MonetDB: Feb2013 - Simplified interface of MT_msync.

[Sjoerd Mullender]

Changeset: d5277a517b09 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d5277a517b09
Modified Files:
        gdk/gdk_posix.c
        gdk/gdk_private.h
        gdk/gdk_storage.c
Branch: Feb2013
Log Message:

Simplified interface of MT_msync.


diffs (56 lines):

diff --git a/gdk/gdk_posix.c b/gdk/gdk_posix.c
--- a/gdk/gdk_posix.c
+++ b/gdk/gdk_posix.c
@@ -589,9 +589,9 @@ MT_mremap(const char *path, int mode, vo
 }
 
 int
-MT_msync(void *p, size_t off, size_t len, int mode)
+MT_msync(void *p, size_t len, int mode)
 {
-       int ret = msync(((char *) p) + off, len,
+       int ret = msync(p, len,
                        (mode & MMAP_SYNC) ? MS_SYNC :
                        ((mode & MMAP_ASYNC) ? MS_ASYNC : MS_INVALIDATE));
 
@@ -816,14 +816,14 @@ MT_mremap(const char *path, int mode, vo
 }
 
 int
-MT_msync(void *p, size_t off, size_t len, int mode)
+MT_msync(void *p, size_t len, int mode)
 {
        int ret = 0;
 
        (void) mode;
        /*       Windows' UnmapViewOfFile returns success!=0, error== 0,
         * while Unix's   munmap          returns success==0, error==-1. */
-       return -(FlushViewOfFile(((char *) p) + off, len) == 0);
+       return -(FlushViewOfFile(p, len) == 0);
 }
 
 #ifndef _HEAPOK                        /* MinGW */
diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h
--- a/gdk/gdk_private.h
+++ b/gdk/gdk_private.h
@@ -83,7 +83,7 @@ void MT_global_exit(int status)
        __attribute__((__noreturn__));
 void MT_init_posix(void);
 void *MT_mremap(const char *path, int mode, void *old_address, size_t 
old_size, size_t *new_size);
-int MT_msync(void *p, size_t off, size_t len, int mode);
+int MT_msync(void *p, size_t len, int mode);
 int OIDdirty(void);
 int OIDinit(void);
 oid OIDread(str buf);
diff --git a/gdk/gdk_storage.c b/gdk/gdk_storage.c
--- a/gdk/gdk_storage.c
+++ b/gdk/gdk_storage.c
@@ -293,7 +293,7 @@ GDKsave(const char *nme, const char *ext
                 * commit-time.
                 */
                if (size)
-                       err = MT_msync(buf, 0, size, MMAP_SYNC);
+                       err = MT_msync(buf, size, MMAP_SYNC);
                if (err)
                        GDKsyserror("GDKsave: error on: name=%s, ext=%s, 
mode=%d\n", nme, ext ? ext : "", (int) mode);
                IODEBUG THRprintf(GDKstdout, "#MT_msync(buf " PTRFMT ", size " 
SZFMT ", MMAP_SYNC) = %d\n", PTRFMTCAST buf, size, err);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list