Changeset 3356

Timestamp:

04/08/07 08:36:57 (6 years ago)

Author:

balister

Message:

Compiles again, but segfaults in SPD Parser.

Location:

ossie/trunk/ossie

Files:

• framework/Application_impl.cpp (modified) (7 diffs)
• framework/DeviceManager_impl.cpp (modified) (3 diffs)
• framework/DomainManager_impl.cpp (modified) (7 diffs)
• include/ossie/DeviceManager_impl.h (modified) (2 diffs)
• include/ossie/SPDImplementation.h (modified) (1 diff)
• parser/SPDParser.cpp (modified) (2 diffs)

ossie/trunk/ossie/framework/Application_impl.cpp

@@ -286 +286 @@
             _rscObj = _orb->get_object_from_name ((*appComponentNamingContexts)[mem].elementId);
 
+#if 0 ///\todo Remove dependency on SAD Parser
         char *localFileName;
         localFileName = new char[256];
@@ -303 +304 @@
         }
         else {
+#endif
             CF::Resource_ptr _rsc = CF::Resource::_narrow (_rscObj);
             DEBUG(2, App, "about to release Object")
@@ -309 +311 @@
             //ossieSupport::sleep(1);
             DEBUG(3, App, "returned from releaseObject")
-        }
+#if 0
+        }
+#endif
         DEBUG(2, App, "app->releaseObject finished releasing this component")
 
@@ -329 +333 @@
                         else
                                 component_found = 1;
+#if 0 ///todo Remove dependency on SAD Parser
                 if (strlen(localFileName)>0) {
                   CF::LoadableDevice_var loadDev = CF::LoadableDevice::_narrow(_devObj);
@@ -334 +339 @@
                   loadDev->unload(localFileName);
                 }
+#endif
                 //check if there is any process running for this component
                 //if the componentId is contained in the processIdList, then terminate the process
@@ -347 +353 @@
                   }
                 }
+#if 0 ///\todo Remove dependency on SAD Parser
                 CF::Device_var dev = CF::Device::_narrow(_devObj);
                 const char *PRFFileName = _spdParser.getPRFFile ();
@@ -367 +374 @@
                     DEBUG(3, App, "No capacity to deallocate")
                 }
+#endif
             }
        }

ossie/trunk/ossie/framework/DeviceManager_impl.cpp

@@ -101 +101 @@
         for (unsigned int i = 0; i < componentPlacements.size(); i++)
         {
-//get spd reference
-//parse spd file
-            SPDParser _SPDParser (_DCDParser.getFileNameFromRefId(componentPlacements[i].refId()));
+            CF::File_var file = _fileSys->open(_DCDParser.getFileNameFromRefId(componentPlacements[i].refId()), true);
+
+            SPDParser _SPDParser (file);
+            file->close();
 
 //get code file name from implementation
@@ -134 +135 @@
                 // in child
                 if (getenv("VALGRIND")) {
-                    string logFile = "--log-file=";
+                    std::string logFile = "--log-file=";
                     logFile += (*_implementations)[0]->getCodeFile ();
                     char *val = "/usr/local/bin/valgrind";
@@ -556 +557 @@
 #endif
 
-    cout << "If this appears look at DeviceManager_impl.cpp line 572" << endl;
+    std::cout << "If this appears look at DeviceManager_impl.cpp line 572" << std::endl;
 /*for (int i = 0; i<localComponentsVector->size();i++)
    {

ossie/trunk/ossie/framework/DomainManager_impl.cpp

@@ -74 +74 @@
 /// \todo Discuss using filename + path directly from xml and screwing with FileSystem
 
+#if 0
     SPDParser _DM_SPD_Parser (_DMDParser.getDomainManagerSoftPkg());
-
+#endif
 
 /*******************************************************
@@ -1028 +1029 @@
         CF::File_var file = _fileMgr->open(profileFileName, true);
         SADParser *sadParser = new SADParser (file);
+        file->close();
 
         DEBUG(8, DomainManager, "Done parsing SAD file.");
@@ -1058 +1060 @@
     DEBUG(8, DomainManager, "Create new Application Factory.");
 
-    appFact_servants.push_back(new ApplicationFactory_impl (sadParser, &_applications));
+    appFact_servants.push_back(new ApplicationFactory_impl (sadParser, _fileMgr, &_applications));
 
     DEBUG(8, DomainManager, "Add Application Factory to list.");
@@ -1377 +1379 @@
     DEBUG(6, DomainManager, "Entering validateSPD.");
 
+#if 0 ///\todo Figure out if this is really necessary
+    // It does not make sense to create and destroy parsers, this is a heavy operation
   if (_spdProfile == NULL)
     return;
@@ -1413 +1417 @@
       throw CF::DomainManager::ApplicationInstallationError (CF::CFEBADF, ex.msg);
     }
-
+#endif
 }
 
@@ -1421 +1425 @@
 {
     DEBUG(6, DomainManager, "Entering removeSPD.");
+
+#if 0 ///\todo Fiugre out shwt this code is for
+    // I think it supports s CF requirement that is silly
 
     if (_spdProfile == NULL)
@@ -1504 +1511 @@
             "[DomainManager:removeSPD] SPD file exception");
     }
+#endif
 }
 

ossie/trunk/ossie/include/ossie/DeviceManager_impl.h

@@ -1 +1 @@
 /****************************************************************************
 
-Copyright 2004, Virginia Polytechnic Institute and State University
+Copyright 2004, 2007 Virginia Polytechnic Institute and State University
 
 This file is part of the OSSIE Core Framework.
@@ -90 +90 @@
 
 // read only attributes
-        string _identifier;
-        string _label;
-        string _deviceConfigurationProfile;
+        std::string _identifier;
+        std::string _label;
+        std::string _deviceConfigurationProfile;
 
         FileSystem_impl *fs_servant;

ossie/trunk/ossie/include/ossie/SPDImplementation.h

@@ -47 +47 @@
  public:
   OSAttributes() {};
-  OSAttributes(const OSAttributes &);
+  //  OSAttributes(const OSAttributes &);
 
   void setOSName(const char * _name) { osName = _name; };

ossie/trunk/ossie/parser/SPDParser.cpp

@@ -210 +210 @@
 bool SPDParser::isScaCompliant()
 {
-        if(softPkgType == SPDParser::SCA_COMPLIANT) return true;
-        else return false;
+    if(softPkgType == "sca_compliant")
+        return true;
+    else
+        return false;
 }
 
@@ -217 +219 @@
 bool SPDParser::isScaNonCompliant()
 {
-        if(softPkgType == SPDParser::SCA_NON_COMPLIANT) return true;
-        else return false;
+    if(softPkgType == "sca_non_compliant")
+        return true;
+    else
+        return false;
 }