Changeset 6013 for branches/newapi

Timestamp:

01/11/08 03:39:55 (11 months ago)

Author:

erijo

Message:

Don't kill the plugin's thread in PluginInstance?'s dtor. Will do that in PluginManager? instead.

Files:

• branches/newapi/licq/src/plugin/plugininstanceimpl.cpp (modified) (3 diffs)

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

@@ -29 +29 @@
 #include <cassert>
 #include <cstring>
-#include <signal.h>
 
 static Licq::Plugin::Id getNextPluginId()
@@ -41 +40 @@
 
 LicqDaemon::PluginInstanceImpl::
-PluginInstanceImpl(boost::shared_ptr<const Licq::Plugin::Information> info,
+PluginInstanceImpl(Licq::Plugin::Information::Ptr info,
                    boost::shared_ptr<PluginLibrary> library,
                    Licq::LogSink& sink)
@@ -55 +54 @@
 LicqDaemon::PluginInstanceImpl::~PluginInstanceImpl()
 {
-  if (myThread->getState() == Licq::Thread::StateRunning)
-  {
-    myThread->kill(SIGTERM);
-    myThread->join();
-  }
-
+  assert(myThread->getState() != Licq::Thread::StateRunning);
   delete myThread;