X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0909f6ea8e2ed9702bd8a2c31163bc3474be79ef..3a12c004433359e3e2b0a29a7913668a33872a69:/include/xbt/mallocator.h diff --git a/include/xbt/mallocator.h b/include/xbt/mallocator.h index be9f83af27..e65d0e2db9 100644 --- a/include/xbt/mallocator.h +++ b/include/xbt/mallocator.h @@ -1,6 +1,7 @@ /* xbt/mallocator.h -- api to recycle allocated objects */ -/* Copyright (c) 2006 Christophe Thiery. All rights reserved. */ +/* Copyright (c) 2006, 2007, 2009, 2010. 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. */ @@ -9,7 +10,7 @@ #define _XBT_MALLOCATOR_H #include "xbt/function_types.h" -#include "xbt/misc.h" /* SG_BEGIN_DECL */ +#include "xbt/misc.h" /* SG_BEGIN_DECL */ SG_BEGIN_DECL() @@ -28,17 +29,18 @@ SG_BEGIN_DECL() * new object, the object is just extracted from the mallocator. No malloc() is * done, unless there is no more object in the mallocator. */ - /** @defgroup XBT_mallocator_cons Mallocator constructor and destructor * @ingroup XBT_mallocator * * @{ */ - /** \brief Mallocator data type (opaque structure) */ typedef struct s_xbt_mallocator *xbt_mallocator_t; -XBT_PUBLIC xbt_mallocator_t xbt_mallocator_new(int size, pvoid_f_void_t new_f, void_f_pvoid_t free_f, void_f_pvoid_t reset_f); -XBT_PUBLIC void xbt_mallocator_free(xbt_mallocator_t mallocator); +XBT_PUBLIC(xbt_mallocator_t) xbt_mallocator_new(int size, + pvoid_f_void_t new_f, + void_f_pvoid_t free_f, + void_f_pvoid_t reset_f); +XBT_PUBLIC(void) xbt_mallocator_free(xbt_mallocator_t mallocator); /** @} */ /* object handling */ @@ -47,10 +49,10 @@ XBT_PUBLIC void xbt_mallocator_free(xbt_mallocator_t mallocator); * * @{ */ -XBT_PUBLIC void *xbt_mallocator_get(xbt_mallocator_t mallocator); -XBT_PUBLIC void xbt_mallocator_release(xbt_mallocator_t mallocator, void *object); +XBT_PUBLIC(void *) xbt_mallocator_get(xbt_mallocator_t mallocator); +XBT_PUBLIC(void) xbt_mallocator_release(xbt_mallocator_t mallocator, + void *object); /** @} */ SG_END_DECL() - -#endif /* _XBT_MALLOCATOR_H */ +#endif /* _XBT_MALLOCATOR_H */