Changeset 8861

Timestamp:

03/03/09 20:18:28 (4 years ago)

Author:

mcarrick

Message:

AppFactory? checks against implementation details from device to find correct component implementations, this check in only operates on dummy data, however

Location:

ossiedev/trunk/system/ossie

Files:

• framework/ApplicationFactory_impl.cpp (modified) (2 diffs)
• include/ossie/ApplicationFactory_impl.h (modified) (1 diff)

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

@@ -136 +136 @@
         requiredComponents.clear();
         }
-    
+   
     getRequiredComponents(base_naming_context.c_str());
-    
+
     // If there is a device assignment sequence, verify its validity;
     // otherwise generate deployment information automatically
@@ -735 +735 @@
         _spd->close();
 
+        // store implementation info from current SPD file
+        std::vector <SPDImplementation*> *compImpl = spd.getImplementations();
+
+        // ----------------- (DELETE THESE LINES) ---------------------
+        // ----------------- ( TEST VECTORS ) -------------------------
+        std::string os = "Linux";
+        std::string proc = "powerpc";
+        std::string version = "2.6.26.3";
+
+        // the if () statements will need to be changes once the real
+        // variable name is given.
+
+        // ------------------------------------------------------------
+
+        // search compImpl for matching implementation details from device
+        // (this checking section will need to be expanded if other
+        // options need to be verified: compiler, 
+
+
+        // (it is currently assumed in SPDImplementation.h,
+        // DeviceManager.cpp, and other places that there is only
+        // a single OS. this is incorrect and needs to be fixed.)
+
+        DEBUG(4, AppFac, "Matching device implementation to candidate components.");
+        for (int i = 0; i < compImpl->size(); i++)
+        {
+            // match OS name
+            if ((*compImpl)[i]->getOperatingSystem().getOSName() == os) 
+            {
+                // match OS version
+                if ((*compImpl)[i]->getOperatingSystem().getOSVersion() == version)
+                {
+                    // get list of candidate processors in component impl
+                    std::vector <std::string> procs = (*compImpl)[i]->getProcessors();
+
+                    // loop through candidate procs, match to device
+                    for (int k = 0; k < procs.size(); k++)
+                    {
+                         // match processor
+                        if (procs[k] == proc)
+                        {
+                           DEBUG(4, AppFac, "Found operating system match: " 
+                               << (*compImpl)[i]->getOperatingSystem().getOSName()
+                               << ", "
+                               << (*compImpl)[i]->getOperatingSystem().getOSVersion() );
+
+                       
+                           DEBUG(4, AppFac, "Found processor match: " << procs[k]);
+
+                           // return path to executable
+                           std::string path = (*compImpl)[i]->getCodeFile();
+                           implsToExecute.push_back(path);
+                        }
+                    }
+                }
+            }
+            else
+            {
+                DEBUG(4, AppFac, "in getRequiredComponents, could not match component implementation to device.");
+            }
+        }
+
+
+
         try
         {

ossiedev/trunk/system/ossie/include/ossie/ApplicationFactory_impl.h

@@ -93 +93 @@
     vector <CF::Device_ptr> registeredDevices;
     vector <ossieSupport::ConnectionInfo *> connectionData;
-    
+
+    std::vector <std::string> implsToExecute;
+
     void verifyDeviceAssignments (const CF::DeviceAssignmentSequence & _deviceAssignments);
     void getRegisteredDevices();