Merge pull request #14408 from JuliaLang/yyc/jl_-thread

Make jl_ thread safe
JuliaLang · Dec 16, 2015 · 7530fce · 7530fce
2 parents 97443cd + abac887
commit 7530fce
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/src/builtins.c b/src/builtins.c
@@ -1642,18 +1642,17 @@ JL_DLLEXPORT size_t jl_static_show_func_sig(JL_STREAM *s, jl_value_t *type)
  return n;
 }
 
-int in_jl_ = 0;
 JL_DLLEXPORT void jl_(void *jl_value)
 {
- in_jl_++;
+ jl_in_jl_++;
  JL_TRY {
  (void)jl_static_show((JL_STREAM*)STDERR_FILENO, (jl_value_t*)jl_value);
  jl_printf((JL_STREAM*)STDERR_FILENO,"\n");
  }
  JL_CATCH {
  jl_printf((JL_STREAM*)STDERR_FILENO, "\n!!! ERROR in jl_ -- ABORTING !!!\n");
  }
- in_jl_--;
+ jl_in_jl_--;
 }
 
 JL_DLLEXPORT void jl_breakpoint(jl_value_t *v)

diff --git a/src/jl_uv.c b/src/jl_uv.c
@@ -308,6 +308,8 @@ JL_DLLEXPORT int jl_fs_chmod(char *path, int mode)
 JL_DLLEXPORT int jl_fs_write(int handle, const char *data, size_t len,
  int64_t offset)
 {
+ if (jl_in_jl_)
+ return write(handle, data, len);
  uv_fs_t req;
  uv_buf_t buf[1];
  buf[0].base = (char*)data;

diff --git a/src/julia.h b/src/julia.h
@@ -1420,6 +1420,7 @@ typedef struct _jl_tls_states_t {
  void *stackbase;
  jl_jmp_buf *volatile jmp_target;
  jl_jmp_buf base_ctx; // base context of stack
+ int8_t in_jl_;
  int16_t tid;
  size_t bt_size;
  ptrint_t bt_data[JL_MAX_BT_SIZE + 1];

diff --git a/src/julia_internal.h b/src/julia_internal.h
@@ -17,6 +17,7 @@ extern jl_function_t *jl_typeinf_func;
 #if defined(JL_USE_INTEL_JITEVENTS)
 extern unsigned sig_stack_size;
 #endif
+#define jl_in_jl_ jl_get_ptls_states()->in_jl_
 
 JL_DLLEXPORT extern int jl_lineno;
 JL_DLLEXPORT extern const char *jl_filename;

diff --git a/src/signals-unix.c b/src/signals-unix.c
@@ -70,13 +70,12 @@ void sigdie_handler(int sig, siginfo_t *info, void *context)
 #include <signals-mach.c>
 #else
 
-extern int in_jl_;
 static void segv_handler(int sig, siginfo_t *info, void *context)
 {
  sigset_t sset;
  assert(sig == SIGSEGV);
 
- if (in_jl_ || is_addr_on_stack(info->si_addr)) { // stack overflow, or restarting jl_
+ if (jl_in_jl_ || is_addr_on_stack(info->si_addr)) { // stack overflow, or restarting jl_
  sigemptyset(&sset);
  sigaddset(&sset, SIGSEGV);
  sigprocmask(SIG_UNBLOCK, &sset, NULL);