From: David Bremner <david@tethera.net>
To: Gregor Zattler <telegraph@gmx.net>, notmuch@notmuchmail.org
Subject: [PATCH] WIP: sort top level messages in thread
Date: Sun, 26 Aug 2018 22:53:53 -0300 [thread overview]
Message-ID: <20180827015353.23652-1-david@tethera.net> (raw)
In-Reply-To: <87va8unnor.fsf@len.workgroup>
this needs a test, and memory de-allocation of the replaced
lists. Currently it creates a fair amount of garbage.
---
Hi Gregor;
Sorry for the lack of reply, some vacation intervened. Can you test
this patch? I think it fixes the second thread also.
lib/message.cc | 43 +++++++++++++++++++++++--------------------
lib/notmuch-private.h | 5 +++--
lib/thread.cc | 9 ++-------
3 files changed, 28 insertions(+), 29 deletions(-)
diff --git a/lib/message.cc b/lib/message.cc
index 3c547298..f329be20 100644
--- a/lib/message.cc
+++ b/lib/message.cc
@@ -639,34 +639,37 @@ _cmpmsg (const void *pa, const void *pb)
return (int) difftime (time_a, time_b);
}
-void
-_notmuch_message_sort_subtree (notmuch_message_t *root)
-{
- size_t child_count = 0;
- size_t child_capacity = 16;
- notmuch_message_t **children = talloc_zero_array (root, notmuch_message_t *, child_capacity);
+notmuch_message_list_t *
+_notmuch_message_sort_subtrees (notmuch_message_list_t *list) {
+
+ size_t count = 0;
+ size_t capacity = 16;
- for (notmuch_messages_t *messages = _notmuch_messages_create (root->replies);
+ if (!list)
+ return list;
+
+ notmuch_message_t **message_array = talloc_zero_array (list, notmuch_message_t *, capacity);
+
+ for (notmuch_messages_t *messages = _notmuch_messages_create (list);
notmuch_messages_valid (messages);
notmuch_messages_move_to_next (messages)) {
- notmuch_message_t *child = notmuch_messages_get (messages);
- if (child_count >= child_capacity) {
- child_capacity *= 2;
- children = talloc_realloc (root, children, notmuch_message_t *, child_capacity);
+ notmuch_message_t *root = notmuch_messages_get (messages);
+ if (count >= capacity) {
+ capacity *= 2;
+ message_array = talloc_realloc (root, message_array, notmuch_message_t *, capacity);
}
- children[child_count++] = child;
- _notmuch_message_sort_subtree (child);
+ message_array[count++] = root;
+ root->replies = _notmuch_message_sort_subtrees (root->replies);
}
- notmuch_message_list_t *new_replies = _notmuch_message_list_create (root);
+ notmuch_message_list_t *new_list = _notmuch_message_list_create (list);
- qsort (children, child_count, sizeof (notmuch_message_t *), _cmpmsg);
- for (size_t i=0; i<child_count; i++){
- _notmuch_message_list_add_message (new_replies, children[i]);
+ qsort (message_array, count, sizeof (notmuch_message_t *), _cmpmsg);
+ for (size_t i=0; i<count; i++){
+ _notmuch_message_list_add_message (new_list, message_array[i]);
}
- talloc_free (root->replies);
- root->replies = new_replies;
- talloc_free (children);
+ talloc_free (message_array);
+ return new_list;
}
notmuch_messages_t *
diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h
index 67fd4990..64f4e982 100644
--- a/lib/notmuch-private.h
+++ b/lib/notmuch-private.h
@@ -558,8 +558,9 @@ size_t _notmuch_message_get_thread_depth (notmuch_message_t *message);
void
_notmuch_message_label_depths (notmuch_message_t *message,
size_t depth);
-void
-_notmuch_message_sort_subtree (notmuch_message_t *message);
+
+notmuch_message_list_t *
+_notmuch_message_sort_subtrees (notmuch_message_list_t *list);
/* sha1.c */
diff --git a/lib/thread.cc b/lib/thread.cc
index a5047103..e9e15a5c 100644
--- a/lib/thread.cc
+++ b/lib/thread.cc
@@ -505,13 +505,8 @@ _resolve_thread_relationships (notmuch_thread_t *thread)
_notmuch_message_list_add_message (thread->toplevel_list, message);
}
- for (notmuch_messages_t *messages = _notmuch_messages_create (thread->toplevel_list);
- notmuch_messages_valid (messages);
- notmuch_messages_move_to_next (messages))
- {
- notmuch_message_t *message = notmuch_messages_get (messages);
- _notmuch_message_sort_subtree (message);
- }
+ /* XXX this creates garbage */
+ thread->toplevel_list = _notmuch_message_sort_subtrees (thread->toplevel_list);
talloc_free (local);
}
--
2.18.0
next prev parent reply other threads:[~2018-08-27 1:54 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-30 22:45 Threading patches v2 David Bremner
2018-07-30 22:45 ` [PATCH 01/15] util: add DEBUG_PRINTF, rename error_util.h -> debug_print.h David Bremner
2018-07-30 22:45 ` [PATCH 02/15] test: start threading test corpus David Bremner
2018-07-30 22:45 ` [PATCH 03/15] test: add known broken tests for "ghost roots" David Bremner
2018-07-30 22:45 ` [PATCH 04/15] lib/thread: sort child messages by date David Bremner
2018-07-30 22:45 ` [PATCH 05/15] lib: read reference terms into message struct David Bremner
2018-07-30 22:45 ` [PATCH 06/15] lib/thread: refactor in-reply-to test David Bremner
2018-07-30 22:45 ` [PATCH 07/15] lib: calculate message depth in thread David Bremner
2018-07-30 22:45 ` [PATCH 08/15] lib/thread: rewrite _parent_or_toplevel to use depths David Bremner
2018-07-30 22:45 ` [PATCH 09/15] lib/thread: change _resolve_thread_relationships " David Bremner
2018-07-30 22:45 ` [PATCH 10/15] test: add known broken test for good In-Reply-To / bad References David Bremner
2018-07-30 22:45 ` [PATCH 11/15] test/thread-replies: mangle In-Reply-To's David Bremner
2018-07-30 22:45 ` [PATCH 12/15] util/string-util: export skip_space David Bremner
2018-07-30 22:45 ` [PATCH 13/15] lib: add _notmuch_message_id_parse_strict David Bremner
2018-08-01 0:46 ` Amin Bandali
2018-08-01 4:58 ` [Patch v1.1] " David Bremner
2018-07-30 22:45 ` [PATCH 14/15] lib: change parent strategy to use In-Reply-To if it looks sane David Bremner
2018-07-30 22:45 ` [PATCH 15/15] test: add known broken test for multiple thread terms per message David Bremner
2018-08-01 14:53 ` Threading patches v2 Gregor Zattler
2018-08-27 1:53 ` David Bremner [this message]
2018-08-27 13:44 ` [PATCH] WIP: sort top level messages in thread Gregor Zattler
2018-08-28 21:33 ` Amin Bandali
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180827015353.23652-1-david@tethera.net \
--to=david@tethera.net \
--cc=notmuch@notmuchmail.org \
--cc=telegraph@gmx.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).