Changeset 959c82 for src/CodePatterns

Timestamp:

Oct 30, 2015, 11:43:20 AM (10 years ago)

Author:

Frederik Heber <heber@…>

Children:

1f96ec

Parents:

e24dde

git-author:

Frederik Heber <heber@…> (07/04/15 22:33:12)

git-committer:

Frederik Heber <heber@…> (10/30/15 11:43:20)

Message:

Extracted all static Observable maps (and mutex) into singleton GlobalObservableInfo.

• this way we may safely control is destruction, i.e. it is always valid as it boils down to a primitive void pointer which does not need to be destroyed or constructed.
• Minimized code where mutex is locked.

Location:

src/CodePatterns

Files:

• Cacheable.hpp (modified) (1 diff)
• ObservedValue.hpp (modified) (1 diff)
• Observer/GlobalObservableInfo.hpp (added)
• Observer/Observable.hpp (modified) (5 diffs)
• Observer/Relay.hpp (modified) (1 diff)

src/CodePatterns/Cacheable.hpp

@@ -197 +197 @@
     if (owner != NULL) {
       if (channels.empty()) {
-        owner->signOn(this,Observable::PriorityLevel(int(-20)));
+        owner->signOn(this,GlobalObservableInfo::PriorityLevel(int(-20)));
       } else {
         for (Observable::channels_t::const_iterator iter = channels.begin();
             iter != channels.end(); ++iter)
-          owner->signOn(this,*iter,Observable::PriorityLevel(int(-20)));
+          owner->signOn(this,*iter,GlobalObservableInfo::PriorityLevel(int(-20)));
       }
     }

src/CodePatterns/ObservedValue.hpp

@@ -151 +151 @@
   if ((owner != NULL) && (!signedOn)) {
     if (channels.empty()) {
-      owner->signOn(this,Observable::PriorityLevel(int(-20)));
+      owner->signOn(this,GlobalObservableInfo::PriorityLevel(int(-20)));
     } else {
       for (Observable::channels_t::const_iterator iter = channels.begin();

src/CodePatterns/Observer/Observable.hpp

@@ -18 +18 @@
 #include <string>
 #include <boost/function.hpp>
-#include <boost/thread.hpp>
 
 #include "CodePatterns/Range.hpp"
 #include "CodePatterns/Observer/defs.hpp"
+#include "CodePatterns/Observer/GlobalObservableInfo.hpp"
 #include "CodePatterns/Observer/Observer.hpp"
 
 class Graveyard;
+class scoped_lock;
 
 /**
@@ -48 +49 @@
   typedef std::vector<size_t> channels_t;
 
-  Observable(std::string _name, const channels_t &_channels = channels_t());
+  Observable(
+      std::string _name,
+      const channels_t &_channels = channels_t());
   virtual ~Observable();
-
-  /** This class is only used to distinguish from size_t in the overload.
-   *
-   * It encapsulates a const int (the priority level) and checks valid bounds
-   * in constructor.
-   *
-   */
-  class PriorityLevel {
-  public:
-    explicit PriorityLevel(const int i);
-    ~PriorityLevel();
-
-    const int level;
-  private:
-    static range<int> ValidRange;
-  };
 
 private:
@@ -92 +79 @@
    * ussually no need to order the update sequence.
    */
-  virtual void signOn(Observer *target, PriorityLevel priority = PriorityDefault) const;
+  virtual void signOn(
+      Observer * target,
+      GlobalObservableInfo::PriorityLevel priority = GlobalObservableInfo::PriorityDefault) const;
 
   /**
@@ -106 +95 @@
       Observer *target,
       size_t channelno,
-      PriorityLevel priority = PriorityDefault) const;
+      GlobalObservableInfo::PriorityLevel priority =
+          GlobalObservableInfo::PriorityDefault) const;
 
   /**
@@ -143 +133 @@
   static void enque_notification_internal(Observable *publisher, Notification_ptr notification);
 
+protected:
+
   typedef std::map<Observable*, Channels *> ChannelMap;
   static ChannelMap NotificationChannels;
-
-  static PriorityLevel PriorityDefault;
-
-protected:
-  typedef std::multimap<int,Observer*> callees_t;
-  typedef std::set<Notification*> notificationSet;
-  static std::map<Observable*, int> depth;
-  static std::map<Observable*,callees_t> callTable;
-  static std::map<Observable*,notificationSet> notifications;
-  static std::set<Observable*> busyObservables;
-
-  static boost::recursive_mutex ObservablesMapLock; //!< a lock for the pointer of the instance
 
 private:

src/CodePatterns/Observer/Relay.hpp

@@ -36 +36 @@
   virtual ~Relay();
 
-  virtual void signOn(Observer *target, PriorityLevel priority = Observable::PriorityDefault) const;
+  virtual void signOn(
+      Observer *target,
+      GlobalObservableInfo::PriorityLevel priority = GlobalObservableInfo::PriorityDefault) const;
 
   virtual void signOff(Observer *target) const;
 
-  virtual void signOn(Observer *target, size_t channelno, PriorityLevel priority = Observable::PriorityDefault) const;
+  virtual void signOn(
+      Observer *target,
+      size_t channelno,
+      GlobalObservableInfo::PriorityLevel priority = GlobalObservableInfo::PriorityDefault) const;
 
   virtual void signOff(Observer *target, size_t channelno) const;