diff options
| author | Volker Lendecke <vl@samba.org> | 2013-03-21 22:00:06 +0100 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2013-03-22 22:10:57 +0100 |
| commit | 12ebb1ba1599dd30db9376a64530667656b803b8 (patch) | |
| tree | 8cbb30527f5b0a7444618e353669ac3dc54a0e8b /source3 | |
| parent | 84dad60672aa5fdc0ff20f5fb8471d5209174063 (diff) | |
| download | samba-12ebb1ba1599dd30db9376a64530667656b803b8.tar.gz samba-12ebb1ba1599dd30db9376a64530667656b803b8.tar.bz2 samba-12ebb1ba1599dd30db9376a64530667656b803b8.zip | |
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@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Fri Mar 22 22:10:57 CET 2013 on sn-devel-104
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/smbd/dir.c | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c index 525f20ec7f..f1c177f2d7 100644 --- a/source3/smbd/dir.c +++ b/source3/smbd/dir.c @@ -1038,12 +1038,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; @@ -1087,16 +1089,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; |