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
yet another cleaning pass
[simgrid.git]
/
examples
/
msg
/
io
/
file_unlink.c
diff --git
a/examples/msg/io/file_unlink.c
b/examples/msg/io/file_unlink.c
index
4e5e581
..
0426d20
100644
(file)
--- a/
examples/msg/io/file_unlink.c
+++ b/
examples/msg/io/file_unlink.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2008-2010, 2012-201
4
. The SimGrid Team.
+/* Copyright (c) 2008-2010, 2012-201
5
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-11,24
+11,15
@@
#define FILENAME1 "/home/doc/simgrid/examples/platforms/g5k.xml"
#define FILENAME1 "/home/doc/simgrid/examples/platforms/g5k.xml"
-#include <stdio.h>
-#include <stdlib.h>
#include "simgrid/msg.h"
#include "simgrid/msg.h"
-#include "surf/surf_private.h"
-
int host(int argc, char *argv[]
);
+
XBT_LOG_NEW_DEFAULT_CATEGORY(io_file, "Messages specific for this io example"
);
-XBT_LOG_NEW_DEFAULT_CATEGORY(io_file,
- "Messages specific for this io example");
-
-int host(int argc, char *argv[])
+static int host(int argc, char *argv[])
{
{
- msg_file_t file = NULL;
- sg_size_t write;
-
// First open
XBT_INFO("\tOpen file '%s'",FILENAME1);
// First open
XBT_INFO("\tOpen file '%s'",FILENAME1);
- file = MSG_file_open(FILENAME1, NULL);
+
msg_file_t
file = MSG_file_open(FILENAME1, NULL);
// Unlink the file
XBT_INFO("\tUnlink file '%s'",MSG_file_get_name(file));
// Unlink the file
XBT_INFO("\tUnlink file '%s'",MSG_file_get_name(file));
@@
-39,7
+30,7
@@
int host(int argc, char *argv[])
file = MSG_file_open(FILENAME1, NULL);
// Write into the new file
file = MSG_file_open(FILENAME1, NULL);
// Write into the new file
- write = MSG_file_write(file,100000); // Write for 100Ko
+
sg_size_t
write = MSG_file_write(file,100000); // Write for 100Ko
XBT_INFO("\tHave written %llu on %s",write,MSG_file_get_name(file));
// Write into the new file
XBT_INFO("\tHave written %llu on %s",write,MSG_file_get_name(file));
// Write into the new file
@@
-55,7
+46,6
@@
int host(int argc, char *argv[])
int main(int argc, char **argv)
{
int main(int argc, char **argv)
{
- int res;
MSG_init(&argc, argv);
MSG_create_environment(argv[1]);
xbt_dynar_t hosts = MSG_hosts_as_dynar();
MSG_init(&argc, argv);
MSG_create_environment(argv[1]);
xbt_dynar_t hosts = MSG_hosts_as_dynar();
@@
-68,11
+58,7
@@
int main(int argc, char **argv)
xbt_dynar_free(&hosts);
xbt_dynar_free(&hosts);
- res = MSG_main();
+
int
res = MSG_main();
XBT_INFO("Simulation time %g", MSG_get_clock());
XBT_INFO("Simulation time %g", MSG_get_clock());
- if (res == MSG_OK)
- return 0;
- else
- return 1;
-
+ return res != MSG_OK;
}
}