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.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
…		…
88	our %EXT_CORO = (); # coroutines bound to extensions	89	our %EXT_CORO = (); # coroutines bound to extensions
89	our %EXT_MAP = (); # pluggable maps	90	our %EXT_MAP = (); # pluggable maps
90		91
91	our $RELOAD; # number of reloads so far, non-zero while in reload	92	our $RELOAD; # number of reloads so far, non-zero while in reload
92	our @EVENT;	93	our @EVENT;
		94	our @REFLECT; # set by XS
		95	our %REFLECT; # set by us
93		96
94	our $CONFDIR = confdir;	97	our $CONFDIR = confdir;
		98
95	our $DATADIR = datadir;	99	our $DATADIR = datadir;
96	our $LIBDIR = "$DATADIR/ext";	100	our $LIBDIR = "$DATADIR/ext";
97	our $PODDIR = "$DATADIR/pod";	101	our $PODDIR = "$DATADIR/pod";
98	our $MAPDIR = "$DATADIR/" . mapdir;	102	our $MAPDIR = "$DATADIR/" . mapdir;
		103
99	our $LOCALDIR = localdir;	104	our $LOCALDIR = localdir;
100	our $TMPDIR = "$LOCALDIR/" . tmpdir;	105	our $TMPDIR = "$LOCALDIR/" . tmpdir;
101	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	106	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
102	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	107	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
103	our $RANDOMDIR = "$LOCALDIR/random";	108	our $RANDOMDIR = "$LOCALDIR/random";
104	our $BDBDIR = "$LOCALDIR/db";	109	our $BDBDIR = "$LOCALDIR/db";
105	our $PIDFILE = "$LOCALDIR/pid";	110	our $PIDFILE = "$LOCALDIR/pid";
106	our $RUNTIMEFILE = "$LOCALDIR/runtime";	111	our $RUNTIMEFILE = "$LOCALDIR/runtime";
107		112
108	our %RESOURCE;	113	our %RESOURCE; # unused
		114
		115	our $OUTPUT_RATE_MIN = 3000;
		116	our $OUTPUT_RATE_MAX = 1000000;
		117
		118	our $MAX_LINKS = 32; # how many chained exits to follow
		119	our $VERBOSE_IO = 1;
109		120
110	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	121	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
111	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	122	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
112	our $NEXT_TICK;	123	our $NEXT_TICK;
113	our $USE_FSYNC = 1; # use fsync to write maps - default on	124	our $USE_FSYNC = 1; # use fsync to write maps - default on
…		…
115	our $BDB_DEADLOCK_WATCHER;	126	our $BDB_DEADLOCK_WATCHER;
116	our $BDB_CHECKPOINT_WATCHER;	127	our $BDB_CHECKPOINT_WATCHER;
117	our $BDB_TRICKLE_WATCHER;	128	our $BDB_TRICKLE_WATCHER;
118	our $DB_ENV;	129	our $DB_ENV;
119		130
120	our @EXTRA_MODULES = qw(pod mapscript);	131	our @EXTRA_MODULES = qw(pod match mapscript incloader);
121		132
122	our %CFG;	133	our %CFG;
123		134
124	our $UPTIME; $UPTIME ||= time;	135	our $UPTIME; $UPTIME ||= time;
125	our $RUNTIME;	136	our $RUNTIME;
…		…
159		170
160	our $EMERGENCY_POSITION;	171	our $EMERGENCY_POSITION;
161		172
162	sub cf::map::normalise;	173	sub cf::map::normalise;
163		174
		175	sub in_main() {
		176	$Coro::current == $Coro::main
		177	}
		178
		179	#############################################################################
		180
		181	%REFLECT = ();
		182	for (@REFLECT) {
		183	my $reflect = JSON::XS::decode_json $_;
		184	$REFLECT{$reflect->{class}} = $reflect;
		185	}
		186
		187	# this is decidedly evil
		188	$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
		189
164	#############################################################################	190	#############################################################################
165		191
166	=head2 GLOBAL VARIABLES	192	=head2 GLOBAL VARIABLES
167		193
168	=over 4	194	=over 4
…		…
209	from wherever your confdir points to.	235	from wherever your confdir points to.
210		236
211	=item cf::wait_for_tick, cf::wait_for_tick_begin	237	=item cf::wait_for_tick, cf::wait_for_tick_begin
212		238
213	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	239	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
214	returns directly I<after> the tick processing (and consequently, can only wake one process	240	returns directly I<after> the tick processing (and consequently, can only wake one thread
215	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	241	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
216		242
		243	=cut
		244
		245	sub wait_for_tick();
		246	sub wait_for_tick_begin();
		247
217	=item @cf::INVOKE_RESULTS	248	=item @cf::INVOKE_RESULTS
218		249
219	This array contains the results of the last C<invoke ()> call. When	250	This array contains the results of the last C<invoke ()> call. When
220	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of	251	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
221	that call.	252	that call.
222		253
		254	=item %cf::REFLECT
		255
		256	Contains, for each (C++) class name, a hash reference with information
		257	about object members (methods, scalars, arrays and flags) and other
		258	metadata, which is useful for introspection.
		259
223	=back	260	=back
224		261
225	=cut	262	=cut
		263
		264	sub error(@) { LOG llevError, join "", @_ }
		265	sub warn (@) { LOG llevWarn , join "", @_ }
		266	sub info (@) { LOG llevInfo , join "", @_ }
		267	sub debug(@) { LOG llevDebug, join "", @_ }
		268	sub trace(@) { LOG llevTrace, join "", @_ }
226		269
227	$Coro::State::WARNHOOK = sub {	270	$Coro::State::WARNHOOK = sub {
228	my $msg = join "", @_;	271	my $msg = join "", @_;
229		272
230	$msg .= "\n"	273	$msg .= "\n"
231	unless $msg =~ /\n$/;	274	unless $msg =~ /\n$/;
232		275
233	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	276	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
234		277
235	LOG llevError, $msg;	278	LOG llevWarn, $msg;
236	};	279	};
237		280
238	$Coro::State::DIEHOOK = sub {	281	$Coro::State::DIEHOOK = sub {
239	return unless $^S eq 0; # "eq", not "=="	282	return unless $^S eq 0; # "eq", not "=="
240		283
241	warn Carp::longmess $_[0];	284	error Carp::longmess $_[0];
242		285
243	if ($Coro::current == $Coro::main) {#d#	286	if (in_main) {#d#
244	warn "DIEHOOK called in main context, Coro bug?\n";#d#	287	error "DIEHOOK called in main context, Coro bug?\n";#d#
245	return;#d#	288	return;#d#
246	}#d#	289	}#d#
247		290
248	# kill coroutine otherwise	291	# kill coroutine otherwise
249	Coro::terminate	292	Coro::terminate
…		…
269	)) {	312	)) {
270	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	313	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
271	}	314	}
272		315
273	$EV::DIED = sub {	316	$EV::DIED = sub {
274	warn "error in event callback: @_";	317	Carp::cluck "error in event callback: @_";
275	};	318	};
276		319
277	#############################################################################	320	#############################################################################
278		321
279	=head2 UTILITY FUNCTIONS	322	=head2 UTILITY FUNCTIONS
…		…
316	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
317		360
318	sub encode_json($) { $json_coder->encode ($_[0]) }	361	sub encode_json($) { $json_coder->encode ($_[0]) }
319	sub decode_json($) { $json_coder->decode ($_[0]) }	362	sub decode_json($) { $json_coder->decode ($_[0]) }
320		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
321	=item cf::post_init { BLOCK }	376	=item cf::post_init { BLOCK }
322		377
323	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,
324	but I<before> the server starts ticking again.	379	but I<before> the server starts ticking again.
325		380
326	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
327	is a reload or not.	382	is a reload or not.
328		383
329	=cut	384	=cut
330		385
331	sub post_init(&) {	386	sub post_init(&) {
332	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	}
333	}	405	}
334		406
335	=item cf::lock_wait $string	407	=item cf::lock_wait $string
336		408
337	Wait until the given lock is available. See cf::lock_acquire.	409	Wait until the given lock is available. See cf::lock_acquire.
…		…
376	}	448	}
377		449
378	=item cf::periodic $interval, $cb	450	=item cf::periodic $interval, $cb
379		451
380	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
381	get spread over timer.	453	get spread over time.
382		454
383	=cut	455	=cut
384		456
385	sub periodic($$) {	457	sub periodic($$) {
386	my ($interval, $cb) = @_;	458	my ($interval, $cb) = @_;
…		…
403		475
404	=cut	476	=cut
405		477
406	our @SLOT_QUEUE;	478	our @SLOT_QUEUE;
407	our $SLOT_QUEUE;	479	our $SLOT_QUEUE;
		480	our $SLOT_DECAY = 0.9;
408		481
409	$SLOT_QUEUE->cancel if $SLOT_QUEUE;	482	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
410	$SLOT_QUEUE = Coro::async {	483	$SLOT_QUEUE = Coro::async {
411	$Coro::current->desc ("timeslot manager");	484	$Coro::current->desc ("timeslot manager");
412		485
413	my $signal = new Coro::Signal;	486	my $signal = new Coro::Signal;
		487	my $busy;
414		488
415	while () {	489	while () {
416	next_job:	490	next_job:
		491
417	my $avail = cf::till_tick;	492	my $avail = cf::till_tick;
418	if ($avail > 0.01) {	493
419	for (0 .. $#SLOT_QUEUE) {	494	for (0 .. $#SLOT_QUEUE) {
420	if ($SLOT_QUEUE[$_][0] < $avail) {	495	if ($SLOT_QUEUE[$_][0] <= $avail) {
		496	$busy = 0;
421	my $job = splice @SLOT_QUEUE, $_, 1, ();	497	my $job = splice @SLOT_QUEUE, $_, 1, ();
422	$job->[2]->send;	498	$job->[2]->send;
423	Coro::cede;	499	Coro::cede;
424	goto next_job;	500	goto next_job;
425	}	501	} else {
		502	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
426	}	503	}
427	}	504	}
428		505
429	if (@SLOT_QUEUE) {	506	if (@SLOT_QUEUE) {
430	# 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
431	push @cf::WAIT_FOR_TICK, $signal;	508	push @cf::WAIT_FOR_TICK, $signal;
432	$signal->wait;	509	$signal->wait;
433	} else {	510	} else {
		511	$busy = 0;
434	Coro::schedule;	512	Coro::schedule;
435	}	513	}
436	}	514	}
437	};	515	};
438		516
439	sub get_slot($;$$) {	517	sub get_slot($;$$) {
440	return if tick_inhibit || $Coro::current == $Coro::main;	518	return if tick_inhibit || $Coro::current == $Coro::main;
441		519
442	my ($time, $pri, $name) = @_;	520	my ($time, $pri, $name) = @_;
443		521
444	$time = $TICK * .6 if $time > $TICK * .6;	522	$time = clamp $time, 0.01, $TICK * .6;
		523
445	my $sig = new Coro::Signal;	524	my $sig = new Coro::Signal;
446		525
447	push @SLOT_QUEUE, [$time, $pri, $sig, $name];	526	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
448	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;	527	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
449	$SLOT_QUEUE->ready;	528	$SLOT_QUEUE->ready;
…		…
475	=cut	554	=cut
476		555
477	sub sync_job(&) {	556	sub sync_job(&) {
478	my ($job) = @_;	557	my ($job) = @_;
479		558
480	if ($Coro::current == $Coro::main) {	559	if (in_main) {
481	my $time = EV::time;	560	my $time = AE::time;
482		561
483	# this is the main coro, too bad, we have to block	562	# this is the main coro, too bad, we have to block
484	# till the operation succeeds, freezing the server :/	563	# till the operation succeeds, freezing the server :/
485		564
486	LOG llevError, Carp::longmess "sync job";#d#	565	#LOG llevError, Carp::longmess "sync job";#d#
487		566
488	my $freeze_guard = freeze_mainloop;	567	my $freeze_guard = freeze_mainloop;
489		568
490	my $busy = 1;	569	my $busy = 1;
491	my @res;	570	my @res;
492		571
493	(async {	572	(async {
494	$Coro::current->desc ("sync job coro");	573	$Coro::current->desc ("sync job coro");
495	@res = eval { $job->() };	574	@res = eval { $job->() };
496	warn $@ if $@;	575	error $@ if $@;
497	undef $busy;	576	undef $busy;
498	})->prio (Coro::PRIO_MAX);	577	})->prio (Coro::PRIO_MAX);
499		578
500	while ($busy) {	579	while ($busy) {
501	if (Coro::nready) {	580	if (Coro::nready) {
…		…
503	} else {	582	} else {
504	EV::loop EV::LOOP_ONESHOT;	583	EV::loop EV::LOOP_ONESHOT;
505	}	584	}
506	}	585	}
507		586
508	my $time = EV::time - $time;	587	my $time = AE::time - $time;
509		588
510	$TICK_START += $time; # do not account sync jobs to server load	589	$TICK_START += $time; # do not account sync jobs to server load
511		590
512	wantarray ? @res : $res[0]	591	wantarray ? @res : $res[0]
513	} else {	592	} else {
…		…
535	$EXT_CORO{$coro+0} = $coro;	614	$EXT_CORO{$coro+0} = $coro;
536		615
537	$coro	616	$coro
538	}	617	}
539		618
540	=item fork_call { }, $args	619	=item fork_call { }, @args
541		620
542	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
543	process, returning the results. Everything must be serialisable with	622	process, returning the results. Everything must be serialisable with
544	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
545	never block itself or use any form of event handling.	624	never block itself or use any form of event handling.
546		625
547	=cut	626	=cut
548		627
		628	sub post_fork {
		629	reset_signals;
		630	}
		631
549	sub fork_call(&@) {	632	sub fork_call(&@) {
550	my ($cb, @args) = @_;	633	my ($cb, @args) = @_;
551		634
552	# 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,
553	# otherwise perl prematurely frees the stuff :/	636	# otherwise perl prematurely frees the stuff :/
554	# TODO: investigate and fix (likely this will be rather laborious)	637	# TODO: investigate and fix (likely this will be rather laborious)
555		638
556	my @res = Coro::Util::fork_eval {	639	my @res = Coro::Util::fork_eval {
557	reset_signals;	640	cf::post_fork;
558	&$cb	641	&$cb
559	}, @args;	642	} @args;
560		643
561	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	)
562	}	656	}
563		657
564	=item $coin = coin_from_name $name	658	=item $coin = coin_from_name $name
565		659
566	=cut	660	=cut
…		…
603	within each server.	697	within each server.
604		698
605	=cut	699	=cut
606		700
607	sub db_table($) {	701	sub db_table($) {
		702	cf::error "db_get called from main context"
		703	if $Coro::current == $Coro::main;
		704
608	my ($name) = @_;	705	my ($name) = @_;
609	my $db = BDB::db_create $DB_ENV;	706	my $db = BDB::db_create $DB_ENV;
610		707
611	eval {	708	eval {
612	$db->set_flags (BDB::CHKSUM);	709	$db->set_flags (BDB::CHKSUM);
…		…
622	}	719	}
623		720
624	our $DB;	721	our $DB;
625		722
626	sub db_init {	723	sub db_init {
627	cf::sync_job {
628	$DB ||= db_table "db";	724	$DB ||= db_table "db";
629	};
630	}	725	}
631		726
632	sub db_get($$) {	727	sub db_get($$) {
633	my $key = "$_[0]/$_[1]";	728	my $key = "$_[0]/$_[1]";
634		729
635	cf::sync_job {	730	cf::error "db_get called from main context"
		731	if $Coro::current == $Coro::main;
		732
636	BDB::db_get $DB, undef, $key, my $data;	733	BDB::db_get $DB, undef, $key, my $data;
637		734
638	$! ? ()	735	$! ? ()
639	: $data	736	: $data
640	}
641	}	737	}
642		738
643	sub db_put($$$) {	739	sub db_put($$$) {
644	BDB::dbreq_pri 4;	740	BDB::dbreq_pri 4;
645	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	741	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
701		797
702	my $t1 = Time::HiRes::time;	798	my $t1 = Time::HiRes::time;
703	my $data = $process->(\@data);	799	my $data = $process->(\@data);
704	my $t2 = Time::HiRes::time;	800	my $t2 = Time::HiRes::time;
705		801
706	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	802	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
707		803
708	db_put cache => "$id/data", $data;	804	db_put cache => "$id/data", $data;
709	db_put cache => "$id/md5" , $md5;	805	db_put cache => "$id/md5" , $md5;
710	db_put cache => "$id/meta", $meta;	806	db_put cache => "$id/meta", $meta;
711		807
…		…
721		817
722	=cut	818	=cut
723		819
724	sub datalog($@) {	820	sub datalog($@) {
725	my ($type, %kv) = @_;	821	my ($type, %kv) = @_;
726	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	822	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
727	}	823	}
728		824
729	=back	825	=back
730		826
731	=cut	827	=cut
…		…
926		1022
927	} elsif (exists $cb_id{$type}) {	1023	} elsif (exists $cb_id{$type}) {
928	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	1024	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
929		1025
930	} elsif (ref $type) {	1026	} elsif (ref $type) {
931	warn "attaching objects not supported, ignoring.\n";	1027	error "attaching objects not supported, ignoring.\n";
932		1028
933	} else {	1029	} else {
934	shift @arg;	1030	shift @arg;
935	warn "attach argument '$type' not supported, ignoring.\n";	1031	error "attach argument '$type' not supported, ignoring.\n";
936	}	1032	}
937	}	1033	}
938	}	1034	}
939		1035
940	sub _object_attach {	1036	sub _object_attach {
…		…
950	_attach $registry, $klass, @attach;	1046	_attach $registry, $klass, @attach;
951	}	1047	}
952		1048
953	$obj->{$name} = \%arg;	1049	$obj->{$name} = \%arg;
954	} else {	1050	} else {
955	warn "object uses attachment '$name' which is not available, postponing.\n";	1051	info "object uses attachment '$name' which is not available, postponing.\n";
956	}	1052	}
957		1053
958	$obj->{_attachment}{$name} = undef;	1054	$obj->{_attachment}{$name} = undef;
959	}	1055	}
960		1056
…		…
1019		1115
1020	for (@$callbacks) {	1116	for (@$callbacks) {
1021	eval { &{$_->[1]} };	1117	eval { &{$_->[1]} };
1022		1118
1023	if ($@) {	1119	if ($@) {
1024	warn "$@";
1025	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1120	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1026	override;	1121	override;
1027	}	1122	}
1028		1123
1029	return 1 if $override;	1124	return 1 if $override;
1030	}	1125	}
…		…
1109	for (@$attach) {	1204	for (@$attach) {
1110	my ($klass, @attach) = @$_;	1205	my ($klass, @attach) = @$_;
1111	_attach $registry, $klass, @attach;	1206	_attach $registry, $klass, @attach;
1112	}	1207	}
1113	} else {	1208	} else {
1114	warn "object uses attachment '$name' that is not available, postponing.\n";	1209	info "object uses attachment '$name' that is not available, postponing.\n";
1115	}	1210	}
1116	}	1211	}
1117	}	1212	}
1118		1213
1119	cf::attachable->attach (	1214	cf::attachable->attach (
…		…
1146	my ($filename, $rdata, $objs) = @_;	1241	my ($filename, $rdata, $objs) = @_;
1147		1242
1148	sync_job {	1243	sync_job {
1149	if (length $$rdata) {	1244	if (length $$rdata) {
1150	utf8::decode (my $decname = $filename);	1245	utf8::decode (my $decname = $filename);
1151	warn sprintf "saving %s (%d,%d)\n",	1246	trace sprintf "saving %s (%d,%d)\n",
1152	$decname, length $$rdata, scalar @$objs;	1247	$decname, length $$rdata, scalar @$objs
		1248	if $VERBOSE_IO;
1153		1249
1154	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1250	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1155	aio_chmod $fh, SAVE_MODE;	1251	aio_chmod $fh, SAVE_MODE;
1156	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1252	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1157	if ($cf::USE_FSYNC) {	1253	if ($cf::USE_FSYNC) {
…		…
1179	aio_rename "$filename~", $filename;	1275	aio_rename "$filename~", $filename;
1180		1276
1181	$filename =~ s%/[^/]+$%%;	1277	$filename =~ s%/[^/]+$%%;
1182	aio_pathsync $filename if $cf::USE_FSYNC;	1278	aio_pathsync $filename if $cf::USE_FSYNC;
1183	} else {	1279	} else {
1184	warn "unable to save objects: $filename~: $!\n";	1280	error "unable to save objects: $filename~: $!\n";
1185	}	1281	}
1186	} else {	1282	} else {
1187	aio_unlink $filename;	1283	aio_unlink $filename;
1188	aio_unlink "$filename.pst";	1284	aio_unlink "$filename.pst";
1189	}	1285	}
…		…
1213	my $st = eval { Coro::Storable::thaw $av };	1309	my $st = eval { Coro::Storable::thaw $av };
1214	$av = $st->{objs};	1310	$av = $st->{objs};
1215	}	1311	}
1216		1312
1217	utf8::decode (my $decname = $filename);	1313	utf8::decode (my $decname = $filename);
1218	warn sprintf "loading %s (%d,%d)\n",	1314	trace sprintf "loading %s (%d,%d)\n",
1219	$decname, length $data, scalar @{$av || []};	1315	$decname, length $data, scalar @{$av || []}
		1316	if $VERBOSE_IO;
1220		1317
1221	($data, $av)	1318	($data, $av)
1222	}	1319	}
1223		1320
1224	=head2 COMMAND CALLBACKS	1321	=head2 COMMAND CALLBACKS
…		…
1283	}	1380	}
1284		1381
1285	use File::Glob ();	1382	use File::Glob ();
1286		1383
1287	cf::player->attach (	1384	cf::player->attach (
1288	on_command => sub {	1385	on_unknown_command => sub {
1289	my ($pl, $name, $params) = @_;	1386	my ($pl, $name, $params) = @_;
1290		1387
1291	my $cb = $COMMAND{$name}	1388	my $cb = $COMMAND{$name}
1292	or return;	1389	or return;
1293		1390
…		…
1316		1413
1317	$pl->ext_reply ($reply, @reply)	1414	$pl->ext_reply ($reply, @reply)
1318	if $reply;	1415	if $reply;
1319		1416
1320	} else {	1417	} else {
1321	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1418	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1322	}	1419	}
1323		1420
1324	cf::override;	1421	cf::override;
1325	},	1422	},
1326	);	1423	);
…		…
1337		1434
1338	$grp	1435	$grp
1339	}	1436	}
1340		1437
1341	sub load_extensions {	1438	sub load_extensions {
		1439	info "loading extensions...";
		1440
1342	cf::sync_job {	1441	cf::sync_job {
1343	my %todo;	1442	my %todo;
1344		1443
1345	for my $path (<$LIBDIR/*.ext>) {	1444	for my $path (<$LIBDIR/*.ext>) {
1346	next unless -r $path;	1445	next unless -r $path;
…		…
1364		1463
1365	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1464	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1366	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1465	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1367		1466
1368	$ext{source} =	1467	$ext{source} =
1369	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1468	"package $pkg; use common::sense;\n"
1370	. "#line 1 \"$path\"\n{\n"	1469	. "#line 1 \"$path\"\n{\n"
1371	. $source	1470	. $source
1372	. "\n};\n1";	1471	. "\n};\n1";
1373		1472
1374	$todo{$base} = \%ext;	1473	$todo{$base} = \%ext;
1375	}	1474	}
1376		1475
		1476	my $pass = 0;
1377	my %done;	1477	my %done;
1378	while (%todo) {	1478	while (%todo) {
1379	my $progress;	1479	my $progress;
1380		1480
		1481	++$pass;
		1482
		1483	ext:
1381	while (my ($k, $v) = each %todo) {	1484	while (my ($k, $v) = each %todo) {
1382	for (split /,\s*/, $v->{meta}{depends}) {	1485	for (split /,\s*/, $v->{meta}{depends}) {
1383	goto skip	1486	next ext
1384	unless exists $done{$_};	1487	unless exists $done{$_};
1385	}	1488	}
1386		1489
1387	warn "... loading '$k' into '$v->{pkg}'\n";	1490	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1388		1491
1389	unless (eval $v->{source}) {	1492	my $active = eval $v->{source};
		1493
		1494	if (length $@) {
1390	my $msg = $@ ? "$v->{path}: $@\n"	1495	error "$v->{path}: $@\n";
1391	: "$v->{base}: extension inactive.\n";
1392		1496
1393	if (exists $v->{meta}{mandatory}) {
1394	warn $msg;
1395	cf::cleanup "mandatory extension failed to load, exiting.";	1497	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1396	}	1498	if exists $v->{meta}{mandatory};
1397		1499
1398	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;
1399	}	1509	}
1400
1401	$done{$k} = delete $todo{$k};
1402	push @EXTS, $v->{pkg};
1403	$progress = 1;
1404	}	1510	}
1405		1511
1406	skip:	1512	unless ($progress) {
1407	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"	1513	warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1408	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	}
1409	}	1520	}
1410	};	1521	};
1411	}	1522	}
1412		1523
1413	#############################################################################	1524	#############################################################################
…		…
1497	$cf::PLAYER{$login} = $pl	1608	$cf::PLAYER{$login} = $pl
1498	}	1609	}
1499	}	1610	}
1500	}	1611	}
1501		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
1502	sub save($) {	1626	sub save($) {
1503	my ($pl) = @_;	1627	my ($pl) = @_;
1504		1628
1505	return if $pl->{deny_save};	1629	return if $pl->{deny_save};
1506		1630
…		…
1511		1635
1512	aio_mkdir playerdir $pl, 0770;	1636	aio_mkdir playerdir $pl, 0770;
1513	$pl->{last_save} = $cf::RUNTIME;	1637	$pl->{last_save} = $cf::RUNTIME;
1514		1638
1515	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];
1516		1643
1517	$pl->save_pl ($path);	1644	$pl->save_pl ($path);
1518	cf::cede_to_tick;	1645	cf::cede_to_tick;
1519	}	1646	}
1520		1647
…		…
1554	my $name = $pl->ob->name;	1681	my $name = $pl->ob->name;
1555		1682
1556	$pl->{deny_save} = 1;	1683	$pl->{deny_save} = 1;
1557	$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
1558		1685
1559	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1686	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1560	$pl->deactivate;	1687	$pl->deactivate;
		1688
1561	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;
1562	$pl->ob->check_score;
1563	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1690	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1691	ext::highscore::check ($pl->ob);
		1692
1564	$pl->ns->destroy if $pl->ns;	1693	$pl->ns->destroy if $pl->ns;
1565		1694
1566	my $path = playerdir $pl;	1695	my $path = playerdir $pl;
1567	my $temp = "$path~$cf::RUNTIME~deleting~";	1696	my $temp = "$path~$cf::RUNTIME~deleting~";
1568	aio_rename $path, $temp;	1697	aio_rename $path, $temp;
…		…
1622	\@logins	1751	\@logins
1623	}	1752	}
1624		1753
1625	=item $player->maps	1754	=item $player->maps
1626		1755
		1756	=item cf::player::maps $login
		1757
1627	Returns an arrayref of map paths that are private for this	1758	Returns an arrayref of map paths that are private for this
1628	player. May block.	1759	player. May block.
1629		1760
1630	=cut	1761	=cut
1631		1762
…		…
1693	=cut	1824	=cut
1694		1825
1695	sub find_by_path($) {	1826	sub find_by_path($) {
1696	my ($path) = @_;	1827	my ($path) = @_;
1697		1828
		1829	$path =~ s/^~[^\/]*//; # skip ~login
		1830
1698	my ($match, $specificity);	1831	my ($match, $specificity);
1699		1832
1700	for my $region (list) {	1833	for my $region (list) {
1701	if ($region->{match} && $path =~ $region->{match}) {	1834	if ($region->{match} && $path =~ $region->{match}) {
1702	($match, $specificity) = ($region, $region->specificity)	1835	($match, $specificity) = ($region, $region->specificity)
…		…
1730	sub generate_random_map {	1863	sub generate_random_map {
1731	my ($self, $rmp) = @_;	1864	my ($self, $rmp) = @_;
1732		1865
1733	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
1734		1867
1735	# mit "rum" bekleckern, nicht
1736	$self->_create_random_map (	1868	$self->_create_random_map ($rmp);
1737	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1738	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1739	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1740	$rmp->{exit_on_final_map},
1741	$rmp->{xsize}, $rmp->{ysize},
1742	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1743	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1744	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1745	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1746	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1747	(cf::region::find $rmp->{region}), $rmp->{custom}
1748	)
1749	}	1869	}
1750		1870
1751	=item cf::map->register ($regex, $prio)	1871	=item cf::map->register ($regex, $prio)
1752		1872
1753	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
…		…
1758		1878
1759	sub register {	1879	sub register {
1760	my (undef, $regex, $prio) = @_;	1880	my (undef, $regex, $prio) = @_;
1761	my $pkg = caller;	1881	my $pkg = caller;
1762		1882
1763	no strict;
1764	push @{"$pkg\::ISA"}, __PACKAGE__;	1883	push @{"$pkg\::ISA"}, __PACKAGE__;
1765		1884
1766	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	1885	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1767	}	1886	}
1768		1887
1769	# also paths starting with '/'	1888	# also paths starting with '/'
1770	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	1889	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1771		1890
1772	sub thawer_merge {	1891	sub thawer_merge {
1773	my ($self, $merge) = @_;	1892	my ($self, $merge) = @_;
1774		1893
1775	# we have to keep some variables in memory intact	1894	# we have to keep some variables in memory intact
…		…
1780	}	1899	}
1781		1900
1782	sub normalise {	1901	sub normalise {
1783	my ($path, $base) = @_;	1902	my ($path, $base) = @_;
1784		1903
1785	$path = "$path"; # make sure its a string	1904	$path = "$path"; # make sure it's a string
1786		1905
1787	$path =~ s/\.map$//;	1906	$path =~ s/\.map$//;
1788		1907
1789	# map plan:	1908	# map plan:
1790	#	1909	#
…		…
1805	$base =~ s{[^/]+/?$}{};	1924	$base =~ s{[^/]+/?$}{};
1806	$path = "$base/$path";	1925	$path = "$base/$path";
1807	}	1926	}
1808		1927
1809	for ($path) {	1928	for ($path) {
1810	redo if s{//}{/};
1811	redo if s{/\.?/}{/};	1929	redo if s{/\.?/}{/};
1812	redo if s{/[^/]+/\.\./}{/};	1930	redo if s{/[^/]+/\.\./}{/};
1813	}	1931	}
1814		1932
1815	$path	1933	$path
…		…
1829	$self->init; # pass $1 etc.	1947	$self->init; # pass $1 etc.
1830	return $self;	1948	return $self;
1831	}	1949	}
1832	}	1950	}
1833		1951
1834	Carp::cluck "unable to resolve path '$path' (base '$base').";	1952	Carp::cluck "unable to resolve path '$path' (base '$base')";
1835	()	1953	()
1836	}	1954	}
1837		1955
1838	sub init {	1956	sub init {
1839	my ($self) = @_;	1957	my ($self) = @_;
…		…
1961	}	2079	}
1962		2080
1963	sub find;	2081	sub find;
1964	sub find {	2082	sub find {
1965	my ($path, $origin) = @_;	2083	my ($path, $origin) = @_;
		2084
		2085	cf::cede_to_tick;
1966		2086
1967	$path = normalise $path, $origin && $origin->path;	2087	$path = normalise $path, $origin && $origin->path;
1968		2088
1969	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2089	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1970	my $guard2 = cf::lock_acquire "map_find:$path";	2090	my $guard2 = cf::lock_acquire "map_find:$path";
…		…
1989		2109
1990	$cf::MAP{$path} = $map	2110	$cf::MAP{$path} = $map
1991	}	2111	}
1992	}	2112	}
1993		2113
1994	sub pre_load { }	2114	sub pre_load { }
1995	sub post_load { }	2115	#sub post_load { } # XS
1996		2116
1997	sub load {	2117	sub load {
1998	my ($self) = @_;	2118	my ($self) = @_;
1999		2119
2000	local $self->{deny_reset} = 1; # loading can take a long time	2120	local $self->{deny_reset} = 1; # loading can take a long time
…		…
2055		2175
2056	$self->in_memory (cf::MAP_ACTIVE);	2176	$self->in_memory (cf::MAP_ACTIVE);
2057	}	2177	}
2058		2178
2059	$self->post_load;	2179	$self->post_load;
2060	}
2061		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
2062	sub customise_for {	2187	sub customise_for {
2063	my ($self, $ob) = @_;	2188	my ($self, $ob) = @_;
2064		2189
2065	return find "~" . $ob->name . "/" . $self->{path}	2190	return find "~" . $ob->name . "/" . $self->{path}
2066	if $self->per_player;	2191	if $self->per_player;
…		…
2082	or next;	2207	or next;
2083	$neigh = find $neigh, $map	2208	$neigh = find $neigh, $map
2084	or next;	2209	or next;
2085	$neigh->load;	2210	$neigh->load;
2086		2211
		2212	# now find the diagonal neighbours
2087	push @neigh,	2213	push @neigh,
2088	[$neigh->tile_path (($_ + 3) % 4), $neigh],	2214	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2089	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2215	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2090	}	2216	}
2091		2217
…		…
2098	}	2224	}
2099		2225
2100	sub find_sync {	2226	sub find_sync {
2101	my ($path, $origin) = @_;	2227	my ($path, $origin) = @_;
2102		2228
2103	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
2104	}	2233	}
2105		2234
2106	sub do_load_sync {	2235	sub do_load_sync {
2107	my ($map) = @_;	2236	my ($map) = @_;
2108		2237
2109	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2238	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2110	if $Coro::current == $Coro::main;	2239	if $Coro::current == $Coro::main;
2111		2240
2112	cf::sync_job { $map->load };	2241	$map->load;
2113	}	2242	}
2114		2243
2115	our %MAP_PREFETCH;	2244	our %MAP_PREFETCH;
2116	our $MAP_PREFETCHER = undef;	2245	our $MAP_PREFETCHER = undef;
2117		2246
…		…
2143	$MAP_PREFETCHER->prio (6);	2272	$MAP_PREFETCHER->prio (6);
2144		2273
2145	()	2274	()
2146	}	2275	}
2147		2276
		2277	# common code, used by both ->save and ->swapout
2148	sub save {	2278	sub _save {
2149	my ($self) = @_;	2279	my ($self) = @_;
2150
2151	my $lock = cf::lock_acquire "map_data:$self->{path}";
2152		2280
2153	$self->{last_save} = $cf::RUNTIME;	2281	$self->{last_save} = $cf::RUNTIME;
2154		2282
2155	return unless $self->dirty;	2283	return unless $self->dirty;
2156		2284
…		…
2176	} else {	2304	} else {
2177	$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);
2178	}	2306	}
2179	}	2307	}
2180		2308
		2309	sub save {
		2310	my ($self) = @_;
		2311
		2312	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2313
		2314	$self->_save;
		2315	}
		2316
2181	sub swap_out {	2317	sub swap_out {
2182	my ($self) = @_;	2318	my ($self) = @_;
2183		2319
2184	# save first because save cedes
2185	$self->save;
2186
2187	my $lock = cf::lock_acquire "map_data:$self->{path}";	2320	my $lock = cf::lock_acquire "map_data:$self->{path}";
2188		2321
2189	return if $self->players;
2190	return if $self->in_memory != cf::MAP_ACTIVE;	2322	return if $self->in_memory != cf::MAP_ACTIVE;
2191	return if $self->{deny_save};	2323	return if $self->{deny_save};
		2324	return if $self->players;
2192		2325
		2326	# first deactivate the map and "unlink" it from the core
		2327	$self->deactivate;
		2328	$_->clear_links_to ($self) for values %cf::MAP;
2193	$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};
2194		2376
2195	$self->deactivate;	2377	$self->deactivate;
2196	$_->clear_links_to ($self) for values %cf::MAP;	2378	$_->clear_links_to ($self) for values %cf::MAP;
2197	$self->clear;	2379	$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		2380
2243	$self->unlink_save;	2381	$self->unlink_save;
2244	$self->destroy;	2382	$self->destroy;
2245	}	2383	}
2246		2384
…		…
2254		2392
2255	delete $cf::MAP{$self->path};	2393	delete $cf::MAP{$self->path};
2256		2394
2257	$self->unlink_save;	2395	$self->unlink_save;
2258		2396
2259	bless $self, "cf::map";	2397	bless $self, "cf::map::wrap";
2260	delete $self->{deny_reset};	2398	delete $self->{deny_reset};
2261	$self->{deny_save} = 1;	2399	$self->{deny_save} = 1;
2262	$self->reset_timeout (1);	2400	$self->reset_timeout (1);
2263	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2401	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2264		2402
…		…
2321	: normalise $_	2459	: normalise $_
2322	} @{ aio_readdir $UNIQUEDIR or [] }	2460	} @{ aio_readdir $UNIQUEDIR or [] }
2323	]	2461	]
2324	}	2462	}
2325		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
2326	=back	2496	=back
2327		2497
2328	=head3 cf::object	2498	=head3 cf::object
2329		2499
2330	=cut	2500	=cut
…		…
2462		2632
2463	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}>).
2464		2634
2465	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.
2466	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,
2467	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
2468	map.	2638	map.
2469		2639
2470	Will never block.	2640	Will never block.
2471		2641
2472	=item $player_object->leave_link ($map, $x, $y)	2642	=item $player_object->leave_link ($map, $x, $y)
…		…
2493	sub cf::object::player::enter_link {	2663	sub cf::object::player::enter_link {
2494	my ($self) = @_;	2664	my ($self) = @_;
2495		2665
2496	$self->deactivate_recursive;	2666	$self->deactivate_recursive;
2497		2667
		2668	++$self->{_link_recursion};
		2669
2498	return if UNIVERSAL::isa $self->map, "ext::map_link";	2670	return if UNIVERSAL::isa $self->map, "ext::map_link";
2499		2671
2500	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2672	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2501	if $self->map && $self->map->{path} ne "{link}";	2673	if $self->map && $self->map->{path} ne "{link}";
2502		2674
2503	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2675	$self->enter_map ($LINK_MAP || link_map, 3, 3);
2504	}	2676	}
2505		2677
2506	sub cf::object::player::leave_link {	2678	sub cf::object::player::leave_link {
2507	my ($self, $map, $x, $y) = @_;	2679	my ($self, $map, $x, $y) = @_;
2508		2680
…		…
2525	($x, $y) = (-1, -1)	2697	($x, $y) = (-1, -1)
2526	unless (defined $x) && (defined $y);	2698	unless (defined $x) && (defined $y);
2527		2699
2528	# use -1 or undef as default coordinates, not 0, 0	2700	# use -1 or undef as default coordinates, not 0, 0
2529	($x, $y) = ($map->enter_x, $map->enter_y)	2701	($x, $y) = ($map->enter_x, $map->enter_y)
2530	if $x <=0 && $y <= 0;	2702	if $x <= 0 && $y <= 0;
2531		2703
2532	$map->load;	2704	$map->load;
2533	$map->load_neighbours;	2705	$map->load_neighbours;
2534		2706
2535	return unless $self->contr->active;	2707	return unless $self->contr->active;
2536		2708
2537	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2709	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2538	$self->enter_map ($map, $x, $y);	2710	if ($self->enter_map ($map, $x, $y)) {
2539		2711	# entering was successful
		2712	delete $self->{_link_recursion};
2540	# only activate afterwards, to support waiting in hooks	2713	# only activate afterwards, to support waiting in hooks
2541	$self->activate_recursive;	2714	$self->activate_recursive;
2542	}	2715	}
2543		2716
		2717	}
		2718
2544	=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)]])
2545		2720
2546	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
2547	her, loading and preparing them map, calling the provided $check callback	2722	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	2723	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	2724	the new (success) or old (failed) map position. In either case, $done will
…		…
2556		2731
2557	our $GOTOGEN;	2732	our $GOTOGEN;
2558		2733
2559	sub cf::object::player::goto {	2734	sub cf::object::player::goto {
2560	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	}
2561		2742
2562	# 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
2563	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2744	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2564		2745
2565	$self->enter_link;	2746	$self->enter_link;
…		…
2589	my $map = eval {	2770	my $map = eval {
2590	my $map = defined $path ? cf::map::find $path : undef;	2771	my $map = defined $path ? cf::map::find $path : undef;
2591		2772
2592	if ($map) {	2773	if ($map) {
2593	$map = $map->customise_for ($self);	2774	$map = $map->customise_for ($self);
2594	$map = $check->($map) if $check && $map;	2775	$map = $check->($map, $x, $y, $self) if $check && $map;
2595	} else {	2776	} else {
2596	$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);
2597	}	2778	}
2598		2779
2599	$map	2780	$map
…		…
2607	if ($gen == $self->{_goto_generation}) {	2788	if ($gen == $self->{_goto_generation}) {
2608	delete $self->{_goto_generation};	2789	delete $self->{_goto_generation};
2609	$self->leave_link ($map, $x, $y);	2790	$self->leave_link ($map, $x, $y);
2610	}	2791	}
2611		2792
2612	$done->() if $done;	2793	$done->($self) if $done;
2613	})->prio (1);	2794	})->prio (1);
2614	}	2795	}
2615		2796
2616	=item $player_object->enter_exit ($exit_object)	2797	=item $player_object->enter_exit ($exit_object)
2617		2798
…		…
2710	$self->message ("Something went wrong deep within the deliantra server. "	2891	$self->message ("Something went wrong deep within the deliantra server. "
2711	. "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. "
2712	. "Please report this to the dungeon master!",	2893	. "Please report this to the dungeon master!",
2713	cf::NDI_UNIQUE | cf::NDI_RED);	2894	cf::NDI_UNIQUE | cf::NDI_RED);
2714		2895
2715	warn "ERROR in enter_exit: $@";	2896	error "ERROR in enter_exit: $@";
2716	$self->leave_link;	2897	$self->leave_link;
2717	}	2898	}
2718	})->prio (1);	2899	})->prio (1);
2719	}	2900	}
2720		2901
…		…
2732	sub cf::client::send_drawinfo {	2913	sub cf::client::send_drawinfo {
2733	my ($self, $text, $flags) = @_;	2914	my ($self, $text, $flags) = @_;
2734		2915
2735	utf8::encode $text;	2916	utf8::encode $text;
2736	$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);
2737	}	2943	}
2738		2944
2739	=item $client->send_msg ($channel, $msg, $color, [extra...])	2945	=item $client->send_msg ($channel, $msg, $color, [extra...])
2740		2946
2741	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
…		…
2745		2951
2746	=cut	2952	=cut
2747		2953
2748	# non-persistent channels (usually the info channel)	2954	# non-persistent channels (usually the info channel)
2749	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	},
2750	"c/identify" => {	2962	"c/identify" => {
2751	id => "infobox",	2963	id => "infobox",
2752	title => "Identify",	2964	title => "Identify",
2753	reply => undef,	2965	reply => undef,
2754	tooltip => "Items recently identified",	2966	tooltip => "Items recently identified",
…		…
2756	"c/examine" => {	2968	"c/examine" => {
2757	id => "infobox",	2969	id => "infobox",
2758	title => "Examine",	2970	title => "Examine",
2759	reply => undef,	2971	reply => undef,
2760	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",
2761	},	2979	},
2762	"c/book" => {	2980	"c/book" => {
2763	id => "infobox",	2981	id => "infobox",
2764	title => "Book",	2982	title => "Book",
2765	reply => undef,	2983	reply => undef,
…		…
2881	my $pkt = "msg "	3099	my $pkt = "msg "
2882	. $self->{json_coder}->encode (	3100	. $self->{json_coder}->encode (
2883	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]	3101	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2884	);	3102	);
2885		3103
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);	3104	$self->send_big_packet ($pkt);
2897	}	3105	}
2898		3106
2899	=item $client->ext_msg ($type, @msg)	3107	=item $client->ext_msg ($type, @msg)
2900		3108
2901	Sends an ext event to the client.	3109	Sends an ext event to the client.
…		…
2904		3112
2905	sub cf::client::ext_msg($$@) {	3113	sub cf::client::ext_msg($$@) {
2906	my ($self, $type, @msg) = @_;	3114	my ($self, $type, @msg) = @_;
2907		3115
2908	if ($self->extcmd == 2) {	3116	if ($self->extcmd == 2) {
2909	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3117	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2910	} elsif ($self->extcmd == 1) { # TODO: remove	3118	} elsif ($self->extcmd == 1) { # TODO: remove
2911	push @msg, msgtype => "event_$type";	3119	push @msg, msgtype => "event_$type";
2912	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3120	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2913	}	3121	}
2914	}	3122	}
2915		3123
2916	=item $client->ext_reply ($msgid, @msg)	3124	=item $client->ext_reply ($msgid, @msg)
2917		3125
…		…
2921		3129
2922	sub cf::client::ext_reply($$@) {	3130	sub cf::client::ext_reply($$@) {
2923	my ($self, $id, @msg) = @_;	3131	my ($self, $id, @msg) = @_;
2924		3132
2925	if ($self->extcmd == 2) {	3133	if ($self->extcmd == 2) {
2926	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));	3134	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2927	} elsif ($self->extcmd == 1) {	3135	} elsif ($self->extcmd == 1) {
2928	#TODO: version 1, remove	3136	#TODO: version 1, remove
2929	unshift @msg, msgtype => "reply", msgid => $id;	3137	unshift @msg, msgtype => "reply", msgid => $id;
2930	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3138	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2931	}	3139	}
2932	}	3140	}
2933		3141
2934	=item $success = $client->query ($flags, "text", \&cb)	3142	=item $success = $client->query ($flags, "text", \&cb)
2935		3143
…		…
3006		3214
3007	$ns->ext_reply ($reply, @reply)	3215	$ns->ext_reply ($reply, @reply)
3008	if $reply;	3216	if $reply;
3009		3217
3010	} else {	3218	} else {
3011	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";
3012	}	3220	}
3013		3221
3014	cf::override;	3222	cf::override;
3015	},	3223	},
3016	);	3224	);
…		…
3036		3244
3037	$coro	3245	$coro
3038	}	3246	}
3039		3247
3040	cf::client->attach (	3248	cf::client->attach (
3041	on_destroy => sub {	3249	on_client_destroy => sub {
3042	my ($ns) = @_;	3250	my ($ns) = @_;
3043		3251
3044	$_->cancel for values %{ (delete $ns->{_coro}) || {} };	3252	$_->cancel for values %{ (delete $ns->{_coro}) || {} };
3045	},	3253	},
3046	);	3254	);
…		…
3062	our $safe_hole = new Safe::Hole;	3270	our $safe_hole = new Safe::Hole;
3063		3271
3064	$SIG{FPE} = 'IGNORE';	3272	$SIG{FPE} = 'IGNORE';
3065		3273
3066	$safe->permit_only (Opcode::opset qw(	3274	$safe->permit_only (Opcode::opset qw(
3067	:base_core :base_mem :base_orig :base_math	3275	:base_core :base_mem :base_orig :base_math :base_loop
3068	grepstart grepwhile mapstart mapwhile	3276	grepstart grepwhile mapstart mapwhile
3069	sort time	3277	sort time
3070	));	3278	));
3071		3279
3072	# here we export the classes and methods available to script code	3280	# here we export the classes and methods available to script code
…		…
3097	decrease split destroy change_exp value msg lore send_msg)],	3305	decrease split destroy change_exp value msg lore send_msg)],
3098	["cf::object::player" => qw(player)],	3306	["cf::object::player" => qw(player)],
3099	["cf::player" => qw(peaceful send_msg)],	3307	["cf::player" => qw(peaceful send_msg)],
3100	["cf::map" => qw(trigger)],	3308	["cf::map" => qw(trigger)],
3101	) {	3309	) {
3102	no strict 'refs';
3103	my ($pkg, @funs) = @$_;	3310	my ($pkg, @funs) = @$_;
3104	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3311	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3105	for @funs;	3312	for @funs;
3106	}	3313	}
3107		3314
…		…
3124	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3331	$qcode =~ s/"/‟/g; # not allowed in #line filenames
3125	$qcode =~ s/\n/\\n/g;	3332	$qcode =~ s/\n/\\n/g;
3126		3333
3127	%vars = (_dummy => 0) unless %vars;	3334	%vars = (_dummy => 0) unless %vars;
3128		3335
		3336	my @res;
3129	local $_;	3337	local $_;
3130	local @safe::cf::_safe_eval_args = values %vars;
3131		3338
3132	my $eval =	3339	my $eval =
3133	"do {\n"	3340	"do {\n"
3134	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"	3341	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3135	. "#line 0 \"{$qcode}\"\n"	3342	. "#line 0 \"{$qcode}\"\n"
3136	. $code	3343	. $code
3137	. "\n}"	3344	. "\n}"
3138	;	3345	;
3139		3346
		3347	if ($CFG{safe_eval}) {
3140	sub_generation_inc;	3348	sub_generation_inc;
		3349	local @safe::cf::_safe_eval_args = values %vars;
3141	my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);	3350	@res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3142	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	}
3143		3356
3144	if ($@) {	3357	if ($@) {
3145	warn "$@";	3358	warn "$@",
3146	warn "while executing safe code '$code'\n";	3359	"while executing safe code '$code'\n",
3147	warn "with arguments " . (join " ", %vars) . "\n";	3360	"with arguments " . (join " ", %vars) . "\n";
3148	}	3361	}
3149		3362
3150	wantarray ? @res : $res[0]	3363	wantarray ? @res : $res[0]
3151	}	3364	}
3152		3365
…		…
3166	=cut	3379	=cut
3167		3380
3168	sub register_script_function {	3381	sub register_script_function {
3169	my ($fun, $cb) = @_;	3382	my ($fun, $cb) = @_;
3170		3383
3171	no strict 'refs';	3384	$fun = "safe::$fun" if $CFG{safe_eval};
3172	*{"safe::$fun"} = $safe_hole->wrap ($cb);	3385	*$fun = $safe_hole->wrap ($cb);
3173	}	3386	}
3174		3387
3175	=back	3388	=back
3176		3389
3177	=cut	3390	=cut
…		…
3186	# for this (global event?)	3399	# for this (global event?)
3187	%ext::player_env::MUSIC_FACE_CACHE = ();	3400	%ext::player_env::MUSIC_FACE_CACHE = ();
3188		3401
3189	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3402	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3190		3403
3191	warn "loading facedata from $path\n";	3404	trace "loading facedata from $path\n";
3192		3405
3193	my $facedata;
3194	0 < aio_load $path, $facedata	3406	0 < aio_load $path, my $facedata
3195	or die "$path: $!";	3407	or die "$path: $!";
3196		3408
3197	$facedata = Coro::Storable::thaw $facedata;	3409	$facedata = Coro::Storable::thaw $facedata;
3198		3410
3199	$facedata->{version} == 2	3411	$facedata->{version} == 2
3200	or cf::cleanup "$path: version mismatch, cannot proceed.";	3412	or cf::cleanup "$path: version mismatch, cannot proceed.";
3201		3413
3202	# 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]);
3203	$facedata->{resource}{"res/exp_table"} = {	3416	$facedata->{resource}{"res/exp_table"} = {
3204	type => FT_RSRC,	3417	type => FT_RSRC,
3205	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),
3206	};	3420	};
3207	cf::cede_to_tick;	3421	cf::cede_to_tick;
3208		3422
3209	{	3423	{
3210	my $faces = $facedata->{faceinfo};	3424	my $faces = $facedata->{faceinfo};
…		…
3212	while (my ($face, $info) = each %$faces) {	3426	while (my ($face, $info) = each %$faces) {
3213	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3427	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3214		3428
3215	cf::face::set_visibility $idx, $info->{visibility};	3429	cf::face::set_visibility $idx, $info->{visibility};
3216	cf::face::set_magicmap $idx, $info->{magicmap};	3430	cf::face::set_magicmap $idx, $info->{magicmap};
3217	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};	3431	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3218	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} ;
3219		3434
3220	cf::cede_to_tick;	3435	cf::cede_to_tick;
3221	}	3436	}
3222		3437
3223	while (my ($face, $info) = each %$faces) {	3438	while (my ($face, $info) = each %$faces) {
…		…
3228		3443
3229	if (my $smooth = cf::face::find $info->{smooth}) {	3444	if (my $smooth = cf::face::find $info->{smooth}) {
3230	cf::face::set_smooth $idx, $smooth;	3445	cf::face::set_smooth $idx, $smooth;
3231	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3446	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3232	} else {	3447	} else {
3233	warn "smooth face '$info->{smooth}' not found for face '$face'";	3448	error "smooth face '$info->{smooth}' not found for face '$face'";
3234	}	3449	}
3235		3450
3236	cf::cede_to_tick;	3451	cf::cede_to_tick;
3237	}	3452	}
3238	}	3453	}
…		…
3247		3462
3248	cf::anim::invalidate_all; # d'oh	3463	cf::anim::invalidate_all; # d'oh
3249	}	3464	}
3250		3465
3251	{	3466	{
3252	# TODO: for gcfclient pleasure, we should give resources
3253	# that gcfclient doesn't grok a >10000 face index.
3254	my $res = $facedata->{resource};	3467	my $res = $facedata->{resource};
3255		3468
3256	while (my ($name, $info) = each %$res) {	3469	while (my ($name, $info) = each %$res) {
3257	if (defined $info->{type}) {	3470	if (defined $info->{type}) {
3258	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3471	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3259	my $data;
3260		3472
3261	if ($info->{type} & 1) {	3473	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};	3474	cf::face::set_type $idx, $info->{type};
3276	} else {	3475	} else {
3277	$RESOURCE{$name} = $info;	3476	$RESOURCE{$name} = $info; # unused
3278	}	3477	}
3279		3478
3280	cf::cede_to_tick;	3479	cf::cede_to_tick;
3281	}	3480	}
3282	}	3481	}
3283		3482
3284	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3483	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3285		3484
3286	1	3485	1
3287	}	3486	}
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		3487
3309	register_exticmd fx_want => sub {	3488	register_exticmd fx_want => sub {
3310	my ($ns, $want) = @_;	3489	my ($ns, $want) = @_;
3311		3490
3312	while (my ($k, $v) = each %$want) {	3491	while (my ($k, $v) = each %$want) {
…		…
3351	sub reload_treasures {	3530	sub reload_treasures {
3352	load_resource_file "$DATADIR/treasures"	3531	load_resource_file "$DATADIR/treasures"
3353	or die "unable to load treasurelists\n";	3532	or die "unable to load treasurelists\n";
3354	}	3533	}
3355		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
3356	sub reload_resources {	3558	sub reload_resources {
3357	warn "reloading resource files...\n";	3559	trace "reloading resource files...\n";
3358		3560
		3561	reload_exp_table;
		3562	reload_materials;
3359	reload_facedata;	3563	reload_facedata;
		3564	reload_sound;
3360	reload_archetypes;	3565	reload_archetypes;
3361	reload_regions;	3566	reload_regions;
3362	reload_treasures;	3567	reload_treasures;
3363		3568
3364	warn "finished reloading resource files\n";	3569	trace "finished reloading resource files\n";
3365	}	3570	}
3366		3571
3367	sub reload_config {	3572	sub reload_config {
3368	open my $fh, "<:utf8", "$CONFDIR/config"	3573	trace "reloading config file...\n";
3369	or return;
3370		3574
3371	local $/;	3575	0 < aio_load "$CONFDIR/config", my $config
3372	*CFG = YAML::Load <$fh>;	3576	or die "$CONFDIR/config: $!";
3373		3577
		3578	utf8::decode $config;
		3579	*CFG = yaml_load $config;
		3580
3374	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3581	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3375		3582
3376	$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};
3377	$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};
3378		3585
3379	if (exists $CFG{mlockall}) {	3586	if (exists $CFG{mlockall}) {
…		…
3403	seek $fh, 0, 0;	3610	seek $fh, 0, 0;
3404	print $fh $$;	3611	print $fh $$;
3405	}	3612	}
3406		3613
3407	sub main_loop {	3614	sub main_loop {
3408	warn "EV::loop starting\n";	3615	trace "EV::loop starting\n";
3409	if (1) {	3616	if (1) {
3410	EV::loop;	3617	EV::loop;
3411	}	3618	}
3412	warn "EV::loop returned\n";	3619	trace "EV::loop returned\n";
3413	goto &main_loop unless $REALLY_UNLOOP;	3620	goto &main_loop unless $REALLY_UNLOOP;
3414	}	3621	}
3415		3622
3416	sub main {	3623	sub main {
3417	cf::init_globals; # initialise logging	3624	cf::init_globals; # initialise logging
3418		3625
3419	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3626	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3420	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.";
3421	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3628	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3422	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3629	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		3630
3429	$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
3430		3632
3431	# we must not ever block the main coroutine	3633	# we must not ever block the main coroutine
3432	local $Coro::idle = sub {	3634	local $Coro::idle = sub {
…		…
3438	};	3640	};
3439		3641
3440	evthread_start IO::AIO::poll_fileno;	3642	evthread_start IO::AIO::poll_fileno;
3441		3643
3442	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
3443	reload_resources;	3653	reload_resources;
3444	reload_config;	3654	reload_config;
3445	db_init;	3655	db_init;
3446		3656
3447	cf::load_settings;
3448	cf::load_materials;
3449	cf::init_uuid;	3657	cf::init_uuid;
3450	cf::init_signals;	3658	cf::init_signals;
3451	cf::init_commands;
3452	cf::init_skills;	3659	cf::init_skills;
3453		3660
3454	cf::init_beforeplay;	3661	cf::init_beforeplay;
3455		3662
3456	atomic;	3663	atomic;
…		…
3461		3668
3462	# no (long-running) fork's whatsoever before this point(!)	3669	# no (long-running) fork's whatsoever before this point(!)
3463	use POSIX ();	3670	use POSIX ();
3464	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};
3465		3672
3466	(pop @POST_INIT)->(0) while @POST_INIT;	3673	cf::_post_init 0;
3467	};	3674	};
3468		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
3469	main_loop;	3684	goto &main_loop;
3470	}	3685	}
3471		3686
3472	#############################################################################	3687	#############################################################################
3473	# initialisation and cleanup	3688	# initialisation and cleanup
3474		3689
3475	# install some emergency cleanup handlers	3690	# install some emergency cleanup handlers
3476	BEGIN {	3691	BEGIN {
3477	our %SIGWATCHER = ();	3692	our %SIGWATCHER = ();
3478	for my $signal (qw(INT HUP TERM)) {	3693	for my $signal (qw(INT HUP TERM)) {
3479	$SIGWATCHER{$signal} = EV::signal $signal, sub {	3694	$SIGWATCHER{$signal} = AE::signal $signal, sub {
3480	cf::cleanup "SIG$signal";	3695	cf::cleanup "SIG$signal";
3481	};	3696	};
3482	}	3697	}
3483	}	3698	}
3484		3699
3485	sub write_runtime_sync {	3700	sub write_runtime_sync {
		3701	my $t0 = AE::time;
		3702
3486	# first touch the runtime file to show we are still running:	3703	# first touch the runtime file to show we are still running:
3487	# the fsync below can take a very very long time.	3704	# the fsync below can take a very very long time.
3488		3705
3489	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;	3706	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3490		3707
3491	my $guard = cf::lock_acquire "write_runtime";	3708	my $guard = cf::lock_acquire "write_runtime";
3492		3709
3493	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644	3710	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3494	or return;	3711	or return;
3495		3712
3496	my $value = $cf::RUNTIME + 90 + 10;	3713	my $value = $cf::RUNTIME + 90 + 10;
3497	# 10 is the runtime save interval, for a monotonic clock	3714	# 10 is the runtime save interval, for a monotonic clock
3498	# 60 allows for the watchdog to kill the server.	3715	# 60 allows for the watchdog to kill the server.
…		…
3511	or return;	3728	or return;
3512		3729
3513	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3730	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3514	and return;	3731	and return;
3515		3732
3516	warn "runtime file written.\n";	3733	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3517		3734
3518	1	3735	1
3519	}	3736	}
3520		3737
3521	our $uuid_lock;	3738	our $uuid_lock;
…		…
3533	or return;	3750	or return;
3534		3751
3535	my $value = uuid_seq uuid_cur;	3752	my $value = uuid_seq uuid_cur;
3536		3753
3537	unless ($value) {	3754	unless ($value) {
3538	warn "cowardly refusing to write zero uuid value!\n";	3755	info "cowardly refusing to write zero uuid value!\n";
3539	return;	3756	return;
3540	}	3757	}
3541		3758
3542	my $value = uuid_str $value + $uuid_skip;	3759	my $value = uuid_str $value + $uuid_skip;
3543	$uuid_skip = 0;	3760	$uuid_skip = 0;
…		…
3553	or return;	3770	or return;
3554		3771
3555	aio_rename "$uuid~", $uuid	3772	aio_rename "$uuid~", $uuid
3556	and return;	3773	and return;
3557		3774
3558	warn "uuid file written ($value).\n";	3775	trace "uuid file written ($value).\n";
3559		3776
3560	1	3777	1
3561		3778
3562	}	3779	}
3563		3780
…		…
3569	}	3786	}
3570		3787
3571	sub emergency_save() {	3788	sub emergency_save() {
3572	my $freeze_guard = cf::freeze_mainloop;	3789	my $freeze_guard = cf::freeze_mainloop;
3573		3790
3574	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;
3575		3797
3576	cf::sync_job {	3798	cf::sync_job {
3577	# this is a trade-off: we want to be very quick here, so	3799	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		3800
3582	# use a peculiar iteration method to avoid tripping on perl	3801	# use a peculiar iteration method to avoid tripping on perl
3583	# refcount bugs in for. also avoids problems with players	3802	# refcount bugs in for. also avoids problems with players
3584	# and maps saved/destroyed asynchronously.	3803	# and maps saved/destroyed asynchronously.
3585	warn "emergency_perl_save: begin player save\n";	3804	info "emergency_perl_save: begin player save\n";
3586	for my $login (keys %cf::PLAYER) {	3805	for my $login (keys %cf::PLAYER) {
3587	my $pl = $cf::PLAYER{$login} or next;	3806	my $pl = $cf::PLAYER{$login} or next;
3588	$pl->valid or next;	3807	$pl->valid or next;
3589	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3808	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3590	$pl->save;	3809	$pl->save;
3591	}	3810	}
3592	warn "emergency_perl_save: end player save\n";	3811	info "emergency_perl_save: end player save\n";
3593		3812
		3813	cf::write_runtime_sync; # external watchdog should not bark
		3814
3594	warn "emergency_perl_save: begin map save\n";	3815	info "emergency_perl_save: begin map save\n";
3595	for my $path (keys %cf::MAP) {	3816	for my $path (keys %cf::MAP) {
3596	my $map = $cf::MAP{$path} or next;	3817	my $map = $cf::MAP{$path} or next;
3597	$map->valid or next;	3818	$map->valid or next;
3598	$map->save;	3819	$map->save;
3599	}	3820	}
3600	warn "emergency_perl_save: end map save\n";	3821	info "emergency_perl_save: end map save\n";
3601		3822
		3823	cf::write_runtime_sync; # external watchdog should not bark
		3824
3602	warn "emergency_perl_save: begin database checkpoint\n";	3825	info "emergency_perl_save: begin database checkpoint\n";
3603	BDB::db_env_txn_checkpoint $DB_ENV;	3826	BDB::db_env_txn_checkpoint $DB_ENV;
3604	warn "emergency_perl_save: end database checkpoint\n";	3827	info "emergency_perl_save: end database checkpoint\n";
3605		3828
3606	warn "emergency_perl_save: begin write uuid\n";	3829	info "emergency_perl_save: begin write uuid\n";
3607	write_uuid_sync 1;	3830	write_uuid_sync 1;
3608	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
3609	};	3851	};
3610		3852
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";	3853	info "emergency_perl_save: leave\n";
3617	}	3854	}
3618		3855
3619	sub post_cleanup {	3856	sub post_cleanup {
3620	my ($make_core) = @_;	3857	my ($make_core) = @_;
3621		3858
		3859	IO::AIO::flush;
		3860
3622	warn Carp::longmess "post_cleanup backtrace"	3861	error Carp::longmess "post_cleanup backtrace"
3623	if $make_core;	3862	if $make_core;
3624		3863
3625	my $fh = pidfile;	3864	my $fh = pidfile;
3626	unlink $PIDFILE if <$fh> == $$;	3865	unlink $PIDFILE if <$fh> == $$;
3627	}	3866	}
…		…
3647	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	3886	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3648	for my $name (keys %$leaf_symtab) {	3887	for my $name (keys %$leaf_symtab) {
3649	_gv_clear *{"$pkg$name"};	3888	_gv_clear *{"$pkg$name"};
3650	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	3889	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3651	}	3890	}
3652	warn "cleared package $pkg\n";#d#
3653	}	3891	}
3654		3892
3655	sub do_reload_perl() {	3893	sub do_reload_perl() {
3656	# can/must only be called in main	3894	# can/must only be called in main
3657	if ($Coro::current != $Coro::main) {	3895	unless (in_main) {
3658	warn "can only reload from main coroutine";	3896	error "can only reload from main coroutine";
3659	return;	3897	return;
3660	}	3898	}
3661		3899
3662	return if $RELOAD++;	3900	return if $RELOAD++;
3663		3901
3664	my $t1 = EV::time;	3902	my $t1 = AE::time;
3665		3903
3666	while ($RELOAD) {	3904	while ($RELOAD) {
3667	warn "reloading...";	3905	cf::get_slot 0.1, -1, "reload_perl";
		3906	info "perl_reload: reloading...";
3668		3907
3669	warn "entering sync_job";	3908	trace "perl_reload: entering sync_job";
3670		3909
3671	cf::sync_job {	3910	cf::sync_job {
3672	cf::write_runtime_sync; # external watchdog should not bark
3673	cf::emergency_save;	3911	#cf::emergency_save;
3674	cf::write_runtime_sync; # external watchdog should not bark
3675		3912
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";	3913	trace "perl_reload: cancelling all extension coros";
3687	$_->cancel for values %EXT_CORO;	3914	$_->cancel for values %EXT_CORO;
3688	%EXT_CORO = ();	3915	%EXT_CORO = ();
3689		3916
3690	warn "removing commands";	3917	trace "perl_reload: removing commands";
3691	%COMMAND = ();	3918	%COMMAND = ();
3692		3919
3693	warn "removing ext/exti commands";	3920	trace "perl_reload: removing ext/exti commands";
3694	%EXTCMD = ();	3921	%EXTCMD = ();
3695	%EXTICMD = ();	3922	%EXTICMD = ();
3696		3923
3697	warn "unloading/nuking all extensions";	3924	trace "perl_reload: unloading/nuking all extensions";
3698	for my $pkg (@EXTS) {	3925	for my $pkg (@EXTS) {
3699	warn "... unloading $pkg";	3926	trace "... unloading $pkg";
3700		3927
3701	if (my $cb = $pkg->can ("unload")) {	3928	if (my $cb = $pkg->can ("unload")) {
3702	eval {	3929	eval {
3703	$cb->($pkg);	3930	$cb->($pkg);
3704	1	3931	1
3705	} or warn "$pkg unloaded, but with errors: $@";	3932	} or error "$pkg unloaded, but with errors: $@";
3706	}	3933	}
3707		3934
3708	warn "... clearing $pkg";	3935	trace "... clearing $pkg";
3709	clear_package $pkg;	3936	clear_package $pkg;
3710	}	3937	}
3711		3938
3712	warn "unloading all perl modules loaded from $LIBDIR";	3939	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3713	while (my ($k, $v) = each %INC) {	3940	while (my ($k, $v) = each %INC) {
3714	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	3941	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3715		3942
3716	warn "... unloading $k";	3943	trace "... unloading $k";
3717	delete $INC{$k};	3944	delete $INC{$k};
3718		3945
3719	$k =~ s/\.pm$//;	3946	$k =~ s/\.pm$//;
3720	$k =~ s/\//::/g;	3947	$k =~ s/\//::/g;
3721		3948
…		…
3724	}	3951	}
3725		3952
3726	clear_package $k;	3953	clear_package $k;
3727	}	3954	}
3728		3955
3729	warn "getting rid of safe::, as good as possible";	3956	trace "perl_reload: getting rid of safe::, as good as possible";
3730	clear_package "safe::$_"	3957	clear_package "safe::$_"
3731	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);
3732		3959
3733	warn "unloading cf.pm \"a bit\"";	3960	trace "perl_reload: unloading cf.pm \"a bit\"";
3734	delete $INC{"cf.pm"};	3961	delete $INC{"cf.pm"};
3735	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	3962	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3736		3963
3737	# don't, removes xs symbols, too,	3964	# don't, removes xs symbols, too,
3738	# and global variables created in xs	3965	# and global variables created in xs
3739	#clear_package __PACKAGE__;	3966	#clear_package __PACKAGE__;
3740		3967
3741	warn "unload completed, starting to reload now";	3968	info "perl_reload: unload completed, starting to reload now";
3742		3969
3743	warn "reloading cf.pm";	3970	trace "perl_reload: reloading cf.pm";
3744	require cf;	3971	require cf;
3745	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3972	cf::_connect_to_perl_1;
3746		3973
3747	warn "loading config and database again";	3974	trace "perl_reload: loading config and database again";
3748	cf::reload_config;	3975	cf::reload_config;
3749		3976
3750	warn "loading extensions";	3977	trace "perl_reload: loading extensions";
3751	cf::load_extensions;	3978	cf::load_extensions;
3752		3979
3753	if ($REATTACH_ON_RELOAD) {	3980	if ($REATTACH_ON_RELOAD) {
3754	warn "reattaching attachments to objects/players";	3981	trace "perl_reload: reattaching attachments to objects/players";
3755	_global_reattach; # objects, sockets	3982	_global_reattach; # objects, sockets
3756	warn "reattaching attachments to maps";	3983	trace "perl_reload: reattaching attachments to maps";
3757	reattach $_ for values %MAP;	3984	reattach $_ for values %MAP;
3758	warn "reattaching attachments to players";	3985	trace "perl_reload: reattaching attachments to players";
3759	reattach $_ for values %PLAYER;	3986	reattach $_ for values %PLAYER;
3760	}	3987	}
3761		3988
3762	warn "running post_init jobs";	3989	cf::_post_init 1;
3763	(pop @POST_INIT)->(1) while @POST_INIT;
3764		3990
3765	warn "leaving sync_job";	3991	trace "perl_reload: leaving sync_job";
3766		3992
3767	1	3993	1
3768	} or do {	3994	} or do {
3769	warn $@;	3995	error $@;
3770	cf::cleanup "error while reloading, exiting.";	3996	cf::cleanup "perl_reload: error, exiting.";
3771	};	3997	};
3772		3998
3773	warn "reloaded";
3774	--$RELOAD;	3999	--$RELOAD;
3775	}	4000	}
3776		4001
3777	$t1 = EV::time - $t1;	4002	$t1 = AE::time - $t1;
3778	warn "reload completed in ${t1}s\n";	4003	info "perl_reload: completed in ${t1}s\n";
3779	};	4004	};
3780		4005
3781	our $RELOAD_WATCHER; # used only during reload	4006	our $RELOAD_WATCHER; # used only during reload
3782		4007
3783	sub reload_perl() {	4008	sub reload_perl() {
…		…
3785	# coro crashes during coro_state_free->destroy here.	4010	# coro crashes during coro_state_free->destroy here.
3786		4011
3787	$RELOAD_WATCHER ||= cf::async {	4012	$RELOAD_WATCHER ||= cf::async {
3788	Coro::AIO::aio_wait cache_extensions;	4013	Coro::AIO::aio_wait cache_extensions;
3789		4014
3790	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {	4015	$RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3791	do_reload_perl;	4016	do_reload_perl;
3792	undef $RELOAD_WATCHER;	4017	undef $RELOAD_WATCHER;
3793	};	4018	};
3794	};	4019	};
3795	}	4020	}
…		…
3804	reload_perl;	4029	reload_perl;
3805	};	4030	};
3806	}	4031	}
3807	};	4032	};
3808		4033
3809	unshift @INC, $LIBDIR;	4034	#############################################################################
3810		4035
3811	my $bug_warning = 0;	4036	my $bug_warning = 0;
3812		4037
3813	our @WAIT_FOR_TICK;	4038	our @WAIT_FOR_TICK;
3814	our @WAIT_FOR_TICK_BEGIN;	4039	our @WAIT_FOR_TICK_BEGIN;
3815		4040
3816	sub wait_for_tick {	4041	sub wait_for_tick() {
3817	return if tick_inhibit || $Coro::current == $Coro::main;	4042	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3818		4043
3819	my $signal = new Coro::Signal;	4044	my $signal = new Coro::Signal;
3820	push @WAIT_FOR_TICK, $signal;	4045	push @WAIT_FOR_TICK, $signal;
3821	$signal->wait;	4046	$signal->wait;
3822	}	4047	}
3823		4048
3824	sub wait_for_tick_begin {	4049	sub wait_for_tick_begin() {
3825	return if tick_inhibit || $Coro::current == $Coro::main;	4050	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3826		4051
3827	my $signal = new Coro::Signal;	4052	my $signal = new Coro::Signal;
3828	push @WAIT_FOR_TICK_BEGIN, $signal;	4053	push @WAIT_FOR_TICK_BEGIN, $signal;
3829	$signal->wait;	4054	$signal->wait;
3830	}	4055	}
…		…
3836	return;	4061	return;
3837	}	4062	}
3838		4063
3839	cf::server_tick; # one server iteration	4064	cf::server_tick; # one server iteration
3840		4065
		4066	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
		4067
3841	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4068	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3842	$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.;
3843	Coro::async_pool {	4070	Coro::async_pool {
3844	$Coro::current->{desc} = "runtime saver";	4071	$Coro::current->{desc} = "runtime saver";
3845	write_runtime_sync	4072	write_runtime_sync
3846	or warn "ERROR: unable to write runtime file: $!";	4073	or error "ERROR: unable to write runtime file: $!";
3847	};	4074	};
3848	}	4075	}
3849		4076
3850	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4077	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3851	$sig->send;	4078	$sig->send;
…		…
3859		4086
3860	if (0) {	4087	if (0) {
3861	if ($NEXT_TICK) {	4088	if ($NEXT_TICK) {
3862	my $jitter = $TICK_START - $NEXT_TICK;	4089	my $jitter = $TICK_START - $NEXT_TICK;
3863	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4090	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
3864	warn "jitter $JITTER\n";#d#	4091	debug "jitter $JITTER\n";#d#
3865	}	4092	}
3866	}	4093	}
3867	}	4094	}
3868		4095
3869	{	4096	{
3870	# configure BDB	4097	# configure BDB
3871		4098
3872	BDB::min_parallel 8;	4099	BDB::min_parallel 16;
3873	BDB::max_poll_reqs $TICK * 0.1;	4100	BDB::max_poll_reqs $TICK * 0.1;
3874	$AnyEvent::BDB::WATCHER->priority (1);	4101	$AnyEvent::BDB::WATCHER->priority (1);
3875		4102
3876	unless ($DB_ENV) {	4103	unless ($DB_ENV) {
3877	$DB_ENV = BDB::db_env_create;	4104	$DB_ENV = BDB::db_env_create;
…		…
3914	IO::AIO::min_parallel 8;	4141	IO::AIO::min_parallel 8;
3915	IO::AIO::max_poll_time $TICK * 0.1;	4142	IO::AIO::max_poll_time $TICK * 0.1;
3916	undef $AnyEvent::AIO::WATCHER;	4143	undef $AnyEvent::AIO::WATCHER;
3917	}	4144	}
3918		4145
3919	my $_log_backtrace;	4146	our $_log_backtrace;
		4147	our $_log_backtrace_last;
3920		4148
3921	sub _log_backtrace {	4149	sub _log_backtrace {
3922	my ($msg, @addr) = @_;	4150	my ($msg, @addr) = @_;
3923		4151
3924	$msg =~ s/\n//;	4152	$msg =~ s/\n$//;
3925		4153
		4154	if ($_log_backtrace_last eq $msg) {
		4155	LOG llevInfo, "[ABT] $msg\n";
		4156	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3926	# limit the # of concurrent backtraces	4157	# limit the # of concurrent backtraces
3927	if ($_log_backtrace < 2) {	4158	} elsif ($_log_backtrace < 2) {
		4159	$_log_backtrace_last = $msg;
3928	++$_log_backtrace;	4160	++$_log_backtrace;
3929	my $perl_bt = Carp::longmess $msg;	4161	my $perl_bt = Carp::longmess $msg;
3930	async {	4162	async {
3931	$Coro::current->{desc} = "abt $msg";	4163	$Coro::current->{desc} = "abt $msg";
3932		4164
…		…
3952	LOG llevInfo, "[ABT] $_\n" for @bt;	4184	LOG llevInfo, "[ABT] $_\n" for @bt;
3953	--$_log_backtrace;	4185	--$_log_backtrace;
3954	};	4186	};
3955	} else {	4187	} else {
3956	LOG llevInfo, "[ABT] $msg\n";	4188	LOG llevInfo, "[ABT] $msg\n";
3957	LOG llevInfo, "[ABT] [suppressed]\n";	4189	LOG llevInfo, "[ABT] [overload, suppressed]\n";
3958	}	4190	}
3959	}	4191	}
3960		4192
3961	# load additional modules	4193	# load additional modules
3962	require "cf/$_.pm" for @EXTRA_MODULES;	4194	require "cf/$_.pm" for @EXTRA_MODULES;
		4195	cf::_connect_to_perl_2;
3963		4196
3964	END { cf::emergency_save }	4197	END { cf::emergency_save }
3965		4198
3966	1	4199	1
3967		4200

Diff Legend

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