ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.475 by root, Tue Jul 21 06:17:00 2009 UTC vs.
Revision 1.553 by root, Tue May 18 21:30:16 2010 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 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;
95	our $DATADIR = datadir;	98	our $DATADIR = datadir;
96	our $LIBDIR = "$DATADIR/ext";	99	our $LIBDIR = "$DATADIR/ext";
97	our $PODDIR = "$DATADIR/pod";	100	our $PODDIR = "$DATADIR/pod";
…		…
103	our $RANDOMDIR = "$LOCALDIR/random";	106	our $RANDOMDIR = "$LOCALDIR/random";
104	our $BDBDIR = "$LOCALDIR/db";	107	our $BDBDIR = "$LOCALDIR/db";
105	our $PIDFILE = "$LOCALDIR/pid";	108	our $PIDFILE = "$LOCALDIR/pid";
106	our $RUNTIMEFILE = "$LOCALDIR/runtime";	109	our $RUNTIMEFILE = "$LOCALDIR/runtime";
107		110
108	our %RESOURCE;	111	our %RESOURCE; # unused
		112
		113	our $OUTPUT_RATE_MIN = 3000;
		114	our $OUTPUT_RATE_MAX = 1000000;
		115
		116	our $MAX_LINKS = 32; # how many chained exits to follow
		117	our $VERBOSE_IO = 1;
109		118
110	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	119	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
111	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	120	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
112	our $NEXT_TICK;	121	our $NEXT_TICK;
113	our $USE_FSYNC = 1; # use fsync to write maps - default on	122	our $USE_FSYNC = 1; # use fsync to write maps - default on
…		…
115	our $BDB_DEADLOCK_WATCHER;	124	our $BDB_DEADLOCK_WATCHER;
116	our $BDB_CHECKPOINT_WATCHER;	125	our $BDB_CHECKPOINT_WATCHER;
117	our $BDB_TRICKLE_WATCHER;	126	our $BDB_TRICKLE_WATCHER;
118	our $DB_ENV;	127	our $DB_ENV;
119		128
120	our @EXTRA_MODULES = qw(pod mapscript);	129	our @EXTRA_MODULES = qw(pod match mapscript incloader);
121		130
122	our %CFG;	131	our %CFG;
123		132
124	our $UPTIME; $UPTIME ||= time;	133	our $UPTIME; $UPTIME ||= time;
125	our $RUNTIME;	134	our $RUNTIME;
…		…
159		168
160	our $EMERGENCY_POSITION;	169	our $EMERGENCY_POSITION;
161		170
162	sub cf::map::normalise;	171	sub cf::map::normalise;
163		172
		173	sub in_main() {
		174	$Coro::current == $Coro::main
		175	}
		176
		177	#############################################################################
		178
		179	%REFLECT = ();
		180	for (@REFLECT) {
		181	my $reflect = JSON::XS::decode_json $_;
		182	$REFLECT{$reflect->{class}} = $reflect;
		183	}
		184
		185	# this is decidedly evil
		186	$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
		187
164	#############################################################################	188	#############################################################################
165		189
166	=head2 GLOBAL VARIABLES	190	=head2 GLOBAL VARIABLES
167		191
168	=over 4	192	=over 4
…		…
209	from wherever your confdir points to.	233	from wherever your confdir points to.
210		234
211	=item cf::wait_for_tick, cf::wait_for_tick_begin	235	=item cf::wait_for_tick, cf::wait_for_tick_begin
212		236
213	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	237	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	238	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.	239	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
216		240
		241	=cut
		242
		243	sub wait_for_tick();
		244	sub wait_for_tick_begin();
		245
217	=item @cf::INVOKE_RESULTS	246	=item @cf::INVOKE_RESULTS
218		247
219	This array contains the results of the last C<invoke ()> call. When	248	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	249	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
221	that call.	250	that call.
222		251
		252	=item %cf::REFLECT
		253
		254	Contains, for each (C++) class name, a hash reference with information
		255	about object members (methods, scalars, arrays and flags) and other
		256	metadata, which is useful for introspection.
		257
223	=back	258	=back
224		259
225	=cut	260	=cut
226		261
227	BEGIN {	262	sub error(@) { LOG llevError, join "", @_ }
228	*CORE::GLOBAL::warn = sub {	263	sub warn (@) { LOG llevWarn , join "", @_ }
		264	sub info (@) { LOG llevInfo , join "", @_ }
		265	sub debug(@) { LOG llevDebug, join "", @_ }
		266	sub trace(@) { LOG llevTrace, join "", @_ }
		267
		268	$Coro::State::WARNHOOK = sub {
229	my $msg = join "", @_;	269	my $msg = join "", @_;
230		270
231	$msg .= "\n"	271	$msg .= "\n"
232	unless $msg =~ /\n$/;	272	unless $msg =~ /\n$/;
233		273
234	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	274	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
235		275
236	LOG llevError, $msg;	276	LOG llevWarn, $msg;
237	};	277	};
238	}
239		278
240	$Coro::State::DIEHOOK = sub {	279	$Coro::State::DIEHOOK = sub {
241	return unless $^S eq 0; # "eq", not "=="	280	return unless $^S eq 0; # "eq", not "=="
242		281
243	if ($Coro::current == $Coro::main) {#d#	282	error Carp::longmess $_[0];
		283
		284	if (in_main) {#d#
244	warn "DIEHOOK called in main context, Coro bug?\n";#d#	285	error "DIEHOOK called in main context, Coro bug?\n";#d#
245	return;#d#	286	return;#d#
246	}#d#	287	}#d#
247		288
248	# kill coroutine otherwise	289	# kill coroutine otherwise
249	warn Carp::longmess $_[0];
250	Coro::terminate	290	Coro::terminate
251	};	291	};
252
253	$SIG{__DIE__} = sub { }; #d#?
254		292
255	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	293	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
256	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	294	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
257	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	295	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
258	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	296	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
…		…
272	)) {	310	)) {
273	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	311	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
274	}	312	}
275		313
276	$EV::DIED = sub {	314	$EV::DIED = sub {
277	warn "error in event callback: @_";	315	Carp::cluck "error in event callback: @_";
278	};	316	};
279		317
280	#############################################################################	318	#############################################################################
281		319
282	=head2 UTILITY FUNCTIONS	320	=head2 UTILITY FUNCTIONS
…		…
319	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	357	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
320		358
321	sub encode_json($) { $json_coder->encode ($_[0]) }	359	sub encode_json($) { $json_coder->encode ($_[0]) }
322	sub decode_json($) { $json_coder->decode ($_[0]) }	360	sub decode_json($) { $json_coder->decode ($_[0]) }
323		361
		362	=item $ref = cf::yaml_load $scalar
		363
		364	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
		365
		366	=cut
		367
		368	sub fork_call(&@);
		369
		370	sub yaml_load($) {
		371	fork_call { YAML::XS::Load $_[0] } @_
		372	}
		373
324	=item cf::post_init { BLOCK }	374	=item cf::post_init { BLOCK }
325		375
326	Execute the given codeblock, I<after> all extensions have been (re-)loaded,	376	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
327	but I<before> the server starts ticking again.	377	but I<before> the server starts ticking again.
328		378
329	The cdoeblock will have a single boolean argument to indicate whether this	379	The codeblock will have a single boolean argument to indicate whether this
330	is a reload or not.	380	is a reload or not.
331		381
332	=cut	382	=cut
333		383
334	sub post_init(&) {	384	sub post_init(&) {
335	push @POST_INIT, shift;	385	push @POST_INIT, shift;
		386	}
		387
		388	sub _post_init {
		389	trace "running post_init jobs";
		390
		391	# run them in parallel...
		392
		393	my @join;
		394
		395	while () {
		396	push @join, map &Coro::async ($_, 0), @POST_INIT;
		397	@POST_INIT = ();
		398
		399	@join or last;
		400
		401	(pop @join)->join;
		402	}
336	}	403	}
337		404
338	=item cf::lock_wait $string	405	=item cf::lock_wait $string
339		406
340	Wait until the given lock is available. See cf::lock_acquire.	407	Wait until the given lock is available. See cf::lock_acquire.
…		…
379	}	446	}
380		447
381	=item cf::periodic $interval, $cb	448	=item cf::periodic $interval, $cb
382		449
383	Like EV::periodic, but randomly selects a starting point so that the actions	450	Like EV::periodic, but randomly selects a starting point so that the actions
384	get spread over timer.	451	get spread over time.
385		452
386	=cut	453	=cut
387		454
388	sub periodic($$) {	455	sub periodic($$) {
389	my ($interval, $cb) = @_;	456	my ($interval, $cb) = @_;
…		…
406		473
407	=cut	474	=cut
408		475
409	our @SLOT_QUEUE;	476	our @SLOT_QUEUE;
410	our $SLOT_QUEUE;	477	our $SLOT_QUEUE;
		478	our $SLOT_DECAY = 0.9;
411		479
412	$SLOT_QUEUE->cancel if $SLOT_QUEUE;	480	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
413	$SLOT_QUEUE = Coro::async {	481	$SLOT_QUEUE = Coro::async {
414	$Coro::current->desc ("timeslot manager");	482	$Coro::current->desc ("timeslot manager");
415		483
416	my $signal = new Coro::Signal;	484	my $signal = new Coro::Signal;
		485	my $busy;
417		486
418	while () {	487	while () {
419	next_job:	488	next_job:
		489
420	my $avail = cf::till_tick;	490	my $avail = cf::till_tick;
421	if ($avail > 0.01) {	491
422	for (0 .. $#SLOT_QUEUE) {	492	for (0 .. $#SLOT_QUEUE) {
423	if ($SLOT_QUEUE[$_][0] < $avail) {	493	if ($SLOT_QUEUE[$_][0] <= $avail) {
		494	$busy = 0;
424	my $job = splice @SLOT_QUEUE, $_, 1, ();	495	my $job = splice @SLOT_QUEUE, $_, 1, ();
425	$job->[2]->send;	496	$job->[2]->send;
426	Coro::cede;	497	Coro::cede;
427	goto next_job;	498	goto next_job;
428	}	499	} else {
		500	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
429	}	501	}
430	}	502	}
431		503
432	if (@SLOT_QUEUE) {	504	if (@SLOT_QUEUE) {
433	# we do not use wait_for_tick() as it returns immediately when tick is inactive	505	# we do not use wait_for_tick() as it returns immediately when tick is inactive
434	push @cf::WAIT_FOR_TICK, $signal;	506	push @cf::WAIT_FOR_TICK, $signal;
435	$signal->wait;	507	$signal->wait;
436	} else {	508	} else {
		509	$busy = 0;
437	Coro::schedule;	510	Coro::schedule;
438	}	511	}
439	}	512	}
440	};	513	};
441		514
442	sub get_slot($;$$) {	515	sub get_slot($;$$) {
443	return if tick_inhibit || $Coro::current == $Coro::main;	516	return if tick_inhibit || $Coro::current == $Coro::main;
444		517
445	my ($time, $pri, $name) = @_;	518	my ($time, $pri, $name) = @_;
446		519
447	$time = $TICK * .6 if $time > $TICK * .6;	520	$time = clamp $time, 0.01, $TICK * .6;
		521
448	my $sig = new Coro::Signal;	522	my $sig = new Coro::Signal;
449		523
450	push @SLOT_QUEUE, [$time, $pri, $sig, $name];	524	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
451	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;	525	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
452	$SLOT_QUEUE->ready;	526	$SLOT_QUEUE->ready;
…		…
478	=cut	552	=cut
479		553
480	sub sync_job(&) {	554	sub sync_job(&) {
481	my ($job) = @_;	555	my ($job) = @_;
482		556
483	if ($Coro::current == $Coro::main) {	557	if (in_main) {
484	my $time = EV::time;	558	my $time = AE::time;
485		559
486	# this is the main coro, too bad, we have to block	560	# this is the main coro, too bad, we have to block
487	# till the operation succeeds, freezing the server :/	561	# till the operation succeeds, freezing the server :/
488		562
489	LOG llevError, Carp::longmess "sync job";#d#	563	#LOG llevError, Carp::longmess "sync job";#d#
490		564
491	my $freeze_guard = freeze_mainloop;	565	my $freeze_guard = freeze_mainloop;
492		566
493	my $busy = 1;	567	my $busy = 1;
494	my @res;	568	my @res;
495		569
496	(async {	570	(async {
497	$Coro::current->desc ("sync job coro");	571	$Coro::current->desc ("sync job coro");
498	@res = eval { $job->() };	572	@res = eval { $job->() };
499	warn $@ if $@;	573	error $@ if $@;
500	undef $busy;	574	undef $busy;
501	})->prio (Coro::PRIO_MAX);	575	})->prio (Coro::PRIO_MAX);
502		576
503	while ($busy) {	577	while ($busy) {
504	if (Coro::nready) {	578	if (Coro::nready) {
…		…
506	} else {	580	} else {
507	EV::loop EV::LOOP_ONESHOT;	581	EV::loop EV::LOOP_ONESHOT;
508	}	582	}
509	}	583	}
510		584
511	my $time = EV::time - $time;	585	my $time = AE::time - $time;
512		586
513	$TICK_START += $time; # do not account sync jobs to server load	587	$TICK_START += $time; # do not account sync jobs to server load
514		588
515	wantarray ? @res : $res[0]	589	wantarray ? @res : $res[0]
516	} else {	590	} else {
…		…
538	$EXT_CORO{$coro+0} = $coro;	612	$EXT_CORO{$coro+0} = $coro;
539		613
540	$coro	614	$coro
541	}	615	}
542		616
543	=item fork_call { }, $args	617	=item fork_call { }, @args
544		618
545	Executes the given code block with the given arguments in a seperate	619	Executes the given code block with the given arguments in a seperate
546	process, returning the results. Everything must be serialisable with	620	process, returning the results. Everything must be serialisable with
547	Coro::Storable. May, of course, block. Note that the executed sub may	621	Coro::Storable. May, of course, block. Note that the executed sub may
548	never block itself or use any form of event handling.	622	never block itself or use any form of event handling.
549		623
550	=cut	624	=cut
551		625
		626	sub post_fork {
		627	reset_signals;
		628	}
		629
552	sub fork_call(&@) {	630	sub fork_call(&@) {
553	my ($cb, @args) = @_;	631	my ($cb, @args) = @_;
554		632
555	# we seemingly have to make a local copy of the whole thing,	633	# we seemingly have to make a local copy of the whole thing,
556	# otherwise perl prematurely frees the stuff :/	634	# otherwise perl prematurely frees the stuff :/
557	# TODO: investigate and fix (likely this will be rather laborious)	635	# TODO: investigate and fix (likely this will be rather laborious)
558		636
559	my @res = Coro::Util::fork_eval {	637	my @res = Coro::Util::fork_eval {
560	reset_signals;	638	cf::post_fork;
561	&$cb	639	&$cb
562	}, @args;	640	} @args;
563		641
564	wantarray ? @res : $res[-1]	642	wantarray ? @res : $res[-1]
		643	}
		644
		645	sub objinfo {
		646	(
		647	"counter value" => cf::object::object_count,
		648	"objects created" => cf::object::create_count,
		649	"objects destroyed" => cf::object::destroy_count,
		650	"freelist size" => cf::object::free_count,
		651	"allocated objects" => cf::object::objects_size,
		652	"active objects" => cf::object::actives_size,
		653	)
565	}	654	}
566		655
567	=item $coin = coin_from_name $name	656	=item $coin = coin_from_name $name
568		657
569	=cut	658	=cut
…		…
606	within each server.	695	within each server.
607		696
608	=cut	697	=cut
609		698
610	sub db_table($) {	699	sub db_table($) {
		700	cf::error "db_get called from main context"
		701	if $Coro::current == $Coro::main;
		702
611	my ($name) = @_;	703	my ($name) = @_;
612	my $db = BDB::db_create $DB_ENV;	704	my $db = BDB::db_create $DB_ENV;
613		705
614	eval {	706	eval {
615	$db->set_flags (BDB::CHKSUM);	707	$db->set_flags (BDB::CHKSUM);
…		…
625	}	717	}
626		718
627	our $DB;	719	our $DB;
628		720
629	sub db_init {	721	sub db_init {
630	cf::sync_job {
631	$DB ||= db_table "db";	722	$DB ||= db_table "db";
632	};
633	}	723	}
634		724
635	sub db_get($$) {	725	sub db_get($$) {
636	my $key = "$_[0]/$_[1]";	726	my $key = "$_[0]/$_[1]";
637		727
638	cf::sync_job {	728	cf::error "db_get called from main context"
		729	if $Coro::current == $Coro::main;
		730
639	BDB::db_get $DB, undef, $key, my $data;	731	BDB::db_get $DB, undef, $key, my $data;
640		732
641	$! ? ()	733	$! ? ()
642	: $data	734	: $data
643	}
644	}	735	}
645		736
646	sub db_put($$$) {	737	sub db_put($$$) {
647	BDB::dbreq_pri 4;	738	BDB::dbreq_pri 4;
648	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	739	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
704		795
705	my $t1 = Time::HiRes::time;	796	my $t1 = Time::HiRes::time;
706	my $data = $process->(\@data);	797	my $data = $process->(\@data);
707	my $t2 = Time::HiRes::time;	798	my $t2 = Time::HiRes::time;
708		799
709	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	800	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
710		801
711	db_put cache => "$id/data", $data;	802	db_put cache => "$id/data", $data;
712	db_put cache => "$id/md5" , $md5;	803	db_put cache => "$id/md5" , $md5;
713	db_put cache => "$id/meta", $meta;	804	db_put cache => "$id/meta", $meta;
714		805
…		…
724		815
725	=cut	816	=cut
726		817
727	sub datalog($@) {	818	sub datalog($@) {
728	my ($type, %kv) = @_;	819	my ($type, %kv) = @_;
729	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	820	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
730	}	821	}
731		822
732	=back	823	=back
733		824
734	=cut	825	=cut
…		…
929		1020
930	} elsif (exists $cb_id{$type}) {	1021	} elsif (exists $cb_id{$type}) {
931	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	1022	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
932		1023
933	} elsif (ref $type) {	1024	} elsif (ref $type) {
934	warn "attaching objects not supported, ignoring.\n";	1025	error "attaching objects not supported, ignoring.\n";
935		1026
936	} else {	1027	} else {
937	shift @arg;	1028	shift @arg;
938	warn "attach argument '$type' not supported, ignoring.\n";	1029	error "attach argument '$type' not supported, ignoring.\n";
939	}	1030	}
940	}	1031	}
941	}	1032	}
942		1033
943	sub _object_attach {	1034	sub _object_attach {
…		…
953	_attach $registry, $klass, @attach;	1044	_attach $registry, $klass, @attach;
954	}	1045	}
955		1046
956	$obj->{$name} = \%arg;	1047	$obj->{$name} = \%arg;
957	} else {	1048	} else {
958	warn "object uses attachment '$name' which is not available, postponing.\n";	1049	info "object uses attachment '$name' which is not available, postponing.\n";
959	}	1050	}
960		1051
961	$obj->{_attachment}{$name} = undef;	1052	$obj->{_attachment}{$name} = undef;
962	}	1053	}
963		1054
…		…
1022		1113
1023	for (@$callbacks) {	1114	for (@$callbacks) {
1024	eval { &{$_->[1]} };	1115	eval { &{$_->[1]} };
1025		1116
1026	if ($@) {	1117	if ($@) {
1027	warn "$@";
1028	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1118	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1029	override;	1119	override;
1030	}	1120	}
1031		1121
1032	return 1 if $override;	1122	return 1 if $override;
1033	}	1123	}
…		…
1112	for (@$attach) {	1202	for (@$attach) {
1113	my ($klass, @attach) = @$_;	1203	my ($klass, @attach) = @$_;
1114	_attach $registry, $klass, @attach;	1204	_attach $registry, $klass, @attach;
1115	}	1205	}
1116	} else {	1206	} else {
1117	warn "object uses attachment '$name' that is not available, postponing.\n";	1207	info "object uses attachment '$name' that is not available, postponing.\n";
1118	}	1208	}
1119	}	1209	}
1120	}	1210	}
1121		1211
1122	cf::attachable->attach (	1212	cf::attachable->attach (
…		…
1149	my ($filename, $rdata, $objs) = @_;	1239	my ($filename, $rdata, $objs) = @_;
1150		1240
1151	sync_job {	1241	sync_job {
1152	if (length $$rdata) {	1242	if (length $$rdata) {
1153	utf8::decode (my $decname = $filename);	1243	utf8::decode (my $decname = $filename);
1154	warn sprintf "saving %s (%d,%d)\n",	1244	trace sprintf "saving %s (%d,%d)\n",
1155	$decname, length $$rdata, scalar @$objs;	1245	$decname, length $$rdata, scalar @$objs
		1246	if $VERBOSE_IO;
1156		1247
1157	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1248	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1158	aio_chmod $fh, SAVE_MODE;	1249	aio_chmod $fh, SAVE_MODE;
1159	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1250	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1160	if ($cf::USE_FSYNC) {	1251	if ($cf::USE_FSYNC) {
…		…
1182	aio_rename "$filename~", $filename;	1273	aio_rename "$filename~", $filename;
1183		1274
1184	$filename =~ s%/[^/]+$%%;	1275	$filename =~ s%/[^/]+$%%;
1185	aio_pathsync $filename if $cf::USE_FSYNC;	1276	aio_pathsync $filename if $cf::USE_FSYNC;
1186	} else {	1277	} else {
1187	warn "unable to save objects: $filename~: $!\n";	1278	error "unable to save objects: $filename~: $!\n";
1188	}	1279	}
1189	} else {	1280	} else {
1190	aio_unlink $filename;	1281	aio_unlink $filename;
1191	aio_unlink "$filename.pst";	1282	aio_unlink "$filename.pst";
1192	}	1283	}
…		…
1216	my $st = eval { Coro::Storable::thaw $av };	1307	my $st = eval { Coro::Storable::thaw $av };
1217	$av = $st->{objs};	1308	$av = $st->{objs};
1218	}	1309	}
1219		1310
1220	utf8::decode (my $decname = $filename);	1311	utf8::decode (my $decname = $filename);
1221	warn sprintf "loading %s (%d,%d)\n",	1312	trace sprintf "loading %s (%d,%d)\n",
1222	$decname, length $data, scalar @{$av || []};	1313	$decname, length $data, scalar @{$av || []}
		1314	if $VERBOSE_IO;
1223		1315
1224	($data, $av)	1316	($data, $av)
1225	}	1317	}
1226		1318
1227	=head2 COMMAND CALLBACKS	1319	=head2 COMMAND CALLBACKS
…		…
1286	}	1378	}
1287		1379
1288	use File::Glob ();	1380	use File::Glob ();
1289		1381
1290	cf::player->attach (	1382	cf::player->attach (
1291	on_command => sub {	1383	on_unknown_command => sub {
1292	my ($pl, $name, $params) = @_;	1384	my ($pl, $name, $params) = @_;
1293		1385
1294	my $cb = $COMMAND{$name}	1386	my $cb = $COMMAND{$name}
1295	or return;	1387	or return;
1296		1388
…		…
1319		1411
1320	$pl->ext_reply ($reply, @reply)	1412	$pl->ext_reply ($reply, @reply)
1321	if $reply;	1413	if $reply;
1322		1414
1323	} else {	1415	} else {
1324	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1416	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1325	}	1417	}
1326		1418
1327	cf::override;	1419	cf::override;
1328	},	1420	},
1329	);	1421	);
…		…
1340		1432
1341	$grp	1433	$grp
1342	}	1434	}
1343		1435
1344	sub load_extensions {	1436	sub load_extensions {
		1437	info "loading extensions...";
		1438
1345	cf::sync_job {	1439	cf::sync_job {
1346	my %todo;	1440	my %todo;
1347		1441
1348	for my $path (<$LIBDIR/*.ext>) {	1442	for my $path (<$LIBDIR/*.ext>) {
1349	next unless -r $path;	1443	next unless -r $path;
…		…
1367		1461
1368	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1462	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1369	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1463	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1370		1464
1371	$ext{source} =	1465	$ext{source} =
1372	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1466	"package $pkg; use common::sense;\n"
1373	. "#line 1 \"$path\"\n{\n"	1467	. "#line 1 \"$path\"\n{\n"
1374	. $source	1468	. $source
1375	. "\n};\n1";	1469	. "\n};\n1";
1376		1470
1377	$todo{$base} = \%ext;	1471	$todo{$base} = \%ext;
1378	}	1472	}
1379		1473
		1474	my $pass = 0;
1380	my %done;	1475	my %done;
1381	while (%todo) {	1476	while (%todo) {
1382	my $progress;	1477	my $progress;
1383		1478
		1479	++$pass;
		1480
		1481	ext:
1384	while (my ($k, $v) = each %todo) {	1482	while (my ($k, $v) = each %todo) {
1385	for (split /,\s*/, $v->{meta}{depends}) {	1483	for (split /,\s*/, $v->{meta}{depends}) {
1386	goto skip	1484	next ext
1387	unless exists $done{$_};	1485	unless exists $done{$_};
1388	}	1486	}
1389		1487
1390	warn "... loading '$k' into '$v->{pkg}'\n";	1488	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1391		1489
1392	unless (eval $v->{source}) {	1490	my $active = eval $v->{source};
		1491
		1492	if (length $@) {
1393	my $msg = $@ ? "$v->{path}: $@\n"	1493	error "$v->{path}: $@\n";
1394	: "$v->{base}: extension inactive.\n";
1395		1494
1396	if (exists $v->{meta}{mandatory}) {
1397	warn $msg;
1398	cf::cleanup "mandatory extension failed to load, exiting.";	1495	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1399	}	1496	if exists $v->{meta}{mandatory};
1400		1497
1401	warn $msg;	1498	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
		1499	delete $todo{$k};
		1500	} else {
		1501	$done{$k} = delete $todo{$k};
		1502	push @EXTS, $v->{pkg};
		1503	$progress = 1;
		1504
		1505	info "$v->{base}: extension inactive.\n"
		1506	unless $active;
1402	}	1507	}
1403
1404	$done{$k} = delete $todo{$k};
1405	push @EXTS, $v->{pkg};
1406	$progress = 1;
1407	}	1508	}
1408		1509
1409	skip:	1510	unless ($progress) {
1410	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"	1511	warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1411	unless $progress;	1512
		1513	while (my ($k, $v) = each %todo) {
		1514	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
		1515	if exists $v->{meta}{mandatory};
		1516	}
		1517	}
1412	}	1518	}
1413	};	1519	};
1414	}	1520	}
1415		1521
1416	#############################################################################	1522	#############################################################################
…		…
1500	$cf::PLAYER{$login} = $pl	1606	$cf::PLAYER{$login} = $pl
1501	}	1607	}
1502	}	1608	}
1503	}	1609	}
1504		1610
		1611	cf::player->attach (
		1612	on_load => sub {
		1613	my ($pl, $path) = @_;
		1614
		1615	# restore slots saved in save, below
		1616	my $slots = delete $pl->{_slots};
		1617
		1618	$pl->ob->current_weapon ($slots->[0]);
		1619	$pl->combat_ob ($slots->[1]);
		1620	$pl->ranged_ob ($slots->[2]);
		1621	},
		1622	);
		1623
1505	sub save($) {	1624	sub save($) {
1506	my ($pl) = @_;	1625	my ($pl) = @_;
1507		1626
1508	return if $pl->{deny_save};	1627	return if $pl->{deny_save};
1509		1628
…		…
1514		1633
1515	aio_mkdir playerdir $pl, 0770;	1634	aio_mkdir playerdir $pl, 0770;
1516	$pl->{last_save} = $cf::RUNTIME;	1635	$pl->{last_save} = $cf::RUNTIME;
1517		1636
1518	cf::get_slot 0.01;	1637	cf::get_slot 0.01;
		1638
		1639	# save slots, to be restored later
		1640	local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1519		1641
1520	$pl->save_pl ($path);	1642	$pl->save_pl ($path);
1521	cf::cede_to_tick;	1643	cf::cede_to_tick;
1522	}	1644	}
1523		1645
…		…
1557	my $name = $pl->ob->name;	1679	my $name = $pl->ob->name;
1558		1680
1559	$pl->{deny_save} = 1;	1681	$pl->{deny_save} = 1;
1560	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1682	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1561		1683
1562	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1684	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1563	$pl->deactivate;	1685	$pl->deactivate;
		1686
1564	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1687	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1565	$pl->ob->check_score;
1566	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1688	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1689	ext::highscore::check ($pl->ob);
		1690
1567	$pl->ns->destroy if $pl->ns;	1691	$pl->ns->destroy if $pl->ns;
1568		1692
1569	my $path = playerdir $pl;	1693	my $path = playerdir $pl;
1570	my $temp = "$path~$cf::RUNTIME~deleting~";	1694	my $temp = "$path~$cf::RUNTIME~deleting~";
1571	aio_rename $path, $temp;	1695	aio_rename $path, $temp;
…		…
1625	\@logins	1749	\@logins
1626	}	1750	}
1627		1751
1628	=item $player->maps	1752	=item $player->maps
1629		1753
		1754	=item cf::player::maps $login
		1755
1630	Returns an arrayref of map paths that are private for this	1756	Returns an arrayref of map paths that are private for this
1631	player. May block.	1757	player. May block.
1632		1758
1633	=cut	1759	=cut
1634		1760
…		…
1696	=cut	1822	=cut
1697		1823
1698	sub find_by_path($) {	1824	sub find_by_path($) {
1699	my ($path) = @_;	1825	my ($path) = @_;
1700		1826
		1827	$path =~ s/^~[^\/]*//; # skip ~login
		1828
1701	my ($match, $specificity);	1829	my ($match, $specificity);
1702		1830
1703	for my $region (list) {	1831	for my $region (list) {
1704	if ($region->{match} && $path =~ $region->{match}) {	1832	if ($region->{match} && $path =~ $region->{match}) {
1705	($match, $specificity) = ($region, $region->specificity)	1833	($match, $specificity) = ($region, $region->specificity)
…		…
1736	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	1864	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1737		1865
1738	# mit "rum" bekleckern, nicht	1866	# mit "rum" bekleckern, nicht
1739	$self->_create_random_map (	1867	$self->_create_random_map (
1740	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},	1868	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1741	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},	1869	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1742	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},	1870	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1743	$rmp->{exit_on_final_map},	1871	$rmp->{exit_on_final_map},
1744	$rmp->{xsize}, $rmp->{ysize},	1872	$rmp->{xsize}, $rmp->{ysize},
1745	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},	1873	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1746	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},	1874	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
…		…
1761		1889
1762	sub register {	1890	sub register {
1763	my (undef, $regex, $prio) = @_;	1891	my (undef, $regex, $prio) = @_;
1764	my $pkg = caller;	1892	my $pkg = caller;
1765		1893
1766	no strict;
1767	push @{"$pkg\::ISA"}, __PACKAGE__;	1894	push @{"$pkg\::ISA"}, __PACKAGE__;
1768		1895
1769	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	1896	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1770	}	1897	}
1771		1898
1772	# also paths starting with '/'	1899	# also paths starting with '/'
1773	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	1900	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1774		1901
1775	sub thawer_merge {	1902	sub thawer_merge {
1776	my ($self, $merge) = @_;	1903	my ($self, $merge) = @_;
1777		1904
1778	# we have to keep some variables in memory intact	1905	# we have to keep some variables in memory intact
…		…
1783	}	1910	}
1784		1911
1785	sub normalise {	1912	sub normalise {
1786	my ($path, $base) = @_;	1913	my ($path, $base) = @_;
1787		1914
1788	$path = "$path"; # make sure its a string	1915	$path = "$path"; # make sure it's a string
1789		1916
1790	$path =~ s/\.map$//;	1917	$path =~ s/\.map$//;
1791		1918
1792	# map plan:	1919	# map plan:
1793	#	1920	#
…		…
1808	$base =~ s{[^/]+/?$}{};	1935	$base =~ s{[^/]+/?$}{};
1809	$path = "$base/$path";	1936	$path = "$base/$path";
1810	}	1937	}
1811		1938
1812	for ($path) {	1939	for ($path) {
1813	redo if s{//}{/};
1814	redo if s{/\.?/}{/};	1940	redo if s{/\.?/}{/};
1815	redo if s{/[^/]+/\.\./}{/};	1941	redo if s{/[^/]+/\.\./}{/};
1816	}	1942	}
1817		1943
1818	$path	1944	$path
…		…
1832	$self->init; # pass $1 etc.	1958	$self->init; # pass $1 etc.
1833	return $self;	1959	return $self;
1834	}	1960	}
1835	}	1961	}
1836		1962
1837	Carp::cluck "unable to resolve path '$path' (base '$base').";	1963	Carp::cluck "unable to resolve path '$path' (base '$base')";
1838	()	1964	()
1839	}	1965	}
1840		1966
1841	sub init {	1967	sub init {
1842	my ($self) = @_;	1968	my ($self) = @_;
…		…
1964	}	2090	}
1965		2091
1966	sub find;	2092	sub find;
1967	sub find {	2093	sub find {
1968	my ($path, $origin) = @_;	2094	my ($path, $origin) = @_;
		2095
		2096	cf::cede_to_tick;
1969		2097
1970	$path = normalise $path, $origin && $origin->path;	2098	$path = normalise $path, $origin && $origin->path;
1971		2099
1972	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2100	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973	my $guard2 = cf::lock_acquire "map_find:$path";	2101	my $guard2 = cf::lock_acquire "map_find:$path";
…		…
1992		2120
1993	$cf::MAP{$path} = $map	2121	$cf::MAP{$path} = $map
1994	}	2122	}
1995	}	2123	}
1996		2124
1997	sub pre_load { }	2125	sub pre_load { }
1998	sub post_load { }	2126	#sub post_load { } # XS
1999		2127
2000	sub load {	2128	sub load {
2001	my ($self) = @_;	2129	my ($self) = @_;
2002		2130
2003	local $self->{deny_reset} = 1; # loading can take a long time	2131	local $self->{deny_reset} = 1; # loading can take a long time
…		…
2058		2186
2059	$self->in_memory (cf::MAP_ACTIVE);	2187	$self->in_memory (cf::MAP_ACTIVE);
2060	}	2188	}
2061		2189
2062	$self->post_load;	2190	$self->post_load;
2063	}
2064		2191
		2192	1
		2193	}
		2194
		2195	# customize the map for a given player, i.e.
		2196	# return the _real_ map. used by e.g. per-player
		2197	# maps to change the path to ~playername/mappath
2065	sub customise_for {	2198	sub customise_for {
2066	my ($self, $ob) = @_;	2199	my ($self, $ob) = @_;
2067		2200
2068	return find "~" . $ob->name . "/" . $self->{path}	2201	return find "~" . $ob->name . "/" . $self->{path}
2069	if $self->per_player;	2202	if $self->per_player;
…		…
2085	or next;	2218	or next;
2086	$neigh = find $neigh, $map	2219	$neigh = find $neigh, $map
2087	or next;	2220	or next;
2088	$neigh->load;	2221	$neigh->load;
2089		2222
		2223	# now find the diagonal neighbours
2090	push @neigh,	2224	push @neigh,
2091	[$neigh->tile_path (($_ + 3) % 4), $neigh],	2225	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2092	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2226	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2093	}	2227	}
2094		2228
…		…
2101	}	2235	}
2102		2236
2103	sub find_sync {	2237	sub find_sync {
2104	my ($path, $origin) = @_;	2238	my ($path, $origin) = @_;
2105		2239
2106	cf::sync_job { find $path, $origin }	2240	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
		2241	if $Coro::current == $Coro::main;
		2242
		2243	find $path, $origin
2107	}	2244	}
2108		2245
2109	sub do_load_sync {	2246	sub do_load_sync {
2110	my ($map) = @_;	2247	my ($map) = @_;
2111		2248
2112	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2249	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2113	if $Coro::current == $Coro::main;	2250	if $Coro::current == $Coro::main;
2114		2251
2115	cf::sync_job { $map->load };	2252	$map->load;
2116	}	2253	}
2117		2254
2118	our %MAP_PREFETCH;	2255	our %MAP_PREFETCH;
2119	our $MAP_PREFETCHER = undef;	2256	our $MAP_PREFETCHER = undef;
2120		2257
…		…
2146	$MAP_PREFETCHER->prio (6);	2283	$MAP_PREFETCHER->prio (6);
2147		2284
2148	()	2285	()
2149	}	2286	}
2150		2287
		2288	# common code, used by both ->save and ->swapout
2151	sub save {	2289	sub _save {
2152	my ($self) = @_;	2290	my ($self) = @_;
2153
2154	my $lock = cf::lock_acquire "map_data:$self->{path}";
2155		2291
2156	$self->{last_save} = $cf::RUNTIME;	2292	$self->{last_save} = $cf::RUNTIME;
2157		2293
2158	return unless $self->dirty;	2294	return unless $self->dirty;
2159		2295
…		…
2179	} else {	2315	} else {
2180	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);	2316	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2181	}	2317	}
2182	}	2318	}
2183		2319
		2320	sub save {
		2321	my ($self) = @_;
		2322
		2323	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2324
		2325	$self->_save;
		2326	}
		2327
2184	sub swap_out {	2328	sub swap_out {
2185	my ($self) = @_;	2329	my ($self) = @_;
2186		2330
2187	# save first because save cedes
2188	$self->save;
2189
2190	my $lock = cf::lock_acquire "map_data:$self->{path}";	2331	my $lock = cf::lock_acquire "map_data:$self->{path}";
2191		2332
2192	return if $self->players;
2193	return if $self->in_memory != cf::MAP_ACTIVE;	2333	return if $self->in_memory != cf::MAP_ACTIVE;
2194	return if $self->{deny_save};	2334	return if $self->{deny_save};
		2335	return if $self->players;
2195		2336
		2337	# first deactivate the map and "unlink" it from the core
		2338	$self->deactivate;
		2339	$_->clear_links_to ($self) for values %cf::MAP;
2196	$self->in_memory (cf::MAP_SWAPPED);	2340	$self->in_memory (cf::MAP_SWAPPED);
		2341
		2342	# then atomically save
		2343	$self->_save;
		2344
		2345	# then free the map
		2346	$self->clear;
		2347	}
		2348
		2349	sub reset_at {
		2350	my ($self) = @_;
		2351
		2352	# TODO: safety, remove and allow resettable per-player maps
		2353	return 1e99 if $self->{deny_reset};
		2354
		2355	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
		2356	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
		2357
		2358	$time + $to
		2359	}
		2360
		2361	sub should_reset {
		2362	my ($self) = @_;
		2363
		2364	$self->reset_at <= $cf::RUNTIME
		2365	}
		2366
		2367	sub reset {
		2368	my ($self) = @_;
		2369
		2370	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2371
		2372	return if $self->players;
		2373
		2374	cf::trace "resetting map ", $self->path, "\n";
		2375
		2376	$self->in_memory (cf::MAP_SWAPPED);
		2377
		2378	# need to save uniques path
		2379	unless ($self->{deny_save}) {
		2380	my $uniq = $self->uniq_path; utf8::encode $uniq;
		2381
		2382	$self->_save_objects ($uniq, cf::IO_UNIQUES)
		2383	if $uniq;
		2384	}
		2385
		2386	delete $cf::MAP{$self->path};
2197		2387
2198	$self->deactivate;	2388	$self->deactivate;
2199	$_->clear_links_to ($self) for values %cf::MAP;	2389	$_->clear_links_to ($self) for values %cf::MAP;
2200	$self->clear;	2390	$self->clear;
2201	}
2202
2203	sub reset_at {
2204	my ($self) = @_;
2205
2206	# TODO: safety, remove and allow resettable per-player maps
2207	return 1e99 if $self->{deny_reset};
2208
2209	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2210	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2211
2212	$time + $to
2213	}
2214
2215	sub should_reset {
2216	my ($self) = @_;
2217
2218	$self->reset_at <= $cf::RUNTIME
2219	}
2220
2221	sub reset {
2222	my ($self) = @_;
2223
2224	my $lock = cf::lock_acquire "map_data:$self->{path}";
2225
2226	return if $self->players;
2227
2228	warn "resetting map ", $self->path;
2229
2230	$self->in_memory (cf::MAP_SWAPPED);
2231
2232	# need to save uniques path
2233	unless ($self->{deny_save}) {
2234	my $uniq = $self->uniq_path; utf8::encode $uniq;
2235
2236	$self->_save_objects ($uniq, cf::IO_UNIQUES)
2237	if $uniq;
2238	}
2239
2240	delete $cf::MAP{$self->path};
2241
2242	$self->deactivate;
2243	$_->clear_links_to ($self) for values %cf::MAP;
2244	$self->clear;
2245		2391
2246	$self->unlink_save;	2392	$self->unlink_save;
2247	$self->destroy;	2393	$self->destroy;
2248	}	2394	}
2249		2395
…		…
2257		2403
2258	delete $cf::MAP{$self->path};	2404	delete $cf::MAP{$self->path};
2259		2405
2260	$self->unlink_save;	2406	$self->unlink_save;
2261		2407
2262	bless $self, "cf::map";	2408	bless $self, "cf::map::wrap";
2263	delete $self->{deny_reset};	2409	delete $self->{deny_reset};
2264	$self->{deny_save} = 1;	2410	$self->{deny_save} = 1;
2265	$self->reset_timeout (1);	2411	$self->reset_timeout (1);
2266	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2412	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2267		2413
…		…
2324	: normalise $_	2470	: normalise $_
2325	} @{ aio_readdir $UNIQUEDIR or [] }	2471	} @{ aio_readdir $UNIQUEDIR or [] }
2326	]	2472	]
2327	}	2473	}
2328		2474
		2475	=item cf::map::static_maps
		2476
		2477	Returns an arrayref if paths of all static maps (all preinstalled F<.map>
		2478	file in the shared directory excluding F</styles> and F</editor>). May
		2479	block.
		2480
		2481	=cut
		2482
		2483	sub static_maps() {
		2484	my @dirs = "";
		2485	my @maps;
		2486
		2487	while (@dirs) {
		2488	my $dir = shift @dirs;
		2489
		2490	next if $dir eq "/styles" || $dir eq "/editor";
		2491
		2492	my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
		2493	or return;
		2494
		2495	for (@$files) {
		2496	s/\.map$// or next;
		2497	utf8::decode $_;
		2498	push @maps, "$dir/$_";
		2499	}
		2500
		2501	push @dirs, map "$dir/$_", @$dirs;
		2502	}
		2503
		2504	\@maps
		2505	}
		2506
2329	=back	2507	=back
2330		2508
2331	=head3 cf::object	2509	=head3 cf::object
2332		2510
2333	=cut	2511	=cut
…		…
2465		2643
2466	Freezes the player and moves him/her to a special map (C<{link}>).	2644	Freezes the player and moves him/her to a special map (C<{link}>).
2467		2645
2468	The player should be reasonably safe there for short amounts of time (e.g.	2646	The player should be reasonably safe there for short amounts of time (e.g.
2469	for loading a map). You I<MUST> call C<leave_link> as soon as possible,	2647	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2470	though, as the palyer cannot control the character while it is on the link	2648	though, as the player cannot control the character while it is on the link
2471	map.	2649	map.
2472		2650
2473	Will never block.	2651	Will never block.
2474		2652
2475	=item $player_object->leave_link ($map, $x, $y)	2653	=item $player_object->leave_link ($map, $x, $y)
…		…
2496	sub cf::object::player::enter_link {	2674	sub cf::object::player::enter_link {
2497	my ($self) = @_;	2675	my ($self) = @_;
2498		2676
2499	$self->deactivate_recursive;	2677	$self->deactivate_recursive;
2500		2678
		2679	++$self->{_link_recursion};
		2680
2501	return if UNIVERSAL::isa $self->map, "ext::map_link";	2681	return if UNIVERSAL::isa $self->map, "ext::map_link";
2502		2682
2503	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2683	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2504	if $self->map && $self->map->{path} ne "{link}";	2684	if $self->map && $self->map->{path} ne "{link}";
2505		2685
2506	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2686	$self->enter_map ($LINK_MAP || link_map, 3, 3);
2507	}	2687	}
2508		2688
2509	sub cf::object::player::leave_link {	2689	sub cf::object::player::leave_link {
2510	my ($self, $map, $x, $y) = @_;	2690	my ($self, $map, $x, $y) = @_;
2511		2691
…		…
2528	($x, $y) = (-1, -1)	2708	($x, $y) = (-1, -1)
2529	unless (defined $x) && (defined $y);	2709	unless (defined $x) && (defined $y);
2530		2710
2531	# use -1 or undef as default coordinates, not 0, 0	2711	# use -1 or undef as default coordinates, not 0, 0
2532	($x, $y) = ($map->enter_x, $map->enter_y)	2712	($x, $y) = ($map->enter_x, $map->enter_y)
2533	if $x <=0 && $y <= 0;	2713	if $x <= 0 && $y <= 0;
2534		2714
2535	$map->load;	2715	$map->load;
2536	$map->load_neighbours;	2716	$map->load_neighbours;
2537		2717
2538	return unless $self->contr->active;	2718	return unless $self->contr->active;
2539	$self->flag (cf::FLAG_DEBUG, 0);#d# temp
2540	$self->activate_recursive;
2541		2719
2542	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2720	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2543	$self->enter_map ($map, $x, $y);	2721	if ($self->enter_map ($map, $x, $y)) {
2544	}	2722	# entering was successful
		2723	delete $self->{_link_recursion};
		2724	# only activate afterwards, to support waiting in hooks
		2725	$self->activate_recursive;
		2726	}
2545		2727
		2728	}
		2729
2546	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2730	=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2547		2731
2548	Moves the player to the given map-path and coordinates by first freezing	2732	Moves the player to the given map-path and coordinates by first freezing
2549	her, loading and preparing them map, calling the provided $check callback	2733	her, loading and preparing them map, calling the provided $check callback
2550	that has to return the map if sucecssful, and then unfreezes the player on	2734	that has to return the map if sucecssful, and then unfreezes the player on
2551	the new (success) or old (failed) map position. In either case, $done will	2735	the new (success) or old (failed) map position. In either case, $done will
…		…
2558		2742
2559	our $GOTOGEN;	2743	our $GOTOGEN;
2560		2744
2561	sub cf::object::player::goto {	2745	sub cf::object::player::goto {
2562	my ($self, $path, $x, $y, $check, $done) = @_;	2746	my ($self, $path, $x, $y, $check, $done) = @_;
		2747
		2748	if ($self->{_link_recursion} >= $MAX_LINKS) {
		2749	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
		2750	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
		2751	($path, $x, $y) = @$EMERGENCY_POSITION;
		2752	}
2563		2753
2564	# do generation counting so two concurrent goto's will be executed in-order	2754	# do generation counting so two concurrent goto's will be executed in-order
2565	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2755	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2566		2756
2567	$self->enter_link;	2757	$self->enter_link;
…		…
2591	my $map = eval {	2781	my $map = eval {
2592	my $map = defined $path ? cf::map::find $path : undef;	2782	my $map = defined $path ? cf::map::find $path : undef;
2593		2783
2594	if ($map) {	2784	if ($map) {
2595	$map = $map->customise_for ($self);	2785	$map = $map->customise_for ($self);
2596	$map = $check->($map) if $check && $map;	2786	$map = $check->($map, $x, $y, $self) if $check && $map;
2597	} else {	2787	} else {
2598	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);	2788	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2599	}	2789	}
2600		2790
2601	$map	2791	$map
…		…
2609	if ($gen == $self->{_goto_generation}) {	2799	if ($gen == $self->{_goto_generation}) {
2610	delete $self->{_goto_generation};	2800	delete $self->{_goto_generation};
2611	$self->leave_link ($map, $x, $y);	2801	$self->leave_link ($map, $x, $y);
2612	}	2802	}
2613		2803
2614	$done->() if $done;	2804	$done->($self) if $done;
2615	})->prio (1);	2805	})->prio (1);
2616	}	2806	}
2617		2807
2618	=item $player_object->enter_exit ($exit_object)	2808	=item $player_object->enter_exit ($exit_object)
2619		2809
…		…
2712	$self->message ("Something went wrong deep within the deliantra server. "	2902	$self->message ("Something went wrong deep within the deliantra server. "
2713	. "I'll try to bring you back to the map you were before. "	2903	. "I'll try to bring you back to the map you were before. "
2714	. "Please report this to the dungeon master!",	2904	. "Please report this to the dungeon master!",
2715	cf::NDI_UNIQUE | cf::NDI_RED);	2905	cf::NDI_UNIQUE | cf::NDI_RED);
2716		2906
2717	warn "ERROR in enter_exit: $@";	2907	error "ERROR in enter_exit: $@";
2718	$self->leave_link;	2908	$self->leave_link;
2719	}	2909	}
2720	})->prio (1);	2910	})->prio (1);
2721	}	2911	}
2722		2912
…		…
2734	sub cf::client::send_drawinfo {	2924	sub cf::client::send_drawinfo {
2735	my ($self, $text, $flags) = @_;	2925	my ($self, $text, $flags) = @_;
2736		2926
2737	utf8::encode $text;	2927	utf8::encode $text;
2738	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2928	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
		2929	}
		2930
		2931	=item $client->send_big_packet ($pkt)
		2932
		2933	Like C<send_packet>, but tries to compress large packets, and fragments
		2934	them as required.
		2935
		2936	=cut
		2937
		2938	our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
		2939
		2940	sub cf::client::send_big_packet {
		2941	my ($self, $pkt) = @_;
		2942
		2943	# try lzf for large packets
		2944	$pkt = "lzf " . Compress::LZF::compress $pkt
		2945	if 1024 <= length $pkt and $self->{can_lzf};
		2946
		2947	# split very large packets
		2948	if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
		2949	$self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
		2950	$pkt = "frag";
		2951	}
		2952
		2953	$self->send_packet ($pkt);
2739	}	2954	}
2740		2955
2741	=item $client->send_msg ($channel, $msg, $color, [extra...])	2956	=item $client->send_msg ($channel, $msg, $color, [extra...])
2742		2957
2743	Send a drawinfo or msg packet to the client, formatting the msg for the	2958	Send a drawinfo or msg packet to the client, formatting the msg for the
…		…
2747		2962
2748	=cut	2963	=cut
2749		2964
2750	# non-persistent channels (usually the info channel)	2965	# non-persistent channels (usually the info channel)
2751	our %CHANNEL = (	2966	our %CHANNEL = (
		2967	"c/motd" => {
		2968	id => "infobox",
		2969	title => "MOTD",
		2970	reply => undef,
		2971	tooltip => "The message of the day",
		2972	},
2752	"c/identify" => {	2973	"c/identify" => {
2753	id => "infobox",	2974	id => "infobox",
2754	title => "Identify",	2975	title => "Identify",
2755	reply => undef,	2976	reply => undef,
2756	tooltip => "Items recently identified",	2977	tooltip => "Items recently identified",
…		…
2758	"c/examine" => {	2979	"c/examine" => {
2759	id => "infobox",	2980	id => "infobox",
2760	title => "Examine",	2981	title => "Examine",
2761	reply => undef,	2982	reply => undef,
2762	tooltip => "Signs and other items you examined",	2983	tooltip => "Signs and other items you examined",
		2984	},
		2985	"c/shopinfo" => {
		2986	id => "infobox",
		2987	title => "Shop Info",
		2988	reply => undef,
		2989	tooltip => "What your bargaining skill tells you about the shop",
2763	},	2990	},
2764	"c/book" => {	2991	"c/book" => {
2765	id => "infobox",	2992	id => "infobox",
2766	title => "Book",	2993	title => "Book",
2767	reply => undef,	2994	reply => undef,
…		…
2883	my $pkt = "msg "	3110	my $pkt = "msg "
2884	. $self->{json_coder}->encode (	3111	. $self->{json_coder}->encode (
2885	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]	3112	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2886	);	3113	);
2887		3114
2888	# try lzf for large packets
2889	$pkt = "lzf " . Compress::LZF::compress $pkt
2890	if 1024 <= length $pkt and $self->{can_lzf};
2891
2892	# split very large packets
2893	if (8192 < length $pkt and $self->{can_lzf}) {
2894	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2895	$pkt = "frag";
2896	}
2897
2898	$self->send_packet ($pkt);	3115	$self->send_big_packet ($pkt);
2899	}	3116	}
2900		3117
2901	=item $client->ext_msg ($type, @msg)	3118	=item $client->ext_msg ($type, @msg)
2902		3119
2903	Sends an ext event to the client.	3120	Sends an ext event to the client.
…		…
2906		3123
2907	sub cf::client::ext_msg($$@) {	3124	sub cf::client::ext_msg($$@) {
2908	my ($self, $type, @msg) = @_;	3125	my ($self, $type, @msg) = @_;
2909		3126
2910	if ($self->extcmd == 2) {	3127	if ($self->extcmd == 2) {
2911	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3128	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2912	} elsif ($self->extcmd == 1) { # TODO: remove	3129	} elsif ($self->extcmd == 1) { # TODO: remove
2913	push @msg, msgtype => "event_$type";	3130	push @msg, msgtype => "event_$type";
2914	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3131	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2915	}	3132	}
2916	}	3133	}
2917		3134
2918	=item $client->ext_reply ($msgid, @msg)	3135	=item $client->ext_reply ($msgid, @msg)
2919		3136
…		…
2923		3140
2924	sub cf::client::ext_reply($$@) {	3141	sub cf::client::ext_reply($$@) {
2925	my ($self, $id, @msg) = @_;	3142	my ($self, $id, @msg) = @_;
2926		3143
2927	if ($self->extcmd == 2) {	3144	if ($self->extcmd == 2) {
2928	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));	3145	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2929	} elsif ($self->extcmd == 1) {	3146	} elsif ($self->extcmd == 1) {
2930	#TODO: version 1, remove	3147	#TODO: version 1, remove
2931	unshift @msg, msgtype => "reply", msgid => $id;	3148	unshift @msg, msgtype => "reply", msgid => $id;
2932	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3149	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2933	}	3150	}
2934	}	3151	}
2935		3152
2936	=item $success = $client->query ($flags, "text", \&cb)	3153	=item $success = $client->query ($flags, "text", \&cb)
2937		3154
…		…
3008		3225
3009	$ns->ext_reply ($reply, @reply)	3226	$ns->ext_reply ($reply, @reply)
3010	if $reply;	3227	if $reply;
3011		3228
3012	} else {	3229	} else {
3013	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3230	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3014	}	3231	}
3015		3232
3016	cf::override;	3233	cf::override;
3017	},	3234	},
3018	);	3235	);
…		…
3038		3255
3039	$coro	3256	$coro
3040	}	3257	}
3041		3258
3042	cf::client->attach (	3259	cf::client->attach (
3043	on_destroy => sub {	3260	on_client_destroy => sub {
3044	my ($ns) = @_;	3261	my ($ns) = @_;
3045		3262
3046	$_->cancel for values %{ (delete $ns->{_coro}) || {} };	3263	$_->cancel for values %{ (delete $ns->{_coro}) || {} };
3047	},	3264	},
3048	);	3265	);
…		…
3064	our $safe_hole = new Safe::Hole;	3281	our $safe_hole = new Safe::Hole;
3065		3282
3066	$SIG{FPE} = 'IGNORE';	3283	$SIG{FPE} = 'IGNORE';
3067		3284
3068	$safe->permit_only (Opcode::opset qw(	3285	$safe->permit_only (Opcode::opset qw(
3069	:base_core :base_mem :base_orig :base_math	3286	:base_core :base_mem :base_orig :base_math :base_loop
3070	grepstart grepwhile mapstart mapwhile	3287	grepstart grepwhile mapstart mapwhile
3071	sort time	3288	sort time
3072	));	3289	));
3073		3290
3074	# here we export the classes and methods available to script code	3291	# here we export the classes and methods available to script code
…		…
3099	decrease split destroy change_exp value msg lore send_msg)],	3316	decrease split destroy change_exp value msg lore send_msg)],
3100	["cf::object::player" => qw(player)],	3317	["cf::object::player" => qw(player)],
3101	["cf::player" => qw(peaceful send_msg)],	3318	["cf::player" => qw(peaceful send_msg)],
3102	["cf::map" => qw(trigger)],	3319	["cf::map" => qw(trigger)],
3103	) {	3320	) {
3104	no strict 'refs';
3105	my ($pkg, @funs) = @$_;	3321	my ($pkg, @funs) = @$_;
3106	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3322	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3107	for @funs;	3323	for @funs;
3108	}	3324	}
3109		3325
…		…
3126	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3342	$qcode =~ s/"/‟/g; # not allowed in #line filenames
3127	$qcode =~ s/\n/\\n/g;	3343	$qcode =~ s/\n/\\n/g;
3128		3344
3129	%vars = (_dummy => 0) unless %vars;	3345	%vars = (_dummy => 0) unless %vars;
3130		3346
		3347	my @res;
3131	local $_;	3348	local $_;
3132	local @safe::cf::_safe_eval_args = values %vars;
3133		3349
3134	my $eval =	3350	my $eval =
3135	"do {\n"	3351	"do {\n"
3136	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"	3352	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3137	. "#line 0 \"{$qcode}\"\n"	3353	. "#line 0 \"{$qcode}\"\n"
3138	. $code	3354	. $code
3139	. "\n}"	3355	. "\n}"
3140	;	3356	;
3141		3357
		3358	if ($CFG{safe_eval}) {
3142	sub_generation_inc;	3359	sub_generation_inc;
		3360	local @safe::cf::_safe_eval_args = values %vars;
3143	my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);	3361	@res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3144	sub_generation_inc;	3362	sub_generation_inc;
		3363	} else {
		3364	local @cf::_safe_eval_args = values %vars;
		3365	@res = wantarray ? eval eval : scalar eval $eval;
		3366	}
3145		3367
3146	if ($@) {	3368	if ($@) {
3147	warn "$@";	3369	warn "$@",
3148	warn "while executing safe code '$code'\n";	3370	"while executing safe code '$code'\n",
3149	warn "with arguments " . (join " ", %vars) . "\n";	3371	"with arguments " . (join " ", %vars) . "\n";
3150	}	3372	}
3151		3373
3152	wantarray ? @res : $res[0]	3374	wantarray ? @res : $res[0]
3153	}	3375	}
3154		3376
…		…
3168	=cut	3390	=cut
3169		3391
3170	sub register_script_function {	3392	sub register_script_function {
3171	my ($fun, $cb) = @_;	3393	my ($fun, $cb) = @_;
3172		3394
3173	no strict 'refs';	3395	$fun = "safe::$fun" if $CFG{safe_eval};
3174	*{"safe::$fun"} = $safe_hole->wrap ($cb);	3396	*$fun = $safe_hole->wrap ($cb);
3175	}	3397	}
3176		3398
3177	=back	3399	=back
3178		3400
3179	=cut	3401	=cut
…		…
3188	# for this (global event?)	3410	# for this (global event?)
3189	%ext::player_env::MUSIC_FACE_CACHE = ();	3411	%ext::player_env::MUSIC_FACE_CACHE = ();
3190		3412
3191	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3413	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3192		3414
3193	warn "loading facedata from $path\n";	3415	trace "loading facedata from $path\n";
3194		3416
3195	my $facedata;
3196	0 < aio_load $path, $facedata	3417	0 < aio_load $path, my $facedata
3197	or die "$path: $!";	3418	or die "$path: $!";
3198		3419
3199	$facedata = Coro::Storable::thaw $facedata;	3420	$facedata = Coro::Storable::thaw $facedata;
3200		3421
3201	$facedata->{version} == 2	3422	$facedata->{version} == 2
3202	or cf::cleanup "$path: version mismatch, cannot proceed.";	3423	or cf::cleanup "$path: version mismatch, cannot proceed.";
3203		3424
3204	# patch in the exptable	3425	# patch in the exptable
		3426	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3205	$facedata->{resource}{"res/exp_table"} = {	3427	$facedata->{resource}{"res/exp_table"} = {
3206	type => FT_RSRC,	3428	type => FT_RSRC,
3207	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),	3429	data => $exp_table,
		3430	hash => (Digest::MD5::md5 $exp_table),
3208	};	3431	};
3209	cf::cede_to_tick;	3432	cf::cede_to_tick;
3210		3433
3211	{	3434	{
3212	my $faces = $facedata->{faceinfo};	3435	my $faces = $facedata->{faceinfo};
…		…
3214	while (my ($face, $info) = each %$faces) {	3437	while (my ($face, $info) = each %$faces) {
3215	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3438	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3216		3439
3217	cf::face::set_visibility $idx, $info->{visibility};	3440	cf::face::set_visibility $idx, $info->{visibility};
3218	cf::face::set_magicmap $idx, $info->{magicmap};	3441	cf::face::set_magicmap $idx, $info->{magicmap};
3219	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};	3442	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3220	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};	3443	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3221		3444
3222	cf::cede_to_tick;	3445	cf::cede_to_tick;
3223	}	3446	}
3224		3447
3225	while (my ($face, $info) = each %$faces) {	3448	while (my ($face, $info) = each %$faces) {
…		…
3230		3453
3231	if (my $smooth = cf::face::find $info->{smooth}) {	3454	if (my $smooth = cf::face::find $info->{smooth}) {
3232	cf::face::set_smooth $idx, $smooth;	3455	cf::face::set_smooth $idx, $smooth;
3233	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3456	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3234	} else {	3457	} else {
3235	warn "smooth face '$info->{smooth}' not found for face '$face'";	3458	error "smooth face '$info->{smooth}' not found for face '$face'";
3236	}	3459	}
3237		3460
3238	cf::cede_to_tick;	3461	cf::cede_to_tick;
3239	}	3462	}
3240	}	3463	}
…		…
3249		3472
3250	cf::anim::invalidate_all; # d'oh	3473	cf::anim::invalidate_all; # d'oh
3251	}	3474	}
3252		3475
3253	{	3476	{
3254	# TODO: for gcfclient pleasure, we should give resources
3255	# that gcfclient doesn't grok a >10000 face index.
3256	my $res = $facedata->{resource};	3477	my $res = $facedata->{resource};
3257		3478
3258	while (my ($name, $info) = each %$res) {	3479	while (my ($name, $info) = each %$res) {
3259	if (defined $info->{type}) {	3480	if (defined $info->{type}) {
3260	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3481	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3261	my $data;
3262		3482
3263	if ($info->{type} & 1) {	3483	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3264	# prepend meta info
3265
3266	my $meta = $enc->encode ({
3267	name => $name,
3268	%{ $info->{meta} || {} },
3269	});
3270
3271	$data = pack "(w/a*)*", $meta, $info->{data};
3272	} else {
3273	$data = $info->{data};
3274	}
3275
3276	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3277	cf::face::set_type $idx, $info->{type};	3484	cf::face::set_type $idx, $info->{type};
3278	} else {	3485	} else {
3279	$RESOURCE{$name} = $info;	3486	$RESOURCE{$name} = $info; # unused
3280	}	3487	}
3281		3488
3282	cf::cede_to_tick;	3489	cf::cede_to_tick;
3283	}	3490	}
3284	}	3491	}
3285		3492
3286	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3493	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3287		3494
3288	1	3495	1
3289	}	3496	}
3290
3291	cf::global->attach (on_resource_update => sub {
3292	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3293	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3294
3295	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3296	my $sound = $soundconf->{compat}[$_]
3297	or next;
3298
3299	my $face = cf::face::find "sound/$sound->[1]";
3300	cf::sound::set $sound->[0] => $face;
3301	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3302	}
3303
3304	while (my ($k, $v) = each %{$soundconf->{event}}) {
3305	my $face = cf::face::find "sound/$v";
3306	cf::sound::set $k => $face;
3307	}
3308	}
3309	});
3310		3497
3311	register_exticmd fx_want => sub {	3498	register_exticmd fx_want => sub {
3312	my ($ns, $want) = @_;	3499	my ($ns, $want) = @_;
3313		3500
3314	while (my ($k, $v) = each %$want) {	3501	while (my ($k, $v) = each %$want) {
…		…
3353	sub reload_treasures {	3540	sub reload_treasures {
3354	load_resource_file "$DATADIR/treasures"	3541	load_resource_file "$DATADIR/treasures"
3355	or die "unable to load treasurelists\n";	3542	or die "unable to load treasurelists\n";
3356	}	3543	}
3357		3544
		3545	sub reload_sound {
		3546	trace "loading sound config from $DATADIR/sound\n";
		3547
		3548	0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
		3549	or die "$DATADIR/sound $!";
		3550
		3551	my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
		3552
		3553	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3554	my $sound = $soundconf->{compat}[$_]
		3555	or next;
		3556
		3557	my $face = cf::face::find "sound/$sound->[1]";
		3558	cf::sound::set $sound->[0] => $face;
		3559	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3560	}
		3561
		3562	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3563	my $face = cf::face::find "sound/$v";
		3564	cf::sound::set $k => $face;
		3565	}
		3566	}
		3567
3358	sub reload_resources {	3568	sub reload_resources {
3359	warn "reloading resource files...\n";	3569	trace "reloading resource files...\n";
3360		3570
		3571	reload_exp_table;
		3572	reload_materials;
3361	reload_facedata;	3573	reload_facedata;
		3574	reload_sound;
3362	reload_archetypes;	3575	reload_archetypes;
3363	reload_regions;	3576	reload_regions;
3364	reload_treasures;	3577	reload_treasures;
3365		3578
3366	warn "finished reloading resource files\n";	3579	trace "finished reloading resource files\n";
3367	}	3580	}
3368		3581
3369	sub reload_config {	3582	sub reload_config {
3370	open my $fh, "<:utf8", "$CONFDIR/config"	3583	trace "reloading config file...\n";
3371	or return;
3372		3584
3373	local $/;	3585	0 < aio_load "$CONFDIR/config", my $config
3374	*CFG = YAML::Load <$fh>;	3586	or die "$CONFDIR/config: $!";
3375		3587
		3588	utf8::decode $config;
		3589	*CFG = yaml_load $config;
		3590
3376	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3591	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3377		3592
3378	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3593	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3379	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3594	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3380		3595
3381	if (exists $CFG{mlockall}) {	3596	if (exists $CFG{mlockall}) {
…		…
3405	seek $fh, 0, 0;	3620	seek $fh, 0, 0;
3406	print $fh $$;	3621	print $fh $$;
3407	}	3622	}
3408		3623
3409	sub main_loop {	3624	sub main_loop {
3410	warn "EV::loop starting\n";	3625	trace "EV::loop starting\n";
3411	if (1) {	3626	if (1) {
3412	EV::loop;	3627	EV::loop;
3413	}	3628	}
3414	warn "EV::loop returned\n";	3629	trace "EV::loop returned\n";
3415	goto &main_loop unless $REALLY_UNLOOP;	3630	goto &main_loop unless $REALLY_UNLOOP;
3416	}	3631	}
3417		3632
3418	sub main {	3633	sub main {
3419	cf::init_globals; # initialise logging	3634	cf::init_globals; # initialise logging
3420		3635
3421	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3636	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3422	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3637	LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3423	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3638	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3424	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3639	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3425
3426	cf::init_experience;
3427	cf::init_anim;
3428	cf::init_attackmess;
3429	cf::init_dynamic;
3430		3640
3431	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3641	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3432		3642
3433	# we must not ever block the main coroutine	3643	# we must not ever block the main coroutine
3434	local $Coro::idle = sub {	3644	local $Coro::idle = sub {
…		…
3440	};	3650	};
3441		3651
3442	evthread_start IO::AIO::poll_fileno;	3652	evthread_start IO::AIO::poll_fileno;
3443		3653
3444	cf::sync_job {	3654	cf::sync_job {
		3655	cf::incloader::init ();
		3656
		3657	cf::init_anim;
		3658	cf::init_attackmess;
		3659	cf::init_dynamic;
		3660
		3661	cf::load_settings;
		3662
3445	reload_resources;	3663	reload_resources;
3446	reload_config;	3664	reload_config;
3447	db_init;	3665	db_init;
3448		3666
3449	cf::load_settings;
3450	cf::load_materials;
3451	cf::init_uuid;	3667	cf::init_uuid;
3452	cf::init_signals;	3668	cf::init_signals;
3453	cf::init_commands;
3454	cf::init_skills;	3669	cf::init_skills;
3455		3670
3456	cf::init_beforeplay;	3671	cf::init_beforeplay;
3457		3672
3458	atomic;	3673	atomic;
…		…
3463		3678
3464	# no (long-running) fork's whatsoever before this point(!)	3679	# no (long-running) fork's whatsoever before this point(!)
3465	use POSIX ();	3680	use POSIX ();
3466	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3681	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3467		3682
3468	(pop @POST_INIT)->(0) while @POST_INIT;	3683	cf::_post_init 0;
3469	};	3684	};
3470		3685
		3686	cf::object::thawer::errors_are_fatal 0;
		3687	info "parse errors in files are no longer fatal from this point on.\n";
		3688
		3689	my $free_main; $free_main = EV::idle sub {
		3690	undef $free_main;
		3691	undef &main; # free gobs of memory :)
		3692	};
		3693
3471	main_loop;	3694	goto &main_loop;
3472	}	3695	}
3473		3696
3474	#############################################################################	3697	#############################################################################
3475	# initialisation and cleanup	3698	# initialisation and cleanup
3476		3699
3477	# install some emergency cleanup handlers	3700	# install some emergency cleanup handlers
3478	BEGIN {	3701	BEGIN {
3479	our %SIGWATCHER = ();	3702	our %SIGWATCHER = ();
3480	for my $signal (qw(INT HUP TERM)) {	3703	for my $signal (qw(INT HUP TERM)) {
3481	$SIGWATCHER{$signal} = EV::signal $signal, sub {	3704	$SIGWATCHER{$signal} = AE::signal $signal, sub {
3482	cf::cleanup "SIG$signal";	3705	cf::cleanup "SIG$signal";
3483	};	3706	};
3484	}	3707	}
3485	}	3708	}
3486		3709
3487	sub write_runtime_sync {	3710	sub write_runtime_sync {
		3711	my $t0 = AE::time;
		3712
3488	# first touch the runtime file to show we are still running:	3713	# first touch the runtime file to show we are still running:
3489	# the fsync below can take a very very long time.	3714	# the fsync below can take a very very long time.
3490		3715
3491	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;	3716	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3492		3717
3493	my $guard = cf::lock_acquire "write_runtime";	3718	my $guard = cf::lock_acquire "write_runtime";
3494		3719
3495	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644	3720	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3496	or return;	3721	or return;
3497		3722
3498	my $value = $cf::RUNTIME + 90 + 10;	3723	my $value = $cf::RUNTIME + 90 + 10;
3499	# 10 is the runtime save interval, for a monotonic clock	3724	# 10 is the runtime save interval, for a monotonic clock
3500	# 60 allows for the watchdog to kill the server.	3725	# 60 allows for the watchdog to kill the server.
…		…
3513	or return;	3738	or return;
3514		3739
3515	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3740	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3516	and return;	3741	and return;
3517		3742
3518	warn "runtime file written.\n";	3743	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3519		3744
3520	1	3745	1
3521	}	3746	}
3522		3747
3523	our $uuid_lock;	3748	our $uuid_lock;
…		…
3535	or return;	3760	or return;
3536		3761
3537	my $value = uuid_seq uuid_cur;	3762	my $value = uuid_seq uuid_cur;
3538		3763
3539	unless ($value) {	3764	unless ($value) {
3540	warn "cowardly refusing to write zero uuid value!\n";	3765	info "cowardly refusing to write zero uuid value!\n";
3541	return;	3766	return;
3542	}	3767	}
3543		3768
3544	my $value = uuid_str $value + $uuid_skip;	3769	my $value = uuid_str $value + $uuid_skip;
3545	$uuid_skip = 0;	3770	$uuid_skip = 0;
…		…
3555	or return;	3780	or return;
3556		3781
3557	aio_rename "$uuid~", $uuid	3782	aio_rename "$uuid~", $uuid
3558	and return;	3783	and return;
3559		3784
3560	warn "uuid file written ($value).\n";	3785	trace "uuid file written ($value).\n";
3561		3786
3562	1	3787	1
3563		3788
3564	}	3789	}
3565		3790
…		…
3571	}	3796	}
3572		3797
3573	sub emergency_save() {	3798	sub emergency_save() {
3574	my $freeze_guard = cf::freeze_mainloop;	3799	my $freeze_guard = cf::freeze_mainloop;
3575		3800
3576	warn "emergency_perl_save: enter\n";	3801	info "emergency_perl_save: enter\n";
		3802
		3803	# this is a trade-off: we want to be very quick here, so
		3804	# save all maps without fsync, and later call a global sync
		3805	# (which in turn might be very very slow)
		3806	local $USE_FSYNC = 0;
3577		3807
3578	cf::sync_job {	3808	cf::sync_job {
3579	# this is a trade-off: we want to be very quick here, so	3809	cf::write_runtime_sync; # external watchdog should not bark
3580	# save all maps without fsync, and later call a global sync
3581	# (which in turn might be very very slow)
3582	local $USE_FSYNC = 0;
3583		3810
3584	# use a peculiar iteration method to avoid tripping on perl	3811	# use a peculiar iteration method to avoid tripping on perl
3585	# refcount bugs in for. also avoids problems with players	3812	# refcount bugs in for. also avoids problems with players
3586	# and maps saved/destroyed asynchronously.	3813	# and maps saved/destroyed asynchronously.
3587	warn "emergency_perl_save: begin player save\n";	3814	info "emergency_perl_save: begin player save\n";
3588	for my $login (keys %cf::PLAYER) {	3815	for my $login (keys %cf::PLAYER) {
3589	my $pl = $cf::PLAYER{$login} or next;	3816	my $pl = $cf::PLAYER{$login} or next;
3590	$pl->valid or next;	3817	$pl->valid or next;
3591	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3818	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3592	$pl->save;	3819	$pl->save;
3593	}	3820	}
3594	warn "emergency_perl_save: end player save\n";	3821	info "emergency_perl_save: end player save\n";
3595		3822
		3823	cf::write_runtime_sync; # external watchdog should not bark
		3824
3596	warn "emergency_perl_save: begin map save\n";	3825	info "emergency_perl_save: begin map save\n";
3597	for my $path (keys %cf::MAP) {	3826	for my $path (keys %cf::MAP) {
3598	my $map = $cf::MAP{$path} or next;	3827	my $map = $cf::MAP{$path} or next;
3599	$map->valid or next;	3828	$map->valid or next;
3600	$map->save;	3829	$map->save;
3601	}	3830	}
3602	warn "emergency_perl_save: end map save\n";	3831	info "emergency_perl_save: end map save\n";
3603		3832
		3833	cf::write_runtime_sync; # external watchdog should not bark
		3834
3604	warn "emergency_perl_save: begin database checkpoint\n";	3835	info "emergency_perl_save: begin database checkpoint\n";
3605	BDB::db_env_txn_checkpoint $DB_ENV;	3836	BDB::db_env_txn_checkpoint $DB_ENV;
3606	warn "emergency_perl_save: end database checkpoint\n";	3837	info "emergency_perl_save: end database checkpoint\n";
3607		3838
3608	warn "emergency_perl_save: begin write uuid\n";	3839	info "emergency_perl_save: begin write uuid\n";
3609	write_uuid_sync 1;	3840	write_uuid_sync 1;
3610	warn "emergency_perl_save: end write uuid\n";	3841	info "emergency_perl_save: end write uuid\n";
		3842
		3843	cf::write_runtime_sync; # external watchdog should not bark
		3844
		3845	trace "emergency_perl_save: syncing database to disk";
		3846	BDB::db_env_txn_checkpoint $DB_ENV;
		3847
		3848	info "emergency_perl_save: starting sync\n";
		3849	IO::AIO::aio_sync sub {
		3850	info "emergency_perl_save: finished sync\n";
		3851	};
		3852
		3853	cf::write_runtime_sync; # external watchdog should not bark
		3854
		3855	trace "emergency_perl_save: flushing outstanding aio requests";
		3856	while (IO::AIO::nreqs || BDB::nreqs) {
		3857	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
		3858	}
		3859
		3860	cf::write_runtime_sync; # external watchdog should not bark
3611	};	3861	};
3612		3862
3613	warn "emergency_perl_save: starting sync()\n";
3614	IO::AIO::aio_sync sub {
3615	warn "emergency_perl_save: finished sync()\n";
3616	};
3617
3618	warn "emergency_perl_save: leave\n";	3863	info "emergency_perl_save: leave\n";
3619	}	3864	}
3620		3865
3621	sub post_cleanup {	3866	sub post_cleanup {
3622	my ($make_core) = @_;	3867	my ($make_core) = @_;
3623		3868
		3869	IO::AIO::flush;
		3870
3624	warn Carp::longmess "post_cleanup backtrace"	3871	error Carp::longmess "post_cleanup backtrace"
3625	if $make_core;	3872	if $make_core;
3626		3873
3627	my $fh = pidfile;	3874	my $fh = pidfile;
3628	unlink $PIDFILE if <$fh> == $$;	3875	unlink $PIDFILE if <$fh> == $$;
3629	}	3876	}
…		…
3649	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	3896	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3650	for my $name (keys %$leaf_symtab) {	3897	for my $name (keys %$leaf_symtab) {
3651	_gv_clear *{"$pkg$name"};	3898	_gv_clear *{"$pkg$name"};
3652	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	3899	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3653	}	3900	}
3654	warn "cleared package $pkg\n";#d#
3655	}	3901	}
3656		3902
3657	sub do_reload_perl() {	3903	sub do_reload_perl() {
3658	# can/must only be called in main	3904	# can/must only be called in main
3659	if ($Coro::current != $Coro::main) {	3905	unless (in_main) {
3660	warn "can only reload from main coroutine";	3906	error "can only reload from main coroutine";
3661	return;	3907	return;
3662	}	3908	}
3663		3909
3664	return if $RELOAD++;	3910	return if $RELOAD++;
3665		3911
3666	my $t1 = EV::time;	3912	my $t1 = AE::time;
3667		3913
3668	while ($RELOAD) {	3914	while ($RELOAD) {
3669	warn "reloading...";	3915	cf::get_slot 0.1, -1, "reload_perl";
		3916	info "perl_reload: reloading...";
3670		3917
3671	warn "entering sync_job";	3918	trace "perl_reload: entering sync_job";
3672		3919
3673	cf::sync_job {	3920	cf::sync_job {
3674	cf::write_runtime_sync; # external watchdog should not bark
3675	cf::emergency_save;	3921	#cf::emergency_save;
3676	cf::write_runtime_sync; # external watchdog should not bark
3677		3922
3678	warn "syncing database to disk";
3679	BDB::db_env_txn_checkpoint $DB_ENV;
3680
3681	# if anything goes wrong in here, we should simply crash as we already saved
3682
3683	warn "flushing outstanding aio requests";
3684	while (IO::AIO::nreqs || BDB::nreqs) {
3685	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3686	}
3687
3688	warn "cancelling all extension coros";	3923	trace "perl_reload: cancelling all extension coros";
3689	$_->cancel for values %EXT_CORO;	3924	$_->cancel for values %EXT_CORO;
3690	%EXT_CORO = ();	3925	%EXT_CORO = ();
3691		3926
3692	warn "removing commands";	3927	trace "perl_reload: removing commands";
3693	%COMMAND = ();	3928	%COMMAND = ();
3694		3929
3695	warn "removing ext/exti commands";	3930	trace "perl_reload: removing ext/exti commands";
3696	%EXTCMD = ();	3931	%EXTCMD = ();
3697	%EXTICMD = ();	3932	%EXTICMD = ();
3698		3933
3699	warn "unloading/nuking all extensions";	3934	trace "perl_reload: unloading/nuking all extensions";
3700	for my $pkg (@EXTS) {	3935	for my $pkg (@EXTS) {
3701	warn "... unloading $pkg";	3936	trace "... unloading $pkg";
3702		3937
3703	if (my $cb = $pkg->can ("unload")) {	3938	if (my $cb = $pkg->can ("unload")) {
3704	eval {	3939	eval {
3705	$cb->($pkg);	3940	$cb->($pkg);
3706	1	3941	1
3707	} or warn "$pkg unloaded, but with errors: $@";	3942	} or error "$pkg unloaded, but with errors: $@";
3708	}	3943	}
3709		3944
3710	warn "... clearing $pkg";	3945	trace "... clearing $pkg";
3711	clear_package $pkg;	3946	clear_package $pkg;
3712	}	3947	}
3713		3948
3714	warn "unloading all perl modules loaded from $LIBDIR";	3949	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3715	while (my ($k, $v) = each %INC) {	3950	while (my ($k, $v) = each %INC) {
3716	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	3951	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3717		3952
3718	warn "... unloading $k";	3953	trace "... unloading $k";
3719	delete $INC{$k};	3954	delete $INC{$k};
3720		3955
3721	$k =~ s/\.pm$//;	3956	$k =~ s/\.pm$//;
3722	$k =~ s/\//::/g;	3957	$k =~ s/\//::/g;
3723		3958
…		…
3726	}	3961	}
3727		3962
3728	clear_package $k;	3963	clear_package $k;
3729	}	3964	}
3730		3965
3731	warn "getting rid of safe::, as good as possible";	3966	trace "perl_reload: getting rid of safe::, as good as possible";
3732	clear_package "safe::$_"	3967	clear_package "safe::$_"
3733	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	3968	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3734		3969
3735	warn "unloading cf.pm \"a bit\"";	3970	trace "perl_reload: unloading cf.pm \"a bit\"";
3736	delete $INC{"cf.pm"};	3971	delete $INC{"cf.pm"};
3737	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	3972	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3738		3973
3739	# don't, removes xs symbols, too,	3974	# don't, removes xs symbols, too,
3740	# and global variables created in xs	3975	# and global variables created in xs
3741	#clear_package __PACKAGE__;	3976	#clear_package __PACKAGE__;
3742		3977
3743	warn "unload completed, starting to reload now";	3978	info "perl_reload: unload completed, starting to reload now";
3744		3979
3745	warn "reloading cf.pm";	3980	trace "perl_reload: reloading cf.pm";
3746	require cf;	3981	require cf;
3747	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3982	cf::_connect_to_perl_1;
3748		3983
3749	warn "loading config and database again";	3984	trace "perl_reload: loading config and database again";
3750	cf::reload_config;	3985	cf::reload_config;
3751		3986
3752	warn "loading extensions";	3987	trace "perl_reload: loading extensions";
3753	cf::load_extensions;	3988	cf::load_extensions;
3754		3989
3755	if ($REATTACH_ON_RELOAD) {	3990	if ($REATTACH_ON_RELOAD) {
3756	warn "reattaching attachments to objects/players";	3991	trace "perl_reload: reattaching attachments to objects/players";
3757	_global_reattach; # objects, sockets	3992	_global_reattach; # objects, sockets
3758	warn "reattaching attachments to maps";	3993	trace "perl_reload: reattaching attachments to maps";
3759	reattach $_ for values %MAP;	3994	reattach $_ for values %MAP;
3760	warn "reattaching attachments to players";	3995	trace "perl_reload: reattaching attachments to players";
3761	reattach $_ for values %PLAYER;	3996	reattach $_ for values %PLAYER;
3762	}	3997	}
3763		3998
3764	warn "running post_init jobs";	3999	cf::_post_init 1;
3765	(pop @POST_INIT)->(1) while @POST_INIT;
3766		4000
3767	warn "leaving sync_job";	4001	trace "perl_reload: leaving sync_job";
3768		4002
3769	1	4003	1
3770	} or do {	4004	} or do {
3771	warn $@;	4005	error $@;
3772	cf::cleanup "error while reloading, exiting.";	4006	cf::cleanup "perl_reload: error, exiting.";
3773	};	4007	};
3774		4008
3775	warn "reloaded";
3776	--$RELOAD;	4009	--$RELOAD;
3777	}	4010	}
3778		4011
3779	$t1 = EV::time - $t1;	4012	$t1 = AE::time - $t1;
3780	warn "reload completed in ${t1}s\n";	4013	info "perl_reload: completed in ${t1}s\n";
3781	};	4014	};
3782		4015
3783	our $RELOAD_WATCHER; # used only during reload	4016	our $RELOAD_WATCHER; # used only during reload
3784		4017
3785	sub reload_perl() {	4018	sub reload_perl() {
…		…
3787	# coro crashes during coro_state_free->destroy here.	4020	# coro crashes during coro_state_free->destroy here.
3788		4021
3789	$RELOAD_WATCHER ||= cf::async {	4022	$RELOAD_WATCHER ||= cf::async {
3790	Coro::AIO::aio_wait cache_extensions;	4023	Coro::AIO::aio_wait cache_extensions;
3791		4024
3792	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {	4025	$RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3793	do_reload_perl;	4026	do_reload_perl;
3794	undef $RELOAD_WATCHER;	4027	undef $RELOAD_WATCHER;
3795	};	4028	};
3796	};	4029	};
3797	}	4030	}
…		…
3806	reload_perl;	4039	reload_perl;
3807	};	4040	};
3808	}	4041	}
3809	};	4042	};
3810		4043
3811	unshift @INC, $LIBDIR;	4044	#############################################################################
3812		4045
3813	my $bug_warning = 0;	4046	my $bug_warning = 0;
3814		4047
3815	our @WAIT_FOR_TICK;	4048	our @WAIT_FOR_TICK;
3816	our @WAIT_FOR_TICK_BEGIN;	4049	our @WAIT_FOR_TICK_BEGIN;
3817		4050
3818	sub wait_for_tick {	4051	sub wait_for_tick() {
3819	return if tick_inhibit || $Coro::current == $Coro::main;	4052	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3820		4053
3821	my $signal = new Coro::Signal;	4054	my $signal = new Coro::Signal;
3822	push @WAIT_FOR_TICK, $signal;	4055	push @WAIT_FOR_TICK, $signal;
3823	$signal->wait;	4056	$signal->wait;
3824	}	4057	}
3825		4058
3826	sub wait_for_tick_begin {	4059	sub wait_for_tick_begin() {
3827	return if tick_inhibit || $Coro::current == $Coro::main;	4060	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3828		4061
3829	my $signal = new Coro::Signal;	4062	my $signal = new Coro::Signal;
3830	push @WAIT_FOR_TICK_BEGIN, $signal;	4063	push @WAIT_FOR_TICK_BEGIN, $signal;
3831	$signal->wait;	4064	$signal->wait;
3832	}	4065	}
…		…
3838	return;	4071	return;
3839	}	4072	}
3840		4073
3841	cf::server_tick; # one server iteration	4074	cf::server_tick; # one server iteration
3842		4075
		4076	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
		4077
3843	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4078	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3844	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4079	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3845	Coro::async_pool {	4080	Coro::async_pool {
3846	$Coro::current->{desc} = "runtime saver";	4081	$Coro::current->{desc} = "runtime saver";
3847	write_runtime_sync	4082	write_runtime_sync
3848	or warn "ERROR: unable to write runtime file: $!";	4083	or error "ERROR: unable to write runtime file: $!";
3849	};	4084	};
3850	}	4085	}
3851		4086
3852	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4087	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3853	$sig->send;	4088	$sig->send;
…		…
3861		4096
3862	if (0) {	4097	if (0) {
3863	if ($NEXT_TICK) {	4098	if ($NEXT_TICK) {
3864	my $jitter = $TICK_START - $NEXT_TICK;	4099	my $jitter = $TICK_START - $NEXT_TICK;
3865	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4100	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
3866	warn "jitter $JITTER\n";#d#	4101	debug "jitter $JITTER\n";#d#
3867	}	4102	}
3868	}	4103	}
3869	}	4104	}
3870		4105
3871	{	4106	{
3872	# configure BDB	4107	# configure BDB
3873		4108
3874	BDB::min_parallel 8;	4109	BDB::min_parallel 16;
3875	BDB::max_poll_reqs $TICK * 0.1;	4110	BDB::max_poll_reqs $TICK * 0.1;
3876	$AnyEvent::BDB::WATCHER->priority (1);	4111	$AnyEvent::BDB::WATCHER->priority (1);
3877		4112
3878	unless ($DB_ENV) {	4113	unless ($DB_ENV) {
3879	$DB_ENV = BDB::db_env_create;	4114	$DB_ENV = BDB::db_env_create;
…		…
3916	IO::AIO::min_parallel 8;	4151	IO::AIO::min_parallel 8;
3917	IO::AIO::max_poll_time $TICK * 0.1;	4152	IO::AIO::max_poll_time $TICK * 0.1;
3918	undef $AnyEvent::AIO::WATCHER;	4153	undef $AnyEvent::AIO::WATCHER;
3919	}	4154	}
3920		4155
3921	my $_log_backtrace;	4156	our $_log_backtrace;
		4157	our $_log_backtrace_last;
3922		4158
3923	sub _log_backtrace {	4159	sub _log_backtrace {
3924	my ($msg, @addr) = @_;	4160	my ($msg, @addr) = @_;
3925		4161
3926	$msg =~ s/\n//;	4162	$msg =~ s/\n$//;
3927		4163
		4164	if ($_log_backtrace_last eq $msg) {
		4165	LOG llevInfo, "[ABT] $msg\n";
		4166	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3928	# limit the # of concurrent backtraces	4167	# limit the # of concurrent backtraces
3929	if ($_log_backtrace < 2) {	4168	} elsif ($_log_backtrace < 2) {
		4169	$_log_backtrace_last = $msg;
3930	++$_log_backtrace;	4170	++$_log_backtrace;
3931	my $perl_bt = Carp::longmess $msg;	4171	my $perl_bt = Carp::longmess $msg;
3932	async {	4172	async {
3933	$Coro::current->{desc} = "abt $msg";	4173	$Coro::current->{desc} = "abt $msg";
3934		4174
…		…
3954	LOG llevInfo, "[ABT] $_\n" for @bt;	4194	LOG llevInfo, "[ABT] $_\n" for @bt;
3955	--$_log_backtrace;	4195	--$_log_backtrace;
3956	};	4196	};
3957	} else {	4197	} else {
3958	LOG llevInfo, "[ABT] $msg\n";	4198	LOG llevInfo, "[ABT] $msg\n";
3959	LOG llevInfo, "[ABT] [suppressed]\n";	4199	LOG llevInfo, "[ABT] [overload, suppressed]\n";
3960	}	4200	}
3961	}	4201	}
3962		4202
3963	# load additional modules	4203	# load additional modules
3964	require "cf/$_.pm" for @EXTRA_MODULES;	4204	require "cf/$_.pm" for @EXTRA_MODULES;
		4205	cf::_connect_to_perl_2;
3965		4206
3966	END { cf::emergency_save }	4207	END { cf::emergency_save }
3967		4208
3968	1	4209	1
3969		4210

Diff Legend

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