r3927 - in trunk/birnet: . tests
- From: timj svn gnome org
- To: svn-commits-list gnome org
- Subject: r3927 - in trunk/birnet: . tests
- Date: Tue, 3 Oct 2006 11:37:25 -0400 (EDT)
Author: timj
Date: 2006-10-03 11:37:24 -0400 (Tue, 03 Oct 2006)
New Revision: 3927
Removed:
trunk/birnet/birnetring.c
trunk/birnet/birnetring.h
trunk/birnet/tests/ring.cc
Modified:
trunk/birnet/ChangeLog
trunk/birnet/Makefile.am
trunk/birnet/birnet.h
trunk/birnet/birnetthread.c
trunk/birnet/tests/Makefile.am
Log:
Tue Oct 3 17:26:50 2006 Tim Janik <timj gtk org>
* tests/ring.cc:
* birnetring.[hc]: removed, moved to sfi/ as SfiRing.
* birnetthread.c: ported from BirnetRing to GSList.
Modified: trunk/birnet/ChangeLog
===================================================================
--- trunk/birnet/ChangeLog 2006-10-03 15:28:27 UTC (rev 3926)
+++ trunk/birnet/ChangeLog 2006-10-03 15:37:24 UTC (rev 3927)
@@ -1,3 +1,10 @@
+Tue Oct 3 17:26:50 2006 Tim Janik <timj gtk org>
+
+ * tests/ring.cc:
+ * birnetring.[hc]: removed, moved to sfi/ as SfiRing.
+
+ * birnetthread.c: ported from BirnetRing to GSList.
+
Sun Oct 1 13:31:47 2006 Tim Janik <timj gtk org>
* birnetutilsxx.hh: added Deletable docs.
Modified: trunk/birnet/Makefile.am
===================================================================
--- trunk/birnet/Makefile.am 2006-10-03 15:28:27 UTC (rev 3926)
+++ trunk/birnet/Makefile.am 2006-10-03 15:37:24 UTC (rev 3927)
@@ -13,7 +13,6 @@
birnetcore.h \
birnetcpu.h \
birnetmsg.h \
- birnetring.h \
birnetsignal.hh \
birnettests.h \
birnetthread.h \
@@ -25,7 +24,6 @@
birnetcore.c \
birnetcpu.c \
birnetmsg.c \
- birnetring.c \
birnetsignal.cc \
birnetthread.c \
birnetthreadxx.cc \
Modified: trunk/birnet/birnet.h
===================================================================
--- trunk/birnet/birnet.h 2006-10-03 15:28:27 UTC (rev 3926)
+++ trunk/birnet/birnet.h 2006-10-03 15:37:24 UTC (rev 3927)
@@ -25,7 +25,6 @@
#include <birnet/birnetutils.h>
#include <birnet/birnetmsg.h>
-#include <birnet/birnetring.h>
#include <birnet/birnetthread.h>
#ifdef __cplusplus
Deleted: trunk/birnet/birnetring.c
===================================================================
--- trunk/birnet/birnetring.c 2006-10-03 15:28:27 UTC (rev 3926)
+++ trunk/birnet/birnetring.c 2006-10-03 15:37:24 UTC (rev 3927)
@@ -1,1180 +0,0 @@
-/* BirnetRing
- * Copyright (C) 2002-2006 Tim Janik
- *
- * 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 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, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#include <stdlib.h>
-#include <string.h>
-#include "birnetring.h"
-
-#define HAVE_GSLICE GLIB_CHECK_VERSION (2, 9, 7)
-
-/* --- memory handling --- */
-static inline gulong
-alloc_upper_power2 (const gulong number)
-{
- return number ? 1 << g_bit_storage (number - 1) : 0;
-}
-
-static inline BirnetRing*
-node_alloc (void)
-{
-#if HAVE_GSLICE
- return g_slice_new (BirnetRing);
-#else
- return (BirnetRing*) g_list_alloc();
-#endif
-}
-
-static inline void
-node_free (BirnetRing *node)
-{
-#if HAVE_GSLICE
- g_slice_free (BirnetRing, node);
-#else
- g_list_free_1 ((GList*) node);
-#endif
-}
-
-static inline void
-free_node_list (BirnetRing *start)
-{
- /* NULL terminated list of ->next pointers */
-#if HAVE_GSLICE
- g_slice_free_chain (BirnetRing, start, next);
-#else
- g_list_free ((GList*) start);
-#endif
-}
-
-/* --- basic comparisons --- */
-gint
-birnet_pointer_cmp (gconstpointer value1,
- gconstpointer value2,
- gpointer dummy)
-{
- const char *p1 = value1;
- const char *p2 = value2;
- return p1 < p2 ? -1 : p1 != p2;
-}
-
-
-/* --- ring (circular-list) --- */
-static inline BirnetRing*
-birnet_ring_prepend_link_i (BirnetRing *head,
- BirnetRing *ring)
-{
- if (!head)
- {
- ring->prev = ring;
- ring->next = ring;
- }
- else
- {
- ring->prev = head->prev;
- ring->next = head;
- head->prev->next = ring;
- head->prev = ring;
- }
- return ring;
-}
-
-static inline BirnetRing*
-birnet_ring_prepend_i (BirnetRing *head,
- gpointer data)
-{
- BirnetRing *ring = node_alloc();
-
- ring->data = data;
- return birnet_ring_prepend_link_i (head, ring);
-}
-
-static inline BirnetRing*
-birnet_ring_append_link_i (BirnetRing *head,
- BirnetRing *ring)
-{
- birnet_ring_prepend_link_i (head, ring);
- return head ? head : ring;
-}
-
-BirnetRing*
-birnet_ring_prepend (BirnetRing *head,
- gpointer data)
-{
- return birnet_ring_prepend_i (head, data);
-}
-
-BirnetRing*
-birnet_ring_prepend_uniq (BirnetRing *head,
- gpointer data)
-{
- BirnetRing *ring;
- for (ring = head; ring; ring = birnet_ring_walk (ring, head))
- if (ring->data == data)
- return head;
- return birnet_ring_prepend_i (head, data);
-}
-
-BirnetRing*
-birnet_ring_append (BirnetRing *head,
- gpointer data)
-{
- BirnetRing *ring = birnet_ring_prepend_i (head, data);
- return head ? head : ring;
-}
-
-BirnetRing*
-birnet_ring_append_uniq (BirnetRing *head,
- gpointer data)
-{
- BirnetRing *ring;
- for (ring = head; ring; ring = birnet_ring_walk (ring, head))
- if (ring->data == data)
- return head;
- ring = birnet_ring_prepend_i (head, data);
- return head ? head : ring;
-}
-
-BirnetRing*
-birnet_ring_insert_before (BirnetRing *head,
- BirnetRing *sibling,
- gpointer data)
-{
- if (!sibling)
- return birnet_ring_append (head, data);
- BirnetRing *node = birnet_ring_prepend (sibling, data);
- return sibling == head ? node : head;
-}
-
-BirnetRing*
-birnet_ring_insert (BirnetRing *head,
- gpointer data,
- gint position)
-{
- if (position < 0)
- return birnet_ring_append (head, data);
- else if (position == 0)
- return birnet_ring_prepend (head, data);
- BirnetRing *node = birnet_ring_nth (head, position);
- if (node)
- return birnet_ring_insert_before (head, node, data);
- else
- return birnet_ring_append (head, data);
-}
-
-gint
-birnet_ring_position (const BirnetRing *head,
- const BirnetRing *node)
-{
- guint i = 0;
- const BirnetRing *ring;
- for (ring = head; ring; ring = birnet_ring_walk (ring, head), i++)
- if (ring == node)
- return i;
- return -1;
-}
-
-gint
-birnet_ring_index (const BirnetRing *head,
- gconstpointer data)
-{
- guint i = 0;
- const BirnetRing *ring;
- for (ring = head; ring; ring = birnet_ring_walk (ring, head), i++)
- if (ring->data == data)
- return i;
- return -1;
-}
-
-BirnetRing*
-birnet_ring_copy (const BirnetRing *head)
-{
- const BirnetRing *walk;
- BirnetRing *dest = NULL;
- for (walk = head; walk; walk = birnet_ring_walk (walk, head))
- dest = birnet_ring_append (dest, walk->data);
- return dest;
-}
-
-BirnetRing*
-birnet_ring_copy_deep (const BirnetRing *head,
- BirnetRingDataFunc copy,
- gpointer func_data)
-{
- const BirnetRing *walk;
- BirnetRing *dest = NULL;
- for (walk = head; walk; walk = birnet_ring_walk (walk, head))
- dest = birnet_ring_append (dest, copy (walk->data, func_data));
- return dest;
-}
-
-BirnetRing*
-birnet_ring_copy_rest (const BirnetRing *ring,
- const BirnetRing *head)
-{
- const BirnetRing *walk;
- BirnetRing *dest = NULL;
- for (walk = ring; walk; walk = birnet_ring_walk (walk, head))
- dest = birnet_ring_append (dest, walk->data);
- return dest;
-}
-
-BirnetRing*
-birnet_ring_concat (BirnetRing *head1,
- BirnetRing *head2)
-{
- BirnetRing *tail1, *tail2;
-
- if (!head1)
- return head2;
- if (!head2)
- return head1;
- tail1 = head1->prev;
- tail2 = head2->prev;
- head1->prev = tail2;
- tail2->next = head1;
- head2->prev = tail1;
- tail1->next = head2;
-
- return head1;
-}
-
-/**
- * @param head1 a non-empty ring
- * @param head2 a ring node different from @a head1 contained in @a head1
- * @param returns @a head2 for convenience
- *
- * Split a ring into two parts, starting the second ring with @a head2.
- * @a head2 must therefore be non-NULL and must be contained in the ring
- * formed by @a head1.
- */
-BirnetRing*
-birnet_ring_split (BirnetRing *head1,
- BirnetRing *head2)
-{
- BirnetRing *tail1, *tail2;
-
- g_return_val_if_fail (head1 != NULL, NULL);
- g_return_val_if_fail (head2 != NULL, NULL);
- g_return_val_if_fail (head1 != head2, NULL);
-
- tail1 = head2->prev;
- tail2 = head1->prev;
- head2->prev = tail2;
- tail2->next = head2;
- head1->prev = tail1;
- tail1->next = head1;
- return head2;
-}
-
-static inline BirnetRing*
-birnet_ring_unlink_node_dangling (BirnetRing *head,
- BirnetRing *node)
-{
- g_assert (head && node);
- /* special case one item ring */
- if (head->prev == head)
- return NULL;
- /* unlink */
- node->next->prev = node->prev;
- node->prev->next = node->next;
- if (head == node)
- head = node->next;
- /* node->prev and node->next are dangling now */
- return head;
-}
-
-BirnetRing*
-birnet_ring_remove_node (BirnetRing *head,
- BirnetRing *node)
-{
- if (!head)
- g_return_val_if_fail (head == NULL && node == NULL, NULL);
- if (!head || !node)
- return NULL;
-
- /* special case one item ring */
- if (head->prev == head)
- {
- g_return_val_if_fail (node == head, head);
-
- node_free (node);
- return NULL;
- }
- g_return_val_if_fail (node != node->next, head); /* node can't be a one item ring here */
-
- node->next->prev = node->prev;
- node->prev->next = node->next;
- if (head == node)
- head = node->next;
- node_free (node);
-
- return head;
-}
-
-BirnetRing*
-birnet_ring_reverse (BirnetRing *head)
-{
- if (head)
- {
- BirnetRing *ring = head = head->prev;
- do
- {
- BirnetRing *tmp = ring;
- ring = tmp->next;
- tmp->next = tmp->prev;
- tmp->prev = ring;
- }
- while (ring != head);
- }
- return head;
-}
-
-BirnetRing*
-birnet_ring_remove (BirnetRing *head,
- gpointer data)
-{
- BirnetRing *walk;
-
- if (!head)
- return NULL;
-
- /* make tail data removal an O(1) operation */
- if (head->prev->data == data)
- return birnet_ring_remove_node (head, head->prev);
-
- for (walk = head; walk; walk = birnet_ring_walk (walk, head))
- if (walk->data == data)
- return birnet_ring_remove_node (head, walk);
-
- /* g_warning (G_STRLOC ": couldn't find data item (%p) to remove from ring (%p)", data, head); */
-
- return head;
-}
-
-guint
-birnet_ring_length (const BirnetRing *head)
-{
- const BirnetRing *ring;
- guint i = 0;
-
- for (ring = head; ring; ring = birnet_ring_walk (ring, head))
- i++;
-
- return i;
-}
-
-gint /* essentially compute length(ring) - test_length, clamped to -1..+1 */
-birnet_ring_cmp_length (const BirnetRing *head,
- guint test_length)
-{
- const BirnetRing *ring = head;
-
- while (test_length && ring)
- {
- test_length--;
- ring = birnet_ring_walk (ring, head);
- }
-
- return test_length > 0 ? -1 : ring != NULL;
-}
-
-BirnetRing*
-birnet_ring_find (const BirnetRing*head,
- gconstpointer data)
-{
- const BirnetRing *ring;
- for (ring = head; ring; ring = birnet_ring_walk (ring, head))
- if (ring->data == (gpointer) data)
- return (BirnetRing*) ring;
- return NULL;
-}
-
-BirnetRing*
-birnet_ring_nth (const BirnetRing *head,
- guint n)
-{
- const BirnetRing *ring = head;
- while (n-- && ring)
- ring = birnet_ring_walk (ring, head);
- return (BirnetRing*) ring;
-}
-
-gpointer
-birnet_ring_nth_data (const BirnetRing *head,
- guint n)
-{
- const BirnetRing *ring = head;
-
- while (n-- && ring)
- ring = birnet_ring_walk (ring, head);
-
- return ring ? ring->data : NULL;
-}
-
-void
-birnet_ring_free_deep (BirnetRing *head,
- GDestroyNotify data_destroy)
-{
- while (head)
- {
- gpointer data = birnet_ring_pop_head (&head);
- data_destroy (data);
- data = birnet_ring_pop_head (&head);
- }
-}
-
-void
-birnet_ring_free (BirnetRing *head)
-{
- if (head)
- {
- head->prev->next = NULL;
- free_node_list (head);
- }
-}
-
-gpointer
-birnet_ring_pop_head (BirnetRing **head_p)
-{
- gpointer data;
-
- g_return_val_if_fail (head_p != NULL, NULL);
-
- if (!*head_p)
- return NULL;
- data = (*head_p)->data;
- *head_p = birnet_ring_remove_node (*head_p, *head_p);
-
- return data;
-}
-
-gpointer
-birnet_ring_pop_tail (BirnetRing **head_p)
-{
- gpointer data;
-
- g_return_val_if_fail (head_p != NULL, NULL);
-
- if (!*head_p)
- return NULL;
- data = (*head_p)->prev->data;
- *head_p = birnet_ring_remove_node (*head_p, (*head_p)->prev);
-
- return data;
-}
-
-BirnetRing*
-birnet_ring_from_list (GList *list)
-{
- BirnetRing *ring = NULL;
- for (; list; list = list->next)
- ring = birnet_ring_append (ring, list->data);
- return ring;
-}
-
-BirnetRing*
-birnet_ring_from_list_and_free (GList *list)
-{
- BirnetRing *ring = NULL;
- GList *free_list = list;
- for (; list; list = list->next)
- ring = birnet_ring_append (ring, list->data);
- g_list_free (free_list);
- return ring;
-}
-
-BirnetRing*
-birnet_ring_from_slist (GSList *slist)
-{
- BirnetRing *ring = NULL;
- for (; slist; slist = slist->next)
- ring = birnet_ring_append (ring, slist->data);
- return ring;
-}
-
-BirnetRing*
-birnet_ring_from_slist_and_free (GSList *slist)
-{
- BirnetRing *ring = NULL;
- GSList *free_slist = slist;
- for (; slist; slist = slist->next)
- ring = birnet_ring_append (ring, slist->data);
- g_slist_free (free_slist);
- return ring;
-}
-
-BirnetRing*
-birnet_ring_insert_sorted (BirnetRing *head,
- gpointer insertion_data,
- BirnetCompareFunc cmp,
- gpointer cmp_data)
-{
- g_return_val_if_fail (cmp != NULL, head);
- if (!head)
- return birnet_ring_prepend (head, insertion_data);
-
- /* implement stable sorting by inserting insertion_data *after* equal nodes */
-
- if (cmp (insertion_data, head->data, cmp_data) >= 0) /* insert after head */
- {
- BirnetRing *tmp, *tail = head->prev;
-
- /* make appending an O(1) operation */
- if (head == tail || cmp (insertion_data, tail->data, cmp_data) >= 0)
- return birnet_ring_append (head, insertion_data);
-
- /* walk forward while data >= tmp (skipping equal nodes) */
- for (tmp = head->next; tmp != tail; tmp = tmp->next)
- if (cmp (insertion_data, tmp->data, cmp_data) < 0)
- break;
-
- /* insert before sibling which is greater than insertion_data */
- birnet_ring_prepend (tmp, insertion_data); /* keep current head */
- return head;
- }
- else /* cmp < 0 */
- return birnet_ring_prepend (head, insertion_data);
-}
-
-BirnetRing*
-birnet_ring_merge_sorted (BirnetRing *head1,
- BirnetRing *head2,
- BirnetCompareFunc cmp,
- gpointer data)
-{
- /* implement stable sorting by inserting head2 members *after* equal nodes from head1 */
-
- if (head1 && head2)
- {
- BirnetRing *tail1 = head1->prev;
- BirnetRing *tail2 = head2->prev;
- BirnetRing *tmp, *ring = NULL;
- /* NULL terminate rings */
- tail1->next = NULL;
- tail2->next = NULL;
- while (head1 && head2)
- {
- gint c = cmp (head1->data, head2->data, data);
- if (c <= 0)
- {
- tmp = head1;
- head1 = head1->next;
- }
- else
- {
- tmp = head2;
- head2 = head2->next;
- }
- ring = birnet_ring_append_link_i (ring, tmp);
- }
- /* reform valid rings, concat sorted rest */
- if (head1)
- {
- tail1->next = head1;
- head1->prev = tail1;
- return birnet_ring_concat (ring, head1);
- }
- if (head2)
- {
- tail2->next = head2;
- head2->prev = tail2;
- return birnet_ring_concat (ring, head2);
- }
- return ring;
- }
- else
- return birnet_ring_concat (head1, head2);
-}
-
-BirnetRing*
-birnet_ring_sort (BirnetRing *head,
- BirnetCompareFunc cmp,
- gpointer data)
-{
- g_return_val_if_fail (cmp != NULL, head);
-
- /* stable sorting guaranteed by birnet_ring_merge_sorted() */
-
- if (head && head->next != head)
- {
- BirnetRing *ring, *tmp, *tail = head->prev;
- /* find middle node to get log2 recursion depth */
- ring = tmp = head->next;
- while (tmp != tail && tmp->next != tail)
- {
- ring = ring->next;
- tmp = tmp->next->next;
- }
- birnet_ring_split (head, ring);
- return birnet_ring_merge_sorted (birnet_ring_sort (head, cmp, data),
- birnet_ring_sort (ring, cmp, data),
- cmp, data);
- }
- return head;
-}
-
-BirnetRing* /* eliminates duplicate nodes */
-birnet_ring_uniq (BirnetRing *sorted_ring1,
- BirnetCompareFunc cmp,
- gpointer data)
-{
- /* always preserves the first of a sublist of consequtive equal elements */
- BirnetRing *r1 = sorted_ring1;
- BirnetRing *r2 = NULL;
- if (r1)
- {
- BirnetRing *last = r1;
- r1 = birnet_ring_unlink_node_dangling (r1, last);
- r2 = last->next = last->prev = last; /* form new ring */
- while (r1)
- {
- BirnetRing *node = r1;
- r1 = birnet_ring_unlink_node_dangling (r1, node);
- if (cmp (last->data, node->data, data))
- {
- last = node;
- r2 = birnet_ring_append_link_i (r2, last);
- }
- else
- node_free (node);
- }
- }
- return r2;
-}
-
-BirnetRing* /* eliminates duplicate nodes */
-birnet_ring_uniq_free_deep (BirnetRing *sorted_ring1,
- BirnetCompareFunc cmp,
- gpointer data,
- GDestroyNotify data_destroy)
-{
- /* always preserves the first of a sublist of consequtive equal elements */
- if (!data_destroy)
- return birnet_ring_uniq (sorted_ring1, cmp, data);
- BirnetRing *r1 = sorted_ring1;
- BirnetRing *r2 = NULL;
- if (r1)
- {
- BirnetRing *last = r1;
- r1 = birnet_ring_unlink_node_dangling (r1, last);
- r2 = last->next = last->prev = last; /* form new ring */
- while (r1)
- {
- BirnetRing *node = r1;
- r1 = birnet_ring_unlink_node_dangling (r1, node);
- if (cmp (last->data, node->data, data))
- {
- last = node;
- r2 = birnet_ring_append_link_i (r2, last);
- }
- else
- {
- data_destroy (node->data);
- node_free (node);
- }
- }
- }
- return r2;
-}
-
-BirnetRing* /* eliminates duplicate nodes */
-birnet_ring_copy_deep_uniq (const BirnetRing *sorted_ring1,
- BirnetRingDataFunc copy,
- gpointer copy_data,
- BirnetCompareFunc cmp,
- gpointer cmp_data)
-{
- /* always preserves the first of a sublist of consequtive equal elements */
- if (!copy)
- return birnet_ring_copy_uniq (sorted_ring1, cmp, cmp_data);
- const BirnetRing *r1 = sorted_ring1;
- BirnetRing *r2 = NULL;
- if (r1)
- {
- gpointer last_data = r1->data;
- r2 = birnet_ring_append (r2, copy (last_data, copy_data));
- for (r1 = birnet_ring_walk (r1, sorted_ring1); r1; r1 = birnet_ring_walk (r1, sorted_ring1))
- if (cmp (last_data, r1->data, cmp_data))
- {
- last_data = r1->data;
- r2 = birnet_ring_append (r2, copy (last_data, copy_data));
- }
- }
- return r2;
-}
-
-BirnetRing* /* eliminates duplicate nodes */
-birnet_ring_copy_uniq (const BirnetRing *sorted_ring1,
- BirnetCompareFunc cmp,
- gpointer data)
-{
- /* always preserves the first of a sublist of consequtive equal elements */
- const BirnetRing *r1 = sorted_ring1;
- BirnetRing *r2 = NULL;
- if (r1)
- {
- gpointer last_data = r1->data;
- r2 = birnet_ring_append (r2, last_data);
- for (r1 = birnet_ring_walk (r1, sorted_ring1); r1; r1 = birnet_ring_walk (r1, sorted_ring1))
- if (cmp (last_data, r1->data, data))
- {
- last_data = r1->data;
- r2 = birnet_ring_append (r2, last_data);
- }
- }
- return r2;
-}
-
-/**
- * @param sorted_set1 Sorted ring 1
- * @param sorted_set2 Sorted ring 2
- * @param cmp Compare function for node data
- * @param data Data argument passed into the cmp() function
- * @return Newly created (or empty) ring
- *
- * Return a newly created ring that contains all data items from @a sorted_set1
- * and @a sorted_set2, omitting duplicates.
- * Items are considered equal according to the cmp() function.
- * For two equal items contained in both sets, the data pointer from
- * @a sorted_set1 will be added to the resulting set.
- * In mathematical terms, the returned ring is the union (sorted_set1, sorted_set2).
- * The complexity is O(MAX (length (sorted_set1), length (sorted_set2))).
- */
-BirnetRing* /* merges rings without dups */
-birnet_ring_union (const BirnetRing *sorted_set1,
- const BirnetRing *sorted_set2,
- BirnetCompareFunc cmp,
- gpointer data)
-{
- /* for two equal elements from both sets, the element from sorted_set1 is picked, the one from sorted_set2 ignored */
- const BirnetRing *r1 = sorted_set1, *r2 = sorted_set2;
- BirnetRing *d = NULL;
- while (r1 && r2)
- {
- gint c = cmp (r1->data, r2->data, data);
- if (c < 0)
- {
- d = birnet_ring_append (d, r1->data);
- r1 = birnet_ring_walk (r1, sorted_set1);
- }
- else if (c > 0)
- {
- d = birnet_ring_append (d, r2->data);
- r2 = birnet_ring_walk (r2, sorted_set2);
- }
- else
- {
- d = birnet_ring_append (d, r1->data);
- r1 = birnet_ring_walk (r1, sorted_set1);
- r2 = birnet_ring_walk (r2, sorted_set2);
- }
- }
- return birnet_ring_concat (d, birnet_ring_copy_rest (r1 ? r1 : r2, r1 ? sorted_set1 : sorted_set2));
-}
-
-/**
- * @param sorted_set1 Sorted ring 1
- * @param sorted_set2 Sorted ring 2
- * @param cmp Compare function for node data
- * @param data Data argument passed into the cmp() function
- * @return Newly created (or empty) ring
- *
- * Return a newly created ring that contains all data items which are contained
- * in both sets, @a sorted_set1 and @a sorted_set2.
- * Items are considered equal according to the cmp() function.
- * For two equal items contained in both sets, the data pointer from
- * @a sorted_set1 will be added to the resulting set.
- * In mathematical terms, the returned ring is the intersection (sorted_set1, sorted_set2).
- * The complexity is O(MAX (length (sorted_set1), length (sorted_set2))).
- */
-BirnetRing* /* returns nodes contained in both rings */
-birnet_ring_intersection (const BirnetRing *sorted_set1,
- const BirnetRing *sorted_set2,
- BirnetCompareFunc cmp,
- gpointer data)
-{
- /* for two equal elements from both sets, only elements from sorted_set1 are picked */
- const BirnetRing *r1 = sorted_set1, *r2 = sorted_set2;
- BirnetRing *d = NULL;
- while (r1 && r2)
- {
- gint c = cmp (r1->data, r2->data, data);
- if (c < 0)
- r1 = birnet_ring_walk (r1, sorted_set1);
- else if (c > 0)
- r2 = birnet_ring_walk (r2, sorted_set2);
- else
- {
- d = birnet_ring_append (d, r1->data);
- r1 = birnet_ring_walk (r1, sorted_set1);
- r2 = birnet_ring_walk (r2, sorted_set2);
- }
- }
- return d;
-}
-
-/**
- * @param sorted_set1 Sorted ring 1
- * @param sorted_set2 Sorted ring 2
- * @param cmp Compare function for node data
- * @param data Data argument passed into the cmp() function
- * @return Newly created (or empty) ring
- *
- * Collect and return all data items from @a sorted_set1 which are not contained in
- * @a sorted_set2, according to the cmp() function.
- * In mathematical terms, the returned ring is the difference (sorted_set1, sorted_set2).
- * The complexity is O(MAX (length (sorted_set1), length (sorted_set2))).
- */
-BirnetRing*
-birnet_ring_difference (const BirnetRing *sorted_set1,
- const BirnetRing *sorted_set2,
- BirnetCompareFunc cmp,
- gpointer data)
-{
- const BirnetRing *r1 = sorted_set1, *r2 = sorted_set2;
- BirnetRing *d = NULL;
- while (r1 && r2)
- {
- gint c = cmp (r1->data, r2->data, data);
- if (c < 0)
- {
- d = birnet_ring_append (d, r1->data);
- r1 = birnet_ring_walk (r1, sorted_set1);
- }
- else if (c > 0)
- r2 = birnet_ring_walk (r2, sorted_set2);
- else
- {
- r1 = birnet_ring_walk (r1, sorted_set1);
- r2 = birnet_ring_walk (r2, sorted_set2);
- }
- }
- return birnet_ring_concat (d, birnet_ring_copy_rest (r1, sorted_set1));
-}
-
-/**
- * @param sorted_set1 Sorted ring 1
- * @param sorted_set2 Sorted ring 2
- * @param cmp Compare function for node data
- * @param data Data argument passed into the cmp() function
- * @return Newly created (or empty) ring
- *
- * Collect and return all data items from @a sorted_set1 which are not contained in
- * @a sorted_set2, and all data items from @a sorted_set2 which are not contained in
- * @a sorted_set1, according to the cmp() function.
- * In mathematical terms, the returned ring is the union (difference (sorted_set1, sorted_set2)
- * + difference (sorted_set2, sorted_set1)).
- * The complexity is O(MAX (length (sorted_set1), length (sorted_set2))).
- */
-BirnetRing*
-birnet_ring_symmetric_difference (const BirnetRing *sorted_set1,
- const BirnetRing *sorted_set2,
- BirnetCompareFunc cmp,
- gpointer data)
-{
- const BirnetRing *r1 = sorted_set1, *r2 = sorted_set2;
- BirnetRing *d = NULL;
- while (r1 && r2)
- {
- gint c = cmp (r1->data, r2->data, data);
- if (c < 0)
- {
- d = birnet_ring_append (d, r1->data);
- r1 = birnet_ring_walk (r1, sorted_set1);
- }
- else if (c > 0)
- {
- d = birnet_ring_append (d, r2->data);
- r2 = birnet_ring_walk (r2, sorted_set2);
- }
- else
- {
- r1 = birnet_ring_walk (r1, sorted_set1);
- r2 = birnet_ring_walk (r2, sorted_set2);
- }
- }
- return birnet_ring_concat (d, birnet_ring_copy_rest (r1 ? r1 : r2, r1 ? sorted_set1 : sorted_set2));
-}
-
-static inline int
-pointerloccmp (const void *pp1,
- const void *pp2)
-{
- const gpointer *p1 = pp1;
- const gpointer *p2 = pp2;
- return *p1 < *p2 ? -1 : *p1 != *p2;
-}
-
-static inline gboolean
-ring_reorder_lookup (guint n_items,
- gpointer *items,
- gpointer key,
- guint *indexp)
-{
- guint offset = 0, n = n_items;
- while (offset < n)
- {
- guint i = (offset + n) >> 1;
- gint cmp = key < items[i] ? -1 : key != items[i];
- if (cmp < 0)
- n = i;
- else if (cmp > 0)
- offset = i + 1;
- else /* match */
- {
- *indexp = i;
- return TRUE;
- }
- }
- return FALSE;
-}
-
-/**
- * @param unordered_ring Unsorted ring
- * @param new_ring_order Ring with arbitrary order
- * @return Reordered version of @a unordered_ring
- *
- * Reorders the data pointers of @a unordered_ring according to the order
- * as given by @a new_ring_order.
- * The complexity involves roughly 3 * length(unordered_ring) + qsort(unordered_ring) + length(new_ring_order) * bsearch(unordered_ring)),
- * i.e. it is at worst O(length(unordered_ring) * log (length(unordered_ring)) * length(new_ring_order)).
- */
-BirnetRing* /* reproduce all elements from unordered_ring in the order new_ring_order */
-birnet_ring_reorder (BirnetRing *unordered_ring,
- const BirnetRing *new_ring_order)
-{
- if (!unordered_ring || !new_ring_order)
- return unordered_ring;
- const BirnetRing *ring;
-
- /* construct a sorted array for faster lookups; O(length(unordered_ring)) */
- gpointer *items = NULL;
- guint i, n_items = 0, n_alloced = 0;
- for (ring = unordered_ring; ring; ring = birnet_ring_walk (ring, unordered_ring))
- {
- i = n_items++;
- if (n_items > n_alloced)
- {
- n_alloced = alloc_upper_power2 (MAX (n_items, 32));
- items = g_renew (gpointer, items, n_alloced);
- }
- items[i] = ring->data;
- }
- birnet_ring_free (unordered_ring);
- unordered_ring = NULL;
- qsort (items, n_items, sizeof (items[0]), pointerloccmp);
-
- /* collapse duplicates; O(length(unordered_ring)) */
- guint j = 0, *counts = g_new0 (guint, n_items);
- for (i = 0; i < n_items; i++)
- if (items[j] != items[i])
- {
- if (++j != i)
- items[j] = items[i];
- counts[j] = 1;
- }
- else /* catch dups */
- counts[j]++;
- n_items = j + 1; /* shrink to number of different items */
-
- /* pick unordered_ring members in the order given by new_ring_order;
- * O(length(new_ring_order) * O(bsearch(unordered_ring)))
- */
- for (ring = new_ring_order; ring; ring = birnet_ring_walk (ring, new_ring_order))
- if (ring_reorder_lookup (n_items, items, ring->data, &i) && counts[i])
- {
- counts[i]--;
- unordered_ring = birnet_ring_append (unordered_ring, ring->data);
- }
-
- /* append left-over members from sorted_ring; O(length(unordered_ring)) */
- for (i = 0; i < n_items; i++)
- while (counts[i]--)
- unordered_ring = birnet_ring_append (unordered_ring, items[i]);
-
- g_free (items);
- g_free (counts);
- return unordered_ring;
-}
-
-gboolean
-birnet_ring_includes (const BirnetRing *sorted_super_set,
- const BirnetRing *sorted_sub_set,
- BirnetCompareFunc cmp,
- gpointer data)
-{
- const BirnetRing *r1 = sorted_super_set, *r2 = sorted_sub_set;
- while (r1 && r2)
- {
- gint c = cmp (r1->data, r2->data, data);
- if (c > 0)
- return FALSE;
- else if (c == 0)
- r2 = birnet_ring_walk (r2, sorted_sub_set);
- // FIXME: misses backtracking to find "abc" in "aabc"
- r1 = birnet_ring_walk (r1, sorted_super_set);
- }
- return !r2;
-}
-
-/**
- * @param sorted_ring1 Sorted ring 1
- * @param sorted_ring2 Sorted ring 2
- * @param cmp Compare function for node data
- * @param data Data argument passed into the cmp() function
- * @return TRUE for equal rings, FALSE otherwise
- *
- * Compare two rings according to the cmp() function. Return FALSE as
- * soon as a mismatch is found, returns TRUE for rings which are equal according to cmp().
- * The complexity is at most O(MIN (length (sorted_ring1), length (sorted_ring2))).
- */
-gboolean
-birnet_ring_equals (const BirnetRing *sorted_ring1,
- const BirnetRing *sorted_ring2,
- BirnetCompareFunc cmp,
- gpointer data)
-{
- const BirnetRing *r1 = sorted_ring1, *r2 = sorted_ring2;
- while (r1 && r2)
- {
- if (cmp (r1->data, r2->data, data))
- return FALSE;
- r1 = birnet_ring_walk (r1, sorted_ring1);
- r2 = birnet_ring_walk (r2, sorted_ring2);
- }
- return r1 == r2; /* both need to be NULL */
-}
-
-/**
- * @param sorted_ring1_p Pointer to sorted ring 1
- * @param sorted_ring2_p Pointer to sorted ring 2
- * @param cmp Compare function for node data
- * @param data Data argument passed into the cmp() function
- * @return TRUE for mismatching rings, FALSE otherwise
- *
- * Compare two rings according to the cmp() function. For mismatching rings,
- * @a sorted_ring1_p and @a sorted_ring2_p are set to point to the mismatching nodes.
- * The complexity is at most O(MIN (length (sorted_ring1), length (sorted_ring2))).
- */
-gboolean
-birnet_ring_mismatch (BirnetRing **sorted_ring1_p,
- BirnetRing **sorted_ring2_p,
- BirnetCompareFunc cmp,
- gpointer data)
-{
- BirnetRing *head1 = *sorted_ring1_p, *head2 = *sorted_ring2_p;
- BirnetRing *r1 = head1, *r2 = head2;
- while (r1 && r2)
- {
- if (cmp (r1->data, r2->data, data))
- goto mismatch;
- r1 = birnet_ring_walk (r1, head1);
- r2 = birnet_ring_walk (r2, head2);
- }
- if (r1 == r2) /* both are NULL */
- return FALSE;
- mismatch:
- *sorted_ring1_p = r1;
- *sorted_ring2_p = r2;
- return TRUE;
-}
-
-/**
- * @param head Head node of a ring or NULL for an empty ring
- * @param cmp Compare function for node data
- * @param data Data argument passed into the cmp() function
- * @return Node with minimum data argument or NULL for empty rings
- *
- * Find and return the node holding the minimum data pointer of a ring, measured by evaluating cmp().
- * The complexity is O(length (head)).
- */
-BirnetRing*
-birnet_ring_min_node (const BirnetRing *head,
- BirnetCompareFunc cmp,
- gpointer data)
-{
- const BirnetRing *ring = head, *last = NULL;
- if (ring)
- {
- last = ring;
- for (ring = birnet_ring_walk (ring, head); ring; ring = birnet_ring_walk (ring, head))
- if (cmp (last->data, ring->data, data) > 0)
- last = ring;
- }
- return (BirnetRing*) last;
-}
-
-/**
- * @param head Head node of a ring or NULL for an empty ring
- * @param cmp Compare function for node data
- * @param data Data argument passed into the cmp() function
- * @return Node with maximum data argument or NULL for empty rings
- *
- * Find and return the node holding the maximum data pointer of a ring, measured by evaluating cmp().
- * The complexity is O(length (head)).
- */
-BirnetRing*
-birnet_ring_max_node (const BirnetRing *head,
- BirnetCompareFunc cmp,
- gpointer data)
-{
- const BirnetRing *ring = head, *last = NULL;
- if (ring)
- {
- last = ring;
- for (ring = birnet_ring_walk (ring, head); ring; ring = birnet_ring_walk (ring, head))
- if (cmp (last->data, ring->data, data) < 0)
- last = ring;
- }
- return (BirnetRing*) last;
-}
-
-/**
- * @param head Head node of a ring or NULL for an empty ring
- * @param cmp Compare function for node data
- * @param data Data argument passed into the cmp() function
- * @return Minimum data argument or NULL for empty rings
- *
- * Find and return the minimum data pointer of a ring, measured by evaluating cmp().
- * The complexity is O(length (head)).
- */
-gpointer
-birnet_ring_min (const BirnetRing *head,
- BirnetCompareFunc cmp,
- gpointer data)
-{
- BirnetRing *ring = birnet_ring_min_node (head, cmp, data);
- return ring ? ring->data : NULL;
-}
-
-/**
- * @param head Head node of a ring or NULL for an empty ring
- * @param cmp Compare function for node data
- * @param data Data argument passed into the cmp() function
- * @return Maximum data argument or NULL for empty rings
- *
- * Find and return the maximum data pointer of a ring, measured by evaluating cmp().
- * The complexity is O(length (head)).
- */
-gpointer
-birnet_ring_max (const BirnetRing *head,
- BirnetCompareFunc cmp,
- gpointer data)
-{
- BirnetRing *ring = birnet_ring_max_node (head, cmp, data);
- return ring ? ring->data : NULL;
-}
Deleted: trunk/birnet/birnetring.h
===================================================================
--- trunk/birnet/birnetring.h 2006-10-03 15:28:27 UTC (rev 3926)
+++ trunk/birnet/birnetring.h 2006-10-03 15:37:24 UTC (rev 3927)
@@ -1,181 +0,0 @@
-/* BirnetRing
- * Copyright (C) 2002-2006 Tim Janik
- *
- * 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 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, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __BIRNET_RING_H__
-#define __BIRNET_RING_H__
-
-#include <birnet/birnetcore.h>
-
-G_BEGIN_DECLS
-
-
-/* --- basic comparisons --- */
-typedef gint (*BirnetCompareFunc) (gconstpointer value1,
- gconstpointer value2,
- gpointer data);
-gint birnet_pointer_cmp (gconstpointer value1,
- gconstpointer value2,
- gpointer dummy);
-
-
-/* --- ring (circular-list) --- */
-typedef gpointer (*BirnetRingDataFunc) (gpointer data,
- gpointer func_data);
-typedef struct BirnetRing BirnetRing;
-struct BirnetRing
-{
- gpointer data;
- BirnetRing *next;
- BirnetRing *prev;
-};
-BirnetRing* birnet_ring_prepend (BirnetRing *head,
- gpointer data);
-BirnetRing* birnet_ring_prepend_uniq (BirnetRing *head,
- gpointer data);
-BirnetRing* birnet_ring_append (BirnetRing *head,
- gpointer data);
-BirnetRing* birnet_ring_append_uniq (BirnetRing *head,
- gpointer data);
-BirnetRing* birnet_ring_insert (BirnetRing *head,
- gpointer data,
- gint position);
-BirnetRing* birnet_ring_insert_before (BirnetRing *head,
- BirnetRing *sibling,
- gpointer data);
-gint birnet_ring_position (const BirnetRing *head,
- const BirnetRing *node);
-gint birnet_ring_index (const BirnetRing *head,
- gconstpointer data);
-BirnetRing* birnet_ring_nth (const BirnetRing *head,
- guint n);
-gpointer birnet_ring_nth_data (const BirnetRing *head,
- guint n);
-BirnetRing* birnet_ring_find (const BirnetRing *head,
- gconstpointer data);
-BirnetRing* birnet_ring_remove_node (BirnetRing *head,
- BirnetRing *node);
-BirnetRing* birnet_ring_remove (BirnetRing *head,
- gpointer data);
-guint birnet_ring_length (const BirnetRing *head);
-gint birnet_ring_cmp_length (const BirnetRing *head,
- guint test_length);
-BirnetRing* birnet_ring_copy (const BirnetRing *head);
-BirnetRing* birnet_ring_copy_deep (const BirnetRing *head,
- BirnetRingDataFunc copy,
- gpointer func_data);
-BirnetRing* birnet_ring_copy_rest (const BirnetRing *ring,
- const BirnetRing *head);
-BirnetRing* birnet_ring_concat (BirnetRing *head1,
- BirnetRing *head2);
-BirnetRing* birnet_ring_split (BirnetRing *head1,
- BirnetRing *head2);
-BirnetRing* birnet_ring_reverse (BirnetRing *head);
-gpointer birnet_ring_pop_head (BirnetRing **head);
-gpointer birnet_ring_pop_tail (BirnetRing **head);
-#define birnet_ring_push_head birnet_ring_prepend
-#define birnet_ring_push_tail birnet_ring_append
-void birnet_ring_free (BirnetRing *head);
-void birnet_ring_free_deep (BirnetRing *head,
- GDestroyNotify data_destroy);
-
-BirnetRing* birnet_ring_from_list (GList *list);
-BirnetRing* birnet_ring_from_list_and_free (GList *list);
-BirnetRing* birnet_ring_from_slist (GSList *slist);
-BirnetRing* birnet_ring_from_slist_and_free (GSList *slist);
-#define birnet_ring_tail(head) ((head) ? (head)->prev : NULL)
-#define birnet_ring_walk(node,head_bound) ((node)->next != (head_bound) ? (node)->next : NULL)
-#define birnet_ring_next(node,head_bound) birnet_ring_walk (node, head_bound)
-
-
-/* ring-modifying cmp-based operations */
-BirnetRing* birnet_ring_insert_sorted (BirnetRing *head,
- gpointer insertion_data,
- BirnetCompareFunc cmp,
- gpointer cmp_data);
-BirnetRing* birnet_ring_merge_sorted (BirnetRing *head1,
- BirnetRing *head2,
- BirnetCompareFunc cmp,
- gpointer data);
-BirnetRing* birnet_ring_sort (BirnetRing *head,
- BirnetCompareFunc cmp,
- gpointer data);
-BirnetRing* birnet_ring_uniq (BirnetRing *sorted_ring1,
- BirnetCompareFunc cmp,
- gpointer data);
-BirnetRing* birnet_ring_uniq_free_deep (BirnetRing *sorted_ring1,
- BirnetCompareFunc cmp,
- gpointer data,
- GDestroyNotify data_destroy);
-BirnetRing* birnet_ring_reorder (BirnetRing *unordered_ring,
- const BirnetRing *new_ring_order);
-/* ring-copying cmp-based operations */
-BirnetRing* birnet_ring_copy_deep_uniq (const BirnetRing *sorted_ring1,
- BirnetRingDataFunc copy,
- gpointer copy_data,
- BirnetCompareFunc cmp,
- gpointer cmp_data);
-BirnetRing* birnet_ring_copy_uniq (const BirnetRing *sorted_ring1,
- BirnetCompareFunc cmp,
- gpointer data);
-BirnetRing* birnet_ring_union (const BirnetRing *sorted_set1,
- const BirnetRing *sorted_set2,
- BirnetCompareFunc cmp,
- gpointer data);
-BirnetRing* birnet_ring_intersection (const BirnetRing *sorted_set1,
- const BirnetRing *sorted_set2,
- BirnetCompareFunc cmp,
- gpointer data);
-BirnetRing* birnet_ring_difference (const BirnetRing *sorted_set1,
- const BirnetRing *sorted_set2,
- BirnetCompareFunc cmp,
- gpointer data);
-BirnetRing* birnet_ring_symmetric_difference (const BirnetRing *sorted_set1,
- const BirnetRing *sorted_set2,
- BirnetCompareFunc cmp,
- gpointer data);
-/* const-result cmp-based operations */
-gboolean birnet_ring_includes (const BirnetRing *sorted_super_set,
- const BirnetRing *sorted_sub_set,
- BirnetCompareFunc cmp,
- gpointer data);
-gboolean birnet_ring_mismatch (BirnetRing **sorted_ring1_p,
- BirnetRing **sorted_ring2_p,
- BirnetCompareFunc cmp,
- gpointer data);
-gboolean birnet_ring_equals (const BirnetRing *sorted_set1,
- const BirnetRing *sorted_set2,
- BirnetCompareFunc cmp,
- gpointer data);
-BirnetRing* birnet_ring_min_node (const BirnetRing *head,
- BirnetCompareFunc cmp,
- gpointer data);
-BirnetRing* birnet_ring_max_node (const BirnetRing *head,
- BirnetCompareFunc cmp,
- gpointer data);
-gpointer birnet_ring_min (const BirnetRing *head,
- BirnetCompareFunc cmp,
- gpointer data);
-gpointer birnet_ring_max (const BirnetRing *head,
- BirnetCompareFunc cmp,
- gpointer data);
-
-G_END_DECLS
-
-#endif /* __BIRNET_RING_H__ */
-
-/* vim:set ts=8 sts=2 sw=2: */
Modified: trunk/birnet/birnetthread.c
===================================================================
--- trunk/birnet/birnetthread.c 2006-10-03 15:28:27 UTC (rev 3926)
+++ trunk/birnet/birnetthread.c 2006-10-03 15:37:24 UTC (rev 3927)
@@ -23,7 +23,6 @@
#define _XOPEN_SOURCE 600 /* for full pthread facilities */
#endif /* defining _XOPEN_SOURCE on random systems can have bad effects */
#include "birnetthread.h"
-#include "birnetring.h"
#include <sys/time.h>
#include <sched.h>
#include <unistd.h> /* sched_yield() */
@@ -87,8 +86,8 @@
static BirnetMutex global_thread_mutex = { 0, };
static BirnetMutex global_startup_mutex = { 0, };
static BirnetCond global_thread_cond = { 0, };
-static BirnetRing *global_thread_list = NULL;
-static BirnetRing *thread_awaken_list = NULL;
+static GSList *global_thread_list = NULL;
+static GSList *thread_awaken_list = NULL;
BirnetThreadTable birnet_thread_table = { NULL, };
@@ -198,9 +197,9 @@
threadcxx = g_atomic_pointer_get (&thread->threadxx);
}
birnet_mutex_lock (&global_thread_mutex);
- global_thread_list = birnet_ring_remove (global_thread_list, thread);
+ global_thread_list = g_slist_remove (global_thread_list, thread);
if (thread->awake_stamp)
- thread_awaken_list = birnet_ring_remove (thread_awaken_list, thread);
+ thread_awaken_list = g_slist_remove (thread_awaken_list, thread);
thread->awake_stamp = 1;
birnet_cond_broadcast (&global_thread_cond);
birnet_mutex_unlock (&global_thread_mutex);
@@ -239,7 +238,7 @@
birnet_thread_ref (thread);
birnet_mutex_lock (&global_thread_mutex);
- global_thread_list = birnet_ring_append (global_thread_list, self);
+ global_thread_list = g_slist_append (global_thread_list, self);
self->accounting = 1;
birnet_thread_accounting_L (self, TRUE);
birnet_cond_broadcast (&global_thread_cond);
@@ -304,7 +303,7 @@
if (gthread)
{
birnet_mutex_lock (&global_thread_mutex);
- while (!birnet_ring_find (global_thread_list, thread))
+ while (!g_slist_find (global_thread_list, thread))
birnet_cond_wait (&global_thread_cond, &global_thread_mutex);
birnet_mutex_unlock (&global_thread_mutex);
}
@@ -392,7 +391,7 @@
thread_get_tid (thread);
birnet_thread_table.thread_set_handle (thread);
birnet_mutex_lock (&global_thread_mutex);
- global_thread_list = birnet_ring_append (global_thread_list, thread);
+ global_thread_list = g_slist_append (global_thread_list, thread);
birnet_mutex_unlock (&global_thread_mutex);
}
return thread;
@@ -584,7 +583,7 @@
g_return_if_fail (thread != NULL);
birnet_mutex_lock (&global_thread_mutex);
- g_assert (birnet_ring_find (global_thread_list, thread));
+ g_assert (g_slist_find (global_thread_list, thread));
birnet_thread_wakeup_L (thread);
birnet_mutex_unlock (&global_thread_mutex);
}
@@ -606,7 +605,7 @@
birnet_mutex_lock (&global_thread_mutex);
if (!self->awake_stamp)
{
- thread_awaken_list = birnet_ring_prepend (thread_awaken_list, self);
+ thread_awaken_list = g_slist_prepend (thread_awaken_list, self);
self->awake_stamp = stamp;
}
else
@@ -624,19 +623,18 @@
void
birnet_thread_emit_wakeups (guint64 wakeup_stamp)
{
- BirnetRing *ring, *next;
-
g_return_if_fail (wakeup_stamp > 0);
birnet_mutex_lock (&global_thread_mutex);
- for (ring = thread_awaken_list; ring; ring = next)
+ GSList *next, *node;
+ for (node = thread_awaken_list; node; node = next)
{
- BirnetThread *thread = ring->data;
- next = birnet_ring_walk (ring, thread_awaken_list);
+ BirnetThread *thread = node->data;
+ next = node->next;
if (thread->awake_stamp <= wakeup_stamp)
{
thread->awake_stamp = 0;
- thread_awaken_list = birnet_ring_remove (thread_awaken_list, thread);
+ thread_awaken_list = g_slist_remove (thread_awaken_list, thread);
birnet_thread_wakeup_L (thread);
}
}
@@ -658,10 +656,10 @@
g_return_if_fail (thread != birnet_thread_self ());
birnet_mutex_lock (&global_thread_mutex);
- g_assert (birnet_ring_find (global_thread_list, thread));
+ g_assert (g_slist_find (global_thread_list, thread));
thread->aborted = TRUE;
birnet_thread_wakeup_L (thread);
- while (birnet_ring_find (global_thread_list, thread))
+ while (g_slist_find (global_thread_list, thread))
birnet_cond_wait (&global_thread_cond, &global_thread_mutex);
birnet_mutex_unlock (&global_thread_mutex);
}
@@ -680,7 +678,7 @@
g_return_if_fail (thread != NULL);
birnet_mutex_lock (&global_thread_mutex);
- g_assert (birnet_ring_find (global_thread_list, thread));
+ g_assert (g_slist_find (global_thread_list, thread));
thread->aborted = TRUE;
birnet_thread_wakeup_L (thread);
birnet_mutex_unlock (&global_thread_mutex);
@@ -729,7 +727,7 @@
birnet_thread_get_running (BirnetThread *thread)
{
birnet_mutex_lock (&global_thread_mutex);
- bool running = birnet_ring_find (global_thread_list, thread);
+ bool running = g_slist_find (global_thread_list, thread);
birnet_mutex_unlock (&global_thread_mutex);
return running;
}
@@ -738,7 +736,7 @@
birnet_thread_wait_for_exit (BirnetThread *thread)
{
birnet_mutex_lock (&global_thread_mutex);
- while (birnet_ring_find (global_thread_list, thread))
+ while (g_slist_find (global_thread_list, thread))
birnet_cond_wait (&global_thread_cond, &global_thread_mutex);
birnet_mutex_unlock (&global_thread_mutex);
}
Modified: trunk/birnet/tests/Makefile.am
===================================================================
--- trunk/birnet/tests/Makefile.am 2006-10-03 15:28:27 UTC (rev 3926)
+++ trunk/birnet/tests/Makefile.am 2006-10-03 15:37:24 UTC (rev 3927)
@@ -7,11 +7,9 @@
INCLUDES += -I$(top_srcdir) -I$(top_builddir) -I. $(BIRNET_CFLAGS)
DEFS += -DG_LOG_DOMAIN='"$(basename $(@F))"' -DPARANOID -DG_DISABLE_CONST_RETURNS
-TESTS = ring infotest signal sorting datalist threads
+TESTS = infotest signal sorting datalist threads
noinst_PROGRAMS = $(TESTS)
progs_ldadd = $(top_builddir)/birnet/libbirnet.o $(BIRNET_LIBS) -lm
-ring_SOURCES = ring.cc
-ring_LDADD = $(progs_ldadd)
infotest_SOURCES = infotest.cc
infotest_LDADD = $(progs_ldadd)
threads_SOURCES = threads.cc
Deleted: trunk/birnet/tests/ring.cc
===================================================================
--- trunk/birnet/tests/ring.cc 2006-10-03 15:28:27 UTC (rev 3926)
+++ trunk/birnet/tests/ring.cc 2006-10-03 15:37:24 UTC (rev 3927)
@@ -1,231 +0,0 @@
-/* Birnet
- * Copyright (C) 2006 Tim Janik
- *
- * 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 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, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-// #define TEST_VERBOSE
-#include <birnet/birnettests.h>
-
-static void
-print_ring_ints (BirnetRing *ring)
-{
- g_print ("BirnetRing(%p): {", ring);
- BirnetRing *node;
- for (node = ring; node; node = birnet_ring_walk (node, ring))
- g_print (" %d,", (ptrdiff_t) node->data);
- g_print (" };");
-}
-
-static void
-print_rings_side_by_side (BirnetRing *ring1,
- BirnetRing *ring2)
-{
- BirnetRing *r1 = ring1, *r2 = ring2;
- g_printerr ("\nRing=%p Ring=%p\n", r1, r2);
- while (r1 || r2)
- {
- if (r1 && r2)
- g_printerr (" %10p %10p\n", r1->data, r2->data);
- else if (r1)
- g_printerr (" %10p\n", r1->data);
- else
- g_printerr (" %10p\n", r2->data);
- if (r1)
- r1 = birnet_ring_walk (r1, ring1);
- if (r2)
- r2 = birnet_ring_walk (r2, ring2);
- }
-}
-
-static void
-test_birnet_ring (void)
-{
- TSTART ("RingBasics");
- (void) print_ring_ints;
-
- BirnetRing *r1 = NULL, *r2 = NULL, *d = NULL;
-
- r1= birnet_ring_append (r1, (void*) 3);
- r1= birnet_ring_append (r1, (void*) 7);
- r1= birnet_ring_append (r1, (void*) 8);
- r1= birnet_ring_append (r1, (void*) 13);
- r1= birnet_ring_append (r1, (void*) 18);
- TASSERT (birnet_ring_length (r1) == 5);
- TASSERT (birnet_ring_equals (r1, r1, birnet_pointer_cmp, NULL));
-
- d = birnet_ring_append (d, (void*) 13);
- d = birnet_ring_append (d, (void*) 7);
- d = birnet_ring_append (d, (void*) 18);
- d = birnet_ring_append (d, (void*) 3);
- d = birnet_ring_append (d, (void*) 8);
- TASSERT (birnet_ring_equals (d, d, birnet_pointer_cmp, NULL));
- TASSERT (birnet_ring_min (d, birnet_pointer_cmp, NULL) == (void*) 3);
- TASSERT (birnet_ring_max (d, birnet_pointer_cmp, NULL) == (void*) 18);
-
- TASSERT (birnet_ring_equals (r1, d, birnet_pointer_cmp, NULL) == FALSE);
- d = birnet_ring_sort (d, birnet_pointer_cmp, NULL);
- TASSERT (birnet_ring_equals (r1, d, birnet_pointer_cmp, NULL));
- TASSERT (birnet_ring_includes (r1, d, birnet_pointer_cmp, NULL));
- TASSERT (birnet_ring_includes (d, r1, birnet_pointer_cmp, NULL));
- birnet_ring_free (d);
-
- r2 = birnet_ring_append (r2, (void*) 4);
- r2 = birnet_ring_append (r2, (void*) 7);
- r2 = birnet_ring_append (r2, (void*) 13);
- TASSERT (birnet_ring_length (r2) == 3);
- d = birnet_ring_sort (birnet_ring_copy (r2), birnet_pointer_cmp, NULL);
- TASSERT (birnet_ring_equals (r2, d, birnet_pointer_cmp, NULL));
- TASSERT (birnet_ring_equals (r1, r2, birnet_pointer_cmp, NULL) == FALSE);
- TASSERT (birnet_ring_includes (r1, r2, birnet_pointer_cmp, NULL) == FALSE);
- birnet_ring_free (d);
-
- TDONE ();
- TSTART ("RingMath");
-
- d = birnet_ring_difference (r1, r2, birnet_pointer_cmp, NULL);
- TASSERT (birnet_ring_pop_head (&d) == (void*) 3);
- TASSERT (birnet_ring_pop_head (&d) == (void*) 8);
- TASSERT (birnet_ring_pop_head (&d) == (void*) 18);
- TASSERT (d == NULL);
-
- d = birnet_ring_symmetric_difference (r1, r2, birnet_pointer_cmp, NULL);
- TASSERT (birnet_ring_pop_head (&d) == (void*) 3);
- TASSERT (birnet_ring_pop_head (&d) == (void*) 4);
- TASSERT (birnet_ring_pop_head (&d) == (void*) 8);
- TASSERT (birnet_ring_pop_head (&d) == (void*) 18);
- TASSERT (d == NULL);
-
- BirnetRing *t1 = birnet_ring_symmetric_difference (r1, r2, birnet_pointer_cmp, NULL);
- BirnetRing *t2 = birnet_ring_intersection (r1, r2, birnet_pointer_cmp, NULL);
- d = birnet_ring_intersection (t1, t2, birnet_pointer_cmp, NULL);
- TASSERT (d == NULL);
- d = birnet_ring_union (t1, t2, birnet_pointer_cmp, NULL);
- TASSERT (birnet_ring_includes (d, t1, birnet_pointer_cmp, NULL));
- TASSERT (birnet_ring_includes (d, t2, birnet_pointer_cmp, NULL));
- birnet_ring_free (t1);
- birnet_ring_free (t2);
- TASSERT (birnet_ring_includes (d, r1, birnet_pointer_cmp, NULL));
- TASSERT (birnet_ring_includes (d, r2, birnet_pointer_cmp, NULL));
-
- d = birnet_ring_union (r1, r2, birnet_pointer_cmp, NULL);
- TASSERT (birnet_ring_length (d) == 6);
- t1 = r1, t2 = d;
- birnet_ring_mismatch (&t1, &t2, birnet_pointer_cmp, NULL);
- TASSERT (t1->data == (void*) 7);
- TASSERT (t2->data == (void*) 4);
- t2 = birnet_ring_concat (birnet_ring_copy (r1), birnet_ring_copy (r2));
- TASSERT (birnet_ring_length (t2) == 8);
- t2 = birnet_ring_sort (t2, birnet_pointer_cmp, NULL);
- TASSERT (birnet_ring_length (t2) == 8);
- t1 = birnet_ring_copy_uniq (t2, birnet_pointer_cmp, NULL);
- TASSERT (birnet_ring_length (t1) == 6);
- TASSERT (birnet_ring_equals (d, t1, birnet_pointer_cmp, NULL));
- birnet_ring_free (t1);
- t1 = birnet_ring_uniq (t2, birnet_pointer_cmp, NULL);
- TASSERT (birnet_ring_length (t1) == 6);
- TASSERT (birnet_ring_equals (d, t1, birnet_pointer_cmp, NULL));
- birnet_ring_free (t1);
- birnet_ring_free (d);
-
- birnet_ring_free (r1);
- birnet_ring_free (r2);
-
- TDONE ();
- TSTART ("RingReorder");
-
- r1 = NULL;
- r1 = birnet_ring_append (r1, (void*) 5);
- r1 = birnet_ring_append (r1, (void*) 7);
- r1 = birnet_ring_append (r1, (void*) 4);
- r1 = birnet_ring_append (r1, (void*) 8);
- r1 = birnet_ring_append (r1, (void*) 1);
- r2 = birnet_ring_sort (birnet_ring_copy (r1), birnet_pointer_cmp, NULL);
- t1 = birnet_ring_reorder (birnet_ring_copy (r2), r1);
- if (0)
- print_rings_side_by_side (t1, r1);
- TASSERT (birnet_ring_equals (t1, r1, birnet_pointer_cmp, NULL));
- birnet_ring_free (t1);
- r2 = birnet_ring_remove (r2, (void*) 4);
- r2 = birnet_ring_append (r2, (void*) 9);
- t1 = birnet_ring_reorder (birnet_ring_copy (r2), r1);
- r1 = birnet_ring_remove (r1, (void*) 4);
- r1 = birnet_ring_append (r1, (void*) 9);
- if (0)
- print_rings_side_by_side (t1, r1);
- TASSERT (birnet_ring_equals (t1, r1, birnet_pointer_cmp, NULL));
- birnet_ring_free (r1);
- birnet_ring_free (r2);
- birnet_ring_free (t1);
- r1 = NULL;
- r2 = NULL;
- r1 = birnet_ring_append (r1, (void*) 0x75);
- r1 = birnet_ring_append (r1, (void*) 0x4c);
- r1 = birnet_ring_append (r1, (void*) 0x5e);
- r2 = birnet_ring_append (r2, (void*) 0x4c);
- r2 = birnet_ring_append (r2, (void*) 0x5e);
- r2 = birnet_ring_append (r2, (void*) 0x68);
- r2 = birnet_ring_append (r2, (void*) 0x68);
- r2 = birnet_ring_reorder (r2, r1);
- if (0)
- print_rings_side_by_side (r2, r1);
- TASSERT (birnet_ring_pop_head (&r2) == (void*) 0x4c);
- TASSERT (birnet_ring_pop_head (&r2) == (void*) 0x5e);
- TASSERT (birnet_ring_pop_head (&r2) == (void*) 0x68);
- TASSERT (birnet_ring_pop_head (&r2) == (void*) 0x68);
- TASSERT (r2 == NULL);
- birnet_ring_free (r1);
-
- r1 = NULL;
- r1 = birnet_ring_append (r1, (void*) 0x11);
- r1 = birnet_ring_append (r1, (void*) 0x16);
- r1 = birnet_ring_append (r1, (void*) 0x15);
- r1 = birnet_ring_append (r1, (void*) 0x14);
- r1 = birnet_ring_append (r1, (void*) 0x13);
- r1 = birnet_ring_append (r1, (void*) 0x12);
- r1 = birnet_ring_append (r1, (void*) 0x03);
- r1 = birnet_ring_append (r1, (void*) 0x02);
- r1 = birnet_ring_append (r1, (void*) 0x01);
- r2 = NULL;
- r2 = birnet_ring_append (r2, (void*) 0x16);
- r2 = birnet_ring_append (r2, (void*) 0x15);
- r2 = birnet_ring_append (r2, (void*) 0x14);
- r2 = birnet_ring_append (r2, (void*) 0x13);
- r2 = birnet_ring_append (r2, (void*) 0x12);
- r2 = birnet_ring_append (r2, (void*) 0x11);
- r2 = birnet_ring_append (r2, (void*) 0x01);
- r2 = birnet_ring_append (r2, (void*) 0x02);
- r2 = birnet_ring_append (r2, (void*) 0x03);
- r1 = birnet_ring_reorder (r1, r2);
- TASSERT (birnet_ring_equals (r1, r2, birnet_pointer_cmp, NULL));
- birnet_ring_free (r1);
- birnet_ring_free (r2);
-
- TDONE ();
-}
-
-
-int
-main (int argc,
- char *argv[])
-{
- birnet_init_test (&argc, &argv);
-
- test_birnet_ring();
-
- return 0;
-}
-
-/* vim:set ts=8 sts=2 sw=2: */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
