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.22 by root, Sat Dec 23 06:21:02 2006 UTC

… …
42 { 42 {
43 g_slice_free1 (s, p); 43 g_slice_free1 (s, p);
44 } 44 }
45}; 45};
46 46
47void *salloc_ (int n) throw (std::bad_alloc);
48void *salloc_ (int n, void *src) throw (std::bad_alloc);
49
47// strictly the same as g_slice_alloc, but never returns 0 50// strictly the same as g_slice_alloc, but never returns 0
48void *alloc (int s) throw (std::bad_alloc); 51template<typename T>
52inline T *salloc (int n = 1) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T)); }
53
54// also copies src into the new area, like "memdup"
55// if src is 0, clears the memory
56template<typename T>
57inline T *salloc (int n, T *src) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T), (void *)src); }
58
59// clears the memory
60template<typename T>
61inline T *salloc0(int n = 1) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T), 0); }
62
49// for symmetry 63// for symmetry
50inline void dealloc (void *p, int s) throw () 64template<typename T>
65inline void sfree (T *ptr, int n = 1) throw ()
51{ 66{
52 g_slice_free1 (s, p); 67 g_slice_free1 (n * sizeof (T), (void *)ptr);
53} 68}
54 69
55// a STL-compatible allocator that uses g_slice 70// a STL-compatible allocator that uses g_slice
56// boy, this is verbose 71// boy, this is verbose
57template<typename Tp> 72template<typename Tp>
… …
81 pointer address (reference x) const { return &x; } 96 pointer address (reference x) const { return &x; }
82 const_pointer address (const_reference x) const { return &x; } 97 const_pointer address (const_reference x) const { return &x; }
83 98
84 pointer allocate (size_type n, const_pointer = 0) 99 pointer allocate (size_type n, const_pointer = 0)
85 { 100 {
86 return static_cast<pointer>(alloc (n * sizeof (Tp))); 101 return salloc<Tp> (n);
87 } 102 }
88 103
89 void deallocate (pointer p, size_type n) 104 void deallocate (pointer p, size_type n)
90 { 105 {
91 dealloc (static_cast<void *>(p), n * sizeof (Tp)); 106 sfree<Tp> (p, n);
92 } 107 }
93 108
94 size_type max_size ()const throw () 109 size_type max_size ()const throw ()
95 { 110 {
96 return size_t (-1) / sizeof (Tp); 111 return size_t (-1) / sizeof (Tp);
… …
107 } 122 }
108}; 123};
109 124
110struct refcounted 125struct refcounted
111{ 126{
127 refcounted () : refcnt (0) { }
128// virtual ~refcounted ();
129 void refcnt_inc () { ++refcnt; }
130 void refcnt_dec () { --refcnt; }
131 bool dead () { return refcnt == 0; }
112 mutable int refcnt; 132 mutable int refcnt;
113 refcounted () : refcnt (0) { } 133#if 0
114 void refcnt_inc () { ++refcnt; } 134private:
115 void refcnt_dec () { --refcnt; 135 static refcounted *rc_first;
116 if (refcnt < 0)abort();}//D 136 refcounted *rc_next;
137#endif
117}; 138};
118 139
119template<class T> 140template<class T>
120struct refptr 141struct refptr
121{ 142{
… …
144 T &operator * () const { return *p; } 165 T &operator * () const { return *p; }
145 T *operator ->() const { return p; } 166 T *operator ->() const { return p; }
146 167
147 operator T *() const { return p; } 168 operator T *() const { return p; }
148}; 169};
170
171typedef refptr<player> player_ptr;
172typedef refptr<object> object_ptr;
173typedef refptr<archetype> arch_ptr;
149 174
150struct str_hash 175struct str_hash
151{ 176{
152 std::size_t operator ()(const char *s) const 177 std::size_t operator ()(const char *s) const
153 { 178 {
… …
216inline void assign (char (&dst)[N], const char *src) 241inline void assign (char (&dst)[N], const char *src)
217{ 242{
218 assign ((char *)&dst, src, N); 243 assign ((char *)&dst, src, N);
219} 244}
220 245
246typedef double tstamp;
247
248// return current time as timestampe
249tstamp now ();
250
221#endif 251#endif
222 252

Diff Legend

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