X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c57842fe897f53b46f0be3da87f7c996674be7d6..05a81a473f36ee2298730ccc85d4033affad4018:/teshsuite/msg/storage/concurrent_rw.c

diff --git a/teshsuite/msg/storage/concurrent_rw.c b/teshsuite/msg/storage/concurrent_rw.c
index 8d938bb6dd..df57ce86ec 100644
--- a/teshsuite/msg/storage/concurrent_rw.c
+++ b/teshsuite/msg/storage/concurrent_rw.c
@@ -1,25 +1,55 @@
-/* Copyright (c) 2008-2010, 2012-2014. The SimGrid Team.
- * All rights reserved.
-*/
+/* Copyright (c) 2008-2010, 2012-2015. The SimGrid Team.
+ * All rights reserved.                                                     */
 
-#include "msg/msg.h"
-#include "xbt/log.h"
-#include <unistd.h>
+/* 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 <unistd.h>
 
 #define FILENAME1 "/sd1/doc/simgrid/examples/cxx/autoDestination/Main.cxx"
 
-int host(int argc, char *argv[]);
-void storage_info(msg_host_t host);
-void display_storage_properties(msg_storage_t storage);
-void dump_storage_by_name(char *name);
-void display_storage_content(msg_storage_t storage);
-
 XBT_LOG_NEW_DEFAULT_CATEGORY(storage,"Messages specific for this simulation");
 
+static void display_storage_properties(msg_storage_t storage){
+  xbt_dict_cursor_t cursor = NULL;
+  char *key, *data;
+  xbt_dict_t props = MSG_storage_get_properties(storage);
+  if (xbt_dict_length(props) > 0){
+    XBT_INFO("\tProperties of mounted storage: %s", MSG_storage_get_name(storage));
+    xbt_dict_foreach(props, cursor, key, data)
+    XBT_INFO("\t\t'%s' -> '%s'", key, data);
+  } else {
+  XBT_INFO("\tNo property attached.");
+  }
+}
 
+static void display_storage_content(msg_storage_t storage){
+  XBT_INFO("Print the content of the storage element: %s",MSG_storage_get_name(storage));
+  xbt_dict_cursor_t cursor = NULL;
+  char *file;
+  sg_size_t *psize;
+  xbt_dict_t content = MSG_storage_get_content(storage);
+  if (content){
+    xbt_dict_foreach(content, cursor, file, psize)
+    XBT_INFO("\t%s size: %llu bytes", file, *psize);
+  } else {
+    XBT_INFO("\tNo content.");
+  }
+  xbt_dict_free(&content);
+}
 
-void storage_info(msg_host_t host)
+static void dump_storage_by_name(char *name){
+  XBT_INFO("*** Dump a storage element ***");
+  msg_storage_t storage = MSG_storage_get_by_name(name);
+
+  if(storage){
+    display_storage_content(storage);
+  } else{
+    XBT_INFO("Unable to retrieve storage element by its name: %s.", name);
+  }
+}
+static void storage_info(msg_host_t host)
 {
   const char* host_name = MSG_host_get_name(host);
   XBT_INFO("*** Storage info on %s ***", host_name);
@@ -31,10 +61,8 @@ void storage_info(msg_host_t host)
 
   xbt_dict_t storage_list = MSG_host_get_mounted_storage_list(host);
 
-  xbt_dict_foreach(storage_list,cursor,mount_name,storage_name)
-  {
+  xbt_dict_foreach(storage_list,cursor,mount_name,storage_name){
     XBT_INFO("\tStorage name: %s, mount name: %s", storage_name, mount_name);
-
     storage = MSG_storage_get_by_name(storage_name);
 
     sg_size_t free_size = MSG_storage_get_free_size(storage);
@@ -49,88 +77,34 @@ void storage_info(msg_host_t host)
   xbt_dict_free(&storage_list);
 }
 
-void display_storage_properties(msg_storage_t storage){
-  xbt_dict_cursor_t cursor = NULL;
-  char *key, *data;
-  xbt_dict_t props = MSG_storage_get_properties(storage);
-  if (xbt_dict_length(props) > 0){
-    XBT_INFO("\tProperties of mounted storage: %s", MSG_storage_get_name(storage));
-    xbt_dict_foreach(props, cursor, key, data)
-	  XBT_INFO("\t\t'%s' -> '%s'", key, data);
-  }else{
-	XBT_INFO("\tNo property attached.");
-  }
-}
-
-void dump_storage_by_name(char *name){
-  XBT_INFO("*** Dump a storage element ***");
-  msg_storage_t storage = MSG_storage_get_by_name(name);
-
-  if(storage){
-    display_storage_content(storage);
-  }
-  else{
-    XBT_INFO("Unable to retrieve storage element by its name: %s.", name);
-  }
-}
-
-void display_storage_content(msg_storage_t storage){
-  XBT_INFO("Print the content of the storage element: %s",MSG_storage_get_name(storage));
-  xbt_dict_cursor_t cursor = NULL;
-  char *file;
-  sg_size_t *psize;
-  xbt_dict_t content = MSG_storage_get_content(storage);
-  if (content){
-    xbt_dict_foreach(content, cursor, file, psize)
-    XBT_INFO("\t%s size: %llu bytes", file, *psize);
-  } else {
-    XBT_INFO("\tNo content.");
-  }
-  xbt_dict_free(&content);
-}
-
-
-
-
-
-int host(int argc, char *argv[])
+static int host(int argc, char *argv[])
 {
-	char name[2048];
-	sprintf(name,"%s%i", FILENAME1,MSG_process_self_PID());
-	msg_file_t file = MSG_file_open(name, NULL);
-	//MSG_file_read(file, MSG_file_get_size(file));
-	MSG_file_write(file, 500000);
+  char name[2048];
+  sprintf(name,"%s%i", FILENAME1,MSG_process_self_PID());
+  msg_file_t file = MSG_file_open(name, NULL);
+  //MSG_file_read(file, MSG_file_get_size(file));
+  MSG_file_write(file, 500000);
 
-	XBT_INFO("Size of %s: %llu", MSG_file_get_name(file), MSG_file_get_size(file));
-	MSG_file_close(file);
+  XBT_INFO("Size of %s: %llu", MSG_file_get_name(file), MSG_file_get_size(file));
+  MSG_file_close(file);
 
-	return 1;
+  return 1;
 }
 
-
 int main(int argc, char **argv)
 {
-
-  int res, i;
   MSG_init(&argc, argv);
   MSG_create_environment(argv[1]);
 
   MSG_function_register("host", host);
-  storage_info(MSG_get_host_by_name(xbt_strdup("host")));
-  for(i = 0 ; i<10; i++){
-  	MSG_process_create(xbt_strdup("host"), host, NULL, MSG_get_host_by_name(xbt_strdup("host")));
+  storage_info(MSG_host_by_name(xbt_strdup("host")));
+  for(int i = 0 ; i<10; i++){
+    MSG_process_create(xbt_strdup("host"), host, NULL, MSG_host_by_name(xbt_strdup("host")));
   }
 
-
-
-
-  res = MSG_main();
-  storage_info(MSG_get_host_by_name(xbt_strdup("host")));
+  int res = MSG_main();
+  storage_info(MSG_host_by_name(xbt_strdup("host")));
   XBT_INFO("Simulation time %g", MSG_get_clock());
 
-  if (res == MSG_OK)
-    return 0;
-  else
-    return 1;
-
+  return res != MSG_OK;
 }