[ViewVC] Diff of: cvs/deliantra/server/server/cfperl.xs

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.117 by root, Sat Dec 30 18:45:28 2006 UTC vs.
Revision 1.153 by root, Fri Jan 26 20:59:57 2007 UTC

…		…
32	#include <sproto.h>	32	#include <sproto.h>
33		33
34	#include "cfperl.h"	34	#include "cfperl.h"
35	#include "shstr.h"	35	#include "shstr.h"
36		36
		37	#include <unistd.h>
		38	#if _POSIX_MEMLOCK
		39	# include <sys/mman.h>
		40	#endif
		41
37	#include <EXTERN.h>	42	#include <EXTERN.h>
38	#include <perl.h>	43	#include <perl.h>
39	#include <XSUB.h>	44	#include <XSUB.h>
40		45
41	#include "CoroAPI.h"	46	#include "CoroAPI.h"
…		…
94		99
95	//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////	100	//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
96		101
97	unordered_vector<attachable *> attachable::mortals;	102	unordered_vector<attachable *> attachable::mortals;
98		103
99	#if 0
100	attachable *attachable::rc_first;
101
102	attachable::attachable ()
103	{
104	refcnt = 0;
105	rc_next = rc_first;
106	rc_first = this;
107	}
108	#endif
109
110	attachable::~attachable ()	104	attachable::~attachable ()
111	{	105	{
112	assert (!(flags & F_BORROWED));//D//TODO//remove when stable
113	#if 0
114	assert (!rc_next);
115	assert (!refcnt);	106	assert (!self);
116	#endif	107	assert (!cb);
		108	}
		109
		110	int
		111	attachable::refcnt_cnt () const
		112	{
		113	return refcnt + (self ? SvREFCNT (self) - 1 : 0);
		114	}
		115
		116	void
		117	attachable::optimise ()
		118	{
		119	if (self
		120	&& SvREFCNT (self) == 1
		121	&& !HvTOTALKEYS (self))
		122	{
		123	sv_unmagic ((SV *)self, PERL_MAGIC_ext);
		124	assert (!self);
		125	}
117	}	126	}
118		127
119	// check wether the object really is dead	128	// check wether the object really is dead
120	void	129	void
121	attachable::do_check ()	130	attachable::do_check ()
122	{	131	{
123	if (refcnt > 0)	132	if (refcnt_cnt () > 0)
124	return;	133	return;
125		134
126	// try to unborrow the refcnt from perl	135	destroy ();
127	if (flags & F_BORROWED)	136	}
		137
		138	void
		139	attachable::do_destroy ()
		140	{
		141	invoke (EVENT_ATTACHABLE_DESTROY, DT_END);
		142
		143	if (cb)
128	{	144	{
129	assert (self);//D//TODO//remove when stable
130	flags &= ~F_BORROWED;
131	refcnt_inc ();
132	SvREFCNT_dec (self);	145	SvREFCNT_dec (cb);
		146	cb = 0;
133	}	147	}
134		148
135	if (refcnt > 0 \|\| self)	149	if (self)
136	return;	150	{
		151	hv_clear (self);
		152	sv_unmagic ((SV *)self, PERL_MAGIC_ext);
		153	// self is now 0
		154	assert (!self);//D//TODO remove soon
		155	}
137		156
138	destroy ();
139	}
140
141	void
142	attachable::do_destroy ()
143	{
144	invoke (EVENT_ATTACHABLE_DESTROY, DT_END);
145
146	//TODO: call generic destroy callback
147	mortals.push_back (this);	157	mortals.push_back (this);
148	}	158	}
149		159
150	void	160	void
151	attachable::destroy ()	161	attachable::destroy ()
…		…
155		165
156	flags \|= F_DESTROYED;	166	flags \|= F_DESTROYED;
157	do_destroy ();	167	do_destroy ();
158	}	168	}
159		169
		170	void
160	void attachable::check_mortals ()	171	attachable::check_mortals ()
161	{	172	{
162	for (int i = 0; i < mortals.size (); )	173	static int i = 0;
		174
		175	for (;;)
163	{	176	{
		177	if (i >= mortals.size ())
		178	{
		179	i = 0;
		180
		181	if (mortals.size () > 1000)
		182	fprintf (stderr, "mortal queue size (%d) exceeds 1000.\n", (int)mortals.size ());
		183
		184	break;
		185	}
		186
164	attachable *obj = mortals [i];	187	attachable *obj = mortals [i];
165		188
166	obj->refcnt_chk (); // unborrow from perl, if necessary	189	obj->refcnt_chk (); // unborrow from perl, if necessary
167		190
		191	//if (obj->refcnt > 0 \|\| obj->self)
168	if (obj->refcnt \|\| obj->self)	192	if (obj->refcnt \|\| obj->self)
169	{	193	{
170	#if 0	194	//printf ("%p rc %d\n", obj, obj->refcnt_cnt ());//D
171	if (mortals.size() > 5)fprintf (stderr, "%d delaying %d:%p:%s %d (self %p:%d)\n", time(0),i, obj, typeid (*obj).name (),
172	obj->refcnt, obj->self, obj->self ? SvREFCNT(obj->self): - 1);//D
173	#endif
174
175	++i; // further delay freeing	195	++i; // further delay freeing
		196
		197	if (!(i & 0x3ff))
		198	break;
176	}//D	199	}
177	else	200	else
178	{	201	{
179	//Dfprintf (stderr, "deleteing %d:%p:%s\n", i, obj,typeid (*obj).name ());//D
180	mortals.erase (i);	202	mortals.erase (i);
181	delete obj;	203	delete obj;
182	}	204	}
183	}	205	}
184	}	206	}
…		…
209		231
210	static int	232	static int
211	attachable_free (pTHX_ SV sv, MAGIC mg)	233	attachable_free (pTHX_ SV sv, MAGIC mg)
212	{	234	{
213	attachable at = (attachable )mg->mg_ptr;	235	attachable at = (attachable )mg->mg_ptr;
214	assert (!(at->flags & attachable::F_BORROWED));//D//TODO//remove when stable	236
		237	//TODO: check if transaction behaviour is really required here
		238	if (SV self = (SV )at->self)
		239	{
215	at->self = 0;	240	at->self = 0;
		241	SvREFCNT_dec (self);
		242	}
		243
216	// next line makes sense, but most objects still have refcnt 0 by default	244	// next line makes sense, but most objects still have refcnt 0 by default
217	//at->refcnt_chk ();	245	//at->refcnt_chk ();
218	return 0;	246	return 0;
219	}	247	}
220		248
…		…
229	if (!obj->self)	257	if (!obj->self)
230	{	258	{
231	obj->self = newHV ();	259	obj->self = newHV ();
232	sv_magicext ((SV )obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char )obj, 0);	260	sv_magicext ((SV )obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char )obj, 0);
233		261
234	// borrow the refcnt from the object	262	// now bless the object _once_
235	obj->flags \|= attachable::F_BORROWED;	263	return sv_bless (newRV_inc ((SV *)obj->self), stash);
236	obj->refcnt_dec ();
237	}	264	}
		265	else
		266	{
		267	SV sv = newRV_inc ((SV )obj->self);
238		268
239	return sv_bless (newRV_inc ((SV *)obj->self), stash);	269	if (Gv_AMG (stash)) // handle overload correctly, as the perl core does not
		270	SvAMAGIC_on (sv);
		271
		272	return sv;
		273	}
240	}	274	}
241		275
242	static void	276	static void
243	clearSVptr (SV *sv)	277	clearSVptr (SV *sv)
244	{	278	{
…		…
297	inline SV to_sv (living v) { return newSVptr (v, stash_cf_living_wrap); }	331	inline SV to_sv (living v) { return newSVptr (v, stash_cf_living_wrap); }
298		332
299	inline SV *to_sv (object & v) { return to_sv (&v); }	333	inline SV *to_sv (object & v) { return to_sv (&v); }
300	inline SV *to_sv (living & v) { return to_sv (&v); }	334	inline SV *to_sv (living & v) { return to_sv (&v); }
301		335
302	//TODO:
303	inline SV to_sv (New_Face v) { return to_sv (v->name); }	336	inline SV to_sv (facetile v) { return to_sv (v->name); }
304	inline SV to_sv (treasurelist v) { return to_sv (v->name); }	337	inline SV to_sv (treasurelist v) { return to_sv (v->name); }
305		338
306	inline SV *to_sv (UUID v)	339	inline SV *to_sv (UUID v)
307	{	340	{
308	char buf[128];	341	char buf[128];
…		…
328	inline void sv_to (SV sv, client &v) { v = (client )(attachable )SvPTR_ornull (sv, "cf::client"); }	361	inline void sv_to (SV sv, client &v) { v = (client )(attachable )SvPTR_ornull (sv, "cf::client"); }
329	inline void sv_to (SV sv, player &v) { v = (player )(attachable )SvPTR_ornull (sv, "cf::player"); }	362	inline void sv_to (SV sv, player &v) { v = (player )(attachable )SvPTR_ornull (sv, "cf::player"); }
330	inline void sv_to (SV sv, object &v) { v = (object )(attachable )SvPTR_ornull (sv, "cf::object"); }	363	inline void sv_to (SV sv, object &v) { v = (object )(attachable )SvPTR_ornull (sv, "cf::object"); }
331	inline void sv_to (SV sv, archetype &v) { v = (archetype )(attachable )SvPTR_ornull (sv, "cf::arch"); }	364	inline void sv_to (SV sv, archetype &v) { v = (archetype )(attachable )SvPTR_ornull (sv, "cf::arch"); }
332	inline void sv_to (SV sv, maptile &v) { v = (maptile )(attachable )SvPTR_ornull (sv, "cf::map"); }	365	inline void sv_to (SV sv, maptile &v) { v = (maptile )(attachable )SvPTR_ornull (sv, "cf::map"); }
		366	inline void sv_to (SV sv, attachable &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); }
333	inline void sv_to (SV sv, partylist &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); }	367	inline void sv_to (SV sv, partylist &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); }
334	inline void sv_to (SV sv, region &v) { v = (region *)SvPTR_ornull (sv, "cf::region"); }	368	inline void sv_to (SV sv, region &v) { v = (region *)SvPTR_ornull (sv, "cf::region"); }
335	inline void sv_to (SV sv, living &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); }	369	inline void sv_to (SV sv, living &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); }
336		370
337	inline void sv_to (SV sv, New_Face &v) { v = &new_faces[FindFace (SvPV_nolen (sv), 0)]; } //TODO	371	inline void sv_to (SV sv, facetile &v) { v = &new_faces[FindFace (SvPV_nolen (sv), 0)]; }
338	inline void sv_to (SV sv, treasurelist &v) { v = find_treasurelist (SvPV_nolen (sv)); } // TODO	372	inline void sv_to (SV sv, treasurelist &v) { v = find_treasurelist (SvPV_nolen (sv)); }
339		373
340	template<class T>	374	template<class T>
341	inline void sv_to (SV sv, refptr<T> &v) { T tmp; sv_to (sv, tmp); v = tmp; }	375	inline void sv_to (SV sv, refptr<T> &v) { T tmp; sv_to (sv, tmp); v = tmp; }
342		376
343	template<int N>	377	template<int N>
…		…
478	{	512	{
479	if (!ext->cb)	513	if (!ext->cb)
480	ext->cb = newAV ();	514	ext->cb = newAV ();
481		515
482	return newRV_inc ((SV *)ext->cb);	516	return newRV_inc ((SV *)ext->cb);
483	}
484
485	#if 0
486	void attachable::clear ()
487	{
488	if (self)
489	{
490	// disconnect Perl from C, to avoid crashes
491	sv_unmagic (SvRV ((SV *)self), PERL_MAGIC_ext);
492
493	// clear the perl hash, might or might not be a good idea
494	hv_clear ((HV )SvRV ((SV )self));
495
496	SvREFCNT_dec (self);
497	self = 0;
498	}
499
500	if (cb)
501	{
502	SvREFCNT_dec (cb);
503	cb = 0;
504	}
505
506	attach = 0;
507	}
508	#endif
509
510	void attachable::optimise ()
511	{
512	if (self
513	&& SvREFCNT (self) == 1
514	&& !HvTOTALKEYS (self))
515	{
516	flags &= ~F_BORROWED;
517	refcnt_inc ();
518	SvREFCNT_dec ((SV *)self);
519	}
520	}	517	}
521		518
522	/////////////////////////////////////////////////////////////////////////////	519	/////////////////////////////////////////////////////////////////////////////
523		520
524	extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr)	521	extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr)
…		…
820	}	817	}
821		818
822	/////////////////////////////////////////////////////////////////////////////	819	/////////////////////////////////////////////////////////////////////////////
823		820
824	void	821	void
825	maptile::emergency_save ()	822	cfperl_emergency_save ()
826	{	823	{
827	CALL_BEGIN (0);	824	CALL_BEGIN (0);
828	CALL_CALL ("cf::map::emergency_save", G_VOID);	825	CALL_CALL ("cf::emergency_save", G_VOID);
829	CALL_END;	826	CALL_END;
830	}	827	}
831		828
832	maptile *	829	maptile *
833	maptile::find_map (const char path, maptile origin)	830	maptile::find_sync (const char path, maptile origin)
834	{	831	{
835	CALL_BEGIN (2);	832	CALL_BEGIN (2);
836	CALL_ARG (path);	833	CALL_ARG (path);
837	CALL_ARG (origin);	834	CALL_ARG (origin);
838	CALL_CALL ("cf::map::find_map", G_SCALAR);	835	CALL_CALL ("cf::map::find_sync", G_SCALAR);
839		836
840	maptile *retval;	837	maptile *retval;
841		838
842	if (count)	839	if (count)
843	sv_to (POPs, retval);	840	sv_to (POPs, retval);
…		…
847	CALL_END;	844	CALL_END;
848		845
849	return retval;	846	return retval;
850	}	847	}
851		848
852	void
853	maptile::do_load ()
854	{
855	CALL_BEGIN (1);
856	CALL_ARG (this);
857	CALL_CALL ("cf::map::do_load", G_VOID);
858	CALL_END;
859	}
860
861	maptile *	849	maptile *
862	maptile::customise_for (object *op)	850	maptile::find_async (const char path, maptile origin)
863	{	851	{
864	CALL_BEGIN (2);	852	CALL_BEGIN (2);
865	CALL_ARG (this);	853	CALL_ARG (path);
866	CALL_ARG (op);	854	CALL_ARG (origin);
867	CALL_CALL ("cf::map::customise_for", G_SCALAR);	855	CALL_CALL ("cf::map::find_async", G_SCALAR);
868		856
869	maptile *retval;	857	maptile *retval;
870		858
871	if (count)	859	if (count)
872	sv_to (POPs, retval);	860	sv_to (POPs, retval);
873	else	861	else
874	retval = 0;	862	retval = 0;
875		863
876	CALL_END;	864	CALL_END;
877		865
878	return retval ? retval : this;	866	return retval;
		867	}
		868
		869	void
		870	maptile::do_load_sync ()
		871	{
		872	CALL_BEGIN (1);
		873	CALL_ARG (this);
		874	CALL_CALL ("cf::map::do_load_sync", G_SCALAR);
		875	CALL_END;
879	}	876	}
880		877
881	void	878	void
882	maptile::change_all_map_light (int change)	879	maptile::change_all_map_light (int change)
883	{	880	{
…		…
903	/////////////////////////////////////////////////////////////////////////////	900	/////////////////////////////////////////////////////////////////////////////
904		901
905	struct EventAPI *watcher_base::GEventAPI;	902	struct EventAPI *watcher_base::GEventAPI;
906	struct CoroAPI *coroapi::GCoroAPI;	903	struct CoroAPI *coroapi::GCoroAPI;
907		904
		905	int coroapi::cede_counter;
		906
908	static void iw_dispatch (pe_event *ev)	907	static void iw_dispatch (pe_event *ev)
909	{	908	{
910	iw w = (iw )ev->ext_data;	909	iw w = (iw )ev->ext_data;
911	w->call (*w);	910	w->call (*w);
912	}	911	}
…		…
914	void	913	void
915	iw::alloc ()	914	iw::alloc ()
916	{	915	{
917	pe = GEventAPI->new_idle (0, 0);	916	pe = GEventAPI->new_idle (0, 0);
918		917
		918	WaREENTRANT_off (pe);
919	pe->base.callback = (void *)iw_dispatch;	919	pe->base.callback = (void *)iw_dispatch;
920	pe->base.ext_data = (void *)this;	920	pe->base.ext_data = (void *)this;
921	}	921	}
922		922
923	static void iow_dispatch (pe_event *ev)	923	static void iow_dispatch (pe_event *ev)
…		…
929	void	929	void
930	iow::alloc ()	930	iow::alloc ()
931	{	931	{
932	pe = GEventAPI->new_io (0, 0);	932	pe = GEventAPI->new_io (0, 0);
933		933
		934	WaREENTRANT_off (pe);
934	pe->base.callback = (void *)iow_dispatch;	935	pe->base.callback = (void *)iow_dispatch;
935	pe->base.ext_data = (void *)this;	936	pe->base.ext_data = (void *)this;
936		937
937	pe->fd = -1;	938	pe->fd = -1;
938	pe->poll = 0;	939	pe->poll = 0;
…		…
1266	const_iv (FLAG_ACTIVATE_ON_RELEASE)	1267	const_iv (FLAG_ACTIVATE_ON_RELEASE)
1267	const_iv (FLAG_IS_WATER)	1268	const_iv (FLAG_IS_WATER)
1268	const_iv (FLAG_CONTENT_ON_GEN)	1269	const_iv (FLAG_CONTENT_ON_GEN)
1269	const_iv (FLAG_IS_A_TEMPLATE)	1270	const_iv (FLAG_IS_A_TEMPLATE)
1270	const_iv (FLAG_IS_BUILDABLE)	1271	const_iv (FLAG_IS_BUILDABLE)
		1272	const_iv (FLAG_DESTROY_ON_DEATH)
		1273	const_iv (FLAG_NO_MAP_SAVE)
1271		1274
1272	const_iv (NDI_BLACK)	1275	const_iv (NDI_BLACK)
1273	const_iv (NDI_WHITE)	1276	const_iv (NDI_WHITE)
1274	const_iv (NDI_NAVY)	1277	const_iv (NDI_NAVY)
1275	const_iv (NDI_RED)	1278	const_iv (NDI_RED)
…		…
1317	const_iv (P_BLOCKSVIEW)	1320	const_iv (P_BLOCKSVIEW)
1318	const_iv (P_PLAYER)	1321	const_iv (P_PLAYER)
1319	const_iv (P_NO_MAGIC)	1322	const_iv (P_NO_MAGIC)
1320	const_iv (P_IS_ALIVE)	1323	const_iv (P_IS_ALIVE)
1321	const_iv (P_NO_CLERIC)	1324	const_iv (P_NO_CLERIC)
1322	const_iv (P_NEED_UPDATE)
1323	const_iv (P_OUT_OF_MAP)	1325	const_iv (P_OUT_OF_MAP)
1324	const_iv (P_NEW_MAP)	1326	const_iv (P_NEW_MAP)
		1327	const_iv (P_UPTODATE)
1325		1328
1326	const_iv (UP_OBJ_INSERT)	1329	const_iv (UP_OBJ_INSERT)
1327	const_iv (UP_OBJ_REMOVE)	1330	const_iv (UP_OBJ_REMOVE)
1328	const_iv (UP_OBJ_CHANGE)	1331	const_iv (UP_OBJ_CHANGE)
1329	const_iv (UP_OBJ_FACE)	1332	const_iv (UP_OBJ_FACE)
…		…
1460	const_iv (ATNR_BLIND)	1463	const_iv (ATNR_BLIND)
1461	const_iv (ATNR_INTERNAL)	1464	const_iv (ATNR_INTERNAL)
1462	const_iv (ATNR_LIFE_STEALING)	1465	const_iv (ATNR_LIFE_STEALING)
1463	const_iv (ATNR_DISEASE)	1466	const_iv (ATNR_DISEASE)
1464		1467
1465	const_iv (MAP_FLUSH)
1466	const_iv (MAP_PLAYER_UNIQUE)
1467	const_iv (MAP_BLOCK)
1468	const_iv (MAP_STYLE)
1469	const_iv (MAP_OVERLAY)
1470
1471	const_iv (MAP_IN_MEMORY)	1468	const_iv (MAP_IN_MEMORY)
1472	const_iv (MAP_SWAPPED)	1469	const_iv (MAP_SWAPPED)
1473	const_iv (MAP_LOADING)	1470	const_iv (MAP_LOADING)
1474	const_iv (MAP_SAVING)	1471	const_iv (MAP_SAVING)
1475		1472
…		…
1488	const_iv (ST_SETUP)	1485	const_iv (ST_SETUP)
1489	const_iv (ST_PLAYING)	1486	const_iv (ST_PLAYING)
1490	const_iv (ST_CUSTOM)	1487	const_iv (ST_CUSTOM)
1491		1488
1492	const_iv (ST_CHANGE_CLASS)	1489	const_iv (ST_CHANGE_CLASS)
1493	const_iv (ST_CONFIRM_QUIT)
1494	const_iv (ST_GET_PARTY_PASSWORD)
1495		1490
1496	const_iv (IO_HEADER)	1491	const_iv (IO_HEADER)
1497	const_iv (IO_OBJECTS)	1492	const_iv (IO_OBJECTS)
1498	const_iv (IO_UNIQUES)	1493	const_iv (IO_UNIQUES)
1499		1494
…		…
1553		1548
1554	void _global_reattach ()	1549	void _global_reattach ()
1555	CODE:	1550	CODE:
1556	{	1551	{
1557	// reattach to all attachable objects in the game.	1552	// reattach to all attachable objects in the game.
1558	for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)	1553	for_all_clients (ns)
1559	(*i)->reattach ();	1554	ns->reattach ();
1560		1555
1561	for_all_players (pl)	1556	for_all_players (pl)
1562	pl->reattach ();	1557	pl->reattach ();
1563		1558
1564	//TODO	1559	//TODO
1565	//for (map_container::iterator i = maps.begin (); i != maps.end (); ++i)	1560	//for (map_container::iterator i = maps.begin (); i != maps.end (); ++i)
1566	// i->second->reattach ();	1561	// i->second->reattach ();
1567		1562
1568	for (object *op = object::first; op; op = op->next)	1563	for_all_objects (op)
1569	op->reattach ();	1564	op->reattach ();
1570	}	1565	}
1571		1566
1572	NV floor (NV x)	1567	NV floor (NV x)
1573		1568
1574	NV ceil (NV x)	1569	NV ceil (NV x)
		1570
		1571	NV rndm (...)
		1572	CODE:
		1573	switch (items)
		1574	{
		1575	case 0: RETVAL = rndm (); break;
		1576	case 1: RETVAL = rndm (SvUV (ST (0))); break;
		1577	case 2: RETVAL = rndm (SvIV (ST (0)), SvIV (ST (1))); break;
		1578	default: croak ("cf::rndm requires none, one or two parameters."); break;
		1579	}
		1580	OUTPUT:
		1581	RETVAL
1575		1582
1576	void server_tick ()	1583	void server_tick ()
1577	CODE:	1584	CODE:
1578	runtime = SvNVx (sv_runtime);	1585	runtime = SvNVx (sv_runtime);
1579	server_tick ();	1586	server_tick ();
…		…
1624	case 5: RETVAL = settings.playerdir; break;	1631	case 5: RETVAL = settings.playerdir; break;
1625	case 6: RETVAL = settings.datadir ; break;	1632	case 6: RETVAL = settings.datadir ; break;
1626	}	1633	}
1627	OUTPUT: RETVAL	1634	OUTPUT: RETVAL
1628		1635
		1636	void abort ()
		1637
		1638	void fork_abort (char *cause = "cf::fork_abort")
		1639
		1640	void cleanup (const char *cause, bool make_core = false)
		1641
1629	void emergency_save ()	1642	void emergency_save ()
1630		1643
		1644	UV sv_2watcher (SV *w)
		1645	CODE:
		1646	RETVAL = (UV)GEventAPI->sv_2watcher (w);
		1647	OUTPUT:
		1648	RETVAL
		1649
1631	void _exit (int status = 0)	1650	void _exit (int status = 0)
		1651
		1652	#if _POSIX_MEMLOCK
		1653
		1654	int mlockall (int flags = MCL_CURRENT \| MCL_FUTURE)
		1655
		1656	int munlockall ()
		1657
		1658	#endif
1632		1659
1633	int find_animation (char *text)	1660	int find_animation (char *text)
1634	PROTOTYPE: $	1661	PROTOTYPE: $
1635		1662
1636	int random_roll (int min, int max, object *op, int goodbad);	1663	int random_roll (int min, int max, object *op, int goodbad);
…		…
1683	CODE:	1710	CODE:
1684	RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);	1711	RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
1685	OUTPUT:	1712	OUTPUT:
1686	RETVAL	1713	RETVAL
1687		1714
1688	#bool	1715	int mortals_size ()
1689	#destroyed (attachable *at)	1716	CODE:
1690	#	1717	RETVAL = attachable::mortals.size ();
1691	#void	1718	OUTPUT: RETVAL
1692	#destroy (attachable *at)	1719
		1720	#object *mortals (U32 index)
		1721	# CODE:
		1722	# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0;
		1723	# OUTPUT: RETVAL
		1724
		1725	INCLUDE: $PERL genacc attachable ../include/cfperl.h \|
1693		1726
1694	MODULE = cf PACKAGE = cf::global	1727	MODULE = cf PACKAGE = cf::global
1695		1728
1696	int invoke (SV *klass, int event, ...)	1729	int invoke (SV *klass, int event, ...)
1697	CODE:	1730	CODE:
…		…
1713	RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END);	1746	RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END);
1714	OUTPUT: RETVAL	1747	OUTPUT: RETVAL
1715		1748
1716	SV registry (object op)	1749	SV registry (object op)
1717		1750
1718	void mortals ()	1751	int objects_size ()
1719	PPCODE:	1752	CODE:
1720	EXTEND (SP, object::mortals.size ());
1721	for (AUTODECL (i, object::mortals.begin ()); i != object::mortals.end (); ++i)
1722	PUSHs (to_sv (*i));
1723
1724	object *first ()
1725	CODE:
1726	RETVAL = object::first;	1753	RETVAL = objects.size ();
		1754	OUTPUT: RETVAL
		1755
		1756	object *objects (U32 index)
		1757	CODE:
		1758	RETVAL = index < objects.size () ? objects [index] : 0;
		1759	OUTPUT: RETVAL
		1760
		1761	int actives_size ()
		1762	CODE:
		1763	RETVAL = actives.size ();
		1764	OUTPUT: RETVAL
		1765
		1766	object *actives (U32 index)
		1767	CODE:
		1768	RETVAL = index < actives.size () ? actives [index] : 0;
1727	OUTPUT: RETVAL	1769	OUTPUT: RETVAL
1728		1770
1729	# missing properties	1771	# missing properties
1730		1772
1731	object head (object op)	1773	object head (object op)
1732	PROTOTYPE: $	1774	PROTOTYPE: $
1733	CODE:	1775	CODE:
1734	RETVAL = op->head ? op->head : op;	1776	RETVAL = op->head_ ();
1735	OUTPUT: RETVAL	1777	OUTPUT: RETVAL
1736		1778
1737	int is_head (object *op)	1779	int is_head (object *op)
1738	PROTOTYPE: $	1780	PROTOTYPE: $
1739	CODE:	1781	CODE:
1740	RETVAL = !op->head;	1782	RETVAL = op->head_ () == op;
1741	OUTPUT: RETVAL	1783	OUTPUT: RETVAL
1742		1784
1743	void	1785	void
1744	inv (object *obj)	1786	inv (object *obj)
1745	PROTOTYPE: $	1787	PROTOTYPE: $
…		…
1836		1878
1837	void drop (object who, object op)	1879	void drop (object who, object op)
1838		1880
1839	void pick_up (object who, object op)	1881	void pick_up (object who, object op)
1840		1882
1841	object cf_object_insert_object (object op, object *container)
1842
1843	object cf_object_insert_in_ob (object ob, object *where)
1844
1845	int cf_object_teleport (object op, maptile map, int x, int y)	1883	int cf_object_teleport (object op, maptile map, int x, int y)
1846		1884
1847	void update_object (object *op, int action)	1885	void update_object (object *op, int action)
1848		1886
1849	object cf_create_object_by_name (const char name)	1887	object cf_create_object_by_name (const char name)
…		…
1942	RETVAL = op->contr;	1980	RETVAL = op->contr;
1943	OUTPUT: RETVAL	1981	OUTPUT: RETVAL
1944		1982
1945	void check_score (object *op)	1983	void check_score (object *op)
1946		1984
1947	void cf_player_message (object obj, char txt, int flags = NDI_ORANGE \| NDI_UNIQUE)	1985	void message (object op, char txt, int flags = NDI_ORANGE \| NDI_UNIQUE)
		1986	CODE:
		1987	new_draw_info (flags, 0, op, txt);
1948		1988
1949	object cf_player_send_inventory (object op)	1989	object cf_player_send_inventory (object op)
1950		1990
1951	char cf_player_get_ip (object op)	1991	char cf_player_get_ip (object op)
1952	ALIAS: ip = 0	1992	ALIAS: ip = 0
…		…
1965		2005
1966	void esrv_update_item (object op, int what, object item)	2006	void esrv_update_item (object op, int what, object item)
1967	C_ARGS: what, op, item	2007	C_ARGS: what, op, item
1968		2008
1969	void clear_los (object *op)	2009	void clear_los (object *op)
1970
1971	int command_teleport (object op, char params)
1972		2010
1973	int command_summon (object op, char params)	2011	int command_summon (object op, char params)
1974		2012
1975	int command_arrest (object op, char params)	2013	int command_arrest (object op, char params)
1976		2014
…		…
1998	CODE:	2036	CODE:
1999	pl->ob->stats.hp = pl->ob->stats.maxhp;	2037	pl->ob->stats.hp = pl->ob->stats.maxhp;
2000	pl->ob->stats.sp = pl->ob->stats.maxsp;	2038	pl->ob->stats.sp = pl->ob->stats.maxsp;
2001	pl->ob->stats.grace = pl->ob->stats.maxgrace;	2039	pl->ob->stats.grace = pl->ob->stats.maxgrace;
2002	pl->orig_stats = pl->ob->stats;	2040	pl->orig_stats = pl->ob->stats;
2003
2004	player cf_player_find (char name)
2005	PROTOTYPE: $
2006		2041
2007	void cf_player_move (player *pl, int dir)	2042	void cf_player_move (player *pl, int dir)
2008		2043
2009	void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0);	2044	void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0);
2010		2045
…		…
2056	if (y) sv_to (y, pl->bed_y);	2091	if (y) sv_to (y, pl->bed_y);
2057		2092
2058	void	2093	void
2059	list ()	2094	list ()
2060	PPCODE:	2095	PPCODE:
2061	for (player *pl = first_player; pl; pl = pl->next)	2096	for_all_players (pl)
2062	XPUSHs (sv_2mortal (to_sv (pl)));	2097	XPUSHs (sv_2mortal (to_sv (pl)));
2063
2064	bool
2065	peaceful (player *pl, bool new_setting = 0)
2066	PROTOTYPE: $;$
2067	CODE:
2068	RETVAL = pl->peaceful;
2069	if (items > 1)
2070	pl->peaceful = new_setting;
2071	OUTPUT:
2072	RETVAL
2073
2074	living *
2075	orig_stats (player *pl)
2076	CODE:
2077	RETVAL = &pl->orig_stats;
2078	OUTPUT: RETVAL
2079
2080	living *
2081	last_stats (player *pl)
2082	CODE:
2083	RETVAL = &pl->last_stats;
2084	OUTPUT: RETVAL
2085		2098
2086		2099
2087	MODULE = cf PACKAGE = cf::map PREFIX = cf_map_	2100	MODULE = cf PACKAGE = cf::map PREFIX = cf_map_
2088		2101
2089	int invoke (maptile *map, int event, ...)	2102	int invoke (maptile *map, int event, ...)
…		…
2107	RETVAL = new maptile;	2120	RETVAL = new maptile;
2108	OUTPUT:	2121	OUTPUT:
2109	RETVAL	2122	RETVAL
2110		2123
2111	void	2124	void
2112	maptile::destroy ()
2113
2114	void
2115	maptile::players ()	2125	maptile::players ()
2116	PPCODE:	2126	PPCODE:
2117	if (GIMME_V == G_SCALAR)	2127	if (GIMME_V == G_SCALAR)
2118	XPUSHs (to_sv (THIS->players));	2128	XPUSHs (sv_2mortal (to_sv (THIS->players)));
2119	else if (GIMME_V == G_ARRAY)	2129	else if (GIMME_V == G_ARRAY)
2120	{	2130	{
2121	EXTEND (SP, THIS->players);	2131	EXTEND (SP, THIS->players);
2122	for_all_players (pl)	2132	for_all_players (pl)
2123	if (pl->ob && pl->ob->map == THIS)	2133	if (pl->ob && pl->ob->map == THIS)
2124	PUSHs (to_sv (pl->ob));	2134	PUSHs (sv_2mortal (to_sv (pl->ob)));
2125	}	2135	}
2126		2136
2127	void play_sound_map (maptile *map, int x, int y, int sound_num)	2137	void play_sound_map (maptile *map, int x, int y, int sound_num)
2128		2138
2129	int out_of_map (maptile *map, int x, int y)	2139	int out_of_map (maptile *map, int x, int y)
…		…
2147		2157
2148	object* cf_map_present_arch_by_name (maptile map, const char str, int nx, int ny)	2158	object* cf_map_present_arch_by_name (maptile map, const char str, int nx, int ny)
2149	C_ARGS: str, map, nx, ny	2159	C_ARGS: str, map, nx, ny
2150		2160
2151	void	2161	void
2152	cf_map_normalise (maptile *map, int x, int y)	2162	get_map_flags (maptile *map, int x, int y)
2153	PPCODE:	2163	PPCODE:
2154	{	2164	{
2155	maptile *nmap = 0;	2165	maptile *nmap = 0;
2156	I16 nx = 0, ny = 0;	2166	I16 nx = 0, ny = 0;
2157	int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);	2167	int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
…		…
2206	case 4: RETVAL = newSVuv ( GET_MAP_MOVE_BLOCK (obj, x, y)); break;	2216	case 4: RETVAL = newSVuv ( GET_MAP_MOVE_BLOCK (obj, x, y)); break;
2207	case 5: RETVAL = newSVuv ( GET_MAP_MOVE_SLOW (obj, x, y)); break;	2217	case 5: RETVAL = newSVuv ( GET_MAP_MOVE_SLOW (obj, x, y)); break;
2208	case 6: RETVAL = newSVuv ( GET_MAP_MOVE_ON (obj, x, y)); break;	2218	case 6: RETVAL = newSVuv ( GET_MAP_MOVE_ON (obj, x, y)); break;
2209	case 7: RETVAL = newSVuv ( GET_MAP_MOVE_OFF (obj, x, y)); break;	2219	case 7: RETVAL = newSVuv ( GET_MAP_MOVE_OFF (obj, x, y)); break;
2210	}	2220	}
2211	OUTPUT:	2221	OUTPUT: RETVAL
2212	RETVAL
2213		2222
2214	void fix_walls (maptile *map, int x, int y)	2223	void fix_walls (maptile *map, int x, int y)
2215		2224
2216	void fix_walls_around (maptile *map, int x, int y)	2225	void fix_walls_around (maptile *map, int x, int y)
2217		2226
		2227	const char *
		2228	region_name (maptile *m)
		2229	CODE:
		2230	RETVAL = get_name_of_region_for_map (m);
		2231	OUTPUT: RETVAL
		2232
2218	# worst xs function of my life	2233	# worst xs function of my life
2219	maptile *	2234	bool
2220	_create_random_map (\	2235	_create_random_map (\
2221	char *path,\	2236	maptile *self,\
2222	char *wallstyle,\	2237	char *wallstyle,\
2223	char *wall_name,\	2238	char *wall_name,\
2224	char *floorstyle,\	2239	char *floorstyle,\
2225	char *monsterstyle,\	2240	char *monsterstyle,\
2226	char *treasurestyle,\	2241	char *treasurestyle,\
…		…
2230	char *origin_map,\	2245	char *origin_map,\
2231	char *final_map,\	2246	char *final_map,\
2232	char *exitstyle,\	2247	char *exitstyle,\
2233	char *this_map,\	2248	char *this_map,\
2234	char *exit_on_final_map,\	2249	char *exit_on_final_map,\
2235	int Xsize,\	2250	int xsize,\
2236	int Ysize,\	2251	int ysize,\
2237	int expand2x,\	2252	int expand2x,\
2238	int layoutoptions1,\	2253	int layoutoptions1,\
2239	int layoutoptions2,\	2254	int layoutoptions2,\
2240	int layoutoptions3,\	2255	int layoutoptions3,\
2241	int symmetry,\	2256	int symmetry,\
…		…
2246	int dungeon_depth,\	2261	int dungeon_depth,\
2247	int decoroptions,\	2262	int decoroptions,\
2248	int orientation,\	2263	int orientation,\
2249	int origin_y,\	2264	int origin_y,\
2250	int origin_x,\	2265	int origin_x,\
2251	int random_seed,\	2266	U32 random_seed,\
2252	val64 total_map_hp,\	2267	val64 total_map_hp,\
2253	int map_layout_style,\	2268	int map_layout_style,\
2254	int treasureoptions,\	2269	int treasureoptions,\
2255	int symmetry_used,\	2270	int symmetry_used,\
2256	region *region\	2271	region *region,\
		2272	char *custom\
2257	)	2273	)
2258	CODE:	2274	CODE:
2259	{	2275	{
2260	random_map_params rmp;	2276	random_map_params rmp;
2261		2277
…		…
2265	assign (rmp.monsterstyle , monsterstyle);	2281	assign (rmp.monsterstyle , monsterstyle);
2266	assign (rmp.treasurestyle , treasurestyle);	2282	assign (rmp.treasurestyle , treasurestyle);
2267	assign (rmp.layoutstyle , layoutstyle);	2283	assign (rmp.layoutstyle , layoutstyle);
2268	assign (rmp.doorstyle , doorstyle);	2284	assign (rmp.doorstyle , doorstyle);
2269	assign (rmp.decorstyle , decorstyle);	2285	assign (rmp.decorstyle , decorstyle);
2270	assign (rmp.origin_map , origin_map);
2271	assign (rmp.final_map , final_map);
2272	assign (rmp.exitstyle , exitstyle);	2286	assign (rmp.exitstyle , exitstyle);
2273	assign (rmp.this_map , this_map);
2274	assign (rmp.exit_on_final_map, exit_on_final_map);	2287	assign (rmp.exit_on_final_map, exit_on_final_map);
2275		2288
		2289	rmp.origin_map = origin_map;
		2290	rmp.final_map = final_map;
		2291	rmp.this_map = this_map;
2276	rmp.Xsize = Xsize;	2292	rmp.xsize = xsize;
2277	rmp.Ysize = Ysize;	2293	rmp.ysize = ysize;
2278	rmp.expand2x = expand2x;	2294	rmp.expand2x = expand2x;
2279	rmp.layoutoptions1 = layoutoptions1;	2295	rmp.layoutoptions1 = layoutoptions1;
2280	rmp.layoutoptions2 = layoutoptions2;	2296	rmp.layoutoptions2 = layoutoptions2;
2281	rmp.layoutoptions3 = layoutoptions3;	2297	rmp.layoutoptions3 = layoutoptions3;
2282	rmp.symmetry = symmetry;	2298	rmp.symmetry = symmetry;
…		…
2293	rmp.total_map_hp = total_map_hp;	2309	rmp.total_map_hp = total_map_hp;
2294	rmp.map_layout_style = map_layout_style;	2310	rmp.map_layout_style = map_layout_style;
2295	rmp.treasureoptions = treasureoptions;	2311	rmp.treasureoptions = treasureoptions;
2296	rmp.symmetry_used = symmetry_used;	2312	rmp.symmetry_used = symmetry_used;
2297	rmp.region = region;	2313	rmp.region = region;
		2314	rmp.custom = custom;
2298		2315
2299	RETVAL = generate_random_map (path, &rmp);	2316	RETVAL = self->generate_random_map (&rmp);
2300	}	2317	}
2301	OUTPUT:	2318	OUTPUT:
2302	RETVAL	2319	RETVAL
2303		2320
2304	MODULE = cf PACKAGE = cf::arch	2321	MODULE = cf PACKAGE = cf::arch
…		…
2323	PROTOTYPE:	2340	PROTOTYPE:
2324	CODE:	2341	CODE:
2325	RETVAL = get_firstparty ();	2342	RETVAL = get_firstparty ();
2326	OUTPUT: RETVAL	2343	OUTPUT: RETVAL
2327		2344
2328	partylist next (partylist party)	2345	INCLUDE: $PERL genacc partylist ../include/player.h \|
2329	CODE:
2330	RETVAL = party->next;
2331	OUTPUT: RETVAL
2332
2333	const char name (partylist party)
2334	CODE:
2335	RETVAL = party->partyname;
2336	OUTPUT: RETVAL
2337
2338	const char password (partylist party)
2339	CODE:
2340	RETVAL = party->passwd;
2341	OUTPUT: RETVAL
2342		2346
2343	MODULE = cf PACKAGE = cf::region	2347	MODULE = cf PACKAGE = cf::region
2344		2348
2345	region *first ()	2349	region *first ()
2346	PROTOTYPE:	2350	PROTOTYPE:
2347	CODE:	2351	CODE:
2348	RETVAL = first_region;	2352	RETVAL = first_region;
2349	OUTPUT: RETVAL	2353	OUTPUT: RETVAL
2350		2354
2351	region next (region reg)	2355	region find (char name)
		2356	PROTOTYPE: $
2352	CODE:	2357	CODE:
2353	RETVAL = reg->next;	2358	RETVAL = get_region_by_name (name);
2354	OUTPUT: RETVAL	2359	OUTPUT: RETVAL
2355		2360
2356	const char name (region reg)	2361	INCLUDE: $PERL genacc region ../include/map.h \|
2357	CODE:
2358	RETVAL = reg->name;
2359	OUTPUT: RETVAL
2360
2361	region parent (region reg)
2362	CODE:
2363	RETVAL = reg->parent;
2364	OUTPUT: RETVAL
2365
2366	const char longname (region reg)
2367	CODE:
2368	RETVAL = reg->longname;
2369	OUTPUT: RETVAL
2370
2371	const char msg (region reg)
2372	CODE:
2373	RETVAL = reg->msg;
2374	OUTPUT: RETVAL
2375		2362
2376	MODULE = cf PACKAGE = cf::living	2363	MODULE = cf PACKAGE = cf::living
2377		2364
2378	INCLUDE: $PERL genacc living ../include/living.h \|	2365	INCLUDE: $PERL genacc living ../include/living.h \|
2379		2366
…		…
2410	char *buf = SvPVbyte (packet, len);	2397	char *buf = SvPVbyte (packet, len);
2411		2398
2412	THIS->send_packet (buf, len);	2399	THIS->send_packet (buf, len);
2413	}	2400	}
2414		2401
2415	void
2416	client::destroy ()
2417

Diff Legend

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

Comparing deliantra/server/server/cfperl.xs (file contents): Revision 1.117 by root, Sat Dec 30 18:45:28 2006 UTC vs. Revision 1.153 by root, Fri Jan 26 20:59:57 2007 UTC

Diff Legend

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.117 by root, Sat Dec 30 18:45:28 2006 UTC vs.
Revision 1.153 by root, Fri Jan 26 20:59:57 2007 UTC