Changeset 410

Timestamp:

07/02/15 11:07:42 (9 years ago)

Author:

Maciej Komosinski

Message:

ChainFileSystem? can merge Vopendir() results

Location:

cpp/common/virtfile

Files:

• virtfile.cpp (modified) (2 diffs)
• virtfile.h (modified) (2 diffs)

cpp/common/virtfile/virtfile.cpp

@@ -189 +189 @@
         printf("ChainFileSystem::Vfopendir %s (chain=%p)\n",path,chain);
 #endif
-        return (chain != NULL) ? chain->Vopendir(path) : NULL;
+        if (chain==NULL) return internalopendir(path);
+        return new Dir(string(path),this,chain);
 }
 
@@ -206 +207 @@
         return (chain != NULL) ? chain->Vdirexists(path, is_writable) : false;
 }
+
+ChainFileSystem::Dir::~Dir()
+{
+if (dir) delete dir;
+}
+
+dirent* ChainFileSystem::Dir::Vreaddir()
+{
+dirent *de;
+  retry:
+if (!dir)
+        {
+        if (first)
+                {
+                dir=first->internalopendir(path.c_str());
+                first=NULL;
+                }
+        else if (second)
+                {
+                dir=second->Vopendir(path.c_str());
+                second=NULL;
+                }
+        else
+                return NULL;
+        }
+de=dir ? dir->Vreaddir() : NULL;
+if (de==NULL)
+        {if (dir) delete dir; dir=NULL; goto retry;}
+
+// no need to check for duplicates if no names are saved and scanning the last location (most common case)
+if (! (duplicates.empty() && (first==NULL) && (second==NULL)) )
+{
+string s(de->d_name);
+if (duplicates.find(s)==duplicates.end())
+        duplicates.insert(s);
+else
+        goto retry;
+}
+
+return de;
+}

cpp/common/virtfile/virtfile.h

@@ -10 +10 @@
 #include <common/nonstd_dir.h>
 #include <string>
+#include <set>
 using std::string;
 
@@ -108 +109 @@
         bool Vfexists(const char* path);
         VirtDIR *Vopendir(const char* path);
+        virtual VirtDIR *internalopendir(const char* path) {return NULL;}
         bool Vmkdir(const char* path);
         bool Vmkdirs(const char* path);
         bool Vdirexists(const char* path, bool is_writable);
+
+        class Dir: public VirtDIR
+        {
+        ChainFileSystem *first;
+        VirtFileSystem *second;
+        string path;
+        std::set<string> duplicates;
+        VirtDIR *dir;
+          public:
+        Dir(string _path,ChainFileSystem *_first,VirtFileSystem *_second):first(_first),second(_second),path(_path),dir(NULL) {}
+        ~Dir();
+        dirent* Vreaddir();
+        };
 };