A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
the name field of a msg_file_t is actually a full name (including path),
[simgrid.git]
/
examples
/
msg
/
io
/
file.c
diff --git
a/examples/msg/io/file.c
b/examples/msg/io/file.c
index
4b13333
..
023c1db
100644
(file)
--- a/
examples/msg/io/file.c
+++ b/
examples/msg/io/file.c
@@
-15,10
+15,10
@@
* - <b>io/file.c</b> Example with the disk resource
*/
* - <b>io/file.c</b> 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 <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
@@
-33,36
+33,33
@@
XBT_LOG_NEW_DEFAULT_CATEGORY(io_file,
int host(int argc, char *argv[])
{
msg_file_t file = NULL;
int host(int argc, char *argv[])
{
msg_file_t file = NULL;
- s_msg_stat_t stat;
-
- char* mount = bprintf("C:");
+ char* mount = xbt_strdup("/home");
size_t read,write;
size_t read,write;
+
if(!strcmp(MSG_process_get_name(MSG_process_self()),"0"))
if(!strcmp(MSG_process_get_name(MSG_process_self()),"0"))
- file = MSG_file_open(mount,FILENAME1
,"rw"
);
+ file = MSG_file_open(mount,FILENAME1);
else if(!strcmp(MSG_process_get_name(MSG_process_self()),"1"))
else if(!strcmp(MSG_process_get_name(MSG_process_self()),"1"))
- file = MSG_file_open(mount,FILENAME2
,"rw"
);
+ file = MSG_file_open(mount,FILENAME2);
else if(!strcmp(MSG_process_get_name(MSG_process_self()),"2"))
else if(!strcmp(MSG_process_get_name(MSG_process_self()),"2"))
- file = MSG_file_open(mount,FILENAME3
,"rw"
);
+ file = MSG_file_open(mount,FILENAME3);
else if(!strcmp(MSG_process_get_name(MSG_process_self()),"3"))
else if(!strcmp(MSG_process_get_name(MSG_process_self()),"3"))
- file = MSG_file_open(mount,FILENAME4
,"rw"
);
+ file = MSG_file_open(mount,FILENAME4);
else xbt_die("FILENAME NOT DEFINED %s",MSG_process_get_name(MSG_process_self()));
else xbt_die("FILENAME NOT DEFINED %s",MSG_process_get_name(MSG_process_self()));
- XBT_INFO("\tOpen file '%s'",file->name);
+ XBT_INFO("\tOpen file '%s'",file->
full
name);
- read = MSG_file_read(
mount,NULL,10000000,sizeof(char*),file); // Read for 10Mo
- XBT_INFO("\tHav
ing read %Zu \ton %s",read,file->
name);
+ read = MSG_file_read(
10000000,file); // Read for 10MB
+ XBT_INFO("\tHav
e read %zu on %s",read,file->full
name);
- write = MSG_file_write(
mount,NULL,100000,sizeof(char*),file); // Write for 100Ko
- XBT_INFO("\tHav
ing write %Zu \ton %s",write,file->
name);
+ write = MSG_file_write(
100000,file); // Write for 100KB
+ XBT_INFO("\tHav
e written %zu on %s",write,file->full
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(110000,file); // Read for 110KB
+ XBT_INFO("\tHave read %zu on %s (of size %zu)",read,file->fullname,
+ MSG_file_get_size(file));
- MSG_file_stat(mount,file,&stat);
- XBT_INFO("\tFile %s Size %d",file->name,(int)stat.size);
-
- XBT_INFO("\tClose file '%s'",file->name);
- MSG_file_close(mount,file);
+ XBT_INFO("\tClose file '%s'",file->fullname);
+ MSG_file_close(file);
free(mount);
return 0;
free(mount);
return 0;
@@
-70,24
+67,23
@@
int host(int argc, char *argv[])
int main(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);
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<
xbt_dynar_length(hosts)
; i++)
+ unsigned long nb_hosts = xbt_dynar_length(hosts);
+ XBT_INFO("Number of host '%lu'",
nb_hosts
);
+ for(i = 0 ; i<
nb_hosts
; i++)
{
char* name_host = bprintf("%d",i);
{
char* name_host = bprintf("%d",i);
- MSG_process_create( name_host, host, NULL, xbt_dynar_get_as(hosts,i,m_host_t) );
+ MSG_process_create( name_host, host, NULL, xbt_dynar_get_as(hosts,i,m
sg
_host_t) );
free(name_host);
}
xbt_dynar_free(&hosts);
res = MSG_main();
XBT_INFO("Simulation time %g", MSG_get_clock());
free(name_host);
}
xbt_dynar_free(&hosts);
res = MSG_main();
XBT_INFO("Simulation time %g", MSG_get_clock());
- MSG_clean();
if (res == MSG_OK)
return 0;
else
if (res == MSG_OK)
return 0;
else