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.312 by root, Tue Dec 23 06:58:24 2008 UTC vs.
Revision 1.323 by root, Sun Oct 11 23:51:41 2009 UTC

… …
71static int tick_pending; 71static int tick_pending;
72 72
73global gbl_ev; 73global gbl_ev;
74static AV *cb_global, *cb_attachable, *cb_object, *cb_player, *cb_client, *cb_type, *cb_map; 74static AV *cb_global, *cb_attachable, *cb_object, *cb_player, *cb_client, *cb_type, *cb_map;
75static SV *sv_runtime, *sv_tick_start, *sv_next_tick, *sv_now; 75static SV *sv_runtime, *sv_tick_start, *sv_next_tick, *sv_now;
76static AV *av_reflect;
76 77
77bitset<NUM_EVENT_TYPES> ev_want_event; 78bitset<NUM_EVENT_TYPES> ev_want_event;
78bitset<NUM_TYPES> ev_want_type; 79bitset<NUM_TYPES> ev_want_type;
79 80
80static HV 81static HV
… …
158 SvREFCNT_inc (self); 159 SvREFCNT_inc (self);
159 hv_clear (self); 160 hv_clear (self);
160 sv_unmagic ((SV *)self, PERL_MAGIC_ext); 161 sv_unmagic ((SV *)self, PERL_MAGIC_ext);
161 SvREFCNT_dec (self); 162 SvREFCNT_dec (self);
162 163
163 // self *must* be null now because thats sv_unmagic's job. 164 // self *must* be null now because that's sv_unmagic's job.
164 assert (!this->self); 165 assert (!this->self);
165 } 166 }
166} 167}
167 168
168void 169void
… …
317 fprintf (stderr, "P %p\n", pl); 318 fprintf (stderr, "P %p\n", pl);
318 319
319 for_all_clients (ns) 320 for_all_clients (ns)
320 if (find_backref (ptr, ns)) 321 if (find_backref (ptr, ns))
321 fprintf (stderr, "C %p\n", ns); 322 fprintf (stderr, "C %p\n", ns);
322
323} 323}
324 324
325////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 325//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
326 326
327static SV * 327static SV *
… …
405 croak ("perl code used %s object, but C object is already destroyed, caught", klass); 405 croak ("perl code used %s object, but C object is already destroyed, caught", klass);
406 406
407 return (long)mg->mg_ptr; 407 return (long)mg->mg_ptr;
408} 408}
409 409
410static long 410static long noinline
411SvPTR_ornull (SV *sv, const char *klass) 411SvPTR_ornull (SV *sv, const char *klass)
412{ 412{
413 if (SvOK (sv)) 413 if (SvOK (sv))
414 return SvPTR (sv, klass); 414 return SvPTR (sv, klass);
415 else 415 else
… …
607 va_end (ap); 607 va_end (ap);
608 608
609 return sv; 609 return sv;
610} 610}
611 611
612// typemap support, mostly to avoid excessive inlining
613template<class type>
614static void noinline
615cf_obj_to (SV *arg, type &var)
616{
617 sv_to (arg, var);
618 if (!var)
619 croak ("must not pass invalid/null cf_obj here");
620}
621
622template<class object>
623static void noinline
624cf_obj_ornull_to (SV *arg, object *&var)
625{
626 if (SvOK (arg))
627 {
628 sv_to (arg, var);
629 if (!var)
630 croak ("unable to convert perl object to C++ object");
631 }
632 else
633 var = 0;
634}
635
612////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 636//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
613 637
614SV * 638SV *
615registry (attachable *ext) 639registry (attachable *ext)
616{ 640{
… …
660 printf ("unable to bootstrap perl, aborting:\n%s", SvPV_nolen (ERRSV)); 684 printf ("unable to bootstrap perl, aborting:\n%s", SvPV_nolen (ERRSV));
661 exit (EXIT_FAILURE); 685 exit (EXIT_FAILURE);
662 } 686 }
663} 687}
664 688
689void
665void cfperl_main () 690cfperl_main ()
666{ 691{
667 dSP; 692 dSP;
668 693
669 PUSHMARK (SP); 694 PUSHMARK (SP);
670 PUTBACK; 695 PUTBACK;
… …
695# undef def 720# undef def
696}; 721};
697 722
698#define KLASS_OF(event) (((unsigned int)event) < NUM_EVENT_TYPES ? klass_of [event] : KLASS_NONE) 723#define KLASS_OF(event) (((unsigned int)event) < NUM_EVENT_TYPES ? klass_of [event] : KLASS_NONE)
699 724
700static void 725static void noinline
701gather_callbacks (AV *&callbacks, AV *registry, event_type event) 726gather_callbacks (AV *&callbacks, AV *registry, event_type event)
702{ 727{
703 // event must be in array 728 // event must be in array
704 if (event >= 0 && event <= AvFILLp (registry)) 729 if (event >= 0 && event <= AvFILLp (registry))
705 { 730 {
… …
791{ 816{
792 attachable::gather_callbacks (callbacks, event); 817 attachable::gather_callbacks (callbacks, event);
793 ::gather_callbacks (callbacks, cb_map, event); 818 ::gather_callbacks (callbacks, cb_map, event);
794} 819}
795 820
796void 821static void noinline
797_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry) 822_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry)
798{ 823{
799 for (int event = 0; event <= AvFILLp (registry); ++event) 824 for (int event = 0; event <= AvFILLp (registry); ++event)
800 { 825 {
801 SV *cbs_ = AvARRAY (registry)[event]; 826 SV *cbs_ = AvARRAY (registry)[event];
… …
811 } 836 }
812 } 837 }
813} 838}
814 839
815// very slow and inefficient way to recalculate the global want bitsets 840// very slow and inefficient way to recalculate the global want bitsets
816void 841static void
817_recalc_want () 842_recalc_want ()
818{ 843{
819 ev_want_event.reset (); 844 ev_want_event.reset ();
820 845
821 _recalc_want (ev_want_event, cb_global); 846 _recalc_want (ev_want_event, cb_global);
… …
931} 956}
932 957
933///////////////////////////////////////////////////////////////////////////// 958/////////////////////////////////////////////////////////////////////////////
934// various c++ => perl glue functions 959// various c++ => perl glue functions
935 960
961void
936void cfperl_tick () 962cfperl_tick ()
937{ 963{
938 tick_pending = 1; 964 tick_pending = 1;
939 965
940 if (tick_inhibit) 966 if (tick_inhibit)
941 return; 967 return;
… …
1003 CALL_END; 1029 CALL_END;
1004 1030
1005 return can; 1031 return can;
1006} 1032}
1007 1033
1034void
1035cfperl_mapscript_activate (object *ob, int state, object *activator, object *originator)
1036{
1037 CALL_BEGIN (4);
1038 CALL_ARG (ob);
1039 CALL_ARG (state);
1040 CALL_ARG (activator);
1041 CALL_ARG (originator);
1042 CALL_CALL ("cf::mapscript::activate", G_VOID);
1043 CALL_END;
1044}
1045
1008player * 1046player *
1009player::find (const char *name) 1047player::find (const char *name)
1010{ 1048{
1011 CALL_BEGIN (1); 1049 CALL_BEGIN (1);
1012 CALL_ARG (name); 1050 CALL_ARG (name);
… …
1150 CALL_CALL ("cf::_log_backtrace", G_VOID); 1188 CALL_CALL ("cf::_log_backtrace", G_VOID);
1151 CALL_END; 1189 CALL_END;
1152#endif 1190#endif
1153} 1191}
1154 1192
1193bool
1194is_match_expr (const char *expr)
1195{
1196 return !strncmp (expr, "match ", sizeof ("match ") - 1);
1197}
1198
1199bool
1200match (const char *expr, object *ob, object *self, object *source, object *originator)
1201{
1202 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1203 expr += sizeof ("match ") - 1;
1204
1205 CALL_BEGIN (5);
1206 CALL_ARG (expr);
1207 CALL_ARG (ob);
1208 CALL_ARG (self);
1209 CALL_ARG (source);
1210 CALL_ARG (originator);
1211 CALL_CALL ("cf::match::match", G_SCALAR);
1212
1213 bool matched = count && SvTRUE (POPs);
1214
1215 CALL_END;
1216
1217 return matched;
1218}
1219
1155///////////////////////////////////////////////////////////////////////////// 1220/////////////////////////////////////////////////////////////////////////////
1156 1221
1157struct EVAPI *evapi::GEVAPI; 1222struct EVAPI *evapi::GEVAPI;
1158struct CoroAPI *coroapi::GCoroAPI; 1223struct CoroAPI *coroapi::GCoroAPI;
1159 1224
1225void
1160void coroapi::do_cede_to_tick () 1226coroapi::do_cede_to_tick ()
1161{ 1227{
1162 cede_pending = 0; 1228 cede_pending = 0;
1163 cede (); 1229 cede ();
1164} 1230}
1165 1231
… …
1189 ev_io_set ((ev_io *)this, fd, events); 1255 ev_io_set ((ev_io *)this, fd, events);
1190 if (active) start (); 1256 if (active) start ();
1191 } 1257 }
1192} 1258}
1193 1259
1194void 1260static void
1195_connect_to_perl () 1261_connect_to_perl ()
1196{ 1262{
1197 stash_cf = gv_stashpv ("cf", 1); 1263 stash_cf = gv_stashpv ("cf", 1);
1198 1264
1199 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1); 1265 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1);
… …
1217 cb_object = get_av ("cf::CB_OBJECT", 1); 1283 cb_object = get_av ("cf::CB_OBJECT", 1);
1218 cb_player = get_av ("cf::CB_PLAYER", 1); 1284 cb_player = get_av ("cf::CB_PLAYER", 1);
1219 cb_client = get_av ("cf::CB_CLIENT", 1); 1285 cb_client = get_av ("cf::CB_CLIENT", 1);
1220 cb_type = get_av ("cf::CB_TYPE" , 1); 1286 cb_type = get_av ("cf::CB_TYPE" , 1);
1221 cb_map = get_av ("cf::CB_MAP" , 1); 1287 cb_map = get_av ("cf::CB_MAP" , 1);
1288
1289 av_reflect = get_av ("cf::REFLECT" , 1);
1222} 1290}
1223 1291
1224MODULE = cf PACKAGE = cf PREFIX = cf_ 1292MODULE = cf PACKAGE = cf PREFIX = cf_
1225 1293
1226BOOT: 1294BOOT:
… …
1289 const_iv (FORCE) const_iv (POTION_EFFECT) const_iv (EVENT_CONNECTOR) const_iv (CLOSE_CON) 1357 const_iv (FORCE) const_iv (POTION_EFFECT) const_iv (EVENT_CONNECTOR) const_iv (CLOSE_CON)
1290 const_iv (CONTAINER) const_iv (ARMOUR_IMPROVER) const_iv (WEAPON_IMPROVER) const_iv (SKILLSCROLL) 1358 const_iv (CONTAINER) const_iv (ARMOUR_IMPROVER) const_iv (WEAPON_IMPROVER) const_iv (SKILLSCROLL)
1291 const_iv (DEEP_SWAMP) const_iv (IDENTIFY_ALTAR) const_iv (MENU) const_iv (RUNE) 1359 const_iv (DEEP_SWAMP) const_iv (IDENTIFY_ALTAR) const_iv (MENU) const_iv (RUNE)
1292 const_iv (TRAP) const_iv (POWER_CRYSTAL) const_iv (CORPSE) const_iv (DISEASE) 1360 const_iv (TRAP) const_iv (POWER_CRYSTAL) const_iv (CORPSE) const_iv (DISEASE)
1293 const_iv (SYMPTOM) const_iv (BUILDER) const_iv (MATERIAL) const_iv (ITEM_TRANSFORMER) 1361 const_iv (SYMPTOM) const_iv (BUILDER) const_iv (MATERIAL) const_iv (ITEM_TRANSFORMER)
1362 const_iv (MAPSCRIPT) const_iv (SAFE_GROUND)
1294 1363
1295 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES) 1364 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES)
1296 1365
1297 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE) 1366 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE)
1298 const_iv (ST_MAT_FLOOR) const_iv (ST_MAT_WALL) const_iv (ST_MAT_ITEM) 1367 const_iv (ST_MAT_FLOOR) const_iv (ST_MAT_WALL) const_iv (ST_MAT_ITEM)
… …
2104 2173
2105int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL) 2174int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL)
2106 2175
2107int calc_skill_exp (object *who, object *op, object *skill); 2176int calc_skill_exp (object *who, object *op, object *skill);
2108 2177
2109void push_button (object *op); 2178void push_button (object *op, object *originator);
2110 2179
2111void use_trigger (object *op); 2180void use_trigger (object *op, object *originator);
2112
2113void add_button_link (object *button, maptile *map, int connected);
2114
2115void remove_button_link (object *op);
2116 2181
2117void handle_apply_yield (object *op); 2182void handle_apply_yield (object *op);
2183
2184int convert_item (object *item, object *converter);
2118 2185
2119 2186
2120MODULE = cf PACKAGE = cf::object PREFIX = cf_ 2187MODULE = cf PACKAGE = cf::object PREFIX = cf_
2121 2188
2122# no clean way to get an object from an archetype - stupid idiotic 2189# no clean way to get an object from an archetype - stupid idiotic
… …
2328void 2395void
2329adjust_daylight () 2396adjust_daylight ()
2330 CODE: 2397 CODE:
2331 maptile::adjust_daylight (); 2398 maptile::adjust_daylight ();
2332 2399
2400int
2401outdoor_darkness (int darkness = 0)
2402 CODE:
2403 RETVAL = maptile::outdoor_darkness;
2404 if (items)
2405 maptile::outdoor_darkness = darkness;
2406 OUTPUT:
2407 RETVAL
2408
2333void 2409void
2334maptile::instantiate () 2410maptile::instantiate ()
2335 2411
2336maptile *new () 2412maptile *new ()
2337 PROTOTYPE: 2413 PROTOTYPE:
… …
2445 } 2521 }
2446 2522
2447int out_of_map (maptile *map, int x, int y) 2523int out_of_map (maptile *map, int x, int y)
2448 2524
2449void 2525void
2450trigger (maptile *map, long connection, bool state = true) 2526find_link (maptile *map, shstr_tmp connection)
2451 CODE:
2452 activate_connection (map, connection, state);
2453
2454void
2455get_connection (maptile *map, long connection)
2456 PPCODE: 2527 PPCODE:
2457 oblinkpt *obp = get_connection_links (map, connection); 2528 if (oblinkpt *obp = map->find_link (connection))
2458 if (obp)
2459 for (objectlink *ol = obp->link; ol; ol = ol->next) 2529 for (objectlink *ol = obp->link; ol; ol = ol->next)
2460 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob))); 2530 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob)));
2461 2531
2462void 2532void
2463get_map_flags (maptile *map, int x, int y) 2533get_map_flags (maptile *map, int x, int y)
… …
2693 PROTOTYPE: $ 2763 PROTOTYPE: $
2694 CODE: 2764 CODE:
2695 RETVAL = region::find (name); 2765 RETVAL = region::find (name);
2696 OUTPUT: RETVAL 2766 OUTPUT: RETVAL
2697 2767
2698region *find_fuzzy (utf8_string name)
2699 PROTOTYPE: $
2700 CODE:
2701 RETVAL = region::find_fuzzy (name);
2702 OUTPUT: RETVAL
2703
2704int specificity (region *rgn) 2768int specificity (region *rgn)
2705 CODE: 2769 CODE:
2706 RETVAL = 0; 2770 RETVAL = 0;
2707 while (rgn = rgn->parent) 2771 while (rgn = rgn->parent)
2708 RETVAL++; 2772 RETVAL++;

Diff Legend

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