Changeset c8cb0d for ThirdParty/CodePatterns/src/Observer

Timestamp:

Dec 26, 2025, 9:40:14 PM (2 days ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Candidate_v1.7.1, stable

Children:

033646

Parents:

f2d5ce

git-author:

Frederik Heber <frederik.heber@…> (12/10/25 16:15:28)

git-committer:

Frederik Heber <frederik.heber@…> (12/26/25 21:40:14)

Message:

Streamlines channel creation in Observables.

• CodePatterns is now version 1.3.4.
• we no longer need to add the channels manually in the cstor of a class that derives from Observable. Instead, we just need to pass the maximum number of channels (as they are typically enumerated anyway) and they are generated and added.
• added mutex protection when inserting.
• adjusted class Relay to forward similar convenience cstors.
• adjusted all call sites in molecuilder.

Location:

ThirdParty/CodePatterns/src/Observer

Files:

• Observable.cpp (modified) (3 diffs)
• Relay.cpp (modified) (1 diff)
• unittests/stubs/ObserverStub.cpp (modified) (2 diffs)

ThirdParty/CodePatterns/src/Observer/Observable.cpp

@@ -383 +383 @@
 }
 
-/** Constructor for class Observable.
- */
 Observable::Observable(
     std::string name,
@@ -405 +403 @@
     insertNotificationChannel( std::make_pair(static_cast<Observable *>(this), OurChannel) );
   }
+}
+
+Observable::Observable(
+    std::string name,
+    const unsigned int _maximum_notification_types) :
+  Observer(Observer::BaseConstructor()),
+  graveyard_informer(&noop_informer)
+{
+#ifdef LOG_OBSERVER
+  observerLog().addName(this,name);
+  observerLog().addMessage() << "++ Creating Observable "
+      << observerLog().getName(static_cast<Observable *>(this));
+#endif
+  createAndInsertNotificationChannel(_maximum_notification_types);
 }
 
@@ -459 +471 @@
 }
 
+void Observable::createAndInsertNotificationChannel(const unsigned int _maximum_notification_types)
+{
+  boost::recursive_mutex::scoped_lock lock(GlobalObservableInfo::getInstance().getObservablesMapMutex());
+  Channels *OurChannel = new Channels;
+  // add instance for each notification type
+  for (size_t type = 0; type < _maximum_notification_types; ++type)
+    OurChannel->addChannel(type);
+  insertNotificationChannel( std::make_pair(static_cast<Observable *>(this), OurChannel) );
+}
+
 void Observable::eraseNotificationChannel(Observable * const _target)
 {

ThirdParty/CodePatterns/src/Observer/Relay.cpp

@@ -33 +33 @@
 Relay::Relay(std::string name) :
   Observable(name),
+  Updater(NULL)
+{
+#ifdef LOG_OBSERVER
+  observerLog().addName(this,name);
+  observerLog().addMessage() << "++ Creating Relay " << observerLog().getName(this);
+#endif
+}
+
+/** Constructor for class Relay.
+ */
+Relay::Relay(std::string name, const channels_t &_channels) :
+  Observable(name, _channels),
+  Updater(NULL)
+{
+#ifdef LOG_OBSERVER
+  observerLog().addName(this,name);
+  observerLog().addMessage() << "++ Creating Relay " << observerLog().getName(this);
+#endif
+}
+
+/** Constructor for class Relay.
+ */
+Relay::Relay(std::string name, const unsigned int _maximum_notification_types) :
+  Observable(name, _maximum_notification_types),
   Updater(NULL)
 {

ThirdParty/CodePatterns/src/Observer/unittests/stubs/ObserverStub.cpp

@@ -133 +133 @@
 
 NotificationObservable::NotificationObservable() :
-  Observable("NotificationObservable")
-{
-  Channels *OurChannel = new Channels();
-  Observable::insertNotificationChannel( std::make_pair(this, OurChannel) );
-  OurChannel->addChannel(Operation1Notify);
-  OurChannel->addChannel(Operation2Notify);
-}
+  Observable("NotificationObservable", { Operation1Notify, Operation2Notify })
+{}
 
 NotificationObservable::~NotificationObservable()
@@ -242 +237 @@
 
 RelayNotification::RelayNotification() :
-    Relay(std::string("RelayTest"))
-{
-  Channels *OurChannel = new Channels();
-  Observable::insertNotificationChannel( std::make_pair(this, OurChannel) );
-  OurChannel->addChannel(NotificationObservable::Operation1Notify);
-  OurChannel->addChannel(NotificationObservable::Operation2Notify);
-}
+    Relay(std::string("RelayTest"), { NotificationObservable::Operation1Notify, NotificationObservable::Operation2Notify })
+{}
 
 RelayNotification::~RelayNotification()