move vfs to express

panda/src/chancfg/chancfg.cxx

@@ -31,6 +31,7 @@
 #include "dcast.h"
 
 #include <algorithm>
+#include <stdio.h>  // for sprintf
 
 
 Configure(chanconfig);

panda/src/express/Sources.pp

@@ -44,6 +44,12 @@
     typeRegistry.I typeRegistry.h \
     typeRegistryNode.I typeRegistryNode.h \
     vector_uchar.h \
+    virtualFileComposite.h virtualFileComposite.I virtualFile.h \
+    virtualFile.I virtualFileList.I virtualFileList.h virtualFileMount.h \
+    virtualFileMount.I virtualFileMountMultifile.h \
+    virtualFileMountMultifile.I virtualFileMountSystem.h \
+    virtualFileMountSystem.I virtualFileSimple.h virtualFileSimple.I \
+    virtualFileSystem.h virtualFileSystem.I \
     zStream.I zStream.h zStreamBuf.h \
     $[if $[HAVE_CRYPTO], \
        crypto_utils.cxx crypto_utils.h patchfile.I \
@@ -68,6 +74,10 @@
     trueClock.cxx typeHandle.cxx \
     typedObject.cxx typedReferenceCount.cxx \
     typeRegistry.cxx typeRegistryNode.cxx vector_uchar.cxx \
+    virtualFileComposite.cxx virtualFile.cxx virtualFileList.cxx \
+    virtualFileMount.cxx \
+    virtualFileMountMultifile.cxx virtualFileMountSystem.cxx \
+    virtualFileSimple.cxx virtualFileSystem.cxx \
     zStream.cxx zStreamBuf.cxx
 
   #define INSTALL_HEADERS  \
@@ -101,6 +111,12 @@
     typeRegistry.I typeRegistry.h \
     typeRegistryNode.I typeRegistryNode.h \
     vector_uchar.h \
+    virtualFileComposite.h virtualFileComposite.I virtualFile.h \
+    virtualFile.I virtualFileList.I virtualFileList.h virtualFileMount.h \
+    virtualFileMount.I virtualFileMountMultifile.h \
+    virtualFileMountMultifile.I virtualFileMountSystem.h \
+    virtualFileMountSystem.I virtualFileSimple.h virtualFileSimple.I \
+    virtualFileSystem.h virtualFileSystem.I \
     zStream.I zStream.h zStreamBuf.h
 
   #define IGATESCAN all

panda/src/express/config_express.cxx

@@ -18,11 +18,16 @@
 
 
 #include "config_express.h"
-#include "clockObject.h"
-#include "typedObject.h"
+#include "datagram.h"
 #include "referenceCount.h"
+#include "typedObject.h"
 #include "typedReferenceCount.h"
-#include "datagram.h"
+#include "virtualFile.h"
+#include "virtualFileComposite.h"
+#include "virtualFileMount.h"
+#include "virtualFileMountMultifile.h"
+#include "virtualFileMountSystem.h"
+#include "virtualFileSimple.h"
 
 #include <dconfig.h>
 
@@ -32,12 +37,18 @@ NotifyCategoryDef(express, "");
 extern void init_system_type_handles();
 
 ConfigureFn(config_express) {
-//  ClockObject::init_ptr();
-  TypedObject::init_type();
+  Datagram::init_type();
   ReferenceCount::init_type();
+  TypedObject::init_type();
   TypedReferenceCount::init_type();
+  VirtualFileComposite::init_type();
+  VirtualFile::init_type();
+  VirtualFileMount::init_type();
+  VirtualFileMountMultifile::init_type();
+  VirtualFileMountSystem::init_type();
+  VirtualFileSimple::init_type();
+
   init_system_type_handles();
-  Datagram::init_type();
 }
 
 

panda/src/express/express_composite1.cxx

@@ -1,4 +1,3 @@
-
 #include "buffer.cxx"
 #include "checksumHashGenerator.cxx"
 #include "clockObject.cxx"
@@ -8,6 +7,7 @@
 #include "datagramIterator.cxx"
 #include "datagramSink.cxx"
 #include "dcast.cxx"
+#include "error_utils.cxx"
 #include "get_config_path.cxx"
 #include "hashGeneratorBase.cxx"
 #include "hashVal.cxx"
@@ -16,4 +16,10 @@
 #include "memoryUsage.cxx"
 #include "memoryUsagePointerCounts.cxx"
 #include "memoryUsagePointers.cxx"
-#include "error_utils.cxx"
+#include "multifile.cxx"
+#include "namable.cxx"
+#include "nativeNumericData.cxx"
+#include "ordered_vector.cxx"
+#include "profileTimer.cxx"
+#include "pta_uchar.cxx"
+#include "referenceCount.cxx"

panda/src/express/express_composite2.cxx

@@ -1,11 +1,3 @@
-
-#include "multifile.cxx"
-#include "namable.cxx"
-#include "nativeNumericData.cxx"
-#include "ordered_vector.cxx"
-#include "profileTimer.cxx"
-#include "pta_uchar.cxx"
-#include "referenceCount.cxx"
 #include "register_type.cxx"
 #include "reversedNumericData.cxx"
 #include "streamReader.cxx"
@@ -19,6 +11,14 @@
 #include "typeRegistry.cxx"
 #include "typeRegistryNode.cxx"
 #include "vector_uchar.cxx"
+#include "virtualFile.cxx"
+#include "virtualFileComposite.cxx"
+#include "virtualFileList.cxx"
+#include "virtualFileMount.cxx"
+#include "virtualFileMountMultifile.cxx"
+#include "virtualFileMountSystem.cxx"
+#include "virtualFileSimple.cxx"
+#include "virtualFileSystem.cxx"
 #include "zStream.cxx"
 #include "zStreamBuf.cxx"
 

panda/src/putil/virtualFile.cxx → panda/src/express/virtualFile.cxx

@@ -19,7 +19,7 @@
 #include "virtualFile.h"
 #include "virtualFileSystem.h"
 #include "virtualFileList.h"
-#include "config_util.h"
+#include "config_express.h"
 
 TypeHandle VirtualFile::_type_handle;
 
@@ -162,7 +162,7 @@ read_file(string &result) const {
 
   istream *in = open_read_file();
   if (in == (istream *)NULL) {
-    util_cat.info()
+    express_cat.info()
       << "Unable to read " << get_filename() << "\n";
     return false;
   }
@@ -175,7 +175,7 @@ read_file(string &result) const {
   delete in;
 
   if (failed) {
-    util_cat.info()
+    express_cat.info()
       << "Error while reading " << get_filename() << "\n";
   }
   return !failed;

panda/src/putil/virtualFile.h → panda/src/express/virtualFile.h

@@ -35,7 +35,7 @@ class VirtualFileSystem;
 // Description : The abstract base class for a file or directory
 //               within the VirtualFileSystem.
 ////////////////////////////////////////////////////////////////////
-class EXPCL_PANDA VirtualFile : public TypedReferenceCount {
+class EXPCL_PANDAEXPRESS VirtualFile : public TypedReferenceCount {
 public:
   INLINE VirtualFile();
 

panda/src/putil/virtualFileComposite.h → panda/src/express/virtualFileComposite.h

@@ -30,7 +30,7 @@
 //               mount points.  The resulting directory appears to be
 //               the union of all the individual simple directories.
 ////////////////////////////////////////////////////////////////////
-class EXPCL_PANDA VirtualFileComposite : public VirtualFile {
+class EXPCL_PANDAEXPRESS VirtualFileComposite : public VirtualFile {
 public:
   INLINE VirtualFileComposite(VirtualFileSystem *file_system,
                               const Filename &filename);

panda/src/putil/virtualFileList.h → panda/src/express/virtualFileList.h

@@ -29,7 +29,7 @@
 // Description : A list of VirtualFiles, as returned by 
 //               VirtualDirectory::scan().
 ////////////////////////////////////////////////////////////////////
-class EXPCL_PANDA VirtualFileList : public ReferenceCount {
+class EXPCL_PANDAEXPRESS VirtualFileList : public ReferenceCount {
 public:
   INLINE VirtualFileList();
 

panda/src/putil/virtualFileMount.h → panda/src/express/virtualFileMount.h

@@ -33,7 +33,7 @@ class VirtualFileSystem;
 //               within a VirtualFileSystem.  Normally users don't
 //               need to monkey with this class directly.
 ////////////////////////////////////////////////////////////////////
-class EXPCL_PANDA VirtualFileMount : public TypedObject {
+class EXPCL_PANDAEXPRESS VirtualFileMount : public TypedObject {
 public:
   INLINE VirtualFileMount(VirtualFileSystem *file_system,
                           const Filename &physical_filename,

panda/src/putil/virtualFileMountMultifile.h → panda/src/express/virtualFileMountMultifile.h

@@ -29,7 +29,7 @@
 // Description : Maps a Multifile's contents into the
 //               VirtualFileSystem.
 ////////////////////////////////////////////////////////////////////
-class EXPCL_PANDA VirtualFileMountMultifile : public VirtualFileMount {
+class EXPCL_PANDAEXPRESS VirtualFileMountMultifile : public VirtualFileMount {
 public:
   INLINE VirtualFileMountMultifile(VirtualFileSystem *file_system,
                                    Multifile *multifile, 

panda/src/putil/virtualFileMountSystem.h → panda/src/express/virtualFileMountSystem.h

@@ -28,7 +28,7 @@
 // Description : Maps an actual OS directory into the
 //               VirtualFileSystem.
 ////////////////////////////////////////////////////////////////////
-class EXPCL_PANDA VirtualFileMountSystem : public VirtualFileMount {
+class EXPCL_PANDAEXPRESS VirtualFileMountSystem : public VirtualFileMount {
 public:
   INLINE VirtualFileMountSystem(VirtualFileSystem *file_system,
                                 const Filename &physical_filename,

panda/src/putil/virtualFileSimple.h → panda/src/express/virtualFileSimple.h

@@ -30,7 +30,7 @@
 //               one mount point.  Most directories, and all regular
 //               files, are of this kind.
 ////////////////////////////////////////////////////////////////////
-class EXPCL_PANDA VirtualFileSimple : public VirtualFile {
+class EXPCL_PANDAEXPRESS VirtualFileSimple : public VirtualFile {
 public:
   INLINE VirtualFileSimple(VirtualFileMount *mount,
                            const Filename &local_filename);

panda/src/putil/virtualFileSystem.I → panda/src/express/virtualFileSystem.I

@@ -64,7 +64,7 @@ INLINE void VirtualFileSystem::
 ls(const string &filename) const {
   PT(VirtualFile) file = get_file(filename);
   if (file == (VirtualFile *)NULL) {
-    util_cat.info()
+    express_cat.info()
       << "Not found: " << filename << "\n";
   } else {
     file->ls();
@@ -84,7 +84,7 @@ INLINE void VirtualFileSystem::
 ls_all(const string &filename) const {
   PT(VirtualFile) file = get_file(filename);
   if (file == (VirtualFile *)NULL) {
-    util_cat.info()
+    express_cat.info()
       << "Not found: " << filename << "\n";
   } else {
     file->ls_all();

panda/src/putil/virtualFileSystem.cxx → panda/src/express/virtualFileSystem.cxx

@@ -22,7 +22,7 @@
 #include "virtualFileMountSystem.h"
 #include "dSearchPath.h"
 #include "dcast.h"
-#include "config_util.h"
+#include "config_express.h"
 #include "executionEnvironment.h"
 #include "pset.h"
 
@@ -85,7 +85,7 @@ bool VirtualFileSystem::
 mount(const Filename &physical_filename, const string &mount_point, 
       int flags) {
   if (!physical_filename.exists()) {
-    util_cat.warning()
+    express_cat.warning()
       << "Attempt to mount " << physical_filename << ", not found.\n";
     return false;
   }
@@ -451,7 +451,7 @@ get_global_ptr() {
 
     // Then, we add whatever mounts are listed in the Configrc file.
     Config::ConfigTable::Symbol mounts;
-    config_util.GetAll("vfs-mount", mounts);
+    config_express.GetAll("vfs-mount", mounts);
 
     // When we use GetAll(), we might inadvertently read duplicate
     // lines.  Filter them out with a set.
@@ -475,12 +475,15 @@ get_global_ptr() {
         // Spaces before that are part of the system filename.
         size_t space = mount_desc.rfind(' ');
         if (space == string::npos) {
-          util_cat.warning()
+          express_cat.warning()
             << "No space in vfs-mount descriptor: " << mount_desc << "\n";
           
         } else {
           string mount_point = mount_desc.substr(space + 1);
-          mount_desc = trim_right(mount_desc.substr(0, space)); 
+          while (space > 0 && isspace(mount_desc[space - 1])) {
+            space--;
+          }
+          mount_desc = mount_desc.substr(0, space);
           string options;
 
           space = mount_desc.rfind(' ');
@@ -488,7 +491,10 @@ get_global_ptr() {
             // If there's another space, we have the optional options field.
             options = mount_point;
             mount_point = mount_desc.substr(space + 1);
-            mount_desc = trim_right(mount_desc.substr(0, space)); 
+            while (space > 0 && isspace(mount_desc[space - 1])) {
+              space--;
+            }
+            mount_desc = mount_desc.substr(0, space);
           }
 
           mount_desc = ExecutionEnvironment::expand_string(mount_desc);

panda/src/putil/virtualFileSystem.h → panda/src/express/virtualFileSystem.h

@@ -25,7 +25,7 @@
 #include "filename.h"
 #include "pointerTo.h"
 #include "pmap.h"
-#include "config_util.h"
+#include "config_express.h"
 
 class Multifile;
 class VirtualFileMount;
@@ -42,7 +42,7 @@ class VirtualFileComposite;
 //               mount one or more Multifiles as their own
 //               subdirectory hierarchies.
 ////////////////////////////////////////////////////////////////////
-class EXPCL_PANDA VirtualFileSystem {
+class EXPCL_PANDAEXPRESS VirtualFileSystem {
 PUBLISHED:
   VirtualFileSystem();
   ~VirtualFileSystem();

panda/src/putil/Sources.pp

@@ -48,12 +48,6 @@
     typedWritableReferenceCount.h updateSeq.I updateSeq.h \
     vector_double.h vector_float.h vector_typedWritable.h \
     vector_ushort.h vector_writable.h \
-    virtualFileComposite.h virtualFileComposite.I virtualFile.h \
-    virtualFile.I virtualFileList.I virtualFileList.h virtualFileMount.h \
-    virtualFileMount.I virtualFileMountMultifile.h \
-    virtualFileMountMultifile.I virtualFileMountSystem.h \
-    virtualFileMountSystem.I virtualFileSimple.h virtualFileSimple.I \
-    virtualFileSystem.h virtualFileSystem.I \
     writableConfigurable.h \
     writableParam.I writableParam.h 
     
@@ -84,10 +78,6 @@
     vector_double.cxx vector_float.cxx \
     vector_typedWritable.cxx \
     vector_ushort.cxx vector_writable.cxx \
-    virtualFileComposite.cxx virtualFile.cxx virtualFileList.cxx \
-    virtualFileMount.cxx \
-    virtualFileMountMultifile.cxx virtualFileMountSystem.cxx \
-    virtualFileSimple.cxx virtualFileSystem.cxx \
     writableConfigurable.cxx writableParam.cxx 
 
   #define INSTALL_HEADERS \
@@ -128,12 +118,6 @@
     typedWritableReferenceCount.h updateSeq.I updateSeq.h \
     vector_double.h vector_float.h vector_typedWritable.h \
     vector_ushort.h vector_writable.h \
-    virtualFileComposite.h virtualFileComposite.I virtualFile.h \
-    virtualFile.I virtualFileList.I virtualFileList.h virtualFileMount.h \
-    virtualFileMount.I virtualFileMountMultifile.h \
-    virtualFileMountMultifile.I virtualFileMountSystem.h \
-    virtualFileMountSystem.I virtualFileSimple.h virtualFileSimple.I \
-    virtualFileSystem.h virtualFileSystem.I \
     writableConfigurable.h writableParam.I \
     writableParam.h
 

panda/src/putil/config_util.cxx

@@ -17,28 +17,22 @@
 ////////////////////////////////////////////////////////////////////
 
 #include "config_util.h"
+#include "bamReaderParam.h"
 #include "buttonEventList.h"
 #include "clockObject.h"
-#include "typedObject.h"
 #include "configurable.h"
+#include "datagram.h"
+#include "factoryParam.h"
 #include "namable.h"
 #include "referenceCount.h"
+#include "typedObject.h"
 #include "typedReferenceCount.h"
-#include "keyboardButton.h"
-#include "mouseButton.h"
-#include "factoryParam.h"
-#include "datagram.h"
 #include "typedWritable.h"
 #include "typedWritableReferenceCount.h"
-#include "virtualFileComposite.h"
-#include "virtualFile.h"
-#include "virtualFileMount.h"
-#include "virtualFileMountMultifile.h"
-#include "virtualFileMountSystem.h"
-#include "virtualFileSimple.h"
-#include "writableParam.h"
-#include "bamReaderParam.h"
 #include "writableConfigurable.h"
+#include "writableParam.h"
+#include "keyboardButton.h"
+#include "mouseButton.h"
 #include "get_config_path.h"
 
 #include <dconfig.h>
@@ -48,28 +42,22 @@ NotifyCategoryDef(util, "");
 NotifyCategoryDef(bam, util_cat);
 
 ConfigureFn(config_util) {
-//  ClockObject::init_ptr();
+  BamReaderParam::init_type();
   ButtonEventList::init_type();
-  TypedObject::init_type();
   Configurable::init_type();
+  Datagram::init_type();
+  FactoryParam::init_type();
   Namable::init_type();
   ReferenceCount::init_type();
+  TypedObject::init_type();
   TypedReferenceCount::init_type();
-  KeyboardButton::init_keyboard_buttons();
-  MouseButton::init_mouse_buttons();
-  FactoryParam::init_type();
-  Datagram::init_type();
   TypedWritable::init_type();
-  WritableParam::init_type();
-  BamReaderParam::init_type();
   TypedWritableReferenceCount::init_type();
-  VirtualFileComposite::init_type();
-  VirtualFile::init_type();
-  VirtualFileMount::init_type();
-  VirtualFileMountMultifile::init_type();
-  VirtualFileMountSystem::init_type();
-  VirtualFileSimple::init_type();
   WritableConfigurable::init_type();
+  WritableParam::init_type();
+
+  KeyboardButton::init_keyboard_buttons();
+  MouseButton::init_mouse_buttons();
 }
 
 

panda/src/putil/putil_composite2.cxx

@@ -16,14 +16,6 @@
 #include "vector_typedWritable.cxx"
 #include "vector_ushort.cxx"
 #include "vector_writable.cxx"
-#include "virtualFile.cxx"
-#include "virtualFileComposite.cxx"
-#include "virtualFileList.cxx"
-#include "virtualFileMount.cxx"
-#include "virtualFileMountMultifile.cxx"
-#include "virtualFileMountSystem.cxx"
-#include "virtualFileSimple.cxx"
-#include "virtualFileSystem.cxx"
 #include "writableConfigurable.cxx"
 #include "writableParam.cxx"