Remove extra debug.

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

diff --git a/projects/stargazer/plugin_runner.h b/projects/stargazer/plugin_runner.h
index 95ddd6809a90dde98ff7929f744cdc25c55edaf4..1c8bf422bb0b15d8a2381cb60959d9c06923eae3 100644 (file)
--- a/projects/stargazer/plugin_runner.h
+++ b/projects/stargazer/plugin_runner.h
@@ -16,78 +16,81 @@
 
 /*
  *    Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
 
 /*
  *    Author : Boris Mikhailenko <stg34@stargazer.dp.ua>

+ *    Author : Maxim Mamontov <faust@stargazer.dp.ua>

  */
 
  */
 

-/*
- $Revision: 1.13 $
- $Date: 2010/03/04 12:22:41 $
- $Author: faust $
- */
-
-#ifndef PLUGIN_RUNNER_H
-#define PLUGIN_RUNNER_H
+#pragma once

 
 

-#include <pthread.h>
+#include "stg/plugin.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 <stdexcept>
+#include <cstdint>
+
+namespace STG
+{
+
+struct ModuleSettings;
+struct Settings;
+struct Admins;
+struct Tariffs;
+struct Users;
+struct Services;
+struct Corporations;
+struct TraffCounter;
+struct Store;

 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-class PLUGIN_RUNNER {
+class PluginRunner {

 public:
 public:

-    PLUGIN_RUNNER(const std::string & pluginFileName,
-                  const MODULE_SETTINGS & ms,
-                  ADMINS * admins,
-                  TARIFFS * tariffs,
-                  USERS * users,
-                  TRAFFCOUNTER * tc,
-                  STORE * store,
-                  const SETTINGS * s);
-    PLUGIN_RUNNER(const PLUGIN_RUNNER & rvalue);
-    ~PLUGIN_RUNNER();
-
-    PLUGIN_RUNNER & operator=(const PLUGIN_RUNNER & rvalue);
+    struct Error : public std::runtime_error {
+        explicit Error(const std::string & msg) : runtime_error(msg) {}
+    };
+
+    PluginRunner(const std::string& pluginFileName,
+                 const std::string& pluginName,
+                 const ModuleSettings& ms,
+                 Admins& admins,
+                 Tariffs& tariffs,
+                 Users& users,
+                 Services& services,
+                 Corporations& corporations,
+                 TraffCounter& traffcounter,
+                 Store& store,
+                 const Settings & settings);
+    ~PluginRunner();

 
     int             Start();
     int             Stop();
 
     int             Start();
     int             Stop();

-    int             Reload();
+    int             Reload(const ModuleSettings& ms);

     int             Restart();
     int             Restart();

-    bool            IsRunning();
+    bool            IsRunning() { return m_plugin.IsRunning(); }

 
 

-    const std::string & GetStrError() const;
-    PLUGIN *        GetPlugin();
-    const std::string & GetFileName() const { return pluginFileName; }
+    const std::string& GetStrError() const { return errorStr; }
+    Plugin& GetPlugin() { return m_plugin; }
+    const std::string& GetFileName() const { return pluginFileName; }
+    const std::string& GetName() const { return pluginName; }

 
 

-    int             Load();
-    int             Unload();
-
-    uint16_t        GetStartPosition() const;
-    uint16_t        GetStopPosition() const;
+    uint16_t        GetStartPosition() const { return m_plugin.GetStartPosition(); }
+    uint16_t        GetStopPosition() const { return m_plugin.GetStopPosition(); }

 
 private:
 
 private:

-    std::string     pluginFileName;
-    std::string     pluginSettingFileName;
-
-    PLUGIN *        plugin;
-    int             isPluginLoaded;
-    std::string     errorStr;
-
-    void *          libHandle;
-    bool            isRunning;
-
-    ADMINS *        admins;
-    TARIFFS *       tariffs;
-    USERS *         users;
-    STORE *         store;
-    TRAFFCOUNTER *  traffCnt;
-    const SETTINGS * stgSettings;
-    MODULE_SETTINGS modSettings;
+    Plugin & load(const ModuleSettings& ms,
+                  Admins& admins,
+                  Tariffs& tariffs,
+                  Users& users,
+                  Services& services,
+                  Corporations& corporations,
+                  TraffCounter& traffcounter,
+                  Store& store,
+                  const Settings& settings);
+
+    std::string pluginFileName;
+    std::string pluginName;
+    void*       libHandle;
+
+    Plugin&     m_plugin;
+    std::string errorStr;

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

-#endif //PLUGIN_RUNNER_H
+}