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

Comparing deliantra/server/include/util.h (file contents):
Revision 1.65 by root, Tue Apr 1 19:50:38 2008 UTC vs.
Revision 1.95 by root, Tue Nov 10 00:01:31 2009 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 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		31
38	#if __GNUC__ < 4 \|\| (__GNUC__ == 4 \|\| __GNUC_MINOR__ < 4)	32	#include <pthread.h>
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		33
48	#include <cstddef>	34	#include <cstddef>
49	#include <cmath>	35	#include <cmath>
50	#include <new>	36	#include <new>
51	#include <vector>	37	#include <vector>
60	# define g_slice_alloc(s) debug_slice_alloc(s)	46	# define g_slice_alloc(s) debug_slice_alloc(s)
61	# define g_slice_free1(s,p) debug_slice_free1(s,p)	47	# define g_slice_free1(s,p) debug_slice_free1(s,p)
62	void *g_slice_alloc (unsigned long size);	48	void *g_slice_alloc (unsigned long size);
63	void *g_slice_alloc0 (unsigned long size);	49	void *g_slice_alloc0 (unsigned long size);
64	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))
65	#endif	55	#endif
66		56
67	// 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)
68	#define auto(var,expr) decltype(expr) var = (expr)	58	#define auto(var,expr) decltype(expr) var = (expr)
69		59
70	// very ugly macro that basicaly declares and initialises a variable	60	// very ugly macro that basically declares and initialises a variable
71	// that is in scope for the next statement only	61	// that is in scope for the next statement only
72	// works only for stuff that can be assigned 0 and converts to false	62	// works only for stuff that can be assigned 0 and converts to false
73	// (note: works great for pointers)	63	// (note: works great for pointers)
74	// most ugly macro I ever wrote	64	// most ugly macro I ever wrote
75	#define statementvar(type, name, value) if (type name = 0) { } else if (((name) = (value)), 1)	65	#define statementvar(type, name, value) if (type name = 0) { } else if (((name) = (value)), 1)
…		…
80		70
81	// in range excluding end	71	// in range excluding end
82	#define IN_RANGE_EXC(val,beg,end) \	72	#define IN_RANGE_EXC(val,beg,end) \
83	((unsigned int)(val) - (unsigned int)(beg) < (unsigned int)(end) - (unsigned int)(beg))	73	((unsigned int)(val) - (unsigned int)(beg) < (unsigned int)(end) - (unsigned int)(beg))
84		74
		75	void cleanup (const char *cause, bool make_core = false);
85	void fork_abort (const char *msg);	76	void fork_abort (const char *msg);
86		77
87	// rationale for using (U) not (T) is to reduce signed/unsigned issues,	78	// rationale for using (U) not (T) is to reduce signed/unsigned issues,
88	// as a is often a constant while b is the variable. it is still a bug, though.	79	// as a is often a constant while b is the variable. it is still a bug, though.
89	template<typename T, typename U> static inline T min (T a, U b) { return (U)a < b ? (U)a : b; }	80	template<typename T, typename U> static inline T min (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; }	81	template<typename T, typename U> static inline T max (T a, U b) { return (U)a > b ? (U)a : b; }
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; }	82	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; }
92		83
		84	template<typename T, typename U> static inline void min_it (T &v, U m) { v = min (v, (T)m); }
		85	template<typename T, typename U> static inline void max_it (T &v, U m) { v = max (v, (T)m); }
		86	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); }
		87
93	template<typename T, typename U> static inline void swap (T& a, U& b) { T t=a; a=(T)b; b=(U)t; }	88	template<typename T, typename U> static inline void swap (T& a, U& b) { T t=a; a=(T)b; b=(U)t; }
94		89
95	template<typename T, typename U, typename V> static inline T min (T a, U b, V c) { return min (a, min (b, c)); }	90	template<typename T, typename U, typename V> static inline T min (T a, U b, V c) { return min (a, min (b, c)); }
96	template<typename T, typename U, typename V> static inline T max (T a, U b, V c) { return max (a, max (b, c)); }	91	template<typename T, typename U, typename V> static inline T max (T a, U b, V c) { return max (a, max (b, c)); }
97		92
		93	// sign returns -1 or +1
		94	template<typename T>
		95	static inline T sign (T v) { return v < 0 ? -1 : +1; }
		96	// relies on 2c representation
		97	template<>
		98	inline sint8 sign (sint8 v) { return 1 - (sint8 (uint8 (v) >> 7) * 2); }
		99
		100	// sign0 returns -1, 0 or +1
		101	template<typename T>
		102	static inline T sign0 (T v) { return v ? sign (v) : 0; }
		103
		104	// div* only work correctly for div > 0
		105	// div, with correct rounding (< 0.5 downwards, >=0.5 upwards)
		106	template<typename T> static inline T div (T val, T div)
		107	{
		108	return expect_false (val < 0) ? - ((-val + (div - 1) / 2) / div) : (val + div / 2) / div;
		109	}
		110	// div, round-up
		111	template<typename T> static inline T div_ru (T val, T div)
		112	{
		113	return expect_false (val < 0) ? - ((-val ) / div) : (val + div - 1) / div;
		114	}
		115	// div, round-down
		116	template<typename T> static inline T div_rd (T val, T div)
		117	{
		118	return expect_false (val < 0) ? - ((-val + (div - 1) ) / div) : (val ) / div;
		119	}
		120
		121	// lerp* only work correctly for min_in < max_in
		122	// Linear intERPolate, scales val from min_in..max_in to min_out..max_out
98	template<typename T>	123	template<typename T>
99	static inline T	124	static inline T
100	lerp (T val, T min_in, T max_in, T min_out, T max_out)	125	lerp (T val, T min_in, T max_in, T min_out, T max_out)
101	{	126	{
102	return (val - min_in) * (max_out - min_out) / (max_in - min_in) + min_out;	127	return min_out + div <T> ((val - min_in) * (max_out - min_out), max_in - min_in);
		128	}
		129
		130	// lerp, round-down
		131	template<typename T>
		132	static inline T
		133	lerp_rd (T val, T min_in, T max_in, T min_out, T max_out)
		134	{
		135	return min_out + div_rd<T> ((val - min_in) * (max_out - min_out), max_in - min_in);
		136	}
		137
		138	// lerp, round-up
		139	template<typename T>
		140	static inline T
		141	lerp_ru (T val, T min_in, T max_in, T min_out, T max_out)
		142	{
		143	return min_out + div_ru<T> ((val - min_in) * (max_out - min_out), max_in - min_in);
103	}	144	}
104		145
105	// lots of stuff taken from FXT	146	// lots of stuff taken from FXT
106		147
107	/* Rotate right. This is used in various places for checksumming */	148	/* Rotate right. This is used in various places for checksumming */
…		…
145	int32_t d = b - a;	186	int32_t d = b - a;
146	d &= d >> 31;	187	d &= d >> 31;
147	return b - d;	188	return b - d;
148	}	189	}
149		190
150	// this is much faster than crossfires original algorithm	191	// this is much faster than crossfire's original algorithm
151	// on modern cpus	192	// on modern cpus
152	inline int	193	inline int
153	isqrt (int n)	194	isqrt (int n)
154	{	195	{
155	return (int)sqrtf ((float)n);	196	return (int)sqrtf ((float)n);
		197	}
		198
		199	// this is kind of like the ^^ operator, if it would exist, without sequence point.
		200	// more handy than it looks like, due to the implicit !! done on its arguments
		201	inline bool
		202	logical_xor (bool a, bool b)
		203	{
		204	return a != b;
		205	}
		206
		207	inline bool
		208	logical_implies (bool a, bool b)
		209	{
		210	return a <= b;
156	}	211	}
157		212
158	// this is only twice as fast as naive sqrtf (dxdy+dydy)	213	// this is only twice as fast as naive sqrtf (dxdy+dydy)
159	#if 0	214	#if 0
160	// and has a max. error of 6 in the range -100..+100.	215	// and has a max. error of 6 in the range -100..+100.
…		…
185	absdir (int d)	240	absdir (int d)
186	{	241	{
187	return ((d - 1) & 7) + 1;	242	return ((d - 1) & 7) + 1;
188	}	243	}
189		244
190	extern size_t slice_alloc; // statistics	245	extern ssize_t slice_alloc; // statistics
		246
		247	void *salloc_ (int n) throw (std::bad_alloc);
		248	void salloc_ (int n, void src) throw (std::bad_alloc);
		249
		250	// strictly the same as g_slice_alloc, but never returns 0
		251	template<typename T>
		252	inline T salloc (int n = 1) throw (std::bad_alloc) { return (T )salloc_ (n * sizeof (T)); }
		253
		254	// also copies src into the new area, like "memdup"
		255	// if src is 0, clears the memory
		256	template<typename T>
		257	inline T salloc (int n, T src) throw (std::bad_alloc) { return (T )salloc_ (n sizeof (T), (void *)src); }
		258
		259	// clears the memory
		260	template<typename T>
		261	inline T salloc0(int n = 1) throw (std::bad_alloc) { return (T )salloc_ (n * sizeof (T), 0); }
		262
		263	// for symmetry
		264	template<typename T>
		265	inline void sfree (T *ptr, int n = 1) throw ()
		266	{
		267	if (expect_true (ptr))
		268	{
		269	slice_alloc -= n * sizeof (T);
		270	if (DEBUG_POISON) memset (ptr, DEBUG_POISON, n * sizeof (T));
		271	g_slice_free1 (n * sizeof (T), (void *)ptr);
		272	assert (slice_alloc >= 0);//D
		273	}
		274	}
		275
		276	// nulls the pointer
		277	template<typename T>
		278	inline void sfree0 (T *&ptr, int n = 1) throw ()
		279	{
		280	sfree<T> (ptr, n);
		281	ptr = 0;
		282	}
191		283
192	// makes dynamically allocated objects zero-initialised	284	// makes dynamically allocated objects zero-initialised
193	struct zero_initialised	285	struct zero_initialised
194	{	286	{
195	void operator new (size_t s, void p)	287	void operator new (size_t s, void p)
…		…
198	return p;	290	return p;
199	}	291	}
200		292
201	void *operator new (size_t s)	293	void *operator new (size_t s)
202	{	294	{
203	slice_alloc += s;
204	return g_slice_alloc0 (s);	295	return salloc0<char> (s);
205	}	296	}
206		297
207	void *operator new[] (size_t s)	298	void *operator new[] (size_t s)
208	{	299	{
209	slice_alloc += s;
210	return g_slice_alloc0 (s);	300	return salloc0<char> (s);
211	}	301	}
212		302
213	void operator delete (void *p, size_t s)	303	void operator delete (void *p, size_t s)
214	{	304	{
215	slice_alloc -= s;	305	sfree ((char *)p, s);
216	g_slice_free1 (s, p);
217	}	306	}
218		307
219	void operator delete[] (void *p, size_t s)	308	void operator delete[] (void *p, size_t s)
220	{	309	{
221	slice_alloc -= s;	310	sfree ((char *)p, s);
222	g_slice_free1 (s, p);
223	}	311	}
224	};	312	};
225		313
226	void *salloc_ (int n) throw (std::bad_alloc);	314	// makes dynamically allocated objects zero-initialised
227	void salloc_ (int n, void src) throw (std::bad_alloc);	315	struct slice_allocated
228
229	// strictly the same as g_slice_alloc, but never returns 0
230	template<typename T>
231	inline T salloc (int n = 1) throw (std::bad_alloc) { return (T )salloc_ (n * sizeof (T)); }
232
233	// also copies src into the new area, like "memdup"
234	// if src is 0, clears the memory
235	template<typename T>
236	inline T salloc (int n, T src) throw (std::bad_alloc) { return (T )salloc_ (n sizeof (T), (void *)src); }
237
238	// clears the memory
239	template<typename T>
240	inline T salloc0(int n = 1) throw (std::bad_alloc) { return (T )salloc_ (n * sizeof (T), 0); }
241
242	// for symmetry
243	template<typename T>
244	inline void sfree (T *ptr, int n = 1) throw ()
245	{	316	{
246	#if PREFER_MALLOC	317	void operator new (size_t s, void p)
247	free (ptr);	318	{
248	#else	319	return p;
249	slice_alloc -= n * sizeof (T);	320	}
250	g_slice_free1 (n * sizeof (T), (void *)ptr);	321
251	#endif	322	void *operator new (size_t s)
252	}	323	{
		324	return salloc<char> (s);
		325	}
		326
		327	void *operator new[] (size_t s)
		328	{
		329	return salloc<char> (s);
		330	}
		331
		332	void operator delete (void *p, size_t s)
		333	{
		334	sfree ((char *)p, s);
		335	}
		336
		337	void operator delete[] (void *p, size_t s)
		338	{
		339	sfree ((char *)p, s);
		340	}
		341	};
253		342
254	// a STL-compatible allocator that uses g_slice	343	// a STL-compatible allocator that uses g_slice
255	// boy, this is verbose	344	// boy, this is verbose
256	template<typename Tp>	345	template<typename Tp>
257	struct slice_allocator	346	struct slice_allocator
…		…
309	// P. L'Ecuyer, “Maximally Equidistributed Combined Tausworthe Generators”, Mathematics of Computation, 65, 213 (1996), 203–213.	398	// P. L'Ecuyer, “Maximally Equidistributed Combined Tausworthe Generators”, Mathematics of Computation, 65, 213 (1996), 203–213.
310	// http://www.iro.umontreal.ca/~lecuyer/myftp/papers/tausme.ps	399	// http://www.iro.umontreal.ca/~lecuyer/myftp/papers/tausme.ps
311	// http://www.iro.umontreal.ca/~lecuyer/myftp/papers/tausme2.ps	400	// http://www.iro.umontreal.ca/~lecuyer/myftp/papers/tausme2.ps
312	struct tausworthe_random_generator	401	struct tausworthe_random_generator
313	{	402	{
314	// generator
315	uint32_t state [4];	403	uint32_t state [4];
316		404
317	void operator =(const tausworthe_random_generator &src)	405	void operator =(const tausworthe_random_generator &src)
318	{	406	{
319	state [0] = src.state [0];	407	state [0] = src.state [0];
…		…
322	state [3] = src.state [3];	410	state [3] = src.state [3];
323	}	411	}
324		412
325	void seed (uint32_t seed);	413	void seed (uint32_t seed);
326	uint32_t next ();	414	uint32_t next ();
		415	};
327		416
328	// uniform distribution	417	// Xorshift RNGs, George Marsaglia
		418	// http://www.jstatsoft.org/v08/i14/paper
		419	// this one is about 40% faster than the tausworthe one above (i.e. not much),
		420	// despite the inlining, and has the issue of only creating 2**32-1 numbers.
		421	// see also http://www.iro.umontreal.ca/~lecuyer/myftp/papers/xorshift.pdf
		422	struct xorshift_random_generator
		423	{
		424	uint32_t x, y;
		425
		426	void operator =(const xorshift_random_generator &src)
		427	{
		428	x = src.x;
		429	y = src.y;
		430	}
		431
		432	void seed (uint32_t seed)
		433	{
		434	x = seed;
		435	y = seed * 69069U;
		436	}
		437
		438	uint32_t next ()
		439	{
		440	uint32_t t = x ^ (x << 10);
		441	x = y;
		442	y = y ^ (y >> 13) ^ t ^ (t >> 10);
		443	return y;
		444	}
		445	};
		446
		447	template<class generator>
		448	struct random_number_generator : generator
		449	{
		450	// uniform distribution, 0 .. max (0, num - 1)
329	uint32_t operator ()(uint32_t num)	451	uint32_t operator ()(uint32_t num)
330	{	452	{
331	return is_constant (num)	453	return !is_constant (num) ? get_range (num) // non-constant
332	? (next () * (uint64_t)num) >> 32U	454	: num & (num - 1) ? (this->next () * (uint64_t)num) >> 32U // constant, non-power-of-two
333	: get_range (num);	455	: this->next () & (num - 1); // constant, power-of-two
334	}	456	}
335		457
336	// return a number within (min .. max)	458	// return a number within (min .. max)
337	int operator () (int r_min, int r_max)	459	int operator () (int r_min, int r_max)
338	{	460	{
…		…
349	protected:	471	protected:
350	uint32_t get_range (uint32_t r_max);	472	uint32_t get_range (uint32_t r_max);
351	int get_range (int r_min, int r_max);	473	int get_range (int r_min, int r_max);
352	};	474	};
353		475
354	typedef tausworthe_random_generator rand_gen;	476	typedef random_number_generator<tausworthe_random_generator> rand_gen;
355		477
356	extern rand_gen rndm;	478	extern rand_gen rndm, rmg_rndm;
357		479
358	INTERFACE_CLASS (attachable)	480	INTERFACE_CLASS (attachable)
359	struct refcnt_base	481	struct refcnt_base
360	{	482	{
361	typedef int refcnt_t;	483	typedef int refcnt_t;
…		…
424	typedef refptr<object> object_ptr;	546	typedef refptr<object> object_ptr;
425	typedef refptr<archetype> arch_ptr;	547	typedef refptr<archetype> arch_ptr;
426	typedef refptr<client> client_ptr;	548	typedef refptr<client> client_ptr;
427	typedef refptr<player> player_ptr;	549	typedef refptr<player> player_ptr;
428		550
		551	#define STRHSH_NULL 2166136261
		552
		553	static inline uint32_t
		554	strhsh (const char *s)
		555	{
		556	// use FNV-1a hash (http://isthe.com/chongo/tech/comp/fnv/)
		557	// it is about twice as fast as the one-at-a-time one,
		558	// with good distribution.
		559	// FNV-1a is faster on many cpus because the multiplication
		560	// runs concurrently with the looping logic.
		561	uint32_t hash = STRHSH_NULL;
		562
		563	while (*s)
		564	hash = (hash ^ s++) 16777619;
		565
		566	return hash;
		567	}
		568
		569	static inline uint32_t
		570	memhsh (const char *s, size_t len)
		571	{
		572	uint32_t hash = STRHSH_NULL;
		573
		574	while (len--)
		575	hash = (hash ^ s++) 16777619;
		576
		577	return hash;
		578	}
		579
429	struct str_hash	580	struct str_hash
430	{	581	{
431	std::size_t operator ()(const char *s) const	582	std::size_t operator ()(const char *s) const
432	{	583	{
433	unsigned long hash = 0;
434
435	/* use the one-at-a-time hash function, which supposedly is
436	* better than the djb2-like one used by perl5.005, but
437	* certainly is better then the bug used here before.
438	* see http://burtleburtle.net/bob/hash/doobs.html
439	*/
440	while (*s)
441	{
442	hash += *s++;
443	hash += hash << 10;
444	hash ^= hash >> 6;
445	}
446
447	hash += hash << 3;
448	hash ^= hash >> 11;
449	hash += hash << 15;
450
451	return hash;	584	return strhsh (s);
		585	}
		586
		587	std::size_t operator ()(const shstr &s) const
		588	{
		589	return strhsh (s);
452	}	590	}
453	};	591	};
454		592
455	struct str_equal	593	struct str_equal
456	{	594	{
…		…
549	erase (&obj);	687	erase (&obj);
550	}	688	}
551	};	689	};
552		690
553	// basically does what strncpy should do, but appends "..." to strings exceeding length	691	// basically does what strncpy should do, but appends "..." to strings exceeding length
		692	// returns the number of bytes actually used (including \0)
554	void assign (char dst, const char src, int maxlen);	693	int assign (char dst, const char src, int maxsize);
555		694
556	// type-safe version of assign	695	// type-safe version of assign
557	template<int N>	696	template<int N>
558	inline void assign (char (&dst)[N], const char *src)	697	inline int assign (char (&dst)[N], const char *src)
559	{	698	{
560	assign ((char *)&dst, src, N);	699	return assign ((char *)&dst, src, N);
561	}	700	}
562		701
563	typedef double tstamp;	702	typedef double tstamp;
564		703
565	// return current time as timestamp	704	// return current time as timestamp
566	tstamp now ();	705	tstamp now ();
567		706
568	int similar_direction (int a, int b);	707	int similar_direction (int a, int b);
569		708
570	// like sprintf, but returns a "static" buffer	709	// like v?sprintf, but returns a "static" buffer
571	const char format (const char format, ...);	710	char vformat (const char format, va_list ap);
		711	char format (const char format, ...) attribute ((format (printf, 1, 2)));
572		712
		713	// safety-check player input which will become object->msg
		714	bool msg_is_safe (const char *msg);
		715
		716	/////////////////////////////////////////////////////////////////////////////
		717	// threads, very very thin wrappers around pthreads
		718
		719	struct thread
		720	{
		721	pthread_t id;
		722
		723	void start (void (start_routine)(void ), void arg = 0);
		724
		725	void cancel ()
		726	{
		727	pthread_cancel (id);
		728	}
		729
		730	void *join ()
		731	{
		732	void *ret;
		733
		734	if (pthread_join (id, &ret))
		735	cleanup ("pthread_join failed", 1);
		736
		737	return ret;
		738	}
		739	};
		740
		741	// note that mutexes are not classes
		742	typedef pthread_mutex_t smutex;
		743
		744	#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
		745	#define SMUTEX_INITIALISER PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
		746	#else
		747	#define SMUTEX_INITIALISER PTHREAD_MUTEX_INITIALIZER
573	#endif	748	#endif
574		749
		750	#define SMUTEX(name) smutex name = SMUTEX_INITIALISER
		751	#define SMUTEX_LOCK(name) pthread_mutex_lock (&(name))
		752	#define SMUTEX_UNLOCK(name) pthread_mutex_unlock (&(name))
		753
		754	typedef pthread_cond_t scond;
		755
		756	#define SCOND(name) scond name = PTHREAD_COND_INITIALIZER
		757	#define SCOND_SIGNAL(name) pthread_cond_signal (&(name))
		758	#define SCOND_BROADCAST(name) pthread_cond_broadcast (&(name))
		759	#define SCOND_WAIT(name,mutex) pthread_cond_wait (&(name), &(mutex))
		760
		761	#endif
		762

Diff Legend

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

Comparing deliantra/server/include/util.h (file contents): Revision 1.65 by root, Tue Apr 1 19:50:38 2008 UTC vs. Revision 1.95 by root, Tue Nov 10 00:01:31 2009 UTC

Diff Legend

Comparing deliantra/server/include/util.h (file contents):
Revision 1.65 by root, Tue Apr 1 19:50:38 2008 UTC vs.
Revision 1.95 by root, Tue Nov 10 00:01:31 2009 UTC