Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

[simgrid.git] / src / amok / PeerManagement / peermanagement.c

diff --git a/src/amok/PeerManagement/peermanagement.c b/src/amok/PeerManagement/peermanagement.c
index dc8219d..1f02fe0 100644 (file)
--- a/src/amok/PeerManagement/peermanagement.c
+++ b/src/amok/PeerManagement/peermanagement.c
@@ -54,7 +54,7 @@ static int amok_pm_cb_get(gras_msg_cb_ctx_t ctx, void *payload)
 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* group_name = *(char* *) payload;
+  char *group_name = *(char **) payload;
   xbt_dynar_t group = xbt_dict_get(g->groups, group_name);
   int rank;
 
@@ -64,7 +64,8 @@ static int amok_pm_cb_join(gras_msg_cb_ctx_t ctx, void *payload)
 
   rank = xbt_dynar_length(group);
   xbt_dynar_push(group, &dude);
-  VERB3("Contacted by %s:%d. Give it rank #%d", dude->name, dude->port,rank);
+  XBT_VERB("Contacted by %s:%d. Give it rank #%d", dude->name, dude->port,
+        rank);
 
   gras_msg_rpcreturn(10, ctx, &rank);
   free(group_name);
@@ -90,7 +91,7 @@ static int amok_pm_cb_leave(gras_msg_cb_ctx_t ctx, void *payload)
       goto end;
     }
   }
-  WARN3("Asked to remove %s:%d from group '%s', but not found. Ignoring",
+  XBT_WARN("Asked to remove %s:%d from group '%s', but not found. Ignoring",
         dude->name, dude->port, name);
 
 end:
@@ -148,13 +149,13 @@ xbt_dynar_t amok_pm_group_new(const char *group_name)
   xbt_dynar_t res = xbt_dynar_new(sizeof(xbt_peer_t),
                                   xbt_peer_free_voidp);
 
-  xbt_assert0(amok_pm_moddata_id != -1, "Run amok_pm_init first!");
+  xbt_assert(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_DEBUG("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);
+  XBT_VERB("Group %s created", group_name);
 
   return res;
 }
@@ -175,14 +176,13 @@ xbt_dynar_t amok_pm_group_get(gras_socket_t master, const char *group_name)
 int amok_pm_group_join(gras_socket_t master, const char *group_name)
 {
   int rank;
-  VERB3("Join group '%s' on %s:%d",
+  XBT_VERB("Join group '%s' on %s:%d",
         group_name, gras_socket_peer_name(master),
         gras_socket_peer_port(master));
   gras_msg_rpccall(master, 30, "amok_pm_join", &group_name, &rank);
-  VERB4("Joined group '%s' on %s:%d. Got rank %d",
+  XBT_VERB("Joined group '%s' on %s:%d. Got rank %d",
         group_name, gras_socket_peer_name(master),
-        gras_socket_peer_port(master),
-        rank);
+        gras_socket_peer_port(master), rank);
   return rank;
 }
 
@@ -193,7 +193,7 @@ int amok_pm_group_join(gras_socket_t master, const char *group_name)
 void amok_pm_group_leave(gras_socket_t master, const char *group_name)
 {
   gras_msg_rpccall(master, 30, "amok_pm_leave", &group_name, NULL);
-  VERB3("Leaved group '%s' on %s:%d",
+  XBT_VERB("Leaved group '%s' on %s:%d",
         group_name, gras_socket_peer_name(master),
         gras_socket_peer_port(master));
 }
@@ -236,15 +236,16 @@ 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_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"), gras_datadesc_by_name("int"));
+  gras_msgtype_declare_rpc("amok_pm_join", gras_datadesc_by_name("string"),
+                           gras_datadesc_by_name("int"));
   gras_msgtype_declare_rpc("amok_pm_leave",
                            gras_datadesc_by_name("string"), NULL);
 
@@ -260,7 +261,7 @@ static void _amok_pm_join(void *p)
   mod->groups = NULL;
 
   mod->done = 0;
-  mod->groups = xbt_dict_new();
+  mod->groups = xbt_dict_new_homogeneous(NULL);
 
   /* callbacks */
   gras_cb_register("amok_pm_kill", &amok_pm_cb_kill);
@@ -282,8 +283,7 @@ 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);
+  xbt_dict_free(&mod->groups);
 
   /* callbacks */
   gras_cb_unregister("amok_pm_kill", &amok_pm_cb_kill);
@@ -297,9 +297,9 @@ static void _amok_pm_leave(void *p)
 
 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);
+  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);
 }