Changeset 6027 for branches/newapi

Timestamp:

01/11/08 07:59:37 (11 months ago)

Author:

erijo

Message:

Updated simple plugin to react on events and shutdown licq after 5 secs

Location:

branches/newapi/simple/src

Files:

• plugin.cpp (modified) (1 diff)
• simpleplugin.cpp (modified) (3 diffs)
• simpleplugin.h (modified) (3 diffs)

branches/newapi/simple/src/plugin.cpp

@@ -48 +48 @@
 Licq::Plugin* licqCreatePlugin(const Licq::Plugin::Setup& setup)
 {
-  return new SimplePlugin(*setup.log);
+  return new SimplePlugin(setup);
 }
 

branches/newapi/simple/src/simpleplugin.cpp

@@ -18 +18 @@
  */
 
+#include "licq/interface/daemon.h"
 #include "simpleplugin.h"
 
-SimplePlugin::SimplePlugin(Licq::Log& log)
-  : myLog(log)
+SimplePlugin::SimplePlugin(const Licq::Plugin::Setup& setup)
+  : myLog(*setup.log),
+    mySetup(setup),
+    myEventDispatcher(myEventLoop, *mySetup.eventQueue, Licq::Daemon::getInstance())
 {
   myLog.debug("Constructing SimplePlugin");
@@ -34 +37 @@
 {
   myLog.debug(boost::format("onTimer(%1%)") % timer);
+  static int counter = 0;
+  if (++counter == 10)
+  {
+    Licq::Event::Ptr exit = Licq::Event::create("daemon.exit");
+    Licq::Daemon::getInstance()->sendEventToDaemon(exit);
+  }
 }
 
@@ -41 +50 @@
 }
 
+bool SimplePlugin::onEvent(Licq::Event::Ptr event)
+{
+  myLog.debug(boost::format("onEvent(%1%)") % event->getName());
+  if (event->getName() == "plugin.stop")
+  {
+    myEventLoop.exit(0);
+    Licq::Event::Ptr stopped = Licq::Event::create("plugin.stopped");
+    stopped->setProperty("id", mySetup.id);
+    Licq::Daemon::getInstance()->sendEventToDaemon(stopped);    
+    return false;
+  }
+  return true;
+}
+
 int SimplePlugin::run()
 {
-  Licq::EventLoop eventLoop;
-  eventLoop.addTimer(20, this);
+  myEventDispatcher.setDefaultCallback(&SimplePlugin::onEvent, this);
+  myEventLoop.addTimer(500, this);
 
   myLog.debug("Starting SimplePlugin");
-  return eventLoop.run();
+  return myEventLoop.run();
 }

branches/newapi/simple/src/simpleplugin.h

@@ -21 +21 @@
 #define SIMPLEPLUGIN_H
 
+#include "licq/event/eventdispatcher.h"
 #include "licq/event/eventloop.h"
 #include "licq/interface/plugin.h"
@@ -30 +31 @@
 {
 public:
-  SimplePlugin(Licq::Log& log);
+  SimplePlugin(const Licq::Plugin::Setup& setup);
   ~SimplePlugin();
 
+  bool onEvent(Licq::Event::Ptr event);
+
+  // From Licq::EventLoop::Handler
   void onTimer(int timer);
   void onDescriptor(int fd, Licq::EventLoop::NotifierType type);
@@ -42 +46 @@
 private:
   Licq::Log& myLog;
+  const Licq::Plugin::Setup& mySetup;
+
+  Licq::EventLoop myEventLoop;
+  Licq::EventDispatcher myEventDispatcher;
 };