# HG changeset patch
# User Olaf Wintermann <olaf.wintermann@gmail.com>
# Date 1326542838 -3600
# Node ID d599fefc76208a4d543577efca31c0a4ad29f956
# Parent  cdd7a31732496a021e0416450dbdb89597573f77# Parent  db7d9860dbbdb88f1dcb38ab44a1c23effa68a08
merge

diff -r db7d9860dbbd -r d599fefc7620 .hgignore
--- a/.hgignore	Thu Jan 05 14:53:54 2012 +0100
+++ b/.hgignore	Sat Jan 14 13:07:18 2012 +0100
@@ -2,3 +2,4 @@
 ^nbproject/.*$
 ^build/.*$
 ^core$
+^.project$
diff -r db7d9860dbbd -r d599fefc7620 test/list_tests.c
--- a/test/list_tests.c	Thu Jan 05 14:53:54 2012 +0100
+++ b/test/list_tests.c	Sat Jan 14 13:07:18 2012 +0100
@@ -13,20 +13,22 @@
     int i;
 };
 
-int list_tests_foreach1(void *v, void *custom) {
+int int_cmp(void* e1, void *e2, void *data) {
+    if (e1 == NULL || e2 == NULL) return (e1 == e2) ? 0 : -1;
+    
+    int *i1 = (int*)e1, *i2 = (int*)e2;
+    int r = (*i1) - (*i2);
+    return (r < 0) ? -1 : (r == 0 ? 0 : 1);
+}
+
+int dlist_tests_foreach(void *v, void *custom) {
     UcxDlist *dl = (UcxDlist*)v;
     struct test1_data *tdata = (struct test1_data*)custom;
 
     tdata->values[tdata->i] = *(int*)dl->data;
     tdata->i++;
-}
-
-int list_tests_foreach2(void *v, void *custom) {
-    UcxList *dl = (UcxList*)v;
-    struct test1_data *tdata = (struct test1_data*)custom;
-
-    tdata->values[tdata->i] = *(int*)dl->data;
-    tdata->i++;
+    
+    return 0;
 }
 
 int dlist_tests() {
@@ -73,68 +75,50 @@
 
     struct test1_data tdata;
     tdata.i = 0;
-    ucx_dlist_foreach(dl, list_tests_foreach1, &tdata);
+    ucx_dlist_foreach(dl, dlist_tests_foreach, &tdata);
 
     if(tdata.values[0] != 4 || tdata.values[1] != 0 || tdata.values[2] != 4) {
         fprintf(stderr, "prepend/append test failed\n");
-        fprintf(stderr, "content: [%d, %d, %d]\n", tdata.values[0], tdata.values[1], tdata.values[2]);
+        fprintf(stderr, "content: [%d, %d, %d]\n",
+                tdata.values[0], tdata.values[1], tdata.values[2]);
+        r--;
+    }
+
+    printf("   Test ucx_dlist_equals\n");
+    UcxDlist *dl2 = NULL;
+    dl2 = ucx_dlist_append(dl2, &v[4]);
+    dl2 = ucx_dlist_append(dl2, &v[0]);
+    dl2 = ucx_dlist_append(dl2, &v[4]);
+    if (!ucx_dlist_equals(dl, dl2, NULL, NULL)) {
+        fprintf(stderr, "ucx_dlist_equals failed (false negative)\n");
+        r--;
+    }
+    dl2->next->data = NULL;
+    if (ucx_dlist_equals(dl, dl2, NULL, NULL)) {
+        fprintf(stderr, "ucx_dlist_equals failed (false positive)\n");
         r--;
     }
+    dl2->next->data = &(tdata.values[1]);
+    if (!ucx_dlist_equals(dl, dl2, int_cmp, NULL)) {
+        fprintf(stderr, "ucx_dlist_equals failed (cmp_func false negative)\n");
+        r--;
+    }
+    if (ucx_dlist_equals(dl, dl2, NULL, NULL)) {
+        fprintf(stderr, "ucx_dlist_equals failed (cmp_func false positive)\n");
+        r--;
+    }
+    ucx_dlist_free(dl2);
+    
+    printf("   Test ucx_dlist_clone\n");
+    dl2 = ucx_dlist_clone(dl, NULL, NULL);
+    if (!ucx_dlist_equals(dl, dl2, NULL, NULL)) {
+        fprintf(stderr, "ucx_dlist_clone (without copy) failed\n");
+        r--;
+    }
+    ucx_dlist_free(dl2);
+    
+    printf("   TODO: test clone with copy\n");
 
     return r;
 }
 
-int list_tests() {
-    int r = 0;
-    int v[8];
-    UcxList *dl = NULL;
-    // build list 0,1,2,3,4,5,6,7
-    printf("   Test ucx_list_append\n");
-    fflush(stdout);
-    for(int i=0;i<8;i++) {
-        v[i] = i;
-        dl = ucx_list_append(dl, &v[i]);
-    }
-
-    printf("   Test ucx_list_get\n");
-    fflush(stdout);
-    for(int i=0;i<8;i++) {
-        UcxList *elm = ucx_list_get(dl, i);
-        if(elm == NULL) {
-            fprintf(stderr, "ucx_list_get failed: element is NULL\n");
-            r--;
-        }
-        if(elm->data == NULL) {
-            fprintf(stderr, "ucx_list_get failed: data is NULL\n");
-            r--;
-        }
-        int *data = (int*)elm->data;
-        if(*data != i) {
-            fprintf(stderr, "ucx_list_get failed with index %d\n", i);
-            r--;
-        }
-    }
-
-    printf("   Test ucx_list_free\n");
-    fflush(stdout);
-    ucx_list_free(dl);
-
-    dl = NULL;
-    // build list 4,0,4
-    printf("   Test ucx_list_prepend\n");
-    dl = ucx_list_prepend(dl, &v[0]);
-    dl = ucx_list_prepend(dl, &v[4]);
-    dl = ucx_list_append(dl, &v[4]);
-
-    struct test1_data tdata;
-    tdata.i = 0;
-    ucx_list_foreach(dl, list_tests_foreach1, &tdata);
-
-    if(tdata.values[0] != 4 || tdata.values[1] != 0 || tdata.values[2] != 4) {
-        fprintf(stderr, "prepend/append test failed\n");
-        fprintf(stderr, "content: [%d, %d, %d]\n", tdata.values[0], tdata.values[1], tdata.values[2]);
-        r--;
-    }
-
-    return r;
-}
diff -r db7d9860dbbd -r d599fefc7620 test/list_tests.h
--- a/test/list_tests.h	Thu Jan 05 14:53:54 2012 +0100
+++ b/test/list_tests.h	Sat Jan 14 13:07:18 2012 +0100
@@ -13,7 +13,6 @@
 #endif
 
 int dlist_tests();
-int list_tests();
 
 
 #ifdef	__cplusplus
diff -r db7d9860dbbd -r d599fefc7620 test/main.c
--- a/test/main.c	Thu Jan 05 14:53:54 2012 +0100
+++ b/test/main.c	Sat Jan 14 13:07:18 2012 +0100
@@ -41,10 +41,7 @@
         fprintf(stderr, "dlist_tests failed\n");
     }
 
-    printf("\nUcxList Tests\n");
-    if(list_tests()) {
-        fprintf(stderr, "list_tests failed\n");
-    }
+    printf("\nUcxList Tests\n   Assumed to be correct\n");
 
     printf("\nUcxMemPool Tests\n");
     if(mpool_tests()) {
diff -r db7d9860dbbd -r d599fefc7620 test/mpool_tests.c
--- a/test/mpool_tests.c	Thu Jan 05 14:53:54 2012 +0100
+++ b/test/mpool_tests.c	Sat Jan 14 13:07:18 2012 +0100
@@ -25,6 +25,8 @@
 }
 
 int mpool_tests() {
+	int r = 0;
+
     printf("   Test ucx_mempool_new\n");
     UcxMempool *pool = ucx_mempool_new(16);
 
@@ -55,6 +57,7 @@
     char *str = ucx_mempool_calloc(pool, 1, 3);
     if(str[0] != 0 || str[1] != 0 || str[2] != 0) {
         fprintf(stderr, "ucx_mempool_calloc failed\n");
+        r--;
     }
     str[0] = 'O';
     str[1] = 'K';
@@ -65,6 +68,7 @@
     str[3] = 0;
     if(strcmp(str, "OK!") != 0) {
         fprintf(stderr, "Test ucx_mempool_realloc failed!\n");
+        r--;
     }
     
     printf("   Test ucx_mempool_reg_destr\n");
@@ -75,5 +79,5 @@
     //ucx_mempool_free(pool);
     
 
-    return 0;
+    return r;
 }
diff -r db7d9860dbbd -r d599fefc7620 ucx/dlist.c
--- a/ucx/dlist.c	Thu Jan 05 14:53:54 2012 +0100
+++ b/ucx/dlist.c	Sat Jan 14 13:07:18 2012 +0100
@@ -1,5 +1,34 @@
 #include "dlist.h"
 
+UcxDlist *ucx_dlist_clone(UcxDlist *l, copy_func fnc, void *data) {
+    UcxDlist *ret = NULL;
+    while (l != NULL) {
+        if (fnc != NULL) {
+            ret = ucx_dlist_append(ret, fnc(l->data, data));
+        } else {
+            ret = ucx_dlist_append(ret, l->data);
+        }
+        l = l->next;
+    }
+    return ret;
+}
+
+int ucx_dlist_equals(UcxDlist *l1, UcxDlist *l2, cmp_func fnc, void* data) {
+    if (l1 == l2) return 1;
+    
+    while (l1 != NULL && l2 != NULL) {
+        if (fnc == NULL) {
+            if (l1->data != l2->data) return 0;
+        } else {
+            if (fnc(l1->data, l2->data, data) != 0) return 0;
+        }
+        l1 = l1->next;
+        l2 = l2->next;
+    }
+    
+    return (l1 == NULL && l2 == NULL);
+}
+
 void ucx_dlist_free(UcxDlist *l) {
     UcxDlist *e = l, *f;
     while (e != NULL) {
diff -r db7d9860dbbd -r d599fefc7620 ucx/dlist.h
--- a/ucx/dlist.h	Thu Jan 05 14:53:54 2012 +0100
+++ b/ucx/dlist.h	Sat Jan 14 13:07:18 2012 +0100
@@ -19,6 +19,9 @@
     UcxDlist *prev;
 };
 
+UcxDlist *ucx_dlist_clone(UcxDlist *l, copy_func fnc, void* data);
+int ucx_dlist_equals(UcxDlist *l1, UcxDlist *l2, cmp_func fnc, void* data);
+
 void ucx_dlist_free(UcxDlist *l);
 UcxDlist *ucx_dlist_append(UcxDlist *l, void *data);
 UcxDlist *ucx_dlist_prepend(UcxDlist *l, void *data);
diff -r db7d9860dbbd -r d599fefc7620 ucx/list.c
--- a/ucx/list.c	Thu Jan 05 14:53:54 2012 +0100
+++ b/ucx/list.c	Sat Jan 14 13:07:18 2012 +0100
@@ -1,5 +1,34 @@
 #include "list.h"
 
+UcxList *ucx_list_clone(UcxList *l, copy_func fnc, void *data) {
+    UcxList *ret = NULL;
+    while (l != NULL) {
+        if (fnc != NULL) {
+            ret = ucx_list_append(ret, fnc(l->data, data));
+        } else {
+            ret = ucx_list_append(ret, l->data);
+        }
+        l = l->next;
+    }
+    return ret;
+}
+
+int ucx_list_equals(UcxList *l1, UcxList *l2, cmp_func fnc, void* data) {
+    if (l1 == l2) return 1;
+    
+    while (l1 != NULL && l2 != NULL) {
+        if (fnc == NULL) {
+            if (l1->data != l2->data) return 0;
+        } else {
+            if (fnc(l1->data, l2->data, data) != 0) return 0;
+        }
+        l1 = l1->next;
+        l2 = l2->next;
+    }
+    
+    return (l1 == NULL && l2 == NULL);
+}
+
 void ucx_list_free(UcxList *l) {
     UcxList *e = l, *f;
     while (e != NULL) {
diff -r db7d9860dbbd -r d599fefc7620 ucx/list.h
--- a/ucx/list.h	Thu Jan 05 14:53:54 2012 +0100
+++ b/ucx/list.h	Sat Jan 14 13:07:18 2012 +0100
@@ -18,6 +18,9 @@
     UcxList *next;
 };
 
+UcxList *ucx_list_clone(UcxList *l, copy_func fnc, void *data);
+int ucx_list_equals(UcxList *l1, UcxList *l2, cmp_func fnc, void *data);
+
 void ucx_list_free(UcxList *l);
 UcxList *ucx_list_append(UcxList *l, void *data);
 UcxList *ucx_list_prepend(UcxList *l, void *data);
diff -r db7d9860dbbd -r d599fefc7620 ucx/ucx.h
--- a/ucx/ucx.h	Thu Jan 05 14:53:54 2012 +0100
+++ b/ucx/ucx.h	Sat Jan 14 13:07:18 2012 +0100
@@ -14,8 +14,15 @@
 extern "C" {
 #endif
 
+/* source,data -> errno */
 typedef int(*ucx_callback)(void*,void*);
 
+/* element1,element2,custom data -> {-1,0,1} */
+typedef int(*cmp_func)(void*,void*,void*);
+
+/* element,custom data -> copy of element */
+typedef void*(*copy_func)(void*,void*);
+
 #ifdef	__cplusplus
 }
 #endif