Refactor most of the filesystem logic out of Client and move under a …

…common mutex
MisterTea · May 7, 2019 · e3f0716 · e3f0716
1 parent 0ced2ca
commit e3f0716
Show file tree

Hide file tree

Showing 10 changed files with 273 additions and 186 deletions.
diff --git a/src/base/FileSystem.cpp b/src/base/FileSystem.cpp
@@ -5,7 +5,7 @@
 
 namespace codefs {
 string FileSystem::serializeFileDataCompressed(const string& path) {
-  std::lock_guard<std::recursive_mutex> lock(fileDataMutex);
+  std::lock_guard<std::recursive_mutex> lock(mutex);
   MessageWriter writer;
   if (allFileData.find(path) == allFileData.end()) {
     writer.writePrimitive<int>(0);
@@ -25,7 +25,7 @@ string FileSystem::serializeFileDataCompressed(const string& path) {
 
 void FileSystem::deserializeFileDataCompressed(const string& path,
                                                const string& s) {
-  std::lock_guard<std::recursive_mutex> lock(fileDataMutex);
+  std::lock_guard<std::recursive_mutex> lock(mutex);
   MessageReader reader;
   reader.load(decompressString(s));
   int numFiles = reader.readPrimitive<int>();

diff --git a/src/base/FileSystem.hpp b/src/base/FileSystem.hpp
@@ -11,7 +11,7 @@ class FileSystem {
   }
 
   virtual optional<FileData> getNode(const string &path) {
-    std::lock_guard<std::recursive_mutex> lock(fileDataMutex);
+    std::lock_guard<std::recursive_mutex> lock(mutex);
     auto it = allFileData.find(path);
     if (it == allFileData.end()) {
       return nullopt;
@@ -20,7 +20,7 @@ class FileSystem {
   }
 
   void setNode(const FileData &fileData) {
-    std::lock_guard<std::recursive_mutex> lock(fileDataMutex);
+    std::lock_guard<std::recursive_mutex> lock(mutex);
     allFileData.erase(fileData.path());
     if (fileData.deleted()) {
       // The node is deleted, Don't add
@@ -35,15 +35,15 @@ class FileSystem {
   }
 
   void createStub(const string &path) {
-    std::lock_guard<std::recursive_mutex> lock(fileDataMutex);
+    std::lock_guard<std::recursive_mutex> lock(mutex);
     FileData stub;
     stub.set_path(path);
     stub.set_invalid(true);
     setNode(stub);
   }
 
   void deleteNode(const string &path) {
-    std::lock_guard<std::recursive_mutex> lock(fileDataMutex);
+    std::lock_guard<std::recursive_mutex> lock(mutex);
     auto it = allFileData.find(path);
     if (it != allFileData.end()) {
       allFileData.erase(it);
@@ -53,8 +53,8 @@ class FileSystem {
   virtual string absoluteToRelative(const string &absolutePath) {
     if (absolutePath.find(rootPath) != 0) {
       LOGFATAL << "Tried to convert absolute path to fuse that wasn't inside "
-                    "the absolute FS: "
-                 << absolutePath << " " << rootPath;
+                  "the absolute FS: "
+               << absolutePath << " " << rootPath;
     }
     string relative = absolutePath.substr(rootPath.size());
     if (relative.length() == 0) {
@@ -107,7 +107,7 @@ class FileSystem {
  protected:
   string rootPath;
   shared_ptr<thread> fuseThread;
-  std::recursive_mutex fileDataMutex;
+  std::recursive_mutex mutex;
 };
 }  // namespace codefs