aboutsummaryrefslogtreecommitdiff
path: root/src/Makefile
diff options
context:
space:
mode:
authorMichael Bebenita <[email protected]>2010-07-19 14:05:18 -0700
committerMichael Bebenita <[email protected]>2010-07-19 14:05:18 -0700
commit00d1465d13980fc3acf650f182ee0723fbda0e06 (patch)
treea73cf5f0f20c0bee6722b33d975eb930919fefdf /src/Makefile
parentAdd a test for an obvious-seeming (but not actually legal) kind of cast attem... (diff)
downloadrust-00d1465d13980fc3acf650f182ee0723fbda0e06.tar.xz
rust-00d1465d13980fc3acf650f182ee0723fbda0e06.zip
Added a message passing system based on lock free queues for inter-thread communication. Channels now buffer on the sending side, and no longer require blocking when sending. Lots of other refactoring and bug fixes.
Diffstat (limited to 'src/Makefile')
-rw-r--r--src/Makefile23
1 files changed, 20 insertions, 3 deletions
diff --git a/src/Makefile b/src/Makefile
index d94e3e25..4449418e 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -244,7 +244,10 @@ BOOT_CMXS := $(BOOT_MLS:.ml=.cmx)
BOOT_OBJS := $(BOOT_MLS:.ml=.o)
BOOT_CMIS := $(BOOT_MLS:.ml=.cmi)
-RUNTIME_CS := rt/rust.cpp \
+RUNTIME_CS := rt/sync/spin_lock.cpp \
+ rt/sync/lock_free_queue.cpp \
+ rt/sync/condition_variable.cpp \
+ rt/rust.cpp \
rt/rust_builtin.cpp \
rt/rust_crate.cpp \
rt/rust_crate_cache.cpp \
@@ -256,12 +259,19 @@ RUNTIME_CS := rt/rust.cpp \
rt/rust_upcall.cpp \
rt/rust_log.cpp \
rt/rust_timer.cpp \
+ rt/circular_buffer.cpp \
rt/isaac/randport.cpp
-RUNTIME_HDR := rt/rust.h \
+RUNTIME_HDR := rt/globals.h \
+ rt/rust.h \
rt/rust_dwarf.h \
rt/rust_internal.h \
- rt/rust_util.h
+ rt/rust_util.h \
+ rt/rust_chan.h \
+ rt/rust_dom.h \
+ rt/rust_task.h \
+ rt/rust_proxy.h \
+ rt/circular_buffer.h
RUNTIME_INCS := -Irt/isaac -Irt/uthash
RUNTIME_OBJS := $(RUNTIME_CS:.cpp=$(CFG_OBJ_SUFFIX))
@@ -363,6 +373,8 @@ TEST_XFAILS_X86 := $(MUT_BOX_XFAILS) \
test/run-pass/task-comm.rs \
test/run-pass/vec-alloc-append.rs \
test/run-pass/vec-slice.rs \
+ test/run-pass/task-comm-3.rs \
+ test/run-pass/task-comm-4.rs \
test/compile-fail/bad-recv.rs \
test/compile-fail/bad-send.rs \
test/compile-fail/infinite-tag-type-recursion.rs \
@@ -452,6 +464,11 @@ TEST_XFAILS_LLVM := $(addprefix test/run-pass/, \
tail-cps.rs \
tail-direct.rs \
task-comm.rs \
+ task-comm-0.rs \
+ task-comm-1.rs \
+ task-comm-2.rs \
+ task-comm-3.rs \
+ task-comm-4.rs \
threads.rs \
tup.rs \
type-sizes.rs \