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.37 by root, Thu Aug 31 17:54:15 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;
… …
433 426
434 add ((void *)"oid ", 4); 427 add ((void *)"oid ", 4);
435 add ((sint32)idx); 428 add ((sint32)idx);
436 add ('\n'); 429 add ('\n');
437 } 430 }
438}
439
440void object_freezer::put (const char *k, const char *v)
441{
442 add (k);
443
444 //if (v)
445 add (' '); //TODO//cf compatibility always add space
446 if (v)
447 add (v);
448
449 add ('\n');
450}
451
452void object_freezer::put (const char *k, int v)
453{
454 add (k);
455 add (' ');
456 add (sint32 (v));
457 add ('\n');
458}
459
460void object_freezer::put (keyword k, const char *v)
461{
462 int klen = keyword_len [k];
463 int vlen = v ? strlen (v) : 0;
464
465 char *p = (char *)alloc (klen + 1 + vlen + 1);
466
467 memcpy (p, keyword_str [k], klen); p += klen;
468 *p++ = ' '; //TODO//cf compatibility always add space
469 memcpy (p, v, vlen); p += vlen;
470 *p = '\n';
471}
472
473void object_freezer::put (keyword k, double v)
474{
475 char buf [128];
476
477 snprintf (buf, 128, "%.7g", v);
478
479 put (k, (const char *)buf);
480}
481
482void object_freezer::put_(keyword k, sint64 v)
483{
484 add (keyword_str [k], keyword_len [k]);
485 add (' ');
486 add (v);
487 add ('\n');
488}
489
490void object_freezer::put_(keyword k, sint32 v)
491{
492 add (keyword_str [k], keyword_len [k]);
493 add (' ');
494 add (v);
495 add ('\n');
496}
497
498void object_freezer::put (keyword kbeg, keyword kend, const char *v)
499{
500 add (keyword_str [kbeg], keyword_len [kbeg]); add ('\n');
501
502 if (v)
503 {
504 add (v);
505 add ('\n');
506 }
507
508 add (keyword_str [kend], keyword_len [kend]); add ('\n');
509} 431}
510 432
511bool object_freezer::save (const char *filename) 433bool object_freezer::save (const char *filename)
512{ 434{
513 dSP; 435 dSP;
… …
543 freezer.add (s); 465 freezer.add (s);
544} 466}
545 467
546object_thawer::object_thawer (const char *filename) 468object_thawer::object_thawer (const char *filename)
547{ 469{
470 static const char eof[] = "\n\n\n\0\0\0";
471
548 av = 0; 472 av = 0;
549 fp = 0; 473 text = 0;
474 line = 0;
550 475
551 if (!filename) 476 if (filename)
552 return;
553
554 fp = fopen (filename, "r");
555 if (!fp)
556 {
557 LOG (llevError, "object_thawer: unable to open '%s': %s.\n", filename, strerror (errno));
558 return;
559 }
560
561 if (perl_booted)
562 { 477 {
563 dSP; 478 dSP;
564 ENTER; 479 ENTER;
565 SAVETMPS; 480 SAVETMPS;
566 PUSHMARK (SP); 481 PUSHMARK (SP);
567 XPUSHs (sv_2mortal (newSVpv (filename, 0))); 482 XPUSHs (sv_2mortal (newSVpv (filename, 0)));
568 PUTBACK; 483 PUTBACK;
569 484
570 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))
571 { 486 {
572 SPAGAIN; 487 SPAGAIN;
488
489 // second value - perl objects
490 {
573 SV *sv = POPs; 491 SV *sv = POPs;
574 if (SvROK (sv)) 492 if (SvROK (sv))
575 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 }
576 } 508 }
577 509
510 PUTBACK;
578 FREETMPS; 511 FREETMPS;
579 LEAVE; 512 LEAVE;
580 } 513 }
581} 514}
582 515
… …
602 reattach (type, obj); 535 reattach (type, obj);
603} 536}
604 537
605object_thawer::~object_thawer () 538object_thawer::~object_thawer ()
606{ 539{
607 if (fp) fclose (fp); 540 if (text) SvREFCNT_dec (text);
608 if (av) SvREFCNT_dec ((AV *)av); 541 if (av) SvREFCNT_dec (av);
609} 542}
610 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
611token object_thawer::get_token () 569keyword object_thawer::get_kv ()
612{ 570{
613#if 0 571 if (!line)
572 return KW_EOF;
573
614 for (;;) 574 for (;;)
615 { 575 {
616 if (!fgets (line, sizeof (line), fp)) 576 char *p = line;
617 return token (KW_eof);
618 577
619 unsigned char *p = (unsigned char *)line; 578 if (!*p)
579 return KW_EOF;
620 580
581 // parse keyword
621 while (*p > ' ') 582 while (*p > ' ')
622 p++; 583 p++;
623 584
624 int len = p - (unsigned char *)line; 585 int klen = p - line;
625 586
626 while ((*p - 1) < ' ') 587 if (*p++ != '\n')
627 p++;
628
629 if (*p)
630 { 588 {
631 char *v = p; 589 // parse value
590 while (*p <= ' ' && *p != '\n') // skip 0x01 .. 0x20
591 ++p;
632 592
593 last_value = p;
594
633 while (*p && *p != '\n') 595 while (*p != '\n')
634 p++; 596 p++;
635 597
636 *p = 0; 598 *p++ = 0;
637
638 return token (k, v);
639 } 599 }
640 else 600 else
641 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;
642 } 620 }
643#endif
644} 621}
645 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
646///////////////////////////////////////////////////////////////////////////// 697/////////////////////////////////////////////////////////////////////////////
647 698
648extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr) 699extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr)
649{ 700{
650 return 0; 701 return 0;
… …
758 char *argv[] = { 809 char *argv[] = {
759 "", 810 "",
760 "-e" 811 "-e"
761 "cf->bootstrap;" 812 "cf->bootstrap;"
762 "unshift @INC, cf::datadir ();" 813 "unshift @INC, cf::datadir ();"
814 "require cf;"
763 }; 815 };
764 816
765 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))
766 { 818 {
767 printf ("unable to initialize perl-interpreter, aborting.\n"); 819 printf ("unable to initialize perl-interpreter, aborting.\n");
768 exit (EXIT_FAILURE); 820 exit (EXIT_FAILURE);
769 } 821 }
770 822
771 obj_cache = newHV (); 823 obj_cache = newHV ();
772}
773
774void cfperl_boot ()
775{
776 perl_booted = true;
777
778 eval_pv ("require cf", 1);
779} 824}
780 825
781void cfperl_main () 826void cfperl_main ()
782{ 827{
783 dSP; 828 dSP;
… …
1359 1404
1360 const_iv (SK_EXP_ADD_SKILL) 1405 const_iv (SK_EXP_ADD_SKILL)
1361 const_iv (SK_EXP_TOTAL) 1406 const_iv (SK_EXP_TOTAL)
1362 const_iv (SK_EXP_NONE) 1407 const_iv (SK_EXP_NONE)
1363 const_iv (SK_SUBTRACT_SKILL_EXP) 1408 const_iv (SK_SUBTRACT_SKILL_EXP)
1409 const_iv (SK_EXP_SKILL_ONLY)
1364 1410
1365 const_iv (SK_LOCKPICKING) 1411 const_iv (SK_LOCKPICKING)
1366 const_iv (SK_HIDING) 1412 const_iv (SK_HIDING)
1367 const_iv (SK_SMITHERY) 1413 const_iv (SK_SMITHERY)
1368 const_iv (SK_BOWYER) 1414 const_iv (SK_BOWYER)

Diff Legend

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