Fixed some possible unregistered parameters errors

Resolve: rhbz#947425
This commit is contained in:
Jaroslav Škarvada 2013-10-29 09:59:17 +01:00
parent c76e0cb9d7
commit b59b07f348
2 changed files with 41 additions and 1 deletions

View File

@ -0,0 +1,33 @@
diff -up ./src/devices/network.cpp.orig ./src/devices/network.cpp
--- ./src/devices/network.cpp.orig 2013-10-29 08:26:59.000000000 +0100
+++ ./src/devices/network.cpp 2013-10-29 08:30:52.100379762 +0100
@@ -346,9 +346,29 @@ const char * network::device_name(void)
void netdev_callback(const char *d_name)
{
+ char devname[128];
+
std::string f_name("/sys/class/net/");
f_name.append(d_name);
+ sprintf(devname, "%s-up", d_name);
+ register_parameter(devname);
+
+ sprintf(devname, "%s-powerunsave", d_name);
+ register_parameter(devname);
+
+ sprintf(devname, "%s-link-100", d_name);
+ register_parameter(devname);
+
+ sprintf(devname, "%s-link-1000", d_name);
+ register_parameter(devname);
+
+ sprintf(devname, "%s-link-high", d_name);
+ register_parameter(devname);
+
+ sprintf(devname, "%s-packets", d_name);
+ register_parameter(devname);
+
network *bl = new(std::nothrow) class network(d_name, f_name.c_str());
if (bl) {
all_devices.push_back(bl);

View File

@ -1,6 +1,6 @@
Name: powertop
Version: 2.4
Release: 5%{?dist}
Release: 6%{?dist}
Summary: Power consumption monitor
Group: Applications/System
@ -18,6 +18,8 @@ Patch2: powertop-2.3-ondemand-check.patch
Patch3: powertop-2.4-unlimit-fds.patch
# Accepted upstream
Patch4: powertop-2.4-fd-limit-err.patch
# Sent upstream
Patch5: powertop-2.4-reg-net-params.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gettext, ncurses-devel, pciutils-devel, zlib-devel, libnl3-devel
Requires(post): coreutils
@ -33,6 +35,7 @@ computer use more power than necessary while it is idle.
%patch2 -p1 -b .ondemand-check
%patch3 -p1 -b .unlimit-fds
%patch4 -p1 -b .fd-limit-err
%patch5 -p1 -b .reg-net-params
# remove left over object files
find . -name "*.o" -exec rm {} \;
@ -65,6 +68,10 @@ rm -rf %{buildroot}
%{_mandir}/man8/powertop.8*
%changelog
* Tue Oct 29 2013 Jaroslav Škarvada <jskarvad@redhat.com> - 2.4-6
- Fixed some possible unregistered parameters errors
Resolve: rhbz#947425
* Thu Oct 10 2013 Jaroslav Škarvada <jskarvad@redhat.com> - 2.4-5
- New version of unlimit-fds patch
- Fixed error message if FDs limit is reached (by fd-limit-err patch)