Ticket #223: 4e4e2b7e8ab5.patch

lemon/CMakeLists.txt

@@ -12 +12 @@
   arg_parser.cc
   base.cc
   color.cc
+  lock.cc
   lp_base.cc
   lp_skeleton.cc
   random.cc

lemon/Makefile.am

@@ -11 +11 @@
         lemon/arg_parser.cc \
         lemon/base.cc \
         lemon/color.cc \
+        lemon/lock.cc \
         lemon/lp_base.cc \
         lemon/lp_skeleton.cc \
         lemon/random.cc \
@@ -93 +94 @@
         lemon/lgf_reader.h \
         lemon/lgf_writer.h \
         lemon/list_graph.h \
+        lemon/lock.h \
         lemon/lp.h \
         lemon/lp_base.h \
         lemon/lp_skeleton.h \

lemon/bits/alteration_notifier.h

@@ -23 +23 @@
 #include <list>
 
 #include <lemon/core.h>
+#include <lemon/lock.h>
 
 //\ingroup graphbits
 //\file
@@ -251 +252 @@
 
     typedef std::list<ObserverBase*> Observers;
     Observers _observers;
+    Lock *_lock;
 
 
   public:
@@ -260 +262 @@
     // The default constructor of the AlterationNotifier.
     // It creates an empty notifier.
     AlterationNotifier()
-      : container(0) {}
+      : container(0) {
+      _lock = LockFactory::createDefaultLock();
+    }
 
     // \brief Constructor.
     //
     // Constructor with the observed container parameter.
     AlterationNotifier(const Container& _container)
-      : container(&_container) {}
+      : container(&_container) {
+      _lock = LockFactory::createDefaultLock();
+    }
 
     // \brief Copy Constructor of the AlterationNotifier.
     //
@@ -274 +280 @@
     // It creates only an empty notifier because the copiable
     // notifier's observers have to be registered still into that notifier.
     AlterationNotifier(const AlterationNotifier& _notifier)
-      : container(_notifier.container) {}
+      : container(_notifier.container) {
+      _lock = LockFactory::createDefaultLock();
+    }
 
     // \brief Destructor.
     //
@@ -284 +292 @@
       for (it = _observers.begin(); it != _observers.end(); ++it) {
         (*it)->_notifier = 0;
       }
+      delete _lock;
     }
 
     // \brief Sets the container.
@@ -332 +341 @@
   protected:
 
     void attach(ObserverBase& observer) {
+      if (_lock) _lock->lock();
       observer._index = _observers.insert(_observers.begin(), &observer);
       observer._notifier = this;
+      if (_lock) _lock->unlock();
     }
 
     void detach(ObserverBase& observer) {
+      if (_lock) _lock->lock();
       _observers.erase(observer._index);
       observer._index = _observers.end();
       observer._notifier = 0;
+      if (_lock) _lock->unlock();
     }
 
   public:

new file lemon/lock.cc

@@ +1 @@
+#include <lemon/lock.h>
+
+namespace lemon {
+  const LockFactory* LockFactory::_factory = 0;
+}

new file lemon/lock.h

@@ +1 @@
+// -*- C++ -*-
+
+#ifndef LEMON_LOCK_H
+#define LEMON_LOCK_H
+
+#include <pthread.h>
+
+namespace lemon {
+  
+  class Lock {
+  public:
+    virtual void lock() = 0;
+    virtual void unlock() = 0;
+    virtual ~Lock() {}
+  };
+  
+  class LockFactory {    
+  private:
+    static const LockFactory* _factory;
+  public:
+    
+    static void setDefaultFactory(const LockFactory *factory) {
+      if (_factory) delete _factory;
+      _factory = factory;
+    }
+    
+    static const LockFactory* defaultFactory() {
+      return _factory;
+    }
+
+    static Lock* createDefaultLock() {
+      if (_factory == 0) return 0;
+      else return _factory->createLock();
+    }
+    
+    virtual Lock* createLock() const = 0;
+    virtual ~LockFactory() {}
+  };
+
+  class PThreadLock : public Lock {
+  private:
+    pthread_mutex_t _mutex;
+  public:
+    PThreadLock() {
+      pthread_mutex_init(&_mutex, 0);
+    }
+    virtual void lock() {
+      pthread_mutex_lock(&_mutex);      
+    }
+    virtual void unlock() {
+      pthread_mutex_unlock(&_mutex);      
+    }
+  };
+
+  class PThreadLockFactory : public LockFactory {
+  public:
+    virtual PThreadLock* createLock() const {
+      return new PThreadLock();
+    }
+  };
+}
+
+#endif