Author: sebor
Date: Fri Jul 6 12:59:39 2007
New Revision: 554036
URL: http://svn.apache.org/viewvc?view=rev&rev=554036
Log:
2007-07-06 Martin Sebor <[EMAIL PROTECTED]>
* mman.h: Header with declarations of portability helper functions
for the manipulation of memory mapped files.
* mman.cpp: Definitions of the said helpers.
* facet.cpp (__rw_mmap, __rw_unmmap): Moved functions to mman.cpp.
Added:
incubator/stdcxx/trunk/src/mman.cpp (with props)
incubator/stdcxx/trunk/src/mman.h (with props)
Modified:
incubator/stdcxx/trunk/src/facet.cpp
Modified: incubator/stdcxx/trunk/src/facet.cpp
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/src/facet.cpp?view=diff&rev=554036&r1=554035&r2=554036
==============================================================================
--- incubator/stdcxx/trunk/src/facet.cpp (original)
+++ incubator/stdcxx/trunk/src/facet.cpp Fri Jul 6 12:59:39 2007
@@ -30,30 +30,14 @@
#include <rw/_defs.h>
-// unistd.h is included here because of PR #26255
-#ifndef _MSC_VER
-# include <unistd.h>
-#endif // _MSC_VER
-
#include <locale.h> // for LC_XXX costants
#include <stdlib.h> // for bsearch(), getenv(), qsort()
#include <string.h> // for memcpy(), strlen()
-#include <sys/stat.h>
-
-#ifndef _MSC_VER
-# include <sys/mman.h>
-#else
-# include <windows.h>
-# include <io.h>
-#endif // _MSC_VER
-
-#include <sys/types.h>
-#include <fcntl.h>
-
#include <iosfwd> // for mbstate_t
#include "access.h"
+#include "mman.h"
#include <loc/_facet.h>
#include <loc/_locale.h>
@@ -99,93 +83,6 @@
}
return 0;
-}
-
-
-// maps a named file into memory as shared, read-only, returns
-// the beginning address on success and fills `size' with the
-// size of the file; returns 0 on failure
-static
-void* __rw_mmap (const char* fname, _RWSTD_SIZE_T *size)
-{
- _RWSTD_ASSERT (0 != fname);
- _RWSTD_ASSERT (0 != size);
-
-#if !defined (_MSC_VER)
- struct stat sb;
- if (stat (fname, &sb) == -1)
-#else
- struct _stat sb;
- if (_stat (fname, &sb) == -1)
-#endif
- return 0;
-
- *size = sb.st_size;
-
-#if !defined(_MSC_VER)
- const int fd = open (fname, O_RDONLY);
-
- if (-1 == fd)
- return 0;
-
- // On HPUX systems MAP_SHARED will prevent a second mapping of the same
- // file if the regions are overlapping; one solution is to make the
- // mapping private.
-#if defined(__hpux)
- void *data = mmap (0, sb.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
-#else
- void *data = mmap (0, sb.st_size, PROT_READ, MAP_SHARED, fd, 0);
-#endif // defined(__hpux__)
-
- close (fd);
-
-#ifndef MAP_FAILED
-# define MAP_FAILED (void*)-1
-#endif
-
- if (MAP_FAILED == data) // failure
- return 0;
-#else
- HANDLE mmf =
- CreateFile (fname, GENERIC_READ, FILE_SHARE_READ, NULL,
- OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
-
- if (mmf == INVALID_HANDLE_VALUE)
- return 0;
-
- HANDLE mmfv =
- CreateFileMapping (mmf, NULL, PAGE_READONLY, 0, 0, NULL);
- if (mmfv == INVALID_HANDLE_VALUE) {
- CloseHandle (mmf);
- return 0;
- }
-
- void * data =
- MapViewOfFile (mmfv, FILE_MAP_READ, 0, 0, sb.st_size);
-
- // The handles can be safely closed
- CloseHandle (mmf);
- CloseHandle (mmfv);
-
-#endif // _MSC_VER
-
- return data;
-}
-
-static inline
-void __rw_munmap (const void* pcv, _RWSTD_SIZE_T size)
-{
- _RWSTD_ASSERT (pcv && size);
-
- // cast first to void*
- void* pv = _RWSTD_CONST_CAST (void*, pcv);
-
- // POSIX munmap() takes a void*, but not all platforms conform
-#ifndef _MSC_VER
- munmap (_RWSTD_STATIC_CAST (_RWSTD_MUNMAP_ARG1_T, pv), size);
-#else
- UnmapViewOfFile (pv);
-#endif // _MSC_VER
}
Added: incubator/stdcxx/trunk/src/mman.cpp
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/src/mman.cpp?view=auto&rev=554036
==============================================================================
--- incubator/stdcxx/trunk/src/mman.cpp (added)
+++ incubator/stdcxx/trunk/src/mman.cpp Fri Jul 6 12:59:39 2007
@@ -0,0 +1,139 @@
+/***************************************************************************
+ *
+ * mman.cpp
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 2001-2006 Rogue Wave Software.
+ *
+ **************************************************************************/
+
+#define _RWSTD_LIB_SRC
+#include <rw/_defs.h>
+
+#ifndef _MSC_VER
+ // <unistd.h> is included here because of PR #26255
+# include <unistd.h>
+#endif // _MSC_VER
+
+#include <sys/stat.h>
+
+#ifndef _MSC_VER
+# include <sys/mman.h>
+#else
+# include <windows.h>
+# include <io.h>
+#endif // _MSC_VER
+
+#include <sys/types.h>
+#include <fcntl.h>
+
+
+_RWSTD_NAMESPACE (__rw) {
+
+
+// maps a named file into memory as shared, read-only, returns
+// the beginning address on success and fills `size' with the
+// size of the file; returns 0 on failure
+void* __rw_mmap (const char* fname, _RWSTD_SIZE_T *size)
+{
+ _RWSTD_ASSERT (0 != fname);
+ _RWSTD_ASSERT (0 != size);
+
+#if !defined (_MSC_VER)
+ struct stat sb;
+ if (stat (fname, &sb) == -1)
+#else
+ struct _stat sb;
+ if (_stat (fname, &sb) == -1)
+#endif
+ return 0;
+
+ *size = sb.st_size;
+
+#if !defined(_MSC_VER)
+ const int fd = open (fname, O_RDONLY);
+
+ if (-1 == fd)
+ return 0;
+
+ // On HPUX systems MAP_SHARED will prevent a second mapping of the same
+ // file if the regions are overlapping; one solution is to make the
+ // mapping private.
+#if defined(__hpux)
+ void *data = mmap (0, sb.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
+#else
+ void *data = mmap (0, sb.st_size, PROT_READ, MAP_SHARED, fd, 0);
+#endif // defined(__hpux__)
+
+ close (fd);
+
+#ifndef MAP_FAILED
+# define MAP_FAILED (void*)-1
+#endif
+
+ if (MAP_FAILED == data) // failure
+ return 0;
+#else
+ HANDLE mmf =
+ CreateFile (fname, GENERIC_READ, FILE_SHARE_READ, NULL,
+ OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+
+ if (mmf == INVALID_HANDLE_VALUE)
+ return 0;
+
+ HANDLE mmfv =
+ CreateFileMapping (mmf, NULL, PAGE_READONLY, 0, 0, NULL);
+ if (mmfv == INVALID_HANDLE_VALUE) {
+ CloseHandle (mmf);
+ return 0;
+ }
+
+ void * data =
+ MapViewOfFile (mmfv, FILE_MAP_READ, 0, 0, sb.st_size);
+
+ // The handles can be safely closed
+ CloseHandle (mmf);
+ CloseHandle (mmfv);
+
+#endif // _MSC_VER
+
+ return data;
+}
+
+
+void __rw_munmap (const void* pcv, _RWSTD_SIZE_T size)
+{
+ _RWSTD_ASSERT (pcv && size);
+
+ // cast first to void*
+ void* pv = _RWSTD_CONST_CAST (void*, pcv);
+
+ // POSIX munmap() takes a void*, but not all platforms conform
+#ifndef _MSC_VER
+ munmap (_RWSTD_STATIC_CAST (_RWSTD_MUNMAP_ARG1_T, pv), size);
+#else
+ UnmapViewOfFile (pv);
+#endif // _MSC_VER
+}
+
+
+} // namespace __rw
Propchange: incubator/stdcxx/trunk/src/mman.cpp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/stdcxx/trunk/src/mman.cpp
------------------------------------------------------------------------------
svn:keywords = Id
Added: incubator/stdcxx/trunk/src/mman.h
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/src/mman.h?view=auto&rev=554036
==============================================================================
--- incubator/stdcxx/trunk/src/mman.h (added)
+++ incubator/stdcxx/trunk/src/mman.h Fri Jul 6 12:59:39 2007
@@ -0,0 +1,51 @@
+/***************************************************************************
+ *
+ * mman.h
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 2001-2006 Rogue Wave Software.
+ *
+ **************************************************************************/
+
+#ifndef _RWSTD_MMAN_H_INCLUDED
+#define _RWSTD_MMAN_H_INCLUDED
+
+
+#include <rw/_defs.h>
+
+
+_RWSTD_NAMESPACE (__rw) {
+
+
+// maps a named file into memory as shared, read-only, returns
+// the beginning address on success and fills 'size' with the
+// size of the file; returns 0 on failure
+void* __rw_mmap (const char*, _RWSTD_SIZE_T*);
+
+// unmaps a memory region
+void __rw_munmap (const void*, _RWSTD_SIZE_T);
+
+
+} // namespace __rw
+
+
+#endif // _RWSTD_MMAN_H_INCLUDED
Propchange: incubator/stdcxx/trunk/src/mman.h
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/stdcxx/trunk/src/mman.h
------------------------------------------------------------------------------
svn:keywords = Id
