Changeset 5151 for sample

Timestamp:

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

Author:

Christoph Mayer

Message:

begin merge back from relay branch

Location:

sample/pingpong

Files:

• PingPong.cpp (modified) (6 diffs)
• PingPong.h (modified) (5 diffs)
• PingPongMessage.cpp (modified) (1 diff)
• PingPongMessage.h (modified) (2 diffs)
• main.cpp (modified) (1 diff)

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() );
 }
 

sample/pingpong/PingPong.h

@@ -6 +6 @@
 #include "ariba/utility/system/StartupInterface.h"
 #include "ariba/utility/system/Timer.h"
+
+#include <vector>
 
 using namespace ariba;
@@ -15 +17 @@
 namespace pingpong {
 
+using namespace std;
+
 /**
-/* The PingPong main class
-/* This class implements an example service for demonstration purposes
-/* The pingpong class sends and receives messages between two SpoVNet
-/* instances
-**/
-class PingPong :
-        public NodeListener,
+ /* The PingPong main class
+ /* This class implements an example service for demonstration purposes
+ /* The pingpong class sends and receives messages between two SpoVNet
+ /* instances
+ **/
+class PingPong: public NodeListener,
         public CommunicationListener,
         public StartupInterface,
@@ -35 +38 @@
 protected:
         // communication listener interface
-        virtual bool onLinkRequest(const NodeID& remote, const DataMessage& msg = DataMessage::UNSPECIFIED);
-        virtual void onMessage(const DataMessage& msg, const NodeID& remote, const LinkID& lnk= LinkID::UNSPECIFIED);
+        virtual bool onLinkRequest(const NodeID& remote, const DataMessage& msg =
+                        DataMessage::UNSPECIFIED);
+        virtual void onMessage(const DataMessage& msg, const NodeID& remote,
+                const LinkID& lnk = LinkID::UNSPECIFIED);
         virtual void onLinkUp(const LinkID& lnk, const NodeID& remote);
         virtual void onLinkDown(const LinkID& lnk, const NodeID& remote);
@@ -43 +48 @@
 
         // node listener interface
-        virtual void onJoinCompleted( const SpoVNetID& vid );
-        virtual void onJoinFailed( const SpoVNetID& vid );
-        virtual void onLeaveCompleted( const SpoVNetID& vid );
-        virtual void onLeaveFailed( const SpoVNetID& vid );
+        virtual void onJoinCompleted(const SpoVNetID& vid);
+        virtual void onJoinFailed(const SpoVNetID& vid);
+        virtual void onLeaveCompleted(const SpoVNetID& vid);
+        virtual void onLeaveFailed(const SpoVNetID& vid);
 
         // startup wrapper interface
@@ -53 +58 @@
 
         // timer events
-        virtual void eventFunction();
+        virtual void eventFunction();
 
 private:
         // the ariba module and a node
         AribaModule* ariba;
-        Node*        node;
+        Node* node;
+        string name;
+        int counter;
+        vector<string> names;
 
         // flag, whether this node initiates or just joins the spovnet
         bool isInitiator;
 
-        // the ping pong service id
-        static ServiceID PINGPONG_SERVICEID;
+        // the ping pong service id
+        static ServiceID PINGPONG_SERVICEID;
 
-        // the current ping id
-        unsigned long pingId;
+        // the current ping id
+        unsigned long pingId;
 
 };

sample/pingpong/PingPongMessage.cpp

@@ -10 +10 @@
 }
 
-PingPongMessage::PingPongMessage(uint8_t _id) : id(_id) {
+PingPongMessage::PingPongMessage(uint8_t _id, string name) : id(_id),name(name) {
 }
 

sample/pingpong/PingPongMessage.h

@@ -18 +18 @@
 public:
         PingPongMessage();
-        PingPongMessage( uint8_t _id );
+        PingPongMessage( uint8_t _id, string name = string("<ping>") );
         virtual ~PingPongMessage();
 
         string info();
         uint8_t getid();
+
+        inline string getName() const {
+                return name;
+        }
 private:
         uint8_t id;
+        string name;
 };
 
@@ -30 +35 @@
 
 sznBeginDefault( ariba::application::pingpong::PingPongMessage, X ) {
-        X && id;
+        X && id && T(name);
 } sznEnd();
 

sample/pingpong/main.cpp

@@ -7 +7 @@
 using ariba::application::pingpong::PingPong;
 
-//*************************************************
-/*
-#include "ariba/utility/bootstrap/BootstrapManager.h"
-using ariba::utility::BootstrapManager;
-
-void debug(){
-        StartupWrapper::startSystem();
-
-        BootstrapManager& manager = BootstrapManager::instance();
-        manager.registerModule( BootstrapManager::BootstrapTypePeriodicBroadcast );
-
-        manager.publish("testname", "testinfo1", "testinfo2", "testinfo3");
-        getchar();
-        manager.revoke("testname");
-
-        manager.unregisterModule( BootstrapManager::BootstrapTypePeriodicBroadcast );
-        StartupWrapper::stopSystem();
-}
-*/
-//*************************************************
-
 int main( int argc, char** argv ) {
-
-        //debug();
-        //return 0;
 
         // get config file