A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Reduce scope for loop variables.
[simgrid.git]
/
src
/
xbt
/
mmalloc
/
mmalloc.c
diff --git
a/src/xbt/mmalloc/mmalloc.c
b/src/xbt/mmalloc/mmalloc.c
index
d9a44ef
..
7b98cdc
100644
(file)
--- a/
src/xbt/mmalloc/mmalloc.c
+++ b/
src/xbt/mmalloc/mmalloc.c
@@
-54,7
+54,7
@@
static void initialize_heapinfo_heapinfo(const s_xbt_mheap_t* mdp)
{
// Update heapinfo about the heapinfo pages (!):
xbt_assert((uintptr_t) mdp->heapinfo % BLOCKSIZE == 0);
-
int block
= BLOCK(mdp->heapinfo);
+
size_t block
= BLOCK(mdp->heapinfo);
size_t nblocks = mdp->heapsize * sizeof(malloc_info) / BLOCKSIZE;
// Mark them as free:
for (size_t j=0; j!=nblocks; ++j) {
@@
-70,9
+70,6
@@
static void initialize_heapinfo_heapinfo(const s_xbt_mheap_t* mdp)
* properly, we need to make the align function publicly visible, too */
static void initialize(xbt_mheap_t mdp)
{
- int i;
- malloc_info mi; /* to compute the offset of the swag hook */
-
// Update mdp meta-data:
mdp->heapsize = HEAP / BLOCKSIZE;
mdp->heapinfo = (malloc_info *)
@@
-89,9
+86,9
@@
static void initialize(xbt_mheap_t mdp)
initialize_heapinfo_heapinfo(mdp);
- for (i
=0;i<BLOCKLOG;
i++) {
- xbt_swag_init(&(mdp->fraghead[i]),
-
xbt_swag_offset(mi, freehook));
+ for (i
nt i = 0; i < BLOCKLOG;
i++) {
+ malloc_info mi; /* to compute the offset of the swag hook */
+
xbt_swag_init(&(mdp->fraghead[i]),
xbt_swag_offset(mi, freehook));
}
}
@@
-109,8
+106,6
@@
static void *register_morecore(struct mdesc *mdp, size_t size)
/* Check if we need to grow the info table (in a multiplicative manner) */
if ((size_t) BLOCK((char *) result + size) > mdp->heapsize) {
- int it;
-
size_t newsize = mdp->heapsize;
while ((size_t) BLOCK((char *) result + size) > newsize)
newsize *= 2;
@@
-140,7
+135,7
@@
static void *register_morecore(struct mdesc *mdp, size_t size)
/* mark the space previously occupied by the block info as free by first marking it
* as occupied in the regular way, and then freing it */
- for (i
t=0; it<BLOCKIFY(mdp->heapsize * sizeof(malloc_info)); it++)
{
+ for (i
nt it = 0; it < BLOCKIFY(mdp->heapsize * sizeof(malloc_info)); it++)
{
newinfo[BLOCK(oldinfo)+it].type = MMALLOC_TYPE_UNFRAGMENTED;
newinfo[BLOCK(oldinfo)+it].busy_block.ignore = 0;
}
@@
-250,7
+245,7
@@
void *mmalloc_no_memset(xbt_mheap_t mdp, size_t size)
result = mmalloc(mdp, BLOCKSIZE); // does not return NULL
block = BLOCK(result);
- mdp->heapinfo[block].type = log;
+ mdp->heapinfo[block].type =
(int)
log;
/* Link all fragments but the first as free, and add the block to the swag of blocks containing free frags */
size_t i;
for (i = 1; i < (size_t) (BLOCKSIZE >> log); ++i) {