GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-02-02 10:04:33 +00:00
Code Issues Releases Wiki Activity

API V3.0 unlimited socket reply size

Browse Source
This commit is contained in:
Kano 2014-01-04 23:56:44 +11:00 committed by Noel Maersk
parent 003b65b7b1
commit 83176cb52a
2 changed files with 44 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
api.c
View File

@ -470,7 +470,6 @@ struct io_data {
char *ptr; char *ptr;
char *cur; char *cur;
bool sock; bool sock;
bool full;
bool close; bool close;
}; };
@ -482,14 +481,15 @@ struct io_list {
static struct io_list *io_head = NULL; static struct io_list *io_head = NULL;
#define SOCKBUFALLOCSIZ 65536
#define io_new(init) _io_new(init, false) #define io_new(init) _io_new(init, false)
#define sock_io_new() _io_new(SOCKBUFSIZ, true) #define sock_io_new() _io_new(SOCKBUFALLOCSIZ, true)
static void io_reinit(struct io_data *io_data) static void io_reinit(struct io_data *io_data)
{ {
io_data->cur = io_data->ptr; io_data->cur = io_data->ptr;
*(io_data->ptr) = '\0'; *(io_data->ptr) = '\0';
io_data->full = false;
io_data->close = false; io_data->close = false;
} }
@ -526,29 +526,16 @@ static bool io_add(struct io_data *io_data, char *buf)
{ {
size_t len, dif, tot; size_t len, dif, tot;
if (io_data->full)
return false;
len = strlen(buf); len = strlen(buf);
dif = io_data->cur - io_data->ptr; dif = io_data->cur - io_data->ptr;
tot = len + 1 + dif; // send will always have enough space to add the JSON
tot = len + 1 + dif + sizeof(JSON_CLOSE) + sizeof(JSON_END);
if (tot > io_data->siz) { if (tot > io_data->siz) {
size_t new = io_data->siz * 2; size_t new = io_data->siz + (2 * SOCKBUFALLOCSIZ);
if (new < tot) if (new < tot)
new = tot * 2; new = (2 + (size_t)((float)tot / (float)SOCKBUFALLOCSIZ)) * SOCKBUFALLOCSIZ;
if (io_data->sock) {
if (new > SOCKBUFSIZ) {
if (tot > SOCKBUFSIZ) {
io_data->full = true;
return false;
}
new = SOCKBUFSIZ;
}
}
io_data->ptr = realloc(io_data->ptr, new); io_data->ptr = realloc(io_data->ptr, new);
io_data->cur = io_data->ptr + dif; io_data->cur = io_data->ptr + dif;
@ -694,8 +681,7 @@ static struct api_data *api_add_data_full(struct api_data *root, char *name, enu
root = api_data; root = api_data;
root->prev = root; root->prev = root;
root->next = root; root->next = root;
} } else {
else {
api_data->prev = root->prev; api_data->prev = root->prev;
root->prev = api_data; root->prev = api_data;
api_data->next = root; api_data->next = root;
@ -3118,28 +3104,24 @@ static void checkcommand(struct io_data *io_data, __maybe_unused SOCKETTYPE c, c
static void send_result(struct io_data *io_data, SOCKETTYPE c, bool isjson) static void send_result(struct io_data *io_data, SOCKETTYPE c, bool isjson)
{ {
char buf[SOCKBUFSIZ + sizeof(JSON_CLOSE) + sizeof(JSON_END)]; int count, sendc, res, tosend, len, n;
int count, res, tosend, len, n; char *buf = io_data->ptr;
strcpy(buf, io_data->ptr); strcpy(buf, io_data->ptr);
if (io_data->close) if (io_data->close)
strcat(buf, JSON_CLOSE); strcat(buf, JSON_CLOSE);
if (isjson) { if (isjson)
if (io_data->full) strcat(buf, JSON_END);
strcat(buf, JSON_END_TRUNCATED);
else
strcat(buf, JSON_END);
}
len = strlen(buf); len = strlen(buf);
tosend = len+1; tosend = len+1;
applog(LOG_DEBUG, "API: send reply: (%d) '%.10s%s'", tosend, buf, len > 10 ? "..." : BLANK); applog(LOG_DEBUG, "API: send reply: (%d) '%.10s%s'", tosend, buf, len > 10 ? "..." : BLANK);
count = 0; count = sendc = 0;
while (count++ < 5 && tosend > 0) { while (count < 5 && tosend > 0) {
// allow 50ms per attempt // allow 50ms per attempt
struct timeval timeout = {0, 50000}; struct timeval timeout = {0, 50000};
fd_set wd; fd_set wd;
@ -3152,28 +3134,34 @@ static void send_result(struct io_data *io_data, SOCKETTYPE c, bool isjson)
} }
n = send(c, buf, tosend, 0); n = send(c, buf, tosend, 0);
sendc++;
if (SOCKETFAIL(n)) { if (SOCKETFAIL(n)) {
count++;
if (sock_blocks()) if (sock_blocks())
continue; continue;
applog(LOG_WARNING, "API: send (%d) failed: %s", tosend, SOCKERRMSG); applog(LOG_WARNING, "API: send (%d:%d) failed: %s", len+1, (len+1 - tosend), SOCKERRMSG);
return; return;
} else { } else {
if (count <= 1) { if (sendc <= 1) {
if (n == tosend) if (n == tosend)
applog(LOG_DEBUG, "API: sent all of %d first go", tosend); applog(LOG_DEBUG, "API: sent all of %d first go", tosend);
else else
applog(LOG_DEBUG, "API: sent %d of %d first go", n, tosend); applog(LOG_DEBUG, "API: sent %d of %d first go", n, tosend);
} else { } else {
if (n == tosend) if (n == tosend)
applog(LOG_DEBUG, "API: sent all of remaining %d (count=%d)", tosend, count); applog(LOG_DEBUG, "API: sent all of remaining %d (sendc=%d)", tosend, sendc);
else else
applog(LOG_DEBUG, "API: sent %d of remaining %d (count=%d)", n, tosend, count); applog(LOG_DEBUG, "API: sent %d of remaining %d (sendc=%d)", n, tosend, sendc);
} }
tosend -= n; tosend -= n;
buf += n;
if (n == 0)
count++;
} }
} }
} }

21
doc/API
View File

@ -497,7 +497,26 @@ miner.php - an example web page to access the API
Feature Changelog for external applications using the API: Feature Changelog for external applications using the API:
API V1.32 (sgminer v3.6.5) API V3.0 (cgminer v3.9.1)
Allow unlimited size replies
---------
API V2.0 (cgminer v3.8.0)
Removed all GPU related commands and information from the replies
---------
API V1.33 (sgminer 4.1.0 post-release)
Modified API command:
'summary' - increased 'MHS' precision, added 'KHS'.
---------
API V1.32 (cgminer v3.6.5)
Modified API commands: Modified API commands:
'devs' 'gpu' 'pga' and 'asc' - add 'Device Elapsed' 'devs' 'gpu' 'pga' and 'asc' - add 'Device Elapsed'