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.480 by root, Thu Oct 8 05:09:43 2009 UTC vs.
Revision 1.559 by root, Sat Feb 26 12:50:27 2011 UTC

1	#	1	#
2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	#	3	#
4	# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	#	5	#
6	# Deliantra is free software: you can redistribute it and/or modify	6	# Deliantra is free software: you can redistribute it and/or modify it under
7	# it under the terms of the GNU General Public License as published by	7	# the terms of the Affero GNU General Public License as published by the
8	# the Free Software Foundation, either version 3 of the License, or	8	# Free Software Foundation, either version 3 of the License, or (at your
9	# (at your option) any later version.	9	# option) any later version.
10	#	10	#
11	# This program is distributed in the hope that it will be useful,	11	# This program is distributed in the hope that it will be useful,
12	# but WITHOUT ANY WARRANTY; without even the implied warranty of	12	# but WITHOUT ANY WARRANTY; without even the implied warranty of
13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14	# GNU General Public License for more details.	14	# GNU General Public License for more details.
15	#	15	#
16	# You should have received a copy of the GNU General Public License	16	# You should have received a copy of the Affero GNU General Public License
17	# along with this program. If not, see <http://www.gnu.org/licenses/>.	17	# and the GNU General Public License along with this program. If not, see
		18	# <http://www.gnu.org/licenses/>.
18	#	19	#
19	# The authors can be reached via e-mail to <support@deliantra.net>	20	# The authors can be reached via e-mail to <support@deliantra.net>
20	#	21	#
21		22
22	package cf;	23	package cf;
23		24
24	use 5.10.0;	25	use common::sense;
25	use utf8;
26	use strict qw(vars subs);
27		26
28	use Symbol;	27	use Symbol;
29	use List::Util;	28	use List::Util;
30	use Socket;	29	use Socket;
31	use EV;	30	use EV;
32	use Opcode;	31	use Opcode;
33	use Safe;	32	use Safe;
34	use Safe::Hole;	33	use Safe::Hole;
35	use Storable ();	34	use Storable ();
		35	use Carp ();
36		36
37	use Guard ();	37	use Guard ();
38	use Coro ();	38	use Coro ();
39	use Coro::State;	39	use Coro::State;
40	use Coro::Handle;	40	use Coro::Handle;
…		…
51	use Coro::Util ();	51	use Coro::Util ();
52		52
53	use JSON::XS 2.01 ();	53	use JSON::XS 2.01 ();
54	use BDB ();	54	use BDB ();
55	use Data::Dumper;	55	use Data::Dumper;
56	use Digest::MD5;
57	use Fcntl;	56	use Fcntl;
58	use YAML ();	57	use YAML::XS ();
59	use IO::AIO ();	58	use IO::AIO ();
60	use Time::HiRes;	59	use Time::HiRes;
61	use Compress::LZF;	60	use Compress::LZF;
62	use Digest::MD5 ();	61	use Digest::MD5 ();
63		62
…		…
76		75
77	# strictly for debugging	76	# strictly for debugging
78	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };	77	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
79		78
80	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	79	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
		80
		81	our @ORIG_INC;
81		82
82	our %COMMAND = ();	83	our %COMMAND = ();
83	our %COMMAND_TIME = ();	84	our %COMMAND_TIME = ();
84		85
85	our @EXTS = (); # list of extension package names	86	our @EXTS = (); # list of extension package names
…		…
92	our @EVENT;	93	our @EVENT;
93	our @REFLECT; # set by XS	94	our @REFLECT; # set by XS
94	our %REFLECT; # set by us	95	our %REFLECT; # set by us
95		96
96	our $CONFDIR = confdir;	97	our $CONFDIR = confdir;
		98
97	our $DATADIR = datadir;	99	our $DATADIR = datadir;
98	our $LIBDIR = "$DATADIR/ext";	100	our $LIBDIR = "$DATADIR/ext";
99	our $PODDIR = "$DATADIR/pod";	101	our $PODDIR = "$DATADIR/pod";
100	our $MAPDIR = "$DATADIR/" . mapdir;	102	our $MAPDIR = "$DATADIR/" . mapdir;
		103
101	our $LOCALDIR = localdir;	104	our $LOCALDIR = localdir;
102	our $TMPDIR = "$LOCALDIR/" . tmpdir;	105	our $TMPDIR = "$LOCALDIR/" . tmpdir;
103	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	106	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
104	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	107	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
105	our $RANDOMDIR = "$LOCALDIR/random";	108	our $RANDOMDIR = "$LOCALDIR/random";
106	our $BDBDIR = "$LOCALDIR/db";	109	our $BDBDIR = "$LOCALDIR/db";
107	our $PIDFILE = "$LOCALDIR/pid";	110	our $PIDFILE = "$LOCALDIR/pid";
108	our $RUNTIMEFILE = "$LOCALDIR/runtime";	111	our $RUNTIMEFILE = "$LOCALDIR/runtime";
109		112
110	our %RESOURCE;	113	our %RESOURCE; # unused
		114
		115	our $OUTPUT_RATE_MIN = 3000;
		116	our $OUTPUT_RATE_MAX = 1000000;
		117
		118	our $MAX_LINKS = 32; # how many chained exits to follow
		119	our $VERBOSE_IO = 1;
111		120
112	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	121	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
113	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	122	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
114	our $NEXT_TICK;	123	our $NEXT_TICK;
115	our $USE_FSYNC = 1; # use fsync to write maps - default on	124	our $USE_FSYNC = 1; # use fsync to write maps - default on
…		…
117	our $BDB_DEADLOCK_WATCHER;	126	our $BDB_DEADLOCK_WATCHER;
118	our $BDB_CHECKPOINT_WATCHER;	127	our $BDB_CHECKPOINT_WATCHER;
119	our $BDB_TRICKLE_WATCHER;	128	our $BDB_TRICKLE_WATCHER;
120	our $DB_ENV;	129	our $DB_ENV;
121		130
122	our @EXTRA_MODULES = qw(pod mapscript);	131	our @EXTRA_MODULES = qw(pod match mapscript incloader);
123		132
124	our %CFG;	133	our %CFG;
125		134
126	our $UPTIME; $UPTIME ||= time;	135	our $UPTIME; $UPTIME ||= time;
127	our $RUNTIME;	136	our $RUNTIME;
…		…
161		170
162	our $EMERGENCY_POSITION;	171	our $EMERGENCY_POSITION;
163		172
164	sub cf::map::normalise;	173	sub cf::map::normalise;
165		174
		175	sub in_main() {
		176	$Coro::current == $Coro::main
		177	}
		178
166	#############################################################################	179	#############################################################################
167		180
168	%REFLECT = ();	181	%REFLECT = ();
169	for (@REFLECT) {	182	for (@REFLECT) {
170	my $reflect = JSON::XS::decode_json $_;	183	my $reflect = JSON::XS::decode_json $_;
171	$REFLECT{$reflect->{class}} = $reflect;	184	$REFLECT{$reflect->{class}} = $reflect;
172	}	185	}
173		186
174	# this is decidedly evil	187	# this is decidedly evil
175	$REFLECT{object}{flags} = [grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"}];	188	$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
176		189
177	#############################################################################	190	#############################################################################
178		191
179	=head2 GLOBAL VARIABLES	192	=head2 GLOBAL VARIABLES
180		193
…		…
222	from wherever your confdir points to.	235	from wherever your confdir points to.
223		236
224	=item cf::wait_for_tick, cf::wait_for_tick_begin	237	=item cf::wait_for_tick, cf::wait_for_tick_begin
225		238
226	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	239	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
227	returns directly I<after> the tick processing (and consequently, can only wake one process	240	returns directly I<after> the tick processing (and consequently, can only wake one thread
228	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	241	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
229		242
		243	=cut
		244
		245	sub wait_for_tick();
		246	sub wait_for_tick_begin();
		247
230	=item @cf::INVOKE_RESULTS	248	=item @cf::INVOKE_RESULTS
231		249
232	This array contains the results of the last C<invoke ()> call. When	250	This array contains the results of the last C<invoke ()> call. When
233	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of	251	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
234	that call.	252	that call.
235		253
236	=item %cf::REFLECT	254	=item %cf::REFLECT
237		255
…		…
241		259
242	=back	260	=back
243		261
244	=cut	262	=cut
245		263
		264	sub error(@) { LOG llevError, join "", @_ }
		265	sub warn (@) { LOG llevWarn , join "", @_ }
		266	sub info (@) { LOG llevInfo , join "", @_ }
		267	sub debug(@) { LOG llevDebug, join "", @_ }
		268	sub trace(@) { LOG llevTrace, join "", @_ }
		269
246	$Coro::State::WARNHOOK = sub {	270	$Coro::State::WARNHOOK = sub {
247	my $msg = join "", @_;	271	my $msg = join "", @_;
248		272
249	$msg .= "\n"	273	$msg .= "\n"
250	unless $msg =~ /\n$/;	274	unless $msg =~ /\n$/;
251		275
252	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	276	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
253		277
254	LOG llevError, $msg;	278	LOG llevWarn, $msg;
255	};	279	};
256		280
257	$Coro::State::DIEHOOK = sub {	281	$Coro::State::DIEHOOK = sub {
258	return unless $^S eq 0; # "eq", not "=="	282	return unless $^S eq 0; # "eq", not "=="
259		283
260	warn Carp::longmess $_[0];	284	error Carp::longmess $_[0];
261		285
262	if ($Coro::current == $Coro::main) {#d#	286	if (in_main) {#d#
263	warn "DIEHOOK called in main context, Coro bug?\n";#d#	287	error "DIEHOOK called in main context, Coro bug?\n";#d#
264	return;#d#	288	return;#d#
265	}#d#	289	}#d#
266		290
267	# kill coroutine otherwise	291	# kill coroutine otherwise
268	Coro::terminate	292	Coro::terminate
…		…
288	)) {	312	)) {
289	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	313	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
290	}	314	}
291		315
292	$EV::DIED = sub {	316	$EV::DIED = sub {
293	warn "error in event callback: @_";	317	Carp::cluck "error in event callback: @_";
294	};	318	};
295		319
296	#############################################################################	320	#############################################################################
297		321
298	=head2 UTILITY FUNCTIONS	322	=head2 UTILITY FUNCTIONS
…		…
335	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	359	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
336		360
337	sub encode_json($) { $json_coder->encode ($_[0]) }	361	sub encode_json($) { $json_coder->encode ($_[0]) }
338	sub decode_json($) { $json_coder->decode ($_[0]) }	362	sub decode_json($) { $json_coder->decode ($_[0]) }
339		363
		364	=item $ref = cf::yaml_load $scalar
		365
		366	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
		367
		368	=cut
		369
		370	sub fork_call(&@);
		371
		372	sub yaml_load($) {
		373	fork_call { YAML::XS::Load $_[0] } @_
		374	}
		375
340	=item cf::post_init { BLOCK }	376	=item cf::post_init { BLOCK }
341		377
342	Execute the given codeblock, I<after> all extensions have been (re-)loaded,	378	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
343	but I<before> the server starts ticking again.	379	but I<before> the server starts ticking again.
344		380
345	The cdoeblock will have a single boolean argument to indicate whether this	381	The codeblock will have a single boolean argument to indicate whether this
346	is a reload or not.	382	is a reload or not.
347		383
348	=cut	384	=cut
349		385
350	sub post_init(&) {	386	sub post_init(&) {
351	push @POST_INIT, shift;	387	push @POST_INIT, shift;
		388	}
		389
		390	sub _post_init {
		391	trace "running post_init jobs";
		392
		393	# run them in parallel...
		394
		395	my @join;
		396
		397	while () {
		398	push @join, map &Coro::async ($_, 0), @POST_INIT;
		399	@POST_INIT = ();
		400
		401	@join or last;
		402
		403	(pop @join)->join;
		404	}
352	}	405	}
353		406
354	=item cf::lock_wait $string	407	=item cf::lock_wait $string
355		408
356	Wait until the given lock is available. See cf::lock_acquire.	409	Wait until the given lock is available. See cf::lock_acquire.
…		…
395	}	448	}
396		449
397	=item cf::periodic $interval, $cb	450	=item cf::periodic $interval, $cb
398		451
399	Like EV::periodic, but randomly selects a starting point so that the actions	452	Like EV::periodic, but randomly selects a starting point so that the actions
400	get spread over timer.	453	get spread over time.
401		454
402	=cut	455	=cut
403		456
404	sub periodic($$) {	457	sub periodic($$) {
405	my ($interval, $cb) = @_;	458	my ($interval, $cb) = @_;
…		…
422		475
423	=cut	476	=cut
424		477
425	our @SLOT_QUEUE;	478	our @SLOT_QUEUE;
426	our $SLOT_QUEUE;	479	our $SLOT_QUEUE;
		480	our $SLOT_DECAY = 0.9;
427		481
428	$SLOT_QUEUE->cancel if $SLOT_QUEUE;	482	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
429	$SLOT_QUEUE = Coro::async {	483	$SLOT_QUEUE = Coro::async {
430	$Coro::current->desc ("timeslot manager");	484	$Coro::current->desc ("timeslot manager");
431		485
432	my $signal = new Coro::Signal;	486	my $signal = new Coro::Signal;
		487	my $busy;
433		488
434	while () {	489	while () {
435	next_job:	490	next_job:
		491
436	my $avail = cf::till_tick;	492	my $avail = cf::till_tick;
437	if ($avail > 0.01) {	493
438	for (0 .. $#SLOT_QUEUE) {	494	for (0 .. $#SLOT_QUEUE) {
439	if ($SLOT_QUEUE[$_][0] < $avail) {	495	if ($SLOT_QUEUE[$_][0] <= $avail) {
		496	$busy = 0;
440	my $job = splice @SLOT_QUEUE, $_, 1, ();	497	my $job = splice @SLOT_QUEUE, $_, 1, ();
441	$job->[2]->send;	498	$job->[2]->send;
442	Coro::cede;	499	Coro::cede;
443	goto next_job;	500	goto next_job;
444	}	501	} else {
		502	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
445	}	503	}
446	}	504	}
447		505
448	if (@SLOT_QUEUE) {	506	if (@SLOT_QUEUE) {
449	# we do not use wait_for_tick() as it returns immediately when tick is inactive	507	# we do not use wait_for_tick() as it returns immediately when tick is inactive
450	push @cf::WAIT_FOR_TICK, $signal;	508	push @cf::WAIT_FOR_TICK, $signal;
451	$signal->wait;	509	$signal->wait;
452	} else {	510	} else {
		511	$busy = 0;
453	Coro::schedule;	512	Coro::schedule;
454	}	513	}
455	}	514	}
456	};	515	};
457		516
458	sub get_slot($;$$) {	517	sub get_slot($;$$) {
459	return if tick_inhibit || $Coro::current == $Coro::main;	518	return if tick_inhibit || $Coro::current == $Coro::main;
460		519
461	my ($time, $pri, $name) = @_;	520	my ($time, $pri, $name) = @_;
462		521
463	$time = $TICK * .6 if $time > $TICK * .6;	522	$time = clamp $time, 0.01, $TICK * .6;
		523
464	my $sig = new Coro::Signal;	524	my $sig = new Coro::Signal;
465		525
466	push @SLOT_QUEUE, [$time, $pri, $sig, $name];	526	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
467	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;	527	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
468	$SLOT_QUEUE->ready;	528	$SLOT_QUEUE->ready;
…		…
494	=cut	554	=cut
495		555
496	sub sync_job(&) {	556	sub sync_job(&) {
497	my ($job) = @_;	557	my ($job) = @_;
498		558
499	if ($Coro::current == $Coro::main) {	559	if (in_main) {
500	my $time = EV::time;	560	my $time = AE::time;
501		561
502	# this is the main coro, too bad, we have to block	562	# this is the main coro, too bad, we have to block
503	# till the operation succeeds, freezing the server :/	563	# till the operation succeeds, freezing the server :/
504		564
505	LOG llevError, Carp::longmess "sync job";#d#	565	#LOG llevError, Carp::longmess "sync job";#d#
506		566
507	my $freeze_guard = freeze_mainloop;	567	my $freeze_guard = freeze_mainloop;
508		568
509	my $busy = 1;	569	my $busy = 1;
510	my @res;	570	my @res;
511		571
512	(async {	572	(async {
513	$Coro::current->desc ("sync job coro");	573	$Coro::current->desc ("sync job coro");
514	@res = eval { $job->() };	574	@res = eval { $job->() };
515	warn $@ if $@;	575	error $@ if $@;
516	undef $busy;	576	undef $busy;
517	})->prio (Coro::PRIO_MAX);	577	})->prio (Coro::PRIO_MAX);
518		578
519	while ($busy) {	579	while ($busy) {
520	if (Coro::nready) {	580	if (Coro::nready) {
…		…
522	} else {	582	} else {
523	EV::loop EV::LOOP_ONESHOT;	583	EV::loop EV::LOOP_ONESHOT;
524	}	584	}
525	}	585	}
526		586
527	my $time = EV::time - $time;	587	my $time = AE::time - $time;
528		588
529	$TICK_START += $time; # do not account sync jobs to server load	589	$TICK_START += $time; # do not account sync jobs to server load
530		590
531	wantarray ? @res : $res[0]	591	wantarray ? @res : $res[0]
532	} else {	592	} else {
…		…
554	$EXT_CORO{$coro+0} = $coro;	614	$EXT_CORO{$coro+0} = $coro;
555		615
556	$coro	616	$coro
557	}	617	}
558		618
559	=item fork_call { }, $args	619	=item fork_call { }, @args
560		620
561	Executes the given code block with the given arguments in a seperate	621	Executes the given code block with the given arguments in a seperate
562	process, returning the results. Everything must be serialisable with	622	process, returning the results. Everything must be serialisable with
563	Coro::Storable. May, of course, block. Note that the executed sub may	623	Coro::Storable. May, of course, block. Note that the executed sub may
564	never block itself or use any form of event handling.	624	never block itself or use any form of event handling.
565		625
566	=cut	626	=cut
567		627
		628	sub post_fork {
		629	reset_signals;
		630	}
		631
568	sub fork_call(&@) {	632	sub fork_call(&@) {
569	my ($cb, @args) = @_;	633	my ($cb, @args) = @_;
570		634
571	# we seemingly have to make a local copy of the whole thing,	635	# we seemingly have to make a local copy of the whole thing,
572	# otherwise perl prematurely frees the stuff :/	636	# otherwise perl prematurely frees the stuff :/
573	# TODO: investigate and fix (likely this will be rather laborious)	637	# TODO: investigate and fix (likely this will be rather laborious)
574		638
575	my @res = Coro::Util::fork_eval {	639	my @res = Coro::Util::fork_eval {
576	reset_signals;	640	cf::post_fork;
577	&$cb	641	&$cb
578	}, @args;	642	} @args;
579		643
580	wantarray ? @res : $res[-1]	644	wantarray ? @res : $res[-1]
		645	}
		646
		647	sub objinfo {
		648	(
		649	"counter value" => cf::object::object_count,
		650	"objects created" => cf::object::create_count,
		651	"objects destroyed" => cf::object::destroy_count,
		652	"freelist size" => cf::object::free_count,
		653	"allocated objects" => cf::object::objects_size,
		654	"active objects" => cf::object::actives_size,
		655	)
581	}	656	}
582		657
583	=item $coin = coin_from_name $name	658	=item $coin = coin_from_name $name
584		659
585	=cut	660	=cut
…		…
622	within each server.	697	within each server.
623		698
624	=cut	699	=cut
625		700
626	sub db_table($) {	701	sub db_table($) {
		702	cf::error "db_get called from main context"
		703	if $Coro::current == $Coro::main;
		704
627	my ($name) = @_;	705	my ($name) = @_;
628	my $db = BDB::db_create $DB_ENV;	706	my $db = BDB::db_create $DB_ENV;
629		707
630	eval {	708	eval {
631	$db->set_flags (BDB::CHKSUM);	709	$db->set_flags (BDB::CHKSUM);
…		…
641	}	719	}
642		720
643	our $DB;	721	our $DB;
644		722
645	sub db_init {	723	sub db_init {
646	cf::sync_job {
647	$DB ||= db_table "db";	724	$DB ||= db_table "db";
648	};
649	}	725	}
650		726
651	sub db_get($$) {	727	sub db_get($$) {
652	my $key = "$_[0]/$_[1]";	728	my $key = "$_[0]/$_[1]";
653		729
654	cf::sync_job {	730	cf::error "db_get called from main context"
		731	if $Coro::current == $Coro::main;
		732
655	BDB::db_get $DB, undef, $key, my $data;	733	BDB::db_get $DB, undef, $key, my $data;
656		734
657	$! ? ()	735	$! ? ()
658	: $data	736	: $data
659	}
660	}	737	}
661		738
662	sub db_put($$$) {	739	sub db_put($$$) {
663	BDB::dbreq_pri 4;	740	BDB::dbreq_pri 4;
664	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	741	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
720		797
721	my $t1 = Time::HiRes::time;	798	my $t1 = Time::HiRes::time;
722	my $data = $process->(\@data);	799	my $data = $process->(\@data);
723	my $t2 = Time::HiRes::time;	800	my $t2 = Time::HiRes::time;
724		801
725	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	802	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
726		803
727	db_put cache => "$id/data", $data;	804	db_put cache => "$id/data", $data;
728	db_put cache => "$id/md5" , $md5;	805	db_put cache => "$id/md5" , $md5;
729	db_put cache => "$id/meta", $meta;	806	db_put cache => "$id/meta", $meta;
730		807
…		…
740		817
741	=cut	818	=cut
742		819
743	sub datalog($@) {	820	sub datalog($@) {
744	my ($type, %kv) = @_;	821	my ($type, %kv) = @_;
745	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	822	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
746	}	823	}
747		824
748	=back	825	=back
749		826
750	=cut	827	=cut
…		…
945		1022
946	} elsif (exists $cb_id{$type}) {	1023	} elsif (exists $cb_id{$type}) {
947	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	1024	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
948		1025
949	} elsif (ref $type) {	1026	} elsif (ref $type) {
950	warn "attaching objects not supported, ignoring.\n";	1027	error "attaching objects not supported, ignoring.\n";
951		1028
952	} else {	1029	} else {
953	shift @arg;	1030	shift @arg;
954	warn "attach argument '$type' not supported, ignoring.\n";	1031	error "attach argument '$type' not supported, ignoring.\n";
955	}	1032	}
956	}	1033	}
957	}	1034	}
958		1035
959	sub _object_attach {	1036	sub _object_attach {
…		…
969	_attach $registry, $klass, @attach;	1046	_attach $registry, $klass, @attach;
970	}	1047	}
971		1048
972	$obj->{$name} = \%arg;	1049	$obj->{$name} = \%arg;
973	} else {	1050	} else {
974	warn "object uses attachment '$name' which is not available, postponing.\n";	1051	info "object uses attachment '$name' which is not available, postponing.\n";
975	}	1052	}
976		1053
977	$obj->{_attachment}{$name} = undef;	1054	$obj->{_attachment}{$name} = undef;
978	}	1055	}
979		1056
…		…
1038		1115
1039	for (@$callbacks) {	1116	for (@$callbacks) {
1040	eval { &{$_->[1]} };	1117	eval { &{$_->[1]} };
1041		1118
1042	if ($@) {	1119	if ($@) {
1043	warn "$@";
1044	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1120	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1045	override;	1121	override;
1046	}	1122	}
1047		1123
1048	return 1 if $override;	1124	return 1 if $override;
1049	}	1125	}
…		…
1128	for (@$attach) {	1204	for (@$attach) {
1129	my ($klass, @attach) = @$_;	1205	my ($klass, @attach) = @$_;
1130	_attach $registry, $klass, @attach;	1206	_attach $registry, $klass, @attach;
1131	}	1207	}
1132	} else {	1208	} else {
1133	warn "object uses attachment '$name' that is not available, postponing.\n";	1209	info "object uses attachment '$name' that is not available, postponing.\n";
1134	}	1210	}
1135	}	1211	}
1136	}	1212	}
1137		1213
1138	cf::attachable->attach (	1214	cf::attachable->attach (
…		…
1165	my ($filename, $rdata, $objs) = @_;	1241	my ($filename, $rdata, $objs) = @_;
1166		1242
1167	sync_job {	1243	sync_job {
1168	if (length $$rdata) {	1244	if (length $$rdata) {
1169	utf8::decode (my $decname = $filename);	1245	utf8::decode (my $decname = $filename);
1170	warn sprintf "saving %s (%d,%d)\n",	1246	trace sprintf "saving %s (%d,%d)\n",
1171	$decname, length $$rdata, scalar @$objs;	1247	$decname, length $$rdata, scalar @$objs
		1248	if $VERBOSE_IO;
1172		1249
1173	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1250	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1174	aio_chmod $fh, SAVE_MODE;	1251	aio_chmod $fh, SAVE_MODE;
1175	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1252	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1176	if ($cf::USE_FSYNC) {	1253	if ($cf::USE_FSYNC) {
…		…
1198	aio_rename "$filename~", $filename;	1275	aio_rename "$filename~", $filename;
1199		1276
1200	$filename =~ s%/[^/]+$%%;	1277	$filename =~ s%/[^/]+$%%;
1201	aio_pathsync $filename if $cf::USE_FSYNC;	1278	aio_pathsync $filename if $cf::USE_FSYNC;
1202	} else {	1279	} else {
1203	warn "unable to save objects: $filename~: $!\n";	1280	error "unable to save objects: $filename~: $!\n";
1204	}	1281	}
1205	} else {	1282	} else {
1206	aio_unlink $filename;	1283	aio_unlink $filename;
1207	aio_unlink "$filename.pst";	1284	aio_unlink "$filename.pst";
1208	}	1285	}
…		…
1232	my $st = eval { Coro::Storable::thaw $av };	1309	my $st = eval { Coro::Storable::thaw $av };
1233	$av = $st->{objs};	1310	$av = $st->{objs};
1234	}	1311	}
1235		1312
1236	utf8::decode (my $decname = $filename);	1313	utf8::decode (my $decname = $filename);
1237	warn sprintf "loading %s (%d,%d)\n",	1314	trace sprintf "loading %s (%d,%d)\n",
1238	$decname, length $data, scalar @{$av || []};	1315	$decname, length $data, scalar @{$av || []}
		1316	if $VERBOSE_IO;
1239		1317
1240	($data, $av)	1318	($data, $av)
1241	}	1319	}
1242		1320
1243	=head2 COMMAND CALLBACKS	1321	=head2 COMMAND CALLBACKS
…		…
1302	}	1380	}
1303		1381
1304	use File::Glob ();	1382	use File::Glob ();
1305		1383
1306	cf::player->attach (	1384	cf::player->attach (
1307	on_command => sub {	1385	on_unknown_command => sub {
1308	my ($pl, $name, $params) = @_;	1386	my ($pl, $name, $params) = @_;
1309		1387
1310	my $cb = $COMMAND{$name}	1388	my $cb = $COMMAND{$name}
1311	or return;	1389	or return;
1312		1390
…		…
1335		1413
1336	$pl->ext_reply ($reply, @reply)	1414	$pl->ext_reply ($reply, @reply)
1337	if $reply;	1415	if $reply;
1338		1416
1339	} else {	1417	} else {
1340	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1418	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1341	}	1419	}
1342		1420
1343	cf::override;	1421	cf::override;
1344	},	1422	},
1345	);	1423	);
…		…
1356		1434
1357	$grp	1435	$grp
1358	}	1436	}
1359		1437
1360	sub load_extensions {	1438	sub load_extensions {
		1439	info "loading extensions...";
		1440
1361	cf::sync_job {	1441	cf::sync_job {
1362	my %todo;	1442	my %todo;
1363		1443
1364	for my $path (<$LIBDIR/*.ext>) {	1444	for my $path (<$LIBDIR/*.ext>) {
1365	next unless -r $path;	1445	next unless -r $path;
…		…
1383		1463
1384	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1464	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1385	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1465	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1386		1466
1387	$ext{source} =	1467	$ext{source} =
1388	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1468	"package $pkg; use common::sense;\n"
1389	. "#line 1 \"$path\"\n{\n"	1469	. "#line 1 \"$path\"\n{\n"
1390	. $source	1470	. $source
1391	. "\n};\n1";	1471	. "\n};\n1";
1392		1472
1393	$todo{$base} = \%ext;	1473	$todo{$base} = \%ext;
1394	}	1474	}
1395		1475
		1476	my $pass = 0;
1396	my %done;	1477	my %done;
1397	while (%todo) {	1478	while (%todo) {
1398	my $progress;	1479	my $progress;
1399		1480
		1481	++$pass;
		1482
		1483	ext:
1400	while (my ($k, $v) = each %todo) {	1484	while (my ($k, $v) = each %todo) {
1401	for (split /,\s*/, $v->{meta}{depends}) {	1485	for (split /,\s*/, $v->{meta}{depends}) {
1402	goto skip	1486	next ext
1403	unless exists $done{$_};	1487	unless exists $done{$_};
1404	}	1488	}
1405		1489
1406	warn "... loading '$k' into '$v->{pkg}'\n";	1490	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1407		1491
1408	unless (eval $v->{source}) {	1492	my $active = eval $v->{source};
		1493
		1494	if (length $@) {
1409	my $msg = $@ ? "$v->{path}: $@\n"	1495	error "$v->{path}: $@\n";
1410	: "$v->{base}: extension inactive.\n";
1411		1496
1412	if (exists $v->{meta}{mandatory}) {
1413	warn $msg;
1414	cf::cleanup "mandatory extension failed to load, exiting.";	1497	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1415	}	1498	if exists $v->{meta}{mandatory};
1416		1499
1417	warn $msg;	1500	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
		1501	delete $todo{$k};
		1502	} else {
		1503	$done{$k} = delete $todo{$k};
		1504	push @EXTS, $v->{pkg};
		1505	$progress = 1;
		1506
		1507	info "$v->{base}: extension inactive.\n"
		1508	unless $active;
1418	}	1509	}
1419
1420	$done{$k} = delete $todo{$k};
1421	push @EXTS, $v->{pkg};
1422	$progress = 1;
1423	}	1510	}
1424		1511
1425	skip:	1512	unless ($progress) {
1426	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"	1513	warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1427	unless $progress;	1514
		1515	while (my ($k, $v) = each %todo) {
		1516	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
		1517	if exists $v->{meta}{mandatory};
		1518	}
		1519	}
1428	}	1520	}
1429	};	1521	};
1430	}	1522	}
1431		1523
1432	#############################################################################	1524	#############################################################################
…		…
1516	$cf::PLAYER{$login} = $pl	1608	$cf::PLAYER{$login} = $pl
1517	}	1609	}
1518	}	1610	}
1519	}	1611	}
1520		1612
		1613	cf::player->attach (
		1614	on_load => sub {
		1615	my ($pl, $path) = @_;
		1616
		1617	# restore slots saved in save, below
		1618	my $slots = delete $pl->{_slots};
		1619
		1620	$pl->ob->current_weapon ($slots->[0]);
		1621	$pl->combat_ob ($slots->[1]);
		1622	$pl->ranged_ob ($slots->[2]);
		1623	},
		1624	);
		1625
1521	sub save($) {	1626	sub save($) {
1522	my ($pl) = @_;	1627	my ($pl) = @_;
1523		1628
1524	return if $pl->{deny_save};	1629	return if $pl->{deny_save};
1525		1630
…		…
1530		1635
1531	aio_mkdir playerdir $pl, 0770;	1636	aio_mkdir playerdir $pl, 0770;
1532	$pl->{last_save} = $cf::RUNTIME;	1637	$pl->{last_save} = $cf::RUNTIME;
1533		1638
1534	cf::get_slot 0.01;	1639	cf::get_slot 0.01;
		1640
		1641	# save slots, to be restored later
		1642	local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1535		1643
1536	$pl->save_pl ($path);	1644	$pl->save_pl ($path);
1537	cf::cede_to_tick;	1645	cf::cede_to_tick;
1538	}	1646	}
1539		1647
…		…
1573	my $name = $pl->ob->name;	1681	my $name = $pl->ob->name;
1574		1682
1575	$pl->{deny_save} = 1;	1683	$pl->{deny_save} = 1;
1576	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1684	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1577		1685
1578	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1686	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1579	$pl->deactivate;	1687	$pl->deactivate;
		1688
1580	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1689	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1581	$pl->ob->check_score;
1582	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1690	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1691	ext::highscore::check ($pl->ob);
		1692
1583	$pl->ns->destroy if $pl->ns;	1693	$pl->ns->destroy if $pl->ns;
1584		1694
1585	my $path = playerdir $pl;	1695	my $path = playerdir $pl;
1586	my $temp = "$path~$cf::RUNTIME~deleting~";	1696	my $temp = "$path~$cf::RUNTIME~deleting~";
1587	aio_rename $path, $temp;	1697	aio_rename $path, $temp;
…		…
1641	\@logins	1751	\@logins
1642	}	1752	}
1643		1753
1644	=item $player->maps	1754	=item $player->maps
1645		1755
		1756	=item cf::player::maps $login
		1757
1646	Returns an arrayref of map paths that are private for this	1758	Returns an arrayref of map paths that are private for this
1647	player. May block.	1759	player. May block.
1648		1760
1649	=cut	1761	=cut
1650		1762
…		…
1712	=cut	1824	=cut
1713		1825
1714	sub find_by_path($) {	1826	sub find_by_path($) {
1715	my ($path) = @_;	1827	my ($path) = @_;
1716		1828
		1829	$path =~ s/^~[^\/]*//; # skip ~login
		1830
1717	my ($match, $specificity);	1831	my ($match, $specificity);
1718		1832
1719	for my $region (list) {	1833	for my $region (list) {
1720	if ($region->{match} && $path =~ $region->{match}) {	1834	if ($region->{match} && $path =~ $region->{match}) {
1721	($match, $specificity) = ($region, $region->specificity)	1835	($match, $specificity) = ($region, $region->specificity)
…		…
1749	sub generate_random_map {	1863	sub generate_random_map {
1750	my ($self, $rmp) = @_;	1864	my ($self, $rmp) = @_;
1751		1865
1752	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	1866	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1753		1867
1754	# mit "rum" bekleckern, nicht
1755	$self->_create_random_map (	1868	$self->_create_random_map ($rmp);
1756	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1757	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1758	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1759	$rmp->{exit_on_final_map},
1760	$rmp->{xsize}, $rmp->{ysize},
1761	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1762	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1763	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1764	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1765	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1766	(cf::region::find $rmp->{region}), $rmp->{custom}
1767	)
1768	}	1869	}
1769		1870
1770	=item cf::map->register ($regex, $prio)	1871	=item cf::map->register ($regex, $prio)
1771		1872
1772	Register a handler for the map path matching the given regex at the	1873	Register a handler for the map path matching the given regex at the
…		…
1777		1878
1778	sub register {	1879	sub register {
1779	my (undef, $regex, $prio) = @_;	1880	my (undef, $regex, $prio) = @_;
1780	my $pkg = caller;	1881	my $pkg = caller;
1781		1882
1782	no strict;
1783	push @{"$pkg\::ISA"}, __PACKAGE__;	1883	push @{"$pkg\::ISA"}, __PACKAGE__;
1784		1884
1785	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	1885	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1786	}	1886	}
1787		1887
1788	# also paths starting with '/'	1888	# also paths starting with '/'
1789	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	1889	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1790		1890
1791	sub thawer_merge {	1891	sub thawer_merge {
1792	my ($self, $merge) = @_;	1892	my ($self, $merge) = @_;
1793		1893
1794	# we have to keep some variables in memory intact	1894	# we have to keep some variables in memory intact
…		…
1799	}	1899	}
1800		1900
1801	sub normalise {	1901	sub normalise {
1802	my ($path, $base) = @_;	1902	my ($path, $base) = @_;
1803		1903
1804	$path = "$path"; # make sure its a string	1904	$path = "$path"; # make sure it's a string
1805		1905
1806	$path =~ s/\.map$//;	1906	$path =~ s/\.map$//;
1807		1907
1808	# map plan:	1908	# map plan:
1809	#	1909	#
…		…
1824	$base =~ s{[^/]+/?$}{};	1924	$base =~ s{[^/]+/?$}{};
1825	$path = "$base/$path";	1925	$path = "$base/$path";
1826	}	1926	}
1827		1927
1828	for ($path) {	1928	for ($path) {
1829	redo if s{//}{/};
1830	redo if s{/\.?/}{/};	1929	redo if s{/\.?/}{/};
1831	redo if s{/[^/]+/\.\./}{/};	1930	redo if s{/[^/]+/\.\./}{/};
1832	}	1931	}
1833		1932
1834	$path	1933	$path
…		…
1848	$self->init; # pass $1 etc.	1947	$self->init; # pass $1 etc.
1849	return $self;	1948	return $self;
1850	}	1949	}
1851	}	1950	}
1852		1951
1853	Carp::cluck "unable to resolve path '$path' (base '$base').";	1952	Carp::cluck "unable to resolve path '$path' (base '$base')";
1854	()	1953	()
1855	}	1954	}
1856		1955
1857	sub init {	1956	sub init {
1858	my ($self) = @_;	1957	my ($self) = @_;
…		…
1980	}	2079	}
1981		2080
1982	sub find;	2081	sub find;
1983	sub find {	2082	sub find {
1984	my ($path, $origin) = @_;	2083	my ($path, $origin) = @_;
		2084
		2085	cf::cede_to_tick;
1985		2086
1986	$path = normalise $path, $origin && $origin->path;	2087	$path = normalise $path, $origin && $origin->path;
1987		2088
1988	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2089	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1989	my $guard2 = cf::lock_acquire "map_find:$path";	2090	my $guard2 = cf::lock_acquire "map_find:$path";
…		…
2008		2109
2009	$cf::MAP{$path} = $map	2110	$cf::MAP{$path} = $map
2010	}	2111	}
2011	}	2112	}
2012		2113
2013	sub pre_load { }	2114	sub pre_load { }
2014	sub post_load { }	2115	#sub post_load { } # XS
2015		2116
2016	sub load {	2117	sub load {
2017	my ($self) = @_;	2118	my ($self) = @_;
2018		2119
2019	local $self->{deny_reset} = 1; # loading can take a long time	2120	local $self->{deny_reset} = 1; # loading can take a long time
…		…
2074		2175
2075	$self->in_memory (cf::MAP_ACTIVE);	2176	$self->in_memory (cf::MAP_ACTIVE);
2076	}	2177	}
2077		2178
2078	$self->post_load;	2179	$self->post_load;
2079	}
2080		2180
		2181	1
		2182	}
		2183
		2184	# customize the map for a given player, i.e.
		2185	# return the _real_ map. used by e.g. per-player
		2186	# maps to change the path to ~playername/mappath
2081	sub customise_for {	2187	sub customise_for {
2082	my ($self, $ob) = @_;	2188	my ($self, $ob) = @_;
2083		2189
2084	return find "~" . $ob->name . "/" . $self->{path}	2190	return find "~" . $ob->name . "/" . $self->{path}
2085	if $self->per_player;	2191	if $self->per_player;
…		…
2101	or next;	2207	or next;
2102	$neigh = find $neigh, $map	2208	$neigh = find $neigh, $map
2103	or next;	2209	or next;
2104	$neigh->load;	2210	$neigh->load;
2105		2211
		2212	# now find the diagonal neighbours
2106	push @neigh,	2213	push @neigh,
2107	[$neigh->tile_path (($_ + 3) % 4), $neigh],	2214	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2108	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2215	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2109	}	2216	}
2110		2217
…		…
2117	}	2224	}
2118		2225
2119	sub find_sync {	2226	sub find_sync {
2120	my ($path, $origin) = @_;	2227	my ($path, $origin) = @_;
2121		2228
2122	cf::sync_job { find $path, $origin }	2229	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
		2230	if $Coro::current == $Coro::main;
		2231
		2232	find $path, $origin
2123	}	2233	}
2124		2234
2125	sub do_load_sync {	2235	sub do_load_sync {
2126	my ($map) = @_;	2236	my ($map) = @_;
2127		2237
2128	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2238	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2129	if $Coro::current == $Coro::main;	2239	if $Coro::current == $Coro::main;
2130		2240
2131	cf::sync_job { $map->load };	2241	$map->load;
2132	}	2242	}
2133		2243
2134	our %MAP_PREFETCH;	2244	our %MAP_PREFETCH;
2135	our $MAP_PREFETCHER = undef;	2245	our $MAP_PREFETCHER = undef;
2136		2246
…		…
2162	$MAP_PREFETCHER->prio (6);	2272	$MAP_PREFETCHER->prio (6);
2163		2273
2164	()	2274	()
2165	}	2275	}
2166		2276
		2277	# common code, used by both ->save and ->swapout
2167	sub save {	2278	sub _save {
2168	my ($self) = @_;	2279	my ($self) = @_;
2169
2170	my $lock = cf::lock_acquire "map_data:$self->{path}";
2171		2280
2172	$self->{last_save} = $cf::RUNTIME;	2281	$self->{last_save} = $cf::RUNTIME;
2173		2282
2174	return unless $self->dirty;	2283	return unless $self->dirty;
2175		2284
…		…
2195	} else {	2304	} else {
2196	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);	2305	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2197	}	2306	}
2198	}	2307	}
2199		2308
		2309	sub save {
		2310	my ($self) = @_;
		2311
		2312	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2313
		2314	$self->_save;
		2315	}
		2316
2200	sub swap_out {	2317	sub swap_out {
2201	my ($self) = @_;	2318	my ($self) = @_;
2202		2319
2203	# save first because save cedes
2204	$self->save;
2205
2206	my $lock = cf::lock_acquire "map_data:$self->{path}";	2320	my $lock = cf::lock_acquire "map_data:$self->{path}";
2207		2321
2208	return if $self->players;
2209	return if $self->in_memory != cf::MAP_ACTIVE;	2322	return if $self->in_memory != cf::MAP_ACTIVE;
2210	return if $self->{deny_save};	2323	return if $self->{deny_save};
		2324	return if $self->players;
2211		2325
		2326	# first deactivate the map and "unlink" it from the core
		2327	$self->deactivate;
		2328	$_->clear_links_to ($self) for values %cf::MAP;
2212	$self->in_memory (cf::MAP_SWAPPED);	2329	$self->in_memory (cf::MAP_SWAPPED);
		2330
		2331	# then atomically save
		2332	$self->_save;
		2333
		2334	# then free the map
		2335	$self->clear;
		2336	}
		2337
		2338	sub reset_at {
		2339	my ($self) = @_;
		2340
		2341	# TODO: safety, remove and allow resettable per-player maps
		2342	return 1e99 if $self->{deny_reset};
		2343
		2344	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
		2345	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
		2346
		2347	$time + $to
		2348	}
		2349
		2350	sub should_reset {
		2351	my ($self) = @_;
		2352
		2353	$self->reset_at <= $cf::RUNTIME
		2354	}
		2355
		2356	sub reset {
		2357	my ($self) = @_;
		2358
		2359	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2360
		2361	return if $self->players;
		2362
		2363	cf::trace "resetting map ", $self->path, "\n";
		2364
		2365	$self->in_memory (cf::MAP_SWAPPED);
		2366
		2367	# need to save uniques path
		2368	unless ($self->{deny_save}) {
		2369	my $uniq = $self->uniq_path; utf8::encode $uniq;
		2370
		2371	$self->_save_objects ($uniq, cf::IO_UNIQUES)
		2372	if $uniq;
		2373	}
		2374
		2375	delete $cf::MAP{$self->path};
2213		2376
2214	$self->deactivate;	2377	$self->deactivate;
2215	$_->clear_links_to ($self) for values %cf::MAP;	2378	$_->clear_links_to ($self) for values %cf::MAP;
2216	$self->clear;	2379	$self->clear;
2217	}
2218
2219	sub reset_at {
2220	my ($self) = @_;
2221
2222	# TODO: safety, remove and allow resettable per-player maps
2223	return 1e99 if $self->{deny_reset};
2224
2225	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2226	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2227
2228	$time + $to
2229	}
2230
2231	sub should_reset {
2232	my ($self) = @_;
2233
2234	$self->reset_at <= $cf::RUNTIME
2235	}
2236
2237	sub reset {
2238	my ($self) = @_;
2239
2240	my $lock = cf::lock_acquire "map_data:$self->{path}";
2241
2242	return if $self->players;
2243
2244	warn "resetting map ", $self->path, "\n";
2245
2246	$self->in_memory (cf::MAP_SWAPPED);
2247
2248	# need to save uniques path
2249	unless ($self->{deny_save}) {
2250	my $uniq = $self->uniq_path; utf8::encode $uniq;
2251
2252	$self->_save_objects ($uniq, cf::IO_UNIQUES)
2253	if $uniq;
2254	}
2255
2256	delete $cf::MAP{$self->path};
2257
2258	$self->deactivate;
2259	$_->clear_links_to ($self) for values %cf::MAP;
2260	$self->clear;
2261		2380
2262	$self->unlink_save;	2381	$self->unlink_save;
2263	$self->destroy;	2382	$self->destroy;
2264	}	2383	}
2265		2384
…		…
2273		2392
2274	delete $cf::MAP{$self->path};	2393	delete $cf::MAP{$self->path};
2275		2394
2276	$self->unlink_save;	2395	$self->unlink_save;
2277		2396
2278	bless $self, "cf::map";	2397	bless $self, "cf::map::wrap";
2279	delete $self->{deny_reset};	2398	delete $self->{deny_reset};
2280	$self->{deny_save} = 1;	2399	$self->{deny_save} = 1;
2281	$self->reset_timeout (1);	2400	$self->reset_timeout (1);
2282	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2401	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2283		2402
…		…
2340	: normalise $_	2459	: normalise $_
2341	} @{ aio_readdir $UNIQUEDIR or [] }	2460	} @{ aio_readdir $UNIQUEDIR or [] }
2342	]	2461	]
2343	}	2462	}
2344		2463
		2464	=item cf::map::static_maps
		2465
		2466	Returns an arrayref if paths of all static maps (all preinstalled F<.map>
		2467	file in the shared directory excluding F</styles> and F</editor>). May
		2468	block.
		2469
		2470	=cut
		2471
		2472	sub static_maps() {
		2473	my @dirs = "";
		2474	my @maps;
		2475
		2476	while (@dirs) {
		2477	my $dir = shift @dirs;
		2478
		2479	next if $dir eq "/styles" || $dir eq "/editor";
		2480
		2481	my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
		2482	or return;
		2483
		2484	for (@$files) {
		2485	s/\.map$// or next;
		2486	utf8::decode $_;
		2487	push @maps, "$dir/$_";
		2488	}
		2489
		2490	push @dirs, map "$dir/$_", @$dirs;
		2491	}
		2492
		2493	\@maps
		2494	}
		2495
2345	=back	2496	=back
2346		2497
2347	=head3 cf::object	2498	=head3 cf::object
2348		2499
2349	=cut	2500	=cut
…		…
2481		2632
2482	Freezes the player and moves him/her to a special map (C<{link}>).	2633	Freezes the player and moves him/her to a special map (C<{link}>).
2483		2634
2484	The player should be reasonably safe there for short amounts of time (e.g.	2635	The player should be reasonably safe there for short amounts of time (e.g.
2485	for loading a map). You I<MUST> call C<leave_link> as soon as possible,	2636	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2486	though, as the palyer cannot control the character while it is on the link	2637	though, as the player cannot control the character while it is on the link
2487	map.	2638	map.
2488		2639
2489	Will never block.	2640	Will never block.
2490		2641
2491	=item $player_object->leave_link ($map, $x, $y)	2642	=item $player_object->leave_link ($map, $x, $y)
…		…
2512	sub cf::object::player::enter_link {	2663	sub cf::object::player::enter_link {
2513	my ($self) = @_;	2664	my ($self) = @_;
2514		2665
2515	$self->deactivate_recursive;	2666	$self->deactivate_recursive;
2516		2667
		2668	++$self->{_link_recursion};
		2669
2517	return if UNIVERSAL::isa $self->map, "ext::map_link";	2670	return if UNIVERSAL::isa $self->map, "ext::map_link";
2518		2671
2519	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2672	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2520	if $self->map && $self->map->{path} ne "{link}";	2673	if $self->map && $self->map->{path} ne "{link}";
2521		2674
2522	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2675	$self->enter_map ($LINK_MAP || link_map, 3, 3);
2523	}	2676	}
2524		2677
2525	sub cf::object::player::leave_link {	2678	sub cf::object::player::leave_link {
2526	my ($self, $map, $x, $y) = @_;	2679	my ($self, $map, $x, $y) = @_;
2527		2680
…		…
2544	($x, $y) = (-1, -1)	2697	($x, $y) = (-1, -1)
2545	unless (defined $x) && (defined $y);	2698	unless (defined $x) && (defined $y);
2546		2699
2547	# use -1 or undef as default coordinates, not 0, 0	2700	# use -1 or undef as default coordinates, not 0, 0
2548	($x, $y) = ($map->enter_x, $map->enter_y)	2701	($x, $y) = ($map->enter_x, $map->enter_y)
2549	if $x <=0 && $y <= 0;	2702	if $x <= 0 && $y <= 0;
2550		2703
2551	$map->load;	2704	$map->load;
2552	$map->load_neighbours;	2705	$map->load_neighbours;
2553		2706
2554	return unless $self->contr->active;	2707	return unless $self->contr->active;
2555		2708
2556	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2709	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2557	$self->enter_map ($map, $x, $y);	2710	if ($self->enter_map ($map, $x, $y)) {
2558		2711	# entering was successful
		2712	delete $self->{_link_recursion};
2559	# only activate afterwards, to support waiting in hooks	2713	# only activate afterwards, to support waiting in hooks
2560	$self->activate_recursive;	2714	$self->activate_recursive;
2561	}	2715	}
2562		2716
		2717	}
		2718
2563	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2719	=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2564		2720
2565	Moves the player to the given map-path and coordinates by first freezing	2721	Moves the player to the given map-path and coordinates by first freezing
2566	her, loading and preparing them map, calling the provided $check callback	2722	her, loading and preparing them map, calling the provided $check callback
2567	that has to return the map if sucecssful, and then unfreezes the player on	2723	that has to return the map if sucecssful, and then unfreezes the player on
2568	the new (success) or old (failed) map position. In either case, $done will	2724	the new (success) or old (failed) map position. In either case, $done will
…		…
2575		2731
2576	our $GOTOGEN;	2732	our $GOTOGEN;
2577		2733
2578	sub cf::object::player::goto {	2734	sub cf::object::player::goto {
2579	my ($self, $path, $x, $y, $check, $done) = @_;	2735	my ($self, $path, $x, $y, $check, $done) = @_;
		2736
		2737	if ($self->{_link_recursion} >= $MAX_LINKS) {
		2738	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
		2739	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
		2740	($path, $x, $y) = @$EMERGENCY_POSITION;
		2741	}
2580		2742
2581	# do generation counting so two concurrent goto's will be executed in-order	2743	# do generation counting so two concurrent goto's will be executed in-order
2582	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2744	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2583		2745
2584	$self->enter_link;	2746	$self->enter_link;
…		…
2608	my $map = eval {	2770	my $map = eval {
2609	my $map = defined $path ? cf::map::find $path : undef;	2771	my $map = defined $path ? cf::map::find $path : undef;
2610		2772
2611	if ($map) {	2773	if ($map) {
2612	$map = $map->customise_for ($self);	2774	$map = $map->customise_for ($self);
2613	$map = $check->($map) if $check && $map;	2775	$map = $check->($map, $x, $y, $self) if $check && $map;
2614	} else {	2776	} else {
2615	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);	2777	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2616	}	2778	}
2617		2779
2618	$map	2780	$map
…		…
2626	if ($gen == $self->{_goto_generation}) {	2788	if ($gen == $self->{_goto_generation}) {
2627	delete $self->{_goto_generation};	2789	delete $self->{_goto_generation};
2628	$self->leave_link ($map, $x, $y);	2790	$self->leave_link ($map, $x, $y);
2629	}	2791	}
2630		2792
2631	$done->() if $done;	2793	$done->($self) if $done;
2632	})->prio (1);	2794	})->prio (1);
2633	}	2795	}
2634		2796
2635	=item $player_object->enter_exit ($exit_object)	2797	=item $player_object->enter_exit ($exit_object)
2636		2798
…		…
2729	$self->message ("Something went wrong deep within the deliantra server. "	2891	$self->message ("Something went wrong deep within the deliantra server. "
2730	. "I'll try to bring you back to the map you were before. "	2892	. "I'll try to bring you back to the map you were before. "
2731	. "Please report this to the dungeon master!",	2893	. "Please report this to the dungeon master!",
2732	cf::NDI_UNIQUE | cf::NDI_RED);	2894	cf::NDI_UNIQUE | cf::NDI_RED);
2733		2895
2734	warn "ERROR in enter_exit: $@";	2896	error "ERROR in enter_exit: $@";
2735	$self->leave_link;	2897	$self->leave_link;
2736	}	2898	}
2737	})->prio (1);	2899	})->prio (1);
2738	}	2900	}
2739		2901
…		…
2751	sub cf::client::send_drawinfo {	2913	sub cf::client::send_drawinfo {
2752	my ($self, $text, $flags) = @_;	2914	my ($self, $text, $flags) = @_;
2753		2915
2754	utf8::encode $text;	2916	utf8::encode $text;
2755	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2917	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
		2918	}
		2919
		2920	=item $client->send_big_packet ($pkt)
		2921
		2922	Like C<send_packet>, but tries to compress large packets, and fragments
		2923	them as required.
		2924
		2925	=cut
		2926
		2927	our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
		2928
		2929	sub cf::client::send_big_packet {
		2930	my ($self, $pkt) = @_;
		2931
		2932	# try lzf for large packets
		2933	$pkt = "lzf " . Compress::LZF::compress $pkt
		2934	if 1024 <= length $pkt and $self->{can_lzf};
		2935
		2936	# split very large packets
		2937	if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
		2938	$self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
		2939	$pkt = "frag";
		2940	}
		2941
		2942	$self->send_packet ($pkt);
2756	}	2943	}
2757		2944
2758	=item $client->send_msg ($channel, $msg, $color, [extra...])	2945	=item $client->send_msg ($channel, $msg, $color, [extra...])
2759		2946
2760	Send a drawinfo or msg packet to the client, formatting the msg for the	2947	Send a drawinfo or msg packet to the client, formatting the msg for the
…		…
2764		2951
2765	=cut	2952	=cut
2766		2953
2767	# non-persistent channels (usually the info channel)	2954	# non-persistent channels (usually the info channel)
2768	our %CHANNEL = (	2955	our %CHANNEL = (
		2956	"c/motd" => {
		2957	id => "infobox",
		2958	title => "MOTD",
		2959	reply => undef,
		2960	tooltip => "The message of the day",
		2961	},
2769	"c/identify" => {	2962	"c/identify" => {
2770	id => "infobox",	2963	id => "infobox",
2771	title => "Identify",	2964	title => "Identify",
2772	reply => undef,	2965	reply => undef,
2773	tooltip => "Items recently identified",	2966	tooltip => "Items recently identified",
…		…
2775	"c/examine" => {	2968	"c/examine" => {
2776	id => "infobox",	2969	id => "infobox",
2777	title => "Examine",	2970	title => "Examine",
2778	reply => undef,	2971	reply => undef,
2779	tooltip => "Signs and other items you examined",	2972	tooltip => "Signs and other items you examined",
		2973	},
		2974	"c/shopinfo" => {
		2975	id => "infobox",
		2976	title => "Shop Info",
		2977	reply => undef,
		2978	tooltip => "What your bargaining skill tells you about the shop",
2780	},	2979	},
2781	"c/book" => {	2980	"c/book" => {
2782	id => "infobox",	2981	id => "infobox",
2783	title => "Book",	2982	title => "Book",
2784	reply => undef,	2983	reply => undef,
…		…
2900	my $pkt = "msg "	3099	my $pkt = "msg "
2901	. $self->{json_coder}->encode (	3100	. $self->{json_coder}->encode (
2902	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]	3101	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2903	);	3102	);
2904		3103
2905	# try lzf for large packets
2906	$pkt = "lzf " . Compress::LZF::compress $pkt
2907	if 1024 <= length $pkt and $self->{can_lzf};
2908
2909	# split very large packets
2910	if (8192 < length $pkt and $self->{can_lzf}) {
2911	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2912	$pkt = "frag";
2913	}
2914
2915	$self->send_packet ($pkt);	3104	$self->send_big_packet ($pkt);
2916	}	3105	}
2917		3106
2918	=item $client->ext_msg ($type, @msg)	3107	=item $client->ext_msg ($type, @msg)
2919		3108
2920	Sends an ext event to the client.	3109	Sends an ext event to the client.
…		…
2923		3112
2924	sub cf::client::ext_msg($$@) {	3113	sub cf::client::ext_msg($$@) {
2925	my ($self, $type, @msg) = @_;	3114	my ($self, $type, @msg) = @_;
2926		3115
2927	if ($self->extcmd == 2) {	3116	if ($self->extcmd == 2) {
2928	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3117	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2929	} elsif ($self->extcmd == 1) { # TODO: remove	3118	} elsif ($self->extcmd == 1) { # TODO: remove
2930	push @msg, msgtype => "event_$type";	3119	push @msg, msgtype => "event_$type";
2931	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3120	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2932	}	3121	}
2933	}	3122	}
2934		3123
2935	=item $client->ext_reply ($msgid, @msg)	3124	=item $client->ext_reply ($msgid, @msg)
2936		3125
…		…
2940		3129
2941	sub cf::client::ext_reply($$@) {	3130	sub cf::client::ext_reply($$@) {
2942	my ($self, $id, @msg) = @_;	3131	my ($self, $id, @msg) = @_;
2943		3132
2944	if ($self->extcmd == 2) {	3133	if ($self->extcmd == 2) {
2945	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));	3134	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2946	} elsif ($self->extcmd == 1) {	3135	} elsif ($self->extcmd == 1) {
2947	#TODO: version 1, remove	3136	#TODO: version 1, remove
2948	unshift @msg, msgtype => "reply", msgid => $id;	3137	unshift @msg, msgtype => "reply", msgid => $id;
2949	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3138	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2950	}	3139	}
2951	}	3140	}
2952		3141
2953	=item $success = $client->query ($flags, "text", \&cb)	3142	=item $success = $client->query ($flags, "text", \&cb)
2954		3143
…		…
3025		3214
3026	$ns->ext_reply ($reply, @reply)	3215	$ns->ext_reply ($reply, @reply)
3027	if $reply;	3216	if $reply;
3028		3217
3029	} else {	3218	} else {
3030	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3219	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3031	}	3220	}
3032		3221
3033	cf::override;	3222	cf::override;
3034	},	3223	},
3035	);	3224	);
…		…
3055		3244
3056	$coro	3245	$coro
3057	}	3246	}
3058		3247
3059	cf::client->attach (	3248	cf::client->attach (
3060	on_destroy => sub {	3249	on_client_destroy => sub {
3061	my ($ns) = @_;	3250	my ($ns) = @_;
3062		3251
3063	$_->cancel for values %{ (delete $ns->{_coro}) || {} };	3252	$_->cancel for values %{ (delete $ns->{_coro}) || {} };
3064	},	3253	},
3065	);	3254	);
…		…
3081	our $safe_hole = new Safe::Hole;	3270	our $safe_hole = new Safe::Hole;
3082		3271
3083	$SIG{FPE} = 'IGNORE';	3272	$SIG{FPE} = 'IGNORE';
3084		3273
3085	$safe->permit_only (Opcode::opset qw(	3274	$safe->permit_only (Opcode::opset qw(
3086	:base_core :base_mem :base_orig :base_math	3275	:base_core :base_mem :base_orig :base_math :base_loop
3087	grepstart grepwhile mapstart mapwhile	3276	grepstart grepwhile mapstart mapwhile
3088	sort time	3277	sort time
3089	));	3278	));
3090		3279
3091	# here we export the classes and methods available to script code	3280	# here we export the classes and methods available to script code
…		…
3116	decrease split destroy change_exp value msg lore send_msg)],	3305	decrease split destroy change_exp value msg lore send_msg)],
3117	["cf::object::player" => qw(player)],	3306	["cf::object::player" => qw(player)],
3118	["cf::player" => qw(peaceful send_msg)],	3307	["cf::player" => qw(peaceful send_msg)],
3119	["cf::map" => qw(trigger)],	3308	["cf::map" => qw(trigger)],
3120	) {	3309	) {
3121	no strict 'refs';
3122	my ($pkg, @funs) = @$_;	3310	my ($pkg, @funs) = @$_;
3123	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3311	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3124	for @funs;	3312	for @funs;
3125	}	3313	}
3126		3314
…		…
3143	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3331	$qcode =~ s/"/‟/g; # not allowed in #line filenames
3144	$qcode =~ s/\n/\\n/g;	3332	$qcode =~ s/\n/\\n/g;
3145		3333
3146	%vars = (_dummy => 0) unless %vars;	3334	%vars = (_dummy => 0) unless %vars;
3147		3335
		3336	my @res;
3148	local $_;	3337	local $_;
3149	local @safe::cf::_safe_eval_args = values %vars;
3150		3338
3151	my $eval =	3339	my $eval =
3152	"do {\n"	3340	"do {\n"
3153	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"	3341	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3154	. "#line 0 \"{$qcode}\"\n"	3342	. "#line 0 \"{$qcode}\"\n"
3155	. $code	3343	. $code
3156	. "\n}"	3344	. "\n}"
3157	;	3345	;
3158		3346
		3347	if ($CFG{safe_eval}) {
3159	sub_generation_inc;	3348	sub_generation_inc;
		3349	local @safe::cf::_safe_eval_args = values %vars;
3160	my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);	3350	@res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3161	sub_generation_inc;	3351	sub_generation_inc;
		3352	} else {
		3353	local @cf::_safe_eval_args = values %vars;
		3354	@res = wantarray ? eval eval : scalar eval $eval;
		3355	}
3162		3356
3163	if ($@) {	3357	if ($@) {
3164	warn "$@";	3358	warn "$@",
3165	warn "while executing safe code '$code'\n";	3359	"while executing safe code '$code'\n",
3166	warn "with arguments " . (join " ", %vars) . "\n";	3360	"with arguments " . (join " ", %vars) . "\n";
3167	}	3361	}
3168		3362
3169	wantarray ? @res : $res[0]	3363	wantarray ? @res : $res[0]
3170	}	3364	}
3171		3365
…		…
3185	=cut	3379	=cut
3186		3380
3187	sub register_script_function {	3381	sub register_script_function {
3188	my ($fun, $cb) = @_;	3382	my ($fun, $cb) = @_;
3189		3383
3190	no strict 'refs';	3384	$fun = "safe::$fun" if $CFG{safe_eval};
3191	*{"safe::$fun"} = $safe_hole->wrap ($cb);	3385	*$fun = $safe_hole->wrap ($cb);
3192	}	3386	}
3193		3387
3194	=back	3388	=back
3195		3389
3196	=cut	3390	=cut
…		…
3205	# for this (global event?)	3399	# for this (global event?)
3206	%ext::player_env::MUSIC_FACE_CACHE = ();	3400	%ext::player_env::MUSIC_FACE_CACHE = ();
3207		3401
3208	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3402	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3209		3403
3210	warn "loading facedata from $path\n";	3404	trace "loading facedata from $path\n";
3211		3405
3212	my $facedata;
3213	0 < aio_load $path, $facedata	3406	0 < aio_load $path, my $facedata
3214	or die "$path: $!";	3407	or die "$path: $!";
3215		3408
3216	$facedata = Coro::Storable::thaw $facedata;	3409	$facedata = Coro::Storable::thaw $facedata;
3217		3410
3218	$facedata->{version} == 2	3411	$facedata->{version} == 2
3219	or cf::cleanup "$path: version mismatch, cannot proceed.";	3412	or cf::cleanup "$path: version mismatch, cannot proceed.";
3220		3413
3221	# patch in the exptable	3414	# patch in the exptable
		3415	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3222	$facedata->{resource}{"res/exp_table"} = {	3416	$facedata->{resource}{"res/exp_table"} = {
3223	type => FT_RSRC,	3417	type => FT_RSRC,
3224	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),	3418	data => $exp_table,
		3419	hash => (Digest::MD5::md5 $exp_table),
3225	};	3420	};
3226	cf::cede_to_tick;	3421	cf::cede_to_tick;
3227		3422
3228	{	3423	{
3229	my $faces = $facedata->{faceinfo};	3424	my $faces = $facedata->{faceinfo};
…		…
3231	while (my ($face, $info) = each %$faces) {	3426	while (my ($face, $info) = each %$faces) {
3232	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3427	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3233		3428
3234	cf::face::set_visibility $idx, $info->{visibility};	3429	cf::face::set_visibility $idx, $info->{visibility};
3235	cf::face::set_magicmap $idx, $info->{magicmap};	3430	cf::face::set_magicmap $idx, $info->{magicmap};
3236	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};	3431	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3237	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};	3432	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
		3433	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3238		3434
3239	cf::cede_to_tick;	3435	cf::cede_to_tick;
3240	}	3436	}
3241		3437
3242	while (my ($face, $info) = each %$faces) {	3438	while (my ($face, $info) = each %$faces) {
…		…
3247		3443
3248	if (my $smooth = cf::face::find $info->{smooth}) {	3444	if (my $smooth = cf::face::find $info->{smooth}) {
3249	cf::face::set_smooth $idx, $smooth;	3445	cf::face::set_smooth $idx, $smooth;
3250	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3446	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3251	} else {	3447	} else {
3252	warn "smooth face '$info->{smooth}' not found for face '$face'";	3448	error "smooth face '$info->{smooth}' not found for face '$face'";
3253	}	3449	}
3254		3450
3255	cf::cede_to_tick;	3451	cf::cede_to_tick;
3256	}	3452	}
3257	}	3453	}
…		…
3266		3462
3267	cf::anim::invalidate_all; # d'oh	3463	cf::anim::invalidate_all; # d'oh
3268	}	3464	}
3269		3465
3270	{	3466	{
3271	# TODO: for gcfclient pleasure, we should give resources
3272	# that gcfclient doesn't grok a >10000 face index.
3273	my $res = $facedata->{resource};	3467	my $res = $facedata->{resource};
3274		3468
3275	while (my ($name, $info) = each %$res) {	3469	while (my ($name, $info) = each %$res) {
3276	if (defined $info->{type}) {	3470	if (defined $info->{type}) {
3277	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3471	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3278	my $data;
3279		3472
3280	if ($info->{type} & 1) {	3473	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3281	# prepend meta info
3282
3283	my $meta = $enc->encode ({
3284	name => $name,
3285	%{ $info->{meta} || {} },
3286	});
3287
3288	$data = pack "(w/a*)*", $meta, $info->{data};
3289	} else {
3290	$data = $info->{data};
3291	}
3292
3293	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3294	cf::face::set_type $idx, $info->{type};	3474	cf::face::set_type $idx, $info->{type};
3295	} else {	3475	} else {
3296	$RESOURCE{$name} = $info;	3476	$RESOURCE{$name} = $info; # unused
3297	}	3477	}
3298		3478
3299	cf::cede_to_tick;	3479	cf::cede_to_tick;
3300	}	3480	}
3301	}	3481	}
3302		3482
3303	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3483	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3304		3484
3305	1	3485	1
3306	}	3486	}
3307
3308	cf::global->attach (on_resource_update => sub {
3309	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3310	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3311
3312	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3313	my $sound = $soundconf->{compat}[$_]
3314	or next;
3315
3316	my $face = cf::face::find "sound/$sound->[1]";
3317	cf::sound::set $sound->[0] => $face;
3318	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3319	}
3320
3321	while (my ($k, $v) = each %{$soundconf->{event}}) {
3322	my $face = cf::face::find "sound/$v";
3323	cf::sound::set $k => $face;
3324	}
3325	}
3326	});
3327		3487
3328	register_exticmd fx_want => sub {	3488	register_exticmd fx_want => sub {
3329	my ($ns, $want) = @_;	3489	my ($ns, $want) = @_;
3330		3490
3331	while (my ($k, $v) = each %$want) {	3491	while (my ($k, $v) = each %$want) {
…		…
3370	sub reload_treasures {	3530	sub reload_treasures {
3371	load_resource_file "$DATADIR/treasures"	3531	load_resource_file "$DATADIR/treasures"
3372	or die "unable to load treasurelists\n";	3532	or die "unable to load treasurelists\n";
3373	}	3533	}
3374		3534
		3535	sub reload_sound {
		3536	trace "loading sound config from $DATADIR/sound\n";
		3537
		3538	0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
		3539	or die "$DATADIR/sound $!";
		3540
		3541	my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
		3542
		3543	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3544	my $sound = $soundconf->{compat}[$_]
		3545	or next;
		3546
		3547	my $face = cf::face::find "sound/$sound->[1]";
		3548	cf::sound::set $sound->[0] => $face;
		3549	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3550	}
		3551
		3552	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3553	my $face = cf::face::find "sound/$v";
		3554	cf::sound::set $k => $face;
		3555	}
		3556	}
		3557
3375	sub reload_resources {	3558	sub reload_resources {
3376	warn "reloading resource files...\n";	3559	trace "reloading resource files...\n";
3377		3560
		3561	reload_exp_table;
		3562	reload_materials;
3378	reload_facedata;	3563	reload_facedata;
		3564	reload_sound;
3379	reload_archetypes;	3565	reload_archetypes;
3380	reload_regions;	3566	reload_regions;
3381	reload_treasures;	3567	reload_treasures;
3382		3568
3383	warn "finished reloading resource files\n";	3569	trace "finished reloading resource files\n";
3384	}	3570	}
3385		3571
3386	sub reload_config {	3572	sub reload_config {
3387	open my $fh, "<:utf8", "$CONFDIR/config"	3573	trace "reloading config file...\n";
3388	or return;
3389		3574
3390	local $/;	3575	0 < aio_load "$CONFDIR/config", my $config
3391	*CFG = YAML::Load <$fh>;	3576	or die "$CONFDIR/config: $!";
3392		3577
		3578	utf8::decode $config;
		3579	*CFG = yaml_load $config;
		3580
3393	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3581	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3394		3582
3395	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3583	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3396	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3584	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3397		3585
3398	if (exists $CFG{mlockall}) {	3586	if (exists $CFG{mlockall}) {
…		…
3422	seek $fh, 0, 0;	3610	seek $fh, 0, 0;
3423	print $fh $$;	3611	print $fh $$;
3424	}	3612	}
3425		3613
3426	sub main_loop {	3614	sub main_loop {
3427	warn "EV::loop starting\n";	3615	trace "EV::loop starting\n";
3428	if (1) {	3616	if (1) {
3429	EV::loop;	3617	EV::loop;
3430	}	3618	}
3431	warn "EV::loop returned\n";	3619	trace "EV::loop returned\n";
3432	goto &main_loop unless $REALLY_UNLOOP;	3620	goto &main_loop unless $REALLY_UNLOOP;
3433	}	3621	}
3434		3622
3435	sub main {	3623	sub main {
3436	cf::init_globals; # initialise logging	3624	cf::init_globals; # initialise logging
3437		3625
3438	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3626	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3439	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3627	LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3440	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3628	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3441	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3629	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3442
3443	cf::init_experience;
3444	cf::init_anim;
3445	cf::init_attackmess;
3446	cf::init_dynamic;
3447		3630
3448	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3631	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3449		3632
3450	# we must not ever block the main coroutine	3633	# we must not ever block the main coroutine
3451	local $Coro::idle = sub {	3634	local $Coro::idle = sub {
…		…
3457	};	3640	};
3458		3641
3459	evthread_start IO::AIO::poll_fileno;	3642	evthread_start IO::AIO::poll_fileno;
3460		3643
3461	cf::sync_job {	3644	cf::sync_job {
		3645	cf::incloader::init ();
		3646
		3647	cf::init_anim;
		3648	cf::init_attackmess;
		3649	cf::init_dynamic;
		3650
		3651	cf::load_settings;
		3652
3462	reload_resources;	3653	reload_resources;
3463	reload_config;	3654	reload_config;
3464	db_init;	3655	db_init;
3465		3656
3466	cf::load_settings;
3467	cf::load_materials;
3468	cf::init_uuid;	3657	cf::init_uuid;
3469	cf::init_signals;	3658	cf::init_signals;
3470	cf::init_commands;
3471	cf::init_skills;	3659	cf::init_skills;
3472		3660
3473	cf::init_beforeplay;	3661	cf::init_beforeplay;
3474		3662
3475	atomic;	3663	atomic;
…		…
3480		3668
3481	# no (long-running) fork's whatsoever before this point(!)	3669	# no (long-running) fork's whatsoever before this point(!)
3482	use POSIX ();	3670	use POSIX ();
3483	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3671	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3484		3672
3485	(pop @POST_INIT)->(0) while @POST_INIT;	3673	cf::_post_init 0;
3486	};	3674	};
3487		3675
		3676	cf::object::thawer::errors_are_fatal 0;
		3677	info "parse errors in files are no longer fatal from this point on.\n";
		3678
		3679	my $free_main; $free_main = EV::idle sub {
		3680	undef $free_main;
		3681	undef &main; # free gobs of memory :)
		3682	};
		3683
3488	main_loop;	3684	goto &main_loop;
3489	}	3685	}
3490		3686
3491	#############################################################################	3687	#############################################################################
3492	# initialisation and cleanup	3688	# initialisation and cleanup
3493		3689
3494	# install some emergency cleanup handlers	3690	# install some emergency cleanup handlers
3495	BEGIN {	3691	BEGIN {
3496	our %SIGWATCHER = ();	3692	our %SIGWATCHER = ();
3497	for my $signal (qw(INT HUP TERM)) {	3693	for my $signal (qw(INT HUP TERM)) {
3498	$SIGWATCHER{$signal} = EV::signal $signal, sub {	3694	$SIGWATCHER{$signal} = AE::signal $signal, sub {
3499	cf::cleanup "SIG$signal";	3695	cf::cleanup "SIG$signal";
3500	};	3696	};
3501	}	3697	}
3502	}	3698	}
3503		3699
3504	sub write_runtime_sync {	3700	sub write_runtime_sync {
		3701	my $t0 = AE::time;
		3702
3505	# first touch the runtime file to show we are still running:	3703	# first touch the runtime file to show we are still running:
3506	# the fsync below can take a very very long time.	3704	# the fsync below can take a very very long time.
3507		3705
3508	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;	3706	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3509		3707
3510	my $guard = cf::lock_acquire "write_runtime";	3708	my $guard = cf::lock_acquire "write_runtime";
3511		3709
3512	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644	3710	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3513	or return;	3711	or return;
3514		3712
3515	my $value = $cf::RUNTIME + 90 + 10;	3713	my $value = $cf::RUNTIME + 90 + 10;
3516	# 10 is the runtime save interval, for a monotonic clock	3714	# 10 is the runtime save interval, for a monotonic clock
3517	# 60 allows for the watchdog to kill the server.	3715	# 60 allows for the watchdog to kill the server.
…		…
3530	or return;	3728	or return;
3531		3729
3532	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3730	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3533	and return;	3731	and return;
3534		3732
3535	warn "runtime file written.\n";	3733	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3536		3734
3537	1	3735	1
3538	}	3736	}
3539		3737
3540	our $uuid_lock;	3738	our $uuid_lock;
…		…
3552	or return;	3750	or return;
3553		3751
3554	my $value = uuid_seq uuid_cur;	3752	my $value = uuid_seq uuid_cur;
3555		3753
3556	unless ($value) {	3754	unless ($value) {
3557	warn "cowardly refusing to write zero uuid value!\n";	3755	info "cowardly refusing to write zero uuid value!\n";
3558	return;	3756	return;
3559	}	3757	}
3560		3758
3561	my $value = uuid_str $value + $uuid_skip;	3759	my $value = uuid_str $value + $uuid_skip;
3562	$uuid_skip = 0;	3760	$uuid_skip = 0;
…		…
3572	or return;	3770	or return;
3573		3771
3574	aio_rename "$uuid~", $uuid	3772	aio_rename "$uuid~", $uuid
3575	and return;	3773	and return;
3576		3774
3577	warn "uuid file written ($value).\n";	3775	trace "uuid file written ($value).\n";
3578		3776
3579	1	3777	1
3580		3778
3581	}	3779	}
3582		3780
…		…
3588	}	3786	}
3589		3787
3590	sub emergency_save() {	3788	sub emergency_save() {
3591	my $freeze_guard = cf::freeze_mainloop;	3789	my $freeze_guard = cf::freeze_mainloop;
3592		3790
3593	warn "emergency_perl_save: enter\n";	3791	info "emergency_perl_save: enter\n";
		3792
		3793	# this is a trade-off: we want to be very quick here, so
		3794	# save all maps without fsync, and later call a global sync
		3795	# (which in turn might be very very slow)
		3796	local $USE_FSYNC = 0;
3594		3797
3595	cf::sync_job {	3798	cf::sync_job {
3596	# this is a trade-off: we want to be very quick here, so	3799	cf::write_runtime_sync; # external watchdog should not bark
3597	# save all maps without fsync, and later call a global sync
3598	# (which in turn might be very very slow)
3599	local $USE_FSYNC = 0;
3600		3800
3601	# use a peculiar iteration method to avoid tripping on perl	3801	# use a peculiar iteration method to avoid tripping on perl
3602	# refcount bugs in for. also avoids problems with players	3802	# refcount bugs in for. also avoids problems with players
3603	# and maps saved/destroyed asynchronously.	3803	# and maps saved/destroyed asynchronously.
3604	warn "emergency_perl_save: begin player save\n";	3804	info "emergency_perl_save: begin player save\n";
3605	for my $login (keys %cf::PLAYER) {	3805	for my $login (keys %cf::PLAYER) {
3606	my $pl = $cf::PLAYER{$login} or next;	3806	my $pl = $cf::PLAYER{$login} or next;
3607	$pl->valid or next;	3807	$pl->valid or next;
3608	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3808	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3609	$pl->save;	3809	$pl->save;
3610	}	3810	}
3611	warn "emergency_perl_save: end player save\n";	3811	info "emergency_perl_save: end player save\n";
3612		3812
		3813	cf::write_runtime_sync; # external watchdog should not bark
		3814
3613	warn "emergency_perl_save: begin map save\n";	3815	info "emergency_perl_save: begin map save\n";
3614	for my $path (keys %cf::MAP) {	3816	for my $path (keys %cf::MAP) {
3615	my $map = $cf::MAP{$path} or next;	3817	my $map = $cf::MAP{$path} or next;
3616	$map->valid or next;	3818	$map->valid or next;
3617	$map->save;	3819	$map->save;
3618	}	3820	}
3619	warn "emergency_perl_save: end map save\n";	3821	info "emergency_perl_save: end map save\n";
3620		3822
		3823	cf::write_runtime_sync; # external watchdog should not bark
		3824
3621	warn "emergency_perl_save: begin database checkpoint\n";	3825	info "emergency_perl_save: begin database checkpoint\n";
3622	BDB::db_env_txn_checkpoint $DB_ENV;	3826	BDB::db_env_txn_checkpoint $DB_ENV;
3623	warn "emergency_perl_save: end database checkpoint\n";	3827	info "emergency_perl_save: end database checkpoint\n";
3624		3828
3625	warn "emergency_perl_save: begin write uuid\n";	3829	info "emergency_perl_save: begin write uuid\n";
3626	write_uuid_sync 1;	3830	write_uuid_sync 1;
3627	warn "emergency_perl_save: end write uuid\n";	3831	info "emergency_perl_save: end write uuid\n";
		3832
		3833	cf::write_runtime_sync; # external watchdog should not bark
		3834
		3835	trace "emergency_perl_save: syncing database to disk";
		3836	BDB::db_env_txn_checkpoint $DB_ENV;
		3837
		3838	info "emergency_perl_save: starting sync\n";
		3839	IO::AIO::aio_sync sub {
		3840	info "emergency_perl_save: finished sync\n";
		3841	};
		3842
		3843	cf::write_runtime_sync; # external watchdog should not bark
		3844
		3845	trace "emergency_perl_save: flushing outstanding aio requests";
		3846	while (IO::AIO::nreqs || BDB::nreqs) {
		3847	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
		3848	}
		3849
		3850	cf::write_runtime_sync; # external watchdog should not bark
3628	};	3851	};
3629		3852
3630	warn "emergency_perl_save: starting sync()\n";
3631	IO::AIO::aio_sync sub {
3632	warn "emergency_perl_save: finished sync()\n";
3633	};
3634
3635	warn "emergency_perl_save: leave\n";	3853	info "emergency_perl_save: leave\n";
3636	}	3854	}
3637		3855
3638	sub post_cleanup {	3856	sub post_cleanup {
3639	my ($make_core) = @_;	3857	my ($make_core) = @_;
3640		3858
		3859	IO::AIO::flush;
		3860
3641	warn Carp::longmess "post_cleanup backtrace"	3861	error Carp::longmess "post_cleanup backtrace"
3642	if $make_core;	3862	if $make_core;
3643		3863
3644	my $fh = pidfile;	3864	my $fh = pidfile;
3645	unlink $PIDFILE if <$fh> == $$;	3865	unlink $PIDFILE if <$fh> == $$;
3646	}	3866	}
…		…
3666	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	3886	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3667	for my $name (keys %$leaf_symtab) {	3887	for my $name (keys %$leaf_symtab) {
3668	_gv_clear *{"$pkg$name"};	3888	_gv_clear *{"$pkg$name"};
3669	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	3889	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3670	}	3890	}
3671	warn "cleared package $pkg\n";#d#
3672	}	3891	}
3673		3892
3674	sub do_reload_perl() {	3893	sub do_reload_perl() {
3675	# can/must only be called in main	3894	# can/must only be called in main
3676	if ($Coro::current != $Coro::main) {	3895	unless (in_main) {
3677	warn "can only reload from main coroutine";	3896	error "can only reload from main coroutine";
3678	return;	3897	return;
3679	}	3898	}
3680		3899
3681	return if $RELOAD++;	3900	return if $RELOAD++;
3682		3901
3683	my $t1 = EV::time;	3902	my $t1 = AE::time;
3684		3903
3685	while ($RELOAD) {	3904	while ($RELOAD) {
3686	warn "reloading...";	3905	cf::get_slot 0.1, -1, "reload_perl";
		3906	info "perl_reload: reloading...";
3687		3907
3688	warn "entering sync_job";	3908	trace "perl_reload: entering sync_job";
3689		3909
3690	cf::sync_job {	3910	cf::sync_job {
3691	cf::write_runtime_sync; # external watchdog should not bark
3692	cf::emergency_save;	3911	#cf::emergency_save;
3693	cf::write_runtime_sync; # external watchdog should not bark
3694		3912
3695	warn "syncing database to disk";
3696	BDB::db_env_txn_checkpoint $DB_ENV;
3697
3698	# if anything goes wrong in here, we should simply crash as we already saved
3699
3700	warn "flushing outstanding aio requests";
3701	while (IO::AIO::nreqs || BDB::nreqs) {
3702	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3703	}
3704
3705	warn "cancelling all extension coros";	3913	trace "perl_reload: cancelling all extension coros";
3706	$_->cancel for values %EXT_CORO;	3914	$_->cancel for values %EXT_CORO;
3707	%EXT_CORO = ();	3915	%EXT_CORO = ();
3708		3916
3709	warn "removing commands";	3917	trace "perl_reload: removing commands";
3710	%COMMAND = ();	3918	%COMMAND = ();
3711		3919
3712	warn "removing ext/exti commands";	3920	trace "perl_reload: removing ext/exti commands";
3713	%EXTCMD = ();	3921	%EXTCMD = ();
3714	%EXTICMD = ();	3922	%EXTICMD = ();
3715		3923
3716	warn "unloading/nuking all extensions";	3924	trace "perl_reload: unloading/nuking all extensions";
3717	for my $pkg (@EXTS) {	3925	for my $pkg (@EXTS) {
3718	warn "... unloading $pkg";	3926	trace "... unloading $pkg";
3719		3927
3720	if (my $cb = $pkg->can ("unload")) {	3928	if (my $cb = $pkg->can ("unload")) {
3721	eval {	3929	eval {
3722	$cb->($pkg);	3930	$cb->($pkg);
3723	1	3931	1
3724	} or warn "$pkg unloaded, but with errors: $@";	3932	} or error "$pkg unloaded, but with errors: $@";
3725	}	3933	}
3726		3934
3727	warn "... clearing $pkg";	3935	trace "... clearing $pkg";
3728	clear_package $pkg;	3936	clear_package $pkg;
3729	}	3937	}
3730		3938
3731	warn "unloading all perl modules loaded from $LIBDIR";	3939	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3732	while (my ($k, $v) = each %INC) {	3940	while (my ($k, $v) = each %INC) {
3733	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	3941	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3734		3942
3735	warn "... unloading $k";	3943	trace "... unloading $k";
3736	delete $INC{$k};	3944	delete $INC{$k};
3737		3945
3738	$k =~ s/\.pm$//;	3946	$k =~ s/\.pm$//;
3739	$k =~ s/\//::/g;	3947	$k =~ s/\//::/g;
3740		3948
…		…
3743	}	3951	}
3744		3952
3745	clear_package $k;	3953	clear_package $k;
3746	}	3954	}
3747		3955
3748	warn "getting rid of safe::, as good as possible";	3956	trace "perl_reload: getting rid of safe::, as good as possible";
3749	clear_package "safe::$_"	3957	clear_package "safe::$_"
3750	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	3958	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3751		3959
3752	warn "unloading cf.pm \"a bit\"";	3960	trace "perl_reload: unloading cf.pm \"a bit\"";
3753	delete $INC{"cf.pm"};	3961	delete $INC{"cf.pm"};
3754	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	3962	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3755		3963
3756	# don't, removes xs symbols, too,	3964	# don't, removes xs symbols, too,
3757	# and global variables created in xs	3965	# and global variables created in xs
3758	#clear_package __PACKAGE__;	3966	#clear_package __PACKAGE__;
3759		3967
3760	warn "unload completed, starting to reload now";	3968	info "perl_reload: unload completed, starting to reload now";
3761		3969
3762	warn "reloading cf.pm";	3970	trace "perl_reload: reloading cf.pm";
3763	require cf;	3971	require cf;
3764	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3972	cf::_connect_to_perl_1;
3765		3973
3766	warn "loading config and database again";	3974	trace "perl_reload: loading config and database again";
3767	cf::reload_config;	3975	cf::reload_config;
3768		3976
3769	warn "loading extensions";	3977	trace "perl_reload: loading extensions";
3770	cf::load_extensions;	3978	cf::load_extensions;
3771		3979
3772	if ($REATTACH_ON_RELOAD) {	3980	if ($REATTACH_ON_RELOAD) {
3773	warn "reattaching attachments to objects/players";	3981	trace "perl_reload: reattaching attachments to objects/players";
3774	_global_reattach; # objects, sockets	3982	_global_reattach; # objects, sockets
3775	warn "reattaching attachments to maps";	3983	trace "perl_reload: reattaching attachments to maps";
3776	reattach $_ for values %MAP;	3984	reattach $_ for values %MAP;
3777	warn "reattaching attachments to players";	3985	trace "perl_reload: reattaching attachments to players";
3778	reattach $_ for values %PLAYER;	3986	reattach $_ for values %PLAYER;
3779	}	3987	}
3780		3988
3781	warn "running post_init jobs";	3989	cf::_post_init 1;
3782	(pop @POST_INIT)->(1) while @POST_INIT;
3783		3990
3784	warn "leaving sync_job";	3991	trace "perl_reload: leaving sync_job";
3785		3992
3786	1	3993	1
3787	} or do {	3994	} or do {
3788	warn $@;	3995	error $@;
3789	cf::cleanup "error while reloading, exiting.";	3996	cf::cleanup "perl_reload: error, exiting.";
3790	};	3997	};
3791		3998
3792	warn "reloaded";
3793	--$RELOAD;	3999	--$RELOAD;
3794	}	4000	}
3795		4001
3796	$t1 = EV::time - $t1;	4002	$t1 = AE::time - $t1;
3797	warn "reload completed in ${t1}s\n";	4003	info "perl_reload: completed in ${t1}s\n";
3798	};	4004	};
3799		4005
3800	our $RELOAD_WATCHER; # used only during reload	4006	our $RELOAD_WATCHER; # used only during reload
3801		4007
3802	sub reload_perl() {	4008	sub reload_perl() {
…		…
3804	# coro crashes during coro_state_free->destroy here.	4010	# coro crashes during coro_state_free->destroy here.
3805		4011
3806	$RELOAD_WATCHER ||= cf::async {	4012	$RELOAD_WATCHER ||= cf::async {
3807	Coro::AIO::aio_wait cache_extensions;	4013	Coro::AIO::aio_wait cache_extensions;
3808		4014
3809	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {	4015	$RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3810	do_reload_perl;	4016	do_reload_perl;
3811	undef $RELOAD_WATCHER;	4017	undef $RELOAD_WATCHER;
3812	};	4018	};
3813	};	4019	};
3814	}	4020	}
…		…
3823	reload_perl;	4029	reload_perl;
3824	};	4030	};
3825	}	4031	}
3826	};	4032	};
3827		4033
3828	unshift @INC, $LIBDIR;	4034	#############################################################################
3829		4035
3830	my $bug_warning = 0;	4036	my $bug_warning = 0;
3831		4037
3832	our @WAIT_FOR_TICK;	4038	our @WAIT_FOR_TICK;
3833	our @WAIT_FOR_TICK_BEGIN;	4039	our @WAIT_FOR_TICK_BEGIN;
3834		4040
3835	sub wait_for_tick {	4041	sub wait_for_tick() {
3836	return if tick_inhibit || $Coro::current == $Coro::main;	4042	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3837		4043
3838	my $signal = new Coro::Signal;	4044	my $signal = new Coro::Signal;
3839	push @WAIT_FOR_TICK, $signal;	4045	push @WAIT_FOR_TICK, $signal;
3840	$signal->wait;	4046	$signal->wait;
3841	}	4047	}
3842		4048
3843	sub wait_for_tick_begin {	4049	sub wait_for_tick_begin() {
3844	return if tick_inhibit || $Coro::current == $Coro::main;	4050	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3845		4051
3846	my $signal = new Coro::Signal;	4052	my $signal = new Coro::Signal;
3847	push @WAIT_FOR_TICK_BEGIN, $signal;	4053	push @WAIT_FOR_TICK_BEGIN, $signal;
3848	$signal->wait;	4054	$signal->wait;
3849	}	4055	}
…		…
3855	return;	4061	return;
3856	}	4062	}
3857		4063
3858	cf::server_tick; # one server iteration	4064	cf::server_tick; # one server iteration
3859		4065
		4066	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
		4067
3860	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4068	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3861	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4069	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3862	Coro::async_pool {	4070	Coro::async_pool {
3863	$Coro::current->{desc} = "runtime saver";	4071	$Coro::current->{desc} = "runtime saver";
3864	write_runtime_sync	4072	write_runtime_sync
3865	or warn "ERROR: unable to write runtime file: $!";	4073	or error "ERROR: unable to write runtime file: $!";
3866	};	4074	};
3867	}	4075	}
3868		4076
3869	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4077	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3870	$sig->send;	4078	$sig->send;
…		…
3878		4086
3879	if (0) {	4087	if (0) {
3880	if ($NEXT_TICK) {	4088	if ($NEXT_TICK) {
3881	my $jitter = $TICK_START - $NEXT_TICK;	4089	my $jitter = $TICK_START - $NEXT_TICK;
3882	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4090	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
3883	warn "jitter $JITTER\n";#d#	4091	debug "jitter $JITTER\n";#d#
3884	}	4092	}
3885	}	4093	}
3886	}	4094	}
3887		4095
3888	{	4096	{
3889	# configure BDB	4097	# configure BDB
3890		4098
3891	BDB::min_parallel 8;	4099	BDB::min_parallel 16;
3892	BDB::max_poll_reqs $TICK * 0.1;	4100	BDB::max_poll_reqs $TICK * 0.1;
3893	$AnyEvent::BDB::WATCHER->priority (1);	4101	$AnyEvent::BDB::WATCHER->priority (1);
3894		4102
3895	unless ($DB_ENV) {	4103	unless ($DB_ENV) {
3896	$DB_ENV = BDB::db_env_create;	4104	$DB_ENV = BDB::db_env_create;
…		…
3933	IO::AIO::min_parallel 8;	4141	IO::AIO::min_parallel 8;
3934	IO::AIO::max_poll_time $TICK * 0.1;	4142	IO::AIO::max_poll_time $TICK * 0.1;
3935	undef $AnyEvent::AIO::WATCHER;	4143	undef $AnyEvent::AIO::WATCHER;
3936	}	4144	}
3937		4145
3938	my $_log_backtrace;	4146	our $_log_backtrace;
		4147	our $_log_backtrace_last;
3939		4148
3940	sub _log_backtrace {	4149	sub _log_backtrace {
3941	my ($msg, @addr) = @_;	4150	my ($msg, @addr) = @_;
3942		4151
3943	$msg =~ s/\n//;	4152	$msg =~ s/\n$//;
3944		4153
		4154	if ($_log_backtrace_last eq $msg) {
		4155	LOG llevInfo, "[ABT] $msg\n";
		4156	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3945	# limit the # of concurrent backtraces	4157	# limit the # of concurrent backtraces
3946	if ($_log_backtrace < 2) {	4158	} elsif ($_log_backtrace < 2) {
		4159	$_log_backtrace_last = $msg;
3947	++$_log_backtrace;	4160	++$_log_backtrace;
3948	my $perl_bt = Carp::longmess $msg;	4161	my $perl_bt = Carp::longmess $msg;
3949	async {	4162	async {
3950	$Coro::current->{desc} = "abt $msg";	4163	$Coro::current->{desc} = "abt $msg";
3951		4164
…		…
3971	LOG llevInfo, "[ABT] $_\n" for @bt;	4184	LOG llevInfo, "[ABT] $_\n" for @bt;
3972	--$_log_backtrace;	4185	--$_log_backtrace;
3973	};	4186	};
3974	} else {	4187	} else {
3975	LOG llevInfo, "[ABT] $msg\n";	4188	LOG llevInfo, "[ABT] $msg\n";
3976	LOG llevInfo, "[ABT] [suppressed]\n";	4189	LOG llevInfo, "[ABT] [overload, suppressed]\n";
3977	}	4190	}
3978	}	4191	}
3979		4192
3980	# load additional modules	4193	# load additional modules
3981	require "cf/$_.pm" for @EXTRA_MODULES;	4194	require "cf/$_.pm" for @EXTRA_MODULES;
		4195	cf::_connect_to_perl_2;
3982		4196
3983	END { cf::emergency_save }	4197	END { cf::emergency_save }
3984		4198
3985	1	4199	1
3986		4200

Diff Legend

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