From: amad206 Date: Fri, 19 May 2006 13:40:00 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: v3.3~3103 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/c29ea41c1e876d54bb72b08da78905d2c254c4ed *** empty log message *** git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@2255 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/examples/amok/saturate/saturate.c b/examples/amok/saturate/saturate.c index 2aa436e69f..545e8bae43 100644 --- a/examples/amok/saturate/saturate.c +++ b/examples/amok/saturate/saturate.c @@ -32,7 +32,7 @@ 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"); @@ -46,6 +46,7 @@ int sensor (int argc,char *argv[]) { 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); @@ -69,9 +70,14 @@ int maestro (int argc,char *argv[]); /* XP setups */ const int buf_size = 0; -const int exp_size = 1024;// * 1024; -const int msg_size = 1024; -const int sat_size = 1024 * 1024 * 10 * 10; +const int exp_size = 64*1024*1024; // * 1024; +const int msg_size = 16*1024*1024; +const int sat_size = 10*1024*1024; //1024 * 10 * + +/* Global private data */ +typedef struct { + gras_socket_t sock; +} s_maestro_data_t,*maestro_data_t; static double XP(const char *bw1, const char *bw2, const char *sat1, const char *sat2) { @@ -128,7 +134,7 @@ static void simple_saturation(int argc, char*argv[]) { kill_buddy(argv[7],atoi(argv[8])); amok_bw_saturate_start(argv[1],atoi(argv[2]),argv[3],atoi(argv[4]), - sat_size*5,5); + sat_size,5); gras_os_sleep(3); TRY { amok_bw_saturate_stop(argv[1],atoi(argv[2]),NULL,NULL); @@ -140,10 +146,129 @@ static void simple_saturation(int argc, char*argv[]) { kill_buddy(argv[1],atoi(argv[2])); kill_buddy(argv[3],atoi(argv[4])); } +/********************************************************************************************/ +void env_hosttohost_bw(int argc, char*argv[]) { + xbt_ex_t e; -static void full_fledged_saturation(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; + + /* socket to sensor */ + gras_socket_t peer; + maestro_data_t g; + g=gras_userdata_new(s_maestro_data_t); + + /* 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; iname=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); + + gras_socket_close(g->sock); + +} +/********************************************************************************************/ +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; + maestro_data_t g; + g=gras_userdata_new(s_maestro_data_t); + + /* 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; iname=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); + + gras_socket_close(g->sock); + +} +/********************************************************************************************/ +static void full_fledged_saturation(int argc, char*argv[]) { + xbt_ex_t e; +//unsigned int time1=5,bw1=5; +double time1=5.0,bw1=5.0; // 0.5 for test /* timers */ double begin_simulated; int begin; @@ -176,7 +301,7 @@ static void full_fledged_saturation(int argc, char*argv[]) { bw=amok_bw_matrix(hosts,buf_size,exp_size,msg_size); - INFO2("Did all BW tests in %ld sec (%.2f simulated sec)", + INFO2("Did all BW tests in %d sec (%.2f simulated sec)", time(NULL)-begin,gras_os_time()-begin_simulated); /* Do the test with saturation */ @@ -184,11 +309,11 @@ static void full_fledged_saturation(int argc, char*argv[]) { xbt_dynar_foreach(hosts,i,h1) { xbt_dynar_foreach(hosts,j,h2) { if (i==j) continue; - + TRY { amok_bw_saturate_start(h1->name,h1->port, h2->name,h2->port, - sat_size,120); + sat_size,120); } CATCH(e) { RETHROW0("Cannot ask hosts to saturate the link: %s"); } @@ -207,25 +332,23 @@ static void full_fledged_saturation(int argc, char*argv[]) { 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, - NULL,&(bw_sat[k*nb_hosts + l])); - + NULL,&(bw_sat[k*nb_hosts + l])); + ratio=bw_sat[k*nb_hosts + l] / bw[k*nb_hosts + l]; INFO8("SATURATED BW XP(%s %s // %s %s) => %f (%f vs %f)%s", h1->name,h2->name,h3->name,h4->name, ratio, bw[k*nb_hosts + l] , bw_sat[k*nb_hosts + l], - ratio < 0.7 ? " THERE IS SOME INTERFERENCE !!!": ""); } } - - amok_bw_saturate_stop(h1->name,h1->port, NULL,NULL); + amok_bw_saturate_stop(h1->name,h1->port,&time1,&bw1);// NULL,NULL); INFO2("Did an iteration on saturation pair in %ld sec (%.2f simulated sec)", time(NULL)-begin, gras_os_time()-begin_simulated); + INFO2("the duration of the experiment >>>>> %.3f sec (%.3f bandwidth)",time1,bw1); } } - free(bw_sat); free(bw); xbt_dynar_map(hosts,kill_buddy_dynar); @@ -238,9 +361,11 @@ int maestro(int argc,char *argv[]) { gras_init(&argc,argv); amok_bw_init(); +env_Pairwisehost_bw(argc,argv); +//env_hosttohost_bw(argc,argv); // simple_saturation(argc,argv); - full_fledged_saturation(argc, argv); + //full_fledged_saturation(argc, argv); gras_exit(); return 0;