mysock = gras_socket_server_range(3000,9999,0,0);
mysock = gras_socket_server_range(3000,9999,0,0);
- 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));
if (xbt_dynar_length(group) < 2) {
char *msg;
asprintf(&msg,"Not enough peers arrived. Expected 2 got %ld",
xbt_dynar_length(group));
- 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");
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",
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,
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 */
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 */