Commit 519f3839 authored by Poul-Henning Kamp's avatar Poul-Henning Kamp

Don't have two copies of the param->bitmap magic

parent 75f057cf
......@@ -1062,19 +1062,8 @@ Tlen(const txt t)
*/
#define W_TIM_real(w) ((w)->lastused = VTIM_real())
static inline int
FEATURE(enum feature_bits x)
{
return (cache_param->feature_bits[(unsigned)x>>3] &
(0x80U >> ((unsigned)x & 7)));
}
static inline int
DO_DEBUG(enum debug_bits x)
{
return (cache_param->debug_bits[(unsigned)x>>3] &
(0x80U >> ((unsigned)x & 7)));
}
#define FEATURE(x) COM_FEATURE(cache_param->feature_bits, x)
#define DO_DEBUG(x) COM_DO_DEBUG(cache_param->debug_bits, x)
#define DSL(debug_bit, id, ...) \
do { \
......
......@@ -44,12 +44,25 @@ enum debug_bits {
DBG_Reserved
};
static inline int
COM_DO_DEBUG(uint8_t volatile *p, enum debug_bits x)
{
return (p[(unsigned)x>>3] & (0x80U >> ((unsigned)x & 7)));
}
enum feature_bits {
#define FEATURE_BIT(U, l, d, ld) FEATURE_##U,
#include "tbl/feature_bits.h"
FEATURE_Reserved
};
static inline int
COM_FEATURE(uint8_t volatile *p, enum feature_bits x)
{
return (p[(unsigned)x>>3] & (0x80U >> ((unsigned)x & 7)));
}
struct poolparam {
unsigned min_pool;
unsigned max_pool;
......
......@@ -226,16 +226,5 @@ extern unsigned mgt_vcc_unsafe_path;
#error "Keep pthreads out of in manager process"
#endif
static inline int
MGT_FEATURE(enum feature_bits x)
{
return (mgt_param.feature_bits[(unsigned)x>>3] &
(0x80U >> ((unsigned)x & 7)));
}
static inline int
MGT_DO_DEBUG(enum debug_bits x)
{
return (mgt_param.debug_bits[(unsigned)x>>3] &
(0x80U >> ((unsigned)x & 7)));
}
#define MGT_FEATURE(x) COM_FEATURE(mgt_param.feature_bits, x)
#define MGT_DO_DEBUG(x) COM_DO_DEBUG(mgt_param.feature_bits, x)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment