Merge pull request #31 from bcardiff/update-crystal-0.28

Update for crystal 0.28 release

Author: bcardiff

linux/Dockerfile

@@ -24,14 +24,14 @@ ENV CFLAGS="-fPIC -pipe ${release:+-O2}"
 # Build libgc
 ARG gc_version
 ARG libatomic_ops_version
-COPY files/fix-gcf-memory-allocation.patch /tmp/
+COPY files/feature-thread-stackbottom.patch /tmp/
 RUN git clone https://github.com/ivmai/bdwgc \
  && cd bdwgc \
  && git checkout ${gc_version} \
  && git clone https://github.com/ivmai/libatomic_ops \
  && (cd libatomic_ops && git checkout ${libatomic_ops_version}) \
  \
- && patch -p1 < /tmp/fix-gcf-memory-allocation.patch \
+ && patch -p1 < /tmp/feature-thread-stackbottom.patch \
  \
  && ./autogen.sh \
  && ./configure --disable-debug --disable-shared --enable-large-config \

linux/Makefile

@@ -20,8 +20,8 @@ PREVIOUS_CRYSTAL_RELEASE_LINUX64_TARGZ ?=  ## url to crystal-{version}-{package}
 PREVIOUS_CRYSTAL_RELEASE_LINUX32_TARGZ ?=  ## url to crystal-{version}-{package}-linux-i686.tar.gz
 
 SHARDS_VERSION = v0.8.1
-GC_VERSION = v7.6.8
-LIBATOMIC_OPS_VERSION = v7.6.6
+GC_VERSION = v7.6.12
+LIBATOMIC_OPS_VERSION = v7.6.10
 
 OUTPUT_DIR = build
 OUTPUT_BASENAME64 = $(OUTPUT_DIR)/crystal-$(CRYSTAL_VERSION)-$(PACKAGE_ITERATION)-linux-x86_64

linux/files/crystal-wrapper

@@ -100,5 +100,6 @@ ROOT_DIR="$SCRIPT_DIR/.."
 export CRYSTAL_PATH="${CRYSTAL_PATH:-"$ROOT_DIR/share/crystal/src:lib"}"
 export PATH="$ROOT_DIR/lib/crystal/bin:$PATH"
 export LIBRARY_PATH="$ROOT_DIR/lib/crystal/lib${LIBRARY_PATH:+:$LIBRARY_PATH}"
+export CRYSTAL_LIBRARY_PATH="${CRYSTAL_LIBRARY_PATH:+$CRYSTAL_LIBRARY_PATH:}$ROOT_DIR/lib/crystal/lib"
 
 exec "$ROOT_DIR/lib/crystal/bin/crystal" "${@}"

linux/files/feature-thread-stackbottom.patch

@@ -0,0 +1,80 @@
+From 4ee871c7812c84631e2e8127302f76df190ffe18 Mon Sep 17 00:00:00 2001
+From: "Brian J. Cardiff" <[email protected]>
+Date: Mon, 7 Jan 2019 17:41:35 -0300
+Subject: [PATCH] Added functions to get and set the stackbottom of each thread
+
+---
+ include/gc.h      | 10 ++++++++++
+ pthread_support.c | 38 ++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 48 insertions(+)
+
+diff --git a/include/gc.h b/include/gc.h
+index d6fec2b5..1a80154d 100644
+--- a/include/gc.h
++++ b/include/gc.h
+@@ -362,6 +362,16 @@ GC_API GC_ATTR_DEPRECATED char *GC_stackbottom;
+                                 /* GC_call_with_gc_active() and         */
+                                 /* GC_register_my_thread() instead.     */
+ 
++/* Sets the cool end of user stack in the specified thread.              */
++/* MUST be called with the GC disabled.                                 */
++GC_API void GC_CALL GC_set_stackbottom(void * thread, char * stackbottom);
++
++/* Returns the cool end of user stack of the current thread/coroutine.  */
++/* When a thread starts it will be computed upon creation.              */
++/* If GC_switch_to_coroutine() is called, the returned value will match */
++/* the specified value in that function.                                 */
++GC_API char * GC_CALL GC_get_stackbottom();
++
+ GC_API GC_ATTR_DEPRECATED int GC_dont_precollect;
+                                 /* Do not collect as part of GC         */
+                                 /* initialization.  Should be set only  */
+diff --git a/pthread_support.c b/pthread_support.c
+index 78e5d35a..e99c4b81 100644
+--- a/pthread_support.c
++++ b/pthread_support.c
+@@ -1369,6 +1369,44 @@ GC_INNER void GC_do_blocking_inner(ptr_t data, void * context GC_ATTR_UNUSED)
+     UNLOCK();
+ }
+ 
++/* Sets the cool end of user stack in the specified thread.              */
++/* MUST be called with the GC disabled.                                 */
++GC_API void GC_CALL GC_set_stackbottom(void * thread, char * stackbottom)
++{
++    GC_thread me;
++
++    me = GC_lookup_thread((pthread_t) thread);
++
++    if ((me -> flags & MAIN_THREAD) == 0) {
++        me -> stack_end = stackbottom;
++    } else {
++        GC_stackbottom = stackbottom;
++    }
++}
++
++/* Returns the cool end of user stack of the current thread/corutine.   */
++/* When a thread starts it will be computed upon creation.              */
++/* If GC_switch_to_coroutine() is called, the returned value will match */
++/* the specified value in that function.                                 */
++GC_API char * GC_CALL GC_get_stackbottom()
++{
++    pthread_t self = pthread_self();
++    GC_thread me;
++    char * ret;
++
++    LOCK();
++    me = GC_lookup_thread(self);
++
++    if ((me -> flags & MAIN_THREAD) == 0) {
++        ret = me -> stack_end;
++    } else {
++        ret = GC_stackbottom;
++    }
++    UNLOCK();
++
++    return ret;
++}
++
+ /* GC_call_with_gc_active() has the opposite to GC_do_blocking()        */
+ /* functionality.  It might be called from a user function invoked by   */
+ /* GC_do_blocking() to temporarily back allow calling any GC function   */

linux/files/fix-gcf-memory-allocation.patch

@@ -0,0 +1,80 @@
+From 4ee871c7812c84631e2e8127302f76df190ffe18 Mon Sep 17 00:00:00 2001
+From: "Brian J. Cardiff" <[email protected]>
+Date: Mon, 7 Jan 2019 17:41:35 -0300
+Subject: [PATCH] Added functions to get and set the stackbottom of each thread
+
+---
+ include/gc.h      | 10 ++++++++++
+ pthread_support.c | 38 ++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 48 insertions(+)
+
+diff --git a/include/gc.h b/include/gc.h
+index d6fec2b5..1a80154d 100644
+--- a/include/gc.h
++++ b/include/gc.h
+@@ -362,6 +362,16 @@ GC_API GC_ATTR_DEPRECATED char *GC_stackbottom;
+                                 /* GC_call_with_gc_active() and         */
+                                 /* GC_register_my_thread() instead.     */
+ 
++/* Sets the cool end of user stack in the specified thread.              */
++/* MUST be called with the GC disabled.                                 */
++GC_API void GC_CALL GC_set_stackbottom(void * thread, char * stackbottom);
++
++/* Returns the cool end of user stack of the current thread/coroutine.  */
++/* When a thread starts it will be computed upon creation.              */
++/* If GC_switch_to_coroutine() is called, the returned value will match */
++/* the specified value in that function.                                 */
++GC_API char * GC_CALL GC_get_stackbottom();
++
+ GC_API GC_ATTR_DEPRECATED int GC_dont_precollect;
+                                 /* Do not collect as part of GC         */
+                                 /* initialization.  Should be set only  */
+diff --git a/pthread_support.c b/pthread_support.c
+index 78e5d35a..e99c4b81 100644
+--- a/pthread_support.c
++++ b/pthread_support.c
+@@ -1369,6 +1369,44 @@ GC_INNER void GC_do_blocking_inner(ptr_t data, void * context GC_ATTR_UNUSED)
+     UNLOCK();
+ }
+ 
++/* Sets the cool end of user stack in the specified thread.              */
++/* MUST be called with the GC disabled.                                 */
++GC_API void GC_CALL GC_set_stackbottom(void * thread, char * stackbottom)
++{
++    GC_thread me;
++
++    me = GC_lookup_thread((pthread_t) thread);
++
++    if ((me -> flags & MAIN_THREAD) == 0) {
++        me -> stack_end = stackbottom;
++    } else {
++        GC_stackbottom = stackbottom;
++    }
++}
++
++/* Returns the cool end of user stack of the current thread/corutine.   */
++/* When a thread starts it will be computed upon creation.              */
++/* If GC_switch_to_coroutine() is called, the returned value will match */
++/* the specified value in that function.                                 */
++GC_API char * GC_CALL GC_get_stackbottom()
++{
++    pthread_t self = pthread_self();
++    GC_thread me;
++    char * ret;
++
++    LOCK();
++    me = GC_lookup_thread(self);
++
++    if ((me -> flags & MAIN_THREAD) == 0) {
++        ret = me -> stack_end;
++    } else {
++        ret = GC_stackbottom;
++    }
++    UNLOCK();
++
++    return ret;
++}
++
+ /* GC_call_with_gc_active() has the opposite to GC_do_blocking()        */
+ /* functionality.  It might be called from a user function invoked by   */
+ /* GC_do_blocking() to temporarily back allow calling any GC function   */

omnibus/config/patches/bdw-gc/feature-thread-stackbottom.patch

@@ -1,5 +1,5 @@
 name "bdw-gc"
-default_version "7.6.8"
+default_version "7.6.12"
 
 source :url => "https://github.com/ivmai/bdwgc/releases/download/v#{version}/gc-#{version}.tar.gz"
 
@@ -11,6 +11,10 @@
   source md5: "9ae6251493ead5d0d13b044954cec7d7"
 end
 
+version "7.6.12" do
+  source md5: "8175e1be00c6cd6eac2e8d67bdf451df"
+end
+
 dependency "libatomic_ops"
 
 relative_path "gc-#{version}"
@@ -19,6 +23,8 @@
 env["CFLAGS"] << " -fPIC"
 
 build do
+  patch source: 'feature-thread-stackbottom.patch', plevel: 1
+
   command "./configure" \
           " --disable-debug" \
           " --disable-dependency-tracking" \

omnibus/config/software/bdw-gc.rb

@@ -18,7 +18,8 @@
 dependency "libevent"
 
 env = with_standard_compiler_flags(with_embedded_path(
-  "LIBRARY_PATH" => "#{install_dir}/embedded/lib"
+  "LIBRARY_PATH" => "#{install_dir}/embedded/lib",
+  "CRYSTAL_LIBRARY_PATH" => "#{install_dir}/embedded/lib"
 ))
 env["CFLAGS"] << " -fPIC"
 

omnibus/config/software/crystal.rb

@@ -1,5 +1,5 @@
 name "libatomic_ops"
-default_version "7.6.6"
+default_version "7.6.10"
 
 source :url => "https://github.com/ivmai/libatomic_ops/releases/download/v#{version}/libatomic_ops-#{version}.tar.gz"
 
@@ -11,6 +11,10 @@
   source md5: "4514d85d14e21af05d59877c9ded5abc"
 end
 
+version "7.6.10" do
+  source md5: "90a78a84d9c28ce11f331c25289bfbd0"
+end
+
 relative_path "libatomic_ops-#{version}"
 
 env = with_standard_compiler_flags

omnibus/config/software/libatomic_ops.rb

@@ -99,4 +99,5 @@ INSTALL_DIR="$(realpath "$SCRIPT_PATH/..")"
 export CRYSTAL_PATH=${CRYSTAL_PATH:-"lib:$INSTALL_DIR/src"}
 export PATH="$INSTALL_DIR/embedded/bin:$PATH"
 export LIBRARY_PATH="$INSTALL_DIR/embedded/lib${LIBRARY_PATH:+:$LIBRARY_PATH}"
+export CRYSTAL_LIBRARY_PATH="${CRYSTAL_LIBRARY_PATH:+$CRYSTAL_LIBRARY_PATH:}$INSTALL_DIR/embedded/lib"
 "$INSTALL_DIR/embedded/bin/crystal" "$@"