Changeset 12060 for source/ariba/overlay/modules/OverlayFactory.cpp

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.

File:

• source/ariba/overlay/modules/OverlayFactory.cpp (modified) (2 diffs)

source/ariba/overlay/modules/OverlayFactory.cpp

@@ -41 +41 @@
 // structured overlays
 #include "chord/Chord.h"
-#include "onehop/OneHop.h"
+//#include "onehop/OneHop.h"  //DEPRECATED
 
 namespace ariba {
@@ -57 +57 @@
                         return new Chord( baseoverlay, nodeid, routeReceiver, param );
 
-                case OverlayParameterSet::OverlayStructureOneHop:
-                        return new OneHop( baseoverlay, nodeid, routeReceiver, param );
+//              case OverlayParameterSet::OverlayStructureOneHop:
+//                      return new OneHop( baseoverlay, nodeid, routeReceiver, param );
 
                 default:
+                    // NEVER return "NULL"
+                    assert(false);
+                    throw 42;
                         return NULL;
         }
 
+        // NEVER return "NULL"
+        assert(false);
+        throw 42;
         return NULL;
 }