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
Add the trace library and fixed a few source of potential bugs in heap.
[simgrid.git]
/
src
/
xbt
/
heap.c
diff --git
a/src/xbt/heap.c
b/src/xbt/heap.c
index
f5549a4
..
394056d
100644
(file)
--- a/
src/xbt/heap.c
+++ b/
src/xbt/heap.c
@@
-5,6
+5,8
@@
/* 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. */
/* 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. */
+#include "xbt/sysdep.h"
+#include "xbt/error.h"
#include "heap_private.h"
/**
#include "heap_private.h"
/**
@@
-16,12
+18,11
@@
*/
xbt_heap_t xbt_heap_new(int init_size, void_f_pvoid_t * const free_func)
{
*/
xbt_heap_t xbt_heap_new(int init_size, void_f_pvoid_t * const free_func)
{
- xbt_heap_t H =
calloc(1, sizeof(struct xbt_heap)
);
+ xbt_heap_t H =
xbt_new0(struct xbt_heap, 1
);
H->size = init_size;
H->count = 0;
H->size = init_size;
H->count = 0;
- H->items =
- (xbt_heapItem_t) calloc(init_size, sizeof(struct xbt_heapItem));
- H->free = free;
+ H->items = (xbt_heapItem_t) xbt_new0(struct xbt_heapItem, init_size);
+ H->free = free_func;
return H;
}
return H;
}
@@
-35,13
+36,24
@@
void xbt_heap_free(xbt_heap_t H)
{
int i;
if (H->free)
{
int i;
if (H->free)
- for (i = 0; i < H->
size
; i++)
+ for (i = 0; i < H->
count
; i++)
H->free(H->items[i].content);
H->free(H->items[i].content);
- free(H->items);
- free(H);
+
xbt_
free(H->items);
+
xbt_
free(H);
return;
}
return;
}
+/**
+ * xbt_heap_size:
+ * @H: the heap we're working on
+ *
+ * returns the number of elements in the heap
+ */
+int xbt_heap_size(xbt_heap_t H)
+{
+ return (H->count);
+}
+
/**
* xbt_heap_push:
* @H: the heap we're working on
/**
* xbt_heap_push:
* @H: the heap we're working on
@@
-79,7
+91,12
@@
void xbt_heap_push(xbt_heap_t H, void *content, xbt_heap_float_t key)
*/
void *xbt_heap_pop(xbt_heap_t H)
{
*/
void *xbt_heap_pop(xbt_heap_t H)
{
- void *max = CONTENT(H, 0);
+ void *max ;
+
+ if(H->count==0) return NULL;
+
+ max = CONTENT(H, 0);
+
H->items[0] = H->items[(H->count) - 1];
(H->count)--;
xbt_heap_maxHeapify(H);
H->items[0] = H->items[(H->count) - 1];
(H->count)--;
xbt_heap_maxHeapify(H);
@@
-100,6
+117,7
@@
void *xbt_heap_pop(xbt_heap_t H)
*/
xbt_heap_float_t xbt_heap_maxkey(xbt_heap_t H)
{
*/
xbt_heap_float_t xbt_heap_maxkey(xbt_heap_t H)
{
+ if(H->count==0) abort();
return KEY(H, 0);
}
return KEY(H, 0);
}
@@
-112,6
+130,7
@@
xbt_heap_float_t xbt_heap_maxkey(xbt_heap_t H)
*/
void *xbt_heap_maxcontent(xbt_heap_t H)
{
*/
void *xbt_heap_maxcontent(xbt_heap_t H)
{
+ if(H->count==0) abort();
return CONTENT(H, 0);
}
return CONTENT(H, 0);
}
@@
-121,7
+140,7
@@
void *xbt_heap_maxcontent(xbt_heap_t H)
*
* Restores the heap property once an element has been deleted.
*/
*
* Restores the heap property once an element has been deleted.
*/
-void xbt_heap_maxHeapify(xbt_heap_t H)
+
static
void xbt_heap_maxHeapify(xbt_heap_t H)
{
int i = 0;
while (1) {
{
int i = 0;
while (1) {
@@
-151,7
+170,7
@@
void xbt_heap_maxHeapify(xbt_heap_t H)
* Moves up an item at position i to its correct position. Works only
* when called from xbt_heap_push. Do not use otherwise.
*/
* Moves up an item at position i to its correct position. Works only
* when called from xbt_heap_push. Do not use otherwise.
*/
-void xbt_heap_increaseKey(xbt_heap_t H, int i)
+
static
void xbt_heap_increaseKey(xbt_heap_t H, int i)
{
while (i > 0 && KEY(H, PARENT(i)) > KEY(H, i)) {
struct xbt_heapItem tmp = H->items[i];
{
while (i > 0 && KEY(H, PARENT(i)) > KEY(H, i)) {
struct xbt_heapItem tmp = H->items[i];