[ViewVC] Diff of: cvs/deliantra/server/include/util.h

Comparing deliantra/server/include/util.h (file contents):
Revision 1.66 by root, Wed Apr 2 11:13:55 2008 UTC vs.
Revision 1.101 by root, Wed Apr 28 19:49:50 2010 UTC

…		…
1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	*	5	*
6	* Deliantra is free software: you can redistribute it and/or modify	6	* Deliantra is free software: you can redistribute it and/or modify it under
7	* it under the terms of the GNU General Public License as published by	7	* the terms of the Affero GNU General Public License as published by the
8	* the Free Software Foundation, either version 3 of the License, or	8	* Free Software Foundation, either version 3 of the License, or (at your
9	* (at your option) any later version.	9	* option) any later version.
10	*	10	*
11	* This program is distributed in the hope that it will be useful,	11	* This program is distributed in the hope that it will be useful,
12	* but WITHOUT ANY WARRANTY; without even the implied warranty of	12	* but WITHOUT ANY WARRANTY; without even the implied warranty of
13	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	13	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14	* GNU General Public License for more details.	14	* GNU General Public License for more details.
15	*	15	*
16	* You should have received a copy of the GNU General Public License	16	* You should have received a copy of the Affero GNU General Public License
17	* along with this program. If not, see <http://www.gnu.org/licenses/>.	17	* and the GNU General Public License along with this program. If not, see
		18	* <http://www.gnu.org/licenses/>.
18	*	19	*
19	* The authors can be reached via e-mail to <support@deliantra.net>	20	* The authors can be reached via e-mail to <support@deliantra.net>
20	*/	21	*/
21		22
22	#ifndef UTIL_H__	23	#ifndef UTIL_H__
23	#define UTIL_H__	24	#define UTIL_H__
24		25
25	#define DEBUG_SALLOC 0	26	#include <compiler.h>
26	#define PREFER_MALLOC 0
27		27
28	#if __GNUC__ >= 3	28	#define DEBUG_POISON 0x00 // poison memory before freeing it if != 0
29	# define is_constant(c) __builtin_constant_p (c)	29	#define DEBUG_SALLOC 0 // add a debug wrapper around all sallocs
30	# define expect(expr,value) __builtin_expect ((expr),(value))	30	#define PREFER_MALLOC 0 // use malloc and not the slice allocator
31	# define prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)
32	#else
33	# define is_constant(c) 0
34	# define expect(expr,value) (expr)
35	# define prefetch(addr,rw,locality)
36	#endif
37
38	#if __GNUC__ < 4 \|\| (__GNUC__ == 4 \|\| __GNUC_MINOR__ < 4)
39	# define decltype(x) typeof(x)
40	#endif
41
42	// put into ifs if you are very sure that the expression
43	// is mostly true or mosty false. note that these return
44	// booleans, not the expression.
45	#define expect_false(expr) expect ((expr) != 0, 0)
46	#define expect_true(expr) expect ((expr) != 0, 1)
47		31
48	#include <pthread.h>	32	#include <pthread.h>
49		33
50	#include <cstddef>	34	#include <cstddef>
51	#include <cmath>	35	#include <cmath>
62	# define g_slice_alloc(s) debug_slice_alloc(s)	46	# define g_slice_alloc(s) debug_slice_alloc(s)
63	# define g_slice_free1(s,p) debug_slice_free1(s,p)	47	# define g_slice_free1(s,p) debug_slice_free1(s,p)
64	void *g_slice_alloc (unsigned long size);	48	void *g_slice_alloc (unsigned long size);
65	void *g_slice_alloc0 (unsigned long size);	49	void *g_slice_alloc0 (unsigned long size);
66	void g_slice_free1 (unsigned long size, void *ptr);	50	void g_slice_free1 (unsigned long size, void *ptr);
		51	#elif PREFER_MALLOC
		52	# define g_slice_alloc0(s) calloc (1, (s))
		53	# define g_slice_alloc(s) malloc ((s))
		54	# define g_slice_free1(s,p) free ((p))
67	#endif	55	#endif
68		56
69	// use C0X decltype for auto declarations until ISO C++ sanctifies them (if ever)	57	// use C0X decltype for auto declarations until ISO C++ sanctifies them (if ever)
70	#define auto(var,expr) decltype(expr) var = (expr)	58	#define auto(var,expr) decltype(expr) var = (expr)
71		59
		60	// could use the sizeof (arr) /( sizeof (arr [0]) here, but C++ is
		61	// much more obfuscated... :)
		62
		63	template<typename T, int N>
		64	inline int array_length (const T (&arr)[N])
		65	{
		66	return N;
		67	}
		68
72	// very ugly macro that basicaly declares and initialises a variable	69	// very ugly macro that basically declares and initialises a variable
73	// that is in scope for the next statement only	70	// that is in scope for the next statement only
74	// works only for stuff that can be assigned 0 and converts to false	71	// works only for stuff that can be assigned 0 and converts to false
75	// (note: works great for pointers)	72	// (note: works great for pointers)
76	// most ugly macro I ever wrote	73	// most ugly macro I ever wrote
77	#define statementvar(type, name, value) if (type name = 0) { } else if (((name) = (value)), 1)	74	#define statementvar(type, name, value) if (type name = 0) { } else if (((name) = (value)), 1)
…		…
91	// as a is often a constant while b is the variable. it is still a bug, though.	88	// as a is often a constant while b is the variable. it is still a bug, though.
92	template<typename T, typename U> static inline T min (T a, U b) { return (U)a < b ? (U)a : b; }	89	template<typename T, typename U> static inline T min (T a, U b) { return (U)a < b ? (U)a : b; }
93	template<typename T, typename U> static inline T max (T a, U b) { return (U)a > b ? (U)a : b; }	90	template<typename T, typename U> static inline T max (T a, U b) { return (U)a > b ? (U)a : b; }
94	template<typename T, typename U, typename V> static inline T clamp (T v, U a, V b) { return v < (T)a ? (T)a : v >(T)b ? (T)b : v; }	91	template<typename T, typename U, typename V> static inline T clamp (T v, U a, V b) { return v < (T)a ? (T)a : v >(T)b ? (T)b : v; }
95		92
		93	template<typename T, typename U> static inline void min_it (T &v, U m) { v = min (v, (T)m); }
		94	template<typename T, typename U> static inline void max_it (T &v, U m) { v = max (v, (T)m); }
		95	template<typename T, typename U, typename V> static inline void clamp_it (T &v, U a, V b) { v = clamp (v, (T)a, (T)b); }
		96
96	template<typename T, typename U> static inline void swap (T& a, U& b) { T t=a; a=(T)b; b=(U)t; }	97	template<typename T, typename U> static inline void swap (T& a, U& b) { T t=a; a=(T)b; b=(U)t; }
97		98
98	template<typename T, typename U, typename V> static inline T min (T a, U b, V c) { return min (a, min (b, c)); }	99	template<typename T, typename U, typename V> static inline T min (T a, U b, V c) { return min (a, min (b, c)); }
99	template<typename T, typename U, typename V> static inline T max (T a, U b, V c) { return max (a, max (b, c)); }	100	template<typename T, typename U, typename V> static inline T max (T a, U b, V c) { return max (a, max (b, c)); }
100		101
		102	// sign returns -1 or +1
		103	template<typename T>
		104	static inline T sign (T v) { return v < 0 ? -1 : +1; }
		105	// relies on 2c representation
		106	template<>
		107	inline sint8 sign (sint8 v) { return 1 - (sint8 (uint8 (v) >> 7) * 2); }
		108
		109	// sign0 returns -1, 0 or +1
		110	template<typename T>
		111	static inline T sign0 (T v) { return v ? sign (v) : 0; }
		112
		113	template<typename T, typename U>
		114	static inline T copysign (T a, U b) { return a > 0 ? b : -b; }
		115
		116	// div* only work correctly for div > 0
		117	// div, with correct rounding (< 0.5 downwards, >=0.5 upwards)
		118	template<typename T> static inline T div (T val, T div)
		119	{
		120	return expect_false (val < 0) ? - ((-val + (div - 1) / 2) / div) : (val + div / 2) / div;
		121	}
		122	// div, round-up
		123	template<typename T> static inline T div_ru (T val, T div)
		124	{
		125	return expect_false (val < 0) ? - ((-val ) / div) : (val + div - 1) / div;
		126	}
		127	// div, round-down
		128	template<typename T> static inline T div_rd (T val, T div)
		129	{
		130	return expect_false (val < 0) ? - ((-val + (div - 1) ) / div) : (val ) / div;
		131	}
		132
		133	// lerp* only work correctly for min_in < max_in
		134	// Linear intERPolate, scales val from min_in..max_in to min_out..max_out
101	template<typename T>	135	template<typename T>
102	static inline T	136	static inline T
103	lerp (T val, T min_in, T max_in, T min_out, T max_out)	137	lerp (T val, T min_in, T max_in, T min_out, T max_out)
104	{	138	{
105	return (val - min_in) * (max_out - min_out) / (max_in - min_in) + min_out;	139	return min_out + div <T> ((val - min_in) * (max_out - min_out), max_in - min_in);
		140	}
		141
		142	// lerp, round-down
		143	template<typename T>
		144	static inline T
		145	lerp_rd (T val, T min_in, T max_in, T min_out, T max_out)
		146	{
		147	return min_out + div_rd<T> ((val - min_in) * (max_out - min_out), max_in - min_in);
		148	}
		149
		150	// lerp, round-up
		151	template<typename T>
		152	static inline T
		153	lerp_ru (T val, T min_in, T max_in, T min_out, T max_out)
		154	{
		155	return min_out + div_ru<T> ((val - min_in) * (max_out - min_out), max_in - min_in);
106	}	156	}
107		157
108	// lots of stuff taken from FXT	158	// lots of stuff taken from FXT
109		159
110	/* Rotate right. This is used in various places for checksumming */	160	/* Rotate right. This is used in various places for checksumming */
…		…
148	int32_t d = b - a;	198	int32_t d = b - a;
149	d &= d >> 31;	199	d &= d >> 31;
150	return b - d;	200	return b - d;
151	}	201	}
152		202
153	// this is much faster than crossfires original algorithm	203	// this is much faster than crossfire's original algorithm
154	// on modern cpus	204	// on modern cpus
155	inline int	205	inline int
156	isqrt (int n)	206	isqrt (int n)
157	{	207	{
158	return (int)sqrtf ((float)n);	208	return (int)sqrtf ((float)n);
		209	}
		210
		211	// this is kind of like the ^^ operator, if it would exist, without sequence point.
		212	// more handy than it looks like, due to the implicit !! done on its arguments
		213	inline bool
		214	logical_xor (bool a, bool b)
		215	{
		216	return a != b;
		217	}
		218
		219	inline bool
		220	logical_implies (bool a, bool b)
		221	{
		222	return a <= b;
159	}	223	}
160		224
161	// this is only twice as fast as naive sqrtf (dxdy+dydy)	225	// this is only twice as fast as naive sqrtf (dxdy+dydy)
162	#if 0	226	#if 0
163	// and has a max. error of 6 in the range -100..+100.	227	// and has a max. error of 6 in the range -100..+100.
…		…
188	absdir (int d)	252	absdir (int d)
189	{	253	{
190	return ((d - 1) & 7) + 1;	254	return ((d - 1) & 7) + 1;
191	}	255	}
192		256
		257	// avoid ctz name because netbsd or freebsd spams it's namespace with it
		258	#if GCC_VERSION(3,4)
		259	static inline int least_significant_bit (uint32_t x)
		260	{
		261	return __builtin_ctz (x);
		262	}
		263	#else
		264	int least_significant_bit (uint32_t x);
		265	#endif
		266
		267	#define for_all_bits_sparse_32(mask, idxvar) \
		268	for (uint32_t idxvar, mask_ = mask; \
		269	mask_ && ((idxvar = least_significant_bit (mask_)), mask_ &= ~(1 << idxvar), 1);)
		270
193	extern size_t slice_alloc; // statistics	271	extern ssize_t slice_alloc; // statistics
		272
		273	void *salloc_ (int n) throw (std::bad_alloc);
		274	void salloc_ (int n, void src) throw (std::bad_alloc);
		275
		276	// strictly the same as g_slice_alloc, but never returns 0
		277	template<typename T>
		278	inline T salloc (int n = 1) throw (std::bad_alloc) { return (T )salloc_ (n * sizeof (T)); }
		279
		280	// also copies src into the new area, like "memdup"
		281	// if src is 0, clears the memory
		282	template<typename T>
		283	inline T salloc (int n, T src) throw (std::bad_alloc) { return (T )salloc_ (n sizeof (T), (void *)src); }
		284
		285	// clears the memory
		286	template<typename T>
		287	inline T salloc0(int n = 1) throw (std::bad_alloc) { return (T )salloc_ (n * sizeof (T), 0); }
		288
		289	// for symmetry
		290	template<typename T>
		291	inline void sfree (T *ptr, int n = 1) throw ()
		292	{
		293	if (expect_true (ptr))
		294	{
		295	slice_alloc -= n * sizeof (T);
		296	if (DEBUG_POISON) memset (ptr, DEBUG_POISON, n * sizeof (T));
		297	g_slice_free1 (n * sizeof (T), (void *)ptr);
		298	assert (slice_alloc >= 0);//D
		299	}
		300	}
		301
		302	// nulls the pointer
		303	template<typename T>
		304	inline void sfree0 (T *&ptr, int n = 1) throw ()
		305	{
		306	sfree<T> (ptr, n);
		307	ptr = 0;
		308	}
194		309
195	// makes dynamically allocated objects zero-initialised	310	// makes dynamically allocated objects zero-initialised
196	struct zero_initialised	311	struct zero_initialised
197	{	312	{
198	void operator new (size_t s, void p)	313	void operator new (size_t s, void p)
…		…
201	return p;	316	return p;
202	}	317	}
203		318
204	void *operator new (size_t s)	319	void *operator new (size_t s)
205	{	320	{
206	slice_alloc += s;
207	return g_slice_alloc0 (s);	321	return salloc0<char> (s);
208	}	322	}
209		323
210	void *operator new[] (size_t s)	324	void *operator new[] (size_t s)
211	{	325	{
212	slice_alloc += s;
213	return g_slice_alloc0 (s);	326	return salloc0<char> (s);
214	}	327	}
215		328
216	void operator delete (void *p, size_t s)	329	void operator delete (void *p, size_t s)
217	{	330	{
218	slice_alloc -= s;	331	sfree ((char *)p, s);
219	g_slice_free1 (s, p);
220	}	332	}
221		333
222	void operator delete[] (void *p, size_t s)	334	void operator delete[] (void *p, size_t s)
223	{	335	{
224	slice_alloc -= s;	336	sfree ((char *)p, s);
225	g_slice_free1 (s, p);
226	}	337	}
227	};	338	};
228		339
229	void *salloc_ (int n) throw (std::bad_alloc);	340	// makes dynamically allocated objects zero-initialised
230	void salloc_ (int n, void src) throw (std::bad_alloc);	341	struct slice_allocated
231
232	// strictly the same as g_slice_alloc, but never returns 0
233	template<typename T>
234	inline T salloc (int n = 1) throw (std::bad_alloc) { return (T )salloc_ (n * sizeof (T)); }
235
236	// also copies src into the new area, like "memdup"
237	// if src is 0, clears the memory
238	template<typename T>
239	inline T salloc (int n, T src) throw (std::bad_alloc) { return (T )salloc_ (n sizeof (T), (void *)src); }
240
241	// clears the memory
242	template<typename T>
243	inline T salloc0(int n = 1) throw (std::bad_alloc) { return (T )salloc_ (n * sizeof (T), 0); }
244
245	// for symmetry
246	template<typename T>
247	inline void sfree (T *ptr, int n = 1) throw ()
248	{	342	{
249	#if PREFER_MALLOC	343	void operator new (size_t s, void p)
250	free (ptr);	344	{
251	#else	345	return p;
252	slice_alloc -= n * sizeof (T);	346	}
253	g_slice_free1 (n * sizeof (T), (void *)ptr);	347
254	#endif	348	void *operator new (size_t s)
255	}	349	{
		350	return salloc<char> (s);
		351	}
		352
		353	void *operator new[] (size_t s)
		354	{
		355	return salloc<char> (s);
		356	}
		357
		358	void operator delete (void *p, size_t s)
		359	{
		360	sfree ((char *)p, s);
		361	}
		362
		363	void operator delete[] (void *p, size_t s)
		364	{
		365	sfree ((char *)p, s);
		366	}
		367	};
256		368
257	// a STL-compatible allocator that uses g_slice	369	// a STL-compatible allocator that uses g_slice
258	// boy, this is verbose	370	// boy, this is verbose
259	template<typename Tp>	371	template<typename Tp>
260	struct slice_allocator	372	struct slice_allocator
…		…
312	// P. L'Ecuyer, “Maximally Equidistributed Combined Tausworthe Generators”, Mathematics of Computation, 65, 213 (1996), 203–213.	424	// P. L'Ecuyer, “Maximally Equidistributed Combined Tausworthe Generators”, Mathematics of Computation, 65, 213 (1996), 203–213.
313	// http://www.iro.umontreal.ca/~lecuyer/myftp/papers/tausme.ps	425	// http://www.iro.umontreal.ca/~lecuyer/myftp/papers/tausme.ps
314	// http://www.iro.umontreal.ca/~lecuyer/myftp/papers/tausme2.ps	426	// http://www.iro.umontreal.ca/~lecuyer/myftp/papers/tausme2.ps
315	struct tausworthe_random_generator	427	struct tausworthe_random_generator
316	{	428	{
317	// generator
318	uint32_t state [4];	429	uint32_t state [4];
319		430
320	void operator =(const tausworthe_random_generator &src)	431	void operator =(const tausworthe_random_generator &src)
321	{	432	{
322	state [0] = src.state [0];	433	state [0] = src.state [0];
…		…
325	state [3] = src.state [3];	436	state [3] = src.state [3];
326	}	437	}
327		438
328	void seed (uint32_t seed);	439	void seed (uint32_t seed);
329	uint32_t next ();	440	uint32_t next ();
		441	};
330		442
331	// uniform distribution	443	// Xorshift RNGs, George Marsaglia
		444	// http://www.jstatsoft.org/v08/i14/paper
		445	// this one is about 40% faster than the tausworthe one above (i.e. not much),
		446	// despite the inlining, and has the issue of only creating 2**32-1 numbers.
		447	// see also http://www.iro.umontreal.ca/~lecuyer/myftp/papers/xorshift.pdf
		448	struct xorshift_random_generator
		449	{
		450	uint32_t x, y;
		451
		452	void operator =(const xorshift_random_generator &src)
		453	{
		454	x = src.x;
		455	y = src.y;
		456	}
		457
		458	void seed (uint32_t seed)
		459	{
		460	x = seed;
		461	y = seed * 69069U;
		462	}
		463
		464	uint32_t next ()
		465	{
		466	uint32_t t = x ^ (x << 10);
		467	x = y;
		468	y = y ^ (y >> 13) ^ t ^ (t >> 10);
		469	return y;
		470	}
		471	};
		472
		473	template<class generator>
		474	struct random_number_generator : generator
		475	{
		476	// uniform distribution, 0 .. max (0, num - 1)
332	uint32_t operator ()(uint32_t num)	477	uint32_t operator ()(uint32_t num)
333	{	478	{
334	return is_constant (num)	479	return !is_constant (num) ? get_range (num) // non-constant
335	? (next () * (uint64_t)num) >> 32U	480	: num & (num - 1) ? (this->next () * (uint64_t)num) >> 32U // constant, non-power-of-two
336	: get_range (num);	481	: this->next () & (num - 1); // constant, power-of-two
337	}	482	}
338		483
339	// return a number within (min .. max)	484	// return a number within the closed interval [min .. max]
340	int operator () (int r_min, int r_max)	485	int operator () (int r_min, int r_max)
341	{	486	{
342	return is_constant (r_min) && is_constant (r_max) && r_min <= r_max	487	return is_constant (r_min) && is_constant (r_max) && r_min <= r_max
343	? r_min + operator ()(r_max - r_min + 1)	488	? r_min + operator ()(r_max - r_min + 1)
344	: get_range (r_min, r_max);	489	: get_range (r_min, r_max);
345	}	490	}
346		491
		492	// return a number within the closed interval [0..1]
347	double operator ()()	493	double operator ()()
348	{	494	{
349	return this->next () / (double)0xFFFFFFFFU;	495	return this->next () / (double)0xFFFFFFFFU;
350	}	496	}
351		497
352	protected:	498	protected:
353	uint32_t get_range (uint32_t r_max);	499	uint32_t get_range (uint32_t r_max);
354	int get_range (int r_min, int r_max);	500	int get_range (int r_min, int r_max);
355	};	501	};
356		502
357	typedef tausworthe_random_generator rand_gen;	503	typedef random_number_generator<tausworthe_random_generator> rand_gen;
358		504
359	extern rand_gen rndm;	505	extern rand_gen rndm, rmg_rndm;
360		506
361	INTERFACE_CLASS (attachable)	507	INTERFACE_CLASS (attachable)
362	struct refcnt_base	508	struct refcnt_base
363	{	509	{
364	typedef int refcnt_t;	510	typedef int refcnt_t;
…		…
427	typedef refptr<object> object_ptr;	573	typedef refptr<object> object_ptr;
428	typedef refptr<archetype> arch_ptr;	574	typedef refptr<archetype> arch_ptr;
429	typedef refptr<client> client_ptr;	575	typedef refptr<client> client_ptr;
430	typedef refptr<player> player_ptr;	576	typedef refptr<player> player_ptr;
431		577
		578	#define STRHSH_NULL 2166136261
		579
		580	static inline uint32_t
		581	strhsh (const char *s)
		582	{
		583	// use FNV-1a hash (http://isthe.com/chongo/tech/comp/fnv/)
		584	// it is about twice as fast as the one-at-a-time one,
		585	// with good distribution.
		586	// FNV-1a is faster on many cpus because the multiplication
		587	// runs concurrently with the looping logic.
		588	uint32_t hash = STRHSH_NULL;
		589
		590	while (*s)
		591	hash = (hash ^ s++) 16777619U;
		592
		593	return hash;
		594	}
		595
		596	static inline uint32_t
		597	memhsh (const char *s, size_t len)
		598	{
		599	uint32_t hash = STRHSH_NULL;
		600
		601	while (len--)
		602	hash = (hash ^ s++) 16777619U;
		603
		604	return hash;
		605	}
		606
432	struct str_hash	607	struct str_hash
433	{	608	{
434	std::size_t operator ()(const char *s) const	609	std::size_t operator ()(const char *s) const
435	{	610	{
436	unsigned long hash = 0;
437
438	/* use the one-at-a-time hash function, which supposedly is
439	* better than the djb2-like one used by perl5.005, but
440	* certainly is better then the bug used here before.
441	* see http://burtleburtle.net/bob/hash/doobs.html
442	*/
443	while (*s)
444	{
445	hash += *s++;
446	hash += hash << 10;
447	hash ^= hash >> 6;
448	}
449
450	hash += hash << 3;
451	hash ^= hash >> 11;
452	hash += hash << 15;
453
454	return hash;	611	return strhsh (s);
		612	}
		613
		614	std::size_t operator ()(const shstr &s) const
		615	{
		616	return strhsh (s);
455	}	617	}
456	};	618	};
457		619
458	struct str_equal	620	struct str_equal
459	{	621	{
…		…
552	erase (&obj);	714	erase (&obj);
553	}	715	}
554	};	716	};
555		717
556	// basically does what strncpy should do, but appends "..." to strings exceeding length	718	// basically does what strncpy should do, but appends "..." to strings exceeding length
		719	// returns the number of bytes actually used (including \0)
557	void assign (char dst, const char src, int maxlen);	720	int assign (char dst, const char src, int maxsize);
558		721
559	// type-safe version of assign	722	// type-safe version of assign
560	template<int N>	723	template<int N>
561	inline void assign (char (&dst)[N], const char *src)	724	inline int assign (char (&dst)[N], const char *src)
562	{	725	{
563	assign ((char *)&dst, src, N);	726	return assign ((char *)&dst, src, N);
564	}	727	}
565		728
566	typedef double tstamp;	729	typedef double tstamp;
567		730
568	// return current time as timestamp	731	// return current time as timestamp
569	tstamp now ();	732	tstamp now ();
570		733
571	int similar_direction (int a, int b);	734	int similar_direction (int a, int b);
572		735
573	// like sprintf, but returns a "static" buffer	736	// like v?sprintf, but returns a "static" buffer
574	const char format (const char format, ...);	737	char vformat (const char format, va_list ap);
		738	char format (const char format, ...) attribute ((format (printf, 1, 2)));
		739
		740	// safety-check player input which will become object->msg
		741	bool msg_is_safe (const char *msg);
575		742
576	/////////////////////////////////////////////////////////////////////////////	743	/////////////////////////////////////////////////////////////////////////////
577	// threads, very very thin wrappers around pthreads	744	// threads, very very thin wrappers around pthreads
578		745
579	struct thread	746	struct thread
…		…
606	#else	773	#else
607	#define SMUTEX_INITIALISER PTHREAD_MUTEX_INITIALIZER	774	#define SMUTEX_INITIALISER PTHREAD_MUTEX_INITIALIZER
608	#endif	775	#endif
609		776
610	#define SMUTEX(name) smutex name = SMUTEX_INITIALISER	777	#define SMUTEX(name) smutex name = SMUTEX_INITIALISER
611	#define SMUTEX_LOCK(name) pthread_mutex_lock (&(name))	778	#define SMUTEX_LOCK(name) pthread_mutex_lock (&(name))
612	#define SMUTEX_UNLOCK(name) pthread_mutex_unlock (&(name))	779	#define SMUTEX_UNLOCK(name) pthread_mutex_unlock (&(name))
613		780
		781	typedef pthread_cond_t scond;
		782
		783	#define SCOND(name) scond name = PTHREAD_COND_INITIALIZER
		784	#define SCOND_SIGNAL(name) pthread_cond_signal (&(name))
		785	#define SCOND_BROADCAST(name) pthread_cond_broadcast (&(name))
		786	#define SCOND_WAIT(name,mutex) pthread_cond_wait (&(name), &(mutex))
		787
614	#endif	788	#endif
615		789

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/include/util.h (file contents): Revision 1.66 by root, Wed Apr 2 11:13:55 2008 UTC vs. Revision 1.101 by root, Wed Apr 28 19:49:50 2010 UTC

Diff Legend

Comparing deliantra/server/include/util.h (file contents):
Revision 1.66 by root, Wed Apr 2 11:13:55 2008 UTC vs.
Revision 1.101 by root, Wed Apr 28 19:49:50 2010 UTC