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.323 by root, Sun Oct 11 23:51:41 2009 UTC vs.
Revision 1.324 by root, Mon Oct 12 04:02:17 2009 UTC

… …
88 *stash_cf_client_wrap, 88 *stash_cf_client_wrap,
89 *stash_cf_arch_wrap, 89 *stash_cf_arch_wrap,
90 *stash_cf_party_wrap, 90 *stash_cf_party_wrap,
91 *stash_cf_region_wrap, 91 *stash_cf_region_wrap,
92 *stash_cf_living_wrap; 92 *stash_cf_living_wrap;
93
94static SV
95 *cv_cf_do_invoke,
96 *cv_cf__can_merge,
97 *cv_cf_client_send_msg,
98 *cv_cf_tick,
99 *cv_cf_match_match;
93 100
94#ifndef newSVpv_utf8 101#ifndef newSVpv_utf8
95static inline SV * 102static inline SV *
96newSVpv_utf8 (const char *s) 103newSVpv_utf8 (const char *s)
97{ 104{
… …
919 XPUSHs (sv_2mortal (newSVdt_va (ap, dt))); 926 XPUSHs (sv_2mortal (newSVdt_va (ap, dt)));
920 } 927 }
921 928
922 va_end (ap); 929 va_end (ap);
923 930
924 CALL_CALL ("cf::do_invoke", G_SCALAR); 931 CALL_CALL (cv_cf_do_invoke, G_SCALAR);
925 count = count > 0 ? POPi : 0; 932 count = count > 0 ? POPi : 0;
926 933
927 CALL_END; 934 CALL_END;
928 935
929 return count; 936 return count;
… …
970 977
971 dSP; 978 dSP;
972 979
973 PUSHMARK (SP); 980 PUSHMARK (SP);
974 PUTBACK; 981 PUTBACK;
975 call_pv ("cf::tick", G_DISCARD | G_VOID); 982 call_pvsv (cv_cf_tick, G_DISCARD | G_VOID);
976 983
977 SvNV_set (sv_next_tick, get_next_tick ()); SvNOK_only (sv_next_tick); 984 SvNV_set (sv_next_tick, get_next_tick ()); SvNOK_only (sv_next_tick);
978} 985}
979 986
980void 987void
… …
1010 CALL_BEGIN (4); 1017 CALL_BEGIN (4);
1011 CALL_ARG (ns); 1018 CALL_ARG (ns);
1012 CALL_ARG (type); 1019 CALL_ARG (type);
1013 CALL_ARG_SV (newSVpv_utf8 (msg)); 1020 CALL_ARG_SV (newSVpv_utf8 (msg));
1014 CALL_ARG (color); 1021 CALL_ARG (color);
1015 CALL_CALL ("cf::client::send_msg", G_VOID); 1022 CALL_CALL (cv_cf_client_send_msg, G_VOID);
1016 CALL_END; 1023 CALL_END;
1017} 1024}
1018 1025
1019int 1026int
1020cfperl_can_merge (object *ob1, object *ob2) 1027cfperl_can_merge (object *ob1, object *ob2)
… …
1022 int can; 1029 int can;
1023 1030
1024 CALL_BEGIN (2); 1031 CALL_BEGIN (2);
1025 CALL_ARG (ob1); 1032 CALL_ARG (ob1);
1026 CALL_ARG (ob2); 1033 CALL_ARG (ob2);
1027 CALL_CALL ("cf::_can_merge", G_SCALAR); 1034 CALL_CALL (cv_cf__can_merge, G_SCALAR);
1028 can = count && SvTRUE (TOPs); 1035 can = count && SvTRUE (TOPs);
1029 CALL_END; 1036 CALL_END;
1030 1037
1031 return can; 1038 return can;
1032} 1039}
… …
1206 CALL_ARG (expr); 1213 CALL_ARG (expr);
1207 CALL_ARG (ob); 1214 CALL_ARG (ob);
1208 CALL_ARG (self); 1215 CALL_ARG (self);
1209 CALL_ARG (source); 1216 CALL_ARG (source);
1210 CALL_ARG (originator); 1217 CALL_ARG (originator);
1211 CALL_CALL ("cf::match::match", G_SCALAR); 1218 CALL_CALL (cv_cf_match_match, G_SCALAR);
1212 1219
1213 bool matched = count && SvTRUE (POPs); 1220 bool matched = count && SvTRUE (TOPs);
1214 1221
1215 CALL_END; 1222 CALL_END;
1216 1223
1217 return matched; 1224 return matched;
1218} 1225}
… …
1256 if (active) start (); 1263 if (active) start ();
1257 } 1264 }
1258} 1265}
1259 1266
1260static void 1267static void
1261_connect_to_perl () 1268_connect_to_perl_1 ()
1262{ 1269{
1263 stash_cf = gv_stashpv ("cf", 1); 1270 stash_cf = gv_stashpv ("cf", 1);
1264 1271
1265 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1); 1272 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1);
1266 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1); 1273 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1);
… …
1283 cb_object = get_av ("cf::CB_OBJECT", 1); 1290 cb_object = get_av ("cf::CB_OBJECT", 1);
1284 cb_player = get_av ("cf::CB_PLAYER", 1); 1291 cb_player = get_av ("cf::CB_PLAYER", 1);
1285 cb_client = get_av ("cf::CB_CLIENT", 1); 1292 cb_client = get_av ("cf::CB_CLIENT", 1);
1286 cb_type = get_av ("cf::CB_TYPE" , 1); 1293 cb_type = get_av ("cf::CB_TYPE" , 1);
1287 cb_map = get_av ("cf::CB_MAP" , 1); 1294 cb_map = get_av ("cf::CB_MAP" , 1);
1295}
1288 1296
1289 av_reflect = get_av ("cf::REFLECT" , 1); 1297static void
1298_connect_to_perl_2 ()
1299{
1300 cv_cf_do_invoke = (SV *)get_cv ("cf::do_invoke" , 0); assert (cv_cf_do_invoke);
1301 cv_cf__can_merge = (SV *)get_cv ("cf::_can_merge" , 0); assert (cv_cf__can_merge);
1302 cv_cf_client_send_msg = (SV *)get_cv ("cf::client::send_msg", 0); assert (cv_cf_client_send_msg);
1303 cv_cf_tick = (SV *)get_cv ("cf::tick" , 0); assert (cv_cf_tick);
1304 cv_cf_match_match = (SV *)get_cv ("cf::match::match" , 0); assert (cv_cf_match_match);
1290} 1305}
1291 1306
1292MODULE = cf PACKAGE = cf PREFIX = cf_ 1307MODULE = cf PACKAGE = cf PREFIX = cf_
1293 1308
1294BOOT: 1309BOOT:
1295{ 1310{
1296 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI; 1311 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI;
1297 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI; 1312 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI;
1298 1313
1299 _connect_to_perl (); 1314 _connect_to_perl_1 ();
1300 1315
1301 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1)); 1316 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1));
1302 1317
1303 //{ 1318 //{
1304 // require_pv ("Time::HiRes"); 1319 // require_pv ("Time::HiRes");
… …
1576 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0)); 1591 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0));
1577 av_push (event, newSViv (eiv->klass)); 1592 av_push (event, newSViv (eiv->klass));
1578 av_store (av, eiv->iv, newRV_noinc ((SV *)event)); 1593 av_store (av, eiv->iv, newRV_noinc ((SV *)event));
1579 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv)); 1594 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv));
1580 } 1595 }
1596
1597 // used by autogenerated BOOT sections from genacc
1598 av_reflect = get_av ("cf::REFLECT", 1);
1581} 1599}
1582 1600
1583void _gv_clear (SV *gv) 1601void _gv_clear (SV *gv)
1584 CODE: 1602 CODE:
1585 assert (SvTYPE (gv) == SVt_PVGV); 1603 assert (SvTYPE (gv) == SVt_PVGV);
… …
1592 f (GvGP (gv)->gp_cv); 1610 f (GvGP (gv)->gp_cv);
1593 GvCVGEN (gv) = 0; 1611 GvCVGEN (gv) = 0;
1594 GvMULTI_off (gv); 1612 GvMULTI_off (gv);
1595# undef f 1613# undef f
1596 1614
1597void _connect_to_perl () 1615void _connect_to_perl_1 ()
1616
1617void _connect_to_perl_2 ()
1598 1618
1599void _recalc_want () 1619void _recalc_want ()
1600 1620
1601# not used by default anymore 1621# not used by default anymore
1602void _global_reattach () 1622void _global_reattach ()

Diff Legend

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