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.451 by root, Mon Sep 22 05:42:41 2008 UTC vs.
Revision 1.581 by root, Fri Feb 3 02:04:11 2012 UTC

1	#	1	#
2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	#	3	#
4	# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	#	5	#
6	# Deliantra is free software: you can redistribute it and/or modify	6	# Deliantra is free software: you can redistribute it and/or modify it under
7	# it under the terms of the GNU General Public License as published by	7	# the terms of the Affero GNU General Public License as published by the
8	# the Free Software Foundation, either version 3 of the License, or	8	# Free Software Foundation, either version 3 of the License, or (at your
9	# (at your option) any later version.	9	# option) any later version.
10	#	10	#
11	# This program is distributed in the hope that it will be useful,	11	# This program is distributed in the hope that it will be useful,
12	# but WITHOUT ANY WARRANTY; without even the implied warranty of	12	# but WITHOUT ANY WARRANTY; without even the implied warranty of
13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14	# GNU General Public License for more details.	14	# GNU General Public License for more details.
15	#	15	#
16	# You should have received a copy of the GNU General Public License	16	# You should have received a copy of the Affero GNU General Public License
17	# along with this program. If not, see <http://www.gnu.org/licenses/>.	17	# and the GNU General Public License along with this program. If not, see
		18	# <http://www.gnu.org/licenses/>.
18	#	19	#
19	# The authors can be reached via e-mail to <support@deliantra.net>	20	# The authors can be reached via e-mail to <support@deliantra.net>
20	#	21	#
21		22
22	package cf;	23	package cf;
23		24
24	use 5.10.0;	25	use common::sense;
25	use utf8;
26	use strict "vars", "subs";
27		26
28	use Symbol;	27	use Symbol;
29	use List::Util;	28	use List::Util;
30	use Socket;	29	use Socket;
31	use EV;	30	use EV;
32	use Opcode;	31	use Opcode;
33	use Safe;	32	use Safe;
34	use Safe::Hole;	33	use Safe::Hole;
35	use Storable ();	34	use Storable ();
		35	use Carp ();
36		36
		37	use Guard ();
37	use Coro ();	38	use Coro ();
38	use Coro::State;	39	use Coro::State;
39	use Coro::Handle;	40	use Coro::Handle;
40	use Coro::EV;	41	use Coro::EV;
41	use Coro::AnyEvent;	42	use Coro::AnyEvent;
42	use Coro::Timer;	43	use Coro::Timer;
43	use Coro::Signal;	44	use Coro::Signal;
44	use Coro::Semaphore;	45	use Coro::Semaphore;
		46	use Coro::SemaphoreSet;
45	use Coro::AnyEvent;	47	use Coro::AnyEvent;
46	use Coro::AIO;	48	use Coro::AIO;
47	use Coro::BDB 1.6;	49	use Coro::BDB 1.6;
48	use Coro::Storable;	50	use Coro::Storable;
49	use Coro::Util ();	51	use Coro::Util ();
50		52
51	use JSON::XS 2.01 ();	53	use JSON::XS 2.01 ();
52	use BDB ();	54	use BDB ();
53	use Data::Dumper;	55	use Data::Dumper;
54	use Digest::MD5;
55	use Fcntl;	56	use Fcntl;
56	use YAML ();	57	use YAML::XS ();
57	use IO::AIO ();	58	use IO::AIO ();
58	use Time::HiRes;	59	use Time::HiRes;
59	use Compress::LZF;	60	use Compress::LZF;
60	use Digest::MD5 ();	61	use Digest::MD5 ();
61		62
…		…
70		71
71	# make sure c-lzf reinitialises itself	72	# make sure c-lzf reinitialises itself
72	Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";	73	Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
73	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later	74	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
74		75
		76	# strictly for debugging
		77	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
		78
75	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	79	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
		80
		81	our @ORIG_INC;
76		82
77	our %COMMAND = ();	83	our %COMMAND = ();
78	our %COMMAND_TIME = ();	84	our %COMMAND_TIME = ();
79		85
80	our @EXTS = (); # list of extension package names	86	our @EXTS = (); # list of extension package names
…		…
83	our %EXT_CORO = (); # coroutines bound to extensions	89	our %EXT_CORO = (); # coroutines bound to extensions
84	our %EXT_MAP = (); # pluggable maps	90	our %EXT_MAP = (); # pluggable maps
85		91
86	our $RELOAD; # number of reloads so far, non-zero while in reload	92	our $RELOAD; # number of reloads so far, non-zero while in reload
87	our @EVENT;	93	our @EVENT;
		94	our @REFLECT; # set by XS
		95	our %REFLECT; # set by us
88		96
89	our $CONFDIR = confdir;	97	our $CONFDIR = confdir;
		98
90	our $DATADIR = datadir;	99	our $DATADIR = datadir;
91	our $LIBDIR = "$DATADIR/ext";	100	our $LIBDIR = "$DATADIR/ext";
92	our $PODDIR = "$DATADIR/pod";	101	our $PODDIR = "$DATADIR/pod";
93	our $MAPDIR = "$DATADIR/" . mapdir;	102	our $MAPDIR = "$DATADIR/" . mapdir;
		103
94	our $LOCALDIR = localdir;	104	our $LOCALDIR = localdir;
95	our $TMPDIR = "$LOCALDIR/" . tmpdir;	105	our $TMPDIR = "$LOCALDIR/" . tmpdir;
96	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	106	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
97	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	107	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
98	our $RANDOMDIR = "$LOCALDIR/random";	108	our $RANDOMDIR = "$LOCALDIR/random";
99	our $BDBDIR = "$LOCALDIR/db";	109	our $BDBDIR = "$LOCALDIR/db";
100	our $PIDFILE = "$LOCALDIR/pid";	110	our $PIDFILE = "$LOCALDIR/pid";
101	our $RUNTIMEFILE = "$LOCALDIR/runtime";	111	our $RUNTIMEFILE = "$LOCALDIR/runtime";
102		112
103	our %RESOURCE;	113	#our %RESOURCE; # unused
		114
		115	our $OUTPUT_RATE_MIN = 3000;
		116	our $OUTPUT_RATE_MAX = 1000000;
		117
		118	our $MAX_LINKS = 32; # how many chained exits to follow
		119	our $VERBOSE_IO = 1;
104		120
105	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	121	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
106	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	122	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
107	our $NEXT_TICK;	123	our $NEXT_TICK;
108	our $USE_FSYNC = 1; # use fsync to write maps - default off	124	our $USE_FSYNC = 1; # use fsync to write maps - default on
109		125
110	our $BDB_DEADLOCK_WATCHER;	126	our $BDB_DEADLOCK_WATCHER;
111	our $BDB_CHECKPOINT_WATCHER;	127	our $BDB_CHECKPOINT_WATCHER;
112	our $BDB_TRICKLE_WATCHER;	128	our $BDB_TRICKLE_WATCHER;
113	our $DB_ENV;	129	our $DB_ENV;
114		130
		131	our @EXTRA_MODULES = qw(pod match mapscript incloader);
		132
115	our %CFG;	133	our %CFG;
116		134
117	our $UPTIME; $UPTIME ||= time;	135	our $UPTIME; $UPTIME ||= time;
118	our $RUNTIME;	136	our $RUNTIME = 0;
		137	our $SERVER_TICK = 0;
119	our $NOW;	138	our $NOW;
120		139
121	our (%PLAYER, %PLAYER_LOADING); # all users	140	our (%PLAYER, %PLAYER_LOADING); # all users
122	our (%MAP, %MAP_LOADING ); # all maps	141	our (%MAP, %MAP_LOADING ); # all maps
123	our $LINK_MAP; # the special {link} map, which is always available	142	our $LINK_MAP; # the special {link} map, which is always available
…		…
127		146
128	our $LOAD; # a number between 0 (idle) and 1 (too many objects)	147	our $LOAD; # a number between 0 (idle) and 1 (too many objects)
129	our $LOADAVG; # same thing, but with alpha-smoothing	148	our $LOADAVG; # same thing, but with alpha-smoothing
130	our $JITTER; # average jitter	149	our $JITTER; # average jitter
131	our $TICK_START; # for load detecting purposes	150	our $TICK_START; # for load detecting purposes
		151
		152	our @POST_INIT;
		153
		154	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
		155	our $REALLY_UNLOOP; # never set to true, please :)
		156
		157	our $WAIT_FOR_TICK = new Coro::Signal;
		158	our @WAIT_FOR_TICK_BEGIN;
132		159
133	binmode STDOUT;	160	binmode STDOUT;
134	binmode STDERR;	161	binmode STDERR;
135		162
136	# read virtual server time, if available	163	# read virtual server time, if available
…		…
138	open my $fh, "<", $RUNTIMEFILE	165	open my $fh, "<", $RUNTIMEFILE
139	or die "unable to read $RUNTIMEFILE file: $!";	166	or die "unable to read $RUNTIMEFILE file: $!";
140	$RUNTIME = <$fh> + 0.;	167	$RUNTIME = <$fh> + 0.;
141	}	168	}
142		169
		170	eval "sub TICK() { $TICK } 1" or die;
		171
143	mkdir $_	172	mkdir $_
144	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;	173	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
145		174
146	our $EMERGENCY_POSITION;	175	our $EMERGENCY_POSITION;
147		176
148	sub cf::map::normalise;	177	sub cf::map::normalise;
149		178
		179	sub in_main() {
		180	$Coro::current == $Coro::main
		181	}
		182
150	#############################################################################	183	#############################################################################
151		184
		185	%REFLECT = ();
		186	for (@REFLECT) {
		187	my $reflect = JSON::XS::decode_json $_;
		188	$REFLECT{$reflect->{class}} = $reflect;
		189	}
		190
		191	# this is decidedly evil
		192	$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
		193
		194	#############################################################################
		195
152	=head2 GLOBAL VARIABLES	196	=head2 GLOBAL VARIABLES
153		197
154	=over 4	198	=over 4
155		199
156	=item $cf::UPTIME	200	=item $cf::UPTIME
157		201
158	The timestamp of the server start (so not actually an uptime).	202	The timestamp of the server start (so not actually an "uptime").
		203
		204	=item $cf::SERVER_TICK
		205
		206	An unsigned integer that starts at zero when the server is started and is
		207	incremented on every tick.
		208
		209	=item $cf::NOW
		210
		211	The (real) time of the last (current) server tick - updated before and
		212	after tick processing, so this is useful only as a rough "what time is it
		213	now" estimate.
		214
		215	=item $cf::TICK
		216
		217	The interval between each server tick, in seconds.
159		218
160	=item $cf::RUNTIME	219	=item $cf::RUNTIME
161		220
162	The time this server has run, starts at 0 and is increased by $cf::TICK on	221	The time this server has run, starts at 0 and is increased by $cf::TICK on
163	every server tick.	222	every server tick.
…		…
169	Various directories - "/etc", read-only install directory, perl-library	228	Various directories - "/etc", read-only install directory, perl-library
170	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	229	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
171	unique-items directory, player file directory, random maps directory and	230	unique-items directory, player file directory, random maps directory and
172	database environment.	231	database environment.
173		232
174	=item $cf::NOW
175
176	The time of the last (current) server tick.
177
178	=item $cf::TICK
179
180	The interval between server ticks, in seconds.
181
182	=item $cf::LOADAVG	233	=item $cf::LOADAVG
183		234
184	The current CPU load on the server (alpha-smoothed), as a value between 0	235	The current CPU load on the server (alpha-smoothed), as a value between 0
185	(none) and 1 (overloaded), indicating how much time is spent on processing	236	(none) and 1 (overloaded), indicating how much time is spent on processing
186	objects per tick. Healthy values are < 0.5.	237	objects per tick. Healthy values are < 0.5.
…		…
195	from wherever your confdir points to.	246	from wherever your confdir points to.
196		247
197	=item cf::wait_for_tick, cf::wait_for_tick_begin	248	=item cf::wait_for_tick, cf::wait_for_tick_begin
198		249
199	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	250	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
200	returns directly I<after> the tick processing (and consequently, can only wake one process	251	returns directly I<after> the tick processing (and consequently, can only wake one thread
201	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	252	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
202		253
		254	Note that cf::Wait_for_tick will immediately return when the server is not
		255	ticking, making it suitable for small pauses in threads that need to run
		256	when the server is paused. If that is not applicable (i.e. you I<really>
		257	want to wait, use C<$cf::WAIT_FOR_TICK>).
		258
		259	=item $cf::WAIT_FOR_TICK
		260
		261	Note that C<cf::wait_for_tick> is probably the correct thing to use. This
		262	variable contains a L<Coro::Signal> that is broadcats after every server
		263	tick. Calling C<< ->wait >> on it will suspend the caller until after the
		264	next server tick.
		265
		266	=cut
		267
		268	sub wait_for_tick();
		269	sub wait_for_tick_begin();
		270
203	=item @cf::INVOKE_RESULTS	271	=item @cf::INVOKE_RESULTS
204		272
205	This array contains the results of the last C<invoke ()> call. When	273	This array contains the results of the last C<invoke ()> call. When
206	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of	274	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
207	that call.	275	that call.
208		276
		277	=item %cf::REFLECT
		278
		279	Contains, for each (C++) class name, a hash reference with information
		280	about object members (methods, scalars, arrays and flags) and other
		281	metadata, which is useful for introspection.
		282
209	=back	283	=back
210		284
211	=cut	285	=cut
212		286
213	BEGIN {	287	sub error(@) { LOG llevError, join "", @_ }
214	*CORE::GLOBAL::warn = sub {	288	sub warn (@) { LOG llevWarn , join "", @_ }
		289	sub info (@) { LOG llevInfo , join "", @_ }
		290	sub debug(@) { LOG llevDebug, join "", @_ }
		291	sub trace(@) { LOG llevTrace, join "", @_ }
		292
		293	$Coro::State::WARNHOOK = sub {
215	my $msg = join "", @_;	294	my $msg = join "", @_;
216		295
217	$msg .= "\n"	296	$msg .= "\n"
218	unless $msg =~ /\n$/;	297	unless $msg =~ /\n$/;
219		298
220	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	299	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
221		300
222	LOG llevError, $msg;	301	LOG llevWarn, $msg;
223	};	302	};
224	}
225		303
226	$Coro::State::DIEHOOK = sub {	304	$Coro::State::DIEHOOK = sub {
227	return unless $^S eq 0; # "eq", not "=="	305	return unless $^S eq 0; # "eq", not "=="
228		306
229	if ($Coro::current == $Coro::main) {#d#	307	error Carp::longmess $_[0];
		308
		309	if (in_main) {#d#
230	warn "DIEHOOK called in main context, Coro bug?\n";#d#	310	error "DIEHOOK called in main context, Coro bug?\n";#d#
231	return;#d#	311	return;#d#
232	}#d#	312	}#d#
233		313
234	# kill coroutine otherwise	314	# kill coroutine otherwise
235	warn Carp::longmess $_[0];
236	Coro::terminate	315	Coro::terminate
237	};	316	};
238
239	$SIG{__DIE__} = sub { }; #d#?
240		317
241	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	318	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
242	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	319	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
243	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	320	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
244	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	321	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
…		…
258	)) {	335	)) {
259	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	336	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
260	}	337	}
261		338
262	$EV::DIED = sub {	339	$EV::DIED = sub {
263	warn "error in event callback: @_";	340	Carp::cluck "error in event callback: @_";
264	};	341	};
		342
		343	#############################################################################
		344
		345	sub fork_call(&@);
		346	sub get_slot($;$$);
265		347
266	#############################################################################	348	#############################################################################
267		349
268	=head2 UTILITY FUNCTIONS	350	=head2 UTILITY FUNCTIONS
269		351
…		…
290	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	372	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
291	$d	373	$d
292	} || "[unable to dump $_[0]: '$@']";	374	} || "[unable to dump $_[0]: '$@']";
293	}	375	}
294		376
		377	=item $scalar = cf::load_file $path
		378
		379	Loads the given file from path and returns its contents. Croaks on error
		380	and can block.
		381
		382	=cut
		383
		384	sub load_file($) {
		385	0 <= aio_load $_[0], my $data
		386	or Carp::croak "$_[0]: $!";
		387
		388	$data
		389	}
		390
		391	=item $success = cf::replace_file $path, $data, $sync
		392
		393	Atomically replaces the file at the given $path with new $data, and
		394	optionally $sync the data to disk before replacing the file.
		395
		396	=cut
		397
		398	sub replace_file($$;$) {
		399	my ($path, $data, $sync) = @_;
		400
		401	my $lock = cf::lock_acquire ("replace_file:$path");
		402
		403	my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
		404	or return;
		405
		406	$data = $data->() if ref $data;
		407
		408	length $data == aio_write $fh, 0, (length $data), $data, 0
		409	or return;
		410
		411	!$sync
		412	or !aio_fsync $fh
		413	or return;
		414
		415	aio_close $fh
		416	and return;
		417
		418	aio_rename "$path~", $path
		419	and return;
		420
		421	if ($sync) {
		422	$path =~ s%/[^/]*$%%;
		423	aio_pathsync $path;
		424	}
		425
		426	1
		427	}
		428
295	=item $ref = cf::decode_json $json	429	=item $ref = cf::decode_json $json
296		430
297	Converts a JSON string into the corresponding perl data structure.	431	Converts a JSON string into the corresponding perl data structure.
298		432
299	=item $json = cf::encode_json $ref	433	=item $json = cf::encode_json $ref
…		…
305	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	439	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
306		440
307	sub encode_json($) { $json_coder->encode ($_[0]) }	441	sub encode_json($) { $json_coder->encode ($_[0]) }
308	sub decode_json($) { $json_coder->decode ($_[0]) }	442	sub decode_json($) { $json_coder->decode ($_[0]) }
309		443
		444	=item $ref = cf::decode_storable $scalar
		445
		446	Same as Coro::Storable::thaw, so blocks.
		447
		448	=cut
		449
		450	BEGIN { *decode_storable = \&Coro::Storable::thaw }
		451
		452	=item $ref = cf::decode_yaml $scalar
		453
		454	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
		455
		456	=cut
		457
		458	sub decode_yaml($) {
		459	fork_call { YAML::XS::Load $_[0] } @_
		460	}
		461
		462	=item $scalar = cf::unlzf $scalar
		463
		464	Same as Compress::LZF::compress, but takes server ticks into account, so
		465	blocks.
		466
		467	=cut
		468
		469	sub unlzf($) {
		470	# we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
		471	cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
		472	Compress::LZF::decompress $_[0]
		473	}
		474
		475	=item cf::post_init { BLOCK }
		476
		477	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
		478	but I<before> the server starts ticking again.
		479
		480	The codeblock will have a single boolean argument to indicate whether this
		481	is a reload or not.
		482
		483	=cut
		484
		485	sub post_init(&) {
		486	push @POST_INIT, shift;
		487	}
		488
		489	sub _post_init {
		490	trace "running post_init jobs";
		491
		492	# run them in parallel...
		493
		494	my @join;
		495
		496	while () {
		497	push @join, map &Coro::async ($_, 0), @POST_INIT;
		498	@POST_INIT = ();
		499
		500	@join or last;
		501
		502	(pop @join)->join;
		503	}
		504	}
		505
310	=item cf::lock_wait $string	506	=item cf::lock_wait $string
311		507
312	Wait until the given lock is available. See cf::lock_acquire.	508	Wait until the given lock is available. See cf::lock_acquire.
313		509
314	=item my $lock = cf::lock_acquire $string	510	=item my $lock = cf::lock_acquire $string
315		511
316	Wait until the given lock is available and then acquires it and returns	512	Wait until the given lock is available and then acquires it and returns
317	a Coro::guard object. If the guard object gets destroyed (goes out of scope,	513	a L<Guard> object. If the guard object gets destroyed (goes out of scope,
318	for example when the coroutine gets canceled), the lock is automatically	514	for example when the coroutine gets canceled), the lock is automatically
319	returned.	515	returned.
320		516
321	Locks are *not* recursive, locking from the same coro twice results in a	517	Locks are *not* recursive, locking from the same coro twice results in a
322	deadlocked coro.	518	deadlocked coro.
…		…
328		524
329	Return true if the lock is currently active, i.e. somebody has locked it.	525	Return true if the lock is currently active, i.e. somebody has locked it.
330		526
331	=cut	527	=cut
332		528
333	our %LOCK;	529	our $LOCKS = new Coro::SemaphoreSet;
334	our %LOCKER;#d#
335		530
336	sub lock_wait($) {	531	sub lock_wait($) {
337	my ($key) = @_;	532	$LOCKS->wait ($_[0]);
338
339	if ($LOCKER{$key} == $Coro::current) {#d#
340	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
341	return;#d#
342	}#d#
343
344	# wait for lock, if any
345	while ($LOCK{$key}) {
346	#local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
347	push @{ $LOCK{$key} }, $Coro::current;
348	Coro::schedule;
349	}
350	}	533	}
351		534
352	sub lock_acquire($) {	535	sub lock_acquire($) {
353	my ($key) = @_;	536	$LOCKS->guard ($_[0])
354
355	# wait, to be sure we are not locked
356	lock_wait $key;
357
358	$LOCK{$key} = [];
359	$LOCKER{$key} = $Coro::current;#d#
360
361	Coro::guard {
362	delete $LOCKER{$key};#d#
363	# wake up all waiters, to be on the safe side
364	$_->ready for @{ delete $LOCK{$key} };
365	}
366	}	537	}
367		538
368	sub lock_active($) {	539	sub lock_active($) {
369	my ($key) = @_;	540	$LOCKS->count ($_[0]) < 1
370
371	! ! $LOCK{$key}
372	}	541	}
373		542
374	sub freeze_mainloop {	543	sub freeze_mainloop {
375	tick_inhibit_inc;	544	tick_inhibit_inc;
376		545
377	Coro::guard \&tick_inhibit_dec;	546	&Guard::guard (\&tick_inhibit_dec);
378	}	547	}
379		548
380	=item cf::periodic $interval, $cb	549	=item cf::periodic $interval, $cb
381		550
382	Like EV::periodic, but randomly selects a starting point so that the actions	551	Like EV::periodic, but randomly selects a starting point so that the actions
383	get spread over timer.	552	get spread over time.
384		553
385	=cut	554	=cut
386		555
387	sub periodic($$) {	556	sub periodic($$) {
388	my ($interval, $cb) = @_;	557	my ($interval, $cb) = @_;
…		…
392	EV::periodic $start, $interval, 0, $cb	561	EV::periodic $start, $interval, 0, $cb
393	}	562	}
394		563
395	=item cf::get_slot $time[, $priority[, $name]]	564	=item cf::get_slot $time[, $priority[, $name]]
396		565
397	Allocate $time seconds of blocking CPU time at priority C<$priority>:	566	Allocate $time seconds of blocking CPU time at priority C<$priority>
398	This call blocks and returns only when you have at least C<$time> seconds	567	(default: 0): This call blocks and returns only when you have at least
399	of cpu time till the next tick. The slot is only valid till the next cede.	568	C<$time> seconds of cpu time till the next tick. The slot is only valid
		569	till the next cede.
		570
		571	Background jobs should use a priority les than zero, interactive jobs
		572	should use 100 or more.
400		573
401	The optional C<$name> can be used to identify the job to run. It might be	574	The optional C<$name> can be used to identify the job to run. It might be
402	used for statistical purposes and should identify the same time-class.	575	used for statistical purposes and should identify the same time-class.
403		576
404	Useful for short background jobs.	577	Useful for short background jobs.
405		578
406	=cut	579	=cut
407		580
408	our @SLOT_QUEUE;	581	our @SLOT_QUEUE;
409	our $SLOT_QUEUE;	582	our $SLOT_QUEUE;
		583	our $SLOT_DECAY = 0.9;
410		584
411	$SLOT_QUEUE->cancel if $SLOT_QUEUE;	585	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
412	$SLOT_QUEUE = Coro::async {	586	$SLOT_QUEUE = Coro::async {
413	$Coro::current->desc ("timeslot manager");	587	$Coro::current->desc ("timeslot manager");
414		588
415	my $signal = new Coro::Signal;	589	my $signal = new Coro::Signal;
		590	my $busy;
416		591
417	while () {	592	while () {
418	next_job:	593	next_job:
		594
419	my $avail = cf::till_tick;	595	my $avail = cf::till_tick;
420	if ($avail > 0.01) {	596
421	for (0 .. $#SLOT_QUEUE) {	597	for (0 .. $#SLOT_QUEUE) {
422	if ($SLOT_QUEUE[$_][0] < $avail) {	598	if ($SLOT_QUEUE[$_][0] <= $avail) {
		599	$busy = 0;
423	my $job = splice @SLOT_QUEUE, $_, 1, ();	600	my $job = splice @SLOT_QUEUE, $_, 1, ();
424	$job->[2]->send;	601	$job->[2]->send;
425	Coro::cede;	602	Coro::cede;
426	goto next_job;	603	goto next_job;
427	}	604	} else {
		605	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
428	}	606	}
429	}	607	}
430		608
431	if (@SLOT_QUEUE) {	609	if (@SLOT_QUEUE) {
432	# we do not use wait_for_tick() as it returns immediately when tick is inactive	610	# we do not use wait_for_tick() as it returns immediately when tick is inactive
433	push @cf::WAIT_FOR_TICK, $signal;	611	$WAIT_FOR_TICK->wait;
434	$signal->wait;
435	} else {	612	} else {
		613	$busy = 0;
436	Coro::schedule;	614	Coro::schedule;
437	}	615	}
438	}	616	}
439	};	617	};
440		618
441	sub get_slot($;$$) {	619	sub get_slot($;$$) {
442	return if tick_inhibit || $Coro::current == $Coro::main;	620	return if tick_inhibit || $Coro::current == $Coro::main;
443		621
444	my ($time, $pri, $name) = @_;	622	my ($time, $pri, $name) = @_;
445		623
446	$time = $TICK * .6 if $time > $TICK * .6;	624	$time = clamp $time, 0.01, $TICK * .6;
		625
447	my $sig = new Coro::Signal;	626	my $sig = new Coro::Signal;
448		627
449	push @SLOT_QUEUE, [$time, $pri, $sig, $name];	628	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
450	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;	629	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
451	$SLOT_QUEUE->ready;	630	$SLOT_QUEUE->ready;
…		…
477	=cut	656	=cut
478		657
479	sub sync_job(&) {	658	sub sync_job(&) {
480	my ($job) = @_;	659	my ($job) = @_;
481		660
482	if ($Coro::current == $Coro::main) {	661	if (in_main) {
483	my $time = EV::time;	662	my $time = AE::time;
484		663
485	# this is the main coro, too bad, we have to block	664	# this is the main coro, too bad, we have to block
486	# till the operation succeeds, freezing the server :/	665	# till the operation succeeds, freezing the server :/
487		666
488	LOG llevError, Carp::longmess "sync job";#d#	667	#LOG llevError, Carp::longmess "sync job";#d#
489		668
490	my $freeze_guard = freeze_mainloop;	669	my $freeze_guard = freeze_mainloop;
491		670
492	my $busy = 1;	671	my $busy = 1;
493	my @res;	672	my @res;
494		673
495	(async {	674	(async {
496	$Coro::current->desc ("sync job coro");	675	$Coro::current->desc ("sync job coro");
497	@res = eval { $job->() };	676	@res = eval { $job->() };
498	warn $@ if $@;	677	error $@ if $@;
499	undef $busy;	678	undef $busy;
500	})->prio (Coro::PRIO_MAX);	679	})->prio (Coro::PRIO_MAX);
501		680
502	while ($busy) {	681	while ($busy) {
503	if (Coro::nready) {	682	if (Coro::nready) {
…		…
505	} else {	684	} else {
506	EV::loop EV::LOOP_ONESHOT;	685	EV::loop EV::LOOP_ONESHOT;
507	}	686	}
508	}	687	}
509		688
510	my $time = EV::time - $time;	689	my $time = AE::time - $time;
511		690
512	$TICK_START += $time; # do not account sync jobs to server load	691	$TICK_START += $time; # do not account sync jobs to server load
513		692
514	wantarray ? @res : $res[0]	693	wantarray ? @res : $res[0]
515	} else {	694	} else {
…		…
537	$EXT_CORO{$coro+0} = $coro;	716	$EXT_CORO{$coro+0} = $coro;
538		717
539	$coro	718	$coro
540	}	719	}
541		720
542	=item fork_call { }, $args	721	=item fork_call { }, @args
543		722
544	Executes the given code block with the given arguments in a seperate	723	Executes the given code block with the given arguments in a seperate
545	process, returning the results. Everything must be serialisable with	724	process, returning the results. Everything must be serialisable with
546	Coro::Storable. May, of course, block. Note that the executed sub may	725	Coro::Storable. May, of course, block. Note that the executed sub may
547	never block itself or use any form of event handling.	726	never block itself or use any form of event handling.
548		727
549	=cut	728	=cut
550		729
		730	sub post_fork {
		731	reset_signals;
		732	}
		733
551	sub fork_call(&@) {	734	sub fork_call(&@) {
552	my ($cb, @args) = @_;	735	my ($cb, @args) = @_;
553		736
554	# we seemingly have to make a local copy of the whole thing,	737	# we seemingly have to make a local copy of the whole thing,
555	# otherwise perl prematurely frees the stuff :/	738	# otherwise perl prematurely frees the stuff :/
556	# TODO: investigate and fix (likely this will be rather laborious)	739	# TODO: investigate and fix (likely this will be rather laborious)
557		740
558	my @res = Coro::Util::fork_eval {	741	my @res = Coro::Util::fork_eval {
559	reset_signals;	742	cf::post_fork;
560	&$cb	743	&$cb
561	}, @args;	744	} @args;
562		745
563	wantarray ? @res : $res[-1]	746	wantarray ? @res : $res[-1]
		747	}
		748
		749	sub objinfo {
		750	(
		751	"counter value" => cf::object::object_count,
		752	"objects created" => cf::object::create_count,
		753	"objects destroyed" => cf::object::destroy_count,
		754	"freelist size" => cf::object::free_count,
		755	"allocated objects" => cf::object::objects_size,
		756	"active objects" => cf::object::actives_size,
		757	)
564	}	758	}
565		759
566	=item $coin = coin_from_name $name	760	=item $coin = coin_from_name $name
567		761
568	=cut	762	=cut
…		…
605	within each server.	799	within each server.
606		800
607	=cut	801	=cut
608		802
609	sub db_table($) {	803	sub db_table($) {
		804	cf::error "db_get called from main context"
		805	if $Coro::current == $Coro::main;
		806
610	my ($name) = @_;	807	my ($name) = @_;
611	my $db = BDB::db_create $DB_ENV;	808	my $db = BDB::db_create $DB_ENV;
612		809
613	eval {	810	eval {
614	$db->set_flags (BDB::CHKSUM);	811	$db->set_flags (BDB::CHKSUM);
…		…
624	}	821	}
625		822
626	our $DB;	823	our $DB;
627		824
628	sub db_init {	825	sub db_init {
629	cf::sync_job {
630	$DB ||= db_table "db";	826	$DB ||= db_table "db";
631	};
632	}	827	}
633		828
634	sub db_get($$) {	829	sub db_get($$) {
635	my $key = "$_[0]/$_[1]";	830	my $key = "$_[0]/$_[1]";
636		831
637	cf::sync_job {	832	cf::error "db_get called from main context"
		833	if $Coro::current == $Coro::main;
		834
638	BDB::db_get $DB, undef, $key, my $data;	835	BDB::db_get $DB, undef, $key, my $data;
639		836
640	$! ? ()	837	$! ? ()
641	: $data	838	: $data
642	}
643	}	839	}
644		840
645	sub db_put($$$) {	841	sub db_put($$$) {
646	BDB::dbreq_pri 4;	842	BDB::dbreq_pri 4;
647	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	843	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
675		871
676	my @data;	872	my @data;
677	my $md5;	873	my $md5;
678		874
679	for (0 .. $#$src) {	875	for (0 .. $#$src) {
680	0 <= aio_load $src->[$_], $data[$_]	876	$data[$_] = load_file $src->[$_];
681	or Carp::croak "$src->[$_]: $!";
682	}	877	}
683		878
684	# if processing is expensive, check	879	# if processing is expensive, check
685	# checksum first	880	# checksum first
686	if (1) {	881	if (1) {
…		…
703		898
704	my $t1 = Time::HiRes::time;	899	my $t1 = Time::HiRes::time;
705	my $data = $process->(\@data);	900	my $data = $process->(\@data);
706	my $t2 = Time::HiRes::time;	901	my $t2 = Time::HiRes::time;
707		902
708	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	903	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
709		904
710	db_put cache => "$id/data", $data;	905	db_put cache => "$id/data", $data;
711	db_put cache => "$id/md5" , $md5;	906	db_put cache => "$id/md5" , $md5;
712	db_put cache => "$id/meta", $meta;	907	db_put cache => "$id/meta", $meta;
713		908
…		…
723		918
724	=cut	919	=cut
725		920
726	sub datalog($@) {	921	sub datalog($@) {
727	my ($type, %kv) = @_;	922	my ($type, %kv) = @_;
728	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	923	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
729	}	924	}
730		925
731	=back	926	=back
732		927
733	=cut	928	=cut
…		…
928		1123
929	} elsif (exists $cb_id{$type}) {	1124	} elsif (exists $cb_id{$type}) {
930	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	1125	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
931		1126
932	} elsif (ref $type) {	1127	} elsif (ref $type) {
933	warn "attaching objects not supported, ignoring.\n";	1128	error "attaching objects not supported, ignoring.\n";
934		1129
935	} else {	1130	} else {
936	shift @arg;	1131	shift @arg;
937	warn "attach argument '$type' not supported, ignoring.\n";	1132	error "attach argument '$type' not supported, ignoring.\n";
938	}	1133	}
939	}	1134	}
940	}	1135	}
941		1136
942	sub _object_attach {	1137	sub _object_attach {
…		…
952	_attach $registry, $klass, @attach;	1147	_attach $registry, $klass, @attach;
953	}	1148	}
954		1149
955	$obj->{$name} = \%arg;	1150	$obj->{$name} = \%arg;
956	} else {	1151	} else {
957	warn "object uses attachment '$name' which is not available, postponing.\n";	1152	info "object uses attachment '$name' which is not available, postponing.\n";
958	}	1153	}
959		1154
960	$obj->{_attachment}{$name} = undef;	1155	$obj->{_attachment}{$name} = undef;
961	}	1156	}
962		1157
…		…
1021		1216
1022	for (@$callbacks) {	1217	for (@$callbacks) {
1023	eval { &{$_->[1]} };	1218	eval { &{$_->[1]} };
1024		1219
1025	if ($@) {	1220	if ($@) {
1026	warn "$@";
1027	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1221	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1028	override;	1222	override;
1029	}	1223	}
1030		1224
1031	return 1 if $override;	1225	return 1 if $override;
1032	}	1226	}
…		…
1111	for (@$attach) {	1305	for (@$attach) {
1112	my ($klass, @attach) = @$_;	1306	my ($klass, @attach) = @$_;
1113	_attach $registry, $klass, @attach;	1307	_attach $registry, $klass, @attach;
1114	}	1308	}
1115	} else {	1309	} else {
1116	warn "object uses attachment '$name' that is not available, postponing.\n";	1310	info "object uses attachment '$name' that is not available, postponing.\n";
1117	}	1311	}
1118	}	1312	}
1119	}	1313	}
1120		1314
1121	cf::attachable->attach (	1315	cf::attachable->attach (
…		…
1148	my ($filename, $rdata, $objs) = @_;	1342	my ($filename, $rdata, $objs) = @_;
1149		1343
1150	sync_job {	1344	sync_job {
1151	if (length $$rdata) {	1345	if (length $$rdata) {
1152	utf8::decode (my $decname = $filename);	1346	utf8::decode (my $decname = $filename);
1153	warn sprintf "saving %s (%d,%d)\n",	1347	trace sprintf "saving %s (%d,%d)\n",
1154	$decname, length $$rdata, scalar @$objs;	1348	$decname, length $$rdata, scalar @$objs
		1349	if $VERBOSE_IO;
1155		1350
1156	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1351	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1157	aio_chmod $fh, SAVE_MODE;	1352	aio_chmod $fh, SAVE_MODE;
1158	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1353	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1159	aio_fsync $fh if $cf::USE_FSYNC;	1354	if ($cf::USE_FSYNC) {
		1355	aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
		1356	aio_fsync $fh;
		1357	}
1160	aio_close $fh;	1358	aio_close $fh;
1161		1359
1162	if (@$objs) {	1360	if (@$objs) {
1163	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {	1361	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1164	aio_chmod $fh, SAVE_MODE;	1362	aio_chmod $fh, SAVE_MODE;
1165	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };	1363	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1166	aio_write $fh, 0, (length $data), $data, 0;	1364	aio_write $fh, 0, (length $data), $data, 0;
1167	aio_fsync $fh if $cf::USE_FSYNC;	1365	if ($cf::USE_FSYNC) {
		1366	aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
		1367	aio_fsync $fh;
		1368	}
1168	aio_close $fh;	1369	aio_close $fh;
1169	aio_rename "$filename.pst~", "$filename.pst";	1370	aio_rename "$filename.pst~", "$filename.pst";
1170	}	1371	}
1171	} else {	1372	} else {
1172	aio_unlink "$filename.pst";	1373	aio_unlink "$filename.pst";
1173	}	1374	}
1174		1375
1175	aio_rename "$filename~", $filename;	1376	aio_rename "$filename~", $filename;
		1377
		1378	$filename =~ s%/[^/]+$%%;
		1379	aio_pathsync $filename if $cf::USE_FSYNC;
1176	} else {	1380	} else {
1177	warn "FATAL: $filename~: $!\n";	1381	error "unable to save objects: $filename~: $!\n";
1178	}	1382	}
1179	} else {	1383	} else {
1180	aio_unlink $filename;	1384	aio_unlink $filename;
1181	aio_unlink "$filename.pst";	1385	aio_unlink "$filename.pst";
1182	}	1386	}
…		…
1206	my $st = eval { Coro::Storable::thaw $av };	1410	my $st = eval { Coro::Storable::thaw $av };
1207	$av = $st->{objs};	1411	$av = $st->{objs};
1208	}	1412	}
1209		1413
1210	utf8::decode (my $decname = $filename);	1414	utf8::decode (my $decname = $filename);
1211	warn sprintf "loading %s (%d,%d)\n",	1415	trace sprintf "loading %s (%d,%d)\n",
1212	$decname, length $data, scalar @{$av || []};	1416	$decname, length $data, scalar @{$av || []}
		1417	if $VERBOSE_IO;
1213		1418
1214	($data, $av)	1419	($data, $av)
1215	}	1420	}
1216		1421
1217	=head2 COMMAND CALLBACKS	1422	=head2 COMMAND CALLBACKS
…		…
1273	my ($name, $cb) = @_;	1478	my ($name, $cb) = @_;
1274		1479
1275	$EXTICMD{$name} = $cb;	1480	$EXTICMD{$name} = $cb;
1276	}	1481	}
1277		1482
		1483	use File::Glob ();
		1484
1278	cf::player->attach (	1485	cf::player->attach (
1279	on_command => sub {	1486	on_unknown_command => sub {
1280	my ($pl, $name, $params) = @_;	1487	my ($pl, $name, $params) = @_;
1281		1488
1282	my $cb = $COMMAND{$name}	1489	my $cb = $COMMAND{$name}
1283	or return;	1490	or return;
1284		1491
…		…
1292	my ($pl, $buf) = @_;	1499	my ($pl, $buf) = @_;
1293		1500
1294	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1501	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1295		1502
1296	if (ref $msg) {	1503	if (ref $msg) {
1297	my ($type, $reply, @payload) =	1504	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1298	"ARRAY" eq ref $msg
1299	? @$msg
1300	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1301		1505
1302	my @reply;	1506	my @reply;
1303		1507
1304	if (my $cb = $EXTCMD{$type}) {	1508	if (my $cb = $EXTCMD{$type}) {
1305	@reply = $cb->($pl, @payload);	1509	@reply = $cb->($pl, @payload);
…		…
1307		1511
1308	$pl->ext_reply ($reply, @reply)	1512	$pl->ext_reply ($reply, @reply)
1309	if $reply;	1513	if $reply;
1310		1514
1311	} else {	1515	} else {
1312	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1516	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1313	}	1517	}
1314		1518
1315	cf::override;	1519	cf::override;
1316	},	1520	},
1317	);	1521	);
1318		1522
		1523	# "readahead" all extensions
		1524	sub cache_extensions {
		1525	my $grp = IO::AIO::aio_group;
		1526
		1527	add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
		1528	for (grep /\.ext$/, @{$_[0]}) {
		1529	add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
		1530	}
		1531	};
		1532
		1533	$grp
		1534	}
		1535
1319	sub load_extensions {	1536	sub load_extensions {
		1537	info "loading extensions...";
		1538
1320	cf::sync_job {	1539	cf::sync_job {
1321	my %todo;	1540	my %todo;
1322		1541
1323	for my $path (<$LIBDIR/*.ext>) {	1542	for my $path (<$LIBDIR/*.ext>) {
1324	next unless -r $path;	1543	next unless -r $path;
…		…
1342		1561
1343	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1562	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1344	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1563	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1345		1564
1346	$ext{source} =	1565	$ext{source} =
1347	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1566	"package $pkg; use common::sense;\n"
1348	. "#line 1 \"$path\"\n{\n"	1567	. "#line 1 \"$path\"\n{\n"
1349	. $source	1568	. $source
1350	. "\n};\n1";	1569	. "\n};\n1";
1351		1570
1352	$todo{$base} = \%ext;	1571	$todo{$base} = \%ext;
1353	}	1572	}
1354		1573
		1574	my $pass = 0;
1355	my %done;	1575	my %done;
1356	while (%todo) {	1576	while (%todo) {
1357	my $progress;	1577	my $progress;
1358		1578
		1579	++$pass;
		1580
		1581	ext:
1359	while (my ($k, $v) = each %todo) {	1582	while (my ($k, $v) = each %todo) {
1360	for (split /,\s*/, $v->{meta}{depends}) {	1583	for (split /,\s*/, $v->{meta}{depends}) {
1361	goto skip	1584	next ext
1362	unless exists $done{$_};	1585	unless exists $done{$_};
1363	}	1586	}
1364		1587
1365	warn "... loading '$k' into '$v->{pkg}'\n";	1588	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1366		1589
1367	unless (eval $v->{source}) {	1590	my $active = eval $v->{source};
		1591
		1592	if (length $@) {
1368	my $msg = $@ ? "$v->{path}: $@\n"	1593	error "$v->{path}: $@\n";
1369	: "$v->{base}: extension inactive.\n";
1370		1594
1371	if (exists $v->{meta}{mandatory}) {
1372	warn $msg;
1373	cf::cleanup "mandatory extension failed to load, exiting.";	1595	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1374	}	1596	if exists $v->{meta}{mandatory};
1375		1597
1376	warn $msg;	1598	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
		1599	delete $todo{$k};
		1600	} else {
		1601	$done{$k} = delete $todo{$k};
		1602	push @EXTS, $v->{pkg};
		1603	$progress = 1;
		1604
		1605	info "$v->{base}: extension inactive.\n"
		1606	unless $active;
1377	}	1607	}
1378
1379	$done{$k} = delete $todo{$k};
1380	push @EXTS, $v->{pkg};
1381	$progress = 1;
1382	}	1608	}
1383		1609
1384	skip:	1610	unless ($progress) {
1385	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"	1611	warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1386	unless $progress;	1612
		1613	while (my ($k, $v) = each %todo) {
		1614	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
		1615	if exists $v->{meta}{mandatory};
		1616	}
		1617
		1618	last;
		1619	}
1387	}	1620	}
1388	};	1621	};
1389	}	1622	}
1390		1623
1391	#############################################################################	1624	#############################################################################
…		…
1445		1678
1446	sub exists($) {	1679	sub exists($) {
1447	my ($login) = @_;	1680	my ($login) = @_;
1448		1681
1449	$cf::PLAYER{$login}	1682	$cf::PLAYER{$login}
1450	or cf::sync_job { !aio_stat path $login }	1683	or !aio_stat path $login
1451	}	1684	}
1452		1685
1453	sub find($) {	1686	sub find($) {
1454	return $cf::PLAYER{$_[0]} || do {	1687	return $cf::PLAYER{$_[0]} || do {
1455	my $login = $_[0];	1688	my $login = $_[0];
…		…
1475	$cf::PLAYER{$login} = $pl	1708	$cf::PLAYER{$login} = $pl
1476	}	1709	}
1477	}	1710	}
1478	}	1711	}
1479		1712
		1713	cf::player->attach (
		1714	on_load => sub {
		1715	my ($pl, $path) = @_;
		1716
		1717	# restore slots saved in save, below
		1718	my $slots = delete $pl->{_slots};
		1719
		1720	$pl->ob->current_weapon ($slots->[0]);
		1721	$pl->combat_ob ($slots->[1]);
		1722	$pl->ranged_ob ($slots->[2]);
		1723	},
		1724	);
		1725
1480	sub save($) {	1726	sub save($) {
1481	my ($pl) = @_;	1727	my ($pl) = @_;
1482		1728
1483	return if $pl->{deny_save};	1729	return if $pl->{deny_save};
1484		1730
…		…
1489		1735
1490	aio_mkdir playerdir $pl, 0770;	1736	aio_mkdir playerdir $pl, 0770;
1491	$pl->{last_save} = $cf::RUNTIME;	1737	$pl->{last_save} = $cf::RUNTIME;
1492		1738
1493	cf::get_slot 0.01;	1739	cf::get_slot 0.01;
		1740
		1741	# save slots, to be restored later
		1742	local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1494		1743
1495	$pl->save_pl ($path);	1744	$pl->save_pl ($path);
1496	cf::cede_to_tick;	1745	cf::cede_to_tick;
1497	}	1746	}
1498		1747
…		…
1532	my $name = $pl->ob->name;	1781	my $name = $pl->ob->name;
1533		1782
1534	$pl->{deny_save} = 1;	1783	$pl->{deny_save} = 1;
1535	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1784	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1536		1785
1537	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1786	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1538	$pl->deactivate;	1787	$pl->deactivate;
		1788
1539	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1789	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1540	$pl->ob->check_score;
1541	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1790	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1791	ext::highscore::check ($pl->ob);
		1792
1542	$pl->ns->destroy if $pl->ns;	1793	$pl->ns->destroy if $pl->ns;
1543		1794
1544	my $path = playerdir $pl;	1795	my $path = playerdir $pl;
1545	my $temp = "$path~$cf::RUNTIME~deleting~";	1796	my $temp = "$path~$cf::RUNTIME~deleting~";
1546	aio_rename $path, $temp;	1797	aio_rename $path, $temp;
…		…
1600	\@logins	1851	\@logins
1601	}	1852	}
1602		1853
1603	=item $player->maps	1854	=item $player->maps
1604		1855
		1856	=item cf::player::maps $login
		1857
1605	Returns an arrayref of map paths that are private for this	1858	Returns an arrayref of map paths that are private for this
1606	player. May block.	1859	player. May block.
1607		1860
1608	=cut	1861	=cut
1609		1862
…		…
1671	=cut	1924	=cut
1672		1925
1673	sub find_by_path($) {	1926	sub find_by_path($) {
1674	my ($path) = @_;	1927	my ($path) = @_;
1675		1928
		1929	$path =~ s/^~[^\/]*//; # skip ~login
		1930
1676	my ($match, $specificity);	1931	my ($match, $specificity);
1677		1932
1678	for my $region (list) {	1933	for my $region (list) {
1679	if ($region->{match} && $path =~ $region->{match}) {	1934	if ($region->{match} && $path =~ $region->{match}) {
1680	($match, $specificity) = ($region, $region->specificity)	1935	($match, $specificity) = ($region, $region->specificity)
…		…
1708	sub generate_random_map {	1963	sub generate_random_map {
1709	my ($self, $rmp) = @_;	1964	my ($self, $rmp) = @_;
1710		1965
1711	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	1966	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1712		1967
1713	# mit "rum" bekleckern, nicht
1714	$self->_create_random_map (	1968	$self->_create_random_map ($rmp);
1715	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1716	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1717	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1718	$rmp->{exit_on_final_map},
1719	$rmp->{xsize}, $rmp->{ysize},
1720	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1721	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1722	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1723	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1724	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1725	(cf::region::find $rmp->{region}), $rmp->{custom}
1726	)
1727	}	1969	}
1728		1970
1729	=item cf::map->register ($regex, $prio)	1971	=item cf::map->register ($regex, $prio)
1730		1972
1731	Register a handler for the map path matching the given regex at the	1973	Register a handler for the map path matching the given regex at the
…		…
1736		1978
1737	sub register {	1979	sub register {
1738	my (undef, $regex, $prio) = @_;	1980	my (undef, $regex, $prio) = @_;
1739	my $pkg = caller;	1981	my $pkg = caller;
1740		1982
1741	no strict;
1742	push @{"$pkg\::ISA"}, __PACKAGE__;	1983	push @{"$pkg\::ISA"}, __PACKAGE__;
1743		1984
1744	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	1985	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1745	}	1986	}
1746		1987
1747	# also paths starting with '/'	1988	# also paths starting with '/'
1748	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	1989	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1749		1990
1750	sub thawer_merge {	1991	sub thawer_merge {
1751	my ($self, $merge) = @_;	1992	my ($self, $merge) = @_;
1752		1993
1753	# we have to keep some variables in memory intact	1994	# we have to keep some variables in memory intact
…		…
1758	}	1999	}
1759		2000
1760	sub normalise {	2001	sub normalise {
1761	my ($path, $base) = @_;	2002	my ($path, $base) = @_;
1762		2003
1763	$path = "$path"; # make sure its a string	2004	$path = "$path"; # make sure it's a string
1764		2005
1765	$path =~ s/\.map$//;	2006	$path =~ s/\.map$//;
1766		2007
1767	# map plan:	2008	# map plan:
1768	#	2009	#
…		…
1783	$base =~ s{[^/]+/?$}{};	2024	$base =~ s{[^/]+/?$}{};
1784	$path = "$base/$path";	2025	$path = "$base/$path";
1785	}	2026	}
1786		2027
1787	for ($path) {	2028	for ($path) {
1788	redo if s{//}{/};
1789	redo if s{/\.?/}{/};	2029	redo if s{/\.?/}{/};
1790	redo if s{/[^/]+/\.\./}{/};	2030	redo if s{/[^/]+/\.\./}{/};
1791	}	2031	}
1792		2032
1793	$path	2033	$path
…		…
1807	$self->init; # pass $1 etc.	2047	$self->init; # pass $1 etc.
1808	return $self;	2048	return $self;
1809	}	2049	}
1810	}	2050	}
1811		2051
1812	Carp::cluck "unable to resolve path '$path' (base '$base').";	2052	Carp::cluck "unable to resolve path '$path' (base '$base')";
1813	()	2053	()
1814	}	2054	}
1815		2055
		2056	# may re-bless or do other evil things
1816	sub init {	2057	sub init {
1817	my ($self) = @_;	2058	my ($self) = @_;
1818		2059
1819	$self	2060	$self
1820	}	2061	}
…		…
1851		2092
1852	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;	2093	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1853	"$UNIQUEDIR/$path"	2094	"$UNIQUEDIR/$path"
1854	}	2095	}
1855		2096
1856	# and all this just because we cannot iterate over
1857	# all maps in C++...
1858	sub change_all_map_light {
1859	my ($change) = @_;
1860
1861	$_->change_map_light ($change)
1862	for grep $_->outdoor, values %cf::MAP;
1863	}
1864
1865	sub decay_objects {	2097	sub decay_objects {
1866	my ($self) = @_;	2098	my ($self) = @_;
1867		2099
1868	return if $self->{deny_reset};	2100	return if $self->{deny_reset};
1869		2101
…		…
1894	$self->{load_path} = $path;	2126	$self->{load_path} = $path;
1895		2127
1896	1	2128	1
1897	}	2129	}
1898		2130
		2131	# used to laod the header of an original map
1899	sub load_header_orig {	2132	sub load_header_orig {
1900	my ($self) = @_;	2133	my ($self) = @_;
1901		2134
1902	$self->load_header_from ($self->load_path)	2135	$self->load_header_from ($self->load_path)
1903	}	2136	}
1904		2137
		2138	# used to laod the header of an instantiated map
1905	sub load_header_temp {	2139	sub load_header_temp {
1906	my ($self) = @_;	2140	my ($self) = @_;
1907		2141
1908	$self->load_header_from ($self->save_path)	2142	$self->load_header_from ($self->save_path)
1909	}	2143	}
1910		2144
		2145	# called after loading the header from an instantiated map
1911	sub prepare_temp {	2146	sub prepare_temp {
1912	my ($self) = @_;	2147	my ($self) = @_;
1913		2148
1914	$self->last_access ((delete $self->{last_access})	2149	$self->last_access ((delete $self->{last_access})
1915	|| $cf::RUNTIME); #d#	2150	|| $cf::RUNTIME); #d#
1916	# safety	2151	# safety
1917	$self->{instantiate_time} = $cf::RUNTIME	2152	$self->{instantiate_time} = $cf::RUNTIME
1918	if $self->{instantiate_time} > $cf::RUNTIME;	2153	if $self->{instantiate_time} > $cf::RUNTIME;
1919	}	2154	}
1920		2155
		2156	# called after loading the header from an original map
1921	sub prepare_orig {	2157	sub prepare_orig {
1922	my ($self) = @_;	2158	my ($self) = @_;
1923		2159
1924	$self->{load_original} = 1;	2160	$self->{load_original} = 1;
1925	$self->{instantiate_time} = $cf::RUNTIME;	2161	$self->{instantiate_time} = $cf::RUNTIME;
…		…
1949		2185
1950	sub find;	2186	sub find;
1951	sub find {	2187	sub find {
1952	my ($path, $origin) = @_;	2188	my ($path, $origin) = @_;
1953		2189
		2190	cf::cede_to_tick;
		2191
1954	$path = normalise $path, $origin && $origin->path;	2192	$path = normalise $path, $origin;
1955		2193
1956	cf::lock_wait "map_data:$path";#d#remove	2194	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1957	cf::lock_wait "map_find:$path";	2195	my $guard2 = cf::lock_acquire "map_find:$path";
1958		2196
1959	$cf::MAP{$path} || do {	2197	$cf::MAP{$path} || do {
1960	my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1961	my $guard2 = cf::lock_acquire "map_find:$path";
1962
1963	my $map = new_from_path cf::map $path	2198	my $map = new_from_path cf::map $path
1964	or return;	2199	or return;
1965		2200
1966	$map->{last_save} = $cf::RUNTIME;	2201	$map->{last_save} = $cf::RUNTIME;
1967		2202
…		…
1979		2214
1980	$cf::MAP{$path} = $map	2215	$cf::MAP{$path} = $map
1981	}	2216	}
1982	}	2217	}
1983		2218
1984	sub pre_load { }	2219	sub pre_load { }
1985	sub post_load { }	2220	#sub post_load { } # XS
1986		2221
1987	sub load {	2222	sub load {
1988	my ($self) = @_;	2223	my ($self) = @_;
1989		2224
1990	local $self->{deny_reset} = 1; # loading can take a long time	2225	local $self->{deny_reset} = 1; # loading can take a long time
…		…
1993		2228
1994	{	2229	{
1995	my $guard = cf::lock_acquire "map_data:$path";	2230	my $guard = cf::lock_acquire "map_data:$path";
1996		2231
1997	return unless $self->valid;	2232	return unless $self->valid;
1998	return unless $self->in_memory == cf::MAP_SWAPPED;	2233	return unless $self->state == cf::MAP_SWAPPED;
1999
2000	$self->in_memory (cf::MAP_LOADING);
2001		2234
2002	$self->alloc;	2235	$self->alloc;
2003		2236
2004	$self->pre_load;	2237	$self->pre_load;
2005	cf::cede_to_tick;	2238	cf::cede_to_tick;
2006		2239
		2240	if (exists $self->{load_path}) {
2007	my $f = new_from_file cf::object::thawer $self->{load_path};	2241	my $f = new_from_file cf::object::thawer $self->{load_path};
2008	$f->skip_block;	2242	$f->skip_block;
2009	$self->_load_objects ($f)	2243	$self->_load_objects ($f)
2010	or return;	2244	or return;
2011		2245
2012	$self->post_load_original	2246	$self->post_load_original
2013	if delete $self->{load_original};	2247	if delete $self->{load_original};
2014		2248
2015	if (my $uniq = $self->uniq_path) {	2249	if (my $uniq = $self->uniq_path) {
2016	utf8::encode $uniq;	2250	utf8::encode $uniq;
2017	unless (aio_stat $uniq) {	2251	unless (aio_stat $uniq) {
2018	if (my $f = new_from_file cf::object::thawer $uniq) {	2252	if (my $f = new_from_file cf::object::thawer $uniq) {
2019	$self->clear_unique_items;	2253	$self->clear_unique_items;
2020	$self->_load_objects ($f);	2254	$self->_load_objects ($f);
2021	$f->resolve_delayed_derefs;	2255	$f->resolve_delayed_derefs;
		2256	}
2022	}	2257	}
2023	}	2258	}
2024	}
2025		2259
2026	$f->resolve_delayed_derefs;	2260	$f->resolve_delayed_derefs;
		2261	} else {
		2262	$self->post_load_original
		2263	if delete $self->{load_original};
		2264	}
		2265
		2266	$self->state (cf::MAP_INACTIVE);
2027		2267
2028	cf::cede_to_tick;	2268	cf::cede_to_tick;
2029	# now do the right thing for maps	2269	# now do the right thing for maps
2030	$self->link_multipart_objects;	2270	$self->link_multipart_objects;
2031	$self->difficulty ($self->estimate_difficulty)	2271	$self->difficulty ($self->estimate_difficulty)
…		…
2035	unless ($self->{deny_activate}) {	2275	unless ($self->{deny_activate}) {
2036	$self->decay_objects;	2276	$self->decay_objects;
2037	$self->fix_auto_apply;	2277	$self->fix_auto_apply;
2038	$self->update_buttons;	2278	$self->update_buttons;
2039	cf::cede_to_tick;	2279	cf::cede_to_tick;
2040	$self->set_darkness_map;	2280	#$self->activate; # no longer activate maps automatically
2041	cf::cede_to_tick;
2042	$self->activate;
2043	}	2281	}
2044		2282
2045	$self->{last_save} = $cf::RUNTIME;	2283	$self->{last_save} = $cf::RUNTIME;
2046	$self->last_access ($cf::RUNTIME);	2284	$self->last_access ($cf::RUNTIME);
2047
2048	$self->in_memory (cf::MAP_ACTIVE);
2049	}	2285	}
2050		2286
2051	$self->post_load;	2287	$self->post_load;
2052	}
2053		2288
		2289	1
		2290	}
		2291
		2292	# customize the map for a given player, i.e.
		2293	# return the _real_ map. used by e.g. per-player
		2294	# maps to change the path to ~playername/mappath
2054	sub customise_for {	2295	sub customise_for {
2055	my ($self, $ob) = @_;	2296	my ($self, $ob) = @_;
2056		2297
2057	return find "~" . $ob->name . "/" . $self->{path}	2298	return find "~" . $ob->name . "/" . $self->{path}
2058	if $self->per_player;	2299	if $self->per_player;
…		…
2061	# if $self->per_party;	2302	# if $self->per_party;
2062		2303
2063	$self	2304	$self
2064	}	2305	}
2065		2306
2066	# find and load all maps in the 3x3 area around a map
2067	sub load_neighbours {
2068	my ($map) = @_;
2069
2070	my @neigh; # diagonal neighbours
2071
2072	for (0 .. 3) {
2073	my $neigh = $map->tile_path ($_)
2074	or next;
2075	$neigh = find $neigh, $map
2076	or next;
2077	$neigh->load;
2078
2079	push @neigh,
2080	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2081	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2082	}
2083
2084	for (grep defined $_->[0], @neigh) {
2085	my ($path, $origin) = @$_;
2086	my $neigh = find $path, $origin
2087	or next;
2088	$neigh->load;
2089	}
2090	}
2091
2092	sub find_sync {	2307	sub find_sync {
2093	my ($path, $origin) = @_;	2308	my ($path, $origin) = @_;
2094		2309
2095	cf::sync_job { find $path, $origin }	2310	# it's a bug to call this from the main context
		2311	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
		2312	if $Coro::current == $Coro::main;
		2313
		2314	find $path, $origin
2096	}	2315	}
2097		2316
2098	sub do_load_sync {	2317	sub do_load_sync {
2099	my ($map) = @_;	2318	my ($map) = @_;
2100		2319
		2320	# it's a bug to call this from the main context
2101	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2321	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2102	if $Coro::current == $Coro::main;	2322	if $Coro::current == $Coro::main;
2103		2323
2104	cf::sync_job { $map->load };	2324	$map->load;
2105	}	2325	}
2106		2326
2107	our %MAP_PREFETCH;	2327	our %MAP_PREFETCH;
2108	our $MAP_PREFETCHER = undef;	2328	our $MAP_PREFETCHER = undef;
2109		2329
2110	sub find_async {	2330	sub find_async {
2111	my ($path, $origin, $load) = @_;	2331	my ($path, $origin, $load) = @_;
2112		2332
2113	$path = normalise $path, $origin && $origin->{path};	2333	$path = normalise $path, $origin;
2114		2334
2115	if (my $map = $cf::MAP{$path}) {	2335	if (my $map = $cf::MAP{$path}) {
2116	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2336	return $map if !$load || $map->linkable;
2117	}	2337	}
2118		2338
2119	$MAP_PREFETCH{$path} |= $load;	2339	$MAP_PREFETCH{$path} |= $load;
2120		2340
2121	$MAP_PREFETCHER ||= cf::async {	2341	$MAP_PREFETCHER ||= cf::async {
…		…
2135	$MAP_PREFETCHER->prio (6);	2355	$MAP_PREFETCHER->prio (6);
2136		2356
2137	()	2357	()
2138	}	2358	}
2139		2359
		2360	# common code, used by both ->save and ->swapout
2140	sub save {	2361	sub _save {
2141	my ($self) = @_;	2362	my ($self) = @_;
2142
2143	my $lock = cf::lock_acquire "map_data:$self->{path}";
2144		2363
2145	$self->{last_save} = $cf::RUNTIME;	2364	$self->{last_save} = $cf::RUNTIME;
2146		2365
2147	return unless $self->dirty;	2366	return unless $self->dirty;
2148		2367
…		…
2168	} else {	2387	} else {
2169	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);	2388	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2170	}	2389	}
2171	}	2390	}
2172		2391
		2392	sub save {
		2393	my ($self) = @_;
		2394
		2395	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2396
		2397	$self->_save;
		2398	}
		2399
2173	sub swap_out {	2400	sub swap_out {
2174	my ($self) = @_;	2401	my ($self) = @_;
2175		2402
2176	# save first because save cedes
2177	$self->save;
2178
2179	my $lock = cf::lock_acquire "map_data:$self->{path}";	2403	my $lock = cf::lock_acquire "map_data:$self->{path}";
2180		2404
		2405	return if !$self->linkable;
		2406	return if $self->{deny_save};
2181	return if $self->players;	2407	return if $self->players;
2182	return if $self->in_memory != cf::MAP_ACTIVE;	2408
		2409	# first deactivate the map and "unlink" it from the core
		2410	$self->deactivate;
		2411	$_->clear_links_to ($self) for values %cf::MAP;
		2412	$self->state (cf::MAP_SWAPPED);
		2413
		2414	# then atomically save
		2415	$self->_save;
		2416
		2417	# then free the map
		2418	$self->clear;
		2419	}
		2420
		2421	sub reset_at {
		2422	my ($self) = @_;
		2423
		2424	# TODO: safety, remove and allow resettable per-player maps
2183	return if $self->{deny_save};	2425	return 1e99 if $self->{deny_reset};
2184		2426
		2427	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
		2428	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
		2429
		2430	$time + $to
		2431	}
		2432
		2433	sub should_reset {
		2434	my ($self) = @_;
		2435
		2436	$self->reset_at <= $cf::RUNTIME
		2437	}
		2438
		2439	sub reset {
		2440	my ($self) = @_;
		2441
		2442	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2443
		2444	return if $self->players;
		2445
		2446	cf::trace "resetting map ", $self->path, "\n";
		2447
2185	$self->in_memory (cf::MAP_SWAPPED);	2448	$self->state (cf::MAP_SWAPPED);
		2449
		2450	# need to save uniques path
		2451	unless ($self->{deny_save}) {
		2452	my $uniq = $self->uniq_path; utf8::encode $uniq;
		2453
		2454	$self->_save_objects ($uniq, cf::IO_UNIQUES)
		2455	if $uniq;
		2456	}
		2457
		2458	delete $cf::MAP{$self->path};
2186		2459
2187	$self->deactivate;	2460	$self->deactivate;
2188	$_->clear_links_to ($self) for values %cf::MAP;	2461	$_->clear_links_to ($self) for values %cf::MAP;
2189	$self->clear;	2462	$self->clear;
2190	}
2191
2192	sub reset_at {
2193	my ($self) = @_;
2194
2195	# TODO: safety, remove and allow resettable per-player maps
2196	return 1e99 if $self->{deny_reset};
2197
2198	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2199	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2200
2201	$time + $to
2202	}
2203
2204	sub should_reset {
2205	my ($self) = @_;
2206
2207	$self->reset_at <= $cf::RUNTIME
2208	}
2209
2210	sub reset {
2211	my ($self) = @_;
2212
2213	my $lock = cf::lock_acquire "map_data:$self->{path}";
2214
2215	return if $self->players;
2216
2217	warn "resetting map ", $self->path;
2218
2219	$self->in_memory (cf::MAP_SWAPPED);
2220
2221	# need to save uniques path
2222	unless ($self->{deny_save}) {
2223	my $uniq = $self->uniq_path; utf8::encode $uniq;
2224
2225	$self->_save_objects ($uniq, cf::IO_UNIQUES)
2226	if $uniq;
2227	}
2228
2229	delete $cf::MAP{$self->path};
2230
2231	$self->deactivate;
2232	$_->clear_links_to ($self) for values %cf::MAP;
2233	$self->clear;
2234		2463
2235	$self->unlink_save;	2464	$self->unlink_save;
2236	$self->destroy;	2465	$self->destroy;
2237	}	2466	}
2238		2467
…		…
2246		2475
2247	delete $cf::MAP{$self->path};	2476	delete $cf::MAP{$self->path};
2248		2477
2249	$self->unlink_save;	2478	$self->unlink_save;
2250		2479
2251	bless $self, "cf::map";	2480	bless $self, "cf::map::wrap";
2252	delete $self->{deny_reset};	2481	delete $self->{deny_reset};
2253	$self->{deny_save} = 1;	2482	$self->{deny_save} = 1;
2254	$self->reset_timeout (1);	2483	$self->reset_timeout (1);
2255	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2484	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2256		2485
…		…
2313	: normalise $_	2542	: normalise $_
2314	} @{ aio_readdir $UNIQUEDIR or [] }	2543	} @{ aio_readdir $UNIQUEDIR or [] }
2315	]	2544	]
2316	}	2545	}
2317		2546
		2547	=item cf::map::static_maps
		2548
		2549	Returns an arrayref if paths of all static maps (all preinstalled F<.map>
		2550	file in the shared directory excluding F</styles> and F</editor>). May
		2551	block.
		2552
		2553	=cut
		2554
		2555	sub static_maps() {
		2556	my @dirs = "";
		2557	my @maps;
		2558
		2559	while (@dirs) {
		2560	my $dir = shift @dirs;
		2561
		2562	next if $dir eq "/styles" || $dir eq "/editor";
		2563
		2564	my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
		2565	or return;
		2566
		2567	for (@$files) {
		2568	s/\.map$// or next;
		2569	utf8::decode $_;
		2570	push @maps, "$dir/$_";
		2571	}
		2572
		2573	push @dirs, map "$dir/$_", @$dirs;
		2574	}
		2575
		2576	\@maps
		2577	}
		2578
2318	=back	2579	=back
2319		2580
2320	=head3 cf::object	2581	=head3 cf::object
2321		2582
2322	=cut	2583	=cut
…		…
2387		2648
2388	our $SAY_CHANNEL = {	2649	our $SAY_CHANNEL = {
2389	id => "say",	2650	id => "say",
2390	title => "Map",	2651	title => "Map",
2391	reply => "say ",	2652	reply => "say ",
2392	tooltip => "Things said to and replied from npcs near you and other players on the same map only.",	2653	tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2393	};	2654	};
2394		2655
2395	our $CHAT_CHANNEL = {	2656	our $CHAT_CHANNEL = {
2396	id => "chat",	2657	id => "chat",
2397	title => "Chat",	2658	title => "Chat",
…		…
2454		2715
2455	Freezes the player and moves him/her to a special map (C<{link}>).	2716	Freezes the player and moves him/her to a special map (C<{link}>).
2456		2717
2457	The player should be reasonably safe there for short amounts of time (e.g.	2718	The player should be reasonably safe there for short amounts of time (e.g.
2458	for loading a map). You I<MUST> call C<leave_link> as soon as possible,	2719	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2459	though, as the palyer cannot control the character while it is on the link	2720	though, as the player cannot control the character while it is on the link
2460	map.	2721	map.
2461		2722
2462	Will never block.	2723	Will never block.
2463		2724
2464	=item $player_object->leave_link ($map, $x, $y)	2725	=item $player_object->leave_link ($map, $x, $y)
…		…
2485	sub cf::object::player::enter_link {	2746	sub cf::object::player::enter_link {
2486	my ($self) = @_;	2747	my ($self) = @_;
2487		2748
2488	$self->deactivate_recursive;	2749	$self->deactivate_recursive;
2489		2750
		2751	++$self->{_link_recursion};
		2752
2490	return if UNIVERSAL::isa $self->map, "ext::map_link";	2753	return if UNIVERSAL::isa $self->map, "ext::map_link";
2491		2754
2492	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2755	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2493	if $self->map && $self->map->{path} ne "{link}";	2756	if $self->map && $self->map->{path} ne "{link}";
2494		2757
2495	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2758	$self->enter_map ($LINK_MAP || link_map, 3, 3);
2496	}	2759	}
2497		2760
2498	sub cf::object::player::leave_link {	2761	sub cf::object::player::leave_link {
2499	my ($self, $map, $x, $y) = @_;	2762	my ($self, $map, $x, $y) = @_;
2500		2763
…		…
2517	($x, $y) = (-1, -1)	2780	($x, $y) = (-1, -1)
2518	unless (defined $x) && (defined $y);	2781	unless (defined $x) && (defined $y);
2519		2782
2520	# use -1 or undef as default coordinates, not 0, 0	2783	# use -1 or undef as default coordinates, not 0, 0
2521	($x, $y) = ($map->enter_x, $map->enter_y)	2784	($x, $y) = ($map->enter_x, $map->enter_y)
2522	if $x <=0 && $y <= 0;	2785	if $x <= 0 && $y <= 0;
2523		2786
2524	$map->load;	2787	$map->load;
2525	$map->load_neighbours;
2526		2788
2527	return unless $self->contr->active;	2789	return unless $self->contr->active;
2528	$self->flag (cf::FLAG_DEBUG, 0);#d# temp
2529	$self->activate_recursive;
2530		2790
2531	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2791	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2532	$self->enter_map ($map, $x, $y);	2792	if ($self->enter_map ($map, $x, $y)) {
2533	}	2793	# entering was successful
		2794	delete $self->{_link_recursion};
		2795	# only activate afterwards, to support waiting in hooks
		2796	$self->activate_recursive;
		2797	}
2534		2798
		2799	}
		2800
2535	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2801	=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2536		2802
2537	Moves the player to the given map-path and coordinates by first freezing	2803	Moves the player to the given map-path and coordinates by first freezing
2538	her, loading and preparing them map, calling the provided $check callback	2804	her, loading and preparing them map, calling the provided $check callback
2539	that has to return the map if sucecssful, and then unfreezes the player on	2805	that has to return the map if sucecssful, and then unfreezes the player on
2540	the new (success) or old (failed) map position. In either case, $done will	2806	the new (success) or old (failed) map position. In either case, $done will
…		…
2547		2813
2548	our $GOTOGEN;	2814	our $GOTOGEN;
2549		2815
2550	sub cf::object::player::goto {	2816	sub cf::object::player::goto {
2551	my ($self, $path, $x, $y, $check, $done) = @_;	2817	my ($self, $path, $x, $y, $check, $done) = @_;
		2818
		2819	if ($self->{_link_recursion} >= $MAX_LINKS) {
		2820	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
		2821	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
		2822	($path, $x, $y) = @$EMERGENCY_POSITION;
		2823	}
2552		2824
2553	# do generation counting so two concurrent goto's will be executed in-order	2825	# do generation counting so two concurrent goto's will be executed in-order
2554	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2826	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2555		2827
2556	$self->enter_link;	2828	$self->enter_link;
…		…
2576	($path, $x, $y) = (undef, undef, undef);	2848	($path, $x, $y) = (undef, undef, undef);
2577	}	2849	}
2578	}	2850	}
2579		2851
2580	my $map = eval {	2852	my $map = eval {
2581	my $map = defined $path ? cf::map::find $path : undef;	2853	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2582		2854
2583	if ($map) {	2855	if ($map) {
2584	$map = $map->customise_for ($self);	2856	$map = $map->customise_for ($self);
2585	$map = $check->($map) if $check && $map;	2857	$map = $check->($map, $x, $y, $self) if $check && $map;
2586	} else {	2858	} else {
2587	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);	2859	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2588	}	2860	}
2589		2861
2590	$map	2862	$map
…		…
2598	if ($gen == $self->{_goto_generation}) {	2870	if ($gen == $self->{_goto_generation}) {
2599	delete $self->{_goto_generation};	2871	delete $self->{_goto_generation};
2600	$self->leave_link ($map, $x, $y);	2872	$self->leave_link ($map, $x, $y);
2601	}	2873	}
2602		2874
2603	$done->() if $done;	2875	$done->($self) if $done;
2604	})->prio (1);	2876	})->prio (1);
2605	}	2877	}
2606		2878
2607	=item $player_object->enter_exit ($exit_object)	2879	=item $player_object->enter_exit ($exit_object)
2608		2880
…		…
2676	$Coro::current->{desc} = "enter_exit";	2948	$Coro::current->{desc} = "enter_exit";
2677		2949
2678	unless (eval {	2950	unless (eval {
2679	$self->deactivate_recursive; # just to be sure	2951	$self->deactivate_recursive; # just to be sure
2680		2952
2681	# random map handling
2682	{
2683	my $guard = cf::lock_acquire "exit_prepare:$exit";
2684
2685	prepare_random_map $exit
2686	if $exit->slaying eq "/!";
2687	}
2688
2689	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2953	my $map = cf::map::normalise $exit->slaying, $exit->map;
2690	my $x = $exit->stats->hp;	2954	my $x = $exit->stats->hp;
2691	my $y = $exit->stats->sp;	2955	my $y = $exit->stats->sp;
		2956
		2957	# special map handling
		2958	my $slaying = $exit->slaying;
		2959
		2960	# special map handling
		2961	if ($slaying eq "/!") {
		2962	my $guard = cf::lock_acquire "exit_prepare:$exit";
		2963
		2964	prepare_random_map $exit
		2965	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		2966
		2967	$map = $exit->slaying;
		2968
		2969	} elsif ($slaying eq '!up') {
		2970	$map = $exit->map->tile_path (cf::TILE_UP);
		2971	$x = $exit->x;
		2972	$y = $exit->y;
		2973
		2974	} elsif ($slaying eq '!down') {
		2975	$map = $exit->map->tile_path (cf::TILE_DOWN);
		2976	$x = $exit->x;
		2977	$y = $exit->y;
		2978	}
2692		2979
2693	$self->goto ($map, $x, $y);	2980	$self->goto ($map, $x, $y);
2694		2981
2695	# if exit is damned, update players death & WoR home-position	2982	# if exit is damned, update players death & WoR home-position
2696	$self->contr->savebed ($map, $x, $y)	2983	$self->contr->savebed ($map, $x, $y)
…		…
2701	$self->message ("Something went wrong deep within the deliantra server. "	2988	$self->message ("Something went wrong deep within the deliantra server. "
2702	. "I'll try to bring you back to the map you were before. "	2989	. "I'll try to bring you back to the map you were before. "
2703	. "Please report this to the dungeon master!",	2990	. "Please report this to the dungeon master!",
2704	cf::NDI_UNIQUE | cf::NDI_RED);	2991	cf::NDI_UNIQUE | cf::NDI_RED);
2705		2992
2706	warn "ERROR in enter_exit: $@";	2993	error "ERROR in enter_exit: $@";
2707	$self->leave_link;	2994	$self->leave_link;
2708	}	2995	}
2709	})->prio (1);	2996	})->prio (1);
2710	}	2997	}
2711		2998
…		…
2723	sub cf::client::send_drawinfo {	3010	sub cf::client::send_drawinfo {
2724	my ($self, $text, $flags) = @_;	3011	my ($self, $text, $flags) = @_;
2725		3012
2726	utf8::encode $text;	3013	utf8::encode $text;
2727	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	3014	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
		3015	}
		3016
		3017	=item $client->send_big_packet ($pkt)
		3018
		3019	Like C<send_packet>, but tries to compress large packets, and fragments
		3020	them as required.
		3021
		3022	=cut
		3023
		3024	our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
		3025
		3026	sub cf::client::send_big_packet {
		3027	my ($self, $pkt) = @_;
		3028
		3029	# try lzf for large packets
		3030	$pkt = "lzf " . Compress::LZF::compress $pkt
		3031	if 1024 <= length $pkt and $self->{can_lzf};
		3032
		3033	# split very large packets
		3034	if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
		3035	$self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
		3036	$pkt = "frag";
		3037	}
		3038
		3039	$self->send_packet ($pkt);
2728	}	3040	}
2729		3041
2730	=item $client->send_msg ($channel, $msg, $color, [extra...])	3042	=item $client->send_msg ($channel, $msg, $color, [extra...])
2731		3043
2732	Send a drawinfo or msg packet to the client, formatting the msg for the	3044	Send a drawinfo or msg packet to the client, formatting the msg for the
…		…
2736		3048
2737	=cut	3049	=cut
2738		3050
2739	# non-persistent channels (usually the info channel)	3051	# non-persistent channels (usually the info channel)
2740	our %CHANNEL = (	3052	our %CHANNEL = (
		3053	"c/motd" => {
		3054	id => "infobox",
		3055	title => "MOTD",
		3056	reply => undef,
		3057	tooltip => "The message of the day",
		3058	},
2741	"c/identify" => {	3059	"c/identify" => {
2742	id => "infobox",	3060	id => "infobox",
2743	title => "Identify",	3061	title => "Identify",
2744	reply => undef,	3062	reply => undef,
2745	tooltip => "Items recently identified",	3063	tooltip => "Items recently identified",
…		…
2747	"c/examine" => {	3065	"c/examine" => {
2748	id => "infobox",	3066	id => "infobox",
2749	title => "Examine",	3067	title => "Examine",
2750	reply => undef,	3068	reply => undef,
2751	tooltip => "Signs and other items you examined",	3069	tooltip => "Signs and other items you examined",
		3070	},
		3071	"c/shopinfo" => {
		3072	id => "infobox",
		3073	title => "Shop Info",
		3074	reply => undef,
		3075	tooltip => "What your bargaining skill tells you about the shop",
2752	},	3076	},
2753	"c/book" => {	3077	"c/book" => {
2754	id => "infobox",	3078	id => "infobox",
2755	title => "Book",	3079	title => "Book",
2756	reply => undef,	3080	reply => undef,
…		…
2772	id => "infobox",	3096	id => "infobox",
2773	title => "Body Parts",	3097	title => "Body Parts",
2774	reply => undef,	3098	reply => undef,
2775	tooltip => "Shows which body parts you posess and are available",	3099	tooltip => "Shows which body parts you posess and are available",
2776	},	3100	},
		3101	"c/statistics" => {
		3102	id => "infobox",
		3103	title => "Statistics",
		3104	reply => undef,
		3105	tooltip => "Shows your primary statistics",
		3106	},
2777	"c/skills" => {	3107	"c/skills" => {
2778	id => "infobox",	3108	id => "infobox",
2779	title => "Skills",	3109	title => "Skills",
2780	reply => undef,	3110	reply => undef,
2781	tooltip => "Shows your experience per skill and item power",	3111	tooltip => "Shows your experience per skill and item power",
		3112	},
		3113	"c/shopitems" => {
		3114	id => "infobox",
		3115	title => "Shop Items",
		3116	reply => undef,
		3117	tooltip => "Shows the items currently for sale in this shop",
		3118	},
		3119	"c/resistances" => {
		3120	id => "infobox",
		3121	title => "Resistances",
		3122	reply => undef,
		3123	tooltip => "Shows your resistances",
		3124	},
		3125	"c/pets" => {
		3126	id => "infobox",
		3127	title => "Pets",
		3128	reply => undef,
		3129	tooltip => "Shows information abotu your pets/a specific pet",
		3130	},
		3131	"c/perceiveself" => {
		3132	id => "infobox",
		3133	title => "Perceive Self",
		3134	reply => undef,
		3135	tooltip => "You gained detailed knowledge about yourself",
2782	},	3136	},
2783	"c/uptime" => {	3137	"c/uptime" => {
2784	id => "infobox",	3138	id => "infobox",
2785	title => "Uptime",	3139	title => "Uptime",
2786	reply => undef,	3140	reply => undef,
…		…
2796	id => "party",	3150	id => "party",
2797	title => "Party",	3151	title => "Party",
2798	reply => "gsay ",	3152	reply => "gsay ",
2799	tooltip => "Messages and chat related to your party",	3153	tooltip => "Messages and chat related to your party",
2800	},	3154	},
		3155	"c/death" => {
		3156	id => "death",
		3157	title => "Death",
		3158	reply => undef,
		3159	tooltip => "Reason for and more info about your most recent death",
		3160	},
		3161	"c/say" => $SAY_CHANNEL,
		3162	"c/chat" => $CHAT_CHANNEL,
2801	);	3163	);
2802		3164
2803	sub cf::client::send_msg {	3165	sub cf::client::send_msg {
2804	my ($self, $channel, $msg, $color, @extra) = @_;	3166	my ($self, $channel, $msg, $color, @extra) = @_;
2805		3167
…		…
2810		3172
2811	# check predefined channels, for the benefit of C	3173	# check predefined channels, for the benefit of C
2812	if ($CHANNEL{$channel}) {	3174	if ($CHANNEL{$channel}) {
2813	$channel = $CHANNEL{$channel};	3175	$channel = $CHANNEL{$channel};
2814		3176
2815	$self->ext_msg (channel_info => $channel)	3177	$self->ext_msg (channel_info => $channel);
2816	if $self->can_msg;
2817
2818	$channel = $channel->{id};	3178	$channel = $channel->{id};
2819		3179
2820	} elsif (ref $channel) {	3180	} elsif (ref $channel) {
2821	# send meta info to client, if not yet sent	3181	# send meta info to client, if not yet sent
2822	unless (exists $self->{channel}{$channel->{id}}) {	3182	unless (exists $self->{channel}{$channel->{id}}) {
2823	$self->{channel}{$channel->{id}} = $channel;	3183	$self->{channel}{$channel->{id}} = $channel;
2824	$self->ext_msg (channel_info => $channel)	3184	$self->ext_msg (channel_info => $channel);
2825	if $self->can_msg;
2826	}	3185	}
2827		3186
2828	$channel = $channel->{id};	3187	$channel = $channel->{id};
2829	}	3188	}
2830		3189
2831	return unless @extra || length $msg;	3190	return unless @extra || length $msg;
2832		3191
2833	if ($self->can_msg) {
2834	# default colour, mask it out	3192	# default colour, mask it out
2835	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)	3193	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2836	if $color & cf::NDI_DEF;	3194	if $color & cf::NDI_DEF;
2837		3195
2838	my $pkt = "msg "	3196	my $pkt = "msg "
2839	. $self->{json_coder}->encode (	3197	. $self->{json_coder}->encode (
2840	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]	3198	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2841	);	3199	);
2842		3200
2843	# try lzf for large packets
2844	$pkt = "lzf " . Compress::LZF::compress $pkt
2845	if 1024 <= length $pkt and $self->{can_lzf};
2846
2847	# split very large packets
2848	if (8192 < length $pkt and $self->{can_lzf}) {
2849	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2850	$pkt = "frag";
2851	}
2852
2853	$self->send_packet ($pkt);	3201	$self->send_big_packet ($pkt);
2854	} else {
2855	if ($color >= 0) {
2856	# replace some tags by gcfclient-compatible ones
2857	for ($msg) {
2858	1 while
2859	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2860	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2861	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2862	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2863	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2864	}
2865
2866	$color &= cf::NDI_COLOR_MASK;
2867
2868	utf8::encode $msg;
2869
2870	if (0 && $msg =~ /\[/) {
2871	# COMMAND/INFO
2872	$self->send_packet ("drawextinfo $color 10 8 $msg")
2873	} else {
2874	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2875	$self->send_packet ("drawinfo $color $msg")
2876	}
2877	}
2878	}
2879	}	3202	}
2880		3203
2881	=item $client->ext_msg ($type, @msg)	3204	=item $client->ext_msg ($type, @msg)
2882		3205
2883	Sends an ext event to the client.	3206	Sends an ext event to the client.
…		…
2886		3209
2887	sub cf::client::ext_msg($$@) {	3210	sub cf::client::ext_msg($$@) {
2888	my ($self, $type, @msg) = @_;	3211	my ($self, $type, @msg) = @_;
2889		3212
2890	if ($self->extcmd == 2) {	3213	if ($self->extcmd == 2) {
2891	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3214	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2892	} elsif ($self->extcmd == 1) { # TODO: remove	3215	} elsif ($self->extcmd == 1) { # TODO: remove
2893	push @msg, msgtype => "event_$type";	3216	push @msg, msgtype => "event_$type";
2894	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3217	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2895	}	3218	}
2896	}	3219	}
2897		3220
2898	=item $client->ext_reply ($msgid, @msg)	3221	=item $client->ext_reply ($msgid, @msg)
2899		3222
…		…
2902	=cut	3225	=cut
2903		3226
2904	sub cf::client::ext_reply($$@) {	3227	sub cf::client::ext_reply($$@) {
2905	my ($self, $id, @msg) = @_;	3228	my ($self, $id, @msg) = @_;
2906		3229
2907	if ($self->extcmd == 2) {	3230	return unless $self->extcmd == 2;
		3231
2908	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));	3232	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2909	} elsif ($self->extcmd == 1) {
2910	#TODO: version 1, remove
2911	unshift @msg, msgtype => "reply", msgid => $id;
2912	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2913	}
2914	}	3233	}
2915		3234
2916	=item $success = $client->query ($flags, "text", \&cb)	3235	=item $success = $client->query ($flags, "text", \&cb)
2917		3236
2918	Queues a query to the client, calling the given callback with	3237	Queues a query to the client, calling the given callback with
…		…
2973	my ($ns, $buf) = @_;	3292	my ($ns, $buf) = @_;
2974		3293
2975	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3294	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2976		3295
2977	if (ref $msg) {	3296	if (ref $msg) {
2978	my ($type, $reply, @payload) =	3297	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2979	"ARRAY" eq ref $msg
2980	? @$msg
2981	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2982		3298
2983	my @reply;	3299	my @reply;
2984		3300
2985	if (my $cb = $EXTICMD{$type}) {	3301	if (my $cb = $EXTICMD{$type}) {
2986	@reply = $cb->($ns, @payload);	3302	@reply = $cb->($ns, @payload);
…		…
2988		3304
2989	$ns->ext_reply ($reply, @reply)	3305	$ns->ext_reply ($reply, @reply)
2990	if $reply;	3306	if $reply;
2991		3307
2992	} else {	3308	} else {
2993	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3309	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2994	}	3310	}
2995		3311
2996	cf::override;	3312	cf::override;
2997	},	3313	},
2998	);	3314	);
…		…
3018		3334
3019	$coro	3335	$coro
3020	}	3336	}
3021		3337
3022	cf::client->attach (	3338	cf::client->attach (
3023	on_destroy => sub {	3339	on_client_destroy => sub {
3024	my ($ns) = @_;	3340	my ($ns) = @_;
3025		3341
3026	$_->cancel for values %{ (delete $ns->{_coro}) || {} };	3342	$_->cancel for values %{ (delete $ns->{_coro}) || {} };
3027	},	3343	},
3028	);	3344	);
…		…
3044	our $safe_hole = new Safe::Hole;	3360	our $safe_hole = new Safe::Hole;
3045		3361
3046	$SIG{FPE} = 'IGNORE';	3362	$SIG{FPE} = 'IGNORE';
3047		3363
3048	$safe->permit_only (Opcode::opset qw(	3364	$safe->permit_only (Opcode::opset qw(
3049	:base_core :base_mem :base_orig :base_math	3365	:base_core :base_mem :base_orig :base_math :base_loop
3050	grepstart grepwhile mapstart mapwhile	3366	grepstart grepwhile mapstart mapwhile
3051	sort time	3367	sort time
3052	));	3368	));
3053		3369
3054	# here we export the classes and methods available to script code	3370	# here we export the classes and methods available to script code
…		…
3058	The following functions and methods are available within a safe environment:	3374	The following functions and methods are available within a safe environment:
3059		3375
3060	cf::object	3376	cf::object
3061	contr pay_amount pay_player map x y force_find force_add destroy	3377	contr pay_amount pay_player map x y force_find force_add destroy
3062	insert remove name archname title slaying race decrease split	3378	insert remove name archname title slaying race decrease split
		3379	value
3063		3380
3064	cf::object::player	3381	cf::object::player
3065	player	3382	player
3066		3383
3067	cf::player	3384	cf::player
…		…
3073	=cut	3390	=cut
3074		3391
3075	for (	3392	for (
3076	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	3393	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3077	insert remove inv nrof name archname title slaying race	3394	insert remove inv nrof name archname title slaying race
3078	decrease split destroy change_exp)],	3395	decrease split destroy change_exp value msg lore send_msg)],
3079	["cf::object::player" => qw(player)],	3396	["cf::object::player" => qw(player)],
3080	["cf::player" => qw(peaceful)],	3397	["cf::player" => qw(peaceful send_msg)],
3081	["cf::map" => qw(trigger)],	3398	["cf::map" => qw(trigger)],
3082	) {	3399	) {
3083	no strict 'refs';
3084	my ($pkg, @funs) = @$_;	3400	my ($pkg, @funs) = @$_;
3085	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3401	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3086	for @funs;	3402	for @funs;
3087	}	3403	}
3088		3404
…		…
3103		3419
3104	my $qcode = $code;	3420	my $qcode = $code;
3105	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3421	$qcode =~ s/"/‟/g; # not allowed in #line filenames
3106	$qcode =~ s/\n/\\n/g;	3422	$qcode =~ s/\n/\\n/g;
3107		3423
		3424	%vars = (_dummy => 0) unless %vars;
		3425
		3426	my @res;
3108	local $_;	3427	local $_;
3109	local @safe::cf::_safe_eval_args = values %vars;
3110		3428
3111	my $eval =	3429	my $eval =
3112	"do {\n"	3430	"do {\n"
3113	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"	3431	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3114	. "#line 0 \"{$qcode}\"\n"	3432	. "#line 0 \"{$qcode}\"\n"
3115	. $code	3433	. $code
3116	. "\n}"	3434	. "\n}"
3117	;	3435	;
3118		3436
		3437	if ($CFG{safe_eval}) {
3119	sub_generation_inc;	3438	sub_generation_inc;
		3439	local @safe::cf::_safe_eval_args = values %vars;
3120	my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);	3440	@res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3121	sub_generation_inc;	3441	sub_generation_inc;
		3442	} else {
		3443	local @cf::_safe_eval_args = values %vars;
		3444	@res = wantarray ? eval eval : scalar eval $eval;
		3445	}
3122		3446
3123	if ($@) {	3447	if ($@) {
3124	warn "$@";	3448	warn "$@",
3125	warn "while executing safe code '$code'\n";	3449	"while executing safe code '$code'\n",
3126	warn "with arguments " . (join " ", %vars) . "\n";	3450	"with arguments " . (join " ", %vars) . "\n";
3127	}	3451	}
3128		3452
3129	wantarray ? @res : $res[0]	3453	wantarray ? @res : $res[0]
3130	}	3454	}
3131		3455
…		…
3145	=cut	3469	=cut
3146		3470
3147	sub register_script_function {	3471	sub register_script_function {
3148	my ($fun, $cb) = @_;	3472	my ($fun, $cb) = @_;
3149		3473
3150	no strict 'refs';	3474	$fun = "safe::$fun" if $CFG{safe_eval};
3151	*{"safe::$fun"} = $safe_hole->wrap ($cb);	3475	*$fun = $safe_hole->wrap ($cb);
3152	}	3476	}
3153		3477
3154	=back	3478	=back
3155		3479
3156	=cut	3480	=cut
…		…
3165	# for this (global event?)	3489	# for this (global event?)
3166	%ext::player_env::MUSIC_FACE_CACHE = ();	3490	%ext::player_env::MUSIC_FACE_CACHE = ();
3167		3491
3168	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3492	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3169		3493
3170	warn "loading facedata from $path\n";	3494	trace "loading facedata from $path\n";
3171		3495
3172	my $facedata;	3496	my $facedata = decode_storable load_file $path;
3173	0 < aio_load $path, $facedata
3174	or die "$path: $!";
3175
3176	$facedata = Coro::Storable::thaw $facedata;
3177		3497
3178	$facedata->{version} == 2	3498	$facedata->{version} == 2
3179	or cf::cleanup "$path: version mismatch, cannot proceed.";	3499	or cf::cleanup "$path: version mismatch, cannot proceed.";
3180		3500
3181	# patch in the exptable	3501	# patch in the exptable
		3502	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3182	$facedata->{resource}{"res/exp_table"} = {	3503	$facedata->{resource}{"res/exp_table"} = {
3183	type => FT_RSRC,	3504	type => FT_RSRC,
3184	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),	3505	data => $exp_table,
		3506	hash => (Digest::MD5::md5 $exp_table),
3185	};	3507	};
3186	cf::cede_to_tick;	3508	cf::cede_to_tick;
3187		3509
3188	{	3510	{
3189	my $faces = $facedata->{faceinfo};	3511	my $faces = $facedata->{faceinfo};
…		…
3191	while (my ($face, $info) = each %$faces) {	3513	while (my ($face, $info) = each %$faces) {
3192	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3514	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3193		3515
3194	cf::face::set_visibility $idx, $info->{visibility};	3516	cf::face::set_visibility $idx, $info->{visibility};
3195	cf::face::set_magicmap $idx, $info->{magicmap};	3517	cf::face::set_magicmap $idx, $info->{magicmap};
3196	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};	3518	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3197	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};	3519	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
		3520	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3198		3521
3199	cf::cede_to_tick;	3522	cf::cede_to_tick;
3200	}	3523	}
3201		3524
3202	while (my ($face, $info) = each %$faces) {	3525	while (my ($face, $info) = each %$faces) {
…		…
3207		3530
3208	if (my $smooth = cf::face::find $info->{smooth}) {	3531	if (my $smooth = cf::face::find $info->{smooth}) {
3209	cf::face::set_smooth $idx, $smooth;	3532	cf::face::set_smooth $idx, $smooth;
3210	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3533	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3211	} else {	3534	} else {
3212	warn "smooth face '$info->{smooth}' not found for face '$face'";	3535	error "smooth face '$info->{smooth}' not found for face '$face'";
3213	}	3536	}
3214		3537
3215	cf::cede_to_tick;	3538	cf::cede_to_tick;
3216	}	3539	}
3217	}	3540	}
…		…
3226		3549
3227	cf::anim::invalidate_all; # d'oh	3550	cf::anim::invalidate_all; # d'oh
3228	}	3551	}
3229		3552
3230	{	3553	{
3231	# TODO: for gcfclient pleasure, we should give resources
3232	# that gcfclient doesn't grok a >10000 face index.
3233	my $res = $facedata->{resource};	3554	my $res = $facedata->{resource};
3234		3555
3235	while (my ($name, $info) = each %$res) {	3556	while (my ($name, $info) = each %$res) {
3236	if (defined $info->{type}) {	3557	if (defined (my $type = $info->{type})) {
		3558	# TODO: different hash - must free and use new index, or cache ixface data queue
3237	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3559	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3238	my $data;
3239		3560
3240	if ($info->{type} & 1) {	3561	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3241	# prepend meta info
3242
3243	my $meta = $enc->encode ({
3244	name => $name,
3245	%{ $info->{meta} || {} },
3246	});
3247
3248	$data = pack "(w/a*)*", $meta, $info->{data};
3249	} else {
3250	$data = $info->{data};
3251	}
3252
3253	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3254	cf::face::set_type $idx, $info->{type};	3562	cf::face::set_type $idx, $type;
		3563	cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3255	} else {	3564	} else {
3256	$RESOURCE{$name} = $info;	3565	# $RESOURCE{$name} = $info; # unused
3257	}	3566	}
3258		3567
3259	cf::cede_to_tick;	3568	cf::cede_to_tick;
3260	}	3569	}
3261	}	3570	}
3262		3571
3263	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3572	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3264		3573
3265	1	3574	1
3266	}	3575	}
3267
3268	cf::global->attach (on_resource_update => sub {
3269	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3270	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3271
3272	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3273	my $sound = $soundconf->{compat}[$_]
3274	or next;
3275
3276	my $face = cf::face::find "sound/$sound->[1]";
3277	cf::sound::set $sound->[0] => $face;
3278	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3279	}
3280
3281	while (my ($k, $v) = each %{$soundconf->{event}}) {
3282	my $face = cf::face::find "sound/$v";
3283	cf::sound::set $k => $face;
3284	}
3285	}
3286	});
3287		3576
3288	register_exticmd fx_want => sub {	3577	register_exticmd fx_want => sub {
3289	my ($ns, $want) = @_;	3578	my ($ns, $want) = @_;
3290		3579
3291	while (my ($k, $v) = each %$want) {	3580	while (my ($k, $v) = each %$want) {
…		…
3330	sub reload_treasures {	3619	sub reload_treasures {
3331	load_resource_file "$DATADIR/treasures"	3620	load_resource_file "$DATADIR/treasures"
3332	or die "unable to load treasurelists\n";	3621	or die "unable to load treasurelists\n";
3333	}	3622	}
3334		3623
		3624	sub reload_sound {
		3625	trace "loading sound config from $DATADIR/sound\n";
		3626
		3627	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
		3628
		3629	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3630	my $sound = $soundconf->{compat}[$_]
		3631	or next;
		3632
		3633	my $face = cf::face::find "sound/$sound->[1]";
		3634	cf::sound::set $sound->[0] => $face;
		3635	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3636	}
		3637
		3638	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3639	my $face = cf::face::find "sound/$v";
		3640	cf::sound::set $k => $face;
		3641	}
		3642	}
		3643
3335	sub reload_resources {	3644	sub reload_resources {
3336	warn "reloading resource files...\n";	3645	trace "reloading resource files...\n";
3337		3646
		3647	reload_exp_table;
		3648	reload_materials;
3338	reload_facedata;	3649	reload_facedata;
		3650	reload_sound;
3339	reload_archetypes;	3651	reload_archetypes;
3340	reload_regions;	3652	reload_regions;
3341	reload_treasures;	3653	reload_treasures;
3342		3654
3343	warn "finished reloading resource files\n";	3655	trace "finished reloading resource files\n";
3344	}
3345
3346	sub init {
3347	my $guard = freeze_mainloop;
3348
3349	evthread_start IO::AIO::poll_fileno;
3350
3351	reload_resources;
3352	}	3656	}
3353		3657
3354	sub reload_config {	3658	sub reload_config {
3355	open my $fh, "<:utf8", "$CONFDIR/config"	3659	trace "reloading config file...\n";
3356	or return;
3357		3660
3358	local $/;	3661	my $config = load_file "$CONFDIR/config";
3359	*CFG = YAML::Load <$fh>;	3662	utf8::decode $config;
		3663	*CFG = decode_yaml $config;
3360		3664
3361	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3665	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3362		3666
3363	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3667	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3364	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3668	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3365		3669
3366	if (exists $CFG{mlockall}) {	3670	if (exists $CFG{mlockall}) {
…		…
3389		3693
3390	seek $fh, 0, 0;	3694	seek $fh, 0, 0;
3391	print $fh $$;	3695	print $fh $$;
3392	}	3696	}
3393		3697
		3698	sub main_loop {
		3699	trace "EV::loop starting\n";
		3700	if (1) {
		3701	EV::loop;
		3702	}
		3703	trace "EV::loop returned\n";
		3704	goto &main_loop unless $REALLY_UNLOOP;
		3705	}
		3706
3394	sub main {	3707	sub main {
3395	atomic;	3708	cf::init_globals; # initialise logging
		3709
		3710	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
		3711	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
		3712	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
		3713	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
		3714
		3715	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3396		3716
3397	# we must not ever block the main coroutine	3717	# we must not ever block the main coroutine
3398	local $Coro::idle = sub {	3718	local $Coro::idle = sub {
3399	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3719	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3400	(async {	3720	(async {
3401	$Coro::current->{desc} = "IDLE BUG HANDLER";	3721	$Coro::current->{desc} = "IDLE BUG HANDLER";
3402	EV::loop EV::LOOP_ONESHOT;	3722	EV::loop EV::LOOP_ONESHOT;
3403	})->prio (Coro::PRIO_MAX);	3723	})->prio (Coro::PRIO_MAX);
3404	};	3724	};
3405		3725
3406	{	3726	evthread_start IO::AIO::poll_fileno;
3407	my $guard = freeze_mainloop;	3727
		3728	cf::sync_job {
		3729	cf::incloader::init ();
		3730
		3731	cf::init_anim;
		3732	cf::init_attackmess;
		3733	cf::init_dynamic;
		3734
		3735	cf::load_settings;
		3736
		3737	reload_resources;
3408	reload_config;	3738	reload_config;
3409	db_init;	3739	db_init;
		3740
		3741	cf::init_uuid;
		3742	cf::init_signals;
		3743	cf::init_skills;
		3744
		3745	cf::init_beforeplay;
		3746
		3747	atomic;
		3748
3410	load_extensions;	3749	load_extensions;
3411		3750
3412	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3413	}
3414
3415	utime time, time, $RUNTIMEFILE;	3751	utime time, time, $RUNTIMEFILE;
3416		3752
3417	# no (long-running) fork's whatsoever before this point(!)	3753	# no (long-running) fork's whatsoever before this point(!)
		3754	use POSIX ();
3418	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3755	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3419		3756
3420	EV::loop;	3757	cf::_post_init 0;
		3758	};
		3759
		3760	cf::object::thawer::errors_are_fatal 0;
		3761	info "parse errors in files are no longer fatal from this point on.\n";
		3762
		3763	AE::postpone {
		3764	undef &main; # free gobs of memory :)
		3765	};
		3766
		3767	goto &main_loop;
3421	}	3768	}
3422		3769
3423	#############################################################################	3770	#############################################################################
3424	# initialisation and cleanup	3771	# initialisation and cleanup
3425		3772
3426	# install some emergency cleanup handlers	3773	# install some emergency cleanup handlers
3427	BEGIN {	3774	BEGIN {
3428	our %SIGWATCHER = ();	3775	our %SIGWATCHER = ();
3429	for my $signal (qw(INT HUP TERM)) {	3776	for my $signal (qw(INT HUP TERM)) {
3430	$SIGWATCHER{$signal} = EV::signal $signal, sub {	3777	$SIGWATCHER{$signal} = AE::signal $signal, sub {
3431	cf::cleanup "SIG$signal";	3778	cf::cleanup "SIG$signal";
3432	};	3779	};
3433	}	3780	}
3434	}	3781	}
3435		3782
3436	sub write_runtime_sync {	3783	sub write_runtime_sync {
		3784	my $t0 = AE::time;
		3785
3437	# first touch the runtime file to show we are still running:	3786	# first touch the runtime file to show we are still running:
3438	# the fsync below can take a very very long time.	3787	# the fsync below can take a very very long time.
3439		3788
3440	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;	3789	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3441		3790
3442	my $guard = cf::lock_acquire "write_runtime";	3791	my $guard = cf::lock_acquire "write_runtime";
3443		3792
3444	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644	3793	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3445	or return;	3794	or return;
3446		3795
3447	my $value = $cf::RUNTIME + 90 + 10;	3796	my $value = $cf::RUNTIME + 90 + 10;
3448	# 10 is the runtime save interval, for a monotonic clock	3797	# 10 is the runtime save interval, for a monotonic clock
3449	# 60 allows for the watchdog to kill the server.	3798	# 60 allows for the watchdog to kill the server.
…		…
3462	or return;	3811	or return;
3463		3812
3464	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3813	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3465	and return;	3814	and return;
3466		3815
3467	warn "runtime file written.\n";	3816	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3468		3817
3469	1	3818	1
3470	}	3819	}
3471		3820
3472	our $uuid_lock;	3821	our $uuid_lock;
…		…
3481	my $uuid = "$LOCALDIR/uuid";	3830	my $uuid = "$LOCALDIR/uuid";
3482		3831
3483	my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644	3832	my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3484	or return;	3833	or return;
3485		3834
3486	my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;	3835	my $value = uuid_seq uuid_cur;
		3836
		3837	unless ($value) {
		3838	info "cowardly refusing to write zero uuid value!\n";
		3839	return;
		3840	}
		3841
		3842	my $value = uuid_str $value + $uuid_skip;
3487	$uuid_skip = 0;	3843	$uuid_skip = 0;
3488		3844
3489	(aio_write $fh, 0, (length $value), $value, 0) <= 0	3845	(aio_write $fh, 0, (length $value), $value, 0) <= 0
3490	and return;	3846	and return;
3491		3847
…		…
3497	or return;	3853	or return;
3498		3854
3499	aio_rename "$uuid~", $uuid	3855	aio_rename "$uuid~", $uuid
3500	and return;	3856	and return;
3501		3857
3502	warn "uuid file written ($value).\n";	3858	trace "uuid file written ($value).\n";
3503		3859
3504	1	3860	1
3505		3861
3506	}	3862	}
3507		3863
…		…
3513	}	3869	}
3514		3870
3515	sub emergency_save() {	3871	sub emergency_save() {
3516	my $freeze_guard = cf::freeze_mainloop;	3872	my $freeze_guard = cf::freeze_mainloop;
3517		3873
3518	warn "enter emergency perl save\n";	3874	info "emergency_perl_save: enter\n";
		3875
		3876	# this is a trade-off: we want to be very quick here, so
		3877	# save all maps without fsync, and later call a global sync
		3878	# (which in turn might be very very slow)
		3879	local $USE_FSYNC = 0;
3519		3880
3520	cf::sync_job {	3881	cf::sync_job {
		3882	cf::write_runtime_sync; # external watchdog should not bark
		3883
3521	# use a peculiar iteration method to avoid tripping on perl	3884	# use a peculiar iteration method to avoid tripping on perl
3522	# refcount bugs in for. also avoids problems with players	3885	# refcount bugs in for. also avoids problems with players
3523	# and maps saved/destroyed asynchronously.	3886	# and maps saved/destroyed asynchronously.
3524	warn "begin emergency player save\n";	3887	info "emergency_perl_save: begin player save\n";
3525	for my $login (keys %cf::PLAYER) {	3888	for my $login (keys %cf::PLAYER) {
3526	my $pl = $cf::PLAYER{$login} or next;	3889	my $pl = $cf::PLAYER{$login} or next;
3527	$pl->valid or next;	3890	$pl->valid or next;
3528	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3891	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3529	$pl->save;	3892	$pl->save;
3530	}	3893	}
3531	warn "end emergency player save\n";	3894	info "emergency_perl_save: end player save\n";
3532		3895
3533	warn "begin emergency map save\n";	3896	cf::write_runtime_sync; # external watchdog should not bark
		3897
		3898	info "emergency_perl_save: begin map save\n";
3534	for my $path (keys %cf::MAP) {	3899	for my $path (keys %cf::MAP) {
3535	my $map = $cf::MAP{$path} or next;	3900	my $map = $cf::MAP{$path} or next;
3536	$map->valid or next;	3901	$map->valid or next;
3537	$map->save;	3902	$map->save;
3538	}	3903	}
3539	warn "end emergency map save\n";	3904	info "emergency_perl_save: end map save\n";
3540		3905
3541	warn "begin emergency database checkpoint\n";	3906	cf::write_runtime_sync; # external watchdog should not bark
		3907
		3908	info "emergency_perl_save: begin database checkpoint\n";
3542	BDB::db_env_txn_checkpoint $DB_ENV;	3909	BDB::db_env_txn_checkpoint $DB_ENV;
3543	warn "end emergency database checkpoint\n";	3910	info "emergency_perl_save: end database checkpoint\n";
3544		3911
3545	warn "begin write uuid\n";	3912	info "emergency_perl_save: begin write uuid\n";
3546	write_uuid_sync 1;	3913	write_uuid_sync 1;
3547	warn "end write uuid\n";	3914	info "emergency_perl_save: end write uuid\n";
		3915
		3916	cf::write_runtime_sync; # external watchdog should not bark
		3917
		3918	trace "emergency_perl_save: syncing database to disk";
		3919	BDB::db_env_txn_checkpoint $DB_ENV;
		3920
		3921	info "emergency_perl_save: starting sync\n";
		3922	IO::AIO::aio_sync sub {
		3923	info "emergency_perl_save: finished sync\n";
		3924	};
		3925
		3926	cf::write_runtime_sync; # external watchdog should not bark
		3927
		3928	trace "emergency_perl_save: flushing outstanding aio requests";
		3929	while (IO::AIO::nreqs || BDB::nreqs) {
		3930	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
		3931	}
		3932
		3933	cf::write_runtime_sync; # external watchdog should not bark
3548	};	3934	};
3549		3935
3550	warn "leave emergency perl save\n";	3936	info "emergency_perl_save: leave\n";
3551	}	3937	}
3552		3938
3553	sub post_cleanup {	3939	sub post_cleanup {
3554	my ($make_core) = @_;	3940	my ($make_core) = @_;
3555		3941
		3942	IO::AIO::flush;
		3943
3556	warn Carp::longmess "post_cleanup backtrace"	3944	error Carp::longmess "post_cleanup backtrace"
3557	if $make_core;	3945	if $make_core;
3558		3946
3559	my $fh = pidfile;	3947	my $fh = pidfile;
3560	unlink $PIDFILE if <$fh> == $$;	3948	unlink $PIDFILE if <$fh> == $$;
3561	}	3949	}
…		…
3581	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	3969	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3582	for my $name (keys %$leaf_symtab) {	3970	for my $name (keys %$leaf_symtab) {
3583	_gv_clear *{"$pkg$name"};	3971	_gv_clear *{"$pkg$name"};
3584	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	3972	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3585	}	3973	}
3586	warn "cleared package $pkg\n";#d#
3587	}	3974	}
3588		3975
3589	sub do_reload_perl() {	3976	sub do_reload_perl() {
3590	# can/must only be called in main	3977	# can/must only be called in main
3591	if ($Coro::current != $Coro::main) {	3978	unless (in_main) {
3592	warn "can only reload from main coroutine";	3979	error "can only reload from main coroutine";
3593	return;	3980	return;
3594	}	3981	}
3595		3982
3596	return if $RELOAD++;	3983	return if $RELOAD++;
3597		3984
		3985	my $t1 = AE::time;
		3986
3598	while ($RELOAD) {	3987	while ($RELOAD) {
3599	warn "reloading...";	3988	cf::get_slot 0.1, -1, "reload_perl";
		3989	info "perl_reload: reloading...";
3600		3990
3601	warn "entering sync_job";	3991	trace "perl_reload: entering sync_job";
3602		3992
3603	cf::sync_job {	3993	cf::sync_job {
3604	cf::write_runtime_sync; # external watchdog should not bark
3605	cf::emergency_save;	3994	#cf::emergency_save;
3606	cf::write_runtime_sync; # external watchdog should not bark
3607		3995
3608	warn "syncing database to disk";
3609	BDB::db_env_txn_checkpoint $DB_ENV;
3610
3611	# if anything goes wrong in here, we should simply crash as we already saved
3612
3613	warn "flushing outstanding aio requests";
3614	while (IO::AIO::nreqs || BDB::nreqs) {
3615	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3616	}
3617
3618	warn "cancelling all extension coros";	3996	trace "perl_reload: cancelling all extension coros";
3619	$_->cancel for values %EXT_CORO;	3997	$_->cancel for values %EXT_CORO;
3620	%EXT_CORO = ();	3998	%EXT_CORO = ();
3621		3999
3622	warn "removing commands";	4000	trace "perl_reload: removing commands";
3623	%COMMAND = ();	4001	%COMMAND = ();
3624		4002
3625	warn "removing ext/exti commands";	4003	trace "perl_reload: removing ext/exti commands";
3626	%EXTCMD = ();	4004	%EXTCMD = ();
3627	%EXTICMD = ();	4005	%EXTICMD = ();
3628		4006
3629	warn "unloading/nuking all extensions";	4007	trace "perl_reload: unloading/nuking all extensions";
3630	for my $pkg (@EXTS) {	4008	for my $pkg (@EXTS) {
3631	warn "... unloading $pkg";	4009	trace "... unloading $pkg";
3632		4010
3633	if (my $cb = $pkg->can ("unload")) {	4011	if (my $cb = $pkg->can ("unload")) {
3634	eval {	4012	eval {
3635	$cb->($pkg);	4013	$cb->($pkg);
3636	1	4014	1
3637	} or warn "$pkg unloaded, but with errors: $@";	4015	} or error "$pkg unloaded, but with errors: $@";
3638	}	4016	}
3639		4017
3640	warn "... clearing $pkg";	4018	trace "... clearing $pkg";
3641	clear_package $pkg;	4019	clear_package $pkg;
3642	}	4020	}
3643		4021
3644	warn "unloading all perl modules loaded from $LIBDIR";	4022	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3645	while (my ($k, $v) = each %INC) {	4023	while (my ($k, $v) = each %INC) {
3646	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4024	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3647		4025
3648	warn "... unloading $k";	4026	trace "... unloading $k";
3649	delete $INC{$k};	4027	delete $INC{$k};
3650		4028
3651	$k =~ s/\.pm$//;	4029	$k =~ s/\.pm$//;
3652	$k =~ s/\//::/g;	4030	$k =~ s/\//::/g;
3653		4031
…		…
3656	}	4034	}
3657		4035
3658	clear_package $k;	4036	clear_package $k;
3659	}	4037	}
3660		4038
3661	warn "getting rid of safe::, as good as possible";	4039	trace "perl_reload: getting rid of safe::, as good as possible";
3662	clear_package "safe::$_"	4040	clear_package "safe::$_"
3663	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4041	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3664		4042
3665	warn "unloading cf.pm \"a bit\"";	4043	trace "perl_reload: unloading cf.pm \"a bit\"";
3666	delete $INC{"cf.pm"};	4044	delete $INC{"cf.pm"};
3667	delete $INC{"cf/pod.pm"};	4045	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3668		4046
3669	# don't, removes xs symbols, too,	4047	# don't, removes xs symbols, too,
3670	# and global variables created in xs	4048	# and global variables created in xs
3671	#clear_package __PACKAGE__;	4049	#clear_package __PACKAGE__;
3672		4050
3673	warn "unload completed, starting to reload now";	4051	info "perl_reload: unload completed, starting to reload now";
3674		4052
3675	warn "reloading cf.pm";	4053	trace "perl_reload: reloading cf.pm";
3676	require cf;	4054	require cf;
3677	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	4055	cf::_connect_to_perl_1;
3678		4056
3679	warn "loading config and database again";	4057	trace "perl_reload: loading config and database again";
3680	cf::reload_config;	4058	cf::reload_config;
3681		4059
3682	warn "loading extensions";	4060	trace "perl_reload: loading extensions";
3683	cf::load_extensions;	4061	cf::load_extensions;
3684		4062
		4063	if ($REATTACH_ON_RELOAD) {
3685	warn "reattaching attachments to objects/players";	4064	trace "perl_reload: reattaching attachments to objects/players";
3686	_global_reattach; # objects, sockets	4065	_global_reattach; # objects, sockets
3687	warn "reattaching attachments to maps";	4066	trace "perl_reload: reattaching attachments to maps";
3688	reattach $_ for values %MAP;	4067	reattach $_ for values %MAP;
3689	warn "reattaching attachments to players";	4068	trace "perl_reload: reattaching attachments to players";
3690	reattach $_ for values %PLAYER;	4069	reattach $_ for values %PLAYER;
		4070	}
3691		4071
3692	warn "leaving sync_job";	4072	cf::_post_init 1;
		4073
		4074	trace "perl_reload: leaving sync_job";
3693		4075
3694	1	4076	1
3695	} or do {	4077	} or do {
3696	warn $@;	4078	error $@;
3697	cf::cleanup "error while reloading, exiting.";	4079	cf::cleanup "perl_reload: error, exiting.";
3698	};	4080	};
3699		4081
3700	warn "reloaded";
3701	--$RELOAD;	4082	--$RELOAD;
3702	}	4083	}
		4084
		4085	$t1 = AE::time - $t1;
		4086	info "perl_reload: completed in ${t1}s\n";
3703	};	4087	};
3704		4088
3705	our $RELOAD_WATCHER; # used only during reload	4089	our $RELOAD_WATCHER; # used only during reload
3706		4090
3707	sub reload_perl() {	4091	sub reload_perl() {
3708	# doing reload synchronously and two reloads happen back-to-back,	4092	# doing reload synchronously and two reloads happen back-to-back,
3709	# coro crashes during coro_state_free->destroy here.	4093	# coro crashes during coro_state_free->destroy here.
3710		4094
		4095	$RELOAD_WATCHER ||= cf::async {
		4096	Coro::AIO::aio_wait cache_extensions;
		4097
3711	$RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub {	4098	$RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3712	do_reload_perl;	4099	do_reload_perl;
3713	undef $RELOAD_WATCHER;	4100	undef $RELOAD_WATCHER;
		4101	};
3714	};	4102	};
3715	}	4103	}
3716		4104
3717	register_command "reload" => sub {	4105	register_command "reload" => sub {
3718	my ($who, $arg) = @_;	4106	my ($who, $arg) = @_;
…		…
3724	reload_perl;	4112	reload_perl;
3725	};	4113	};
3726	}	4114	}
3727	};	4115	};
3728		4116
3729	unshift @INC, $LIBDIR;	4117	#############################################################################
3730		4118
3731	my $bug_warning = 0;	4119	my $bug_warning = 0;
3732		4120
3733	our @WAIT_FOR_TICK;
3734	our @WAIT_FOR_TICK_BEGIN;
3735
3736	sub wait_for_tick {	4121	sub wait_for_tick() {
3737	return if tick_inhibit || $Coro::current == $Coro::main;	4122	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3738		4123
3739	my $signal = new Coro::Signal;	4124	$WAIT_FOR_TICK->wait;
3740	push @WAIT_FOR_TICK, $signal;
3741	$signal->wait;
3742	}	4125	}
3743		4126
3744	sub wait_for_tick_begin {	4127	sub wait_for_tick_begin() {
3745	return if tick_inhibit || $Coro::current == $Coro::main;	4128	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3746		4129
3747	my $signal = new Coro::Signal;	4130	my $signal = new Coro::Signal;
3748	push @WAIT_FOR_TICK_BEGIN, $signal;	4131	push @WAIT_FOR_TICK_BEGIN, $signal;
3749	$signal->wait;	4132	$signal->wait;
3750	}	4133	}
…		…
3754	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4137	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3755	unless ++$bug_warning > 10;	4138	unless ++$bug_warning > 10;
3756	return;	4139	return;
3757	}	4140	}
3758		4141
3759	cf::server_tick; # one server iteration	4142	cf::one_tick; # one server iteration
		4143
		4144	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3760		4145
3761	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4146	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3762	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4147	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3763	Coro::async_pool {	4148	Coro::async_pool {
3764	$Coro::current->{desc} = "runtime saver";	4149	$Coro::current->{desc} = "runtime saver";
3765	write_runtime_sync	4150	write_runtime_sync
3766	or warn "ERROR: unable to write runtime file: $!";	4151	or error "ERROR: unable to write runtime file: $!";
3767	};	4152	};
3768	}	4153	}
3769		4154
3770	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4155	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3771	$sig->send;	4156	$sig->send;
3772	}	4157	}
3773	while (my $sig = shift @WAIT_FOR_TICK) {	4158	$WAIT_FOR_TICK->broadcast;
3774	$sig->send;
3775	}
3776		4159
3777	$LOAD = ($NOW - $TICK_START) / $TICK;	4160	$LOAD = ($NOW - $TICK_START) / $TICK;
3778	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4161	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3779		4162
3780	if (0) {	4163	if (0) {
3781	if ($NEXT_TICK) {	4164	if ($NEXT_TICK) {
3782	my $jitter = $TICK_START - $NEXT_TICK;	4165	my $jitter = $TICK_START - $NEXT_TICK;
3783	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4166	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
3784	warn "jitter $JITTER\n";#d#	4167	debug "jitter $JITTER\n";#d#
3785	}	4168	}
3786	}	4169	}
3787	}	4170	}
3788		4171
3789	{	4172	{
3790	# configure BDB	4173	# configure BDB
3791		4174
3792	BDB::min_parallel 8;	4175	BDB::min_parallel 16;
3793	BDB::max_poll_reqs $TICK * 0.1;	4176	BDB::max_poll_reqs $TICK * 0.1;
3794	$AnyEvent::BDB::WATCHER->priority (1);	4177	#$AnyEvent::BDB::WATCHER->priority (1);
3795		4178
3796	unless ($DB_ENV) {	4179	unless ($DB_ENV) {
3797	$DB_ENV = BDB::db_env_create;	4180	$DB_ENV = BDB::db_env_create;
3798	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4181	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3799	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4182	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
3834	IO::AIO::min_parallel 8;	4217	IO::AIO::min_parallel 8;
3835	IO::AIO::max_poll_time $TICK * 0.1;	4218	IO::AIO::max_poll_time $TICK * 0.1;
3836	undef $AnyEvent::AIO::WATCHER;	4219	undef $AnyEvent::AIO::WATCHER;
3837	}	4220	}
3838		4221
3839	my $_log_backtrace;	4222	our $_log_backtrace;
		4223	our $_log_backtrace_last;
3840		4224
3841	sub _log_backtrace {	4225	sub _log_backtrace {
3842	my ($msg, @addr) = @_;	4226	my ($msg, @addr) = @_;
3843		4227
3844	$msg =~ s/\n//;	4228	$msg =~ s/\n$//;
3845		4229
		4230	if ($_log_backtrace_last eq $msg) {
		4231	LOG llevInfo, "[ABT] $msg\n";
		4232	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3846	# limit the # of concurrent backtraces	4233	# limit the # of concurrent backtraces
3847	if ($_log_backtrace < 2) {	4234	} elsif ($_log_backtrace < 2) {
		4235	$_log_backtrace_last = $msg;
3848	++$_log_backtrace;	4236	++$_log_backtrace;
3849	my $perl_bt = Carp::longmess $msg;	4237	my $perl_bt = Carp::longmess $msg;
3850	async {	4238	async {
3851	$Coro::current->{desc} = "abt $msg";	4239	$Coro::current->{desc} = "abt $msg";
3852		4240
…		…
3872	LOG llevInfo, "[ABT] $_\n" for @bt;	4260	LOG llevInfo, "[ABT] $_\n" for @bt;
3873	--$_log_backtrace;	4261	--$_log_backtrace;
3874	};	4262	};
3875	} else {	4263	} else {
3876	LOG llevInfo, "[ABT] $msg\n";	4264	LOG llevInfo, "[ABT] $msg\n";
3877	LOG llevInfo, "[ABT] [suppressed]\n";	4265	LOG llevInfo, "[ABT] [overload, suppressed]\n";
3878	}	4266	}
3879	}	4267	}
3880		4268
3881	# load additional modules	4269	# load additional modules
3882	use cf::pod;	4270	require "cf/$_.pm" for @EXTRA_MODULES;
		4271	cf::_connect_to_perl_2;
3883		4272
3884	END { cf::emergency_save }	4273	END { cf::emergency_save }
3885		4274
3886	1	4275	1
3887		4276

Diff Legend

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