X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1d3411a600fb19bb3049999c2a494a49bd23ca63..2b06c6bf94cb93ee8a5c3bd2c9575fd1e15bd05a:/src/xbt/mmalloc/mmprivate.h diff --git a/src/xbt/mmalloc/mmprivate.h b/src/xbt/mmalloc/mmprivate.h index b00c5d37e3..aad689ee4e 100644 --- a/src/xbt/mmalloc/mmprivate.h +++ b/src/xbt/mmalloc/mmprivate.h @@ -4,7 +4,7 @@ Written May 1989 by Mike Haertel. Heavily modified Mar 1992 by Fred Fish. (fnf@cygnus.com) */ -/* Copyright (c) 2010. The SimGrid Team. +/* Copyright (c) 2010-2013. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -154,18 +154,16 @@ typedef struct { /* Heap information for a busy block. */ struct { size_t nfree; /* Free fragments in a fragmented block. */ - short frag_size[MAX_FRAGMENT_PER_BLOCK]; + ssize_t frag_size[MAX_FRAGMENT_PER_BLOCK]; //void *bt[MAX_FRAGMENT_PER_BLOCK][XBT_BACKTRACE_SIZE]; /* Where it was malloced (or realloced lastly) */ - short ignore[MAX_FRAGMENT_PER_BLOCK]; - heap_area_t equal_to[MAX_FRAGMENT_PER_BLOCK]; + int ignore[MAX_FRAGMENT_PER_BLOCK]; } busy_frag; struct { size_t size; /* Size (in blocks) of a large cluster. */ size_t busy_size; /* Actually used space, in bytes */ //void *bt[XBT_BACKTRACE_SIZE]; /* Where it was malloced (or realloced lastly) */ //int bt_size; - short ignore; - heap_area_t equal_to; + int ignore; } busy_block; /* Heap information for a free block (that may be the first of a free cluster). */ struct {