summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
3d54962)
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@2346
48e7efb5-ca39-0410-a469-
dd3cf9ba447f
* - joining the group (with amok_hm_group_join(), so that the master now it)
* - entering the endless loop (with amok_hm_mainloop()).
* - joining the group (with amok_hm_group_join(), so that the master now it)
* - entering the endless loop (with amok_hm_mainloop()).
- * The <b>master</b>, on its side, should create declare the datatypes and messages just like slaves.
+ * The <b>master</b>, on its side, should create declare the datatypes and
+ * messages just like slaves. It should then create a group with
+ * amok_hm_group_new().
+
* Afterward, there is two solutions.
* - If your master is a deamon which never stops itself (just like regular UNIX daemons), it should:
* - register the needed callbacks to messages comming from slaves
* Afterward, there is two solutions.
* - If your master is a deamon which never stops itself (just like regular UNIX daemons), it should:
* - register the needed callbacks to messages comming from slaves
void amok_hm_kill(gras_socket_t buddy);
void amok_hm_kill_sync(gras_socket_t buddy);
void amok_hm_kill(gras_socket_t buddy);
void amok_hm_kill_sync(gras_socket_t buddy);
-xbt_dynar_t amok_hm_group_new(char *group_name);
-xbt_dynar_t amok_hm_group_get(gras_socket_t master,char *group_name);
+xbt_dynar_t amok_hm_group_new(const char *group_name);
+xbt_dynar_t amok_hm_group_get(gras_socket_t master, const char *group_name);
-void amok_hm_group_join(gras_socket_t master, char *group_name);
-void amok_hm_group_leave(gras_socket_t master, char *group_name);
+void amok_hm_group_join(gras_socket_t master, const char *group_name);
+void amok_hm_group_leave(gras_socket_t master, const char *group_name);
-void amok_hm_group_shutdown_local(char *group_name);
-void amok_hm_group_shutdown_remote(gras_socket_t master, char *group_name);
+void amok_hm_group_shutdown(const char *group_name);
+void amok_hm_group_shutdown_remote(gras_socket_t master, const char *group_name);
/* libdata management */
static int amok_hm_libdata_id;
typedef struct {
/* libdata management */
static int amok_hm_libdata_id;
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);
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;
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;
xbt_dict_free(&data->groups);
free (data);
}
xbt_dict_free(&data->groups);
free (data);
}
xbt_dynar_push(group,&dude);
gras_msg_rpcreturn(30, ctx, NULL);
xbt_dynar_push(group,&dude);
gras_msg_rpcreturn(30, ctx, NULL);
return 1;
}
static int amok_hm_cb_leave(gras_msg_cb_ctx_t ctx, void *payload) {
return 1;
}
static int amok_hm_cb_leave(gras_msg_cb_ctx_t ctx, void *payload) {
static int amok_hm_cb_shutdown(gras_msg_cb_ctx_t ctx, void *payload) {
char *name = *(void**)payload;
static int amok_hm_cb_shutdown(gras_msg_cb_ctx_t ctx, void *payload) {
char *name = *(void**)payload;
- amok_hm_group_shutdown_local(name);
+ amok_hm_group_shutdown(name);
gras_msg_rpcreturn(30, ctx, NULL);
return 1;
gras_msg_rpcreturn(30, ctx, NULL);
return 1;
/* Datatype and message declarations */
gras_msgtype_declare("amok_hm_kill",NULL);
/* Datatype and message declarations */
gras_msgtype_declare("amok_hm_kill",NULL);
- gras_msgtype_declare_rpc("amok_hm_kill",NULL,NULL);
+ gras_msgtype_declare_rpc("amok_hm_killrpc",NULL,NULL);
gras_msgtype_declare_rpc("amok_hm_get",
gras_datadesc_by_name("string"),
gras_msgtype_declare_rpc("amok_hm_get",
gras_datadesc_by_name("string"),
*
* The dynar elements are of type xbt_host_t
*/
*
* The dynar elements are of type xbt_host_t
*/
-xbt_dynar_t amok_hm_group_new(char *group_name) {
+xbt_dynar_t amok_hm_group_new(const char *group_name) {
amok_hm_libdata_t g=gras_libdata_by_id(amok_hm_libdata_id);
xbt_dynar_t res = xbt_dynar_new(sizeof(xbt_host_t),
amok_hm_libdata_t g=gras_libdata_by_id(amok_hm_libdata_id);
xbt_dynar_t res = xbt_dynar_new(sizeof(xbt_host_t),
- xbt_dict_set(g->groups,group_name,res,&xbt_dynar_free_voidp);
+ xbt_dict_set(g->groups,group_name,res,NULL); /*FIXME: leaking xbt_dynar_free_voidp);*/
+ VERB1("Group %s created",group_name);
return res;
}
/** \brief retrieve all members of the given remote group */
return res;
}
/** \brief retrieve all members of the given remote group */
-xbt_dynar_t amok_hm_group_get(gras_socket_t master, char *group_name) {
+xbt_dynar_t amok_hm_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"),
xbt_dynar_t res;
gras_msg_rpccall(master,30,gras_msgtype_by_name("amok_hm_get"),
}
/** \brief add current host to the given remote group */
}
/** \brief add current host to the given remote group */
-void amok_hm_group_join(gras_socket_t master, char *group_name) {
+void amok_hm_group_join(gras_socket_t master, const char *group_name) {
gras_msg_rpccall(master,30,gras_msgtype_by_name("amok_hm_join"),
&group_name,NULL);
gras_msg_rpccall(master,30,gras_msgtype_by_name("amok_hm_join"),
&group_name,NULL);
+ VERB3("Joined group '%s' on %s:%d",
+ group_name,gras_socket_peer_name(master),gras_socket_peer_port(master));
}
/** \brief remove current host from the given remote group if found
*
* If not found, call is ignored
*/
}
/** \brief remove current host from the given remote group if found
*
* If not found, call is ignored
*/
-void amok_hm_group_leave(gras_socket_t master, char *group_name) {
+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"),
&group_name,NULL);
gras_msg_rpccall(master,30,gras_msgtype_by_name("amok_hm_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 */
}
/** \brief stops all members of the given local group */
-void amok_hm_group_shutdown_local(char *group_name) {
+void amok_hm_group_shutdown(const char *group_name) {
amok_hm_libdata_t g=gras_libdata_by_id(amok_hm_libdata_id);
xbt_dynar_t group = xbt_dict_get(g->groups, group_name);
amok_hm_libdata_t g=gras_libdata_by_id(amok_hm_libdata_id);
xbt_dynar_t group = xbt_dict_get(g->groups, group_name);
xbt_dict_remove(g->groups,group_name);
}
/** \brief stops all members of the given remote 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, char *group_name){
+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"),
&group_name,NULL);
}
gras_msg_rpccall(master,30,gras_msgtype_by_name("amok_hm_shutdown"),
&group_name,NULL);
}