#include "gras.h"
#include "amok/bandwidth.h"
-#include "amok/hostmanagement.h"
+#include "amok/peermanagement.h"
XBT_LOG_NEW_DEFAULT_CATEGORY(Bandwidth,"Messages specific to this example");
gras_init(&argc, argv);
amok_bw_init();
- amok_hm_init();
-
+ amok_pm_init();
+
mysock = gras_socket_server_range(3000,9999,0,0);
- gras_os_sleep(1); /* let the master get ready */
+ INFO1("Sensor starting (on port %d)",gras_os_myport());
+ gras_os_sleep(0.5); /* let the master get ready */
master = gras_socket_client_from_string(argv[1]);
- amok_hm_group_join(master,"bandwidth");
- amok_hm_mainloop(60);
+ amok_pm_group_join(master,"bandwidth");
+ amok_pm_mainloop(60);
gras_socket_close(mysock);
gras_socket_close(master);
int maestro(int argc,char *argv[]) {
double sec, bw;
int buf_size=32 *1024;
- int exp_size=512 *1024;
int msg_size=512 *1024;
+ int msg_amount = 1;
double min_duration = 1;
gras_socket_t peer;
gras_socket_t mysock;
- xbt_host_t h1,h2;
+ xbt_peer_t h1,h2;
xbt_dynar_t group;
gras_init(&argc, argv);
amok_bw_init();
- amok_hm_init();
+ amok_pm_init();
+ INFO0("Maestro starting");
if (argc != 2) {
ERROR0("Usage: maestro port\n");
return 1;
}
mysock=gras_socket_server(atoi(argv[1]));
- group=amok_hm_group_new("bandwidth");
- gras_msg_handleall(10); /* friends, we're ready. Come and play */
+ group=amok_pm_group_new("bandwidth");
+ INFO0("Wait for peers for 5 sec");
+ gras_msg_handleall(5); /* friends, we're ready. Come and play */
if (xbt_dynar_length(group) < 2) {
char *msg;
asprintf(&msg,"Not enough peers arrived. Expected 2 got %ld",
xbt_dynar_length(group));
+ amok_pm_group_shutdown("bandwidth");
xbt_die(msg);
}
- h1 = *(xbt_host_t*) xbt_dynar_get_ptr(group, 0);
- h2 = *(xbt_host_t*)xbt_dynar_get_ptr(group, 1);
-
+ h1 = *(xbt_peer_t*) xbt_dynar_get_ptr(group, 0);
+ h2 = *(xbt_peer_t*)xbt_dynar_get_ptr(group, 1);
+
+ INFO2("Contact %s:%d",h1->name, h1->port);
peer = gras_socket_client(h1->name, h1->port);
INFO0("Test the BW between me and one of the sensors");
- amok_bw_test(peer,buf_size,exp_size,msg_size,min_duration,&sec,&bw);
- INFO6("Experience between me and %s:%d (%d bytes in msgs of %d bytes) took %f sec, achieving %f kb/s",
+ amok_bw_test(peer,buf_size,msg_size,msg_amount,min_duration,&sec,&bw);
+ INFO7("Experience between me and %s:%d (initially %d msgs of %d bytes, maybe modified to fill the pipe at least %.1fs) took %f sec, achieving %f kb/s",
h1->name, h1->port,
- exp_size,msg_size,
+ msg_amount,msg_size,min_duration,
sec,((double)bw)/1024.0);
INFO4("Test the BW between %s:%d and %s:%d", h1->name, h1->port, h2->name, h2->port);
amok_bw_request(h1->name, h1->port, h2->name, h2->port,
- buf_size,exp_size,msg_size,min_duration,&sec,&bw);
+ buf_size,msg_size,msg_amount,min_duration,&sec,&bw);
INFO6("Experience between %s:%d and %s:%d took took %f sec, achieving %f kb/s",
h1->name, h1->port, h2->name, h2->port,
sec,((double)bw)/1024.0);
/* Game is over, friends */
- amok_hm_group_shutdown ("bandwidth");
+ amok_pm_group_shutdown ("bandwidth");
gras_socket_close(mysock);
gras_exit();