Fix smpi_execute_benched.

[simgrid.git] / teshsuite / xbt / parmap_bench / parmap_bench.c

diff --git a/teshsuite/xbt/parmap_bench/parmap_bench.c b/teshsuite/xbt/parmap_bench/parmap_bench.c
index f28a54f..3944546 100644 (file)
--- a/teshsuite/xbt/parmap_bench/parmap_bench.c
+++ b/teshsuite/xbt/parmap_bench/parmap_bench.c
@@ -1,17 +1,16 @@
-/* Copyright (c) 2012-2014. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2012-2017. 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. */
 
+#include "simgrid/msg.h"
+#include "src/internal_config.h" /* HAVE_FUTEX_H */
+#include "xbt/xbt_os_time.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <xbt/dynar.h>
 #include <xbt/parmap.h>
 #include <xbt/sysdep.h>
-#include "src/internal_config.h"        /* HAVE_FUTEX_H */
-#include "simgrid/simix.h"
-#include "xbt/xbt_os_time.h"
 
 #define MODES_DEFAULT 0x7
 #define TIMEOUT 10.0
@@ -45,15 +44,13 @@ static const char *parmap_mode_name(e_xbt_parmap_mode_t mode)
 
 static int parmap_skip_mode(e_xbt_parmap_mode_t mode)
 {
-  switch (mode) {
 #if !HAVE_FUTEX_H
-  case XBT_PARMAP_FUTEX:
+  if (mode == XBT_PARMAP_FUTEX) {
     printf("not available\n");
     return 1;
+  } else
 #endif
-  default:
     return 0;
-  }
 }
 
 static unsigned fibonacci(unsigned n)
@@ -164,7 +161,7 @@ int main(int argc, char *argv[])
   int nthreads;
   unsigned modes = MODES_DEFAULT;
 
-  SIMIX_global_init(&argc, argv);
+  MSG_init(&argc, argv);
 
   if (argc != 2 && argc != 3) {
     fprintf(stderr, "Usage: %s nthreads [modes]\n"
@@ -183,7 +180,7 @@ int main(int argc, char *argv[])
 
   printf("Parmap benchmark with %d workers (modes = %#x)...\n\n", nthreads, modes);
 
-  fun_to_apply = fun_small_comp;
+  fun_to_apply = &fun_small_comp;
 
   printf("Benchmark for parmap create+apply+destroy (small comp):\n");
   bench_all_modes(bench_parmap_full, nthreads, modes);
@@ -193,7 +190,7 @@ int main(int argc, char *argv[])
   bench_all_modes(bench_parmap_apply, nthreads, modes);
   printf("\n");
 
-  fun_to_apply = fun_big_comp;
+  fun_to_apply = &fun_big_comp;
 
   printf("Benchmark for parmap create+apply+destroy (big comp):\n");
   bench_all_modes(bench_parmap_full, nthreads, modes);