1 Return-Path: <aclements@csail.mit.edu>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 1B883431FBF
\r
6 for <notmuch@notmuchmail.org>; Mon, 6 Oct 2014 16:17:30 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5
\r
12 tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id kqGYkVidWxFZ for <notmuch@notmuchmail.org>;
\r
16 Mon, 6 Oct 2014 16:17:26 -0700 (PDT)
\r
17 Received: from dmz-mailsec-scanner-3.mit.edu (dmz-mailsec-scanner-3.mit.edu
\r
19 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
\r
20 (No client certificate requested)
\r
21 by olra.theworths.org (Postfix) with ESMTPS id B04A2431FAE
\r
22 for <notmuch@notmuchmail.org>; Mon, 6 Oct 2014 16:17:26 -0700 (PDT)
\r
23 X-AuditID: 1209190e-f79d46d000003643-42-5433230508c4
\r
24 Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])
\r
25 (using TLS with cipher AES256-SHA (256/256 bits))
\r
26 (Client did not present a certificate)
\r
27 by dmz-mailsec-scanner-3.mit.edu (Symantec Messaging Gateway) with SMTP
\r
28 id 99.5D.13891.50323345; Mon, 6 Oct 2014 19:17:25 -0400 (EDT)
\r
29 Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])
\r
30 by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id s96NHPVd025203;
\r
31 Mon, 6 Oct 2014 19:17:25 -0400
\r
32 Received: from drake.dyndns.org ([12.185.136.2]) (authenticated bits=0)
\r
33 (User authenticated as amdragon@ATHENA.MIT.EDU)
\r
34 by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id s96NHMsj014457
\r
35 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT);
\r
36 Mon, 6 Oct 2014 19:17:24 -0400
\r
37 Received: from amthrax by drake.dyndns.org with local (Exim 4.84)
\r
38 (envelope-from <aclements@csail.mit.edu>)
\r
39 id 1XbHWr-0001JF-ED; Mon, 06 Oct 2014 17:17:21 -0600
\r
40 From: Austin Clements <aclements@csail.mit.edu>
\r
41 To: notmuch@notmuchmail.org
\r
42 Subject: [PATCH 00/12] Add ghost messages and fix thread linking
\r
43 Date: Mon, 6 Oct 2014 17:17:06 -0600
\r
44 Message-Id: <1412637438-4821-1-git-send-email-aclements@csail.mit.edu>
\r
45 X-Mailer: git-send-email 2.1.0
\r
46 X-Brightmail-Tracker:
\r
47 H4sIAAAAAAAAA+NgFlrKIsWRmVeSWpSXmKPExsUixG6nosuqbBxi0DXT0OJGazejxfWbM5kd
\r
48 mDyerbrF7LHl0HvmAKYoLpuU1JzMstQifbsErowzy9+xFmxSqJg57R9jA+M8qS5GTg4JAROJ
\r
49 yce3MkLYYhIX7q1n62Lk4hASmM0ksfvqXEYIZwOjRMOpJlYIZymTxM3Xe9hBWoQEljBK3LkI
\r
50 ZrMJ6EusWDuJFcQWEZCW2Hl3NpjNLCAqMef/PTBbWMBB4lVjIxOIzSKgKvHk6x8wm1fATWL9
\r
51 /MUsEGfISWzY/Z9xAiPvAkaGVYyyKblVurmJmTnFqcm6xcmJeXmpRbrGermZJXqpKaWbGEGh
\r
52 wSnJt4Px60GlQ4wCHIxKPLwROwxDhFgTy4orcw8xSnIwKYnyzmE3DhHiS8pPqcxILM6ILyrN
\r
53 SS0+xCjBwawkwsv12yhEiDclsbIqtSgfJiXNwaIkzrvpB1+IkEB6YklqdmpqQWoRTFaGg0NJ
\r
54 gveQItBQwaLU9NSKtMycEoQ0EwcnyHAeoOH/QGp4iwsSc4sz0yHypxgVpcR5k5WAEgIgiYzS
\r
55 PLheWOy+YhQHekWY9yZIOw8w7uG6XwENZgIabDpHH2RwSSJCSqqBcVHIKUb/T+UXP7Rm+Ean
\r
56 6l73bGH8b3fhJvei3Gbe/u+b6vwP3j/KlrL8jVGpWGHBOsX604eOxdhJfpzcs3n2omTO6ZwM
\r
57 s77rL39lNmF+bENgaurtEmX/+KX7sm/ve7PpJnNMq/7TX1Wt+lt92R7lpFmK3wn6rDWt5mJZ
\r
58 vsGunSnTguVi7hpPVGIpzkg01GIuKk4EAJjvj4S4AgAA
\r
59 X-BeenThere: notmuch@notmuchmail.org
\r
60 X-Mailman-Version: 2.1.13
\r
62 List-Id: "Use and development of the notmuch mail system."
\r
63 <notmuch.notmuchmail.org>
\r
64 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
65 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
66 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
67 List-Post: <mailto:notmuch@notmuchmail.org>
\r
68 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
69 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
70 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
71 X-List-Received-Date: Mon, 06 Oct 2014 23:17:30 -0000
\r
74 id:1412345958-8278-1-git-send-email-aclements@csail.mit.edu. This
\r
75 adds some comments and clarifies some code as suggested by David.
\r
76 Patch 6 is new in v2 and adds some bit-twiddling macros for clarity
\r
77 and robustness in later patches.
\r
79 The diff from v1 is below.
\r
81 diff --git a/lib/database.cc b/lib/database.cc
\r
82 index 4655f59..6e51a72 100644
\r
83 --- a/lib/database.cc
\r
84 +++ b/lib/database.cc
\r
85 @@ -1277,6 +1277,8 @@ notmuch_database_upgrade (notmuch_database_t *notmuch,
\r
88 if (new_features & NOTMUCH_FEATURE_GHOSTS) {
\r
89 + /* The ghost message upgrade converts all thread_id_*
\r
90 + * metadata values into ghost message documents. */
\r
91 t_end = db->metadata_keys_end ("thread_id_");
\r
92 for (t = db->metadata_keys_begin ("thread_id_"); t != t_end; ++t)
\r
94 diff --git a/lib/message.cc b/lib/message.cc
\r
95 index ad832cf..a7a13cc 100644
\r
96 --- a/lib/message.cc
\r
97 +++ b/lib/message.cc
\r
98 @@ -344,15 +344,17 @@ _notmuch_message_ensure_metadata (notmuch_message_t *message)
\r
100 /* Get document type */
\r
101 assert (strcmp (id_prefix, type_prefix) < 0);
\r
102 - if (! (message->lazy_flags & (1 << NOTMUCH_MESSAGE_FLAG_GHOST))) {
\r
103 + if (! NOTMUCH_TEST_BIT (message->lazy_flags, NOTMUCH_MESSAGE_FLAG_GHOST)) {
\r
104 i.skip_to (type_prefix);
\r
105 + /* "T" is the prefix "type" fields. See
\r
106 + * BOOLEAN_PREFIX_INTERNAL. */
\r
108 - message->flags &= ~(1 << NOTMUCH_MESSAGE_FLAG_GHOST);
\r
109 + NOTMUCH_CLEAR_BIT (&message->flags, NOTMUCH_MESSAGE_FLAG_GHOST);
\r
110 else if (*i == "Tghost")
\r
111 - message->flags |= (1 << NOTMUCH_MESSAGE_FLAG_GHOST);
\r
112 + NOTMUCH_SET_BIT (&message->flags, NOTMUCH_MESSAGE_FLAG_GHOST);
\r
114 INTERNAL_ERROR ("Message without type term");
\r
115 - message->lazy_flags |= (1 << NOTMUCH_MESSAGE_FLAG_GHOST);
\r
116 + NOTMUCH_SET_BIT (&message->lazy_flags, NOTMUCH_MESSAGE_FLAG_GHOST);
\r
119 /* Get filename list. Here we get only the terms. We lazily
\r
120 @@ -390,8 +392,8 @@ _notmuch_message_invalidate_metadata (notmuch_message_t *message,
\r
123 if (strcmp ("type", prefix_name) == 0) {
\r
124 - message->flags &= ~(1 << NOTMUCH_MESSAGE_FLAG_GHOST);
\r
125 - message->lazy_flags &= ~(1 << NOTMUCH_MESSAGE_FLAG_GHOST);
\r
126 + NOTMUCH_CLEAR_BIT (&message->flags, NOTMUCH_MESSAGE_FLAG_GHOST);
\r
127 + NOTMUCH_CLEAR_BIT (&message->lazy_flags, NOTMUCH_MESSAGE_FLAG_GHOST);
\r
130 if (strcmp ("file-direntry", prefix_name) == 0) {
\r
131 @@ -893,10 +895,10 @@ notmuch_message_get_flag (notmuch_message_t *message,
\r
132 notmuch_message_flag_t flag)
\r
134 if (flag == NOTMUCH_MESSAGE_FLAG_GHOST &&
\r
135 - ! (message->lazy_flags & (1 << flag)))
\r
136 + ! NOTMUCH_TEST_BIT (message->lazy_flags, flag))
\r
137 _notmuch_message_ensure_metadata (message);
\r
139 - return message->flags & (1 << flag);
\r
140 + return NOTMUCH_TEST_BIT (message->flags, flag);
\r
144 @@ -904,10 +906,10 @@ notmuch_message_set_flag (notmuch_message_t *message,
\r
145 notmuch_message_flag_t flag, notmuch_bool_t enable)
\r
148 - message->flags |= (1 << flag);
\r
149 + NOTMUCH_SET_BIT (&message->flags, flag);
\r
151 - message->flags &= ~(1 << flag);
\r
152 - message->lazy_flags |= (1 << flag);
\r
153 + NOTMUCH_CLEAR_BIT (&message->flags, flag);
\r
154 + NOTMUCH_SET_BIT (&message->lazy_flags, flag);
\r
158 diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h
\r
159 index 2fbd38e..2f43c1d 100644
\r
160 --- a/lib/notmuch-private.h
\r
161 +++ b/lib/notmuch-private.h
\r
162 @@ -63,6 +63,17 @@ NOTMUCH_BEGIN_DECLS
\r
163 #define STRNCMP_LITERAL(var, literal) \
\r
164 strncmp ((var), (literal), sizeof (literal) - 1)
\r
166 +/* Robust bit test/set/reset macros */
\r
167 +#define NOTMUCH_TEST_BIT(val, bit) \
\r
168 + ((bit < 0 || bit >= CHAR_BIT * sizeof (unsigned long long)) ? 0 \
\r
169 + : !!((val) & (1ull << bit)))
\r
170 +#define NOTMUCH_SET_BIT(valp, bit) \
\r
171 + ((bit < 0 || bit >= CHAR_BIT * sizeof (unsigned long long)) ? *(valp) \
\r
172 + : (*(valp) |= (1ull << bit)))
\r
173 +#define NOTMUCH_CLEAR_BIT(valp, bit) \
\r
174 + ((bit < 0 || bit >= CHAR_BIT * sizeof (unsigned long long)) ? *(valp) \
\r
175 + : (*(valp) &= ~(1ull << bit)))
\r
177 #define unused(x) x __attribute__ ((unused))
\r