[SCM] Samba Shared Repository - branch v3-6-test updated

Karolin Seeger kseeger at samba.org
Sun Apr 7 13:46:03 MDT 2013


The branch, v3-6-test has been updated
       via  565d140 smbd: Tune "dir" a bit.
      from  01192ce BUG 9735: Fix winbind seperator in upn to username conversion.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 565d1409c7c424fbbeed1e98b042d3970b0acf73
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Mar 21 22:00:06 2013 +0100

    smbd: Tune "dir" a bit.
    
    for i in $(seq 1 20000) ; do echo dir ; done | smbclient //127.0.0.1/tmp -U%
    
    without and with this patch:
    
    $ time bin/smbd -d0 -i
    smbd version 4.1.0pre1-GIT-1f139ae started.
    Copyright Andrew Tridgell and the Samba Team 1992-2013
    Beendet
    
    real    0m28.342s
    user    0m10.249s
    sys     0m10.513s
    
    $ time bin/smbd -d0 -i
    smbd version 4.1.0pre1-GIT-1f139ae started.
    Copyright Andrew Tridgell and the Samba Team 1992-2013
    Beendet
    
    real    0m27.348s
    user    0m9.089s
    sys     0m10.853s
    
    The "real" timestamp is irrelevant, this also contains the time between
    starting smbd and the smbclient job. It's the "user" time. The result that this
    patch improves the time spent in user space by 10% is consistent.
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Fix bug #9736 - Change to smbd/dir.c code gives significant performance
    increases on large directory listings.

-----------------------------------------------------------------------

Summary of changes:
 source3/smbd/dir.c |   25 +++++++++++++++++++------
 1 files changed, 19 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index 92be816..f7bc325 100644
--- a/source3/smbd/dir.c
+++ b/source3/smbd/dir.c
@@ -941,12 +941,14 @@ bool smbd_dirptr_get_entry(TALLOC_CTX *ctx,
 			   long *_prev_offset)
 {
 	connection_struct *conn = dirptr->conn;
-	bool needslash;
+	size_t slashlen;
+	size_t pathlen;
 
 	*_smb_fname = NULL;
 	*_mode = 0;
 
-	needslash = ( dirptr->path[strlen(dirptr->path) -1] != '/');
+	pathlen = strlen(dirptr->path);
+	slashlen = ( dirptr->path[pathlen-1] != '/') ? 1 : 0;
 
 	while (true) {
 		long cur_offset;
@@ -990,16 +992,27 @@ bool smbd_dirptr_get_entry(TALLOC_CTX *ctx,
 			continue;
 		}
 
-		pathreal = talloc_asprintf(ctx, "%s%s%s",
-					   dirptr->path,
-					   needslash?"/":"",
-					   dname);
+		/*
+		 * This used to be
+		 * pathreal = talloc_asprintf(ctx, "%s%s%s", dirptr->path,
+		 *			      needslash?"/":"", dname);
+		 * but this was measurably slower than doing the memcpy.
+		 */
+
+		pathreal = talloc_array(
+			ctx, char,
+			pathlen + slashlen + talloc_get_size(dname));
 		if (!pathreal) {
 			TALLOC_FREE(dname);
 			TALLOC_FREE(fname);
 			return false;
 		}
 
+		memcpy(pathreal, dirptr->path, pathlen);
+		pathreal[pathlen] = '/';
+		memcpy(pathreal + slashlen + pathlen, dname,
+		       talloc_get_size(dname));
+
 		/* Create smb_fname with NULL stream_name. */
 		ZERO_STRUCT(smb_fname);
 		smb_fname.base_name = pathreal;


-- 
Samba Shared Repository


More information about the samba-cvs mailing list