Changeset 11064

Timestamp:

03/12/12 16:09:32 (15 months ago)

Author:

Snyder.Jason

Message:

committing patches from opencpi

Location:

ossiedev/branches/jsnyder/trunk

Files:

• Makefile.am (modified) (1 diff)
• system/ossie/framework/FileManager_impl.cpp (modified) (5 diffs)
• system/ossie/framework/FileSystem_impl.cpp (modified) (6 diffs)
• system/ossie/framework/File_impl.cpp (modified) (2 diffs)
• system/ossie/framework/helperFunctions.cpp (modified) (3 diffs)
• system/ossie/include/ossie/FileSystem_impl.h (modified) (3 diffs)
• system/ossie/parser/DASParser.cpp (modified) (1 diff)

ossiedev/branches/jsnyder/trunk/Makefile.am

@@ -61 +61 @@
 
 install-data-hook:
-        -cp -rf $(prefix)/lib/* $(libdir)
-        -rm -rf $(prefix)/lib
+        -if [ $(prefix)/lib != $(libdir) ]; then \
+            cp -rf $(prefix)/lib/* $(libdir); \
+            rm -rf $(prefix)/lib; \
+         fi
         -cp -rf $(prefix)/dom/xml/dtd/ $(prefix)/dev/xml/
-        -mv $(prefix)/bin/nodeBooter $(nbdir)
-        -mv $(prefix)/bin/c_wavLoader $(nbdir)
+        -if [ $(prefix)/bin != $(nbdir) ]; then \
+            mv $(prefix)/bin/nodeBooter $(nbdir); \
+            mv $(prefix)/bin/c_wavLoader $(nbdir); \
+         fi
         -chown -R $(SUDO_USER).$(SUDO_USER) $(prefix)
 

ossiedev/branches/jsnyder/trunk/system/ossie/framework/FileManager_impl.cpp

@@ -23 +23 @@
 #include <iostream>
 #include <string>
-#include <sstream>
-
-#include <boost/filesystem/operations.hpp>
-#include <boost/filesystem/path.hpp>
-#include <boost/filesystem/exception.hpp>
-
-#ifndef BOOST_VERSION
-#include <boost/version.hpp>
-#endif
-
-#if BOOST_VERSION < 103500
-#  include <boost/filesystem/cerrno.hpp>
-#else
-#  include <boost/cerrno.hpp>
-#endif
-
-namespace fs = boost::filesystem;
+
 
 #include "ossie/cf.h"
 #include "ossie/FileManager_impl.h"
 #include "ossie/debug.h"
+#include "ossie/ossieSupport.h"
 
 FileManager_impl::FileManager_impl ():FileSystem_impl ()
@@ -251 +236 @@
     int result_length = 0;
     int tmp_length = 0;
-    try {
         for ( unsigned int i = 0; i < numMounts; i++ ) {
             DEBUG(4, FileManager, "Calling FileSystem->list");
@@ -282 +266 @@
         DEBUG(4, FileManager, "About to return from list");
         return result._retn();
-    } catch (const fs::filesystem_error &ex) {
-#if BOOST_VERSION < 103400
-        DEBUG(9, FileManager, "Caught exception in list, error_code " << ex.error());
-        if (ex.error() == fs::other_error)
-#elif BOOST_VERSION < 103500
-        DEBUG(9, FileManager, "Caught exception in list, error_code " << ex.system_error());
-        if (ex.system_error() == EINVAL)
-#else
-        DEBUG(9, FileManager, "Caught exception in list, error_code " << ex.code().value()); ;
-        if (ex.code().value() == EINVAL)
-#endif
-            throw CF::InvalidFileName(CF::CFEINVAL, ex.what());
-        throw CF::FileException(CF::CFNOTSET, ex.what());
-    }
 }
 
@@ -491 +461 @@
     DEBUG(5, FileManager, "Entering getFSandFSPath with path " << path);
 
-    fs::path fullPath(path);
-    fs::path::iterator fullItr(fullPath.begin());
     std::string tmpFSPath;
 
@@ -514 +482 @@
     DEBUG(5, FileManager, "Entering pathMatches with path " << path << " mount point " << mPoint);
 
-    fs::path fullPath(path);
-    fs::path::iterator fullItr(fullPath.begin());
-
-    fs::path mPath(mPoint);
-    fs::path::iterator mItr(mPath.begin());
-
-    unsigned int commonElements(0);
-
-    while (fullItr != fullPath.end()) {
-        if (*fullItr != *mItr)
-            break;
-        ++fullItr;
-        ++mItr;
-        ++commonElements;
-    }
-
-
-    fs::path localPath("/");
-
-    while (fullItr != fullPath.end()) {
-        localPath /= *fullItr;
-        ++fullItr;
-    }
-    FSPath = localPath.string();
+    unsigned n = 0, commonElements = 0;
+    for (n = 0; *path && *mPoint && *path == *mPoint; n++, path++, mPoint++)
+      if (n && *path == '/')
+        commonElements++;
+    FSPath = path;
 
     DEBUG(5, FileManager, "Path matches with " << commonElements << " path elements in common and remaining path " << FSPath);

ossiedev/branches/jsnyder/trunk/system/ossie/framework/FileSystem_impl.cpp

@@ -21 +21 @@
 ****************************************************************************/
 
+#include <string>
+#include "ossie/FileSystem_impl.h"
+
+#ifdef USE_OPENCPI_FS
+#include "OcpiUtilFileFs.h"
+#include "OcpiCFUtilVfsFileSystem.h"
+
+
+FileSystem_impl::FileSystem_impl()
+: OCPI::CFUtil::VfsFileSystem(ossieSupport::ORB::poa,
+                              new OCPI::Util::FileFs::FileFs())
+{
+}
+FileSystem_impl::FileSystem_impl(const char *root)
+: OCPI::CFUtil::VfsFileSystem(ossieSupport::ORB::poa,
+                              new OCPI::Util::FileFs::FileFs(root))
+{
+}
+
+FileSystem_impl::~FileSystem_impl(){}
+
+// static
+bool FileSystem_impl::isValidPath(const char *path) {
+  try {
+    std::string s(path);
+    testFileName(s);
+  } catch (...) {
+    return false;
+  }
+  return true;
+}
+
+// static
+void FileSystem_impl::joinPath(const char *base, const char *rel, std::string &result) {
+  result = OCPI::Util::Vfs::joinNames(OCPI::Util::Vfs::directoryName(base), rel);
+}
+
+#else
 /* SCA */
 
 #include <iostream>
-#include <string>
-
 #include <fnmatch.h>
 
@@ -43 +79 @@
 namespace fs = boost::filesystem;
 
-#include "ossie/FileSystem_impl.h"
 #include "ossie/debug.h"
 
@@ -76 +111 @@
     DEBUG(6, FileSystem, "In destructor.");
 }
+
+// Filename utility functions as static member functions of FileSystem_impl, 
+// implemented using boost here, to limit boost dependency to here
+// static
+bool FileSystem_impl::isValidPath(const char *fileName) {
+    try {
+        fs::path testPath(fileName);
+    } catch (...) {
+        return false;
+    }
+
+    return true;
+}
+// static
+void FileSystem_impl::joinPath(const char *spdFile, const char *name, std::string &fileName) {
+    fs::path spdPath(spdFile);
+
+    fs::path filePath = spdPath.branch_path() / name;
+
+    fileName = filePath.string();
+}
+
 
 void FileSystem_impl::remove (const char *fileName) throw (CORBA::SystemException, CF::FileException, CF::InvalidFileName)
@@ -157 +214 @@
             DEBUG(9, FileSystem, "In list checking file " << itr->path().filename());
             if (fnmatch(searchPattern.c_str(), itr->path().filename().c_str(), 0) == 0) {
-                DEBUG(9, FileSystem, "Match in list with " << itr->path().filename());
+                DEBUG(9, FileSystem, "Match in list with " << itr->path().string());
                 fis->length(idx + 1);
 
@@ -214 +271 @@
     result->length(0);
 
-    recursiveList(rootDirPath, pattern, result);
-
+    try {
+      recursiveList(rootDirPath, pattern, result);
+    } catch (const fs::filesystem_error &ex) {
+      // Convert boost fs errors into SCA FileSystem errors
+#if BOOST_VERSION < 103400
+      DEBUG(9, FileManager, "Caught exception in list, error_code " << ex.error());
+      if (ex.error() == fs::other_error)
+#elif BOOST_VERSION < 103500
+      DEBUG(9, FileManager, "Caught exception in list, error_code " << ex.system_error());
+      if (ex.system_error() == EINVAL)
+#else
+      DEBUG(9, FileManager, "Caught exception in list, error_code " << ex.code().value()); ;
+      if (ex.code().value() == EINVAL)
+#endif
+        throw CF::InvalidFileName(CF::CFEINVAL, ex.what());
+      throw CF::FileException(CF::CFNOTSET, ex.what());
+    }
     return result._retn();
 }
@@ -369 +441 @@
 
 ///\todo Implement File object reference clean up.
+#endif /* end of else of ifdef USE_OPENCPI_FS */

ossiedev/branches/jsnyder/trunk/system/ossie/framework/File_impl.cpp

@@ -21 +21 @@
 ****************************************************************************/
 
+#ifndef USE_OPENCPI_FS // This entire file isn't needed of we are using OpenCPI FS
 #include <iostream>
 #include <fstream>
@@ -136 +137 @@
     f.seekp(_filePointer);
 }
+#endif /* of ifndef USE_OPENCPI_FS */

ossiedev/branches/jsnyder/trunk/system/ossie/framework/helperFunctions.cpp

@@ -24 +24 @@
 #include <iostream>
 
-#include <boost/filesystem/path.hpp>
-
-namespace fs = boost::filesystem;
+#include "ossie/FileSystem_impl.h"
 
 #include <ossie/ossieSupport.h>
@@ -40 +38 @@
 bool ossieSupport::isValidFileName(const char *fileName)
 {
-    try {
-        fs::path testPath(fileName);
-    } catch (...) {
-        return false;
-    }
-
-    return true;
+  return FileSystem_impl::isValidPath(fileName);
 }
 
@@ -52 +44 @@
 {
     DEBUG(9, spd_rel_file, "Called with spdFile: " << spdFile << ", name: " << name);
-    fs::path spdPath(spdFile);
 
-    fs::path filePath = spdPath.branch_path() / name;
-
-    fileName = filePath.string();
+    FileSystem_impl::joinPath(spdFile, name, fileName);
 
     DEBUG(9, spd_rel_file, "Result: " << fileName);

ossiedev/branches/jsnyder/trunk/system/ossie/include/ossie/FileSystem_impl.h

@@ -25 +25 @@
 #define __FILESYSTEM_IMPL__
 
+#include "ossie/cf.h"
+#include "ossie/ossieSupport.h"
+#ifdef USE_OPENCPI_FS
+
+#include "OcpiCFUtilVfsFileSystem.h"
+
+class FileSystem_impl : OCPI::CFUtil::VfsFileSystem, virtual public POA_CF::FileSystem {
+ public:
+  // The standalone constructor to create a file system based on a URL
+  FileSystem_impl(const char *url);
+  FileSystem_impl();
+  ~FileSystem_impl();
+  static bool isValidPath(const char *path);
+  static void joinPath(const char *base, const char *rel, std::string &result);
+};
+#else
+
 #include <vector>
 #include <string>
@@ -41 +58 @@
     FileSystem_impl (const char *_root);
     ~ FileSystem_impl ();
+
+    static bool isValidPath(const char *path);
+
+    static void joinPath(const char *base, const char *rel, std::string &result);
 
     void remove (const char *fileName)
@@ -89 +110 @@
 
 };                                                /* END CLASS DEFINITION FileSystem */
+#endif                                            /* end of else of ifdef USE_OPENCPI_FS */
 #endif                                            /* __FILESYSTEM__ */

ossiedev/branches/jsnyder/trunk/system/ossie/parser/DASParser.cpp

@@ -38 +38 @@
     das_file->read(fileData, fileSize);
 
-    das_file->close();
+    // das_file->close(); removed this since the only caller does this, like others
 
     unsigned char *fileBuffer = fileData->get_buffer();