Changeset 454bc54 for src/Observer/Observable.cpp

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.

File:

• src/Observer/Observable.cpp (modified) (8 diffs)

src/Observer/Observable.cpp

@@ -26 +26 @@
 #include "CodePatterns/Observer/defs.hpp"
 #include "CodePatterns/Observer/Notification.hpp"
+
+#include <algorithm>
 
 //!> This function does nothing with the given Observable
@@ -107 +109 @@
   ObservablesMapLock.lock();
   --depth[publisher];
-  ObservablesMapLock.unlock();
 #ifdef LOG_OBSERVER
   observerLog().addMessage(depth[publisher]) << "<< Unlocking " << observerLog().getName(publisher);
 #endif
-  ObservablesMapLock.lock();
   int depth_publisher = depth[publisher];
   ObservablesMapLock.unlock();
@@ -203 +203 @@
   // send out all notifications that need to be done
 
+  ObservablesMapLock.lock();
   notificationSet currentNotifications = notifications[this];
+  ObservablesMapLock.unlock();
   for(notificationSet::iterator it = currentNotifications.begin();
       it != currentNotifications.end();++it){
@@ -317 +319 @@
 }
 
-void Observable::signOn(Observer *target, size_t channelno) const
+void Observable::signOn(
+    Observer *target,
+    size_t channelno,
+    PriorityLevel priority) const
 {
   boost::recursive_mutex::scoped_lock guard(ObservablesMapLock);
@@ -326 +331 @@
       << "'s channel no." << channelno << ".";
 #endif
-  notification->addObserver(target);
+  notification->addObserver(target, priority.level);
 }
 
@@ -398 +403 @@
 /** Constructor for class Observable.
  */
-Observable::Observable(std::string name) :
+Observable::Observable(std::string name, const channels_t &_channels) :
   Observer(Observer::BaseConstructor()),
   graveyard_informer(&noop_informer)
@@ -407 +412 @@
       << observerLog().getName(static_cast<Observable *>(this));
 #endif
+
+  if (!_channels.empty()) {
+    Channels *OurChannel = new Channels;
+    NotificationChannels.insert( std::make_pair(static_cast<Observable *>(this), OurChannel) );
+    // add instance for each notification type
+    for (channels_t::const_iterator iter = _channels.begin();
+        iter != _channels.end(); ++iter)
+      OurChannel->addChannel(*iter);
+  }
 }
 
@@ -442 +456 @@
   }
 }
+
+Observable::channels_t Observable::getChannelList(const size_t max)
+{
+  channels_t channels(max);
+  std::generate(channels.begin(), channels.end(), UniqueNumber());
+  return channels;
+}