Changeset 5412

Timestamp:

Jul 29, 2009, 11:45:17 AM (15 years ago)

Author:

Christoph Mayer

Message:

-logging fix, -sdp fix, -endpoint operator fix, -endpoint aufräumen

Location:

source/ariba

Files:

• Node.cpp (modified) (1 diff)
• communication/EndpointDescriptor.h (modified) (1 diff)
• overlay/BaseOverlay.cpp (modified) (4 diffs)
• overlay/OverlayBootstrap.cpp (modified) (2 diffs)
• utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.cpp (modified) (7 diffs)
• utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.h (modified) (1 diff)
• utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.cpp (modified) (1 diff)
• utility/logging/Logging.h (modified) (2 diffs)
• utility/measurement/PathloadMeasurement.cpp (modified) (1 diff)
• utility/system/StartupWrapper.cpp (modified) (2 diffs)

source/ariba/Node.cpp

@@ -75 +75 @@
 
         // join against further nodes
-        if( ep != NULL && *ep != EndpointDescriptor::UNSPECIFIED )
+        if( ep != NULL && ep->isUnspecified() == false )
                 base_overlay->joinSpoVNet( spovnetId, *ep);
 }

source/ariba/communication/EndpointDescriptor.h

@@ -111 +111 @@
         bool operator==(const EndpointDescriptor& rh) const {
                 if (rh.isUnspecified() && isUnspecified()) return true;
+                if (rh.isUnspecified() ^  isUnspecified()) return false;
+
+                assert( (!rh.isUnspecified()) && (!isUnspecified()) );
                 return endpoints == rh.endpoints;
         }
 
         bool operator!=(const EndpointDescriptor& rh) const {
-                if (!rh.isUnspecified() && !isUnspecified()) return true;
-                return endpoints != rh.endpoints;
+                return ( !operator==(rh) );
         }
 

source/ariba/overlay/BaseOverlay.cpp

@@ -60 +60 @@
 namespace overlay {
 
-#define logging_force(x) std::cout << x << std::endl;
-#define logging_force1(x) std::cout << x << std::endl;
-
 LinkDescriptor* BaseOverlay::getDescriptor( const LinkID& link, bool communication ) {
         BOOST_FOREACH( LinkDescriptor* lp, links )
@@ -127 +124 @@
                 // get descriptor of first hop
                 rld = getDescriptor(rlid);
-                logging_force1( rld );
+                logging_force( rld );
 
                 // is first hop a relay path? yes-> try to find real link!
@@ -136 +133 @@
                 else relayNode = rld->remoteNode;
         }
-        logging_force1( "Potential relay node " << relayNode.toString() );
+        logging_force( "Potential relay node " << relayNode.toString() );
         // do not return myself or use the node as relay node
         if (relayNode == nodeId)
                 return NodeID::UNSPECIFIED;
         else {
-                logging_force1( "Returning relay node " << relayNode.toString() );
+                logging_force( "Returning relay node " << relayNode.toString() );
                 return relayNode;
         }
@@ -310 +307 @@
                         " with nodeid " << nodeId.toString());
 
-        if(bootstrapEp == EndpointDescriptor::UNSPECIFIED && state == BaseOverlayStateInvalid){
+        if(bootstrapEp.isUnspecified() && state == BaseOverlayStateInvalid){
 
                 // bootstrap against ourselfs

source/ariba/overlay/OverlayBootstrap.cpp

@@ -65 +65 @@
         manager.registerCallback( this );
         manager.registerModule( BootstrapManager::BootstrapTypePeriodicBroadcast );
-        //manager.registerModule( BootstrapManager::BootstrapTypeBluetoothSdp );
+        manager.registerModule( BootstrapManager::BootstrapTypeBluetoothSdp );
 }
 
@@ -77 +77 @@
         manager.unregisterCallback( this );
         manager.unregisterModule( BootstrapManager::BootstrapTypePeriodicBroadcast );
-        //manager.unregisterModule( BootstrapManager::BootstrapTypeBluetoothSdp );
+        manager.unregisterModule( BootstrapManager::BootstrapTypeBluetoothSdp );
 }
 

source/ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.cpp

@@ -217 +217 @@
 
         if (sdp_session_ == NULL) {
-                logging_error( "something is wrong with your SDP server, nothing registered" );
+                logging_error( "something is wrong with your SDP server, nothing registered: " << strerror(errno) );
         } else {
                 int ret = sdp_record_register(sdp_session_, &record, 0);
 
                 if(ret < 0){
-                        logging_error("failed registering sdp record");
+                        logging_error("failed registering sdp record: " << strerror(errno));
                 }else{
                         logging_debug("sdp record registered using session " << sdp_session_);
@@ -269 +269 @@
         sock = hci_open_dev(dev_id);
         if (dev_id < 0 || sock < 0) {
-                logging_error("opening socket for device " << dev_id << " failed. can not scan for peers");
+                logging_error("opening socket for device "
+                                << dev_id << " failed. can not scan for peers: " << strerror(errno));
                 return;
         }
@@ -280 +281 @@
         num_rsp = hci_inquiry(dev_id, len, max_rsp, NULL, &ii, flags);
         if (num_rsp < 0)
-                logging_error("hci_inquiry failed with " << num_rsp);
+                logging_error("hci_inquiry failed with " << num_rsp << ": " << strerror(errno));
 
         for (i = 0; i < num_rsp; i++) {
@@ -289 +290 @@
 
                 logging_debug("found peer [" << saddress << "] [" << sname << "]");
-
-                // TODO: sdp_search can be very slow, fork it!
                 sdp_search( address, sname );
         }
@@ -297 +296 @@
         close(sock);
 
-        int nextscan = (rand() % 40) + 5;
+        int nextscan = (rand() % 30) + 5;
         logging_debug("next sdp scan in " << nextscan << " seconds");
 
@@ -328 +327 @@
 
         if (session == NULL) {
-                logging_error("failed to connect to SDP server at " << ba2string(&target) <<".");
+                logging_error("failed to connect to SDP server at "
+                                << ba2string(&target) << ": " << strerror(errno));
                 return;
         }
@@ -373 +373 @@
                 }
         } else {
-                logging_error("sdp_service_search_attr_req failed with timeout");
+                logging_error("sdp_service_search_attr_req failed with timeout: " << strerror(errno));
         }
 

source/ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.h

@@ -45 +45 @@
 #include <string>
 #include <ctime>
+#include <cerrno>
 #include <boost/bind.hpp>
 #include <boost/asio.hpp>

source/ariba/utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.cpp

@@ -58 +58 @@
 
 use_logging_cpp(PeriodicBroadcast);
-const long PeriodicBroadcast::timerinterval = 1000;
-const long PeriodicBroadcast::servicetimeout = 3000;
+const long PeriodicBroadcast::timerinterval = 2000;
+const long PeriodicBroadcast::servicetimeout = 5000;
 const unsigned int PeriodicBroadcast::serverport_v4 = 5634;
 const unsigned int PeriodicBroadcast::serverport_v6 = 5636;

source/ariba/utility/logging/Logging.h

@@ -76 +76 @@
   #define logging_warn(x)   {colorWarn;  LOG4CXX_WARN(logger,x);  colorDefault;           }
   #define logging_error(x)  {colorError; LOG4CXX_ERROR(logger,x); colorDefault;           }
+  #define logging_force(x)  {colorInfo;  LOG4CXX_INFO(logger,x);  colorDefault;           }
   #define logging_fatal(x)  {colorError; LOG4CXX_FATAL(logger,x); colorDefault; exit(-1); }
 
@@ -85 +86 @@
   #define logging_warn(x)   {colorWarn;  LOG4CXX_WARN(logger,x);  colorDefault;           }
   #define logging_error(x)  {colorError; LOG4CXX_ERROR(logger,x); colorDefault;           }
+  #define logging_force(x)  {colorInfo;  LOG4CXX_INFO(logger,x);  colorDefault;           }
   #define logging_fatal(x)  {colorError; LOG4CXX_FATAL(logger,x); colorDefault; exit(-1); }
 

source/ariba/utility/measurement/PathloadMeasurement.cpp

@@ -108 +108 @@
         // get the endpoint for this node
         const EndpointDescriptor& endp = baseoverlay->getEndpointDescriptor( resultNode );
-        if( endp == EndpointDescriptor::UNSPECIFIED ){
+        if( endp.isUnspecified() ){
                 logging_warn( "can not measure node " << resultNode.toString() << ": can't resolve endpoint" );
                 return;

source/ariba/utility/system/StartupWrapper.cpp

@@ -98 +98 @@
         {
                 log4cxx::LoggerPtr logger(log4cxx::Logger::getRootLogger());
-                logger->setLevel(log4cxx::Level::getWarn());
+                logger->setLevel(log4cxx::Level::getDebug());
         }
 
@@ -123 +123 @@
                         logger->setLevel(log4cxx::Level::getDebug());
         }
-*/
+         */
 
         //$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$