Changeset 3400

Timestamp:

04/12/07 15:43:01 (6 years ago)

Author:

balister

Message:

Split file system creation from file manager.

Location:

ossie/trunk/ossie

Files:

• framework/DeviceManager_impl.cpp (modified) (2 diffs)
• framework/DomainManager_impl.cpp (modified) (3 diffs)
• framework/FileManager_impl.cpp (modified) (2 diffs)
• framework/FileSystem_impl.cpp (modified) (1 diff)
• include/ossie/DeviceManager_impl.h (modified) (2 diffs)
• include/ossie/DomainManager_impl.h (modified) (2 diffs)
• include/ossie/FileSystem_impl.h (modified) (1 diff)

ossie/trunk/ossie/framework/DeviceManager_impl.cpp

@@ -47 +47 @@
 
 
-DeviceManager_impl::DeviceManager_impl(const char *DCDInput)
+DeviceManager_impl::DeviceManager_impl(const char *DCDInput, const char *rootPath)
 
 {
     DEBUG(6, DeviceManager, "Entering constructor with " << DCDInput);
-
-  _deviceConfigurationProfile = DCDInput;
+    
+    _deviceConfigurationProfile = DCDInput;
+    fsRoot = rootPath;
 }
 
@@ -67 +68 @@
     _registeredServices.length(0);
 
-    fs_servant = new FileSystem_impl();
+    fs_servant = new FileSystem_impl(fsRoot.c_str());
     _fileSys = fs_servant->_this();
 

ossie/trunk/ossie/framework/DomainManager_impl.cpp

@@ -38 +38 @@
 #include "ossie/debug.h"
 #include "ossie/DomainManager_impl.h"
+#include "ossie/FileSystem_impl.h"
 #include "ossie/ossieSupport.h"
 
@@ -44 +45 @@
 #endif
 
-DomainManager_impl::DomainManager_impl (const char *_dmdFile)
+DomainManager_impl::DomainManager_impl (const char *_dmdFile, const char *rootPath)
 {
 
@@ -60 +61 @@
 
     
-// Create file manager
+    // Create file manager
     FileManager_impl *_fileMgrImpl = new FileManager_impl ();
 
     _fileMgr = _fileMgrImpl->_this ();
+
+    // Create root file system and mount on File Manager
+    FileSystem_impl *fileSys_serv = new FileSystem_impl (rootPath);
+    fileSys = fileSys_serv->_this();
+
+    _fileMgr->mount ("/", fileSys);
 
     CF::File_var file = _fileMgr->open(_domainManagerProfile.c_str(), true);

ossie/trunk/ossie/framework/FileManager_impl.cpp

@@ -34 +34 @@
     DEBUG(4, FileManager, "Entering constructor.");
 
+    // Set the path validation check function, if it is not already set
     if (boost::filesystem::path::default_name_check_writable())
         boost::filesystem::path::default_name_check(boost::filesystem::portable_posix_name);
@@ -39 +40 @@
     numMounts = 0;
     mount_table = new CF::FileManager::MountSequence(5);
-
-    rootFileSys_serv = new FileSystem_impl ();
-    rootFileSys = rootFileSys_serv->_this();
-
-    mount ("/", rootFileSys);
 
     DEBUG(4, FileManager, "Leaving constructor.")

ossie/trunk/ossie/framework/FileSystem_impl.cpp

@@ -50 +50 @@
 
 
-FileSystem_impl::FileSystem_impl (char *_root)
+FileSystem_impl::FileSystem_impl (const char *_root)
 {
     DEBUG(6, FileSystem, "In constructor with " << _root);

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

@@ -43 +43 @@
     {
         public:
-        DeviceManager_impl (const char *);
+      DeviceManager_impl (const char *, const char *);
 
         // Run this after the constructor and the caller has created the object reference
@@ -94 +94 @@
         std::string _deviceConfigurationProfile;
 
+        std::string fsRoot;
         FileSystem_impl *fs_servant;
         CF::FileSystem_var _fileSys;

ossie/trunk/ossie/include/ossie/DomainManager_impl.h

@@ -96 +96 @@
     {
       public:
-        DomainManager_impl (const char*);
+      DomainManager_impl (const char*, const char*);
         ~DomainManager_impl ();
 
@@ -249 +249 @@
             _numDevMgrs;
 
-        CF::FileManager_ptr
-            _fileMgr;
+        CF::FileManager_var _fileMgr;
+        CF::FileSystem_var fileSys;
 
         void

ossie/trunk/ossie/include/ossie/FileSystem_impl.h

@@ -39 +39 @@
 public:
     FileSystem_impl ();
-    FileSystem_impl (char *_root);
+    FileSystem_impl (const char *_root);
     ~ FileSystem_impl ();