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.56 by root, Sun Sep 9 06:25:46 2007 UTC vs.
Revision 1.57 by root, Tue Oct 16 05:34:24 2007 UTC

172absdir (int d) 172absdir (int d)
173{ 173{
174 return ((d - 1) & 7) + 1; 174 return ((d - 1) & 7) + 1;
175} 175}
176 176
177extern size_t slice_alloc; // statistics
178
177// makes dynamically allocated objects zero-initialised 179// makes dynamically allocated objects zero-initialised
178struct zero_initialised 180struct zero_initialised
179{ 181{
180 void *operator new (size_t s, void *p) 182 void *operator new (size_t s, void *p)
181 { 183 {
183 return p; 185 return p;
184 } 186 }
185 187
186 void *operator new (size_t s) 188 void *operator new (size_t s)
187 { 189 {
190 slice_alloc += s;
188 return g_slice_alloc0 (s); 191 return g_slice_alloc0 (s);
189 } 192 }
190 193
191 void *operator new[] (size_t s) 194 void *operator new[] (size_t s)
192 { 195 {
196 slice_alloc += s;
193 return g_slice_alloc0 (s); 197 return g_slice_alloc0 (s);
194 } 198 }
195 199
196 void operator delete (void *p, size_t s) 200 void operator delete (void *p, size_t s)
197 { 201 {
202 slice_alloc -= s;
198 g_slice_free1 (s, p); 203 g_slice_free1 (s, p);
199 } 204 }
200 205
201 void operator delete[] (void *p, size_t s) 206 void operator delete[] (void *p, size_t s)
202 { 207 {
208 slice_alloc -= s;
203 g_slice_free1 (s, p); 209 g_slice_free1 (s, p);
204 } 210 }
205}; 211};
206 212
207void *salloc_ (int n) throw (std::bad_alloc); 213void *salloc_ (int n) throw (std::bad_alloc);
225inline void sfree (T *ptr, int n = 1) throw () 231inline void sfree (T *ptr, int n = 1) throw ()
226{ 232{
227#ifdef PREFER_MALLOC 233#ifdef PREFER_MALLOC
228 free (ptr); 234 free (ptr);
229#else 235#else
236 slice_alloc -= n * sizeof (T);
230 g_slice_free1 (n * sizeof (T), (void *)ptr); 237 g_slice_free1 (n * sizeof (T), (void *)ptr);
231#endif 238#endif
232} 239}
233 240
234// a STL-compatible allocator that uses g_slice 241// a STL-compatible allocator that uses g_slice

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines