ck: Reimplement a few libc headers, to make CK build when compiling in the

FreeBSD kernel.

include/ck_array.h

@@ -31,8 +31,8 @@
 #include <ck_cc.h>
 #include <ck_malloc.h>
 #include <ck_pr.h>
-#include <stdbool.h>
-#include <stddef.h>
+#include <ck_stdbool.h>
+#include <ck_stddef.h>
 
 struct _ck_array {
 	unsigned int n_committed;

include/ck_bitmap.h

@@ -33,9 +33,11 @@
 #include <ck_limits.h>
 #include <ck_pr.h>
 #include <ck_stdint.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <string.h>
+#include <ck_stdbool.h>
+#include <ck_stddef.h>
+#include <ck_stdbool.h>
+#include <ck_stddef.h>
+#include <ck_string.h>
 
 #if !defined(CK_F_PR_LOAD_UINT) || !defined(CK_F_PR_STORE_UINT) || \
     !defined(CK_F_PR_AND_UINT) || !defined(CK_F_PR_OR_UINT) || \

include/ck_brlock.h

@@ -41,8 +41,8 @@
  */
 
 #include <ck_pr.h>
-#include <stdbool.h>
-#include <stddef.h>
+#include <ck_stdbool.h>
+#include <ck_stddef.h>
 
 struct ck_brlock_reader {
 	unsigned int n_readers;

include/ck_bytelock.h

@@ -38,8 +38,8 @@
 #include <ck_cc.h>
 #include <ck_md.h>
 #include <ck_pr.h>
-#include <stdbool.h>
-#include <stddef.h>
+#include <ck_stdbool.h>
+#include <ck_stddef.h>
 #include <ck_limits.h>
 
 struct ck_bytelock {

include/ck_cohort.h

@@ -36,7 +36,7 @@
 
 #include <ck_cc.h>
 #include <ck_pr.h>
-#include <stddef.h>
+#include <ck_stddef.h>
 
 enum ck_cohort_state {
 	CK_COHORT_STATE_GLOBAL = 0,

include/ck_elide.h

@@ -35,7 +35,7 @@
 
 #include <ck_cc.h>
 #include <ck_pr.h>
-#include <string.h>
+#include <ck_string.h>
 
 /*
  * skip_-prefixed counters represent the number of consecutive

include/ck_epoch.h

@@ -37,7 +37,7 @@
 #include <ck_md.h>
 #include <ck_pr.h>
 #include <ck_stack.h>
-#include <stdbool.h>
+#include <ck_stdbool.h>
 
 #ifndef CK_EPOCH_LENGTH
 #define CK_EPOCH_LENGTH 4

include/ck_fifo.h

@@ -32,7 +32,7 @@
 #include <ck_md.h>
 #include <ck_pr.h>
 #include <ck_spinlock.h>
-#include <stddef.h>
+#include <ck_stddef.h>
 
 #ifndef CK_F_FIFO_SPSC
 #define CK_F_FIFO_SPSC

include/ck_hp_fifo.h

@@ -31,7 +31,7 @@
 #include <ck_cc.h>
 #include <ck_hp.h>
 #include <ck_pr.h>
-#include <stddef.h>
+#include <ck_stddef.h>
 
 #define CK_HP_FIFO_SLOTS_COUNT (2)
 #define CK_HP_FIFO_SLOTS_SIZE  (sizeof(void *) * CK_HP_FIFO_SLOTS_COUNT)

include/ck_hp_stack.h

@@ -31,7 +31,7 @@
 #include <ck_hp.h>
 #include <ck_pr.h>
 #include <ck_stack.h>
-#include <stddef.h>
+#include <ck_stddef.h>
 
 #define CK_HP_STACK_SLOTS_COUNT 1
 #define CK_HP_STACK_SLOTS_SIZE  sizeof(void *)

include/ck_hs.h

@@ -32,8 +32,8 @@
 #include <ck_md.h>
 #include <ck_pr.h>
 #include <ck_stdint.h>
-#include <stdbool.h>
-#include <stddef.h>
+#include <ck_stdbool.h>
+#include <ck_stddef.h>
 
 /*
  * Indicates a single-writer many-reader workload. Mutually

include/ck_ht.h

@@ -51,8 +51,8 @@
 #include <ck_malloc.h>
 #include <ck_md.h>
 #include <ck_stdint.h>
-#include <stdbool.h>
-#include <stddef.h>
+#include <ck_stdbool.h>
+#include <ck_stddef.h>
 
 struct ck_ht_hash {
 	uint64_t value;

include/ck_limits.h

@@ -40,6 +40,9 @@
 #define UINT64_MAX ULLONG_MAX
 #endif
 
+#elif defined(__FreeBSD__) && defined(_KERNEL)
+#include <sys/stdint.h>
+#include <sys/limits.h>
 #else
 #include <limits.h>
 #endif /* __linux__ && __KERNEL__ */

include/ck_malloc.h

@@ -27,7 +27,7 @@
 #ifndef CK_MALLOC_H
 #define CK_MALLOC_H
 
-#include <stdbool.h>
+#include <ck_stdbool.h>
 #include <sys/types.h>
 
 struct ck_malloc {

include/ck_pr.h

@@ -32,7 +32,7 @@
 #include <ck_limits.h>
 #include <ck_md.h>
 #include <ck_stdint.h>
-#include <stdbool.h>
+#include <ck_stdbool.h>
 
 #ifndef CK_USE_CC_BUILTINS
 #if defined(__x86_64__)

include/ck_rhs.h

@@ -32,8 +32,8 @@
 #include <ck_md.h>
 #include <ck_pr.h>
 #include <ck_stdint.h>
-#include <stdbool.h>
-#include <stddef.h>
+#include <ck_stdbool.h>
+#include <ck_stddef.h>
 
 /*
  * Indicates a single-writer many-reader workload. Mutually

include/ck_ring.h

@@ -30,8 +30,8 @@
 #include <ck_cc.h>
 #include <ck_md.h>
 #include <ck_pr.h>
-#include <stdbool.h>
-#include <string.h>
+#include <ck_stdbool.h>
+#include <ck_string.h>
 
 /*
  * Concurrent ring buffer.

include/ck_rwcohort.h

@@ -36,7 +36,7 @@
 
 #include <ck_cc.h>
 #include <ck_pr.h>
-#include <stddef.h>
+#include <ck_stddef.h>
 #include <ck_cohort.h>
 
 #define CK_RWCOHORT_WP_NAME(N) ck_rwcohort_wp_##N

include/ck_rwlock.h

@@ -29,8 +29,8 @@
 
 #include <ck_elide.h>
 #include <ck_pr.h>
-#include <stdbool.h>
-#include <stddef.h>
+#include <ck_stdbool.h>
+#include <ck_stddef.h>
 
 struct ck_rwlock {
 	unsigned int writer;

include/ck_sequence.h

@@ -29,7 +29,7 @@
 
 #include <ck_cc.h>
 #include <ck_pr.h>
-#include <stdbool.h>
+#include <ck_stdbool.h>
 
 struct ck_sequence {
 	unsigned int sequence;

include/ck_stack.h

@@ -29,8 +29,8 @@
 
 #include <ck_cc.h>
 #include <ck_pr.h>
-#include <stdbool.h>
-#include <stddef.h>
+#include <ck_stdbool.h>
+#include <ck_stddef.h>
 
 struct ck_stack_entry {
 	struct ck_stack_entry *next;

include/ck_stdbool.h

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2015 Olivier Houchard.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
+ */
+
+#if defined(__FreeBSD__) && defined(_KERNEL)
+#include <sys/types.h>
+#else
+#include <stdbool.h>
+#endif

include/ck_stddef.h

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2015 Olivier Houchard.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
+ */
+
+#if defined(__FreeBSD__) && defined(_KERNEL)
+#include <sys/stddef.h>
+#else
+#include <stddef.h>
+#endif

include/ck_stdint.h

@@ -27,6 +27,8 @@
 #if defined(__linux__) && defined(__KERNEL__)
 #include <linux/kernel.h>
 #include <linux/types.h>
+#elif defined(__FreeBSD__) && defined(_KERNEL)
+#include <sys/stdint.h>
 #else
 #include <stdint.h>
 #endif /* __linux__ && __KERNEL__ */

include/ck_stdlib.h

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2015 Olivier Houchard.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
+ */
+
+#if defined(__FreeBSD__) && defined(_KERNEL)
+#include <sys/systm.h>
+#else
+#include <stdlib.h>
+#endif

include/ck_string.h

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2015 Olivier Houchard.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
+ */
+
+#if defined(__FreeBSD__) && defined(_KERNEL)
+#include <sys/systm.h>
+#else
+#include <string.h>
+#endif

include/ck_swlock.h

@@ -31,8 +31,8 @@
 #include <ck_elide.h>
 #include <ck_limits.h>
 #include <ck_pr.h>
-#include <stdbool.h>
-#include <stddef.h>
+#include <ck_stdbool.h>
+#include <ck_stddef.h>
 
 struct ck_swlock {
 	uint32_t value;

include/gcc/x86/ck_pr.h

@@ -35,7 +35,6 @@
 #include <ck_cc.h>
 #include <ck_md.h>
 #include <ck_stdint.h>
-#include <stdbool.h>
 
 /*
  * The following represent supported atomic operations.

include/gcc/x86_64/ck_pr.h

@@ -34,7 +34,6 @@
 #include <ck_cc.h>
 #include <ck_md.h>
 #include <ck_stdint.h>
-#include <stdbool.h>
 
 /*
  * The following represent supported atomic operations.

include/spinlock/anderson.h

@@ -31,7 +31,7 @@
 #include <ck_limits.h>
 #include <ck_md.h>
 #include <ck_pr.h>
-#include <stdbool.h>
+#include <ck_stdbool.h>
 
 #ifndef CK_F_SPINLOCK_ANDERSON
 #define CK_F_SPINLOCK_ANDERSON

include/spinlock/cas.h

@@ -31,7 +31,7 @@
 #include <ck_cc.h>
 #include <ck_elide.h>
 #include <ck_pr.h>
-#include <stdbool.h>
+#include <ck_stdbool.h>
 
 #ifndef CK_F_SPINLOCK_CAS
 #define CK_F_SPINLOCK_CAS

include/spinlock/clh.h

@@ -30,8 +30,8 @@
 #include <ck_cc.h>
 #include <ck_limits.h>
 #include <ck_pr.h>
-#include <stdbool.h>
-#include <stddef.h>
+#include <ck_stdbool.h>
+#include <ck_stddef.h>
 
 #ifndef CK_F_SPINLOCK_CLH
 #define CK_F_SPINLOCK_CLH

include/spinlock/dec.h

@@ -31,7 +31,7 @@
 #include <ck_cc.h>
 #include <ck_elide.h>
 #include <ck_pr.h>
-#include <stdbool.h>
+#include <ck_stdbool.h>
 
 #ifndef CK_F_SPINLOCK_DEC
 #define CK_F_SPINLOCK_DEC

include/spinlock/fas.h

@@ -31,7 +31,7 @@
 #include <ck_cc.h>
 #include <ck_elide.h>
 #include <ck_pr.h>
-#include <stdbool.h>
+#include <ck_stdbool.h>
 
 #ifndef CK_F_SPINLOCK_FAS
 #define CK_F_SPINLOCK_FAS

include/spinlock/hclh.h

@@ -30,8 +30,8 @@
 
 #include <ck_cc.h>
 #include <ck_pr.h>
-#include <stdbool.h>
-#include <stddef.h>
+#include <ck_stdbool.h>
+#include <ck_stddef.h>
 
 #ifndef CK_F_SPINLOCK_HCLH
 #define CK_F_SPINLOCK_HCLH

include/spinlock/mcs.h

@@ -29,8 +29,8 @@
 
 #include <ck_cc.h>
 #include <ck_pr.h>
-#include <stdbool.h>
-#include <stddef.h>
+#include <ck_stdbool.h>
+#include <ck_stddef.h>
 
 #ifndef CK_F_SPINLOCK_MCS
 #define CK_F_SPINLOCK_MCS

include/spinlock/ticket.h

@@ -32,7 +32,7 @@
 #include <ck_elide.h>
 #include <ck_md.h>
 #include <ck_pr.h>
-#include <stdbool.h>
+#include <ck_stdbool.h>
 
 #ifndef CK_F_SPINLOCK_TICKET
 #define CK_F_SPINLOCK_TICKET

src/ck_array.c

@@ -28,8 +28,8 @@
 #include <ck_array.h>
 #include <ck_cc.h>
 #include <ck_pr.h>
-#include <stdbool.h>
-#include <string.h>
+#include <ck_stdbool.h>
+#include <ck_string.h>
 
 static struct _ck_array *
 ck_array_create(struct ck_malloc *allocator, unsigned int length)

src/ck_barrier_mcs.c

@@ -28,7 +28,7 @@
 #include <ck_barrier.h>
 #include <ck_cc.h>
 #include <ck_pr.h>
-#include <stdbool.h>
+#include <ck_stdbool.h>
 
 void
 ck_barrier_mcs_init(struct ck_barrier_mcs *barrier, unsigned int nthr)

src/ck_epoch.c

@@ -35,7 +35,7 @@
 #include <ck_epoch.h>
 #include <ck_pr.h>
 #include <ck_stack.h>
-#include <stdbool.h>
+#include <ck_stdbool.h>
 
 /*
  * Only three distinct values are used for reclamation, but reclamation occurs

src/ck_hp.c

@@ -56,10 +56,10 @@
 #include <ck_hp.h>
 #include <ck_pr.h>
 #include <ck_stack.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
+#include <ck_stdbool.h>
+#include <ck_stddef.h>
+#include <ck_stdlib.h>
+#include <ck_string.h>
 
 CK_STACK_CONTAINER(struct ck_hp_record, global_entry, ck_hp_record_container)
 CK_STACK_CONTAINER(struct ck_hp_hazard, pending_entry, ck_hp_hazard_container)

src/ck_hs.c

@@ -30,8 +30,8 @@
 #include <ck_md.h>
 #include <ck_pr.h>
 #include <ck_stdint.h>
-#include <stdbool.h>
-#include <string.h>
+#include <ck_stdbool.h>
+#include <ck_string.h>
 
 #include "ck_internal.h"
 

src/ck_ht.c

@@ -38,8 +38,8 @@
 #include <ck_md.h>
 #include <ck_pr.h>
 #include <ck_stdint.h>
-#include <stdbool.h>
-#include <string.h>
+#include <ck_stdbool.h>
+#include <ck_string.h>
 
 #include "ck_ht_hash.h"
 #include "ck_internal.h"

src/ck_ht_hash.h

@@ -32,7 +32,7 @@
  */
 
 #include <ck_stdint.h>
-#include <string.h>
+#include <ck_string.h>
 
 //-----------------------------------------------------------------------------
 // MurmurHash3 was written by Austin Appleby, and is placed in the public

src/ck_rhs.c

@@ -31,8 +31,8 @@
 #include <ck_md.h>
 #include <ck_pr.h>
 #include <ck_stdint.h>
-#include <stdbool.h>
-#include <string.h>
+#include <ck_stdbool.h>
+#include <ck_string.h>
 
 #include "ck_internal.h"