Changeset 7853

Timestamp:

06/12/08 21:26:27 (5 years ago)

Author:

shereef

Message:

DevMgr? still crashes; something is throwing a CF::FileException? right at the end; getting warmer

Location:

ossiedev/branches/ssayed/devs/src/system

Files:

• nodebooter/nodebooter.cpp (modified) (1 diff)
• ossie/framework/DeviceManager_impl.cpp (modified) (5 diffs)
• ossie/framework/DomainManager_impl.cpp (modified) (5 diffs)

ossiedev/branches/ssayed/devs/src/system/nodebooter/nodebooter.cpp

@@ -169 +169 @@
 
         // finish initializing the Device Manager
-        DeviceManager_servant->post_constructor(DeviceManager_objref);
+        try
+        {
+         DeviceManager_servant->post_constructor(DeviceManager_objref);
+        } catch( CF::FileException &_ex ) {
+         std::cout << "[nodebooter] While starting DevMgr: " << _ex.msg << "\n";
+         exit(EXIT_FAILURE);
+        }
     }
 

ossiedev/branches/ssayed/devs/src/system/ossie/framework/DeviceManager_impl.cpp

@@ -168 +168 @@
       }
 #endif
-
+      ossieSupport::nsleep(0, 1000*1000);
       CORBA::Object_var _obj = CORBA::Object::_nil();
       char nameStr[255];
-      sprintf( nameStr, "DomainName1/%s", componentPlacements[i].usageName() );
-      DEBUG(3, DevMgr, "searching for "<< nameStr)
+      sprintf( nameStr, "DomainName1/%s", componentPlacements[i].usageName() );      DEBUG(3, DevMgr, "searching for "<< nameStr)
       do
       {
@@ -181 +180 @@
         _obj = orb_obj->get_object_from_name(nameStr);
        } catch (CosNaming::NamingContext::NotFound) {
-        std::cout << "[DeviceManager::post_ctor] While obtaining NamingContext: NamingContext Not Found\n";
-        ossieSupport::nsleep(0, 50*1000);
+        ossieSupport::nsleep(0, 100*1000);
        } catch( ... ) {
         std::cout << "[DeviceManager::post_ctor] While obtaining NamingContext: Unknown Exception\n";
@@ -193 +191 @@
       tempDevice->initialize ();
 
+      if( strlen( _SPDParser.getPRFFile() ) > 0 )
+      {
 //Get properties from PRF
-      CF::File_var _prf;
-      try
-      {
-       _prf = _fileSys->open( _SPDParser.getPRFFile(), true );
-      } catch( CF::InvalidFileName &_ex ) {
-       std::cout << "[DeviceManager::post_ctor] While opening PRF: " << _ex.msg << "\n";
-       exit(EXIT_FAILURE);
-      } catch( CF::FileException &_ex ) {
-       std::cout << "[DeviceManager::post_ctor] While opening PRF: " << _ex.msg << "\n";
-       exit(EXIT_FAILURE);
-      } catch( ... ) {
-       std::cout << "[DeviceManager::post_ctor] While opening PRF: Unknown Exception\n";
-       exit(EXIT_FAILURE);
+       CF::File_var _prf;
+       try
+       {
+        _prf = _fileSys->open( _SPDParser.getPRFFile(), true );
+       } catch( CF::InvalidFileName &_ex ) {
+        std::cout << "[DeviceManager::post_ctor] While opening PRF " << _SPDParser.getPRFFile() <<  ": " << _ex.msg << "\n";
+        exit(EXIT_FAILURE);
+       } catch( CF::FileException &_ex ) {
+        std::cout << "[DeviceManager::post_ctor] While opening PRF " << _SPDParser.getPRFFile() << ": " << _ex.msg << "\n";
+        exit(EXIT_FAILURE);
+       } catch( ... ) {
+        std::cout << "[DeviceManager::post_ctor] While opening PRF: Unknown Exception\n";
+        exit(EXIT_FAILURE);
+       }
+
+       PRFParser _PRFparser ( _prf );
+       _prf->close();
+       std::vector <PRFProperty *> *prfSimpleProp = _PRFparser.getConfigureProperties ();
+       CF::Properties configCapacities;
+       configCapacities.length (prfSimpleProp->size ());
+       for (unsigned int i = 0; i < prfSimpleProp->size (); i++)
+       {
+        configCapacities[i] = *((*prfSimpleProp)[i]->getDataType ());
+       }
+
+//configure properties
+       DEBUG(3, DevMgr, "Configuring capacities")
+       tempDevice->configure (configCapacities);
       }
 
-      PRFParser _PRFparser ( _prf );
-      _prf->close();
-      std::vector <PRFProperty *> *prfSimpleProp = _PRFparser.getConfigureProperties ();
-      CF::Properties configCapacities;
-      configCapacities.length (prfSimpleProp->size ());
-      for (unsigned int i = 0; i < prfSimpleProp->size (); i++)
-      {
-       configCapacities[i] = *((*prfSimpleProp)[i]->getDataType ());
-      }
-
-//configure properties
-      DEBUG(3, DevMgr, "Configuring capacities")
-      tempDevice->configure (configCapacities);
       DEBUG(3, DevMgr, "Registering device")
       try
@@ -229 +231 @@
        std::cout << "[DeviceManager::post_ctor] While registering Device: " << _ex.msg << "\n";
        exit(EXIT_FAILURE);
+      } catch( CF::FileException &_ex ) {
+       std::cout << "[DeviceManager::post_ctor] While registering Device: " << _ex.msg << "\n";
       } catch( ... ) {
        std::cout << "[DeviceManager::post_ctor] While registering Device: Unknown Exception\n";
@@ -323 +327 @@
     if (CORBA::is_nil (registeringDevice)) {
         //writeLogRecord(FAILURE_ALARM,invalid reference input parameter.)
-
         throw (CF::
             InvalidObjectReference
             ("[DeviceManager::registerDevice] Cannot register Device. registeringDevice is a nil reference."));
-        return;
     }
 

ossiedev/branches/ssayed/devs/src/system/ossie/framework/DomainManager_impl.cpp

@@ -245 +245 @@
     string mountPoint = "/";
     mountPoint += deviceMgr->label();
-
-    _fileMgr->mount (mountPoint.c_str(), deviceMgr->fileSys ());
+    try
+    {
+     _fileMgr->mount (mountPoint.c_str(), deviceMgr->fileSys ());
+    } catch( CF::InvalidFileName &_ex ) {
+     std::cout << "[DomainManager::registerDeviceManager] While mounting DevMgr FileSys: " << _ex.msg << "\n";
+     exit(EXIT_FAILURE);
+    } catch( ... ) {
+     std::cout << "[DomainManager::registerDeviceManager] While mounting DevMgr FileSys: Unknown Exception\n";
+     exit(EXIT_FAILURE);
+    }
 
 //      add all devices under device manager to registereddevice att.
@@ -335 +343 @@
         throw (CF::
             InvalidObjectReference
-            ("Cannot unregister Device. DeviceMgr is a nil reference."));
+            ("[DomainManager::unregisterDeviceManager] Cannot unregister Device. DeviceMgr is a nil reference."));
         return;
     }
@@ -466 +474 @@
         throw (CF::
             InvalidObjectReference
-            ("Cannot register Device. Either Device or DeviceMgr is a nil reference."));
-        return;
+            ("[DomainManager::registerDevice] Cannot register Device. Either Device or DeviceMgr is a nil reference."));
     }
 
@@ -476 +483 @@
 
         throw CF::DomainManager::DeviceManagerNotRegistered ();
-        return;
     }
 
@@ -490 +496 @@
 //              throw( CF::InvalidProfile() );
         throw CF::InvalidProfile ();
-        return;
     }