mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-22 16:33:29 +00:00
Use valloc() in NSAllocateMemoryPages().
Cosmetic style changes. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@2004 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
101fbead74
commit
db631fa048
1 changed files with 11 additions and 14 deletions
|
@ -59,12 +59,9 @@ NSPageSize (void)
|
|||
unsigned
|
||||
NSLogPageSize (void)
|
||||
{
|
||||
unsigned tmp_page_size;
|
||||
unsigned tmp_page_size = ns_page_size();
|
||||
unsigned log = 1;
|
||||
|
||||
if (!ns_page_size)
|
||||
ns_page_size = (unsigned) getpagesize ();
|
||||
tmp_page_size = ns_page_size;
|
||||
while (tmp_page_size >> 1)
|
||||
log++;
|
||||
return log;
|
||||
|
@ -75,9 +72,9 @@ NSLogPageSize (void)
|
|||
unsigned
|
||||
NSRoundDownToMultipleOfPageSize (unsigned bytes)
|
||||
{
|
||||
if (!ns_page_size)
|
||||
ns_page_size = (unsigned) getpagesize ();
|
||||
return (bytes / ns_page_size) * ns_page_size;
|
||||
unsigned a = ns_page_size();
|
||||
|
||||
return (bytes / a) * a;
|
||||
}
|
||||
|
||||
/* Round BYTES up to the nearest multiple of the memory page size,
|
||||
|
@ -85,11 +82,9 @@ NSRoundDownToMultipleOfPageSize (unsigned bytes)
|
|||
unsigned
|
||||
NSRoundUpToMultipleOfPageSize (unsigned bytes)
|
||||
{
|
||||
if (!ns_page_size)
|
||||
ns_page_size = (unsigned) getpagesize ();
|
||||
return ((bytes % ns_page_size)
|
||||
? ((bytes / ns_page_size + 1) * ns_page_size)
|
||||
: bytes);
|
||||
unsigned a = ns_page_size();
|
||||
|
||||
return ((bytes % a) ? ((bytes / a + 1) * a) : bytes);
|
||||
}
|
||||
|
||||
unsigned
|
||||
|
@ -102,14 +97,16 @@ NSRealMemoryAvailable ()
|
|||
void *
|
||||
NSAllocateMemoryPages (unsigned bytes)
|
||||
{
|
||||
#if __mach__
|
||||
void *where;
|
||||
#if __mach__
|
||||
kern_return_t r;
|
||||
r = vm_allocate (mach_task_self(), &where, (vm_size_t) bytes, 1);
|
||||
NSParameterAssert (r == KERN_SUCCESS);
|
||||
return where;
|
||||
#else
|
||||
return calloc (bytes, 1);
|
||||
where = valloc (bytes);
|
||||
memset (where, 0, bytes);
|
||||
return where;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue