[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.154 by root, Fri Jan 26 21:44:11 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 self = (SV )this->self;
		124
		125	SvREFCNT_inc (self);
		126	sv_unmagic (self, PERL_MAGIC_ext);
		127	SvREFCNT_dec (self);
		128	assert (!this->self);
		129	}
117	}	130	}
118		131
119	// check wether the object really is dead	132	// check wether the object really is dead
120	void	133	void
121	attachable::do_check ()	134	attachable::do_check ()
122	{	135	{
123	if (refcnt > 0)	136	if (refcnt_cnt () > 0)
124	return;	137	return;
125		138
126	// try to unborrow the refcnt from perl	139	destroy ();
127	if (flags & F_BORROWED)	140	}
		141
		142	void
		143	attachable::do_destroy ()
		144	{
		145	invoke (EVENT_ATTACHABLE_DESTROY, DT_END);
		146
		147	if (cb)
128	{	148	{
129	assert (self);//D//TODO//remove when stable	149	SvREFCNT_dec (cb);
130	flags &= ~F_BORROWED;	150	cb = 0;
131	refcnt_inc ();	151	}
		152
		153	if (self)
		154	{
		155	hv_clear (self);
		156
		157	SV self = (SV )this->self;
		158	SvREFCNT_inc (self);
		159	sv_unmagic (self, PERL_MAGIC_ext);
132	SvREFCNT_dec (self);	160	SvREFCNT_dec (self);
		161	// self is now 0
		162	assert (!this->self);//D//TODO remove soon
133	}	163	}
134		164
135	if (refcnt > 0 \|\| self)
136	return;
137
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);	165	mortals.push_back (this);
148	}	166	}
149		167
150	void	168	void
151	attachable::destroy ()	169	attachable::destroy ()
…		…
155		173
156	flags \|= F_DESTROYED;	174	flags \|= F_DESTROYED;
157	do_destroy ();	175	do_destroy ();
158	}	176	}
159		177
		178	void
160	void attachable::check_mortals ()	179	attachable::check_mortals ()
161	{	180	{
162	for (int i = 0; i < mortals.size (); )	181	static int i = 0;
		182
		183	for (;;)
163	{	184	{
		185	if (i >= mortals.size ())
		186	{
		187	i = 0;
		188
		189	if (mortals.size () > 1000)
		190	fprintf (stderr, "mortal queue size (%d) exceeds 1000.\n", (int)mortals.size ());
		191
		192	break;
		193	}
		194
164	attachable *obj = mortals [i];	195	attachable *obj = mortals [i];
165		196
166	obj->refcnt_chk (); // unborrow from perl, if necessary	197	obj->refcnt_chk (); // unborrow from perl, if necessary
167		198
		199	//if (obj->refcnt > 0 \|\| obj->self)
168	if (obj->refcnt \|\| obj->self)	200	if (obj->refcnt \|\| obj->self)
169	{	201	{
170	#if 0	202	//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	203	++i; // further delay freeing
		204
		205	if (!(i & 0x3ff))
		206	break;
176	}//D	207	}
177	else	208	else
178	{	209	{
179	//Dfprintf (stderr, "deleteing %d:%p:%s\n", i, obj,typeid (*obj).name ());//D
180	mortals.erase (i);	210	mortals.erase (i);
181	delete obj;	211	delete obj;
182	}	212	}
183	}	213	}
184	}	214	}
…		…
209		239
210	static int	240	static int
211	attachable_free (pTHX_ SV sv, MAGIC mg)	241	attachable_free (pTHX_ SV sv, MAGIC mg)
212	{	242	{
213	attachable at = (attachable )mg->mg_ptr;	243	attachable at = (attachable )mg->mg_ptr;
214	assert (!(at->flags & attachable::F_BORROWED));//D//TODO//remove when stable	244
		245	//TODO: check if transaction behaviour is really required here
		246	if (SV self = (SV )at->self)
		247	{
215	at->self = 0;	248	at->self = 0;
		249	SvREFCNT_dec (self);
		250	}
		251
216	// next line makes sense, but most objects still have refcnt 0 by default	252	// next line makes sense, but most objects still have refcnt 0 by default
217	//at->refcnt_chk ();	253	//at->refcnt_chk ();
218	return 0;	254	return 0;
219	}	255	}
220		256
…		…
229	if (!obj->self)	265	if (!obj->self)
230	{	266	{
231	obj->self = newHV ();	267	obj->self = newHV ();
232	sv_magicext ((SV )obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char )obj, 0);	268	sv_magicext ((SV )obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char )obj, 0);
233		269
234	// borrow the refcnt from the object	270	// now bless the object _once_
235	obj->flags \|= attachable::F_BORROWED;	271	return sv_bless (newRV_inc ((SV *)obj->self), stash);
236	obj->refcnt_dec ();
237	}	272	}
		273	else
		274	{
		275	SV sv = newRV_inc ((SV )obj->self);
238		276
239	return sv_bless (newRV_inc ((SV *)obj->self), stash);	277	if (Gv_AMG (stash)) // handle overload correctly, as the perl core does not
		278	SvAMAGIC_on (sv);
		279
		280	return sv;
		281	}
240	}	282	}
241		283
242	static void	284	static void
243	clearSVptr (SV *sv)	285	clearSVptr (SV *sv)
244	{	286	{
…		…
297	inline SV to_sv (living v) { return newSVptr (v, stash_cf_living_wrap); }	339	inline SV to_sv (living v) { return newSVptr (v, stash_cf_living_wrap); }
298		340
299	inline SV *to_sv (object & v) { return to_sv (&v); }	341	inline SV *to_sv (object & v) { return to_sv (&v); }
300	inline SV *to_sv (living & v) { return to_sv (&v); }	342	inline SV *to_sv (living & v) { return to_sv (&v); }
301		343
302	//TODO:
303	inline SV to_sv (New_Face v) { return to_sv (v->name); }	344	inline SV to_sv (facetile v) { return to_sv (v->name); }
304	inline SV to_sv (treasurelist v) { return to_sv (v->name); }	345	inline SV to_sv (treasurelist v) { return to_sv (v->name); }
305		346
306	inline SV *to_sv (UUID v)	347	inline SV *to_sv (UUID v)
307	{	348	{
308	char buf[128];	349	char buf[128];
…		…
328	inline void sv_to (SV sv, client &v) { v = (client )(attachable )SvPTR_ornull (sv, "cf::client"); }	369	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"); }	370	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"); }	371	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"); }	372	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"); }	373	inline void sv_to (SV sv, maptile &v) { v = (maptile )(attachable )SvPTR_ornull (sv, "cf::map"); }
		374	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"); }	375	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"); }	376	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"); }	377	inline void sv_to (SV sv, living &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); }
336		378
337	inline void sv_to (SV sv, New_Face &v) { v = &new_faces[FindFace (SvPV_nolen (sv), 0)]; } //TODO	379	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	380	inline void sv_to (SV sv, treasurelist &v) { v = find_treasurelist (SvPV_nolen (sv)); }
339		381
340	template<class T>	382	template<class T>
341	inline void sv_to (SV sv, refptr<T> &v) { T tmp; sv_to (sv, tmp); v = tmp; }	383	inline void sv_to (SV sv, refptr<T> &v) { T tmp; sv_to (sv, tmp); v = tmp; }
342		384
343	template<int N>	385	template<int N>
…		…
478	{	520	{
479	if (!ext->cb)	521	if (!ext->cb)
480	ext->cb = newAV ();	522	ext->cb = newAV ();
481		523
482	return newRV_inc ((SV *)ext->cb);	524	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	}	525	}
521		526
522	/////////////////////////////////////////////////////////////////////////////	527	/////////////////////////////////////////////////////////////////////////////
523		528
524	extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr)	529	extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr)
…		…
820	}	825	}
821		826
822	/////////////////////////////////////////////////////////////////////////////	827	/////////////////////////////////////////////////////////////////////////////
823		828
824	void	829	void
825	maptile::emergency_save ()	830	cfperl_emergency_save ()
826	{	831	{
827	CALL_BEGIN (0);	832	CALL_BEGIN (0);
828	CALL_CALL ("cf::map::emergency_save", G_VOID);	833	CALL_CALL ("cf::emergency_save", G_VOID);
829	CALL_END;	834	CALL_END;
830	}	835	}
831		836
832	maptile *	837	maptile *
833	maptile::load_map_sync (const char path, maptile origin)	838	maptile::find_sync (const char path, maptile origin)
834	{	839	{
835	CALL_BEGIN (2);	840	CALL_BEGIN (2);
836	CALL_ARG (path);	841	CALL_ARG (path);
837	CALL_ARG (origin);	842	CALL_ARG (origin);
838	CALL_CALL ("cf::map::load_map_sync", G_SCALAR);	843	CALL_CALL ("cf::map::find_sync", G_SCALAR);
839		844
840	maptile *retval;	845	maptile *retval;
841		846
842	if (count)	847	if (count)
843	sv_to (POPs, retval);	848	sv_to (POPs, retval);
…		…
845	retval = 0;	850	retval = 0;
846		851
847	CALL_END;	852	CALL_END;
848		853
849	return retval;	854	return retval;
		855	}
		856
		857	maptile *
		858	maptile::find_async (const char path, maptile origin)
		859	{
		860	CALL_BEGIN (2);
		861	CALL_ARG (path);
		862	CALL_ARG (origin);
		863	CALL_CALL ("cf::map::find_async", G_SCALAR);
		864
		865	maptile *retval;
		866
		867	if (count)
		868	sv_to (POPs, retval);
		869	else
		870	retval = 0;
		871
		872	CALL_END;
		873
		874	return retval;
		875	}
		876
		877	void
		878	maptile::do_load_sync ()
		879	{
		880	CALL_BEGIN (1);
		881	CALL_ARG (this);
		882	CALL_CALL ("cf::map::do_load_sync", G_SCALAR);
		883	CALL_END;
850	}	884	}
851		885
852	void	886	void
853	maptile::change_all_map_light (int change)	887	maptile::change_all_map_light (int change)
854	{	888	{
…		…
874	/////////////////////////////////////////////////////////////////////////////	908	/////////////////////////////////////////////////////////////////////////////
875		909
876	struct EventAPI *watcher_base::GEventAPI;	910	struct EventAPI *watcher_base::GEventAPI;
877	struct CoroAPI *coroapi::GCoroAPI;	911	struct CoroAPI *coroapi::GCoroAPI;
878		912
		913	int coroapi::cede_counter;
		914
879	static void iw_dispatch (pe_event *ev)	915	static void iw_dispatch (pe_event *ev)
880	{	916	{
881	iw w = (iw )ev->ext_data;	917	iw w = (iw )ev->ext_data;
882	w->call (*w);	918	w->call (*w);
883	}	919	}
…		…
885	void	921	void
886	iw::alloc ()	922	iw::alloc ()
887	{	923	{
888	pe = GEventAPI->new_idle (0, 0);	924	pe = GEventAPI->new_idle (0, 0);
889		925
		926	WaREENTRANT_off (pe);
890	pe->base.callback = (void *)iw_dispatch;	927	pe->base.callback = (void *)iw_dispatch;
891	pe->base.ext_data = (void *)this;	928	pe->base.ext_data = (void *)this;
892	}	929	}
893		930
894	static void iow_dispatch (pe_event *ev)	931	static void iow_dispatch (pe_event *ev)
…		…
900	void	937	void
901	iow::alloc ()	938	iow::alloc ()
902	{	939	{
903	pe = GEventAPI->new_io (0, 0);	940	pe = GEventAPI->new_io (0, 0);
904		941
		942	WaREENTRANT_off (pe);
905	pe->base.callback = (void *)iow_dispatch;	943	pe->base.callback = (void *)iow_dispatch;
906	pe->base.ext_data = (void *)this;	944	pe->base.ext_data = (void *)this;
907		945
908	pe->fd = -1;	946	pe->fd = -1;
909	pe->poll = 0;	947	pe->poll = 0;
…		…
1237	const_iv (FLAG_ACTIVATE_ON_RELEASE)	1275	const_iv (FLAG_ACTIVATE_ON_RELEASE)
1238	const_iv (FLAG_IS_WATER)	1276	const_iv (FLAG_IS_WATER)
1239	const_iv (FLAG_CONTENT_ON_GEN)	1277	const_iv (FLAG_CONTENT_ON_GEN)
1240	const_iv (FLAG_IS_A_TEMPLATE)	1278	const_iv (FLAG_IS_A_TEMPLATE)
1241	const_iv (FLAG_IS_BUILDABLE)	1279	const_iv (FLAG_IS_BUILDABLE)
		1280	const_iv (FLAG_DESTROY_ON_DEATH)
		1281	const_iv (FLAG_NO_MAP_SAVE)
1242		1282
1243	const_iv (NDI_BLACK)	1283	const_iv (NDI_BLACK)
1244	const_iv (NDI_WHITE)	1284	const_iv (NDI_WHITE)
1245	const_iv (NDI_NAVY)	1285	const_iv (NDI_NAVY)
1246	const_iv (NDI_RED)	1286	const_iv (NDI_RED)
…		…
1288	const_iv (P_BLOCKSVIEW)	1328	const_iv (P_BLOCKSVIEW)
1289	const_iv (P_PLAYER)	1329	const_iv (P_PLAYER)
1290	const_iv (P_NO_MAGIC)	1330	const_iv (P_NO_MAGIC)
1291	const_iv (P_IS_ALIVE)	1331	const_iv (P_IS_ALIVE)
1292	const_iv (P_NO_CLERIC)	1332	const_iv (P_NO_CLERIC)
1293	const_iv (P_NEED_UPDATE)
1294	const_iv (P_OUT_OF_MAP)	1333	const_iv (P_OUT_OF_MAP)
1295	const_iv (P_NEW_MAP)	1334	const_iv (P_NEW_MAP)
		1335	const_iv (P_UPTODATE)
1296		1336
1297	const_iv (UP_OBJ_INSERT)	1337	const_iv (UP_OBJ_INSERT)
1298	const_iv (UP_OBJ_REMOVE)	1338	const_iv (UP_OBJ_REMOVE)
1299	const_iv (UP_OBJ_CHANGE)	1339	const_iv (UP_OBJ_CHANGE)
1300	const_iv (UP_OBJ_FACE)	1340	const_iv (UP_OBJ_FACE)
…		…
1431	const_iv (ATNR_BLIND)	1471	const_iv (ATNR_BLIND)
1432	const_iv (ATNR_INTERNAL)	1472	const_iv (ATNR_INTERNAL)
1433	const_iv (ATNR_LIFE_STEALING)	1473	const_iv (ATNR_LIFE_STEALING)
1434	const_iv (ATNR_DISEASE)	1474	const_iv (ATNR_DISEASE)
1435		1475
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)	1476	const_iv (MAP_IN_MEMORY)
1443	const_iv (MAP_SWAPPED)	1477	const_iv (MAP_SWAPPED)
1444	const_iv (MAP_LOADING)	1478	const_iv (MAP_LOADING)
1445	const_iv (MAP_SAVING)	1479	const_iv (MAP_SAVING)
1446		1480
…		…
1459	const_iv (ST_SETUP)	1493	const_iv (ST_SETUP)
1460	const_iv (ST_PLAYING)	1494	const_iv (ST_PLAYING)
1461	const_iv (ST_CUSTOM)	1495	const_iv (ST_CUSTOM)
1462		1496
1463	const_iv (ST_CHANGE_CLASS)	1497	const_iv (ST_CHANGE_CLASS)
1464	const_iv (ST_CONFIRM_QUIT)
1465	const_iv (ST_GET_PARTY_PASSWORD)
1466		1498
1467	const_iv (IO_HEADER)	1499	const_iv (IO_HEADER)
1468	const_iv (IO_OBJECTS)	1500	const_iv (IO_OBJECTS)
1469	const_iv (IO_UNIQUES)	1501	const_iv (IO_UNIQUES)
1470		1502
…		…
1524		1556
1525	void _global_reattach ()	1557	void _global_reattach ()
1526	CODE:	1558	CODE:
1527	{	1559	{
1528	// reattach to all attachable objects in the game.	1560	// reattach to all attachable objects in the game.
1529	for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)	1561	for_all_clients (ns)
1530	(*i)->reattach ();	1562	ns->reattach ();
1531		1563
1532	for_all_players (pl)	1564	for_all_players (pl)
1533	pl->reattach ();	1565	pl->reattach ();
1534		1566
1535	//TODO	1567	//TODO
1536	//for (map_container::iterator i = maps.begin (); i != maps.end (); ++i)	1568	//for (map_container::iterator i = maps.begin (); i != maps.end (); ++i)
1537	// i->second->reattach ();	1569	// i->second->reattach ();
1538		1570
1539	for (object *op = object::first; op; op = op->next)	1571	for_all_objects (op)
1540	op->reattach ();	1572	op->reattach ();
1541	}	1573	}
1542		1574
1543	NV floor (NV x)	1575	NV floor (NV x)
1544		1576
1545	NV ceil (NV x)	1577	NV ceil (NV x)
		1578
		1579	NV rndm (...)
		1580	CODE:
		1581	switch (items)
		1582	{
		1583	case 0: RETVAL = rndm (); break;
		1584	case 1: RETVAL = rndm (SvUV (ST (0))); break;
		1585	case 2: RETVAL = rndm (SvIV (ST (0)), SvIV (ST (1))); break;
		1586	default: croak ("cf::rndm requires none, one or two parameters."); break;
		1587	}
		1588	OUTPUT:
		1589	RETVAL
1546		1590
1547	void server_tick ()	1591	void server_tick ()
1548	CODE:	1592	CODE:
1549	runtime = SvNVx (sv_runtime);	1593	runtime = SvNVx (sv_runtime);
1550	server_tick ();	1594	server_tick ();
…		…
1595	case 5: RETVAL = settings.playerdir; break;	1639	case 5: RETVAL = settings.playerdir; break;
1596	case 6: RETVAL = settings.datadir ; break;	1640	case 6: RETVAL = settings.datadir ; break;
1597	}	1641	}
1598	OUTPUT: RETVAL	1642	OUTPUT: RETVAL
1599		1643
		1644	void abort ()
		1645
		1646	void fork_abort (char *cause = "cf::fork_abort")
		1647
		1648	void cleanup (const char *cause, bool make_core = false)
		1649
1600	void emergency_save ()	1650	void emergency_save ()
1601		1651
		1652	UV sv_2watcher (SV *w)
		1653	CODE:
		1654	RETVAL = (UV)GEventAPI->sv_2watcher (w);
		1655	OUTPUT:
		1656	RETVAL
		1657
1602	void _exit (int status = 0)	1658	void _exit (int status = 0)
		1659
		1660	#if _POSIX_MEMLOCK
		1661
		1662	int mlockall (int flags = MCL_CURRENT \| MCL_FUTURE)
		1663
		1664	int munlockall ()
		1665
		1666	#endif
1603		1667
1604	int find_animation (char *text)	1668	int find_animation (char *text)
1605	PROTOTYPE: $	1669	PROTOTYPE: $
1606		1670
1607	int random_roll (int min, int max, object *op, int goodbad);	1671	int random_roll (int min, int max, object *op, int goodbad);
…		…
1654	CODE:	1718	CODE:
1655	RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);	1719	RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
1656	OUTPUT:	1720	OUTPUT:
1657	RETVAL	1721	RETVAL
1658		1722
1659	#bool	1723	int mortals_size ()
1660	#destroyed (attachable *at)	1724	CODE:
1661	#	1725	RETVAL = attachable::mortals.size ();
1662	#void	1726	OUTPUT: RETVAL
1663	#destroy (attachable *at)	1727
		1728	#object *mortals (U32 index)
		1729	# CODE:
		1730	# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0;
		1731	# OUTPUT: RETVAL
		1732
		1733	INCLUDE: $PERL genacc attachable ../include/cfperl.h \|
1664		1734
1665	MODULE = cf PACKAGE = cf::global	1735	MODULE = cf PACKAGE = cf::global
1666		1736
1667	int invoke (SV *klass, int event, ...)	1737	int invoke (SV *klass, int event, ...)
1668	CODE:	1738	CODE:
…		…
1684	RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END);	1754	RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END);
1685	OUTPUT: RETVAL	1755	OUTPUT: RETVAL
1686		1756
1687	SV registry (object op)	1757	SV registry (object op)
1688		1758
1689	void mortals ()	1759	int objects_size ()
1690	PPCODE:	1760	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;	1761	RETVAL = objects.size ();
		1762	OUTPUT: RETVAL
		1763
		1764	object *objects (U32 index)
		1765	CODE:
		1766	RETVAL = index < objects.size () ? objects [index] : 0;
		1767	OUTPUT: RETVAL
		1768
		1769	int actives_size ()
		1770	CODE:
		1771	RETVAL = actives.size ();
		1772	OUTPUT: RETVAL
		1773
		1774	object *actives (U32 index)
		1775	CODE:
		1776	RETVAL = index < actives.size () ? actives [index] : 0;
1698	OUTPUT: RETVAL	1777	OUTPUT: RETVAL
1699		1778
1700	# missing properties	1779	# missing properties
1701		1780
1702	object head (object op)	1781	object head (object op)
1703	PROTOTYPE: $	1782	PROTOTYPE: $
1704	CODE:	1783	CODE:
1705	RETVAL = op->head ? op->head : op;	1784	RETVAL = op->head_ ();
1706	OUTPUT: RETVAL	1785	OUTPUT: RETVAL
1707		1786
1708	int is_head (object *op)	1787	int is_head (object *op)
1709	PROTOTYPE: $	1788	PROTOTYPE: $
1710	CODE:	1789	CODE:
1711	RETVAL = !op->head;	1790	RETVAL = op->head_ () == op;
1712	OUTPUT: RETVAL	1791	OUTPUT: RETVAL
1713		1792
1714	void	1793	void
1715	inv (object *obj)	1794	inv (object *obj)
1716	PROTOTYPE: $	1795	PROTOTYPE: $
…		…
1807		1886
1808	void drop (object who, object op)	1887	void drop (object who, object op)
1809		1888
1810	void pick_up (object who, object op)	1889	void pick_up (object who, object op)
1811		1890
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)	1891	int cf_object_teleport (object op, maptile map, int x, int y)
1817		1892
1818	void update_object (object *op, int action)	1893	void update_object (object *op, int action)
1819		1894
1820	object cf_create_object_by_name (const char name)	1895	object cf_create_object_by_name (const char name)
…		…
1913	RETVAL = op->contr;	1988	RETVAL = op->contr;
1914	OUTPUT: RETVAL	1989	OUTPUT: RETVAL
1915		1990
1916	void check_score (object *op)	1991	void check_score (object *op)
1917		1992
1918	void cf_player_message (object obj, char txt, int flags = NDI_ORANGE \| NDI_UNIQUE)	1993	void message (object op, char txt, int flags = NDI_ORANGE \| NDI_UNIQUE)
		1994	CODE:
		1995	new_draw_info (flags, 0, op, txt);
1919		1996
1920	object cf_player_send_inventory (object op)	1997	object cf_player_send_inventory (object op)
1921		1998
1922	char cf_player_get_ip (object op)	1999	char cf_player_get_ip (object op)
1923	ALIAS: ip = 0	2000	ALIAS: ip = 0
…		…
1936		2013
1937	void esrv_update_item (object op, int what, object item)	2014	void esrv_update_item (object op, int what, object item)
1938	C_ARGS: what, op, item	2015	C_ARGS: what, op, item
1939		2016
1940	void clear_los (object *op)	2017	void clear_los (object *op)
1941
1942	int command_teleport (object op, char params)
1943		2018
1944	int command_summon (object op, char params)	2019	int command_summon (object op, char params)
1945		2020
1946	int command_arrest (object op, char params)	2021	int command_arrest (object op, char params)
1947		2022
…		…
1969	CODE:	2044	CODE:
1970	pl->ob->stats.hp = pl->ob->stats.maxhp;	2045	pl->ob->stats.hp = pl->ob->stats.maxhp;
1971	pl->ob->stats.sp = pl->ob->stats.maxsp;	2046	pl->ob->stats.sp = pl->ob->stats.maxsp;
1972	pl->ob->stats.grace = pl->ob->stats.maxgrace;	2047	pl->ob->stats.grace = pl->ob->stats.maxgrace;
1973	pl->orig_stats = pl->ob->stats;	2048	pl->orig_stats = pl->ob->stats;
1974
1975	player cf_player_find (char name)
1976	PROTOTYPE: $
1977		2049
1978	void cf_player_move (player *pl, int dir)	2050	void cf_player_move (player *pl, int dir)
1979		2051
1980	void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0);	2052	void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0);
1981		2053
…		…
2027	if (y) sv_to (y, pl->bed_y);	2099	if (y) sv_to (y, pl->bed_y);
2028		2100
2029	void	2101	void
2030	list ()	2102	list ()
2031	PPCODE:	2103	PPCODE:
2032	for (player *pl = first_player; pl; pl = pl->next)	2104	for_all_players (pl)
2033	XPUSHs (sv_2mortal (to_sv (pl)));	2105	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		2106
2057		2107
2058	MODULE = cf PACKAGE = cf::map PREFIX = cf_map_	2108	MODULE = cf PACKAGE = cf::map PREFIX = cf_map_
2059		2109
2060	int invoke (maptile *map, int event, ...)	2110	int invoke (maptile *map, int event, ...)
…		…
2076	PROTOTYPE:	2126	PROTOTYPE:
2077	CODE:	2127	CODE:
2078	RETVAL = new maptile;	2128	RETVAL = new maptile;
2079	OUTPUT:	2129	OUTPUT:
2080	RETVAL	2130	RETVAL
2081
2082	void
2083	maptile::destroy ()
2084		2131
2085	void	2132	void
2086	maptile::players ()	2133	maptile::players ()
2087	PPCODE:	2134	PPCODE:
2088	if (GIMME_V == G_SCALAR)	2135	if (GIMME_V == G_SCALAR)
…		…
2118		2165
2119	object* cf_map_present_arch_by_name (maptile map, const char str, int nx, int ny)	2166	object* cf_map_present_arch_by_name (maptile map, const char str, int nx, int ny)
2120	C_ARGS: str, map, nx, ny	2167	C_ARGS: str, map, nx, ny
2121		2168
2122	void	2169	void
2123	cf_map_normalise (maptile *map, int x, int y)	2170	get_map_flags (maptile *map, int x, int y)
2124	PPCODE:	2171	PPCODE:
2125	{	2172	{
2126	maptile *nmap = 0;	2173	maptile *nmap = 0;
2127	I16 nx = 0, ny = 0;	2174	I16 nx = 0, ny = 0;
2128	int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);	2175	int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
…		…
2177	case 4: RETVAL = newSVuv ( GET_MAP_MOVE_BLOCK (obj, x, y)); break;	2224	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;	2225	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;	2226	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;	2227	case 7: RETVAL = newSVuv ( GET_MAP_MOVE_OFF (obj, x, y)); break;
2181	}	2228	}
2182	OUTPUT:	2229	OUTPUT: RETVAL
2183	RETVAL
2184		2230
2185	void fix_walls (maptile *map, int x, int y)	2231	void fix_walls (maptile *map, int x, int y)
2186		2232
2187	void fix_walls_around (maptile *map, int x, int y)	2233	void fix_walls_around (maptile *map, int x, int y)
2188		2234
		2235	const char *
		2236	region_name (maptile *m)
		2237	CODE:
		2238	RETVAL = get_name_of_region_for_map (m);
		2239	OUTPUT: RETVAL
		2240
2189	# worst xs function of my life	2241	# worst xs function of my life
2190	maptile *	2242	bool
2191	_create_random_map (\	2243	_create_random_map (\
2192	char *path,\	2244	maptile *self,\
2193	char *wallstyle,\	2245	char *wallstyle,\
2194	char *wall_name,\	2246	char *wall_name,\
2195	char *floorstyle,\	2247	char *floorstyle,\
2196	char *monsterstyle,\	2248	char *monsterstyle,\
2197	char *treasurestyle,\	2249	char *treasurestyle,\
…		…
2201	char *origin_map,\	2253	char *origin_map,\
2202	char *final_map,\	2254	char *final_map,\
2203	char *exitstyle,\	2255	char *exitstyle,\
2204	char *this_map,\	2256	char *this_map,\
2205	char *exit_on_final_map,\	2257	char *exit_on_final_map,\
2206	int Xsize,\	2258	int xsize,\
2207	int Ysize,\	2259	int ysize,\
2208	int expand2x,\	2260	int expand2x,\
2209	int layoutoptions1,\	2261	int layoutoptions1,\
2210	int layoutoptions2,\	2262	int layoutoptions2,\
2211	int layoutoptions3,\	2263	int layoutoptions3,\
2212	int symmetry,\	2264	int symmetry,\
…		…
2217	int dungeon_depth,\	2269	int dungeon_depth,\
2218	int decoroptions,\	2270	int decoroptions,\
2219	int orientation,\	2271	int orientation,\
2220	int origin_y,\	2272	int origin_y,\
2221	int origin_x,\	2273	int origin_x,\
2222	int random_seed,\	2274	U32 random_seed,\
2223	val64 total_map_hp,\	2275	val64 total_map_hp,\
2224	int map_layout_style,\	2276	int map_layout_style,\
2225	int treasureoptions,\	2277	int treasureoptions,\
2226	int symmetry_used,\	2278	int symmetry_used,\
2227	region *region\	2279	region *region,\
		2280	char *custom\
2228	)	2281	)
2229	CODE:	2282	CODE:
2230	{	2283	{
2231	random_map_params rmp;	2284	random_map_params rmp;
2232		2285
…		…
2236	assign (rmp.monsterstyle , monsterstyle);	2289	assign (rmp.monsterstyle , monsterstyle);
2237	assign (rmp.treasurestyle , treasurestyle);	2290	assign (rmp.treasurestyle , treasurestyle);
2238	assign (rmp.layoutstyle , layoutstyle);	2291	assign (rmp.layoutstyle , layoutstyle);
2239	assign (rmp.doorstyle , doorstyle);	2292	assign (rmp.doorstyle , doorstyle);
2240	assign (rmp.decorstyle , decorstyle);	2293	assign (rmp.decorstyle , decorstyle);
2241	assign (rmp.origin_map , origin_map);
2242	assign (rmp.final_map , final_map);
2243	assign (rmp.exitstyle , exitstyle);	2294	assign (rmp.exitstyle , exitstyle);
2244	assign (rmp.this_map , this_map);
2245	assign (rmp.exit_on_final_map, exit_on_final_map);	2295	assign (rmp.exit_on_final_map, exit_on_final_map);
2246		2296
		2297	rmp.origin_map = origin_map;
		2298	rmp.final_map = final_map;
		2299	rmp.this_map = this_map;
2247	rmp.Xsize = Xsize;	2300	rmp.xsize = xsize;
2248	rmp.Ysize = Ysize;	2301	rmp.ysize = ysize;
2249	rmp.expand2x = expand2x;	2302	rmp.expand2x = expand2x;
2250	rmp.layoutoptions1 = layoutoptions1;	2303	rmp.layoutoptions1 = layoutoptions1;
2251	rmp.layoutoptions2 = layoutoptions2;	2304	rmp.layoutoptions2 = layoutoptions2;
2252	rmp.layoutoptions3 = layoutoptions3;	2305	rmp.layoutoptions3 = layoutoptions3;
2253	rmp.symmetry = symmetry;	2306	rmp.symmetry = symmetry;
…		…
2264	rmp.total_map_hp = total_map_hp;	2317	rmp.total_map_hp = total_map_hp;
2265	rmp.map_layout_style = map_layout_style;	2318	rmp.map_layout_style = map_layout_style;
2266	rmp.treasureoptions = treasureoptions;	2319	rmp.treasureoptions = treasureoptions;
2267	rmp.symmetry_used = symmetry_used;	2320	rmp.symmetry_used = symmetry_used;
2268	rmp.region = region;	2321	rmp.region = region;
		2322	rmp.custom = custom;
2269		2323
2270	RETVAL = generate_random_map (path, &rmp);	2324	RETVAL = self->generate_random_map (&rmp);
2271	}	2325	}
2272	OUTPUT:	2326	OUTPUT:
2273	RETVAL	2327	RETVAL
2274		2328
2275	MODULE = cf PACKAGE = cf::arch	2329	MODULE = cf PACKAGE = cf::arch
…		…
2298		2352
2299	INCLUDE: $PERL genacc partylist ../include/player.h \|	2353	INCLUDE: $PERL genacc partylist ../include/player.h \|
2300		2354
2301	MODULE = cf PACKAGE = cf::region	2355	MODULE = cf PACKAGE = cf::region
2302		2356
2303	region *first ()	2357	region *first ()
2304	PROTOTYPE:	2358	PROTOTYPE:
2305	CODE:	2359	CODE:
2306	RETVAL = first_region;	2360	RETVAL = first_region;
		2361	OUTPUT: RETVAL
		2362
		2363	region find (char name)
		2364	PROTOTYPE: $
		2365	CODE:
		2366	RETVAL = get_region_by_name (name);
2307	OUTPUT: RETVAL	2367	OUTPUT: RETVAL
2308		2368
2309	INCLUDE: $PERL genacc region ../include/map.h \|	2369	INCLUDE: $PERL genacc region ../include/map.h \|
2310		2370
2311	MODULE = cf PACKAGE = cf::living	2371	MODULE = cf PACKAGE = cf::living
…		…
2345	char *buf = SvPVbyte (packet, len);	2405	char *buf = SvPVbyte (packet, len);
2346		2406
2347	THIS->send_packet (buf, len);	2407	THIS->send_packet (buf, len);
2348	}	2408	}
2349		2409
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.154 by root, Fri Jan 26 21:44:11 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.154 by root, Fri Jan 26 21:44:11 2007 UTC