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.393 by root, Fri Oct 26 04:47:00 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	use re 'eval';
1554
1555	my $group;
1556	my $interior; $interior = qr{
1557	# match a pod interior sequence sans C<< >>
1558	(?:
1559	\ (.*?)\ (?{ $group = $^N })
1560	| < (??{$interior}) >
1561	)
1562	}x;
1563
1564	sub expand_cfpod {
1565	my ($self, $pod) = @_;
1566
1567	my $xml;
1568
1569	while () {
1570	if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1571	$group = $1;
1572
1573	$group =~ s/&/&amp;/g;
1574	$group =~ s/</&lt;/g;
1575
1576	$xml .= $group;
1577	} elsif ($pod =~ m%\G
1578	([BCGHITU])
1579	<
1580	(?:
1581	([^<>]*) (?{ $group = $^N })
1582	| < $interior >
1583	)
1584	>
1585	%gcsx
1586	) {
1587	my ($code, $data) = ($1, $group);
1588
1589	if ($code eq "B") {
1590	$xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1591	} elsif ($code eq "I") {
1592	$xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1593	} elsif ($code eq "U") {
1594	$xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1595	} elsif ($code eq "C") {
1596	$xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1597	} elsif ($code eq "T") {
1598	$xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1599	} elsif ($code eq "G") {
1600	my ($male, $female) = split /\|/, $data;
1601	$data = $self->gender ? $female : $male;
1602	$xml .= expand_cfpod ($self, $data);
1603	} elsif ($code eq "H") {
1604	$xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1605	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1606	"")
1607	[$self->{hintmode}];
1608	} else {
1609	$xml .= "error processing '$code($data)' directive";
1610	}
1611	} else {
1612	if ($pod =~ /\G(.+)/) {
1613	warn "parse error while expanding $pod (at $1)";
1614	}
1615	last;
1616	}
1617	}
1618
1619	for ($xml) {
1620	# create single paragraphs (very hackish)
1621	s/(?<=\S)\n(?=\w)/ /g;
1622
1623	# compress some whitespace
1624	s/\s+\n/\n/g; # ws line-ends
1625	s/\n\n+/\n/g; # double lines
1626	s/^\n+//; # beginning lines
1627	s/\n+$//; # ending lines
1628	}
1629
1630	$xml
1631	}
1632
1633	no re 'eval';
1634
1635	sub hintmode {
1636	$_[0]{hintmode} = $_[1] if @_ > 1;
1637	$_[0]{hintmode}
1638	}
1639		1646
1640	=item $player->ext_reply ($msgid, @msg)	1647	=item $player->ext_reply ($msgid, @msg)
1641		1648
1642	Sends an ext reply to the player.	1649	Sends an ext reply to the player.
1643		1650
…		…
1710	our $MAX_RESET = 3600;	1717	our $MAX_RESET = 3600;
1711	our $DEFAULT_RESET = 3000;	1718	our $DEFAULT_RESET = 3000;
1712		1719
1713	sub generate_random_map {	1720	sub generate_random_map {
1714	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
1715	# mit "rum" bekleckern, nicht	1725	# mit "rum" bekleckern, nicht
1716	$self->_create_random_map (	1726	$self->_create_random_map (
1717	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},	1727	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1718	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},	1728	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1719	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},	1729	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
…		…
1841		1851
1842	# the temporary/swap location	1852	# the temporary/swap location
1843	sub save_path {	1853	sub save_path {
1844	my ($self) = @_;	1854	my ($self) = @_;
1845		1855
1846	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1856	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1847	"$TMPDIR/$path.map"	1857	"$TMPDIR/$path.map"
1848	}	1858	}
1849		1859
1850	# the unique path, undef == no special unique path	1860	# the unique path, undef == no special unique path
1851	sub uniq_path {	1861	sub uniq_path {
1852	my ($self) = @_;	1862	my ($self) = @_;
1853		1863
1854	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1864	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1855	"$UNIQUEDIR/$path"	1865	"$UNIQUEDIR/$path"
1856	}	1866	}
1857		1867
1858	# and all this just because we cannot iterate over	1868	# and all this just because we cannot iterate over
1859	# all maps in C++...	1869	# all maps in C++...
…		…
1957		1967
1958	cf::lock_wait "map_data:$path";#d#remove	1968	cf::lock_wait "map_data:$path";#d#remove
1959	cf::lock_wait "map_find:$path";	1969	cf::lock_wait "map_find:$path";
1960		1970
1961	$cf::MAP{$path} || do {	1971	$cf::MAP{$path} || do {
1962	my $guard1 = cf::lock_acquire "map_find:$path";
1963	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";
1964		1974
1965	my $map = new_from_path cf::map $path	1975	my $map = new_from_path cf::map $path
1966	or return;	1976	or return;
1967		1977
1968	$map->{last_save} = $cf::RUNTIME;	1978	$map->{last_save} = $cf::RUNTIME;
…		…
1971	or return;	1981	or return;
1972		1982
1973	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1983	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1974	# doing this can freeze the server in a sync job, obviously	1984	# doing this can freeze the server in a sync job, obviously
1975	#$cf::WAIT_FOR_TICK->wait;	1985	#$cf::WAIT_FOR_TICK->wait;
		1986	undef $guard2;
1976	undef $guard1;	1987	undef $guard1;
1977	undef $guard2;
1978	$map->reset;	1988	$map->reset;
1979	return find $path;	1989	return find $path;
1980	}	1990	}
1981		1991
1982	$cf::MAP{$path} = $map	1992	$cf::MAP{$path} = $map
…		…
2009	my $f = new_from_file cf::object::thawer $self->{load_path};	2019	my $f = new_from_file cf::object::thawer $self->{load_path};
2010	$f->skip_block;	2020	$f->skip_block;
2011	$self->_load_objects ($f)	2021	$self->_load_objects ($f)
2012	or return;	2022	or return;
2013		2023
2014	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	2024	$self->post_load_original
2015	if delete $self->{load_original};	2025	if delete $self->{load_original};
2016		2026
2017	if (my $uniq = $self->uniq_path) {	2027	if (my $uniq = $self->uniq_path) {
2018	utf8::encode $uniq;	2028	utf8::encode $uniq;
2019	unless (aio_stat $uniq) {	2029	unless (aio_stat $uniq) {
…		…
2045	}	2055	}
2046		2056
2047	$self->{last_save} = $cf::RUNTIME;	2057	$self->{last_save} = $cf::RUNTIME;
2048	$self->last_access ($cf::RUNTIME);	2058	$self->last_access ($cf::RUNTIME);
2049		2059
2050	$self->in_memory (cf::MAP_IN_MEMORY);	2060	$self->in_memory (cf::MAP_ACTIVE);
2051	}	2061	}
2052		2062
2053	$self->post_load;	2063	$self->post_load;
2054	}	2064	}
2055		2065
…		…
2113	my ($path, $origin, $load) = @_;	2123	my ($path, $origin, $load) = @_;
2114		2124
2115	$path = normalise $path, $origin && $origin->{path};	2125	$path = normalise $path, $origin && $origin->{path};
2116		2126
2117	if (my $map = $cf::MAP{$path}) {	2127	if (my $map = $cf::MAP{$path}) {
2118	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;	2128	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2119	}	2129	}
2120		2130
2121	$MAP_PREFETCH{$path} |= $load;	2131	$MAP_PREFETCH{$path} |= $load;
2122		2132
2123	$MAP_PREFETCHER ||= cf::async {	2133	$MAP_PREFETCHER ||= cf::async {
…		…
2160	cf::async {	2170	cf::async {
2161	$Coro::current->{desc} = "map player save";	2171	$Coro::current->{desc} = "map player save";
2162	$_->contr->save for $self->players;	2172	$_->contr->save for $self->players;
2163	};	2173	};
2164		2174
		2175	cf::get_slot 0.02;
		2176
2165	if ($uniq) {	2177	if ($uniq) {
2166	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);	2178	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2167	$self->_save_objects ($uniq, cf::IO_UNIQUES);	2179	$self->_save_objects ($uniq, cf::IO_UNIQUES);
2168	} else {	2180	} else {
2169	$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);
…		…
2177	$self->save;	2189	$self->save;
2178		2190
2179	my $lock = cf::lock_acquire "map_data:$self->{path}";	2191	my $lock = cf::lock_acquire "map_data:$self->{path}";
2180		2192
2181	return if $self->players;	2193	return if $self->players;
2182	return if $self->in_memory != cf::MAP_IN_MEMORY;	2194	return if $self->in_memory != cf::MAP_ACTIVE;
2183	return if $self->{deny_save};	2195	return if $self->{deny_save};
2184		2196
2185	$self->in_memory (cf::MAP_SWAPPED);	2197	$self->in_memory (cf::MAP_SWAPPED);
2186		2198
2187	$self->deactivate;	2199	$self->deactivate;
…		…
2305		2317
2306	sub unique_maps() {	2318	sub unique_maps() {
2307	[	2319	[
2308	map {	2320	map {
2309	utf8::decode $_;	2321	utf8::decode $_;
2310	/\.map$/	2322	s/\.map$//; # TODO future compatibility hack
		2323	/\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
		2324	? ()
2311	? normalise $_	2325	: normalise $_
2312	: ()
2313	} @{ aio_readdir $UNIQUEDIR or [] }	2326	} @{ aio_readdir $UNIQUEDIR or [] }
2314	]	2327	]
2315	}	2328	}
2316		2329
2317	package cf;
2318
2319	=back	2330	=back
2320		2331
2321	=head3 cf::object	2332	=head3 cf::object
2322		2333
2323	=cut	2334	=cut
…		…
2326		2337
2327	=over 4	2338	=over 4
2328		2339
2329	=item $ob->inv_recursive	2340	=item $ob->inv_recursive
2330		2341
2331	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.
2332		2344
2333	=cut	2345	=cut
2334		2346
2335	sub inv_recursive_;	2347	sub inv_recursive_;
2336	sub inv_recursive_ {	2348	sub inv_recursive_ {
…		…
2341	inv_recursive_ inv $_[0]	2353	inv_recursive_ inv $_[0]
2342	}	2354	}
2343		2355
2344	=item $ref = $ob->ref	2356	=item $ref = $ob->ref
2345		2357
2346	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.
2347		2359
2348	=item $ob = cf::object::deref ($refstring)	2360	=item $ob = cf::object::deref ($refstring)
2349		2361
2350	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,
2351	even if the object actually exists. May block.	2363	even if the object actually exists. May block.
…		…
2383	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
2384	dialogue with the given NPC character.	2396	dialogue with the given NPC character.
2385		2397
2386	=cut	2398	=cut
2387		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
2388	# rough implementation of a future "reply" method that works	2414	# rough implementation of a future "reply" method that works
2389	# with dialog boxes.	2415	# with dialog boxes.
2390	#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
2391	sub cf::object::player::reply($$$;$) {	2417	sub cf::object::player::reply($$$;$) {
2392	my ($self, $npc, $msg, $flags) = @_;	2418	my ($self, $npc, $msg, $flags) = @_;
…		…
2403	my $dialog = $pl->{npc_dialog};	2429	my $dialog = $pl->{npc_dialog};
2404	$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));
2405		2431
2406	} else {	2432	} else {
2407	$msg = $npc->name . " says: $msg" if $npc;	2433	$msg = $npc->name . " says: $msg" if $npc;
2408	$self->message ($msg, $flags);	2434	$self->send_msg ($SAY_CHANNEL => $msg, $flags);
2409	}	2435	}
2410	}	2436	}
2411	}	2437	}
2412		2438
2413	=item $object->send_msg ($channel, $msg, $color, [extra...])	2439	=item $object->send_msg ($channel, $msg, $color, [extra...])
…		…
2438		2464
2439	=item $player_object->enter_link	2465	=item $player_object->enter_link
2440		2466
2441	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}>).
2442		2468
2443	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.
2444	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.
2445		2473
2446	Will never block.	2474	Will never block.
2447		2475
2448	=item $player_object->leave_link ($map, $x, $y)	2476	=item $player_object->leave_link ($map, $x, $y)
2449		2477
…		…
2507		2535
2508	$map->load;	2536	$map->load;
2509	$map->load_neighbours;	2537	$map->load_neighbours;
2510		2538
2511	return unless $self->contr->active;	2539	return unless $self->contr->active;
		2540	$self->flag (cf::FLAG_DEBUG, 0);#d# temp
2512	$self->activate_recursive;	2541	$self->activate_recursive;
2513		2542
2514	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2543	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2515	$self->enter_map ($map, $x, $y);	2544	$self->enter_map ($map, $x, $y);
2516	}	2545	}
…		…
2520	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
2521	her, loading and preparing them map, calling the provided $check callback	2550	her, loading and preparing them map, calling the provided $check callback
2522	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
2523	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
2524	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 >>.
2525		2557
2526	=cut	2558	=cut
2527		2559
2528	our $GOTOGEN;	2560	our $GOTOGEN;
2529		2561
…		…
2608	}	2640	}
2609		2641
2610	sub prepare_random_map {	2642	sub prepare_random_map {
2611	my ($exit) = @_;	2643	my ($exit) = @_;
2612		2644
2613	my $guard = cf::lock_acquire "exit_prepare:$exit";
2614
2615	# all this does is basically replace the /! path by	2645	# all this does is basically replace the /! path by
2616	# a new random map path (?random/...) with a seed	2646	# a new random map path (?random/...) with a seed
2617	# that depends on the exit object	2647	# that depends on the exit object
2618		2648
2619	my $rmp = parse_random_map_params $exit->msg;	2649	my $rmp = parse_random_map_params $exit->msg;
…		…
2621	if ($exit->map) {	2651	if ($exit->map) {
2622	$rmp->{region} = $exit->region->name;	2652	$rmp->{region} = $exit->region->name;
2623	$rmp->{origin_map} = $exit->map->path;	2653	$rmp->{origin_map} = $exit->map->path;
2624	$rmp->{origin_x} = $exit->x;	2654	$rmp->{origin_x} = $exit->x;
2625	$rmp->{origin_y} = $exit->y;	2655	$rmp->{origin_y} = $exit->y;
		2656
		2657	$exit->map->touch;
2626	}	2658	}
2627		2659
2628	$rmp->{random_seed} ||= $exit->random_seed;	2660	$rmp->{random_seed} ||= $exit->random_seed;
2629		2661
2630	my $data = cf::to_json $rmp;	2662	my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2631	my $md5 = Digest::MD5::md5_hex $data;	2663	my $md5 = Digest::MD5::md5_hex $data;
2632	my $meta = "$RANDOMDIR/$md5.meta";	2664	my $meta = "$RANDOMDIR/$md5.meta";
2633		2665
2634	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {	2666	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2635	aio_write $fh, 0, (length $data), $data, 0;	2667	aio_write $fh, 0, (length $data), $data, 0;
2636	undef $fh;	2668	undef $fh;
2637	aio_rename "$meta~", $meta;	2669	aio_rename "$meta~", $meta;
2638		2670
		2671	my $slaying = "?random/$md5";
		2672
		2673	if ($exit->valid) {
2639	$exit->slaying ("?random/$md5");	2674	$exit->slaying ("?random/$md5");
2640	$exit->msg (undef);	2675	$exit->msg (undef);
		2676	}
2641	}	2677	}
2642	}	2678	}
2643		2679
2644	sub cf::object::player::enter_exit {	2680	sub cf::object::player::enter_exit {
2645	my ($self, $exit) = @_;	2681	my ($self, $exit) = @_;
2646		2682
2647	return unless $self->type == cf::PLAYER;	2683	return unless $self->type == cf::PLAYER;
2648		2684
2649	if ($exit->slaying eq "/!") {
2650	#TODO: this should de-fi-ni-te-ly not be a sync-job
2651	# the problem is that $exit might not survive long enough
2652	# so it needs to be done right now, right here
2653	cf::sync_job { prepare_random_map $exit };
2654	}
2655
2656	my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2657	my $hp = $exit->stats->hp;
2658	my $sp = $exit->stats->sp;
2659
2660	$self->enter_link;	2685	$self->enter_link;
2661		2686
2662	# if exit is damned, update players death & WoR home-position
2663	$self->contr->savebed ($slaying, $hp, $sp)
2664	if $exit->flag (FLAG_DAMNED);
2665
2666	(async {	2687	(async {
2667	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";	2688	$Coro::current->{desc} = "enter_exit";
2668		2689
2669	$self->deactivate_recursive; # just to be sure
2670	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
2671	$self->goto ($slaying, $hp, $sp);	2705	$self->goto ($map, $x, $y);
2672		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
2673	1;	2711	1
2674	}) {	2712	}) {
2675	$self->message ("Something went wrong deep within the crossfire server. "	2713	$self->message ("Something went wrong deep within the deliantra server. "
2676	. "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. "
2677	. "Please report this to the dungeon master!",	2715	. "Please report this to the dungeon master!",
2678	cf::NDI_UNIQUE | cf::NDI_RED);	2716	cf::NDI_UNIQUE | cf::NDI_RED);
2679		2717
2680	warn "ERROR in enter_exit: $@";	2718	warn "ERROR in enter_exit: $@";
…		…
2758	id => "infobox",	2796	id => "infobox",
2759	title => "Map Info",	2797	title => "Map Info",
2760	reply => undef,	2798	reply => undef,
2761	tooltip => "Information related to the maps",	2799	tooltip => "Information related to the maps",
2762	},	2800	},
		2801	"c/party" => {
		2802	id => "party",
		2803	title => "Party",
		2804	reply => "gsay ",
		2805	tooltip => "Messages and chat related to your party",
		2806	},
2763	);	2807	);
2764		2808
2765	sub cf::client::send_msg {	2809	sub cf::client::send_msg {
2766	my ($self, $channel, $msg, $color, @extra) = @_;	2810	my ($self, $channel, $msg, $color, @extra) = @_;
2767		2811
2768	$msg = $self->pl->expand_cfpod ($msg);	2812	$msg = $self->pl->expand_cfpod ($msg)
		2813	unless $color & cf::NDI_VERBATIM;
2769		2814
2770	$color &= cf::NDI_CLIENT_MASK; # just in case...	2815	$color &= cf::NDI_CLIENT_MASK; # just in case...
2771		2816
2772	# check predefined channels, for the benefit of C	2817	# check predefined channels, for the benefit of C
2773	if ($CHANNEL{$channel}) {	2818	if ($CHANNEL{$channel}) {
…		…
2794	if ($self->can_msg) {	2839	if ($self->can_msg) {
2795	# default colour, mask it out	2840	# default colour, mask it out
2796	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)	2841	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2797	if $color & cf::NDI_DEF;	2842	if $color & cf::NDI_DEF;
2798		2843
2799	$self->send_packet ("msg " . $self->{json_coder}->encode (	2844	my $pkt = "msg "
		2845	. $self->{json_coder}->encode (
2800	[$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);
2801	} else {	2860	} else {
2802	if ($color >= 0) {	2861	if ($color >= 0) {
2803	# replace some tags by gcfclient-compatible ones	2862	# replace some tags by gcfclient-compatible ones
2804	for ($msg) {	2863	for ($msg) {
2805	1 while	2864	1 while
…		…
3004		3063
3005	The following functions and methods are available within a safe environment:	3064	The following functions and methods are available within a safe environment:
3006		3065
3007	cf::object	3066	cf::object
3008	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
3009	insert remove name archname title slaying race decrease_ob_nr	3068	insert remove name archname title slaying race decrease split
3010		3069
3011	cf::object::player	3070	cf::object::player
3012	player	3071	player
3013		3072
3014	cf::player	3073	cf::player
…		…
3019		3078
3020	=cut	3079	=cut
3021		3080
3022	for (	3081	for (
3023	["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
3024	insert remove inv name archname title slaying race	3083	insert remove inv nrof name archname title slaying race
3025	decrease_ob_nr destroy)],	3084	decrease split destroy change_exp)],
3026	["cf::object::player" => qw(player)],	3085	["cf::object::player" => qw(player)],
3027	["cf::player" => qw(peaceful)],	3086	["cf::player" => qw(peaceful)],
3028	["cf::map" => qw(trigger)],	3087	["cf::map" => qw(trigger)],
3029	) {	3088	) {
3030	no strict 'refs';	3089	no strict 'refs';
…		…
3135	{	3194	{
3136	my $faces = $facedata->{faceinfo};	3195	my $faces = $facedata->{faceinfo};
3137		3196
3138	while (my ($face, $info) = each %$faces) {	3197	while (my ($face, $info) = each %$faces) {
3139	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3198	my $idx = (cf::face::find $face) || cf::face::alloc $face;
		3199
3140	cf::face::set_visibility $idx, $info->{visibility};	3200	cf::face::set_visibility $idx, $info->{visibility};
3141	cf::face::set_magicmap $idx, $info->{magicmap};	3201	cf::face::set_magicmap $idx, $info->{magicmap};
3142	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};
3143	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};
3144		3204
3145	cf::cede_to_tick;	3205	cf::cede_to_tick;
3146	}	3206	}
3147		3207
3148	while (my ($face, $info) = each %$faces) {	3208	while (my ($face, $info) = each %$faces) {
3149	next unless $info->{smooth};	3209	next unless $info->{smooth};
		3210
3150	my $idx = cf::face::find $face	3211	my $idx = cf::face::find $face
3151	or next;	3212	or next;
		3213
3152	if (my $smooth = cf::face::find $info->{smooth}) {	3214	if (my $smooth = cf::face::find $info->{smooth}) {
3153	cf::face::set_smooth $idx, $smooth;	3215	cf::face::set_smooth $idx, $smooth;
3154	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3216	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3155	} else {	3217	} else {
3156	warn "smooth face '$info->{smooth}' not found for face '$face'";	3218	warn "smooth face '$info->{smooth}' not found for face '$face'";
…		…
3174	{	3236	{
3175	# TODO: for gcfclient pleasure, we should give resources	3237	# TODO: for gcfclient pleasure, we should give resources
3176	# that gcfclient doesn't grok a >10000 face index.	3238	# that gcfclient doesn't grok a >10000 face index.
3177	my $res = $facedata->{resource};	3239	my $res = $facedata->{resource};
3178		3240
3179	my $soundconf = delete $res->{"res/sound.conf"};
3180
3181	while (my ($name, $info) = each %$res) {	3241	while (my ($name, $info) = each %$res) {
		3242	if (defined $info->{type}) {
3182	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3243	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3183	my $data;	3244	my $data;
3184		3245
3185	if ($info->{type} & 1) {	3246	if ($info->{type} & 1) {
3186	# prepend meta info	3247	# prepend meta info
3187		3248
3188	my $meta = $enc->encode ({	3249	my $meta = $enc->encode ({
3189	name => $name,	3250	name => $name,
3190	%{ $info->{meta} || {} },	3251	%{ $info->{meta} || {} },
3191	});	3252	});
3192		3253
3193	$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};
3194	} else {	3261	} else {
3195	$data = $info->{data};	3262	$RESOURCE{$name} = $info;
3196	}	3263	}
3197		3264
3198	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3199	cf::face::set_type $idx, $info->{type};
3200
3201	cf::cede_to_tick;	3265	cf::cede_to_tick;
3202	}	3266	}
3203
3204	if ($soundconf) {
3205	$soundconf = $enc->decode (delete $soundconf->{data});
3206
3207	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3208	my $sound = $soundconf->{compat}[$_]
3209	or next;
3210
3211	my $face = cf::face::find "sound/$sound->[1]";
3212	cf::sound::set $sound->[0] => $face;
3213	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3214	}
3215
3216	while (my ($k, $v) = each %{$soundconf->{event}}) {
3217	my $face = cf::face::find "sound/$v";
3218	cf::sound::set $k => $face;
3219	}
3220	}
3221	}	3267	}
		3268
		3269	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3222		3270
3223	1	3271	1
3224	}	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	});
3225		3293
3226	register_exticmd fx_want => sub {	3294	register_exticmd fx_want => sub {
3227	my ($ns, $want) = @_;	3295	my ($ns, $want) = @_;
3228		3296
3229	while (my ($k, $v) = each %$want) {	3297	while (my ($k, $v) = each %$want) {
3230	$ns->fx_want ($k, $v);	3298	$ns->fx_want ($k, $v);
3231	}	3299	}
3232	};	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	}
3233		3311
3234	sub reload_regions {	3312	sub reload_regions {
3235	# 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
3236	# for this (global event?)	3314	# for this (global event?)
3237	%ext::player_env::MUSIC_FACE_CACHE = ();	3315	%ext::player_env::MUSIC_FACE_CACHE = ();
…		…
3251	}	3329	}
3252		3330
3253	sub reload_archetypes {	3331	sub reload_archetypes {
3254	load_resource_file "$DATADIR/archetypes"	3332	load_resource_file "$DATADIR/archetypes"
3255	or die "unable to load archetypes\n";	3333	or die "unable to load archetypes\n";
3256	#d# NEED to laod twice to resolve forward references
3257	# this really needs to be done in an extra post-pass
3258	# (which needs to be synchronous, so solve it differently)
3259	load_resource_file "$DATADIR/archetypes"
3260	or die "unable to load archetypes\n";
3261	}	3334	}
3262		3335
3263	sub reload_treasures {	3336	sub reload_treasures {
3264	load_resource_file "$DATADIR/treasures"	3337	load_resource_file "$DATADIR/treasures"
3265	or die "unable to load treasurelists\n";	3338	or die "unable to load treasurelists\n";
3266	}	3339	}
3267		3340
3268	sub reload_resources {	3341	sub reload_resources {
3269	warn "reloading resource files...\n";	3342	warn "reloading resource files...\n";
3270		3343
		3344	reload_facedata;
		3345	reload_archetypes;
3271	reload_regions;	3346	reload_regions;
3272	reload_facedata;
3273	#reload_archetypes;#d#
3274	reload_archetypes;
3275	reload_treasures;	3347	reload_treasures;
3276		3348
3277	warn "finished reloading resource files\n";	3349	warn "finished reloading resource files\n";
3278	}	3350	}
3279		3351
3280	sub init {	3352	sub init {
		3353	my $guard = freeze_mainloop;
		3354
		3355	evthread_start IO::AIO::poll_fileno;
		3356
3281	reload_resources;	3357	reload_resources;
3282	}	3358	}
3283		3359
3284	sub reload_config {	3360	sub reload_config {
3285	open my $fh, "<:utf8", "$CONFDIR/config"	3361	open my $fh, "<:utf8", "$CONFDIR/config"
3286	or return;	3362	or return;
3287		3363
3288	local $/;	3364	local $/;
3289	*CFG = YAML::Syck::Load <$fh>;	3365	*CFG = YAML::Load <$fh>;
3290		3366
3291	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3367	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3292		3368
3293	$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};
3294	$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};
…		…
3300	};	3376	};
3301	warn $@ if $@;	3377	warn $@ if $@;
3302	}	3378	}
3303	}	3379	}
3304		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
3305	sub main {	3400	sub main {
		3401	atomic;
		3402
3306	# we must not ever block the main coroutine	3403	# we must not ever block the main coroutine
3307	local $Coro::idle = sub {	3404	local $Coro::idle = sub {
3308	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#
3309	(async {	3406	(async {
3310	$Coro::current->{desc} = "IDLE BUG HANDLER";	3407	$Coro::current->{desc} = "IDLE BUG HANDLER";
3311	Event::one_event;	3408	EV::loop EV::LOOP_ONESHOT;
3312	})->prio (Coro::PRIO_MAX);	3409	})->prio (Coro::PRIO_MAX);
3313	};	3410	};
3314		3411
		3412	{
		3413	my $guard = freeze_mainloop;
3315	reload_config;	3414	reload_config;
3316	db_init;	3415	db_init;
3317	load_extensions;	3416	load_extensions;
3318		3417
3319	$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
3320	Event::loop;	3426	EV::loop;
3321	}	3427	}
3322		3428
3323	#############################################################################	3429	#############################################################################
3324	# initialisation and cleanup	3430	# initialisation and cleanup
3325		3431
3326	# install some emergency cleanup handlers	3432	# install some emergency cleanup handlers
3327	BEGIN {	3433	BEGIN {
		3434	our %SIGWATCHER = ();
3328	for my $signal (qw(INT HUP TERM)) {	3435	for my $signal (qw(INT HUP TERM)) {
3329	Event->signal (	3436	$SIGWATCHER{$signal} = EV::signal $signal, sub {
3330	reentrant => 0,
3331	data => WF_AUTOCANCEL,
3332	signal => $signal,
3333	prio => 0,
3334	cb => sub {
3335	cf::cleanup "SIG$signal";	3437	cf::cleanup "SIG$signal";
3336	},
3337	);	3438	};
3338	}	3439	}
3339	}	3440	}
3340		3441
3341	sub write_runtime {	3442	sub write_runtime_sync {
3342	my $runtime = "$LOCALDIR/runtime";
3343
3344	# first touch the runtime file to show we are still running:	3443	# first touch the runtime file to show we are still running:
3345	# the fsync below can take a very very long time.	3444	# the fsync below can take a very very long time.
3346		3445
3347	IO::AIO::aio_utime $runtime, undef, undef;	3446	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3348		3447
3349	my $guard = cf::lock_acquire "write_runtime";	3448	my $guard = cf::lock_acquire "write_runtime";
3350		3449
3351	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644	3450	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3352	or return;	3451	or return;
3353		3452
3354	my $value = $cf::RUNTIME + 90 + 10;	3453	my $value = $cf::RUNTIME + 90 + 10;
3355	# 10 is the runtime save interval, for a monotonic clock	3454	# 10 is the runtime save interval, for a monotonic clock
3356	# 60 allows for the watchdog to kill the server.	3455	# 60 allows for the watchdog to kill the server.
…		…
3366	aio_utime $fh, undef, undef;	3465	aio_utime $fh, undef, undef;
3367		3466
3368	close $fh	3467	close $fh
3369	or return;	3468	or return;
3370		3469
3371	aio_rename "$runtime~", $runtime	3470	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3372	and return;	3471	and return;
3373		3472
3374	warn "runtime file written.\n";	3473	warn "runtime file written.\n";
3375		3474
3376	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 };
3377	}	3519	}
3378		3520
3379	sub emergency_save() {	3521	sub emergency_save() {
3380	my $freeze_guard = cf::freeze_mainloop;	3522	my $freeze_guard = cf::freeze_mainloop;
3381		3523
…		…
3403	warn "end emergency map save\n";	3545	warn "end emergency map save\n";
3404		3546
3405	warn "begin emergency database checkpoint\n";	3547	warn "begin emergency database checkpoint\n";
3406	BDB::db_env_txn_checkpoint $DB_ENV;	3548	BDB::db_env_txn_checkpoint $DB_ENV;
3407	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";
3408	};	3554	};
3409		3555
3410	warn "leave emergency perl save\n";	3556	warn "leave emergency perl save\n";
3411	}	3557	}
3412		3558
3413	sub post_cleanup {	3559	sub post_cleanup {
3414	my ($make_core) = @_;	3560	my ($make_core) = @_;
3415		3561
3416	warn Carp::longmess "post_cleanup backtrace"	3562	warn Carp::longmess "post_cleanup backtrace"
3417	if $make_core;	3563	if $make_core;
		3564
		3565	my $fh = pidfile;
		3566	unlink $PIDFILE if <$fh> == $$;
3418	}	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
3419		3596
3420	sub do_reload_perl() {	3597	sub do_reload_perl() {
3421	# can/must only be called in main	3598	# can/must only be called in main
3422	if ($Coro::current != $Coro::main) {	3599	if ($Coro::current != $Coro::main) {
3423	warn "can only reload from main coroutine";	3600	warn "can only reload from main coroutine";
3424	return;	3601	return;
3425	}	3602	}
3426		3603
		3604	return if $RELOAD++;
		3605
		3606	while ($RELOAD) {
3427	warn "reloading...";	3607	warn "reloading...";
3428		3608
3429	warn "entering sync_job";	3609	warn "entering sync_job";
3430		3610
3431	cf::sync_job {	3611	cf::sync_job {
3432	cf::write_runtime; # external watchdog should not bark	3612	cf::write_runtime_sync; # external watchdog should not bark
3433	cf::emergency_save;	3613	cf::emergency_save;
3434	cf::write_runtime; # external watchdog should not bark	3614	cf::write_runtime_sync; # external watchdog should not bark
3435		3615
3436	warn "syncing database to disk";	3616	warn "syncing database to disk";
3437	BDB::db_env_txn_checkpoint $DB_ENV;	3617	BDB::db_env_txn_checkpoint $DB_ENV;
3438		3618
3439	# 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
3440		3620
3441	warn "cancelling all WF_AUTOCANCEL watchers";
3442	for (Event::all_watchers) {
3443	$_->cancel if $_->data & WF_AUTOCANCEL;
3444	}
3445
3446	warn "flushing outstanding aio requests";	3621	warn "flushing outstanding aio requests";
3447	for (;;) {
3448	BDB::flush;
3449	IO::AIO::flush;
3450	Coro::cede_notself;
3451	last unless IO::AIO::nreqs || BDB::nreqs;	3622	while (IO::AIO::nreqs || BDB::nreqs) {
3452	warn "iterate...";	3623	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3453	}
3454
3455	++$RELOAD;
3456
3457	warn "cancelling all extension coros";
3458	$_->cancel for values %EXT_CORO;
3459	%EXT_CORO = ();
3460
3461	warn "removing commands";
3462	%COMMAND = ();
3463
3464	warn "removing ext/exti commands";
3465	%EXTCMD = ();
3466	%EXTICMD = ();
3467
3468	warn "unloading/nuking all extensions";
3469	for my $pkg (@EXTS) {
3470	warn "... unloading $pkg";
3471
3472	if (my $cb = $pkg->can ("unload")) {
3473	eval {
3474	$cb->($pkg);
3475	1
3476	} or warn "$pkg unloaded, but with errors: $@";
3477	}	3624	}
3478		3625
3479	warn "... nuking $pkg";	3626	warn "cancelling all extension coros";
3480	Symbol::delete_package $pkg;	3627	$_->cancel for values %EXT_CORO;
3481	}	3628	%EXT_CORO = ();
3482		3629
3483	warn "unloading all perl modules loaded from $LIBDIR";	3630	warn "removing commands";
3484	while (my ($k, $v) = each %INC) {	3631	%COMMAND = ();
3485	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3486		3632
		3633	warn "removing ext/exti commands";
		3634	%EXTCMD = ();
		3635	%EXTICMD = ();
		3636
		3637	warn "unloading/nuking all extensions";
		3638	for my $pkg (@EXTS) {
3487	warn "... unloading $k";	3639	warn "... unloading $pkg";
3488	delete $INC{$k};
3489		3640
3490	$k =~ s/\.pm$//;
3491	$k =~ s/\//::/g;
3492
3493	if (my $cb = $k->can ("unload_module")) {	3641	if (my $cb = $pkg->can ("unload")) {
		3642	eval {
3494	$cb->();	3643	$cb->($pkg);
		3644	1
		3645	} or warn "$pkg unloaded, but with errors: $@";
		3646	}
		3647
		3648	warn "... clearing $pkg";
		3649	clear_package $pkg;
3495	}	3650	}
3496		3651
3497	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;
3498	}	3667	}
3499		3668
3500	warn "getting rid of safe::, as good as possible";	3669	warn "getting rid of safe::, as good as possible";
3501	Symbol::delete_package "safe::$_"	3670	clear_package "safe::$_"
3502	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);
3503		3672
3504	warn "unloading cf.pm \"a bit\"";	3673	warn "unloading cf.pm \"a bit\"";
3505	delete $INC{"cf.pm"};	3674	delete $INC{"cf.pm"};
3506	delete $INC{"cf/pod.pm"};	3675	delete $INC{"cf/pod.pm"};
3507		3676
3508	# don't, removes xs symbols, too,	3677	# don't, removes xs symbols, too,
3509	# and global variables created in xs	3678	# and global variables created in xs
3510	#Symbol::delete_package __PACKAGE__;	3679	#clear_package __PACKAGE__;
3511		3680
3512	warn "unload completed, starting to reload now";	3681	warn "unload completed, starting to reload now";
3513		3682
3514	warn "reloading cf.pm";	3683	warn "reloading cf.pm";
3515	require cf;	3684	require cf;
3516	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3685	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3517		3686
3518	warn "loading config and database again";	3687	warn "loading config and database again";
3519	cf::reload_config;	3688	cf::reload_config;
3520		3689
3521	warn "loading extensions";	3690	warn "loading extensions";
3522	cf::load_extensions;	3691	cf::load_extensions;
3523		3692
3524	warn "reattaching attachments to objects/players";	3693	warn "reattaching attachments to objects/players";
3525	_global_reattach; # objects, sockets	3694	_global_reattach; # objects, sockets
3526	warn "reattaching attachments to maps";	3695	warn "reattaching attachments to maps";
3527	reattach $_ for values %MAP;	3696	reattach $_ for values %MAP;
3528	warn "reattaching attachments to players";	3697	warn "reattaching attachments to players";
3529	reattach $_ for values %PLAYER;	3698	reattach $_ for values %PLAYER;
3530		3699
3531	warn "leaving sync_job";	3700	warn "leaving sync_job";
3532		3701
3533	1	3702	1
3534	} or do {	3703	} or do {
3535	warn $@;	3704	warn $@;
3536	warn "error while reloading, exiting.";	3705	cf::cleanup "error while reloading, exiting.";
3537	exit 1;
3538	};	3706	};
3539		3707
3540	warn "reloaded";	3708	warn "reloaded";
		3709	--$RELOAD;
		3710	}
3541	};	3711	};
3542		3712
3543	our $RELOAD_WATCHER; # used only during reload	3713	our $RELOAD_WATCHER; # used only during reload
3544		3714
3545	sub reload_perl() {	3715	sub reload_perl() {
3546	# doing reload synchronously and two reloads happen back-to-back,	3716	# doing reload synchronously and two reloads happen back-to-back,
3547	# coro crashes during coro_state_free->destroy here.	3717	# coro crashes during coro_state_free->destroy here.
3548		3718
3549	$RELOAD_WATCHER ||= Event->timer (	3719	$RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3550	reentrant => 0,
3551	after => 0,
3552	data => WF_AUTOCANCEL,
3553	cb => sub {
3554	do_reload_perl;	3720	do_reload_perl;
3555	undef $RELOAD_WATCHER;	3721	undef $RELOAD_WATCHER;
3556	},
3557	);	3722	};
3558	}	3723	}
3559		3724
3560	register_command "reload" => sub {	3725	register_command "reload" => sub {
3561	my ($who, $arg) = @_;	3726	my ($who, $arg) = @_;
3562		3727
…		…
3575		3740
3576	our @WAIT_FOR_TICK;	3741	our @WAIT_FOR_TICK;
3577	our @WAIT_FOR_TICK_BEGIN;	3742	our @WAIT_FOR_TICK_BEGIN;
3578		3743
3579	sub wait_for_tick {	3744	sub wait_for_tick {
3580	return unless $TICK_WATCHER->is_active;
3581	return if $Coro::current == $Coro::main;	3745	return if tick_inhibit || $Coro::current == $Coro::main;
3582		3746
3583	my $signal = new Coro::Signal;	3747	my $signal = new Coro::Signal;
3584	push @WAIT_FOR_TICK, $signal;	3748	push @WAIT_FOR_TICK, $signal;
3585	$signal->wait;	3749	$signal->wait;
3586	}	3750	}
3587		3751
3588	sub wait_for_tick_begin {	3752	sub wait_for_tick_begin {
3589	return unless $TICK_WATCHER->is_active;
3590	return if $Coro::current == $Coro::main;	3753	return if tick_inhibit || $Coro::current == $Coro::main;
3591		3754
3592	my $signal = new Coro::Signal;	3755	my $signal = new Coro::Signal;
3593	push @WAIT_FOR_TICK_BEGIN, $signal;	3756	push @WAIT_FOR_TICK_BEGIN, $signal;
3594	$signal->wait;	3757	$signal->wait;
3595	}	3758	}
3596		3759
3597	$TICK_WATCHER = Event->timer (	3760	sub tick {
3598	reentrant => 0,
3599	parked => 1,
3600	prio => 0,
3601	at => $NEXT_TICK || $TICK,
3602	data => WF_AUTOCANCEL,
3603	cb => sub {
3604	if ($Coro::current != $Coro::main) {	3761	if ($Coro::current != $Coro::main) {
3605	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"
3606	unless ++$bug_warning > 10;	3763	unless ++$bug_warning > 10;
3607	return;	3764	return;
3608	}	3765	}
3609		3766
3610	$NOW = $tick_start = Event::time;
3611
3612	cf::server_tick; # one server iteration	3767	cf::server_tick; # one server iteration
3613		3768
3614	$RUNTIME += $TICK;
3615	$NEXT_TICK += $TICK;
3616
3617	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3769	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3618	$NEXT_RUNTIME_WRITE = $NOW + 10;	3770	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3619	Coro::async_pool {	3771	Coro::async_pool {
3620	$Coro::current->{desc} = "runtime saver";	3772	$Coro::current->{desc} = "runtime saver";
3621	write_runtime	3773	write_runtime_sync
3622	or warn "ERROR: unable to write runtime file: $!";	3774	or warn "ERROR: unable to write runtime file: $!";
3623	};
3624	}	3775	};
		3776	}
3625		3777
3626	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3778	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3627	$sig->send;	3779	$sig->send;
3628	}	3780	}
3629	while (my $sig = shift @WAIT_FOR_TICK) {	3781	while (my $sig = shift @WAIT_FOR_TICK) {
3630	$sig->send;	3782	$sig->send;
3631	}	3783	}
3632		3784
3633	$NOW = Event::time;	3785	$LOAD = ($NOW - $TICK_START) / $TICK;
3634
3635	# if we are delayed by four ticks or more, skip them all
3636	$NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3637
3638	$TICK_WATCHER->at ($NEXT_TICK);
3639	$TICK_WATCHER->start;
3640
3641	$LOAD = ($NOW - $tick_start) / $TICK;
3642	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3786	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3643		3787
3644	_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	}
3645	},	3794	}
3646	);	3795	}
3647		3796
3648	{	3797	{
		3798	# configure BDB
		3799
3649	BDB::min_parallel 8;	3800	BDB::min_parallel 8;
3650	BDB::max_poll_time $TICK * 0.1;	3801	BDB::max_poll_reqs $TICK * 0.1;
3651	$BDB_POLL_WATCHER = Event->io (	3802	$AnyEvent::BDB::WATCHER->priority (1);
3652	reentrant => 0,
3653	fd => BDB::poll_fileno,
3654	poll => 'r',
3655	prio => 0,
3656	data => WF_AUTOCANCEL,
3657	cb => \&BDB::poll_cb,
3658	);
3659
3660	BDB::set_sync_prepare {
3661	my $status;
3662	my $current = $Coro::current;
3663	(
3664	sub {
3665	$status = $!;
3666	$current->ready; undef $current;
3667	},
3668	sub {
3669	Coro::schedule while defined $current;
3670	$! = $status;
3671	},
3672	)
3673	};
3674		3803
3675	unless ($DB_ENV) {	3804	unless ($DB_ENV) {
3676	$DB_ENV = BDB::db_env_create;	3805	$DB_ENV = BDB::db_env_create;
3677	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC	3806	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3678	| 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;
3679	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);	3809	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3680	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);	3810	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3681		3811
3682	cf::sync_job {	3812	cf::sync_job {
3683	eval {	3813	eval {
…		…
3693		3823
3694	cf::cleanup "db_env_open(db): $@" if $@;	3824	cf::cleanup "db_env_open(db): $@" if $@;
3695	};	3825	};
3696	}	3826	}
3697		3827
3698	$BDB_DEADLOCK_WATCHER = Event->timer (	3828	$BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3699	after => 3,
3700	interval => 1,
3701	hard => 1,
3702	prio => 0,
3703	data => WF_AUTOCANCEL,
3704	cb => sub {
3705	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 { };
3706	},
3707	);	3830	};
3708	$BDB_CHECKPOINT_WATCHER = Event->timer (	3831	$BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3709	after => 11,
3710	interval => 60,
3711	hard => 1,
3712	prio => 0,
3713	data => WF_AUTOCANCEL,
3714	cb => sub {
3715	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	3832	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3716	},
3717	);	3833	};
3718	$BDB_TRICKLE_WATCHER = Event->timer (	3834	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3719	after => 5,
3720	interval => 10,
3721	hard => 1,
3722	prio => 0,
3723	data => WF_AUTOCANCEL,
3724	cb => sub {
3725	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	3835	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3726	},
3727	);	3836	};
3728	}	3837	}
3729		3838
3730	{	3839	{
		3840	# configure IO::AIO
		3841
3731	IO::AIO::min_parallel 8;	3842	IO::AIO::min_parallel 8;
3732
3733	undef $Coro::AIO::WATCHER;
3734	IO::AIO::max_poll_time $TICK * 0.1;	3843	IO::AIO::max_poll_time $TICK * 0.1;
3735	$AIO_POLL_WATCHER = Event->io (	3844	undef $AnyEvent::AIO::WATCHER;
3736	reentrant => 0,
3737	data => WF_AUTOCANCEL,
3738	fd => IO::AIO::poll_fileno,
3739	poll => 'r',
3740	prio => 0,
3741	cb => \&IO::AIO::poll_cb,
3742	);
3743	}	3845	}
3744		3846
3745	my $_log_backtrace;	3847	my $_log_backtrace;
3746		3848
3747	sub _log_backtrace {	3849	sub _log_backtrace {
…		…
3750	$msg =~ s/\n//;	3852	$msg =~ s/\n//;
3751		3853
3752	# limit the # of concurrent backtraces	3854	# limit the # of concurrent backtraces
3753	if ($_log_backtrace < 2) {	3855	if ($_log_backtrace < 2) {
3754	++$_log_backtrace;	3856	++$_log_backtrace;
		3857	my $perl_bt = Carp::longmess $msg;
3755	async {	3858	async {
3756	$Coro::current->{desc} = "abt $msg";	3859	$Coro::current->{desc} = "abt $msg";
3757		3860
3758	my @bt = fork_call {	3861	my @bt = fork_call {
3759	@addr = map { sprintf "%x", $_ } @addr;	3862	@addr = map { sprintf "%x", $_ } @addr;
…		…
3770	}	3873	}
3771		3874
3772	@funcs	3875	@funcs
3773	};	3876	};
3774		3877
3775	LOG llevInfo, "[ABT] $msg\n";	3878	LOG llevInfo, "[ABT] $perl_bt\n";
		3879	LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3776	LOG llevInfo, "[ABT] $_\n" for @bt;	3880	LOG llevInfo, "[ABT] $_\n" for @bt;
3777	--$_log_backtrace;	3881	--$_log_backtrace;
3778	};	3882	};
3779	} else {	3883	} else {
3780	LOG llevInfo, "[ABT] $msg\n";	3884	LOG llevInfo, "[ABT] $msg\n";

Diff Legend

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