Changeset 8772 for ossiedev/trunk/system/ossie/framework/DeviceManager_impl.cpp

Timestamp:

02/25/09 02:12:51 (4 years ago)

Author:

shereef

Message:

DeviceManager? now supports multiple implementations

Files:

• ossiedev/trunk/system/ossie/framework/DeviceManager_impl.cpp (modified) (3 diffs)

ossiedev/trunk/system/ossie/framework/DeviceManager_impl.cpp

@@ -177 +177 @@
 //Parse local componenents from DCD files
      std::vector <componentPlacement> componentPlacements = _DCDParser.getComponentPlacements ();
+     if( componentPlacements.size() == 0 )
+     {
+      for( unsigned int i = 0; i < _DCDParser.getDeployOnComponents()->size(); i++ )
+      {
+       componentPlacements.push_back(componentPlacement(
+        (*_DCDParser.getDeployOnComponents())[i]->getFileRefId(),
+        (*_DCDParser.getDeployOnComponents())[i]->getInstantiationId(),
+        (*_DCDParser.getDeployOnComponents())[i]->getUsageName() ));
+      }
+     }
      DEBUG(2, DevMgr, "ComponentPlacement size is" << componentPlacements.size())
      for (unsigned int i = 0; i < componentPlacements.size(); i++)
@@ -209 +219 @@
       for( unsigned int j = 0; j < _implementations->size(); j++ )
       {
-       std::cout << "[DeviceManager::post_ctor] Checking idx: " << j << std::endl;
+       std::cout << "[DeviceManager::post_ctor] Checking idx: " << j << " of " << _implementations->size() << std::endl;
        std::vector< std::string > _devprocessors = (*_implementations)[j]->getProcessors();
-       std::vector< std::string > _devmgrprocessors = (*_devmgrspdimpl)[j]->getProcessors();
+       std::vector< std::string > _devmgrprocessors = (*_devmgrspdimpl)[0]->getProcessors();
         // Assume only one processor per implementation
         // -- test if the target processor matches; if not, get next implementation
+       DEBUG(4, DevMgr, "Comparing processors")
        if( _devprocessors[0] != _devmgrprocessors[0] ) continue;
+       DEBUG(4, DevMgr, "Device processor matches DeviceManager processor")
        OSAttributes _devosattr = (*_implementations)[j]->getOperatingSystem();
-       OSAttributes _devmgrosattr = (*_devmgrspdimpl)[j]->getOperatingSystem();
+       OSAttributes _devmgrosattr = (*_devmgrspdimpl)[0]->getOperatingSystem();
         // -- test if the target OS matches; if not, get next implementation
-       if( strcmp( _devosattr.getOSName(), _devmgrosattr.getOSName() ) != 0 ) continue;
+       DEBUG(4, DevMgr, "Comparing OSes")
+       if( strcmp( _devosattr.getOSName(), _devmgrosattr.getOSName() ) < 0 ) continue;
+       DEBUG(4, DevMgr, "Device OS matches DeviceManager OS")
        _implIdx = j;
        break;
@@ -236 +250 @@
       int myPid2;
 
-      DEBUG(2, DevMgr, "Launching Device file " << (*_implementations)[_implIdx]->getCodeFile () << " Usage name " << componentPlacements[_implIdx].usageName())
+      DEBUG(2, DevMgr, "Launching Device file " << (*_implementations)[_implIdx]->getCodeFile () << " Usage name " << componentPlacements[i].usageName())
 
       if ((myPid2 = fork()) < 0) std::cout << "Fork Error" << std::endl;