---

yaml
---
r: 31605
b: refs/heads/dist-snap
c: ce6d651
h: refs/heads/master
i:
  31603: 22852c5
v: v3

Author: eholk

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: f76a46242b6a34ac09643ddf4050be9d1ad11573
+refs/heads/dist-snap: ce6d6511c7fb7f82d2890de578ef9bb28e410281
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/rt/rust_sched_driver.cpp

@@ -22,6 +22,18 @@ void
 rust_sched_driver::start_main_loop() {
     assert(sched_loop != NULL);
 
+#ifdef __APPLE__
+    {
+        char buf[64];
+        snprintf(buf, sizeof(buf), "scheduler loop %d", sched_loop->get_id());
+        // pthread_setname_np seems to have a different signature and
+        // different behavior on different platforms. Thus, this is
+        // only for Mac at the moment. There are equivalent versions
+        // for Linux that we can add if needed.
+        pthread_setname_np(buf);
+    }
+#endif
+
     rust_sched_loop_state state = sched_loop_state_keep_going;
     while (state != sched_loop_state_exit) {
         DLOG(sched_loop, dom, "pumping scheduler");

branches/dist-snap/src/rt/rust_sched_loop.h

@@ -130,6 +130,8 @@ struct rust_sched_loop
     // Called by tasks when they need a stack on which to run C code
     stk_seg *borrow_c_stack();
     void return_c_stack(stk_seg *stack);
+
+    int get_id() { return this->id; }
 };
 
 inline rust_log &