Attachment 14181 Details for Bug 13362 – patch

[patch] patch

patch.txt (text/plain), 4.68 KB, created by Volker Lendecke on 2018-05-07 15:00:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Volker Lendecke

Created: 2018-05-07 15:00:47 UTC

Size: 4.68 KB

patch

obsolete

>From 432bb96b2697e5f600c5678ea5712e23fd68708e Mon Sep 17 00:00:00 2001
>From: Volker Lendecke <vl@samba.org>
>Date: Mon, 7 May 2018 16:41:55 +0200
>Subject: [PATCH 1/3] lib: Put "results_store" into a linked list
>
>Signed-off-by: Volker Lendecke <vl@samba.org>
>---
> lib/ldb/modules/paged_results.c | 25 +++++--------------------
> 1 file changed, 5 insertions(+), 20 deletions(-)
>
>diff --git a/lib/ldb/modules/paged_results.c b/lib/ldb/modules/paged_results.c
>index de014a39699..d7c60416ed8 100644
>--- a/lib/ldb/modules/paged_results.c
>+++ b/lib/ldb/modules/paged_results.c
>@@ -35,6 +35,7 @@
> #include "replace.h"
> #include "system/filesys.h"
> #include "system/time.h"
>+#include "lib/util/dlinklist.h"
> #include "ldb_module.h"
> 
> struct message_store {
>@@ -48,14 +49,13 @@ struct message_store {
> struct private_data;
> 
> struct results_store {
>+	struct results_store *prev, *next;
> 
> 	struct private_data *priv;
> 
> 	char *cookie;
> 	time_t timestamp;
> 
>-	struct results_store *next;
>-
> 	struct message_store *first;
> 	struct message_store *last;
> 	int num_entries;
>@@ -75,22 +75,8 @@ struct private_data {
> static int store_destructor(struct results_store *del)
> {
> 	struct private_data *priv = del->priv;
>-	struct results_store *loop;
>-
>-	if (priv->store == del) {
>-		priv->store = del->next;
>-		return 0;
>-	}
>-
>-	for (loop = priv->store; loop; loop = loop->next) {
>-		if (loop->next == del) {
>-			loop->next = del->next;
>-			return 0;
>-		}
>-	}
>-
>-	/* is not in list ? */
>-	return -1;
>+	DLIST_REMOVE(priv->store, del);
>+	return 0;
> }
> 
> static struct results_store *new_store(struct private_data *priv)
>@@ -120,8 +106,7 @@ static struct results_store *new_store(struct private_data *priv)
> 	newr->first_ref = NULL;
> 	newr->controls = NULL;
> 
>-	newr->next = priv->store;
>-	priv->store = newr;
>+	DLIST_ADD(priv->store, newr);
> 
> 	talloc_set_destructor(newr, store_destructor);
> 
>-- 
>2.11.0
>
>
>From c97586eb179029fbdeb115c4b18e1fb382f3b1bd Mon Sep 17 00:00:00 2001
>From: Volker Lendecke <vl@samba.org>
>Date: Mon, 7 May 2018 16:43:00 +0200
>Subject: [PATCH 2/3] lib: Use "talloc_zero" in paged_results
>
>---
> lib/ldb/modules/paged_results.c | 7 +------
> 1 file changed, 1 insertion(+), 6 deletions(-)
>
>diff --git a/lib/ldb/modules/paged_results.c b/lib/ldb/modules/paged_results.c
>index d7c60416ed8..9807aa24f16 100644
>--- a/lib/ldb/modules/paged_results.c
>+++ b/lib/ldb/modules/paged_results.c
>@@ -88,7 +88,7 @@ static struct results_store *new_store(struct private_data *priv)
> 	 * outstanding paged searches
> 	 */
> 
>-	newr = talloc(priv, struct results_store);
>+	newr = talloc_zero(priv, struct results_store);
> 	if (!newr) return NULL;
> 
> 	newr->priv = priv;
>@@ -101,11 +101,6 @@ static struct results_store *new_store(struct private_data *priv)
> 
> 	newr->timestamp = time(NULL);
> 
>-	newr->first = NULL;
>-	newr->num_entries = 0;
>-	newr->first_ref = NULL;
>-	newr->controls = NULL;
>-
> 	DLIST_ADD(priv->store, newr);
> 
> 	talloc_set_destructor(newr, store_destructor);
>-- 
>2.11.0
>
>
>From 7310bdf938784334bd37dd0f27d1500e86e73128 Mon Sep 17 00:00:00 2001
>From: Volker Lendecke <vl@samba.org>
>Date: Mon, 7 May 2018 16:53:00 +0200
>Subject: [PATCH 3/3] lib: Hold at most 10 outstanding cookies
>
>---
> lib/ldb/modules/paged_results.c | 21 +++++++++++++++++++++
> 1 file changed, 21 insertions(+)
>
>diff --git a/lib/ldb/modules/paged_results.c b/lib/ldb/modules/paged_results.c
>index 9807aa24f16..4f246de9daf 100644
>--- a/lib/ldb/modules/paged_results.c
>+++ b/lib/ldb/modules/paged_results.c
>@@ -36,6 +36,7 @@
> #include "system/filesys.h"
> #include "system/time.h"
> #include "lib/util/dlinklist.h"
>+#include <assert.h>
> #include "ldb_module.h"
> 
> struct message_store {
>@@ -68,6 +69,7 @@ struct results_store {
> 
> struct private_data {
> 	uint32_t next_free_id;
>+	size_t num_stores;
> 	struct results_store *store;
> 	
> };
>@@ -76,6 +78,10 @@ static int store_destructor(struct results_store *del)
> {
> 	struct private_data *priv = del->priv;
> 	DLIST_REMOVE(priv->store, del);
>+
>+	assert(priv->num_stores > 0);
>+	priv->num_stores -= 1;
>+
> 	return 0;
> }
> 
>@@ -103,8 +109,21 @@ static struct results_store *new_store(struct private_data *priv)
> 
> 	DLIST_ADD(priv->store, newr);
> 
>+	assert(priv->num_stores < SIZE_MAX);
>+	priv->num_stores += 1;
>+
> 	talloc_set_destructor(newr, store_destructor);
> 
>+	if (priv->num_stores > 10) {
>+		struct results_store *last;
>+		/*
>+		 * 10 is the default for MaxResultSetsPerConn -- need
>+		 * to parametrize it.
>+		 */
>+		last = DLIST_TAIL(priv->store);
>+		DLIST_REMOVE(priv->store, last);
>+	}
>+
> 	return newr;
> }
> 
>@@ -361,6 +380,8 @@ static int paged_search(struct ldb_module *module, struct ldb_request *req)
> 			return LDB_ERR_UNWILLING_TO_PERFORM;
> 		}
> 
>+		DLIST_PROMOTE(private_data->store, current);
>+
> 		ac->store = current;
> 
> 		/* check if it is an abandon */
>-- 
>2.11.0
>

Actions: View

Attachments on bug 13362: 14180 | 14181 | 14184 | 14185 | 14188 | 14190 | 14201