ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/include/cfperl.h
(Generate patch)

Comparing deliantra/server/include/cfperl.h (file contents):
Revision 1.85 by root, Wed Aug 1 20:07:06 2007 UTC vs.
Revision 1.89 by root, Tue Sep 4 05:43:21 2007 UTC

… …
55#undef readdir 55#undef readdir
56#undef getprotobyname 56#undef getprotobyname
57#undef gethostbyname 57#undef gethostbyname
58#undef ctime 58#undef ctime
59#undef strerror 59#undef strerror
60#undef _
60 61
61// same here, massive symbol spamming 62// same here, massive symbol spamming
62#undef do_open 63#undef do_open
63#undef do_close 64#undef do_close
64#undef ref 65#undef ref
… …
66 67
67// perl bug #40256: perl does overwrite those with reentrant versions 68// perl bug #40256: perl does overwrite those with reentrant versions
68// but does not initialise their state structures. 69// but does not initialise their state structures.
69#undef random 70#undef random
70#undef crypt 71#undef crypt
72
73//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
74
75#define _(msg) (msg)
76#define N_(msg) (msg)
71 77
72////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 78//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
73 79
74// some macros to simplify perl in-calls 80// some macros to simplify perl in-calls
75 81
… …
154int cfperl_result_INT (int idx); 160int cfperl_result_INT (int idx);
155 161
156////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 162//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
157 163
158INTERFACE_CLASS (attachable) 164INTERFACE_CLASS (attachable)
159struct attachable 165struct attachable : refcnt_base
160{ 166{
161 static MGVTBL vtbl; 167 static MGVTBL vtbl;
162 168
163 static unordered_vector<attachable *> mortals; 169 static unordered_vector<attachable *> mortals;
164 MTH static void check_mortals (); 170 MTH static void check_mortals ();
165 171
166 enum { 172 enum {
167 F_DESTROYED = 0x01, 173 F_DESTROYED = 0x01,
168 F_DEBUG_TRACE = 0x02, 174 F_DEBUG_TRACE = 0x02,
169 }; 175 };
176 int ACC (RW, flags);
170 177
171 // object is delete'd after the refcount reaches 0 178 // object is delete'd after the refcount reaches 0
172 int ACC (RW, flags);
173 mutable int ACC (RW, refcnt);
174
175 MTH void refcnt_inc () const { ++refcnt; }
176 MTH void refcnt_dec () const { --refcnt; }
177
178 MTH int refcnt_cnt () const; 179 MTH int refcnt_cnt () const;
179 // check wether the object has died and destroy 180 // check wether the object has died and destroy
180 MTH void refcnt_chk () { if (expect_false (refcnt <= 0)) do_check (); } 181 MTH void refcnt_chk () { if (expect_false (refcnt <= 0)) do_check (); }
181 182
182 // destroy the object unless it was already destroyed 183 // destroy the object unless it was already destroyed
… …
201 202
202 void sever_self (); // sever this object from its self, if it has one. 203 void sever_self (); // sever this object from its self, if it has one.
203 void optimise (); // possibly save some memory by destroying unneeded data 204 void optimise (); // possibly save some memory by destroying unneeded data
204 205
205 attachable () 206 attachable ()
206 : flags (0), refcnt (0), self (0), cb (0), attach (0) 207 : flags (0), self (0), cb (0), attach (0)
207 { 208 {
208 } 209 }
209 210
210 attachable (const attachable &src) 211 attachable (const attachable &src)
211 : flags (0), refcnt (0), self (0), cb (0), attach (src.attach) 212 : flags (0), self (0), cb (0), attach (src.attach)
212 { 213 {
213 } 214 }
214 215
215 // set a custom key to the given value, or delete it if value = 0 216 // set a custom key to the given value, or delete it if value = 0
217 void set_key (const char *key, const char *value = 0, bool is_utf8 = 0);
218
216 void set_key (const char *key, const char *value = 0); 219 void set_key_text (const char *key, const char *value = 0)
220 {
221 set_key (key, value, 1);
222 }
223
224 void set_key_data (const char *key, const char *value = 0)
225 {
226 set_key (key, value, 0);
227 }
217 228
218 attachable &operator =(const attachable &src); 229 attachable &operator =(const attachable &src);
219 230
220 // used to _quickly_ device wether to shortcut the evaluation 231 // used to _quickly_ device wether to shortcut the evaluation
221 bool should_invoke (event_type event) 232 bool should_invoke (event_type event)
… …
247 258
248extern struct global gbl_ev; 259extern struct global gbl_ev;
249 260
250////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 261//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
251 262
263INTERFACE_CLASS(object_freezer)
252struct object_freezer : dynbuf_text 264struct object_freezer : dynbuf_text
253{ 265{
254 AV *av; 266 AV *av;
255 267
256 object_freezer (); 268 object_freezer ();
… …
360 void put (keyword k, const refptr<T> &v) 372 void put (keyword k, const refptr<T> &v)
361 { 373 {
362 put (k, (T *)v); 374 put (k, (T *)v);
363 } 375 }
364 376
365 bool save (const char *path); 377 MTH bool save (const_octet_string path);
366 char *as_string (); // like strdup 378 char *as_string (); // like strdup
367 379
368 operator bool () { return !!av; } 380 operator bool () { return !!av; }
369}; 381};
370 382
383INTERFACE_CLASS(object_thawer)
371struct object_thawer 384struct object_thawer
372{ 385{
373 char *line; // current beginning of line 386 char *line; // current beginning of line
374 SV *text; // text part 387 SV *text; // text part
375 AV *av; // perl part 388 AV *av; // perl part
… …
378 char *kw_str; // the keyword parsed, as string 391 char *kw_str; // the keyword parsed, as string
379 char *value; // the value, or 0 if no value 392 char *value; // the value, or 0 if no value
380 char *value_nn; // the value, or the empty string if no value 393 char *value_nn; // the value, or the empty string if no value
381 const char *name; 394 const char *name;
382 395
383 operator bool () { return !!text; } 396 operator bool () const { return !!text; }
384 397
385 object_thawer (const char *path = 0); 398 object_thawer (const char *path = 0);
386 object_thawer (const char *data, AV *perlav); 399 object_thawer (const char *data, AV *perlav);
387 ~object_thawer (); 400 ~object_thawer ();
388 401
389 void get (attachable *obj, int oid); 402 void get (attachable *obj, int oid);
390 403
391 // parse next line 404 // parse next line
392 void next (); 405 MTH void next ();
393 // skip the current key-value (usually fetch next line, for 406 // skip the current key-value (usually fetch next line, for
394 // multiline-fields, skips till the corresponding end-kw 407 // multiline-fields, skips till the corresponding end-kw
395 void skip (); 408 MTH void skip ();
409 MTH void skip_block (); // skips till and over KW_end
396 410
397 char *get_str () { return value; } // may be 0 411 char *get_str () { return value; } // may be 0
398 void get_ml (keyword kend, shstr &sh); 412 void get_ml (keyword kend, shstr &sh);
399 413
400 void get_ornull (shstr &sh) const { sh = value; } 414 void get_ornull (shstr &sh) const { sh = value; }
… …
416 void get (sint32 &i) { i = get_sint32 (); } 430 void get (sint32 &i) { i = get_sint32 (); }
417 431
418 void get (uint32 &i) { i = get_sint64 (); } 432 void get (uint32 &i) { i = get_sint64 (); }
419 void get (sint64 &i) { i = get_sint64 (); } 433 void get (sint64 &i) { i = get_sint64 (); }
420 434
421 void parse_warn (const char *msg); 435 MTH void parse_warn (const char *msg);
422 bool parse_error (const char *type = 0, const char *name = 0, bool skip = true); 436 MTH bool parse_error (const char *type = 0, const char *name = 0, bool skip = true);
437
438 struct delayed_ref {
439 attachable *op;
440 object_ptr *ptr;
441 const char *ref;
442 };
443 std::vector<delayed_ref> delrefs;
444
445 void delayed_deref (attachable *op, object_ptr &ptr, const char *ref);
446 MTH void resolve_delayed_derefs (bool deref = true);
423}; 447};
424 448
425//TODO: remove 449//TODO: remove
426char *fgets (char *s, int n, object_thawer &thawer); 450char *fgets (char *s, int n, object_thawer &thawer);
427 451

Diff Legend

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