diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | Makefile.in | 5 | ||||
| -rw-r--r-- | doc/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/Makefile.in | 3 | ||||
| -rw-r--r-- | doc/tutorial.tex | 29 | ||||
| -rw-r--r-- | examples/ChangeLog | 6 | ||||
| -rwxr-xr-x | examples/iostat-scsi.stp | 24 | ||||
| -rw-r--r-- | examples/iostat-scsi.txt | 2 | ||||
| -rw-r--r-- | tapset/ChangeLog | 5 | ||||
| -rw-r--r-- | tapset/i686/syscalls.stp | 4 | ||||
| -rw-r--r-- | testsuite/ChangeLog | 5 | ||||
| -rwxr-xr-x | testsuite/systemtap.samples/examples.exp | 4 |
13 files changed, 75 insertions, 25 deletions
@@ -1,3 +1,8 @@ +2008-03-06 Frank Ch. Eigler <fche@elastic.org> + + * Makefile.am (AM_CXXFLAGS, AM_CFLAGS): Remove -Werror. + * Makefile.in, doc/Makefile.in: Regenerated. + 2008-03-03 Frank Ch. Eigler <fche@elastic.org> PR5516 diff --git a/Makefile.am b/Makefile.am index d153dd0d..1fc4dbec 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,8 +7,8 @@ pkglibexecdir = ${libexecdir}/${PACKAGE} AM_CPPFLAGS = -DBINDIR='"$(bindir)"' -DPKGDATADIR='"${pkgdatadir}"' -DPKGLIBDIR='"$(pkglibexecdir)"' -AM_CFLAGS = -D_GNU_SOURCE -fexceptions -Wall -Wextra -Werror -Wshadow -Wunused -Wformat=2 -W -AM_CXXFLAGS = -Wall -Wextra -Werror +AM_CFLAGS = -D_GNU_SOURCE -fexceptions -Wall -Werror -Wshadow -Wunused -Wformat=2 -W +AM_CXXFLAGS = -Wall -Werror dist_man_MANS = stap.1 stapprobes.5 stapfuncs.5 stapex.5 staprun.8 man/stapprobes.iosched.5 man/stapprobes.netdev.5 man/stapprobes.nfs.5 man/stapprobes.nfsd.5 man/stapprobes.pagefault.5 man/stapprobes.process.5 man/stapprobes.rpc.5 man/stapprobes.scsi.5 man/stapprobes.signal.5 man/stapprobes.socket.5 man/stapprobes.tcp.5 man/stapprobes.udp.5 bin_PROGRAMS = stap staprun diff --git a/Makefile.in b/Makefile.in index d97459d6..e82d66a3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -234,6 +234,7 @@ elfutils_abs_srcdir = @elfutils_abs_srcdir@ exec_prefix = @exec_prefix@ have_dvips = @have_dvips@ have_latex = @have_latex@ +have_latex2html = @have_latex2html@ have_ps2pdf = @have_ps2pdf@ host_alias = @host_alias@ htmldir = @htmldir@ @@ -265,8 +266,8 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = dist-bzip2 pkglibexecdir = ${libexecdir}/${PACKAGE} AM_CPPFLAGS = -DBINDIR='"$(bindir)"' -DPKGDATADIR='"${pkgdatadir}"' -DPKGLIBDIR='"$(pkglibexecdir)"' -AM_CFLAGS = -D_GNU_SOURCE -fexceptions -Wall -Wextra -Werror -Wshadow -Wunused -Wformat=2 -W -AM_CXXFLAGS = -Wall -Wextra -Werror +AM_CFLAGS = -D_GNU_SOURCE -fexceptions -Wall -Werror -Wshadow -Wunused -Wformat=2 -W +AM_CXXFLAGS = -Wall -Werror dist_man_MANS = stap.1 stapprobes.5 stapfuncs.5 stapex.5 staprun.8 man/stapprobes.iosched.5 man/stapprobes.netdev.5 man/stapprobes.nfs.5 man/stapprobes.nfsd.5 man/stapprobes.pagefault.5 man/stapprobes.process.5 man/stapprobes.rpc.5 man/stapprobes.scsi.5 man/stapprobes.signal.5 man/stapprobes.socket.5 man/stapprobes.tcp.5 man/stapprobes.udp.5 stap_SOURCES = main.cxx \ parse.cxx staptree.cxx elaborate.cxx translate.cxx \ diff --git a/doc/ChangeLog b/doc/ChangeLog index 35ee8cbb..902e1d1e 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,7 @@ +2008-03-04 David Smith <dsmith@redhat.com> + + * tutorial.tex: Made minor changes to remove warnings. + 2008-03-03 Frank Ch. Eigler <fche@elastic.org> From Masami Hiramatsu <mhiramat@redhat.com> diff --git a/doc/Makefile.in b/doc/Makefile.in index 97d6f755..e76f154d 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -32,7 +32,7 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : subdir = doc -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -118,6 +118,7 @@ elfutils_abs_srcdir = @elfutils_abs_srcdir@ exec_prefix = @exec_prefix@ have_dvips = @have_dvips@ have_latex = @have_latex@ +have_latex2html = @have_latex2html@ have_ps2pdf = @have_ps2pdf@ host_alias = @host_alias@ htmldir = @htmldir@ diff --git a/doc/tutorial.tex b/doc/tutorial.tex index d465bf0b..ee7d37da 100644 --- a/doc/tutorial.tex +++ b/doc/tutorial.tex @@ -40,7 +40,6 @@ \hfill \begin{minipage}{2.5in} % contributors please add your names to the list Frank Ch. Eigler {\tt \small <fche@redhat.com>} \\ - \hfill \today \end{minipage} @@ -82,7 +81,7 @@ Eventually, the session stops, the hooks are disconnected, and the module removed. This entire process is driven from a single command-line program, \verb+stap+. -\begin{figure}[h!] +\begin{figure}[!ht] \begin{boxedminipage}{4.5in} \begin{verbatim} # cat hello-world.stp @@ -106,7 +105,7 @@ can run the scripts such as the simple one in Figure~\ref{fig:hello-world}. Log on as \verb+root+, or even better, as a user authorized to \verb+sudo+, before running systemtap. -\begin{figure}[h] +\begin{figure}[ht] \begin{boxedminipage}{4.5in} \begin{verbatim} # cat strace-open.stp @@ -251,7 +250,7 @@ long they took. Figure~\ref{fig:socket-trace} shows the finished script. It lacks a call to the \verb+exit()+ function, so you need to interrupt it with \verb+^C+ when you want the tracing to stop. -\begin{figure}[h!] +\begin{figure}[!ht] \begin{boxedminipage}{4.5in} \begin{verbatim} # cat socket-trace.stp @@ -384,7 +383,7 @@ probe handlers and functions executed during a systemtap session.} protect global variables against concurrent modification and/or access.} -\begin{figure}[h!] +\begin{figure}[!ht] \begin{boxedminipage}{4.5in} \begin{verbatim} # cat timer-jiffies.stp @@ -436,7 +435,7 @@ example also demonstrates pasting numeric command-line arguments (\verb+$1+ etc.) into scripts. %$ -\begin{figure}[h!] +\begin{figure}[!ht] \begin{boxedminipage}{4.5in} \begin{verbatim} # cat inode-watch.stp @@ -489,7 +488,7 @@ is possible, up to a nesting depth limit. Figure~\ref{fig:functions} displays function syntax. -\begin{figure}[h!] +\begin{figure}[!ht] \begin{boxedminipage}{4.5in} \begin{verbatim} # Red Hat convention @@ -580,7 +579,7 @@ expression is one way. For simplicity, systemtap forbids any {\em modification} of an array while it is being iterated using a \verb+foreach+. -\begin{tabular}{rl} +\begin{tabular}{rp{0.4\textwidth}} \verb|foreach ([a,b] in foo) { fuss_with(foo[a,b]) }| & simple loop in arbitrary sequence \\ \verb|foreach ([a,b] in foo+ limit 5) { }| & loop in increasing sequence of value, stop after 5 \\ \verb|foreach ([a-,b] in foo) { }| & loop in decreasing sequence of first key \\ @@ -625,12 +624,12 @@ using {\tt foreach} shortly.} only be printed. \nomenclature{extractor}{A function-like expression in a script that computes a single statistic for a given aggregate.} -\begin{tabular}{rl} +\begin{tabular}{rp{0.5\textwidth}} \verb+@avg(a)+ & the average of all the values accumulated into \verb+a+ \\ \verb+print(@hist_linear(a,0,100,10))+ & print an ``ascii art'' linear - histogram of the same data stream, \\ - & bounds $0 \ldots 100$, bucket width is $10$ \\ + histogram of the same data stream, + bounds $0 \ldots 100$, bucket width is $10$ \\ \verb|@count(writes["zsh"])| & the number of times ``zsh'' ran the probe handler \\ \verb+print(@hist_log(writes["zsh"]))+ & print an ``ascii art'' logarithmic @@ -738,7 +737,7 @@ specific to general, as shown in Figure~\ref{fig:tapset-search}. systemtap for tapset scripts, allowing specialization by version architecture.} -\begin{figure}[h!] +\begin{figure}[!ht] \begin{boxedminipage}{6in} \begin{verbatim} # stap -p1 -vv -e 'probe begin { }' > /dev/null @@ -779,7 +778,7 @@ use. It should have a default, but should not require additional run-time checks to let a user choose another. Figure~\ref{fig:tapset-default} shows a way. -\begin{figure}[h!] +\begin{figure}[!ht] \begin{boxedminipage}{6in} \begin{verbatim} # cat tapset/time-common.stp @@ -845,7 +844,7 @@ point alias can expand to multiple probe points, even to other aliases. It also includes probe point wildcarding. These functions are designed to compose sensibly. -\begin{figure}[h!] +\begin{figure}[!ht] \begin{boxedminipage}{4.5in} \begin{verbatim} # cat probe-alias.stp @@ -942,7 +941,7 @@ locks. give up, do not block. \end{enumerate} -\begin{figure}[h!] +\begin{figure}[!ht] \begin{boxedminipage}{4.5in} \begin{verbatim} # cat embedded-C.stp diff --git a/examples/ChangeLog b/examples/ChangeLog index 99fc6928..ae011376 100644 --- a/examples/ChangeLog +++ b/examples/ChangeLog @@ -1,3 +1,9 @@ +2008-03-05 David Smith <dsmith@redhat.com> + + PR5422 + * iostat-scsi.stp: Updated to handle kernel versions > 2.6.24. + * iostat-scsi.txt: Updated. + 2008-01-29 Frank Ch. Eigler <fche@elastic.org> * nettop.stp: Reorganize array usage to minimize contention. diff --git a/examples/iostat-scsi.stp b/examples/iostat-scsi.stp index a65ec3f7..ef778e53 100755 --- a/examples/iostat-scsi.stp +++ b/examples/iostat-scsi.stp @@ -3,6 +3,7 @@ global devices, reads, writes /* data collection: SCSI disk */ +%(kernel_v<"2.6.24" %? probe module("sd_mod").function("sd_init_command") !, kernel.function("sd_init_command") { device=kernel_string($SCpnt->request->rq_disk->disk_name) sector_size=$SCpnt->device->sector_size @@ -17,6 +18,29 @@ probe module("sd_mod").function("sd_init_command") !, kernel.function("sd_init_c else reads[device] <<< nr_sectors * sector_size } +%: +%{ +#include <scsi/scsi_device.h> +%} + +function get_sector_size:long (data:long) %{ /* pure */ + struct scsi_device *sdp = (struct scsi_device *)((long)THIS->data); + THIS->__retvalue = kread(&(sdp->sector_size)); + CATCH_DEREF_FAULT(); +%} + +probe module("sd_mod").function("sd_prep_fn") !, kernel.function("sd_prep_fn") { + device=kernel_string($rq->rq_disk->disk_name) + sector_size=get_sector_size($q->queuedata) + nr_sectors=$rq->nr_sectors + devices[device] = 1 + if ($rq->cmd_flags & 1) + writes[device] <<< nr_sectors * sector_size + else + reads[device] <<< nr_sectors * sector_size +} +%) + /* data collection: SCSI tape */ probe module("st").function("st_do_scsi") !, kernel.function("st_do_scsi") { device=kernel_string($STp->disk->disk_name) diff --git a/examples/iostat-scsi.txt b/examples/iostat-scsi.txt index 81157b1d..8222f659 100644 --- a/examples/iostat-scsi.txt +++ b/examples/iostat-scsi.txt @@ -1,6 +1,6 @@ From: http://sourceware.org/systemtap/wiki/WSiostatSCSI -# stap iostat-scsi.stp 10 # seconds between reports +# stap -g iostat-scsi.stp 10 # seconds between reports Device: tps blk_read/s blk_wrtn/s blk_read blk_wrtn sda 1.30 2.40 105.60 24 1056 diff --git a/tapset/ChangeLog b/tapset/ChangeLog index 4c65ccc0..32ac6bf2 100644 --- a/tapset/ChangeLog +++ b/tapset/ChangeLog @@ -1,3 +1,8 @@ +2008-03-06 Ananth N Mavinakayanahalli <ananth@in.ibm.com + + * i686/syscalls.stp: Handle sys_sigaltstack parameter after + register unification + 2008-02-28 Will Cohen <wcohen@redhat.com> PR433780 diff --git a/tapset/i686/syscalls.stp b/tapset/i686/syscalls.stp index 75bc960d..8e69f622 100644 --- a/tapset/i686/syscalls.stp +++ b/tapset/i686/syscalls.stp @@ -119,8 +119,8 @@ probe syscall.set_zone_reclaim.return = # probe syscall.sigaltstack = kernel.function("sys_sigaltstack") { name = "sigaltstack" - ebx = $ebx - argstr = sprintf("%p", $ebx) + ussp = %( kernel_vr < "2.6.25" %? $ebx %: $bx %) + argstr = sprintf("%p", ussp) } probe syscall.sigaltstack.return = kernel.function("sys_sigaltstack").return { name = "sigaltstack" diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog index 2f6caac1..1596711d 100644 --- a/testsuite/ChangeLog +++ b/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2008-03-05 David Smith <dsmith@redhat.com> + + PR5422 + * systemtap.samples/examples.exp: Updated. + 2008-03-03 Frank Ch. Eigler <fche@elastic.org> PR5516 diff --git a/testsuite/systemtap.samples/examples.exp b/testsuite/systemtap.samples/examples.exp index d8c43ecd..a7200c59 100755 --- a/testsuite/systemtap.samples/examples.exp +++ b/testsuite/systemtap.samples/examples.exp @@ -1,7 +1,7 @@ foreach file [lsort [glob -nocomplain $srcdir/../examples/*.stp $srcdir/../examples/small_demos/*.stp]] { set test [file tail $file] switch $test { - {iostat-scsi.stp} {set cmd "stap -p4 $file 5"} + {iostat-scsi.stp} {set cmd "stap -p4 -g $file 5"} {sigmon.stp} {set cmd "stap -p4 -x 1234 $file SIGKILL"} {keyhack.stp} {set cmd "stap -p4 -g $file"} default {set cmd "stap -p4 $file"} @@ -9,4 +9,4 @@ foreach file [lsort [glob -nocomplain $srcdir/../examples/*.stp $srcdir/../examp verbose -log "Running $cmd" set rc [catch {eval "exec $cmd"} baz] if {$rc} { fail $test; verbose -log $baz } else { pass $test } -}
\ No newline at end of file +} |