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

Diff Legend

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