ecere/sys/File: Only updating openCount in _DEBUG

- Also fixed a race condition on modifying openCount
ecere · Sep 12, 2023 · f2cad7a · f2cad7a
1 parent 152fb12
commit f2cad7a
Showing 1 changed file with 19 additions and 0 deletions.
diff --git a/ecere/src/sys/File.ec b/ecere/src/sys/File.ec
@@ -255,12 +255,20 @@ public class File : IOChannel
    {
       if(output && output != input)
       {
+#ifdef _DEBUG
+         openCountMutex.Wait();
          openCount--;
+         openCountMutex.Release();
+#endif
          fclose(output);
       }
       if(input)
       {
+#ifdef _DEBUG
+         openCountMutex.Wait();
          openCount--;
+         openCountMutex.Release();
+#endif
          fclose(input);
       }
       input = null;
@@ -843,7 +851,11 @@ public:
          if(!input && !output);
          else
          {
+#ifdef _DEBUG
+            openCountMutex.Wait();
             openCount++;
+            openCountMutex.Release();
+#endif
             result = true;
             // TESTING ENABLING FILE BUFFERING BY DEFAULT... DOCUMENT ANY ISSUE
             /*
@@ -1002,7 +1014,10 @@ public FileAttribs FileExists(const char * fileName)
       return FILE_FileExists(fileName);
 }
 
+#ifdef _DEBUG
 static int openCount;
+static Mutex openCountMutex { };
+#endif
 
 public File FileOpen(const char * fileName, FileOpenMode mode)
 {
@@ -1054,7 +1069,11 @@ public File FileOpen(const char * fileName, FileOpenMode mode)
             if(!file.input && !file.output);
             else
             {
+#ifdef _DEBUG
+               openCountMutex.Wait();
                openCount++;
+               openCountMutex.Release();
+#endif
                result = file;
                // TESTING ENABLING FILE BUFFERING BY DEFAULT... DOCUMENT ANY ISSUE
                /*