ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

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

Diff Legend

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