Commit 78d6a19d authored by Zardosht Kasheff's avatar Zardosht Kasheff Committed by Yoni Fogel

[t:4125], remove cilk code from brt_merge_child

git-svn-id: file:///svn/toku/tokudb@36810 c7de825b-a66e-492c-adef-691d508d4ae1
parent 7d828bbd
...@@ -2959,21 +2959,14 @@ brt_merge_child (struct brt_header* h, BRTNODE node, int childnum_to_merge, BOOL ...@@ -2959,21 +2959,14 @@ brt_merge_child (struct brt_header* h, BRTNODE node, int childnum_to_merge, BOOL
// unlock the parent // unlock the parent
assert(node->dirty); assert(node->dirty);
toku_unpin_brtnode_off_client_thread(h, node); toku_unpin_brtnode_off_client_thread(h, node);
if (childb->height > 0 && nonleaf_node_is_gorged(childb)) {
cilk_spawn flush_some_child(h, childb);
}
else {
toku_unpin_brtnode_off_client_thread(h, childb); toku_unpin_brtnode_off_client_thread(h, childb);
} }
}
if (childa->height > 0 && nonleaf_node_is_gorged(childa)) { if (childa->height > 0 && nonleaf_node_is_gorged(childa)) {
flush_some_child(h, childa); flush_some_child(h, childa);
} }
else { else {
toku_unpin_brtnode_off_client_thread(h, childa); toku_unpin_brtnode_off_client_thread(h, childa);
} }
cilk_sync;
} }
static void static void
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment