From 4fbbed9523b539c1887f300e912ce4c47f233354 Mon Sep 17 00:00:00 2001 From: Jethro Grassie Date: Sat, 29 Aug 2020 05:32:50 -0400 Subject: [PATCH 1/2] stats: count by account instead of connections --- src/growbag.c | 218 ++++++++++ src/growbag.h | 60 +++ src/pool.c | 339 +++++++++------ src/uthash.h | 1150 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 1627 insertions(+), 140 deletions(-) create mode 100644 src/growbag.c create mode 100644 src/growbag.h create mode 100644 src/uthash.h diff --git a/src/growbag.c b/src/growbag.c new file mode 100644 index 0000000..d5a73c0 --- /dev/null +++ b/src/growbag.c @@ -0,0 +1,218 @@ +/* +Copyright (c) 2014-2020, The Monero Project + +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this +list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, +this list of conditions and the following disclaimer in the documentation +and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its contributors +may be used to endorse or promote products derived from this software without +specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Parts of the project are originally copyright (c) 2012-2013 The Cryptonote +developers. +*/ + +#include "growbag.h" +#include +#include +#include +#include + +struct gbag_t +{ + size_t z; + size_t max; + size_t ref; + char * b; + char * n; + char * ni; + gbag_recycle rc; + gbag_moved mv; +}; + +void +gbag_new(gbag_t **out, size_t count, size_t size, + gbag_recycle recycle, gbag_moved moved) +{ + assert(*out==NULL && count && size); + gbag_t *gb = (gbag_t*) calloc(1, sizeof(gbag_t)); + gb->z = size; + gb->max = count; + gb->ref = 0; + gb->b = (char*) calloc(gb->max, gb->z); + gb->n = gb->b; + gb->ni = gb->b; + gb->rc = recycle; + gb->mv = moved; + *out = gb; +} + +void +gbag_free(gbag_t *gb) +{ + assert(gb && gb->max && gb->b); + char *end = gb->b + (gb->max * gb->z); + char *cur = gb->b; + if (gb->rc) + { + while (cur < end) + { + gb->rc(cur); + cur += gb->z; + } + } + free(gb->b); + gb->max = 0; + gb->ref = 0; + gb->b = NULL; + gb->n = NULL; + gb->ni = NULL; + gb->rc = NULL; + gb->mv = NULL; +} + +void * +gbag_get(gbag_t *gb) +{ + assert(gb && gb->max && gb->b); + char *end = gb->b + (gb->max * gb->z); + char *from = gb->n; + size_t nm, cz; + char *b = NULL; + if (gb->ref == gb->max) + goto grow; +scan: + do + { + if (!*gb->n) + { + gb->ref++; + return gb->n; + } + gb->n += gb->z; + } + while(gb->n < end); + if (from != gb->b) + { + end = from; + gb->n = gb->b; + from = gb->n; + goto scan; + } + else + { +grow: + cz = gb->max * gb->z; + nm = gb->max << 1; + b = (char*) realloc(gb->b, nm * gb->z); + if (b == NULL) + return NULL; + memset(b + cz, 0, cz); + gb->max = nm; + if (gb->mv && gb->b != b) + gb->mv(b, cz); + gb->b = b; + gb->n = b + cz; + gb->ref++; + return gb->n; + } + return NULL; +} + +void +gbag_put(gbag_t *gb, void *item) +{ + assert(gb && item && gb->ref>0); + if (gb->rc) + gb->rc(item); + memset(item, 0, gb->z); + gb->n = (char*)item; + gb->ref--; +} + +size_t +gbag_max(gbag_t *gb) +{ + return gb->max; +} + +size_t +gbag_used(gbag_t *gb) +{ + return gb->ref; +} + +void * +gbag_find(gbag_t *gb, const void *key, gbag_cmp cmp) +{ + assert(gb && gb->b && gb->max); + return gbag_find_after(gb, key, cmp, NULL); +} + +void * +gbag_find_after(gbag_t *gb, const void *key, gbag_cmp cmp, void *from) +{ + assert(gb && gb->b && gb->max); + char *s = gb->b; + char *e = gb->b + (gb->max * gb->z); + if (from) + s = ((char*)from) + gb->z; + int c = (e-s)/gb->z; + return bsearch(key, s, c, gb->z, cmp); +} + +void * +gbag_first(gbag_t *gb) +{ + assert(gb && gb->b && gb->max); + char *s = gb->b; + char *e = gb->b + (gb->max * gb->z); + gb->ni = s; + do + { + if (*s) + return s; + s += gb->z; + } + while (sb && gb->max); + if (from) + gb->ni = ((char*)from) + gb->z; + char *e = gb->b + (gb->max * gb->z); + char *s = gb->ni; + while (sni += gb->z; + if (*s) + return s; + s += gb->z; + } + return NULL; +} + diff --git a/src/growbag.h b/src/growbag.h new file mode 100644 index 0000000..0e6af94 --- /dev/null +++ b/src/growbag.h @@ -0,0 +1,60 @@ +/* +Copyright (c) 2014-2020, The Monero Project + +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this +list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, +this list of conditions and the following disclaimer in the documentation +and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its contributors +may be used to endorse or promote products derived from this software without +specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Parts of the project are originally copyright (c) 2012-2013 The Cryptonote +developers. +*/ + +/* A bag of memory that exponentially grows */ + +#ifndef GBAG_H +#define GBAG_H + +#include + +typedef struct gbag_t gbag_t; +typedef void (*gbag_recycle)(void*); +typedef void (*gbag_moved)(const void*,size_t); +typedef int (*gbag_cmp)(const void*,const void*); + +void gbag_new(gbag_t **out, size_t count, size_t size, + gbag_recycle recycle, gbag_moved moved); +void gbag_free(gbag_t *gb); + +void * gbag_get(gbag_t *gb); +void gbag_put(gbag_t *gb, void *item); +size_t gbag_max(gbag_t *gb); +size_t gbag_used(gbag_t *gb); +void * gbag_find(gbag_t *gb, const void *key, gbag_cmp cmp); +void * gbag_find_after(gbag_t *gb, const void *key, gbag_cmp cmp, void* from); +void * gbag_first(gbag_t *gb); +void * gbag_next(gbag_t *gb, void* from); + +#endif diff --git a/src/pool.c b/src/pool.c index bad5869..36e1795 100644 --- a/src/pool.c +++ b/src/pool.c @@ -69,9 +69,11 @@ developers. #include "log.h" #include "webui.h" #include "forkoff.h" +#include "growbag.h" +#include "uthash.h" #define MAX_LINE 8192 -#define POOL_CLIENTS_GROW 0x4000 +#define CLIENTS_INIT 0x4000 #define RPC_BODY_MAX 8192 #define JOB_BODY_MAX 8192 #define ERROR_BODY_MAX 512 @@ -212,13 +214,17 @@ typedef struct client_t uint8_t bad_shares; bool downstream; uint32_t downstream_miners; + UT_hash_handle hh; } client_t; -typedef struct pool_clients_t +typedef struct account_stats_t { - client_t *clients; - size_t count; -} pool_clients_t; + char address[ADDRESS_MAX]; + size_t worker_count; + time_t connected_since; + uint64_t hashes; + UT_hash_handle hh; +} account_stats_t; typedef struct share_t { @@ -248,14 +254,15 @@ typedef struct payment_t typedef struct rpc_callback_t rpc_callback_t; typedef void (*rpc_callback_fun)(const char*, rpc_callback_t*); +typedef void (*rpc_datafree_fun)(void*); struct rpc_callback_t { - rpc_callback_fun f; + rpc_callback_fun cf; void *data; + rpc_datafree_fun df; }; static config_t config; -static pool_clients_t pool_clients; static bstack_t *bst; static bstack_t *bsh; static struct event_base *pool_base; @@ -281,6 +288,8 @@ static pthread_cond_t cond_clients = PTHREAD_COND_INITIALIZER; static pthread_mutex_t mutex_clients = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t mutex_log = PTHREAD_MUTEX_INITIALIZER; static pthread_rwlock_t rwlock_tx = PTHREAD_RWLOCK_INITIALIZER; +static pthread_rwlock_t rwlock_acc = PTHREAD_RWLOCK_INITIALIZER; +static pthread_rwlock_t rwlock_cfd = PTHREAD_RWLOCK_INITIALIZER; static FILE *fd_log; static unsigned char sec_view[32]; static unsigned char pub_spend[32]; @@ -293,6 +302,10 @@ static struct event *timer_10s; static time_t upstream_last_time; static uint64_t upstream_last_height; static uint32_t miner_count; +static client_t *clients_by_fd = NULL; +static account_stats_t *account_stats = NULL; +static gbag_t *bag_stats; +static gbag_t *bag_clients; #ifdef HAVE_RX extern void rx_stop_mining(); @@ -324,11 +337,12 @@ void rx_slow_hash_free_state(){} } static inline rpc_callback_t * -rpc_callback_new(rpc_callback_fun f, void *data) +rpc_callback_new(rpc_callback_fun cf, void *data, rpc_datafree_fun df) { rpc_callback_t *c = calloc(1, sizeof(rpc_callback_t)); - c->f = f; + c->cf = cf; c->data = data; + c->df = df; return c; } @@ -338,10 +352,21 @@ rpc_callback_free(rpc_callback_t *callback) if (!callback) return; if (callback->data) - free(callback->data); + { + if (callback->df) + callback->df(callback->data); + else + free(callback->data); + } free(callback); } +static inline void +rpc_bag_free(void* data) +{ + gbag_free((gbag_t*)data); +} + static int compare_uint64(const MDB_val *a, const MDB_val *b) { @@ -606,27 +631,19 @@ store_block(uint64_t height, block_t *block) uint64_t miner_hr(const char *address) { - pthread_mutex_lock(&mutex_clients); - clients_reading++; - pthread_mutex_unlock(&mutex_clients); - client_t *c = pool_clients.clients; uint64_t hr = 0; - for (size_t i = 0; i < pool_clients.count; i++, c++) - { - if (c->connected_since - && !strncmp(c->address, address, ADDRESS_MAX)) - { - double d = difftime(time(NULL), c->connected_since); - if (d == 0.0) - continue; - hr += c->hashes / d; - continue; - } - } - pthread_mutex_lock(&mutex_clients); - clients_reading--; - pthread_cond_signal(&cond_clients); - pthread_mutex_unlock(&mutex_clients); + double d = 0.0; + account_stats_t *stats = NULL; + pthread_rwlock_rdlock(&rwlock_acc); + HASH_FIND_STR(account_stats, address, stats); + if (!stats || !stats->connected_since || !stats->hashes) + goto bail; + d = difftime(time(NULL), stats->connected_since); + if (d == 0.0) + goto bail; + hr = stats->hashes / d; +bail: + pthread_rwlock_unlock(&rwlock_acc); return hr; } @@ -937,16 +954,13 @@ static void update_pool_hr(void) { uint64_t hr = 0; - client_t *c = pool_clients.clients; - for (size_t i = 0; i < pool_clients.count; i++, c++) + client_t *c = (client_t*) gbag_first(bag_clients); + while ((c = gbag_next(bag_clients,NULL))) { - if (c->connected_since) - { - double d = difftime(time(NULL), c->connected_since); - if (d == 0.0) - continue; - hr += c->hashes / d; - } + double d = difftime(time(NULL), c->connected_since); + if (d == 0.0) + continue; + hr += c->hashes / d; } log_debug("Pool hashrate: %"PRIu64, hr); if (upstream_event) @@ -1344,10 +1358,34 @@ miner_send_job(client_t *client, bool response) } static void -pool_clients_send_job(void) +account_stats_moved(const void *items, size_t count) { - client_t *c = pool_clients.clients; - for (size_t i = 0; i < pool_clients.count; i++, c++) + account_stats_t *s, *e, *r; + s = (account_stats_t*) items; + e = s + count; + pthread_rwlock_wrlock(&rwlock_acc); + while (sfd == 0 || c->address[0] == 0 || c->downstream) continue; @@ -1356,27 +1394,36 @@ pool_clients_send_job(void) } static void -pool_clients_init(void) +clients_init(void) { - assert(pool_clients.count == 0); - pool_clients.count = POOL_CLIENTS_GROW; - pool_clients.clients = (client_t*) calloc(pool_clients.count, - sizeof(client_t)); + gbag_new(&bag_stats, CLIENTS_INIT, sizeof(account_stats_t), 0, + account_stats_moved); + gbag_new(&bag_clients, CLIENTS_INIT, sizeof(client_t), 0, + clients_moved); } static void -pool_clients_free(void) +clients_free(void) { - if (!pool_clients.clients) + if (!(bag_stats && bag_clients)) return; - client_t *c = pool_clients.clients; - for (size_t i = 0; i < pool_clients.count; i++, c++) + + client_t *c = (client_t*) gbag_first(bag_clients); + while ((c = gbag_next(bag_clients,NULL))) { if (!c->active_jobs) continue; client_clear_jobs(c); } - free(pool_clients.clients); + pthread_rwlock_wrlock(&rwlock_cfd); + HASH_CLEAR(hh, clients_by_fd); + gbag_free(bag_clients); + pthread_rwlock_unlock(&rwlock_cfd); + + pthread_rwlock_wrlock(&rwlock_acc); + HASH_CLEAR(hh, account_stats); + gbag_free(bag_stats); + pthread_rwlock_unlock(&rwlock_acc); } static void @@ -1464,7 +1511,7 @@ rpc_on_response(struct evhttp_request *req, void *arg) char body[len+1]; evbuffer_remove(input, body, len); body[len] = '\0'; - callback->f(body, callback); + callback->cf(body, callback); rpc_callback_free(callback); } @@ -1659,7 +1706,7 @@ rpc_on_block_template(const char* data, rpc_callback_t *callback) pool_stats.last_template_fetched = time(NULL); block_template_t *top = (block_template_t*) bstack_push(bst, NULL); response_to_block_template(result, top); - pool_clients_send_job(); + clients_send_job(); json_object_put(root); } @@ -1770,7 +1817,7 @@ startup_payout(uint64_t height) rpc_get_request_body(body, "get_block_header_by_height", "sd", "height", block->height); rpc_callback_t *cb = rpc_callback_new( - rpc_on_block_header_by_height, NULL); + rpc_on_block_header_by_height, 0, 0); rpc_request(pool_base, body, cb); } @@ -1862,7 +1909,7 @@ rpc_on_last_block_header(const char* data, rpc_callback_t *callback) uint64_t reserve = 17; rpc_get_request_body(body, "get_block_template", "sssd", "wallet_address", config.pool_wallet, "reserve_size", reserve); - rpc_callback_t *cb1 = rpc_callback_new(rpc_on_block_template, NULL); + rpc_callback_t *cb1 = rpc_callback_new(rpc_on_block_template, 0, 0); rpc_request(pool_base, body, cb1); uint64_t end = top->height - 60; @@ -1870,7 +1917,7 @@ rpc_on_last_block_header(const char* data, rpc_callback_t *callback) rpc_get_request_body(body, "get_block_headers_range", "sdsd", "start_height", start, "end_height", end); rpc_callback_t *cb2 = rpc_callback_new( - rpc_on_block_headers_range, NULL); + rpc_on_block_headers_range, 0, 0); rpc_request(pool_base, body, cb2); } @@ -1955,11 +2002,12 @@ rpc_on_wallet_transferred(const char* data, rpc_callback_t *callback) mdb_txn_abort(txn); goto cleanup; } - payment_t *payment = (payment_t*) callback->data; - for (; payment->amount; payment++) + gbag_t *bag_pay = (gbag_t*) callback->data; + payment_t *p = (payment_t*) gbag_first(bag_pay); + while((p = gbag_next(bag_pay, 0))) { MDB_cursor_op op = MDB_SET; - MDB_val key = {ADDRESS_MAX, (void*)payment->address}; + MDB_val key = {ADDRESS_MAX, (void*)p->address}; MDB_val val; rc = mdb_cursor_get(cursor, &key, &val, op); if (rc == MDB_NOTFOUND) @@ -1975,21 +2023,21 @@ rpc_on_wallet_transferred(const char* data, rpc_callback_t *callback) } uint64_t current_amount = *(uint64_t*)val.mv_data; - if (current_amount >= payment->amount) + if (current_amount >= p->amount) { - current_amount -= payment->amount; + current_amount -= p->amount; } else { log_error("Payment was more than balance: %"PRIu64" > %"PRIu64, - payment->amount, current_amount); + p->amount, current_amount); current_amount = 0; } if (error) { log_warn("Error seen on transfer for %s with amount %"PRIu64, - payment->address, payment->amount); + p->address, p->amount); } MDB_val new_val = {sizeof(current_amount), (void*)¤t_amount}; rc = mdb_cursor_put(cursor, &key, &new_val, MDB_CURRENT); @@ -2022,12 +2070,12 @@ rpc_on_wallet_transferred(const char* data, rpc_callback_t *callback) goto cleanup; } time_t now = time(NULL); - payment = (payment_t*) callback->data; - for (; payment->amount; payment++) + p = (payment_t*) gbag_first(bag_pay); + while((p = gbag_next(bag_pay, 0))) { - payment->timestamp = now; - MDB_val key = {ADDRESS_MAX, (void*)payment->address}; - MDB_val val = {sizeof(payment_t), payment}; + p->timestamp = now; + MDB_val key = {ADDRESS_MAX, (void*)p->address}; + MDB_val val = {sizeof(payment_t), p}; if ((rc = mdb_cursor_put(cursor, &key, &val, MDB_APPENDDUP)) != 0) { err = mdb_strerror(rc); @@ -2071,12 +2119,8 @@ send_payments(void) return rc; } - size_t payments_count = 0; - size_t payments_max_count = 25; - size_t payments_size = payments_max_count * sizeof(payment_t); - payment_t *payments = (payment_t*) calloc(1, payments_size); - payment_t *payment = payments; - payment_t *end_payment = payment + payments_max_count; + gbag_t *bag_pay; + gbag_new(&bag_pay, 25, sizeof(payment_t), 0, 0); MDB_cursor_op op = MDB_FIRST; while (1) @@ -2096,52 +2140,43 @@ send_payments(void) log_info("Sending payment: %"PRIu64", %.8s", amount, address); - strncpy(payment->address, address, ADDRESS_MAX-1); - payment->amount = amount; - payments_count++; - - if (++payment == end_payment) - { - payments_size <<= 1; - payments = (payment_t*) realloc(payments, payments_size); - payment = payments + payments_max_count; - memset(payment, 0, sizeof(payment_t) * payments_max_count); - payments_max_count <<= 1; - end_payment = payments + payments_max_count; - } + payment_t *p = (payment_t*) gbag_get(bag_pay); + strncpy(p->address, address, ADDRESS_MAX-1); + p->amount = amount; } mdb_cursor_close(cursor); mdb_txn_abort(txn); - if (payments_count) + size_t proc = gbag_used(bag_pay); + if (proc) { - size_t body_size = 160 * payments_count + 128; + size_t body_size = 160 * proc + 128; char body[body_size]; char *start = body; char *end = body + body_size; start = stecpy(start, "{\"id\":\"0\",\"jsonrpc\":\"2.0\",\"method\":" "\"transfer_split\",\"params\":{" "\"ring_size\":11,\"destinations\":[", end); - for (size_t i=0; iaddress, end); start = stecpy(start, "\",\"amount\":", end); sprintf(start, "%"PRIu64"}", p->amount); start = body + strlen(body); - if (i != payments_count -1) + if (--proc) start = stecpy(start, ",", end); else start = stecpy(start, "]}}", end); } log_trace(body); rpc_callback_t *cb = rpc_callback_new( - rpc_on_wallet_transferred, payments); + rpc_on_wallet_transferred, bag_pay, rpc_bag_free); rpc_wallet_request(pool_base, body, cb); } else - free(payments); + gbag_free(bag_pay); return 0; } @@ -2159,7 +2194,7 @@ fetch_view_key(void) return; char body[RPC_BODY_MAX] = {0}; rpc_get_request_body(body, "query_key", "ss", "key_type", "view_key"); - rpc_callback_t *cb = rpc_callback_new(rpc_on_view_key, NULL); + rpc_callback_t *cb = rpc_callback_new(rpc_on_view_key, 0, 0); rpc_wallet_request(pool_base, body, cb); } @@ -2169,7 +2204,7 @@ fetch_last_block_header(void) log_info("Fetching last block header"); char body[RPC_BODY_MAX] = {0}; rpc_get_request_body(body, "get_last_block_header", NULL); - rpc_callback_t *cb = rpc_callback_new(rpc_on_last_block_header, NULL); + rpc_callback_t *cb = rpc_callback_new(rpc_on_last_block_header, 0, 0); rpc_request(pool_base, body, cb); } @@ -2686,42 +2721,28 @@ timer_on_10m(int fd, short kind, void *ctx) static void client_add(int fd, struct bufferevent *bev, bool downstream) { - client_t *c = pool_clients.clients; - bool resize = true; - for (size_t i = 0; i < pool_clients.count; i++, c++) - { - if (c->connected_since == 0) - { - resize = false; - break; - } - } + client_t *c; + bool resize = gbag_used(bag_clients) == gbag_max(bag_clients); if (resize) { pthread_mutex_lock(&mutex_clients); while (clients_reading) pthread_cond_wait(&cond_clients, &mutex_clients); - pool_clients.count += POOL_CLIENTS_GROW; - c = realloc(pool_clients.clients, sizeof(client_t) * - pool_clients.count); - pool_clients.clients = c; - c += pool_clients.count - POOL_CLIENTS_GROW; - memset(c, 0, sizeof(client_t) * POOL_CLIENTS_GROW); + c = gbag_get(bag_clients); pthread_mutex_unlock(&mutex_clients); - log_debug("Client pool can now hold %zu clients", pool_clients.count); + log_debug("Client pool can now hold %zu clients", + gbag_max(bag_clients)); } else - memset(c, 0, sizeof(client_t)); + c = gbag_get(bag_clients); c->fd = fd; c->bev = bev; c->connected_since = time(NULL); c->downstream = downstream; bstack_new(&c->active_jobs, CLIENT_JOBS_MAX, sizeof(job_t), job_recycle); - miner_count++; - if (!downstream) - pool_stats.connected_miners++; - if (upstream_event) - upstream_send_client_connect(1); + pthread_rwlock_wrlock(&rwlock_cfd); + HASH_ADD_INT(clients_by_fd, fd, c); + pthread_rwlock_unlock(&rwlock_cfd); } static void @@ -2733,16 +2754,9 @@ client_find(struct bufferevent *bev, client_t **client) *client = NULL; return; } - client_t *c = pool_clients.clients; - for (size_t i = 0; i < pool_clients.count; i++, c++) - { - if (c->fd == fd) - { - *client = c; - return; - } - } - *client = NULL; + pthread_rwlock_rdlock(&rwlock_cfd); + HASH_FIND_INT(clients_by_fd, &fd, *client); + pthread_rwlock_unlock(&rwlock_cfd); } static void @@ -2753,15 +2767,31 @@ client_clear(struct bufferevent *bev) if (!client) return; client_clear_jobs(client); - if (client->downstream) - pool_stats.connected_miners -= client->downstream_miners; - else - pool_stats.connected_miners--; + account_stats_t *stats = NULL; + pthread_rwlock_rdlock(&rwlock_acc); + HASH_FIND_STR(account_stats, client->address, stats); + pthread_rwlock_unlock(&rwlock_acc); + if (stats && stats->worker_count == 1) + { + if (client->downstream) + pool_stats.connected_miners -= client->downstream_miners; + else + pool_stats.connected_miners--; + if (upstream_event) + upstream_send_client_disconnect(); + miner_count--; + pthread_rwlock_wrlock(&rwlock_acc); + HASH_DEL(account_stats, stats); + pthread_rwlock_unlock(&rwlock_acc); + gbag_put(bag_stats, stats); + } + else if (stats && stats->worker_count > 1) + stats->worker_count--; + pthread_rwlock_wrlock(&rwlock_cfd); + HASH_DEL(clients_by_fd, client); + pthread_rwlock_unlock(&rwlock_cfd); memset(client, 0, sizeof(client_t)); bufferevent_free(bev); - if (upstream_event) - upstream_send_client_disconnect(); - miner_count--; } static void @@ -2831,6 +2861,28 @@ miner_on_login(json_object *message, client_t *client) strncpy(client->address, address, sizeof(client->address)-1); strncpy(client->worker_id, worker_id, sizeof(client->worker_id)-1); + account_stats_t *stats = NULL; + pthread_rwlock_rdlock(&rwlock_acc); + HASH_FIND_STR(account_stats, client->address, stats); + pthread_rwlock_unlock(&rwlock_acc); + if (!stats) + { + miner_count++; + if (!client->downstream) + pool_stats.connected_miners++; + if (upstream_event) + upstream_send_client_connect(1); + stats = gbag_get(bag_stats); + strncpy(stats->address, address, sizeof(stats->address)-1); + stats->worker_count = 1; + stats->connected_since = time(NULL); + stats->hashes = 0; + pthread_rwlock_wrlock(&rwlock_acc); + HASH_ADD_STR(account_stats, address, stats); + pthread_rwlock_unlock(&rwlock_acc); + } + else + stats->worker_count++; uuid_t cid; uuid_generate(cid); bin_to_hex((const unsigned char*)cid, sizeof(uuid_t), @@ -3137,6 +3189,11 @@ post_hash: BN_free(rh); /* Process share */ + account_stats_t *stats = NULL; + pthread_rwlock_rdlock(&rwlock_acc); + HASH_FIND_STR(account_stats, client->address, stats); + pthread_rwlock_unlock(&rwlock_acc); + stats->hashes += job->target; client->hashes += job->target; time_t now = time(NULL); bool can_store = true; @@ -3156,7 +3213,7 @@ post_hash: "\"submit_block\", \"params\":[\"%s\"]}", block_hex); - rpc_callback_t *cb = rpc_callback_new(rpc_on_block_submitted, NULL); + rpc_callback_t *cb = rpc_callback_new(rpc_on_block_submitted, 0, 0); cb->data = calloc(1, sizeof(block_t)); block_t* b = (block_t*) cb->data; b->height = bt->height; @@ -4077,7 +4134,7 @@ cleanup(void) event_base_loopbreak(trusted_base); if (pool_base) event_base_free(pool_base); - pool_clients_free(); + clients_free(); if (bsh) bstack_free(bsh); if (bst) @@ -4090,6 +4147,8 @@ cleanup(void) pthread_mutex_destroy(&mutex_clients); pthread_mutex_destroy(&mutex_log); pthread_rwlock_destroy(&rwlock_tx); + pthread_rwlock_destroy(&rwlock_acc); + pthread_rwlock_destroy(&rwlock_cfd); pthread_cond_destroy(&cond_clients); log_info("Pool shutdown successfully"); if (fd_log) @@ -4252,7 +4311,7 @@ int main(int argc, char **argv) uuid_generate(iid); memcpy(&instance_id, iid, 4); - pool_clients_init(); + clients_init(); wui_context_t uic; uic.port = config.webui_port; diff --git a/src/uthash.h b/src/uthash.h new file mode 100644 index 0000000..5e5866a --- /dev/null +++ b/src/uthash.h @@ -0,0 +1,1150 @@ +/* +Copyright (c) 2003-2018, Troy D. Hanson http://troydhanson.github.com/uthash/ +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS +IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER +OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#ifndef UTHASH_H +#define UTHASH_H + +#define UTHASH_VERSION 2.1.0 + +#include /* memcmp, memset, strlen */ +#include /* ptrdiff_t */ +#include /* exit */ + +/* These macros use decltype or the earlier __typeof GNU extension. + As decltype is only available in newer compilers (VS2010 or gcc 4.3+ + when compiling c++ source) this code uses whatever method is needed + or, for VS2008 where neither is available, uses casting workarounds. */ +#if !defined(DECLTYPE) && !defined(NO_DECLTYPE) +#if defined(_MSC_VER) /* MS compiler */ +#if _MSC_VER >= 1600 && defined(__cplusplus) /* VS2010 or newer in C++ mode */ +#define DECLTYPE(x) (decltype(x)) +#else /* VS2008 or older (or VS2010 in C mode) */ +#define NO_DECLTYPE +#endif +#elif defined(__BORLANDC__) || defined(__ICCARM__) || defined(__LCC__) || defined(__WATCOMC__) +#define NO_DECLTYPE +#else /* GNU, Sun and other compilers */ +#define DECLTYPE(x) (__typeof(x)) +#endif +#endif + +#ifdef NO_DECLTYPE +#define DECLTYPE(x) +#define DECLTYPE_ASSIGN(dst,src) \ +do { \ + char **_da_dst = (char**)(&(dst)); \ + *_da_dst = (char*)(src); \ +} while (0) +#else +#define DECLTYPE_ASSIGN(dst,src) \ +do { \ + (dst) = DECLTYPE(dst)(src); \ +} while (0) +#endif + +/* a number of the hash function use uint32_t which isn't defined on Pre VS2010 */ +#if defined(_WIN32) +#if defined(_MSC_VER) && _MSC_VER >= 1600 +#include +#elif defined(__WATCOMC__) || defined(__MINGW32__) || defined(__CYGWIN__) +#include +#else +typedef unsigned int uint32_t; +typedef unsigned char uint8_t; +#endif +#elif defined(__GNUC__) && !defined(__VXWORKS__) +#include +#else +typedef unsigned int uint32_t; +typedef unsigned char uint8_t; +#endif + +#ifndef uthash_malloc +#define uthash_malloc(sz) malloc(sz) /* malloc fcn */ +#endif +#ifndef uthash_free +#define uthash_free(ptr,sz) free(ptr) /* free fcn */ +#endif +#ifndef uthash_bzero +#define uthash_bzero(a,n) memset(a,'\0',n) +#endif +#ifndef uthash_strlen +#define uthash_strlen(s) strlen(s) +#endif + +#ifdef uthash_memcmp +/* This warning will not catch programs that define uthash_memcmp AFTER including uthash.h. */ +#warning "uthash_memcmp is deprecated; please use HASH_KEYCMP instead" +#else +#define uthash_memcmp(a,b,n) memcmp(a,b,n) +#endif + +#ifndef HASH_KEYCMP +#define HASH_KEYCMP(a,b,n) uthash_memcmp(a,b,n) +#endif + +#ifndef uthash_noexpand_fyi +#define uthash_noexpand_fyi(tbl) /* can be defined to log noexpand */ +#endif +#ifndef uthash_expand_fyi +#define uthash_expand_fyi(tbl) /* can be defined to log expands */ +#endif + +#ifndef HASH_NONFATAL_OOM +#define HASH_NONFATAL_OOM 0 +#endif + +#if HASH_NONFATAL_OOM +/* malloc failures can be recovered from */ + +#ifndef uthash_nonfatal_oom +#define uthash_nonfatal_oom(obj) do {} while (0) /* non-fatal OOM error */ +#endif + +#define HASH_RECORD_OOM(oomed) do { (oomed) = 1; } while (0) +#define IF_HASH_NONFATAL_OOM(x) x + +#else +/* malloc failures result in lost memory, hash tables are unusable */ + +#ifndef uthash_fatal +#define uthash_fatal(msg) exit(-1) /* fatal OOM error */ +#endif + +#define HASH_RECORD_OOM(oomed) uthash_fatal("out of memory") +#define IF_HASH_NONFATAL_OOM(x) + +#endif + +/* initial number of buckets */ +#define HASH_INITIAL_NUM_BUCKETS 32U /* initial number of buckets */ +#define HASH_INITIAL_NUM_BUCKETS_LOG2 5U /* lg2 of initial number of buckets */ +#define HASH_BKT_CAPACITY_THRESH 10U /* expand when bucket count reaches */ + +/* calculate the element whose hash handle address is hhp */ +#define ELMT_FROM_HH(tbl,hhp) ((void*)(((char*)(hhp)) - ((tbl)->hho))) +/* calculate the hash handle from element address elp */ +#define HH_FROM_ELMT(tbl,elp) ((UT_hash_handle*)(void*)(((char*)(elp)) + ((tbl)->hho))) + +#define HASH_ROLLBACK_BKT(hh, head, itemptrhh) \ +do { \ + struct UT_hash_handle *_hd_hh_item = (itemptrhh); \ + unsigned _hd_bkt; \ + HASH_TO_BKT(_hd_hh_item->hashv, (head)->hh.tbl->num_buckets, _hd_bkt); \ + (head)->hh.tbl->buckets[_hd_bkt].count++; \ + _hd_hh_item->hh_next = NULL; \ + _hd_hh_item->hh_prev = NULL; \ +} while (0) + +#define HASH_VALUE(keyptr,keylen,hashv) \ +do { \ + HASH_FCN(keyptr, keylen, hashv); \ +} while (0) + +#define HASH_FIND_BYHASHVALUE(hh,head,keyptr,keylen,hashval,out) \ +do { \ + (out) = NULL; \ + if (head) { \ + unsigned _hf_bkt; \ + HASH_TO_BKT(hashval, (head)->hh.tbl->num_buckets, _hf_bkt); \ + if (HASH_BLOOM_TEST((head)->hh.tbl, hashval) != 0) { \ + HASH_FIND_IN_BKT((head)->hh.tbl, hh, (head)->hh.tbl->buckets[ _hf_bkt ], keyptr, keylen, hashval, out); \ + } \ + } \ +} while (0) + +#define HASH_FIND(hh,head,keyptr,keylen,out) \ +do { \ + (out) = NULL; \ + if (head) { \ + unsigned _hf_hashv; \ + HASH_VALUE(keyptr, keylen, _hf_hashv); \ + HASH_FIND_BYHASHVALUE(hh, head, keyptr, keylen, _hf_hashv, out); \ + } \ +} while (0) + +#ifdef HASH_BLOOM +#define HASH_BLOOM_BITLEN (1UL << HASH_BLOOM) +#define HASH_BLOOM_BYTELEN (HASH_BLOOM_BITLEN/8UL) + (((HASH_BLOOM_BITLEN%8UL)!=0UL) ? 1UL : 0UL) +#define HASH_BLOOM_MAKE(tbl,oomed) \ +do { \ + (tbl)->bloom_nbits = HASH_BLOOM; \ + (tbl)->bloom_bv = (uint8_t*)uthash_malloc(HASH_BLOOM_BYTELEN); \ + if (!(tbl)->bloom_bv) { \ + HASH_RECORD_OOM(oomed); \ + } else { \ + uthash_bzero((tbl)->bloom_bv, HASH_BLOOM_BYTELEN); \ + (tbl)->bloom_sig = HASH_BLOOM_SIGNATURE; \ + } \ +} while (0) + +#define HASH_BLOOM_FREE(tbl) \ +do { \ + uthash_free((tbl)->bloom_bv, HASH_BLOOM_BYTELEN); \ +} while (0) + +#define HASH_BLOOM_BITSET(bv,idx) (bv[(idx)/8U] |= (1U << ((idx)%8U))) +#define HASH_BLOOM_BITTEST(bv,idx) (bv[(idx)/8U] & (1U << ((idx)%8U))) + +#define HASH_BLOOM_ADD(tbl,hashv) \ + HASH_BLOOM_BITSET((tbl)->bloom_bv, ((hashv) & (uint32_t)((1UL << (tbl)->bloom_nbits) - 1U))) + +#define HASH_BLOOM_TEST(tbl,hashv) \ + HASH_BLOOM_BITTEST((tbl)->bloom_bv, ((hashv) & (uint32_t)((1UL << (tbl)->bloom_nbits) - 1U))) + +#else +#define HASH_BLOOM_MAKE(tbl,oomed) +#define HASH_BLOOM_FREE(tbl) +#define HASH_BLOOM_ADD(tbl,hashv) +#define HASH_BLOOM_TEST(tbl,hashv) (1) +#define HASH_BLOOM_BYTELEN 0U +#endif + +#define HASH_MAKE_TABLE(hh,head,oomed) \ +do { \ + (head)->hh.tbl = (UT_hash_table*)uthash_malloc(sizeof(UT_hash_table)); \ + if (!(head)->hh.tbl) { \ + HASH_RECORD_OOM(oomed); \ + } else { \ + uthash_bzero((head)->hh.tbl, sizeof(UT_hash_table)); \ + (head)->hh.tbl->tail = &((head)->hh); \ + (head)->hh.tbl->num_buckets = HASH_INITIAL_NUM_BUCKETS; \ + (head)->hh.tbl->log2_num_buckets = HASH_INITIAL_NUM_BUCKETS_LOG2; \ + (head)->hh.tbl->hho = (char*)(&(head)->hh) - (char*)(head); \ + (head)->hh.tbl->buckets = (UT_hash_bucket*)uthash_malloc( \ + HASH_INITIAL_NUM_BUCKETS * sizeof(struct UT_hash_bucket)); \ + (head)->hh.tbl->signature = HASH_SIGNATURE; \ + if (!(head)->hh.tbl->buckets) { \ + HASH_RECORD_OOM(oomed); \ + uthash_free((head)->hh.tbl, sizeof(UT_hash_table)); \ + } else { \ + uthash_bzero((head)->hh.tbl->buckets, \ + HASH_INITIAL_NUM_BUCKETS * sizeof(struct UT_hash_bucket)); \ + HASH_BLOOM_MAKE((head)->hh.tbl, oomed); \ + IF_HASH_NONFATAL_OOM( \ + if (oomed) { \ + uthash_free((head)->hh.tbl->buckets, \ + HASH_INITIAL_NUM_BUCKETS*sizeof(struct UT_hash_bucket)); \ + uthash_free((head)->hh.tbl, sizeof(UT_hash_table)); \ + } \ + ) \ + } \ + } \ +} while (0) + +#define HASH_REPLACE_BYHASHVALUE_INORDER(hh,head,fieldname,keylen_in,hashval,add,replaced,cmpfcn) \ +do { \ + (replaced) = NULL; \ + HASH_FIND_BYHASHVALUE(hh, head, &((add)->fieldname), keylen_in, hashval, replaced); \ + if (replaced) { \ + HASH_DELETE(hh, head, replaced); \ + } \ + HASH_ADD_KEYPTR_BYHASHVALUE_INORDER(hh, head, &((add)->fieldname), keylen_in, hashval, add, cmpfcn); \ +} while (0) + +#define HASH_REPLACE_BYHASHVALUE(hh,head,fieldname,keylen_in,hashval,add,replaced) \ +do { \ + (replaced) = NULL; \ + HASH_FIND_BYHASHVALUE(hh, head, &((add)->fieldname), keylen_in, hashval, replaced); \ + if (replaced) { \ + HASH_DELETE(hh, head, replaced); \ + } \ + HASH_ADD_KEYPTR_BYHASHVALUE(hh, head, &((add)->fieldname), keylen_in, hashval, add); \ +} while (0) + +#define HASH_REPLACE(hh,head,fieldname,keylen_in,add,replaced) \ +do { \ + unsigned _hr_hashv; \ + HASH_VALUE(&((add)->fieldname), keylen_in, _hr_hashv); \ + HASH_REPLACE_BYHASHVALUE(hh, head, fieldname, keylen_in, _hr_hashv, add, replaced); \ +} while (0) + +#define HASH_REPLACE_INORDER(hh,head,fieldname,keylen_in,add,replaced,cmpfcn) \ +do { \ + unsigned _hr_hashv; \ + HASH_VALUE(&((add)->fieldname), keylen_in, _hr_hashv); \ + HASH_REPLACE_BYHASHVALUE_INORDER(hh, head, fieldname, keylen_in, _hr_hashv, add, replaced, cmpfcn); \ +} while (0) + +#define HASH_APPEND_LIST(hh, head, add) \ +do { \ + (add)->hh.next = NULL; \ + (add)->hh.prev = ELMT_FROM_HH((head)->hh.tbl, (head)->hh.tbl->tail); \ + (head)->hh.tbl->tail->next = (add); \ + (head)->hh.tbl->tail = &((add)->hh); \ +} while (0) + +#define HASH_AKBI_INNER_LOOP(hh,head,add,cmpfcn) \ +do { \ + do { \ + if (cmpfcn(DECLTYPE(head)(_hs_iter), add) > 0) { \ + break; \ + } \ + } while ((_hs_iter = HH_FROM_ELMT((head)->hh.tbl, _hs_iter)->next)); \ +} while (0) + +#ifdef NO_DECLTYPE +#undef HASH_AKBI_INNER_LOOP +#define HASH_AKBI_INNER_LOOP(hh,head,add,cmpfcn) \ +do { \ + char *_hs_saved_head = (char*)(head); \ + do { \ + DECLTYPE_ASSIGN(head, _hs_iter); \ + if (cmpfcn(head, add) > 0) { \ + DECLTYPE_ASSIGN(head, _hs_saved_head); \ + break; \ + } \ + DECLTYPE_ASSIGN(head, _hs_saved_head); \ + } while ((_hs_iter = HH_FROM_ELMT((head)->hh.tbl, _hs_iter)->next)); \ +} while (0) +#endif + +#if HASH_NONFATAL_OOM + +#define HASH_ADD_TO_TABLE(hh,head,keyptr,keylen_in,hashval,add,oomed) \ +do { \ + if (!(oomed)) { \ + unsigned _ha_bkt; \ + (head)->hh.tbl->num_items++; \ + HASH_TO_BKT(hashval, (head)->hh.tbl->num_buckets, _ha_bkt); \ + HASH_ADD_TO_BKT((head)->hh.tbl->buckets[_ha_bkt], hh, &(add)->hh, oomed); \ + if (oomed) { \ + HASH_ROLLBACK_BKT(hh, head, &(add)->hh); \ + HASH_DELETE_HH(hh, head, &(add)->hh); \ + (add)->hh.tbl = NULL; \ + uthash_nonfatal_oom(add); \ + } else { \ + HASH_BLOOM_ADD((head)->hh.tbl, hashval); \ + HASH_EMIT_KEY(hh, head, keyptr, keylen_in); \ + } \ + } else { \ + (add)->hh.tbl = NULL; \ + uthash_nonfatal_oom(add); \ + } \ +} while (0) + +#else + +#define HASH_ADD_TO_TABLE(hh,head,keyptr,keylen_in,hashval,add,oomed) \ +do { \ + unsigned _ha_bkt; \ + (head)->hh.tbl->num_items++; \ + HASH_TO_BKT(hashval, (head)->hh.tbl->num_buckets, _ha_bkt); \ + HASH_ADD_TO_BKT((head)->hh.tbl->buckets[_ha_bkt], hh, &(add)->hh, oomed); \ + HASH_BLOOM_ADD((head)->hh.tbl, hashval); \ + HASH_EMIT_KEY(hh, head, keyptr, keylen_in); \ +} while (0) + +#endif + + +#define HASH_ADD_KEYPTR_BYHASHVALUE_INORDER(hh,head,keyptr,keylen_in,hashval,add,cmpfcn) \ +do { \ + IF_HASH_NONFATAL_OOM( int _ha_oomed = 0; ) \ + (add)->hh.hashv = (hashval); \ + (add)->hh.key = (char*) (keyptr); \ + (add)->hh.keylen = (unsigned) (keylen_in); \ + if (!(head)) { \ + (add)->hh.next = NULL; \ + (add)->hh.prev = NULL; \ + HASH_MAKE_TABLE(hh, add, _ha_oomed); \ + IF_HASH_NONFATAL_OOM( if (!_ha_oomed) { ) \ + (head) = (add); \ + IF_HASH_NONFATAL_OOM( } ) \ + } else { \ + void *_hs_iter = (head); \ + (add)->hh.tbl = (head)->hh.tbl; \ + HASH_AKBI_INNER_LOOP(hh, head, add, cmpfcn); \ + if (_hs_iter) { \ + (add)->hh.next = _hs_iter; \ + if (((add)->hh.prev = HH_FROM_ELMT((head)->hh.tbl, _hs_iter)->prev)) { \ + HH_FROM_ELMT((head)->hh.tbl, (add)->hh.prev)->next = (add); \ + } else { \ + (head) = (add); \ + } \ + HH_FROM_ELMT((head)->hh.tbl, _hs_iter)->prev = (add); \ + } else { \ + HASH_APPEND_LIST(hh, head, add); \ + } \ + } \ + HASH_ADD_TO_TABLE(hh, head, keyptr, keylen_in, hashval, add, _ha_oomed); \ + HASH_FSCK(hh, head, "HASH_ADD_KEYPTR_BYHASHVALUE_INORDER"); \ +} while (0) + +#define HASH_ADD_KEYPTR_INORDER(hh,head,keyptr,keylen_in,add,cmpfcn) \ +do { \ + unsigned _hs_hashv; \ + HASH_VALUE(keyptr, keylen_in, _hs_hashv); \ + HASH_ADD_KEYPTR_BYHASHVALUE_INORDER(hh, head, keyptr, keylen_in, _hs_hashv, add, cmpfcn); \ +} while (0) + +#define HASH_ADD_BYHASHVALUE_INORDER(hh,head,fieldname,keylen_in,hashval,add,cmpfcn) \ + HASH_ADD_KEYPTR_BYHASHVALUE_INORDER(hh, head, &((add)->fieldname), keylen_in, hashval, add, cmpfcn) + +#define HASH_ADD_INORDER(hh,head,fieldname,keylen_in,add,cmpfcn) \ + HASH_ADD_KEYPTR_INORDER(hh, head, &((add)->fieldname), keylen_in, add, cmpfcn) + +#define HASH_ADD_KEYPTR_BYHASHVALUE(hh,head,keyptr,keylen_in,hashval,add) \ +do { \ + IF_HASH_NONFATAL_OOM( int _ha_oomed = 0; ) \ + (add)->hh.hashv = (hashval); \ + (add)->hh.key = (char*) (keyptr); \ + (add)->hh.keylen = (unsigned) (keylen_in); \ + if (!(head)) { \ + (add)->hh.next = NULL; \ + (add)->hh.prev = NULL; \ + HASH_MAKE_TABLE(hh, add, _ha_oomed); \ + IF_HASH_NONFATAL_OOM( if (!_ha_oomed) { ) \ + (head) = (add); \ + IF_HASH_NONFATAL_OOM( } ) \ + } else { \ + (add)->hh.tbl = (head)->hh.tbl; \ + HASH_APPEND_LIST(hh, head, add); \ + } \ + HASH_ADD_TO_TABLE(hh, head, keyptr, keylen_in, hashval, add, _ha_oomed); \ + HASH_FSCK(hh, head, "HASH_ADD_KEYPTR_BYHASHVALUE"); \ +} while (0) + +#define HASH_ADD_KEYPTR(hh,head,keyptr,keylen_in,add) \ +do { \ + unsigned _ha_hashv; \ + HASH_VALUE(keyptr, keylen_in, _ha_hashv); \ + HASH_ADD_KEYPTR_BYHASHVALUE(hh, head, keyptr, keylen_in, _ha_hashv, add); \ +} while (0) + +#define HASH_ADD_BYHASHVALUE(hh,head,fieldname,keylen_in,hashval,add) \ + HASH_ADD_KEYPTR_BYHASHVALUE(hh, head, &((add)->fieldname), keylen_in, hashval, add) + +#define HASH_ADD(hh,head,fieldname,keylen_in,add) \ + HASH_ADD_KEYPTR(hh, head, &((add)->fieldname), keylen_in, add) + +#define HASH_TO_BKT(hashv,num_bkts,bkt) \ +do { \ + bkt = ((hashv) & ((num_bkts) - 1U)); \ +} while (0) + +/* delete "delptr" from the hash table. + * "the usual" patch-up process for the app-order doubly-linked-list. + * The use of _hd_hh_del below deserves special explanation. + * These used to be expressed using (delptr) but that led to a bug + * if someone used the same symbol for the head and deletee, like + * HASH_DELETE(hh,users,users); + * We want that to work, but by changing the head (users) below + * we were forfeiting our ability to further refer to the deletee (users) + * in the patch-up process. Solution: use scratch space to + * copy the deletee pointer, then the latter references are via that + * scratch pointer rather than through the repointed (users) symbol. + */ +#define HASH_DELETE(hh,head,delptr) \ + HASH_DELETE_HH(hh, head, &(delptr)->hh) + +#define HASH_DELETE_HH(hh,head,delptrhh) \ +do { \ + struct UT_hash_handle *_hd_hh_del = (delptrhh); \ + if ((_hd_hh_del->prev == NULL) && (_hd_hh_del->next == NULL)) { \ + HASH_BLOOM_FREE((head)->hh.tbl); \ + uthash_free((head)->hh.tbl->buckets, \ + (head)->hh.tbl->num_buckets * sizeof(struct UT_hash_bucket)); \ + uthash_free((head)->hh.tbl, sizeof(UT_hash_table)); \ + (head) = NULL; \ + } else { \ + unsigned _hd_bkt; \ + if (_hd_hh_del == (head)->hh.tbl->tail) { \ + (head)->hh.tbl->tail = HH_FROM_ELMT((head)->hh.tbl, _hd_hh_del->prev); \ + } \ + if (_hd_hh_del->prev != NULL) { \ + HH_FROM_ELMT((head)->hh.tbl, _hd_hh_del->prev)->next = _hd_hh_del->next; \ + } else { \ + DECLTYPE_ASSIGN(head, _hd_hh_del->next); \ + } \ + if (_hd_hh_del->next != NULL) { \ + HH_FROM_ELMT((head)->hh.tbl, _hd_hh_del->next)->prev = _hd_hh_del->prev; \ + } \ + HASH_TO_BKT(_hd_hh_del->hashv, (head)->hh.tbl->num_buckets, _hd_bkt); \ + HASH_DEL_IN_BKT((head)->hh.tbl->buckets[_hd_bkt], _hd_hh_del); \ + (head)->hh.tbl->num_items--; \ + } \ + HASH_FSCK(hh, head, "HASH_DELETE_HH"); \ +} while (0) + +/* convenience forms of HASH_FIND/HASH_ADD/HASH_DEL */ +#define HASH_FIND_STR(head,findstr,out) \ +do { \ + unsigned _uthash_hfstr_keylen = (unsigned)uthash_strlen(findstr); \ + HASH_FIND(hh, head, findstr, _uthash_hfstr_keylen, out); \ +} while (0) +#define HASH_ADD_STR(head,strfield,add) \ +do { \ + unsigned _uthash_hastr_keylen = (unsigned)uthash_strlen((add)->strfield); \ + HASH_ADD(hh, head, strfield[0], _uthash_hastr_keylen, add); \ +} while (0) +#define HASH_REPLACE_STR(head,strfield,add,replaced) \ +do { \ + unsigned _uthash_hrstr_keylen = (unsigned)uthash_strlen((add)->strfield); \ + HASH_REPLACE(hh, head, strfield[0], _uthash_hrstr_keylen, add, replaced); \ +} while (0) +#define HASH_FIND_INT(head,findint,out) \ + HASH_FIND(hh,head,findint,sizeof(int),out) +#define HASH_ADD_INT(head,intfield,add) \ + HASH_ADD(hh,head,intfield,sizeof(int),add) +#define HASH_REPLACE_INT(head,intfield,add,replaced) \ + HASH_REPLACE(hh,head,intfield,sizeof(int),add,replaced) +#define HASH_FIND_PTR(head,findptr,out) \ + HASH_FIND(hh,head,findptr,sizeof(void *),out) +#define HASH_ADD_PTR(head,ptrfield,add) \ + HASH_ADD(hh,head,ptrfield,sizeof(void *),add) +#define HASH_REPLACE_PTR(head,ptrfield,add,replaced) \ + HASH_REPLACE(hh,head,ptrfield,sizeof(void *),add,replaced) +#define HASH_DEL(head,delptr) \ + HASH_DELETE(hh,head,delptr) + +/* HASH_FSCK checks hash integrity on every add/delete when HASH_DEBUG is defined. + * This is for uthash developer only; it compiles away if HASH_DEBUG isn't defined. + */ +#ifdef HASH_DEBUG +#include /* fprintf, stderr */ +#define HASH_OOPS(...) do { fprintf(stderr, __VA_ARGS__); exit(-1); } while (0) +#define HASH_FSCK(hh,head,where) \ +do { \ + struct UT_hash_handle *_thh; \ + if (head) { \ + unsigned _bkt_i; \ + unsigned _count = 0; \ + char *_prev; \ + for (_bkt_i = 0; _bkt_i < (head)->hh.tbl->num_buckets; ++_bkt_i) { \ + unsigned _bkt_count = 0; \ + _thh = (head)->hh.tbl->buckets[_bkt_i].hh_head; \ + _prev = NULL; \ + while (_thh) { \ + if (_prev != (char*)(_thh->hh_prev)) { \ + HASH_OOPS("%s: invalid hh_prev %p, actual %p\n", \ + (where), (void*)_thh->hh_prev, (void*)_prev); \ + } \ + _bkt_count++; \ + _prev = (char*)(_thh); \ + _thh = _thh->hh_next; \ + } \ + _count += _bkt_count; \ + if ((head)->hh.tbl->buckets[_bkt_i].count != _bkt_count) { \ + HASH_OOPS("%s: invalid bucket count %u, actual %u\n", \ + (where), (head)->hh.tbl->buckets[_bkt_i].count, _bkt_count); \ + } \ + } \ + if (_count != (head)->hh.tbl->num_items) { \ + HASH_OOPS("%s: invalid hh item count %u, actual %u\n", \ + (where), (head)->hh.tbl->num_items, _count); \ + } \ + _count = 0; \ + _prev = NULL; \ + _thh = &(head)->hh; \ + while (_thh) { \ + _count++; \ + if (_prev != (char*)_thh->prev) { \ + HASH_OOPS("%s: invalid prev %p, actual %p\n", \ + (where), (void*)_thh->prev, (void*)_prev); \ + } \ + _prev = (char*)ELMT_FROM_HH((head)->hh.tbl, _thh); \ + _thh = (_thh->next ? HH_FROM_ELMT((head)->hh.tbl, _thh->next) : NULL); \ + } \ + if (_count != (head)->hh.tbl->num_items) { \ + HASH_OOPS("%s: invalid app item count %u, actual %u\n", \ + (where), (head)->hh.tbl->num_items, _count); \ + } \ + } \ +} while (0) +#else +#define HASH_FSCK(hh,head,where) +#endif + +/* When compiled with -DHASH_EMIT_KEYS, length-prefixed keys are emitted to + * the descriptor to which this macro is defined for tuning the hash function. + * The app can #include to get the prototype for write(2). */ +#ifdef HASH_EMIT_KEYS +#define HASH_EMIT_KEY(hh,head,keyptr,fieldlen) \ +do { \ + unsigned _klen = fieldlen; \ + write(HASH_EMIT_KEYS, &_klen, sizeof(_klen)); \ + write(HASH_EMIT_KEYS, keyptr, (unsigned long)fieldlen); \ +} while (0) +#else +#define HASH_EMIT_KEY(hh,head,keyptr,fieldlen) +#endif + +/* default to Jenkin's hash unless overridden e.g. DHASH_FUNCTION=HASH_SAX */ +#ifdef HASH_FUNCTION +#define HASH_FCN HASH_FUNCTION +#else +#define HASH_FCN HASH_JEN +#endif + +/* The Bernstein hash function, used in Perl prior to v5.6. Note (x<<5+x)=x*33. */ +#define HASH_BER(key,keylen,hashv) \ +do { \ + unsigned _hb_keylen = (unsigned)keylen; \ + const unsigned char *_hb_key = (const unsigned char*)(key); \ + (hashv) = 0; \ + while (_hb_keylen-- != 0U) { \ + (hashv) = (((hashv) << 5) + (hashv)) + *_hb_key++; \ + } \ +} while (0) + + +/* SAX/FNV/OAT/JEN hash functions are macro variants of those listed at + * http://eternallyconfuzzled.com/tuts/algorithms/jsw_tut_hashing.aspx */ +#define HASH_SAX(key,keylen,hashv) \ +do { \ + unsigned _sx_i; \ + const unsigned char *_hs_key = (const unsigned char*)(key); \ + hashv = 0; \ + for (_sx_i=0; _sx_i < keylen; _sx_i++) { \ + hashv ^= (hashv << 5) + (hashv >> 2) + _hs_key[_sx_i]; \ + } \ +} while (0) +/* FNV-1a variation */ +#define HASH_FNV(key,keylen,hashv) \ +do { \ + unsigned _fn_i; \ + const unsigned char *_hf_key = (const unsigned char*)(key); \ + (hashv) = 2166136261U; \ + for (_fn_i=0; _fn_i < keylen; _fn_i++) { \ + hashv = hashv ^ _hf_key[_fn_i]; \ + hashv = hashv * 16777619U; \ + } \ +} while (0) + +#define HASH_OAT(key,keylen,hashv) \ +do { \ + unsigned _ho_i; \ + const unsigned char *_ho_key=(const unsigned char*)(key); \ + hashv = 0; \ + for(_ho_i=0; _ho_i < keylen; _ho_i++) { \ + hashv += _ho_key[_ho_i]; \ + hashv += (hashv << 10); \ + hashv ^= (hashv >> 6); \ + } \ + hashv += (hashv << 3); \ + hashv ^= (hashv >> 11); \ + hashv += (hashv << 15); \ +} while (0) + +#define HASH_JEN_MIX(a,b,c) \ +do { \ + a -= b; a -= c; a ^= ( c >> 13 ); \ + b -= c; b -= a; b ^= ( a << 8 ); \ + c -= a; c -= b; c ^= ( b >> 13 ); \ + a -= b; a -= c; a ^= ( c >> 12 ); \ + b -= c; b -= a; b ^= ( a << 16 ); \ + c -= a; c -= b; c ^= ( b >> 5 ); \ + a -= b; a -= c; a ^= ( c >> 3 ); \ + b -= c; b -= a; b ^= ( a << 10 ); \ + c -= a; c -= b; c ^= ( b >> 15 ); \ +} while (0) + +#define HASH_JEN(key,keylen,hashv) \ +do { \ + unsigned _hj_i,_hj_j,_hj_k; \ + unsigned const char *_hj_key=(unsigned const char*)(key); \ + hashv = 0xfeedbeefu; \ + _hj_i = _hj_j = 0x9e3779b9u; \ + _hj_k = (unsigned)(keylen); \ + while (_hj_k >= 12U) { \ + _hj_i += (_hj_key[0] + ( (unsigned)_hj_key[1] << 8 ) \ + + ( (unsigned)_hj_key[2] << 16 ) \ + + ( (unsigned)_hj_key[3] << 24 ) ); \ + _hj_j += (_hj_key[4] + ( (unsigned)_hj_key[5] << 8 ) \ + + ( (unsigned)_hj_key[6] << 16 ) \ + + ( (unsigned)_hj_key[7] << 24 ) ); \ + hashv += (_hj_key[8] + ( (unsigned)_hj_key[9] << 8 ) \ + + ( (unsigned)_hj_key[10] << 16 ) \ + + ( (unsigned)_hj_key[11] << 24 ) ); \ + \ + HASH_JEN_MIX(_hj_i, _hj_j, hashv); \ + \ + _hj_key += 12; \ + _hj_k -= 12U; \ + } \ + hashv += (unsigned)(keylen); \ + switch ( _hj_k ) { \ + case 11: hashv += ( (unsigned)_hj_key[10] << 24 ); /* FALLTHROUGH */ \ + case 10: hashv += ( (unsigned)_hj_key[9] << 16 ); /* FALLTHROUGH */ \ + case 9: hashv += ( (unsigned)_hj_key[8] << 8 ); /* FALLTHROUGH */ \ + case 8: _hj_j += ( (unsigned)_hj_key[7] << 24 ); /* FALLTHROUGH */ \ + case 7: _hj_j += ( (unsigned)_hj_key[6] << 16 ); /* FALLTHROUGH */ \ + case 6: _hj_j += ( (unsigned)_hj_key[5] << 8 ); /* FALLTHROUGH */ \ + case 5: _hj_j += _hj_key[4]; /* FALLTHROUGH */ \ + case 4: _hj_i += ( (unsigned)_hj_key[3] << 24 ); /* FALLTHROUGH */ \ + case 3: _hj_i += ( (unsigned)_hj_key[2] << 16 ); /* FALLTHROUGH */ \ + case 2: _hj_i += ( (unsigned)_hj_key[1] << 8 ); /* FALLTHROUGH */ \ + case 1: _hj_i += _hj_key[0]; \ + } \ + HASH_JEN_MIX(_hj_i, _hj_j, hashv); \ +} while (0) + +/* The Paul Hsieh hash function */ +#undef get16bits +#if (defined(__GNUC__) && defined(__i386__)) || defined(__WATCOMC__) \ + || defined(_MSC_VER) || defined (__BORLANDC__) || defined (__TURBOC__) +#define get16bits(d) (*((const uint16_t *) (d))) +#endif + +#if !defined (get16bits) +#define get16bits(d) ((((uint32_t)(((const uint8_t *)(d))[1])) << 8) \ + +(uint32_t)(((const uint8_t *)(d))[0]) ) +#endif +#define HASH_SFH(key,keylen,hashv) \ +do { \ + unsigned const char *_sfh_key=(unsigned const char*)(key); \ + uint32_t _sfh_tmp, _sfh_len = (uint32_t)keylen; \ + \ + unsigned _sfh_rem = _sfh_len & 3U; \ + _sfh_len >>= 2; \ + hashv = 0xcafebabeu; \ + \ + /* Main loop */ \ + for (;_sfh_len > 0U; _sfh_len--) { \ + hashv += get16bits (_sfh_key); \ + _sfh_tmp = ((uint32_t)(get16bits (_sfh_key+2)) << 11) ^ hashv; \ + hashv = (hashv << 16) ^ _sfh_tmp; \ + _sfh_key += 2U*sizeof (uint16_t); \ + hashv += hashv >> 11; \ + } \ + \ + /* Handle end cases */ \ + switch (_sfh_rem) { \ + case 3: hashv += get16bits (_sfh_key); \ + hashv ^= hashv << 16; \ + hashv ^= (uint32_t)(_sfh_key[sizeof (uint16_t)]) << 18; \ + hashv += hashv >> 11; \ + break; \ + case 2: hashv += get16bits (_sfh_key); \ + hashv ^= hashv << 11; \ + hashv += hashv >> 17; \ + break; \ + case 1: hashv += *_sfh_key; \ + hashv ^= hashv << 10; \ + hashv += hashv >> 1; \ + } \ + \ + /* Force "avalanching" of final 127 bits */ \ + hashv ^= hashv << 3; \ + hashv += hashv >> 5; \ + hashv ^= hashv << 4; \ + hashv += hashv >> 17; \ + hashv ^= hashv << 25; \ + hashv += hashv >> 6; \ +} while (0) + +/* iterate over items in a known bucket to find desired item */ +#define HASH_FIND_IN_BKT(tbl,hh,head,keyptr,keylen_in,hashval,out) \ +do { \ + if ((head).hh_head != NULL) { \ + DECLTYPE_ASSIGN(out, ELMT_FROM_HH(tbl, (head).hh_head)); \ + } else { \ + (out) = NULL; \ + } \ + while ((out) != NULL) { \ + if ((out)->hh.hashv == (hashval) && (out)->hh.keylen == (keylen_in)) { \ + if (HASH_KEYCMP((out)->hh.key, keyptr, keylen_in) == 0) { \ + break; \ + } \ + } \ + if ((out)->hh.hh_next != NULL) { \ + DECLTYPE_ASSIGN(out, ELMT_FROM_HH(tbl, (out)->hh.hh_next)); \ + } else { \ + (out) = NULL; \ + } \ + } \ +} while (0) + +/* add an item to a bucket */ +#define HASH_ADD_TO_BKT(head,hh,addhh,oomed) \ +do { \ + UT_hash_bucket *_ha_head = &(head); \ + _ha_head->count++; \ + (addhh)->hh_next = _ha_head->hh_head; \ + (addhh)->hh_prev = NULL; \ + if (_ha_head->hh_head != NULL) { \ + _ha_head->hh_head->hh_prev = (addhh); \ + } \ + _ha_head->hh_head = (addhh); \ + if ((_ha_head->count >= ((_ha_head->expand_mult + 1U) * HASH_BKT_CAPACITY_THRESH)) \ + && !(addhh)->tbl->noexpand) { \ + HASH_EXPAND_BUCKETS(addhh,(addhh)->tbl, oomed); \ + IF_HASH_NONFATAL_OOM( \ + if (oomed) { \ + HASH_DEL_IN_BKT(head,addhh); \ + } \ + ) \ + } \ +} while (0) + +/* remove an item from a given bucket */ +#define HASH_DEL_IN_BKT(head,delhh) \ +do { \ + UT_hash_bucket *_hd_head = &(head); \ + _hd_head->count--; \ + if (_hd_head->hh_head == (delhh)) { \ + _hd_head->hh_head = (delhh)->hh_next; \ + } \ + if ((delhh)->hh_prev) { \ + (delhh)->hh_prev->hh_next = (delhh)->hh_next; \ + } \ + if ((delhh)->hh_next) { \ + (delhh)->hh_next->hh_prev = (delhh)->hh_prev; \ + } \ +} while (0) + +/* Bucket expansion has the effect of doubling the number of buckets + * and redistributing the items into the new buckets. Ideally the + * items will distribute more or less evenly into the new buckets + * (the extent to which this is true is a measure of the quality of + * the hash function as it applies to the key domain). + * + * With the items distributed into more buckets, the chain length + * (item count) in each bucket is reduced. Thus by expanding buckets + * the hash keeps a bound on the chain length. This bounded chain + * length is the essence of how a hash provides constant time lookup. + * + * The calculation of tbl->ideal_chain_maxlen below deserves some + * explanation. First, keep in mind that we're calculating the ideal + * maximum chain length based on the *new* (doubled) bucket count. + * In fractions this is just n/b (n=number of items,b=new num buckets). + * Since the ideal chain length is an integer, we want to calculate + * ceil(n/b). We don't depend on floating point arithmetic in this + * hash, so to calculate ceil(n/b) with integers we could write + * + * ceil(n/b) = (n/b) + ((n%b)?1:0) + * + * and in fact a previous version of this hash did just that. + * But now we have improved things a bit by recognizing that b is + * always a power of two. We keep its base 2 log handy (call it lb), + * so now we can write this with a bit shift and logical AND: + * + * ceil(n/b) = (n>>lb) + ( (n & (b-1)) ? 1:0) + * + */ +#define HASH_EXPAND_BUCKETS(hh,tbl,oomed) \ +do { \ + unsigned _he_bkt; \ + unsigned _he_bkt_i; \ + struct UT_hash_handle *_he_thh, *_he_hh_nxt; \ + UT_hash_bucket *_he_new_buckets, *_he_newbkt; \ + _he_new_buckets = (UT_hash_bucket*)uthash_malloc( \ + 2UL * (tbl)->num_buckets * sizeof(struct UT_hash_bucket)); \ + if (!_he_new_buckets) { \ + HASH_RECORD_OOM(oomed); \ + } else { \ + uthash_bzero(_he_new_buckets, \ + 2UL * (tbl)->num_buckets * sizeof(struct UT_hash_bucket)); \ + (tbl)->ideal_chain_maxlen = \ + ((tbl)->num_items >> ((tbl)->log2_num_buckets+1U)) + \ + ((((tbl)->num_items & (((tbl)->num_buckets*2U)-1U)) != 0U) ? 1U : 0U); \ + (tbl)->nonideal_items = 0; \ + for (_he_bkt_i = 0; _he_bkt_i < (tbl)->num_buckets; _he_bkt_i++) { \ + _he_thh = (tbl)->buckets[ _he_bkt_i ].hh_head; \ + while (_he_thh != NULL) { \ + _he_hh_nxt = _he_thh->hh_next; \ + HASH_TO_BKT(_he_thh->hashv, (tbl)->num_buckets * 2U, _he_bkt); \ + _he_newbkt = &(_he_new_buckets[_he_bkt]); \ + if (++(_he_newbkt->count) > (tbl)->ideal_chain_maxlen) { \ + (tbl)->nonideal_items++; \ + if (_he_newbkt->count > _he_newbkt->expand_mult * (tbl)->ideal_chain_maxlen) { \ + _he_newbkt->expand_mult++; \ + } \ + } \ + _he_thh->hh_prev = NULL; \ + _he_thh->hh_next = _he_newbkt->hh_head; \ + if (_he_newbkt->hh_head != NULL) { \ + _he_newbkt->hh_head->hh_prev = _he_thh; \ + } \ + _he_newbkt->hh_head = _he_thh; \ + _he_thh = _he_hh_nxt; \ + } \ + } \ + uthash_free((tbl)->buckets, (tbl)->num_buckets * sizeof(struct UT_hash_bucket)); \ + (tbl)->num_buckets *= 2U; \ + (tbl)->log2_num_buckets++; \ + (tbl)->buckets = _he_new_buckets; \ + (tbl)->ineff_expands = ((tbl)->nonideal_items > ((tbl)->num_items >> 1)) ? \ + ((tbl)->ineff_expands+1U) : 0U; \ + if ((tbl)->ineff_expands > 1U) { \ + (tbl)->noexpand = 1; \ + uthash_noexpand_fyi(tbl); \ + } \ + uthash_expand_fyi(tbl); \ + } \ +} while (0) + + +/* This is an adaptation of Simon Tatham's O(n log(n)) mergesort */ +/* Note that HASH_SORT assumes the hash handle name to be hh. + * HASH_SRT was added to allow the hash handle name to be passed in. */ +#define HASH_SORT(head,cmpfcn) HASH_SRT(hh,head,cmpfcn) +#define HASH_SRT(hh,head,cmpfcn) \ +do { \ + unsigned _hs_i; \ + unsigned _hs_looping,_hs_nmerges,_hs_insize,_hs_psize,_hs_qsize; \ + struct UT_hash_handle *_hs_p, *_hs_q, *_hs_e, *_hs_list, *_hs_tail; \ + if (head != NULL) { \ + _hs_insize = 1; \ + _hs_looping = 1; \ + _hs_list = &((head)->hh); \ + while (_hs_looping != 0U) { \ + _hs_p = _hs_list; \ + _hs_list = NULL; \ + _hs_tail = NULL; \ + _hs_nmerges = 0; \ + while (_hs_p != NULL) { \ + _hs_nmerges++; \ + _hs_q = _hs_p; \ + _hs_psize = 0; \ + for (_hs_i = 0; _hs_i < _hs_insize; ++_hs_i) { \ + _hs_psize++; \ + _hs_q = ((_hs_q->next != NULL) ? \ + HH_FROM_ELMT((head)->hh.tbl, _hs_q->next) : NULL); \ + if (_hs_q == NULL) { \ + break; \ + } \ + } \ + _hs_qsize = _hs_insize; \ + while ((_hs_psize != 0U) || ((_hs_qsize != 0U) && (_hs_q != NULL))) { \ + if (_hs_psize == 0U) { \ + _hs_e = _hs_q; \ + _hs_q = ((_hs_q->next != NULL) ? \ + HH_FROM_ELMT((head)->hh.tbl, _hs_q->next) : NULL); \ + _hs_qsize--; \ + } else if ((_hs_qsize == 0U) || (_hs_q == NULL)) { \ + _hs_e = _hs_p; \ + if (_hs_p != NULL) { \ + _hs_p = ((_hs_p->next != NULL) ? \ + HH_FROM_ELMT((head)->hh.tbl, _hs_p->next) : NULL); \ + } \ + _hs_psize--; \ + } else if ((cmpfcn( \ + DECLTYPE(head)(ELMT_FROM_HH((head)->hh.tbl, _hs_p)), \ + DECLTYPE(head)(ELMT_FROM_HH((head)->hh.tbl, _hs_q)) \ + )) <= 0) { \ + _hs_e = _hs_p; \ + if (_hs_p != NULL) { \ + _hs_p = ((_hs_p->next != NULL) ? \ + HH_FROM_ELMT((head)->hh.tbl, _hs_p->next) : NULL); \ + } \ + _hs_psize--; \ + } else { \ + _hs_e = _hs_q; \ + _hs_q = ((_hs_q->next != NULL) ? \ + HH_FROM_ELMT((head)->hh.tbl, _hs_q->next) : NULL); \ + _hs_qsize--; \ + } \ + if ( _hs_tail != NULL ) { \ + _hs_tail->next = ((_hs_e != NULL) ? \ + ELMT_FROM_HH((head)->hh.tbl, _hs_e) : NULL); \ + } else { \ + _hs_list = _hs_e; \ + } \ + if (_hs_e != NULL) { \ + _hs_e->prev = ((_hs_tail != NULL) ? \ + ELMT_FROM_HH((head)->hh.tbl, _hs_tail) : NULL); \ + } \ + _hs_tail = _hs_e; \ + } \ + _hs_p = _hs_q; \ + } \ + if (_hs_tail != NULL) { \ + _hs_tail->next = NULL; \ + } \ + if (_hs_nmerges <= 1U) { \ + _hs_looping = 0; \ + (head)->hh.tbl->tail = _hs_tail; \ + DECLTYPE_ASSIGN(head, ELMT_FROM_HH((head)->hh.tbl, _hs_list)); \ + } \ + _hs_insize *= 2U; \ + } \ + HASH_FSCK(hh, head, "HASH_SRT"); \ + } \ +} while (0) + +/* This function selects items from one hash into another hash. + * The end result is that the selected items have dual presence + * in both hashes. There is no copy of the items made; rather + * they are added into the new hash through a secondary hash + * hash handle that must be present in the structure. */ +#define HASH_SELECT(hh_dst, dst, hh_src, src, cond) \ +do { \ + unsigned _src_bkt, _dst_bkt; \ + void *_last_elt = NULL, *_elt; \ + UT_hash_handle *_src_hh, *_dst_hh, *_last_elt_hh=NULL; \ + ptrdiff_t _dst_hho = ((char*)(&(dst)->hh_dst) - (char*)(dst)); \ + if ((src) != NULL) { \ + for (_src_bkt=0; _src_bkt < (src)->hh_src.tbl->num_buckets; _src_bkt++) { \ + for (_src_hh = (src)->hh_src.tbl->buckets[_src_bkt].hh_head; \ + _src_hh != NULL; \ + _src_hh = _src_hh->hh_next) { \ + _elt = ELMT_FROM_HH((src)->hh_src.tbl, _src_hh); \ + if (cond(_elt)) { \ + IF_HASH_NONFATAL_OOM( int _hs_oomed = 0; ) \ + _dst_hh = (UT_hash_handle*)(void*)(((char*)_elt) + _dst_hho); \ + _dst_hh->key = _src_hh->key; \ + _dst_hh->keylen = _src_hh->keylen; \ + _dst_hh->hashv = _src_hh->hashv; \ + _dst_hh->prev = _last_elt; \ + _dst_hh->next = NULL; \ + if (_last_elt_hh != NULL) { \ + _last_elt_hh->next = _elt; \ + } \ + if ((dst) == NULL) { \ + DECLTYPE_ASSIGN(dst, _elt); \ + HASH_MAKE_TABLE(hh_dst, dst, _hs_oomed); \ + IF_HASH_NONFATAL_OOM( \ + if (_hs_oomed) { \ + uthash_nonfatal_oom(_elt); \ + (dst) = NULL; \ + continue; \ + } \ + ) \ + } else { \ + _dst_hh->tbl = (dst)->hh_dst.tbl; \ + } \ + HASH_TO_BKT(_dst_hh->hashv, _dst_hh->tbl->num_buckets, _dst_bkt); \ + HASH_ADD_TO_BKT(_dst_hh->tbl->buckets[_dst_bkt], hh_dst, _dst_hh, _hs_oomed); \ + (dst)->hh_dst.tbl->num_items++; \ + IF_HASH_NONFATAL_OOM( \ + if (_hs_oomed) { \ + HASH_ROLLBACK_BKT(hh_dst, dst, _dst_hh); \ + HASH_DELETE_HH(hh_dst, dst, _dst_hh); \ + _dst_hh->tbl = NULL; \ + uthash_nonfatal_oom(_elt); \ + continue; \ + } \ + ) \ + HASH_BLOOM_ADD(_dst_hh->tbl, _dst_hh->hashv); \ + _last_elt = _elt; \ + _last_elt_hh = _dst_hh; \ + } \ + } \ + } \ + } \ + HASH_FSCK(hh_dst, dst, "HASH_SELECT"); \ +} while (0) + +#define HASH_CLEAR(hh,head) \ +do { \ + if ((head) != NULL) { \ + HASH_BLOOM_FREE((head)->hh.tbl); \ + uthash_free((head)->hh.tbl->buckets, \ + (head)->hh.tbl->num_buckets*sizeof(struct UT_hash_bucket)); \ + uthash_free((head)->hh.tbl, sizeof(UT_hash_table)); \ + (head) = NULL; \ + } \ +} while (0) + +#define HASH_OVERHEAD(hh,head) \ + (((head) != NULL) ? ( \ + (size_t)(((head)->hh.tbl->num_items * sizeof(UT_hash_handle)) + \ + ((head)->hh.tbl->num_buckets * sizeof(UT_hash_bucket)) + \ + sizeof(UT_hash_table) + \ + (HASH_BLOOM_BYTELEN))) : 0U) + +#ifdef NO_DECLTYPE +#define HASH_ITER(hh,head,el,tmp) \ +for(((el)=(head)), ((*(char**)(&(tmp)))=(char*)((head!=NULL)?(head)->hh.next:NULL)); \ + (el) != NULL; ((el)=(tmp)), ((*(char**)(&(tmp)))=(char*)((tmp!=NULL)?(tmp)->hh.next:NULL))) +#else +#define HASH_ITER(hh,head,el,tmp) \ +for(((el)=(head)), ((tmp)=DECLTYPE(el)((head!=NULL)?(head)->hh.next:NULL)); \ + (el) != NULL; ((el)=(tmp)), ((tmp)=DECLTYPE(el)((tmp!=NULL)?(tmp)->hh.next:NULL))) +#endif + +/* obtain a count of items in the hash */ +#define HASH_COUNT(head) HASH_CNT(hh,head) +#define HASH_CNT(hh,head) ((head != NULL)?((head)->hh.tbl->num_items):0U) + +typedef struct UT_hash_bucket { + struct UT_hash_handle *hh_head; + unsigned count; + + /* expand_mult is normally set to 0. In this situation, the max chain length + * threshold is enforced at its default value, HASH_BKT_CAPACITY_THRESH. (If + * the bucket's chain exceeds this length, bucket expansion is triggered). + * However, setting expand_mult to a non-zero value delays bucket expansion + * (that would be triggered by additions to this particular bucket) + * until its chain length reaches a *multiple* of HASH_BKT_CAPACITY_THRESH. + * (The multiplier is simply expand_mult+1). The whole idea of this + * multiplier is to reduce bucket expansions, since they are expensive, in + * situations where we know that a particular bucket tends to be overused. + * It is better to let its chain length grow to a longer yet-still-bounded + * value, than to do an O(n) bucket expansion too often. + */ + unsigned expand_mult; + +} UT_hash_bucket; + +/* random signature used only to find hash tables in external analysis */ +#define HASH_SIGNATURE 0xa0111fe1u +#define HASH_BLOOM_SIGNATURE 0xb12220f2u + +typedef struct UT_hash_table { + UT_hash_bucket *buckets; + unsigned num_buckets, log2_num_buckets; + unsigned num_items; + struct UT_hash_handle *tail; /* tail hh in app order, for fast append */ + ptrdiff_t hho; /* hash handle offset (byte pos of hash handle in element */ + + /* in an ideal situation (all buckets used equally), no bucket would have + * more than ceil(#items/#buckets) items. that's the ideal chain length. */ + unsigned ideal_chain_maxlen; + + /* nonideal_items is the number of items in the hash whose chain position + * exceeds the ideal chain maxlen. these items pay the penalty for an uneven + * hash distribution; reaching them in a chain traversal takes >ideal steps */ + unsigned nonideal_items; + + /* ineffective expands occur when a bucket doubling was performed, but + * afterward, more than half the items in the hash had nonideal chain + * positions. If this happens on two consecutive expansions we inhibit any + * further expansion, as it's not helping; this happens when the hash + * function isn't a good fit for the key domain. When expansion is inhibited + * the hash will still work, albeit no longer in constant time. */ + unsigned ineff_expands, noexpand; + + uint32_t signature; /* used only to find hash tables in external analysis */ +#ifdef HASH_BLOOM + uint32_t bloom_sig; /* used only to test bloom exists in external analysis */ + uint8_t *bloom_bv; + uint8_t bloom_nbits; +#endif + +} UT_hash_table; + +typedef struct UT_hash_handle { + struct UT_hash_table *tbl; + void *prev; /* prev element in app order */ + void *next; /* next element in app order */ + struct UT_hash_handle *hh_prev; /* previous hh in bucket order */ + struct UT_hash_handle *hh_next; /* next hh in bucket order */ + void *key; /* ptr to enclosing struct's key */ + unsigned keylen; /* enclosing struct's key len */ + unsigned hashv; /* result of hash-fcn(key) */ +} UT_hash_handle; + +#endif /* UTHASH_H */ From 5e5c1f0dfd4393b934446ec7de6f29418bc59ccb Mon Sep 17 00:00:00 2001 From: Jethro Grassie Date: Tue, 1 Sep 2020 20:40:14 -0400 Subject: [PATCH 2/2] stats: hashrate averages --- src/pool.c | 220 +++++++++++++++++++++++++++++++--------------------- src/pool.h | 4 +- src/webui.c | 15 ++-- src/webui.h | 2 +- 4 files changed, 143 insertions(+), 98 deletions(-) diff --git a/src/pool.c b/src/pool.c index 36e1795..570b70c 100644 --- a/src/pool.c +++ b/src/pool.c @@ -135,6 +135,17 @@ enum msgbin_type { BIN_PING, BIN_CONNECT, BIN_DISCONNECT, BIN_SHARE, BIN_BLOCK, BIN_STATS, BIN_BALANCE }; const unsigned char msgbin[] = {0x4D,0x4E,0x52,0x4F,0x50,0x4F,0x4F,0x4C}; +/* 2m, 10m, 30m, 1h, 1d, 1w */ +const unsigned hr_intervals[] = {120,600,1800,3600,86400,604800}; + +typedef struct hr_stats_t +{ + time_t last_calc; + uint64_t diff_since; + /* 2m, 10m, 30m, 1h, 1d, 1w */ + double avg[6]; +} hr_stats_t; + typedef struct config_t { char rpc_host[MAX_HOST]; @@ -208,23 +219,25 @@ typedef struct client_t char agent[256]; bstack_t *active_jobs; uint64_t hashes; + hr_stats_t hr_stats; time_t connected_since; bool is_xnp; uint32_t mode; uint8_t bad_shares; bool downstream; - uint32_t downstream_miners; + uint32_t downstream_accounts; UT_hash_handle hh; } client_t; -typedef struct account_stats_t +typedef struct account_t { char address[ADDRESS_MAX]; size_t worker_count; time_t connected_since; uint64_t hashes; + hr_stats_t hr_stats; UT_hash_handle hh; -} account_stats_t; +} account_t; typedef struct share_t { @@ -303,8 +316,8 @@ static time_t upstream_last_time; static uint64_t upstream_last_height; static uint32_t miner_count; static client_t *clients_by_fd = NULL; -static account_stats_t *account_stats = NULL; -static gbag_t *bag_stats; +static account_t *accounts = NULL; +static gbag_t *bag_accounts; static gbag_t *bag_clients; #ifdef HAVE_RX @@ -336,6 +349,37 @@ void rx_slow_hash_free_state(){} } \ } +static void +hr_update(hr_stats_t *stats) +{ + /* + Update some time decayed EMA hashrates. + */ + time_t now = time(NULL); + double t = difftime(now, stats->last_calc); + if (t <= 0) + return; + double h = stats->diff_since; + double d, p, z; + unsigned i = sizeof(hr_intervals)/sizeof(hr_intervals[0]); + while (i--) + { + unsigned inter = hr_intervals[i]; + double *f = &stats->avg[i]; + d = t/inter; + if (d > 32) + d = 32; + p = 1 - 1.0 / exp(d); + z = 1 + p; + *f += (h / t * p); + *f /= z; + if (*f < 2e-16) + *f = 0; + } + stats->diff_since = 0; + stats->last_calc = now; +} + static inline rpc_callback_t * rpc_callback_new(rpc_callback_fun cf, void *data, rpc_datafree_fun df) { @@ -628,27 +672,21 @@ store_block(uint64_t height, block_t *block) return rc; } -uint64_t -miner_hr(const char *address) +void +account_hr(double *avg, const char *address) { - uint64_t hr = 0; - double d = 0.0; - account_stats_t *stats = NULL; + account_t *account = NULL; pthread_rwlock_rdlock(&rwlock_acc); - HASH_FIND_STR(account_stats, address, stats); - if (!stats || !stats->connected_since || !stats->hashes) + HASH_FIND_STR(accounts, address, account); + if (!account) goto bail; - d = difftime(time(NULL), stats->connected_since); - if (d == 0.0) - goto bail; - hr = stats->hashes / d; + memcpy(avg, account->hr_stats.avg, sizeof(account->hr_stats.avg)); bail: pthread_rwlock_unlock(&rwlock_acc); - return hr; } uint64_t -miner_balance(const char *address) +account_balance(const char *address) { int rc; char *err; @@ -954,14 +992,9 @@ static void update_pool_hr(void) { uint64_t hr = 0; - client_t *c = (client_t*) gbag_first(bag_clients); - while ((c = gbag_next(bag_clients,NULL))) - { - double d = difftime(time(NULL), c->connected_since); - if (d == 0.0) - continue; - hr += c->hashes / d; - } + client_t *c = (client_t*)gbag_first(bag_clients); + while ((c = gbag_next(bag_clients, 0))) + hr += (uint64_t) c->hr_stats.avg[0]; log_debug("Pool hashrate: %"PRIu64, hr); if (upstream_event) return; @@ -1358,14 +1391,14 @@ miner_send_job(client_t *client, bool response) } static void -account_stats_moved(const void *items, size_t count) +accounts_moved(const void *items, size_t count) { - account_stats_t *s, *e, *r; - s = (account_stats_t*) items; + account_t *s, *e, *r; + s = (account_t*) items; e = s + count; pthread_rwlock_wrlock(&rwlock_acc); while (sfd == 0 || c->address[0] == 0 || c->downstream) continue; @@ -1396,8 +1429,8 @@ clients_send_job(void) static void clients_init(void) { - gbag_new(&bag_stats, CLIENTS_INIT, sizeof(account_stats_t), 0, - account_stats_moved); + gbag_new(&bag_accounts, CLIENTS_INIT, sizeof(account_t), 0, + accounts_moved); gbag_new(&bag_clients, CLIENTS_INIT, sizeof(client_t), 0, clients_moved); } @@ -1405,11 +1438,11 @@ clients_init(void) static void clients_free(void) { - if (!(bag_stats && bag_clients)) + if (!(bag_accounts && bag_clients)) return; client_t *c = (client_t*) gbag_first(bag_clients); - while ((c = gbag_next(bag_clients,NULL))) + while ((c = gbag_next(bag_clients, 0))) { if (!c->active_jobs) continue; @@ -1421,8 +1454,8 @@ clients_free(void) pthread_rwlock_unlock(&rwlock_cfd); pthread_rwlock_wrlock(&rwlock_acc); - HASH_CLEAR(hh, account_stats); - gbag_free(bag_stats); + HASH_CLEAR(hh, accounts); + gbag_free(bag_accounts); pthread_rwlock_unlock(&rwlock_acc); } @@ -2119,7 +2152,7 @@ send_payments(void) return rc; } - gbag_t *bag_pay; + gbag_t *bag_pay = NULL; gbag_new(&bag_pay, 25, sizeof(payment_t), 0, 0); MDB_cursor_op op = MDB_FIRST; @@ -2158,7 +2191,7 @@ send_payments(void) "\"transfer_split\",\"params\":{" "\"ring_size\":11,\"destinations\":[", end); payment_t *p = (payment_t*) gbag_first(bag_pay); - while ((p = gbag_next(bag_pay, NULL))) + while ((p = gbag_next(bag_pay, 0))) { start = stecpy(start, "{\"address\":\"", end); start = stecpy(start, p->address, end); @@ -2274,7 +2307,7 @@ trusted_send_balance(client_t *client, const char *address) int t = BIN_BALANCE; memcpy(data, msgbin, 8); memcpy(data+8, &t, 1); - uint64_t balance = miner_balance(address); + uint64_t balance = account_balance(address); memcpy(data+9, &balance, sizeof(uint64_t)); memcpy(data+9+sizeof(uint64_t), address, ADDRESS_MAX); evbuffer_add(output, data, z); @@ -2293,7 +2326,7 @@ upstream_send_ping() } static void -upstream_send_client_connect(uint32_t count) +upstream_send_account_connect(uint32_t count) { struct evbuffer *output = bufferevent_get_output(upstream_event); size_t z = 9 + sizeof(uint32_t); @@ -2303,11 +2336,11 @@ upstream_send_client_connect(uint32_t count) memcpy(data+8, &t, 1); memcpy(data+9, &count, z-9); evbuffer_add(output, data, z); - log_trace("Sending message connect upstream"); + log_trace("Sending message account connect upstream"); } static void -upstream_send_client_disconnect() +upstream_send_account_disconnect() { struct evbuffer *output = bufferevent_get_output(upstream_event); char data[9]; @@ -2447,37 +2480,37 @@ upstream_send_backlog() mdb_cursor_close(curshr); mdb_cursor_close(curblk); mdb_txn_abort(txn); - upstream_send_client_connect(pool_stats.connected_miners); + upstream_send_account_connect(pool_stats.connected_accounts); } static void -trusted_on_client_connect(client_t *client) +trusted_on_account_connect(client_t *client) { struct evbuffer *input = bufferevent_get_input(client->bev); uint32_t count; evbuffer_remove(input, &count, sizeof(uint32_t)); - pool_stats.connected_miners += count; - client->downstream_miners += count; - log_trace("Downstream miner connected. " - "Miner count: %d, Pool hashrate: %"PRIu64, - pool_stats.connected_miners, pool_stats.pool_hashrate); + pool_stats.connected_accounts += count; + client->downstream_accounts += count; + log_trace("Downstream account connected. " + "Accounts: %d, Pool hashrate: %"PRIu64, + pool_stats.connected_accounts, pool_stats.pool_hashrate); trusted_send_stats(client); if (upstream_event) - upstream_send_client_connect(count); + upstream_send_account_connect(count); } static void -trusted_on_client_disconnect(client_t *client) +trusted_on_account_disconnect(client_t *client) { - pool_stats.connected_miners--; - if (client->downstream_miners) - client->downstream_miners--; - log_trace("Downstream miner disconnected. " + pool_stats.connected_accounts--; + if (client->downstream_accounts) + client->downstream_accounts--; + log_trace("Downstream account disconnected. " "Miner count: %d, Pool hashrate: %"PRIu64, - pool_stats.connected_miners, pool_stats.pool_hashrate); + pool_stats.connected_accounts, pool_stats.pool_hashrate); trusted_send_stats(client); if (upstream_event) - upstream_send_client_disconnect(); + upstream_send_account_disconnect(); } static void @@ -2494,6 +2527,8 @@ trusted_on_client_share(client_t *client) s.difficulty); client->hashes += s.difficulty; pool_stats.round_hashes += s.difficulty; + client->hr_stats.diff_since += s.difficulty; + hr_update(&client->hr_stats); rc = store_share(s.height, &s); if (rc != 0) log_warn("Failed to store share: %s", mdb_strerror(rc)); @@ -2529,7 +2564,7 @@ upstream_on_stats(struct bufferevent *bev) evbuffer_remove(input, &pool_stats, sizeof(pool_stats_t)); log_trace("Stats from upstream: " "%d, %"PRIu64", %"PRIu64", %d, %"PRIu64, - pool_stats.connected_miners, + pool_stats.connected_accounts, pool_stats.pool_hashrate, pool_stats.round_hashes, pool_stats.pool_blocks_found, @@ -2633,9 +2668,9 @@ upstream_on_event(struct bufferevent *bev, short error, void *ctx) log_debug("Upstream timeout"); } /* Update stats due to upstream disconnect */ - if (pool_stats.connected_miners != miner_count) + if (pool_stats.connected_accounts != miner_count) { - pool_stats.connected_miners = miner_count; + pool_stats.connected_accounts = miner_count; update_pool_hr(); } /* Wait and try to reconnect */ @@ -2767,26 +2802,26 @@ client_clear(struct bufferevent *bev) if (!client) return; client_clear_jobs(client); - account_stats_t *stats = NULL; + account_t *account = NULL; pthread_rwlock_rdlock(&rwlock_acc); - HASH_FIND_STR(account_stats, client->address, stats); + HASH_FIND_STR(accounts, client->address, account); pthread_rwlock_unlock(&rwlock_acc); - if (stats && stats->worker_count == 1) + if (account && account->worker_count == 1) { if (client->downstream) - pool_stats.connected_miners -= client->downstream_miners; + pool_stats.connected_accounts -= client->downstream_accounts; else - pool_stats.connected_miners--; + pool_stats.connected_accounts--; if (upstream_event) - upstream_send_client_disconnect(); + upstream_send_account_disconnect(); miner_count--; pthread_rwlock_wrlock(&rwlock_acc); - HASH_DEL(account_stats, stats); + HASH_DEL(accounts, account); pthread_rwlock_unlock(&rwlock_acc); - gbag_put(bag_stats, stats); + gbag_put(bag_accounts, account); } - else if (stats && stats->worker_count > 1) - stats->worker_count--; + else if (account && account->worker_count > 1) + account->worker_count--; pthread_rwlock_wrlock(&rwlock_cfd); HASH_DEL(clients_by_fd, client); pthread_rwlock_unlock(&rwlock_cfd); @@ -2861,28 +2896,28 @@ miner_on_login(json_object *message, client_t *client) strncpy(client->address, address, sizeof(client->address)-1); strncpy(client->worker_id, worker_id, sizeof(client->worker_id)-1); - account_stats_t *stats = NULL; + account_t *account = NULL; pthread_rwlock_rdlock(&rwlock_acc); - HASH_FIND_STR(account_stats, client->address, stats); + HASH_FIND_STR(accounts, client->address, account); pthread_rwlock_unlock(&rwlock_acc); - if (!stats) + if (!account) { miner_count++; if (!client->downstream) - pool_stats.connected_miners++; + pool_stats.connected_accounts++; if (upstream_event) - upstream_send_client_connect(1); - stats = gbag_get(bag_stats); - strncpy(stats->address, address, sizeof(stats->address)-1); - stats->worker_count = 1; - stats->connected_since = time(NULL); - stats->hashes = 0; + upstream_send_account_connect(1); + account = gbag_get(bag_accounts); + strncpy(account->address, address, sizeof(account->address)-1); + account->worker_count = 1; + account->connected_since = time(NULL); + account->hashes = 0; pthread_rwlock_wrlock(&rwlock_acc); - HASH_ADD_STR(account_stats, address, stats); + HASH_ADD_STR(accounts, address, account); pthread_rwlock_unlock(&rwlock_acc); } else - stats->worker_count++; + account->worker_count++; uuid_t cid; uuid_generate(cid); bin_to_hex((const unsigned char*)cid, sizeof(uuid_t), @@ -3189,12 +3224,17 @@ post_hash: BN_free(rh); /* Process share */ - account_stats_t *stats = NULL; + account_t *account = NULL; pthread_rwlock_rdlock(&rwlock_acc); - HASH_FIND_STR(account_stats, client->address, stats); - pthread_rwlock_unlock(&rwlock_acc); - stats->hashes += job->target; + HASH_FIND_STR(accounts, client->address, account); client->hashes += job->target; + client->hr_stats.diff_since += job->target; + account->hashes += job->target; + account->hr_stats.diff_since += job->target; + hr_update(&client->hr_stats); + /* TODO: account hr should be called less freq */ + hr_update(&account->hr_stats); + pthread_rwlock_unlock(&rwlock_acc); time_t now = time(NULL); bool can_store = true; log_trace("Checking hash against block difficulty: " @@ -3442,11 +3482,11 @@ trusted_on_read(struct bufferevent *bev, void *ctx) if (len - 9 < sizeof(uint32_t)) goto unlock; evbuffer_drain(input, 9); - trusted_on_client_connect(client); + trusted_on_account_connect(client); break; case BIN_DISCONNECT: evbuffer_drain(input, 9); - trusted_on_client_disconnect(client); + trusted_on_account_disconnect(client); break; case BIN_SHARE: if (len - 9 < sizeof(share_t)) @@ -3549,7 +3589,7 @@ listener_on_accept(evutil_socket_t listener, short event, void *arg) bufferevent_setwatermark(bev, EV_READ, 0, MAX_LINE); client_add(fd, bev, base == trusted_base); log_info("New %s connected. Miner count: %d, Pool hashrate: %"PRIu64, - type, pool_stats.connected_miners, pool_stats.pool_hashrate); + type, pool_stats.connected_accounts, pool_stats.pool_hashrate); bufferevent_enable(bev, EV_READ|EV_WRITE); } diff --git a/src/pool.h b/src/pool.h index 91f8347..fc6195c 100644 --- a/src/pool.h +++ b/src/pool.h @@ -35,7 +35,7 @@ developers. #ifndef POOL_H #define POOL_H -uint64_t miner_hr(const char *address); -uint64_t miner_balance(const char *address); +void account_hr(double *avg, const char *address); +uint64_t account_balance(const char *address); #endif diff --git a/src/webui.c b/src/webui.c index 58ac5f1..a49348f 100644 --- a/src/webui.c +++ b/src/webui.c @@ -75,7 +75,7 @@ send_json_stats(struct evhttp_request *req, void *arg) uint32_t pbf = context->pool_stats->pool_blocks_found; uint64_t rh = context->pool_stats->round_hashes; unsigned ss = context->allow_self_select; - uint64_t mh = 0; + double mh[6] = {0}; double mb = 0.0; hdrs_in = evhttp_request_get_input_headers(req); @@ -86,8 +86,8 @@ send_json_stats(struct evhttp_request *req, void *arg) if (wa) { wa += 3; - mh = miner_hr(wa); - uint64_t balance = miner_balance(wa); + account_hr(mh, wa); + uint64_t balance = account_balance(wa); mb = (double) balance / 1000000000000.0; } } @@ -108,12 +108,17 @@ send_json_stats(struct evhttp_request *req, void *arg) "\"allow_self_select\":%u," "\"connected_miners\":%d," "\"miner_hashrate\":%"PRIu64"," + "\"miner_hashrate_stats\":[" + "%"PRIu64",%"PRIu64",%"PRIu64"," + "%"PRIu64",%"PRIu64",%"PRIu64"]," "\"miner_balance\":%.8f" "}", ph, rh, nh, nd, height, ltf, lbf, pbf, context->payment_threshold, context->pool_fee, context->pool_port, context->pool_ssl_port, - ss, context->pool_stats->connected_miners, - mh, mb); + ss, context->pool_stats->connected_accounts, + (uint64_t)mh[0], + (uint64_t)mh[0], (uint64_t)mh[1], (uint64_t)mh[2], + (uint64_t)mh[3], (uint64_t)mh[4], (uint64_t)mh[5], mb); hdrs_out = evhttp_request_get_output_headers(req); evhttp_add_header(hdrs_out, "Content-Type", "application/json"); evhttp_send_reply(req, HTTP_OK, "OK", buf); diff --git a/src/webui.h b/src/webui.h index 6b9cb1e..38e3617 100644 --- a/src/webui.h +++ b/src/webui.h @@ -40,7 +40,7 @@ typedef struct pool_stats_t uint64_t network_difficulty; uint64_t network_hashrate; uint64_t network_height; - uint32_t connected_miners; + uint32_t connected_accounts; uint64_t pool_hashrate; uint64_t round_hashes; uint32_t pool_blocks_found;