Changeset 2098 for Whitix/branches/netchannel/memory/mmap.c

Timestamp:

05/27/10 13:45:58 (2 years ago)

Author:

mwhitworth

Message:

FIx issue with two threads faulting on the same page.

Files:

• Whitix/branches/netchannel/memory/mmap.c (modified) (2 diffs)

Whitix/branches/netchannel/memory/mmap.c

@@ -108 +108 @@
                         /* So no luck finding it in the VNode's mapping list - read it in */
                         newPage=PageAlloc();
-
+                        
                         if (!newPage)
                                 return -ENOMEM;
 
-                        VirtMemMapPage(address, newPage->physAddr,
-                                area->protection | PAGE_ACCESSED | PAGE_SHARED);
+                        DWORD tempAddr = VirtAllocateTemp(newPage->physAddr);
 
                         /* Add to shared list so other read-only pages can map this page */
@@ -123 +122 @@
                         VmLockPage(mappedPage);
                         ListAdd(&mappedPage->list, &area->vNode->sharedList);
+
                         if (area->vNode->fileOps->mMap)
-                                ret=area->vNode->fileOps->mMap(area->vNode, address, offset);
+                                ret = area->vNode->fileOps->mMap(area->vNode, tempAddr, offset);
                         else
-                                ret=FileGenericReadPage(address,area->vNode,offset);
+                                ret = FileGenericReadPage(tempAddr, area->vNode,offset);
+
+                        VirtUnmapPhysPage(tempAddr);
+
+                        VirtMemMapPage(address, newPage->physAddr,
+                                area->protection);
 
                         VmUnlockPage(mappedPage);