#include "gras.h"
#include "amok/bandwidth.h"
+#include "amok/hostmanagement.h"
XBT_LOG_NEW_DEFAULT_CATEGORY(saturate,"Messages specific to this example");
* Sensor code
* **********************************************************************/
-/* Global private data */
-typedef struct {
- gras_socket_t sock;
- int done;
-} sensor_data_t;
-
/* Function prototypes */
int sensor (int argc,char *argv[]);
-static int sensor_cb_kill(gras_msg_cb_ctx_t ctx,
- void *payload_data) {
-
- sensor_data_t *g=gras_userdata_get();
- g->done = 1;
- INFO0("Killed");
- return 1;
-}
int sensor (int argc,char *argv[]) {
- sensor_data_t *g;
- xbt_ex_t e;
+ gras_socket_t mysock;
+ gras_socket_t master;
- gras_init(&argc,argv);
+ gras_init(&argc, argv);
amok_bw_init();
-
- g=gras_userdata_new(sensor_data_t);
- g->sock = gras_socket_server(atoi(argv[1]));
-
- g->done = 0;
- gras_msgtype_declare("kill",NULL);
- gras_cb_register(gras_msgtype_by_name("kill"),&sensor_cb_kill);
-
- while (!g->done) {
- TRY {
- gras_msg_handle(20.0);
- } CATCH(e) {
- if (e.category != timeout_error)
- RETHROW;
- xbt_ex_free(e);
- }
- }
-
- gras_socket_close(g->sock);
- free(g);
+ amok_hm_init();
+
+ mysock = gras_socket_server_range(3000,9999,0,0);
+ 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,"saturate");
+ amok_hm_mainloop(600);
+
+ gras_socket_close(mysock);
+ gras_socket_close(master);
gras_exit();
return 0;
}
const int exp_size = 100 * 1024;
const int msg_size = 50 * 1024;
const int sat_size = 1024 * 1024 * 10;
+const double min_duration = 1;
static double XP(const char *bw1, const char *bw2,
const char *sat1, const char *sat2) {
gras_os_sleep(5.0); /* wait for the sensors to show up */
/* Test BW without saturation */
amok_bw_request(bw1,4000,bw2,4000,
- buf_size,exp_size,msg_size,&sec,&bw);
+ buf_size,exp_size,msg_size,min_duration,&sec,&bw);
INFO4("BW(%s,%s) => %f sec, achieving %f Mb/s",
bw1, bw2, sec, (bw/1024.0/1024.0));
gras_os_sleep(1.0); /* let it start */
amok_bw_request(bw1,4000,bw2,4000,
- buf_size,exp_size,msg_size,&sec_sat,&bw_sat);
+ buf_size,exp_size,msg_size,min_duration,&sec_sat,&bw_sat);
INFO6("BW(%s,%s//%s,%s) => %f sec, achieving %f Mb/s",
bw1,bw2,sat1,sat2,sec,bw/1024.0/1024.0);
kill_buddy(argv[3],atoi(argv[4]));
}
/********************************************************************************************/
-static void env_hosttohost_bw(int argc, char*argv[]) {
-
- /* where are the sensors */
- xbt_dynar_t hosts = xbt_dynar_new(sizeof(xbt_host_t),&free_host);
- int nb_hosts;
-
- /* results */
- double sec, bw;
-
- /* iterators */
- int i;
- xbt_host_t h1;
-
- gras_socket_t peer; /* socket to sensor */
-
- /* wait to ensure that all server sockets are there before starting the experiment */
- gras_os_sleep(0.5);
-
- /* Get the sensor location from argc/argv */
- for (i=1; i<argc-1; i+=2){
- xbt_host_t host=xbt_new(s_xbt_host_t,1);
- host->name=strdup(argv[i]);
- host->port=atoi(argv[i+1]);
- INFO2("New sensor: %s:%d",host->name,host->port);
- xbt_dynar_push(hosts,&host);
- }
- nb_hosts = xbt_dynar_length(hosts);
-
- INFO0(">>> start Test1: ENV end to end mesurements");
-
- xbt_dynar_foreach(hosts,i,h1) {
- peer = gras_socket_client(h1->name,h1->port);
- amok_bw_test(peer,buf_size,exp_size,msg_size,&sec,&bw);
- INFO6("Bandwidth between me and %s:%d (%d bytes in msgs of %d bytes) took %f sec, achieving %.3f kb/s",
- h1->name,h1->port,
- exp_size,msg_size,
- sec,((double)bw)/1024.0);
- }
-
- xbt_dynar_map(hosts,kill_buddy_dynar);
- xbt_dynar_free(&hosts);
-
-}
-/********************************************************************************************/
-static void env_Pairwisehost_bw(int argc, char*argv[]) {
- xbt_ex_t e;
-
- /* where are the sensors */
- xbt_dynar_t hosts = xbt_dynar_new(sizeof(xbt_host_t),&free_host);
- int nb_hosts;
-
- /* getting the name of maestro for the saturation and the concurrent bandwidth measurements */
- char* host_test=argv[0];
-
- /* results */
- double sec, bw;
-
- /* iterators */
- int i,j;
- xbt_host_t h1,h2;
-
- /* socket to sensor */
- gras_socket_t peer;
-
- /* wait to ensure that all server sockets are there before starting the experiment */
- gras_os_sleep(0.5);
-
- INFO1(">>>>>< le maestro est: %s ",argv[0]);
- /* Get the sensor location from argc/argv */
- for (i=1; i<argc-1; i+=2){
- xbt_host_t host=xbt_new(s_xbt_host_t,1);
- host->name=strdup(argv[i]);
- host->port=atoi(argv[i+1]);
- INFO2("New sensor: %s:%d",host->name,host->port);
- xbt_dynar_push(hosts,&host);
- }
- nb_hosts = xbt_dynar_length(hosts);
-
- INFO0(">>> start Test2: ENV pairwise host bandwidth mesurements");
- xbt_dynar_foreach(hosts,i,h1) {
-
- TRY {
- amok_bw_saturate_start(h1->name,h1->port,
- host_test,h1->port,//"Ginette"
- msg_size,120); // sturation of the link with msg_size to compute a concurent bandwidth MA //MB
- } CATCH(e) {
- RETHROW0("Cannot ask hosts to saturate the link: %s");
- }
- // gras_os_sleep(1.0);
-
- xbt_dynar_foreach(hosts,j,h2) {
- if (i==j) continue;
-
- peer = gras_socket_client(h2->name,h2->port);
- amok_bw_test(peer,buf_size,exp_size,msg_size,&sec,&bw);
- INFO6("Bandwidth between me and %s // measurement between me and %s (%d bytes in msgs of %d bytes) took %f sec, achieving %.3f kb/s",
- h2->name,h1->name,
- exp_size,msg_size,
- sec,((double)bw)/1024.0);
-
- }
- amok_bw_saturate_stop(h1->name,h1->port,NULL,NULL);
-}
- xbt_dynar_map(hosts,kill_buddy_dynar);
- xbt_dynar_free(&hosts);
-
-}
-/********************************************************************************************/
static void full_fledged_saturation(int argc, char*argv[]) {
xbt_ex_t e;
//unsigned int time1=5,bw1=5;
int begin;
/* where are the sensors */
- xbt_dynar_t hosts = xbt_dynar_new(sizeof(xbt_host_t),&free_host);
+ xbt_dynar_t hosts;
int nb_hosts;
/* results */
int i,j,k,l;
xbt_host_t h1,h2,h3,h4;
- /* Get the sensor location from argc/argv */
- for (i=1; i<argc-1; i+=2){
- xbt_host_t host=xbt_new(s_xbt_host_t,1);
- host->name=strdup(argv[i]);
- host->port=atoi(argv[i+1]);
- INFO2("New sensor: %s:%d",host->name,host->port);
- xbt_dynar_push(hosts,&host);
- }
+ /* Init the group */
+ hosts=amok_hm_group_new("saturate");
+ INFO0("Wait for peers for 5 sec");
+ gras_msg_handleall(5); /* friends, we're ready. Come and play */
nb_hosts = xbt_dynar_length(hosts);
- gras_os_sleep(2); /* wait for my pals to get ready */
INFO0("Let's go for the bw_matrix");
/* Do the test without saturation */
begin=time(NULL);
begin_simulated=gras_os_time();
- bw=amok_bw_matrix(hosts,buf_size,exp_size,msg_size);
+ bw=amok_bw_matrix(hosts,buf_size,exp_size,msg_size,min_duration);
- INFO2("Did all BW tests in %ld sec (%.2f simulated sec)",
+ INFO2("Did all BW tests in %ld sec (%.2f simulated(?) sec)",
time(NULL)-begin,gras_os_time()-begin_simulated);
/* Do the test with saturation */
double ratio;
if (i==l || j==l || k==l) continue;
- INFO4("TEST %s %s // %s %s",
+ VERB4("TEST %s %s // %s %s",
h1->name,h2->name,h3->name,h4->name);
amok_bw_request(h3->name,h3->port, h4->name,h4->port,
- buf_size,exp_size,msg_size,
+ buf_size,exp_size,msg_size,min_duration,
NULL,&(bw_sat[k*nb_hosts + l]));
ratio=bw_sat[k*nb_hosts + l] / bw[k*nb_hosts + l];
}
free(bw_sat);
free(bw);
- xbt_dynar_map(hosts,kill_buddy_dynar);
- xbt_dynar_free(&hosts);
+ /* Game is over, friends */
+ amok_hm_group_shutdown ("saturate");
}
gras_init(&argc,argv);
amok_bw_init();
+ amok_hm_init();
- gras_socket_server(3333); /* only so that messages from the transport layer in gras identify us */
-
- //env_Pairwisehost_bw(argc,argv);
- //env_hosttohost_bw(argc,argv);
+ gras_socket_server(atoi(argv[1]));
// simple_saturation(argc,argv);
full_fledged_saturation(argc, argv);
