X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/12ae49296d24d861c54ec09f030827487a179b8c..b996512c84c87b3e01e10859e2e9e5556e51fee2:/examples/amok/saturate/saturate.c diff --git a/examples/amok/saturate/saturate.c b/examples/amok/saturate/saturate.c index ca62e93b29..6146e0d77e 100644 --- a/examples/amok/saturate/saturate.c +++ b/examples/amok/saturate/saturate.c @@ -14,7 +14,7 @@ #include "gras.h" #include "amok/bandwidth.h" -#include "amok/hostmanagement.h" +#include "amok/peermanagement.h" XBT_LOG_NEW_DEFAULT_CATEGORY(saturate,"Messages specific to this example"); @@ -31,15 +31,15 @@ int sensor (int argc,char *argv[]) { gras_init(&argc, argv); amok_bw_init(); - amok_hm_init(); + 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_hm_group_join(master,"saturate"); - amok_hm_mainloop(600); + amok_pm_group_join(master,"saturate"); + amok_pm_mainloop(600); gras_socket_close(mysock); gras_socket_close(master); @@ -100,12 +100,12 @@ static void kill_buddy(char *name,int port){ gras_socket_close(sock); } static void kill_buddy_dynar(void *b) { - xbt_host_t buddy=*(xbt_host_t*)b; + xbt_peer_t buddy=*(xbt_peer_t*)b; kill_buddy(buddy->name,buddy->port); } -static void free_host(void *d){ - xbt_host_t h=*(xbt_host_t*)d; +static void free_peer(void *d){ + xbt_peer_t h=*(xbt_peer_t*)d; free(h->name); free(h); } @@ -113,34 +113,50 @@ static void free_host(void *d){ static void simple_saturation(int argc, char*argv[]) { xbt_ex_t e; - kill_buddy(argv[5],atoi(argv[6])); - kill_buddy(argv[7],atoi(argv[8])); + /* where are the sensors */ + xbt_dynar_t peers; + xbt_peer_t h1,h2; + /* results */ + double duration,bw; - amok_bw_saturate_start(argv[1],atoi(argv[2]),argv[3],atoi(argv[4]), - sat_size,5); - gras_os_sleep(3); + /* 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(argv[1],atoi(argv[2]),NULL,NULL); + amok_bw_saturate_stop(h1->name,h1->port, &duration,&bw); } CATCH(e) { xbt_ex_free(e); } - - - kill_buddy(argv[1],atoi(argv[2])); - kill_buddy(argv[3],atoi(argv[4])); + 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; -//unsigned int time1=5,bw1=5; 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; - int nb_hosts; + xbt_dynar_t peers; + int nb_peers; /* results */ double *bw; @@ -148,16 +164,16 @@ static void full_fledged_saturation(int argc, char*argv[]) { /* iterators */ int i,j,k,l; - xbt_host_t h1,h2,h3,h4; + xbt_peer_t h1,h2,h3,h4; /* Init the group */ - hosts=amok_hm_group_new("saturate"); + 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_hosts = xbt_dynar_length(hosts); + nb_peers = xbt_dynar_length(peers); INFO0("Let's go for the bw_matrix"); @@ -165,15 +181,15 @@ static void full_fledged_saturation(int argc, char*argv[]) { begin=time(NULL); begin_simulated=gras_os_time(); - bw=amok_bw_matrix(hosts,buf_size,exp_size,msg_size,min_duration); + bw=amok_bw_matrix(peers,buf_size,exp_size,msg_size,min_duration); 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 { @@ -182,16 +198,16 @@ static void full_fledged_saturation(int argc, char*argv[]) { 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(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; @@ -199,17 +215,17 @@ 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,min_duration, - NULL,&(bw_sat[k*nb_hosts + l])); + NULL,&(bw_sat[k*nb_peers + l])); - ratio=bw_sat[k*nb_hosts + l] / bw[k*nb_hosts + 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,&time1,&bw1);// 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); @@ -219,7 +235,7 @@ static void full_fledged_saturation(int argc, char*argv[]) { free(bw_sat); free(bw); /* Game is over, friends */ - amok_hm_group_shutdown ("saturate"); + amok_pm_group_shutdown ("saturate"); } @@ -227,12 +243,12 @@ int maestro(int argc,char *argv[]) { gras_init(&argc,argv); amok_bw_init(); - amok_hm_init(); + amok_pm_init(); gras_socket_server(atoi(argv[1])); - // simple_saturation(argc,argv); - full_fledged_saturation(argc, argv); + simple_saturation(argc,argv); + //full_fledged_saturation(argc, argv); gras_exit(); return 0;