Changeset 376 for ps

Timestamp:

06/03/04 02:27:50 (21 years ago)

Author:

janwas

Message:

implemented refcount for mmap

File:

• ps/trunk/source/lib/res/file.cpp (modified) (2 diffs)

ps/trunk/source/lib/res/file.cpp

@@ -445 +445 @@
     CHECK_FILE(f);
 
+    // make sure the mapping is actually freed,
+    // regardless of how many references remain.
+    if(f->map_refs > 1)
+        f->map_refs = 1;
+    file_unmap(f);
+
     // (check fd to avoid BoundsChecker warning about invalid close() param)
     if(f->fd != -1)
@@ -1345 +1351 @@
     CHECK_FILE(f);
 
+    // file is not currently mapped
+    if(f->map_refs == 0)
+        return -1;
+
+    // still more than one reference remaining - done.
+    if(--f->map_refs > 0)
+        return 0;
+
+    // no more references: remove the mapping
     void* const p = f->mapping;
     f->mapping = 0;
-    // don't reset size - the file is still open.
-
-    // not currently mapped
-    if(!p)
-        return -1;
-
-    return munmap(p, (uint)f->size);
-}
+    // don't clear f->size - the file is still open.
+
+    return munmap(p, f->size);
+}