X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b511b8e4a7d720584d9d9a72b874709869bc10d0..5d449744bf13fe169eaee166e0cba7453d410b0d:/examples/amok/saturate/saturate.c diff --git a/examples/amok/saturate/saturate.c b/examples/amok/saturate/saturate.c index 108e595052..4f3a802be7 100644 --- a/examples/amok/saturate/saturate.c +++ b/examples/amok/saturate/saturate.c @@ -12,6 +12,7 @@ #include #include +#include "xbt/peer.h" #include "gras.h" #include "amok/bandwidth.h" #include "amok/peermanagement.h" @@ -31,15 +32,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); @@ -56,8 +57,8 @@ 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 msg_amount = 2; const int sat_size = 1024 * 1024 * 10; const double min_duration = 1; @@ -69,7 +70,7 @@ static double XP(const char *bw1, const char *bw2, 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,min_duration,&sec,&bw); + buf_size,msg_size,msg_amount,min_duration,&sec,&bw); INFO4("BW(%s,%s) => %f sec, achieving %f Mb/s", bw1, bw2, sec, (bw/1024.0/1024.0)); @@ -79,7 +80,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,min_duration,&sec_sat,&bw_sat); + buf_size,msg_size,msg_amount,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); @@ -96,7 +97,7 @@ static double XP(const char *bw1, const char *bw2, 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_msg_send(sock,"kill",NULL); gras_socket_close(sock); } static void kill_buddy_dynar(void *b) { @@ -113,26 +114,56 @@ static void free_peer(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); + + /* Stop all sensors but two of them */ + while (xbt_dynar_length(peers) > 2) { + xbt_dynar_pop(peers,&h1); + amok_pm_kill_hp(h1->name,h1->port); + xbt_peer_free(h1); + } + + /* get 2 friends */ + xbt_dynar_get_cpy(peers,0,&h1); + xbt_dynar_get_cpy(peers,1,&h2); + + /* Start saturation */ + INFO4("Start saturation between %s:%d and %s:%d", + h1->name,h1->port, + h2->name,h2->port); + + 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 */ + INFO0("Have a rest"); + gras_os_sleep(1); TRY { - amok_bw_saturate_stop(argv[1],atoi(argv[2]),NULL,NULL); + INFO0("Stop the saturation"); + amok_bw_saturate_stop(h1->name,h1->port, &duration,&bw); } CATCH(e) { + INFO0("Ooops, stoping the saturation raised an exception"); 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; @@ -147,11 +178,11 @@ static void full_fledged_saturation(int argc, char*argv[]) { double *bw_sat; /* iterators */ - int i,j,k,l; + unsigned int i,j,k,l; xbt_peer_t h1,h2,h3,h4; /* Init the group */ - peers=amok_hm_group_new("saturate"); + peers=amok_pm_group_new("saturate"); /* wait 4 dudes */ gras_msg_handle(60); gras_msg_handle(60); @@ -165,10 +196,10 @@ static void full_fledged_saturation(int argc, char*argv[]) { begin=time(NULL); begin_simulated=gras_os_time(); - bw=amok_bw_matrix(peers,buf_size,exp_size,msg_size,min_duration); + bw=amok_bw_matrix(peers,buf_size,msg_size,msg_amount,min_duration); INFO2("Did all BW tests in %ld sec (%.2f simulated(?) sec)", - time(NULL)-begin,gras_os_time()-begin_simulated); + (long int) (time(NULL)-begin),gras_os_time()-begin_simulated); /* Do the test with saturation */ bw_sat=xbt_new(double,nb_peers*nb_peers); @@ -198,7 +229,7 @@ static void full_fledged_saturation(int argc, char*argv[]) { 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,min_duration, + buf_size,msg_size,msg_amount,min_duration, NULL,&(bw_sat[k*nb_peers + l])); ratio=bw_sat[k*nb_peers + l] / bw[k*nb_peers + l]; @@ -209,17 +240,17 @@ static void full_fledged_saturation(int argc, char*argv[]) { 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); + (long int) (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_hm_group_shutdown ("saturate"); + amok_pm_group_shutdown ("saturate"); } @@ -227,12 +258,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;