Browse Source

Differentiate socket full from sock full.

nfactor-troky
Con Kolivas 12 years ago
parent
commit
6e2e7d36de
  1. 4
      cgminer.c
  2. 21
      util.c
  3. 2
      util.h

4
cgminer.c

@ -4655,7 +4655,7 @@ static void *stratum_thread(void *userdata)
/* Check to see whether we need to maintain this connection /* Check to see whether we need to maintain this connection
* indefinitely or just bring it up when we switch to this * indefinitely or just bring it up when we switch to this
* pool */ * pool */
if (!sock_full(pool, false) && !cnx_needed(pool)) { if (!sock_full(pool) && !cnx_needed(pool)) {
suspend_stratum(pool); suspend_stratum(pool);
clear_stratum_shares(pool); clear_stratum_shares(pool);
clear_pool_work(pool); clear_pool_work(pool);
@ -4680,7 +4680,7 @@ static void *stratum_thread(void *userdata)
* every minute so if we fail to receive any for 90 seconds we * every minute so if we fail to receive any for 90 seconds we
* assume the connection has been dropped and treat this pool * assume the connection has been dropped and treat this pool
* as dead */ * as dead */
if (!sock_full(pool, false) && select(pool->sock + 1, &rd, NULL, NULL, &timeout) < 1) if (!sock_full(pool) && select(pool->sock + 1, &rd, NULL, NULL, &timeout) < 1)
s = NULL; s = NULL;
else else
s = recv_line(pool); s = recv_line(pool);

21
util.c

@ -929,16 +929,12 @@ bool stratum_send(struct pool *pool, char *s, ssize_t len)
return ret; return ret;
} }
/* Check to see if Santa's been good to you */ static bool socket_full(struct pool *pool, bool wait)
bool sock_full(struct pool *pool, bool wait)
{ {
SOCKETTYPE sock = pool->sock; SOCKETTYPE sock = pool->sock;
struct timeval timeout; struct timeval timeout;
fd_set rd; fd_set rd;
if (strlen(pool->sockbuf))
return true;
FD_ZERO(&rd); FD_ZERO(&rd);
FD_SET(sock, &rd); FD_SET(sock, &rd);
timeout.tv_usec = 0; timeout.tv_usec = 0;
@ -951,6 +947,15 @@ bool sock_full(struct pool *pool, bool wait)
return false; return false;
} }
/* Check to see if Santa's been good to you */
bool sock_full(struct pool *pool)
{
if (strlen(pool->sockbuf))
return true;
return (socket_full(pool, false));
}
static void clear_sock(struct pool *pool) static void clear_sock(struct pool *pool)
{ {
ssize_t n; ssize_t n;
@ -975,8 +980,8 @@ char *recv_line(struct pool *pool)
char s[RBUFSIZE]; char s[RBUFSIZE];
size_t sspace; size_t sspace;
if (!sock_full(pool, true)) { if (!socket_full(pool, true)) {
applog(LOG_DEBUG, "Timed out waiting for data on sock_full"); applog(LOG_DEBUG, "Timed out waiting for data on socket_full");
goto out; goto out;
} }
memset(s, 0, RBUFSIZE); memset(s, 0, RBUFSIZE);
@ -1385,7 +1390,7 @@ bool initiate_stratum(struct pool *pool)
goto out; goto out;
} }
if (!sock_full(pool, true)) { if (!socket_full(pool, true)) {
applog(LOG_DEBUG, "Timed out waiting for response in initiate_stratum"); applog(LOG_DEBUG, "Timed out waiting for response in initiate_stratum");
goto out; goto out;
} }

2
util.h

@ -46,7 +46,7 @@ struct pool;
enum dev_reason; enum dev_reason;
struct cgpu_info; struct cgpu_info;
bool stratum_send(struct pool *pool, char *s, ssize_t len); bool stratum_send(struct pool *pool, char *s, ssize_t len);
bool sock_full(struct pool *pool, bool wait); bool sock_full(struct pool *pool);
char *recv_line(struct pool *pool); char *recv_line(struct pool *pool);
bool parse_method(struct pool *pool, char *s); bool parse_method(struct pool *pool, char *s);
bool extract_sockaddr(struct pool *pool, char *url); bool extract_sockaddr(struct pool *pool, char *url);

Loading…
Cancel
Save