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.40 by root, Sun Sep 3 00:18:42 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;
… …
467 freezer.add (s); 465 freezer.add (s);
468} 466}
469 467
470object_thawer::object_thawer (const char *filename) 468object_thawer::object_thawer (const char *filename)
471{ 469{
470 static const char eof[] = "\n\n\n\0\0\0";
471
472 av = 0; 472 av = 0;
473 fp = 0; 473 text = 0;
474 line = 0;
474 475
475 if (!filename) 476 if (filename)
476 return;
477
478 fp = fopen (filename, "r");
479 if (!fp)
480 {
481 LOG (llevError, "object_thawer: unable to open '%s': %s.\n", filename, strerror (errno));
482 return;
483 }
484
485 if (perl_booted)
486 { 477 {
487 dSP; 478 dSP;
488 ENTER; 479 ENTER;
489 SAVETMPS; 480 SAVETMPS;
490 PUSHMARK (SP); 481 PUSHMARK (SP);
491 XPUSHs (sv_2mortal (newSVpv (filename, 0))); 482 XPUSHs (sv_2mortal (newSVpv (filename, 0)));
492 PUTBACK; 483 PUTBACK;
493 484
494 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))
495 { 486 {
496 SPAGAIN; 487 SPAGAIN;
488
489 // second value - perl objects
490 {
497 SV *sv = POPs; 491 SV *sv = POPs;
498 if (SvROK (sv)) 492 if (SvROK (sv))
499 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 }
500 } 508 }
501 509
510 PUTBACK;
502 FREETMPS; 511 FREETMPS;
503 LEAVE; 512 LEAVE;
504 } 513 }
505} 514}
506 515
… …
526 reattach (type, obj); 535 reattach (type, obj);
527} 536}
528 537
529object_thawer::~object_thawer () 538object_thawer::~object_thawer ()
530{ 539{
531 if (fp) fclose (fp); 540 if (text) SvREFCNT_dec (text);
532 if (av) SvREFCNT_dec ((AV *)av); 541 if (av) SvREFCNT_dec (av);
533} 542}
534 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
535token object_thawer::get_token () 569keyword object_thawer::get_kv ()
536{ 570{
537#if 0 571 if (!line)
572 return KW_EOF;
573
538 for (;;) 574 for (;;)
539 { 575 {
540 if (!fgets (line, sizeof (line), fp)) 576 char *p = line;
541 return token (KW_eof);
542 577
543 unsigned char *p = (unsigned char *)line; 578 if (!*p)
579 return KW_EOF;
544 580
581 // parse keyword
545 while (*p > ' ') 582 while (*p > ' ')
546 p++; 583 p++;
547 584
548 int len = p - (unsigned char *)line; 585 int klen = p - line;
549 586
550 while ((*p - 1) < ' ') 587 if (*p++ != '\n')
551 p++;
552
553 if (*p)
554 { 588 {
555 char *v = p; 589 // parse value
590 while (*p <= ' ' && *p != '\n') // skip 0x01 .. 0x20
591 ++p;
556 592
593 last_value = p;
594
557 while (*p && *p != '\n') 595 while (*p != '\n')
558 p++; 596 p++;
559 597
560 *p = 0; 598 *p++ = 0;
561
562 return token (k, v);
563 } 599 }
564 else 600 else
565 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;
566 } 620 }
567#endif
568} 621}
569 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
570///////////////////////////////////////////////////////////////////////////// 697/////////////////////////////////////////////////////////////////////////////
571 698
572extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr) 699extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr)
573{ 700{
574 return 0; 701 return 0;
… …
682 char *argv[] = { 809 char *argv[] = {
683 "", 810 "",
684 "-e" 811 "-e"
685 "cf->bootstrap;" 812 "cf->bootstrap;"
686 "unshift @INC, cf::datadir ();" 813 "unshift @INC, cf::datadir ();"
814 "require cf;"
687 }; 815 };
688 816
689 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))
690 { 818 {
691 printf ("unable to initialize perl-interpreter, aborting.\n"); 819 printf ("unable to initialize perl-interpreter, aborting.\n");
692 exit (EXIT_FAILURE); 820 exit (EXIT_FAILURE);
693 } 821 }
694 822
695 obj_cache = newHV (); 823 obj_cache = newHV ();
696}
697
698void cfperl_boot ()
699{
700 perl_booted = true;
701
702 eval_pv ("require cf", 1);
703} 824}
704 825
705void cfperl_main () 826void cfperl_main ()
706{ 827{
707 dSP; 828 dSP;

Diff Legend

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