X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FMsg.pm;h=cf15ff76a8ce2242762d01248339d0ea1c61e22e;hb=403e6bac61ed5d509aeda5b49557481ac88bc08c;hp=30519a0764b9c0ddec9dcc7330277cb68d600986;hpb=94b9e6854969b7c7419a4ef39eb83a70ca1a85f8;p=spider.git

diff --git a/perl/Msg.pm b/perl/Msg.pm
index 30519a07..cf15ff76 100644
--- a/perl/Msg.pm
+++ b/perl/Msg.pm
@@ -14,7 +14,7 @@ use strict;
 
 use vars qw($VERSION $BRANCH);
 $VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
 $main::build += $VERSION;
 $main::branch += $BRANCH;
 
@@ -37,6 +37,7 @@ $now = time;
 BEGIN {
     # Checks if blocking is supported
     eval {
+		local $^W;
         require POSIX; POSIX->import(qw(O_NONBLOCK F_SETFL F_GETFL))
     };
 	if ($@ || $main::is_win) {
@@ -50,15 +51,33 @@ BEGIN {
 
 	# import as many of these errno values as are available
 	eval {
+		local $^W;
 		require Errno; Errno->import(qw(EAGAIN EINPROGRESS EWOULDBLOCK));
 	};
+
+	unless ($^O eq 'MSWin32') {
+		if ($] >= 5.6) {
+			eval {
+				local $^W;
+				require Socket; Socket->import(qw(IPPROTO_TCP TCP_NODELAY));
+			};
+		} else {
+			dbg("IPPROTO_TCP and TCP_NODELAY manually defined");
+			eval 'sub IPPROTO_TCP {     6 };';
+			eval 'sub TCP_NODELAY {     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 };';
-		$blocking_supported = 1;
+		eval '*F_GETFL     = sub {     0 };';
+		eval '*F_SETFL     = sub {     0 };';
+		eval '*IPPROTO_TCP     = sub {     6 };';
+		eval '*TCP_NODELAY     = sub {     1 };';
+		$blocking_supported = 0;   # it appears that this DOESN'T work :-(
 	} 
 }
 
@@ -119,21 +138,21 @@ sub blocking
 	return unless $blocking_supported;
 
 	# Make the handle stop blocking, the Windows way.
-	if ($main::iswin) { 
-        # 126 is FIONBIO (some docs say 0x7F << 16)
-        ioctl( $_[0],
-               0x80000000 | (4 << 16) | (ord('f') << 8) | 126,
-               "$_[1]"
-             );
-	}
-	
-	my $flags = fcntl ($_[0], F_GETFL, 0);
-	if ($_[1]) {
-		$flags &= ~O_NONBLOCK;
+	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
@@ -193,7 +212,10 @@ sub connect {
 	blocking($sock, 0);
 	$conn->{blocking} = 0;
 
+	# does the host resolve?
 	my $ip = gethostbyname($to_host);
+	return undef unless $ip;
+	
 #	my $r = $sock->connect($to_port, $ip);
 	my $r = connect($sock, pack_sockaddr_in($to_port, $ip));
 	return undef unless $r || _err_will_block($!);
@@ -373,37 +395,31 @@ sub new_server {
 	return $self;
 }
 
-my $oldw = $^W;
-$^W = 0;
-eval "use Socket qw(IPPROTO_TCP TCP_NODELAY)";
-$^W = $oldw;
-if ($@ && !$main::inwin) {
-	sub IPPROTO_TCP {6;}
-	sub TCP_NODELAY {1;};
-}
 
 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: $!";
-	setsockopt($conn->{sock}, IPPROTO_TCP, TCP_NODELAY, 1) or confess "setsockopt: $!" unless $main::iswin;
-	$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");
-	}
+	unless ($main::is_win) {
+		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 = $main::is_win ? 0 : unpack "l", getsockopt($conn->{sock}, IPPROTO_TCP, TCP_NODELAY);
+			dbg("Linger is: $l $t, keepalive: $k, nagle: $n");
+		}
+		
+		eval {setsockopt($conn->{sock}, SOL_SOCKET, SO_KEEPALIVE, 1)} or dbg("setsockopt keepalive: $!");
+		eval {setsockopt($conn->{sock}, SOL_SOCKET, SO_LINGER, pack("ll", 0, 0))} or dbg("setsockopt linger: $!");
+		eval {setsockopt($conn->{sock}, IPPROTO_TCP, TCP_NODELAY, 1)} or eval {setsockopt($conn->{sock}, SOL_SOCKET, TCP_NODELAY, 1)} or dbg("setsockopt tcp_nodelay: $!");
+		$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 = $main::is_win ? 0 : unpack "l", getsockopt($conn->{sock}, IPPROTO_TCP, TCP_NODELAY);
+			dbg("Linger is: $l $t, keepalive: $k, nagle: $n");
+		}
+	} 
 }
 
 sub dequeue
@@ -572,24 +588,35 @@ sub set_event_handler {
 }
 
 sub event_loop {
-    my ($pkg, $loop_count, $timeout) = @_; # event_loop(1) to process events once
+    my ($pkg, $loop_count, $timeout, $wronly) = @_; # event_loop(1) to process events once
     my ($conn, $r, $w, $e, $rset, $wset, $eset);
     while (1) {
  
        # Quit the loop if no handles left to process
-        last unless ($rd_handles->count() || $wt_handles->count());
+		if ($wronly) {
+			last unless $wt_handles->count();
         
-		($rset, $wset, $eset) = IO::Select->select($rd_handles, $wt_handles, $er_handles, $timeout);
-		
-        foreach $e (@$eset) {
-            &{$er_callbacks{$e}}($e) if exists $er_callbacks{$e};
-        }
-        foreach $r (@$rset) {
-            &{$rd_callbacks{$r}}($r) if exists $rd_callbacks{$r};
-        }
-        foreach $w (@$wset) {
-            &{$wt_callbacks{$w}}($w) if exists $wt_callbacks{$w};
-        }
+			($rset, $wset, $eset) = IO::Select->select(undef, $wt_handles, undef, $timeout);
+			
+			foreach $w (@$wset) {
+				&{$wt_callbacks{$w}}($w) if exists $wt_callbacks{$w};
+			}
+		} else {
+			
+			last unless ($rd_handles->count() || $wt_handles->count());
+        
+			($rset, $wset, $eset) = IO::Select->select($rd_handles, $wt_handles, $er_handles, $timeout);
+			
+			foreach $e (@$eset) {
+				&{$er_callbacks{$e}}($e) if exists $er_callbacks{$e};
+			}
+			foreach $r (@$rset) {
+				&{$rd_callbacks{$r}}($r) if exists $rd_callbacks{$r};
+			}
+			foreach $w (@$wset) {
+				&{$wt_callbacks{$w}}($w) if exists $wt_callbacks{$w};
+			}
+		}
 
 		Timer::handler;