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.61 by root, Fri Jan 25 18:09:23 2008 UTC vs.
Revision 1.65 by root, Tue Apr 1 19:50:38 2008 UTC

… …
20 */ 20 */
21 21
22#ifndef UTIL_H__ 22#ifndef UTIL_H__
23#define UTIL_H__ 23#define UTIL_H__
24 24
25#define DEBUG_SALLOC 0
25//#define PREFER_MALLOC 26#define PREFER_MALLOC 0
26//#define DEBUG_SALLOC
27 27
28#if __GNUC__ >= 3 28#if __GNUC__ >= 3
29# define is_constant(c) __builtin_constant_p (c) 29# define is_constant(c) __builtin_constant_p (c)
30# define expect(expr,value) __builtin_expect ((expr),(value)) 30# define expect(expr,value) __builtin_expect ((expr),(value))
31# define prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality) 31# define prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)
… …
53#include <glib.h> 53#include <glib.h>
54 54
55#include <shstr.h> 55#include <shstr.h>
56#include <traits.h> 56#include <traits.h>
57 57
58#ifdef DEBUG_SALLOC 58#if DEBUG_SALLOC
59# define g_slice_alloc0(s) debug_slice_alloc0(s) 59# define g_slice_alloc0(s) debug_slice_alloc0(s)
60# define g_slice_alloc(s) debug_slice_alloc(s) 60# define g_slice_alloc(s) debug_slice_alloc(s)
61# define g_slice_free1(s,p) debug_slice_free1(s,p) 61# define g_slice_free1(s,p) debug_slice_free1(s,p)
62void *g_slice_alloc (unsigned long size); 62void *g_slice_alloc (unsigned long size);
63void *g_slice_alloc0 (unsigned long size); 63void *g_slice_alloc0 (unsigned long size);
… …
89template<typename T, typename U> static inline T min (T a, U b) { return (U)a < b ? (U)a : b; } 89template<typename T, typename U> static inline T min (T a, U b) { return (U)a < b ? (U)a : b; }
90template<typename T, typename U> static inline T max (T a, U b) { return (U)a > b ? (U)a : b; } 90template<typename T, typename U> static inline T max (T a, U b) { return (U)a > b ? (U)a : b; }
91template<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; } 91template<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 92
93template<typename T, typename U> static inline void swap (T& a, U& b) { T t=a; a=(T)b; b=(U)t; } 93template<typename T, typename U> static inline void swap (T& a, U& b) { T t=a; a=(T)b; b=(U)t; }
94
95template<typename T, typename U, typename V> static inline T min (T a, U b, V c) { return min (a, min (b, c)); }
96template<typename T, typename U, typename V> static inline T max (T a, U b, V c) { return max (a, max (b, c)); }
94 97
95template<typename T> 98template<typename T>
96static inline T 99static inline T
97lerp (T val, T min_in, T max_in, T min_out, T max_out) 100lerp (T val, T min_in, T max_in, T min_out, T max_out)
98{ 101{
… …
238 241
239// for symmetry 242// for symmetry
240template<typename T> 243template<typename T>
241inline void sfree (T *ptr, int n = 1) throw () 244inline void sfree (T *ptr, int n = 1) throw ()
242{ 245{
243#ifdef PREFER_MALLOC 246#if PREFER_MALLOC
244 free (ptr); 247 free (ptr);
245#else 248#else
246 slice_alloc -= n * sizeof (T); 249 slice_alloc -= n * sizeof (T);
247 g_slice_free1 (n * sizeof (T), (void *)ptr); 250 g_slice_free1 (n * sizeof (T), (void *)ptr);
248#endif 251#endif
… …
266 { 269 {
267 typedef slice_allocator<U> other; 270 typedef slice_allocator<U> other;
268 }; 271 };
269 272
270 slice_allocator () throw () { } 273 slice_allocator () throw () { }
271 slice_allocator (const slice_allocator &o) throw () { } 274 slice_allocator (const slice_allocator &) throw () { }
272 template<typename Tp2> 275 template<typename Tp2>
273 slice_allocator (const slice_allocator<Tp2> &) throw () { } 276 slice_allocator (const slice_allocator<Tp2> &) throw () { }
274 277
275 ~slice_allocator () { } 278 ~slice_allocator () { }
276 279
… …
285 void deallocate (pointer p, size_type n) 288 void deallocate (pointer p, size_type n)
286 { 289 {
287 sfree<Tp> (p, n); 290 sfree<Tp> (p, n);
288 } 291 }
289 292
290 size_type max_size ()const throw () 293 size_type max_size () const throw ()
291 { 294 {
292 return size_t (-1) / sizeof (Tp); 295 return size_t (-1) / sizeof (Tp);
293 } 296 }
294 297
295 void construct (pointer p, const Tp &val) 298 void construct (pointer p, const Tp &val)

Diff Legend

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