--- /dev/null
+Return-Path: <amdragon@mit.edu>\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 59BD9431FAF\r
+ for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 20:57:21 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+ tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 p-g33t5ItADr for <notmuch@notmuchmail.org>;\r
+ Sat, 24 Nov 2012 20:57:20 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-7.mit.edu (DMZ-MAILSEC-SCANNER-7.MIT.EDU\r
+ [18.7.68.36])\r
+ by olra.theworths.org (Postfix) with ESMTP id 8F525431FBF\r
+ for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 20:57:19 -0800 (PST)\r
+X-AuditID: 12074424-b7fce6d000000925-3c-50b1a52e6a56\r
+Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
+ by dmz-mailsec-scanner-7.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id C0.DA.02341.E25A1B05; Sat, 24 Nov 2012 23:57:18 -0500 (EST)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+ by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id qAP4vHTg018857; \r
+ Sat, 24 Nov 2012 23:57:17 -0500\r
+Received: from drake.dyndns.org\r
+ (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+ [209.6.116.242]) (authenticated bits=0)\r
+ (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+ by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id qAP4vEDW000082\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Sat, 24 Nov 2012 23:57:16 -0500 (EST)\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+ (envelope-from <amdragon@mit.edu>)\r
+ id 1TcUHJ-0003Zn-Ss; Sat, 24 Nov 2012 23:57:13 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/6] lib: Separate list of all messages from top-level\r
+ messages\r
+Date: Sat, 24 Nov 2012 23:57:03 -0500\r
+Message-Id: <1353819427-13182-3-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1353819427-13182-1-git-send-email-amdragon@mit.edu>\r
+References: <1353819427-13182-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrDIsWRmVeSWpSXmKPExsUixCmqrau3dGOAweR/shar5/JYXL85k9mB\r
+ yWPnrLvsHs9W3WIOYIrisklJzcksSy3St0vgytjYNY294L9cxarT95gaGF9JdDFyckgImEis\r
+ +HqDDcIWk7hwbz2QzcUhJLCPUeLEjrPsEM4GRolHZ86zQjiPmCS2nrkFVTaXUWJz81kWkH42\r
+ AQ2JbfuXM4LYIgLSEjvvzmYFsZkFHCU+718EtkNYwF/i/r4msDiLgKrEyU07wWxeAQeJuXd2\r
+ M0LcoSjR/WwCUD0HBydQb+NeOZCwEFDJrX+TmCcw8i9gZFjFKJuSW6Wbm5iZU5yarFucnJiX\r
+ l1qka66Xm1mil5pSuokRFEjsLio7GJsPKR1iFOBgVOLhvZG4MUCINbGsuDL3EKMkB5OSKG/m\r
+ IqAQX1J+SmVGYnFGfFFpTmrxIUYJDmYlEV5rVaAcb0piZVVqUT5MSpqDRUmc93rKTX8hgfTE\r
+ ktTs1NSC1CKYrAwHh5IEr8gSoEbBotT01Iq0zJwShDQTByfIcB6g4aIgNbzFBYm5xZnpEPlT\r
+ jIpS4rzmIAkBkERGaR5cLyzSXzGKA70izOsAUsUDTBJw3a+ABjMBDX46ex3I4JJEhJRUA2N0\r
+ jJWA01Nd8wdnjjdWcTyZYXwo/NmhHB2WSSfqwtv2XvmqGyRiFpUvqiX5NeN8z9+61vid039c\r
+ lXoUGp+5OMWOXXBWhZ/lXRaZKfUTWOeUd+yL4Vv088FH7irpc/4ec80FUm5ufriroEpi5X8V\r
+ G6vURTMX3H66fsHXgJpj25quWLfrPWTic1FiKc5INNRiLipOBACvrW8czwIAAA==\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: Sun, 25 Nov 2012 04:57:21 -0000\r
+\r
+Previously, thread.cc built up a list of all messages, then\r
+proceeded to tear it apart to transform it into a list of\r
+top-level messages. Now we simply build a new list of top-level\r
+messages.\r
+\r
+This simplifies the interface to _notmuch_message_add_reply,\r
+eliminates the pointer acrobatics from\r
+_resolve_thread_relationships, and will enable us to do things\r
+with the list of all messages in the following patches.\r
+---\r
+ lib/message.cc | 4 ++--\r
+ lib/notmuch-private.h | 2 +-\r
+ lib/thread.cc | 29 ++++++++++++++---------------\r
+ 3 files changed, 17 insertions(+), 18 deletions(-)\r
+\r
+diff --git a/lib/message.cc b/lib/message.cc\r
+index 978de06..171c580 100644\r
+--- a/lib/message.cc\r
++++ b/lib/message.cc\r
+@@ -462,9 +462,9 @@ notmuch_message_get_thread_id (notmuch_message_t *message)\r
+ \r
+ void\r
+ _notmuch_message_add_reply (notmuch_message_t *message,\r
+- notmuch_message_node_t *reply)\r
++ notmuch_message_t *reply)\r
+ {\r
+- _notmuch_message_list_append (message->replies, reply);\r
++ _notmuch_message_list_add_message (message->replies, reply);\r
+ }\r
+ \r
+ notmuch_messages_t *\r
+diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h\r
+index 7a409f5..c054a0e 100644\r
+--- a/lib/notmuch-private.h\r
++++ b/lib/notmuch-private.h\r
+@@ -462,7 +462,7 @@ _notmuch_doc_id_set_remove (notmuch_doc_id_set_t *doc_ids,\r
+ \r
+ void\r
+ _notmuch_message_add_reply (notmuch_message_t *message,\r
+- notmuch_message_node_t *reply);\r
++ notmuch_message_t *reply);\r
+ \r
+ /* sha1.c */\r
+ \r
+diff --git a/lib/thread.cc b/lib/thread.cc\r
+index aed87b1..45a7d1d 100644\r
+--- a/lib/thread.cc\r
++++ b/lib/thread.cc\r
+@@ -35,7 +35,11 @@ struct visible _notmuch_thread {\r
+ char *authors;\r
+ GHashTable *tags;\r
+ \r
++ /* All messages, oldest first. */\r
+ notmuch_message_list_t *message_list;\r
++ /* Top-level messages, oldest first. */\r
++ notmuch_message_list_t *toplevel_list;\r
++\r
+ GHashTable *message_hash;\r
+ int total_messages;\r
+ int matched_messages;\r
+@@ -345,29 +349,22 @@ _thread_add_matched_message (notmuch_thread_t *thread,\r
+ }\r
+ \r
+ static void\r
+-_resolve_thread_relationships (unused (notmuch_thread_t *thread))\r
++_resolve_thread_relationships (notmuch_thread_t *thread)\r
+ {\r
+- notmuch_message_node_t **prev, *node;\r
++ notmuch_message_node_t *node;\r
+ notmuch_message_t *message, *parent;\r
+ const char *in_reply_to;\r
+ \r
+- prev = &thread->message_list->head;\r
+- while ((node = *prev)) {\r
++ for (node = thread->message_list->head; node; node = node->next) {\r
+ message = node->message;\r
+ in_reply_to = _notmuch_message_get_in_reply_to (message);\r
+ if (in_reply_to && strlen (in_reply_to) &&\r
+ g_hash_table_lookup_extended (thread->message_hash,\r
+ in_reply_to, NULL,\r
+ (void **) &parent))\r
+- {\r
+- *prev = node->next;\r
+- if (thread->message_list->tail == &node->next)\r
+- thread->message_list->tail = prev;\r
+- node->next = NULL;\r
+- _notmuch_message_add_reply (parent, node);\r
+- } else {\r
+- prev = &((*prev)->next);\r
+- }\r
++ _notmuch_message_add_reply (parent, message);\r
++ else\r
++ _notmuch_message_list_add_message (thread->toplevel_list, message);\r
+ }\r
+ \r
+ /* XXX: After scanning through the entire list looking for parents\r
+@@ -451,7 +448,9 @@ _notmuch_thread_create (void *ctx,\r
+ free, NULL);\r
+ \r
+ thread->message_list = _notmuch_message_list_create (thread);\r
+- if (unlikely (thread->message_list == NULL)) {\r
++ thread->toplevel_list = _notmuch_message_list_create (thread);\r
++ if (unlikely (thread->message_list == NULL ||\r
++ thread->toplevel_list == NULL)) {\r
+ thread = NULL;\r
+ goto DONE;\r
+ }\r
+@@ -506,7 +505,7 @@ _notmuch_thread_create (void *ctx,\r
+ notmuch_messages_t *\r
+ notmuch_thread_get_toplevel_messages (notmuch_thread_t *thread)\r
+ {\r
+- return _notmuch_messages_create (thread->message_list);\r
++ return _notmuch_messages_create (thread->toplevel_list);\r
+ }\r
+ \r
+ const char *\r
+-- \r
+1.7.10.4\r
+\r
projects / notmuch-archives.git / commitdiff