ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/include/util.h
(Generate patch)

Comparing deliantra/server/include/util.h (file contents):
Revision 1.66 by root, Wed Apr 2 11:13:55 2008 UTC vs.
Revision 1.69 by root, Fri Apr 18 23:43:59 2008 UTC

… …
62# define g_slice_alloc(s) debug_slice_alloc(s) 62# define g_slice_alloc(s) debug_slice_alloc(s)
63# define g_slice_free1(s,p) debug_slice_free1(s,p) 63# define g_slice_free1(s,p) debug_slice_free1(s,p)
64void *g_slice_alloc (unsigned long size); 64void *g_slice_alloc (unsigned long size);
65void *g_slice_alloc0 (unsigned long size); 65void *g_slice_alloc0 (unsigned long size);
66void g_slice_free1 (unsigned long size, void *ptr); 66void g_slice_free1 (unsigned long size, void *ptr);
67#elif PREFER_MALLOC
68# define g_slice_alloc0(s) calloc (1, (s))
69# define g_slice_alloc(s) malloc ((s))
70# define g_slice_free1(s,p) free ((p))
67#endif 71#endif
68 72
69// use C0X decltype for auto declarations until ISO C++ sanctifies them (if ever) 73// use C0X decltype for auto declarations until ISO C++ sanctifies them (if ever)
70#define auto(var,expr) decltype(expr) var = (expr) 74#define auto(var,expr) decltype(expr) var = (expr)
71 75
… …
188absdir (int d) 192absdir (int d)
189{ 193{
190 return ((d - 1) & 7) + 1; 194 return ((d - 1) & 7) + 1;
191} 195}
192 196
193extern size_t slice_alloc; // statistics 197extern ssize_t slice_alloc; // statistics
194
195// makes dynamically allocated objects zero-initialised
196struct zero_initialised
197{
198 void *operator new (size_t s, void *p)
199 {
200 memset (p, 0, s);
201 return p;
202 }
203
204 void *operator new (size_t s)
205 {
206 slice_alloc += s;
207 return g_slice_alloc0 (s);
208 }
209
210 void *operator new[] (size_t s)
211 {
212 slice_alloc += s;
213 return g_slice_alloc0 (s);
214 }
215
216 void operator delete (void *p, size_t s)
217 {
218 slice_alloc -= s;
219 g_slice_free1 (s, p);
220 }
221
222 void operator delete[] (void *p, size_t s)
223 {
224 slice_alloc -= s;
225 g_slice_free1 (s, p);
226 }
227};
228 198
229void *salloc_ (int n) throw (std::bad_alloc); 199void *salloc_ (int n) throw (std::bad_alloc);
230void *salloc_ (int n, void *src) throw (std::bad_alloc); 200void *salloc_ (int n, void *src) throw (std::bad_alloc);
231 201
232// strictly the same as g_slice_alloc, but never returns 0 202// strictly the same as g_slice_alloc, but never returns 0
… …
244 214
245// for symmetry 215// for symmetry
246template<typename T> 216template<typename T>
247inline void sfree (T *ptr, int n = 1) throw () 217inline void sfree (T *ptr, int n = 1) throw ()
248{ 218{
249#if PREFER_MALLOC 219 if (expect_true (ptr))
250 free (ptr); 220 {
251#else
252 slice_alloc -= n * sizeof (T); 221 slice_alloc -= n * sizeof (T);
253 g_slice_free1 (n * sizeof (T), (void *)ptr); 222 g_slice_free1 (n * sizeof (T), (void *)ptr);
254#endif 223 assert (slice_alloc >= 0);//D
224 }
255} 225}
226
227// makes dynamically allocated objects zero-initialised
228struct zero_initialised
229{
230 void *operator new (size_t s, void *p)
231 {
232 memset (p, 0, s);
233 return p;
234 }
235
236 void *operator new (size_t s)
237 {
238 return salloc0<char> (s);
239 }
240
241 void *operator new[] (size_t s)
242 {
243 return salloc0<char> (s);
244 }
245
246 void operator delete (void *p, size_t s)
247 {
248 sfree ((char *)p, s);
249 }
250
251 void operator delete[] (void *p, size_t s)
252 {
253 sfree ((char *)p, s);
254 }
255};
256 256
257// a STL-compatible allocator that uses g_slice 257// a STL-compatible allocator that uses g_slice
258// boy, this is verbose 258// boy, this is verbose
259template<typename Tp> 259template<typename Tp>
260struct slice_allocator 260struct slice_allocator
… …
606#else 606#else
607 #define SMUTEX_INITIALISER PTHREAD_MUTEX_INITIALIZER 607 #define SMUTEX_INITIALISER PTHREAD_MUTEX_INITIALIZER
608#endif 608#endif
609 609
610#define SMUTEX(name) smutex name = SMUTEX_INITIALISER 610#define SMUTEX(name) smutex name = SMUTEX_INITIALISER
611#define SMUTEX_LOCK(name) pthread_mutex_lock (&(name)) 611#define SMUTEX_LOCK(name) pthread_mutex_lock (&(name))
612#define SMUTEX_UNLOCK(name) pthread_mutex_unlock (&(name)) 612#define SMUTEX_UNLOCK(name) pthread_mutex_unlock (&(name))
613 613
614typedef pthread_cond_t scond;
615
616#define SCOND(name) scond name = PTHREAD_COND_INITIALIZER
617#define SCOND_SIGNAL(name) pthread_cond_signal (&(name))
618#define SCOND_BROADCAST(name) pthread_cond_broadcast (&(name))
619#define SCOND_WAIT(name,mutex) pthread_cond_wait (&(name), &(mutex))
620
614#endif 621#endif
615 622

Diff Legend

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