ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "kill HAVE_POSIX_FILEMAP"

Browse source
This commit is contained in:
Yabin Cui 2014-11-11 19:24:19 +00:00 • committed by Gerrit Code Review
commit 2c0839e9db
2 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/utils/FileMap.h
View file

@ -24,7 +24,7 @@
#include <utils/Compat.h> #include <utils/Compat.h>
#ifdef HAVE_WIN32_FILEMAP #if defined(__MINGW32__)
// Ensure that we always pull in winsock2.h before windows.h // Ensure that we always pull in winsock2.h before windows.h
#ifdef HAVE_WINSOCK #ifdef HAVE_WINSOCK
#include <winsock2.h> #include <winsock2.h>
@ -127,7 +127,7 @@ private:
off64_t mDataOffset; // offset used when map was created off64_t mDataOffset; // offset used when map was created
void* mDataPtr; // start of requested data, offset from base void* mDataPtr; // start of requested data, offset from base
size_t mDataLength; // length, measured from "mDataPtr" size_t mDataLength; // length, measured from "mDataPtr"
#ifdef HAVE_WIN32_FILEMAP #if defined(__MINGW32__)
HANDLE mFileHandle; // Win32 file handle HANDLE mFileHandle; // Win32 file handle
HANDLE mFileMapping; // Win32 file mapping handle HANDLE mFileMapping; // Win32 file mapping handle
#endif #endif

22
libutils/FileMap.cpp
View file

@ -23,7 +23,7 @@
#include <utils/FileMap.h> #include <utils/FileMap.h>
#include <utils/Log.h> #include <utils/Log.h>
#if defined(HAVE_WIN32_FILEMAP) && !defined(__USE_MINGW_ANSI_STDIO) #if defined(__MINGW32__) && !defined(__USE_MINGW_ANSI_STDIO)
# define PRId32 "I32d" # define PRId32 "I32d"
# define PRIx32 "I32x" # define PRIx32 "I32x"
# define PRId64 "I64d" # define PRId64 "I64d"
@ -33,7 +33,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#ifdef HAVE_POSIX_FILEMAP #if !defined(__MINGW32__)
#include <sys/mman.h> #include <sys/mman.h>
#endif #endif
@ -64,12 +64,7 @@ FileMap::~FileMap(void)
if (mFileName != NULL) { if (mFileName != NULL) {
free(mFileName); free(mFileName);
} }
#ifdef HAVE_POSIX_FILEMAP #if defined(__MINGW32__)
if (mBasePtr && munmap(mBasePtr, mBaseLength) != 0) {
ALOGD("munmap(%p, %zu) failed\n", mBasePtr, mBaseLength);
}
#endif
#ifdef HAVE_WIN32_FILEMAP
if (mBasePtr && UnmapViewOfFile(mBasePtr) == 0) { if (mBasePtr && UnmapViewOfFile(mBasePtr) == 0) {
ALOGD("UnmapViewOfFile(%p) failed, error = %" PRId32 "\n", mBasePtr, ALOGD("UnmapViewOfFile(%p) failed, error = %" PRId32 "\n", mBasePtr,
GetLastError() ); GetLastError() );
@ -77,6 +72,10 @@ FileMap::~FileMap(void)
if (mFileMapping != INVALID_HANDLE_VALUE) { if (mFileMapping != INVALID_HANDLE_VALUE) {
CloseHandle(mFileMapping); CloseHandle(mFileMapping);
} }
#else
if (mBasePtr && munmap(mBasePtr, mBaseLength) != 0) {
ALOGD("munmap(%p, %zu) failed\n", mBasePtr, mBaseLength);
}
#endif #endif
} }
@ -90,7 +89,7 @@ FileMap::~FileMap(void)
bool FileMap::create(const char* origFileName, int fd, off64_t offset, size_t length, bool FileMap::create(const char* origFileName, int fd, off64_t offset, size_t length,
bool readOnly) bool readOnly)
{ {
#ifdef HAVE_WIN32_FILEMAP #if defined(__MINGW32__)
int adjust; int adjust;
off64_t adjOffset; off64_t adjOffset;
size_t adjLength; size_t adjLength;
@ -128,8 +127,7 @@ bool FileMap::create(const char* origFileName, int fd, off64_t offset, size_t le
mFileMapping = INVALID_HANDLE_VALUE; mFileMapping = INVALID_HANDLE_VALUE;
return false; return false;
} }
#endif #else // !defined(__MINGW32__)
#ifdef HAVE_POSIX_FILEMAP
int prot, flags, adjust; int prot, flags, adjust;
off64_t adjOffset; off64_t adjOffset;
size_t adjLength; size_t adjLength;
@ -179,7 +177,7 @@ try_again:
return false; return false;
} }
mBasePtr = ptr; mBasePtr = ptr;
#endif // HAVE_POSIX_FILEMAP #endif // !defined(__MINGW32__)
mFileName = origFileName != NULL ? strdup(origFileName) : NULL; mFileName = origFileName != NULL ? strdup(origFileName) : NULL;
mBaseLength = adjLength; mBaseLength = adjLength;