X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8d510dd9844ff0da71e3856a38fe067973d03e04..f757db3e61c8c5cbcab605a1beba36b5e21dc6f9:/src/xbt/mallocator_private.h diff --git a/src/xbt/mallocator_private.h b/src/xbt/mallocator_private.h index 12cccbf5f1..266c026534 100644 --- a/src/xbt/mallocator_private.h +++ b/src/xbt/mallocator_private.h @@ -1,6 +1,6 @@ /* mallocator - recycle objects to avoid malloc() / free() */ -/* Copyright (c) 2006, 2007, 2008, 2009, 2010. The SimGrid Team. +/* Copyright (c) 2006-2012. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -8,7 +8,7 @@ #ifndef _XBT_MALLOCATOR_PRIVATE_H__ #define _XBT_MALLOCATOR_PRIVATE_H__ -#include "xbt/xbt_os_thread.h" + typedef struct s_xbt_mallocator { void **objects; /* objects stored by the mallocator and available for the user */ int current_size; /* number of objects currently stored */ @@ -16,7 +16,7 @@ typedef struct s_xbt_mallocator { pvoid_f_void_t new_f; /* function to call when we are running out of objects */ void_f_pvoid_t free_f; /* function to call when we have got too many objects */ void_f_pvoid_t reset_f; /* function to call when an object is released by the user */ - xbt_os_mutex_t mutex; /* mutex to ensure the mallocator is thread-safe */ + int lock; /* lock to ensure the mallocator is thread-safe */ } s_xbt_mallocator_t; #endif /* _XBT_MALLOCATOR_PRIVATE_H__ */