[prev in list] [next in list] [prev in thread] [next in thread] 

List:       gnash-commit
Subject:    [Gnash-commit] /srv/bzr/gnash/rtmp r9792: use the _timeout that's
From:       rob () welcomehome ! org
Date:       2008-11-27 16:12:57
Message-ID: E1L5lH4-0006PZ-D8 () sv ! gnu ! org
[Download RAW message or body]

------------------------------------------------------------
revno: 9792
committer: rob@welcomehome.org
branch nick: rtmp
timestamp: Thu 2008-11-27 09:12:57 -0700
message:
  use the _timeout that's already swet. Don't block SIGINT for now while debugging.
modified:
  libnet/network.cpp

["r9792.diff" (r9792.diff)]

=== modified file 'libnet/network.cpp'
--- a/libnet/network.cpp	2008-11-26 22:57:44 +0000
+++ b/libnet/network.cpp	2008-11-27 16:12:57 +0000
@@ -284,8 +284,8 @@
 	struct timespec tval;
 	sigset_t sigset, emptyset, blockset, pending;
 	sigemptyset(&blockset);         /* Block SIGINT */
-        sigaddset(&blockset, SIGINT);
-//        sigaddset(&blockset, SIGPIPE);
+//        sigaddset(&blockset, SIGINT);
+        sigaddset(&blockset, SIGPIPE);
 	sigprocmask(SIG_BLOCK, &blockset, &sigset);
 #else
 	struct timeval tval;
@@ -304,7 +304,7 @@
         // Reset the timeout value, since select modifies it on return. To
         // block, set the timeout to zero.
 #ifdef HAVE_PSELECT
-	tval.tv_sec = 1;
+	tval.tv_sec = _timeout;
 	tval.tv_nsec = 0;
         if (block) {
 	    ret = pselect(fd+1, &fdset, NULL, NULL, NULL, &blockset);
@@ -1110,9 +1110,9 @@
 //        sigaddset(&blockset, SIGPIPE);
         sigprocmask(SIG_BLOCK, &blockset, NULL);
 
-	tval.tv_sec = _timeout;
+	tval.tv_sec = 5; // FIXME: was _timeout;
 	tval.tv_nsec = 0;
-	int ret = ppoll(fds, limit, &tval, &emptyset);
+	int ret = ppoll(fds, limit, &tval, &blockset);
 	sigpending(&pending);
 	if (sigismember(&pending, SIGINT)) {
 	    log_debug("Have a pending SIGINT interupt waiting!");



_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit


[prev in list] [next in list] [prev in thread] [next in thread]