From 461f88a18bb39f3966a1aa4579224fd241b8bc5d Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Fri, 29 Jul 2016 19:34:54 +0000 Subject: -dead code elimination --- src/ats-tests/ats-testing.c | 9 ++++----- src/ats-tests/ats-testing.h | 4 ---- src/ats-tests/gnunet-ats-sim.c | 42 ++++++++++++++++++++---------------------- src/ats-tests/perf_ats.c | 11 +---------- 4 files changed, 25 insertions(+), 41 deletions(-) (limited to 'src') diff --git a/src/ats-tests/ats-testing.c b/src/ats-tests/ats-testing.c index c894f4445..16956489d 100644 --- a/src/ats-tests/ats-testing.c +++ b/src/ats-tests/ats-testing.c @@ -841,7 +841,6 @@ GNUNET_ATS_TEST_get_partner (int src, int dest) * @param test_core connect to CORE service (GNUNET_YES) or transport (GNUNET_NO) * @param done_cb function to call when topology is setup * @param done_cb_cls cls for callback - * @param transport_recv_cb callback to call when data are received * @param log_request_cb callback to call when logging is required */ void @@ -851,7 +850,6 @@ GNUNET_ATS_TEST_create_topology (char *name, char *cfg_file, int test_core, GNUNET_ATS_TEST_TopologySetupDoneCallback done_cb, void *done_cb_cls, - GNUNET_TRANSPORT_ReceiveCallback transport_recv_cb, GNUNET_ATS_AddressInformationCallback log_request_cb) { static struct GNUNET_CORE_MessageHandler handlers[] = { @@ -866,11 +864,12 @@ GNUNET_ATS_TEST_create_topology (char *name, char *cfg_file, top->done_cb = done_cb; top->done_cb_cls = done_cb_cls; top->test_core = test_core; - top->transport_recv_cb = transport_recv_cb; top->ats_perf_cb = log_request_cb; - top->mps = GNUNET_malloc (num_masters * sizeof (struct BenchmarkPeer)); - top->sps = GNUNET_malloc (num_slaves * sizeof (struct BenchmarkPeer)); + top->mps = GNUNET_new_array (num_masters, + struct BenchmarkPeer); + top->sps = GNUNET_new_array (num_slaves, + struct BenchmarkPeer); /* Start topology */ uint64_t event_mask; diff --git a/src/ats-tests/ats-testing.h b/src/ats-tests/ats-testing.h index b2a4d13e6..b98988138 100644 --- a/src/ats-tests/ats-testing.h +++ b/src/ats-tests/ats-testing.h @@ -447,8 +447,6 @@ struct GNUNET_ATS_TEST_Topology struct GNUNET_CORE_MessageHandler *handlers; - GNUNET_TRANSPORT_ReceiveCallback transport_recv_cb; - GNUNET_ATS_TEST_TopologySetupDoneCallback done_cb; GNUNET_ATS_AddressInformationCallback ats_perf_cb; void *done_cb_cls; @@ -721,7 +719,6 @@ GNUNET_ATS_TEST_get_partner (int src, int dest); * @param test_core connect to CORE service (#GNUNET_YES) or transport (#GNUNET_NO) * @param done_cb function to call when topology is setup * @param done_cb_cls cls for callback - * @param transport_recv_cb callback to call when data are received * @param log_request_cb callback to call when logging is required */ void @@ -732,7 +729,6 @@ GNUNET_ATS_TEST_create_topology (char *name, int test_core, GNUNET_ATS_TEST_TopologySetupDoneCallback done_cb, void *done_cb_cls, - GNUNET_TRANSPORT_ReceiveCallback recv_cb, GNUNET_ATS_TEST_LogRequest ats_perf_cb); diff --git a/src/ats-tests/gnunet-ats-sim.c b/src/ats-tests/gnunet-ats-sim.c index f624c2b21..56f8f2223 100644 --- a/src/ats-tests/gnunet-ats-sim.c +++ b/src/ats-tests/gnunet-ats-sim.c @@ -168,32 +168,25 @@ do_timeout (void *cls) static void -transport_recv_cb (void *cls, - const struct GNUNET_PeerIdentity *peer, - const struct GNUNET_MessageHeader *message) +log_request__cb (void *cls, + const struct GNUNET_HELLO_Address *address, + int address_active, + struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out, + struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in, + const struct GNUNET_ATS_Properties *ats) { - -} - -static void -log_request__cb (void *cls, const struct GNUNET_HELLO_Address *address, - int address_active, struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out, - struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in, - const struct GNUNET_ATS_Properties *ats) -{ - if (NULL != l) { //GNUNET_break (0); //GNUNET_ATS_TEST_logging_now (l); } - } static void experiment_done_cb (struct Experiment *e, - struct GNUNET_TIME_Relative duration,int success) + struct GNUNET_TIME_Relative duration, + int success) { if (GNUNET_OK == success) GNUNET_log (GNUNET_ERROR_TYPE_INFO, @@ -222,15 +215,19 @@ experiment_done_cb (struct Experiment *e, static void episode_done_cb (struct Episode *ep) { - GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Episode %u done\n", ep->id); + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "Episode %u done\n", + ep->id); } -static void topology_setup_done (void *cls, - struct BenchmarkPeer *masters, - struct BenchmarkPeer *slaves) +static void +topology_setup_done (void *cls, + struct BenchmarkPeer *masters, + struct BenchmarkPeer *slaves) { - GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Topology setup complete!\n"); + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "Topology setup complete!\n"); masters_p = masters; slaves_p = slaves; @@ -240,7 +237,9 @@ static void topology_setup_done (void *cls, masters_p, e->num_masters, e->num_slaves, opt_verbose); - GNUNET_ATS_TEST_experimentation_run (e, &episode_done_cb, &experiment_done_cb); + GNUNET_ATS_TEST_experimentation_run (e, + &episode_done_cb, + &experiment_done_cb); /* GNUNET_ATS_TEST_generate_preferences_start(&masters[0],&masters[0].partners[0], GNUNET_ATS_TEST_TG_CONSTANT, 1, 1, GNUNET_TIME_UNIT_SECONDS, @@ -385,7 +384,6 @@ main (int argc, char *argv[]) GNUNET_NO, &topology_setup_done, NULL, - &transport_recv_cb, &log_request__cb); GNUNET_free (opt_exp_file); return 0; diff --git a/src/ats-tests/perf_ats.c b/src/ats-tests/perf_ats.c index a7c1dc3bf..da664bc94 100644 --- a/src/ats-tests/perf_ats.c +++ b/src/ats-tests/perf_ats.c @@ -338,15 +338,6 @@ find_partner (struct BenchmarkPeer *me, } -static void -test_recv_cb (void *cls, - const struct GNUNET_PeerIdentity * peer, - const struct GNUNET_MessageHeader * message) -{ - -} - - static void log_request_cb (void *cls, const struct GNUNET_HELLO_Address *address, @@ -586,7 +577,7 @@ main (int argc, char *argv[]) test_core, &do_benchmark, NULL, - &test_recv_cb, + NULL, &log_request_cb); return result; -- cgit v1.2.3