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
[mc] Fix broken tests with surf++ (because simcall number have changed)
[simgrid.git]
/
examples
/
msg
/
token_ring
/
ring_call.c
diff --git
a/examples/msg/token_ring/ring_call.c
b/examples/msg/token_ring/ring_call.c
index
3de124d
..
9a7de6e
100644
(file)
--- a/
examples/msg/token_ring/ring_call.c
+++ b/
examples/msg/token_ring/ring_call.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2008
, 2009, 2010
. The SimGrid Team.
+/* Copyright (c) 2008
-2012
. 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
@@
-32,7
+32,7
@@
int host(int argc, char *argv[])
{
int host_number = atoi(MSG_process_get_name(MSG_process_self()));
char mailbox[256];
{
int host_number = atoi(MSG_process_get_name(MSG_process_self()));
char mailbox[256];
- m_task_t task = NULL;
+ m
sg
_task_t task = NULL;
_XBT_GNUC_UNUSED int res;
if (host_number == 0){ //master send then receive
sprintf(mailbox, "%d", host_number+1);
_XBT_GNUC_UNUSED int res;
if (host_number == 0){ //master send then receive
sprintf(mailbox, "%d", host_number+1);
@@
-63,7
+63,7
@@
int host(int argc, char *argv[])
int main(int argc, char **argv)
{
int i,res;
int main(int argc, char **argv)
{
int i,res;
- MSG_
global_
init(&argc, argv);
+ MSG_init(&argc, argv);
MSG_create_environment(argv[1]);
xbt_dynar_t hosts = MSG_hosts_as_dynar();
nb_hosts = xbt_dynar_length(hosts);
MSG_create_environment(argv[1]);
xbt_dynar_t hosts = MSG_hosts_as_dynar();
nb_hosts = xbt_dynar_length(hosts);
@@
-73,14
+73,13
@@
int main(int argc, char **argv)
for(i = 0 ; i<nb_hosts; i++)
{
char* name_host = bprintf("%d",i);
for(i = 0 ; i<nb_hosts; 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