Changeset 3041 for sample

Timestamp:

Apr 23, 2009, 9:18:12 AM (16 years ago)

Author:

Christoph Mayer

Message:

-mehrere Fixes, Tickets #25 (bind listeners earlier), #21 (better pingpong), #40 (systemqueue misbehavior)

Location:

sample/pingpong

Files:

• PingPong.cpp (modified) (4 diffs)
• main.cpp (modified) (1 diff)

sample/pingpong/PingPong.cpp

@@ -62 +62 @@
         node = new Node( *ariba, nodeName );
 
+        // bind communication and node listener
+        node->bind( this );                       /*NodeListener*/
+        node->bind( this, PingPong::PINGPONG_ID); /*CommunicationListener*/
+
         // start node module
         node->start();
@@ -68 +72 @@
         if (!isInitiator) node->join(spovnetName);
         else node->initiate(spovnetName);
-
-        // bind communication and node listener
-        node->bind( this );                       /*NodeListener*/
-        node->bind( this, PingPong::PINGPONG_ID); /*CommunicationListener*/
-
-        // start the ping timer. if we are not
-        // the initiator this will happen in onJoinCompleted
-        if( isInitiator ) Timer::start();
 
         // ping pong started up...
@@ -109 +105 @@
 }
 
-// node listener interface
-void PingPong::onJoinCompleted( const SpoVNetID& vid ) {
-        logging_error( "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX pingpong node join completed, spovnetid=" << vid.toString() );
-
-        // start the timer to ping every second
-        Timer::start();
-}
-
-void PingPong::onJoinFailed( const SpoVNetID& vid ) {
-        logging_error("pingpong node join failed, spovnetid=" << vid.toString() );
-}
-
-void PingPong::onLeaveCompleted( const SpoVNetID& vid ){
-        logging_info("pingpong node leave completed, spovnetid=" << vid.toString() );
-}
-
-void PingPong::onLeaveFailed( const SpoVNetID& vid ){
-        logging_error("pingpong node leave failed, spovnetid=" << vid.toString() );
-}
-
 // timer event
 void PingPong::eventFunction() {
@@ -153 +129 @@
         //-----------------------------------------------------------------------
         // node->sendBroadcastMessage( pingmsg, PingPong::PINGPONG_ID );
+}
+
+// node listener interface
+void PingPong::onJoinCompleted( const SpoVNetID& vid ) {
+        logging_error( "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX pingpong node join completed, spovnetid=" << vid.toString() );
+
+        // start the timer to ping every second
+        Timer::start();
+}
+
+void PingPong::onJoinFailed( const SpoVNetID& vid ) {
+        logging_error("pingpong node join failed, spovnetid=" << vid.toString() );
+}
+
+void PingPong::onLeaveCompleted( const SpoVNetID& vid ){
+        logging_info("pingpong node leave completed, spovnetid=" << vid.toString() );
+}
+
+void PingPong::onLeaveFailed( const SpoVNetID& vid ){
+        logging_error("pingpong node leave failed, spovnetid=" << vid.toString() );
 }
 

sample/pingpong/main.cpp

@@ -20 +20 @@
         StartupWrapper::startup(&ping, true);
 
-        // this will run blocking until <enter> is hit
-        StartupWrapper::shutdown();
+        // --> we will run blocking until <enter> is hit
+
+        StartupWrapper::shutdown(&ping);
         return 0;
 }