From 83ff9840528320d61c61741082672d1ffab36000 Mon Sep 17 00:00:00 2001 From: Sam Wilson Date: Fri, 30 May 2014 10:04:04 -0400 Subject: [PATCH 01/21] Add delete_after for klist --- klist.h | 13 +++++++++++++ test/klist_test.c | 2 ++ 2 files changed, 15 insertions(+) diff --git a/klist.h b/klist.h index adc3db1..2c263b7 100644 --- a/klist.h +++ b/klist.h @@ -115,6 +115,18 @@ if (d) *d = p->data; \ kmp_free(name, kl->mp, p); \ return 0; \ + } \ + static inline int kl_delete_after_##name(kl_##name##_t *kl, \ + kl1_##name *c, \ + kltype_t *d) { \ + kl1_##name *p; \ + if (c->next == 0) return -1; \ + if (c->next->next == 0) return -1; \ + --kl->size; \ + p = c->next; c->next = c->next->next; \ + if (d) *d = p->data; \ + kmp_free(name, kl->mp, p); \ + return 0; \ } #define KLIST_INIT(name, kltype_t, kmpfree_t) \ @@ -131,5 +143,6 @@ #define kl_destroy(name, kl) kl_destroy_##name(kl) #define kl_pushp(name, kl) kl_pushp_##name(kl) #define kl_shift(name, kl, d) kl_shift_##name(kl, d) +#define kl_delete_after(name, kl, iter, d) kl_delete_after_##name(kl, iter, d) #endif diff --git a/test/klist_test.c b/test/klist_test.c index cd13813..324e92e 100644 --- a/test/klist_test.c +++ b/test/klist_test.c @@ -11,7 +11,9 @@ int main() kl = kl_init(32); *kl_pushp(32, kl) = 1; *kl_pushp(32, kl) = 10; + *kl_pushp(32, kl) = 19; kl_shift(32, kl, 0); + kl_delete_after(32, kl, kl_begin(kl), 0); for (p = kl_begin(kl); p != kl_end(kl); p = kl_next(p)) printf("%d\n", kl_val(p)); kl_destroy(32, kl); From 393c21bd4354ba4b8e436a078c8253daf2209576 Mon Sep 17 00:00:00 2001 From: Sam Wilson Date: Fri, 30 May 2014 22:11:34 -0400 Subject: [PATCH 02/21] Add insert_after and unshift --- klist.h | 17 +++++++++++++++++ test/klist_test.c | 3 +++ 2 files changed, 20 insertions(+) diff --git a/klist.h b/klist.h index 2c263b7..76d3cb5 100644 --- a/klist.h +++ b/klist.h @@ -116,6 +116,12 @@ kmp_free(name, kl->mp, p); \ return 0; \ } \ + static inline kltype_t *kl_unshiftp_##name(kl_##name##_t *kl) { \ + kl1_##name *q, *p = kmp_alloc(name, kl->mp); \ + q = kl->head; p->next = q; kl->head = p; \ + ++kl->size; \ + return &p->data; \ + } \ static inline int kl_delete_after_##name(kl_##name##_t *kl, \ kl1_##name *c, \ kltype_t *d) { \ @@ -127,6 +133,14 @@ if (d) *d = p->data; \ kmp_free(name, kl->mp, p); \ return 0; \ + } \ + static inline kltype_t *kl_insertp_after_##name(kl_##name##_t *kl, \ + kl1_##name *c) { \ + if (c->next == 0) return 0; \ + kl1_##name *p = kmp_alloc(name, kl->mp); \ + p->next = c->next; c->next = p; \ + ++kl->size; \ + return &p->data; \ } #define KLIST_INIT(name, kltype_t, kmpfree_t) \ @@ -143,6 +157,9 @@ #define kl_destroy(name, kl) kl_destroy_##name(kl) #define kl_pushp(name, kl) kl_pushp_##name(kl) #define kl_shift(name, kl, d) kl_shift_##name(kl, d) +#define kl_unshiftp(name, kl) kl_unshiftp_##name(kl) + #define kl_delete_after(name, kl, iter, d) kl_delete_after_##name(kl, iter, d) +#define kl_insertp_after(name, kl, iter) kl_insertp_after_##name(kl, iter) #endif diff --git a/test/klist_test.c b/test/klist_test.c index 324e92e..9ec45cd 100644 --- a/test/klist_test.c +++ b/test/klist_test.c @@ -12,8 +12,11 @@ int main() *kl_pushp(32, kl) = 1; *kl_pushp(32, kl) = 10; *kl_pushp(32, kl) = 19; + *kl_pushp(32, kl) = 28; kl_shift(32, kl, 0); kl_delete_after(32, kl, kl_begin(kl), 0); + *kl_unshiftp(32, kl) = 37; + *kl_insertp_after(32, kl, kl_begin(kl)) = 46; for (p = kl_begin(kl); p != kl_end(kl); p = kl_next(p)) printf("%d\n", kl_val(p)); kl_destroy(32, kl); From 6c9ebad0e034d7dc4ead2bef567572502357f59a Mon Sep 17 00:00:00 2001 From: tecywiz121 Date: Mon, 2 Jun 2014 11:41:57 -0400 Subject: [PATCH 03/21] Add kl_length macro --- klist.h | 1 + 1 file changed, 1 insertion(+) diff --git a/klist.h b/klist.h index 76d3cb5..4483288 100644 --- a/klist.h +++ b/klist.h @@ -152,6 +152,7 @@ #define kl_next(iter) ((iter)->next) #define kl_begin(kl) ((kl)->head) #define kl_end(kl) ((kl)->tail) +#define kl_length(kl) ((kl)->size) #define kl_init(name) kl_init_##name() #define kl_destroy(name, kl) kl_destroy_##name(kl) From 242ed0a3dfb0221410df048539a5f4bafd6e1d65 Mon Sep 17 00:00:00 2001 From: Sam Wilson Date: Fri, 19 Sep 2014 09:56:31 -0400 Subject: [PATCH 04/21] Make klist cope with OoM situations; Improve c++ compatibility --- klist.h | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/klist.h b/klist.h index 4483288..2b32673 100644 --- a/klist.h +++ b/klist.h @@ -42,7 +42,7 @@ kmptype_t **buf; \ } kmp_##name##_t; \ SCOPE kmp_##name##_t *kmp_init_##name(void) { \ - return calloc(1, sizeof(kmp_##name##_t)); \ + return (kmp_##name##_t *)calloc(1, sizeof(kmp_##name##_t)); \ } \ SCOPE void kmp_destroy_##name(kmp_##name##_t *mp) { \ size_t k; \ @@ -53,14 +53,16 @@ } \ SCOPE kmptype_t *kmp_alloc_##name(kmp_##name##_t *mp) { \ ++mp->cnt; \ - if (mp->n == 0) return calloc(1, sizeof(kmptype_t)); \ + if (mp->n == 0) return (kmptype_t*)calloc(1,sizeof(kmptype_t)); \ return mp->buf[--mp->n]; \ } \ SCOPE void kmp_free_##name(kmp_##name##_t *mp, kmptype_t *p) { \ --mp->cnt; \ if (mp->n == mp->max) { \ - mp->max = mp->max? mp->max<<1 : 16; \ - mp->buf = realloc(mp->buf, sizeof(kmptype_t *) * mp->max); \ + size_t new_max = mp->max ? mp->max<<1 : 16; \ + void* nb = realloc(mp->buf, sizeof(kmptype_t *) * new_max); \ + if (!nb) { kmpfree_f(p); free(p); return; } \ + mp->max = new_max; mp->buf = (kmptype_t **)nb; \ } \ mp->buf[mp->n++] = p; \ } @@ -87,9 +89,12 @@ size_t size; \ } kl_##name##_t; \ SCOPE kl_##name##_t *kl_init_##name(void) { \ - kl_##name##_t *kl = calloc(1, sizeof(kl_##name##_t)); \ + kl_##name##_t *kl = (kl_##name##_t *)calloc(1, sizeof(kl_##name##_t)); \ + if (!kl) return 0; \ kl->mp = kmp_init(name); \ + if (!kl->mp) { free(kl); return 0; } \ kl->head = kl->tail = kmp_alloc(name, kl->mp); \ + if (!kl->head) { free(kl->mp); free(kl); return 0; } \ kl->head->next = 0; \ return kl; \ } \ @@ -103,6 +108,7 @@ } \ SCOPE kltype_t *kl_pushp_##name(kl_##name##_t *kl) { \ kl1_##name *q, *p = kmp_alloc(name, kl->mp); \ + if (!p) return 0; \ q = kl->tail; p->next = 0; kl->tail->next = p; kl->tail = p; \ ++kl->size; \ return &q->data; \ @@ -118,6 +124,7 @@ } \ static inline kltype_t *kl_unshiftp_##name(kl_##name##_t *kl) { \ kl1_##name *q, *p = kmp_alloc(name, kl->mp); \ + if (!p) return 0; \ q = kl->head; p->next = q; kl->head = p; \ ++kl->size; \ return &p->data; \ @@ -138,6 +145,7 @@ kl1_##name *c) { \ if (c->next == 0) return 0; \ kl1_##name *p = kmp_alloc(name, kl->mp); \ + if (!p) return 0; \ p->next = c->next; c->next = p; \ ++kl->size; \ return &p->data; \ From 03ce04c7f67b3ce5cb4e870669488dc849792f42 Mon Sep 17 00:00:00 2001 From: Sam Wilson Date: Wed, 4 Feb 2015 13:32:04 -0500 Subject: [PATCH 05/21] Fix use-after-free in klist --- klist.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/klist.h b/klist.h index 2b32673..25e2345 100644 --- a/klist.h +++ b/klist.h @@ -99,9 +99,11 @@ return kl; \ } \ SCOPE void kl_destroy_##name(kl_##name##_t *kl) { \ - kl1_##name *p; \ - for (p = kl->head; p != kl->tail; p = p->next) \ + kl1_##name *p, *next_p; \ + for (p = kl->head; p != kl->tail; p = next_p){ \ + next_p = p->next; \ kmp_free(name, kl->mp, p); \ + } \ kmp_free(name, kl->mp, p); \ kmp_destroy(name, kl->mp); \ free(kl); \ From e48a57b36ab3e74aad5ecb7b4b93daca92e04279 Mon Sep 17 00:00:00 2001 From: Sam Wilson Date: Thu, 24 Nov 2016 13:24:02 -0500 Subject: [PATCH 06/21] Use the SCOPE macro argument in klist --- klist.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/klist.h b/klist.h index 25e2345..1a96dc8 100644 --- a/klist.h +++ b/klist.h @@ -124,14 +124,14 @@ kmp_free(name, kl->mp, p); \ return 0; \ } \ - static inline kltype_t *kl_unshiftp_##name(kl_##name##_t *kl) { \ + SCOPE kltype_t *kl_unshiftp_##name(kl_##name##_t *kl) { \ kl1_##name *q, *p = kmp_alloc(name, kl->mp); \ if (!p) return 0; \ q = kl->head; p->next = q; kl->head = p; \ ++kl->size; \ return &p->data; \ } \ - static inline int kl_delete_after_##name(kl_##name##_t *kl, \ + SCOPE int kl_delete_after_##name(kl_##name##_t *kl, \ kl1_##name *c, \ kltype_t *d) { \ kl1_##name *p; \ @@ -143,7 +143,7 @@ kmp_free(name, kl->mp, p); \ return 0; \ } \ - static inline kltype_t *kl_insertp_after_##name(kl_##name##_t *kl, \ + SCOPE kltype_t *kl_insertp_after_##name(kl_##name##_t *kl, \ kl1_##name *c) { \ if (c->next == 0) return 0; \ kl1_##name *p = kmp_alloc(name, kl->mp); \ From aa7ed251a6d9a160f911b348bfd70c4b9cf7fdd0 Mon Sep 17 00:00:00 2001 From: Sam Wilson Date: Tue, 3 Jun 2014 11:38:46 -0400 Subject: [PATCH 07/21] removing old tests --- test/Makefile | 63 ---- test/kbit_test.c | 137 ------- test/kbtree_test.c | 94 ----- test/kgraph_test.c | 26 -- test/khash_keith.c | 95 ----- test/khash_keith2.c | 67 ---- test/khash_test.c | 141 ------- test/klist_test.c | 24 -- test/kmin_test.c | 48 --- test/kseq_bench.c | 69 ---- test/kseq_bench2.c | 43 --- test/kseq_test.c | 27 -- test/kseq_test.dat | 12 - test/ksort_test.c | 104 ------ test/ksort_test.cc | 997 -------------------------------------------------- test/kstring_bench.c | 51 --- test/kstring_bench2.c | 131 ------- test/kstring_test.c | 132 ------- test/kthread_test.c | 69 ---- test/kvec_test.cc | 69 ---- 20 files changed, 2399 deletions(-) delete mode 100644 test/Makefile delete mode 100644 test/kbit_test.c delete mode 100644 test/kbtree_test.c delete mode 100644 test/kgraph_test.c delete mode 100644 test/khash_keith.c delete mode 100644 test/khash_keith2.c delete mode 100644 test/khash_test.c delete mode 100644 test/klist_test.c delete mode 100644 test/kmin_test.c delete mode 100644 test/kseq_bench.c delete mode 100644 test/kseq_bench2.c delete mode 100644 test/kseq_test.c delete mode 100644 test/kseq_test.dat delete mode 100644 test/ksort_test.c delete mode 100644 test/ksort_test.cc delete mode 100644 test/kstring_bench.c delete mode 100644 test/kstring_bench2.c delete mode 100644 test/kstring_test.c delete mode 100644 test/kthread_test.c delete mode 100644 test/kvec_test.cc diff --git a/test/Makefile b/test/Makefile deleted file mode 100644 index 44d9eab..0000000 --- a/test/Makefile +++ /dev/null @@ -1,63 +0,0 @@ -CC=gcc -CXX=g++ -CFLAGS=-g -Wall -O2 -I.. -CXXFLAGS=$(CFLAGS) -PROGS=kbtree_test khash_keith khash_keith2 khash_test klist_test kseq_test kseq_bench \ - kseq_bench2 ksort_test ksort_test-stl kvec_test kmin_test kstring_bench kstring_bench2 kstring_test \ - kthread_test2 - -all:$(PROGS) - -clean: - rm -fr $(PROGS) *.dSYM a.out *.o - -kbtree_test:kbtree_test.c ../kbtree.h - $(CC) $(CFLAGS) -o $@ kbtree_test.c - -khash_keith:khash_keith.c ../khash.h - $(CC) $(CFLAGS) -o $@ khash_keith.c - -khash_keith2:khash_keith2.c ../khash.h - $(CC) $(CFLAGS) -o $@ khash_keith2.c - -khash_test:khash_test.c ../khash.h - $(CC) $(CFLAGS) -o $@ khash_test.c - -klist_test:klist_test.c ../klist.h - $(CC) $(CFLAGS) -o $@ klist_test.c - -kseq_test:kseq_test.c ../kseq.h - $(CC) $(CFLAGS) -o $@ kseq_test.c -lz - -kseq_bench:kseq_bench.c ../kseq.h - $(CC) $(CFLAGS) -o $@ kseq_bench.c -lz - -kseq_bench2:kseq_bench2.c ../kseq.h - $(CC) $(CFLAGS) -o $@ kseq_bench2.c -lz - -ksort_test:ksort_test.c ../ksort.h - $(CC) $(CFLAGS) -o $@ ksort_test.c - -ksort_test-stl:ksort_test.cc ../ksort.h - $(CXX) $(CXXFLAGS) -o $@ ksort_test.cc - -kvec_test:kvec_test.cc ../kvec.h - $(CXX) $(CXXFLAGS) -o $@ kvec_test.cc - -kmin_test:kmin_test.c ../kmath.h ../kmath.c - $(CC) $(CFLAGS) -o $@ kmin_test.c ../kmath.c - -kstring_bench:kstring_bench.c ../kstring.h ../kstring.c - $(CC) $(CFLAGS) -o $@ kstring_bench.c ../kstring.c - -kstring_bench2:kstring_bench2.c ../kstring.h ../kstring.c - $(CC) $(CFLAGS) -o $@ kstring_bench2.c ../kstring.c - -kstring_test:kstring_test.c ../kstring.h ../kstring.c - $(CC) $(CFLAGS) -o $@ kstring_test.c ../kstring.c - -kthread_test:kthread_test.c ../kthread.c - $(CC) $(CFLAGS) -fopenmp -o $@ kthread_test.c ../kthread.c - -kthread_test2:kthread_test2.c ../kthread.c - $(CC) $(CFLAGS) -o $@ kthread_test2.c ../kthread.c diff --git a/test/kbit_test.c b/test/kbit_test.c deleted file mode 100644 index 3ae3bd3..0000000 --- a/test/kbit_test.c +++ /dev/null @@ -1,137 +0,0 @@ -#include -#include -#include -#include -#include "kbit.h" - -// from bowtie-0.9.8.1 -inline static int bt1_pop64(uint64_t x) // the kbi_popcount64() equivalence; similar to popcount_2() in wiki -{ - x -= ((x >> 1) & 0x5555555555555555llu); - x = (x & 0x3333333333333333llu) + ((x >> 2) & 0x3333333333333333llu); - x = (x + (x >> 4)) & 0x0F0F0F0F0F0F0F0Fllu; - x = x + (x >> 8); - x = x + (x >> 16); - x = x + (x >> 32); - return x & 0x3F; -} - -inline static int bt1_countInU64(uint64_t dw, int c) // the kbi_DNAcount64() equivalence -{ - uint64_t dwA = dw & 0xAAAAAAAAAAAAAAAAllu; - uint64_t dwNA = dw & ~0xAAAAAAAAAAAAAAAAllu; - uint64_t tmp; - switch (c) { - case 0: tmp = (dwA >> 1) | dwNA; break; - case 1: tmp = ~(dwA >> 1) & dwNA; break; - case 2: tmp = (dwA >> 1) & ~dwNA; break; - default: tmp = (dwA >> 1) & dwNA; - } - tmp = bt1_pop64(tmp); - if (c == 0) tmp = 32 - tmp; - return (int)tmp; -} - -// from bigmagic -static uint32_t sse2_bit_count32(const __m128i* block, const __m128i* block_end) -{ - const unsigned mu1 = 0x55555555; - const unsigned mu2 = 0x33333333; - const unsigned mu3 = 0x0F0F0F0F; - const unsigned mu4 = 0x0000003F; - - uint32_t tcnt[4]; - - // Loading masks - __m128i m1 = _mm_set_epi32 (mu1, mu1, mu1, mu1); - __m128i m2 = _mm_set_epi32 (mu2, mu2, mu2, mu2); - __m128i m3 = _mm_set_epi32 (mu3, mu3, mu3, mu3); - __m128i m4 = _mm_set_epi32 (mu4, mu4, mu4, mu4); - __m128i mcnt; - mcnt = _mm_xor_si128(m1, m1); // cnt = 0 - - __m128i tmp1, tmp2; - do - { - __m128i b = _mm_load_si128(block); - ++block; - - // b = (b & 0x55555555) + (b >> 1 & 0x55555555); - tmp1 = _mm_srli_epi32(b, 1); // tmp1 = (b >> 1 & 0x55555555) - tmp1 = _mm_and_si128(tmp1, m1); - tmp2 = _mm_and_si128(b, m1); // tmp2 = (b & 0x55555555) - b = _mm_add_epi32(tmp1, tmp2); // b = tmp1 + tmp2 - - // b = (b & 0x33333333) + (b >> 2 & 0x33333333); - tmp1 = _mm_srli_epi32(b, 2); // (b >> 2 & 0x33333333) - tmp1 = _mm_and_si128(tmp1, m2); - tmp2 = _mm_and_si128(b, m2); // (b & 0x33333333) - b = _mm_add_epi32(tmp1, tmp2); // b = tmp1 + tmp2 - - // b = (b + (b >> 4)) & 0x0F0F0F0F; - tmp1 = _mm_srli_epi32(b, 4); // tmp1 = b >> 4 - b = _mm_add_epi32(b, tmp1); // b = b + (b >> 4) - b = _mm_and_si128(b, m3); // & 0x0F0F0F0F - - // b = b + (b >> 8); - tmp1 = _mm_srli_epi32 (b, 8); // tmp1 = b >> 8 - b = _mm_add_epi32(b, tmp1); // b = b + (b >> 8) - - // b = (b + (b >> 16)) & 0x0000003F; - tmp1 = _mm_srli_epi32 (b, 16); // b >> 16 - b = _mm_add_epi32(b, tmp1); // b + (b >> 16) - b = _mm_and_si128(b, m4); // (b >> 16) & 0x0000003F; - - mcnt = _mm_add_epi32(mcnt, b); // mcnt += b - - } while (block < block_end); - - _mm_store_si128((__m128i*)tcnt, mcnt); - - return tcnt[0] + tcnt[1] + tcnt[2] + tcnt[3]; -} - -int main(void) -{ - int i, N = 100000000; - uint64_t *x, cnt; - clock_t t; - int c = 1; - - x = (uint64_t*)calloc(N, 8); - srand48(11); - for (i = 0; i < N; ++i) - x[i] = (uint64_t)lrand48() << 32 ^ lrand48(); - - fprintf(stderr, "\n===> Calculate # of 1 in an integer (popcount) <===\n"); - - t = clock(); cnt = 0; - for (i = 0; i < N; ++i) cnt += kbi_popcount64(x[i]); - fprintf(stderr, "%20s\t%20ld\t%10.6f\n", "kbit", (long)cnt, (double)(clock() - t) / CLOCKS_PER_SEC); - - t = clock(); cnt = 0; - for (i = 0; i < N; ++i) cnt += bt1_pop64(x[i]); - fprintf(stderr, "%20s\t%20ld\t%10.6f\n", "wiki-popcount_2", (long)cnt, (double)(clock() - t) / CLOCKS_PER_SEC); - - t = clock(); cnt = 0; - for (i = 0; i < N; ++i) cnt += __builtin_popcountl(x[i]); - fprintf(stderr, "%20s\t%20ld\t%10.6f\n", "__builtin_popcountl", (long)cnt, (double)(clock() - t) / CLOCKS_PER_SEC); - - t = clock(); cnt = 0; - cnt += sse2_bit_count32((__m128i*)x, (__m128i*)(x+N)); - fprintf(stderr, "%20s\t%20ld\t%10.6f\n", "SSE2-32bit", (long)cnt, (double)(clock() - t) / CLOCKS_PER_SEC); - - fprintf(stderr, "\n===> Count '%c' in 2-bit encoded integers <===\n", "ACGT"[c]); - - t = clock(); cnt = 0; - for (i = 0; i < N; ++i) cnt += kbi_DNAcount64(x[i], c); - fprintf(stderr, "%20s\t%20ld\t%10.6f\n", "kbit", (long)cnt, (double)(clock() - t) / CLOCKS_PER_SEC); - - t = clock(); cnt = 0; - for (i = 0; i < N; ++i) cnt += bt1_countInU64(x[i], c); - fprintf(stderr, "%20s\t%20ld\t%10.6f\n", "bowtie1", (long)cnt, (double)(clock() - t) / CLOCKS_PER_SEC); - - fprintf(stderr, "\n"); - free(x); - return 0; -} diff --git a/test/kbtree_test.c b/test/kbtree_test.c deleted file mode 100644 index 8e10687..0000000 --- a/test/kbtree_test.c +++ /dev/null @@ -1,94 +0,0 @@ -#include -#include -#include -#include -#include -#include - -typedef const char *str_t; - -#include "kbtree.h" -KBTREE_INIT(int, uint32_t, kb_generic_cmp) -KBTREE_INIT(str, str_t, kb_str_cmp) - -static int data_size = 5000000; -static unsigned *int_data; -static char **str_data; - -void ht_init_data() -{ - int i; - char buf[256]; - printf("--- generating data... "); - srand48(11); - int_data = (unsigned*)calloc(data_size, sizeof(unsigned)); - str_data = (char**)calloc(data_size, sizeof(char*)); - for (i = 0; i < data_size; ++i) { - int_data[i] = (unsigned)(data_size * drand48() / 4) * 271828183u; - sprintf(buf, "%x", int_data[i]); - str_data[i] = strdup(buf); - } - printf("done!\n"); -} -void ht_destroy_data() -{ - int i; - for (i = 0; i < data_size; ++i) free(str_data[i]); - free(str_data); free(int_data); -} - -void ht_khash_int() -{ - int i; - unsigned *data = int_data; - uint32_t *l, *u; - kbtree_t(int) *h; - - h = kb_init(int, KB_DEFAULT_SIZE); - for (i = 0; i < data_size; ++i) { - if (kb_get(int, h, data[i]) == 0) kb_put(int, h, data[i]); - else kb_del(int, h, data[i]); - } - printf("[ht_khash_int] size: %d\n", kb_size(h)); - if (1) { - int cnt = 0; - uint32_t x, y; - kb_interval(int, h, 2174625464u, &l, &u); - printf("interval for 2174625464: (%u, %u)\n", l? *l : 0, u? *u : 0); -#define traverse_f(p) { if (cnt == 0) y = *p; ++cnt; } - __kb_traverse(uint32_t, h, traverse_f); - __kb_get_first(uint32_t, h, x); - printf("# of elements from traversal: %d\n", cnt); - printf("first element: %d == %d\n", x, y); - } - __kb_destroy(h); -} -void ht_khash_str() -{ - int i; - char **data = str_data; - kbtree_t(str) *h; - - h = kb_init(str, KB_DEFAULT_SIZE); - for (i = 0; i < data_size; ++i) { - if (kb_get(str, h, data[i]) == 0) kb_put(str, h, data[i]); - else kb_del(str, h, data[i]); - } - printf("[ht_khash_int] size: %d\n", kb_size(h)); - __kb_destroy(h); -} -void ht_timing(void (*f)(void)) -{ - clock_t t = clock(); - (*f)(); - printf("[ht_timing] %.3lf sec\n", (double)(clock() - t) / CLOCKS_PER_SEC); -} -int main(int argc, char *argv[]) -{ - if (argc > 1) data_size = atoi(argv[1]); - ht_init_data(); - ht_timing(ht_khash_int); - ht_timing(ht_khash_str); - ht_destroy_data(); - return 0; -} diff --git a/test/kgraph_test.c b/test/kgraph_test.c deleted file mode 100644 index 3da1cd7..0000000 --- a/test/kgraph_test.c +++ /dev/null @@ -1,26 +0,0 @@ -#include -#include "kgraph.h" - -KHASH_INIT2(e32, extern, uint32_t, int, 1, kh_int_hash_func, kh_int_hash_equal) - -typedef struct { - int i; - khash_t(e32) *_arc; -} vertex_t; - -KGRAPH_INIT(g, extern, vertex_t, int, e32) -KGRAPH_PRINT(g, extern) - -int main() -{ - int *pb, *pe; - kgraph_t(g) *g; - g = kg_init_g(); - kg_put_a_g(g, 10, 20, 0, &pb, &pe); - kg_put_a_g(g, 20, 30, 0, &pb, &pe); - kg_put_a_g(g, 30, 10, 1, &pb, &pe); - kg_del_v_g(g, 20); - kg_print_g(g); - kg_destroy_g(g); - return 0; -} diff --git a/test/khash_keith.c b/test/khash_keith.c deleted file mode 100644 index ddd755a..0000000 --- a/test/khash_keith.c +++ /dev/null @@ -1,95 +0,0 @@ -/* - * This is an optimized version of the following C++ program: - * - * http://keithlea.com/javabench/src/cpp/hash.cpp - * - * Keith in his benchmark (http://keithlea.com/javabench/data) showed that the - * Java implementation is twice as fast as the C++ version. In fact, this is - * only because the C++ implementation is substandard. Most importantly, Keith - * is using "sprintf()" to convert an integer to a string, which is known to be - * extremely inefficient. - */ -#include -#include "khash.h" -KHASH_MAP_INIT_STR(str, int) - -inline void int2str(int c, int base, char *ret) -{ - const char *tab = "0123456789abcdef"; - if (c == 0) ret[0] = '0', ret[1] = 0; - else { - int l, x, y; - char buf[16]; - for (l = 0, x = c < 0? -c : c; x > 0; x /= base) buf[l++] = tab[x%base]; - if (c < 0) buf[l++] = '-'; - for (x = l - 1, y = 0; x >= 0; --x) ret[y++] = buf[x]; - ret[y] = 0; - } -} - -#ifndef _USE_STRDUP -#define BLOCK_SIZE 0x100000 -int main(int argc, char *argv[]) -{ - char **mem = 0; - int i, l, n = 1000000, ret, block_end = 0, curr = 0, c = 0; - khash_t(str) *h; - h = kh_init(str); - if (argc > 1) n = atoi(argv[1]); - mem = malloc(sizeof(void*)); - mem[0] = malloc(BLOCK_SIZE); // memory buffer to avoid memory fragmentation - curr = block_end = 0; - for (i = 1; i <= n; ++i) { - char buf[16]; - int2str(i, 16, buf); - khint_t k = kh_put(str, h, buf, &ret); - l = strlen(buf) + 1; - if (block_end + l > BLOCK_SIZE) { - ++curr; block_end = 0; - mem = realloc(mem, (curr + 1) * sizeof(void*)); - mem[curr] = malloc(BLOCK_SIZE); - } - memcpy(mem[curr] + block_end, buf, l); - kh_key(h, k) = mem[curr] + block_end; - block_end += l; - kh_val(h, k) = i; - } - for (i = 1; i <= n; ++i) { - char buf[16]; - int2str(i, 10, buf); - khint_t k = kh_get(str, h, buf); - if (k != kh_end(h)) ++c; - } - printf("%d\n", c); - for (ret = 0; ret <= curr; ++ret) free(mem[ret]); - free(mem); - kh_destroy(str, h); - return 0; -} -#else // _USE_STRDUP -int main(int argc, char *argv[]) -{ - int i, l, n = 1000000, ret, c = 0; - khash_t(str) *h; - khint_t k; - h = kh_init(str); - if (argc > 1) n = atoi(argv[1]); - for (i = 1; i <= n; ++i) { - char buf[16]; - int2str(i, 16, buf); - k = kh_put(str, h, strdup(buf), &ret); - kh_val(h, k) = i; - } - for (i = 1; i <= n; ++i) { - char buf[16]; - int2str(i, 10, buf); - k = kh_get(str, h, buf); - if (k != kh_end(h)) ++c; - } - for (k = kh_begin(h); k != kh_end(h); ++k) // explicitly freeing memory takes 10-20% CPU time. - if (kh_exist(h, k)) free((char*)kh_key(h, k)); - printf("%d\n", c); - kh_destroy(str, h); - return 0; -} -#endif diff --git a/test/khash_keith2.c b/test/khash_keith2.c deleted file mode 100644 index b9df9b7..0000000 --- a/test/khash_keith2.c +++ /dev/null @@ -1,67 +0,0 @@ -/* - * This is an optimized version of the following C++ program: - * - * http://keithlea.com/javabench/src/cpp/hash.cpp - * - * Keith in his benchmark (http://keithlea.com/javabench/data) showed that the - * Java implementation is twice as fast as the C++ version. In fact, this is - * only because the C++ implementation is substandard. Most importantly, Keith - * is using "sprintf()" to convert an integer to a string, which is known to be - * extremely inefficient. - */ -#include -#include "khash.h" -KHASH_MAP_INIT_STR(str, int) - -inline void int2str(int c, int base, char *ret) -{ - const char *tab = "0123456789abcdef"; - if (c == 0) ret[0] = '0', ret[1] = 0; - else { - int l, x, y; - char buf[16]; - for (l = 0, x = c < 0? -c : c; x > 0; x /= base) buf[l++] = tab[x%base]; - if (c < 0) buf[l++] = '-'; - for (x = l - 1, y = 0; x >= 0; --x) ret[y++] = buf[x]; - ret[y] = 0; - } -} - -int main(int argc, char *argv[]) -{ - int i, l, n = 1000, ret; - khash_t(str) *h, *h2; - khint_t k; - h = kh_init(str); - h2 = kh_init(str); - if (argc > 1) n = atoi(argv[1]); - for (i = 0; i < 10000; ++i) { - char buf[32]; - strcpy(buf, "foo_"); - int2str(i, 10, buf+4); - k = kh_put(str, h, strdup(buf), &ret); - kh_val(h, k) = i; - } - for (i = 0; i < n; ++i) { - for (k = kh_begin(h); k != kh_end(h); ++k) { - if (kh_exist(h, k)) { - khint_t k2 = kh_put(str, h2, kh_key(h, k), &ret); - if (ret) { // absent - kh_key(h2, k2) = strdup(kh_key(h, k)); - kh_val(h2, k2) = kh_val(h, k); - } else kh_val(h2, k2) += kh_val(h, k); - } - } - } - k = kh_get(str, h, "foo_1"); printf("%d", kh_val(h, k)); - k = kh_get(str, h, "foo_9999"); printf(" %d", kh_val(h, k)); - k = kh_get(str, h2, "foo_1"); printf(" %d", kh_val(h2, k)); - k = kh_get(str, h2, "foo_9999"); printf(" %d\n", kh_val(h2, k)); - for (k = kh_begin(h); k != kh_end(h); ++k) - if (kh_exist(h, k)) free((char*)kh_key(h, k)); - for (k = kh_begin(h2); k != kh_end(h2); ++k) - if (kh_exist(h2, k)) free((char*)kh_key(h2, k)); - kh_destroy(str, h); - kh_destroy(str, h2); - return 0; -} diff --git a/test/khash_test.c b/test/khash_test.c deleted file mode 100644 index 8d6687f..0000000 --- a/test/khash_test.c +++ /dev/null @@ -1,141 +0,0 @@ -#include -#include -#include -#include -#include - -#include "khash.h" -KHASH_SET_INIT_STR(str) -KHASH_MAP_INIT_INT(int, unsigned char) - -typedef struct { - unsigned key; - unsigned char val; -} int_unpack_t; - -typedef struct { - unsigned key; - unsigned char val; -} __attribute__ ((__packed__)) int_packed_t; - -#define hash_eq(a, b) ((a).key == (b).key) -#define hash_func(a) ((a).key) - -KHASH_INIT(iun, int_unpack_t, char, 0, hash_func, hash_eq) -KHASH_INIT(ipk, int_packed_t, char, 0, hash_func, hash_eq) - -static int data_size = 5000000; -static unsigned *int_data; -static char **str_data; - -void ht_init_data() -{ - int i; - char buf[256]; - khint32_t x = 11; - printf("--- generating data... "); - int_data = (unsigned*)calloc(data_size, sizeof(unsigned)); - str_data = (char**)calloc(data_size, sizeof(char*)); - for (i = 0; i < data_size; ++i) { - int_data[i] = (unsigned)(data_size * ((double)x / UINT_MAX) / 4) * 271828183u; - sprintf(buf, "%x", int_data[i]); - str_data[i] = strdup(buf); - x = 1664525L * x + 1013904223L; - } - printf("done!\n"); -} - -void ht_destroy_data() -{ - int i; - for (i = 0; i < data_size; ++i) free(str_data[i]); - free(str_data); free(int_data); -} - -void ht_khash_int() -{ - int i, ret; - unsigned *data = int_data; - khash_t(int) *h; - unsigned k; - - h = kh_init(int); - for (i = 0; i < data_size; ++i) { - k = kh_put(int, h, data[i], &ret); - kh_val(h, k) = i&0xff; - if (!ret) kh_del(int, h, k); - } - printf("[ht_khash_int] size: %u\n", kh_size(h)); - kh_destroy(int, h); -} - -void ht_khash_str() -{ - int i, ret; - char **data = str_data; - khash_t(str) *h; - unsigned k; - - h = kh_init(str); - for (i = 0; i < data_size; ++i) { - k = kh_put(str, h, data[i], &ret); - if (!ret) kh_del(str, h, k); - } - printf("[ht_khash_int] size: %u\n", kh_size(h)); - kh_destroy(str, h); -} - -void ht_khash_unpack() -{ - int i, ret; - unsigned *data = int_data; - khash_t(iun) *h; - unsigned k; - - h = kh_init(iun); - for (i = 0; i < data_size; ++i) { - int_unpack_t x; - x.key = data[i]; x.val = i&0xff; - k = kh_put(iun, h, x, &ret); - if (!ret) kh_del(iun, h, k); - } - printf("[ht_khash_unpack] size: %u (sizeof=%ld)\n", kh_size(h), sizeof(int_unpack_t)); - kh_destroy(iun, h); -} - -void ht_khash_packed() -{ - int i, ret; - unsigned *data = int_data; - khash_t(ipk) *h; - unsigned k; - - h = kh_init(ipk); - for (i = 0; i < data_size; ++i) { - int_packed_t x; - x.key = data[i]; x.val = i&0xff; - k = kh_put(ipk, h, x, &ret); - if (!ret) kh_del(ipk, h, k); - } - printf("[ht_khash_packed] size: %u (sizeof=%ld)\n", kh_size(h), sizeof(int_packed_t)); - kh_destroy(ipk, h); -} - -void ht_timing(void (*f)(void)) -{ - clock_t t = clock(); - (*f)(); - printf("[ht_timing] %.3lf sec\n", (double)(clock() - t) / CLOCKS_PER_SEC); -} - -int main(int argc, char *argv[]) -{ - if (argc > 1) data_size = atoi(argv[1]); - ht_init_data(); - ht_timing(ht_khash_int); - ht_timing(ht_khash_str); - ht_timing(ht_khash_unpack); - ht_timing(ht_khash_packed); - ht_destroy_data(); - return 0; -} diff --git a/test/klist_test.c b/test/klist_test.c deleted file mode 100644 index 9ec45cd..0000000 --- a/test/klist_test.c +++ /dev/null @@ -1,24 +0,0 @@ -#include -#include "klist.h" - -#define __int_free(x) -KLIST_INIT(32, int, __int_free) - -int main() -{ - klist_t(32) *kl; - kliter_t(32) *p; - kl = kl_init(32); - *kl_pushp(32, kl) = 1; - *kl_pushp(32, kl) = 10; - *kl_pushp(32, kl) = 19; - *kl_pushp(32, kl) = 28; - kl_shift(32, kl, 0); - kl_delete_after(32, kl, kl_begin(kl), 0); - *kl_unshiftp(32, kl) = 37; - *kl_insertp_after(32, kl, kl_begin(kl)) = 46; - for (p = kl_begin(kl); p != kl_end(kl); p = kl_next(p)) - printf("%d\n", kl_val(p)); - kl_destroy(32, kl); - return 0; -} diff --git a/test/kmin_test.c b/test/kmin_test.c deleted file mode 100644 index 33ccd1c..0000000 --- a/test/kmin_test.c +++ /dev/null @@ -1,48 +0,0 @@ -#include -#include -#include "kmath.h" - -static int n_evals; - -double f_Chebyquad(int n, double *x, void *data) -{ - int i, j; - double y[20][20], f; - int np, iw; - double sum; - for (j = 0; j != n; ++j) { - y[0][j] = 1.; - y[1][j] = 2. * x[j] - 1.; - } - for (i = 1; i != n; ++i) - for (j = 0; j != n; ++j) - y[i+1][j] = 2. * y[1][j] * y[i][j] - y[i-1][j]; - f = 0.; - np = n + 1; - iw = 1; - for (i = 0; i != np; ++i) { - sum = 0.; - for (j = 0; j != n; ++j) sum += y[i][j]; - sum /= n; - if (iw > 0) sum += 1. / ((i - 1) * (i + 1)); - iw = -iw; - f += sum * sum; - } - ++n_evals; - return f; -} - -int main() -{ - double x[20], y; - int n, i; - printf("\nMinimizer: Hooke-Jeeves\n"); - for (n = 2; n <= 8; n += 2) { - for (i = 0; i != n; ++i) x[i] = (double)(i + 1) / n; - n_evals = 0; - y = kmin_hj(f_Chebyquad, n, x, 0, KMIN_RADIUS, KMIN_EPS, KMIN_MAXCALL); - printf("n=%d,min=%.8lg,n_evals=%d\n", n, y, n_evals); - } - printf("\n"); - return 0; -} diff --git a/test/kseq_bench.c b/test/kseq_bench.c deleted file mode 100644 index eeda13f..0000000 --- a/test/kseq_bench.c +++ /dev/null @@ -1,69 +0,0 @@ -#include -#include -#include -#include -#include -#include "kseq.h" - -#define BUF_SIZE 4096 -KSTREAM_INIT(gzFile, gzread, BUF_SIZE) - -int main(int argc, char *argv[]) -{ - gzFile fp; - clock_t t; - if (argc == 1) { - fprintf(stderr, "Usage: kseq_bench \n"); - return 1; - } - { - uint8_t *buf = malloc(BUF_SIZE); - fp = gzopen(argv[1], "r"); - t = clock(); - while (gzread(fp, buf, BUF_SIZE) > 0); - fprintf(stderr, "[gzread] %.2f sec\n", (float)(clock() - t) / CLOCKS_PER_SEC); - gzclose(fp); - free(buf); - } - { - kstream_t *ks; - fp = gzopen(argv[1], "r"); - ks = ks_init(fp); - t = clock(); - while (ks_getc(ks) >= 0); - fprintf(stderr, "[ks_getc] %.2f sec\n", (float)(clock() - t) / CLOCKS_PER_SEC); - ks_destroy(ks); - gzclose(fp); - } - { - kstream_t *ks; - kstring_t *s; - int dret; - s = calloc(1, sizeof(kstring_t)); - fp = gzopen(argv[1], "r"); - ks = ks_init(fp); - t = clock(); - while (ks_getuntil(ks, '\n', s, &dret) >= 0); - fprintf(stderr, "[ks_getuntil] %.2f sec\n", (float)(clock() - t) / CLOCKS_PER_SEC); - ks_destroy(ks); - gzclose(fp); - free(s->s); free(s); - } - if (argc == 2) { - fp = gzopen(argv[1], "r"); - t = clock(); - while (gzgetc(fp) >= 0); - fprintf(stderr, "[gzgetc] %.2f sec\n", (float)(clock() - t) / CLOCKS_PER_SEC); - gzclose(fp); - } - if (argc == 2) { - char *buf = malloc(BUF_SIZE); - fp = gzopen(argv[1], "r"); - t = clock(); - while (gzgets(fp, buf, BUF_SIZE) > 0); - fprintf(stderr, "[gzgets] %.2f sec\n", (float)(clock() - t) / CLOCKS_PER_SEC); - gzclose(fp); - free(buf); - } - return 0; -} diff --git a/test/kseq_bench2.c b/test/kseq_bench2.c deleted file mode 100644 index b415458..0000000 --- a/test/kseq_bench2.c +++ /dev/null @@ -1,43 +0,0 @@ -#include -#include -#include -#include -#include -#include "kseq.h" -KSTREAM_INIT(int, read, 4096) - -#define BUF_SIZE 65536 - -int main(int argc, char *argv[]) -{ - clock_t t; - if (argc == 1) { - fprintf(stderr, "Usage: %s \n", argv[0]); - return 1; - } - { - FILE *fp; - char *s; - t = clock(); - s = malloc(BUF_SIZE); - fp = fopen(argv[1], "r"); - while (fgets(s, BUF_SIZE, fp)); - fclose(fp); - fprintf(stderr, "[fgets] %.2f sec\n", (float)(clock() - t) / CLOCKS_PER_SEC); - } - { - int fd, dret; - kstream_t *ks; - kstring_t s; - t = clock(); - s.l = s.m = 0; s.s = 0; - fd = open(argv[1], O_RDONLY); - ks = ks_init(fd); - while (ks_getuntil(ks, '\n', &s, &dret) >= 0); - free(s.s); - ks_destroy(ks); - close(fd); - fprintf(stderr, "[kstream] %.2f sec\n", (float)(clock() - t) / CLOCKS_PER_SEC); - } - return 0; -} diff --git a/test/kseq_test.c b/test/kseq_test.c deleted file mode 100644 index 0304dea..0000000 --- a/test/kseq_test.c +++ /dev/null @@ -1,27 +0,0 @@ -#include -#include -#include "kseq.h" -KSEQ_INIT(gzFile, gzread) - -int main(int argc, char *argv[]) -{ - gzFile fp; - kseq_t *seq; - int l; - if (argc == 1) { - fprintf(stderr, "Usage: %s \n", argv[0]); - return 1; - } - fp = gzopen(argv[1], "r"); - seq = kseq_init(fp); - while ((l = kseq_read(seq)) >= 0) { - printf("name: %s\n", seq->name.s); - if (seq->comment.l) printf("comment: %s\n", seq->comment.s); - printf("seq: %s\n", seq->seq.s); - if (seq->qual.l) printf("qual: %s\n", seq->qual.s); - } - printf("return value: %d\n", l); - kseq_destroy(seq); - gzclose(fp); - return 0; -} diff --git a/test/kseq_test.dat b/test/kseq_test.dat deleted file mode 100644 index b774ae2..0000000 --- a/test/kseq_test.dat +++ /dev/null @@ -1,12 +0,0 @@ ->1 -acgtacgtacgtagc ->2 test -acgatcgatc -@3 test2 -cgctagcatagc -cgatatgactta -+ -78wo82usd980 -d88fau - -238ud8 diff --git a/test/ksort_test.c b/test/ksort_test.c deleted file mode 100644 index 92c7d3d..0000000 --- a/test/ksort_test.c +++ /dev/null @@ -1,104 +0,0 @@ -#include -#include -#include -#include -#include "ksort.h" - -KSORT_INIT_GENERIC(int) - -int main(int argc, char *argv[]) -{ - int i, N = 10000000; - int *array, x; - clock_t t1, t2; - if (argc > 1) N = atoi(argv[1]); - array = (int*)malloc(sizeof(int) * N); - - srand48(11); - for (i = 0; i < N; ++i) array[i] = (int)lrand48(); - t1 = clock(); - x = ks_ksmall(int, N, array, 10500); - t2 = clock(); - fprintf(stderr, "ksmall [%d]: %.3lf\n", x, (double)(t2-t1)/CLOCKS_PER_SEC); - - srand48(11); - for (i = 0; i < N; ++i) array[i] = (int)lrand48(); - t1 = clock(); - ks_introsort(int, N, array); - t2 = clock(); - fprintf(stderr, "introsort [%d]: %.3lf\n", array[10500], (double)(t2-t1)/CLOCKS_PER_SEC); - for (i = 0; i < N-1; ++i) { - if (array[i] > array[i+1]) { - fprintf(stderr, "Bug in introsort!\n"); - exit(1); - } - } - -#ifndef _ALIGNED_ONLY - { // test unaligned ksmall - srand48(11); - unsigned char *a; - int *b; - a = malloc(N * sizeof(int) + 1); - b = (int*)(a + 1); - for (i = 0; i < N; ++i) b[i] = (int)lrand48(); - t1 = clock(); - ks_introsort(int, N, b); - t2 = clock(); - fprintf(stderr, "introsort [%d]: %.3lf (unaligned: 0x%lx) \n", b[10500], (double)(t2-t1)/CLOCKS_PER_SEC, (size_t)b); - } -#endif - - t1 = clock(); - ks_introsort(int, N, array); - t2 = clock(); - fprintf(stderr, "introsort (sorted): %.3lf\n", (double)(t2-t1)/CLOCKS_PER_SEC); - - srand48(11); - for (i = 0; i < N; ++i) array[i] = (int)lrand48(); - t1 = clock(); - ks_combsort(int, N, array); - t2 = clock(); - fprintf(stderr, "combsort: %.3lf\n", (double)(t2-t1)/CLOCKS_PER_SEC); - for (i = 0; i < N-1; ++i) { - if (array[i] > array[i+1]) { - fprintf(stderr, "Bug in combsort!\n"); - exit(1); - } - } - - srand48(11); - for (i = 0; i < N; ++i) array[i] = (int)lrand48(); - t1 = clock(); - ks_mergesort(int, N, array, 0); - t2 = clock(); - fprintf(stderr, "mergesort: %.3lf\n", (double)(t2-t1)/CLOCKS_PER_SEC); - for (i = 0; i < N-1; ++i) { - if (array[i] > array[i+1]) { - fprintf(stderr, "Bug in mergesort!\n"); - exit(1); - } - } - - t1 = clock(); - ks_mergesort(int, N, array, 0); - t2 = clock(); - fprintf(stderr, "mergesort (sorted): %.3lf\n", (double)(t2-t1)/CLOCKS_PER_SEC); - - srand48(11); - for (i = 0; i < N; ++i) array[i] = (int)lrand48(); - t1 = clock(); - ks_heapmake(int, N, array); - ks_heapsort(int, N, array); - t2 = clock(); - fprintf(stderr, "heapsort: %.3lf\n", (double)(t2-t1)/CLOCKS_PER_SEC); - for (i = 0; i < N-1; ++i) { - if (array[i] > array[i+1]) { - fprintf(stderr, "Bug in heapsort!\n"); - exit(1); - } - } - - free(array); - return 0; -} diff --git a/test/ksort_test.cc b/test/ksort_test.cc deleted file mode 100644 index 8950d80..0000000 --- a/test/ksort_test.cc +++ /dev/null @@ -1,997 +0,0 @@ -#include -#include -#include -#include -#include - -#include "ksort.h" -KSORT_INIT_GENERIC(int) - -using namespace std; - -/********************************** - * BEGIN OF PAUL'S IMPLEMENTATION * - **********************************/ - -/* Attractive Chaos: I have added inline where necessary. */ - -/* -Copyright (c) 2004 Paul Hsieh -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. - - Neither the name of sorttest nor the names of its contributors may be - used to endorse or promote products derived from this software without - specific prior written permission. - -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. -*/ - -/* - -Recommended flags: ------------------- - -Intel C/C++: -icl /O2 /G6 /Qaxi /Qxi /Qip sorttest.c - -WATCOM C/C++: -wcl386 /otexan /6r sorttest.c - -GCC: -gcc -O3 -mcpu=athlon-xp -march=athlon-xp sorttest.c - -MSVC: -cl /O2 /Ot /Og /G6 sorttest.c - -*/ - -static inline void sort2 (int * numbers) { -int tmp; - - if (numbers[0] <= numbers[1]) return; - tmp = numbers[0]; - numbers[0] = numbers[1]; - numbers[1] = tmp; -} - -static inline void sort3 (int * numbers) { -int tmp; - - if (numbers[0] <= numbers[1]) { - if (numbers[1] <= numbers[2]) return; - if (numbers[2] <= numbers[0]) { - tmp = numbers[0]; - numbers[0] = numbers[2]; - numbers[2] = numbers[1]; - numbers[1] = tmp; - return; - } - tmp = numbers[1]; - } else { - tmp = numbers[0]; - if (numbers[0] <= numbers[2]) { - numbers[0] = numbers[1]; - numbers[1] = tmp; - return; - } - if (numbers[2] <= numbers[1]) { - numbers[0] = numbers[2]; - numbers[2] = tmp; - return; - } - numbers[0] = numbers[1]; - } - numbers[1] = numbers[2]; - numbers[2] = tmp; -} - -static inline void sort4 (int * num) { -int tmp; - if (num[0] < num[1]) { - if (num[1] < num[2]) { - if (num[1] < num[3]) { - if (num[2] >= num[3]) { - tmp = num[2]; - num[2] = num[3]; - num[3] = tmp; - } - } else { - tmp = num[1]; - if (num[0] < num[3]) { - num[1] = num[3]; - } else { - num[1] = num[0]; - num[0] = num[3]; - } - num[3] = num[2]; - num[2] = tmp; - } - } else { - if (num[0] < num[2]) { - if (num[2] < num[3]) { - if (num[1] < num[3]) { - tmp = num[1]; - } else { - tmp = num[3]; - num[3] = num[1]; - } - num[1] = num[2]; - num[2] = tmp; - } else { - if (num[0] < num[3]) { - tmp = num[3]; - } else { - tmp = num[0]; - num[0] = num[3]; - } - num[3] = num[1]; - num[1] = tmp; - } - } else { - if (num[0] < num[3]) { - tmp = num[0]; - num[0] = num[2]; - if (num[1] < num[3]) { - num[2] = num[1]; - } else { - num[2] = num[3]; - num[3] = num[1]; - } - num[1] = tmp; - } else { - if (num[2] < num[3]) { - tmp = num[0]; - num[0] = num[2]; - num[2] = tmp; - tmp = num[1]; - num[1] = num[3]; - } else { - tmp = num[1]; - num[1] = num[2]; - num[2] = num[0]; - num[0] = num[3]; - } - num[3] = tmp; - } - } - } - } else { - tmp = num[0]; - if (tmp < num[2]) { - if (tmp < num[3]) { - num[0] = num[1]; - num[1] = tmp; - if (num[2] >= num[3]) { - tmp = num[2]; - num[2] = num[3]; - num[3] = tmp; - } - } else { - if (num[1] < num[3]) { - num[0] = num[1]; - num[1] = num[3]; - } else { - num[0] = num[3]; - } - num[3] = num[2]; - num[2] = tmp; - } - } else { - if (num[1] < num[2]) { - if (num[2] < num[3]) { - num[0] = num[1]; - num[1] = num[2]; - if (tmp < num[3]) { - num[2] = tmp; - } else { - num[2] = num[3]; - num[3] = tmp; - } - } else { - if (num[1] < num[3]) { - num[0] = num[1]; - num[1] = num[3]; - } else { - num[0] = num[3]; - } - num[3] = tmp; - } - } else { - if (num[1] < num[3]) { - num[0] = num[2]; - if (tmp < num[3]) { - num[2] = tmp; - } else { - num[2] = num[3]; - num[3] = tmp; - } - } else { - if (num[2] < num[3]) { - num[0] = num[2]; - num[2] = num[1]; - num[1] = num[3]; - num[3] = tmp; - } else { - num[0] = num[3]; - num[3] = tmp; - tmp = num[1]; - num[1] = num[2]; - num[2] = tmp; - } - } - } - } - } -} - -static inline void sortAlt2 (int * numbers, int * altNumbers) { - if (numbers[0] <= numbers[1]) { - altNumbers[0] = numbers[0]; - altNumbers[1] = numbers[1]; - } else { - altNumbers[0] = numbers[1]; - altNumbers[1] = numbers[0]; - } -} - -static inline void sortAlt3 (int * numbers, int * altNumbers) { - if (numbers[0] <= numbers[1]) { - if (numbers[1] <= numbers[2]) { - altNumbers[0] = numbers[0]; - altNumbers[1] = numbers[1]; - altNumbers[2] = numbers[2]; - } else if (numbers[2] <= numbers[0]) { - altNumbers[0] = numbers[2]; - altNumbers[1] = numbers[0]; - altNumbers[2] = numbers[1]; - } else { - altNumbers[0] = numbers[0]; - altNumbers[1] = numbers[2]; - altNumbers[2] = numbers[1]; - } - } else { - if (numbers[0] <= numbers[2]) { - altNumbers[0] = numbers[1]; - altNumbers[1] = numbers[0]; - altNumbers[2] = numbers[2]; - } else if (numbers[2] <= numbers[1]) { - altNumbers[0] = numbers[2]; - altNumbers[1] = numbers[1]; - altNumbers[2] = numbers[0]; - } else { - altNumbers[0] = numbers[1]; - altNumbers[1] = numbers[2]; - altNumbers[2] = numbers[0]; - } - } -} - -/* - * Insert Sort - */ - -inline void insertSort (int numbers[], int qty) { -int i, j, idx, q4; -int tmp; - - if (qty <= 4) { - if (qty == 4) sort4 (numbers); - else if (qty == 3) sort3 (numbers); - else if (qty == 2) sort2 (numbers); - return; - } - - q4 = qty - 4; - - for (i=0; i < q4; i++) { - idx = i; - for (j=i+1; j < qty; j++) { - if (numbers[j] < numbers[idx]) idx = j; - } - if (idx != i) { - tmp = numbers[idx]; - numbers[idx] = numbers[i]; - numbers[i] = tmp; - } - } - - sort4 (numbers + q4); -} - -/* - * Heap Sort - */ - -/* Assure the heap property for entries from top to last */ -static void siftDown (int numbers[], int top, int last) { -int tmp = numbers[top]; -int maxIdx = top; - - while (last >= (maxIdx += maxIdx)) { - - /* This is where the comparison occurrs and where a sufficiently - good compiler can use a computed conditional result rather - than using control logic. */ - if (maxIdx != last && numbers[maxIdx] < numbers[maxIdx + 1]) maxIdx++; - - if (tmp >= numbers[maxIdx]) break; - numbers[top] = numbers[maxIdx]; - top = maxIdx; - } - numbers[top] = tmp; -} - -/* Peel off the top siftDown operation since its parameters are trivial to - fill in directly (and this saves us some moves.) */ -static void siftDown0 (int numbers[], int last) { -int tmp; - - if (numbers[0] < numbers[1]) { - tmp = numbers[1]; - numbers[1] = numbers[0]; - siftDown (numbers, 1, last); - } else { - tmp = numbers[0]; - } - numbers[0] = numbers[last]; - numbers[last] = tmp; -} - -void heapSort (int numbers[], int qty) { -int i; - - if (qty <= 4) { - if (qty == 4) sort4 (numbers); - else if (qty == 3) sort3 (numbers); - else if (qty == 2) sort2 (numbers); - return; - } - - i = qty / 2; - /* Enforce the heap property for each position in the tree */ - for ( qty--; i > 0; i--) siftDown (numbers, i, qty); - for (i = qty; i > 0; i--) siftDown0 (numbers, i); -} - -/* - * Quick Sort - */ - -static int medianOf3 (int * numbers, int i, int j) { -int tmp; - - if (numbers[0] <= numbers[i]) { - if (numbers[j] <= numbers[0]) return numbers[0]; /* j 0 i */ - if (numbers[i] <= numbers[j]) j = i; /* 0 i j */ - /* 0 j i */ - } else { - if (numbers[0] <= numbers[j]) return numbers[0]; /* i 0 j */ - if (numbers[j] <= numbers[i]) j = i; /* j i 0 */ - /* i j 0 */ - } - tmp = numbers[j]; - numbers[j] = numbers[0]; - numbers[0] = tmp; - return tmp; -} - -static void quickSortRecurse (int * numbers, int left, int right) { -int pivot, lTmp, rTmp; - - qsrStart:; - -#if defined(__GNUC__) - if (right <= left + 8) { - insertSort (numbers + left, right - left + 1); - return; - } -#else - if (right <= left + 3) { - if (right == left + 1) { - sort2 (numbers + left); - } else if (right == left + 2) { - sort3 (numbers + left); - } else if (right == left + 3) { - sort4 (numbers + left); - } - return; - } -#endif - - lTmp = left; - rTmp = right; - - pivot = medianOf3 (numbers + left, (right-left) >> 1, right-1-left); - - goto QStart; - while (1) { - do { - right--; - if (left >= right) goto QEnd; - QStart:; - } while (numbers[right] > pivot); - numbers[left] = numbers[right]; - do { - left++; - if (left >= right) { - left = right; - goto QEnd; - } - } while (numbers[ left] < pivot); - numbers[right] = numbers[left]; - } - QEnd:; - numbers[left] = pivot; - - /* Only recurse the smaller partition */ - - if (left-1 - lTmp <= rTmp - left - 1) { - if (lTmp < left) quickSortRecurse (numbers, lTmp, left-1); - - /* Set up for larger partition */ - left++; - right = rTmp; - } else { - if (rTmp > left) quickSortRecurse (numbers, left+1, rTmp); - - /* Set up for larger partition */ - right = left - 1; - left = lTmp; - } - - /* Rerun with larger partition (recursion not required.) */ - goto qsrStart; -} - -void quickSort (int numbers[], int qty) { - if (qty < 2) return; - quickSortRecurse (numbers, 0, qty - 1); -} - -/* - * Merge Sort - */ - -static void mergesortInPlace (int * numbers, int * altNumbers, int qty); - -/* Perform mergesort, but store results in altNumbers */ - -static void mergesortExchange (int * numbers, int * altNumbers, int qty) { -int half, i0, i1, i; - - if (qty == 2) { - sortAlt2 (numbers, altNumbers); - return; - } - if (qty == 3) { - sortAlt3 (numbers, altNumbers); - return; - } - - half = (qty + 1)/2; - - mergesortInPlace (numbers, altNumbers, half); - mergesortInPlace (numbers + half, altNumbers, qty - half); - - i0 = 0; i1 = half; - - for (i=0; i < qty; i++) { - if (i1 >= qty || (i0 < half && numbers[i0] < numbers[i1])) { - altNumbers[i] = numbers[i0]; - i0++; - } else { - altNumbers[i] = numbers[i1]; - i1++; - } - } -} - -/* Perform mergesort and store results in numbers */ - -static void mergesortInPlace (int * numbers, int * altNumbers, int qty) { -int half, i0, i1, i; - -#if 0 - if (qty == 2) { - sort2 (numbers); - return; - } - if (qty == 3) { - sort3 (numbers); - return; - } - if (qty == 4) { - sort4 (numbers); - return; - } -#else - if (qty <= 12) { - insertSort (numbers, qty); - return; - } -#endif - - half = (qty + 1)/2; - - mergesortExchange (numbers, altNumbers, half); - mergesortExchange (numbers + half, altNumbers + half, qty - half); - - i0 = 0; i1 = half; - - for (i=0; i < qty; i++) { - if (i1 >= qty || (i0 < half && altNumbers[i0] < altNumbers[i1])) { - numbers[i] = altNumbers[i0]; - i0++; - } else { - numbers[i] = altNumbers[i1]; - i1++; - } - } -} - -#include - -void mergeSort (int numbers[], int qty) { -int * tmpArray; - - if (qty <= 12) { - insertSort (numbers, qty); - return; - } - - tmpArray = (int *) malloc (qty * sizeof (int)); - mergesortInPlace (numbers, tmpArray, qty); - free (tmpArray); -} - -/******************************** - * END OF PAUL'S IMPLEMENTATION * - ********************************/ - -/************************************************* - *** Implementation 1: faster on sorted arrays *** - *************************************************/ - -#define rstype_t unsigned -#define rskey(x) (x) - -#define RS_MIN_SIZE 64 - -typedef struct { - rstype_t *b, *e; -} rsbucket_t; - -void rs_sort(rstype_t *beg, rstype_t *end, int n_bits, int s) -{ - rstype_t *i; - int size = 1<b = k->e = beg; - for (i = beg; i != end; ++i) ++b[rskey(*i)>>s&m].e; - for (k = b + 1; k != be; ++k) - k->e += (k-1)->e - beg, k->b = (k-1)->e; - for (k = b; k != be;) { - if (k->b != k->e) { - rsbucket_t *l; - if ((l = b + (rskey(*k->b)>>s&m)) != k) { - rstype_t tmp = *k->b, swap; - do { - swap = tmp; tmp = *l->b; *l->b++ = swap; - l = b + (rskey(tmp)>>s&m); - } while (l != k); - *k->b++ = tmp; - } else ++k->b; - } else ++k; - } - for (b->b = beg, k = b + 1; k != be; ++k) k->b = (k-1)->e; - if (s) { - s = s > n_bits? s - n_bits : 0; - for (k = b; k != be; ++k) - if (k->e - k->b > RS_MIN_SIZE) rs_sort(k->b, k->e, n_bits, s); - else if (k->e - k->b > 1) - for (i = k->b + 1; i < k->e; ++i) - if (rskey(*i) < rskey(*(i - 1))) { - rstype_t *j, tmp = *i; - for (j = i; j > k->b && rskey(tmp) < rskey(*(j-1)); --j) - *j = *(j - 1); - *j = tmp; - } - } -} - -/************************************************* - *** Implementation 2: faster on random arrays *** - *************************************************/ - -static inline void rs_insertsort(rstype_t *s, rstype_t *t) -{ - rstype_t *i; - for (i = s + 1; i < t; ++i) { - if (rskey(*i) < rskey(*(i - 1))) { - rstype_t *j, tmp = *i; - for (j = i; j > s && rskey(tmp) < rskey(*(j-1)); --j) - *j = *(j - 1); - *j = tmp; - } - } -} -/* -void rs_sort2(rstype_t *beg, rstype_t *end, int n_bits, int s) -{ - int j, size = 1<>s&m]; - b[0] = e[0] = beg; - for (j = 1; j != size; ++j) b[j] = e[j] = b[j - 1] + c[j - 1]; - for (i = beg, j = 0; i != end;) { - rstype_t tmp = *i, swap; - int x; - for (;;) { - x = rskey(tmp)>>s&m; - if (e[x] == i) break; - swap = tmp; tmp = *e[x]; *e[x]++ = swap; - } - *i++ = tmp; - ++e[x]; - while (j != size && i >= b[j]) ++j; - while (j != size && e[j-1] == b[j]) ++j; - if (i < e[j-1]) i = e[j-1]; - } - if (s) { - s = s > n_bits? s - n_bits : 0; - for (j = 0; j < size; ++j) { - if (c[j] >= RS_MIN_SIZE) rs_sort2(b[j], e[j], n_bits, s); - else if (c[j] >= 2) rs_insertsort(b[j], e[j]); - } - } -} -*/ -void radix_sort(unsigned *array, int offset, int end, int shift) { - int x, y, value, temp; - int last[256] = { 0 }, pointer[256]; - - for (x=offset; x> shift) & 0xFF]; - } - - last[0] += offset; - pointer[0] = offset; - for (x=1; x<256; ++x) { - pointer[x] = last[x-1]; - last[x] += last[x-1]; - } - - for (x=0; x<256; ++x) { - while (pointer[x] != last[x]) { - value = array[pointer[x]]; - y = (value >> shift) & 0xFF; - while (x != y) { - temp = array[pointer[y]]; - array[pointer[y]++] = value; - value = temp; - y = (value >> shift) & 0xFF; - } - array[pointer[x]++] = value; - } - } - - if (shift > 0) { - shift -= 8; - for (x=0; x<256; ++x) { - temp = x > 0 ? pointer[x] - pointer[x-1] : pointer[0] - offset; - if (temp > 64) { - radix_sort(array, pointer[x] - temp, pointer[x], shift); - } else if (temp > 1) rs_insertsort(array + pointer[x] - temp, array + pointer[x]); - } - } -} -/************************* - *** END OF RADIX SORT *** - *************************/ - -template< class _Type, unsigned long PowerOfTwoRadix, unsigned long Log2ofPowerOfTwoRadix, long Threshold > -inline void _RadixSort_Unsigned_PowerOf2Radix_1( _Type* a, long last, _Type bitMask, unsigned long shiftRightAmount ) -{ - const unsigned long numberOfBins = PowerOfTwoRadix; - unsigned long count[ numberOfBins ]; - for( unsigned long i = 0; i < numberOfBins; i++ ) - count[ i ] = 0; - for ( long _current = 0; _current <= last; _current++ ) // Scan the array and count the number of times each value appears - { - unsigned long digit = (unsigned long)(( a[ _current ] & bitMask ) >> shiftRightAmount ); // extract the digit we are sorting based on - count[ digit ]++; - } - long startOfBin[ numberOfBins ], endOfBin[ numberOfBins ], nextBin; - startOfBin[ 0 ] = endOfBin[ 0 ] = nextBin = 0; - for( unsigned long i = 1; i < numberOfBins; i++ ) - startOfBin[ i ] = endOfBin[ i ] = startOfBin[ i - 1 ] + count[ i - 1 ]; - for ( long _current = 0; _current <= last; ) - { - unsigned long digit; - _Type tmp = a[ _current ]; // get the compiler to recognize that a register can be used for the loop instead of a[_current] memory location - while ( true ) { - digit = (unsigned long)(( tmp & bitMask ) >> shiftRightAmount ); // extract the digit we are sorting based on - if ( endOfBin[ digit ] == _current ) - break; - _Type tmp2; - //_swap( tmp, a[ endOfBin[ digit ] ] ); - tmp2 = a[endOfBin[digit]]; a[endOfBin[digit]] = tmp; tmp = tmp2; - endOfBin[ digit ]++; - } - a[ _current ] = tmp; - endOfBin[ digit ]++; // leave the element at its location and grow the bin - _current++; // advance the current pointer to the next element - while( _current >= startOfBin[ nextBin ] && nextBin < numberOfBins ) - nextBin++; - while( endOfBin[ nextBin - 1 ] == startOfBin[ nextBin ] && nextBin < numberOfBins ) - nextBin++; - if ( _current < endOfBin[ nextBin - 1 ] ) - _current = endOfBin[ nextBin - 1 ]; - } - bitMask >>= Log2ofPowerOfTwoRadix; - if ( bitMask != 0 ) // end recursion when all the bits have been processes - { - if ( shiftRightAmount >= Log2ofPowerOfTwoRadix ) shiftRightAmount -= Log2ofPowerOfTwoRadix; - else shiftRightAmount = 0; - for( unsigned long i = 0; i < numberOfBins; i++ ) - { - long numberOfElements = endOfBin[ i ] - startOfBin[ i ]; - if ( numberOfElements >= Threshold ) // endOfBin actually points to one beyond the bin - _RadixSort_Unsigned_PowerOf2Radix_1< _Type, PowerOfTwoRadix, Log2ofPowerOfTwoRadix, Threshold >( &a[ startOfBin[ i ]], numberOfElements - 1, bitMask, shiftRightAmount ); - else if ( numberOfElements >= 2 ) - rs_insertsort(&a[ startOfBin[ i ]], &a[ endOfBin[ i ]]); - } - } -} -inline void RadixSortInPlace_HybridUnsigned_Radix256( unsigned* a, unsigned long a_size ) -{ - if ( a_size < 2 ) return; - unsigned long bitMask = 0xFF000000; // bitMask controls how many bits we process at a time - unsigned long shiftRightAmount = 24; - if ( a_size >= 32 ) - _RadixSort_Unsigned_PowerOf2Radix_1(a, a_size - 1, bitMask, shiftRightAmount ); - else - rs_insertsort(a, a + a_size); -} - -struct intcmp_t { - inline int operator() (int a, int b) const { - return a < b? -1 : a > b? 1 : 0; - } -}; - -int compare_int(int a, int b) -{ - return a < b? -1 : a > b? 1 : 0; -} -int compare(const void *a, const void *b) -{ - return *((int*)a) - *((int*)b); -} - -int main(int argc, char *argv[]) -{ - int i, N = 50000000; - int *array, *temp; - clock_t t1, t2; - if (argc == 1) fprintf(stderr, "Usage: %s [%d]\n", argv[0], N); - if (argc > 1) N = atoi(argv[1]); - temp = (int*)malloc(sizeof(int) * N); - array = (int*)malloc(sizeof(int) * N); - - srand48(11); - for (i = 0; i < N; ++i) array[i] = (int)lrand48(); - t1 = clock(); - rs_sort((unsigned*)array, (unsigned*)array + N, 8, 24); - t2 = clock(); - fprintf(stderr, "radix sort: %.3lf\n", (double)(t2-t1)/CLOCKS_PER_SEC); - for (i = 0; i < N-1; ++i) { - if (array[i] > array[i+1]) { - fprintf(stderr, "Bug in radix sort!\n"); - exit(1); - } - } - t1 = clock(); - rs_sort((unsigned*)array, (unsigned*)array + N, 8, 24); - t2 = clock(); - fprintf(stderr, "radix sort (sorted): %.3lf\n", (double)(t2-t1)/CLOCKS_PER_SEC); - - srand48(11); - for (i = 0; i < N; ++i) array[i] = (int)lrand48(); - t1 = clock(); - RadixSortInPlace_HybridUnsigned_Radix256((unsigned*)array, N); -// radix_sort((unsigned*)array, 0, N, 24); - t2 = clock(); - fprintf(stderr, "vd's radix sort: %.3lf\n", (double)(t2-t1)/CLOCKS_PER_SEC); - for (i = 0; i < N-1; ++i) { - if (array[i] > array[i+1]) { - fprintf(stderr, "Bug in radix sort!\n"); - exit(1); - } - } - t1 = clock(); - RadixSortInPlace_HybridUnsigned_Radix256((unsigned*)array, N); -// radix_sort((unsigned*)array, 0, N, 24); - t2 = clock(); - fprintf(stderr, "vd's radix sort (sorted): %.3lf\n", (double)(t2-t1)/CLOCKS_PER_SEC); - - srand48(11); - for (i = 0; i < N; ++i) array[i] = (int)lrand48(); - t1 = clock(); - sort(array, array+N); - t2 = clock(); - fprintf(stderr, "STL introsort: %.3lf\n", (double)(t2-t1)/CLOCKS_PER_SEC); - t1 = clock(); - sort(array, array+N); - t2 = clock(); - fprintf(stderr, "STL introsort (sorted): %.3lf\n", (double)(t2-t1)/CLOCKS_PER_SEC); - - srand48(11); - for (i = 0; i < N; ++i) array[i] = (int)lrand48(); - t1 = clock(); - stable_sort(array, array+N); - t2 = clock(); - fprintf(stderr, "STL stablesort: %.3lf\n", (double)(t2-t1)/CLOCKS_PER_SEC); - t1 = clock(); - stable_sort(array, array+N); - t2 = clock(); - fprintf(stderr, "STL stablesort (sorted): %.3lf\n", (double)(t2-t1)/CLOCKS_PER_SEC); - - srand48(11); - for (i = 0; i < N; ++i) array[i] = (int)lrand48(); - t1 = clock(); - make_heap(array, array+N); - sort_heap(array, array+N); - t2 = clock(); - fprintf(stderr, "STL heapsort: %.3lf\n", (double)(t2-t1)/CLOCKS_PER_SEC); - for (i = 0; i < N-1; ++i) { - if (array[i] > array[i+1]) { - fprintf(stderr, "Bug in heap_sort!\n"); - exit(1); - } - } - t1 = clock(); - make_heap(array, array+N); - sort_heap(array, array+N); - t2 = clock(); - fprintf(stderr, "STL heapsort (sorted): %.3lf\n", (double)(t2-t1)/CLOCKS_PER_SEC); - - srand48(11); - for (i = 0; i < N; ++i) array[i] = (int)lrand48(); - t1 = clock(); - ks_combsort(int, N, array); - t2 = clock(); - fprintf(stderr, "combsort: %.3lf\n", (double)(t2-t1)/CLOCKS_PER_SEC); - for (i = 0; i < N-1; ++i) { - if (array[i] > array[i+1]) { - fprintf(stderr, "Bug in combsort!\n"); - exit(1); - } - } - - srand48(11); - for (i = 0; i < N; ++i) array[i] = (int)lrand48(); - t1 = clock(); - qsort(array, N, sizeof(int), compare); - t2 = clock(); - fprintf(stderr, "libc qsort: %.3lf\n", (double)(t2-t1)/CLOCKS_PER_SEC); - - srand48(11); - for (i = 0; i < N; ++i) array[i] = (int)lrand48(); - t1 = clock(); - ks_introsort(int, N, array); - t2 = clock(); - fprintf(stderr, "my introsort: %.3lf\n", (double)(t2-t1)/CLOCKS_PER_SEC); - for (i = 0; i < N-1; ++i) { - if (array[i] > array[i+1]) { - fprintf(stderr, "Bug in intro_sort!\n"); - exit(1); - } - } - t1 = clock(); - ks_introsort(int, N, array); - t2 = clock(); - fprintf(stderr, "introsort (sorted): %.3lf\n", (double)(t2-t1)/CLOCKS_PER_SEC); - - srand48(11); - for (i = 0; i < N; ++i) array[i] = (int)lrand48(); - t1 = clock(); - ks_mergesort(int, N, array, 0); - t2 = clock(); - fprintf(stderr, "iterative mergesort: %.3lf\n", (double)(t2-t1)/CLOCKS_PER_SEC); - for (i = 0; i < N-1; ++i) { - if (array[i] > array[i+1]) { - fprintf(stderr, "Bug in merge_sort!\n"); - exit(1); - } - } - t1 = clock(); - ks_mergesort(int, N, array, 0); - t2 = clock(); - fprintf(stderr, "iterative mergesort (sorted): %.3lf\n", (double)(t2-t1)/CLOCKS_PER_SEC); - - srand48(11); - for (i = 0; i < N; ++i) array[i] = (int)lrand48(); - t1 = clock(); - ks_heapmake(int, N, array); - ks_heapsort(int, N, array); - t2 = clock(); - fprintf(stderr, "my heapsort: %.3lf\n", (double)(t2-t1)/CLOCKS_PER_SEC); - for (i = 0; i < N-1; ++i) { - if (array[i] > array[i+1]) { - fprintf(stderr, "Bug in heap_sort!\n"); - exit(1); - } - } - t1 = clock(); - ks_heapmake(int, N, array); - ks_heapsort(int, N, array); - t2 = clock(); - fprintf(stderr, "heapsort (sorted): %.3lf\n", (double)(t2-t1)/CLOCKS_PER_SEC); - - srand48(11); - for (i = 0; i < N; ++i) array[i] = (int)lrand48(); - t1 = clock(); - heapSort(array, N); - t2 = clock(); - fprintf(stderr, "Paul's heapsort: %.3lf\n", (double)(t2-t1)/CLOCKS_PER_SEC); - for (i = 0; i < N-1; ++i) { - if (array[i] > array[i+1]) { - fprintf(stderr, "Bug in intro_sort!\n"); - exit(1); - } - } - - srand48(11); - for (i = 0; i < N; ++i) array[i] = (int)lrand48(); - t1 = clock(); - quickSort(array, N); - t2 = clock(); - fprintf(stderr, "Paul's quicksort: %.3lf\n", (double)(t2-t1)/CLOCKS_PER_SEC); - for (i = 0; i < N-1; ++i) { - if (array[i] > array[i+1]) { - fprintf(stderr, "Bug in intro_sort!\n"); - exit(1); - } - } - - srand48(11); - for (i = 0; i < N; ++i) array[i] = (int)lrand48(); - t1 = clock(); - mergeSort(array, N); - t2 = clock(); - fprintf(stderr, "Paul's mergesort: %.3lf\n", (double)(t2-t1)/CLOCKS_PER_SEC); - for (i = 0; i < N-1; ++i) { - if (array[i] > array[i+1]) { - fprintf(stderr, "Bug in intro_sort!\n"); - exit(1); - } - } - - free(array); free(temp); - return 0; -} diff --git a/test/kstring_bench.c b/test/kstring_bench.c deleted file mode 100644 index 82598e8..0000000 --- a/test/kstring_bench.c +++ /dev/null @@ -1,51 +0,0 @@ -#include -#include -#include -#include "kstring.h" - -#define N 10000000 - -int main() -{ - int i; - clock_t t; - kstring_t s, s2; - srand48(11); - s.l = s.m = 0; s.s = 0; - t = clock(); - for (i = 0; i < N; ++i) { - int x = lrand48(); - s.l = 0; - kputw(x, &s); - } - fprintf(stderr, "kputw: %lf\n", (double)(clock() - t) / CLOCKS_PER_SEC); - srand48(11); - t = clock(); - for (i = 0; i < N; ++i) { - int x = lrand48(); - s.l = 0; - ksprintf(&s, "%d", x); - } - fprintf(stderr, "ksprintf: %lf\n", (double)(clock() - t) / CLOCKS_PER_SEC); - - srand48(11); - s2.l = s2.m = 0; s2.s = 0; - t = clock(); - for (i = 0; i < N; ++i) { - int x = lrand48(); - s2.l = s.l = 0; - kputw(x, &s2); - kputs(s2.s, &s); - } - fprintf(stderr, "kputw+kputs: %lf\n", (double)(clock() - t) / CLOCKS_PER_SEC); - srand48(11); - t = clock(); - for (i = 0; i < N; ++i) { - int x = lrand48(); - s2.l = s.l = 0; - kputw(x, &s2); - ksprintf(&s, "%s", s2.s); - } - fprintf(stderr, "kputw+ksprintf: %lf\n", (double)(clock() - t) / CLOCKS_PER_SEC); - return 0; -} diff --git a/test/kstring_bench2.c b/test/kstring_bench2.c deleted file mode 100644 index b7707a8..0000000 --- a/test/kstring_bench2.c +++ /dev/null @@ -1,131 +0,0 @@ -#include -#include -#include -#include -#include "kstring.h" - -#ifdef __APPLE__ -#define HAVE_STRNSTR -#endif - -#ifdef __linux__ -#define HAVE_MEMMEM -#endif - -static int str_len = 1024*1024*128; -static int pat_len = 30; -static int alphabet = 2; -static int repeat = 50; - -char *gen_data(int len, int a) -{ - char *data; - int i; - long x; - srand48(11); - data = malloc(len); - for (i = 0; i < len; ++i) - data[i] = (int)(a * drand48()) + '!'; - data[str_len - 1] = 0; - return data; -} -// http://srcvault.scali.eu.org/cgi-bin/Syntax/c/BoyerMoore.c -char *BoyerMoore( unsigned char *data, unsigned int dataLength, unsigned char *string, unsigned int strLength ) -{ - unsigned int skipTable[256], i; - unsigned char *search; - register unsigned char lastChar; - - if (strLength == 0) - return NULL; - - for (i = 0; i < 256; i++) - skipTable[i] = strLength; - search = string; - i = --strLength; - do { - skipTable[*search++] = i; - } while (i--); - lastChar = *--search; - search = data + strLength; - dataLength -= strLength+(strLength-1); - while ((int)dataLength > 0 ) { - unsigned int skip; - skip = skipTable[*search]; - search += skip; - dataLength -= skip; - skip = skipTable[*search]; - search += skip; - dataLength -= skip; - skip = skipTable[*search]; - if (*search != lastChar) { - search += skip; - dataLength -= skip; - continue; - } - i = strLength; - do { - if (i-- == 0) return search; - } while (*--search == string[i]); - search += (strLength - i + 1); - dataLength--; - } - return NULL; -} - -int main() -{ - char *data; - int i; - clock_t t; - t = clock(); - data = gen_data(str_len, alphabet); - fprintf(stderr, "Generate data in %.3f sec\n", (float)(clock() - t) / CLOCKS_PER_SEC); - { - t = clock(); srand48(1331); - for (i = 0; i < repeat; ++i) { - int y = lrand48() % (str_len - pat_len); - char *ret; - ret = kmemmem(data, str_len, data + y, pat_len, 0); -// printf("%d, %d\n", (int)(ret - data), y); - } - fprintf(stderr, "Search patterns in %.3f sec\n", (float)(clock() - t) / CLOCKS_PER_SEC); - } - if (1) { - t = clock(); srand48(1331); - for (i = 0; i < repeat; ++i) { - int y = lrand48() % (str_len - pat_len); - char *ret; - ret = BoyerMoore(data, str_len, data + y, pat_len); -// printf("%d, %d\n", (int)(ret - data), y); - } - fprintf(stderr, "Search patterns in %.3f sec\n", (float)(clock() - t) / CLOCKS_PER_SEC); - } -#ifdef HAVE_STRNSTR - if (1) { - char *tmp; - t = clock(); srand48(1331); - tmp = calloc(pat_len+1, 1); - for (i = 0; i < repeat; ++i) { - int y = lrand48() % (str_len - pat_len); - char *ret; - memcpy(tmp, data + y, pat_len); - ret = strnstr(data, tmp, str_len); - } - fprintf(stderr, "Search patterns in %.3f sec\n", (float)(clock() - t) / CLOCKS_PER_SEC); - } -#endif -#ifdef HAVE_MEMMEM - if (1) { - t = clock(); srand48(1331); - for (i = 0; i < repeat; ++i) { - int y = lrand48() % (str_len - pat_len); - char *ret; - ret = memmem(data, str_len, data + y, pat_len); -// printf("%d, %d\n", (int)(ret - data), y); - } - fprintf(stderr, "Search patterns in %.3f sec\n", (float)(clock() - t) / CLOCKS_PER_SEC); - } -#endif - return 0; -} diff --git a/test/kstring_test.c b/test/kstring_test.c deleted file mode 100644 index 9f9b6e6..0000000 --- a/test/kstring_test.c +++ /dev/null @@ -1,132 +0,0 @@ -#include -#include -#include -#include -#include - -#include "kstring.h" - -int nfail = 0; - -void check(const char *what, const kstring_t *ks, const char *correct) -{ - if (ks->l != strlen(correct) || strcmp(ks->s, correct) != 0) { - fprintf(stderr, "%s produced \"%.*s\" (\"%s\" is correct)\tFAIL\n", what, (int)(ks->l), ks->s, correct); - nfail++; - } -} - -void test_kputw(kstring_t *ks, int n) -{ - char buf[16]; - - ks->l = 0; - kputw(n, ks); - - sprintf(buf, "%d", n); - check("kputw()", ks, buf); -} - -void test_kputl(kstring_t *ks, long n) -{ - char buf[24]; - - ks->l = 0; - kputl(n, ks); - - sprintf(buf, "%ld", n); - check("kputl()", ks, buf); -} - -static char *mem_gets(char *buf, int buflen, void *vtextp) -{ - const char **textp = (const char **) vtextp; - - const char *nl = strchr(*textp, '\n'); - size_t n = nl? nl - *textp + 1 : strlen(*textp); - - if (n == 0) return NULL; - - if (n > buflen-1) n = buflen-1; - memcpy(buf, *textp, n); - buf[n] = '\0'; - *textp += n; - return buf; -} - -void test_kgetline(kstring_t *ks, const char *text, ...) -{ - const char *exp; - va_list arg; - - va_start(arg, text); - while ((exp = va_arg(arg, const char *)) != NULL) { - ks->l = 0; - if (kgetline(ks, mem_gets, &text) != 0) kputs("EOF", ks); - check("kgetline()", ks, exp); - } - va_end(arg); - - ks->l = 0; - if (kgetline(ks, mem_gets, &text) == 0) check("kgetline()", ks, "EOF"); -} - -int main(int argc, char **argv) -{ - kstring_t ks; - - ks.l = ks.m = 0; - ks.s = NULL; - - test_kputw(&ks, 0); - test_kputw(&ks, 1); - test_kputw(&ks, 37); - test_kputw(&ks, 12345); - test_kputw(&ks, -12345); - test_kputw(&ks, INT_MAX); - test_kputw(&ks, -INT_MAX); - test_kputw(&ks, INT_MIN); - - test_kputl(&ks, 0); - test_kputl(&ks, 1); - test_kputl(&ks, 37); - test_kputl(&ks, 12345); - test_kputl(&ks, -12345); - test_kputl(&ks, INT_MAX); - test_kputl(&ks, -INT_MAX); - test_kputl(&ks, INT_MIN); - test_kputl(&ks, LONG_MAX); - test_kputl(&ks, -LONG_MAX); - test_kputl(&ks, LONG_MIN); - - test_kgetline(&ks, "", NULL); - test_kgetline(&ks, "apple", "apple", NULL); - test_kgetline(&ks, "banana\n", "banana", NULL); - test_kgetline(&ks, "carrot\r\n", "carrot", NULL); - test_kgetline(&ks, "\n", "", NULL); - test_kgetline(&ks, "\n\n", "", "", NULL); - test_kgetline(&ks, "foo\nbar", "foo", "bar", NULL); - test_kgetline(&ks, "foo\nbar\n", "foo", "bar", NULL); - test_kgetline(&ks, - "abcdefghijklmnopqrstuvwxyz0123456789\nABCDEFGHIJKLMNOPQRSTUVWXYZ\n", - "abcdefghijklmnopqrstuvwxyz0123456789", - "ABCDEFGHIJKLMNOPQRSTUVWXYZ", NULL); - - if (argc > 1) { - FILE *f = fopen(argv[1], "r"); - if (f) { - for (ks.l = 0; kgetline(&ks, (kgets_func *)fgets, f) == 0; ks.l = 0) - puts(ks.s); - fclose(f); - } - } - - free(ks.s); - - if (nfail > 0) { - fprintf(stderr, "Total failures: %d\n", nfail); - return EXIT_FAILURE; - } - - return EXIT_SUCCESS; -} diff --git a/test/kthread_test.c b/test/kthread_test.c deleted file mode 100644 index 1b67ed4..0000000 --- a/test/kthread_test.c +++ /dev/null @@ -1,69 +0,0 @@ -#include -#include -#include -#include -#if HAVE_CILK -#include -#include -#endif - -typedef struct { - int max_iter, w, h; - double xmin, xmax, ymin, ymax; - int *k; -} global_t; - -static void compute(void *_g, int i, int tid) -{ - global_t *g = (global_t*)_g; - double x, x0 = g->xmin + (g->xmax - g->xmin) * (i%g->w) / g->w; - double y, y0 = g->ymin + (g->ymax - g->ymin) * (i/g->w) / g->h; - int k; - - assert(g->k[i] < 0); - x = x0, y = y0; - for (k = 0; k < g->max_iter; ++k) { - double z = x * y; - x *= x; y *= y; - if (x + y >= 4) break; - x = x - y + x0; - y = z + z + y0; - } - g->k[i] = k; -} - -void kt_for(int n_threads, int n_items, void (*func)(void*,int,int), void *data); - -int main(int argc, char *argv[]) -{ - int i, tmp, tot, type = 0, n_threads = 2; - global_t global = { 10240*100, 800, 600, -2., -1.2, -1.2, 1.2, 0 }; -// global_t global = { 10240*1, 8, 6, -2., -1.2, -1.2, 1.2, 0 }; - - if (argc > 1) { - type = argv[1][0] == 'o'? 2 : argv[1][0] == 'c'? 3 : argv[1][0] == 'n'? 1 : 0; - if (argv[1][0] >= '0' && argv[1][0] <= '9') - n_threads = atoi(argv[1]); - } else { - fprintf(stderr, "Usage: ./a.out [openmp | cilk | #threads]\n"); - } - tot = global.w * global.h; - global.k = calloc(tot, sizeof(int)); - for (i = 0; i < tot; ++i) global.k[i] = -1; - if (type == 0) { - kt_for(n_threads, tot, compute, &global); - } else if (type == 2) { - #pragma omp parallel for - for (i = 0; i < tot; ++i) - compute(&global, i, 0); - } else if (type == 3) { - #if HAVE_CILK - cilk_for (i = 0; i < tot; ++i) - compute(&global, i, 0); - #endif - } - for (i = tmp = 0; i < tot; ++i) tmp += (global.k[i] < 0); - free(global.k); - assert(tmp == 0); - return 0; -} diff --git a/test/kvec_test.cc b/test/kvec_test.cc deleted file mode 100644 index 1015574..0000000 --- a/test/kvec_test.cc +++ /dev/null @@ -1,69 +0,0 @@ -#include -#include -#include -#include -#include "kvec.h" - -int main() -{ - int M = 10, N = 20000000, i, j; - clock_t t; - t = clock(); - for (i = 0; i < M; ++i) { - int *array = (int*)malloc(N * sizeof(int)); - for (j = 0; j < N; ++j) array[j] = j; - free(array); - } - printf("C array, preallocated: %.3f sec\n", - (float)(clock() - t) / CLOCKS_PER_SEC); - t = clock(); - for (i = 0; i < M; ++i) { - int *array = 0, max = 0; - for (j = 0; j < N; ++j) { - if (j == max) { - max = !max? 1 : max << 1; - array = (int*)realloc(array, sizeof(int)*max); - } - array[j] = j; - } - free(array); - } - printf("C array, dynamic: %.3f sec\n", - (float)(clock() - t) / CLOCKS_PER_SEC); - t = clock(); - for (i = 0; i < M; ++i) { - kvec_t(int) array; - kv_init(array); - kv_resize(int, array, N); - for (j = 0; j < N; ++j) kv_a(int, array, j) = j; - kv_destroy(array); - } - printf("C vector, dynamic(kv_a): %.3f sec\n", - (float)(clock() - t) / CLOCKS_PER_SEC); - t = clock(); - for (i = 0; i < M; ++i) { - kvec_t(int) array; - kv_init(array); - for (j = 0; j < N; ++j) - kv_push(int, array, j); - kv_destroy(array); - } - printf("C vector, dynamic(kv_push): %.3f sec\n", - (float)(clock() - t) / CLOCKS_PER_SEC); - t = clock(); - for (i = 0; i < M; ++i) { - std::vector array; - array.reserve(N); - for (j = 0; j < N; ++j) array[j] = j; - } - printf("C++ vector, preallocated: %.3f sec\n", - (float)(clock() - t) / CLOCKS_PER_SEC); - t = clock(); - for (i = 0; i < M; ++i) { - std::vector array; - for (j = 0; j < N; ++j) array.push_back(j); - } - printf("C++ vector, dynamic: %.3f sec\n", - (float)(clock() - t) / CLOCKS_PER_SEC); - return 0; -} From aa2b099e4e212b5f6d1d8aef468910568cf4fd27 Mon Sep 17 00:00:00 2001 From: Sam Wilson Date: Tue, 3 Jun 2014 16:08:20 -0400 Subject: [PATCH 08/21] add new testing framework --- .gitignore | 17 +--- test/.ycm_extra_conf.py | 164 +++++++++++++++++++++++++++++++++++++ test/CMakeLists.txt | 15 ++++ test/cmake/Modules/FindCheck.cmake | 55 +++++++++++++ test/klist_tests.c | 93 +++++++++++++++++++++ test/klist_tests.h | 9 ++ test/main.c | 28 +++++++ 7 files changed, 366 insertions(+), 15 deletions(-) create mode 100644 test/.ycm_extra_conf.py create mode 100644 test/CMakeLists.txt create mode 100644 test/cmake/Modules/FindCheck.cmake create mode 100644 test/klist_tests.c create mode 100644 test/klist_tests.h create mode 100644 test/main.c diff --git a/.gitignore b/.gitignore index 010a8eb..4b510ef 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ *~ .git TAGS +*.pyc # Mac/Xcode-specfic xcuserdata @@ -23,18 +24,4 @@ contents.xcworkspacedata ._* # Test byproducts -test/kbtree_test -test/khash_keith -test/khash_keith2 -test/khash_test -test/klist_test -test/kmin_test -test/kseq_bench -test/kseq_bench2 -test/kseq_test -test/ksort_test -test/ksort_test-stl -test/kstring_bench -test/kstring_bench2 -test/kstring_test -test/kvec_test +test/build diff --git a/test/.ycm_extra_conf.py b/test/.ycm_extra_conf.py new file mode 100644 index 0000000..7332f53 --- /dev/null +++ b/test/.ycm_extra_conf.py @@ -0,0 +1,164 @@ +# This file is NOT licensed under the GPLv3, which is the license for the rest +# of YouCompleteMe. +# +# Here's the license text for this file: +# +# This is free and unencumbered software released into the public domain. +# +# Anyone is free to copy, modify, publish, use, compile, sell, or +# distribute this software, either in source code form or as a compiled +# binary, for any purpose, commercial or non-commercial, and by any +# means. +# +# In jurisdictions that recognize copyright laws, the author or authors +# of this software dedicate any and all copyright interest in the +# software to the public domain. We make this dedication for the benefit +# of the public at large and to the detriment of our heirs and +# successors. We intend this dedication to be an overt act of +# relinquishment in perpetuity of all present and future rights to this +# software under copyright law. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +# IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR +# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +# OTHER DEALINGS IN THE SOFTWARE. +# +# For more information, please refer to + +import os +import ycm_core + +# These are the compilation flags that will be used in case there's no +# compilation database set (by default, one is not set). +# CHANGE THIS LIST OF FLAGS. YES, THIS IS THE DROID YOU HAVE BEEN LOOKING FOR. +flags = [ +'-Wall', +'-Wextra', +'-Werror', +'-pedantic', +# THIS IS IMPORTANT! Without a "-std=" flag, clang won't know which +# language to use when compiling headers. So it will guess. Badly. So C++ +# headers will be compiled as C headers. You don't want that so ALWAYS specify +# a "-std=". +# For a C project, you would set this to something like 'c99' instead of +# 'c++11'. +'-std=c99', +# ...and the same thing goes for the magic -x option which specifies the +# language that the files to be compiled are written in. This is mostly +# relevant for c++ headers. +# For a C project, you would set this to 'c' instead of 'c++'. +'-x', +'c', +'-isystem', +'../llvm/include', +'-isystem', +'../llvm/tools/clang/include', +'-I', +'.', +'-isystem', +'/usr/include', +'-isystem', +'/usr/local/include', +'-isystem', +'/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/c++/v1', +'-isystem', +'/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include', +'-I', +os.path.join(os.path.dirname(__file__), '..') +] + + +# Set this to the absolute path to the folder (NOT the file!) containing the +# compile_commands.json file to use that instead of 'flags'. See here for +# more details: http://clang.llvm.org/docs/JSONCompilationDatabase.html +# +# Most projects will NOT need to set this to anything; you can just change the +# 'flags' list of compilation flags. Notice that YCM itself uses that approach. +compilation_database_folder = '' + +if os.path.exists( compilation_database_folder ): + database = ycm_core.CompilationDatabase( compilation_database_folder ) +else: + database = None + +SOURCE_EXTENSIONS = [ '.cpp', '.cxx', '.cc', '.c', '.m', '.mm' ] + +def DirectoryOfThisScript(): + return os.path.dirname( os.path.abspath( __file__ ) ) + + +def MakeRelativePathsInFlagsAbsolute( flags, working_directory ): + if not working_directory: + return list( flags ) + new_flags = [] + make_next_absolute = False + path_flags = [ '-isystem', '-I', '-iquote', '--sysroot=' ] + for flag in flags: + new_flag = flag + + if make_next_absolute: + make_next_absolute = False + if not flag.startswith( '/' ): + new_flag = os.path.join( working_directory, flag ) + + for path_flag in path_flags: + if flag == path_flag: + make_next_absolute = True + break + + if flag.startswith( path_flag ): + path = flag[ len( path_flag ): ] + new_flag = path_flag + os.path.join( working_directory, path ) + break + + if new_flag: + new_flags.append( new_flag ) + return new_flags + + +def IsHeaderFile( filename ): + extension = os.path.splitext( filename )[ 1 ] + return extension in [ '.h', '.hxx', '.hpp', '.hh' ] + + +def GetCompilationInfoForFile( filename ): + # The compilation_commands.json file generated by CMake does not have entries + # for header files. So we do our best by asking the db for flags for a + # corresponding source file, if any. If one exists, the flags for that file + # should be good enough. + if IsHeaderFile( filename ): + basename = os.path.splitext( filename )[ 0 ] + for extension in SOURCE_EXTENSIONS: + replacement_file = basename + extension + if os.path.exists( replacement_file ): + compilation_info = database.GetCompilationInfoForFile( + replacement_file ) + if compilation_info.compiler_flags_: + return compilation_info + return None + return database.GetCompilationInfoForFile( filename ) + + +def FlagsForFile( filename, **kwargs ): + if database: + # Bear in mind that compilation_info.compiler_flags_ does NOT return a + # python list, but a "list-like" StringVec object + compilation_info = GetCompilationInfoForFile( filename ) + if not compilation_info: + return None + + final_flags = MakeRelativePathsInFlagsAbsolute( + compilation_info.compiler_flags_, + compilation_info.compiler_working_dir_ ) + + else: + relative_to = DirectoryOfThisScript() + final_flags = MakeRelativePathsInFlagsAbsolute( flags, relative_to ) + + return { + 'flags': final_flags, + 'do_cache': True + } diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt new file mode 100644 index 0000000..e5ac175 --- /dev/null +++ b/test/CMakeLists.txt @@ -0,0 +1,15 @@ +cmake_minimum_required(VERSION 2.8) +project(klib-test) +enable_testing() +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") + +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --std=c99 -Wall -Wextra -Werror -pedantic -Wstrict-prototypes -Wold-style-definition") + +find_package(Threads REQUIRED) +find_package(Check REQUIRED) + +add_executable(klib-test main klist_tests) +target_include_directories(klib-test PUBLIC ${CHECK_INCLUDE_DIRS} ../) +target_link_libraries(klib-test ${CHECK_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) + +add_test(klib-test ${CMAKE_CURRENT_BINARY_DIR}/klib-test) diff --git a/test/cmake/Modules/FindCheck.cmake b/test/cmake/Modules/FindCheck.cmake new file mode 100644 index 0000000..8ad818f --- /dev/null +++ b/test/cmake/Modules/FindCheck.cmake @@ -0,0 +1,55 @@ +# - Try to find the CHECK libraries +# Once done this will define +# +# CHECK_FOUND - system has check +# CHECK_INCLUDE_DIRS - the check include directory +# CHECK_LIBRARIES - check library +# +# Copyright (c) 2007 Daniel Gollub +# Copyright (c) 2007-2009 Bjoern Ricks +# +# Redistribution and use is allowed according to the terms of the New +# BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + + +INCLUDE( FindPkgConfig ) + +IF ( Check_FIND_REQUIRED ) + SET( _pkgconfig_REQUIRED "REQUIRED" ) +ELSE( Check_FIND_REQUIRED ) + SET( _pkgconfig_REQUIRED "" ) +ENDIF ( Check_FIND_REQUIRED ) + +IF ( CHECK_MIN_VERSION ) + PKG_SEARCH_MODULE( CHECK ${_pkgconfig_REQUIRED} check>=${CHECK_MIN_VERSION} ) +ELSE ( CHECK_MIN_VERSION ) + PKG_SEARCH_MODULE( CHECK ${_pkgconfig_REQUIRED} check ) +ENDIF ( CHECK_MIN_VERSION ) + +# Look for CHECK include dir and libraries +IF( NOT CHECK_FOUND AND NOT PKG_CONFIG_FOUND ) + + FIND_PATH( CHECK_INCLUDE_DIRS check.h ) + + FIND_LIBRARY( CHECK_LIBRARIES NAMES check ) + + IF ( CHECK_INCLUDE_DIRS AND CHECK_LIBRARIES ) + SET( CHECK_FOUND 1 ) + IF ( NOT Check_FIND_QUIETLY ) + MESSAGE ( STATUS "Found CHECK: ${CHECK_LIBRARIES}" ) + ENDIF ( NOT Check_FIND_QUIETLY ) + ELSE ( CHECK_INCLUDE_DIRS AND CHECK_LIBRARIES ) + IF ( Check_FIND_REQUIRED ) + MESSAGE( FATAL_ERROR "Could NOT find CHECK" ) + ELSE ( Check_FIND_REQUIRED ) + IF ( NOT Check_FIND_QUIETLY ) + MESSAGE( STATUS "Could NOT find CHECK" ) + ENDIF ( NOT Check_FIND_QUIETLY ) + ENDIF ( Check_FIND_REQUIRED ) + ENDIF ( CHECK_INCLUDE_DIRS AND CHECK_LIBRARIES ) +ENDIF( NOT CHECK_FOUND AND NOT PKG_CONFIG_FOUND ) + +# Hide advanced variables from CMake GUIs +MARK_AS_ADVANCED( CHECK_INCLUDE_DIRS CHECK_LIBRARIES ) + diff --git a/test/klist_tests.c b/test/klist_tests.c new file mode 100644 index 0000000..779ace4 --- /dev/null +++ b/test/klist_tests.c @@ -0,0 +1,93 @@ +#include "klist_tests.h" + +/* + * Definitions + */ +#define __int_free(x) +KLIST_INIT(32, int, __int_free) + +/* + * Tests + */ +START_TEST (init) +{ + klist_t(32) *list = kl_init(32); + ck_assert_ptr_ne(list, 0); + kl_destroy(32, list); +} +END_TEST + +static klist_t(32) *g_list; + +void empty_setup(void) +{ + g_list = kl_init(32); +} + +void empty_teardown(void) +{ + kl_destroy(32, g_list); + g_list = NULL; +} + +START_TEST (empty_size) +{ + ck_assert_int_eq(kl_length(g_list), 0); +} +END_TEST + +START_TEST (empty_shift) +{ + int d = 42; + int result = kl_shift(32, g_list, &d); + ck_assert_int_eq(result, -1); + ck_assert_int_eq(kl_length(g_list), 0); + ck_assert_int_eq(d, 42); +} +END_TEST + +START_TEST (empty_unshift) +{ + *kl_unshiftp(32, g_list) = 22; + ck_assert_int_eq(kl_length(g_list), 1); + + int val = kl_val(kl_begin(g_list)); + ck_assert_int_eq(val, 22); +} +END_TEST + +START_TEST (empty_push) +{ + *kl_pushp(32, g_list) = 22; + ck_assert_int_eq(kl_length(g_list), 1); + + int val = kl_val(kl_begin(g_list)); + ck_assert_int_eq(val, 22); +} +END_TEST + +START_TEST (empty_begin_end) +{ + ck_assert_ptr_eq(kl_begin(g_list), kl_end(g_list)); +} +END_TEST + +Suite* klist_suite(void) +{ + Suite *s = suite_create("klist"); + + TCase *tc_core = tcase_create("init"); + tcase_add_test(tc_core, init); + suite_add_tcase(s, tc_core); + + TCase *tc_empty = tcase_create("empty"); + tcase_add_checked_fixture(tc_empty, empty_setup, empty_teardown); + tcase_add_test(tc_empty, empty_size); + tcase_add_test(tc_empty, empty_shift); + tcase_add_test(tc_empty, empty_unshift); + tcase_add_test(tc_empty, empty_push); + tcase_add_test(tc_empty, empty_begin_end); + suite_add_tcase(s, tc_empty); + + return s; +} diff --git a/test/klist_tests.h b/test/klist_tests.h new file mode 100644 index 0000000..b088041 --- /dev/null +++ b/test/klist_tests.h @@ -0,0 +1,9 @@ +#ifndef KLIST_TESTS_H +#define KLIST_TESTS_H 1 + +#include +#include "klist.h" + +Suite* klist_suite(void); + +#endif diff --git a/test/main.c b/test/main.c new file mode 100644 index 0000000..0d5ec78 --- /dev/null +++ b/test/main.c @@ -0,0 +1,28 @@ +#include +#include +#include "klist_tests.h" + +int main(void) +{ + int n_fail = 0; + + Suite *master_suite = suite_create("master_suite"); + + Suite *suites[] = { + klist_suite(), + NULL + }; + + SRunner *sr = srunner_create(master_suite); + + for (Suite **pp = &suites[0]; *pp != NULL; pp++) { + srunner_add_suite(sr, *pp); + } + + srunner_run_all(sr, CK_NORMAL); + n_fail += srunner_ntests_failed(sr); + + srunner_free(sr); + + return (n_fail == 0) ? EXIT_SUCCESS : EXIT_FAILURE; +} From 7d1f08ada8e0d57a02d372237da284d122e20f71 Mon Sep 17 00:00:00 2001 From: Sam Wilson Date: Wed, 4 Jun 2014 09:17:04 -0400 Subject: [PATCH 09/21] Adding support for travis-ci --- .travis.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..d777086 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,24 @@ +language: c +compiler: gcc + +before_install: + # Add PPA for gcc + - sudo apt-add-repository -y ppa:ubuntu-toolchain-r/test + # Update apt + - sudo apt-get update -qq + # Install gcc 4.8 + - sudo apt-get install -qq gcc-4.8 g++-4.8 + # Make gcc 4.8 the default version + - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 100 + - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 100 + - sudo update-alternatives --install /usr/bin/cpp cpp /usr/bin/cpp-4.8 100 + # Install required libraries from apt + - sudo apt-get install -qq check + +script: + - cd ./test + - mkdir ./build + - cd ./build + - cmake .. + - make + - ./klib-test From 2eab59804641b32d5953578f9dd4829579393b17 Mon Sep 17 00:00:00 2001 From: Sam Wilson Date: Wed, 4 Jun 2014 09:24:46 -0400 Subject: [PATCH 10/21] Forgot pthreads --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d777086..1282d7c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ before_install: - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 100 - sudo update-alternatives --install /usr/bin/cpp cpp /usr/bin/cpp-4.8 100 # Install required libraries from apt - - sudo apt-get install -qq check + - sudo apt-get install -qq check libpthread-stubs0-dev script: - cd ./test From fafe64178cd73968baf7e29ddcf28af3a580498b Mon Sep 17 00:00:00 2001 From: Sam Wilson Date: Wed, 4 Jun 2014 09:49:55 -0400 Subject: [PATCH 11/21] try #3 for travis-ci --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1282d7c..beb9e95 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ before_install: - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 100 - sudo update-alternatives --install /usr/bin/cpp cpp /usr/bin/cpp-4.8 100 # Install required libraries from apt - - sudo apt-get install -qq check libpthread-stubs0-dev + - sudo apt-get install -qq check build-essential script: - cd ./test From a6105037bcb99937887e3e34420d71e4abcd74fd Mon Sep 17 00:00:00 2001 From: Sam Wilson Date: Wed, 4 Jun 2014 14:11:55 -0400 Subject: [PATCH 12/21] Move cflags below findpackage --- test/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index e5ac175..2b62145 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -3,11 +3,11 @@ project(klib-test) enable_testing() set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --std=c99 -Wall -Wextra -Werror -pedantic -Wstrict-prototypes -Wold-style-definition") - find_package(Threads REQUIRED) find_package(Check REQUIRED) +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --std=c99 -Wall -Wextra -Werror -pedantic -Wstrict-prototypes -Wold-style-definition") + add_executable(klib-test main klist_tests) target_include_directories(klib-test PUBLIC ${CHECK_INCLUDE_DIRS} ../) target_link_libraries(klib-test ${CHECK_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) From f8a26c7964fd4ef687f2d5b7555c95d2b4267f18 Mon Sep 17 00:00:00 2001 From: Sam Wilson Date: Wed, 4 Jun 2014 14:26:22 -0400 Subject: [PATCH 13/21] up the minimum required version --- test/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 2b62145..caeaaab 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 2.8.11) project(klib-test) enable_testing() set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") From d0686024fba4418bfc3e7ab68440b890399a1f42 Mon Sep 17 00:00:00 2001 From: Sam Wilson Date: Wed, 4 Jun 2014 14:30:38 -0400 Subject: [PATCH 14/21] Add repo for backported cmake --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index beb9e95..629fe22 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,10 +4,11 @@ compiler: gcc before_install: # Add PPA for gcc - sudo apt-add-repository -y ppa:ubuntu-toolchain-r/test + - sudo apt-add-repository -y ppa:kalakris/cmake # Update apt - sudo apt-get update -qq # Install gcc 4.8 - - sudo apt-get install -qq gcc-4.8 g++-4.8 + - sudo apt-get install -qq gcc-4.8 g++-4.8 cmake # Make gcc 4.8 the default version - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 100 - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 100 From d6b60f78eef6a45cbb710fe57ed9cc853e146573 Mon Sep 17 00:00:00 2001 From: Sam Wilson Date: Wed, 4 Jun 2014 15:32:19 -0400 Subject: [PATCH 15/21] compile check instead of using old packages --- .travis.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 629fe22..0b6d171 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,17 @@ before_install: - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 100 - sudo update-alternatives --install /usr/bin/cpp cpp /usr/bin/cpp-4.8 100 # Install required libraries from apt - - sudo apt-get install -qq check build-essential + - sudo apt-get install -qq build-essential + # Build newer version of check + - sudo apt-get build-dep check + - mkdir check + - cd check + - wget http://sourceforge.net/projects/check/files/latest/download -O check.tar.gz + - tar -xvzf check.tar.gz --strip-components=1 + - ./configure --prefix=/usr + - make + - sudo make install + - cd .. script: - cd ./test From 3de0779f233ca33d8df4a3d2116c57263e862ec3 Mon Sep 17 00:00:00 2001 From: Sam Wilson Date: Wed, 4 Jun 2014 16:51:06 -0400 Subject: [PATCH 16/21] Add travis badge to readme --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index ddd74f4..7964aa5 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ #Klib: a Generic Library in C +[![Build Status](https://travis-ci.org/tecywiz121/klib.svg?branch=master)](https://travis-ci.org/tecywiz121/klib) + ##Overview Klib is a standalone and lightweight C library distributed under [MIT/X11 From dd270246605bf687affdc763541ff747ddad0e30 Mon Sep 17 00:00:00 2001 From: Sam Wilson Date: Wed, 4 Jun 2014 17:02:21 -0400 Subject: [PATCH 17/21] add kl_val test --- test/klist_tests.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/test/klist_tests.c b/test/klist_tests.c index 779ace4..f710a4e 100644 --- a/test/klist_tests.c +++ b/test/klist_tests.c @@ -72,6 +72,12 @@ START_TEST (empty_begin_end) } END_TEST +START_TEST (empty_val) +{ + ck_assert_int_eq(kl_val(kl_begin(g_list)), 0); +} +END_TEST + Suite* klist_suite(void) { Suite *s = suite_create("klist"); @@ -87,6 +93,7 @@ Suite* klist_suite(void) tcase_add_test(tc_empty, empty_unshift); tcase_add_test(tc_empty, empty_push); tcase_add_test(tc_empty, empty_begin_end); + tcase_add_test(tc_empty, empty_val); suite_add_tcase(s, tc_empty); return s; From d7a086d4335aacd07e2e962eb9f4fee411ae3282 Mon Sep 17 00:00:00 2001 From: Sam Wilson Date: Wed, 4 Jun 2014 18:22:31 -0400 Subject: [PATCH 18/21] couple more empty list tests --- test/klist_tests.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/test/klist_tests.c b/test/klist_tests.c index f710a4e..8b21ea0 100644 --- a/test/klist_tests.c +++ b/test/klist_tests.c @@ -78,6 +78,30 @@ START_TEST (empty_val) } END_TEST +START_TEST (empty_next) +{ + ck_assert_ptr_eq(kl_next(kl_begin(g_list)), NULL); +} +END_TEST + +START_TEST (empty_delete_after) +{ + int d = 42; + int result = kl_delete_after(32, g_list, kl_begin(g_list), &d); + ck_assert_int_eq(result, -1); + ck_assert_int_eq(d, 42); + ck_assert_int_eq(kl_length(g_list), 0); +} +END_TEST + +START_TEST (empty_insertp_after) +{ + int *result = kl_insertp_after(32, g_list, kl_begin(g_list)); + ck_assert_ptr_eq(result, NULL); + ck_assert_int_eq(kl_length(g_list), 0); +} +END_TEST + Suite* klist_suite(void) { Suite *s = suite_create("klist"); @@ -94,6 +118,9 @@ Suite* klist_suite(void) tcase_add_test(tc_empty, empty_push); tcase_add_test(tc_empty, empty_begin_end); tcase_add_test(tc_empty, empty_val); + tcase_add_test(tc_empty, empty_next); + tcase_add_test(tc_empty, empty_delete_after); + tcase_add_test(tc_empty, empty_insertp_after); suite_add_tcase(s, tc_empty); return s; From 44d4d7c555d18bcbc6ba8d43bf39c651db9ae9da Mon Sep 17 00:00:00 2001 From: Sam Wilson Date: Wed, 4 Jun 2014 23:26:19 -0400 Subject: [PATCH 19/21] more tests --- test/klist_tests.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/test/klist_tests.c b/test/klist_tests.c index 8b21ea0..2e01e71 100644 --- a/test/klist_tests.c +++ b/test/klist_tests.c @@ -102,6 +102,34 @@ START_TEST (empty_insertp_after) } END_TEST +void one_setup(void) +{ + g_list = kl_init(32); + *kl_pushp(32, g_list) = 12; +} + +void one_teardown(void) +{ + kl_destroy(32, g_list); + g_list = NULL; +} + +START_TEST (one_size) +{ + ck_assert_int_eq(kl_length(g_list), 1); +} +END_TEST + +START_TEST (one_shift) +{ + int d = 1; + int result = kl_shift(32, g_list, &d); + ck_assert_int_eq(result, 0); + ck_assert_int_eq(d, 12); + ck_assert_int_eq(kl_length(g_list), 0); +} +END_TEST + Suite* klist_suite(void) { Suite *s = suite_create("klist"); @@ -123,5 +151,10 @@ Suite* klist_suite(void) tcase_add_test(tc_empty, empty_insertp_after); suite_add_tcase(s, tc_empty); + TCase *tc_one = tcase_create("one"); + tcase_add_checked_fixture(tc_one, one_setup, one_teardown); + tcase_add_test(tc_one, one_size); + tcase_add_test(tc_one, one_shift); + suite_add_tcase(s, tc_one); return s; } From d19a1ad10e6cee6a5b1dad5bd4892e42a1483249 Mon Sep 17 00:00:00 2001 From: Sam Wilson Date: Thu, 5 Jun 2014 15:50:08 -0400 Subject: [PATCH 20/21] add a couple more tests --- test/klist_tests.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/test/klist_tests.c b/test/klist_tests.c index 2e01e71..f0f7363 100644 --- a/test/klist_tests.c +++ b/test/klist_tests.c @@ -130,6 +130,48 @@ START_TEST (one_shift) } END_TEST +START_TEST (one_unshift) +{ + *kl_unshiftp(32, g_list) = 98; + ck_assert_int_eq(kl_length(g_list), 2); + + kliter_t(32) *p = kl_begin(g_list); + ck_assert_int_eq(kl_val(p), 98); + + p = kl_next(p); + ck_assert_int_eq(kl_val(p), 12); + + p = kl_next(p); + ck_assert_ptr_eq(p, kl_end(g_list)); +} +END_TEST + +START_TEST (one_push) +{ + *kl_pushp(32, g_list) = 98; + ck_assert_int_eq(kl_length(g_list), 2); + + kliter_t(32) *p = kl_begin(g_list); + ck_assert_int_eq(kl_val(p), 12); + + p = kl_next(p); + ck_assert_int_eq(kl_val(p), 98); + + p = kl_next(p); + ck_assert_ptr_eq(p, kl_end(g_list)); +} +END_TEST + +START_TEST (one_delete_after) +{ + int d = 42; + int result = kl_delete_after(32, g_list, kl_begin(g_list), &d); + ck_assert_int_eq(result, -1); + ck_assert_int_eq(d, 42); + ck_assert_int_eq(kl_length(g_list), 1); +} +END_TEST + Suite* klist_suite(void) { Suite *s = suite_create("klist"); @@ -155,6 +197,9 @@ Suite* klist_suite(void) tcase_add_checked_fixture(tc_one, one_setup, one_teardown); tcase_add_test(tc_one, one_size); tcase_add_test(tc_one, one_shift); + tcase_add_test(tc_one, one_unshift); + tcase_add_test(tc_one, one_push); + tcase_add_test(tc_one, one_delete_after); suite_add_tcase(s, tc_one); return s; } From 42652dafe418e21dae6b31672c5c2d75bf9de9f1 Mon Sep 17 00:00:00 2001 From: Sam Wilson Date: Thu, 24 Nov 2016 13:38:02 -0500 Subject: [PATCH 21/21] Add -Wc++-compat warnings --- test/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index caeaaab..2fe5328 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -6,7 +6,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") find_package(Threads REQUIRED) find_package(Check REQUIRED) -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --std=c99 -Wall -Wextra -Werror -pedantic -Wstrict-prototypes -Wold-style-definition") +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --std=c99 -Wall -Wextra -Werror -pedantic -Wstrict-prototypes -Wold-style-definition -Wc++-compat") add_executable(klib-test main klist_tests) target_include_directories(klib-test PUBLIC ${CHECK_INCLUDE_DIRS} ../)