[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.96 by root, Wed Nov 11 03:52:44 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
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
72	// very ugly macro that basicaly declares and initialises a variable	60	// very ugly macro that basically declares and initialises a variable
73	// that is in scope for the next statement only	61	// that is in scope for the next statement only
74	// 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
75	// (note: works great for pointers)	63	// (note: works great for pointers)
76	// most ugly macro I ever wrote	64	// most ugly macro I ever wrote
77	#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)
…		…
91	// 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.
92	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; }
93	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; }
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; }	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; }
95		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
96	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; }
97		89
98	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)); }
99	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)); }
100		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
101	template<typename T>	123	template<typename T>
102	static inline T	124	static inline T
103	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)
104	{	126	{
105	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);
106	}	144	}
107		145
108	// lots of stuff taken from FXT	146	// lots of stuff taken from FXT
109		147
110	/* Rotate right. This is used in various places for checksumming */	148	/* Rotate right. This is used in various places for checksumming */
…		…
148	int32_t d = b - a;	186	int32_t d = b - a;
149	d &= d >> 31;	187	d &= d >> 31;
150	return b - d;	188	return b - d;
151	}	189	}
152		190
153	// this is much faster than crossfires original algorithm	191	// this is much faster than crossfire's original algorithm
154	// on modern cpus	192	// on modern cpus
155	inline int	193	inline int
156	isqrt (int n)	194	isqrt (int n)
157	{	195	{
158	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;
159	}	211	}
160		212
161	// this is only twice as fast as naive sqrtf (dxdy+dydy)	213	// this is only twice as fast as naive sqrtf (dxdy+dydy)
162	#if 0	214	#if 0
163	// 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.
…		…
188	absdir (int d)	240	absdir (int d)
189	{	241	{
190	return ((d - 1) & 7) + 1;	242	return ((d - 1) & 7) + 1;
191	}	243	}
192		244
		245	// avoid ctz name because netbsd or freebsd spams it's namespace with it
		246	#if GCC_VERSION(3,4)
		247	static inline int least_significant_bit (uint32_t x)
		248	{
		249	return __builtin_ctz (x);
		250	}
		251	#else
		252	int least_significant_bit (uint32_t x);
		253	#endif
		254
		255	#define for_all_bits_sparse_32(mask, idxvar) \
		256	for (uint32_t idxvar, mask_ = mask; \
		257	mask_ && ((idxvar = least_significant_bit (mask_)), mask_ &= ~(1 << idxvar), 1);)
		258
193	extern size_t slice_alloc; // statistics	259	extern ssize_t slice_alloc; // statistics
		260
		261	void *salloc_ (int n) throw (std::bad_alloc);
		262	void salloc_ (int n, void src) throw (std::bad_alloc);
		263
		264	// strictly the same as g_slice_alloc, but never returns 0
		265	template<typename T>
		266	inline T salloc (int n = 1) throw (std::bad_alloc) { return (T )salloc_ (n * sizeof (T)); }
		267
		268	// also copies src into the new area, like "memdup"
		269	// if src is 0, clears the memory
		270	template<typename T>
		271	inline T salloc (int n, T src) throw (std::bad_alloc) { return (T )salloc_ (n sizeof (T), (void *)src); }
		272
		273	// clears the memory
		274	template<typename T>
		275	inline T salloc0(int n = 1) throw (std::bad_alloc) { return (T )salloc_ (n * sizeof (T), 0); }
		276
		277	// for symmetry
		278	template<typename T>
		279	inline void sfree (T *ptr, int n = 1) throw ()
		280	{
		281	if (expect_true (ptr))
		282	{
		283	slice_alloc -= n * sizeof (T);
		284	if (DEBUG_POISON) memset (ptr, DEBUG_POISON, n * sizeof (T));
		285	g_slice_free1 (n * sizeof (T), (void *)ptr);
		286	assert (slice_alloc >= 0);//D
		287	}
		288	}
		289
		290	// nulls the pointer
		291	template<typename T>
		292	inline void sfree0 (T *&ptr, int n = 1) throw ()
		293	{
		294	sfree<T> (ptr, n);
		295	ptr = 0;
		296	}
194		297
195	// makes dynamically allocated objects zero-initialised	298	// makes dynamically allocated objects zero-initialised
196	struct zero_initialised	299	struct zero_initialised
197	{	300	{
198	void operator new (size_t s, void p)	301	void operator new (size_t s, void p)
…		…
201	return p;	304	return p;
202	}	305	}
203		306
204	void *operator new (size_t s)	307	void *operator new (size_t s)
205	{	308	{
206	slice_alloc += s;
207	return g_slice_alloc0 (s);	309	return salloc0<char> (s);
208	}	310	}
209		311
210	void *operator new[] (size_t s)	312	void *operator new[] (size_t s)
211	{	313	{
212	slice_alloc += s;
213	return g_slice_alloc0 (s);	314	return salloc0<char> (s);
214	}	315	}
215		316
216	void operator delete (void *p, size_t s)	317	void operator delete (void *p, size_t s)
217	{	318	{
218	slice_alloc -= s;	319	sfree ((char *)p, s);
219	g_slice_free1 (s, p);
220	}	320	}
221		321
222	void operator delete[] (void *p, size_t s)	322	void operator delete[] (void *p, size_t s)
223	{	323	{
224	slice_alloc -= s;	324	sfree ((char *)p, s);
225	g_slice_free1 (s, p);
226	}	325	}
227	};	326	};
228		327
229	void *salloc_ (int n) throw (std::bad_alloc);	328	// makes dynamically allocated objects zero-initialised
230	void salloc_ (int n, void src) throw (std::bad_alloc);	329	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	{	330	{
249	#if PREFER_MALLOC	331	void operator new (size_t s, void p)
250	free (ptr);	332	{
251	#else	333	return p;
252	slice_alloc -= n * sizeof (T);	334	}
253	g_slice_free1 (n * sizeof (T), (void *)ptr);	335
254	#endif	336	void *operator new (size_t s)
255	}	337	{
		338	return salloc<char> (s);
		339	}
		340
		341	void *operator new[] (size_t s)
		342	{
		343	return salloc<char> (s);
		344	}
		345
		346	void operator delete (void *p, size_t s)
		347	{
		348	sfree ((char *)p, s);
		349	}
		350
		351	void operator delete[] (void *p, size_t s)
		352	{
		353	sfree ((char *)p, s);
		354	}
		355	};
256		356
257	// a STL-compatible allocator that uses g_slice	357	// a STL-compatible allocator that uses g_slice
258	// boy, this is verbose	358	// boy, this is verbose
259	template<typename Tp>	359	template<typename Tp>
260	struct slice_allocator	360	struct slice_allocator
…		…
312	// P. L'Ecuyer, “Maximally Equidistributed Combined Tausworthe Generators”, Mathematics of Computation, 65, 213 (1996), 203–213.	412	// 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	413	// http://www.iro.umontreal.ca/~lecuyer/myftp/papers/tausme.ps
314	// http://www.iro.umontreal.ca/~lecuyer/myftp/papers/tausme2.ps	414	// http://www.iro.umontreal.ca/~lecuyer/myftp/papers/tausme2.ps
315	struct tausworthe_random_generator	415	struct tausworthe_random_generator
316	{	416	{
317	// generator
318	uint32_t state [4];	417	uint32_t state [4];
319		418
320	void operator =(const tausworthe_random_generator &src)	419	void operator =(const tausworthe_random_generator &src)
321	{	420	{
322	state [0] = src.state [0];	421	state [0] = src.state [0];
…		…
325	state [3] = src.state [3];	424	state [3] = src.state [3];
326	}	425	}
327		426
328	void seed (uint32_t seed);	427	void seed (uint32_t seed);
329	uint32_t next ();	428	uint32_t next ();
		429	};
330		430
331	// uniform distribution	431	// Xorshift RNGs, George Marsaglia
		432	// http://www.jstatsoft.org/v08/i14/paper
		433	// this one is about 40% faster than the tausworthe one above (i.e. not much),
		434	// despite the inlining, and has the issue of only creating 2**32-1 numbers.
		435	// see also http://www.iro.umontreal.ca/~lecuyer/myftp/papers/xorshift.pdf
		436	struct xorshift_random_generator
		437	{
		438	uint32_t x, y;
		439
		440	void operator =(const xorshift_random_generator &src)
		441	{
		442	x = src.x;
		443	y = src.y;
		444	}
		445
		446	void seed (uint32_t seed)
		447	{
		448	x = seed;
		449	y = seed * 69069U;
		450	}
		451
		452	uint32_t next ()
		453	{
		454	uint32_t t = x ^ (x << 10);
		455	x = y;
		456	y = y ^ (y >> 13) ^ t ^ (t >> 10);
		457	return y;
		458	}
		459	};
		460
		461	template<class generator>
		462	struct random_number_generator : generator
		463	{
		464	// uniform distribution, 0 .. max (0, num - 1)
332	uint32_t operator ()(uint32_t num)	465	uint32_t operator ()(uint32_t num)
333	{	466	{
334	return is_constant (num)	467	return !is_constant (num) ? get_range (num) // non-constant
335	? (next () * (uint64_t)num) >> 32U	468	: num & (num - 1) ? (this->next () * (uint64_t)num) >> 32U // constant, non-power-of-two
336	: get_range (num);	469	: this->next () & (num - 1); // constant, power-of-two
337	}	470	}
338		471
339	// return a number within (min .. max)	472	// return a number within (min .. max)
340	int operator () (int r_min, int r_max)	473	int operator () (int r_min, int r_max)
341	{	474	{
…		…
352	protected:	485	protected:
353	uint32_t get_range (uint32_t r_max);	486	uint32_t get_range (uint32_t r_max);
354	int get_range (int r_min, int r_max);	487	int get_range (int r_min, int r_max);
355	};	488	};
356		489
357	typedef tausworthe_random_generator rand_gen;	490	typedef random_number_generator<tausworthe_random_generator> rand_gen;
358		491
359	extern rand_gen rndm;	492	extern rand_gen rndm, rmg_rndm;
360		493
361	INTERFACE_CLASS (attachable)	494	INTERFACE_CLASS (attachable)
362	struct refcnt_base	495	struct refcnt_base
363	{	496	{
364	typedef int refcnt_t;	497	typedef int refcnt_t;
…		…
427	typedef refptr<object> object_ptr;	560	typedef refptr<object> object_ptr;
428	typedef refptr<archetype> arch_ptr;	561	typedef refptr<archetype> arch_ptr;
429	typedef refptr<client> client_ptr;	562	typedef refptr<client> client_ptr;
430	typedef refptr<player> player_ptr;	563	typedef refptr<player> player_ptr;
431		564
		565	#define STRHSH_NULL 2166136261
		566
		567	static inline uint32_t
		568	strhsh (const char *s)
		569	{
		570	// use FNV-1a hash (http://isthe.com/chongo/tech/comp/fnv/)
		571	// it is about twice as fast as the one-at-a-time one,
		572	// with good distribution.
		573	// FNV-1a is faster on many cpus because the multiplication
		574	// runs concurrently with the looping logic.
		575	uint32_t hash = STRHSH_NULL;
		576
		577	while (*s)
		578	hash = (hash ^ s++) 16777619;
		579
		580	return hash;
		581	}
		582
		583	static inline uint32_t
		584	memhsh (const char *s, size_t len)
		585	{
		586	uint32_t hash = STRHSH_NULL;
		587
		588	while (len--)
		589	hash = (hash ^ s++) 16777619;
		590
		591	return hash;
		592	}
		593
432	struct str_hash	594	struct str_hash
433	{	595	{
434	std::size_t operator ()(const char *s) const	596	std::size_t operator ()(const char *s) const
435	{	597	{
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;	598	return strhsh (s);
		599	}
		600
		601	std::size_t operator ()(const shstr &s) const
		602	{
		603	return strhsh (s);
455	}	604	}
456	};	605	};
457		606
458	struct str_equal	607	struct str_equal
459	{	608	{
…		…
552	erase (&obj);	701	erase (&obj);
553	}	702	}
554	};	703	};
555		704
556	// basically does what strncpy should do, but appends "..." to strings exceeding length	705	// basically does what strncpy should do, but appends "..." to strings exceeding length
		706	// returns the number of bytes actually used (including \0)
557	void assign (char dst, const char src, int maxlen);	707	int assign (char dst, const char src, int maxsize);
558		708
559	// type-safe version of assign	709	// type-safe version of assign
560	template<int N>	710	template<int N>
561	inline void assign (char (&dst)[N], const char *src)	711	inline int assign (char (&dst)[N], const char *src)
562	{	712	{
563	assign ((char *)&dst, src, N);	713	return assign ((char *)&dst, src, N);
564	}	714	}
565		715
566	typedef double tstamp;	716	typedef double tstamp;
567		717
568	// return current time as timestamp	718	// return current time as timestamp
569	tstamp now ();	719	tstamp now ();
570		720
571	int similar_direction (int a, int b);	721	int similar_direction (int a, int b);
572		722
573	// like sprintf, but returns a "static" buffer	723	// like v?sprintf, but returns a "static" buffer
574	const char format (const char format, ...);	724	char vformat (const char format, va_list ap);
		725	char format (const char format, ...) attribute ((format (printf, 1, 2)));
		726
		727	// safety-check player input which will become object->msg
		728	bool msg_is_safe (const char *msg);
575		729
576	/////////////////////////////////////////////////////////////////////////////	730	/////////////////////////////////////////////////////////////////////////////
577	// threads, very very thin wrappers around pthreads	731	// threads, very very thin wrappers around pthreads
578		732
579	struct thread	733	struct thread
…		…
606	#else	760	#else
607	#define SMUTEX_INITIALISER PTHREAD_MUTEX_INITIALIZER	761	#define SMUTEX_INITIALISER PTHREAD_MUTEX_INITIALIZER
608	#endif	762	#endif
609		763
610	#define SMUTEX(name) smutex name = SMUTEX_INITIALISER	764	#define SMUTEX(name) smutex name = SMUTEX_INITIALISER
611	#define SMUTEX_LOCK(name) pthread_mutex_lock (&(name))	765	#define SMUTEX_LOCK(name) pthread_mutex_lock (&(name))
612	#define SMUTEX_UNLOCK(name) pthread_mutex_unlock (&(name))	766	#define SMUTEX_UNLOCK(name) pthread_mutex_unlock (&(name))
613		767
		768	typedef pthread_cond_t scond;
		769
		770	#define SCOND(name) scond name = PTHREAD_COND_INITIALIZER
		771	#define SCOND_SIGNAL(name) pthread_cond_signal (&(name))
		772	#define SCOND_BROADCAST(name) pthread_cond_broadcast (&(name))
		773	#define SCOND_WAIT(name,mutex) pthread_cond_wait (&(name), &(mutex))
		774
614	#endif	775	#endif
615		776

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.96 by root, Wed Nov 11 03:52:44 2009 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.96 by root, Wed Nov 11 03:52:44 2009 UTC