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 a675eb5..1f02fe0 100644 (file)
--- a/src/amok/PeerManagement/peermanagement.c
+++ b/src/amok/PeerManagement/peermanagement.c
@@ -149,7 +149,7 @@ 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);
 
   XBT_DEBUG("retrieved groups=%p", g->groups);
@@ -261,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);
@@ -283,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);