yet another cleaning pass

[simgrid.git] / examples / msg / actions / storage_actions.c

diff --git a/examples/msg/actions/storage_actions.c b/examples/msg/actions/storage_actions.c
index 981b11c..0d29d49 100644 (file)
--- a/examples/msg/actions/storage_actions.c
+++ b/examples/msg/actions/storage_actions.c
@@ -4,10 +4,7 @@
 /* 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 <stdlib.h>
 #include "simgrid/msg.h"
-#include "xbt.h"                /* calloc, printf */
 #include <xbt/replay.h>
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(storage_actions, "Messages specific for this example");
@@ -30,7 +27,7 @@ static void log_action(const char *const *action, double date)
   }
 }
 
-msg_file_t get_file_descriptor(const char *file_name){
+static msg_file_t get_file_descriptor(const char *file_name){
   char full_name[1024];
   msg_file_t file = NULL;
 
@@ -43,28 +40,26 @@ msg_file_t get_file_descriptor(const char *file_name){
 static sg_size_t parse_size(const char *string){
   sg_size_t size;
   char *endptr;
-  
+
   size = strtoul(string, &endptr, 10);
   if (*endptr != '\0')
     THROWF(unknown_error, 0, "%s is not a long unsigned int (a.k.a. sg_size_t)", string);
   return size;
 }
 
-
 static void action_open(const char *const *action) {
   const char *file_name = action[2];
   char full_name[1024];
   msg_file_t file = NULL;
-  double clock = MSG_get_clock();       /* this "call" is free thanks to inlining */
+  double clock = MSG_get_clock();
 
-  sprintf(full_name, "%s:%s", MSG_process_get_name(MSG_process_self()), 
-         file_name);
+  sprintf(full_name, "%s:%s", MSG_process_get_name(MSG_process_self()), file_name);
 
   ACT_DEBUG("Entering Open: %s (filename: %s)", NAME, file_name);
   file = MSG_file_open(file_name, NULL);
- 
+
   xbt_dict_set(opened_files, full_name, file, NULL);
-  
+
   log_action(action, MSG_get_clock() - clock);
 }
 
@@ -73,11 +68,11 @@ static void action_read(const char *const *action) {
   const char *size_str = action[3];
   msg_file_t file = NULL;
   sg_size_t size = parse_size(size_str);
-  
-  double clock = MSG_get_clock();       /* this "call" is free thanks to inlining */
+
+  double clock = MSG_get_clock();
 
   file = get_file_descriptor(file_name);
-  
+
   ACT_DEBUG("Entering Read: %s (size: %llu)", NAME, size);
   MSG_file_read(file, size);
 
@@ -86,9 +81,8 @@ static void action_read(const char *const *action) {
 
 static void action_close(const char *const *action) {
   const char *file_name = action[2];
-  char full_name[1024];
   msg_file_t file;
-  double clock = MSG_get_clock();       /* this "call" is free thanks to inlining */
+  double clock = MSG_get_clock();
 
   file = get_file_descriptor(file_name);
 
@@ -101,33 +95,23 @@ static void action_close(const char *const *action) {
 int main(int argc, char *argv[]) {
   msg_error_t res = MSG_OK;
 
-  /* Check the given arguments */
   MSG_init(&argc, argv);
   /* Explicit initialization of the action module is required now*/
   MSG_action_init();
 
-  if (argc < 3) {
-    printf("Usage: %s platform_file deployment_file [action_files]\n", argv[0]);
-    printf
-        ("example: %s msg_platform.xml msg_deployment.xml actions # if all actions are in the same file\n",
-         argv[0]);
-    printf
-        ("example: %s msg_platform.xml msg_deployment.xml # if actions are in separate files, specified in deployment\n",
-         argv[0]);
-    exit(1);
-  }
+  xbt_assert(argc > 3,"Usage: %s platform_file deployment_file [action_files]\n"
+             "\texample: %s platform.xml deployment.xml actions # if all actions are in the same file\n"
+             "\texample: %s platform.xml deployment.xml # if actions are in separate files, specified in deployment\n",
+             argv[0], argv[0], argv[0]);
 
-  /*  Simulation setting */
   MSG_create_environment(argv[1]);
-
-  /* No need to register functions as in classical MSG programs: the actions get started anyway */
   MSG_launch_application(argv[2]);
 
   /*   Action registration */
   xbt_replay_action_register("open", action_open);
   xbt_replay_action_register("read", action_read);
   xbt_replay_action_register("close", action_close);
-  
+
   if (!opened_files)
     opened_files = xbt_dict_new_homogeneous(NULL);
   /* Actually do the simulation using MSG_action_trace_run */
@@ -141,5 +125,5 @@ int main(int argc, char *argv[]) {
   /* Explicit finalization of the action module is required now*/
   MSG_action_exit();
 
-  return !!MSG_OK;
-}                               /* end_of_main */
+  return res!=MSG_OK;
+}