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

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.34 by root, Thu Aug 31 06:23:20 2006 UTC vs.
Revision 1.42 by root, Mon Sep 4 11:08:00 2006 UTC

… …
51 51
52static f_plug_api gethook = cfapi_get_hooks; 52static f_plug_api gethook = cfapi_get_hooks;
53static f_plug_api object_set_property = cfapi_object_set_property; 53static f_plug_api object_set_property = cfapi_object_set_property;
54static f_plug_api object_insert = cfapi_object_insert; 54static f_plug_api object_insert = cfapi_object_insert;
55 55
56static bool perl_booted;
57
58/* this is a stupid way to do things, and awkward to use for plug-in authors */ 56/* this is a stupid way to do things, and awkward to use for plug-in authors */
59typedef struct 57typedef struct
60{ 58{
61 object* who; 59 object* who;
62 object* activator; 60 object* activator;
… …
326 { 324 {
327 SvREFCNT_dec (cb); 325 SvREFCNT_dec (cb);
328 cb = 0; 326 cb = 0;
329 } 327 }
330 328
331 if (attach)
332 {
333 free_string (attach);
334 attach = 0; 329 attach = 0;
335 }
336} 330}
337 331
338void attachable_base::optimise () 332void attachable_base::optimise ()
339{ 333{
340 if (!self) 334 if (!self)
… …
359 PUSHMARK (SP); 353 PUSHMARK (SP);
360 EXTEND (SP, 2); 354 EXTEND (SP, 2);
361 PUSHs (sv_2mortal (newSVdt (type, obj))); 355 PUSHs (sv_2mortal (newSVdt (type, obj)));
362 PUSHs (sv_2mortal (newSVpv (attach, 0))); 356 PUSHs (sv_2mortal (newSVpv (attach, 0)));
363 357
364 free_string (attach);
365 attach = 0; 358 attach = 0;
366 359
367 PUTBACK; 360 PUTBACK;
368 call_pv ("cf::instantiate", G_DISCARD | G_VOID | G_EVAL); 361 call_pv ("cf::instantiate", G_DISCARD | G_VOID | G_EVAL);
369 FREETMPS; 362 FREETMPS;
… …
404void reattach (attachable<subclass> *obj) 397void reattach (attachable<subclass> *obj)
405{ 398{
406 obj->optimise (); 399 obj->optimise ();
407 400
408 if (obj->self) 401 if (obj->self)
409 reattach (subclass::get_dt (), (subclass *)obj); 402 reattach ((data_type) cftype<subclass>::dt, (subclass *)obj);
410} 403}
404
405#include "kw_hash.h"
411 406
412object_freezer::object_freezer () 407object_freezer::object_freezer ()
408: dynbuf (128 * 1024, 64 * 1024)
413{ 409{
414 av = newAV (); 410 av = newAV ();
415 // TODO: fast dynbuf implementation... yeah, we need obstacks
416 text = newSV (10 * 1024 * 1024); // only temporarily used, so be generous
417} 411}
418 412
419object_freezer::~object_freezer () 413object_freezer::~object_freezer ()
420{ 414{
421 SvREFCNT_dec (text);
422 SvREFCNT_dec (av); 415 SvREFCNT_dec (av);
423} 416}
424 417
425void object_freezer::put (attachable_base *ext) 418void object_freezer::put (attachable_base *ext)
426{ 419{
… …
429 if (ext->self) 422 if (ext->self)
430 { 423 {
431 int idx = AvFILLp ((AV *)av) + 1; 424 int idx = AvFILLp ((AV *)av) + 1;
432 av_store (av, idx, SvREFCNT_inc (ext->self)); 425 av_store (av, idx, SvREFCNT_inc (ext->self));
433 426
434 sv_catpvf (text, "oid %d\n", idx); 427 add ((void *)"oid ", 4);
428 add ((sint32)idx);
429 add ('\n');
435 } 430 }
436} 431}
437 432
438bool object_freezer::save (const char *filename) 433bool object_freezer::save (const char *filename)
439{ 434{
… …
441 ENTER; 436 ENTER;
442 SAVETMPS; 437 SAVETMPS;
443 PUSHMARK (SP); 438 PUSHMARK (SP);
444 EXTEND (SP, 3); 439 EXTEND (SP, 3);
445 PUSHs (sv_2mortal (newSVpv (filename, 0))); 440 PUSHs (sv_2mortal (newSVpv (filename, 0)));
446 PUSHs (sv_2mortal (newRV_inc (text))); 441 PUSHs (sv_2mortal (newRV_noinc (newSVpvn ((char *)linearise (), size ()))));
447 PUSHs (sv_2mortal (newRV_inc ((SV *)av))); 442 PUSHs (sv_2mortal (newRV_inc ((SV *)av)));
448 PUTBACK; 443 PUTBACK;
449 call_pv ("cf::object_freezer_save", G_VOID | G_DISCARD | G_EVAL); 444 call_pv ("cf::object_freezer_save", G_VOID | G_DISCARD | G_EVAL);
450 FREETMPS; 445 FREETMPS;
451 LEAVE; 446 LEAVE;
… …
454int fprintf (object_freezer &freezer, const char *format, ...) 449int fprintf (object_freezer &freezer, const char *format, ...)
455{ 450{
456 va_list ap; 451 va_list ap;
457 452
458 va_start (ap, format); 453 va_start (ap, format);
459 sv_vcatpvfn (freezer.text, format, strlen (format), &ap, 0, 0, 0); 454
455 int len = vsnprintf ((char *)freezer.force (1024), 1024, format, ap);
456
457 if (len >= 0)
458 freezer.alloc (len);
459
460 va_end (ap); 460 va_end (ap);
461} 461}
462 462
463int fputs (const char *s, object_freezer &freezer) 463int fputs (const char *s, object_freezer &freezer)
464{ 464{
465 sv_catpvn (freezer.text, s, strlen (s)); 465 freezer.add (s);
466} 466}
467 467
468object_thawer::object_thawer (const char *filename) 468object_thawer::object_thawer (const char *filename)
469{ 469{
470 static const char eof[] = "\n\n\n\0\0\0";
471
470 av = 0; 472 av = 0;
471 fp = 0; 473 text = 0;
474 line = 0;
472 475
473 if (!filename) 476 if (filename)
474 return;
475
476 fp = fopen (filename, "r");
477 if (!fp)
478 {
479 LOG (llevError, "object_thawer: unable to open '%s': %s.\n", filename, strerror (errno));
480 return;
481 }
482
483 if (perl_booted)
484 { 477 {
485 dSP; 478 dSP;
486 ENTER; 479 ENTER;
487 SAVETMPS; 480 SAVETMPS;
488 PUSHMARK (SP); 481 PUSHMARK (SP);
489 XPUSHs (sv_2mortal (newSVpv (filename, 0))); 482 XPUSHs (sv_2mortal (newSVpv (filename, 0)));
490 PUTBACK; 483 PUTBACK;
491 484
492 if (0 < call_pv ("cf::object_thawer_load", G_SCALAR | G_EVAL)) 485 if (2 == call_pv ("cf::object_thawer_load", G_ARRAY | G_EVAL))
493 { 486 {
494 SPAGAIN; 487 SPAGAIN;
488
489 // second value - perl objects
490 {
495 SV *sv = POPs; 491 SV *sv = POPs;
496 if (SvROK (sv)) 492 if (SvROK (sv))
497 av = (AV *)SvREFCNT_inc (SvRV (sv)); 493 av = (AV *)SvREFCNT_inc (SvRV (sv));
494 }
495
496 // first value - text part, pad with 3 zeroes
497 {
498 SV *sv = POPs;
499 STRLEN len;
500 char *sv_ = SvPVbyte (sv, len);
501 text = newSV (len + sizeof (eof));
502 SvCUR_set (text, len);
503 memcpy (SvPVX (text), sv_, len);
504 memcpy (SvEND (text), eof, sizeof (eof)); // just to be sure
505
506 line = SvPVX (text);
507 }
498 } 508 }
499 509
510 PUTBACK;
500 FREETMPS; 511 FREETMPS;
501 LEAVE; 512 LEAVE;
502 } 513 }
503} 514}
504 515
… …
524 reattach (type, obj); 535 reattach (type, obj);
525} 536}
526 537
527object_thawer::~object_thawer () 538object_thawer::~object_thawer ()
528{ 539{
529 if (fp) fclose (fp); 540 if (text) SvREFCNT_dec (text);
530 if (av) SvREFCNT_dec ((AV *)av); 541 if (av) SvREFCNT_dec (av);
531} 542}
532 543
544char *fgets (char *s, int n, object_thawer &thawer)
545{
546 char *p = thawer.line;
547 char *q = s;
548
549 if (!p)
550 return 0;
551
552 while (--n)
553 {
554 if (!*p)
555 break;
556
557 *q++ = *p;
558
559 if (*p++ == '\n')
560 break;
561 }
562
563 *q = 0;
564 thawer.line = p;
565
566 return s == q ? 0 : s;
567}
568
533token object_thawer::get_token () 569keyword object_thawer::get_kv ()
534{ 570{
535#if 0 571 if (!line)
572 return KW_EOF;
573
536 for (;;) 574 for (;;)
537 { 575 {
538 if (!fgets (line, sizeof (line), fp)) 576 char *p = line;
539 return token (KW_eof);
540 577
541 unsigned char *p = (unsigned char *)line; 578 if (!*p)
579 return KW_EOF;
542 580
581 // parse keyword
543 while (*p > ' ') 582 while (*p > ' ')
544 p++; 583 p++;
545 584
546 int len = p - (unsigned char *)line; 585 int klen = p - line;
547 586
548 while ((*p - 1) < ' ') 587 if (*p++ != '\n')
549 p++;
550
551 if (*p)
552 { 588 {
553 char *v = p; 589 // parse value
590 while (*p <= ' ' && *p != '\n') // skip 0x01 .. 0x20
591 ++p;
554 592
593 last_value = p;
594
555 while (*p && *p != '\n') 595 while (*p != '\n')
556 p++; 596 p++;
557 597
558 *p = 0; 598 *p++ = 0;
559
560 return token (k, v);
561 } 599 }
562 else 600 else
563 return token (k); 601 last_value = 0;
602
603 line [klen] = 0;
604 keyword_idx *kw = kw_lex::match (line, klen);
605
606 //printf ("KV %d<%s,%s>\n", kw ? kw->index : 0, line, last_value);//D
607
608 if (kw)
609 {
610 line = p;
611 return kw->index;
612 }
613 else if (!*line || *line == '#')
614 {
615 // empty/comment line
616 line = p;
617 }
618 else
619 return KW_ERROR;
564 } 620 }
565#endif
566} 621}
567 622
623void object_thawer::get (shstr &sh) const
624{
625 if (last_value)
626 sh = last_value;
627 else
628 {
629 sh = "<value missing>";
630 LOG (llevError, "keyword requires value: <%s>\n", line);//TODO: add filename
631 }
632}
633
634void object_thawer::get_ml (keyword kend, shstr &sh)
635{
636 char kw[128];
637
638 // multi-line strings are delimited by "\nendXXX\n"
639 kw [0] = '\n';
640 strcpy (kw + 1, keyword_str [kend]);
641
642 char *end = strstr (line, kw);
643
644 if (!end)
645 {
646 sh = 0;
647 return;
648 }
649
650 *end = 0;
651 sh = line;
652
653 line = end + keyword_len [kend] + 1;
654
655 while (*line++ != '\n')
656 ;
657}
658
659sint32 object_thawer::get_sint32 () const
660{
661 char *p = last_value;
662
663 if (!p)
664 return 0;
665
666 sint32 val = 0;
667 bool negate;
668
669 if (*p == '-')
670 {
671 negate = true;
672 ++p;
673 }
674 else
675 negate = false;
676
677 do
678 {
679 val *= 10;
680 val += *p++ - '0';
681 }
682 while (*p);
683
684 return negate ? -val : val;
685}
686
687sint64 object_thawer::get_sint64 () const
688{
689 return last_value ? atoll (last_value) : 0;
690}
691
692double object_thawer::get_double () const
693{
694 return last_value ? atof (last_value) : 0;
695}
696
568///////////////////////////////////////////////////////////////////////////// 697/////////////////////////////////////////////////////////////////////////////
569 698
570extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr) 699extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr)
571{ 700{
572 return 0; 701 return 0;
… …
680 char *argv[] = { 809 char *argv[] = {
681 "", 810 "",
682 "-e" 811 "-e"
683 "cf->bootstrap;" 812 "cf->bootstrap;"
684 "unshift @INC, cf::datadir ();" 813 "unshift @INC, cf::datadir ();"
814 "require cf;"
685 }; 815 };
686 816
687 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) || perl_run (perl)) 817 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) || perl_run (perl))
688 { 818 {
689 printf ("unable to initialize perl-interpreter, aborting.\n"); 819 printf ("unable to initialize perl-interpreter, aborting.\n");
690 exit (EXIT_FAILURE); 820 exit (EXIT_FAILURE);
691 } 821 }
692 822
693 obj_cache = newHV (); 823 obj_cache = newHV ();
694}
695
696void cfperl_boot ()
697{
698 perl_booted = true;
699
700 eval_pv ("require cf", 1);
701} 824}
702 825
703void cfperl_main () 826void cfperl_main ()
704{ 827{
705 dSP; 828 dSP;
… …
1281 1404
1282 const_iv (SK_EXP_ADD_SKILL) 1405 const_iv (SK_EXP_ADD_SKILL)
1283 const_iv (SK_EXP_TOTAL) 1406 const_iv (SK_EXP_TOTAL)
1284 const_iv (SK_EXP_NONE) 1407 const_iv (SK_EXP_NONE)
1285 const_iv (SK_SUBTRACT_SKILL_EXP) 1408 const_iv (SK_SUBTRACT_SKILL_EXP)
1409 const_iv (SK_EXP_SKILL_ONLY)
1286 1410
1287 const_iv (SK_LOCKPICKING) 1411 const_iv (SK_LOCKPICKING)
1288 const_iv (SK_HIDING) 1412 const_iv (SK_HIDING)
1289 const_iv (SK_SMITHERY) 1413 const_iv (SK_SMITHERY)
1290 const_iv (SK_BOWYER) 1414 const_iv (SK_BOWYER)
… …
2346 RETVAL 2470 RETVAL
2347 2471
2348 2472
2349MODULE = cf PACKAGE = cf::arch 2473MODULE = cf PACKAGE = cf::arch
2350 2474
2475archetype *find (const char *name)
2476 CODE:
2477 RETVAL = find_archetype (name);
2478 OUTPUT:
2479 RETVAL
2480
2351archetype *first() 2481archetype *first()
2352 PROTOTYPE: 2482 PROTOTYPE:
2353 CODE: 2483 CODE:
2354 RETVAL = first_archetype; 2484 RETVAL = first_archetype;
2355 OUTPUT: RETVAL 2485 OUTPUT: RETVAL

Diff Legend

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