summaryrefslogtreecommitdiffstats
path: root/avahi-core/prioq-test.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2005-08-13 21:25:09 +0000
committerLennart Poettering <lennart@poettering.net>2005-08-13 21:25:09 +0000
commit4f0a5e7572a4257894b4bfede42c26d65152609e (patch)
tree21e3d5ee20716739590e5931859a4c2052161395 /avahi-core/prioq-test.c
parentd6d7d3769441b73ffb5b7af34fef823b41e66312 (diff)
* strip glib from avahi-core
* implement glib memory allocator * add new documentation file MALLOC * initialize pseudo-RNG from /dev/urandom in avahi-daemon * remove some gcc 4.0 warnings * beef up watch system with real timeouts * move GCC __attribute__ macros into its own header avahi-common/gccmacro.h * make use of GCC's sentinel attribute where it make sense * add malloc() implementations that abort on OOM and enable them by default git-svn-id: file:///home/lennart/svn/public/avahi/trunk@308 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
Diffstat (limited to 'avahi-core/prioq-test.c')
-rw-r--r--avahi-core/prioq-test.c36
1 files changed, 20 insertions, 16 deletions
diff --git a/avahi-core/prioq-test.c b/avahi-core/prioq-test.c
index 28c734b..0e43702 100644
--- a/avahi-core/prioq-test.c
+++ b/avahi-core/prioq-test.c
@@ -26,16 +26,20 @@
#include <time.h>
#include <stdlib.h>
#include <stdio.h>
+#include <assert.h>
#include "prioq.h"
-static gint compare_int(gconstpointer a, gconstpointer b) {
- gint i = GPOINTER_TO_INT(a), j = GPOINTER_TO_INT(b);
+#define POINTER_TO_INT(p) ((int) (p))
+#define INT_TO_POINTER(i) ((void*) (i))
+
+static int compare_int(const void* a, const void* b) {
+ int i = POINTER_TO_INT(a), j = POINTER_TO_INT(b);
return i < j ? -1 : (i > j ? 1 : 0);
}
-static int compare_ptr(gconstpointer a, gconstpointer b) {
+static int compare_ptr(const void* a, const void* b) {
return a < b ? -1 : (a > b ? 1 : 0);
}
@@ -44,28 +48,28 @@ static void rec(AvahiPrioQueueNode *n) {
return;
if (n->left)
- g_assert(n->left->parent == n);
+ assert(n->left->parent == n);
if (n->right)
- g_assert(n->right->parent == n);
+ assert(n->right->parent == n);
if (n->parent) {
- g_assert(n->parent->left == n || n->parent->right == n);
+ assert(n->parent->left == n || n->parent->right == n);
if (n->parent->left == n)
- g_assert(n->next == n->parent->right);
+ assert(n->next == n->parent->right);
}
if (!n->next) {
- g_assert(n->queue->last == n);
+ assert(n->queue->last == n);
if (n->parent && n->parent->left == n)
- g_assert(n->parent->right == NULL);
+ assert(n->parent->right == NULL);
}
if (n->parent) {
- int a = GPOINTER_TO_INT(n->parent->data), b = GPOINTER_TO_INT(n->data);
+ int a = POINTER_TO_INT(n->parent->data), b = POINTER_TO_INT(n->data);
if (a > b) {
printf("%i <= %i: NO\n", a, b);
abort();
@@ -78,7 +82,7 @@ static void rec(AvahiPrioQueueNode *n) {
int main(int argc, char *argv[]) {
AvahiPrioQueue *q, *q2;
- gint i;
+ int i;
q = avahi_prio_queue_new(compare_int);
q2 = avahi_prio_queue_new(compare_ptr);
@@ -86,15 +90,15 @@ int main(int argc, char *argv[]) {
srand(time(NULL));
for (i = 0; i < 10000; i++)
- avahi_prio_queue_put(q2, avahi_prio_queue_put(q, GINT_TO_POINTER(random() & 0xFFFF)));
+ avahi_prio_queue_put(q2, avahi_prio_queue_put(q, INT_TO_POINTER(random() & 0xFFFF)));
while (q2->root) {
rec(q->root);
rec(q2->root);
- g_assert(q->n_nodes == q2->n_nodes);
+ assert(q->n_nodes == q2->n_nodes);
- printf("%i\n", GPOINTER_TO_INT(((AvahiPrioQueueNode*)q2->root->data)->data));
+ printf("%i\n", POINTER_TO_INT(((AvahiPrioQueueNode*)q2->root->data)->data));
avahi_prio_queue_remove(q, q2->root->data);
avahi_prio_queue_remove(q2, q2->root);
@@ -103,11 +107,11 @@ int main(int argc, char *argv[]) {
/* prev = 0; */
/* while (q->root) { */
-/* gint v = GPOINTER_TO_INT(q->root->data); */
+/* int v = GPOINTER_TO_INT(q->root->data); */
/* rec(q->root); */
/* printf("%i\n", v); */
/* avahi_prio_queue_remove(q, q->root); */
-/* g_assert(v >= prev); */
+/* assert(v >= prev); */
/* prev = v; */
/* } */