sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

ctdb-client: Create sync wrappers for managing message handlers

Browse Source 
This wraps the entire async computation for setting and removing message
handlers instead of calling multiple sync calls.

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
This commit is contained in:
Amitay Isaacs 2017-04-18 16:22:12 +10:00 committed by Martin Schwenke
parent 025ebc0fc8
commit 1469cfb0be
1 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
ctdb/client/client_message.c
View File

@ -544,22 +544,33 @@ int ctdb_client_set_message_handler(struct tevent_context *ev,
void *private_data)
{
TALLOC_CTX *mem_ctx;
struct tevent_req *req;
int ret;
bool status;
mem_ctx = talloc_new(client);
if (mem_ctx == NULL) {
return ENOMEM;
}
ret = ctdb_ctrl_register_srvid(mem_ctx, ev, client, client->pnn,
tevent_timeval_zero(), srvid);
talloc_free(mem_ctx);
if (ret != 0) {
req = ctdb_client_set_message_handler_send(mem_ctx, ev, client,
srvid, handler,
private_data);
if (req == NULL) {
talloc_free(mem_ctx);
return ENOMEM;
}
tevent_req_poll(req, ev);
status = ctdb_client_set_message_handler_recv(req, &ret);
if (! status) {
talloc_free(mem_ctx);
return ret;
}
return srvid_register(client->srv, client, srvid,
handler, private_data);
talloc_free(mem_ctx);
return 0;
}
int ctdb_client_remove_message_handler(struct tevent_context *ev,
@ -567,19 +578,30 @@ int ctdb_client_remove_message_handler(struct tevent_context *ev,
uint64_t srvid, void *private_data)
{
TALLOC_CTX *mem_ctx;
struct tevent_req *req;
int ret;
bool status;
mem_ctx = talloc_new(client);
if (mem_ctx == NULL) {
return ENOMEM;
}
ret = ctdb_ctrl_deregister_srvid(mem_ctx, ev, client, client->pnn,
tevent_timeval_zero(), srvid);
talloc_free(mem_ctx);
if (ret != 0) {
req = ctdb_client_remove_message_handler_send(mem_ctx, ev, client,
srvid, private_data);
if (req == NULL) {
talloc_free(mem_ctx);
return ENOMEM;
}
tevent_req_poll(req, ev);
status = ctdb_client_remove_message_handler_recv(req, &ret);
if (! status) {
talloc_free(mem_ctx);
return ret;
}
return srvid_deregister(client->srv, srvid, private_data);
talloc_free(mem_ctx);
return 0;
}