diff options
| author | Dave Brolley <brolley@redhat.com> | 2009-11-24 14:51:46 -0500 |
|---|---|---|
| committer | Dave Brolley <brolley@redhat.com> | 2009-11-24 14:51:46 -0500 |
| commit | 7067e1b0418eed528fe2d102654dbe12bb9236af (patch) | |
| tree | 8120ae0263ef32cdc7fa3b2132e7acb3af03d3e0 /doc | |
| parent | 37f1e3c413aee81f7590de431d232a474eb412ee (diff) | |
| parent | 90bba7158de040705a101ba1fdf6062866b4b4e9 (diff) | |
| download | systemtap-steved-7067e1b0418eed528fe2d102654dbe12bb9236af.tar.gz systemtap-steved-7067e1b0418eed528fe2d102654dbe12bb9236af.tar.xz systemtap-steved-7067e1b0418eed528fe2d102654dbe12bb9236af.zip | |
Merge branch 'master' of ssh://sources.redhat.com/git/systemtap
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/SystemTap_Tapset_Reference/Makefile.am | 2 | ||||
| -rw-r--r-- | doc/SystemTap_Tapset_Reference/Makefile.in | 2 | ||||
| -rw-r--r-- | doc/SystemTap_Tapset_Reference/tapsets.tmpl | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/doc/SystemTap_Tapset_Reference/Makefile.am b/doc/SystemTap_Tapset_Reference/Makefile.am index 454b3331..109aaa9e 100644 --- a/doc/SystemTap_Tapset_Reference/Makefile.am +++ b/doc/SystemTap_Tapset_Reference/Makefile.am @@ -30,7 +30,7 @@ if BUILD_REFDOCS all: $(PDFDOCS) stamp-htmldocs stamp-mandocs tapsets.xml: docproc $(shell find $(SRCTREE)/tapset -name '*.stp') SRCTREE=$(SRCTREE) $(DOCPROC) doc $(abs_srcdir)/tapsets.tmpl > tapsets.xml.new - if cmp tapsets.xml.new tapsets.xml >/dev/null ; then \ + if test -s tapsets.xml && cmp tapsets.xml.new tapsets.xml >/dev/null ; then \ echo tapsets.xml unchanged; \ rm tapsets.xml.new; \ else \ diff --git a/doc/SystemTap_Tapset_Reference/Makefile.in b/doc/SystemTap_Tapset_Reference/Makefile.in index 5059b159..158c9b6b 100644 --- a/doc/SystemTap_Tapset_Reference/Makefile.in +++ b/doc/SystemTap_Tapset_Reference/Makefile.in @@ -470,7 +470,7 @@ uninstall-am: @BUILD_REFDOCS_TRUE@all: $(PDFDOCS) stamp-htmldocs stamp-mandocs @BUILD_REFDOCS_TRUE@tapsets.xml: docproc $(shell find $(SRCTREE)/tapset -name '*.stp') @BUILD_REFDOCS_TRUE@ SRCTREE=$(SRCTREE) $(DOCPROC) doc $(abs_srcdir)/tapsets.tmpl > tapsets.xml.new -@BUILD_REFDOCS_TRUE@ if cmp tapsets.xml.new tapsets.xml >/dev/null ; then \ +@BUILD_REFDOCS_TRUE@ if test -s tapsets.xml && cmp tapsets.xml.new tapsets.xml >/dev/null ; then \ @BUILD_REFDOCS_TRUE@ echo tapsets.xml unchanged; \ @BUILD_REFDOCS_TRUE@ rm tapsets.xml.new; \ @BUILD_REFDOCS_TRUE@ else \ diff --git a/doc/SystemTap_Tapset_Reference/tapsets.tmpl b/doc/SystemTap_Tapset_Reference/tapsets.tmpl index addcf88d..bb855d29 100644 --- a/doc/SystemTap_Tapset_Reference/tapsets.tmpl +++ b/doc/SystemTap_Tapset_Reference/tapsets.tmpl @@ -167,12 +167,13 @@ </chapter> <chapter id="iosched.stp"> - <title>IO Scheduler Tapset</title> + <title>IO Scheduler and block IO Tapset</title> <para> - This family of probe points is used to probe IO scheduler activities. + This family of probe points is used to probe block IO layer and IO scheduler activities. It contains the following probe points: </para> !Itapset/ioscheduler.stp +!Itapset/ioblock.stp </chapter> <chapter id="scsi.stp"> |