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.482 by root, Sun Oct 11 05:31:54 2009 UTC vs.
Revision 1.548 by root, Mon May 10 21:40:22 2010 UTC

1	#	1	#
2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	#	3	#
4	# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	#	5	#
6	# Deliantra is free software: you can redistribute it and/or modify	6	# Deliantra is free software: you can redistribute it and/or modify it under
7	# it under the terms of the GNU General Public License as published by	7	# the terms of the Affero GNU General Public License as published by the
8	# the Free Software Foundation, either version 3 of the License, or	8	# Free Software Foundation, either version 3 of the License, or (at your
9	# (at your option) any later version.	9	# option) any later version.
10	#	10	#
11	# This program is distributed in the hope that it will be useful,	11	# This program is distributed in the hope that it will be useful,
12	# but WITHOUT ANY WARRANTY; without even the implied warranty of	12	# but WITHOUT ANY WARRANTY; without even the implied warranty of
13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14	# GNU General Public License for more details.	14	# GNU General Public License for more details.
15	#	15	#
16	# You should have received a copy of the GNU General Public License	16	# You should have received a copy of the Affero GNU General Public License
17	# along with this program. If not, see <http://www.gnu.org/licenses/>.	17	# and the GNU General Public License along with this program. If not, see
		18	# <http://www.gnu.org/licenses/>.
18	#	19	#
19	# The authors can be reached via e-mail to <support@deliantra.net>	20	# The authors can be reached via e-mail to <support@deliantra.net>
20	#	21	#
21		22
22	package cf;	23	package cf;
23		24
24	use 5.10.0;	25	use common::sense;
25	use utf8;
26	use strict qw(vars subs);
27		26
28	use Symbol;	27	use Symbol;
29	use List::Util;	28	use List::Util;
30	use Socket;	29	use Socket;
31	use EV;	30	use EV;
32	use Opcode;	31	use Opcode;
33	use Safe;	32	use Safe;
34	use Safe::Hole;	33	use Safe::Hole;
35	use Storable ();	34	use Storable ();
		35	use Carp ();
36		36
37	use Guard ();	37	use Guard ();
38	use Coro ();	38	use Coro ();
39	use Coro::State;	39	use Coro::State;
40	use Coro::Handle;	40	use Coro::Handle;
…		…
51	use Coro::Util ();	51	use Coro::Util ();
52		52
53	use JSON::XS 2.01 ();	53	use JSON::XS 2.01 ();
54	use BDB ();	54	use BDB ();
55	use Data::Dumper;	55	use Data::Dumper;
56	use Digest::MD5;
57	use Fcntl;	56	use Fcntl;
58	use YAML ();	57	use YAML::XS ();
59	use IO::AIO ();	58	use IO::AIO ();
60	use Time::HiRes;	59	use Time::HiRes;
61	use Compress::LZF;	60	use Compress::LZF;
62	use Digest::MD5 ();	61	use Digest::MD5 ();
63		62
…		…
76		75
77	# strictly for debugging	76	# strictly for debugging
78	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };	77	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
79		78
80	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	79	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
		80
		81	our @ORIG_INC;
81		82
82	our %COMMAND = ();	83	our %COMMAND = ();
83	our %COMMAND_TIME = ();	84	our %COMMAND_TIME = ();
84		85
85	our @EXTS = (); # list of extension package names	86	our @EXTS = (); # list of extension package names
…		…
105	our $RANDOMDIR = "$LOCALDIR/random";	106	our $RANDOMDIR = "$LOCALDIR/random";
106	our $BDBDIR = "$LOCALDIR/db";	107	our $BDBDIR = "$LOCALDIR/db";
107	our $PIDFILE = "$LOCALDIR/pid";	108	our $PIDFILE = "$LOCALDIR/pid";
108	our $RUNTIMEFILE = "$LOCALDIR/runtime";	109	our $RUNTIMEFILE = "$LOCALDIR/runtime";
109		110
110	our %RESOURCE;	111	our %RESOURCE; # unused
		112
		113	our $OUTPUT_RATE_MIN = 3000;
		114	our $OUTPUT_RATE_MAX = 1000000;
		115
		116	our $MAX_LINKS = 32; # how many chained exits to follow
		117	our $VERBOSE_IO = 1;
111		118
112	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	119	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
113	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	120	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
114	our $NEXT_TICK;	121	our $NEXT_TICK;
115	our $USE_FSYNC = 1; # use fsync to write maps - default on	122	our $USE_FSYNC = 1; # use fsync to write maps - default on
…		…
117	our $BDB_DEADLOCK_WATCHER;	124	our $BDB_DEADLOCK_WATCHER;
118	our $BDB_CHECKPOINT_WATCHER;	125	our $BDB_CHECKPOINT_WATCHER;
119	our $BDB_TRICKLE_WATCHER;	126	our $BDB_TRICKLE_WATCHER;
120	our $DB_ENV;	127	our $DB_ENV;
121		128
122	our @EXTRA_MODULES = qw(pod match mapscript);	129	our @EXTRA_MODULES = qw(pod match mapscript incloader);
123		130
124	our %CFG;	131	our %CFG;
125		132
126	our $UPTIME; $UPTIME ||= time;	133	our $UPTIME; $UPTIME ||= time;
127	our $RUNTIME;	134	our $RUNTIME;
…		…
161		168
162	our $EMERGENCY_POSITION;	169	our $EMERGENCY_POSITION;
163		170
164	sub cf::map::normalise;	171	sub cf::map::normalise;
165		172
		173	sub in_main() {
		174	$Coro::current == $Coro::main
		175	}
		176
166	#############################################################################	177	#############################################################################
167		178
168	%REFLECT = ();	179	%REFLECT = ();
169	for (@REFLECT) {	180	for (@REFLECT) {
170	my $reflect = JSON::XS::decode_json $_;	181	my $reflect = JSON::XS::decode_json $_;
…		…
222	from wherever your confdir points to.	233	from wherever your confdir points to.
223		234
224	=item cf::wait_for_tick, cf::wait_for_tick_begin	235	=item cf::wait_for_tick, cf::wait_for_tick_begin
225		236
226	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	237	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
227	returns directly I<after> the tick processing (and consequently, can only wake one process	238	returns directly I<after> the tick processing (and consequently, can only wake one thread
228	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	239	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
229		240
		241	=cut
		242
		243	sub wait_for_tick();
		244	sub wait_for_tick_begin();
		245
230	=item @cf::INVOKE_RESULTS	246	=item @cf::INVOKE_RESULTS
231		247
232	This array contains the results of the last C<invoke ()> call. When	248	This array contains the results of the last C<invoke ()> call. When
233	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of	249	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
234	that call.	250	that call.
235		251
236	=item %cf::REFLECT	252	=item %cf::REFLECT
237		253
…		…
241		257
242	=back	258	=back
243		259
244	=cut	260	=cut
245		261
		262	sub error(@) { LOG llevError, join "", @_ }
		263	sub warn (@) { LOG llevWarn , join "", @_ }
		264	sub info (@) { LOG llevInfo , join "", @_ }
		265	sub debug(@) { LOG llevDebug, join "", @_ }
		266	sub trace(@) { LOG llevTrace, join "", @_ }
		267
246	$Coro::State::WARNHOOK = sub {	268	$Coro::State::WARNHOOK = sub {
247	my $msg = join "", @_;	269	my $msg = join "", @_;
248		270
249	$msg .= "\n"	271	$msg .= "\n"
250	unless $msg =~ /\n$/;	272	unless $msg =~ /\n$/;
251		273
252	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	274	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
253		275
254	LOG llevError, $msg;	276	LOG llevWarn, $msg;
255	};	277	};
256		278
257	$Coro::State::DIEHOOK = sub {	279	$Coro::State::DIEHOOK = sub {
258	return unless $^S eq 0; # "eq", not "=="	280	return unless $^S eq 0; # "eq", not "=="
259		281
260	warn Carp::longmess $_[0];	282	error Carp::longmess $_[0];
261		283
262	if ($Coro::current == $Coro::main) {#d#	284	if (in_main) {#d#
263	warn "DIEHOOK called in main context, Coro bug?\n";#d#	285	error "DIEHOOK called in main context, Coro bug?\n";#d#
264	return;#d#	286	return;#d#
265	}#d#	287	}#d#
266		288
267	# kill coroutine otherwise	289	# kill coroutine otherwise
268	Coro::terminate	290	Coro::terminate
…		…
288	)) {	310	)) {
289	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	311	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
290	}	312	}
291		313
292	$EV::DIED = sub {	314	$EV::DIED = sub {
293	warn "error in event callback: @_";	315	Carp::cluck "error in event callback: @_";
294	};	316	};
295		317
296	#############################################################################	318	#############################################################################
297		319
298	=head2 UTILITY FUNCTIONS	320	=head2 UTILITY FUNCTIONS
…		…
335	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	357	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
336		358
337	sub encode_json($) { $json_coder->encode ($_[0]) }	359	sub encode_json($) { $json_coder->encode ($_[0]) }
338	sub decode_json($) { $json_coder->decode ($_[0]) }	360	sub decode_json($) { $json_coder->decode ($_[0]) }
339		361
		362	=item $ref = cf::yaml_load $scalar
		363
		364	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
		365
		366	=cut
		367
		368	sub fork_call(&@);
		369
		370	sub yaml_load($) {
		371	fork_call { YAML::XS::Load $_[0] } @_
		372	}
		373
340	=item cf::post_init { BLOCK }	374	=item cf::post_init { BLOCK }
341		375
342	Execute the given codeblock, I<after> all extensions have been (re-)loaded,	376	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
343	but I<before> the server starts ticking again.	377	but I<before> the server starts ticking again.
344		378
345	The cdoeblock will have a single boolean argument to indicate whether this	379	The codeblock will have a single boolean argument to indicate whether this
346	is a reload or not.	380	is a reload or not.
347		381
348	=cut	382	=cut
349		383
350	sub post_init(&) {	384	sub post_init(&) {
…		…
395	}	429	}
396		430
397	=item cf::periodic $interval, $cb	431	=item cf::periodic $interval, $cb
398		432
399	Like EV::periodic, but randomly selects a starting point so that the actions	433	Like EV::periodic, but randomly selects a starting point so that the actions
400	get spread over timer.	434	get spread over time.
401		435
402	=cut	436	=cut
403		437
404	sub periodic($$) {	438	sub periodic($$) {
405	my ($interval, $cb) = @_;	439	my ($interval, $cb) = @_;
…		…
422		456
423	=cut	457	=cut
424		458
425	our @SLOT_QUEUE;	459	our @SLOT_QUEUE;
426	our $SLOT_QUEUE;	460	our $SLOT_QUEUE;
		461	our $SLOT_DECAY = 0.9;
427		462
428	$SLOT_QUEUE->cancel if $SLOT_QUEUE;	463	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
429	$SLOT_QUEUE = Coro::async {	464	$SLOT_QUEUE = Coro::async {
430	$Coro::current->desc ("timeslot manager");	465	$Coro::current->desc ("timeslot manager");
431		466
432	my $signal = new Coro::Signal;	467	my $signal = new Coro::Signal;
		468	my $busy;
433		469
434	while () {	470	while () {
435	next_job:	471	next_job:
		472
436	my $avail = cf::till_tick;	473	my $avail = cf::till_tick;
437	if ($avail > 0.01) {	474
438	for (0 .. $#SLOT_QUEUE) {	475	for (0 .. $#SLOT_QUEUE) {
439	if ($SLOT_QUEUE[$_][0] < $avail) {	476	if ($SLOT_QUEUE[$_][0] <= $avail) {
		477	$busy = 0;
440	my $job = splice @SLOT_QUEUE, $_, 1, ();	478	my $job = splice @SLOT_QUEUE, $_, 1, ();
441	$job->[2]->send;	479	$job->[2]->send;
442	Coro::cede;	480	Coro::cede;
443	goto next_job;	481	goto next_job;
444	}	482	} else {
		483	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
445	}	484	}
446	}	485	}
447		486
448	if (@SLOT_QUEUE) {	487	if (@SLOT_QUEUE) {
449	# we do not use wait_for_tick() as it returns immediately when tick is inactive	488	# we do not use wait_for_tick() as it returns immediately when tick is inactive
450	push @cf::WAIT_FOR_TICK, $signal;	489	push @cf::WAIT_FOR_TICK, $signal;
451	$signal->wait;	490	$signal->wait;
452	} else {	491	} else {
		492	$busy = 0;
453	Coro::schedule;	493	Coro::schedule;
454	}	494	}
455	}	495	}
456	};	496	};
457		497
458	sub get_slot($;$$) {	498	sub get_slot($;$$) {
459	return if tick_inhibit || $Coro::current == $Coro::main;	499	return if tick_inhibit || $Coro::current == $Coro::main;
460		500
461	my ($time, $pri, $name) = @_;	501	my ($time, $pri, $name) = @_;
462		502
463	$time = $TICK * .6 if $time > $TICK * .6;	503	$time = clamp $time, 0.01, $TICK * .6;
		504
464	my $sig = new Coro::Signal;	505	my $sig = new Coro::Signal;
465		506
466	push @SLOT_QUEUE, [$time, $pri, $sig, $name];	507	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
467	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;	508	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
468	$SLOT_QUEUE->ready;	509	$SLOT_QUEUE->ready;
…		…
494	=cut	535	=cut
495		536
496	sub sync_job(&) {	537	sub sync_job(&) {
497	my ($job) = @_;	538	my ($job) = @_;
498		539
499	if ($Coro::current == $Coro::main) {	540	if (in_main) {
500	my $time = EV::time;	541	my $time = AE::time;
501		542
502	# this is the main coro, too bad, we have to block	543	# this is the main coro, too bad, we have to block
503	# till the operation succeeds, freezing the server :/	544	# till the operation succeeds, freezing the server :/
504		545
505	LOG llevError, Carp::longmess "sync job";#d#	546	#LOG llevError, Carp::longmess "sync job";#d#
506		547
507	my $freeze_guard = freeze_mainloop;	548	my $freeze_guard = freeze_mainloop;
508		549
509	my $busy = 1;	550	my $busy = 1;
510	my @res;	551	my @res;
511		552
512	(async {	553	(async {
513	$Coro::current->desc ("sync job coro");	554	$Coro::current->desc ("sync job coro");
514	@res = eval { $job->() };	555	@res = eval { $job->() };
515	warn $@ if $@;	556	error $@ if $@;
516	undef $busy;	557	undef $busy;
517	})->prio (Coro::PRIO_MAX);	558	})->prio (Coro::PRIO_MAX);
518		559
519	while ($busy) {	560	while ($busy) {
520	if (Coro::nready) {	561	if (Coro::nready) {
…		…
522	} else {	563	} else {
523	EV::loop EV::LOOP_ONESHOT;	564	EV::loop EV::LOOP_ONESHOT;
524	}	565	}
525	}	566	}
526		567
527	my $time = EV::time - $time;	568	my $time = AE::time - $time;
528		569
529	$TICK_START += $time; # do not account sync jobs to server load	570	$TICK_START += $time; # do not account sync jobs to server load
530		571
531	wantarray ? @res : $res[0]	572	wantarray ? @res : $res[0]
532	} else {	573	} else {
…		…
554	$EXT_CORO{$coro+0} = $coro;	595	$EXT_CORO{$coro+0} = $coro;
555		596
556	$coro	597	$coro
557	}	598	}
558		599
559	=item fork_call { }, $args	600	=item fork_call { }, @args
560		601
561	Executes the given code block with the given arguments in a seperate	602	Executes the given code block with the given arguments in a seperate
562	process, returning the results. Everything must be serialisable with	603	process, returning the results. Everything must be serialisable with
563	Coro::Storable. May, of course, block. Note that the executed sub may	604	Coro::Storable. May, of course, block. Note that the executed sub may
564	never block itself or use any form of event handling.	605	never block itself or use any form of event handling.
565		606
566	=cut	607	=cut
567		608
		609	sub post_fork {
		610	reset_signals;
		611	}
		612
568	sub fork_call(&@) {	613	sub fork_call(&@) {
569	my ($cb, @args) = @_;	614	my ($cb, @args) = @_;
570		615
571	# we seemingly have to make a local copy of the whole thing,	616	# we seemingly have to make a local copy of the whole thing,
572	# otherwise perl prematurely frees the stuff :/	617	# otherwise perl prematurely frees the stuff :/
573	# TODO: investigate and fix (likely this will be rather laborious)	618	# TODO: investigate and fix (likely this will be rather laborious)
574		619
575	my @res = Coro::Util::fork_eval {	620	my @res = Coro::Util::fork_eval {
576	reset_signals;	621	cf::post_fork;
577	&$cb	622	&$cb
578	}, @args;	623	} @args;
579		624
580	wantarray ? @res : $res[-1]	625	wantarray ? @res : $res[-1]
		626	}
		627
		628	sub objinfo {
		629	(
		630	"counter value" => cf::object::object_count,
		631	"objects created" => cf::object::create_count,
		632	"objects destroyed" => cf::object::destroy_count,
		633	"freelist size" => cf::object::free_count,
		634	"allocated objects" => cf::object::objects_size,
		635	"active objects" => cf::object::actives_size,
		636	)
581	}	637	}
582		638
583	=item $coin = coin_from_name $name	639	=item $coin = coin_from_name $name
584		640
585	=cut	641	=cut
…		…
622	within each server.	678	within each server.
623		679
624	=cut	680	=cut
625		681
626	sub db_table($) {	682	sub db_table($) {
		683	cf::error "db_get called from main context"
		684	if $Coro::current == $Coro::main;
		685
627	my ($name) = @_;	686	my ($name) = @_;
628	my $db = BDB::db_create $DB_ENV;	687	my $db = BDB::db_create $DB_ENV;
629		688
630	eval {	689	eval {
631	$db->set_flags (BDB::CHKSUM);	690	$db->set_flags (BDB::CHKSUM);
…		…
641	}	700	}
642		701
643	our $DB;	702	our $DB;
644		703
645	sub db_init {	704	sub db_init {
646	cf::sync_job {
647	$DB ||= db_table "db";	705	$DB ||= db_table "db";
648	};
649	}	706	}
650		707
651	sub db_get($$) {	708	sub db_get($$) {
652	my $key = "$_[0]/$_[1]";	709	my $key = "$_[0]/$_[1]";
653		710
654	cf::sync_job {	711	cf::error "db_get called from main context"
		712	if $Coro::current == $Coro::main;
		713
655	BDB::db_get $DB, undef, $key, my $data;	714	BDB::db_get $DB, undef, $key, my $data;
656		715
657	$! ? ()	716	$! ? ()
658	: $data	717	: $data
659	}
660	}	718	}
661		719
662	sub db_put($$$) {	720	sub db_put($$$) {
663	BDB::dbreq_pri 4;	721	BDB::dbreq_pri 4;
664	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	722	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
720		778
721	my $t1 = Time::HiRes::time;	779	my $t1 = Time::HiRes::time;
722	my $data = $process->(\@data);	780	my $data = $process->(\@data);
723	my $t2 = Time::HiRes::time;	781	my $t2 = Time::HiRes::time;
724		782
725	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	783	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
726		784
727	db_put cache => "$id/data", $data;	785	db_put cache => "$id/data", $data;
728	db_put cache => "$id/md5" , $md5;	786	db_put cache => "$id/md5" , $md5;
729	db_put cache => "$id/meta", $meta;	787	db_put cache => "$id/meta", $meta;
730		788
…		…
740		798
741	=cut	799	=cut
742		800
743	sub datalog($@) {	801	sub datalog($@) {
744	my ($type, %kv) = @_;	802	my ($type, %kv) = @_;
745	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	803	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
746	}	804	}
747		805
748	=back	806	=back
749		807
750	=cut	808	=cut
…		…
945		1003
946	} elsif (exists $cb_id{$type}) {	1004	} elsif (exists $cb_id{$type}) {
947	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	1005	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
948		1006
949	} elsif (ref $type) {	1007	} elsif (ref $type) {
950	warn "attaching objects not supported, ignoring.\n";	1008	error "attaching objects not supported, ignoring.\n";
951		1009
952	} else {	1010	} else {
953	shift @arg;	1011	shift @arg;
954	warn "attach argument '$type' not supported, ignoring.\n";	1012	error "attach argument '$type' not supported, ignoring.\n";
955	}	1013	}
956	}	1014	}
957	}	1015	}
958		1016
959	sub _object_attach {	1017	sub _object_attach {
…		…
969	_attach $registry, $klass, @attach;	1027	_attach $registry, $klass, @attach;
970	}	1028	}
971		1029
972	$obj->{$name} = \%arg;	1030	$obj->{$name} = \%arg;
973	} else {	1031	} else {
974	warn "object uses attachment '$name' which is not available, postponing.\n";	1032	info "object uses attachment '$name' which is not available, postponing.\n";
975	}	1033	}
976		1034
977	$obj->{_attachment}{$name} = undef;	1035	$obj->{_attachment}{$name} = undef;
978	}	1036	}
979		1037
…		…
1038		1096
1039	for (@$callbacks) {	1097	for (@$callbacks) {
1040	eval { &{$_->[1]} };	1098	eval { &{$_->[1]} };
1041		1099
1042	if ($@) {	1100	if ($@) {
1043	warn "$@";
1044	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1101	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1045	override;	1102	override;
1046	}	1103	}
1047		1104
1048	return 1 if $override;	1105	return 1 if $override;
1049	}	1106	}
…		…
1128	for (@$attach) {	1185	for (@$attach) {
1129	my ($klass, @attach) = @$_;	1186	my ($klass, @attach) = @$_;
1130	_attach $registry, $klass, @attach;	1187	_attach $registry, $klass, @attach;
1131	}	1188	}
1132	} else {	1189	} else {
1133	warn "object uses attachment '$name' that is not available, postponing.\n";	1190	info "object uses attachment '$name' that is not available, postponing.\n";
1134	}	1191	}
1135	}	1192	}
1136	}	1193	}
1137		1194
1138	cf::attachable->attach (	1195	cf::attachable->attach (
…		…
1165	my ($filename, $rdata, $objs) = @_;	1222	my ($filename, $rdata, $objs) = @_;
1166		1223
1167	sync_job {	1224	sync_job {
1168	if (length $$rdata) {	1225	if (length $$rdata) {
1169	utf8::decode (my $decname = $filename);	1226	utf8::decode (my $decname = $filename);
1170	warn sprintf "saving %s (%d,%d)\n",	1227	trace sprintf "saving %s (%d,%d)\n",
1171	$decname, length $$rdata, scalar @$objs;	1228	$decname, length $$rdata, scalar @$objs
		1229	if $VERBOSE_IO;
1172		1230
1173	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1231	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1174	aio_chmod $fh, SAVE_MODE;	1232	aio_chmod $fh, SAVE_MODE;
1175	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1233	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1176	if ($cf::USE_FSYNC) {	1234	if ($cf::USE_FSYNC) {
…		…
1198	aio_rename "$filename~", $filename;	1256	aio_rename "$filename~", $filename;
1199		1257
1200	$filename =~ s%/[^/]+$%%;	1258	$filename =~ s%/[^/]+$%%;
1201	aio_pathsync $filename if $cf::USE_FSYNC;	1259	aio_pathsync $filename if $cf::USE_FSYNC;
1202	} else {	1260	} else {
1203	warn "unable to save objects: $filename~: $!\n";	1261	error "unable to save objects: $filename~: $!\n";
1204	}	1262	}
1205	} else {	1263	} else {
1206	aio_unlink $filename;	1264	aio_unlink $filename;
1207	aio_unlink "$filename.pst";	1265	aio_unlink "$filename.pst";
1208	}	1266	}
…		…
1232	my $st = eval { Coro::Storable::thaw $av };	1290	my $st = eval { Coro::Storable::thaw $av };
1233	$av = $st->{objs};	1291	$av = $st->{objs};
1234	}	1292	}
1235		1293
1236	utf8::decode (my $decname = $filename);	1294	utf8::decode (my $decname = $filename);
1237	warn sprintf "loading %s (%d,%d)\n",	1295	trace sprintf "loading %s (%d,%d)\n",
1238	$decname, length $data, scalar @{$av || []};	1296	$decname, length $data, scalar @{$av || []}
		1297	if $VERBOSE_IO;
1239		1298
1240	($data, $av)	1299	($data, $av)
1241	}	1300	}
1242		1301
1243	=head2 COMMAND CALLBACKS	1302	=head2 COMMAND CALLBACKS
…		…
1302	}	1361	}
1303		1362
1304	use File::Glob ();	1363	use File::Glob ();
1305		1364
1306	cf::player->attach (	1365	cf::player->attach (
1307	on_command => sub {	1366	on_unknown_command => sub {
1308	my ($pl, $name, $params) = @_;	1367	my ($pl, $name, $params) = @_;
1309		1368
1310	my $cb = $COMMAND{$name}	1369	my $cb = $COMMAND{$name}
1311	or return;	1370	or return;
1312		1371
…		…
1335		1394
1336	$pl->ext_reply ($reply, @reply)	1395	$pl->ext_reply ($reply, @reply)
1337	if $reply;	1396	if $reply;
1338		1397
1339	} else {	1398	} else {
1340	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1399	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1341	}	1400	}
1342		1401
1343	cf::override;	1402	cf::override;
1344	},	1403	},
1345	);	1404	);
…		…
1356		1415
1357	$grp	1416	$grp
1358	}	1417	}
1359		1418
1360	sub load_extensions {	1419	sub load_extensions {
		1420	info "loading extensions...";
		1421
1361	cf::sync_job {	1422	cf::sync_job {
1362	my %todo;	1423	my %todo;
1363		1424
1364	for my $path (<$LIBDIR/*.ext>) {	1425	for my $path (<$LIBDIR/*.ext>) {
1365	next unless -r $path;	1426	next unless -r $path;
…		…
1383		1444
1384	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1445	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1385	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1446	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1386		1447
1387	$ext{source} =	1448	$ext{source} =
1388	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1449	"package $pkg; use common::sense;\n"
1389	. "#line 1 \"$path\"\n{\n"	1450	. "#line 1 \"$path\"\n{\n"
1390	. $source	1451	. $source
1391	. "\n};\n1";	1452	. "\n};\n1";
1392		1453
1393	$todo{$base} = \%ext;	1454	$todo{$base} = \%ext;
1394	}	1455	}
1395		1456
		1457	my $pass = 0;
1396	my %done;	1458	my %done;
1397	while (%todo) {	1459	while (%todo) {
1398	my $progress;	1460	my $progress;
1399		1461
		1462	++$pass;
		1463
		1464	ext:
1400	while (my ($k, $v) = each %todo) {	1465	while (my ($k, $v) = each %todo) {
1401	for (split /,\s*/, $v->{meta}{depends}) {	1466	for (split /,\s*/, $v->{meta}{depends}) {
1402	goto skip	1467	next ext
1403	unless exists $done{$_};	1468	unless exists $done{$_};
1404	}	1469	}
1405		1470
1406	warn "... loading '$k' into '$v->{pkg}'\n";	1471	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1407		1472
1408	unless (eval $v->{source}) {	1473	my $active = eval $v->{source};
		1474
		1475	if (length $@) {
1409	my $msg = $@ ? "$v->{path}: $@\n"	1476	error "$v->{path}: $@\n";
1410	: "$v->{base}: extension inactive.\n";
1411		1477
1412	if (exists $v->{meta}{mandatory}) {
1413	warn $msg;
1414	cf::cleanup "mandatory extension failed to load, exiting.";	1478	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1415	}	1479	if exists $v->{meta}{mandatory};
1416		1480
1417	warn $msg;	1481	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
		1482	delete $todo{$k};
		1483	} else {
		1484	$done{$k} = delete $todo{$k};
		1485	push @EXTS, $v->{pkg};
		1486	$progress = 1;
		1487
		1488	info "$v->{base}: extension inactive.\n"
		1489	unless $active;
1418	}	1490	}
1419
1420	$done{$k} = delete $todo{$k};
1421	push @EXTS, $v->{pkg};
1422	$progress = 1;
1423	}	1491	}
1424		1492
1425	skip:	1493	unless ($progress) {
1426	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"	1494	warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1427	unless $progress;	1495
		1496	while (my ($k, $v) = each %todo) {
		1497	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
		1498	if exists $v->{meta}{mandatory};
		1499	}
		1500	}
1428	}	1501	}
1429	};	1502	};
1430	}	1503	}
1431		1504
1432	#############################################################################	1505	#############################################################################
…		…
1516	$cf::PLAYER{$login} = $pl	1589	$cf::PLAYER{$login} = $pl
1517	}	1590	}
1518	}	1591	}
1519	}	1592	}
1520		1593
		1594	cf::player->attach (
		1595	on_load => sub {
		1596	my ($pl, $path) = @_;
		1597
		1598	# restore slots saved in save, below
		1599	my $slots = delete $pl->{_slots};
		1600
		1601	$pl->ob->current_weapon ($slots->[0]);
		1602	$pl->combat_ob ($slots->[1]);
		1603	$pl->ranged_ob ($slots->[2]);
		1604	},
		1605	);
		1606
1521	sub save($) {	1607	sub save($) {
1522	my ($pl) = @_;	1608	my ($pl) = @_;
1523		1609
1524	return if $pl->{deny_save};	1610	return if $pl->{deny_save};
1525		1611
…		…
1530		1616
1531	aio_mkdir playerdir $pl, 0770;	1617	aio_mkdir playerdir $pl, 0770;
1532	$pl->{last_save} = $cf::RUNTIME;	1618	$pl->{last_save} = $cf::RUNTIME;
1533		1619
1534	cf::get_slot 0.01;	1620	cf::get_slot 0.01;
		1621
		1622	# save slots, to be restored later
		1623	local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1535		1624
1536	$pl->save_pl ($path);	1625	$pl->save_pl ($path);
1537	cf::cede_to_tick;	1626	cf::cede_to_tick;
1538	}	1627	}
1539		1628
…		…
1575	$pl->{deny_save} = 1;	1664	$pl->{deny_save} = 1;
1576	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1665	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1577		1666
1578	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1667	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1579	$pl->deactivate;	1668	$pl->deactivate;
		1669
1580	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1670	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1581	$pl->ob->check_score;	1671	ext::highscore::check ($pl->ob);
		1672
1582	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1673	$pl->invoke (cf::EVENT_PLAYER_QUIT);
1583	$pl->ns->destroy if $pl->ns;	1674	$pl->ns->destroy if $pl->ns;
1584		1675
1585	my $path = playerdir $pl;	1676	my $path = playerdir $pl;
1586	my $temp = "$path~$cf::RUNTIME~deleting~";	1677	my $temp = "$path~$cf::RUNTIME~deleting~";
…		…
1641	\@logins	1732	\@logins
1642	}	1733	}
1643		1734
1644	=item $player->maps	1735	=item $player->maps
1645		1736
		1737	=item cf::player::maps $login
		1738
1646	Returns an arrayref of map paths that are private for this	1739	Returns an arrayref of map paths that are private for this
1647	player. May block.	1740	player. May block.
1648		1741
1649	=cut	1742	=cut
1650		1743
…		…
1712	=cut	1805	=cut
1713		1806
1714	sub find_by_path($) {	1807	sub find_by_path($) {
1715	my ($path) = @_;	1808	my ($path) = @_;
1716		1809
		1810	$path =~ s/^~[^\/]*//; # skip ~login
		1811
1717	my ($match, $specificity);	1812	my ($match, $specificity);
1718		1813
1719	for my $region (list) {	1814	for my $region (list) {
1720	if ($region->{match} && $path =~ $region->{match}) {	1815	if ($region->{match} && $path =~ $region->{match}) {
1721	($match, $specificity) = ($region, $region->specificity)	1816	($match, $specificity) = ($region, $region->specificity)
…		…
1752	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	1847	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1753		1848
1754	# mit "rum" bekleckern, nicht	1849	# mit "rum" bekleckern, nicht
1755	$self->_create_random_map (	1850	$self->_create_random_map (
1756	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},	1851	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1757	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},	1852	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1758	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},	1853	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1759	$rmp->{exit_on_final_map},	1854	$rmp->{exit_on_final_map},
1760	$rmp->{xsize}, $rmp->{ysize},	1855	$rmp->{xsize}, $rmp->{ysize},
1761	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},	1856	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1762	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},	1857	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
…		…
1777		1872
1778	sub register {	1873	sub register {
1779	my (undef, $regex, $prio) = @_;	1874	my (undef, $regex, $prio) = @_;
1780	my $pkg = caller;	1875	my $pkg = caller;
1781		1876
1782	no strict;
1783	push @{"$pkg\::ISA"}, __PACKAGE__;	1877	push @{"$pkg\::ISA"}, __PACKAGE__;
1784		1878
1785	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	1879	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1786	}	1880	}
1787		1881
1788	# also paths starting with '/'	1882	# also paths starting with '/'
1789	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	1883	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1790		1884
1791	sub thawer_merge {	1885	sub thawer_merge {
1792	my ($self, $merge) = @_;	1886	my ($self, $merge) = @_;
1793		1887
1794	# we have to keep some variables in memory intact	1888	# we have to keep some variables in memory intact
…		…
1799	}	1893	}
1800		1894
1801	sub normalise {	1895	sub normalise {
1802	my ($path, $base) = @_;	1896	my ($path, $base) = @_;
1803		1897
1804	$path = "$path"; # make sure its a string	1898	$path = "$path"; # make sure it's a string
1805		1899
1806	$path =~ s/\.map$//;	1900	$path =~ s/\.map$//;
1807		1901
1808	# map plan:	1902	# map plan:
1809	#	1903	#
…		…
1848	$self->init; # pass $1 etc.	1942	$self->init; # pass $1 etc.
1849	return $self;	1943	return $self;
1850	}	1944	}
1851	}	1945	}
1852		1946
1853	Carp::cluck "unable to resolve path '$path' (base '$base').";	1947	Carp::cluck "unable to resolve path '$path' (base '$base')";
1854	()	1948	()
1855	}	1949	}
1856		1950
1857	sub init {	1951	sub init {
1858	my ($self) = @_;	1952	my ($self) = @_;
…		…
1980	}	2074	}
1981		2075
1982	sub find;	2076	sub find;
1983	sub find {	2077	sub find {
1984	my ($path, $origin) = @_;	2078	my ($path, $origin) = @_;
		2079
		2080	cf::cede_to_tick;
1985		2081
1986	$path = normalise $path, $origin && $origin->path;	2082	$path = normalise $path, $origin && $origin->path;
1987		2083
1988	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2084	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1989	my $guard2 = cf::lock_acquire "map_find:$path";	2085	my $guard2 = cf::lock_acquire "map_find:$path";
…		…
2008		2104
2009	$cf::MAP{$path} = $map	2105	$cf::MAP{$path} = $map
2010	}	2106	}
2011	}	2107	}
2012		2108
2013	sub pre_load { }	2109	sub pre_load { }
2014	sub post_load { }	2110	#sub post_load { } # XS
2015		2111
2016	sub load {	2112	sub load {
2017	my ($self) = @_;	2113	my ($self) = @_;
2018		2114
2019	local $self->{deny_reset} = 1; # loading can take a long time	2115	local $self->{deny_reset} = 1; # loading can take a long time
…		…
2076	}	2172	}
2077		2173
2078	$self->post_load;	2174	$self->post_load;
2079	}	2175	}
2080		2176
		2177	# customize the map for a given player, i.e.
		2178	# return the _real_ map. used by e.g. per-player
		2179	# maps to change the path to ~playername/mappath
2081	sub customise_for {	2180	sub customise_for {
2082	my ($self, $ob) = @_;	2181	my ($self, $ob) = @_;
2083		2182
2084	return find "~" . $ob->name . "/" . $self->{path}	2183	return find "~" . $ob->name . "/" . $self->{path}
2085	if $self->per_player;	2184	if $self->per_player;
…		…
2101	or next;	2200	or next;
2102	$neigh = find $neigh, $map	2201	$neigh = find $neigh, $map
2103	or next;	2202	or next;
2104	$neigh->load;	2203	$neigh->load;
2105		2204
		2205	# now find the diagonal neighbours
2106	push @neigh,	2206	push @neigh,
2107	[$neigh->tile_path (($_ + 3) % 4), $neigh],	2207	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2108	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2208	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2109	}	2209	}
2110		2210
…		…
2117	}	2217	}
2118		2218
2119	sub find_sync {	2219	sub find_sync {
2120	my ($path, $origin) = @_;	2220	my ($path, $origin) = @_;
2121		2221
2122	cf::sync_job { find $path, $origin }	2222	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
		2223	if $Coro::current == $Coro::main;
		2224
		2225	find $path, $origin
2123	}	2226	}
2124		2227
2125	sub do_load_sync {	2228	sub do_load_sync {
2126	my ($map) = @_;	2229	my ($map) = @_;
2127		2230
2128	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2231	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2129	if $Coro::current == $Coro::main;	2232	if $Coro::current == $Coro::main;
2130		2233
2131	cf::sync_job { $map->load };	2234	$map->load;
2132	}	2235	}
2133		2236
2134	our %MAP_PREFETCH;	2237	our %MAP_PREFETCH;
2135	our $MAP_PREFETCHER = undef;	2238	our $MAP_PREFETCHER = undef;
2136		2239
…		…
2162	$MAP_PREFETCHER->prio (6);	2265	$MAP_PREFETCHER->prio (6);
2163		2266
2164	()	2267	()
2165	}	2268	}
2166		2269
		2270	# common code, used by both ->save and ->swapout
2167	sub save {	2271	sub _save {
2168	my ($self) = @_;	2272	my ($self) = @_;
2169
2170	my $lock = cf::lock_acquire "map_data:$self->{path}";
2171		2273
2172	$self->{last_save} = $cf::RUNTIME;	2274	$self->{last_save} = $cf::RUNTIME;
2173		2275
2174	return unless $self->dirty;	2276	return unless $self->dirty;
2175		2277
…		…
2195	} else {	2297	} else {
2196	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);	2298	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2197	}	2299	}
2198	}	2300	}
2199		2301
		2302	sub save {
		2303	my ($self) = @_;
		2304
		2305	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2306
		2307	$self->_save;
		2308	}
		2309
2200	sub swap_out {	2310	sub swap_out {
2201	my ($self) = @_;	2311	my ($self) = @_;
2202		2312
2203	# save first because save cedes
2204	$self->save;
2205
2206	my $lock = cf::lock_acquire "map_data:$self->{path}";	2313	my $lock = cf::lock_acquire "map_data:$self->{path}";
2207		2314
2208	return if $self->players;
2209	return if $self->in_memory != cf::MAP_ACTIVE;	2315	return if $self->in_memory != cf::MAP_ACTIVE;
2210	return if $self->{deny_save};	2316	return if $self->{deny_save};
		2317	return if $self->players;
2211		2318
		2319	# first deactivate the map and "unlink" it from the core
		2320	$self->deactivate;
		2321	$_->clear_links_to ($self) for values %cf::MAP;
2212	$self->in_memory (cf::MAP_SWAPPED);	2322	$self->in_memory (cf::MAP_SWAPPED);
		2323
		2324	# then atomically save
		2325	$self->_save;
		2326
		2327	# then free the map
		2328	$self->clear;
		2329	}
		2330
		2331	sub reset_at {
		2332	my ($self) = @_;
		2333
		2334	# TODO: safety, remove and allow resettable per-player maps
		2335	return 1e99 if $self->{deny_reset};
		2336
		2337	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
		2338	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
		2339
		2340	$time + $to
		2341	}
		2342
		2343	sub should_reset {
		2344	my ($self) = @_;
		2345
		2346	$self->reset_at <= $cf::RUNTIME
		2347	}
		2348
		2349	sub reset {
		2350	my ($self) = @_;
		2351
		2352	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2353
		2354	return if $self->players;
		2355
		2356	cf::trace "resetting map ", $self->path, "\n";
		2357
		2358	$self->in_memory (cf::MAP_SWAPPED);
		2359
		2360	# need to save uniques path
		2361	unless ($self->{deny_save}) {
		2362	my $uniq = $self->uniq_path; utf8::encode $uniq;
		2363
		2364	$self->_save_objects ($uniq, cf::IO_UNIQUES)
		2365	if $uniq;
		2366	}
		2367
		2368	delete $cf::MAP{$self->path};
2213		2369
2214	$self->deactivate;	2370	$self->deactivate;
2215	$_->clear_links_to ($self) for values %cf::MAP;	2371	$_->clear_links_to ($self) for values %cf::MAP;
2216	$self->clear;	2372	$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		2373
2262	$self->unlink_save;	2374	$self->unlink_save;
2263	$self->destroy;	2375	$self->destroy;
2264	}	2376	}
2265		2377
…		…
2273		2385
2274	delete $cf::MAP{$self->path};	2386	delete $cf::MAP{$self->path};
2275		2387
2276	$self->unlink_save;	2388	$self->unlink_save;
2277		2389
2278	bless $self, "cf::map";	2390	bless $self, "cf::map::wrap";
2279	delete $self->{deny_reset};	2391	delete $self->{deny_reset};
2280	$self->{deny_save} = 1;	2392	$self->{deny_save} = 1;
2281	$self->reset_timeout (1);	2393	$self->reset_timeout (1);
2282	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2394	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2283		2395
…		…
2340	: normalise $_	2452	: normalise $_
2341	} @{ aio_readdir $UNIQUEDIR or [] }	2453	} @{ aio_readdir $UNIQUEDIR or [] }
2342	]	2454	]
2343	}	2455	}
2344		2456
		2457	=item cf::map::static_maps
		2458
		2459	Returns an arrayref if paths of all static maps (all preinstalled F<.map>
		2460	file in the shared directory excluding F</styles> and F</editor>). May
		2461	block.
		2462
		2463	=cut
		2464
		2465	sub static_maps() {
		2466	my @dirs = "";
		2467	my @maps;
		2468
		2469	while (@dirs) {
		2470	my $dir = shift @dirs;
		2471
		2472	next if $dir eq "/styles" || $dir eq "/editor";
		2473
		2474	my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
		2475	or return;
		2476
		2477	for (@$files) {
		2478	s/\.map$// or next;
		2479	utf8::decode $_;
		2480	push @maps, "$dir/$_";
		2481	}
		2482
		2483	push @dirs, map "$dir/$_", @$dirs;
		2484	}
		2485
		2486	\@maps
		2487	}
		2488
2345	=back	2489	=back
2346		2490
2347	=head3 cf::object	2491	=head3 cf::object
2348		2492
2349	=cut	2493	=cut
…		…
2481		2625
2482	Freezes the player and moves him/her to a special map (C<{link}>).	2626	Freezes the player and moves him/her to a special map (C<{link}>).
2483		2627
2484	The player should be reasonably safe there for short amounts of time (e.g.	2628	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,	2629	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	2630	though, as the player cannot control the character while it is on the link
2487	map.	2631	map.
2488		2632
2489	Will never block.	2633	Will never block.
2490		2634
2491	=item $player_object->leave_link ($map, $x, $y)	2635	=item $player_object->leave_link ($map, $x, $y)
…		…
2512	sub cf::object::player::enter_link {	2656	sub cf::object::player::enter_link {
2513	my ($self) = @_;	2657	my ($self) = @_;
2514		2658
2515	$self->deactivate_recursive;	2659	$self->deactivate_recursive;
2516		2660
		2661	++$self->{_link_recursion};
		2662
2517	return if UNIVERSAL::isa $self->map, "ext::map_link";	2663	return if UNIVERSAL::isa $self->map, "ext::map_link";
2518		2664
2519	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2665	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2520	if $self->map && $self->map->{path} ne "{link}";	2666	if $self->map && $self->map->{path} ne "{link}";
2521		2667
2522	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2668	$self->enter_map ($LINK_MAP || link_map, 3, 3);
2523	}	2669	}
2524		2670
2525	sub cf::object::player::leave_link {	2671	sub cf::object::player::leave_link {
2526	my ($self, $map, $x, $y) = @_;	2672	my ($self, $map, $x, $y) = @_;
2527		2673
…		…
2544	($x, $y) = (-1, -1)	2690	($x, $y) = (-1, -1)
2545	unless (defined $x) && (defined $y);	2691	unless (defined $x) && (defined $y);
2546		2692
2547	# use -1 or undef as default coordinates, not 0, 0	2693	# use -1 or undef as default coordinates, not 0, 0
2548	($x, $y) = ($map->enter_x, $map->enter_y)	2694	($x, $y) = ($map->enter_x, $map->enter_y)
2549	if $x <=0 && $y <= 0;	2695	if $x <= 0 && $y <= 0;
2550		2696
2551	$map->load;	2697	$map->load;
2552	$map->load_neighbours;	2698	$map->load_neighbours;
2553		2699
2554	return unless $self->contr->active;	2700	return unless $self->contr->active;
2555		2701
2556	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2702	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2557	$self->enter_map ($map, $x, $y);	2703	if ($self->enter_map ($map, $x, $y)) {
2558		2704	# entering was successful
		2705	delete $self->{_link_recursion};
2559	# only activate afterwards, to support waiting in hooks	2706	# only activate afterwards, to support waiting in hooks
2560	$self->activate_recursive;	2707	$self->activate_recursive;
2561	}	2708	}
2562		2709
		2710	}
		2711
2563	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2712	=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2564		2713
2565	Moves the player to the given map-path and coordinates by first freezing	2714	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	2715	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	2716	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	2717	the new (success) or old (failed) map position. In either case, $done will
…		…
2575		2724
2576	our $GOTOGEN;	2725	our $GOTOGEN;
2577		2726
2578	sub cf::object::player::goto {	2727	sub cf::object::player::goto {
2579	my ($self, $path, $x, $y, $check, $done) = @_;	2728	my ($self, $path, $x, $y, $check, $done) = @_;
		2729
		2730	if ($self->{_link_recursion} >= $MAX_LINKS) {
		2731	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
		2732	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
		2733	($path, $x, $y) = @$EMERGENCY_POSITION;
		2734	}
2580		2735
2581	# do generation counting so two concurrent goto's will be executed in-order	2736	# do generation counting so two concurrent goto's will be executed in-order
2582	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2737	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2583		2738
2584	$self->enter_link;	2739	$self->enter_link;
…		…
2608	my $map = eval {	2763	my $map = eval {
2609	my $map = defined $path ? cf::map::find $path : undef;	2764	my $map = defined $path ? cf::map::find $path : undef;
2610		2765
2611	if ($map) {	2766	if ($map) {
2612	$map = $map->customise_for ($self);	2767	$map = $map->customise_for ($self);
2613	$map = $check->($map) if $check && $map;	2768	$map = $check->($map, $x, $y, $self) if $check && $map;
2614	} else {	2769	} else {
2615	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);	2770	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2616	}	2771	}
2617		2772
2618	$map	2773	$map
…		…
2626	if ($gen == $self->{_goto_generation}) {	2781	if ($gen == $self->{_goto_generation}) {
2627	delete $self->{_goto_generation};	2782	delete $self->{_goto_generation};
2628	$self->leave_link ($map, $x, $y);	2783	$self->leave_link ($map, $x, $y);
2629	}	2784	}
2630		2785
2631	$done->() if $done;	2786	$done->($self) if $done;
2632	})->prio (1);	2787	})->prio (1);
2633	}	2788	}
2634		2789
2635	=item $player_object->enter_exit ($exit_object)	2790	=item $player_object->enter_exit ($exit_object)
2636		2791
…		…
2729	$self->message ("Something went wrong deep within the deliantra server. "	2884	$self->message ("Something went wrong deep within the deliantra server. "
2730	. "I'll try to bring you back to the map you were before. "	2885	. "I'll try to bring you back to the map you were before. "
2731	. "Please report this to the dungeon master!",	2886	. "Please report this to the dungeon master!",
2732	cf::NDI_UNIQUE | cf::NDI_RED);	2887	cf::NDI_UNIQUE | cf::NDI_RED);
2733		2888
2734	warn "ERROR in enter_exit: $@";	2889	error "ERROR in enter_exit: $@";
2735	$self->leave_link;	2890	$self->leave_link;
2736	}	2891	}
2737	})->prio (1);	2892	})->prio (1);
2738	}	2893	}
2739		2894
…		…
2751	sub cf::client::send_drawinfo {	2906	sub cf::client::send_drawinfo {
2752	my ($self, $text, $flags) = @_;	2907	my ($self, $text, $flags) = @_;
2753		2908
2754	utf8::encode $text;	2909	utf8::encode $text;
2755	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2910	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
		2911	}
		2912
		2913	=item $client->send_big_packet ($pkt)
		2914
		2915	Like C<send_packet>, but tries to compress large packets, and fragments
		2916	them as required.
		2917
		2918	=cut
		2919
		2920	our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
		2921
		2922	sub cf::client::send_big_packet {
		2923	my ($self, $pkt) = @_;
		2924
		2925	# try lzf for large packets
		2926	$pkt = "lzf " . Compress::LZF::compress $pkt
		2927	if 1024 <= length $pkt and $self->{can_lzf};
		2928
		2929	# split very large packets
		2930	if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
		2931	$self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
		2932	$pkt = "frag";
		2933	}
		2934
		2935	$self->send_packet ($pkt);
2756	}	2936	}
2757		2937
2758	=item $client->send_msg ($channel, $msg, $color, [extra...])	2938	=item $client->send_msg ($channel, $msg, $color, [extra...])
2759		2939
2760	Send a drawinfo or msg packet to the client, formatting the msg for the	2940	Send a drawinfo or msg packet to the client, formatting the msg for the
…		…
2764		2944
2765	=cut	2945	=cut
2766		2946
2767	# non-persistent channels (usually the info channel)	2947	# non-persistent channels (usually the info channel)
2768	our %CHANNEL = (	2948	our %CHANNEL = (
		2949	"c/motd" => {
		2950	id => "infobox",
		2951	title => "MOTD",
		2952	reply => undef,
		2953	tooltip => "The message of the day",
		2954	},
2769	"c/identify" => {	2955	"c/identify" => {
2770	id => "infobox",	2956	id => "infobox",
2771	title => "Identify",	2957	title => "Identify",
2772	reply => undef,	2958	reply => undef,
2773	tooltip => "Items recently identified",	2959	tooltip => "Items recently identified",
…		…
2775	"c/examine" => {	2961	"c/examine" => {
2776	id => "infobox",	2962	id => "infobox",
2777	title => "Examine",	2963	title => "Examine",
2778	reply => undef,	2964	reply => undef,
2779	tooltip => "Signs and other items you examined",	2965	tooltip => "Signs and other items you examined",
		2966	},
		2967	"c/shopinfo" => {
		2968	id => "infobox",
		2969	title => "Shop Info",
		2970	reply => undef,
		2971	tooltip => "What your bargaining skill tells you about the shop",
2780	},	2972	},
2781	"c/book" => {	2973	"c/book" => {
2782	id => "infobox",	2974	id => "infobox",
2783	title => "Book",	2975	title => "Book",
2784	reply => undef,	2976	reply => undef,
…		…
2900	my $pkt = "msg "	3092	my $pkt = "msg "
2901	. $self->{json_coder}->encode (	3093	. $self->{json_coder}->encode (
2902	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]	3094	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2903	);	3095	);
2904		3096
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);	3097	$self->send_big_packet ($pkt);
2916	}	3098	}
2917		3099
2918	=item $client->ext_msg ($type, @msg)	3100	=item $client->ext_msg ($type, @msg)
2919		3101
2920	Sends an ext event to the client.	3102	Sends an ext event to the client.
…		…
2923		3105
2924	sub cf::client::ext_msg($$@) {	3106	sub cf::client::ext_msg($$@) {
2925	my ($self, $type, @msg) = @_;	3107	my ($self, $type, @msg) = @_;
2926		3108
2927	if ($self->extcmd == 2) {	3109	if ($self->extcmd == 2) {
2928	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3110	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2929	} elsif ($self->extcmd == 1) { # TODO: remove	3111	} elsif ($self->extcmd == 1) { # TODO: remove
2930	push @msg, msgtype => "event_$type";	3112	push @msg, msgtype => "event_$type";
2931	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3113	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2932	}	3114	}
2933	}	3115	}
2934		3116
2935	=item $client->ext_reply ($msgid, @msg)	3117	=item $client->ext_reply ($msgid, @msg)
2936		3118
…		…
2940		3122
2941	sub cf::client::ext_reply($$@) {	3123	sub cf::client::ext_reply($$@) {
2942	my ($self, $id, @msg) = @_;	3124	my ($self, $id, @msg) = @_;
2943		3125
2944	if ($self->extcmd == 2) {	3126	if ($self->extcmd == 2) {
2945	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));	3127	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2946	} elsif ($self->extcmd == 1) {	3128	} elsif ($self->extcmd == 1) {
2947	#TODO: version 1, remove	3129	#TODO: version 1, remove
2948	unshift @msg, msgtype => "reply", msgid => $id;	3130	unshift @msg, msgtype => "reply", msgid => $id;
2949	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3131	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2950	}	3132	}
2951	}	3133	}
2952		3134
2953	=item $success = $client->query ($flags, "text", \&cb)	3135	=item $success = $client->query ($flags, "text", \&cb)
2954		3136
…		…
3025		3207
3026	$ns->ext_reply ($reply, @reply)	3208	$ns->ext_reply ($reply, @reply)
3027	if $reply;	3209	if $reply;
3028		3210
3029	} else {	3211	} else {
3030	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3212	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3031	}	3213	}
3032		3214
3033	cf::override;	3215	cf::override;
3034	},	3216	},
3035	);	3217	);
…		…
3055		3237
3056	$coro	3238	$coro
3057	}	3239	}
3058		3240
3059	cf::client->attach (	3241	cf::client->attach (
3060	on_destroy => sub {	3242	on_client_destroy => sub {
3061	my ($ns) = @_;	3243	my ($ns) = @_;
3062		3244
3063	$_->cancel for values %{ (delete $ns->{_coro}) || {} };	3245	$_->cancel for values %{ (delete $ns->{_coro}) || {} };
3064	},	3246	},
3065	);	3247	);
…		…
3081	our $safe_hole = new Safe::Hole;	3263	our $safe_hole = new Safe::Hole;
3082		3264
3083	$SIG{FPE} = 'IGNORE';	3265	$SIG{FPE} = 'IGNORE';
3084		3266
3085	$safe->permit_only (Opcode::opset qw(	3267	$safe->permit_only (Opcode::opset qw(
3086	:base_core :base_mem :base_orig :base_math	3268	:base_core :base_mem :base_orig :base_math :base_loop
3087	grepstart grepwhile mapstart mapwhile	3269	grepstart grepwhile mapstart mapwhile
3088	sort time	3270	sort time
3089	));	3271	));
3090		3272
3091	# here we export the classes and methods available to script code	3273	# here we export the classes and methods available to script code
…		…
3116	decrease split destroy change_exp value msg lore send_msg)],	3298	decrease split destroy change_exp value msg lore send_msg)],
3117	["cf::object::player" => qw(player)],	3299	["cf::object::player" => qw(player)],
3118	["cf::player" => qw(peaceful send_msg)],	3300	["cf::player" => qw(peaceful send_msg)],
3119	["cf::map" => qw(trigger)],	3301	["cf::map" => qw(trigger)],
3120	) {	3302	) {
3121	no strict 'refs';
3122	my ($pkg, @funs) = @$_;	3303	my ($pkg, @funs) = @$_;
3123	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3304	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3124	for @funs;	3305	for @funs;
3125	}	3306	}
3126		3307
…		…
3143	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3324	$qcode =~ s/"/‟/g; # not allowed in #line filenames
3144	$qcode =~ s/\n/\\n/g;	3325	$qcode =~ s/\n/\\n/g;
3145		3326
3146	%vars = (_dummy => 0) unless %vars;	3327	%vars = (_dummy => 0) unless %vars;
3147		3328
		3329	my @res;
3148	local $_;	3330	local $_;
3149	local @safe::cf::_safe_eval_args = values %vars;
3150		3331
3151	my $eval =	3332	my $eval =
3152	"do {\n"	3333	"do {\n"
3153	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"	3334	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3154	. "#line 0 \"{$qcode}\"\n"	3335	. "#line 0 \"{$qcode}\"\n"
3155	. $code	3336	. $code
3156	. "\n}"	3337	. "\n}"
3157	;	3338	;
3158		3339
		3340	if ($CFG{safe_eval}) {
3159	sub_generation_inc;	3341	sub_generation_inc;
		3342	local @safe::cf::_safe_eval_args = values %vars;
3160	my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);	3343	@res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3161	sub_generation_inc;	3344	sub_generation_inc;
		3345	} else {
		3346	local @cf::_safe_eval_args = values %vars;
		3347	@res = wantarray ? eval eval : scalar eval $eval;
		3348	}
3162		3349
3163	if ($@) {	3350	if ($@) {
3164	warn "$@";	3351	warn "$@",
3165	warn "while executing safe code '$code'\n";	3352	"while executing safe code '$code'\n",
3166	warn "with arguments " . (join " ", %vars) . "\n";	3353	"with arguments " . (join " ", %vars) . "\n";
3167	}	3354	}
3168		3355
3169	wantarray ? @res : $res[0]	3356	wantarray ? @res : $res[0]
3170	}	3357	}
3171		3358
…		…
3185	=cut	3372	=cut
3186		3373
3187	sub register_script_function {	3374	sub register_script_function {
3188	my ($fun, $cb) = @_;	3375	my ($fun, $cb) = @_;
3189		3376
3190	no strict 'refs';	3377	$fun = "safe::$fun" if $CFG{safe_eval};
3191	*{"safe::$fun"} = $safe_hole->wrap ($cb);	3378	*$fun = $safe_hole->wrap ($cb);
3192	}	3379	}
3193		3380
3194	=back	3381	=back
3195		3382
3196	=cut	3383	=cut
…		…
3205	# for this (global event?)	3392	# for this (global event?)
3206	%ext::player_env::MUSIC_FACE_CACHE = ();	3393	%ext::player_env::MUSIC_FACE_CACHE = ();
3207		3394
3208	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3395	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3209		3396
3210	warn "loading facedata from $path\n";	3397	trace "loading facedata from $path\n";
3211		3398
3212	my $facedata;
3213	0 < aio_load $path, $facedata	3399	0 < aio_load $path, my $facedata
3214	or die "$path: $!";	3400	or die "$path: $!";
3215		3401
3216	$facedata = Coro::Storable::thaw $facedata;	3402	$facedata = Coro::Storable::thaw $facedata;
3217		3403
3218	$facedata->{version} == 2	3404	$facedata->{version} == 2
3219	or cf::cleanup "$path: version mismatch, cannot proceed.";	3405	or cf::cleanup "$path: version mismatch, cannot proceed.";
3220		3406
3221	# patch in the exptable	3407	# patch in the exptable
		3408	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3222	$facedata->{resource}{"res/exp_table"} = {	3409	$facedata->{resource}{"res/exp_table"} = {
3223	type => FT_RSRC,	3410	type => FT_RSRC,
3224	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),	3411	data => $exp_table,
		3412	hash => (Digest::MD5::md5 $exp_table),
3225	};	3413	};
3226	cf::cede_to_tick;	3414	cf::cede_to_tick;
3227		3415
3228	{	3416	{
3229	my $faces = $facedata->{faceinfo};	3417	my $faces = $facedata->{faceinfo};
…		…
3231	while (my ($face, $info) = each %$faces) {	3419	while (my ($face, $info) = each %$faces) {
3232	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3420	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3233		3421
3234	cf::face::set_visibility $idx, $info->{visibility};	3422	cf::face::set_visibility $idx, $info->{visibility};
3235	cf::face::set_magicmap $idx, $info->{magicmap};	3423	cf::face::set_magicmap $idx, $info->{magicmap};
3236	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};	3424	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3237	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};	3425	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3238		3426
3239	cf::cede_to_tick;	3427	cf::cede_to_tick;
3240	}	3428	}
3241		3429
3242	while (my ($face, $info) = each %$faces) {	3430	while (my ($face, $info) = each %$faces) {
…		…
3247		3435
3248	if (my $smooth = cf::face::find $info->{smooth}) {	3436	if (my $smooth = cf::face::find $info->{smooth}) {
3249	cf::face::set_smooth $idx, $smooth;	3437	cf::face::set_smooth $idx, $smooth;
3250	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3438	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3251	} else {	3439	} else {
3252	warn "smooth face '$info->{smooth}' not found for face '$face'";	3440	error "smooth face '$info->{smooth}' not found for face '$face'";
3253	}	3441	}
3254		3442
3255	cf::cede_to_tick;	3443	cf::cede_to_tick;
3256	}	3444	}
3257	}	3445	}
…		…
3266		3454
3267	cf::anim::invalidate_all; # d'oh	3455	cf::anim::invalidate_all; # d'oh
3268	}	3456	}
3269		3457
3270	{	3458	{
3271	# TODO: for gcfclient pleasure, we should give resources
3272	# that gcfclient doesn't grok a >10000 face index.
3273	my $res = $facedata->{resource};	3459	my $res = $facedata->{resource};
3274		3460
3275	while (my ($name, $info) = each %$res) {	3461	while (my ($name, $info) = each %$res) {
3276	if (defined $info->{type}) {	3462	if (defined $info->{type}) {
3277	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3463	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3278	my $data;
3279		3464
3280	if ($info->{type} & 1) {	3465	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};	3466	cf::face::set_type $idx, $info->{type};
3295	} else {	3467	} else {
3296	$RESOURCE{$name} = $info;	3468	$RESOURCE{$name} = $info; # unused
3297	}	3469	}
3298		3470
3299	cf::cede_to_tick;	3471	cf::cede_to_tick;
3300	}	3472	}
3301	}	3473	}
3302		3474
3303	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3475	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3304		3476
3305	1	3477	1
3306	}	3478	}
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		3479
3328	register_exticmd fx_want => sub {	3480	register_exticmd fx_want => sub {
3329	my ($ns, $want) = @_;	3481	my ($ns, $want) = @_;
3330		3482
3331	while (my ($k, $v) = each %$want) {	3483	while (my ($k, $v) = each %$want) {
…		…
3370	sub reload_treasures {	3522	sub reload_treasures {
3371	load_resource_file "$DATADIR/treasures"	3523	load_resource_file "$DATADIR/treasures"
3372	or die "unable to load treasurelists\n";	3524	or die "unable to load treasurelists\n";
3373	}	3525	}
3374		3526
		3527	sub reload_sound {
		3528	trace "loading sound config from $DATADIR/sound\n";
		3529
		3530	0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
		3531	or die "$DATADIR/sound $!";
		3532
		3533	my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
		3534
		3535	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3536	my $sound = $soundconf->{compat}[$_]
		3537	or next;
		3538
		3539	my $face = cf::face::find "sound/$sound->[1]";
		3540	cf::sound::set $sound->[0] => $face;
		3541	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3542	}
		3543
		3544	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3545	my $face = cf::face::find "sound/$v";
		3546	cf::sound::set $k => $face;
		3547	}
		3548	}
		3549
3375	sub reload_resources {	3550	sub reload_resources {
3376	warn "reloading resource files...\n";	3551	trace "reloading resource files...\n";
3377		3552
		3553	reload_exp_table;
		3554	reload_materials;
3378	reload_facedata;	3555	reload_facedata;
		3556	reload_sound;
3379	reload_archetypes;	3557	reload_archetypes;
3380	reload_regions;	3558	reload_regions;
3381	reload_treasures;	3559	reload_treasures;
3382		3560
3383	warn "finished reloading resource files\n";	3561	trace "finished reloading resource files\n";
3384	}	3562	}
3385		3563
3386	sub reload_config {	3564	sub reload_config {
3387	open my $fh, "<:utf8", "$CONFDIR/config"	3565	trace "reloading config file...\n";
3388	or return;
3389		3566
3390	local $/;	3567	0 < aio_load "$CONFDIR/config", my $config
3391	*CFG = YAML::Load <$fh>;	3568	or die "$CONFDIR/config: $!";
3392		3569
		3570	utf8::decode $config;
		3571	*CFG = yaml_load $config;
		3572
3393	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3573	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3394		3574
3395	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3575	$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};	3576	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3397		3577
3398	if (exists $CFG{mlockall}) {	3578	if (exists $CFG{mlockall}) {
…		…
3422	seek $fh, 0, 0;	3602	seek $fh, 0, 0;
3423	print $fh $$;	3603	print $fh $$;
3424	}	3604	}
3425		3605
3426	sub main_loop {	3606	sub main_loop {
3427	warn "EV::loop starting\n";	3607	trace "EV::loop starting\n";
3428	if (1) {	3608	if (1) {
3429	EV::loop;	3609	EV::loop;
3430	}	3610	}
3431	warn "EV::loop returned\n";	3611	trace "EV::loop returned\n";
3432	goto &main_loop unless $REALLY_UNLOOP;	3612	goto &main_loop unless $REALLY_UNLOOP;
3433	}	3613	}
3434		3614
3435	sub main {	3615	sub main {
3436	cf::init_globals; # initialise logging	3616	cf::init_globals; # initialise logging
3437		3617
3438	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3618	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3439	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3619	LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3440	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3620	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3441	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3621	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		3622
3448	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3623	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3449		3624
3450	# we must not ever block the main coroutine	3625	# we must not ever block the main coroutine
3451	local $Coro::idle = sub {	3626	local $Coro::idle = sub {
…		…
3457	};	3632	};
3458		3633
3459	evthread_start IO::AIO::poll_fileno;	3634	evthread_start IO::AIO::poll_fileno;
3460		3635
3461	cf::sync_job {	3636	cf::sync_job {
		3637	cf::incloader::init ();
		3638
		3639	cf::init_anim;
		3640	cf::init_attackmess;
		3641	cf::init_dynamic;
		3642
		3643	cf::load_settings;
		3644
3462	reload_resources;	3645	reload_resources;
3463	reload_config;	3646	reload_config;
3464	db_init;	3647	db_init;
3465		3648
3466	cf::load_settings;
3467	cf::load_materials;
3468	cf::init_uuid;	3649	cf::init_uuid;
3469	cf::init_signals;	3650	cf::init_signals;
3470	cf::init_commands;
3471	cf::init_skills;	3651	cf::init_skills;
3472		3652
3473	cf::init_beforeplay;	3653	cf::init_beforeplay;
3474		3654
3475	atomic;	3655	atomic;
…		…
3483	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3663	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3484		3664
3485	(pop @POST_INIT)->(0) while @POST_INIT;	3665	(pop @POST_INIT)->(0) while @POST_INIT;
3486	};	3666	};
3487		3667
		3668	cf::object::thawer::errors_are_fatal 0;
		3669	info "parse errors in files are no longer fatal from this point on.\n";
		3670
		3671	my $free_main; $free_main = EV::idle sub {
		3672	undef $free_main;
		3673	undef &main; # free gobs of memory :)
		3674	};
		3675
3488	main_loop;	3676	goto &main_loop;
3489	}	3677	}
3490		3678
3491	#############################################################################	3679	#############################################################################
3492	# initialisation and cleanup	3680	# initialisation and cleanup
3493		3681
3494	# install some emergency cleanup handlers	3682	# install some emergency cleanup handlers
3495	BEGIN {	3683	BEGIN {
3496	our %SIGWATCHER = ();	3684	our %SIGWATCHER = ();
3497	for my $signal (qw(INT HUP TERM)) {	3685	for my $signal (qw(INT HUP TERM)) {
3498	$SIGWATCHER{$signal} = EV::signal $signal, sub {	3686	$SIGWATCHER{$signal} = AE::signal $signal, sub {
3499	cf::cleanup "SIG$signal";	3687	cf::cleanup "SIG$signal";
3500	};	3688	};
3501	}	3689	}
3502	}	3690	}
3503		3691
3504	sub write_runtime_sync {	3692	sub write_runtime_sync {
		3693	my $t0 = AE::time;
		3694
3505	# first touch the runtime file to show we are still running:	3695	# first touch the runtime file to show we are still running:
3506	# the fsync below can take a very very long time.	3696	# the fsync below can take a very very long time.
3507		3697
3508	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;	3698	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3509		3699
3510	my $guard = cf::lock_acquire "write_runtime";	3700	my $guard = cf::lock_acquire "write_runtime";
3511		3701
3512	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644	3702	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3513	or return;	3703	or return;
3514		3704
3515	my $value = $cf::RUNTIME + 90 + 10;	3705	my $value = $cf::RUNTIME + 90 + 10;
3516	# 10 is the runtime save interval, for a monotonic clock	3706	# 10 is the runtime save interval, for a monotonic clock
3517	# 60 allows for the watchdog to kill the server.	3707	# 60 allows for the watchdog to kill the server.
…		…
3530	or return;	3720	or return;
3531		3721
3532	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3722	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3533	and return;	3723	and return;
3534		3724
3535	warn "runtime file written.\n";	3725	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3536		3726
3537	1	3727	1
3538	}	3728	}
3539		3729
3540	our $uuid_lock;	3730	our $uuid_lock;
…		…
3552	or return;	3742	or return;
3553		3743
3554	my $value = uuid_seq uuid_cur;	3744	my $value = uuid_seq uuid_cur;
3555		3745
3556	unless ($value) {	3746	unless ($value) {
3557	warn "cowardly refusing to write zero uuid value!\n";	3747	info "cowardly refusing to write zero uuid value!\n";
3558	return;	3748	return;
3559	}	3749	}
3560		3750
3561	my $value = uuid_str $value + $uuid_skip;	3751	my $value = uuid_str $value + $uuid_skip;
3562	$uuid_skip = 0;	3752	$uuid_skip = 0;
…		…
3572	or return;	3762	or return;
3573		3763
3574	aio_rename "$uuid~", $uuid	3764	aio_rename "$uuid~", $uuid
3575	and return;	3765	and return;
3576		3766
3577	warn "uuid file written ($value).\n";	3767	trace "uuid file written ($value).\n";
3578		3768
3579	1	3769	1
3580		3770
3581	}	3771	}
3582		3772
…		…
3588	}	3778	}
3589		3779
3590	sub emergency_save() {	3780	sub emergency_save() {
3591	my $freeze_guard = cf::freeze_mainloop;	3781	my $freeze_guard = cf::freeze_mainloop;
3592		3782
3593	warn "emergency_perl_save: enter\n";	3783	info "emergency_perl_save: enter\n";
		3784
		3785	# this is a trade-off: we want to be very quick here, so
		3786	# save all maps without fsync, and later call a global sync
		3787	# (which in turn might be very very slow)
		3788	local $USE_FSYNC = 0;
3594		3789
3595	cf::sync_job {	3790	cf::sync_job {
3596	# this is a trade-off: we want to be very quick here, so	3791	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		3792
3601	# use a peculiar iteration method to avoid tripping on perl	3793	# use a peculiar iteration method to avoid tripping on perl
3602	# refcount bugs in for. also avoids problems with players	3794	# refcount bugs in for. also avoids problems with players
3603	# and maps saved/destroyed asynchronously.	3795	# and maps saved/destroyed asynchronously.
3604	warn "emergency_perl_save: begin player save\n";	3796	info "emergency_perl_save: begin player save\n";
3605	for my $login (keys %cf::PLAYER) {	3797	for my $login (keys %cf::PLAYER) {
3606	my $pl = $cf::PLAYER{$login} or next;	3798	my $pl = $cf::PLAYER{$login} or next;
3607	$pl->valid or next;	3799	$pl->valid or next;
3608	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3800	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3609	$pl->save;	3801	$pl->save;
3610	}	3802	}
3611	warn "emergency_perl_save: end player save\n";	3803	info "emergency_perl_save: end player save\n";
3612		3804
		3805	cf::write_runtime_sync; # external watchdog should not bark
		3806
3613	warn "emergency_perl_save: begin map save\n";	3807	info "emergency_perl_save: begin map save\n";
3614	for my $path (keys %cf::MAP) {	3808	for my $path (keys %cf::MAP) {
3615	my $map = $cf::MAP{$path} or next;	3809	my $map = $cf::MAP{$path} or next;
3616	$map->valid or next;	3810	$map->valid or next;
3617	$map->save;	3811	$map->save;
3618	}	3812	}
3619	warn "emergency_perl_save: end map save\n";	3813	info "emergency_perl_save: end map save\n";
3620		3814
		3815	cf::write_runtime_sync; # external watchdog should not bark
		3816
3621	warn "emergency_perl_save: begin database checkpoint\n";	3817	info "emergency_perl_save: begin database checkpoint\n";
3622	BDB::db_env_txn_checkpoint $DB_ENV;	3818	BDB::db_env_txn_checkpoint $DB_ENV;
3623	warn "emergency_perl_save: end database checkpoint\n";	3819	info "emergency_perl_save: end database checkpoint\n";
3624		3820
3625	warn "emergency_perl_save: begin write uuid\n";	3821	info "emergency_perl_save: begin write uuid\n";
3626	write_uuid_sync 1;	3822	write_uuid_sync 1;
3627	warn "emergency_perl_save: end write uuid\n";	3823	info "emergency_perl_save: end write uuid\n";
		3824
		3825	cf::write_runtime_sync; # external watchdog should not bark
		3826
		3827	trace "emergency_perl_save: syncing database to disk";
		3828	BDB::db_env_txn_checkpoint $DB_ENV;
		3829
		3830	info "emergency_perl_save: starting sync\n";
		3831	IO::AIO::aio_sync sub {
		3832	info "emergency_perl_save: finished sync\n";
		3833	};
		3834
		3835	cf::write_runtime_sync; # external watchdog should not bark
		3836
		3837	trace "emergency_perl_save: flushing outstanding aio requests";
		3838	while (IO::AIO::nreqs || BDB::nreqs) {
		3839	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
		3840	}
		3841
		3842	cf::write_runtime_sync; # external watchdog should not bark
3628	};	3843	};
3629		3844
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";	3845	info "emergency_perl_save: leave\n";
3636	}	3846	}
3637		3847
3638	sub post_cleanup {	3848	sub post_cleanup {
3639	my ($make_core) = @_;	3849	my ($make_core) = @_;
3640		3850
		3851	IO::AIO::flush;
		3852
3641	warn Carp::longmess "post_cleanup backtrace"	3853	error Carp::longmess "post_cleanup backtrace"
3642	if $make_core;	3854	if $make_core;
3643		3855
3644	my $fh = pidfile;	3856	my $fh = pidfile;
3645	unlink $PIDFILE if <$fh> == $$;	3857	unlink $PIDFILE if <$fh> == $$;
3646	}	3858	}
…		…
3666	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	3878	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3667	for my $name (keys %$leaf_symtab) {	3879	for my $name (keys %$leaf_symtab) {
3668	_gv_clear *{"$pkg$name"};	3880	_gv_clear *{"$pkg$name"};
3669	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	3881	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3670	}	3882	}
3671	warn "cleared package $pkg\n";#d#
3672	}	3883	}
3673		3884
3674	sub do_reload_perl() {	3885	sub do_reload_perl() {
3675	# can/must only be called in main	3886	# can/must only be called in main
3676	if ($Coro::current != $Coro::main) {	3887	unless (in_main) {
3677	warn "can only reload from main coroutine";	3888	error "can only reload from main coroutine";
3678	return;	3889	return;
3679	}	3890	}
3680		3891
3681	return if $RELOAD++;	3892	return if $RELOAD++;
3682		3893
3683	my $t1 = EV::time;	3894	my $t1 = AE::time;
3684		3895
3685	while ($RELOAD) {	3896	while ($RELOAD) {
		3897	cf::get_slot 0.1, -1, "reload_perl";
3686	warn "reloading...";	3898	info "reloading...";
3687		3899
3688	warn "entering sync_job";	3900	trace "entering sync_job";
3689		3901
3690	cf::sync_job {	3902	cf::sync_job {
3691	cf::write_runtime_sync; # external watchdog should not bark
3692	cf::emergency_save;	3903	#cf::emergency_save;
3693	cf::write_runtime_sync; # external watchdog should not bark
3694		3904
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";	3905	trace "cancelling all extension coros";
3706	$_->cancel for values %EXT_CORO;	3906	$_->cancel for values %EXT_CORO;
3707	%EXT_CORO = ();	3907	%EXT_CORO = ();
3708		3908
3709	warn "removing commands";	3909	trace "removing commands";
3710	%COMMAND = ();	3910	%COMMAND = ();
3711		3911
3712	warn "removing ext/exti commands";	3912	trace "removing ext/exti commands";
3713	%EXTCMD = ();	3913	%EXTCMD = ();
3714	%EXTICMD = ();	3914	%EXTICMD = ();
3715		3915
3716	warn "unloading/nuking all extensions";	3916	trace "unloading/nuking all extensions";
3717	for my $pkg (@EXTS) {	3917	for my $pkg (@EXTS) {
3718	warn "... unloading $pkg";	3918	trace "... unloading $pkg";
3719		3919
3720	if (my $cb = $pkg->can ("unload")) {	3920	if (my $cb = $pkg->can ("unload")) {
3721	eval {	3921	eval {
3722	$cb->($pkg);	3922	$cb->($pkg);
3723	1	3923	1
3724	} or warn "$pkg unloaded, but with errors: $@";	3924	} or error "$pkg unloaded, but with errors: $@";
3725	}	3925	}
3726		3926
3727	warn "... clearing $pkg";	3927	trace "... clearing $pkg";
3728	clear_package $pkg;	3928	clear_package $pkg;
3729	}	3929	}
3730		3930
3731	warn "unloading all perl modules loaded from $LIBDIR";	3931	trace "unloading all perl modules loaded from $LIBDIR";
3732	while (my ($k, $v) = each %INC) {	3932	while (my ($k, $v) = each %INC) {
3733	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	3933	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3734		3934
3735	warn "... unloading $k";	3935	trace "... unloading $k";
3736	delete $INC{$k};	3936	delete $INC{$k};
3737		3937
3738	$k =~ s/\.pm$//;	3938	$k =~ s/\.pm$//;
3739	$k =~ s/\//::/g;	3939	$k =~ s/\//::/g;
3740		3940
…		…
3743	}	3943	}
3744		3944
3745	clear_package $k;	3945	clear_package $k;
3746	}	3946	}
3747		3947
3748	warn "getting rid of safe::, as good as possible";	3948	trace "getting rid of safe::, as good as possible";
3749	clear_package "safe::$_"	3949	clear_package "safe::$_"
3750	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	3950	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3751		3951
3752	warn "unloading cf.pm \"a bit\"";	3952	trace "unloading cf.pm \"a bit\"";
3753	delete $INC{"cf.pm"};	3953	delete $INC{"cf.pm"};
3754	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	3954	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3755		3955
3756	# don't, removes xs symbols, too,	3956	# don't, removes xs symbols, too,
3757	# and global variables created in xs	3957	# and global variables created in xs
3758	#clear_package __PACKAGE__;	3958	#clear_package __PACKAGE__;
3759		3959
3760	warn "unload completed, starting to reload now";	3960	info "unload completed, starting to reload now";
3761		3961
3762	warn "reloading cf.pm";	3962	trace "reloading cf.pm";
3763	require cf;	3963	require cf;
3764	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3964	cf::_connect_to_perl_1;
3765		3965
3766	warn "loading config and database again";	3966	trace "loading config and database again";
3767	cf::reload_config;	3967	cf::reload_config;
3768		3968
3769	warn "loading extensions";	3969	trace "loading extensions";
3770	cf::load_extensions;	3970	cf::load_extensions;
3771		3971
3772	if ($REATTACH_ON_RELOAD) {	3972	if ($REATTACH_ON_RELOAD) {
3773	warn "reattaching attachments to objects/players";	3973	trace "reattaching attachments to objects/players";
3774	_global_reattach; # objects, sockets	3974	_global_reattach; # objects, sockets
3775	warn "reattaching attachments to maps";	3975	trace "reattaching attachments to maps";
3776	reattach $_ for values %MAP;	3976	reattach $_ for values %MAP;
3777	warn "reattaching attachments to players";	3977	trace "reattaching attachments to players";
3778	reattach $_ for values %PLAYER;	3978	reattach $_ for values %PLAYER;
3779	}	3979	}
3780		3980
3781	warn "running post_init jobs";	3981	trace "running post_init jobs";
3782	(pop @POST_INIT)->(1) while @POST_INIT;	3982	(pop @POST_INIT)->(1) while @POST_INIT;
3783		3983
3784	warn "leaving sync_job";	3984	trace "leaving sync_job";
3785		3985
3786	1	3986	1
3787	} or do {	3987	} or do {
3788	warn $@;	3988	error $@;
3789	cf::cleanup "error while reloading, exiting.";	3989	cf::cleanup "error while reloading, exiting.";
3790	};	3990	};
3791		3991
3792	warn "reloaded";	3992	info "reloaded";
3793	--$RELOAD;	3993	--$RELOAD;
3794	}	3994	}
3795		3995
3796	$t1 = EV::time - $t1;	3996	$t1 = AE::time - $t1;
3797	warn "reload completed in ${t1}s\n";	3997	info "reload completed in ${t1}s\n";
3798	};	3998	};
3799		3999
3800	our $RELOAD_WATCHER; # used only during reload	4000	our $RELOAD_WATCHER; # used only during reload
3801		4001
3802	sub reload_perl() {	4002	sub reload_perl() {
…		…
3804	# coro crashes during coro_state_free->destroy here.	4004	# coro crashes during coro_state_free->destroy here.
3805		4005
3806	$RELOAD_WATCHER ||= cf::async {	4006	$RELOAD_WATCHER ||= cf::async {
3807	Coro::AIO::aio_wait cache_extensions;	4007	Coro::AIO::aio_wait cache_extensions;
3808		4008
3809	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {	4009	$RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3810	do_reload_perl;	4010	do_reload_perl;
3811	undef $RELOAD_WATCHER;	4011	undef $RELOAD_WATCHER;
3812	};	4012	};
3813	};	4013	};
3814	}	4014	}
…		…
3823	reload_perl;	4023	reload_perl;
3824	};	4024	};
3825	}	4025	}
3826	};	4026	};
3827		4027
3828	unshift @INC, $LIBDIR;	4028	#############################################################################
3829		4029
3830	my $bug_warning = 0;	4030	my $bug_warning = 0;
3831		4031
3832	our @WAIT_FOR_TICK;	4032	our @WAIT_FOR_TICK;
3833	our @WAIT_FOR_TICK_BEGIN;	4033	our @WAIT_FOR_TICK_BEGIN;
3834		4034
3835	sub wait_for_tick {	4035	sub wait_for_tick() {
3836	return if tick_inhibit || $Coro::current == $Coro::main;	4036	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3837		4037
3838	my $signal = new Coro::Signal;	4038	my $signal = new Coro::Signal;
3839	push @WAIT_FOR_TICK, $signal;	4039	push @WAIT_FOR_TICK, $signal;
3840	$signal->wait;	4040	$signal->wait;
3841	}	4041	}
3842		4042
3843	sub wait_for_tick_begin {	4043	sub wait_for_tick_begin() {
3844	return if tick_inhibit || $Coro::current == $Coro::main;	4044	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3845		4045
3846	my $signal = new Coro::Signal;	4046	my $signal = new Coro::Signal;
3847	push @WAIT_FOR_TICK_BEGIN, $signal;	4047	push @WAIT_FOR_TICK_BEGIN, $signal;
3848	$signal->wait;	4048	$signal->wait;
3849	}	4049	}
…		…
3855	return;	4055	return;
3856	}	4056	}
3857		4057
3858	cf::server_tick; # one server iteration	4058	cf::server_tick; # one server iteration
3859		4059
		4060	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
		4061
3860	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4062	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3861	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4063	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3862	Coro::async_pool {	4064	Coro::async_pool {
3863	$Coro::current->{desc} = "runtime saver";	4065	$Coro::current->{desc} = "runtime saver";
3864	write_runtime_sync	4066	write_runtime_sync
3865	or warn "ERROR: unable to write runtime file: $!";	4067	or error "ERROR: unable to write runtime file: $!";
3866	};	4068	};
3867	}	4069	}
3868		4070
3869	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4071	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3870	$sig->send;	4072	$sig->send;
…		…
3878		4080
3879	if (0) {	4081	if (0) {
3880	if ($NEXT_TICK) {	4082	if ($NEXT_TICK) {
3881	my $jitter = $TICK_START - $NEXT_TICK;	4083	my $jitter = $TICK_START - $NEXT_TICK;
3882	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4084	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
3883	warn "jitter $JITTER\n";#d#	4085	debug "jitter $JITTER\n";#d#
3884	}	4086	}
3885	}	4087	}
3886	}	4088	}
3887		4089
3888	{	4090	{
3889	# configure BDB	4091	# configure BDB
3890		4092
3891	BDB::min_parallel 8;	4093	BDB::min_parallel 16;
3892	BDB::max_poll_reqs $TICK * 0.1;	4094	BDB::max_poll_reqs $TICK * 0.1;
3893	$AnyEvent::BDB::WATCHER->priority (1);	4095	$AnyEvent::BDB::WATCHER->priority (1);
3894		4096
3895	unless ($DB_ENV) {	4097	unless ($DB_ENV) {
3896	$DB_ENV = BDB::db_env_create;	4098	$DB_ENV = BDB::db_env_create;
…		…
3977	}	4179	}
3978	}	4180	}
3979		4181
3980	# load additional modules	4182	# load additional modules
3981	require "cf/$_.pm" for @EXTRA_MODULES;	4183	require "cf/$_.pm" for @EXTRA_MODULES;
		4184	cf::_connect_to_perl_2;
3982		4185
3983	END { cf::emergency_save }	4186	END { cf::emergency_save }
3984		4187
3985	1	4188	1
3986		4189

Diff Legend

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