X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6bb8549789b7ac183f0c9ad041fc34a466aeb83d..873e5ee63a46ed55fa5901c9140247810b45b6bc:/src/xbt/mallocator.c diff --git a/src/xbt/mallocator.c b/src/xbt/mallocator.c index 3469e222e7..d4619b608d 100644 --- a/src/xbt/mallocator.c +++ b/src/xbt/mallocator.c @@ -1,6 +1,6 @@ /* mallocator - recycle objects to avoid malloc() / free() */ -/* Copyright (c) 2006-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-2022. 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. */ @@ -90,7 +90,7 @@ static inline int xbt_mallocator_is_active(void) { * mallocator is empty * @param free_f function to free an object of your datatype, called in @a xbt_mallocator_release() when the stack is * full, and when the mallocator is freed. - * @param reset_f function to reinitialise an object of your datatype, called when you extract an object from the + * @param reset_f function to reinitialize an object of your datatype, called when you extract an object from the * mallocator (can be NULL) * * Create and initialize a new mallocator for a given datatype. @@ -125,11 +125,10 @@ xbt_mallocator_t xbt_mallocator_new(int size, pvoid_f_void_t new_f, void_f_pvoid */ void xbt_mallocator_free(xbt_mallocator_t m) { - int i; xbt_assert(m != NULL, "Invalid parameter"); XBT_VERB("Frees mallocator %p (size:%d/%d)", m, m->current_size, m->max_size); - for (i = 0; i < m->current_size; i++) { + for (int i = 0; i < m->current_size; i++) { m->free_f(m->objects[i]); } xbt_free(m->objects); @@ -159,9 +158,8 @@ void *xbt_mallocator_get(xbt_mallocator_t m) if (m->current_size <= 0) { /* No object is ready yet. Create a bunch of them to try to group the * mallocs on the same memory pages (to help the cache lines) */ - int i; int amount = MIN(m->max_size / 2, 1000); - for (i = 0; i < amount; i++) + for (int i = 0; i < amount; i++) m->objects[i] = m->new_f(); m->current_size = amount; }