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.389 by root, Sat Oct 20 04:39:57 2007 UTC vs.
Revision 1.448 by root, Fri Sep 19 05:30:23 2008 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 "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 Event;	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
15	use Coro 4.1 ();	37	use Coro ();
16	use Coro::State;	38	use Coro::State;
17	use Coro::Handle;	39	use Coro::Handle;
		40	use Coro::EV;
18	use Coro::Event;	41	use Coro::AnyEvent;
19	use Coro::Timer;	42	use Coro::Timer;
20	use Coro::Signal;	43	use Coro::Signal;
21	use Coro::Semaphore;	44	use Coro::Semaphore;
		45	use Coro::AnyEvent;
22	use Coro::AIO;	46	use Coro::AIO;
		47	use Coro::BDB 1.6;
23	use Coro::Storable;	48	use Coro::Storable;
24	use Coro::Util ();	49	use Coro::Util ();
25		50
26	use JSON::XS ();	51	use JSON::XS 2.01 ();
27	use BDB ();	52	use BDB ();
28	use Data::Dumper;	53	use Data::Dumper;
29	use Digest::MD5;	54	use Digest::MD5;
30	use Fcntl;	55	use Fcntl;
31	use YAML::Syck ();	56	use YAML ();
32	use IO::AIO 2.51 ();	57	use IO::AIO ();
33	use Time::HiRes;	58	use Time::HiRes;
34	use Compress::LZF;	59	use Compress::LZF;
35	use Digest::MD5 ();	60	use Digest::MD5 ();
		61
		62	AnyEvent::detect;
36		63
37	# configure various modules to our taste	64	# configure various modules to our taste
38	#	65	#
39	$Storable::canonical = 1; # reduce rsync transfers	66	$Storable::canonical = 1; # reduce rsync transfers
40	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator	67	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
41	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42
43	$Event::Eval = 1; # no idea why this is required, but it is
44
45	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46	$YAML::Syck::ImplicitUnicode = 1;
47		68
48	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority	69	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
		70
		71	{
		72	# very ugly, but ensure we acquire the storable lock
		73
		74	sub net_mstore {
		75	my $guard = Coro::Storable::guard;
		76	&Storable::net_mstore
		77	}
		78
		79	sub mretrieve {
		80	my $guard = Coro::Storable::guard;
		81	&Storable::mretrieve
		82	}
		83
		84	Compress::LZF::set_serializer "Coro::Storable", "cf::net_mstore", "cf::mretrieve";
		85	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
		86	}
49		87
50	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	88	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51		89
52	our %COMMAND = ();	90	our %COMMAND = ();
53	our %COMMAND_TIME = ();	91	our %COMMAND_TIME = ();
…		…
59	our %EXT_MAP = (); # pluggable maps	97	our %EXT_MAP = (); # pluggable maps
60		98
61	our $RELOAD; # number of reloads so far	99	our $RELOAD; # number of reloads so far
62	our @EVENT;	100	our @EVENT;
63		101
64	our $CONFDIR = confdir;	102	our $CONFDIR = confdir;
65	our $DATADIR = datadir;	103	our $DATADIR = datadir;
66	our $LIBDIR = "$DATADIR/ext";	104	our $LIBDIR = "$DATADIR/ext";
67	our $PODDIR = "$DATADIR/pod";	105	our $PODDIR = "$DATADIR/pod";
68	our $MAPDIR = "$DATADIR/" . mapdir;	106	our $MAPDIR = "$DATADIR/" . mapdir;
69	our $LOCALDIR = localdir;	107	our $LOCALDIR = localdir;
70	our $TMPDIR = "$LOCALDIR/" . tmpdir;	108	our $TMPDIR = "$LOCALDIR/" . tmpdir;
71	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	109	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	110	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73	our $RANDOMDIR = "$LOCALDIR/random";	111	our $RANDOMDIR = "$LOCALDIR/random";
74	our $BDBDIR = "$LOCALDIR/db";	112	our $BDBDIR = "$LOCALDIR/db";
		113	our $PIDFILE = "$LOCALDIR/pid";
		114	our $RUNTIMEFILE = "$LOCALDIR/runtime";
		115
		116	our %RESOURCE;
75		117
76	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	118	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	119	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80	our $NEXT_TICK;	120	our $NEXT_TICK;
81	our $NOW;
82	our $USE_FSYNC = 1; # use fsync to write maps - default off	121	our $USE_FSYNC = 1; # use fsync to write maps - default off
83		122
84	our $BDB_POLL_WATCHER;
85	our $BDB_DEADLOCK_WATCHER;	123	our $BDB_DEADLOCK_WATCHER;
86	our $BDB_CHECKPOINT_WATCHER;	124	our $BDB_CHECKPOINT_WATCHER;
87	our $BDB_TRICKLE_WATCHER;	125	our $BDB_TRICKLE_WATCHER;
88	our $DB_ENV;	126	our $DB_ENV;
89		127
90	our %CFG;	128	our %CFG;
91		129
92	our $UPTIME; $UPTIME ||= time;	130	our $UPTIME; $UPTIME ||= time;
93	our $RUNTIME;	131	our $RUNTIME;
		132	our $NOW;
94		133
95	our (%PLAYER, %PLAYER_LOADING); # all users	134	our (%PLAYER, %PLAYER_LOADING); # all users
96	our (%MAP, %MAP_LOADING ); # all maps	135	our (%MAP, %MAP_LOADING ); # all maps
97	our $LINK_MAP; # the special {link} map, which is always available	136	our $LINK_MAP; # the special {link} map, which is always available
98		137
99	# used to convert map paths into valid unix filenames by replacing / by ∕	138	# used to convert map paths into valid unix filenames by replacing / by ∕
100	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	139	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101		140
102	our $LOAD; # a number between 0 (idle) and 1 (too many objects)	141	our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103	our $LOADAVG; # same thing, but with alpha-smoothing	142	our $LOADAVG; # same thing, but with alpha-smoothing
		143	our $JITTER; # average jitter
104	our $tick_start; # for load detecting purposes	144	our $TICK_START; # for load detecting purposes
105		145
106	binmode STDOUT;	146	binmode STDOUT;
107	binmode STDERR;	147	binmode STDERR;
108		148
109	# read virtual server time, if available	149	# read virtual server time, if available
110	unless ($RUNTIME || !-e "$LOCALDIR/runtime") {	150	unless ($RUNTIME || !-e $RUNTIMEFILE) {
111	open my $fh, "<", "$LOCALDIR/runtime"	151	open my $fh, "<", $RUNTIMEFILE
112	or die "unable to read runtime file: $!";	152	or die "unable to read $RUNTIMEFILE file: $!";
113	$RUNTIME = <$fh> + 0.;	153	$RUNTIME = <$fh> + 0.;
114	}	154	}
115		155
116	mkdir $_	156	mkdir $_
117	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;	157	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
…		…
162		202
163	The raw value load value from the last tick.	203	The raw value load value from the last tick.
164		204
165	=item %cf::CFG	205	=item %cf::CFG
166		206
167	Configuration for the server, loaded from C</etc/crossfire/config>, or	207	Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168	from wherever your confdir points to.	208	from wherever your confdir points to.
169		209
170	=item cf::wait_for_tick, cf::wait_for_tick_begin	210	=item cf::wait_for_tick, cf::wait_for_tick_begin
171		211
172	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	212	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
…		…
193	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	233	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194		234
195	LOG llevError, $msg;	235	LOG llevError, $msg;
196	};	236	};
197	}	237	}
		238
		239	$Coro::State::DIEHOOK = sub {
		240	return unless $^S eq 0; # "eq", not "=="
		241
		242	if ($Coro::current == $Coro::main) {#d#
		243	warn "DIEHOOK called in main context, Coro bug?\n";#d#
		244	return;#d#
		245	}#d#
		246
		247	# kill coroutine otherwise
		248	warn Carp::longmess $_[0];
		249	Coro::terminate
		250	};
		251
		252	$SIG{__DIE__} = sub { }; #d#?
198		253
199	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	254	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	255	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	256	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	257	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
…		…
209	for my $pkg (qw(	264	for my $pkg (qw(
210	cf::global cf::attachable	265	cf::global cf::attachable
211	cf::object cf::object::player	266	cf::object cf::object::player
212	cf::client cf::player	267	cf::client cf::player
213	cf::arch cf::living	268	cf::arch cf::living
		269	cf::map cf::mapspace
214	cf::map cf::party cf::region	270	cf::party cf::region
215	)) {	271	)) {
216	no strict 'refs';
217	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	272	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218	}	273	}
219		274
220	$Event::DIED = sub {	275	$EV::DIED = sub {
221	warn "error in event callback: @_";	276	warn "error in event callback: @_";
222	};	277	};
223		278
224	#############################################################################	279	#############################################################################
225		280
…		…
248	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	303	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249	$d	304	$d
250	} || "[unable to dump $_[0]: '$@']";	305	} || "[unable to dump $_[0]: '$@']";
251	}	306	}
252		307
253	=item $ref = cf::from_json $json	308	=item $ref = cf::decode_json $json
254		309
255	Converts a JSON string into the corresponding perl data structure.	310	Converts a JSON string into the corresponding perl data structure.
256		311
257	=item $json = cf::to_json $ref	312	=item $json = cf::encode_json $ref
258		313
259	Converts a perl data structure into its JSON representation.	314	Converts a perl data structure into its JSON representation.
260		315
261	=cut	316	=cut
262		317
263	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	318	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264		319
265	sub to_json ($) { $json_coder->encode ($_[0]) }	320	sub encode_json($) { $json_coder->encode ($_[0]) }
266	sub from_json ($) { $json_coder->decode ($_[0]) }	321	sub decode_json($) { $json_coder->decode ($_[0]) }
267		322
268	=item cf::lock_wait $string	323	=item cf::lock_wait $string
269		324
270	Wait until the given lock is available. See cf::lock_acquire.	325	Wait until the given lock is available. See cf::lock_acquire.
271		326
…		…
327		382
328	! ! $LOCK{$key}	383	! ! $LOCK{$key}
329	}	384	}
330		385
331	sub freeze_mainloop {	386	sub freeze_mainloop {
332	return unless $TICK_WATCHER->is_active;	387	tick_inhibit_inc;
333		388
334	my $guard = Coro::guard {	389	Coro::guard \&tick_inhibit_dec;
335	$TICK_WATCHER->start;	390	}
336	};	391
337	$TICK_WATCHER->stop;	392	=item cf::periodic $interval, $cb
338	$guard	393
		394	Like EV::periodic, but randomly selects a starting point so that the actions
		395	get spread over timer.
		396
		397	=cut
		398
		399	sub periodic($$) {
		400	my ($interval, $cb) = @_;
		401
		402	my $start = rand List::Util::min 180, $interval;
		403
		404	EV::periodic $start, $interval, 0, $cb
339	}	405	}
340		406
341	=item cf::get_slot $time[, $priority[, $name]]	407	=item cf::get_slot $time[, $priority[, $name]]
342		408
343	Allocate $time seconds of blocking CPU time at priority C<$priority>:	409	Allocate $time seconds of blocking CPU time at priority C<$priority>:
…		…
383	}	449	}
384	}	450	}
385	};	451	};
386		452
387	sub get_slot($;$$) {	453	sub get_slot($;$$) {
		454	return if tick_inhibit || $Coro::current == $Coro::main;
		455
388	my ($time, $pri, $name) = @_;	456	my ($time, $pri, $name) = @_;
389		457
390	$time = $TICK * .6 if $time > $TICK * .6;	458	$time = $TICK * .6 if $time > $TICK * .6;
391	my $sig = new Coro::Signal;	459	my $sig = new Coro::Signal;
392		460
…		…
406		474
407	BEGIN { *async = \&Coro::async_pool }	475	BEGIN { *async = \&Coro::async_pool }
408		476
409	=item cf::sync_job { BLOCK }	477	=item cf::sync_job { BLOCK }
410		478
411	The design of Crossfire TRT requires that the main coroutine ($Coro::main)	479	The design of Deliantra requires that the main coroutine ($Coro::main)
412	is always able to handle events or runnable, as Crossfire TRT is only	480	is always able to handle events or runnable, as Deliantra is only
413	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not	481	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414	acceptable.	482	acceptable.
415		483
416	If it must be done, put the blocking parts into C<sync_job>. This will run	484	If it must be done, put the blocking parts into C<sync_job>. This will run
417	the given BLOCK in another coroutine while waiting for the result. The	485	the given BLOCK in another coroutine while waiting for the result. The
…		…
422		490
423	sub sync_job(&) {	491	sub sync_job(&) {
424	my ($job) = @_;	492	my ($job) = @_;
425		493
426	if ($Coro::current == $Coro::main) {	494	if ($Coro::current == $Coro::main) {
427	my $time = Event::time;	495	my $time = EV::time;
428		496
429	# this is the main coro, too bad, we have to block	497	# this is the main coro, too bad, we have to block
430	# till the operation succeeds, freezing the server :/	498	# till the operation succeeds, freezing the server :/
431		499
432	LOG llevError, Carp::longmess "sync job";#d#	500	LOG llevError, Carp::longmess "sync job";#d#
433		501
434	# TODO: use suspend/resume instead
435	# (but this is cancel-safe)
436	my $freeze_guard = freeze_mainloop;	502	my $freeze_guard = freeze_mainloop;
437		503
438	my $busy = 1;	504	my $busy = 1;
439	my @res;	505	my @res;
440		506
…		…
447		513
448	while ($busy) {	514	while ($busy) {
449	if (Coro::nready) {	515	if (Coro::nready) {
450	Coro::cede_notself;	516	Coro::cede_notself;
451	} else {	517	} else {
452	Event::one_event;	518	EV::loop EV::LOOP_ONESHOT;
453	}	519	}
454	}	520	}
455		521
456	$time = Event::time - $time;	522	my $time = EV::time - $time;
457		523
458	LOG llevError | logBacktrace, Carp::longmess "long sync job"
459	if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
460
461	$tick_start += $time; # do not account sync jobs to server load	524	$TICK_START += $time; # do not account sync jobs to server load
462		525
463	wantarray ? @res : $res[0]	526	wantarray ? @res : $res[0]
464	} else {	527	} else {
465	# we are in another coroutine, how wonderful, everything just works	528	# we are in another coroutine, how wonderful, everything just works
466		529
…		…
491	=item fork_call { }, $args	554	=item fork_call { }, $args
492		555
493	Executes the given code block with the given arguments in a seperate	556	Executes the given code block with the given arguments in a seperate
494	process, returning the results. Everything must be serialisable with	557	process, returning the results. Everything must be serialisable with
495	Coro::Storable. May, of course, block. Note that the executed sub may	558	Coro::Storable. May, of course, block. Note that the executed sub may
496	never block itself or use any form of Event handling.	559	never block itself or use any form of event handling.
497		560
498	=cut	561	=cut
499		562
500	sub fork_call(&@) {	563	sub fork_call(&@) {
501	my ($cb, @args) = @_;	564	my ($cb, @args) = @_;
…		…
508	reset_signals;	571	reset_signals;
509	&$cb	572	&$cb
510	}, @args;	573	}, @args;
511		574
512	wantarray ? @res : $res[-1]	575	wantarray ? @res : $res[-1]
		576	}
		577
		578	=item $coin = coin_from_name $name
		579
		580	=cut
		581
		582	our %coin_alias = (
		583	"silver" => "silvercoin",
		584	"silvercoin" => "silvercoin",
		585	"silvercoins" => "silvercoin",
		586	"gold" => "goldcoin",
		587	"goldcoin" => "goldcoin",
		588	"goldcoins" => "goldcoin",
		589	"platinum" => "platinacoin",
		590	"platinumcoin" => "platinacoin",
		591	"platinumcoins" => "platinacoin",
		592	"platina" => "platinacoin",
		593	"platinacoin" => "platinacoin",
		594	"platinacoins" => "platinacoin",
		595	"royalty" => "royalty",
		596	"royalties" => "royalty",
		597	);
		598
		599	sub coin_from_name($) {
		600	$coin_alias{$_[0]}
		601	? cf::arch::find $coin_alias{$_[0]}
		602	: undef
513	}	603	}
514		604
515	=item $value = cf::db_get $family => $key	605	=item $value = cf::db_get $family => $key
516		606
517	Returns a single value from the environment database.	607	Returns a single value from the environment database.
…		…
656		746
657	#############################################################################	747	#############################################################################
658		748
659	=head2 ATTACHABLE OBJECTS	749	=head2 ATTACHABLE OBJECTS
660		750
661	Many objects in crossfire are so-called attachable objects. That means you can	751	Many objects in deliantra are so-called attachable objects. That means you can
662	attach callbacks/event handlers (a collection of which is called an "attachment")	752	attach callbacks/event handlers (a collection of which is called an "attachment")
663	to it. All such attachable objects support the following methods.	753	to it. All such attachable objects support the following methods.
664		754
665	In the following description, CLASS can be any of C<global>, C<object>	755	In the following description, CLASS can be any of C<global>, C<object>
666	C<player>, C<client> or C<map> (i.e. the attachable objects in	756	C<player>, C<client> or C<map> (i.e. the attachable objects in
667	Crossfire TRT).	757	Deliantra).
668		758
669	=over 4	759	=over 4
670		760
671	=item $attachable->attach ($attachment, key => $value...)	761	=item $attachable->attach ($attachment, key => $value...)
672		762
…		…
716	=item cf::CLASS::attachment $name, ...	806	=item cf::CLASS::attachment $name, ...
717		807
718	Register an attachment by C<$name> through which attachable objects of the	808	Register an attachment by C<$name> through which attachable objects of the
719	given CLASS can refer to this attachment.	809	given CLASS can refer to this attachment.
720		810
721	Some classes such as crossfire maps and objects can specify attachments	811	Some classes such as deliantra maps and objects can specify attachments
722	that are attached at load/instantiate time, thus the need for a name.	812	that are attached at load/instantiate time, thus the need for a name.
723		813
724	These calls expect any number of the following handler/hook descriptions:	814	These calls expect any number of the following handler/hook descriptions:
725		815
726	=over 4	816	=over 4
…		…
954	}	1044	}
955		1045
956	0	1046	0
957	}	1047	}
958		1048
959	=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...)	1049	=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
960		1050
961	=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)	1051	=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
962		1052
963	Generate an object-specific event with the given arguments.	1053	Generate an object-specific event with the given arguments.
964		1054
…		…
1017		1107
1018	sub reattach {	1108	sub reattach {
1019	# basically do the same as instantiate, without calling instantiate	1109	# basically do the same as instantiate, without calling instantiate
1020	my ($obj) = @_;	1110	my ($obj) = @_;
1021		1111
		1112	# no longer needed after getting rid of delete_package?
1022	bless $obj, ref $obj; # re-bless in case extensions have been reloaded	1113	#bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1023		1114
1024	my $registry = $obj->registry;	1115	my $registry = $obj->registry;
1025		1116
1026	@$registry = ();	1117	@$registry = ();
1027		1118
…		…
1042	cf::attachable->attach (	1133	cf::attachable->attach (
1043	prio => -1000000,	1134	prio => -1000000,
1044	on_instantiate => sub {	1135	on_instantiate => sub {
1045	my ($obj, $data) = @_;	1136	my ($obj, $data) = @_;
1046		1137
1047	$data = from_json $data;	1138	$data = decode_json $data;
1048		1139
1049	for (@$data) {	1140	for (@$data) {
1050	my ($name, $args) = @$_;	1141	my ($name, $args) = @$_;
1051		1142
1052	$obj->attach ($name, %{$args || {} });	1143	$obj->attach ($name, %{$args || {} });
…		…
1073	utf8::decode (my $decname = $filename);	1164	utf8::decode (my $decname = $filename);
1074	warn sprintf "saving %s (%d,%d)\n",	1165	warn sprintf "saving %s (%d,%d)\n",
1075	$decname, length $$rdata, scalar @$objs;	1166	$decname, length $$rdata, scalar @$objs;
1076		1167
1077	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1168	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1078	chmod SAVE_MODE, $fh;	1169	aio_chmod $fh, SAVE_MODE;
1079	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1170	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1080	aio_fsync $fh if $cf::USE_FSYNC;	1171	aio_fsync $fh if $cf::USE_FSYNC;
1081	close $fh;	1172	aio_close $fh;
1082		1173
1083	if (@$objs) {	1174	if (@$objs) {
1084	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {	1175	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1085	chmod SAVE_MODE, $fh;	1176	aio_chmod $fh, SAVE_MODE;
1086	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };	1177	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1087	aio_write $fh, 0, (length $data), $data, 0;	1178	aio_write $fh, 0, (length $data), $data, 0;
1088	aio_fsync $fh if $cf::USE_FSYNC;	1179	aio_fsync $fh if $cf::USE_FSYNC;
1089	close $fh;	1180	aio_close $fh;
1090	aio_rename "$filename.pst~", "$filename.pst";	1181	aio_rename "$filename.pst~", "$filename.pst";
1091	}	1182	}
1092	} else {	1183	} else {
1093	aio_unlink "$filename.pst";	1184	aio_unlink "$filename.pst";
1094	}	1185	}
…		…
1263		1354
1264	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1355	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1265	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1356	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1266		1357
1267	$ext{source} =	1358	$ext{source} =
1268	"package $pkg; use strict; use utf8;\n"	1359	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1269	. "#line 1 \"$path\"\n{\n"	1360	. "#line 1 \"$path\"\n{\n"
1270	. $source	1361	. $source
1271	. "\n};\n1";	1362	. "\n};\n1";
1272		1363
1273	$todo{$base} = \%ext;	1364	$todo{$base} = \%ext;
…		…
1289	my $msg = $@ ? "$v->{path}: $@\n"	1380	my $msg = $@ ? "$v->{path}: $@\n"
1290	: "$v->{base}: extension inactive.\n";	1381	: "$v->{base}: extension inactive.\n";
1291		1382
1292	if (exists $v->{meta}{mandatory}) {	1383	if (exists $v->{meta}{mandatory}) {
1293	warn $msg;	1384	warn $msg;
1294	warn "mandatory extension failed to load, exiting.\n";	1385	cf::cleanup "mandatory extension failed to load, exiting.";
1295	exit 1;
1296	}	1386	}
1297		1387
1298	warn $msg;	1388	warn $msg;
1299	}	1389	}
1300		1390
…		…
1314		1404
1315	=back	1405	=back
1316		1406
1317	=head2 CORE EXTENSIONS	1407	=head2 CORE EXTENSIONS
1318		1408
1319	Functions and methods that extend core crossfire objects.	1409	Functions and methods that extend core deliantra objects.
1320		1410
1321	=cut	1411	=cut
1322		1412
1323	package cf::player;	1413	package cf::player;
1324		1414
…		…
1389	my $f = new_from_file cf::object::thawer path $login	1479	my $f = new_from_file cf::object::thawer path $login
1390	or return;	1480	or return;
1391		1481
1392	my $pl = cf::player::load_pl $f	1482	my $pl = cf::player::load_pl $f
1393	or return;	1483	or return;
		1484
1394	local $cf::PLAYER_LOADING{$login} = $pl;	1485	local $cf::PLAYER_LOADING{$login} = $pl;
1395	$f->resolve_delayed_derefs;	1486	$f->resolve_delayed_derefs;
1396	$cf::PLAYER{$login} = $pl	1487	$cf::PLAYER{$login} = $pl
1397	}	1488	}
1398	}	1489	}
…		…
1408		1499
1409	return if $pl->{deny_save};	1500	return if $pl->{deny_save};
1410		1501
1411	aio_mkdir playerdir $pl, 0770;	1502	aio_mkdir playerdir $pl, 0770;
1412	$pl->{last_save} = $cf::RUNTIME;	1503	$pl->{last_save} = $cf::RUNTIME;
		1504
		1505	cf::get_slot 0.01;
1413		1506
1414	$pl->save_pl ($path);	1507	$pl->save_pl ($path);
1415	cf::cede_to_tick;	1508	cf::cede_to_tick;
1416	}	1509	}
1417		1510
…		…
1449	my ($pl) = @_;	1542	my ($pl) = @_;
1450		1543
1451	my $name = $pl->ob->name;	1544	my $name = $pl->ob->name;
1452		1545
1453	$pl->{deny_save} = 1;	1546	$pl->{deny_save} = 1;
1454	$pl->password ("*"); # this should lock out the player until we nuked the dir	1547	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1455		1548
1456	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1549	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1457	$pl->deactivate;	1550	$pl->deactivate;
		1551	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
		1552	$pl->ob->check_score;
1458	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1553	$pl->invoke (cf::EVENT_PLAYER_QUIT);
1459	$pl->ns->destroy if $pl->ns;	1554	$pl->ns->destroy if $pl->ns;
1460		1555
1461	my $path = playerdir $pl;	1556	my $path = playerdir $pl;
1462	my $temp = "$path~$cf::RUNTIME~deleting~";	1557	my $temp = "$path~$cf::RUNTIME~deleting~";
…		…
1501		1596
1502	for my $login (@$dirs) {	1597	for my $login (@$dirs) {
1503	my $path = path $login;	1598	my $path = path $login;
1504		1599
1505	# a .pst is a dead give-away for a valid player	1600	# a .pst is a dead give-away for a valid player
1506	unless (-e "$path.pst") {	1601	# if no pst file found, open and chekc for blocked users
		1602	if (aio_stat "$path.pst") {
1507	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;	1603	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1508	aio_read $fh, 0, 512, my $buf, 0 or next;	1604	aio_read $fh, 0, 512, my $buf, 0 or next;
1509	$buf !~ /^password -------------$/m or next; # official not-valid tag	1605	$buf !~ /^password -------------$/m or next; # official not-valid tag
1510	}	1606	}
1511		1607
…		…
1542	}	1638	}
1543		1639
1544	\@paths	1640	\@paths
1545	}	1641	}
1546		1642
1547	=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)	1643	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1548		1644
1549	Expand crossfire pod fragments into protocol xml.	1645	Expand deliantra pod fragments into protocol xml.
1550
1551	=cut
1552
1553	sub expand_cfpod {
1554	((my $self), (local $_)) = @_;
1555
1556	# escape & and <
1557	s/&/&amp;/g;
1558	s/(?<![BIUGHT])</&lt;/g;
1559
1560	# this is buggy, it needs to properly take care of nested <'s
1561
1562	1 while
1563	# replace B<>, I<>, U<> etc.
1564	s/B<([^\>]*)>/<b>$1<\/b>/
1565	|| s/I<([^\>]*)>/<i>$1<\/i>/
1566	|| s/U<([^\>]*)>/<u>$1<\/u>/
1567	|| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1568	# replace G<male|female> tags
1569	|| s{G<([^>|]*)\|([^>]*)>}{
1570	$self->gender ? $2 : $1
1571	}ge
1572	# replace H<hint text>
1573	|| s{H<([^\>]*)>}
1574	{
1575	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1576	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1577	"")
1578	[$self->{hintmode}]
1579	}ge;
1580
1581	# create single paragraphs (very hackish)
1582	s/(?<=\S)\n(?=\w)/ /g;
1583
1584	# compress some whitespace
1585	s/\s+\n/\n/g; # ws line-ends
1586	s/\n\n+/\n/g; # double lines
1587	s/^\n+//; # beginning lines
1588	s/\n+$//; # ending lines
1589
1590	$_
1591	}
1592
1593	sub hintmode {
1594	$_[0]{hintmode} = $_[1] if @_ > 1;
1595	$_[0]{hintmode}
1596	}
1597		1646
1598	=item $player->ext_reply ($msgid, @msg)	1647	=item $player->ext_reply ($msgid, @msg)
1599		1648
1600	Sends an ext reply to the player.	1649	Sends an ext reply to the player.
1601		1650
…		…
1668	our $MAX_RESET = 3600;	1717	our $MAX_RESET = 3600;
1669	our $DEFAULT_RESET = 3000;	1718	our $DEFAULT_RESET = 3000;
1670		1719
1671	sub generate_random_map {	1720	sub generate_random_map {
1672	my ($self, $rmp) = @_;	1721	my ($self, $rmp) = @_;
		1722
		1723	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
		1724
1673	# mit "rum" bekleckern, nicht	1725	# mit "rum" bekleckern, nicht
1674	$self->_create_random_map (	1726	$self->_create_random_map (
1675	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},	1727	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1676	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},	1728	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1677	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},	1729	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
…		…
1799		1851
1800	# the temporary/swap location	1852	# the temporary/swap location
1801	sub save_path {	1853	sub save_path {
1802	my ($self) = @_;	1854	my ($self) = @_;
1803		1855
1804	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1856	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1805	"$TMPDIR/$path.map"	1857	"$TMPDIR/$path.map"
1806	}	1858	}
1807		1859
1808	# the unique path, undef == no special unique path	1860	# the unique path, undef == no special unique path
1809	sub uniq_path {	1861	sub uniq_path {
1810	my ($self) = @_;	1862	my ($self) = @_;
1811		1863
1812	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1864	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1813	"$UNIQUEDIR/$path"	1865	"$UNIQUEDIR/$path"
1814	}	1866	}
1815		1867
1816	# and all this just because we cannot iterate over	1868	# and all this just because we cannot iterate over
1817	# all maps in C++...	1869	# all maps in C++...
…		…
1915		1967
1916	cf::lock_wait "map_data:$path";#d#remove	1968	cf::lock_wait "map_data:$path";#d#remove
1917	cf::lock_wait "map_find:$path";	1969	cf::lock_wait "map_find:$path";
1918		1970
1919	$cf::MAP{$path} || do {	1971	$cf::MAP{$path} || do {
1920	my $guard1 = cf::lock_acquire "map_find:$path";
1921	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it	1972	my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1973	my $guard2 = cf::lock_acquire "map_find:$path";
1922		1974
1923	my $map = new_from_path cf::map $path	1975	my $map = new_from_path cf::map $path
1924	or return;	1976	or return;
1925		1977
1926	$map->{last_save} = $cf::RUNTIME;	1978	$map->{last_save} = $cf::RUNTIME;
…		…
1929	or return;	1981	or return;
1930		1982
1931	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1983	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1932	# doing this can freeze the server in a sync job, obviously	1984	# doing this can freeze the server in a sync job, obviously
1933	#$cf::WAIT_FOR_TICK->wait;	1985	#$cf::WAIT_FOR_TICK->wait;
		1986	undef $guard2;
1934	undef $guard1;	1987	undef $guard1;
1935	undef $guard2;
1936	$map->reset;	1988	$map->reset;
1937	return find $path;	1989	return find $path;
1938	}	1990	}
1939		1991
1940	$cf::MAP{$path} = $map	1992	$cf::MAP{$path} = $map
…		…
1967	my $f = new_from_file cf::object::thawer $self->{load_path};	2019	my $f = new_from_file cf::object::thawer $self->{load_path};
1968	$f->skip_block;	2020	$f->skip_block;
1969	$self->_load_objects ($f)	2021	$self->_load_objects ($f)
1970	or return;	2022	or return;
1971		2023
1972	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	2024	$self->post_load_original
1973	if delete $self->{load_original};	2025	if delete $self->{load_original};
1974		2026
1975	if (my $uniq = $self->uniq_path) {	2027	if (my $uniq = $self->uniq_path) {
1976	utf8::encode $uniq;	2028	utf8::encode $uniq;
1977	unless (aio_stat $uniq) {	2029	unless (aio_stat $uniq) {
…		…
2003	}	2055	}
2004		2056
2005	$self->{last_save} = $cf::RUNTIME;	2057	$self->{last_save} = $cf::RUNTIME;
2006	$self->last_access ($cf::RUNTIME);	2058	$self->last_access ($cf::RUNTIME);
2007		2059
2008	$self->in_memory (cf::MAP_IN_MEMORY);	2060	$self->in_memory (cf::MAP_ACTIVE);
2009	}	2061	}
2010		2062
2011	$self->post_load;	2063	$self->post_load;
2012	}	2064	}
2013		2065
…		…
2071	my ($path, $origin, $load) = @_;	2123	my ($path, $origin, $load) = @_;
2072		2124
2073	$path = normalise $path, $origin && $origin->{path};	2125	$path = normalise $path, $origin && $origin->{path};
2074		2126
2075	if (my $map = $cf::MAP{$path}) {	2127	if (my $map = $cf::MAP{$path}) {
2076	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;	2128	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2077	}	2129	}
2078		2130
2079	$MAP_PREFETCH{$path} |= $load;	2131	$MAP_PREFETCH{$path} |= $load;
2080		2132
2081	$MAP_PREFETCHER ||= cf::async {	2133	$MAP_PREFETCHER ||= cf::async {
…		…
2118	cf::async {	2170	cf::async {
2119	$Coro::current->{desc} = "map player save";	2171	$Coro::current->{desc} = "map player save";
2120	$_->contr->save for $self->players;	2172	$_->contr->save for $self->players;
2121	};	2173	};
2122		2174
		2175	cf::get_slot 0.02;
		2176
2123	if ($uniq) {	2177	if ($uniq) {
2124	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);	2178	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2125	$self->_save_objects ($uniq, cf::IO_UNIQUES);	2179	$self->_save_objects ($uniq, cf::IO_UNIQUES);
2126	} else {	2180	} else {
2127	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);	2181	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
…		…
2135	$self->save;	2189	$self->save;
2136		2190
2137	my $lock = cf::lock_acquire "map_data:$self->{path}";	2191	my $lock = cf::lock_acquire "map_data:$self->{path}";
2138		2192
2139	return if $self->players;	2193	return if $self->players;
2140	return if $self->in_memory != cf::MAP_IN_MEMORY;	2194	return if $self->in_memory != cf::MAP_ACTIVE;
2141	return if $self->{deny_save};	2195	return if $self->{deny_save};
2142		2196
2143	$self->in_memory (cf::MAP_SWAPPED);	2197	$self->in_memory (cf::MAP_SWAPPED);
2144		2198
2145	$self->deactivate;	2199	$self->deactivate;
…		…
2263		2317
2264	sub unique_maps() {	2318	sub unique_maps() {
2265	[	2319	[
2266	map {	2320	map {
2267	utf8::decode $_;	2321	utf8::decode $_;
2268	/\.map$/	2322	s/\.map$//; # TODO future compatibility hack
		2323	/\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
		2324	? ()
2269	? normalise $_	2325	: normalise $_
2270	: ()
2271	} @{ aio_readdir $UNIQUEDIR or [] }	2326	} @{ aio_readdir $UNIQUEDIR or [] }
2272	]	2327	]
2273	}	2328	}
2274		2329
2275	package cf;
2276
2277	=back	2330	=back
2278		2331
2279	=head3 cf::object	2332	=head3 cf::object
2280		2333
2281	=cut	2334	=cut
…		…
2284		2337
2285	=over 4	2338	=over 4
2286		2339
2287	=item $ob->inv_recursive	2340	=item $ob->inv_recursive
2288		2341
2289	Returns the inventory of the object _and_ their inventories, recursively.	2342	Returns the inventory of the object I<and> their inventories, recursively,
		2343	but I<not> the object itself.
2290		2344
2291	=cut	2345	=cut
2292		2346
2293	sub inv_recursive_;	2347	sub inv_recursive_;
2294	sub inv_recursive_ {	2348	sub inv_recursive_ {
…		…
2299	inv_recursive_ inv $_[0]	2353	inv_recursive_ inv $_[0]
2300	}	2354	}
2301		2355
2302	=item $ref = $ob->ref	2356	=item $ref = $ob->ref
2303		2357
2304	creates and returns a persistent reference to an objetc that can be stored as a string.	2358	Creates and returns a persistent reference to an object that can be stored as a string.
2305		2359
2306	=item $ob = cf::object::deref ($refstring)	2360	=item $ob = cf::object::deref ($refstring)
2307		2361
2308	returns the objetc referenced by refstring. may return undef when it cnanot find the object,	2362	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2309	even if the object actually exists. May block.	2363	even if the object actually exists. May block.
…		…
2341	can be C<undef>. Does the right thing when the player is currently in a	2395	can be C<undef>. Does the right thing when the player is currently in a
2342	dialogue with the given NPC character.	2396	dialogue with the given NPC character.
2343		2397
2344	=cut	2398	=cut
2345		2399
		2400	our $SAY_CHANNEL = {
		2401	id => "say",
		2402	title => "Map",
		2403	reply => "say ",
		2404	tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
		2405	};
		2406
		2407	our $CHAT_CHANNEL = {
		2408	id => "chat",
		2409	title => "Chat",
		2410	reply => "chat ",
		2411	tooltip => "Player chat and shouts, global to the server.",
		2412	};
		2413
2346	# rough implementation of a future "reply" method that works	2414	# rough implementation of a future "reply" method that works
2347	# with dialog boxes.	2415	# with dialog boxes.
2348	#TODO: the first argument must go, split into a $npc->reply_to ( method	2416	#TODO: the first argument must go, split into a $npc->reply_to ( method
2349	sub cf::object::player::reply($$$;$) {	2417	sub cf::object::player::reply($$$;$) {
2350	my ($self, $npc, $msg, $flags) = @_;	2418	my ($self, $npc, $msg, $flags) = @_;
…		…
2361	my $dialog = $pl->{npc_dialog};	2429	my $dialog = $pl->{npc_dialog};
2362	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));	2430	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2363		2431
2364	} else {	2432	} else {
2365	$msg = $npc->name . " says: $msg" if $npc;	2433	$msg = $npc->name . " says: $msg" if $npc;
2366	$self->message ($msg, $flags);	2434	$self->send_msg ($SAY_CHANNEL => $msg, $flags);
2367	}	2435	}
2368	}	2436	}
2369	}	2437	}
2370		2438
2371	=item $object->send_msg ($channel, $msg, $color, [extra...])	2439	=item $object->send_msg ($channel, $msg, $color, [extra...])
…		…
2396		2464
2397	=item $player_object->enter_link	2465	=item $player_object->enter_link
2398		2466
2399	Freezes the player and moves him/her to a special map (C<{link}>).	2467	Freezes the player and moves him/her to a special map (C<{link}>).
2400		2468
2401	The player should be reasonably safe there for short amounts of time. You	2469	The player should be reasonably safe there for short amounts of time (e.g.
2402	I<MUST> call C<leave_link> as soon as possible, though.	2470	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
		2471	though, as the palyer cannot control the character while it is on the link
		2472	map.
2403		2473
2404	Will never block.	2474	Will never block.
2405		2475
2406	=item $player_object->leave_link ($map, $x, $y)	2476	=item $player_object->leave_link ($map, $x, $y)
2407		2477
…		…
2465		2535
2466	$map->load;	2536	$map->load;
2467	$map->load_neighbours;	2537	$map->load_neighbours;
2468		2538
2469	return unless $self->contr->active;	2539	return unless $self->contr->active;
		2540	$self->flag (cf::FLAG_DEBUG, 0);#d# temp
2470	$self->activate_recursive;	2541	$self->activate_recursive;
2471		2542
2472	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2543	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2473	$self->enter_map ($map, $x, $y);	2544	$self->enter_map ($map, $x, $y);
2474	}	2545	}
…		…
2478	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
2479	her, loading and preparing them map, calling the provided $check callback	2550	her, loading and preparing them map, calling the provided $check callback
2480	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
2481	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
2482	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 >>.
2483		2557
2484	=cut	2558	=cut
2485		2559
2486	our $GOTOGEN;	2560	our $GOTOGEN;
2487		2561
…		…
2566	}	2640	}
2567		2641
2568	sub prepare_random_map {	2642	sub prepare_random_map {
2569	my ($exit) = @_;	2643	my ($exit) = @_;
2570		2644
2571	my $guard = cf::lock_acquire "exit_prepare:$exit";
2572
2573	# all this does is basically replace the /! path by	2645	# all this does is basically replace the /! path by
2574	# a new random map path (?random/...) with a seed	2646	# a new random map path (?random/...) with a seed
2575	# that depends on the exit object	2647	# that depends on the exit object
2576		2648
2577	my $rmp = parse_random_map_params $exit->msg;	2649	my $rmp = parse_random_map_params $exit->msg;
…		…
2579	if ($exit->map) {	2651	if ($exit->map) {
2580	$rmp->{region} = $exit->region->name;	2652	$rmp->{region} = $exit->region->name;
2581	$rmp->{origin_map} = $exit->map->path;	2653	$rmp->{origin_map} = $exit->map->path;
2582	$rmp->{origin_x} = $exit->x;	2654	$rmp->{origin_x} = $exit->x;
2583	$rmp->{origin_y} = $exit->y;	2655	$rmp->{origin_y} = $exit->y;
		2656
		2657	$exit->map->touch;
2584	}	2658	}
2585		2659
2586	$rmp->{random_seed} ||= $exit->random_seed;	2660	$rmp->{random_seed} ||= $exit->random_seed;
2587		2661
2588	my $data = cf::to_json $rmp;	2662	my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2589	my $md5 = Digest::MD5::md5_hex $data;	2663	my $md5 = Digest::MD5::md5_hex $data;
2590	my $meta = "$RANDOMDIR/$md5.meta";	2664	my $meta = "$RANDOMDIR/$md5.meta";
2591		2665
2592	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {	2666	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2593	aio_write $fh, 0, (length $data), $data, 0;	2667	aio_write $fh, 0, (length $data), $data, 0;
2594	undef $fh;	2668	undef $fh;
2595	aio_rename "$meta~", $meta;	2669	aio_rename "$meta~", $meta;
2596		2670
		2671	my $slaying = "?random/$md5";
		2672
		2673	if ($exit->valid) {
2597	$exit->slaying ("?random/$md5");	2674	$exit->slaying ("?random/$md5");
2598	$exit->msg (undef);	2675	$exit->msg (undef);
		2676	}
2599	}	2677	}
2600	}	2678	}
2601		2679
2602	sub cf::object::player::enter_exit {	2680	sub cf::object::player::enter_exit {
2603	my ($self, $exit) = @_;	2681	my ($self, $exit) = @_;
2604		2682
2605	return unless $self->type == cf::PLAYER;	2683	return unless $self->type == cf::PLAYER;
2606		2684
2607	if ($exit->slaying eq "/!") {
2608	#TODO: this should de-fi-ni-te-ly not be a sync-job
2609	# the problem is that $exit might not survive long enough
2610	# so it needs to be done right now, right here
2611	cf::sync_job { prepare_random_map $exit };
2612	}
2613
2614	my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2615	my $hp = $exit->stats->hp;
2616	my $sp = $exit->stats->sp;
2617
2618	$self->enter_link;	2685	$self->enter_link;
2619		2686
2620	# if exit is damned, update players death & WoR home-position
2621	$self->contr->savebed ($slaying, $hp, $sp)
2622	if $exit->flag (FLAG_DAMNED);
2623
2624	(async {	2687	(async {
2625	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";	2688	$Coro::current->{desc} = "enter_exit";
2626		2689
2627	$self->deactivate_recursive; # just to be sure
2628	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
2629	$self->goto ($slaying, $hp, $sp);	2705	$self->goto ($map, $x, $y);
2630		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
2631	1;	2711	1
2632	}) {	2712	}) {
2633	$self->message ("Something went wrong deep within the crossfire server. "	2713	$self->message ("Something went wrong deep within the deliantra server. "
2634	. "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. "
2635	. "Please report this to the dungeon master!",	2715	. "Please report this to the dungeon master!",
2636	cf::NDI_UNIQUE | cf::NDI_RED);	2716	cf::NDI_UNIQUE | cf::NDI_RED);
2637		2717
2638	warn "ERROR in enter_exit: $@";	2718	warn "ERROR in enter_exit: $@";
…		…
2666	the message, with C<log> being the default. If C<$color> is negative, suppress	2746	the message, with C<log> being the default. If C<$color> is negative, suppress
2667	the message unless the client supports the msg packet.	2747	the message unless the client supports the msg packet.
2668		2748
2669	=cut	2749	=cut
2670		2750
		2751	# non-persistent channels (usually the info channel)
2671	our %CHANNEL = (	2752	our %CHANNEL = (
2672	"c/identify" => {	2753	"c/identify" => {
2673	id => "infobox",	2754	id => "infobox",
2674	title => "Identify",	2755	title => "Identify",
2675	reply => undef,	2756	reply => undef,
…		…
2691	id => "infobox",	2772	id => "infobox",
2692	title => "Look",	2773	title => "Look",
2693	reply => undef,	2774	reply => undef,
2694	tooltip => "What you saw there",	2775	tooltip => "What you saw there",
2695	},	2776	},
		2777	"c/who" => {
		2778	id => "infobox",
		2779	title => "Players",
		2780	reply => undef,
		2781	tooltip => "Shows players who are currently online",
		2782	},
		2783	"c/body" => {
		2784	id => "infobox",
		2785	title => "Body Parts",
		2786	reply => undef,
		2787	tooltip => "Shows which body parts you posess and are available",
		2788	},
		2789	"c/uptime" => {
		2790	id => "infobox",
		2791	title => "Uptime",
		2792	reply => undef,
		2793	tooltip => "How long the server has been running since last restart",
		2794	},
		2795	"c/mapinfo" => {
		2796	id => "infobox",
		2797	title => "Map Info",
		2798	reply => undef,
		2799	tooltip => "Information related to the maps",
		2800	},
		2801	"c/party" => {
		2802	id => "party",
		2803	title => "Party",
		2804	reply => "gsay ",
		2805	tooltip => "Messages and chat related to your party",
		2806	},
2696	);	2807	);
2697		2808
2698	sub cf::client::send_msg {	2809	sub cf::client::send_msg {
2699	my ($self, $channel, $msg, $color, @extra) = @_;	2810	my ($self, $channel, $msg, $color, @extra) = @_;
2700		2811
2701	$msg = $self->pl->expand_cfpod ($msg);	2812	$msg = $self->pl->expand_cfpod ($msg)
		2813	unless $color & cf::NDI_VERBATIM;
2702		2814
2703	$color &= cf::NDI_CLIENT_MASK; # just in case...	2815	$color &= cf::NDI_CLIENT_MASK; # just in case...
2704		2816
2705	# check predefined channels, for the benefit of C	2817	# check predefined channels, for the benefit of C
2706	if ($CHANNEL{$channel}) {	2818	if ($CHANNEL{$channel}) {
…		…
2727	if ($self->can_msg) {	2839	if ($self->can_msg) {
2728	# default colour, mask it out	2840	# default colour, mask it out
2729	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)	2841	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2730	if $color & cf::NDI_DEF;	2842	if $color & cf::NDI_DEF;
2731		2843
2732	$self->send_packet ("msg " . $self->{json_coder}->encode (	2844	my $pkt = "msg "
		2845	. $self->{json_coder}->encode (
2733	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));	2846	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
		2847	);
		2848
		2849	# try lzf for large packets
		2850	$pkt = "lzf " . Compress::LZF::compress $pkt
		2851	if 1024 <= length $pkt and $self->{can_lzf};
		2852
		2853	# split very large packets
		2854	if (8192 < length $pkt and $self->{can_lzf}) {
		2855	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
		2856	$pkt = "frag";
		2857	}
		2858
		2859	$self->send_packet ($pkt);
2734	} else {	2860	} else {
2735	if ($color >= 0) {	2861	if ($color >= 0) {
2736	# replace some tags by gcfclient-compatible ones	2862	# replace some tags by gcfclient-compatible ones
2737	for ($msg) {	2863	for ($msg) {
2738	1 while	2864	1 while
…		…
2937		3063
2938	The following functions and methods are available within a safe environment:	3064	The following functions and methods are available within a safe environment:
2939		3065
2940	cf::object	3066	cf::object
2941	contr pay_amount pay_player map x y force_find force_add destroy	3067	contr pay_amount pay_player map x y force_find force_add destroy
2942	insert remove name archname title slaying race decrease_ob_nr	3068	insert remove name archname title slaying race decrease split
2943		3069
2944	cf::object::player	3070	cf::object::player
2945	player	3071	player
2946		3072
2947	cf::player	3073	cf::player
…		…
2952		3078
2953	=cut	3079	=cut
2954		3080
2955	for (	3081	for (
2956	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	3082	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2957	insert remove inv name archname title slaying race	3083	insert remove inv nrof name archname title slaying race
2958	decrease_ob_nr destroy)],	3084	decrease split destroy change_exp)],
2959	["cf::object::player" => qw(player)],	3085	["cf::object::player" => qw(player)],
2960	["cf::player" => qw(peaceful)],	3086	["cf::player" => qw(peaceful)],
2961	["cf::map" => qw(trigger)],	3087	["cf::map" => qw(trigger)],
2962	) {	3088	) {
2963	no strict 'refs';	3089	no strict 'refs';
…		…
3068	{	3194	{
3069	my $faces = $facedata->{faceinfo};	3195	my $faces = $facedata->{faceinfo};
3070		3196
3071	while (my ($face, $info) = each %$faces) {	3197	while (my ($face, $info) = each %$faces) {
3072	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3198	my $idx = (cf::face::find $face) || cf::face::alloc $face;
		3199
3073	cf::face::set_visibility $idx, $info->{visibility};	3200	cf::face::set_visibility $idx, $info->{visibility};
3074	cf::face::set_magicmap $idx, $info->{magicmap};	3201	cf::face::set_magicmap $idx, $info->{magicmap};
3075	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};	3202	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3076	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};	3203	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3077		3204
3078	cf::cede_to_tick;	3205	cf::cede_to_tick;
3079	}	3206	}
3080		3207
3081	while (my ($face, $info) = each %$faces) {	3208	while (my ($face, $info) = each %$faces) {
3082	next unless $info->{smooth};	3209	next unless $info->{smooth};
		3210
3083	my $idx = cf::face::find $face	3211	my $idx = cf::face::find $face
3084	or next;	3212	or next;
		3213
3085	if (my $smooth = cf::face::find $info->{smooth}) {	3214	if (my $smooth = cf::face::find $info->{smooth}) {
3086	cf::face::set_smooth $idx, $smooth;	3215	cf::face::set_smooth $idx, $smooth;
3087	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3216	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3088	} else {	3217	} else {
3089	warn "smooth face '$info->{smooth}' not found for face '$face'";	3218	warn "smooth face '$info->{smooth}' not found for face '$face'";
…		…
3107	{	3236	{
3108	# TODO: for gcfclient pleasure, we should give resources	3237	# TODO: for gcfclient pleasure, we should give resources
3109	# that gcfclient doesn't grok a >10000 face index.	3238	# that gcfclient doesn't grok a >10000 face index.
3110	my $res = $facedata->{resource};	3239	my $res = $facedata->{resource};
3111		3240
3112	my $soundconf = delete $res->{"res/sound.conf"};
3113
3114	while (my ($name, $info) = each %$res) {	3241	while (my ($name, $info) = each %$res) {
		3242	if (defined $info->{type}) {
3115	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3243	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3116	my $data;	3244	my $data;
3117		3245
3118	if ($info->{type} & 1) {	3246	if ($info->{type} & 1) {
3119	# prepend meta info	3247	# prepend meta info
3120		3248
3121	my $meta = $enc->encode ({	3249	my $meta = $enc->encode ({
3122	name => $name,	3250	name => $name,
3123	%{ $info->{meta} || {} },	3251	%{ $info->{meta} || {} },
3124	});	3252	});
3125		3253
3126	$data = pack "(w/a*)*", $meta, $info->{data};	3254	$data = pack "(w/a*)*", $meta, $info->{data};
		3255	} else {
		3256	$data = $info->{data};
		3257	}
		3258
		3259	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3260	cf::face::set_type $idx, $info->{type};
3127	} else {	3261	} else {
3128	$data = $info->{data};	3262	$RESOURCE{$name} = $info;
3129	}	3263	}
3130		3264
3131	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3132	cf::face::set_type $idx, $info->{type};
3133
3134	cf::cede_to_tick;	3265	cf::cede_to_tick;
3135	}	3266	}
3136
3137	if ($soundconf) {
3138	$soundconf = $enc->decode (delete $soundconf->{data});
3139
3140	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3141	my $sound = $soundconf->{compat}[$_]
3142	or next;
3143
3144	my $face = cf::face::find "sound/$sound->[1]";
3145	cf::sound::set $sound->[0] => $face;
3146	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3147	}
3148
3149	while (my ($k, $v) = each %{$soundconf->{event}}) {
3150	my $face = cf::face::find "sound/$v";
3151	cf::sound::set $k => $face;
3152	}
3153	}
3154	}	3267	}
		3268
		3269	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3155		3270
3156	1	3271	1
3157	}	3272	}
		3273
		3274	cf::global->attach (on_resource_update => sub {
		3275	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
		3276	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
		3277
		3278	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3279	my $sound = $soundconf->{compat}[$_]
		3280	or next;
		3281
		3282	my $face = cf::face::find "sound/$sound->[1]";
		3283	cf::sound::set $sound->[0] => $face;
		3284	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3285	}
		3286
		3287	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3288	my $face = cf::face::find "sound/$v";
		3289	cf::sound::set $k => $face;
		3290	}
		3291	}
		3292	});
3158		3293
3159	register_exticmd fx_want => sub {	3294	register_exticmd fx_want => sub {
3160	my ($ns, $want) = @_;	3295	my ($ns, $want) = @_;
3161		3296
3162	while (my ($k, $v) = each %$want) {	3297	while (my ($k, $v) = each %$want) {
3163	$ns->fx_want ($k, $v);	3298	$ns->fx_want ($k, $v);
3164	}	3299	}
3165	};	3300	};
		3301
		3302	sub load_resource_file($) {
		3303	my $guard = lock_acquire "load_resource_file";
		3304
		3305	my $status = load_resource_file_ $_[0];
		3306	get_slot 0.1, 100;
		3307	cf::arch::commit_load;
		3308
		3309	$status
		3310	}
3166		3311
3167	sub reload_regions {	3312	sub reload_regions {
3168	# HACK to clear player env face cache, we need some signal framework	3313	# HACK to clear player env face cache, we need some signal framework
3169	# for this (global event?)	3314	# for this (global event?)
3170	%ext::player_env::MUSIC_FACE_CACHE = ();	3315	%ext::player_env::MUSIC_FACE_CACHE = ();
…		…
3184	}	3329	}
3185		3330
3186	sub reload_archetypes {	3331	sub reload_archetypes {
3187	load_resource_file "$DATADIR/archetypes"	3332	load_resource_file "$DATADIR/archetypes"
3188	or die "unable to load archetypes\n";	3333	or die "unable to load archetypes\n";
3189	#d# NEED to laod twice to resolve forward references
3190	# this really needs to be done in an extra post-pass
3191	# (which needs to be synchronous, so solve it differently)
3192	load_resource_file "$DATADIR/archetypes"
3193	or die "unable to load archetypes\n";
3194	}	3334	}
3195		3335
3196	sub reload_treasures {	3336	sub reload_treasures {
3197	load_resource_file "$DATADIR/treasures"	3337	load_resource_file "$DATADIR/treasures"
3198	or die "unable to load treasurelists\n";	3338	or die "unable to load treasurelists\n";
3199	}	3339	}
3200		3340
3201	sub reload_resources {	3341	sub reload_resources {
3202	warn "reloading resource files...\n";	3342	warn "reloading resource files...\n";
3203		3343
		3344	reload_facedata;
		3345	reload_archetypes;
3204	reload_regions;	3346	reload_regions;
3205	reload_facedata;
3206	#reload_archetypes;#d#
3207	reload_archetypes;
3208	reload_treasures;	3347	reload_treasures;
3209		3348
3210	warn "finished reloading resource files\n";	3349	warn "finished reloading resource files\n";
3211	}	3350	}
3212		3351
3213	sub init {	3352	sub init {
		3353	my $guard = freeze_mainloop;
		3354
		3355	evthread_start IO::AIO::poll_fileno;
		3356
3214	reload_resources;	3357	reload_resources;
3215	}	3358	}
3216		3359
3217	sub reload_config {	3360	sub reload_config {
3218	open my $fh, "<:utf8", "$CONFDIR/config"	3361	open my $fh, "<:utf8", "$CONFDIR/config"
3219	or return;	3362	or return;
3220		3363
3221	local $/;	3364	local $/;
3222	*CFG = YAML::Syck::Load <$fh>;	3365	*CFG = YAML::Load <$fh>;
3223		3366
3224	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3367	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3225		3368
3226	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3369	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3227	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3370	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
3233	};	3376	};
3234	warn $@ if $@;	3377	warn $@ if $@;
3235	}	3378	}
3236	}	3379	}
3237		3380
		3381	sub pidfile() {
		3382	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
		3383	or die "$PIDFILE: $!";
		3384	flock $fh, &Fcntl::LOCK_EX
		3385	or die "$PIDFILE: flock: $!";
		3386	$fh
		3387	}
		3388
		3389	# make sure only one server instance is running at any one time
		3390	sub atomic {
		3391	my $fh = pidfile;
		3392
		3393	my $pid = <$fh>;
		3394	kill 9, $pid if $pid > 0;
		3395
		3396	seek $fh, 0, 0;
		3397	print $fh $$;
		3398	}
		3399
3238	sub main {	3400	sub main {
		3401	atomic;
		3402
3239	# we must not ever block the main coroutine	3403	# we must not ever block the main coroutine
3240	local $Coro::idle = sub {	3404	local $Coro::idle = sub {
3241	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3405	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3242	(async {	3406	(async {
3243	$Coro::current->{desc} = "IDLE BUG HANDLER";	3407	$Coro::current->{desc} = "IDLE BUG HANDLER";
3244	Event::one_event;	3408	EV::loop EV::LOOP_ONESHOT;
3245	})->prio (Coro::PRIO_MAX);	3409	})->prio (Coro::PRIO_MAX);
3246	};	3410	};
3247		3411
		3412	{
		3413	my $guard = freeze_mainloop;
3248	reload_config;	3414	reload_config;
3249	db_init;	3415	db_init;
3250	load_extensions;	3416	load_extensions;
3251		3417
3252	$TICK_WATCHER->start;	3418	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
		3419	}
		3420
		3421	utime time, time, $RUNTIMEFILE;
		3422
		3423	# no (long-running) fork's whatsoever before this point(!)
		3424	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
		3425
3253	Event::loop;	3426	EV::loop;
3254	}	3427	}
3255		3428
3256	#############################################################################	3429	#############################################################################
3257	# initialisation and cleanup	3430	# initialisation and cleanup
3258		3431
3259	# install some emergency cleanup handlers	3432	# install some emergency cleanup handlers
3260	BEGIN {	3433	BEGIN {
		3434	our %SIGWATCHER = ();
3261	for my $signal (qw(INT HUP TERM)) {	3435	for my $signal (qw(INT HUP TERM)) {
3262	Event->signal (	3436	$SIGWATCHER{$signal} = EV::signal $signal, sub {
3263	reentrant => 0,
3264	data => WF_AUTOCANCEL,
3265	signal => $signal,
3266	prio => 0,
3267	cb => sub {
3268	cf::cleanup "SIG$signal";	3437	cf::cleanup "SIG$signal";
3269	},
3270	);	3438	};
3271	}	3439	}
3272	}	3440	}
3273		3441
3274	sub write_runtime {	3442	sub write_runtime_sync {
3275	my $runtime = "$LOCALDIR/runtime";
3276
3277	# first touch the runtime file to show we are still running:	3443	# first touch the runtime file to show we are still running:
3278	# the fsync below can take a very very long time.	3444	# the fsync below can take a very very long time.
3279		3445
3280	IO::AIO::aio_utime $runtime, undef, undef;	3446	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3281		3447
3282	my $guard = cf::lock_acquire "write_runtime";	3448	my $guard = cf::lock_acquire "write_runtime";
3283		3449
3284	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644	3450	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3285	or return;	3451	or return;
3286		3452
3287	my $value = $cf::RUNTIME + 90 + 10;	3453	my $value = $cf::RUNTIME + 90 + 10;
3288	# 10 is the runtime save interval, for a monotonic clock	3454	# 10 is the runtime save interval, for a monotonic clock
3289	# 60 allows for the watchdog to kill the server.	3455	# 60 allows for the watchdog to kill the server.
…		…
3299	aio_utime $fh, undef, undef;	3465	aio_utime $fh, undef, undef;
3300		3466
3301	close $fh	3467	close $fh
3302	or return;	3468	or return;
3303		3469
3304	aio_rename "$runtime~", $runtime	3470	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3305	and return;	3471	and return;
3306		3472
3307	warn "runtime file written.\n";	3473	warn "runtime file written.\n";
3308		3474
3309	1	3475	1
		3476	}
		3477
		3478	our $uuid_lock;
		3479	our $uuid_skip;
		3480
		3481	sub write_uuid_sync($) {
		3482	$uuid_skip ||= $_[0];
		3483
		3484	return if $uuid_lock;
		3485	local $uuid_lock = 1;
		3486
		3487	my $uuid = "$LOCALDIR/uuid";
		3488
		3489	my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
		3490	or return;
		3491
		3492	my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
		3493	$uuid_skip = 0;
		3494
		3495	(aio_write $fh, 0, (length $value), $value, 0) <= 0
		3496	and return;
		3497
		3498	# always fsync - this file is important
		3499	aio_fsync $fh
		3500	and return;
		3501
		3502	close $fh
		3503	or return;
		3504
		3505	aio_rename "$uuid~", $uuid
		3506	and return;
		3507
		3508	warn "uuid file written ($value).\n";
		3509
		3510	1
		3511
		3512	}
		3513
		3514	sub write_uuid($$) {
		3515	my ($skip, $sync) = @_;
		3516
		3517	$sync ? write_uuid_sync $skip
		3518	: async { write_uuid_sync $skip };
3310	}	3519	}
3311		3520
3312	sub emergency_save() {	3521	sub emergency_save() {
3313	my $freeze_guard = cf::freeze_mainloop;	3522	my $freeze_guard = cf::freeze_mainloop;
3314		3523
…		…
3336	warn "end emergency map save\n";	3545	warn "end emergency map save\n";
3337		3546
3338	warn "begin emergency database checkpoint\n";	3547	warn "begin emergency database checkpoint\n";
3339	BDB::db_env_txn_checkpoint $DB_ENV;	3548	BDB::db_env_txn_checkpoint $DB_ENV;
3340	warn "end emergency database checkpoint\n";	3549	warn "end emergency database checkpoint\n";
		3550
		3551	warn "begin write uuid\n";
		3552	write_uuid_sync 1;
		3553	warn "end write uuid\n";
3341	};	3554	};
3342		3555
3343	warn "leave emergency perl save\n";	3556	warn "leave emergency perl save\n";
3344	}	3557	}
3345		3558
3346	sub post_cleanup {	3559	sub post_cleanup {
3347	my ($make_core) = @_;	3560	my ($make_core) = @_;
3348		3561
3349	warn Carp::longmess "post_cleanup backtrace"	3562	warn Carp::longmess "post_cleanup backtrace"
3350	if $make_core;	3563	if $make_core;
		3564
		3565	my $fh = pidfile;
		3566	unlink $PIDFILE if <$fh> == $$;
3351	}	3567	}
		3568
		3569	# a safer delete_package, copied from Symbol
		3570	sub clear_package($) {
		3571	my $pkg = shift;
		3572
		3573	# expand to full symbol table name if needed
		3574	unless ($pkg =~ /^main::.*::$/) {
		3575	$pkg = "main$pkg" if $pkg =~ /^::/;
		3576	$pkg = "main::$pkg" unless $pkg =~ /^main::/;
		3577	$pkg .= '::' unless $pkg =~ /::$/;
		3578	}
		3579
		3580	my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
		3581	my $stem_symtab = *{$stem}{HASH};
		3582
		3583	defined $stem_symtab and exists $stem_symtab->{$leaf}
		3584	or return;
		3585
		3586	# clear all symbols
		3587	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
		3588	for my $name (keys %$leaf_symtab) {
		3589	_gv_clear *{"$pkg$name"};
		3590	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
		3591	}
		3592	warn "cleared package #$pkg\n";#d#
		3593	}
		3594
		3595	our $RELOAD; # how many times to reload
3352		3596
3353	sub do_reload_perl() {	3597	sub do_reload_perl() {
3354	# can/must only be called in main	3598	# can/must only be called in main
3355	if ($Coro::current != $Coro::main) {	3599	if ($Coro::current != $Coro::main) {
3356	warn "can only reload from main coroutine";	3600	warn "can only reload from main coroutine";
3357	return;	3601	return;
3358	}	3602	}
3359		3603
		3604	return if $RELOAD++;
		3605
		3606	while ($RELOAD) {
3360	warn "reloading...";	3607	warn "reloading...";
3361		3608
3362	warn "entering sync_job";	3609	warn "entering sync_job";
3363		3610
3364	cf::sync_job {	3611	cf::sync_job {
3365	cf::write_runtime; # external watchdog should not bark	3612	cf::write_runtime_sync; # external watchdog should not bark
3366	cf::emergency_save;	3613	cf::emergency_save;
3367	cf::write_runtime; # external watchdog should not bark	3614	cf::write_runtime_sync; # external watchdog should not bark
3368		3615
3369	warn "syncing database to disk";	3616	warn "syncing database to disk";
3370	BDB::db_env_txn_checkpoint $DB_ENV;	3617	BDB::db_env_txn_checkpoint $DB_ENV;
3371		3618
3372	# if anything goes wrong in here, we should simply crash as we already saved	3619	# if anything goes wrong in here, we should simply crash as we already saved
3373		3620
3374	warn "cancelling all WF_AUTOCANCEL watchers";
3375	for (Event::all_watchers) {
3376	$_->cancel if $_->data & WF_AUTOCANCEL;
3377	}
3378
3379	warn "flushing outstanding aio requests";	3621	warn "flushing outstanding aio requests";
3380	for (;;) {
3381	BDB::flush;
3382	IO::AIO::flush;
3383	Coro::cede_notself;
3384	last unless IO::AIO::nreqs || BDB::nreqs;	3622	while (IO::AIO::nreqs || BDB::nreqs) {
3385	warn "iterate...";	3623	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3386	}
3387
3388	++$RELOAD;
3389
3390	warn "cancelling all extension coros";
3391	$_->cancel for values %EXT_CORO;
3392	%EXT_CORO = ();
3393
3394	warn "removing commands";
3395	%COMMAND = ();
3396
3397	warn "removing ext/exti commands";
3398	%EXTCMD = ();
3399	%EXTICMD = ();
3400
3401	warn "unloading/nuking all extensions";
3402	for my $pkg (@EXTS) {
3403	warn "... unloading $pkg";
3404
3405	if (my $cb = $pkg->can ("unload")) {
3406	eval {
3407	$cb->($pkg);
3408	1
3409	} or warn "$pkg unloaded, but with errors: $@";
3410	}	3624	}
3411		3625
3412	warn "... nuking $pkg";	3626	warn "cancelling all extension coros";
3413	Symbol::delete_package $pkg;	3627	$_->cancel for values %EXT_CORO;
3414	}	3628	%EXT_CORO = ();
3415		3629
3416	warn "unloading all perl modules loaded from $LIBDIR";	3630	warn "removing commands";
3417	while (my ($k, $v) = each %INC) {	3631	%COMMAND = ();
3418	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3419		3632
		3633	warn "removing ext/exti commands";
		3634	%EXTCMD = ();
		3635	%EXTICMD = ();
		3636
		3637	warn "unloading/nuking all extensions";
		3638	for my $pkg (@EXTS) {
3420	warn "... unloading $k";	3639	warn "... unloading $pkg";
3421	delete $INC{$k};
3422		3640
3423	$k =~ s/\.pm$//;
3424	$k =~ s/\//::/g;
3425
3426	if (my $cb = $k->can ("unload_module")) {	3641	if (my $cb = $pkg->can ("unload")) {
		3642	eval {
3427	$cb->();	3643	$cb->($pkg);
		3644	1
		3645	} or warn "$pkg unloaded, but with errors: $@";
		3646	}
		3647
		3648	warn "... clearing $pkg";
		3649	clear_package $pkg;
3428	}	3650	}
3429		3651
3430	Symbol::delete_package $k;	3652	warn "unloading all perl modules loaded from $LIBDIR";
		3653	while (my ($k, $v) = each %INC) {
		3654	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
		3655
		3656	warn "... unloading $k";
		3657	delete $INC{$k};
		3658
		3659	$k =~ s/\.pm$//;
		3660	$k =~ s/\//::/g;
		3661
		3662	if (my $cb = $k->can ("unload_module")) {
		3663	$cb->();
		3664	}
		3665
		3666	clear_package $k;
3431	}	3667	}
3432		3668
3433	warn "getting rid of safe::, as good as possible";	3669	warn "getting rid of safe::, as good as possible";
3434	Symbol::delete_package "safe::$_"	3670	clear_package "safe::$_"
3435	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	3671	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3436		3672
3437	warn "unloading cf.pm \"a bit\"";	3673	warn "unloading cf.pm \"a bit\"";
3438	delete $INC{"cf.pm"};	3674	delete $INC{"cf.pm"};
3439	delete $INC{"cf/pod.pm"};	3675	delete $INC{"cf/pod.pm"};
3440		3676
3441	# don't, removes xs symbols, too,	3677	# don't, removes xs symbols, too,
3442	# and global variables created in xs	3678	# and global variables created in xs
3443	#Symbol::delete_package __PACKAGE__;	3679	#clear_package __PACKAGE__;
3444		3680
3445	warn "unload completed, starting to reload now";	3681	warn "unload completed, starting to reload now";
3446		3682
3447	warn "reloading cf.pm";	3683	warn "reloading cf.pm";
3448	require cf;	3684	require cf;
3449	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3685	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3450		3686
3451	warn "loading config and database again";	3687	warn "loading config and database again";
3452	cf::reload_config;	3688	cf::reload_config;
3453		3689
3454	warn "loading extensions";	3690	warn "loading extensions";
3455	cf::load_extensions;	3691	cf::load_extensions;
3456		3692
3457	warn "reattaching attachments to objects/players";	3693	warn "reattaching attachments to objects/players";
3458	_global_reattach; # objects, sockets	3694	_global_reattach; # objects, sockets
3459	warn "reattaching attachments to maps";	3695	warn "reattaching attachments to maps";
3460	reattach $_ for values %MAP;	3696	reattach $_ for values %MAP;
3461	warn "reattaching attachments to players";	3697	warn "reattaching attachments to players";
3462	reattach $_ for values %PLAYER;	3698	reattach $_ for values %PLAYER;
3463		3699
3464	warn "leaving sync_job";	3700	warn "leaving sync_job";
3465		3701
3466	1	3702	1
3467	} or do {	3703	} or do {
3468	warn $@;	3704	warn $@;
3469	warn "error while reloading, exiting.";	3705	cf::cleanup "error while reloading, exiting.";
3470	exit 1;
3471	};	3706	};
3472		3707
3473	warn "reloaded";	3708	warn "reloaded";
		3709	--$RELOAD;
		3710	}
3474	};	3711	};
3475		3712
3476	our $RELOAD_WATCHER; # used only during reload	3713	our $RELOAD_WATCHER; # used only during reload
3477		3714
3478	sub reload_perl() {	3715	sub reload_perl() {
3479	# doing reload synchronously and two reloads happen back-to-back,	3716	# doing reload synchronously and two reloads happen back-to-back,
3480	# coro crashes during coro_state_free->destroy here.	3717	# coro crashes during coro_state_free->destroy here.
3481		3718
3482	$RELOAD_WATCHER ||= Event->timer (	3719	$RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3483	reentrant => 0,
3484	after => 0,
3485	data => WF_AUTOCANCEL,
3486	cb => sub {
3487	do_reload_perl;	3720	do_reload_perl;
3488	undef $RELOAD_WATCHER;	3721	undef $RELOAD_WATCHER;
3489	},
3490	);	3722	};
3491	}	3723	}
3492		3724
3493	register_command "reload" => sub {	3725	register_command "reload" => sub {
3494	my ($who, $arg) = @_;	3726	my ($who, $arg) = @_;
3495		3727
…		…
3508		3740
3509	our @WAIT_FOR_TICK;	3741	our @WAIT_FOR_TICK;
3510	our @WAIT_FOR_TICK_BEGIN;	3742	our @WAIT_FOR_TICK_BEGIN;
3511		3743
3512	sub wait_for_tick {	3744	sub wait_for_tick {
3513	return unless $TICK_WATCHER->is_active;
3514	return if $Coro::current == $Coro::main;	3745	return if tick_inhibit || $Coro::current == $Coro::main;
3515		3746
3516	my $signal = new Coro::Signal;	3747	my $signal = new Coro::Signal;
3517	push @WAIT_FOR_TICK, $signal;	3748	push @WAIT_FOR_TICK, $signal;
3518	$signal->wait;	3749	$signal->wait;
3519	}	3750	}
3520		3751
3521	sub wait_for_tick_begin {	3752	sub wait_for_tick_begin {
3522	return unless $TICK_WATCHER->is_active;
3523	return if $Coro::current == $Coro::main;	3753	return if tick_inhibit || $Coro::current == $Coro::main;
3524		3754
3525	my $signal = new Coro::Signal;	3755	my $signal = new Coro::Signal;
3526	push @WAIT_FOR_TICK_BEGIN, $signal;	3756	push @WAIT_FOR_TICK_BEGIN, $signal;
3527	$signal->wait;	3757	$signal->wait;
3528	}	3758	}
3529		3759
3530	$TICK_WATCHER = Event->timer (	3760	sub tick {
3531	reentrant => 0,
3532	parked => 1,
3533	prio => 0,
3534	at => $NEXT_TICK || $TICK,
3535	data => WF_AUTOCANCEL,
3536	cb => sub {
3537	if ($Coro::current != $Coro::main) {	3761	if ($Coro::current != $Coro::main) {
3538	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	3762	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3539	unless ++$bug_warning > 10;	3763	unless ++$bug_warning > 10;
3540	return;	3764	return;
3541	}	3765	}
3542		3766
3543	$NOW = $tick_start = Event::time;
3544
3545	cf::server_tick; # one server iteration	3767	cf::server_tick; # one server iteration
3546		3768
3547	$RUNTIME += $TICK;
3548	$NEXT_TICK += $TICK;
3549
3550	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3769	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3551	$NEXT_RUNTIME_WRITE = $NOW + 10;	3770	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3552	Coro::async_pool {	3771	Coro::async_pool {
3553	$Coro::current->{desc} = "runtime saver";	3772	$Coro::current->{desc} = "runtime saver";
3554	write_runtime	3773	write_runtime_sync
3555	or warn "ERROR: unable to write runtime file: $!";	3774	or warn "ERROR: unable to write runtime file: $!";
3556	};
3557	}	3775	};
		3776	}
3558		3777
3559	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3778	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3560	$sig->send;	3779	$sig->send;
3561	}	3780	}
3562	while (my $sig = shift @WAIT_FOR_TICK) {	3781	while (my $sig = shift @WAIT_FOR_TICK) {
3563	$sig->send;	3782	$sig->send;
3564	}	3783	}
3565		3784
3566	$NOW = Event::time;	3785	$LOAD = ($NOW - $TICK_START) / $TICK;
3567
3568	# if we are delayed by four ticks or more, skip them all
3569	$NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3570
3571	$TICK_WATCHER->at ($NEXT_TICK);
3572	$TICK_WATCHER->start;
3573
3574	$LOAD = ($NOW - $tick_start) / $TICK;
3575	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3786	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3576		3787
3577	_post_tick;	3788	if (0) {
		3789	if ($NEXT_TICK) {
		3790	my $jitter = $TICK_START - $NEXT_TICK;
		3791	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
		3792	warn "jitter $JITTER\n";#d#
		3793	}
3578	},	3794	}
3579	);	3795	}
3580		3796
3581	{	3797	{
		3798	# configure BDB
		3799
3582	BDB::min_parallel 8;	3800	BDB::min_parallel 8;
3583	BDB::max_poll_time $TICK * 0.1;	3801	BDB::max_poll_reqs $TICK * 0.1;
3584	$BDB_POLL_WATCHER = Event->io (	3802	$AnyEvent::BDB::WATCHER->priority (1);
3585	reentrant => 0,
3586	fd => BDB::poll_fileno,
3587	poll => 'r',
3588	prio => 0,
3589	data => WF_AUTOCANCEL,
3590	cb => \&BDB::poll_cb,
3591	);
3592
3593	BDB::set_sync_prepare {
3594	my $status;
3595	my $current = $Coro::current;
3596	(
3597	sub {
3598	$status = $!;
3599	$current->ready; undef $current;
3600	},
3601	sub {
3602	Coro::schedule while defined $current;
3603	$! = $status;
3604	},
3605	)
3606	};
3607		3803
3608	unless ($DB_ENV) {	3804	unless ($DB_ENV) {
3609	$DB_ENV = BDB::db_env_create;	3805	$DB_ENV = BDB::db_env_create;
3610	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC	3806	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3611	| BDB::LOG_AUTOREMOVE, 1);	3807	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
		3808	$DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3612	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);	3809	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3613	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);	3810	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3614		3811
3615	cf::sync_job {	3812	cf::sync_job {
3616	eval {	3813	eval {
…		…
3626		3823
3627	cf::cleanup "db_env_open(db): $@" if $@;	3824	cf::cleanup "db_env_open(db): $@" if $@;
3628	};	3825	};
3629	}	3826	}
3630		3827
3631	$BDB_DEADLOCK_WATCHER = Event->timer (	3828	$BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3632	after => 3,
3633	interval => 1,
3634	hard => 1,
3635	prio => 0,
3636	data => WF_AUTOCANCEL,
3637	cb => sub {
3638	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };	3829	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3639	},
3640	);	3830	};
3641	$BDB_CHECKPOINT_WATCHER = Event->timer (	3831	$BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3642	after => 11,
3643	interval => 60,
3644	hard => 1,
3645	prio => 0,
3646	data => WF_AUTOCANCEL,
3647	cb => sub {
3648	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	3832	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3649	},
3650	);	3833	};
3651	$BDB_TRICKLE_WATCHER = Event->timer (	3834	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3652	after => 5,
3653	interval => 10,
3654	hard => 1,
3655	prio => 0,
3656	data => WF_AUTOCANCEL,
3657	cb => sub {
3658	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	3835	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3659	},
3660	);	3836	};
3661	}	3837	}
3662		3838
3663	{	3839	{
		3840	# configure IO::AIO
		3841
3664	IO::AIO::min_parallel 8;	3842	IO::AIO::min_parallel 8;
3665
3666	undef $Coro::AIO::WATCHER;
3667	IO::AIO::max_poll_time $TICK * 0.1;	3843	IO::AIO::max_poll_time $TICK * 0.1;
3668	$AIO_POLL_WATCHER = Event->io (	3844	undef $AnyEvent::AIO::WATCHER;
3669	reentrant => 0,
3670	data => WF_AUTOCANCEL,
3671	fd => IO::AIO::poll_fileno,
3672	poll => 'r',
3673	prio => 0,
3674	cb => \&IO::AIO::poll_cb,
3675	);
3676	}	3845	}
3677		3846
3678	my $_log_backtrace;	3847	my $_log_backtrace;
3679		3848
3680	sub _log_backtrace {	3849	sub _log_backtrace {
…		…
3683	$msg =~ s/\n//;	3852	$msg =~ s/\n//;
3684		3853
3685	# limit the # of concurrent backtraces	3854	# limit the # of concurrent backtraces
3686	if ($_log_backtrace < 2) {	3855	if ($_log_backtrace < 2) {
3687	++$_log_backtrace;	3856	++$_log_backtrace;
		3857	my $perl_bt = Carp::longmess $msg;
3688	async {	3858	async {
3689	$Coro::current->{desc} = "abt $msg";	3859	$Coro::current->{desc} = "abt $msg";
3690		3860
3691	my @bt = fork_call {	3861	my @bt = fork_call {
3692	@addr = map { sprintf "%x", $_ } @addr;	3862	@addr = map { sprintf "%x", $_ } @addr;
…		…
3703	}	3873	}
3704		3874
3705	@funcs	3875	@funcs
3706	};	3876	};
3707		3877
3708	LOG llevInfo, "[ABT] $msg\n";	3878	LOG llevInfo, "[ABT] $perl_bt\n";
		3879	LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3709	LOG llevInfo, "[ABT] $_\n" for @bt;	3880	LOG llevInfo, "[ABT] $_\n" for @bt;
3710	--$_log_backtrace;	3881	--$_log_backtrace;
3711	};	3882	};
3712	} else {	3883	} else {
3713	LOG llevInfo, "[ABT] $msg\n";	3884	LOG llevInfo, "[ABT] $msg\n";

Diff Legend

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