rpms/kerneloops/F-8 kerneloops-performance.patch, NONE, 1.1 kerneloops.spec, 1.6, 1.7
Chuck Ebbert (cebbert)
fedora-extras-commits at redhat.com
Mon Mar 17 17:39:35 UTC 2008
Author: cebbert
Update of /cvs/pkgs/rpms/kerneloops/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30407
Modified Files:
kerneloops.spec
Added Files:
kerneloops-performance.patch
Log Message:
rpm patch command won't accept -F
kerneloops-performance.patch:
--- NEW FILE kerneloops-performance.patch ---
Index: kerneloops-0.10/dmesg.c
===================================================================
--- kerneloops-0.10.orig/dmesg.c
+++ kerneloops-0.10/dmesg.c
@@ -1,3 +1,4 @@
+#define _GNU_SOURCE
/*
* Copyright 2007, Intel Corporation
*
@@ -52,20 +53,25 @@ static void fill_linepointers(char *buff
linecount = 0;
c = buffer;
while (c) {
+ int len = 0;
+ char *c9;
+
+ c9 = strchr(c, '\n');
+ if (c9)
+ len = c9 - c;
+
/* in /var/log/messages, we need to strip the first part off, upto the 3rd ':' */
if (remove_syslog) {
char *c2;
- char *c3;
- c3 = strchr(c, '\n');
/* skip non-kernel lines */
- c2 = strstr(c, "kernel:");
- if (!c2 || (c2 > c3))
- c2 = strstr(c, "kerneloops:");
- if (!c2 || (c2 > c3)) {
- c2 = strchr(c, '\n');
+ c2 = memmem(c, len, "kernel:", 7);
+ if (!c2)
+ c2 = memmem(c, len, "kerneloops:", 11);
+ if (!c2) {
+ c2 = c9;
if (c2) {
- c = c2+1;
+ c = c2 + 1;
continue;
} else
break;
Index: kerneloops.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kerneloops/F-8/kerneloops.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kerneloops.spec 4 Mar 2008 22:06:01 -0000 1.6
+++ kerneloops.spec 17 Mar 2008 17:38:58 -0000 1.7
@@ -1,6 +1,6 @@
Name: kerneloops
Version: 0.10
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Tool to automatically collect and submit kernel crash signatures
Group: System Environment/Base
@@ -11,6 +11,7 @@
Patch0: kerneloops-fix-manfile-name.patch
Patch1: kerneloops-ignore-module-list.patch
Patch2: kerneloops-require-syslog-on-shutdown.patch
+Patch3: kerneloops-performance.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -32,10 +33,10 @@
%prep
%setup -q
-
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
@@ -76,6 +77,9 @@
%{_mandir}/man8/kerneloops.8.gz
%changelog
+* Mon Mar 17 2008 Chuck Ebbert <cebbert at redhat.com> 0.10-7
+- Fix high CPU usage on startup with large system logs (F9#435544)
+
* Tue Mar 04 2008 Chuck Ebbert <cebbert at redhat.com> 0.10-6
- Fix the preun script to use a numeric comparison.
More information about the fedora-extras-commits
mailing list