Fixes in dealing with external libs.

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

diff --git a/projects/stargazer/plugin_runner.cpp b/projects/stargazer/plugin_runner.cpp
index 180713c0706aef614207e5a8eb949fb06e471978..eaf51058ccedc97a0999c8fee211142632edc8c1 100644 (file)
--- a/projects/stargazer/plugin_runner.cpp
+++ b/projects/stargazer/plugin_runner.cpp
@@ -16,219 +16,133 @@
 
 /*
  *    Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
 
 /*
  *    Author : Boris Mikhailenko <stg34@stargazer.dp.ua>

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

  */
 
  */
 

-/*
- $Revision: 1.17 $
- $Date: 2010/09/13 05:52:46 $
- $Author: faust $
- */
+#include "plugin_runner.h"
+
+#include "stg/common.h"

 
 #include <dlfcn.h>
 #include <unistd.h>
 
 #include <dlfcn.h>
 #include <unistd.h>

-#include <signal.h>
-
-#include "plugin_runner.h"
-#include "common.h"
-#include "conffiles.h"

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

-PLUGIN_RUNNER::PLUGIN_RUNNER(const string & pFileName,
+PLUGIN_RUNNER::PLUGIN_RUNNER(const std::string & fileName,

                              const MODULE_SETTINGS & ms,
                              const MODULE_SETTINGS & ms,

-                             ADMINS * a,
-                             TARIFFS * t,
-                             USERS * u,
-                             TRAFFCOUNTER * tc,
-                             BASE_STORE * st,
-                             const SETTINGS * s)
-    : pluginFileName(pFileName),
-      pluginSettingFileName(),
-      plugin(NULL),
-      isPluginLoaded(false),
-      errorStr(),
+                             ADMINS & admins,
+                             TARIFFS & tariffs,
+                             USERS & users,
+                             SERVICES & services,
+                             CORPORATIONS & corporations,
+                             TRAFFCOUNTER & traffcounter,
+                             STORE & store,
+                             const SETTINGS & settings)
+    : pluginFileName(fileName),

       libHandle(NULL),
       libHandle(NULL),

-      isRunning(false),
-      admins(a),
-      tariffs(t),
-      users(u),
-      store(st),
-      traffCnt(tc),
-      stgSettings(s),
-      modSettings(ms)
-{
-}
-//-----------------------------------------------------------------------------
-PLUGIN_RUNNER::PLUGIN_RUNNER(const PLUGIN_RUNNER & rvalue)
-    : pluginFileName(rvalue.pluginFileName),
-      pluginSettingFileName(rvalue.pluginSettingFileName),
-      plugin(rvalue.plugin),
-      isPluginLoaded(rvalue.isPluginLoaded),
-      errorStr(rvalue.errorStr),
-      libHandle(rvalue.libHandle),
-      isRunning(rvalue.isRunning),
-      admins(rvalue.admins),
-      tariffs(rvalue.tariffs),
-      users(rvalue.users),
-      store(rvalue.store),
-      traffCnt(rvalue.traffCnt),
-      stgSettings(rvalue.stgSettings),
-      modSettings(rvalue.modSettings)
-{
-}
-//-----------------------------------------------------------------------------
-PLUGIN_RUNNER & PLUGIN_RUNNER::operator=(const PLUGIN_RUNNER & rvalue)
+      m_plugin(Load(ms, admins, tariffs, users, services, corporations,
+                    traffcounter, store, settings))

 {
 {

-pluginFileName = rvalue.pluginFileName;
-pluginSettingFileName = rvalue.pluginSettingFileName;
-plugin = rvalue.plugin;
-isPluginLoaded = rvalue.isPluginLoaded;
-errorStr = rvalue.errorStr;
-libHandle = rvalue.libHandle;
-isRunning = rvalue.isRunning;
-admins = rvalue.admins;
-tariffs = rvalue.tariffs;
-users = rvalue.users;
-store = rvalue.store;
-traffCnt = rvalue.traffCnt;
-stgSettings = rvalue.stgSettings;
-modSettings = rvalue.modSettings;
-
-return *this;

 }
 //-----------------------------------------------------------------------------
 PLUGIN_RUNNER::~PLUGIN_RUNNER()
 {
 }
 //-----------------------------------------------------------------------------
 PLUGIN_RUNNER::~PLUGIN_RUNNER()
 {

-if (isPluginLoaded)
+if (dlclose(libHandle))

     {
     {

-    Unload();
+    errorStr = "Failed to unload plugin '" + pluginFileName + "': " + dlerror();
+    printfd(__FILE__, "PLUGIN_RUNNER::Unload() - %s", errorStr.c_str());

     }
     }

-
-isPluginLoaded = 0;
-}
-//-----------------------------------------------------------------------------
-BASE_PLUGIN * PLUGIN_RUNNER::GetPlugin()
-{
-return plugin;

 }
 //-----------------------------------------------------------------------------
 int PLUGIN_RUNNER::Start()
 {
 }
 //-----------------------------------------------------------------------------
 int PLUGIN_RUNNER::Start()
 {

-if (!isPluginLoaded)
-    if (Load())
-        return -1;
-
-plugin->SetTariffs(tariffs);
-plugin->SetAdmins(admins);
-plugin->SetUsers(users);
-plugin->SetTraffcounter(traffCnt);
-plugin->SetStore(store);
-plugin->SetStgSettings(stgSettings);
-
-if (plugin->Start())
-    {
-    errorStr = plugin->GetStrError();
-    return -1;
-    }
-return 0;
+int res = m_plugin.Start();
+errorStr = m_plugin.GetStrError();
+return res;

 }
 //-----------------------------------------------------------------------------
 int PLUGIN_RUNNER::Stop()
 {
 }
 //-----------------------------------------------------------------------------
 int PLUGIN_RUNNER::Stop()
 {

-plugin->Stop();
-
-//if (Unload())
-//    return -1;
-return 0;
+int res = m_plugin.Stop();
+errorStr = m_plugin.GetStrError();
+return res;

 }
 //-----------------------------------------------------------------------------
 int PLUGIN_RUNNER::Reload()
 {
 }
 //-----------------------------------------------------------------------------
 int PLUGIN_RUNNER::Reload()
 {

-int res = plugin->Reload();
-errorStr = plugin->GetStrError();
+int res = m_plugin.Reload();
+errorStr = m_plugin.GetStrError();

 return res;
 }
 //-----------------------------------------------------------------------------
 return res;
 }
 //-----------------------------------------------------------------------------

-bool PLUGIN_RUNNER::IsRunning()
+PLUGIN & PLUGIN_RUNNER::Load(const MODULE_SETTINGS & ms,
+                             ADMINS & admins,
+                             TARIFFS & tariffs,
+                             USERS & users,
+                             SERVICES & services,
+                             CORPORATIONS & corporations,
+                             TRAFFCOUNTER & traffcounter,
+                             STORE & store,
+                             const SETTINGS & settings)

 {
 {

-if (!isPluginLoaded)
-    return false;
-return plugin->IsRunning();
-}
-//-----------------------------------------------------------------------------
-int PLUGIN_RUNNER::Load()
-{
-if (!pluginFileName.size())
+if (pluginFileName.empty())
+    {
+    const std::string msg = "Empty plugin file name.";
+    printfd(__FILE__, "PLUGIN_RUNNER::Load() - %s\n", msg.c_str());
+    throw Error(msg);
+    }
+
+if (access(pluginFileName.c_str(), R_OK))

     {
     {

-    errorStr = "Plugin loading failed. No plugin";
-    printfd(__FILE__, "%s\n", errorStr.c_str());
-    return -1;
+    const std::string msg = "Plugin file '" + pluginFileName + "' is missing or inaccessible.";
+    printfd(__FILE__, "PLUGIN_RUNNER::Load() - %s\n", msg.c_str());
+    throw Error(msg);

     }
 
 libHandle = dlopen(pluginFileName.c_str(), RTLD_NOW);
 
 if (!libHandle)
     {
     }
 
 libHandle = dlopen(pluginFileName.c_str(), RTLD_NOW);
 
 if (!libHandle)
     {

-    errorStr = string("Plugin loading failed. ") + dlerror();
-    printfd(__FILE__, "%s\n", errorStr.c_str());
-    return -1;
+    std::string msg = "Error loading plugin '" + pluginFileName + "'";
+    const char* error = dlerror();
+    if (error)
+        msg = msg + ": '" + error + "'";
+    printfd(__FILE__, "PLUGIN_RUNNER::Load() - %s\n", msg.c_str());
+    throw Error(msg);

     }
 
     }
 

-BASE_PLUGIN * (*GetPlugin)();
-GetPlugin = (BASE_PLUGIN * (*)())dlsym(libHandle, "GetPlugin");
+PLUGIN * (*GetPlugin)();
+GetPlugin = (PLUGIN * (*)())dlsym(libHandle, "GetPlugin");

 if (!GetPlugin)
     {
 if (!GetPlugin)
     {

-    errorStr = string("GetPlugin() not found. ") + dlerror();
-    return -1;
+    const std::string msg = "Plugin '" + pluginFileName + "' does not have GetPlugin() function. ";
+    printfd(__FILE__, "PLUGIN_RUNNER::Load() - %s\n", msg.c_str());
+    throw Error(msg);

     }
     }

-plugin = GetPlugin();
-isPluginLoaded++;
+PLUGIN * plugin = GetPlugin();

 
 if (!plugin)
     {
 
 if (!plugin)
     {

-    errorStr = "Plugin was not created!";
-    printfd(__FILE__, "%s\n", errorStr.c_str());
-    return -1;
+    const std::string msg = "Failed to create an instance of plugin '" + pluginFileName + "'.";
+    printfd(__FILE__, "PLUGIN_RUNNER::Load() - %s\n", msg.c_str());
+    throw Error(msg);

     }
 
     }
 

-plugin->SetSettings(modSettings);
-printfd(__FILE__, "Plugin %s parsesettings\n", plugin->GetVersion().c_str());
+plugin->SetSettings(ms);
+plugin->SetTariffs(&tariffs);
+plugin->SetAdmins(&admins);
+plugin->SetUsers(&users);
+plugin->SetServices(&services);
+plugin->SetCorporations(&corporations);
+plugin->SetTraffcounter(&traffcounter);
+plugin->SetStore(&store);
+plugin->SetStgSettings(&settings);
+

 if (plugin->ParseSettings())
     {
 if (plugin->ParseSettings())
     {

-    errorStr = "Plugin \'" + plugin->GetVersion() + "\' error: " + plugin->GetStrError();
-    return -1;
+    const std::string msg = "Plugin '" + pluginFileName + "' is unable to parse settings. " + plugin->GetStrError();
+    printfd(__FILE__, "PLUGIN_RUNNER::Load() - %s\n", msg.c_str());
+    throw Error(msg);

     }
 
     }
 

-return 0;
-}
-//-----------------------------------------------------------------------------
-int PLUGIN_RUNNER::Unload()
-{
-if (isPluginLoaded)
-    {
-    if (dlclose(libHandle))
-        {
-        errorStr = dlerror();
-        printfd(__FILE__, "Error unloading plugin '%s': '%s'", pluginFileName.c_str(), dlerror());
-        return -1;
-        }
-    isPluginLoaded--;
-    }
-return 0;
+return *plugin;

 }
 }

-//-----------------------------------------------------------------------------
-const string & PLUGIN_RUNNER::GetStrError() const
-{
-return errorStr;
-}
-//-----------------------------------------------------------------------------
-uint16_t PLUGIN_RUNNER::GetStartPosition() const
-{
-return plugin->GetStartPosition();
-}
-//-----------------------------------------------------------------------------
-uint16_t PLUGIN_RUNNER::GetStopPosition() const
-{
-return plugin->GetStopPosition();
-}
-//-----------------------------------------------------------------------------
-