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 pull request #65 from fabienchaix/master
[simgrid.git]
/
examples
/
msg
/
io
/
remote.c
diff --git
a/examples/msg/io/remote.c
b/examples/msg/io/remote.c
index
620ab81
..
cc84983
100644
(file)
--- a/
examples/msg/io/remote.c
+++ b/
examples/msg/io/remote.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2014. The SimGrid Team.
+/* Copyright (c) 2014
-2015
. 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
@@
-12,7
+12,6
@@
#include <stdio.h>
#include <stdlib.h>
#include "simgrid/msg.h"
#include <stdio.h>
#include <stdlib.h>
#include "simgrid/msg.h"
-#include "surf/surf_private.h"
#define INMEGA (1024*1024)
#define INMEGA (1024*1024)
@@
-54,8
+53,8
@@
int host(int argc, char *argv[]){
msg_host_t src, dest;
src= MSG_host_self();
msg_host_t src, dest;
src= MSG_host_self();
- dest = MSG_
get_
host_by_name(argv[3]);
- if (
atoi(argv[5]))
{
+ dest = MSG_host_by_name(argv[3]);
+ if (
xbt_str_parse_int(argv[5], "Argument 5 (move or copy) must be an int, not '%s'"))
{
XBT_INFO("Move '%s' (of size %llu) from '%s' to '%s'", filename,
MSG_file_get_size(file), MSG_host_get_name(src),
argv[3]);
XBT_INFO("Move '%s' (of size %llu) from '%s' to '%s'", filename,
MSG_file_get_size(file), MSG_host_get_name(src),
argv[3]);
@@
-103,8
+102,5
@@
int main(int argc, char **argv)
xbt_dynar_free_container(&storages);
XBT_INFO("Simulation time %g", MSG_get_clock());
xbt_dynar_free_container(&storages);
XBT_INFO("Simulation time %g", MSG_get_clock());
- if (res == MSG_OK)
- return 0;
- else
- return 1;
+ return res != MSG_OK;
}
}