add bounded stack

src/bstack.c

@@ -0,0 +1,153 @@
+/*
+Copyright (c) 2014-2019, 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 "bstack.h"
+#include <assert.h>
+#include <string.h>
+#include <stdlib.h>
+
+struct bstack_t
+{
+    size_t c;
+    size_t cc;
+    size_t z;
+    size_t n;
+    size_t ni;
+    recycle_fun rf;
+    char * b;
+};
+
+void
+bstack_new(bstack_t **out, size_t count, size_t size, recycle_fun recycle)
+{
+    assert(*out==NULL);
+    bstack_t *q = (bstack_t*) calloc(1, sizeof(bstack_t));
+    q->c = count;
+    q->cc = 0;
+    q->z = size;
+    q->b = (char*) calloc(q->c, q->z);
+    q->n = 0;
+    q->ni = 0;
+    q->rf = recycle;
+    *out = q;
+}
+
+void
+bstack_free(bstack_t *q)
+{
+    assert(q);
+    if (q->rf)
+    {
+        char *ps = q->b;
+        char *pe = ps + (q->cc * q->z);
+        while (ps < pe)
+        {
+            q->rf(ps);
+            ps += q->z;
+        }
+    }
+    free(q->b);
+    free(q);
+}
+
+void *
+bstack_push(bstack_t *q, void *item)
+{
+    assert(q);
+    size_t idx = q->n++ % q->c;
+    void *pb = q->b + (idx * q->z);
+    if (q->rf && q->cc == q->c)
+        q->rf(pb);
+    if (item)
+        memcpy(pb, item, q->z);
+    else
+        memset(pb, 0, q->z);
+    if (q->cc < q->c)
+        q->cc++;
+    q->ni = q->cc;
+    return pb;
+}
+
+void
+bstack_drop(bstack_t *q)
+{
+    assert(q);
+    if (!q->cc)
+        return;
+    q->n--;
+    size_t idx = (q->n - q->cc) % q->c;
+    void *pb = q->b + (idx * q->z);
+    q->cc--;
+    if (q->rf)
+        q->rf(pb);
+}
+
+void *
+bstack_peek(bstack_t *q)
+{
+    assert(q);
+    if (!q->cc)
+        return NULL;
+    size_t idx = (q->n - (q->cc + 1)) % q->c;
+    if (q->cc < q->c)
+        idx = q->cc-1;
+    void *pb = idx ? q->b + (idx * q->z) : q->b;
+    return pb;
+}
+
+size_t bstack_count(bstack_t *q)
+{
+    assert(q);
+    return q->cc;
+}
+
+void *
+bstack_next(bstack_t *q)
+{
+    assert(q);
+    if (!q->ni)
+        return NULL;
+    q->ni--;
+    size_t idx = (q->n - (q->cc - q->ni)) % q->c;
+    void *pb = idx ? q->b + (idx * q->z) : q->b;
+    return pb;
+}
+
+void
+bstack_reset(bstack_t *q)
+{
+    assert(q);
+    q->ni = q->cc;
+}
+

src/bstack.h

@@ -0,0 +1,54 @@
+/*
+Copyright (c) 2014-2019, 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.
+*/
+
+/* Bounded Stack */
+
+#ifndef BSTACK_H
+#define BSTACK_H
+
+#include <stddef.h>
+
+typedef struct bstack_t bstack_t;
+typedef void (*recycle_fun)(void*);
+
+void bstack_new(bstack_t **out, size_t count, size_t size, recycle_fun recycle);
+void bstack_free(bstack_t *q);
+void * bstack_push(bstack_t *q, void *item);
+void bstack_drop(bstack_t *q);
+void * bstack_peek(bstack_t *q);
+size_t bstack_count(bstack_t *q);
+void * bstack_next(bstack_t *q);
+void bstack_reset(bstack_t *q);
+
+#endif

src/pool.c

@@ -60,6 +60,7 @@
 #include <openssl/bn.h>
 #include <pthread.h>
 
+#include "bstack.h"
 #include "util.h"
 #include "xmr.h"
 #include "log.h"
@@ -220,9 +221,6 @@ static int balance_add(const char *address, uint64_t amount, MDB_txn *parent);
 static int send_payments();
 static int startup_pauout(uint64_t height);
 static void update_pool_hr();
-static void block_template_free(block_template_t *block_template);
-static void block_templates_free();
-static void last_block_headers_free();
 static void pool_clients_init();
 static void pool_clients_free();
 static void pool_clients_send_job();
@@ -262,8 +260,8 @@ static void sigusr1_handler(evutil_socket_t fd, short event, void *arg);
 
 static config_t config;
 static pool_clients_t pool_clients;
-static block_t *last_block_headers[BLOCK_HEADERS_MAX];
+static bstack_t *bst;
-static block_template_t *block_templates[BLOCK_TEMPLATES_MAX];
+static bstack_t *bsh;
 static struct event_base *base;
 static struct event *listener_event;
 static struct event *timer_120s;
@@ -966,36 +964,19 @@ update_pool_hr()
 }
 
 static void
-block_template_free(block_template_t *block_template)
+template_recycle(void *item)
 {
-    free(block_template->blockhashing_blob);
+    block_template_t *bt = (block_template_t*) item;
-    free(block_template->blocktemplate_blob);
+    log_trace("Recycle block template at height: %"PRIu64, bt->height);
-    free(block_template);
+    if (bt->blockhashing_blob)
-}
-
-static void
-block_templates_free()
-{
-    for (size_t i=0; i<BLOCK_TEMPLATES_MAX; i++)
     {
-        block_template_t *bt = block_templates[i];
+        free(bt->blockhashing_blob);
-        if (bt != NULL)
+        bt->blockhashing_blob = NULL;
-        {
-            free(bt->blockhashing_blob);
-            free(bt->blocktemplate_blob);
-            free(bt);
-        }
     }
-}
+    if (bt->blocktemplate_blob)
-
-static void
-last_block_headers_free()
-{
-    for (size_t i=0; i<BLOCK_HEADERS_MAX; i++)
     {
-        block_t *block = last_block_headers[i];
+        free(bt->blocktemplate_blob);
-        if (block != NULL)
+        bt->blocktemplate_blob = NULL;
-            free(block);
     }
 }
 
@@ -1403,26 +1384,8 @@ rpc_on_block_template(const char* data, rpc_callback_t *callback)
         return;
     }
 
-    block_template_t *bt = calloc(1, sizeof(block_template_t));
+    block_template_t *front = (block_template_t*) bstack_push(bst, NULL);
-    response_to_block_template(result, bt);
+    response_to_block_template(result, front);
-    block_template_t *front = block_templates[0];
-    if (front == NULL)
-    {
-        block_templates[0] = bt;
-    }
-    else
-    {
-        size_t i = BLOCK_TEMPLATES_MAX;
-        while (--i)
-        {
-            if (i == BLOCK_TEMPLATES_MAX - 1 && block_templates[i] != NULL)
-            {
-                block_template_free(block_templates[i]);
-            }
-            block_templates[i] = block_templates[i-1];
-        }
-        block_templates[0] = bt;
-    }
     pool_clients_send_job();
     json_object_put(root);
 }
@@ -1453,40 +1416,27 @@ rpc_on_last_block_header(const char* data, rpc_callback_t *callback)
         json_object_put(root);
         return;
     }
-    block_t *front = last_block_headers[0];
+    block_t *front = bstack_peek(bsh);
-    block_t *block = calloc(1, sizeof(block_t));
+    block_t *block = bstack_push(bsh, NULL);
     JSON_GET_OR_WARN(block_header, result, json_type_object);
     response_to_block(block_header, block);
-    if (front == NULL)
-    {
-        startup_pauout(block->height);
-    }
     bool need_new_template = false;
     if (front != NULL && block->height > front->height)
     {
-        size_t i = BLOCK_HEADERS_MAX;
-        while (--i)
-        {
-            if (i == BLOCK_HEADERS_MAX - 1 && last_block_headers[i] != NULL)
-            {
-                free(last_block_headers[i]);
-            }
-            last_block_headers[i] = last_block_headers[i-1];
-        }
-        last_block_headers[0] = block;
         need_new_template = true;
     }
     else if (front == NULL)
     {
-        last_block_headers[0] = block;
+        startup_pauout(block->height);
         need_new_template = true;
     }
     else
-        free(block);
+        bstack_drop(bsh);
 
-    pool_stats.network_difficulty = last_block_headers[0]->difficulty;
+    front = bstack_peek(bsh);
-    pool_stats.network_hashrate = last_block_headers[0]->difficulty / BLOCK_TIME;
+    pool_stats.network_difficulty = front->difficulty;
-    pool_stats.network_height = last_block_headers[0]->height;
+    pool_stats.network_hashrate = front->difficulty / BLOCK_TIME;
+    pool_stats.network_height = front->height;
     update_pool_hr();
 
     if (need_new_template)
@@ -1772,7 +1722,7 @@ client_send_job(client_t *client, bool response)
     memset(job, 0, sizeof(job_t));
 
     /* Quick check we actually have a block template */
-    block_template_t *bt = block_templates[0];
+    block_template_t *bt = bstack_peek(bst);
     if (!bt)
     {
         log_warn("Cannot send client a job as have not yet recieved a block template");
@@ -2487,8 +2437,8 @@ cleanup()
         event_free(timer_10m);
     event_base_free(base);
     pool_clients_free();
-    last_block_headers_free();
+    bstack_free(bsh);
-    block_templates_free();
+    bstack_free(bst);
     database_close();
     BN_free(base_diff);
     BN_CTX_free(bn_ctx);
@@ -2579,6 +2529,10 @@ int main(int argc, char **argv)
         goto cleanup;
     }
 
+    bstack_new(&bst, BLOCK_TEMPLATES_MAX, sizeof(block_template_t),
+            template_recycle);
+    bstack_new(&bsh, BLOCK_HEADERS_MAX, sizeof(block_t), NULL);
+
     bn_ctx = BN_CTX_new();
     base_diff = NULL;
     BN_hex2bn(&base_diff, "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF");