r3130: - added a LOCAL-IDTREE test suite

- made idtree return a "struct idr_context *" instead of a void*

- more efficient idr_remove for ids that are not present (patch from Jim Houston)
(This used to be commit f8d12d4b4ae5a38de7869deb782cb8f48504844c)

3 files changed, 103 insertions, 1 deletions

diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index e64d041889..49ab3fba43 100644
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -104,7 +104,8 @@ ADD_OBJ_FILES = \
 		torture/local/iconv.o \
 		torture/local/talloc.o \
 		torture/local/messaging.o \
-		torture/local/binding_string.o
+		torture/local/binding_string.o \
+		torture/local/idtree.o
 REQUIRED_SUBSYSTEMS = \
 		LIBSMB \
 		MESSAGING
diff --git a/source4/torture/local/idtree.c b/source4/torture/local/idtree.c
new file mode 100644
index 0000000000..36360b5917
--- /dev/null
+++ b/source4/torture/local/idtree.c
@@ -0,0 +1,100 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   local testing of idtree routines.
+
+   Copyright (C) Andrew Tridgell 2004
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "includes.h"
+
+BOOL torture_local_idtree(int dummy) 
+{
+	struct idr_context *idr;
+	int i;
+	int *ids;
+	int *present;
+	BOOL ret = True;
+	extern int torture_numops;
+	int n = torture_numops;
+	void *ctx = talloc(NULL, 0);
+
+	idr = idr_init(ctx);
+
+	ids = talloc_zero_array_p(ctx, int, n);
+	present = talloc_zero_array_p(ctx, int, n);
+
+	for (i=0;i<n;i++) {
+		ids[i] = -1;
+	}
+
+	for (i=0;i<n;i++) {
+		int ii = random() % n;
+		void *p = idr_find(idr, ids[ii]);
+		if (present[ii]) {
+			if (p != &ids[ii]) {
+				printf("wrong ptr at %d - %p should be %p\n", 
+				       ii, p, &ids[ii]);
+				ret = False;
+			}
+			if (random() % 7 == 0) {
+				if (idr_remove(idr, ids[ii]) != 0) {
+					printf("remove failed at %d (id=%d)\n", 
+					       i, ids[ii]);
+					ret = False;
+				}
+				present[ii] = 0;
+				ids[ii] = -1;
+			}
+		} else {
+			if (p != NULL) {
+				printf("non-present at %d gave %p (would be %d)\n", 
+				       ii, p, 
+				       (((char *)p) - (char *)(&ids[0])) / sizeof(int));
+				ret = False;
+			}
+			if (random() % 5) {
+				ids[ii] = idr_get_new(idr, &ids[ii], n);
+				if (ids[ii] < 0) {
+					printf("alloc failure at %d (ret=%d)\n", 
+					       ii, ids[ii]);
+					ret = False;
+				} else {
+					present[ii] = 1;
+				}
+			}
+		}
+	}
+
+	printf("done %d random ops\n", i);
+
+	for (i=0;i<n;i++) {
+		if (present[i]) {
+			if (idr_remove(idr, ids[i]) != 0) {
+				printf("delete failed on cleanup at %d (id=%d)\n", 
+				       i, ids[i]);
+				ret = False;
+			}
+		}
+	}
+
+	printf("cleaned up\n");
+
+	talloc_free(ctx);
+
+	return ret;
+}
diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index cb639da653..67f214d558 100644
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -3472,6 +3472,7 @@ static struct {
 	{"LOCAL-TALLOC", torture_local_talloc, 0},
 	{"LOCAL-MESSAGING", torture_local_messaging, 0},
 	{"LOCAL-BINDINGSTRING", torture_local_binding_string, 0},
+	{"LOCAL-IDTREE", torture_local_idtree, 0},
 
 	/* ldap testers */
 	{"LDAP-BASIC", torture_ldap_basic, 0},