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
using a trace marker to register the end of each flow in the gtnets example
[simgrid.git]
/
examples
/
msg
/
gtnets
/
gtnets.c
diff --git
a/examples/msg/gtnets/gtnets.c
b/examples/msg/gtnets/gtnets.c
index
fe661af
..
d25c64f
100644
(file)
--- a/
examples/msg/gtnets/gtnets.c
+++ b/
examples/msg/gtnets/gtnets.c
@@
-1,3
+1,9
@@
+/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
+ * All rights reserved. */
+
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
+
#include <stdio.h>
#include <stdlib.h>
#include "msg/msg.h"
#include <stdio.h>
#include <stdlib.h>
#include "msg/msg.h"
@@
-50,14
+56,16
@@
int master(int argc, char *argv[])
/* slave name */
slavename = argv[2];
id = atoi(argv[3]);
/* slave name */
slavename = argv[2];
id = atoi(argv[3]);
- sprintf(id_alias, "%d", id);
+ sprintf(id_alias, "
flow_
%d", id);
slavenames[id] = slavename;
slavenames[id] = slavename;
+ TRACE_category (id_alias);
masternames[id] = MSG_host_get_name(MSG_host_self());
{ /* Task creation. */
char sprintf_buffer[64] = "Task_0";
todo = MSG_task_create(sprintf_buffer, 0, task_comm_size, NULL);
masternames[id] = MSG_host_get_name(MSG_host_self());
{ /* Task creation. */
char sprintf_buffer[64] = "Task_0";
todo = MSG_task_create(sprintf_buffer, 0, task_comm_size, NULL);
+ TRACE_msg_set_task_category(todo,id_alias);
//keep track of running tasks
gl_task_array[id] = todo;
gl_data_size[id] = task_comm_size;
//keep track of running tasks
gl_task_array[id] = todo;
gl_data_size[id] = task_comm_size;
@@
-68,15
+76,18
@@
int master(int argc, char *argv[])
}
/* time measurement */
}
/* time measurement */
+ sprintf(id_alias, "%d", id);
start_time = MSG_get_clock();
MSG_task_send(todo, id_alias);
start_time = MSG_get_clock();
MSG_task_send(todo, id_alias);
-
end_time = MSG_get_clock();
end_time = MSG_get_clock();
- INFO3("Send completed (to %s). Transfer time: %f\t Agregate bandwidth: %f",
- slave->name, (end_time - start_time),
- task_comm_size / (end_time - start_time));
- INFO2("Completed peer: %s time: %f", slave->name, (end_time - start_time));
+
+ if (!bool_printed) {
+ INFO3("Send completed (to %s). Transfer time: %f\t Agregate bandwidth: %f",
+ slave->name, (end_time - start_time),
+ task_comm_size / (end_time - start_time));
+ INFO2("Completed peer: %s time: %f", slave->name, (end_time - start_time));
+ }
return 0;
} /* end_of_master */
return 0;
} /* end_of_master */
@@
-87,6
+98,7
@@
int slave(int argc, char *argv[])
m_task_t task = NULL;
int a;
int id = 0;
m_task_t task = NULL;
int a;
int id = 0;
+ int limited_latency=0;
double remaining = 0;
char id_alias[10];
double remaining = 0;
char id_alias[10];
@@
-96,6
+108,7
@@
int slave(int argc, char *argv[])
id = atoi(argv[1]);
sprintf(id_alias, "%d", id);
id = atoi(argv[1]);
sprintf(id_alias, "%d", id);
+ int trace_id = id;
a = MSG_task_receive(&(task), id_alias);
a = MSG_task_receive(&(task), id_alias);
@@
-111,29
+124,34
@@
int slave(int argc, char *argv[])
for (id = 0; id < NTASKS; id++) {
if (gl_task_array[id] == NULL) {
} else if (gl_task_array[id] == task) {
for (id = 0; id < NTASKS; id++) {
if (gl_task_array[id] == NULL) {
} else if (gl_task_array[id] == task) {
- INFO5
+ limited_latency = MSG_task_is_latency_bounded(gl_task_array[id]);
+ if(limited_latency){
+ INFO1("WARNING FLOW[%d] is limited by latency!!", id);
+ }
+ INFO5
("===> Estimated Bw of FLOW[%d] : %f ; message from %s to %s with remaining : %f",
id, gl_data_size[id] / elapsed_time, masternames[id],
slavenames[id], 0.0);
} else {
remaining = MSG_task_get_remaining_communication(gl_task_array[id]);
("===> Estimated Bw of FLOW[%d] : %f ; message from %s to %s with remaining : %f",
id, gl_data_size[id] / elapsed_time, masternames[id],
slavenames[id], 0.0);
} else {
remaining = MSG_task_get_remaining_communication(gl_task_array[id]);
+ limited_latency = MSG_task_is_latency_bounded(gl_task_array[id]);
+
+ if(limited_latency){
+ INFO1("WARNING FLOW[%d] is limited by latency!!", id);
+ }
INFO5
("===> Estimated Bw of FLOW[%d] : %f ; message from %s to %s with remaining : %f",
id, (gl_data_size[id] - remaining) / elapsed_time, masternames[id],
slavenames[id], remaining);
}
INFO5
("===> Estimated Bw of FLOW[%d] : %f ; message from %s to %s with remaining : %f",
id, (gl_data_size[id] - remaining) / elapsed_time, masternames[id],
slavenames[id], remaining);
}
- }
- exit(0);
- }
- for (id = 0; id < NTASKS; id++) {
- if (gl_task_array[id] == task) {
- MSG_task_destroy(task);
- gl_task_array[id] = NULL;
- return 0;
}
}
- }
+ }
+ char mark[100];
+ snprintf (mark, 100, "flow_%d_finished", trace_id);
+ TRACE_mark ("endmark", mark);
+ MSG_task_destroy(task);
return 0;
} /* end_of_slave */
return 0;
} /* end_of_slave */
@@
-168,10
+186,16
@@
int main(int argc, char *argv[])
printf("Usage: %s platform_file deployment_file\n", argv[0]);
exit(1);
}
printf("Usage: %s platform_file deployment_file\n", argv[0]);
exit(1);
}
+
+ TRACE_start ();
+ TRACE_declare_mark ("endmark");
+
res = test_all(argv[1], argv[2]);
MSG_clean();
res = test_all(argv[1], argv[2]);
MSG_clean();
+ TRACE_end ();
+
if (res == MSG_OK)
return 0;
else
if (res == MSG_OK)
return 0;
else