Changeset 4882 for branches/erijo-dev

Timestamp:

04/01/07 22:33:24 (20 months ago)

Author:

erijo

Message:

Rename getEventName to getName and add unique event id.

Location:

branches/erijo-dev/licq

Files:

• licq/interface/event.h (modified) (1 diff)
• licq/types.h (modified) (1 diff)
• src/daemon.cpp (modified) (2 diffs)
• src/event.cpp (modified) (3 diffs)
• src/event.h (modified) (3 diffs)
• src/tests/eventqueuetest.cpp (modified) (3 diffs)
• src/tests/eventtest.cpp (modified) (1 diff)

branches/erijo-dev/licq/licq/interface/event.h

@@ -75 +75 @@
 
   /** \return Event name passed to create(). */
-  virtual const std::string& getEventName() const = 0;
+  virtual const std::string& getName() const = 0;
+
+  /** \return Globally unique id. */
+  virtual TEventId getId() const = 0;
 
   /** \return True if the event has a property \a key; otherwise false. */

branches/erijo-dev/licq/licq/types.h

@@ -37 +37 @@
 typedef unsigned long TPluginId;
 
-/** \brief All events get an unique id of type TEventId when they are sent to the daemon.
+/** \brief All events get an unique id of type TEventId when they are created.
     \ingroup public
 */

branches/erijo-dev/licq/src/daemon.cpp

@@ -25 +25 @@
 void Licq::TDaemon::onEvent(const IEventPtr& event)
 {
-  Log.info("TDaemon::onEvent(%s)", event->getEventName().c_str());
-  TEventHandlers::iterator handler = EventHandlers.find(event->getEventName());
+  Log.info("TDaemon::onEvent(%s [%lu])", event->getName().c_str(), event->getId());
+  TEventHandlers::iterator handler = EventHandlers.find(event->getName());
   if (handler != EventHandlers.end())
   {
-    Log.debug("Calling handler for %s", event->getEventName().c_str());
+    Log.debug("Calling handler for %s", event->getName().c_str());
     (this->*(handler->second))(event);
   }
@@ -62 +62 @@
   }
 
-  if (count == 5)
+  if (count >= 5)
     Pipe.write("TESTING", sizeof("TESTING") - 1);
+
+  if (count >= 6)
+    EventLoop.removeFileDescriptor(Pipe.getFileDescriptor());
+
+  if (count == 7)
+    EventLoop.removeTimer(1);
 }
 

branches/erijo-dev/licq/src/event.cpp

@@ -25 +25 @@
 }
 
+Licq::TEventId Licq::TEvent::NextEventId = 1;
+Licq::TMutex Licq::TEvent::Mutex;
+
 Licq::TEvent::TEvent(Licq::TPluginId sender, const std::string& eventName)
-  : Sender(sender), EventName(eventName)
+  : Sender(sender), Name(eventName)
 {
-  // Empty
+  Mutex.lock();
+  Id = NextEventId++;
+  Mutex.unlock();
 }
 
@@ -36 +41 @@
 }
 
-bool Licq::TEvent::getProperty(const std::string& key, const boost::any** value) const
+bool Licq::TEvent::getProperty(const std::string& key,
+                               const boost::any** value) const
 {
   TProperties::const_iterator it = Properties.find(key);
@@ -51 +57 @@
 }
 
-const std::string& Licq::TEvent::getEventName() const
+const std::string& Licq::TEvent::getName() const
 {
-  return EventName;
+  return Name;
+}
+
+Licq::TEventId Licq::TEvent::getId() const
+{
+  return Id;
 }
 

branches/erijo-dev/licq/src/event.h

@@ -23 +23 @@
 #include "licq/interface/event.h"
 #include "utils/misc.h"
+#include "utils/mutex.h"
 
 #include <map>
@@ -43 +44 @@
 
   TPluginId Sender;
-  const std::string EventName;
+  const std::string Name;
+  unsigned long Id;
 
   typedef std::map<std::string, boost::any> TProperties;
   TProperties Properties;
+
+  static TMutex Mutex;
+  static TEventId NextEventId;
 
 protected:
@@ -55 +60 @@
   // From IEvent
   TPluginId getSenderId() const;
-  const std::string& getEventName() const;
+  const std::string& getName() const;
+  TEventId getId() const;
   bool hasProperty(const std::string& key) const;
   void setProperty(const std::string& key, const boost::any& value);

branches/erijo-dev/licq/src/tests/eventqueuetest.cpp

@@ -59 +59 @@
 
   BOOST_CHECK_EQUAL(ret1->getSenderId(), (Licq::TPluginId) 1);
-  BOOST_CHECK_EQUAL(ret1->getEventName(), "event-1");
+  BOOST_CHECK_EQUAL(ret1->getName(), "event-1");
 
   int answer;
@@ -72 +72 @@
 
   BOOST_CHECK_EQUAL(ret2->getSenderId(), (Licq::TPluginId) 17);
-  BOOST_CHECK_EQUAL(ret2->getEventName(), "event-2");
+  BOOST_CHECK_EQUAL(ret2->getName(), "event-2");
 
   std::string question;
@@ -93 +93 @@
   BOOST_CHECK_EQUAL(queue.empty(), true);
 
-  BOOST_CHECK_EQUAL(list.front()->getEventName(), "event-2");
-  BOOST_CHECK_EQUAL(list.back()->getEventName(), "event-1");
+  BOOST_CHECK_EQUAL(list.front()->getName(), "event-2");
+  BOOST_CHECK_EQUAL(list.back()->getName(), "event-1");
   list.clear();
 }

branches/erijo-dev/licq/src/tests/eventtest.cpp

@@ -39 +39 @@
   Licq::IEventPtr data = Licq::IEvent::create(1, "test-event");
   BOOST_CHECK_EQUAL(data->getSenderId(), Licq::TPluginId(1));
-  BOOST_CHECK_EQUAL(data->getEventName(), "test-event");
+  BOOST_CHECK_EQUAL(data->getName(), "test-event");
 
   // Set some data