X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/406f54970c00ca178fa918763d943027bd09e3ba..fa222c38f9b796be07ab4351ffc810a61a8fd705:/examples/msg/io/file_unlink.c
diff --git a/examples/msg/io/file_unlink.c b/examples/msg/io/file_unlink.c
index d9f6c01a61..188b3e20e5 100644
--- a/examples/msg/io/file_unlink.c
+++ b/examples/msg/io/file_unlink.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2008-2010, 2012-2015. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@ -6,20 +6,14 @@
/** @addtogroup MSG_examples
*
- * @subsection MSG_ex_resources Other resource kinds
- *
- * This section contains some sparse examples of how to use the other
- * kind of resources, such as disk or GPU. These resources are quite
- * experimental for now, but here we go anyway.
- *
- * - io/file.c Example with the disk resource
+ * - io/file_unlink.c TBA
*/
-#define FILENAME1 "./doc/simgrid/examples/platforms/g5k.xml"
+#define FILENAME1 "/home/doc/simgrid/examples/platforms/g5k.xml"
#include
#include
-#include "msg/msg.h"
+#include "simgrid/msg.h"
#include "surf/surf_private.h"
int host(int argc, char *argv[]);
@@ -30,77 +24,32 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(io_file,
int host(int argc, char *argv[])
{
msg_file_t file = NULL;
- s_msg_stat_t stat;
- void *ptr = NULL;
- char* mount = bprintf("/home");
- double write;
+ sg_size_t write;
// First open
XBT_INFO("\tOpen file '%s'",FILENAME1);
- file = MSG_file_open(mount,FILENAME1,"rw");
-
- // Print stat
- MSG_file_stat(file,&stat);
- XBT_INFO("\tFile stat %s Size %.1f",file->name,stat.size);
- MSG_file_free_stat(&stat);
+ file = MSG_file_open(FILENAME1, NULL);
// Unlink the file
- XBT_INFO("\tUnlink file '%s'",file->name);
+ XBT_INFO("\tUnlink file '%s'",MSG_file_get_name(file));
MSG_file_unlink(file);
// Re Open the file wich is in fact created
XBT_INFO("\tOpen file '%s'",FILENAME1);
- file = MSG_file_open(mount,FILENAME1,"rw");
-
- // Print stat
- MSG_file_stat(file,&stat);
- XBT_INFO("\tFile stat %s Size %.1f",file->name,stat.size);
- MSG_file_free_stat(&stat);
+ file = MSG_file_open(FILENAME1, NULL);
// Write into the new file
- write = MSG_file_write(ptr,100000,sizeof(char*),file); // Write for 100Ko
- XBT_INFO("\tHave written %8.1f on %s",write,file->name);
+ write = MSG_file_write(file,100000); // Write for 100Ko
+ XBT_INFO("\tHave written %llu on %s",write,MSG_file_get_name(file));
- // Print the stat
- MSG_file_stat(file,&stat);
- XBT_INFO("\tFile stat %s Size %.1f",file->name,stat.size);
- MSG_file_free_stat(&stat);
+ // Write into the new file
+ write = MSG_file_write(file,100000); // Write for 100Ko
+ XBT_INFO("\tHave written %llu on %s",write,MSG_file_get_name(file));
// Close the file
- XBT_INFO("\tClose file '%s'",file->name);
+ XBT_INFO("\tClose file '%s'",MSG_file_get_name(file));
MSG_file_close(file);
- xbt_dict_t dict_ls;
- char* key;
- surf_stat_t data = NULL;
- xbt_dict_cursor_t cursor = NULL;
-
- dict_ls = MSG_file_ls(mount,"./");
- XBT_INFO(" ");XBT_INFO("ls ./");
- xbt_dict_foreach(dict_ls,cursor,key,data){
- if(data) XBT_INFO("FILE : %s",key);
- else XBT_INFO("DIR : %s",key);
- }
- xbt_dict_free(&dict_ls);
-
- dict_ls = MSG_file_ls(mount,"./doc/simgrid/examples/platforms/");
- XBT_INFO(" ");XBT_INFO("ls ./doc/simgrid/examples/platforms/");
- xbt_dict_foreach(dict_ls,cursor,key,data){
- if(data) XBT_INFO("FILE : %s",key);
- else XBT_INFO("DIR : %s",key);
- }
- xbt_dict_free(&dict_ls);
-
- dict_ls = MSG_file_ls(mount,"./doc/simgrid/examples/msg/");
- XBT_INFO(" ");XBT_INFO("ls ./doc/simgrid/examples/msg/");
- xbt_dict_foreach(dict_ls,cursor,key,data){
- if(data) XBT_INFO("FILE : %s",key);
- else XBT_INFO("DIR : %s",key);
- }
- xbt_dict_free(&dict_ls);
-
- free(mount);
-
return 0;
}
@@ -113,7 +62,7 @@ int main(int argc, char **argv)
MSG_function_register("host", host);
unsigned long nb_hosts = xbt_dynar_length(hosts);
XBT_INFO("Number of host '%lu'",nb_hosts);
- char* name_host = bprintf("0");
+ char* name_host = xbt_strdup("0");
MSG_process_create( name_host, host, NULL, xbt_dynar_get_as(hosts,0,msg_host_t) );
free(name_host);