---

yaml
---
r: 7974
b: refs/heads/snap-stage3
c: 5c89938
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: d24eb58a094b73f1b22cdc7ea5087b59f1d1b574
+refs/heads/snap-stage3: 5c8993854495a35a182182b00d472e08be796a6b
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/snap-stage3/mk/rt.mk

@@ -50,7 +50,6 @@ RUNTIME_CS_$(1) := \
               rt/rust_uv.cpp \
               rt/rust_uvtmp.cpp \
               rt/rust_log.cpp \
-              rt/rust_timer.cpp \
               rt/circular_buffer.cpp \
               rt/isaac/randport.cpp \
               rt/rust_srv.cpp \

branches/snap-stage3/src/rt/rust_internal.h

@@ -220,27 +220,6 @@ template <typename T> class ptr_vec : public task_owned<ptr_vec<T> > {
 #include "rust_kernel.h"
 #include "rust_scheduler.h"
 
-struct rust_timer {
-    // FIXME: This will probably eventually need replacement
-    // with something more sophisticated and integrated with
-    // an IO event-handling library, when we have such a thing.
-    // For now it's just the most basic "thread that can interrupt
-    // its associated domain-thread" device, so that we have
-    // *some* form of task-preemption.
-    rust_scheduler *sched;
-    uintptr_t exit_flag;
-
-#if defined(__WIN32__)
-    HANDLE thread;
-#else
-    pthread_attr_t attr;
-    pthread_t thread;
-#endif
-
-    rust_timer(rust_scheduler *sched);
-    ~rust_timer();
-};
-
 typedef void CDECL (glue_fn)(void *, void *,
                              const type_desc **, void *);
 typedef void CDECL (cmp_glue_fn)(void *, void *,

branches/snap-stage3/src/rt/rust_scheduler.cpp

@@ -244,13 +244,6 @@ void
 rust_scheduler::start_main_loop() {
     lock.lock();
 
-    // Make sure someone is watching, to pull us out of infinite loops.
-    //
-    // FIXME: time-based interruption is not presently working; worked
-    // in rustboot and has been completely broken in rustc.
-    //
-    // rust_timer timer(this);
-
     DLOG(this, dom, "started domain loop %d", id);
 
     while (kernel->live_tasks > 0) {