From: Austin Clements Date: Wed, 8 Dec 2010 22:01:53 +0000 (+1900) Subject: [PATCH] Various small clean-ups to doc ID set code. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=28fa9f71d41d5cff5fb0ee08825d3f2ec9646a98;p=notmuch-archives.git [PATCH] Various small clean-ups to doc ID set code. --- diff --git a/e0/c89eb0456d24d3931d6375174d89dd4fe7af8a b/e0/c89eb0456d24d3931d6375174d89dd4fe7af8a new file mode 100644 index 000000000..df065e145 --- /dev/null +++ b/e0/c89eb0456d24d3931d6375174d89dd4fe7af8a @@ -0,0 +1,179 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 74CA9431FD0 + for ; Wed, 8 Dec 2010 14:01:56 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id F4wAxNBzpSu9 for ; + Wed, 8 Dec 2010 14:01:55 -0800 (PST) +Received: from dmz-mailsec-scanner-2.mit.edu (DMZ-MAILSEC-SCANNER-2.MIT.EDU + [18.9.25.13]) + by olra.theworths.org (Postfix) with ESMTP id CE4E5431FB5 + for ; Wed, 8 Dec 2010 14:01:55 -0800 (PST) +X-AuditID: 1209190d-b7cacae000000a14-5f-4d0000538ba5 +Received: from mailhub-auth-4.mit.edu ( [18.7.62.39]) + by dmz-mailsec-scanner-2.mit.edu (Symantec Brightmail Gateway) with + SMTP id 2E.4D.02580.350000D4; Wed, 8 Dec 2010 17:01:55 -0500 (EST) +Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) + by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id oB8M1sSZ021056; + Wed, 8 Dec 2010 17:01:55 -0500 +Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91]) + (authenticated bits=0) + (User authenticated as amdragon@ATHENA.MIT.EDU) + by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id oB8M1rJn019459 + (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); + Wed, 8 Dec 2010 17:01:54 -0500 (EST) +Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.72) + (envelope-from ) + id 1PQS5B-0001iD-DC; Wed, 08 Dec 2010 17:01:53 -0500 +Date: Wed, 8 Dec 2010 17:01:53 -0500 +From: Austin Clements +To: Carl Worth +Subject: [PATCH] Various small clean-ups to doc ID set code. +Message-ID: <20101208220153.GT2447@mit.edu> +References: <20101117192826.GU2439@mit.edu> + <874oap5aek.fsf@yoom.home.cworth.org> + <20101208215844.GS2447@mit.edu> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +Content-Disposition: inline +In-Reply-To: <20101208215844.GS2447@mit.edu> +User-Agent: Mutt/1.5.20 (2009-06-14) +X-Brightmail-Tracker: AAAAAA== +Cc: notmuch@notmuchmail.org +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Wed, 08 Dec 2010 22:01:56 -0000 + +Remove the repeated "sizeof (doc_ids->bitmap[0])" that bothered cworth +by instead defining macros to compute the word and bit offset of a +given bit in the bitmap. + +Don't require the caller of _notmuch_doc_id_set_init to pass in a +correct bound; instead compute it from the array. This simplifies the +caller and makes this interface easier to use correctly. +--- + lib/query.cc | 37 +++++++++++++++++++------------------ + 1 files changed, 19 insertions(+), 18 deletions(-) + +diff --git a/lib/query.cc b/lib/query.cc +index c7ae4ee..3b76dc5 100644 +--- a/lib/query.cc ++++ b/lib/query.cc +@@ -38,9 +38,12 @@ typedef struct _notmuch_mset_messages { + + struct _notmuch_doc_id_set { + unsigned int *bitmap; +- unsigned int bound; ++ unsigned int max; + }; + ++#define BITMAP_WORD(bit) ((bit) / sizeof (unsigned int)) ++#define BITMAP_BIT(bit) ((bit) % sizeof (unsigned int)) ++ + struct _notmuch_threads { + notmuch_query_t *query; + +@@ -257,22 +260,24 @@ _notmuch_mset_messages_move_to_next (notmuch_messages_t *messages) + static notmuch_bool_t + _notmuch_doc_id_set_init (void *ctx, + notmuch_doc_id_set_t *doc_ids, +- GArray *arr, unsigned int bound) ++ GArray *arr) + { +- size_t count = (bound + sizeof (doc_ids->bitmap[0]) - 1) / +- sizeof (doc_ids->bitmap[0]); +- unsigned int *bitmap = talloc_zero_array (ctx, unsigned int, count); ++ unsigned int max = 0; ++ unsigned int *bitmap; ++ ++ for (unsigned int i = 0; i < arr->len; i++) ++ max = MAX(max, g_array_index (arr, unsigned int, i)); ++ bitmap = talloc_zero_array (ctx, unsigned int, 1 + max / sizeof (*bitmap)); + + if (bitmap == NULL) + return FALSE; + + doc_ids->bitmap = bitmap; +- doc_ids->bound = bound; ++ doc_ids->max = max; + + for (unsigned int i = 0; i < arr->len; i++) { +- unsigned int doc_id = g_array_index(arr, unsigned int, i); +- bitmap[doc_id / sizeof (bitmap[0])] |= +- 1 << (doc_id % sizeof (bitmap[0])); ++ unsigned int doc_id = g_array_index (arr, unsigned int, i); ++ bitmap[BITMAP_WORD(doc_id)] |= 1 << BITMAP_BIT(doc_id); + } + + return TRUE; +@@ -282,19 +287,17 @@ notmuch_bool_t + _notmuch_doc_id_set_contains (notmuch_doc_id_set_t *doc_ids, + unsigned int doc_id) + { +- if (doc_id >= doc_ids->bound) ++ if (doc_id > doc_ids->max) + return FALSE; +- return (doc_ids->bitmap[doc_id / sizeof (doc_ids->bitmap[0])] & +- (1 << (doc_id % sizeof (doc_ids->bitmap[0])))) != 0; ++ return doc_ids->bitmap[BITMAP_WORD(doc_id)] & (1 << BITMAP_BIT(doc_id)); + } + + void + _notmuch_doc_id_set_remove (notmuch_doc_id_set_t *doc_ids, + unsigned int doc_id) + { +- if (doc_id < doc_ids->bound) +- doc_ids->bitmap[doc_id / sizeof (doc_ids->bitmap[0])] &= +- ~(1 << (doc_id % sizeof (doc_ids->bitmap[0]))); ++ if (doc_id <= doc_ids->max) ++ doc_ids->bitmap[BITMAP_WORD(doc_id)] &= ~(1 << BITMAP_BIT(doc_id)); + } + + /* Glib objects force use to use a talloc destructor as well, (but not +@@ -315,7 +318,6 @@ notmuch_query_search_threads (notmuch_query_t *query) + { + notmuch_threads_t *threads; + notmuch_messages_t *messages; +- Xapian::docid max_doc_id = 0; + + threads = talloc (query, notmuch_threads_t); + if (threads == NULL) +@@ -335,7 +337,6 @@ notmuch_query_search_threads (notmuch_query_t *query) + while (notmuch_messages_valid (messages)) { + unsigned int doc_id = _notmuch_mset_messages_get_doc_id (messages); + g_array_append_val (threads->doc_ids, doc_id); +- max_doc_id = MAX (max_doc_id, doc_id); + notmuch_messages_move_to_next (messages); + } + threads->doc_id_pos = 0; +@@ -343,7 +344,7 @@ notmuch_query_search_threads (notmuch_query_t *query) + talloc_free (messages); + + if (! _notmuch_doc_id_set_init (threads, &threads->match_set, +- threads->doc_ids, max_doc_id + 1)) { ++ threads->doc_ids)) { + talloc_free (threads); + return NULL; + } +-- +1.7.2.3 +