Changeset 454bc54 for src/CodePatterns/Observer

Timestamp:

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

Author:

Frederik Heber <heber@…>

Children:

e24dde

Parents:

1b5188

git-author:

Frederik Heber <heber@…> (06/19/15 22:28:24)

git-committer:

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

Message:

Added new pattern ObservedValue, contrary to Cacheable.

• essentially updates immediately and caches a value for off-line use, safe- guard with mutexes.
• added unit test for ObservedValue.
• factored threeNumbers stub out of CacheableUnitTest, also used the stub in ObservedValueUnitTest.
• we may now signOn() to Notification with a priority.
• Cacheable can also update now via notification channels not just for global updates.
• Observable can now also instantiate the channels directly if given a list. This was necessary as Cacheable or ObservedValue are instantiated in the constructor, too, and if listening to channels, these must already be present.
• FIX: Channels::addChannels() used NDEBUG wrong way round.
• ObservedValue::get() returns reference.

Location:

src/CodePatterns/Observer

Files:

• Notification.hpp (modified) (3 diffs)
• Observable.hpp (modified) (3 diffs)
• Relay.hpp (modified) (1 diff)

src/CodePatterns/Observer/Notification.hpp

@@ -15 +15 @@
 
 #include <set>
+
+#include <boost/thread/recursive_mutex.hpp>
 
 class Channels;
@@ -41 +43 @@
 protected:
 
-  void addObserver(Observer *target);
+  void addObserver(Observer *target, const int priority);
   void removeObserver(Observer *target);
 
@@ -73 +75 @@
 
 private:
-  typedef std::set<Observer*> targets_t;
+  typedef std::multimap<int,Observer*> targets_t;
   targets_t targets;
   const size_t channelno;
+
+  mutable boost::recursive_mutex TargetsLock; //!< a lock for the pointer of the instance
 };
 

src/CodePatterns/Observer/Observable.hpp

@@ -45 +45 @@
 class Observable : public Observer {
 public:
-  Observable(std::string _name);
+  //!> typedef for a vector of channels
+  typedef std::vector<size_t> channels_t;
+
+  Observable(std::string _name, const channels_t &_channels = channels_t());
   virtual ~Observable();
 
@@ -63 +66 @@
     static range<int> ValidRange;
   };
+
+private:
+  /** Helper class to create a unique increasing list.
+   *
+   */
+  struct UniqueNumber
+  {
+    int operator()()
+    { return value++; }
+    int value;
+  };
+
+public:
+  static channels_t getChannelList(const size_t max);
 
   /**
@@ -86 +103 @@
    * Sign on for specialized notifications
    */
-  virtual void signOn(Observer *target, size_t channelno) const;
+  virtual void signOn(
+      Observer *target,
+      size_t channelno,
+      PriorityLevel priority = PriorityDefault) const;
 
   /**

src/CodePatterns/Observer/Relay.hpp

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