X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/be437b7fa306304527b4b99a22d4bd017586cd68..fc4c8251c04db481742ebe77ceb4cfa64fac7085:/src/amok/PeerManagement/peermanagement.c

diff --git a/src/amok/PeerManagement/peermanagement.c b/src/amok/PeerManagement/peermanagement.c
index 7650f35509..8dc2e7a427 100644
--- a/src/amok/PeerManagement/peermanagement.c
+++ b/src/amok/PeerManagement/peermanagement.c
@@ -10,66 +10,48 @@
 #include "xbt/sysdep.h"
 #include "xbt/peer.h"
 #include "amok/peermanagement.h"
-#include "gras/Virtu/virtu_interface.h" /* libdata */
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(amok_hm,amok,"peer management");
+#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_hm_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_hm_libdata_t, *amok_hm_libdata_t;
-
-static void *amok_hm_libdata_new() {
-  amok_hm_libdata_t res=xbt_new(s_amok_hm_libdata_t,1);
-  res->name=xbt_strdup("amok_hm");
-  res->name_len=0;
-  res->done = 0;
-  res->groups = xbt_dict_new();
-  return res;
-}
-static void amok_hm_libdata_free(void *d) {
-  amok_hm_libdata_t data=(amok_hm_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_hm_cb_kill(gras_msg_cb_ctx_t ctx,
+static int amok_pm_cb_kill(gras_msg_cb_ctx_t ctx,
 			   void             *payload_data) {
 
-  amok_hm_libdata_t g=gras_libdata_by_id(amok_hm_libdata_id);
+  amok_pm_moddata_t g=gras_moddata_by_id(amok_pm_moddata_id);
   g->done = 1;
   return 1;
 }
-static int amok_hm_cb_killrpc(gras_msg_cb_ctx_t ctx,
+static int amok_pm_cb_killrpc(gras_msg_cb_ctx_t ctx,
 			      void             *payload_data) {
 
-  amok_hm_libdata_t g=gras_libdata_by_id(amok_hm_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_hm_cb_get(gras_msg_cb_ctx_t ctx, void *payload) {
-  amok_hm_libdata_t g=gras_libdata_by_id(amok_hm_libdata_id);
+static int amok_pm_cb_get(gras_msg_cb_ctx_t ctx, void *payload) {
+  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);
 
   gras_msg_rpcreturn(30, ctx, &res);
   return 1;
 }
-static int amok_hm_cb_join(gras_msg_cb_ctx_t ctx, void *payload) {
-  amok_hm_libdata_t g=gras_libdata_by_id(amok_hm_libdata_id);
+static int amok_pm_cb_join(gras_msg_cb_ctx_t ctx, void *payload) {
+  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);
   
@@ -84,8 +66,8 @@ static int amok_hm_cb_join(gras_msg_cb_ctx_t ctx, void *payload) {
   free(name);
   return 1;
 }
-static int amok_hm_cb_leave(gras_msg_cb_ctx_t ctx, void *payload) {
-  amok_hm_libdata_t g=gras_libdata_by_id(amok_hm_libdata_id);
+static int amok_pm_cb_leave(gras_msg_cb_ctx_t ctx, void *payload) {
+  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);
   
@@ -111,93 +93,17 @@ static int amok_hm_cb_leave(gras_msg_cb_ctx_t ctx, void *payload) {
   return 1;
 }
 
-static int amok_hm_cb_shutdown(gras_msg_cb_ctx_t ctx, void *payload) {
+static int amok_pm_cb_shutdown(gras_msg_cb_ctx_t ctx, void *payload) {
   char *name = *(void**)payload;
-  amok_hm_group_shutdown(name);
+  amok_pm_group_shutdown(name);
 
   gras_msg_rpcreturn(30, ctx, NULL);
   return 1;
 }
 
-
-/* Initialization stuff */
-static short amok_hm_used = 0;
-
-/** \brief Initialize the peer management module. Every process must run it before use */
-void amok_hm_init() {
-  /* pure INIT part */
-  if (! amok_hm_used) {
-
-    /* dependencies */
-    amok_base_init();
-
-    /* module data on each process */
-    amok_hm_libdata_id = gras_procdata_add("amok_hm",
-					   amok_hm_libdata_new,
-					   amok_hm_libdata_free);
-
-    /* Datatype and message declarations */
-    gras_msgtype_declare("amok_hm_kill",NULL);   
-    gras_msgtype_declare_rpc("amok_hm_killrpc",NULL,NULL);   
-
-    gras_msgtype_declare_rpc("amok_hm_get",
-			     gras_datadesc_by_name("string"),
-			     gras_datadesc_by_name("xbt_dynar_t"));
-    gras_msgtype_declare_rpc("amok_hm_join",
-			     gras_datadesc_by_name("string"),
-			     NULL);
-    gras_msgtype_declare_rpc("amok_hm_leave",
-			     gras_datadesc_by_name("string"),
-			     NULL);
-
-    gras_msgtype_declare_rpc("amok_hm_shutdown",
-			     gras_datadesc_by_name("string"),
-			     NULL);
-  }
-  amok_hm_used++;
-
-  /* JOIN part */
-  gras_cb_register(gras_msgtype_by_name("amok_hm_kill"),
-		   &amok_hm_cb_kill);
-  gras_cb_register(gras_msgtype_by_name("amok_hm_killrpc"),
-		   &amok_hm_cb_killrpc);
-
-  gras_cb_register(gras_msgtype_by_name("amok_hm_get"),
-		   &amok_hm_cb_get);
-  gras_cb_register(gras_msgtype_by_name("amok_hm_join"),
-		   &amok_hm_cb_join);
-  gras_cb_register(gras_msgtype_by_name("amok_hm_leave"),
-		   &amok_hm_cb_leave);
-  gras_cb_register(gras_msgtype_by_name("amok_hm_shutdown"),
-		   &amok_hm_cb_shutdown);
-}
-
-/** \brief Finalize the peer management module. Every process should run it after use */
-void amok_hm_exit() {
-  /* pure EXIT part */
-  amok_hm_used--;
-
-  /* LEAVE part */
-  gras_cb_unregister(gras_msgtype_by_name("amok_hm_kill"),
-		     &amok_hm_cb_kill);
-  gras_cb_unregister(gras_msgtype_by_name("amok_hm_killrpc"),
-		     &amok_hm_cb_killrpc);
-
-  gras_cb_unregister(gras_msgtype_by_name("amok_hm_get"),
-		     &amok_hm_cb_get);
-  gras_cb_unregister(gras_msgtype_by_name("amok_hm_join"),
-		     &amok_hm_cb_join);
-  gras_cb_unregister(gras_msgtype_by_name("amok_hm_leave"),
-		     &amok_hm_cb_leave);
-
-  gras_cb_unregister(gras_msgtype_by_name("amok_hm_shutdown"),
-		     &amok_hm_cb_shutdown);
-}
-
-
 /** \brief Enter the main loop of the program. It won't return until we get a kill message. */
-void amok_hm_mainloop(double timeOut) {
-  amok_hm_libdata_t g=gras_libdata_by_id(amok_hm_libdata_id);
+void amok_pm_mainloop(double timeOut) {
+  amok_pm_moddata_t g=gras_moddata_by_id(amok_pm_moddata_id);
   
   while (!g->done) {
     gras_msg_handle(timeOut);
@@ -205,20 +111,20 @@ void amok_hm_mainloop(double timeOut) {
 }
 
 /** \brief kill a buddy identified by its peername and port */
-void amok_hm_kill_hp(char *name,int port) {
+void amok_pm_kill_hp(char *name,int port) {
   gras_socket_t sock=gras_socket_client(name,port);
-  amok_hm_kill(sock);
+  amok_pm_kill(sock);
   gras_socket_close(sock);
 }
 
 /** \brief kill a buddy to which we have a socket already */
-void amok_hm_kill(gras_socket_t buddy) {
-  gras_msg_send(buddy,gras_msgtype_by_name("amok_hm_kill"),NULL);
+void amok_pm_kill(gras_socket_t buddy) {
+  gras_msg_send(buddy,gras_msgtype_by_name("amok_pm_kill"),NULL);
 }
 
 /** \brief kill syncronously a buddy (do not return before its death) */
-void amok_hm_kill_sync(gras_socket_t buddy) {
-  gras_msg_rpccall(buddy,30,gras_msgtype_by_name("amok_hm_killrpc"),NULL,NULL);
+void amok_pm_kill_sync(gras_socket_t buddy) {
+  gras_msg_rpccall(buddy,30,gras_msgtype_by_name("amok_pm_killrpc"),NULL,NULL);
 }
 
 
@@ -226,13 +132,15 @@ void amok_hm_kill_sync(gras_socket_t buddy) {
  *
  * The dynar elements are of type xbt_peer_t
  */
-xbt_dynar_t amok_hm_group_new(const char *group_name) {
-  amok_hm_libdata_t g;
+xbt_dynar_t amok_pm_group_new(const char *group_name) {
+  amok_pm_moddata_t g;
   xbt_dynar_t res = xbt_dynar_new(sizeof(xbt_peer_t),
 				  xbt_peer_free_voidp);
 
-  xbt_assert0(amok_hm_libdata_id != -1,"Run amok_hm_init first!");
-  g=gras_libdata_by_id(amok_hm_libdata_id);
+  xbt_assert0(amok_pm_moddata_id != -1,"Run amok_pm_init first!");
+  g=gras_moddata_by_id(amok_pm_moddata_id);
+
+  DEBUG1("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);
@@ -240,19 +148,19 @@ xbt_dynar_t amok_hm_group_new(const char *group_name) {
   return res;
 }
 /** \brief retrieve all members of the given remote group */
-xbt_dynar_t amok_hm_group_get(gras_socket_t master, const char *group_name) {
+xbt_dynar_t amok_pm_group_get(gras_socket_t master, const char *group_name) {
   xbt_dynar_t res;
   
-  gras_msg_rpccall(master,30,gras_msgtype_by_name("amok_hm_get"),
+  gras_msg_rpccall(master,30,gras_msgtype_by_name("amok_pm_get"),
 		   &group_name,&res);
   return res;
 }
 
 /** \brief add current peer to the given remote group */
-void        amok_hm_group_join(gras_socket_t master, const char *group_name) {
+void        amok_pm_group_join(gras_socket_t master, const char *group_name) {
   VERB3("Join group '%s' on %s:%d",
 	group_name,gras_socket_peer_name(master),gras_socket_peer_port(master));
-  gras_msg_rpccall(master,30,gras_msgtype_by_name("amok_hm_join"),
+  gras_msg_rpccall(master,30,gras_msgtype_by_name("amok_pm_join"),
 		   &group_name,NULL);
   VERB3("Joined group '%s' on %s:%d",
 	group_name,gras_socket_peer_name(master),gras_socket_peer_port(master));
@@ -261,30 +169,135 @@ void        amok_hm_group_join(gras_socket_t master, const char *group_name) {
  *
  * If not found, call is ignored 
  */
-void        amok_hm_group_leave(gras_socket_t master, const char *group_name) {
-  gras_msg_rpccall(master,30,gras_msgtype_by_name("amok_hm_leave"),
+void        amok_pm_group_leave(gras_socket_t master, const char *group_name) {
+  gras_msg_rpccall(master,30,gras_msgtype_by_name("amok_pm_leave"),
 		   &group_name,NULL);
   VERB3("Leaved group '%s' on %s:%d",
 	group_name,gras_socket_peer_name(master),gras_socket_peer_port(master));
 }
 
 /** \brief stops all members of the given local group */
-void amok_hm_group_shutdown(const char *group_name) {
-  amok_hm_libdata_t g=gras_libdata_by_id(amok_hm_libdata_id);
+void amok_pm_group_shutdown(const char *group_name) {
+  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;
   xbt_peer_t peer_it;
 
   xbt_dynar_foreach(group, cpt, peer_it) {
-    amok_hm_kill_hp(peer_it->name, peer_it->port);
+    amok_pm_kill_hp(peer_it->name, peer_it->port);
   }
 
   xbt_dynar_free(&group);
   xbt_dict_remove(g->groups,group_name);
 }
 /** \brief stops all members of the given remote group */
-void amok_hm_group_shutdown_remote(gras_socket_t master, const char *group_name){
-  gras_msg_rpccall(master,30,gras_msgtype_by_name("amok_hm_shutdown"),
+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_datadesc_type_t pm_group_type = gras_datadesc_dynar(gras_datadesc_by_name("xbt_peer_t"), xbt_peer_free_voidp);
+   
+   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"),
+			    pm_group_type);
+   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->groups = NULL;
+   
+   mod->done = 0;
+   mod->groups = xbt_dict_new();
+   
+   /* 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;
+   
+   if (mod->groups)
+     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");
+}