Changeset 12060 for source/ariba/utility/system

Timestamp:

Jun 19, 2013, 11:05:49 AM (12 years ago)

Author:

hock@…

Message:

Reintegrate branch: 20130111-hock-message_classes

improvements:

• new message classes (reboost, zero-copy)
• "fast path" for direct links (skip overlay layer)
• link-properties accessible from the application
• SystemQueue can call boost::bind functions
• protlib compatibility removed (32bit overhead saved in every message)
• addressing2
• AddressDiscovery discoveres only addresses on which we're actually listening
• ariba serialization usage reduced (sill used in OverlayMsg)
• Node::connect, easier and cleaner interface to start-up ariba from the application
• ariba configs via JSON, XML, etc (boost::property_tree)
• keep-alive overhead greatly reduced
• (relayed) overlay links can actually be closed now
• lost messages are detected in most cases
• notification to the application when link is transformed into direct-link
• overlay routing: send message to second best hop if it would be dropped otherwise
• SequenceNumbers (only mechanisms, so for: upward compatibility)
• various small fixes

regressions:

• bluetooth is not yet working again
• bootstrap modules deactivated
• liblog4xx is not working (use cout-logging)

This patch brings great performance and stability improvements at cost of backward compatibility.
Also bluetooth and the bootstrap modules have not been ported to the new interfaces, yet.

Location:

source/ariba/utility/system

Files:

• StartupWrapper.cpp (modified) (1 diff)
• StartupWrapper.h (modified) (1 diff)
• SystemQueue.cpp (modified) (1 diff)
• SystemQueue.h (modified) (4 diffs)

source/ariba/utility/system/StartupWrapper.cpp

@@ -36 +36 @@
 // Telematics.
 // [License]
+
+// XXX NOTE: Use this class with caution! Config support is outdated.
 
 #include "StartupWrapper.h"

source/ariba/utility/system/StartupWrapper.h

@@ -36 +36 @@
 // Telematics.
 // [License]
+
+// XXX NOTE: Use this class with caution! Config support is outdated.
 
 #ifndef __STARTUP_WRAPPER_H

source/ariba/utility/system/SystemQueue.cpp

@@ -69 +69 @@
 }
 
+// maps to function call internally to the Event-system
+void SystemQueue::scheduleCall( const boost::function0<void>& function, uint32_t delay)
+{
+    // copy function object
+    boost::function0<void>* function_ptr = new boost::function0<void>();
+    (*function_ptr) = function; 
+
+    // schedule special call-event
+    scheduleEvent( SystemEvent(&internal_function_caller, SystemEventType::DEFAULT, function_ptr), delay );
+
+}
+
 #ifdef UNDERLAY_OMNET
 void SystemQueue::handleMessage(cMessage* msg){

source/ariba/utility/system/SystemQueue.h

@@ -60 +60 @@
 #endif
 
+#include <boost/function.hpp>
+
+
 using std::vector;
 using boost::posix_time::ptime;
@@ -108 +111 @@
          */
         void scheduleEvent( const SystemEvent& event, uint32_t delay = 0 );
+        
+        /**
+         * This method schedules a function call in the SystemQueue.
+         * (Like scheduleEvent, but to be used with boost::bind.)
+         * 
+         * @param function: The function to be called [void function()]
+         * @param The delay in milli-seconds
+         */
+        void scheduleCall( const boost::function0<void>& function, uint32_t delay = 0 );
 
         /**
@@ -170 +182 @@
 #endif
 
+        
+        
 private:
 
@@ -235 +249 @@
         volatile bool systemQueueRunning;
 #endif
-
+        
+        
+private:
+    /**
+     * This inner class handles the function-call events.
+     * @see SystemQueue::scheduleCall
+     */
+    class FunctionCaller  :  public SystemEventListener
+    {
+        void handleSystemEvent(const SystemEvent& event)
+        {
+            boost::function0<void>* function_ptr = event.getData< boost::function0<void> >();
+            (*function_ptr)();
+            delete function_ptr;
+        }
+    };
+
+    FunctionCaller internal_function_caller;
 }; // class SystemQueue