Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(908)

Unified Diff: base/sync_socket_posix.cc

Issue 49303008: Don't use select() in SyncSocket when handle > FD_SETSIZE. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/sync_socket_posix.cc
diff --git a/base/sync_socket_posix.cc b/base/sync_socket_posix.cc
index c408de52238e90bbd7a76a927d5c65bedd32beb7..b306207457abded6a87157d0cecca1c416da20d1 100644
--- a/base/sync_socket_posix.cc
+++ b/base/sync_socket_posix.cc
@@ -125,7 +125,13 @@ size_t SyncSocket::ReceiveWithTimeout(void* buffer,
DCHECK_GT(length, 0u);
DCHECK_LE(length, kMaxMessageLength);
DCHECK_NE(handle_, kInvalidHandle);
- CHECK_LT(handle_, FD_SETSIZE);
+
+ // TODO(dalecurtis): There's an undiagnosed issue on OSX where we're seeing
+ // extremely high numbers of open files which prevents select() from being
+ // used. When this is true, the best we can do is Peek() to see if we can
+ // Receive() now and return an error if not. See http://crbug.com/314364.
awong 2013/11/04 23:25:23 Please clarify why returning 0 doesn't turn into d
DaleCurtis 2013/11/04 23:32:25 Clarified that the 0 return value is a timeout err
+ if (handle_ >= FD_SETSIZE)
+ return Peek() < length ? 0 : Receive(buffer, length);
// Only timeouts greater than zero and less than one second are allowed.
DCHECK_GT(timeout.InMicroseconds(), 0);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698