testing/systemtap
SHA256
3
0
Fork 0
forked from pool/systemtap
Code Pull Requests Activity

Accepting request 89983 from home:jirislaby:branches:devel:tools

Browse Source 
udpate to 1.6

OBS-URL: https://build.opensuse.org/request/show/89983
OBS-URL: https://build.opensuse.org/package/show/devel:tools/systemtap?expand=0&rev=34
This commit is contained in:
Jiri Slaby 2011-11-02 19:17:40 +00:00 committed by Git OBS Bridge
parent 1268408de2
commit 14aa29960a
9 changed files with 62 additions and 225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
0001-PR13216-set-AM_GNU_GETTEXT_VERSION-0.17-in-configury.patch Normal file
View File

@ -0,0 +1,27 @@
From e281908fcbcb10a848e109d23c3ca4f2d2ef0a40 Mon Sep 17 00:00:00 2001
From: "Frank Ch. Eigler" <fche@redhat.com>
Date: Thu, 22 Sep 2011 11:53:13 -0400
Subject: PR13216: set AM_GNU_GETTEXT_VERSION(0.17) in configury
Git-commit: e281908fcbcb10a848e109d23c3ca4f2d2ef0a40
Patch-mainline: yes
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
---
configure.ac | 2 +-
testsuite/aclocal.m4 | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index ce3121e..c8b90de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,7 @@ AC_PROG_MAKE_SET
AC_SUBST(CFLAGS)
AC_SUBST(CXXFLAGS)
AM_GNU_GETTEXT(external)
-AM_GNU_GETTEXT_VERSION
+AM_GNU_GETTEXT_VERSION(0.15)
AC_CHECK_FUNCS(ppoll)
dnl Handle the prologues option.

29
0001-adding-ifdef-CLONE_STOPPED-to-stop-module-compilati.patch
View File

@ -1,29 +0,0 @@
From b30b7ed14e6734e0b5b216729aad0e465412c4b1 Mon Sep 17 00:00:00 2001
From: Lukas Berk <lberk@redhat.com>
Date: Mon, 24 Jan 2011 12:09:29 -0500
Subject: adding #ifdef CLONE_STOPPED to stop module compilation error
Patch-mainline: yes
Git-commit: b30b7ed14e6734e0b5b216729aad0e465412c4b1
Signed-off-by: Jiri Slaby <jslaby@nessler.arch.suse.de>
---
tapset/aux_syscalls.stp | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/tapset/aux_syscalls.stp b/tapset/aux_syscalls.stp
index e9a9750..25ca345 100644
--- a/tapset/aux_syscalls.stp
+++ b/tapset/aux_syscalls.stp
@@ -1616,7 +1616,9 @@ static const _stp_val_array const _stp_fork_list[] = {
V(CLONE_DETACHED),
V(CLONE_UNTRACED),
V(CLONE_CHILD_SETTID),
+#ifdef CLONE_STOPPED
V(CLONE_STOPPED),
+#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
V(CLONE_NEWUTS),
V(CLONE_NEWIPC),
--
1.6.0.2

110
systemtap-1.4-gcc46.patch
View File

@ -1,110 +0,0 @@
From: Ismail Doenmez <idoenmez@suse.de>
Subject: Fix compilation with gcc 4.6
Date: 02.05.2011
References: N/A
Upstream: yes
Signed-Off-by: Frank Ch. Eigler <fche@redhat.com>
Fix GCC 4.6 unused-variable warnings
Upstream commit id: 5d8a0aeabbbf3d2e4d0a6c51e6ca9b6d9446c8a0
diff --git a/grapher/grapher.cxx b/grapher/grapher.cxx
index 0111184..87489af 100644
--- a/grapher/grapher.cxx
+++ b/grapher/grapher.cxx
@@ -72,11 +72,13 @@ extern "C"
strerror_r(errno, errbuf, sizeof(errbuf));
err = write(STDERR_FILENO, errbuf, strlen(errbuf));
err = write(STDERR_FILENO, "\n", 1);
+ (void) err; /* XXX: notused */
return;
}
else if (childInfo.pid > 0)
{
err = write(signalPipe[1], &childInfo, sizeof(childInfo));
+ (void) err; /* XXX: notused */
}
else
return;
diff --git a/runtime/staprun/common.c b/runtime/staprun/common.c
index 4fbc9e5..99026fb 100644
--- a/runtime/staprun/common.c
+++ b/runtime/staprun/common.c
@@ -399,6 +399,7 @@ static void fatal_handler (int signum)
rc = write (STDERR_FILENO, ERR_MSG, sizeof(ERR_MSG));
rc = write (STDERR_FILENO, str, strlen(str));
rc = write (STDERR_FILENO, "\n", 1);
+ (void) rc; /* notused */
_exit(1);
}
diff --git a/runtime/staprun/mainloop.c b/runtime/staprun/mainloop.c
index 2733c2e..1514969 100644
--- a/runtime/staprun/mainloop.c
+++ b/runtime/staprun/mainloop.c
@@ -60,6 +60,7 @@ static void chld_proc(int signum)
return;
// send STP_EXIT
rc = write(control_channel, &btype, sizeof(btype));
+ (void) rc; /* XXX: notused */
}
#if WORKAROUND_BZ467568
@@ -622,6 +623,7 @@ int stp_main_loop(void)
dbug(2, "got STP_REQUEST_EXIT\n");
int32_t rc, btype = STP_EXIT;
rc = write(control_channel, &btype, sizeof(btype));
+ (void) rc; /* XXX: notused */
break;
}
case STP_START:
diff --git a/tapsets.cxx b/tapsets.cxx
index b141921..4daae5e 100644
--- a/tapsets.cxx
+++ b/tapsets.cxx
@@ -5341,7 +5341,6 @@ sdt_query::handle_probe_entry()
probe *new_base = convert_location();
probe_point *new_location = new_base->locations[0];
- bool kprobe_found = false;
bool need_debug_info = false;
Dwarf_Addr bias;
@@ -5351,7 +5350,6 @@ sdt_query::handle_probe_entry()
if (have_kprobe())
{
convert_probe(new_base);
- kprobe_found = true;
// Expand the local variables in the probe body
sdt_kprobe_var_expanding_visitor svv (module_val,
provider_name,
@@ -7726,13 +7724,15 @@ hwbkpt_builder::build(systemtap_session & sess,
"",len,0,
has_write,
has_rw));
- else // has symbol_str
+ else if (has_symbol_str)
finished_results.push_back (new hwbkpt_derived_probe (base,
location,
0,
symbol_str_val,len,0,
has_write,
has_rw));
+ else
+ assert (0);
}
// ------------------------------------------------------------------------
diff --git a/translate.cxx b/translate.cxx
index e5038f9..82f3ee4 100644
--- a/translate.cxx
+++ b/translate.cxx
@@ -4447,6 +4447,8 @@ c_unparser::visit_print_format (print_format* e)
if (components[i].prectype == print_format::prec_dynamic)
prec_ix = arg_ix++;
+ (void) width_ix; /* XXX: notused */
+
/* %m and %M need special care for digging into memory. */
if (components[i].type == print_format::conv_memory
|| components[i].type == print_format::conv_memory_hex)

3
systemtap-1.4.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:773110b3648ce480d6470c10db47b2daeb5988722e7000aa4dbc723c27600dd7
size 1530777

3
systemtap-1.6.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:18e3f346d2fb0a2a9e5980351da1052a884466598f76d971fb1c18e6aed1d8bb
size 1701974

5
systemtap-docs.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Nov 2 10:54:46 CET 2011 - jslaby@suse.de
- update to 1.6
-------------------------------------------------------------------
Tue Jun 7 08:11:15 UTC 2011 - coolo@novell.com

23
systemtap-docs.spec
View File

@ -24,29 +24,22 @@ BuildRequires: gcc-c++ libebl-devel pkg-config
BuildRequires: xmlto
BuildRequires: fop
BuildRequires: latex2html
%define use_snapshot 0
License: GPLv2+
Version: 1.4
Version: 1.6
Release: 5
Summary: Documents and examples for systemtap
Group: Development/Tools/Debuggers
Url: http://sourceware.org/systemtap/
%if %use_snapshot
%define package_version 20090214
%else
%define package_version %{version}
%endif
Source: ftp://sources.redhat.com/pub/systemtap/snapshots/systemtap-%{package_version}.tar.bz2
Source: systemtap-%{version}.tar.bz2
Source2: README-BEFORE-ADDING-PATCHES
Patch1: systemtap-docdir-fix.diff
Patch2: systemtap-xmlto-fop.diff
# PATCH-FIX-UPSTREAM systemtap-1.4-gcc46.patch idoenmez@suse.de -- Fix compilation with gcc 4.6
Patch3: systemtap-1.4-gcc46.patch
Patch3: 0001-PR13216-set-AM_GNU_GETTEXT_VERSION-0.17-in-configury.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%description
SystemTap is an instrumentation system for systems running Linux 2.6.
SystemTap is an instrumentation system for systems running Linux.
This package contains the documents and examples for systemtap.
@ -59,11 +52,7 @@ Authors:
Tom Zanussi <zanussi@us.ibm.com>
%prep
%if %use_snapshot
%setup -n src -q
%else
%setup -n systemtap-%{package_version} -q
%endif
%setup -n systemtap-%{version} -q
%patch1 -p1
%patch2 -p1
%patch3 -p1
@ -73,7 +62,7 @@ Authors:
find testsuite examples -name "*.stp" | xargs -n1 sed -i -e 's, /bin/env, /usr/bin/env,'
find testsuite examples -type f | xargs chmod 644
autoreconf -fi
%configure
%configure --docdir=%{_docdir}/systemtap --disable-nls
make %{?jobs:-j %jobs}
%install

5
systemtap.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Nov 2 10:54:26 CET 2011 - jslaby@suse.de
- update to 1.6
-------------------------------------------------------------------
Fri Aug 19 08:38:29 UTC 2011 - tonyj@novell.com

82
systemtap.spec
View File

@ -21,36 +21,21 @@
Name: systemtap
BuildRequires: gcc-c++ glib2-devel libcap-devel libebl-devel pkg-config sqlite-devel
BuildRequires: mozilla-nspr-devel mozilla-nss-devel mozilla-nss-tools
%define use_snapshot 0
License: GPLv2+
Version: 1.4
Version: 1.6
Release: 8
Summary: Instrumentation System
Group: Development/Tools/Debuggers
Url: http://sourceware.org/systemtap/
# Requires: kernel-source gcc make
# Suggest: kernel-smp-debuginfo
%if %use_snapshot
%define package_version 20090214
%else
%define package_version %{version}
%endif
Source: ftp://sources.redhat.com/pub/systemtap/snapshots/systemtap-%{package_version}.tar.bz2
Source: systemtap-%{version}.tar.bz2
Source2: README-BEFORE-ADDING-PATCHES
Source3: stap-server.conf
# need -docdir patch even though docs are packaged by systemtap-docs.spec
# so that they are installed into directories matching below rm -rf's
Patch1: systemtap-docdir-fix.diff
Patch2: 0001-adding-ifdef-CLONE_STOPPED-to-stop-module-compilati.patch
# PATCH-FIX-UPSTREAM systemtap-1.4-gcc46.patch idoenmez@suse.de -- Fix compilation with gcc 4.6
Patch3: systemtap-1.4-gcc46.patch
Requires: libebl1
Obsoletes: systemtap-client < 1.5
Requires: %{name}-runtime = %{version}-%{release}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
SystemTap is an instrumentation system for systems running Linux 2.6.
SystemTap is an instrumentation system for systems running Linux.
Developers can write instrumentation to collect data on the operation
of the system.
@ -60,21 +45,9 @@ Group: Development/Tools/Debuggers
Summary: Runtime environment for systemtap
%description runtime
SystemTap is an instrumentation system for systems running Linux 2.6.
SystemTap is an instrumentation system for systems running Linux.
This package contains the runtime environment for systemtap programs.
%package client
License: GPLv2+
Group: Development/Tools/Debuggers
Summary: Systemtap client
Requires: %{name}-runtime = %{version}-%{release}
# dependancies for systemtap shell scripts
Requires: coreutils avahi avahi-utils mozilla-nss-tools zip unzip
%description client
SystemTap is an instrumentation system for systems running Linux 2.6.
This package contains the client component for systemtap.
%package server
License: GPLv2+
Group: Development/Tools/Debuggers
@ -84,7 +57,7 @@ Requires: %{name} = %{version}-%{release}
Requires: coreutils avahi avahi-utils mozilla-nss-tools zip unzip
%description server
SystemTap is an instrumentation system for systems running Linux 2.6.
SystemTap is an instrumentation system for systems running Linux.
This package contains the server component of systemtap.
%package sdt-devel
@ -95,22 +68,14 @@ Requires: %{name} = %{version}-%{release}
Requires: python-base
%description sdt-devel
SystemTap is an instrumentation system for systems running Linux 2.6.
SystemTap is an instrumentation system for systems running Linux.
This package contains the support tools for static probes.
%prep
%if %use_snapshot
%setup -n src -q
%else
%setup -n %{name}-%{package_version} -q
%endif
%patch1 -p1
%patch2 -p1
%patch3 -p1
%setup -q
%build
autoreconf -fi
%configure
%configure --disable-docs --docdir=%{_docdir}/systemtap
make %{?jobs:-j %jobs}
%install
@ -130,6 +95,8 @@ touch $RPM_BUILD_ROOT%{_localstatedir}/log/stap-server.log
mkdir -p $RPM_BUILD_ROOT/usr/lib/tmpfiles.d
install -m 644 %SOURCE3 $RPM_BUILD_ROOT/usr/lib/tmpfiles.d
%{find_lang} systemtap
%clean
rm -rf ${RPM_BUILD_ROOT}
@ -137,53 +104,36 @@ rm -rf ${RPM_BUILD_ROOT}
%defattr(-,root,root)
%{_bindir}/stap
%{_mandir}/man[17]/*
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/runtime
%{_datadir}/%{name}/tapset
#packaged by systemtap-initscript in upstream
%dir %{_localstatedir}/cache/systemtap
%files runtime
%files runtime -f systemtap.lang
%defattr(-,root,root)
%doc %{_docdir}/systemtap
%{_bindir}/staprun
%{_bindir}/stapsh
%{_bindir}/stap-merge
%{_bindir}/stap-report
%{_bindir}/stap-authorize-signing-cert
%dir %{_libexecdir}/%{name}
%{_libexecdir}/%{name}/stapio
%{_libexecdir}/%{name}/stap-env
%{_libexecdir}/%{name}/stap-authorize-cert
%{_mandir}/man8/staprun.8*
%{_mandir}/man8/stap-authorize-signing-cert.8*
%files client
%defattr(-,root,root)
%defattr(-,root,root)
%{_bindir}/stap-client
%{_bindir}/stap-authorize-server-cert
%{_libexecdir}/%{name}/stap-find-servers
%{_libexecdir}/%{name}/stap-client-connect
%{_mandir}/man8/stap-client.8*
%{_mandir}/man8/stap-authorize-server-cert.8*
%files server
%defattr(-,root,root)
%dir /usr/lib/tmpfiles.d
/usr/lib/tmpfiles.d/stap-server.conf
%{_bindir}/stap-authorize-server-cert
%{_bindir}/stap-server
%{_libexecdir}/%{name}/stap-serverd
%{_libexecdir}/%{name}/stap-start-server
%{_libexecdir}/%{name}/stap-find-servers
%{_libexecdir}/%{name}/stap-find-or-start-server
%{_libexecdir}/%{name}/stap-stop-server
%{_libexecdir}/%{name}/stap-gen-cert
%{_libexecdir}/%{name}/stap-server-connect
%{_libexecdir}/%{name}/stap-serverd
%{_libexecdir}/%{name}/stap-sign-module
%{_libexecdir}/%{name}/stap-start-server
%{_libexecdir}/%{name}/stap-stop-server
%{_mandir}/man8/stap-server.8*
%{_mandir}/man8/stap-authorize-server-cert.8*
%ghost %{_localstatedir}/log/stap-server.log
%ghost %dir %{_localstatedir}/run/stap-server