Added next table offset to tableinfo

4 files changed, 10 insertions, 1 deletions

diff --git a/src/solvers/tables.h b/src/solvers/tables.h
index be0209f..9598a09 100644
--- a/src/solvers/tables.h
+++ b/src/solvers/tables.h
@@ -9,7 +9,8 @@
 #define INFO_OFFSET_BITS         (INFO_OFFSET_ENTRIES + sizeof(uint64_t))
 #define INFO_OFFSET_BASE         (INFO_OFFSET_BITS + sizeof(uint8_t))
 #define INFO_OFFSET_MAXVALUE     (INFO_OFFSET_BASE + sizeof(uint8_t))
-#define INFO_OFFSET_DISTRIBUTION (INFO_OFFSET_MAXVALUE + sizeof(uint8_t))
+#define INFO_OFFSET_NEXT         (INFO_OFFSET_MAXVALUE + sizeof(uint8_t))
+#define INFO_OFFSET_DISTRIBUTION (INFO_OFFSET_NEXT + sizeof(uint64_t))
 #define INFO_DISTRIBUTION_LEN    21
 
 typedef struct {
@@ -21,6 +22,7 @@ typedef struct {
         uint8_t bits;
         uint8_t base;
         uint8_t maxvalue;
+        uint64_t next;
         uint64_t distribution[INFO_DISTRIBUTION_LEN];
 } tableinfo_t;
 
@@ -49,6 +51,7 @@ readtableinfo(const void *buf, tableinfo_t *info)
         info->bits = *OFFSET(buf, INFO_OFFSET_BITS);
         info->base = *OFFSET(buf, INFO_OFFSET_BASE);
         info->maxvalue = *OFFSET(buf, INFO_OFFSET_MAXVALUE);
+        info->next = *(const uint64_t* )OFFSET(buf, INFO_OFFSET_NEXT);
         memcpy(info->distribution, OFFSET(buf, INFO_OFFSET_DISTRIBUTION),
             INFO_DISTRIBUTION_LEN * sizeof(uint64_t));
 
@@ -85,6 +88,7 @@ writetableinfo(const tableinfo_t *info, void *buf)
         *OFFSET(buf, INFO_OFFSET_BITS) = info->bits;
         *OFFSET(buf, INFO_OFFSET_BASE) = info->base;
         *OFFSET(buf, INFO_OFFSET_MAXVALUE) = info->maxvalue;
+        *(uint64_t *)OFFSET(buf, INFO_OFFSET_NEXT) = info->next;
 
         memcpy(OFFSET(buf, INFO_OFFSET_DISTRIBUTION), info->distribution,
             INFO_DISTRIBUTION_LEN * sizeof(uint64_t));
diff --git a/test/090_tables_readwrite/00_table.in b/test/090_tables_readwrite/00_table.in
index 1816242..a35f13a 100644
--- a/test/090_tables_readwrite/00_table.in
+++ b/test/090_tables_readwrite/00_table.in
@@ -7,6 +7,7 @@ Test solver
 2
 0
 20
+100000000512
 
 100
 101
diff --git a/test/090_tables_readwrite/00_table.out b/test/090_tables_readwrite/00_table.out
index 1816242..a35f13a 100644
--- a/test/090_tables_readwrite/00_table.out
+++ b/test/090_tables_readwrite/00_table.out
@@ -7,6 +7,7 @@ Test solver
 2
 0
 20
+100000000512
 
 100
 101
diff --git a/test/090_tables_readwrite/tables_readwrite_tests.c b/test/090_tables_readwrite/tables_readwrite_tests.c
index 97b8ab7..b062460 100644
--- a/test/090_tables_readwrite/tables_readwrite_tests.c
+++ b/test/090_tables_readwrite/tables_readwrite_tests.c
@@ -13,6 +13,7 @@ typedef struct {
         uint8_t bits;
         uint8_t base;
         uint8_t maxvalue;
+        uint64_t next;
         uint64_t distribution[INFO_DISTRIBUTION_LEN];
 } tableinfo_t;
 
@@ -45,6 +46,7 @@ tableinfo_t test_readinfo(void) {
         ret.bits = (uint8_t)readn();
         ret.base = (uint8_t)readn();
         ret.maxvalue = (uint8_t)readn();
+        ret.next = readn();
 
         fgets(emptyline, 2, stdin);
 
@@ -67,6 +69,7 @@ void test_writeinfo(tableinfo_t info) {
         printf("%" PRIu8 "\n", info.bits);
         printf("%" PRIu8 "\n", info.base);
         printf("%" PRIu8 "\n", info.maxvalue);
+        printf("%" PRIu64 "\n", info.next);
         printf("\n");
 
         for (i = 0; i < INFO_DISTRIBUTION_LEN; i++)