[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r35086 - gnunet/src/transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r35086 - gnunet/src/transport |
Date: |
Tue, 3 Feb 2015 16:31:02 +0100 |
Author: grothoff
Date: 2015-02-03 16:31:02 +0100 (Tue, 03 Feb 2015)
New Revision: 35086
Modified:
gnunet/src/transport/gnunet-service-transport_neighbours.c
gnunet/src/transport/gnunet-service-transport_neighbours.h
Log:
get rid of unused state and dead code: GST_neighbour_get_latency is never used
Modified: gnunet/src/transport/gnunet-service-transport_neighbours.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_neighbours.c 2015-02-03
15:28:00 UTC (rev 35085)
+++ gnunet/src/transport/gnunet-service-transport_neighbours.c 2015-02-03
15:31:02 UTC (rev 35086)
@@ -377,11 +377,6 @@
struct GNUNET_TIME_Absolute timeout;
/**
- * Latest calculated latency value
- */
- struct GNUNET_TIME_Relative latency;
-
- /**
* Tracker for inbound bandwidth.
*/
struct GNUNET_BANDWIDTH_Tracker in_tracker;
@@ -1501,8 +1496,8 @@
struct NeighbourMapEntry *n;
const struct SessionKeepAliveMessage *msg;
struct GNUNET_TRANSPORT_PluginFunctions *papi;
- uint32_t latency;
struct GNUNET_ATS_Information ats;
+ struct GNUNET_TIME_Relative latency;
if (sizeof (struct SessionKeepAliveMessage) != ntohs (m->size))
return;
@@ -1564,21 +1559,19 @@
n->primary_address.keep_alive_nonce = 0;
n->expect_latency_response = GNUNET_NO;
- n->latency = GNUNET_TIME_absolute_get_duration (n->last_keep_alive_time);
set_timeout (n, GNUNET_TIME_relative_to_absolute
(GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT));
+ latency = GNUNET_TIME_absolute_get_duration (n->last_keep_alive_time);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Latency for peer `%s' is %s\n",
GNUNET_i2s (&n->id),
- GNUNET_STRINGS_relative_time_to_string (n->latency,
+ GNUNET_STRINGS_relative_time_to_string (latency,
GNUNET_YES));
/* append latency */
ats.type = htonl (GNUNET_ATS_QUALITY_NET_DELAY);
- if (n->latency.rel_value_us > UINT32_MAX)
- latency = UINT32_MAX;
- else
- latency = n->latency.rel_value_us;
- ats.value = htonl (latency);
+ ats.value = htonl ( (latency.rel_value_us > UINT32_MAX)
+ ? UINT32_MAX
+ : (uint32_t) latency.rel_value_us );
GST_ats_update_metrics (n->primary_address.address,
n->primary_address.session,
&ats, 1);
@@ -2057,7 +2050,6 @@
n = GNUNET_new (struct NeighbourMapEntry);
n->id = *peer;
n->ack_state = ACK_UNDEFINED;
- n->latency = GNUNET_TIME_UNIT_FOREVER_REL;
n->last_util_transmission = GNUNET_TIME_absolute_get();
n->util_payload_bytes_recv = 0;
n->util_payload_bytes_sent = 0;
@@ -3807,47 +3799,6 @@
/**
- * Obtain current latency information for the given neighbour.
- *
- * @param peer to get the latency for
- * @return observed latency of the address, FOREVER if the
- * the connection is not up
- */
-struct GNUNET_TIME_Relative
-GST_neighbour_get_latency (const struct GNUNET_PeerIdentity *peer)
-{
- struct NeighbourMapEntry *n;
-
- n = lookup_neighbour (peer);
- if (NULL == n)
- return GNUNET_TIME_UNIT_FOREVER_REL;
- switch (n->state)
- {
- case GNUNET_TRANSPORT_PS_CONNECTED:
- case GNUNET_TRANSPORT_PS_SWITCH_SYN_SENT:
- case GNUNET_TRANSPORT_PS_RECONNECT_SENT:
- case GNUNET_TRANSPORT_PS_RECONNECT_ATS:
- return n->latency;
- case GNUNET_TRANSPORT_PS_NOT_CONNECTED:
- case GNUNET_TRANSPORT_PS_INIT_ATS:
- case GNUNET_TRANSPORT_PS_SYN_RECV_ATS:
- case GNUNET_TRANSPORT_PS_SYN_RECV_ACK:
- case GNUNET_TRANSPORT_PS_SYN_SENT:
- case GNUNET_TRANSPORT_PS_DISCONNECT:
- case GNUNET_TRANSPORT_PS_DISCONNECT_FINISHED:
- return GNUNET_TIME_UNIT_FOREVER_REL;
- default:
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Unhandled state `%s'\n",
- GNUNET_TRANSPORT_ps2s (n->state));
- GNUNET_break (0);
- break;
- }
- return GNUNET_TIME_UNIT_FOREVER_REL;
-}
-
-
-/**
* Obtain current address information for the given neighbour.
*
* @param peer
Modified: gnunet/src/transport/gnunet-service-transport_neighbours.h
===================================================================
--- gnunet/src/transport/gnunet-service-transport_neighbours.h 2015-02-03
15:28:00 UTC (rev 35085)
+++ gnunet/src/transport/gnunet-service-transport_neighbours.h 2015-02-03
15:31:02 UTC (rev 35086)
@@ -324,17 +324,6 @@
/**
- * Obtain current latency information for the given neighbour.
- *
- * @param peer
- * @return observed latency of the address, FOREVER if the address was
- * never successfully validated
- */
-struct GNUNET_TIME_Relative
-GST_neighbour_get_latency (const struct GNUNET_PeerIdentity *peer);
-
-
-/**
* Obtain current address information for the given neighbour.
*
* @param peer
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r35086 - gnunet/src/transport,
gnunet <=