Drop the arena; BPFENs are bounded by 32 bytes anyway, and the typical is something...

[remoteglot-book] / binloader.cpp

diff --git a/binloader.cpp b/binloader.cpp
index 3877ffcaf827aa87267ff4237cc45796e1490641..acf14d7c9d3dd79d0bf436c4ab4c772f3540a889 100644 (file)
--- a/binloader.cpp
+++ b/binloader.cpp
@@ -12,7 +12,6 @@
 #include <unordered_set>
 #include <string.h>
 #include "count.pb.h"
-#include "arena.h"
 #include "hash.h"
 
 #define DUMMY_TIMESTAMP 32503680000
@@ -42,7 +41,7 @@ static inline int memcmp_different_len(const void *s1, size_t n1, const void *s2
 
 enum Result { WHITE = 0, DRAW, BLACK };
 struct Element {
-       char *bpfen;  // includes prev_board_hash
+       char bpfen[32];  // includes prev_board_hash
        int bpfen_len;
        char move[8];   // Na1xc3+
        Result result;
@@ -59,7 +58,6 @@ struct Element {
 
 struct ShardData {
        vector<Element> elems;
-       unique_ptr<Arena> arena;  // Used to allocate bpfen.
        int num_written_subshards = 0;
 };
 
@@ -119,7 +117,6 @@ void write_subshard(const char *basename, ShardData* shard, int bucket)
        mtbl_writer_destroy(&mtbl);
 
        shard->elems.clear();
-       shard->arena.reset(new Arena);
 }
 
 int main(int argc, char **argv)
@@ -132,7 +129,6 @@ int main(int argc, char **argv)
 
        for (int i = 0; i < num_buckets; ++i) {
                shards[i].elems.reserve(num_pos_per_subshard);
-               shards[i].arena.reset(new Arena);
        }
 
        size_t num_elems = 0;
@@ -154,6 +150,7 @@ int main(int argc, char **argv)
                        if (bpfen_len == -1) {
                                break;
                        }
+                       assert(bpfen_len <= 32);
                        if (bpfen_len >= int(sizeof(bpfen))) {
                                fprintf(stderr, "Overlong BPFEN (%d bytes)\n", bpfen_len);
                //              exit(1);
@@ -226,7 +223,6 @@ int main(int argc, char **argv)
 
                        int bucket = hash_key_to_bucket(bpfen, bpfen_len, num_buckets);
                        Element e;
-                       e.bpfen = shards[bucket].arena->alloc(bpfen_len);
                        memcpy(e.bpfen, bpfen, bpfen_len);
                        e.bpfen_len = bpfen_len;
                        strcpy(e.move, move);