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.388 by root, Thu Oct 18 02:56:13 2007 UTC vs.
Revision 1.450 by root, Mon Sep 22 01:33:09 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
		68
		69	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
		70
		71	# make sure c-lzf reinitialises itself
		72	Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later	73	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
48	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49		74
50	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	75	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51		76
52	our %COMMAND = ();	77	our %COMMAND = ();
53	our %COMMAND_TIME = ();	78	our %COMMAND_TIME = ();
…		…
59	our %EXT_MAP = (); # pluggable maps	84	our %EXT_MAP = (); # pluggable maps
60		85
61	our $RELOAD; # number of reloads so far	86	our $RELOAD; # number of reloads so far
62	our @EVENT;	87	our @EVENT;
63		88
64	our $CONFDIR = confdir;	89	our $CONFDIR = confdir;
65	our $DATADIR = datadir;	90	our $DATADIR = datadir;
66	our $LIBDIR = "$DATADIR/ext";	91	our $LIBDIR = "$DATADIR/ext";
67	our $PODDIR = "$DATADIR/pod";	92	our $PODDIR = "$DATADIR/pod";
68	our $MAPDIR = "$DATADIR/" . mapdir;	93	our $MAPDIR = "$DATADIR/" . mapdir;
69	our $LOCALDIR = localdir;	94	our $LOCALDIR = localdir;
70	our $TMPDIR = "$LOCALDIR/" . tmpdir;	95	our $TMPDIR = "$LOCALDIR/" . tmpdir;
71	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	96	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	97	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73	our $RANDOMDIR = "$LOCALDIR/random";	98	our $RANDOMDIR = "$LOCALDIR/random";
74	our $BDBDIR = "$LOCALDIR/db";	99	our $BDBDIR = "$LOCALDIR/db";
		100	our $PIDFILE = "$LOCALDIR/pid";
		101	our $RUNTIMEFILE = "$LOCALDIR/runtime";
		102
		103	our %RESOURCE;
75		104
76	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	105	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	106	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80	our $NEXT_TICK;	107	our $NEXT_TICK;
81	our $NOW;
82	our $USE_FSYNC = 1; # use fsync to write maps - default off	108	our $USE_FSYNC = 1; # use fsync to write maps - default off
83		109
84	our $BDB_POLL_WATCHER;
85	our $BDB_DEADLOCK_WATCHER;	110	our $BDB_DEADLOCK_WATCHER;
86	our $BDB_CHECKPOINT_WATCHER;	111	our $BDB_CHECKPOINT_WATCHER;
87	our $BDB_TRICKLE_WATCHER;	112	our $BDB_TRICKLE_WATCHER;
88	our $DB_ENV;	113	our $DB_ENV;
89		114
90	our %CFG;	115	our %CFG;
91		116
92	our $UPTIME; $UPTIME ||= time;	117	our $UPTIME; $UPTIME ||= time;
93	our $RUNTIME;	118	our $RUNTIME;
		119	our $NOW;
94		120
95	our (%PLAYER, %PLAYER_LOADING); # all users	121	our (%PLAYER, %PLAYER_LOADING); # all users
96	our (%MAP, %MAP_LOADING ); # all maps	122	our (%MAP, %MAP_LOADING ); # all maps
97	our $LINK_MAP; # the special {link} map, which is always available	123	our $LINK_MAP; # the special {link} map, which is always available
98		124
99	# used to convert map paths into valid unix filenames by replacing / by ∕	125	# used to convert map paths into valid unix filenames by replacing / by ∕
100	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	126	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101		127
102	our $LOAD; # a number between 0 (idle) and 1 (too many objects)	128	our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103	our $LOADAVG; # same thing, but with alpha-smoothing	129	our $LOADAVG; # same thing, but with alpha-smoothing
		130	our $JITTER; # average jitter
104	our $tick_start; # for load detecting purposes	131	our $TICK_START; # for load detecting purposes
105		132
106	binmode STDOUT;	133	binmode STDOUT;
107	binmode STDERR;	134	binmode STDERR;
108		135
109	# read virtual server time, if available	136	# read virtual server time, if available
110	unless ($RUNTIME || !-e "$LOCALDIR/runtime") {	137	unless ($RUNTIME || !-e $RUNTIMEFILE) {
111	open my $fh, "<", "$LOCALDIR/runtime"	138	open my $fh, "<", $RUNTIMEFILE
112	or die "unable to read runtime file: $!";	139	or die "unable to read $RUNTIMEFILE file: $!";
113	$RUNTIME = <$fh> + 0.;	140	$RUNTIME = <$fh> + 0.;
114	}	141	}
115		142
116	mkdir $_	143	mkdir $_
117	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;	144	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
…		…
162		189
163	The raw value load value from the last tick.	190	The raw value load value from the last tick.
164		191
165	=item %cf::CFG	192	=item %cf::CFG
166		193
167	Configuration for the server, loaded from C</etc/crossfire/config>, or	194	Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168	from wherever your confdir points to.	195	from wherever your confdir points to.
169		196
170	=item cf::wait_for_tick, cf::wait_for_tick_begin	197	=item cf::wait_for_tick, cf::wait_for_tick_begin
171		198
172	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	199	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;	220	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194		221
195	LOG llevError, $msg;	222	LOG llevError, $msg;
196	};	223	};
197	}	224	}
		225
		226	$Coro::State::DIEHOOK = sub {
		227	return unless $^S eq 0; # "eq", not "=="
		228
		229	if ($Coro::current == $Coro::main) {#d#
		230	warn "DIEHOOK called in main context, Coro bug?\n";#d#
		231	return;#d#
		232	}#d#
		233
		234	# kill coroutine otherwise
		235	warn Carp::longmess $_[0];
		236	Coro::terminate
		237	};
		238
		239	$SIG{__DIE__} = sub { }; #d#?
198		240
199	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	241	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	242	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	243	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	244	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
…		…
209	for my $pkg (qw(	251	for my $pkg (qw(
210	cf::global cf::attachable	252	cf::global cf::attachable
211	cf::object cf::object::player	253	cf::object cf::object::player
212	cf::client cf::player	254	cf::client cf::player
213	cf::arch cf::living	255	cf::arch cf::living
		256	cf::map cf::mapspace
214	cf::map cf::party cf::region	257	cf::party cf::region
215	)) {	258	)) {
216	no strict 'refs';
217	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	259	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218	}	260	}
219		261
220	$Event::DIED = sub {	262	$EV::DIED = sub {
221	warn "error in event callback: @_";	263	warn "error in event callback: @_";
222	};	264	};
223		265
224	#############################################################################	266	#############################################################################
225		267
…		…
248	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	290	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249	$d	291	$d
250	} || "[unable to dump $_[0]: '$@']";	292	} || "[unable to dump $_[0]: '$@']";
251	}	293	}
252		294
253	=item $ref = cf::from_json $json	295	=item $ref = cf::decode_json $json
254		296
255	Converts a JSON string into the corresponding perl data structure.	297	Converts a JSON string into the corresponding perl data structure.
256		298
257	=item $json = cf::to_json $ref	299	=item $json = cf::encode_json $ref
258		300
259	Converts a perl data structure into its JSON representation.	301	Converts a perl data structure into its JSON representation.
260		302
261	=cut	303	=cut
262		304
263	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	305	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264		306
265	sub to_json ($) { $json_coder->encode ($_[0]) }	307	sub encode_json($) { $json_coder->encode ($_[0]) }
266	sub from_json ($) { $json_coder->decode ($_[0]) }	308	sub decode_json($) { $json_coder->decode ($_[0]) }
267		309
268	=item cf::lock_wait $string	310	=item cf::lock_wait $string
269		311
270	Wait until the given lock is available. See cf::lock_acquire.	312	Wait until the given lock is available. See cf::lock_acquire.
271		313
…		…
327		369
328	! ! $LOCK{$key}	370	! ! $LOCK{$key}
329	}	371	}
330		372
331	sub freeze_mainloop {	373	sub freeze_mainloop {
332	return unless $TICK_WATCHER->is_active;	374	tick_inhibit_inc;
333		375
334	my $guard = Coro::guard {	376	Coro::guard \&tick_inhibit_dec;
335	$TICK_WATCHER->start;	377	}
336	};	378
337	$TICK_WATCHER->stop;	379	=item cf::periodic $interval, $cb
338	$guard	380
		381	Like EV::periodic, but randomly selects a starting point so that the actions
		382	get spread over timer.
		383
		384	=cut
		385
		386	sub periodic($$) {
		387	my ($interval, $cb) = @_;
		388
		389	my $start = rand List::Util::min 180, $interval;
		390
		391	EV::periodic $start, $interval, 0, $cb
339	}	392	}
340		393
341	=item cf::get_slot $time[, $priority[, $name]]	394	=item cf::get_slot $time[, $priority[, $name]]
342		395
343	Allocate $time seconds of blocking CPU time at priority C<$priority>:	396	Allocate $time seconds of blocking CPU time at priority C<$priority>:
…		…
383	}	436	}
384	}	437	}
385	};	438	};
386		439
387	sub get_slot($;$$) {	440	sub get_slot($;$$) {
		441	return if tick_inhibit || $Coro::current == $Coro::main;
		442
388	my ($time, $pri, $name) = @_;	443	my ($time, $pri, $name) = @_;
389		444
390	$time = $TICK * .6 if $time > $TICK * .6;	445	$time = $TICK * .6 if $time > $TICK * .6;
391	my $sig = new Coro::Signal;	446	my $sig = new Coro::Signal;
392		447
…		…
406		461
407	BEGIN { *async = \&Coro::async_pool }	462	BEGIN { *async = \&Coro::async_pool }
408		463
409	=item cf::sync_job { BLOCK }	464	=item cf::sync_job { BLOCK }
410		465
411	The design of Crossfire TRT requires that the main coroutine ($Coro::main)	466	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	467	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	468	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414	acceptable.	469	acceptable.
415		470
416	If it must be done, put the blocking parts into C<sync_job>. This will run	471	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	472	the given BLOCK in another coroutine while waiting for the result. The
…		…
422		477
423	sub sync_job(&) {	478	sub sync_job(&) {
424	my ($job) = @_;	479	my ($job) = @_;
425		480
426	if ($Coro::current == $Coro::main) {	481	if ($Coro::current == $Coro::main) {
427	my $time = Event::time;	482	my $time = EV::time;
428		483
429	# this is the main coro, too bad, we have to block	484	# this is the main coro, too bad, we have to block
430	# till the operation succeeds, freezing the server :/	485	# till the operation succeeds, freezing the server :/
431		486
432	LOG llevError, Carp::longmess "sync job";#d#	487	LOG llevError, Carp::longmess "sync job";#d#
433		488
434	# TODO: use suspend/resume instead
435	# (but this is cancel-safe)
436	my $freeze_guard = freeze_mainloop;	489	my $freeze_guard = freeze_mainloop;
437		490
438	my $busy = 1;	491	my $busy = 1;
439	my @res;	492	my @res;
440		493
…		…
447		500
448	while ($busy) {	501	while ($busy) {
449	if (Coro::nready) {	502	if (Coro::nready) {
450	Coro::cede_notself;	503	Coro::cede_notself;
451	} else {	504	} else {
452	Event::one_event;	505	EV::loop EV::LOOP_ONESHOT;
453	}	506	}
454	}	507	}
455		508
456	$time = Event::time - $time;	509	my $time = EV::time - $time;
457		510
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	511	$TICK_START += $time; # do not account sync jobs to server load
462		512
463	wantarray ? @res : $res[0]	513	wantarray ? @res : $res[0]
464	} else {	514	} else {
465	# we are in another coroutine, how wonderful, everything just works	515	# we are in another coroutine, how wonderful, everything just works
466		516
…		…
491	=item fork_call { }, $args	541	=item fork_call { }, $args
492		542
493	Executes the given code block with the given arguments in a seperate	543	Executes the given code block with the given arguments in a seperate
494	process, returning the results. Everything must be serialisable with	544	process, returning the results. Everything must be serialisable with
495	Coro::Storable. May, of course, block. Note that the executed sub may	545	Coro::Storable. May, of course, block. Note that the executed sub may
496	never block itself or use any form of Event handling.	546	never block itself or use any form of event handling.
497		547
498	=cut	548	=cut
499		549
500	sub fork_call(&@) {	550	sub fork_call(&@) {
501	my ($cb, @args) = @_;	551	my ($cb, @args) = @_;
…		…
508	reset_signals;	558	reset_signals;
509	&$cb	559	&$cb
510	}, @args;	560	}, @args;
511		561
512	wantarray ? @res : $res[-1]	562	wantarray ? @res : $res[-1]
		563	}
		564
		565	=item $coin = coin_from_name $name
		566
		567	=cut
		568
		569	our %coin_alias = (
		570	"silver" => "silvercoin",
		571	"silvercoin" => "silvercoin",
		572	"silvercoins" => "silvercoin",
		573	"gold" => "goldcoin",
		574	"goldcoin" => "goldcoin",
		575	"goldcoins" => "goldcoin",
		576	"platinum" => "platinacoin",
		577	"platinumcoin" => "platinacoin",
		578	"platinumcoins" => "platinacoin",
		579	"platina" => "platinacoin",
		580	"platinacoin" => "platinacoin",
		581	"platinacoins" => "platinacoin",
		582	"royalty" => "royalty",
		583	"royalties" => "royalty",
		584	);
		585
		586	sub coin_from_name($) {
		587	$coin_alias{$_[0]}
		588	? cf::arch::find $coin_alias{$_[0]}
		589	: undef
513	}	590	}
514		591
515	=item $value = cf::db_get $family => $key	592	=item $value = cf::db_get $family => $key
516		593
517	Returns a single value from the environment database.	594	Returns a single value from the environment database.
…		…
656		733
657	#############################################################################	734	#############################################################################
658		735
659	=head2 ATTACHABLE OBJECTS	736	=head2 ATTACHABLE OBJECTS
660		737
661	Many objects in crossfire are so-called attachable objects. That means you can	738	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")	739	attach callbacks/event handlers (a collection of which is called an "attachment")
663	to it. All such attachable objects support the following methods.	740	to it. All such attachable objects support the following methods.
664		741
665	In the following description, CLASS can be any of C<global>, C<object>	742	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	743	C<player>, C<client> or C<map> (i.e. the attachable objects in
667	Crossfire TRT).	744	Deliantra).
668		745
669	=over 4	746	=over 4
670		747
671	=item $attachable->attach ($attachment, key => $value...)	748	=item $attachable->attach ($attachment, key => $value...)
672		749
…		…
716	=item cf::CLASS::attachment $name, ...	793	=item cf::CLASS::attachment $name, ...
717		794
718	Register an attachment by C<$name> through which attachable objects of the	795	Register an attachment by C<$name> through which attachable objects of the
719	given CLASS can refer to this attachment.	796	given CLASS can refer to this attachment.
720		797
721	Some classes such as crossfire maps and objects can specify attachments	798	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.	799	that are attached at load/instantiate time, thus the need for a name.
723		800
724	These calls expect any number of the following handler/hook descriptions:	801	These calls expect any number of the following handler/hook descriptions:
725		802
726	=over 4	803	=over 4
…		…
954	}	1031	}
955		1032
956	0	1033	0
957	}	1034	}
958		1035
959	=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...)	1036	=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
960		1037
961	=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)	1038	=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
962		1039
963	Generate an object-specific event with the given arguments.	1040	Generate an object-specific event with the given arguments.
964		1041
…		…
1017		1094
1018	sub reattach {	1095	sub reattach {
1019	# basically do the same as instantiate, without calling instantiate	1096	# basically do the same as instantiate, without calling instantiate
1020	my ($obj) = @_;	1097	my ($obj) = @_;
1021		1098
		1099	# no longer needed after getting rid of delete_package?
1022	bless $obj, ref $obj; # re-bless in case extensions have been reloaded	1100	#bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1023		1101
1024	my $registry = $obj->registry;	1102	my $registry = $obj->registry;
1025		1103
1026	@$registry = ();	1104	@$registry = ();
1027		1105
…		…
1042	cf::attachable->attach (	1120	cf::attachable->attach (
1043	prio => -1000000,	1121	prio => -1000000,
1044	on_instantiate => sub {	1122	on_instantiate => sub {
1045	my ($obj, $data) = @_;	1123	my ($obj, $data) = @_;
1046		1124
1047	$data = from_json $data;	1125	$data = decode_json $data;
1048		1126
1049	for (@$data) {	1127	for (@$data) {
1050	my ($name, $args) = @$_;	1128	my ($name, $args) = @$_;
1051		1129
1052	$obj->attach ($name, %{$args || {} });	1130	$obj->attach ($name, %{$args || {} });
…		…
1073	utf8::decode (my $decname = $filename);	1151	utf8::decode (my $decname = $filename);
1074	warn sprintf "saving %s (%d,%d)\n",	1152	warn sprintf "saving %s (%d,%d)\n",
1075	$decname, length $$rdata, scalar @$objs;	1153	$decname, length $$rdata, scalar @$objs;
1076		1154
1077	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1155	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1078	chmod SAVE_MODE, $fh;	1156	aio_chmod $fh, SAVE_MODE;
1079	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1157	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1080	aio_fsync $fh if $cf::USE_FSYNC;	1158	aio_fsync $fh if $cf::USE_FSYNC;
1081	close $fh;	1159	aio_close $fh;
1082		1160
1083	if (@$objs) {	1161	if (@$objs) {
1084	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {	1162	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1085	chmod SAVE_MODE, $fh;	1163	aio_chmod $fh, SAVE_MODE;
1086	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };	1164	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1087	aio_write $fh, 0, (length $data), $data, 0;	1165	aio_write $fh, 0, (length $data), $data, 0;
1088	aio_fsync $fh if $cf::USE_FSYNC;	1166	aio_fsync $fh if $cf::USE_FSYNC;
1089	close $fh;	1167	aio_close $fh;
1090	aio_rename "$filename.pst~", "$filename.pst";	1168	aio_rename "$filename.pst~", "$filename.pst";
1091	}	1169	}
1092	} else {	1170	} else {
1093	aio_unlink "$filename.pst";	1171	aio_unlink "$filename.pst";
1094	}	1172	}
…		…
1263		1341
1264	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1342	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1265	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1343	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1266		1344
1267	$ext{source} =	1345	$ext{source} =
1268	"package $pkg; use strict; use utf8;\n"	1346	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1269	. "#line 1 \"$path\"\n{\n"	1347	. "#line 1 \"$path\"\n{\n"
1270	. $source	1348	. $source
1271	. "\n};\n1";	1349	. "\n};\n1";
1272		1350
1273	$todo{$base} = \%ext;	1351	$todo{$base} = \%ext;
…		…
1289	my $msg = $@ ? "$v->{path}: $@\n"	1367	my $msg = $@ ? "$v->{path}: $@\n"
1290	: "$v->{base}: extension inactive.\n";	1368	: "$v->{base}: extension inactive.\n";
1291		1369
1292	if (exists $v->{meta}{mandatory}) {	1370	if (exists $v->{meta}{mandatory}) {
1293	warn $msg;	1371	warn $msg;
1294	warn "mandatory extension failed to load, exiting.\n";	1372	cf::cleanup "mandatory extension failed to load, exiting.";
1295	exit 1;
1296	}	1373	}
1297		1374
1298	warn $msg;	1375	warn $msg;
1299	}	1376	}
1300		1377
…		…
1314		1391
1315	=back	1392	=back
1316		1393
1317	=head2 CORE EXTENSIONS	1394	=head2 CORE EXTENSIONS
1318		1395
1319	Functions and methods that extend core crossfire objects.	1396	Functions and methods that extend core deliantra objects.
1320		1397
1321	=cut	1398	=cut
1322		1399
1323	package cf::player;	1400	package cf::player;
1324		1401
…		…
1389	my $f = new_from_file cf::object::thawer path $login	1466	my $f = new_from_file cf::object::thawer path $login
1390	or return;	1467	or return;
1391		1468
1392	my $pl = cf::player::load_pl $f	1469	my $pl = cf::player::load_pl $f
1393	or return;	1470	or return;
		1471
1394	local $cf::PLAYER_LOADING{$login} = $pl;	1472	local $cf::PLAYER_LOADING{$login} = $pl;
1395	$f->resolve_delayed_derefs;	1473	$f->resolve_delayed_derefs;
1396	$cf::PLAYER{$login} = $pl	1474	$cf::PLAYER{$login} = $pl
1397	}	1475	}
1398	}	1476	}
…		…
1408		1486
1409	return if $pl->{deny_save};	1487	return if $pl->{deny_save};
1410		1488
1411	aio_mkdir playerdir $pl, 0770;	1489	aio_mkdir playerdir $pl, 0770;
1412	$pl->{last_save} = $cf::RUNTIME;	1490	$pl->{last_save} = $cf::RUNTIME;
		1491
		1492	cf::get_slot 0.01;
1413		1493
1414	$pl->save_pl ($path);	1494	$pl->save_pl ($path);
1415	cf::cede_to_tick;	1495	cf::cede_to_tick;
1416	}	1496	}
1417		1497
…		…
1449	my ($pl) = @_;	1529	my ($pl) = @_;
1450		1530
1451	my $name = $pl->ob->name;	1531	my $name = $pl->ob->name;
1452		1532
1453	$pl->{deny_save} = 1;	1533	$pl->{deny_save} = 1;
1454	$pl->password ("*"); # this should lock out the player until we nuked the dir	1534	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1455		1535
1456	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1536	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1457	$pl->deactivate;	1537	$pl->deactivate;
		1538	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
		1539	$pl->ob->check_score;
1458	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1540	$pl->invoke (cf::EVENT_PLAYER_QUIT);
1459	$pl->ns->destroy if $pl->ns;	1541	$pl->ns->destroy if $pl->ns;
1460		1542
1461	my $path = playerdir $pl;	1543	my $path = playerdir $pl;
1462	my $temp = "$path~$cf::RUNTIME~deleting~";	1544	my $temp = "$path~$cf::RUNTIME~deleting~";
…		…
1501		1583
1502	for my $login (@$dirs) {	1584	for my $login (@$dirs) {
1503	my $path = path $login;	1585	my $path = path $login;
1504		1586
1505	# a .pst is a dead give-away for a valid player	1587	# a .pst is a dead give-away for a valid player
1506	unless (-e "$path.pst") {	1588	# if no pst file found, open and chekc for blocked users
		1589	if (aio_stat "$path.pst") {
1507	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;	1590	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1508	aio_read $fh, 0, 512, my $buf, 0 or next;	1591	aio_read $fh, 0, 512, my $buf, 0 or next;
1509	$buf !~ /^password -------------$/m or next; # official not-valid tag	1592	$buf !~ /^password -------------$/m or next; # official not-valid tag
1510	}	1593	}
1511		1594
…		…
1542	}	1625	}
1543		1626
1544	\@paths	1627	\@paths
1545	}	1628	}
1546		1629
1547	=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)	1630	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1548		1631
1549	Expand crossfire pod fragments into protocol xml.	1632	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		1633
1598	=item $player->ext_reply ($msgid, @msg)	1634	=item $player->ext_reply ($msgid, @msg)
1599		1635
1600	Sends an ext reply to the player.	1636	Sends an ext reply to the player.
1601		1637
…		…
1668	our $MAX_RESET = 3600;	1704	our $MAX_RESET = 3600;
1669	our $DEFAULT_RESET = 3000;	1705	our $DEFAULT_RESET = 3000;
1670		1706
1671	sub generate_random_map {	1707	sub generate_random_map {
1672	my ($self, $rmp) = @_;	1708	my ($self, $rmp) = @_;
		1709
		1710	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
		1711
1673	# mit "rum" bekleckern, nicht	1712	# mit "rum" bekleckern, nicht
1674	$self->_create_random_map (	1713	$self->_create_random_map (
1675	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},	1714	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1676	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},	1715	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1677	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},	1716	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
…		…
1799		1838
1800	# the temporary/swap location	1839	# the temporary/swap location
1801	sub save_path {	1840	sub save_path {
1802	my ($self) = @_;	1841	my ($self) = @_;
1803		1842
1804	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1843	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1805	"$TMPDIR/$path.map"	1844	"$TMPDIR/$path.map"
1806	}	1845	}
1807		1846
1808	# the unique path, undef == no special unique path	1847	# the unique path, undef == no special unique path
1809	sub uniq_path {	1848	sub uniq_path {
1810	my ($self) = @_;	1849	my ($self) = @_;
1811		1850
1812	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1851	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1813	"$UNIQUEDIR/$path"	1852	"$UNIQUEDIR/$path"
1814	}	1853	}
1815		1854
1816	# and all this just because we cannot iterate over	1855	# and all this just because we cannot iterate over
1817	# all maps in C++...	1856	# all maps in C++...
…		…
1915		1954
1916	cf::lock_wait "map_data:$path";#d#remove	1955	cf::lock_wait "map_data:$path";#d#remove
1917	cf::lock_wait "map_find:$path";	1956	cf::lock_wait "map_find:$path";
1918		1957
1919	$cf::MAP{$path} || do {	1958	$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	1959	my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1960	my $guard2 = cf::lock_acquire "map_find:$path";
1922		1961
1923	my $map = new_from_path cf::map $path	1962	my $map = new_from_path cf::map $path
1924	or return;	1963	or return;
1925		1964
1926	$map->{last_save} = $cf::RUNTIME;	1965	$map->{last_save} = $cf::RUNTIME;
…		…
1929	or return;	1968	or return;
1930		1969
1931	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1970	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1932	# doing this can freeze the server in a sync job, obviously	1971	# doing this can freeze the server in a sync job, obviously
1933	#$cf::WAIT_FOR_TICK->wait;	1972	#$cf::WAIT_FOR_TICK->wait;
		1973	undef $guard2;
1934	undef $guard1;	1974	undef $guard1;
1935	undef $guard2;
1936	$map->reset;	1975	$map->reset;
1937	return find $path;	1976	return find $path;
1938	}	1977	}
1939		1978
1940	$cf::MAP{$path} = $map	1979	$cf::MAP{$path} = $map
…		…
1967	my $f = new_from_file cf::object::thawer $self->{load_path};	2006	my $f = new_from_file cf::object::thawer $self->{load_path};
1968	$f->skip_block;	2007	$f->skip_block;
1969	$self->_load_objects ($f)	2008	$self->_load_objects ($f)
1970	or return;	2009	or return;
1971		2010
1972	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	2011	$self->post_load_original
1973	if delete $self->{load_original};	2012	if delete $self->{load_original};
1974		2013
1975	if (my $uniq = $self->uniq_path) {	2014	if (my $uniq = $self->uniq_path) {
1976	utf8::encode $uniq;	2015	utf8::encode $uniq;
1977	unless (aio_stat $uniq) {	2016	unless (aio_stat $uniq) {
…		…
2003	}	2042	}
2004		2043
2005	$self->{last_save} = $cf::RUNTIME;	2044	$self->{last_save} = $cf::RUNTIME;
2006	$self->last_access ($cf::RUNTIME);	2045	$self->last_access ($cf::RUNTIME);
2007		2046
2008	$self->in_memory (cf::MAP_IN_MEMORY);	2047	$self->in_memory (cf::MAP_ACTIVE);
2009	}	2048	}
2010		2049
2011	$self->post_load;	2050	$self->post_load;
2012	}	2051	}
2013		2052
…		…
2071	my ($path, $origin, $load) = @_;	2110	my ($path, $origin, $load) = @_;
2072		2111
2073	$path = normalise $path, $origin && $origin->{path};	2112	$path = normalise $path, $origin && $origin->{path};
2074		2113
2075	if (my $map = $cf::MAP{$path}) {	2114	if (my $map = $cf::MAP{$path}) {
2076	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;	2115	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2077	}	2116	}
2078		2117
2079	$MAP_PREFETCH{$path} |= $load;	2118	$MAP_PREFETCH{$path} |= $load;
2080		2119
2081	$MAP_PREFETCHER ||= cf::async {	2120	$MAP_PREFETCHER ||= cf::async {
…		…
2118	cf::async {	2157	cf::async {
2119	$Coro::current->{desc} = "map player save";	2158	$Coro::current->{desc} = "map player save";
2120	$_->contr->save for $self->players;	2159	$_->contr->save for $self->players;
2121	};	2160	};
2122		2161
		2162	cf::get_slot 0.02;
		2163
2123	if ($uniq) {	2164	if ($uniq) {
2124	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);	2165	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2125	$self->_save_objects ($uniq, cf::IO_UNIQUES);	2166	$self->_save_objects ($uniq, cf::IO_UNIQUES);
2126	} else {	2167	} else {
2127	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);	2168	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
…		…
2135	$self->save;	2176	$self->save;
2136		2177
2137	my $lock = cf::lock_acquire "map_data:$self->{path}";	2178	my $lock = cf::lock_acquire "map_data:$self->{path}";
2138		2179
2139	return if $self->players;	2180	return if $self->players;
2140	return if $self->in_memory != cf::MAP_IN_MEMORY;	2181	return if $self->in_memory != cf::MAP_ACTIVE;
2141	return if $self->{deny_save};	2182	return if $self->{deny_save};
2142		2183
2143	$self->in_memory (cf::MAP_SWAPPED);	2184	$self->in_memory (cf::MAP_SWAPPED);
2144		2185
2145	$self->deactivate;	2186	$self->deactivate;
…		…
2263		2304
2264	sub unique_maps() {	2305	sub unique_maps() {
2265	[	2306	[
2266	map {	2307	map {
2267	utf8::decode $_;	2308	utf8::decode $_;
2268	/\.map$/	2309	s/\.map$//; # TODO future compatibility hack
		2310	/\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
		2311	? ()
2269	? normalise $_	2312	: normalise $_
2270	: ()
2271	} @{ aio_readdir $UNIQUEDIR or [] }	2313	} @{ aio_readdir $UNIQUEDIR or [] }
2272	]	2314	]
2273	}	2315	}
2274		2316
2275	package cf;
2276
2277	=back	2317	=back
2278		2318
2279	=head3 cf::object	2319	=head3 cf::object
2280		2320
2281	=cut	2321	=cut
…		…
2284		2324
2285	=over 4	2325	=over 4
2286		2326
2287	=item $ob->inv_recursive	2327	=item $ob->inv_recursive
2288		2328
2289	Returns the inventory of the object _and_ their inventories, recursively.	2329	Returns the inventory of the object I<and> their inventories, recursively,
		2330	but I<not> the object itself.
2290		2331
2291	=cut	2332	=cut
2292		2333
2293	sub inv_recursive_;	2334	sub inv_recursive_;
2294	sub inv_recursive_ {	2335	sub inv_recursive_ {
…		…
2299	inv_recursive_ inv $_[0]	2340	inv_recursive_ inv $_[0]
2300	}	2341	}
2301		2342
2302	=item $ref = $ob->ref	2343	=item $ref = $ob->ref
2303		2344
2304	creates and returns a persistent reference to an objetc that can be stored as a string.	2345	Creates and returns a persistent reference to an object that can be stored as a string.
2305		2346
2306	=item $ob = cf::object::deref ($refstring)	2347	=item $ob = cf::object::deref ($refstring)
2307		2348
2308	returns the objetc referenced by refstring. may return undef when it cnanot find the object,	2349	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2309	even if the object actually exists. May block.	2350	even if the object actually exists. May block.
…		…
2341	can be C<undef>. Does the right thing when the player is currently in a	2382	can be C<undef>. Does the right thing when the player is currently in a
2342	dialogue with the given NPC character.	2383	dialogue with the given NPC character.
2343		2384
2344	=cut	2385	=cut
2345		2386
		2387	our $SAY_CHANNEL = {
		2388	id => "say",
		2389	title => "Map",
		2390	reply => "say ",
		2391	tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
		2392	};
		2393
		2394	our $CHAT_CHANNEL = {
		2395	id => "chat",
		2396	title => "Chat",
		2397	reply => "chat ",
		2398	tooltip => "Player chat and shouts, global to the server.",
		2399	};
		2400
2346	# rough implementation of a future "reply" method that works	2401	# rough implementation of a future "reply" method that works
2347	# with dialog boxes.	2402	# with dialog boxes.
2348	#TODO: the first argument must go, split into a $npc->reply_to ( method	2403	#TODO: the first argument must go, split into a $npc->reply_to ( method
2349	sub cf::object::player::reply($$$;$) {	2404	sub cf::object::player::reply($$$;$) {
2350	my ($self, $npc, $msg, $flags) = @_;	2405	my ($self, $npc, $msg, $flags) = @_;
…		…
2361	my $dialog = $pl->{npc_dialog};	2416	my $dialog = $pl->{npc_dialog};
2362	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));	2417	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2363		2418
2364	} else {	2419	} else {
2365	$msg = $npc->name . " says: $msg" if $npc;	2420	$msg = $npc->name . " says: $msg" if $npc;
2366	$self->message ($msg, $flags);	2421	$self->send_msg ($SAY_CHANNEL => $msg, $flags);
2367	}	2422	}
2368	}	2423	}
2369	}	2424	}
2370		2425
2371	=item $object->send_msg ($channel, $msg, $color, [extra...])	2426	=item $object->send_msg ($channel, $msg, $color, [extra...])
…		…
2396		2451
2397	=item $player_object->enter_link	2452	=item $player_object->enter_link
2398		2453
2399	Freezes the player and moves him/her to a special map (C<{link}>).	2454	Freezes the player and moves him/her to a special map (C<{link}>).
2400		2455
2401	The player should be reasonably safe there for short amounts of time. You	2456	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.	2457	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
		2458	though, as the palyer cannot control the character while it is on the link
		2459	map.
2403		2460
2404	Will never block.	2461	Will never block.
2405		2462
2406	=item $player_object->leave_link ($map, $x, $y)	2463	=item $player_object->leave_link ($map, $x, $y)
2407		2464
…		…
2465		2522
2466	$map->load;	2523	$map->load;
2467	$map->load_neighbours;	2524	$map->load_neighbours;
2468		2525
2469	return unless $self->contr->active;	2526	return unless $self->contr->active;
		2527	$self->flag (cf::FLAG_DEBUG, 0);#d# temp
2470	$self->activate_recursive;	2528	$self->activate_recursive;
2471		2529
2472	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2530	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2473	$self->enter_map ($map, $x, $y);	2531	$self->enter_map ($map, $x, $y);
2474	}	2532	}
…		…
2478	Moves the player to the given map-path and coordinates by first freezing	2536	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	2537	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	2538	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	2539	the new (success) or old (failed) map position. In either case, $done will
2482	be called at the end of this process.	2540	be called at the end of this process.
		2541
		2542	Note that $check will be called with a potentially non-loaded map, so if
		2543	it needs a loaded map it has to call C<< ->load >>.
2483		2544
2484	=cut	2545	=cut
2485		2546
2486	our $GOTOGEN;	2547	our $GOTOGEN;
2487		2548
…		…
2566	}	2627	}
2567		2628
2568	sub prepare_random_map {	2629	sub prepare_random_map {
2569	my ($exit) = @_;	2630	my ($exit) = @_;
2570		2631
2571	my $guard = cf::lock_acquire "exit_prepare:$exit";
2572
2573	# all this does is basically replace the /! path by	2632	# all this does is basically replace the /! path by
2574	# a new random map path (?random/...) with a seed	2633	# a new random map path (?random/...) with a seed
2575	# that depends on the exit object	2634	# that depends on the exit object
2576		2635
2577	my $rmp = parse_random_map_params $exit->msg;	2636	my $rmp = parse_random_map_params $exit->msg;
…		…
2579	if ($exit->map) {	2638	if ($exit->map) {
2580	$rmp->{region} = $exit->region->name;	2639	$rmp->{region} = $exit->region->name;
2581	$rmp->{origin_map} = $exit->map->path;	2640	$rmp->{origin_map} = $exit->map->path;
2582	$rmp->{origin_x} = $exit->x;	2641	$rmp->{origin_x} = $exit->x;
2583	$rmp->{origin_y} = $exit->y;	2642	$rmp->{origin_y} = $exit->y;
		2643
		2644	$exit->map->touch;
2584	}	2645	}
2585		2646
2586	$rmp->{random_seed} ||= $exit->random_seed;	2647	$rmp->{random_seed} ||= $exit->random_seed;
2587		2648
2588	my $data = cf::to_json $rmp;	2649	my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2589	my $md5 = Digest::MD5::md5_hex $data;	2650	my $md5 = Digest::MD5::md5_hex $data;
2590	my $meta = "$RANDOMDIR/$md5.meta";	2651	my $meta = "$RANDOMDIR/$md5.meta";
2591		2652
2592	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {	2653	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2593	aio_write $fh, 0, (length $data), $data, 0;	2654	aio_write $fh, 0, (length $data), $data, 0;
2594	undef $fh;	2655	undef $fh;
2595	aio_rename "$meta~", $meta;	2656	aio_rename "$meta~", $meta;
2596		2657
		2658	my $slaying = "?random/$md5";
		2659
		2660	if ($exit->valid) {
2597	$exit->slaying ("?random/$md5");	2661	$exit->slaying ("?random/$md5");
2598	$exit->msg (undef);	2662	$exit->msg (undef);
		2663	}
2599	}	2664	}
2600	}	2665	}
2601		2666
2602	sub cf::object::player::enter_exit {	2667	sub cf::object::player::enter_exit {
2603	my ($self, $exit) = @_;	2668	my ($self, $exit) = @_;
2604		2669
2605	return unless $self->type == cf::PLAYER;	2670	return unless $self->type == cf::PLAYER;
2606		2671
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;	2672	$self->enter_link;
2619		2673
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 {	2674	(async {
2625	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";	2675	$Coro::current->{desc} = "enter_exit";
2626		2676
2627	$self->deactivate_recursive; # just to be sure
2628	unless (eval {	2677	unless (eval {
		2678	$self->deactivate_recursive; # just to be sure
		2679
		2680	# random map handling
		2681	{
		2682	my $guard = cf::lock_acquire "exit_prepare:$exit";
		2683
		2684	prepare_random_map $exit
		2685	if $exit->slaying eq "/!";
		2686	}
		2687
		2688	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
		2689	my $x = $exit->stats->hp;
		2690	my $y = $exit->stats->sp;
		2691
2629	$self->goto ($slaying, $hp, $sp);	2692	$self->goto ($map, $x, $y);
2630		2693
		2694	# if exit is damned, update players death & WoR home-position
		2695	$self->contr->savebed ($map, $x, $y)
		2696	if $exit->flag (cf::FLAG_DAMNED);
		2697
2631	1;	2698	1
2632	}) {	2699	}) {
2633	$self->message ("Something went wrong deep within the crossfire server. "	2700	$self->message ("Something went wrong deep within the deliantra server. "
2634	. "I'll try to bring you back to the map you were before. "	2701	. "I'll try to bring you back to the map you were before. "
2635	. "Please report this to the dungeon master!",	2702	. "Please report this to the dungeon master!",
2636	cf::NDI_UNIQUE | cf::NDI_RED);	2703	cf::NDI_UNIQUE | cf::NDI_RED);
2637		2704
2638	warn "ERROR in enter_exit: $@";	2705	warn "ERROR in enter_exit: $@";
…		…
2666	the message, with C<log> being the default. If C<$color> is negative, suppress	2733	the message, with C<log> being the default. If C<$color> is negative, suppress
2667	the message unless the client supports the msg packet.	2734	the message unless the client supports the msg packet.
2668		2735
2669	=cut	2736	=cut
2670		2737
		2738	# non-persistent channels (usually the info channel)
2671	our %CHANNEL = (	2739	our %CHANNEL = (
2672	"c/identify" => {	2740	"c/identify" => {
2673	id => "infobox",	2741	id => "infobox",
2674	title => "Identify",	2742	title => "Identify",
2675	reply => undef,	2743	reply => undef,
…		…
2679	id => "infobox",	2747	id => "infobox",
2680	title => "Examine",	2748	title => "Examine",
2681	reply => undef,	2749	reply => undef,
2682	tooltip => "Signs and other items you examined",	2750	tooltip => "Signs and other items you examined",
2683	},	2751	},
		2752	"c/book" => {
		2753	id => "infobox",
		2754	title => "Book",
		2755	reply => undef,
		2756	tooltip => "The contents of a note or book",
		2757	},
2684	"c/lookat" => {	2758	"c/lookat" => {
2685	id => "infobox",	2759	id => "infobox",
2686	title => "Look",	2760	title => "Look",
2687	reply => undef,	2761	reply => undef,
2688	tooltip => "What you saw there",	2762	tooltip => "What you saw there",
2689	},	2763	},
		2764	"c/who" => {
		2765	id => "infobox",
		2766	title => "Players",
		2767	reply => undef,
		2768	tooltip => "Shows players who are currently online",
		2769	},
		2770	"c/body" => {
		2771	id => "infobox",
		2772	title => "Body Parts",
		2773	reply => undef,
		2774	tooltip => "Shows which body parts you posess and are available",
		2775	},
		2776	"c/skills" => {
		2777	id => "infobox",
		2778	title => "Skills",
		2779	reply => undef,
		2780	tooltip => "Shows your experience per skill and item power",
		2781	},
		2782	"c/uptime" => {
		2783	id => "infobox",
		2784	title => "Uptime",
		2785	reply => undef,
		2786	tooltip => "How long the server has been running since last restart",
		2787	},
		2788	"c/mapinfo" => {
		2789	id => "infobox",
		2790	title => "Map Info",
		2791	reply => undef,
		2792	tooltip => "Information related to the maps",
		2793	},
		2794	"c/party" => {
		2795	id => "party",
		2796	title => "Party",
		2797	reply => "gsay ",
		2798	tooltip => "Messages and chat related to your party",
		2799	},
2690	);	2800	);
2691		2801
2692	sub cf::client::send_msg {	2802	sub cf::client::send_msg {
2693	my ($self, $channel, $msg, $color, @extra) = @_;	2803	my ($self, $channel, $msg, $color, @extra) = @_;
2694		2804
2695	$msg = $self->pl->expand_cfpod ($msg);	2805	$msg = $self->pl->expand_cfpod ($msg)
		2806	unless $color & cf::NDI_VERBATIM;
2696		2807
2697	$color &= cf::NDI_CLIENT_MASK; # just in case...	2808	$color &= cf::NDI_CLIENT_MASK; # just in case...
2698		2809
2699	# check predefined channels, for the benefit of C	2810	# check predefined channels, for the benefit of C
2700	if ($CHANNEL{$channel}) {	2811	if ($CHANNEL{$channel}) {
…		…
2721	if ($self->can_msg) {	2832	if ($self->can_msg) {
2722	# default colour, mask it out	2833	# default colour, mask it out
2723	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)	2834	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2724	if $color & cf::NDI_DEF;	2835	if $color & cf::NDI_DEF;
2725		2836
2726	$self->send_packet ("msg " . $self->{json_coder}->encode (	2837	my $pkt = "msg "
		2838	. $self->{json_coder}->encode (
2727	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));	2839	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
		2840	);
		2841
		2842	# try lzf for large packets
		2843	$pkt = "lzf " . Compress::LZF::compress $pkt
		2844	if 1024 <= length $pkt and $self->{can_lzf};
		2845
		2846	# split very large packets
		2847	if (8192 < length $pkt and $self->{can_lzf}) {
		2848	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
		2849	$pkt = "frag";
		2850	}
		2851
		2852	$self->send_packet ($pkt);
2728	} else {	2853	} else {
2729	if ($color >= 0) {	2854	if ($color >= 0) {
2730	# replace some tags by gcfclient-compatible ones	2855	# replace some tags by gcfclient-compatible ones
2731	for ($msg) {	2856	for ($msg) {
2732	1 while	2857	1 while
…		…
2931		3056
2932	The following functions and methods are available within a safe environment:	3057	The following functions and methods are available within a safe environment:
2933		3058
2934	cf::object	3059	cf::object
2935	contr pay_amount pay_player map x y force_find force_add destroy	3060	contr pay_amount pay_player map x y force_find force_add destroy
2936	insert remove name archname title slaying race decrease_ob_nr	3061	insert remove name archname title slaying race decrease split
2937		3062
2938	cf::object::player	3063	cf::object::player
2939	player	3064	player
2940		3065
2941	cf::player	3066	cf::player
…		…
2946		3071
2947	=cut	3072	=cut
2948		3073
2949	for (	3074	for (
2950	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	3075	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2951	insert remove inv name archname title slaying race	3076	insert remove inv nrof name archname title slaying race
2952	decrease_ob_nr destroy)],	3077	decrease split destroy change_exp)],
2953	["cf::object::player" => qw(player)],	3078	["cf::object::player" => qw(player)],
2954	["cf::player" => qw(peaceful)],	3079	["cf::player" => qw(peaceful)],
2955	["cf::map" => qw(trigger)],	3080	["cf::map" => qw(trigger)],
2956	) {	3081	) {
2957	no strict 'refs';	3082	no strict 'refs';
…		…
3062	{	3187	{
3063	my $faces = $facedata->{faceinfo};	3188	my $faces = $facedata->{faceinfo};
3064		3189
3065	while (my ($face, $info) = each %$faces) {	3190	while (my ($face, $info) = each %$faces) {
3066	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3191	my $idx = (cf::face::find $face) || cf::face::alloc $face;
		3192
3067	cf::face::set_visibility $idx, $info->{visibility};	3193	cf::face::set_visibility $idx, $info->{visibility};
3068	cf::face::set_magicmap $idx, $info->{magicmap};	3194	cf::face::set_magicmap $idx, $info->{magicmap};
3069	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};	3195	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3070	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};	3196	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3071		3197
3072	cf::cede_to_tick;	3198	cf::cede_to_tick;
3073	}	3199	}
3074		3200
3075	while (my ($face, $info) = each %$faces) {	3201	while (my ($face, $info) = each %$faces) {
3076	next unless $info->{smooth};	3202	next unless $info->{smooth};
		3203
3077	my $idx = cf::face::find $face	3204	my $idx = cf::face::find $face
3078	or next;	3205	or next;
		3206
3079	if (my $smooth = cf::face::find $info->{smooth}) {	3207	if (my $smooth = cf::face::find $info->{smooth}) {
3080	cf::face::set_smooth $idx, $smooth;	3208	cf::face::set_smooth $idx, $smooth;
3081	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3209	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3082	} else {	3210	} else {
3083	warn "smooth face '$info->{smooth}' not found for face '$face'";	3211	warn "smooth face '$info->{smooth}' not found for face '$face'";
…		…
3101	{	3229	{
3102	# TODO: for gcfclient pleasure, we should give resources	3230	# TODO: for gcfclient pleasure, we should give resources
3103	# that gcfclient doesn't grok a >10000 face index.	3231	# that gcfclient doesn't grok a >10000 face index.
3104	my $res = $facedata->{resource};	3232	my $res = $facedata->{resource};
3105		3233
3106	my $soundconf = delete $res->{"res/sound.conf"};
3107
3108	while (my ($name, $info) = each %$res) {	3234	while (my ($name, $info) = each %$res) {
		3235	if (defined $info->{type}) {
3109	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3236	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3110	my $data;	3237	my $data;
3111		3238
3112	if ($info->{type} & 1) {	3239	if ($info->{type} & 1) {
3113	# prepend meta info	3240	# prepend meta info
3114		3241
3115	my $meta = $enc->encode ({	3242	my $meta = $enc->encode ({
3116	name => $name,	3243	name => $name,
3117	%{ $info->{meta} || {} },	3244	%{ $info->{meta} || {} },
3118	});	3245	});
3119		3246
3120	$data = pack "(w/a*)*", $meta, $info->{data};	3247	$data = pack "(w/a*)*", $meta, $info->{data};
		3248	} else {
		3249	$data = $info->{data};
		3250	}
		3251
		3252	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3253	cf::face::set_type $idx, $info->{type};
3121	} else {	3254	} else {
3122	$data = $info->{data};	3255	$RESOURCE{$name} = $info;
3123	}	3256	}
3124		3257
3125	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3126	cf::face::set_type $idx, $info->{type};
3127
3128	cf::cede_to_tick;	3258	cf::cede_to_tick;
3129	}	3259	}
3130
3131	if ($soundconf) {
3132	$soundconf = $enc->decode (delete $soundconf->{data});
3133
3134	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3135	my $sound = $soundconf->{compat}[$_]
3136	or next;
3137
3138	my $face = cf::face::find "sound/$sound->[1]";
3139	cf::sound::set $sound->[0] => $face;
3140	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3141	}
3142
3143	while (my ($k, $v) = each %{$soundconf->{event}}) {
3144	my $face = cf::face::find "sound/$v";
3145	cf::sound::set $k => $face;
3146	}
3147	}
3148	}	3260	}
		3261
		3262	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3149		3263
3150	1	3264	1
3151	}	3265	}
		3266
		3267	cf::global->attach (on_resource_update => sub {
		3268	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
		3269	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
		3270
		3271	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3272	my $sound = $soundconf->{compat}[$_]
		3273	or next;
		3274
		3275	my $face = cf::face::find "sound/$sound->[1]";
		3276	cf::sound::set $sound->[0] => $face;
		3277	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3278	}
		3279
		3280	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3281	my $face = cf::face::find "sound/$v";
		3282	cf::sound::set $k => $face;
		3283	}
		3284	}
		3285	});
3152		3286
3153	register_exticmd fx_want => sub {	3287	register_exticmd fx_want => sub {
3154	my ($ns, $want) = @_;	3288	my ($ns, $want) = @_;
3155		3289
3156	while (my ($k, $v) = each %$want) {	3290	while (my ($k, $v) = each %$want) {
3157	$ns->fx_want ($k, $v);	3291	$ns->fx_want ($k, $v);
3158	}	3292	}
3159	};	3293	};
		3294
		3295	sub load_resource_file($) {
		3296	my $guard = lock_acquire "load_resource_file";
		3297
		3298	my $status = load_resource_file_ $_[0];
		3299	get_slot 0.1, 100;
		3300	cf::arch::commit_load;
		3301
		3302	$status
		3303	}
3160		3304
3161	sub reload_regions {	3305	sub reload_regions {
3162	# HACK to clear player env face cache, we need some signal framework	3306	# HACK to clear player env face cache, we need some signal framework
3163	# for this (global event?)	3307	# for this (global event?)
3164	%ext::player_env::MUSIC_FACE_CACHE = ();	3308	%ext::player_env::MUSIC_FACE_CACHE = ();
…		…
3178	}	3322	}
3179		3323
3180	sub reload_archetypes {	3324	sub reload_archetypes {
3181	load_resource_file "$DATADIR/archetypes"	3325	load_resource_file "$DATADIR/archetypes"
3182	or die "unable to load archetypes\n";	3326	or die "unable to load archetypes\n";
3183	#d# NEED to laod twice to resolve forward references
3184	# this really needs to be done in an extra post-pass
3185	# (which needs to be synchronous, so solve it differently)
3186	load_resource_file "$DATADIR/archetypes"
3187	or die "unable to load archetypes\n";
3188	}	3327	}
3189		3328
3190	sub reload_treasures {	3329	sub reload_treasures {
3191	load_resource_file "$DATADIR/treasures"	3330	load_resource_file "$DATADIR/treasures"
3192	or die "unable to load treasurelists\n";	3331	or die "unable to load treasurelists\n";
3193	}	3332	}
3194		3333
3195	sub reload_resources {	3334	sub reload_resources {
3196	warn "reloading resource files...\n";	3335	warn "reloading resource files...\n";
3197		3336
		3337	reload_facedata;
		3338	reload_archetypes;
3198	reload_regions;	3339	reload_regions;
3199	reload_facedata;
3200	#reload_archetypes;#d#
3201	reload_archetypes;
3202	reload_treasures;	3340	reload_treasures;
3203		3341
3204	warn "finished reloading resource files\n";	3342	warn "finished reloading resource files\n";
3205	}	3343	}
3206		3344
3207	sub init {	3345	sub init {
		3346	my $guard = freeze_mainloop;
		3347
		3348	evthread_start IO::AIO::poll_fileno;
		3349
3208	reload_resources;	3350	reload_resources;
3209	}	3351	}
3210		3352
3211	sub reload_config {	3353	sub reload_config {
3212	open my $fh, "<:utf8", "$CONFDIR/config"	3354	open my $fh, "<:utf8", "$CONFDIR/config"
3213	or return;	3355	or return;
3214		3356
3215	local $/;	3357	local $/;
3216	*CFG = YAML::Syck::Load <$fh>;	3358	*CFG = YAML::Load <$fh>;
3217		3359
3218	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3360	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3219		3361
3220	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3362	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3221	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3363	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
3227	};	3369	};
3228	warn $@ if $@;	3370	warn $@ if $@;
3229	}	3371	}
3230	}	3372	}
3231		3373
		3374	sub pidfile() {
		3375	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
		3376	or die "$PIDFILE: $!";
		3377	flock $fh, &Fcntl::LOCK_EX
		3378	or die "$PIDFILE: flock: $!";
		3379	$fh
		3380	}
		3381
		3382	# make sure only one server instance is running at any one time
		3383	sub atomic {
		3384	my $fh = pidfile;
		3385
		3386	my $pid = <$fh>;
		3387	kill 9, $pid if $pid > 0;
		3388
		3389	seek $fh, 0, 0;
		3390	print $fh $$;
		3391	}
		3392
3232	sub main {	3393	sub main {
		3394	atomic;
		3395
3233	# we must not ever block the main coroutine	3396	# we must not ever block the main coroutine
3234	local $Coro::idle = sub {	3397	local $Coro::idle = sub {
3235	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3398	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3236	(async {	3399	(async {
3237	$Coro::current->{desc} = "IDLE BUG HANDLER";	3400	$Coro::current->{desc} = "IDLE BUG HANDLER";
3238	Event::one_event;	3401	EV::loop EV::LOOP_ONESHOT;
3239	})->prio (Coro::PRIO_MAX);	3402	})->prio (Coro::PRIO_MAX);
3240	};	3403	};
3241		3404
		3405	{
		3406	my $guard = freeze_mainloop;
3242	reload_config;	3407	reload_config;
3243	db_init;	3408	db_init;
3244	load_extensions;	3409	load_extensions;
3245		3410
3246	$TICK_WATCHER->start;	3411	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
		3412	}
		3413
		3414	utime time, time, $RUNTIMEFILE;
		3415
		3416	# no (long-running) fork's whatsoever before this point(!)
		3417	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
		3418
3247	Event::loop;	3419	EV::loop;
3248	}	3420	}
3249		3421
3250	#############################################################################	3422	#############################################################################
3251	# initialisation and cleanup	3423	# initialisation and cleanup
3252		3424
3253	# install some emergency cleanup handlers	3425	# install some emergency cleanup handlers
3254	BEGIN {	3426	BEGIN {
		3427	our %SIGWATCHER = ();
3255	for my $signal (qw(INT HUP TERM)) {	3428	for my $signal (qw(INT HUP TERM)) {
3256	Event->signal (	3429	$SIGWATCHER{$signal} = EV::signal $signal, sub {
3257	reentrant => 0,
3258	data => WF_AUTOCANCEL,
3259	signal => $signal,
3260	prio => 0,
3261	cb => sub {
3262	cf::cleanup "SIG$signal";	3430	cf::cleanup "SIG$signal";
3263	},
3264	);	3431	};
3265	}	3432	}
3266	}	3433	}
3267		3434
3268	sub write_runtime {	3435	sub write_runtime_sync {
3269	my $runtime = "$LOCALDIR/runtime";
3270
3271	# first touch the runtime file to show we are still running:	3436	# first touch the runtime file to show we are still running:
3272	# the fsync below can take a very very long time.	3437	# the fsync below can take a very very long time.
3273		3438
3274	IO::AIO::aio_utime $runtime, undef, undef;	3439	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3275		3440
3276	my $guard = cf::lock_acquire "write_runtime";	3441	my $guard = cf::lock_acquire "write_runtime";
3277		3442
3278	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644	3443	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3279	or return;	3444	or return;
3280		3445
3281	my $value = $cf::RUNTIME + 90 + 10;	3446	my $value = $cf::RUNTIME + 90 + 10;
3282	# 10 is the runtime save interval, for a monotonic clock	3447	# 10 is the runtime save interval, for a monotonic clock
3283	# 60 allows for the watchdog to kill the server.	3448	# 60 allows for the watchdog to kill the server.
…		…
3293	aio_utime $fh, undef, undef;	3458	aio_utime $fh, undef, undef;
3294		3459
3295	close $fh	3460	close $fh
3296	or return;	3461	or return;
3297		3462
3298	aio_rename "$runtime~", $runtime	3463	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3299	and return;	3464	and return;
3300		3465
3301	warn "runtime file written.\n";	3466	warn "runtime file written.\n";
3302		3467
3303	1	3468	1
		3469	}
		3470
		3471	our $uuid_lock;
		3472	our $uuid_skip;
		3473
		3474	sub write_uuid_sync($) {
		3475	$uuid_skip ||= $_[0];
		3476
		3477	return if $uuid_lock;
		3478	local $uuid_lock = 1;
		3479
		3480	my $uuid = "$LOCALDIR/uuid";
		3481
		3482	my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
		3483	or return;
		3484
		3485	my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
		3486	$uuid_skip = 0;
		3487
		3488	(aio_write $fh, 0, (length $value), $value, 0) <= 0
		3489	and return;
		3490
		3491	# always fsync - this file is important
		3492	aio_fsync $fh
		3493	and return;
		3494
		3495	close $fh
		3496	or return;
		3497
		3498	aio_rename "$uuid~", $uuid
		3499	and return;
		3500
		3501	warn "uuid file written ($value).\n";
		3502
		3503	1
		3504
		3505	}
		3506
		3507	sub write_uuid($$) {
		3508	my ($skip, $sync) = @_;
		3509
		3510	$sync ? write_uuid_sync $skip
		3511	: async { write_uuid_sync $skip };
3304	}	3512	}
3305		3513
3306	sub emergency_save() {	3514	sub emergency_save() {
3307	my $freeze_guard = cf::freeze_mainloop;	3515	my $freeze_guard = cf::freeze_mainloop;
3308		3516
…		…
3330	warn "end emergency map save\n";	3538	warn "end emergency map save\n";
3331		3539
3332	warn "begin emergency database checkpoint\n";	3540	warn "begin emergency database checkpoint\n";
3333	BDB::db_env_txn_checkpoint $DB_ENV;	3541	BDB::db_env_txn_checkpoint $DB_ENV;
3334	warn "end emergency database checkpoint\n";	3542	warn "end emergency database checkpoint\n";
		3543
		3544	warn "begin write uuid\n";
		3545	write_uuid_sync 1;
		3546	warn "end write uuid\n";
3335	};	3547	};
3336		3548
3337	warn "leave emergency perl save\n";	3549	warn "leave emergency perl save\n";
3338	}	3550	}
3339		3551
3340	sub post_cleanup {	3552	sub post_cleanup {
3341	my ($make_core) = @_;	3553	my ($make_core) = @_;
3342		3554
3343	warn Carp::longmess "post_cleanup backtrace"	3555	warn Carp::longmess "post_cleanup backtrace"
3344	if $make_core;	3556	if $make_core;
		3557
		3558	my $fh = pidfile;
		3559	unlink $PIDFILE if <$fh> == $$;
3345	}	3560	}
		3561
		3562	# a safer delete_package, copied from Symbol
		3563	sub clear_package($) {
		3564	my $pkg = shift;
		3565
		3566	# expand to full symbol table name if needed
		3567	unless ($pkg =~ /^main::.*::$/) {
		3568	$pkg = "main$pkg" if $pkg =~ /^::/;
		3569	$pkg = "main::$pkg" unless $pkg =~ /^main::/;
		3570	$pkg .= '::' unless $pkg =~ /::$/;
		3571	}
		3572
		3573	my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
		3574	my $stem_symtab = *{$stem}{HASH};
		3575
		3576	defined $stem_symtab and exists $stem_symtab->{$leaf}
		3577	or return;
		3578
		3579	# clear all symbols
		3580	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
		3581	for my $name (keys %$leaf_symtab) {
		3582	_gv_clear *{"$pkg$name"};
		3583	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
		3584	}
		3585	warn "cleared package #$pkg\n";#d#
		3586	}
		3587
		3588	our $RELOAD; # how many times to reload
3346		3589
3347	sub do_reload_perl() {	3590	sub do_reload_perl() {
3348	# can/must only be called in main	3591	# can/must only be called in main
3349	if ($Coro::current != $Coro::main) {	3592	if ($Coro::current != $Coro::main) {
3350	warn "can only reload from main coroutine";	3593	warn "can only reload from main coroutine";
3351	return;	3594	return;
3352	}	3595	}
3353		3596
		3597	return if $RELOAD++;
		3598
		3599	while ($RELOAD) {
3354	warn "reloading...";	3600	warn "reloading...";
3355		3601
3356	warn "entering sync_job";	3602	warn "entering sync_job";
3357		3603
3358	cf::sync_job {	3604	cf::sync_job {
3359	cf::write_runtime; # external watchdog should not bark	3605	cf::write_runtime_sync; # external watchdog should not bark
3360	cf::emergency_save;	3606	cf::emergency_save;
3361	cf::write_runtime; # external watchdog should not bark	3607	cf::write_runtime_sync; # external watchdog should not bark
3362		3608
3363	warn "syncing database to disk";	3609	warn "syncing database to disk";
3364	BDB::db_env_txn_checkpoint $DB_ENV;	3610	BDB::db_env_txn_checkpoint $DB_ENV;
3365		3611
3366	# if anything goes wrong in here, we should simply crash as we already saved	3612	# if anything goes wrong in here, we should simply crash as we already saved
3367		3613
3368	warn "cancelling all WF_AUTOCANCEL watchers";
3369	for (Event::all_watchers) {
3370	$_->cancel if $_->data & WF_AUTOCANCEL;
3371	}
3372
3373	warn "flushing outstanding aio requests";	3614	warn "flushing outstanding aio requests";
3374	for (;;) {
3375	BDB::flush;
3376	IO::AIO::flush;
3377	Coro::cede_notself;
3378	last unless IO::AIO::nreqs || BDB::nreqs;	3615	while (IO::AIO::nreqs || BDB::nreqs) {
3379	warn "iterate...";	3616	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3380	}
3381
3382	++$RELOAD;
3383
3384	warn "cancelling all extension coros";
3385	$_->cancel for values %EXT_CORO;
3386	%EXT_CORO = ();
3387
3388	warn "removing commands";
3389	%COMMAND = ();
3390
3391	warn "removing ext/exti commands";
3392	%EXTCMD = ();
3393	%EXTICMD = ();
3394
3395	warn "unloading/nuking all extensions";
3396	for my $pkg (@EXTS) {
3397	warn "... unloading $pkg";
3398
3399	if (my $cb = $pkg->can ("unload")) {
3400	eval {
3401	$cb->($pkg);
3402	1
3403	} or warn "$pkg unloaded, but with errors: $@";
3404	}	3617	}
3405		3618
3406	warn "... nuking $pkg";	3619	warn "cancelling all extension coros";
3407	Symbol::delete_package $pkg;	3620	$_->cancel for values %EXT_CORO;
3408	}	3621	%EXT_CORO = ();
3409		3622
3410	warn "unloading all perl modules loaded from $LIBDIR";	3623	warn "removing commands";
3411	while (my ($k, $v) = each %INC) {	3624	%COMMAND = ();
3412	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3413		3625
		3626	warn "removing ext/exti commands";
		3627	%EXTCMD = ();
		3628	%EXTICMD = ();
		3629
		3630	warn "unloading/nuking all extensions";
		3631	for my $pkg (@EXTS) {
3414	warn "... unloading $k";	3632	warn "... unloading $pkg";
3415	delete $INC{$k};
3416		3633
3417	$k =~ s/\.pm$//;
3418	$k =~ s/\//::/g;
3419
3420	if (my $cb = $k->can ("unload_module")) {	3634	if (my $cb = $pkg->can ("unload")) {
		3635	eval {
3421	$cb->();	3636	$cb->($pkg);
		3637	1
		3638	} or warn "$pkg unloaded, but with errors: $@";
		3639	}
		3640
		3641	warn "... clearing $pkg";
		3642	clear_package $pkg;
3422	}	3643	}
3423		3644
3424	Symbol::delete_package $k;	3645	warn "unloading all perl modules loaded from $LIBDIR";
		3646	while (my ($k, $v) = each %INC) {
		3647	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
		3648
		3649	warn "... unloading $k";
		3650	delete $INC{$k};
		3651
		3652	$k =~ s/\.pm$//;
		3653	$k =~ s/\//::/g;
		3654
		3655	if (my $cb = $k->can ("unload_module")) {
		3656	$cb->();
		3657	}
		3658
		3659	clear_package $k;
3425	}	3660	}
3426		3661
3427	warn "getting rid of safe::, as good as possible";	3662	warn "getting rid of safe::, as good as possible";
3428	Symbol::delete_package "safe::$_"	3663	clear_package "safe::$_"
3429	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	3664	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3430		3665
3431	warn "unloading cf.pm \"a bit\"";	3666	warn "unloading cf.pm \"a bit\"";
3432	delete $INC{"cf.pm"};	3667	delete $INC{"cf.pm"};
3433	delete $INC{"cf/pod.pm"};	3668	delete $INC{"cf/pod.pm"};
3434		3669
3435	# don't, removes xs symbols, too,	3670	# don't, removes xs symbols, too,
3436	# and global variables created in xs	3671	# and global variables created in xs
3437	#Symbol::delete_package __PACKAGE__;	3672	#clear_package __PACKAGE__;
3438		3673
3439	warn "unload completed, starting to reload now";	3674	warn "unload completed, starting to reload now";
3440		3675
3441	warn "reloading cf.pm";	3676	warn "reloading cf.pm";
3442	require cf;	3677	require cf;
3443	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3678	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3444		3679
3445	warn "loading config and database again";	3680	warn "loading config and database again";
3446	cf::reload_config;	3681	cf::reload_config;
3447		3682
3448	warn "loading extensions";	3683	warn "loading extensions";
3449	cf::load_extensions;	3684	cf::load_extensions;
3450		3685
3451	warn "reattaching attachments to objects/players";	3686	warn "reattaching attachments to objects/players";
3452	_global_reattach; # objects, sockets	3687	_global_reattach; # objects, sockets
3453	warn "reattaching attachments to maps";	3688	warn "reattaching attachments to maps";
3454	reattach $_ for values %MAP;	3689	reattach $_ for values %MAP;
3455	warn "reattaching attachments to players";	3690	warn "reattaching attachments to players";
3456	reattach $_ for values %PLAYER;	3691	reattach $_ for values %PLAYER;
3457		3692
3458	warn "leaving sync_job";	3693	warn "leaving sync_job";
3459		3694
3460	1	3695	1
3461	} or do {	3696	} or do {
3462	warn $@;	3697	warn $@;
3463	warn "error while reloading, exiting.";	3698	cf::cleanup "error while reloading, exiting.";
3464	exit 1;
3465	};	3699	};
3466		3700
3467	warn "reloaded";	3701	warn "reloaded";
		3702	--$RELOAD;
		3703	}
3468	};	3704	};
3469		3705
3470	our $RELOAD_WATCHER; # used only during reload	3706	our $RELOAD_WATCHER; # used only during reload
3471		3707
3472	sub reload_perl() {	3708	sub reload_perl() {
3473	# doing reload synchronously and two reloads happen back-to-back,	3709	# doing reload synchronously and two reloads happen back-to-back,
3474	# coro crashes during coro_state_free->destroy here.	3710	# coro crashes during coro_state_free->destroy here.
3475		3711
3476	$RELOAD_WATCHER ||= Event->timer (	3712	$RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3477	reentrant => 0,
3478	after => 0,
3479	data => WF_AUTOCANCEL,
3480	cb => sub {
3481	do_reload_perl;	3713	do_reload_perl;
3482	undef $RELOAD_WATCHER;	3714	undef $RELOAD_WATCHER;
3483	},
3484	);	3715	};
3485	}	3716	}
3486		3717
3487	register_command "reload" => sub {	3718	register_command "reload" => sub {
3488	my ($who, $arg) = @_;	3719	my ($who, $arg) = @_;
3489		3720
…		…
3502		3733
3503	our @WAIT_FOR_TICK;	3734	our @WAIT_FOR_TICK;
3504	our @WAIT_FOR_TICK_BEGIN;	3735	our @WAIT_FOR_TICK_BEGIN;
3505		3736
3506	sub wait_for_tick {	3737	sub wait_for_tick {
3507	return unless $TICK_WATCHER->is_active;
3508	return if $Coro::current == $Coro::main;	3738	return if tick_inhibit || $Coro::current == $Coro::main;
3509		3739
3510	my $signal = new Coro::Signal;	3740	my $signal = new Coro::Signal;
3511	push @WAIT_FOR_TICK, $signal;	3741	push @WAIT_FOR_TICK, $signal;
3512	$signal->wait;	3742	$signal->wait;
3513	}	3743	}
3514		3744
3515	sub wait_for_tick_begin {	3745	sub wait_for_tick_begin {
3516	return unless $TICK_WATCHER->is_active;
3517	return if $Coro::current == $Coro::main;	3746	return if tick_inhibit || $Coro::current == $Coro::main;
3518		3747
3519	my $signal = new Coro::Signal;	3748	my $signal = new Coro::Signal;
3520	push @WAIT_FOR_TICK_BEGIN, $signal;	3749	push @WAIT_FOR_TICK_BEGIN, $signal;
3521	$signal->wait;	3750	$signal->wait;
3522	}	3751	}
3523		3752
3524	$TICK_WATCHER = Event->timer (	3753	sub tick {
3525	reentrant => 0,
3526	parked => 1,
3527	prio => 0,
3528	at => $NEXT_TICK || $TICK,
3529	data => WF_AUTOCANCEL,
3530	cb => sub {
3531	if ($Coro::current != $Coro::main) {	3754	if ($Coro::current != $Coro::main) {
3532	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	3755	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3533	unless ++$bug_warning > 10;	3756	unless ++$bug_warning > 10;
3534	return;	3757	return;
3535	}	3758	}
3536		3759
3537	$NOW = $tick_start = Event::time;
3538
3539	cf::server_tick; # one server iteration	3760	cf::server_tick; # one server iteration
3540		3761
3541	$RUNTIME += $TICK;
3542	$NEXT_TICK += $TICK;
3543
3544	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3762	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3545	$NEXT_RUNTIME_WRITE = $NOW + 10;	3763	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3546	Coro::async_pool {	3764	Coro::async_pool {
3547	$Coro::current->{desc} = "runtime saver";	3765	$Coro::current->{desc} = "runtime saver";
3548	write_runtime	3766	write_runtime_sync
3549	or warn "ERROR: unable to write runtime file: $!";	3767	or warn "ERROR: unable to write runtime file: $!";
3550	};
3551	}	3768	};
		3769	}
3552		3770
3553	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3771	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3554	$sig->send;	3772	$sig->send;
3555	}	3773	}
3556	while (my $sig = shift @WAIT_FOR_TICK) {	3774	while (my $sig = shift @WAIT_FOR_TICK) {
3557	$sig->send;	3775	$sig->send;
3558	}	3776	}
3559		3777
3560	$NOW = Event::time;	3778	$LOAD = ($NOW - $TICK_START) / $TICK;
3561
3562	# if we are delayed by four ticks or more, skip them all
3563	$NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3564
3565	$TICK_WATCHER->at ($NEXT_TICK);
3566	$TICK_WATCHER->start;
3567
3568	$LOAD = ($NOW - $tick_start) / $TICK;
3569	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3779	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3570		3780
3571	_post_tick;	3781	if (0) {
		3782	if ($NEXT_TICK) {
		3783	my $jitter = $TICK_START - $NEXT_TICK;
		3784	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
		3785	warn "jitter $JITTER\n";#d#
		3786	}
3572	},	3787	}
3573	);	3788	}
3574		3789
3575	{	3790	{
		3791	# configure BDB
		3792
3576	BDB::min_parallel 8;	3793	BDB::min_parallel 8;
3577	BDB::max_poll_time $TICK * 0.1;	3794	BDB::max_poll_reqs $TICK * 0.1;
3578	$BDB_POLL_WATCHER = Event->io (	3795	$AnyEvent::BDB::WATCHER->priority (1);
3579	reentrant => 0,
3580	fd => BDB::poll_fileno,
3581	poll => 'r',
3582	prio => 0,
3583	data => WF_AUTOCANCEL,
3584	cb => \&BDB::poll_cb,
3585	);
3586
3587	BDB::set_sync_prepare {
3588	my $status;
3589	my $current = $Coro::current;
3590	(
3591	sub {
3592	$status = $!;
3593	$current->ready; undef $current;
3594	},
3595	sub {
3596	Coro::schedule while defined $current;
3597	$! = $status;
3598	},
3599	)
3600	};
3601		3796
3602	unless ($DB_ENV) {	3797	unless ($DB_ENV) {
3603	$DB_ENV = BDB::db_env_create;	3798	$DB_ENV = BDB::db_env_create;
3604	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC	3799	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3605	| BDB::LOG_AUTOREMOVE, 1);	3800	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
		3801	$DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3606	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);	3802	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3607	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);	3803	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3608		3804
3609	cf::sync_job {	3805	cf::sync_job {
3610	eval {	3806	eval {
…		…
3620		3816
3621	cf::cleanup "db_env_open(db): $@" if $@;	3817	cf::cleanup "db_env_open(db): $@" if $@;
3622	};	3818	};
3623	}	3819	}
3624		3820
3625	$BDB_DEADLOCK_WATCHER = Event->timer (	3821	$BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3626	after => 3,
3627	interval => 1,
3628	hard => 1,
3629	prio => 0,
3630	data => WF_AUTOCANCEL,
3631	cb => sub {
3632	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };	3822	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3633	},
3634	);	3823	};
3635	$BDB_CHECKPOINT_WATCHER = Event->timer (	3824	$BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3636	after => 11,
3637	interval => 60,
3638	hard => 1,
3639	prio => 0,
3640	data => WF_AUTOCANCEL,
3641	cb => sub {
3642	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	3825	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3643	},
3644	);	3826	};
3645	$BDB_TRICKLE_WATCHER = Event->timer (	3827	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3646	after => 5,
3647	interval => 10,
3648	hard => 1,
3649	prio => 0,
3650	data => WF_AUTOCANCEL,
3651	cb => sub {
3652	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	3828	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3653	},
3654	);	3829	};
3655	}	3830	}
3656		3831
3657	{	3832	{
		3833	# configure IO::AIO
		3834
3658	IO::AIO::min_parallel 8;	3835	IO::AIO::min_parallel 8;
3659
3660	undef $Coro::AIO::WATCHER;
3661	IO::AIO::max_poll_time $TICK * 0.1;	3836	IO::AIO::max_poll_time $TICK * 0.1;
3662	$AIO_POLL_WATCHER = Event->io (	3837	undef $AnyEvent::AIO::WATCHER;
3663	reentrant => 0,
3664	data => WF_AUTOCANCEL,
3665	fd => IO::AIO::poll_fileno,
3666	poll => 'r',
3667	prio => 0,
3668	cb => \&IO::AIO::poll_cb,
3669	);
3670	}	3838	}
3671		3839
3672	my $_log_backtrace;	3840	my $_log_backtrace;
3673		3841
3674	sub _log_backtrace {	3842	sub _log_backtrace {
…		…
3677	$msg =~ s/\n//;	3845	$msg =~ s/\n//;
3678		3846
3679	# limit the # of concurrent backtraces	3847	# limit the # of concurrent backtraces
3680	if ($_log_backtrace < 2) {	3848	if ($_log_backtrace < 2) {
3681	++$_log_backtrace;	3849	++$_log_backtrace;
		3850	my $perl_bt = Carp::longmess $msg;
3682	async {	3851	async {
3683	$Coro::current->{desc} = "abt $msg";	3852	$Coro::current->{desc} = "abt $msg";
3684		3853
3685	my @bt = fork_call {	3854	my @bt = fork_call {
3686	@addr = map { sprintf "%x", $_ } @addr;	3855	@addr = map { sprintf "%x", $_ } @addr;
…		…
3697	}	3866	}
3698		3867
3699	@funcs	3868	@funcs
3700	};	3869	};
3701		3870
3702	LOG llevInfo, "[ABT] $msg\n";	3871	LOG llevInfo, "[ABT] $perl_bt\n";
		3872	LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3703	LOG llevInfo, "[ABT] $_\n" for @bt;	3873	LOG llevInfo, "[ABT] $_\n" for @bt;
3704	--$_log_backtrace;	3874	--$_log_backtrace;
3705	};	3875	};
3706	} else {	3876	} else {
3707	LOG llevInfo, "[ABT] $msg\n";	3877	LOG llevInfo, "[ABT] $msg\n";

Diff Legend

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