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

Stop the worker thread when running 

Delete mutexes only after all other resets and delets.
This commit is contained in:
Holger Vogt 2024-06-23 17:02:03 +02:00
parent 250e9afd92
commit a6240eed87
1 changed files with 46 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/sharedspice.c
View File

@ -1097,6 +1097,10 @@ sh_delete_myvec(void)
IMPEXP IMPEXP
int ngSpice_Command(char* comexec) int ngSpice_Command(char* comexec)
{ {
if (!is_initialized) {
return 1;
}
/* delete existing command memory */ /* delete existing command memory */
if (comexec == NULL) { if (comexec == NULL) {
cp_resetcontrol(FALSE); cp_resetcontrol(FALSE);
@ -1385,6 +1389,9 @@ int ngSpice_UnlockRealloc(void)
IMPEXP IMPEXP
int ngSpice_Reset(void) int ngSpice_Reset(void)
{ {
if (!is_initialized)
return 1;
fprintf(stdout, "Note: Resetting ngspice\n\n");
return totalreset(); return totalreset();
} }
@ -2425,11 +2432,22 @@ void shared_send_dict(int index, int no_of_nodes, char* name, char*type)
static int totalreset(void) static int totalreset(void)
{ {
if(!is_initialized)
return 1;
is_initialized = FALSE; is_initialized = FALSE;
// if we are in a worker thread, we exit it here
// detaching then has to be done explicitely by the caller
if (fl_running && !fl_exited) {
fl_exited = TRUE;
bgtr(fl_exited, ng_ident, userptr);
// finish and exit the worker thread
#ifdef HAVE_LIBPTHREAD
pthread_exit(NULL);
#elif defined _MSC_VER || defined __MINGW32__
_endthreadex(1);
#endif
}
/* start to clean up the mess */ /* start to clean up the mess */
noprintfwanted = FALSE; noprintfwanted = FALSE;
@ -2443,32 +2461,6 @@ static int totalreset(void)
immediate = FALSE; immediate = FALSE;
coquit = FALSE; coquit = FALSE;
#ifdef THREADS
/* Destroy the mutexes */
#ifdef HAVE_LIBPTHREAD
pthread_mutex_destroy(&triggerMutex);
pthread_mutex_destroy(&allocMutex);
pthread_mutex_destroy(&fputsMutex);
pthread_mutex_destroy(&vecreallocMutex);
cont_condition = FALSE;
#else
#ifdef SRW
/* Do we need to remove the SWR locks? */
// InitializeSRWLock(&triggerMutex);
// InitializeSRWLock(&allocMutex);
// InitializeSRWLock(&fputsMutex);
// InitializeSRWLock(&vecreallocMutex);
#else
DeleteCriticalSection(&triggerMutex);
DeleteCriticalSection(&allocMutex);
DeleteCriticalSection(&fputsMutex);
DeleteCriticalSection(&vecreallocMutex);
#endif
#endif
// Id of primary thread
main_id = 0;
#endif
wordlist all = { "all", NULL, NULL }; wordlist all = { "all", NULL, NULL };
wordlist star = { "*", NULL, NULL }; wordlist star = { "*", NULL, NULL };
@ -2503,5 +2495,31 @@ static int totalreset(void)
cp_resetcontrol(FALSE); cp_resetcontrol(FALSE);
sh_delete_myvec(); sh_delete_myvec();
#ifdef THREADS
/* Destroy the mutexes */
#ifdef HAVE_LIBPTHREAD
pthread_mutex_destroy(&triggerMutex);
pthread_mutex_destroy(&allocMutex);
pthread_mutex_destroy(&fputsMutex);
pthread_mutex_destroy(&vecreallocMutex);
cont_condition = FALSE;
#else
#ifdef SRW
/* Do we need to remove the SWR locks? */
// InitializeSRWLock(&triggerMutex);
// InitializeSRWLock(&allocMutex);
// InitializeSRWLock(&fputsMutex);
// InitializeSRWLock(&vecreallocMutex);
#else
DeleteCriticalSection(&triggerMutex);
DeleteCriticalSection(&allocMutex);
DeleteCriticalSection(&fputsMutex);
DeleteCriticalSection(&vecreallocMutex);
#endif
#endif
// Id of primary thread
main_id = 0;
#endif
return 0; return 0;
}; };