Changeset 12060 for etc

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:

etc/pingpong

Files:

• settings_node1.cnf (modified) (1 diff)
• settings_node2.cnf (modified) (1 diff)

etc/pingpong/settings_node1.cnf

@@ -1 @@
-node.name = nodeone
-ariba.endpoints = tcp{5003}
-ariba.bootstrap.hints=pingpong{ip{127.0.0.1};tcp{5002};broadcast}
 
-pingpong.name = nodeone
+//JSON
+{
+    "ariba": {
+        "spovnet_name": "pingpong",
+        
+        "listen_on": [
+            {"category": "TCPIP", "addr": "::", "port": 5003 }
+        ],
+        
+        "bootstrap": {
+            "direct": [
+                {"category": "TCPIP", "addr": "127.0.0.1", "port": 41322 }
+            ],
+            
+            "broadcast": false,
+            "mdns": false,
+            "sdp": false
+        }
+    }
+}
 
+
+
+//node.name = nodeone
+//ariba.endpoints = JSON { "endpoint_set": [ {"category": "TCPIP", "addr": "::", "port": 5003 } ] }
+//ariba.bootstrap.hints=pingpong{broadcast;mdns;}
+
+//pingpong.name = nodeone
+

etc/pingpong/settings_node2.cnf

@@ -1 @@
-node.name = nodetwo
-ariba.endpoints = tcp{5004}
-ariba.bootstrap.hints=pingpong{ip{127.0.0.1};tcp{5002}}
+//JSON
+{
+    "ariba": {
+        "spovnet_name": "pingpong",
+        
+        "listen_on": [
+            {"category": "TCPIP", "addr": "::", "port": 0 }
+        ],
+        
+        "bootstrap": {
+            "direct": [
+                {"category": "TCPIP", "addr": "127.0.0.1", "port": 5003 }
+            ],
+            
+            "broadcast": false,
+            "mdns": false,
+            "sdp": false
+        }
+    }
+}
 
-pingpong.name = nodetwo