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
snake_case simix/blocking_simcall.hpp
[simgrid.git]
/
doc
/
tuto-msg
/
masterworker-sol2.c
diff --git
a/doc/tuto-msg/masterworker-sol2.c
b/doc/tuto-msg/masterworker-sol2.c
index
2b71a0b
..
16d44b0
100644
(file)
--- a/
doc/tuto-msg/masterworker-sol2.c
+++ b/
doc/tuto-msg/masterworker-sol2.c
@@
-34,19
+34,19
@@
static int master(int argc, char* argv[])
double comm_size = xbt_str_parse_double(argv[3], "Invalid communication size: %s"); /** - Task communication size */
/* Get the info about the worker processes (directly from SimGrid) */
double comm_size = xbt_str_parse_double(argv[3], "Invalid communication size: %s"); /** - Task communication size */
/* Get the info about the worker processes (directly from SimGrid) */
- int worker
s_count
= MSG_get_host_number();
+ int worker
_count
= MSG_get_host_number();
msg_host_t* workers = xbt_dynar_to_array(MSG_hosts_as_dynar());
msg_host_t* workers = xbt_dynar_to_array(MSG_hosts_as_dynar());
- for (int i = 0; i < worker
s
_count; i++) // Remove my host from the list
+ for (int i = 0; i < worker_count; i++) // Remove my host from the list
if (host_self == workers[i]) {
if (host_self == workers[i]) {
- workers[i] = workers[worker
s
_count - 1];
- worker
s
_count--;
+ workers[i] = workers[worker_count - 1];
+ worker_count--;
break;
}
break;
}
- for (int i = 0; i < worker
s
_count; i++)
+ for (int i = 0; i < worker_count; i++)
MSG_process_create("worker", worker, (void*)master_name, workers[i]);
MSG_process_create("worker", worker, (void*)master_name, workers[i]);
- XBT_INFO("Got %d workers and will send tasks for %g seconds", worker
s
_count, timeout);
+ XBT_INFO("Got %d workers and will send tasks for %g seconds", worker_count, timeout);
/* Dispatch the tasks */
int task_num = 0;
/* Dispatch the tasks */
int task_num = 0;
@@
-58,7
+58,7
@@
static int master(int argc, char* argv[])
sprintf(sprintf_buffer, "Task_%d", task_num);
msg_task_t task = MSG_task_create(sprintf_buffer, comp_size, comm_size, NULL);
sprintf(sprintf_buffer, "Task_%d", task_num);
msg_task_t task = MSG_task_create(sprintf_buffer, comp_size, comm_size, NULL);
- build_channel_name(channel, master_name, MSG_host_get_name(workers[task_num % worker
s
_count]));
+ build_channel_name(channel, master_name, MSG_host_get_name(workers[task_num % worker_count]));
XBT_DEBUG("Sending '%s' to channel '%s'", task->name, channel);
MSG_task_send(task, channel);
XBT_DEBUG("Sending '%s' to channel '%s'", task->name, channel);
MSG_task_send(task, channel);
@@
-67,9
+67,9
@@
static int master(int argc, char* argv[])
}
XBT_DEBUG("All tasks have been dispatched. Let's tell everybody the computation is over.");
}
XBT_DEBUG("All tasks have been dispatched. Let's tell everybody the computation is over.");
- for (int i = 0; i < worker
s
_count; i++) {
+ for (int i = 0; i < worker_count; i++) {
msg_task_t finalize = MSG_task_create("finalize", 0, 0, FINALIZE);
msg_task_t finalize = MSG_task_create("finalize", 0, 0, FINALIZE);
- MSG_task_send(finalize, build_channel_name(channel, master_name, MSG_host_get_name(workers[i % worker
s
_count])));
+ MSG_task_send(finalize, build_channel_name(channel, master_name, MSG_host_get_name(workers[i % worker_count])));
}
XBT_DEBUG("Sent %d tasks in total!", task_num);
}
XBT_DEBUG("Sent %d tasks in total!", task_num);