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.477 by root, Wed Sep 2 22:52:36 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
…		…
88	our %EXT_CORO = (); # coroutines bound to extensions	89	our %EXT_CORO = (); # coroutines bound to extensions
89	our %EXT_MAP = (); # pluggable maps	90	our %EXT_MAP = (); # pluggable maps
90		91
91	our $RELOAD; # number of reloads so far, non-zero while in reload	92	our $RELOAD; # number of reloads so far, non-zero while in reload
92	our @EVENT;	93	our @EVENT;
		94	our @REFLECT; # set by XS
		95	our %REFLECT; # set by us
93		96
94	our $CONFDIR = confdir;	97	our $CONFDIR = confdir;
		98
95	our $DATADIR = datadir;	99	our $DATADIR = datadir;
96	our $LIBDIR = "$DATADIR/ext";	100	our $LIBDIR = "$DATADIR/ext";
97	our $PODDIR = "$DATADIR/pod";	101	our $PODDIR = "$DATADIR/pod";
98	our $MAPDIR = "$DATADIR/" . mapdir;	102	our $MAPDIR = "$DATADIR/" . mapdir;
		103
99	our $LOCALDIR = localdir;	104	our $LOCALDIR = localdir;
100	our $TMPDIR = "$LOCALDIR/" . tmpdir;	105	our $TMPDIR = "$LOCALDIR/" . tmpdir;
101	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	106	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
102	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	107	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
103	our $RANDOMDIR = "$LOCALDIR/random";	108	our $RANDOMDIR = "$LOCALDIR/random";
104	our $BDBDIR = "$LOCALDIR/db";	109	our $BDBDIR = "$LOCALDIR/db";
105	our $PIDFILE = "$LOCALDIR/pid";	110	our $PIDFILE = "$LOCALDIR/pid";
106	our $RUNTIMEFILE = "$LOCALDIR/runtime";	111	our $RUNTIMEFILE = "$LOCALDIR/runtime";
107		112
108	our %RESOURCE;	113	our %RESOURCE; # unused
		114
		115	our $OUTPUT_RATE_MIN = 3000;
		116	our $OUTPUT_RATE_MAX = 1000000;
		117
		118	our $MAX_LINKS = 32; # how many chained exits to follow
		119	our $VERBOSE_IO = 1;
109		120
110	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	121	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
111	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	122	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
112	our $NEXT_TICK;	123	our $NEXT_TICK;
113	our $USE_FSYNC = 1; # use fsync to write maps - default on	124	our $USE_FSYNC = 1; # use fsync to write maps - default on
…		…
115	our $BDB_DEADLOCK_WATCHER;	126	our $BDB_DEADLOCK_WATCHER;
116	our $BDB_CHECKPOINT_WATCHER;	127	our $BDB_CHECKPOINT_WATCHER;
117	our $BDB_TRICKLE_WATCHER;	128	our $BDB_TRICKLE_WATCHER;
118	our $DB_ENV;	129	our $DB_ENV;
119		130
120	our @EXTRA_MODULES = qw(pod mapscript);	131	our @EXTRA_MODULES = qw(pod match mapscript incloader);
121		132
122	our %CFG;	133	our %CFG;
123		134
124	our $UPTIME; $UPTIME ||= time;	135	our $UPTIME; $UPTIME ||= time;
125	our $RUNTIME;	136	our $RUNTIME;
…		…
159		170
160	our $EMERGENCY_POSITION;	171	our $EMERGENCY_POSITION;
161		172
162	sub cf::map::normalise;	173	sub cf::map::normalise;
163		174
		175	sub in_main() {
		176	$Coro::current == $Coro::main
		177	}
		178
		179	#############################################################################
		180
		181	%REFLECT = ();
		182	for (@REFLECT) {
		183	my $reflect = JSON::XS::decode_json $_;
		184	$REFLECT{$reflect->{class}} = $reflect;
		185	}
		186
		187	# this is decidedly evil
		188	$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
		189
164	#############################################################################	190	#############################################################################
165		191
166	=head2 GLOBAL VARIABLES	192	=head2 GLOBAL VARIABLES
167		193
168	=over 4	194	=over 4
…		…
209	from wherever your confdir points to.	235	from wherever your confdir points to.
210		236
211	=item cf::wait_for_tick, cf::wait_for_tick_begin	237	=item cf::wait_for_tick, cf::wait_for_tick_begin
212		238
213	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	239	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
214	returns directly I<after> the tick processing (and consequently, can only wake one process	240	returns directly I<after> the tick processing (and consequently, can only wake one thread
215	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	241	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
216		242
		243	=cut
		244
		245	sub wait_for_tick();
		246	sub wait_for_tick_begin();
		247
217	=item @cf::INVOKE_RESULTS	248	=item @cf::INVOKE_RESULTS
218		249
219	This array contains the results of the last C<invoke ()> call. When	250	This array contains the results of the last C<invoke ()> call. When
220	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of	251	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
221	that call.	252	that call.
222		253
		254	=item %cf::REFLECT
		255
		256	Contains, for each (C++) class name, a hash reference with information
		257	about object members (methods, scalars, arrays and flags) and other
		258	metadata, which is useful for introspection.
		259
223	=back	260	=back
224		261
225	=cut	262	=cut
		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 "", @_ }
226		269
227	$Coro::State::WARNHOOK = sub {	270	$Coro::State::WARNHOOK = sub {
228	my $msg = join "", @_;	271	my $msg = join "", @_;
229		272
230	$msg .= "\n"	273	$msg .= "\n"
231	unless $msg =~ /\n$/;	274	unless $msg =~ /\n$/;
232		275
233	$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;
234		277
235	LOG llevError, $msg;	278	LOG llevWarn, $msg;
236	};	279	};
237		280
238	$Coro::State::DIEHOOK = sub {	281	$Coro::State::DIEHOOK = sub {
239	return unless $^S eq 0; # "eq", not "=="	282	return unless $^S eq 0; # "eq", not "=="
240		283
241	warn Carp::longmess $_[0];	284	error Carp::longmess $_[0];
242		285
243	if ($Coro::current == $Coro::main) {#d#	286	if (in_main) {#d#
244	warn "DIEHOOK called in main context, Coro bug?\n";#d#	287	error "DIEHOOK called in main context, Coro bug?\n";#d#
245	return;#d#	288	return;#d#
246	}#d#	289	}#d#
247		290
248	# kill coroutine otherwise	291	# kill coroutine otherwise
249	Coro::terminate	292	Coro::terminate
…		…
269	)) {	312	)) {
270	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	313	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
271	}	314	}
272		315
273	$EV::DIED = sub {	316	$EV::DIED = sub {
274	warn "error in event callback: @_";	317	Carp::cluck "error in event callback: @_";
275	};	318	};
		319
		320	#############################################################################
		321
		322	sub fork_call(&@);
		323	sub get_slot($;$$);
276		324
277	#############################################################################	325	#############################################################################
278		326
279	=head2 UTILITY FUNCTIONS	327	=head2 UTILITY FUNCTIONS
280		328
…		…
301	$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;
302	$d	350	$d
303	} || "[unable to dump $_[0]: '$@']";	351	} || "[unable to dump $_[0]: '$@']";
304	}	352	}
305		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
306	=item $ref = cf::decode_json $json	368	=item $ref = cf::decode_json $json
307		369
308	Converts a JSON string into the corresponding perl data structure.	370	Converts a JSON string into the corresponding perl data structure.
309		371
310	=item $json = cf::encode_json $ref	372	=item $json = cf::encode_json $ref
…		…
316	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
317		379
318	sub encode_json($) { $json_coder->encode ($_[0]) }	380	sub encode_json($) { $json_coder->encode ($_[0]) }
319	sub decode_json($) { $json_coder->decode ($_[0]) }	381	sub decode_json($) { $json_coder->decode ($_[0]) }
320		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
321	=item cf::post_init { BLOCK }	414	=item cf::post_init { BLOCK }
322		415
323	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,
324	but I<before> the server starts ticking again.	417	but I<before> the server starts ticking again.
325		418
326	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
327	is a reload or not.	420	is a reload or not.
328		421
329	=cut	422	=cut
330		423
331	sub post_init(&) {	424	sub post_init(&) {
332	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	}
333	}	443	}
334		444
335	=item cf::lock_wait $string	445	=item cf::lock_wait $string
336		446
337	Wait until the given lock is available. See cf::lock_acquire.	447	Wait until the given lock is available. See cf::lock_acquire.
…		…
376	}	486	}
377		487
378	=item cf::periodic $interval, $cb	488	=item cf::periodic $interval, $cb
379		489
380	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
381	get spread over timer.	491	get spread over time.
382		492
383	=cut	493	=cut
384		494
385	sub periodic($$) {	495	sub periodic($$) {
386	my ($interval, $cb) = @_;	496	my ($interval, $cb) = @_;
…		…
390	EV::periodic $start, $interval, 0, $cb	500	EV::periodic $start, $interval, 0, $cb
391	}	501	}
392		502
393	=item cf::get_slot $time[, $priority[, $name]]	503	=item cf::get_slot $time[, $priority[, $name]]
394		504
395	Allocate $time seconds of blocking CPU time at priority C<$priority>:	505	Allocate $time seconds of blocking CPU time at priority C<$priority>
396	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
397	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.
398		512
399	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
400	used for statistical purposes and should identify the same time-class.	514	used for statistical purposes and should identify the same time-class.
401		515
402	Useful for short background jobs.	516	Useful for short background jobs.
403		517
404	=cut	518	=cut
405		519
406	our @SLOT_QUEUE;	520	our @SLOT_QUEUE;
407	our $SLOT_QUEUE;	521	our $SLOT_QUEUE;
		522	our $SLOT_DECAY = 0.9;
408		523
409	$SLOT_QUEUE->cancel if $SLOT_QUEUE;	524	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
410	$SLOT_QUEUE = Coro::async {	525	$SLOT_QUEUE = Coro::async {
411	$Coro::current->desc ("timeslot manager");	526	$Coro::current->desc ("timeslot manager");
412		527
413	my $signal = new Coro::Signal;	528	my $signal = new Coro::Signal;
		529	my $busy;
414		530
415	while () {	531	while () {
416	next_job:	532	next_job:
		533
417	my $avail = cf::till_tick;	534	my $avail = cf::till_tick;
418	if ($avail > 0.01) {	535
419	for (0 .. $#SLOT_QUEUE) {	536	for (0 .. $#SLOT_QUEUE) {
420	if ($SLOT_QUEUE[$_][0] < $avail) {	537	if ($SLOT_QUEUE[$_][0] <= $avail) {
		538	$busy = 0;
421	my $job = splice @SLOT_QUEUE, $_, 1, ();	539	my $job = splice @SLOT_QUEUE, $_, 1, ();
422	$job->[2]->send;	540	$job->[2]->send;
423	Coro::cede;	541	Coro::cede;
424	goto next_job;	542	goto next_job;
425	}	543	} else {
		544	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
426	}	545	}
427	}	546	}
428		547
429	if (@SLOT_QUEUE) {	548	if (@SLOT_QUEUE) {
430	# 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
431	push @cf::WAIT_FOR_TICK, $signal;	550	push @cf::WAIT_FOR_TICK, $signal;
432	$signal->wait;	551	$signal->wait;
433	} else {	552	} else {
		553	$busy = 0;
434	Coro::schedule;	554	Coro::schedule;
435	}	555	}
436	}	556	}
437	};	557	};
438		558
439	sub get_slot($;$$) {	559	sub get_slot($;$$) {
440	return if tick_inhibit || $Coro::current == $Coro::main;	560	return if tick_inhibit || $Coro::current == $Coro::main;
441		561
442	my ($time, $pri, $name) = @_;	562	my ($time, $pri, $name) = @_;
443		563
444	$time = $TICK * .6 if $time > $TICK * .6;	564	$time = clamp $time, 0.01, $TICK * .6;
		565
445	my $sig = new Coro::Signal;	566	my $sig = new Coro::Signal;
446		567
447	push @SLOT_QUEUE, [$time, $pri, $sig, $name];	568	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
448	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;	569	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
449	$SLOT_QUEUE->ready;	570	$SLOT_QUEUE->ready;
…		…
475	=cut	596	=cut
476		597
477	sub sync_job(&) {	598	sub sync_job(&) {
478	my ($job) = @_;	599	my ($job) = @_;
479		600
480	if ($Coro::current == $Coro::main) {	601	if (in_main) {
481	my $time = EV::time;	602	my $time = AE::time;
482		603
483	# this is the main coro, too bad, we have to block	604	# this is the main coro, too bad, we have to block
484	# till the operation succeeds, freezing the server :/	605	# till the operation succeeds, freezing the server :/
485		606
486	LOG llevError, Carp::longmess "sync job";#d#	607	#LOG llevError, Carp::longmess "sync job";#d#
487		608
488	my $freeze_guard = freeze_mainloop;	609	my $freeze_guard = freeze_mainloop;
489		610
490	my $busy = 1;	611	my $busy = 1;
491	my @res;	612	my @res;
492		613
493	(async {	614	(async {
494	$Coro::current->desc ("sync job coro");	615	$Coro::current->desc ("sync job coro");
495	@res = eval { $job->() };	616	@res = eval { $job->() };
496	warn $@ if $@;	617	error $@ if $@;
497	undef $busy;	618	undef $busy;
498	})->prio (Coro::PRIO_MAX);	619	})->prio (Coro::PRIO_MAX);
499		620
500	while ($busy) {	621	while ($busy) {
501	if (Coro::nready) {	622	if (Coro::nready) {
…		…
503	} else {	624	} else {
504	EV::loop EV::LOOP_ONESHOT;	625	EV::loop EV::LOOP_ONESHOT;
505	}	626	}
506	}	627	}
507		628
508	my $time = EV::time - $time;	629	my $time = AE::time - $time;
509		630
510	$TICK_START += $time; # do not account sync jobs to server load	631	$TICK_START += $time; # do not account sync jobs to server load
511		632
512	wantarray ? @res : $res[0]	633	wantarray ? @res : $res[0]
513	} else {	634	} else {
…		…
535	$EXT_CORO{$coro+0} = $coro;	656	$EXT_CORO{$coro+0} = $coro;
536		657
537	$coro	658	$coro
538	}	659	}
539		660
540	=item fork_call { }, $args	661	=item fork_call { }, @args
541		662
542	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
543	process, returning the results. Everything must be serialisable with	664	process, returning the results. Everything must be serialisable with
544	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
545	never block itself or use any form of event handling.	666	never block itself or use any form of event handling.
546		667
547	=cut	668	=cut
548		669
		670	sub post_fork {
		671	reset_signals;
		672	}
		673
549	sub fork_call(&@) {	674	sub fork_call(&@) {
550	my ($cb, @args) = @_;	675	my ($cb, @args) = @_;
551		676
552	# 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,
553	# otherwise perl prematurely frees the stuff :/	678	# otherwise perl prematurely frees the stuff :/
554	# TODO: investigate and fix (likely this will be rather laborious)	679	# TODO: investigate and fix (likely this will be rather laborious)
555		680
556	my @res = Coro::Util::fork_eval {	681	my @res = Coro::Util::fork_eval {
557	reset_signals;	682	cf::post_fork;
558	&$cb	683	&$cb
559	}, @args;	684	} @args;
560		685
561	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	)
562	}	698	}
563		699
564	=item $coin = coin_from_name $name	700	=item $coin = coin_from_name $name
565		701
566	=cut	702	=cut
…		…
603	within each server.	739	within each server.
604		740
605	=cut	741	=cut
606		742
607	sub db_table($) {	743	sub db_table($) {
		744	cf::error "db_get called from main context"
		745	if $Coro::current == $Coro::main;
		746
608	my ($name) = @_;	747	my ($name) = @_;
609	my $db = BDB::db_create $DB_ENV;	748	my $db = BDB::db_create $DB_ENV;
610		749
611	eval {	750	eval {
612	$db->set_flags (BDB::CHKSUM);	751	$db->set_flags (BDB::CHKSUM);
…		…
622	}	761	}
623		762
624	our $DB;	763	our $DB;
625		764
626	sub db_init {	765	sub db_init {
627	cf::sync_job {
628	$DB ||= db_table "db";	766	$DB ||= db_table "db";
629	};
630	}	767	}
631		768
632	sub db_get($$) {	769	sub db_get($$) {
633	my $key = "$_[0]/$_[1]";	770	my $key = "$_[0]/$_[1]";
634		771
635	cf::sync_job {	772	cf::error "db_get called from main context"
		773	if $Coro::current == $Coro::main;
		774
636	BDB::db_get $DB, undef, $key, my $data;	775	BDB::db_get $DB, undef, $key, my $data;
637		776
638	$! ? ()	777	$! ? ()
639	: $data	778	: $data
640	}
641	}	779	}
642		780
643	sub db_put($$$) {	781	sub db_put($$$) {
644	BDB::dbreq_pri 4;	782	BDB::dbreq_pri 4;
645	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	783	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
673		811
674	my @data;	812	my @data;
675	my $md5;	813	my $md5;
676		814
677	for (0 .. $#$src) {	815	for (0 .. $#$src) {
678	0 <= aio_load $src->[$_], $data[$_]	816	$data[$_] = load_file $src->[$_];
679	or Carp::croak "$src->[$_]: $!";
680	}	817	}
681		818
682	# if processing is expensive, check	819	# if processing is expensive, check
683	# checksum first	820	# checksum first
684	if (1) {	821	if (1) {
…		…
701		838
702	my $t1 = Time::HiRes::time;	839	my $t1 = Time::HiRes::time;
703	my $data = $process->(\@data);	840	my $data = $process->(\@data);
704	my $t2 = Time::HiRes::time;	841	my $t2 = Time::HiRes::time;
705		842
706	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	843	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
707		844
708	db_put cache => "$id/data", $data;	845	db_put cache => "$id/data", $data;
709	db_put cache => "$id/md5" , $md5;	846	db_put cache => "$id/md5" , $md5;
710	db_put cache => "$id/meta", $meta;	847	db_put cache => "$id/meta", $meta;
711		848
…		…
721		858
722	=cut	859	=cut
723		860
724	sub datalog($@) {	861	sub datalog($@) {
725	my ($type, %kv) = @_;	862	my ($type, %kv) = @_;
726	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	863	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
727	}	864	}
728		865
729	=back	866	=back
730		867
731	=cut	868	=cut
…		…
926		1063
927	} elsif (exists $cb_id{$type}) {	1064	} elsif (exists $cb_id{$type}) {
928	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	1065	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
929		1066
930	} elsif (ref $type) {	1067	} elsif (ref $type) {
931	warn "attaching objects not supported, ignoring.\n";	1068	error "attaching objects not supported, ignoring.\n";
932		1069
933	} else {	1070	} else {
934	shift @arg;	1071	shift @arg;
935	warn "attach argument '$type' not supported, ignoring.\n";	1072	error "attach argument '$type' not supported, ignoring.\n";
936	}	1073	}
937	}	1074	}
938	}	1075	}
939		1076
940	sub _object_attach {	1077	sub _object_attach {
…		…
950	_attach $registry, $klass, @attach;	1087	_attach $registry, $klass, @attach;
951	}	1088	}
952		1089
953	$obj->{$name} = \%arg;	1090	$obj->{$name} = \%arg;
954	} else {	1091	} else {
955	warn "object uses attachment '$name' which is not available, postponing.\n";	1092	info "object uses attachment '$name' which is not available, postponing.\n";
956	}	1093	}
957		1094
958	$obj->{_attachment}{$name} = undef;	1095	$obj->{_attachment}{$name} = undef;
959	}	1096	}
960		1097
…		…
1019		1156
1020	for (@$callbacks) {	1157	for (@$callbacks) {
1021	eval { &{$_->[1]} };	1158	eval { &{$_->[1]} };
1022		1159
1023	if ($@) {	1160	if ($@) {
1024	warn "$@";
1025	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1161	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1026	override;	1162	override;
1027	}	1163	}
1028		1164
1029	return 1 if $override;	1165	return 1 if $override;
1030	}	1166	}
…		…
1109	for (@$attach) {	1245	for (@$attach) {
1110	my ($klass, @attach) = @$_;	1246	my ($klass, @attach) = @$_;
1111	_attach $registry, $klass, @attach;	1247	_attach $registry, $klass, @attach;
1112	}	1248	}
1113	} else {	1249	} else {
1114	warn "object uses attachment '$name' that is not available, postponing.\n";	1250	info "object uses attachment '$name' that is not available, postponing.\n";
1115	}	1251	}
1116	}	1252	}
1117	}	1253	}
1118		1254
1119	cf::attachable->attach (	1255	cf::attachable->attach (
…		…
1146	my ($filename, $rdata, $objs) = @_;	1282	my ($filename, $rdata, $objs) = @_;
1147		1283
1148	sync_job {	1284	sync_job {
1149	if (length $$rdata) {	1285	if (length $$rdata) {
1150	utf8::decode (my $decname = $filename);	1286	utf8::decode (my $decname = $filename);
1151	warn sprintf "saving %s (%d,%d)\n",	1287	trace sprintf "saving %s (%d,%d)\n",
1152	$decname, length $$rdata, scalar @$objs;	1288	$decname, length $$rdata, scalar @$objs
		1289	if $VERBOSE_IO;
1153		1290
1154	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1291	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1155	aio_chmod $fh, SAVE_MODE;	1292	aio_chmod $fh, SAVE_MODE;
1156	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1293	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1157	if ($cf::USE_FSYNC) {	1294	if ($cf::USE_FSYNC) {
…		…
1179	aio_rename "$filename~", $filename;	1316	aio_rename "$filename~", $filename;
1180		1317
1181	$filename =~ s%/[^/]+$%%;	1318	$filename =~ s%/[^/]+$%%;
1182	aio_pathsync $filename if $cf::USE_FSYNC;	1319	aio_pathsync $filename if $cf::USE_FSYNC;
1183	} else {	1320	} else {
1184	warn "unable to save objects: $filename~: $!\n";	1321	error "unable to save objects: $filename~: $!\n";
1185	}	1322	}
1186	} else {	1323	} else {
1187	aio_unlink $filename;	1324	aio_unlink $filename;
1188	aio_unlink "$filename.pst";	1325	aio_unlink "$filename.pst";
1189	}	1326	}
…		…
1213	my $st = eval { Coro::Storable::thaw $av };	1350	my $st = eval { Coro::Storable::thaw $av };
1214	$av = $st->{objs};	1351	$av = $st->{objs};
1215	}	1352	}
1216		1353
1217	utf8::decode (my $decname = $filename);	1354	utf8::decode (my $decname = $filename);
1218	warn sprintf "loading %s (%d,%d)\n",	1355	trace sprintf "loading %s (%d,%d)\n",
1219	$decname, length $data, scalar @{$av || []};	1356	$decname, length $data, scalar @{$av || []}
		1357	if $VERBOSE_IO;
1220		1358
1221	($data, $av)	1359	($data, $av)
1222	}	1360	}
1223		1361
1224	=head2 COMMAND CALLBACKS	1362	=head2 COMMAND CALLBACKS
…		…
1283	}	1421	}
1284		1422
1285	use File::Glob ();	1423	use File::Glob ();
1286		1424
1287	cf::player->attach (	1425	cf::player->attach (
1288	on_command => sub {	1426	on_unknown_command => sub {
1289	my ($pl, $name, $params) = @_;	1427	my ($pl, $name, $params) = @_;
1290		1428
1291	my $cb = $COMMAND{$name}	1429	my $cb = $COMMAND{$name}
1292	or return;	1430	or return;
1293		1431
…		…
1316		1454
1317	$pl->ext_reply ($reply, @reply)	1455	$pl->ext_reply ($reply, @reply)
1318	if $reply;	1456	if $reply;
1319		1457
1320	} else {	1458	} else {
1321	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1459	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1322	}	1460	}
1323		1461
1324	cf::override;	1462	cf::override;
1325	},	1463	},
1326	);	1464	);
…		…
1337		1475
1338	$grp	1476	$grp
1339	}	1477	}
1340		1478
1341	sub load_extensions {	1479	sub load_extensions {
		1480	info "loading extensions...";
		1481
1342	cf::sync_job {	1482	cf::sync_job {
1343	my %todo;	1483	my %todo;
1344		1484
1345	for my $path (<$LIBDIR/*.ext>) {	1485	for my $path (<$LIBDIR/*.ext>) {
1346	next unless -r $path;	1486	next unless -r $path;
…		…
1364		1504
1365	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1505	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1366	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1506	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1367		1507
1368	$ext{source} =	1508	$ext{source} =
1369	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1509	"package $pkg; use common::sense;\n"
1370	. "#line 1 \"$path\"\n{\n"	1510	. "#line 1 \"$path\"\n{\n"
1371	. $source	1511	. $source
1372	. "\n};\n1";	1512	. "\n};\n1";
1373		1513
1374	$todo{$base} = \%ext;	1514	$todo{$base} = \%ext;
1375	}	1515	}
1376		1516
		1517	my $pass = 0;
1377	my %done;	1518	my %done;
1378	while (%todo) {	1519	while (%todo) {
1379	my $progress;	1520	my $progress;
1380		1521
		1522	++$pass;
		1523
		1524	ext:
1381	while (my ($k, $v) = each %todo) {	1525	while (my ($k, $v) = each %todo) {
1382	for (split /,\s*/, $v->{meta}{depends}) {	1526	for (split /,\s*/, $v->{meta}{depends}) {
1383	goto skip	1527	next ext
1384	unless exists $done{$_};	1528	unless exists $done{$_};
1385	}	1529	}
1386		1530
1387	warn "... loading '$k' into '$v->{pkg}'\n";	1531	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1388		1532
1389	unless (eval $v->{source}) {	1533	my $active = eval $v->{source};
		1534
		1535	if (length $@) {
1390	my $msg = $@ ? "$v->{path}: $@\n"	1536	error "$v->{path}: $@\n";
1391	: "$v->{base}: extension inactive.\n";
1392		1537
1393	if (exists $v->{meta}{mandatory}) {
1394	warn $msg;
1395	cf::cleanup "mandatory extension failed to load, exiting.";	1538	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1396	}	1539	if exists $v->{meta}{mandatory};
1397		1540
1398	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;
1399	}	1550	}
1400
1401	$done{$k} = delete $todo{$k};
1402	push @EXTS, $v->{pkg};
1403	$progress = 1;
1404	}	1551	}
1405		1552
1406	skip:	1553	unless ($progress) {
1407	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"	1554	warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1408	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	}
1409	}	1563	}
1410	};	1564	};
1411	}	1565	}
1412		1566
1413	#############################################################################	1567	#############################################################################
…		…
1497	$cf::PLAYER{$login} = $pl	1651	$cf::PLAYER{$login} = $pl
1498	}	1652	}
1499	}	1653	}
1500	}	1654	}
1501		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
1502	sub save($) {	1669	sub save($) {
1503	my ($pl) = @_;	1670	my ($pl) = @_;
1504		1671
1505	return if $pl->{deny_save};	1672	return if $pl->{deny_save};
1506		1673
…		…
1511		1678
1512	aio_mkdir playerdir $pl, 0770;	1679	aio_mkdir playerdir $pl, 0770;
1513	$pl->{last_save} = $cf::RUNTIME;	1680	$pl->{last_save} = $cf::RUNTIME;
1514		1681
1515	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];
1516		1686
1517	$pl->save_pl ($path);	1687	$pl->save_pl ($path);
1518	cf::cede_to_tick;	1688	cf::cede_to_tick;
1519	}	1689	}
1520		1690
…		…
1554	my $name = $pl->ob->name;	1724	my $name = $pl->ob->name;
1555		1725
1556	$pl->{deny_save} = 1;	1726	$pl->{deny_save} = 1;
1557	$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
1558		1728
1559	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1729	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1560	$pl->deactivate;	1730	$pl->deactivate;
		1731
1561	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;
1562	$pl->ob->check_score;
1563	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1733	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1734	ext::highscore::check ($pl->ob);
		1735
1564	$pl->ns->destroy if $pl->ns;	1736	$pl->ns->destroy if $pl->ns;
1565		1737
1566	my $path = playerdir $pl;	1738	my $path = playerdir $pl;
1567	my $temp = "$path~$cf::RUNTIME~deleting~";	1739	my $temp = "$path~$cf::RUNTIME~deleting~";
1568	aio_rename $path, $temp;	1740	aio_rename $path, $temp;
…		…
1622	\@logins	1794	\@logins
1623	}	1795	}
1624		1796
1625	=item $player->maps	1797	=item $player->maps
1626		1798
		1799	=item cf::player::maps $login
		1800
1627	Returns an arrayref of map paths that are private for this	1801	Returns an arrayref of map paths that are private for this
1628	player. May block.	1802	player. May block.
1629		1803
1630	=cut	1804	=cut
1631		1805
…		…
1693	=cut	1867	=cut
1694		1868
1695	sub find_by_path($) {	1869	sub find_by_path($) {
1696	my ($path) = @_;	1870	my ($path) = @_;
1697		1871
		1872	$path =~ s/^~[^\/]*//; # skip ~login
		1873
1698	my ($match, $specificity);	1874	my ($match, $specificity);
1699		1875
1700	for my $region (list) {	1876	for my $region (list) {
1701	if ($region->{match} && $path =~ $region->{match}) {	1877	if ($region->{match} && $path =~ $region->{match}) {
1702	($match, $specificity) = ($region, $region->specificity)	1878	($match, $specificity) = ($region, $region->specificity)
…		…
1730	sub generate_random_map {	1906	sub generate_random_map {
1731	my ($self, $rmp) = @_;	1907	my ($self, $rmp) = @_;
1732		1908
1733	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
1734		1910
1735	# mit "rum" bekleckern, nicht
1736	$self->_create_random_map (	1911	$self->_create_random_map ($rmp);
1737	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1738	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1739	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1740	$rmp->{exit_on_final_map},
1741	$rmp->{xsize}, $rmp->{ysize},
1742	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1743	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1744	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1745	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1746	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1747	(cf::region::find $rmp->{region}), $rmp->{custom}
1748	)
1749	}	1912	}
1750		1913
1751	=item cf::map->register ($regex, $prio)	1914	=item cf::map->register ($regex, $prio)
1752		1915
1753	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
…		…
1758		1921
1759	sub register {	1922	sub register {
1760	my (undef, $regex, $prio) = @_;	1923	my (undef, $regex, $prio) = @_;
1761	my $pkg = caller;	1924	my $pkg = caller;
1762		1925
1763	no strict;
1764	push @{"$pkg\::ISA"}, __PACKAGE__;	1926	push @{"$pkg\::ISA"}, __PACKAGE__;
1765		1927
1766	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	1928	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1767	}	1929	}
1768		1930
1769	# also paths starting with '/'	1931	# also paths starting with '/'
1770	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	1932	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1771		1933
1772	sub thawer_merge {	1934	sub thawer_merge {
1773	my ($self, $merge) = @_;	1935	my ($self, $merge) = @_;
1774		1936
1775	# we have to keep some variables in memory intact	1937	# we have to keep some variables in memory intact
…		…
1780	}	1942	}
1781		1943
1782	sub normalise {	1944	sub normalise {
1783	my ($path, $base) = @_;	1945	my ($path, $base) = @_;
1784		1946
1785	$path = "$path"; # make sure its a string	1947	$path = "$path"; # make sure it's a string
1786		1948
1787	$path =~ s/\.map$//;	1949	$path =~ s/\.map$//;
1788		1950
1789	# map plan:	1951	# map plan:
1790	#	1952	#
…		…
1792	# {... are special paths that are not being touched	1954	# {... are special paths that are not being touched
1793	# ?xxx/... are special absolute paths	1955	# ?xxx/... are special absolute paths
1794	# ?random/... random maps	1956	# ?random/... random maps
1795	# /... normal maps	1957	# /... normal maps
1796	# ~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
1797		1960
1798	$path =~ s/$PATH_SEP/\//go;	1961	$path =~ s/$PATH_SEP/\//go;
1799		1962
1800	# treat it as relative path if it starts with	1963	# treat it as relative path if it starts with
1801	# something that looks reasonable	1964	# something that looks reasonable
1802	if ($path =~ m{^(?:\./|\.\./|\w)}) {	1965	if ($path =~ m{^(?:\./|\.\./|\w)}) {
1803	$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'";
1804		1967
1805	$base =~ s{[^/]+/?$}{};	1968	$base =~ s{[^/]+/?$}{};
1806	$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;
1807	}	1984	}
1808		1985
1809	for ($path) {	1986	for ($path) {
1810	redo if s{//}{/};
1811	redo if s{/\.?/}{/};	1987	redo if s{/\.?/}{/};
1812	redo if s{/[^/]+/\.\./}{/};	1988	redo if s{/[^/]+/\.\./}{/};
1813	}	1989	}
1814		1990
1815	$path	1991	$path
…		…
1829	$self->init; # pass $1 etc.	2005	$self->init; # pass $1 etc.
1830	return $self;	2006	return $self;
1831	}	2007	}
1832	}	2008	}
1833		2009
1834	Carp::cluck "unable to resolve path '$path' (base '$base').";	2010	Carp::cluck "unable to resolve path '$path' (base '$base')";
1835	()	2011	()
1836	}	2012	}
1837		2013
		2014	# may re-bless or do other evil things
1838	sub init {	2015	sub init {
1839	my ($self) = @_;	2016	my ($self) = @_;
1840		2017
1841	$self	2018	$self
1842	}	2019	}
…		…
1907	$self->{load_path} = $path;	2084	$self->{load_path} = $path;
1908		2085
1909	1	2086	1
1910	}	2087	}
1911		2088
		2089	# used to laod the header of an original map
1912	sub load_header_orig {	2090	sub load_header_orig {
1913	my ($self) = @_;	2091	my ($self) = @_;
1914		2092
1915	$self->load_header_from ($self->load_path)	2093	$self->load_header_from ($self->load_path)
1916	}	2094	}
1917		2095
		2096	# used to laod the header of an instantiated map
1918	sub load_header_temp {	2097	sub load_header_temp {
1919	my ($self) = @_;	2098	my ($self) = @_;
1920		2099
1921	$self->load_header_from ($self->save_path)	2100	$self->load_header_from ($self->save_path)
1922	}	2101	}
1923		2102
		2103	# called after loading the header from an instantiated map
1924	sub prepare_temp {	2104	sub prepare_temp {
1925	my ($self) = @_;	2105	my ($self) = @_;
1926		2106
1927	$self->last_access ((delete $self->{last_access})	2107	$self->last_access ((delete $self->{last_access})
1928	|| $cf::RUNTIME); #d#	2108	|| $cf::RUNTIME); #d#
1929	# safety	2109	# safety
1930	$self->{instantiate_time} = $cf::RUNTIME	2110	$self->{instantiate_time} = $cf::RUNTIME
1931	if $self->{instantiate_time} > $cf::RUNTIME;	2111	if $self->{instantiate_time} > $cf::RUNTIME;
1932	}	2112	}
1933		2113
		2114	# called after loading the header from an original map
1934	sub prepare_orig {	2115	sub prepare_orig {
1935	my ($self) = @_;	2116	my ($self) = @_;
1936		2117
1937	$self->{load_original} = 1;	2118	$self->{load_original} = 1;
1938	$self->{instantiate_time} = $cf::RUNTIME;	2119	$self->{instantiate_time} = $cf::RUNTIME;
…		…
1962		2143
1963	sub find;	2144	sub find;
1964	sub find {	2145	sub find {
1965	my ($path, $origin) = @_;	2146	my ($path, $origin) = @_;
1966		2147
		2148	cf::cede_to_tick;
		2149
1967	$path = normalise $path, $origin && $origin->path;	2150	$path = normalise $path, $origin;
1968		2151
1969	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2152	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1970	my $guard2 = cf::lock_acquire "map_find:$path";	2153	my $guard2 = cf::lock_acquire "map_find:$path";
1971		2154
1972	$cf::MAP{$path} || do {	2155	$cf::MAP{$path} || do {
…		…
1989		2172
1990	$cf::MAP{$path} = $map	2173	$cf::MAP{$path} = $map
1991	}	2174	}
1992	}	2175	}
1993		2176
1994	sub pre_load { }	2177	sub pre_load { }
1995	sub post_load { }	2178	#sub post_load { } # XS
1996		2179
1997	sub load {	2180	sub load {
1998	my ($self) = @_;	2181	my ($self) = @_;
1999		2182
2000	local $self->{deny_reset} = 1; # loading can take a long time	2183	local $self->{deny_reset} = 1; # loading can take a long time
…		…
2012	$self->alloc;	2195	$self->alloc;
2013		2196
2014	$self->pre_load;	2197	$self->pre_load;
2015	cf::cede_to_tick;	2198	cf::cede_to_tick;
2016		2199
		2200	if (exists $self->{load_path}) {
2017	my $f = new_from_file cf::object::thawer $self->{load_path};	2201	my $f = new_from_file cf::object::thawer $self->{load_path};
2018	$f->skip_block;	2202	$f->skip_block;
2019	$self->_load_objects ($f)	2203	$self->_load_objects ($f)
2020	or return;	2204	or return;
2021		2205
2022	$self->post_load_original	2206	$self->post_load_original
2023	if delete $self->{load_original};	2207	if delete $self->{load_original};
2024		2208
2025	if (my $uniq = $self->uniq_path) {	2209	if (my $uniq = $self->uniq_path) {
2026	utf8::encode $uniq;	2210	utf8::encode $uniq;
2027	unless (aio_stat $uniq) {	2211	unless (aio_stat $uniq) {
2028	if (my $f = new_from_file cf::object::thawer $uniq) {	2212	if (my $f = new_from_file cf::object::thawer $uniq) {
2029	$self->clear_unique_items;	2213	$self->clear_unique_items;
2030	$self->_load_objects ($f);	2214	$self->_load_objects ($f);
2031	$f->resolve_delayed_derefs;	2215	$f->resolve_delayed_derefs;
		2216	}
2032	}	2217	}
2033	}	2218	}
2034	}
2035		2219
2036	$f->resolve_delayed_derefs;	2220	$f->resolve_delayed_derefs;
		2221	} else {
		2222	$self->post_load_original
		2223	if delete $self->{load_original};
		2224	}
2037		2225
2038	cf::cede_to_tick;	2226	cf::cede_to_tick;
2039	# now do the right thing for maps	2227	# now do the right thing for maps
2040	$self->link_multipart_objects;	2228	$self->link_multipart_objects;
2041	$self->difficulty ($self->estimate_difficulty)	2229	$self->difficulty ($self->estimate_difficulty)
…		…
2055		2243
2056	$self->in_memory (cf::MAP_ACTIVE);	2244	$self->in_memory (cf::MAP_ACTIVE);
2057	}	2245	}
2058		2246
2059	$self->post_load;	2247	$self->post_load;
2060	}
2061		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
2062	sub customise_for {	2255	sub customise_for {
2063	my ($self, $ob) = @_;	2256	my ($self, $ob) = @_;
2064		2257
2065	return find "~" . $ob->name . "/" . $self->{path}	2258	return find "~" . $ob->name . "/" . $self->{path}
2066	if $self->per_player;	2259	if $self->per_player;
…		…
2082	or next;	2275	or next;
2083	$neigh = find $neigh, $map	2276	$neigh = find $neigh, $map
2084	or next;	2277	or next;
2085	$neigh->load;	2278	$neigh->load;
2086		2279
		2280	# now find the diagonal neighbours
2087	push @neigh,	2281	push @neigh,
2088	[$neigh->tile_path (($_ + 3) % 4), $neigh],	2282	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2089	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2283	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2090	}	2284	}
2091		2285
…		…
2098	}	2292	}
2099		2293
2100	sub find_sync {	2294	sub find_sync {
2101	my ($path, $origin) = @_;	2295	my ($path, $origin) = @_;
2102		2296
2103	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
2104	}	2301	}
2105		2302
2106	sub do_load_sync {	2303	sub do_load_sync {
2107	my ($map) = @_;	2304	my ($map) = @_;
2108		2305
2109	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2306	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2110	if $Coro::current == $Coro::main;	2307	if $Coro::current == $Coro::main;
2111		2308
2112	cf::sync_job { $map->load };	2309	$map->load;
2113	}	2310	}
2114		2311
2115	our %MAP_PREFETCH;	2312	our %MAP_PREFETCH;
2116	our $MAP_PREFETCHER = undef;	2313	our $MAP_PREFETCHER = undef;
2117		2314
2118	sub find_async {	2315	sub find_async {
2119	my ($path, $origin, $load) = @_;	2316	my ($path, $origin, $load) = @_;
2120		2317
2121	$path = normalise $path, $origin && $origin->{path};	2318	$path = normalise $path, $origin;
2122		2319
2123	if (my $map = $cf::MAP{$path}) {	2320	if (my $map = $cf::MAP{$path}) {
2124	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2321	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2125	}	2322	}
2126		2323
…		…
2143	$MAP_PREFETCHER->prio (6);	2340	$MAP_PREFETCHER->prio (6);
2144		2341
2145	()	2342	()
2146	}	2343	}
2147		2344
		2345	# common code, used by both ->save and ->swapout
2148	sub save {	2346	sub _save {
2149	my ($self) = @_;	2347	my ($self) = @_;
2150
2151	my $lock = cf::lock_acquire "map_data:$self->{path}";
2152		2348
2153	$self->{last_save} = $cf::RUNTIME;	2349	$self->{last_save} = $cf::RUNTIME;
2154		2350
2155	return unless $self->dirty;	2351	return unless $self->dirty;
2156		2352
…		…
2176	} else {	2372	} else {
2177	$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);
2178	}	2374	}
2179	}	2375	}
2180		2376
		2377	sub save {
		2378	my ($self) = @_;
		2379
		2380	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2381
		2382	$self->_save;
		2383	}
		2384
2181	sub swap_out {	2385	sub swap_out {
2182	my ($self) = @_;	2386	my ($self) = @_;
2183		2387
2184	# save first because save cedes
2185	$self->save;
2186
2187	my $lock = cf::lock_acquire "map_data:$self->{path}";	2388	my $lock = cf::lock_acquire "map_data:$self->{path}";
2188		2389
2189	return if $self->players;
2190	return if $self->in_memory != cf::MAP_ACTIVE;	2390	return if $self->in_memory != cf::MAP_ACTIVE;
2191	return if $self->{deny_save};	2391	return if $self->{deny_save};
		2392	return if $self->players;
2192		2393
		2394	# first deactivate the map and "unlink" it from the core
		2395	$self->deactivate;
		2396	$_->clear_links_to ($self) for values %cf::MAP;
2193	$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};
2194		2444
2195	$self->deactivate;	2445	$self->deactivate;
2196	$_->clear_links_to ($self) for values %cf::MAP;	2446	$_->clear_links_to ($self) for values %cf::MAP;
2197	$self->clear;	2447	$self->clear;
2198	}
2199
2200	sub reset_at {
2201	my ($self) = @_;
2202
2203	# TODO: safety, remove and allow resettable per-player maps
2204	return 1e99 if $self->{deny_reset};
2205
2206	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2207	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2208
2209	$time + $to
2210	}
2211
2212	sub should_reset {
2213	my ($self) = @_;
2214
2215	$self->reset_at <= $cf::RUNTIME
2216	}
2217
2218	sub reset {
2219	my ($self) = @_;
2220
2221	my $lock = cf::lock_acquire "map_data:$self->{path}";
2222
2223	return if $self->players;
2224
2225	warn "resetting map ", $self->path;
2226
2227	$self->in_memory (cf::MAP_SWAPPED);
2228
2229	# need to save uniques path
2230	unless ($self->{deny_save}) {
2231	my $uniq = $self->uniq_path; utf8::encode $uniq;
2232
2233	$self->_save_objects ($uniq, cf::IO_UNIQUES)
2234	if $uniq;
2235	}
2236
2237	delete $cf::MAP{$self->path};
2238
2239	$self->deactivate;
2240	$_->clear_links_to ($self) for values %cf::MAP;
2241	$self->clear;
2242		2448
2243	$self->unlink_save;	2449	$self->unlink_save;
2244	$self->destroy;	2450	$self->destroy;
2245	}	2451	}
2246		2452
…		…
2254		2460
2255	delete $cf::MAP{$self->path};	2461	delete $cf::MAP{$self->path};
2256		2462
2257	$self->unlink_save;	2463	$self->unlink_save;
2258		2464
2259	bless $self, "cf::map";	2465	bless $self, "cf::map::wrap";
2260	delete $self->{deny_reset};	2466	delete $self->{deny_reset};
2261	$self->{deny_save} = 1;	2467	$self->{deny_save} = 1;
2262	$self->reset_timeout (1);	2468	$self->reset_timeout (1);
2263	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2469	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2264		2470
…		…
2321	: normalise $_	2527	: normalise $_
2322	} @{ aio_readdir $UNIQUEDIR or [] }	2528	} @{ aio_readdir $UNIQUEDIR or [] }
2323	]	2529	]
2324	}	2530	}
2325		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
2326	=back	2564	=back
2327		2565
2328	=head3 cf::object	2566	=head3 cf::object
2329		2567
2330	=cut	2568	=cut
…		…
2462		2700
2463	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}>).
2464		2702
2465	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.
2466	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,
2467	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
2468	map.	2706	map.
2469		2707
2470	Will never block.	2708	Will never block.
2471		2709
2472	=item $player_object->leave_link ($map, $x, $y)	2710	=item $player_object->leave_link ($map, $x, $y)
…		…
2493	sub cf::object::player::enter_link {	2731	sub cf::object::player::enter_link {
2494	my ($self) = @_;	2732	my ($self) = @_;
2495		2733
2496	$self->deactivate_recursive;	2734	$self->deactivate_recursive;
2497		2735
		2736	++$self->{_link_recursion};
		2737
2498	return if UNIVERSAL::isa $self->map, "ext::map_link";	2738	return if UNIVERSAL::isa $self->map, "ext::map_link";
2499		2739
2500	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2740	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2501	if $self->map && $self->map->{path} ne "{link}";	2741	if $self->map && $self->map->{path} ne "{link}";
2502		2742
2503	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2743	$self->enter_map ($LINK_MAP || link_map, 3, 3);
2504	}	2744	}
2505		2745
2506	sub cf::object::player::leave_link {	2746	sub cf::object::player::leave_link {
2507	my ($self, $map, $x, $y) = @_;	2747	my ($self, $map, $x, $y) = @_;
2508		2748
…		…
2525	($x, $y) = (-1, -1)	2765	($x, $y) = (-1, -1)
2526	unless (defined $x) && (defined $y);	2766	unless (defined $x) && (defined $y);
2527		2767
2528	# use -1 or undef as default coordinates, not 0, 0	2768	# use -1 or undef as default coordinates, not 0, 0
2529	($x, $y) = ($map->enter_x, $map->enter_y)	2769	($x, $y) = ($map->enter_x, $map->enter_y)
2530	if $x <=0 && $y <= 0;	2770	if $x <= 0 && $y <= 0;
2531		2771
2532	$map->load;	2772	$map->load;
2533	$map->load_neighbours;	2773	$map->load_neighbours;
2534		2774
2535	return unless $self->contr->active;	2775	return unless $self->contr->active;
2536		2776
2537	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2777	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2538	$self->enter_map ($map, $x, $y);	2778	if ($self->enter_map ($map, $x, $y)) {
2539		2779	# entering was successful
		2780	delete $self->{_link_recursion};
2540	# only activate afterwards, to support waiting in hooks	2781	# only activate afterwards, to support waiting in hooks
2541	$self->activate_recursive;	2782	$self->activate_recursive;
2542	}	2783	}
2543		2784
		2785	}
		2786
2544	=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)]])
2545		2788
2546	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
2547	her, loading and preparing them map, calling the provided $check callback	2790	her, loading and preparing them map, calling the provided $check callback
2548	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
2549	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
…		…
2556		2799
2557	our $GOTOGEN;	2800	our $GOTOGEN;
2558		2801
2559	sub cf::object::player::goto {	2802	sub cf::object::player::goto {
2560	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	}
2561		2810
2562	# 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
2563	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2812	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2564		2813
2565	$self->enter_link;	2814	$self->enter_link;
…		…
2585	($path, $x, $y) = (undef, undef, undef);	2834	($path, $x, $y) = (undef, undef, undef);
2586	}	2835	}
2587	}	2836	}
2588		2837
2589	my $map = eval {	2838	my $map = eval {
2590	my $map = defined $path ? cf::map::find $path : undef;	2839	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2591		2840
2592	if ($map) {	2841	if ($map) {
2593	$map = $map->customise_for ($self);	2842	$map = $map->customise_for ($self);
2594	$map = $check->($map) if $check && $map;	2843	$map = $check->($map, $x, $y, $self) if $check && $map;
2595	} else {	2844	} else {
2596	$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);
2597	}	2846	}
2598		2847
2599	$map	2848	$map
…		…
2607	if ($gen == $self->{_goto_generation}) {	2856	if ($gen == $self->{_goto_generation}) {
2608	delete $self->{_goto_generation};	2857	delete $self->{_goto_generation};
2609	$self->leave_link ($map, $x, $y);	2858	$self->leave_link ($map, $x, $y);
2610	}	2859	}
2611		2860
2612	$done->() if $done;	2861	$done->($self) if $done;
2613	})->prio (1);	2862	})->prio (1);
2614	}	2863	}
2615		2864
2616	=item $player_object->enter_exit ($exit_object)	2865	=item $player_object->enter_exit ($exit_object)
2617		2866
…		…
2693		2942
2694	prepare_random_map $exit	2943	prepare_random_map $exit
2695	if $exit->slaying eq "/!";	2944	if $exit->slaying eq "/!";
2696	}	2945	}
2697		2946
2698	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2947	my $map = cf::map::normalise $exit->slaying, $exit->map;
2699	my $x = $exit->stats->hp;	2948	my $x = $exit->stats->hp;
2700	my $y = $exit->stats->sp;	2949	my $y = $exit->stats->sp;
2701		2950
2702	$self->goto ($map, $x, $y);	2951	$self->goto ($map, $x, $y);
2703		2952
…		…
2710	$self->message ("Something went wrong deep within the deliantra server. "	2959	$self->message ("Something went wrong deep within the deliantra server. "
2711	. "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. "
2712	. "Please report this to the dungeon master!",	2961	. "Please report this to the dungeon master!",
2713	cf::NDI_UNIQUE | cf::NDI_RED);	2962	cf::NDI_UNIQUE | cf::NDI_RED);
2714		2963
2715	warn "ERROR in enter_exit: $@";	2964	error "ERROR in enter_exit: $@";
2716	$self->leave_link;	2965	$self->leave_link;
2717	}	2966	}
2718	})->prio (1);	2967	})->prio (1);
2719	}	2968	}
2720		2969
…		…
2732	sub cf::client::send_drawinfo {	2981	sub cf::client::send_drawinfo {
2733	my ($self, $text, $flags) = @_;	2982	my ($self, $text, $flags) = @_;
2734		2983
2735	utf8::encode $text;	2984	utf8::encode $text;
2736	$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);
2737	}	3011	}
2738		3012
2739	=item $client->send_msg ($channel, $msg, $color, [extra...])	3013	=item $client->send_msg ($channel, $msg, $color, [extra...])
2740		3014
2741	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
…		…
2745		3019
2746	=cut	3020	=cut
2747		3021
2748	# non-persistent channels (usually the info channel)	3022	# non-persistent channels (usually the info channel)
2749	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	},
2750	"c/identify" => {	3030	"c/identify" => {
2751	id => "infobox",	3031	id => "infobox",
2752	title => "Identify",	3032	title => "Identify",
2753	reply => undef,	3033	reply => undef,
2754	tooltip => "Items recently identified",	3034	tooltip => "Items recently identified",
…		…
2756	"c/examine" => {	3036	"c/examine" => {
2757	id => "infobox",	3037	id => "infobox",
2758	title => "Examine",	3038	title => "Examine",
2759	reply => undef,	3039	reply => undef,
2760	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",
2761	},	3047	},
2762	"c/book" => {	3048	"c/book" => {
2763	id => "infobox",	3049	id => "infobox",
2764	title => "Book",	3050	title => "Book",
2765	reply => undef,	3051	reply => undef,
…		…
2881	my $pkt = "msg "	3167	my $pkt = "msg "
2882	. $self->{json_coder}->encode (	3168	. $self->{json_coder}->encode (
2883	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]	3169	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2884	);	3170	);
2885		3171
2886	# try lzf for large packets
2887	$pkt = "lzf " . Compress::LZF::compress $pkt
2888	if 1024 <= length $pkt and $self->{can_lzf};
2889
2890	# split very large packets
2891	if (8192 < length $pkt and $self->{can_lzf}) {
2892	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2893	$pkt = "frag";
2894	}
2895
2896	$self->send_packet ($pkt);	3172	$self->send_big_packet ($pkt);
2897	}	3173	}
2898		3174
2899	=item $client->ext_msg ($type, @msg)	3175	=item $client->ext_msg ($type, @msg)
2900		3176
2901	Sends an ext event to the client.	3177	Sends an ext event to the client.
…		…
2904		3180
2905	sub cf::client::ext_msg($$@) {	3181	sub cf::client::ext_msg($$@) {
2906	my ($self, $type, @msg) = @_;	3182	my ($self, $type, @msg) = @_;
2907		3183
2908	if ($self->extcmd == 2) {	3184	if ($self->extcmd == 2) {
2909	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3185	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2910	} elsif ($self->extcmd == 1) { # TODO: remove	3186	} elsif ($self->extcmd == 1) { # TODO: remove
2911	push @msg, msgtype => "event_$type";	3187	push @msg, msgtype => "event_$type";
2912	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3188	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2913	}	3189	}
2914	}	3190	}
2915		3191
2916	=item $client->ext_reply ($msgid, @msg)	3192	=item $client->ext_reply ($msgid, @msg)
2917		3193
…		…
2921		3197
2922	sub cf::client::ext_reply($$@) {	3198	sub cf::client::ext_reply($$@) {
2923	my ($self, $id, @msg) = @_;	3199	my ($self, $id, @msg) = @_;
2924		3200
2925	if ($self->extcmd == 2) {	3201	if ($self->extcmd == 2) {
2926	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));	3202	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2927	} elsif ($self->extcmd == 1) {	3203	} elsif ($self->extcmd == 1) {
2928	#TODO: version 1, remove	3204	#TODO: version 1, remove
2929	unshift @msg, msgtype => "reply", msgid => $id;	3205	unshift @msg, msgtype => "reply", msgid => $id;
2930	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3206	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2931	}	3207	}
2932	}	3208	}
2933		3209
2934	=item $success = $client->query ($flags, "text", \&cb)	3210	=item $success = $client->query ($flags, "text", \&cb)
2935		3211
…		…
3006		3282
3007	$ns->ext_reply ($reply, @reply)	3283	$ns->ext_reply ($reply, @reply)
3008	if $reply;	3284	if $reply;
3009		3285
3010	} else {	3286	} else {
3011	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";
3012	}	3288	}
3013		3289
3014	cf::override;	3290	cf::override;
3015	},	3291	},
3016	);	3292	);
…		…
3036		3312
3037	$coro	3313	$coro
3038	}	3314	}
3039		3315
3040	cf::client->attach (	3316	cf::client->attach (
3041	on_destroy => sub {	3317	on_client_destroy => sub {
3042	my ($ns) = @_;	3318	my ($ns) = @_;
3043		3319
3044	$_->cancel for values %{ (delete $ns->{_coro}) || {} };	3320	$_->cancel for values %{ (delete $ns->{_coro}) || {} };
3045	},	3321	},
3046	);	3322	);
…		…
3062	our $safe_hole = new Safe::Hole;	3338	our $safe_hole = new Safe::Hole;
3063		3339
3064	$SIG{FPE} = 'IGNORE';	3340	$SIG{FPE} = 'IGNORE';
3065		3341
3066	$safe->permit_only (Opcode::opset qw(	3342	$safe->permit_only (Opcode::opset qw(
3067	:base_core :base_mem :base_orig :base_math	3343	:base_core :base_mem :base_orig :base_math :base_loop
3068	grepstart grepwhile mapstart mapwhile	3344	grepstart grepwhile mapstart mapwhile
3069	sort time	3345	sort time
3070	));	3346	));
3071		3347
3072	# here we export the classes and methods available to script code	3348	# here we export the classes and methods available to script code
…		…
3097	decrease split destroy change_exp value msg lore send_msg)],	3373	decrease split destroy change_exp value msg lore send_msg)],
3098	["cf::object::player" => qw(player)],	3374	["cf::object::player" => qw(player)],
3099	["cf::player" => qw(peaceful send_msg)],	3375	["cf::player" => qw(peaceful send_msg)],
3100	["cf::map" => qw(trigger)],	3376	["cf::map" => qw(trigger)],
3101	) {	3377	) {
3102	no strict 'refs';
3103	my ($pkg, @funs) = @$_;	3378	my ($pkg, @funs) = @$_;
3104	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3379	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3105	for @funs;	3380	for @funs;
3106	}	3381	}
3107		3382
…		…
3124	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3399	$qcode =~ s/"/‟/g; # not allowed in #line filenames
3125	$qcode =~ s/\n/\\n/g;	3400	$qcode =~ s/\n/\\n/g;
3126		3401
3127	%vars = (_dummy => 0) unless %vars;	3402	%vars = (_dummy => 0) unless %vars;
3128		3403
		3404	my @res;
3129	local $_;	3405	local $_;
3130	local @safe::cf::_safe_eval_args = values %vars;
3131		3406
3132	my $eval =	3407	my $eval =
3133	"do {\n"	3408	"do {\n"
3134	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"	3409	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3135	. "#line 0 \"{$qcode}\"\n"	3410	. "#line 0 \"{$qcode}\"\n"
3136	. $code	3411	. $code
3137	. "\n}"	3412	. "\n}"
3138	;	3413	;
3139		3414
		3415	if ($CFG{safe_eval}) {
3140	sub_generation_inc;	3416	sub_generation_inc;
		3417	local @safe::cf::_safe_eval_args = values %vars;
3141	my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);	3418	@res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3142	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	}
3143		3424
3144	if ($@) {	3425	if ($@) {
3145	warn "$@";	3426	warn "$@",
3146	warn "while executing safe code '$code'\n";	3427	"while executing safe code '$code'\n",
3147	warn "with arguments " . (join " ", %vars) . "\n";	3428	"with arguments " . (join " ", %vars) . "\n";
3148	}	3429	}
3149		3430
3150	wantarray ? @res : $res[0]	3431	wantarray ? @res : $res[0]
3151	}	3432	}
3152		3433
…		…
3166	=cut	3447	=cut
3167		3448
3168	sub register_script_function {	3449	sub register_script_function {
3169	my ($fun, $cb) = @_;	3450	my ($fun, $cb) = @_;
3170		3451
3171	no strict 'refs';	3452	$fun = "safe::$fun" if $CFG{safe_eval};
3172	*{"safe::$fun"} = $safe_hole->wrap ($cb);	3453	*$fun = $safe_hole->wrap ($cb);
3173	}	3454	}
3174		3455
3175	=back	3456	=back
3176		3457
3177	=cut	3458	=cut
…		…
3186	# for this (global event?)	3467	# for this (global event?)
3187	%ext::player_env::MUSIC_FACE_CACHE = ();	3468	%ext::player_env::MUSIC_FACE_CACHE = ();
3188		3469
3189	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3470	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3190		3471
3191	warn "loading facedata from $path\n";	3472	trace "loading facedata from $path\n";
3192		3473
3193	my $facedata;	3474	my $facedata = decode_storable load_file $path;
3194	0 < aio_load $path, $facedata
3195	or die "$path: $!";
3196
3197	$facedata = Coro::Storable::thaw $facedata;
3198		3475
3199	$facedata->{version} == 2	3476	$facedata->{version} == 2
3200	or cf::cleanup "$path: version mismatch, cannot proceed.";	3477	or cf::cleanup "$path: version mismatch, cannot proceed.";
3201		3478
3202	# 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]);
3203	$facedata->{resource}{"res/exp_table"} = {	3481	$facedata->{resource}{"res/exp_table"} = {
3204	type => FT_RSRC,	3482	type => FT_RSRC,
3205	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),
3206	};	3485	};
3207	cf::cede_to_tick;	3486	cf::cede_to_tick;
3208		3487
3209	{	3488	{
3210	my $faces = $facedata->{faceinfo};	3489	my $faces = $facedata->{faceinfo};
…		…
3212	while (my ($face, $info) = each %$faces) {	3491	while (my ($face, $info) = each %$faces) {
3213	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3492	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3214		3493
3215	cf::face::set_visibility $idx, $info->{visibility};	3494	cf::face::set_visibility $idx, $info->{visibility};
3216	cf::face::set_magicmap $idx, $info->{magicmap};	3495	cf::face::set_magicmap $idx, $info->{magicmap};
3217	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};	3496	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3218	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} ;
3219		3499
3220	cf::cede_to_tick;	3500	cf::cede_to_tick;
3221	}	3501	}
3222		3502
3223	while (my ($face, $info) = each %$faces) {	3503	while (my ($face, $info) = each %$faces) {
…		…
3228		3508
3229	if (my $smooth = cf::face::find $info->{smooth}) {	3509	if (my $smooth = cf::face::find $info->{smooth}) {
3230	cf::face::set_smooth $idx, $smooth;	3510	cf::face::set_smooth $idx, $smooth;
3231	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3511	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3232	} else {	3512	} else {
3233	warn "smooth face '$info->{smooth}' not found for face '$face'";	3513	error "smooth face '$info->{smooth}' not found for face '$face'";
3234	}	3514	}
3235		3515
3236	cf::cede_to_tick;	3516	cf::cede_to_tick;
3237	}	3517	}
3238	}	3518	}
…		…
3247		3527
3248	cf::anim::invalidate_all; # d'oh	3528	cf::anim::invalidate_all; # d'oh
3249	}	3529	}
3250		3530
3251	{	3531	{
3252	# TODO: for gcfclient pleasure, we should give resources
3253	# that gcfclient doesn't grok a >10000 face index.
3254	my $res = $facedata->{resource};	3532	my $res = $facedata->{resource};
3255		3533
3256	while (my ($name, $info) = each %$res) {	3534	while (my ($name, $info) = each %$res) {
3257	if (defined $info->{type}) {	3535	if (defined $info->{type}) {
3258	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3536	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3259	my $data;
3260		3537
3261	if ($info->{type} & 1) {	3538	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3262	# prepend meta info
3263
3264	my $meta = $enc->encode ({
3265	name => $name,
3266	%{ $info->{meta} || {} },
3267	});
3268
3269	$data = pack "(w/a*)*", $meta, $info->{data};
3270	} else {
3271	$data = $info->{data};
3272	}
3273
3274	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3275	cf::face::set_type $idx, $info->{type};	3539	cf::face::set_type $idx, $info->{type};
3276	} else {	3540	} else {
3277	$RESOURCE{$name} = $info;	3541	$RESOURCE{$name} = $info; # unused
3278	}	3542	}
3279		3543
3280	cf::cede_to_tick;	3544	cf::cede_to_tick;
3281	}	3545	}
3282	}	3546	}
3283		3547
3284	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3548	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3285		3549
3286	1	3550	1
3287	}	3551	}
3288
3289	cf::global->attach (on_resource_update => sub {
3290	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3291	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3292
3293	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3294	my $sound = $soundconf->{compat}[$_]
3295	or next;
3296
3297	my $face = cf::face::find "sound/$sound->[1]";
3298	cf::sound::set $sound->[0] => $face;
3299	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3300	}
3301
3302	while (my ($k, $v) = each %{$soundconf->{event}}) {
3303	my $face = cf::face::find "sound/$v";
3304	cf::sound::set $k => $face;
3305	}
3306	}
3307	});
3308		3552
3309	register_exticmd fx_want => sub {	3553	register_exticmd fx_want => sub {
3310	my ($ns, $want) = @_;	3554	my ($ns, $want) = @_;
3311		3555
3312	while (my ($k, $v) = each %$want) {	3556	while (my ($k, $v) = each %$want) {
…		…
3351	sub reload_treasures {	3595	sub reload_treasures {
3352	load_resource_file "$DATADIR/treasures"	3596	load_resource_file "$DATADIR/treasures"
3353	or die "unable to load treasurelists\n";	3597	or die "unable to load treasurelists\n";
3354	}	3598	}
3355		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
3356	sub reload_resources {	3620	sub reload_resources {
3357	warn "reloading resource files...\n";	3621	trace "reloading resource files...\n";
3358		3622
		3623	reload_exp_table;
		3624	reload_materials;
3359	reload_facedata;	3625	reload_facedata;
		3626	reload_sound;
3360	reload_archetypes;	3627	reload_archetypes;
3361	reload_regions;	3628	reload_regions;
3362	reload_treasures;	3629	reload_treasures;
3363		3630
3364	warn "finished reloading resource files\n";	3631	trace "finished reloading resource files\n";
3365	}	3632	}
3366		3633
3367	sub reload_config {	3634	sub reload_config {
3368	open my $fh, "<:utf8", "$CONFDIR/config"	3635	trace "reloading config file...\n";
3369	or return;
3370		3636
3371	local $/;	3637	my $config = load_file "$CONFDIR/config";
3372	*CFG = YAML::Load <$fh>;	3638	utf8::decode $config;
		3639	*CFG = decode_yaml $config;
3373		3640
3374	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3641	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3375		3642
3376	$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};
3377	$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};
3378		3645
3379	if (exists $CFG{mlockall}) {	3646	if (exists $CFG{mlockall}) {
…		…
3403	seek $fh, 0, 0;	3670	seek $fh, 0, 0;
3404	print $fh $$;	3671	print $fh $$;
3405	}	3672	}
3406		3673
3407	sub main_loop {	3674	sub main_loop {
3408	warn "EV::loop starting\n";	3675	trace "EV::loop starting\n";
3409	if (1) {	3676	if (1) {
3410	EV::loop;	3677	EV::loop;
3411	}	3678	}
3412	warn "EV::loop returned\n";	3679	trace "EV::loop returned\n";
3413	goto &main_loop unless $REALLY_UNLOOP;	3680	goto &main_loop unless $REALLY_UNLOOP;
3414	}	3681	}
3415		3682
3416	sub main {	3683	sub main {
3417	cf::init_globals; # initialise logging	3684	cf::init_globals; # initialise logging
3418		3685
3419	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3686	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3420	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.";
3421	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3688	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3422	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3689	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3423
3424	cf::init_experience;
3425	cf::init_anim;
3426	cf::init_attackmess;
3427	cf::init_dynamic;
3428		3690
3429	$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
3430		3692
3431	# we must not ever block the main coroutine	3693	# we must not ever block the main coroutine
3432	local $Coro::idle = sub {	3694	local $Coro::idle = sub {
…		…
3438	};	3700	};
3439		3701
3440	evthread_start IO::AIO::poll_fileno;	3702	evthread_start IO::AIO::poll_fileno;
3441		3703
3442	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
3443	reload_resources;	3713	reload_resources;
3444	reload_config;	3714	reload_config;
3445	db_init;	3715	db_init;
3446		3716
3447	cf::load_settings;
3448	cf::load_materials;
3449	cf::init_uuid;	3717	cf::init_uuid;
3450	cf::init_signals;	3718	cf::init_signals;
3451	cf::init_commands;
3452	cf::init_skills;	3719	cf::init_skills;
3453		3720
3454	cf::init_beforeplay;	3721	cf::init_beforeplay;
3455		3722
3456	atomic;	3723	atomic;
…		…
3461		3728
3462	# no (long-running) fork's whatsoever before this point(!)	3729	# no (long-running) fork's whatsoever before this point(!)
3463	use POSIX ();	3730	use POSIX ();
3464	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};
3465		3732
3466	(pop @POST_INIT)->(0) while @POST_INIT;	3733	cf::_post_init 0;
3467	};	3734	};
3468		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
3469	main_loop;	3744	goto &main_loop;
3470	}	3745	}
3471		3746
3472	#############################################################################	3747	#############################################################################
3473	# initialisation and cleanup	3748	# initialisation and cleanup
3474		3749
3475	# install some emergency cleanup handlers	3750	# install some emergency cleanup handlers
3476	BEGIN {	3751	BEGIN {
3477	our %SIGWATCHER = ();	3752	our %SIGWATCHER = ();
3478	for my $signal (qw(INT HUP TERM)) {	3753	for my $signal (qw(INT HUP TERM)) {
3479	$SIGWATCHER{$signal} = EV::signal $signal, sub {	3754	$SIGWATCHER{$signal} = AE::signal $signal, sub {
3480	cf::cleanup "SIG$signal";	3755	cf::cleanup "SIG$signal";
3481	};	3756	};
3482	}	3757	}
3483	}	3758	}
3484		3759
3485	sub write_runtime_sync {	3760	sub write_runtime_sync {
		3761	my $t0 = AE::time;
		3762
3486	# first touch the runtime file to show we are still running:	3763	# first touch the runtime file to show we are still running:
3487	# the fsync below can take a very very long time.	3764	# the fsync below can take a very very long time.
3488		3765
3489	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;	3766	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3490		3767
3491	my $guard = cf::lock_acquire "write_runtime";	3768	my $guard = cf::lock_acquire "write_runtime";
3492		3769
3493	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644	3770	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3494	or return;	3771	or return;
3495		3772
3496	my $value = $cf::RUNTIME + 90 + 10;	3773	my $value = $cf::RUNTIME + 90 + 10;
3497	# 10 is the runtime save interval, for a monotonic clock	3774	# 10 is the runtime save interval, for a monotonic clock
3498	# 60 allows for the watchdog to kill the server.	3775	# 60 allows for the watchdog to kill the server.
…		…
3511	or return;	3788	or return;
3512		3789
3513	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3790	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3514	and return;	3791	and return;
3515		3792
3516	warn "runtime file written.\n";	3793	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3517		3794
3518	1	3795	1
3519	}	3796	}
3520		3797
3521	our $uuid_lock;	3798	our $uuid_lock;
…		…
3533	or return;	3810	or return;
3534		3811
3535	my $value = uuid_seq uuid_cur;	3812	my $value = uuid_seq uuid_cur;
3536		3813
3537	unless ($value) {	3814	unless ($value) {
3538	warn "cowardly refusing to write zero uuid value!\n";	3815	info "cowardly refusing to write zero uuid value!\n";
3539	return;	3816	return;
3540	}	3817	}
3541		3818
3542	my $value = uuid_str $value + $uuid_skip;	3819	my $value = uuid_str $value + $uuid_skip;
3543	$uuid_skip = 0;	3820	$uuid_skip = 0;
…		…
3553	or return;	3830	or return;
3554		3831
3555	aio_rename "$uuid~", $uuid	3832	aio_rename "$uuid~", $uuid
3556	and return;	3833	and return;
3557		3834
3558	warn "uuid file written ($value).\n";	3835	trace "uuid file written ($value).\n";
3559		3836
3560	1	3837	1
3561		3838
3562	}	3839	}
3563		3840
…		…
3569	}	3846	}
3570		3847
3571	sub emergency_save() {	3848	sub emergency_save() {
3572	my $freeze_guard = cf::freeze_mainloop;	3849	my $freeze_guard = cf::freeze_mainloop;
3573		3850
3574	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;
3575		3857
3576	cf::sync_job {	3858	cf::sync_job {
3577	# this is a trade-off: we want to be very quick here, so	3859	cf::write_runtime_sync; # external watchdog should not bark
3578	# save all maps without fsync, and later call a global sync
3579	# (which in turn might be very very slow)
3580	local $USE_FSYNC = 0;
3581		3860
3582	# use a peculiar iteration method to avoid tripping on perl	3861	# use a peculiar iteration method to avoid tripping on perl
3583	# refcount bugs in for. also avoids problems with players	3862	# refcount bugs in for. also avoids problems with players
3584	# and maps saved/destroyed asynchronously.	3863	# and maps saved/destroyed asynchronously.
3585	warn "emergency_perl_save: begin player save\n";	3864	info "emergency_perl_save: begin player save\n";
3586	for my $login (keys %cf::PLAYER) {	3865	for my $login (keys %cf::PLAYER) {
3587	my $pl = $cf::PLAYER{$login} or next;	3866	my $pl = $cf::PLAYER{$login} or next;
3588	$pl->valid or next;	3867	$pl->valid or next;
3589	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3868	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3590	$pl->save;	3869	$pl->save;
3591	}	3870	}
3592	warn "emergency_perl_save: end player save\n";	3871	info "emergency_perl_save: end player save\n";
3593		3872
		3873	cf::write_runtime_sync; # external watchdog should not bark
		3874
3594	warn "emergency_perl_save: begin map save\n";	3875	info "emergency_perl_save: begin map save\n";
3595	for my $path (keys %cf::MAP) {	3876	for my $path (keys %cf::MAP) {
3596	my $map = $cf::MAP{$path} or next;	3877	my $map = $cf::MAP{$path} or next;
3597	$map->valid or next;	3878	$map->valid or next;
3598	$map->save;	3879	$map->save;
3599	}	3880	}
3600	warn "emergency_perl_save: end map save\n";	3881	info "emergency_perl_save: end map save\n";
3601		3882
		3883	cf::write_runtime_sync; # external watchdog should not bark
		3884
3602	warn "emergency_perl_save: begin database checkpoint\n";	3885	info "emergency_perl_save: begin database checkpoint\n";
3603	BDB::db_env_txn_checkpoint $DB_ENV;	3886	BDB::db_env_txn_checkpoint $DB_ENV;
3604	warn "emergency_perl_save: end database checkpoint\n";	3887	info "emergency_perl_save: end database checkpoint\n";
3605		3888
3606	warn "emergency_perl_save: begin write uuid\n";	3889	info "emergency_perl_save: begin write uuid\n";
3607	write_uuid_sync 1;	3890	write_uuid_sync 1;
3608	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
3609	};	3911	};
3610		3912
3611	warn "emergency_perl_save: starting sync()\n";
3612	IO::AIO::aio_sync sub {
3613	warn "emergency_perl_save: finished sync()\n";
3614	};
3615
3616	warn "emergency_perl_save: leave\n";	3913	info "emergency_perl_save: leave\n";
3617	}	3914	}
3618		3915
3619	sub post_cleanup {	3916	sub post_cleanup {
3620	my ($make_core) = @_;	3917	my ($make_core) = @_;
3621		3918
		3919	IO::AIO::flush;
		3920
3622	warn Carp::longmess "post_cleanup backtrace"	3921	error Carp::longmess "post_cleanup backtrace"
3623	if $make_core;	3922	if $make_core;
3624		3923
3625	my $fh = pidfile;	3924	my $fh = pidfile;
3626	unlink $PIDFILE if <$fh> == $$;	3925	unlink $PIDFILE if <$fh> == $$;
3627	}	3926	}
…		…
3647	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	3946	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3648	for my $name (keys %$leaf_symtab) {	3947	for my $name (keys %$leaf_symtab) {
3649	_gv_clear *{"$pkg$name"};	3948	_gv_clear *{"$pkg$name"};
3650	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	3949	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3651	}	3950	}
3652	warn "cleared package $pkg\n";#d#
3653	}	3951	}
3654		3952
3655	sub do_reload_perl() {	3953	sub do_reload_perl() {
3656	# can/must only be called in main	3954	# can/must only be called in main
3657	if ($Coro::current != $Coro::main) {	3955	unless (in_main) {
3658	warn "can only reload from main coroutine";	3956	error "can only reload from main coroutine";
3659	return;	3957	return;
3660	}	3958	}
3661		3959
3662	return if $RELOAD++;	3960	return if $RELOAD++;
3663		3961
3664	my $t1 = EV::time;	3962	my $t1 = AE::time;
3665		3963
3666	while ($RELOAD) {	3964	while ($RELOAD) {
3667	warn "reloading...";	3965	cf::get_slot 0.1, -1, "reload_perl";
		3966	info "perl_reload: reloading...";
3668		3967
3669	warn "entering sync_job";	3968	trace "perl_reload: entering sync_job";
3670		3969
3671	cf::sync_job {	3970	cf::sync_job {
3672	cf::write_runtime_sync; # external watchdog should not bark
3673	cf::emergency_save;	3971	#cf::emergency_save;
3674	cf::write_runtime_sync; # external watchdog should not bark
3675		3972
3676	warn "syncing database to disk";
3677	BDB::db_env_txn_checkpoint $DB_ENV;
3678
3679	# if anything goes wrong in here, we should simply crash as we already saved
3680
3681	warn "flushing outstanding aio requests";
3682	while (IO::AIO::nreqs || BDB::nreqs) {
3683	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3684	}
3685
3686	warn "cancelling all extension coros";	3973	trace "perl_reload: cancelling all extension coros";
3687	$_->cancel for values %EXT_CORO;	3974	$_->cancel for values %EXT_CORO;
3688	%EXT_CORO = ();	3975	%EXT_CORO = ();
3689		3976
3690	warn "removing commands";	3977	trace "perl_reload: removing commands";
3691	%COMMAND = ();	3978	%COMMAND = ();
3692		3979
3693	warn "removing ext/exti commands";	3980	trace "perl_reload: removing ext/exti commands";
3694	%EXTCMD = ();	3981	%EXTCMD = ();
3695	%EXTICMD = ();	3982	%EXTICMD = ();
3696		3983
3697	warn "unloading/nuking all extensions";	3984	trace "perl_reload: unloading/nuking all extensions";
3698	for my $pkg (@EXTS) {	3985	for my $pkg (@EXTS) {
3699	warn "... unloading $pkg";	3986	trace "... unloading $pkg";
3700		3987
3701	if (my $cb = $pkg->can ("unload")) {	3988	if (my $cb = $pkg->can ("unload")) {
3702	eval {	3989	eval {
3703	$cb->($pkg);	3990	$cb->($pkg);
3704	1	3991	1
3705	} or warn "$pkg unloaded, but with errors: $@";	3992	} or error "$pkg unloaded, but with errors: $@";
3706	}	3993	}
3707		3994
3708	warn "... clearing $pkg";	3995	trace "... clearing $pkg";
3709	clear_package $pkg;	3996	clear_package $pkg;
3710	}	3997	}
3711		3998
3712	warn "unloading all perl modules loaded from $LIBDIR";	3999	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3713	while (my ($k, $v) = each %INC) {	4000	while (my ($k, $v) = each %INC) {
3714	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4001	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3715		4002
3716	warn "... unloading $k";	4003	trace "... unloading $k";
3717	delete $INC{$k};	4004	delete $INC{$k};
3718		4005
3719	$k =~ s/\.pm$//;	4006	$k =~ s/\.pm$//;
3720	$k =~ s/\//::/g;	4007	$k =~ s/\//::/g;
3721		4008
…		…
3724	}	4011	}
3725		4012
3726	clear_package $k;	4013	clear_package $k;
3727	}	4014	}
3728		4015
3729	warn "getting rid of safe::, as good as possible";	4016	trace "perl_reload: getting rid of safe::, as good as possible";
3730	clear_package "safe::$_"	4017	clear_package "safe::$_"
3731	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);
3732		4019
3733	warn "unloading cf.pm \"a bit\"";	4020	trace "perl_reload: unloading cf.pm \"a bit\"";
3734	delete $INC{"cf.pm"};	4021	delete $INC{"cf.pm"};
3735	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4022	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3736		4023
3737	# don't, removes xs symbols, too,	4024	# don't, removes xs symbols, too,
3738	# and global variables created in xs	4025	# and global variables created in xs
3739	#clear_package __PACKAGE__;	4026	#clear_package __PACKAGE__;
3740		4027
3741	warn "unload completed, starting to reload now";	4028	info "perl_reload: unload completed, starting to reload now";
3742		4029
3743	warn "reloading cf.pm";	4030	trace "perl_reload: reloading cf.pm";
3744	require cf;	4031	require cf;
3745	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	4032	cf::_connect_to_perl_1;
3746		4033
3747	warn "loading config and database again";	4034	trace "perl_reload: loading config and database again";
3748	cf::reload_config;	4035	cf::reload_config;
3749		4036
3750	warn "loading extensions";	4037	trace "perl_reload: loading extensions";
3751	cf::load_extensions;	4038	cf::load_extensions;
3752		4039
3753	if ($REATTACH_ON_RELOAD) {	4040	if ($REATTACH_ON_RELOAD) {
3754	warn "reattaching attachments to objects/players";	4041	trace "perl_reload: reattaching attachments to objects/players";
3755	_global_reattach; # objects, sockets	4042	_global_reattach; # objects, sockets
3756	warn "reattaching attachments to maps";	4043	trace "perl_reload: reattaching attachments to maps";
3757	reattach $_ for values %MAP;	4044	reattach $_ for values %MAP;
3758	warn "reattaching attachments to players";	4045	trace "perl_reload: reattaching attachments to players";
3759	reattach $_ for values %PLAYER;	4046	reattach $_ for values %PLAYER;
3760	}	4047	}
3761		4048
3762	warn "running post_init jobs";	4049	cf::_post_init 1;
3763	(pop @POST_INIT)->(1) while @POST_INIT;
3764		4050
3765	warn "leaving sync_job";	4051	trace "perl_reload: leaving sync_job";
3766		4052
3767	1	4053	1
3768	} or do {	4054	} or do {
3769	warn $@;	4055	error $@;
3770	cf::cleanup "error while reloading, exiting.";	4056	cf::cleanup "perl_reload: error, exiting.";
3771	};	4057	};
3772		4058
3773	warn "reloaded";
3774	--$RELOAD;	4059	--$RELOAD;
3775	}	4060	}
3776		4061
3777	$t1 = EV::time - $t1;	4062	$t1 = AE::time - $t1;
3778	warn "reload completed in ${t1}s\n";	4063	info "perl_reload: completed in ${t1}s\n";
3779	};	4064	};
3780		4065
3781	our $RELOAD_WATCHER; # used only during reload	4066	our $RELOAD_WATCHER; # used only during reload
3782		4067
3783	sub reload_perl() {	4068	sub reload_perl() {
…		…
3785	# coro crashes during coro_state_free->destroy here.	4070	# coro crashes during coro_state_free->destroy here.
3786		4071
3787	$RELOAD_WATCHER ||= cf::async {	4072	$RELOAD_WATCHER ||= cf::async {
3788	Coro::AIO::aio_wait cache_extensions;	4073	Coro::AIO::aio_wait cache_extensions;
3789		4074
3790	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {	4075	$RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3791	do_reload_perl;	4076	do_reload_perl;
3792	undef $RELOAD_WATCHER;	4077	undef $RELOAD_WATCHER;
3793	};	4078	};
3794	};	4079	};
3795	}	4080	}
…		…
3804	reload_perl;	4089	reload_perl;
3805	};	4090	};
3806	}	4091	}
3807	};	4092	};
3808		4093
3809	unshift @INC, $LIBDIR;	4094	#############################################################################
3810		4095
3811	my $bug_warning = 0;	4096	my $bug_warning = 0;
3812		4097
3813	our @WAIT_FOR_TICK;	4098	our @WAIT_FOR_TICK;
3814	our @WAIT_FOR_TICK_BEGIN;	4099	our @WAIT_FOR_TICK_BEGIN;
3815		4100
3816	sub wait_for_tick {	4101	sub wait_for_tick() {
3817	return if tick_inhibit || $Coro::current == $Coro::main;	4102	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3818		4103
3819	my $signal = new Coro::Signal;	4104	my $signal = new Coro::Signal;
3820	push @WAIT_FOR_TICK, $signal;	4105	push @WAIT_FOR_TICK, $signal;
3821	$signal->wait;	4106	$signal->wait;
3822	}	4107	}
3823		4108
3824	sub wait_for_tick_begin {	4109	sub wait_for_tick_begin() {
3825	return if tick_inhibit || $Coro::current == $Coro::main;	4110	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3826		4111
3827	my $signal = new Coro::Signal;	4112	my $signal = new Coro::Signal;
3828	push @WAIT_FOR_TICK_BEGIN, $signal;	4113	push @WAIT_FOR_TICK_BEGIN, $signal;
3829	$signal->wait;	4114	$signal->wait;
3830	}	4115	}
…		…
3836	return;	4121	return;
3837	}	4122	}
3838		4123
3839	cf::server_tick; # one server iteration	4124	cf::server_tick; # one server iteration
3840		4125
		4126	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
		4127
3841	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4128	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3842	$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.;
3843	Coro::async_pool {	4130	Coro::async_pool {
3844	$Coro::current->{desc} = "runtime saver";	4131	$Coro::current->{desc} = "runtime saver";
3845	write_runtime_sync	4132	write_runtime_sync
3846	or warn "ERROR: unable to write runtime file: $!";	4133	or error "ERROR: unable to write runtime file: $!";
3847	};	4134	};
3848	}	4135	}
3849		4136
3850	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4137	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3851	$sig->send;	4138	$sig->send;
…		…
3859		4146
3860	if (0) {	4147	if (0) {
3861	if ($NEXT_TICK) {	4148	if ($NEXT_TICK) {
3862	my $jitter = $TICK_START - $NEXT_TICK;	4149	my $jitter = $TICK_START - $NEXT_TICK;
3863	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4150	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
3864	warn "jitter $JITTER\n";#d#	4151	debug "jitter $JITTER\n";#d#
3865	}	4152	}
3866	}	4153	}
3867	}	4154	}
3868		4155
3869	{	4156	{
3870	# configure BDB	4157	# configure BDB
3871		4158
3872	BDB::min_parallel 8;	4159	BDB::min_parallel 16;
3873	BDB::max_poll_reqs $TICK * 0.1;	4160	BDB::max_poll_reqs $TICK * 0.1;
3874	$AnyEvent::BDB::WATCHER->priority (1);	4161	$AnyEvent::BDB::WATCHER->priority (1);
3875		4162
3876	unless ($DB_ENV) {	4163	unless ($DB_ENV) {
3877	$DB_ENV = BDB::db_env_create;	4164	$DB_ENV = BDB::db_env_create;
…		…
3914	IO::AIO::min_parallel 8;	4201	IO::AIO::min_parallel 8;
3915	IO::AIO::max_poll_time $TICK * 0.1;	4202	IO::AIO::max_poll_time $TICK * 0.1;
3916	undef $AnyEvent::AIO::WATCHER;	4203	undef $AnyEvent::AIO::WATCHER;
3917	}	4204	}
3918		4205
3919	my $_log_backtrace;	4206	our $_log_backtrace;
		4207	our $_log_backtrace_last;
3920		4208
3921	sub _log_backtrace {	4209	sub _log_backtrace {
3922	my ($msg, @addr) = @_;	4210	my ($msg, @addr) = @_;
3923		4211
3924	$msg =~ s/\n//;	4212	$msg =~ s/\n$//;
3925		4213
		4214	if ($_log_backtrace_last eq $msg) {
		4215	LOG llevInfo, "[ABT] $msg\n";
		4216	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3926	# limit the # of concurrent backtraces	4217	# limit the # of concurrent backtraces
3927	if ($_log_backtrace < 2) {	4218	} elsif ($_log_backtrace < 2) {
		4219	$_log_backtrace_last = $msg;
3928	++$_log_backtrace;	4220	++$_log_backtrace;
3929	my $perl_bt = Carp::longmess $msg;	4221	my $perl_bt = Carp::longmess $msg;
3930	async {	4222	async {
3931	$Coro::current->{desc} = "abt $msg";	4223	$Coro::current->{desc} = "abt $msg";
3932		4224
…		…
3952	LOG llevInfo, "[ABT] $_\n" for @bt;	4244	LOG llevInfo, "[ABT] $_\n" for @bt;
3953	--$_log_backtrace;	4245	--$_log_backtrace;
3954	};	4246	};
3955	} else {	4247	} else {
3956	LOG llevInfo, "[ABT] $msg\n";	4248	LOG llevInfo, "[ABT] $msg\n";
3957	LOG llevInfo, "[ABT] [suppressed]\n";	4249	LOG llevInfo, "[ABT] [overload, suppressed]\n";
3958	}	4250	}
3959	}	4251	}
3960		4252
3961	# load additional modules	4253	# load additional modules
3962	require "cf/$_.pm" for @EXTRA_MODULES;	4254	require "cf/$_.pm" for @EXTRA_MODULES;
		4255	cf::_connect_to_perl_2;
3963		4256
3964	END { cf::emergency_save }	4257	END { cf::emergency_save }
3965		4258
3966	1	4259	1
3967		4260

Diff Legend

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