#12 memleak fix + pthread dll attach routines, going to fix tctdb and ejdb...

diff --git a/tcejdb/tcfdb.c b/tcejdb/tcfdb.c
index f41f445..9745848 100644 (file)
--- a/tcejdb/tcfdb.c
+++ b/tcejdb/tcfdb.c
@@ -89,11 +89,11 @@ enum {
 #define FDBTHREADYIELD(TC_fdb)                          \
   do { if((TC_fdb)->mmtx) sched_yield(); } while(false)
 #define FDBLOCKSMEM(TC_fdb, TC_wr)                       \
-  ((TC_fdb)->smtx ? tcfdblocksmem((TC_fdb), (TC_wr)) : ((TC_fdb)->map != NULL))
+  ((TC_fdb)->mmtx ? tcfdblocksmem((TC_fdb), (TC_wr)) : ((TC_fdb)->map != NULL))
 #define FDBLOCKSMEM2(TC_fdb, TC_wr)                       \
-  ((TC_fdb)->smtx ? tcfdblocksmem2((TC_fdb), (TC_wr)) : true)
+  ((TC_fdb)->mmtx ? tcfdblocksmem2((TC_fdb), (TC_wr)) : true)
 #define FDBUNLOCKSMEM(TC_fdb)                             \
-  ((TC_fdb)->smtx ? tcfdbunlocksmem(TC_fdb) : true)
+  ((TC_fdb)->mmtx ? tcfdbunlocksmem(TC_fdb) : true)
 
 /* private function prototypes */
 static void tcfdbdumpmeta(TCFDB *fdb, char *hbuf);
@@ -165,12 +165,12 @@ void tcfdbdel(TCFDB *fdb) {
     if (fdb->mmtx) {
         pthread_key_delete(*(pthread_key_t *) fdb->eckey);
         pthread_mutex_destroy(fdb->wmtx);
-        pthread_mutex_destroy(fdb->smtx);
         pthread_mutex_destroy(fdb->tmtx);
         for (int i = FDBRMTXNUM - 1; i >= 0; i--) {
             pthread_rwlock_destroy((pthread_rwlock_t *) fdb->rmtxs + i);
         }
         pthread_mutex_destroy(fdb->amtx);
+        pthread_rwlock_destroy(fdb->smtx);
         pthread_rwlock_destroy(fdb->mmtx);
         TCFREE(fdb->eckey);
         TCFREE(fdb->wmtx);
@@ -179,6 +179,7 @@ void tcfdbdel(TCFDB *fdb) {
         TCFREE(fdb->rmtxs);
         TCFREE(fdb->amtx);
         TCFREE(fdb->mmtx);
+        fdb->mmtx = NULL;
     }
     TCFREE(fdb);
 }

diff --git a/tcejdb/win32/platform.c b/tcejdb/win32/platform.c
index 62a62f5..2fb219e 100644 (file)
--- a/tcejdb/win32/platform.c
+++ b/tcejdb/win32/platform.c
@@ -166,4 +166,35 @@ int glob(const char *pattern, int flags,
     return 0;
 }
 
+#ifdef EJDB_DLL
+BOOL WINAPI DllMain(HINSTANCE hinstDll, DWORD fdwReason, LPVOID lpvReserved) {
+    BOOL result = PTW32_TRUE;
+    switch (fdwReason) {
+        case DLL_PROCESS_ATTACH:
+            result = pthread_win32_process_attach_np();
+            break;
+
+        case DLL_THREAD_ATTACH:
+            /*
+             * A thread is being created
+             */
+            result = pthread_win32_thread_attach_np();
+            break;
+
+        case DLL_THREAD_DETACH:
+            /*
+             * A thread is exiting cleanly
+             */
+            result = pthread_win32_thread_detach_np();
+            break;
+
+        case DLL_PROCESS_DETACH:
+            (void) pthread_win32_thread_detach_np();
+            result = pthread_win32_process_detach_np();
+            break;
+    }
+    return (result);
+
+} /* DllMain */
+#endif