X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5b3677b425b9cc6949c1573d59ac772540cbf4b2..f2df13795e01302813a6aef10825ec7e922ce530:/examples/msg/io/storage.c diff --git a/examples/msg/io/storage.c b/examples/msg/io/storage.c index e2778d0e55..66a1fd4d9d 100644 --- a/examples/msg/io/storage.c +++ b/examples/msg/io/storage.c @@ -36,7 +36,7 @@ static int host(int argc, char *argv[]){ msg_storage_t storage; // Retrieve all mount points of current host - xbt_dict_t storage_list = MSG_host_get_storage_list(MSG_host_self()); + xbt_dict_t storage_list = MSG_host_get_mounted_storage_list(MSG_host_self()); xbt_dict_foreach(storage_list,cursor,mount_name,storage_name) { // For each disk mounted on host @@ -56,14 +56,12 @@ static int host(int argc, char *argv[]){ // Create a 200,000 bytes file named './tmp/data.txt' on /sd1 - - char* mount = xbt_strdup("/home"); - char* file_name = xbt_strdup("./tmp/data.txt"); + char* file_name = xbt_strdup("/home/tmp/data.txt"); msg_file_t file = NULL; sg_size_t write, read, file_size; // Open an non-existing file amounts to create it! - file = MSG_file_open(mount, file_name, NULL); + file = MSG_file_open(file_name, NULL); write = MSG_file_write(file, 200000); // Write 200,000 bytes XBT_INFO("Create a %llu bytes file named '%s' on /sd1", write, file_name); MSG_file_dump(file); @@ -84,15 +82,14 @@ static int host(int argc, char *argv[]){ MSG_file_dump(file); MSG_file_close(file); - free(mount); free(file_name); storage_name = xbt_strdup("Disk4"); storage = MSG_storage_get_by_name(storage_name); // Now rename file from ./tmp/data.txt to ./tmp/simgrid.readme - XBT_INFO("*** Renaming './tmp/data.txt' into './tmp/simgrid.readme'"); - MSG_storage_file_rename(storage, "./tmp/data.txt", "./tmp/simgrid.readme"); + XBT_INFO("*** Renaming '/tmp/data.txt' into '/tmp/simgrid.readme'"); + MSG_storage_file_rename(storage, "/tmp/data.txt", "/tmp/simgrid.readme"); // Now attach some user data to disk1 XBT_INFO("*** Get/set data for storage element: %s ***",storage_name); @@ -101,9 +98,10 @@ static int host(int argc, char *argv[]){ XBT_INFO("Get data: '%s'", data); - MSG_storage_set_data(storage,strdup("Some user data")); + MSG_storage_set_data(storage, xbt_strdup("Some user data")); data = MSG_storage_get_data(storage); XBT_INFO("Set and get data: '%s'", data); + xbt_free(data); xbt_free(storage_name);