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
No vm when ptask on
[simgrid.git]
/
src
/
xbt
/
heap.c
diff --git
a/src/xbt/heap.c
b/src/xbt/heap.c
index
e124aab
..
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
@@
-11,6
+11,7
@@
#include "heap_private.h"
#include <stdio.h>
#include "heap_private.h"
#include <stdio.h>
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_heap, xbt, "Heap");
static void xbt_heap_max_heapify(xbt_heap_t H);
static void xbt_heap_increase_key(xbt_heap_t H, int i);
static void xbt_heap_max_heapify(xbt_heap_t H);
static void xbt_heap_increase_key(xbt_heap_t H, int i);
@@
-103,6
+104,7
@@
void xbt_heap_push(xbt_heap_t H, void *content, double key)
item->key = key;
item->content = content;
xbt_heap_increase_key(H, count - 1);
item->key = key;
item->content = content;
xbt_heap_increase_key(H, count - 1);
+ XBT_DEBUG("Heap has now %d elements and max elem is %g",xbt_heap_size(H),xbt_heap_maxkey(H));
return;
}
return;
}
@@
-124,6
+126,8
@@
void *xbt_heap_pop(xbt_heap_t 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];
@@
-152,6
+156,8
@@
void *xbt_heap_pop(xbt_heap_t H)
*/
void *xbt_heap_remove(xbt_heap_t H, int i)
{
*/
void *xbt_heap_remove(xbt_heap_t H, int i)
{
+ XBT_DEBUG("Heap has %d elements: extracting element %d",xbt_heap_size(H),i);
+
if ((i < 0) || (i > H->count - 1))
return NULL;
/* put element i at head */
if ((i < 0) || (i > H->count - 1))
return NULL;
/* put element i at head */