X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fa222c38f9b796be07ab4351ffc810a61a8fd705..4a6b0a991a67e6f2f67c03fed43529e078da7115:/doc/msg-tuto-src/masterworker2.c?ds=sidebyside diff --git a/doc/msg-tuto-src/masterworker2.c b/doc/msg-tuto-src/masterworker2.c index b8cdc8d753..e3c2826c50 100644 --- a/doc/msg-tuto-src/masterworker2.c +++ b/doc/msg-tuto-src/masterworker2.c @@ -44,7 +44,7 @@ int master(int argc, char *argv[]) int i; - _XBT_GNUC_UNUSED int res = sscanf(argv[1], "%lg", &timeout); + XBT_ATTRIB_UNUSED int res = sscanf(argv[1], "%lg", &timeout); xbt_assert(res,"Invalid argument %s\n", argv[1]); res = sscanf(argv[2], "%lg", &task_comp_size); xbt_assert(res, "Invalid argument %s\n", argv[2]); @@ -57,17 +57,17 @@ int master(int argc, char *argv[]) for (i = 0; i < workers_count; i++) if(host_self == workers[i]) { - workers[i] = workers[workers_count-1]; - workers_count--; - break; + workers[i] = workers[workers_count-1]; + workers_count--; + break; } for (i = 0; i < workers_count; i++) - MSG_process_create("worker", worker, master_name, workers[i]); + MSG_process_create("worker", worker, master_name, workers[i]); } XBT_INFO("Got %d workers and will send tasks for %g seconds!", - workers_count, timeout); + workers_count, timeout); for (i = 0; 1; i++) { char sprintf_buffer[64]; @@ -77,10 +77,10 @@ int master(int argc, char *argv[]) sprintf(sprintf_buffer, "Task_%d", i); task = MSG_task_create(sprintf_buffer, task_comp_size, task_comm_size, - NULL); + NULL); build_channel_name(channel,master_name, - MSG_host_get_name(workers[i % workers_count])); + MSG_host_get_name(workers[i % workers_count])); XBT_DEBUG("Sending \"%s\" to channel \"%s\"", task->name, channel); MSG_task_send(task, channel); @@ -94,7 +94,7 @@ int master(int argc, char *argv[]) for (i = 0; i < workers_count; i++) { 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 % workers_count]))); + MSG_host_get_name(workers[i % workers_count]))); } XBT_INFO("Sent %d tasks in total!", task_num); @@ -107,11 +107,11 @@ int master(int argc, char *argv[]) int worker(int argc, char *argv[]) { msg_task_t task = NULL; - _XBT_GNUC_UNUSED int res; + XBT_ATTRIB_UNUSED int res; char channel[1024]; build_channel_name(channel,MSG_process_get_data(MSG_process_self()), - MSG_host_get_name(MSG_host_self())); + MSG_host_get_name(MSG_host_self())); XBT_DEBUG("Receiving on channel \"%s\"", channel);