X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/900c977019a54d76dee6bdb6a5dd38336f698c18..b996512c84c87b3e01e10859e2e9e5556e51fee2:/examples/amok/saturate/saturate.c diff --git a/examples/amok/saturate/saturate.c b/examples/amok/saturate/saturate.c index 833d55867d..6146e0d77e 100644 --- a/examples/amok/saturate/saturate.c +++ b/examples/amok/saturate/saturate.c @@ -14,6 +14,7 @@ #include "gras.h" #include "amok/bandwidth.h" +#include "amok/peermanagement.h" XBT_LOG_NEW_DEFAULT_CATEGORY(saturate,"Messages specific to this example"); @@ -21,27 +22,28 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(saturate,"Messages specific to this example"); * Sensor code * **********************************************************************/ -/* Global private data */ -typedef struct { - gras_socket_t sock; -} sensor_data_t; - /* Function prototypes */ int sensor (int argc,char *argv[]); int sensor (int argc,char *argv[]) { - sensor_data_t *g; + 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(4000); - - while (1) { - gras_msg_handle(60.0); - } - + amok_pm_init(); + + mysock = gras_socket_server_range(3000,9999,0,0); + INFO1("Sensor starting (on port %d)",gras_os_myport()); + gras_os_sleep(2); /* let the master get ready */ + master = gras_socket_client_from_string(argv[1]); + + amok_pm_group_join(master,"saturate"); + amok_pm_mainloop(600); + + gras_socket_close(mysock); + gras_socket_close(master); + gras_exit(); return 0; } @@ -52,18 +54,22 @@ int sensor (int argc,char *argv[]) { /* Function prototypes */ int maestro (int argc,char *argv[]); +/* XP setups */ +const int buf_size = 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) { - int buf_size=32 * 1024; - int exp_size=64 * 1024; - int msg_size=64 * 1024; - int sat_size=msg_size * 10; double sec, bw, sec_sat,bw_sat; + 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)); @@ -73,7 +79,7 @@ static double XP(const char *bw1, const char *bw2, 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); @@ -88,26 +94,69 @@ static double XP(const char *bw1, const char *bw2, return bw_sat/bw; } -static void free_host(void *d){ - xbt_host_t h=*(xbt_host_t*)d; +static void kill_buddy(char *name,int port){ + gras_socket_t sock=gras_socket_client(name,port); + gras_msg_send(sock,gras_msgtype_by_name("kill"),NULL); + gras_socket_close(sock); +} +static void kill_buddy_dynar(void *b) { + xbt_peer_t buddy=*(xbt_peer_t*)b; + kill_buddy(buddy->name,buddy->port); +} + +static void free_peer(void *d){ + xbt_peer_t h=*(xbt_peer_t*)d; free(h->name); free(h); } -int maestro(int argc,char *argv[]) { + +static void simple_saturation(int argc, char*argv[]) { xbt_ex_t e; - /* XP setups */ - int buf_size=0; - int exp_size= 1024 * 1024; - int msg_size=exp_size; - int sat_size=msg_size * 100; + /* where are the sensors */ + xbt_dynar_t peers; + xbt_peer_t h1,h2; + /* results */ + double duration,bw; + + /* Init the group */ + peers=amok_pm_group_new("saturate"); + /* wait for dudes */ + gras_msg_handleall(5); + + /* get 2 friends */ + xbt_dynar_get_cpy(peers,0,&h1); + xbt_dynar_get_cpy(peers,1,&h2); + + /* Start saturation */ + amok_bw_saturate_start(h1->name,h1->port, + h2->name,h2->port, + 0, /* Be a nice boy, compute msg_size yourself */ + 30 /* 5 sec timeout */); + + /* Stop it after a while */ + gras_os_sleep(1); + TRY { + amok_bw_saturate_stop(h1->name,h1->port, &duration,&bw); + } CATCH(e) { + xbt_ex_free(e); + } + INFO2("Saturation took %.2fsec, achieving %fb/s",duration,bw); + + /* Game is over, friends */ + amok_pm_group_shutdown ("saturate"); +} +/********************************************************************************************/ +static void full_fledged_saturation(int argc, char*argv[]) { + xbt_ex_t e; + double time1=5.0,bw1=5.0; // 0.5 for test /* timers */ double begin_simulated; int begin; /* where are the sensors */ - xbt_dynar_t hosts = xbt_dynar_new(sizeof(xbt_host_t),&free_host); - int nb_hosts; + xbt_dynar_t peers; + int nb_peers; /* results */ double *bw; @@ -115,120 +164,93 @@ int maestro(int argc,char *argv[]) { /* iterators */ int i,j,k,l; - xbt_host_t h1,h2,h3,h4; + xbt_peer_t h1,h2,h3,h4; - gras_init(&argc,argv); - amok_bw_init(); + /* Init the group */ + peers=amok_pm_group_new("saturate"); + /* wait 4 dudes */ + gras_msg_handle(60); + gras_msg_handle(60); + gras_msg_handle(60); + gras_msg_handle(60); + nb_peers = xbt_dynar_length(peers); - /* 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("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(peers,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 */ - bw_sat=xbt_new(double,nb_hosts*nb_hosts); - xbt_dynar_foreach(hosts,i,h1) { - xbt_dynar_foreach(hosts,j,h2) { + bw_sat=xbt_new(double,nb_peers*nb_peers); + xbt_dynar_foreach(peers,i,h1) { + xbt_dynar_foreach(peers,j,h2) { if (i==j) continue; - + TRY { amok_bw_saturate_start(h1->name,h1->port, h2->name,h2->port, - sat_size,360000000); + 0, /* Be nice, compute msg_size yourself */ + 0 /* no timeout */); } CATCH(e) { - RETHROW0("Cannot ask hosts to saturate the link: %s"); + RETHROW0("Cannot ask peers to saturate the link: %s"); } - gras_os_sleep(1.0); + gras_os_sleep(5); begin=time(NULL); begin_simulated=gras_os_time(); - xbt_dynar_foreach(hosts,k,h3) { + xbt_dynar_foreach(peers,k,h3) { if (i==k || j==k) continue; - xbt_dynar_foreach(hosts,l,h4) { + xbt_dynar_foreach(peers,l,h4) { double ratio; if (i==l || j==l || k==l) continue; + 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, - NULL,&(bw_sat[k*nb_hosts + l])); - - ratio=bw_sat[k*nb_hosts + l] / bw[k*nb_hosts + l]; + buf_size,exp_size,msg_size,min_duration, + NULL,&(bw_sat[k*nb_peers + l])); + + ratio=bw_sat[k*nb_peers + l] / bw[k*nb_peers + 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], - + bw[k*nb_peers + l] , bw_sat[k*nb_peers + 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); 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); + /* Game is over, friends */ + amok_pm_group_shutdown ("saturate"); +} - gras_os_sleep(5.0); - exit(0); -#if 0 - return 0; - /* start saturation */ - fprintf(stderr,"MAESTRO: Start saturation with size %d",msg_size); - if ((errcode=grasbw_saturate_start(argv[5],atoi(argv[6]),argv[7],atoi(argv[8]),msg_size*10,60))) { - fprintf(stderr,"MAESTRO: Error %s encountered while starting saturation", - xbt_error_name(errcode)); - return 1; - } - fprintf(stderr,"MAESTRO: Saturation started"); - gras_os_sleep(5.0); - - /* test with saturation */ - if ((errcode=grasbw_request(argv[1],atoi(argv[2]),argv[3],atoi(argv[4]), - buf_size,exp_size,msg_size,&sec,&bw))) { - fprintf(stderr,"MAESTRO: Error %s encountered while doing the test",xbt_error_name(errcode)); - return 1; - } - - fprintf(stderr,"MAESTRO: Experience3 (%d ko in msgs of %d ko with saturation) took %f sec, achieving %f Mb/s", - exp_size/1024,msg_size/1024, - sec,bw); - - /* stop saturation */ - if ((errcode=grasbw_saturate_stop(argv[5],atoi(argv[6]),argv[7],atoi(argv[8])))) { - fprintf(stderr,"MAESTRO: Error %s encountered while stopping saturation", - xbt_error_name(errcode)); - return 1; - } - /* test without saturation */ - if ((errcode=grasbw_request(argv[1],atoi(argv[2]),argv[3],atoi(argv[4]), - buf_size,exp_size,msg_size,&sec,&bw))) { - fprintf(stderr,"MAESTRO: Error %s encountered while doing the test",xbt_error_name(errcode)); - return 1; - } - - fprintf(stderr,"MAESTRO: Experience4 (%d ko in msgs of %d ko, without saturation) took %f sec, achieving %f Mb/s", - exp_size/1024,msg_size/1024, - sec,bw); +int maestro(int argc,char *argv[]) { - gras_os_sleep(5.0); -#endif - + gras_init(&argc,argv); + amok_bw_init(); + amok_pm_init(); + + gras_socket_server(atoi(argv[1])); + + simple_saturation(argc,argv); + //full_fledged_saturation(argc, argv); + + gras_exit(); return 0; + }