You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
#include <math.h>
#include <inttypes.h>
+#include "rps-test_util.h"
+
#define LOG(kind, ...) GNUNET_log_from(kind,"rps-sampler",__VA_ARGS__)
+
// multiple 'clients'?
// TODO check for overflows
* How many times this sampler changed the peer_id.
*/
uint32_t num_change;
+
+ /**
+ * The file name this sampler element should log to
+ */
+ #ifdef TO_FILE
+ char *file_name;
+ #endif /* TO_FILE */
};
+/**
+ * Callback that is called from _get_rand_peer() when the PeerID is ready.
+ *
+ * @param cls the closure given alongside this function.
+ * @param id the PeerID that was returned
+ */
+typedef void
+(*RPS_sampler_rand_peer_ready_cont) (void *cls,
+ const struct GNUNET_PeerIdentity *id);
+
+
+/**
+ * Closure for #sampler_mod_get_rand_peer() and #sampler_get_rand_peer
+ */
+struct GetPeerCls
+{
+ /**
+ * DLL
+ */
+ struct GetPeerCls *next;
+
+ /**
+ * DLL
+ */
+ struct GetPeerCls *prev;
+
+ /**
+ * The sampler this function operates on.
+ */
+ struct RPS_Sampler *sampler;
+
+ /**
+ * The task for this function.
+ */
+ struct GNUNET_SCHEDULER_Task *get_peer_task;
+
+ /**
+ * The callback
+ */
+ RPS_sampler_rand_peer_ready_cont cont;
+
+ /**
+ * The closure to the callback @e cont
+ */
+ void *cont_cls;
+
+ /**
+ * The address of the id to be stored at
+ */
+ struct GNUNET_PeerIdentity *id;
+};
+
+
+/**
+ * Type of function used to differentiate between modified and not modified
+ * Sampler.
+ */
+typedef void
+(*RPS_get_peers_type) (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc);
+
+/**
+ * Get one random peer out of the sampled peers.
+ *
+ * We might want to reinitialise this sampler after giving the
+ * corrsponding peer to the client.
+ * Only used internally
+ */
+static void
+sampler_get_rand_peer (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc);
+
+/**
+ * Get one random peer out of the sampled peers.
+ *
+ * We might want to reinitialise this sampler after giving the
+ * corrsponding peer to the client.
+ */
+static void
+sampler_mod_get_rand_peer (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc);
+
/**
* Sampler with its own array of SamplerElements
//size_t size;
/**
- * All Samplers in one array.
+ * All sampler elements in one array.
*/
struct RPS_SamplerElement **sampler_elements;
/**
- * Max time a round takes
- *
- * Used in the context of RPS
+ * Number of sampler elements trash can holds.
*/
- struct GNUNET_TIME_Relative max_round_interval;
-};
+ unsigned int trash_can_size;
-/**
- * Closure to _get_n_rand_peers_ready_cb()
- */
-struct NRandPeersReadyCls
-{
/**
- * Number of peers we are waiting for.
+ * Trash can for old sampler elements.
+ * We need this to evaluate the sampler.
+ * TODO remove after evaluation
+ * and undo changes in
+ * sampler_resize
+ * sampler_empty
+ * sampler_init
+ * sampler_remove?
+ * sampler_reinitialise_by_value
+ * sampler_update
*/
- uint32_t num_peers;
+ struct RPS_SamplerElement **trash_can;
/**
- * Number of peers we currently have.
+ * Maximum time a round takes
+ *
+ * Used in the context of RPS
*/
- uint32_t cur_num_peers;
+ struct GNUNET_TIME_Relative max_round_interval;
/**
- * Pointer to the array holding the ids.
+ * Stores the function to return peers. Which one it is depends on whether
+ * the Sampler is the modified one or not.
*/
- struct GNUNET_PeerIdentity *ids;
+ RPS_get_peers_type get_peers;
/**
- * Callback to be called when all ids are available.
+ * Head for the DLL to store the closures to pending requests.
*/
- RPS_sampler_n_rand_peers_ready_cb callback;
+ struct GetPeerCls *gpc_head;
/**
- * Closure given to the callback
+ * Tail for the DLL to store the closures to pending requests.
*/
- void *cls;
-};
+ struct GetPeerCls *gpc_tail;
-/**
- * Callback that is called from _get_rand_peer() when the PeerID is ready.
- *
- * @param cls the closure given alongside this function.
- * @param id the PeerID that was returned
- */
-typedef void
-(*RPS_sampler_rand_peer_ready_cont) (void *cls,
- const struct GNUNET_PeerIdentity *id);
+ #ifdef TO_FILE
+ /**
+ * File name to log to
+ */
+ char *file_name;
+ #endif /* TO_FILE */
+};
/**
- * Closure to #RPS_sampler_get_rand_peer()
+ * Closure to _get_n_rand_peers_ready_cb()
*/
-struct GetPeerCls
+struct NRandPeersReadyCls
{
- /** DLL */
- struct GetPeerCls *next;
- struct GetPeerCls *prev;
-
/**
- * The sampler this function operates on.
+ * Number of peers we are waiting for.
*/
- struct RPS_Sampler *sampler;
+ uint32_t num_peers;
/**
- * The task for this function.
+ * Number of peers we currently have.
*/
- struct GNUNET_SCHEDULER_Task *get_peer_task;
+ uint32_t cur_num_peers;
/**
- * The callback
+ * Pointer to the array holding the ids.
*/
- RPS_sampler_rand_peer_ready_cont cont;
+ struct GNUNET_PeerIdentity *ids;
/**
- * The closure to the callback
+ * Callback to be called when all ids are available.
*/
- void *cont_cls;
+ RPS_sampler_n_rand_peers_ready_cb callback;
/**
- * The address of the id to be stored at
+ * Closure given to the callback
*/
- struct GNUNET_PeerIdentity *id;
+ void *cls;
};
-
///**
// * Global sampler variable.
// */
static uint32_t client_get_index;
-/** FIXME document */
-struct GetPeerCls *gpc_head;
-struct GetPeerCls *gpc_tail;
-
-
/**
* Callback to _get_rand_peer() used by _get_n_rand_peers().
*
* Checks whether all n peers are available. If they are,
* give those back.
*/
- void
+static void
check_n_peers_ready (void *cls,
const struct GNUNET_PeerIdentity *id)
{
- struct NRandPeersReadyCls *n_peers_cls;
-
- n_peers_cls = (struct NRandPeersReadyCls *) cls;
+ struct NRandPeersReadyCls *n_peers_cls = cls;
n_peers_cls->cur_num_peers++;
LOG (GNUNET_ERROR_TYPE_DEBUG,
&(sampler_el->auth_key.key),
GNUNET_CRYPTO_HASH_LENGTH);
+ #ifdef TO_FILE
+ /* Create a file(-name) to store internals to */
+ char *name_buf;
+ name_buf = auth_key_to_string (sampler_el->auth_key);
+
+ sampler_el->file_name = create_file (name_buf);
+ GNUNET_free (name_buf);
+ #endif /* TO_FILE */
+
sampler_el->last_client_request = GNUNET_TIME_UNIT_FOREVER_ABS;
sampler_el->birth = GNUNET_TIME_absolute_get ();
s = GNUNET_new (struct RPS_SamplerElement);
RPS_sampler_elem_reinit (s);
- LOG (GNUNET_ERROR_TYPE_DEBUG, "initialised with empty PeerID\n");
return s;
}
* Input an PeerID into the given sampler element.
*
* @param sampler the sampler the @a s_elem belongs to.
- * Needed to know the
+ * Needed to know the
*/
static void
RPS_sampler_elem_next (struct RPS_SamplerElement *s_elem,
- struct RPS_Sampler *sampler,
+ struct RPS_Sampler *sampler, /* TODO remove? */
const struct GNUNET_PeerIdentity *other)
{
struct GNUNET_HashCode other_hash;
s_elem->num_peers++;
+ to_file (s_elem->file_name,
+ "Got id %s",
+ GNUNET_i2s_full (other));
+
if (0 == GNUNET_CRYPTO_cmp_peer_identity (other, &(s_elem->peer_id)))
{
LOG (GNUNET_ERROR_TYPE_DEBUG, " Got PeerID %s\n",
GNUNET_i2s (other));
LOG (GNUNET_ERROR_TYPE_DEBUG, "Discarding old PeerID %s\n",
GNUNET_i2s (&s_elem->peer_id));
+ s_elem->peer_id = *other;
+ s_elem->peer_id_hash = other_hash;
s_elem->num_change++;
}
}
}
s_elem->is_empty = NOT_EMPTY;
+
+ to_file (s_elem->file_name,
+ "Now holding %s",
+ GNUNET_i2s_full (&s_elem->peer_id));
}
if (old_size > new_size)
{ /* Shrinking */
- /* Temporary store those to properly call the removeCB on those later */
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Shrinking sampler %d -> %d\n", old_size, new_size);
- GNUNET_array_grow (sampler->sampler_elements, sampler->sampler_size, new_size);
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "sampler->sampler_elements now points to %p\n",
- sampler->sampler_elements);
+ "Shrinking sampler %d -> %d\n",
+ old_size,
+ new_size);
+
+ to_file (sampler->file_name,
+ "Shrinking sampler %d -> %d",
+ old_size,
+ new_size);
+
+ /* TODO Temporary store those to properly call the removeCB on those later? */
+ GNUNET_array_grow (sampler->trash_can,
+ sampler->trash_can_size,
+ old_size - new_size);
+ for (i = new_size ; i < old_size ; i++)
+ {
+ to_file (sampler->file_name,
+ "-%" PRIu32 ": %s",
+ i,
+ sampler->sampler_elements[i]->file_name);
+ to_file (sampler->sampler_elements[i]->file_name,
+ "--- non-active");
+ sampler->trash_can[i - new_size] = sampler->sampler_elements[i];
+ }
+
+ GNUNET_array_grow (sampler->sampler_elements,
+ sampler->sampler_size,
+ new_size);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "sampler->sampler_elements now points to %p\n",
+ sampler->sampler_elements);
}
else if (old_size < new_size)
{ /* Growing */
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Growing sampler %d -> %d\n", old_size, new_size);
- GNUNET_array_grow (sampler->sampler_elements, sampler->sampler_size, new_size);
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "sampler->sampler_elements now points to %p\n",
- sampler->sampler_elements);
+ "Growing sampler %d -> %d\n",
+ old_size,
+ new_size);
+
+ to_file (sampler->file_name,
+ "Growing sampler %d -> %d",
+ old_size,
+ new_size);
+
+ GNUNET_array_grow (sampler->sampler_elements,
+ sampler->sampler_size,
+ new_size);
- for ( i = old_size ; i < new_size ; i++ )
+ for (i = old_size ; i < new_size ; i++)
{ /* Add new sampler elements */
sampler->sampler_elements[i] = RPS_sampler_elem_create ();
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Added %" PRIX32 ". sampler, now pointing to %p, contains %s\n",
- i, &sampler->sampler_elements[i], GNUNET_i2s (&sampler->sampler_elements[i]->peer_id));
+
+ to_file (sampler->file_name,
+ "+%" PRIu32 ": %s",
+ i,
+ sampler->sampler_elements[i]->file_name);
}
}
else
}
GNUNET_assert (sampler->sampler_size == new_size);
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Finished growing/shrinking.\n"); // remove
}
* Initialise a tuple of sampler elements.
*
* @param init_size the size the sampler is initialised with
- * @param ins_cb the callback that will be called on every PeerID that is
- * newly inserted into a sampler element
- * @param ins_cls the closure given to #ins_cb
- * @param rem_cb the callback that will be called on every PeerID that is
- * removed from a sampler element
- * @param rem_cls the closure given to #rem_cb
+ * @param max_round_interval maximum time a round takes
* @return a handle to a sampler that consists of sampler elements.
*/
struct RPS_Sampler *
RPS_sampler_init (size_t init_size,
- struct GNUNET_TIME_Relative max_round_interval)
+ struct GNUNET_TIME_Relative max_round_interval)
{
struct RPS_Sampler *sampler;
- //uint32_t i;
/* Initialise context around extended sampler */
min_size = 10; // TODO make input to _samplers_init()
max_size = 1000; // TODO make input to _samplers_init()
sampler = GNUNET_new (struct RPS_Sampler);
+
+ #ifdef TO_FILE
+ sampler->file_name = create_file ("sampler-");
+
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Initialised sampler %s\n",
+ sampler->file_name);
+ #endif /* TO_FILE */
+
sampler->sampler_size = 0;
sampler->sampler_elements = NULL;
+ sampler->trash_can_size = 0;
+ sampler->trash_can = NULL;
sampler->max_round_interval = max_round_interval;
+ sampler->get_peers = sampler_get_rand_peer;
+ sampler->gpc_head = NULL;
+ sampler->gpc_tail = NULL;
//sampler->sampler_elements = GNUNET_new_array(init_size, struct GNUNET_PeerIdentity);
//GNUNET_array_grow (sampler->sampler_elements, sampler->sampler_size, min_size);
RPS_sampler_resize (sampler, init_size);
return sampler;
}
+/**
+ * Initialise a modified tuple of sampler elements.
+ *
+ * @param init_size the size the sampler is initialised with
+ * @param max_round_interval maximum time a round takes
+ * @return a handle to a sampler that consists of sampler elements.
+ */
+struct RPS_Sampler *
+RPS_sampler_mod_init (size_t init_size,
+ struct GNUNET_TIME_Relative max_round_interval)
+{
+ struct RPS_Sampler *sampler;
+
+ sampler = RPS_sampler_init (init_size, max_round_interval);
+ sampler->get_peers = sampler_mod_get_rand_peer;
+
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Initialised modified sampler %s\n",
+ sampler->file_name);
+ to_file (sampler->file_name,
+ "This is a modified sampler");
+
+ return sampler;
+}
+
/**
* A fuction to update every sampler in the given list
{
uint32_t i;
- for ( i = 0 ; i < sampler->sampler_size ; i++ )
+ to_file (sampler->file_name,
+ "Got %s",
+ GNUNET_i2s_full (id));
+
+ for (i = 0 ; i < sampler->sampler_size ; i++)
+ {
RPS_sampler_elem_next (sampler->sampler_elements[i],
sampler,
id);
+ }
+
+ for (i = 0 ; i < sampler->trash_can_size ; i++)
+ {
+ RPS_sampler_elem_next (sampler->trash_can[i],
+ sampler,
+ id);
+ }
}
const struct GNUNET_PeerIdentity *id)
{
uint32_t i;
+ struct RPS_SamplerElement *trash_entry;
for ( i = 0 ; i < sampler->sampler_size ; i++ )
{
if ( 0 == GNUNET_CRYPTO_cmp_peer_identity(id, &(sampler->sampler_elements[i]->peer_id)) )
{
LOG (GNUNET_ERROR_TYPE_DEBUG, "Reinitialising sampler\n");
+ trash_entry = GNUNET_new (struct RPS_SamplerElement);
+ *trash_entry = *(sampler->sampler_elements[i]);
+ GNUNET_array_append (sampler->trash_can,
+ sampler->trash_can_size,
+ trash_entry);
+ to_file (trash_entry->file_name,
+ "--- non-active");
RPS_sampler_elem_reinit (sampler->sampler_elements[i]);
}
}
* Only used internally
*/
static void
-sampler_get_rand_peer2 (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+sampler_get_rand_peer (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- struct GetPeerCls *gpc = (struct GetPeerCls *) cls;
+ struct GetPeerCls *gpc = cls;
uint32_t r_index;
gpc->get_peer_task = NULL;
- GNUNET_CONTAINER_DLL_remove (gpc_head, gpc_tail, gpc);
if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
return;
r_index = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_STRONG,
gpc->sampler->sampler_size);
- if ( EMPTY == gpc->sampler->sampler_elements[r_index]->is_empty )
+ if (EMPTY == gpc->sampler->sampler_elements[r_index]->is_empty)
{
- gpc->get_peer_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply(
- GNUNET_TIME_UNIT_SECONDS,
- .1),
- &sampler_get_rand_peer2,
- cls);
+ //LOG (GNUNET_ERROR_TYPE_DEBUG,
+ // "Not returning randomly selected, empty PeerID. - Rescheduling.\n");
+
+ /* FIXME no active wait - get notified, when new id arrives?
+ * Might also be a freshly emptied one. Others might still contain ids.
+ * Counter?
+ */
+ gpc->get_peer_task =
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply (
+ GNUNET_TIME_UNIT_SECONDS, 0.1),
+ &sampler_get_rand_peer,
+ cls);
return;
}
*gpc->id = gpc->sampler->sampler_elements[r_index]->peer_id;
gpc->cont (gpc->cont_cls, gpc->id);
+
+ GNUNET_CONTAINER_DLL_remove (gpc->sampler->gpc_head,
+ gpc->sampler->gpc_tail,
+ gpc);
+
GNUNET_free (gpc);
}
* corrsponding peer to the client.
*/
static void
-sampler_get_rand_peer (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+sampler_mod_get_rand_peer (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- struct GetPeerCls *gpc = (struct GetPeerCls *) cls;
+ struct GetPeerCls *gpc = cls;
struct GNUNET_PeerIdentity tmp_id;
unsigned int empty_flag;
struct RPS_SamplerElement *s_elem;
GNUNET_assert (NULL == gpc->get_peer_task);
gpc->get_peer_task =
GNUNET_SCHEDULER_add_delayed (gpc->sampler->max_round_interval,
- &sampler_get_rand_peer,
+ &sampler_mod_get_rand_peer,
cls);
return;
}
else
client_get_index++;
- LOG (GNUNET_ERROR_TYPE_DEBUG, "incremented index to %" PRIX32 ".\n",
- client_get_index);
+ /* LOG (GNUNET_ERROR_TYPE_DEBUG, "incremented index to %" PRIX32 ".\n",
+ client_get_index); */
} while (EMPTY == gpc->sampler->sampler_elements[client_get_index]->is_empty);
s_elem = gpc->sampler->sampler_elements[client_get_index];
GNUNET_assert (NULL == gpc->get_peer_task);
gpc->get_peer_task =
GNUNET_SCHEDULER_add_delayed (gpc->sampler->max_round_interval,
- &sampler_get_rand_peer,
+ &sampler_mod_get_rand_peer,
cls);
return;
}
s_elem->last_client_request = GNUNET_TIME_absolute_get ();
- GNUNET_CONTAINER_DLL_remove (gpc_head, gpc_tail, gpc);
+ GNUNET_CONTAINER_DLL_remove (gpc->sampler->gpc_head,
+ gpc->sampler->gpc_tail,
+ gpc);
gpc->cont (gpc->cont_cls, gpc->id);
GNUNET_free (gpc);
}
void
RPS_sampler_get_n_rand_peers (struct RPS_Sampler *sampler,
RPS_sampler_n_rand_peers_ready_cb cb,
- void *cls, uint32_t num_peers, int for_client)
+ void *cls, uint32_t num_peers)
{
GNUNET_assert (0 != sampler->sampler_size);
+ if (0 == num_peers)
+ return;
// TODO check if we have too much (distinct) sampled peers
uint32_t i;
cb_cls->cls = cls;
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Scheduling requests for %" PRIX32 " peers\n", num_peers);
+ "Scheduling requests for %" PRIu32 " peers\n", num_peers);
- for ( i = 0 ; i < num_peers ; i++ )
+ for (i = 0 ; i < num_peers ; i++)
{
gpc = GNUNET_new (struct GetPeerCls);
gpc->sampler = sampler;
gpc->id = &cb_cls->ids[i];
// maybe add a little delay
- if (GNUNET_YES == for_client)
- gpc->get_peer_task = GNUNET_SCHEDULER_add_now (&sampler_get_rand_peer, gpc);
- else if (GNUNET_NO == for_client)
- gpc->get_peer_task = GNUNET_SCHEDULER_add_now (&sampler_get_rand_peer2, gpc);
- else
- GNUNET_abort ();
+ gpc->get_peer_task = GNUNET_SCHEDULER_add_now (sampler->get_peers, gpc);
- GNUNET_CONTAINER_DLL_insert (gpc_head, gpc_tail, gpc);
+ GNUNET_CONTAINER_DLL_insert (sampler->gpc_head,
+ sampler->gpc_tail,
+ gpc);
}
}
{
struct GetPeerCls *i;
- for (i = gpc_head; NULL != i; i = gpc_head)
+ for (i = sampler->gpc_head; NULL != i; i = sampler->gpc_head)
{
- GNUNET_CONTAINER_DLL_remove (gpc_head, gpc_tail, i);
+ GNUNET_CONTAINER_DLL_remove (sampler->gpc_head,
+ sampler->gpc_tail,
+ i);
GNUNET_SCHEDULER_cancel (i->get_peer_task);
GNUNET_free (i);
}
projects / oweals / gnunet.git / blobdiff