Changeset 12887

Timestamp:

Apr 18, 2007, 9:38:36 AM (19 years ago)

Author:

rhl

Message:

getpagesize() isn't in posix, and isn't needed --- adding 1 ensures a trailing NUL

File:

• trunk/psLib/src/types/psMetadataConfig.c (modified) (2 diffs)

trunk/psLib/src/types/psMetadataConfig.c

@@ -11 +11 @@
 *  @author Joshua Hoblitt, University of Hawaii 2006-2007
 *
-*  @version $Revision: 1.133 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2007-03-22 00:32:18 $
+*  @version $Revision: 1.134 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2007-04-18 19:38:36 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1303 +1303 @@
     }
 
-    // determine the system page size
-    int pageSize = getpagesize();
-
-    // request one extra page.  even if st_size is an exact multiple of pageSize, this
-    // will guarantee we get a block of 0-valued bytes at the end of the file data.
-    int nPages = buf.st_size / pageSize + 1;
-
-    int nBytes = nPages * pageSize;
-
     // psMetadataConfigParse() is going to read the entire file into memory so
-    // we're trying to be nice by allowing the VM to flush the file out of
-    // memory if need be.
+    // lets use mmap() to allow the system to be cleverer about what gets read
+    //
+    // We're adding 1 to buf.st_size here in case st_size / system page size has
+    // a remainder of zero (otherwise there won't be any trailing \0s at the end
+    // of the page).
+    int nBytes = buf.st_size + 1;
 
     void *file = mmap(0, nBytes, PROT_READ, MAP_PRIVATE, fd, 0);