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

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.124 by root, Mon Jan 1 00:41:03 2007 UTC vs.
Revision 1.132 by root, Mon Jan 8 20:59:15 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	106	assert (!(flags & F_BORROWED));
113	#if 0	107	}
114	assert (!rc_next);	108
115	assert (!refcnt);	109	int
116	#endif	110	attachable::refcnt_cnt () const
		111	{
		112	return refcnt + (self ? SvREFCNT (self) : 0);
		113	}
		114
		115	void
		116	attachable::optimise ()
		117	{
		118	if (self
		119	&& SvREFCNT (self) == 1
		120	&& !HvTOTALKEYS (self))
		121	{
		122	flags &= ~F_BORROWED;
		123	refcnt_inc ();
		124	SvREFCNT_dec ((SV *)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 > 0)
124	return;	133	return;
125		134
126	// try to unborrow the refcnt from perl	135	optimise ();
127	if (flags & F_BORROWED)	136
		137	if (self)
128	{	138	{
129	assert (self);//D//TODO//remove when stable	139	if (refcnt + SvREFCNT (self) > 0)
		140	return;
		141
		142	if (flags & F_BORROWED)
		143	{
130	flags &= ~F_BORROWED;	144	flags &= ~F_BORROWED;
131	refcnt_inc ();	145	refcnt_inc ();
132	SvREFCNT_dec (self);	146	SvREFCNT_dec (self);
		147	}
		148
		149	if (self)
		150	if (refcnt + SvREFCNT (self) > 0)
		151	return;
133	}	152	}
134		153
135	if (refcnt > 0 \|\| self)	154	if (refcnt > 0)
136	return;	155	return;
137		156
138	destroy ();	157	destroy ();
139	}	158	}
140		159
141	void	160	void
142	attachable::do_destroy ()	161	attachable::do_destroy ()
143	{	162	{
144	invoke (EVENT_ATTACHABLE_DESTROY, DT_END);	163	invoke (EVENT_ATTACHABLE_DESTROY, DT_END);
145		164
146	//TODO: call generic destroy callback	165	if (self)
		166	hv_clear (self);
		167
147	mortals.push_back (this);	168	mortals.push_back (this);
148	}	169	}
149		170
150	void	171	void
151	attachable::destroy ()	172	attachable::destroy ()
…		…
155		176
156	flags \|= F_DESTROYED;	177	flags \|= F_DESTROYED;
157	do_destroy ();	178	do_destroy ();
158	}	179	}
159		180
		181	void
160	void attachable::check_mortals ()	182	attachable::check_mortals ()
161	{	183	{
162	for (int i = 0; i < mortals.size (); )	184	for (int i = 0; i < mortals.size (); )
163	{	185	{
164	attachable *obj = mortals [i];	186	attachable *obj = mortals [i];
165		187
…		…
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	assert (!(at->flags & attachable::F_BORROWED));
215	at->self = 0;	237	at->self = 0;
216	// next line makes sense, but most objects still have refcnt 0 by default	238	// next line makes sense, but most objects still have refcnt 0 by default
217	//at->refcnt_chk ();	239	//at->refcnt_chk ();
218	return 0;	240	return 0;
219	}	241	}
…		…
232	sv_magicext ((SV )obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char )obj, 0);	254	sv_magicext ((SV )obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char )obj, 0);
233		255
234	// borrow the refcnt from the object	256	// borrow the refcnt from the object
235	obj->flags \|= attachable::F_BORROWED;	257	obj->flags \|= attachable::F_BORROWED;
236	obj->refcnt_dec ();	258	obj->refcnt_dec ();
		259
		260	// now bless the object _once_
		261	return sv_bless (newRV_inc ((SV *)obj->self), stash);
237	}	262	}
238		263	else
239	return sv_bless (newRV_inc ((SV *)obj->self), stash);	264	return newRV_inc ((SV *)obj->self);
240	}	265	}
241		266
242	static void	267	static void
243	clearSVptr (SV *sv)	268	clearSVptr (SV *sv)
244	{	269	{
…		…
328	inline void sv_to (SV sv, client &v) { v = (client )(attachable )SvPTR_ornull (sv, "cf::client"); }	353	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"); }	354	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"); }	355	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"); }	356	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"); }	357	inline void sv_to (SV sv, maptile &v) { v = (maptile )(attachable )SvPTR_ornull (sv, "cf::map"); }
		358	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"); }	359	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"); }	360	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"); }	361	inline void sv_to (SV sv, living &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); }
336		362
337	inline void sv_to (SV sv, New_Face &v) { v = &new_faces[FindFace (SvPV_nolen (sv), 0)]; } //TODO	363	inline void sv_to (SV sv, New_Face &v) { v = &new_faces[FindFace (SvPV_nolen (sv), 0)]; } //TODO
…		…
504	}	530	}
505		531
506	attach = 0;	532	attach = 0;
507	}	533	}
508	#endif	534	#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	}
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)
525	{	539	{
…		…
828	CALL_CALL ("cf::map::emergency_save", G_VOID);	842	CALL_CALL ("cf::map::emergency_save", G_VOID);
829	CALL_END;	843	CALL_END;
830	}	844	}
831		845
832	maptile *	846	maptile *
833	maptile::load_map_sync (const char path, maptile origin)	847	maptile::find_sync (const char path, maptile origin)
834	{	848	{
835	CALL_BEGIN (2);	849	CALL_BEGIN (2);
836	CALL_ARG (path);	850	CALL_ARG (path);
837	CALL_ARG (origin);	851	CALL_ARG (origin);
838	CALL_CALL ("cf::map::load_map_sync", G_SCALAR);	852	CALL_CALL ("cf::map::find_sync", G_SCALAR);
839		853
840	maptile *retval;	854	maptile *retval;
841		855
842	if (count)	856	if (count)
843	sv_to (POPs, retval);	857	sv_to (POPs, retval);
…		…
845	retval = 0;	859	retval = 0;
846		860
847	CALL_END;	861	CALL_END;
848		862
849	return retval;	863	return retval;
		864	}
		865
		866	void
		867	maptile::do_load_sync ()
		868	{
		869	CALL_BEGIN (1);
		870	CALL_ARG (this);
		871	CALL_CALL ("cf::map::do_load_sync", G_SCALAR);
		872	CALL_END;
850	}	873	}
851		874
852	void	875	void
853	maptile::change_all_map_light (int change)	876	maptile::change_all_map_light (int change)
854	{	877	{
…		…
1461	const_iv (ST_SETUP)	1484	const_iv (ST_SETUP)
1462	const_iv (ST_PLAYING)	1485	const_iv (ST_PLAYING)
1463	const_iv (ST_CUSTOM)	1486	const_iv (ST_CUSTOM)
1464		1487
1465	const_iv (ST_CHANGE_CLASS)	1488	const_iv (ST_CHANGE_CLASS)
1466	const_iv (ST_CONFIRM_QUIT)
1467	const_iv (ST_GET_PARTY_PASSWORD)
1468		1489
1469	const_iv (IO_HEADER)	1490	const_iv (IO_HEADER)
1470	const_iv (IO_OBJECTS)	1491	const_iv (IO_OBJECTS)
1471	const_iv (IO_UNIQUES)	1492	const_iv (IO_UNIQUES)
1472		1493
…		…
1526		1547
1527	void _global_reattach ()	1548	void _global_reattach ()
1528	CODE:	1549	CODE:
1529	{	1550	{
1530	// reattach to all attachable objects in the game.	1551	// reattach to all attachable objects in the game.
1531	for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)	1552	for_all_clients (ns)
1532	(*i)->reattach ();	1553	ns->reattach ();
1533		1554
1534	for_all_players (pl)	1555	for_all_players (pl)
1535	pl->reattach ();	1556	pl->reattach ();
1536		1557
1537	//TODO	1558	//TODO
1538	//for (map_container::iterator i = maps.begin (); i != maps.end (); ++i)	1559	//for (map_container::iterator i = maps.begin (); i != maps.end (); ++i)
1539	// i->second->reattach ();	1560	// i->second->reattach ();
1540		1561
1541	for (object *op = object::first; op; op = op->next)	1562	for_all_objects (op)
1542	op->reattach ();	1563	op->reattach ();
1543	}	1564	}
1544		1565
1545	NV floor (NV x)	1566	NV floor (NV x)
1546		1567
…		…
1603		1624
1604	void emergency_save ()	1625	void emergency_save ()
1605		1626
1606	void _exit (int status = 0)	1627	void _exit (int status = 0)
1607		1628
		1629	#if _POSIX_MEMLOCK
		1630
		1631	int mlockall (int flags = MCL_CURRENT \| MCL_FUTURE)
		1632
		1633	int munlockall ()
		1634
		1635	#endif
		1636
1608	int find_animation (char *text)	1637	int find_animation (char *text)
1609	PROTOTYPE: $	1638	PROTOTYPE: $
1610		1639
1611	int random_roll (int min, int max, object *op, int goodbad);	1640	int random_roll (int min, int max, object *op, int goodbad);
1612		1641
…		…
1658	CODE:	1687	CODE:
1659	RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);	1688	RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
1660	OUTPUT:	1689	OUTPUT:
1661	RETVAL	1690	RETVAL
1662		1691
1663	#bool	1692	INCLUDE: $PERL genacc attachable ../include/cfperl.h \|
1664	#destroyed (attachable *at)
1665	#
1666	#void
1667	#destroy (attachable *at)
1668		1693
1669	MODULE = cf PACKAGE = cf::global	1694	MODULE = cf PACKAGE = cf::global
1670		1695
1671	int invoke (SV *klass, int event, ...)	1696	int invoke (SV *klass, int event, ...)
1672	CODE:	1697	CODE:
…		…
1975	CODE:	2000	CODE:
1976	pl->ob->stats.hp = pl->ob->stats.maxhp;	2001	pl->ob->stats.hp = pl->ob->stats.maxhp;
1977	pl->ob->stats.sp = pl->ob->stats.maxsp;	2002	pl->ob->stats.sp = pl->ob->stats.maxsp;
1978	pl->ob->stats.grace = pl->ob->stats.maxgrace;	2003	pl->ob->stats.grace = pl->ob->stats.maxgrace;
1979	pl->orig_stats = pl->ob->stats;	2004	pl->orig_stats = pl->ob->stats;
1980
1981	player cf_player_find (char name)
1982	PROTOTYPE: $
1983		2005
1984	void cf_player_move (player *pl, int dir)	2006	void cf_player_move (player *pl, int dir)
1985		2007
1986	void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0);	2008	void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0);
1987		2009
…		…
2033	if (y) sv_to (y, pl->bed_y);	2055	if (y) sv_to (y, pl->bed_y);
2034		2056
2035	void	2057	void
2036	list ()	2058	list ()
2037	PPCODE:	2059	PPCODE:
2038	for (player *pl = first_player; pl; pl = pl->next)	2060	for_all_players (pl)
2039	XPUSHs (sv_2mortal (to_sv (pl)));	2061	XPUSHs (sv_2mortal (to_sv (pl)));
2040
2041	bool
2042	peaceful (player *pl, bool new_setting = 0)
2043	PROTOTYPE: $;$
2044	CODE:
2045	RETVAL = pl->peaceful;
2046	if (items > 1)
2047	pl->peaceful = new_setting;
2048	OUTPUT:
2049	RETVAL
2050
2051	living *
2052	orig_stats (player *pl)
2053	CODE:
2054	RETVAL = &pl->orig_stats;
2055	OUTPUT: RETVAL
2056
2057	living *
2058	last_stats (player *pl)
2059	CODE:
2060	RETVAL = &pl->last_stats;
2061	OUTPUT: RETVAL
2062		2062
2063		2063
2064	MODULE = cf PACKAGE = cf::map PREFIX = cf_map_	2064	MODULE = cf PACKAGE = cf::map PREFIX = cf_map_
2065		2065
2066	int invoke (maptile *map, int event, ...)	2066	int invoke (maptile *map, int event, ...)
…		…
2082	PROTOTYPE:	2082	PROTOTYPE:
2083	CODE:	2083	CODE:
2084	RETVAL = new maptile;	2084	RETVAL = new maptile;
2085	OUTPUT:	2085	OUTPUT:
2086	RETVAL	2086	RETVAL
2087
2088	void
2089	maptile::destroy ()
2090		2087
2091	void	2088	void
2092	maptile::players ()	2089	maptile::players ()
2093	PPCODE:	2090	PPCODE:
2094	if (GIMME_V == G_SCALAR)	2091	if (GIMME_V == G_SCALAR)
…		…
2362	char *buf = SvPVbyte (packet, len);	2359	char *buf = SvPVbyte (packet, len);
2363		2360
2364	THIS->send_packet (buf, len);	2361	THIS->send_packet (buf, len);
2365	}	2362	}
2366		2363
2367	void
2368	client::destroy ()
2369

Diff Legend

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

Comparing deliantra/server/server/cfperl.xs (file contents): Revision 1.124 by root, Mon Jan 1 00:41:03 2007 UTC vs. Revision 1.132 by root, Mon Jan 8 20:59:15 2007 UTC

Diff Legend

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.124 by root, Mon Jan 1 00:41:03 2007 UTC vs.
Revision 1.132 by root, Mon Jan 8 20:59:15 2007 UTC