diff options
| author | Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl> | 2021-08-05 01:30:25 +0200 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2021-08-07 20:06:31 +0000 |
| commit | 96bfefe8d1209b6aaa56fd77ca570789d82efb6e (patch) | |
| tree | 0e144ee8d336a0901e86bdf75e368124731df090 | |
| parent | 3091277052cccd47994a2aa075eecaa767cc709b (diff) | |
util/fossilize_db: Be conservative about header length check for locking.
Don't anticipate seeing any partial written headers but just in case we
should probably wait on the lock to make sure whatever header was being
written is finished being written.
Fixes: 4f0f8133a35 "util/fossilize_db: Do not lock the fossilize db permanently."
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12204>
| -rw-r--r-- | src/util/fossilize_db.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/util/fossilize_db.c b/src/util/fossilize_db.c index af5c6e58581..46217f8a597 100644 --- a/src/util/fossilize_db.c +++ b/src/util/fossilize_db.c @@ -203,8 +203,9 @@ load_foz_dbs(struct foz_db *foz_db, FILE *db_idx, uint8_t file_idx, size_t len = ftell(db_idx); rewind(db_idx); - /* Try not to take the lock if len > 0, but if it is 0 we take the lock to initialize the files. */ - if (len == 0) { + /* Try not to take the lock if len >= the size of the header, but if it is smaller we take the + * lock to potentially initialize the files. */ + if (len < sizeof(stream_reference_magic_and_version)) { /* Wait for 100 ms in case of contention, after that we prioritize getting the app started. */ int err = lock_file_with_timeout(foz_db->file[file_idx], 100000000); if (err == -1) |