X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5091520484cfb65451327eb49cfe4c423a010628..56a999c55a1467d7b89d556e226ff5ec2671d620:/src/xbt/mmalloc/mm_module.c diff --git a/src/xbt/mmalloc/mm_module.c b/src/xbt/mmalloc/mm_module.c index 01c0bce8c2..08f9de28e8 100644 --- a/src/xbt/mmalloc/mm_module.c +++ b/src/xbt/mmalloc/mm_module.c @@ -20,6 +20,12 @@ not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +/* Copyright (c) 2012-2014. 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. */ + #include #include /* After sys/types.h, at least for dpx/2. */ #include @@ -317,7 +323,7 @@ void *mmalloc_preinit(void) { int res; if (__mmalloc_default_mdp == NULL) { - unsigned long mask = ~((unsigned long)getpagesize() - 1); + unsigned long mask = ~((unsigned long)xbt_pagesize - 1); void *addr = (void*)(((unsigned long)sbrk(0) + HEAP_OFFSET) & mask); __mmalloc_default_mdp = xbt_mheap_new(-1, addr); /* Fixme? only the default mdp in protected against forks */ @@ -339,9 +345,9 @@ void *mmalloc_preinit(void) void mmalloc_postexit(void) { - /* Do not detach the default mdp or ldl won't be able to free the memory it allocated since we're in memory */ - // mmalloc_detach(__mmalloc_default_mdp); - xbt_mheap_destroy_no_free(__mmalloc_default_mdp); + /* Do not destroy the default mdp or ldl won't be able to free the memory it + * allocated since we're in memory */ + // xbt_mheap_destroy_no_free(__mmalloc_default_mdp); } size_t mmalloc_get_bytes_used(xbt_mheap_t heap){