[ViewVC] Diff of: cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.437 by root, Tue Jul 8 08:33:27 2008 UTC vs.
Revision 1.486 by root, Thu Oct 15 21:56:50 2009 UTC

…		…
1	#	1	#
2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	#	3	#
4	# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	#	5	#
6	# Deliantra is free software: you can redistribute it and/or modify	6	# Deliantra is free software: you can redistribute it and/or modify it under
7	# it under the terms of the GNU General Public License as published by	7	# the terms of the Affero GNU General Public License as published by the
8	# the Free Software Foundation, either version 3 of the License, or	8	# Free Software Foundation, either version 3 of the License, or (at your
9	# (at your option) any later version.	9	# option) any later version.
10	#	10	#
11	# This program is distributed in the hope that it will be useful,	11	# This program is distributed in the hope that it will be useful,
12	# but WITHOUT ANY WARRANTY; without even the implied warranty of	12	# but WITHOUT ANY WARRANTY; without even the implied warranty of
13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14	# GNU General Public License for more details.	14	# GNU General Public License for more details.
15	#	15	#
16	# You should have received a copy of the GNU General Public License	16	# You should have received a copy of the Affero GNU General Public License
17	# along with this program. If not, see <http://www.gnu.org/licenses/>.	17	# and the GNU General Public License along with this program. If not, see
		18	# <http://www.gnu.org/licenses/>.
18	#	19	#
19	# The authors can be reached via e-mail to <support@deliantra.net>	20	# The authors can be reached via e-mail to <support@deliantra.net>
20	#	21	#
21		22
22	package cf;	23	package cf;
23		24
		25	use 5.10.0;
24	use utf8;	26	use utf8;
25	use strict;	27	use strict qw(vars subs);
26		28
27	use Symbol;	29	use Symbol;
28	use List::Util;	30	use List::Util;
29	use Socket;	31	use Socket;
30	use EV;	32	use EV;
31	use Opcode;	33	use Opcode;
32	use Safe;	34	use Safe;
33	use Safe::Hole;	35	use Safe::Hole;
34	use Storable ();	36	use Storable ();
35		37
		38	use Guard ();
36	use Coro ();	39	use Coro ();
37	use Coro::State;	40	use Coro::State;
38	use Coro::Handle;	41	use Coro::Handle;
		42	use Coro::EV;
39	use Coro::AnyEvent;	43	use Coro::AnyEvent;
40	use Coro::Timer;	44	use Coro::Timer;
41	use Coro::Signal;	45	use Coro::Signal;
42	use Coro::Semaphore;	46	use Coro::Semaphore;
		47	use Coro::SemaphoreSet;
43	use Coro::AnyEvent;	48	use Coro::AnyEvent;
44	use Coro::AIO;	49	use Coro::AIO;
45	use Coro::BDB 1.6;	50	use Coro::BDB 1.6;
46	use Coro::Storable;	51	use Coro::Storable;
47	use Coro::Util ();	52	use Coro::Util ();
49	use JSON::XS 2.01 ();	54	use JSON::XS 2.01 ();
50	use BDB ();	55	use BDB ();
51	use Data::Dumper;	56	use Data::Dumper;
52	use Digest::MD5;	57	use Digest::MD5;
53	use Fcntl;	58	use Fcntl;
54	use YAML ();	59	use YAML::XS ();
55	use IO::AIO ();	60	use IO::AIO ();
56	use Time::HiRes;	61	use Time::HiRes;
57	use Compress::LZF;	62	use Compress::LZF;
58	use Digest::MD5 ();	63	use Digest::MD5 ();
59		64
…		…
61		66
62	# configure various modules to our taste	67	# configure various modules to our taste
63	#	68	#
64	$Storable::canonical = 1; # reduce rsync transfers	69	$Storable::canonical = 1; # reduce rsync transfers
65	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator	70	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
		71
		72	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
		73
		74	# make sure c-lzf reinitialises itself
		75	Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
66	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later	76	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
67		77
68	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority	78	# strictly for debugging
		79	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
69		80
70	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	81	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
71		82
72	our %COMMAND = ();	83	our %COMMAND = ();
73	our %COMMAND_TIME = ();	84	our %COMMAND_TIME = ();
…		…
76	our %EXTCMD = ();	87	our %EXTCMD = ();
77	our %EXTICMD = ();	88	our %EXTICMD = ();
78	our %EXT_CORO = (); # coroutines bound to extensions	89	our %EXT_CORO = (); # coroutines bound to extensions
79	our %EXT_MAP = (); # pluggable maps	90	our %EXT_MAP = (); # pluggable maps
80		91
81	our $RELOAD; # number of reloads so far	92	our $RELOAD; # number of reloads so far, non-zero while in reload
82	our @EVENT;	93	our @EVENT;
		94	our @REFLECT; # set by XS
		95	our %REFLECT; # set by us
83		96
84	our $CONFDIR = confdir;	97	our $CONFDIR = confdir;
85	our $DATADIR = datadir;	98	our $DATADIR = datadir;
86	our $LIBDIR = "$DATADIR/ext";	99	our $LIBDIR = "$DATADIR/ext";
87	our $PODDIR = "$DATADIR/pod";	100	our $PODDIR = "$DATADIR/pod";
88	our $MAPDIR = "$DATADIR/" . mapdir;	101	our $MAPDIR = "$DATADIR/" . mapdir;
89	our $LOCALDIR = localdir;	102	our $LOCALDIR = localdir;
90	our $TMPDIR = "$LOCALDIR/" . tmpdir;	103	our $TMPDIR = "$LOCALDIR/" . tmpdir;
91	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	104	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
92	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	105	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
93	our $RANDOMDIR = "$LOCALDIR/random";	106	our $RANDOMDIR = "$LOCALDIR/random";
94	our $BDBDIR = "$LOCALDIR/db";	107	our $BDBDIR = "$LOCALDIR/db";
		108	our $PIDFILE = "$LOCALDIR/pid";
		109	our $RUNTIMEFILE = "$LOCALDIR/runtime";
		110
95	our %RESOURCE;	111	our %RESOURCE;
96		112
97	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	113	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
98	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	114	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
99	our $NEXT_TICK;	115	our $NEXT_TICK;
100	our $USE_FSYNC = 1; # use fsync to write maps - default off	116	our $USE_FSYNC = 1; # use fsync to write maps - default on
101		117
102	our $BDB_DEADLOCK_WATCHER;	118	our $BDB_DEADLOCK_WATCHER;
103	our $BDB_CHECKPOINT_WATCHER;	119	our $BDB_CHECKPOINT_WATCHER;
104	our $BDB_TRICKLE_WATCHER;	120	our $BDB_TRICKLE_WATCHER;
105	our $DB_ENV;	121	our $DB_ENV;
106		122
		123	our @EXTRA_MODULES = qw(pod match mapscript);
		124
107	our %CFG;	125	our %CFG;
108		126
109	our $UPTIME; $UPTIME \|\|= time;	127	our $UPTIME; $UPTIME \|\|= time;
110	our $RUNTIME;	128	our $RUNTIME;
111	our $NOW;	129	our $NOW;
…		…
120	our $LOAD; # a number between 0 (idle) and 1 (too many objects)	138	our $LOAD; # a number between 0 (idle) and 1 (too many objects)
121	our $LOADAVG; # same thing, but with alpha-smoothing	139	our $LOADAVG; # same thing, but with alpha-smoothing
122	our $JITTER; # average jitter	140	our $JITTER; # average jitter
123	our $TICK_START; # for load detecting purposes	141	our $TICK_START; # for load detecting purposes
124		142
		143	our @POST_INIT;
		144
		145	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
		146	our $REALLY_UNLOOP; # never set to true, please :)
		147
125	binmode STDOUT;	148	binmode STDOUT;
126	binmode STDERR;	149	binmode STDERR;
127		150
128	# read virtual server time, if available	151	# read virtual server time, if available
129	unless ($RUNTIME \|\| !-e "$LOCALDIR/runtime") {	152	unless ($RUNTIME \|\| !-e $RUNTIMEFILE) {
130	open my $fh, "<", "$LOCALDIR/runtime"	153	open my $fh, "<", $RUNTIMEFILE
131	or die "unable to read runtime file: $!";	154	or die "unable to read $RUNTIMEFILE file: $!";
132	$RUNTIME = <$fh> + 0.;	155	$RUNTIME = <$fh> + 0.;
133	}	156	}
		157
		158	eval "sub TICK() { $TICK } 1" or die;
134		159
135	mkdir $_	160	mkdir $_
136	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;	161	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
137		162
138	our $EMERGENCY_POSITION;	163	our $EMERGENCY_POSITION;
139		164
140	sub cf::map::normalise;	165	sub cf::map::normalise;
		166
		167	#############################################################################
		168
		169	%REFLECT = ();
		170	for (@REFLECT) {
		171	my $reflect = JSON::XS::decode_json $_;
		172	$REFLECT{$reflect->{class}} = $reflect;
		173	}
		174
		175	# this is decidedly evil
		176	$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
141		177
142	#############################################################################	178	#############################################################################
143		179
144	=head2 GLOBAL VARIABLES	180	=head2 GLOBAL VARIABLES
145		181
…		…
196		232
197	This array contains the results of the last C<invoke ()> call. When	233	This array contains the results of the last C<invoke ()> call. When
198	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of	234	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
199	that call.	235	that call.
200		236
		237	=item %cf::REFLECT
		238
		239	Contains, for each (C++) class name, a hash reference with information
		240	about object members (methods, scalars, arrays and flags) and other
		241	metadata, which is useful for introspection.
		242
201	=back	243	=back
202		244
203	=cut	245	=cut
204		246
205	BEGIN {	247	$Coro::State::WARNHOOK = sub {
206	*CORE::GLOBAL::warn = sub {
207	my $msg = join "", @_;	248	my $msg = join "", @_;
208		249
209	$msg .= "\n"	250	$msg .= "\n"
210	unless $msg =~ /\n$/;	251	unless $msg =~ /\n$/;
211		252
212	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	253	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
213		254
214	LOG llevError, $msg;	255	LOG llevError, $msg;
215	};	256	};
216	}
217		257
218	$Coro::State::DIEHOOK = sub {	258	$Coro::State::DIEHOOK = sub {
219	return unless $^S eq 0; # "eq", not "=="	259	return unless $^S eq 0; # "eq", not "=="
		260
		261	warn Carp::longmess $_[0];
220		262
221	if ($Coro::current == $Coro::main) {#d#	263	if ($Coro::current == $Coro::main) {#d#
222	warn "DIEHOOK called in main context, Coro bug?\n";#d#	264	warn "DIEHOOK called in main context, Coro bug?\n";#d#
223	return;#d#	265	return;#d#
224	}#d#	266	}#d#
225		267
226	# kill coroutine otherwise	268	# kill coroutine otherwise
227	warn Carp::longmess $_[0];
228	Coro::terminate	269	Coro::terminate
229	};	270	};
230
231	$SIG{__DIE__} = sub { }; #d#?
232		271
233	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	272	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
234	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	273	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
235	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	274	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
236	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	275	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
…		…
243	for my $pkg (qw(	282	for my $pkg (qw(
244	cf::global cf::attachable	283	cf::global cf::attachable
245	cf::object cf::object::player	284	cf::object cf::object::player
246	cf::client cf::player	285	cf::client cf::player
247	cf::arch cf::living	286	cf::arch cf::living
		287	cf::map cf::mapspace
248	cf::map cf::party cf::region	288	cf::party cf::region
249	)) {	289	)) {
250	no strict 'refs';
251	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	290	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
252	}	291	}
253		292
254	$EV::DIED = sub {	293	$EV::DIED = sub {
255	warn "error in event callback: @_";	294	warn "error in event callback: @_";
…		…
297	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	336	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
298		337
299	sub encode_json($) { $json_coder->encode ($_[0]) }	338	sub encode_json($) { $json_coder->encode ($_[0]) }
300	sub decode_json($) { $json_coder->decode ($_[0]) }	339	sub decode_json($) { $json_coder->decode ($_[0]) }
301		340
		341	=item cf::post_init { BLOCK }
		342
		343	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
		344	but I<before> the server starts ticking again.
		345
		346	The cdoeblock will have a single boolean argument to indicate whether this
		347	is a reload or not.
		348
		349	=cut
		350
		351	sub post_init(&) {
		352	push @POST_INIT, shift;
		353	}
		354
302	=item cf::lock_wait $string	355	=item cf::lock_wait $string
303		356
304	Wait until the given lock is available. See cf::lock_acquire.	357	Wait until the given lock is available. See cf::lock_acquire.
305		358
306	=item my $lock = cf::lock_acquire $string	359	=item my $lock = cf::lock_acquire $string
307		360
308	Wait until the given lock is available and then acquires it and returns	361	Wait until the given lock is available and then acquires it and returns
309	a Coro::guard object. If the guard object gets destroyed (goes out of scope,	362	a L<Guard> object. If the guard object gets destroyed (goes out of scope,
310	for example when the coroutine gets canceled), the lock is automatically	363	for example when the coroutine gets canceled), the lock is automatically
311	returned.	364	returned.
312		365
313	Locks are not recursive, locking from the same coro twice results in a	366	Locks are not recursive, locking from the same coro twice results in a
314	deadlocked coro.	367	deadlocked coro.
…		…
320		373
321	Return true if the lock is currently active, i.e. somebody has locked it.	374	Return true if the lock is currently active, i.e. somebody has locked it.
322		375
323	=cut	376	=cut
324		377
325	our %LOCK;	378	our $LOCKS = new Coro::SemaphoreSet;
326	our %LOCKER;#d#
327		379
328	sub lock_wait($) {	380	sub lock_wait($) {
329	my ($key) = @_;	381	$LOCKS->wait ($_[0]);
330
331	if ($LOCKER{$key} == $Coro::current) {#d#
332	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
333	return;#d#
334	}#d#
335
336	# wait for lock, if any
337	while ($LOCK{$key}) {
338	push @{ $LOCK{$key} }, $Coro::current;
339	Coro::schedule;
340	}
341	}	382	}
342		383
343	sub lock_acquire($) {	384	sub lock_acquire($) {
344	my ($key) = @_;	385	$LOCKS->guard ($_[0])
345
346	# wait, to be sure we are not locked
347	lock_wait $key;
348
349	$LOCK{$key} = [];
350	$LOCKER{$key} = $Coro::current;#d#
351
352	Coro::guard {
353	delete $LOCKER{$key};#d#
354	# wake up all waiters, to be on the safe side
355	$_->ready for @{ delete $LOCK{$key} };
356	}
357	}	386	}
358		387
359	sub lock_active($) {	388	sub lock_active($) {
360	my ($key) = @_;	389	$LOCKS->count ($_[0]) < 1
361
362	! ! $LOCK{$key}
363	}	390	}
364		391
365	sub freeze_mainloop {	392	sub freeze_mainloop {
366	tick_inhibit_inc;	393	tick_inhibit_inc;
367		394
368	Coro::guard \&tick_inhibit_dec;	395	&Guard::guard (\&tick_inhibit_dec);
369	}	396	}
370		397
371	=item cf::periodic $interval, $cb	398	=item cf::periodic $interval, $cb
372		399
373	Like EV::periodic, but randomly selects a starting point so that the actions	400	Like EV::periodic, but randomly selects a starting point so that the actions
…		…
725		752
726	#############################################################################	753	#############################################################################
727		754
728	=head2 ATTACHABLE OBJECTS	755	=head2 ATTACHABLE OBJECTS
729		756
730	Many objects in crossfire are so-called attachable objects. That means you can	757	Many objects in deliantra are so-called attachable objects. That means you can
731	attach callbacks/event handlers (a collection of which is called an "attachment")	758	attach callbacks/event handlers (a collection of which is called an "attachment")
732	to it. All such attachable objects support the following methods.	759	to it. All such attachable objects support the following methods.
733		760
734	In the following description, CLASS can be any of C<global>, C<object>	761	In the following description, CLASS can be any of C<global>, C<object>
735	C<player>, C<client> or C<map> (i.e. the attachable objects in	762	C<player>, C<client> or C<map> (i.e. the attachable objects in
…		…
785	=item cf::CLASS::attachment $name, ...	812	=item cf::CLASS::attachment $name, ...
786		813
787	Register an attachment by C<$name> through which attachable objects of the	814	Register an attachment by C<$name> through which attachable objects of the
788	given CLASS can refer to this attachment.	815	given CLASS can refer to this attachment.
789		816
790	Some classes such as crossfire maps and objects can specify attachments	817	Some classes such as deliantra maps and objects can specify attachments
791	that are attached at load/instantiate time, thus the need for a name.	818	that are attached at load/instantiate time, thus the need for a name.
792		819
793	These calls expect any number of the following handler/hook descriptions:	820	These calls expect any number of the following handler/hook descriptions:
794		821
795	=over 4	822	=over 4
…		…
1086		1113
1087	sub reattach {	1114	sub reattach {
1088	# basically do the same as instantiate, without calling instantiate	1115	# basically do the same as instantiate, without calling instantiate
1089	my ($obj) = @_;	1116	my ($obj) = @_;
1090		1117
		1118	# no longer needed after getting rid of delete_package?
1091	bless $obj, ref $obj; # re-bless in case extensions have been reloaded	1119	#bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1092		1120
1093	my $registry = $obj->registry;	1121	my $registry = $obj->registry;
1094		1122
1095	@$registry = ();	1123	@$registry = ();
1096		1124
…		…
1144	$decname, length $$rdata, scalar @$objs;	1172	$decname, length $$rdata, scalar @$objs;
1145		1173
1146	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {	1174	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {
1147	aio_chmod $fh, SAVE_MODE;	1175	aio_chmod $fh, SAVE_MODE;
1148	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1176	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1149	aio_fsync $fh if $cf::USE_FSYNC;	1177	if ($cf::USE_FSYNC) {
		1178	aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE \| IO::AIO::SYNC_FILE_RANGE_WRITE \| IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
		1179	aio_fsync $fh;
		1180	}
1150	aio_close $fh;	1181	aio_close $fh;
1151		1182
1152	if (@$objs) {	1183	if (@$objs) {
1153	if (my $fh = aio_open "$filename.pst~", O_WRONLY \| O_CREAT, 0600) {	1184	if (my $fh = aio_open "$filename.pst~", O_WRONLY \| O_CREAT, 0600) {
1154	aio_chmod $fh, SAVE_MODE;	1185	aio_chmod $fh, SAVE_MODE;
1155	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };	1186	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1156	aio_write $fh, 0, (length $data), $data, 0;	1187	aio_write $fh, 0, (length $data), $data, 0;
1157	aio_fsync $fh if $cf::USE_FSYNC;	1188	if ($cf::USE_FSYNC) {
		1189	aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE \| IO::AIO::SYNC_FILE_RANGE_WRITE \| IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
		1190	aio_fsync $fh;
		1191	}
1158	aio_close $fh;	1192	aio_close $fh;
1159	aio_rename "$filename.pst~", "$filename.pst";	1193	aio_rename "$filename.pst~", "$filename.pst";
1160	}	1194	}
1161	} else {	1195	} else {
1162	aio_unlink "$filename.pst";	1196	aio_unlink "$filename.pst";
1163	}	1197	}
1164		1198
1165	aio_rename "$filename~", $filename;	1199	aio_rename "$filename~", $filename;
		1200
		1201	$filename =~ s%/[^/]+$%%;
		1202	aio_pathsync $filename if $cf::USE_FSYNC;
1166	} else {	1203	} else {
1167	warn "FATAL: $filename~: $!\n";	1204	warn "unable to save objects: $filename~: $!\n";
1168	}	1205	}
1169	} else {	1206	} else {
1170	aio_unlink $filename;	1207	aio_unlink $filename;
1171	aio_unlink "$filename.pst";	1208	aio_unlink "$filename.pst";
1172	}	1209	}
…		…
1263	my ($name, $cb) = @_;	1300	my ($name, $cb) = @_;
1264		1301
1265	$EXTICMD{$name} = $cb;	1302	$EXTICMD{$name} = $cb;
1266	}	1303	}
1267		1304
		1305	use File::Glob ();
		1306
1268	cf::player->attach (	1307	cf::player->attach (
1269	on_command => sub {	1308	on_command => sub {
1270	my ($pl, $name, $params) = @_;	1309	my ($pl, $name, $params) = @_;
1271		1310
1272	my $cb = $COMMAND{$name}	1311	my $cb = $COMMAND{$name}
…		…
1304		1343
1305	cf::override;	1344	cf::override;
1306	},	1345	},
1307	);	1346	);
1308		1347
		1348	# "readahead" all extensions
		1349	sub cache_extensions {
		1350	my $grp = IO::AIO::aio_group;
		1351
		1352	add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
		1353	for (grep /\.ext$/, @{$_[0]}) {
		1354	add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
		1355	}
		1356	};
		1357
		1358	$grp
		1359	}
		1360
1309	sub load_extensions {	1361	sub load_extensions {
1310	cf::sync_job {	1362	cf::sync_job {
1311	my %todo;	1363	my %todo;
1312		1364
1313	for my $path (<$LIBDIR/*.ext>) {	1365	for my $path (<$LIBDIR/*.ext>) {
…		…
1332		1384
1333	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1385	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1334	if $source =~ /\A#!.?perl.?#\s(.)$/m;	1386	if $source =~ /\A#!.?perl.?#\s(.)$/m;
1335		1387
1336	$ext{source} =	1388	$ext{source} =
1337	"package $pkg; use strict; use utf8;\n"	1389	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1338	. "#line 1 \"$path\"\n{\n"	1390	. "#line 1 \"$path\"\n{\n"
1339	. $source	1391	. $source
1340	. "\n};\n1";	1392	. "\n};\n1";
1341		1393
1342	$todo{$base} = \%ext;	1394	$todo{$base} = \%ext;
…		…
1382		1434
1383	=back	1435	=back
1384		1436
1385	=head2 CORE EXTENSIONS	1437	=head2 CORE EXTENSIONS
1386		1438
1387	Functions and methods that extend core crossfire objects.	1439	Functions and methods that extend core deliantra objects.
1388		1440
1389	=cut	1441	=cut
1390		1442
1391	package cf::player;	1443	package cf::player;
1392		1444
…		…
1435		1487
1436	sub exists($) {	1488	sub exists($) {
1437	my ($login) = @_;	1489	my ($login) = @_;
1438		1490
1439	$cf::PLAYER{$login}	1491	$cf::PLAYER{$login}
1440	or cf::sync_job { !aio_stat path $login }	1492	or !aio_stat path $login
1441	}	1493	}
1442		1494
1443	sub find($) {	1495	sub find($) {
1444	return $cf::PLAYER{$_[0]} \|\| do {	1496	return $cf::PLAYER{$_[0]} \|\| do {
1445	my $login = $_[0];	1497	my $login = $_[0];
…		…
1520	my ($pl) = @_;	1572	my ($pl) = @_;
1521		1573
1522	my $name = $pl->ob->name;	1574	my $name = $pl->ob->name;
1523		1575
1524	$pl->{deny_save} = 1;	1576	$pl->{deny_save} = 1;
1525	$pl->password ("*"); # this should lock out the player until we nuked the dir	1577	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1526		1578
1527	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1579	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1528	$pl->deactivate;	1580	$pl->deactivate;
1529	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1581	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1530	$pl->ob->check_score;	1582	$pl->ob->check_score;
…		…
1616	}	1668	}
1617		1669
1618	\@paths	1670	\@paths
1619	}	1671	}
1620		1672
1621	=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)	1673	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1622		1674
1623	Expand crossfire pod fragments into protocol xml.	1675	Expand deliantra pod fragments into protocol xml.
1624
1625	=cut
1626
1627	use re 'eval';
1628
1629	my $group;
1630	my $interior; $interior = qr{
1631	# match a pod interior sequence sans C<< >>
1632	(?:
1633	\ (.*?)\ (?{ $group = $^N })
1634	\| < (??{$interior}) >
1635	)
1636	}x;
1637
1638	sub expand_cfpod {
1639	my ($self, $pod) = @_;
1640
1641	my $xml;
1642
1643	while () {
1644	if ($pod =~ /\G( (?: [^BCGHITU]+ \| .(?!<) )+ )/xgcs) {
1645	$group = $1;
1646
1647	$group =~ s/&/&/g;
1648	$group =~ s/</</g;
1649
1650	$xml .= $group;
1651	} elsif ($pod =~ m%\G
1652	([BCGHITU])
1653	<
1654	(?:
1655	([^<>]*) (?{ $group = $^N })
1656	\| < $interior >
1657	)
1658	>
1659	%gcsx
1660	) {
1661	my ($code, $data) = ($1, $group);
1662
1663	if ($code eq "B") {
1664	$xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1665	} elsif ($code eq "I") {
1666	$xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1667	} elsif ($code eq "U") {
1668	$xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1669	} elsif ($code eq "C") {
1670	$xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1671	} elsif ($code eq "T") {
1672	$xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1673	} elsif ($code eq "G") {
1674	my ($male, $female) = split /\\|/, $data;
1675	$data = $self->gender ? $female : $male;
1676	$xml .= expand_cfpod ($self, $data);
1677	} elsif ($code eq "H") {
1678	$xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1679	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1680	"")
1681	[$self->{hintmode}];
1682	} else {
1683	$xml .= "error processing '$code($data)' directive";
1684	}
1685	} else {
1686	if ($pod =~ /\G(.+)/) {
1687	warn "parse error while expanding $pod (at $1)";
1688	}
1689	last;
1690	}
1691	}
1692
1693	for ($xml) {
1694	# create single paragraphs (very hackish)
1695	s/(?<=\S)\n(?=\w)/ /g;
1696
1697	# compress some whitespace
1698	s/\s+\n/\n/g; # ws line-ends
1699	s/\n\n+/\n/g; # double lines
1700	s/^\n+//; # beginning lines
1701	s/\n+$//; # ending lines
1702	}
1703
1704	$xml
1705	}
1706
1707	no re 'eval';
1708
1709	sub hintmode {
1710	$_[0]{hintmode} = $_[1] if @_ > 1;
1711	$_[0]{hintmode}
1712	}
1713		1676
1714	=item $player->ext_reply ($msgid, @msg)	1677	=item $player->ext_reply ($msgid, @msg)
1715		1678
1716	Sends an ext reply to the player.	1679	Sends an ext reply to the player.
1717		1680
…		…
1930		1893
1931	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;	1894	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1932	"$UNIQUEDIR/$path"	1895	"$UNIQUEDIR/$path"
1933	}	1896	}
1934		1897
1935	# and all this just because we cannot iterate over
1936	# all maps in C++...
1937	sub change_all_map_light {
1938	my ($change) = @_;
1939
1940	$_->change_map_light ($change)
1941	for grep $_->outdoor, values %cf::MAP;
1942	}
1943
1944	sub decay_objects {	1898	sub decay_objects {
1945	my ($self) = @_;	1899	my ($self) = @_;
1946		1900
1947	return if $self->{deny_reset};	1901	return if $self->{deny_reset};
1948		1902
…		…
2030	sub find {	1984	sub find {
2031	my ($path, $origin) = @_;	1985	my ($path, $origin) = @_;
2032		1986
2033	$path = normalise $path, $origin && $origin->path;	1987	$path = normalise $path, $origin && $origin->path;
2034		1988
2035	cf::lock_wait "map_data:$path";#d#remove	1989	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2036	cf::lock_wait "map_find:$path";	1990	my $guard2 = cf::lock_acquire "map_find:$path";
2037		1991
2038	$cf::MAP{$path} \|\| do {	1992	$cf::MAP{$path} \|\| do {
2039	my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2040	my $guard2 = cf::lock_acquire "map_find:$path";
2041
2042	my $map = new_from_path cf::map $path	1993	my $map = new_from_path cf::map $path
2043	or return;	1994	or return;
2044		1995
2045	$map->{last_save} = $cf::RUNTIME;	1996	$map->{last_save} = $cf::RUNTIME;
2046		1997
…		…
2086	my $f = new_from_file cf::object::thawer $self->{load_path};	2037	my $f = new_from_file cf::object::thawer $self->{load_path};
2087	$f->skip_block;	2038	$f->skip_block;
2088	$self->_load_objects ($f)	2039	$self->_load_objects ($f)
2089	or return;	2040	or return;
2090		2041
2091	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	2042	$self->post_load_original
2092	if delete $self->{load_original};	2043	if delete $self->{load_original};
2093		2044
2094	if (my $uniq = $self->uniq_path) {	2045	if (my $uniq = $self->uniq_path) {
2095	utf8::encode $uniq;	2046	utf8::encode $uniq;
2096	unless (aio_stat $uniq) {	2047	unless (aio_stat $uniq) {
…		…
2114	unless ($self->{deny_activate}) {	2065	unless ($self->{deny_activate}) {
2115	$self->decay_objects;	2066	$self->decay_objects;
2116	$self->fix_auto_apply;	2067	$self->fix_auto_apply;
2117	$self->update_buttons;	2068	$self->update_buttons;
2118	cf::cede_to_tick;	2069	cf::cede_to_tick;
2119	$self->set_darkness_map;
2120	cf::cede_to_tick;
2121	$self->activate;	2070	$self->activate;
2122	}	2071	}
2123		2072
2124	$self->{last_save} = $cf::RUNTIME;	2073	$self->{last_save} = $cf::RUNTIME;
2125	$self->last_access ($cf::RUNTIME);	2074	$self->last_access ($cf::RUNTIME);
…		…
2291		2240
2292	my $lock = cf::lock_acquire "map_data:$self->{path}";	2241	my $lock = cf::lock_acquire "map_data:$self->{path}";
2293		2242
2294	return if $self->players;	2243	return if $self->players;
2295		2244
2296	warn "resetting map ", $self->path;	2245	warn "resetting map ", $self->path, "\n";
2297		2246
2298	$self->in_memory (cf::MAP_SWAPPED);	2247	$self->in_memory (cf::MAP_SWAPPED);
2299		2248
2300	# need to save uniques path	2249	# need to save uniques path
2301	unless ($self->{deny_save}) {	2250	unless ($self->{deny_save}) {
…		…
2466		2415
2467	our $SAY_CHANNEL = {	2416	our $SAY_CHANNEL = {
2468	id => "say",	2417	id => "say",
2469	title => "Map",	2418	title => "Map",
2470	reply => "say ",	2419	reply => "say ",
2471	tooltip => "Things said to and replied from npcs near you and other players on the same map only.",	2420	tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2472	};	2421	};
2473		2422
2474	our $CHAT_CHANNEL = {	2423	our $CHAT_CHANNEL = {
2475	id => "chat",	2424	id => "chat",
2476	title => "Chat",	2425	title => "Chat",
…		…
2531		2480
2532	=item $player_object->enter_link	2481	=item $player_object->enter_link
2533		2482
2534	Freezes the player and moves him/her to a special map (C<{link}>).	2483	Freezes the player and moves him/her to a special map (C<{link}>).
2535		2484
2536	The player should be reasonably safe there for short amounts of time. You	2485	The player should be reasonably safe there for short amounts of time (e.g.
2537	I<MUST> call C<leave_link> as soon as possible, though.	2486	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
		2487	though, as the palyer cannot control the character while it is on the link
		2488	map.
2538		2489
2539	Will never block.	2490	Will never block.
2540		2491
2541	=item $player_object->leave_link ($map, $x, $y)	2492	=item $player_object->leave_link ($map, $x, $y)
2542		2493
…		…
2600		2551
2601	$map->load;	2552	$map->load;
2602	$map->load_neighbours;	2553	$map->load_neighbours;
2603		2554
2604	return unless $self->contr->active;	2555	return unless $self->contr->active;
2605	$self->activate_recursive;
2606		2556
2607	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2557	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2608	$self->enter_map ($map, $x, $y);	2558	$self->enter_map ($map, $x, $y);
		2559
		2560	# only activate afterwards, to support waiting in hooks
		2561	$self->activate_recursive;
2609	}	2562	}
2610		2563
2611	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2564	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2612		2565
2613	Moves the player to the given map-path and coordinates by first freezing	2566	Moves the player to the given map-path and coordinates by first freezing
…		…
2772	$self->contr->savebed ($map, $x, $y)	2725	$self->contr->savebed ($map, $x, $y)
2773	if $exit->flag (cf::FLAG_DAMNED);	2726	if $exit->flag (cf::FLAG_DAMNED);
2774		2727
2775	1	2728	1
2776	}) {	2729	}) {
2777	$self->message ("Something went wrong deep within the crossfire server. "	2730	$self->message ("Something went wrong deep within the deliantra server. "
2778	. "I'll try to bring you back to the map you were before. "	2731	. "I'll try to bring you back to the map you were before. "
2779	. "Please report this to the dungeon master!",	2732	. "Please report this to the dungeon master!",
2780	cf::NDI_UNIQUE \| cf::NDI_RED);	2733	cf::NDI_UNIQUE \| cf::NDI_RED);
2781		2734
2782	warn "ERROR in enter_exit: $@";	2735	warn "ERROR in enter_exit: $@";
…		…
2812		2765
2813	=cut	2766	=cut
2814		2767
2815	# non-persistent channels (usually the info channel)	2768	# non-persistent channels (usually the info channel)
2816	our %CHANNEL = (	2769	our %CHANNEL = (
		2770	"c/motd" => {
		2771	id => "infobox",
		2772	title => "MOTD",
		2773	reply => undef,
		2774	tooltip => "The message of the day",
		2775	},
2817	"c/identify" => {	2776	"c/identify" => {
2818	id => "infobox",	2777	id => "infobox",
2819	title => "Identify",	2778	title => "Identify",
2820	reply => undef,	2779	reply => undef,
2821	tooltip => "Items recently identified",	2780	tooltip => "Items recently identified",
…		…
2848	id => "infobox",	2807	id => "infobox",
2849	title => "Body Parts",	2808	title => "Body Parts",
2850	reply => undef,	2809	reply => undef,
2851	tooltip => "Shows which body parts you posess and are available",	2810	tooltip => "Shows which body parts you posess and are available",
2852	},	2811	},
		2812	"c/statistics" => {
		2813	id => "infobox",
		2814	title => "Statistics",
		2815	reply => undef,
		2816	tooltip => "Shows your primary statistics",
		2817	},
		2818	"c/skills" => {
		2819	id => "infobox",
		2820	title => "Skills",
		2821	reply => undef,
		2822	tooltip => "Shows your experience per skill and item power",
		2823	},
		2824	"c/shopitems" => {
		2825	id => "infobox",
		2826	title => "Shop Items",
		2827	reply => undef,
		2828	tooltip => "Shows the items currently for sale in this shop",
		2829	},
		2830	"c/resistances" => {
		2831	id => "infobox",
		2832	title => "Resistances",
		2833	reply => undef,
		2834	tooltip => "Shows your resistances",
		2835	},
		2836	"c/pets" => {
		2837	id => "infobox",
		2838	title => "Pets",
		2839	reply => undef,
		2840	tooltip => "Shows information abotu your pets/a specific pet",
		2841	},
		2842	"c/perceiveself" => {
		2843	id => "infobox",
		2844	title => "Perceive Self",
		2845	reply => undef,
		2846	tooltip => "You gained detailed knowledge about yourself",
		2847	},
2853	"c/uptime" => {	2848	"c/uptime" => {
2854	id => "infobox",	2849	id => "infobox",
2855	title => "Uptime",	2850	title => "Uptime",
2856	reply => undef,	2851	reply => undef,
2857	tooltip => "How long the server has been running since last restart",	2852	tooltip => "How long the server has been running since last restart",
…		…
2866	id => "party",	2861	id => "party",
2867	title => "Party",	2862	title => "Party",
2868	reply => "gsay ",	2863	reply => "gsay ",
2869	tooltip => "Messages and chat related to your party",	2864	tooltip => "Messages and chat related to your party",
2870	},	2865	},
		2866	"c/death" => {
		2867	id => "death",
		2868	title => "Death",
		2869	reply => undef,
		2870	tooltip => "Reason for and more info about your most recent death",
		2871	},
		2872	"c/say" => $SAY_CHANNEL,
		2873	"c/chat" => $CHAT_CHANNEL,
2871	);	2874	);
2872		2875
2873	sub cf::client::send_msg {	2876	sub cf::client::send_msg {
2874	my ($self, $channel, $msg, $color, @extra) = @_;	2877	my ($self, $channel, $msg, $color, @extra) = @_;
2875		2878
2876	$msg = $self->pl->expand_cfpod ($msg);	2879	$msg = $self->pl->expand_cfpod ($msg)
		2880	unless $color & cf::NDI_VERBATIM;
2877		2881
2878	$color &= cf::NDI_CLIENT_MASK; # just in case...	2882	$color &= cf::NDI_CLIENT_MASK; # just in case...
2879		2883
2880	# check predefined channels, for the benefit of C	2884	# check predefined channels, for the benefit of C
2881	if ($CHANNEL{$channel}) {	2885	if ($CHANNEL{$channel}) {
2882	$channel = $CHANNEL{$channel};	2886	$channel = $CHANNEL{$channel};
2883		2887
2884	$self->ext_msg (channel_info => $channel)	2888	$self->ext_msg (channel_info => $channel);
2885	if $self->can_msg;
2886
2887	$channel = $channel->{id};	2889	$channel = $channel->{id};
2888		2890
2889	} elsif (ref $channel) {	2891	} elsif (ref $channel) {
2890	# send meta info to client, if not yet sent	2892	# send meta info to client, if not yet sent
2891	unless (exists $self->{channel}{$channel->{id}}) {	2893	unless (exists $self->{channel}{$channel->{id}}) {
2892	$self->{channel}{$channel->{id}} = $channel;	2894	$self->{channel}{$channel->{id}} = $channel;
2893	$self->ext_msg (channel_info => $channel)	2895	$self->ext_msg (channel_info => $channel);
2894	if $self->can_msg;
2895	}	2896	}
2896		2897
2897	$channel = $channel->{id};	2898	$channel = $channel->{id};
2898	}	2899	}
2899		2900
2900	return unless @extra \|\| length $msg;	2901	return unless @extra \|\| length $msg;
2901		2902
2902	if ($self->can_msg) {
2903	# default colour, mask it out	2903	# default colour, mask it out
2904	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)	2904	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)
2905	if $color & cf::NDI_DEF;	2905	if $color & cf::NDI_DEF;
2906		2906
2907	$self->send_packet ("msg " . $self->{json_coder}->encode (	2907	my $pkt = "msg "
		2908	. $self->{json_coder}->encode (
2908	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));	2909	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2909	} else {	2910	);
2910	if ($color >= 0) {
2911	# replace some tags by gcfclient-compatible ones
2912	for ($msg) {
2913	1 while
2914	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2915	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2916	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2917	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2918	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2919	}
2920		2911
2921	$color &= cf::NDI_COLOR_MASK;	2912	# try lzf for large packets
		2913	$pkt = "lzf " . Compress::LZF::compress $pkt
		2914	if 1024 <= length $pkt and $self->{can_lzf};
2922		2915
2923	utf8::encode $msg;	2916	# split very large packets
2924		2917	if (8192 < length $pkt and $self->{can_lzf}) {
2925	if (0 && $msg =~ /\[/) {	2918	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2926	# COMMAND/INFO	2919	$pkt = "frag";
2927	$self->send_packet ("drawextinfo $color 10 8 $msg")
2928	} else {
2929	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
2930	$self->send_packet ("drawinfo $color $msg")
2931	}
2932	}
2933	}	2920	}
		2921
		2922	$self->send_packet ($pkt);
2934	}	2923	}
2935		2924
2936	=item $client->ext_msg ($type, @msg)	2925	=item $client->ext_msg ($type, @msg)
2937		2926
2938	Sends an ext event to the client.	2927	Sends an ext event to the client.
…		…
3113	The following functions and methods are available within a safe environment:	3102	The following functions and methods are available within a safe environment:
3114		3103
3115	cf::object	3104	cf::object
3116	contr pay_amount pay_player map x y force_find force_add destroy	3105	contr pay_amount pay_player map x y force_find force_add destroy
3117	insert remove name archname title slaying race decrease split	3106	insert remove name archname title slaying race decrease split
		3107	value
3118		3108
3119	cf::object::player	3109	cf::object::player
3120	player	3110	player
3121		3111
3122	cf::player	3112	cf::player
…		…
3128	=cut	3118	=cut
3129		3119
3130	for (	3120	for (
3131	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	3121	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3132	insert remove inv nrof name archname title slaying race	3122	insert remove inv nrof name archname title slaying race
3133	decrease split destroy)],	3123	decrease split destroy change_exp value msg lore send_msg)],
3134	["cf::object::player" => qw(player)],	3124	["cf::object::player" => qw(player)],
3135	["cf::player" => qw(peaceful)],	3125	["cf::player" => qw(peaceful send_msg)],
3136	["cf::map" => qw(trigger)],	3126	["cf::map" => qw(trigger)],
3137	) {	3127	) {
3138	no strict 'refs';	3128	no strict 'refs';
3139	my ($pkg, @funs) = @$_;	3129	my ($pkg, @funs) = @$_;
3140	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3130	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
…		…
3157	my ($code, %vars) = @_;	3147	my ($code, %vars) = @_;
3158		3148
3159	my $qcode = $code;	3149	my $qcode = $code;
3160	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3150	$qcode =~ s/"/‟/g; # not allowed in #line filenames
3161	$qcode =~ s/\n/\\n/g;	3151	$qcode =~ s/\n/\\n/g;
		3152
		3153	%vars = (_dummy => 0) unless %vars;
3162		3154
3163	local $_;	3155	local $_;
3164	local @safe::cf::_safe_eval_args = values %vars;	3156	local @safe::cf::_safe_eval_args = values %vars;
3165		3157
3166	my $eval =	3158	my $eval =
…		…
3396	reload_treasures;	3388	reload_treasures;
3397		3389
3398	warn "finished reloading resource files\n";	3390	warn "finished reloading resource files\n";
3399	}	3391	}
3400		3392
3401	sub init {
3402	my $guard = freeze_mainloop;
3403
3404	evthread_start IO::AIO::poll_fileno;
3405
3406	reload_resources;
3407	}
3408
3409	sub reload_config {	3393	sub reload_config {
		3394	warn "reloading config file...\n";
		3395
3410	open my $fh, "<:utf8", "$CONFDIR/config"	3396	open my $fh, "<:utf8", "$CONFDIR/config"
3411	or return;	3397	or return;
3412		3398
3413	local $/;	3399	local $/;
3414	*CFG = YAML::Load <$fh>;	3400	*CFG = YAML::XS::Load scalar <$fh>;
3415		3401
3416	$EMERGENCY_POSITION = $CFG{emergency_position} \|\| ["/world/world_105_115", 5, 37];	3402	$EMERGENCY_POSITION = $CFG{emergency_position} \|\| ["/world/world_105_115", 5, 37];
3417		3403
3418	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3404	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3419	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3405	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
3423	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3409	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3424	and die "WARNING: m(un)lockall failed: $!\n";	3410	and die "WARNING: m(un)lockall failed: $!\n";
3425	};	3411	};
3426	warn $@ if $@;	3412	warn $@ if $@;
3427	}	3413	}
		3414
		3415	warn "finished reloading resource files\n";
		3416	}
		3417
		3418	sub pidfile() {
		3419	sysopen my $fh, $PIDFILE, O_RDWR \| O_CREAT
		3420	or die "$PIDFILE: $!";
		3421	flock $fh, &Fcntl::LOCK_EX
		3422	or die "$PIDFILE: flock: $!";
		3423	$fh
		3424	}
		3425
		3426	# make sure only one server instance is running at any one time
		3427	sub atomic {
		3428	my $fh = pidfile;
		3429
		3430	my $pid = <$fh>;
		3431	kill 9, $pid if $pid > 0;
		3432
		3433	seek $fh, 0, 0;
		3434	print $fh $$;
		3435	}
		3436
		3437	sub main_loop {
		3438	warn "EV::loop starting\n";
		3439	if (1) {
		3440	EV::loop;
		3441	}
		3442	warn "EV::loop returned\n";
		3443	goto &main_loop unless $REALLY_UNLOOP;
3428	}	3444	}
3429		3445
3430	sub main {	3446	sub main {
		3447	cf::init_globals; # initialise logging
		3448
		3449	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
		3450	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
		3451	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
		3452	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
		3453
		3454	cf::init_experience;
		3455	cf::init_anim;
		3456	cf::init_attackmess;
		3457	cf::init_dynamic;
		3458
		3459	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
		3460
3431	# we must not ever block the main coroutine	3461	# we must not ever block the main coroutine
3432	local $Coro::idle = sub {	3462	local $Coro::idle = sub {
3433	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3463	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3434	(async {	3464	(async {
3435	$Coro::current->{desc} = "IDLE BUG HANDLER";	3465	$Coro::current->{desc} = "IDLE BUG HANDLER";
3436	EV::loop EV::LOOP_ONESHOT;	3466	EV::loop EV::LOOP_ONESHOT;
3437	})->prio (Coro::PRIO_MAX);	3467	})->prio (Coro::PRIO_MAX);
3438	};	3468	};
3439		3469
3440	{	3470	evthread_start IO::AIO::poll_fileno;
3441	my $guard = freeze_mainloop;	3471
		3472	cf::sync_job {
		3473	reload_resources;
3442	reload_config;	3474	reload_config;
3443	db_init;	3475	db_init;
		3476
		3477	cf::load_settings;
		3478	cf::load_materials;
		3479	cf::init_uuid;
		3480	cf::init_signals;
		3481	cf::init_commands;
		3482	cf::init_skills;
		3483
		3484	cf::init_beforeplay;
		3485
		3486	atomic;
		3487
3444	load_extensions;	3488	load_extensions;
3445		3489
3446	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3490	utime time, time, $RUNTIMEFILE;
		3491
		3492	# no (long-running) fork's whatsoever before this point(!)
		3493	use POSIX ();
		3494	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
		3495
		3496	(pop @POST_INIT)->(0) while @POST_INIT;
3447	}	3497	};
3448		3498
3449	EV::loop;	3499	main_loop;
3450	}	3500	}
3451		3501
3452	#############################################################################	3502	#############################################################################
3453	# initialisation and cleanup	3503	# initialisation and cleanup
3454		3504
…		…
3461	};	3511	};
3462	}	3512	}
3463	}	3513	}
3464		3514
3465	sub write_runtime_sync {	3515	sub write_runtime_sync {
3466	my $runtime = "$LOCALDIR/runtime";
3467
3468	# first touch the runtime file to show we are still running:	3516	# first touch the runtime file to show we are still running:
3469	# the fsync below can take a very very long time.	3517	# the fsync below can take a very very long time.
3470		3518
3471	IO::AIO::aio_utime $runtime, undef, undef;	3519	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3472		3520
3473	my $guard = cf::lock_acquire "write_runtime";	3521	my $guard = cf::lock_acquire "write_runtime";
3474		3522
3475	my $fh = aio_open "$runtime~", O_WRONLY \| O_CREAT, 0644	3523	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY \| O_CREAT, 0644
3476	or return;	3524	or return;
3477		3525
3478	my $value = $cf::RUNTIME + 90 + 10;	3526	my $value = $cf::RUNTIME + 90 + 10;
3479	# 10 is the runtime save interval, for a monotonic clock	3527	# 10 is the runtime save interval, for a monotonic clock
3480	# 60 allows for the watchdog to kill the server.	3528	# 60 allows for the watchdog to kill the server.
…		…
3490	aio_utime $fh, undef, undef;	3538	aio_utime $fh, undef, undef;
3491		3539
3492	close $fh	3540	close $fh
3493	or return;	3541	or return;
3494		3542
3495	aio_rename "$runtime~", $runtime	3543	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3496	and return;	3544	and return;
3497		3545
3498	warn "runtime file written.\n";	3546	warn "runtime file written.\n";
3499		3547
3500	1	3548	1
…		…
3512	my $uuid = "$LOCALDIR/uuid";	3560	my $uuid = "$LOCALDIR/uuid";
3513		3561
3514	my $fh = aio_open "$uuid~", O_WRONLY \| O_CREAT, 0644	3562	my $fh = aio_open "$uuid~", O_WRONLY \| O_CREAT, 0644
3515	or return;	3563	or return;
3516		3564
3517	my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;	3565	my $value = uuid_seq uuid_cur;
		3566
		3567	unless ($value) {
		3568	warn "cowardly refusing to write zero uuid value!\n";
		3569	return;
		3570	}
		3571
		3572	my $value = uuid_str $value + $uuid_skip;
3518	$uuid_skip = 0;	3573	$uuid_skip = 0;
3519		3574
3520	(aio_write $fh, 0, (length $value), $value, 0) <= 0	3575	(aio_write $fh, 0, (length $value), $value, 0) <= 0
3521	and return;	3576	and return;
3522		3577
…		…
3544	}	3599	}
3545		3600
3546	sub emergency_save() {	3601	sub emergency_save() {
3547	my $freeze_guard = cf::freeze_mainloop;	3602	my $freeze_guard = cf::freeze_mainloop;
3548		3603
3549	warn "enter emergency perl save\n";	3604	warn "emergency_perl_save: enter\n";
3550		3605
3551	cf::sync_job {	3606	cf::sync_job {
		3607	# this is a trade-off: we want to be very quick here, so
		3608	# save all maps without fsync, and later call a global sync
		3609	# (which in turn might be very very slow)
		3610	local $USE_FSYNC = 0;
		3611
3552	# use a peculiar iteration method to avoid tripping on perl	3612	# use a peculiar iteration method to avoid tripping on perl
3553	# refcount bugs in for. also avoids problems with players	3613	# refcount bugs in for. also avoids problems with players
3554	# and maps saved/destroyed asynchronously.	3614	# and maps saved/destroyed asynchronously.
3555	warn "begin emergency player save\n";	3615	warn "emergency_perl_save: begin player save\n";
3556	for my $login (keys %cf::PLAYER) {	3616	for my $login (keys %cf::PLAYER) {
3557	my $pl = $cf::PLAYER{$login} or next;	3617	my $pl = $cf::PLAYER{$login} or next;
3558	$pl->valid or next;	3618	$pl->valid or next;
3559	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3619	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3560	$pl->save;	3620	$pl->save;
3561	}	3621	}
3562	warn "end emergency player save\n";	3622	warn "emergency_perl_save: end player save\n";
3563		3623
3564	warn "begin emergency map save\n";	3624	warn "emergency_perl_save: begin map save\n";
3565	for my $path (keys %cf::MAP) {	3625	for my $path (keys %cf::MAP) {
3566	my $map = $cf::MAP{$path} or next;	3626	my $map = $cf::MAP{$path} or next;
3567	$map->valid or next;	3627	$map->valid or next;
3568	$map->save;	3628	$map->save;
3569	}	3629	}
3570	warn "end emergency map save\n";	3630	warn "emergency_perl_save: end map save\n";
3571		3631
3572	warn "begin emergency database checkpoint\n";	3632	warn "emergency_perl_save: begin database checkpoint\n";
3573	BDB::db_env_txn_checkpoint $DB_ENV;	3633	BDB::db_env_txn_checkpoint $DB_ENV;
3574	warn "end emergency database checkpoint\n";	3634	warn "emergency_perl_save: end database checkpoint\n";
3575		3635
3576	warn "begin write uuid\n";	3636	warn "emergency_perl_save: begin write uuid\n";
3577	write_uuid_sync 1;	3637	write_uuid_sync 1;
3578	warn "end write uuid\n";	3638	warn "emergency_perl_save: end write uuid\n";
3579	};	3639	};
3580		3640
		3641	warn "emergency_perl_save: starting sync()\n";
		3642	IO::AIO::aio_sync sub {
		3643	warn "emergency_perl_save: finished sync()\n";
		3644	};
		3645
3581	warn "leave emergency perl save\n";	3646	warn "emergency_perl_save: leave\n";
3582	}	3647	}
3583		3648
3584	sub post_cleanup {	3649	sub post_cleanup {
3585	my ($make_core) = @_;	3650	my ($make_core) = @_;
3586		3651
3587	warn Carp::longmess "post_cleanup backtrace"	3652	warn Carp::longmess "post_cleanup backtrace"
3588	if $make_core;	3653	if $make_core;
		3654
		3655	my $fh = pidfile;
		3656	unlink $PIDFILE if <$fh> == $$;
		3657	}
		3658
		3659	# a safer delete_package, copied from Symbol
		3660	sub clear_package($) {
		3661	my $pkg = shift;
		3662
		3663	# expand to full symbol table name if needed
		3664	unless ($pkg =~ /^main::.*::$/) {
		3665	$pkg = "main$pkg" if $pkg =~ /^::/;
		3666	$pkg = "main::$pkg" unless $pkg =~ /^main::/;
		3667	$pkg .= '::' unless $pkg =~ /::$/;
		3668	}
		3669
		3670	my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
		3671	my $stem_symtab = *{$stem}{HASH};
		3672
		3673	defined $stem_symtab and exists $stem_symtab->{$leaf}
		3674	or return;
		3675
		3676	# clear all symbols
		3677	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
		3678	for my $name (keys %$leaf_symtab) {
		3679	_gv_clear *{"$pkg$name"};
		3680	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
		3681	}
		3682	warn "cleared package $pkg\n";#d#
3589	}	3683	}
3590		3684
3591	sub do_reload_perl() {	3685	sub do_reload_perl() {
3592	# can/must only be called in main	3686	# can/must only be called in main
3593	if ($Coro::current != $Coro::main) {	3687	if ($Coro::current != $Coro::main) {
3594	warn "can only reload from main coroutine";	3688	warn "can only reload from main coroutine";
3595	return;	3689	return;
3596	}	3690	}
3597		3691
		3692	return if $RELOAD++;
		3693
		3694	my $t1 = EV::time;
		3695
		3696	while ($RELOAD) {
3598	warn "reloading...";	3697	warn "reloading...";
3599		3698
3600	warn "entering sync_job";	3699	warn "entering sync_job";
3601		3700
3602	cf::sync_job {	3701	cf::sync_job {
3603	cf::write_runtime_sync; # external watchdog should not bark	3702	cf::write_runtime_sync; # external watchdog should not bark
3604	cf::emergency_save;	3703	cf::emergency_save;
3605	cf::write_runtime_sync; # external watchdog should not bark	3704	cf::write_runtime_sync; # external watchdog should not bark
3606		3705
3607	warn "syncing database to disk";	3706	warn "syncing database to disk";
3608	BDB::db_env_txn_checkpoint $DB_ENV;	3707	BDB::db_env_txn_checkpoint $DB_ENV;
3609		3708
3610	# if anything goes wrong in here, we should simply crash as we already saved	3709	# if anything goes wrong in here, we should simply crash as we already saved
3611		3710
3612	warn "flushing outstanding aio requests";	3711	warn "flushing outstanding aio requests";
3613	for (;;) {
3614	BDB::flush;
3615	IO::AIO::flush;
3616	Coro::cede_notself;
3617	last unless IO::AIO::nreqs \|\| BDB::nreqs;	3712	while (IO::AIO::nreqs \|\| BDB::nreqs) {
3618	warn "iterate...";	3713	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3619	}
3620
3621	++$RELOAD;
3622
3623	warn "cancelling all extension coros";
3624	$_->cancel for values %EXT_CORO;
3625	%EXT_CORO = ();
3626
3627	warn "removing commands";
3628	%COMMAND = ();
3629
3630	warn "removing ext/exti commands";
3631	%EXTCMD = ();
3632	%EXTICMD = ();
3633
3634	warn "unloading/nuking all extensions";
3635	for my $pkg (@EXTS) {
3636	warn "... unloading $pkg";
3637
3638	if (my $cb = $pkg->can ("unload")) {
3639	eval {
3640	$cb->($pkg);
3641	1
3642	} or warn "$pkg unloaded, but with errors: $@";
3643	}	3714	}
3644		3715
3645	warn "... nuking $pkg";	3716	warn "cancelling all extension coros";
3646	Symbol::delete_package $pkg;	3717	$_->cancel for values %EXT_CORO;
3647	}	3718	%EXT_CORO = ();
3648		3719
3649	warn "unloading all perl modules loaded from $LIBDIR";	3720	warn "removing commands";
3650	while (my ($k, $v) = each %INC) {	3721	%COMMAND = ();
3651	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3652		3722
		3723	warn "removing ext/exti commands";
		3724	%EXTCMD = ();
		3725	%EXTICMD = ();
		3726
		3727	warn "unloading/nuking all extensions";
		3728	for my $pkg (@EXTS) {
3653	warn "... unloading $k";	3729	warn "... unloading $pkg";
3654	delete $INC{$k};
3655		3730
3656	$k =~ s/\.pm$//;
3657	$k =~ s/\//::/g;
3658
3659	if (my $cb = $k->can ("unload_module")) {	3731	if (my $cb = $pkg->can ("unload")) {
		3732	eval {
3660	$cb->();	3733	$cb->($pkg);
		3734	1
		3735	} or warn "$pkg unloaded, but with errors: $@";
		3736	}
		3737
		3738	warn "... clearing $pkg";
		3739	clear_package $pkg;
3661	}	3740	}
3662		3741
3663	Symbol::delete_package $k;	3742	warn "unloading all perl modules loaded from $LIBDIR";
		3743	while (my ($k, $v) = each %INC) {
		3744	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
		3745
		3746	warn "... unloading $k";
		3747	delete $INC{$k};
		3748
		3749	$k =~ s/\.pm$//;
		3750	$k =~ s/\//::/g;
		3751
		3752	if (my $cb = $k->can ("unload_module")) {
		3753	$cb->();
		3754	}
		3755
		3756	clear_package $k;
3664	}	3757	}
3665		3758
3666	warn "getting rid of safe::, as good as possible";	3759	warn "getting rid of safe::, as good as possible";
3667	Symbol::delete_package "safe::$_"	3760	clear_package "safe::$_"
3668	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	3761	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3669		3762
3670	warn "unloading cf.pm \"a bit\"";	3763	warn "unloading cf.pm \"a bit\"";
3671	delete $INC{"cf.pm"};	3764	delete $INC{"cf.pm"};
3672	delete $INC{"cf/pod.pm"};	3765	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3673		3766
3674	# don't, removes xs symbols, too,	3767	# don't, removes xs symbols, too,
3675	# and global variables created in xs	3768	# and global variables created in xs
3676	#Symbol::delete_package __PACKAGE__;	3769	#clear_package __PACKAGE__;
3677		3770
3678	warn "unload completed, starting to reload now";	3771	warn "unload completed, starting to reload now";
3679		3772
3680	warn "reloading cf.pm";	3773	warn "reloading cf.pm";
3681	require cf;	3774	require cf;
3682	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3775	cf::_connect_to_perl_1;
3683		3776
3684	warn "loading config and database again";	3777	warn "loading config and database again";
3685	cf::reload_config;	3778	cf::reload_config;
3686		3779
3687	warn "loading extensions";	3780	warn "loading extensions";
3688	cf::load_extensions;	3781	cf::load_extensions;
3689		3782
		3783	if ($REATTACH_ON_RELOAD) {
3690	warn "reattaching attachments to objects/players";	3784	warn "reattaching attachments to objects/players";
3691	_global_reattach; # objects, sockets	3785	_global_reattach; # objects, sockets
3692	warn "reattaching attachments to maps";	3786	warn "reattaching attachments to maps";
3693	reattach $_ for values %MAP;	3787	reattach $_ for values %MAP;
3694	warn "reattaching attachments to players";	3788	warn "reattaching attachments to players";
3695	reattach $_ for values %PLAYER;	3789	reattach $_ for values %PLAYER;
		3790	}
3696		3791
		3792	warn "running post_init jobs";
		3793	(pop @POST_INIT)->(1) while @POST_INIT;
		3794
3697	warn "leaving sync_job";	3795	warn "leaving sync_job";
3698		3796
3699	1	3797	1
3700	} or do {	3798	} or do {
3701	warn $@;	3799	warn $@;
3702	cf::cleanup "error while reloading, exiting.";	3800	cf::cleanup "error while reloading, exiting.";
3703	};	3801	};
3704		3802
3705	warn "reloaded";	3803	warn "reloaded";
		3804	--$RELOAD;
		3805	}
		3806
		3807	$t1 = EV::time - $t1;
		3808	warn "reload completed in ${t1}s\n";
3706	};	3809	};
3707		3810
3708	our $RELOAD_WATCHER; # used only during reload	3811	our $RELOAD_WATCHER; # used only during reload
3709		3812
3710	sub reload_perl() {	3813	sub reload_perl() {
3711	# doing reload synchronously and two reloads happen back-to-back,	3814	# doing reload synchronously and two reloads happen back-to-back,
3712	# coro crashes during coro_state_free->destroy here.	3815	# coro crashes during coro_state_free->destroy here.
3713		3816
		3817	$RELOAD_WATCHER \|\|= cf::async {
		3818	Coro::AIO::aio_wait cache_extensions;
		3819
3714	$RELOAD_WATCHER \|\|= EV::timer 0, 0, sub {	3820	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3715	do_reload_perl;	3821	do_reload_perl;
3716	undef $RELOAD_WATCHER;	3822	undef $RELOAD_WATCHER;
		3823	};
3717	};	3824	};
3718	}	3825	}
3719		3826
3720	register_command "reload" => sub {	3827	register_command "reload" => sub {
3721	my ($who, $arg) = @_;	3828	my ($who, $arg) = @_;
…		…
3847	$msg =~ s/\n//;	3954	$msg =~ s/\n//;
3848		3955
3849	# limit the # of concurrent backtraces	3956	# limit the # of concurrent backtraces
3850	if ($_log_backtrace < 2) {	3957	if ($_log_backtrace < 2) {
3851	++$_log_backtrace;	3958	++$_log_backtrace;
		3959	my $perl_bt = Carp::longmess $msg;
3852	async {	3960	async {
3853	$Coro::current->{desc} = "abt $msg";	3961	$Coro::current->{desc} = "abt $msg";
3854		3962
3855	my @bt = fork_call {	3963	my @bt = fork_call {
3856	@addr = map { sprintf "%x", $_ } @addr;	3964	@addr = map { sprintf "%x", $_ } @addr;
…		…
3867	}	3975	}
3868		3976
3869	@funcs	3977	@funcs
3870	};	3978	};
3871		3979
3872	LOG llevInfo, "[ABT] $msg\n";	3980	LOG llevInfo, "[ABT] $perl_bt\n";
		3981	LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3873	LOG llevInfo, "[ABT] $_\n" for @bt;	3982	LOG llevInfo, "[ABT] $_\n" for @bt;
3874	--$_log_backtrace;	3983	--$_log_backtrace;
3875	};	3984	};
3876	} else {	3985	} else {
3877	LOG llevInfo, "[ABT] $msg\n";	3986	LOG llevInfo, "[ABT] $msg\n";
3878	LOG llevInfo, "[ABT] [suppressed]\n";	3987	LOG llevInfo, "[ABT] [suppressed]\n";
3879	}	3988	}
3880	}	3989	}
3881		3990
3882	# load additional modules	3991	# load additional modules
3883	use cf::pod;	3992	require "cf/$_.pm" for @EXTRA_MODULES;
		3993	cf::_connect_to_perl_2;
3884		3994
3885	END { cf::emergency_save }	3995	END { cf::emergency_save }
3886		3996
3887	1	3997	1
3888		3998

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.437 by root, Tue Jul 8 08:33:27 2008 UTC vs. Revision 1.486 by root, Thu Oct 15 21:56:50 2009 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.437 by root, Tue Jul 8 08:33:27 2008 UTC vs.
Revision 1.486 by root, Thu Oct 15 21:56:50 2009 UTC