d0s3t3ch/wownero-puddle
1
0
Fork 0
mirror of https://git.wownero.com/wownero/wownero-puddle.git synced 2024-08-15 01:03:20 +00:00
Code Issues Projects Releases Wiki Activity

bstack: rename peek to top

Browse source
This commit is contained in:
Jethro Grassie 2020-05-03 17:23:20 -04:00
parent 4bc1589781
commit c12b8b78e5
No known key found for this signature in database
GPG key ID: DE8ED755616565BB
3 changed files with 14 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/bstack.c
View file

@ -115,13 +115,6 @@ bstack_drop(bstack_t *q)
void * void *
bstack_top(bstack_t *q) bstack_top(bstack_t *q)
{
bstack_reset(q);
return bstack_peek(q);
}
void *
bstack_peek(bstack_t *q)
{ {
assert(q); assert(q);
if (!q->cc) if (!q->cc)

6
src/bstack.h
View file

@ -42,13 +42,15 @@ developers.
typedef struct bstack_t bstack_t; typedef struct bstack_t bstack_t;
typedef void (*recycle_fun)(void*); typedef void (*recycle_fun)(void*);
void bstack_new(bstack_t **out, size_t count, size_t size, recycle_fun recycle); void bstack_new(bstack_t **out, size_t count, size_t size,
recycle_fun recycle);
void bstack_free(bstack_t *q); void bstack_free(bstack_t *q);
void * bstack_push(bstack_t *q, void *item); void * bstack_push(bstack_t *q, void *item);
void bstack_drop(bstack_t *q); void bstack_drop(bstack_t *q);
void * bstack_top(bstack_t *q); void * bstack_top(bstack_t *q);
void * bstack_peek(bstack_t *q);
size_t bstack_count(bstack_t *q); size_t bstack_count(bstack_t *q);
/* iteration */
void * bstack_next(bstack_t *q); void * bstack_next(bstack_t *q);
void bstack_reset(bstack_t *q); void bstack_reset(bstack_t *q);

20
src/pool.c
View file

@ -1636,8 +1636,8 @@ rpc_on_block_template(const char* data, rpc_callback_t *callback)
return; return;
} }
pool_stats.last_template_fetched = time(NULL); pool_stats.last_template_fetched = time(NULL);
block_template_t *front = (block_template_t*) bstack_push(bst, NULL); block_template_t *top = (block_template_t*) bstack_push(bst, NULL);
response_to_block_template(result, front); response_to_block_template(result, top);
pool_clients_send_job(); pool_clients_send_job();
json_object_put(root); json_object_put(root);
} }
@ -1812,14 +1812,14 @@ rpc_on_last_block_header(const char* data, rpc_callback_t *callback)
JSON_GET_OR_WARN(height, block_header, json_type_int); JSON_GET_OR_WARN(height, block_header, json_type_int);
uint64_t bh = json_object_get_int64(height); uint64_t bh = json_object_get_int64(height);
bool need_new_template = false; bool need_new_template = false;
block_t *front = bstack_top(bsh); block_t *top = bstack_top(bsh);
if (front && bh > front->height) if (top && bh > top->height)
{ {
need_new_template = true; need_new_template = true;
block_t *block = bstack_push(bsh, NULL); block_t *block = bstack_push(bsh, NULL);
response_to_block(block_header, block); response_to_block(block_header, block);
} }
else if (!front) else if (!top)
{ {
block_t *block = bstack_push(bsh, NULL); block_t *block = bstack_push(bsh, NULL);
response_to_block(block_header, block); response_to_block(block_header, block);
@ -1828,10 +1828,10 @@ rpc_on_last_block_header(const char* data, rpc_callback_t *callback)
need_new_template = true; need_new_template = true;
} }
front = bstack_top(bsh); top = bstack_top(bsh);
pool_stats.network_difficulty = front->difficulty; pool_stats.network_difficulty = top->difficulty;
pool_stats.network_hashrate = front->difficulty / BLOCK_TIME; pool_stats.network_hashrate = top->difficulty / BLOCK_TIME;
pool_stats.network_height = front->height; pool_stats.network_height = top->height;
update_pool_hr(); update_pool_hr();
if (need_new_template) if (need_new_template)
@ -1844,7 +1844,7 @@ rpc_on_last_block_header(const char* data, rpc_callback_t *callback)
rpc_callback_t *cb1 = rpc_callback_new(rpc_on_block_template, NULL); rpc_callback_t *cb1 = rpc_callback_new(rpc_on_block_template, NULL);
rpc_request(pool_base, body, cb1); rpc_request(pool_base, body, cb1);
uint64_t end = front->height - 60; uint64_t end = top->height - 60;
uint64_t start = end - BLOCK_HEADERS_RANGE + 1; uint64_t start = end - BLOCK_HEADERS_RANGE + 1;
rpc_get_request_body(body, "get_block_headers_range", "sdsd", rpc_get_request_body(body, "get_block_headers_range", "sdsd",
"start_height", start, "end_height", end); "start_height", start, "end_height", end);