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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.442 by root, Sun Aug 31 09:03:31 2008 UTC vs.
Revision 1.494 by root, Mon Oct 26 05:18:00 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
24	use 5.10.0;	25	use 5.10.0;
25	use utf8;	26	use utf8;
26	use strict "vars", "subs";	27	use strict qw(vars subs);
27		28
28	use Symbol;	29	use Symbol;
29	use List::Util;	30	use List::Util;
30	use Socket;	31	use Socket;
31	use EV;	32	use EV;
32	use Opcode;	33	use Opcode;
33	use Safe;	34	use Safe;
34	use Safe::Hole;	35	use Safe::Hole;
35	use Storable ();	36	use Storable ();
		37	use Carp ();
36		38
		39	use Guard ();
37	use Coro ();	40	use Coro ();
38	use Coro::State;	41	use Coro::State;
39	use Coro::Handle;	42	use Coro::Handle;
40	use Coro::EV;	43	use Coro::EV;
41	use Coro::AnyEvent;	44	use Coro::AnyEvent;
42	use Coro::Timer;	45	use Coro::Timer;
43	use Coro::Signal;	46	use Coro::Signal;
44	use Coro::Semaphore;	47	use Coro::Semaphore;
		48	use Coro::SemaphoreSet;
45	use Coro::AnyEvent;	49	use Coro::AnyEvent;
46	use Coro::AIO;	50	use Coro::AIO;
47	use Coro::BDB 1.6;	51	use Coro::BDB 1.6;
48	use Coro::Storable;	52	use Coro::Storable;
49	use Coro::Util ();	53	use Coro::Util ();
51	use JSON::XS 2.01 ();	55	use JSON::XS 2.01 ();
52	use BDB ();	56	use BDB ();
53	use Data::Dumper;	57	use Data::Dumper;
54	use Digest::MD5;	58	use Digest::MD5;
55	use Fcntl;	59	use Fcntl;
56	use YAML ();	60	use YAML::XS ();
57	use IO::AIO ();	61	use IO::AIO ();
58	use Time::HiRes;	62	use Time::HiRes;
59	use Compress::LZF;	63	use Compress::LZF;
60	use Digest::MD5 ();	64	use Digest::MD5 ();
61		65
…		…
63		67
64	# configure various modules to our taste	68	# configure various modules to our taste
65	#	69	#
66	$Storable::canonical = 1; # reduce rsync transfers	70	$Storable::canonical = 1; # reduce rsync transfers
67	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator	71	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
		72
		73	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
		74
		75	# make sure c-lzf reinitialises itself
		76	Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
68	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later	77	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
69		78
70	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority	79	# strictly for debugging
		80	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
71		81
72	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	82	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
73		83
74	our %COMMAND = ();	84	our %COMMAND = ();
75	our %COMMAND_TIME = ();	85	our %COMMAND_TIME = ();
…		…
78	our %EXTCMD = ();	88	our %EXTCMD = ();
79	our %EXTICMD = ();	89	our %EXTICMD = ();
80	our %EXT_CORO = (); # coroutines bound to extensions	90	our %EXT_CORO = (); # coroutines bound to extensions
81	our %EXT_MAP = (); # pluggable maps	91	our %EXT_MAP = (); # pluggable maps
82		92
83	our $RELOAD; # number of reloads so far	93	our $RELOAD; # number of reloads so far, non-zero while in reload
84	our @EVENT;	94	our @EVENT;
		95	our @REFLECT; # set by XS
		96	our %REFLECT; # set by us
85		97
86	our $CONFDIR = confdir;	98	our $CONFDIR = confdir;
87	our $DATADIR = datadir;	99	our $DATADIR = datadir;
88	our $LIBDIR = "$DATADIR/ext";	100	our $LIBDIR = "$DATADIR/ext";
89	our $PODDIR = "$DATADIR/pod";	101	our $PODDIR = "$DATADIR/pod";
90	our $MAPDIR = "$DATADIR/" . mapdir;	102	our $MAPDIR = "$DATADIR/" . mapdir;
91	our $LOCALDIR = localdir;	103	our $LOCALDIR = localdir;
92	our $TMPDIR = "$LOCALDIR/" . tmpdir;	104	our $TMPDIR = "$LOCALDIR/" . tmpdir;
93	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	105	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
94	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	106	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
95	our $RANDOMDIR = "$LOCALDIR/random";	107	our $RANDOMDIR = "$LOCALDIR/random";
96	our $BDBDIR = "$LOCALDIR/db";	108	our $BDBDIR = "$LOCALDIR/db";
		109	our $PIDFILE = "$LOCALDIR/pid";
		110	our $RUNTIMEFILE = "$LOCALDIR/runtime";
		111
97	our %RESOURCE;	112	our %RESOURCE;
98		113
99	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	114	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
100	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	115	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
101	our $NEXT_TICK;	116	our $NEXT_TICK;
102	our $USE_FSYNC = 1; # use fsync to write maps - default off	117	our $USE_FSYNC = 1; # use fsync to write maps - default on
103		118
104	our $BDB_DEADLOCK_WATCHER;	119	our $BDB_DEADLOCK_WATCHER;
105	our $BDB_CHECKPOINT_WATCHER;	120	our $BDB_CHECKPOINT_WATCHER;
106	our $BDB_TRICKLE_WATCHER;	121	our $BDB_TRICKLE_WATCHER;
107	our $DB_ENV;	122	our $DB_ENV;
108		123
		124	our @EXTRA_MODULES = qw(pod match mapscript);
		125
109	our %CFG;	126	our %CFG;
110		127
111	our $UPTIME; $UPTIME \|\|= time;	128	our $UPTIME; $UPTIME \|\|= time;
112	our $RUNTIME;	129	our $RUNTIME;
113	our $NOW;	130	our $NOW;
…		…
122	our $LOAD; # a number between 0 (idle) and 1 (too many objects)	139	our $LOAD; # a number between 0 (idle) and 1 (too many objects)
123	our $LOADAVG; # same thing, but with alpha-smoothing	140	our $LOADAVG; # same thing, but with alpha-smoothing
124	our $JITTER; # average jitter	141	our $JITTER; # average jitter
125	our $TICK_START; # for load detecting purposes	142	our $TICK_START; # for load detecting purposes
126		143
		144	our @POST_INIT;
		145
		146	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
		147	our $REALLY_UNLOOP; # never set to true, please :)
		148
127	binmode STDOUT;	149	binmode STDOUT;
128	binmode STDERR;	150	binmode STDERR;
129		151
130	# read virtual server time, if available	152	# read virtual server time, if available
131	unless ($RUNTIME \|\| !-e "$LOCALDIR/runtime") {	153	unless ($RUNTIME \|\| !-e $RUNTIMEFILE) {
132	open my $fh, "<", "$LOCALDIR/runtime"	154	open my $fh, "<", $RUNTIMEFILE
133	or die "unable to read runtime file: $!";	155	or die "unable to read $RUNTIMEFILE file: $!";
134	$RUNTIME = <$fh> + 0.;	156	$RUNTIME = <$fh> + 0.;
135	}	157	}
		158
		159	eval "sub TICK() { $TICK } 1" or die;
136		160
137	mkdir $_	161	mkdir $_
138	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;	162	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
139		163
140	our $EMERGENCY_POSITION;	164	our $EMERGENCY_POSITION;
141		165
142	sub cf::map::normalise;	166	sub cf::map::normalise;
		167
		168	#############################################################################
		169
		170	%REFLECT = ();
		171	for (@REFLECT) {
		172	my $reflect = JSON::XS::decode_json $_;
		173	$REFLECT{$reflect->{class}} = $reflect;
		174	}
		175
		176	# this is decidedly evil
		177	$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
143		178
144	#############################################################################	179	#############################################################################
145		180
146	=head2 GLOBAL VARIABLES	181	=head2 GLOBAL VARIABLES
147		182
…		…
194	returns directly I<after> the tick processing (and consequently, can only wake one process	229	returns directly I<after> the tick processing (and consequently, can only wake one process
195	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	230	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
196		231
197	=item @cf::INVOKE_RESULTS	232	=item @cf::INVOKE_RESULTS
198		233
199	This array contains the results of the last C<invoke ()> call. When	234	This array contains the results of the last C<invoke ()> call. When
200	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of	235	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
201	that call.	236	that call.
202		237
		238	=item %cf::REFLECT
		239
		240	Contains, for each (C++) class name, a hash reference with information
		241	about object members (methods, scalars, arrays and flags) and other
		242	metadata, which is useful for introspection.
		243
203	=back	244	=back
204		245
205	=cut	246	=cut
206		247
207	BEGIN {	248	$Coro::State::WARNHOOK = sub {
208	*CORE::GLOBAL::warn = sub {
209	my $msg = join "", @_;	249	my $msg = join "", @_;
210		250
211	$msg .= "\n"	251	$msg .= "\n"
212	unless $msg =~ /\n$/;	252	unless $msg =~ /\n$/;
213		253
214	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	254	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
215		255
216	LOG llevError, $msg;	256	LOG llevError, $msg;
217	};	257	};
218	}
219		258
220	$Coro::State::DIEHOOK = sub {	259	$Coro::State::DIEHOOK = sub {
221	return unless $^S eq 0; # "eq", not "=="	260	return unless $^S eq 0; # "eq", not "=="
		261
		262	warn Carp::longmess $_[0];
222		263
223	if ($Coro::current == $Coro::main) {#d#	264	if ($Coro::current == $Coro::main) {#d#
224	warn "DIEHOOK called in main context, Coro bug?\n";#d#	265	warn "DIEHOOK called in main context, Coro bug?\n";#d#
225	return;#d#	266	return;#d#
226	}#d#	267	}#d#
227		268
228	# kill coroutine otherwise	269	# kill coroutine otherwise
229	warn Carp::longmess $_[0];
230	Coro::terminate	270	Coro::terminate
231	};	271	};
232
233	$SIG{__DIE__} = sub { }; #d#?
234		272
235	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	273	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
236	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	274	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
237	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	275	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
238	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	276	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
…		…
252	)) {	290	)) {
253	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	291	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
254	}	292	}
255		293
256	$EV::DIED = sub {	294	$EV::DIED = sub {
257	warn "error in event callback: @_";	295	Carp::cluck "error in event callback: @_";
258	};	296	};
259		297
260	#############################################################################	298	#############################################################################
261		299
262	=head2 UTILITY FUNCTIONS	300	=head2 UTILITY FUNCTIONS
…		…
299	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	337	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
300		338
301	sub encode_json($) { $json_coder->encode ($_[0]) }	339	sub encode_json($) { $json_coder->encode ($_[0]) }
302	sub decode_json($) { $json_coder->decode ($_[0]) }	340	sub decode_json($) { $json_coder->decode ($_[0]) }
303		341
		342	=item cf::post_init { BLOCK }
		343
		344	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
		345	but I<before> the server starts ticking again.
		346
		347	The cdoeblock will have a single boolean argument to indicate whether this
		348	is a reload or not.
		349
		350	=cut
		351
		352	sub post_init(&) {
		353	push @POST_INIT, shift;
		354	}
		355
304	=item cf::lock_wait $string	356	=item cf::lock_wait $string
305		357
306	Wait until the given lock is available. See cf::lock_acquire.	358	Wait until the given lock is available. See cf::lock_acquire.
307		359
308	=item my $lock = cf::lock_acquire $string	360	=item my $lock = cf::lock_acquire $string
309		361
310	Wait until the given lock is available and then acquires it and returns	362	Wait until the given lock is available and then acquires it and returns
311	a Coro::guard object. If the guard object gets destroyed (goes out of scope,	363	a L<Guard> object. If the guard object gets destroyed (goes out of scope,
312	for example when the coroutine gets canceled), the lock is automatically	364	for example when the coroutine gets canceled), the lock is automatically
313	returned.	365	returned.
314		366
315	Locks are not recursive, locking from the same coro twice results in a	367	Locks are not recursive, locking from the same coro twice results in a
316	deadlocked coro.	368	deadlocked coro.
…		…
322		374
323	Return true if the lock is currently active, i.e. somebody has locked it.	375	Return true if the lock is currently active, i.e. somebody has locked it.
324		376
325	=cut	377	=cut
326		378
327	our %LOCK;	379	our $LOCKS = new Coro::SemaphoreSet;
328	our %LOCKER;#d#
329		380
330	sub lock_wait($) {	381	sub lock_wait($) {
331	my ($key) = @_;	382	$LOCKS->wait ($_[0]);
332
333	if ($LOCKER{$key} == $Coro::current) {#d#
334	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
335	return;#d#
336	}#d#
337
338	# wait for lock, if any
339	while ($LOCK{$key}) {
340	push @{ $LOCK{$key} }, $Coro::current;
341	Coro::schedule;
342	}
343	}	383	}
344		384
345	sub lock_acquire($) {	385	sub lock_acquire($) {
346	my ($key) = @_;	386	$LOCKS->guard ($_[0])
347
348	# wait, to be sure we are not locked
349	lock_wait $key;
350
351	$LOCK{$key} = [];
352	$LOCKER{$key} = $Coro::current;#d#
353
354	Coro::guard {
355	delete $LOCKER{$key};#d#
356	# wake up all waiters, to be on the safe side
357	$_->ready for @{ delete $LOCK{$key} };
358	}
359	}	387	}
360		388
361	sub lock_active($) {	389	sub lock_active($) {
362	my ($key) = @_;	390	$LOCKS->count ($_[0]) < 1
363
364	! ! $LOCK{$key}
365	}	391	}
366		392
367	sub freeze_mainloop {	393	sub freeze_mainloop {
368	tick_inhibit_inc;	394	tick_inhibit_inc;
369		395
370	Coro::guard \&tick_inhibit_dec;	396	&Guard::guard (\&tick_inhibit_dec);
371	}	397	}
372		398
373	=item cf::periodic $interval, $cb	399	=item cf::periodic $interval, $cb
374		400
375	Like EV::periodic, but randomly selects a starting point so that the actions	401	Like EV::periodic, but randomly selects a starting point so that the actions
…		…
727		753
728	#############################################################################	754	#############################################################################
729		755
730	=head2 ATTACHABLE OBJECTS	756	=head2 ATTACHABLE OBJECTS
731		757
732	Many objects in crossfire are so-called attachable objects. That means you can	758	Many objects in deliantra are so-called attachable objects. That means you can
733	attach callbacks/event handlers (a collection of which is called an "attachment")	759	attach callbacks/event handlers (a collection of which is called an "attachment")
734	to it. All such attachable objects support the following methods.	760	to it. All such attachable objects support the following methods.
735		761
736	In the following description, CLASS can be any of C<global>, C<object>	762	In the following description, CLASS can be any of C<global>, C<object>
737	C<player>, C<client> or C<map> (i.e. the attachable objects in	763	C<player>, C<client> or C<map> (i.e. the attachable objects in
…		…
787	=item cf::CLASS::attachment $name, ...	813	=item cf::CLASS::attachment $name, ...
788		814
789	Register an attachment by C<$name> through which attachable objects of the	815	Register an attachment by C<$name> through which attachable objects of the
790	given CLASS can refer to this attachment.	816	given CLASS can refer to this attachment.
791		817
792	Some classes such as crossfire maps and objects can specify attachments	818	Some classes such as deliantra maps and objects can specify attachments
793	that are attached at load/instantiate time, thus the need for a name.	819	that are attached at load/instantiate time, thus the need for a name.
794		820
795	These calls expect any number of the following handler/hook descriptions:	821	These calls expect any number of the following handler/hook descriptions:
796		822
797	=over 4	823	=over 4
…		…
1147	$decname, length $$rdata, scalar @$objs;	1173	$decname, length $$rdata, scalar @$objs;
1148		1174
1149	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {	1175	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {
1150	aio_chmod $fh, SAVE_MODE;	1176	aio_chmod $fh, SAVE_MODE;
1151	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1177	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1152	aio_fsync $fh if $cf::USE_FSYNC;	1178	if ($cf::USE_FSYNC) {
		1179	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;
		1180	aio_fsync $fh;
		1181	}
1153	aio_close $fh;	1182	aio_close $fh;
1154		1183
1155	if (@$objs) {	1184	if (@$objs) {
1156	if (my $fh = aio_open "$filename.pst~", O_WRONLY \| O_CREAT, 0600) {	1185	if (my $fh = aio_open "$filename.pst~", O_WRONLY \| O_CREAT, 0600) {
1157	aio_chmod $fh, SAVE_MODE;	1186	aio_chmod $fh, SAVE_MODE;
1158	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };	1187	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1159	aio_write $fh, 0, (length $data), $data, 0;	1188	aio_write $fh, 0, (length $data), $data, 0;
1160	aio_fsync $fh if $cf::USE_FSYNC;	1189	if ($cf::USE_FSYNC) {
		1190	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;
		1191	aio_fsync $fh;
		1192	}
1161	aio_close $fh;	1193	aio_close $fh;
1162	aio_rename "$filename.pst~", "$filename.pst";	1194	aio_rename "$filename.pst~", "$filename.pst";
1163	}	1195	}
1164	} else {	1196	} else {
1165	aio_unlink "$filename.pst";	1197	aio_unlink "$filename.pst";
1166	}	1198	}
1167		1199
1168	aio_rename "$filename~", $filename;	1200	aio_rename "$filename~", $filename;
		1201
		1202	$filename =~ s%/[^/]+$%%;
		1203	aio_pathsync $filename if $cf::USE_FSYNC;
1169	} else {	1204	} else {
1170	warn "FATAL: $filename~: $!\n";	1205	warn "unable to save objects: $filename~: $!\n";
1171	}	1206	}
1172	} else {	1207	} else {
1173	aio_unlink $filename;	1208	aio_unlink $filename;
1174	aio_unlink "$filename.pst";	1209	aio_unlink "$filename.pst";
1175	}	1210	}
…		…
1266	my ($name, $cb) = @_;	1301	my ($name, $cb) = @_;
1267		1302
1268	$EXTICMD{$name} = $cb;	1303	$EXTICMD{$name} = $cb;
1269	}	1304	}
1270		1305
		1306	use File::Glob ();
		1307
1271	cf::player->attach (	1308	cf::player->attach (
1272	on_command => sub {	1309	on_command => sub {
1273	my ($pl, $name, $params) = @_;	1310	my ($pl, $name, $params) = @_;
1274		1311
1275	my $cb = $COMMAND{$name}	1312	my $cb = $COMMAND{$name}
…		…
1306	}	1343	}
1307		1344
1308	cf::override;	1345	cf::override;
1309	},	1346	},
1310	);	1347	);
		1348
		1349	# "readahead" all extensions
		1350	sub cache_extensions {
		1351	my $grp = IO::AIO::aio_group;
		1352
		1353	add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
		1354	for (grep /\.ext$/, @{$_[0]}) {
		1355	add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
		1356	}
		1357	};
		1358
		1359	$grp
		1360	}
1311		1361
1312	sub load_extensions {	1362	sub load_extensions {
1313	cf::sync_job {	1363	cf::sync_job {
1314	my %todo;	1364	my %todo;
1315		1365
…		…
1385		1435
1386	=back	1436	=back
1387		1437
1388	=head2 CORE EXTENSIONS	1438	=head2 CORE EXTENSIONS
1389		1439
1390	Functions and methods that extend core crossfire objects.	1440	Functions and methods that extend core deliantra objects.
1391		1441
1392	=cut	1442	=cut
1393		1443
1394	package cf::player;	1444	package cf::player;
1395		1445
…		…
1438		1488
1439	sub exists($) {	1489	sub exists($) {
1440	my ($login) = @_;	1490	my ($login) = @_;
1441		1491
1442	$cf::PLAYER{$login}	1492	$cf::PLAYER{$login}
1443	or cf::sync_job { !aio_stat path $login }	1493	or !aio_stat path $login
1444	}	1494	}
1445		1495
1446	sub find($) {	1496	sub find($) {
1447	return $cf::PLAYER{$_[0]} \|\| do {	1497	return $cf::PLAYER{$_[0]} \|\| do {
1448	my $login = $_[0];	1498	my $login = $_[0];
…		…
1523	my ($pl) = @_;	1573	my ($pl) = @_;
1524		1574
1525	my $name = $pl->ob->name;	1575	my $name = $pl->ob->name;
1526		1576
1527	$pl->{deny_save} = 1;	1577	$pl->{deny_save} = 1;
1528	$pl->password ("*"); # this should lock out the player until we nuked the dir	1578	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1529		1579
1530	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1580	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1531	$pl->deactivate;	1581	$pl->deactivate;
1532	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1582	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533	$pl->ob->check_score;	1583	$pl->ob->check_score;
…		…
1619	}	1669	}
1620		1670
1621	\@paths	1671	\@paths
1622	}	1672	}
1623		1673
1624	=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)	1674	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1625		1675
1626	Expand crossfire pod fragments into protocol xml.	1676	Expand deliantra pod fragments into protocol xml.
1627
1628	=cut
1629
1630	sub expand_cfpod {
1631	my ($self, $pod) = @_;
1632
1633	my @nest = [qr<\G$>, undef, ""];
1634	my $xml;
1635
1636	for ($pod) {
1637	while () {
1638	if (/\G( (?: [^BCEGHITUZ&>\n\ ]+ \| [BCEGHITUZ](?!<) \| \ (?!>) )+ )/xgcs) {
1639	$xml .= $1;
1640	} elsif (/\G\n(?=\S)/xgcs) {
1641	$xml .= " ";
1642	} elsif (/\G\n/xgcs) {
1643	$xml .= "\n";
1644	} elsif (/\G ([BCEGHITUZ]) (< (?: <+\ \| (?!<) ) )/xgcs) {
1645	my ($code, $delim) = ($1, scalar reverse $2);
1646	$delim =~ y/</>/; # delim now contains the stop sequence
1647	$delim = qr{\G\Q$delim};
1648
1649	my $cb;
1650
1651	if ($code eq "B") {
1652	$cb = sub { "<b>$_[0]</b>" };
1653	} elsif ($code eq "C") {
1654	$cb = sub { "<tt>$_[0]</tt>" };
1655	} elsif ($code eq "E") {
1656	$cb = sub { warn "E<$_[0]>\n";"&$_[0];" };
1657	} elsif ($code eq "G") {
1658	$cb = sub {
1659	my ($male, $female) = split /\\|/, $_[0];
1660	$self->gender ? $female : $male
1661	};
1662	} elsif ($code eq "H") {
1663	$cb = sub {
1664	(
1665	"<fg name=\"lightblue\">[$_[0] (Use hintmode to suppress hints)]</fg>",
1666	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1667	"",
1668	)[$self->{hintmode}];
1669	};
1670	} elsif ($code eq "I") {
1671	$cb = sub { "<i>$_[0]</i>" };
1672	} elsif ($code eq "T") {
1673	$cb = sub { "<big><b>$_[0]</b></big>" };
1674	} elsif ($code eq "U") {
1675	$cb = sub { "<u>$_[0]</u>" };
1676	} elsif ($code eq "Z") {
1677	$cb = sub { };
1678	} else {
1679	die "FATAL error in expand_cfpod";
1680	}
1681
1682	push @nest, [$delim, $cb, $xml];
1683	undef $xml;
1684
1685	} elsif ($_ =~ /$nest[-1][0]/gcs) {
1686	my $nest = pop @nest;
1687
1688	if ($nest->[1]) {
1689	$xml = $nest->[2] . $nest->[1]->($xml);
1690	} else {
1691	last;
1692	}
1693	} elsif (/\G</xgcs) {
1694	$xml .= "<";
1695	} elsif (/\G&/xgcs) {
1696	$xml .= "&";
1697	} elsif (/\G>/xgcs) {
1698	$xml .= ">";
1699	} else {
1700	if ($pod =~ /\G(.+)/xgcs) {
1701	warn "parse error (at $1)($nest[-1][0]) while expanding cfpod:\n$pod";
1702	last;
1703	} else {
1704	warn "parse error (unclosed interior sequence at end of cfpod) while expanding cfpod:\n$pod";
1705	return "<b>Sorry, the server encountered an internal error when formatting this message, please report this.</b>";
1706	}
1707	}
1708	}
1709	}
1710
1711	$xml
1712	}
1713
1714	sub hintmode {
1715	$_[0]{hintmode} = $_[1] if @_ > 1;
1716	$_[0]{hintmode}
1717	}
1718		1677
1719	=item $player->ext_reply ($msgid, @msg)	1678	=item $player->ext_reply ($msgid, @msg)
1720		1679
1721	Sends an ext reply to the player.	1680	Sends an ext reply to the player.
1722		1681
…		…
1935		1894
1936	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;	1895	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1937	"$UNIQUEDIR/$path"	1896	"$UNIQUEDIR/$path"
1938	}	1897	}
1939		1898
1940	# and all this just because we cannot iterate over
1941	# all maps in C++...
1942	sub change_all_map_light {
1943	my ($change) = @_;
1944
1945	$_->change_map_light ($change)
1946	for grep $_->outdoor, values %cf::MAP;
1947	}
1948
1949	sub decay_objects {	1899	sub decay_objects {
1950	my ($self) = @_;	1900	my ($self) = @_;
1951		1901
1952	return if $self->{deny_reset};	1902	return if $self->{deny_reset};
1953		1903
…		…
2035	sub find {	1985	sub find {
2036	my ($path, $origin) = @_;	1986	my ($path, $origin) = @_;
2037		1987
2038	$path = normalise $path, $origin && $origin->path;	1988	$path = normalise $path, $origin && $origin->path;
2039		1989
2040	cf::lock_wait "map_data:$path";#d#remove	1990	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2041	cf::lock_wait "map_find:$path";	1991	my $guard2 = cf::lock_acquire "map_find:$path";
2042		1992
2043	$cf::MAP{$path} \|\| do {	1993	$cf::MAP{$path} \|\| do {
2044	my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2045	my $guard2 = cf::lock_acquire "map_find:$path";
2046
2047	my $map = new_from_path cf::map $path	1994	my $map = new_from_path cf::map $path
2048	or return;	1995	or return;
2049		1996
2050	$map->{last_save} = $cf::RUNTIME;	1997	$map->{last_save} = $cf::RUNTIME;
2051		1998
…		…
2119	unless ($self->{deny_activate}) {	2066	unless ($self->{deny_activate}) {
2120	$self->decay_objects;	2067	$self->decay_objects;
2121	$self->fix_auto_apply;	2068	$self->fix_auto_apply;
2122	$self->update_buttons;	2069	$self->update_buttons;
2123	cf::cede_to_tick;	2070	cf::cede_to_tick;
2124	$self->set_darkness_map;
2125	cf::cede_to_tick;
2126	$self->activate;	2071	$self->activate;
2127	}	2072	}
2128		2073
2129	$self->{last_save} = $cf::RUNTIME;	2074	$self->{last_save} = $cf::RUNTIME;
2130	$self->last_access ($cf::RUNTIME);	2075	$self->last_access ($cf::RUNTIME);
…		…
2296		2241
2297	my $lock = cf::lock_acquire "map_data:$self->{path}";	2242	my $lock = cf::lock_acquire "map_data:$self->{path}";
2298		2243
2299	return if $self->players;	2244	return if $self->players;
2300		2245
2301	warn "resetting map ", $self->path;	2246	warn "resetting map ", $self->path, "\n";
2302		2247
2303	$self->in_memory (cf::MAP_SWAPPED);	2248	$self->in_memory (cf::MAP_SWAPPED);
2304		2249
2305	# need to save uniques path	2250	# need to save uniques path
2306	unless ($self->{deny_save}) {	2251	unless ($self->{deny_save}) {
…		…
2397	: normalise $_	2342	: normalise $_
2398	} @{ aio_readdir $UNIQUEDIR or [] }	2343	} @{ aio_readdir $UNIQUEDIR or [] }
2399	]	2344	]
2400	}	2345	}
2401		2346
		2347	=item cf::map::static_maps
		2348
		2349	Returns an arrayref if paths of all static maps (all preinstalled F<.map>
		2350	file in the shared directory excluding F</styles> and F</editor>). May
		2351	block.
		2352
		2353	=cut
		2354
		2355	sub static_maps() {
		2356	my @dirs = "";
		2357	my @maps;
		2358
		2359	while (@dirs) {
		2360	my $dir = shift @dirs;
		2361
		2362	next if $dir eq "/styles" \|\| $dir eq "/editor";
		2363
		2364	my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
		2365	or return;
		2366
		2367	for (@$files) {
		2368	s/\.map$// or next;
		2369	utf8::decode $_;
		2370	push @maps, "$dir/$_";
		2371	}
		2372
		2373	push @dirs, map "$dir/$_", @$dirs;
		2374	}
		2375
		2376	\@maps
		2377	}
		2378
2402	=back	2379	=back
2403		2380
2404	=head3 cf::object	2381	=head3 cf::object
2405		2382
2406	=cut	2383	=cut
…		…
2471		2448
2472	our $SAY_CHANNEL = {	2449	our $SAY_CHANNEL = {
2473	id => "say",	2450	id => "say",
2474	title => "Map",	2451	title => "Map",
2475	reply => "say ",	2452	reply => "say ",
2476	tooltip => "Things said to and replied from npcs near you and other players on the same map only.",	2453	tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2477	};	2454	};
2478		2455
2479	our $CHAT_CHANNEL = {	2456	our $CHAT_CHANNEL = {
2480	id => "chat",	2457	id => "chat",
2481	title => "Chat",	2458	title => "Chat",
…		…
2536		2513
2537	=item $player_object->enter_link	2514	=item $player_object->enter_link
2538		2515
2539	Freezes the player and moves him/her to a special map (C<{link}>).	2516	Freezes the player and moves him/her to a special map (C<{link}>).
2540		2517
2541	The player should be reasonably safe there for short amounts of time. You	2518	The player should be reasonably safe there for short amounts of time (e.g.
2542	I<MUST> call C<leave_link> as soon as possible, though.	2519	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
		2520	though, as the palyer cannot control the character while it is on the link
		2521	map.
2543		2522
2544	Will never block.	2523	Will never block.
2545		2524
2546	=item $player_object->leave_link ($map, $x, $y)	2525	=item $player_object->leave_link ($map, $x, $y)
2547		2526
…		…
2599	($x, $y) = (-1, -1)	2578	($x, $y) = (-1, -1)
2600	unless (defined $x) && (defined $y);	2579	unless (defined $x) && (defined $y);
2601		2580
2602	# use -1 or undef as default coordinates, not 0, 0	2581	# use -1 or undef as default coordinates, not 0, 0
2603	($x, $y) = ($map->enter_x, $map->enter_y)	2582	($x, $y) = ($map->enter_x, $map->enter_y)
2604	if $x <=0 && $y <= 0;	2583	if $x <= 0 && $y <= 0;
2605		2584
2606	$map->load;	2585	$map->load;
2607	$map->load_neighbours;	2586	$map->load_neighbours;
2608		2587
2609	return unless $self->contr->active;	2588	return unless $self->contr->active;
2610	$self->activate_recursive;
2611		2589
2612	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2590	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2613	$self->enter_map ($map, $x, $y);	2591	$self->enter_map ($map, $x, $y);
		2592
		2593	# only activate afterwards, to support waiting in hooks
		2594	$self->activate_recursive;
2614	}	2595	}
2615		2596
2616	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2597	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2617		2598
2618	Moves the player to the given map-path and coordinates by first freezing	2599	Moves the player to the given map-path and coordinates by first freezing
…		…
2777	$self->contr->savebed ($map, $x, $y)	2758	$self->contr->savebed ($map, $x, $y)
2778	if $exit->flag (cf::FLAG_DAMNED);	2759	if $exit->flag (cf::FLAG_DAMNED);
2779		2760
2780	1	2761	1
2781	}) {	2762	}) {
2782	$self->message ("Something went wrong deep within the crossfire server. "	2763	$self->message ("Something went wrong deep within the deliantra server. "
2783	. "I'll try to bring you back to the map you were before. "	2764	. "I'll try to bring you back to the map you were before. "
2784	. "Please report this to the dungeon master!",	2765	. "Please report this to the dungeon master!",
2785	cf::NDI_UNIQUE \| cf::NDI_RED);	2766	cf::NDI_UNIQUE \| cf::NDI_RED);
2786		2767
2787	warn "ERROR in enter_exit: $@";	2768	warn "ERROR in enter_exit: $@";
…		…
2804	sub cf::client::send_drawinfo {	2785	sub cf::client::send_drawinfo {
2805	my ($self, $text, $flags) = @_;	2786	my ($self, $text, $flags) = @_;
2806		2787
2807	utf8::encode $text;	2788	utf8::encode $text;
2808	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);	2789	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);
		2790	}
		2791
		2792	=item $client->send_big_packet ($pkt)
		2793
		2794	Like C<send_packet>, but tries to compress large packets, and fragments
		2795	them as required.
		2796
		2797	=cut
		2798
		2799	our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
		2800
		2801	sub cf::client::send_big_packet {
		2802	my ($self, $pkt) = @_;
		2803
		2804	# try lzf for large packets
		2805	$pkt = "lzf " . Compress::LZF::compress $pkt
		2806	if 1024 <= length $pkt and $self->{can_lzf};
		2807
		2808	# split very large packets
		2809	if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
		2810	$self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
		2811	$pkt = "frag";
		2812	}
		2813
		2814	$self->send_packet ($pkt);
2809	}	2815	}
2810		2816
2811	=item $client->send_msg ($channel, $msg, $color, [extra...])	2817	=item $client->send_msg ($channel, $msg, $color, [extra...])
2812		2818
2813	Send a drawinfo or msg packet to the client, formatting the msg for the	2819	Send a drawinfo or msg packet to the client, formatting the msg for the
…		…
2817		2823
2818	=cut	2824	=cut
2819		2825
2820	# non-persistent channels (usually the info channel)	2826	# non-persistent channels (usually the info channel)
2821	our %CHANNEL = (	2827	our %CHANNEL = (
		2828	"c/motd" => {
		2829	id => "infobox",
		2830	title => "MOTD",
		2831	reply => undef,
		2832	tooltip => "The message of the day",
		2833	},
2822	"c/identify" => {	2834	"c/identify" => {
2823	id => "infobox",	2835	id => "infobox",
2824	title => "Identify",	2836	title => "Identify",
2825	reply => undef,	2837	reply => undef,
2826	tooltip => "Items recently identified",	2838	tooltip => "Items recently identified",
…		…
2828	"c/examine" => {	2840	"c/examine" => {
2829	id => "infobox",	2841	id => "infobox",
2830	title => "Examine",	2842	title => "Examine",
2831	reply => undef,	2843	reply => undef,
2832	tooltip => "Signs and other items you examined",	2844	tooltip => "Signs and other items you examined",
		2845	},
		2846	"c/shopinfo" => {
		2847	id => "infobox",
		2848	title => "Shop Info",
		2849	reply => undef,
		2850	tooltip => "What your bargaining skill tells you about the shop",
2833	},	2851	},
2834	"c/book" => {	2852	"c/book" => {
2835	id => "infobox",	2853	id => "infobox",
2836	title => "Book",	2854	title => "Book",
2837	reply => undef,	2855	reply => undef,
…		…
2853	id => "infobox",	2871	id => "infobox",
2854	title => "Body Parts",	2872	title => "Body Parts",
2855	reply => undef,	2873	reply => undef,
2856	tooltip => "Shows which body parts you posess and are available",	2874	tooltip => "Shows which body parts you posess and are available",
2857	},	2875	},
		2876	"c/statistics" => {
		2877	id => "infobox",
		2878	title => "Statistics",
		2879	reply => undef,
		2880	tooltip => "Shows your primary statistics",
		2881	},
		2882	"c/skills" => {
		2883	id => "infobox",
		2884	title => "Skills",
		2885	reply => undef,
		2886	tooltip => "Shows your experience per skill and item power",
		2887	},
		2888	"c/shopitems" => {
		2889	id => "infobox",
		2890	title => "Shop Items",
		2891	reply => undef,
		2892	tooltip => "Shows the items currently for sale in this shop",
		2893	},
		2894	"c/resistances" => {
		2895	id => "infobox",
		2896	title => "Resistances",
		2897	reply => undef,
		2898	tooltip => "Shows your resistances",
		2899	},
		2900	"c/pets" => {
		2901	id => "infobox",
		2902	title => "Pets",
		2903	reply => undef,
		2904	tooltip => "Shows information abotu your pets/a specific pet",
		2905	},
		2906	"c/perceiveself" => {
		2907	id => "infobox",
		2908	title => "Perceive Self",
		2909	reply => undef,
		2910	tooltip => "You gained detailed knowledge about yourself",
		2911	},
2858	"c/uptime" => {	2912	"c/uptime" => {
2859	id => "infobox",	2913	id => "infobox",
2860	title => "Uptime",	2914	title => "Uptime",
2861	reply => undef,	2915	reply => undef,
2862	tooltip => "How long the server has been running since last restart",	2916	tooltip => "How long the server has been running since last restart",
…		…
2871	id => "party",	2925	id => "party",
2872	title => "Party",	2926	title => "Party",
2873	reply => "gsay ",	2927	reply => "gsay ",
2874	tooltip => "Messages and chat related to your party",	2928	tooltip => "Messages and chat related to your party",
2875	},	2929	},
		2930	"c/death" => {
		2931	id => "death",
		2932	title => "Death",
		2933	reply => undef,
		2934	tooltip => "Reason for and more info about your most recent death",
		2935	},
		2936	"c/say" => $SAY_CHANNEL,
		2937	"c/chat" => $CHAT_CHANNEL,
2876	);	2938	);
2877		2939
2878	sub cf::client::send_msg {	2940	sub cf::client::send_msg {
2879	my ($self, $channel, $msg, $color, @extra) = @_;	2941	my ($self, $channel, $msg, $color, @extra) = @_;
2880		2942
2881	$msg = $self->pl->expand_cfpod ($msg);	2943	$msg = $self->pl->expand_cfpod ($msg)
		2944	unless $color & cf::NDI_VERBATIM;
2882		2945
2883	$color &= cf::NDI_CLIENT_MASK; # just in case...	2946	$color &= cf::NDI_CLIENT_MASK; # just in case...
2884		2947
2885	# check predefined channels, for the benefit of C	2948	# check predefined channels, for the benefit of C
2886	if ($CHANNEL{$channel}) {	2949	if ($CHANNEL{$channel}) {
2887	$channel = $CHANNEL{$channel};	2950	$channel = $CHANNEL{$channel};
2888		2951
2889	$self->ext_msg (channel_info => $channel)	2952	$self->ext_msg (channel_info => $channel);
2890	if $self->can_msg;
2891
2892	$channel = $channel->{id};	2953	$channel = $channel->{id};
2893		2954
2894	} elsif (ref $channel) {	2955	} elsif (ref $channel) {
2895	# send meta info to client, if not yet sent	2956	# send meta info to client, if not yet sent
2896	unless (exists $self->{channel}{$channel->{id}}) {	2957	unless (exists $self->{channel}{$channel->{id}}) {
2897	$self->{channel}{$channel->{id}} = $channel;	2958	$self->{channel}{$channel->{id}} = $channel;
2898	$self->ext_msg (channel_info => $channel)	2959	$self->ext_msg (channel_info => $channel);
2899	if $self->can_msg;
2900	}	2960	}
2901		2961
2902	$channel = $channel->{id};	2962	$channel = $channel->{id};
2903	}	2963	}
2904		2964
2905	return unless @extra \|\| length $msg;	2965	return unless @extra \|\| length $msg;
2906		2966
2907	if ($self->can_msg) {
2908	# default colour, mask it out	2967	# default colour, mask it out
2909	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)	2968	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)
2910	if $color & cf::NDI_DEF;	2969	if $color & cf::NDI_DEF;
2911		2970
2912	$self->send_packet ("msg " . $self->{json_coder}->encode (	2971	my $pkt = "msg "
		2972	. $self->{json_coder}->encode (
2913	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));	2973	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2914	} else {	2974	);
2915	if ($color >= 0) {
2916	# replace some tags by gcfclient-compatible ones
2917	for ($msg) {
2918	1 while
2919	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2920	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2921	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2922	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2923	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2924	}
2925		2975
2926	$color &= cf::NDI_COLOR_MASK;	2976	$self->send_big_packet ($pkt);
2927
2928	utf8::encode $msg;
2929
2930	if (0 && $msg =~ /\[/) {
2931	# COMMAND/INFO
2932	$self->send_packet ("drawextinfo $color 10 8 $msg")
2933	} else {
2934	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
2935	$self->send_packet ("drawinfo $color $msg")
2936	}
2937	}
2938	}
2939	}	2977	}
2940		2978
2941	=item $client->ext_msg ($type, @msg)	2979	=item $client->ext_msg ($type, @msg)
2942		2980
2943	Sends an ext event to the client.	2981	Sends an ext event to the client.
…		…
2946		2984
2947	sub cf::client::ext_msg($$@) {	2985	sub cf::client::ext_msg($$@) {
2948	my ($self, $type, @msg) = @_;	2986	my ($self, $type, @msg) = @_;
2949		2987
2950	if ($self->extcmd == 2) {	2988	if ($self->extcmd == 2) {
2951	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	2989	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2952	} elsif ($self->extcmd == 1) { # TODO: remove	2990	} elsif ($self->extcmd == 1) { # TODO: remove
2953	push @msg, msgtype => "event_$type";	2991	push @msg, msgtype => "event_$type";
2954	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	2992	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2955	}	2993	}
2956	}	2994	}
2957		2995
2958	=item $client->ext_reply ($msgid, @msg)	2996	=item $client->ext_reply ($msgid, @msg)
2959		2997
…		…
2963		3001
2964	sub cf::client::ext_reply($$@) {	3002	sub cf::client::ext_reply($$@) {
2965	my ($self, $id, @msg) = @_;	3003	my ($self, $id, @msg) = @_;
2966		3004
2967	if ($self->extcmd == 2) {	3005	if ($self->extcmd == 2) {
2968	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));	3006	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2969	} elsif ($self->extcmd == 1) {	3007	} elsif ($self->extcmd == 1) {
2970	#TODO: version 1, remove	3008	#TODO: version 1, remove
2971	unshift @msg, msgtype => "reply", msgid => $id;	3009	unshift @msg, msgtype => "reply", msgid => $id;
2972	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3010	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2973	}	3011	}
2974	}	3012	}
2975		3013
2976	=item $success = $client->query ($flags, "text", \&cb)	3014	=item $success = $client->query ($flags, "text", \&cb)
2977		3015
…		…
3118	The following functions and methods are available within a safe environment:	3156	The following functions and methods are available within a safe environment:
3119		3157
3120	cf::object	3158	cf::object
3121	contr pay_amount pay_player map x y force_find force_add destroy	3159	contr pay_amount pay_player map x y force_find force_add destroy
3122	insert remove name archname title slaying race decrease split	3160	insert remove name archname title slaying race decrease split
		3161	value
3123		3162
3124	cf::object::player	3163	cf::object::player
3125	player	3164	player
3126		3165
3127	cf::player	3166	cf::player
…		…
3133	=cut	3172	=cut
3134		3173
3135	for (	3174	for (
3136	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	3175	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3137	insert remove inv nrof name archname title slaying race	3176	insert remove inv nrof name archname title slaying race
3138	decrease split destroy change_exp)],	3177	decrease split destroy change_exp value msg lore send_msg)],
3139	["cf::object::player" => qw(player)],	3178	["cf::object::player" => qw(player)],
3140	["cf::player" => qw(peaceful)],	3179	["cf::player" => qw(peaceful send_msg)],
3141	["cf::map" => qw(trigger)],	3180	["cf::map" => qw(trigger)],
3142	) {	3181	) {
3143	no strict 'refs';	3182	no strict 'refs';
3144	my ($pkg, @funs) = @$_;	3183	my ($pkg, @funs) = @$_;
3145	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3184	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
…		…
3162	my ($code, %vars) = @_;	3201	my ($code, %vars) = @_;
3163		3202
3164	my $qcode = $code;	3203	my $qcode = $code;
3165	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3204	$qcode =~ s/"/‟/g; # not allowed in #line filenames
3166	$qcode =~ s/\n/\\n/g;	3205	$qcode =~ s/\n/\\n/g;
		3206
		3207	%vars = (_dummy => 0) unless %vars;
3167		3208
3168	local $_;	3209	local $_;
3169	local @safe::cf::_safe_eval_args = values %vars;	3210	local @safe::cf::_safe_eval_args = values %vars;
3170		3211
3171	my $eval =	3212	my $eval =
…		…
3401	reload_treasures;	3442	reload_treasures;
3402		3443
3403	warn "finished reloading resource files\n";	3444	warn "finished reloading resource files\n";
3404	}	3445	}
3405		3446
3406	sub init {
3407	my $guard = freeze_mainloop;
3408
3409	evthread_start IO::AIO::poll_fileno;
3410
3411	reload_resources;
3412	}
3413
3414	sub reload_config {	3447	sub reload_config {
		3448	warn "reloading config file...\n";
		3449
3415	open my $fh, "<:utf8", "$CONFDIR/config"	3450	open my $fh, "<:utf8", "$CONFDIR/config"
3416	or return;	3451	or return;
3417		3452
3418	local $/;	3453	local $/;
3419	*CFG = YAML::Load <$fh>;	3454	*CFG = YAML::XS::Load scalar <$fh>;
3420		3455
3421	$EMERGENCY_POSITION = $CFG{emergency_position} \|\| ["/world/world_105_115", 5, 37];	3456	$EMERGENCY_POSITION = $CFG{emergency_position} \|\| ["/world/world_105_115", 5, 37];
3422		3457
3423	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3458	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3424	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3459	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
3428	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3463	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3429	and die "WARNING: m(un)lockall failed: $!\n";	3464	and die "WARNING: m(un)lockall failed: $!\n";
3430	};	3465	};
3431	warn $@ if $@;	3466	warn $@ if $@;
3432	}	3467	}
		3468
		3469	warn "finished reloading resource files\n";
		3470	}
		3471
		3472	sub pidfile() {
		3473	sysopen my $fh, $PIDFILE, O_RDWR \| O_CREAT
		3474	or die "$PIDFILE: $!";
		3475	flock $fh, &Fcntl::LOCK_EX
		3476	or die "$PIDFILE: flock: $!";
		3477	$fh
		3478	}
		3479
		3480	# make sure only one server instance is running at any one time
		3481	sub atomic {
		3482	my $fh = pidfile;
		3483
		3484	my $pid = <$fh>;
		3485	kill 9, $pid if $pid > 0;
		3486
		3487	seek $fh, 0, 0;
		3488	print $fh $$;
		3489	}
		3490
		3491	sub main_loop {
		3492	warn "EV::loop starting\n";
		3493	if (1) {
		3494	EV::loop;
		3495	}
		3496	warn "EV::loop returned\n";
		3497	goto &main_loop unless $REALLY_UNLOOP;
3433	}	3498	}
3434		3499
3435	sub main {	3500	sub main {
		3501	cf::init_globals; # initialise logging
		3502
		3503	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
		3504	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
		3505	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
		3506	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
		3507
		3508	cf::init_experience;
		3509	cf::init_anim;
		3510	cf::init_attackmess;
		3511	cf::init_dynamic;
		3512
		3513	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
		3514
3436	# we must not ever block the main coroutine	3515	# we must not ever block the main coroutine
3437	local $Coro::idle = sub {	3516	local $Coro::idle = sub {
3438	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3517	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3439	(async {	3518	(async {
3440	$Coro::current->{desc} = "IDLE BUG HANDLER";	3519	$Coro::current->{desc} = "IDLE BUG HANDLER";
3441	EV::loop EV::LOOP_ONESHOT;	3520	EV::loop EV::LOOP_ONESHOT;
3442	})->prio (Coro::PRIO_MAX);	3521	})->prio (Coro::PRIO_MAX);
3443	};	3522	};
3444		3523
3445	{	3524	evthread_start IO::AIO::poll_fileno;
3446	my $guard = freeze_mainloop;	3525
		3526	cf::sync_job {
		3527	reload_resources;
3447	reload_config;	3528	reload_config;
3448	db_init;	3529	db_init;
		3530
		3531	cf::load_settings;
		3532	cf::load_materials;
		3533	cf::init_uuid;
		3534	cf::init_signals;
		3535	cf::init_commands;
		3536	cf::init_skills;
		3537
		3538	cf::init_beforeplay;
		3539
		3540	atomic;
		3541
3449	load_extensions;	3542	load_extensions;
3450		3543
3451	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3544	utime time, time, $RUNTIMEFILE;
		3545
		3546	# no (long-running) fork's whatsoever before this point(!)
		3547	use POSIX ();
		3548	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
		3549
		3550	(pop @POST_INIT)->(0) while @POST_INIT;
3452	}	3551	};
3453		3552
3454	EV::loop;	3553	main_loop;
3455	}	3554	}
3456		3555
3457	#############################################################################	3556	#############################################################################
3458	# initialisation and cleanup	3557	# initialisation and cleanup
3459		3558
…		…
3466	};	3565	};
3467	}	3566	}
3468	}	3567	}
3469		3568
3470	sub write_runtime_sync {	3569	sub write_runtime_sync {
3471	my $runtime = "$LOCALDIR/runtime";
3472
3473	# first touch the runtime file to show we are still running:	3570	# first touch the runtime file to show we are still running:
3474	# the fsync below can take a very very long time.	3571	# the fsync below can take a very very long time.
3475		3572
3476	IO::AIO::aio_utime $runtime, undef, undef;	3573	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3477		3574
3478	my $guard = cf::lock_acquire "write_runtime";	3575	my $guard = cf::lock_acquire "write_runtime";
3479		3576
3480	my $fh = aio_open "$runtime~", O_WRONLY \| O_CREAT, 0644	3577	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY \| O_CREAT, 0644
3481	or return;	3578	or return;
3482		3579
3483	my $value = $cf::RUNTIME + 90 + 10;	3580	my $value = $cf::RUNTIME + 90 + 10;
3484	# 10 is the runtime save interval, for a monotonic clock	3581	# 10 is the runtime save interval, for a monotonic clock
3485	# 60 allows for the watchdog to kill the server.	3582	# 60 allows for the watchdog to kill the server.
…		…
3495	aio_utime $fh, undef, undef;	3592	aio_utime $fh, undef, undef;
3496		3593
3497	close $fh	3594	close $fh
3498	or return;	3595	or return;
3499		3596
3500	aio_rename "$runtime~", $runtime	3597	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3501	and return;	3598	and return;
3502		3599
3503	warn "runtime file written.\n";	3600	warn "runtime file written.\n";
3504		3601
3505	1	3602	1
…		…
3517	my $uuid = "$LOCALDIR/uuid";	3614	my $uuid = "$LOCALDIR/uuid";
3518		3615
3519	my $fh = aio_open "$uuid~", O_WRONLY \| O_CREAT, 0644	3616	my $fh = aio_open "$uuid~", O_WRONLY \| O_CREAT, 0644
3520	or return;	3617	or return;
3521		3618
3522	my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;	3619	my $value = uuid_seq uuid_cur;
		3620
		3621	unless ($value) {
		3622	warn "cowardly refusing to write zero uuid value!\n";
		3623	return;
		3624	}
		3625
		3626	my $value = uuid_str $value + $uuid_skip;
3523	$uuid_skip = 0;	3627	$uuid_skip = 0;
3524		3628
3525	(aio_write $fh, 0, (length $value), $value, 0) <= 0	3629	(aio_write $fh, 0, (length $value), $value, 0) <= 0
3526	and return;	3630	and return;
3527		3631
…		…
3549	}	3653	}
3550		3654
3551	sub emergency_save() {	3655	sub emergency_save() {
3552	my $freeze_guard = cf::freeze_mainloop;	3656	my $freeze_guard = cf::freeze_mainloop;
3553		3657
3554	warn "enter emergency perl save\n";	3658	warn "emergency_perl_save: enter\n";
3555		3659
3556	cf::sync_job {	3660	cf::sync_job {
		3661	# this is a trade-off: we want to be very quick here, so
		3662	# save all maps without fsync, and later call a global sync
		3663	# (which in turn might be very very slow)
		3664	local $USE_FSYNC = 0;
		3665
3557	# use a peculiar iteration method to avoid tripping on perl	3666	# use a peculiar iteration method to avoid tripping on perl
3558	# refcount bugs in for. also avoids problems with players	3667	# refcount bugs in for. also avoids problems with players
3559	# and maps saved/destroyed asynchronously.	3668	# and maps saved/destroyed asynchronously.
3560	warn "begin emergency player save\n";	3669	warn "emergency_perl_save: begin player save\n";
3561	for my $login (keys %cf::PLAYER) {	3670	for my $login (keys %cf::PLAYER) {
3562	my $pl = $cf::PLAYER{$login} or next;	3671	my $pl = $cf::PLAYER{$login} or next;
3563	$pl->valid or next;	3672	$pl->valid or next;
3564	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3673	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3565	$pl->save;	3674	$pl->save;
3566	}	3675	}
3567	warn "end emergency player save\n";	3676	warn "emergency_perl_save: end player save\n";
3568		3677
3569	warn "begin emergency map save\n";	3678	warn "emergency_perl_save: begin map save\n";
3570	for my $path (keys %cf::MAP) {	3679	for my $path (keys %cf::MAP) {
3571	my $map = $cf::MAP{$path} or next;	3680	my $map = $cf::MAP{$path} or next;
3572	$map->valid or next;	3681	$map->valid or next;
3573	$map->save;	3682	$map->save;
3574	}	3683	}
3575	warn "end emergency map save\n";	3684	warn "emergency_perl_save: end map save\n";
3576		3685
3577	warn "begin emergency database checkpoint\n";	3686	warn "emergency_perl_save: begin database checkpoint\n";
3578	BDB::db_env_txn_checkpoint $DB_ENV;	3687	BDB::db_env_txn_checkpoint $DB_ENV;
3579	warn "end emergency database checkpoint\n";	3688	warn "emergency_perl_save: end database checkpoint\n";
3580		3689
3581	warn "begin write uuid\n";	3690	warn "emergency_perl_save: begin write uuid\n";
3582	write_uuid_sync 1;	3691	write_uuid_sync 1;
3583	warn "end write uuid\n";	3692	warn "emergency_perl_save: end write uuid\n";
3584	};	3693	};
3585		3694
		3695	warn "emergency_perl_save: starting sync()\n";
		3696	IO::AIO::aio_sync sub {
		3697	warn "emergency_perl_save: finished sync()\n";
		3698	};
		3699
3586	warn "leave emergency perl save\n";	3700	warn "emergency_perl_save: leave\n";
3587	}	3701	}
3588		3702
3589	sub post_cleanup {	3703	sub post_cleanup {
3590	my ($make_core) = @_;	3704	my ($make_core) = @_;
3591		3705
3592	warn Carp::longmess "post_cleanup backtrace"	3706	warn Carp::longmess "post_cleanup backtrace"
3593	if $make_core;	3707	if $make_core;
		3708
		3709	my $fh = pidfile;
		3710	unlink $PIDFILE if <$fh> == $$;
3594	}	3711	}
3595		3712
3596	# a safer delete_package, copied from Symbol	3713	# a safer delete_package, copied from Symbol
3597	sub clear_package($) {	3714	sub clear_package($) {
3598	my $pkg = shift;	3715	my $pkg = shift;
…		…
3614	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	3731	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3615	for my $name (keys %$leaf_symtab) {	3732	for my $name (keys %$leaf_symtab) {
3616	_gv_clear *{"$pkg$name"};	3733	_gv_clear *{"$pkg$name"};
3617	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	3734	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3618	}	3735	}
3619	warn "cleared package #$pkg\n";#d#	3736	warn "cleared package $pkg\n";#d#
3620	}	3737	}
3621
3622	our $RELOAD; # how many times to reload
3623		3738
3624	sub do_reload_perl() {	3739	sub do_reload_perl() {
3625	# can/must only be called in main	3740	# can/must only be called in main
3626	if ($Coro::current != $Coro::main) {	3741	if ($Coro::current != $Coro::main) {
3627	warn "can only reload from main coroutine";	3742	warn "can only reload from main coroutine";
3628	return;	3743	return;
3629	}	3744	}
3630		3745
3631	return if $RELOAD++;	3746	return if $RELOAD++;
		3747
		3748	my $t1 = EV::time;
3632		3749
3633	while ($RELOAD) {	3750	while ($RELOAD) {
3634	warn "reloading...";	3751	warn "reloading...";
3635		3752
3636	warn "entering sync_job";	3753	warn "entering sync_job";
…		…
3697	clear_package "safe::$_"	3814	clear_package "safe::$_"
3698	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	3815	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3699		3816
3700	warn "unloading cf.pm \"a bit\"";	3817	warn "unloading cf.pm \"a bit\"";
3701	delete $INC{"cf.pm"};	3818	delete $INC{"cf.pm"};
3702	delete $INC{"cf/pod.pm"};	3819	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3703		3820
3704	# don't, removes xs symbols, too,	3821	# don't, removes xs symbols, too,
3705	# and global variables created in xs	3822	# and global variables created in xs
3706	#clear_package __PACKAGE__;	3823	#clear_package __PACKAGE__;
3707		3824
3708	warn "unload completed, starting to reload now";	3825	warn "unload completed, starting to reload now";
3709		3826
3710	warn "reloading cf.pm";	3827	warn "reloading cf.pm";
3711	require cf;	3828	require cf;
3712	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3829	cf::_connect_to_perl_1;
3713		3830
3714	warn "loading config and database again";	3831	warn "loading config and database again";
3715	cf::reload_config;	3832	cf::reload_config;
3716		3833
3717	warn "loading extensions";	3834	warn "loading extensions";
3718	cf::load_extensions;	3835	cf::load_extensions;
3719		3836
		3837	if ($REATTACH_ON_RELOAD) {
3720	warn "reattaching attachments to objects/players";	3838	warn "reattaching attachments to objects/players";
3721	_global_reattach; # objects, sockets	3839	_global_reattach; # objects, sockets
3722	warn "reattaching attachments to maps";	3840	warn "reattaching attachments to maps";
3723	reattach $_ for values %MAP;	3841	reattach $_ for values %MAP;
3724	warn "reattaching attachments to players";	3842	warn "reattaching attachments to players";
3725	reattach $_ for values %PLAYER;	3843	reattach $_ for values %PLAYER;
		3844	}
		3845
		3846	warn "running post_init jobs";
		3847	(pop @POST_INIT)->(1) while @POST_INIT;
3726		3848
3727	warn "leaving sync_job";	3849	warn "leaving sync_job";
3728		3850
3729	1	3851	1
3730	} or do {	3852	} or do {
…		…
3733	};	3855	};
3734		3856
3735	warn "reloaded";	3857	warn "reloaded";
3736	--$RELOAD;	3858	--$RELOAD;
3737	}	3859	}
		3860
		3861	$t1 = EV::time - $t1;
		3862	warn "reload completed in ${t1}s\n";
3738	};	3863	};
3739		3864
3740	our $RELOAD_WATCHER; # used only during reload	3865	our $RELOAD_WATCHER; # used only during reload
3741		3866
3742	sub reload_perl() {	3867	sub reload_perl() {
3743	# doing reload synchronously and two reloads happen back-to-back,	3868	# doing reload synchronously and two reloads happen back-to-back,
3744	# coro crashes during coro_state_free->destroy here.	3869	# coro crashes during coro_state_free->destroy here.
3745		3870
		3871	$RELOAD_WATCHER \|\|= cf::async {
		3872	Coro::AIO::aio_wait cache_extensions;
		3873
3746	$RELOAD_WATCHER \|\|= EV::timer 0, 0, sub {	3874	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3747	do_reload_perl;	3875	do_reload_perl;
3748	undef $RELOAD_WATCHER;	3876	undef $RELOAD_WATCHER;
		3877	};
3749	};	3878	};
3750	}	3879	}
3751		3880
3752	register_command "reload" => sub {	3881	register_command "reload" => sub {
3753	my ($who, $arg) = @_;	3882	my ($who, $arg) = @_;
…		…
3879	$msg =~ s/\n//;	4008	$msg =~ s/\n//;
3880		4009
3881	# limit the # of concurrent backtraces	4010	# limit the # of concurrent backtraces
3882	if ($_log_backtrace < 2) {	4011	if ($_log_backtrace < 2) {
3883	++$_log_backtrace;	4012	++$_log_backtrace;
		4013	my $perl_bt = Carp::longmess $msg;
3884	async {	4014	async {
3885	$Coro::current->{desc} = "abt $msg";	4015	$Coro::current->{desc} = "abt $msg";
3886		4016
3887	my @bt = fork_call {	4017	my @bt = fork_call {
3888	@addr = map { sprintf "%x", $_ } @addr;	4018	@addr = map { sprintf "%x", $_ } @addr;
…		…
3899	}	4029	}
3900		4030
3901	@funcs	4031	@funcs
3902	};	4032	};
3903		4033
3904	LOG llevInfo, "[ABT] $msg\n";	4034	LOG llevInfo, "[ABT] $perl_bt\n";
		4035	LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3905	LOG llevInfo, "[ABT] $_\n" for @bt;	4036	LOG llevInfo, "[ABT] $_\n" for @bt;
3906	--$_log_backtrace;	4037	--$_log_backtrace;
3907	};	4038	};
3908	} else {	4039	} else {
3909	LOG llevInfo, "[ABT] $msg\n";	4040	LOG llevInfo, "[ABT] $msg\n";
3910	LOG llevInfo, "[ABT] [suppressed]\n";	4041	LOG llevInfo, "[ABT] [suppressed]\n";
3911	}	4042	}
3912	}	4043	}
3913		4044
3914	# load additional modules	4045	# load additional modules
3915	use cf::pod;	4046	require "cf/$_.pm" for @EXTRA_MODULES;
		4047	cf::_connect_to_perl_2;
3916		4048
3917	END { cf::emergency_save }	4049	END { cf::emergency_save }
3918		4050
3919	1	4051	1
3920		4052

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.442 by root, Sun Aug 31 09:03:31 2008 UTC vs. Revision 1.494 by root, Mon Oct 26 05:18:00 2009 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.442 by root, Sun Aug 31 09:03:31 2008 UTC vs.
Revision 1.494 by root, Mon Oct 26 05:18:00 2009 UTC