- libpciaccess-fd-cache.patch: Cache sysfs PCI config space file
descriptors for great boot speed justice.
This commit is contained in:
Adam Jackson
parent
f949b3ae73
commit
38ab561713
143
libpciaccess-fd-cache.patch
Normal file
143
libpciaccess-fd-cache.patch
Normal file
@ -0,0 +1,143 @@
|
|||||||
|
diff -up libpciaccess-20071031/src/linux_sysfs.c.cache libpciaccess-20071031/src/linux_sysfs.c
|
||||||
|
--- libpciaccess-20071031/src/linux_sysfs.c.cache 2007-10-23 09:19:36.000000000 -0400
|
||||||
|
+++ libpciaccess-20071031/src/linux_sysfs.c 2008-01-22 19:23:12.000000000 -0500
|
||||||
|
@@ -55,6 +55,8 @@
|
||||||
|
#include "pciaccess_private.h"
|
||||||
|
#include "linux_devmem.h"
|
||||||
|
|
||||||
|
+static void pci_device_linux_sysfs_destroy( void );
|
||||||
|
+
|
||||||
|
static int pci_device_linux_sysfs_read_rom( struct pci_device * dev,
|
||||||
|
void * buffer );
|
||||||
|
|
||||||
|
@@ -74,7 +76,7 @@
|
||||||
|
pciaddr_t * bytes_wrtten );
|
||||||
|
|
||||||
|
static const struct pci_system_methods linux_sysfs_methods = {
|
||||||
|
- .destroy = NULL,
|
||||||
|
+ .destroy = pci_device_linux_sysfs_destroy,
|
||||||
|
.destroy_device = NULL,
|
||||||
|
.read_rom = pci_device_linux_sysfs_read_rom,
|
||||||
|
.probe = pci_device_linux_sysfs_probe,
|
||||||
|
@@ -362,6 +364,53 @@
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
||||||
|
+static struct pci_device *last_config_dev = NULL;
|
||||||
|
+static int config_fd = -1;
|
||||||
|
+
|
||||||
|
+static void
|
||||||
|
+pci_device_linux_sysfs_destroy( void )
|
||||||
|
+{
|
||||||
|
+ if (config_fd != -1)
|
||||||
|
+ close( config_fd );
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static int
|
||||||
|
+open_config_fd( struct pci_device * dev, int flags )
|
||||||
|
+{
|
||||||
|
+ int fd;
|
||||||
|
+ char name[256];
|
||||||
|
+
|
||||||
|
+ /* Each device has a directory under sysfs. Within that directory there
|
||||||
|
+ * is a file named "config". This file used to access the PCI config
|
||||||
|
+ * space. It is used here to obtain most of the information about the
|
||||||
|
+ * device.
|
||||||
|
+ */
|
||||||
|
+
|
||||||
|
+ if ( last_config_dev != dev ) {
|
||||||
|
+ if ( config_fd != -1 ) {
|
||||||
|
+ close( config_fd );
|
||||||
|
+ last_config_dev = NULL;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ snprintf( name, 255, "%s/%04x:%02x:%02x.%1u/config",
|
||||||
|
+ SYS_BUS_PCI,
|
||||||
|
+ dev->domain,
|
||||||
|
+ dev->bus,
|
||||||
|
+ dev->dev,
|
||||||
|
+ dev->func );
|
||||||
|
+
|
||||||
|
+ fd = open( name, flags );
|
||||||
|
+ if ( fd == -1 ) {
|
||||||
|
+ return -1;
|
||||||
|
+ }
|
||||||
|
+ config_fd = fd;
|
||||||
|
+ last_config_dev = dev;
|
||||||
|
+ } else {
|
||||||
|
+ fd = config_fd;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return fd;
|
||||||
|
+}
|
||||||
|
|
||||||
|
static int
|
||||||
|
pci_device_linux_sysfs_read( struct pci_device * dev, void * data,
|
||||||
|
@@ -378,23 +427,9 @@
|
||||||
|
*bytes_read = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
- /* Each device has a directory under sysfs. Within that directory there
|
||||||
|
- * is a file named "config". This file used to access the PCI config
|
||||||
|
- * space. It is used here to obtain most of the information about the
|
||||||
|
- * device.
|
||||||
|
- */
|
||||||
|
- snprintf( name, 255, "%s/%04x:%02x:%02x.%1u/config",
|
||||||
|
- SYS_BUS_PCI,
|
||||||
|
- dev->domain,
|
||||||
|
- dev->bus,
|
||||||
|
- dev->dev,
|
||||||
|
- dev->func );
|
||||||
|
-
|
||||||
|
- fd = open( name, O_RDONLY );
|
||||||
|
- if ( fd == -1 ) {
|
||||||
|
+ fd = open_config_fd( dev, O_RDONLY );
|
||||||
|
+ if ( fd == -1 )
|
||||||
|
return errno;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
|
||||||
|
while ( temp_size > 0 ) {
|
||||||
|
const ssize_t bytes = pread64( fd, data_bytes, temp_size, offset );
|
||||||
|
@@ -416,7 +451,6 @@
|
||||||
|
*bytes_read = size - temp_size;
|
||||||
|
}
|
||||||
|
|
||||||
|
- close( fd );
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -436,23 +470,9 @@
|
||||||
|
*bytes_written = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
- /* Each device has a directory under sysfs. Within that directory there
|
||||||
|
- * is a file named "config". This file used to access the PCI config
|
||||||
|
- * space. It is used here to obtain most of the information about the
|
||||||
|
- * device.
|
||||||
|
- */
|
||||||
|
- snprintf( name, 255, "%s/%04x:%02x:%02x.%1u/config",
|
||||||
|
- SYS_BUS_PCI,
|
||||||
|
- dev->domain,
|
||||||
|
- dev->bus,
|
||||||
|
- dev->dev,
|
||||||
|
- dev->func );
|
||||||
|
-
|
||||||
|
- fd = open( name, O_WRONLY );
|
||||||
|
- if ( fd == -1 ) {
|
||||||
|
+ fd = open_config_fd( dev, O_WRONLY );
|
||||||
|
+ if ( fd == -1 )
|
||||||
|
return errno;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
|
||||||
|
while ( temp_size > 0 ) {
|
||||||
|
const ssize_t bytes = pwrite64( fd, data_bytes, temp_size, offset );
|
||||||
|
@@ -474,7 +494,6 @@
|
||||||
|
*bytes_written = size - temp_size;
|
||||||
|
}
|
||||||
|
|
||||||
|
- close( fd );
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
||||||
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
Name: libpciaccess
|
Name: libpciaccess
|
||||||
Version: 0.9.1
|
Version: 0.9.1
|
||||||
Release: 2.%{gitdate}%{?dist}
|
Release: 3.%{gitdate}%{?dist}
|
||||||
Summary: PCI access library
|
Summary: PCI access library
|
||||||
|
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
@ -17,6 +17,8 @@ Source0: libpciaccess-20071031.tar.bz2
|
|||||||
Source1: make-libpciaccess-snapshot.sh
|
Source1: make-libpciaccess-snapshot.sh
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
|
||||||
|
Patch0: libpciaccess-fd-cache.patch
|
||||||
|
|
||||||
BuildRequires: autoconf automake libtool pkgconfig
|
BuildRequires: autoconf automake libtool pkgconfig
|
||||||
Requires: hwdata
|
Requires: hwdata
|
||||||
|
|
||||||
@ -35,6 +37,7 @@ Development package for libpciaccess.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-%{gitdate}
|
%setup -q -n %{name}-%{gitdate}
|
||||||
|
%patch0 -p1 -b .cache
|
||||||
|
|
||||||
%build
|
%build
|
||||||
autoreconf -v --install
|
autoreconf -v --install
|
||||||
@ -65,6 +68,10 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_libdir}/pkgconfig/pciaccess.pc
|
%{_libdir}/pkgconfig/pciaccess.pc
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jan 23 2008 Adam Jackson <ajax@redhat.com> 0.9.1-3.20071031
|
||||||
|
- libpciaccess-fd-cache.patch: Cache sysfs PCI config space file
|
||||||
|
descriptors for great boot speed justice.
|
||||||
|
|
||||||
* Wed Oct 31 2007 Kristian Høgsberg <krh@redhat.com> 0.9.1-2.20071031
|
* Wed Oct 31 2007 Kristian Høgsberg <krh@redhat.com> 0.9.1-2.20071031
|
||||||
- New snapshot, git revision e392082abb5696c8837224da86cc0af4f21d7010.
|
- New snapshot, git revision e392082abb5696c8837224da86cc0af4f21d7010.
|
||||||
- Pick up new .so file.
|
- Pick up new .so file.
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user