GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-11 07:17:58 +00:00
Code Issues Releases Wiki Activity

All stratum calls to recv_line are serialised from the one place so there is no need to use locking around recv().

Browse Source
This commit is contained in:
Con Kolivas 2013-05-19 10:23:59 +10:00
parent bd652a623e
commit 64b08f383b
1 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
util.c
View File

@ -1084,12 +1084,6 @@ static void recalloc_sock(struct pool *pool, size_t len)
pool->sockbuf_size = new; 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 /* 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 */ * from the socket and returns that as a malloced char */
char *recv_line(struct pool *pool) char *recv_line(struct pool *pool)
@ -1098,7 +1092,6 @@ char *recv_line(struct pool *pool)
char *tok, *sret = NULL; char *tok, *sret = NULL;
if (!strstr(pool->sockbuf, "\n")) { if (!strstr(pool->sockbuf, "\n")) {
enum recv_ret ret = RECV_OK;
struct timeval rstart, now; struct timeval rstart, now;
cgtime(&rstart); cgtime(&rstart);
@ -1107,7 +1100,6 @@ char *recv_line(struct pool *pool)
goto out; goto out;
} }
mutex_lock(&pool->stratum_lock);
do { do {
char s[RBUFSIZE]; char s[RBUFSIZE];
size_t slen; size_t slen;
@ -1116,12 +1108,12 @@ char *recv_line(struct pool *pool)
memset(s, 0, RBUFSIZE); memset(s, 0, RBUFSIZE);
n = recv(pool->sock, s, RECVSIZE, 0); n = recv(pool->sock, s, RECVSIZE, 0);
if (!n) { if (!n) {
ret = RECV_CLOSED; applog(LOG_DEBUG, "Socket closed waiting in recv_line");
break; break;
} }
if (n < 0) { if (n < 0) {
if (!sock_blocks() || !socket_full(pool, false)) { if (!sock_blocks() || !socket_full(pool, false)) {
ret = RECV_RECVFAIL; applog(LOG_DEBUG, "Failed to recv sock in recv_line");
break; break;
} }
} else { } else {
@ -1131,19 +1123,6 @@ char *recv_line(struct pool *pool)
} }
cgtime(&now); cgtime(&now);
} while (tdiff(&now, &rstart) < 60 && !strstr(pool->sockbuf, "\n")); } 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");
goto out;
case RECV_RECVFAIL:
applog(LOG_DEBUG, "Failed to recv sock in recv_line");
goto out;
}
} }
buflen = strlen(pool->sockbuf); buflen = strlen(pool->sockbuf);