From: minima <minima>
Date: Fri, 11 Jan 2002 00:21:43 +0000 (+0000)
Subject: stop nagling on node output
X-Git-Tag: R_1_50~97
X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=f00b2281c52b68ab0df2166f8e263271861935ad;p=spider.git

stop nagling on node output
allow non blocking for M$?
---

diff --git a/Changes b/Changes
index 82d90bb4..cfa97c62 100644
--- a/Changes
+++ b/Changes
@@ -3,8 +3,11 @@
 socket. This MAY help some of the hanging problems (but I am now beginning
 to doubt this).
 2. do the same on the C client (which means DON'T FORGET to make it).
-3. set KEEPALIVE on TCP connections for both the node and C Client (you will
+3. set no nagling on the output from the node.
+4. set KEEPALIVE on TCP connections for both the node and C Client (you will
 have to make the C client again) and you will need to restart.
+5. It appears that it IS possible to set non blocking on M$ you just need to
+know how.
 08Jan02=======================================================================
 1. altered sh/qrz to point to the new server
 2. alter the character set handling a bit to make it better for spanish
diff --git a/perl/Msg.pm b/perl/Msg.pm
index f2881c8f..5593e937 100644
--- a/perl/Msg.pm
+++ b/perl/Msg.pm
@@ -52,6 +52,14 @@ BEGIN {
 	eval {
 		require Errno; Errno->import(qw(EAGAIN EINPROGRESS EWOULDBLOCK));
 	};
+	# http://support.microsoft.com/support/kb/articles/Q150/5/37.asp
+	# defines EINPROGRESS as 10035.  We provide it here because some
+	# Win32 users report POSIX::EINPROGRESS is not vendor-supported.
+	if ($^O eq 'MSWin32') { 
+		eval '*EINPROGRESS = sub { 10036 };';
+		eval '*EWOULDBLOCK = *EAGAIN = sub { 10035 };';
+		$blocking_supported = 1;
+	} 
 }
 
 my $w = $^W;
@@ -109,6 +117,17 @@ sub set_rproc
 sub blocking
 {
 	return unless $blocking_supported;
+
+	# Make the handle stop blocking, the Windows way.
+	if ($^O eq 'MSWin32') { 
+        my $set_it = $_[1];
+		
+        # 126 is FIONBIO (some docs say 0x7F << 16)
+        ioctl( $_[0],
+               0x80000000 | (4 << 16) | (ord('f') << 8) | 126,
+               $set_it
+             ) or confess "Can't set the handle non-blocking: $!";
+	}
 	
 	my $flags = fcntl ($_[0], F_GETFL, 0);
 	if ($_[1]) {
@@ -356,19 +375,29 @@ sub new_server {
 	return $self;
 }
 
+use Socket qw(IPPROTO_TCP TCP_NODELAY);
+
 sub nolinger
 {
 	my $conn = shift;
-	my $buf;
-	if (isdbg('sock') && ($buf = getsockopt($conn->{sock}, SOL_SOCKET, SO_LINGER))) {
-		my ($l, $t) = unpack("ll", $buf);
-		dbg("Linger is: $buf = $l $t");
+
+	if (isdbg('sock')) {
+		my ($l, $t) = unpack "ll", getsockopt($conn->{sock}, SOL_SOCKET, SO_LINGER); 
+		my $k = unpack 'l', getsockopt($conn->{sock}, SOL_SOCKET, SO_KEEPALIVE);
+		my $n = unpack "l", getsockopt($conn->{sock}, IPPROTO_TCP, TCP_NODELAY);
+		dbg("Linger is: $l $t, keepalive: $k, nagle: $n");
 	}
+
 	setsockopt($conn->{sock}, SOL_SOCKET, SO_LINGER, pack("ll", 0, 0)) or confess "setsockopt linger: $!";
 	setsockopt($conn->{sock}, SOL_SOCKET, SO_KEEPALIVE, 1) or confess "setsockopt keepalive: $!";
-	if (isdbg('sock') && ($buf = getsockopt($conn->{sock}, SOL_SOCKET, SO_LINGER))) {
-		my ($l, $t) = unpack("ll", $buf);
-		dbg("Linger is: $buf = $l $t");
+	setsockopt($conn->{sock}, IPPROTO_TCP, TCP_NODELAY, 1) or confess "setsockopt: $!";
+	$conn->{sock}->autoflush(0);
+	
+	if (isdbg('sock')) {
+		my ($l, $t) = unpack "ll", getsockopt($conn->{sock}, SOL_SOCKET, SO_LINGER); 
+		my $k = unpack 'l', getsockopt($conn->{sock}, SOL_SOCKET, SO_KEEPALIVE);
+		my $n = unpack "l", getsockopt($conn->{sock}, IPPROTO_TCP, TCP_NODELAY);
+		dbg("Linger is: $l $t, keepalive: $k, nagle: $n");
 	}
 }