diff options
| author | Stefan Metzmacher <metze@samba.org> | 2014-11-28 09:33:13 +0100 |
|---|---|---|
| committer | Ralph Böhme <slow@samba.org> | 2015-03-06 12:31:10 +0100 |
| commit | 5fa692b4aa36f66a14ae9b1512f881ecef23dca3 (patch) | |
| tree | 5145ddf71b9932e99d65d99e2e1c0b308c5d99e3 /source3 | |
| parent | 7004ccc441f700692b95dba89f8d3c4f30f2ca18 (diff) | |
| download | samba-5fa692b4aa36f66a14ae9b1512f881ecef23dca3.tar.gz samba-5fa692b4aa36f66a14ae9b1512f881ecef23dca3.tar.xz samba-5fa692b4aa36f66a14ae9b1512f881ecef23dca3.zip | |
s3:smbprofile: specify SMBPROFILE_STATS_SECTION_START() with name vs. display[name]
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/include/smbprofile.h | 20 | ||||
| -rw-r--r-- | source3/utils/status_profile.c | 4 |
2 files changed, 12 insertions, 12 deletions
diff --git a/source3/include/smbprofile.h b/source3/include/smbprofile.h index ea241658c0..bf2b3b456f 100644 --- a/source3/include/smbprofile.h +++ b/source3/include/smbprofile.h @@ -26,7 +26,7 @@ #define SMBPROFILE_STATS_ALL_SECTIONS \ SMBPROFILE_STATS_START \ \ - SMBPROFILE_STATS_SECTION_START("SMBD loop") \ + SMBPROFILE_STATS_SECTION_START(global, "SMBD loop") \ SMBPROFILE_STATS_COUNT(connect) \ SMBPROFILE_STATS_COUNT(disconnect) \ SMBPROFILE_STATS_BASIC(idle) \ @@ -37,7 +37,7 @@ SMBPROFILE_STATS_BASIC(pop_sec_ctx) \ SMBPROFILE_STATS_SECTION_END \ \ - SMBPROFILE_STATS_SECTION_START("System Calls") \ + SMBPROFILE_STATS_SECTION_START(syscall, "System Calls") \ SMBPROFILE_STATS_BASIC(syscall_opendir) \ SMBPROFILE_STATS_BASIC(syscall_fdopendir) \ SMBPROFILE_STATS_BASIC(syscall_readdir) \ @@ -96,7 +96,7 @@ SMBPROFILE_STATS_BASIC(syscall_brl_cancel) \ SMBPROFILE_STATS_SECTION_END \ \ - SMBPROFILE_STATS_SECTION_START("ACL Calls") \ + SMBPROFILE_STATS_SECTION_START(acl, "ACL Calls") \ SMBPROFILE_STATS_BASIC(get_nt_acl) \ SMBPROFILE_STATS_BASIC(fget_nt_acl) \ SMBPROFILE_STATS_BASIC(fset_nt_acl) \ @@ -104,13 +104,13 @@ SMBPROFILE_STATS_BASIC(fchmod_acl) \ SMBPROFILE_STATS_SECTION_END \ \ - SMBPROFILE_STATS_SECTION_START("Stat Cache") \ + SMBPROFILE_STATS_SECTION_START(statcache, "Stat Cache") \ SMBPROFILE_STATS_COUNT(statcache_lookups) \ SMBPROFILE_STATS_COUNT(statcache_misses) \ SMBPROFILE_STATS_COUNT(statcache_hits) \ SMBPROFILE_STATS_SECTION_END \ \ - SMBPROFILE_STATS_SECTION_START("Write Cache") \ + SMBPROFILE_STATS_SECTION_START(writecache, "Write Cache") \ SMBPROFILE_STATS_COUNT(writecache_allocations) \ SMBPROFILE_STATS_COUNT(writecache_deallocations) \ SMBPROFILE_STATS_COUNT(writecache_cached_reads) \ @@ -131,7 +131,7 @@ SMBPROFILE_STATS_COUNT(writecache_flush_reason_sizechange) \ SMBPROFILE_STATS_SECTION_END \ \ - SMBPROFILE_STATS_SECTION_START("SMB Calls") \ + SMBPROFILE_STATS_SECTION_START(SMB, "SMB Calls") \ SMBPROFILE_STATS_BASIC(SMBmkdir) \ SMBPROFILE_STATS_BASIC(SMBrmdir) \ SMBPROFILE_STATS_BASIC(SMBopen) \ @@ -209,7 +209,7 @@ SMBPROFILE_STATS_BASIC(SMBinvalid) \ SMBPROFILE_STATS_SECTION_END \ \ - SMBPROFILE_STATS_SECTION_START("Trans2 Calls") \ + SMBPROFILE_STATS_SECTION_START(Trans2, "Trans2 Calls") \ SMBPROFILE_STATS_BASIC(Trans2_open) \ SMBPROFILE_STATS_BASIC(Trans2_findfirst) \ SMBPROFILE_STATS_BASIC(Trans2_findnext) \ @@ -229,7 +229,7 @@ SMBPROFILE_STATS_BASIC(Trans2_report_dfs_inconsistancy) \ SMBPROFILE_STATS_SECTION_END \ \ - SMBPROFILE_STATS_SECTION_START("NT Transact Calls") \ + SMBPROFILE_STATS_SECTION_START(NT_transact, "NT Transact Calls") \ SMBPROFILE_STATS_BASIC(NT_transact_create) \ SMBPROFILE_STATS_BASIC(NT_transact_ioctl) \ SMBPROFILE_STATS_BASIC(NT_transact_set_security_desc) \ @@ -240,7 +240,7 @@ SMBPROFILE_STATS_BASIC(NT_transact_set_user_quota) \ SMBPROFILE_STATS_SECTION_END \ \ - SMBPROFILE_STATS_SECTION_START("SMB2 Calls") \ + SMBPROFILE_STATS_SECTION_START(smb2, "SMB2 Calls") \ SMBPROFILE_STATS_IOBYTES(smb2_negprot) \ SMBPROFILE_STATS_IOBYTES(smb2_sesssetup) \ SMBPROFILE_STATS_IOBYTES(smb2_logoff) \ @@ -323,7 +323,7 @@ struct smbprofile_stats_iobytes_async { struct profile_stats { #define SMBPROFILE_STATS_START -#define SMBPROFILE_STATS_SECTION_START(name) +#define SMBPROFILE_STATS_SECTION_START(name, display) #define SMBPROFILE_STATS_COUNT(name) \ struct smbprofile_stats_count name##_stats; #define SMBPROFILE_STATS_TIME(name) \ diff --git a/source3/utils/status_profile.c b/source3/utils/status_profile.c index f0cf405e18..a0f98d87c8 100644 --- a/source3/utils/status_profile.c +++ b/source3/utils/status_profile.c @@ -53,7 +53,7 @@ bool status_profile_dump(bool verbose) (uintmax_t)profile_p->_stats.field); \ } while(0); #define SMBPROFILE_STATS_START -#define SMBPROFILE_STATS_SECTION_START(name) profile_separator(#name); +#define SMBPROFILE_STATS_SECTION_START(name, display) profile_separator(#display); #define SMBPROFILE_STATS_COUNT(name) do { \ __PRINT_FIELD_LINE(#name, name##_stats, count); \ } while(0); @@ -243,7 +243,7 @@ static uint64_t print_count_samples( } #define SMBPROFILE_STATS_START -#define SMBPROFILE_STATS_SECTION_START(name) +#define SMBPROFILE_STATS_SECTION_START(name, display) #define SMBPROFILE_STATS_COUNT(name) do { \ count += print_count_count_samples(buf, sizeof(buf), \ #name, \ |