Changeset 5151 for sample/pingpong/PingPong.cpp

Timestamp:

Jul 21, 2009, 1:54:55 PM (16 years ago)

Author:

Christoph Mayer

Message:

begin merge back from relay branch

File:

• sample/pingpong/PingPong.cpp (modified) (6 diffs)

sample/pingpong/PingPong.cpp

@@ -17 +17 @@
 // construction
 PingPong::PingPong() : pingId( 0 ) {
-        Timer::setInterval( 5000 );
+        Timer::setInterval( 1000 );
 }
 
@@ -41 +41 @@
         // get initiator flag
         this->isInitiator = Configuration::instance().read<bool>("node.initiator");
+
+        this->name = string("<ping>");
 
         // get node name
@@ -55 +57 @@
         if (config.exists("ariba.bootstrap.hints")) ariba->setProperty("bootstrap.hints",
                         config.read<string>("ariba.bootstrap.hints"));
+        if (config.exists("pingpong.name")) name =
+                        config.read<string>("pingpong.name");
 
         // start ariba module
@@ -71 +75 @@
         // when initiating, you can define the overlay type, default is Chord [CHORD_OVERLAY]
         SpoVNetProperties params;
-        params.setBaseOverlayType( SpoVNetProperties::ONE_HOP_OVERLAY ); // alternative: OneHop
+        //params.setBaseOverlayType( SpoVNetProperties::ONE_HOP_OVERLAY ); // alternative: OneHop
 
         // initiate or join the spovnet
@@ -122 +126 @@
         // function that is implemented further down in PingPong::onLinkUp
 
-        logging_info( "pinging overlay neighbors with ping id " << ++pingId );
-
-        PingPongMessage pingmsg( pingId );
+//      logging_info( "pinging overlay neighbors with ping id " << ++pingId );
+
+        PingPongMessage pingmsg( pingId, name );
 
         //-----------------------------------------------------------------------
         // Option 1: get all neighboring nodes and send the message to each
         //-----------------------------------------------------------------------
+        counter++;
+        if (counter<0 || counter>4) {
+                counter = 0;
+                string s;
+                for (int i=0; i<names.size();i++) {
+                        if (i!=0) s+= ", ";
+                        s = s+names[i];
+                }
+                logging_info("----> I am " << name << " and I know " << s);
+                names.clear();
+        }
         vector<NodeID> nodes = node->getNeighborNodes();
         BOOST_FOREACH( NodeID nid, nodes ){
@@ -162 +177 @@
 void PingPong::onMessage(const DataMessage& msg, const NodeID& remote, const LinkID& lnk) {
         PingPongMessage* pingmsg = msg.getMessage()->convert<PingPongMessage> ();
-
-        logging_info( "received ping message on link " << lnk.toString()
-                        << " from node " << remote.toString()
-                        << ": " << pingmsg->info() );
+        bool found=false;
+        for (int i=0;i<names.size(); i++) if (names[i]==pingmsg->getName()) found=true;
+        if (!found) names.push_back(pingmsg->getName());
+//      logging_info( "received ping message on link " << lnk.toString()
+//                      << " from node " << remote.toString()
+//                      << ": " << pingmsg->info() );
 }