--- /dev/null
+Return-Path: <m.walters@qmul.ac.uk>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id 144B0431FB6\r
+ for <notmuch@notmuchmail.org>; Tue, 21 Oct 2014 16:32:36 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.098\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5\r
+ tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+ NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id orDRXjNKJbOW for <notmuch@notmuchmail.org>;\r
+ Tue, 21 Oct 2014 16:32:28 -0700 (PDT)\r
+Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])\r
+ (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 1F57D431FAE\r
+ for <notmuch@notmuchmail.org>; Tue, 21 Oct 2014 16:32:28 -0700 (PDT)\r
+Received: from smtp.qmul.ac.uk ([138.37.6.40])\r
+ by mail2.qmul.ac.uk with esmtp (Exim 4.71)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1XgiuL-0002un-SR; Wed, 22 Oct 2014 00:32:26 +0100\r
+Received: from 5751dfa2.skybroadband.com ([87.81.223.162] helo=localhost)\r
+ by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.71)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1XgiuL-0006Lw-AQ; Wed, 22 Oct 2014 00:32:05 +0100\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: Austin Clements <aclements@csail.mit.edu>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 00/12] Add ghost messages and fix thread linking\r
+In-Reply-To: <1412637438-4821-1-git-send-email-aclements@csail.mit.edu>\r
+References: <1412637438-4821-1-git-send-email-aclements@csail.mit.edu>\r
+User-Agent: Notmuch/0.18.1+86~gef5e66a (http://notmuchmail.org) Emacs/23.4.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Wed, 22 Oct 2014 00:32:03 +0100\r
+Message-ID: <8761fdrocs.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 87.81.223.162\r
+X-QM-Geographic: According to ripencc,\r
+ this message was delivered by a machine in Britain (UK) (GB).\r
+X-QM-SPAM-Info: Sender has good ham record. :)\r
+X-QM-Body-MD5: e0f4863151f97d6debbe100bbbb22c5d (of first 20000 bytes)\r
+X-SpamAssassin-Score: -0.1\r
+X-SpamAssassin-SpamBar: /\r
+X-SpamAssassin-Report: The QM spam filters have analysed this message to\r
+ determine if it is\r
+ spam. We require at least 5.0 points to mark a message as spam.\r
+ This message scored -0.1 points.\r
+ Summary of the scoring: \r
+ * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+ provider * (markwalters1009[at]gmail.com)\r
+ * -0.1 AWL AWL: From: address is in the auto white-list\r
+X-QM-Scan-Virus: ClamAV says the message is clean\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Tue, 21 Oct 2014 23:32:36 -0000\r
+\r
+\r
+On Tue, 07 Oct 2014, Austin Clements <aclements@csail.mit.edu> wrote:\r
+> This is v2 of the\r
+> id:1412345958-8278-1-git-send-email-aclements@csail.mit.edu. This\r
+> adds some comments and clarifies some code as suggested by David.\r
+> Patch 6 is new in v2 and adds some bit-twiddling macros for clarity\r
+> and robustness in later patches.\r
+\r
+Ok I have now been through the whole series and am basically happy with\r
+it (I sent some trivial comments separately). The tests pass, and my\r
+database still seems to work.\r
+\r
+So +1 from me but it is code I am not very familiar with so it's a\r
+slightly more cautious +1 than usual.\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+\r
+>\r
+> The diff from v1 is below.\r
+>\r
+> diff --git a/lib/database.cc b/lib/database.cc\r
+> index 4655f59..6e51a72 100644\r
+> --- a/lib/database.cc\r
+> +++ b/lib/database.cc\r
+> @@ -1277,6 +1277,8 @@ notmuch_database_upgrade (notmuch_database_t *notmuch,\r
+> ++total;\r
+> }\r
+> if (new_features & NOTMUCH_FEATURE_GHOSTS) {\r
+> + /* The ghost message upgrade converts all thread_id_*\r
+> + * metadata values into ghost message documents. */\r
+> t_end = db->metadata_keys_end ("thread_id_");\r
+> for (t = db->metadata_keys_begin ("thread_id_"); t != t_end; ++t)\r
+> ++total;\r
+> diff --git a/lib/message.cc b/lib/message.cc\r
+> index ad832cf..a7a13cc 100644\r
+> --- a/lib/message.cc\r
+> +++ b/lib/message.cc\r
+> @@ -344,15 +344,17 @@ _notmuch_message_ensure_metadata (notmuch_message_t *message)\r
+> \r
+> /* Get document type */\r
+> assert (strcmp (id_prefix, type_prefix) < 0);\r
+> - if (! (message->lazy_flags & (1 << NOTMUCH_MESSAGE_FLAG_GHOST))) {\r
+> + if (! NOTMUCH_TEST_BIT (message->lazy_flags, NOTMUCH_MESSAGE_FLAG_GHOST)) {\r
+> i.skip_to (type_prefix);\r
+> + /* "T" is the prefix "type" fields. See\r
+> + * BOOLEAN_PREFIX_INTERNAL. */\r
+> if (*i == "Tmail")\r
+> - message->flags &= ~(1 << NOTMUCH_MESSAGE_FLAG_GHOST);\r
+> + NOTMUCH_CLEAR_BIT (&message->flags, NOTMUCH_MESSAGE_FLAG_GHOST);\r
+> else if (*i == "Tghost")\r
+> - message->flags |= (1 << NOTMUCH_MESSAGE_FLAG_GHOST);\r
+> + NOTMUCH_SET_BIT (&message->flags, NOTMUCH_MESSAGE_FLAG_GHOST);\r
+> else\r
+> INTERNAL_ERROR ("Message without type term");\r
+> - message->lazy_flags |= (1 << NOTMUCH_MESSAGE_FLAG_GHOST);\r
+> + NOTMUCH_SET_BIT (&message->lazy_flags, NOTMUCH_MESSAGE_FLAG_GHOST);\r
+> }\r
+> \r
+> /* Get filename list. Here we get only the terms. We lazily\r
+> @@ -390,8 +392,8 @@ _notmuch_message_invalidate_metadata (notmuch_message_t *message,\r
+> }\r
+> \r
+> if (strcmp ("type", prefix_name) == 0) {\r
+> - message->flags &= ~(1 << NOTMUCH_MESSAGE_FLAG_GHOST);\r
+> - message->lazy_flags &= ~(1 << NOTMUCH_MESSAGE_FLAG_GHOST);\r
+> + NOTMUCH_CLEAR_BIT (&message->flags, NOTMUCH_MESSAGE_FLAG_GHOST);\r
+> + NOTMUCH_CLEAR_BIT (&message->lazy_flags, NOTMUCH_MESSAGE_FLAG_GHOST);\r
+> }\r
+> \r
+> if (strcmp ("file-direntry", prefix_name) == 0) {\r
+> @@ -893,10 +895,10 @@ notmuch_message_get_flag (notmuch_message_t *message,\r
+> notmuch_message_flag_t flag)\r
+> {\r
+> if (flag == NOTMUCH_MESSAGE_FLAG_GHOST &&\r
+> - ! (message->lazy_flags & (1 << flag)))\r
+> + ! NOTMUCH_TEST_BIT (message->lazy_flags, flag))\r
+> _notmuch_message_ensure_metadata (message);\r
+> \r
+> - return message->flags & (1 << flag);\r
+> + return NOTMUCH_TEST_BIT (message->flags, flag);\r
+> }\r
+> \r
+> void\r
+> @@ -904,10 +906,10 @@ notmuch_message_set_flag (notmuch_message_t *message,\r
+> notmuch_message_flag_t flag, notmuch_bool_t enable)\r
+> {\r
+> if (enable)\r
+> - message->flags |= (1 << flag);\r
+> + NOTMUCH_SET_BIT (&message->flags, flag);\r
+> else\r
+> - message->flags &= ~(1 << flag);\r
+> - message->lazy_flags |= (1 << flag);\r
+> + NOTMUCH_CLEAR_BIT (&message->flags, flag);\r
+> + NOTMUCH_SET_BIT (&message->lazy_flags, flag);\r
+> }\r
+> \r
+> time_t\r
+> diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h\r
+> index 2fbd38e..2f43c1d 100644\r
+> --- a/lib/notmuch-private.h\r
+> +++ b/lib/notmuch-private.h\r
+> @@ -63,6 +63,17 @@ NOTMUCH_BEGIN_DECLS\r
+> #define STRNCMP_LITERAL(var, literal) \\r
+> strncmp ((var), (literal), sizeof (literal) - 1)\r
+> \r
+> +/* Robust bit test/set/reset macros */\r
+> +#define NOTMUCH_TEST_BIT(val, bit) \\r
+> + ((bit < 0 || bit >= CHAR_BIT * sizeof (unsigned long long)) ? 0 \\r
+> + : !!((val) & (1ull << bit)))\r
+> +#define NOTMUCH_SET_BIT(valp, bit) \\r
+> + ((bit < 0 || bit >= CHAR_BIT * sizeof (unsigned long long)) ? *(valp) \\r
+> + : (*(valp) |= (1ull << bit)))\r
+> +#define NOTMUCH_CLEAR_BIT(valp, bit) \\r
+> + ((bit < 0 || bit >= CHAR_BIT * sizeof (unsigned long long)) ? *(valp) \\r
+> + : (*(valp) &= ~(1ull << bit)))\r
+> +\r
+> #define unused(x) x __attribute__ ((unused))\r
+> \r
+> #ifdef __cplusplus\r
+>\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r
projects / notmuch-archives.git / commitdiff