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

Diff Legend

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