Contributed by Fred Fish at Cygnus Support. fnf@cygnus.com */
-/* Copyright (c) 2010. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2010-2012. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
static size_t pagesize;
#define PAGE_ALIGN(addr) (void*) (((long)(addr) + pagesize - 1) & \
- ~(pagesize - 1))
+ ~(pagesize - 1))
/* Return MAP_PRIVATE if MDP represents /dev/zero. Otherwise, return
MAP_SHARED. */
#define MAP_PRIVATE_OR_SHARED(MDP) (( MDP -> flags & MMALLOC_ANONYMOUS) \
- ? MAP_PRIVATE \
+ ? MAP_PRIVATE \
: MAP_SHARED)
/* Return MAP_ANONYMOUS if MDP uses anonymous mapping. Otherwise, return 0 */
#define MAP_IS_ANONYMOUS(MDP) (((MDP) -> flags & MMALLOC_ANONYMOUS) \
- ? MAP_ANONYMOUS \
- : 0)
+ ? MAP_ANONYMOUS \
+ : 0)
/* Return -1 if MDP uses anonymous mapping. Otherwise, return MDP->FD */
#define MAP_ANON_OR_FD(MDP) (((MDP) -> flags & MMALLOC_ANONYMOUS) \
- ? -1 \
- : (MDP) -> fd)
+ ? -1 \
+ : (MDP) -> fd)
/* Get core for the memory region specified by MDP, using SIZE as the
amount to either add to or subtract from the existing region. Works
It never returns NULL. Instead, it dies verbosely on errors. */
-void *mmorecore(struct mdesc *mdp, int size)
+void *mmorecore(struct mdesc *mdp, ssize_t size)
{
ssize_t test = 0;
void *result; // please keep it uninitialized to track issues
void *mapto; /* Address we actually mapped to */
char buf = 0; /* Single byte to write to extend mapped file */
+// fprintf(stderr,"increase %p by %u\n",mdp,size);
if (pagesize == 0)
pagesize = getpagesize();
(size_t) (((char *) mdp->top) - ((char *) moveto)) - 1);
mdp->top = moveto;
} else {
- fprintf(stderr,"Internal error: mmap was asked to deallocate more memory than it previously allocated. Bailling out now!\n");
- abort();
+ fprintf(stderr,"Internal error: mmap was asked to deallocate more memory than it previously allocated. Bailling out now!\n");
+ abort();
}
} else {
/* We are allocating memory. Make sure we have an open file
descriptor if not working with anonymous memory. */
if (!(mdp->flags & MMALLOC_ANONYMOUS) && mdp->fd < 0) {
- fprintf(stderr,"Internal error: mmap file descriptor <0 (%d), without MMALLOC_ANONYMOUS being in the flags.\n",mdp->fd);
- abort();
+ fprintf(stderr,"Internal error: mmap file descriptor <0 (%d), without MMALLOC_ANONYMOUS being in the flags.\n",mdp->fd);
+ abort();
} else if ((char *) mdp->breakval + size > (char *) mdp->top) {
/* The request would move us past the end of the currently
mapped memory, so map in enough more memory to satisfy
lseek(mdp->fd, foffset + mapbytes - 1, SEEK_SET);
test = write(mdp->fd, &buf, 1);
if (test == -1) {
- fprintf(stderr,"Internal error: write to mmap'ed fd failed! error: %s", strerror(errno));
- abort();
+ fprintf(stderr,"Internal error: write to mmap'ed fd failed! error: %s", strerror(errno));
+ abort();
}
}
MAP_FIXED, MAP_ANON_OR_FD(mdp), foffset);
if (mapto == (void *) -1/* That's MAP_FAILED */) {
- fprintf(stderr,"Internal error: mmap returned MAP_FAILED! error: %s",strerror(errno));
- abort();
+ char buff[1024];
+ fprintf(stderr,"Internal error: mmap returned MAP_FAILED! error: %s\n",strerror(errno));
+ sprintf(buff,"cat /proc/%d/maps",getpid());
+ int status = system(buff);
+ if (status == -1 || !(WIFEXITED(status) && WEXITSTATUS(status) == 0))
+ fprintf(stderr, "Something went wrong when trying to %s\n", buff);
+ sleep(1);
+ abort();
}
if (mdp->top == 0)
- mdp->base = mdp->breakval = mapto;
+ mdp->base = mdp->breakval = mapto;
mdp->top = PAGE_ALIGN((char *) mdp->breakval + size);
result = (void *) mdp->breakval;