[PATCH] Common: Added mmap implementation for windows


Frank Quinn <fquinn@...>
 

This change adds mman.h and mman.c to the code base as licensed by the MIT

license from https://code.google.com/p/mman-win32/. It also removes mmap.h

and updates windows/wombat/port.h to use the new mman.h header.

 

This allows us to make mmap calls on windows. References to source files

have also been added to the MSVC project and scons build environment.

 

Signed-off-by: Frank Quinn <fquinn@...>

---

common/c_cpp/src/c/SConscript.win        |   1 +

common/c_cpp/src/c/commonc.vcproj        |   4 +

common/c_cpp/src/c/windows/mman.c        | 206 +++++++++++++++++++++++++++++++

common/c_cpp/src/c/windows/mman.h        |  74 +++++++++++

common/c_cpp/src/c/windows/mmap.h        |  28 -----

common/c_cpp/src/c/windows/wombat/port.h |   2 +-

6 files changed, 286 insertions(+), 29 deletions(-)

create mode 100644 common/c_cpp/src/c/windows/mman.c

create mode 100644 common/c_cpp/src/c/windows/mman.h

delete mode 100644 common/c_cpp/src/c/windows/mmap.h

 

diff --git a/common/c_cpp/src/c/SConscript.win b/common/c_cpp/src/c/SConscript.win

index a883e27..dc920de 100644

--- a/common/c_cpp/src/c/SConscript.win

+++ b/common/c_cpp/src/c/SConscript.win

@@ -21,6 +21,7 @@ libyywrap.c

windows/strpcasecmp.c

windows/strptime.c

windows/platform.c

+windows/mman.c

windows/wSemaphore.c

windows/network.c

windows/environment.c

diff --git a/common/c_cpp/src/c/commonc.vcproj b/common/c_cpp/src/c/commonc.vcproj

index dc09604..1c45014 100644

--- a/common/c_cpp/src/c/commonc.vcproj

+++ b/common/c_cpp/src/c/commonc.vcproj

@@ -409,6 +409,10 @@

                                                               >

                                               </File>

                                               <File

+                                                             RelativePath=".\windows\mman.c"

+                                                             >

+                                             </File>

+                                             <File

                                                               RelativePath=".\windows\network.c"

                                                               >

                                               </File>

diff --git a/common/c_cpp/src/c/windows/mman.c b/common/c_cpp/src/c/windows/mman.c

new file mode 100644

index 0000000..3a71d0f

--- /dev/null

+++ b/common/c_cpp/src/c/windows/mman.c

@@ -0,0 +1,206 @@

+/*

+ * The MIT License (MIT)

+ *

+ * Copyright (c) 2012 Viktor Kutuzov (https://code.google.com/p/mman-win32/)

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining a copy

+ * of this software and associated documentation files (the "Software"), to deal

+ * in the Software without restriction, including without limitation the rights

+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

+ * copies of the Software, and to permit persons to whom the Software is

+ * furnished to do so, subject to the following conditions:

+ *

+ * The above copyright notice and this permission notice shall be included in

+ * all copies or substantial portions of the Software.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

+ * THE SOFTWARE.

+ */

+

+#include <windows.h>

+#include <errno.h>

+#include <io.h>

+

+#include "mman.h"

+

+#ifndef FILE_MAP_EXECUTE

+#define FILE_MAP_EXECUTE    0x0020

+#endif /* FILE_MAP_EXECUTE */

+

+static int __map_mman_error(const DWORD err, const int deferr)

+{

+    if (err == 0)

+        return 0;

+    //TODO: implement

+    return err;

+}

+

+static DWORD __map_mmap_prot_page(const int prot)

+{

+    DWORD protect = 0;

+   

+    if (prot == PROT_NONE)

+        return protect;

+       

+    if ((prot & PROT_EXEC) != 0)

+    {

+        protect = ((prot & PROT_WRITE) != 0) ?

+                    PAGE_EXECUTE_READWRITE : PAGE_EXECUTE_READ;

+    }

+    else

+    {

+        protect = ((prot & PROT_WRITE) != 0) ?

+                    PAGE_READWRITE : PAGE_READONLY;

+    }

+

+    /* fq */

+    //protect |= SEC_COMMIT | SEC_LARGE_PAGES;

+   

+    return protect;

+}

+

+static DWORD __map_mmap_prot_file(const int prot)

+{

+    DWORD desiredAccess = 0;

+   

+    if (prot == PROT_NONE)

+        return desiredAccess;

+       

+    if ((prot & PROT_READ) != 0)

+        desiredAccess |= FILE_MAP_READ;

+    if ((prot & PROT_WRITE) != 0)

+        desiredAccess |= FILE_MAP_WRITE;

+    if ((prot & PROT_EXEC) != 0)

+        desiredAccess |= FILE_MAP_EXECUTE;

+   

+    return desiredAccess;

+}

+

+void* mmap(void *addr, size_t len, int prot, int flags, int fildes, off_t off)

+{

+    HANDLE fm, h;

+   

+    void * map = MAP_FAILED;

+   

+#ifdef _MSC_VER

+#pragma warning(push)

+#pragma warning(disable: 4293)

+#endif

+

+    const DWORD dwFileOffsetLow = (sizeof(off_t) <= sizeof(DWORD)) ?

+                    (DWORD)off : (DWORD)(off & 0xFFFFFFFFL);

+    const DWORD dwFileOffsetHigh = (sizeof(off_t) <= sizeof(DWORD)) ?

+                    (DWORD)0 : (DWORD)((off >> 32) & 0xFFFFFFFFL);

+    const DWORD protect = __map_mmap_prot_page(prot);

+    const DWORD desiredAccess = __map_mmap_prot_file(prot);

+

+    const off_t maxSize = off + (off_t)len;

+

+    const DWORD dwMaxSizeLow = (sizeof(off_t) <= sizeof(DWORD)) ?

+                    (DWORD)maxSize : (DWORD)(maxSize & 0xFFFFFFFFL);

+    const DWORD dwMaxSizeHigh = (sizeof(off_t) <= sizeof(DWORD)) ?

+                    (DWORD)0 : (DWORD)((maxSize >> 32) & 0xFFFFFFFFL);

+

+#ifdef _MSC_VER

+#pragma warning(pop)

+#endif

+

+    errno = 0;

+   

+    if (len == 0

+        /* Unsupported flag combinations */

+        || (flags & MAP_FIXED) != 0

+        /* Usupported protection combinations */

+        || prot == PROT_EXEC)

+    {

+        errno = EINVAL;

+        return MAP_FAILED;

+    }

+   

+    h = ((flags & MAP_ANONYMOUS) == 0) ?

+                    (HANDLE)_get_osfhandle(fildes) : INVALID_HANDLE_VALUE;

+

+    if ((flags & MAP_ANONYMOUS) == 0 && h == INVALID_HANDLE_VALUE)

+    {

+        errno = EBADF;

+        return MAP_FAILED;

+    }

+

+    fm = CreateFileMapping(h, NULL, protect, dwMaxSizeHigh, dwMaxSizeLow, NULL);

+

+    if (fm == NULL)

+    {

+        errno = __map_mman_error(GetLastError(), EPERM);

+        return MAP_FAILED;

+    }

+    map = MapViewOfFile(fm, desiredAccess, dwFileOffsetHigh, dwFileOffsetLow, len);

+

+    CloseHandle(fm);

+    if (map == NULL)

+    {

+        errno = __map_mman_error(GetLastError(), EPERM);

+        return MAP_FAILED;

+    }

+

+    return map;

+}

+

+int munmap(void *addr, size_t len)

+{

+    if (UnmapViewOfFile(addr))

+        return 0;

+       

+    errno =  __map_mman_error(GetLastError(), EPERM);

+   

+    return -1;

+}

+

+int mprotect(void *addr, size_t len, int prot)

+{

+    DWORD newProtect = __map_mmap_prot_page(prot);

+    DWORD oldProtect = 0;

+   

+    if (VirtualProtect(addr, len, newProtect, &oldProtect))

+        return 0;

+   

+    errno =  __map_mman_error(GetLastError(), EPERM);

+   

+    return -1;

+}

+

+int msync(void *addr, size_t len, int flags)

+{

+    if (FlushViewOfFile(addr, len))

+        return 0;

+   

+    errno =  __map_mman_error(GetLastError(), EPERM);

+   

+    return -1;

+}

+

+int mlock(const void *addr, size_t len)

+{

+    if (VirtualLock((LPVOID)addr, len))

+        return 0;

+       

+    errno =  __map_mman_error(GetLastError(), EPERM);

+   

+    return -1;

+}

+

+int munlock(const void *addr, size_t len)

+{

+    if (VirtualUnlock((LPVOID)addr, len))

+        return 0;

+       

+    errno =  __map_mman_error(GetLastError(), EPERM);

+   

+    return -1;

+}

diff --git a/common/c_cpp/src/c/windows/mman.h b/common/c_cpp/src/c/windows/mman.h

new file mode 100644

index 0000000..7c85d9e

--- /dev/null

+++ b/common/c_cpp/src/c/windows/mman.h

@@ -0,0 +1,74 @@

+/*

+ * The MIT License (MIT)

+ *

+ * Copyright (c) 2012 Viktor Kutuzov (https://code.google.com/p/mman-win32/)

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining a copy

+ * of this software and associated documentation files (the "Software"), to deal

+ * in the Software without restriction, including without limitation the rights

+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

+ * copies of the Software, and to permit persons to whom the Software is

+ * furnished to do so, subject to the following conditions:

+ *

+ * The above copyright notice and this permission notice shall be included in

+ * all copies or substantial portions of the Software.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

+ * THE SOFTWARE.

+ */

+

+#ifndef _SYS_MMAN_H_

+#define _SYS_MMAN_H_

+

+#ifndef _WIN32_WINNT                            // Allow use of features specific to Windows XP or later.                  

+#define _WIN32_WINNT 0x0501            // Change this to the appropriate value to target other versions of Windows.

+#endif                                                                                               

+

+/* All the headers include this file. */

+#ifndef _MSC_VER

+#include <_mingw.h>

+#endif

+

+#include <sys/types.h>

+

+#ifdef __cplusplus

+extern "C" {

+#endif

+

+#define PROT_NONE       0

+#define PROT_READ       1

+#define PROT_WRITE      2

+#define PROT_EXEC       4

+

+#define MAP_FILE        0

+#define MAP_SHARED      1

+#define MAP_PRIVATE     2

+#define MAP_TYPE        0xf

+#define MAP_FIXED       0x10

+#define MAP_ANONYMOUS   0x20

+#define MAP_ANON        MAP_ANONYMOUS

+

+#define MAP_FAILED      ((void *)-1)

+

+/* Flags for msync. */

+#define MS_ASYNC        1

+#define MS_SYNC         2

+#define MS_INVALIDATE   4

+

+void*   mmap(void *addr, size_t len, int prot, int flags, int fildes, off_t off);

+int     munmap(void *addr, size_t len);

+int     mprotect(void *addr, size_t len, int prot);

+int     msync(void *addr, size_t len, int flags);

+int     mlock(const void *addr, size_t len);

+int     munlock(const void *addr, size_t len);

+

+#ifdef __cplusplus

+};

+#endif

+

+#endif /*  _SYS_MMAN_H_ */

diff --git a/common/c_cpp/src/c/windows/mmap.h b/common/c_cpp/src/c/windows/mmap.h

deleted file mode 100644

index 939bd23..0000000

--- a/common/c_cpp/src/c/windows/mmap.h

+++ /dev/null

@@ -1,28 +0,0 @@

-/*

- * OpenMAMA: The open middleware agnostic messaging API

- * Copyright (C) 2011 NYSE Technologies, Inc.

- *

- * This library is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 2.1 of the License, or (at your option) any later version.

- *

- * This library is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- * You should have received a copy of the GNU Lesser General Public

- * License along with this library; if not, write to the Free Software

- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA

- * 02110-1301 USA

- */

-

-#ifndef WINDOWS_MMAP_H__

-#define WINDOWS_MMAP_H__

-

-/**

- * Open a file that will be mapped to memory. Return

- */

-

-#endif /* WINDOWS_MMAP_H__ */

diff --git a/common/c_cpp/src/c/windows/wombat/port.h b/common/c_cpp/src/c/windows/wombat/port.h

index 8eb09de..04168f3 100644

--- a/common/c_cpp/src/c/windows/wombat/port.h

+++ b/common/c_cpp/src/c/windows/wombat/port.h

@@ -40,7 +40,7 @@

#include "wombat/targetsxs.h"

#include "wombat/wConfig.h"

#include "windows/lock.h"

-#include "windows/mmap.h"

+#include "windows/mman.h"

 #if defined(__cplusplus)

extern "C" {

--

1.8.4.msysgit.0

 


This message may contain confidential information and is intended for specific recipients unless explicitly noted otherwise. If you have reason to believe you are not an intended recipient of this message, please delete it and notify the sender. This message may not represent the opinion of IntercontinentalExchange Group, Inc. (ICE), NYSE Euronext or any of their subsidiaries or affiliates, and does not constitute a contract or guarantee. Unencrypted electronic mail is not secure and the recipient of this message is expected to provide safeguards from viruses and pursue alternate means of communication where privacy or a binding message is desired.


Damian Maguire <DMaguire@...>
 

Master Quinn, 

Ticket raised in Bugzilla for this: http://bugs.openmama.org/show_bug.cgi?id=78

Cheers, 

D

From: Frank Quinn <fquinn@...>
Date: Wednesday, March 12, 2014 1:46 PM
To: "openmama-dev@..." <openmama-dev@...>
Subject: [Openmama-dev] [PATCH] Common: Added mmap implementation for windows

This change adds mman.h and mman.c to the code base as licensed by the MIT

license from https://code.google.com/p/mman-win32/. It also removes mmap.h

and updates windows/wombat/port.h to use the new mman.h header.

 

This allows us to make mmap calls on windows. References to source files

have also been added to the MSVC project and scons build environment.

 

Signed-off-by: Frank Quinn <fquinn@...>

---

common/c_cpp/src/c/SConscript.win        |   1 +

common/c_cpp/src/c/commonc.vcproj        |   4 +

common/c_cpp/src/c/windows/mman.c        | 206 +++++++++++++++++++++++++++++++

common/c_cpp/src/c/windows/mman.h        |  74 +++++++++++

common/c_cpp/src/c/windows/mmap.h        |  28 -----

common/c_cpp/src/c/windows/wombat/port.h |   2 +-

6 files changed, 286 insertions(+), 29 deletions(-)

create mode 100644 common/c_cpp/src/c/windows/mman.c

create mode 100644 common/c_cpp/src/c/windows/mman.h

delete mode 100644 common/c_cpp/src/c/windows/mmap.h

 

diff --git a/common/c_cpp/src/c/SConscript.win b/common/c_cpp/src/c/SConscript.win

index a883e27..dc920de 100644

--- a/common/c_cpp/src/c/SConscript.win

+++ b/common/c_cpp/src/c/SConscript.win

@@ -21,6 +21,7 @@ libyywrap.c

windows/strpcasecmp.c

windows/strptime.c

windows/platform.c

+windows/mman.c

windows/wSemaphore.c

windows/network.c

windows/environment.c

diff --git a/common/c_cpp/src/c/commonc.vcproj b/common/c_cpp/src/c/commonc.vcproj

index dc09604..1c45014 100644

--- a/common/c_cpp/src/c/commonc.vcproj

+++ b/common/c_cpp/src/c/commonc.vcproj

@@ -409,6 +409,10 @@

                                                               >

                                               </File>

                                               <File

+                                                             RelativePath=".\windows\mman.c"

+                                                             >

+                                             </File>

+                                             <File

                                                               RelativePath=".\windows\network.c"

                                                               >

                                               </File>

diff --git a/common/c_cpp/src/c/windows/mman.c b/common/c_cpp/src/c/windows/mman.c

new file mode 100644

index 0000000..3a71d0f

--- /dev/null

+++ b/common/c_cpp/src/c/windows/mman.c

@@ -0,0 +1,206 @@

+/*

+ * The MIT License (MIT)

+ *

+ * Copyright (c) 2012 Viktor Kutuzov (https://code.google.com/p/mman-win32/)

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining a copy

+ * of this software and associated documentation files (the "Software"), to deal

+ * in the Software without restriction, including without limitation the rights

+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

+ * copies of the Software, and to permit persons to whom the Software is

+ * furnished to do so, subject to the following conditions:

+ *

+ * The above copyright notice and this permission notice shall be included in

+ * all copies or substantial portions of the Software.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

+ * THE SOFTWARE.

+ */

+

+#include <windows.h>

+#include <errno.h>

+#include <io.h>

+

+#include "mman.h"

+

+#ifndef FILE_MAP_EXECUTE

+#define FILE_MAP_EXECUTE    0x0020

+#endif /* FILE_MAP_EXECUTE */

+

+static int __map_mman_error(const DWORD err, const int deferr)

+{

+    if (err == 0)

+        return 0;

+    //TODO: implement

+    return err;

+}

+

+static DWORD __map_mmap_prot_page(const int prot)

+{

+    DWORD protect = 0;

+   

+    if (prot == PROT_NONE)

+        return protect;

+       

+    if ((prot & PROT_EXEC) != 0)

+    {

+        protect = ((prot & PROT_WRITE) != 0) ?

+                    PAGE_EXECUTE_READWRITE : PAGE_EXECUTE_READ;

+    }

+    else

+    {

+        protect = ((prot & PROT_WRITE) != 0) ?

+                    PAGE_READWRITE : PAGE_READONLY;

+    }

+

+    /* fq */

+    //protect |= SEC_COMMIT | SEC_LARGE_PAGES;

+   

+    return protect;

+}

+

+static DWORD __map_mmap_prot_file(const int prot)

+{

+    DWORD desiredAccess = 0;

+   

+    if (prot == PROT_NONE)

+        return desiredAccess;

+       

+    if ((prot & PROT_READ) != 0)

+        desiredAccess |= FILE_MAP_READ;

+    if ((prot & PROT_WRITE) != 0)

+        desiredAccess |= FILE_MAP_WRITE;

+    if ((prot & PROT_EXEC) != 0)

+        desiredAccess |= FILE_MAP_EXECUTE;

+   

+    return desiredAccess;

+}

+

+void* mmap(void *addr, size_t len, int prot, int flags, int fildes, off_t off)

+{

+    HANDLE fm, h;

+   

+    void * map = MAP_FAILED;

+   

+#ifdef _MSC_VER

+#pragma warning(push)

+#pragma warning(disable: 4293)

+#endif

+

+    const DWORD dwFileOffsetLow = (sizeof(off_t) <= sizeof(DWORD)) ?

+                    (DWORD)off : (DWORD)(off & 0xFFFFFFFFL);

+    const DWORD dwFileOffsetHigh = (sizeof(off_t) <= sizeof(DWORD)) ?

+                    (DWORD)0 : (DWORD)((off >> 32) & 0xFFFFFFFFL);

+    const DWORD protect = __map_mmap_prot_page(prot);

+    const DWORD desiredAccess = __map_mmap_prot_file(prot);

+

+    const off_t maxSize = off + (off_t)len;

+

+    const DWORD dwMaxSizeLow = (sizeof(off_t) <= sizeof(DWORD)) ?

+                    (DWORD)maxSize : (DWORD)(maxSize & 0xFFFFFFFFL);

+    const DWORD dwMaxSizeHigh = (sizeof(off_t) <= sizeof(DWORD)) ?

+                    (DWORD)0 : (DWORD)((maxSize >> 32) & 0xFFFFFFFFL);

+

+#ifdef _MSC_VER

+#pragma warning(pop)

+#endif

+

+    errno = 0;

+   

+    if (len == 0

+        /* Unsupported flag combinations */

+        || (flags & MAP_FIXED) != 0

+        /* Usupported protection combinations */

+        || prot == PROT_EXEC)

+    {

+        errno = EINVAL;

+        return MAP_FAILED;

+    }

+   

+    h = ((flags & MAP_ANONYMOUS) == 0) ?

+                    (HANDLE)_get_osfhandle(fildes) : INVALID_HANDLE_VALUE;

+

+    if ((flags & MAP_ANONYMOUS) == 0 && h == INVALID_HANDLE_VALUE)

+    {

+        errno = EBADF;

+        return MAP_FAILED;

+    }

+

+    fm = CreateFileMapping(h, NULL, protect, dwMaxSizeHigh, dwMaxSizeLow, NULL);

+

+    if (fm == NULL)

+    {

+        errno = __map_mman_error(GetLastError(), EPERM);

+        return MAP_FAILED;

+    }

+    map = MapViewOfFile(fm, desiredAccess, dwFileOffsetHigh, dwFileOffsetLow, len);

+

+    CloseHandle(fm);

+    if (map == NULL)

+    {

+        errno = __map_mman_error(GetLastError(), EPERM);

+        return MAP_FAILED;

+    }

+

+    return map;

+}

+

+int munmap(void *addr, size_t len)

+{

+    if (UnmapViewOfFile(addr))

+        return 0;

+       

+    errno =  __map_mman_error(GetLastError(), EPERM);

+   

+    return -1;

+}

+

+int mprotect(void *addr, size_t len, int prot)

+{

+    DWORD newProtect = __map_mmap_prot_page(prot);

+    DWORD oldProtect = 0;

+   

+    if (VirtualProtect(addr, len, newProtect, &oldProtect))

+        return 0;

+   

+    errno =  __map_mman_error(GetLastError(), EPERM);

+   

+    return -1;

+}

+

+int msync(void *addr, size_t len, int flags)

+{

+    if (FlushViewOfFile(addr, len))

+        return 0;

+   

+    errno =  __map_mman_error(GetLastError(), EPERM);

+   

+    return -1;

+}

+

+int mlock(const void *addr, size_t len)

+{

+    if (VirtualLock((LPVOID)addr, len))

+        return 0;

+       

+    errno =  __map_mman_error(GetLastError(), EPERM);

+   

+    return -1;

+}

+

+int munlock(const void *addr, size_t len)

+{

+    if (VirtualUnlock((LPVOID)addr, len))

+        return 0;

+       

+    errno =  __map_mman_error(GetLastError(), EPERM);

+   

+    return -1;

+}

diff --git a/common/c_cpp/src/c/windows/mman.h b/common/c_cpp/src/c/windows/mman.h

new file mode 100644

index 0000000..7c85d9e

--- /dev/null

+++ b/common/c_cpp/src/c/windows/mman.h

@@ -0,0 +1,74 @@

+/*

+ * The MIT License (MIT)

+ *

+ * Copyright (c) 2012 Viktor Kutuzov (https://code.google.com/p/mman-win32/)

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining a copy

+ * of this software and associated documentation files (the "Software"), to deal

+ * in the Software without restriction, including without limitation the rights

+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

+ * copies of the Software, and to permit persons to whom the Software is

+ * furnished to do so, subject to the following conditions:

+ *

+ * The above copyright notice and this permission notice shall be included in

+ * all copies or substantial portions of the Software.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

+ * THE SOFTWARE.

+ */

+

+#ifndef _SYS_MMAN_H_

+#define _SYS_MMAN_H_

+

+#ifndef _WIN32_WINNT                            // Allow use of features specific to Windows XP or later.                  

+#define _WIN32_WINNT 0x0501            // Change this to the appropriate value to target other versions of Windows.

+#endif                                                                                               

+

+/* All the headers include this file. */

+#ifndef _MSC_VER

+#include <_mingw.h>

+#endif

+

+#include <sys/types.h>

+

+#ifdef __cplusplus

+extern "C" {

+#endif

+

+#define PROT_NONE       0

+#define PROT_READ       1

+#define PROT_WRITE      2

+#define PROT_EXEC       4

+

+#define MAP_FILE        0

+#define MAP_SHARED      1

+#define MAP_PRIVATE     2

+#define MAP_TYPE        0xf

+#define MAP_FIXED       0x10

+#define MAP_ANONYMOUS   0x20

+#define MAP_ANON        MAP_ANONYMOUS

+

+#define MAP_FAILED      ((void *)-1)

+

+/* Flags for msync. */

+#define MS_ASYNC        1

+#define MS_SYNC         2

+#define MS_INVALIDATE   4

+

+void*   mmap(void *addr, size_t len, int prot, int flags, int fildes, off_t off);

+int     munmap(void *addr, size_t len);

+int     mprotect(void *addr, size_t len, int prot);

+int     msync(void *addr, size_t len, int flags);

+int     mlock(const void *addr, size_t len);

+int     munlock(const void *addr, size_t len);

+

+#ifdef __cplusplus

+};

+#endif

+

+#endif /*  _SYS_MMAN_H_ */

diff --git a/common/c_cpp/src/c/windows/mmap.h b/common/c_cpp/src/c/windows/mmap.h

deleted file mode 100644

index 939bd23..0000000

--- a/common/c_cpp/src/c/windows/mmap.h

+++ /dev/null

@@ -1,28 +0,0 @@

-/*

- * OpenMAMA: The open middleware agnostic messaging API

- * Copyright (C) 2011 NYSE Technologies, Inc.

- *

- * This library is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 2.1 of the License, or (at your option) any later version.

- *

- * This library is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- * You should have received a copy of the GNU Lesser General Public

- * License along with this library; if not, write to the Free Software

- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA

- * 02110-1301 USA

- */

-

-#ifndef WINDOWS_MMAP_H__

-#define WINDOWS_MMAP_H__

-

-/**

- * Open a file that will be mapped to memory. Return

- */

-

-#endif /* WINDOWS_MMAP_H__ */

diff --git a/common/c_cpp/src/c/windows/wombat/port.h b/common/c_cpp/src/c/windows/wombat/port.h

index 8eb09de..04168f3 100644

--- a/common/c_cpp/src/c/windows/wombat/port.h

+++ b/common/c_cpp/src/c/windows/wombat/port.h

@@ -40,7 +40,7 @@

#include "wombat/targetsxs.h"

#include "wombat/wConfig.h"

#include "windows/lock.h"

-#include "windows/mmap.h"

+#include "windows/mman.h"

 #if defined(__cplusplus)

extern "C" {

--

1.8.4.msysgit.0

 


This message may contain confidential information and is intended for specific recipients unless explicitly noted otherwise. If you have reason to believe you are not an intended recipient of this message, please delete it and notify the sender. This message may not represent the opinion of IntercontinentalExchange Group, Inc. (ICE), NYSE Euronext or any of their subsidiaries or affiliates, and does not constitute a contract or guarantee. Unencrypted electronic mail is not secure and the recipient of this message is expected to provide safeguards from viruses and pursue alternate means of communication where privacy or a binding message is desired.

This message may contain confidential information and is intended for specific recipients unless explicitly noted otherwise. If you have reason to believe you are not an intended recipient of this message, please delete it and notify the sender. This message may not represent the opinion of IntercontinentalExchange Group, Inc. (ICE), NYSE Euronext or any of their subsidiaries or affiliates, and does not constitute a contract or guarantee. Unencrypted electronic mail is not secure and the recipient of this message is expected to provide safeguards from viruses and pursue alternate means of communication where privacy or a binding message is desired.