Hello community, here is the log from the commit of package trace-cmd for openSUSE:Factory checked in at 2013-03-12 22:38:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/trace-cmd (Old) and /work/SRC/openSUSE:Factory/.trace-cmd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "trace-cmd", Maintainer is "to...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/trace-cmd/trace-cmd.changes 2012-10-10 09:34:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.trace-cmd.new/trace-cmd.changes 2013-03-12 22:38:42.000000000 +0100 @@ -1,0 +2,22 @@ +Tue Mar 12 16:20:26 UTC 2013 - mgor...@suse.com + +- Upgrade to version 2.0.4 + - Have read splice check for EINTR or EAGAIN + - Do not block during ring buffer extract + - Do not block on reads when record is finished + The read splice check is expected to be necessary for trace-cmd to + work with Linux kernel versions 3.10 and later. + +------------------------------------------------------------------- +Thu Dec 20 21:17:20 UTC 2012 - to...@suse.com + +- Upgrade to version v2.0.2 + Changelog: + - Update README for plugins directory + - trace-cmd: Move trace-cmd python modules to lib/ + - python: Fix further issues of struct record rename +- Fix libraries to install in /usr/lib64 on relevant archs. This adds + an openSUSE-specific patch called "makefile-lib64.patch" that will + not be pushed upstream. + +------------------------------------------------------------------- Old: ---- trace-cmd-2.0.1.tar.bz2 New: ---- makefile-lib64.patch trace-cmd-2.0.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ trace-cmd.spec ++++++ --- /var/tmp/diff_new_pack.pYv2Ou/_old 2013-03-12 22:38:43.000000000 +0100 +++ /var/tmp/diff_new_pack.pYv2Ou/_new 2013-03-12 22:38:43.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package trace-cmd # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,13 +16,12 @@ # - Name: trace-cmd Url: http://elinux.org/Ftrace Summary: Configuration tool for Ftrace License: GPL-2.0 and LGPL-2.1 Group: Development/Tools/Debuggers -Version: 2.0.1 +Version: 2.0.4 Release: 0 Source0: trace-cmd-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -36,12 +35,14 @@ %else BuildRequires: libxslt %endif +Patch1: makefile-lib64.patch %description trace-cmd is a command-line tool for configuring Ftrace. %prep %setup -q +%patch1 -p1 %package -n kernelshark Summary: GUI for trace-cmd @@ -65,7 +66,7 @@ %files %defattr(-,root,root) %{_bindir}/trace-cmd -%{_prefix}/lib/trace-cmd +%{_libdir}/trace-cmd %{_mandir}/man1/trace-cmd* %{_mandir}/man5/trace-cmd.dat* ++++++ makefile-lib64.patch ++++++ From: Tony Jones <to...@suse.de> Subject: install 64bit libs into /usr/lib64 Upstream: no Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) --- a/Makefile +++ b/Makefile @@ -56,8 +56,14 @@ ifeq ($(prefix),$(HOME)) plugin_dir = $(HOME)/.trace-cmd/plugins python_dir = $(HOME)/.trace-cmd/python else -plugin_dir = $(prefix)/lib/trace-cmd/plugins -python_dir = $(prefix)/lib/trace-cmd/python +libdir = lib +ifeq ($(prefix),/usr) + ifeq ($(shell getconf LONG_BIT),64) + libdir = lib64 + endif +endif +plugin_dir = $(prefix)/$(libdir)/trace-cmd/plugins +python_dir = $(prefix)/$(libdir)/trace-cmd/python PLUGIN_DIR = -DPLUGIN_DIR="$(plugin_dir)" PYTHON_DIR = -DPYTHON_DIR="$(python_dir)" PLUGIN_DIR_SQ = '$(subst ','\'',$(PLUGIN_DIR))' ++++++ trace-cmd-2.0.1.tar.bz2 -> trace-cmd-2.0.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/trace-cmd-2.0.1/Makefile new/trace-cmd-2.0.4/Makefile --- old/trace-cmd-2.0.1/Makefile 2012-10-08 20:32:58.000000000 +0200 +++ new/trace-cmd-2.0.4/Makefile 2013-03-05 02:31:06.000000000 +0100 @@ -1,7 +1,7 @@ # trace-cmd version TC_VERSION = 2 TC_PATCHLEVEL = 0 -TC_EXTRAVERSION = 1 +TC_EXTRAVERSION = 4 # Kernel Shark version KS_VERSION = 0 @@ -57,7 +57,7 @@ python_dir = $(HOME)/.trace-cmd/python else plugin_dir = $(prefix)/lib/trace-cmd/plugins -python_dir = $(prefix)/share/trace-cmd/python +python_dir = $(prefix)/lib/trace-cmd/python PLUGIN_DIR = -DPLUGIN_DIR="$(plugin_dir)" PYTHON_DIR = -DPYTHON_DIR="$(python_dir)" PLUGIN_DIR_SQ = '$(subst ','\'',$(PLUGIN_DIR))' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/trace-cmd-2.0.1/README new/trace-cmd-2.0.4/README --- old/trace-cmd-2.0.1/README 2012-10-08 20:32:58.000000000 +0200 +++ new/trace-cmd-2.0.4/README 2013-03-05 02:31:06.000000000 +0100 @@ -28,7 +28,7 @@ Note: The default install is relative to /usr/local The default install directory is /usr/local/bin - The default plugin directory is /usr/local/share/trace-cmd/plugins + The default plugin directory is /usr/local/lib/trace-cmd/plugins To change the default, you can set 'prefix', eg mkdir $HOME/test-trace diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/trace-cmd-2.0.1/event-viewer.py new/trace-cmd-2.0.4/event-viewer.py --- old/trace-cmd-2.0.1/event-viewer.py 2012-10-08 20:32:58.000000000 +0200 +++ new/trace-cmd-2.0.4/event-viewer.py 2013-03-05 02:31:06.000000000 +0100 @@ -68,8 +68,8 @@ for cpu in range(0, trace.cpus): rec = tracecmd_read_data(self.trace._handle, cpu) while rec: - offset = record_offset_get(rec) - ts = record_ts_get(rec) + offset = pevent_record_offset_get(rec) + ts = pevent_record_ts_get(rec) self.refs.append(self.EventRef(index, ts, offset, cpu)) index = index + 1 rec = tracecmd_read_data(self.trace._handle, cpu) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/trace-cmd-2.0.1/trace-recorder.c new/trace-cmd-2.0.4/trace-recorder.c --- old/trace-cmd-2.0.1/trace-recorder.c 2012-10-08 20:32:58.000000000 +0200 +++ new/trace-cmd-2.0.4/trace-recorder.c 2013-03-05 02:31:06.000000000 +0100 @@ -141,8 +141,10 @@ ret = splice(recorder->trace_fd, NULL, recorder->brass[1], NULL, recorder->page_size, 1 /* SPLICE_F_MOVE */); if (ret < 0) { - warning("recorder error in splice input"); - return -1; + if (errno != EAGAIN && errno != EINTR) { + warning("recorder error in splice input"); + return -1; + } } ret = splice(recorder->brass[0], NULL, recorder->fd, NULL, @@ -158,12 +160,24 @@ return ret; } + +static void set_nonblock(struct tracecmd_recorder *recorder) +{ + long flags; + + /* Do not block on reads for flushing */ + flags = fcntl(recorder->trace_fd, F_GETFL); + fcntl(recorder->trace_fd, F_SETFL, flags | O_NONBLOCK); +} + long tracecmd_flush_recording(struct tracecmd_recorder *recorder) { char *buf[recorder->page_size]; long total = 0; long ret; + set_nonblock(recorder); + do { ret = splice_data(recorder); if (ret < 0) @@ -213,6 +227,8 @@ if (!recorder) return; + set_nonblock(recorder); + recorder->stop = 1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/trace-cmd-2.0.1/tracecmd.py new/trace-cmd-2.0.4/tracecmd.py --- old/trace-cmd-2.0.1/tracecmd.py 2012-10-08 20:32:58.000000000 +0200 +++ new/trace-cmd-2.0.4/tracecmd.py 2013-03-05 02:31:06.000000000 +0100 @@ -84,7 +84,7 @@ @cached_property def cpu(self): - return record_cpu_get(self._record) + return pevent_record_cpu_get(self._record) @cached_property def name(self): @@ -96,7 +96,7 @@ @cached_property def ts(self): - return record_ts_get(self._record) + return pevent_record_ts_get(self._record) @cached_property def type(self): -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
