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.480 by root, Thu Oct 8 05:09:43 2009 UTC vs.
Revision 1.570 by root, Wed May 4 07:41:14 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
…		…
92	our @EVENT;	93	our @EVENT;
93	our @REFLECT; # set by XS	94	our @REFLECT; # set by XS
94	our %REFLECT; # set by us	95	our %REFLECT; # set by us
95		96
96	our $CONFDIR = confdir;	97	our $CONFDIR = confdir;
		98
97	our $DATADIR = datadir;	99	our $DATADIR = datadir;
98	our $LIBDIR = "$DATADIR/ext";	100	our $LIBDIR = "$DATADIR/ext";
99	our $PODDIR = "$DATADIR/pod";	101	our $PODDIR = "$DATADIR/pod";
100	our $MAPDIR = "$DATADIR/" . mapdir;	102	our $MAPDIR = "$DATADIR/" . mapdir;
		103
101	our $LOCALDIR = localdir;	104	our $LOCALDIR = localdir;
102	our $TMPDIR = "$LOCALDIR/" . tmpdir;	105	our $TMPDIR = "$LOCALDIR/" . tmpdir;
103	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	106	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
104	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	107	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
105	our $RANDOMDIR = "$LOCALDIR/random";	108	our $RANDOMDIR = "$LOCALDIR/random";
106	our $BDBDIR = "$LOCALDIR/db";	109	our $BDBDIR = "$LOCALDIR/db";
107	our $PIDFILE = "$LOCALDIR/pid";	110	our $PIDFILE = "$LOCALDIR/pid";
108	our $RUNTIMEFILE = "$LOCALDIR/runtime";	111	our $RUNTIMEFILE = "$LOCALDIR/runtime";
109		112
110	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;
111		120
112	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	121	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
113	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	122	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
114	our $NEXT_TICK;	123	our $NEXT_TICK;
115	our $USE_FSYNC = 1; # use fsync to write maps - default on	124	our $USE_FSYNC = 1; # use fsync to write maps - default on
…		…
117	our $BDB_DEADLOCK_WATCHER;	126	our $BDB_DEADLOCK_WATCHER;
118	our $BDB_CHECKPOINT_WATCHER;	127	our $BDB_CHECKPOINT_WATCHER;
119	our $BDB_TRICKLE_WATCHER;	128	our $BDB_TRICKLE_WATCHER;
120	our $DB_ENV;	129	our $DB_ENV;
121		130
122	our @EXTRA_MODULES = qw(pod mapscript);	131	our @EXTRA_MODULES = qw(pod match mapscript incloader);
123		132
124	our %CFG;	133	our %CFG;
125		134
126	our $UPTIME; $UPTIME ||= time;	135	our $UPTIME; $UPTIME ||= time;
127	our $RUNTIME;	136	our $RUNTIME;
…		…
161		170
162	our $EMERGENCY_POSITION;	171	our $EMERGENCY_POSITION;
163		172
164	sub cf::map::normalise;	173	sub cf::map::normalise;
165		174
		175	sub in_main() {
		176	$Coro::current == $Coro::main
		177	}
		178
166	#############################################################################	179	#############################################################################
167		180
168	%REFLECT = ();	181	%REFLECT = ();
169	for (@REFLECT) {	182	for (@REFLECT) {
170	my $reflect = JSON::XS::decode_json $_;	183	my $reflect = JSON::XS::decode_json $_;
171	$REFLECT{$reflect->{class}} = $reflect;	184	$REFLECT{$reflect->{class}} = $reflect;
172	}	185	}
173		186
174	# this is decidedly evil	187	# this is decidedly evil
175	$REFLECT{object}{flags} = [grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"}];	188	$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
176		189
177	#############################################################################	190	#############################################################################
178		191
179	=head2 GLOBAL VARIABLES	192	=head2 GLOBAL VARIABLES
180		193
…		…
222	from wherever your confdir points to.	235	from wherever your confdir points to.
223		236
224	=item cf::wait_for_tick, cf::wait_for_tick_begin	237	=item cf::wait_for_tick, cf::wait_for_tick_begin
225		238
226	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
227	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
228	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.
229		242
		243	=cut
		244
		245	sub wait_for_tick();
		246	sub wait_for_tick_begin();
		247
230	=item @cf::INVOKE_RESULTS	248	=item @cf::INVOKE_RESULTS
231		249
232	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
233	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
234	that call.	252	that call.
235		253
236	=item %cf::REFLECT	254	=item %cf::REFLECT
237		255
…		…
241		259
242	=back	260	=back
243		261
244	=cut	262	=cut
245		263
		264	sub error(@) { LOG llevError, join "", @_ }
		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
246	$Coro::State::WARNHOOK = sub {	270	$Coro::State::WARNHOOK = sub {
247	my $msg = join "", @_;	271	my $msg = join "", @_;
248		272
249	$msg .= "\n"	273	$msg .= "\n"
250	unless $msg =~ /\n$/;	274	unless $msg =~ /\n$/;
251		275
252	$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;
253		277
254	LOG llevError, $msg;	278	LOG llevWarn, $msg;
255	};	279	};
256		280
257	$Coro::State::DIEHOOK = sub {	281	$Coro::State::DIEHOOK = sub {
258	return unless $^S eq 0; # "eq", not "=="	282	return unless $^S eq 0; # "eq", not "=="
259		283
260	warn Carp::longmess $_[0];	284	error Carp::longmess $_[0];
261		285
262	if ($Coro::current == $Coro::main) {#d#	286	if (in_main) {#d#
263	warn "DIEHOOK called in main context, Coro bug?\n";#d#	287	error "DIEHOOK called in main context, Coro bug?\n";#d#
264	return;#d#	288	return;#d#
265	}#d#	289	}#d#
266		290
267	# kill coroutine otherwise	291	# kill coroutine otherwise
268	Coro::terminate	292	Coro::terminate
…		…
288	)) {	312	)) {
289	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	313	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
290	}	314	}
291		315
292	$EV::DIED = sub {	316	$EV::DIED = sub {
293	warn "error in event callback: @_";	317	Carp::cluck "error in event callback: @_";
294	};	318	};
		319
		320	#############################################################################
		321
		322	sub fork_call(&@);
		323	sub get_slot($;$$);
295		324
296	#############################################################################	325	#############################################################################
297		326
298	=head2 UTILITY FUNCTIONS	327	=head2 UTILITY FUNCTIONS
299		328
…		…
320	$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;
321	$d	350	$d
322	} || "[unable to dump $_[0]: '$@']";	351	} || "[unable to dump $_[0]: '$@']";
323	}	352	}
324		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
325	=item $ref = cf::decode_json $json	368	=item $ref = cf::decode_json $json
326		369
327	Converts a JSON string into the corresponding perl data structure.	370	Converts a JSON string into the corresponding perl data structure.
328		371
329	=item $json = cf::encode_json $ref	372	=item $json = cf::encode_json $ref
…		…
335	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
336		379
337	sub encode_json($) { $json_coder->encode ($_[0]) }	380	sub encode_json($) { $json_coder->encode ($_[0]) }
338	sub decode_json($) { $json_coder->decode ($_[0]) }	381	sub decode_json($) { $json_coder->decode ($_[0]) }
339		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
340	=item cf::post_init { BLOCK }	414	=item cf::post_init { BLOCK }
341		415
342	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,
343	but I<before> the server starts ticking again.	417	but I<before> the server starts ticking again.
344		418
345	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
346	is a reload or not.	420	is a reload or not.
347		421
348	=cut	422	=cut
349		423
350	sub post_init(&) {	424	sub post_init(&) {
351	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	}
352	}	443	}
353		444
354	=item cf::lock_wait $string	445	=item cf::lock_wait $string
355		446
356	Wait until the given lock is available. See cf::lock_acquire.	447	Wait until the given lock is available. See cf::lock_acquire.
…		…
395	}	486	}
396		487
397	=item cf::periodic $interval, $cb	488	=item cf::periodic $interval, $cb
398		489
399	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
400	get spread over timer.	491	get spread over time.
401		492
402	=cut	493	=cut
403		494
404	sub periodic($$) {	495	sub periodic($$) {
405	my ($interval, $cb) = @_;	496	my ($interval, $cb) = @_;
…		…
409	EV::periodic $start, $interval, 0, $cb	500	EV::periodic $start, $interval, 0, $cb
410	}	501	}
411		502
412	=item cf::get_slot $time[, $priority[, $name]]	503	=item cf::get_slot $time[, $priority[, $name]]
413		504
414	Allocate $time seconds of blocking CPU time at priority C<$priority>:	505	Allocate $time seconds of blocking CPU time at priority C<$priority>
415	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
416	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.
417		512
418	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
419	used for statistical purposes and should identify the same time-class.	514	used for statistical purposes and should identify the same time-class.
420		515
421	Useful for short background jobs.	516	Useful for short background jobs.
422		517
423	=cut	518	=cut
424		519
425	our @SLOT_QUEUE;	520	our @SLOT_QUEUE;
426	our $SLOT_QUEUE;	521	our $SLOT_QUEUE;
		522	our $SLOT_DECAY = 0.9;
427		523
428	$SLOT_QUEUE->cancel if $SLOT_QUEUE;	524	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
429	$SLOT_QUEUE = Coro::async {	525	$SLOT_QUEUE = Coro::async {
430	$Coro::current->desc ("timeslot manager");	526	$Coro::current->desc ("timeslot manager");
431		527
432	my $signal = new Coro::Signal;	528	my $signal = new Coro::Signal;
		529	my $busy;
433		530
434	while () {	531	while () {
435	next_job:	532	next_job:
		533
436	my $avail = cf::till_tick;	534	my $avail = cf::till_tick;
437	if ($avail > 0.01) {	535
438	for (0 .. $#SLOT_QUEUE) {	536	for (0 .. $#SLOT_QUEUE) {
439	if ($SLOT_QUEUE[$_][0] < $avail) {	537	if ($SLOT_QUEUE[$_][0] <= $avail) {
		538	$busy = 0;
440	my $job = splice @SLOT_QUEUE, $_, 1, ();	539	my $job = splice @SLOT_QUEUE, $_, 1, ();
441	$job->[2]->send;	540	$job->[2]->send;
442	Coro::cede;	541	Coro::cede;
443	goto next_job;	542	goto next_job;
444	}	543	} else {
		544	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
445	}	545	}
446	}	546	}
447		547
448	if (@SLOT_QUEUE) {	548	if (@SLOT_QUEUE) {
449	# 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
450	push @cf::WAIT_FOR_TICK, $signal;	550	push @cf::WAIT_FOR_TICK, $signal;
451	$signal->wait;	551	$signal->wait;
452	} else {	552	} else {
		553	$busy = 0;
453	Coro::schedule;	554	Coro::schedule;
454	}	555	}
455	}	556	}
456	};	557	};
457		558
458	sub get_slot($;$$) {	559	sub get_slot($;$$) {
459	return if tick_inhibit || $Coro::current == $Coro::main;	560	return if tick_inhibit || $Coro::current == $Coro::main;
460		561
461	my ($time, $pri, $name) = @_;	562	my ($time, $pri, $name) = @_;
462		563
463	$time = $TICK * .6 if $time > $TICK * .6;	564	$time = clamp $time, 0.01, $TICK * .6;
		565
464	my $sig = new Coro::Signal;	566	my $sig = new Coro::Signal;
465		567
466	push @SLOT_QUEUE, [$time, $pri, $sig, $name];	568	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
467	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;	569	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
468	$SLOT_QUEUE->ready;	570	$SLOT_QUEUE->ready;
…		…
494	=cut	596	=cut
495		597
496	sub sync_job(&) {	598	sub sync_job(&) {
497	my ($job) = @_;	599	my ($job) = @_;
498		600
499	if ($Coro::current == $Coro::main) {	601	if (in_main) {
500	my $time = EV::time;	602	my $time = AE::time;
501		603
502	# this is the main coro, too bad, we have to block	604	# this is the main coro, too bad, we have to block
503	# till the operation succeeds, freezing the server :/	605	# till the operation succeeds, freezing the server :/
504		606
505	LOG llevError, Carp::longmess "sync job";#d#	607	#LOG llevError, Carp::longmess "sync job";#d#
506		608
507	my $freeze_guard = freeze_mainloop;	609	my $freeze_guard = freeze_mainloop;
508		610
509	my $busy = 1;	611	my $busy = 1;
510	my @res;	612	my @res;
511		613
512	(async {	614	(async {
513	$Coro::current->desc ("sync job coro");	615	$Coro::current->desc ("sync job coro");
514	@res = eval { $job->() };	616	@res = eval { $job->() };
515	warn $@ if $@;	617	error $@ if $@;
516	undef $busy;	618	undef $busy;
517	})->prio (Coro::PRIO_MAX);	619	})->prio (Coro::PRIO_MAX);
518		620
519	while ($busy) {	621	while ($busy) {
520	if (Coro::nready) {	622	if (Coro::nready) {
…		…
522	} else {	624	} else {
523	EV::loop EV::LOOP_ONESHOT;	625	EV::loop EV::LOOP_ONESHOT;
524	}	626	}
525	}	627	}
526		628
527	my $time = EV::time - $time;	629	my $time = AE::time - $time;
528		630
529	$TICK_START += $time; # do not account sync jobs to server load	631	$TICK_START += $time; # do not account sync jobs to server load
530		632
531	wantarray ? @res : $res[0]	633	wantarray ? @res : $res[0]
532	} else {	634	} else {
…		…
554	$EXT_CORO{$coro+0} = $coro;	656	$EXT_CORO{$coro+0} = $coro;
555		657
556	$coro	658	$coro
557	}	659	}
558		660
559	=item fork_call { }, $args	661	=item fork_call { }, @args
560		662
561	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
562	process, returning the results. Everything must be serialisable with	664	process, returning the results. Everything must be serialisable with
563	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
564	never block itself or use any form of event handling.	666	never block itself or use any form of event handling.
565		667
566	=cut	668	=cut
567		669
		670	sub post_fork {
		671	reset_signals;
		672	}
		673
568	sub fork_call(&@) {	674	sub fork_call(&@) {
569	my ($cb, @args) = @_;	675	my ($cb, @args) = @_;
570		676
571	# 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,
572	# otherwise perl prematurely frees the stuff :/	678	# otherwise perl prematurely frees the stuff :/
573	# TODO: investigate and fix (likely this will be rather laborious)	679	# TODO: investigate and fix (likely this will be rather laborious)
574		680
575	my @res = Coro::Util::fork_eval {	681	my @res = Coro::Util::fork_eval {
576	reset_signals;	682	cf::post_fork;
577	&$cb	683	&$cb
578	}, @args;	684	} @args;
579		685
580	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	)
581	}	698	}
582		699
583	=item $coin = coin_from_name $name	700	=item $coin = coin_from_name $name
584		701
585	=cut	702	=cut
…		…
622	within each server.	739	within each server.
623		740
624	=cut	741	=cut
625		742
626	sub db_table($) {	743	sub db_table($) {
		744	cf::error "db_get called from main context"
		745	if $Coro::current == $Coro::main;
		746
627	my ($name) = @_;	747	my ($name) = @_;
628	my $db = BDB::db_create $DB_ENV;	748	my $db = BDB::db_create $DB_ENV;
629		749
630	eval {	750	eval {
631	$db->set_flags (BDB::CHKSUM);	751	$db->set_flags (BDB::CHKSUM);
…		…
641	}	761	}
642		762
643	our $DB;	763	our $DB;
644		764
645	sub db_init {	765	sub db_init {
646	cf::sync_job {
647	$DB ||= db_table "db";	766	$DB ||= db_table "db";
648	};
649	}	767	}
650		768
651	sub db_get($$) {	769	sub db_get($$) {
652	my $key = "$_[0]/$_[1]";	770	my $key = "$_[0]/$_[1]";
653		771
654	cf::sync_job {	772	cf::error "db_get called from main context"
		773	if $Coro::current == $Coro::main;
		774
655	BDB::db_get $DB, undef, $key, my $data;	775	BDB::db_get $DB, undef, $key, my $data;
656		776
657	$! ? ()	777	$! ? ()
658	: $data	778	: $data
659	}
660	}	779	}
661		780
662	sub db_put($$$) {	781	sub db_put($$$) {
663	BDB::dbreq_pri 4;	782	BDB::dbreq_pri 4;
664	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	783	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
692		811
693	my @data;	812	my @data;
694	my $md5;	813	my $md5;
695		814
696	for (0 .. $#$src) {	815	for (0 .. $#$src) {
697	0 <= aio_load $src->[$_], $data[$_]	816	$data[$_] = load_file $src->[$_];
698	or Carp::croak "$src->[$_]: $!";
699	}	817	}
700		818
701	# if processing is expensive, check	819	# if processing is expensive, check
702	# checksum first	820	# checksum first
703	if (1) {	821	if (1) {
…		…
720		838
721	my $t1 = Time::HiRes::time;	839	my $t1 = Time::HiRes::time;
722	my $data = $process->(\@data);	840	my $data = $process->(\@data);
723	my $t2 = Time::HiRes::time;	841	my $t2 = Time::HiRes::time;
724		842
725	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	843	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
726		844
727	db_put cache => "$id/data", $data;	845	db_put cache => "$id/data", $data;
728	db_put cache => "$id/md5" , $md5;	846	db_put cache => "$id/md5" , $md5;
729	db_put cache => "$id/meta", $meta;	847	db_put cache => "$id/meta", $meta;
730		848
…		…
740		858
741	=cut	859	=cut
742		860
743	sub datalog($@) {	861	sub datalog($@) {
744	my ($type, %kv) = @_;	862	my ($type, %kv) = @_;
745	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	863	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
746	}	864	}
747		865
748	=back	866	=back
749		867
750	=cut	868	=cut
…		…
945		1063
946	} elsif (exists $cb_id{$type}) {	1064	} elsif (exists $cb_id{$type}) {
947	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	1065	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
948		1066
949	} elsif (ref $type) {	1067	} elsif (ref $type) {
950	warn "attaching objects not supported, ignoring.\n";	1068	error "attaching objects not supported, ignoring.\n";
951		1069
952	} else {	1070	} else {
953	shift @arg;	1071	shift @arg;
954	warn "attach argument '$type' not supported, ignoring.\n";	1072	error "attach argument '$type' not supported, ignoring.\n";
955	}	1073	}
956	}	1074	}
957	}	1075	}
958		1076
959	sub _object_attach {	1077	sub _object_attach {
…		…
969	_attach $registry, $klass, @attach;	1087	_attach $registry, $klass, @attach;
970	}	1088	}
971		1089
972	$obj->{$name} = \%arg;	1090	$obj->{$name} = \%arg;
973	} else {	1091	} else {
974	warn "object uses attachment '$name' which is not available, postponing.\n";	1092	info "object uses attachment '$name' which is not available, postponing.\n";
975	}	1093	}
976		1094
977	$obj->{_attachment}{$name} = undef;	1095	$obj->{_attachment}{$name} = undef;
978	}	1096	}
979		1097
…		…
1038		1156
1039	for (@$callbacks) {	1157	for (@$callbacks) {
1040	eval { &{$_->[1]} };	1158	eval { &{$_->[1]} };
1041		1159
1042	if ($@) {	1160	if ($@) {
1043	warn "$@";
1044	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1161	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1045	override;	1162	override;
1046	}	1163	}
1047		1164
1048	return 1 if $override;	1165	return 1 if $override;
1049	}	1166	}
…		…
1128	for (@$attach) {	1245	for (@$attach) {
1129	my ($klass, @attach) = @$_;	1246	my ($klass, @attach) = @$_;
1130	_attach $registry, $klass, @attach;	1247	_attach $registry, $klass, @attach;
1131	}	1248	}
1132	} else {	1249	} else {
1133	warn "object uses attachment '$name' that is not available, postponing.\n";	1250	info "object uses attachment '$name' that is not available, postponing.\n";
1134	}	1251	}
1135	}	1252	}
1136	}	1253	}
1137		1254
1138	cf::attachable->attach (	1255	cf::attachable->attach (
…		…
1165	my ($filename, $rdata, $objs) = @_;	1282	my ($filename, $rdata, $objs) = @_;
1166		1283
1167	sync_job {	1284	sync_job {
1168	if (length $$rdata) {	1285	if (length $$rdata) {
1169	utf8::decode (my $decname = $filename);	1286	utf8::decode (my $decname = $filename);
1170	warn sprintf "saving %s (%d,%d)\n",	1287	trace sprintf "saving %s (%d,%d)\n",
1171	$decname, length $$rdata, scalar @$objs;	1288	$decname, length $$rdata, scalar @$objs
		1289	if $VERBOSE_IO;
1172		1290
1173	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1291	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1174	aio_chmod $fh, SAVE_MODE;	1292	aio_chmod $fh, SAVE_MODE;
1175	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1293	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1176	if ($cf::USE_FSYNC) {	1294	if ($cf::USE_FSYNC) {
…		…
1198	aio_rename "$filename~", $filename;	1316	aio_rename "$filename~", $filename;
1199		1317
1200	$filename =~ s%/[^/]+$%%;	1318	$filename =~ s%/[^/]+$%%;
1201	aio_pathsync $filename if $cf::USE_FSYNC;	1319	aio_pathsync $filename if $cf::USE_FSYNC;
1202	} else {	1320	} else {
1203	warn "unable to save objects: $filename~: $!\n";	1321	error "unable to save objects: $filename~: $!\n";
1204	}	1322	}
1205	} else {	1323	} else {
1206	aio_unlink $filename;	1324	aio_unlink $filename;
1207	aio_unlink "$filename.pst";	1325	aio_unlink "$filename.pst";
1208	}	1326	}
…		…
1232	my $st = eval { Coro::Storable::thaw $av };	1350	my $st = eval { Coro::Storable::thaw $av };
1233	$av = $st->{objs};	1351	$av = $st->{objs};
1234	}	1352	}
1235		1353
1236	utf8::decode (my $decname = $filename);	1354	utf8::decode (my $decname = $filename);
1237	warn sprintf "loading %s (%d,%d)\n",	1355	trace sprintf "loading %s (%d,%d)\n",
1238	$decname, length $data, scalar @{$av || []};	1356	$decname, length $data, scalar @{$av || []}
		1357	if $VERBOSE_IO;
1239		1358
1240	($data, $av)	1359	($data, $av)
1241	}	1360	}
1242		1361
1243	=head2 COMMAND CALLBACKS	1362	=head2 COMMAND CALLBACKS
…		…
1302	}	1421	}
1303		1422
1304	use File::Glob ();	1423	use File::Glob ();
1305		1424
1306	cf::player->attach (	1425	cf::player->attach (
1307	on_command => sub {	1426	on_unknown_command => sub {
1308	my ($pl, $name, $params) = @_;	1427	my ($pl, $name, $params) = @_;
1309		1428
1310	my $cb = $COMMAND{$name}	1429	my $cb = $COMMAND{$name}
1311	or return;	1430	or return;
1312		1431
…		…
1335		1454
1336	$pl->ext_reply ($reply, @reply)	1455	$pl->ext_reply ($reply, @reply)
1337	if $reply;	1456	if $reply;
1338		1457
1339	} else {	1458	} else {
1340	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1459	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1341	}	1460	}
1342		1461
1343	cf::override;	1462	cf::override;
1344	},	1463	},
1345	);	1464	);
…		…
1356		1475
1357	$grp	1476	$grp
1358	}	1477	}
1359		1478
1360	sub load_extensions {	1479	sub load_extensions {
		1480	info "loading extensions...";
		1481
1361	cf::sync_job {	1482	cf::sync_job {
1362	my %todo;	1483	my %todo;
1363		1484
1364	for my $path (<$LIBDIR/*.ext>) {	1485	for my $path (<$LIBDIR/*.ext>) {
1365	next unless -r $path;	1486	next unless -r $path;
…		…
1383		1504
1384	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1505	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1385	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1506	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1386		1507
1387	$ext{source} =	1508	$ext{source} =
1388	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1509	"package $pkg; use common::sense;\n"
1389	. "#line 1 \"$path\"\n{\n"	1510	. "#line 1 \"$path\"\n{\n"
1390	. $source	1511	. $source
1391	. "\n};\n1";	1512	. "\n};\n1";
1392		1513
1393	$todo{$base} = \%ext;	1514	$todo{$base} = \%ext;
1394	}	1515	}
1395		1516
		1517	my $pass = 0;
1396	my %done;	1518	my %done;
1397	while (%todo) {	1519	while (%todo) {
1398	my $progress;	1520	my $progress;
1399		1521
		1522	++$pass;
		1523
		1524	ext:
1400	while (my ($k, $v) = each %todo) {	1525	while (my ($k, $v) = each %todo) {
1401	for (split /,\s*/, $v->{meta}{depends}) {	1526	for (split /,\s*/, $v->{meta}{depends}) {
1402	goto skip	1527	next ext
1403	unless exists $done{$_};	1528	unless exists $done{$_};
1404	}	1529	}
1405		1530
1406	warn "... loading '$k' into '$v->{pkg}'\n";	1531	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1407		1532
1408	unless (eval $v->{source}) {	1533	my $active = eval $v->{source};
		1534
		1535	if (length $@) {
1409	my $msg = $@ ? "$v->{path}: $@\n"	1536	error "$v->{path}: $@\n";
1410	: "$v->{base}: extension inactive.\n";
1411		1537
1412	if (exists $v->{meta}{mandatory}) {
1413	warn $msg;
1414	cf::cleanup "mandatory extension failed to load, exiting.";	1538	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1415	}	1539	if exists $v->{meta}{mandatory};
1416		1540
1417	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;
1418	}	1550	}
1419
1420	$done{$k} = delete $todo{$k};
1421	push @EXTS, $v->{pkg};
1422	$progress = 1;
1423	}	1551	}
1424		1552
1425	skip:	1553	unless ($progress) {
1426	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"	1554	warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1427	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	}
1428	}	1563	}
1429	};	1564	};
1430	}	1565	}
1431		1566
1432	#############################################################################	1567	#############################################################################
…		…
1516	$cf::PLAYER{$login} = $pl	1651	$cf::PLAYER{$login} = $pl
1517	}	1652	}
1518	}	1653	}
1519	}	1654	}
1520		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
1521	sub save($) {	1669	sub save($) {
1522	my ($pl) = @_;	1670	my ($pl) = @_;
1523		1671
1524	return if $pl->{deny_save};	1672	return if $pl->{deny_save};
1525		1673
…		…
1530		1678
1531	aio_mkdir playerdir $pl, 0770;	1679	aio_mkdir playerdir $pl, 0770;
1532	$pl->{last_save} = $cf::RUNTIME;	1680	$pl->{last_save} = $cf::RUNTIME;
1533		1681
1534	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];
1535		1686
1536	$pl->save_pl ($path);	1687	$pl->save_pl ($path);
1537	cf::cede_to_tick;	1688	cf::cede_to_tick;
1538	}	1689	}
1539		1690
…		…
1573	my $name = $pl->ob->name;	1724	my $name = $pl->ob->name;
1574		1725
1575	$pl->{deny_save} = 1;	1726	$pl->{deny_save} = 1;
1576	$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
1577		1728
1578	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1729	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1579	$pl->deactivate;	1730	$pl->deactivate;
		1731
1580	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;
1581	$pl->ob->check_score;
1582	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1733	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1734	ext::highscore::check ($pl->ob);
		1735
1583	$pl->ns->destroy if $pl->ns;	1736	$pl->ns->destroy if $pl->ns;
1584		1737
1585	my $path = playerdir $pl;	1738	my $path = playerdir $pl;
1586	my $temp = "$path~$cf::RUNTIME~deleting~";	1739	my $temp = "$path~$cf::RUNTIME~deleting~";
1587	aio_rename $path, $temp;	1740	aio_rename $path, $temp;
…		…
1641	\@logins	1794	\@logins
1642	}	1795	}
1643		1796
1644	=item $player->maps	1797	=item $player->maps
1645		1798
		1799	=item cf::player::maps $login
		1800
1646	Returns an arrayref of map paths that are private for this	1801	Returns an arrayref of map paths that are private for this
1647	player. May block.	1802	player. May block.
1648		1803
1649	=cut	1804	=cut
1650		1805
…		…
1712	=cut	1867	=cut
1713		1868
1714	sub find_by_path($) {	1869	sub find_by_path($) {
1715	my ($path) = @_;	1870	my ($path) = @_;
1716		1871
		1872	$path =~ s/^~[^\/]*//; # skip ~login
		1873
1717	my ($match, $specificity);	1874	my ($match, $specificity);
1718		1875
1719	for my $region (list) {	1876	for my $region (list) {
1720	if ($region->{match} && $path =~ $region->{match}) {	1877	if ($region->{match} && $path =~ $region->{match}) {
1721	($match, $specificity) = ($region, $region->specificity)	1878	($match, $specificity) = ($region, $region->specificity)
…		…
1749	sub generate_random_map {	1906	sub generate_random_map {
1750	my ($self, $rmp) = @_;	1907	my ($self, $rmp) = @_;
1751		1908
1752	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
1753		1910
1754	# mit "rum" bekleckern, nicht
1755	$self->_create_random_map (	1911	$self->_create_random_map ($rmp);
1756	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1757	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1758	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1759	$rmp->{exit_on_final_map},
1760	$rmp->{xsize}, $rmp->{ysize},
1761	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1762	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1763	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1764	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1765	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1766	(cf::region::find $rmp->{region}), $rmp->{custom}
1767	)
1768	}	1912	}
1769		1913
1770	=item cf::map->register ($regex, $prio)	1914	=item cf::map->register ($regex, $prio)
1771		1915
1772	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
…		…
1777		1921
1778	sub register {	1922	sub register {
1779	my (undef, $regex, $prio) = @_;	1923	my (undef, $regex, $prio) = @_;
1780	my $pkg = caller;	1924	my $pkg = caller;
1781		1925
1782	no strict;
1783	push @{"$pkg\::ISA"}, __PACKAGE__;	1926	push @{"$pkg\::ISA"}, __PACKAGE__;
1784		1927
1785	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	1928	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1786	}	1929	}
1787		1930
1788	# also paths starting with '/'	1931	# also paths starting with '/'
1789	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	1932	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1790		1933
1791	sub thawer_merge {	1934	sub thawer_merge {
1792	my ($self, $merge) = @_;	1935	my ($self, $merge) = @_;
1793		1936
1794	# we have to keep some variables in memory intact	1937	# we have to keep some variables in memory intact
…		…
1799	}	1942	}
1800		1943
1801	sub normalise {	1944	sub normalise {
1802	my ($path, $base) = @_;	1945	my ($path, $base) = @_;
1803		1946
1804	$path = "$path"; # make sure its a string	1947	$path = "$path"; # make sure it's a string
1805		1948
1806	$path =~ s/\.map$//;	1949	$path =~ s/\.map$//;
1807		1950
1808	# map plan:	1951	# map plan:
1809	#	1952	#
…		…
1824	$base =~ s{[^/]+/?$}{};	1967	$base =~ s{[^/]+/?$}{};
1825	$path = "$base/$path";	1968	$path = "$base/$path";
1826	}	1969	}
1827		1970
1828	for ($path) {	1971	for ($path) {
1829	redo if s{//}{/};
1830	redo if s{/\.?/}{/};	1972	redo if s{/\.?/}{/};
1831	redo if s{/[^/]+/\.\./}{/};	1973	redo if s{/[^/]+/\.\./}{/};
1832	}	1974	}
1833		1975
1834	$path	1976	$path
…		…
1848	$self->init; # pass $1 etc.	1990	$self->init; # pass $1 etc.
1849	return $self;	1991	return $self;
1850	}	1992	}
1851	}	1993	}
1852		1994
1853	Carp::cluck "unable to resolve path '$path' (base '$base').";	1995	Carp::cluck "unable to resolve path '$path' (base '$base')";
1854	()	1996	()
1855	}	1997	}
1856		1998
		1999	# may re-bless or do other evil things
1857	sub init {	2000	sub init {
1858	my ($self) = @_;	2001	my ($self) = @_;
1859		2002
1860	$self	2003	$self
1861	}	2004	}
…		…
1926	$self->{load_path} = $path;	2069	$self->{load_path} = $path;
1927		2070
1928	1	2071	1
1929	}	2072	}
1930		2073
		2074	# used to laod the header of an original map
1931	sub load_header_orig {	2075	sub load_header_orig {
1932	my ($self) = @_;	2076	my ($self) = @_;
1933		2077
1934	$self->load_header_from ($self->load_path)	2078	$self->load_header_from ($self->load_path)
1935	}	2079	}
1936		2080
		2081	# used to laod the header of an instantiated map
1937	sub load_header_temp {	2082	sub load_header_temp {
1938	my ($self) = @_;	2083	my ($self) = @_;
1939		2084
1940	$self->load_header_from ($self->save_path)	2085	$self->load_header_from ($self->save_path)
1941	}	2086	}
1942		2087
		2088	# called after loading the header from an instantiated map
1943	sub prepare_temp {	2089	sub prepare_temp {
1944	my ($self) = @_;	2090	my ($self) = @_;
1945		2091
1946	$self->last_access ((delete $self->{last_access})	2092	$self->last_access ((delete $self->{last_access})
1947	|| $cf::RUNTIME); #d#	2093	|| $cf::RUNTIME); #d#
1948	# safety	2094	# safety
1949	$self->{instantiate_time} = $cf::RUNTIME	2095	$self->{instantiate_time} = $cf::RUNTIME
1950	if $self->{instantiate_time} > $cf::RUNTIME;	2096	if $self->{instantiate_time} > $cf::RUNTIME;
1951	}	2097	}
1952		2098
		2099	# called after loading the header from an original map
1953	sub prepare_orig {	2100	sub prepare_orig {
1954	my ($self) = @_;	2101	my ($self) = @_;
1955		2102
1956	$self->{load_original} = 1;	2103	$self->{load_original} = 1;
1957	$self->{instantiate_time} = $cf::RUNTIME;	2104	$self->{instantiate_time} = $cf::RUNTIME;
…		…
1981		2128
1982	sub find;	2129	sub find;
1983	sub find {	2130	sub find {
1984	my ($path, $origin) = @_;	2131	my ($path, $origin) = @_;
1985		2132
		2133	cf::cede_to_tick;
		2134
1986	$path = normalise $path, $origin && $origin->path;	2135	$path = normalise $path, $origin;
1987		2136
1988	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2137	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1989	my $guard2 = cf::lock_acquire "map_find:$path";	2138	my $guard2 = cf::lock_acquire "map_find:$path";
1990		2139
1991	$cf::MAP{$path} || do {	2140	$cf::MAP{$path} || do {
…		…
2008		2157
2009	$cf::MAP{$path} = $map	2158	$cf::MAP{$path} = $map
2010	}	2159	}
2011	}	2160	}
2012		2161
2013	sub pre_load { }	2162	sub pre_load { }
2014	sub post_load { }	2163	#sub post_load { } # XS
2015		2164
2016	sub load {	2165	sub load {
2017	my ($self) = @_;	2166	my ($self) = @_;
2018		2167
2019	local $self->{deny_reset} = 1; # loading can take a long time	2168	local $self->{deny_reset} = 1; # loading can take a long time
…		…
2022		2171
2023	{	2172	{
2024	my $guard = cf::lock_acquire "map_data:$path";	2173	my $guard = cf::lock_acquire "map_data:$path";
2025		2174
2026	return unless $self->valid;	2175	return unless $self->valid;
2027	return unless $self->in_memory == cf::MAP_SWAPPED;	2176	return unless $self->state == cf::MAP_SWAPPED;
2028
2029	$self->in_memory (cf::MAP_LOADING);
2030		2177
2031	$self->alloc;	2178	$self->alloc;
2032		2179
2033	$self->pre_load;	2180	$self->pre_load;
2034	cf::cede_to_tick;	2181	cf::cede_to_tick;
2035		2182
		2183	if (exists $self->{load_path}) {
2036	my $f = new_from_file cf::object::thawer $self->{load_path};	2184	my $f = new_from_file cf::object::thawer $self->{load_path};
2037	$f->skip_block;	2185	$f->skip_block;
2038	$self->_load_objects ($f)	2186	$self->_load_objects ($f)
2039	or return;	2187	or return;
2040		2188
2041	$self->post_load_original	2189	$self->post_load_original
2042	if delete $self->{load_original};	2190	if delete $self->{load_original};
2043		2191
2044	if (my $uniq = $self->uniq_path) {	2192	if (my $uniq = $self->uniq_path) {
2045	utf8::encode $uniq;	2193	utf8::encode $uniq;
2046	unless (aio_stat $uniq) {	2194	unless (aio_stat $uniq) {
2047	if (my $f = new_from_file cf::object::thawer $uniq) {	2195	if (my $f = new_from_file cf::object::thawer $uniq) {
2048	$self->clear_unique_items;	2196	$self->clear_unique_items;
2049	$self->_load_objects ($f);	2197	$self->_load_objects ($f);
2050	$f->resolve_delayed_derefs;	2198	$f->resolve_delayed_derefs;
		2199	}
2051	}	2200	}
2052	}	2201	}
2053	}
2054		2202
2055	$f->resolve_delayed_derefs;	2203	$f->resolve_delayed_derefs;
		2204	} else {
		2205	$self->post_load_original
		2206	if delete $self->{load_original};
		2207	}
		2208
		2209	$self->state (cf::MAP_INACTIVE);
2056		2210
2057	cf::cede_to_tick;	2211	cf::cede_to_tick;
2058	# now do the right thing for maps	2212	# now do the right thing for maps
2059	$self->link_multipart_objects;	2213	$self->link_multipart_objects;
2060	$self->difficulty ($self->estimate_difficulty)	2214	$self->difficulty ($self->estimate_difficulty)
…		…
2064	unless ($self->{deny_activate}) {	2218	unless ($self->{deny_activate}) {
2065	$self->decay_objects;	2219	$self->decay_objects;
2066	$self->fix_auto_apply;	2220	$self->fix_auto_apply;
2067	$self->update_buttons;	2221	$self->update_buttons;
2068	cf::cede_to_tick;	2222	cf::cede_to_tick;
2069	$self->activate;	2223	#$self->activate; # no longer activate maps automatically
2070	}	2224	}
2071		2225
2072	$self->{last_save} = $cf::RUNTIME;	2226	$self->{last_save} = $cf::RUNTIME;
2073	$self->last_access ($cf::RUNTIME);	2227	$self->last_access ($cf::RUNTIME);
2074
2075	$self->in_memory (cf::MAP_ACTIVE);
2076	}	2228	}
2077		2229
2078	$self->post_load;	2230	$self->post_load;
2079	}
2080		2231
		2232	1
		2233	}
		2234
		2235	# customize the map for a given player, i.e.
		2236	# return the _real_ map. used by e.g. per-player
		2237	# maps to change the path to ~playername/mappath
2081	sub customise_for {	2238	sub customise_for {
2082	my ($self, $ob) = @_;	2239	my ($self, $ob) = @_;
2083		2240
2084	return find "~" . $ob->name . "/" . $self->{path}	2241	return find "~" . $ob->name . "/" . $self->{path}
2085	if $self->per_player;	2242	if $self->per_player;
…		…
2101	or next;	2258	or next;
2102	$neigh = find $neigh, $map	2259	$neigh = find $neigh, $map
2103	or next;	2260	or next;
2104	$neigh->load;	2261	$neigh->load;
2105		2262
		2263	# now find the diagonal neighbours
2106	push @neigh,	2264	push @neigh,
2107	[$neigh->tile_path (($_ + 3) % 4), $neigh],	2265	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2108	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2266	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2109	}	2267	}
2110		2268
…		…
2117	}	2275	}
2118		2276
2119	sub find_sync {	2277	sub find_sync {
2120	my ($path, $origin) = @_;	2278	my ($path, $origin) = @_;
2121		2279
2122	cf::sync_job { find $path, $origin }	2280	# it's a bug to call this from the main context
		2281	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
		2282	if $Coro::current == $Coro::main;
		2283
		2284	find $path, $origin
2123	}	2285	}
2124		2286
2125	sub do_load_sync {	2287	sub do_load_sync {
2126	my ($map) = @_;	2288	my ($map) = @_;
2127		2289
		2290	# it's a bug to call this from the main context
2128	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2291	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2129	if $Coro::current == $Coro::main;	2292	if $Coro::current == $Coro::main;
2130		2293
2131	cf::sync_job { $map->load };	2294	$map->load;
2132	}	2295	}
2133		2296
2134	our %MAP_PREFETCH;	2297	our %MAP_PREFETCH;
2135	our $MAP_PREFETCHER = undef;	2298	our $MAP_PREFETCHER = undef;
2136		2299
2137	sub find_async {	2300	sub find_async {
2138	my ($path, $origin, $load) = @_;	2301	my ($path, $origin, $load) = @_;
2139		2302
2140	$path = normalise $path, $origin && $origin->{path};	2303	$path = normalise $path, $origin;
2141		2304
2142	if (my $map = $cf::MAP{$path}) {	2305	if (my $map = $cf::MAP{$path}) {
2143	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2306	return $map if !$load || $map->linkable;
2144	}	2307	}
2145		2308
2146	$MAP_PREFETCH{$path} |= $load;	2309	$MAP_PREFETCH{$path} |= $load;
2147		2310
2148	$MAP_PREFETCHER ||= cf::async {	2311	$MAP_PREFETCHER ||= cf::async {
…		…
2162	$MAP_PREFETCHER->prio (6);	2325	$MAP_PREFETCHER->prio (6);
2163		2326
2164	()	2327	()
2165	}	2328	}
2166		2329
		2330	# common code, used by both ->save and ->swapout
2167	sub save {	2331	sub _save {
2168	my ($self) = @_;	2332	my ($self) = @_;
2169
2170	my $lock = cf::lock_acquire "map_data:$self->{path}";
2171		2333
2172	$self->{last_save} = $cf::RUNTIME;	2334	$self->{last_save} = $cf::RUNTIME;
2173		2335
2174	return unless $self->dirty;	2336	return unless $self->dirty;
2175		2337
…		…
2195	} else {	2357	} else {
2196	$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);
2197	}	2359	}
2198	}	2360	}
2199		2361
		2362	sub save {
		2363	my ($self) = @_;
		2364
		2365	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2366
		2367	$self->_save;
		2368	}
		2369
2200	sub swap_out {	2370	sub swap_out {
2201	my ($self) = @_;	2371	my ($self) = @_;
2202		2372
2203	# save first because save cedes
2204	$self->save;
2205
2206	my $lock = cf::lock_acquire "map_data:$self->{path}";	2373	my $lock = cf::lock_acquire "map_data:$self->{path}";
2207		2374
		2375	return if !$self->linkable;
		2376	return if $self->{deny_save};
2208	return if $self->players;	2377	return if $self->players;
2209	return if $self->in_memory != cf::MAP_ACTIVE;	2378
		2379	# first deactivate the map and "unlink" it from the core
		2380	$self->deactivate;
		2381	$_->clear_links_to ($self) for values %cf::MAP;
		2382	$self->state (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
2210	return if $self->{deny_save};	2395	return 1e99 if $self->{deny_reset};
2211		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
2212	$self->in_memory (cf::MAP_SWAPPED);	2418	$self->state (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};
2213		2429
2214	$self->deactivate;	2430	$self->deactivate;
2215	$_->clear_links_to ($self) for values %cf::MAP;	2431	$_->clear_links_to ($self) for values %cf::MAP;
2216	$self->clear;	2432	$self->clear;
2217	}
2218
2219	sub reset_at {
2220	my ($self) = @_;
2221
2222	# TODO: safety, remove and allow resettable per-player maps
2223	return 1e99 if $self->{deny_reset};
2224
2225	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2226	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2227
2228	$time + $to
2229	}
2230
2231	sub should_reset {
2232	my ($self) = @_;
2233
2234	$self->reset_at <= $cf::RUNTIME
2235	}
2236
2237	sub reset {
2238	my ($self) = @_;
2239
2240	my $lock = cf::lock_acquire "map_data:$self->{path}";
2241
2242	return if $self->players;
2243
2244	warn "resetting map ", $self->path, "\n";
2245
2246	$self->in_memory (cf::MAP_SWAPPED);
2247
2248	# need to save uniques path
2249	unless ($self->{deny_save}) {
2250	my $uniq = $self->uniq_path; utf8::encode $uniq;
2251
2252	$self->_save_objects ($uniq, cf::IO_UNIQUES)
2253	if $uniq;
2254	}
2255
2256	delete $cf::MAP{$self->path};
2257
2258	$self->deactivate;
2259	$_->clear_links_to ($self) for values %cf::MAP;
2260	$self->clear;
2261		2433
2262	$self->unlink_save;	2434	$self->unlink_save;
2263	$self->destroy;	2435	$self->destroy;
2264	}	2436	}
2265		2437
…		…
2273		2445
2274	delete $cf::MAP{$self->path};	2446	delete $cf::MAP{$self->path};
2275		2447
2276	$self->unlink_save;	2448	$self->unlink_save;
2277		2449
2278	bless $self, "cf::map";	2450	bless $self, "cf::map::wrap";
2279	delete $self->{deny_reset};	2451	delete $self->{deny_reset};
2280	$self->{deny_save} = 1;	2452	$self->{deny_save} = 1;
2281	$self->reset_timeout (1);	2453	$self->reset_timeout (1);
2282	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2454	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2283		2455
…		…
2340	: normalise $_	2512	: normalise $_
2341	} @{ aio_readdir $UNIQUEDIR or [] }	2513	} @{ aio_readdir $UNIQUEDIR or [] }
2342	]	2514	]
2343	}	2515	}
2344		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
2345	=back	2549	=back
2346		2550
2347	=head3 cf::object	2551	=head3 cf::object
2348		2552
2349	=cut	2553	=cut
…		…
2481		2685
2482	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}>).
2483		2687
2484	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.
2485	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,
2486	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
2487	map.	2691	map.
2488		2692
2489	Will never block.	2693	Will never block.
2490		2694
2491	=item $player_object->leave_link ($map, $x, $y)	2695	=item $player_object->leave_link ($map, $x, $y)
…		…
2512	sub cf::object::player::enter_link {	2716	sub cf::object::player::enter_link {
2513	my ($self) = @_;	2717	my ($self) = @_;
2514		2718
2515	$self->deactivate_recursive;	2719	$self->deactivate_recursive;
2516		2720
		2721	++$self->{_link_recursion};
		2722
2517	return if UNIVERSAL::isa $self->map, "ext::map_link";	2723	return if UNIVERSAL::isa $self->map, "ext::map_link";
2518		2724
2519	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2725	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2520	if $self->map && $self->map->{path} ne "{link}";	2726	if $self->map && $self->map->{path} ne "{link}";
2521		2727
2522	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2728	$self->enter_map ($LINK_MAP || link_map, 3, 3);
2523	}	2729	}
2524		2730
2525	sub cf::object::player::leave_link {	2731	sub cf::object::player::leave_link {
2526	my ($self, $map, $x, $y) = @_;	2732	my ($self, $map, $x, $y) = @_;
2527		2733
…		…
2544	($x, $y) = (-1, -1)	2750	($x, $y) = (-1, -1)
2545	unless (defined $x) && (defined $y);	2751	unless (defined $x) && (defined $y);
2546		2752
2547	# use -1 or undef as default coordinates, not 0, 0	2753	# use -1 or undef as default coordinates, not 0, 0
2548	($x, $y) = ($map->enter_x, $map->enter_y)	2754	($x, $y) = ($map->enter_x, $map->enter_y)
2549	if $x <=0 && $y <= 0;	2755	if $x <= 0 && $y <= 0;
2550		2756
2551	$map->load;	2757	$map->load;
2552	$map->load_neighbours;	2758	$map->load_neighbours;
2553		2759
2554	return unless $self->contr->active;	2760	return unless $self->contr->active;
2555		2761
2556	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2762	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2557	$self->enter_map ($map, $x, $y);	2763	if ($self->enter_map ($map, $x, $y)) {
2558		2764	# entering was successful
		2765	delete $self->{_link_recursion};
2559	# only activate afterwards, to support waiting in hooks	2766	# only activate afterwards, to support waiting in hooks
2560	$self->activate_recursive;	2767	$self->activate_recursive;
2561	}	2768	}
2562		2769
		2770	}
		2771
2563	=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)]])
2564		2773
2565	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
2566	her, loading and preparing them map, calling the provided $check callback	2775	her, loading and preparing them map, calling the provided $check callback
2567	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
2568	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
…		…
2575		2784
2576	our $GOTOGEN;	2785	our $GOTOGEN;
2577		2786
2578	sub cf::object::player::goto {	2787	sub cf::object::player::goto {
2579	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	}
2580		2795
2581	# 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
2582	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2797	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2583		2798
2584	$self->enter_link;	2799	$self->enter_link;
…		…
2604	($path, $x, $y) = (undef, undef, undef);	2819	($path, $x, $y) = (undef, undef, undef);
2605	}	2820	}
2606	}	2821	}
2607		2822
2608	my $map = eval {	2823	my $map = eval {
2609	my $map = defined $path ? cf::map::find $path : undef;	2824	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2610		2825
2611	if ($map) {	2826	if ($map) {
2612	$map = $map->customise_for ($self);	2827	$map = $map->customise_for ($self);
2613	$map = $check->($map) if $check && $map;	2828	$map = $check->($map, $x, $y, $self) if $check && $map;
2614	} else {	2829	} else {
2615	$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);
2616	}	2831	}
2617		2832
2618	$map	2833	$map
…		…
2626	if ($gen == $self->{_goto_generation}) {	2841	if ($gen == $self->{_goto_generation}) {
2627	delete $self->{_goto_generation};	2842	delete $self->{_goto_generation};
2628	$self->leave_link ($map, $x, $y);	2843	$self->leave_link ($map, $x, $y);
2629	}	2844	}
2630		2845
2631	$done->() if $done;	2846	$done->($self) if $done;
2632	})->prio (1);	2847	})->prio (1);
2633	}	2848	}
2634		2849
2635	=item $player_object->enter_exit ($exit_object)	2850	=item $player_object->enter_exit ($exit_object)
2636		2851
…		…
2704	$Coro::current->{desc} = "enter_exit";	2919	$Coro::current->{desc} = "enter_exit";
2705		2920
2706	unless (eval {	2921	unless (eval {
2707	$self->deactivate_recursive; # just to be sure	2922	$self->deactivate_recursive; # just to be sure
2708		2923
2709	# random map handling
2710	{
2711	my $guard = cf::lock_acquire "exit_prepare:$exit";
2712
2713	prepare_random_map $exit
2714	if $exit->slaying eq "/!";
2715	}
2716
2717	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2924	my $map = cf::map::normalise $exit->slaying, $exit->map;
2718	my $x = $exit->stats->hp;	2925	my $x = $exit->stats->hp;
2719	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 $exit->slaying eq "/!"; # need to re-check after getting the lock
		2937
		2938	$map = $exit->slaying;
		2939
		2940	} elsif ($slaying eq '!up') {
		2941	$map = $exit->map->tile_path (cf::TILE_UP);
		2942	$x = $exit->x;
		2943	$y = $exit->y;
		2944
		2945	} elsif ($slaying eq '!down') {
		2946	$map = $exit->map->tile_path (cf::TILE_DOWN);
		2947	$x = $exit->x;
		2948	$y = $exit->y;
		2949	}
2720		2950
2721	$self->goto ($map, $x, $y);	2951	$self->goto ($map, $x, $y);
2722		2952
2723	# if exit is damned, update players death & WoR home-position	2953	# if exit is damned, update players death & WoR home-position
2724	$self->contr->savebed ($map, $x, $y)	2954	$self->contr->savebed ($map, $x, $y)
…		…
2729	$self->message ("Something went wrong deep within the deliantra server. "	2959	$self->message ("Something went wrong deep within the deliantra server. "
2730	. "I'll try to bring you back to the map you were before. "	2960	. "I'll try to bring you back to the map you were before. "
2731	. "Please report this to the dungeon master!",	2961	. "Please report this to the dungeon master!",
2732	cf::NDI_UNIQUE | cf::NDI_RED);	2962	cf::NDI_UNIQUE | cf::NDI_RED);
2733		2963
2734	warn "ERROR in enter_exit: $@";	2964	error "ERROR in enter_exit: $@";
2735	$self->leave_link;	2965	$self->leave_link;
2736	}	2966	}
2737	})->prio (1);	2967	})->prio (1);
2738	}	2968	}
2739		2969
…		…
2751	sub cf::client::send_drawinfo {	2981	sub cf::client::send_drawinfo {
2752	my ($self, $text, $flags) = @_;	2982	my ($self, $text, $flags) = @_;
2753		2983
2754	utf8::encode $text;	2984	utf8::encode $text;
2755	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2985	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
		2986	}
		2987
		2988	=item $client->send_big_packet ($pkt)
		2989
		2990	Like C<send_packet>, but tries to compress large packets, and fragments
		2991	them as required.
		2992
		2993	=cut
		2994
		2995	our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
		2996
		2997	sub cf::client::send_big_packet {
		2998	my ($self, $pkt) = @_;
		2999
		3000	# try lzf for large packets
		3001	$pkt = "lzf " . Compress::LZF::compress $pkt
		3002	if 1024 <= length $pkt and $self->{can_lzf};
		3003
		3004	# split very large packets
		3005	if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
		3006	$self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
		3007	$pkt = "frag";
		3008	}
		3009
		3010	$self->send_packet ($pkt);
2756	}	3011	}
2757		3012
2758	=item $client->send_msg ($channel, $msg, $color, [extra...])	3013	=item $client->send_msg ($channel, $msg, $color, [extra...])
2759		3014
2760	Send a drawinfo or msg packet to the client, formatting the msg for the	3015	Send a drawinfo or msg packet to the client, formatting the msg for the
…		…
2764		3019
2765	=cut	3020	=cut
2766		3021
2767	# non-persistent channels (usually the info channel)	3022	# non-persistent channels (usually the info channel)
2768	our %CHANNEL = (	3023	our %CHANNEL = (
		3024	"c/motd" => {
		3025	id => "infobox",
		3026	title => "MOTD",
		3027	reply => undef,
		3028	tooltip => "The message of the day",
		3029	},
2769	"c/identify" => {	3030	"c/identify" => {
2770	id => "infobox",	3031	id => "infobox",
2771	title => "Identify",	3032	title => "Identify",
2772	reply => undef,	3033	reply => undef,
2773	tooltip => "Items recently identified",	3034	tooltip => "Items recently identified",
…		…
2775	"c/examine" => {	3036	"c/examine" => {
2776	id => "infobox",	3037	id => "infobox",
2777	title => "Examine",	3038	title => "Examine",
2778	reply => undef,	3039	reply => undef,
2779	tooltip => "Signs and other items you examined",	3040	tooltip => "Signs and other items you examined",
		3041	},
		3042	"c/shopinfo" => {
		3043	id => "infobox",
		3044	title => "Shop Info",
		3045	reply => undef,
		3046	tooltip => "What your bargaining skill tells you about the shop",
2780	},	3047	},
2781	"c/book" => {	3048	"c/book" => {
2782	id => "infobox",	3049	id => "infobox",
2783	title => "Book",	3050	title => "Book",
2784	reply => undef,	3051	reply => undef,
…		…
2900	my $pkt = "msg "	3167	my $pkt = "msg "
2901	. $self->{json_coder}->encode (	3168	. $self->{json_coder}->encode (
2902	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]	3169	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2903	);	3170	);
2904		3171
2905	# try lzf for large packets
2906	$pkt = "lzf " . Compress::LZF::compress $pkt
2907	if 1024 <= length $pkt and $self->{can_lzf};
2908
2909	# split very large packets
2910	if (8192 < length $pkt and $self->{can_lzf}) {
2911	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2912	$pkt = "frag";
2913	}
2914
2915	$self->send_packet ($pkt);	3172	$self->send_big_packet ($pkt);
2916	}	3173	}
2917		3174
2918	=item $client->ext_msg ($type, @msg)	3175	=item $client->ext_msg ($type, @msg)
2919		3176
2920	Sends an ext event to the client.	3177	Sends an ext event to the client.
…		…
2923		3180
2924	sub cf::client::ext_msg($$@) {	3181	sub cf::client::ext_msg($$@) {
2925	my ($self, $type, @msg) = @_;	3182	my ($self, $type, @msg) = @_;
2926		3183
2927	if ($self->extcmd == 2) {	3184	if ($self->extcmd == 2) {
2928	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3185	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2929	} elsif ($self->extcmd == 1) { # TODO: remove	3186	} elsif ($self->extcmd == 1) { # TODO: remove
2930	push @msg, msgtype => "event_$type";	3187	push @msg, msgtype => "event_$type";
2931	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3188	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2932	}	3189	}
2933	}	3190	}
2934		3191
2935	=item $client->ext_reply ($msgid, @msg)	3192	=item $client->ext_reply ($msgid, @msg)
2936		3193
…		…
2940		3197
2941	sub cf::client::ext_reply($$@) {	3198	sub cf::client::ext_reply($$@) {
2942	my ($self, $id, @msg) = @_;	3199	my ($self, $id, @msg) = @_;
2943		3200
2944	if ($self->extcmd == 2) {	3201	if ($self->extcmd == 2) {
2945	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));	3202	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2946	} elsif ($self->extcmd == 1) {	3203	} elsif ($self->extcmd == 1) {
2947	#TODO: version 1, remove	3204	#TODO: version 1, remove
2948	unshift @msg, msgtype => "reply", msgid => $id;	3205	unshift @msg, msgtype => "reply", msgid => $id;
2949	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3206	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2950	}	3207	}
2951	}	3208	}
2952		3209
2953	=item $success = $client->query ($flags, "text", \&cb)	3210	=item $success = $client->query ($flags, "text", \&cb)
2954		3211
…		…
3025		3282
3026	$ns->ext_reply ($reply, @reply)	3283	$ns->ext_reply ($reply, @reply)
3027	if $reply;	3284	if $reply;
3028		3285
3029	} else {	3286	} else {
3030	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3287	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3031	}	3288	}
3032		3289
3033	cf::override;	3290	cf::override;
3034	},	3291	},
3035	);	3292	);
…		…
3055		3312
3056	$coro	3313	$coro
3057	}	3314	}
3058		3315
3059	cf::client->attach (	3316	cf::client->attach (
3060	on_destroy => sub {	3317	on_client_destroy => sub {
3061	my ($ns) = @_;	3318	my ($ns) = @_;
3062		3319
3063	$_->cancel for values %{ (delete $ns->{_coro}) || {} };	3320	$_->cancel for values %{ (delete $ns->{_coro}) || {} };
3064	},	3321	},
3065	);	3322	);
…		…
3081	our $safe_hole = new Safe::Hole;	3338	our $safe_hole = new Safe::Hole;
3082		3339
3083	$SIG{FPE} = 'IGNORE';	3340	$SIG{FPE} = 'IGNORE';
3084		3341
3085	$safe->permit_only (Opcode::opset qw(	3342	$safe->permit_only (Opcode::opset qw(
3086	:base_core :base_mem :base_orig :base_math	3343	:base_core :base_mem :base_orig :base_math :base_loop
3087	grepstart grepwhile mapstart mapwhile	3344	grepstart grepwhile mapstart mapwhile
3088	sort time	3345	sort time
3089	));	3346	));
3090		3347
3091	# here we export the classes and methods available to script code	3348	# here we export the classes and methods available to script code
…		…
3116	decrease split destroy change_exp value msg lore send_msg)],	3373	decrease split destroy change_exp value msg lore send_msg)],
3117	["cf::object::player" => qw(player)],	3374	["cf::object::player" => qw(player)],
3118	["cf::player" => qw(peaceful send_msg)],	3375	["cf::player" => qw(peaceful send_msg)],
3119	["cf::map" => qw(trigger)],	3376	["cf::map" => qw(trigger)],
3120	) {	3377	) {
3121	no strict 'refs';
3122	my ($pkg, @funs) = @$_;	3378	my ($pkg, @funs) = @$_;
3123	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3379	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3124	for @funs;	3380	for @funs;
3125	}	3381	}
3126		3382
…		…
3143	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3399	$qcode =~ s/"/‟/g; # not allowed in #line filenames
3144	$qcode =~ s/\n/\\n/g;	3400	$qcode =~ s/\n/\\n/g;
3145		3401
3146	%vars = (_dummy => 0) unless %vars;	3402	%vars = (_dummy => 0) unless %vars;
3147		3403
		3404	my @res;
3148	local $_;	3405	local $_;
3149	local @safe::cf::_safe_eval_args = values %vars;
3150		3406
3151	my $eval =	3407	my $eval =
3152	"do {\n"	3408	"do {\n"
3153	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"	3409	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3154	. "#line 0 \"{$qcode}\"\n"	3410	. "#line 0 \"{$qcode}\"\n"
3155	. $code	3411	. $code
3156	. "\n}"	3412	. "\n}"
3157	;	3413	;
3158		3414
		3415	if ($CFG{safe_eval}) {
3159	sub_generation_inc;	3416	sub_generation_inc;
		3417	local @safe::cf::_safe_eval_args = values %vars;
3160	my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);	3418	@res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3161	sub_generation_inc;	3419	sub_generation_inc;
		3420	} else {
		3421	local @cf::_safe_eval_args = values %vars;
		3422	@res = wantarray ? eval eval : scalar eval $eval;
		3423	}
3162		3424
3163	if ($@) {	3425	if ($@) {
3164	warn "$@";	3426	warn "$@",
3165	warn "while executing safe code '$code'\n";	3427	"while executing safe code '$code'\n",
3166	warn "with arguments " . (join " ", %vars) . "\n";	3428	"with arguments " . (join " ", %vars) . "\n";
3167	}	3429	}
3168		3430
3169	wantarray ? @res : $res[0]	3431	wantarray ? @res : $res[0]
3170	}	3432	}
3171		3433
…		…
3185	=cut	3447	=cut
3186		3448
3187	sub register_script_function {	3449	sub register_script_function {
3188	my ($fun, $cb) = @_;	3450	my ($fun, $cb) = @_;
3189		3451
3190	no strict 'refs';	3452	$fun = "safe::$fun" if $CFG{safe_eval};
3191	*{"safe::$fun"} = $safe_hole->wrap ($cb);	3453	*$fun = $safe_hole->wrap ($cb);
3192	}	3454	}
3193		3455
3194	=back	3456	=back
3195		3457
3196	=cut	3458	=cut
…		…
3205	# for this (global event?)	3467	# for this (global event?)
3206	%ext::player_env::MUSIC_FACE_CACHE = ();	3468	%ext::player_env::MUSIC_FACE_CACHE = ();
3207		3469
3208	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3470	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3209		3471
3210	warn "loading facedata from $path\n";	3472	trace "loading facedata from $path\n";
3211		3473
3212	my $facedata;	3474	my $facedata = decode_storable load_file $path;
3213	0 < aio_load $path, $facedata
3214	or die "$path: $!";
3215
3216	$facedata = Coro::Storable::thaw $facedata;
3217		3475
3218	$facedata->{version} == 2	3476	$facedata->{version} == 2
3219	or cf::cleanup "$path: version mismatch, cannot proceed.";	3477	or cf::cleanup "$path: version mismatch, cannot proceed.";
3220		3478
3221	# patch in the exptable	3479	# patch in the exptable
		3480	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3222	$facedata->{resource}{"res/exp_table"} = {	3481	$facedata->{resource}{"res/exp_table"} = {
3223	type => FT_RSRC,	3482	type => FT_RSRC,
3224	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),	3483	data => $exp_table,
		3484	hash => (Digest::MD5::md5 $exp_table),
3225	};	3485	};
3226	cf::cede_to_tick;	3486	cf::cede_to_tick;
3227		3487
3228	{	3488	{
3229	my $faces = $facedata->{faceinfo};	3489	my $faces = $facedata->{faceinfo};
…		…
3231	while (my ($face, $info) = each %$faces) {	3491	while (my ($face, $info) = each %$faces) {
3232	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3492	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3233		3493
3234	cf::face::set_visibility $idx, $info->{visibility};	3494	cf::face::set_visibility $idx, $info->{visibility};
3235	cf::face::set_magicmap $idx, $info->{magicmap};	3495	cf::face::set_magicmap $idx, $info->{magicmap};
3236	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};	3496	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3237	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};	3497	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
		3498	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3238		3499
3239	cf::cede_to_tick;	3500	cf::cede_to_tick;
3240	}	3501	}
3241		3502
3242	while (my ($face, $info) = each %$faces) {	3503	while (my ($face, $info) = each %$faces) {
…		…
3247		3508
3248	if (my $smooth = cf::face::find $info->{smooth}) {	3509	if (my $smooth = cf::face::find $info->{smooth}) {
3249	cf::face::set_smooth $idx, $smooth;	3510	cf::face::set_smooth $idx, $smooth;
3250	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3511	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3251	} else {	3512	} else {
3252	warn "smooth face '$info->{smooth}' not found for face '$face'";	3513	error "smooth face '$info->{smooth}' not found for face '$face'";
3253	}	3514	}
3254		3515
3255	cf::cede_to_tick;	3516	cf::cede_to_tick;
3256	}	3517	}
3257	}	3518	}
…		…
3266		3527
3267	cf::anim::invalidate_all; # d'oh	3528	cf::anim::invalidate_all; # d'oh
3268	}	3529	}
3269		3530
3270	{	3531	{
3271	# TODO: for gcfclient pleasure, we should give resources
3272	# that gcfclient doesn't grok a >10000 face index.
3273	my $res = $facedata->{resource};	3532	my $res = $facedata->{resource};
3274		3533
3275	while (my ($name, $info) = each %$res) {	3534	while (my ($name, $info) = each %$res) {
3276	if (defined $info->{type}) {	3535	if (defined $info->{type}) {
3277	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3536	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3278	my $data;
3279		3537
3280	if ($info->{type} & 1) {	3538	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3281	# prepend meta info
3282
3283	my $meta = $enc->encode ({
3284	name => $name,
3285	%{ $info->{meta} || {} },
3286	});
3287
3288	$data = pack "(w/a*)*", $meta, $info->{data};
3289	} else {
3290	$data = $info->{data};
3291	}
3292
3293	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3294	cf::face::set_type $idx, $info->{type};	3539	cf::face::set_type $idx, $info->{type};
3295	} else {	3540	} else {
3296	$RESOURCE{$name} = $info;	3541	$RESOURCE{$name} = $info; # unused
3297	}	3542	}
3298		3543
3299	cf::cede_to_tick;	3544	cf::cede_to_tick;
3300	}	3545	}
3301	}	3546	}
3302		3547
3303	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3548	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3304		3549
3305	1	3550	1
3306	}	3551	}
3307
3308	cf::global->attach (on_resource_update => sub {
3309	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3310	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3311
3312	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3313	my $sound = $soundconf->{compat}[$_]
3314	or next;
3315
3316	my $face = cf::face::find "sound/$sound->[1]";
3317	cf::sound::set $sound->[0] => $face;
3318	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3319	}
3320
3321	while (my ($k, $v) = each %{$soundconf->{event}}) {
3322	my $face = cf::face::find "sound/$v";
3323	cf::sound::set $k => $face;
3324	}
3325	}
3326	});
3327		3552
3328	register_exticmd fx_want => sub {	3553	register_exticmd fx_want => sub {
3329	my ($ns, $want) = @_;	3554	my ($ns, $want) = @_;
3330		3555
3331	while (my ($k, $v) = each %$want) {	3556	while (my ($k, $v) = each %$want) {
…		…
3370	sub reload_treasures {	3595	sub reload_treasures {
3371	load_resource_file "$DATADIR/treasures"	3596	load_resource_file "$DATADIR/treasures"
3372	or die "unable to load treasurelists\n";	3597	or die "unable to load treasurelists\n";
3373	}	3598	}
3374		3599
		3600	sub reload_sound {
		3601	trace "loading sound config from $DATADIR/sound\n";
		3602
		3603	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
		3604
		3605	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3606	my $sound = $soundconf->{compat}[$_]
		3607	or next;
		3608
		3609	my $face = cf::face::find "sound/$sound->[1]";
		3610	cf::sound::set $sound->[0] => $face;
		3611	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3612	}
		3613
		3614	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3615	my $face = cf::face::find "sound/$v";
		3616	cf::sound::set $k => $face;
		3617	}
		3618	}
		3619
3375	sub reload_resources {	3620	sub reload_resources {
3376	warn "reloading resource files...\n";	3621	trace "reloading resource files...\n";
3377		3622
		3623	reload_exp_table;
		3624	reload_materials;
3378	reload_facedata;	3625	reload_facedata;
		3626	reload_sound;
3379	reload_archetypes;	3627	reload_archetypes;
3380	reload_regions;	3628	reload_regions;
3381	reload_treasures;	3629	reload_treasures;
3382		3630
3383	warn "finished reloading resource files\n";	3631	trace "finished reloading resource files\n";
3384	}	3632	}
3385		3633
3386	sub reload_config {	3634	sub reload_config {
3387	open my $fh, "<:utf8", "$CONFDIR/config"	3635	trace "reloading config file...\n";
3388	or return;
3389		3636
3390	local $/;	3637	my $config = load_file "$CONFDIR/config";
3391	*CFG = YAML::Load <$fh>;	3638	utf8::decode $config;
		3639	*CFG = decode_yaml $config;
3392		3640
3393	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3641	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3394		3642
3395	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3643	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3396	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3644	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3397		3645
3398	if (exists $CFG{mlockall}) {	3646	if (exists $CFG{mlockall}) {
…		…
3422	seek $fh, 0, 0;	3670	seek $fh, 0, 0;
3423	print $fh $$;	3671	print $fh $$;
3424	}	3672	}
3425		3673
3426	sub main_loop {	3674	sub main_loop {
3427	warn "EV::loop starting\n";	3675	trace "EV::loop starting\n";
3428	if (1) {	3676	if (1) {
3429	EV::loop;	3677	EV::loop;
3430	}	3678	}
3431	warn "EV::loop returned\n";	3679	trace "EV::loop returned\n";
3432	goto &main_loop unless $REALLY_UNLOOP;	3680	goto &main_loop unless $REALLY_UNLOOP;
3433	}	3681	}
3434		3682
3435	sub main {	3683	sub main {
3436	cf::init_globals; # initialise logging	3684	cf::init_globals; # initialise logging
3437		3685
3438	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3686	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3439	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3687	LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3440	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3688	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3441	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3689	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3442
3443	cf::init_experience;
3444	cf::init_anim;
3445	cf::init_attackmess;
3446	cf::init_dynamic;
3447		3690
3448	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3691	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3449		3692
3450	# we must not ever block the main coroutine	3693	# we must not ever block the main coroutine
3451	local $Coro::idle = sub {	3694	local $Coro::idle = sub {
…		…
3457	};	3700	};
3458		3701
3459	evthread_start IO::AIO::poll_fileno;	3702	evthread_start IO::AIO::poll_fileno;
3460		3703
3461	cf::sync_job {	3704	cf::sync_job {
		3705	cf::incloader::init ();
		3706
		3707	cf::init_anim;
		3708	cf::init_attackmess;
		3709	cf::init_dynamic;
		3710
		3711	cf::load_settings;
		3712
3462	reload_resources;	3713	reload_resources;
3463	reload_config;	3714	reload_config;
3464	db_init;	3715	db_init;
3465		3716
3466	cf::load_settings;
3467	cf::load_materials;
3468	cf::init_uuid;	3717	cf::init_uuid;
3469	cf::init_signals;	3718	cf::init_signals;
3470	cf::init_commands;
3471	cf::init_skills;	3719	cf::init_skills;
3472		3720
3473	cf::init_beforeplay;	3721	cf::init_beforeplay;
3474		3722
3475	atomic;	3723	atomic;
…		…
3480		3728
3481	# no (long-running) fork's whatsoever before this point(!)	3729	# no (long-running) fork's whatsoever before this point(!)
3482	use POSIX ();	3730	use POSIX ();
3483	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3731	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3484		3732
3485	(pop @POST_INIT)->(0) while @POST_INIT;	3733	cf::_post_init 0;
3486	};	3734	};
3487		3735
		3736	cf::object::thawer::errors_are_fatal 0;
		3737	info "parse errors in files are no longer fatal from this point on.\n";
		3738
		3739	my $free_main; $free_main = EV::idle sub {
		3740	undef $free_main;
		3741	undef &main; # free gobs of memory :)
		3742	};
		3743
3488	main_loop;	3744	goto &main_loop;
3489	}	3745	}
3490		3746
3491	#############################################################################	3747	#############################################################################
3492	# initialisation and cleanup	3748	# initialisation and cleanup
3493		3749
3494	# install some emergency cleanup handlers	3750	# install some emergency cleanup handlers
3495	BEGIN {	3751	BEGIN {
3496	our %SIGWATCHER = ();	3752	our %SIGWATCHER = ();
3497	for my $signal (qw(INT HUP TERM)) {	3753	for my $signal (qw(INT HUP TERM)) {
3498	$SIGWATCHER{$signal} = EV::signal $signal, sub {	3754	$SIGWATCHER{$signal} = AE::signal $signal, sub {
3499	cf::cleanup "SIG$signal";	3755	cf::cleanup "SIG$signal";
3500	};	3756	};
3501	}	3757	}
3502	}	3758	}
3503		3759
3504	sub write_runtime_sync {	3760	sub write_runtime_sync {
		3761	my $t0 = AE::time;
		3762
3505	# first touch the runtime file to show we are still running:	3763	# first touch the runtime file to show we are still running:
3506	# the fsync below can take a very very long time.	3764	# the fsync below can take a very very long time.
3507		3765
3508	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;	3766	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3509		3767
3510	my $guard = cf::lock_acquire "write_runtime";	3768	my $guard = cf::lock_acquire "write_runtime";
3511		3769
3512	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644	3770	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3513	or return;	3771	or return;
3514		3772
3515	my $value = $cf::RUNTIME + 90 + 10;	3773	my $value = $cf::RUNTIME + 90 + 10;
3516	# 10 is the runtime save interval, for a monotonic clock	3774	# 10 is the runtime save interval, for a monotonic clock
3517	# 60 allows for the watchdog to kill the server.	3775	# 60 allows for the watchdog to kill the server.
…		…
3530	or return;	3788	or return;
3531		3789
3532	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3790	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3533	and return;	3791	and return;
3534		3792
3535	warn "runtime file written.\n";	3793	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3536		3794
3537	1	3795	1
3538	}	3796	}
3539		3797
3540	our $uuid_lock;	3798	our $uuid_lock;
…		…
3552	or return;	3810	or return;
3553		3811
3554	my $value = uuid_seq uuid_cur;	3812	my $value = uuid_seq uuid_cur;
3555		3813
3556	unless ($value) {	3814	unless ($value) {
3557	warn "cowardly refusing to write zero uuid value!\n";	3815	info "cowardly refusing to write zero uuid value!\n";
3558	return;	3816	return;
3559	}	3817	}
3560		3818
3561	my $value = uuid_str $value + $uuid_skip;	3819	my $value = uuid_str $value + $uuid_skip;
3562	$uuid_skip = 0;	3820	$uuid_skip = 0;
…		…
3572	or return;	3830	or return;
3573		3831
3574	aio_rename "$uuid~", $uuid	3832	aio_rename "$uuid~", $uuid
3575	and return;	3833	and return;
3576		3834
3577	warn "uuid file written ($value).\n";	3835	trace "uuid file written ($value).\n";
3578		3836
3579	1	3837	1
3580		3838
3581	}	3839	}
3582		3840
…		…
3588	}	3846	}
3589		3847
3590	sub emergency_save() {	3848	sub emergency_save() {
3591	my $freeze_guard = cf::freeze_mainloop;	3849	my $freeze_guard = cf::freeze_mainloop;
3592		3850
3593	warn "emergency_perl_save: enter\n";	3851	info "emergency_perl_save: enter\n";
		3852
		3853	# this is a trade-off: we want to be very quick here, so
		3854	# save all maps without fsync, and later call a global sync
		3855	# (which in turn might be very very slow)
		3856	local $USE_FSYNC = 0;
3594		3857
3595	cf::sync_job {	3858	cf::sync_job {
3596	# this is a trade-off: we want to be very quick here, so	3859	cf::write_runtime_sync; # external watchdog should not bark
3597	# save all maps without fsync, and later call a global sync
3598	# (which in turn might be very very slow)
3599	local $USE_FSYNC = 0;
3600		3860
3601	# use a peculiar iteration method to avoid tripping on perl	3861	# use a peculiar iteration method to avoid tripping on perl
3602	# refcount bugs in for. also avoids problems with players	3862	# refcount bugs in for. also avoids problems with players
3603	# and maps saved/destroyed asynchronously.	3863	# and maps saved/destroyed asynchronously.
3604	warn "emergency_perl_save: begin player save\n";	3864	info "emergency_perl_save: begin player save\n";
3605	for my $login (keys %cf::PLAYER) {	3865	for my $login (keys %cf::PLAYER) {
3606	my $pl = $cf::PLAYER{$login} or next;	3866	my $pl = $cf::PLAYER{$login} or next;
3607	$pl->valid or next;	3867	$pl->valid or next;
3608	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3868	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3609	$pl->save;	3869	$pl->save;
3610	}	3870	}
3611	warn "emergency_perl_save: end player save\n";	3871	info "emergency_perl_save: end player save\n";
3612		3872
		3873	cf::write_runtime_sync; # external watchdog should not bark
		3874
3613	warn "emergency_perl_save: begin map save\n";	3875	info "emergency_perl_save: begin map save\n";
3614	for my $path (keys %cf::MAP) {	3876	for my $path (keys %cf::MAP) {
3615	my $map = $cf::MAP{$path} or next;	3877	my $map = $cf::MAP{$path} or next;
3616	$map->valid or next;	3878	$map->valid or next;
3617	$map->save;	3879	$map->save;
3618	}	3880	}
3619	warn "emergency_perl_save: end map save\n";	3881	info "emergency_perl_save: end map save\n";
3620		3882
		3883	cf::write_runtime_sync; # external watchdog should not bark
		3884
3621	warn "emergency_perl_save: begin database checkpoint\n";	3885	info "emergency_perl_save: begin database checkpoint\n";
3622	BDB::db_env_txn_checkpoint $DB_ENV;	3886	BDB::db_env_txn_checkpoint $DB_ENV;
3623	warn "emergency_perl_save: end database checkpoint\n";	3887	info "emergency_perl_save: end database checkpoint\n";
3624		3888
3625	warn "emergency_perl_save: begin write uuid\n";	3889	info "emergency_perl_save: begin write uuid\n";
3626	write_uuid_sync 1;	3890	write_uuid_sync 1;
3627	warn "emergency_perl_save: end write uuid\n";	3891	info "emergency_perl_save: end write uuid\n";
		3892
		3893	cf::write_runtime_sync; # external watchdog should not bark
		3894
		3895	trace "emergency_perl_save: syncing database to disk";
		3896	BDB::db_env_txn_checkpoint $DB_ENV;
		3897
		3898	info "emergency_perl_save: starting sync\n";
		3899	IO::AIO::aio_sync sub {
		3900	info "emergency_perl_save: finished sync\n";
		3901	};
		3902
		3903	cf::write_runtime_sync; # external watchdog should not bark
		3904
		3905	trace "emergency_perl_save: flushing outstanding aio requests";
		3906	while (IO::AIO::nreqs || BDB::nreqs) {
		3907	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
		3908	}
		3909
		3910	cf::write_runtime_sync; # external watchdog should not bark
3628	};	3911	};
3629		3912
3630	warn "emergency_perl_save: starting sync()\n";
3631	IO::AIO::aio_sync sub {
3632	warn "emergency_perl_save: finished sync()\n";
3633	};
3634
3635	warn "emergency_perl_save: leave\n";	3913	info "emergency_perl_save: leave\n";
3636	}	3914	}
3637		3915
3638	sub post_cleanup {	3916	sub post_cleanup {
3639	my ($make_core) = @_;	3917	my ($make_core) = @_;
3640		3918
		3919	IO::AIO::flush;
		3920
3641	warn Carp::longmess "post_cleanup backtrace"	3921	error Carp::longmess "post_cleanup backtrace"
3642	if $make_core;	3922	if $make_core;
3643		3923
3644	my $fh = pidfile;	3924	my $fh = pidfile;
3645	unlink $PIDFILE if <$fh> == $$;	3925	unlink $PIDFILE if <$fh> == $$;
3646	}	3926	}
…		…
3666	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	3946	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3667	for my $name (keys %$leaf_symtab) {	3947	for my $name (keys %$leaf_symtab) {
3668	_gv_clear *{"$pkg$name"};	3948	_gv_clear *{"$pkg$name"};
3669	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	3949	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3670	}	3950	}
3671	warn "cleared package $pkg\n";#d#
3672	}	3951	}
3673		3952
3674	sub do_reload_perl() {	3953	sub do_reload_perl() {
3675	# can/must only be called in main	3954	# can/must only be called in main
3676	if ($Coro::current != $Coro::main) {	3955	unless (in_main) {
3677	warn "can only reload from main coroutine";	3956	error "can only reload from main coroutine";
3678	return;	3957	return;
3679	}	3958	}
3680		3959
3681	return if $RELOAD++;	3960	return if $RELOAD++;
3682		3961
3683	my $t1 = EV::time;	3962	my $t1 = AE::time;
3684		3963
3685	while ($RELOAD) {	3964	while ($RELOAD) {
3686	warn "reloading...";	3965	cf::get_slot 0.1, -1, "reload_perl";
		3966	info "perl_reload: reloading...";
3687		3967
3688	warn "entering sync_job";	3968	trace "perl_reload: entering sync_job";
3689		3969
3690	cf::sync_job {	3970	cf::sync_job {
3691	cf::write_runtime_sync; # external watchdog should not bark
3692	cf::emergency_save;	3971	#cf::emergency_save;
3693	cf::write_runtime_sync; # external watchdog should not bark
3694		3972
3695	warn "syncing database to disk";
3696	BDB::db_env_txn_checkpoint $DB_ENV;
3697
3698	# if anything goes wrong in here, we should simply crash as we already saved
3699
3700	warn "flushing outstanding aio requests";
3701	while (IO::AIO::nreqs || BDB::nreqs) {
3702	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3703	}
3704
3705	warn "cancelling all extension coros";	3973	trace "perl_reload: cancelling all extension coros";
3706	$_->cancel for values %EXT_CORO;	3974	$_->cancel for values %EXT_CORO;
3707	%EXT_CORO = ();	3975	%EXT_CORO = ();
3708		3976
3709	warn "removing commands";	3977	trace "perl_reload: removing commands";
3710	%COMMAND = ();	3978	%COMMAND = ();
3711		3979
3712	warn "removing ext/exti commands";	3980	trace "perl_reload: removing ext/exti commands";
3713	%EXTCMD = ();	3981	%EXTCMD = ();
3714	%EXTICMD = ();	3982	%EXTICMD = ();
3715		3983
3716	warn "unloading/nuking all extensions";	3984	trace "perl_reload: unloading/nuking all extensions";
3717	for my $pkg (@EXTS) {	3985	for my $pkg (@EXTS) {
3718	warn "... unloading $pkg";	3986	trace "... unloading $pkg";
3719		3987
3720	if (my $cb = $pkg->can ("unload")) {	3988	if (my $cb = $pkg->can ("unload")) {
3721	eval {	3989	eval {
3722	$cb->($pkg);	3990	$cb->($pkg);
3723	1	3991	1
3724	} or warn "$pkg unloaded, but with errors: $@";	3992	} or error "$pkg unloaded, but with errors: $@";
3725	}	3993	}
3726		3994
3727	warn "... clearing $pkg";	3995	trace "... clearing $pkg";
3728	clear_package $pkg;	3996	clear_package $pkg;
3729	}	3997	}
3730		3998
3731	warn "unloading all perl modules loaded from $LIBDIR";	3999	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3732	while (my ($k, $v) = each %INC) {	4000	while (my ($k, $v) = each %INC) {
3733	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4001	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3734		4002
3735	warn "... unloading $k";	4003	trace "... unloading $k";
3736	delete $INC{$k};	4004	delete $INC{$k};
3737		4005
3738	$k =~ s/\.pm$//;	4006	$k =~ s/\.pm$//;
3739	$k =~ s/\//::/g;	4007	$k =~ s/\//::/g;
3740		4008
…		…
3743	}	4011	}
3744		4012
3745	clear_package $k;	4013	clear_package $k;
3746	}	4014	}
3747		4015
3748	warn "getting rid of safe::, as good as possible";	4016	trace "perl_reload: getting rid of safe::, as good as possible";
3749	clear_package "safe::$_"	4017	clear_package "safe::$_"
3750	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4018	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3751		4019
3752	warn "unloading cf.pm \"a bit\"";	4020	trace "perl_reload: unloading cf.pm \"a bit\"";
3753	delete $INC{"cf.pm"};	4021	delete $INC{"cf.pm"};
3754	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4022	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3755		4023
3756	# don't, removes xs symbols, too,	4024	# don't, removes xs symbols, too,
3757	# and global variables created in xs	4025	# and global variables created in xs
3758	#clear_package __PACKAGE__;	4026	#clear_package __PACKAGE__;
3759		4027
3760	warn "unload completed, starting to reload now";	4028	info "perl_reload: unload completed, starting to reload now";
3761		4029
3762	warn "reloading cf.pm";	4030	trace "perl_reload: reloading cf.pm";
3763	require cf;	4031	require cf;
3764	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	4032	cf::_connect_to_perl_1;
3765		4033
3766	warn "loading config and database again";	4034	trace "perl_reload: loading config and database again";
3767	cf::reload_config;	4035	cf::reload_config;
3768		4036
3769	warn "loading extensions";	4037	trace "perl_reload: loading extensions";
3770	cf::load_extensions;	4038	cf::load_extensions;
3771		4039
3772	if ($REATTACH_ON_RELOAD) {	4040	if ($REATTACH_ON_RELOAD) {
3773	warn "reattaching attachments to objects/players";	4041	trace "perl_reload: reattaching attachments to objects/players";
3774	_global_reattach; # objects, sockets	4042	_global_reattach; # objects, sockets
3775	warn "reattaching attachments to maps";	4043	trace "perl_reload: reattaching attachments to maps";
3776	reattach $_ for values %MAP;	4044	reattach $_ for values %MAP;
3777	warn "reattaching attachments to players";	4045	trace "perl_reload: reattaching attachments to players";
3778	reattach $_ for values %PLAYER;	4046	reattach $_ for values %PLAYER;
3779	}	4047	}
3780		4048
3781	warn "running post_init jobs";	4049	cf::_post_init 1;
3782	(pop @POST_INIT)->(1) while @POST_INIT;
3783		4050
3784	warn "leaving sync_job";	4051	trace "perl_reload: leaving sync_job";
3785		4052
3786	1	4053	1
3787	} or do {	4054	} or do {
3788	warn $@;	4055	error $@;
3789	cf::cleanup "error while reloading, exiting.";	4056	cf::cleanup "perl_reload: error, exiting.";
3790	};	4057	};
3791		4058
3792	warn "reloaded";
3793	--$RELOAD;	4059	--$RELOAD;
3794	}	4060	}
3795		4061
3796	$t1 = EV::time - $t1;	4062	$t1 = AE::time - $t1;
3797	warn "reload completed in ${t1}s\n";	4063	info "perl_reload: completed in ${t1}s\n";
3798	};	4064	};
3799		4065
3800	our $RELOAD_WATCHER; # used only during reload	4066	our $RELOAD_WATCHER; # used only during reload
3801		4067
3802	sub reload_perl() {	4068	sub reload_perl() {
…		…
3804	# coro crashes during coro_state_free->destroy here.	4070	# coro crashes during coro_state_free->destroy here.
3805		4071
3806	$RELOAD_WATCHER ||= cf::async {	4072	$RELOAD_WATCHER ||= cf::async {
3807	Coro::AIO::aio_wait cache_extensions;	4073	Coro::AIO::aio_wait cache_extensions;
3808		4074
3809	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {	4075	$RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3810	do_reload_perl;	4076	do_reload_perl;
3811	undef $RELOAD_WATCHER;	4077	undef $RELOAD_WATCHER;
3812	};	4078	};
3813	};	4079	};
3814	}	4080	}
…		…
3823	reload_perl;	4089	reload_perl;
3824	};	4090	};
3825	}	4091	}
3826	};	4092	};
3827		4093
3828	unshift @INC, $LIBDIR;	4094	#############################################################################
3829		4095
3830	my $bug_warning = 0;	4096	my $bug_warning = 0;
3831		4097
3832	our @WAIT_FOR_TICK;	4098	our @WAIT_FOR_TICK;
3833	our @WAIT_FOR_TICK_BEGIN;	4099	our @WAIT_FOR_TICK_BEGIN;
3834		4100
3835	sub wait_for_tick {	4101	sub wait_for_tick() {
3836	return if tick_inhibit || $Coro::current == $Coro::main;	4102	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3837		4103
3838	my $signal = new Coro::Signal;	4104	my $signal = new Coro::Signal;
3839	push @WAIT_FOR_TICK, $signal;	4105	push @WAIT_FOR_TICK, $signal;
3840	$signal->wait;	4106	$signal->wait;
3841	}	4107	}
3842		4108
3843	sub wait_for_tick_begin {	4109	sub wait_for_tick_begin() {
3844	return if tick_inhibit || $Coro::current == $Coro::main;	4110	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3845		4111
3846	my $signal = new Coro::Signal;	4112	my $signal = new Coro::Signal;
3847	push @WAIT_FOR_TICK_BEGIN, $signal;	4113	push @WAIT_FOR_TICK_BEGIN, $signal;
3848	$signal->wait;	4114	$signal->wait;
3849	}	4115	}
…		…
3855	return;	4121	return;
3856	}	4122	}
3857		4123
3858	cf::server_tick; # one server iteration	4124	cf::server_tick; # one server iteration
3859		4125
		4126	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
		4127
3860	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4128	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3861	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4129	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3862	Coro::async_pool {	4130	Coro::async_pool {
3863	$Coro::current->{desc} = "runtime saver";	4131	$Coro::current->{desc} = "runtime saver";
3864	write_runtime_sync	4132	write_runtime_sync
3865	or warn "ERROR: unable to write runtime file: $!";	4133	or error "ERROR: unable to write runtime file: $!";
3866	};	4134	};
3867	}	4135	}
3868		4136
3869	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4137	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3870	$sig->send;	4138	$sig->send;
…		…
3878		4146
3879	if (0) {	4147	if (0) {
3880	if ($NEXT_TICK) {	4148	if ($NEXT_TICK) {
3881	my $jitter = $TICK_START - $NEXT_TICK;	4149	my $jitter = $TICK_START - $NEXT_TICK;
3882	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4150	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
3883	warn "jitter $JITTER\n";#d#	4151	debug "jitter $JITTER\n";#d#
3884	}	4152	}
3885	}	4153	}
3886	}	4154	}
3887		4155
3888	{	4156	{
3889	# configure BDB	4157	# configure BDB
3890		4158
3891	BDB::min_parallel 8;	4159	BDB::min_parallel 16;
3892	BDB::max_poll_reqs $TICK * 0.1;	4160	BDB::max_poll_reqs $TICK * 0.1;
3893	$AnyEvent::BDB::WATCHER->priority (1);	4161	$AnyEvent::BDB::WATCHER->priority (1);
3894		4162
3895	unless ($DB_ENV) {	4163	unless ($DB_ENV) {
3896	$DB_ENV = BDB::db_env_create;	4164	$DB_ENV = BDB::db_env_create;
…		…
3933	IO::AIO::min_parallel 8;	4201	IO::AIO::min_parallel 8;
3934	IO::AIO::max_poll_time $TICK * 0.1;	4202	IO::AIO::max_poll_time $TICK * 0.1;
3935	undef $AnyEvent::AIO::WATCHER;	4203	undef $AnyEvent::AIO::WATCHER;
3936	}	4204	}
3937		4205
3938	my $_log_backtrace;	4206	our $_log_backtrace;
		4207	our $_log_backtrace_last;
3939		4208
3940	sub _log_backtrace {	4209	sub _log_backtrace {
3941	my ($msg, @addr) = @_;	4210	my ($msg, @addr) = @_;
3942		4211
3943	$msg =~ s/\n//;	4212	$msg =~ s/\n$//;
3944		4213
		4214	if ($_log_backtrace_last eq $msg) {
		4215	LOG llevInfo, "[ABT] $msg\n";
		4216	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3945	# limit the # of concurrent backtraces	4217	# limit the # of concurrent backtraces
3946	if ($_log_backtrace < 2) {	4218	} elsif ($_log_backtrace < 2) {
		4219	$_log_backtrace_last = $msg;
3947	++$_log_backtrace;	4220	++$_log_backtrace;
3948	my $perl_bt = Carp::longmess $msg;	4221	my $perl_bt = Carp::longmess $msg;
3949	async {	4222	async {
3950	$Coro::current->{desc} = "abt $msg";	4223	$Coro::current->{desc} = "abt $msg";
3951		4224
…		…
3971	LOG llevInfo, "[ABT] $_\n" for @bt;	4244	LOG llevInfo, "[ABT] $_\n" for @bt;
3972	--$_log_backtrace;	4245	--$_log_backtrace;
3973	};	4246	};
3974	} else {	4247	} else {
3975	LOG llevInfo, "[ABT] $msg\n";	4248	LOG llevInfo, "[ABT] $msg\n";
3976	LOG llevInfo, "[ABT] [suppressed]\n";	4249	LOG llevInfo, "[ABT] [overload, suppressed]\n";
3977	}	4250	}
3978	}	4251	}
3979		4252
3980	# load additional modules	4253	# load additional modules
3981	require "cf/$_.pm" for @EXTRA_MODULES;	4254	require "cf/$_.pm" for @EXTRA_MODULES;
		4255	cf::_connect_to_perl_2;
3982		4256
3983	END { cf::emergency_save }	4257	END { cf::emergency_save }
3984		4258
3985	1	4259	1
3986		4260

Diff Legend

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