Changeset 12061

Timestamp:

Jun 19, 2013, 12:58:43 PM (11 years ago)

Author:

hock@…

Message:

PingPong: some clean up

Files:

• etc/pingpong/settings_node1.cnf (modified) (2 diffs)
• sample/pingpong/PingPong.cpp (modified) (5 diffs)
• sample/pingpong/main.cpp (modified) (1 diff)

etc/pingpong/settings_node1.cnf

@@ -1 @@
-
 //JSON
 {
     "ariba": {
+        "node_name": "Node1",
         "spovnet_name": "pingpong",
         
@@ -21 +21 @@
 }
 
-
-
-//node.name = nodeone
-//ariba.endpoints = JSON { "endpoint_set": [ {"category": "TCPIP", "addr": "::", "port": 5003 } ] }
-//ariba.bootstrap.hints=pingpong{broadcast;mdns;}
-
-//pingpong.name = nodeone
-

sample/pingpong/PingPong.cpp

@@ -26 +26 @@
         config_file(config)
 {
-        Timer::setInterval( 3000 );
+        Timer::setInterval( 5000 );
 }
 
@@ -60 +60 @@
     }
     
-    name = "TODO";
+    // use node name also in the application
+    name = config.get("ariba.node_name", "NO_NAME");
     
         // bind communication and node listener
@@ -108 +109 @@
         // this can be all nodes (OneHop) overlay or just some neighbors
         // in case of a Chord or Kademlia structure
+        // NOTE: Currently ariba only supports the Chord overlay.
 
         // in this sample we use auto-links: we just send out our message
@@ -114 +116 @@
         // a link and start using the link in the CommunicationListener::onLinkUp
         // function that is implemented further down in PingPong::onLinkUp
+        
+        // NOTE: This example still uses the old deprecated ariba::message messages 
+        //   with the ariba built-in serialization. 
+        // For future applications please use the new reboost::message_t messages. 
+        //   Data is stored in high efficient zero-copy buffers of type 
+        //   reboost::shared_buffer_t. These buffers hold plain data, so you have to 
+        //   serialize the data "on your own".
+        // We reccomend third-party serialization libraries like:
+        //   - Protocol Buffers (http://en.wikipedia.org/wiki/Protocol_Buffers)
+        //   - MessagePack      (http://en.wikipedia.org/wiki/MessagePack)
 
         pingId++;
-//      logging_info( endl << "#################" << endl
     logging_info( endl << "|||||||||| >>>>>>>>>>" << endl
                 << "[PINGPONG]\t PINGING overlay neighbors with ping id " << pingId );
@@ -173 +184 @@
         for (int i=0;i<names.size(); i++) if (names[i]==pingmsg->getName()) found=true;
         if (!found) names.push_back(pingmsg->getName());
-//      logging_info( endl << "#################" << endl
         logging_info( endl << "<<<<<<<<<< ||||||||||" << endl
                 << "[PINGPONG]\t RECEIVED ping message on link "

sample/pingpong/main.cpp

@@ -13 +13 @@
         if (argc >= 2) config = argv[1];
 
-//      StartupWrapper::initConfig( config );
         StartupWrapper::startSystem();