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
In trace replay, allow to have one trace file per process
[simgrid.git]
/
examples
/
msg
/
actions
/
actions.c
diff --git
a/examples/msg/actions/actions.c
b/examples/msg/actions/actions.c
index
0a92faf
..
44bfb41
100644
(file)
--- a/
examples/msg/actions/actions.c
+++ b/
examples/msg/actions/actions.c
@@
-37,19
+37,22
@@
static double parse_double(const char *string) {
static void send(xbt_dynar_t action)
{
char *name = xbt_str_join(action, " ");
static void send(xbt_dynar_t action)
{
char *name = xbt_str_join(action, " ");
- char
*to = xbt_dynar_get_as(action, 2, char *)
;
+ char
to[250]
;
char *size = xbt_dynar_get_as(action, 3, char *);
double clock = MSG_get_clock();
char *size = xbt_dynar_get_as(action, 3, char *);
double clock = MSG_get_clock();
+ sprintf (to,"%s_%s", MSG_process_get_name(MSG_process_self()),
+ xbt_dynar_get_as(action, 2, char *));
+ // char *to = xbt_dynar_get_as(action, 2, char *);
DEBUG2("Entering Send: %s (size: %lg)", name, parse_double(size));
MSG_task_send(MSG_task_create(name, 0, parse_double(size), NULL), to);
DEBUG2("Entering Send: %s (size: %lg)", name, parse_double(size));
MSG_task_send(MSG_task_create(name, 0, parse_double(size), NULL), to);
-
INFO
2("%s %f", name, MSG_get_clock()-clock);
+
DEBUG
2("%s %f", name, MSG_get_clock()-clock);
free(name);
}
static int spawned_send(int argc, char *argv[])
{
free(name);
}
static int spawned_send(int argc, char *argv[])
{
- DEBUG3("%s: Sending %s on %s", MSG_process_
self()->name
,
+ DEBUG3("%s: Sending %s on %s", MSG_process_
get_name(MSG_process_self())
,
argv[1],argv[0]);
MSG_task_send(MSG_task_create(argv[0], 0, parse_double(argv[1]), NULL),
argv[0]);
argv[1],argv[0]);
MSG_task_send(MSG_task_create(argv[0], 0, parse_double(argv[1]), NULL),
argv[0]);
@@
-59,7
+62,8
@@
static int spawned_send(int argc, char *argv[])
static void Isend(xbt_dynar_t action)
{
char spawn_name[80];
static void Isend(xbt_dynar_t action)
{
char spawn_name[80];
- char *to = xbt_dynar_get_as(action, 2, char *);
+ char to[250];
+ // char *to = xbt_dynar_get_as(action, 2, char *);
char *size = xbt_dynar_get_as(action, 3, char *);
char **myargv;
m_process_t comm_helper;
char *size = xbt_dynar_get_as(action, 3, char *);
char **myargv;
m_process_t comm_helper;
@@
-67,31
+71,37
@@
static void Isend(xbt_dynar_t action)
DEBUG1("Isend on %s: spawn process ",
MSG_process_get_name(MSG_process_self()));
DEBUG1("Isend on %s: spawn process ",
MSG_process_get_name(MSG_process_self()));
+ sprintf (to,"%s_%s", MSG_process_get_name(MSG_process_self()),
+ xbt_dynar_get_as(action, 2, char *));
myargv = (char**) calloc (3, sizeof (char*));
myargv[0] = xbt_strdup(to);
myargv[1] = xbt_strdup(size);
myargv[2] = NULL;
myargv = (char**) calloc (3, sizeof (char*));
myargv[0] = xbt_strdup(to);
myargv[1] = xbt_strdup(size);
myargv[2] = NULL;
- sprintf(spawn_name,"%s_wait",MSG_process_get_name(MSG_process_self()));
+ // sprintf(spawn_name,"%s_wait",MSG_process_get_name(MSG_process_self()));
+ sprintf(spawn_name,"%s_wait",to);
comm_helper =
MSG_process_create_with_arguments(spawn_name, spawned_send,
NULL, MSG_host_self(), 2, myargv);
comm_helper =
MSG_process_create_with_arguments(spawn_name, spawned_send,
NULL, MSG_host_self(), 2, myargv);
-
INFO
2("%s %f",xbt_str_join(action, " "), MSG_get_clock()-clock);
+
DEBUG
2("%s %f",xbt_str_join(action, " "), MSG_get_clock()-clock);
}
static void recv(xbt_dynar_t action)
{
char *name = xbt_str_join(action, " ");
}
static void recv(xbt_dynar_t action)
{
char *name = xbt_str_join(action, " ");
+ char mailbox_name[250];
m_task_t task = NULL;
double clock = MSG_get_clock();
//FIXME: argument of action ignored so far; semantic not clear
//char *from=xbt_dynar_get_as(action,2,char*);
m_task_t task = NULL;
double clock = MSG_get_clock();
//FIXME: argument of action ignored so far; semantic not clear
//char *from=xbt_dynar_get_as(action,2,char*);
-
+ sprintf (mailbox_name,"%s_%s", xbt_dynar_get_as(action, 2, char *),
+ MSG_process_get_name(MSG_process_self()));
DEBUG1("Receiving: %s", name);
DEBUG1("Receiving: %s", name);
- MSG_task_receive(&task, MSG_process_get_name(MSG_process_self()));
- INFO2("%s %f", name, MSG_get_clock()-clock);
+ MSG_task_receive(&task, mailbox_name);
+ // MSG_task_receive(&task, MSG_process_get_name(MSG_process_self()));
+ DEBUG2("%s %f", name, MSG_get_clock()-clock);
MSG_task_destroy(task);
free(name);
}
MSG_task_destroy(task);
free(name);
}
@@
-99,12
+109,12
@@
static void recv(xbt_dynar_t action)
static int spawned_recv(int argc, char *argv[])
{
m_task_t task = NULL;
static int spawned_recv(int argc, char *argv[])
{
m_task_t task = NULL;
- char* name = (char *) MSG_process_get_data(MSG_process_self());
- DEBUG1("Receiving on %s", name);
- MSG_task_receive(&task, name);
+ DEBUG1("Receiving on %s", argv[0]);
+ MSG_task_receive(&task, argv[0]);
DEBUG1("Received %s", MSG_task_get_name(task));
DEBUG1("waiter on %s", MSG_process_get_name(MSG_process_self()));
DEBUG1("Received %s", MSG_task_get_name(task));
DEBUG1("waiter on %s", MSG_process_get_name(MSG_process_self()));
- MSG_task_send(MSG_task_create("waiter",0,0,NULL),MSG_process_get_name(MSG_process_self()));
+ MSG_task_send(MSG_task_create("waiter",0,0,NULL),
+ MSG_process_get_name(MSG_process_self()));
MSG_task_destroy(task);
return 0;
MSG_task_destroy(task);
return 0;
@@
-115,23
+125,31
@@
static void Irecv(xbt_dynar_t action)
{
char *name = xbt_str_join(action, " ");
m_process_t comm_helper;
{
char *name = xbt_str_join(action, " ");
m_process_t comm_helper;
+ char mailbox_name[250];
+ char **myargv;
double clock = MSG_get_clock();
DEBUG1("Irecv on %s: spawn process ",
MSG_process_get_name(MSG_process_self()));
double clock = MSG_get_clock();
DEBUG1("Irecv on %s: spawn process ",
MSG_process_get_name(MSG_process_self()));
+ sprintf (mailbox_name,"%s_%s", xbt_dynar_get_as(action, 2, char *),
+ MSG_process_get_name(MSG_process_self()));
sprintf(name,"%s_wait",MSG_process_get_name(MSG_process_self()));
sprintf(name,"%s_wait",MSG_process_get_name(MSG_process_self()));
- comm_helper = MSG_process_create(name,spawned_recv,
- (void *) MSG_process_get_name(MSG_process_self()),
- MSG_host_self());
+ myargv = (char**) calloc (2, sizeof (char*));
+
+ myargv[0] = xbt_strdup(mailbox_name);
+ myargv[1] = NULL;
+ comm_helper = MSG_process_create_with_arguments(name,spawned_recv,
+ NULL, MSG_host_self(),
+ 1, myargv);
-
INFO
2("%s %f", xbt_str_join(action, " "),
+
DEBUG
2("%s %f", xbt_str_join(action, " "),
MSG_get_clock()-clock);
free(name);
}
MSG_get_clock()-clock);
free(name);
}
-static void wait(xbt_dynar_t action)
+static void wait
_action
(xbt_dynar_t action)
{
char *name = xbt_str_join(action, " ");
char task_name[80];
{
char *name = xbt_str_join(action, " ");
char task_name[80];
@@
-140,16
+158,17
@@
static void wait(xbt_dynar_t action)
DEBUG1("Entering %s", name);
sprintf(task_name,"%s_wait",MSG_process_get_name(MSG_process_self()));
DEBUG1("Entering %s", name);
sprintf(task_name,"%s_wait",MSG_process_get_name(MSG_process_self()));
+ DEBUG1("wait: %s", task_name);
MSG_task_receive(&task,task_name);
MSG_task_destroy(task);
MSG_task_receive(&task,task_name);
MSG_task_destroy(task);
-
INFO2("%s %f", name,
MSG_get_clock()-clock);
+
DEBUG2("%s %f", name,
MSG_get_clock()-clock);
free(name);
}
static void barrier (xbt_dynar_t action)
{
char *name = xbt_str_join(action, " ");
free(name);
}
static void barrier (xbt_dynar_t action)
{
char *name = xbt_str_join(action, " ");
-
INFO
1("barrier: %s", name);
+
DEBUG
1("barrier: %s", name);
free(name);
free(name);
@@
-162,6
+181,7
@@
static void reduce(xbt_dynar_t action)
char *name;
char task_name[80];
char spawn_name[80];
char *name;
char task_name[80];
char spawn_name[80];
+ char **myargv;
char *comm_size = xbt_dynar_get_as(action, 2, char *);
char *comp_size = xbt_dynar_get_as(action, 3, char *);
m_process_t comm_helper=NULL;
char *comm_size = xbt_dynar_get_as(action, 2, char *);
char *comp_size = xbt_dynar_get_as(action, 3, char *);
m_process_t comm_helper=NULL;
@@
-183,19
+203,25
@@
static void reduce(xbt_dynar_t action)
name = bprintf("reduce_%d", counters->reduce_counter++);
name = bprintf("reduce_%d", counters->reduce_counter++);
- if (!strcmp(process_name, "p
rocess
0")){
+ if (!strcmp(process_name, "p0")){
DEBUG2("%s: %s is the Root",name, process_name);
for(i=1;i<communicator_size;i++){
DEBUG2("%s: %s is the Root",name, process_name);
for(i=1;i<communicator_size;i++){
- sprintf(spawn_name,"%s_process%d", name, i);
+ sprintf(spawn_name,"%s_p%d_%s", name, i,
+ MSG_process_get_name(MSG_process_self()));
sprintf(task_name,"%s_wait", spawn_name);
sprintf(task_name,"%s_wait", spawn_name);
+ myargv = (char**) calloc (2, sizeof (char*));
+
+ myargv[0] = xbt_strdup(spawn_name);
+ myargv[1] = NULL;
+
comm_helper =
comm_helper =
- MSG_process_create(task_name, spawned_recv,
-
(void *) xbt_strdup(spawn_name
),
- MSG_host_self());
+ MSG_process_create
_with_arguments
(task_name, spawned_recv,
+
NULL, MSG_host_self(
),
+ 1, myargv);
}
for(i=1;i<communicator_size;i++){
}
for(i=1;i<communicator_size;i++){
- sprintf(task_name,"%s_p
rocess%d
_wait", name, i);
+ sprintf(task_name,"%s_p
%d_p0
_wait", name, i);
MSG_task_receive(&task,task_name);
MSG_task_destroy(task);
task=NULL;
MSG_task_receive(&task,task_name);
MSG_task_destroy(task);
task=NULL;
@@
-209,14
+235,14
@@
static void reduce(xbt_dynar_t action)
DEBUG1("%s: computed", name);
} else {
DEBUG2("%s: %s sends", name, process_name);
DEBUG1("%s: computed", name);
} else {
DEBUG2("%s: %s sends", name, process_name);
- sprintf(task_name,"%s_%s", name, process_name);
+ sprintf(task_name,"%s_%s
_p0
", name, process_name);
DEBUG1("put on %s", task_name);
MSG_task_send(MSG_task_create(name, 0, parse_double(comm_size), NULL),
task_name);
}
MSG_process_set_data(MSG_process_self(), (void*)counters);
DEBUG1("put on %s", task_name);
MSG_task_send(MSG_task_create(name, 0, parse_double(comm_size), NULL),
task_name);
}
MSG_process_set_data(MSG_process_self(), (void*)counters);
-
INFO
2("%s %f", xbt_str_join(action, " "), MSG_get_clock()-clock);
+
DEBUG
2("%s %f", xbt_str_join(action, " "), MSG_get_clock()-clock);
free(name);
}
free(name);
}
@@
-245,7
+271,7
@@
static void bcast (xbt_dynar_t action)
}
name = bprintf("bcast_%d", counters->bcast_counter++);
}
name = bprintf("bcast_%d", counters->bcast_counter++);
- if (!strcmp(process_name, "p
rocess
0")){
+ if (!strcmp(process_name, "p0")){
DEBUG2("%s: %s is the Root",name, process_name);
for(i=1;i<communicator_size;i++){
DEBUG2("%s: %s is the Root",name, process_name);
for(i=1;i<communicator_size;i++){
@@
-261,7
+287,7
@@
static void bcast (xbt_dynar_t action)
}
for(i=1;i<communicator_size;i++){
}
for(i=1;i<communicator_size;i++){
- sprintf(task_name,"p
rocess
%d_wait", i);
+ sprintf(task_name,"p%d_wait", i);
DEBUG1("get on %s", task_name);
MSG_task_receive(&task,task_name);
MSG_task_destroy(task);
DEBUG1("get on %s", task_name);
MSG_task_receive(&task,task_name);
MSG_task_destroy(task);
@@
-280,7
+306,7
@@
static void bcast (xbt_dynar_t action)
}
MSG_process_set_data(MSG_process_self(), (void*)counters);
}
MSG_process_set_data(MSG_process_self(), (void*)counters);
-
INFO
2("%s %f", xbt_str_join(action, " "), MSG_get_clock()-clock);
+
DEBUG
2("%s %f", xbt_str_join(action, " "), MSG_get_clock()-clock);
free(name);
}
free(name);
}
@@
-292,7
+318,7
@@
static void sleep(xbt_dynar_t action)
double clock = MSG_get_clock();
DEBUG1("Entering %s", name);
MSG_process_sleep(parse_double(duration));
double clock = MSG_get_clock();
DEBUG1("Entering %s", name);
MSG_process_sleep(parse_double(duration));
-
INFO
2("%s %f ", name, MSG_get_clock()-clock);
+
DEBUG
2("%s %f ", name, MSG_get_clock()-clock);
free(name);
}
free(name);
}
@@
-324,19
+350,25
@@
static void allReduce(xbt_dynar_t action)
name = bprintf("allReduce_%d", counters->allReduce_counter++);
name = bprintf("allReduce_%d", counters->allReduce_counter++);
- if (!strcmp(process_name, "p
rocess
0")){
+ if (!strcmp(process_name, "p0")){
DEBUG2("%s: %s is the Root",name, process_name);
for(i=1;i<communicator_size;i++){
DEBUG2("%s: %s is the Root",name, process_name);
for(i=1;i<communicator_size;i++){
- sprintf(spawn_name,"%s_process%d", name, i);
+ sprintf(spawn_name,"%s_p%d_%s", name, i,
+ MSG_process_get_name(MSG_process_self()));
sprintf(task_name,"%s_wait", spawn_name);
sprintf(task_name,"%s_wait", spawn_name);
+ myargv = (char**) calloc (2, sizeof (char*));
+
+ myargv[0] = xbt_strdup(spawn_name);
+ myargv[1] = NULL;
+
comm_helper =
comm_helper =
- MSG_process_create(task_name, spawned_recv,
-
(void *) xbt_strdup(spawn_name
),
- MSG_host_self());
+ MSG_process_create
_with_arguments
(task_name, spawned_recv,
+
NULL, MSG_host_self(
),
+ 1, myargv);
}
for(i=1;i<communicator_size;i++){
}
for(i=1;i<communicator_size;i++){
- sprintf(task_name,"%s_p
rocess%d
_wait", name, i);
+ sprintf(task_name,"%s_p
%d_p0
_wait", name, i);
MSG_task_receive(&task,task_name);
MSG_task_destroy(task);
task=NULL;
MSG_task_receive(&task,task_name);
MSG_task_destroy(task);
task=NULL;
@@
-362,7
+394,7
@@
static void allReduce(xbt_dynar_t action)
}
for(i=1;i<communicator_size;i++){
}
for(i=1;i<communicator_size;i++){
- sprintf(task_name,"p
rocess
%d_wait", i);
+ sprintf(task_name,"p%d_wait", i);
DEBUG1("get on %s", task_name);
MSG_task_receive(&task,task_name);
MSG_task_destroy(task);
DEBUG1("get on %s", task_name);
MSG_task_receive(&task,task_name);
MSG_task_destroy(task);
@@
-373,7
+405,7
@@
static void allReduce(xbt_dynar_t action)
} else {
DEBUG2("%s: %s sends", name, process_name);
} else {
DEBUG2("%s: %s sends", name, process_name);
- sprintf(task_name,"%s_%s", name, process_name);
+ sprintf(task_name,"%s_%s
_p0
", name, process_name);
DEBUG1("put on %s", task_name);
MSG_task_send(MSG_task_create(name, 0, parse_double(comm_size), NULL),
task_name);
DEBUG1("put on %s", task_name);
MSG_task_send(MSG_task_create(name, 0, parse_double(comm_size), NULL),
task_name);
@@
-388,7
+420,7
@@
static void allReduce(xbt_dynar_t action)
}
MSG_process_set_data(MSG_process_self(), (void*)counters);
}
MSG_process_set_data(MSG_process_self(), (void*)counters);
-
INFO
2("%s %f", xbt_str_join(action, " "), MSG_get_clock()-clock);
+
DEBUG
2("%s %f", xbt_str_join(action, " "), MSG_get_clock()-clock);
free(name);
}
free(name);
}
@@
-408,7
+440,7
@@
static void compute(xbt_dynar_t action)
DEBUG1("Entering %s", name);
MSG_task_execute(task);
MSG_task_destroy(task);
DEBUG1("Entering %s", name);
MSG_task_execute(task);
MSG_task_destroy(task);
-
INFO
2("%s %f", name, MSG_get_clock()-clock);
+
DEBUG
2("%s %f", name, MSG_get_clock()-clock);
free(name);
}
free(name);
}
@@
-419,9
+451,11
@@
int main(int argc, char *argv[])
/* Check the given arguments */
MSG_global_init(&argc, argv);
/* Check the given arguments */
MSG_global_init(&argc, argv);
- if (argc < 4) {
- printf("Usage: %s platform_file deployment_file action_files\n", argv[0]);
- printf("example: %s msg_platform.xml msg_deployment.xml actions\n",
+ if (argc < 3) {
+ printf("Usage: %s platform_file deployment_file [action_files]\n", argv[0]);
+ printf("example: %s msg_platform.xml msg_deployment.xml actions # if all actions are in the same file\n",
+ argv[0]);
+ printf("example: %s msg_platform.xml msg_deployment.xml # if actions are in separate files, specified in deployment\n",
argv[0]);
exit(1);
}
argv[0]);
exit(1);
}
@@
-438,7
+472,7
@@
int main(int argc, char *argv[])
MSG_action_register("Isend", Isend);
MSG_action_register("recv", recv);
MSG_action_register("Irecv", Irecv);
MSG_action_register("Isend", Isend);
MSG_action_register("recv", recv);
MSG_action_register("Irecv", Irecv);
- MSG_action_register("wait", wait);
+ MSG_action_register("wait", wait
_action
);
MSG_action_register("barrier", barrier);
MSG_action_register("bcast", bcast);
MSG_action_register("reduce", reduce);
MSG_action_register("barrier", barrier);
MSG_action_register("bcast", bcast);
MSG_action_register("reduce", reduce);
@@
-448,7
+482,7
@@
int main(int argc, char *argv[])
/* Actually do the simulation using MSG_action_trace_run */
/* Actually do the simulation using MSG_action_trace_run */
- res = MSG_action_trace_run(argv[3]);
+ res = MSG_action_trace_run(argv[3]);
// it's ok to pass a NULL argument here
INFO1("Simulation time %g", MSG_get_clock());
MSG_clean();
INFO1("Simulation time %g", MSG_get_clock());
MSG_clean();