Index: /trunk/include/iprt/mem.h =================================================================== --- /trunk/include/iprt/mem.h (revision 52020) +++ /trunk/include/iprt/mem.h (revision 52021) @@ -506,89 +506,4 @@ RTDECL(void) RTMemWipeThoroughly(void *pv, size_t cb, size_t cMinPasses) RT_NO_THROW; -/** - * Allocate locked memory with default tag - extended version. - * - * @returns IPRT status code. - * @param cb The amount of memory to allocate. - * @param ppv Where to store the pointer to the allocated memory on success. - */ -#define RTMemLockedAllocEx(cb, ppv) RTMemLockedAllocExTag((cb), RTMEM_TAG, (ppv)) - -/** - * Allocate locked memory - extended version. - * - * @returns IPRT status code. - * @param cb The amount of memory to allocate. - * @param pszTag Allocation tag used for statistics and such. - * @param ppv Where to store the pointer to the allocated memory on success. - */ -RTDECL(int) RTMemLockedAllocExTag(size_t cb, const char *pszTag, void **ppv) RT_NO_THROW; - -/** - * Allocate zeroed locked memory with default tag - extended version. - * - * @returns IPRT status code. - * @param cb The amount of memory to allocate. - * @param ppv Where to store the pointer to the allocated memory on success. - */ -#define RTMemLockedAllocZEx(cb, ppv) RTMemLockedAllocZExTag((cb), RTMEM_TAG, (ppv)) - -/** - * Allocate zeroed locked memory - extended version. - * - * @returns IPRT status code. - * @param cb The amount of memory to allocate. - * @param pszTag Allocation tag used for statistics and such. - * @param ppv Where to store the pointer to the allocated memory on success. - */ -RTDECL(int) RTMemLockedAllocZExTag(size_t cb, const char *pszTag, void **ppv) RT_NO_THROW; - -/** - * Allocate locked memory with the default tag - shortcut for RTMemLockedAllocExTag(). - * - * @returns Pointer to allocated memory on success. - * @returns NULL on failure (use RTMemLockedAllocExTag() if the specific reason is required) - * @param cb The amount of memory to allocate. - */ -#define RTMemLockedAlloc(cb) RTMemLockedAllocTag((cb), RTMEM_TAG) - -/** - * Allocate locked memory - shortcut for RTMemLockedAllocExTag(). - * - * @returns Pointer to allocated memory on success. - * @returns NULL on failure (use RTMemLockedAllocExTag() if the specific reason is required) - * @param cb The amount of memory to allocate. - * @param pszTag Allocation tag used for statistics and such. - */ -RTDECL(void *) RTMemLockedAllocTag(size_t cb, const char *pszTag) RT_NO_THROW; - -/** - * Allocate locked zeroed memory with the default tag - shortcut for RTMemLockedAllocZExTag(). - * - * @returns Pointer to allocated memory on success. - * @returns NULL on failure (use RTMemLockedAllocZExTag() if the specific reason is required) - * @param cb The amount of memory to allocate. - */ -#define RTMemLockedAllocZ(cb) RTMemLockedAllocZTag((cb), RTMEM_TAG) - -/** - * Allocate locked zeroed memory - shortcut for RTMemLockedAllocZExTag(). - * - * @returns Pointer to allocated memory on success. - * @returns NULL on failure (use RTMemLockedAllocZExTag() if the specific reason is required) - * @param cb The amount of memory to allocate. - * @param pszTag Allocation tag used for statistics and such. - */ -RTDECL(void *) RTMemLockedAllocZTag(size_t cb, const char *pszTag) RT_NO_THROW; - -/** - * Frees memory allocated with any of the RTMemLockedAlloc* API. - * - * @returns nothing. - * @param pv Pointer to the memory block to free. - */ -RTDECL(void) RTMemLockedFree(void *pv) RT_NO_THROW; - - #ifdef IN_RING0 Index: /trunk/src/VBox/Runtime/Makefile.kmk =================================================================== --- /trunk/src/VBox/Runtime/Makefile.kmk (revision 52020) +++ /trunk/src/VBox/Runtime/Makefile.kmk (revision 52021) @@ -734,5 +734,4 @@ r3/win/symlink-win.cpp \ r3/win/rtFileNativeSetAttributes-win.cpp \ - r3/win/rtmemlocked-win.cpp \ r3/win/thread-win.cpp \ r3/win/thread2-win.cpp \ @@ -786,5 +785,4 @@ r3/posix/RTTimeSet-posix.cpp \ r3/posix/rtmempage-exec-mmap-heap-posix.cpp \ - r3/posix/rtmemlocked-posix.cpp \ r3/posix/dir-posix.cpp \ r3/posix/env-posix.cpp \ @@ -957,5 +955,4 @@ r3/posix/ldrNative-posix.cpp \ r3/posix/rtmempage-exec-mmap-heap-posix.cpp \ - r3/posix/rtmemlocked-posix.cpp \ r3/posix/path-posix.cpp \ r3/posix/path2-posix.cpp \ @@ -1023,5 +1020,4 @@ r3/posix/ldrNative-posix.cpp \ r3/posix/rtmempage-exec-mmap-heap-posix.cpp \ - r3/posix/rtmemlocked-posix.cpp \ r3/posix/path-posix.cpp \ r3/posix/path2-posix.cpp \ @@ -1082,5 +1078,4 @@ r3/posix/ldrNative-posix.cpp \ r3/posix/rtmempage-exec-mmap-heap-posix.cpp \ - r3/posix/rtmemlocked-posix.cpp \ r3/posix/path-posix.cpp \ r3/posix/path2-posix.cpp \ @@ -1161,5 +1156,4 @@ r3/posix/ldrNative-posix.cpp \ r3/posix/rtmempage-exec-mmap-heap-posix.cpp \ - r3/posix/rtmemlocked-posix.cpp \ r3/posix/path-posix.cpp \ r3/posix/path2-posix.cpp \ Index: unk/src/VBox/Runtime/r3/posix/rtmemlocked-posix.cpp =================================================================== --- /trunk/src/VBox/Runtime/r3/posix/rtmemlocked-posix.cpp (revision 52020) +++ (revision ) @@ -1,159 +1,0 @@ -/* $Id$ */ -/** @file - * IPRT - RTMemLocked*, POSIX. - */ - -/* - * Copyright (C) 2014 Oracle Corporation - * - * This file is part of VirtualBox Open Source Edition (OSE), as - * available from http://www.virtualbox.org. This file is free software; - * you can redistribute it and/or modify it under the terms of the GNU - * General Public License (GPL) as published by the Free Software - * Foundation, in version 2 as it comes in the "COPYING" file of the - * VirtualBox OSE distribution. VirtualBox OSE is distributed in the - * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. - * - * The contents of this file may alternatively be used under the terms - * of the Common Development and Distribution License Version 1.0 - * (CDDL) only, as it comes in the "COPYING.CDDL" file of the - * VirtualBox OSE distribution, in which case the provisions of the - * CDDL are applicable instead of those of the GPL. - * - * You may elect to license modified versions of this file under the - * terms and conditions of either the GPL or the CDDL or both. - */ - - -/******************************************************************************* -* Header Files * -*******************************************************************************/ -#include "internal/iprt.h" -#include - -#include -#include -#include -#include -#include "internal/mem.h" - -#include -#include -#include -#if !defined(MAP_ANONYMOUS) && defined(MAP_ANON) -# define MAP_ANONYMOUS MAP_ANON -#endif - -/******************************************************************************* -* Defined Constants And Macros * -*******************************************************************************/ - - -/******************************************************************************* -* Structures and Typedefs * -*******************************************************************************/ -/** - * Header for a locked memory region. - */ -typedef struct RTMEMLOCKEDHDR -{ - /** Magic value. */ - uint32_t u32Magic; - /** Size of the region in bytes including the header, rounded to a page aligned value. */ - size_t cbRegion; -#if HC_ARCH_BITS == 64 - /** 8 byte alignment of the structure on 64bit platforms. */ - uint32_t u32Alignment; -#endif -} RTMEMLOCKEDHDR; -/** Pointer to a locked memory region header. */ -typedef RTMEMLOCKEDHDR *PRTMEMLOCKEDHDR; -/** Magic for the header. (Vienna Teng) */ -#define RTMEMLOCKEDHDR_MAGIC UINT32_C(0x19781003) - -RTDECL(int) RTMemLockedAllocExTag(size_t cb, const char *pszTag, void **ppv) RT_NO_THROW -{ - int rc = VINF_SUCCESS; - size_t cbAlloc = RT_ALIGN_Z(cb + sizeof(RTMEMLOCKEDHDR), PAGE_SIZE); - void *pv; - - NOREF(pszTag); - - pv = mmap(NULL, cbAlloc, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, - -1, 0); - if (pv != MAP_FAILED) - { - int rcPosix = mlock(pv, cbAlloc); - if (!rcPosix) - { - PRTMEMLOCKEDHDR pHdr = (PRTMEMLOCKEDHDR)pv; - AssertPtr(pHdr); - - pHdr->u32Magic = RTMEMLOCKEDHDR_MAGIC; - pHdr->cbRegion = cbAlloc; - *ppv = pHdr + 1; - } - else - rc = RTErrConvertFromErrno(errno); - } - - return rc; -} - -RTDECL(int) RTMemLockedAllocZExTag(size_t cb, const char *pszTag, void **ppv) RT_NO_THROW -{ - void *pv = NULL; - int rc = RTMemLockedAllocExTag(cb, pszTag, &pv); - - if (RT_SUCCESS(rc)) - { - RT_BZERO(pv, cb); - *ppv = pv; - } - - return rc; -} - -RTDECL(void *) RTMemLockedAllocTag(size_t cb, const char *pszTag) RT_NO_THROW -{ - void *pv = NULL; - int rc = RTMemLockedAllocExTag(cb, pszTag, &pv); - - if (RT_FAILURE(rc)) - return NULL; - - return pv; -} - -RTDECL(void *) RTMemLockedAllocZTag(size_t cb, const char *pszTag) RT_NO_THROW -{ - void *pv = NULL; - int rc = RTMemLockedAllocZExTag(cb, pszTag, &pv); - - if (RT_FAILURE(rc)) - return NULL; - - return pv; -} - -RTDECL(void) RTMemLockedFree(void *pv) RT_NO_THROW -{ - /* - * Validate & adjust the input. - */ - if (!pv) - return; - AssertPtr(pv); - - int rcPosix; - PRTMEMLOCKEDHDR pHdr = ((PRTMEMLOCKEDHDR)pv) - 1; - AssertReturnVoid(pHdr->u32Magic == RTMEMLOCKEDHDR_MAGIC); - - pHdr->u32Magic = ~RTMEMLOCKEDHDR_MAGIC; - rcPosix = munlock(pHdr, pHdr->cbRegion); - AssertMsg(rcPosix == 0, ("rc=%d errno=%d pv=%p\n", rcPosix, errno, pHdr)); NOREF(rcPosix); - - rcPosix = munmap(pHdr, pHdr->cbRegion); - AssertMsg(rcPosix == 0, ("rc=%d errno=%d pv=%p\n", rcPosix, errno, pHdr)); NOREF(rcPosix); -} - Index: unk/src/VBox/Runtime/r3/win/rtmemlocked-win.cpp =================================================================== --- /trunk/src/VBox/Runtime/r3/win/rtmemlocked-win.cpp (revision 52020) +++ (revision ) @@ -1,110 +1,0 @@ -/* $Id$ */ -/** @file - * IPRT - RTMemLocked*, POSIX. - */ - -/* - * Copyright (C) 2014 Oracle Corporation - * - * This file is part of VirtualBox Open Source Edition (OSE), as - * available from http://www.virtualbox.org. This file is free software; - * you can redistribute it and/or modify it under the terms of the GNU - * General Public License (GPL) as published by the Free Software - * Foundation, in version 2 as it comes in the "COPYING" file of the - * VirtualBox OSE distribution. VirtualBox OSE is distributed in the - * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. - * - * The contents of this file may alternatively be used under the terms - * of the Common Development and Distribution License Version 1.0 - * (CDDL) only, as it comes in the "COPYING.CDDL" file of the - * VirtualBox OSE distribution, in which case the provisions of the - * CDDL are applicable instead of those of the GPL. - * - * You may elect to license modified versions of this file under the - * terms and conditions of either the GPL or the CDDL or both. - */ - - -/******************************************************************************* -* Header Files * -*******************************************************************************/ -#define LOG_GROUP RTLOGGROUP_MEM -#include "internal/iprt.h" -#include - -#include -#include -#include -#include -#include "internal/mem.h" - -#include - -/******************************************************************************* -* Defined Constants And Macros * -*******************************************************************************/ - - -/******************************************************************************* -* Structures and Typedefs * -*******************************************************************************/ - -RTDECL(int) RTMemLockedAllocExTag(size_t cb, const char *pszTag, void **ppv) RT_NO_THROW -{ - int rc = VINF_SUCCESS; - - *ppv = RTMemAlloc(cb); - if (!*ppv) - rc = VERR_NO_MEMORY; - - return rc; -} - -RTDECL(int) RTMemLockedAllocZExTag(size_t cb, const char *pszTag, void **ppv) RT_NO_THROW -{ - void *pv = NULL; - int rc = RTMemLockedAllocExTag(cb, pszTag, &pv); - - if (RT_SUCCESS(rc)) - { - RT_BZERO(pv, cb); - *ppv = pv; - } - - return rc; -} - -RTDECL(void *) RTMemLockedAllocTag(size_t cb, const char *pszTag) RT_NO_THROW -{ - void *pv = NULL; - int rc = RTMemLockedAllocExTag(cb, pszTag, &pv); - - if (RT_FAILURE(rc)) - return NULL; - - return pv; -} - -RTDECL(void *) RTMemLockedAllocZTag(size_t cb, const char *pszTag) RT_NO_THROW -{ - void *pv = NULL; - int rc = RTMemLockedAllocZExTag(cb, pszTag, &pv); - - if (RT_FAILURE(rc)) - return NULL; - - return pv; -} - -RTDECL(void) RTMemLockedFree(void *pv) RT_NO_THROW -{ - /* - * Validate & adjust the input. - */ - if (!pv) - return; - AssertPtr(pv); - - RTMemFree(pv); -} -