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.15 by root, Sun Aug 27 13:04:43 2006 UTC vs.
Revision 1.18 by root, Mon Aug 28 07:07:42 2006 UTC

… …
108 108
109 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0); 109 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0);
110 return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 110 return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
111} 111}
112 112
113template<class extendable> 113template<class attachable>
114SV * 114SV *
115newSVextendable (extendable *obj, const char *klass) 115newSVattachable (attachable *obj, const char *klass)
116{ 116{
117 if (!obj) 117 if (!obj)
118 return &PL_sv_undef; 118 return &PL_sv_undef;
119 119
120 if (!obj->self) 120 if (!obj->self)
… …
227 break; 227 break;
228 228
229 case DT_OBJECT: 229 case DT_OBJECT:
230 { 230 {
231 object *obj = va_arg (ap, object *); 231 object *obj = va_arg (ap, object *);
232 sv = newSVextendable (obj, obj && obj->type == PLAYER ? "cf::object::player::wrap" : "cf::object::wrap"); 232 sv = newSVattachable (obj, obj && obj->type == PLAYER ? "cf::object::player::wrap" : "cf::object::wrap");
233 } 233 }
234 break; 234 break;
235 235
236 case DT_MAP: 236 case DT_MAP:
237 // va_arg (object *) when void * is passed is an XSI extension 237 // va_arg (object *) when void * is passed is an XSI extension
238 sv = newSVextendable (va_arg (ap, mapstruct *), "cf::map::wrap"); 238 sv = newSVattachable (va_arg (ap, mapstruct *), "cf::map::wrap");
239 break; 239 break;
240 240
241 case DT_PLAYER: 241 case DT_PLAYER:
242 sv = newSVextendable (va_arg (ap, player *), "cf::player::wrap"); 242 sv = newSVattachable (va_arg (ap, player *), "cf::player::wrap");
243 break; 243 break;
244 244
245 case DT_ARCH: 245 case DT_ARCH:
246 sv = newSVptr (va_arg (ap, archetype *), "cf::arch::wrap"); 246 sv = newSVptr (va_arg (ap, archetype *), "cf::arch::wrap");
247 break; 247 break;
… …
304} 304}
305 305
306////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 306//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
307 307
308SV * 308SV *
309registry_of (extendable_base *ext) 309registry_of (attachable_base *ext)
310{ 310{
311 if (!ext->cb) 311 if (!ext->cb)
312 ext->cb = newAV (); 312 ext->cb = newAV ();
313 313
314 return newRV_inc ((SV *)ext->cb); 314 return newRV_inc ((SV *)ext->cb);
315} 315}
316 316
317void extendable_base::clear () 317void attachable_base::clear ()
318{ 318{
319 //if (self) fprintf (stderr, "free_ob_self %p %s (%p,%p)\n", this, ((object *)this)->name, self, cb);//D 319 //if (self) fprintf (stderr, "free_ob_self %p %s (%p,%p)\n", this, ((object *)this)->name, self, cb);//D
320 320
321 if (self) SvREFCNT_dec (self); 321 if (self) SvREFCNT_dec (self);
322 if (cb) SvREFCNT_dec (cb); 322 if (cb) SvREFCNT_dec (cb);
… …
326 self = 0; 326 self = 0;
327 cb = 0; 327 cb = 0;
328 attach = 0; 328 attach = 0;
329} 329}
330 330
331void extendable_base::optimise () 331void attachable_base::optimise ()
332{ 332{
333 if (!self) 333 if (!self)
334 return; 334 return;
335 335
336 HV *hv = (HV *)SvRV ((SV *)self); 336 HV *hv = (HV *)SvRV ((SV *)self);
… …
356 PUSHs (sv_2mortal (newSVpv (attach, 0))); 356 PUSHs (sv_2mortal (newSVpv (attach, 0)));
357 PUTBACK; 357 PUTBACK;
358 call_pv ("cf::instantiate", G_DISCARD | G_VOID | G_EVAL); 358 call_pv ("cf::instantiate", G_DISCARD | G_VOID | G_EVAL);
359 FREETMPS; 359 FREETMPS;
360 LEAVE; 360 LEAVE;
361
362 INVOKE_OBJECT (INSTANTIATE, this);
361} 363}
362 364
363///////////////////////////////////////////////////////////////////////////// 365/////////////////////////////////////////////////////////////////////////////
366
367void reattach (data_type type, void *obj)
368{
369 dSP;
370 ENTER;
371 SAVETMPS;
372 PUSHMARK (SP);
373 XPUSHs (sv_2mortal (newSVdt (type, obj)));
374 PUTBACK;
375 call_pv ("cf::reattach", G_DISCARD | G_VOID | G_EVAL);
376 FREETMPS;
377 LEAVE;
378
379 switch (type)
380 {
381 case DT_OBJECT: INVOKE_OBJECT (REATTACH, obj); break;
382 case DT_PLAYER: INVOKE_PLAYER (REATTACH, obj); break;
383 case DT_MAP: INVOKE_MAP (REATTACH, obj); break;
384 }
385}
386
387template<class subclass>
388void reattach (attachable<subclass> *obj)
389{
390 obj->optimise ();
391
392 if (obj->self)
393 reattach (subclass::get_dt (), (subclass *)obj);
394}
364 395
365object_freezer::object_freezer (const char *filename) 396object_freezer::object_freezer (const char *filename)
366: filename (filename) 397: filename (filename)
367{ 398{
368 av = (AV *)newAV (); 399 av = (AV *)newAV ();
369 idx = 0;
370 av_extend ((AV *)av, 1024);
371} 400}
372 401
373object_freezer::~object_freezer () 402object_freezer::~object_freezer ()
374{ 403{
375 dSP; 404 dSP;
… …
382 call_pv ("cf::object_freezer_save", G_VOID | G_DISCARD | G_EVAL); 411 call_pv ("cf::object_freezer_save", G_VOID | G_DISCARD | G_EVAL);
383 FREETMPS; 412 FREETMPS;
384 LEAVE; 413 LEAVE;
385} 414}
386 415
387void object_freezer::put (extendable_base *ext) 416void object_freezer::put (FILE *fp, attachable_base *ext)
388{ 417{
389 ext->optimise (); 418 ext->optimise ();
390 419
391 if (ext->self) 420 if (ext->self)
421 {
422 int idx = AvFILLp ((AV *)av) + 1;
392 av_store ((AV *)av, idx, SvREFCNT_inc ((SV *)ext->self)); 423 av_store ((AV *)av, idx, SvREFCNT_inc ((SV *)ext->self));
393 424 fprintf (fp, "oid %d\n", idx);
394 ++idx; 425 }
395} 426}
396 427
397object_thawer::object_thawer (const char *filename) 428object_thawer::object_thawer (const char *filename)
398{ 429{
399 av = 0; 430 av = 0;
400 idx = 0;
401 431
402 if (!filename) 432 if (!filename)
403 return; 433 return;
404 434
405 dSP; 435 dSP;
… …
419 449
420 FREETMPS; 450 FREETMPS;
421 LEAVE; 451 LEAVE;
422} 452}
423 453
424void reattach (data_type type, void *obj)
425{
426 dSP;
427 ENTER;
428 SAVETMPS;
429 PUSHMARK (SP);
430 XPUSHs (sv_2mortal (newSVdt (type, obj)));
431 PUTBACK;
432 call_pv ("cf::reattach", G_DISCARD | G_VOID | G_EVAL);
433 FREETMPS;
434 LEAVE;
435
436 switch (type)
437 {
438 case DT_OBJECT: INVOKE_OBJECT (REATTACH, obj); break;
439 case DT_PLAYER: INVOKE_PLAYER (REATTACH, obj); break;
440 case DT_MAP: INVOKE_MAP (REATTACH, obj); break;
441 }
442}
443
444template<class subclass>
445void reattach (extendable<subclass> *obj)
446{
447 obj->optimise ();
448
449 if (obj->self)
450 reattach (subclass::get_dt (), (subclass *)obj);
451}
452
453void object_thawer::get (data_type type, void *obj, extendable_base *ext) 454void object_thawer::get (data_type type, void *obj, attachable_base *ext, int oid)
454{ 455{
455 if (!av) 456 if (!av || oid < 0) // this is actually an error of sorts
456 return; 457 return;
457 458
458 // we have to "re-instantiate"/reattach to an object, so nuke ext->attach 459 // we have to "re-instantiate"/reattach to an object, so nuke ext->attach
459 ext->clear (); 460 ext->clear ();
460 461
461 SV **svp = av_fetch ((AV *)av, idx, 0); 462 SV **svp = av_fetch ((AV *)av, oid, 0);
462 463
463 ++idx;
464
465 if (!svp)
466 return;
467
468 if (SvROK (*svp)) 464 if (!svp || !SvROK (*svp))
469 { 465 {
470 ext->self = SvREFCNT_inc (*svp); 466 printf ("trying to thaw duplicate or never-issued oid %d, ignoring.\n", oid);
471 sv_magic (SvRV ((SV *)ext->self), 0, PERL_MAGIC_ext, (char *)obj, 0); 467 return;
472
473 reattach (type, obj);
474 } 468 }
469
470 ext->self = *svp; *svp = &PL_sv_undef;
471 sv_magic (SvRV ((SV *)ext->self), 0, PERL_MAGIC_ext, (char *)obj, 0);
472
473 reattach (type, obj);
475} 474}
476 475
477object_thawer::~object_thawer () 476object_thawer::~object_thawer ()
478{ 477{
479 if (av) 478 if (av)
… …
483///////////////////////////////////////////////////////////////////////////// 482/////////////////////////////////////////////////////////////////////////////
484 483
485extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr) 484extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr)
486{ 485{
487 gethook = gethooksptr; 486 gethook = gethooksptr;
488 printf (PLUGIN_VERSION " init\n");
489 487
490 return 0; 488 return 0;
491} 489}
492 490
493static CommArray_s rtn_cmd; 491static CommArray_s rtn_cmd;
… …
574extern "C" int cfperl_postInitPlugin () 572extern "C" int cfperl_postInitPlugin ()
575{ 573{
576 int hooktype = 1; 574 int hooktype = 1;
577 int rtype = 0; 575 int rtype = 0;
578 576
579 printf (PLUGIN_VERSION " post init\n");
580
581 systemDirectory = (void* (*)(int*, ...)) gethook (&rtype, hooktype, "cfapi_system_directory"); 577 systemDirectory = (void* (*)(int*, ...)) gethook (&rtype, hooktype, "cfapi_system_directory");
582 object_set_property = (void* (*)(int*, ...)) gethook (&rtype, hooktype, "cfapi_object_set_property"); 578 object_set_property = (void* (*)(int*, ...)) gethook (&rtype, hooktype, "cfapi_object_set_property");
583 map_get_map = (void* (*)(int*, ...)) gethook (&rtype, hooktype, "cfapi_map_get_map"); 579 map_get_map = (void* (*)(int*, ...)) gethook (&rtype, hooktype, "cfapi_map_get_map");
584 object_insert = (void* (*)(int*, ...)) gethook (&rtype, hooktype, "cfapi_object_insert"); 580 object_insert = (void* (*)(int*, ...)) gethook (&rtype, hooktype, "cfapi_object_insert");
585 581
… …
638static event_klass klass_of[NUM_EVENT_TYPES] = { 634static event_klass klass_of[NUM_EVENT_TYPES] = {
639# define def(type,name) KLASS_ ## type, 635# define def(type,name) KLASS_ ## type,
640# include "eventinc.h" 636# include "eventinc.h"
641# undef def 637# undef def
642}; 638};
639
640#define KLASS_OF(event) (((unsigned int)event) < NUM_EVENT_TYPES ? klass_of [event] : KLASS_NONE)
643 641
644static void 642static void
645gather_callbacks (AV *&callbacks, AV *registry, event_type event) 643gather_callbacks (AV *&callbacks, AV *registry, event_type event)
646{ 644{
647 // event must be in array 645 // event must be in array
… …
690 // 2a. per-type callback 688 // 2a. per-type callback
691 // 4. global callbacks 689 // 4. global callbacks
692 690
693 gather_callbacks (callbacks, cb_global, event); 691 gather_callbacks (callbacks, cb_global, event);
694 692
695 switch (klass_of [event]) 693 switch (KLASS_OF (event))
696 { 694 {
697 case KLASS_GLOBAL: 695 case KLASS_GLOBAL:
698 break; 696 break;
699 697
700 case KLASS_OBJECT: 698 case KLASS_OBJECT:
… …
766 EXTEND (SP, 3); 764 EXTEND (SP, 3);
767 765
768 PUSHs (sv_2mortal (newSViv (event))); // only used for debugging nowadays 766 PUSHs (sv_2mortal (newSViv (event))); // only used for debugging nowadays
769 PUSHs (sv_2mortal (newRV_noinc ((SV *)callbacks))); 767 PUSHs (sv_2mortal (newRV_noinc ((SV *)callbacks)));
770 768
771 switch (klass_of [event]) 769 switch (KLASS_OF (event))
772 { 770 {
773 case KLASS_OBJECT: PUSHs (sv_2mortal (newSVdt (DT_OBJECT, op))); break; 771 case KLASS_OBJECT: PUSHs (sv_2mortal (newSVdt (DT_OBJECT, op))); break;
774 case KLASS_PLAYER: PUSHs (sv_2mortal (newSVdt (DT_PLAYER, pl))); break; 772 case KLASS_PLAYER: PUSHs (sv_2mortal (newSVdt (DT_PLAYER, pl))); break;
775 case KLASS_MAP: PUSHs (sv_2mortal (newSVdt (DT_MAP, map))); break; 773 case KLASS_MAP: PUSHs (sv_2mortal (newSVdt (DT_MAP, map))); break;
776 } 774 }
… …
1559 1557
1560int random_roll(int min, int max, object *op, int goodbad); 1558int random_roll(int min, int max, object *op, int goodbad);
1561 1559
1562const char *cost_string_from_value(uint64 cost, int approx = 0) 1560const char *cost_string_from_value(uint64 cost, int approx = 0)
1563 1561
1564int invoke (int event, SV *arg1, ...) 1562int invoke (int event, ...)
1565 CODE: 1563 CODE:
1566{ 1564 if (KLASS_OF (event) != KLASS_GLOBAL) croak ("event class must be GLOBAL");
1567 // parse first arg and call invoke_object etc as seen fit 1565 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); for (int i = 1; i < items; i++) av_push (av, ST (i));
1568 //TODO 1566 RETVAL = INVOKE_((event_type)event, ARG_AV (av));
1569 //cfperl_invoke (event, 1567 OUTPUT: RETVAL
1570}
1571 1568
1572int 1569int
1573exp_to_level (val64 exp) 1570exp_to_level (val64 exp)
1574 CODE: 1571 CODE:
1575{ 1572{
… …
1607 else 1604 else
1608 XSRETURN_UNDEF; 1605 XSRETURN_UNDEF;
1609 OUTPUT: RETVAL 1606 OUTPUT: RETVAL
1610 1607
1611MODULE = cf PACKAGE = cf::object PREFIX = cf_object_ 1608MODULE = cf PACKAGE = cf::object PREFIX = cf_object_
1609
1610int invoke (object *op, int event, ...)
1611 CODE:
1612 if (KLASS_OF (event) != KLASS_OBJECT) croak ("event class must be OBJECT");
1613 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); for (int i = 2; i < items; i++) av_push (av, ST (i));
1614 RETVAL = INVOKE_((event_type)event, ARG_OBJECT (op), ARG_AV (av));
1615 OUTPUT: RETVAL
1616
1617SV *registry (object *op)
1618 CODE:
1619 RETVAL = registry_of (op);
1620 OUTPUT:
1621 RETVAL
1612 1622
1613SV * 1623SV *
1614get_property (object *obj, int type, int idx) 1624get_property (object *obj, int type, int idx)
1615 CODE: 1625 CODE:
1616 RETVAL = newSVcfapi (type, cf_object_get_property (obj, idx)); 1626 RETVAL = newSVcfapi (type, cf_object_get_property (obj, idx));
… …
1814{ 1824{
1815 int unused_type; 1825 int unused_type;
1816 RETVAL = (object *)object_insert (&unused_type, ob, 0, where, orig, flag, x, y); 1826 RETVAL = (object *)object_insert (&unused_type, ob, 0, where, orig, flag, x, y);
1817} 1827}
1818 1828
1819SV *registry (object *op)
1820 CODE:
1821 RETVAL = registry_of (op);
1822 OUTPUT:
1823 RETVAL
1824
1825# syntatic sugar for easier use in event callbacks. 1829# syntatic sugar for easier use in event callbacks.
1826const char *options (object *op) 1830const char *options (object *op)
1827 CODE: 1831 CODE:
1828 RETVAL = op->name; 1832 RETVAL = op->name;
1829 OUTPUT: 1833 OUTPUT:
… …
1900void cf_player_set_party (object *op, partylist *party) 1904void cf_player_set_party (object *op, partylist *party)
1901 1905
1902void kill_player (object *op) 1906void kill_player (object *op)
1903 1907
1904MODULE = cf PACKAGE = cf::player PREFIX = cf_player_ 1908MODULE = cf PACKAGE = cf::player PREFIX = cf_player_
1909
1910int invoke (player *pl, int event, ...)
1911 CODE:
1912 if (KLASS_OF (event) != KLASS_PLAYER) croak ("event class must be PLAYER");
1913 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); for (int i = 2; i < items; i++) av_push (av, ST (i));
1914 RETVAL = INVOKE_((event_type)event, ARG_PLAYER (pl), ARG_AV (av));
1915 OUTPUT: RETVAL
1905 1916
1906SV *registry (player *pl) 1917SV *registry (player *pl)
1907 CODE: 1918 CODE:
1908 RETVAL = registry_of (pl); 1919 RETVAL = registry_of (pl);
1909 OUTPUT: 1920 OUTPUT:
… …
2033 RETVAL = &pl->last_stats; 2044 RETVAL = &pl->last_stats;
2034 OUTPUT: RETVAL 2045 OUTPUT: RETVAL
2035 2046
2036 2047
2037MODULE = cf PACKAGE = cf::map PREFIX = cf_map_ 2048MODULE = cf PACKAGE = cf::map PREFIX = cf_map_
2049
2050int invoke (mapstruct *map, int event, ...)
2051 CODE:
2052 if (KLASS_OF (event) != KLASS_MAP) croak ("event class must be MAP");
2053 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); for (int i = 2; i < items; i++) av_push (av, ST (i));
2054 RETVAL = INVOKE_((event_type)event, ARG_MAP (map), ARG_AV (av));
2055 OUTPUT:
2056 RETVAL
2038 2057
2039SV *registry (mapstruct *map) 2058SV *registry (mapstruct *map)
2040 CODE: 2059 CODE:
2041 RETVAL = registry_of (map); 2060 RETVAL = registry_of (map);
2042 OUTPUT: 2061 OUTPUT:

Diff Legend

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