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.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
…		…
88	our %EXT_CORO = (); # coroutines bound to extensions	89	our %EXT_CORO = (); # coroutines bound to extensions
89	our %EXT_MAP = (); # pluggable maps	90	our %EXT_MAP = (); # pluggable maps
90		91
91	our $RELOAD; # number of reloads so far, non-zero while in reload	92	our $RELOAD; # number of reloads so far, non-zero while in reload
92	our @EVENT;	93	our @EVENT;
		94	our @REFLECT; # set by XS
		95	our %REFLECT; # set by us
93		96
94	our $CONFDIR = confdir;	97	our $CONFDIR = confdir;
95	our $DATADIR = datadir;	98	our $DATADIR = datadir;
96	our $LIBDIR = "$DATADIR/ext";	99	our $LIBDIR = "$DATADIR/ext";
97	our $PODDIR = "$DATADIR/pod";	100	our $PODDIR = "$DATADIR/pod";
…		…
103	our $RANDOMDIR = "$LOCALDIR/random";	106	our $RANDOMDIR = "$LOCALDIR/random";
104	our $BDBDIR = "$LOCALDIR/db";	107	our $BDBDIR = "$LOCALDIR/db";
105	our $PIDFILE = "$LOCALDIR/pid";	108	our $PIDFILE = "$LOCALDIR/pid";
106	our $RUNTIMEFILE = "$LOCALDIR/runtime";	109	our $RUNTIMEFILE = "$LOCALDIR/runtime";
107		110
108	our %RESOURCE;	111	our %RESOURCE; # unused
		112
		113	our $OUTPUT_RATE_MIN = 3000;
		114	our $OUTPUT_RATE_MAX = 1000000;
		115
		116	our $MAX_LINKS = 32; # how many chained exits to follow
		117	our $VERBOSE_IO = 1;
109		118
110	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	119	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
111	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	120	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
112	our $NEXT_TICK;	121	our $NEXT_TICK;
113	our $USE_FSYNC = 1; # use fsync to write maps - default on	122	our $USE_FSYNC = 1; # use fsync to write maps - default on
…		…
115	our $BDB_DEADLOCK_WATCHER;	124	our $BDB_DEADLOCK_WATCHER;
116	our $BDB_CHECKPOINT_WATCHER;	125	our $BDB_CHECKPOINT_WATCHER;
117	our $BDB_TRICKLE_WATCHER;	126	our $BDB_TRICKLE_WATCHER;
118	our $DB_ENV;	127	our $DB_ENV;
119		128
120	our @EXTRA_MODULES = qw(pod mapscript);	129	our @EXTRA_MODULES = qw(pod match mapscript incloader);
121		130
122	our %CFG;	131	our %CFG;
123		132
124	our $UPTIME; $UPTIME ||= time;	133	our $UPTIME; $UPTIME ||= time;
125	our $RUNTIME;	134	our $RUNTIME;
…		…
159		168
160	our $EMERGENCY_POSITION;	169	our $EMERGENCY_POSITION;
161		170
162	sub cf::map::normalise;	171	sub cf::map::normalise;
163		172
		173	sub in_main() {
		174	$Coro::current == $Coro::main
		175	}
		176
		177	#############################################################################
		178
		179	%REFLECT = ();
		180	for (@REFLECT) {
		181	my $reflect = JSON::XS::decode_json $_;
		182	$REFLECT{$reflect->{class}} = $reflect;
		183	}
		184
		185	# this is decidedly evil
		186	$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
		187
164	#############################################################################	188	#############################################################################
165		189
166	=head2 GLOBAL VARIABLES	190	=head2 GLOBAL VARIABLES
167		191
168	=over 4	192	=over 4
…		…
209	from wherever your confdir points to.	233	from wherever your confdir points to.
210		234
211	=item cf::wait_for_tick, cf::wait_for_tick_begin	235	=item cf::wait_for_tick, cf::wait_for_tick_begin
212		236
213	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	237	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
214	returns directly I<after> the tick processing (and consequently, can only wake one process	238	returns directly I<after> the tick processing (and consequently, can only wake one thread
215	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	239	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
216		240
		241	=cut
		242
		243	sub wait_for_tick();
		244	sub wait_for_tick_begin();
		245
217	=item @cf::INVOKE_RESULTS	246	=item @cf::INVOKE_RESULTS
218		247
219	This array contains the results of the last C<invoke ()> call. When	248	This array contains the results of the last C<invoke ()> call. When
220	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of	249	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
221	that call.	250	that call.
222		251
		252	=item %cf::REFLECT
		253
		254	Contains, for each (C++) class name, a hash reference with information
		255	about object members (methods, scalars, arrays and flags) and other
		256	metadata, which is useful for introspection.
		257
223	=back	258	=back
224		259
225	=cut	260	=cut
		261
		262	sub error(@) { LOG llevError, join "", @_ }
		263	sub warn (@) { LOG llevWarn , join "", @_ }
		264	sub info (@) { LOG llevInfo , join "", @_ }
		265	sub debug(@) { LOG llevDebug, join "", @_ }
		266	sub trace(@) { LOG llevTrace, join "", @_ }
226		267
227	$Coro::State::WARNHOOK = sub {	268	$Coro::State::WARNHOOK = sub {
228	my $msg = join "", @_;	269	my $msg = join "", @_;
229		270
230	$msg .= "\n"	271	$msg .= "\n"
231	unless $msg =~ /\n$/;	272	unless $msg =~ /\n$/;
232		273
233	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	274	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
234		275
235	LOG llevError, $msg;	276	LOG llevWarn, $msg;
236	};	277	};
237		278
238	$Coro::State::DIEHOOK = sub {	279	$Coro::State::DIEHOOK = sub {
239	return unless $^S eq 0; # "eq", not "=="	280	return unless $^S eq 0; # "eq", not "=="
240		281
241	warn Carp::longmess $_[0];	282	error Carp::longmess $_[0];
242		283
243	if ($Coro::current == $Coro::main) {#d#	284	if (in_main) {#d#
244	warn "DIEHOOK called in main context, Coro bug?\n";#d#	285	error "DIEHOOK called in main context, Coro bug?\n";#d#
245	return;#d#	286	return;#d#
246	}#d#	287	}#d#
247		288
248	# kill coroutine otherwise	289	# kill coroutine otherwise
249	Coro::terminate	290	Coro::terminate
…		…
269	)) {	310	)) {
270	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	311	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
271	}	312	}
272		313
273	$EV::DIED = sub {	314	$EV::DIED = sub {
274	warn "error in event callback: @_";	315	Carp::cluck "error in event callback: @_";
275	};	316	};
276		317
277	#############################################################################	318	#############################################################################
278		319
279	=head2 UTILITY FUNCTIONS	320	=head2 UTILITY FUNCTIONS
…		…
316	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	357	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
317		358
318	sub encode_json($) { $json_coder->encode ($_[0]) }	359	sub encode_json($) { $json_coder->encode ($_[0]) }
319	sub decode_json($) { $json_coder->decode ($_[0]) }	360	sub decode_json($) { $json_coder->decode ($_[0]) }
320		361
		362	=item $ref = cf::yaml_load $scalar
		363
		364	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
		365
		366	=cut
		367
		368	sub fork_call(&@);
		369
		370	sub yaml_load($) {
		371	fork_call { YAML::XS::Load $_[0] } @_
		372	}
		373
321	=item cf::post_init { BLOCK }	374	=item cf::post_init { BLOCK }
322		375
323	Execute the given codeblock, I<after> all extensions have been (re-)loaded,	376	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
324	but I<before> the server starts ticking again.	377	but I<before> the server starts ticking again.
325		378
326	The cdoeblock will have a single boolean argument to indicate whether this	379	The codeblock will have a single boolean argument to indicate whether this
327	is a reload or not.	380	is a reload or not.
328		381
329	=cut	382	=cut
330		383
331	sub post_init(&) {	384	sub post_init(&) {
…		…
376	}	429	}
377		430
378	=item cf::periodic $interval, $cb	431	=item cf::periodic $interval, $cb
379		432
380	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
381	get spread over timer.	434	get spread over time.
382		435
383	=cut	436	=cut
384		437
385	sub periodic($$) {	438	sub periodic($$) {
386	my ($interval, $cb) = @_;	439	my ($interval, $cb) = @_;
…		…
403		456
404	=cut	457	=cut
405		458
406	our @SLOT_QUEUE;	459	our @SLOT_QUEUE;
407	our $SLOT_QUEUE;	460	our $SLOT_QUEUE;
		461	our $SLOT_DECAY = 0.9;
408		462
409	$SLOT_QUEUE->cancel if $SLOT_QUEUE;	463	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
410	$SLOT_QUEUE = Coro::async {	464	$SLOT_QUEUE = Coro::async {
411	$Coro::current->desc ("timeslot manager");	465	$Coro::current->desc ("timeslot manager");
412		466
413	my $signal = new Coro::Signal;	467	my $signal = new Coro::Signal;
		468	my $busy;
414		469
415	while () {	470	while () {
416	next_job:	471	next_job:
		472
417	my $avail = cf::till_tick;	473	my $avail = cf::till_tick;
418	if ($avail > 0.01) {	474
419	for (0 .. $#SLOT_QUEUE) {	475	for (0 .. $#SLOT_QUEUE) {
420	if ($SLOT_QUEUE[$_][0] < $avail) {	476	if ($SLOT_QUEUE[$_][0] <= $avail) {
		477	$busy = 0;
421	my $job = splice @SLOT_QUEUE, $_, 1, ();	478	my $job = splice @SLOT_QUEUE, $_, 1, ();
422	$job->[2]->send;	479	$job->[2]->send;
423	Coro::cede;	480	Coro::cede;
424	goto next_job;	481	goto next_job;
425	}	482	} else {
		483	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
426	}	484	}
427	}	485	}
428		486
429	if (@SLOT_QUEUE) {	487	if (@SLOT_QUEUE) {
430	# 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
431	push @cf::WAIT_FOR_TICK, $signal;	489	push @cf::WAIT_FOR_TICK, $signal;
432	$signal->wait;	490	$signal->wait;
433	} else {	491	} else {
		492	$busy = 0;
434	Coro::schedule;	493	Coro::schedule;
435	}	494	}
436	}	495	}
437	};	496	};
438		497
439	sub get_slot($;$$) {	498	sub get_slot($;$$) {
440	return if tick_inhibit || $Coro::current == $Coro::main;	499	return if tick_inhibit || $Coro::current == $Coro::main;
441		500
442	my ($time, $pri, $name) = @_;	501	my ($time, $pri, $name) = @_;
443		502
444	$time = $TICK * .6 if $time > $TICK * .6;	503	$time = clamp $time, 0.01, $TICK * .6;
		504
445	my $sig = new Coro::Signal;	505	my $sig = new Coro::Signal;
446		506
447	push @SLOT_QUEUE, [$time, $pri, $sig, $name];	507	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
448	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;	508	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
449	$SLOT_QUEUE->ready;	509	$SLOT_QUEUE->ready;
…		…
475	=cut	535	=cut
476		536
477	sub sync_job(&) {	537	sub sync_job(&) {
478	my ($job) = @_;	538	my ($job) = @_;
479		539
480	if ($Coro::current == $Coro::main) {	540	if (in_main) {
481	my $time = EV::time;	541	my $time = AE::time;
482		542
483	# this is the main coro, too bad, we have to block	543	# this is the main coro, too bad, we have to block
484	# till the operation succeeds, freezing the server :/	544	# till the operation succeeds, freezing the server :/
485		545
486	LOG llevError, Carp::longmess "sync job";#d#	546	#LOG llevError, Carp::longmess "sync job";#d#
487		547
488	my $freeze_guard = freeze_mainloop;	548	my $freeze_guard = freeze_mainloop;
489		549
490	my $busy = 1;	550	my $busy = 1;
491	my @res;	551	my @res;
492		552
493	(async {	553	(async {
494	$Coro::current->desc ("sync job coro");	554	$Coro::current->desc ("sync job coro");
495	@res = eval { $job->() };	555	@res = eval { $job->() };
496	warn $@ if $@;	556	error $@ if $@;
497	undef $busy;	557	undef $busy;
498	})->prio (Coro::PRIO_MAX);	558	})->prio (Coro::PRIO_MAX);
499		559
500	while ($busy) {	560	while ($busy) {
501	if (Coro::nready) {	561	if (Coro::nready) {
…		…
503	} else {	563	} else {
504	EV::loop EV::LOOP_ONESHOT;	564	EV::loop EV::LOOP_ONESHOT;
505	}	565	}
506	}	566	}
507		567
508	my $time = EV::time - $time;	568	my $time = AE::time - $time;
509		569
510	$TICK_START += $time; # do not account sync jobs to server load	570	$TICK_START += $time; # do not account sync jobs to server load
511		571
512	wantarray ? @res : $res[0]	572	wantarray ? @res : $res[0]
513	} else {	573	} else {
…		…
535	$EXT_CORO{$coro+0} = $coro;	595	$EXT_CORO{$coro+0} = $coro;
536		596
537	$coro	597	$coro
538	}	598	}
539		599
540	=item fork_call { }, $args	600	=item fork_call { }, @args
541		601
542	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
543	process, returning the results. Everything must be serialisable with	603	process, returning the results. Everything must be serialisable with
544	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
545	never block itself or use any form of event handling.	605	never block itself or use any form of event handling.
546		606
547	=cut	607	=cut
548		608
		609	sub post_fork {
		610	reset_signals;
		611	}
		612
549	sub fork_call(&@) {	613	sub fork_call(&@) {
550	my ($cb, @args) = @_;	614	my ($cb, @args) = @_;
551		615
552	# 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,
553	# otherwise perl prematurely frees the stuff :/	617	# otherwise perl prematurely frees the stuff :/
554	# TODO: investigate and fix (likely this will be rather laborious)	618	# TODO: investigate and fix (likely this will be rather laborious)
555		619
556	my @res = Coro::Util::fork_eval {	620	my @res = Coro::Util::fork_eval {
557	reset_signals;	621	cf::post_fork;
558	&$cb	622	&$cb
559	}, @args;	623	} @args;
560		624
561	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	)
562	}	637	}
563		638
564	=item $coin = coin_from_name $name	639	=item $coin = coin_from_name $name
565		640
566	=cut	641	=cut
…		…
603	within each server.	678	within each server.
604		679
605	=cut	680	=cut
606		681
607	sub db_table($) {	682	sub db_table($) {
		683	cf::error "db_get called from main context"
		684	if $Coro::current == $Coro::main;
		685
608	my ($name) = @_;	686	my ($name) = @_;
609	my $db = BDB::db_create $DB_ENV;	687	my $db = BDB::db_create $DB_ENV;
610		688
611	eval {	689	eval {
612	$db->set_flags (BDB::CHKSUM);	690	$db->set_flags (BDB::CHKSUM);
…		…
622	}	700	}
623		701
624	our $DB;	702	our $DB;
625		703
626	sub db_init {	704	sub db_init {
627	cf::sync_job {
628	$DB ||= db_table "db";	705	$DB ||= db_table "db";
629	};
630	}	706	}
631		707
632	sub db_get($$) {	708	sub db_get($$) {
633	my $key = "$_[0]/$_[1]";	709	my $key = "$_[0]/$_[1]";
634		710
635	cf::sync_job {	711	cf::error "db_get called from main context"
		712	if $Coro::current == $Coro::main;
		713
636	BDB::db_get $DB, undef, $key, my $data;	714	BDB::db_get $DB, undef, $key, my $data;
637		715
638	$! ? ()	716	$! ? ()
639	: $data	717	: $data
640	}
641	}	718	}
642		719
643	sub db_put($$$) {	720	sub db_put($$$) {
644	BDB::dbreq_pri 4;	721	BDB::dbreq_pri 4;
645	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	722	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
701		778
702	my $t1 = Time::HiRes::time;	779	my $t1 = Time::HiRes::time;
703	my $data = $process->(\@data);	780	my $data = $process->(\@data);
704	my $t2 = Time::HiRes::time;	781	my $t2 = Time::HiRes::time;
705		782
706	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	783	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
707		784
708	db_put cache => "$id/data", $data;	785	db_put cache => "$id/data", $data;
709	db_put cache => "$id/md5" , $md5;	786	db_put cache => "$id/md5" , $md5;
710	db_put cache => "$id/meta", $meta;	787	db_put cache => "$id/meta", $meta;
711		788
…		…
721		798
722	=cut	799	=cut
723		800
724	sub datalog($@) {	801	sub datalog($@) {
725	my ($type, %kv) = @_;	802	my ($type, %kv) = @_;
726	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	803	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
727	}	804	}
728		805
729	=back	806	=back
730		807
731	=cut	808	=cut
…		…
926		1003
927	} elsif (exists $cb_id{$type}) {	1004	} elsif (exists $cb_id{$type}) {
928	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	1005	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
929		1006
930	} elsif (ref $type) {	1007	} elsif (ref $type) {
931	warn "attaching objects not supported, ignoring.\n";	1008	error "attaching objects not supported, ignoring.\n";
932		1009
933	} else {	1010	} else {
934	shift @arg;	1011	shift @arg;
935	warn "attach argument '$type' not supported, ignoring.\n";	1012	error "attach argument '$type' not supported, ignoring.\n";
936	}	1013	}
937	}	1014	}
938	}	1015	}
939		1016
940	sub _object_attach {	1017	sub _object_attach {
…		…
950	_attach $registry, $klass, @attach;	1027	_attach $registry, $klass, @attach;
951	}	1028	}
952		1029
953	$obj->{$name} = \%arg;	1030	$obj->{$name} = \%arg;
954	} else {	1031	} else {
955	warn "object uses attachment '$name' which is not available, postponing.\n";	1032	info "object uses attachment '$name' which is not available, postponing.\n";
956	}	1033	}
957		1034
958	$obj->{_attachment}{$name} = undef;	1035	$obj->{_attachment}{$name} = undef;
959	}	1036	}
960		1037
…		…
1019		1096
1020	for (@$callbacks) {	1097	for (@$callbacks) {
1021	eval { &{$_->[1]} };	1098	eval { &{$_->[1]} };
1022		1099
1023	if ($@) {	1100	if ($@) {
1024	warn "$@";
1025	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1101	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1026	override;	1102	override;
1027	}	1103	}
1028		1104
1029	return 1 if $override;	1105	return 1 if $override;
1030	}	1106	}
…		…
1109	for (@$attach) {	1185	for (@$attach) {
1110	my ($klass, @attach) = @$_;	1186	my ($klass, @attach) = @$_;
1111	_attach $registry, $klass, @attach;	1187	_attach $registry, $klass, @attach;
1112	}	1188	}
1113	} else {	1189	} else {
1114	warn "object uses attachment '$name' that is not available, postponing.\n";	1190	info "object uses attachment '$name' that is not available, postponing.\n";
1115	}	1191	}
1116	}	1192	}
1117	}	1193	}
1118		1194
1119	cf::attachable->attach (	1195	cf::attachable->attach (
…		…
1146	my ($filename, $rdata, $objs) = @_;	1222	my ($filename, $rdata, $objs) = @_;
1147		1223
1148	sync_job {	1224	sync_job {
1149	if (length $$rdata) {	1225	if (length $$rdata) {
1150	utf8::decode (my $decname = $filename);	1226	utf8::decode (my $decname = $filename);
1151	warn sprintf "saving %s (%d,%d)\n",	1227	trace sprintf "saving %s (%d,%d)\n",
1152	$decname, length $$rdata, scalar @$objs;	1228	$decname, length $$rdata, scalar @$objs
		1229	if $VERBOSE_IO;
1153		1230
1154	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1231	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1155	aio_chmod $fh, SAVE_MODE;	1232	aio_chmod $fh, SAVE_MODE;
1156	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1233	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1157	if ($cf::USE_FSYNC) {	1234	if ($cf::USE_FSYNC) {
…		…
1179	aio_rename "$filename~", $filename;	1256	aio_rename "$filename~", $filename;
1180		1257
1181	$filename =~ s%/[^/]+$%%;	1258	$filename =~ s%/[^/]+$%%;
1182	aio_pathsync $filename if $cf::USE_FSYNC;	1259	aio_pathsync $filename if $cf::USE_FSYNC;
1183	} else {	1260	} else {
1184	warn "unable to save objects: $filename~: $!\n";	1261	error "unable to save objects: $filename~: $!\n";
1185	}	1262	}
1186	} else {	1263	} else {
1187	aio_unlink $filename;	1264	aio_unlink $filename;
1188	aio_unlink "$filename.pst";	1265	aio_unlink "$filename.pst";
1189	}	1266	}
…		…
1213	my $st = eval { Coro::Storable::thaw $av };	1290	my $st = eval { Coro::Storable::thaw $av };
1214	$av = $st->{objs};	1291	$av = $st->{objs};
1215	}	1292	}
1216		1293
1217	utf8::decode (my $decname = $filename);	1294	utf8::decode (my $decname = $filename);
1218	warn sprintf "loading %s (%d,%d)\n",	1295	trace sprintf "loading %s (%d,%d)\n",
1219	$decname, length $data, scalar @{$av || []};	1296	$decname, length $data, scalar @{$av || []}
		1297	if $VERBOSE_IO;
1220		1298
1221	($data, $av)	1299	($data, $av)
1222	}	1300	}
1223		1301
1224	=head2 COMMAND CALLBACKS	1302	=head2 COMMAND CALLBACKS
…		…
1283	}	1361	}
1284		1362
1285	use File::Glob ();	1363	use File::Glob ();
1286		1364
1287	cf::player->attach (	1365	cf::player->attach (
1288	on_command => sub {	1366	on_unknown_command => sub {
1289	my ($pl, $name, $params) = @_;	1367	my ($pl, $name, $params) = @_;
1290		1368
1291	my $cb = $COMMAND{$name}	1369	my $cb = $COMMAND{$name}
1292	or return;	1370	or return;
1293		1371
…		…
1316		1394
1317	$pl->ext_reply ($reply, @reply)	1395	$pl->ext_reply ($reply, @reply)
1318	if $reply;	1396	if $reply;
1319		1397
1320	} else {	1398	} else {
1321	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1399	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1322	}	1400	}
1323		1401
1324	cf::override;	1402	cf::override;
1325	},	1403	},
1326	);	1404	);
…		…
1337		1415
1338	$grp	1416	$grp
1339	}	1417	}
1340		1418
1341	sub load_extensions {	1419	sub load_extensions {
		1420	info "loading extensions...";
		1421
1342	cf::sync_job {	1422	cf::sync_job {
1343	my %todo;	1423	my %todo;
1344		1424
1345	for my $path (<$LIBDIR/*.ext>) {	1425	for my $path (<$LIBDIR/*.ext>) {
1346	next unless -r $path;	1426	next unless -r $path;
…		…
1364		1444
1365	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1445	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1366	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1446	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1367		1447
1368	$ext{source} =	1448	$ext{source} =
1369	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1449	"package $pkg; use common::sense;\n"
1370	. "#line 1 \"$path\"\n{\n"	1450	. "#line 1 \"$path\"\n{\n"
1371	. $source	1451	. $source
1372	. "\n};\n1";	1452	. "\n};\n1";
1373		1453
1374	$todo{$base} = \%ext;	1454	$todo{$base} = \%ext;
1375	}	1455	}
1376		1456
		1457	my $pass = 0;
1377	my %done;	1458	my %done;
1378	while (%todo) {	1459	while (%todo) {
1379	my $progress;	1460	my $progress;
1380		1461
		1462	++$pass;
		1463
		1464	ext:
1381	while (my ($k, $v) = each %todo) {	1465	while (my ($k, $v) = each %todo) {
1382	for (split /,\s*/, $v->{meta}{depends}) {	1466	for (split /,\s*/, $v->{meta}{depends}) {
1383	goto skip	1467	next ext
1384	unless exists $done{$_};	1468	unless exists $done{$_};
1385	}	1469	}
1386		1470
1387	warn "... loading '$k' into '$v->{pkg}'\n";	1471	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1388		1472
1389	unless (eval $v->{source}) {	1473	my $active = eval $v->{source};
		1474
		1475	if (length $@) {
1390	my $msg = $@ ? "$v->{path}: $@\n"	1476	error "$v->{path}: $@\n";
1391	: "$v->{base}: extension inactive.\n";
1392		1477
1393	if (exists $v->{meta}{mandatory}) {
1394	warn $msg;
1395	cf::cleanup "mandatory extension failed to load, exiting.";	1478	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1396	}	1479	if exists $v->{meta}{mandatory};
1397		1480
1398	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;
1399	}	1490	}
1400
1401	$done{$k} = delete $todo{$k};
1402	push @EXTS, $v->{pkg};
1403	$progress = 1;
1404	}	1491	}
1405		1492
1406	skip:	1493	unless ($progress) {
1407	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"	1494	warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1408	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	}
1409	}	1501	}
1410	};	1502	};
1411	}	1503	}
1412		1504
1413	#############################################################################	1505	#############################################################################
…		…
1497	$cf::PLAYER{$login} = $pl	1589	$cf::PLAYER{$login} = $pl
1498	}	1590	}
1499	}	1591	}
1500	}	1592	}
1501		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
1502	sub save($) {	1607	sub save($) {
1503	my ($pl) = @_;	1608	my ($pl) = @_;
1504		1609
1505	return if $pl->{deny_save};	1610	return if $pl->{deny_save};
1506		1611
…		…
1511		1616
1512	aio_mkdir playerdir $pl, 0770;	1617	aio_mkdir playerdir $pl, 0770;
1513	$pl->{last_save} = $cf::RUNTIME;	1618	$pl->{last_save} = $cf::RUNTIME;
1514		1619
1515	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];
1516		1624
1517	$pl->save_pl ($path);	1625	$pl->save_pl ($path);
1518	cf::cede_to_tick;	1626	cf::cede_to_tick;
1519	}	1627	}
1520		1628
…		…
1556	$pl->{deny_save} = 1;	1664	$pl->{deny_save} = 1;
1557	$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
1558		1666
1559	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1667	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1560	$pl->deactivate;	1668	$pl->deactivate;
		1669
1561	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;
1562	$pl->ob->check_score;	1671	ext::highscore::check ($pl->ob);
		1672
1563	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1673	$pl->invoke (cf::EVENT_PLAYER_QUIT);
1564	$pl->ns->destroy if $pl->ns;	1674	$pl->ns->destroy if $pl->ns;
1565		1675
1566	my $path = playerdir $pl;	1676	my $path = playerdir $pl;
1567	my $temp = "$path~$cf::RUNTIME~deleting~";	1677	my $temp = "$path~$cf::RUNTIME~deleting~";
…		…
1622	\@logins	1732	\@logins
1623	}	1733	}
1624		1734
1625	=item $player->maps	1735	=item $player->maps
1626		1736
		1737	=item cf::player::maps $login
		1738
1627	Returns an arrayref of map paths that are private for this	1739	Returns an arrayref of map paths that are private for this
1628	player. May block.	1740	player. May block.
1629		1741
1630	=cut	1742	=cut
1631		1743
…		…
1693	=cut	1805	=cut
1694		1806
1695	sub find_by_path($) {	1807	sub find_by_path($) {
1696	my ($path) = @_;	1808	my ($path) = @_;
1697		1809
		1810	$path =~ s/^~[^\/]*//; # skip ~login
		1811
1698	my ($match, $specificity);	1812	my ($match, $specificity);
1699		1813
1700	for my $region (list) {	1814	for my $region (list) {
1701	if ($region->{match} && $path =~ $region->{match}) {	1815	if ($region->{match} && $path =~ $region->{match}) {
1702	($match, $specificity) = ($region, $region->specificity)	1816	($match, $specificity) = ($region, $region->specificity)
…		…
1733	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
1734		1848
1735	# mit "rum" bekleckern, nicht	1849	# mit "rum" bekleckern, nicht
1736	$self->_create_random_map (	1850	$self->_create_random_map (
1737	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},	1851	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1738	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},	1852	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1739	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},	1853	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1740	$rmp->{exit_on_final_map},	1854	$rmp->{exit_on_final_map},
1741	$rmp->{xsize}, $rmp->{ysize},	1855	$rmp->{xsize}, $rmp->{ysize},
1742	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},	1856	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1743	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},	1857	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
…		…
1758		1872
1759	sub register {	1873	sub register {
1760	my (undef, $regex, $prio) = @_;	1874	my (undef, $regex, $prio) = @_;
1761	my $pkg = caller;	1875	my $pkg = caller;
1762		1876
1763	no strict;
1764	push @{"$pkg\::ISA"}, __PACKAGE__;	1877	push @{"$pkg\::ISA"}, __PACKAGE__;
1765		1878
1766	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	1879	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1767	}	1880	}
1768		1881
1769	# also paths starting with '/'	1882	# also paths starting with '/'
1770	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	1883	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1771		1884
1772	sub thawer_merge {	1885	sub thawer_merge {
1773	my ($self, $merge) = @_;	1886	my ($self, $merge) = @_;
1774		1887
1775	# we have to keep some variables in memory intact	1888	# we have to keep some variables in memory intact
…		…
1780	}	1893	}
1781		1894
1782	sub normalise {	1895	sub normalise {
1783	my ($path, $base) = @_;	1896	my ($path, $base) = @_;
1784		1897
1785	$path = "$path"; # make sure its a string	1898	$path = "$path"; # make sure it's a string
1786		1899
1787	$path =~ s/\.map$//;	1900	$path =~ s/\.map$//;
1788		1901
1789	# map plan:	1902	# map plan:
1790	#	1903	#
…		…
1829	$self->init; # pass $1 etc.	1942	$self->init; # pass $1 etc.
1830	return $self;	1943	return $self;
1831	}	1944	}
1832	}	1945	}
1833		1946
1834	Carp::cluck "unable to resolve path '$path' (base '$base').";	1947	Carp::cluck "unable to resolve path '$path' (base '$base')";
1835	()	1948	()
1836	}	1949	}
1837		1950
1838	sub init {	1951	sub init {
1839	my ($self) = @_;	1952	my ($self) = @_;
…		…
1961	}	2074	}
1962		2075
1963	sub find;	2076	sub find;
1964	sub find {	2077	sub find {
1965	my ($path, $origin) = @_;	2078	my ($path, $origin) = @_;
		2079
		2080	cf::cede_to_tick;
1966		2081
1967	$path = normalise $path, $origin && $origin->path;	2082	$path = normalise $path, $origin && $origin->path;
1968		2083
1969	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2084	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1970	my $guard2 = cf::lock_acquire "map_find:$path";	2085	my $guard2 = cf::lock_acquire "map_find:$path";
…		…
1989		2104
1990	$cf::MAP{$path} = $map	2105	$cf::MAP{$path} = $map
1991	}	2106	}
1992	}	2107	}
1993		2108
1994	sub pre_load { }	2109	sub pre_load { }
1995	sub post_load { }	2110	#sub post_load { } # XS
1996		2111
1997	sub load {	2112	sub load {
1998	my ($self) = @_;	2113	my ($self) = @_;
1999		2114
2000	local $self->{deny_reset} = 1; # loading can take a long time	2115	local $self->{deny_reset} = 1; # loading can take a long time
…		…
2057	}	2172	}
2058		2173
2059	$self->post_load;	2174	$self->post_load;
2060	}	2175	}
2061		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
2062	sub customise_for {	2180	sub customise_for {
2063	my ($self, $ob) = @_;	2181	my ($self, $ob) = @_;
2064		2182
2065	return find "~" . $ob->name . "/" . $self->{path}	2183	return find "~" . $ob->name . "/" . $self->{path}
2066	if $self->per_player;	2184	if $self->per_player;
…		…
2082	or next;	2200	or next;
2083	$neigh = find $neigh, $map	2201	$neigh = find $neigh, $map
2084	or next;	2202	or next;
2085	$neigh->load;	2203	$neigh->load;
2086		2204
		2205	# now find the diagonal neighbours
2087	push @neigh,	2206	push @neigh,
2088	[$neigh->tile_path (($_ + 3) % 4), $neigh],	2207	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2089	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2208	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2090	}	2209	}
2091		2210
…		…
2098	}	2217	}
2099		2218
2100	sub find_sync {	2219	sub find_sync {
2101	my ($path, $origin) = @_;	2220	my ($path, $origin) = @_;
2102		2221
2103	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
2104	}	2226	}
2105		2227
2106	sub do_load_sync {	2228	sub do_load_sync {
2107	my ($map) = @_;	2229	my ($map) = @_;
2108		2230
2109	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2231	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2110	if $Coro::current == $Coro::main;	2232	if $Coro::current == $Coro::main;
2111		2233
2112	cf::sync_job { $map->load };	2234	$map->load;
2113	}	2235	}
2114		2236
2115	our %MAP_PREFETCH;	2237	our %MAP_PREFETCH;
2116	our $MAP_PREFETCHER = undef;	2238	our $MAP_PREFETCHER = undef;
2117		2239
…		…
2143	$MAP_PREFETCHER->prio (6);	2265	$MAP_PREFETCHER->prio (6);
2144		2266
2145	()	2267	()
2146	}	2268	}
2147		2269
		2270	# common code, used by both ->save and ->swapout
2148	sub save {	2271	sub _save {
2149	my ($self) = @_;	2272	my ($self) = @_;
2150
2151	my $lock = cf::lock_acquire "map_data:$self->{path}";
2152		2273
2153	$self->{last_save} = $cf::RUNTIME;	2274	$self->{last_save} = $cf::RUNTIME;
2154		2275
2155	return unless $self->dirty;	2276	return unless $self->dirty;
2156		2277
…		…
2176	} else {	2297	} else {
2177	$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);
2178	}	2299	}
2179	}	2300	}
2180		2301
		2302	sub save {
		2303	my ($self) = @_;
		2304
		2305	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2306
		2307	$self->_save;
		2308	}
		2309
2181	sub swap_out {	2310	sub swap_out {
2182	my ($self) = @_;	2311	my ($self) = @_;
2183		2312
2184	# save first because save cedes
2185	$self->save;
2186
2187	my $lock = cf::lock_acquire "map_data:$self->{path}";	2313	my $lock = cf::lock_acquire "map_data:$self->{path}";
2188		2314
2189	return if $self->players;
2190	return if $self->in_memory != cf::MAP_ACTIVE;	2315	return if $self->in_memory != cf::MAP_ACTIVE;
2191	return if $self->{deny_save};	2316	return if $self->{deny_save};
		2317	return if $self->players;
2192		2318
		2319	# first deactivate the map and "unlink" it from the core
		2320	$self->deactivate;
		2321	$_->clear_links_to ($self) for values %cf::MAP;
2193	$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};
2194		2369
2195	$self->deactivate;	2370	$self->deactivate;
2196	$_->clear_links_to ($self) for values %cf::MAP;	2371	$_->clear_links_to ($self) for values %cf::MAP;
2197	$self->clear;	2372	$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		2373
2243	$self->unlink_save;	2374	$self->unlink_save;
2244	$self->destroy;	2375	$self->destroy;
2245	}	2376	}
2246		2377
…		…
2254		2385
2255	delete $cf::MAP{$self->path};	2386	delete $cf::MAP{$self->path};
2256		2387
2257	$self->unlink_save;	2388	$self->unlink_save;
2258		2389
2259	bless $self, "cf::map";	2390	bless $self, "cf::map::wrap";
2260	delete $self->{deny_reset};	2391	delete $self->{deny_reset};
2261	$self->{deny_save} = 1;	2392	$self->{deny_save} = 1;
2262	$self->reset_timeout (1);	2393	$self->reset_timeout (1);
2263	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2394	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2264		2395
…		…
2321	: normalise $_	2452	: normalise $_
2322	} @{ aio_readdir $UNIQUEDIR or [] }	2453	} @{ aio_readdir $UNIQUEDIR or [] }
2323	]	2454	]
2324	}	2455	}
2325		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
2326	=back	2489	=back
2327		2490
2328	=head3 cf::object	2491	=head3 cf::object
2329		2492
2330	=cut	2493	=cut
…		…
2462		2625
2463	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}>).
2464		2627
2465	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.
2466	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,
2467	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
2468	map.	2631	map.
2469		2632
2470	Will never block.	2633	Will never block.
2471		2634
2472	=item $player_object->leave_link ($map, $x, $y)	2635	=item $player_object->leave_link ($map, $x, $y)
…		…
2493	sub cf::object::player::enter_link {	2656	sub cf::object::player::enter_link {
2494	my ($self) = @_;	2657	my ($self) = @_;
2495		2658
2496	$self->deactivate_recursive;	2659	$self->deactivate_recursive;
2497		2660
		2661	++$self->{_link_recursion};
		2662
2498	return if UNIVERSAL::isa $self->map, "ext::map_link";	2663	return if UNIVERSAL::isa $self->map, "ext::map_link";
2499		2664
2500	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2665	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2501	if $self->map && $self->map->{path} ne "{link}";	2666	if $self->map && $self->map->{path} ne "{link}";
2502		2667
2503	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2668	$self->enter_map ($LINK_MAP || link_map, 3, 3);
2504	}	2669	}
2505		2670
2506	sub cf::object::player::leave_link {	2671	sub cf::object::player::leave_link {
2507	my ($self, $map, $x, $y) = @_;	2672	my ($self, $map, $x, $y) = @_;
2508		2673
…		…
2525	($x, $y) = (-1, -1)	2690	($x, $y) = (-1, -1)
2526	unless (defined $x) && (defined $y);	2691	unless (defined $x) && (defined $y);
2527		2692
2528	# use -1 or undef as default coordinates, not 0, 0	2693	# use -1 or undef as default coordinates, not 0, 0
2529	($x, $y) = ($map->enter_x, $map->enter_y)	2694	($x, $y) = ($map->enter_x, $map->enter_y)
2530	if $x <=0 && $y <= 0;	2695	if $x <= 0 && $y <= 0;
2531		2696
2532	$map->load;	2697	$map->load;
2533	$map->load_neighbours;	2698	$map->load_neighbours;
2534		2699
2535	return unless $self->contr->active;	2700	return unless $self->contr->active;
2536		2701
2537	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2702	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2538	$self->enter_map ($map, $x, $y);	2703	if ($self->enter_map ($map, $x, $y)) {
2539		2704	# entering was successful
		2705	delete $self->{_link_recursion};
2540	# only activate afterwards, to support waiting in hooks	2706	# only activate afterwards, to support waiting in hooks
2541	$self->activate_recursive;	2707	$self->activate_recursive;
2542	}	2708	}
2543		2709
		2710	}
		2711
2544	=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)]])
2545		2713
2546	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
2547	her, loading and preparing them map, calling the provided $check callback	2715	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	2716	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	2717	the new (success) or old (failed) map position. In either case, $done will
…		…
2556		2724
2557	our $GOTOGEN;	2725	our $GOTOGEN;
2558		2726
2559	sub cf::object::player::goto {	2727	sub cf::object::player::goto {
2560	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	}
2561		2735
2562	# 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
2563	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2737	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2564		2738
2565	$self->enter_link;	2739	$self->enter_link;
…		…
2589	my $map = eval {	2763	my $map = eval {
2590	my $map = defined $path ? cf::map::find $path : undef;	2764	my $map = defined $path ? cf::map::find $path : undef;
2591		2765
2592	if ($map) {	2766	if ($map) {
2593	$map = $map->customise_for ($self);	2767	$map = $map->customise_for ($self);
2594	$map = $check->($map) if $check && $map;	2768	$map = $check->($map, $x, $y, $self) if $check && $map;
2595	} else {	2769	} else {
2596	$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);
2597	}	2771	}
2598		2772
2599	$map	2773	$map
…		…
2607	if ($gen == $self->{_goto_generation}) {	2781	if ($gen == $self->{_goto_generation}) {
2608	delete $self->{_goto_generation};	2782	delete $self->{_goto_generation};
2609	$self->leave_link ($map, $x, $y);	2783	$self->leave_link ($map, $x, $y);
2610	}	2784	}
2611		2785
2612	$done->() if $done;	2786	$done->($self) if $done;
2613	})->prio (1);	2787	})->prio (1);
2614	}	2788	}
2615		2789
2616	=item $player_object->enter_exit ($exit_object)	2790	=item $player_object->enter_exit ($exit_object)
2617		2791
…		…
2710	$self->message ("Something went wrong deep within the deliantra server. "	2884	$self->message ("Something went wrong deep within the deliantra server. "
2711	. "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. "
2712	. "Please report this to the dungeon master!",	2886	. "Please report this to the dungeon master!",
2713	cf::NDI_UNIQUE | cf::NDI_RED);	2887	cf::NDI_UNIQUE | cf::NDI_RED);
2714		2888
2715	warn "ERROR in enter_exit: $@";	2889	error "ERROR in enter_exit: $@";
2716	$self->leave_link;	2890	$self->leave_link;
2717	}	2891	}
2718	})->prio (1);	2892	})->prio (1);
2719	}	2893	}
2720		2894
…		…
2732	sub cf::client::send_drawinfo {	2906	sub cf::client::send_drawinfo {
2733	my ($self, $text, $flags) = @_;	2907	my ($self, $text, $flags) = @_;
2734		2908
2735	utf8::encode $text;	2909	utf8::encode $text;
2736	$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);
2737	}	2936	}
2738		2937
2739	=item $client->send_msg ($channel, $msg, $color, [extra...])	2938	=item $client->send_msg ($channel, $msg, $color, [extra...])
2740		2939
2741	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
…		…
2745		2944
2746	=cut	2945	=cut
2747		2946
2748	# non-persistent channels (usually the info channel)	2947	# non-persistent channels (usually the info channel)
2749	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	},
2750	"c/identify" => {	2955	"c/identify" => {
2751	id => "infobox",	2956	id => "infobox",
2752	title => "Identify",	2957	title => "Identify",
2753	reply => undef,	2958	reply => undef,
2754	tooltip => "Items recently identified",	2959	tooltip => "Items recently identified",
…		…
2756	"c/examine" => {	2961	"c/examine" => {
2757	id => "infobox",	2962	id => "infobox",
2758	title => "Examine",	2963	title => "Examine",
2759	reply => undef,	2964	reply => undef,
2760	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",
2761	},	2972	},
2762	"c/book" => {	2973	"c/book" => {
2763	id => "infobox",	2974	id => "infobox",
2764	title => "Book",	2975	title => "Book",
2765	reply => undef,	2976	reply => undef,
…		…
2881	my $pkt = "msg "	3092	my $pkt = "msg "
2882	. $self->{json_coder}->encode (	3093	. $self->{json_coder}->encode (
2883	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]	3094	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2884	);	3095	);
2885		3096
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);	3097	$self->send_big_packet ($pkt);
2897	}	3098	}
2898		3099
2899	=item $client->ext_msg ($type, @msg)	3100	=item $client->ext_msg ($type, @msg)
2900		3101
2901	Sends an ext event to the client.	3102	Sends an ext event to the client.
…		…
2904		3105
2905	sub cf::client::ext_msg($$@) {	3106	sub cf::client::ext_msg($$@) {
2906	my ($self, $type, @msg) = @_;	3107	my ($self, $type, @msg) = @_;
2907		3108
2908	if ($self->extcmd == 2) {	3109	if ($self->extcmd == 2) {
2909	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3110	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2910	} elsif ($self->extcmd == 1) { # TODO: remove	3111	} elsif ($self->extcmd == 1) { # TODO: remove
2911	push @msg, msgtype => "event_$type";	3112	push @msg, msgtype => "event_$type";
2912	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3113	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2913	}	3114	}
2914	}	3115	}
2915		3116
2916	=item $client->ext_reply ($msgid, @msg)	3117	=item $client->ext_reply ($msgid, @msg)
2917		3118
…		…
2921		3122
2922	sub cf::client::ext_reply($$@) {	3123	sub cf::client::ext_reply($$@) {
2923	my ($self, $id, @msg) = @_;	3124	my ($self, $id, @msg) = @_;
2924		3125
2925	if ($self->extcmd == 2) {	3126	if ($self->extcmd == 2) {
2926	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));	3127	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2927	} elsif ($self->extcmd == 1) {	3128	} elsif ($self->extcmd == 1) {
2928	#TODO: version 1, remove	3129	#TODO: version 1, remove
2929	unshift @msg, msgtype => "reply", msgid => $id;	3130	unshift @msg, msgtype => "reply", msgid => $id;
2930	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3131	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2931	}	3132	}
2932	}	3133	}
2933		3134
2934	=item $success = $client->query ($flags, "text", \&cb)	3135	=item $success = $client->query ($flags, "text", \&cb)
2935		3136
…		…
3006		3207
3007	$ns->ext_reply ($reply, @reply)	3208	$ns->ext_reply ($reply, @reply)
3008	if $reply;	3209	if $reply;
3009		3210
3010	} else {	3211	} else {
3011	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";
3012	}	3213	}
3013		3214
3014	cf::override;	3215	cf::override;
3015	},	3216	},
3016	);	3217	);
…		…
3036		3237
3037	$coro	3238	$coro
3038	}	3239	}
3039		3240
3040	cf::client->attach (	3241	cf::client->attach (
3041	on_destroy => sub {	3242	on_client_destroy => sub {
3042	my ($ns) = @_;	3243	my ($ns) = @_;
3043		3244
3044	$_->cancel for values %{ (delete $ns->{_coro}) || {} };	3245	$_->cancel for values %{ (delete $ns->{_coro}) || {} };
3045	},	3246	},
3046	);	3247	);
…		…
3062	our $safe_hole = new Safe::Hole;	3263	our $safe_hole = new Safe::Hole;
3063		3264
3064	$SIG{FPE} = 'IGNORE';	3265	$SIG{FPE} = 'IGNORE';
3065		3266
3066	$safe->permit_only (Opcode::opset qw(	3267	$safe->permit_only (Opcode::opset qw(
3067	:base_core :base_mem :base_orig :base_math	3268	:base_core :base_mem :base_orig :base_math :base_loop
3068	grepstart grepwhile mapstart mapwhile	3269	grepstart grepwhile mapstart mapwhile
3069	sort time	3270	sort time
3070	));	3271	));
3071		3272
3072	# here we export the classes and methods available to script code	3273	# here we export the classes and methods available to script code
…		…
3097	decrease split destroy change_exp value msg lore send_msg)],	3298	decrease split destroy change_exp value msg lore send_msg)],
3098	["cf::object::player" => qw(player)],	3299	["cf::object::player" => qw(player)],
3099	["cf::player" => qw(peaceful send_msg)],	3300	["cf::player" => qw(peaceful send_msg)],
3100	["cf::map" => qw(trigger)],	3301	["cf::map" => qw(trigger)],
3101	) {	3302	) {
3102	no strict 'refs';
3103	my ($pkg, @funs) = @$_;	3303	my ($pkg, @funs) = @$_;
3104	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3304	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3105	for @funs;	3305	for @funs;
3106	}	3306	}
3107		3307
…		…
3124	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3324	$qcode =~ s/"/‟/g; # not allowed in #line filenames
3125	$qcode =~ s/\n/\\n/g;	3325	$qcode =~ s/\n/\\n/g;
3126		3326
3127	%vars = (_dummy => 0) unless %vars;	3327	%vars = (_dummy => 0) unless %vars;
3128		3328
		3329	my @res;
3129	local $_;	3330	local $_;
3130	local @safe::cf::_safe_eval_args = values %vars;
3131		3331
3132	my $eval =	3332	my $eval =
3133	"do {\n"	3333	"do {\n"
3134	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"	3334	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3135	. "#line 0 \"{$qcode}\"\n"	3335	. "#line 0 \"{$qcode}\"\n"
3136	. $code	3336	. $code
3137	. "\n}"	3337	. "\n}"
3138	;	3338	;
3139		3339
		3340	if ($CFG{safe_eval}) {
3140	sub_generation_inc;	3341	sub_generation_inc;
		3342	local @safe::cf::_safe_eval_args = values %vars;
3141	my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);	3343	@res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3142	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	}
3143		3349
3144	if ($@) {	3350	if ($@) {
3145	warn "$@";	3351	warn "$@",
3146	warn "while executing safe code '$code'\n";	3352	"while executing safe code '$code'\n",
3147	warn "with arguments " . (join " ", %vars) . "\n";	3353	"with arguments " . (join " ", %vars) . "\n";
3148	}	3354	}
3149		3355
3150	wantarray ? @res : $res[0]	3356	wantarray ? @res : $res[0]
3151	}	3357	}
3152		3358
…		…
3166	=cut	3372	=cut
3167		3373
3168	sub register_script_function {	3374	sub register_script_function {
3169	my ($fun, $cb) = @_;	3375	my ($fun, $cb) = @_;
3170		3376
3171	no strict 'refs';	3377	$fun = "safe::$fun" if $CFG{safe_eval};
3172	*{"safe::$fun"} = $safe_hole->wrap ($cb);	3378	*$fun = $safe_hole->wrap ($cb);
3173	}	3379	}
3174		3380
3175	=back	3381	=back
3176		3382
3177	=cut	3383	=cut
…		…
3186	# for this (global event?)	3392	# for this (global event?)
3187	%ext::player_env::MUSIC_FACE_CACHE = ();	3393	%ext::player_env::MUSIC_FACE_CACHE = ();
3188		3394
3189	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3395	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3190		3396
3191	warn "loading facedata from $path\n";	3397	trace "loading facedata from $path\n";
3192		3398
3193	my $facedata;
3194	0 < aio_load $path, $facedata	3399	0 < aio_load $path, my $facedata
3195	or die "$path: $!";	3400	or die "$path: $!";
3196		3401
3197	$facedata = Coro::Storable::thaw $facedata;	3402	$facedata = Coro::Storable::thaw $facedata;
3198		3403
3199	$facedata->{version} == 2	3404	$facedata->{version} == 2
3200	or cf::cleanup "$path: version mismatch, cannot proceed.";	3405	or cf::cleanup "$path: version mismatch, cannot proceed.";
3201		3406
3202	# 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]);
3203	$facedata->{resource}{"res/exp_table"} = {	3409	$facedata->{resource}{"res/exp_table"} = {
3204	type => FT_RSRC,	3410	type => FT_RSRC,
3205	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),
3206	};	3413	};
3207	cf::cede_to_tick;	3414	cf::cede_to_tick;
3208		3415
3209	{	3416	{
3210	my $faces = $facedata->{faceinfo};	3417	my $faces = $facedata->{faceinfo};
…		…
3212	while (my ($face, $info) = each %$faces) {	3419	while (my ($face, $info) = each %$faces) {
3213	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3420	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3214		3421
3215	cf::face::set_visibility $idx, $info->{visibility};	3422	cf::face::set_visibility $idx, $info->{visibility};
3216	cf::face::set_magicmap $idx, $info->{magicmap};	3423	cf::face::set_magicmap $idx, $info->{magicmap};
3217	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};	3424	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3218	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};	3425	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3219		3426
3220	cf::cede_to_tick;	3427	cf::cede_to_tick;
3221	}	3428	}
3222		3429
3223	while (my ($face, $info) = each %$faces) {	3430	while (my ($face, $info) = each %$faces) {
…		…
3228		3435
3229	if (my $smooth = cf::face::find $info->{smooth}) {	3436	if (my $smooth = cf::face::find $info->{smooth}) {
3230	cf::face::set_smooth $idx, $smooth;	3437	cf::face::set_smooth $idx, $smooth;
3231	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3438	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3232	} else {	3439	} else {
3233	warn "smooth face '$info->{smooth}' not found for face '$face'";	3440	error "smooth face '$info->{smooth}' not found for face '$face'";
3234	}	3441	}
3235		3442
3236	cf::cede_to_tick;	3443	cf::cede_to_tick;
3237	}	3444	}
3238	}	3445	}
…		…
3247		3454
3248	cf::anim::invalidate_all; # d'oh	3455	cf::anim::invalidate_all; # d'oh
3249	}	3456	}
3250		3457
3251	{	3458	{
3252	# TODO: for gcfclient pleasure, we should give resources
3253	# that gcfclient doesn't grok a >10000 face index.
3254	my $res = $facedata->{resource};	3459	my $res = $facedata->{resource};
3255		3460
3256	while (my ($name, $info) = each %$res) {	3461	while (my ($name, $info) = each %$res) {
3257	if (defined $info->{type}) {	3462	if (defined $info->{type}) {
3258	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3463	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3259	my $data;
3260		3464
3261	if ($info->{type} & 1) {	3465	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};	3466	cf::face::set_type $idx, $info->{type};
3276	} else {	3467	} else {
3277	$RESOURCE{$name} = $info;	3468	$RESOURCE{$name} = $info; # unused
3278	}	3469	}
3279		3470
3280	cf::cede_to_tick;	3471	cf::cede_to_tick;
3281	}	3472	}
3282	}	3473	}
3283		3474
3284	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3475	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3285		3476
3286	1	3477	1
3287	}	3478	}
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		3479
3309	register_exticmd fx_want => sub {	3480	register_exticmd fx_want => sub {
3310	my ($ns, $want) = @_;	3481	my ($ns, $want) = @_;
3311		3482
3312	while (my ($k, $v) = each %$want) {	3483	while (my ($k, $v) = each %$want) {
…		…
3351	sub reload_treasures {	3522	sub reload_treasures {
3352	load_resource_file "$DATADIR/treasures"	3523	load_resource_file "$DATADIR/treasures"
3353	or die "unable to load treasurelists\n";	3524	or die "unable to load treasurelists\n";
3354	}	3525	}
3355		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
3356	sub reload_resources {	3550	sub reload_resources {
3357	warn "reloading resource files...\n";	3551	trace "reloading resource files...\n";
3358		3552
		3553	reload_exp_table;
		3554	reload_materials;
3359	reload_facedata;	3555	reload_facedata;
		3556	reload_sound;
3360	reload_archetypes;	3557	reload_archetypes;
3361	reload_regions;	3558	reload_regions;
3362	reload_treasures;	3559	reload_treasures;
3363		3560
3364	warn "finished reloading resource files\n";	3561	trace "finished reloading resource files\n";
3365	}	3562	}
3366		3563
3367	sub reload_config {	3564	sub reload_config {
3368	open my $fh, "<:utf8", "$CONFDIR/config"	3565	trace "reloading config file...\n";
3369	or return;
3370		3566
3371	local $/;	3567	0 < aio_load "$CONFDIR/config", my $config
3372	*CFG = YAML::Load <$fh>;	3568	or die "$CONFDIR/config: $!";
3373		3569
		3570	utf8::decode $config;
		3571	*CFG = yaml_load $config;
		3572
3374	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3573	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3375		3574
3376	$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};
3377	$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};
3378		3577
3379	if (exists $CFG{mlockall}) {	3578	if (exists $CFG{mlockall}) {
…		…
3403	seek $fh, 0, 0;	3602	seek $fh, 0, 0;
3404	print $fh $$;	3603	print $fh $$;
3405	}	3604	}
3406		3605
3407	sub main_loop {	3606	sub main_loop {
3408	warn "EV::loop starting\n";	3607	trace "EV::loop starting\n";
3409	if (1) {	3608	if (1) {
3410	EV::loop;	3609	EV::loop;
3411	}	3610	}
3412	warn "EV::loop returned\n";	3611	trace "EV::loop returned\n";
3413	goto &main_loop unless $REALLY_UNLOOP;	3612	goto &main_loop unless $REALLY_UNLOOP;
3414	}	3613	}
3415		3614
3416	sub main {	3615	sub main {
3417	cf::init_globals; # initialise logging	3616	cf::init_globals; # initialise logging
3418		3617
3419	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3618	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3420	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.";
3421	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3620	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3422	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3621	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		3622
3429	$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
3430		3624
3431	# we must not ever block the main coroutine	3625	# we must not ever block the main coroutine
3432	local $Coro::idle = sub {	3626	local $Coro::idle = sub {
…		…
3438	};	3632	};
3439		3633
3440	evthread_start IO::AIO::poll_fileno;	3634	evthread_start IO::AIO::poll_fileno;
3441		3635
3442	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
3443	reload_resources;	3645	reload_resources;
3444	reload_config;	3646	reload_config;
3445	db_init;	3647	db_init;
3446		3648
3447	cf::load_settings;
3448	cf::load_materials;
3449	cf::init_uuid;	3649	cf::init_uuid;
3450	cf::init_signals;	3650	cf::init_signals;
3451	cf::init_commands;
3452	cf::init_skills;	3651	cf::init_skills;
3453		3652
3454	cf::init_beforeplay;	3653	cf::init_beforeplay;
3455		3654
3456	atomic;	3655	atomic;
…		…
3464	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};
3465		3664
3466	(pop @POST_INIT)->(0) while @POST_INIT;	3665	(pop @POST_INIT)->(0) while @POST_INIT;
3467	};	3666	};
3468		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
3469	main_loop;	3676	goto &main_loop;
3470	}	3677	}
3471		3678
3472	#############################################################################	3679	#############################################################################
3473	# initialisation and cleanup	3680	# initialisation and cleanup
3474		3681
3475	# install some emergency cleanup handlers	3682	# install some emergency cleanup handlers
3476	BEGIN {	3683	BEGIN {
3477	our %SIGWATCHER = ();	3684	our %SIGWATCHER = ();
3478	for my $signal (qw(INT HUP TERM)) {	3685	for my $signal (qw(INT HUP TERM)) {
3479	$SIGWATCHER{$signal} = EV::signal $signal, sub {	3686	$SIGWATCHER{$signal} = AE::signal $signal, sub {
3480	cf::cleanup "SIG$signal";	3687	cf::cleanup "SIG$signal";
3481	};	3688	};
3482	}	3689	}
3483	}	3690	}
3484		3691
3485	sub write_runtime_sync {	3692	sub write_runtime_sync {
		3693	my $t0 = AE::time;
		3694
3486	# first touch the runtime file to show we are still running:	3695	# first touch the runtime file to show we are still running:
3487	# the fsync below can take a very very long time.	3696	# the fsync below can take a very very long time.
3488		3697
3489	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;	3698	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3490		3699
3491	my $guard = cf::lock_acquire "write_runtime";	3700	my $guard = cf::lock_acquire "write_runtime";
3492		3701
3493	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644	3702	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3494	or return;	3703	or return;
3495		3704
3496	my $value = $cf::RUNTIME + 90 + 10;	3705	my $value = $cf::RUNTIME + 90 + 10;
3497	# 10 is the runtime save interval, for a monotonic clock	3706	# 10 is the runtime save interval, for a monotonic clock
3498	# 60 allows for the watchdog to kill the server.	3707	# 60 allows for the watchdog to kill the server.
…		…
3511	or return;	3720	or return;
3512		3721
3513	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3722	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3514	and return;	3723	and return;
3515		3724
3516	warn "runtime file written.\n";	3725	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3517		3726
3518	1	3727	1
3519	}	3728	}
3520		3729
3521	our $uuid_lock;	3730	our $uuid_lock;
…		…
3533	or return;	3742	or return;
3534		3743
3535	my $value = uuid_seq uuid_cur;	3744	my $value = uuid_seq uuid_cur;
3536		3745
3537	unless ($value) {	3746	unless ($value) {
3538	warn "cowardly refusing to write zero uuid value!\n";	3747	info "cowardly refusing to write zero uuid value!\n";
3539	return;	3748	return;
3540	}	3749	}
3541		3750
3542	my $value = uuid_str $value + $uuid_skip;	3751	my $value = uuid_str $value + $uuid_skip;
3543	$uuid_skip = 0;	3752	$uuid_skip = 0;
…		…
3553	or return;	3762	or return;
3554		3763
3555	aio_rename "$uuid~", $uuid	3764	aio_rename "$uuid~", $uuid
3556	and return;	3765	and return;
3557		3766
3558	warn "uuid file written ($value).\n";	3767	trace "uuid file written ($value).\n";
3559		3768
3560	1	3769	1
3561		3770
3562	}	3771	}
3563		3772
…		…
3569	}	3778	}
3570		3779
3571	sub emergency_save() {	3780	sub emergency_save() {
3572	my $freeze_guard = cf::freeze_mainloop;	3781	my $freeze_guard = cf::freeze_mainloop;
3573		3782
3574	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;
3575		3789
3576	cf::sync_job {	3790	cf::sync_job {
3577	# this is a trade-off: we want to be very quick here, so	3791	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		3792
3582	# use a peculiar iteration method to avoid tripping on perl	3793	# use a peculiar iteration method to avoid tripping on perl
3583	# refcount bugs in for. also avoids problems with players	3794	# refcount bugs in for. also avoids problems with players
3584	# and maps saved/destroyed asynchronously.	3795	# and maps saved/destroyed asynchronously.
3585	warn "emergency_perl_save: begin player save\n";	3796	info "emergency_perl_save: begin player save\n";
3586	for my $login (keys %cf::PLAYER) {	3797	for my $login (keys %cf::PLAYER) {
3587	my $pl = $cf::PLAYER{$login} or next;	3798	my $pl = $cf::PLAYER{$login} or next;
3588	$pl->valid or next;	3799	$pl->valid or next;
3589	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3800	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3590	$pl->save;	3801	$pl->save;
3591	}	3802	}
3592	warn "emergency_perl_save: end player save\n";	3803	info "emergency_perl_save: end player save\n";
3593		3804
		3805	cf::write_runtime_sync; # external watchdog should not bark
		3806
3594	warn "emergency_perl_save: begin map save\n";	3807	info "emergency_perl_save: begin map save\n";
3595	for my $path (keys %cf::MAP) {	3808	for my $path (keys %cf::MAP) {
3596	my $map = $cf::MAP{$path} or next;	3809	my $map = $cf::MAP{$path} or next;
3597	$map->valid or next;	3810	$map->valid or next;
3598	$map->save;	3811	$map->save;
3599	}	3812	}
3600	warn "emergency_perl_save: end map save\n";	3813	info "emergency_perl_save: end map save\n";
3601		3814
		3815	cf::write_runtime_sync; # external watchdog should not bark
		3816
3602	warn "emergency_perl_save: begin database checkpoint\n";	3817	info "emergency_perl_save: begin database checkpoint\n";
3603	BDB::db_env_txn_checkpoint $DB_ENV;	3818	BDB::db_env_txn_checkpoint $DB_ENV;
3604	warn "emergency_perl_save: end database checkpoint\n";	3819	info "emergency_perl_save: end database checkpoint\n";
3605		3820
3606	warn "emergency_perl_save: begin write uuid\n";	3821	info "emergency_perl_save: begin write uuid\n";
3607	write_uuid_sync 1;	3822	write_uuid_sync 1;
3608	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
3609	};	3843	};
3610		3844
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";	3845	info "emergency_perl_save: leave\n";
3617	}	3846	}
3618		3847
3619	sub post_cleanup {	3848	sub post_cleanup {
3620	my ($make_core) = @_;	3849	my ($make_core) = @_;
3621		3850
		3851	IO::AIO::flush;
		3852
3622	warn Carp::longmess "post_cleanup backtrace"	3853	error Carp::longmess "post_cleanup backtrace"
3623	if $make_core;	3854	if $make_core;
3624		3855
3625	my $fh = pidfile;	3856	my $fh = pidfile;
3626	unlink $PIDFILE if <$fh> == $$;	3857	unlink $PIDFILE if <$fh> == $$;
3627	}	3858	}
…		…
3647	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	3878	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3648	for my $name (keys %$leaf_symtab) {	3879	for my $name (keys %$leaf_symtab) {
3649	_gv_clear *{"$pkg$name"};	3880	_gv_clear *{"$pkg$name"};
3650	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	3881	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3651	}	3882	}
3652	warn "cleared package $pkg\n";#d#
3653	}	3883	}
3654		3884
3655	sub do_reload_perl() {	3885	sub do_reload_perl() {
3656	# can/must only be called in main	3886	# can/must only be called in main
3657	if ($Coro::current != $Coro::main) {	3887	unless (in_main) {
3658	warn "can only reload from main coroutine";	3888	error "can only reload from main coroutine";
3659	return;	3889	return;
3660	}	3890	}
3661		3891
3662	return if $RELOAD++;	3892	return if $RELOAD++;
3663		3893
3664	my $t1 = EV::time;	3894	my $t1 = AE::time;
3665		3895
3666	while ($RELOAD) {	3896	while ($RELOAD) {
		3897	cf::get_slot 0.1, -1, "reload_perl";
3667	warn "reloading...";	3898	info "reloading...";
3668		3899
3669	warn "entering sync_job";	3900	trace "entering sync_job";
3670		3901
3671	cf::sync_job {	3902	cf::sync_job {
3672	cf::write_runtime_sync; # external watchdog should not bark
3673	cf::emergency_save;	3903	#cf::emergency_save;
3674	cf::write_runtime_sync; # external watchdog should not bark
3675		3904
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";	3905	trace "cancelling all extension coros";
3687	$_->cancel for values %EXT_CORO;	3906	$_->cancel for values %EXT_CORO;
3688	%EXT_CORO = ();	3907	%EXT_CORO = ();
3689		3908
3690	warn "removing commands";	3909	trace "removing commands";
3691	%COMMAND = ();	3910	%COMMAND = ();
3692		3911
3693	warn "removing ext/exti commands";	3912	trace "removing ext/exti commands";
3694	%EXTCMD = ();	3913	%EXTCMD = ();
3695	%EXTICMD = ();	3914	%EXTICMD = ();
3696		3915
3697	warn "unloading/nuking all extensions";	3916	trace "unloading/nuking all extensions";
3698	for my $pkg (@EXTS) {	3917	for my $pkg (@EXTS) {
3699	warn "... unloading $pkg";	3918	trace "... unloading $pkg";
3700		3919
3701	if (my $cb = $pkg->can ("unload")) {	3920	if (my $cb = $pkg->can ("unload")) {
3702	eval {	3921	eval {
3703	$cb->($pkg);	3922	$cb->($pkg);
3704	1	3923	1
3705	} or warn "$pkg unloaded, but with errors: $@";	3924	} or error "$pkg unloaded, but with errors: $@";
3706	}	3925	}
3707		3926
3708	warn "... clearing $pkg";	3927	trace "... clearing $pkg";
3709	clear_package $pkg;	3928	clear_package $pkg;
3710	}	3929	}
3711		3930
3712	warn "unloading all perl modules loaded from $LIBDIR";	3931	trace "unloading all perl modules loaded from $LIBDIR";
3713	while (my ($k, $v) = each %INC) {	3932	while (my ($k, $v) = each %INC) {
3714	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	3933	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3715		3934
3716	warn "... unloading $k";	3935	trace "... unloading $k";
3717	delete $INC{$k};	3936	delete $INC{$k};
3718		3937
3719	$k =~ s/\.pm$//;	3938	$k =~ s/\.pm$//;
3720	$k =~ s/\//::/g;	3939	$k =~ s/\//::/g;
3721		3940
…		…
3724	}	3943	}
3725		3944
3726	clear_package $k;	3945	clear_package $k;
3727	}	3946	}
3728		3947
3729	warn "getting rid of safe::, as good as possible";	3948	trace "getting rid of safe::, as good as possible";
3730	clear_package "safe::$_"	3949	clear_package "safe::$_"
3731	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);
3732		3951
3733	warn "unloading cf.pm \"a bit\"";	3952	trace "unloading cf.pm \"a bit\"";
3734	delete $INC{"cf.pm"};	3953	delete $INC{"cf.pm"};
3735	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	3954	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3736		3955
3737	# don't, removes xs symbols, too,	3956	# don't, removes xs symbols, too,
3738	# and global variables created in xs	3957	# and global variables created in xs
3739	#clear_package __PACKAGE__;	3958	#clear_package __PACKAGE__;
3740		3959
3741	warn "unload completed, starting to reload now";	3960	info "unload completed, starting to reload now";
3742		3961
3743	warn "reloading cf.pm";	3962	trace "reloading cf.pm";
3744	require cf;	3963	require cf;
3745	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3964	cf::_connect_to_perl_1;
3746		3965
3747	warn "loading config and database again";	3966	trace "loading config and database again";
3748	cf::reload_config;	3967	cf::reload_config;
3749		3968
3750	warn "loading extensions";	3969	trace "loading extensions";
3751	cf::load_extensions;	3970	cf::load_extensions;
3752		3971
3753	if ($REATTACH_ON_RELOAD) {	3972	if ($REATTACH_ON_RELOAD) {
3754	warn "reattaching attachments to objects/players";	3973	trace "reattaching attachments to objects/players";
3755	_global_reattach; # objects, sockets	3974	_global_reattach; # objects, sockets
3756	warn "reattaching attachments to maps";	3975	trace "reattaching attachments to maps";
3757	reattach $_ for values %MAP;	3976	reattach $_ for values %MAP;
3758	warn "reattaching attachments to players";	3977	trace "reattaching attachments to players";
3759	reattach $_ for values %PLAYER;	3978	reattach $_ for values %PLAYER;
3760	}	3979	}
3761		3980
3762	warn "running post_init jobs";	3981	trace "running post_init jobs";
3763	(pop @POST_INIT)->(1) while @POST_INIT;	3982	(pop @POST_INIT)->(1) while @POST_INIT;
3764		3983
3765	warn "leaving sync_job";	3984	trace "leaving sync_job";
3766		3985
3767	1	3986	1
3768	} or do {	3987	} or do {
3769	warn $@;	3988	error $@;
3770	cf::cleanup "error while reloading, exiting.";	3989	cf::cleanup "error while reloading, exiting.";
3771	};	3990	};
3772		3991
3773	warn "reloaded";	3992	info "reloaded";
3774	--$RELOAD;	3993	--$RELOAD;
3775	}	3994	}
3776		3995
3777	$t1 = EV::time - $t1;	3996	$t1 = AE::time - $t1;
3778	warn "reload completed in ${t1}s\n";	3997	info "reload completed in ${t1}s\n";
3779	};	3998	};
3780		3999
3781	our $RELOAD_WATCHER; # used only during reload	4000	our $RELOAD_WATCHER; # used only during reload
3782		4001
3783	sub reload_perl() {	4002	sub reload_perl() {
…		…
3785	# coro crashes during coro_state_free->destroy here.	4004	# coro crashes during coro_state_free->destroy here.
3786		4005
3787	$RELOAD_WATCHER ||= cf::async {	4006	$RELOAD_WATCHER ||= cf::async {
3788	Coro::AIO::aio_wait cache_extensions;	4007	Coro::AIO::aio_wait cache_extensions;
3789		4008
3790	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {	4009	$RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3791	do_reload_perl;	4010	do_reload_perl;
3792	undef $RELOAD_WATCHER;	4011	undef $RELOAD_WATCHER;
3793	};	4012	};
3794	};	4013	};
3795	}	4014	}
…		…
3804	reload_perl;	4023	reload_perl;
3805	};	4024	};
3806	}	4025	}
3807	};	4026	};
3808		4027
3809	unshift @INC, $LIBDIR;	4028	#############################################################################
3810		4029
3811	my $bug_warning = 0;	4030	my $bug_warning = 0;
3812		4031
3813	our @WAIT_FOR_TICK;	4032	our @WAIT_FOR_TICK;
3814	our @WAIT_FOR_TICK_BEGIN;	4033	our @WAIT_FOR_TICK_BEGIN;
3815		4034
3816	sub wait_for_tick {	4035	sub wait_for_tick() {
3817	return if tick_inhibit || $Coro::current == $Coro::main;	4036	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3818		4037
3819	my $signal = new Coro::Signal;	4038	my $signal = new Coro::Signal;
3820	push @WAIT_FOR_TICK, $signal;	4039	push @WAIT_FOR_TICK, $signal;
3821	$signal->wait;	4040	$signal->wait;
3822	}	4041	}
3823		4042
3824	sub wait_for_tick_begin {	4043	sub wait_for_tick_begin() {
3825	return if tick_inhibit || $Coro::current == $Coro::main;	4044	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3826		4045
3827	my $signal = new Coro::Signal;	4046	my $signal = new Coro::Signal;
3828	push @WAIT_FOR_TICK_BEGIN, $signal;	4047	push @WAIT_FOR_TICK_BEGIN, $signal;
3829	$signal->wait;	4048	$signal->wait;
3830	}	4049	}
…		…
3836	return;	4055	return;
3837	}	4056	}
3838		4057
3839	cf::server_tick; # one server iteration	4058	cf::server_tick; # one server iteration
3840		4059
		4060	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
		4061
3841	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4062	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3842	$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.;
3843	Coro::async_pool {	4064	Coro::async_pool {
3844	$Coro::current->{desc} = "runtime saver";	4065	$Coro::current->{desc} = "runtime saver";
3845	write_runtime_sync	4066	write_runtime_sync
3846	or warn "ERROR: unable to write runtime file: $!";	4067	or error "ERROR: unable to write runtime file: $!";
3847	};	4068	};
3848	}	4069	}
3849		4070
3850	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4071	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3851	$sig->send;	4072	$sig->send;
…		…
3859		4080
3860	if (0) {	4081	if (0) {
3861	if ($NEXT_TICK) {	4082	if ($NEXT_TICK) {
3862	my $jitter = $TICK_START - $NEXT_TICK;	4083	my $jitter = $TICK_START - $NEXT_TICK;
3863	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4084	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
3864	warn "jitter $JITTER\n";#d#	4085	debug "jitter $JITTER\n";#d#
3865	}	4086	}
3866	}	4087	}
3867	}	4088	}
3868		4089
3869	{	4090	{
3870	# configure BDB	4091	# configure BDB
3871		4092
3872	BDB::min_parallel 8;	4093	BDB::min_parallel 16;
3873	BDB::max_poll_reqs $TICK * 0.1;	4094	BDB::max_poll_reqs $TICK * 0.1;
3874	$AnyEvent::BDB::WATCHER->priority (1);	4095	$AnyEvent::BDB::WATCHER->priority (1);
3875		4096
3876	unless ($DB_ENV) {	4097	unless ($DB_ENV) {
3877	$DB_ENV = BDB::db_env_create;	4098	$DB_ENV = BDB::db_env_create;
…		…
3958	}	4179	}
3959	}	4180	}
3960		4181
3961	# load additional modules	4182	# load additional modules
3962	require "cf/$_.pm" for @EXTRA_MODULES;	4183	require "cf/$_.pm" for @EXTRA_MODULES;
		4184	cf::_connect_to_perl_2;
3963		4185
3964	END { cf::emergency_save }	4186	END { cf::emergency_save }
3965		4187
3966	1	4188	1
3967		4189

Diff Legend

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