Changeset 6015 for branches/newapi

Timestamp:

01/11/08 05:28:58 (11 months ago)

Author:

erijo

Message:

Moved starting and stopping of plugin instances to the PluginInstance? class.

Location:

branches/newapi/licq/src/plugin

Files:

• plugininstance.h (modified) (2 diffs)
• plugininstanceimpl.cpp (modified) (5 diffs)
• plugininstanceimpl.h (modified) (3 diffs)

branches/newapi/licq/src/plugin/plugininstance.h

@@ -21 +21 @@
 #define LICQDAEMON_PLUGININSTANCE_H
 
+#include "licq/event/event.h"
 #include "licq/interface/plugin.h"
 
@@ -40 +41 @@
 {
 public:
+  enum State
+  {
+    StateNotLoaded,
+    StateLoaded,
+    StateStarted,
+    StateStopping,
+    StateStopped
+  };
+
   virtual Licq::Plugin::Id load(int argc, char** argv) = 0;
+
+  virtual void start() = 0;
+  virtual void initiateStop(Licq::Event::Ptr stopEvent) = 0;
+  virtual void completeStop(bool force) = 0;
+
+  virtual State getState() const = 0;
 
   virtual Licq::Plugin::Id getPluginId() const = 0;

branches/newapi/licq/src/plugin/plugininstanceimpl.cpp

@@ -28 +28 @@
 
 #include <cassert>
+#include <csignal>
 #include <cstring>
 
@@ -45 +46 @@
   : myInformation(info),
     myLibrary(library),
+    myState(StateNotLoaded),
     myPlugin(NULL),
     myThread(NULL),
@@ -54 +56 @@
 LicqDaemon::PluginInstanceImpl::~PluginInstanceImpl()
 {
-  assert(myThread->getState() != Licq::Thread::StateRunning);
+  assert(myState != StateStarted && myState != StateStopping);
+
   delete myThread;
 
-  myLibrary->destroyPlugin(myPlugin);
-  myPlugin = NULL;
+  if (myPlugin != NULL)
+  {
+    myLibrary->destroyPlugin(myPlugin);
+    myPlugin = NULL;
+  }
 
   // Cleanup mySetup
@@ -71 +77 @@
 Licq::Plugin::Id LicqDaemon::PluginInstanceImpl::load(int argc, char** argv)
 {
-  assert(myPlugin == NULL);
+  assert(myState == StateNotLoaded);
 
   // Set up argc and argv for the plugin
@@ -98 +104 @@
   }
 
-  // Create the thread
+  myState = StateLoaded;
   myThread = new Licq::Thread(myPlugin);
 
   return mySetup.id;
 }
+
+void LicqDaemon::PluginInstanceImpl::start()
+{
+  assert(myState == StateLoaded);
+  myThread->start();
+  myState = StateStarted;
+}
+
+void LicqDaemon::PluginInstanceImpl::initiateStop(Licq::Event::Ptr stopEvent)
+{
+  assert(myState == StateStarted);
+  mySetup.eventQueue->push(stopEvent);
+  myState = StateStopping;
+}
+
+void LicqDaemon::PluginInstanceImpl::completeStop(bool force)
+{
+  assert(myState == StateStopping);
+
+  if (force)
+    myThread->kill(SIGTERM);
+  myThread->join();
+
+  myState = StateStopped;
+}

branches/newapi/licq/src/plugin/plugininstanceimpl.h

@@ -52 +52 @@
   Licq::Plugin::Id load(int argc, char** argv);
 
+  void start();
+  void initiateStop(Licq::Event::Ptr stopEvent);
+  void completeStop(bool force);
+
+  State getState() const;
+
   /**
    * @returns This plugin instance's plugin information.
@@ -84 +90 @@
   Licq::Plugin::Information::Ptr myInformation;
   boost::shared_ptr<PluginLibrary> myLibrary;
+  State myState;
 
   Licq::Plugin::Setup mySetup;
@@ -94 +101 @@
 
 } // namespace LicqDaemon
+
+inline LicqDaemon::PluginInstance::State
+LicqDaemon::PluginInstanceImpl::getState() const
+{
+  return myState;
+}
 
 inline Licq::Plugin::Id LicqDaemon::PluginInstanceImpl::getPluginId() const