merge with dev

test/main-override.cpp

@@ -3,13 +3,35 @@
 #include <assert.h>
 #include <string.h>
 #include <stdint.h>
-
-#include <mimalloc-new-delete.h>
-#include <mimalloc.h>
 #include <new>
 #include <vector>
+#include <thread>
+#include <mimalloc.h>
+#include <mimalloc-new-delete.h>
 #include <mimalloc-override.h>
 
+
+#ifdef _WIN32
+#include <windows.h>
+static void msleep(unsigned long msecs) { Sleep(msecs); }
+#else
+#include <unistd.h>
+static void msleep(unsigned long msecs) { usleep(msecs * 1000UL); }
+#endif
+
+void heap_no_delete();
+void heap_late_free();
+void various_tests();
+
+int main() {
+  mi_stats_reset();  // ignore earlier allocations
+  // heap_no_delete();  // issue #202
+  // heap_late_free();  // issue #204
+  various_tests();
+  mi_stats_print(NULL);
+  return 0;
+}
+
 static void* p = malloc(8);
 
 void free_p() {
@@ -27,8 +49,7 @@ public:
 
 void dangling_ptr_write();
 
-int main() {
-  mi_stats_reset();  // ignore earlier allocations
+void various_tests() {  
   atexit(free_p);
   //dangling_ptr_write();
   void* p1 = malloc(78);
@@ -36,13 +57,13 @@ int main() {
   free(p1);  
   p1 = malloc(8);
   char* s = _strdup("hello\n");
-  /*
-  char* s = _strdup("hello\n");
-  char* buf = NULL;
-  size_t len;
-  _dupenv_s(&buf,&len,"MIMALLOC_VERBOSE"); 
-  mi_free(buf);
-  */
+  
+  //char* s = _strdup("hello\n");
+  //char* buf = NULL;
+  //size_t len;
+  //_dupenv_s(&buf,&len,"MIMALLOC_VERBOSE"); 
+  //mi_free(buf);
+  
   mi_free(p2);
   p2 = malloc(16);
   p1 = realloc(p1, 32);
@@ -55,8 +76,6 @@ int main() {
   // t = new(std::nothrow) Test(42);   // does not work with overriding :-(
   t = new Test(42);
   delete t;  
-  mi_stats_print(NULL);
-  return 0;
 }
 
 static void dangling_ptr_write() {
@@ -106,4 +125,38 @@ bool test_stl_allocator2() {
   vec.push_back(some_struct());
   vec.pop_back();
   return vec.size() == 0;
+}
+
+
+
+// Issue #202
+void heap_no_delete_worker() {
+  mi_heap_t* heap = mi_heap_new();
+  void* q = mi_heap_malloc(heap,1024);
+  // mi_heap_delete(heap); // uncomment to prevent assertion
+}
+
+void heap_no_delete() {
+  auto t1 = std::thread(heap_no_delete_worker);
+  t1.join();  
+}
+
+
+// Issue #204
+volatile void* global_p;
+
+void t1main() {
+  mi_heap_t* heap = mi_heap_new();
+  global_p = mi_heap_malloc(heap, 1024);
+  mi_heap_delete(heap);
+}
+
+void heap_late_free() {
+  auto t1 = std::thread(t1main);
+
+  msleep(2000);
+  assert(global_p);
+  mi_free((void*)global_p);
+
+  t1.join();
 }