firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 21:23:04 +01:00
Code Issues

Fixed CORE-3067: Objects not unmapped when shared memory is closed

Browse Source
This commit is contained in:
alexpeshkoff 2010-07-09 11:04:23 +00:00
parent 5c1c5ee7a9
commit 9a7dd2f84f
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/jrd/isc_sync.cpp
View File

@ -2314,16 +2314,16 @@ void SharedMemoryBase::unmapObject(Arg::StatusVector& statusVector, UCHAR** obje
return;
}
#endif
const ULONG page_size = (ULONG) ps;
const size_t page_size = (ULONG) ps;
// Compute the start and end page-aligned addresses which contain the mapped object.
UCHAR* const start = (UCHAR *) ((U_IPTR) * object_pointer & ~(page_size - 1));
const UCHAR* end =
(UCHAR*) ((U_IPTR) ((*object_pointer + object_length) + (page_size - 1)) & ~(page_size - 1));
const ULONG length = end - start;
char* const start = (char*) ((U_IPTR) (*object_pointer) & ~(page_size - 1));
char* const end =
(char*) ((U_IPTR) ((*object_pointer + object_length) + (page_size - 1)) & ~(page_size - 1));
const size_t length = end - start;
if (munmap((char *) start, length) == -1)
if (munmap(start, length) == -1)
{
error(statusVector, "munmap", errno);
return; // false;
@ -3363,7 +3363,7 @@ void SharedMemoryBase::unmapFile(Arg::StatusVector& statusVector)
#endif
#if defined(HAVE_OBJECT_MAP) && (!defined(USE_SYS5SEMAPHORE))
unmapObject(statusVector, (UCHAR**) sh_mem_mutex, sizeof(mtx));
unmapObject(statusVector, (UCHAR**) &sh_mem_mutex, sizeof(mtx));
#endif
munmap((char *) getHeader(), sh_mem_length_mapped);