X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Frps%2Fgnunet-service-rps_sampler.c;h=b51867d28b942e32b8edd392e08ec419451ef767;hb=36fd53ed6ae7c60d4b49cea614d18aa6d58843a1;hp=f1fa53e01c8fdc6bf9eff44e311a5fcd06932561;hpb=3a30016f3eb61c60156d7f53237e3690662c2dcc;p=oweals%2Fgnunet.git diff --git a/src/rps/gnunet-service-rps_sampler.c b/src/rps/gnunet-service-rps_sampler.c index f1fa53e01..b51867d28 100644 --- a/src/rps/gnunet-service-rps_sampler.c +++ b/src/rps/gnunet-service-rps_sampler.c @@ -14,8 +14,8 @@ 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. */ /** @@ -32,8 +32,11 @@ #include #include +#include "rps-test_util.h" + #define LOG(kind, ...) GNUNET_log_from(kind,"rps-sampler",__VA_ARGS__) + // multiple 'clients'? // TODO check for overflows @@ -102,115 +105,194 @@ struct RPS_SamplerElement * 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); + /** - * Sampler with its own array of SamplerElements + * Closure for #sampler_mod_get_rand_peer() and #sampler_get_rand_peer */ -struct RPS_Sampler +struct GetPeerCls { /** - * Number of sampler elements we hold. - */ - unsigned int sampler_size; - //size_t size; - - /** - * All Samplers in one array. + * DLL */ - struct RPS_SamplerElement **sampler_elements; + struct GetPeerCls *next; /** - * Max time a round takes - * - * Used in the context of RPS + * DLL */ - struct GNUNET_TIME_Relative max_round_interval; -}; + struct GetPeerCls *prev; -/** - * Closure to _get_n_rand_peers_ready_cb() - */ -struct NRandPeersReadyCls -{ /** - * Number of peers we are waiting for. + * The sampler this function operates on. */ - uint32_t num_peers; + struct RPS_Sampler *sampler; /** - * Number of peers we currently have. + * The task for this function. */ - uint32_t cur_num_peers; + struct GNUNET_SCHEDULER_Task *get_peer_task; /** - * Pointer to the array holding the ids. + * The callback */ - struct GNUNET_PeerIdentity *ids; + RPS_sampler_rand_peer_ready_cont cont; /** - * Callback to be called when all ids are available. + * The closure to the callback @e cont */ - RPS_sampler_n_rand_peers_ready_cb callback; + void *cont_cls; /** - * Closure given to the callback + * The address of the id to be stored at */ - void *cls; + struct GNUNET_PeerIdentity *id; }; + /** - * 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 + * Type of function used to differentiate between modified and not modified + * Sampler. */ typedef void -(*RPS_sampler_rand_peer_ready_cont) (void *cls, - const struct GNUNET_PeerIdentity *id); +(*RPS_get_peers_type) (void *cls, + const struct GNUNET_SCHEDULER_TaskContext *tc); /** - * Closure for #sampler_get_rand_peer() + * 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 */ -struct GetPeerCls +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 + */ +struct RPS_Sampler { /** - * DLL + * Number of sampler elements we hold. */ - struct GetPeerCls *next; + unsigned int sampler_size; + //size_t size; /** - * DLL + * All sampler elements in one array. */ - struct GetPeerCls *prev; + struct RPS_SamplerElement **sampler_elements; /** - * The sampler this function operates on. + * Number of sampler elements trash can holds. */ - struct RPS_Sampler *sampler; + unsigned int trash_can_size; /** - * The task for this function. + * 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 */ - struct GNUNET_SCHEDULER_Task *get_peer_task; + struct RPS_SamplerElement **trash_can; /** - * The callback + * Maximum time a round takes + * + * Used in the context of RPS */ - RPS_sampler_rand_peer_ready_cont cont; + struct GNUNET_TIME_Relative max_round_interval; /** - * The closure to the callback @e cont + * Stores the function to return peers. Which one it is depends on whether + * the Sampler is the modified one or not. */ - void *cont_cls; + RPS_get_peers_type get_peers; /** - * The address of the id to be stored at + * Head for the DLL to store the closures to pending requests. */ - struct GNUNET_PeerIdentity *id; + struct GetPeerCls *gpc_head; + + /** + * Tail for the DLL to store the closures to pending requests. + */ + struct GetPeerCls *gpc_tail; + + #ifdef TO_FILE + /** + * File name to log to + */ + char *file_name; + #endif /* TO_FILE */ }; +/** + * Closure to _get_n_rand_peers_ready_cb() + */ +struct NRandPeersReadyCls +{ + /** + * Number of peers we are waiting for. + */ + uint32_t num_peers; + + /** + * Number of peers we currently have. + */ + uint32_t cur_num_peers; + + /** + * Pointer to the array holding the ids. + */ + struct GNUNET_PeerIdentity *ids; + + /** + * Callback to be called when all ids are available. + */ + RPS_sampler_n_rand_peers_ready_cb callback; + + /** + * Closure given to the callback + */ + void *cls; +}; ///** // * Global sampler variable. @@ -239,11 +321,6 @@ static size_t max_size; static uint32_t client_get_index; -/** FIXME document */ -static struct GetPeerCls *gpc_head; -static struct GetPeerCls *gpc_tail; - - /** * Callback to _get_rand_peer() used by _get_n_rand_peers(). * @@ -290,6 +367,15 @@ RPS_sampler_elem_reinit (struct RPS_SamplerElement *sampler_el) &(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 (); @@ -327,13 +413,17 @@ RPS_sampler_elem_create (void) */ 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", @@ -364,6 +454,8 @@ RPS_sampler_elem_next (struct RPS_SamplerElement *s_elem, 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++; } @@ -376,6 +468,10 @@ RPS_sampler_elem_next (struct RPS_SamplerElement *s_elem, } } s_elem->is_empty = NOT_EMPTY; + + to_file (s_elem->file_name, + "Now holding %s", + GNUNET_i2s_full (&s_elem->peer_id)); } @@ -410,23 +506,64 @@ sampler_resize (struct RPS_Sampler *sampler, unsigned int new_size) 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, + "Growing sampler %d -> %d\n", + old_size, + new_size); - for ( i = old_size ; i < new_size ; i++ ) + 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++) { /* Add new sampler elements */ sampler->sampler_elements[i] = RPS_sampler_elem_create (); + + to_file (sampler->file_name, + "+%" PRIu32 ": %s", + i, + sampler->sampler_elements[i]->file_name); } } else @@ -470,29 +607,37 @@ sampler_empty (struct RPS_Sampler *sampler) * 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); @@ -503,6 +648,31 @@ RPS_sampler_init (size_t 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 @@ -516,10 +686,23 @@ RPS_sampler_update (struct RPS_Sampler *sampler, { 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); + } } @@ -536,12 +719,20 @@ RPS_sampler_reinitialise_by_value (struct RPS_Sampler *sampler, 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]); } } @@ -556,13 +747,13 @@ RPS_sampler_reinitialise_by_value (struct RPS_Sampler *sampler, * 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 = 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; @@ -573,19 +764,31 @@ sampler_get_rand_peer2 (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc 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); } @@ -597,7 +800,8 @@ sampler_get_rand_peer2 (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc * 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 = cls; struct GNUNET_PeerIdentity tmp_id; @@ -632,7 +836,7 @@ sampler_get_rand_peer (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) 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; } @@ -651,8 +855,8 @@ sampler_get_rand_peer (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) 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]; @@ -679,7 +883,7 @@ sampler_get_rand_peer (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) 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; } @@ -688,7 +892,9 @@ sampler_get_rand_peer (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) 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); } @@ -711,9 +917,11 @@ sampler_get_rand_peer (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) 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; @@ -728,9 +936,9 @@ RPS_sampler_get_n_rand_peers (struct RPS_Sampler *sampler, 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; @@ -739,14 +947,11 @@ RPS_sampler_get_n_rand_peers (struct RPS_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_assert (0); + 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); } } @@ -785,9 +990,11 @@ RPS_sampler_destroy (struct RPS_Sampler *sampler) { 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); }