*/
#include "platform.h"
#include "gnunet_load_lib.h"
-#include "gnunet_ats_service.h"
#include "gnunet-service-fs.h"
#include "gnunet-service-fs_cp.h"
#include "gnunet-service-fs_pe.h"
*/
#define REPLY_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 2)
+/**
+ * Collect an instane number of statistics? May cause excessive IPC.
+ */
+#define INSANE_STATISTICS GNUNET_NO
+
/**
* Handle to cancel a transmission request.
*/
static char *respectDirectory;
-/**
- * Handle to ATS service.
- */
-static struct GNUNET_ATS_PerformanceHandle *ats;
/**
* Get the filename under which we would store respect
/**
- * Find latency information in 'atsi'.
+ * Update the latency information kept for the given peer.
*
- * @param atsi performance data
- * @param atsi_count number of records in 'atsi'
- * @return connection latency
+ * @param id peer record to update
+ * @param latency current latency value
*/
-static struct GNUNET_TIME_Relative
-get_latency (const struct GNUNET_ATS_Information *atsi, unsigned int atsi_count)
-{
- unsigned int i;
-
- for (i = 0; i < atsi_count; i++)
- if (ntohl (atsi->type) == GNUNET_ATS_QUALITY_NET_DELAY)
- return GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS,
- ntohl (atsi->value));
- return GNUNET_TIME_UNIT_SECONDS;
-}
-
-
-/**
- * Update the performance information kept for the given peer.
- *
- * @param cp peer record to update
- * @param atsi transport performance data
- * @param atsi_count number of records in 'atsi'
- */
-static void
-update_atsi (struct GSF_ConnectedPeer *cp,
- const struct GNUNET_ATS_Information *atsi, unsigned int atsi_count)
+void
+GSF_update_peer_latency_ (const struct GNUNET_PeerIdentity *id,
+ struct GNUNET_TIME_Relative latency)
{
- struct GNUNET_TIME_Relative latency;
+ struct GSF_ConnectedPeer *cp;
- latency = get_latency (atsi, atsi_count);
+ cp = GSF_peer_get_ (id);
+ if (NULL == cp)
+ return; /* we're not yet connected at the core level, ignore */
GNUNET_LOAD_value_set_decline (cp->ppd.transmission_delay, latency);
/* LATER: merge atsi into cp's performance data (if we ever care...) */
}
if (0 != cp->inc_preference)
{
- GNUNET_ATS_change_preference (ats, &target, GNUNET_ATS_PREFERENCE_BANDWIDTH,
+ GNUNET_ATS_change_preference (GSF_ats, &target, GNUNET_ATS_PREFERENCE_BANDWIDTH,
(double) cp->inc_preference,
GNUNET_ATS_PREFERENCE_END);
cp->inc_preference = 0;
/* reservation already done! */
pth->was_reserved = GNUNET_YES;
cp->rc =
- GNUNET_ATS_reserve_bandwidth (ats, &target, DBLOCK_SIZE,
+ GNUNET_ATS_reserve_bandwidth (GSF_ats, &target, DBLOCK_SIZE,
&ats_reserve_callback, cp);
return;
}
- GNUNET_assert (cp->cth == NULL);
+ GNUNET_assert (NULL == cp->cth);
cp->cth_in_progress++;
cp->cth =
GNUNET_CORE_notify_transmit_ready (GSF_core, GNUNET_YES, pth->priority,
schedule_transmission (pth);
return 0;
}
- if (pth->timeout_task != GNUNET_SCHEDULER_NO_TASK)
+ if (GNUNET_SCHEDULER_NO_TASK != pth->timeout_task)
{
GNUNET_SCHEDULER_cancel (pth->timeout_task);
pth->timeout_task = GNUNET_SCHEDULER_NO_TASK;
GNUNET_PEER_resolve (cp->ppd.pid, &target);
cp->rc_delay_task = GNUNET_SCHEDULER_NO_TASK;
cp->rc =
- GNUNET_ATS_reserve_bandwidth (ats, &target, DBLOCK_SIZE,
- &ats_reserve_callback, cp);
+ GNUNET_ATS_reserve_bandwidth (GSF_ats, &target, DBLOCK_SIZE,
+ &ats_reserve_callback, cp);
}
struct GSF_PeerTransmitHandle *pth;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Reserved %d bytes / need to wait %llu ms for reservation\n",
- (int) amount, (unsigned long long) res_delay.rel_value);
+ "Reserved %d bytes / need to wait %s for reservation\n",
+ (int) amount,
+ GNUNET_STRINGS_relative_time_to_string (res_delay, GNUNET_YES));
cp->rc = NULL;
if (0 == amount)
{
* records.
*
* @param peer identity of peer that connected
- * @param atsi performance data for the connection
- * @param atsi_count number of records in 'atsi'
* @return handle to connected peer entry
*/
struct GSF_ConnectedPeer *
-GSF_peer_connect_handler_ (const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_ATS_Information *atsi,
- unsigned int atsi_count)
+GSF_peer_connect_handler_ (const struct GNUNET_PeerIdentity *peer)
{
struct GSF_ConnectedPeer *cp;
char *fn;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connected to peer %s\n",
GNUNET_i2s (peer));
- cp = GNUNET_malloc (sizeof (struct GSF_ConnectedPeer));
+ cp = GNUNET_new (struct GSF_ConnectedPeer);
cp->ppd.pid = GNUNET_PEER_intern (peer);
cp->ppd.transmission_delay = GNUNET_LOAD_value_init (GNUNET_TIME_UNIT_ZERO);
cp->rc =
- GNUNET_ATS_reserve_bandwidth (ats, peer, DBLOCK_SIZE,
+ GNUNET_ATS_reserve_bandwidth (GSF_ats, peer, DBLOCK_SIZE,
&ats_reserve_callback, cp);
fn = get_respect_filename (peer);
- if ((GNUNET_DISK_file_test (fn) == GNUNET_YES) &&
+ if ((GNUNET_YES == GNUNET_DISK_file_test (fn)) &&
(sizeof (respect) == GNUNET_DISK_fn_read (fn, &respect, sizeof (respect))))
cp->disk_respect = cp->ppd.respect = ntohl (respect);
GNUNET_free (fn);
- cp->request_map = GNUNET_CONTAINER_multihashmap_create (128);
+ cp->request_map = GNUNET_CONTAINER_multihashmap_create (128, GNUNET_NO);
GNUNET_break (GNUNET_OK ==
- GNUNET_CONTAINER_multihashmap_put (cp_map, &peer->hashPubKey,
+ GNUNET_CONTAINER_multihashmap_put (cp_map,
+ &GSF_connected_peer_get_identity2_ (cp)->hashPubKey,
cp,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
GNUNET_STATISTICS_set (GSF_stats, gettext_noop ("# peers connected"),
GNUNET_CONTAINER_multihashmap_size (cp_map),
GNUNET_NO);
- update_atsi (cp, atsi, atsi_count);
GSF_push_start_ (cp);
return cp;
}
* @param other the other peer involved (sender or receiver, NULL
* for loopback messages where we are both sender and receiver)
* @param message the actual message
- * @param atsi performance information
- * @param atsi_count number of records in 'atsi'
* @return GNUNET_OK to keep the connection open,
* GNUNET_SYSERR to close it (signal serious error)
*/
int
GSF_handle_p2p_migration_stop_ (void *cls,
const struct GNUNET_PeerIdentity *other,
- const struct GNUNET_MessageHeader *message,
- const struct GNUNET_ATS_Information *atsi,
- unsigned int atsi_count)
+ const struct GNUNET_MessageHeader *message)
{
struct GSF_ConnectedPeer *cp;
const struct MigrationStopMessage *msm;
msm = (const struct MigrationStopMessage *) message;
cp = GSF_peer_get_ (other);
- if (cp == NULL)
+ if (NULL == cp)
{
GNUNET_break (0);
return GNUNET_OK;
1, GNUNET_NO);
bt = GNUNET_TIME_relative_ntoh (msm->duration);
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- _("Migration of content to peer `%s' blocked for %llu ms\n"),
- GNUNET_i2s (other), (unsigned long long) bt.rel_value);
+ _("Migration of content to peer `%s' blocked for %s\n"),
+ GNUNET_i2s (other),
+ GNUNET_STRINGS_relative_time_to_string (bt, GNUNET_YES));
cp->ppd.migration_blocked_until = GNUNET_TIME_relative_to_absolute (bt);
- if (cp->mig_revive_task == GNUNET_SCHEDULER_NO_TASK)
+ if (GNUNET_SCHEDULER_NO_TASK == cp->mig_revive_task)
{
GSF_push_stop_ (cp);
cp->mig_revive_task =
GNUNET_SCHEDULER_add_delayed (bt, &revive_migration, cp);
}
- update_atsi (cp, atsi, atsi_count);
return GNUNET_OK;
}
struct PutMessage *pm = cls;
size_t size;
- if (buf != NULL)
+ if (NULL != buf)
{
GNUNET_assert (buf_size >= ntohs (pm->header.size));
size = ntohs (pm->header.size);
{
struct GSF_ConnectedPeer *cp = peerreq->cp;
- if (peerreq->kill_task != GNUNET_SCHEDULER_NO_TASK)
+ if (GNUNET_SCHEDULER_NO_TASK != peerreq->kill_task)
{
GNUNET_SCHEDULER_cancel (peerreq->kill_task);
peerreq->kill_task = GNUNET_SCHEDULER_NO_TASK;
GNUNET_CRYPTO_random_u32
(GNUNET_CRYPTO_QUALITY_WEAK,
2 * GSF_avg_latency.rel_value + 1));
+#if INSANE_STATISTICS
GNUNET_STATISTICS_update (GSF_stats,
gettext_noop
("# artificial delays introduced (ms)"),
ret.rel_value, GNUNET_NO);
-
+#endif
return ret;
}
free_pending_request (peerreq, &prd->query);
return;
}
- GNUNET_break (type != GNUNET_BLOCK_TYPE_ANY);
- if ((prd->type != type) && (prd->type != GNUNET_BLOCK_TYPE_ANY))
+ GNUNET_break (GNUNET_BLOCK_TYPE_ANY != type);
+ if ((prd->type != type) && (GNUNET_BLOCK_TYPE_ANY != prd->type))
{
GNUNET_STATISTICS_update (GSF_stats,
gettext_noop
GNUNET_break (0);
return;
}
- if ((reply_anonymity_level != UINT32_MAX) && (reply_anonymity_level > 1))
+ if ((UINT32_MAX != reply_anonymity_level) && (reply_anonymity_level > 1))
{
if (reply_anonymity_level - 1 > GSF_cover_content_count)
{
pm->type = htonl (type);
pm->expiration = GNUNET_TIME_absolute_hton (expiration);
memcpy (&pm[1], data, data_len);
- if ((reply_anonymity_level != UINT32_MAX) && (reply_anonymity_level != 0) &&
- (GSF_enable_randomized_delays == GNUNET_YES))
+ if ((UINT32_MAX != reply_anonymity_level) && (0 != reply_anonymity_level) &&
+ (GNUNET_YES == GSF_enable_randomized_delays))
{
struct GSF_DelayedHandle *dh;
- dh = GNUNET_malloc (sizeof (struct GSF_DelayedHandle));
+ dh = GNUNET_new (struct GSF_DelayedHandle);
dh->cp = cp;
dh->pm = pm;
dh->msize = msize;
(void) GSF_peer_transmit_ (cp, GNUNET_NO, UINT32_MAX, REPLY_TIMEOUT, msize,
©_reply, pm);
}
- if (eval != GNUNET_BLOCK_EVALUATION_OK_LAST)
+ if (GNUNET_BLOCK_EVALUATION_OK_LAST != eval)
return;
if (GNUNET_SCHEDULER_NO_TASK == peerreq->kill_task)
{
static int
change_peer_respect (struct GSF_ConnectedPeer *cp, int value)
{
- if (value == 0)
+ if (0 == value)
return 0;
- GNUNET_assert (cp != NULL);
+ GNUNET_assert (NULL != cp);
if (value > 0)
{
if (cp->ppd.respect + value < cp->ppd.respect)
int ld;
ld = GSF_test_get_load_too_high_ (0);
- if (ld == GNUNET_SYSERR)
+ if (GNUNET_SYSERR == ld)
{
+#if INSANE_STATISTICS
GNUNET_STATISTICS_update (GSF_stats,
gettext_noop
("# requests done for free (low load)"), 1,
GNUNET_NO);
+#endif
return 0; /* excess resources */
}
if (prio_in > INT32_MAX)
rret = ret;
GSF_current_priorities = (GSF_current_priorities * (N - 1) + rret) / N;
}
- if ((ld == GNUNET_YES) && (ret > 0))
+ if ((GNUNET_YES == ld) && (ret > 0))
{
/* try with charging */
ld = GSF_test_get_load_too_high_ (ret);
}
- if (ld == GNUNET_YES)
+ if (GNUNET_YES == ld)
{
GNUNET_STATISTICS_update (GSF_stats,
gettext_noop
struct GSF_PendingRequestData *prd;
struct GSF_ConnectedPeer *cp;
struct GSF_ConnectedPeer *cps;
- const struct GNUNET_HashCode *namespace;
const struct GNUNET_PeerIdentity *target;
enum GSF_PendingRequestOptions options;
uint16_t msize;
cp = GSF_peer_get_ ((const struct GNUNET_PeerIdentity *) &opt[bits++]);
else
cp = cps;
- if (cp == NULL)
+ if (NULL == cp)
{
if (0 != (bm & GET_MESSAGE_BIT_RETURN_TO))
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Failed to find peer `%4s' in connection set. Dropping query.\n",
GNUNET_i2s (other));
+#if INSANE_STATISTICS
GNUNET_STATISTICS_update (GSF_stats,
gettext_noop
("# requests dropped due to missing reverse route"),
1, GNUNET_NO);
+#endif
return NULL;
}
/* note that we can really only check load here since otherwise
"Received request for `%s' of type %u from peer `%4s' with flags %u\n",
GNUNET_h2s (&gm->query), (unsigned int) type, GNUNET_i2s (other),
(unsigned int) bm);
- namespace = (0 != (bm & GET_MESSAGE_BIT_SKS_NAMESPACE)) ? &opt[bits++] : NULL;
- if ((type == GNUNET_BLOCK_TYPE_FS_SBLOCK) && (namespace == NULL))
- {
- GNUNET_break_op (0);
- return NULL;
- }
- if ((type != GNUNET_BLOCK_TYPE_FS_SBLOCK) && (namespace != NULL))
- {
- GNUNET_break_op (0);
- return NULL;
- }
target =
(0 !=
(bm & GET_MESSAGE_BIT_TRANSMIT_TO)) ? ((const struct GNUNET_PeerIdentity
{
pr = peerreq->pr;
prd = GSF_pending_request_get_data_ (pr);
- if ((prd->type == type) &&
- ((type != GNUNET_BLOCK_TYPE_FS_SBLOCK) ||
- (0 == memcmp (&prd->namespace, namespace, sizeof (struct GNUNET_HashCode)))))
+ if (prd->type == type)
{
if (prd->ttl.abs_value >= GNUNET_TIME_absolute_get ().abs_value + ttl)
{
}
}
- peerreq = GNUNET_malloc (sizeof (struct PeerRequest));
+ peerreq = GNUNET_new (struct PeerRequest);
peerreq->cp = cp;
- pr = GSF_pending_request_create_ (options, type, &gm->query, namespace,
+ pr = GSF_pending_request_create_ (options, type, &gm->query,
target,
(bfsize >
0) ? (const char *) &opt[bits] : NULL,
struct GSF_PeerTransmitHandle *pos;
struct GSF_PeerTransmitHandle *prev;
- pth = GNUNET_malloc (sizeof (struct GSF_PeerTransmitHandle));
+ pth = GNUNET_new (struct GSF_PeerTransmitHandle);
pth->transmission_request_start_time = GNUNET_TIME_absolute_get ();
pth->timeout = GNUNET_TIME_relative_to_absolute (timeout);
pth->gmc = gmc;
/* insertion sort (by priority, descending) */
prev = NULL;
pos = cp->pth_head;
- while ((pos != NULL) && (pos->priority > priority))
+ while ((NULL != pos) && (pos->priority > priority))
{
prev = pos;
pos = pos->next;
{
struct GSF_ConnectedPeer *cp;
- if (pth->timeout_task != GNUNET_SCHEDULER_NO_TASK)
+ if (GNUNET_SCHEDULER_NO_TASK != pth->timeout_task)
{
GNUNET_SCHEDULER_cancel (pth->timeout_task);
pth->timeout_task = GNUNET_SCHEDULER_NO_TASK;
/**
* Obtain the identity of a connected peer.
*
- * @param cp peer to reserve bandwidth from
+ * @param cp peer to get identity of
* @param id identity to set (written to)
*/
void
}
+/**
+ * Obtain the identity of a connected peer.
+ *
+ * @param cp peer to get identity of
+ * @return reference to peer identity, valid until peer disconnects (!)
+ */
+const struct GNUNET_PeerIdentity *
+GSF_connected_peer_get_identity2_ (const struct GSF_ConnectedPeer *cp)
+{
+ GNUNET_assert (0 != cp->ppd.pid);
+ return GNUNET_PEER_resolve2 (cp->ppd.pid);
+}
+
+
/**
* Assemble a migration stop message for transmission.
*
if (cp->last_migration_block.abs_value > block_time.abs_value)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Migration already blocked for another %llu ms\n",
- (unsigned long long)
- GNUNET_TIME_absolute_get_remaining
- (cp->last_migration_block).rel_value);
+ "Migration already blocked for another %s\n",
+ GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_remaining
+ (cp->last_migration_block), GNUNET_YES));
return; /* already blocked */
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Asking to stop migration for %llu ms\n",
(unsigned long long) GNUNET_TIME_absolute_get_remaining (block_time).rel_value);
cp->last_migration_block = block_time;
- if (cp->migration_pth != NULL)
+ if (NULL != cp->migration_pth)
GSF_peer_transmit_cancel_ (cp->migration_pth);
cp->migration_pth =
GSF_peer_transmit_ (cp, GNUNET_SYSERR, UINT32_MAX,
void
GSF_connected_peer_init_ ()
{
- cp_map = GNUNET_CONTAINER_multihashmap_create (128);
- ats = GNUNET_ATS_performance_init (GSF_cfg, NULL, NULL);
+ cp_map = GNUNET_CONTAINER_multihashmap_create (128, GNUNET_YES);
GNUNET_assert (GNUNET_OK ==
GNUNET_CONFIGURATION_get_value_filename (GSF_cfg, "fs",
"RESPECT",
cp_map = NULL;
GNUNET_free (respectDirectory);
respectDirectory = NULL;
- GNUNET_ATS_performance_done (ats);
- ats = NULL;
}