X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ba3cfdd2528cc9e2d3d1f74533906f2152155ac5..5d449744bf13fe169eaee166e0cba7453d410b0d:/examples/amok/saturate/saturate.c diff --git a/examples/amok/saturate/saturate.c b/examples/amok/saturate/saturate.c index 37e95245f9..4f3a802be7 100644 --- a/examples/amok/saturate/saturate.c +++ b/examples/amok/saturate/saturate.c @@ -12,8 +12,10 @@ #include #include +#include "xbt/peer.h" #include "gras.h" #include "amok/bandwidth.h" +#include "amok/peermanagement.h" XBT_LOG_NEW_DEFAULT_CATEGORY(saturate,"Messages specific to this example"); @@ -21,49 +23,27 @@ 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_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; } @@ -77,9 +57,10 @@ 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; static double XP(const char *bw1, const char *bw2, const char *sat1, const char *sat2) { @@ -89,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,&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)); @@ -99,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,&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); @@ -116,16 +97,16 @@ 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) { - 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); } @@ -133,220 +114,143 @@ 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])); - - amok_bw_saturate_start(argv[1],atoi(argv[2]),argv[3],atoi(argv[4]), - sat_size,5); - gras_os_sleep(3); - TRY { - amok_bw_saturate_stop(argv[1],atoi(argv[2]),NULL,NULL); - } CATCH(e) { - xbt_ex_free(e); - } - - - kill_buddy(argv[1],atoi(argv[2])); - 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; - + xbt_dynar_t peers; + xbt_peer_t h1,h2; /* 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; iname=strdup(argv[i]); - host->port=atoi(argv[i+1]); - INFO2("New sensor: %s:%d",host->name,host->port); - xbt_dynar_push(hosts,&host); + double duration,bw; + + /* 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); } - 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", + + /* 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, - 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; 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); + h2->name,h2->port); - 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_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 { + 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); } - amok_bw_saturate_stop(h1->name,h1->port,NULL,NULL); -} - xbt_dynar_map(hosts,kill_buddy_dynar); - xbt_dynar_free(&hosts); - + 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 = xbt_dynar_new(sizeof(xbt_host_t),&free_host); - int nb_hosts; + xbt_dynar_t peers; + int nb_peers; /* results */ double *bw; double *bw_sat; /* iterators */ - int i,j,k,l; - xbt_host_t h1,h2,h3,h4; - - /* Get the sensor location from argc/argv */ - for (i=1; iname,host->port); - xbt_dynar_push(hosts,&host); - } - nb_hosts = xbt_dynar_length(hosts); + unsigned int i,j,k,l; + xbt_peer_t h1,h2,h3,h4; + + /* 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); - 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(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); + INFO2("Did all BW tests in %ld sec (%.2f simulated(?) sec)", + (long int) (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, 0/* no timeout */); + 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])); + buf_size,msg_size,msg_amount,min_duration, + 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); + (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); - xbt_dynar_map(hosts,kill_buddy_dynar); - xbt_dynar_free(&hosts); + /* Game is over, friends */ + amok_pm_group_shutdown ("saturate"); } @@ -354,14 +258,12 @@ int maestro(int argc,char *argv[]) { gras_init(&argc,argv); amok_bw_init(); + amok_pm_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); + simple_saturation(argc,argv); + //full_fledged_saturation(argc, argv); gras_exit(); return 0;