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.475 by root, Tue Jul 21 06:17:00 2009 UTC vs.
Revision 1.567 by root, Mon May 2 16:16:00 2011 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 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 qw(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 Guard ();
38	use Coro ();	38	use Coro ();
39	use Coro::State;	39	use Coro::State;
40	use Coro::Handle;	40	use Coro::Handle;
…		…
51	use Coro::Util ();	51	use Coro::Util ();
52		52
53	use JSON::XS 2.01 ();	53	use JSON::XS 2.01 ();
54	use BDB ();	54	use BDB ();
55	use Data::Dumper;	55	use Data::Dumper;
56	use Digest::MD5;
57	use Fcntl;	56	use Fcntl;
58	use YAML ();	57	use YAML::XS ();
59	use IO::AIO ();	58	use IO::AIO ();
60	use Time::HiRes;	59	use Time::HiRes;
61	use Compress::LZF;	60	use Compress::LZF;
62	use Digest::MD5 ();	61	use Digest::MD5 ();
63		62
…		…
76		75
77	# strictly for debugging	76	# strictly for debugging
78	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };	77	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
79		78
80	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;
81		82
82	our %COMMAND = ();	83	our %COMMAND = ();
83	our %COMMAND_TIME = ();	84	our %COMMAND_TIME = ();
84		85
85	our @EXTS = (); # list of extension package names	86	our @EXTS = (); # list of extension package names
…		…
88	our %EXT_CORO = (); # coroutines bound to extensions	89	our %EXT_CORO = (); # coroutines bound to extensions
89	our %EXT_MAP = (); # pluggable maps	90	our %EXT_MAP = (); # pluggable maps
90		91
91	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
92	our @EVENT;	93	our @EVENT;
		94	our @REFLECT; # set by XS
		95	our %REFLECT; # set by us
93		96
94	our $CONFDIR = confdir;	97	our $CONFDIR = confdir;
		98
95	our $DATADIR = datadir;	99	our $DATADIR = datadir;
96	our $LIBDIR = "$DATADIR/ext";	100	our $LIBDIR = "$DATADIR/ext";
97	our $PODDIR = "$DATADIR/pod";	101	our $PODDIR = "$DATADIR/pod";
98	our $MAPDIR = "$DATADIR/" . mapdir;	102	our $MAPDIR = "$DATADIR/" . mapdir;
		103
99	our $LOCALDIR = localdir;	104	our $LOCALDIR = localdir;
100	our $TMPDIR = "$LOCALDIR/" . tmpdir;	105	our $TMPDIR = "$LOCALDIR/" . tmpdir;
101	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	106	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
102	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	107	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
103	our $RANDOMDIR = "$LOCALDIR/random";	108	our $RANDOMDIR = "$LOCALDIR/random";
104	our $BDBDIR = "$LOCALDIR/db";	109	our $BDBDIR = "$LOCALDIR/db";
105	our $PIDFILE = "$LOCALDIR/pid";	110	our $PIDFILE = "$LOCALDIR/pid";
106	our $RUNTIMEFILE = "$LOCALDIR/runtime";	111	our $RUNTIMEFILE = "$LOCALDIR/runtime";
107		112
108	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;
109		120
110	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	121	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
111	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	122	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
112	our $NEXT_TICK;	123	our $NEXT_TICK;
113	our $USE_FSYNC = 1; # use fsync to write maps - default on	124	our $USE_FSYNC = 1; # use fsync to write maps - default on
…		…
115	our $BDB_DEADLOCK_WATCHER;	126	our $BDB_DEADLOCK_WATCHER;
116	our $BDB_CHECKPOINT_WATCHER;	127	our $BDB_CHECKPOINT_WATCHER;
117	our $BDB_TRICKLE_WATCHER;	128	our $BDB_TRICKLE_WATCHER;
118	our $DB_ENV;	129	our $DB_ENV;
119		130
120	our @EXTRA_MODULES = qw(pod mapscript);	131	our @EXTRA_MODULES = qw(pod match mapscript incloader);
121		132
122	our %CFG;	133	our %CFG;
123		134
124	our $UPTIME; $UPTIME ||= time;	135	our $UPTIME; $UPTIME ||= time;
125	our $RUNTIME;	136	our $RUNTIME;
…		…
159		170
160	our $EMERGENCY_POSITION;	171	our $EMERGENCY_POSITION;
161		172
162	sub cf::map::normalise;	173	sub cf::map::normalise;
163		174
		175	sub in_main() {
		176	$Coro::current == $Coro::main
		177	}
		178
		179	#############################################################################
		180
		181	%REFLECT = ();
		182	for (@REFLECT) {
		183	my $reflect = JSON::XS::decode_json $_;
		184	$REFLECT{$reflect->{class}} = $reflect;
		185	}
		186
		187	# this is decidedly evil
		188	$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
		189
164	#############################################################################	190	#############################################################################
165		191
166	=head2 GLOBAL VARIABLES	192	=head2 GLOBAL VARIABLES
167		193
168	=over 4	194	=over 4
…		…
209	from wherever your confdir points to.	235	from wherever your confdir points to.
210		236
211	=item cf::wait_for_tick, cf::wait_for_tick_begin	237	=item cf::wait_for_tick, cf::wait_for_tick_begin
212		238
213	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	239	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
214	returns directly I<after> the tick processing (and consequently, can only wake one process	240	returns directly I<after> the tick processing (and consequently, can only wake one thread
215	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	241	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
216		242
		243	=cut
		244
		245	sub wait_for_tick();
		246	sub wait_for_tick_begin();
		247
217	=item @cf::INVOKE_RESULTS	248	=item @cf::INVOKE_RESULTS
218		249
219	This array contains the results of the last C<invoke ()> call. When	250	This array contains the results of the last C<invoke ()> call. When
220	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of	251	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
221	that call.	252	that call.
222		253
		254	=item %cf::REFLECT
		255
		256	Contains, for each (C++) class name, a hash reference with information
		257	about object members (methods, scalars, arrays and flags) and other
		258	metadata, which is useful for introspection.
		259
223	=back	260	=back
224		261
225	=cut	262	=cut
226		263
227	BEGIN {	264	sub error(@) { LOG llevError, join "", @_ }
228	*CORE::GLOBAL::warn = sub {	265	sub warn (@) { LOG llevWarn , join "", @_ }
		266	sub info (@) { LOG llevInfo , join "", @_ }
		267	sub debug(@) { LOG llevDebug, join "", @_ }
		268	sub trace(@) { LOG llevTrace, join "", @_ }
		269
		270	$Coro::State::WARNHOOK = sub {
229	my $msg = join "", @_;	271	my $msg = join "", @_;
230		272
231	$msg .= "\n"	273	$msg .= "\n"
232	unless $msg =~ /\n$/;	274	unless $msg =~ /\n$/;
233		275
234	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	276	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
235		277
236	LOG llevError, $msg;	278	LOG llevWarn, $msg;
237	};	279	};
238	}
239		280
240	$Coro::State::DIEHOOK = sub {	281	$Coro::State::DIEHOOK = sub {
241	return unless $^S eq 0; # "eq", not "=="	282	return unless $^S eq 0; # "eq", not "=="
242		283
243	if ($Coro::current == $Coro::main) {#d#	284	error Carp::longmess $_[0];
		285
		286	if (in_main) {#d#
244	warn "DIEHOOK called in main context, Coro bug?\n";#d#	287	error "DIEHOOK called in main context, Coro bug?\n";#d#
245	return;#d#	288	return;#d#
246	}#d#	289	}#d#
247		290
248	# kill coroutine otherwise	291	# kill coroutine otherwise
249	warn Carp::longmess $_[0];
250	Coro::terminate	292	Coro::terminate
251	};	293	};
252
253	$SIG{__DIE__} = sub { }; #d#?
254		294
255	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	295	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
256	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	296	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
257	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	297	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
258	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	298	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
…		…
272	)) {	312	)) {
273	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	313	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
274	}	314	}
275		315
276	$EV::DIED = sub {	316	$EV::DIED = sub {
277	warn "error in event callback: @_";	317	Carp::cluck "error in event callback: @_";
278	};	318	};
		319
		320	#############################################################################
		321
		322	sub fork_call(&@);
		323	sub get_slot($;$$);
279		324
280	#############################################################################	325	#############################################################################
281		326
282	=head2 UTILITY FUNCTIONS	327	=head2 UTILITY FUNCTIONS
283		328
…		…
304	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	349	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
305	$d	350	$d
306	} || "[unable to dump $_[0]: '$@']";	351	} || "[unable to dump $_[0]: '$@']";
307	}	352	}
308		353
		354	=item $scalar = load_file $path
		355
		356	Loads the given file from path and returns its contents. Croaks on error
		357	and can block.
		358
		359	=cut
		360
		361	sub load_file($) {
		362	0 <= aio_load $_[0], my $data
		363	or Carp::croak "$_[0]: $!";
		364
		365	$data
		366	}
		367
309	=item $ref = cf::decode_json $json	368	=item $ref = cf::decode_json $json
310		369
311	Converts a JSON string into the corresponding perl data structure.	370	Converts a JSON string into the corresponding perl data structure.
312		371
313	=item $json = cf::encode_json $ref	372	=item $json = cf::encode_json $ref
…		…
319	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	378	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
320		379
321	sub encode_json($) { $json_coder->encode ($_[0]) }	380	sub encode_json($) { $json_coder->encode ($_[0]) }
322	sub decode_json($) { $json_coder->decode ($_[0]) }	381	sub decode_json($) { $json_coder->decode ($_[0]) }
323		382
		383	=item $ref = cf::decode_storable $scalar
		384
		385	Same as Coro::Storable::thaw, so blocks.
		386
		387	=cut
		388
		389	BEGIN { *decode_storable = \&Coro::Storable::thaw }
		390
		391	=item $ref = cf::decode_yaml $scalar
		392
		393	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
		394
		395	=cut
		396
		397	sub decode_yaml($) {
		398	fork_call { YAML::XS::Load $_[0] } @_
		399	}
		400
		401	=item $scalar = cf::unlzf $scalar
		402
		403	Same as Compress::LZF::compress, but takes server ticks into account, so
		404	blocks.
		405
		406	=cut
		407
		408	sub unlzf($) {
		409	# we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
		410	cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
		411	Compress::LZF::decompress $_[0]
		412	}
		413
324	=item cf::post_init { BLOCK }	414	=item cf::post_init { BLOCK }
325		415
326	Execute the given codeblock, I<after> all extensions have been (re-)loaded,	416	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
327	but I<before> the server starts ticking again.	417	but I<before> the server starts ticking again.
328		418
329	The cdoeblock will have a single boolean argument to indicate whether this	419	The codeblock will have a single boolean argument to indicate whether this
330	is a reload or not.	420	is a reload or not.
331		421
332	=cut	422	=cut
333		423
334	sub post_init(&) {	424	sub post_init(&) {
335	push @POST_INIT, shift;	425	push @POST_INIT, shift;
		426	}
		427
		428	sub _post_init {
		429	trace "running post_init jobs";
		430
		431	# run them in parallel...
		432
		433	my @join;
		434
		435	while () {
		436	push @join, map &Coro::async ($_, 0), @POST_INIT;
		437	@POST_INIT = ();
		438
		439	@join or last;
		440
		441	(pop @join)->join;
		442	}
336	}	443	}
337		444
338	=item cf::lock_wait $string	445	=item cf::lock_wait $string
339		446
340	Wait until the given lock is available. See cf::lock_acquire.	447	Wait until the given lock is available. See cf::lock_acquire.
…		…
379	}	486	}
380		487
381	=item cf::periodic $interval, $cb	488	=item cf::periodic $interval, $cb
382		489
383	Like EV::periodic, but randomly selects a starting point so that the actions	490	Like EV::periodic, but randomly selects a starting point so that the actions
384	get spread over timer.	491	get spread over time.
385		492
386	=cut	493	=cut
387		494
388	sub periodic($$) {	495	sub periodic($$) {
389	my ($interval, $cb) = @_;	496	my ($interval, $cb) = @_;
…		…
393	EV::periodic $start, $interval, 0, $cb	500	EV::periodic $start, $interval, 0, $cb
394	}	501	}
395		502
396	=item cf::get_slot $time[, $priority[, $name]]	503	=item cf::get_slot $time[, $priority[, $name]]
397		504
398	Allocate $time seconds of blocking CPU time at priority C<$priority>:	505	Allocate $time seconds of blocking CPU time at priority C<$priority>
399	This call blocks and returns only when you have at least C<$time> seconds	506	(default: 0): This call blocks and returns only when you have at least
400	of cpu time till the next tick. The slot is only valid till the next cede.	507	C<$time> seconds of cpu time till the next tick. The slot is only valid
		508	till the next cede.
		509
		510	Background jobs should use a priority les than zero, interactive jobs
		511	should use 100 or more.
401		512
402	The optional C<$name> can be used to identify the job to run. It might be	513	The optional C<$name> can be used to identify the job to run. It might be
403	used for statistical purposes and should identify the same time-class.	514	used for statistical purposes and should identify the same time-class.
404		515
405	Useful for short background jobs.	516	Useful for short background jobs.
406		517
407	=cut	518	=cut
408		519
409	our @SLOT_QUEUE;	520	our @SLOT_QUEUE;
410	our $SLOT_QUEUE;	521	our $SLOT_QUEUE;
		522	our $SLOT_DECAY = 0.9;
411		523
412	$SLOT_QUEUE->cancel if $SLOT_QUEUE;	524	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
413	$SLOT_QUEUE = Coro::async {	525	$SLOT_QUEUE = Coro::async {
414	$Coro::current->desc ("timeslot manager");	526	$Coro::current->desc ("timeslot manager");
415		527
416	my $signal = new Coro::Signal;	528	my $signal = new Coro::Signal;
		529	my $busy;
417		530
418	while () {	531	while () {
419	next_job:	532	next_job:
		533
420	my $avail = cf::till_tick;	534	my $avail = cf::till_tick;
421	if ($avail > 0.01) {	535
422	for (0 .. $#SLOT_QUEUE) {	536	for (0 .. $#SLOT_QUEUE) {
423	if ($SLOT_QUEUE[$_][0] < $avail) {	537	if ($SLOT_QUEUE[$_][0] <= $avail) {
		538	$busy = 0;
424	my $job = splice @SLOT_QUEUE, $_, 1, ();	539	my $job = splice @SLOT_QUEUE, $_, 1, ();
425	$job->[2]->send;	540	$job->[2]->send;
426	Coro::cede;	541	Coro::cede;
427	goto next_job;	542	goto next_job;
428	}	543	} else {
		544	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
429	}	545	}
430	}	546	}
431		547
432	if (@SLOT_QUEUE) {	548	if (@SLOT_QUEUE) {
433	# we do not use wait_for_tick() as it returns immediately when tick is inactive	549	# we do not use wait_for_tick() as it returns immediately when tick is inactive
434	push @cf::WAIT_FOR_TICK, $signal;	550	push @cf::WAIT_FOR_TICK, $signal;
435	$signal->wait;	551	$signal->wait;
436	} else {	552	} else {
		553	$busy = 0;
437	Coro::schedule;	554	Coro::schedule;
438	}	555	}
439	}	556	}
440	};	557	};
441		558
442	sub get_slot($;$$) {	559	sub get_slot($;$$) {
443	return if tick_inhibit || $Coro::current == $Coro::main;	560	return if tick_inhibit || $Coro::current == $Coro::main;
444		561
445	my ($time, $pri, $name) = @_;	562	my ($time, $pri, $name) = @_;
446		563
447	$time = $TICK * .6 if $time > $TICK * .6;	564	$time = clamp $time, 0.01, $TICK * .6;
		565
448	my $sig = new Coro::Signal;	566	my $sig = new Coro::Signal;
449		567
450	push @SLOT_QUEUE, [$time, $pri, $sig, $name];	568	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
451	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;	569	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
452	$SLOT_QUEUE->ready;	570	$SLOT_QUEUE->ready;
…		…
478	=cut	596	=cut
479		597
480	sub sync_job(&) {	598	sub sync_job(&) {
481	my ($job) = @_;	599	my ($job) = @_;
482		600
483	if ($Coro::current == $Coro::main) {	601	if (in_main) {
484	my $time = EV::time;	602	my $time = AE::time;
485		603
486	# this is the main coro, too bad, we have to block	604	# this is the main coro, too bad, we have to block
487	# till the operation succeeds, freezing the server :/	605	# till the operation succeeds, freezing the server :/
488		606
489	LOG llevError, Carp::longmess "sync job";#d#	607	#LOG llevError, Carp::longmess "sync job";#d#
490		608
491	my $freeze_guard = freeze_mainloop;	609	my $freeze_guard = freeze_mainloop;
492		610
493	my $busy = 1;	611	my $busy = 1;
494	my @res;	612	my @res;
495		613
496	(async {	614	(async {
497	$Coro::current->desc ("sync job coro");	615	$Coro::current->desc ("sync job coro");
498	@res = eval { $job->() };	616	@res = eval { $job->() };
499	warn $@ if $@;	617	error $@ if $@;
500	undef $busy;	618	undef $busy;
501	})->prio (Coro::PRIO_MAX);	619	})->prio (Coro::PRIO_MAX);
502		620
503	while ($busy) {	621	while ($busy) {
504	if (Coro::nready) {	622	if (Coro::nready) {
…		…
506	} else {	624	} else {
507	EV::loop EV::LOOP_ONESHOT;	625	EV::loop EV::LOOP_ONESHOT;
508	}	626	}
509	}	627	}
510		628
511	my $time = EV::time - $time;	629	my $time = AE::time - $time;
512		630
513	$TICK_START += $time; # do not account sync jobs to server load	631	$TICK_START += $time; # do not account sync jobs to server load
514		632
515	wantarray ? @res : $res[0]	633	wantarray ? @res : $res[0]
516	} else {	634	} else {
…		…
538	$EXT_CORO{$coro+0} = $coro;	656	$EXT_CORO{$coro+0} = $coro;
539		657
540	$coro	658	$coro
541	}	659	}
542		660
543	=item fork_call { }, $args	661	=item fork_call { }, @args
544		662
545	Executes the given code block with the given arguments in a seperate	663	Executes the given code block with the given arguments in a seperate
546	process, returning the results. Everything must be serialisable with	664	process, returning the results. Everything must be serialisable with
547	Coro::Storable. May, of course, block. Note that the executed sub may	665	Coro::Storable. May, of course, block. Note that the executed sub may
548	never block itself or use any form of event handling.	666	never block itself or use any form of event handling.
549		667
550	=cut	668	=cut
551		669
		670	sub post_fork {
		671	reset_signals;
		672	}
		673
552	sub fork_call(&@) {	674	sub fork_call(&@) {
553	my ($cb, @args) = @_;	675	my ($cb, @args) = @_;
554		676
555	# we seemingly have to make a local copy of the whole thing,	677	# we seemingly have to make a local copy of the whole thing,
556	# otherwise perl prematurely frees the stuff :/	678	# otherwise perl prematurely frees the stuff :/
557	# TODO: investigate and fix (likely this will be rather laborious)	679	# TODO: investigate and fix (likely this will be rather laborious)
558		680
559	my @res = Coro::Util::fork_eval {	681	my @res = Coro::Util::fork_eval {
560	reset_signals;	682	cf::post_fork;
561	&$cb	683	&$cb
562	}, @args;	684	} @args;
563		685
564	wantarray ? @res : $res[-1]	686	wantarray ? @res : $res[-1]
		687	}
		688
		689	sub objinfo {
		690	(
		691	"counter value" => cf::object::object_count,
		692	"objects created" => cf::object::create_count,
		693	"objects destroyed" => cf::object::destroy_count,
		694	"freelist size" => cf::object::free_count,
		695	"allocated objects" => cf::object::objects_size,
		696	"active objects" => cf::object::actives_size,
		697	)
565	}	698	}
566		699
567	=item $coin = coin_from_name $name	700	=item $coin = coin_from_name $name
568		701
569	=cut	702	=cut
…		…
606	within each server.	739	within each server.
607		740
608	=cut	741	=cut
609		742
610	sub db_table($) {	743	sub db_table($) {
		744	cf::error "db_get called from main context"
		745	if $Coro::current == $Coro::main;
		746
611	my ($name) = @_;	747	my ($name) = @_;
612	my $db = BDB::db_create $DB_ENV;	748	my $db = BDB::db_create $DB_ENV;
613		749
614	eval {	750	eval {
615	$db->set_flags (BDB::CHKSUM);	751	$db->set_flags (BDB::CHKSUM);
…		…
625	}	761	}
626		762
627	our $DB;	763	our $DB;
628		764
629	sub db_init {	765	sub db_init {
630	cf::sync_job {
631	$DB ||= db_table "db";	766	$DB ||= db_table "db";
632	};
633	}	767	}
634		768
635	sub db_get($$) {	769	sub db_get($$) {
636	my $key = "$_[0]/$_[1]";	770	my $key = "$_[0]/$_[1]";
637		771
638	cf::sync_job {	772	cf::error "db_get called from main context"
		773	if $Coro::current == $Coro::main;
		774
639	BDB::db_get $DB, undef, $key, my $data;	775	BDB::db_get $DB, undef, $key, my $data;
640		776
641	$! ? ()	777	$! ? ()
642	: $data	778	: $data
643	}
644	}	779	}
645		780
646	sub db_put($$$) {	781	sub db_put($$$) {
647	BDB::dbreq_pri 4;	782	BDB::dbreq_pri 4;
648	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	783	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
676		811
677	my @data;	812	my @data;
678	my $md5;	813	my $md5;
679		814
680	for (0 .. $#$src) {	815	for (0 .. $#$src) {
681	0 <= aio_load $src->[$_], $data[$_]	816	$data[$_] = load_file $src->[$_];
682	or Carp::croak "$src->[$_]: $!";
683	}	817	}
684		818
685	# if processing is expensive, check	819	# if processing is expensive, check
686	# checksum first	820	# checksum first
687	if (1) {	821	if (1) {
…		…
704		838
705	my $t1 = Time::HiRes::time;	839	my $t1 = Time::HiRes::time;
706	my $data = $process->(\@data);	840	my $data = $process->(\@data);
707	my $t2 = Time::HiRes::time;	841	my $t2 = Time::HiRes::time;
708		842
709	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	843	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
710		844
711	db_put cache => "$id/data", $data;	845	db_put cache => "$id/data", $data;
712	db_put cache => "$id/md5" , $md5;	846	db_put cache => "$id/md5" , $md5;
713	db_put cache => "$id/meta", $meta;	847	db_put cache => "$id/meta", $meta;
714		848
…		…
724		858
725	=cut	859	=cut
726		860
727	sub datalog($@) {	861	sub datalog($@) {
728	my ($type, %kv) = @_;	862	my ($type, %kv) = @_;
729	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	863	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
730	}	864	}
731		865
732	=back	866	=back
733		867
734	=cut	868	=cut
…		…
929		1063
930	} elsif (exists $cb_id{$type}) {	1064	} elsif (exists $cb_id{$type}) {
931	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	1065	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
932		1066
933	} elsif (ref $type) {	1067	} elsif (ref $type) {
934	warn "attaching objects not supported, ignoring.\n";	1068	error "attaching objects not supported, ignoring.\n";
935		1069
936	} else {	1070	} else {
937	shift @arg;	1071	shift @arg;
938	warn "attach argument '$type' not supported, ignoring.\n";	1072	error "attach argument '$type' not supported, ignoring.\n";
939	}	1073	}
940	}	1074	}
941	}	1075	}
942		1076
943	sub _object_attach {	1077	sub _object_attach {
…		…
953	_attach $registry, $klass, @attach;	1087	_attach $registry, $klass, @attach;
954	}	1088	}
955		1089
956	$obj->{$name} = \%arg;	1090	$obj->{$name} = \%arg;
957	} else {	1091	} else {
958	warn "object uses attachment '$name' which is not available, postponing.\n";	1092	info "object uses attachment '$name' which is not available, postponing.\n";
959	}	1093	}
960		1094
961	$obj->{_attachment}{$name} = undef;	1095	$obj->{_attachment}{$name} = undef;
962	}	1096	}
963		1097
…		…
1022		1156
1023	for (@$callbacks) {	1157	for (@$callbacks) {
1024	eval { &{$_->[1]} };	1158	eval { &{$_->[1]} };
1025		1159
1026	if ($@) {	1160	if ($@) {
1027	warn "$@";
1028	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1161	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1029	override;	1162	override;
1030	}	1163	}
1031		1164
1032	return 1 if $override;	1165	return 1 if $override;
1033	}	1166	}
…		…
1112	for (@$attach) {	1245	for (@$attach) {
1113	my ($klass, @attach) = @$_;	1246	my ($klass, @attach) = @$_;
1114	_attach $registry, $klass, @attach;	1247	_attach $registry, $klass, @attach;
1115	}	1248	}
1116	} else {	1249	} else {
1117	warn "object uses attachment '$name' that is not available, postponing.\n";	1250	info "object uses attachment '$name' that is not available, postponing.\n";
1118	}	1251	}
1119	}	1252	}
1120	}	1253	}
1121		1254
1122	cf::attachable->attach (	1255	cf::attachable->attach (
…		…
1149	my ($filename, $rdata, $objs) = @_;	1282	my ($filename, $rdata, $objs) = @_;
1150		1283
1151	sync_job {	1284	sync_job {
1152	if (length $$rdata) {	1285	if (length $$rdata) {
1153	utf8::decode (my $decname = $filename);	1286	utf8::decode (my $decname = $filename);
1154	warn sprintf "saving %s (%d,%d)\n",	1287	trace sprintf "saving %s (%d,%d)\n",
1155	$decname, length $$rdata, scalar @$objs;	1288	$decname, length $$rdata, scalar @$objs
		1289	if $VERBOSE_IO;
1156		1290
1157	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1291	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1158	aio_chmod $fh, SAVE_MODE;	1292	aio_chmod $fh, SAVE_MODE;
1159	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1293	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1160	if ($cf::USE_FSYNC) {	1294	if ($cf::USE_FSYNC) {
…		…
1182	aio_rename "$filename~", $filename;	1316	aio_rename "$filename~", $filename;
1183		1317
1184	$filename =~ s%/[^/]+$%%;	1318	$filename =~ s%/[^/]+$%%;
1185	aio_pathsync $filename if $cf::USE_FSYNC;	1319	aio_pathsync $filename if $cf::USE_FSYNC;
1186	} else {	1320	} else {
1187	warn "unable to save objects: $filename~: $!\n";	1321	error "unable to save objects: $filename~: $!\n";
1188	}	1322	}
1189	} else {	1323	} else {
1190	aio_unlink $filename;	1324	aio_unlink $filename;
1191	aio_unlink "$filename.pst";	1325	aio_unlink "$filename.pst";
1192	}	1326	}
…		…
1216	my $st = eval { Coro::Storable::thaw $av };	1350	my $st = eval { Coro::Storable::thaw $av };
1217	$av = $st->{objs};	1351	$av = $st->{objs};
1218	}	1352	}
1219		1353
1220	utf8::decode (my $decname = $filename);	1354	utf8::decode (my $decname = $filename);
1221	warn sprintf "loading %s (%d,%d)\n",	1355	trace sprintf "loading %s (%d,%d)\n",
1222	$decname, length $data, scalar @{$av || []};	1356	$decname, length $data, scalar @{$av || []}
		1357	if $VERBOSE_IO;
1223		1358
1224	($data, $av)	1359	($data, $av)
1225	}	1360	}
1226		1361
1227	=head2 COMMAND CALLBACKS	1362	=head2 COMMAND CALLBACKS
…		…
1286	}	1421	}
1287		1422
1288	use File::Glob ();	1423	use File::Glob ();
1289		1424
1290	cf::player->attach (	1425	cf::player->attach (
1291	on_command => sub {	1426	on_unknown_command => sub {
1292	my ($pl, $name, $params) = @_;	1427	my ($pl, $name, $params) = @_;
1293		1428
1294	my $cb = $COMMAND{$name}	1429	my $cb = $COMMAND{$name}
1295	or return;	1430	or return;
1296		1431
…		…
1319		1454
1320	$pl->ext_reply ($reply, @reply)	1455	$pl->ext_reply ($reply, @reply)
1321	if $reply;	1456	if $reply;
1322		1457
1323	} else {	1458	} else {
1324	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1459	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1325	}	1460	}
1326		1461
1327	cf::override;	1462	cf::override;
1328	},	1463	},
1329	);	1464	);
…		…
1340		1475
1341	$grp	1476	$grp
1342	}	1477	}
1343		1478
1344	sub load_extensions {	1479	sub load_extensions {
		1480	info "loading extensions...";
		1481
1345	cf::sync_job {	1482	cf::sync_job {
1346	my %todo;	1483	my %todo;
1347		1484
1348	for my $path (<$LIBDIR/*.ext>) {	1485	for my $path (<$LIBDIR/*.ext>) {
1349	next unless -r $path;	1486	next unless -r $path;
…		…
1367		1504
1368	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1505	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1369	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1506	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1370		1507
1371	$ext{source} =	1508	$ext{source} =
1372	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1509	"package $pkg; use common::sense;\n"
1373	. "#line 1 \"$path\"\n{\n"	1510	. "#line 1 \"$path\"\n{\n"
1374	. $source	1511	. $source
1375	. "\n};\n1";	1512	. "\n};\n1";
1376		1513
1377	$todo{$base} = \%ext;	1514	$todo{$base} = \%ext;
1378	}	1515	}
1379		1516
		1517	my $pass = 0;
1380	my %done;	1518	my %done;
1381	while (%todo) {	1519	while (%todo) {
1382	my $progress;	1520	my $progress;
1383		1521
		1522	++$pass;
		1523
		1524	ext:
1384	while (my ($k, $v) = each %todo) {	1525	while (my ($k, $v) = each %todo) {
1385	for (split /,\s*/, $v->{meta}{depends}) {	1526	for (split /,\s*/, $v->{meta}{depends}) {
1386	goto skip	1527	next ext
1387	unless exists $done{$_};	1528	unless exists $done{$_};
1388	}	1529	}
1389		1530
1390	warn "... loading '$k' into '$v->{pkg}'\n";	1531	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1391		1532
1392	unless (eval $v->{source}) {	1533	my $active = eval $v->{source};
		1534
		1535	if (length $@) {
1393	my $msg = $@ ? "$v->{path}: $@\n"	1536	error "$v->{path}: $@\n";
1394	: "$v->{base}: extension inactive.\n";
1395		1537
1396	if (exists $v->{meta}{mandatory}) {
1397	warn $msg;
1398	cf::cleanup "mandatory extension failed to load, exiting.";	1538	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1399	}	1539	if exists $v->{meta}{mandatory};
1400		1540
1401	warn $msg;	1541	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
		1542	delete $todo{$k};
		1543	} else {
		1544	$done{$k} = delete $todo{$k};
		1545	push @EXTS, $v->{pkg};
		1546	$progress = 1;
		1547
		1548	info "$v->{base}: extension inactive.\n"
		1549	unless $active;
1402	}	1550	}
1403
1404	$done{$k} = delete $todo{$k};
1405	push @EXTS, $v->{pkg};
1406	$progress = 1;
1407	}	1551	}
1408		1552
1409	skip:	1553	unless ($progress) {
1410	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"	1554	warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1411	unless $progress;	1555
		1556	while (my ($k, $v) = each %todo) {
		1557	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
		1558	if exists $v->{meta}{mandatory};
		1559	}
		1560
		1561	last;
		1562	}
1412	}	1563	}
1413	};	1564	};
1414	}	1565	}
1415		1566
1416	#############################################################################	1567	#############################################################################
…		…
1500	$cf::PLAYER{$login} = $pl	1651	$cf::PLAYER{$login} = $pl
1501	}	1652	}
1502	}	1653	}
1503	}	1654	}
1504		1655
		1656	cf::player->attach (
		1657	on_load => sub {
		1658	my ($pl, $path) = @_;
		1659
		1660	# restore slots saved in save, below
		1661	my $slots = delete $pl->{_slots};
		1662
		1663	$pl->ob->current_weapon ($slots->[0]);
		1664	$pl->combat_ob ($slots->[1]);
		1665	$pl->ranged_ob ($slots->[2]);
		1666	},
		1667	);
		1668
1505	sub save($) {	1669	sub save($) {
1506	my ($pl) = @_;	1670	my ($pl) = @_;
1507		1671
1508	return if $pl->{deny_save};	1672	return if $pl->{deny_save};
1509		1673
…		…
1514		1678
1515	aio_mkdir playerdir $pl, 0770;	1679	aio_mkdir playerdir $pl, 0770;
1516	$pl->{last_save} = $cf::RUNTIME;	1680	$pl->{last_save} = $cf::RUNTIME;
1517		1681
1518	cf::get_slot 0.01;	1682	cf::get_slot 0.01;
		1683
		1684	# save slots, to be restored later
		1685	local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1519		1686
1520	$pl->save_pl ($path);	1687	$pl->save_pl ($path);
1521	cf::cede_to_tick;	1688	cf::cede_to_tick;
1522	}	1689	}
1523		1690
…		…
1557	my $name = $pl->ob->name;	1724	my $name = $pl->ob->name;
1558		1725
1559	$pl->{deny_save} = 1;	1726	$pl->{deny_save} = 1;
1560	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1727	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1561		1728
1562	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1729	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1563	$pl->deactivate;	1730	$pl->deactivate;
		1731
1564	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1732	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1565	$pl->ob->check_score;
1566	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1733	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1734	ext::highscore::check ($pl->ob);
		1735
1567	$pl->ns->destroy if $pl->ns;	1736	$pl->ns->destroy if $pl->ns;
1568		1737
1569	my $path = playerdir $pl;	1738	my $path = playerdir $pl;
1570	my $temp = "$path~$cf::RUNTIME~deleting~";	1739	my $temp = "$path~$cf::RUNTIME~deleting~";
1571	aio_rename $path, $temp;	1740	aio_rename $path, $temp;
…		…
1625	\@logins	1794	\@logins
1626	}	1795	}
1627		1796
1628	=item $player->maps	1797	=item $player->maps
1629		1798
		1799	=item cf::player::maps $login
		1800
1630	Returns an arrayref of map paths that are private for this	1801	Returns an arrayref of map paths that are private for this
1631	player. May block.	1802	player. May block.
1632		1803
1633	=cut	1804	=cut
1634		1805
…		…
1696	=cut	1867	=cut
1697		1868
1698	sub find_by_path($) {	1869	sub find_by_path($) {
1699	my ($path) = @_;	1870	my ($path) = @_;
1700		1871
		1872	$path =~ s/^~[^\/]*//; # skip ~login
		1873
1701	my ($match, $specificity);	1874	my ($match, $specificity);
1702		1875
1703	for my $region (list) {	1876	for my $region (list) {
1704	if ($region->{match} && $path =~ $region->{match}) {	1877	if ($region->{match} && $path =~ $region->{match}) {
1705	($match, $specificity) = ($region, $region->specificity)	1878	($match, $specificity) = ($region, $region->specificity)
…		…
1733	sub generate_random_map {	1906	sub generate_random_map {
1734	my ($self, $rmp) = @_;	1907	my ($self, $rmp) = @_;
1735		1908
1736	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	1909	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1737		1910
1738	# mit "rum" bekleckern, nicht
1739	$self->_create_random_map (	1911	$self->_create_random_map ($rmp);
1740	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1741	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1742	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1743	$rmp->{exit_on_final_map},
1744	$rmp->{xsize}, $rmp->{ysize},
1745	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1746	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1747	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1748	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1749	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1750	(cf::region::find $rmp->{region}), $rmp->{custom}
1751	)
1752	}	1912	}
1753		1913
1754	=item cf::map->register ($regex, $prio)	1914	=item cf::map->register ($regex, $prio)
1755		1915
1756	Register a handler for the map path matching the given regex at the	1916	Register a handler for the map path matching the given regex at the
…		…
1761		1921
1762	sub register {	1922	sub register {
1763	my (undef, $regex, $prio) = @_;	1923	my (undef, $regex, $prio) = @_;
1764	my $pkg = caller;	1924	my $pkg = caller;
1765		1925
1766	no strict;
1767	push @{"$pkg\::ISA"}, __PACKAGE__;	1926	push @{"$pkg\::ISA"}, __PACKAGE__;
1768		1927
1769	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	1928	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1770	}	1929	}
1771		1930
1772	# also paths starting with '/'	1931	# also paths starting with '/'
1773	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	1932	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1774		1933
1775	sub thawer_merge {	1934	sub thawer_merge {
1776	my ($self, $merge) = @_;	1935	my ($self, $merge) = @_;
1777		1936
1778	# we have to keep some variables in memory intact	1937	# we have to keep some variables in memory intact
…		…
1783	}	1942	}
1784		1943
1785	sub normalise {	1944	sub normalise {
1786	my ($path, $base) = @_;	1945	my ($path, $base) = @_;
1787		1946
1788	$path = "$path"; # make sure its a string	1947	$path = "$path"; # make sure it's a string
1789		1948
1790	$path =~ s/\.map$//;	1949	$path =~ s/\.map$//;
1791		1950
1792	# map plan:	1951	# map plan:
1793	#	1952	#
…		…
1808	$base =~ s{[^/]+/?$}{};	1967	$base =~ s{[^/]+/?$}{};
1809	$path = "$base/$path";	1968	$path = "$base/$path";
1810	}	1969	}
1811		1970
1812	for ($path) {	1971	for ($path) {
1813	redo if s{//}{/};
1814	redo if s{/\.?/}{/};	1972	redo if s{/\.?/}{/};
1815	redo if s{/[^/]+/\.\./}{/};	1973	redo if s{/[^/]+/\.\./}{/};
1816	}	1974	}
1817		1975
1818	$path	1976	$path
…		…
1832	$self->init; # pass $1 etc.	1990	$self->init; # pass $1 etc.
1833	return $self;	1991	return $self;
1834	}	1992	}
1835	}	1993	}
1836		1994
1837	Carp::cluck "unable to resolve path '$path' (base '$base').";	1995	Carp::cluck "unable to resolve path '$path' (base '$base')";
1838	()	1996	()
1839	}	1997	}
1840		1998
		1999	# may re-bless or do other evil things
1841	sub init {	2000	sub init {
1842	my ($self) = @_;	2001	my ($self) = @_;
1843		2002
1844	$self	2003	$self
1845	}	2004	}
…		…
1910	$self->{load_path} = $path;	2069	$self->{load_path} = $path;
1911		2070
1912	1	2071	1
1913	}	2072	}
1914		2073
		2074	# used to laod the header of an original map
1915	sub load_header_orig {	2075	sub load_header_orig {
1916	my ($self) = @_;	2076	my ($self) = @_;
1917		2077
1918	$self->load_header_from ($self->load_path)	2078	$self->load_header_from ($self->load_path)
1919	}	2079	}
1920		2080
		2081	# used to laod the header of an instantiated map
1921	sub load_header_temp {	2082	sub load_header_temp {
1922	my ($self) = @_;	2083	my ($self) = @_;
1923		2084
1924	$self->load_header_from ($self->save_path)	2085	$self->load_header_from ($self->save_path)
1925	}	2086	}
1926		2087
		2088	# called after loading the header from an instantiated map
1927	sub prepare_temp {	2089	sub prepare_temp {
1928	my ($self) = @_;	2090	my ($self) = @_;
1929		2091
1930	$self->last_access ((delete $self->{last_access})	2092	$self->last_access ((delete $self->{last_access})
1931	|| $cf::RUNTIME); #d#	2093	|| $cf::RUNTIME); #d#
1932	# safety	2094	# safety
1933	$self->{instantiate_time} = $cf::RUNTIME	2095	$self->{instantiate_time} = $cf::RUNTIME
1934	if $self->{instantiate_time} > $cf::RUNTIME;	2096	if $self->{instantiate_time} > $cf::RUNTIME;
1935	}	2097	}
1936		2098
		2099	# called after loading the header from an original map
1937	sub prepare_orig {	2100	sub prepare_orig {
1938	my ($self) = @_;	2101	my ($self) = @_;
1939		2102
1940	$self->{load_original} = 1;	2103	$self->{load_original} = 1;
1941	$self->{instantiate_time} = $cf::RUNTIME;	2104	$self->{instantiate_time} = $cf::RUNTIME;
…		…
1965		2128
1966	sub find;	2129	sub find;
1967	sub find {	2130	sub find {
1968	my ($path, $origin) = @_;	2131	my ($path, $origin) = @_;
1969		2132
		2133	cf::cede_to_tick;
		2134
1970	$path = normalise $path, $origin && $origin->path;	2135	$path = normalise $path, $origin;
1971		2136
1972	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2137	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973	my $guard2 = cf::lock_acquire "map_find:$path";	2138	my $guard2 = cf::lock_acquire "map_find:$path";
1974		2139
1975	$cf::MAP{$path} || do {	2140	$cf::MAP{$path} || do {
…		…
1992		2157
1993	$cf::MAP{$path} = $map	2158	$cf::MAP{$path} = $map
1994	}	2159	}
1995	}	2160	}
1996		2161
1997	sub pre_load { }	2162	sub pre_load { }
1998	sub post_load { }	2163	#sub post_load { } # XS
1999		2164
2000	sub load {	2165	sub load {
2001	my ($self) = @_;	2166	my ($self) = @_;
2002		2167
2003	local $self->{deny_reset} = 1; # loading can take a long time	2168	local $self->{deny_reset} = 1; # loading can take a long time
…		…
2015	$self->alloc;	2180	$self->alloc;
2016		2181
2017	$self->pre_load;	2182	$self->pre_load;
2018	cf::cede_to_tick;	2183	cf::cede_to_tick;
2019		2184
		2185	if (exists $self->{load_path}) {
2020	my $f = new_from_file cf::object::thawer $self->{load_path};	2186	my $f = new_from_file cf::object::thawer $self->{load_path};
2021	$f->skip_block;	2187	$f->skip_block;
2022	$self->_load_objects ($f)	2188	$self->_load_objects ($f)
2023	or return;	2189	or return;
2024		2190
2025	$self->post_load_original	2191	$self->post_load_original
2026	if delete $self->{load_original};	2192	if delete $self->{load_original};
2027		2193
2028	if (my $uniq = $self->uniq_path) {	2194	if (my $uniq = $self->uniq_path) {
2029	utf8::encode $uniq;	2195	utf8::encode $uniq;
2030	unless (aio_stat $uniq) {	2196	unless (aio_stat $uniq) {
2031	if (my $f = new_from_file cf::object::thawer $uniq) {	2197	if (my $f = new_from_file cf::object::thawer $uniq) {
2032	$self->clear_unique_items;	2198	$self->clear_unique_items;
2033	$self->_load_objects ($f);	2199	$self->_load_objects ($f);
2034	$f->resolve_delayed_derefs;	2200	$f->resolve_delayed_derefs;
		2201	}
2035	}	2202	}
2036	}	2203	}
2037	}
2038		2204
2039	$f->resolve_delayed_derefs;	2205	$f->resolve_delayed_derefs;
		2206	} else {
		2207	$self->post_load_original
		2208	if delete $self->{load_original};
		2209	}
2040		2210
2041	cf::cede_to_tick;	2211	cf::cede_to_tick;
2042	# now do the right thing for maps	2212	# now do the right thing for maps
2043	$self->link_multipart_objects;	2213	$self->link_multipart_objects;
2044	$self->difficulty ($self->estimate_difficulty)	2214	$self->difficulty ($self->estimate_difficulty)
…		…
2058		2228
2059	$self->in_memory (cf::MAP_ACTIVE);	2229	$self->in_memory (cf::MAP_ACTIVE);
2060	}	2230	}
2061		2231
2062	$self->post_load;	2232	$self->post_load;
2063	}
2064		2233
		2234	1
		2235	}
		2236
		2237	# customize the map for a given player, i.e.
		2238	# return the _real_ map. used by e.g. per-player
		2239	# maps to change the path to ~playername/mappath
2065	sub customise_for {	2240	sub customise_for {
2066	my ($self, $ob) = @_;	2241	my ($self, $ob) = @_;
2067		2242
2068	return find "~" . $ob->name . "/" . $self->{path}	2243	return find "~" . $ob->name . "/" . $self->{path}
2069	if $self->per_player;	2244	if $self->per_player;
…		…
2085	or next;	2260	or next;
2086	$neigh = find $neigh, $map	2261	$neigh = find $neigh, $map
2087	or next;	2262	or next;
2088	$neigh->load;	2263	$neigh->load;
2089		2264
		2265	# now find the diagonal neighbours
2090	push @neigh,	2266	push @neigh,
2091	[$neigh->tile_path (($_ + 3) % 4), $neigh],	2267	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2092	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2268	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2093	}	2269	}
2094		2270
…		…
2101	}	2277	}
2102		2278
2103	sub find_sync {	2279	sub find_sync {
2104	my ($path, $origin) = @_;	2280	my ($path, $origin) = @_;
2105		2281
2106	cf::sync_job { find $path, $origin }	2282	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
		2283	if $Coro::current == $Coro::main;
		2284
		2285	find $path, $origin
2107	}	2286	}
2108		2287
2109	sub do_load_sync {	2288	sub do_load_sync {
2110	my ($map) = @_;	2289	my ($map) = @_;
2111		2290
2112	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2291	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2113	if $Coro::current == $Coro::main;	2292	if $Coro::current == $Coro::main;
2114		2293
2115	cf::sync_job { $map->load };	2294	$map->load;
2116	}	2295	}
2117		2296
2118	our %MAP_PREFETCH;	2297	our %MAP_PREFETCH;
2119	our $MAP_PREFETCHER = undef;	2298	our $MAP_PREFETCHER = undef;
2120		2299
2121	sub find_async {	2300	sub find_async {
2122	my ($path, $origin, $load) = @_;	2301	my ($path, $origin, $load) = @_;
2123		2302
2124	$path = normalise $path, $origin && $origin->{path};	2303	$path = normalise $path, $origin;
2125		2304
2126	if (my $map = $cf::MAP{$path}) {	2305	if (my $map = $cf::MAP{$path}) {
2127	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2306	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2128	}	2307	}
2129		2308
…		…
2146	$MAP_PREFETCHER->prio (6);	2325	$MAP_PREFETCHER->prio (6);
2147		2326
2148	()	2327	()
2149	}	2328	}
2150		2329
		2330	# common code, used by both ->save and ->swapout
2151	sub save {	2331	sub _save {
2152	my ($self) = @_;	2332	my ($self) = @_;
2153
2154	my $lock = cf::lock_acquire "map_data:$self->{path}";
2155		2333
2156	$self->{last_save} = $cf::RUNTIME;	2334	$self->{last_save} = $cf::RUNTIME;
2157		2335
2158	return unless $self->dirty;	2336	return unless $self->dirty;
2159		2337
…		…
2179	} else {	2357	} else {
2180	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);	2358	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2181	}	2359	}
2182	}	2360	}
2183		2361
		2362	sub save {
		2363	my ($self) = @_;
		2364
		2365	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2366
		2367	$self->_save;
		2368	}
		2369
2184	sub swap_out {	2370	sub swap_out {
2185	my ($self) = @_;	2371	my ($self) = @_;
2186		2372
2187	# save first because save cedes
2188	$self->save;
2189
2190	my $lock = cf::lock_acquire "map_data:$self->{path}";	2373	my $lock = cf::lock_acquire "map_data:$self->{path}";
2191		2374
2192	return if $self->players;
2193	return if $self->in_memory != cf::MAP_ACTIVE;	2375	return if $self->in_memory != cf::MAP_ACTIVE;
2194	return if $self->{deny_save};	2376	return if $self->{deny_save};
		2377	return if $self->players;
2195		2378
		2379	# first deactivate the map and "unlink" it from the core
		2380	$self->deactivate;
		2381	$_->clear_links_to ($self) for values %cf::MAP;
2196	$self->in_memory (cf::MAP_SWAPPED);	2382	$self->in_memory (cf::MAP_SWAPPED);
		2383
		2384	# then atomically save
		2385	$self->_save;
		2386
		2387	# then free the map
		2388	$self->clear;
		2389	}
		2390
		2391	sub reset_at {
		2392	my ($self) = @_;
		2393
		2394	# TODO: safety, remove and allow resettable per-player maps
		2395	return 1e99 if $self->{deny_reset};
		2396
		2397	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
		2398	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
		2399
		2400	$time + $to
		2401	}
		2402
		2403	sub should_reset {
		2404	my ($self) = @_;
		2405
		2406	$self->reset_at <= $cf::RUNTIME
		2407	}
		2408
		2409	sub reset {
		2410	my ($self) = @_;
		2411
		2412	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2413
		2414	return if $self->players;
		2415
		2416	cf::trace "resetting map ", $self->path, "\n";
		2417
		2418	$self->in_memory (cf::MAP_SWAPPED);
		2419
		2420	# need to save uniques path
		2421	unless ($self->{deny_save}) {
		2422	my $uniq = $self->uniq_path; utf8::encode $uniq;
		2423
		2424	$self->_save_objects ($uniq, cf::IO_UNIQUES)
		2425	if $uniq;
		2426	}
		2427
		2428	delete $cf::MAP{$self->path};
2197		2429
2198	$self->deactivate;	2430	$self->deactivate;
2199	$_->clear_links_to ($self) for values %cf::MAP;	2431	$_->clear_links_to ($self) for values %cf::MAP;
2200	$self->clear;	2432	$self->clear;
2201	}
2202
2203	sub reset_at {
2204	my ($self) = @_;
2205
2206	# TODO: safety, remove and allow resettable per-player maps
2207	return 1e99 if $self->{deny_reset};
2208
2209	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2210	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2211
2212	$time + $to
2213	}
2214
2215	sub should_reset {
2216	my ($self) = @_;
2217
2218	$self->reset_at <= $cf::RUNTIME
2219	}
2220
2221	sub reset {
2222	my ($self) = @_;
2223
2224	my $lock = cf::lock_acquire "map_data:$self->{path}";
2225
2226	return if $self->players;
2227
2228	warn "resetting map ", $self->path;
2229
2230	$self->in_memory (cf::MAP_SWAPPED);
2231
2232	# need to save uniques path
2233	unless ($self->{deny_save}) {
2234	my $uniq = $self->uniq_path; utf8::encode $uniq;
2235
2236	$self->_save_objects ($uniq, cf::IO_UNIQUES)
2237	if $uniq;
2238	}
2239
2240	delete $cf::MAP{$self->path};
2241
2242	$self->deactivate;
2243	$_->clear_links_to ($self) for values %cf::MAP;
2244	$self->clear;
2245		2433
2246	$self->unlink_save;	2434	$self->unlink_save;
2247	$self->destroy;	2435	$self->destroy;
2248	}	2436	}
2249		2437
…		…
2257		2445
2258	delete $cf::MAP{$self->path};	2446	delete $cf::MAP{$self->path};
2259		2447
2260	$self->unlink_save;	2448	$self->unlink_save;
2261		2449
2262	bless $self, "cf::map";	2450	bless $self, "cf::map::wrap";
2263	delete $self->{deny_reset};	2451	delete $self->{deny_reset};
2264	$self->{deny_save} = 1;	2452	$self->{deny_save} = 1;
2265	$self->reset_timeout (1);	2453	$self->reset_timeout (1);
2266	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2454	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2267		2455
…		…
2324	: normalise $_	2512	: normalise $_
2325	} @{ aio_readdir $UNIQUEDIR or [] }	2513	} @{ aio_readdir $UNIQUEDIR or [] }
2326	]	2514	]
2327	}	2515	}
2328		2516
		2517	=item cf::map::static_maps
		2518
		2519	Returns an arrayref if paths of all static maps (all preinstalled F<.map>
		2520	file in the shared directory excluding F</styles> and F</editor>). May
		2521	block.
		2522
		2523	=cut
		2524
		2525	sub static_maps() {
		2526	my @dirs = "";
		2527	my @maps;
		2528
		2529	while (@dirs) {
		2530	my $dir = shift @dirs;
		2531
		2532	next if $dir eq "/styles" || $dir eq "/editor";
		2533
		2534	my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
		2535	or return;
		2536
		2537	for (@$files) {
		2538	s/\.map$// or next;
		2539	utf8::decode $_;
		2540	push @maps, "$dir/$_";
		2541	}
		2542
		2543	push @dirs, map "$dir/$_", @$dirs;
		2544	}
		2545
		2546	\@maps
		2547	}
		2548
2329	=back	2549	=back
2330		2550
2331	=head3 cf::object	2551	=head3 cf::object
2332		2552
2333	=cut	2553	=cut
…		…
2465		2685
2466	Freezes the player and moves him/her to a special map (C<{link}>).	2686	Freezes the player and moves him/her to a special map (C<{link}>).
2467		2687
2468	The player should be reasonably safe there for short amounts of time (e.g.	2688	The player should be reasonably safe there for short amounts of time (e.g.
2469	for loading a map). You I<MUST> call C<leave_link> as soon as possible,	2689	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2470	though, as the palyer cannot control the character while it is on the link	2690	though, as the player cannot control the character while it is on the link
2471	map.	2691	map.
2472		2692
2473	Will never block.	2693	Will never block.
2474		2694
2475	=item $player_object->leave_link ($map, $x, $y)	2695	=item $player_object->leave_link ($map, $x, $y)
…		…
2496	sub cf::object::player::enter_link {	2716	sub cf::object::player::enter_link {
2497	my ($self) = @_;	2717	my ($self) = @_;
2498		2718
2499	$self->deactivate_recursive;	2719	$self->deactivate_recursive;
2500		2720
		2721	++$self->{_link_recursion};
		2722
2501	return if UNIVERSAL::isa $self->map, "ext::map_link";	2723	return if UNIVERSAL::isa $self->map, "ext::map_link";
2502		2724
2503	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2725	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2504	if $self->map && $self->map->{path} ne "{link}";	2726	if $self->map && $self->map->{path} ne "{link}";
2505		2727
2506	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2728	$self->enter_map ($LINK_MAP || link_map, 3, 3);
2507	}	2729	}
2508		2730
2509	sub cf::object::player::leave_link {	2731	sub cf::object::player::leave_link {
2510	my ($self, $map, $x, $y) = @_;	2732	my ($self, $map, $x, $y) = @_;
2511		2733
…		…
2528	($x, $y) = (-1, -1)	2750	($x, $y) = (-1, -1)
2529	unless (defined $x) && (defined $y);	2751	unless (defined $x) && (defined $y);
2530		2752
2531	# use -1 or undef as default coordinates, not 0, 0	2753	# use -1 or undef as default coordinates, not 0, 0
2532	($x, $y) = ($map->enter_x, $map->enter_y)	2754	($x, $y) = ($map->enter_x, $map->enter_y)
2533	if $x <=0 && $y <= 0;	2755	if $x <= 0 && $y <= 0;
2534		2756
2535	$map->load;	2757	$map->load;
2536	$map->load_neighbours;	2758	$map->load_neighbours;
2537		2759
2538	return unless $self->contr->active;	2760	return unless $self->contr->active;
2539	$self->flag (cf::FLAG_DEBUG, 0);#d# temp
2540	$self->activate_recursive;
2541		2761
2542	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2762	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2543	$self->enter_map ($map, $x, $y);	2763	if ($self->enter_map ($map, $x, $y)) {
2544	}	2764	# entering was successful
		2765	delete $self->{_link_recursion};
		2766	# only activate afterwards, to support waiting in hooks
		2767	$self->activate_recursive;
		2768	}
2545		2769
		2770	}
		2771
2546	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2772	=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2547		2773
2548	Moves the player to the given map-path and coordinates by first freezing	2774	Moves the player to the given map-path and coordinates by first freezing
2549	her, loading and preparing them map, calling the provided $check callback	2775	her, loading and preparing them map, calling the provided $check callback
2550	that has to return the map if sucecssful, and then unfreezes the player on	2776	that has to return the map if sucecssful, and then unfreezes the player on
2551	the new (success) or old (failed) map position. In either case, $done will	2777	the new (success) or old (failed) map position. In either case, $done will
…		…
2558		2784
2559	our $GOTOGEN;	2785	our $GOTOGEN;
2560		2786
2561	sub cf::object::player::goto {	2787	sub cf::object::player::goto {
2562	my ($self, $path, $x, $y, $check, $done) = @_;	2788	my ($self, $path, $x, $y, $check, $done) = @_;
		2789
		2790	if ($self->{_link_recursion} >= $MAX_LINKS) {
		2791	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
		2792	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
		2793	($path, $x, $y) = @$EMERGENCY_POSITION;
		2794	}
2563		2795
2564	# do generation counting so two concurrent goto's will be executed in-order	2796	# do generation counting so two concurrent goto's will be executed in-order
2565	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2797	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2566		2798
2567	$self->enter_link;	2799	$self->enter_link;
…		…
2587	($path, $x, $y) = (undef, undef, undef);	2819	($path, $x, $y) = (undef, undef, undef);
2588	}	2820	}
2589	}	2821	}
2590		2822
2591	my $map = eval {	2823	my $map = eval {
2592	my $map = defined $path ? cf::map::find $path : undef;	2824	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2593		2825
2594	if ($map) {	2826	if ($map) {
2595	$map = $map->customise_for ($self);	2827	$map = $map->customise_for ($self);
2596	$map = $check->($map) if $check && $map;	2828	$map = $check->($map, $x, $y, $self) if $check && $map;
2597	} else {	2829	} else {
2598	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);	2830	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2599	}	2831	}
2600		2832
2601	$map	2833	$map
…		…
2609	if ($gen == $self->{_goto_generation}) {	2841	if ($gen == $self->{_goto_generation}) {
2610	delete $self->{_goto_generation};	2842	delete $self->{_goto_generation};
2611	$self->leave_link ($map, $x, $y);	2843	$self->leave_link ($map, $x, $y);
2612	}	2844	}
2613		2845
2614	$done->() if $done;	2846	$done->($self) if $done;
2615	})->prio (1);	2847	})->prio (1);
2616	}	2848	}
2617		2849
2618	=item $player_object->enter_exit ($exit_object)	2850	=item $player_object->enter_exit ($exit_object)
2619		2851
…		…
2687	$Coro::current->{desc} = "enter_exit";	2919	$Coro::current->{desc} = "enter_exit";
2688		2920
2689	unless (eval {	2921	unless (eval {
2690	$self->deactivate_recursive; # just to be sure	2922	$self->deactivate_recursive; # just to be sure
2691		2923
2692	# random map handling
2693	{
2694	my $guard = cf::lock_acquire "exit_prepare:$exit";
2695
2696	prepare_random_map $exit
2697	if $exit->slaying eq "/!";
2698	}
2699
2700	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2924	my $map = cf::map::normalise $exit->slaying, $exit->map;
2701	my $x = $exit->stats->hp;	2925	my $x = $exit->stats->hp;
2702	my $y = $exit->stats->sp;	2926	my $y = $exit->stats->sp;
		2927
		2928	# special map handling
		2929	my $slaying = $exit->slaying;
		2930
		2931	# special map handling
		2932	if ($slaying eq "/!") {
		2933	my $guard = cf::lock_acquire "exit_prepare:$exit";
		2934
		2935	prepare_random_map $exit
		2936	if $slaying eq "/!"; # need to re-check after getting the lock
		2937
		2938	} elsif ($slaying eq '!up') {
		2939	$map = $exit->map->tile_path (cf::TILE_UP);
		2940	$x = $exit->x;
		2941	$y = $exit->y;
		2942
		2943	} elsif ($slaying eq '!down') {
		2944	$map = $exit->map->tile_path (cf::TILE_DOWN);
		2945	$x = $exit->x;
		2946	$y = $exit->y;
		2947	}
2703		2948
2704	$self->goto ($map, $x, $y);	2949	$self->goto ($map, $x, $y);
2705		2950
2706	# if exit is damned, update players death & WoR home-position	2951	# if exit is damned, update players death & WoR home-position
2707	$self->contr->savebed ($map, $x, $y)	2952	$self->contr->savebed ($map, $x, $y)
…		…
2712	$self->message ("Something went wrong deep within the deliantra server. "	2957	$self->message ("Something went wrong deep within the deliantra server. "
2713	. "I'll try to bring you back to the map you were before. "	2958	. "I'll try to bring you back to the map you were before. "
2714	. "Please report this to the dungeon master!",	2959	. "Please report this to the dungeon master!",
2715	cf::NDI_UNIQUE | cf::NDI_RED);	2960	cf::NDI_UNIQUE | cf::NDI_RED);
2716		2961
2717	warn "ERROR in enter_exit: $@";	2962	error "ERROR in enter_exit: $@";
2718	$self->leave_link;	2963	$self->leave_link;
2719	}	2964	}
2720	})->prio (1);	2965	})->prio (1);
2721	}	2966	}
2722		2967
…		…
2734	sub cf::client::send_drawinfo {	2979	sub cf::client::send_drawinfo {
2735	my ($self, $text, $flags) = @_;	2980	my ($self, $text, $flags) = @_;
2736		2981
2737	utf8::encode $text;	2982	utf8::encode $text;
2738	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2983	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
		2984	}
		2985
		2986	=item $client->send_big_packet ($pkt)
		2987
		2988	Like C<send_packet>, but tries to compress large packets, and fragments
		2989	them as required.
		2990
		2991	=cut
		2992
		2993	our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
		2994
		2995	sub cf::client::send_big_packet {
		2996	my ($self, $pkt) = @_;
		2997
		2998	# try lzf for large packets
		2999	$pkt = "lzf " . Compress::LZF::compress $pkt
		3000	if 1024 <= length $pkt and $self->{can_lzf};
		3001
		3002	# split very large packets
		3003	if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
		3004	$self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
		3005	$pkt = "frag";
		3006	}
		3007
		3008	$self->send_packet ($pkt);
2739	}	3009	}
2740		3010
2741	=item $client->send_msg ($channel, $msg, $color, [extra...])	3011	=item $client->send_msg ($channel, $msg, $color, [extra...])
2742		3012
2743	Send a drawinfo or msg packet to the client, formatting the msg for the	3013	Send a drawinfo or msg packet to the client, formatting the msg for the
…		…
2747		3017
2748	=cut	3018	=cut
2749		3019
2750	# non-persistent channels (usually the info channel)	3020	# non-persistent channels (usually the info channel)
2751	our %CHANNEL = (	3021	our %CHANNEL = (
		3022	"c/motd" => {
		3023	id => "infobox",
		3024	title => "MOTD",
		3025	reply => undef,
		3026	tooltip => "The message of the day",
		3027	},
2752	"c/identify" => {	3028	"c/identify" => {
2753	id => "infobox",	3029	id => "infobox",
2754	title => "Identify",	3030	title => "Identify",
2755	reply => undef,	3031	reply => undef,
2756	tooltip => "Items recently identified",	3032	tooltip => "Items recently identified",
…		…
2758	"c/examine" => {	3034	"c/examine" => {
2759	id => "infobox",	3035	id => "infobox",
2760	title => "Examine",	3036	title => "Examine",
2761	reply => undef,	3037	reply => undef,
2762	tooltip => "Signs and other items you examined",	3038	tooltip => "Signs and other items you examined",
		3039	},
		3040	"c/shopinfo" => {
		3041	id => "infobox",
		3042	title => "Shop Info",
		3043	reply => undef,
		3044	tooltip => "What your bargaining skill tells you about the shop",
2763	},	3045	},
2764	"c/book" => {	3046	"c/book" => {
2765	id => "infobox",	3047	id => "infobox",
2766	title => "Book",	3048	title => "Book",
2767	reply => undef,	3049	reply => undef,
…		…
2883	my $pkt = "msg "	3165	my $pkt = "msg "
2884	. $self->{json_coder}->encode (	3166	. $self->{json_coder}->encode (
2885	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]	3167	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2886	);	3168	);
2887		3169
2888	# try lzf for large packets
2889	$pkt = "lzf " . Compress::LZF::compress $pkt
2890	if 1024 <= length $pkt and $self->{can_lzf};
2891
2892	# split very large packets
2893	if (8192 < length $pkt and $self->{can_lzf}) {
2894	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2895	$pkt = "frag";
2896	}
2897
2898	$self->send_packet ($pkt);	3170	$self->send_big_packet ($pkt);
2899	}	3171	}
2900		3172
2901	=item $client->ext_msg ($type, @msg)	3173	=item $client->ext_msg ($type, @msg)
2902		3174
2903	Sends an ext event to the client.	3175	Sends an ext event to the client.
…		…
2906		3178
2907	sub cf::client::ext_msg($$@) {	3179	sub cf::client::ext_msg($$@) {
2908	my ($self, $type, @msg) = @_;	3180	my ($self, $type, @msg) = @_;
2909		3181
2910	if ($self->extcmd == 2) {	3182	if ($self->extcmd == 2) {
2911	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3183	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2912	} elsif ($self->extcmd == 1) { # TODO: remove	3184	} elsif ($self->extcmd == 1) { # TODO: remove
2913	push @msg, msgtype => "event_$type";	3185	push @msg, msgtype => "event_$type";
2914	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3186	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2915	}	3187	}
2916	}	3188	}
2917		3189
2918	=item $client->ext_reply ($msgid, @msg)	3190	=item $client->ext_reply ($msgid, @msg)
2919		3191
…		…
2923		3195
2924	sub cf::client::ext_reply($$@) {	3196	sub cf::client::ext_reply($$@) {
2925	my ($self, $id, @msg) = @_;	3197	my ($self, $id, @msg) = @_;
2926		3198
2927	if ($self->extcmd == 2) {	3199	if ($self->extcmd == 2) {
2928	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));	3200	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2929	} elsif ($self->extcmd == 1) {	3201	} elsif ($self->extcmd == 1) {
2930	#TODO: version 1, remove	3202	#TODO: version 1, remove
2931	unshift @msg, msgtype => "reply", msgid => $id;	3203	unshift @msg, msgtype => "reply", msgid => $id;
2932	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3204	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2933	}	3205	}
2934	}	3206	}
2935		3207
2936	=item $success = $client->query ($flags, "text", \&cb)	3208	=item $success = $client->query ($flags, "text", \&cb)
2937		3209
…		…
3008		3280
3009	$ns->ext_reply ($reply, @reply)	3281	$ns->ext_reply ($reply, @reply)
3010	if $reply;	3282	if $reply;
3011		3283
3012	} else {	3284	} else {
3013	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3285	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3014	}	3286	}
3015		3287
3016	cf::override;	3288	cf::override;
3017	},	3289	},
3018	);	3290	);
…		…
3038		3310
3039	$coro	3311	$coro
3040	}	3312	}
3041		3313
3042	cf::client->attach (	3314	cf::client->attach (
3043	on_destroy => sub {	3315	on_client_destroy => sub {
3044	my ($ns) = @_;	3316	my ($ns) = @_;
3045		3317
3046	$_->cancel for values %{ (delete $ns->{_coro}) || {} };	3318	$_->cancel for values %{ (delete $ns->{_coro}) || {} };
3047	},	3319	},
3048	);	3320	);
…		…
3064	our $safe_hole = new Safe::Hole;	3336	our $safe_hole = new Safe::Hole;
3065		3337
3066	$SIG{FPE} = 'IGNORE';	3338	$SIG{FPE} = 'IGNORE';
3067		3339
3068	$safe->permit_only (Opcode::opset qw(	3340	$safe->permit_only (Opcode::opset qw(
3069	:base_core :base_mem :base_orig :base_math	3341	:base_core :base_mem :base_orig :base_math :base_loop
3070	grepstart grepwhile mapstart mapwhile	3342	grepstart grepwhile mapstart mapwhile
3071	sort time	3343	sort time
3072	));	3344	));
3073		3345
3074	# here we export the classes and methods available to script code	3346	# here we export the classes and methods available to script code
…		…
3099	decrease split destroy change_exp value msg lore send_msg)],	3371	decrease split destroy change_exp value msg lore send_msg)],
3100	["cf::object::player" => qw(player)],	3372	["cf::object::player" => qw(player)],
3101	["cf::player" => qw(peaceful send_msg)],	3373	["cf::player" => qw(peaceful send_msg)],
3102	["cf::map" => qw(trigger)],	3374	["cf::map" => qw(trigger)],
3103	) {	3375	) {
3104	no strict 'refs';
3105	my ($pkg, @funs) = @$_;	3376	my ($pkg, @funs) = @$_;
3106	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3377	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3107	for @funs;	3378	for @funs;
3108	}	3379	}
3109		3380
…		…
3126	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3397	$qcode =~ s/"/‟/g; # not allowed in #line filenames
3127	$qcode =~ s/\n/\\n/g;	3398	$qcode =~ s/\n/\\n/g;
3128		3399
3129	%vars = (_dummy => 0) unless %vars;	3400	%vars = (_dummy => 0) unless %vars;
3130		3401
		3402	my @res;
3131	local $_;	3403	local $_;
3132	local @safe::cf::_safe_eval_args = values %vars;
3133		3404
3134	my $eval =	3405	my $eval =
3135	"do {\n"	3406	"do {\n"
3136	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"	3407	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3137	. "#line 0 \"{$qcode}\"\n"	3408	. "#line 0 \"{$qcode}\"\n"
3138	. $code	3409	. $code
3139	. "\n}"	3410	. "\n}"
3140	;	3411	;
3141		3412
		3413	if ($CFG{safe_eval}) {
3142	sub_generation_inc;	3414	sub_generation_inc;
		3415	local @safe::cf::_safe_eval_args = values %vars;
3143	my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);	3416	@res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3144	sub_generation_inc;	3417	sub_generation_inc;
		3418	} else {
		3419	local @cf::_safe_eval_args = values %vars;
		3420	@res = wantarray ? eval eval : scalar eval $eval;
		3421	}
3145		3422
3146	if ($@) {	3423	if ($@) {
3147	warn "$@";	3424	warn "$@",
3148	warn "while executing safe code '$code'\n";	3425	"while executing safe code '$code'\n",
3149	warn "with arguments " . (join " ", %vars) . "\n";	3426	"with arguments " . (join " ", %vars) . "\n";
3150	}	3427	}
3151		3428
3152	wantarray ? @res : $res[0]	3429	wantarray ? @res : $res[0]
3153	}	3430	}
3154		3431
…		…
3168	=cut	3445	=cut
3169		3446
3170	sub register_script_function {	3447	sub register_script_function {
3171	my ($fun, $cb) = @_;	3448	my ($fun, $cb) = @_;
3172		3449
3173	no strict 'refs';	3450	$fun = "safe::$fun" if $CFG{safe_eval};
3174	*{"safe::$fun"} = $safe_hole->wrap ($cb);	3451	*$fun = $safe_hole->wrap ($cb);
3175	}	3452	}
3176		3453
3177	=back	3454	=back
3178		3455
3179	=cut	3456	=cut
…		…
3188	# for this (global event?)	3465	# for this (global event?)
3189	%ext::player_env::MUSIC_FACE_CACHE = ();	3466	%ext::player_env::MUSIC_FACE_CACHE = ();
3190		3467
3191	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3468	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3192		3469
3193	warn "loading facedata from $path\n";	3470	trace "loading facedata from $path\n";
3194		3471
3195	my $facedata;	3472	my $facedata = decode_storable load_file $path;
3196	0 < aio_load $path, $facedata
3197	or die "$path: $!";
3198
3199	$facedata = Coro::Storable::thaw $facedata;
3200		3473
3201	$facedata->{version} == 2	3474	$facedata->{version} == 2
3202	or cf::cleanup "$path: version mismatch, cannot proceed.";	3475	or cf::cleanup "$path: version mismatch, cannot proceed.";
3203		3476
3204	# patch in the exptable	3477	# patch in the exptable
		3478	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3205	$facedata->{resource}{"res/exp_table"} = {	3479	$facedata->{resource}{"res/exp_table"} = {
3206	type => FT_RSRC,	3480	type => FT_RSRC,
3207	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),	3481	data => $exp_table,
		3482	hash => (Digest::MD5::md5 $exp_table),
3208	};	3483	};
3209	cf::cede_to_tick;	3484	cf::cede_to_tick;
3210		3485
3211	{	3486	{
3212	my $faces = $facedata->{faceinfo};	3487	my $faces = $facedata->{faceinfo};
…		…
3214	while (my ($face, $info) = each %$faces) {	3489	while (my ($face, $info) = each %$faces) {
3215	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3490	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3216		3491
3217	cf::face::set_visibility $idx, $info->{visibility};	3492	cf::face::set_visibility $idx, $info->{visibility};
3218	cf::face::set_magicmap $idx, $info->{magicmap};	3493	cf::face::set_magicmap $idx, $info->{magicmap};
3219	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};	3494	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3220	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};	3495	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
		3496	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3221		3497
3222	cf::cede_to_tick;	3498	cf::cede_to_tick;
3223	}	3499	}
3224		3500
3225	while (my ($face, $info) = each %$faces) {	3501	while (my ($face, $info) = each %$faces) {
…		…
3230		3506
3231	if (my $smooth = cf::face::find $info->{smooth}) {	3507	if (my $smooth = cf::face::find $info->{smooth}) {
3232	cf::face::set_smooth $idx, $smooth;	3508	cf::face::set_smooth $idx, $smooth;
3233	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3509	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3234	} else {	3510	} else {
3235	warn "smooth face '$info->{smooth}' not found for face '$face'";	3511	error "smooth face '$info->{smooth}' not found for face '$face'";
3236	}	3512	}
3237		3513
3238	cf::cede_to_tick;	3514	cf::cede_to_tick;
3239	}	3515	}
3240	}	3516	}
…		…
3249		3525
3250	cf::anim::invalidate_all; # d'oh	3526	cf::anim::invalidate_all; # d'oh
3251	}	3527	}
3252		3528
3253	{	3529	{
3254	# TODO: for gcfclient pleasure, we should give resources
3255	# that gcfclient doesn't grok a >10000 face index.
3256	my $res = $facedata->{resource};	3530	my $res = $facedata->{resource};
3257		3531
3258	while (my ($name, $info) = each %$res) {	3532	while (my ($name, $info) = each %$res) {
3259	if (defined $info->{type}) {	3533	if (defined $info->{type}) {
3260	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3534	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3261	my $data;
3262		3535
3263	if ($info->{type} & 1) {	3536	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3264	# prepend meta info
3265
3266	my $meta = $enc->encode ({
3267	name => $name,
3268	%{ $info->{meta} || {} },
3269	});
3270
3271	$data = pack "(w/a*)*", $meta, $info->{data};
3272	} else {
3273	$data = $info->{data};
3274	}
3275
3276	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3277	cf::face::set_type $idx, $info->{type};	3537	cf::face::set_type $idx, $info->{type};
3278	} else {	3538	} else {
3279	$RESOURCE{$name} = $info;	3539	$RESOURCE{$name} = $info; # unused
3280	}	3540	}
3281		3541
3282	cf::cede_to_tick;	3542	cf::cede_to_tick;
3283	}	3543	}
3284	}	3544	}
3285		3545
3286	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3546	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3287		3547
3288	1	3548	1
3289	}	3549	}
3290
3291	cf::global->attach (on_resource_update => sub {
3292	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3293	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3294
3295	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3296	my $sound = $soundconf->{compat}[$_]
3297	or next;
3298
3299	my $face = cf::face::find "sound/$sound->[1]";
3300	cf::sound::set $sound->[0] => $face;
3301	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3302	}
3303
3304	while (my ($k, $v) = each %{$soundconf->{event}}) {
3305	my $face = cf::face::find "sound/$v";
3306	cf::sound::set $k => $face;
3307	}
3308	}
3309	});
3310		3550
3311	register_exticmd fx_want => sub {	3551	register_exticmd fx_want => sub {
3312	my ($ns, $want) = @_;	3552	my ($ns, $want) = @_;
3313		3553
3314	while (my ($k, $v) = each %$want) {	3554	while (my ($k, $v) = each %$want) {
…		…
3353	sub reload_treasures {	3593	sub reload_treasures {
3354	load_resource_file "$DATADIR/treasures"	3594	load_resource_file "$DATADIR/treasures"
3355	or die "unable to load treasurelists\n";	3595	or die "unable to load treasurelists\n";
3356	}	3596	}
3357		3597
		3598	sub reload_sound {
		3599	trace "loading sound config from $DATADIR/sound\n";
		3600
		3601	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
		3602
		3603	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3604	my $sound = $soundconf->{compat}[$_]
		3605	or next;
		3606
		3607	my $face = cf::face::find "sound/$sound->[1]";
		3608	cf::sound::set $sound->[0] => $face;
		3609	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3610	}
		3611
		3612	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3613	my $face = cf::face::find "sound/$v";
		3614	cf::sound::set $k => $face;
		3615	}
		3616	}
		3617
3358	sub reload_resources {	3618	sub reload_resources {
3359	warn "reloading resource files...\n";	3619	trace "reloading resource files...\n";
3360		3620
		3621	reload_exp_table;
		3622	reload_materials;
3361	reload_facedata;	3623	reload_facedata;
		3624	reload_sound;
3362	reload_archetypes;	3625	reload_archetypes;
3363	reload_regions;	3626	reload_regions;
3364	reload_treasures;	3627	reload_treasures;
3365		3628
3366	warn "finished reloading resource files\n";	3629	trace "finished reloading resource files\n";
3367	}	3630	}
3368		3631
3369	sub reload_config {	3632	sub reload_config {
3370	open my $fh, "<:utf8", "$CONFDIR/config"	3633	trace "reloading config file...\n";
3371	or return;
3372		3634
3373	local $/;	3635	my $config = load_file "$CONFDIR/config";
3374	*CFG = YAML::Load <$fh>;	3636	utf8::decode $config;
		3637	*CFG = decode_yaml $config;
3375		3638
3376	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3639	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3377		3640
3378	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3641	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3379	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3642	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3380		3643
3381	if (exists $CFG{mlockall}) {	3644	if (exists $CFG{mlockall}) {
…		…
3405	seek $fh, 0, 0;	3668	seek $fh, 0, 0;
3406	print $fh $$;	3669	print $fh $$;
3407	}	3670	}
3408		3671
3409	sub main_loop {	3672	sub main_loop {
3410	warn "EV::loop starting\n";	3673	trace "EV::loop starting\n";
3411	if (1) {	3674	if (1) {
3412	EV::loop;	3675	EV::loop;
3413	}	3676	}
3414	warn "EV::loop returned\n";	3677	trace "EV::loop returned\n";
3415	goto &main_loop unless $REALLY_UNLOOP;	3678	goto &main_loop unless $REALLY_UNLOOP;
3416	}	3679	}
3417		3680
3418	sub main {	3681	sub main {
3419	cf::init_globals; # initialise logging	3682	cf::init_globals; # initialise logging
3420		3683
3421	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3684	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3422	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3685	LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3423	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3686	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3424	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3687	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3425
3426	cf::init_experience;
3427	cf::init_anim;
3428	cf::init_attackmess;
3429	cf::init_dynamic;
3430		3688
3431	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3689	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3432		3690
3433	# we must not ever block the main coroutine	3691	# we must not ever block the main coroutine
3434	local $Coro::idle = sub {	3692	local $Coro::idle = sub {
…		…
3440	};	3698	};
3441		3699
3442	evthread_start IO::AIO::poll_fileno;	3700	evthread_start IO::AIO::poll_fileno;
3443		3701
3444	cf::sync_job {	3702	cf::sync_job {
		3703	cf::incloader::init ();
		3704
		3705	cf::init_anim;
		3706	cf::init_attackmess;
		3707	cf::init_dynamic;
		3708
		3709	cf::load_settings;
		3710
3445	reload_resources;	3711	reload_resources;
3446	reload_config;	3712	reload_config;
3447	db_init;	3713	db_init;
3448		3714
3449	cf::load_settings;
3450	cf::load_materials;
3451	cf::init_uuid;	3715	cf::init_uuid;
3452	cf::init_signals;	3716	cf::init_signals;
3453	cf::init_commands;
3454	cf::init_skills;	3717	cf::init_skills;
3455		3718
3456	cf::init_beforeplay;	3719	cf::init_beforeplay;
3457		3720
3458	atomic;	3721	atomic;
…		…
3463		3726
3464	# no (long-running) fork's whatsoever before this point(!)	3727	# no (long-running) fork's whatsoever before this point(!)
3465	use POSIX ();	3728	use POSIX ();
3466	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3729	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3467		3730
3468	(pop @POST_INIT)->(0) while @POST_INIT;	3731	cf::_post_init 0;
3469	};	3732	};
3470		3733
		3734	cf::object::thawer::errors_are_fatal 0;
		3735	info "parse errors in files are no longer fatal from this point on.\n";
		3736
		3737	my $free_main; $free_main = EV::idle sub {
		3738	undef $free_main;
		3739	undef &main; # free gobs of memory :)
		3740	};
		3741
3471	main_loop;	3742	goto &main_loop;
3472	}	3743	}
3473		3744
3474	#############################################################################	3745	#############################################################################
3475	# initialisation and cleanup	3746	# initialisation and cleanup
3476		3747
3477	# install some emergency cleanup handlers	3748	# install some emergency cleanup handlers
3478	BEGIN {	3749	BEGIN {
3479	our %SIGWATCHER = ();	3750	our %SIGWATCHER = ();
3480	for my $signal (qw(INT HUP TERM)) {	3751	for my $signal (qw(INT HUP TERM)) {
3481	$SIGWATCHER{$signal} = EV::signal $signal, sub {	3752	$SIGWATCHER{$signal} = AE::signal $signal, sub {
3482	cf::cleanup "SIG$signal";	3753	cf::cleanup "SIG$signal";
3483	};	3754	};
3484	}	3755	}
3485	}	3756	}
3486		3757
3487	sub write_runtime_sync {	3758	sub write_runtime_sync {
		3759	my $t0 = AE::time;
		3760
3488	# first touch the runtime file to show we are still running:	3761	# first touch the runtime file to show we are still running:
3489	# the fsync below can take a very very long time.	3762	# the fsync below can take a very very long time.
3490		3763
3491	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;	3764	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3492		3765
3493	my $guard = cf::lock_acquire "write_runtime";	3766	my $guard = cf::lock_acquire "write_runtime";
3494		3767
3495	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644	3768	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3496	or return;	3769	or return;
3497		3770
3498	my $value = $cf::RUNTIME + 90 + 10;	3771	my $value = $cf::RUNTIME + 90 + 10;
3499	# 10 is the runtime save interval, for a monotonic clock	3772	# 10 is the runtime save interval, for a monotonic clock
3500	# 60 allows for the watchdog to kill the server.	3773	# 60 allows for the watchdog to kill the server.
…		…
3513	or return;	3786	or return;
3514		3787
3515	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3788	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3516	and return;	3789	and return;
3517		3790
3518	warn "runtime file written.\n";	3791	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3519		3792
3520	1	3793	1
3521	}	3794	}
3522		3795
3523	our $uuid_lock;	3796	our $uuid_lock;
…		…
3535	or return;	3808	or return;
3536		3809
3537	my $value = uuid_seq uuid_cur;	3810	my $value = uuid_seq uuid_cur;
3538		3811
3539	unless ($value) {	3812	unless ($value) {
3540	warn "cowardly refusing to write zero uuid value!\n";	3813	info "cowardly refusing to write zero uuid value!\n";
3541	return;	3814	return;
3542	}	3815	}
3543		3816
3544	my $value = uuid_str $value + $uuid_skip;	3817	my $value = uuid_str $value + $uuid_skip;
3545	$uuid_skip = 0;	3818	$uuid_skip = 0;
…		…
3555	or return;	3828	or return;
3556		3829
3557	aio_rename "$uuid~", $uuid	3830	aio_rename "$uuid~", $uuid
3558	and return;	3831	and return;
3559		3832
3560	warn "uuid file written ($value).\n";	3833	trace "uuid file written ($value).\n";
3561		3834
3562	1	3835	1
3563		3836
3564	}	3837	}
3565		3838
…		…
3571	}	3844	}
3572		3845
3573	sub emergency_save() {	3846	sub emergency_save() {
3574	my $freeze_guard = cf::freeze_mainloop;	3847	my $freeze_guard = cf::freeze_mainloop;
3575		3848
3576	warn "emergency_perl_save: enter\n";	3849	info "emergency_perl_save: enter\n";
		3850
		3851	# this is a trade-off: we want to be very quick here, so
		3852	# save all maps without fsync, and later call a global sync
		3853	# (which in turn might be very very slow)
		3854	local $USE_FSYNC = 0;
3577		3855
3578	cf::sync_job {	3856	cf::sync_job {
3579	# this is a trade-off: we want to be very quick here, so	3857	cf::write_runtime_sync; # external watchdog should not bark
3580	# save all maps without fsync, and later call a global sync
3581	# (which in turn might be very very slow)
3582	local $USE_FSYNC = 0;
3583		3858
3584	# use a peculiar iteration method to avoid tripping on perl	3859	# use a peculiar iteration method to avoid tripping on perl
3585	# refcount bugs in for. also avoids problems with players	3860	# refcount bugs in for. also avoids problems with players
3586	# and maps saved/destroyed asynchronously.	3861	# and maps saved/destroyed asynchronously.
3587	warn "emergency_perl_save: begin player save\n";	3862	info "emergency_perl_save: begin player save\n";
3588	for my $login (keys %cf::PLAYER) {	3863	for my $login (keys %cf::PLAYER) {
3589	my $pl = $cf::PLAYER{$login} or next;	3864	my $pl = $cf::PLAYER{$login} or next;
3590	$pl->valid or next;	3865	$pl->valid or next;
3591	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3866	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3592	$pl->save;	3867	$pl->save;
3593	}	3868	}
3594	warn "emergency_perl_save: end player save\n";	3869	info "emergency_perl_save: end player save\n";
3595		3870
		3871	cf::write_runtime_sync; # external watchdog should not bark
		3872
3596	warn "emergency_perl_save: begin map save\n";	3873	info "emergency_perl_save: begin map save\n";
3597	for my $path (keys %cf::MAP) {	3874	for my $path (keys %cf::MAP) {
3598	my $map = $cf::MAP{$path} or next;	3875	my $map = $cf::MAP{$path} or next;
3599	$map->valid or next;	3876	$map->valid or next;
3600	$map->save;	3877	$map->save;
3601	}	3878	}
3602	warn "emergency_perl_save: end map save\n";	3879	info "emergency_perl_save: end map save\n";
3603		3880
		3881	cf::write_runtime_sync; # external watchdog should not bark
		3882
3604	warn "emergency_perl_save: begin database checkpoint\n";	3883	info "emergency_perl_save: begin database checkpoint\n";
3605	BDB::db_env_txn_checkpoint $DB_ENV;	3884	BDB::db_env_txn_checkpoint $DB_ENV;
3606	warn "emergency_perl_save: end database checkpoint\n";	3885	info "emergency_perl_save: end database checkpoint\n";
3607		3886
3608	warn "emergency_perl_save: begin write uuid\n";	3887	info "emergency_perl_save: begin write uuid\n";
3609	write_uuid_sync 1;	3888	write_uuid_sync 1;
3610	warn "emergency_perl_save: end write uuid\n";	3889	info "emergency_perl_save: end write uuid\n";
		3890
		3891	cf::write_runtime_sync; # external watchdog should not bark
		3892
		3893	trace "emergency_perl_save: syncing database to disk";
		3894	BDB::db_env_txn_checkpoint $DB_ENV;
		3895
		3896	info "emergency_perl_save: starting sync\n";
		3897	IO::AIO::aio_sync sub {
		3898	info "emergency_perl_save: finished sync\n";
		3899	};
		3900
		3901	cf::write_runtime_sync; # external watchdog should not bark
		3902
		3903	trace "emergency_perl_save: flushing outstanding aio requests";
		3904	while (IO::AIO::nreqs || BDB::nreqs) {
		3905	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
		3906	}
		3907
		3908	cf::write_runtime_sync; # external watchdog should not bark
3611	};	3909	};
3612		3910
3613	warn "emergency_perl_save: starting sync()\n";
3614	IO::AIO::aio_sync sub {
3615	warn "emergency_perl_save: finished sync()\n";
3616	};
3617
3618	warn "emergency_perl_save: leave\n";	3911	info "emergency_perl_save: leave\n";
3619	}	3912	}
3620		3913
3621	sub post_cleanup {	3914	sub post_cleanup {
3622	my ($make_core) = @_;	3915	my ($make_core) = @_;
3623		3916
		3917	IO::AIO::flush;
		3918
3624	warn Carp::longmess "post_cleanup backtrace"	3919	error Carp::longmess "post_cleanup backtrace"
3625	if $make_core;	3920	if $make_core;
3626		3921
3627	my $fh = pidfile;	3922	my $fh = pidfile;
3628	unlink $PIDFILE if <$fh> == $$;	3923	unlink $PIDFILE if <$fh> == $$;
3629	}	3924	}
…		…
3649	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	3944	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3650	for my $name (keys %$leaf_symtab) {	3945	for my $name (keys %$leaf_symtab) {
3651	_gv_clear *{"$pkg$name"};	3946	_gv_clear *{"$pkg$name"};
3652	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	3947	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3653	}	3948	}
3654	warn "cleared package $pkg\n";#d#
3655	}	3949	}
3656		3950
3657	sub do_reload_perl() {	3951	sub do_reload_perl() {
3658	# can/must only be called in main	3952	# can/must only be called in main
3659	if ($Coro::current != $Coro::main) {	3953	unless (in_main) {
3660	warn "can only reload from main coroutine";	3954	error "can only reload from main coroutine";
3661	return;	3955	return;
3662	}	3956	}
3663		3957
3664	return if $RELOAD++;	3958	return if $RELOAD++;
3665		3959
3666	my $t1 = EV::time;	3960	my $t1 = AE::time;
3667		3961
3668	while ($RELOAD) {	3962	while ($RELOAD) {
3669	warn "reloading...";	3963	cf::get_slot 0.1, -1, "reload_perl";
		3964	info "perl_reload: reloading...";
3670		3965
3671	warn "entering sync_job";	3966	trace "perl_reload: entering sync_job";
3672		3967
3673	cf::sync_job {	3968	cf::sync_job {
3674	cf::write_runtime_sync; # external watchdog should not bark
3675	cf::emergency_save;	3969	#cf::emergency_save;
3676	cf::write_runtime_sync; # external watchdog should not bark
3677		3970
3678	warn "syncing database to disk";
3679	BDB::db_env_txn_checkpoint $DB_ENV;
3680
3681	# if anything goes wrong in here, we should simply crash as we already saved
3682
3683	warn "flushing outstanding aio requests";
3684	while (IO::AIO::nreqs || BDB::nreqs) {
3685	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3686	}
3687
3688	warn "cancelling all extension coros";	3971	trace "perl_reload: cancelling all extension coros";
3689	$_->cancel for values %EXT_CORO;	3972	$_->cancel for values %EXT_CORO;
3690	%EXT_CORO = ();	3973	%EXT_CORO = ();
3691		3974
3692	warn "removing commands";	3975	trace "perl_reload: removing commands";
3693	%COMMAND = ();	3976	%COMMAND = ();
3694		3977
3695	warn "removing ext/exti commands";	3978	trace "perl_reload: removing ext/exti commands";
3696	%EXTCMD = ();	3979	%EXTCMD = ();
3697	%EXTICMD = ();	3980	%EXTICMD = ();
3698		3981
3699	warn "unloading/nuking all extensions";	3982	trace "perl_reload: unloading/nuking all extensions";
3700	for my $pkg (@EXTS) {	3983	for my $pkg (@EXTS) {
3701	warn "... unloading $pkg";	3984	trace "... unloading $pkg";
3702		3985
3703	if (my $cb = $pkg->can ("unload")) {	3986	if (my $cb = $pkg->can ("unload")) {
3704	eval {	3987	eval {
3705	$cb->($pkg);	3988	$cb->($pkg);
3706	1	3989	1
3707	} or warn "$pkg unloaded, but with errors: $@";	3990	} or error "$pkg unloaded, but with errors: $@";
3708	}	3991	}
3709		3992
3710	warn "... clearing $pkg";	3993	trace "... clearing $pkg";
3711	clear_package $pkg;	3994	clear_package $pkg;
3712	}	3995	}
3713		3996
3714	warn "unloading all perl modules loaded from $LIBDIR";	3997	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3715	while (my ($k, $v) = each %INC) {	3998	while (my ($k, $v) = each %INC) {
3716	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	3999	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3717		4000
3718	warn "... unloading $k";	4001	trace "... unloading $k";
3719	delete $INC{$k};	4002	delete $INC{$k};
3720		4003
3721	$k =~ s/\.pm$//;	4004	$k =~ s/\.pm$//;
3722	$k =~ s/\//::/g;	4005	$k =~ s/\//::/g;
3723		4006
…		…
3726	}	4009	}
3727		4010
3728	clear_package $k;	4011	clear_package $k;
3729	}	4012	}
3730		4013
3731	warn "getting rid of safe::, as good as possible";	4014	trace "perl_reload: getting rid of safe::, as good as possible";
3732	clear_package "safe::$_"	4015	clear_package "safe::$_"
3733	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4016	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3734		4017
3735	warn "unloading cf.pm \"a bit\"";	4018	trace "perl_reload: unloading cf.pm \"a bit\"";
3736	delete $INC{"cf.pm"};	4019	delete $INC{"cf.pm"};
3737	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4020	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3738		4021
3739	# don't, removes xs symbols, too,	4022	# don't, removes xs symbols, too,
3740	# and global variables created in xs	4023	# and global variables created in xs
3741	#clear_package __PACKAGE__;	4024	#clear_package __PACKAGE__;
3742		4025
3743	warn "unload completed, starting to reload now";	4026	info "perl_reload: unload completed, starting to reload now";
3744		4027
3745	warn "reloading cf.pm";	4028	trace "perl_reload: reloading cf.pm";
3746	require cf;	4029	require cf;
3747	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	4030	cf::_connect_to_perl_1;
3748		4031
3749	warn "loading config and database again";	4032	trace "perl_reload: loading config and database again";
3750	cf::reload_config;	4033	cf::reload_config;
3751		4034
3752	warn "loading extensions";	4035	trace "perl_reload: loading extensions";
3753	cf::load_extensions;	4036	cf::load_extensions;
3754		4037
3755	if ($REATTACH_ON_RELOAD) {	4038	if ($REATTACH_ON_RELOAD) {
3756	warn "reattaching attachments to objects/players";	4039	trace "perl_reload: reattaching attachments to objects/players";
3757	_global_reattach; # objects, sockets	4040	_global_reattach; # objects, sockets
3758	warn "reattaching attachments to maps";	4041	trace "perl_reload: reattaching attachments to maps";
3759	reattach $_ for values %MAP;	4042	reattach $_ for values %MAP;
3760	warn "reattaching attachments to players";	4043	trace "perl_reload: reattaching attachments to players";
3761	reattach $_ for values %PLAYER;	4044	reattach $_ for values %PLAYER;
3762	}	4045	}
3763		4046
3764	warn "running post_init jobs";	4047	cf::_post_init 1;
3765	(pop @POST_INIT)->(1) while @POST_INIT;
3766		4048
3767	warn "leaving sync_job";	4049	trace "perl_reload: leaving sync_job";
3768		4050
3769	1	4051	1
3770	} or do {	4052	} or do {
3771	warn $@;	4053	error $@;
3772	cf::cleanup "error while reloading, exiting.";	4054	cf::cleanup "perl_reload: error, exiting.";
3773	};	4055	};
3774		4056
3775	warn "reloaded";
3776	--$RELOAD;	4057	--$RELOAD;
3777	}	4058	}
3778		4059
3779	$t1 = EV::time - $t1;	4060	$t1 = AE::time - $t1;
3780	warn "reload completed in ${t1}s\n";	4061	info "perl_reload: completed in ${t1}s\n";
3781	};	4062	};
3782		4063
3783	our $RELOAD_WATCHER; # used only during reload	4064	our $RELOAD_WATCHER; # used only during reload
3784		4065
3785	sub reload_perl() {	4066	sub reload_perl() {
…		…
3787	# coro crashes during coro_state_free->destroy here.	4068	# coro crashes during coro_state_free->destroy here.
3788		4069
3789	$RELOAD_WATCHER ||= cf::async {	4070	$RELOAD_WATCHER ||= cf::async {
3790	Coro::AIO::aio_wait cache_extensions;	4071	Coro::AIO::aio_wait cache_extensions;
3791		4072
3792	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {	4073	$RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3793	do_reload_perl;	4074	do_reload_perl;
3794	undef $RELOAD_WATCHER;	4075	undef $RELOAD_WATCHER;
3795	};	4076	};
3796	};	4077	};
3797	}	4078	}
…		…
3806	reload_perl;	4087	reload_perl;
3807	};	4088	};
3808	}	4089	}
3809	};	4090	};
3810		4091
3811	unshift @INC, $LIBDIR;	4092	#############################################################################
3812		4093
3813	my $bug_warning = 0;	4094	my $bug_warning = 0;
3814		4095
3815	our @WAIT_FOR_TICK;	4096	our @WAIT_FOR_TICK;
3816	our @WAIT_FOR_TICK_BEGIN;	4097	our @WAIT_FOR_TICK_BEGIN;
3817		4098
3818	sub wait_for_tick {	4099	sub wait_for_tick() {
3819	return if tick_inhibit || $Coro::current == $Coro::main;	4100	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3820		4101
3821	my $signal = new Coro::Signal;	4102	my $signal = new Coro::Signal;
3822	push @WAIT_FOR_TICK, $signal;	4103	push @WAIT_FOR_TICK, $signal;
3823	$signal->wait;	4104	$signal->wait;
3824	}	4105	}
3825		4106
3826	sub wait_for_tick_begin {	4107	sub wait_for_tick_begin() {
3827	return if tick_inhibit || $Coro::current == $Coro::main;	4108	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3828		4109
3829	my $signal = new Coro::Signal;	4110	my $signal = new Coro::Signal;
3830	push @WAIT_FOR_TICK_BEGIN, $signal;	4111	push @WAIT_FOR_TICK_BEGIN, $signal;
3831	$signal->wait;	4112	$signal->wait;
3832	}	4113	}
…		…
3838	return;	4119	return;
3839	}	4120	}
3840		4121
3841	cf::server_tick; # one server iteration	4122	cf::server_tick; # one server iteration
3842		4123
		4124	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
		4125
3843	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4126	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3844	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4127	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3845	Coro::async_pool {	4128	Coro::async_pool {
3846	$Coro::current->{desc} = "runtime saver";	4129	$Coro::current->{desc} = "runtime saver";
3847	write_runtime_sync	4130	write_runtime_sync
3848	or warn "ERROR: unable to write runtime file: $!";	4131	or error "ERROR: unable to write runtime file: $!";
3849	};	4132	};
3850	}	4133	}
3851		4134
3852	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4135	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3853	$sig->send;	4136	$sig->send;
…		…
3861		4144
3862	if (0) {	4145	if (0) {
3863	if ($NEXT_TICK) {	4146	if ($NEXT_TICK) {
3864	my $jitter = $TICK_START - $NEXT_TICK;	4147	my $jitter = $TICK_START - $NEXT_TICK;
3865	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4148	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
3866	warn "jitter $JITTER\n";#d#	4149	debug "jitter $JITTER\n";#d#
3867	}	4150	}
3868	}	4151	}
3869	}	4152	}
3870		4153
3871	{	4154	{
3872	# configure BDB	4155	# configure BDB
3873		4156
3874	BDB::min_parallel 8;	4157	BDB::min_parallel 16;
3875	BDB::max_poll_reqs $TICK * 0.1;	4158	BDB::max_poll_reqs $TICK * 0.1;
3876	$AnyEvent::BDB::WATCHER->priority (1);	4159	$AnyEvent::BDB::WATCHER->priority (1);
3877		4160
3878	unless ($DB_ENV) {	4161	unless ($DB_ENV) {
3879	$DB_ENV = BDB::db_env_create;	4162	$DB_ENV = BDB::db_env_create;
…		…
3916	IO::AIO::min_parallel 8;	4199	IO::AIO::min_parallel 8;
3917	IO::AIO::max_poll_time $TICK * 0.1;	4200	IO::AIO::max_poll_time $TICK * 0.1;
3918	undef $AnyEvent::AIO::WATCHER;	4201	undef $AnyEvent::AIO::WATCHER;
3919	}	4202	}
3920		4203
3921	my $_log_backtrace;	4204	our $_log_backtrace;
		4205	our $_log_backtrace_last;
3922		4206
3923	sub _log_backtrace {	4207	sub _log_backtrace {
3924	my ($msg, @addr) = @_;	4208	my ($msg, @addr) = @_;
3925		4209
3926	$msg =~ s/\n//;	4210	$msg =~ s/\n$//;
3927		4211
		4212	if ($_log_backtrace_last eq $msg) {
		4213	LOG llevInfo, "[ABT] $msg\n";
		4214	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3928	# limit the # of concurrent backtraces	4215	# limit the # of concurrent backtraces
3929	if ($_log_backtrace < 2) {	4216	} elsif ($_log_backtrace < 2) {
		4217	$_log_backtrace_last = $msg;
3930	++$_log_backtrace;	4218	++$_log_backtrace;
3931	my $perl_bt = Carp::longmess $msg;	4219	my $perl_bt = Carp::longmess $msg;
3932	async {	4220	async {
3933	$Coro::current->{desc} = "abt $msg";	4221	$Coro::current->{desc} = "abt $msg";
3934		4222
…		…
3954	LOG llevInfo, "[ABT] $_\n" for @bt;	4242	LOG llevInfo, "[ABT] $_\n" for @bt;
3955	--$_log_backtrace;	4243	--$_log_backtrace;
3956	};	4244	};
3957	} else {	4245	} else {
3958	LOG llevInfo, "[ABT] $msg\n";	4246	LOG llevInfo, "[ABT] $msg\n";
3959	LOG llevInfo, "[ABT] [suppressed]\n";	4247	LOG llevInfo, "[ABT] [overload, suppressed]\n";
3960	}	4248	}
3961	}	4249	}
3962		4250
3963	# load additional modules	4251	# load additional modules
3964	require "cf/$_.pm" for @EXTRA_MODULES;	4252	require "cf/$_.pm" for @EXTRA_MODULES;
		4253	cf::_connect_to_perl_2;
3965		4254
3966	END { cf::emergency_save }	4255	END { cf::emergency_save }
3967		4256
3968	1	4257	1
3969		4258

Diff Legend

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