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
Merge tag 'v3_9_90' into hypervisor
[simgrid.git]
/
src
/
xbt
/
heap.c
diff --git
a/src/xbt/heap.c
b/src/xbt/heap.c
index
f024b08
..
ac3cafe
100644
(file)
--- a/
src/xbt/heap.c
+++ b/
src/xbt/heap.c
@@
-1,6
+1,6
@@
/* a generic and efficient heap */
/* a generic and efficient heap */
-/* Copyright (c) 2004
, 2005, 2007, 2008, 2009, 2010
. The SimGrid Team.
+/* Copyright (c) 2004
-2005, 2007-2013
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-96,7
+96,7
@@
void xbt_heap_push(xbt_heap_t H, void *content, double key)
if (count > size) {
H->size = (size << 1) + 1;
H->items =
if (count > size) {
H->size = (size << 1) + 1;
H->items =
- (void *) realloc(H->items,
+ (void *)
xbt_
realloc(H->items,
(H->size) * sizeof(struct xbt_heap_item));
}
(H->size) * sizeof(struct xbt_heap_item));
}
@@
-123,11
+123,11
@@
void *xbt_heap_pop(xbt_heap_t H)
int size = H->size;
void *max;
int size = H->size;
void *max;
- XBT_DEBUG("Heap has %d elements before extraction and max elem was %g",xbt_heap_size(H),xbt_heap_maxkey(H));
-
if (H->count == 0)
return NULL;
if (H->count == 0)
return NULL;
+ XBT_DEBUG("Heap has %d elements before extraction and max elem was %g",xbt_heap_size(H),xbt_heap_maxkey(H));
+
max = CONTENT(H, 0);
items[0] = items[(H->count) - 1];
max = CONTENT(H, 0);
items[0] = items[(H->count) - 1];
@@
-136,7
+136,7
@@
void *xbt_heap_pop(xbt_heap_t H)
if (H->count < size >> 2 && size > 16) {
size = (size >> 1) + 1;
H->items =
if (H->count < size >> 2 && size > 16) {
size = (size >> 1) + 1;
H->items =
- (void *) realloc(items,
+ (void *)
xbt_
realloc(items,
size * sizeof(struct xbt_heap_item));
H->size = size;
}
size * sizeof(struct xbt_heap_item));
H->size = size;
}