diff options
| author | Eric Reed <ereed@mozilla.com> | 2013-06-17 12:45:40 -0700 |
|---|---|---|
| committer | Eric Reed <ereed@mozilla.com> | 2013-06-17 12:45:40 -0700 |
| commit | 35f3fa6383b5ed278879bfe5c74a913b885a2d4f (patch) | |
| tree | be8ca61c0beccd0b4c5d1e486c5322c1181c49f5 /src/rt/rust_kernel.cpp | |
| parent | 33ae193a3c1a156e73bf6880366c9785dd4b7393 (diff) | |
| parent | 319cf6e465f203c794d71800808c2bd60a1e7613 (diff) | |
| download | rust-35f3fa6383b5ed278879bfe5c74a913b885a2d4f.tar.gz rust-35f3fa6383b5ed278879bfe5c74a913b885a2d4f.zip | |
Merge remote-tracking branch 'upstream/io' into io
Conflicts: src/libstd/rt/uvio.rs
Diffstat (limited to 'src/rt/rust_kernel.cpp')
| -rw-r--r-- | src/rt/rust_kernel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rt/rust_kernel.cpp b/src/rt/rust_kernel.cpp index bf48554696e..c1c40222f1a 100644 --- a/src/rt/rust_kernel.cpp +++ b/src/rt/rust_kernel.cpp @@ -162,7 +162,7 @@ rust_kernel::release_scheduler_id(rust_sched_id id) { } /* -Called by rust_sched_reaper to join every every terminating scheduler thread, +Called by rust_sched_reaper to join every terminating scheduler thread, so that we can be sure they have completely exited before the process exits. If we don't join them then we can see valgrind errors due to un-freed pthread memory. |