summaryrefslogtreecommitdiff
path: root/lib/thread
diff options
context:
space:
mode:
authorOri Bernstein <ori@eigenstate.org>2017-03-05 13:52:17 -0800
committerOri Bernstein <ori@eigenstate.org>2017-03-05 13:54:27 -0800
commitb3d835e235336f8c0e1979fe009eefb24117a169 (patch)
tree67bcc668d9e2b2c521e2872908d529ce60c2b2d4 /lib/thread
parentb623656b7898648e82dcc0adc5c4d03a5ba9b5da (diff)
parent2bb663c4e88ad3602a2402a039b18a30d7acf556 (diff)
downloadmc-b3d835e235336f8c0e1979fe009eefb24117a169.tar.gz
Merge branch 'master' of git+ssh://git.eigenstate.org/git/ori/mc
Diffstat (limited to 'lib/thread')
-rw-r--r--lib/thread/bld.sub9
-rw-r--r--lib/thread/condvar+freebsd.myr6
-rw-r--r--lib/thread/condvar+linux.myr6
-rw-r--r--lib/thread/future.myr2
-rw-r--r--lib/thread/mutex+freebsd.myr4
-rw-r--r--lib/thread/mutex+linux.myr4
-rw-r--r--lib/thread/mutex+plan9.myr4
-rw-r--r--lib/thread/mutex.myr4
-rw-r--r--lib/thread/test/atomic.myr2
-rw-r--r--lib/thread/test/condvar.myr2
-rw-r--r--lib/thread/test/future.myr2
-rw-r--r--lib/thread/test/mutex.myr2
12 files changed, 23 insertions, 24 deletions
diff --git a/lib/thread/bld.sub b/lib/thread/bld.sub
index 3cc710a..8f892f1 100644
--- a/lib/thread/bld.sub
+++ b/lib/thread/bld.sub
@@ -18,10 +18,10 @@ lib thread =
# netbsd impl of thread primitives
#condvar+netbsd.myr
- mutex+netbsd.myr
- spawn+netbsd.myr
- ncpu+netbsd.myr
- exit+netbsd-x64.s
+ #mutex+netbsd.myr
+ #spawn+netbsd.myr
+ #ncpu+netbsd.myr
+ #exit+netbsd-x64.s
# osx impl of thread primitives
#condvar+osx.myr
@@ -39,7 +39,6 @@ lib thread =
spawn+openbsd.myr
exit+openbsd-x64.s
-
atomic-impl+x64.s
atomic.myr
diff --git a/lib/thread/condvar+freebsd.myr b/lib/thread/condvar+freebsd.myr
index 24e5a32..65267a4 100644
--- a/lib/thread/condvar+freebsd.myr
+++ b/lib/thread/condvar+freebsd.myr
@@ -1,9 +1,9 @@
use std
use sys
-use "atomic.use"
-use "common.use"
-use "mutex.use"
+use "atomic"
+use "common"
+use "mutex"
pkg thread =
type cond = struct
diff --git a/lib/thread/condvar+linux.myr b/lib/thread/condvar+linux.myr
index 9e288d7..cd4ab8c 100644
--- a/lib/thread/condvar+linux.myr
+++ b/lib/thread/condvar+linux.myr
@@ -1,9 +1,9 @@
use std
use sys
-use "atomic.use"
-use "common.use"
-use "mutex.use"
+use "atomic"
+use "common"
+use "mutex"
pkg thread =
type cond = struct
diff --git a/lib/thread/future.myr b/lib/thread/future.myr
index da6252b..5637e6d 100644
--- a/lib/thread/future.myr
+++ b/lib/thread/future.myr
@@ -1,6 +1,6 @@
use std
-use "mutex.use"
+use "mutex"
pkg thread =
type future(@a) = struct
diff --git a/lib/thread/mutex+freebsd.myr b/lib/thread/mutex+freebsd.myr
index d66fd53..fc1f8c2 100644
--- a/lib/thread/mutex+freebsd.myr
+++ b/lib/thread/mutex+freebsd.myr
@@ -1,8 +1,8 @@
use std
use sys
-use "atomic.use"
-use "common.use"
+use "atomic"
+use "common"
pkg thread =
type mutex = struct
diff --git a/lib/thread/mutex+linux.myr b/lib/thread/mutex+linux.myr
index 37bec62..22b9904 100644
--- a/lib/thread/mutex+linux.myr
+++ b/lib/thread/mutex+linux.myr
@@ -1,8 +1,8 @@
use std
use sys
-use "atomic.use"
-use "common.use"
+use "atomic"
+use "common"
pkg thread =
type mutex = struct
diff --git a/lib/thread/mutex+plan9.myr b/lib/thread/mutex+plan9.myr
index 7c87218..e91cd90 100644
--- a/lib/thread/mutex+plan9.myr
+++ b/lib/thread/mutex+plan9.myr
@@ -2,8 +2,8 @@ use std
use sys
-use "atomic.use"
-use "common.use"
+use "atomic"
+use "common"
pkg thread =
type mutex = struct
diff --git a/lib/thread/mutex.myr b/lib/thread/mutex.myr
index 6dc4a44..5b90574 100644
--- a/lib/thread/mutex.myr
+++ b/lib/thread/mutex.myr
@@ -2,8 +2,8 @@ use std
use sys
-use "atomic.use"
-use "common.use"
+use "atomic"
+use "common"
pkg thread =
type mutex = struct
diff --git a/lib/thread/test/atomic.myr b/lib/thread/test/atomic.myr
index c005677..3dd3284 100644
--- a/lib/thread/test/atomic.myr
+++ b/lib/thread/test/atomic.myr
@@ -1,7 +1,7 @@
use std
use thread
-use "test/util.use"
+use "util"
const Nherd = 20
diff --git a/lib/thread/test/condvar.myr b/lib/thread/test/condvar.myr
index e8670b1..0f1de58 100644
--- a/lib/thread/test/condvar.myr
+++ b/lib/thread/test/condvar.myr
@@ -1,7 +1,7 @@
use std
use thread
-use "test/util.use"
+use "util"
const Nwakes = 1000
diff --git a/lib/thread/test/future.myr b/lib/thread/test/future.myr
index 63969a4..e69e1af 100644
--- a/lib/thread/test/future.myr
+++ b/lib/thread/test/future.myr
@@ -2,7 +2,7 @@ use std
use sys
use thread
-use "test/util.use"
+use "util"
var fut
var nready : int32
diff --git a/lib/thread/test/mutex.myr b/lib/thread/test/mutex.myr
index e29ae85..b366637 100644
--- a/lib/thread/test/mutex.myr
+++ b/lib/thread/test/mutex.myr
@@ -1,7 +1,7 @@
use std
use thread
-use "test/util.use"
+use "util"
const Nherd = 20