Use std::recusive_mutex

Author: Maschell

src/FSWrapper.cpp

@@ -249,7 +249,7 @@ FSError FSWrapper::FSOpenFileWrapper(const char *path, const char *mode, FSFileH
     if (fd >= 0) {
         auto fileHandle = getNewFileHandle();
         if (fileHandle) {
-            std::lock_guard<std::mutex> lock(openFilesMutex);
+            std::lock_guard lock(openFilesMutex);
 
             fileHandle->handle = (((uint32_t) fileHandle.get()) & 0x0FFFFFFF) | 0x30000000;
             *handle            = fileHandle->handle;

src/FSWrapper.h

@@ -134,8 +134,8 @@ class FSWrapper : public IFSWrapper {
     std::string pPathToReplace;
     std::string pReplacePathWith;
     bool pIsWriteable = false;
-    std::mutex openFilesMutex;
-    std::mutex openDirsMutex;
+    std::recursive_mutex openFilesMutex;
+    std::recursive_mutex openDirsMutex;
     std::vector<std::shared_ptr<FileInfo>> openFiles;
     std::vector<std::shared_ptr<DirInfoBase>> openDirs;
 };

src/FileUtils.cpp

@@ -12,14 +12,14 @@
 #include <unistd.h>
 
 namespace {
-    std::mutex sWorkingDirMutex;
+    std::recursive_mutex sWorkingDirMutex;
     std::map<FSAClientHandle, std::string> sWorkingDirs;
 } // namespace
 
-std::mutex gFSLayerMutex;
+std::recursive_mutex gFSLayerMutex;
 std::vector<std::unique_ptr<IFSWrapper>> gFSLayers;
 
-std::string getFullPathGeneric(const FSAClientHandle client, const char *path, std::mutex &mutex, const std::map<FSAClientHandle, std::string> &map) {
+std::string getFullPathGeneric(const FSAClientHandle client, const char *path, std::recursive_mutex &mutex, const std::map<FSAClientHandle, std::string> &map) {
     std::lock_guard workingDirLock(mutex);
 
     std::string res;
@@ -39,7 +39,7 @@ std::string getFullPathGeneric(const FSAClientHandle client, const char *path, s
     return res;
 }
 
-void setWorkingDirGeneric(const FSAClientHandle client, const char *path, std::mutex &mutex, std::map<FSAClientHandle, std::string> &map) {
+void setWorkingDirGeneric(const FSAClientHandle client, const char *path, std::recursive_mutex &mutex, std::map<FSAClientHandle, std::string> &map) {
     if (!path) {
         DEBUG_FUNCTION_LINE_WARN("Path was NULL");
         return;

src/FileUtils.h

@@ -55,7 +55,7 @@ struct FSShimWrapperMessage {
 
 extern bool gThreadsRunning;
 extern FSIOThreadData gThreadData[3];
-extern std::mutex gFSLayerMutex;
+extern std::recursive_mutex gFSLayerMutex;
 extern std::vector<std::unique_ptr<IFSWrapper>> gFSLayers;
 
 #define fsaShimPrepareRequestReadFile    ((FSError(*)(FSAShimBuffer * shim, IOSHandle clientHandle, uint8_t * buffer, uint32_t size, uint32_t count, uint32_t pos, FSFileHandle handle, FSAReadFlag readFlags))(0x101C400 + 0x436cc))

src/utils/utils.h

@@ -15,8 +15,8 @@ std::shared_ptr<T> make_shared_nothrow(Args &&...args) noexcept(noexcept(T(std::
 }
 
 template<typename T, class Allocator, class Predicate>
-bool remove_locked_first_if(std::mutex &mutex, std::vector<T, Allocator> &list, Predicate pred) {
-    std::lock_guard<std::mutex> lock(mutex);
+bool remove_locked_first_if(std::recursive_mutex &mutex, std::vector<T, Allocator> &list, Predicate pred) {
+    std::lock_guard lock(mutex);
     auto it = list.begin();
     while (it != list.end()) {
         if (pred(*it)) {