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.14 by root, Thu Sep 14 18:13:02 2006 UTC vs.
Revision 1.25 by root, Sat Dec 30 10:16:10 2006 UTC

… …
6#else 6#else
7# define is_constant(c) 0 7# define is_constant(c) 0
8#endif 8#endif
9 9
10#include <cstddef> 10#include <cstddef>
11#include <new>
12#include <vector>
11 13
12#include <glib.h> 14#include <glib.h>
15
16#include <shstr.h>
17#include <traits.h>
13 18
14// use a gcc extension for auto declarations until ISO C++ sanctifies them 19// use a gcc extension for auto declarations until ISO C++ sanctifies them
15#define AUTODECL(var,expr) typeof(expr) var = (expr) 20#define AUTODECL(var,expr) typeof(expr) var = (expr)
16 21
17// makes dynamically allocated objects zero-initialised 22// makes dynamically allocated objects zero-initialised
… …
42 { 47 {
43 g_slice_free1 (s, p); 48 g_slice_free1 (s, p);
44 } 49 }
45}; 50};
46 51
52void *salloc_ (int n) throw (std::bad_alloc);
53void *salloc_ (int n, void *src) throw (std::bad_alloc);
54
47// strictly the same as g_slice_alloc, but never returns 0 55// strictly the same as g_slice_alloc, but never returns 0
48void *alloc (int s) throw (std::bad_alloc); 56template<typename T>
57inline T *salloc (int n = 1) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T)); }
58
59// also copies src into the new area, like "memdup"
60// if src is 0, clears the memory
61template<typename T>
62inline T *salloc (int n, T *src) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T), (void *)src); }
63
64// clears the memory
65template<typename T>
66inline T *salloc0(int n = 1) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T), 0); }
67
49// for symmetry 68// for symmetry
50inline void dealloc (void *p, int s) throw () 69template<typename T>
70inline void sfree (T *ptr, int n = 1) throw ()
51{ 71{
52 g_slice_free1 (s, p); 72 g_slice_free1 (n * sizeof (T), (void *)ptr);
53} 73}
54 74
55// a STL-compatible allocator that uses g_slice 75// a STL-compatible allocator that uses g_slice
56// boy, this is verbose 76// boy, this is verbose
57template<typename Tp> 77template<typename Tp>
… …
81 pointer address (reference x) const { return &x; } 101 pointer address (reference x) const { return &x; }
82 const_pointer address (const_reference x) const { return &x; } 102 const_pointer address (const_reference x) const { return &x; }
83 103
84 pointer allocate (size_type n, const_pointer = 0) 104 pointer allocate (size_type n, const_pointer = 0)
85 { 105 {
86 return static_cast<pointer>(alloc (n * sizeof (Tp))); 106 return salloc<Tp> (n);
87 } 107 }
88 108
89 void deallocate (pointer p, size_type n) 109 void deallocate (pointer p, size_type n)
90 { 110 {
91 dealloc (static_cast<void *>(p), n * sizeof (Tp)); 111 sfree<Tp> (p, n);
92 } 112 }
93 113
94 size_type max_size ()const throw () 114 size_type max_size ()const throw ()
95 { 115 {
96 return size_t (-1) / sizeof (Tp); 116 return size_t (-1) / sizeof (Tp);
… …
103 123
104 void destroy (pointer p) 124 void destroy (pointer p)
105 { 125 {
106 p->~Tp (); 126 p->~Tp ();
107 } 127 }
108};
109
110struct refcounted
111{
112 mutable int refcnt;
113 refcounted () : refcnt (0) { }
114 void refcnt_inc () { ++refcnt; }
115 void refcnt_dec () { --refcnt;
116 if (refcnt < 0)abort();}//D
117}; 128};
118 129
119template<class T> 130template<class T>
120struct refptr 131struct refptr
121{ 132{
… …
144 T &operator * () const { return *p; } 155 T &operator * () const { return *p; }
145 T *operator ->() const { return p; } 156 T *operator ->() const { return p; }
146 157
147 operator T *() const { return p; } 158 operator T *() const { return p; }
148}; 159};
160
161typedef refptr<maptile> maptile_ptr;
162typedef refptr<object> object_ptr;
163typedef refptr<archetype> arch_ptr;
164typedef refptr<client> client_ptr;
165typedef refptr<player> player_ptr;
149 166
150struct str_hash 167struct str_hash
151{ 168{
152 std::size_t operator ()(const char *s) const 169 std::size_t operator ()(const char *s) const
153 { 170 {
… …
179 { 196 {
180 return !strcmp (a, b); 197 return !strcmp (a, b);
181 } 198 }
182}; 199};
183 200
184#include <vector>
185
186template<class obj> 201template<class obj>
187struct unordered_vector : std::vector<obj, slice_allocator<obj> > 202struct unordered_vector : std::vector<obj, slice_allocator<obj> >
188{ 203{
189 typedef typename unordered_vector::iterator iterator; 204 typedef typename unordered_vector::iterator iterator;
190 205
… …
216inline void assign (char (&dst)[N], const char *src) 231inline void assign (char (&dst)[N], const char *src)
217{ 232{
218 assign ((char *)&dst, src, N); 233 assign ((char *)&dst, src, N);
219} 234}
220 235
236typedef double tstamp;
237
238// return current time as timestampe
239tstamp now ();
240
241int similar_direction (int a, int b);
242
221#endif 243#endif
222 244

Diff Legend

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