added some optimisation for the case where the number of open files is

very large. files.c now promotes a files_struct to the top of the list
if it is used when it is more than 10 elements from the top.

also moved common linked list code for the 5 sets of linked lists that
I've created over the past few days into dlinklist.h (I've explained
to Chris why I didn't use the ubiqx code)
(This used to be commit 1eb9ae2996b5a243a147f485e7e353d54f820852)

2 files changed, 24 insertions, 50 deletions

diff --git a/source3/smbd/conn.c b/source3/smbd/conn.c
index b110e8d082..2afbfb7d7e 100644
--- a/source3/smbd/conn.c
+++ b/source3/smbd/conn.c
@@ -72,10 +72,16 @@ find a conn given a cnum
 ****************************************************************************/
 connection_struct *conn_find(int cnum)
 {
+	int count=0;
 	connection_struct *conn;
 
-	for (conn=Connections;conn;conn=conn->next) {
-		if (conn->cnum == cnum) return conn;
+	for (conn=Connections;conn;conn=conn->next,count++) {
+		if (conn->cnum == cnum) {
+			if (count > 10) {
+				DLIST_PROMOTE(Connections, conn);
+			}
+			return conn;
+		}
 	}
 
 	return NULL;
@@ -114,14 +120,7 @@ connection_struct *conn_new(void)
 	string_init(&conn->connectpath,"");
 	string_init(&conn->origpath,"");
 	
-	/* hook into the front of the list */
-	if (!Connections) {
-		Connections = conn;
-	} else {
-		Connections->prev = conn;
-		conn->next = Connections;
-		Connections = conn;
-	}
+	DLIST_ADD(Connections, conn);
 
 	return conn;
 }
@@ -165,13 +164,7 @@ free a conn structure
 ****************************************************************************/
 void conn_free(connection_struct *conn)
 {
-	if (conn == Connections) {
-		Connections = conn->next;
-		if (Connections) Connections->prev = NULL;
-	} else {
-		conn->prev->next = conn->next;
-		if (conn->next) conn->next->prev = conn->prev;
-	}
+	DLIST_REMOVE(Connections, conn);
 
 	if (conn->ngroups && conn->groups) {
 		free(conn->groups);
diff --git a/source3/smbd/files.c b/source3/smbd/files.c
index 7bd5501de5..fa1b8f3bac 100644
--- a/source3/smbd/files.c
+++ b/source3/smbd/files.c
@@ -100,14 +100,7 @@ files_struct *file_new(void )
 	fsp->fnum = i + FILE_HANDLE_OFFSET;
 	string_init(&fsp->fsp_name,"");
 	
-	/* hook into the front of the list */
-	if (!Files) {
-		Files = fsp;
-	} else {
-		Files->prev = fsp;
-		fsp->next = Files;
-		Files = fsp;
-	}
+	DLIST_ADD(Files, fsp);
 
 	DEBUG(5,("allocated file structure %d (%d used)\n",
 		 i, files_used));
@@ -180,14 +173,7 @@ file_fd_struct *fd_get_new(void)
 	bitmap_set(fd_bmap, i);
 	fd_ptr_used++;
 
-	/* hook into the front of the list */
-	if (!FileFd) {
-		FileFd = fd_ptr;
-	} else {
-		FileFd->prev = fd_ptr;
-		fd_ptr->next = FileFd;
-		FileFd = fd_ptr;
-	}
+	DLIST_ADD(FileFd, fd_ptr);
 
 	DEBUG(5,("allocated fd_ptr structure %d (%d used)\n",
 		 i, fd_ptr_used));
@@ -269,14 +255,18 @@ find a fsp given a device, inode and timevalue
 ****************************************************************************/
 files_struct *file_find_dit(int dev, int inode, struct timeval *tval)
 {
+	int count=0;
 	files_struct *fsp;
 
-	for (fsp=Files;fsp;fsp=fsp->next) {
+	for (fsp=Files;fsp;fsp=fsp->next,count++) {
 		if (fsp->open && 
 		    fsp->fd_ptr->dev == dev && 
 		    fsp->fd_ptr->inode == inode &&
 		    fsp->open_time.tv_sec == tval->tv_sec &&
 		    fsp->open_time.tv_usec == tval->tv_usec) {
+			if (count > 10) {
+				DLIST_PROMOTE(Files, fsp);
+			}
 			return fsp;
 		}
 	}
@@ -320,13 +310,7 @@ free up a fd_ptr
 ****************************************************************************/
 static void fd_ptr_free(file_fd_struct *fd_ptr)
 {
-	if (fd_ptr == FileFd) {
-		FileFd = fd_ptr->next;
-		if (FileFd) FileFd->prev = NULL;
-	} else {
-		fd_ptr->prev->next = fd_ptr->next;
-		if (fd_ptr->next) fd_ptr->next->prev = fd_ptr->prev;
-	}
+	DLIST_REMOVE(FileFd, fd_ptr);
 
 	bitmap_clear(fd_bmap, fd_ptr->fdnum);
 	fd_ptr_used--;
@@ -346,13 +330,7 @@ free up a fsp
 ****************************************************************************/
 void file_free(files_struct *fsp)
 {
-	if (fsp == Files) {
-		Files = fsp->next;
-		if (Files) Files->prev = NULL;
-	} else {
-		fsp->prev->next = fsp->next;
-		if (fsp->next) fsp->next->prev = fsp->prev;
-	}
+	DLIST_REMOVE(Files, fsp);
 
 	string_free(&fsp->fsp_name);
 
@@ -381,16 +359,19 @@ get a fsp from a packet given the offset of a 16 bit fnum
 ****************************************************************************/
 files_struct *file_fsp(char *buf, int where)
 {
-	int fnum;
+	int fnum, count=0;
 	files_struct *fsp;
 
 	if (chain_fsp) return chain_fsp;
 
 	fnum = SVAL(buf, where);
 
-	for (fsp=Files;fsp;fsp=fsp->next) {
+	for (fsp=Files;fsp;fsp=fsp->next, count++) {
 		if (fsp->fnum == fnum) {
 			chain_fsp = fsp;
+			if (count > 10) {
+				DLIST_PROMOTE(Files, fsp);
+			}
 			return fsp;
 		}
 	}