From b5cf8d911dd6127cd87ba547fd5d087d90307426 Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Tue, 1 Mar 2016 00:02:47 +0100 Subject: [PATCH] fix some mistakes --- teshsuite/java/semaphore/SemaphoreGC.java | 1 + .../java/sleep_host_off/SleepHostOff.java | 1 + teshsuite/xbt/heap_bench/heap_bench.c | 20 +++++++++---------- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/teshsuite/java/semaphore/SemaphoreGC.java b/teshsuite/java/semaphore/SemaphoreGC.java index d740251a98..1dd871cff1 100644 --- a/teshsuite/java/semaphore/SemaphoreGC.java +++ b/teshsuite/java/semaphore/SemaphoreGC.java @@ -10,6 +10,7 @@ package semaphore; import org.simgrid.msg.*; +import org.simgrid.msg.Process; class SemCreator extends Process { Semaphore sem; diff --git a/teshsuite/java/sleep_host_off/SleepHostOff.java b/teshsuite/java/sleep_host_off/SleepHostOff.java index 0b15188846..02368af093 100644 --- a/teshsuite/java/sleep_host_off/SleepHostOff.java +++ b/teshsuite/java/sleep_host_off/SleepHostOff.java @@ -7,6 +7,7 @@ package sleep_host_off; import org.simgrid.msg.*; +import org.simgrid.msg.Process; class Sleeper extends Process { public Sleeper(Host host, String name, String[] args) { diff --git a/teshsuite/xbt/heap_bench/heap_bench.c b/teshsuite/xbt/heap_bench/heap_bench.c index ce3d7fc0e9..cff04fe087 100644 --- a/teshsuite/xbt/heap_bench/heap_bench.c +++ b/teshsuite/xbt/heap_bench/heap_bench.c @@ -26,6 +26,16 @@ static int compare_double(const void *a, const void *b) return -1; } +static void test_reset_heap(xbt_heap_t * heap, int size) +{ + xbt_heap_free(*heap); + *heap = xbt_heap_new(size, NULL); + + for (int i = 0; i < size; i++) { + xbt_heap_push(*heap, NULL, (10.0 * rand() / (RAND_MAX + 1.0))); + } +} + static void test_heap_validity(int size) { xbt_heap_t heap = xbt_heap_new(size, NULL); @@ -79,16 +89,6 @@ static void test_heap_mean_operation(int size) xbt_heap_free(heap); } -static void test_reset_heap(xbt_heap_t * heap, int size) -{ - xbt_heap_free(*heap); - *heap = xbt_heap_new(size, NULL); - - for (int i = 0; i < size; i++) { - xbt_heap_push(*heap, NULL, (10.0 * rand() / (RAND_MAX + 1.0))); - } -} - int main(int argc, char **argv) { int size; -- 2.20.1