--- libelwix/inc/elwix.h 2013/02/04 16:42:31 1.1.1.1.2.5 +++ libelwix/inc/elwix.h 2014/02/21 13:30:19 1.11 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: elwix.h,v 1.1.1.1.2.5 2013/02/04 16:42:31 misho Exp $ +* $Id: elwix.h,v 1.11 2014/02/21 13:30:19 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -12,7 +12,7 @@ terms: All of the documentation and software included in the ELWIX and AITNET Releases is copyrighted by ELWIX - Sofia/Bulgaria -Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 +Copyright 2004 - 2014 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -50,7 +50,10 @@ SUCH DAMAGE. #include #include #include +#include +#include #include +#include #include #include #include @@ -66,12 +69,33 @@ SUCH DAMAGE. #include #include #include +#include +#include +#include #ifndef STRSIZ #define STRSIZ 256 #endif +#ifndef NBBY +#define NBBY 8 /* number of bits in a byte */ +#endif + +#ifndef BYTE_ORDER + #ifndef LITTLE_ENDIAN + #define LITTLE_ENDIAN 1234 + #endif /* LITTLE_ENDIAN */ + #ifndef BIG_ENDIAN + #define BIG_ENDIAN 4321 + #endif /* BIG_ENDIAN */ + #ifdef WORDS_BIGENDIAN + #define BYTE_ORDER BIG_ENDIAN + #else /* WORDS_BIGENDIAN */ + #define BYTE_ORDER LITTLE_ENDIAN + #endif /* WORDS_BIGENDIAN */ +#endif /* BYTE_ORDER */ + #ifndef be16toh #define be16toh betoh16 #endif @@ -91,29 +115,77 @@ SUCH DAMAGE. #define le64toh letoh64 #endif -#define E_ALIGN(x, a) (((x) + ((a) - 1)) & ~((a) - 1)) +/* Bit map related macros. */ +#ifndef setbit +#define setbit(a, i) (((unsigned char *)(a))[(i) / NBBY] |= 1 << ((i) % NBBY)) +#endif +#ifndef clrbit +#define clrbit(a, i) (((unsigned char *)(a))[(i) / NBBY] &= ~(1 << ((i) % NBBY))) +#endif +#ifndef isset +#define isset(a, i) (((const unsigned char *)(a))[(i) / NBBY] & (1 << ((i) % NBBY))) +#endif +#ifndef isclr +#define isclr(a, i) ((((const unsigned char *)(a))[(i) / NBBY] & (1 << ((i) % NBBY))) == 0) +#endif +/* Macros for counting and rounding. */ +#ifndef howmany +#define howmany(x, y) (((x) + ((y) - 1)) / (y)) +#endif +#ifndef nitems +#define nitems(x) (sizeof((x)) / sizeof((x)[0])) +#endif +#ifndef rounddown +#define rounddown(x, y) (((x) / (y)) * (y)) +#endif +#ifndef rounddown2 +#define rounddown2(x, y) ((x) & (~((y) - 1))) /* if y is power of two */ +#endif +#ifndef roundup +#define roundup(x, y) ((((x) + ((y) - 1)) / (y)) * (y)) /* to any y */ +#endif +#ifndef roundup2 +#define roundup2(x, y) (((x) + ((y) - 1)) & (~((y) - 1))) /* if y is powers of two */ +#endif +#ifndef powerof2 +#define powerof2(x) ((((x) - 1) & (x)) == 0) +#endif -#define ELWIX_SYSM 0 -#define ELWIX_MPOOL 1 +/* Macros for min/max. */ +#ifndef MIN +#define MIN(a, b) (((a) < (b)) ? (a) : (b)) +#endif +#ifndef MAX +#define MAX(a, b) (((a) > (b)) ? (a) : (b)) +#endif -#define VACUUM_LEFT 1 -#define VACUUM_BETWEEN 2 +#define E_ALIGN(x, a) (((x) + ((a) - 1)) & ~((a) - 1)) +#define ELWIX_SYSM 0 +#define ELWIX_MPOOL 1 + +#define VACUUM_LEFT 1 +#define VACUUM_BETWEEN 2 + + +extern int __isthreaded; + + // elwix_SetProg() Set program memory pool name -inline void elwix_SetProg(const char *csProgName); +void elwix_SetProg(const char *csProgName); // elwix_GetProg() Get program memory pool name -inline const char *elwix_GetProg(); +const char *elwix_GetProg(); // elwix_GetErrno() Get error code of last operation -inline int elwix_GetErrno(); +int elwix_GetErrno(); // elwix_GetError() Get error text of last operation -inline const char *elwix_GetError(); +const char *elwix_GetError(); // elwix_mm_inuse() Check for memory management model -inline int elwix_mm_inuse(); +int elwix_mm_inuse(); /* @@ -123,14 +195,21 @@ inline int elwix_mm_inuse(); * @maxmem = memory limit * return: -1 error or !=-1 used memory management model */ -inline int elwixInit(int mm, unsigned long maxmem); +int elwixInit(int mm, unsigned long maxmem); /* * elwixFini() - Finish libelwix library memory management * * return: none */ -inline void elwixFini(); +void elwixFini(); +/* + * elwix_byteOrder() - Detect platform byte order + * + * return: 1 = little endian or 0 big endian + */ +int elwix_byteOrder(); + /* memory management hooks */ extern void *(*e_malloc)(size_t); extern void *(*e_calloc)(size_t, size_t); @@ -150,10 +229,10 @@ extern int elwix_Verbose; #define EVERBS(x) if ((x) <= elwix_Verbose) #define EVERBOSE(x, fmt, ...) do { assert((fmt)); \ if ((x) <= elwix_Verbose) { \ - char str[BUFSIZ] = { 0 }; \ - snprintf(str, sizeof str, (fmt), ##__VA_ARGS__); \ + char __str[BUFSIZ] = { [0 ... BUFSIZ - 1] = 0 }; \ + snprintf(__str, sizeof __str, (fmt), ##__VA_ARGS__); \ syslog(LOG_DEBUG, "Verbose(%d):%s(%d): %s\n", \ - (x), __func__, __LINE__, str); \ + (x), __func__, __LINE__, __str); \ } \ } while (0) @@ -164,31 +243,31 @@ extern int elwix_Debug; #define ELWIX_DEBUG_LOG 0x2 #define ELWIX_DEBUG_ANY 0xFFFFFFFF -#define ETRACE(x) if (elwix_Debug & ELWIX_DEBUG_TRACE) \ - syslog(LOG_DEBUG, "I'm in %s(%d)", __func__, __LINE__) +#define ETRACE() if (elwix_Debug & ELWIX_DEBUG_TRACE) \ + syslog(LOG_DEBUG, "I'm in %s(%d)\n", __func__, __LINE__) #define EDEBUG(x, fmt, ...) do { assert((fmt)); \ if ((x) & elwix_Debug) { \ - char str[BUFSIZ] = { 0 }; \ - snprintf(str, sizeof str, (fmt), ##__VA_ARGS__); \ + char __str[BUFSIZ] = { [0 ... BUFSIZ - 1] = 0 }; \ + snprintf(__str, sizeof __str, (fmt), ##__VA_ARGS__); \ syslog(LOG_DEBUG, "Debug(%d):%s(%d): %s\n", \ - (x), __func__, __LINE__, str); \ + (x), __func__, __LINE__, __str); \ } \ } while (0) /* Logger macro */ #define ELOGGER(x, fmt, ...) do { assert((fmt)); \ - char str[BUFSIZ] = { 0 }; \ - snprintf(str, sizeof str, (fmt), ##__VA_ARGS__); \ + char __str[BUFSIZ] = { [0 ... BUFSIZ - 1] = 0 }; \ + snprintf(__str, sizeof __str, (fmt), ##__VA_ARGS__); \ syslog((x), "Logger:%s(%d): %s\n", \ - __func__, __LINE__, str); \ + __func__, __LINE__, __str); \ } while (0) /* Error state macros */ #define EERROR(x, fmt, ...) do { assert((fmt)); \ - char str[BUFSIZ] = { 0 }; \ - snprintf(str, sizeof str, (fmt), ##__VA_ARGS__); \ + char __str[BUFSIZ] = { [0 ... BUFSIZ - 1] = 0 }; \ + snprintf(__str, sizeof __str, (fmt), ##__VA_ARGS__); \ syslog(LOG_ERR, "Error:%s(%d): #%d - %s\n", \ - __func__, __LINE__, (x), str); \ + __func__, __LINE__, (x), __str); \ } while (0) #define ESYSERR(x) do { \ if (x > 0 || errno) \