From 14c5326ccd05d3741271219510138880575a5d81 Mon Sep 17 00:00:00 2001 From: behlendo Date: Tue, 4 Mar 2008 18:22:31 +0000 Subject: [PATCH] More stub headers, moved generic to sysmacros, added some more macros for kernel compatibility git-svn-id: https://outreach.scidac.gov/svn/spl/trunk@22 7e1ea52c-4ff2-0310-8f11-9dd32ca42a1c --- include/strings.h | 4 ++ include/sys/Makefile.am | 2 +- include/sys/generic.h | 74 -------------------- include/sys/spl.h | 2 +- include/sys/sysmacros.h | 141 ++++++++++++++++++++++++++++++++++++++ include/sys/thread.h | 2 +- include/sys/types.h | 2 +- include/unistd.h | 4 ++ modules/spl/spl-generic.c | 2 +- 9 files changed, 154 insertions(+), 79 deletions(-) create mode 100644 include/strings.h delete mode 100644 include/sys/generic.h create mode 100644 include/sys/sysmacros.h create mode 100644 include/unistd.h diff --git a/include/strings.h b/include/strings.h new file mode 100644 index 0000000000..697ac4db61 --- /dev/null +++ b/include/strings.h @@ -0,0 +1,4 @@ +#ifndef _SPL_STRINGS_H +#define _SPL_STRINGS_H + +#endif /* SPL_STRINGS_H */ diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am index c44748e027..8fc6f91b0e 100644 --- a/include/sys/Makefile.am +++ b/include/sys/Makefile.am @@ -1,5 +1,5 @@ EXTRA_DIST = callb.h cmn_err.h condvar.h cred.h -EXTRA_DIST += debug.h generic.h kmem.h kstat.h +EXTRA_DIST += debug.h kmem.h kstat.h EXTRA_DIST += mutex.h param.h random.h rwlock.h EXTRA_DIST += spl.h taskq.h thread.h time.h EXTRA_DIST += timer.h types.h diff --git a/include/sys/generic.h b/include/sys/generic.h deleted file mode 100644 index 2d09892331..0000000000 --- a/include/sys/generic.h +++ /dev/null @@ -1,74 +0,0 @@ -#ifndef _SPL_GENERIC_H -#define _SPL_GENERIC_H - -#ifdef __cplusplus -extern "C" { -#endif - -#include - -/* Missing defines. - */ -#define INT32_MAX INT_MAX -#define UINT64_MAX (~0ULL) -#define NBBY 8 -#define ENOTSUP ENOTSUPP -#define MAXNAMELEN 256 -#define MAXPATHLEN PATH_MAX -#define __va_list va_list -#define _KERNEL __KERNEL__ -#define max_ncpus 64 - -/* 0..MAX_PRIO-1: Process priority - * 0..MAX_RT_PRIO-1: RT priority tasks - * MAX_RT_PRIO..MAX_PRIO-1: SCHED_NORMAL tasks - * - * Treat shim tasks as SCHED_NORMAL tasks - */ -#define minclsyspri (MAX_RT_PRIO) -#define maxclsyspri (MAX_PRIO-1) - -#define NICE_TO_PRIO(nice) (MAX_RT_PRIO + (nice) + 20) -#define PRIO_TO_NICE(prio) ((prio) - MAX_RT_PRIO - 20) - -#define kred NULL - -#define FREAD 1 -#define FWRITE 2 -#define FCREAT O_CREAT -#define FTRUNC O_TRUNC -#define FOFFMAX O_LARGEFILE -#define FSYNC O_SYNC -#define FDSYNC O_DSYNC -#define FRSYNC O_RSYNC -#define FEXCL O_EXCL - -#define FNODSYNC 0x10000 /* fsync pseudo flag */ -#define FNOFOLLOW 0x20000 /* don't follow symlinks */ - -/* Missing macros - */ -#define PAGESIZE PAGE_SIZE - -/* from Solaris sys/byteorder.h */ -#define BSWAP_8(x) ((x) & 0xff) -#define BSWAP_16(x) ((BSWAP_8(x) << 8) | BSWAP_8((x) >> 8)) -#define BSWAP_32(x) ((BSWAP_16(x) << 16) | BSWAP_16((x) >> 16)) -#define BSWAP_64(x) ((BSWAP_32(x) << 32) | BSWAP_32((x) >> 32)) - -/* Map some simple functions. - */ -#define bzero(ptr,size) memset(ptr,0,size) -#define bcopy(src,dest,size) memcpy(dest,src,size) -#define ASSERT(x) BUG_ON(!(x)) -#define ASSERT3U(left,OP,right) BUG_ON(!((left) OP (right))) - -/* Missing globals - */ -extern int p0; - -#ifdef __cplusplus -} -#endif - -#endif /* _SPL_GENERIC_H */ diff --git a/include/sys/spl.h b/include/sys/spl.h index 7cc1cab583..b8c1c38379 100644 --- a/include/sys/spl.h +++ b/include/sys/spl.h @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/sys/sysmacros.h b/include/sys/sysmacros.h new file mode 100644 index 0000000000..c48019fdb2 --- /dev/null +++ b/include/sys/sysmacros.h @@ -0,0 +1,141 @@ +#ifndef _SPL_SYSMACROS_H +#define _SPL_SYSMACROS_H + +#ifdef __cplusplus +extern "C" { +#endif + +#include + +#ifndef _KERNEL +#define _KERNEL __KERNEL__ +#endif + +/* Missing defines. + */ +#define INT32_MAX INT_MAX +#define UINT64_MAX (~0ULL) +#define NBBY 8 +#define ENOTSUP ENOTSUPP +#define MAXNAMELEN 256 +#define MAXPATHLEN PATH_MAX +#define __va_list va_list +#define max_ncpus 64 + +/* 0..MAX_PRIO-1: Process priority + * 0..MAX_RT_PRIO-1: RT priority tasks + * MAX_RT_PRIO..MAX_PRIO-1: SCHED_NORMAL tasks + * + * Treat shim tasks as SCHED_NORMAL tasks + */ +#define minclsyspri (MAX_RT_PRIO) +#define maxclsyspri (MAX_PRIO-1) + +#define NICE_TO_PRIO(nice) (MAX_RT_PRIO + (nice) + 20) +#define PRIO_TO_NICE(prio) ((prio) - MAX_RT_PRIO - 20) + +#define kred NULL + +#define FREAD 1 +#define FWRITE 2 +#define FCREAT O_CREAT +#define FTRUNC O_TRUNC +#define FOFFMAX O_LARGEFILE +#define FSYNC O_SYNC +#define FDSYNC O_DSYNC +#define FRSYNC O_RSYNC +#define FEXCL O_EXCL + +#define FNODSYNC 0x10000 /* fsync pseudo flag */ +#define FNOFOLLOW 0x20000 /* don't follow symlinks */ + +/* Missing macros + */ +#define PAGESIZE PAGE_SIZE + +/* from Solaris sys/byteorder.h */ +#define BSWAP_8(x) ((x) & 0xff) +#define BSWAP_16(x) ((BSWAP_8(x) << 8) | BSWAP_8((x) >> 8)) +#define BSWAP_32(x) ((BSWAP_16(x) << 16) | BSWAP_16((x) >> 16)) +#define BSWAP_64(x) ((BSWAP_32(x) << 32) | BSWAP_32((x) >> 32)) + +/* Map some simple functions. + */ +#define bzero(ptr,size) memset(ptr,0,size) +#define bcopy(src,dest,size) memcpy(dest,src,size) +#define ASSERT(x) BUG_ON(!(x)) +#define ASSERT3U(left,OP,right) BUG_ON(!((left) OP (right))) + +/* Missing globals + */ +extern int p0; + +#define makedevice(maj,min) makedev(maj,min) + +/* XXX - Borrowed from zfs project libsolcompat/include/sys/sysmacros.h */ +/* common macros */ +#ifndef MIN +#define MIN(a, b) ((a) < (b) ? (a) : (b)) +#endif +#ifndef MAX +#define MAX(a, b) ((a) < (b) ? (b) : (a)) +#endif +#ifndef ABS +#define ABS(a) ((a) < 0 ? -(a) : (a)) +#endif + +/* + * Compatibility macros/typedefs needed for Solaris -> Linux port + */ +#define P2ALIGN(x, align) ((x) & -(align)) +#define P2CROSS(x, y, align) (((x) ^ (y)) > (align) - 1) +#define P2ROUNDUP(x, align) (-(-(x) & -(align))) +#define P2ROUNDUP_TYPED(x, align, type) \ + (-(-(type)(x) & -(type)(align))) +#define P2PHASE(x, align) ((x) & ((align) - 1)) +#define P2NPHASE(x, align) (-(x) & ((align) - 1)) +#define P2NPHASE_TYPED(x, align, type) \ + (-(type)(x) & ((type)(align) - 1)) +#define ISP2(x) (((x) & ((x) - 1)) == 0) +#define IS_P2ALIGNED(v, a) ((((uintptr_t)(v)) & ((uintptr_t)(a) - 1)) == 0) + +/* + * Typed version of the P2* macros. These macros should be used to ensure + * that the result is correctly calculated based on the data type of (x), + * which is passed in as the last argument, regardless of the data + * type of the alignment. For example, if (x) is of type uint64_t, + * and we want to round it up to a page boundary using "PAGESIZE" as + * the alignment, we can do either + * P2ROUNDUP(x, (uint64_t)PAGESIZE) + * or + * P2ROUNDUP_TYPED(x, PAGESIZE, uint64_t) + */ +#define P2ALIGN_TYPED(x, align, type) \ + ((type)(x) & -(type)(align)) +#define P2PHASE_TYPED(x, align, type) \ + ((type)(x) & ((type)(align) - 1)) +#define P2NPHASE_TYPED(x, align, type) \ + (-(type)(x) & ((type)(align) - 1)) +#define P2ROUNDUP_TYPED(x, align, type) \ + (-(-(type)(x) & -(type)(align))) +#define P2END_TYPED(x, align, type) \ + (-(~(type)(x) & -(type)(align))) +#define P2PHASEUP_TYPED(x, align, phase, type) \ + ((type)(phase) - (((type)(phase) - (type)(x)) & -(type)(align))) +#define P2CROSS_TYPED(x, y, align, type) \ + (((type)(x) ^ (type)(y)) > (type)(align) - 1) +#define P2SAMEHIGHBIT_TYPED(x, y, type) \ + (((type)(x) ^ (type)(y)) < ((type)(x) & (type)(y))) + +#if defined(_KERNEL) && !defined(_KMEMUSER) && !defined(offsetof) + +/* avoid any possibility of clashing with version */ + +#define offsetof(s, m) ((size_t)(&(((s *)0)->m))) +#endif + +#ifdef __cplusplus +} +#endif + +#endif /* _SPL_SYSMACROS_H */ diff --git a/include/sys/thread.h b/include/sys/thread.h index e7f99c96d4..d1009ab6d8 100644 --- a/include/sys/thread.h +++ b/include/sys/thread.h @@ -9,7 +9,7 @@ extern "C" { #include #include #include -#include +#include /* * Thread interfaces diff --git a/include/sys/types.h b/include/sys/types.h index 28dc16435c..0a6cbfe791 100644 --- a/include/sys/types.h +++ b/include/sys/types.h @@ -6,7 +6,7 @@ extern "C" { #endif #include -#include +#include typedef enum { B_FALSE=0, B_TRUE=1 } boolean_t; typedef unsigned long uintptr_t; diff --git a/include/unistd.h b/include/unistd.h new file mode 100644 index 0000000000..c6b298a342 --- /dev/null +++ b/include/unistd.h @@ -0,0 +1,4 @@ +#ifndef _SPL_UNISTD_H +#define _SPL_UNISTD_H + +#endif /* SPL_UNISTD_H */ diff --git a/modules/spl/spl-generic.c b/modules/spl/spl-generic.c index 653b8cd1f7..60bebfdc47 100644 --- a/modules/spl/spl-generic.c +++ b/modules/spl/spl-generic.c @@ -1,4 +1,4 @@ -#include +#include #include "config.h" /*