X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FMsg.pm;h=165596d270265b34c2fc5cba785cc633f1f58b5c;hb=532c5c9e14a48ec17d38dce5d904a3b612a2563b;hp=cdb72aa0e920e41433c8ab724d58b41c1719b8b1;hpb=f935566e70cd40345937910094a5fa3394a58dc1;p=spider.git

diff --git a/perl/Msg.pm b/perl/Msg.pm
index cdb72aa0..165596d2 100644
--- a/perl/Msg.pm
+++ b/perl/Msg.pm
@@ -52,6 +52,27 @@ BEGIN {
 	eval {
 		require Errno; Errno->import(qw(EAGAIN EINPROGRESS EWOULDBLOCK));
 	};
+
+	eval {
+		require Socket; Socket->import(qw(IPPROTO_TCP TCP_NODELAY));
+	};
+	unless (*IPPROTO_TCP  && !$^O =~ /^MS/) {
+		dbg("IPPROTO_TCP and TCP_NODELAY manually defined");
+		eval '*IPPROTO_TCP     = sub {     6 };';
+		eval '*TCP_NODELAY     = sub {     1 };';
+	}
+	# 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 };';
+		eval '*F_GETFL     = sub {     0 };';
+		eval '*F_SETFL     = sub {     0 };';
+		eval '*IPPROTO_TCP     = sub {     6 };';
+		eval '*TCP_NODELAY     = sub {     1 };';
+		$blocking_supported = 1;
+	} 
 }
 
 my $w = $^W;
@@ -109,14 +130,23 @@ sub set_rproc
 sub blocking
 {
 	return unless $blocking_supported;
-	
-	my $flags = fcntl ($_[0], F_GETFL, 0);
-	if ($_[1]) {
-		$flags &= ~O_NONBLOCK;
+
+	# Make the handle stop blocking, the Windows way.
+	if ($main::is_win) { 
+	  # 126 is FIONBIO (some docs say 0x7F << 16)
+		ioctl( $_[0],
+			   0x80000000 | (4 << 16) | (ord('f') << 8) | 126,
+			   "$_[1]"
+			 );
 	} else {
-		$flags |= O_NONBLOCK;
+		my $flags = fcntl ($_[0], F_GETFL, 0);
+		if ($_[1]) {
+			$flags &= ~O_NONBLOCK;
+		} else {
+			$flags |= O_NONBLOCK;
+		}
+		fcntl ($_[0], F_SETFL, $flags);
 	}
-	fcntl ($_[0], F_SETFL, $flags);
 }
 
 # save it
@@ -208,10 +238,6 @@ sub disconnect {
 	$call ||= 'unallocated';
 	dbg("Connection $conn->{cnum} $call disconnected") if isdbg('connll');
 	
-	unless ($main::is_win) {
-		kill 'TERM', $conn->{pid} if exists $conn->{pid};
-	}
-
 	# get rid of any references
 	for (keys %$conn) {
 		if (ref($conn->{$_})) {
@@ -219,10 +245,16 @@ sub disconnect {
 		}
 	}
 
-	return unless defined($sock);
-    set_event_handler ($sock, read => undef, write => undef, error => undef);
-    shutdown($sock, 3);
-	close($sock);
+	if (defined($sock)) {
+		set_event_handler ($sock, read => undef, write => undef, error => undef);
+		shutdown($sock, 3);
+		close($sock);
+	}
+	
+	unless ($main::is_win) {
+		kill 'TERM', $conn->{pid} if exists $conn->{pid};
+	}
+
 }
 
 sub send_now {
@@ -354,6 +386,33 @@ sub new_server {
 	return $self;
 }
 
+
+sub nolinger
+{
+	my $conn = shift;
+
+	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: $!";
+	unless ($main::is_win) {
+		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");
+	}
+}
+
 sub dequeue
 {
 	my $conn = shift;
@@ -436,6 +495,7 @@ sub new_client {
 		my $conn = $server_conn->new($server_conn->{rproc});
 		$conn->{sock} = $sock;
 		blocking($sock, 0);
+		$conn->nolinger;
 		$conn->{blocking} = 0;
 		my ($rproc, $eproc) = &{$server_conn->{rproc}} ($conn, $conn->{peerhost} = $sock->peerhost(), $conn->{peerport} = $sock->peerport());
 		$conn->{sort} = 'Incoming';