[SCM] Samba Shared Repository - branch master updated

David Disseldorp ddiss at samba.org
Tue Oct 7 09:04:01 MDT 2014


The branch, master has been updated
       via  bdebf96 idl: Fix a typo
       via  cfc1e72 smbd: Simplify remove_child_pid
       via  1044497 status: 80 chars per line
       via  0fa1689 smbd: Fix nonempty line endings
      from  8cc41b0 lanman: don't leak cache_path onto talloc tos

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit bdebf96cab66be3743ba82463ca852ed57c1ed7e
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Oct 6 15:17:54 2014 +0000

    idl: Fix a typo
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: David Disseldorp <ddiss at samba.org>
    
    Autobuild-User(master): David Disseldorp <ddiss at samba.org>
    Autobuild-Date(master): Tue Oct  7 17:03:42 CEST 2014 on sn-devel-104

commit cfc1e727da856259b6229cdb46e982c6539824f4
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Oct 6 14:12:52 2014 +0000

    smbd: Simplify remove_child_pid
    
    In this if-branch ret is always != 0.
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: David Disseldorp <ddiss at samba.org>

commit 10444972d27dbf0627696d959688181c9fdf6d62
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Sep 30 12:51:37 2014 +0000

    status: 80 chars per line
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: David Disseldorp <ddiss at samba.org>

commit 0fa16895f12050987c086a9ee27d6cf1b5be7251
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Sep 11 16:46:39 2014 +0200

    smbd: Fix nonempty line endings
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: David Disseldorp <ddiss at samba.org>

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

Summary of changes:
 source3/librpc/idl/perfcount.idl |    2 +-
 source3/profile/profile.c        |   29 +-
 source3/smbd/server.c            |    2 +-
 source3/utils/status_profile.c   | 1101 +++++++++++++++++++++++++-------------
 4 files changed, 750 insertions(+), 384 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/librpc/idl/perfcount.idl b/source3/librpc/idl/perfcount.idl
index e9a4383..e797e01 100644
--- a/source3/librpc/idl/perfcount.idl
+++ b/source3/librpc/idl/perfcount.idl
@@ -156,7 +156,7 @@
 		   PerfTime, and having it there will make my offset math much easier. */
 		uint32 Padding;
 		/* Now when I'm marshalling this, I'll need to call prs_align_uint64()
-		   before I start encodint the uint64 structs */
+		   before I start encoding the uint64 structs */
 		/* clock rate * seconds uptime */
 		hyper PerfTime;
 		/* The clock rate of the CPU */
diff --git a/source3/profile/profile.c b/source3/profile/profile.c
index 9367ff4..7aeee85 100644
--- a/source3/profile/profile.c
+++ b/source3/profile/profile.c
@@ -1,4 +1,4 @@
-/* 
+/*
    Unix SMB/CIFS implementation.
    store smbd profiling information in shared memory
    Copyright (C) Andrew Tridgell 1999
@@ -8,12 +8,12 @@
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 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, see <http://www.gnu.org/licenses/>.
 
@@ -102,8 +102,8 @@ static void profile_message(struct messaging_context *msg_ctx,
 receive a request profile level message
 ****************************************************************************/
 static void reqprofile_message(struct messaging_context *msg_ctx,
-			       void *private_data, 
-			       uint32_t msg_type, 
+			       void *private_data,
+			       uint32_t msg_type,
 			       struct server_id src,
 			       DATA_BLOB *data)
 {
@@ -129,33 +129,32 @@ bool profile_setup(struct messaging_context *msg_ctx, bool rdonly)
  again:
 	/* try to use an existing key */
 	shm_id = shmget(PROF_SHMEM_KEY, 0, 0);
-	
+
 	/* if that failed then create one. There is a race condition here
 	   if we are running from inetd. Bad luck. */
 	if (shm_id == -1) {
 		if (read_only) return False;
-		shm_id = shmget(PROF_SHMEM_KEY, sizeof(*profile_h), 
+		shm_id = shmget(PROF_SHMEM_KEY, sizeof(*profile_h),
 				IPC_CREAT | IPC_EXCL | IPC_PERMS);
 	}
-	
+
 	if (shm_id == -1) {
-		DEBUG(0,("Can't create or use IPC area. Error was %s\n", 
+		DEBUG(0,("Can't create or use IPC area. Error was %s\n",
 			 strerror(errno)));
 		return False;
-	}   
-	
-	
-	profile_h = (struct profile_header *)shmat(shm_id, 0, 
+	}
+
+	profile_h = (struct profile_header *)shmat(shm_id, 0,
 						   read_only?SHM_RDONLY:0);
 	if ((long)profile_h == -1) {
-		DEBUG(0,("Can't attach to IPC area. Error was %s\n", 
+		DEBUG(0,("Can't attach to IPC area. Error was %s\n",
 			 strerror(errno)));
 		return False;
 	}
 
 	/* find out who created this memory area */
 	if (shmctl(shm_id, IPC_STAT, &shm_ds) != 0) {
-		DEBUG(0,("ERROR shmctl : can't IPC_STAT. Error was %s\n", 
+		DEBUG(0,("ERROR shmctl : can't IPC_STAT. Error was %s\n",
 			 strerror(errno)));
 		return False;
 	}
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 8b9a1c1..0d649e1 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -424,7 +424,7 @@ static void remove_child_pid(struct smbd_parent_context *parent,
 
 	if ((ret != 0) && (ret != ENOENT)) {
 		DEBUG(10, ("%s: messaging_cleanup returned %s\n",
-			   __func__, ret ? strerror(ret) : "ok"));
+			   __func__, strerror(ret)));
 	}
 
 	for (child = parent->children; child != NULL; child = child->next) {
diff --git a/source3/utils/status_profile.c b/source3/utils/status_profile.c
index 153fba6..282dea3 100644
--- a/source3/utils/status_profile.c
+++ b/source3/utils/status_profile.c
@@ -49,390 +49,757 @@ bool status_profile_dump(bool verbose)
 		return False;
 	}
 
-	d_printf("smb_count:                      %u\n", profile_p->smb_count);
-	d_printf("uid_changes:                    %u\n", profile_p->uid_changes);
+	d_printf("smb_count:                      %u\n",
+		 profile_p->smb_count);
+	d_printf("uid_changes:                    %u\n",
+		 profile_p->uid_changes);
 
 	profile_separator("System Calls");
-	d_printf("opendir_count:                  %u\n", profile_p->syscall_opendir_count);
-	d_printf("opendir_time:                   %u\n", profile_p->syscall_opendir_time);
-	d_printf("fdopendir_count:                %u\n", profile_p->syscall_fdopendir_count);
-	d_printf("fdopendir_time:                 %u\n", profile_p->syscall_fdopendir_time);
-	d_printf("readdir_count:                  %u\n", profile_p->syscall_readdir_count);
-	d_printf("readdir_time:                   %u\n", profile_p->syscall_readdir_time);
-	d_printf("mkdir_count:                    %u\n", profile_p->syscall_mkdir_count);
-	d_printf("mkdir_time:                     %u\n", profile_p->syscall_mkdir_time);
-	d_printf("rmdir_count:                    %u\n", profile_p->syscall_rmdir_count);
-	d_printf("rmdir_time:                     %u\n", profile_p->syscall_rmdir_time);
-	d_printf("closedir_count:                 %u\n", profile_p->syscall_closedir_count);
-	d_printf("closedir_time:                  %u\n", profile_p->syscall_closedir_time);
-	d_printf("open_count:                     %u\n", profile_p->syscall_open_count);
-	d_printf("open_time:                      %u\n", profile_p->syscall_open_time);
-	d_printf("close_count:                    %u\n", profile_p->syscall_close_count);
-	d_printf("close_time:                     %u\n", profile_p->syscall_close_time);
-	d_printf("read_count:                     %u\n", profile_p->syscall_read_count);
-	d_printf("read_time:                      %u\n", profile_p->syscall_read_time);
-	d_printf("read_bytes:                     %u\n", profile_p->syscall_read_bytes);
-	d_printf("write_count:                    %u\n", profile_p->syscall_write_count);
-	d_printf("write_time:                     %u\n", profile_p->syscall_write_time);
-	d_printf("write_bytes:                    %u\n", profile_p->syscall_write_bytes);
-	d_printf("pread_count:                    %u\n", profile_p->syscall_pread_count);
-	d_printf("pread_time:                     %u\n", profile_p->syscall_pread_time);
-	d_printf("pread_bytes:                    %u\n", profile_p->syscall_pread_bytes);
-	d_printf("pwrite_count:                   %u\n", profile_p->syscall_pwrite_count);
-	d_printf("pwrite_time:                    %u\n", profile_p->syscall_pwrite_time);
-	d_printf("pwrite_bytes:                   %u\n", profile_p->syscall_pwrite_bytes);
-	d_printf("sendfile_count:                 %u\n", profile_p->syscall_sendfile_count);
-	d_printf("sendfile_time:                  %u\n", profile_p->syscall_sendfile_time);
-	d_printf("sendfile_bytes:                 %u\n", profile_p->syscall_sendfile_bytes);
-	d_printf("lseek_count:                    %u\n", profile_p->syscall_lseek_count);
-	d_printf("lseek_time:                     %u\n", profile_p->syscall_lseek_time);
-	d_printf("rename_count:                   %u\n", profile_p->syscall_rename_count);
-	d_printf("rename_time:                    %u\n", profile_p->syscall_rename_time);
-	d_printf("fsync_count:                    %u\n", profile_p->syscall_fsync_count);
-	d_printf("fsync_time:                     %u\n", profile_p->syscall_fsync_time);
-	d_printf("stat_count:                     %u\n", profile_p->syscall_stat_count);
-	d_printf("stat_time:                      %u\n", profile_p->syscall_stat_time);
-	d_printf("fstat_count:                    %u\n", profile_p->syscall_fstat_count);
-	d_printf("fstat_time:                     %u\n", profile_p->syscall_fstat_time);
-	d_printf("lstat_count:                    %u\n", profile_p->syscall_lstat_count);
-	d_printf("lstat_time:                     %u\n", profile_p->syscall_lstat_time);
-	d_printf("unlink_count:                   %u\n", profile_p->syscall_unlink_count);
-	d_printf("unlink_time:                    %u\n", profile_p->syscall_unlink_time);
-	d_printf("chmod_count:                    %u\n", profile_p->syscall_chmod_count);
-	d_printf("chmod_time:                     %u\n", profile_p->syscall_chmod_time);
-	d_printf("fchmod_count:                   %u\n", profile_p->syscall_fchmod_count);
-	d_printf("fchmod_time:                    %u\n", profile_p->syscall_fchmod_time);
-	d_printf("chown_count:                    %u\n", profile_p->syscall_chown_count);
-	d_printf("chown_time:                     %u\n", profile_p->syscall_chown_time);
-	d_printf("fchown_count:                   %u\n", profile_p->syscall_fchown_count);
-	d_printf("fchown_time:                    %u\n", profile_p->syscall_fchown_time);
-	d_printf("chdir_count:                    %u\n", profile_p->syscall_chdir_count);
-	d_printf("chdir_time:                     %u\n", profile_p->syscall_chdir_time);
-	d_printf("getwd_count:                    %u\n", profile_p->syscall_getwd_count);
-	d_printf("getwd_time:                     %u\n", profile_p->syscall_getwd_time);
-	d_printf("ntimes_count:                   %u\n", profile_p->syscall_ntimes_count);
-	d_printf("ntimes_time:                    %u\n", profile_p->syscall_ntimes_time);
-	d_printf("ftruncate_count:                %u\n", profile_p->syscall_ftruncate_count);
-	d_printf("ftruncate_time:                 %u\n", profile_p->syscall_ftruncate_time);
-	d_printf("fcntl_lock_count:               %u\n", profile_p->syscall_fcntl_lock_count);
-	d_printf("fcntl_lock_time:                %u\n", profile_p->syscall_fcntl_lock_time);
-	d_printf("readlink_count:                 %u\n", profile_p->syscall_readlink_count);
-	d_printf("readlink_time:                  %u\n", profile_p->syscall_readlink_time);
-	d_printf("symlink_count:                  %u\n", profile_p->syscall_symlink_count);
-	d_printf("symlink_time:                   %u\n", profile_p->syscall_symlink_time);
+	d_printf("opendir_count:                  %u\n",
+		 profile_p->syscall_opendir_count);
+	d_printf("opendir_time:                   %u\n",
+		 profile_p->syscall_opendir_time);
+	d_printf("fdopendir_count:                %u\n",
+		 profile_p->syscall_fdopendir_count);
+	d_printf("fdopendir_time:                 %u\n",
+		 profile_p->syscall_fdopendir_time);
+	d_printf("readdir_count:                  %u\n",
+		 profile_p->syscall_readdir_count);
+	d_printf("readdir_time:                   %u\n",
+		 profile_p->syscall_readdir_time);
+	d_printf("mkdir_count:                    %u\n",
+		 profile_p->syscall_mkdir_count);
+	d_printf("mkdir_time:                     %u\n",
+		 profile_p->syscall_mkdir_time);
+	d_printf("rmdir_count:                    %u\n",
+		 profile_p->syscall_rmdir_count);
+	d_printf("rmdir_time:                     %u\n",
+		 profile_p->syscall_rmdir_time);
+	d_printf("closedir_count:                 %u\n",
+		 profile_p->syscall_closedir_count);
+	d_printf("closedir_time:                  %u\n",
+		 profile_p->syscall_closedir_time);
+	d_printf("open_count:                     %u\n",
+		 profile_p->syscall_open_count);
+	d_printf("open_time:                      %u\n",
+		 profile_p->syscall_open_time);
+	d_printf("close_count:                    %u\n",
+		 profile_p->syscall_close_count);
+	d_printf("close_time:                     %u\n",
+		 profile_p->syscall_close_time);
+	d_printf("read_count:                     %u\n",
+		 profile_p->syscall_read_count);
+	d_printf("read_time:                      %u\n",
+		 profile_p->syscall_read_time);
+	d_printf("read_bytes:                     %u\n",
+		 profile_p->syscall_read_bytes);
+	d_printf("write_count:                    %u\n",
+		 profile_p->syscall_write_count);
+	d_printf("write_time:                     %u\n",
+		 profile_p->syscall_write_time);
+	d_printf("write_bytes:                    %u\n",
+		 profile_p->syscall_write_bytes);
+	d_printf("pread_count:                    %u\n",
+		 profile_p->syscall_pread_count);
+	d_printf("pread_time:                     %u\n",
+		 profile_p->syscall_pread_time);
+	d_printf("pread_bytes:                    %u\n",
+		 profile_p->syscall_pread_bytes);
+	d_printf("pwrite_count:                   %u\n",
+		 profile_p->syscall_pwrite_count);
+	d_printf("pwrite_time:                    %u\n",
+		 profile_p->syscall_pwrite_time);
+	d_printf("pwrite_bytes:                   %u\n",
+		 profile_p->syscall_pwrite_bytes);
+	d_printf("sendfile_count:                 %u\n",
+		 profile_p->syscall_sendfile_count);
+	d_printf("sendfile_time:                  %u\n",
+		 profile_p->syscall_sendfile_time);
+	d_printf("sendfile_bytes:                 %u\n",
+		 profile_p->syscall_sendfile_bytes);
+	d_printf("lseek_count:                    %u\n",
+		 profile_p->syscall_lseek_count);
+	d_printf("lseek_time:                     %u\n",
+		 profile_p->syscall_lseek_time);
+	d_printf("rename_count:                   %u\n",
+		 profile_p->syscall_rename_count);
+	d_printf("rename_time:                    %u\n",
+		 profile_p->syscall_rename_time);
+	d_printf("fsync_count:                    %u\n",
+		 profile_p->syscall_fsync_count);
+	d_printf("fsync_time:                     %u\n",
+		 profile_p->syscall_fsync_time);
+	d_printf("stat_count:                     %u\n",
+		 profile_p->syscall_stat_count);
+	d_printf("stat_time:                      %u\n",
+		 profile_p->syscall_stat_time);
+	d_printf("fstat_count:                    %u\n",
+		 profile_p->syscall_fstat_count);
+	d_printf("fstat_time:                     %u\n",
+		 profile_p->syscall_fstat_time);
+	d_printf("lstat_count:                    %u\n",
+		 profile_p->syscall_lstat_count);
+	d_printf("lstat_time:                     %u\n",
+		 profile_p->syscall_lstat_time);
+	d_printf("unlink_count:                   %u\n",
+		 profile_p->syscall_unlink_count);
+	d_printf("unlink_time:                    %u\n",
+		 profile_p->syscall_unlink_time);
+	d_printf("chmod_count:                    %u\n",
+		 profile_p->syscall_chmod_count);
+	d_printf("chmod_time:                     %u\n",
+		 profile_p->syscall_chmod_time);
+	d_printf("fchmod_count:                   %u\n",
+		 profile_p->syscall_fchmod_count);
+	d_printf("fchmod_time:                    %u\n",
+		 profile_p->syscall_fchmod_time);
+	d_printf("chown_count:                    %u\n",
+		 profile_p->syscall_chown_count);
+	d_printf("chown_time:                     %u\n",
+		 profile_p->syscall_chown_time);
+	d_printf("fchown_count:                   %u\n",
+		 profile_p->syscall_fchown_count);
+	d_printf("fchown_time:                    %u\n",
+		 profile_p->syscall_fchown_time);
+	d_printf("chdir_count:                    %u\n",
+		 profile_p->syscall_chdir_count);
+	d_printf("chdir_time:                     %u\n",
+		 profile_p->syscall_chdir_time);
+	d_printf("getwd_count:                    %u\n",
+		 profile_p->syscall_getwd_count);
+	d_printf("getwd_time:                     %u\n",
+		 profile_p->syscall_getwd_time);
+	d_printf("ntimes_count:                   %u\n",
+		 profile_p->syscall_ntimes_count);
+	d_printf("ntimes_time:                    %u\n",
+		 profile_p->syscall_ntimes_time);
+	d_printf("ftruncate_count:                %u\n",
+		 profile_p->syscall_ftruncate_count);
+	d_printf("ftruncate_time:                 %u\n",
+		 profile_p->syscall_ftruncate_time);
+	d_printf("fcntl_lock_count:               %u\n",
+		 profile_p->syscall_fcntl_lock_count);
+	d_printf("fcntl_lock_time:                %u\n",
+		 profile_p->syscall_fcntl_lock_time);
+	d_printf("readlink_count:                 %u\n",
+		 profile_p->syscall_readlink_count);
+	d_printf("readlink_time:                  %u\n",
+		 profile_p->syscall_readlink_time);
+	d_printf("symlink_count:                  %u\n",
+		 profile_p->syscall_symlink_count);
+	d_printf("symlink_time:                   %u\n",
+		 profile_p->syscall_symlink_time);
 
 	profile_separator("Stat Cache");
-	d_printf("lookups:                        %u\n", profile_p->statcache_lookups);
-	d_printf("misses:                         %u\n", profile_p->statcache_misses);
-	d_printf("hits:                           %u\n", profile_p->statcache_hits);
+	d_printf("lookups:                        %u\n",
+		 profile_p->statcache_lookups);
+	d_printf("misses:                         %u\n",
+		 profile_p->statcache_misses);
+	d_printf("hits:                           %u\n",
+		 profile_p->statcache_hits);
 
 	profile_separator("Write Cache");
-	d_printf("read_hits:                      %u\n", profile_p->writecache_read_hits);
-	d_printf("abutted_writes:                 %u\n", profile_p->writecache_abutted_writes);
-	d_printf("total_writes:                   %u\n", profile_p->writecache_total_writes);
-	d_printf("non_oplock_writes:              %u\n", profile_p->writecache_non_oplock_writes);
-	d_printf("direct_writes:                  %u\n", profile_p->writecache_direct_writes);
-	d_printf("init_writes:                    %u\n", profile_p->writecache_init_writes);
-	d_printf("flushed_writes[SEEK]:           %u\n", profile_p->writecache_flushed_writes[SAMBA_SEEK_FLUSH]);
-	d_printf("flushed_writes[READ]:           %u\n", profile_p->writecache_flushed_writes[SAMBA_READ_FLUSH]);
-	d_printf("flushed_writes[WRITE]:          %u\n", profile_p->writecache_flushed_writes[SAMBA_WRITE_FLUSH]);
-	d_printf("flushed_writes[READRAW]:        %u\n", profile_p->writecache_flushed_writes[SAMBA_READRAW_FLUSH]);
-	d_printf("flushed_writes[OPLOCK_RELEASE]: %u\n", profile_p->writecache_flushed_writes[SAMBA_OPLOCK_RELEASE_FLUSH]);
-	d_printf("flushed_writes[CLOSE]:          %u\n", profile_p->writecache_flushed_writes[SAMBA_CLOSE_FLUSH]);
-	d_printf("flushed_writes[SYNC]:           %u\n", profile_p->writecache_flushed_writes[SAMBA_SYNC_FLUSH]);
-	d_printf("flushed_writes[SIZECHANGE]:     %u\n", profile_p->writecache_flushed_writes[SAMBA_SIZECHANGE_FLUSH]);
-	d_printf("num_perfect_writes:             %u\n", profile_p->writecache_num_perfect_writes);
-	d_printf("num_write_caches:               %u\n", profile_p->writecache_num_write_caches);
-	d_printf("allocated_write_caches:         %u\n", profile_p->writecache_allocated_write_caches);
+	d_printf("read_hits:                      %u\n",
+		 profile_p->writecache_read_hits);
+	d_printf("abutted_writes:                 %u\n",
+		 profile_p->writecache_abutted_writes);
+	d_printf("total_writes:                   %u\n",
+		 profile_p->writecache_total_writes);
+	d_printf("non_oplock_writes:              %u\n",
+		 profile_p->writecache_non_oplock_writes);
+	d_printf("direct_writes:                  %u\n",
+		 profile_p->writecache_direct_writes);
+	d_printf("init_writes:                    %u\n",
+		 profile_p->writecache_init_writes);
+	d_printf("flushed_writes[SEEK]:           %u\n",
+		 profile_p->writecache_flushed_writes[SAMBA_SEEK_FLUSH]);
+	d_printf("flushed_writes[READ]:           %u\n",
+		 profile_p->writecache_flushed_writes[SAMBA_READ_FLUSH]);
+	d_printf("flushed_writes[WRITE]:          %u\n",
+		 profile_p->writecache_flushed_writes[SAMBA_WRITE_FLUSH]);
+	d_printf("flushed_writes[READRAW]:        %u\n",
+		 profile_p->writecache_flushed_writes[SAMBA_READRAW_FLUSH]);
+	d_printf("flushed_writes[OPLOCK_RELEASE]: %u\n",
+		 profile_p->writecache_flushed_writes[SAMBA_OPLOCK_RELEASE_FLUSH]);
+	d_printf("flushed_writes[CLOSE]:          %u\n",
+		 profile_p->writecache_flushed_writes[SAMBA_CLOSE_FLUSH]);
+	d_printf("flushed_writes[SYNC]:           %u\n",
+		 profile_p->writecache_flushed_writes[SAMBA_SYNC_FLUSH]);
+	d_printf("flushed_writes[SIZECHANGE]:     %u\n",
+		 profile_p->writecache_flushed_writes[SAMBA_SIZECHANGE_FLUSH]);
+	d_printf("num_perfect_writes:             %u\n",
+		 profile_p->writecache_num_perfect_writes);
+	d_printf("num_write_caches:               %u\n",
+		 profile_p->writecache_num_write_caches);
+	d_printf("allocated_write_caches:         %u\n",
+		 profile_p->writecache_allocated_write_caches);
 
 	profile_separator("SMB Calls");
-	d_printf("mkdir_count:                    %u\n", profile_p->SMBmkdir_count);
-	d_printf("mkdir_time:                     %u\n", profile_p->SMBmkdir_time);
-	d_printf("rmdir_count:                    %u\n", profile_p->SMBrmdir_count);
-	d_printf("rmdir_time:                     %u\n", profile_p->SMBrmdir_time);
-	d_printf("open_count:                     %u\n", profile_p->SMBopen_count);
-	d_printf("open_time:                      %u\n", profile_p->SMBopen_time);
-	d_printf("create_count:                   %u\n", profile_p->SMBcreate_count);
-	d_printf("create_time:                    %u\n", profile_p->SMBcreate_time);
-	d_printf("close_count:                    %u\n", profile_p->SMBclose_count);
-	d_printf("close_time:                     %u\n", profile_p->SMBclose_time);
-	d_printf("flush_count:                    %u\n", profile_p->SMBflush_count);
-	d_printf("flush_time:                     %u\n", profile_p->SMBflush_time);
-	d_printf("unlink_count:                   %u\n", profile_p->SMBunlink_count);
-	d_printf("unlink_time:                    %u\n", profile_p->SMBunlink_time);
-	d_printf("mv_count:                       %u\n", profile_p->SMBmv_count);
-	d_printf("mv_time:                        %u\n", profile_p->SMBmv_time);
-	d_printf("getatr_count:                   %u\n", profile_p->SMBgetatr_count);
-	d_printf("getatr_time:                    %u\n", profile_p->SMBgetatr_time);
-	d_printf("setatr_count:                   %u\n", profile_p->SMBsetatr_count);
-	d_printf("setatr_time:                    %u\n", profile_p->SMBsetatr_time);
-	d_printf("read_count:                     %u\n", profile_p->SMBread_count);
-	d_printf("read_time:                      %u\n", profile_p->SMBread_time);
-	d_printf("write_count:                    %u\n", profile_p->SMBwrite_count);
-	d_printf("write_time:                     %u\n", profile_p->SMBwrite_time);
-	d_printf("lock_count:                     %u\n", profile_p->SMBlock_count);
-	d_printf("lock_time:                      %u\n", profile_p->SMBlock_time);
-	d_printf("unlock_count:                   %u\n", profile_p->SMBunlock_count);
-	d_printf("unlock_time:                    %u\n", profile_p->SMBunlock_time);
-	d_printf("ctemp_count:                    %u\n", profile_p->SMBctemp_count);
-	d_printf("ctemp_time:                     %u\n", profile_p->SMBctemp_time);
-	d_printf("mknew_count:                    %u\n", profile_p->SMBmknew_count);
-	d_printf("mknew_time:                     %u\n", profile_p->SMBmknew_time);
-	d_printf("checkpath_count:                %u\n", profile_p->SMBcheckpath_count);
-	d_printf("checkpath_time:                 %u\n", profile_p->SMBcheckpath_time);
-	d_printf("exit_count:                     %u\n", profile_p->SMBexit_count);
-	d_printf("exit_time:                      %u\n", profile_p->SMBexit_time);
-	d_printf("lseek_count:                    %u\n", profile_p->SMBlseek_count);
-	d_printf("lseek_time:                     %u\n", profile_p->SMBlseek_time);
-	d_printf("lockread_count:                 %u\n", profile_p->SMBlockread_count);
-	d_printf("lockread_time:                  %u\n", profile_p->SMBlockread_time);
-	d_printf("writeunlock_count:              %u\n", profile_p->SMBwriteunlock_count);
-	d_printf("writeunlock_time:               %u\n", profile_p->SMBwriteunlock_time);
-	d_printf("readbraw_count:                 %u\n", profile_p->SMBreadbraw_count);
-	d_printf("readbraw_time:                  %u\n", profile_p->SMBreadbraw_time);
-	d_printf("readBmpx_count:                 %u\n", profile_p->SMBreadBmpx_count);
-	d_printf("readBmpx_time:                  %u\n", profile_p->SMBreadBmpx_time);
-	d_printf("readBs_count:                   %u\n", profile_p->SMBreadBs_count);
-	d_printf("readBs_time:                    %u\n", profile_p->SMBreadBs_time);
-	d_printf("writebraw_count:                %u\n", profile_p->SMBwritebraw_count);
-	d_printf("writebraw_time:                 %u\n", profile_p->SMBwritebraw_time);
-	d_printf("writeBmpx_count:                %u\n", profile_p->SMBwriteBmpx_count);
-	d_printf("writeBmpx_time:                 %u\n", profile_p->SMBwriteBmpx_time);
-	d_printf("writeBs_count:                  %u\n", profile_p->SMBwriteBs_count);
-	d_printf("writeBs_time:                   %u\n", profile_p->SMBwriteBs_time);
-	d_printf("writec_count:                   %u\n", profile_p->SMBwritec_count);
-	d_printf("writec_time:                    %u\n", profile_p->SMBwritec_time);
-	d_printf("setattrE_count:                 %u\n", profile_p->SMBsetattrE_count);
-	d_printf("setattrE_time:                  %u\n", profile_p->SMBsetattrE_time);
-	d_printf("getattrE_count:                 %u\n", profile_p->SMBgetattrE_count);
-	d_printf("getattrE_time:                  %u\n", profile_p->SMBgetattrE_time);
-	d_printf("lockingX_count:                 %u\n", profile_p->SMBlockingX_count);
-	d_printf("lockingX_time:                  %u\n", profile_p->SMBlockingX_time);
-	d_printf("trans_count:                    %u\n", profile_p->SMBtrans_count);
-	d_printf("trans_time:                     %u\n", profile_p->SMBtrans_time);
-	d_printf("transs_count:                   %u\n", profile_p->SMBtranss_count);
-	d_printf("transs_time:                    %u\n", profile_p->SMBtranss_time);
-	d_printf("ioctl_count:                    %u\n", profile_p->SMBioctl_count);
-	d_printf("ioctl_time:                     %u\n", profile_p->SMBioctl_time);
-	d_printf("ioctls_count:                   %u\n", profile_p->SMBioctls_count);
-	d_printf("ioctls_time:                    %u\n", profile_p->SMBioctls_time);
-	d_printf("copy_count:                     %u\n", profile_p->SMBcopy_count);
-	d_printf("copy_time:                      %u\n", profile_p->SMBcopy_time);
-	d_printf("move_count:                     %u\n", profile_p->SMBmove_count);
-	d_printf("move_time:                      %u\n", profile_p->SMBmove_time);
-	d_printf("echo_count:                     %u\n", profile_p->SMBecho_count);
-	d_printf("echo_time:                      %u\n", profile_p->SMBecho_time);
-	d_printf("writeclose_count:               %u\n", profile_p->SMBwriteclose_count);
-	d_printf("writeclose_time:                %u\n", profile_p->SMBwriteclose_time);
-	d_printf("openX_count:                    %u\n", profile_p->SMBopenX_count);
-	d_printf("openX_time:                     %u\n", profile_p->SMBopenX_time);
-	d_printf("readX_count:                    %u\n", profile_p->SMBreadX_count);
-	d_printf("readX_time:                     %u\n", profile_p->SMBreadX_time);
-	d_printf("writeX_count:                   %u\n", profile_p->SMBwriteX_count);
-	d_printf("writeX_time:                    %u\n", profile_p->SMBwriteX_time);
-	d_printf("trans2_count:                   %u\n", profile_p->SMBtrans2_count);
-	d_printf("trans2_time:                    %u\n", profile_p->SMBtrans2_time);
-	d_printf("transs2_count:                  %u\n", profile_p->SMBtranss2_count);
-	d_printf("transs2_time:                   %u\n", profile_p->SMBtranss2_time);
-	d_printf("findclose_count:                %u\n", profile_p->SMBfindclose_count);
-	d_printf("findclose_time:                 %u\n", profile_p->SMBfindclose_time);
-	d_printf("findnclose_count:               %u\n", profile_p->SMBfindnclose_count);
-	d_printf("findnclose_time:                %u\n", profile_p->SMBfindnclose_time);
-	d_printf("tcon_count:                     %u\n", profile_p->SMBtcon_count);
-	d_printf("tcon_time:                      %u\n", profile_p->SMBtcon_time);
-	d_printf("tdis_count:                     %u\n", profile_p->SMBtdis_count);
-	d_printf("tdis_time:                      %u\n", profile_p->SMBtdis_time);
-	d_printf("negprot_count:                  %u\n", profile_p->SMBnegprot_count);
-	d_printf("negprot_time:                   %u\n", profile_p->SMBnegprot_time);
-	d_printf("sesssetupX_count:               %u\n", profile_p->SMBsesssetupX_count);
-	d_printf("sesssetupX_time:                %u\n", profile_p->SMBsesssetupX_time);
-	d_printf("ulogoffX_count:                 %u\n", profile_p->SMBulogoffX_count);
-	d_printf("ulogoffX_time:                  %u\n", profile_p->SMBulogoffX_time);
-	d_printf("tconX_count:                    %u\n", profile_p->SMBtconX_count);
-	d_printf("tconX_time:                     %u\n", profile_p->SMBtconX_time);
-	d_printf("dskattr_count:                  %u\n", profile_p->SMBdskattr_count);
-	d_printf("dskattr_time:                   %u\n", profile_p->SMBdskattr_time);
-	d_printf("search_count:                   %u\n", profile_p->SMBsearch_count);
-	d_printf("search_time:                    %u\n", profile_p->SMBsearch_time);
-	d_printf("ffirst_count:                   %u\n", profile_p->SMBffirst_count);
-	d_printf("ffirst_time:                    %u\n", profile_p->SMBffirst_time);
-	d_printf("funique_count:                  %u\n", profile_p->SMBfunique_count);
-	d_printf("funique_time:                   %u\n", profile_p->SMBfunique_time);


-- 
Samba Shared Repository


More information about the samba-cvs mailing list