Commit b5617734fa2f4d900912a1e98e87fb16a30c6446
2012-09-30T23:10:43
Provide locking around stratum send operations to avoid races.
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 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86
diff --git a/cgminer.c b/cgminer.c
index d937137..6e65ada 100644
--- a/cgminer.c
+++ b/cgminer.c
@@ -2759,7 +2759,7 @@ static void *submit_work_thread(void *userdata)
applog(LOG_INFO, "Submitting share %08lx to pool %d", (unsigned long)(hash32[6]), pool->pool_no);
- sock_send(pool->sock, s, strlen(s));
+ stratum_send(pool, s, strlen(s));
goto out;
}
diff --git a/util.c b/util.c
index ddc563a..6b08338 100644
--- a/util.c
+++ b/util.c
@@ -843,9 +843,11 @@ bool extract_sockaddr(struct pool *pool, char *url)
}
/* Send a single command across a socket, appending \n to it */
-bool sock_send(int sock, char *s, ssize_t len)
+bool stratum_send(struct pool *pool, char *s, ssize_t len)
{
+ SOCKETTYPE sock = pool->sock;
ssize_t sent = 0;
+ bool ret = false;
if (opt_protocol)
applog(LOG_DEBUG, "SEND: %s", s);
@@ -853,15 +855,20 @@ bool sock_send(int sock, char *s, ssize_t len)
strcat(s, "\n");
len++;
+ mutex_lock(&pool->pool_lock);
while (len > 0 ) {
sent = send(sock, s + sent, len, 0);
- if (SOCKETFAIL(sent))
- return false;
+ if (SOCKETFAIL(sent)) {
+ ret = false;
+ goto out_unlock;
+ }
len -= sent;
}
+ ret = true;
fsync(sock);
-
- return true;
+out_unlock:
+ mutex_unlock(&pool->pool_lock);
+ return ret;;
}
#define RECVSIZE 8192
@@ -1129,7 +1136,7 @@ bool auth_stratum(struct pool *pool)
free(sret);
}
- if (!sock_send(pool->sock, s, strlen(s)))
+ if (!stratum_send(pool, s, strlen(s)))
goto out;
sret = recv_line(pool->sock);
@@ -1184,7 +1191,7 @@ bool initiate_stratum(struct pool *pool)
goto out;
}
- if (!sock_send(pool->sock, s, strlen(s))) {
+ if (!stratum_send(pool, s, strlen(s))) {
applog(LOG_DEBUG, "Failed to send s in initiate_stratum");
goto out;
}
diff --git a/util.h b/util.h
index 51b8778..2560552 100644
--- a/util.h
+++ b/util.h
@@ -116,7 +116,7 @@
#endif
struct pool;
-bool sock_send(int sock, char *s, ssize_t len);
+bool stratum_send(struct pool *pool, char *s, ssize_t len);
char *recv_line(SOCKETTYPE sock);
bool parse_method(struct pool *pool, char *s);
bool extract_sockaddr(struct pool *pool, char *url);