Replaced API functor with API function.

[stg.git] / projects / stargazer / plugin_runner.h

diff --git a/projects/stargazer/plugin_runner.h b/projects/stargazer/plugin_runner.h
index 95ddd6809a90dde98ff7929f744cdc25c55edaf4..8e2272bfb1cf9ba84a9d08d3a4a8c1425c010310 100644 (file)
--- a/projects/stargazer/plugin_runner.h
+++ b/projects/stargazer/plugin_runner.h
@@ -27,28 +27,34 @@
 #ifndef PLUGIN_RUNNER_H
 #define PLUGIN_RUNNER_H
 
 #ifndef PLUGIN_RUNNER_H
 #define PLUGIN_RUNNER_H
 

-#include <pthread.h>
-

 #include <string>
 
 #include <string>
 

-#include "plugin.h"
-#include "module_settings.h"
-#include "traffcounter.h"
-#include "tariffs.h"
-#include "admins.h"
-#include "users.h"
+#include "stg/module_settings.h"
+#include "stg/plugin.h"
+#include "stg/os_int.h"
+
+class SETTINGS_IMPL;
+class ADMINS_IMPL;
+class TARIFFS_IMPL;
+class USERS_IMPL;
+class SERVICES_IMPL;
+class CORPORATIONS_IMPL;
+class TRAFFCOUNTER;
+class STORE;

 
 //-----------------------------------------------------------------------------
 class PLUGIN_RUNNER {
 public:
     PLUGIN_RUNNER(const std::string & pluginFileName,
                   const MODULE_SETTINGS & ms,
 
 //-----------------------------------------------------------------------------
 class PLUGIN_RUNNER {
 public:
     PLUGIN_RUNNER(const std::string & pluginFileName,
                   const MODULE_SETTINGS & ms,

-                  ADMINS * admins,
-                  TARIFFS * tariffs,
-                  USERS * users,
+                  ADMINS_IMPL * admins,
+                  TARIFFS_IMPL * tariffs,
+                  USERS_IMPL * users,
+                  SERVICES_IMPL * services,
+                  CORPORATIONS_IMPL * corporations,

                   TRAFFCOUNTER * tc,
                   STORE * store,
                   TRAFFCOUNTER * tc,
                   STORE * store,

-                  const SETTINGS * s);
+                  const SETTINGS_IMPL * s);

     PLUGIN_RUNNER(const PLUGIN_RUNNER & rvalue);
     ~PLUGIN_RUNNER();
 
     PLUGIN_RUNNER(const PLUGIN_RUNNER & rvalue);
     ~PLUGIN_RUNNER();
 


@@ -60,33 +66,35 @@ public:
     int             Restart();
     bool            IsRunning();
 
     int             Restart();
     bool            IsRunning();
 

-    const std::string & GetStrError() const;
+    const std::string & GetStrError() const { return errorStr; }

     PLUGIN *        GetPlugin();
     const std::string & GetFileName() const { return pluginFileName; }
 
     int             Load();
     int             Unload();
 
     PLUGIN *        GetPlugin();
     const std::string & GetFileName() const { return pluginFileName; }
 
     int             Load();
     int             Unload();
 

-    uint16_t        GetStartPosition() const;
-    uint16_t        GetStopPosition() const;
+    uint16_t        GetStartPosition() const { return plugin->GetStartPosition(); }
+    uint16_t        GetStopPosition() const { return plugin->GetStopPosition(); }

 
 private:
     std::string     pluginFileName;
     std::string     pluginSettingFileName;
 
     PLUGIN *        plugin;
 
 private:
     std::string     pluginFileName;
     std::string     pluginSettingFileName;
 
     PLUGIN *        plugin;

-    int             isPluginLoaded;
+    bool            isPluginLoaded;

     std::string     errorStr;
 
     void *          libHandle;
     bool            isRunning;
 
     std::string     errorStr;
 
     void *          libHandle;
     bool            isRunning;
 

-    ADMINS *        admins;
-    TARIFFS *       tariffs;
-    USERS *         users;
+    ADMINS_IMPL *   admins;
+    TARIFFS_IMPL *  tariffs;
+    USERS_IMPL *    users;
+    SERVICES_IMPL * services;
+    CORPORATIONS_IMPL * corps;

     STORE *         store;
     TRAFFCOUNTER *  traffCnt;
     STORE *         store;
     TRAFFCOUNTER *  traffCnt;

-    const SETTINGS * stgSettings;
+    const SETTINGS_IMPL * stgSettings;

     MODULE_SETTINGS modSettings;
 };
 //-----------------------------------------------------------------------------
     MODULE_SETTINGS modSettings;
 };
 //-----------------------------------------------------------------------------