sed -i -e 's/\t/ /g' [sources] Please people, stop using tabs

[simgrid.git] / examples / msg / cloud / scale.c

diff --git a/examples/msg/cloud/scale.c b/examples/msg/cloud/scale.c
index e113d2c..1c45b8c 100644 (file)
--- a/examples/msg/cloud/scale.c
+++ b/examples/msg/cloud/scale.c
@@ -1,11 +1,12 @@
-/* Copyright (c) 2007-2012. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-2015. 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 <stdio.h>
 #include <sys/time.h>
-#include "msg/msg.h"
+#include "simgrid/msg.h"
 #include "xbt/sysdep.h"         /* calloc, printf */
 
 /* Create a log channel to have nice outputs. */
@@ -22,20 +23,18 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
  * 2. kcachegrind
  **/
 
-static double time_precise(void)
-{
-       struct timeval tv;
-       int ret = gettimeofday(&tv, NULL);
+static double time_precise(void) {
+  struct timeval tv;
+  int ret = gettimeofday(&tv, NULL);
   if (ret < 0)
     xbt_die("gettimeofday");
 
-       double now = (double) tv.tv_sec + tv.tv_usec * 0.001 * 0.001;
+  double now = (double) tv.tv_sec + tv.tv_usec * 0.001 * 0.001;
 
-       return now;
+  return now;
 }
 
-static int computation_fun(int argc, char *argv[])
-{
+static int computation_fun(int argc, char *argv[]) {
   for (;;) {
     // double clock_sta = time_precise();
 
@@ -52,92 +51,10 @@ static int computation_fun(int argc, char *argv[])
   return 0;
 }
 
-static void launch_computation_worker(msg_host_t host)
-{
+static void launch_computation_worker(msg_host_t host) {
   MSG_process_create("compute", computation_fun, NULL, host);
 }
 
-#if 0
-struct task_priv {
-  msg_host_t tx_host;
-  msg_process_t tx_proc;
-  double clock_sta;
-};
-
-static int communication_tx_fun(int argc, char *argv[])
-{
-  xbt_assert(argc == 2);
-  const char *mbox = argv[1];
-
-  msg_task_t task = MSG_task_create("Task", 1000000, 1000000, NULL);
-
-  struct task_priv *priv = xbt_new(struct task_priv, 1);
-  priv->tx_proc = MSG_process_self();
-  priv->tx_host = MSG_host_self();
-  priv->clock_sta = MSG_get_clock();
-
-  MSG_task_set_data(task, priv);
-
-  MSG_task_send(task, mbox);
-
-  return 0;
-}
-
-static int communication_rx_fun(int argc, char *argv[])
-{
-  const char *pr_name = MSG_process_get_name(MSG_process_self());
-  const char *host_name = MSG_host_get_name(MSG_host_self());
-  xbt_assert(argc == 2);
-  const char *mbox = argv[1];
-
-  msg_task_t task = NULL;
-  MSG_task_recv(&task, mbox);
-
-  struct task_priv *priv = MSG_task_get_data(task);
-  double clock_end = MSG_get_clock();
-
-  XBT_INFO("%s:%s to %s:%s => %g sec",
-      MSG_host_get_name(priv->tx_host),
-      MSG_process_get_name(priv->tx_proc),
-      host_name, pr_name, clock_end - priv->clock_sta);
-
-  MSG_task_destroy(task);
-
-  return 0;
-}
-
-static void launch_communication_worker(msg_host_t tx_host, msg_host_t rx_host)
-{
-  char *mbox = bprintf("MBOX:%s-%s",
-      MSG_host_get_name(tx_host),
-      MSG_host_get_name(rx_host));
-  char **argv = NULL;
-  
-  const char *pr_name_tx =  "comm_tx";
-  argv = xbt_new(char *, 3);
-  argv[0] = xbt_strdup(pr_name_tx);
-  argv[1] = xbt_strdup(mbox);
-  argv[2] = NULL;
-
-  MSG_process_create_with_arguments(pr_name_tx, communication_tx_fun, NULL, tx_host, 2, argv);
-
-  const char *pr_name_rx =  "comm_rx";  
-  argv = xbt_new(char *, 3);
-  argv[0] = xbt_strdup(pr_name_rx);
-  argv[1] = xbt_strdup(mbox);
-  argv[2] = NULL;
-
-  MSG_process_create_with_arguments(pr_name_rx, communication_rx_fun, NULL, rx_host, 2, argv);
-
-  xbt_free(mbox);
-}
-#endif
-
-
-
-
-
-
 static int master_main(int argc, char *argv[])
 {
   xbt_dynar_t hosts_dynar = MSG_hosts_as_dynar();
@@ -150,33 +67,33 @@ static int master_main(int argc, char *argv[])
 
   int i = 0;
   for (i = 0; i < npm; i++) {
-         pm[i] = xbt_dynar_get_as(hosts_dynar, i, msg_host_t);
+    pm[i] = xbt_dynar_get_as(hosts_dynar, i, msg_host_t);
   }
 
   for (i = 0; i < nvm; i++) {
-         int pm_index = i % npm;
-         char *vm_name = bprintf("vm%d", i);
-         vm[i] = MSG_vm_create_core(pm[pm_index], vm_name);
-         MSG_vm_start(vm[i]);
+    int pm_index = i % npm;
+    char *vm_name = bprintf("vm%d", i);
+    vm[i] = MSG_vm_create_core(pm[pm_index], vm_name);
+    MSG_vm_start(vm[i]);
 
     launch_computation_worker(vm[i]);
 
-         xbt_free(vm_name);
+    xbt_free(vm_name);
   }
 
 
   XBT_INFO("## Test (start)");
 
   for (i = 0; i < 10; i++) {
-         double clock_sta = time_precise();
-         MSG_process_sleep(1);
-         double clock_end = time_precise();
-         XBT_INFO("duration %f", clock_end - clock_sta);
+    double clock_sta = time_precise();
+    MSG_process_sleep(1);
+    double clock_end = time_precise();
+    XBT_INFO("duration %f", clock_end - clock_sta);
   }
 
 
   for (i = 0; i < nvm; i++) {
-         MSG_vm_destroy(vm[i]);
+    MSG_vm_destroy(vm[i]);
   }
 
   XBT_INFO("## Test (ended)");