Adding a tail pointer to each list increases memory footprint by four bytes, while reducing the runtime of llist_add() from O(n) to O(1). In testing, the time required to append 100000 elements to a linked list was reduced from 29.245s to 0.009s. Our second main concern is to reduce the runtime of llist_add_sorted() when inserting elements from a presorted list (this is reduced from O(n) to O(1) as well), since the data files contain appointments in sorted order and are always processed front to back. Some local numbers show how this speeds up calcurse startup (test set with 50000 appointments): 0.22user 0.12system 0:00.35elapsed 99%CPU (0avgtext+0avgdata 5396maxresident)k 0inputs+8outputs (0major+1398minor)pagefaults 0swaps As opposed to the unpatched binary: 21.97user 0.25system 0:22.23elapsed 99%CPU (0avgtext+0avgdata 5388maxresident)k 0inputs+48outputs (0major+1396minor)pagefaults 0swaps This is a ~10000% increase in speed. Timings for reading random input files generated by a script stay the same (32.391s vs. 31.776s). Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
265 lines
5.0 KiB
C
265 lines
5.0 KiB
C
/*
|
|
* Calcurse - text-based organizer
|
|
*
|
|
* Copyright (c) 2004-2011 calcurse Development Team <misc@calcurse.org>
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
*
|
|
* - Redistributions of source code must retain the above
|
|
* copyright notice, this list of conditions and the
|
|
* following disclaimer.
|
|
*
|
|
* - Redistributions in binary form must reproduce the above
|
|
* copyright notice, this list of conditions and the
|
|
* following disclaimer in the documentation and/or other
|
|
* materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*
|
|
* Send your feedback or comments to : misc@calcurse.org
|
|
* Calcurse home page : http://calcurse.org
|
|
*
|
|
*/
|
|
|
|
#include "calcurse.h"
|
|
|
|
/*
|
|
* Initialize a list.
|
|
*/
|
|
void
|
|
llist_init (llist_t *l)
|
|
{
|
|
l->head = NULL;
|
|
l->tail = NULL;
|
|
}
|
|
|
|
/*
|
|
* Free a list, but not the contained data.
|
|
*/
|
|
void
|
|
llist_free (llist_t *l)
|
|
{
|
|
llist_item_t *i, *t;
|
|
|
|
for (i = l->head; i; i = t)
|
|
{
|
|
t = i->next;
|
|
mem_free (i);
|
|
}
|
|
|
|
l->head = NULL;
|
|
l->tail = NULL;
|
|
}
|
|
|
|
/*
|
|
* Free the data contained in a list.
|
|
*/
|
|
void
|
|
llist_free_inner (llist_t *l, llist_fn_free_t fn_free)
|
|
{
|
|
llist_item_t *i;
|
|
|
|
for (i = l->head; i; i = i->next)
|
|
{
|
|
if (i->data)
|
|
{
|
|
fn_free(i->data);
|
|
i->data = NULL;
|
|
}
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Get the first item of a list.
|
|
*/
|
|
llist_item_t *
|
|
llist_first (llist_t *l)
|
|
{
|
|
return l->head;
|
|
}
|
|
|
|
/*
|
|
* Get the nth item of a list.
|
|
*/
|
|
llist_item_t *
|
|
llist_nth (llist_t *l, int n)
|
|
{
|
|
llist_item_t *i;
|
|
|
|
for (i = l->head; i && n > 0; n--)
|
|
i = i->next;
|
|
|
|
return i;
|
|
}
|
|
|
|
/*
|
|
* Get the successor of a list item.
|
|
*/
|
|
llist_item_t *
|
|
llist_next (llist_item_t *i)
|
|
{
|
|
return i ? i->next : NULL;
|
|
}
|
|
|
|
/*
|
|
* Get the actual data of an item.
|
|
*/
|
|
void *
|
|
llist_get_data (llist_item_t *i)
|
|
{
|
|
return i ? i->data : NULL;
|
|
}
|
|
|
|
/*
|
|
* Add an item at the end of a list.
|
|
*/
|
|
void
|
|
llist_add (llist_t *l, void *data)
|
|
{
|
|
llist_item_t *o = mem_malloc (sizeof (llist_item_t));
|
|
|
|
if (o)
|
|
{
|
|
o->data = data;
|
|
o->next = NULL;
|
|
|
|
if (!l->head)
|
|
l->head = l->tail = o;
|
|
else
|
|
{
|
|
l->tail->next = o;
|
|
l->tail = o;
|
|
}
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Add an item to a sorted list.
|
|
*/
|
|
void
|
|
llist_add_sorted (llist_t *l, void *data, llist_fn_cmp_t fn_cmp)
|
|
{
|
|
llist_item_t *o = mem_malloc (sizeof (llist_item_t));
|
|
llist_item_t *i;
|
|
|
|
if (o)
|
|
{
|
|
o->data = data;
|
|
o->next = NULL;
|
|
|
|
if (!l->head)
|
|
l->head = l->tail = o;
|
|
else if (fn_cmp(o->data, l->tail->data) >= 0)
|
|
{
|
|
l->tail->next = o;
|
|
l->tail = o;
|
|
}
|
|
else if (fn_cmp(o->data, l->head->data) < 0)
|
|
{
|
|
o->next = l->head;
|
|
l->head = o;
|
|
}
|
|
else
|
|
{
|
|
i = l->head;
|
|
while (i->next && fn_cmp(o->data, i->next->data) >= 0)
|
|
i = i->next;
|
|
o->next = i->next;
|
|
i->next = o;
|
|
}
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Remove an item from a list.
|
|
*/
|
|
void
|
|
llist_remove (llist_t *l, llist_item_t *i)
|
|
{
|
|
llist_item_t *j = NULL;
|
|
|
|
if (l->head && i == l->head)
|
|
l->head = i->next;
|
|
else
|
|
{
|
|
for (j = l->head; j && j->next != i; j = j->next)
|
|
;
|
|
}
|
|
|
|
if (i)
|
|
{
|
|
if (j)
|
|
j->next = i->next;
|
|
if (i == l->tail)
|
|
l->tail = j;
|
|
|
|
mem_free (i);
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Find the first item matched by some filter callback.
|
|
*/
|
|
llist_item_t *
|
|
llist_find_first (llist_t *l, long data, llist_fn_match_t fn_match)
|
|
{
|
|
llist_item_t *i;
|
|
|
|
for (i = l->head; i; i = i->next)
|
|
{
|
|
if (fn_match (i->data, data))
|
|
return i;
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
/*
|
|
* Find the next item matched by some filter callback.
|
|
*/
|
|
llist_item_t *
|
|
llist_find_next (llist_item_t *i, long data, llist_fn_match_t fn_match)
|
|
{
|
|
if (i)
|
|
{
|
|
i = i->next;
|
|
for (; i; i = i->next)
|
|
{
|
|
if (fn_match (i->data, data))
|
|
return i;
|
|
}
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
/*
|
|
* Find the nth item matched by some filter callback.
|
|
*/
|
|
llist_item_t *
|
|
llist_find_nth (llist_t *l, int n, long data, llist_fn_match_t fn_match)
|
|
{
|
|
llist_item_t *i;
|
|
|
|
for (i = l->head; i; i = i->next)
|
|
{
|
|
if (fn_match (i->data, data) && (n-- == 0))
|
|
return i;
|
|
}
|
|
|
|
return NULL;
|
|
}
|