Changeset 7904

Timestamp:

06/19/08 12:56:31 (5 years ago)

Author:

shereef

Message:

ExecutableDevice? crashes calling 'execv'; I'm in big trouble

Location:

ossiedev/branches/ssayed/devs/src

Files:

• components/ChannelDemo/ChannelDemo.spd.xml (modified) (1 diff)
• components/RxDemo/RxDemo.spd.xml (modified) (1 diff)
• components/TxDemo/TxDemo.spd.xml (modified) (1 diff)
• system/ossie/framework/ApplicationFactory_impl.cpp (modified) (1 diff)

ossiedev/branches/ssayed/devs/src/components/ChannelDemo/ChannelDemo.spd.xml

@@ -20 +20 @@
         <description>Linux implementation</description> 
         <code type="Executable">
-            <localfile name="bin/ChannelDemo"/>
+            <localfile name="/../../bin/ChannelDemo"/>
         </code>
         <processor name="x86"/>

ossiedev/branches/ssayed/devs/src/components/RxDemo/RxDemo.spd.xml

@@ -20 +20 @@
         <description>Linux implementation</description> 
         <code type="Executable">
-            <localfile name="bin/RxDemo"/>
+            <localfile name="/../../bin/RxDemo"/>
         </code>
         <processor name="x86"/>

ossiedev/branches/ssayed/devs/src/components/TxDemo/TxDemo.spd.xml

@@ -20 +20 @@
         <description>Linux implementation</description> 
         <code type="Executable">
-            <localfile name="bin/TxDemo"/>
+            <localfile name="/../../bin/TxDemo"/>
         </code>
         <processor name="x86"/>

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

@@ -182 +182 @@
             /// \TODO Validate that the intended device supports the LoadableDevice interface
      
-            DEBUG(1, AppFact, "loading " << component->getLocalFileName())
-            
-                        CF::FileSystem_ptr fs = CF::FileSystem::_narrow(dmnMgr->fileMgr());
-            device->load (fs, component->getLocalFileName(), component->getCodeType());
-            
+        DEBUG(1, AppFact, "loading " << component->getLocalFileName())
+
+        int idx = 0;
+
+        CF::FileManager_var fileMgr = dmnMgr->fileMgr();
+
+        CF::FileManager::MountSequence_var mts = fileMgr->getMounts();
+
+        for( int i = 0; i < mts->length(); i++ )
+        {
+         try
+         {
+          if( mts[i].fs->exists( component->getLocalFileName() ) ) idx = i;
+         } catch( CF::InvalidFileName &_ex ) {
+          std::cout << "[ApplicationFactory::create] Searching for FileSys containing " << component->getLocalFileName() << "\n";
+         } catch( CF::FileException &_ex ) {
+          std::cout << "[ApplicationFactory::create] Searching for FileSys containing " << component->getLocalFileName() << "\n";
+         } catch( ... ) {
+         }
+        }
+    
+        try
+        {
+         device->load (mts[idx].fs, component->getLocalFileName(), component->getCodeType());
+        } catch( CF::InvalidFileName &_ex ) {
+         std::cout << "[ApplicationFactory::create] While loading ExecDev: " << _ex.msg << "\n";
+         exit(EXIT_FAILURE);
+        } catch( CF::Device::InvalidState &_ex ) {
+         std::cout << "[ApplicationFactory::create] While loading ExecDev: " << _ex.msg << "\n";
+         exit(EXIT_FAILURE);
+        } catch( ... ) {
+         std::cout << "[ApplicationFactory::create] While loading ExecDev: Unknown Exception\n";
+         exit(EXIT_FAILURE);
+        }            
             // Execute when necesary
-            if (component->getCodeType() == CF::LoadableDevice::EXECUTABLE
+       if (component->getCodeType() == CF::LoadableDevice::EXECUTABLE
                     || component->getCodeType() == CF::LoadableDevice::SHARED_LIBRARY
                     && strcmp (component->getEntryPoint(), "") != 0) {
                 /// \TODO: Validate that the intended device supports the LoadableDevice interface
                 
-                DEBUG(1, AppFact, "executing-> " << component->getLocalFileName())
-
-                                CF::DataType dt;
-                                dt.id = component->getIdentifier();
-
-                                string initial_name("");
+         DEBUG(1, AppFact, "executing-> " << component->getLocalFileName())
+
+         CF::DataType dt;
+         dt.id = component->getIdentifier();
+
+         string initial_name("");
                                 
-                                if (!strncmp("DomainName1", component->getNamingServiceName(), 11)) {
-                                        initial_name.append((component->getNamingServiceName()+12));
-                                } else {
-                                        initial_name.append(component->getNamingServiceName());
-                                }
+         if (!strncmp("DomainName1", component->getNamingServiceName(), 11)) 
+         {
+          initial_name.append((component->getNamingServiceName()+12));
+         } else {
+          initial_name.append(component->getNamingServiceName());
+         }
                                 
-                                dt.value <<= component->getNamingServiceName();
+         dt.value <<= component->getNamingServiceName();
                                         
-                                component->addExecParameter(&dt);
-                                                
-                                CF::ExecutableDevice::ProcessID_Type tempPid = device->
-                                                execute (component->getLocalFileName(),
-                                                                 component->getOptions(),
-                                                                 component->getExecParameters());
-
-                                if (tempPid < 0) {
-                                        /// \TODO throw exception here
-                                } else {
-                                        _pidSeq->length (_pidSeq->length() + 1);
-                                        (* _pidSeq)[_pidSeq->length() - 1].processId = tempPid;
-                                        (* _pidSeq)[_pidSeq->length() - 1].componentId =
-                                                CORBA::string_dup(component->getIdentifier());
-                                }
-                                // NOTE: The PID returned by execute is not handled
-                                // An exception shall be thrown when PID = -1
-            }
-        }
+         component->addExecParameter(&dt);
+        CF::ExecutableDevice::ProcessID_Type tempPid;
+        try
+        {       
+         tempPid = device->execute (component->getLocalFileName(), component->getOptions(), component->getExecParameters());
+        } catch( CF::InvalidFileName &_ex ) {
+         std::cout << "[ApplicationFactory::create] When calling 'execute' on a device: " << _ex.msg << "\n";
+         exit(EXIT_FAILURE);
+        } catch( CF::Device::InvalidState &_ex ) {
+         std::cout << "[ApplicationFactory::create] When calling 'execute' on a device: " << _ex.msg << "\n";
+         exit(EXIT_FAILURE);
+        } catch( ... ) {
+         std::cout << "[ApplicationFactory::create] When calling 'execute' on a device: Unknown Exception\n";
+         exit(EXIT_FAILURE);
+        }
+
+        if (tempPid < 0) {
+        /// \TODO throw exception here
+        } else {
+         _pidSeq->length (_pidSeq->length() + 1);
+         (* _pidSeq)[_pidSeq->length() - 1].processId = tempPid;
+         (* _pidSeq)[_pidSeq->length() - 1].componentId =
+         CORBA::string_dup(component->getIdentifier());
+        }
+        // NOTE: The PID returned by execute is not handled
+        // An exception shall be thrown when PID = -1
+      }
+     }
     }