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.111 by root, Wed Nov 11 17:41:14 2009 UTC vs.
Revision 1.112 by root, Wed Nov 11 23:27:57 2009 UTC

… …
286 286
287extern struct global gbl_ev; 287extern struct global gbl_ev;
288 288
289////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 289//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
290 290
291// a little dirty hack, maybe unify with something else at a later time
292struct keyword_string
293{
294 const char *s;
295 const int l;
296
297 keyword_string (const char *s, int l)
298 : s(s), l(l)
299 { }
300
301 keyword_string (keyword kw)
302 : s(keyword_str [kw]), l(keyword_len [kw])
303 {
304 }
305
306 keyword_string (shstr_tmp sh)
307 : s(&sh), l(sh.length ())
308 {
309 }
310};
311
312#define CS(keyword) keyword_string (# keyword, sizeof (# keyword) - 1)
313#define KW(keyword) CS(keyword)
314
291INTERFACE_CLASS(object_freezer) 315INTERFACE_CLASS(object_freezer)
292struct object_freezer : dynbuf_text 316struct object_freezer : dynbuf_text
293{ 317{
294 AV *av; 318 AV *av;
295 319
296 object_freezer (); 320 object_freezer ();
297 ~object_freezer (); 321 ~object_freezer ();
298 322
323 // serialise perl part
299 void put (attachable *ext); 324 void put_ (attachable *ext);
300 325 void put (attachable *ext)
301 // used only for user-defined key-value pairs
302 void put (shstr_tmp k, shstr_tmp v)
303 { 326 {
304 add (k); 327 if (expect_false (ext->self))
328 put_ (ext);
329 }
305 330
331 // null value (== no space after keyword)
332 void put (const keyword_string k)
333 {
334 char *p = force (k.l + 1);
335 memcpy (p, k.s, k.l); p += k.l; *p++ = '\n';
336 alloc (p);
337 }
338
339 void put (const keyword_string k, const keyword_string v)
340 {
341 char *p = force (k.l + 1 + v.l + 1);
342 memcpy (p, k.s, k.l); p += k.l; *p++ = ' ';
343 memcpy (p, v.s, v.l); p += v.l; *p++ = '\n';
344 alloc (p);
345 }
346
347 void put (const keyword_string k, const char *v)
348 {
306 if (expect_true (v)) 349 if (expect_true (v))
307 add (' '), add (v); 350 put (k, keyword_string (v, strlen (v)));
308 351 else
309 add ('\n'); 352 put (k);
310 } 353 }
311 354
312 template<typename T>
313 void put_kw_string (keyword k, const T &v)
314 {
315 int klen = keyword_len [k];
316 int vlen = v ? strlen (v) + 1 : 0;
317
318 char *p = (char *)alloc (klen + vlen + 1);
319
320 memcpy (p, keyword_str [k], klen); p += klen;
321
322 if (expect_true (v))
323 {
324 *p++ = ' '; vlen--;
325 memcpy (p, v, vlen); p += vlen;
326 }
327
328 *p = '\n';
329 }
330
331 void put (keyword k, const char *v = 0)
332 {
333 put_kw_string (k, v);
334 }
335
336 void put (keyword k, shstr_tmp v) 355 void put (const keyword_string k, shstr_tmp v)
337 { 356 {
338 put_kw_string (k, v); 357 put (k, keyword_string (v));
339 } 358 }
340 359
341 void put (keyword k, double v) 360 void put (const keyword_string k, double v)
342 { 361 {
343 force (MAX_KEYWORD_LEN + 2 + 32); 362 char *p = force (MAX_KEYWORD_LEN + 2 + 32);
344 fadd (keyword_str [k], keyword_len [k]); 363 memcpy (p, k.s, k.l); p += k.l; *p++ = ' ';
345 fadd (' '); 364 p += sprintf (p, "%.7g", v); *p++ = '\n';
346 falloc (sprintf (ptr, "%.7g", v)); 365 alloc (p);
347 fadd ('\n');
348 } 366 }
349 367
350 void put_(keyword k, sint64 v) 368 void put_(const keyword_string k, sint64 v)
351 { 369 {
352 force (MAX_KEYWORD_LEN + 2 + sint64_digits); 370 force (MAX_KEYWORD_LEN + 2 + sint64_digits);
353 fadd (keyword_str [k], keyword_len [k]); 371 fadd (k.s, k.l);
354 fadd (' '); 372 fadd (' ');
355 add (v); 373 add (v);
356 fadd ('\n'); 374 fadd ('\n');
357 } 375 }
358 376
359 void put_(keyword k, sint32 v) 377 void put_(const keyword_string k, sint32 v)
360 { 378 {
361 force (MAX_KEYWORD_LEN + 2 + sint32_digits); 379 force (MAX_KEYWORD_LEN + 2 + sint32_digits);
362 fadd (keyword_str [k], keyword_len [k]); 380 fadd (k.s, k.l);
363 fadd (' '); 381 fadd (' ');
364 add (v); 382 add (v);
365 fadd ('\n'); 383 fadd ('\n');
366 } 384 }
367 385
368 void put (keyword k, float v) { put (k, (double)v); } 386 void put (const keyword_string k, float v) { put (k, (double)v); }
369 void put (keyword k, signed char v) { put_(k, (sint32)v); } 387 void put (const keyword_string k, signed char v) { put_(k, (sint32)v); }
370 void put (keyword k, unsigned char v) { put_(k, (sint32)v); } 388 void put (const keyword_string k, unsigned char v) { put_(k, (sint32)v); }
371 void put (keyword k, signed short v) { put_(k, (sint32)v); } 389 void put (const keyword_string k, signed short v) { put_(k, (sint32)v); }
372 void put (keyword k, unsigned short v) { put_(k, (sint32)v); } 390 void put (const keyword_string k, unsigned short v) { put_(k, (sint32)v); }
373 void put (keyword k, signed int v) { put_(k, (sint32)v); } 391 void put (const keyword_string k, signed int v) { put_(k, (sint32)v); }
374 void put (keyword k, unsigned int v) { put_(k, (sint64)v); } 392 void put (const keyword_string k, unsigned int v) { put_(k, (sint64)v); }
375 void put (keyword k, signed long v) { put_(k, (sint64)v); } 393 void put (const keyword_string k, signed long v) { put_(k, (sint64)v); }
376 void put (keyword k, unsigned long v) { put_(k, (sint64)v); } 394 void put (const keyword_string k, unsigned long v) { put_(k, (sint64)v); }
377 void put (keyword k, signed long long v) { put_(k, (sint64)v); } 395 void put (const keyword_string k, signed long long v) { put_(k, (sint64)v); }
378 void put (keyword k, unsigned long long v) { put_(k, (sint64)v); } 396 void put (const keyword_string k, unsigned long long v) { put_(k, (sint64)v); }
379 397
380 void put (keyword kbeg, keyword kend, shstr_tmp v) 398 void put (const keyword_string kbeg, const keyword_string kend, shstr_tmp v)
381 { 399 {
382 force (MAX_KEYWORD_LEN + 1); 400 force (MAX_KEYWORD_LEN + 1);
383 fadd (keyword_str [kbeg], keyword_len [kbeg]); fadd ('\n'); 401 fadd (kbeg.s, kbeg.l); fadd ('\n');
384 402
385 if (expect_true (v)) 403 if (expect_true (v))
386 { 404 {
387 add (v); 405 add (v);
388 add ('\n'); 406 add ('\n');
389 } 407 }
390 408
391 force (MAX_KEYWORD_LEN + 1); 409 force (MAX_KEYWORD_LEN + 1);
392 fadd (keyword_str [kend], keyword_len [kend]); fadd ('\n'); 410 fadd (kend.s, kend.l); fadd ('\n');
393 } 411 }
394 412
395 void put (keyword k, archetype *v); 413 void put (const keyword_string k, archetype *v);
396 void put (keyword k, treasurelist *v); 414 void put (const keyword_string k, treasurelist *v);
397 void put (keyword k, faceinfo *v); 415 void put (const keyword_string k, faceinfo *v);
398 416
399 template<typename T> 417 template<typename T>
400 void put (keyword k, const refptr<T> &v) 418 void put (const keyword_string k, const refptr<T> &v)
401 { 419 {
402 put (k, (T *)v); 420 put (k, (T *)v);
403 } 421 }
404 422
405 MTH bool save (const_octet_string path); 423 MTH bool save (const_octet_string path);

Diff Legend

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