X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/44de33fb61dd7f508d1a4043defb6c2be81d5fbd..f3ccc5f8981f5b1e258cab911a09679860b8cc7d:/src/amok/Bandwidth/bandwidth.c diff --git a/src/amok/Bandwidth/bandwidth.c b/src/amok/Bandwidth/bandwidth.c index 79ecf7d608..c9601a080a 100644 --- a/src/amok/Bandwidth/bandwidth.c +++ b/src/amok/Bandwidth/bandwidth.c @@ -2,7 +2,9 @@ /* amok_bandwidth - Bandwidth tests facilities */ -/* Copyright (c) 2003-5 Martin Quinson. All rights reserved. */ +/* Copyright (c) 2003-6 Martin Quinson. */ +/* Copyright (c) 2006 Ahmed Harbaoui. */ +/* All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -23,7 +25,7 @@ void amok_bw_init(void) { if (! _amok_bw_initialized) { - /* Build the datatype descriptions */ + /* Build the Bandwidth datatype descriptions */ bw_request_desc = gras_datadesc_struct("s_bw_request_t"); gras_datadesc_struct_append(bw_request_desc,"host", gras_datadesc_by_name("xbt_host_t")); @@ -43,6 +45,10 @@ void amok_bw_init(void) { gras_datadesc_struct_close(bw_res_desc); bw_res_desc = gras_datadesc_ref("bw_res_t",bw_res_desc); + gras_msgtype_declare_rpc("BW handshake",bw_request_desc,bw_request_desc); + gras_msgtype_declare_rpc("BW request", bw_request_desc,bw_res_desc); + + /* Build the saturation datatype descriptions */ sat_request_desc = gras_datadesc_struct("s_sat_request_desc_t"); gras_datadesc_struct_append(sat_request_desc,"host",gras_datadesc_by_name("xbt_host_t")); gras_datadesc_struct_append(sat_request_desc,"msg_size",gras_datadesc_by_name("unsigned int")); @@ -50,12 +56,6 @@ void amok_bw_init(void) { gras_datadesc_struct_close(sat_request_desc); sat_request_desc = gras_datadesc_ref("sat_request_t",sat_request_desc); - /* Register the bandwidth messages */ - gras_msgtype_declare("BW handshake", bw_request_desc); - gras_msgtype_declare("BW handshake ACK", bw_request_desc); - gras_msgtype_declare("BW request", bw_request_desc); - gras_msgtype_declare("BW result", bw_res_desc); - /* Register the saturation messages */ gras_msgtype_declare("SAT start", sat_request_desc); gras_msgtype_declare("SAT started", NULL); @@ -154,19 +154,12 @@ void amok_bw_test(gras_socket_t peer, buf_size,request->buf_size); TRY { - gras_msg_send(peer,gras_msgtype_by_name("BW handshake"),&request); + gras_msg_rpccall(peer,60, + gras_msgtype_by_name("BW handshake"),&request, &request_ack); } CATCH(e) { RETHROW0("Error encountered while sending the BW request: %s"); } measIn = gras_socket_meas_accept(measMasterIn); - - TRY { - gras_msg_wait(60,gras_msgtype_by_name("BW handshake ACK"),NULL,&request_ack); - } CATCH(e) { - RETHROW0("Error encountered while waiting for the answer to BW request: %s"); - } - - /* FIXME: What if there is a remote error? */ TRY { measOut=gras_socket_client_ext(gras_socket_peer_name(peer), @@ -209,8 +202,9 @@ void amok_bw_test(gras_socket_t peer, sizes are in byte */ -int amok_bw_cb_bw_handshake(gras_socket_t expeditor, +int amok_bw_cb_bw_handshake(gras_msg_cb_ctx_t ctx, void *payload) { + gras_socket_t expeditor = gras_msg_cb_ctx_from(ctx); gras_socket_t measMasterIn=NULL,measIn=NULL,measOut=NULL; bw_request_t request=*(bw_request_t*)payload; bw_request_t answer; @@ -242,6 +236,17 @@ int amok_bw_cb_bw_handshake(gras_socket_t expeditor, answer->msg_size=request->msg_size; answer->host.port=gras_socket_my_port(measMasterIn); + + + TRY { + gras_msg_rpcreturn(60,ctx,&answer); + } CATCH(e) { + gras_socket_close(measMasterIn); + /* FIXME: tell error to remote */ + RETHROW0("Error encountered while sending the answer: %s"); + } + + /* Don't connect asap to leave time to other side to enter the accept() */ TRY { measOut = gras_socket_client_ext(gras_socket_peer_name(expeditor), @@ -253,15 +258,6 @@ int amok_bw_cb_bw_handshake(gras_socket_t expeditor, /* FIXME: tell error to remote */ } - TRY { - gras_msg_send(expeditor, gras_msgtype_by_name("BW handshake ACK"), &answer); - } CATCH(e) { - gras_socket_close(measMasterIn); - gras_socket_close(measOut); - /* FIXME: tell error to remote */ - RETHROW0("Error encountered while sending the answer: %s"); - } - TRY { measIn = gras_socket_meas_accept(measMasterIn); DEBUG4("BW handshake answered. buf_size=%lu exp_size=%lu msg_size=%lu port=%d", @@ -328,10 +324,7 @@ void amok_bw_request(const char* from_name,unsigned int from_port, request->host.port = to_port; sock = gras_socket_client(from_name,from_port); - gras_msg_send(sock,gras_msgtype_by_name("BW request"),&request); - free(request); - - gras_msg_wait(240,gras_msgtype_by_name("BW result"),NULL, &result); + gras_msg_rpccall(sock,240,gras_msgtype_by_name("BW request"),&request, &result); *sec=result->sec; *bw =result->bw; @@ -344,7 +337,7 @@ void amok_bw_request(const char* from_name,unsigned int from_port, free(result); } -int amok_bw_cb_bw_request(gras_socket_t expeditor, +int amok_bw_cb_bw_request(gras_msg_cb_ctx_t ctx, void *payload) { /* specification of the test to run, and our answer */ @@ -357,7 +350,7 @@ int amok_bw_cb_bw_request(gras_socket_t expeditor, request->buf_size,request->exp_size,request->msg_size, &(result->sec),&(result->bw)); - gras_msg_send(expeditor,gras_msgtype_by_name("BW result"),&result); + gras_msg_rpcreturn(240,ctx,&result); gras_os_sleep(1); gras_socket_close(peer); @@ -367,13 +360,47 @@ int amok_bw_cb_bw_request(gras_socket_t expeditor, return 1; } -int amok_bw_cb_sat_start(gras_socket_t expeditor, +int amok_bw_cb_sat_start(gras_msg_cb_ctx_t ctx, void *payload) { CRITICAL0("amok_bw_cb_sat_start; not implemented"); return 1; } -int amok_bw_cb_sat_begin(gras_socket_t expeditor, +int amok_bw_cb_sat_begin(gras_msg_cb_ctx_t ctx, void *payload) { CRITICAL0("amok_bw_cb_sat_begin: not implemented"); return 1; } + +double * amok_bw_matrix(xbt_dynar_t hosts, + int buf_size_bw, int exp_size_bw, int msg_size_bw) { + double sec; + /* construct of matrixs for bandwith and Latency */ + + + double *matrix_bw; /* matrix bandwidth */ + int i,j,len=xbt_dynar_length(hosts); + + matrix_bw = (double *) malloc(sizeof(double)* len*len); + + xbt_host_t h1,h2; + + h1 = xbt_new(s_xbt_host_t,1); + h2 = xbt_new(s_xbt_host_t,1); + i=0; + xbt_dynar_foreach (hosts,i,h1) { + j=0; + xbt_dynar_foreach (hosts,j,h2) { + if(i!=j) { + /* Mesurements of Bandwidth */ + amok_bw_request(h1->name,h1->port,h2->name,h2->port, + buf_size_bw,exp_size_bw,msg_size_bw,&sec,&matrix_bw[i*len + j]); + } else { + matrix_bw[i*len +j] = 0.0; + } + + } + } + free(h1); + free(h2); + return matrix_bw; +}