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

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.119 by root, Sun Dec 31 10:28:36 2006 UTC vs.
Revision 1.166 by root, Tue Feb 13 19:25:45 2007 UTC

…		…
29	#include <plugin_common.h>	29	#include <plugin_common.h>
30	#include <sounds.h>	30	#include <sounds.h>
31	#include <cstdarg>	31	#include <cstdarg>
32	#include <sproto.h>	32	#include <sproto.h>
33		33
		34	#include "loader.h"
34	#include "cfperl.h"	35	#include "cfperl.h"
35	#include "shstr.h"	36	#include "shstr.h"
		37
		38	#include <unistd.h>
		39	#if _POSIX_MEMLOCK
		40	# include <sys/mman.h>
		41	#endif
36		42
37	#include <EXTERN.h>	43	#include <EXTERN.h>
38	#include <perl.h>	44	#include <perl.h>
39	#include <XSUB.h>	45	#include <XSUB.h>
40		46
…		…
94		100
95	//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////	101	//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
96		102
97	unordered_vector<attachable *> attachable::mortals;	103	unordered_vector<attachable *> attachable::mortals;
98		104
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 ()	105	attachable::~attachable ()
111	{	106	{
112	assert (!(flags & F_BORROWED));//D//TODO//remove when stable
113	#if 0
114	assert (!rc_next);
115	assert (!refcnt);	107	assert (!self);
116	#endif	108	assert (!cb);
		109	}
		110
		111	int
		112	attachable::refcnt_cnt () const
		113	{
		114	return refcnt + (self ? SvREFCNT (self) - 1 : 0);
		115	}
		116
		117	void
		118	attachable::sever_self ()
		119	{
		120	if (HV *self = this->self)
		121	{
		122	// keep a refcount because sv_unmagic might call attachable_free,
		123	// which might clear self, causing sv_unmagic to crash on a now
		124	// invalid object.
		125	SvREFCNT_inc (self);
		126	hv_clear (self);
		127	sv_unmagic ((SV *)self, PERL_MAGIC_ext);
		128	SvREFCNT_dec (self);
		129
		130	// self must be null now because thats sv_unmagic's job.
		131	assert (!this->self);
		132	flags \|= 0x80; // severed //D
		133	}
		134	}
		135
		136	void
		137	attachable::optimise ()
		138	{
		139	if (self
		140	&& SvREFCNT (self) == 1
		141	&& !HvTOTALKEYS (self))
		142	flags \|= 0x40,//D
		143	sever_self ();
117	}	144	}
118		145
119	// check wether the object really is dead	146	// check wether the object really is dead
120	void	147	void
121	attachable::do_check ()	148	attachable::do_check ()
122	{	149	{
123	if (refcnt > 0)	150	if (refcnt_cnt () > 0)
124	return;	151	return;
125		152
126	// try to unborrow the refcnt from perl	153	destroy ();
127	if (flags & F_BORROWED)	154	}
		155
		156	void
		157	attachable::do_destroy ()
		158	{
		159	invoke (EVENT_ATTACHABLE_DESTROY, DT_END);
		160
		161	if (cb)
128	{	162	{
129	assert (self);//D//TODO//remove when stable
130	flags &= ~F_BORROWED;
131	refcnt_inc ();
132	SvREFCNT_dec (self);	163	SvREFCNT_dec (cb);
		164	cb = 0;
133	}	165	}
134		166
135	if (refcnt > 0 \|\| self)	167	if (self)
136	return;	168	sever_self ();
137		169
138	destroy ();	170	flags \|= 0x20; //D
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);	171	mortals.push_back (this);
148	}	172	}
149		173
150	void	174	void
151	attachable::destroy ()	175	attachable::destroy ()
…		…
155		179
156	flags \|= F_DESTROYED;	180	flags \|= F_DESTROYED;
157	do_destroy ();	181	do_destroy ();
158	}	182	}
159		183
		184	void
160	void attachable::check_mortals ()	185	attachable::check_mortals ()
161	{	186	{
162	for (int i = 0; i < mortals.size (); )	187	static int i = 0;
		188
		189	for (;;)
163	{	190	{
		191	if (i >= mortals.size ())
		192	{
		193	i = 0;
		194
		195	if (mortals.size () > 1000)
		196	fprintf (stderr, "mortal queue size (%d) exceeds 1000.\n", (int)mortals.size ());
		197
		198	break;
		199	}
		200
164	attachable *obj = mortals [i];	201	attachable *obj = mortals [i];
165		202
166	obj->refcnt_chk (); // unborrow from perl, if necessary	203	obj->refcnt_chk (); // unborrow from perl, if necessary
167		204
		205	//if (obj->refcnt > 0 \|\| obj->self)
168	if (obj->refcnt \|\| obj->self)	206	if (obj->refcnt \|\| obj->self)
169	{	207	{
170	#if 0	208	//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	209	++i; // further delay freeing
		210
		211	if (!(i & 0x3ff))
		212	break;
176	}//D	213	}
177	else	214	else
178	{	215	{
179	//Dfprintf (stderr, "deleteing %d:%p:%s\n", i, obj,typeid (*obj).name ());//D
180	mortals.erase (i);	216	mortals.erase (i);
181	delete obj;	217	delete obj;
182	}	218	}
183	}	219	}
184	}	220	}
…		…
209		245
210	static int	246	static int
211	attachable_free (pTHX_ SV sv, MAGIC mg)	247	attachable_free (pTHX_ SV sv, MAGIC mg)
212	{	248	{
213	attachable at = (attachable )mg->mg_ptr;	249	attachable at = (attachable )mg->mg_ptr;
214	assert (!(at->flags & attachable::F_BORROWED));//D//TODO//remove when stable	250
		251	//TODO: check if transaction behaviour is really required here
		252	if (SV self = (SV )at->self)
		253	{
215	at->self = 0;	254	at->self = 0;
		255	SvREFCNT_dec (self);
		256	}
		257
216	// next line makes sense, but most objects still have refcnt 0 by default	258	// next line makes sense, but most objects still have refcnt 0 by default
217	//at->refcnt_chk ();	259	//at->refcnt_chk ();
218	return 0;	260	return 0;
219	}	261	}
220		262
…		…
228		270
229	if (!obj->self)	271	if (!obj->self)
230	{	272	{
231	obj->self = newHV ();	273	obj->self = newHV ();
232	sv_magicext ((SV )obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char )obj, 0);	274	sv_magicext ((SV )obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char )obj, 0);
		275	obj->flags \|= (obj->flags & 0xc0) << 8;
		276	obj->flags &= ~0xc0;//D
		277	obj->flags \|= 0x10;//D
233		278
234	// borrow the refcnt from the object	279	// now bless the object _once_
235	obj->flags \|= attachable::F_BORROWED;	280	return sv_bless (newRV_inc ((SV *)obj->self), stash);
236	obj->refcnt_dec ();
237	}	281	}
		282	else
		283	{
		284	SV sv = newRV_inc ((SV )obj->self);
238		285
239	return sv_bless (newRV_inc ((SV *)obj->self), stash);	286	if (Gv_AMG (stash)) // handle overload correctly, as the perl core does not
		287	SvAMAGIC_on (sv);
		288
		289	return sv;
		290	}
240	}	291	}
241		292
242	static void	293	static void
243	clearSVptr (SV *sv)	294	clearSVptr (SV *sv)
244	{	295	{
…		…
297	inline SV to_sv (living v) { return newSVptr (v, stash_cf_living_wrap); }	348	inline SV to_sv (living v) { return newSVptr (v, stash_cf_living_wrap); }
298		349
299	inline SV *to_sv (object & v) { return to_sv (&v); }	350	inline SV *to_sv (object & v) { return to_sv (&v); }
300	inline SV *to_sv (living & v) { return to_sv (&v); }	351	inline SV *to_sv (living & v) { return to_sv (&v); }
301		352
302	//TODO:
303	inline SV to_sv (New_Face v) { return to_sv (v->name); }	353	inline SV to_sv (facetile v) { return to_sv (v->name); }
304	inline SV to_sv (treasurelist v) { return to_sv (v->name); }	354	inline SV to_sv (treasurelist v) { return to_sv (v->name); }
305		355
306	inline SV *to_sv (UUID v)	356	inline SV *to_sv (UUID v)
307	{	357	{
308	char buf[128];	358	char buf[128];
309	snprintf (buf, 128, "<1,%" PRIx64 ">", v.seq);	359	snprintf (buf, 128, "<1.%" PRIx64 ">", v.seq);
310	return newSVpv (buf, 0);	360	return newSVpv (buf, 0);
311	}	361	}
312		362
313	inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPV_nolen (sv) : 0; }	363	inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPV_nolen (sv) : 0; }
314	inline void sv_to (SV sv, char &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; }	364	inline void sv_to (SV sv, char &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; }
…		…
328	inline void sv_to (SV sv, client &v) { v = (client )(attachable )SvPTR_ornull (sv, "cf::client"); }	378	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"); }	379	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"); }	380	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"); }	381	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"); }	382	inline void sv_to (SV sv, maptile &v) { v = (maptile )(attachable )SvPTR_ornull (sv, "cf::map"); }
		383	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"); }	384	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"); }	385	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"); }	386	inline void sv_to (SV sv, living &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); }
336		387
337	inline void sv_to (SV sv, New_Face &v) { v = &new_faces[FindFace (SvPV_nolen (sv), 0)]; } //TODO	388	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	389	inline void sv_to (SV sv, treasurelist &v) { v = find_treasurelist (SvPV_nolen (sv)); }
339		390
340	template<class T>	391	template<class T>
341	inline void sv_to (SV sv, refptr<T> &v) { T tmp; sv_to (sv, tmp); v = tmp; }	392	inline void sv_to (SV sv, refptr<T> &v) { T tmp; sv_to (sv, tmp); v = tmp; }
342		393
343	template<int N>	394	template<int N>
…		…
478	{	529	{
479	if (!ext->cb)	530	if (!ext->cb)
480	ext->cb = newAV ();	531	ext->cb = newAV ();
481		532
482	return newRV_inc ((SV *)ext->cb);	533	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	}	534	}
521		535
522	/////////////////////////////////////////////////////////////////////////////	536	/////////////////////////////////////////////////////////////////////////////
523		537
524	extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr)	538	extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr)
…		…
597	if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) \|\| perl_run (perl))	611	if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) \|\| perl_run (perl))
598	{	612	{
599	printf ("unable to initialize perl-interpreter, aborting.\n");	613	printf ("unable to initialize perl-interpreter, aborting.\n");
600	exit (EXIT_FAILURE);	614	exit (EXIT_FAILURE);
601	}	615	}
		616
		617	{
		618	dSP;
		619
		620	PUSHMARK (SP);
		621	PUTBACK;
		622	call_pv ("cf::init", G_DISCARD \| G_VOID);
		623	}
602	}	624	}
603		625
604	void cfperl_main ()	626	void cfperl_main ()
605	{	627	{
606	dSP;	628	dSP;
…		…
820	}	842	}
821		843
822	/////////////////////////////////////////////////////////////////////////////	844	/////////////////////////////////////////////////////////////////////////////
823		845
824	void	846	void
825	maptile::emergency_save ()	847	cfperl_emergency_save ()
826	{	848	{
827	CALL_BEGIN (0);	849	CALL_BEGIN (0);
828	CALL_CALL ("cf::map::emergency_save", G_VOID);	850	CALL_CALL ("cf::emergency_save", G_VOID);
829	CALL_END;	851	CALL_END;
830	}	852	}
831		853
		854	void
		855	cfperl_cleanup (int make_core)
		856	{
		857	CALL_BEGIN (1);
		858	CALL_ARG (make_core);
		859	CALL_CALL ("cf::post_cleanup", G_VOID);
		860	CALL_END;
		861	}
		862
832	maptile *	863	maptile *
833	maptile::load_map_sync (const char path, maptile origin)	864	maptile::find_sync (const char path, maptile origin)
834	{	865	{
835	CALL_BEGIN (2);	866	CALL_BEGIN (2);
836	CALL_ARG (path);	867	CALL_ARG (path);
837	CALL_ARG (origin);	868	CALL_ARG (origin);
838	CALL_CALL ("cf::map::load_map_sync", G_SCALAR);	869	CALL_CALL ("cf::map::find_sync", G_SCALAR);
839		870
840	maptile *retval;	871	maptile *retval;
841		872
842	if (count)	873	if (count)
843	sv_to (POPs, retval);	874	sv_to (POPs, retval);
…		…
845	retval = 0;	876	retval = 0;
846		877
847	CALL_END;	878	CALL_END;
848		879
849	return retval;	880	return retval;
		881	}
		882
		883	maptile *
		884	maptile::find_async (const char path, maptile origin)
		885	{
		886	CALL_BEGIN (2);
		887	CALL_ARG (path);
		888	CALL_ARG (origin);
		889	CALL_CALL ("cf::map::find_async", G_SCALAR);
		890
		891	maptile *retval;
		892
		893	if (count)
		894	sv_to (POPs, retval);
		895	else
		896	retval = 0;
		897
		898	CALL_END;
		899
		900	return retval;
		901	}
		902
		903	void
		904	maptile::do_load_sync ()
		905	{
		906	CALL_BEGIN (1);
		907	CALL_ARG (this);
		908	CALL_CALL ("cf::map::do_load_sync", G_SCALAR);
		909	CALL_END;
850	}	910	}
851		911
852	void	912	void
853	maptile::change_all_map_light (int change)	913	maptile::change_all_map_light (int change)
854	{	914	{
…		…
874	/////////////////////////////////////////////////////////////////////////////	934	/////////////////////////////////////////////////////////////////////////////
875		935
876	struct EventAPI *watcher_base::GEventAPI;	936	struct EventAPI *watcher_base::GEventAPI;
877	struct CoroAPI *coroapi::GCoroAPI;	937	struct CoroAPI *coroapi::GCoroAPI;
878		938
		939	int coroapi::cede_counter;
		940
879	static void iw_dispatch (pe_event *ev)	941	static void iw_dispatch (pe_event *ev)
880	{	942	{
881	iw w = (iw )ev->ext_data;	943	iw w = (iw )ev->ext_data;
882	w->call (*w);	944	w->call (*w);
883	}	945	}
…		…
885	void	947	void
886	iw::alloc ()	948	iw::alloc ()
887	{	949	{
888	pe = GEventAPI->new_idle (0, 0);	950	pe = GEventAPI->new_idle (0, 0);
889		951
		952	WaREENTRANT_off (pe);
890	pe->base.callback = (void *)iw_dispatch;	953	pe->base.callback = (void *)iw_dispatch;
891	pe->base.ext_data = (void *)this;	954	pe->base.ext_data = (void *)this;
892	}	955	}
893		956
894	static void iow_dispatch (pe_event *ev)	957	static void iow_dispatch (pe_event *ev)
…		…
900	void	963	void
901	iow::alloc ()	964	iow::alloc ()
902	{	965	{
903	pe = GEventAPI->new_io (0, 0);	966	pe = GEventAPI->new_io (0, 0);
904		967
		968	WaREENTRANT_off (pe);
905	pe->base.callback = (void *)iow_dispatch;	969	pe->base.callback = (void *)iow_dispatch;
906	pe->base.ext_data = (void *)this;	970	pe->base.ext_data = (void *)this;
907		971
908	pe->fd = -1;	972	pe->fd = -1;
909	pe->poll = 0;	973	pe->poll = 0;
…		…
1237	const_iv (FLAG_ACTIVATE_ON_RELEASE)	1301	const_iv (FLAG_ACTIVATE_ON_RELEASE)
1238	const_iv (FLAG_IS_WATER)	1302	const_iv (FLAG_IS_WATER)
1239	const_iv (FLAG_CONTENT_ON_GEN)	1303	const_iv (FLAG_CONTENT_ON_GEN)
1240	const_iv (FLAG_IS_A_TEMPLATE)	1304	const_iv (FLAG_IS_A_TEMPLATE)
1241	const_iv (FLAG_IS_BUILDABLE)	1305	const_iv (FLAG_IS_BUILDABLE)
		1306	const_iv (FLAG_DESTROY_ON_DEATH)
		1307	const_iv (FLAG_NO_MAP_SAVE)
1242		1308
1243	const_iv (NDI_BLACK)	1309	const_iv (NDI_BLACK)
1244	const_iv (NDI_WHITE)	1310	const_iv (NDI_WHITE)
1245	const_iv (NDI_NAVY)	1311	const_iv (NDI_NAVY)
1246	const_iv (NDI_RED)	1312	const_iv (NDI_RED)
…		…
1288	const_iv (P_BLOCKSVIEW)	1354	const_iv (P_BLOCKSVIEW)
1289	const_iv (P_PLAYER)	1355	const_iv (P_PLAYER)
1290	const_iv (P_NO_MAGIC)	1356	const_iv (P_NO_MAGIC)
1291	const_iv (P_IS_ALIVE)	1357	const_iv (P_IS_ALIVE)
1292	const_iv (P_NO_CLERIC)	1358	const_iv (P_NO_CLERIC)
1293	const_iv (P_NEED_UPDATE)
1294	const_iv (P_OUT_OF_MAP)	1359	const_iv (P_OUT_OF_MAP)
1295	const_iv (P_NEW_MAP)	1360	const_iv (P_NEW_MAP)
		1361	const_iv (P_UPTODATE)
1296		1362
1297	const_iv (UP_OBJ_INSERT)	1363	const_iv (UP_OBJ_INSERT)
1298	const_iv (UP_OBJ_REMOVE)	1364	const_iv (UP_OBJ_REMOVE)
1299	const_iv (UP_OBJ_CHANGE)	1365	const_iv (UP_OBJ_CHANGE)
1300	const_iv (UP_OBJ_FACE)	1366	const_iv (UP_OBJ_FACE)
…		…
1431	const_iv (ATNR_BLIND)	1497	const_iv (ATNR_BLIND)
1432	const_iv (ATNR_INTERNAL)	1498	const_iv (ATNR_INTERNAL)
1433	const_iv (ATNR_LIFE_STEALING)	1499	const_iv (ATNR_LIFE_STEALING)
1434	const_iv (ATNR_DISEASE)	1500	const_iv (ATNR_DISEASE)
1435		1501
1436	const_iv (MAP_FLUSH)
1437	const_iv (MAP_PLAYER_UNIQUE)
1438	const_iv (MAP_BLOCK)
1439	const_iv (MAP_STYLE)
1440	const_iv (MAP_OVERLAY)
1441
1442	const_iv (MAP_IN_MEMORY)	1502	const_iv (MAP_IN_MEMORY)
1443	const_iv (MAP_SWAPPED)	1503	const_iv (MAP_SWAPPED)
1444	const_iv (MAP_LOADING)	1504	const_iv (MAP_LOADING)
1445	const_iv (MAP_SAVING)	1505	const_iv (MAP_SAVING)
1446		1506
…		…
1459	const_iv (ST_SETUP)	1519	const_iv (ST_SETUP)
1460	const_iv (ST_PLAYING)	1520	const_iv (ST_PLAYING)
1461	const_iv (ST_CUSTOM)	1521	const_iv (ST_CUSTOM)
1462		1522
1463	const_iv (ST_CHANGE_CLASS)	1523	const_iv (ST_CHANGE_CLASS)
1464	const_iv (ST_CONFIRM_QUIT)
1465	const_iv (ST_GET_PARTY_PASSWORD)
1466		1524
1467	const_iv (IO_HEADER)	1525	const_iv (IO_HEADER)
1468	const_iv (IO_OBJECTS)	1526	const_iv (IO_OBJECTS)
1469	const_iv (IO_UNIQUES)	1527	const_iv (IO_UNIQUES)
1470		1528
…		…
1524		1582
1525	void _global_reattach ()	1583	void _global_reattach ()
1526	CODE:	1584	CODE:
1527	{	1585	{
1528	// reattach to all attachable objects in the game.	1586	// reattach to all attachable objects in the game.
1529	for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)	1587	for_all_clients (ns)
1530	(*i)->reattach ();	1588	ns->reattach ();
1531		1589
1532	for_all_players (pl)	1590	for_all_players (pl)
1533	pl->reattach ();	1591	pl->reattach ();
1534		1592
1535	//TODO	1593	//TODO
1536	//for (map_container::iterator i = maps.begin (); i != maps.end (); ++i)	1594	//for (map_container::iterator i = maps.begin (); i != maps.end (); ++i)
1537	// i->second->reattach ();	1595	// i->second->reattach ();
1538		1596
1539	for (object *op = object::first; op; op = op->next)	1597	for_all_objects (op)
1540	op->reattach ();	1598	op->reattach ();
1541	}	1599	}
1542		1600
1543	NV floor (NV x)	1601	NV floor (NV x)
1544		1602
1545	NV ceil (NV x)	1603	NV ceil (NV x)
		1604
		1605	NV rndm (...)
		1606	CODE:
		1607	switch (items)
		1608	{
		1609	case 0: RETVAL = rndm (); break;
		1610	case 1: RETVAL = rndm (SvUV (ST (0))); break;
		1611	case 2: RETVAL = rndm (SvIV (ST (0)), SvIV (ST (1))); break;
		1612	default: croak ("cf::rndm requires none, one or two parameters."); break;
		1613	}
		1614	OUTPUT:
		1615	RETVAL
1546		1616
1547	void server_tick ()	1617	void server_tick ()
1548	CODE:	1618	CODE:
1549	runtime = SvNVx (sv_runtime);	1619	runtime = SvNVx (sv_runtime);
1550	server_tick ();	1620	server_tick ();
…		…
1595	case 5: RETVAL = settings.playerdir; break;	1665	case 5: RETVAL = settings.playerdir; break;
1596	case 6: RETVAL = settings.datadir ; break;	1666	case 6: RETVAL = settings.datadir ; break;
1597	}	1667	}
1598	OUTPUT: RETVAL	1668	OUTPUT: RETVAL
1599		1669
		1670	void abort ()
		1671
		1672	void fork_abort (char *cause = "cf::fork_abort")
		1673
		1674	void cleanup (const char *cause, bool make_core = false)
		1675
1600	void emergency_save ()	1676	void emergency_save ()
1601		1677
1602	void _exit (int status = 0)	1678	void _exit (int status = EXIT_SUCCESS)
		1679
		1680	UV sv_2watcher (SV *w)
		1681	CODE:
		1682	RETVAL = (UV)GEventAPI->sv_2watcher (w);
		1683	OUTPUT:
		1684	RETVAL
		1685
		1686	#if _POSIX_MEMLOCK
		1687
		1688	int mlockall (int flags = MCL_CURRENT \| MCL_FUTURE)
		1689
		1690	int munlockall ()
		1691
		1692	#endif
1603		1693
1604	int find_animation (char *text)	1694	int find_animation (char *text)
1605	PROTOTYPE: $	1695	PROTOTYPE: $
1606		1696
1607	int random_roll (int min, int max, object *op, int goodbad);	1697	int random_roll (int min, int max, object *op, int goodbad);
…		…
1645	RETVAL = newSVpv (resist_plus[atnr], 0);	1735	RETVAL = newSVpv (resist_plus[atnr], 0);
1646	else	1736	else
1647	XSRETURN_UNDEF;	1737	XSRETURN_UNDEF;
1648	OUTPUT: RETVAL	1738	OUTPUT: RETVAL
1649		1739
		1740	bool
		1741	load_regions (const char *filename)
		1742	CODE:
		1743	RETVAL = loader_region ().load (filename);
		1744	OUTPUT: RETVAL
		1745
1650	MODULE = cf PACKAGE = cf::attachable	1746	MODULE = cf PACKAGE = cf::attachable
1651		1747
1652	int	1748	int
1653	valid (SV *obj)	1749	valid (SV *obj)
1654	CODE:	1750	CODE:
1655	RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);	1751	RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
1656	OUTPUT:	1752	OUTPUT:
1657	RETVAL	1753	RETVAL
1658		1754
1659	#bool
1660	#destroyed (attachable *at)
1661	#
1662	#void	1755	void
1663	#destroy (attachable *at)	1756	debug_trace (attachable *obj, bool on = true)
		1757	CODE:
		1758	obj->flags &= ~attachable::F_DEBUG_TRACE;
		1759	if (on)
		1760	obj->flags \|= attachable::F_DEBUG_TRACE;
		1761
		1762	int mortals_size ()
		1763	CODE:
		1764	RETVAL = attachable::mortals.size ();
		1765	OUTPUT: RETVAL
		1766
		1767	#object *mortals (U32 index)
		1768	# CODE:
		1769	# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0;
		1770	# OUTPUT: RETVAL
		1771
		1772	INCLUDE: $PERL genacc attachable ../include/cfperl.h \|
1664		1773
1665	MODULE = cf PACKAGE = cf::global	1774	MODULE = cf PACKAGE = cf::global
1666		1775
1667	int invoke (SV *klass, int event, ...)	1776	int invoke (SV *klass, int event, ...)
1668	CODE:	1777	CODE:
…		…
1684	RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END);	1793	RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END);
1685	OUTPUT: RETVAL	1794	OUTPUT: RETVAL
1686		1795
1687	SV registry (object op)	1796	SV registry (object op)
1688		1797
1689	void mortals ()	1798	int objects_size ()
1690	PPCODE:	1799	CODE:
1691	EXTEND (SP, object::mortals.size ());
1692	for (AUTODECL (i, object::mortals.begin ()); i != object::mortals.end (); ++i)
1693	PUSHs (to_sv (*i));
1694
1695	object *first ()
1696	CODE:
1697	RETVAL = object::first;	1800	RETVAL = objects.size ();
		1801	OUTPUT: RETVAL
		1802
		1803	object *objects (U32 index)
		1804	CODE:
		1805	RETVAL = index < objects.size () ? objects [index] : 0;
		1806	OUTPUT: RETVAL
		1807
		1808	int actives_size ()
		1809	CODE:
		1810	RETVAL = actives.size ();
		1811	OUTPUT: RETVAL
		1812
		1813	object *actives (U32 index)
		1814	CODE:
		1815	RETVAL = index < actives.size () ? actives [index] : 0;
1698	OUTPUT: RETVAL	1816	OUTPUT: RETVAL
1699		1817
1700	# missing properties	1818	# missing properties
1701		1819
1702	object head (object op)	1820	object head (object op)
1703	PROTOTYPE: $	1821	PROTOTYPE: $
1704	CODE:	1822	CODE:
1705	RETVAL = op->head ? op->head : op;	1823	RETVAL = op->head_ ();
1706	OUTPUT: RETVAL	1824	OUTPUT: RETVAL
1707		1825
1708	int is_head (object *op)	1826	int is_head (object *op)
1709	PROTOTYPE: $	1827	PROTOTYPE: $
1710	CODE:	1828	CODE:
1711	RETVAL = !op->head;	1829	RETVAL = op->head_ () == op;
1712	OUTPUT: RETVAL	1830	OUTPUT: RETVAL
1713		1831
1714	void	1832	void
1715	inv (object *obj)	1833	inv (object *obj)
1716	PROTOTYPE: $	1834	PROTOTYPE: $
…		…
1723		1841
1724	void	1842	void
1725	set_animation (object *op, int idx)	1843	set_animation (object *op, int idx)
1726	CODE:	1844	CODE:
1727	SET_ANIMATION (op, idx);	1845	SET_ANIMATION (op, idx);
		1846
		1847	int
		1848	num_animations (object *op)
		1849	CODE:
		1850	RETVAL = NUM_ANIMATIONS (op);
		1851	OUTPUT: RETVAL
1728		1852
1729	object find_best_object_match (object op, const char *match)	1853	object find_best_object_match (object op, const char *match)
1730		1854
1731	object find_marked_object (object op)	1855	object find_marked_object (object op)
1732		1856
…		…
1807		1931
1808	void drop (object who, object op)	1932	void drop (object who, object op)
1809		1933
1810	void pick_up (object who, object op)	1934	void pick_up (object who, object op)
1811		1935
1812	object cf_object_insert_object (object op, object *container)
1813
1814	object cf_object_insert_in_ob (object ob, object *where)
1815
1816	int cf_object_teleport (object op, maptile map, int x, int y)	1936	int cf_object_teleport (object op, maptile map, int x, int y)
1817		1937
1818	void update_object (object *op, int action)	1938	void update_object (object *op, int action)
1819		1939
1820	object cf_create_object_by_name (const char name)	1940	object cf_create_object_by_name (const char name)
…		…
1913	RETVAL = op->contr;	2033	RETVAL = op->contr;
1914	OUTPUT: RETVAL	2034	OUTPUT: RETVAL
1915		2035
1916	void check_score (object *op)	2036	void check_score (object *op)
1917		2037
1918	void cf_player_message (object obj, char txt, int flags = NDI_ORANGE \| NDI_UNIQUE)	2038	void message (object op, char txt, int flags = NDI_ORANGE \| NDI_UNIQUE)
		2039	CODE:
		2040	new_draw_info (flags, 0, op, txt);
1919		2041
1920	object cf_player_send_inventory (object op)	2042	object cf_player_send_inventory (object op)
1921		2043
1922	char cf_player_get_ip (object op)	2044	char cf_player_get_ip (object op)
1923	ALIAS: ip = 0	2045	ALIAS: ip = 0
…		…
1936		2058
1937	void esrv_update_item (object op, int what, object item)	2059	void esrv_update_item (object op, int what, object item)
1938	C_ARGS: what, op, item	2060	C_ARGS: what, op, item
1939		2061
1940	void clear_los (object *op)	2062	void clear_los (object *op)
1941
1942	int command_teleport (object op, char params)
1943		2063
1944	int command_summon (object op, char params)	2064	int command_summon (object op, char params)
1945		2065
1946	int command_arrest (object op, char params)	2066	int command_arrest (object op, char params)
1947		2067
…		…
1970	pl->ob->stats.hp = pl->ob->stats.maxhp;	2090	pl->ob->stats.hp = pl->ob->stats.maxhp;
1971	pl->ob->stats.sp = pl->ob->stats.maxsp;	2091	pl->ob->stats.sp = pl->ob->stats.maxsp;
1972	pl->ob->stats.grace = pl->ob->stats.maxgrace;	2092	pl->ob->stats.grace = pl->ob->stats.maxgrace;
1973	pl->orig_stats = pl->ob->stats;	2093	pl->orig_stats = pl->ob->stats;
1974		2094
1975	player cf_player_find (char name)
1976	PROTOTYPE: $
1977
1978	void cf_player_move (player *pl, int dir)	2095	void cf_player_move (player *pl, int dir)
1979		2096
1980	void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0);	2097	void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0);
1981
1982	player *first ()
1983	CODE:
1984	RETVAL = first_player;
1985	OUTPUT: RETVAL
1986		2098
1987	bool	2099	bool
1988	cell_visible (player *pl, int dx, int dy)	2100	cell_visible (player *pl, int dx, int dy)
1989	CODE:	2101	CODE:
1990	RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2	2102	RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2
…		…
2027	if (y) sv_to (y, pl->bed_y);	2139	if (y) sv_to (y, pl->bed_y);
2028		2140
2029	void	2141	void
2030	list ()	2142	list ()
2031	PPCODE:	2143	PPCODE:
2032	for (player *pl = first_player; pl; pl = pl->next)	2144	for_all_players (pl)
2033	XPUSHs (sv_2mortal (to_sv (pl)));	2145	XPUSHs (sv_2mortal (to_sv (pl)));
2034
2035	bool
2036	peaceful (player *pl, bool new_setting = 0)
2037	PROTOTYPE: $;$
2038	CODE:
2039	RETVAL = pl->peaceful;
2040	if (items > 1)
2041	pl->peaceful = new_setting;
2042	OUTPUT:
2043	RETVAL
2044
2045	living *
2046	orig_stats (player *pl)
2047	CODE:
2048	RETVAL = &pl->orig_stats;
2049	OUTPUT: RETVAL
2050
2051	living *
2052	last_stats (player *pl)
2053	CODE:
2054	RETVAL = &pl->last_stats;
2055	OUTPUT: RETVAL
2056		2146
2057		2147
2058	MODULE = cf PACKAGE = cf::map PREFIX = cf_map_	2148	MODULE = cf PACKAGE = cf::map PREFIX = cf_map_
2059		2149
2060	int invoke (maptile *map, int event, ...)	2150	int invoke (maptile *map, int event, ...)
…		…
2076	PROTOTYPE:	2166	PROTOTYPE:
2077	CODE:	2167	CODE:
2078	RETVAL = new maptile;	2168	RETVAL = new maptile;
2079	OUTPUT:	2169	OUTPUT:
2080	RETVAL	2170	RETVAL
2081
2082	void
2083	maptile::destroy ()
2084		2171
2085	void	2172	void
2086	maptile::players ()	2173	maptile::players ()
2087	PPCODE:	2174	PPCODE:
2088	if (GIMME_V == G_SCALAR)	2175	if (GIMME_V == G_SCALAR)
…		…
2093	for_all_players (pl)	2180	for_all_players (pl)
2094	if (pl->ob && pl->ob->map == THIS)	2181	if (pl->ob && pl->ob->map == THIS)
2095	PUSHs (sv_2mortal (to_sv (pl->ob)));	2182	PUSHs (sv_2mortal (to_sv (pl->ob)));
2096	}	2183	}
2097		2184
		2185	void
		2186	maptile::set_regiondata (SV data, SV plt)
		2187	CODE:
		2188	{
		2189	if (!SvROK (plt) \|\| SvTYPE (SvRV (plt)) != SVt_PVAV)
		2190	croak ("maptile::set_regiondata needs arrayref as plt arg");
		2191
		2192	AV av = (AV )SvRV (plt);
		2193
		2194	region regionmap = (region )malloc ((av_len (av) + 1) * sizeof (region *));
		2195
		2196	for (int i = av_len (av) + 1; i--; )
		2197	regionmap [i] = region::find (SvPVutf8_nolen (*av_fetch (av, i, 1)));
		2198
		2199	THIS->regions = salloc<uint8_t> (THIS->size (), (uint8_t *)SvPVbyte_nolen (data));
		2200	THIS->regionmap = regionmap;
		2201	}
		2202
2098	void play_sound_map (maptile *map, int x, int y, int sound_num)	2203	void play_sound_map (maptile *map, int x, int y, int sound_num)
2099		2204
2100	int out_of_map (maptile *map, int x, int y)	2205	int out_of_map (maptile *map, int x, int y)
2101		2206
2102	void	2207	void
…		…
2118		2223
2119	object* cf_map_present_arch_by_name (maptile map, const char str, int nx, int ny)	2224	object* cf_map_present_arch_by_name (maptile map, const char str, int nx, int ny)
2120	C_ARGS: str, map, nx, ny	2225	C_ARGS: str, map, nx, ny
2121		2226
2122	void	2227	void
2123	cf_map_normalise (maptile *map, int x, int y)	2228	get_map_flags (maptile *map, int x, int y)
2124	PPCODE:	2229	PPCODE:
2125	{	2230	{
2126	maptile *nmap = 0;	2231	maptile *nmap = 0;
2127	I16 nx = 0, ny = 0;	2232	I16 nx = 0, ny = 0;
2128	int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);	2233	int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
…		…
2177	case 4: RETVAL = newSVuv ( GET_MAP_MOVE_BLOCK (obj, x, y)); break;	2282	case 4: RETVAL = newSVuv ( GET_MAP_MOVE_BLOCK (obj, x, y)); break;
2178	case 5: RETVAL = newSVuv ( GET_MAP_MOVE_SLOW (obj, x, y)); break;	2283	case 5: RETVAL = newSVuv ( GET_MAP_MOVE_SLOW (obj, x, y)); break;
2179	case 6: RETVAL = newSVuv ( GET_MAP_MOVE_ON (obj, x, y)); break;	2284	case 6: RETVAL = newSVuv ( GET_MAP_MOVE_ON (obj, x, y)); break;
2180	case 7: RETVAL = newSVuv ( GET_MAP_MOVE_OFF (obj, x, y)); break;	2285	case 7: RETVAL = newSVuv ( GET_MAP_MOVE_OFF (obj, x, y)); break;
2181	}	2286	}
2182	OUTPUT:	2287	OUTPUT: RETVAL
2183	RETVAL
2184		2288
2185	void fix_walls (maptile *map, int x, int y)	2289	void fix_walls (maptile *map, int x, int y)
2186		2290
2187	void fix_walls_around (maptile *map, int x, int y)	2291	void fix_walls_around (maptile *map, int x, int y)
2188		2292
2189	# worst xs function of my life	2293	# worst xs function of my life
2190	maptile *	2294	bool
2191	_create_random_map (\	2295	_create_random_map (\
2192	char *path,\	2296	maptile *self,\
2193	char *wallstyle,\	2297	char *wallstyle,\
2194	char *wall_name,\	2298	char *wall_name,\
2195	char *floorstyle,\	2299	char *floorstyle,\
2196	char *monsterstyle,\	2300	char *monsterstyle,\
2197	char *treasurestyle,\	2301	char *treasurestyle,\
…		…
2201	char *origin_map,\	2305	char *origin_map,\
2202	char *final_map,\	2306	char *final_map,\
2203	char *exitstyle,\	2307	char *exitstyle,\
2204	char *this_map,\	2308	char *this_map,\
2205	char *exit_on_final_map,\	2309	char *exit_on_final_map,\
2206	int Xsize,\	2310	int xsize,\
2207	int Ysize,\	2311	int ysize,\
2208	int expand2x,\	2312	int expand2x,\
2209	int layoutoptions1,\	2313	int layoutoptions1,\
2210	int layoutoptions2,\	2314	int layoutoptions2,\
2211	int layoutoptions3,\	2315	int layoutoptions3,\
2212	int symmetry,\	2316	int symmetry,\
…		…
2217	int dungeon_depth,\	2321	int dungeon_depth,\
2218	int decoroptions,\	2322	int decoroptions,\
2219	int orientation,\	2323	int orientation,\
2220	int origin_y,\	2324	int origin_y,\
2221	int origin_x,\	2325	int origin_x,\
2222	int random_seed,\	2326	U32 random_seed,\
2223	val64 total_map_hp,\	2327	val64 total_map_hp,\
2224	int map_layout_style,\	2328	int map_layout_style,\
2225	int treasureoptions,\	2329	int treasureoptions,\
2226	int symmetry_used,\	2330	int symmetry_used,\
2227	region *region\	2331	region *region,\
		2332	char *custom\
2228	)	2333	)
2229	CODE:	2334	CODE:
2230	{	2335	{
2231	random_map_params rmp;	2336	random_map_params rmp;
2232		2337
…		…
2236	assign (rmp.monsterstyle , monsterstyle);	2341	assign (rmp.monsterstyle , monsterstyle);
2237	assign (rmp.treasurestyle , treasurestyle);	2342	assign (rmp.treasurestyle , treasurestyle);
2238	assign (rmp.layoutstyle , layoutstyle);	2343	assign (rmp.layoutstyle , layoutstyle);
2239	assign (rmp.doorstyle , doorstyle);	2344	assign (rmp.doorstyle , doorstyle);
2240	assign (rmp.decorstyle , decorstyle);	2345	assign (rmp.decorstyle , decorstyle);
2241	assign (rmp.origin_map , origin_map);
2242	assign (rmp.final_map , final_map);
2243	assign (rmp.exitstyle , exitstyle);	2346	assign (rmp.exitstyle , exitstyle);
2244	assign (rmp.this_map , this_map);
2245	assign (rmp.exit_on_final_map, exit_on_final_map);	2347	assign (rmp.exit_on_final_map, exit_on_final_map);
2246		2348
		2349	rmp.origin_map = origin_map;
		2350	rmp.final_map = final_map;
		2351	rmp.this_map = this_map;
2247	rmp.Xsize = Xsize;	2352	rmp.xsize = xsize;
2248	rmp.Ysize = Ysize;	2353	rmp.ysize = ysize;
2249	rmp.expand2x = expand2x;	2354	rmp.expand2x = expand2x;
2250	rmp.layoutoptions1 = layoutoptions1;	2355	rmp.layoutoptions1 = layoutoptions1;
2251	rmp.layoutoptions2 = layoutoptions2;	2356	rmp.layoutoptions2 = layoutoptions2;
2252	rmp.layoutoptions3 = layoutoptions3;	2357	rmp.layoutoptions3 = layoutoptions3;
2253	rmp.symmetry = symmetry;	2358	rmp.symmetry = symmetry;
…		…
2264	rmp.total_map_hp = total_map_hp;	2369	rmp.total_map_hp = total_map_hp;
2265	rmp.map_layout_style = map_layout_style;	2370	rmp.map_layout_style = map_layout_style;
2266	rmp.treasureoptions = treasureoptions;	2371	rmp.treasureoptions = treasureoptions;
2267	rmp.symmetry_used = symmetry_used;	2372	rmp.symmetry_used = symmetry_used;
2268	rmp.region = region;	2373	rmp.region = region;
		2374	rmp.custom = custom;
2269		2375
2270	RETVAL = generate_random_map (path, &rmp);	2376	RETVAL = self->generate_random_map (&rmp);
2271	}	2377	}
2272	OUTPUT:	2378	OUTPUT:
2273	RETVAL	2379	RETVAL
2274		2380
2275	MODULE = cf PACKAGE = cf::arch	2381	MODULE = cf PACKAGE = cf::arch
…		…
2298		2404
2299	INCLUDE: $PERL genacc partylist ../include/player.h \|	2405	INCLUDE: $PERL genacc partylist ../include/player.h \|
2300		2406
2301	MODULE = cf PACKAGE = cf::region	2407	MODULE = cf PACKAGE = cf::region
2302		2408
2303	region *first ()	2409	void
		2410	list ()
		2411	PPCODE:
		2412	for_all_regions (rgn)
		2413	XPUSHs (sv_2mortal (to_sv (rgn)));
		2414
		2415	region find (char name)
2304	PROTOTYPE:	2416	PROTOTYPE: $
2305	CODE:	2417	CODE:
2306	RETVAL = first_region;	2418	RETVAL = region::find (name);
		2419	OUTPUT: RETVAL
		2420
		2421	region find_fuzzy (char name)
		2422	PROTOTYPE: $
		2423	CODE:
		2424	RETVAL = region::find_fuzzy (name);
2307	OUTPUT: RETVAL	2425	OUTPUT: RETVAL
2308		2426
2309	INCLUDE: $PERL genacc region ../include/map.h \|	2427	INCLUDE: $PERL genacc region ../include/map.h \|
2310		2428
2311	MODULE = cf PACKAGE = cf::living	2429	MODULE = cf PACKAGE = cf::living
…		…
2345	char *buf = SvPVbyte (packet, len);	2463	char *buf = SvPVbyte (packet, len);
2346		2464
2347	THIS->send_packet (buf, len);	2465	THIS->send_packet (buf, len);
2348	}	2466	}
2349		2467
2350	void
2351	client::destroy ()
2352

Diff Legend

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

Comparing deliantra/server/server/cfperl.xs (file contents): Revision 1.119 by root, Sun Dec 31 10:28:36 2006 UTC vs. Revision 1.166 by root, Tue Feb 13 19:25:45 2007 UTC

Diff Legend

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.119 by root, Sun Dec 31 10:28:36 2006 UTC vs.
Revision 1.166 by root, Tue Feb 13 19:25:45 2007 UTC