ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.408 by root, Mon Jan 14 10:12:12 2008 UTC vs.
Revision 1.476 by root, Wed Sep 2 16:54:20 2009 UTC

		1	#
		2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.
		3	#
		4	# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
		5	#
		6	# Deliantra is free software: you can redistribute it and/or modify
		7	# it under the terms of the GNU General Public License as published by
		8	# the Free Software Foundation, either version 3 of the License, or
		9	# (at your option) any later version.
		10	#
		11	# This program is distributed in the hope that it will be useful,
		12	# but WITHOUT ANY WARRANTY; without even the implied warranty of
		13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		14	# GNU General Public License for more details.
		15	#
		16	# You should have received a copy of the GNU General Public License
		17	# along with this program. If not, see <http://www.gnu.org/licenses/>.
		18	#
		19	# The authors can be reached via e-mail to <support@deliantra.net>
		20	#
		21
1	package cf;	22	package cf;
2		23
		24	use 5.10.0;
3	use utf8;	25	use utf8;
4	use strict;	26	use strict qw(vars subs);
5		27
6	use Symbol;	28	use Symbol;
7	use List::Util;	29	use List::Util;
8	use Socket;	30	use Socket;
9	use EV 1.86;	31	use EV;
10	use Opcode;	32	use Opcode;
11	use Safe;	33	use Safe;
12	use Safe::Hole;	34	use Safe::Hole;
13	use Storable ();	35	use Storable ();
14		36
		37	use Guard ();
15	use Coro 4.32 ();	38	use Coro ();
16	use Coro::State;	39	use Coro::State;
17	use Coro::Handle;	40	use Coro::Handle;
18	use Coro::EV;	41	use Coro::EV;
		42	use Coro::AnyEvent;
19	use Coro::Timer;	43	use Coro::Timer;
20	use Coro::Signal;	44	use Coro::Signal;
21	use Coro::Semaphore;	45	use Coro::Semaphore;
		46	use Coro::SemaphoreSet;
		47	use Coro::AnyEvent;
22	use Coro::AIO;	48	use Coro::AIO;
23	use Coro::BDB;	49	use Coro::BDB 1.6;
24	use Coro::Storable;	50	use Coro::Storable;
25	use Coro::Util ();	51	use Coro::Util ();
26		52
27	use JSON::XS 2.01 ();	53	use JSON::XS 2.01 ();
28	use BDB ();	54	use BDB ();
29	use Data::Dumper;	55	use Data::Dumper;
30	use Digest::MD5;	56	use Digest::MD5;
31	use Fcntl;	57	use Fcntl;
32	use YAML ();	58	use YAML ();
33	use IO::AIO 2.51 ();	59	use IO::AIO ();
34	use Time::HiRes;	60	use Time::HiRes;
35	use Compress::LZF;	61	use Compress::LZF;
36	use Digest::MD5 ();	62	use Digest::MD5 ();
		63
		64	AnyEvent::detect;
37		65
38	# configure various modules to our taste	66	# configure various modules to our taste
39	#	67	#
40	$Storable::canonical = 1; # reduce rsync transfers	68	$Storable::canonical = 1; # reduce rsync transfers
41	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator	69	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
		70
		71	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
		72
		73	# make sure c-lzf reinitialises itself
		74	Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
42	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later	75	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
43		76
44	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority	77	# strictly for debugging
		78	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45		79
46	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	80	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
47		81
48	our %COMMAND = ();	82	our %COMMAND = ();
49	our %COMMAND_TIME = ();	83	our %COMMAND_TIME = ();
…		…
52	our %EXTCMD = ();	86	our %EXTCMD = ();
53	our %EXTICMD = ();	87	our %EXTICMD = ();
54	our %EXT_CORO = (); # coroutines bound to extensions	88	our %EXT_CORO = (); # coroutines bound to extensions
55	our %EXT_MAP = (); # pluggable maps	89	our %EXT_MAP = (); # pluggable maps
56		90
57	our $RELOAD; # number of reloads so far	91	our $RELOAD; # number of reloads so far, non-zero while in reload
58	our @EVENT;	92	our @EVENT;
59		93
60	our $CONFDIR = confdir;	94	our $CONFDIR = confdir;
61	our $DATADIR = datadir;	95	our $DATADIR = datadir;
62	our $LIBDIR = "$DATADIR/ext";	96	our $LIBDIR = "$DATADIR/ext";
63	our $PODDIR = "$DATADIR/pod";	97	our $PODDIR = "$DATADIR/pod";
64	our $MAPDIR = "$DATADIR/" . mapdir;	98	our $MAPDIR = "$DATADIR/" . mapdir;
65	our $LOCALDIR = localdir;	99	our $LOCALDIR = localdir;
66	our $TMPDIR = "$LOCALDIR/" . tmpdir;	100	our $TMPDIR = "$LOCALDIR/" . tmpdir;
67	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	101	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	102	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69	our $RANDOMDIR = "$LOCALDIR/random";	103	our $RANDOMDIR = "$LOCALDIR/random";
70	our $BDBDIR = "$LOCALDIR/db";	104	our $BDBDIR = "$LOCALDIR/db";
		105	our $PIDFILE = "$LOCALDIR/pid";
		106	our $RUNTIMEFILE = "$LOCALDIR/runtime";
		107
71	our %RESOURCE;	108	our %RESOURCE;
72		109
73	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	110	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
74	our $TICK_WATCHER;
75	our $AIO_POLL_WATCHER;
76	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	111	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
77	our $NEXT_TICK;	112	our $NEXT_TICK;
78	our $USE_FSYNC = 1; # use fsync to write maps - default off	113	our $USE_FSYNC = 1; # use fsync to write maps - default on
79		114
80	our $BDB_POLL_WATCHER;
81	our $BDB_DEADLOCK_WATCHER;	115	our $BDB_DEADLOCK_WATCHER;
82	our $BDB_CHECKPOINT_WATCHER;	116	our $BDB_CHECKPOINT_WATCHER;
83	our $BDB_TRICKLE_WATCHER;	117	our $BDB_TRICKLE_WATCHER;
84	our $DB_ENV;	118	our $DB_ENV;
85		119
		120	our @EXTRA_MODULES = qw(pod mapscript);
		121
86	our %CFG;	122	our %CFG;
87		123
88	our $UPTIME; $UPTIME ||= time;	124	our $UPTIME; $UPTIME ||= time;
89	our $RUNTIME;	125	our $RUNTIME;
90	our $NOW;	126	our $NOW;
…		…
96	# used to convert map paths into valid unix filenames by replacing / by ∕	132	# used to convert map paths into valid unix filenames by replacing / by ∕
97	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	133	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98		134
99	our $LOAD; # a number between 0 (idle) and 1 (too many objects)	135	our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100	our $LOADAVG; # same thing, but with alpha-smoothing	136	our $LOADAVG; # same thing, but with alpha-smoothing
		137	our $JITTER; # average jitter
101	our $tick_start; # for load detecting purposes	138	our $TICK_START; # for load detecting purposes
		139
		140	our @POST_INIT;
		141
		142	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
		143	our $REALLY_UNLOOP; # never set to true, please :)
102		144
103	binmode STDOUT;	145	binmode STDOUT;
104	binmode STDERR;	146	binmode STDERR;
105		147
106	# read virtual server time, if available	148	# read virtual server time, if available
107	unless ($RUNTIME || !-e "$LOCALDIR/runtime") {	149	unless ($RUNTIME || !-e $RUNTIMEFILE) {
108	open my $fh, "<", "$LOCALDIR/runtime"	150	open my $fh, "<", $RUNTIMEFILE
109	or die "unable to read runtime file: $!";	151	or die "unable to read $RUNTIMEFILE file: $!";
110	$RUNTIME = <$fh> + 0.;	152	$RUNTIME = <$fh> + 0.;
111	}	153	}
		154
		155	eval "sub TICK() { $TICK } 1" or die;
112		156
113	mkdir $_	157	mkdir $_
114	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;	158	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
115		159
116	our $EMERGENCY_POSITION;	160	our $EMERGENCY_POSITION;
…		…
192	LOG llevError, $msg;	236	LOG llevError, $msg;
193	};	237	};
194	}	238	}
195		239
196	$Coro::State::DIEHOOK = sub {	240	$Coro::State::DIEHOOK = sub {
		241	return unless $^S eq 0; # "eq", not "=="
		242
		243	if ($Coro::current == $Coro::main) {#d#
		244	warn "DIEHOOK called in main context, Coro bug?\n";#d#
		245	return;#d#
		246	}#d#
		247
		248	# kill coroutine otherwise
197	warn Carp::longmess $_[0];	249	warn Carp::longmess $_[0];
198	Coro::terminate;	250	Coro::terminate
199	};	251	};
		252
		253	$SIG{__DIE__} = sub { }; #d#?
200		254
201	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	255	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
202	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	256	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
203	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	257	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
204	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	258	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
…		…
211	for my $pkg (qw(	265	for my $pkg (qw(
212	cf::global cf::attachable	266	cf::global cf::attachable
213	cf::object cf::object::player	267	cf::object cf::object::player
214	cf::client cf::player	268	cf::client cf::player
215	cf::arch cf::living	269	cf::arch cf::living
		270	cf::map cf::mapspace
216	cf::map cf::party cf::region	271	cf::party cf::region
217	)) {	272	)) {
218	no strict 'refs';
219	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	273	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
220	}	274	}
221		275
222	$EV::DIED = sub {	276	$EV::DIED = sub {
223	warn "error in event callback: @_";	277	warn "error in event callback: @_";
…		…
265	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	319	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
266		320
267	sub encode_json($) { $json_coder->encode ($_[0]) }	321	sub encode_json($) { $json_coder->encode ($_[0]) }
268	sub decode_json($) { $json_coder->decode ($_[0]) }	322	sub decode_json($) { $json_coder->decode ($_[0]) }
269		323
		324	=item cf::post_init { BLOCK }
		325
		326	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
		327	but I<before> the server starts ticking again.
		328
		329	The cdoeblock will have a single boolean argument to indicate whether this
		330	is a reload or not.
		331
		332	=cut
		333
		334	sub post_init(&) {
		335	push @POST_INIT, shift;
		336	}
		337
270	=item cf::lock_wait $string	338	=item cf::lock_wait $string
271		339
272	Wait until the given lock is available. See cf::lock_acquire.	340	Wait until the given lock is available. See cf::lock_acquire.
273		341
274	=item my $lock = cf::lock_acquire $string	342	=item my $lock = cf::lock_acquire $string
275		343
276	Wait until the given lock is available and then acquires it and returns	344	Wait until the given lock is available and then acquires it and returns
277	a Coro::guard object. If the guard object gets destroyed (goes out of scope,	345	a L<Guard> object. If the guard object gets destroyed (goes out of scope,
278	for example when the coroutine gets canceled), the lock is automatically	346	for example when the coroutine gets canceled), the lock is automatically
279	returned.	347	returned.
280		348
281	Locks are *not* recursive, locking from the same coro twice results in a	349	Locks are *not* recursive, locking from the same coro twice results in a
282	deadlocked coro.	350	deadlocked coro.
…		…
288		356
289	Return true if the lock is currently active, i.e. somebody has locked it.	357	Return true if the lock is currently active, i.e. somebody has locked it.
290		358
291	=cut	359	=cut
292		360
293	our %LOCK;	361	our $LOCKS = new Coro::SemaphoreSet;
294	our %LOCKER;#d#
295		362
296	sub lock_wait($) {	363	sub lock_wait($) {
297	my ($key) = @_;	364	$LOCKS->wait ($_[0]);
298
299	if ($LOCKER{$key} == $Coro::current) {#d#
300	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
301	return;#d#
302	}#d#
303
304	# wait for lock, if any
305	while ($LOCK{$key}) {
306	push @{ $LOCK{$key} }, $Coro::current;
307	Coro::schedule;
308	}
309	}	365	}
310		366
311	sub lock_acquire($) {	367	sub lock_acquire($) {
312	my ($key) = @_;	368	$LOCKS->guard ($_[0])
313
314	# wait, to be sure we are not locked
315	lock_wait $key;
316
317	$LOCK{$key} = [];
318	$LOCKER{$key} = $Coro::current;#d#
319
320	Coro::guard {
321	delete $LOCKER{$key};#d#
322	# wake up all waiters, to be on the safe side
323	$_->ready for @{ delete $LOCK{$key} };
324	}
325	}	369	}
326		370
327	sub lock_active($) {	371	sub lock_active($) {
328	my ($key) = @_;	372	$LOCKS->count ($_[0]) < 1
329
330	! ! $LOCK{$key}
331	}	373	}
332		374
333	sub freeze_mainloop {	375	sub freeze_mainloop {
334	return unless $TICK_WATCHER->is_active;	376	tick_inhibit_inc;
335		377
336	my $guard = Coro::guard {	378	&Guard::guard (\&tick_inhibit_dec);
337	$TICK_WATCHER->start;
338	};
339	$TICK_WATCHER->stop;
340	$guard
341	}	379	}
342		380
343	=item cf::periodic $interval, $cb	381	=item cf::periodic $interval, $cb
344		382
345	Like EV::periodic, but randomly selects a starting point so that the actions	383	Like EV::periodic, but randomly selects a starting point so that the actions
…		…
400	}	438	}
401	}	439	}
402	};	440	};
403		441
404	sub get_slot($;$$) {	442	sub get_slot($;$$) {
		443	return if tick_inhibit || $Coro::current == $Coro::main;
		444
405	my ($time, $pri, $name) = @_;	445	my ($time, $pri, $name) = @_;
406		446
407	$time = $TICK * .6 if $time > $TICK * .6;	447	$time = $TICK * .6 if $time > $TICK * .6;
408	my $sig = new Coro::Signal;	448	my $sig = new Coro::Signal;
409		449
…		…
446	# this is the main coro, too bad, we have to block	486	# this is the main coro, too bad, we have to block
447	# till the operation succeeds, freezing the server :/	487	# till the operation succeeds, freezing the server :/
448		488
449	LOG llevError, Carp::longmess "sync job";#d#	489	LOG llevError, Carp::longmess "sync job";#d#
450		490
451	# TODO: use suspend/resume instead
452	# (but this is cancel-safe)
453	my $freeze_guard = freeze_mainloop;	491	my $freeze_guard = freeze_mainloop;
454		492
455	my $busy = 1;	493	my $busy = 1;
456	my @res;	494	my @res;
457		495
…		…
468	} else {	506	} else {
469	EV::loop EV::LOOP_ONESHOT;	507	EV::loop EV::LOOP_ONESHOT;
470	}	508	}
471	}	509	}
472		510
473	$time = EV::time - $time;	511	my $time = EV::time - $time;
474		512
475	LOG llevError | logBacktrace, Carp::longmess "long sync job"
476	if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
477
478	$tick_start += $time; # do not account sync jobs to server load	513	$TICK_START += $time; # do not account sync jobs to server load
479		514
480	wantarray ? @res : $res[0]	515	wantarray ? @res : $res[0]
481	} else {	516	} else {
482	# we are in another coroutine, how wonderful, everything just works	517	# we are in another coroutine, how wonderful, everything just works
483		518
…		…
525	reset_signals;	560	reset_signals;
526	&$cb	561	&$cb
527	}, @args;	562	}, @args;
528		563
529	wantarray ? @res : $res[-1]	564	wantarray ? @res : $res[-1]
		565	}
		566
		567	=item $coin = coin_from_name $name
		568
		569	=cut
		570
		571	our %coin_alias = (
		572	"silver" => "silvercoin",
		573	"silvercoin" => "silvercoin",
		574	"silvercoins" => "silvercoin",
		575	"gold" => "goldcoin",
		576	"goldcoin" => "goldcoin",
		577	"goldcoins" => "goldcoin",
		578	"platinum" => "platinacoin",
		579	"platinumcoin" => "platinacoin",
		580	"platinumcoins" => "platinacoin",
		581	"platina" => "platinacoin",
		582	"platinacoin" => "platinacoin",
		583	"platinacoins" => "platinacoin",
		584	"royalty" => "royalty",
		585	"royalties" => "royalty",
		586	);
		587
		588	sub coin_from_name($) {
		589	$coin_alias{$_[0]}
		590	? cf::arch::find $coin_alias{$_[0]}
		591	: undef
530	}	592	}
531		593
532	=item $value = cf::db_get $family => $key	594	=item $value = cf::db_get $family => $key
533		595
534	Returns a single value from the environment database.	596	Returns a single value from the environment database.
…		…
673		735
674	#############################################################################	736	#############################################################################
675		737
676	=head2 ATTACHABLE OBJECTS	738	=head2 ATTACHABLE OBJECTS
677		739
678	Many objects in crossfire are so-called attachable objects. That means you can	740	Many objects in deliantra are so-called attachable objects. That means you can
679	attach callbacks/event handlers (a collection of which is called an "attachment")	741	attach callbacks/event handlers (a collection of which is called an "attachment")
680	to it. All such attachable objects support the following methods.	742	to it. All such attachable objects support the following methods.
681		743
682	In the following description, CLASS can be any of C<global>, C<object>	744	In the following description, CLASS can be any of C<global>, C<object>
683	C<player>, C<client> or C<map> (i.e. the attachable objects in	745	C<player>, C<client> or C<map> (i.e. the attachable objects in
…		…
733	=item cf::CLASS::attachment $name, ...	795	=item cf::CLASS::attachment $name, ...
734		796
735	Register an attachment by C<$name> through which attachable objects of the	797	Register an attachment by C<$name> through which attachable objects of the
736	given CLASS can refer to this attachment.	798	given CLASS can refer to this attachment.
737		799
738	Some classes such as crossfire maps and objects can specify attachments	800	Some classes such as deliantra maps and objects can specify attachments
739	that are attached at load/instantiate time, thus the need for a name.	801	that are attached at load/instantiate time, thus the need for a name.
740		802
741	These calls expect any number of the following handler/hook descriptions:	803	These calls expect any number of the following handler/hook descriptions:
742		804
743	=over 4	805	=over 4
…		…
1034		1096
1035	sub reattach {	1097	sub reattach {
1036	# basically do the same as instantiate, without calling instantiate	1098	# basically do the same as instantiate, without calling instantiate
1037	my ($obj) = @_;	1099	my ($obj) = @_;
1038		1100
		1101	# no longer needed after getting rid of delete_package?
1039	bless $obj, ref $obj; # re-bless in case extensions have been reloaded	1102	#bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1040		1103
1041	my $registry = $obj->registry;	1104	my $registry = $obj->registry;
1042		1105
1043	@$registry = ();	1106	@$registry = ();
1044		1107
…		…
1090	utf8::decode (my $decname = $filename);	1153	utf8::decode (my $decname = $filename);
1091	warn sprintf "saving %s (%d,%d)\n",	1154	warn sprintf "saving %s (%d,%d)\n",
1092	$decname, length $$rdata, scalar @$objs;	1155	$decname, length $$rdata, scalar @$objs;
1093		1156
1094	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1157	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1095	chmod SAVE_MODE, $fh;	1158	aio_chmod $fh, SAVE_MODE;
1096	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1159	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1097	aio_fsync $fh if $cf::USE_FSYNC;	1160	if ($cf::USE_FSYNC) {
		1161	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;
		1162	aio_fsync $fh;
		1163	}
1098	close $fh;	1164	aio_close $fh;
1099		1165
1100	if (@$objs) {	1166	if (@$objs) {
1101	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {	1167	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1102	chmod SAVE_MODE, $fh;	1168	aio_chmod $fh, SAVE_MODE;
1103	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };	1169	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1104	aio_write $fh, 0, (length $data), $data, 0;	1170	aio_write $fh, 0, (length $data), $data, 0;
1105	aio_fsync $fh if $cf::USE_FSYNC;	1171	if ($cf::USE_FSYNC) {
		1172	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;
		1173	aio_fsync $fh;
		1174	}
1106	close $fh;	1175	aio_close $fh;
1107	aio_rename "$filename.pst~", "$filename.pst";	1176	aio_rename "$filename.pst~", "$filename.pst";
1108	}	1177	}
1109	} else {	1178	} else {
1110	aio_unlink "$filename.pst";	1179	aio_unlink "$filename.pst";
1111	}	1180	}
1112		1181
1113	aio_rename "$filename~", $filename;	1182	aio_rename "$filename~", $filename;
		1183
		1184	$filename =~ s%/[^/]+$%%;
		1185	aio_pathsync $filename if $cf::USE_FSYNC;
1114	} else {	1186	} else {
1115	warn "FATAL: $filename~: $!\n";	1187	warn "unable to save objects: $filename~: $!\n";
1116	}	1188	}
1117	} else {	1189	} else {
1118	aio_unlink $filename;	1190	aio_unlink $filename;
1119	aio_unlink "$filename.pst";	1191	aio_unlink "$filename.pst";
1120	}	1192	}
…		…
1211	my ($name, $cb) = @_;	1283	my ($name, $cb) = @_;
1212		1284
1213	$EXTICMD{$name} = $cb;	1285	$EXTICMD{$name} = $cb;
1214	}	1286	}
1215		1287
		1288	use File::Glob ();
		1289
1216	cf::player->attach (	1290	cf::player->attach (
1217	on_command => sub {	1291	on_command => sub {
1218	my ($pl, $name, $params) = @_;	1292	my ($pl, $name, $params) = @_;
1219		1293
1220	my $cb = $COMMAND{$name}	1294	my $cb = $COMMAND{$name}
…		…
1252		1326
1253	cf::override;	1327	cf::override;
1254	},	1328	},
1255	);	1329	);
1256		1330
		1331	# "readahead" all extensions
		1332	sub cache_extensions {
		1333	my $grp = IO::AIO::aio_group;
		1334
		1335	add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
		1336	for (grep /\.ext$/, @{$_[0]}) {
		1337	add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
		1338	}
		1339	};
		1340
		1341	$grp
		1342	}
		1343
1257	sub load_extensions {	1344	sub load_extensions {
1258	cf::sync_job {	1345	cf::sync_job {
1259	my %todo;	1346	my %todo;
1260		1347
1261	for my $path (<$LIBDIR/*.ext>) {	1348	for my $path (<$LIBDIR/*.ext>) {
…		…
1280		1367
1281	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1368	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1282	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1369	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1283		1370
1284	$ext{source} =	1371	$ext{source} =
1285	"package $pkg; use strict; use utf8;\n"	1372	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1286	. "#line 1 \"$path\"\n{\n"	1373	. "#line 1 \"$path\"\n{\n"
1287	. $source	1374	. $source
1288	. "\n};\n1";	1375	. "\n};\n1";
1289		1376
1290	$todo{$base} = \%ext;	1377	$todo{$base} = \%ext;
…		…
1306	my $msg = $@ ? "$v->{path}: $@\n"	1393	my $msg = $@ ? "$v->{path}: $@\n"
1307	: "$v->{base}: extension inactive.\n";	1394	: "$v->{base}: extension inactive.\n";
1308		1395
1309	if (exists $v->{meta}{mandatory}) {	1396	if (exists $v->{meta}{mandatory}) {
1310	warn $msg;	1397	warn $msg;
1311	warn "mandatory extension failed to load, exiting.\n";	1398	cf::cleanup "mandatory extension failed to load, exiting.";
1312	exit 1;
1313	}	1399	}
1314		1400
1315	warn $msg;	1401	warn $msg;
1316	}	1402	}
1317		1403
…		…
1331		1417
1332	=back	1418	=back
1333		1419
1334	=head2 CORE EXTENSIONS	1420	=head2 CORE EXTENSIONS
1335		1421
1336	Functions and methods that extend core crossfire objects.	1422	Functions and methods that extend core deliantra objects.
1337		1423
1338	=cut	1424	=cut
1339		1425
1340	package cf::player;	1426	package cf::player;
1341		1427
…		…
1384		1470
1385	sub exists($) {	1471	sub exists($) {
1386	my ($login) = @_;	1472	my ($login) = @_;
1387		1473
1388	$cf::PLAYER{$login}	1474	$cf::PLAYER{$login}
1389	or cf::sync_job { !aio_stat path $login }	1475	or !aio_stat path $login
1390	}	1476	}
1391		1477
1392	sub find($) {	1478	sub find($) {
1393	return $cf::PLAYER{$_[0]} || do {	1479	return $cf::PLAYER{$_[0]} || do {
1394	my $login = $_[0];	1480	my $login = $_[0];
…		…
1406	my $f = new_from_file cf::object::thawer path $login	1492	my $f = new_from_file cf::object::thawer path $login
1407	or return;	1493	or return;
1408		1494
1409	my $pl = cf::player::load_pl $f	1495	my $pl = cf::player::load_pl $f
1410	or return;	1496	or return;
		1497
1411	local $cf::PLAYER_LOADING{$login} = $pl;	1498	local $cf::PLAYER_LOADING{$login} = $pl;
1412	$f->resolve_delayed_derefs;	1499	$f->resolve_delayed_derefs;
1413	$cf::PLAYER{$login} = $pl	1500	$cf::PLAYER{$login} = $pl
1414	}	1501	}
1415	}	1502	}
…		…
1425		1512
1426	return if $pl->{deny_save};	1513	return if $pl->{deny_save};
1427		1514
1428	aio_mkdir playerdir $pl, 0770;	1515	aio_mkdir playerdir $pl, 0770;
1429	$pl->{last_save} = $cf::RUNTIME;	1516	$pl->{last_save} = $cf::RUNTIME;
		1517
		1518	cf::get_slot 0.01;
1430		1519
1431	$pl->save_pl ($path);	1520	$pl->save_pl ($path);
1432	cf::cede_to_tick;	1521	cf::cede_to_tick;
1433	}	1522	}
1434		1523
…		…
1466	my ($pl) = @_;	1555	my ($pl) = @_;
1467		1556
1468	my $name = $pl->ob->name;	1557	my $name = $pl->ob->name;
1469		1558
1470	$pl->{deny_save} = 1;	1559	$pl->{deny_save} = 1;
1471	$pl->password ("*"); # this should lock out the player until we nuked the dir	1560	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1472		1561
1473	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1562	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1474	$pl->deactivate;	1563	$pl->deactivate;
		1564	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
		1565	$pl->ob->check_score;
1475	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1566	$pl->invoke (cf::EVENT_PLAYER_QUIT);
1476	$pl->ns->destroy if $pl->ns;	1567	$pl->ns->destroy if $pl->ns;
1477		1568
1478	my $path = playerdir $pl;	1569	my $path = playerdir $pl;
1479	my $temp = "$path~$cf::RUNTIME~deleting~";	1570	my $temp = "$path~$cf::RUNTIME~deleting~";
…		…
1518		1609
1519	for my $login (@$dirs) {	1610	for my $login (@$dirs) {
1520	my $path = path $login;	1611	my $path = path $login;
1521		1612
1522	# a .pst is a dead give-away for a valid player	1613	# a .pst is a dead give-away for a valid player
1523	unless (-e "$path.pst") {	1614	# if no pst file found, open and chekc for blocked users
		1615	if (aio_stat "$path.pst") {
1524	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;	1616	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1525	aio_read $fh, 0, 512, my $buf, 0 or next;	1617	aio_read $fh, 0, 512, my $buf, 0 or next;
1526	$buf !~ /^password -------------$/m or next; # official not-valid tag	1618	$buf !~ /^password -------------$/m or next; # official not-valid tag
1527	}	1619	}
1528		1620
…		…
1559	}	1651	}
1560		1652
1561	\@paths	1653	\@paths
1562	}	1654	}
1563		1655
1564	=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)	1656	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1565		1657
1566	Expand crossfire pod fragments into protocol xml.	1658	Expand deliantra pod fragments into protocol xml.
1567
1568	=cut
1569
1570	use re 'eval';
1571
1572	my $group;
1573	my $interior; $interior = qr{
1574	# match a pod interior sequence sans C<< >>
1575	(?:
1576	\ (.*?)\ (?{ $group = $^N })
1577	| < (??{$interior}) >
1578	)
1579	}x;
1580
1581	sub expand_cfpod {
1582	my ($self, $pod) = @_;
1583
1584	my $xml;
1585
1586	while () {
1587	if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1588	$group = $1;
1589
1590	$group =~ s/&/&amp;/g;
1591	$group =~ s/</&lt;/g;
1592
1593	$xml .= $group;
1594	} elsif ($pod =~ m%\G
1595	([BCGHITU])
1596	<
1597	(?:
1598	([^<>]*) (?{ $group = $^N })
1599	| < $interior >
1600	)
1601	>
1602	%gcsx
1603	) {
1604	my ($code, $data) = ($1, $group);
1605
1606	if ($code eq "B") {
1607	$xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1608	} elsif ($code eq "I") {
1609	$xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1610	} elsif ($code eq "U") {
1611	$xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1612	} elsif ($code eq "C") {
1613	$xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1614	} elsif ($code eq "T") {
1615	$xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1616	} elsif ($code eq "G") {
1617	my ($male, $female) = split /\|/, $data;
1618	$data = $self->gender ? $female : $male;
1619	$xml .= expand_cfpod ($self, $data);
1620	} elsif ($code eq "H") {
1621	$xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1622	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1623	"")
1624	[$self->{hintmode}];
1625	} else {
1626	$xml .= "error processing '$code($data)' directive";
1627	}
1628	} else {
1629	if ($pod =~ /\G(.+)/) {
1630	warn "parse error while expanding $pod (at $1)";
1631	}
1632	last;
1633	}
1634	}
1635
1636	for ($xml) {
1637	# create single paragraphs (very hackish)
1638	s/(?<=\S)\n(?=\w)/ /g;
1639
1640	# compress some whitespace
1641	s/\s+\n/\n/g; # ws line-ends
1642	s/\n\n+/\n/g; # double lines
1643	s/^\n+//; # beginning lines
1644	s/\n+$//; # ending lines
1645	}
1646
1647	$xml
1648	}
1649
1650	no re 'eval';
1651
1652	sub hintmode {
1653	$_[0]{hintmode} = $_[1] if @_ > 1;
1654	$_[0]{hintmode}
1655	}
1656		1659
1657	=item $player->ext_reply ($msgid, @msg)	1660	=item $player->ext_reply ($msgid, @msg)
1658		1661
1659	Sends an ext reply to the player.	1662	Sends an ext reply to the player.
1660		1663
…		…
1727	our $MAX_RESET = 3600;	1730	our $MAX_RESET = 3600;
1728	our $DEFAULT_RESET = 3000;	1731	our $DEFAULT_RESET = 3000;
1729		1732
1730	sub generate_random_map {	1733	sub generate_random_map {
1731	my ($self, $rmp) = @_;	1734	my ($self, $rmp) = @_;
		1735
		1736	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
		1737
1732	# mit "rum" bekleckern, nicht	1738	# mit "rum" bekleckern, nicht
1733	$self->_create_random_map (	1739	$self->_create_random_map (
1734	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},	1740	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1735	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},	1741	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1736	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},	1742	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
…		…
1858		1864
1859	# the temporary/swap location	1865	# the temporary/swap location
1860	sub save_path {	1866	sub save_path {
1861	my ($self) = @_;	1867	my ($self) = @_;
1862		1868
1863	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1869	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1864	"$TMPDIR/$path.map"	1870	"$TMPDIR/$path.map"
1865	}	1871	}
1866		1872
1867	# the unique path, undef == no special unique path	1873	# the unique path, undef == no special unique path
1868	sub uniq_path {	1874	sub uniq_path {
1869	my ($self) = @_;	1875	my ($self) = @_;
1870		1876
1871	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1877	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1872	"$UNIQUEDIR/$path"	1878	"$UNIQUEDIR/$path"
1873	}
1874
1875	# and all this just because we cannot iterate over
1876	# all maps in C++...
1877	sub change_all_map_light {
1878	my ($change) = @_;
1879
1880	$_->change_map_light ($change)
1881	for grep $_->outdoor, values %cf::MAP;
1882	}	1879	}
1883		1880
1884	sub decay_objects {	1881	sub decay_objects {
1885	my ($self) = @_;	1882	my ($self) = @_;
1886		1883
…		…
1970	sub find {	1967	sub find {
1971	my ($path, $origin) = @_;	1968	my ($path, $origin) = @_;
1972		1969
1973	$path = normalise $path, $origin && $origin->path;	1970	$path = normalise $path, $origin && $origin->path;
1974		1971
1975	cf::lock_wait "map_data:$path";#d#remove	1972	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1976	cf::lock_wait "map_find:$path";	1973	my $guard2 = cf::lock_acquire "map_find:$path";
1977		1974
1978	$cf::MAP{$path} || do {	1975	$cf::MAP{$path} || do {
1979	my $guard1 = cf::lock_acquire "map_find:$path";
1980	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1981
1982	my $map = new_from_path cf::map $path	1976	my $map = new_from_path cf::map $path
1983	or return;	1977	or return;
1984		1978
1985	$map->{last_save} = $cf::RUNTIME;	1979	$map->{last_save} = $cf::RUNTIME;
1986		1980
…		…
1988	or return;	1982	or return;
1989		1983
1990	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1984	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1991	# doing this can freeze the server in a sync job, obviously	1985	# doing this can freeze the server in a sync job, obviously
1992	#$cf::WAIT_FOR_TICK->wait;	1986	#$cf::WAIT_FOR_TICK->wait;
		1987	undef $guard2;
1993	undef $guard1;	1988	undef $guard1;
1994	undef $guard2;
1995	$map->reset;	1989	$map->reset;
1996	return find $path;	1990	return find $path;
1997	}	1991	}
1998		1992
1999	$cf::MAP{$path} = $map	1993	$cf::MAP{$path} = $map
…		…
2026	my $f = new_from_file cf::object::thawer $self->{load_path};	2020	my $f = new_from_file cf::object::thawer $self->{load_path};
2027	$f->skip_block;	2021	$f->skip_block;
2028	$self->_load_objects ($f)	2022	$self->_load_objects ($f)
2029	or return;	2023	or return;
2030		2024
2031	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	2025	$self->post_load_original
2032	if delete $self->{load_original};	2026	if delete $self->{load_original};
2033		2027
2034	if (my $uniq = $self->uniq_path) {	2028	if (my $uniq = $self->uniq_path) {
2035	utf8::encode $uniq;	2029	utf8::encode $uniq;
2036	unless (aio_stat $uniq) {	2030	unless (aio_stat $uniq) {
…		…
2054	unless ($self->{deny_activate}) {	2048	unless ($self->{deny_activate}) {
2055	$self->decay_objects;	2049	$self->decay_objects;
2056	$self->fix_auto_apply;	2050	$self->fix_auto_apply;
2057	$self->update_buttons;	2051	$self->update_buttons;
2058	cf::cede_to_tick;	2052	cf::cede_to_tick;
2059	$self->set_darkness_map;
2060	cf::cede_to_tick;
2061	$self->activate;	2053	$self->activate;
2062	}	2054	}
2063		2055
2064	$self->{last_save} = $cf::RUNTIME;	2056	$self->{last_save} = $cf::RUNTIME;
2065	$self->last_access ($cf::RUNTIME);	2057	$self->last_access ($cf::RUNTIME);
2066		2058
2067	$self->in_memory (cf::MAP_IN_MEMORY);	2059	$self->in_memory (cf::MAP_ACTIVE);
2068	}	2060	}
2069		2061
2070	$self->post_load;	2062	$self->post_load;
2071	}	2063	}
2072		2064
…		…
2130	my ($path, $origin, $load) = @_;	2122	my ($path, $origin, $load) = @_;
2131		2123
2132	$path = normalise $path, $origin && $origin->{path};	2124	$path = normalise $path, $origin && $origin->{path};
2133		2125
2134	if (my $map = $cf::MAP{$path}) {	2126	if (my $map = $cf::MAP{$path}) {
2135	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;	2127	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2136	}	2128	}
2137		2129
2138	$MAP_PREFETCH{$path} |= $load;	2130	$MAP_PREFETCH{$path} |= $load;
2139		2131
2140	$MAP_PREFETCHER ||= cf::async {	2132	$MAP_PREFETCHER ||= cf::async {
…		…
2177	cf::async {	2169	cf::async {
2178	$Coro::current->{desc} = "map player save";	2170	$Coro::current->{desc} = "map player save";
2179	$_->contr->save for $self->players;	2171	$_->contr->save for $self->players;
2180	};	2172	};
2181		2173
		2174	cf::get_slot 0.02;
		2175
2182	if ($uniq) {	2176	if ($uniq) {
2183	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);	2177	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2184	$self->_save_objects ($uniq, cf::IO_UNIQUES);	2178	$self->_save_objects ($uniq, cf::IO_UNIQUES);
2185	} else {	2179	} else {
2186	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);	2180	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
…		…
2194	$self->save;	2188	$self->save;
2195		2189
2196	my $lock = cf::lock_acquire "map_data:$self->{path}";	2190	my $lock = cf::lock_acquire "map_data:$self->{path}";
2197		2191
2198	return if $self->players;	2192	return if $self->players;
2199	return if $self->in_memory != cf::MAP_IN_MEMORY;	2193	return if $self->in_memory != cf::MAP_ACTIVE;
2200	return if $self->{deny_save};	2194	return if $self->{deny_save};
2201		2195
2202	$self->in_memory (cf::MAP_SWAPPED);	2196	$self->in_memory (cf::MAP_SWAPPED);
2203		2197
2204	$self->deactivate;	2198	$self->deactivate;
…		…
2322		2316
2323	sub unique_maps() {	2317	sub unique_maps() {
2324	[	2318	[
2325	map {	2319	map {
2326	utf8::decode $_;	2320	utf8::decode $_;
2327	/\.map$/	2321	s/\.map$//; # TODO future compatibility hack
		2322	/\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
		2323	? ()
2328	? normalise $_	2324	: normalise $_
2329	: ()
2330	} @{ aio_readdir $UNIQUEDIR or [] }	2325	} @{ aio_readdir $UNIQUEDIR or [] }
2331	]	2326	]
2332	}	2327	}
2333		2328
2334	package cf;
2335
2336	=back	2329	=back
2337		2330
2338	=head3 cf::object	2331	=head3 cf::object
2339		2332
2340	=cut	2333	=cut
…		…
2343		2336
2344	=over 4	2337	=over 4
2345		2338
2346	=item $ob->inv_recursive	2339	=item $ob->inv_recursive
2347		2340
2348	Returns the inventory of the object _and_ their inventories, recursively.	2341	Returns the inventory of the object I<and> their inventories, recursively,
		2342	but I<not> the object itself.
2349		2343
2350	=cut	2344	=cut
2351		2345
2352	sub inv_recursive_;	2346	sub inv_recursive_;
2353	sub inv_recursive_ {	2347	sub inv_recursive_ {
…		…
2358	inv_recursive_ inv $_[0]	2352	inv_recursive_ inv $_[0]
2359	}	2353	}
2360		2354
2361	=item $ref = $ob->ref	2355	=item $ref = $ob->ref
2362		2356
2363	creates and returns a persistent reference to an objetc that can be stored as a string.	2357	Creates and returns a persistent reference to an object that can be stored as a string.
2364		2358
2365	=item $ob = cf::object::deref ($refstring)	2359	=item $ob = cf::object::deref ($refstring)
2366		2360
2367	returns the objetc referenced by refstring. may return undef when it cnanot find the object,	2361	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2368	even if the object actually exists. May block.	2362	even if the object actually exists. May block.
…		…
2400	can be C<undef>. Does the right thing when the player is currently in a	2394	can be C<undef>. Does the right thing when the player is currently in a
2401	dialogue with the given NPC character.	2395	dialogue with the given NPC character.
2402		2396
2403	=cut	2397	=cut
2404		2398
		2399	our $SAY_CHANNEL = {
		2400	id => "say",
		2401	title => "Map",
		2402	reply => "say ",
		2403	tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
		2404	};
		2405
		2406	our $CHAT_CHANNEL = {
		2407	id => "chat",
		2408	title => "Chat",
		2409	reply => "chat ",
		2410	tooltip => "Player chat and shouts, global to the server.",
		2411	};
		2412
2405	# rough implementation of a future "reply" method that works	2413	# rough implementation of a future "reply" method that works
2406	# with dialog boxes.	2414	# with dialog boxes.
2407	#TODO: the first argument must go, split into a $npc->reply_to ( method	2415	#TODO: the first argument must go, split into a $npc->reply_to ( method
2408	sub cf::object::player::reply($$$;$) {	2416	sub cf::object::player::reply($$$;$) {
2409	my ($self, $npc, $msg, $flags) = @_;	2417	my ($self, $npc, $msg, $flags) = @_;
…		…
2420	my $dialog = $pl->{npc_dialog};	2428	my $dialog = $pl->{npc_dialog};
2421	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));	2429	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2422		2430
2423	} else {	2431	} else {
2424	$msg = $npc->name . " says: $msg" if $npc;	2432	$msg = $npc->name . " says: $msg" if $npc;
2425	$self->message ($msg, $flags);	2433	$self->send_msg ($SAY_CHANNEL => $msg, $flags);
2426	}	2434	}
2427	}	2435	}
2428	}	2436	}
2429		2437
2430	=item $object->send_msg ($channel, $msg, $color, [extra...])	2438	=item $object->send_msg ($channel, $msg, $color, [extra...])
…		…
2455		2463
2456	=item $player_object->enter_link	2464	=item $player_object->enter_link
2457		2465
2458	Freezes the player and moves him/her to a special map (C<{link}>).	2466	Freezes the player and moves him/her to a special map (C<{link}>).
2459		2467
2460	The player should be reasonably safe there for short amounts of time. You	2468	The player should be reasonably safe there for short amounts of time (e.g.
2461	I<MUST> call C<leave_link> as soon as possible, though.	2469	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
		2470	though, as the palyer cannot control the character while it is on the link
		2471	map.
2462		2472
2463	Will never block.	2473	Will never block.
2464		2474
2465	=item $player_object->leave_link ($map, $x, $y)	2475	=item $player_object->leave_link ($map, $x, $y)
2466		2476
…		…
2524		2534
2525	$map->load;	2535	$map->load;
2526	$map->load_neighbours;	2536	$map->load_neighbours;
2527		2537
2528	return unless $self->contr->active;	2538	return unless $self->contr->active;
2529	$self->activate_recursive;
2530		2539
2531	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2540	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2532	$self->enter_map ($map, $x, $y);	2541	$self->enter_map ($map, $x, $y);
		2542
		2543	# only activate afterwards, to support waiting in hooks
		2544	$self->activate_recursive;
2533	}	2545	}
2534		2546
2535	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2547	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2536		2548
2537	Moves the player to the given map-path and coordinates by first freezing	2549	Moves the player to the given map-path and coordinates by first freezing
2538	her, loading and preparing them map, calling the provided $check callback	2550	her, loading and preparing them map, calling the provided $check callback
2539	that has to return the map if sucecssful, and then unfreezes the player on	2551	that has to return the map if sucecssful, and then unfreezes the player on
2540	the new (success) or old (failed) map position. In either case, $done will	2552	the new (success) or old (failed) map position. In either case, $done will
2541	be called at the end of this process.	2553	be called at the end of this process.
		2554
		2555	Note that $check will be called with a potentially non-loaded map, so if
		2556	it needs a loaded map it has to call C<< ->load >>.
2542		2557
2543	=cut	2558	=cut
2544		2559
2545	our $GOTOGEN;	2560	our $GOTOGEN;
2546		2561
…		…
2625	}	2640	}
2626		2641
2627	sub prepare_random_map {	2642	sub prepare_random_map {
2628	my ($exit) = @_;	2643	my ($exit) = @_;
2629		2644
2630	my $guard = cf::lock_acquire "exit_prepare:$exit";
2631
2632	# all this does is basically replace the /! path by	2645	# all this does is basically replace the /! path by
2633	# a new random map path (?random/...) with a seed	2646	# a new random map path (?random/...) with a seed
2634	# that depends on the exit object	2647	# that depends on the exit object
2635		2648
2636	my $rmp = parse_random_map_params $exit->msg;	2649	my $rmp = parse_random_map_params $exit->msg;
…		…
2638	if ($exit->map) {	2651	if ($exit->map) {
2639	$rmp->{region} = $exit->region->name;	2652	$rmp->{region} = $exit->region->name;
2640	$rmp->{origin_map} = $exit->map->path;	2653	$rmp->{origin_map} = $exit->map->path;
2641	$rmp->{origin_x} = $exit->x;	2654	$rmp->{origin_x} = $exit->x;
2642	$rmp->{origin_y} = $exit->y;	2655	$rmp->{origin_y} = $exit->y;
		2656
		2657	$exit->map->touch;
2643	}	2658	}
2644		2659
2645	$rmp->{random_seed} ||= $exit->random_seed;	2660	$rmp->{random_seed} ||= $exit->random_seed;
2646		2661
2647	my $data = cf::encode_json $rmp;	2662	my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2648	my $md5 = Digest::MD5::md5_hex $data;	2663	my $md5 = Digest::MD5::md5_hex $data;
2649	my $meta = "$RANDOMDIR/$md5.meta";	2664	my $meta = "$RANDOMDIR/$md5.meta";
2650		2665
2651	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {	2666	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2652	aio_write $fh, 0, (length $data), $data, 0;	2667	aio_write $fh, 0, (length $data), $data, 0;
2653	undef $fh;	2668	undef $fh;
2654	aio_rename "$meta~", $meta;	2669	aio_rename "$meta~", $meta;
2655		2670
		2671	my $slaying = "?random/$md5";
		2672
		2673	if ($exit->valid) {
2656	$exit->slaying ("?random/$md5");	2674	$exit->slaying ("?random/$md5");
2657	$exit->msg (undef);	2675	$exit->msg (undef);
		2676	}
2658	}	2677	}
2659	}	2678	}
2660		2679
2661	sub cf::object::player::enter_exit {	2680	sub cf::object::player::enter_exit {
2662	my ($self, $exit) = @_;	2681	my ($self, $exit) = @_;
2663		2682
2664	return unless $self->type == cf::PLAYER;	2683	return unless $self->type == cf::PLAYER;
2665		2684
2666	if ($exit->slaying eq "/!") {
2667	#TODO: this should de-fi-ni-te-ly not be a sync-job
2668	# the problem is that $exit might not survive long enough
2669	# so it needs to be done right now, right here
2670	cf::sync_job { prepare_random_map $exit };
2671	}
2672
2673	my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2674	my $hp = $exit->stats->hp;
2675	my $sp = $exit->stats->sp;
2676
2677	$self->enter_link;	2685	$self->enter_link;
2678		2686
2679	# if exit is damned, update players death & WoR home-position
2680	$self->contr->savebed ($slaying, $hp, $sp)
2681	if $exit->flag (FLAG_DAMNED);
2682
2683	(async {	2687	(async {
2684	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";	2688	$Coro::current->{desc} = "enter_exit";
2685		2689
2686	$self->deactivate_recursive; # just to be sure
2687	unless (eval {	2690	unless (eval {
		2691	$self->deactivate_recursive; # just to be sure
		2692
		2693	# random map handling
		2694	{
		2695	my $guard = cf::lock_acquire "exit_prepare:$exit";
		2696
		2697	prepare_random_map $exit
		2698	if $exit->slaying eq "/!";
		2699	}
		2700
		2701	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
		2702	my $x = $exit->stats->hp;
		2703	my $y = $exit->stats->sp;
		2704
2688	$self->goto ($slaying, $hp, $sp);	2705	$self->goto ($map, $x, $y);
2689		2706
		2707	# if exit is damned, update players death & WoR home-position
		2708	$self->contr->savebed ($map, $x, $y)
		2709	if $exit->flag (cf::FLAG_DAMNED);
		2710
2690	1;	2711	1
2691	}) {	2712	}) {
2692	$self->message ("Something went wrong deep within the crossfire server. "	2713	$self->message ("Something went wrong deep within the deliantra server. "
2693	. "I'll try to bring you back to the map you were before. "	2714	. "I'll try to bring you back to the map you were before. "
2694	. "Please report this to the dungeon master!",	2715	. "Please report this to the dungeon master!",
2695	cf::NDI_UNIQUE | cf::NDI_RED);	2716	cf::NDI_UNIQUE | cf::NDI_RED);
2696		2717
2697	warn "ERROR in enter_exit: $@";	2718	warn "ERROR in enter_exit: $@";
…		…
2763	id => "infobox",	2784	id => "infobox",
2764	title => "Body Parts",	2785	title => "Body Parts",
2765	reply => undef,	2786	reply => undef,
2766	tooltip => "Shows which body parts you posess and are available",	2787	tooltip => "Shows which body parts you posess and are available",
2767	},	2788	},
		2789	"c/statistics" => {
		2790	id => "infobox",
		2791	title => "Statistics",
		2792	reply => undef,
		2793	tooltip => "Shows your primary statistics",
		2794	},
		2795	"c/skills" => {
		2796	id => "infobox",
		2797	title => "Skills",
		2798	reply => undef,
		2799	tooltip => "Shows your experience per skill and item power",
		2800	},
		2801	"c/shopitems" => {
		2802	id => "infobox",
		2803	title => "Shop Items",
		2804	reply => undef,
		2805	tooltip => "Shows the items currently for sale in this shop",
		2806	},
		2807	"c/resistances" => {
		2808	id => "infobox",
		2809	title => "Resistances",
		2810	reply => undef,
		2811	tooltip => "Shows your resistances",
		2812	},
		2813	"c/pets" => {
		2814	id => "infobox",
		2815	title => "Pets",
		2816	reply => undef,
		2817	tooltip => "Shows information abotu your pets/a specific pet",
		2818	},
		2819	"c/perceiveself" => {
		2820	id => "infobox",
		2821	title => "Perceive Self",
		2822	reply => undef,
		2823	tooltip => "You gained detailed knowledge about yourself",
		2824	},
2768	"c/uptime" => {	2825	"c/uptime" => {
2769	id => "infobox",	2826	id => "infobox",
2770	title => "Uptime",	2827	title => "Uptime",
2771	reply => undef,	2828	reply => undef,
2772	tooltip => "How long the server has been running since last restart",	2829	tooltip => "How long the server has been running since last restart",
…		…
2775	id => "infobox",	2832	id => "infobox",
2776	title => "Map Info",	2833	title => "Map Info",
2777	reply => undef,	2834	reply => undef,
2778	tooltip => "Information related to the maps",	2835	tooltip => "Information related to the maps",
2779	},	2836	},
		2837	"c/party" => {
		2838	id => "party",
		2839	title => "Party",
		2840	reply => "gsay ",
		2841	tooltip => "Messages and chat related to your party",
		2842	},
		2843	"c/death" => {
		2844	id => "death",
		2845	title => "Death",
		2846	reply => undef,
		2847	tooltip => "Reason for and more info about your most recent death",
		2848	},
		2849	"c/say" => $SAY_CHANNEL,
		2850	"c/chat" => $CHAT_CHANNEL,
2780	);	2851	);
2781		2852
2782	sub cf::client::send_msg {	2853	sub cf::client::send_msg {
2783	my ($self, $channel, $msg, $color, @extra) = @_;	2854	my ($self, $channel, $msg, $color, @extra) = @_;
2784		2855
2785	$msg = $self->pl->expand_cfpod ($msg);	2856	$msg = $self->pl->expand_cfpod ($msg)
		2857	unless $color & cf::NDI_VERBATIM;
2786		2858
2787	$color &= cf::NDI_CLIENT_MASK; # just in case...	2859	$color &= cf::NDI_CLIENT_MASK; # just in case...
2788		2860
2789	# check predefined channels, for the benefit of C	2861	# check predefined channels, for the benefit of C
2790	if ($CHANNEL{$channel}) {	2862	if ($CHANNEL{$channel}) {
2791	$channel = $CHANNEL{$channel};	2863	$channel = $CHANNEL{$channel};
2792		2864
2793	$self->ext_msg (channel_info => $channel)	2865	$self->ext_msg (channel_info => $channel);
2794	if $self->can_msg;
2795
2796	$channel = $channel->{id};	2866	$channel = $channel->{id};
2797		2867
2798	} elsif (ref $channel) {	2868	} elsif (ref $channel) {
2799	# send meta info to client, if not yet sent	2869	# send meta info to client, if not yet sent
2800	unless (exists $self->{channel}{$channel->{id}}) {	2870	unless (exists $self->{channel}{$channel->{id}}) {
2801	$self->{channel}{$channel->{id}} = $channel;	2871	$self->{channel}{$channel->{id}} = $channel;
2802	$self->ext_msg (channel_info => $channel)	2872	$self->ext_msg (channel_info => $channel);
2803	if $self->can_msg;
2804	}	2873	}
2805		2874
2806	$channel = $channel->{id};	2875	$channel = $channel->{id};
2807	}	2876	}
2808		2877
2809	return unless @extra || length $msg;	2878	return unless @extra || length $msg;
2810		2879
2811	if ($self->can_msg) {
2812	# default colour, mask it out	2880	# default colour, mask it out
2813	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)	2881	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2814	if $color & cf::NDI_DEF;	2882	if $color & cf::NDI_DEF;
2815		2883
2816	$self->send_packet ("msg " . $self->{json_coder}->encode (	2884	my $pkt = "msg "
		2885	. $self->{json_coder}->encode (
2817	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));	2886	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2818	} else {	2887	);
2819	if ($color >= 0) {
2820	# replace some tags by gcfclient-compatible ones
2821	for ($msg) {
2822	1 while
2823	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2824	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2825	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2826	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2827	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2828	}
2829		2888
2830	$color &= cf::NDI_COLOR_MASK;	2889	# try lzf for large packets
		2890	$pkt = "lzf " . Compress::LZF::compress $pkt
		2891	if 1024 <= length $pkt and $self->{can_lzf};
2831		2892
2832	utf8::encode $msg;	2893	# split very large packets
2833		2894	if (8192 < length $pkt and $self->{can_lzf}) {
2834	if (0 && $msg =~ /\[/) {	2895	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2835	# COMMAND/INFO	2896	$pkt = "frag";
2836	$self->send_packet ("drawextinfo $color 10 8 $msg")
2837	} else {
2838	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2839	$self->send_packet ("drawinfo $color $msg")
2840	}
2841	}
2842	}	2897	}
		2898
		2899	$self->send_packet ($pkt);
2843	}	2900	}
2844		2901
2845	=item $client->ext_msg ($type, @msg)	2902	=item $client->ext_msg ($type, @msg)
2846		2903
2847	Sends an ext event to the client.	2904	Sends an ext event to the client.
…		…
3021		3078
3022	The following functions and methods are available within a safe environment:	3079	The following functions and methods are available within a safe environment:
3023		3080
3024	cf::object	3081	cf::object
3025	contr pay_amount pay_player map x y force_find force_add destroy	3082	contr pay_amount pay_player map x y force_find force_add destroy
3026	insert remove name archname title slaying race decrease_ob_nr	3083	insert remove name archname title slaying race decrease split
		3084	value
3027		3085
3028	cf::object::player	3086	cf::object::player
3029	player	3087	player
3030		3088
3031	cf::player	3089	cf::player
…		…
3036		3094
3037	=cut	3095	=cut
3038		3096
3039	for (	3097	for (
3040	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	3098	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3041	insert remove inv name archname title slaying race	3099	insert remove inv nrof name archname title slaying race
3042	decrease_ob_nr destroy)],	3100	decrease split destroy change_exp value msg lore send_msg)],
3043	["cf::object::player" => qw(player)],	3101	["cf::object::player" => qw(player)],
3044	["cf::player" => qw(peaceful)],	3102	["cf::player" => qw(peaceful send_msg)],
3045	["cf::map" => qw(trigger)],	3103	["cf::map" => qw(trigger)],
3046	) {	3104	) {
3047	no strict 'refs';	3105	no strict 'refs';
3048	my ($pkg, @funs) = @$_;	3106	my ($pkg, @funs) = @$_;
3049	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3107	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
…		…
3066	my ($code, %vars) = @_;	3124	my ($code, %vars) = @_;
3067		3125
3068	my $qcode = $code;	3126	my $qcode = $code;
3069	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3127	$qcode =~ s/"/‟/g; # not allowed in #line filenames
3070	$qcode =~ s/\n/\\n/g;	3128	$qcode =~ s/\n/\\n/g;
		3129
		3130	%vars = (_dummy => 0) unless %vars;
3071		3131
3072	local $_;	3132	local $_;
3073	local @safe::cf::_safe_eval_args = values %vars;	3133	local @safe::cf::_safe_eval_args = values %vars;
3074		3134
3075	my $eval =	3135	my $eval =
…		…
3255	while (my ($k, $v) = each %$want) {	3315	while (my ($k, $v) = each %$want) {
3256	$ns->fx_want ($k, $v);	3316	$ns->fx_want ($k, $v);
3257	}	3317	}
3258	};	3318	};
3259		3319
		3320	sub load_resource_file($) {
		3321	my $guard = lock_acquire "load_resource_file";
		3322
		3323	my $status = load_resource_file_ $_[0];
		3324	get_slot 0.1, 100;
		3325	cf::arch::commit_load;
		3326
		3327	$status
		3328	}
		3329
3260	sub reload_regions {	3330	sub reload_regions {
3261	# HACK to clear player env face cache, we need some signal framework	3331	# HACK to clear player env face cache, we need some signal framework
3262	# for this (global event?)	3332	# for this (global event?)
3263	%ext::player_env::MUSIC_FACE_CACHE = ();	3333	%ext::player_env::MUSIC_FACE_CACHE = ();
3264		3334
…		…
3277	}	3347	}
3278		3348
3279	sub reload_archetypes {	3349	sub reload_archetypes {
3280	load_resource_file "$DATADIR/archetypes"	3350	load_resource_file "$DATADIR/archetypes"
3281	or die "unable to load archetypes\n";	3351	or die "unable to load archetypes\n";
3282	#d# NEED to laod twice to resolve forward references
3283	# this really needs to be done in an extra post-pass
3284	# (which needs to be synchronous, so solve it differently)
3285	load_resource_file "$DATADIR/archetypes"
3286	or die "unable to load archetypes\n";
3287	}	3352	}
3288		3353
3289	sub reload_treasures {	3354	sub reload_treasures {
3290	load_resource_file "$DATADIR/treasures"	3355	load_resource_file "$DATADIR/treasures"
3291	or die "unable to load treasurelists\n";	3356	or die "unable to load treasurelists\n";
3292	}	3357	}
3293		3358
3294	sub reload_resources {	3359	sub reload_resources {
3295	warn "reloading resource files...\n";	3360	warn "reloading resource files...\n";
3296		3361
		3362	reload_facedata;
		3363	reload_archetypes;
3297	reload_regions;	3364	reload_regions;
3298	reload_facedata;
3299	#reload_archetypes;#d#
3300	reload_archetypes;
3301	reload_treasures;	3365	reload_treasures;
3302		3366
3303	warn "finished reloading resource files\n";	3367	warn "finished reloading resource files\n";
3304	}
3305
3306	sub init {
3307	reload_resources;
3308	}	3368	}
3309		3369
3310	sub reload_config {	3370	sub reload_config {
3311	open my $fh, "<:utf8", "$CONFDIR/config"	3371	open my $fh, "<:utf8", "$CONFDIR/config"
3312	or return;	3372	or return;
…		…
3326	};	3386	};
3327	warn $@ if $@;	3387	warn $@ if $@;
3328	}	3388	}
3329	}	3389	}
3330		3390
		3391	sub pidfile() {
		3392	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
		3393	or die "$PIDFILE: $!";
		3394	flock $fh, &Fcntl::LOCK_EX
		3395	or die "$PIDFILE: flock: $!";
		3396	$fh
		3397	}
		3398
		3399	# make sure only one server instance is running at any one time
		3400	sub atomic {
		3401	my $fh = pidfile;
		3402
		3403	my $pid = <$fh>;
		3404	kill 9, $pid if $pid > 0;
		3405
		3406	seek $fh, 0, 0;
		3407	print $fh $$;
		3408	}
		3409
		3410	sub main_loop {
		3411	warn "EV::loop starting\n";
		3412	if (1) {
		3413	EV::loop;
		3414	}
		3415	warn "EV::loop returned\n";
		3416	goto &main_loop unless $REALLY_UNLOOP;
		3417	}
		3418
3331	sub main {	3419	sub main {
		3420	cf::init_globals; # initialise logging
		3421
		3422	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
		3423	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
		3424	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
		3425	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
		3426
		3427	cf::init_experience;
		3428	cf::init_anim;
		3429	cf::init_attackmess;
		3430	cf::init_dynamic;
		3431
		3432	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
		3433
3332	# we must not ever block the main coroutine	3434	# we must not ever block the main coroutine
3333	local $Coro::idle = sub {	3435	local $Coro::idle = sub {
3334	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3436	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3335	(async {	3437	(async {
3336	$Coro::current->{desc} = "IDLE BUG HANDLER";	3438	$Coro::current->{desc} = "IDLE BUG HANDLER";
3337	EV::loop EV::LOOP_ONESHOT;	3439	EV::loop EV::LOOP_ONESHOT;
3338	})->prio (Coro::PRIO_MAX);	3440	})->prio (Coro::PRIO_MAX);
3339	};	3441	};
3340		3442
		3443	evthread_start IO::AIO::poll_fileno;
		3444
		3445	cf::sync_job {
		3446	reload_resources;
3341	reload_config;	3447	reload_config;
3342	db_init;	3448	db_init;
		3449
		3450	cf::load_settings;
		3451	cf::load_materials;
		3452	cf::init_uuid;
		3453	cf::init_signals;
		3454	cf::init_commands;
		3455	cf::init_skills;
		3456
		3457	cf::init_beforeplay;
		3458
		3459	atomic;
		3460
3343	load_extensions;	3461	load_extensions;
3344		3462
3345	$TICK_WATCHER->start;	3463	utime time, time, $RUNTIMEFILE;
3346	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3464
3347	EV::loop;	3465	# no (long-running) fork's whatsoever before this point(!)
		3466	use POSIX ();
		3467	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
		3468
		3469	(pop @POST_INIT)->(0) while @POST_INIT;
		3470	};
		3471
		3472	main_loop;
3348	}	3473	}
3349		3474
3350	#############################################################################	3475	#############################################################################
3351	# initialisation and cleanup	3476	# initialisation and cleanup
3352		3477
…		…
3358	cf::cleanup "SIG$signal";	3483	cf::cleanup "SIG$signal";
3359	};	3484	};
3360	}	3485	}
3361	}	3486	}
3362		3487
3363	sub write_runtime {	3488	sub write_runtime_sync {
3364	my $runtime = "$LOCALDIR/runtime";
3365
3366	# first touch the runtime file to show we are still running:	3489	# first touch the runtime file to show we are still running:
3367	# the fsync below can take a very very long time.	3490	# the fsync below can take a very very long time.
3368		3491
3369	IO::AIO::aio_utime $runtime, undef, undef;	3492	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3370		3493
3371	my $guard = cf::lock_acquire "write_runtime";	3494	my $guard = cf::lock_acquire "write_runtime";
3372		3495
3373	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644	3496	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3374	or return;	3497	or return;
3375		3498
3376	my $value = $cf::RUNTIME + 90 + 10;	3499	my $value = $cf::RUNTIME + 90 + 10;
3377	# 10 is the runtime save interval, for a monotonic clock	3500	# 10 is the runtime save interval, for a monotonic clock
3378	# 60 allows for the watchdog to kill the server.	3501	# 60 allows for the watchdog to kill the server.
…		…
3388	aio_utime $fh, undef, undef;	3511	aio_utime $fh, undef, undef;
3389		3512
3390	close $fh	3513	close $fh
3391	or return;	3514	or return;
3392		3515
3393	aio_rename "$runtime~", $runtime	3516	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3394	and return;	3517	and return;
3395		3518
3396	warn "runtime file written.\n";	3519	warn "runtime file written.\n";
3397		3520
3398	1	3521	1
		3522	}
		3523
		3524	our $uuid_lock;
		3525	our $uuid_skip;
		3526
		3527	sub write_uuid_sync($) {
		3528	$uuid_skip ||= $_[0];
		3529
		3530	return if $uuid_lock;
		3531	local $uuid_lock = 1;
		3532
		3533	my $uuid = "$LOCALDIR/uuid";
		3534
		3535	my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
		3536	or return;
		3537
		3538	my $value = uuid_seq uuid_cur;
		3539
		3540	unless ($value) {
		3541	warn "cowardly refusing to write zero uuid value!\n";
		3542	return;
		3543	}
		3544
		3545	my $value = uuid_str $value + $uuid_skip;
		3546	$uuid_skip = 0;
		3547
		3548	(aio_write $fh, 0, (length $value), $value, 0) <= 0
		3549	and return;
		3550
		3551	# always fsync - this file is important
		3552	aio_fsync $fh
		3553	and return;
		3554
		3555	close $fh
		3556	or return;
		3557
		3558	aio_rename "$uuid~", $uuid
		3559	and return;
		3560
		3561	warn "uuid file written ($value).\n";
		3562
		3563	1
		3564
		3565	}
		3566
		3567	sub write_uuid($$) {
		3568	my ($skip, $sync) = @_;
		3569
		3570	$sync ? write_uuid_sync $skip
		3571	: async { write_uuid_sync $skip };
3399	}	3572	}
3400		3573
3401	sub emergency_save() {	3574	sub emergency_save() {
3402	my $freeze_guard = cf::freeze_mainloop;	3575	my $freeze_guard = cf::freeze_mainloop;
3403		3576
3404	warn "enter emergency perl save\n";	3577	warn "emergency_perl_save: enter\n";
3405		3578
3406	cf::sync_job {	3579	cf::sync_job {
		3580	# this is a trade-off: we want to be very quick here, so
		3581	# save all maps without fsync, and later call a global sync
		3582	# (which in turn might be very very slow)
		3583	local $USE_FSYNC = 0;
		3584
3407	# use a peculiar iteration method to avoid tripping on perl	3585	# use a peculiar iteration method to avoid tripping on perl
3408	# refcount bugs in for. also avoids problems with players	3586	# refcount bugs in for. also avoids problems with players
3409	# and maps saved/destroyed asynchronously.	3587	# and maps saved/destroyed asynchronously.
3410	warn "begin emergency player save\n";	3588	warn "emergency_perl_save: begin player save\n";
3411	for my $login (keys %cf::PLAYER) {	3589	for my $login (keys %cf::PLAYER) {
3412	my $pl = $cf::PLAYER{$login} or next;	3590	my $pl = $cf::PLAYER{$login} or next;
3413	$pl->valid or next;	3591	$pl->valid or next;
3414	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3592	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3415	$pl->save;	3593	$pl->save;
3416	}	3594	}
3417	warn "end emergency player save\n";	3595	warn "emergency_perl_save: end player save\n";
3418		3596
3419	warn "begin emergency map save\n";	3597	warn "emergency_perl_save: begin map save\n";
3420	for my $path (keys %cf::MAP) {	3598	for my $path (keys %cf::MAP) {
3421	my $map = $cf::MAP{$path} or next;	3599	my $map = $cf::MAP{$path} or next;
3422	$map->valid or next;	3600	$map->valid or next;
3423	$map->save;	3601	$map->save;
3424	}	3602	}
3425	warn "end emergency map save\n";	3603	warn "emergency_perl_save: end map save\n";
3426		3604
3427	warn "begin emergency database checkpoint\n";	3605	warn "emergency_perl_save: begin database checkpoint\n";
3428	BDB::db_env_txn_checkpoint $DB_ENV;	3606	BDB::db_env_txn_checkpoint $DB_ENV;
3429	warn "end emergency database checkpoint\n";	3607	warn "emergency_perl_save: end database checkpoint\n";
		3608
		3609	warn "emergency_perl_save: begin write uuid\n";
		3610	write_uuid_sync 1;
		3611	warn "emergency_perl_save: end write uuid\n";
3430	};	3612	};
3431		3613
		3614	warn "emergency_perl_save: starting sync()\n";
		3615	IO::AIO::aio_sync sub {
		3616	warn "emergency_perl_save: finished sync()\n";
		3617	};
		3618
3432	warn "leave emergency perl save\n";	3619	warn "emergency_perl_save: leave\n";
3433	}	3620	}
3434		3621
3435	sub post_cleanup {	3622	sub post_cleanup {
3436	my ($make_core) = @_;	3623	my ($make_core) = @_;
3437		3624
3438	warn Carp::longmess "post_cleanup backtrace"	3625	warn Carp::longmess "post_cleanup backtrace"
3439	if $make_core;	3626	if $make_core;
		3627
		3628	my $fh = pidfile;
		3629	unlink $PIDFILE if <$fh> == $$;
		3630	}
		3631
		3632	# a safer delete_package, copied from Symbol
		3633	sub clear_package($) {
		3634	my $pkg = shift;
		3635
		3636	# expand to full symbol table name if needed
		3637	unless ($pkg =~ /^main::.*::$/) {
		3638	$pkg = "main$pkg" if $pkg =~ /^::/;
		3639	$pkg = "main::$pkg" unless $pkg =~ /^main::/;
		3640	$pkg .= '::' unless $pkg =~ /::$/;
		3641	}
		3642
		3643	my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
		3644	my $stem_symtab = *{$stem}{HASH};
		3645
		3646	defined $stem_symtab and exists $stem_symtab->{$leaf}
		3647	or return;
		3648
		3649	# clear all symbols
		3650	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
		3651	for my $name (keys %$leaf_symtab) {
		3652	_gv_clear *{"$pkg$name"};
		3653	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
		3654	}
		3655	warn "cleared package $pkg\n";#d#
3440	}	3656	}
3441		3657
3442	sub do_reload_perl() {	3658	sub do_reload_perl() {
3443	# can/must only be called in main	3659	# can/must only be called in main
3444	if ($Coro::current != $Coro::main) {	3660	if ($Coro::current != $Coro::main) {
3445	warn "can only reload from main coroutine";	3661	warn "can only reload from main coroutine";
3446	return;	3662	return;
3447	}	3663	}
3448		3664
		3665	return if $RELOAD++;
		3666
		3667	my $t1 = EV::time;
		3668
		3669	while ($RELOAD) {
3449	warn "reloading...";	3670	warn "reloading...";
3450		3671
3451	warn "entering sync_job";	3672	warn "entering sync_job";
3452		3673
3453	cf::sync_job {	3674	cf::sync_job {
3454	cf::write_runtime; # external watchdog should not bark	3675	cf::write_runtime_sync; # external watchdog should not bark
3455	cf::emergency_save;	3676	cf::emergency_save;
3456	cf::write_runtime; # external watchdog should not bark	3677	cf::write_runtime_sync; # external watchdog should not bark
3457		3678
3458	warn "syncing database to disk";	3679	warn "syncing database to disk";
3459	BDB::db_env_txn_checkpoint $DB_ENV;	3680	BDB::db_env_txn_checkpoint $DB_ENV;
3460		3681
3461	# if anything goes wrong in here, we should simply crash as we already saved	3682	# if anything goes wrong in here, we should simply crash as we already saved
3462		3683
3463	warn "flushing outstanding aio requests";	3684	warn "flushing outstanding aio requests";
3464	for (;;) {
3465	BDB::flush;
3466	IO::AIO::flush;
3467	Coro::cede_notself;
3468	last unless IO::AIO::nreqs || BDB::nreqs;	3685	while (IO::AIO::nreqs || BDB::nreqs) {
3469	warn "iterate...";	3686	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3470	}
3471
3472	++$RELOAD;
3473
3474	warn "cancelling all extension coros";
3475	$_->cancel for values %EXT_CORO;
3476	%EXT_CORO = ();
3477
3478	warn "removing commands";
3479	%COMMAND = ();
3480
3481	warn "removing ext/exti commands";
3482	%EXTCMD = ();
3483	%EXTICMD = ();
3484
3485	warn "unloading/nuking all extensions";
3486	for my $pkg (@EXTS) {
3487	warn "... unloading $pkg";
3488
3489	if (my $cb = $pkg->can ("unload")) {
3490	eval {
3491	$cb->($pkg);
3492	1
3493	} or warn "$pkg unloaded, but with errors: $@";
3494	}	3687	}
3495		3688
3496	warn "... nuking $pkg";	3689	warn "cancelling all extension coros";
3497	Symbol::delete_package $pkg;	3690	$_->cancel for values %EXT_CORO;
3498	}	3691	%EXT_CORO = ();
3499		3692
3500	warn "unloading all perl modules loaded from $LIBDIR";	3693	warn "removing commands";
3501	while (my ($k, $v) = each %INC) {	3694	%COMMAND = ();
3502	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3503		3695
		3696	warn "removing ext/exti commands";
		3697	%EXTCMD = ();
		3698	%EXTICMD = ();
		3699
		3700	warn "unloading/nuking all extensions";
		3701	for my $pkg (@EXTS) {
3504	warn "... unloading $k";	3702	warn "... unloading $pkg";
3505	delete $INC{$k};
3506		3703
3507	$k =~ s/\.pm$//;
3508	$k =~ s/\//::/g;
3509
3510	if (my $cb = $k->can ("unload_module")) {	3704	if (my $cb = $pkg->can ("unload")) {
		3705	eval {
3511	$cb->();	3706	$cb->($pkg);
		3707	1
		3708	} or warn "$pkg unloaded, but with errors: $@";
		3709	}
		3710
		3711	warn "... clearing $pkg";
		3712	clear_package $pkg;
3512	}	3713	}
3513		3714
3514	Symbol::delete_package $k;	3715	warn "unloading all perl modules loaded from $LIBDIR";
		3716	while (my ($k, $v) = each %INC) {
		3717	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
		3718
		3719	warn "... unloading $k";
		3720	delete $INC{$k};
		3721
		3722	$k =~ s/\.pm$//;
		3723	$k =~ s/\//::/g;
		3724
		3725	if (my $cb = $k->can ("unload_module")) {
		3726	$cb->();
		3727	}
		3728
		3729	clear_package $k;
3515	}	3730	}
3516		3731
3517	warn "getting rid of safe::, as good as possible";	3732	warn "getting rid of safe::, as good as possible";
3518	Symbol::delete_package "safe::$_"	3733	clear_package "safe::$_"
3519	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	3734	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3520		3735
3521	warn "unloading cf.pm \"a bit\"";	3736	warn "unloading cf.pm \"a bit\"";
3522	delete $INC{"cf.pm"};	3737	delete $INC{"cf.pm"};
3523	delete $INC{"cf/pod.pm"};	3738	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3524		3739
3525	# don't, removes xs symbols, too,	3740	# don't, removes xs symbols, too,
3526	# and global variables created in xs	3741	# and global variables created in xs
3527	#Symbol::delete_package __PACKAGE__;	3742	#clear_package __PACKAGE__;
3528		3743
3529	warn "unload completed, starting to reload now";	3744	warn "unload completed, starting to reload now";
3530		3745
3531	warn "reloading cf.pm";	3746	warn "reloading cf.pm";
3532	require cf;	3747	require cf;
3533	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3748	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3534		3749
3535	warn "loading config and database again";	3750	warn "loading config and database again";
3536	cf::reload_config;	3751	cf::reload_config;
3537		3752
3538	warn "loading extensions";	3753	warn "loading extensions";
3539	cf::load_extensions;	3754	cf::load_extensions;
3540		3755
		3756	if ($REATTACH_ON_RELOAD) {
3541	warn "reattaching attachments to objects/players";	3757	warn "reattaching attachments to objects/players";
3542	_global_reattach; # objects, sockets	3758	_global_reattach; # objects, sockets
3543	warn "reattaching attachments to maps";	3759	warn "reattaching attachments to maps";
3544	reattach $_ for values %MAP;	3760	reattach $_ for values %MAP;
3545	warn "reattaching attachments to players";	3761	warn "reattaching attachments to players";
3546	reattach $_ for values %PLAYER;	3762	reattach $_ for values %PLAYER;
		3763	}
3547		3764
		3765	warn "running post_init jobs";
		3766	(pop @POST_INIT)->(1) while @POST_INIT;
		3767
3548	warn "leaving sync_job";	3768	warn "leaving sync_job";
3549		3769
3550	1	3770	1
3551	} or do {	3771	} or do {
3552	warn $@;	3772	warn $@;
3553	warn "error while reloading, exiting.";	3773	cf::cleanup "error while reloading, exiting.";
3554	exit 1;
3555	};	3774	};
3556		3775
3557	warn "reloaded";	3776	warn "reloaded";
		3777	--$RELOAD;
		3778	}
		3779
		3780	$t1 = EV::time - $t1;
		3781	warn "reload completed in ${t1}s\n";
3558	};	3782	};
3559		3783
3560	our $RELOAD_WATCHER; # used only during reload	3784	our $RELOAD_WATCHER; # used only during reload
3561		3785
3562	sub reload_perl() {	3786	sub reload_perl() {
3563	# doing reload synchronously and two reloads happen back-to-back,	3787	# doing reload synchronously and two reloads happen back-to-back,
3564	# coro crashes during coro_state_free->destroy here.	3788	# coro crashes during coro_state_free->destroy here.
3565		3789
		3790	$RELOAD_WATCHER ||= cf::async {
		3791	Coro::AIO::aio_wait cache_extensions;
		3792
3566	$RELOAD_WATCHER ||= EV::timer 0, 0, sub {	3793	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
		3794	do_reload_perl;
3567	undef $RELOAD_WATCHER;	3795	undef $RELOAD_WATCHER;
3568	do_reload_perl;	3796	};
3569	};	3797	};
3570	}	3798	}
3571		3799
3572	register_command "reload" => sub {	3800	register_command "reload" => sub {
3573	my ($who, $arg) = @_;	3801	my ($who, $arg) = @_;
…		…
3587		3815
3588	our @WAIT_FOR_TICK;	3816	our @WAIT_FOR_TICK;
3589	our @WAIT_FOR_TICK_BEGIN;	3817	our @WAIT_FOR_TICK_BEGIN;
3590		3818
3591	sub wait_for_tick {	3819	sub wait_for_tick {
3592	return unless $TICK_WATCHER->is_active;
3593	return if $Coro::current == $Coro::main;	3820	return if tick_inhibit || $Coro::current == $Coro::main;
3594		3821
3595	my $signal = new Coro::Signal;	3822	my $signal = new Coro::Signal;
3596	push @WAIT_FOR_TICK, $signal;	3823	push @WAIT_FOR_TICK, $signal;
3597	$signal->wait;	3824	$signal->wait;
3598	}	3825	}
3599		3826
3600	sub wait_for_tick_begin {	3827	sub wait_for_tick_begin {
3601	return unless $TICK_WATCHER->is_active;
3602	return if $Coro::current == $Coro::main;	3828	return if tick_inhibit || $Coro::current == $Coro::main;
3603		3829
3604	my $signal = new Coro::Signal;	3830	my $signal = new Coro::Signal;
3605	push @WAIT_FOR_TICK_BEGIN, $signal;	3831	push @WAIT_FOR_TICK_BEGIN, $signal;
3606	$signal->wait;	3832	$signal->wait;
3607	}	3833	}
3608		3834
3609	$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {	3835	sub tick {
3610	if ($Coro::current != $Coro::main) {	3836	if ($Coro::current != $Coro::main) {
3611	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	3837	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3612	unless ++$bug_warning > 10;	3838	unless ++$bug_warning > 10;
3613	return;	3839	return;
3614	}	3840	}
3615		3841
3616	$NOW = $tick_start = EV::now;
3617
3618	cf::server_tick; # one server iteration	3842	cf::server_tick; # one server iteration
3619
3620	$RUNTIME += $TICK;
3621	$NEXT_TICK = $_[0]->at;
3622		3843
3623	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3844	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3624	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	3845	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3625	Coro::async_pool {	3846	Coro::async_pool {
3626	$Coro::current->{desc} = "runtime saver";	3847	$Coro::current->{desc} = "runtime saver";
3627	write_runtime	3848	write_runtime_sync
3628	or warn "ERROR: unable to write runtime file: $!";	3849	or warn "ERROR: unable to write runtime file: $!";
3629	};	3850	};
3630	}	3851	}
3631		3852
3632	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3853	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
…		…
3634	}	3855	}
3635	while (my $sig = shift @WAIT_FOR_TICK) {	3856	while (my $sig = shift @WAIT_FOR_TICK) {
3636	$sig->send;	3857	$sig->send;
3637	}	3858	}
3638		3859
3639	$LOAD = ($NOW - $tick_start) / $TICK;	3860	$LOAD = ($NOW - $TICK_START) / $TICK;
3640	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3861	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3641		3862
3642	_post_tick;	3863	if (0) {
3643	};	3864	if ($NEXT_TICK) {
3644	$TICK_WATCHER->priority (EV::MAXPRI);	3865	my $jitter = $TICK_START - $NEXT_TICK;
		3866	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
		3867	warn "jitter $JITTER\n";#d#
		3868	}
		3869	}
		3870	}
3645		3871
3646	{	3872	{
3647	# configure BDB	3873	# configure BDB
3648		3874
3649	BDB::min_parallel 8;	3875	BDB::min_parallel 8;
3650	BDB::max_poll_reqs $TICK * 0.1;	3876	BDB::max_poll_reqs $TICK * 0.1;
3651	$Coro::BDB::WATCHER->priority (1);	3877	$AnyEvent::BDB::WATCHER->priority (1);
3652		3878
3653	unless ($DB_ENV) {	3879	unless ($DB_ENV) {
3654	$DB_ENV = BDB::db_env_create;	3880	$DB_ENV = BDB::db_env_create;
3655	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC	3881	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3656	| BDB::LOG_AUTOREMOVE, 1);	3882	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
		3883	$DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3657	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);	3884	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3658	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);	3885	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3659		3886
3660	cf::sync_job {	3887	cf::sync_job {
3661	eval {	3888	eval {
…		…
3687	{	3914	{
3688	# configure IO::AIO	3915	# configure IO::AIO
3689		3916
3690	IO::AIO::min_parallel 8;	3917	IO::AIO::min_parallel 8;
3691	IO::AIO::max_poll_time $TICK * 0.1;	3918	IO::AIO::max_poll_time $TICK * 0.1;
3692	$Coro::AIO::WATCHER->priority (1);	3919	undef $AnyEvent::AIO::WATCHER;
3693	}	3920	}
3694		3921
3695	my $_log_backtrace;	3922	my $_log_backtrace;
3696		3923
3697	sub _log_backtrace {	3924	sub _log_backtrace {
…		…
3700	$msg =~ s/\n//;	3927	$msg =~ s/\n//;
3701		3928
3702	# limit the # of concurrent backtraces	3929	# limit the # of concurrent backtraces
3703	if ($_log_backtrace < 2) {	3930	if ($_log_backtrace < 2) {
3704	++$_log_backtrace;	3931	++$_log_backtrace;
		3932	my $perl_bt = Carp::longmess $msg;
3705	async {	3933	async {
3706	$Coro::current->{desc} = "abt $msg";	3934	$Coro::current->{desc} = "abt $msg";
3707		3935
3708	my @bt = fork_call {	3936	my @bt = fork_call {
3709	@addr = map { sprintf "%x", $_ } @addr;	3937	@addr = map { sprintf "%x", $_ } @addr;
…		…
3720	}	3948	}
3721		3949
3722	@funcs	3950	@funcs
3723	};	3951	};
3724		3952
3725	LOG llevInfo, "[ABT] $msg\n";	3953	LOG llevInfo, "[ABT] $perl_bt\n";
		3954	LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3726	LOG llevInfo, "[ABT] $_\n" for @bt;	3955	LOG llevInfo, "[ABT] $_\n" for @bt;
3727	--$_log_backtrace;	3956	--$_log_backtrace;
3728	};	3957	};
3729	} else {	3958	} else {
3730	LOG llevInfo, "[ABT] $msg\n";	3959	LOG llevInfo, "[ABT] $msg\n";
3731	LOG llevInfo, "[ABT] [suppressed]\n";	3960	LOG llevInfo, "[ABT] [suppressed]\n";
3732	}	3961	}
3733	}	3962	}
3734		3963
3735	# load additional modules	3964	# load additional modules
3736	use cf::pod;	3965	require "cf/$_.pm" for @EXTRA_MODULES;
3737		3966
3738	END { cf::emergency_save }	3967	END { cf::emergency_save }
3739		3968
3740	1	3969	1
3741		3970

Diff Legend

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