X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8c354c48ec90c997cc7213ce96ca97d882934166..02f6c8f2138d26350576c29cbbbe863ce15c9a2b:/src/xbt/heap_private.h diff --git a/src/xbt/heap_private.h b/src/xbt/heap_private.h index 782947b25c..f6b4d98617 100644 --- 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. */ @@ -8,19 +7,20 @@ #ifndef _XBT_HEAP_PRIVATE_H #define _XBT_HEAP_PRIVATE_H -#include +#include "xbt/dynar.h" /* void_f_pvoid_t */ #include "xbt/heap.h" typedef struct xbt_heapItem { void *content; - xbt_heap_float_t key; + double key; } s_xbt_heapItem_t, *xbt_heapItem_t; typedef struct xbt_heap { int size; int count; xbt_heapItem_t items; - void_f_pvoid_t *free; + void_f_pvoid_t free; + void (*update_callback) (void *, int); } s_xbt_heap_t; #define PARENT(i) i/2 @@ -30,7 +30,9 @@ typedef struct xbt_heap { #define KEY(H,i) ((H->items)[i]).key #define CONTENT(H,i) ((H->items)[i]).content +#define MIN_KEY_VALUE -10000 + static void xbt_heap_maxHeapify(xbt_heap_t H); static void xbt_heap_increaseKey(xbt_heap_t H, int i); -#endif /* _XBT_HEAP_PRIVATE_H */ +#endif /* _XBT_HEAP_PRIVATE_H */