X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dff9e15c44ab6340d27215957c56fa72fad246a2..2c8c164d58104acb6256b6d8efd476a6a2165b8a:/src/xbt/mallocator_private.h

diff --git a/src/xbt/mallocator_private.h b/src/xbt/mallocator_private.h
index 952564cfec..3bc4d8c971 100644
--- a/src/xbt/mallocator_private.h
+++ b/src/xbt/mallocator_private.h
@@ -1,6 +1,7 @@
 /* mallocator - recycle objects to avoid malloc() / free()                  */
 
-/* Copyright (c) 2006 Christophe Thiery. All rights reserved.               */
+/* Copyright (c) 2006-2015. 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. */
@@ -8,13 +9,16 @@
 #ifndef _XBT_MALLOCATOR_PRIVATE_H__
 #define _XBT_MALLOCATOR_PRIVATE_H__
 
+#include <xbt/function_types.h>
+
 typedef struct s_xbt_mallocator {
-  int current_size;             /* number of objects currently stored */
   void **objects;               /* objects stored by the mallocator and available for the user */
+  int current_size;             /* number of objects currently stored */
   int max_size;                 /* maximum number of objects */
   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 */
+  int lock;                     /* lock to ensure the mallocator is thread-safe */
 } s_xbt_mallocator_t;
 
-#endif /* _XBT_MALLOCATOR_PRIVATE_H__ */
+#endif                          /* _XBT_MALLOCATOR_PRIVATE_H__ */