From 929386fad90eed7dad8b32f457020c57a786d288 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Tue, 11 May 2021 08:08:32 -0300 Subject: [PATCH] lib/generate_thread_id: move static buffer to notmuch_database_t Work towards the goal of concurrent access to different Xapian databases from the same process. --- lib/add-message.cc | 9 +++------ lib/database-private.h | 4 ++++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/add-message.cc b/lib/add-message.cc index 0c34d318..d4a00b17 100644 --- a/lib/add-message.cc +++ b/lib/add-message.cc @@ -40,17 +40,14 @@ parse_references (void *ctx, static const char * _notmuch_database_generate_thread_id (notmuch_database_t *notmuch) { - /* 16 bytes (+ terminator) for hexadecimal representation of - * a 64-bit integer. */ - static char thread_id[17]; notmuch->last_thread_id++; - sprintf (thread_id, "%016" PRIx64, notmuch->last_thread_id); + sprintf (notmuch->thread_id_str, "%016" PRIx64, notmuch->last_thread_id); - notmuch->writable_xapian_db->set_metadata ("last_thread_id", thread_id); + notmuch->writable_xapian_db->set_metadata ("last_thread_id", notmuch->thread_id_str); - return thread_id; + return notmuch->thread_id_str; } static char * diff --git a/lib/database-private.h b/lib/database-private.h index 0d12ec1e..1a73dacc 100644 --- a/lib/database-private.h +++ b/lib/database-private.h @@ -206,6 +206,10 @@ struct _notmuch_database { enum _notmuch_features features; unsigned int last_doc_id; + + /* 16 bytes (+ terminator) for hexadecimal representation of + * a 64-bit integer. */ + char thread_id_str[17]; uint64_t last_thread_id; /* error reporting; this value persists only until the