Contributed by Fred Fish at Cygnus Support. fnf@cygnus.com */
-/* Copyright (c) 2010. The SimGrid Team.
+/* Copyright (c) 2010-2014. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
#include <stdio.h>
#include <fcntl.h>
#include <sys/mman.h>
+#include <sys/wait.h>
#include "mmprivate.h"
-/* Cache the pagesize for the current host machine. Note that if the host
- does not readily provide a getpagesize() function, we need to emulate it
- elsewhere, not clutter up this file with lots of kluges to try to figure
- it out. */
-
-static size_t pagesize;
-
-#define PAGE_ALIGN(addr) (void*) (((long)(addr) + pagesize - 1) & \
- ~(pagesize - 1))
+#define PAGE_ALIGN(addr) (void*) (((long)(addr) + xbt_pagesize - 1) & \
+ ~((long)xbt_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 */
- if (pagesize == 0)
- pagesize = getpagesize();
+// fprintf(stderr,"increase %p by %u\n",mdp,size);
if (size == 0) {
/* Just return the current "break" value. */
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));
+ 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();
}