MonetDB: Jan2014 - Do slightly fewer path-traversing system calls.

[Sjoerd Mullender]

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

Do slightly fewer path-traversing system calls.


diffs (98 lines):

diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h
--- a/gdk/gdk_private.h
+++ b/gdk/gdk_private.h
@@ -50,9 +50,7 @@ void BBPtrim(size_t delta);
 void BBPunshare(bat b);
 void GDKclrerr(void);
 int GDKextend(const char *fn, size_t size);
-#ifndef NATIVE_WIN32
-int GDKextendf(int fd, off_t size);
-#endif
+int GDKextendf(int fd, size_t size);
 int GDKfdlocate(const char *nme, const char *mode, const char *ext);
 FILE *GDKfilelocate(const char *nme, const char *mode, const char *ext);
 char *GDKload(const char *nme, const char *ext, size_t size, size_t *maxsize, 
storage_t mode);
diff --git a/gdk/gdk_storage.c b/gdk/gdk_storage.c
--- a/gdk/gdk_storage.c
+++ b/gdk/gdk_storage.c
@@ -228,9 +228,8 @@ GDKmove(const char *dir1, const char *nm
        return ret;
 }
 
-#ifndef NATIVE_WIN32
 int
-GDKextendf(int fd, off_t size)
+GDKextendf(int fd, size_t size)
 {
        struct stat stb;
 
@@ -239,35 +238,31 @@ GDKextendf(int fd, off_t size)
                return -1;
        }
        /* if necessary, extend the underlying file */
-       if (stb.st_size < size)
-               return ftruncate(fd, size);
+       if (stb.st_size < (off_t) size) {
+#ifdef WIN32
+               return -(_chsize_s(fd, (__int64) size) != 0);
+#else
+               return ftruncate(fd, (off_t) size);
+#endif
+       }
        return 0;
 }
-#endif
 
 int
 GDKextend(const char *fn, size_t size)
 {
        int t0 = 0;
+       int rt = -1, fd;
 
        IODEBUG t0 = GDKms();
-#ifdef WIN32
-       {
-               int fd, rt;
-
-               if ((fd = open(fn, O_RDWR)) < 0)
-                       return -1;
-               rt = _chsize_s(fd, (__int64) size);
+       rt = -1;
+       if ((fd = open(fn, O_RDWR)) >= 0) {
+               rt = GDKextendf(fd, size);
                close(fd);
-               if (rt != 0)
-                       return -1;
        }
-#else
-       if (truncate(fn, (off_t) size) < 0)
-               return -1;
-#endif
-       IODEBUG fprintf(stderr, "#GDKextend %s " SZFMT " %dms\n", fn, size, 
GDKms() - t0);
-       return 0;
+       IODEBUG fprintf(stderr, "#GDKextend %s " SZFMT " %dms%s\n", fn, size,
+                       GDKms() - t0, rt < 0 ? " (failed)" : "");
+       return rt;
 }
 
 /*
@@ -418,7 +413,6 @@ GDKload(const char *nme, const char *ext
                }
        } else {
                char path[PATHLENGTH];
-               struct stat st;
 
                /* round up to multiple of GDK_mmap_pagesize with a
                 * minimum of one */
@@ -426,10 +420,7 @@ GDKload(const char *nme, const char *ext
                if (size == 0)
                        size = GDK_mmap_pagesize;
                GDKfilepath(path, BATDIR, nme, ext);
-               if (stat(path, &st) >= 0 &&
-                   (size <= (size_t) st.st_size ||
-                    /* mmap storage is auto-extended here */
-                    GDKextend(path, size) == 0)) {
+               if (GDKextend(path, size) == 0) {
                        int mod = MMAP_READ | MMAP_WRITE | MMAP_SEQUENTIAL | 
MMAP_SYNC;
 
                        if (mode == STORE_PRIV)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list