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
Avoid to clear mem for the last element.
[simgrid.git]
/
src
/
xbt
/
heap_private.h
diff --git
a/src/xbt/heap_private.h
b/src/xbt/heap_private.h
index
72389dc
..
c0330c7
100644
(file)
--- a/
src/xbt/heap_private.h
+++ b/
src/xbt/heap_private.h
@@
-1,6
+1,5
@@
-/* $Id$ */
-
-/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */
+/* Copyright (c) 2004, 2005, 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. */
/* 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. */
@@
-8,29
+7,29
@@
#ifndef _XBT_HEAP_PRIVATE_H
#define _XBT_HEAP_PRIVATE_H
#ifndef _XBT_HEAP_PRIVATE_H
#define _XBT_HEAP_PRIVATE_H
-#include "xbt/dynar.h" /* void_f_pvoid_t */
+#include "xbt/dynar.h"
/* void_f_pvoid_t */
#include "xbt/heap.h"
#include "xbt/heap.h"
-typedef struct xbt_heap
I
tem {
+typedef struct xbt_heap
_i
tem {
void *content;
double key;
void *content;
double key;
-} s_xbt_heap
Item_t, *xbt_heapI
tem_t;
+} s_xbt_heap
_item_t, *xbt_heap_i
tem_t;
typedef struct xbt_heap {
int size;
int count;
typedef struct xbt_heap {
int size;
int count;
- xbt_heapItem_t items;
- void_f_pvoid_t *free;
+ xbt_heap_item_t items;
+ void_f_pvoid_t free;
+ void (*update_callback) (void *, int);
} s_xbt_heap_t;
} s_xbt_heap_t;
-#define PARENT(i)
i/2
-#define LEFT(i)
2*i
-#define RIGHT(i)
2*i+1
+#define PARENT(i)
(i >> 1)
+#define LEFT(i)
(i << 1)
+#define RIGHT(i)
((i << 1) + 1)
#define KEY(H,i) ((H->items)[i]).key
#define CONTENT(H,i) ((H->items)[i]).content
#define KEY(H,i) ((H->items)[i]).key
#define CONTENT(H,i) ((H->items)[i]).content
-static void xbt_heap_maxHeapify(xbt_heap_t H);
-static void xbt_heap_increaseKey(xbt_heap_t H, int i);
+#define MIN_KEY_VALUE -10000
-#endif /* _XBT_HEAP_PRIVATE_H */
+#endif
/* _XBT_HEAP_PRIVATE_H */