coverage madness in examples

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

diff --git a/examples/msg/cloud/master_worker_vm.c b/examples/msg/cloud/master_worker_vm.c
index 273af4c..8e4209e 100644 (file)
--- a/examples/msg/cloud/master_worker_vm.c
+++ b/examples/msg/cloud/master_worker_vm.c
@@ -1,11 +1,11 @@
-/* Copyright (c) 2007-2014. The SimGrid Team.
+/* 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 "msg/msg.h"
+#include "simgrid/msg.h"
 #include "xbt/sysdep.h"         /* calloc, printf */
 
 /* Create a log channel to have nice outputs. */
@@ -14,6 +14,8 @@
 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
                              "Messages specific for this msg example");
 
+#define MAXMBOXLEN 64
+
 /** @addtogroup MSG_examples
  *
  *  - <b>cloud/masterslave_virtual_machines.c: Master/workers
@@ -68,7 +70,7 @@ int master_fun(int argc, char *argv[])
     XBT_INFO("create %s on PM(%s)", vm_name, MSG_host_get_name(pm));
     msg_vm_t vm = MSG_vm_create_core(pm, vm_name);
 
-    s_ws_params_t params;
+    s_vm_params_t params;
     memset(&params, 0, sizeof(params));
     params.ramsize = 1L * 1024 * 1024 * 1024; // 1Gbytes
     MSG_host_set_params(vm, &params);
@@ -139,8 +141,8 @@ int master_fun(int argc, char *argv[])
 
   XBT_INFO("# Shutdown the half of worker processes gracefuly. The remaining half will be forcibly killed.");
   for (i = 0; i < nb_workers; i++) {
-    char mbox[64];
-    sprintf(mbox, "MBOX:WRK%02d", i);
+    char mbox[MAXMBOXLEN];
+    snprintf(mbox, MAXMBOXLEN, "MBOX:WRK%02d", i);
     msg_task_t finalize = MSG_task_create("finalize", 0, 0, 0);
     MSG_task_send(finalize, mbox);
   }
@@ -167,7 +169,8 @@ int master_fun(int argc, char *argv[])
 int worker_fun(int argc, char *argv[])
 {
   const char *pr_name = MSG_process_get_name(MSG_process_self());
-  char *mbox = bprintf("MBOX:%s", pr_name);
+  char mbox[MAXMBOXLEN];
+  snprintf(mbox, MAXMBOXLEN, "MBOX:%s", pr_name);
 
   XBT_INFO("%s is listenning on mailbox(%s)", pr_name, mbox);
 
@@ -193,8 +196,6 @@ int worker_fun(int argc, char *argv[])
     MSG_task_destroy(task);
   }
 
-  free(mbox);
-
   return 0;
 }