From cf9a801ebcb4df0a8b1ea75e58ca8ea8960ba13b Mon Sep 17 00:00:00 2001
From: Pixel <pixel@nobis-crew.org>
Date: Sun, 9 Oct 2011 22:58:44 -0700
Subject: Adding basic locks from libpthread. Also, that 'pending' loop belongs
 after we activate the tasks.

---
 src/TaskMan.cc | 27 +++++++++++++--------------
 src/Threads.cc | 13 +++++++++++++
 2 files changed, 26 insertions(+), 14 deletions(-)
 create mode 100644 src/Threads.cc

(limited to 'src')

diff --git a/src/TaskMan.cc b/src/TaskMan.cc
index a9ad709..fd0246f 100644
--- a/src/TaskMan.cc
+++ b/src/TaskMan.cc
@@ -33,21 +33,10 @@ void Balau::TaskMan::mainLoop() {
         // checking "STARTING" tasks, and running them once
         for (iH = m_tasks.begin(); iH != m_tasks.end(); iH++) {
             t = *iH;
-            if (t->getStatus() == Task::STARTING) {
+            if (t->getStatus() == Task::STARTING)
                 t->switchTo();
-            }
         }
 
-        // lock pending
-        // Adding tasks that were added, maybe from other threads
-        for (iL = m_pendingAdd.begin(); iL != m_pendingAdd.end(); iL++) {
-            t = *iL;
-            Assert(m_tasks.find(t) == m_tasks.end());
-            m_tasks.insert(t);
-        }
-        m_pendingAdd.clear();
-        // unlock pending
-
         ev_run(m_loop, EVRUN_ONCE);
 
         // let's check who got signaled, and call them
@@ -56,6 +45,16 @@ void Balau::TaskMan::mainLoop() {
             t->switchTo();
         }
 
+        m_pendingLock.enter();
+        // Adding tasks that were added, maybe from other threads
+        for (iL = m_pendingAdd.begin(); iL != m_pendingAdd.end(); iL++) {
+            t = *iL;
+            Assert(m_tasks.find(t) == m_tasks.end());
+            m_tasks.insert(t);
+        }
+        m_pendingAdd.clear();
+        m_pendingLock.leave();
+
         // Dealing with stopped and faulted tasks.
         // First by signalling the waiters.
         for (iH = m_tasks.begin(); iH != m_tasks.end(); iH++) {
@@ -93,9 +92,9 @@ void Balau::TaskMan::mainLoop() {
 }
 
 void Balau::TaskMan::registerTask(Balau::Task * t) {
-    // lock pending
+    m_pendingLock.enter();
     m_pendingAdd.push_back(t);
-    // unlock pending
+    m_pendingLock.leave();
 }
 
 void Balau::TaskMan::signalTask(Task * t) {
diff --git a/src/Threads.cc b/src/Threads.cc
new file mode 100644
index 0000000..7c928f8
--- /dev/null
+++ b/src/Threads.cc
@@ -0,0 +1,13 @@
+#include <Exceptions.h>
+#include <Threads.h>
+
+Balau::Lock::Lock() {
+    int r;
+    pthread_mutexattr_t attr;
+    r = pthread_mutexattr_init(&attr);
+    Assert(r == 0);
+    r = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
+    Assert(r == 0);
+    r = pthread_mutex_init(&m_lock, &attr);
+    Assert(r == 0);
+}
-- 
cgit v1.2.3