--- deliantra/server/include/util.h 2018/11/14 22:52:13 1.125 +++ deliantra/server/include/util.h 2018/12/01 20:22:13 1.129 @@ -1,6 +1,7 @@ /* * This file is part of Deliantra, the Roguelike Realtime MMORPG. * + * Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team * * Deliantra is free software: you can redistribute it and/or modify it under @@ -38,6 +39,8 @@ #include +#include + #include #include @@ -54,20 +57,6 @@ # define g_slice_free1(s,p) free ((p)) #endif -// use C0X decltype for auto declarations until ISO C++ sanctifies them (if ever) -#define auto(var,expr) decltype(expr) var = (expr) - -#if cplusplus_does_not_suck /* still sucks in codesize with gcc 6, although local types work now */ -// does not work for local types (http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2657.htm) -template -static inline int array_length (const T (&arr)[N]) -{ - return N; -} -#else -#define array_length(name) (sizeof (name) / sizeof (name [0])) -#endif - // very ugly macro that basically declares and initialises a variable // that is in scope for the next statement only // works only for stuff that can be assigned 0 and converts to false @@ -83,8 +72,8 @@ #define IN_RANGE_EXC(val,beg,end) \ ((unsigned int)(val) - (unsigned int)(beg) < (unsigned int)(end) - (unsigned int)(beg)) -void cleanup (const char *cause, bool make_core = false); -void fork_abort (const char *msg); +ecb_cold void cleanup (const char *cause, bool make_core = false); +ecb_cold void fork_abort (const char *msg); // rationale for using (U) not (T) is to reduce signed/unsigned issues, // as a is often a constant while b is the variable. it is still a bug, though. @@ -285,19 +274,9 @@ return ((d - 1) & 7) + 1; } -// avoid ctz name because netbsd or freebsd spams it's namespace with it -#if GCC_VERSION(3,4) -static inline int least_significant_bit (uint32_t x) -{ - return __builtin_ctz (x); -} -#else -int least_significant_bit (uint32_t x); -#endif - #define for_all_bits_sparse_32(mask, idxvar) \ for (uint32_t idxvar, mask_ = mask; \ - mask_ && ((idxvar = least_significant_bit (mask_)), mask_ &= ~(1 << idxvar), 1);) + mask_ && ((idxvar = ecb_ctz32 (mask_)), mask_ &= ~(1 << idxvar), 1);) extern ssize_t slice_alloc; // statistics @@ -538,7 +517,7 @@ void refcnt_dec () { - if (!is_constant (p)) + if (!ecb_is_constant (p)) --*refcnt_ref (); else if (p) --p->refcnt; @@ -546,7 +525,7 @@ void refcnt_inc () { - if (!is_constant (p)) + if (!ecb_is_constant (p)) ++*refcnt_ref (); else if (p) ++p->refcnt; @@ -628,6 +607,8 @@ { return strhsh (s); } + + typedef ska::power_of_two_hash_policy hash_policy; }; struct str_equal @@ -816,7 +797,7 @@ // like v?sprintf, but returns a "static" buffer char *vformat (const char *format, va_list ap); -char *format (const char *format, ...) attribute ((format (printf, 1, 2))); +char *format (const char *format, ...) ecb_attribute ((format (printf, 1, 2))); // safety-check player input which will become object->msg bool msg_is_safe (const char *msg);