GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-22 11:19:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use malloc/realloc on macOS when fd < 0... but doesn't compile

Browse Source
This commit is contained in:
John J. Camilleri
2021-10-15 15:24:15 +02:00
parent a5fb51ff3d
commit 8cd0bb5ec1
1 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/runtime/c/pgf/db.cxx
View File

@@ -323,10 +323,19 @@ PgfDB::PgfDB(const char* filepath, int flags, int mode) {
this->filepath = strdup(filepath); this->filepath = strdup(filepath);
} }
#ifndef MREMAP_MAYMOVE
if (fd >= 0) {
ms = (malloc_state*)
mmap(NULL, file_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
} else {
ms = (malloc_state*) malloc(file_size); // doesn't compile
}
#else
int mflags = (fd < 0) ? (MAP_PRIVATE | MAP_ANONYMOUS) : MAP_SHARED; int mflags = (fd < 0) ? (MAP_PRIVATE | MAP_ANONYMOUS) : MAP_SHARED;
ms = (malloc_state*) ms = (malloc_state*)
mmap(NULL, file_size, PROT_READ | PROT_WRITE, mflags, fd, 0); mmap(NULL, file_size, PROT_READ | PROT_WRITE, mflags, fd, 0);
if (ms == MAP_FAILED) { #endif
if (ms == MAP_FAILED || ms == NULL) {
ms = NULL; // mark that ms is not created. ms = NULL; // mark that ms is not created.
::free((void *) this->filepath); ::free((void *) this->filepath);
int code = errno; int code = errno;
@@ -884,14 +893,19 @@ object PgfDB::malloc_internal(size_t bytes)
throw pgf_systemerror(errno, filepath); throw pgf_systemerror(errno, filepath);
} }
malloc_state* new_ms;
// OSX mman and mman-win32 do not implement mremap or MREMAP_MAYMOVE // OSX mman and mman-win32 do not implement mremap or MREMAP_MAYMOVE
#ifndef MREMAP_MAYMOVE #ifndef MREMAP_MAYMOVE
if (munmap(ms, old_size) == -1) if (fd >= 0) {
throw pgf_systemerror(errno); if (munmap(ms, old_size) == -1)
malloc_state* new_ms = throw pgf_systemerror(errno);
(malloc_state*) mmap(0, new_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); new_ms =
(malloc_state*) mmap(0, new_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
} else {
new_ms = (malloc_state*) realloc(ms, new_size);
}
#else #else
malloc_state* new_ms = new_ms =
(malloc_state*) mremap(ms, old_size, new_size, MREMAP_MAYMOVE); (malloc_state*) mremap(ms, old_size, new_size, MREMAP_MAYMOVE);
#endif #endif
if (new_ms == MAP_FAILED) if (new_ms == MAP_FAILED)