[SCM] Samba Shared Repository - branch master updated
Ralph Böhme
slow at samba.org
Wed Jul 19 14:21:02 UTC 2017
The branch, master has been updated
via 1b7b7a9 examples: add winbindd.stp and a shell script to generate it
via 995aec5 examples: add gencache.stp
via f7daa45 dbwrap_ctdb: Fix calculation of persistent flag
from bd7eab1 s3:tests: Fix directory creation and deletion of test_nosymlinks()
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 1b7b7a9275af7cc9687aaf8b73015fe2d696394b
Author: Ralph Boehme <slow at samba.org>
Date: Fri Jun 30 19:37:03 2017 +0200
examples: add winbindd.stp and a shell script to generate it
Usage:
Instrument all winbindd processes:
# stap winbindd.stp
Instrument a specific winbindd process:
# stap -x PID winbindd.stp
Example output:
# stap winbindd.stp
Collecting data, press ctrl-C to stop... ^C
Winbind request service time
============================
winbindd_getpwnam_send count: 99, sum: 6229 ms (min: 2669 us, avg: 62921 us, max: 157907 us)
Winbind request runtime
=======================
winbindd_getpwnam_send count: 99, sum: 3 ms (min: 21 us, avg: 36 us, max: 77 us)
Winbind domain-child request service time
=========================================
_wbint_LookupName count: 99, sum: 1403 ms (min: 619 us, avg: 14181 us, max: 136613 us)
_wbint_GetNssInfo count: 99, sum: 0 ms (min: 2 us, avg: 3 us, max: 6 us)
_wbint_LookupSid count: 102, sum: 49 ms (min: 13 us, avg: 481 us, max: 6315 us)
_wbint_Sids2UnixIDs count: 101, sum: 2 ms (min: 18 us, avg: 29 us, max: 49 us)
_wbint_LookupSids count: 101, sum: 84 ms (min: 411 us, avg: 838 us, max: 3524 us)
Winbind domain-child AD-backend service time
============================================
sid_to_name count: 56, sum: 45 ms (min: 431 us, avg: 816 us, max: 6275 us)
sequence_number count: 12, sum: 1209 ms (min: 46618 us, avg: 100803 us, max: 131439 us)
name_to_sid count: 99, sum: 176 ms (min: 547 us, avg: 1781 us, max: 9866 us)
...
Regenerate winbindd.stp:
$ examples/systemtap/generate-winbindd.stp.sh
Signed-off-by: Ralph Boehme <slow at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
Autobuild-User(master): Ralph Böhme <slow at samba.org>
Autobuild-Date(master): Wed Jul 19 16:20:56 CEST 2017 on sn-devel-144
commit 995aec51da659e46cbcc2bc07f4be19a9b0a38d1
Author: Ralph Boehme <slow at samba.org>
Date: Fri Jun 30 12:59:37 2017 +0200
examples: add gencache.stp
Add a Systemtap script to profile gencache.
Usage:
- profile a single smbd process:
# stap -x 22225 gencache.stp smbd
- profile all winbindd proceses:
# stap gencache.stp winbindd
Signed-off-by: Ralph Boehme <slow at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit f7daa453045c787ddab6e04c1fdaa386c231371f
Author: Amitay Isaacs <amitay at gmail.com>
Date: Wed Jul 19 12:04:35 2017 +1000
dbwrap_ctdb: Fix calculation of persistent flag
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12891
Signed-off-by: Amitay Isaacs <amitay at gmail.com>
Reviewed-by: Ralph Boehme <slow at samba.org>
-----------------------------------------------------------------------
Summary of changes:
examples/systemtap/gencache.stp | 124 ++
examples/systemtap/generate-winbindd.stp.sh | 309 +++
examples/systemtap/winbindd.stp | 2859 +++++++++++++++++++++++++++
source3/lib/dbwrap/dbwrap_ctdb.c | 2 +-
4 files changed, 3293 insertions(+), 1 deletion(-)
create mode 100755 examples/systemtap/gencache.stp
create mode 100755 examples/systemtap/generate-winbindd.stp.sh
create mode 100644 examples/systemtap/winbindd.stp
Changeset truncated at 500 lines:
diff --git a/examples/systemtap/gencache.stp b/examples/systemtap/gencache.stp
new file mode 100755
index 0000000..225f0ae
--- /dev/null
+++ b/examples/systemtap/gencache.stp
@@ -0,0 +1,124 @@
+#!/usr/bin/stap
+#
+# Systemtap script to instrument the Samba gencache subsystem
+#
+# Usage:
+#
+# Instrument all smbd processes:
+# # stap gencache.stp smbd
+#
+# Instrument all winbindd processes:
+# # stap gencache.stp winbindd
+#
+# Instrument a specific smbd process:
+# # stap -x PID gencache.stp smbd
+#
+# Instrument a specific winbindd process:
+# # stap -x PID gencache.stp winbindd
+#
+
+global running, intervals
+
+probe begin {
+ printf("Collecting data, press ctrl-C to stop... ")
+}
+
+probe process(@1).library("*").function("gencache_parse") {
+ running["gencache_parse", tid()] = gettimeofday_us()
+}
+
+probe process(@1).library("*").function("gencache_parse").return {
+ if (!(["gencache_parse", tid()] in running))
+ next
+
+ end = gettimeofday_us()
+ begin = running["gencache_parse", tid()]
+ delete running["gencache_parse", tid()]
+
+ duration = end - begin
+ intervals["gencache_parse"] <<< duration
+}
+
+probe process(@1).library("*").function("gencache_get_data_blob") {
+ running["gencache_get_data_blob", tid()] = gettimeofday_us()
+}
+
+probe process(@1).library("*").function("gencache_get_data_blob").return {
+ if (!(["gencache_get_data_blob", tid()] in running))
+ next
+
+ end = gettimeofday_us()
+ begin = running["gencache_get_data_blob", tid()]
+ delete running["gencache_get_data_blob", tid()]
+
+ duration = end - begin
+ intervals["gencache_get_data_blob"] <<< duration
+}
+
+probe process(@1).library("*").function("gencache_set_data_blob") {
+ running["gencache_set_data_blob", tid()] = gettimeofday_us()
+}
+
+probe process(@1).library("*").function("gencache_set_data_blob").return {
+ if (!(["gencache_set_data_blob", tid()] in running))
+ next
+
+ end = gettimeofday_us()
+ begin = running["gencache_set_data_blob", tid()]
+ delete running["gencache_set_data_blob", tid()]
+
+ duration = end - begin
+ intervals["gencache_set_data_blob"] <<< duration
+}
+
+probe process(@1).library("*").function("gencache_del") {
+ running["gencache_del", tid()] = gettimeofday_us()
+}
+
+probe process(@1).library("*").function("gencache_del").return {
+ if (!(["gencache_del", tid()] in running))
+ next
+
+ end = gettimeofday_us()
+ begin = running["gencache_del", tid()]
+ delete running["gencache_del", tid()]
+
+ duration = end - begin
+ intervals["gencache_del"] <<< duration
+}
+
+probe process(@1).library("*").function("gencache_stabilize") {
+ running["gencache_stabilize", tid()] = gettimeofday_us()
+}
+
+probe process(@1).library("*").function("gencache_stabilize").return {
+ if (!(["gencache_stabilize", tid()] in running))
+ next
+
+ end = gettimeofday_us()
+ begin = running["gencache_stabilize", tid()]
+ delete running["gencache_stabilize", tid()]
+
+ duration = end - begin
+ intervals["gencache_stabilize"] <<< duration
+}
+
+probe end {
+ printf("\n\n")
+
+ foreach ([name] in intervals) {
+ printf("%-30s count: %d sum: %d us (min: %d us avg: %d us max: %d us)\n",
+ name,
+ @count(intervals[name]),
+ @sum(intervals[name]),
+ @min(intervals[name]),
+ @avg(intervals[name]),
+ @max(intervals[name]))
+ }
+
+ printf("\n")
+ foreach ([name] in intervals) {
+ printf("%s time distribution histogram:\n", name)
+ println(@hist_log(intervals[name]))
+ }
+}
diff --git a/examples/systemtap/generate-winbindd.stp.sh b/examples/systemtap/generate-winbindd.stp.sh
new file mode 100755
index 0000000..002fb5b
--- /dev/null
+++ b/examples/systemtap/generate-winbindd.stp.sh
@@ -0,0 +1,309 @@
+#!/bin/sh
+
+outfile="$(dirname $0)/winbindd.stp"
+
+child_funcs="winbindd_dual_ping
+winbindd_dual_list_trusted_domains
+winbindd_dual_init_connection
+winbindd_dual_pam_auth
+winbindd_dual_pam_auth_crap
+winbindd_dual_pam_logoff
+winbindd_dual_pam_chng_pswd_auth_crap
+winbindd_dual_pam_chauthtok
+_wbint_LookupSid
+_wbint_LookupSids
+_wbint_LookupName
+_wbint_Sids2UnixIDs
+_wbint_UnixIDs2Sids
+_wbint_AllocateUid
+_wbint_AllocateGid
+_wbint_GetNssInfo
+_wbint_LookupUserAliases
+_wbint_LookupUserGroups
+_wbint_QuerySequenceNumber
+_wbint_LookupGroupMembers
+_wbint_QueryGroupList
+_wbint_QueryUserRidList
+_wbint_DsGetDcName
+_wbint_LookupRids
+_wbint_CheckMachineAccount
+_wbint_ChangeMachineAccount
+_wbint_PingDc"
+
+async_funcs="wb_ping
+winbindd_lookupsid
+winbindd_lookupsids
+winbindd_lookupname
+winbindd_sids_to_xids
+winbindd_xids_to_sids
+winbindd_getpwsid
+winbindd_getpwnam
+winbindd_getpwuid
+winbindd_getsidaliases
+winbindd_getuserdomgroups
+winbindd_getgroups
+winbindd_show_sequence
+winbindd_getgrgid
+winbindd_getgrnam
+winbindd_getusersids
+winbindd_lookuprids
+winbindd_setpwent
+winbindd_getpwent
+winbindd_endpwent
+winbindd_dsgetdcname
+winbindd_getdcname
+winbindd_setgrent
+winbindd_getgrent
+winbindd_endgrent
+winbindd_list_users
+winbindd_list_groups
+winbindd_check_machine_acct
+winbindd_ping_dc
+winbindd_pam_auth
+winbindd_pam_logoff
+winbindd_pam_chauthtok
+winbindd_pam_chng_pswd_auth_crap
+winbindd_wins_byip
+winbindd_wins_byname
+winbindd_allocate_uid
+winbindd_allocate_gid
+winbindd_change_machine_acct
+winbindd_pam_auth_crap"
+
+backend_funcs="query_user_list
+enum_dom_groups
+enum_local_groups
+name_to_sid
+sid_to_name
+rids_to_names
+lookup_usergroups
+lookup_useraliases
+lookup_groupmem
+sequence_number
+lockout_policy
+password_policy
+trusted_domains"
+
+header='#!/usr/bin/stap
+#
+# Systemtap script to instrument winbindd
+#
+'"# Generated by examples/systemtap/$(basename $0) on $(date), do not edit
+#"'
+# Usage:
+#
+# Instrument all winbindd processes:
+# # stap winbindd.stp
+#
+# Instrument a specific winbindd process:
+# # stap -x PID winbindd.stp
+#
+
+global dc_running, dc_svctime
+global backend_running, backend_svctime
+global send_running, recv_running
+global start_time, idle_time
+global async_svctime, async_runtime
+
+probe begin {
+ printf("Collecting data, press ctrl-C to stop... ")
+}'
+
+domchild_req_template='
+#
+# winbind domain child function XXX
+#
+
+probe process("winbindd").function("XXX") {
+ dc_running[tid(), "XXX"] = gettimeofday_us()
+}
+
+probe process("winbindd").function("XXX").return {
+ if (!([tid(), "XXX"] in dc_running))
+ next
+
+ end = gettimeofday_us()
+ begin = dc_running[tid(), "XXX"]
+ delete dc_running[tid(), "XXX"]
+
+ duration = end - begin
+ dc_svctime["XXX"] <<< duration
+}'
+
+backend_req_template='
+#
+# winbind domain child backend function XXX
+#
+
+probe process("winbindd").function("XXX at ../source3/winbindd/winbindd_ads.c") {
+ backend_running[tid(), "XXX"] = gettimeofday_us()
+}
+
+probe process("winbindd").function("XXX at ../source3/winbindd/winbindd_ads.c").return {
+ if (!([tid(), "XXX"] in backend_running))
+ next
+
+ end = gettimeofday_us()
+ begin = backend_running[tid(), "XXX"]
+ delete backend_running[tid(), "XXX"]
+
+ duration = end - begin
+ backend_svctime["XXX"] <<< duration
+}'
+
+async_req_template='
+#
+# winbind async function XXX
+#
+
+probe process("winbindd").function("XXX_send") {
+ send_running["XXX_send"] = gettimeofday_us()
+}
+
+probe process("winbindd").function("XXX_send").return {
+ if (!(["XXX_send"] in send_running))
+ next
+
+ end = gettimeofday_us()
+ start = send_running["XXX_send"]
+ delete send_running["XXX_send"]
+
+ start_time["XXX_send", $return] = start
+ idle_time["XXX_send", $return] = end
+}
+
+probe process("winbindd").function("XXX_recv") {
+ if (!(["XXX_send", $req] in start_time))
+ next
+
+ recv_running["XXX_recv"] = gettimeofday_us()
+}
+
+probe process("winbindd").function("XXX_recv").return {
+ if (!(["XXX_recv"] in recv_running))
+ next
+
+ recv_end = gettimeofday_us()
+ recv_start = recv_running["XXX_recv"]
+ delete recv_running["XXX_recv"]
+ recv_runtime = recv_end - recv_start
+
+ req = @entry($req)
+
+ send_begin = start_time["XXX_send", req]
+ delete start_time["XXX_send", req]
+ svctime = recv_end - send_begin
+
+ idle = idle_time["XXX_send", req]
+ delete idle_time["XXX_send", req]
+ runtime = (idle - send_begin) + recv_runtime
+
+ async_svctime["XXX_send"] <<< svctime
+ async_runtime["XXX_send"] <<< runtime
+}'
+
+footer='
+probe end {
+ printf("\n\n")
+
+ printf("Winbind request service time\n")
+ printf("============================\n")
+ foreach ([name] in async_svctime) {
+ printf("%-40s count: %5d, sum: %6d ms (min: %6d us, avg: %6d us, max: %6d us)\n",
+ name,
+ @count(async_svctime[name]),
+ @sum(async_svctime[name]) / 1000,
+ @min(async_svctime[name]),
+ @avg(async_svctime[name]),
+ @max(async_svctime[name]))
+ }
+ printf("\n")
+
+ printf("Winbind request runtime\n")
+ printf("=======================\n")
+ foreach ([name] in async_runtime) {
+ printf("%-40s count: %5d, sum: %6d ms (min: %6d us, avg: %6d us, max: %6d us)\n",
+ name,
+ @count(async_runtime[name]),
+ @sum(async_runtime[name]) / 1000,
+ @min(async_runtime[name]),
+ @avg(async_runtime[name]),
+ @max(async_runtime[name]))
+ }
+ printf("\n")
+
+ printf("Winbind domain-child request service time\n")
+ printf("=========================================\n")
+ foreach ([name] in dc_svctime) {
+ printf("%-40s count: %5d, sum: %6d ms (min: %6d us, avg: %6d us, max: %6d us)\n",
+ name,
+ @count(dc_svctime[name]),
+ @sum(dc_svctime[name]) / 1000,
+ @min(dc_svctime[name]),
+ @avg(dc_svctime[name]),
+ @max(dc_svctime[name]))
+ }
+ printf("\n")
+
+ printf("Winbind domain-child AD-backend service time\n")
+ printf("============================================\n")
+ foreach ([name] in backend_svctime) {
+ printf("%-40s count: %5d, sum: %6d ms (min: %6d us, avg: %6d us, max: %6d us)\n",
+ name,
+ @count(backend_svctime[name]),
+ @sum(backend_svctime[name]) / 1000,
+ @min(backend_svctime[name]),
+ @avg(backend_svctime[name]),
+ @max(backend_svctime[name]))
+ }
+ printf("\n")
+
+ printf("Winbind request service time distributions (us)\n")
+ printf("===============================================\n")
+ foreach ([name] in async_svctime) {
+ printf("%s:\n", name);
+ println(@hist_log(async_svctime[name]))
+ }
+ printf("\n")
+
+ printf("Winbind request runtime distributions (us)\n")
+ printf("==========================================\n")
+ foreach ([name] in async_runtime) {
+ printf("%s:\n", name);
+ println(@hist_log(async_runtime[name]))
+ }
+
+ printf("Winbind domain-child request service time distributions (us)\n")
+ printf("============================================================\n")
+ foreach ([name] in dc_svctime) {
+ printf("%s:\n", name);
+ println(@hist_log(dc_svctime[name]))
+ }
+
+ printf("Winbind domain-child AD-backend service time distributions (us)\n")
+ printf("===============================================================\n")
+ foreach ([name] in backend_svctime) {
+ printf("%s:\n", name);
+ println(@hist_log(backend_svctime[name]))
+ }
+}'
+
+cat <<EOF > $outfile
+$header
+EOF
+
+printf "$child_funcs\n" | while read func ; do
+ printf "$domchild_req_template\n" | sed -e s/XXX/$func/g >> $outfile
+done
+
+printf "$backend_funcs\n" | while read func ; do
+ printf "$backend_req_template\n" | sed -e "s|XXX|$func|g" >> $outfile
+done
+
+printf "$async_funcs\n" | while read func ; do
+ printf "$async_req_template\n" | sed -e s/XXX/$func/g >> $outfile
+done
+
+cat <<EOF >>$outfile
+$footer
+EOF
diff --git a/examples/systemtap/winbindd.stp b/examples/systemtap/winbindd.stp
new file mode 100644
index 0000000..0769312
--- /dev/null
+++ b/examples/systemtap/winbindd.stp
@@ -0,0 +1,2859 @@
+#!/usr/bin/stap
+#
+# Systemtap script to instrument winbindd
+#
+# Generated by examples/systemtap/generate-winbindd.stp.sh on Sat Jul 15 18:49:52 CEST 2017, do not edit
+#
+# Usage:
+#
+# Instrument all winbindd processes:
+# # stap winbindd.stp
+#
+# Instrument a specific winbindd process:
+# # stap -x PID winbindd.stp
+#
+
+global dc_running, dc_svctime
+global backend_running, backend_svctime
+global send_running, recv_running
+global start_time, idle_time
+global async_svctime, async_runtime
+
+probe begin {
+ printf("Collecting data, press ctrl-C to stop... ")
+}
+
+#
+# winbind domain child function winbindd_dual_ping
+#
+
+probe process("winbindd").function("winbindd_dual_ping") {
+ dc_running[tid(), "winbindd_dual_ping"] = gettimeofday_us()
+}
+
+probe process("winbindd").function("winbindd_dual_ping").return {
+ if (!([tid(), "winbindd_dual_ping"] in dc_running))
+ next
+
+ end = gettimeofday_us()
+ begin = dc_running[tid(), "winbindd_dual_ping"]
+ delete dc_running[tid(), "winbindd_dual_ping"]
+
+ duration = end - begin
+ dc_svctime["winbindd_dual_ping"] <<< duration
+}
+
+#
+# winbind domain child function winbindd_dual_list_trusted_domains
+#
+
--
Samba Shared Repository
More information about the samba-cvs
mailing list