/* 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. */
#include "amok/Bandwidth/bandwidth_private.h"
#include "gras/messages.h"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(bw,amok,"Bandwidth testing");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(amok_bw,amok,"Bandwidth testing");
+
+
+/******************************
+ * Stuff global to the module *
+ ******************************/
static short _amok_bw_initialized = 0;
/** @brief module initialization; all participating nodes must run this */
void amok_bw_init(void) {
- gras_datadesc_type_t bw_request_desc, bw_res_desc, sat_request_desc;
amok_base_init();
if (! _amok_bw_initialized) {
-
- /* Build the 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"));
- gras_datadesc_struct_append(bw_request_desc,"buf_size",
- gras_datadesc_by_name("unsigned long int"));
- gras_datadesc_struct_append(bw_request_desc,"exp_size",
- gras_datadesc_by_name("unsigned long int"));
- gras_datadesc_struct_append(bw_request_desc,"msg_size",
- gras_datadesc_by_name("unsigned long int"));
- gras_datadesc_struct_close(bw_request_desc);
- bw_request_desc = gras_datadesc_ref("bw_request_t",bw_request_desc);
-
- bw_res_desc = gras_datadesc_struct("s_bw_res_t");
- gras_datadesc_struct_append(bw_res_desc,"timestamp",gras_datadesc_by_name("unsigned int"));
- gras_datadesc_struct_append(bw_res_desc,"seconds",gras_datadesc_by_name("double"));
- gras_datadesc_struct_append(bw_res_desc,"bw",gras_datadesc_by_name("double"));
- gras_datadesc_struct_close(bw_res_desc);
- bw_res_desc = gras_datadesc_ref("bw_res_t",bw_res_desc);
-
- 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"));
- gras_datadesc_struct_append(sat_request_desc,"timeout",gras_datadesc_by_name("unsigned int"));
- 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);
- gras_msgtype_declare("SAT begin", sat_request_desc);
- gras_msgtype_declare("SAT begun", NULL);
- gras_msgtype_declare("SAT end", NULL);
- gras_msgtype_declare("SAT ended", NULL);
- gras_msgtype_declare("SAT stop", NULL);
- gras_msgtype_declare("SAT stopped", NULL);
+ amok_bw_bw_init();
+ amok_bw_sat_init();
}
- /* Register the callbacks */
- gras_cb_register(gras_msgtype_by_name("BW request"),
- &amok_bw_cb_bw_request);
- gras_cb_register(gras_msgtype_by_name("BW handshake"),
- &amok_bw_cb_bw_handshake);
+ amok_bw_bw_join();
+ amok_bw_sat_join();
- gras_cb_register(gras_msgtype_by_name("SAT start"),
- &amok_bw_cb_sat_start);
- gras_cb_register(gras_msgtype_by_name("SAT begin"),
- &amok_bw_cb_sat_begin);
-
- _amok_bw_initialized =1;
+ _amok_bw_initialized++;
}
/** @brief module finalization */
if (! _amok_bw_initialized)
return;
- gras_cb_unregister(gras_msgtype_by_name("BW request"),
- &amok_bw_cb_bw_request);
- gras_cb_unregister(gras_msgtype_by_name("BW handshake"),
- &amok_bw_cb_bw_handshake);
+ amok_bw_bw_leave();
+ amok_bw_sat_leave();
- gras_cb_unregister(gras_msgtype_by_name("SAT start"),
- &amok_bw_cb_sat_start);
- gras_cb_unregister(gras_msgtype_by_name("SAT begin"),
- &amok_bw_cb_sat_begin);
-
- _amok_bw_initialized = 0;
+ _amok_bw_initialized--;
}
/* ***************************************************************************
* Bandwidth tests
* ***************************************************************************/
+static int amok_bw_cb_bw_handshake(gras_msg_cb_ctx_t ctx, void *payload);
+static int amok_bw_cb_bw_request(gras_msg_cb_ctx_t ctx, void *payload);
+
+void amok_bw_bw_init() {
+ gras_datadesc_type_t bw_request_desc, bw_res_desc;
+
+ /* 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("s_xbt_host_t"));
+ gras_datadesc_struct_append(bw_request_desc,"buf_size",
+ gras_datadesc_by_name("unsigned long int"));
+ gras_datadesc_struct_append(bw_request_desc,"exp_size",
+ gras_datadesc_by_name("unsigned long int"));
+ gras_datadesc_struct_append(bw_request_desc,"msg_size",
+ gras_datadesc_by_name("unsigned long int"));
+ gras_datadesc_struct_close(bw_request_desc);
+ bw_request_desc = gras_datadesc_ref("bw_request_t",bw_request_desc);
+
+ bw_res_desc = gras_datadesc_struct("s_bw_res_t");
+ gras_datadesc_struct_append(bw_res_desc,"timestamp",gras_datadesc_by_name("unsigned int"));
+ gras_datadesc_struct_append(bw_res_desc,"seconds",gras_datadesc_by_name("double"));
+ gras_datadesc_struct_append(bw_res_desc,"bw",gras_datadesc_by_name("double"));
+ 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);
+}
+void amok_bw_bw_join() {
+ gras_cb_register(gras_msgtype_by_name("BW request"),
+ &amok_bw_cb_bw_request);
+ gras_cb_register(gras_msgtype_by_name("BW handshake"),
+ &amok_bw_cb_bw_handshake);
+}
+void amok_bw_bw_leave() {
+ gras_cb_unregister(gras_msgtype_by_name("BW request"),
+ &amok_bw_cb_bw_request);
+ gras_cb_unregister(gras_msgtype_by_name("BW handshake"),
+ &amok_bw_cb_bw_handshake);
+}
/**
* \brief bandwidth measurement between localhost and \e peer
*
* \arg peer: A (regular) socket at which the the host with which we should conduct the experiment can be contacted
- * \arg buf_size: Size of the socket buffer
+ * \arg buf_size: Size of the socket buffer. If 0, a sain default is used (32k, but may change)
* \arg exp_size: Total size of data sent across the network
* \arg msg_size: Size of each message sent. Ie, (\e expSize % \e msgSize) messages will be sent.
* \arg sec: where the result (in seconds) should be stored.
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),
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;
/* Build our answer */
answer = xbt_new0(s_bw_request_t,1);
- for (port = 6000; port < 10000 && measMasterIn == NULL; port++) {
+ for (port = 6000; port <= 10000 && measMasterIn == NULL; port++) {
TRY {
measMasterIn = gras_socket_server_ext(port,request->buf_size,1);
} CATCH(e) {
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),
/* 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",
* \arg to_port: port on which the second process is listening (for messages, do not
* give a measurement socket here. The needed measurement sockets will be created
* automatically and negociated between the peers)
- * \arg buf_size: Size of the socket buffer
+ * \arg buf_size: Size of the socket buffer. If 0, a sain default is used (32k, but may change)
* \arg exp_size: Total size of data sent across the network
* \arg msg_size: Size of each message sent. (\e expSize % \e msgSize) messages will be sent.
* \arg sec: where the result (in seconds) should be stored.
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;
+ if (sec)
+ *sec=result->sec;
+ if (bw)
+ *bw =result->bw;
VERB6("BW test between %s:%d and %s:%d took %f sec, achieving %f kb/s",
from_name,from_port, to_name,to_port,
- *sec,*bw);
+ *sec,((double)*bw)/1024.0);
gras_socket_close(sock);
free(result);
+ free(request);
}
-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 */
bw_request_t request = *(bw_request_t*)payload;
- bw_res_t result = xbt_new0(s_bw_res,1);
+ bw_res_t result = xbt_new0(s_bw_res_t,1);
gras_socket_t peer;
peer = gras_socket_client(request->host.name,request->host.port);
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);
+ free(request->host.name);
free(request);
free(result);
return 1;
}
-int amok_bw_cb_sat_start(gras_socket_t expeditor,
- void *payload) {
- CRITICAL0("amok_bw_cb_sat_start; not implemented");
- return 1;
-}
-int amok_bw_cb_sat_begin(gras_socket_t expeditor,
- 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 */
+
+
+ int i,j,len=xbt_dynar_length(hosts);
+
+ double *matrix_res = xbt_new0(double, len*len);
+ xbt_host_t h1,h2;
+
+ xbt_dynar_foreach (hosts,i,h1) {
+ 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_res[i*len + j]);
+ }
+ }
+ }
+ return matrix_res;
}