Mesa (staging/21.1): util/fossilize_db: Update parsed_offset correctly.

[GitLab Mirror]

Module: Mesa
Branch: staging/21.1
Commit: 3962282c126a91b637e745df1b64db1a83b79737
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3962282c126a91b637e745df1b64db1a83b79737

Author: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Date:   Thu Aug  5 01:26:15 2021 +0200

util/fossilize_db: Update parsed_offset correctly.

If things went perfectly parsed_offset was never updated for the
final entry and we'd seek_set to the start of the last entry. Is
fun when appending to the file next.

Fixes: 2ec1bff0f3a "util/fossilize_db: Split out reading the index."
Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12204>
(cherry picked from commit 3c51a3aa954bb09ceb7c101dc02c1b11fb250bbf)

---

 .pick_status.json       | 2 +-
 src/util/fossilize_db.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 421d5bdfbc2..67bf9c4e6d6 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -202,7 +202,7 @@
         "description": "util/fossilize_db: Update parsed_offset correctly.",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "2ec1bff0f3a4450a9739d59421dc9c9fe72c94c6"
     },
diff --git a/src/util/fossilize_db.c b/src/util/fossilize_db.c
index 92c180c6944..aefc461ebb2 100644
--- a/src/util/fossilize_db.c
+++ b/src/util/fossilize_db.c
@@ -120,8 +120,6 @@ update_foz_index(struct foz_db *foz_db, FILE *db_idx, unsigned file_idx)
 
    fseek(db_idx, offset, SEEK_SET);
    while (offset < len) {
-      parsed_offset = offset;
-
       char bytes_to_read[FOSSILIZE_BLOB_HASH_LENGTH + sizeof(struct foz_payload_header)];
       struct foz_payload_header *header;
 
@@ -171,6 +169,7 @@ update_foz_index(struct foz_db *foz_db, FILE *db_idx, unsigned file_idx)
       _mesa_hash_table_u64_insert(foz_db->index_db, key, entry);
 
       offset += header->payload_size;
+      parsed_offset = offset;
    }