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
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid into...
[simgrid.git]
/
examples
/
msg
/
io
/
file.c
diff --git
a/examples/msg/io/file.c
b/examples/msg/io/file.c
index
b419a3a
..
0eb2cb4
100644
(file)
--- a/
examples/msg/io/file.c
+++ b/
examples/msg/io/file.c
@@
-36,7
+36,7
@@
int host(int argc, char *argv[])
s_msg_stat_t stat;
void *ptr = NULL;
char* mount = bprintf("/home");
s_msg_stat_t stat;
void *ptr = NULL;
char* mount = bprintf("/home");
-
size_t
read,write;
+
double
read,write;
if(!strcmp(MSG_process_get_name(MSG_process_self()),"0"))
file = MSG_file_open(mount,FILENAME1,"rw");
if(!strcmp(MSG_process_get_name(MSG_process_self()),"0"))
file = MSG_file_open(mount,FILENAME1,"rw");
@@
-51,16
+51,17
@@
int host(int argc, char *argv[])
XBT_INFO("\tOpen file '%s'",file->name);
read = MSG_file_read(ptr,10000000,sizeof(char*),file); // Read for 10Mo
XBT_INFO("\tOpen file '%s'",file->name);
read = MSG_file_read(ptr,10000000,sizeof(char*),file); // Read for 10Mo
- XBT_INFO("\tHav
ing read %zu \t
on %s",read,file->name);
+ XBT_INFO("\tHav
e read %8.1f
on %s",read,file->name);
write = MSG_file_write(ptr,100000,sizeof(char*),file); // Write for 100Ko
write = MSG_file_write(ptr,100000,sizeof(char*),file); // Write for 100Ko
- XBT_INFO("\tHav
ing write %zu \t
on %s",write,file->name);
+ XBT_INFO("\tHav
e written %8.1f
on %s",write,file->name);
read = MSG_file_read(ptr,10000000,sizeof(char*),file); // Read for 10Mo
read = MSG_file_read(ptr,10000000,sizeof(char*),file); // Read for 10Mo
- XBT_INFO("\tHav
ing read %zu \t
on %s",read,file->name);
+ XBT_INFO("\tHav
e read %8.1f
on %s",read,file->name);
MSG_file_stat(file,&stat);
MSG_file_stat(file,&stat);
- XBT_INFO("\tFile stat %s Size %d",file->name,(int)stat.size);
+ 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(file);
XBT_INFO("\tClose file '%s'",file->name);
MSG_file_close(file);
@@
-76,19
+77,18
@@
int main(int argc, char **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