From 9fa950ec53dc7428d2d4a20ba56a50c21d5606a5 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Sat, 4 Feb 2012 00:03:45 -0800 Subject: rt: Stop using atomic ops on rust_kernel::live_tasks These ops are all done within spitting distance of a suitable lock, so just protect it with the lock. --- src/rt/rust_kernel.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/rt/rust_kernel.cpp') diff --git a/src/rt/rust_kernel.cpp b/src/rt/rust_kernel.cpp index 367b76a9136..33191c2f553 100644 --- a/src/rt/rust_kernel.cpp +++ b/src/rt/rust_kernel.cpp @@ -84,25 +84,27 @@ rust_kernel::fail() { void rust_kernel::register_task(rust_task *task) { + int new_live_tasks; { scoped_lock with(task_lock); task->user.id = max_task_id++; task_table.put(task->user.id, task); + new_live_tasks = ++live_tasks; } K(srv, task->user.id != INTPTR_MAX, "Hit the maximum task id"); KLOG_("Registered task %" PRIdPTR, task->user.id); - int new_live_tasks = sync::increment(live_tasks); KLOG_("Total outstanding tasks: %d", new_live_tasks); } void rust_kernel::release_task_id(rust_task_id id) { KLOG_("Releasing task %" PRIdPTR, id); + int new_live_tasks; { scoped_lock with(task_lock); task_table.remove(id); + new_live_tasks = --live_tasks; } - int new_live_tasks = sync::decrement(live_tasks); KLOG_("Total outstanding tasks: %d", new_live_tasks); if (new_live_tasks == 0) { // There are no more tasks and there never will be. -- cgit 1.4.1-3-g733a5