diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix alloc.c

Browse Source 
git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@24 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc 2001-05-03 17:23:30 +00:00
parent f48f399540
commit 6a8e087730
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
C/alloc.c
View File

@ -12,7 +12,7 @@
* Last rev: * * Last rev: *
* mods: * * mods: *
* comments: allocating space * * comments: allocating space *
* version:$Id: alloc.c,v 1.2 2001-05-03 17:13:18 vsc Exp $ * * version:$Id: alloc.c,v 1.3 2001-05-03 17:23:30 vsc Exp $ *
*************************************************************************/ *************************************************************************/
#ifdef SCCS #ifdef SCCS
static char SccsId[] = "%W% %G%"; static char SccsId[] = "%W% %G%";
@ -545,15 +545,9 @@ ExtendWorkSpace(Int s)
a = mmap(WorkSpaceTop, (size_t) s, PROT_READ | PROT_WRITE | PROT_EXEC, a = mmap(WorkSpaceTop, (size_t) s, PROT_READ | PROT_WRITE | PROT_EXEC,
MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
if (a != WorkSpaceTop) {
Error(SYSTEM_ERROR, TermNil, "mmap could not grow memory at %p, got %p", WorkSpaceTop, a );
}
#elif defined(__APPLE__) #elif defined(__APPLE__)
a = mmap(WorkSpaceTop, (size_t) s, PROT_READ | PROT_WRITE | PROT_EXEC, a = mmap(WorkSpaceTop, (size_t) s, PROT_READ | PROT_WRITE | PROT_EXEC,
MAP_PRIVATE | MAP_ANON | MAP_FIXED, -1, 0); MAP_PRIVATE | MAP_ANON | MAP_FIXED, -1, 0);
if (a != WorkSpaceTop) {
Error(SYSTEM_ERROR, TermNil, "mmap could not grow memory at %p, got %p", WorkSpaceTop, a );
}
#else #else
int fd; int fd;
fd = open("/dev/zero", O_RDWR); fd = open("/dev/zero", O_RDWR);
@ -566,7 +560,7 @@ ExtendWorkSpace(Int s)
Error(SYSTEM_ERROR, TermNil, "mkstemp could not create temporary file %s (%s)", file, strerror(errno)); Error(SYSTEM_ERROR, TermNil, "mkstemp could not create temporary file %s (%s)", file, strerror(errno));
#else #else
Error(SYSTEM_ERROR, TermNil, "mkstemp could not create temporary file %s", file); Error(SYSTEM_ERROR, TermNil, "mkstemp could not create temporary file %s", file);
#endif #endif /* HAVE_STRERROR */
return FALSE; return FALSE;
} }
#else #else
@ -604,6 +598,8 @@ ExtendWorkSpace(Int s)
#endif #endif
return FALSE; return FALSE;
} }
a = mmap(WorkSpaceTop, (size_t) s, PROT_READ | PROT_WRITE | PROT_EXEC,
MAP_PRIVATE | MAP_FIXED, fd, 0);
#endif #endif
if (a == (MALLOC_T) - 1) { if (a == (MALLOC_T) - 1) {
#if HAVE_STRERROR #if HAVE_STRERROR
@ -613,15 +609,13 @@ ExtendWorkSpace(Int s)
#endif #endif
return FALSE; return FALSE;
} }
a = mmap(WorkSpaceTop, (size_t) s, PROT_READ | PROT_WRITE | PROT_EXEC,
MAP_PRIVATE | MAP_FIXED, fd, 0);
if (a != WorkSpaceTop) { if (a != WorkSpaceTop) {
Error(SYSTEM_ERROR, TermNil, "mmap could not grow memory at %p, got %p", WorkSpaceTop, a ); Error(SYSTEM_ERROR, TermNil, "mmap could not grow memory at %p, got %p", WorkSpaceTop, a );
return FALSE;
} }
WorkSpaceTop = (char *) a + s;
#endif /* YAPOR */ #endif /* YAPOR */
WorkSpaceTop = (char *) a + s;
return TRUE; return TRUE;
} }