Changeset 6471

Timestamp:

02/15/08 14:39:58 (5 years ago)

Author:

balister

Message:

Attempt to avoid hammering omniNames during component startup. Ticket #157.

Location:

ossie/trunk/ossie/framework

Files:

• ApplicationFactory_impl.cpp (modified) (2 diffs)
• DeviceManager_impl.cpp (modified) (2 diffs)

ossie/trunk/ossie/framework/ApplicationFactory_impl.cpp

@@ -1 +1 @@
 /****************************************************************************
  
-Copyright 2004, 2005, 2006, 2007 Virginia Polytechnic Institute and State University
+Copyright 2004, 2005, 2006, 2007, 2008 Virginia Polytechnic Institute and State University
  
 This file is part of the OSSIE Core Framework.
@@ -257 +257 @@
                 
                 // Wait for component to start
-                do {
+                for (unsigned int delay(50000);;) {
                     try {
                         _obj = orb->get_object_from_name(waveformContext, _lookupName.c_str());
-                    } catch (CosNaming::NamingContext::NotFound) {
-                    };
-                    ///\todo Check the name not found exceptions and make certain this is correct
-                    ossieSupport::nsleep(0,50 * 1000);
-                } while (CORBA::is_nil (_obj));
+                    } catch (CosNaming::NamingContext::NotFound) {};
+
+                    if (!CORBA::is_nil(_obj))
+                        break;
+                    
+                    ///\todo Figure out how to get rid of this sleep
+                    ossieSupport::nsleep(0, delay);
+                    
+                    if (delay < 1000000)
+                        delay *= 2;
+                }
                 
                 // check to see if the resource is the assembly controller

ossie/trunk/ossie/framework/DeviceManager_impl.cpp

@@ -153 +153 @@
         
         CORBA::Object_var _obj = CORBA::Object::_nil();
+        ///\todo Convert to use iostream, you can buffer overflow with long usageName
         char nameStr[255];
         sprintf( nameStr, "DomainName1/%s", componentPlacements[i].usageName() );
         DEBUG(3, DevMgr, "searching for "<< nameStr);
-        do {
+        for (unsigned int delay(50000);;) {
             /// \todo sleep prevents system from beating Name Service to death, Fix better
-            ossieSupport::nsleep(0, 50*1000);
-            try {
+            ossieSupport::nsleep(0, delay);
+
+            try { // the call will throw if the name is not found
                 _obj = orb_obj->get_object_from_name(nameStr);
             } catch (CosNaming::NamingContext::NotFound) {};
+
+            if (!CORBA::is_nil(_obj))
+                break;
+
+            if (delay < 1000000)
+                delay *= 2;
         }
-        while (CORBA::is_nil (_obj));
+
         DEBUG(3, DevMgr, "found "<< nameStr);
         
@@ -228 +236 @@
 
 /// \todo sleep prevents system from beating Name Service to death, Fix better
-    do{
-      obj = orb_obj->get_object_from_name (domainManagerName);
-      usleep(1000);
-    }while(CORBA::is_nil(obj));
-
+    for (unsigned int delay(1000);;) {
+
+        try {
+            obj = orb_obj->get_object_from_name (domainManagerName);
+        } catch (CosNaming::NamingContext::NotFound) {};
+
+        if (!CORBA::is_nil(obj))
+            break;
+
+        usleep(delay);
+
+        if (delay < 1000000)
+            delay *= 2;
+    }
+    
     _dmnMgr = CF::DomainManager::_narrow (obj);
 }