X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/af0b5e9494ca8988c8dd7d3874c3c7a400a63172..9215b9a2294a6352eaac6396a6367d420cdc8759:/examples/msg/io/file.c
diff --git a/examples/msg/io/file.c b/examples/msg/io/file.c
index d63d941c89..0eb2cb459c 100644
--- a/examples/msg/io/file.c
+++ b/examples/msg/io/file.c
@@ -15,10 +15,10 @@
* - io/file.c Example with the disk resource
*/
-#define FILENAME1 "/home/user/Install/simgrid/doc/simgrid/examples/platforms/g5k.xml"
-#define FILENAME2 "/home/user/Install/simgrid/doc/simgrid/examples/platforms/One_cluster_no_backbone.xml"
-#define FILENAME3 "/home/user/Install/simgrid/doc/simgrid/examples/platforms/g5k_cabinets.xml"
-#define FILENAME4 "/home/user/Install/simgrid/doc/simgrid/examples/platforms/nancy.xml"
+#define FILENAME1 "./doc/simgrid/examples/platforms/g5k.xml"
+#define FILENAME2 "./doc/simgrid/examples/platforms/One_cluster_no_backbone.xml"
+#define FILENAME3 "./doc/simgrid/examples/platforms/g5k_cabinets.xml"
+#define FILENAME4 "./doc/simgrid/examples/platforms/nancy.xml"
#include
#include
@@ -32,9 +32,12 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(io_file,
int host(int argc, char *argv[])
{
- msg_file_t file;
- char* mount = bprintf("C:");
- size_t read,write;
+ msg_file_t file = NULL;
+ s_msg_stat_t stat;
+ void *ptr = NULL;
+ char* mount = bprintf("/home");
+ double read,write;
+
if(!strcmp(MSG_process_get_name(MSG_process_self()),"0"))
file = MSG_file_open(mount,FILENAME1,"rw");
else if(!strcmp(MSG_process_get_name(MSG_process_self()),"1"))
@@ -47,20 +50,21 @@ int host(int argc, char *argv[])
XBT_INFO("\tOpen file '%s'",file->name);
- read = MSG_file_read(mount,NULL,10000000,sizeof(char*),file); // Read for 10Mo
- XBT_INFO("\tHaving read %Zu \ton %s",read,file->name);
+ read = MSG_file_read(ptr,10000000,sizeof(char*),file); // Read for 10Mo
+ XBT_INFO("\tHave read %8.1f on %s",read,file->name);
- write = MSG_file_write(mount,NULL,100000,sizeof(char*),file); // Write for 100Ko
- XBT_INFO("\tHaving write %Zu \ton %s",write,file->name);
+ write = MSG_file_write(ptr,100000,sizeof(char*),file); // Write for 100Ko
+ XBT_INFO("\tHave written %8.1f on %s",write,file->name);
- read = MSG_file_read(mount,NULL,10000000,sizeof(char*),file); // Read for 10Mo
- XBT_INFO("\tHaving read %Zu \ton %s",read,file->name);
+ read = MSG_file_read(ptr,10000000,sizeof(char*),file); // Read for 10Mo
+ XBT_INFO("\tHave read %8.1f on %s",read,file->name);
-// res = MSG_file_stat(mount,0,NULL);
-// XBT_INFO("Host '%s' stat %d",MSG_host_get_name(MSG_host_self()), res);
+ MSG_file_stat(file,&stat);
+ XBT_INFO("\tFile stat %s Size %.1f",file->name,stat.size);
+ MSG_file_free_stat(&stat);
XBT_INFO("\tClose file '%s'",file->name);
- MSG_file_close(mount,file);
+ MSG_file_close(file);
free(mount);
return 0;
@@ -68,24 +72,23 @@ int host(int argc, char *argv[])
int main(int argc, char **argv)
{
- int i,res;
- MSG_global_init(&argc, argv);
+ int i,res;
+ MSG_init(&argc, argv);
MSG_create_environment(argv[1]);
xbt_dynar_t hosts = MSG_hosts_as_dynar();
MSG_function_register("host", host);
-
- XBT_INFO("Number of host '%lu'",xbt_dynar_length(hosts));
- for(i = 0 ; i