X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/edde8f7fbc1b74a81551bf9eb7bac1935b999296..53cde8dfb94134348e908b3c2845200ffc582dc7:/src/amok/Bandwidth/saturate.c diff --git a/src/amok/Bandwidth/saturate.c b/src/amok/Bandwidth/saturate.c index 0f61258d14..fc374dd756 100644 --- a/src/amok/Bandwidth/saturate.c +++ b/src/amok/Bandwidth/saturate.c @@ -19,19 +19,19 @@ static int amok_bw_cb_sat_begin(gras_msg_cb_ctx_t ctx, void *payload); void amok_bw_sat_init(void) { - gras_datadesc_type_t bw_res_desc = gras_datadesc_by_name("bw_res_t"); - gras_datadesc_type_t sat_request_desc; + xbt_datadesc_type_t bw_res_desc = xbt_datadesc_by_name("bw_res_t"); + xbt_datadesc_type_t sat_request_desc; /* Build the saturation datatype descriptions */ - sat_request_desc = gras_datadesc_struct("s_sat_request_desc_t"); - gras_datadesc_struct_append(sat_request_desc, "peer", - gras_datadesc_by_name("s_xbt_peer_t")); - gras_datadesc_struct_append(sat_request_desc, "msg_size", - gras_datadesc_by_name("unsigned int")); - gras_datadesc_struct_append(sat_request_desc, "duration", - 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); + sat_request_desc = xbt_datadesc_struct("s_sat_request_desc_t"); + xbt_datadesc_struct_append(sat_request_desc, "peer", + xbt_datadesc_by_name("s_xbt_peer_t")); + xbt_datadesc_struct_append(sat_request_desc, "msg_size", + xbt_datadesc_by_name("unsigned int")); + xbt_datadesc_struct_append(sat_request_desc, "duration", + xbt_datadesc_by_name("unsigned int")); + xbt_datadesc_struct_close(sat_request_desc); + sat_request_desc = xbt_datadesc_ref("sat_request_t", sat_request_desc); /* Register the saturation messages */ gras_msgtype_declare_rpc("amok_bw_sat start", sat_request_desc, NULL); @@ -76,10 +76,10 @@ void amok_bw_saturate_start(const char *from_name, unsigned int from_port, const char *to_name, unsigned int to_port, unsigned int msg_size, double duration) { - gras_socket_t sock; + xbt_socket_t sock; sat_request_t request = xbt_new(s_sat_request_t, 1); - XBT_VERB("Start from_name %s:%d -> to_name %s:%d", + XBT_VERB("Start from_name %s:%u -> to_name %s:%u", from_name, from_port, to_name, to_port); sock = gras_socket_client(from_name, from_port); @@ -99,10 +99,10 @@ void amok_bw_saturate_start(const char *from_name, unsigned int from_port, static int amok_bw_cb_sat_start(gras_msg_cb_ctx_t ctx, void *payload) { sat_request_t request = *(sat_request_t *) payload; - gras_socket_t expeditor = gras_msg_cb_ctx_from(ctx); + xbt_socket_t expeditor = gras_msg_cb_ctx_from(ctx); XBT_VERB("Asked by %s:%d to start a saturation to %s:%d", - gras_socket_peer_name(expeditor), gras_socket_peer_port(expeditor), + xbt_socket_peer_name(expeditor), xbt_socket_peer_port(expeditor), request->peer.name, request->peer.port); gras_msg_rpcreturn(60, ctx, NULL); @@ -135,10 +135,10 @@ void amok_bw_saturate_begin(const char *to_name, unsigned int to_port, xbt_ex_t e; - gras_socket_t peer_cmd = gras_socket_client(to_name, to_port); + xbt_socket_t peer_cmd = gras_socket_client(to_name, to_port); gras_msg_cb_ctx_t ctx; - gras_socket_t meas; + xbt_socket_t meas; s_gras_msg_t msg_got; @@ -151,7 +151,7 @@ void amok_bw_saturate_begin(const char *to_name, unsigned int to_port, /* Negociate the saturation with the peer */ sat_request_t request = xbt_new(s_sat_request_t, 1); - XBT_DEBUG("Begin to saturate to %s:%d", to_name, to_port); + XBT_DEBUG("Begin to saturate to %s:%u", to_name, to_port); memset(&msg_got, 0, sizeof(msg_got)); request->msg_size = msg_size; @@ -170,7 +170,7 @@ void amok_bw_saturate_begin(const char *to_name, unsigned int to_port, 1, /* at least one sec */ &sec, &bw); msg_size = request->msg_size = (int) bw; - XBT_DEBUG("Saturate with packets of %d bytes", request->msg_size); + XBT_DEBUG("Saturate with packets of %u bytes", request->msg_size); } /* Launch the saturation */ @@ -186,7 +186,7 @@ void amok_bw_saturate_begin(const char *to_name, unsigned int to_port, free(request); gras_socket_close(peer_cmd); - XBT_INFO("Saturation(%s:%d->%s:%d) started", gras_os_myname(), + XBT_INFO("Saturation(%s:%d->%s:%u) started", gras_os_myname(), gras_os_myport(), to_name, to_port); /* Start experiment */ @@ -194,7 +194,7 @@ void amok_bw_saturate_begin(const char *to_name, unsigned int to_port, do { /* do send it */ - gras_socket_meas_send(meas, 120, msg_size, 1); + xbt_socket_meas_send(meas, 120, msg_size, 1); packet_sent++; /* Check whether someone asked us to stop saturation */ @@ -215,7 +215,7 @@ void amok_bw_saturate_begin(const char *to_name, unsigned int to_port, /* Check whether the experiment has to be terminated by now */ elapsed = gras_os_time() - start; - XBT_DEBUG("elapsed %f duration %f (msg_size=%d)", elapsed, duration, + XBT_DEBUG("elapsed %f duration %f (msg_size=%u)", elapsed, duration, msg_size); } while (saturate_further && (duration == 0 || elapsed < duration)); @@ -232,10 +232,10 @@ void amok_bw_saturate_begin(const char *to_name, unsigned int to_port, bw_res_t answer = xbt_new(s_bw_res_t, 1); s_gras_msg_cb_ctx_t ctx; - XBT_INFO("Saturation from %s:%d to %s:%d stopped by %s:%d", + XBT_INFO("Saturation from %s:%d to %s:%u stopped by %s:%d", gras_os_myname(), gras_os_myport(), to_name, to_port, - gras_socket_peer_name(msg_got.expe), - gras_socket_peer_port(msg_got.expe)); + xbt_socket_peer_name(msg_got.expe), + xbt_socket_peer_port(msg_got.expe)); answer->timestamp = gras_os_time(); answer->sec = elapsed; answer->bw = bw; @@ -248,7 +248,7 @@ void amok_bw_saturate_begin(const char *to_name, unsigned int to_port, free(answer); } else { XBT_INFO - ("Saturation from %s:%d to %s:%d elapsed after %f sec (achieving %f kb/s)", + ("Saturation from %s:%d to %s:%u elapsed after %f sec (achieving %f kb/s)", gras_os_myname(), gras_os_myport(), to_name, to_port, elapsed, bw / 1024.0); } @@ -263,8 +263,8 @@ static int amok_bw_cb_sat_begin(gras_msg_cb_ctx_t ctx, void *payload) sat_request_t answer = xbt_new0(s_sat_request_t, 1); volatile int saturate_further = 1; xbt_ex_t e; - volatile gras_socket_t measMaster = NULL, meas = NULL; - volatile gras_socket_t from = gras_msg_cb_ctx_from(ctx); + volatile xbt_socket_t measMaster = NULL, meas = NULL; + volatile xbt_socket_t from = gras_msg_cb_ctx_from(ctx); volatile int port = 6000; while (port <= 10000 && measMaster == NULL) { @@ -291,7 +291,7 @@ static int amok_bw_cb_sat_begin(gras_msg_cb_ctx_t ctx, void *payload) gras_os_sleep(5); /* Wait for the accept */ TRY { - meas = gras_socket_meas_accept(measMaster); + meas = xbt_socket_meas_accept(measMaster); XBT_DEBUG("saturation handshake answered"); } CATCH_ANONYMOUS { @@ -301,7 +301,7 @@ static int amok_bw_cb_sat_begin(gras_msg_cb_ctx_t ctx, void *payload) while (saturate_further) { TRY { - gras_socket_meas_recv(meas, 5, request->msg_size, 1); + xbt_socket_meas_recv(meas, 5, request->msg_size, 1); } CATCH(e) { saturate_further = 0; @@ -309,7 +309,7 @@ static int amok_bw_cb_sat_begin(gras_msg_cb_ctx_t ctx, void *payload) } } XBT_INFO("Saturation comming from %s:%d stopped on %s:%d", - gras_socket_peer_name(from), gras_socket_peer_port(from), + xbt_socket_peer_name(from), xbt_socket_peer_port(from), gras_os_myname(), gras_os_myport()); gras_socket_close(meas); @@ -330,14 +330,14 @@ static int amok_bw_cb_sat_begin(gras_msg_cb_ctx_t ctx, void *payload) void amok_bw_saturate_stop(const char *from_name, unsigned int from_port, /*out */ double *time, double *bw) { - gras_socket_t sock = gras_socket_client(from_name, from_port); + xbt_socket_t sock = gras_socket_client(from_name, from_port); bw_res_t answer; - XBT_VERB("Ask %s:%d to stop the saturation", from_name, from_port); + XBT_VERB("Ask %s:%u to stop the saturation", from_name, from_port); TRY { gras_msg_rpccall(sock, 60, "amok_bw_sat stop", NULL, &answer); } CATCH_ANONYMOUS { - RETHROWF("Cannot ask %s:%d to stop saturation: %s", from_name, from_port); + RETHROWF("Cannot ask %s:%u to stop saturation: %s", from_name, from_port); } gras_socket_close(sock); if (time)