luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fcn ngGet_Vec_Info(): copy the vector pointer into a static pointer 

infovec only if it is derived from event data (checked by a
scale vector with name "step"). Upon next call to fcn
ngGet_Vec_Info() first free the vector pointed to by infovec.

resolve merge conflict
This commit is contained in:
Holger Vogt 2017-11-20 18:27:01 +01:00
parent 8aff70036a
commit 710e98a22c
1 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/sharedspice.c
View File

@ -218,6 +218,9 @@ static GetVSRCData* getvdat;
static GetISRCData* getidat; static GetISRCData* getidat;
static GetSyncData* getsync; static GetSyncData* getsync;
static pvector_info myvec = NULL; static pvector_info myvec = NULL;
#ifdef XSPICE
static struct dvec *infovec = NULL;
#endif
char **allvecs = NULL; char **allvecs = NULL;
char **allplots = NULL; char **allplots = NULL;
static bool noprintfwanted = FALSE; static bool noprintfwanted = FALSE;
@ -779,6 +782,20 @@ bot:
return 0; return 0;
} }
/* to be called upon 'quit' */
void
sh_delete_myvec(void)
{
tfree(myvec);
#ifdef XSPICE
if (infovec) {
dvec_free(infovec->v_scale);
dvec_free(infovec);
}
#endif
}
/* retrieve a ngspice command from caller and run it /* retrieve a ngspice command from caller and run it
immediately */ immediately */
IMPEXP IMPEXP
@ -813,6 +830,15 @@ pvector_info ngGet_Vec_Info(char* vecname)
return NULL; return NULL;
} }
#ifdef XSPICE
/* If vector is derived from event data, free it */
if (infovec) {
dvec_free(infovec->v_scale);
dvec_free(infovec);
infovec = NULL;
}
#endif
newvec = vec_get(vecname); newvec = vec_get(vecname);
if (newvec == NULL) { if (newvec == NULL) {
@ -830,6 +856,13 @@ pvector_info ngGet_Vec_Info(char* vecname)
myvec->v_realdata = newvec->v_realdata; myvec->v_realdata = newvec->v_realdata;
myvec->v_compdata = newvec->v_compdata; myvec->v_compdata = newvec->v_compdata;
myvec->v_length = newvec->v_length; myvec->v_length = newvec->v_length;
#ifdef XSPICE
/* If we have a vector derived from event data, store its pointer */
if (newvec->v_scale && newvec->v_scale->v_name && eq(newvec->v_scale->v_name, "step"))
infovec = newvec;
#endif
return myvec; return myvec;
}; };