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.15 by root, Sat Sep 16 13:11:20 2006 UTC vs.
Revision 1.17 by root, Sat Dec 16 03:08:26 2006 UTC

43 g_slice_free1 (s, p); 43 g_slice_free1 (s, p);
44 } 44 }
45}; 45};
46 46
47// strictly the same as g_slice_alloc, but never returns 0 47// strictly the same as g_slice_alloc, but never returns 0
48void *alloc (int s) throw (std::bad_alloc); 48void *salloc (int size) throw (std::bad_alloc);
49// also copies src into the new area, like "memdup"
50void *salloc (int size, void *src) throw (std::bad_alloc);
49// for symmetry 51// for symmetry
50inline void dealloc (void *p, int s) throw () 52inline void sfree (void *ptr, int size) throw ()
51{ 53{
52 g_slice_free1 (s, p); 54 g_slice_free1 (size, ptr);
53} 55}
54 56
55// a STL-compatible allocator that uses g_slice 57// a STL-compatible allocator that uses g_slice
56// boy, this is verbose 58// boy, this is verbose
57template<typename Tp> 59template<typename Tp>
81 pointer address (reference x) const { return &x; } 83 pointer address (reference x) const { return &x; }
82 const_pointer address (const_reference x) const { return &x; } 84 const_pointer address (const_reference x) const { return &x; }
83 85
84 pointer allocate (size_type n, const_pointer = 0) 86 pointer allocate (size_type n, const_pointer = 0)
85 { 87 {
86 return static_cast<pointer>(alloc (n * sizeof (Tp))); 88 return static_cast<pointer>(salloc (n * sizeof (Tp)));
87 } 89 }
88 90
89 void deallocate (pointer p, size_type n) 91 void deallocate (pointer p, size_type n)
90 { 92 {
91 dealloc (static_cast<void *>(p), n * sizeof (Tp)); 93 sfree (static_cast<void *>(p), n * sizeof (Tp));
92 } 94 }
93 95
94 size_type max_size ()const throw () 96 size_type max_size ()const throw ()
95 { 97 {
96 return size_t (-1) / sizeof (Tp); 98 return size_t (-1) / sizeof (Tp);
107 } 109 }
108}; 110};
109 111
110struct refcounted 112struct refcounted
111{ 113{
112 mutable int refcnt;
113 refcounted () : refcnt (0) { } 114 refcounted () : refcnt (0) { }
115// virtual ~refcounted ();
114 void refcnt_inc () { ++refcnt; } 116 void refcnt_inc () { ++refcnt; }
115 void refcnt_dec () { --refcnt; } 117 void refcnt_dec () { --refcnt; }
118 bool dead () { return refcnt == 0; }
119 mutable int refcnt;
120#if 0
121private:
122 static refcounted *rc_first;
123 refcounted *rc_next;
124#endif
116}; 125};
117 126
118template<class T> 127template<class T>
119struct refptr 128struct refptr
120{ 129{
215inline void assign (char (&dst)[N], const char *src) 224inline void assign (char (&dst)[N], const char *src)
216{ 225{
217 assign ((char *)&dst, src, N); 226 assign ((char *)&dst, src, N);
218} 227}
219 228
229typedef double tstamp;
230
231// return current time as timestampe
232tstamp now ();
233
220#endif 234#endif
221 235

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines