fix: disable aborting when collecting from unknown threads and make p…

…utenv noop on windows
madlib-lang · Jun 8, 2024 · 3f5dbfa · 3f5dbfa
1 parent 0043db6
commit 3f5dbfa
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 9 deletions.
diff --git a/madlib.cabal b/madlib.cabal
@@ -5,7 +5,7 @@ cabal-version: 2.0
 -- see: https://github.com/sol/hpack
 
 name:           madlib
-version:        0.23.16
+version:        0.23.17
 description:    Please see the README on GitHub at <https://github.com/madlib-lang/madlib#readme>
 homepage:       https://github.com/madlib-lang/madlib#readme
 bug-reports:    https://github.com/madlib-lang/madlib/issues

diff --git a/package.yaml b/package.yaml
@@ -1,5 +1,5 @@
 name:                madlib
-version:             0.23.16
+version:             0.23.17
 github:              "madlib-lang/madlib"
 license:             BSD3
 author:              "Arnaud Boeglin, Brekk Bockrath"

diff --git a/pkg/package.json b/pkg/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@madlib-lang/madlib",
-  "version": "0.23.16",
+  "version": "0.23.17",
   "main": "./src/run.js",
   "bin": {
     "madlib": "src/run.js"

diff --git a/runtime/src/process.cpp b/runtime/src/process.cpp
@@ -15,7 +15,9 @@
 #endif
 
 #ifdef __MINGW32__
-extern int putenv(char *);
+int putenv(char *) {
+  return 0;
+}
 #endif
 
 #ifdef __cplusplus

diff --git a/scripts/build-runtime-libs b/scripts/build-runtime-libs
@@ -34,13 +34,21 @@ fi
 # build libgc
 LIBGC_VERSION="8.2.6"
 
-wget "https://github.com/ivmai/bdwgc/archive/refs/tags/v${LIBGC_VERSION}.zip"
-unzip "v${LIBGC_VERSION}.zip" -d libgc
-cd "libgc/bdwgc-${LIBGC_VERSION}"
+# wget "https://github.com/ivmai/bdwgc/archive/refs/tags/v${LIBGC_VERSION}.zip"
+# unzip "v${LIBGC_VERSION}.zip" -d libgc
+# cd "libgc/bdwgc-${LIBGC_VERSION}"
+
+wget "https://github.com/madlib-lang/bdwgc/archive/refs/heads/disable-unknown-thread-abort.zip"
+unzip disable-unknown-thread-abort.zip
+cd bdwgc-disable-unknown-thread-abort
+
 sed -i -e 's/scan_size = 2/scan_size = 8/g' alloc.c
 git clone https://github.com/ivmai/libatomic_ops.git
-make -f Makefile.direct CFLAGS_EXTRA="-O3 -DDONT_ADD_BYTE_AT_END -DNO_DEBUGGING -DGC_THREADS -DLARGE_CONFIG -DGC_DISABLE_INCREMENTAL" c++
-make -f Makefile.direct CFLAGS_EXTRA="-O3 -DDONT_ADD_BYTE_AT_END -DNO_DEBUGGING -DGC_THREADS -DLARGE_CONFIG -DGC_DISABLE_INCREMENTAL"
+# make -f Makefile.direct CFLAGS_EXTRA="-O3 -DDONT_ADD_BYTE_AT_END -DNO_DEBUGGING -DGC_THREADS -DLARGE_CONFIG -DGC_DISABLE_INCREMENTAL" c++
+# make -f Makefile.direct CFLAGS_EXTRA="-O3 -DDONT_ADD_BYTE_AT_END -DNO_DEBUGGING -DGC_THREADS -DLARGE_CONFIG -DGC_DISABLE_INCREMENTAL"
+make -f Makefile.direct CFLAGS_EXTRA="-O3 -DTHREAD_LOCAL_ALLOC -DGC_USE_LD_WRAP -DDONT_ADD_BYTE_AT_END -DGC_THREADS -DLARGE_CONFIG -DGC_DISABLE_INCREMENTAL" c++
+make -f Makefile.direct CFLAGS_EXTRA="-O3 -DTHREAD_LOCAL_ALLOC -DGC_USE_LD_WRAP -DDONT_ADD_BYTE_AT_END -DGC_THREADS -DLARGE_CONFIG -DGC_DISABLE_INCREMENTAL"
+
 # make -f Makefile.direct CFLAGS_EXTRA="-O3 -DTHREAD_LOCAL_ALLOC -DGC_DISCOVER_TASK_THREADS -DDEBUG_THREADS -DGC_ASSERTIONS -DDONT_ADD_BYTE_AT_END -DFIND_LEAK -DGC_DEBUG -DGC_DUMP_REGULARLY -DKEEP_BACK_PTRS -DALL_INTERIOR_POINTERS -DGC_PRINT_VERBOSE_STATS -DPRINT_BLACK_LIST -DGC_THREADS -DLARGE_CONFIG -DGC_DISABLE_INCREMENTAL" c++
 # make -f Makefile.direct CFLAGS_EXTRA="-O3 -DTHREAD_LOCAL_ALLOC -DGC_DISCOVER_TASK_THREADS -DDEBUG_THREADS -DGC_ASSERTIONS -DDONT_ADD_BYTE_AT_END -DFIND_LEAK -DGC_DEBUG -DGC_DUMP_REGULARLY -DKEEP_BACK_PTRS -DALL_INTERIOR_POINTERS -DGC_PRINT_VERBOSE_STATS -DPRINT_BLACK_LIST -DGC_THREADS -DLARGE_CONFIG -DGC_DISABLE_INCREMENTAL"
 cd ../..