GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-22 20:44:19 +00:00
Code Issues Releases Wiki Activity

Merge pull request #365 from kanoi/api

Browse Source 
Pool store data transfer stats + API stats - display pool byte transfer stats
This commit is contained in:
Con Kolivas 2012-12-12 15:29:51 -08:00
commit fd1bd9e7c3
4 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
API-README
View File

@ -394,6 +394,9 @@ Enforced output limitation:
however, JSON brackets will be correctly closed and the JSON id will be
set to 0 (instead of 1) if any data was truncated
Modified API commands:
'stats' - add 'Times Sent', 'Bytes Sent', 'Times Recv', 'Bytes Recv'
----------
API V1.21 (cgminer v2.10.0)
@ -711,7 +714,8 @@ On Fedora 17:
systemctl enable httpd.service --system
On windows there are a few options.
Try one of these (I've never used either one)
Try one of these (apparently the first one is easiest - thanks jborkl)
http://www.easyphp.org/
http://www.apachefriends.org/en/xampp.html
http://www.wampserver.com/en/

4
api.c
View File

@ -2875,6 +2875,10 @@ static int itemstats(struct io_data *io_data, int i, char *id, struct cgminer_st
root = api_add_diff(root, "Max Diff", &(pool_stats->max_diff), false);
root = api_add_uint32(root, "Min Diff Count", &(pool_stats->min_diff_count), false);
root = api_add_uint32(root, "Max Diff Count", &(pool_stats->max_diff_count), false);
root = api_add_uint64(root, "Times Sent", &(pool_stats->times_sent), false);
root = api_add_uint64(root, "Bytes Sent", &(pool_stats->bytes_sent), false);
root = api_add_uint64(root, "Times Recv", &(pool_stats->times_received), false);
root = api_add_uint64(root, "Bytes Recv", &(pool_stats->bytes_received), false);
}
if (extra)

4
miner.h
View File

@ -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 {

21
util.c
View File

@ -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))) {