Skip to content

ZOOKEEPER-4299: Use non lock completion list in zoo_amulti since it is not multithreaded #2256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions zookeeper-client/zookeeper-client-c/src/zookeeper.c
Original file line number Diff line number Diff line change
@@ -3139,10 +3139,9 @@ static int queue_session_event(zhandle_t *zh, int state)
}
//#endif

completion_list_t *dequeue_completion(completion_head_t *list)
{
completion_list_t *dequeue_completion_nolock(completion_head_t *list) {

completion_list_t *cptr;
lock_completion_list(list);
cptr = list->head;
if (cptr) {
list->head = cptr->next;
@@ -3151,6 +3150,14 @@ completion_list_t *dequeue_completion(completion_head_t *list)
list->last = 0;
}
}
return cptr;
}

completion_list_t *dequeue_completion(completion_head_t *list)
{
completion_list_t *cptr;
lock_completion_list(list);
cptr = dequeue_completion_nolock(list);
unlock_completion_list(list);
return cptr;
}
@@ -3159,7 +3166,7 @@ completion_list_t *dequeue_completion(completion_head_t *list)
static void cleanup_failed_multi(zhandle_t *zh, int xid, int rc, completion_list_t *cptr) {
completion_list_t *entry;
completion_head_t *clist = &cptr->c.clist;
while ((entry = dequeue_completion(clist)) != NULL) {
while ((entry = dequeue_completion_nolock(clist)) != NULL) {
// Fake failed response for all sub-requests
deserialize_response(zh, entry->c.type, xid, 1, rc, entry, NULL);
destroy_completion_entry(entry);
@@ -3174,7 +3181,7 @@ static int deserialize_multi(zhandle_t *zh, int xid, completion_list_t *cptr, st
assert(clist);
deserialize_MultiHeader(ia, "multiheader", &mhdr);
while (!mhdr.done) {
completion_list_t *entry = dequeue_completion(clist);
completion_list_t *entry = dequeue_completion_nolock(clist);
assert(entry);

if (mhdr.type == -1) {
@@ -4728,7 +4735,7 @@ int zoo_amulti(zhandle_t *zh, int count, const zoo_op_t *ops,
return ZUNIMPLEMENTED;
}

queue_completion(&clist, entry, 0);
queue_completion_nolock(&clist, entry, 0);
}

rc = rc < 0 ? rc : serialize_MultiHeader(oa, "multiheader", &mh);