Fixing double initialization of critical section

ktakashi · Dec 16, 2024 · 41b475c · 41b475c
1 parent d0b5d41
commit 41b475c
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/src/clos.c b/src/clos.c
@@ -2319,9 +2319,14 @@ static void init_class(SgClass *klass, const SgChar *name,
   klass->gettersNSetters = (SgSlotAccessor**)Sg_ListToArray(acc, TRUE);
   klass->slots = slots;
   klass->nfields = (int)Sg_Length(slots);
+
   /* do we need this? */
-  Sg_InitMutex(&klass->mutex, FALSE);
-  Sg_InitCond(&klass->cv);
+  if ((flags & SG_NO_INIT_MUTEX) == 0) {
+    Sg_InitMutex(&klass->mutex, FALSE);
+  }
+  if ((flags & SG_NO_INIT_CV) == 0) {
+    Sg_InitCond(&klass->cv);
+  }
 }
 
 void Sg_InitStaticClass(SgClass *klass, const SgChar *name,
@@ -3139,8 +3144,6 @@ void Sg__InitClos()
   BINIT(SG_CLASS_DICTIONARY, "<dictionary>", NULL);
   BINIT(SG_CLASS_ORDERED_DICTIONARY, "<ordered-dictionary>", NULL);
 
-  /* hashtable */
-  CINIT(SG_CLASS_HASHTABLE, "<hashtable>");
   /* treemap */
   CINIT(SG_CLASS_TREE_MAP,  "<tree-map>");
 

diff --git a/src/dl_win.c b/src/dl_win.c
@@ -57,6 +57,6 @@ static SgDynLoadInitFn dl_sym(void *handle, const char *name)
 
 static void dl_close(void *handle)
 {
-  (void)FreeLibrary((HMODULE)handle);
+  /* (void)FreeLibrary((HMODULE)handle); */
 }
 
diff --git a/src/record.c b/src/record.c
@@ -88,7 +88,7 @@ SgObject Sg_AllocateRecordTypeMeta(SgClass *klass, SgObject initargs)
   SG_SET_CLASS(m, klass);
   /* ok we need to initialise the metaclass by hand */
   SG_CLASS(m)->cpa = Sg_RTMCPL;
-  Sg_InitStaticClass(SG_CLASS(m), NULL, NULL, rtm_slots, 0);
+  Sg_InitStaticClass(SG_CLASS(m), NULL, NULL, rtm_slots, SG_NO_INIT_CV);
   SG_RECORD_TYPE_META(m)->rtd = SG_FALSE;
   SG_RECORD_TYPE_META(m)->rcd = SG_FALSE;
   return m;

diff --git a/src/sagittarius/private/clos.h b/src/sagittarius/private/clos.h
@@ -156,6 +156,12 @@ enum {
   SG_CLASS_APPLICABLE = 0x04,
 };
 
+/* A bit ugly work around for double initialization... */
+typedef enum {
+  SG_NO_INIT_CV    = 0x00000001,
+  SG_NO_INIT_MUTEX = 0x00000002,
+} SgClassInitFlags;
+
 /* built-in classes */
 SG_CLASS_DECL(Sg_TopClass);
 SG_CLASS_DECL(Sg_BoolClass);