Changeset 5624 for source

Timestamp:

Aug 3, 2009, 2:29:12 PM (15 years ago)

Author:

Christoph Mayer

Message:

maemo segfault wegen static object ctors workaround

Location:

source/ariba

Files:

• communication/BaseCommunication.cpp (modified) (3 diffs)
• communication/BaseCommunication.h (modified) (2 diffs)
• communication/EndpointDescriptor.cpp (modified) (1 diff)
• communication/EndpointDescriptor.h (modified) (2 diffs)
• overlay/BaseOverlay.cpp (modified) (2 diffs)
• overlay/BaseOverlay.h (modified) (1 diff)
• overlay/messages/JoinReply.h (modified) (1 diff)
• overlay/modules/OverlayInterface.h (modified) (1 diff)
• overlay/modules/chord/Chord.cpp (modified) (1 diff)
• overlay/modules/chord/Chord.h (modified) (1 diff)
• overlay/modules/onehop/OneHop.cpp (modified) (1 diff)
• overlay/modules/onehop/OneHop.h (modified) (1 diff)
• utility/addressing (modified) (1 prop)
• utility/bootstrap/modules/bluetoothsdp (modified) (1 prop)
• utility/bootstrap/modules/periodicbroadcast (modified) (1 prop)
• utility/transport (modified) (1 prop)

source/ariba/communication/BaseCommunication.cpp

@@ -244 +244 @@
         } else {
                 LinkDescriptor& linkDesc = queryLocalLink(link);
-                if (linkDesc.isUnspecified()) return EndpointDescriptor::UNSPECIFIED;
+                if (linkDesc.isUnspecified()) return EndpointDescriptor::UNSPECIFIED();
                 return linkDesc.remoteEndpoint;
         }
@@ -534 +534 @@
                 if (linkSet[i]->localLink == link) return (LinkDescriptor&)*linkSet[i];
 
-        LinkDescriptor ret;
-        ret.unspecified = true;
-        return ret;
+        return LinkDescriptor::UNSPECIFIED();
 }
 
@@ -544 +542 @@
                 if (linkSet[i]->remoteLink == link) return (LinkDescriptor&)*linkSet[i];
 
-        LinkDescriptor ret;
-        ret.unspecified = true;
-        return ret;
+        return LinkDescriptor::UNSPECIFIED();
 }
 

source/ariba/communication/BaseCommunication.h

@@ -234 +234 @@
                         localLink(LinkID::UNSPECIFIED), localLocator(NULL),
                         remoteLink(LinkID::UNSPECIFIED), remoteLocator(NULL),
-                        remoteEndpoint(EndpointDescriptor::UNSPECIFIED), up(false), unspecified(false) {
+                        up(false) {
                 }
 
@@ -243 +243 @@
 
                 bool isUnspecified() const {
-                        return unspecified;
+                        return (this == &UNSPECIFIED());
+                }
+
+                static LinkDescriptor& UNSPECIFIED(){
+                        static LinkDescriptor* unspec = NULL;
+                        if(unspec == NULL) unspec = new LinkDescriptor();
+                        return *unspec;
                 }
 

source/ariba/communication/EndpointDescriptor.cpp

@@ -42 +42 @@
 namespace communication {
 
-const EndpointDescriptor EndpointDescriptor::UNSPECIFIED;
 vsznDefault(EndpointDescriptor);
 
-EndpointDescriptor::EndpointDescriptor() {
+EndpointDescriptor::EndpointDescriptor(){
 }
 
-EndpointDescriptor::~EndpointDescriptor() {
+EndpointDescriptor::~EndpointDescriptor(){
 
 }
 
 EndpointDescriptor::EndpointDescriptor(const EndpointDescriptor& rh) :
-        endpoints(rh.endpoints) {
+        endpoints(rh.endpoints){
 }
 
 EndpointDescriptor::EndpointDescriptor(const endpoint_set& endpoints ) :
-        endpoints(endpoints) {
+        endpoints(endpoints){
 }
 
-EndpointDescriptor::EndpointDescriptor(const string& str) : endpoints(str) {
+EndpointDescriptor::EndpointDescriptor(const string& str) : endpoints(str){
 }
 

source/ariba/communication/EndpointDescriptor.h

@@ -56 +56 @@
 
 public:
-        /// the unspecified endpoint descriptor
-        static const EndpointDescriptor UNSPECIFIED;
-
         /// creates an empty endpoint descriptor with zero endpoints
         EndpointDescriptor();
@@ -79 +76 @@
         }
 
+        static EndpointDescriptor& UNSPECIFIED() {
+                static EndpointDescriptor* unspec = NULL;
+                if(unspec == NULL) unspec = new EndpointDescriptor();
+
+                return *unspec;
+        }
+
         /// returns true, if this object is the unspecified object
         bool isUnspecified() const {
-                return this == &UNSPECIFIED;
+                return (this == &UNSPECIFIED());
         }
 

source/ariba/overlay/BaseOverlay.cpp

@@ -654 +654 @@
         // find link descriptor. not found -> return unspecified
         const LinkDescriptor* ld = getDescriptor(link);
-        if (ld==NULL) return EndpointDescriptor::UNSPECIFIED;
+        if (ld==NULL) return EndpointDescriptor::UNSPECIFIED();
 
         // return endpoint-descriptor from base communication
@@ -670 +670 @@
         if( overlayInterface == NULL ) {
                 logging_error( "overlay interface not set, cannot resolve endpoint" );
-                return EndpointDescriptor::UNSPECIFIED;
+                return EndpointDescriptor::UNSPECIFIED();
         }
 

source/ariba/overlay/BaseOverlay.h

@@ -269 +269 @@
          * @param boot A bootstrap node
          */
-        void joinSpoVNet(const SpoVNetID& id, const EndpointDescriptor& boot = EndpointDescriptor::UNSPECIFIED);
+        void joinSpoVNet(const SpoVNetID& id, const EndpointDescriptor& boot = EndpointDescriptor::UNSPECIFIED());
 
         /**

source/ariba/overlay/messages/JoinReply.h

@@ -71 +71 @@
                 const OverlayParameterSet _param = OverlayParameterSet::DEFAULT,
                 bool _joinAllowed = false,
-                const EndpointDescriptor _bootstrapEp = EndpointDescriptor::UNSPECIFIED
+                const EndpointDescriptor _bootstrapEp = EndpointDescriptor::UNSPECIFIED()
         );
 

source/ariba/overlay/modules/OverlayInterface.h

@@ -103 +103 @@
          *    end-point, if this node is the initiator
          */
-        virtual void joinOverlay(const EndpointDescriptor& bootstrap =
-                EndpointDescriptor::UNSPECIFIED ) = 0;
+        virtual void joinOverlay(const EndpointDescriptor& bootstrap = EndpointDescriptor::UNSPECIFIED()) = 0;
 
         /**

source/ariba/overlay/modules/chord/Chord.cpp

@@ -133 +133 @@
 const EndpointDescriptor& Chord::resolveNode(const NodeID& node) {
         const route_item* item = table->get(node);
-        if (item == NULL || item->info.isUnspecified()) return EndpointDescriptor::UNSPECIFIED;
+        if (item == NULL || item->info.isUnspecified()) return EndpointDescriptor::UNSPECIFIED();
         return baseoverlay.getEndpointDescriptor(item->info);
 }

source/ariba/overlay/modules/chord/Chord.h

@@ -104 +104 @@
         /// @see OverlayInterface.h
         virtual void joinOverlay(
-                const EndpointDescriptor& boot = EndpointDescriptor::UNSPECIFIED
+                const EndpointDescriptor& boot = EndpointDescriptor::UNSPECIFIED()
         );
 

source/ariba/overlay/modules/onehop/OneHop.cpp

@@ -71 +71 @@
 
         OverlayNodeMapping::const_iterator i = overlayNodes.find( node );
-        if (i == overlayNodes.end()) return EndpointDescriptor::UNSPECIFIED;
+        if (i == overlayNodes.end()) return EndpointDescriptor::UNSPECIFIED();
 
         const EndpointDescriptor& ep = baseoverlay.getEndpointDescriptor( i->second );

source/ariba/overlay/modules/onehop/OneHop.h

@@ -72 +72 @@
         /// @see OverlayInterface.h
         virtual void joinOverlay(const EndpointDescriptor& boot =
-                        EndpointDescriptor::UNSPECIFIED);
+                        EndpointDescriptor::UNSPECIFIED());
 
         /// @see OverlayInterface.h