asTrapWriteRegisterListener() safe lazy init

mdavidsaver · Dec 30, 2024 · a99697e · a99697e
1 parent 62d8f37
commit a99697e
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/modules/libcom/src/as/asTrapWrite.c b/modules/libcom/src/as/asTrapWrite.c
@@ -22,6 +22,7 @@
 
 #include "ellLib.h"
 #include "freeList.h"
+#include "epicsThread.h"
 #include "cantProceed.h"
 #include "epicsMutex.h"
 #include "ellLib.h"
@@ -57,9 +58,10 @@ typedef struct asTrapWritePvt
     epicsMutexId lock;
 }asTrapWritePvt;
 
+static epicsThreadOnceId asTrapWriteOnce = EPICS_THREAD_ONCE_INIT;
 static asTrapWritePvt *pasTrapWritePvt = 0;
 
-static void asTrapWriteInit(void)
+static void asTrapWriteInit(void *unused)
 {
     pasTrapWritePvt = callocMustSucceed(1,sizeof(asTrapWritePvt),"asTrapWriteInit");
     ellInit(&pasTrapWritePvt->listenerList);
@@ -75,7 +77,7 @@ asTrapWriteId epicsStdCall asTrapWriteRegisterListener(
     asTrapWriteListener func)
 {
     listener *plistener;
-    if(pasTrapWritePvt==0) asTrapWriteInit();
+    epicsThreadOnce(&asTrapWriteOnce, &asTrapWriteInit, NULL);
     plistener = callocMustSucceed(1,sizeof(listener),"asTrapWriteRegisterListener");
     plistener->func = func;
     epicsMutexMustLock(pasTrapWritePvt->lock);