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.246 by root, Thu Aug 30 07:28:25 2007 UTC vs.
Revision 1.253 by root, Mon Sep 10 17:24:36 2007 UTC

… …
53#include "CoroAPI.h" 53#include "CoroAPI.h"
54#include "perlxsi.c" 54#include "perlxsi.c"
55 55
56extern sint64 *levels; // the experience table 56extern sint64 *levels; // the experience table
57 57
58typedef object object_ornull; 58typedef object_thawer &object_thawer_ref;
59typedef maptile maptile_ornull; 59typedef object_freezer &object_freezer_ref;
60
61typedef char *octet_string;
62typedef char *utf8_string;
63typedef const char *const_octet_string;
64typedef const char *const_utf8_string;
65 60
66typedef std::string std__string; 61typedef std::string std__string;
67 62
68#if IVSIZE >= 8 63#if IVSIZE >= 8
69 typedef IV val64; 64 typedef IV val64;
… …
102 *stash_cf_living_wrap; 97 *stash_cf_living_wrap;
103 98
104static inline SV * 99static inline SV *
105newSVpv_utf8 (const char *s) 100newSVpv_utf8 (const char *s)
106{ 101{
102 if (!s)
103 return newSV (0);
104
107 SV *sv = newSVpv (s, 0); 105 SV *sv = newSVpv (s, 0);
108 SvUTF8_on (sv); 106 SvUTF8_on (sv);
109 return sv; 107 return sv;
110} 108}
111 109
112static inline SV * 110static inline SV *
113newSVpvn_utf8 (const char *s, STRLEN l) 111newSVpvn_utf8 (const char *s, STRLEN l)
114{ 112{
113 if (!s)
114 return newSV (0);
115
115 SV *sv = newSVpvn (s, l); 116 SV *sv = newSVpvn (s, l);
116 SvUTF8_on (sv); 117 SvUTF8_on (sv);
117 return sv; 118 return sv;
118} 119}
119 120
… …
326newSVptr (void *ptr, HV *stash, HV *hv = newHV ()) 327newSVptr (void *ptr, HV *stash, HV *hv = newHV ())
327{ 328{
328 SV *sv; 329 SV *sv;
329 330
330 if (!ptr) 331 if (!ptr)
331 return &PL_sv_undef; 332 return newSV (0);
332 333
333 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, 0, (char *)ptr, 0); 334 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, 0, (char *)ptr, 0);
334 return sv_bless (newRV_noinc ((SV *)hv), stash); 335 return sv_bless (newRV_noinc ((SV *)hv), stash);
335} 336}
336 337
… …
355 356
356static SV * 357static SV *
357newSVattachable (attachable *obj, HV *stash) 358newSVattachable (attachable *obj, HV *stash)
358{ 359{
359 if (!obj) 360 if (!obj)
360 return &PL_sv_undef; 361 return newSV (0);
361 362
362 if (!obj->self) 363 if (!obj->self)
363 obj->self = newHV (); 364 obj->self = newHV ();
364 365
365 if (!SvOBJECT (obj->self)) 366 if (!SvOBJECT (obj->self))
… …
412 return SvPTR (sv, klass); 413 return SvPTR (sv, klass);
413 else 414 else
414 return 0; 415 return 0;
415} 416}
416 417
417inline SV *to_sv (const shstr & v) { return v ? newSVpvn_utf8 ((const char *)v, v.length ()) : &PL_sv_undef; } 418inline SV *to_sv (const shstr & v) { return newSVpvn_utf8 ((const char *)v, v.length ()); }
418inline SV *to_sv (const char * v) { return newSVpv (v, 0); } 419inline SV *to_sv (const char * v) { return v ? newSVpv (v, 0) : newSV (0); }
419inline SV *to_sv (bool v) { return newSViv (v); } 420inline SV *to_sv (bool v) { return newSViv (v); }
420inline SV *to_sv ( signed char v) { return newSViv (v); } 421inline SV *to_sv ( signed char v) { return newSViv (v); }
421inline SV *to_sv (unsigned char v) { return newSViv (v); } 422inline SV *to_sv (unsigned char v) { return newSViv (v); }
422inline SV *to_sv ( signed short v) { return newSViv (v); } 423inline SV *to_sv ( signed short v) { return newSViv (v); }
423inline SV *to_sv (unsigned short v) { return newSVuv (v); } 424inline SV *to_sv (unsigned short v) { return newSVuv (v); }
… …
449 char buf[128]; 450 char buf[128];
450 snprintf (buf, 128, "<1.%" PRIx64 ">", v.seq); 451 snprintf (buf, 128, "<1.%" PRIx64 ">", v.seq);
451 return newSVpv (buf, 0); 452 return newSVpv (buf, 0);
452} 453}
453 454
454inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPVutf8_nolen (sv) : 0; } 455inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPVutf8_nolen (sv) : 0; }
455inline void sv_to (SV *sv, char * &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; } 456inline void sv_to (SV *sv, char * &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; }
456inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); } 457inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }
457inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); } 458inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); }
458inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); } 459inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); }
459inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); } 460inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); }
460inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); } 461inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); }
461inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); } 462inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); }
462inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); } 463inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); }
463inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); } 464inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); }
464inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); } 465inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); }
465inline void sv_to (SV *sv, signed long long &v) { v = ( signed long long)SvVAL64 (sv); } 466inline void sv_to (SV *sv, signed long long &v) { v = ( signed long long)SvVAL64 (sv); }
466inline void sv_to (SV *sv, unsigned long long &v) { v = (unsigned long long)SvVAL64 (sv); } 467inline void sv_to (SV *sv, unsigned long long &v) { v = (unsigned long long)SvVAL64 (sv); }
467inline void sv_to (SV *sv, float &v) { v = SvNV (sv); } 468inline void sv_to (SV *sv, float &v) { v = SvNV (sv); }
468inline void sv_to (SV *sv, double &v) { v = SvNV (sv); } 469inline void sv_to (SV *sv, double &v) { v = SvNV (sv); }
469inline void sv_to (SV *sv, client * &v) { v = (client *)(attachable *)SvPTR_ornull (sv, "cf::client"); } 470inline void sv_to (SV *sv, client * &v) { v = (client *)(attachable *)SvPTR_ornull (sv, "cf::client"); }
470inline void sv_to (SV *sv, player * &v) { v = (player *)(attachable *)SvPTR_ornull (sv, "cf::player"); } 471inline void sv_to (SV *sv, player * &v) { v = (player *)(attachable *)SvPTR_ornull (sv, "cf::player"); }
471inline void sv_to (SV *sv, object * &v) { v = (object *)(attachable *)SvPTR_ornull (sv, "cf::object"); } 472inline void sv_to (SV *sv, object * &v) { v = (object *)(attachable *)SvPTR_ornull (sv, "cf::object"); }
472inline void sv_to (SV *sv, archetype * &v) { v = (archetype *)(attachable *)SvPTR_ornull (sv, "cf::arch"); } 473inline void sv_to (SV *sv, archetype * &v) { v = (archetype *)(attachable *)SvPTR_ornull (sv, "cf::arch"); }
473inline void sv_to (SV *sv, maptile * &v) { v = (maptile *)(attachable *)SvPTR_ornull (sv, "cf::map"); } 474inline void sv_to (SV *sv, maptile * &v) { v = (maptile *)(attachable *)SvPTR_ornull (sv, "cf::map"); }
474inline void sv_to (SV *sv, region * &v) { v = (region *)(attachable *)SvPTR_ornull (sv, "cf::region"); } 475inline void sv_to (SV *sv, region * &v) { v = (region *)(attachable *)SvPTR_ornull (sv, "cf::region"); }
475inline void sv_to (SV *sv, attachable * &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); } 476inline void sv_to (SV *sv, attachable * &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); }
476inline void sv_to (SV *sv, partylist * &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); } 477inline void sv_to (SV *sv, partylist * &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); }
477inline void sv_to (SV *sv, living * &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); } 478inline void sv_to (SV *sv, living * &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); }
479inline void sv_to (SV *sv, object_freezer * &v) { v = (object_freezer *)SvPTR_ornull (sv, "cf::object::freezer"); }
480inline void sv_to (SV *sv, object_thawer * &v) { v = (object_thawer *)SvPTR_ornull (sv, "cf::object::thawer" ); }
478 481
479//inline void sv_to (SV *sv, faceinfo * &v) { v = &faces [face_find (SvPV_nolen (sv), 0)]; } 482//inline void sv_to (SV *sv, faceinfo * &v) { v = &faces [face_find (SvPV_nolen (sv), 0)]; }
480inline void sv_to (SV *sv, treasurelist * &v) { v = treasurelist::find (SvPV_nolen (sv)); } 483inline void sv_to (SV *sv, treasurelist * &v) { v = treasurelist::find (SvPV_nolen (sv)); }
481 484
482template<class T> 485template<class T>
483inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; } 486inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; }
484 487
485template<int N> 488template<int N>
486inline void sv_to (SV *sv, char (&v)[N]) { assign (v, SvPV_nolen (sv)); } 489inline void sv_to (SV *sv, char (&v)[N]) { assign (v, SvPV_nolen (sv)); }
487 490
488inline void sv_to (SV *sv, bowtype_t &v) { v = (bowtype_t) SvIV (sv); } 491inline void sv_to (SV *sv, bowtype_t &v) { v = (bowtype_t) SvIV (sv); }
489inline void sv_to (SV *sv, petmode_t &v) { v = (petmode_t) SvIV (sv); } 492inline void sv_to (SV *sv, petmode_t &v) { v = (petmode_t) SvIV (sv); }
490inline void sv_to (SV *sv, usekeytype &v) { v = (usekeytype) SvIV (sv); } 493inline void sv_to (SV *sv, usekeytype &v) { v = (usekeytype) SvIV (sv); }
491inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); } 494inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); }
492 495
493inline void sv_to (SV *sv, std::string &v) 496inline void sv_to (SV *sv, std::string &v)
494{ 497{
495 STRLEN len; 498 STRLEN len;
496 char *data = SvPVbyte (sv, len); 499 char *data = SvPVbyte (sv, len);
497 v.assign (data, len); 500 v.assign (data, len);
498} 501}
499 502
500inline void sv_to (SV *sv, UUID &v) 503inline void sv_to (SV *sv, UUID &v)
501{ 504{
502 unsigned int version; 505 unsigned int version;
503 506
504 if (2 != sscanf (SvPV_nolen (sv), "<%d.%" SCNx64 ">", &version, &v.seq) || 1 != version) 507 if (2 != sscanf (SvPV_nolen (sv), "<%d.%" SCNx64 ">", &version, &v.seq) || 1 != version)
505 croak ("unparsable uuid: %s", SvPV_nolen (sv)); 508 croak ("unparsable uuid: %s", SvPV_nolen (sv));
… …
527 break; 530 break;
528 531
529 case DT_STRING: 532 case DT_STRING:
530 { 533 {
531 char *str = (char *)va_arg (ap, const char *); 534 char *str = (char *)va_arg (ap, const char *);
532 sv = str ? newSVpv (str, 0) : &PL_sv_undef; 535 sv = str ? newSVpv (str, 0) : newSV (0);
533 } 536 }
534 break; 537 break;
535 538
536 case DT_DATA: 539 case DT_DATA:
537 { 540 {
538 char *str = (char *)va_arg (ap, const void *); 541 char *str = (char *)va_arg (ap, const void *);
539 int len = va_arg (ap, int); 542 int len = va_arg (ap, int);
540 sv = str ? newSVpv (str, len) : &PL_sv_undef; 543 sv = str ? newSVpv (str, len) : newSV (0);
541 } 544 }
542 break; 545 break;
543 546
544 case DT_OBJECT: 547 case DT_OBJECT:
545 sv = to_sv (va_arg (ap, object *)); 548 sv = to_sv (va_arg (ap, object *));
… …
988{ 991{
989 return SvNV (cfperl_result (idx)); 992 return SvNV (cfperl_result (idx));
990} 993}
991 994
992///////////////////////////////////////////////////////////////////////////// 995/////////////////////////////////////////////////////////////////////////////
996// various c++ => perl glue functions
993 997
994void 998void
995cfperl_emergency_save () 999cfperl_emergency_save ()
996{ 1000{
997 CALL_BEGIN (0); 1001 CALL_BEGIN (0);
… …
1132 CALL_BEGIN (2); 1136 CALL_BEGIN (2);
1133 CALL_ARG (this); 1137 CALL_ARG (this);
1134 CALL_ARG (exit); 1138 CALL_ARG (exit);
1135 CALL_CALL ("cf::object::player::enter_exit", G_VOID); 1139 CALL_CALL ("cf::object::player::enter_exit", G_VOID);
1136 CALL_END; 1140 CALL_END;
1141}
1142
1143const char *
1144object::ref () const
1145{
1146 if (type == PLAYER)
1147 return format ("player/<1.%llx>/%s", (unsigned long long)uuid.seq, &name);
1148 else
1149 return 0;
1150}
1151
1152object *
1153object::deref (const char *ref)
1154{
1155 object *retval = 0;
1156
1157 if (ref)
1158 {
1159 CALL_BEGIN (1);
1160 CALL_ARG (ref);
1161 CALL_CALL ("cf::object::deref", G_SCALAR);
1162
1163 if (count)
1164 sv_to (POPs, retval);
1165
1166 CALL_END;
1167 }
1168
1169 return retval;
1137} 1170}
1138 1171
1139void 1172void
1140log_backtrace (const char *msg) 1173log_backtrace (const char *msg)
1141{ 1174{
… …
1405 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED) 1438 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED)
1406 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN) 1439 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN)
1407 const_iv (NDI_LT_GREEN) const_iv (NDI_GREY) const_iv (NDI_BROWN) const_iv (NDI_GOLD) 1440 const_iv (NDI_LT_GREEN) const_iv (NDI_GREY) const_iv (NDI_BROWN) const_iv (NDI_GOLD)
1408 const_iv (NDI_TAN) const_iv (NDI_MAX_COLOR) const_iv (NDI_COLOR_MASK) const_iv (NDI_UNIQUE) 1441 const_iv (NDI_TAN) const_iv (NDI_MAX_COLOR) const_iv (NDI_COLOR_MASK) const_iv (NDI_UNIQUE)
1409 const_iv (NDI_ALL) const_iv (NDI_DEF) const_iv (NDI_REPLY) const_iv (NDI_CLIENT_MASK) 1442 const_iv (NDI_ALL) const_iv (NDI_DEF) const_iv (NDI_REPLY) const_iv (NDI_CLIENT_MASK)
1410 const_iv (NDI_NOCREATE) 1443 const_iv (NDI_NOCREATE) const_iv (NDI_CLEAR)
1411 1444
1412 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE) 1445 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE)
1413 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF) 1446 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF)
1414 1447
1415 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_DAMAGE) 1448 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_DAMAGE)
… …
1522 const_iv (MAP_IN_MEMORY) const_iv (MAP_SWAPPED) const_iv (MAP_LOADING) const_iv (MAP_SAVING) 1555 const_iv (MAP_IN_MEMORY) const_iv (MAP_SWAPPED) const_iv (MAP_LOADING) const_iv (MAP_SAVING)
1523 1556
1524 const_iv (KLASS_ATTACHABLE) const_iv (KLASS_GLOBAL) const_iv (KLASS_OBJECT) 1557 const_iv (KLASS_ATTACHABLE) const_iv (KLASS_GLOBAL) const_iv (KLASS_OBJECT)
1525 const_iv (KLASS_CLIENT) const_iv (KLASS_PLAYER) const_iv (KLASS_MAP) 1558 const_iv (KLASS_CLIENT) const_iv (KLASS_PLAYER) const_iv (KLASS_MAP)
1526 1559
1560 const_iv (VERSION_CS) const_iv (VERSION_SC)
1561
1527 const_iv (CS_QUERY_YESNO) const_iv (CS_QUERY_SINGLECHAR) const_iv (CS_QUERY_HIDEINPUT) 1562 const_iv (CS_QUERY_YESNO) const_iv (CS_QUERY_SINGLECHAR) const_iv (CS_QUERY_HIDEINPUT)
1528 1563
1529 const_iv (ST_DEAD) const_iv (ST_SETUP) const_iv (ST_PLAYING) const_iv (ST_CUSTOM) 1564 const_iv (ST_DEAD) const_iv (ST_SETUP) const_iv (ST_PLAYING) const_iv (ST_CUSTOM)
1530 1565
1531 const_iv (IO_HEADER) const_iv (IO_OBJECTS) const_iv (IO_UNIQUES) 1566 const_iv (IO_HEADER) const_iv (IO_OBJECTS) const_iv (IO_UNIQUES)
… …
2531 OUTPUT: 2566 OUTPUT:
2532 RETVAL 2567 RETVAL
2533 2568
2534MODULE = cf PACKAGE = cf::arch 2569MODULE = cf PACKAGE = cf::arch
2535 2570
2536archetype *find (utf8_string name)
2537 CODE:
2538 RETVAL = archetype::find (name);
2539 OUTPUT:
2540 RETVAL
2541
2542int archetypes_size () 2571int archetypes_size ()
2543 CODE: 2572 CODE:
2544 RETVAL = archetypes.size (); 2573 RETVAL = archetypes.size ();
2545 OUTPUT: RETVAL 2574 OUTPUT: RETVAL
2546 2575
… …
2803void invalidate_all () 2832void invalidate_all ()
2804 CODE: 2833 CODE:
2805 for_all_clients (ns) 2834 for_all_clients (ns)
2806 ns->anims_sent.reset (); 2835 ns->anims_sent.reset ();
2807 2836
2837MODULE = cf PACKAGE = cf::object::freezer
2838
2839INCLUDE: $PERL $srcdir/genacc object_freezer ../include/cfperl.h |
2840
2841SV *
2842new (char *klass)
2843 CODE:
2844 RETVAL = newSVptr (new object_freezer, gv_stashpv ("cf::object::freezer", 1));
2845 OUTPUT: RETVAL
2846
2847void
2848DESTROY (SV *sv)
2849 CODE:
2850 object_freezer *self;
2851 sv_to (sv, self);
2852 delete self;
2853
2854MODULE = cf PACKAGE = cf::object::thawer
2855
2856INCLUDE: $PERL $srcdir/genacc object_thawer ../include/cfperl.h |
2857
2858SV *
2859new_from_file (char *klass, octet_string path)
2860 CODE:
2861 object_thawer *f = new object_thawer (path);
2862 if (!*f)
2863 {
2864 delete f;
2865 XSRETURN_UNDEF;
2866 }
2867 RETVAL = newSVptr (f, gv_stashpv ("cf::object::thawer", 1));
2868 OUTPUT: RETVAL
2869
2870void
2871DESTROY (SV *sv)
2872 CODE:
2873 object_thawer *self;
2874 sv_to (sv, self);
2875 delete self;
2876
2877void
2878extract_tags (object_thawer *self)
2879 CODE:
2880 while (self->kw != KW_EOF)
2881 {
2882 coroapi::cede_to_tick_every (5000);
2883
2884 if (self->kw == KW_tag)
2885 XPUSHs (sv_2mortal (to_sv (self->get_str ())));
2886
2887 self->skip ();
2888 }
2889

Diff Legend

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