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.404 by root, Wed May 4 07:36:41 2011 UTC vs.
Revision 1.414 by root, Tue Oct 30 17:07:50 2012 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2006,2007,2008,2009,2010,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * 5 *
6 * Deliantra is free software: you can redistribute it and/or modify it under 6 * Deliantra is free software: you can redistribute it and/or modify it under
7 * the terms of the Affero GNU General Public License as published by the 7 * the terms of the Affero GNU General Public License as published by the
8 * Free Software Foundation, either version 3 of the License, or (at your 8 * Free Software Foundation, either version 3 of the License, or (at your
9 * option) any later version. 9 * option) any later version.
10 * 10 *
11 * This program is distributed in the hope that it will be useful, 11 * This program is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 * GNU General Public License for more details. 14 * GNU General Public License for more details.
15 * 15 *
16 * You should have received a copy of the Affero GNU General Public License 16 * You should have received a copy of the Affero GNU General Public License
17 * and the GNU General Public License along with this program. If not, see 17 * and the GNU General Public License along with this program. If not, see
18 * <http://www.gnu.org/licenses/>. 18 * <http://www.gnu.org/licenses/>.
19 * 19 *
20 * The authors can be reached via e-mail to <support@deliantra.net> 20 * The authors can be reached via e-mail to <support@deliantra.net>
21 */ 21 */
22 22
23#include "autoconf.h" 23#include "autoconf.h"
24 24
… …
67static int tick_inhibit; 67static int tick_inhibit;
68static int tick_pending; 68static int tick_pending;
69 69
70global gbl_ev; 70global gbl_ev;
71static AV *cb_global, *cb_attachable, *cb_object, *cb_player, *cb_client, *cb_type, *cb_map; 71static AV *cb_global, *cb_attachable, *cb_object, *cb_player, *cb_client, *cb_type, *cb_map;
72static SV *sv_runtime, *sv_tick_start, *sv_next_tick, *sv_now; 72static SV *sv_runtime, *sv_tick_start, *sv_next_tick, *sv_now, *sv_server_tick;
73static AV *av_reflect; 73static AV *av_reflect;
74 74
75bitset<NUM_EVENT_TYPES> ev_want_event; 75bitset<NUM_EVENT_TYPES> ev_want_event;
76bitset<NUM_TYPES> ev_want_type; 76bitset<NUM_TYPES> ev_want_type;
77 77
… …
253 { 253 {
254 static int last_mortalcount; 254 static int last_mortalcount;
255 if (mortals.size () != last_mortalcount) 255 if (mortals.size () != last_mortalcount)
256 { 256 {
257 last_mortalcount = mortals.size (); 257 last_mortalcount = mortals.size ();
258 LOG (llevInfo, "%d mortals.\n", (int)mortals.size ()); 258 object *specimen = is_a<object> (mortals [rndm (mortals.size ())]);
259
260 LOG (llevInfo, "%d mortals (random specimen: %s).\n",
261 (int)mortals.size (), specimen ? specimen->debug_desc () : "(not an object)");
259 262
260 if (0) 263 if (0)
261 { 264 {
262 for (int j = 0; j < mortals.size (); ++j)//D 265 for (int j = 0; j < mortals.size (); ++j)//D
263 fprintf (stderr, "%d:%s %p ", j, &((object *)mortals[j])->name, mortals[j]);//D 266 fprintf (stderr, "%d:%s %p ", j, &((object *)mortals[j])->name, mortals[j]);//D
… …
622 STRLEN len; 625 STRLEN len;
623 char *data = SvPVbyte (sv, len); 626 char *data = SvPVbyte (sv, len);
624 v.assign (data, len); 627 v.assign (data, len);
625} 628}
626 629
630static inline void sv_to (SV *sv, refcnt_buf &v)
631{
632 STRLEN len;
633 char *data = SvPVbyte (sv, len);
634 refcnt_buf buf (data, len);
635 v = buf;
636}
637
627static inline void sv_to (SV *sv, UUID &v) 638static inline void sv_to (SV *sv, UUID &v)
628{ 639{
629 if (!v.parse (SvPV_nolen (sv))) 640 if (!v.parse (SvPV_nolen (sv)))
630 croak ("unparsable uuid: %s", SvPV_nolen (sv)); 641 croak ("unparsable uuid: %s", SvPV_nolen (sv));
631} 642}
… …
1404 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1); 1415 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1);
1405 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1); 1416 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1);
1406 stash_cf_layout_wrap = gv_stashpv ("cf::layout::wrap", 1); 1417 stash_cf_layout_wrap = gv_stashpv ("cf::layout::wrap", 1);
1407 stash_ext_map_world = gv_stashpv ("ext::map_world" , 1); 1418 stash_ext_map_world = gv_stashpv ("ext::map_world" , 1);
1408 1419
1409 sv_now = get_sv ("cf::NOW" , 1); SvUPGRADE (sv_now , SVt_NV); 1420 sv_now = get_sv ("cf::NOW" , 1); SvUPGRADE (sv_now , SVt_NV);
1410 sv_runtime = get_sv ("cf::RUNTIME" , 1); SvUPGRADE (sv_runtime , SVt_NV); 1421 sv_runtime = get_sv ("cf::RUNTIME" , 1); SvUPGRADE (sv_runtime , SVt_NV);
1422 sv_server_tick = get_sv ("cf::SERVER_TICK", 1); SvUPGRADE (sv_server_tick, SVt_IV);
1411 sv_tick_start = get_sv ("cf::TICK_START", 1); SvUPGRADE (sv_tick_start, SVt_NV); 1423 sv_tick_start = get_sv ("cf::TICK_START" , 1); SvUPGRADE (sv_tick_start , SVt_NV);
1412 sv_next_tick = get_sv ("cf::NEXT_TICK" , 1); SvUPGRADE (sv_next_tick , SVt_NV); 1424 sv_next_tick = get_sv ("cf::NEXT_TICK" , 1); SvUPGRADE (sv_next_tick , SVt_NV);
1413 1425
1414 cb_global = get_av ("cf::CB_GLOBAL", 1); 1426 cb_global = get_av ("cf::CB_GLOBAL", 1);
1415 cb_attachable = get_av ("cf::CB_ATTACHABLE", 1); 1427 cb_attachable = get_av ("cf::CB_ATTACHABLE", 1);
1416 cb_object = get_av ("cf::CB_OBJECT", 1); 1428 cb_object = get_av ("cf::CB_OBJECT", 1);
1417 cb_player = get_av ("cf::CB_PLAYER", 1); 1429 cb_player = get_av ("cf::CB_PLAYER", 1);
… …
1527 1539
1528void _gv_clear (SV *gv) 1540void _gv_clear (SV *gv)
1529 CODE: 1541 CODE:
1530 assert (SvTYPE (gv) == SVt_PVGV); 1542 assert (SvTYPE (gv) == SVt_PVGV);
1531# define f(sv) { SV *sv_ = (SV *)(sv); sv = 0; SvREFCNT_dec (sv_); } 1543# define f(sv) { SV *sv_ = (SV *)(sv); sv = 0; SvREFCNT_dec (sv_); }
1544 SvREFCNT_inc (gv);
1532 f (GvGP (gv)->gp_form); 1545 f (GvGP (gv)->gp_form);
1533 f (GvGP (gv)->gp_io); 1546 f (GvGP (gv)->gp_io);
1534 f (GvGP (gv)->gp_sv); 1547 f (GvGP (gv)->gp_sv);
1535 f (GvGP (gv)->gp_av); 1548 f (GvGP (gv)->gp_av);
1536 f (GvGP (gv)->gp_hv); 1549 f (GvGP (gv)->gp_hv);
1537 f (GvGP (gv)->gp_cv); 1550 f (GvGP (gv)->gp_cv);
1538 GvCVGEN (gv) = 0; 1551 GvCVGEN (gv) = 0;
1539 GvMULTI_off (gv); 1552 GvMULTI_off (gv);
1553 SvREFCNT_dec (gv);
1540# undef f 1554# undef f
1541 1555
1542void _connect_to_perl_1 () 1556void _connect_to_perl_1 ()
1543 1557
1544void _connect_to_perl_2 () 1558void _connect_to_perl_2 ()
… …
1610 { 1624 {
1611 ev_async_send (EV_DEFAULT, &tick_watcher); 1625 ev_async_send (EV_DEFAULT, &tick_watcher);
1612 coroapi::cede (); 1626 coroapi::cede ();
1613 } 1627 }
1614 1628
1615void server_tick () 1629void one_tick ()
1616 CODE: 1630 CODE:
1617{ 1631{
1618 ev_now_update (EV_DEFAULT); 1632 ev_now_update (EV_DEFAULT);
1619 NOW = ev_now (EV_DEFAULT); 1633 NOW = ev_now (EV_DEFAULT);
1620 SvNV_set (sv_now, NOW); SvNOK_only (sv_now); 1634 SvNV_set (sv_now, NOW); SvNOK_only (sv_now);
1621 SvNV_set (sv_tick_start, NOW); SvNOK_only (sv_tick_start); 1635 SvNV_set (sv_tick_start, NOW); SvNOK_only (sv_tick_start);
1622 runtime = SvNVX (sv_runtime); 1636 runtime = SvNVX (sv_runtime);
1623 1637
1638 one_tick ();
1639
1624 server_tick (); 1640 ++server_tick;
1641 SvUV_set (sv_server_tick, server_tick); SvIOK_only_UV (sv_server_tick);
1625 1642
1626 ev_now_update (EV_DEFAULT); 1643 ev_now_update (EV_DEFAULT);
1627 NOW = ev_now (EV_DEFAULT); 1644 NOW = ev_now (EV_DEFAULT);
1628 SvNV_set (sv_now, NOW); SvNOK_only (sv_now); 1645 SvNV_set (sv_now, NOW); SvNOK_only (sv_now);
1646
1629 runtime += TICK; 1647 runtime += TICK;
1630 SvNV_set (sv_runtime, runtime); SvNOK_only (sv_runtime); 1648 SvNV_set (sv_runtime, runtime); SvNOK_only (sv_runtime);
1631} 1649}
1632 1650
1633NV floor (NV x) 1651NV floor (NV x)
… …
2128 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y); 2146 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y);
2129 2147
2130 if (RETVAL->destroyed ()) 2148 if (RETVAL->destroyed ())
2131 RETVAL = 0; 2149 RETVAL = 0;
2132} 2150}
2151 OUTPUT:
2152 RETVAL
2133 2153
2134shstr 2154shstr
2135object::kv_get (shstr key) 2155object::kv_get (shstr key)
2136 CODE: 2156 CODE:
2137 RETVAL = THIS->kv.get (key); 2157 RETVAL = THIS->kv.get (key);
… …
2618 PPCODE: 2638 PPCODE:
2619 EXTEND (SP, clients.size ()); 2639 EXTEND (SP, clients.size ());
2620 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i) 2640 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)
2621 PUSHs (sv_2mortal (to_sv (*i))); 2641 PUSHs (sv_2mortal (to_sv (*i)));
2622 2642
2643STRLEN
2644client::inbuf_append (SV *data)
2645 CODE:
2646{
2647 STRLEN len;
2648 char *ptr = SvPVbyte (data, len);
2649
2650 min_it (len, sizeof (THIS->inbuf) - THIS->inbuf_len);
2651 memcpy (THIS->inbuf + THIS->inbuf_len, ptr, len);
2652 THIS->inbuf_len += len;
2653
2654 THIS->inbuf_handle ();
2655
2656 RETVAL = len;
2657}
2658 OUTPUT: RETVAL
2659
2623void 2660void
2624client::send_packet (SV *packet) 2661client::send_packet (SV *packet)
2625 CODE: 2662 CODE:
2626{ 2663{
2627 STRLEN len; 2664 STRLEN len;
… …
2682faceidx face_find (utf8_string name, faceidx defidx = 0) 2719faceidx face_find (utf8_string name, faceidx defidx = 0)
2683 2720
2684faceidx alloc (utf8_string name) 2721faceidx alloc (utf8_string name)
2685 CODE: 2722 CODE:
2686{ 2723{
2687 do 2724 RETVAL = face_alloc ();
2688 {
2689 RETVAL = faces.size ();
2690 faces.resize (RETVAL + 1);
2691 }
2692 while (!RETVAL); // crude way to leave index 0
2693 2725
2694 faces [RETVAL].name = name; 2726 faces [RETVAL].name = name;
2695 facehash.insert (std::make_pair (faces [RETVAL].name, RETVAL)); 2727 facehash.insert (std::make_pair (faces [RETVAL].name, RETVAL));
2696 2728
2697 if (!strcmp (name, BLANK_FACE_NAME )) blank_face = RETVAL; 2729 if (!strcmp (name, BLANK_FACE_NAME )) blank_face = RETVAL;
2698 if (!strcmp (name, EMPTY_FACE_NAME )) empty_face = RETVAL; 2730 if (!strcmp (name, EMPTY_FACE_NAME )) empty_face = RETVAL;
2699 if (!strcmp (name, MAGICMOUTH_FACE_NAME)) magicmouth_face = RETVAL; 2731 if (!strcmp (name, MAGICMOUTH_FACE_NAME)) magicmouth_face = RETVAL;
2700} 2732}
2733 OUTPUT: RETVAL
2734
2735faceidx faces_size ()
2736 CODE:
2737 RETVAL = faces.size ();
2701 OUTPUT: RETVAL 2738 OUTPUT: RETVAL
2702 2739
2703void set_type (faceidx idx, int value) 2740void set_type (faceidx idx, int value)
2704 ALIAS: 2741 ALIAS:
2705 set_type = 0 2742 set_type = 0
… …
2751 if (!d) XSRETURN_UNDEF; 2788 if (!d) XSRETURN_UNDEF;
2752 RETVAL = d->data.size (); 2789 RETVAL = d->data.size ();
2753 OUTPUT: 2790 OUTPUT:
2754 RETVAL 2791 RETVAL
2755 2792
2793void set_meta (faceidx idx, SV *sv)
2794 CODE:
2795{
2796 faceinfo *f = face_info (idx); assert (f);
2797 SvREFCNT_dec (f->meta_hv);
2798 f->meta_hv = SvOK (sv) ? (HV *)SvREFCNT_inc (SvRV (sv)) : 0;
2799}
2800
2756SV *get_chksum (faceidx idx, int faceset = 0) 2801SV *get_chksum (faceidx idx, int faceset = 0)
2757 CODE: 2802 CODE:
2758 facedata *d = face_data (idx, faceset); 2803 facedata *d = face_data (idx, faceset);
2759 if (!d) XSRETURN_UNDEF; 2804 if (!d) XSRETURN_UNDEF;
2760 RETVAL = newSVpvn ((char *)d->chksum, d->chksum_len); 2805 RETVAL = newSVpvn ((char *)d->chksum, d->chksum_len);
2761 OUTPUT: 2806 OUTPUT:
2762 RETVAL 2807 RETVAL
2763 2808
2809int get_type (faceidx idx)
2810 CODE:
2811 faceinfo *f = face_info (idx);
2812 if (!f) XSRETURN_UNDEF;
2813 RETVAL = f->type;
2814 OUTPUT:
2815 RETVAL
2816
2764SV *get_data (faceidx idx, int faceset = 0) 2817SV *get_data (faceidx idx, int faceset = 0)
2765 CODE: 2818 CODE:
2766 facedata *d = face_data (idx, faceset); 2819 facedata *d = face_data (idx, faceset);
2767 if (!d) XSRETURN_UNDEF; 2820 if (!d) XSRETURN_UNDEF;
2768 RETVAL = newSVpvn (d->data.data (), d->data.length ()); 2821 RETVAL = newSVpvn (d->data, d->data.size ());
2769 OUTPUT: 2822 OUTPUT:
2770 RETVAL 2823 RETVAL
2771 2824
2825SV *get_meta (faceidx idx)
2826 CODE:
2827 faceinfo *f = face_info (idx); assert (f);
2828 if (!f || !f->meta_hv) XSRETURN_UNDEF;
2829 RETVAL = newRV_inc ((SV *)f->meta_hv);
2830 OUTPUT:
2831 RETVAL
2832
2772void invalidate (faceidx idx) 2833void invalidate (faceidx idx)
2773 CODE: 2834 CODE:
2774 for_all_clients (ns) 2835 for_all_clients (ns)
2775 { 2836 ns->invalidate_face (idx);
2776 ns->faces_sent [idx] = false;
2777 ns->force_newmap = true;
2778 }
2779 2837
2780void invalidate_all () 2838void invalidate_all ()
2781 CODE: 2839 CODE:
2782 for_all_clients (ns) 2840 for_all_clients (ns)
2783 { 2841 ns->invalidate_all_faces ();
2784 ns->faces_sent.reset ();
2785 ns->force_newmap = true;
2786 }
2787 2842
2788MODULE = cf PACKAGE = cf::anim PREFIX = anim_ 2843MODULE = cf PACKAGE = cf::anim PREFIX = anim_
2789 2844
2790#INCLUDE: $PERL $srcdir/genacc faceset $srcdir/../include/anim.h | 2845#INCLUDE: $PERL $srcdir/genacc faceset $srcdir/../include/anim.h |
2791 2846
… …
2795 OUTPUT: RETVAL 2850 OUTPUT: RETVAL
2796 2851
2797animidx set (utf8_string name, SV *frames, int facings = 1) 2852animidx set (utf8_string name, SV *frames, int facings = 1)
2798 CODE: 2853 CODE:
2799{ 2854{
2800 if (!SvROK (frames) && SvTYPE (SvRV (frames)) != SVt_PVAV) 2855 if (!SvROK (frames) && SvTYPE (SvRV (frames)) != SVt_PVAV)
2801 croak ("frames must be an arrayref"); 2856 croak ("frames must be an arrayref");
2802 2857
2803 AV *av = (AV *)SvRV (frames); 2858 AV *av = (AV *)SvRV (frames);
2804 2859
2805 animation *anim = &animation::find (name); 2860 animation *anim = &animation::find (name);
2806 if (anim->number) 2861 if (anim->number)
2807 { 2862 {
2808 anim->resize (av_len (av) + 1); 2863 anim->resize (av_len (av) + 1);
2809 anim->facings = facings; 2864 anim->facings = facings;
2810 } 2865 }

Diff Legend

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