From b31aa3904ccea9c6e66da861f8d44a266f69a043 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Fri, 18 Jan 2013 09:35:05 +0000 Subject: [PATCH] * mmap.cc (handler_disk_file::msync): Add call to FlushFileBuffers to implement MS_SYNC. --- winsup/cygwin/ChangeLog | 5 +++++ winsup/cygwin/mmap.cc | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 9920d98e4..f75aa354c 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2013-01-18 Christopher Faylor + + * mmap.cc (handler_disk_file::msync): Add call to FlushFileBuffers + to implement MS_SYNC. + 2013-01-17 Christopher Faylor * mmap.cc (handler_disk_file::msync): Retry up to 99 times if diff --git a/winsup/cygwin/mmap.cc b/winsup/cygwin/mmap.cc index 0ede7e6ab..da89d9d81 100644 --- a/winsup/cygwin/mmap.cc +++ b/winsup/cygwin/mmap.cc @@ -1664,7 +1664,14 @@ fhandler_disk_file::msync (HANDLE h, caddr_t addr, size_t len, int flags) cygwin list. So retry 99 times and hope we get lucky. */ for (int i = 0; i < retry; i++) if (FlushViewOfFile (addr, len)) - return 0; + { + /* FlushViewOfFile just triggers the action and returns immediately, + so it's equivalent to MS_ASYNC. MS_SYNC requires another call to + FlushFileBuffers. */ + if (flags & MS_SYNC) + FlushFileBuffers (h); + return 0; + } else if (GetLastError () != ERROR_LOCK_VIOLATION) break; else if (i < (retry - 1))