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.476 by root, Wed Sep 2 16:54:20 2009 UTC vs.
Revision 1.558 by root, Tue Oct 5 22:35:30 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)
…		…
1733	sub generate_random_map {	1861	sub generate_random_map {
1734	my ($self, $rmp) = @_;	1862	my ($self, $rmp) = @_;
1735		1863
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
1739	$self->_create_random_map (	1866	$self->_create_random_map ($rmp);
1740	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1741	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1742	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1743	$rmp->{exit_on_final_map},
1744	$rmp->{xsize}, $rmp->{ysize},
1745	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1746	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1747	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1748	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1749	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1750	(cf::region::find $rmp->{region}), $rmp->{custom}
1751	)
1752	}	1867	}
1753		1868
1754	=item cf::map->register ($regex, $prio)	1869	=item cf::map->register ($regex, $prio)
1755		1870
1756	Register a handler for the map path matching the given regex at the	1871	Register a handler for the map path matching the given regex at the
…		…
1761		1876
1762	sub register {	1877	sub register {
1763	my (undef, $regex, $prio) = @_;	1878	my (undef, $regex, $prio) = @_;
1764	my $pkg = caller;	1879	my $pkg = caller;
1765		1880
1766	no strict;
1767	push @{"$pkg\::ISA"}, __PACKAGE__;	1881	push @{"$pkg\::ISA"}, __PACKAGE__;
1768		1882
1769	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	1883	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1770	}	1884	}
1771		1885
1772	# also paths starting with '/'	1886	# also paths starting with '/'
1773	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	1887	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1774		1888
1775	sub thawer_merge {	1889	sub thawer_merge {
1776	my ($self, $merge) = @_;	1890	my ($self, $merge) = @_;
1777		1891
1778	# we have to keep some variables in memory intact	1892	# we have to keep some variables in memory intact
…		…
1783	}	1897	}
1784		1898
1785	sub normalise {	1899	sub normalise {
1786	my ($path, $base) = @_;	1900	my ($path, $base) = @_;
1787		1901
1788	$path = "$path"; # make sure its a string	1902	$path = "$path"; # make sure it's a string
1789		1903
1790	$path =~ s/\.map$//;	1904	$path =~ s/\.map$//;
1791		1905
1792	# map plan:	1906	# map plan:
1793	#	1907	#
…		…
1808	$base =~ s{[^/]+/?$}{};	1922	$base =~ s{[^/]+/?$}{};
1809	$path = "$base/$path";	1923	$path = "$base/$path";
1810	}	1924	}
1811		1925
1812	for ($path) {	1926	for ($path) {
1813	redo if s{//}{/};
1814	redo if s{/\.?/}{/};	1927	redo if s{/\.?/}{/};
1815	redo if s{/[^/]+/\.\./}{/};	1928	redo if s{/[^/]+/\.\./}{/};
1816	}	1929	}
1817		1930
1818	$path	1931	$path
…		…
1832	$self->init; # pass $1 etc.	1945	$self->init; # pass $1 etc.
1833	return $self;	1946	return $self;
1834	}	1947	}
1835	}	1948	}
1836		1949
1837	Carp::cluck "unable to resolve path '$path' (base '$base').";	1950	Carp::cluck "unable to resolve path '$path' (base '$base')";
1838	()	1951	()
1839	}	1952	}
1840		1953
1841	sub init {	1954	sub init {
1842	my ($self) = @_;	1955	my ($self) = @_;
…		…
1964	}	2077	}
1965		2078
1966	sub find;	2079	sub find;
1967	sub find {	2080	sub find {
1968	my ($path, $origin) = @_;	2081	my ($path, $origin) = @_;
		2082
		2083	cf::cede_to_tick;
1969		2084
1970	$path = normalise $path, $origin && $origin->path;	2085	$path = normalise $path, $origin && $origin->path;
1971		2086
1972	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2087	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973	my $guard2 = cf::lock_acquire "map_find:$path";	2088	my $guard2 = cf::lock_acquire "map_find:$path";
…		…
1992		2107
1993	$cf::MAP{$path} = $map	2108	$cf::MAP{$path} = $map
1994	}	2109	}
1995	}	2110	}
1996		2111
1997	sub pre_load { }	2112	sub pre_load { }
1998	sub post_load { }	2113	#sub post_load { } # XS
1999		2114
2000	sub load {	2115	sub load {
2001	my ($self) = @_;	2116	my ($self) = @_;
2002		2117
2003	local $self->{deny_reset} = 1; # loading can take a long time	2118	local $self->{deny_reset} = 1; # loading can take a long time
…		…
2058		2173
2059	$self->in_memory (cf::MAP_ACTIVE);	2174	$self->in_memory (cf::MAP_ACTIVE);
2060	}	2175	}
2061		2176
2062	$self->post_load;	2177	$self->post_load;
2063	}
2064		2178
		2179	1
		2180	}
		2181
		2182	# customize the map for a given player, i.e.
		2183	# return the _real_ map. used by e.g. per-player
		2184	# maps to change the path to ~playername/mappath
2065	sub customise_for {	2185	sub customise_for {
2066	my ($self, $ob) = @_;	2186	my ($self, $ob) = @_;
2067		2187
2068	return find "~" . $ob->name . "/" . $self->{path}	2188	return find "~" . $ob->name . "/" . $self->{path}
2069	if $self->per_player;	2189	if $self->per_player;
…		…
2085	or next;	2205	or next;
2086	$neigh = find $neigh, $map	2206	$neigh = find $neigh, $map
2087	or next;	2207	or next;
2088	$neigh->load;	2208	$neigh->load;
2089		2209
		2210	# now find the diagonal neighbours
2090	push @neigh,	2211	push @neigh,
2091	[$neigh->tile_path (($_ + 3) % 4), $neigh],	2212	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2092	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2213	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2093	}	2214	}
2094		2215
…		…
2101	}	2222	}
2102		2223
2103	sub find_sync {	2224	sub find_sync {
2104	my ($path, $origin) = @_;	2225	my ($path, $origin) = @_;
2105		2226
2106	cf::sync_job { find $path, $origin }	2227	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
		2228	if $Coro::current == $Coro::main;
		2229
		2230	find $path, $origin
2107	}	2231	}
2108		2232
2109	sub do_load_sync {	2233	sub do_load_sync {
2110	my ($map) = @_;	2234	my ($map) = @_;
2111		2235
2112	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2236	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2113	if $Coro::current == $Coro::main;	2237	if $Coro::current == $Coro::main;
2114		2238
2115	cf::sync_job { $map->load };	2239	$map->load;
2116	}	2240	}
2117		2241
2118	our %MAP_PREFETCH;	2242	our %MAP_PREFETCH;
2119	our $MAP_PREFETCHER = undef;	2243	our $MAP_PREFETCHER = undef;
2120		2244
…		…
2146	$MAP_PREFETCHER->prio (6);	2270	$MAP_PREFETCHER->prio (6);
2147		2271
2148	()	2272	()
2149	}	2273	}
2150		2274
		2275	# common code, used by both ->save and ->swapout
2151	sub save {	2276	sub _save {
2152	my ($self) = @_;	2277	my ($self) = @_;
2153
2154	my $lock = cf::lock_acquire "map_data:$self->{path}";
2155		2278
2156	$self->{last_save} = $cf::RUNTIME;	2279	$self->{last_save} = $cf::RUNTIME;
2157		2280
2158	return unless $self->dirty;	2281	return unless $self->dirty;
2159		2282
…		…
2179	} else {	2302	} else {
2180	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);	2303	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2181	}	2304	}
2182	}	2305	}
2183		2306
		2307	sub save {
		2308	my ($self) = @_;
		2309
		2310	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2311
		2312	$self->_save;
		2313	}
		2314
2184	sub swap_out {	2315	sub swap_out {
2185	my ($self) = @_;	2316	my ($self) = @_;
2186		2317
2187	# save first because save cedes
2188	$self->save;
2189
2190	my $lock = cf::lock_acquire "map_data:$self->{path}";	2318	my $lock = cf::lock_acquire "map_data:$self->{path}";
2191		2319
2192	return if $self->players;
2193	return if $self->in_memory != cf::MAP_ACTIVE;	2320	return if $self->in_memory != cf::MAP_ACTIVE;
2194	return if $self->{deny_save};	2321	return if $self->{deny_save};
		2322	return if $self->players;
2195		2323
		2324	# first deactivate the map and "unlink" it from the core
		2325	$self->deactivate;
		2326	$_->clear_links_to ($self) for values %cf::MAP;
2196	$self->in_memory (cf::MAP_SWAPPED);	2327	$self->in_memory (cf::MAP_SWAPPED);
		2328
		2329	# then atomically save
		2330	$self->_save;
		2331
		2332	# then free the map
		2333	$self->clear;
		2334	}
		2335
		2336	sub reset_at {
		2337	my ($self) = @_;
		2338
		2339	# TODO: safety, remove and allow resettable per-player maps
		2340	return 1e99 if $self->{deny_reset};
		2341
		2342	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
		2343	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
		2344
		2345	$time + $to
		2346	}
		2347
		2348	sub should_reset {
		2349	my ($self) = @_;
		2350
		2351	$self->reset_at <= $cf::RUNTIME
		2352	}
		2353
		2354	sub reset {
		2355	my ($self) = @_;
		2356
		2357	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2358
		2359	return if $self->players;
		2360
		2361	cf::trace "resetting map ", $self->path, "\n";
		2362
		2363	$self->in_memory (cf::MAP_SWAPPED);
		2364
		2365	# need to save uniques path
		2366	unless ($self->{deny_save}) {
		2367	my $uniq = $self->uniq_path; utf8::encode $uniq;
		2368
		2369	$self->_save_objects ($uniq, cf::IO_UNIQUES)
		2370	if $uniq;
		2371	}
		2372
		2373	delete $cf::MAP{$self->path};
2197		2374
2198	$self->deactivate;	2375	$self->deactivate;
2199	$_->clear_links_to ($self) for values %cf::MAP;	2376	$_->clear_links_to ($self) for values %cf::MAP;
2200	$self->clear;	2377	$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		2378
2246	$self->unlink_save;	2379	$self->unlink_save;
2247	$self->destroy;	2380	$self->destroy;
2248	}	2381	}
2249		2382
…		…
2257		2390
2258	delete $cf::MAP{$self->path};	2391	delete $cf::MAP{$self->path};
2259		2392
2260	$self->unlink_save;	2393	$self->unlink_save;
2261		2394
2262	bless $self, "cf::map";	2395	bless $self, "cf::map::wrap";
2263	delete $self->{deny_reset};	2396	delete $self->{deny_reset};
2264	$self->{deny_save} = 1;	2397	$self->{deny_save} = 1;
2265	$self->reset_timeout (1);	2398	$self->reset_timeout (1);
2266	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2399	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2267		2400
…		…
2324	: normalise $_	2457	: normalise $_
2325	} @{ aio_readdir $UNIQUEDIR or [] }	2458	} @{ aio_readdir $UNIQUEDIR or [] }
2326	]	2459	]
2327	}	2460	}
2328		2461
		2462	=item cf::map::static_maps
		2463
		2464	Returns an arrayref if paths of all static maps (all preinstalled F<.map>
		2465	file in the shared directory excluding F</styles> and F</editor>). May
		2466	block.
		2467
		2468	=cut
		2469
		2470	sub static_maps() {
		2471	my @dirs = "";
		2472	my @maps;
		2473
		2474	while (@dirs) {
		2475	my $dir = shift @dirs;
		2476
		2477	next if $dir eq "/styles" || $dir eq "/editor";
		2478
		2479	my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
		2480	or return;
		2481
		2482	for (@$files) {
		2483	s/\.map$// or next;
		2484	utf8::decode $_;
		2485	push @maps, "$dir/$_";
		2486	}
		2487
		2488	push @dirs, map "$dir/$_", @$dirs;
		2489	}
		2490
		2491	\@maps
		2492	}
		2493
2329	=back	2494	=back
2330		2495
2331	=head3 cf::object	2496	=head3 cf::object
2332		2497
2333	=cut	2498	=cut
…		…
2465		2630
2466	Freezes the player and moves him/her to a special map (C<{link}>).	2631	Freezes the player and moves him/her to a special map (C<{link}>).
2467		2632
2468	The player should be reasonably safe there for short amounts of time (e.g.	2633	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,	2634	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	2635	though, as the player cannot control the character while it is on the link
2471	map.	2636	map.
2472		2637
2473	Will never block.	2638	Will never block.
2474		2639
2475	=item $player_object->leave_link ($map, $x, $y)	2640	=item $player_object->leave_link ($map, $x, $y)
…		…
2496	sub cf::object::player::enter_link {	2661	sub cf::object::player::enter_link {
2497	my ($self) = @_;	2662	my ($self) = @_;
2498		2663
2499	$self->deactivate_recursive;	2664	$self->deactivate_recursive;
2500		2665
		2666	++$self->{_link_recursion};
		2667
2501	return if UNIVERSAL::isa $self->map, "ext::map_link";	2668	return if UNIVERSAL::isa $self->map, "ext::map_link";
2502		2669
2503	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2670	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2504	if $self->map && $self->map->{path} ne "{link}";	2671	if $self->map && $self->map->{path} ne "{link}";
2505		2672
2506	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2673	$self->enter_map ($LINK_MAP || link_map, 3, 3);
2507	}	2674	}
2508		2675
2509	sub cf::object::player::leave_link {	2676	sub cf::object::player::leave_link {
2510	my ($self, $map, $x, $y) = @_;	2677	my ($self, $map, $x, $y) = @_;
2511		2678
…		…
2528	($x, $y) = (-1, -1)	2695	($x, $y) = (-1, -1)
2529	unless (defined $x) && (defined $y);	2696	unless (defined $x) && (defined $y);
2530		2697
2531	# use -1 or undef as default coordinates, not 0, 0	2698	# use -1 or undef as default coordinates, not 0, 0
2532	($x, $y) = ($map->enter_x, $map->enter_y)	2699	($x, $y) = ($map->enter_x, $map->enter_y)
2533	if $x <=0 && $y <= 0;	2700	if $x <= 0 && $y <= 0;
2534		2701
2535	$map->load;	2702	$map->load;
2536	$map->load_neighbours;	2703	$map->load_neighbours;
2537		2704
2538	return unless $self->contr->active;	2705	return unless $self->contr->active;
2539		2706
2540	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2707	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2541	$self->enter_map ($map, $x, $y);	2708	if ($self->enter_map ($map, $x, $y)) {
2542		2709	# entering was successful
		2710	delete $self->{_link_recursion};
2543	# only activate afterwards, to support waiting in hooks	2711	# only activate afterwards, to support waiting in hooks
2544	$self->activate_recursive;	2712	$self->activate_recursive;
2545	}	2713	}
2546		2714
		2715	}
		2716
2547	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2717	=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2548		2718
2549	Moves the player to the given map-path and coordinates by first freezing	2719	Moves the player to the given map-path and coordinates by first freezing
2550	her, loading and preparing them map, calling the provided $check callback	2720	her, loading and preparing them map, calling the provided $check callback
2551	that has to return the map if sucecssful, and then unfreezes the player on	2721	that has to return the map if sucecssful, and then unfreezes the player on
2552	the new (success) or old (failed) map position. In either case, $done will	2722	the new (success) or old (failed) map position. In either case, $done will
…		…
2559		2729
2560	our $GOTOGEN;	2730	our $GOTOGEN;
2561		2731
2562	sub cf::object::player::goto {	2732	sub cf::object::player::goto {
2563	my ($self, $path, $x, $y, $check, $done) = @_;	2733	my ($self, $path, $x, $y, $check, $done) = @_;
		2734
		2735	if ($self->{_link_recursion} >= $MAX_LINKS) {
		2736	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
		2737	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
		2738	($path, $x, $y) = @$EMERGENCY_POSITION;
		2739	}
2564		2740
2565	# do generation counting so two concurrent goto's will be executed in-order	2741	# do generation counting so two concurrent goto's will be executed in-order
2566	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2742	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2567		2743
2568	$self->enter_link;	2744	$self->enter_link;
…		…
2592	my $map = eval {	2768	my $map = eval {
2593	my $map = defined $path ? cf::map::find $path : undef;	2769	my $map = defined $path ? cf::map::find $path : undef;
2594		2770
2595	if ($map) {	2771	if ($map) {
2596	$map = $map->customise_for ($self);	2772	$map = $map->customise_for ($self);
2597	$map = $check->($map) if $check && $map;	2773	$map = $check->($map, $x, $y, $self) if $check && $map;
2598	} else {	2774	} else {
2599	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);	2775	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2600	}	2776	}
2601		2777
2602	$map	2778	$map
…		…
2610	if ($gen == $self->{_goto_generation}) {	2786	if ($gen == $self->{_goto_generation}) {
2611	delete $self->{_goto_generation};	2787	delete $self->{_goto_generation};
2612	$self->leave_link ($map, $x, $y);	2788	$self->leave_link ($map, $x, $y);
2613	}	2789	}
2614		2790
2615	$done->() if $done;	2791	$done->($self) if $done;
2616	})->prio (1);	2792	})->prio (1);
2617	}	2793	}
2618		2794
2619	=item $player_object->enter_exit ($exit_object)	2795	=item $player_object->enter_exit ($exit_object)
2620		2796
…		…
2713	$self->message ("Something went wrong deep within the deliantra server. "	2889	$self->message ("Something went wrong deep within the deliantra server. "
2714	. "I'll try to bring you back to the map you were before. "	2890	. "I'll try to bring you back to the map you were before. "
2715	. "Please report this to the dungeon master!",	2891	. "Please report this to the dungeon master!",
2716	cf::NDI_UNIQUE | cf::NDI_RED);	2892	cf::NDI_UNIQUE | cf::NDI_RED);
2717		2893
2718	warn "ERROR in enter_exit: $@";	2894	error "ERROR in enter_exit: $@";
2719	$self->leave_link;	2895	$self->leave_link;
2720	}	2896	}
2721	})->prio (1);	2897	})->prio (1);
2722	}	2898	}
2723		2899
…		…
2735	sub cf::client::send_drawinfo {	2911	sub cf::client::send_drawinfo {
2736	my ($self, $text, $flags) = @_;	2912	my ($self, $text, $flags) = @_;
2737		2913
2738	utf8::encode $text;	2914	utf8::encode $text;
2739	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2915	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
		2916	}
		2917
		2918	=item $client->send_big_packet ($pkt)
		2919
		2920	Like C<send_packet>, but tries to compress large packets, and fragments
		2921	them as required.
		2922
		2923	=cut
		2924
		2925	our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
		2926
		2927	sub cf::client::send_big_packet {
		2928	my ($self, $pkt) = @_;
		2929
		2930	# try lzf for large packets
		2931	$pkt = "lzf " . Compress::LZF::compress $pkt
		2932	if 1024 <= length $pkt and $self->{can_lzf};
		2933
		2934	# split very large packets
		2935	if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
		2936	$self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
		2937	$pkt = "frag";
		2938	}
		2939
		2940	$self->send_packet ($pkt);
2740	}	2941	}
2741		2942
2742	=item $client->send_msg ($channel, $msg, $color, [extra...])	2943	=item $client->send_msg ($channel, $msg, $color, [extra...])
2743		2944
2744	Send a drawinfo or msg packet to the client, formatting the msg for the	2945	Send a drawinfo or msg packet to the client, formatting the msg for the
…		…
2748		2949
2749	=cut	2950	=cut
2750		2951
2751	# non-persistent channels (usually the info channel)	2952	# non-persistent channels (usually the info channel)
2752	our %CHANNEL = (	2953	our %CHANNEL = (
		2954	"c/motd" => {
		2955	id => "infobox",
		2956	title => "MOTD",
		2957	reply => undef,
		2958	tooltip => "The message of the day",
		2959	},
2753	"c/identify" => {	2960	"c/identify" => {
2754	id => "infobox",	2961	id => "infobox",
2755	title => "Identify",	2962	title => "Identify",
2756	reply => undef,	2963	reply => undef,
2757	tooltip => "Items recently identified",	2964	tooltip => "Items recently identified",
…		…
2759	"c/examine" => {	2966	"c/examine" => {
2760	id => "infobox",	2967	id => "infobox",
2761	title => "Examine",	2968	title => "Examine",
2762	reply => undef,	2969	reply => undef,
2763	tooltip => "Signs and other items you examined",	2970	tooltip => "Signs and other items you examined",
		2971	},
		2972	"c/shopinfo" => {
		2973	id => "infobox",
		2974	title => "Shop Info",
		2975	reply => undef,
		2976	tooltip => "What your bargaining skill tells you about the shop",
2764	},	2977	},
2765	"c/book" => {	2978	"c/book" => {
2766	id => "infobox",	2979	id => "infobox",
2767	title => "Book",	2980	title => "Book",
2768	reply => undef,	2981	reply => undef,
…		…
2884	my $pkt = "msg "	3097	my $pkt = "msg "
2885	. $self->{json_coder}->encode (	3098	. $self->{json_coder}->encode (
2886	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]	3099	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2887	);	3100	);
2888		3101
2889	# try lzf for large packets
2890	$pkt = "lzf " . Compress::LZF::compress $pkt
2891	if 1024 <= length $pkt and $self->{can_lzf};
2892
2893	# split very large packets
2894	if (8192 < length $pkt and $self->{can_lzf}) {
2895	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2896	$pkt = "frag";
2897	}
2898
2899	$self->send_packet ($pkt);	3102	$self->send_big_packet ($pkt);
2900	}	3103	}
2901		3104
2902	=item $client->ext_msg ($type, @msg)	3105	=item $client->ext_msg ($type, @msg)
2903		3106
2904	Sends an ext event to the client.	3107	Sends an ext event to the client.
…		…
2907		3110
2908	sub cf::client::ext_msg($$@) {	3111	sub cf::client::ext_msg($$@) {
2909	my ($self, $type, @msg) = @_;	3112	my ($self, $type, @msg) = @_;
2910		3113
2911	if ($self->extcmd == 2) {	3114	if ($self->extcmd == 2) {
2912	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3115	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2913	} elsif ($self->extcmd == 1) { # TODO: remove	3116	} elsif ($self->extcmd == 1) { # TODO: remove
2914	push @msg, msgtype => "event_$type";	3117	push @msg, msgtype => "event_$type";
2915	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3118	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2916	}	3119	}
2917	}	3120	}
2918		3121
2919	=item $client->ext_reply ($msgid, @msg)	3122	=item $client->ext_reply ($msgid, @msg)
2920		3123
…		…
2924		3127
2925	sub cf::client::ext_reply($$@) {	3128	sub cf::client::ext_reply($$@) {
2926	my ($self, $id, @msg) = @_;	3129	my ($self, $id, @msg) = @_;
2927		3130
2928	if ($self->extcmd == 2) {	3131	if ($self->extcmd == 2) {
2929	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));	3132	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2930	} elsif ($self->extcmd == 1) {	3133	} elsif ($self->extcmd == 1) {
2931	#TODO: version 1, remove	3134	#TODO: version 1, remove
2932	unshift @msg, msgtype => "reply", msgid => $id;	3135	unshift @msg, msgtype => "reply", msgid => $id;
2933	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3136	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2934	}	3137	}
2935	}	3138	}
2936		3139
2937	=item $success = $client->query ($flags, "text", \&cb)	3140	=item $success = $client->query ($flags, "text", \&cb)
2938		3141
…		…
3009		3212
3010	$ns->ext_reply ($reply, @reply)	3213	$ns->ext_reply ($reply, @reply)
3011	if $reply;	3214	if $reply;
3012		3215
3013	} else {	3216	} else {
3014	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3217	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3015	}	3218	}
3016		3219
3017	cf::override;	3220	cf::override;
3018	},	3221	},
3019	);	3222	);
…		…
3039		3242
3040	$coro	3243	$coro
3041	}	3244	}
3042		3245
3043	cf::client->attach (	3246	cf::client->attach (
3044	on_destroy => sub {	3247	on_client_destroy => sub {
3045	my ($ns) = @_;	3248	my ($ns) = @_;
3046		3249
3047	$_->cancel for values %{ (delete $ns->{_coro}) || {} };	3250	$_->cancel for values %{ (delete $ns->{_coro}) || {} };
3048	},	3251	},
3049	);	3252	);
…		…
3065	our $safe_hole = new Safe::Hole;	3268	our $safe_hole = new Safe::Hole;
3066		3269
3067	$SIG{FPE} = 'IGNORE';	3270	$SIG{FPE} = 'IGNORE';
3068		3271
3069	$safe->permit_only (Opcode::opset qw(	3272	$safe->permit_only (Opcode::opset qw(
3070	:base_core :base_mem :base_orig :base_math	3273	:base_core :base_mem :base_orig :base_math :base_loop
3071	grepstart grepwhile mapstart mapwhile	3274	grepstart grepwhile mapstart mapwhile
3072	sort time	3275	sort time
3073	));	3276	));
3074		3277
3075	# here we export the classes and methods available to script code	3278	# here we export the classes and methods available to script code
…		…
3100	decrease split destroy change_exp value msg lore send_msg)],	3303	decrease split destroy change_exp value msg lore send_msg)],
3101	["cf::object::player" => qw(player)],	3304	["cf::object::player" => qw(player)],
3102	["cf::player" => qw(peaceful send_msg)],	3305	["cf::player" => qw(peaceful send_msg)],
3103	["cf::map" => qw(trigger)],	3306	["cf::map" => qw(trigger)],
3104	) {	3307	) {
3105	no strict 'refs';
3106	my ($pkg, @funs) = @$_;	3308	my ($pkg, @funs) = @$_;
3107	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3309	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3108	for @funs;	3310	for @funs;
3109	}	3311	}
3110		3312
…		…
3127	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3329	$qcode =~ s/"/‟/g; # not allowed in #line filenames
3128	$qcode =~ s/\n/\\n/g;	3330	$qcode =~ s/\n/\\n/g;
3129		3331
3130	%vars = (_dummy => 0) unless %vars;	3332	%vars = (_dummy => 0) unless %vars;
3131		3333
		3334	my @res;
3132	local $_;	3335	local $_;
3133	local @safe::cf::_safe_eval_args = values %vars;
3134		3336
3135	my $eval =	3337	my $eval =
3136	"do {\n"	3338	"do {\n"
3137	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"	3339	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3138	. "#line 0 \"{$qcode}\"\n"	3340	. "#line 0 \"{$qcode}\"\n"
3139	. $code	3341	. $code
3140	. "\n}"	3342	. "\n}"
3141	;	3343	;
3142		3344
		3345	if ($CFG{safe_eval}) {
3143	sub_generation_inc;	3346	sub_generation_inc;
		3347	local @safe::cf::_safe_eval_args = values %vars;
3144	my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);	3348	@res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3145	sub_generation_inc;	3349	sub_generation_inc;
		3350	} else {
		3351	local @cf::_safe_eval_args = values %vars;
		3352	@res = wantarray ? eval eval : scalar eval $eval;
		3353	}
3146		3354
3147	if ($@) {	3355	if ($@) {
3148	warn "$@";	3356	warn "$@",
3149	warn "while executing safe code '$code'\n";	3357	"while executing safe code '$code'\n",
3150	warn "with arguments " . (join " ", %vars) . "\n";	3358	"with arguments " . (join " ", %vars) . "\n";
3151	}	3359	}
3152		3360
3153	wantarray ? @res : $res[0]	3361	wantarray ? @res : $res[0]
3154	}	3362	}
3155		3363
…		…
3169	=cut	3377	=cut
3170		3378
3171	sub register_script_function {	3379	sub register_script_function {
3172	my ($fun, $cb) = @_;	3380	my ($fun, $cb) = @_;
3173		3381
3174	no strict 'refs';	3382	$fun = "safe::$fun" if $CFG{safe_eval};
3175	*{"safe::$fun"} = $safe_hole->wrap ($cb);	3383	*$fun = $safe_hole->wrap ($cb);
3176	}	3384	}
3177		3385
3178	=back	3386	=back
3179		3387
3180	=cut	3388	=cut
…		…
3189	# for this (global event?)	3397	# for this (global event?)
3190	%ext::player_env::MUSIC_FACE_CACHE = ();	3398	%ext::player_env::MUSIC_FACE_CACHE = ();
3191		3399
3192	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3400	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3193		3401
3194	warn "loading facedata from $path\n";	3402	trace "loading facedata from $path\n";
3195		3403
3196	my $facedata;
3197	0 < aio_load $path, $facedata	3404	0 < aio_load $path, my $facedata
3198	or die "$path: $!";	3405	or die "$path: $!";
3199		3406
3200	$facedata = Coro::Storable::thaw $facedata;	3407	$facedata = Coro::Storable::thaw $facedata;
3201		3408
3202	$facedata->{version} == 2	3409	$facedata->{version} == 2
3203	or cf::cleanup "$path: version mismatch, cannot proceed.";	3410	or cf::cleanup "$path: version mismatch, cannot proceed.";
3204		3411
3205	# patch in the exptable	3412	# patch in the exptable
		3413	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3206	$facedata->{resource}{"res/exp_table"} = {	3414	$facedata->{resource}{"res/exp_table"} = {
3207	type => FT_RSRC,	3415	type => FT_RSRC,
3208	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),	3416	data => $exp_table,
		3417	hash => (Digest::MD5::md5 $exp_table),
3209	};	3418	};
3210	cf::cede_to_tick;	3419	cf::cede_to_tick;
3211		3420
3212	{	3421	{
3213	my $faces = $facedata->{faceinfo};	3422	my $faces = $facedata->{faceinfo};
…		…
3215	while (my ($face, $info) = each %$faces) {	3424	while (my ($face, $info) = each %$faces) {
3216	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3425	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3217		3426
3218	cf::face::set_visibility $idx, $info->{visibility};	3427	cf::face::set_visibility $idx, $info->{visibility};
3219	cf::face::set_magicmap $idx, $info->{magicmap};	3428	cf::face::set_magicmap $idx, $info->{magicmap};
3220	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};	3429	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3221	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};	3430	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
		3431	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3222		3432
3223	cf::cede_to_tick;	3433	cf::cede_to_tick;
3224	}	3434	}
3225		3435
3226	while (my ($face, $info) = each %$faces) {	3436	while (my ($face, $info) = each %$faces) {
…		…
3231		3441
3232	if (my $smooth = cf::face::find $info->{smooth}) {	3442	if (my $smooth = cf::face::find $info->{smooth}) {
3233	cf::face::set_smooth $idx, $smooth;	3443	cf::face::set_smooth $idx, $smooth;
3234	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3444	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3235	} else {	3445	} else {
3236	warn "smooth face '$info->{smooth}' not found for face '$face'";	3446	error "smooth face '$info->{smooth}' not found for face '$face'";
3237	}	3447	}
3238		3448
3239	cf::cede_to_tick;	3449	cf::cede_to_tick;
3240	}	3450	}
3241	}	3451	}
…		…
3250		3460
3251	cf::anim::invalidate_all; # d'oh	3461	cf::anim::invalidate_all; # d'oh
3252	}	3462	}
3253		3463
3254	{	3464	{
3255	# TODO: for gcfclient pleasure, we should give resources
3256	# that gcfclient doesn't grok a >10000 face index.
3257	my $res = $facedata->{resource};	3465	my $res = $facedata->{resource};
3258		3466
3259	while (my ($name, $info) = each %$res) {	3467	while (my ($name, $info) = each %$res) {
3260	if (defined $info->{type}) {	3468	if (defined $info->{type}) {
3261	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3469	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3262	my $data;
3263		3470
3264	if ($info->{type} & 1) {	3471	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3265	# prepend meta info
3266
3267	my $meta = $enc->encode ({
3268	name => $name,
3269	%{ $info->{meta} || {} },
3270	});
3271
3272	$data = pack "(w/a*)*", $meta, $info->{data};
3273	} else {
3274	$data = $info->{data};
3275	}
3276
3277	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3278	cf::face::set_type $idx, $info->{type};	3472	cf::face::set_type $idx, $info->{type};
3279	} else {	3473	} else {
3280	$RESOURCE{$name} = $info;	3474	$RESOURCE{$name} = $info; # unused
3281	}	3475	}
3282		3476
3283	cf::cede_to_tick;	3477	cf::cede_to_tick;
3284	}	3478	}
3285	}	3479	}
3286		3480
3287	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3481	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3288		3482
3289	1	3483	1
3290	}	3484	}
3291
3292	cf::global->attach (on_resource_update => sub {
3293	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3294	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3295
3296	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3297	my $sound = $soundconf->{compat}[$_]
3298	or next;
3299
3300	my $face = cf::face::find "sound/$sound->[1]";
3301	cf::sound::set $sound->[0] => $face;
3302	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3303	}
3304
3305	while (my ($k, $v) = each %{$soundconf->{event}}) {
3306	my $face = cf::face::find "sound/$v";
3307	cf::sound::set $k => $face;
3308	}
3309	}
3310	});
3311		3485
3312	register_exticmd fx_want => sub {	3486	register_exticmd fx_want => sub {
3313	my ($ns, $want) = @_;	3487	my ($ns, $want) = @_;
3314		3488
3315	while (my ($k, $v) = each %$want) {	3489	while (my ($k, $v) = each %$want) {
…		…
3354	sub reload_treasures {	3528	sub reload_treasures {
3355	load_resource_file "$DATADIR/treasures"	3529	load_resource_file "$DATADIR/treasures"
3356	or die "unable to load treasurelists\n";	3530	or die "unable to load treasurelists\n";
3357	}	3531	}
3358		3532
		3533	sub reload_sound {
		3534	trace "loading sound config from $DATADIR/sound\n";
		3535
		3536	0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
		3537	or die "$DATADIR/sound $!";
		3538
		3539	my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
		3540
		3541	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3542	my $sound = $soundconf->{compat}[$_]
		3543	or next;
		3544
		3545	my $face = cf::face::find "sound/$sound->[1]";
		3546	cf::sound::set $sound->[0] => $face;
		3547	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3548	}
		3549
		3550	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3551	my $face = cf::face::find "sound/$v";
		3552	cf::sound::set $k => $face;
		3553	}
		3554	}
		3555
3359	sub reload_resources {	3556	sub reload_resources {
3360	warn "reloading resource files...\n";	3557	trace "reloading resource files...\n";
3361		3558
		3559	reload_exp_table;
		3560	reload_materials;
3362	reload_facedata;	3561	reload_facedata;
		3562	reload_sound;
3363	reload_archetypes;	3563	reload_archetypes;
3364	reload_regions;	3564	reload_regions;
3365	reload_treasures;	3565	reload_treasures;
3366		3566
3367	warn "finished reloading resource files\n";	3567	trace "finished reloading resource files\n";
3368	}	3568	}
3369		3569
3370	sub reload_config {	3570	sub reload_config {
3371	open my $fh, "<:utf8", "$CONFDIR/config"	3571	trace "reloading config file...\n";
3372	or return;
3373		3572
3374	local $/;	3573	0 < aio_load "$CONFDIR/config", my $config
3375	*CFG = YAML::Load <$fh>;	3574	or die "$CONFDIR/config: $!";
3376		3575
		3576	utf8::decode $config;
		3577	*CFG = yaml_load $config;
		3578
3377	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3579	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3378		3580
3379	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3581	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3380	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3582	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3381		3583
3382	if (exists $CFG{mlockall}) {	3584	if (exists $CFG{mlockall}) {
…		…
3406	seek $fh, 0, 0;	3608	seek $fh, 0, 0;
3407	print $fh $$;	3609	print $fh $$;
3408	}	3610	}
3409		3611
3410	sub main_loop {	3612	sub main_loop {
3411	warn "EV::loop starting\n";	3613	trace "EV::loop starting\n";
3412	if (1) {	3614	if (1) {
3413	EV::loop;	3615	EV::loop;
3414	}	3616	}
3415	warn "EV::loop returned\n";	3617	trace "EV::loop returned\n";
3416	goto &main_loop unless $REALLY_UNLOOP;	3618	goto &main_loop unless $REALLY_UNLOOP;
3417	}	3619	}
3418		3620
3419	sub main {	3621	sub main {
3420	cf::init_globals; # initialise logging	3622	cf::init_globals; # initialise logging
3421		3623
3422	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3624	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3423	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3625	LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3424	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3626	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3425	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3627	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3426
3427	cf::init_experience;
3428	cf::init_anim;
3429	cf::init_attackmess;
3430	cf::init_dynamic;
3431		3628
3432	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3629	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3433		3630
3434	# we must not ever block the main coroutine	3631	# we must not ever block the main coroutine
3435	local $Coro::idle = sub {	3632	local $Coro::idle = sub {
…		…
3441	};	3638	};
3442		3639
3443	evthread_start IO::AIO::poll_fileno;	3640	evthread_start IO::AIO::poll_fileno;
3444		3641
3445	cf::sync_job {	3642	cf::sync_job {
		3643	cf::incloader::init ();
		3644
		3645	cf::init_anim;
		3646	cf::init_attackmess;
		3647	cf::init_dynamic;
		3648
		3649	cf::load_settings;
		3650
3446	reload_resources;	3651	reload_resources;
3447	reload_config;	3652	reload_config;
3448	db_init;	3653	db_init;
3449		3654
3450	cf::load_settings;
3451	cf::load_materials;
3452	cf::init_uuid;	3655	cf::init_uuid;
3453	cf::init_signals;	3656	cf::init_signals;
3454	cf::init_commands;
3455	cf::init_skills;	3657	cf::init_skills;
3456		3658
3457	cf::init_beforeplay;	3659	cf::init_beforeplay;
3458		3660
3459	atomic;	3661	atomic;
…		…
3464		3666
3465	# no (long-running) fork's whatsoever before this point(!)	3667	# no (long-running) fork's whatsoever before this point(!)
3466	use POSIX ();	3668	use POSIX ();
3467	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3669	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3468		3670
3469	(pop @POST_INIT)->(0) while @POST_INIT;	3671	cf::_post_init 0;
3470	};	3672	};
3471		3673
		3674	cf::object::thawer::errors_are_fatal 0;
		3675	info "parse errors in files are no longer fatal from this point on.\n";
		3676
		3677	my $free_main; $free_main = EV::idle sub {
		3678	undef $free_main;
		3679	undef &main; # free gobs of memory :)
		3680	};
		3681
3472	main_loop;	3682	goto &main_loop;
3473	}	3683	}
3474		3684
3475	#############################################################################	3685	#############################################################################
3476	# initialisation and cleanup	3686	# initialisation and cleanup
3477		3687
3478	# install some emergency cleanup handlers	3688	# install some emergency cleanup handlers
3479	BEGIN {	3689	BEGIN {
3480	our %SIGWATCHER = ();	3690	our %SIGWATCHER = ();
3481	for my $signal (qw(INT HUP TERM)) {	3691	for my $signal (qw(INT HUP TERM)) {
3482	$SIGWATCHER{$signal} = EV::signal $signal, sub {	3692	$SIGWATCHER{$signal} = AE::signal $signal, sub {
3483	cf::cleanup "SIG$signal";	3693	cf::cleanup "SIG$signal";
3484	};	3694	};
3485	}	3695	}
3486	}	3696	}
3487		3697
3488	sub write_runtime_sync {	3698	sub write_runtime_sync {
		3699	my $t0 = AE::time;
		3700
3489	# first touch the runtime file to show we are still running:	3701	# first touch the runtime file to show we are still running:
3490	# the fsync below can take a very very long time.	3702	# the fsync below can take a very very long time.
3491		3703
3492	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;	3704	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3493		3705
3494	my $guard = cf::lock_acquire "write_runtime";	3706	my $guard = cf::lock_acquire "write_runtime";
3495		3707
3496	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644	3708	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3497	or return;	3709	or return;
3498		3710
3499	my $value = $cf::RUNTIME + 90 + 10;	3711	my $value = $cf::RUNTIME + 90 + 10;
3500	# 10 is the runtime save interval, for a monotonic clock	3712	# 10 is the runtime save interval, for a monotonic clock
3501	# 60 allows for the watchdog to kill the server.	3713	# 60 allows for the watchdog to kill the server.
…		…
3514	or return;	3726	or return;
3515		3727
3516	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3728	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3517	and return;	3729	and return;
3518		3730
3519	warn "runtime file written.\n";	3731	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3520		3732
3521	1	3733	1
3522	}	3734	}
3523		3735
3524	our $uuid_lock;	3736	our $uuid_lock;
…		…
3536	or return;	3748	or return;
3537		3749
3538	my $value = uuid_seq uuid_cur;	3750	my $value = uuid_seq uuid_cur;
3539		3751
3540	unless ($value) {	3752	unless ($value) {
3541	warn "cowardly refusing to write zero uuid value!\n";	3753	info "cowardly refusing to write zero uuid value!\n";
3542	return;	3754	return;
3543	}	3755	}
3544		3756
3545	my $value = uuid_str $value + $uuid_skip;	3757	my $value = uuid_str $value + $uuid_skip;
3546	$uuid_skip = 0;	3758	$uuid_skip = 0;
…		…
3556	or return;	3768	or return;
3557		3769
3558	aio_rename "$uuid~", $uuid	3770	aio_rename "$uuid~", $uuid
3559	and return;	3771	and return;
3560		3772
3561	warn "uuid file written ($value).\n";	3773	trace "uuid file written ($value).\n";
3562		3774
3563	1	3775	1
3564		3776
3565	}	3777	}
3566		3778
…		…
3572	}	3784	}
3573		3785
3574	sub emergency_save() {	3786	sub emergency_save() {
3575	my $freeze_guard = cf::freeze_mainloop;	3787	my $freeze_guard = cf::freeze_mainloop;
3576		3788
3577	warn "emergency_perl_save: enter\n";	3789	info "emergency_perl_save: enter\n";
		3790
		3791	# this is a trade-off: we want to be very quick here, so
		3792	# save all maps without fsync, and later call a global sync
		3793	# (which in turn might be very very slow)
		3794	local $USE_FSYNC = 0;
3578		3795
3579	cf::sync_job {	3796	cf::sync_job {
3580	# this is a trade-off: we want to be very quick here, so	3797	cf::write_runtime_sync; # external watchdog should not bark
3581	# save all maps without fsync, and later call a global sync
3582	# (which in turn might be very very slow)
3583	local $USE_FSYNC = 0;
3584		3798
3585	# use a peculiar iteration method to avoid tripping on perl	3799	# use a peculiar iteration method to avoid tripping on perl
3586	# refcount bugs in for. also avoids problems with players	3800	# refcount bugs in for. also avoids problems with players
3587	# and maps saved/destroyed asynchronously.	3801	# and maps saved/destroyed asynchronously.
3588	warn "emergency_perl_save: begin player save\n";	3802	info "emergency_perl_save: begin player save\n";
3589	for my $login (keys %cf::PLAYER) {	3803	for my $login (keys %cf::PLAYER) {
3590	my $pl = $cf::PLAYER{$login} or next;	3804	my $pl = $cf::PLAYER{$login} or next;
3591	$pl->valid or next;	3805	$pl->valid or next;
3592	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3806	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3593	$pl->save;	3807	$pl->save;
3594	}	3808	}
3595	warn "emergency_perl_save: end player save\n";	3809	info "emergency_perl_save: end player save\n";
3596		3810
		3811	cf::write_runtime_sync; # external watchdog should not bark
		3812
3597	warn "emergency_perl_save: begin map save\n";	3813	info "emergency_perl_save: begin map save\n";
3598	for my $path (keys %cf::MAP) {	3814	for my $path (keys %cf::MAP) {
3599	my $map = $cf::MAP{$path} or next;	3815	my $map = $cf::MAP{$path} or next;
3600	$map->valid or next;	3816	$map->valid or next;
3601	$map->save;	3817	$map->save;
3602	}	3818	}
3603	warn "emergency_perl_save: end map save\n";	3819	info "emergency_perl_save: end map save\n";
3604		3820
		3821	cf::write_runtime_sync; # external watchdog should not bark
		3822
3605	warn "emergency_perl_save: begin database checkpoint\n";	3823	info "emergency_perl_save: begin database checkpoint\n";
3606	BDB::db_env_txn_checkpoint $DB_ENV;	3824	BDB::db_env_txn_checkpoint $DB_ENV;
3607	warn "emergency_perl_save: end database checkpoint\n";	3825	info "emergency_perl_save: end database checkpoint\n";
3608		3826
3609	warn "emergency_perl_save: begin write uuid\n";	3827	info "emergency_perl_save: begin write uuid\n";
3610	write_uuid_sync 1;	3828	write_uuid_sync 1;
3611	warn "emergency_perl_save: end write uuid\n";	3829	info "emergency_perl_save: end write uuid\n";
		3830
		3831	cf::write_runtime_sync; # external watchdog should not bark
		3832
		3833	trace "emergency_perl_save: syncing database to disk";
		3834	BDB::db_env_txn_checkpoint $DB_ENV;
		3835
		3836	info "emergency_perl_save: starting sync\n";
		3837	IO::AIO::aio_sync sub {
		3838	info "emergency_perl_save: finished sync\n";
		3839	};
		3840
		3841	cf::write_runtime_sync; # external watchdog should not bark
		3842
		3843	trace "emergency_perl_save: flushing outstanding aio requests";
		3844	while (IO::AIO::nreqs || BDB::nreqs) {
		3845	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
		3846	}
		3847
		3848	cf::write_runtime_sync; # external watchdog should not bark
3612	};	3849	};
3613		3850
3614	warn "emergency_perl_save: starting sync()\n";
3615	IO::AIO::aio_sync sub {
3616	warn "emergency_perl_save: finished sync()\n";
3617	};
3618
3619	warn "emergency_perl_save: leave\n";	3851	info "emergency_perl_save: leave\n";
3620	}	3852	}
3621		3853
3622	sub post_cleanup {	3854	sub post_cleanup {
3623	my ($make_core) = @_;	3855	my ($make_core) = @_;
3624		3856
		3857	IO::AIO::flush;
		3858
3625	warn Carp::longmess "post_cleanup backtrace"	3859	error Carp::longmess "post_cleanup backtrace"
3626	if $make_core;	3860	if $make_core;
3627		3861
3628	my $fh = pidfile;	3862	my $fh = pidfile;
3629	unlink $PIDFILE if <$fh> == $$;	3863	unlink $PIDFILE if <$fh> == $$;
3630	}	3864	}
…		…
3650	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	3884	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3651	for my $name (keys %$leaf_symtab) {	3885	for my $name (keys %$leaf_symtab) {
3652	_gv_clear *{"$pkg$name"};	3886	_gv_clear *{"$pkg$name"};
3653	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	3887	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3654	}	3888	}
3655	warn "cleared package $pkg\n";#d#
3656	}	3889	}
3657		3890
3658	sub do_reload_perl() {	3891	sub do_reload_perl() {
3659	# can/must only be called in main	3892	# can/must only be called in main
3660	if ($Coro::current != $Coro::main) {	3893	unless (in_main) {
3661	warn "can only reload from main coroutine";	3894	error "can only reload from main coroutine";
3662	return;	3895	return;
3663	}	3896	}
3664		3897
3665	return if $RELOAD++;	3898	return if $RELOAD++;
3666		3899
3667	my $t1 = EV::time;	3900	my $t1 = AE::time;
3668		3901
3669	while ($RELOAD) {	3902	while ($RELOAD) {
3670	warn "reloading...";	3903	cf::get_slot 0.1, -1, "reload_perl";
		3904	info "perl_reload: reloading...";
3671		3905
3672	warn "entering sync_job";	3906	trace "perl_reload: entering sync_job";
3673		3907
3674	cf::sync_job {	3908	cf::sync_job {
3675	cf::write_runtime_sync; # external watchdog should not bark
3676	cf::emergency_save;	3909	#cf::emergency_save;
3677	cf::write_runtime_sync; # external watchdog should not bark
3678		3910
3679	warn "syncing database to disk";
3680	BDB::db_env_txn_checkpoint $DB_ENV;
3681
3682	# if anything goes wrong in here, we should simply crash as we already saved
3683
3684	warn "flushing outstanding aio requests";
3685	while (IO::AIO::nreqs || BDB::nreqs) {
3686	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3687	}
3688
3689	warn "cancelling all extension coros";	3911	trace "perl_reload: cancelling all extension coros";
3690	$_->cancel for values %EXT_CORO;	3912	$_->cancel for values %EXT_CORO;
3691	%EXT_CORO = ();	3913	%EXT_CORO = ();
3692		3914
3693	warn "removing commands";	3915	trace "perl_reload: removing commands";
3694	%COMMAND = ();	3916	%COMMAND = ();
3695		3917
3696	warn "removing ext/exti commands";	3918	trace "perl_reload: removing ext/exti commands";
3697	%EXTCMD = ();	3919	%EXTCMD = ();
3698	%EXTICMD = ();	3920	%EXTICMD = ();
3699		3921
3700	warn "unloading/nuking all extensions";	3922	trace "perl_reload: unloading/nuking all extensions";
3701	for my $pkg (@EXTS) {	3923	for my $pkg (@EXTS) {
3702	warn "... unloading $pkg";	3924	trace "... unloading $pkg";
3703		3925
3704	if (my $cb = $pkg->can ("unload")) {	3926	if (my $cb = $pkg->can ("unload")) {
3705	eval {	3927	eval {
3706	$cb->($pkg);	3928	$cb->($pkg);
3707	1	3929	1
3708	} or warn "$pkg unloaded, but with errors: $@";	3930	} or error "$pkg unloaded, but with errors: $@";
3709	}	3931	}
3710		3932
3711	warn "... clearing $pkg";	3933	trace "... clearing $pkg";
3712	clear_package $pkg;	3934	clear_package $pkg;
3713	}	3935	}
3714		3936
3715	warn "unloading all perl modules loaded from $LIBDIR";	3937	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3716	while (my ($k, $v) = each %INC) {	3938	while (my ($k, $v) = each %INC) {
3717	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	3939	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3718		3940
3719	warn "... unloading $k";	3941	trace "... unloading $k";
3720	delete $INC{$k};	3942	delete $INC{$k};
3721		3943
3722	$k =~ s/\.pm$//;	3944	$k =~ s/\.pm$//;
3723	$k =~ s/\//::/g;	3945	$k =~ s/\//::/g;
3724		3946
…		…
3727	}	3949	}
3728		3950
3729	clear_package $k;	3951	clear_package $k;
3730	}	3952	}
3731		3953
3732	warn "getting rid of safe::, as good as possible";	3954	trace "perl_reload: getting rid of safe::, as good as possible";
3733	clear_package "safe::$_"	3955	clear_package "safe::$_"
3734	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	3956	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3735		3957
3736	warn "unloading cf.pm \"a bit\"";	3958	trace "perl_reload: unloading cf.pm \"a bit\"";
3737	delete $INC{"cf.pm"};	3959	delete $INC{"cf.pm"};
3738	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	3960	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3739		3961
3740	# don't, removes xs symbols, too,	3962	# don't, removes xs symbols, too,
3741	# and global variables created in xs	3963	# and global variables created in xs
3742	#clear_package __PACKAGE__;	3964	#clear_package __PACKAGE__;
3743		3965
3744	warn "unload completed, starting to reload now";	3966	info "perl_reload: unload completed, starting to reload now";
3745		3967
3746	warn "reloading cf.pm";	3968	trace "perl_reload: reloading cf.pm";
3747	require cf;	3969	require cf;
3748	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3970	cf::_connect_to_perl_1;
3749		3971
3750	warn "loading config and database again";	3972	trace "perl_reload: loading config and database again";
3751	cf::reload_config;	3973	cf::reload_config;
3752		3974
3753	warn "loading extensions";	3975	trace "perl_reload: loading extensions";
3754	cf::load_extensions;	3976	cf::load_extensions;
3755		3977
3756	if ($REATTACH_ON_RELOAD) {	3978	if ($REATTACH_ON_RELOAD) {
3757	warn "reattaching attachments to objects/players";	3979	trace "perl_reload: reattaching attachments to objects/players";
3758	_global_reattach; # objects, sockets	3980	_global_reattach; # objects, sockets
3759	warn "reattaching attachments to maps";	3981	trace "perl_reload: reattaching attachments to maps";
3760	reattach $_ for values %MAP;	3982	reattach $_ for values %MAP;
3761	warn "reattaching attachments to players";	3983	trace "perl_reload: reattaching attachments to players";
3762	reattach $_ for values %PLAYER;	3984	reattach $_ for values %PLAYER;
3763	}	3985	}
3764		3986
3765	warn "running post_init jobs";	3987	cf::_post_init 1;
3766	(pop @POST_INIT)->(1) while @POST_INIT;
3767		3988
3768	warn "leaving sync_job";	3989	trace "perl_reload: leaving sync_job";
3769		3990
3770	1	3991	1
3771	} or do {	3992	} or do {
3772	warn $@;	3993	error $@;
3773	cf::cleanup "error while reloading, exiting.";	3994	cf::cleanup "perl_reload: error, exiting.";
3774	};	3995	};
3775		3996
3776	warn "reloaded";
3777	--$RELOAD;	3997	--$RELOAD;
3778	}	3998	}
3779		3999
3780	$t1 = EV::time - $t1;	4000	$t1 = AE::time - $t1;
3781	warn "reload completed in ${t1}s\n";	4001	info "perl_reload: completed in ${t1}s\n";
3782	};	4002	};
3783		4003
3784	our $RELOAD_WATCHER; # used only during reload	4004	our $RELOAD_WATCHER; # used only during reload
3785		4005
3786	sub reload_perl() {	4006	sub reload_perl() {
…		…
3788	# coro crashes during coro_state_free->destroy here.	4008	# coro crashes during coro_state_free->destroy here.
3789		4009
3790	$RELOAD_WATCHER ||= cf::async {	4010	$RELOAD_WATCHER ||= cf::async {
3791	Coro::AIO::aio_wait cache_extensions;	4011	Coro::AIO::aio_wait cache_extensions;
3792		4012
3793	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {	4013	$RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3794	do_reload_perl;	4014	do_reload_perl;
3795	undef $RELOAD_WATCHER;	4015	undef $RELOAD_WATCHER;
3796	};	4016	};
3797	};	4017	};
3798	}	4018	}
…		…
3807	reload_perl;	4027	reload_perl;
3808	};	4028	};
3809	}	4029	}
3810	};	4030	};
3811		4031
3812	unshift @INC, $LIBDIR;	4032	#############################################################################
3813		4033
3814	my $bug_warning = 0;	4034	my $bug_warning = 0;
3815		4035
3816	our @WAIT_FOR_TICK;	4036	our @WAIT_FOR_TICK;
3817	our @WAIT_FOR_TICK_BEGIN;	4037	our @WAIT_FOR_TICK_BEGIN;
3818		4038
3819	sub wait_for_tick {	4039	sub wait_for_tick() {
3820	return if tick_inhibit || $Coro::current == $Coro::main;	4040	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3821		4041
3822	my $signal = new Coro::Signal;	4042	my $signal = new Coro::Signal;
3823	push @WAIT_FOR_TICK, $signal;	4043	push @WAIT_FOR_TICK, $signal;
3824	$signal->wait;	4044	$signal->wait;
3825	}	4045	}
3826		4046
3827	sub wait_for_tick_begin {	4047	sub wait_for_tick_begin() {
3828	return if tick_inhibit || $Coro::current == $Coro::main;	4048	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3829		4049
3830	my $signal = new Coro::Signal;	4050	my $signal = new Coro::Signal;
3831	push @WAIT_FOR_TICK_BEGIN, $signal;	4051	push @WAIT_FOR_TICK_BEGIN, $signal;
3832	$signal->wait;	4052	$signal->wait;
3833	}	4053	}
…		…
3839	return;	4059	return;
3840	}	4060	}
3841		4061
3842	cf::server_tick; # one server iteration	4062	cf::server_tick; # one server iteration
3843		4063
		4064	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
		4065
3844	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4066	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3845	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4067	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3846	Coro::async_pool {	4068	Coro::async_pool {
3847	$Coro::current->{desc} = "runtime saver";	4069	$Coro::current->{desc} = "runtime saver";
3848	write_runtime_sync	4070	write_runtime_sync
3849	or warn "ERROR: unable to write runtime file: $!";	4071	or error "ERROR: unable to write runtime file: $!";
3850	};	4072	};
3851	}	4073	}
3852		4074
3853	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4075	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3854	$sig->send;	4076	$sig->send;
…		…
3862		4084
3863	if (0) {	4085	if (0) {
3864	if ($NEXT_TICK) {	4086	if ($NEXT_TICK) {
3865	my $jitter = $TICK_START - $NEXT_TICK;	4087	my $jitter = $TICK_START - $NEXT_TICK;
3866	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4088	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
3867	warn "jitter $JITTER\n";#d#	4089	debug "jitter $JITTER\n";#d#
3868	}	4090	}
3869	}	4091	}
3870	}	4092	}
3871		4093
3872	{	4094	{
3873	# configure BDB	4095	# configure BDB
3874		4096
3875	BDB::min_parallel 8;	4097	BDB::min_parallel 16;
3876	BDB::max_poll_reqs $TICK * 0.1;	4098	BDB::max_poll_reqs $TICK * 0.1;
3877	$AnyEvent::BDB::WATCHER->priority (1);	4099	$AnyEvent::BDB::WATCHER->priority (1);
3878		4100
3879	unless ($DB_ENV) {	4101	unless ($DB_ENV) {
3880	$DB_ENV = BDB::db_env_create;	4102	$DB_ENV = BDB::db_env_create;
…		…
3917	IO::AIO::min_parallel 8;	4139	IO::AIO::min_parallel 8;
3918	IO::AIO::max_poll_time $TICK * 0.1;	4140	IO::AIO::max_poll_time $TICK * 0.1;
3919	undef $AnyEvent::AIO::WATCHER;	4141	undef $AnyEvent::AIO::WATCHER;
3920	}	4142	}
3921		4143
3922	my $_log_backtrace;	4144	our $_log_backtrace;
		4145	our $_log_backtrace_last;
3923		4146
3924	sub _log_backtrace {	4147	sub _log_backtrace {
3925	my ($msg, @addr) = @_;	4148	my ($msg, @addr) = @_;
3926		4149
3927	$msg =~ s/\n//;	4150	$msg =~ s/\n$//;
3928		4151
		4152	if ($_log_backtrace_last eq $msg) {
		4153	LOG llevInfo, "[ABT] $msg\n";
		4154	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3929	# limit the # of concurrent backtraces	4155	# limit the # of concurrent backtraces
3930	if ($_log_backtrace < 2) {	4156	} elsif ($_log_backtrace < 2) {
		4157	$_log_backtrace_last = $msg;
3931	++$_log_backtrace;	4158	++$_log_backtrace;
3932	my $perl_bt = Carp::longmess $msg;	4159	my $perl_bt = Carp::longmess $msg;
3933	async {	4160	async {
3934	$Coro::current->{desc} = "abt $msg";	4161	$Coro::current->{desc} = "abt $msg";
3935		4162
…		…
3955	LOG llevInfo, "[ABT] $_\n" for @bt;	4182	LOG llevInfo, "[ABT] $_\n" for @bt;
3956	--$_log_backtrace;	4183	--$_log_backtrace;
3957	};	4184	};
3958	} else {	4185	} else {
3959	LOG llevInfo, "[ABT] $msg\n";	4186	LOG llevInfo, "[ABT] $msg\n";
3960	LOG llevInfo, "[ABT] [suppressed]\n";	4187	LOG llevInfo, "[ABT] [overload, suppressed]\n";
3961	}	4188	}
3962	}	4189	}
3963		4190
3964	# load additional modules	4191	# load additional modules
3965	require "cf/$_.pm" for @EXTRA_MODULES;	4192	require "cf/$_.pm" for @EXTRA_MODULES;
		4193	cf::_connect_to_perl_2;
3966		4194
3967	END { cf::emergency_save }	4195	END { cf::emergency_save }
3968		4196
3969	1	4197	1
3970		4198

Diff Legend

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