From 138465bf0c915f7a39220851b8aee535c1734fa9 Mon Sep 17 00:00:00 2001 From: Kano Date: Thu, 13 Dec 2012 00:56:10 +1100 Subject: [PATCH] Pool store data transfer stats --- miner.h | 4 ++++ util.c | 21 +++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/miner.h b/miner.h index bd8109ab..5fbe3712 100644 --- a/miner.h +++ b/miner.h @@ -352,6 +352,10 @@ struct cgminer_pool_stats { double last_diff; uint32_t min_diff_count; uint32_t max_diff_count; + uint64_t times_sent; + uint64_t bytes_sent; + uint64_t times_received; + uint64_t bytes_received; }; struct cgpu_info { diff --git a/util.c b/util.c index 4d9ee96e..abb5bcc6 100644 --- a/util.c +++ b/util.c @@ -275,6 +275,7 @@ json_t *json_rpc_call(CURL *curl, const char *url, struct upload_buffer upload_data; json_t *val, *err_val, *res_val; bool probing = false; + double byte_count; json_error_t err; int rc; @@ -384,6 +385,13 @@ json_t *json_rpc_call(CURL *curl, const char *url, goto err_out; } + pool->cgminer_pool_stats.times_sent++; + if (curl_easy_getinfo(curl, CURLINFO_SIZE_UPLOAD, &byte_count) == CURLE_OK) + pool->cgminer_pool_stats.bytes_sent += byte_count; + pool->cgminer_pool_stats.times_received++; + if (curl_easy_getinfo(curl, CURLINFO_SIZE_DOWNLOAD, &byte_count) == CURLE_OK) + pool->cgminer_pool_stats.bytes_received += byte_count; + if (probing) { pool->probed = true; /* If X-Long-Polling was found, activate long polling */ @@ -900,6 +908,8 @@ static bool __stratum_send(struct pool *pool, char *s, ssize_t len) len -= ssent; } + pool->cgminer_pool_stats.times_sent++; + pool->cgminer_pool_stats.bytes_sent += ssent; return true; } @@ -1000,6 +1010,9 @@ char *recv_line(struct pool *pool) memmove(pool->sockbuf, pool->sockbuf + len + 1, buflen - len + 1); else strcpy(pool->sockbuf, ""); + + pool->cgminer_pool_stats.times_received++; + pool->cgminer_pool_stats.bytes_received += len; out: if (!sret) clear_sock(pool); @@ -1311,6 +1324,7 @@ bool initiate_stratum(struct pool *pool) char curl_err_str[CURL_ERROR_SIZE]; char s[RBUFSIZE], *sret = NULL; CURL *curl = NULL; + double byte_count; json_error_t err; bool ret = false; @@ -1350,6 +1364,13 @@ bool initiate_stratum(struct pool *pool) curl_easy_getinfo(curl, CURLINFO_LASTSOCKET, (long *)&pool->sock); keep_alive(curl, pool->sock); + pool->cgminer_pool_stats.times_sent++; + if (curl_easy_getinfo(curl, CURLINFO_SIZE_UPLOAD, &byte_count) == CURLE_OK) + pool->cgminer_pool_stats.bytes_sent += byte_count; + pool->cgminer_pool_stats.times_received++; + if (curl_easy_getinfo(curl, CURLINFO_SIZE_DOWNLOAD, &byte_count) == CURLE_OK) + pool->cgminer_pool_stats.bytes_received += byte_count; + sprintf(s, "{\"id\": %d, \"method\": \"mining.subscribe\", \"params\": []}", swork_id++); if (!__stratum_send(pool, s, strlen(s))) {