From ac122a4b27f568306287b03f4eac88943b385481 Mon Sep 17 00:00:00 2001 From: mquinson Date: Wed, 19 Jul 2006 14:19:51 +0000 Subject: [PATCH] Switch from libdata to moddata (to ensure the correctness of the latter, even if Testing can only prove the presence of bugs) git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@2632 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/amok/PeerManagement/peermanagement.c | 235 ++++++++++++----------- 1 file changed, 122 insertions(+), 113 deletions(-) diff --git a/src/amok/PeerManagement/peermanagement.c b/src/amok/PeerManagement/peermanagement.c index 73c383f3ea..3e95db1218 100644 --- a/src/amok/PeerManagement/peermanagement.c +++ b/src/amok/PeerManagement/peermanagement.c @@ -10,58 +10,40 @@ #include "xbt/sysdep.h" #include "xbt/peer.h" #include "amok/peermanagement.h" -#include "gras/Virtu/virtu_interface.h" /* libdata */ + +#include "amok/amok_modinter.h" /* prototype of my module declaration */ +#include "gras/module.h" /* module mecanism */ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(amok_pm,amok,"peer management"); -/* libdata management */ -static int amok_pm_libdata_id=-1; +/* data management */ +int amok_pm_moddata_id=-1; typedef struct { - /* set headers */ - unsigned int ID; - char *name; - unsigned int name_len; - - /* payload */ - int done; - xbt_dict_t groups; -} s_amok_pm_libdata_t, *amok_pm_libdata_t; - -static void *amok_pm_libdata_new() { - amok_pm_libdata_t res=xbt_new(s_amok_pm_libdata_t,1); - res->name=xbt_strdup("amok_pm"); - res->name_len=0; - res->done = 0; - res->groups = xbt_dict_new(); - return res; -} -static void amok_pm_libdata_free(void *d) { - amok_pm_libdata_t data=(amok_pm_libdata_t)d; - free(data->name); - xbt_dict_free(&data->groups); - free (data); -} + int done; + xbt_dict_t groups; +} s_amok_pm_moddata_t, *amok_pm_moddata_t; + /* Message callbacks */ static int amok_pm_cb_kill(gras_msg_cb_ctx_t ctx, void *payload_data) { - amok_pm_libdata_t g=gras_libdata_by_id(amok_pm_libdata_id); + amok_pm_moddata_t g=gras_moddata_by_id(amok_pm_moddata_id); g->done = 1; return 1; } static int amok_pm_cb_killrpc(gras_msg_cb_ctx_t ctx, void *payload_data) { - amok_pm_libdata_t g=gras_libdata_by_id(amok_pm_libdata_id); + amok_pm_moddata_t g=gras_moddata_by_id(amok_pm_moddata_id); g->done = 1; gras_msg_rpcreturn(30,ctx,NULL); return 1; } static int amok_pm_cb_get(gras_msg_cb_ctx_t ctx, void *payload) { - amok_pm_libdata_t g=gras_libdata_by_id(amok_pm_libdata_id); + amok_pm_moddata_t g=gras_moddata_by_id(amok_pm_moddata_id); char *name = *(void**)payload; xbt_dynar_t res = xbt_dict_get(g->groups, name); @@ -69,7 +51,7 @@ static int amok_pm_cb_get(gras_msg_cb_ctx_t ctx, void *payload) { return 1; } static int amok_pm_cb_join(gras_msg_cb_ctx_t ctx, void *payload) { - amok_pm_libdata_t g=gras_libdata_by_id(amok_pm_libdata_id); + amok_pm_moddata_t g=gras_moddata_by_id(amok_pm_moddata_id); char *name = *(void**)payload; xbt_dynar_t group = xbt_dict_get(g->groups, name); @@ -85,7 +67,7 @@ static int amok_pm_cb_join(gras_msg_cb_ctx_t ctx, void *payload) { return 1; } static int amok_pm_cb_leave(gras_msg_cb_ctx_t ctx, void *payload) { - amok_pm_libdata_t g=gras_libdata_by_id(amok_pm_libdata_id); + amok_pm_moddata_t g=gras_moddata_by_id(amok_pm_moddata_id); char *name = *(void**)payload; xbt_dynar_t group = xbt_dict_get(g->groups, name); @@ -119,85 +101,9 @@ static int amok_pm_cb_shutdown(gras_msg_cb_ctx_t ctx, void *payload) { return 1; } - -/* Initialization stuff */ -static short amok_pm_used = 0; - -/** \brief Initialize the peer management module. Every process must run it before use */ -void amok_pm_init() { - /* pure INIT part */ - if (! amok_pm_used) { - - /* dependencies */ - amok_base_init(); - - /* module data on each process */ - amok_pm_libdata_id = gras_procdata_add("amok_pm", - amok_pm_libdata_new, - amok_pm_libdata_free); - - /* Datatype and message declarations */ - gras_msgtype_declare("amok_pm_kill",NULL); - gras_msgtype_declare_rpc("amok_pm_killrpc",NULL,NULL); - - gras_msgtype_declare_rpc("amok_pm_get", - gras_datadesc_by_name("string"), - gras_datadesc_by_name("xbt_dynar_t")); - gras_msgtype_declare_rpc("amok_pm_join", - gras_datadesc_by_name("string"), - NULL); - gras_msgtype_declare_rpc("amok_pm_leave", - gras_datadesc_by_name("string"), - NULL); - - gras_msgtype_declare_rpc("amok_pm_shutdown", - gras_datadesc_by_name("string"), - NULL); - } - amok_pm_used++; - - /* JOIN part */ - gras_cb_register(gras_msgtype_by_name("amok_pm_kill"), - &amok_pm_cb_kill); - gras_cb_register(gras_msgtype_by_name("amok_pm_killrpc"), - &amok_pm_cb_killrpc); - - gras_cb_register(gras_msgtype_by_name("amok_pm_get"), - &amok_pm_cb_get); - gras_cb_register(gras_msgtype_by_name("amok_pm_join"), - &amok_pm_cb_join); - gras_cb_register(gras_msgtype_by_name("amok_pm_leave"), - &amok_pm_cb_leave); - gras_cb_register(gras_msgtype_by_name("amok_pm_shutdown"), - &amok_pm_cb_shutdown); -} - -/** \brief Finalize the peer management module. Every process should run it after use */ -void amok_pm_exit() { - /* pure EXIT part */ - amok_pm_used--; - - /* LEAVE part */ - gras_cb_unregister(gras_msgtype_by_name("amok_pm_kill"), - &amok_pm_cb_kill); - gras_cb_unregister(gras_msgtype_by_name("amok_pm_killrpc"), - &amok_pm_cb_killrpc); - - gras_cb_unregister(gras_msgtype_by_name("amok_pm_get"), - &amok_pm_cb_get); - gras_cb_unregister(gras_msgtype_by_name("amok_pm_join"), - &amok_pm_cb_join); - gras_cb_unregister(gras_msgtype_by_name("amok_pm_leave"), - &amok_pm_cb_leave); - - gras_cb_unregister(gras_msgtype_by_name("amok_pm_shutdown"), - &amok_pm_cb_shutdown); -} - - /** \brief Enter the main loop of the program. It won't return until we get a kill message. */ void amok_pm_mainloop(double timeOut) { - amok_pm_libdata_t g=gras_libdata_by_id(amok_pm_libdata_id); + amok_pm_moddata_t g=gras_moddata_by_id(amok_pm_moddata_id); while (!g->done) { gras_msg_handle(timeOut); @@ -227,12 +133,14 @@ void amok_pm_kill_sync(gras_socket_t buddy) { * The dynar elements are of type xbt_peer_t */ xbt_dynar_t amok_pm_group_new(const char *group_name) { - amok_pm_libdata_t g; + amok_pm_moddata_t g; xbt_dynar_t res = xbt_dynar_new(sizeof(xbt_peer_t), xbt_peer_free_voidp); - xbt_assert0(amok_pm_libdata_id != -1,"Run amok_pm_init first!"); - g=gras_libdata_by_id(amok_pm_libdata_id); + xbt_assert0(amok_pm_moddata_id != -1,"Run amok_pm_init first!"); + g=gras_moddata_by_id(amok_pm_moddata_id); + + INFO1("retrieved groups=%p",g->groups); xbt_dict_set(g->groups,group_name,res,NULL); /*FIXME: leaking xbt_dynar_free_voidp);*/ VERB1("Group %s created",group_name); @@ -270,7 +178,7 @@ void amok_pm_group_leave(gras_socket_t master, const char *group_name) { /** \brief stops all members of the given local group */ void amok_pm_group_shutdown(const char *group_name) { - amok_pm_libdata_t g=gras_libdata_by_id(amok_pm_libdata_id); + amok_pm_moddata_t g=gras_moddata_by_id(amok_pm_moddata_id); xbt_dynar_t group = xbt_dict_get(g->groups, group_name); int cpt; @@ -288,3 +196,104 @@ void amok_pm_group_shutdown_remote(gras_socket_t master, const char *group_name) gras_msg_rpccall(master,30,gras_msgtype_by_name("amok_pm_shutdown"), &group_name,NULL); } + + +/* * + * * + * * Module management functions + * * + * */ + + + +static void _amok_pm_init(void) { + /* no world-wide globals */ + /* Datatype and message declarations */ + gras_msgtype_declare("amok_pm_kill",NULL); + gras_msgtype_declare_rpc("amok_pm_killrpc",NULL,NULL); + + gras_msgtype_declare_rpc("amok_pm_get", + gras_datadesc_by_name("string"), + gras_datadesc_by_name("xbt_dynar_t")); + gras_msgtype_declare_rpc("amok_pm_join", + gras_datadesc_by_name("string"), + NULL); + gras_msgtype_declare_rpc("amok_pm_leave", + gras_datadesc_by_name("string"), + NULL); + + gras_msgtype_declare_rpc("amok_pm_shutdown", + gras_datadesc_by_name("string"), + NULL); +} + +static void _amok_pm_join(void *p) { + /* moddata management */ + amok_pm_moddata_t mod = (amok_pm_moddata_t)p; + + mod->done = 0; + mod->groups = xbt_dict_new(); + INFO1("groups=%p",mod->groups); + + /* callbacks */ + gras_cb_register(gras_msgtype_by_name("amok_pm_kill"), + &amok_pm_cb_kill); + gras_cb_register(gras_msgtype_by_name("amok_pm_killrpc"), + &amok_pm_cb_killrpc); + + gras_cb_register(gras_msgtype_by_name("amok_pm_get"), + &amok_pm_cb_get); + gras_cb_register(gras_msgtype_by_name("amok_pm_join"), + &amok_pm_cb_join); + gras_cb_register(gras_msgtype_by_name("amok_pm_leave"), + &amok_pm_cb_leave); + gras_cb_register(gras_msgtype_by_name("amok_pm_shutdown"), + &amok_pm_cb_shutdown); +} +static void _amok_pm_exit(void) { + /* no world-wide globals */ +} +static void _amok_pm_leave(void *p) { + /* moddata */ + amok_pm_moddata_t mod = (amok_pm_moddata_t)p; + + xbt_dict_free(&mod->groups); + + /* callbacks */ + gras_cb_unregister(gras_msgtype_by_name("amok_pm_kill"), + &amok_pm_cb_kill); + gras_cb_unregister(gras_msgtype_by_name("amok_pm_killrpc"), + &amok_pm_cb_killrpc); + + gras_cb_unregister(gras_msgtype_by_name("amok_pm_get"), + &amok_pm_cb_get); + gras_cb_unregister(gras_msgtype_by_name("amok_pm_join"), + &amok_pm_cb_join); + gras_cb_unregister(gras_msgtype_by_name("amok_pm_leave"), + &amok_pm_cb_leave); + + gras_cb_unregister(gras_msgtype_by_name("amok_pm_shutdown"), + &amok_pm_cb_shutdown); +} + +void amok_pm_modulecreate() { + gras_module_add("amok_pm", sizeof(s_amok_pm_moddata_t), &amok_pm_moddata_id, + &_amok_pm_init,&_amok_pm_exit,&_amok_pm_join,&_amok_pm_leave); +} + + + +/* * + * * + * * Old module functions (kept for compatibility) + * * + * */ +/** \brief Initialize the peer management module. Every process must run it before use */ +void amok_pm_init() { + gras_module_join("amok_pm"); +} + +/** \brief Finalize the peer management module. Every process should run it after use */ +void amok_pm_exit() { + gras_module_leave("amok_pm"); +} -- 2.20.1