X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=binloader.cpp;h=44088856081f05eb05e7ddb464a00ccbd4ddb98a;hb=99e8e99517d82bd2dc42a9fe104e40e61fe54b82;hp=5bf2502c6867610fbb963c91d63aaf3f717312c8;hpb=55481cd69d21b31bfdcc6e33853ea475ed16f622;p=remoteglot-book

diff --git a/binloader.cpp b/binloader.cpp
index 5bf2502..4408885 100644
--- a/binloader.cpp
+++ b/binloader.cpp
@@ -12,23 +12,36 @@
 #include <unordered_set>
 #include <string.h>
 #include "count.pb.h"
+#include "arena.h"
 #include "hash.h"
 
 #define DUMMY_TIMESTAMP 32503680000
 
 using namespace std;
 
+Arena arena;
+
 enum Result { WHITE = 0, DRAW, BLACK };
 struct Element {
-	string bpfen;
-	string move;
+	char *bpfen;
+	int bpfen_len;
+	char move[8];   // Na1xc3+
 	Result result;
 	int opening_num, white_elo, black_elo;
+	int file_num;
 	time_t timestamp;
 	long start_position;
 
 	bool operator< (const Element& other) const {
-		return bpfen < other.bpfen;
+		int shared_len = min(bpfen_len, other.bpfen_len);
+		int s = memcmp(bpfen, other.bpfen, shared_len);
+		if (s < 0) {
+			return true;
+		} else if (s > 0) {
+			return false;
+		} else {
+			return bpfen_len < other.bpfen_len;
+		}
 	}
 };
 
@@ -47,14 +60,13 @@ int main(int argc, char **argv)
 			exit(1);
 		}
 		for ( ;; ) {
-			int l = getc(fp);
-			if (l == -1) {
+			int bpfen_len = getc(fp);
+			if (bpfen_len == -1) {
 				break;
 			}
 		
-			string bpfen;
-			bpfen.resize(l);
-			if (fread(&bpfen[0], l, 1, fp) != 1) {
+			char *bpfen = arena.alloc(bpfen_len);
+			if (fread(bpfen, bpfen_len, 1, fp) != 1) {
 				perror("fread()");
 		//		exit(1);
 				break;
@@ -67,7 +79,7 @@ int main(int argc, char **argv)
 				break;
 			}
 
-			int opening_num, white_elo, black_elo;
+			int opening_num, white_elo, black_elo, file_num;
 			time_t timestamp;
 			long start_position;
 			if (fread(&white_elo, sizeof(white_elo), 1, fp) != 1) {
@@ -90,6 +102,11 @@ int main(int argc, char **argv)
 				//exit(1);
 				break;
 			}
+			if (fread(&file_num, sizeof(file_num), 1, fp) != 1) {
+				perror("fread()");
+				//exit(1);
+				break;
+			}
 			if (fread(&start_position, sizeof(start_position), 1, fp) != 1) {
 				perror("fread()");
 				//exit(1);
@@ -97,20 +114,36 @@ int main(int argc, char **argv)
 			}
 
 
-			l = getc(fp);
+			char move[8];
+			int l = getc(fp);
 			if (l == -1) {
 				break;
 			}
-			string move;
-			move.resize(l);
+			if (l >= int(sizeof(move))) {
+				fprintf(stderr, "Overlong move (%d bytes)\n", l);
+		//		exit(1);
+				break;
+			}
 			if (fread(&move[0], l, 1, fp) != 1) {
 				perror("fread()");
 		//		exit(1);
 				break;
 			}
-
-			int bucket = hash_key_to_bucket(bpfen.data(), bpfen.size(), num_buckets);
-			elems[bucket].emplace_back(Element {std::move(bpfen), std::move(move), Result(r), opening_num, white_elo, black_elo, timestamp, start_position});
+			move[l] = 0;
+
+			int bucket = hash_key_to_bucket(bpfen, bpfen_len, num_buckets);
+			Element e;
+			e.bpfen = bpfen;
+			e.bpfen_len = bpfen_len;
+			strcpy(e.move, move);
+			e.result = Result(r);
+			e.opening_num = opening_num;
+			e.white_elo = white_elo;
+			e.black_elo = black_elo;
+			e.file_num = file_num;
+			e.timestamp = timestamp;
+			e.start_position = start_position;
+			elems[bucket].push_back(e);
 			++num_elems;
 		}
 		fclose(fp);
@@ -153,16 +186,19 @@ int main(int argc, char **argv)
 					c.set_first_timestamp(e.timestamp);
 				}
 				c.set_opening_num(e.opening_num);
+				c.set_pgn_file_num(e.file_num);
 				c.set_pgn_start_position(e.start_position);
 			}
 			if (!moves.count(e.move)) {
 				moves.insert(e.move);
 				c.add_move(e.move);
 			}
-			if (j == elems[i].size() - 1 || e.bpfen != elems[i][j + 1].bpfen) {
+			if (j == elems[i].size() - 1 ||
+			    e.bpfen_len != elems[i][j + 1].bpfen_len ||
+			    memcmp(e.bpfen, elems[i][j + 1].bpfen, e.bpfen_len) != 0) {
 				c.SerializeToString(&buf);
 				mtbl_writer_add(mtbl,
-					(const uint8_t *)e.bpfen.data(), e.bpfen.size(),
+					(const uint8_t *)e.bpfen, e.bpfen_len,
 					(const uint8_t *)buf.data(), buf.size());
 				c = Count();
 				moves.clear();