Changeset 8878

Timestamp:

03/05/09 17:40:07 (4 years ago)

Author:

mcarrick

Message:

cleaning up unnecessary variables, improving readability

Files:

• ossiedev/trunk/system/ossie/framework/ApplicationFactory_impl.cpp (modified) (1 diff)

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

@@ -935 +935 @@
 void ApplicationFactory_impl::matchDeviceToComponent(SPDParser*  spd, const std::vector<SPDImplementation*>& _devspdimpls)
 {
-        for(unsigned int m = 0; m < _devspdimpls.size(); m++)
+    // Go through devices, and search through the current component 
+    // SPD file and collects paths for all binaries to be executed.
+
+    // check all device implemtations
+    for(unsigned int m = 0; m < _devspdimpls.size(); m++)
+    {
+        // get information on device OS and processor
+        OSAttributes _osattr = _devspdimpls[m]->getOperatingSystem();
+        std::vector<std::string> _proclist = _devspdimpls[m]->getProcessors();
+
+        // store implementation info from current SPD file
+        std::vector <SPDImplementation*> *compImpl = spd->getImplementations();
+
+        // search compImpl for matching implementation details from device,
+        // stop once the first matching implementation is found
+        // (this checking section will need to be expanded if other
+        // options need to be verified: compiler, etc.)
+
+        // (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.");
+
+        // flip through all component implementations
+        bool implFound = false; // flag to determine if an implementation has been found
+        int i = 0; // counter variable for looping through components
+
+        while(!implFound & i < compImpl->size())
         {
-         OSAttributes _osattr = _devspdimpls[m]->getOperatingSystem();
-         std::vector<std::string> _proclist = _devspdimpls[m]->getProcessors();
-    // Given a current device, this function searches through the current
-    // component SPD file and collects paths for all binaries to be
-    // executed.
-
-    // store implementation info from current SPD file
-    std::vector <SPDImplementation*> *compImpl = spd->getImplementations();
-
-    // ----------------- (DELETE THESE LINES) ---------------------
-    // ----------------- ( TEST VECTORS ) -------------------------
-    std::string os = _osattr.getOSName();
-    std::string proc = _proclist[0];
-    std::string version = _osattr.getOSVersion();
-
-    // the if () statements will need to be changes once the real
-    // variable name is given.
-    // ------------------------------------------------------------
-
-    // search compImpl for matching implementation details from device,
-    // stop once the first matching implementation is found
-    // (this checking section will need to be expanded if other
-    // options need to be verified: compiler, etc.)
-
-    // (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.");
-
-    bool implFound = false; // flag to determine if an implementation has been found
-    int i = 0; // counter variable for looping through components
-
-    // flip through all component implementations
-    while(!implFound & i < compImpl->size())
-    {
-        // match OS name and version
-        if ((*compImpl)[i]->getOperatingSystem().getOSName() == os & (*compImpl)[i]->getOperatingSystem().getOSVersion() == version)
+            // match OS name and version
+            std::string compImplOSName = (*compImpl)[i]->getOperatingSystem().getOSName();
+            std::string compImplOSVersion = (*compImpl)[i]->getOperatingSystem().getOSVersion();
+
+            if ( compImplOSName == string(_osattr.getOSName()) & compImplOSVersion == string(_osattr.getOSVersion()) )
+            {
+                // get list of compatable processors in component impl
+                std::vector <std::string> compatibleProcs = (*compImpl)[i]->getProcessors();
+
+                // loop through candidate procs, match to device
+                int k = 0; // counter variable 
+                while (!implFound & k < compatibleProcs.size())
+                {
+                    // match processor
+                    int p = 0;
+                    while (!implFound & p < _proclist.size())
+                    {
+                        if (compatibleProcs[k] == _proclist[p])
+                        {
+                            implFound = true; // implementation has been matched, break out of loops
+
+                            DEBUG(4, AppFac, "Found operating system match: "
+                                << _osattr.getOSName() << ", " << _osattr.getOSVersion() );
+
+                            DEBUG(4, AppFac, "Found processor match: " << _proclist[p]);
+
+                            // return path to executable
+                            std::string path = (*compImpl)[i]->getCodeFile();
+                            implsToExecute.push_back(path);
+                        }
+
+                        k++;
+                    }
+                }
+            }
+
+            i++;
+        }
+
+        // if a component implementation cannot be matched to the device, error out
+        if (!implFound)
         {
-            // get list of compatable processors in component impl
-            std::vector <std::string> procs = (*compImpl)[i]->getProcessors();
-
-            // loop through candidate procs, match to device
-            int k = 0; // counter variable 
-            while (!implFound & k < procs.size())
-            {
-                // match processor
-                if (procs[k] == proc)
-                {
-                    implFound = true; // implementation has been matched, break out of loops
-
-                    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);
-                }
-
-                k++;
-            }
+            std::cout <<  "[ApplicationFactory::matchDeviceToComponents] Could not match an implementation of " << spd->getSoftPkgName() << " to the current device\n";
+            exit(EXIT_FAILURE);
         }
-
-        i++;
     }
-
-    // if a component implementation cannot be matched to the device, error out
-    if (!implFound)
-    {
-        std::cout <<  "[ApplicationFactory::matchDeviceToComponents] Could not match an implementation of " << spd->getSoftPkgName() << " to the current device\n";
-        exit(EXIT_FAILURE);
-    }
-        }
 }