From d154c121a70e27466b43d1852ec672e2f70e1f36 Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Sat, 22 Oct 2016 19:05:07 -0700 Subject: 3562 Fix CI. Revert accidentally-added files. --- html/091socket.cc.html | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'html/091socket.cc.html') diff --git a/html/091socket.cc.html b/html/091socket.cc.html index a3bd7316..a81f4c79 100644 --- a/html/091socket.cc.html +++ b/html/091socket.cc.html @@ -251,7 +251,6 @@ put(Recipe_ordinal,} :(before "End Primitive Recipe Implementations") case _READ_FROM_SOCKET: { - cerr << "$read-from-socket\n"; long long int x = static_cast<long long int>(ingredients.at(0).at(0)); socket_t* socket = reinterpret_cast<socket_t*>(x); // 1. we'd like to simply read() from the socket @@ -261,22 +260,19 @@ put(Recipe_ordinal,// 3. but poll() will block on EOF, so only use poll() on the very first // $read-from-socket on a socket if (!socket->polled) { + socket->polled = true; pollfd p; bzero(&p, sizeof(p)); p.fd = socket->fd; p.events = POLLIN | POLLHUP; - if (poll(&p, /*num pollfds*/1, /*timeout*/100/*ms*/) <= 0) { + if (poll(&p, /*num pollfds*/1, /*no timeout*/-1) <= 0) { raise << maybe(current_recipe_name()) << "error in $read-from-socket\n" << end(); products.resize(2); products.at(0).push_back(0); products.at(1).push_back(false); break; } - cerr << "poll output: " << p.revents << '\n'; - cerr << "setting socket->polled\n"; - socket->polled = true; } - cerr << "$read-from-socket " << x << " continuing\n"; int bytes = static_cast<int>(ingredients.at(1).at(0)); char* contents = new char[bytes]; bzero(contents, bytes); -- cgit 1.4.1-2-gfad0