ITS#9491 plug memctx leak - frontend already clears it

diff --git a/servers/slapd/back-asyncmeta/add.c b/servers/slapd/back-asyncmeta/add.c
index 31057d21f04b34cc6dabb1ce1b9f348e83fc79b6..f672467e8b517ccd2ff719e63301e02eb62e0800 100644 (file)
--- a/servers/slapd/back-asyncmeta/add.c
+++ b/servers/slapd/back-asyncmeta/add.c
@@ -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:

diff --git a/servers/slapd/back-asyncmeta/back-asyncmeta.h b/servers/slapd/back-asyncmeta/back-asyncmeta.h
index 9068b0d72d53ebd4eeec17ffdf01efc0ac9ce126..550054c1e4f76266f99fe32a88b0fc3044c2ffb8 100644 (file)
--- a/servers/slapd/back-asyncmeta/back-asyncmeta.h
+++ b/servers/slapd/back-asyncmeta/back-asyncmeta.h
@@ -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 );
 

diff --git a/servers/slapd/back-asyncmeta/compare.c b/servers/slapd/back-asyncmeta/compare.c
index 1b8d66638194dfa54e4e191a58825c2577d5eab0..6448197ff3d7f1aee903ed418f761639dd47d41c 100644 (file)
--- a/servers/slapd/back-asyncmeta/compare.c
+++ b/servers/slapd/back-asyncmeta/compare.c
@@ -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:

diff --git a/servers/slapd/back-asyncmeta/delete.c b/servers/slapd/back-asyncmeta/delete.c
index 0fe6c0f3808b3def9f53c06c7c5dc6eee0ecae13..6f7ee9d291b49577f4a5fa213e11852df6cc020c 100644 (file)
--- a/servers/slapd/back-asyncmeta/delete.c
+++ b/servers/slapd/back-asyncmeta/delete.c
@@ -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:

diff --git a/servers/slapd/back-asyncmeta/message_queue.c b/servers/slapd/back-asyncmeta/message_queue.c
index c76e8b68f5b0336f276ed764ed843fd996ff5602..f059545401e1a56d32081ba76d1fc029d4438022 100644 (file)
--- a/servers/slapd/back-asyncmeta/message_queue.c
+++ b/servers/slapd/back-asyncmeta/message_queue.c
@@ -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,

diff --git a/servers/slapd/back-asyncmeta/modify.c b/servers/slapd/back-asyncmeta/modify.c
index c1ad3391a4b6f18f2e258039d4bc08162e989be7..a6a1f5666a4f4c4ef4defd64d9d8474b16458d40 100644 (file)
--- a/servers/slapd/back-asyncmeta/modify.c
+++ b/servers/slapd/back-asyncmeta/modify.c
@@ -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;
 

diff --git a/servers/slapd/back-asyncmeta/modrdn.c b/servers/slapd/back-asyncmeta/modrdn.c
index e78678a35076b639bb4f1f21126ed6eb97e02e1f..970566e4dec4ecb0c4d30b1ac0bf33ae3e536db9 100644 (file)
--- a/servers/slapd/back-asyncmeta/modrdn.c
+++ b/servers/slapd/back-asyncmeta/modrdn.c
@@ -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:

diff --git a/servers/slapd/back-asyncmeta/search.c b/servers/slapd/back-asyncmeta/search.c
index 0a6ed632ce380002b79eaeb173789a5c3b43b86b..5321d007a1a3e4f965a486db33e486777a6cc570 100644 (file)
--- a/servers/slapd/back-asyncmeta/search.c
+++ b/servers/slapd/back-asyncmeta/search.c
@@ -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;