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.33 by elmex, Thu Aug 31 01:03:36 2006 UTC vs.
Revision 1.41 by root, Sun Sep 3 22:45:57 2006 UTC

… …
24*/ 24*/
25 25
26#define PLUGIN_NAME "perl" 26#define PLUGIN_NAME "perl"
27#define PLUGIN_VERSION "cfperl 0.5" 27#define PLUGIN_VERSION "cfperl 0.5"
28 28
29#ifndef __CEXTRACT__
30#include <plugin.h>
31#endif
32
33#undef MODULEAPI
34#ifdef WIN32
35#else
36#define MODULEAPI
37#endif
38
39#include <plugin_common.h> 29#include <plugin_common.h>
40#include <sounds.h> 30#include <sounds.h>
41#include <cstdarg> 31#include <cstdarg>
42#include <sproto.h> 32#include <sproto.h>
43 33
… …
60#define SvVAL64 SvNV 50#define SvVAL64 SvNV
61 51
62static f_plug_api gethook = cfapi_get_hooks; 52static f_plug_api gethook = cfapi_get_hooks;
63static f_plug_api object_set_property = cfapi_object_set_property; 53static f_plug_api object_set_property = cfapi_object_set_property;
64static f_plug_api object_insert = cfapi_object_insert; 54static f_plug_api object_insert = cfapi_object_insert;
65
66static bool perl_booted;
67 55
68/* 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 */
69typedef struct 57typedef struct
70{ 58{
71 object* who; 59 object* who;
… …
336 { 324 {
337 SvREFCNT_dec (cb); 325 SvREFCNT_dec (cb);
338 cb = 0; 326 cb = 0;
339 } 327 }
340 328
341 if (attach)
342 {
343 free_string (attach);
344 attach = 0; 329 attach = 0;
345 }
346} 330}
347 331
348void attachable_base::optimise () 332void attachable_base::optimise ()
349{ 333{
350 if (!self) 334 if (!self)
… …
369 PUSHMARK (SP); 353 PUSHMARK (SP);
370 EXTEND (SP, 2); 354 EXTEND (SP, 2);
371 PUSHs (sv_2mortal (newSVdt (type, obj))); 355 PUSHs (sv_2mortal (newSVdt (type, obj)));
372 PUSHs (sv_2mortal (newSVpv (attach, 0))); 356 PUSHs (sv_2mortal (newSVpv (attach, 0)));
373 357
374 free_string (attach);
375 attach = 0; 358 attach = 0;
376 359
377 PUTBACK; 360 PUTBACK;
378 call_pv ("cf::instantiate", G_DISCARD | G_VOID | G_EVAL); 361 call_pv ("cf::instantiate", G_DISCARD | G_VOID | G_EVAL);
379 FREETMPS; 362 FREETMPS;
… …
414void reattach (attachable<subclass> *obj) 397void reattach (attachable<subclass> *obj)
415{ 398{
416 obj->optimise (); 399 obj->optimise ();
417 400
418 if (obj->self) 401 if (obj->self)
419 reattach (subclass::get_dt (), (subclass *)obj); 402 reattach ((data_type) cftype<subclass>::dt, (subclass *)obj);
420} 403}
421 404
405#include "kw_hash.h"
406
422object_freezer::object_freezer (const char *filename) 407object_freezer::object_freezer ()
408: dynbuf (128 * 1024, 64 * 1024)
423{ 409{
424 this->filename = (SV *)newSVpv (filename, 0);
425
426 char filename2 [4096];
427 snprintf (filename2, 4096, "%s~", filename);
428
429 av = newAV (); 410 av = newAV ();
430
431 // TODO: fast dynbuf implementation... yeah, we need obstacks
432 text = newSV (10 * 1024 * 1024); // only temporarily used, so be generous
433} 411}
434 412
435object_freezer::~object_freezer () 413object_freezer::~object_freezer ()
414{
415 SvREFCNT_dec (av);
416}
417
418void object_freezer::put (attachable_base *ext)
419{
420 ext->optimise ();
421
422 if (ext->self)
423 {
424 int idx = AvFILLp ((AV *)av) + 1;
425 av_store (av, idx, SvREFCNT_inc (ext->self));
426
427 add ((void *)"oid ", 4);
428 add ((sint32)idx);
429 add ('\n');
430 }
431}
432
433bool object_freezer::save (const char *filename)
436{ 434{
437 dSP; 435 dSP;
438 ENTER; 436 ENTER;
439 SAVETMPS; 437 SAVETMPS;
440 PUSHMARK (SP); 438 PUSHMARK (SP);
439 EXTEND (SP, 3);
441 XPUSHs (sv_2mortal ((SV *)filename)); 440 PUSHs (sv_2mortal (newSVpv (filename, 0)));
442 XPUSHs (sv_2mortal (newRV_noinc (text))); 441 PUSHs (sv_2mortal (newRV_noinc (newSVpvn ((char *)linearise (), size ()))));
443 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 442 PUSHs (sv_2mortal (newRV_inc ((SV *)av)));
444 PUTBACK; 443 PUTBACK;
445 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);
446 FREETMPS; 445 FREETMPS;
447 LEAVE; 446 LEAVE;
448} 447}
449 448
450void object_freezer::put (attachable_base *ext)
451{
452 ext->optimise ();
453
454 if (ext->self)
455 {
456 int idx = AvFILLp ((AV *)av) + 1;
457 av_store (av, idx, SvREFCNT_inc (ext->self));
458
459 sv_catpvf (text, "oid %d\n", idx);
460 }
461}
462
463int fprintf (object_freezer &freezer, const char *format, ...) 449int fprintf (object_freezer &freezer, const char *format, ...)
464{ 450{
465 va_list ap; 451 va_list ap;
466 452
467 va_start (ap, format); 453 va_start (ap, format);
468 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
469 va_end (ap); 460 va_end (ap);
470} 461}
471 462
472int fputs (const char *s, object_freezer &freezer) 463int fputs (const char *s, object_freezer &freezer)
473{ 464{
474 sv_catpvn (freezer.text, s, strlen (s)); 465 freezer.add (s);
475} 466}
476 467
477object_thawer::object_thawer (const char *filename) 468object_thawer::object_thawer (const char *filename)
478{ 469{
470 static const char eof[] = "\n\n\n\0\0\0";
471
479 av = 0; 472 av = 0;
480 fp = 0; 473 text = 0;
481 474
482 if (!filename) 475 if (filename)
483 return;
484
485 fp = fopen (filename, "r");
486 if (!fp)
487 {
488 LOG (llevError, "object_thawer: unable to open '%s': %s.\n", filename, strerror (errno));
489 return;
490 }
491
492 if (perl_booted)
493 { 476 {
494 dSP; 477 dSP;
495 ENTER; 478 ENTER;
496 SAVETMPS; 479 SAVETMPS;
497 PUSHMARK (SP); 480 PUSHMARK (SP);
498 XPUSHs (sv_2mortal (newSVpv (filename, 0))); 481 XPUSHs (sv_2mortal (newSVpv (filename, 0)));
499 PUTBACK; 482 PUTBACK;
500 483
501 if (0 < call_pv ("cf::object_thawer_load", G_SCALAR | G_EVAL)) 484 if (2 == call_pv ("cf::object_thawer_load", G_ARRAY | G_EVAL))
502 { 485 {
503 SPAGAIN; 486 SPAGAIN;
487
488 // second value - perl objects
489 {
504 SV *sv = POPs; 490 SV *sv = POPs;
505 if (SvROK (sv)) 491 if (SvROK (sv))
506 av = (AV *)SvREFCNT_inc (SvRV (sv)); 492 av = (AV *)SvREFCNT_inc (SvRV (sv));
493 }
494
495 // first value - text part, pad with 3 zeroes
496 {
497 SV *sv = POPs;
498 STRLEN len;
499 char *sv_ = SvPVbyte (sv, len);
500 text = newSV (len + sizeof (eof));
501 SvCUR_set (text, len);
502 memcpy (SvPVX (text), sv_, len);
503 memcpy (SvEND (text), eof, sizeof (eof)); // just to be sure
504 }
507 } 505 }
508 506
507 PUTBACK;
509 FREETMPS; 508 FREETMPS;
510 LEAVE; 509 LEAVE;
511 } 510 }
511
512 if (!text)
513 text = newSVpvn (eof, sizeof (eof));
514
515 line = SvPVX (text);
512} 516}
513 517
514void object_thawer::get (data_type type, void *obj, attachable_base *ext, int oid) 518void object_thawer::get (data_type type, void *obj, attachable_base *ext, int oid)
515{ 519{
516 if (!av || oid < 0) // this is actually an error of sorts 520 if (!av || oid < 0) // this is actually an error of sorts
… …
533 reattach (type, obj); 537 reattach (type, obj);
534} 538}
535 539
536object_thawer::~object_thawer () 540object_thawer::~object_thawer ()
537{ 541{
538 if (fp) fclose (fp); 542 if (text) SvREFCNT_dec (text);
539 if (av) SvREFCNT_dec ((AV *)av); 543 if (av) SvREFCNT_dec (av);
544}
545
546char *fgets (char *s, int n, object_thawer &thawer)
547{
548 char *p = thawer.line;
549 char *q = s;
550
551 while (--n)
552 {
553 if (!*p)
554 break;
555
556 *q++ = *p;
557
558 if (*p++ == '\n')
559 break;
560 }
561
562 *q = 0;
563 thawer.line = p;
564
565 return s == q ? 0 : s;
566}
567
568keyword object_thawer::get_kv ()
569{
570 for (;;)
571 {
572 char *p = line;
573
574 if (!*p)
575 return KW_EOF;
576
577 // parse keyword
578 while (*p > ' ')
579 p++;
580
581 int klen = p - line;
582
583 if (*p++ != '\n')
584 {
585 // parse value
586 while (*p <= ' ' && *p != '\n') // skip 0x01 .. 0x20
587 ++p;
588
589 last_value = p;
590
591 while (*p != '\n')
592 p++;
593
594 *p++ = 0;
595 }
596 else
597 last_value = 0;
598
599 line [klen] = 0;
600 keyword_idx *kw = kw_lex::match (line, klen);
601
602 //printf ("KV %d<%s,%s>\n", kw ? kw->index : 0, line, last_value);//D
603
604 if (kw)
605 {
606 line = p;
607 return kw->index;
608 }
609 else if (!*line || *line == '#')
610 {
611 // empty/comment line
612 line = p;
613 }
614 else
615 return KW_ERROR;
616 }
617}
618
619void object_thawer::get (shstr &sh) const
620{
621 if (last_value)
622 sh = last_value;
623 else
624 {
625 sh = "<value missing>";
626 LOG (llevError, "keyword requires value: <%s>\n", line);//TODO: add filename
627 }
628}
629
630void object_thawer::get_ml (keyword kend, shstr &sh)
631{
632 char kw[128];
633
634 // multi-line strings are delimited by "\nendXXX\n"
635 kw [0] = '\n';
636 strcpy (kw + 1, keyword_str [kend]);
637
638 char *end = strstr (line, kw);
639
640 if (!end)
641 {
642 sh = 0;
643 return;
644 }
645
646 *end = 0;
647 sh = line;
648
649 line = end + keyword_len [kend] + 1;
650
651 while (*line++ != '\n')
652 ;
653}
654
655sint32 object_thawer::get_sint32 () const
656{
657 char *p = last_value;
658
659 if (!p)
660 return 0;
661
662 sint32 val = 0;
663 bool negate;
664
665 if (*p == '-')
666 {
667 negate = true;
668 ++p;
669 }
670 else
671 negate = false;
672
673 do
674 {
675 val *= 10;
676 val += *p++ - '0';
677 }
678 while (*p);
679
680 return negate ? -val : val;
681}
682
683sint64 object_thawer::get_sint64 () const
684{
685 return last_value ? atoll (last_value) : 0;
686}
687
688double object_thawer::get_double () const
689{
690 return last_value ? atof (last_value) : 0;
540} 691}
541 692
542///////////////////////////////////////////////////////////////////////////// 693/////////////////////////////////////////////////////////////////////////////
543 694
544extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr) 695extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr)
… …
654 char *argv[] = { 805 char *argv[] = {
655 "", 806 "",
656 "-e" 807 "-e"
657 "cf->bootstrap;" 808 "cf->bootstrap;"
658 "unshift @INC, cf::datadir ();" 809 "unshift @INC, cf::datadir ();"
810 "require cf;"
659 }; 811 };
660 812
661 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) || perl_run (perl)) 813 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) || perl_run (perl))
662 { 814 {
663 printf ("unable to initialize perl-interpreter, aborting.\n"); 815 printf ("unable to initialize perl-interpreter, aborting.\n");
664 exit (EXIT_FAILURE); 816 exit (EXIT_FAILURE);
665 } 817 }
666 818
667 obj_cache = newHV (); 819 obj_cache = newHV ();
668}
669
670void cfperl_boot ()
671{
672 perl_booted = true;
673
674 eval_pv ("require cf", 1);
675} 820}
676 821
677void cfperl_main () 822void cfperl_main ()
678{ 823{
679 dSP; 824 dSP;
… …
1255 1400
1256 const_iv (SK_EXP_ADD_SKILL) 1401 const_iv (SK_EXP_ADD_SKILL)
1257 const_iv (SK_EXP_TOTAL) 1402 const_iv (SK_EXP_TOTAL)
1258 const_iv (SK_EXP_NONE) 1403 const_iv (SK_EXP_NONE)
1259 const_iv (SK_SUBTRACT_SKILL_EXP) 1404 const_iv (SK_SUBTRACT_SKILL_EXP)
1405 const_iv (SK_EXP_SKILL_ONLY)
1260 1406
1261 const_iv (SK_LOCKPICKING) 1407 const_iv (SK_LOCKPICKING)
1262 const_iv (SK_HIDING) 1408 const_iv (SK_HIDING)
1263 const_iv (SK_SMITHERY) 1409 const_iv (SK_SMITHERY)
1264 const_iv (SK_BOWYER) 1410 const_iv (SK_BOWYER)
… …
2320 RETVAL 2466 RETVAL
2321 2467
2322 2468
2323MODULE = cf PACKAGE = cf::arch 2469MODULE = cf PACKAGE = cf::arch
2324 2470
2471archetype *find (const char *name)
2472 CODE:
2473 RETVAL = find_archetype (name);
2474 OUTPUT:
2475 RETVAL
2476
2325archetype *first() 2477archetype *first()
2326 PROTOTYPE: 2478 PROTOTYPE:
2327 CODE: 2479 CODE:
2328 RETVAL = first_archetype; 2480 RETVAL = first_archetype;
2329 OUTPUT: RETVAL 2481 OUTPUT: RETVAL

Diff Legend

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