Commit 69c203d88a8f81a5bd17d4f1a1052a0093e11a57
2013-04-15T12:07:52
Avoid applog under stratum_lock in recv_line.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58
diff --git a/util.c b/util.c
index 5e22104..ff423b7 100644
--- a/util.c
+++ b/util.c
@@ -1029,6 +1029,12 @@ static void recalloc_sock(struct pool *pool, size_t len)
pool->sockbuf_size = new;
}
+enum recv_ret {
+ RECV_OK,
+ RECV_CLOSED,
+ RECV_RECVFAIL
+};
+
/* Peeks at a socket to find the first end of line and then reads just that
* from the socket and returns that as a malloced char */
char *recv_line(struct pool *pool)
@@ -1037,6 +1043,7 @@ char *recv_line(struct pool *pool)
char *tok, *sret = NULL;
if (!strstr(pool->sockbuf, "\n")) {
+ enum recv_ret ret = RECV_OK;
struct timeval rstart, now;
gettimeofday(&rstart, NULL);
@@ -1054,11 +1061,11 @@ char *recv_line(struct pool *pool)
memset(s, 0, RBUFSIZE);
n = recv(pool->sock, s, RECVSIZE, 0);
if (!n) {
- applog(LOG_DEBUG, "Socket closed waiting in recv_line");
+ ret = RECV_CLOSED;
break;
}
if (n < 0 && errno != EAGAIN && errno != EWOULDBLOCK) {
- applog(LOG_DEBUG, "Failed to recv sock in recv_line");
+ ret = RECV_RECVFAIL;
break;
}
slen = strlen(s);
@@ -1067,6 +1074,18 @@ char *recv_line(struct pool *pool)
gettimeofday(&now, NULL);
} while (tdiff(&now, &rstart) < 60 && !strstr(pool->sockbuf, "\n"));
mutex_unlock(&pool->stratum_lock);
+
+ switch (ret) {
+ default:
+ case RECV_OK:
+ break;
+ case RECV_CLOSED:
+ applog(LOG_DEBUG, "Socket closed waiting in recv_line");
+ break;
+ case RECV_RECVFAIL:
+ applog(LOG_DEBUG, "Failed to recv sock in recv_line");
+ break;
+ }
}
buflen = strlen(pool->sockbuf);