rpms/libxcb/F-11 libxcb-1.2-disable-nagle.patch, NONE, 1.1 libxcb.spec, 1.20, 1.21

[Warren Togami 砥上勇]

Author: wtogami

Update of /cvs/pkgs/rpms/libxcb/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18211

Modified Files:
	libxcb.spec 
Added Files:
	libxcb-1.2-disable-nagle.patch 
Log Message:
- disable Nagle's algorithm for X TCP traffic as upstream decided this was a bad idea.
  This should be a significant performance boost.


libxcb-1.2-disable-nagle.patch:

--- NEW FILE libxcb-1.2-disable-nagle.patch ---
diff -urN libxcb-1.2.orig/src/xcb_util.c libxcb-1.2/src/xcb_util.c
--- libxcb-1.2.orig/src/xcb_util.c	2008-12-11 05:15:34.000000000 -0500
+++ libxcb-1.2/src/xcb_util.c	2009-06-24 11:57:38.592581280 -0400
@@ -30,6 +30,7 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <netinet/in.h>
+#include <netinet/tcp.h>
 #ifdef DNETCONN
 #include <netdnet/dnetdb.h>
 #include <netdnet/dn.h>
@@ -250,6 +251,9 @@
     {
         fd = socket(addr->ai_family, addr->ai_socktype, addr->ai_protocol);
         if(fd >= 0) {
+            int on = 1;
+            setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &on, sizeof(on));
+
             if (connect(fd, addr->ai_addr, addr->ai_addrlen) >= 0)
                 break;
             close(fd);


Index: libxcb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxcb/F-11/libxcb.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- libxcb.spec	13 Apr 2009 16:03:30 -0000	1.20
+++ libxcb.spec	24 Jun 2009 16:07:23 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           libxcb
 Version:        1.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A C binding to the X11 protocol
 
 Group:          System Environment/Libraries
@@ -16,6 +16,7 @@ Source1:	pthread-stubs.pc.in
 
 Patch0:         libxcb-1.1-no-pthread-stubs.patch
 Patch1:		libxcb-1.2-to-git-6e2e87d.patch
+Patch2:         libxcb-1.2-disable-nagle.patch
 
 BuildRequires:  autoconf automake libtool pkgconfig
 BuildRequires:  doxygen
@@ -54,6 +55,7 @@ The %{name}-doc package contains documen
 %setup -q
 %patch0 -p1 -b .pthread-stubs
 %patch1 -p1 -b .git
+%patch2 -p1 -b .disable-nagle
 
 %build
 autoreconf -v --install
@@ -89,6 +91,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/doc/%{name}-%{version}
 
 %changelog
+* Wed Jun 24 2009 Warren Togami <wtogami at redhat.com> 1.2-4
+- disable Nagle's algorithm for X TCP traffic as upstream decided this was a bad idea.
+  This should be a significant performance boost.
+
 * Tue Apr 07 2009 Adam Jackson <ajax at redhat.com> 1.2-3
 - libxcb-1.2-to-git-6e2e87d.patch: Various updates from git, XID generation
   being the most important.