Initialize some fields via initializer lists in USER_IMPL and

[stg.git] / projects / stargazer / plugins / other / smux / smux.h

diff --git a/projects/stargazer/plugins/other/smux/smux.h b/projects/stargazer/plugins/other/smux/smux.h
index 1b1ee96e21584c18fd2662f05e1980bcfdbf5f88..7337deaff6a558ddf0c42b3a8dd915a6c8d84db6 100644 (file)
--- a/projects/stargazer/plugins/other/smux/smux.h
+++ b/projects/stargazer/plugins/other/smux/smux.h
@@ -13,6 +13,8 @@
 #include "stg/os_int.h"
 #include "stg/plugin.h"
 #include "stg/module_settings.h"
 #include "stg/os_int.h"
 #include "stg/plugin.h"
 #include "stg/module_settings.h"

+#include "stg/notifer.h"
+#include "stg/noncopyable.h"

 
 #include "sensors.h"
 #include "tables.h"
 
 #include "sensors.h"
 #include "tables.h"


@@ -55,20 +57,40 @@ private:
 //-----------------------------------------------------------------------------
 class CHG_AFTER_NOTIFIER : public PROPERTY_NOTIFIER_BASE<std::string> {
 public:
 //-----------------------------------------------------------------------------
 class CHG_AFTER_NOTIFIER : public PROPERTY_NOTIFIER_BASE<std::string> {
 public:

-                CHG_AFTER_NOTIFIER(SMUX & s, const USER_PTR & u) : smux(s), userPtr(u) {}
-    void        Notify(const std::string &, const std::string &);
+             CHG_AFTER_NOTIFIER(SMUX & s, const USER_PTR & u) : smux(s), userPtr(u) {}
+             CHG_AFTER_NOTIFIER(const CHG_AFTER_NOTIFIER & rvalue) : smux(rvalue.smux), userPtr(rvalue.userPtr) {}
+    void     Notify(const std::string &, const std::string &);

 
 

-    USER_PTR    GetUserPtr() { return userPtr; }
+    USER_PTR GetUserPtr() { return userPtr; }

 
 private:
 
 private:

+    CHG_AFTER_NOTIFIER & operator=(const CHG_AFTER_NOTIFIER & rvalue);

     SMUX & smux;
     USER_PTR userPtr;
 };
 //-----------------------------------------------------------------------------
     SMUX & smux;
     USER_PTR userPtr;
 };
 //-----------------------------------------------------------------------------

-class ADD_DEL_USER_NOTIFIER : public NOTIFIER_BASE<USER_PTR> {
+class ADD_DEL_TARIFF_NOTIFIER : public NOTIFIER_BASE<TARIFF_DATA>, private NONCOPYABLE {

 public:
 public:

-                ADD_DEL_USER_NOTIFIER(SMUX & s) : smux(s) {}
-    void        Notify(const USER_PTR &);
+         ADD_DEL_TARIFF_NOTIFIER(SMUX & s) : smux(s) {}
+    void Notify(const TARIFF_DATA &);
+
+private:
+    SMUX & smux;
+};
+//-----------------------------------------------------------------------------
+class ADD_USER_NOTIFIER : public NOTIFIER_BASE<USER_PTR>, private NONCOPYABLE {
+public:
+         ADD_USER_NOTIFIER(SMUX & s) : smux(s) {}
+    void Notify(const USER_PTR &);
+
+private:
+    SMUX & smux;
+};
+//-----------------------------------------------------------------------------
+class DEL_USER_NOTIFIER : public NOTIFIER_BASE<USER_PTR>, private NONCOPYABLE {
+public:
+         DEL_USER_NOTIFIER(SMUX & s) : smux(s) {}
+    void Notify(const USER_PTR &);

 
 private:
     SMUX & smux;
 
 private:
     SMUX & smux;


@@ -90,7 +112,7 @@ public:
 
     int Start();
     int Stop();
 
     int Start();
     int Stop();

-    int Reload() { return 0; }
+    int Reload();

     bool IsRunning() { return running && !stopped; }
 
     const std::string & GetStrError() const { return errorStr; }
     bool IsRunning() { return running && !stopped; }
 
     const std::string & GetStrError() const { return errorStr; }


@@ -100,7 +122,13 @@ public:
 
     bool UpdateTables();
 
 
     bool UpdateTables();
 

+    void SetNotifier(USER_PTR userPtr);
+    void UnsetNotifier(USER_PTR userPtr);
+

 private:
 private:

+    SMUX(const SMUX & rvalue);
+    SMUX & operator=(const SMUX & rvalue);
+

     static void * Runner(void * d);
     void Run();
     bool PrepareNet();
     static void * Runner(void * d);
     void Run();
     bool PrepareNet();


@@ -143,10 +171,32 @@ private:
     Tables tables;
 
     std::list<CHG_AFTER_NOTIFIER> notifiers;
     Tables tables;
 
     std::list<CHG_AFTER_NOTIFIER> notifiers;

-    ADD_DEL_USER_NOTIFIER addDelNotifier;
+    ADD_USER_NOTIFIER addUserNotifier;
+    DEL_USER_NOTIFIER delUserNotifier;
+    ADD_DEL_TARIFF_NOTIFIER addDelTariffNotifier;

 };
 //-----------------------------------------------------------------------------
 
 };
 //-----------------------------------------------------------------------------
 

+inline
+void ADD_DEL_TARIFF_NOTIFIER::Notify(const TARIFF_DATA &)
+{
+smux.UpdateTables();
+}
+
+inline
+void ADD_USER_NOTIFIER::Notify(const USER_PTR & userPtr)
+{
+smux.SetNotifier(userPtr);
+smux.UpdateTables();
+}
+
+inline
+void DEL_USER_NOTIFIER::Notify(const USER_PTR & userPtr)
+{
+smux.UnsetNotifier(userPtr);
+smux.UpdateTables();
+}
+

 extern "C" PLUGIN * GetPlugin();
 
 #endif
 extern "C" PLUGIN * GetPlugin();
 
 #endif