Commit 17abe7e7 authored by Howard Chu's avatar Howard Chu
Browse files

ITS#9491 plug memctx leak - frontend already clears it

parent 2b4e8acd
......@@ -355,7 +355,6 @@ retry:
mc->mc_conns[candidate].msc_active--;
asyncmeta_start_one_listener(mc, candidates, bc, candidate);
bc->bc_active--;
asyncmeta_memctx_toggle(thrctx);
ldap_pvt_thread_mutex_unlock( &mc->mc_om_mutex);
rs->sr_err = SLAPD_ASYNCOP;
finish:
......
......@@ -611,8 +611,6 @@ void asyncmeta_drop_bc_from_fconn(bm_context_t *bc);
bm_context_t *
asyncmeta_find_message(ber_int_t msgid, a_metaconn_t *mc, int candidate);
void asyncmeta_memctx_toggle(void *thrctx);
void* asyncmeta_op_handle_result(void *ctx, void *arg);
int asyncmeta_back_cleanup( Operation *op, SlapReply *rs, bm_context_t *bm );
......
......@@ -297,7 +297,6 @@ retry:
mc->mc_conns[candidate].msc_active--;
asyncmeta_start_one_listener(mc, candidates, bc, candidate);
bc->bc_active--;
asyncmeta_memctx_toggle(thrctx);
ldap_pvt_thread_mutex_unlock( &mc->mc_om_mutex);
rs->sr_err = SLAPD_ASYNCOP;
finish:
......
......@@ -290,7 +290,6 @@ retry:
mc->mc_conns[candidate].msc_active--;
asyncmeta_start_one_listener(mc, candidates, bc, candidate);
bc->bc_active--;
asyncmeta_memctx_toggle(thrctx);
ldap_pvt_thread_mutex_unlock( &mc->mc_om_mutex);
rs->sr_err = SLAPD_ASYNCOP;
finish:
......
......@@ -51,22 +51,12 @@ typedef struct listhead {
#define LH_MAX 16
#endif
static void *asyncmeta_memctx_get(void *threadctx)
{
return slap_sl_mem_create(SLAP_SLAB_SIZE, SLAP_SLAB_STACK, threadctx, 1);
}
static void asyncmeta_memctx_put(void *threadctx, void *memctx)
{
slap_sl_mem_setctx(threadctx, NULL);
slap_sl_mem_destroy((void *)1, memctx);
}
void asyncmeta_memctx_toggle(void *thrctx)
{
asyncmeta_memctx_get(thrctx);
}
int asyncmeta_new_bm_context(Operation *op,
SlapReply *rs,
bm_context_t **new_bc,
......
......@@ -349,7 +349,6 @@ retry:
mc->mc_conns[candidate].msc_active--;
asyncmeta_start_one_listener(mc, candidates, bc, candidate);
bc->bc_active--;
asyncmeta_memctx_toggle(thrctx);
ldap_pvt_thread_mutex_unlock( &mc->mc_om_mutex);
rs->sr_err = SLAPD_ASYNCOP;
......
......@@ -360,7 +360,6 @@ retry:
mc->mc_conns[candidate].msc_active--;
asyncmeta_start_one_listener(mc, candidates, bc, candidate);
bc->bc_active--;
asyncmeta_memctx_toggle(thrctx);
ldap_pvt_thread_mutex_unlock( &mc->mc_om_mutex);
rs->sr_err = SLAPD_ASYNCOP;
finish:
......
......@@ -923,7 +923,6 @@ retry:
asyncmeta_start_listeners(mc, candidates, bc);
bc->bc_active--;
asyncmeta_memctx_toggle(thrctx);
ldap_pvt_thread_mutex_unlock( &mc->mc_om_mutex);
rs->sr_err = SLAPD_ASYNCOP;
......
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