From 21ce41d42d6b86e482ec2e7fe01b3feb74dd4ea4 Mon Sep 17 00:00:00 2001
From: Huon Wilson <dbau.pp+github@gmail.com>
Date: Wed, 11 Sep 2013 00:50:47 +1000
Subject: extra: use a mutex to wrap linenoise calls and make them threadsafe.

Fixes #3921.
---
 src/rt/rust_builtin.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'src/rt/rust_builtin.cpp')

diff --git a/src/rt/rust_builtin.cpp b/src/rt/rust_builtin.cpp
index 03a17d2c2ef..1871e7f36b3 100644
--- a/src/rt/rust_builtin.cpp
+++ b/src/rt/rust_builtin.cpp
@@ -633,6 +633,18 @@ rust_drop_env_lock() {
     env_lock.unlock();
 }
 
+static lock_and_signal linenoise_lock;
+
+extern "C" CDECL void
+rust_take_linenoise_lock() {
+    linenoise_lock.lock();
+}
+
+extern "C" CDECL void
+rust_drop_linenoise_lock() {
+    linenoise_lock.unlock();
+}
+
 extern "C" CDECL unsigned int
 rust_valgrind_stack_register(void *start, void *end) {
   return VALGRIND_STACK_REGISTER(start, end);
-- 
cgit 1.4.1-3-g733a5