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 branches 'MC_LTL' and 'MC_LTL' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
include
/
xbt
/
heap.h
diff --git
a/include/xbt/heap.h
b/include/xbt/heap.h
index
8a21d6c
..
b6e9689
100644
(file)
--- a/
include/xbt/heap.h
+++ b/
include/xbt/heap.h
@@
-1,6
+1,5
@@
-/* $Id$ */
-
-/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */
+/* Copyright (c) 2004, 2005, 2006, 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. */
@@
-9,7
+8,7
@@
#define _XBT_HEAP_H
#include "xbt/misc.h"
#define _XBT_HEAP_H
#include "xbt/misc.h"
-#include "xbt/dynar.h" /* void_f_pvoid_t */
+#include "xbt/dynar.h"
/* void_f_pvoid_t */
/** @addtogroup XBT_heap
* @brief This section describes the API to generic heap with O(log(n)) access.
/** @addtogroup XBT_heap
* @brief This section describes the API to generic heap with O(log(n)) access.
@@
-19,15
+18,21
@@
/* @brief heap datatype */
typedef struct xbt_heap *xbt_heap_t;
/* @brief heap datatype */
typedef struct xbt_heap *xbt_heap_t;
-XBT_PUBLIC(xbt_heap_t) xbt_heap_new(int num, void_f_pvoid_t * const free_func);
+XBT_PUBLIC(xbt_heap_t) xbt_heap_new(int init_size,
+ void_f_pvoid_t const free_func);
XBT_PUBLIC(void) xbt_heap_free(xbt_heap_t H);
XBT_PUBLIC(int) xbt_heap_size(xbt_heap_t H);
XBT_PUBLIC(void) xbt_heap_push(xbt_heap_t H, void *content, double key);
XBT_PUBLIC(void) xbt_heap_free(xbt_heap_t H);
XBT_PUBLIC(int) xbt_heap_size(xbt_heap_t H);
XBT_PUBLIC(void) xbt_heap_push(xbt_heap_t H, void *content, double key);
-XBT_PUBLIC(void*) xbt_heap_pop(xbt_heap_t H);
+XBT_PUBLIC(void
*) xbt_heap_pop(xbt_heap_t H);
XBT_PUBLIC(double) xbt_heap_maxkey(xbt_heap_t H);
XBT_PUBLIC(double) xbt_heap_maxkey(xbt_heap_t H);
-XBT_PUBLIC(void*) xbt_heap_maxcontent(xbt_heap_t H);
+XBT_PUBLIC(void *) xbt_heap_maxcontent(xbt_heap_t H);
+XBT_PUBLIC(void) xbt_heap_set_update_callback(xbt_heap_t H,
+ void (*update_callback) (void
+ *,
+ int));
+XBT_PUBLIC(void *) xbt_heap_remove(xbt_heap_t H, int i);
/* @} */
/* @} */
-#endif /* _XBT_HEAP_H */
+#endif
/* _XBT_HEAP_H */