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

Merge "Remove reference to NOT_USING_KLIBC and cygwin."

Browse source
This commit is contained in:
Narayan Kamath 2015-02-20 16:40:32 +00:00 • committed by Gerrit Code Review
commit 1158c7d5fe
1 changed files with 1 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
libutils/FileMap.cpp
View file

@ -141,20 +141,14 @@ bool FileMap::create(const char* origFileName, int fd, off64_t offset, size_t le
// init on first use // init on first use
if (mPageSize == -1) { if (mPageSize == -1) {
#if NOT_USING_KLIBC
mPageSize = sysconf(_SC_PAGESIZE); mPageSize = sysconf(_SC_PAGESIZE);
if (mPageSize == -1) { if (mPageSize == -1) {
ALOGE("could not get _SC_PAGESIZE\n"); ALOGE("could not get _SC_PAGESIZE\n");
return false; return false;
} }
#else
// this holds for Linux, Darwin, Cygwin, and doesn't pain the ARM
mPageSize = 4096;
#endif
} }
adjust = offset % mPageSize; adjust = offset % mPageSize;
try_again:
adjOffset = offset - adjust; adjOffset = offset - adjust;
adjLength = length + adjust; adjLength = length + adjust;
@ -165,13 +159,6 @@ try_again:
ptr = mmap(NULL, adjLength, prot, flags, fd, adjOffset); ptr = mmap(NULL, adjLength, prot, flags, fd, adjOffset);
if (ptr == MAP_FAILED) { if (ptr == MAP_FAILED) {
// Cygwin does not seem to like file mapping files from an offset.
// So if we fail, try again with offset zero
if (adjOffset > 0) {
adjust = offset;
goto try_again;
}
ALOGE("mmap(%lld,%zu) failed: %s\n", ALOGE("mmap(%lld,%zu) failed: %s\n",
(long long)adjOffset, adjLength, strerror(errno)); (long long)adjOffset, adjLength, strerror(errno));
return false; return false;