rpms/oprofile/devel .cvsignore, 1.13, 1.14 sources, 1.14, 1.15 oprofile.spec, 1.69, 1.70 oprofile-0.7-libs.patch, 1.4, 1.5 oprofile-0.9.3-xen.patch, 1.1, 1.2 oprofile-0.9.3-970MP.patch, 1.1, NONE oprofile-0.9.3-family10.patch, 1.1, NONE oprofile-0.9.3-fmtver.patch, 1.1, NONE oprofile-0.9.3-ld_options.patch, 1.2, NONE oprofile-0.9.3-ranges.patch, 1.1, NONE oprofile-gcc43.patch, 1.1, NONE
William Eden Cohen (wcohen)
fedora-extras-commits at redhat.com
Fri Jul 18 19:46:16 UTC 2008
Author: wcohen
Update of /cvs/pkgs/rpms/oprofile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9338
Modified Files:
.cvsignore sources oprofile.spec oprofile-0.7-libs.patch
oprofile-0.9.3-xen.patch
Removed Files:
oprofile-0.9.3-970MP.patch oprofile-0.9.3-family10.patch
oprofile-0.9.3-fmtver.patch oprofile-0.9.3-ld_options.patch
oprofile-0.9.3-ranges.patch oprofile-gcc43.patch
Log Message:
Update to orprofile 0.9.4.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/oprofile/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore 17 Jul 2007 18:29:10 -0000 1.13
+++ .cvsignore 18 Jul 2008 19:45:30 -0000 1.14
@@ -1,5 +1 @@
-oprofile-0.8.2.tar.gz
-oprofile-0.9.tar.gz
-oprofile-0.9.1.tar.gz
-oprofile-0.9.2.tar.gz
-oprofile-0.9.3.tar.gz
+oprofile-0.9.4.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/oprofile/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources 17 Jul 2007 18:29:10 -0000 1.14
+++ sources 18 Jul 2008 19:45:30 -0000 1.15
@@ -1 +1 @@
-bb91e4d5bd45ff0d5c3e6214653422b7 oprofile-0.9.3.tar.gz
+82b059379895cf125261d7d773465915 oprofile-0.9.4.tar.gz
Index: oprofile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/oprofile/devel/oprofile.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- oprofile.spec 23 Jun 2008 20:49:20 -0000 1.69
+++ oprofile.spec 18 Jul 2008 19:45:30 -0000 1.70
@@ -1,10 +1,10 @@
%define DATE 20070717
-%define oprofile_version 0.9.3
+%define oprofile_version 0.9.4
Summary: System wide profiler
Name: oprofile
-Version: 0.9.3
-Release: 18%{?dist}
-License: GPL
+Version: 0.9.4
+Release: 1%{?dist}
+License: GPLv2
Group: Development/System
#
Source0: oprofile-%{version}.tar.gz
@@ -13,12 +13,7 @@
Patch10: oprofile-0.4-guess2.patch
Patch63: oprofile-0.7-libs.patch
Patch83: oprofile-0.9.3-xen.patch
-Patch92: oprofile-0.9.3-ld_options.patch
-Patch93: oprofile-0.9.3-family10.patch
-Patch94: oprofile-0.9.3-ranges.patch
-Patch95: oprofile-0.9.3-970MP.patch
-Patch96: oprofile-0.9.3-fmtver.patch
-Patch100: oprofile-gcc43.patch
+#Patch100: oprofile-gcc43.patch
URL: http://oprofile.sf.net
ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x alpha alphaev6 sparc sparc64
@@ -29,8 +24,12 @@
BuildRequires: elinks
BuildRequires: gtk2-devel
BuildRequires: automake
+BuildRequires: libtool
BuildRequires: binutils-devel
BuildRequires: popt-devel
+BuildRequires: java-devel
+BuildRequires: jpackage-utils
+BuildRequires: java-1.6.0-openjdk-devel
BuildRoot: %{_tmppath}/%{name}-root
@@ -60,23 +59,33 @@
%description gui
The oprof_start GUI for oprofile.
+
+%package jit
+Summary: Libraries required for profiling Java and other JITed code
+Group: Development/System
+Requires: oprofile = %{version}-%{release}
+Requires: java >= 1.6
+Requires: jpackage-utils
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+Requires: /etc/ld.so.conf.d
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%description jit
+This package includes a base JIT support library, as well as a Java
+agent library.
+
+
%prep
%setup -q -n %{name}-%{version}
%patch10 -p1 -b .guess2
#%patch35 -p1 -b .separate
%patch63 -p1 -b .libs
%patch83 -p1 -b .xen
-#%patch87 -p1 -b .power6
-#%patch88 -p0 -b .core
-#%patch89 -p0 -b .ppc64doc
-#%patch90 -p0 -b .race
-#%patch91 -p1 -b .k10
-%patch92 -p0 -b .ld_option
-%patch93 -p0 -b .family10
-%patch94 -p0 -b .ranges
-%patch95 -p1 -b .970MP
-%patch96 -p0 -b .fmtver
-%patch100 -p1 -b .gcc43
+#%patch100 -p1 -b .gcc43
./autogen.sh
@@ -106,7 +115,8 @@
--infodir=%{_infodir} \
--with-separate-debug-dir=/usr/lib/debug \
--enable-abi \
---with-qt-dir=$QTDIR
+--with-qt-dir=$QTDIR \
+--with-java=/usr/lib/jvm/java
make CFLAGS="$RPM_OPT_FLAGS"
@@ -142,9 +152,19 @@
#install -m 755 pp/liboppp.a $RPM_BUILD_ROOT/%{_libdir}
install -m 755 libabi/libopabi.a $RPM_BUILD_ROOT/%{_libdir}
+mkdir -p %{buildroot}/etc/ld.so.conf.d
+echo "%{_libdir}/oprofile" > %{buildroot}/etc/ld.so.conf.d/oprofile-%{_arch}.conf
+
%clean
rm -rf ${RPM_BUILD_ROOT}
+%pre
+getent group oprofile >/dev/null || groupadd -r oprofile
+getent passwd oprofile >/dev/null || \
+useradd -r -g oprofile -d /home/oprofile -s /sbin/nologin \
+ -c "Special user account to be used by OProfile" oprofile
+exit 0
+
%files
%defattr(-,root,root)
%doc doc/oprofile.html
@@ -157,6 +177,7 @@
%{_bindir}/opreport
%{_bindir}/oprofiled
%{_bindir}/oparchive
+%{_bindir}/opjitconv
%{_mandir}/man1/ophelp.1.gz
%{_mandir}/man1/opannotate.1.gz
@@ -179,6 +200,7 @@
%{_includedir}/op_list.h
%{_includedir}/op_sample_file.h
%{_includedir}/op_types.h
+%{_includedir}/opagent.h
%{_libdir}/libodb.a
%{_libdir}/libop.a
@@ -186,12 +208,24 @@
%{_libdir}/liboputil++.a
%{_libdir}/liboputil.a
+%doc doc/op-jit-devel.html
+%doc doc/opreport.xsd
+
%files gui
%defattr(-,root,root)
%{_bindir}/oprof_start
+%files jit
+%defattr(-,root,root)
+
+%{_libdir}/oprofile
+/etc/ld.so.conf.d/*
+
%changelog
+* Fri Jul 17 2008 Will Cohen <wcohen at redhat.com> - 0.9.4-1
+- Update to orprofile 0.9.4.
+
* Mon Jun 23 2008 Will Cohen <wcohen at redhat.com> - 0.9.3-18
- Fix default location for vmlinux. rhbz #451539
oprofile-0.7-libs.patch:
Index: oprofile-0.7-libs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/oprofile/devel/oprofile-0.7-libs.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- oprofile-0.7-libs.patch 22 Sep 2006 18:17:22 -0000 1.4
+++ oprofile-0.7-libs.patch 18 Jul 2008 19:45:30 -0000 1.5
@@ -1,34 +1,37 @@
---- oprofile-0.9.2/libutil/Makefile.am.libs 2003-09-26 09:23:32.000000000 -0400
-+++ oprofile-0.9.2/libutil/Makefile.am 2006-09-18 10:20:33.000000000 -0400
-@@ -2,8 +2,8 @@
+diff -up oprofile-0.9.4rc1/daemon/Makefile.am.libs oprofile-0.9.4rc1/daemon/Makefile.am
+--- oprofile-0.9.4rc1/daemon/Makefile.am.libs 2008-05-21 14:52:31.000000000 -0400
++++ oprofile-0.9.4rc1/daemon/Makefile.am 2008-06-01 13:41:19.000000000 -0400
+@@ -43,9 +43,9 @@ bin_PROGRAMS = oprofiled
- AM_CFLAGS = @OP_CFLAGS@
-
--noinst_LIBRARIES = libutil.a
--libutil_a_SOURCES = \
-+noinst_LIBRARIES = liboputil.a
-+liboputil_a_SOURCES = \
- op_deviceio.c \
- op_lockfile.c \
- op_file.c \
---- oprofile-0.9.2/libabi/tests/Makefile.am.libs 2005-08-04 14:27:28.000000000 -0400
-+++ oprofile-0.9.2/libabi/tests/Makefile.am 2006-09-18 10:27:20.000000000 -0400
-@@ -13,9 +13,9 @@
+ oprofiled_LDADD = \
+ liblegacy/liblegacy.a \
+- ../libabi/libabi.a \
++ ../libabi/libopabi.a \
+ ../libdb/libodb.a \
+ ../libop/libop.a \
+- ../libutil/libutil.a
++ ../libutil/liboputil.a
- abi_test_SOURCES = abi_test.cpp
- abi_test_LDADD = \
-- ../libabi.a \
-+ ../libopabi.a \
- ../../libop/libop.a \
- ../../libdb/libodb.a \
- ../../libopt++/libopt++.a \
-- ../../libutil++/libutil++.a \
-- ../../libutil/libutil.a
-+ ../../libutil++/liboputil++.a \
-+ ../../libutil/liboputil.a
---- oprofile-0.9.2/libabi/Makefile.am.libs 2005-08-04 14:27:27.000000000 -0400
-+++ oprofile-0.9.2/libabi/Makefile.am 2006-09-18 10:28:31.000000000 -0400
-@@ -10,15 +10,15 @@
+ oprofiled_LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+diff -up oprofile-0.9.4rc1/gui/Makefile.am.libs oprofile-0.9.4rc1/gui/Makefile.am
+--- oprofile-0.9.4rc1/gui/Makefile.am.libs 2008-05-21 14:52:31.000000000 -0400
++++ oprofile-0.9.4rc1/gui/Makefile.am 2008-06-01 13:41:19.000000000 -0400
+@@ -26,9 +26,9 @@ bin_PROGRAMS = oprof_start
+ oprof_start_SOURCES = $(dist_sources)
+ nodist_oprof_start_SOURCES = oprof_start.moc.cpp
+ oprof_start_LDADD = \
+- ../libutil++/libutil++.a \
++ ../libutil++/liboputil++.a \
+ ../libop/libop.a \
+- ../libutil/libutil.a \
++ ../libutil/liboputil.a \
+ ui/liboprof_start.a \
+ @QT_LDFLAGS@ \
+ @QT_LIB@ \
+diff -up oprofile-0.9.4rc1/libabi/Makefile.am.libs oprofile-0.9.4rc1/libabi/Makefile.am
+--- oprofile-0.9.4rc1/libabi/Makefile.am.libs 2008-05-21 14:52:32.000000000 -0400
++++ oprofile-0.9.4rc1/libabi/Makefile.am 2008-06-01 13:41:19.000000000 -0400
+@@ -10,15 +10,15 @@ AM_CPPFLAGS = \
AM_CXXFLAGS = @OP_CXXFLAGS@
@@ -49,9 +52,66 @@
- ../libutil/libutil.a
+ ../libutil++/liboputil++.a \
+ ../libutil/liboputil.a
---- oprofile-0.9.2/pp/Makefile.am.libs 2005-04-04 18:34:41.000000000 -0400
-+++ oprofile-0.9.2/pp/Makefile.am 2006-09-18 10:20:33.000000000 -0400
-@@ -19,9 +19,9 @@
+diff -up oprofile-0.9.4rc1/libabi/tests/Makefile.am.libs oprofile-0.9.4rc1/libabi/tests/Makefile.am
+--- oprofile-0.9.4rc1/libabi/tests/Makefile.am.libs 2008-05-21 14:52:32.000000000 -0400
++++ oprofile-0.9.4rc1/libabi/tests/Makefile.am 2008-06-01 13:41:19.000000000 -0400
+@@ -13,9 +13,9 @@ check_PROGRAMS = abi_test
+
+ abi_test_SOURCES = abi_test.cpp
+ abi_test_LDADD = \
+- ../libabi.a \
++ ../libopabi.a \
+ ../../libop/libop.a \
+ ../../libdb/libodb.a \
+ ../../libopt++/libopt++.a \
+- ../../libutil++/libutil++.a \
+- ../../libutil/libutil.a
++ ../../libutil++/liboputil++.a \
++ ../../libutil/liboputil.a
+diff -up oprofile-0.9.4rc1/libutil/Makefile.am.libs oprofile-0.9.4rc1/libutil/Makefile.am
+--- oprofile-0.9.4rc1/libutil/Makefile.am.libs 2008-05-21 14:52:31.000000000 -0400
++++ oprofile-0.9.4rc1/libutil/Makefile.am 2008-06-01 13:41:19.000000000 -0400
+@@ -2,8 +2,8 @@ SUBDIRS = . tests
+
+ AM_CFLAGS = @OP_CFLAGS@
+
+-noinst_LIBRARIES = libutil.a
+-libutil_a_SOURCES = \
++noinst_LIBRARIES = liboputil.a
++liboputil_a_SOURCES = \
+ op_deviceio.c \
+ op_lockfile.c \
+ op_file.c \
+diff -up oprofile-0.9.4rc1/libutil++/Makefile.am.libs oprofile-0.9.4rc1/libutil++/Makefile.am
+--- oprofile-0.9.4rc1/libutil++/Makefile.am.libs 2008-05-21 14:52:31.000000000 -0400
++++ oprofile-0.9.4rc1/libutil++/Makefile.am 2008-06-01 13:41:19.000000000 -0400
+@@ -7,8 +7,8 @@ AM_CPPFLAGS= \
+
+ AM_CXXFLAGS = @OP_CXXFLAGS@
+
+-noinst_LIBRARIES = libutil++.a
+-libutil___a_SOURCES = \
++noinst_LIBRARIES = liboputil++.a
++liboputil___a_SOURCES = \
+ op_bfd.cpp \
+ op_bfd.h \
+ bfd_support.cpp \
+diff -up oprofile-0.9.4rc1/opjitconv/Makefile.am.libs oprofile-0.9.4rc1/opjitconv/Makefile.am
+--- oprofile-0.9.4rc1/opjitconv/Makefile.am.libs 2008-06-01 13:42:53.000000000 -0400
++++ oprofile-0.9.4rc1/opjitconv/Makefile.am 2008-06-01 13:43:04.000000000 -0400
+@@ -6,7 +6,7 @@ bin_PROGRAMS = opjitconv
+ LIBS = @BFD_LIBS@
+
+ needed_libs = \
+- ../libutil/libutil.a
++ ../libutil/liboputil.a
+
+ opjitconv_LDADD = $(needed_libs)
+
+diff -up oprofile-0.9.4rc1/pp/Makefile.am.libs oprofile-0.9.4rc1/pp/Makefile.am
+--- oprofile-0.9.4rc1/pp/Makefile.am.libs 2008-05-21 14:52:30.000000000 -0400
++++ oprofile-0.9.4rc1/pp/Makefile.am 2008-06-01 13:41:19.000000000 -0400
+@@ -19,9 +19,9 @@ common_libs = \
../libpp/libpp.a \
../libopt++/libopt++.a \
../libregex/libop_regex.a \
@@ -63,52 +123,12 @@
../libdb/libodb.a
opreport_SOURCES = opreport.cpp \
---- oprofile-0.9.2/utils/Makefile.am.libs 2005-03-31 12:20:41.000000000 -0500
-+++ oprofile-0.9.2/utils/Makefile.am 2006-09-18 10:20:33.000000000 -0400
-@@ -7,4 +7,4 @@
+diff -up oprofile-0.9.4rc1/utils/Makefile.am.libs oprofile-0.9.4rc1/utils/Makefile.am
+--- oprofile-0.9.4rc1/utils/Makefile.am.libs 2008-05-21 14:52:31.000000000 -0400
++++ oprofile-0.9.4rc1/utils/Makefile.am 2008-06-01 13:41:19.000000000 -0400
+@@ -7,4 +7,4 @@ bin_PROGRAMS = ophelp
dist_bin_SCRIPTS = opcontrol
ophelp_SOURCES = ophelp.c
-ophelp_LDADD = ../libop/libop.a ../libutil/libutil.a
+ophelp_LDADD = ../libop/libop.a ../libutil/liboputil.a
---- oprofile-0.9.2/gui/Makefile.am.libs 2003-11-06 14:45:54.000000000 -0500
-+++ oprofile-0.9.2/gui/Makefile.am 2006-09-18 10:20:33.000000000 -0400
-@@ -26,9 +26,9 @@
- oprof_start_SOURCES = $(dist_sources)
- nodist_oprof_start_SOURCES = oprof_start.moc.cpp
- oprof_start_LDADD = \
-- ../libutil++/libutil++.a \
-+ ../libutil++/liboputil++.a \
- ../libop/libop.a \
-- ../libutil/libutil.a \
-+ ../libutil/liboputil.a \
- ui/liboprof_start.a \
- @QT_LDFLAGS@ \
- @QT_LIB@ \
---- oprofile-0.9.2/libutil++/Makefile.am.libs 2005-04-22 15:29:21.000000000 -0400
-+++ oprofile-0.9.2/libutil++/Makefile.am 2006-09-18 10:20:33.000000000 -0400
-@@ -5,8 +5,8 @@
- -I ${top_srcdir}/libop
- AM_CXXFLAGS = @OP_CXXFLAGS@
-
--noinst_LIBRARIES = libutil++.a
--libutil___a_SOURCES = \
-+noinst_LIBRARIES = liboputil++.a
-+liboputil___a_SOURCES = \
- op_bfd.cpp \
- op_bfd.h \
- bfd_support.cpp \
---- oprofile-0.9.2/daemon/Makefile.am.libs 2005-08-04 14:27:26.000000000 -0400
-+++ oprofile-0.9.2/daemon/Makefile.am 2006-09-18 10:25:46.000000000 -0400
-@@ -40,9 +40,9 @@
-
- oprofiled_LDADD = \
- liblegacy/liblegacy.a \
-- ../libabi/libabi.a \
-+ ../libabi/libopabi.a \
- ../libdb/libodb.a \
- ../libop/libop.a \
-- ../libutil/libutil.a
-+ ../libutil/liboputil.a
-
- oprofiled_LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
oprofile-0.9.3-xen.patch:
Index: oprofile-0.9.3-xen.patch
===================================================================
RCS file: /cvs/pkgs/rpms/oprofile/devel/oprofile-0.9.3-xen.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- oprofile-0.9.3-xen.patch 18 Jan 2008 17:01:44 -0000 1.1
+++ oprofile-0.9.3-xen.patch 18 Jul 2008 19:45:30 -0000 1.2
@@ -1,7 +1,7 @@
-diff -Naur oprofile-0.9.3/daemon/init.c oprofile-0.9.3-xen-r2/daemon/init.c
---- oprofile-0.9.3/daemon/init.c 2007-07-16 11:22:17.000000000 -0700
-+++ oprofile-0.9.3-xen-r2/daemon/init.c 2007-07-30 10:28:09.000000000 -0700
-@@ -226,6 +226,8 @@
+diff -up oprofile-0.9.4/daemon/init.c.orig oprofile-0.9.4/daemon/init.c
+--- oprofile-0.9.4/daemon/init.c.orig 2008-04-28 17:23:24.000000000 -0400
++++ oprofile-0.9.4/daemon/init.c 2008-07-18 11:26:04.000000000 -0400
+@@ -309,6 +309,8 @@ static void opd_26_init(void)
opd_create_vmlinux(vmlinux, kernel_range);
opd_create_xen(xenimage, xen_range);
@@ -10,34 +10,11 @@
opd_buf_size = opd_read_fs_int("/dev/oprofile/", "buffer_size", 1);
kernel_pointer_size = opd_read_fs_int("/dev/oprofile/", "pointer_size", 1);
-diff -Naur oprofile-0.9.3/daemon/opd_interface.h oprofile-0.9.3-xen-r2/daemon/opd_interface.h
---- oprofile-0.9.3/daemon/opd_interface.h 2007-07-16 11:22:17.000000000 -0700
-+++ oprofile-0.9.3-xen-r2/daemon/opd_interface.h 2007-12-20 11:59:20.000000000 -0800
-@@ -27,8 +27,19 @@
- /* Code 9 used to be TRACE_END_CODE which is not used anymore */
- /* Code 9 is now considered an unknown escape code */
- #define XEN_ENTER_SWITCH_CODE 10
-+/*
-+ * Ugly work-around for the unfortunate collision between Xenoprof's
-+ * DOMAIN_SWITCH_CODE (in use on x86 and ia64) and Cell's SPU_PROFILING_CODE
-+ * (in use with Power):
-+ */
-+#if defined(__i386__) || defined(__x86_64__) || defined(__ia64__)
-+#define DOMAIN_SWITCH_CODE 11
-+#define LAST_CODE 12
-+#else
- #define SPU_PROFILING_CODE 11
- #define SPU_CTX_SWITCH_CODE 12
--#define LAST_CODE 13
-+#define DOMAIN_SWITCH_CODE 13
-+#define LAST_CODE 14
-+#endif
-
- #endif /* OPD_INTERFACE_H */
-diff -Naur oprofile-0.9.3/daemon/opd_kernel.c oprofile-0.9.3-xen-r2/daemon/opd_kernel.c
---- oprofile-0.9.3/daemon/opd_kernel.c 2007-07-16 11:22:17.000000000 -0700
-+++ oprofile-0.9.3-xen-r2/daemon/opd_kernel.c 2007-08-02 09:46:27.000000000 -0700
-@@ -34,11 +34,22 @@
+diff -up oprofile-0.9.4/daemon/opd_interface.h.orig oprofile-0.9.4/daemon/opd_interface.h
+diff -up oprofile-0.9.4/daemon/opd_kernel.c.orig oprofile-0.9.4/daemon/opd_kernel.c
+--- oprofile-0.9.4/daemon/opd_kernel.c.orig 2006-01-16 08:21:09.000000000 -0500
++++ oprofile-0.9.4/daemon/opd_kernel.c 2008-07-18 11:26:04.000000000 -0400
+@@ -34,11 +34,22 @@ static struct kernel_image vmlinux_image
static struct kernel_image xen_image;
@@ -60,7 +37,7 @@
/* for no vmlinux */
if (no_vmlinux) {
vmlinux_image.name = "no-vmlinux";
-@@ -57,13 +68,22 @@
+@@ -57,13 +68,22 @@ void opd_create_vmlinux(char const * nam
vmlinux_image.start, vmlinux_image.end);
exit(EXIT_FAILURE);
}
@@ -83,7 +60,7 @@
/* for no xen */
if (no_xen) {
xen_image.name = "no-xen";
-@@ -72,18 +92,106 @@
+@@ -72,18 +92,106 @@ void opd_create_xen(char const * name, c
xen_image.name = xstrdup(name);
@@ -192,7 +169,7 @@
/**
* Allocate and initialise a kernel image description
-@@ -210,6 +318,75 @@
+@@ -210,6 +318,75 @@ struct kernel_image * find_kernel_image(
struct list_head * pos;
struct kernel_image * image = &vmlinux_image;
@@ -268,7 +245,7 @@
if (no_vmlinux)
return image;
-@@ -222,8 +399,5 @@
+@@ -222,8 +399,5 @@ struct kernel_image * find_kernel_image(
return image;
}
@@ -278,10 +255,10 @@
- return NULL;
+ return &vmlinux_image_anon;
}
-diff -Naur oprofile-0.9.3/daemon/opd_kernel.h oprofile-0.9.3-xen-r2/daemon/opd_kernel.h
---- oprofile-0.9.3/daemon/opd_kernel.h 2007-07-16 11:22:17.000000000 -0700
-+++ oprofile-0.9.3-xen-r2/daemon/opd_kernel.h 2007-07-30 10:28:09.000000000 -0700
-@@ -23,8 +23,12 @@
+diff -up oprofile-0.9.4/daemon/opd_kernel.h.orig oprofile-0.9.4/daemon/opd_kernel.h
+--- oprofile-0.9.4/daemon/opd_kernel.h.orig 2006-01-16 08:21:09.000000000 -0500
++++ oprofile-0.9.4/daemon/opd_kernel.h 2008-07-18 11:26:04.000000000 -0400
+@@ -23,8 +23,12 @@ struct transient;
/** create the kernel image */
void opd_create_vmlinux(char const * name, char const * arg);
@@ -294,7 +271,7 @@
/** opd_reread_module_info - parse /proc/modules for kernel modules */
void opd_reread_module_info(void);
-@@ -33,6 +37,7 @@
+@@ -33,6 +37,7 @@ struct kernel_image {
char * name;
vma_t start;
vma_t end;
@@ -302,80 +279,10 @@
struct list_head list;
};
-diff -Naur oprofile-0.9.3/daemon/opd_perfmon.c oprofile-0.9.3-xen-r2/daemon/opd_perfmon.c
---- oprofile-0.9.3/daemon/opd_perfmon.c 2007-07-16 11:22:17.000000000 -0700
-+++ oprofile-0.9.3-xen-r2/daemon/opd_perfmon.c 2007-12-20 12:07:50.000000000 -0800
-@@ -380,6 +380,7 @@
- close(child->up_pipe[1]);
- }
-
-+static struct child* xen_ctx;
-
- void perfmon_init(void)
- {
-@@ -389,6 +390,24 @@
- if (cpu_type == CPU_TIMER_INT)
- return;
-
-+ if (!no_xen) {
-+ xen_ctx = xmalloc(sizeof(struct child));
-+ xen_ctx->pid = getpid();
-+ xen_ctx->up_pipe[0] = -1;
-+ xen_ctx->up_pipe[1] = -1;
-+ xen_ctx->sigusr1 = 0;
-+ xen_ctx->sigusr2 = 0;
-+ xen_ctx->sigterm = 0;
-+
-+ create_context(xen_ctx);
-+
-+ write_pmu(xen_ctx);
-+
-+ load_context(xen_ctx);
-+ return;
-+ }
-+
-+
- nr = sysconf(_SC_NPROCESSORS_ONLN);
- if (nr == -1) {
- fprintf(stderr, "Couldn't determine number of CPUs.\n");
-@@ -431,6 +450,9 @@
- if (cpu_type == CPU_TIMER_INT)
- return;
-
-+ if (!no_xen)
-+ return;
-+
- for (i = 0; i < nr_cpus; ++i) {
- kill(children[i].pid, SIGKILL);
- waitpid(children[i].pid, NULL, 0);
-@@ -445,6 +467,11 @@
- if (cpu_type == CPU_TIMER_INT)
- return;
-
-+ if (!no_xen) {
-+ perfmon_start_child(xen_ctx->ctx_fd);
-+ return;
-+ }
-+
- for (i = 0; i < nr_cpus; ++i)
- kill(children[i].pid, SIGUSR1);
- }
-@@ -457,6 +484,11 @@
- if (cpu_type == CPU_TIMER_INT)
- return;
-
-+ if (!no_xen) {
-+ perfmon_stop_child(xen_ctx->ctx_fd);
-+ return;
-+ }
-+
- for (i = 0; i < nr_cpus; ++i)
- kill(children[i].pid, SIGUSR2);
- }
-diff -Naur oprofile-0.9.3/daemon/opd_sfile.c oprofile-0.9.3-xen-r2/daemon/opd_sfile.c
---- oprofile-0.9.3/daemon/opd_sfile.c 2007-07-16 11:22:17.000000000 -0700
-+++ oprofile-0.9.3-xen-r2/daemon/opd_sfile.c 2007-07-30 10:28:09.000000000 -0700
-@@ -234,7 +234,7 @@
+diff -up oprofile-0.9.4/daemon/opd_sfile.c.orig oprofile-0.9.4/daemon/opd_sfile.c
+--- oprofile-0.9.4/daemon/opd_sfile.c.orig 2007-05-10 19:42:33.000000000 -0400
++++ oprofile-0.9.4/daemon/opd_sfile.c 2008-07-18 11:26:10.000000000 -0400
+@@ -234,7 +234,7 @@ struct sfile * sfile_find(struct transie
}
/* we might need a kernel image start/end to hash on */
@@ -384,9 +291,9 @@
ki = find_kernel_image(trans);
if (!ki) {
verbprintf(vsamples, "Lost kernel sample %llx\n", trans->pc);
-diff -Naur oprofile-0.9.3/daemon/opd_trans.c oprofile-0.9.3-xen-r2/daemon/opd_trans.c
---- oprofile-0.9.3/daemon/opd_trans.c 2007-07-16 11:22:17.000000000 -0700
-+++ oprofile-0.9.3-xen-r2/daemon/opd_trans.c 2007-12-20 12:03:23.000000000 -0800
+diff -up oprofile-0.9.4/daemon/opd_trans.c.orig oprofile-0.9.4/daemon/opd_trans.c
+--- oprofile-0.9.4/daemon/opd_trans.c.orig 2008-01-14 21:05:47.000000000 -0500
++++ oprofile-0.9.4/daemon/opd_trans.c 2008-07-18 11:34:07.000000000 -0400
@@ -31,6 +31,8 @@
#include <stdio.h>
#include <errno.h>
@@ -396,7 +303,7 @@
extern size_t kernel_pointer_size;
-@@ -203,6 +205,9 @@
+@@ -203,6 +205,9 @@ static void code_kernel_enter(struct tra
{
verbprintf(vmisc, "KERNEL_ENTER_SWITCH to kernel\n");
trans->in_kernel = 1;
@@ -406,7 +313,7 @@
clear_trans_current(trans);
/* subtlety: we must keep trans->cookie cached,
* even though it's meaningless for the kernel -
-@@ -216,6 +221,9 @@
+@@ -216,6 +221,9 @@ static void code_user_enter(struct trans
{
verbprintf(vmisc, "USER_ENTER_SWITCH to user-space\n");
trans->in_kernel = 0;
@@ -416,7 +323,7 @@
clear_trans_current(trans);
clear_trans_last(trans);
}
-@@ -244,15 +252,33 @@
+@@ -244,15 +252,33 @@ static void code_trace_begin(struct tran
static void code_xen_enter(struct transient * trans)
{
verbprintf(vmisc, "XEN_ENTER_SWITCH to xen\n");
@@ -456,26 +363,17 @@
}
extern void code_spu_profiling(struct transient * trans);
-@@ -271,8 +297,16 @@
- &code_trace_begin,
- &code_unknown,
- &code_xen_enter,
-+/*
-+ * Ugly work-around for the unfortunate collision between Xenoprof's
-+ * DOMAIN_SWITCH_CODE (in use on x86 and ia64) and Cell's SPU_PROFILING_CODE
-+ * (in use with Power):
-+ */
-+#if !defined(__i386__) && !defined(__x86_64__) && !defined(__ia64__)
+@@ -275,6 +301,7 @@ handler_t handlers[LAST_CODE + 1] = {
&code_spu_profiling,
&code_spu_ctx_switch,
-+#endif
-+ &code_domain_switch,
+ #endif
++ &code_domain_switch,
+ &code_unknown,
};
- extern void (*special_processor)(struct transient *);
-diff -Naur oprofile-0.9.3/daemon/opd_trans.h oprofile-0.9.3-xen-r2/daemon/opd_trans.h
---- oprofile-0.9.3/daemon/opd_trans.h 2007-07-16 11:22:17.000000000 -0700
-+++ oprofile-0.9.3-xen-r2/daemon/opd_trans.h 2007-07-30 10:28:09.000000000 -0700
+diff -up oprofile-0.9.4/daemon/opd_trans.h.orig oprofile-0.9.4/daemon/opd_trans.h
+--- oprofile-0.9.4/daemon/opd_trans.h.orig 2007-05-10 19:42:33.000000000 -0400
++++ oprofile-0.9.4/daemon/opd_trans.h 2008-07-18 11:26:10.000000000 -0400
@@ -21,6 +21,10 @@
#include <stdint.h>
@@ -487,10 +385,10 @@
struct sfile;
struct anon_mapping;
-diff -Naur oprofile-0.9.3/daemon/oprofiled.c oprofile-0.9.3-xen-r2/daemon/oprofiled.c
---- oprofile-0.9.3/daemon/oprofiled.c 2007-07-16 11:22:17.000000000 -0700
-+++ oprofile-0.9.3-xen-r2/daemon/oprofiled.c 2007-07-30 10:28:09.000000000 -0700
-@@ -67,6 +67,7 @@
+diff -up oprofile-0.9.4/daemon/oprofiled.c.orig oprofile-0.9.4/daemon/oprofiled.c
+--- oprofile-0.9.4/daemon/oprofiled.c.orig 2008-04-28 17:23:23.000000000 -0400
++++ oprofile-0.9.4/daemon/oprofiled.c 2008-07-18 11:26:10.000000000 -0400
+@@ -68,6 +68,7 @@ char * session_dir;
int no_xen;
char * xenimage;
char * xen_range;
@@ -498,7 +396,7 @@
static char * verbose;
static char * binary_name_filter;
static char * events;
-@@ -86,6 +87,7 @@
+@@ -87,6 +88,7 @@ static struct poptOption options[] = {
{ "xen-range", 0, POPT_ARG_STRING, &xen_range, 0, "Xen VMA range", "start-end", },
{ "xen-image", 0, POPT_ARG_STRING, &xenimage, 0, "Xen image", "file", },
{ "image", 0, POPT_ARG_STRING, &binary_name_filter, 0, "image name filter", "profile these comma separated image" },
@@ -506,20 +404,20 @@
{ "separate-lib", 0, POPT_ARG_INT, &separate_lib, 0, "separate library samples for each distinct application", "[0|1]", },
{ "separate-kernel", 0, POPT_ARG_INT, &separate_kernel, 0, "separate kernel samples for each distinct application", "[0|1]", },
{ "separate-thread", 0, POPT_ARG_INT, &separate_thread, 0, "thread-profiling mode", "[0|1]" },
-diff -Naur oprofile-0.9.3/daemon/oprofiled.h oprofile-0.9.3-xen-r2/daemon/oprofiled.h
---- oprofile-0.9.3/daemon/oprofiled.h 2007-07-16 11:22:17.000000000 -0700
-+++ oprofile-0.9.3-xen-r2/daemon/oprofiled.h 2007-07-30 10:28:09.000000000 -0700
-@@ -64,5 +64,6 @@
+diff -up oprofile-0.9.4/daemon/oprofiled.h.orig oprofile-0.9.4/daemon/oprofiled.h
+--- oprofile-0.9.4/daemon/oprofiled.h.orig 2008-04-28 17:23:23.000000000 -0400
++++ oprofile-0.9.4/daemon/oprofiled.h 2008-07-18 11:26:10.000000000 -0400
+@@ -65,5 +65,6 @@ extern char * kernel_range;
extern int no_xen;
extern char * xenimage;
extern char * xen_range;
+extern char * xen_passive_setup;
#endif /* OPROFILED_H */
-diff -Naur oprofile-0.9.3/doc/opcontrol.1.in oprofile-0.9.3-xen-r2/doc/opcontrol.1.in
---- oprofile-0.9.3/doc/opcontrol.1.in 2007-07-16 11:22:17.000000000 -0700
-+++ oprofile-0.9.3-xen-r2/doc/opcontrol.1.in 2007-07-30 10:28:09.000000000 -0700
-@@ -147,12 +147,41 @@
+diff -up oprofile-0.9.4/doc/opcontrol.1.in.orig oprofile-0.9.4/doc/opcontrol.1.in
+--- oprofile-0.9.4/doc/opcontrol.1.in.orig 2007-08-14 15:05:37.000000000 -0400
++++ oprofile-0.9.4/doc/opcontrol.1.in 2008-07-18 11:26:10.000000000 -0400
+@@ -149,12 +149,41 @@ Xen image
.br
.TP
.BI "--active-domains="<list>
@@ -563,10 +461,10 @@
.br
.SH ENVIRONMENT
-diff -Naur oprofile-0.9.3/utils/opcontrol oprofile-0.9.3-xen-r2/utils/opcontrol
---- oprofile-0.9.3/utils/opcontrol 2007-07-16 11:22:17.000000000 -0700
-+++ oprofile-0.9.3-xen-r2/utils/opcontrol 2007-07-30 12:22:19.000000000 -0700
-@@ -144,9 +144,16 @@
+diff -up oprofile-0.9.4/utils/opcontrol.orig oprofile-0.9.4/utils/opcontrol
+--- oprofile-0.9.4/utils/opcontrol.orig 2008-04-28 17:23:23.000000000 -0400
++++ oprofile-0.9.4/utils/opcontrol 2008-07-18 11:26:10.000000000 -0400
+@@ -158,9 +158,16 @@ do_help()
--cpu-buffer-size=num per-cpu buffer size in units (2.6 only)
--note-table-size kernel notes buffer size in notes units (2.4 only)
@@ -586,7 +484,7 @@
" >&2
}
-@@ -289,6 +296,9 @@
+@@ -303,6 +310,9 @@ do_init()
SETUP_DIR="/root/.oprofile"
SETUP_FILE="$SETUP_DIR/daemonrc"
@@ -596,7 +494,7 @@
# initialize daemon vars
decide_oprofile_device_mount
CPUTYPE=`cat $MOUNT/cpu_type`
-@@ -433,7 +443,7 @@
+@@ -447,7 +457,7 @@ do_load_setup()
}
@@ -605,7 +503,7 @@
{
if test -z "$VMLINUX"; then
echo "No vmlinux file specified. You must specify the correct vmlinux file, e.g." >&2
-@@ -454,8 +464,12 @@
+@@ -468,8 +478,12 @@ check_valid_args()
echo "The specified vmlinux file \"$VMLINUX\" doesn't exist." >&2
exit 1
@@ -618,7 +516,7 @@
if test -f "$XENIMAGE"; then
return
fi
-@@ -511,6 +525,76 @@
+@@ -529,6 +543,76 @@ get_image_range()
fi
}
@@ -695,7 +593,7 @@
# validate --separate= parameters. This function is called with IFS=,
# so on each argument is splitted
-@@ -825,6 +909,16 @@
+@@ -843,6 +927,16 @@ do_options()
ACTIVE_DOMAINS=$val
DO_SETUP=yes
;;
@@ -712,7 +610,7 @@
--note-table-size)
error_if_empty $arg $val
if test "$KERNEL_SUPPORT" = "yes"; then
-@@ -897,6 +991,16 @@
+@@ -915,6 +1009,16 @@ do_options()
exit 1
fi
fi
@@ -729,7 +627,7 @@
}
-@@ -1167,6 +1271,15 @@
+@@ -1230,6 +1334,15 @@ do_param_setup()
fi
fi
@@ -745,7 +643,7 @@
if test $NOTE_SIZE != 0; then
set_param notesize $NOTE_SIZE
fi
-@@ -1284,7 +1397,8 @@
+@@ -1360,7 +1473,8 @@ do_start_daemon()
fi
do_setup
@@ -755,7 +653,7 @@
get_image_range "linux"
get_image_range "xen"
do_param_setup
-@@ -1312,6 +1426,10 @@
+@@ -1388,6 +1502,10 @@ do_start_daemon()
OPD_ARGS="$OPD_ARGS --image=$IMAGE_FILTER"
fi
@@ -766,8 +664,8 @@
if test -n "$VERBOSE"; then
OPD_ARGS="$OPD_ARGS --verbose=$VERBOSE"
fi
-@@ -1522,6 +1640,8 @@
- move_and_remove $SAMPLES_DIR/current/{root}
+@@ -1582,6 +1700,8 @@ do_save_session()
+ fi
hup_daemon
+
@@ -775,7 +673,7 @@
}
-@@ -1552,7 +1672,8 @@
+@@ -1631,7 +1751,8 @@ do_operations()
fi
if test "$SETUP" = "yes"; then
--- oprofile-0.9.3-970MP.patch DELETED ---
--- oprofile-0.9.3-family10.patch DELETED ---
--- oprofile-0.9.3-fmtver.patch DELETED ---
--- oprofile-0.9.3-ld_options.patch DELETED ---
--- oprofile-0.9.3-ranges.patch DELETED ---
--- oprofile-gcc43.patch DELETED ---
More information about the fedora-extras-commits
mailing list