2018-09-14 02:34:40 +00:00
|
|
|
/*
|
|
|
|
* Copyright © 2018 Benjamin Otte
|
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* Lesser General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
|
|
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
*
|
|
|
|
* Authors: Benjamin Otte <otte@gnome.org>
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "config.h"
|
|
|
|
|
|
|
|
#include "gtksortlistmodel.h"
|
|
|
|
|
|
|
|
#include "gtkintl.h"
|
|
|
|
#include "gtkprivate.h"
|
2020-07-17 00:47:22 +00:00
|
|
|
#include "gtktimsortprivate.h"
|
2018-09-14 02:34:40 +00:00
|
|
|
|
2020-07-18 02:45:46 +00:00
|
|
|
/* The maximum amount of items to merge for a single merge step
|
|
|
|
*
|
|
|
|
* Making this smaller will result in more steps, which has more overhead and slows
|
|
|
|
* down total sort time.
|
|
|
|
* Making it larger will result in fewer steps, which increases the time taken for
|
|
|
|
* a single step.
|
|
|
|
*
|
|
|
|
* As merges are the most expensive steps, this is essentially a tunable for the
|
|
|
|
* longest time spent in gtk_tim_sort_step().
|
|
|
|
*
|
|
|
|
* Note that this should be reset to 0 when not doing incremental sorting to get
|
|
|
|
* rid of all the overhead.
|
|
|
|
*/
|
|
|
|
#define GTK_SORT_MAX_MERGE_SIZE (1024)
|
|
|
|
|
2020-07-20 23:40:06 +00:00
|
|
|
/* Time we spend in the sort callback before returning to the main loop
|
|
|
|
*
|
|
|
|
* Increasing this number will make the callback take longer and potentially
|
|
|
|
* reduce responsiveness of an application, but will increase the amount of
|
|
|
|
* work done per step. And we emit an ::items-changed() signal after every
|
|
|
|
* step, so if we can avoid that, we recuce the overhead in the list widget
|
|
|
|
* and in turn reduce the total sort time.
|
|
|
|
*/
|
|
|
|
#define GTK_SORT_STEP_TIME_US (1000) /* 1 millisecond */
|
|
|
|
|
2018-09-14 02:34:40 +00:00
|
|
|
/**
|
|
|
|
* SECTION:gtksortlistmodel
|
|
|
|
* @title: GtkSortListModel
|
2019-02-24 20:29:08 +00:00
|
|
|
* @short_description: A list model that sorts its items
|
2019-12-03 04:44:22 +00:00
|
|
|
* @see_also: #GListModel, #GtkSorter
|
2018-09-14 02:34:40 +00:00
|
|
|
*
|
|
|
|
* #GtkSortListModel is a list model that takes a list model and
|
2019-12-03 04:44:22 +00:00
|
|
|
* sorts its elements according to a #GtkSorter.
|
2018-09-14 02:34:40 +00:00
|
|
|
*
|
|
|
|
* #GtkSortListModel is a generic model and because of that it
|
|
|
|
* cannot take advantage of any external knowledge when sorting.
|
|
|
|
* If you run into performance issues with #GtkSortListModel, it
|
|
|
|
* is strongly recommended that you write your own sorting list
|
|
|
|
* model.
|
|
|
|
*/
|
|
|
|
|
|
|
|
enum {
|
|
|
|
PROP_0,
|
2020-07-21 00:50:45 +00:00
|
|
|
PROP_INCREMENTAL,
|
2018-09-14 02:34:40 +00:00
|
|
|
PROP_MODEL,
|
2019-12-03 04:44:22 +00:00
|
|
|
PROP_SORTER,
|
2018-09-14 02:34:40 +00:00
|
|
|
NUM_PROPERTIES
|
|
|
|
};
|
|
|
|
|
|
|
|
struct _GtkSortListModel
|
|
|
|
{
|
|
|
|
GObject parent_instance;
|
|
|
|
|
|
|
|
GListModel *model;
|
2019-12-03 04:44:22 +00:00
|
|
|
GtkSorter *sorter;
|
2020-07-21 00:50:45 +00:00
|
|
|
gboolean incremental;
|
2018-09-14 02:34:40 +00:00
|
|
|
|
2020-07-20 23:46:09 +00:00
|
|
|
GtkTimSort sort; /* ongoing sort operation */
|
|
|
|
guint sort_cb; /* 0 or current ongoing sort callback */
|
sortlistmodel: Split the SortItem into 2 arrays
Instead of one item keeping the item + its position and sorting that
list, keep the items in 1 array and put the positions into a 2nd array.
This is generally slower while sorting, but allows multiple improvements:
1. We can replace items with keys
This allows avoiding multiple slow lookups when using complex
comparisons
2. We can keep multiple position arrays
This allows doing a sorting in the background without actually
emitting items-changed() until the array is completely sorted.
3. The main list tracks the items in the original model
So only a single memmove() is necessary there, while the old version
had to upgrade the position in every item.
Benchmarks:
sorting a model of simple strings
old new
256,000 items 256ms 268ms
512,000 items 569ms 638ms
sorting a model of file trees, directories first, by size
old new
64,000 items 350ms 364ms
128,000 items 667ms 691ms
removing half the model
old new
512,000 items 24ms 15ms
1,024,000 items 49ms 25ms
2020-07-21 01:09:10 +00:00
|
|
|
|
|
|
|
guint n_items;
|
|
|
|
gpointer *keys;
|
|
|
|
gpointer *positions;
|
2018-09-14 02:34:40 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
struct _GtkSortListModelClass
|
|
|
|
{
|
|
|
|
GObjectClass parent_class;
|
|
|
|
};
|
|
|
|
|
|
|
|
static GParamSpec *properties[NUM_PROPERTIES] = { NULL, };
|
|
|
|
|
sortlistmodel: Split the SortItem into 2 arrays
Instead of one item keeping the item + its position and sorting that
list, keep the items in 1 array and put the positions into a 2nd array.
This is generally slower while sorting, but allows multiple improvements:
1. We can replace items with keys
This allows avoiding multiple slow lookups when using complex
comparisons
2. We can keep multiple position arrays
This allows doing a sorting in the background without actually
emitting items-changed() until the array is completely sorted.
3. The main list tracks the items in the original model
So only a single memmove() is necessary there, while the old version
had to upgrade the position in every item.
Benchmarks:
sorting a model of simple strings
old new
256,000 items 256ms 268ms
512,000 items 569ms 638ms
sorting a model of file trees, directories first, by size
old new
64,000 items 350ms 364ms
128,000 items 667ms 691ms
removing half the model
old new
512,000 items 24ms 15ms
1,024,000 items 49ms 25ms
2020-07-21 01:09:10 +00:00
|
|
|
static guint
|
|
|
|
pos_from_key (GtkSortListModel *self,
|
|
|
|
gpointer key)
|
|
|
|
{
|
|
|
|
guint pos = (gpointer *) key - self->keys;
|
|
|
|
|
|
|
|
g_assert (pos < self->n_items);
|
|
|
|
|
|
|
|
return pos;
|
|
|
|
}
|
|
|
|
|
|
|
|
static gpointer
|
|
|
|
key_from_pos (GtkSortListModel *self,
|
|
|
|
guint pos)
|
|
|
|
{
|
|
|
|
return self->keys + pos;
|
|
|
|
}
|
|
|
|
|
2018-09-14 02:34:40 +00:00
|
|
|
static GType
|
|
|
|
gtk_sort_list_model_get_item_type (GListModel *list)
|
|
|
|
{
|
2020-07-04 19:47:48 +00:00
|
|
|
return G_TYPE_OBJECT;
|
2018-09-14 02:34:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static guint
|
|
|
|
gtk_sort_list_model_get_n_items (GListModel *list)
|
|
|
|
{
|
|
|
|
GtkSortListModel *self = GTK_SORT_LIST_MODEL (list);
|
|
|
|
|
|
|
|
if (self->model == NULL)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
return g_list_model_get_n_items (self->model);
|
|
|
|
}
|
|
|
|
|
|
|
|
static gpointer
|
|
|
|
gtk_sort_list_model_get_item (GListModel *list,
|
|
|
|
guint position)
|
|
|
|
{
|
|
|
|
GtkSortListModel *self = GTK_SORT_LIST_MODEL (list);
|
|
|
|
|
|
|
|
if (self->model == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
sortlistmodel: Split the SortItem into 2 arrays
Instead of one item keeping the item + its position and sorting that
list, keep the items in 1 array and put the positions into a 2nd array.
This is generally slower while sorting, but allows multiple improvements:
1. We can replace items with keys
This allows avoiding multiple slow lookups when using complex
comparisons
2. We can keep multiple position arrays
This allows doing a sorting in the background without actually
emitting items-changed() until the array is completely sorted.
3. The main list tracks the items in the original model
So only a single memmove() is necessary there, while the old version
had to upgrade the position in every item.
Benchmarks:
sorting a model of simple strings
old new
256,000 items 256ms 268ms
512,000 items 569ms 638ms
sorting a model of file trees, directories first, by size
old new
64,000 items 350ms 364ms
128,000 items 667ms 691ms
removing half the model
old new
512,000 items 24ms 15ms
1,024,000 items 49ms 25ms
2020-07-21 01:09:10 +00:00
|
|
|
if (self->positions)
|
|
|
|
position = pos_from_key (self, self->positions[position]);
|
2018-09-14 02:34:40 +00:00
|
|
|
|
sortlistmodel: Split the SortItem into 2 arrays
Instead of one item keeping the item + its position and sorting that
list, keep the items in 1 array and put the positions into a 2nd array.
This is generally slower while sorting, but allows multiple improvements:
1. We can replace items with keys
This allows avoiding multiple slow lookups when using complex
comparisons
2. We can keep multiple position arrays
This allows doing a sorting in the background without actually
emitting items-changed() until the array is completely sorted.
3. The main list tracks the items in the original model
So only a single memmove() is necessary there, while the old version
had to upgrade the position in every item.
Benchmarks:
sorting a model of simple strings
old new
256,000 items 256ms 268ms
512,000 items 569ms 638ms
sorting a model of file trees, directories first, by size
old new
64,000 items 350ms 364ms
128,000 items 667ms 691ms
removing half the model
old new
512,000 items 24ms 15ms
1,024,000 items 49ms 25ms
2020-07-21 01:09:10 +00:00
|
|
|
return g_list_model_get_item (self->model, position);
|
2018-09-14 02:34:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_sort_list_model_model_init (GListModelInterface *iface)
|
|
|
|
{
|
|
|
|
iface->get_item_type = gtk_sort_list_model_get_item_type;
|
|
|
|
iface->get_n_items = gtk_sort_list_model_get_n_items;
|
|
|
|
iface->get_item = gtk_sort_list_model_get_item;
|
|
|
|
}
|
|
|
|
|
|
|
|
G_DEFINE_TYPE_WITH_CODE (GtkSortListModel, gtk_sort_list_model, G_TYPE_OBJECT,
|
|
|
|
G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL, gtk_sort_list_model_model_init))
|
|
|
|
|
2020-07-20 23:46:09 +00:00
|
|
|
static gboolean
|
|
|
|
gtk_sort_list_model_is_sorting (GtkSortListModel *self)
|
|
|
|
{
|
|
|
|
return self->sort_cb != 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2020-07-21 00:50:45 +00:00
|
|
|
gtk_sort_list_model_stop_sorting (GtkSortListModel *self,
|
|
|
|
gsize *runs)
|
2020-07-20 23:46:09 +00:00
|
|
|
{
|
|
|
|
if (self->sort_cb == 0)
|
2020-07-21 00:50:45 +00:00
|
|
|
{
|
|
|
|
if (runs)
|
|
|
|
{
|
sortlistmodel: Split the SortItem into 2 arrays
Instead of one item keeping the item + its position and sorting that
list, keep the items in 1 array and put the positions into a 2nd array.
This is generally slower while sorting, but allows multiple improvements:
1. We can replace items with keys
This allows avoiding multiple slow lookups when using complex
comparisons
2. We can keep multiple position arrays
This allows doing a sorting in the background without actually
emitting items-changed() until the array is completely sorted.
3. The main list tracks the items in the original model
So only a single memmove() is necessary there, while the old version
had to upgrade the position in every item.
Benchmarks:
sorting a model of simple strings
old new
256,000 items 256ms 268ms
512,000 items 569ms 638ms
sorting a model of file trees, directories first, by size
old new
64,000 items 350ms 364ms
128,000 items 667ms 691ms
removing half the model
old new
512,000 items 24ms 15ms
1,024,000 items 49ms 25ms
2020-07-21 01:09:10 +00:00
|
|
|
runs[0] = self->n_items;
|
2020-07-21 00:50:45 +00:00
|
|
|
runs[1] = 0;
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
2020-07-20 23:46:09 +00:00
|
|
|
|
2020-07-21 00:50:45 +00:00
|
|
|
if (runs)
|
|
|
|
gtk_tim_sort_get_runs (&self->sort, runs);
|
2020-07-20 23:46:09 +00:00
|
|
|
gtk_tim_sort_finish (&self->sort);
|
|
|
|
g_clear_handle_id (&self->sort_cb, g_source_remove);
|
|
|
|
}
|
|
|
|
|
2020-07-20 23:40:06 +00:00
|
|
|
static gboolean
|
|
|
|
gtk_sort_list_model_sort_step (GtkSortListModel *self,
|
2020-07-21 00:50:45 +00:00
|
|
|
gboolean finish,
|
2020-07-20 23:40:06 +00:00
|
|
|
guint *out_position,
|
|
|
|
guint *out_n_items)
|
|
|
|
{
|
|
|
|
gint64 end_time = g_get_monotonic_time ();
|
|
|
|
gboolean result = FALSE;
|
|
|
|
GtkTimSortRun change;
|
sortlistmodel: Split the SortItem into 2 arrays
Instead of one item keeping the item + its position and sorting that
list, keep the items in 1 array and put the positions into a 2nd array.
This is generally slower while sorting, but allows multiple improvements:
1. We can replace items with keys
This allows avoiding multiple slow lookups when using complex
comparisons
2. We can keep multiple position arrays
This allows doing a sorting in the background without actually
emitting items-changed() until the array is completely sorted.
3. The main list tracks the items in the original model
So only a single memmove() is necessary there, while the old version
had to upgrade the position in every item.
Benchmarks:
sorting a model of simple strings
old new
256,000 items 256ms 268ms
512,000 items 569ms 638ms
sorting a model of file trees, directories first, by size
old new
64,000 items 350ms 364ms
128,000 items 667ms 691ms
removing half the model
old new
512,000 items 24ms 15ms
1,024,000 items 49ms 25ms
2020-07-21 01:09:10 +00:00
|
|
|
gpointer *start_change, *end_change;
|
2020-07-20 23:40:06 +00:00
|
|
|
|
|
|
|
end_time += GTK_SORT_STEP_TIME_US;
|
sortlistmodel: Split the SortItem into 2 arrays
Instead of one item keeping the item + its position and sorting that
list, keep the items in 1 array and put the positions into a 2nd array.
This is generally slower while sorting, but allows multiple improvements:
1. We can replace items with keys
This allows avoiding multiple slow lookups when using complex
comparisons
2. We can keep multiple position arrays
This allows doing a sorting in the background without actually
emitting items-changed() until the array is completely sorted.
3. The main list tracks the items in the original model
So only a single memmove() is necessary there, while the old version
had to upgrade the position in every item.
Benchmarks:
sorting a model of simple strings
old new
256,000 items 256ms 268ms
512,000 items 569ms 638ms
sorting a model of file trees, directories first, by size
old new
64,000 items 350ms 364ms
128,000 items 667ms 691ms
removing half the model
old new
512,000 items 24ms 15ms
1,024,000 items 49ms 25ms
2020-07-21 01:09:10 +00:00
|
|
|
end_change = self->positions;
|
|
|
|
start_change = self->positions + self->n_items;
|
2020-07-20 23:40:06 +00:00
|
|
|
|
|
|
|
while (gtk_tim_sort_step (&self->sort, &change))
|
|
|
|
{
|
|
|
|
result = TRUE;
|
|
|
|
if (change.len)
|
|
|
|
{
|
sortlistmodel: Split the SortItem into 2 arrays
Instead of one item keeping the item + its position and sorting that
list, keep the items in 1 array and put the positions into a 2nd array.
This is generally slower while sorting, but allows multiple improvements:
1. We can replace items with keys
This allows avoiding multiple slow lookups when using complex
comparisons
2. We can keep multiple position arrays
This allows doing a sorting in the background without actually
emitting items-changed() until the array is completely sorted.
3. The main list tracks the items in the original model
So only a single memmove() is necessary there, while the old version
had to upgrade the position in every item.
Benchmarks:
sorting a model of simple strings
old new
256,000 items 256ms 268ms
512,000 items 569ms 638ms
sorting a model of file trees, directories first, by size
old new
64,000 items 350ms 364ms
128,000 items 667ms 691ms
removing half the model
old new
512,000 items 24ms 15ms
1,024,000 items 49ms 25ms
2020-07-21 01:09:10 +00:00
|
|
|
start_change = MIN (start_change, (gpointer *) change.base);
|
|
|
|
end_change = MAX (end_change, ((gpointer *) change.base) + change.len);
|
2020-07-20 23:40:06 +00:00
|
|
|
}
|
|
|
|
|
2020-07-21 00:50:45 +00:00
|
|
|
if (g_get_monotonic_time () >= end_time && !finish)
|
2020-07-20 23:40:06 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (start_change < end_change)
|
|
|
|
{
|
sortlistmodel: Split the SortItem into 2 arrays
Instead of one item keeping the item + its position and sorting that
list, keep the items in 1 array and put the positions into a 2nd array.
This is generally slower while sorting, but allows multiple improvements:
1. We can replace items with keys
This allows avoiding multiple slow lookups when using complex
comparisons
2. We can keep multiple position arrays
This allows doing a sorting in the background without actually
emitting items-changed() until the array is completely sorted.
3. The main list tracks the items in the original model
So only a single memmove() is necessary there, while the old version
had to upgrade the position in every item.
Benchmarks:
sorting a model of simple strings
old new
256,000 items 256ms 268ms
512,000 items 569ms 638ms
sorting a model of file trees, directories first, by size
old new
64,000 items 350ms 364ms
128,000 items 667ms 691ms
removing half the model
old new
512,000 items 24ms 15ms
1,024,000 items 49ms 25ms
2020-07-21 01:09:10 +00:00
|
|
|
*out_position = start_change - self->positions;
|
2020-07-20 23:40:06 +00:00
|
|
|
*out_n_items = end_change - start_change;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
*out_position = 0;
|
|
|
|
*out_n_items = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2020-07-20 23:46:09 +00:00
|
|
|
static gboolean
|
|
|
|
gtk_sort_list_model_sort_cb (gpointer data)
|
|
|
|
{
|
|
|
|
GtkSortListModel *self = data;
|
2020-07-20 23:40:06 +00:00
|
|
|
guint pos, n_items;
|
2020-07-20 23:46:09 +00:00
|
|
|
|
2020-07-21 00:50:45 +00:00
|
|
|
if (gtk_sort_list_model_sort_step (self, FALSE, &pos, &n_items))
|
2020-07-20 23:46:09 +00:00
|
|
|
{
|
2020-07-20 23:40:06 +00:00
|
|
|
if (n_items)
|
|
|
|
g_list_model_items_changed (G_LIST_MODEL (self), pos, n_items, n_items);
|
2020-07-20 23:46:09 +00:00
|
|
|
return G_SOURCE_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2020-07-21 00:50:45 +00:00
|
|
|
gtk_sort_list_model_stop_sorting (self, NULL);
|
2020-07-20 23:46:09 +00:00
|
|
|
return G_SOURCE_REMOVE;
|
|
|
|
}
|
|
|
|
|
2020-07-21 00:50:45 +00:00
|
|
|
static int
|
|
|
|
sort_func (gconstpointer a,
|
|
|
|
gconstpointer b,
|
|
|
|
gpointer data)
|
2020-07-20 23:46:09 +00:00
|
|
|
{
|
sortlistmodel: Split the SortItem into 2 arrays
Instead of one item keeping the item + its position and sorting that
list, keep the items in 1 array and put the positions into a 2nd array.
This is generally slower while sorting, but allows multiple improvements:
1. We can replace items with keys
This allows avoiding multiple slow lookups when using complex
comparisons
2. We can keep multiple position arrays
This allows doing a sorting in the background without actually
emitting items-changed() until the array is completely sorted.
3. The main list tracks the items in the original model
So only a single memmove() is necessary there, while the old version
had to upgrade the position in every item.
Benchmarks:
sorting a model of simple strings
old new
256,000 items 256ms 268ms
512,000 items 569ms 638ms
sorting a model of file trees, directories first, by size
old new
64,000 items 350ms 364ms
128,000 items 667ms 691ms
removing half the model
old new
512,000 items 24ms 15ms
1,024,000 items 49ms 25ms
2020-07-21 01:09:10 +00:00
|
|
|
gpointer **sa = (gpointer **) a;
|
|
|
|
gpointer **sb = (gpointer **) b;
|
2020-07-21 00:50:45 +00:00
|
|
|
|
sortlistmodel: Split the SortItem into 2 arrays
Instead of one item keeping the item + its position and sorting that
list, keep the items in 1 array and put the positions into a 2nd array.
This is generally slower while sorting, but allows multiple improvements:
1. We can replace items with keys
This allows avoiding multiple slow lookups when using complex
comparisons
2. We can keep multiple position arrays
This allows doing a sorting in the background without actually
emitting items-changed() until the array is completely sorted.
3. The main list tracks the items in the original model
So only a single memmove() is necessary there, while the old version
had to upgrade the position in every item.
Benchmarks:
sorting a model of simple strings
old new
256,000 items 256ms 268ms
512,000 items 569ms 638ms
sorting a model of file trees, directories first, by size
old new
64,000 items 350ms 364ms
128,000 items 667ms 691ms
removing half the model
old new
512,000 items 24ms 15ms
1,024,000 items 49ms 25ms
2020-07-21 01:09:10 +00:00
|
|
|
return gtk_sorter_compare (data, **sa, **sb);
|
2020-07-21 00:50:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
|
|
|
gtk_sort_list_model_start_sorting (GtkSortListModel *self,
|
|
|
|
gsize *runs)
|
|
|
|
{
|
|
|
|
g_assert (self->sort_cb == 0);
|
|
|
|
|
|
|
|
gtk_tim_sort_init (&self->sort,
|
sortlistmodel: Split the SortItem into 2 arrays
Instead of one item keeping the item + its position and sorting that
list, keep the items in 1 array and put the positions into a 2nd array.
This is generally slower while sorting, but allows multiple improvements:
1. We can replace items with keys
This allows avoiding multiple slow lookups when using complex
comparisons
2. We can keep multiple position arrays
This allows doing a sorting in the background without actually
emitting items-changed() until the array is completely sorted.
3. The main list tracks the items in the original model
So only a single memmove() is necessary there, while the old version
had to upgrade the position in every item.
Benchmarks:
sorting a model of simple strings
old new
256,000 items 256ms 268ms
512,000 items 569ms 638ms
sorting a model of file trees, directories first, by size
old new
64,000 items 350ms 364ms
128,000 items 667ms 691ms
removing half the model
old new
512,000 items 24ms 15ms
1,024,000 items 49ms 25ms
2020-07-21 01:09:10 +00:00
|
|
|
self->positions,
|
|
|
|
self->n_items,
|
|
|
|
sizeof (gpointer),
|
2020-07-21 00:50:45 +00:00
|
|
|
sort_func,
|
|
|
|
self->sorter);
|
|
|
|
if (runs)
|
|
|
|
gtk_tim_sort_set_runs (&self->sort, runs);
|
|
|
|
if (self->incremental)
|
|
|
|
gtk_tim_sort_set_max_merge_size (&self->sort, GTK_SORT_MAX_MERGE_SIZE);
|
|
|
|
|
|
|
|
if (!self->incremental)
|
|
|
|
return FALSE;
|
2020-07-20 23:46:09 +00:00
|
|
|
|
|
|
|
self->sort_cb = g_idle_add (gtk_sort_list_model_sort_cb, self);
|
2020-07-21 00:50:45 +00:00
|
|
|
return TRUE;
|
2020-07-20 23:46:09 +00:00
|
|
|
}
|
|
|
|
|
2018-09-14 02:34:40 +00:00
|
|
|
static void
|
2020-07-21 00:50:45 +00:00
|
|
|
gtk_sort_list_model_finish_sorting (GtkSortListModel *self,
|
|
|
|
guint *pos,
|
|
|
|
guint *n_items)
|
2018-09-14 02:34:40 +00:00
|
|
|
{
|
2020-07-21 00:50:45 +00:00
|
|
|
gtk_tim_sort_set_max_merge_size (&self->sort, 0);
|
|
|
|
|
|
|
|
gtk_sort_list_model_sort_step (self, TRUE, pos, n_items);
|
|
|
|
gtk_tim_sort_finish (&self->sort);
|
|
|
|
|
|
|
|
gtk_sort_list_model_stop_sorting (self, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_sort_list_model_clear_items (GtkSortListModel *self,
|
|
|
|
guint *pos,
|
|
|
|
guint *n_items)
|
|
|
|
{
|
sortlistmodel: Split the SortItem into 2 arrays
Instead of one item keeping the item + its position and sorting that
list, keep the items in 1 array and put the positions into a 2nd array.
This is generally slower while sorting, but allows multiple improvements:
1. We can replace items with keys
This allows avoiding multiple slow lookups when using complex
comparisons
2. We can keep multiple position arrays
This allows doing a sorting in the background without actually
emitting items-changed() until the array is completely sorted.
3. The main list tracks the items in the original model
So only a single memmove() is necessary there, while the old version
had to upgrade the position in every item.
Benchmarks:
sorting a model of simple strings
old new
256,000 items 256ms 268ms
512,000 items 569ms 638ms
sorting a model of file trees, directories first, by size
old new
64,000 items 350ms 364ms
128,000 items 667ms 691ms
removing half the model
old new
512,000 items 24ms 15ms
1,024,000 items 49ms 25ms
2020-07-21 01:09:10 +00:00
|
|
|
guint i;
|
|
|
|
|
2020-07-21 00:50:45 +00:00
|
|
|
gtk_sort_list_model_stop_sorting (self, NULL);
|
|
|
|
|
sortlistmodel: Split the SortItem into 2 arrays
Instead of one item keeping the item + its position and sorting that
list, keep the items in 1 array and put the positions into a 2nd array.
This is generally slower while sorting, but allows multiple improvements:
1. We can replace items with keys
This allows avoiding multiple slow lookups when using complex
comparisons
2. We can keep multiple position arrays
This allows doing a sorting in the background without actually
emitting items-changed() until the array is completely sorted.
3. The main list tracks the items in the original model
So only a single memmove() is necessary there, while the old version
had to upgrade the position in every item.
Benchmarks:
sorting a model of simple strings
old new
256,000 items 256ms 268ms
512,000 items 569ms 638ms
sorting a model of file trees, directories first, by size
old new
64,000 items 350ms 364ms
128,000 items 667ms 691ms
removing half the model
old new
512,000 items 24ms 15ms
1,024,000 items 49ms 25ms
2020-07-21 01:09:10 +00:00
|
|
|
if (self->positions == NULL)
|
|
|
|
{
|
|
|
|
if (pos || n_items)
|
|
|
|
*pos = *n_items = 0;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2020-07-21 00:50:45 +00:00
|
|
|
if (pos || n_items)
|
|
|
|
{
|
|
|
|
guint start, end;
|
|
|
|
|
sortlistmodel: Split the SortItem into 2 arrays
Instead of one item keeping the item + its position and sorting that
list, keep the items in 1 array and put the positions into a 2nd array.
This is generally slower while sorting, but allows multiple improvements:
1. We can replace items with keys
This allows avoiding multiple slow lookups when using complex
comparisons
2. We can keep multiple position arrays
This allows doing a sorting in the background without actually
emitting items-changed() until the array is completely sorted.
3. The main list tracks the items in the original model
So only a single memmove() is necessary there, while the old version
had to upgrade the position in every item.
Benchmarks:
sorting a model of simple strings
old new
256,000 items 256ms 268ms
512,000 items 569ms 638ms
sorting a model of file trees, directories first, by size
old new
64,000 items 350ms 364ms
128,000 items 667ms 691ms
removing half the model
old new
512,000 items 24ms 15ms
1,024,000 items 49ms 25ms
2020-07-21 01:09:10 +00:00
|
|
|
for (start = 0; start < self->n_items; start++)
|
2020-07-21 00:50:45 +00:00
|
|
|
{
|
sortlistmodel: Split the SortItem into 2 arrays
Instead of one item keeping the item + its position and sorting that
list, keep the items in 1 array and put the positions into a 2nd array.
This is generally slower while sorting, but allows multiple improvements:
1. We can replace items with keys
This allows avoiding multiple slow lookups when using complex
comparisons
2. We can keep multiple position arrays
This allows doing a sorting in the background without actually
emitting items-changed() until the array is completely sorted.
3. The main list tracks the items in the original model
So only a single memmove() is necessary there, while the old version
had to upgrade the position in every item.
Benchmarks:
sorting a model of simple strings
old new
256,000 items 256ms 268ms
512,000 items 569ms 638ms
sorting a model of file trees, directories first, by size
old new
64,000 items 350ms 364ms
128,000 items 667ms 691ms
removing half the model
old new
512,000 items 24ms 15ms
1,024,000 items 49ms 25ms
2020-07-21 01:09:10 +00:00
|
|
|
if (pos_from_key (self, self->positions[start]) != + start)
|
2020-07-21 00:50:45 +00:00
|
|
|
break;
|
|
|
|
}
|
sortlistmodel: Split the SortItem into 2 arrays
Instead of one item keeping the item + its position and sorting that
list, keep the items in 1 array and put the positions into a 2nd array.
This is generally slower while sorting, but allows multiple improvements:
1. We can replace items with keys
This allows avoiding multiple slow lookups when using complex
comparisons
2. We can keep multiple position arrays
This allows doing a sorting in the background without actually
emitting items-changed() until the array is completely sorted.
3. The main list tracks the items in the original model
So only a single memmove() is necessary there, while the old version
had to upgrade the position in every item.
Benchmarks:
sorting a model of simple strings
old new
256,000 items 256ms 268ms
512,000 items 569ms 638ms
sorting a model of file trees, directories first, by size
old new
64,000 items 350ms 364ms
128,000 items 667ms 691ms
removing half the model
old new
512,000 items 24ms 15ms
1,024,000 items 49ms 25ms
2020-07-21 01:09:10 +00:00
|
|
|
for (end = self->n_items; end > start; end--)
|
2020-07-21 00:50:45 +00:00
|
|
|
{
|
sortlistmodel: Split the SortItem into 2 arrays
Instead of one item keeping the item + its position and sorting that
list, keep the items in 1 array and put the positions into a 2nd array.
This is generally slower while sorting, but allows multiple improvements:
1. We can replace items with keys
This allows avoiding multiple slow lookups when using complex
comparisons
2. We can keep multiple position arrays
This allows doing a sorting in the background without actually
emitting items-changed() until the array is completely sorted.
3. The main list tracks the items in the original model
So only a single memmove() is necessary there, while the old version
had to upgrade the position in every item.
Benchmarks:
sorting a model of simple strings
old new
256,000 items 256ms 268ms
512,000 items 569ms 638ms
sorting a model of file trees, directories first, by size
old new
64,000 items 350ms 364ms
128,000 items 667ms 691ms
removing half the model
old new
512,000 items 24ms 15ms
1,024,000 items 49ms 25ms
2020-07-21 01:09:10 +00:00
|
|
|
if (pos_from_key (self, self->positions[end - 1]) != end - 1)
|
2020-07-21 00:50:45 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
*n_items = end - start;
|
|
|
|
if (*n_items == 0)
|
|
|
|
*pos = 0;
|
|
|
|
else
|
|
|
|
*pos = start;
|
|
|
|
}
|
|
|
|
|
sortlistmodel: Split the SortItem into 2 arrays
Instead of one item keeping the item + its position and sorting that
list, keep the items in 1 array and put the positions into a 2nd array.
This is generally slower while sorting, but allows multiple improvements:
1. We can replace items with keys
This allows avoiding multiple slow lookups when using complex
comparisons
2. We can keep multiple position arrays
This allows doing a sorting in the background without actually
emitting items-changed() until the array is completely sorted.
3. The main list tracks the items in the original model
So only a single memmove() is necessary there, while the old version
had to upgrade the position in every item.
Benchmarks:
sorting a model of simple strings
old new
256,000 items 256ms 268ms
512,000 items 569ms 638ms
sorting a model of file trees, directories first, by size
old new
64,000 items 350ms 364ms
128,000 items 667ms 691ms
removing half the model
old new
512,000 items 24ms 15ms
1,024,000 items 49ms 25ms
2020-07-21 01:09:10 +00:00
|
|
|
g_clear_pointer (&self->positions, g_free);
|
|
|
|
for (i = 0; i < self->n_items; i++)
|
|
|
|
g_object_unref (self->keys[i]);
|
|
|
|
g_clear_pointer (&self->keys, g_free);
|
2020-07-16 23:56:18 +00:00
|
|
|
}
|
2018-09-14 02:34:40 +00:00
|
|
|
|
2020-07-17 00:28:42 +00:00
|
|
|
static gboolean
|
|
|
|
gtk_sort_list_model_should_sort (GtkSortListModel *self)
|
|
|
|
{
|
|
|
|
return self->sorter != NULL &&
|
|
|
|
self->model != NULL &&
|
|
|
|
gtk_sorter_get_order (self->sorter) != GTK_SORTER_ORDER_NONE;
|
|
|
|
}
|
|
|
|
|
2020-07-16 23:56:18 +00:00
|
|
|
static void
|
|
|
|
gtk_sort_list_model_create_items (GtkSortListModel *self)
|
|
|
|
{
|
sortlistmodel: Split the SortItem into 2 arrays
Instead of one item keeping the item + its position and sorting that
list, keep the items in 1 array and put the positions into a 2nd array.
This is generally slower while sorting, but allows multiple improvements:
1. We can replace items with keys
This allows avoiding multiple slow lookups when using complex
comparisons
2. We can keep multiple position arrays
This allows doing a sorting in the background without actually
emitting items-changed() until the array is completely sorted.
3. The main list tracks the items in the original model
So only a single memmove() is necessary there, while the old version
had to upgrade the position in every item.
Benchmarks:
sorting a model of simple strings
old new
256,000 items 256ms 268ms
512,000 items 569ms 638ms
sorting a model of file trees, directories first, by size
old new
64,000 items 350ms 364ms
128,000 items 667ms 691ms
removing half the model
old new
512,000 items 24ms 15ms
1,024,000 items 49ms 25ms
2020-07-21 01:09:10 +00:00
|
|
|
guint i;
|
2018-09-14 02:34:40 +00:00
|
|
|
|
2020-07-17 00:28:42 +00:00
|
|
|
if (!gtk_sort_list_model_should_sort (self))
|
2020-07-16 23:56:18 +00:00
|
|
|
return;
|
2018-09-14 02:34:40 +00:00
|
|
|
|
sortlistmodel: Split the SortItem into 2 arrays
Instead of one item keeping the item + its position and sorting that
list, keep the items in 1 array and put the positions into a 2nd array.
This is generally slower while sorting, but allows multiple improvements:
1. We can replace items with keys
This allows avoiding multiple slow lookups when using complex
comparisons
2. We can keep multiple position arrays
This allows doing a sorting in the background without actually
emitting items-changed() until the array is completely sorted.
3. The main list tracks the items in the original model
So only a single memmove() is necessary there, while the old version
had to upgrade the position in every item.
Benchmarks:
sorting a model of simple strings
old new
256,000 items 256ms 268ms
512,000 items 569ms 638ms
sorting a model of file trees, directories first, by size
old new
64,000 items 350ms 364ms
128,000 items 667ms 691ms
removing half the model
old new
512,000 items 24ms 15ms
1,024,000 items 49ms 25ms
2020-07-21 01:09:10 +00:00
|
|
|
self->positions = g_new (gpointer, self->n_items);
|
|
|
|
self->keys = g_new (gpointer, self->n_items);
|
|
|
|
for (i = 0; i < self->n_items; i++)
|
2020-07-16 23:56:18 +00:00
|
|
|
{
|
sortlistmodel: Split the SortItem into 2 arrays
Instead of one item keeping the item + its position and sorting that
list, keep the items in 1 array and put the positions into a 2nd array.
This is generally slower while sorting, but allows multiple improvements:
1. We can replace items with keys
This allows avoiding multiple slow lookups when using complex
comparisons
2. We can keep multiple position arrays
This allows doing a sorting in the background without actually
emitting items-changed() until the array is completely sorted.
3. The main list tracks the items in the original model
So only a single memmove() is necessary there, while the old version
had to upgrade the position in every item.
Benchmarks:
sorting a model of simple strings
old new
256,000 items 256ms 268ms
512,000 items 569ms 638ms
sorting a model of file trees, directories first, by size
old new
64,000 items 350ms 364ms
128,000 items 667ms 691ms
removing half the model
old new
512,000 items 24ms 15ms
1,024,000 items 49ms 25ms
2020-07-21 01:09:10 +00:00
|
|
|
self->keys[i] = g_list_model_get_item (self->model, i);
|
|
|
|
self->positions[i] = key_from_pos (self, i);
|
2018-09-14 02:34:40 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
sortlistmodel: Split the SortItem into 2 arrays
Instead of one item keeping the item + its position and sorting that
list, keep the items in 1 array and put the positions into a 2nd array.
This is generally slower while sorting, but allows multiple improvements:
1. We can replace items with keys
This allows avoiding multiple slow lookups when using complex
comparisons
2. We can keep multiple position arrays
This allows doing a sorting in the background without actually
emitting items-changed() until the array is completely sorted.
3. The main list tracks the items in the original model
So only a single memmove() is necessary there, while the old version
had to upgrade the position in every item.
Benchmarks:
sorting a model of simple strings
old new
256,000 items 256ms 268ms
512,000 items 569ms 638ms
sorting a model of file trees, directories first, by size
old new
64,000 items 350ms 364ms
128,000 items 667ms 691ms
removing half the model
old new
512,000 items 24ms 15ms
1,024,000 items 49ms 25ms
2020-07-21 01:09:10 +00:00
|
|
|
/* This realloc()s the arrays but does not set the added values. */
|
2020-07-17 00:28:42 +00:00
|
|
|
static void
|
2020-07-21 00:50:45 +00:00
|
|
|
gtk_sort_list_model_update_items (GtkSortListModel *self,
|
|
|
|
gsize runs[GTK_TIM_SORT_MAX_PENDING + 1],
|
2020-07-17 00:28:42 +00:00
|
|
|
guint position,
|
|
|
|
guint removed,
|
|
|
|
guint added,
|
|
|
|
guint *unmodified_start,
|
|
|
|
guint *unmodified_end)
|
|
|
|
{
|
|
|
|
guint i, n_items, valid;
|
|
|
|
guint start, end;
|
sortlistmodel: Split the SortItem into 2 arrays
Instead of one item keeping the item + its position and sorting that
list, keep the items in 1 array and put the positions into a 2nd array.
This is generally slower while sorting, but allows multiple improvements:
1. We can replace items with keys
This allows avoiding multiple slow lookups when using complex
comparisons
2. We can keep multiple position arrays
This allows doing a sorting in the background without actually
emitting items-changed() until the array is completely sorted.
3. The main list tracks the items in the original model
So only a single memmove() is necessary there, while the old version
had to upgrade the position in every item.
Benchmarks:
sorting a model of simple strings
old new
256,000 items 256ms 268ms
512,000 items 569ms 638ms
sorting a model of file trees, directories first, by size
old new
64,000 items 350ms 364ms
128,000 items 667ms 691ms
removing half the model
old new
512,000 items 24ms 15ms
1,024,000 items 49ms 25ms
2020-07-21 01:09:10 +00:00
|
|
|
gpointer *old_keys;
|
2020-07-17 00:28:42 +00:00
|
|
|
|
sortlistmodel: Split the SortItem into 2 arrays
Instead of one item keeping the item + its position and sorting that
list, keep the items in 1 array and put the positions into a 2nd array.
This is generally slower while sorting, but allows multiple improvements:
1. We can replace items with keys
This allows avoiding multiple slow lookups when using complex
comparisons
2. We can keep multiple position arrays
This allows doing a sorting in the background without actually
emitting items-changed() until the array is completely sorted.
3. The main list tracks the items in the original model
So only a single memmove() is necessary there, while the old version
had to upgrade the position in every item.
Benchmarks:
sorting a model of simple strings
old new
256,000 items 256ms 268ms
512,000 items 569ms 638ms
sorting a model of file trees, directories first, by size
old new
64,000 items 350ms 364ms
128,000 items 667ms 691ms
removing half the model
old new
512,000 items 24ms 15ms
1,024,000 items 49ms 25ms
2020-07-21 01:09:10 +00:00
|
|
|
n_items = self->n_items;
|
2020-07-17 00:28:42 +00:00
|
|
|
start = n_items;
|
|
|
|
end = n_items;
|
|
|
|
|
sortlistmodel: Split the SortItem into 2 arrays
Instead of one item keeping the item + its position and sorting that
list, keep the items in 1 array and put the positions into a 2nd array.
This is generally slower while sorting, but allows multiple improvements:
1. We can replace items with keys
This allows avoiding multiple slow lookups when using complex
comparisons
2. We can keep multiple position arrays
This allows doing a sorting in the background without actually
emitting items-changed() until the array is completely sorted.
3. The main list tracks the items in the original model
So only a single memmove() is necessary there, while the old version
had to upgrade the position in every item.
Benchmarks:
sorting a model of simple strings
old new
256,000 items 256ms 268ms
512,000 items 569ms 638ms
sorting a model of file trees, directories first, by size
old new
64,000 items 350ms 364ms
128,000 items 667ms 691ms
removing half the model
old new
512,000 items 24ms 15ms
1,024,000 items 49ms 25ms
2020-07-21 01:09:10 +00:00
|
|
|
/* first, move the keys over */
|
|
|
|
old_keys = self->keys;
|
|
|
|
for (i = position; i < position + removed; i++)
|
|
|
|
g_object_unref (self->keys[i]);
|
|
|
|
if (removed > added)
|
|
|
|
{
|
|
|
|
memmove (self->keys + position + removed,
|
|
|
|
self->keys + position + added,
|
|
|
|
sizeof (gpointer) * (n_items - position - removed));
|
|
|
|
self->keys = g_renew (gpointer, self->keys, n_items - removed + added);
|
|
|
|
}
|
|
|
|
else if (removed < added)
|
|
|
|
{
|
|
|
|
self->keys = g_renew (gpointer, self->keys, n_items - removed + added);
|
|
|
|
memmove (self->keys + position + removed,
|
|
|
|
self->keys + position + added,
|
|
|
|
sizeof (gpointer) * (n_items - position - removed));
|
|
|
|
}
|
|
|
|
|
|
|
|
/* then, update the positions */
|
2020-07-17 00:28:42 +00:00
|
|
|
valid = 0;
|
|
|
|
for (i = 0; i < n_items; i++)
|
|
|
|
{
|
sortlistmodel: Split the SortItem into 2 arrays
Instead of one item keeping the item + its position and sorting that
list, keep the items in 1 array and put the positions into a 2nd array.
This is generally slower while sorting, but allows multiple improvements:
1. We can replace items with keys
This allows avoiding multiple slow lookups when using complex
comparisons
2. We can keep multiple position arrays
This allows doing a sorting in the background without actually
emitting items-changed() until the array is completely sorted.
3. The main list tracks the items in the original model
So only a single memmove() is necessary there, while the old version
had to upgrade the position in every item.
Benchmarks:
sorting a model of simple strings
old new
256,000 items 256ms 268ms
512,000 items 569ms 638ms
sorting a model of file trees, directories first, by size
old new
64,000 items 350ms 364ms
128,000 items 667ms 691ms
removing half the model
old new
512,000 items 24ms 15ms
1,024,000 items 49ms 25ms
2020-07-21 01:09:10 +00:00
|
|
|
guint pos = (gpointer *) self->positions[i] - old_keys;
|
2020-07-17 00:28:42 +00:00
|
|
|
|
sortlistmodel: Split the SortItem into 2 arrays
Instead of one item keeping the item + its position and sorting that
list, keep the items in 1 array and put the positions into a 2nd array.
This is generally slower while sorting, but allows multiple improvements:
1. We can replace items with keys
This allows avoiding multiple slow lookups when using complex
comparisons
2. We can keep multiple position arrays
This allows doing a sorting in the background without actually
emitting items-changed() until the array is completely sorted.
3. The main list tracks the items in the original model
So only a single memmove() is necessary there, while the old version
had to upgrade the position in every item.
Benchmarks:
sorting a model of simple strings
old new
256,000 items 256ms 268ms
512,000 items 569ms 638ms
sorting a model of file trees, directories first, by size
old new
64,000 items 350ms 364ms
128,000 items 667ms 691ms
removing half the model
old new
512,000 items 24ms 15ms
1,024,000 items 49ms 25ms
2020-07-21 01:09:10 +00:00
|
|
|
if (pos >= position + removed)
|
|
|
|
pos = pos - removed + added;
|
|
|
|
else if (pos >= position)
|
2020-07-17 00:28:42 +00:00
|
|
|
{
|
|
|
|
start = MIN (start, valid);
|
|
|
|
end = n_items - i - 1;
|
|
|
|
continue;
|
|
|
|
}
|
sortlistmodel: Split the SortItem into 2 arrays
Instead of one item keeping the item + its position and sorting that
list, keep the items in 1 array and put the positions into a 2nd array.
This is generally slower while sorting, but allows multiple improvements:
1. We can replace items with keys
This allows avoiding multiple slow lookups when using complex
comparisons
2. We can keep multiple position arrays
This allows doing a sorting in the background without actually
emitting items-changed() until the array is completely sorted.
3. The main list tracks the items in the original model
So only a single memmove() is necessary there, while the old version
had to upgrade the position in every item.
Benchmarks:
sorting a model of simple strings
old new
256,000 items 256ms 268ms
512,000 items 569ms 638ms
sorting a model of file trees, directories first, by size
old new
64,000 items 350ms 364ms
128,000 items 667ms 691ms
removing half the model
old new
512,000 items 24ms 15ms
1,024,000 items 49ms 25ms
2020-07-21 01:09:10 +00:00
|
|
|
|
|
|
|
self->positions[valid] = key_from_pos (self, pos);
|
2020-07-17 00:28:42 +00:00
|
|
|
valid++;
|
|
|
|
}
|
sortlistmodel: Split the SortItem into 2 arrays
Instead of one item keeping the item + its position and sorting that
list, keep the items in 1 array and put the positions into a 2nd array.
This is generally slower while sorting, but allows multiple improvements:
1. We can replace items with keys
This allows avoiding multiple slow lookups when using complex
comparisons
2. We can keep multiple position arrays
This allows doing a sorting in the background without actually
emitting items-changed() until the array is completely sorted.
3. The main list tracks the items in the original model
So only a single memmove() is necessary there, while the old version
had to upgrade the position in every item.
Benchmarks:
sorting a model of simple strings
old new
256,000 items 256ms 268ms
512,000 items 569ms 638ms
sorting a model of file trees, directories first, by size
old new
64,000 items 350ms 364ms
128,000 items 667ms 691ms
removing half the model
old new
512,000 items 24ms 15ms
1,024,000 items 49ms 25ms
2020-07-21 01:09:10 +00:00
|
|
|
self->positions = g_renew (gpointer, self->positions, n_items - removed + added);
|
2020-07-17 00:28:42 +00:00
|
|
|
|
2020-07-21 00:50:45 +00:00
|
|
|
/* FIXME */
|
|
|
|
runs[0] = 0;
|
|
|
|
|
2020-07-17 00:28:42 +00:00
|
|
|
g_assert (valid == n_items - removed);
|
sortlistmodel: Split the SortItem into 2 arrays
Instead of one item keeping the item + its position and sorting that
list, keep the items in 1 array and put the positions into a 2nd array.
This is generally slower while sorting, but allows multiple improvements:
1. We can replace items with keys
This allows avoiding multiple slow lookups when using complex
comparisons
2. We can keep multiple position arrays
This allows doing a sorting in the background without actually
emitting items-changed() until the array is completely sorted.
3. The main list tracks the items in the original model
So only a single memmove() is necessary there, while the old version
had to upgrade the position in every item.
Benchmarks:
sorting a model of simple strings
old new
256,000 items 256ms 268ms
512,000 items 569ms 638ms
sorting a model of file trees, directories first, by size
old new
64,000 items 350ms 364ms
128,000 items 667ms 691ms
removing half the model
old new
512,000 items 24ms 15ms
1,024,000 items 49ms 25ms
2020-07-21 01:09:10 +00:00
|
|
|
|
|
|
|
self->n_items = n_items - removed + added;
|
|
|
|
|
|
|
|
for (i = 0; i < added; i++)
|
|
|
|
{
|
|
|
|
self->keys[position + i] = g_list_model_get_item (self->model, position + i);
|
|
|
|
self->positions[self->n_items - added + i] = key_from_pos (self, position + i);
|
|
|
|
}
|
2020-07-17 00:28:42 +00:00
|
|
|
|
|
|
|
*unmodified_start = start;
|
|
|
|
*unmodified_end = end;
|
|
|
|
}
|
|
|
|
|
2018-09-14 02:34:40 +00:00
|
|
|
static void
|
|
|
|
gtk_sort_list_model_items_changed_cb (GListModel *model,
|
|
|
|
guint position,
|
|
|
|
guint removed,
|
|
|
|
guint added,
|
|
|
|
GtkSortListModel *self)
|
|
|
|
{
|
2020-07-21 00:50:45 +00:00
|
|
|
gsize runs[GTK_TIM_SORT_MAX_PENDING + 1];
|
2020-07-17 00:28:42 +00:00
|
|
|
guint i, n_items, start, end;
|
2020-07-20 23:46:09 +00:00
|
|
|
gboolean was_sorting;
|
2018-09-14 02:34:40 +00:00
|
|
|
|
2020-07-17 00:28:42 +00:00
|
|
|
if (removed == 0 && added == 0)
|
|
|
|
return;
|
2018-09-14 02:34:40 +00:00
|
|
|
|
2020-07-17 00:28:42 +00:00
|
|
|
if (!gtk_sort_list_model_should_sort (self))
|
|
|
|
{
|
sortlistmodel: Split the SortItem into 2 arrays
Instead of one item keeping the item + its position and sorting that
list, keep the items in 1 array and put the positions into a 2nd array.
This is generally slower while sorting, but allows multiple improvements:
1. We can replace items with keys
This allows avoiding multiple slow lookups when using complex
comparisons
2. We can keep multiple position arrays
This allows doing a sorting in the background without actually
emitting items-changed() until the array is completely sorted.
3. The main list tracks the items in the original model
So only a single memmove() is necessary there, while the old version
had to upgrade the position in every item.
Benchmarks:
sorting a model of simple strings
old new
256,000 items 256ms 268ms
512,000 items 569ms 638ms
sorting a model of file trees, directories first, by size
old new
64,000 items 350ms 364ms
128,000 items 667ms 691ms
removing half the model
old new
512,000 items 24ms 15ms
1,024,000 items 49ms 25ms
2020-07-21 01:09:10 +00:00
|
|
|
self->n_items = self->n_items - removed + added;
|
2020-07-17 00:28:42 +00:00
|
|
|
g_list_model_items_changed (G_LIST_MODEL (self), position, removed, added);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2020-07-20 23:46:09 +00:00
|
|
|
was_sorting = gtk_sort_list_model_is_sorting (self);
|
2020-07-21 00:50:45 +00:00
|
|
|
gtk_sort_list_model_stop_sorting (self, runs);
|
2020-07-20 23:46:09 +00:00
|
|
|
|
2020-07-21 00:50:45 +00:00
|
|
|
gtk_sort_list_model_update_items (self, runs, position, removed, added, &start, &end);
|
2020-07-20 23:46:09 +00:00
|
|
|
|
2020-07-17 00:28:42 +00:00
|
|
|
if (added > 0)
|
|
|
|
{
|
sortlistmodel: Split the SortItem into 2 arrays
Instead of one item keeping the item + its position and sorting that
list, keep the items in 1 array and put the positions into a 2nd array.
This is generally slower while sorting, but allows multiple improvements:
1. We can replace items with keys
This allows avoiding multiple slow lookups when using complex
comparisons
2. We can keep multiple position arrays
This allows doing a sorting in the background without actually
emitting items-changed() until the array is completely sorted.
3. The main list tracks the items in the original model
So only a single memmove() is necessary there, while the old version
had to upgrade the position in every item.
Benchmarks:
sorting a model of simple strings
old new
256,000 items 256ms 268ms
512,000 items 569ms 638ms
sorting a model of file trees, directories first, by size
old new
64,000 items 350ms 364ms
128,000 items 667ms 691ms
removing half the model
old new
512,000 items 24ms 15ms
1,024,000 items 49ms 25ms
2020-07-21 01:09:10 +00:00
|
|
|
if (gtk_sort_list_model_start_sorting (self, runs))
|
2020-07-17 00:28:42 +00:00
|
|
|
{
|
sortlistmodel: Split the SortItem into 2 arrays
Instead of one item keeping the item + its position and sorting that
list, keep the items in 1 array and put the positions into a 2nd array.
This is generally slower while sorting, but allows multiple improvements:
1. We can replace items with keys
This allows avoiding multiple slow lookups when using complex
comparisons
2. We can keep multiple position arrays
This allows doing a sorting in the background without actually
emitting items-changed() until the array is completely sorted.
3. The main list tracks the items in the original model
So only a single memmove() is necessary there, while the old version
had to upgrade the position in every item.
Benchmarks:
sorting a model of simple strings
old new
256,000 items 256ms 268ms
512,000 items 569ms 638ms
sorting a model of file trees, directories first, by size
old new
64,000 items 350ms 364ms
128,000 items 667ms 691ms
removing half the model
old new
512,000 items 24ms 15ms
1,024,000 items 49ms 25ms
2020-07-21 01:09:10 +00:00
|
|
|
end = 0;
|
2020-07-17 00:28:42 +00:00
|
|
|
}
|
sortlistmodel: Split the SortItem into 2 arrays
Instead of one item keeping the item + its position and sorting that
list, keep the items in 1 array and put the positions into a 2nd array.
This is generally slower while sorting, but allows multiple improvements:
1. We can replace items with keys
This allows avoiding multiple slow lookups when using complex
comparisons
2. We can keep multiple position arrays
This allows doing a sorting in the background without actually
emitting items-changed() until the array is completely sorted.
3. The main list tracks the items in the original model
So only a single memmove() is necessary there, while the old version
had to upgrade the position in every item.
Benchmarks:
sorting a model of simple strings
old new
256,000 items 256ms 268ms
512,000 items 569ms 638ms
sorting a model of file trees, directories first, by size
old new
64,000 items 350ms 364ms
128,000 items 667ms 691ms
removing half the model
old new
512,000 items 24ms 15ms
1,024,000 items 49ms 25ms
2020-07-21 01:09:10 +00:00
|
|
|
else
|
2020-07-21 00:50:45 +00:00
|
|
|
{
|
|
|
|
guint pos, n;
|
|
|
|
gtk_sort_list_model_finish_sorting (self, &pos, &n);
|
sortlistmodel: Split the SortItem into 2 arrays
Instead of one item keeping the item + its position and sorting that
list, keep the items in 1 array and put the positions into a 2nd array.
This is generally slower while sorting, but allows multiple improvements:
1. We can replace items with keys
This allows avoiding multiple slow lookups when using complex
comparisons
2. We can keep multiple position arrays
This allows doing a sorting in the background without actually
emitting items-changed() until the array is completely sorted.
3. The main list tracks the items in the original model
So only a single memmove() is necessary there, while the old version
had to upgrade the position in every item.
Benchmarks:
sorting a model of simple strings
old new
256,000 items 256ms 268ms
512,000 items 569ms 638ms
sorting a model of file trees, directories first, by size
old new
64,000 items 350ms 364ms
128,000 items 667ms 691ms
removing half the model
old new
512,000 items 24ms 15ms
1,024,000 items 49ms 25ms
2020-07-21 01:09:10 +00:00
|
|
|
if (n)
|
|
|
|
start = MIN (start, pos);
|
|
|
|
/* find first item that was added */
|
|
|
|
for (i = 0; i < end; i++)
|
|
|
|
{
|
|
|
|
pos = pos_from_key (self, self->positions[self->n_items - i - 1]);
|
|
|
|
if (pos >= position && pos < position + added)
|
|
|
|
{
|
|
|
|
end = i;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2020-07-21 00:50:45 +00:00
|
|
|
}
|
2020-07-20 23:46:09 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (was_sorting)
|
2020-07-21 00:50:45 +00:00
|
|
|
gtk_sort_list_model_start_sorting (self, runs);
|
2020-07-17 00:28:42 +00:00
|
|
|
}
|
|
|
|
|
sortlistmodel: Split the SortItem into 2 arrays
Instead of one item keeping the item + its position and sorting that
list, keep the items in 1 array and put the positions into a 2nd array.
This is generally slower while sorting, but allows multiple improvements:
1. We can replace items with keys
This allows avoiding multiple slow lookups when using complex
comparisons
2. We can keep multiple position arrays
This allows doing a sorting in the background without actually
emitting items-changed() until the array is completely sorted.
3. The main list tracks the items in the original model
So only a single memmove() is necessary there, while the old version
had to upgrade the position in every item.
Benchmarks:
sorting a model of simple strings
old new
256,000 items 256ms 268ms
512,000 items 569ms 638ms
sorting a model of file trees, directories first, by size
old new
64,000 items 350ms 364ms
128,000 items 667ms 691ms
removing half the model
old new
512,000 items 24ms 15ms
1,024,000 items 49ms 25ms
2020-07-21 01:09:10 +00:00
|
|
|
n_items = self->n_items - start - end;
|
2020-07-17 00:28:42 +00:00
|
|
|
g_list_model_items_changed (G_LIST_MODEL (self), start, n_items - added + removed, n_items);
|
2018-09-14 02:34:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_sort_list_model_set_property (GObject *object,
|
|
|
|
guint prop_id,
|
|
|
|
const GValue *value,
|
|
|
|
GParamSpec *pspec)
|
|
|
|
{
|
|
|
|
GtkSortListModel *self = GTK_SORT_LIST_MODEL (object);
|
|
|
|
|
|
|
|
switch (prop_id)
|
|
|
|
{
|
2020-07-21 00:50:45 +00:00
|
|
|
case PROP_INCREMENTAL:
|
|
|
|
gtk_sort_list_model_set_incremental (self, g_value_get_boolean (value));
|
|
|
|
break;
|
|
|
|
|
2018-09-14 02:34:40 +00:00
|
|
|
case PROP_MODEL:
|
|
|
|
gtk_sort_list_model_set_model (self, g_value_get_object (value));
|
|
|
|
break;
|
|
|
|
|
2019-12-03 04:44:22 +00:00
|
|
|
case PROP_SORTER:
|
|
|
|
gtk_sort_list_model_set_sorter (self, g_value_get_object (value));
|
|
|
|
break;
|
|
|
|
|
2018-09-14 02:34:40 +00:00
|
|
|
default:
|
|
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_sort_list_model_get_property (GObject *object,
|
|
|
|
guint prop_id,
|
|
|
|
GValue *value,
|
|
|
|
GParamSpec *pspec)
|
|
|
|
{
|
|
|
|
GtkSortListModel *self = GTK_SORT_LIST_MODEL (object);
|
|
|
|
|
|
|
|
switch (prop_id)
|
|
|
|
{
|
2020-07-21 00:50:45 +00:00
|
|
|
case PROP_INCREMENTAL:
|
|
|
|
g_value_set_boolean (value, self->incremental);
|
|
|
|
break;
|
|
|
|
|
2018-09-14 02:34:40 +00:00
|
|
|
case PROP_MODEL:
|
|
|
|
g_value_set_object (value, self->model);
|
|
|
|
break;
|
|
|
|
|
2019-12-03 04:44:22 +00:00
|
|
|
case PROP_SORTER:
|
|
|
|
g_value_set_object (value, self->sorter);
|
|
|
|
break;
|
|
|
|
|
2018-09-14 02:34:40 +00:00
|
|
|
default:
|
|
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-12-03 04:44:22 +00:00
|
|
|
static void
|
|
|
|
gtk_sort_list_model_sorter_changed_cb (GtkSorter *sorter,
|
|
|
|
int change,
|
|
|
|
GtkSortListModel *self)
|
|
|
|
{
|
2020-07-21 00:50:45 +00:00
|
|
|
guint pos, n_items;
|
2020-07-16 23:56:18 +00:00
|
|
|
|
sortlistmodel: Split the SortItem into 2 arrays
Instead of one item keeping the item + its position and sorting that
list, keep the items in 1 array and put the positions into a 2nd array.
This is generally slower while sorting, but allows multiple improvements:
1. We can replace items with keys
This allows avoiding multiple slow lookups when using complex
comparisons
2. We can keep multiple position arrays
This allows doing a sorting in the background without actually
emitting items-changed() until the array is completely sorted.
3. The main list tracks the items in the original model
So only a single memmove() is necessary there, while the old version
had to upgrade the position in every item.
Benchmarks:
sorting a model of simple strings
old new
256,000 items 256ms 268ms
512,000 items 569ms 638ms
sorting a model of file trees, directories first, by size
old new
64,000 items 350ms 364ms
128,000 items 667ms 691ms
removing half the model
old new
512,000 items 24ms 15ms
1,024,000 items 49ms 25ms
2020-07-21 01:09:10 +00:00
|
|
|
if (gtk_sort_list_model_should_sort (self))
|
2020-07-21 00:50:45 +00:00
|
|
|
{
|
sortlistmodel: Split the SortItem into 2 arrays
Instead of one item keeping the item + its position and sorting that
list, keep the items in 1 array and put the positions into a 2nd array.
This is generally slower while sorting, but allows multiple improvements:
1. We can replace items with keys
This allows avoiding multiple slow lookups when using complex
comparisons
2. We can keep multiple position arrays
This allows doing a sorting in the background without actually
emitting items-changed() until the array is completely sorted.
3. The main list tracks the items in the original model
So only a single memmove() is necessary there, while the old version
had to upgrade the position in every item.
Benchmarks:
sorting a model of simple strings
old new
256,000 items 256ms 268ms
512,000 items 569ms 638ms
sorting a model of file trees, directories first, by size
old new
64,000 items 350ms 364ms
128,000 items 667ms 691ms
removing half the model
old new
512,000 items 24ms 15ms
1,024,000 items 49ms 25ms
2020-07-21 01:09:10 +00:00
|
|
|
if (self->positions == NULL)
|
2020-07-21 00:50:45 +00:00
|
|
|
gtk_sort_list_model_create_items (self);
|
|
|
|
|
|
|
|
gtk_sort_list_model_stop_sorting (self, NULL);
|
2020-07-16 23:56:18 +00:00
|
|
|
|
2020-07-21 00:50:45 +00:00
|
|
|
if (gtk_sort_list_model_start_sorting (self, NULL))
|
|
|
|
pos = n_items = 0;
|
|
|
|
else
|
|
|
|
gtk_sort_list_model_finish_sorting (self, &pos, &n_items);
|
|
|
|
}
|
sortlistmodel: Split the SortItem into 2 arrays
Instead of one item keeping the item + its position and sorting that
list, keep the items in 1 array and put the positions into a 2nd array.
This is generally slower while sorting, but allows multiple improvements:
1. We can replace items with keys
This allows avoiding multiple slow lookups when using complex
comparisons
2. We can keep multiple position arrays
This allows doing a sorting in the background without actually
emitting items-changed() until the array is completely sorted.
3. The main list tracks the items in the original model
So only a single memmove() is necessary there, while the old version
had to upgrade the position in every item.
Benchmarks:
sorting a model of simple strings
old new
256,000 items 256ms 268ms
512,000 items 569ms 638ms
sorting a model of file trees, directories first, by size
old new
64,000 items 350ms 364ms
128,000 items 667ms 691ms
removing half the model
old new
512,000 items 24ms 15ms
1,024,000 items 49ms 25ms
2020-07-21 01:09:10 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
gtk_sort_list_model_clear_items (self, &pos, &n_items);
|
|
|
|
}
|
2020-07-16 23:56:18 +00:00
|
|
|
|
2020-07-21 00:50:45 +00:00
|
|
|
if (n_items > 0)
|
|
|
|
g_list_model_items_changed (G_LIST_MODEL (self), pos, n_items, n_items);
|
2019-12-03 04:44:22 +00:00
|
|
|
}
|
|
|
|
|
2018-09-14 02:34:40 +00:00
|
|
|
static void
|
|
|
|
gtk_sort_list_model_clear_model (GtkSortListModel *self)
|
|
|
|
{
|
|
|
|
if (self->model == NULL)
|
|
|
|
return;
|
|
|
|
|
|
|
|
g_signal_handlers_disconnect_by_func (self->model, gtk_sort_list_model_items_changed_cb, self);
|
|
|
|
g_clear_object (&self->model);
|
2020-07-21 00:50:45 +00:00
|
|
|
gtk_sort_list_model_clear_items (self, NULL, NULL);
|
sortlistmodel: Split the SortItem into 2 arrays
Instead of one item keeping the item + its position and sorting that
list, keep the items in 1 array and put the positions into a 2nd array.
This is generally slower while sorting, but allows multiple improvements:
1. We can replace items with keys
This allows avoiding multiple slow lookups when using complex
comparisons
2. We can keep multiple position arrays
This allows doing a sorting in the background without actually
emitting items-changed() until the array is completely sorted.
3. The main list tracks the items in the original model
So only a single memmove() is necessary there, while the old version
had to upgrade the position in every item.
Benchmarks:
sorting a model of simple strings
old new
256,000 items 256ms 268ms
512,000 items 569ms 638ms
sorting a model of file trees, directories first, by size
old new
64,000 items 350ms 364ms
128,000 items 667ms 691ms
removing half the model
old new
512,000 items 24ms 15ms
1,024,000 items 49ms 25ms
2020-07-21 01:09:10 +00:00
|
|
|
self->n_items = 0;
|
2018-09-14 02:34:40 +00:00
|
|
|
}
|
|
|
|
|
2019-12-03 04:44:22 +00:00
|
|
|
static void
|
|
|
|
gtk_sort_list_model_clear_sorter (GtkSortListModel *self)
|
|
|
|
{
|
|
|
|
if (self->sorter == NULL)
|
|
|
|
return;
|
|
|
|
|
|
|
|
g_signal_handlers_disconnect_by_func (self->sorter, gtk_sort_list_model_sorter_changed_cb, self);
|
|
|
|
g_clear_object (&self->sorter);
|
|
|
|
}
|
|
|
|
|
2018-09-14 02:34:40 +00:00
|
|
|
static void
|
|
|
|
gtk_sort_list_model_dispose (GObject *object)
|
|
|
|
{
|
|
|
|
GtkSortListModel *self = GTK_SORT_LIST_MODEL (object);
|
|
|
|
|
|
|
|
gtk_sort_list_model_clear_model (self);
|
2019-12-03 04:44:22 +00:00
|
|
|
gtk_sort_list_model_clear_sorter (self);
|
2018-09-14 02:34:40 +00:00
|
|
|
|
|
|
|
G_OBJECT_CLASS (gtk_sort_list_model_parent_class)->dispose (object);
|
|
|
|
};
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_sort_list_model_class_init (GtkSortListModelClass *class)
|
|
|
|
{
|
|
|
|
GObjectClass *gobject_class = G_OBJECT_CLASS (class);
|
|
|
|
|
|
|
|
gobject_class->set_property = gtk_sort_list_model_set_property;
|
|
|
|
gobject_class->get_property = gtk_sort_list_model_get_property;
|
|
|
|
gobject_class->dispose = gtk_sort_list_model_dispose;
|
|
|
|
|
|
|
|
/**
|
2020-07-21 00:50:45 +00:00
|
|
|
* GtkSortListModel:incremental:
|
2018-09-14 02:34:40 +00:00
|
|
|
*
|
2020-07-21 00:50:45 +00:00
|
|
|
* If the model should sort items incrementally
|
2018-09-14 02:34:40 +00:00
|
|
|
*/
|
2020-07-21 00:50:45 +00:00
|
|
|
properties[PROP_INCREMENTAL] =
|
|
|
|
g_param_spec_boolean ("incremental",
|
|
|
|
P_("Incremental"),
|
|
|
|
P_("Sort items incrementally"),
|
|
|
|
FALSE,
|
2019-12-03 04:44:22 +00:00
|
|
|
GTK_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
|
2018-09-14 02:34:40 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* GtkSortListModel:model:
|
|
|
|
*
|
|
|
|
* The model being sorted
|
|
|
|
*/
|
|
|
|
properties[PROP_MODEL] =
|
|
|
|
g_param_spec_object ("model",
|
|
|
|
P_("Model"),
|
|
|
|
P_("The model being sorted"),
|
|
|
|
G_TYPE_LIST_MODEL,
|
2020-07-07 21:18:46 +00:00
|
|
|
GTK_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
|
2018-09-14 02:34:40 +00:00
|
|
|
|
2020-07-21 00:50:45 +00:00
|
|
|
/**
|
|
|
|
* GtkSortListModel:sorter:
|
|
|
|
*
|
|
|
|
* The sorter for this model
|
|
|
|
*/
|
|
|
|
properties[PROP_SORTER] =
|
|
|
|
g_param_spec_object ("sorter",
|
|
|
|
P_("Sorter"),
|
|
|
|
P_("The sorter for this model"),
|
|
|
|
GTK_TYPE_SORTER,
|
|
|
|
GTK_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
|
|
|
|
|
2018-09-14 02:34:40 +00:00
|
|
|
g_object_class_install_properties (gobject_class, NUM_PROPERTIES, properties);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_sort_list_model_init (GtkSortListModel *self)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* gtk_sort_list_model_new:
|
2020-07-04 19:47:48 +00:00
|
|
|
* @model: (allow-none): the model to sort
|
2019-12-03 04:44:22 +00:00
|
|
|
* @sorter: (allow-none): the #GtkSorter to sort @model with
|
2018-09-14 02:34:40 +00:00
|
|
|
*
|
2019-12-03 04:44:22 +00:00
|
|
|
* Creates a new sort list model that uses the @sorter to sort @model.
|
2018-09-14 02:34:40 +00:00
|
|
|
*
|
|
|
|
* Returns: a new #GtkSortListModel
|
|
|
|
**/
|
|
|
|
GtkSortListModel *
|
2019-12-03 04:44:22 +00:00
|
|
|
gtk_sort_list_model_new (GListModel *model,
|
|
|
|
GtkSorter *sorter)
|
2018-09-14 02:34:40 +00:00
|
|
|
{
|
|
|
|
GtkSortListModel *result;
|
|
|
|
|
2020-07-04 19:47:48 +00:00
|
|
|
g_return_val_if_fail (model == NULL || G_IS_LIST_MODEL (model), NULL);
|
2019-12-03 04:44:22 +00:00
|
|
|
g_return_val_if_fail (sorter == NULL || GTK_IS_SORTER (sorter), NULL);
|
2018-09-14 02:34:40 +00:00
|
|
|
|
|
|
|
result = g_object_new (GTK_TYPE_SORT_LIST_MODEL,
|
|
|
|
"model", model,
|
2019-12-03 04:44:22 +00:00
|
|
|
"sorter", sorter,
|
2018-09-14 02:34:40 +00:00
|
|
|
NULL);
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* gtk_sort_list_model_set_model:
|
|
|
|
* @self: a #GtkSortListModel
|
|
|
|
* @model: (allow-none): The model to be sorted
|
|
|
|
*
|
|
|
|
* Sets the model to be sorted. The @model's item type must conform to
|
|
|
|
* the item type of @self.
|
|
|
|
**/
|
|
|
|
void
|
|
|
|
gtk_sort_list_model_set_model (GtkSortListModel *self,
|
|
|
|
GListModel *model)
|
|
|
|
{
|
sortlistmodel: Split the SortItem into 2 arrays
Instead of one item keeping the item + its position and sorting that
list, keep the items in 1 array and put the positions into a 2nd array.
This is generally slower while sorting, but allows multiple improvements:
1. We can replace items with keys
This allows avoiding multiple slow lookups when using complex
comparisons
2. We can keep multiple position arrays
This allows doing a sorting in the background without actually
emitting items-changed() until the array is completely sorted.
3. The main list tracks the items in the original model
So only a single memmove() is necessary there, while the old version
had to upgrade the position in every item.
Benchmarks:
sorting a model of simple strings
old new
256,000 items 256ms 268ms
512,000 items 569ms 638ms
sorting a model of file trees, directories first, by size
old new
64,000 items 350ms 364ms
128,000 items 667ms 691ms
removing half the model
old new
512,000 items 24ms 15ms
1,024,000 items 49ms 25ms
2020-07-21 01:09:10 +00:00
|
|
|
guint removed;
|
2018-09-14 02:34:40 +00:00
|
|
|
|
|
|
|
g_return_if_fail (GTK_IS_SORT_LIST_MODEL (self));
|
|
|
|
g_return_if_fail (model == NULL || G_IS_LIST_MODEL (model));
|
|
|
|
|
|
|
|
if (self->model == model)
|
|
|
|
return;
|
|
|
|
|
|
|
|
removed = g_list_model_get_n_items (G_LIST_MODEL (self));
|
|
|
|
gtk_sort_list_model_clear_model (self);
|
|
|
|
|
|
|
|
if (model)
|
|
|
|
{
|
2020-07-21 00:50:45 +00:00
|
|
|
guint ignore1, ignore2;
|
|
|
|
|
2018-09-14 02:34:40 +00:00
|
|
|
self->model = g_object_ref (model);
|
sortlistmodel: Split the SortItem into 2 arrays
Instead of one item keeping the item + its position and sorting that
list, keep the items in 1 array and put the positions into a 2nd array.
This is generally slower while sorting, but allows multiple improvements:
1. We can replace items with keys
This allows avoiding multiple slow lookups when using complex
comparisons
2. We can keep multiple position arrays
This allows doing a sorting in the background without actually
emitting items-changed() until the array is completely sorted.
3. The main list tracks the items in the original model
So only a single memmove() is necessary there, while the old version
had to upgrade the position in every item.
Benchmarks:
sorting a model of simple strings
old new
256,000 items 256ms 268ms
512,000 items 569ms 638ms
sorting a model of file trees, directories first, by size
old new
64,000 items 350ms 364ms
128,000 items 667ms 691ms
removing half the model
old new
512,000 items 24ms 15ms
1,024,000 items 49ms 25ms
2020-07-21 01:09:10 +00:00
|
|
|
self->n_items = g_list_model_get_n_items (model);
|
2018-09-14 02:34:40 +00:00
|
|
|
g_signal_connect (model, "items-changed", G_CALLBACK (gtk_sort_list_model_items_changed_cb), self);
|
|
|
|
|
sortlistmodel: Split the SortItem into 2 arrays
Instead of one item keeping the item + its position and sorting that
list, keep the items in 1 array and put the positions into a 2nd array.
This is generally slower while sorting, but allows multiple improvements:
1. We can replace items with keys
This allows avoiding multiple slow lookups when using complex
comparisons
2. We can keep multiple position arrays
This allows doing a sorting in the background without actually
emitting items-changed() until the array is completely sorted.
3. The main list tracks the items in the original model
So only a single memmove() is necessary there, while the old version
had to upgrade the position in every item.
Benchmarks:
sorting a model of simple strings
old new
256,000 items 256ms 268ms
512,000 items 569ms 638ms
sorting a model of file trees, directories first, by size
old new
64,000 items 350ms 364ms
128,000 items 667ms 691ms
removing half the model
old new
512,000 items 24ms 15ms
1,024,000 items 49ms 25ms
2020-07-21 01:09:10 +00:00
|
|
|
if (gtk_sort_list_model_should_sort (self))
|
|
|
|
{
|
|
|
|
gtk_sort_list_model_create_items (self);
|
|
|
|
if (!gtk_sort_list_model_start_sorting (self, NULL))
|
|
|
|
gtk_sort_list_model_finish_sorting (self, &ignore1, &ignore2);
|
|
|
|
}
|
2018-09-14 02:34:40 +00:00
|
|
|
}
|
|
|
|
|
sortlistmodel: Split the SortItem into 2 arrays
Instead of one item keeping the item + its position and sorting that
list, keep the items in 1 array and put the positions into a 2nd array.
This is generally slower while sorting, but allows multiple improvements:
1. We can replace items with keys
This allows avoiding multiple slow lookups when using complex
comparisons
2. We can keep multiple position arrays
This allows doing a sorting in the background without actually
emitting items-changed() until the array is completely sorted.
3. The main list tracks the items in the original model
So only a single memmove() is necessary there, while the old version
had to upgrade the position in every item.
Benchmarks:
sorting a model of simple strings
old new
256,000 items 256ms 268ms
512,000 items 569ms 638ms
sorting a model of file trees, directories first, by size
old new
64,000 items 350ms 364ms
128,000 items 667ms 691ms
removing half the model
old new
512,000 items 24ms 15ms
1,024,000 items 49ms 25ms
2020-07-21 01:09:10 +00:00
|
|
|
if (removed > 0 || self->n_items > 0)
|
|
|
|
g_list_model_items_changed (G_LIST_MODEL (self), 0, removed, self->n_items);
|
2018-09-14 02:34:40 +00:00
|
|
|
|
|
|
|
g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_MODEL]);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* gtk_sort_list_model_get_model:
|
|
|
|
* @self: a #GtkSortListModel
|
|
|
|
*
|
|
|
|
* Gets the model currently sorted or %NULL if none.
|
|
|
|
*
|
|
|
|
* Returns: (nullable) (transfer none): The model that gets sorted
|
|
|
|
**/
|
|
|
|
GListModel *
|
|
|
|
gtk_sort_list_model_get_model (GtkSortListModel *self)
|
|
|
|
{
|
|
|
|
g_return_val_if_fail (GTK_IS_SORT_LIST_MODEL (self), NULL);
|
|
|
|
|
|
|
|
return self->model;
|
|
|
|
}
|
|
|
|
|
2019-12-03 04:44:22 +00:00
|
|
|
/**
|
|
|
|
* gtk_sort_list_model_set_sorter:
|
|
|
|
* @self: a #GtkSortListModel
|
|
|
|
* @sorter: (allow-none): the #GtkSorter to sort @model with
|
|
|
|
*
|
|
|
|
* Sets a new sorter on @self.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
gtk_sort_list_model_set_sorter (GtkSortListModel *self,
|
|
|
|
GtkSorter *sorter)
|
|
|
|
{
|
|
|
|
g_return_if_fail (GTK_IS_SORT_LIST_MODEL (self));
|
|
|
|
g_return_if_fail (sorter == NULL || GTK_IS_SORTER (sorter));
|
|
|
|
|
|
|
|
gtk_sort_list_model_clear_sorter (self);
|
|
|
|
|
|
|
|
if (sorter)
|
|
|
|
{
|
|
|
|
self->sorter = g_object_ref (sorter);
|
|
|
|
g_signal_connect (sorter, "changed", G_CALLBACK (gtk_sort_list_model_sorter_changed_cb), self);
|
|
|
|
}
|
|
|
|
|
sortlistmodel: Split the SortItem into 2 arrays
Instead of one item keeping the item + its position and sorting that
list, keep the items in 1 array and put the positions into a 2nd array.
This is generally slower while sorting, but allows multiple improvements:
1. We can replace items with keys
This allows avoiding multiple slow lookups when using complex
comparisons
2. We can keep multiple position arrays
This allows doing a sorting in the background without actually
emitting items-changed() until the array is completely sorted.
3. The main list tracks the items in the original model
So only a single memmove() is necessary there, while the old version
had to upgrade the position in every item.
Benchmarks:
sorting a model of simple strings
old new
256,000 items 256ms 268ms
512,000 items 569ms 638ms
sorting a model of file trees, directories first, by size
old new
64,000 items 350ms 364ms
128,000 items 667ms 691ms
removing half the model
old new
512,000 items 24ms 15ms
1,024,000 items 49ms 25ms
2020-07-21 01:09:10 +00:00
|
|
|
gtk_sort_list_model_sorter_changed_cb (sorter, GTK_SORTER_CHANGE_DIFFERENT, self);
|
|
|
|
|
2019-12-03 04:44:22 +00:00
|
|
|
g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_SORTER]);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* gtk_sort_list_model_get_sorter:
|
2020-07-16 23:56:18 +00:00
|
|
|
* @self: a #GtkSortListModel
|
2019-12-03 04:44:22 +00:00
|
|
|
*
|
|
|
|
* Gets the sorter that is used to sort @self.
|
|
|
|
*
|
|
|
|
* Returns: (nullable) (transfer none): the sorter of #self
|
|
|
|
*/
|
|
|
|
GtkSorter *
|
|
|
|
gtk_sort_list_model_get_sorter (GtkSortListModel *self)
|
|
|
|
{
|
|
|
|
g_return_val_if_fail (GTK_IS_SORT_LIST_MODEL (self), NULL);
|
|
|
|
|
|
|
|
return self->sorter;
|
|
|
|
}
|
2020-07-21 00:50:45 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* gtk_sort_list_model_set_incremental:
|
|
|
|
* @self: a #GtkSortListModel
|
|
|
|
* @incremental: %TRUE to sort incrementally
|
|
|
|
*
|
|
|
|
* Sets the sort model to do an incremental sort.
|
|
|
|
*
|
|
|
|
* When incremental sorting is enabled, the sortlistmodel will not do
|
|
|
|
* a complete sort immediately, but will instead queue an idle handler that
|
|
|
|
* incrementally sorts the items towards their correct position. This of
|
|
|
|
* course means that items do not instantly appear in the right place. It
|
|
|
|
* also means that the total sorting time is a lot slower.
|
|
|
|
*
|
|
|
|
* When your filter blocks the UI while sorting, you might consider
|
|
|
|
* turning this on. Depending on your model and sorters, this may become
|
|
|
|
* interesting around 10,000 to 100,000 items.
|
|
|
|
*
|
|
|
|
* By default, incremental sorting is disabled.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
gtk_sort_list_model_set_incremental (GtkSortListModel *self,
|
|
|
|
gboolean incremental)
|
|
|
|
{
|
|
|
|
g_return_if_fail (GTK_IS_SORT_LIST_MODEL (self));
|
|
|
|
|
|
|
|
if (self->incremental == incremental)
|
|
|
|
return;
|
|
|
|
|
|
|
|
self->incremental = incremental;
|
|
|
|
|
|
|
|
if (!incremental && gtk_sort_list_model_is_sorting (self))
|
|
|
|
{
|
|
|
|
guint pos, n_items;
|
|
|
|
|
|
|
|
gtk_sort_list_model_finish_sorting (self, &pos, &n_items);
|
|
|
|
if (n_items)
|
|
|
|
g_list_model_items_changed (G_LIST_MODEL (self), pos, n_items, n_items);
|
|
|
|
}
|
|
|
|
|
|
|
|
g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_INCREMENTAL]);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* gtk_sort_list_model_get_incremental:
|
|
|
|
* @self: a #GtkSortListModel
|
|
|
|
*
|
|
|
|
* Returns whether incremental sorting was enabled via
|
|
|
|
* gtk_sort_list_model_set_incremental().
|
|
|
|
*
|
|
|
|
* Returns: %TRUE if incremental sorting is enabled
|
|
|
|
*/
|
|
|
|
gboolean
|
|
|
|
gtk_sort_list_model_get_incremental (GtkSortListModel *self)
|
|
|
|
{
|
|
|
|
g_return_val_if_fail (GTK_IS_SORT_LIST_MODEL (self), FALSE);
|
|
|
|
|
|
|
|
return self->incremental;
|
|
|
|
}
|