luke/xschem
1
0
Fork 0
mirror of https://github.com/StefanSchippers/xschem.git synced 2026-08-22 06:07:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

set mutex in translate() to avoid reentrant calls if any happens (shouldn`t happen, though)

Browse Source
This commit is contained in:
stefan schippers
2026-07-25 11:48:43 +02:00
parent 7be708fcc3
commit b69f793f83
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/token.c
+11 -1
View File
@@ -4466,8 +4466,9 @@ char *get_fqdevice(const char *param, int modelparam, const char *instname)
/* substitute given tokens in a string with their corresponding values */ /* substitute given tokens in a string with their corresponding values */
/* ex.: name=@name w=@w l=@l ---> name=m112 w=3e-6 l=0.8e-6 */ /* ex.: name=@name w=@w l=@l ---> name=m112 w=3e-6 l=0.8e-6 */
/* if s==NULL return emty string */ /* if s==NULL return emty string */
const char *translate(int inst, const char* s) const char *translate(int inst, const char *s)
{ {
static int mutex = 0;
#ifdef __unix__ #ifdef __unix__
static regex_t *get_sp_cur = NULL; static regex_t *get_sp_cur = NULL;
#endif #endif
@@ -4507,6 +4508,7 @@ const char *translate(int inst, const char* s)
if(!s || !xctx || !xctx->inst) { if(!s || !xctx || !xctx->inst) {
return empty; return empty;
} }
#ifdef __unix__ #ifdef __unix__
if(!get_sp_cur) { if(!get_sp_cur) {
get_sp_cur = my_malloc(_ALLOC_ID_, sizeof(regex_t)); get_sp_cur = my_malloc(_ALLOC_ID_, sizeof(regex_t));
@@ -4524,6 +4526,13 @@ const char *translate(int inst, const char* s)
dbg(0, "translate(): instance number out of bounds: %d\n", inst); dbg(0, "translate(): instance number out of bounds: %d\n", inst);
return empty; return empty;
} }
if(mutex > 0) {
dbg(0, "translate(): reentrant call, mutex=%d, skip and return empty string", mutex);
return empty;
}
mutex++;
/* if spice_get_* token not processed by tcl use enginering notation (2m, 3u, ...) */ /* if spice_get_* token not processed by tcl use enginering notation (2m, 3u, ...) */
if(!(strstr(s, "tcleval(") == s)) engineering = 1; if(!(strstr(s, "tcleval(") == s)) engineering = 1;
instname = (inst >=0 && xctx->inst[inst].instname) ? xctx->inst[inst].instname : ""; instname = (inst >=0 && xctx->inst[inst].instname) ? xctx->inst[inst].instname : "";
@@ -5308,6 +5317,7 @@ const char *translate(int inst, const char* s)
translate3(result, 1, xctx->inst[inst].prop_ptr, xctx->sym[xctx->inst[inst].ptr].templ, translate3(result, 1, xctx->inst[inst].prop_ptr, xctx->sym[xctx->inst[inst].ptr].templ,
NULL, NULL))); NULL, NULL)));
} }
mutex--;
return result; return result;
} }