X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FMsg.pm;h=ef43b0bc24618b6033aa52520a009defdae1318e;hb=dbf7523a9b228dbdf1d03109afde351b8b194fab;hp=a30b1f5d064c827fcef6cefa37515927bd0f1ac2;hpb=71a8b14092af69cbc61d864a44b1f26b86e86a75;p=spider.git

diff --git a/perl/Msg.pm b/perl/Msg.pm
index a30b1f5d..ef43b0bc 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,12 +51,14 @@ 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 {
@@ -582,24 +585,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;