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.470 by root, Sun Apr 26 19:42:45 2009 UTC vs.
Revision 1.534 by root, Thu Apr 29 08:13:51 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 5.10.0;
25	use utf8;	26	use utf8;
…		…
31	use EV;	32	use EV;
32	use Opcode;	33	use Opcode;
33	use Safe;	34	use Safe;
34	use Safe::Hole;	35	use Safe::Hole;
35	use Storable ();	36	use Storable ();
		37	use Carp ();
36		38
37	use Guard ();	39	use Guard ();
38	use Coro ();	40	use Coro ();
39	use Coro::State;	41	use Coro::State;
40	use Coro::Handle;	42	use Coro::Handle;
…		…
51	use Coro::Util ();	53	use Coro::Util ();
52		54
53	use JSON::XS 2.01 ();	55	use JSON::XS 2.01 ();
54	use BDB ();	56	use BDB ();
55	use Data::Dumper;	57	use Data::Dumper;
56	use Digest::MD5;
57	use Fcntl;	58	use Fcntl;
58	use YAML ();	59	use YAML::XS ();
59	use IO::AIO ();	60	use IO::AIO ();
60	use Time::HiRes;	61	use Time::HiRes;
61	use Compress::LZF;	62	use Compress::LZF;
62	use Digest::MD5 ();	63	use Digest::MD5 ();
63		64
…		…
71	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority	72	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
72		73
73	# make sure c-lzf reinitialises itself	74	# make sure c-lzf reinitialises itself
74	Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";	75	Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
75	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later	76	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
		77
		78	# strictly for debugging
		79	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
76		80
77	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	81	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
78		82
79	our %COMMAND = ();	83	our %COMMAND = ();
80	our %COMMAND_TIME = ();	84	our %COMMAND_TIME = ();
…		…
85	our %EXT_CORO = (); # coroutines bound to extensions	89	our %EXT_CORO = (); # coroutines bound to extensions
86	our %EXT_MAP = (); # pluggable maps	90	our %EXT_MAP = (); # pluggable maps
87		91
88	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
89	our @EVENT;	93	our @EVENT;
		94	our @REFLECT; # set by XS
		95	our %REFLECT; # set by us
90		96
91	our $CONFDIR = confdir;	97	our $CONFDIR = confdir;
92	our $DATADIR = datadir;	98	our $DATADIR = datadir;
93	our $LIBDIR = "$DATADIR/ext";	99	our $LIBDIR = "$DATADIR/ext";
94	our $PODDIR = "$DATADIR/pod";	100	our $PODDIR = "$DATADIR/pod";
…		…
100	our $RANDOMDIR = "$LOCALDIR/random";	106	our $RANDOMDIR = "$LOCALDIR/random";
101	our $BDBDIR = "$LOCALDIR/db";	107	our $BDBDIR = "$LOCALDIR/db";
102	our $PIDFILE = "$LOCALDIR/pid";	108	our $PIDFILE = "$LOCALDIR/pid";
103	our $RUNTIMEFILE = "$LOCALDIR/runtime";	109	our $RUNTIMEFILE = "$LOCALDIR/runtime";
104		110
105	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;
106		118
107	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	119	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
108	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	120	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
109	our $NEXT_TICK;	121	our $NEXT_TICK;
110	our $USE_FSYNC = 1; # use fsync to write maps - default on	122	our $USE_FSYNC = 1; # use fsync to write maps - default on
…		…
112	our $BDB_DEADLOCK_WATCHER;	124	our $BDB_DEADLOCK_WATCHER;
113	our $BDB_CHECKPOINT_WATCHER;	125	our $BDB_CHECKPOINT_WATCHER;
114	our $BDB_TRICKLE_WATCHER;	126	our $BDB_TRICKLE_WATCHER;
115	our $DB_ENV;	127	our $DB_ENV;
116		128
117	our @EXTRA_MODULES = qw(pod mapscript);	129	our @EXTRA_MODULES = qw(pod match mapscript);
118		130
119	our %CFG;	131	our %CFG;
120		132
121	our $UPTIME; $UPTIME ||= time;	133	our $UPTIME; $UPTIME ||= time;
122	our $RUNTIME;	134	our $RUNTIME;
…		…
134	our $JITTER; # average jitter	146	our $JITTER; # average jitter
135	our $TICK_START; # for load detecting purposes	147	our $TICK_START; # for load detecting purposes
136		148
137	our @POST_INIT;	149	our @POST_INIT;
138		150
139	our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)	151	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
		152	our $REALLY_UNLOOP; # never set to true, please :)
140		153
141	binmode STDOUT;	154	binmode STDOUT;
142	binmode STDERR;	155	binmode STDERR;
143		156
144	# read virtual server time, if available	157	# read virtual server time, if available
…		…
155		168
156	our $EMERGENCY_POSITION;	169	our $EMERGENCY_POSITION;
157		170
158	sub cf::map::normalise;	171	sub cf::map::normalise;
159		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
160	#############################################################################	188	#############################################################################
161		189
162	=head2 GLOBAL VARIABLES	190	=head2 GLOBAL VARIABLES
163		191
164	=over 4	192	=over 4
…		…
210	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 process
211	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.
212		240
213	=item @cf::INVOKE_RESULTS	241	=item @cf::INVOKE_RESULTS
214		242
215	This array contains the results of the last C<invoke ()> call. When	243	This array contains the results of the last C<invoke ()> call. When
216	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of	244	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
217	that call.	245	that call.
218		246
		247	=item %cf::REFLECT
		248
		249	Contains, for each (C++) class name, a hash reference with information
		250	about object members (methods, scalars, arrays and flags) and other
		251	metadata, which is useful for introspection.
		252
219	=back	253	=back
220		254
221	=cut	255	=cut
222		256
223	BEGIN {	257	sub error(@) { LOG llevError, join "", @_ }
224	*CORE::GLOBAL::warn = sub {	258	sub warn (@) { LOG llevWarn , join "", @_ }
		259	sub info (@) { LOG llevInfo , join "", @_ }
		260	sub debug(@) { LOG llevDebug, join "", @_ }
		261	sub trace(@) { LOG llevTrace, join "", @_ }
		262
		263	$Coro::State::WARNHOOK = sub {
225	my $msg = join "", @_;	264	my $msg = join "", @_;
226		265
227	$msg .= "\n"	266	$msg .= "\n"
228	unless $msg =~ /\n$/;	267	unless $msg =~ /\n$/;
229		268
230	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	269	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
231		270
232	LOG llevError, $msg;	271	LOG llevWarn, $msg;
233	};	272	};
234	}
235		273
236	$Coro::State::DIEHOOK = sub {	274	$Coro::State::DIEHOOK = sub {
237	return unless $^S eq 0; # "eq", not "=="	275	return unless $^S eq 0; # "eq", not "=="
238		276
239	if ($Coro::current == $Coro::main) {#d#	277	error Carp::longmess $_[0];
		278
		279	if (in_main) {#d#
240	warn "DIEHOOK called in main context, Coro bug?\n";#d#	280	error "DIEHOOK called in main context, Coro bug?\n";#d#
241	return;#d#	281	return;#d#
242	}#d#	282	}#d#
243		283
244	# kill coroutine otherwise	284	# kill coroutine otherwise
245	warn Carp::longmess $_[0];
246	Coro::terminate	285	Coro::terminate
247	};	286	};
248
249	$SIG{__DIE__} = sub { }; #d#?
250		287
251	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	288	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
252	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	289	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
253	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	290	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
254	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	291	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
…		…
268	)) {	305	)) {
269	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	306	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
270	}	307	}
271		308
272	$EV::DIED = sub {	309	$EV::DIED = sub {
273	warn "error in event callback: @_";	310	Carp::cluck "error in event callback: @_";
274	};	311	};
275		312
276	#############################################################################	313	#############################################################################
277		314
278	=head2 UTILITY FUNCTIONS	315	=head2 UTILITY FUNCTIONS
…		…
375	}	412	}
376		413
377	=item cf::periodic $interval, $cb	414	=item cf::periodic $interval, $cb
378		415
379	Like EV::periodic, but randomly selects a starting point so that the actions	416	Like EV::periodic, but randomly selects a starting point so that the actions
380	get spread over timer.	417	get spread over time.
381		418
382	=cut	419	=cut
383		420
384	sub periodic($$) {	421	sub periodic($$) {
385	my ($interval, $cb) = @_;	422	my ($interval, $cb) = @_;
…		…
402		439
403	=cut	440	=cut
404		441
405	our @SLOT_QUEUE;	442	our @SLOT_QUEUE;
406	our $SLOT_QUEUE;	443	our $SLOT_QUEUE;
		444	our $SLOT_DECAY = 0.9;
407		445
408	$SLOT_QUEUE->cancel if $SLOT_QUEUE;	446	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
409	$SLOT_QUEUE = Coro::async {	447	$SLOT_QUEUE = Coro::async {
410	$Coro::current->desc ("timeslot manager");	448	$Coro::current->desc ("timeslot manager");
411		449
412	my $signal = new Coro::Signal;	450	my $signal = new Coro::Signal;
		451	my $busy;
413		452
414	while () {	453	while () {
415	next_job:	454	next_job:
		455
416	my $avail = cf::till_tick;	456	my $avail = cf::till_tick;
417	if ($avail > 0.01) {	457
418	for (0 .. $#SLOT_QUEUE) {	458	for (0 .. $#SLOT_QUEUE) {
419	if ($SLOT_QUEUE[$_][0] < $avail) {	459	if ($SLOT_QUEUE[$_][0] <= $avail) {
		460	$busy = 0;
420	my $job = splice @SLOT_QUEUE, $_, 1, ();	461	my $job = splice @SLOT_QUEUE, $_, 1, ();
421	$job->[2]->send;	462	$job->[2]->send;
422	Coro::cede;	463	Coro::cede;
423	goto next_job;	464	goto next_job;
424	}	465	} else {
		466	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
425	}	467	}
426	}	468	}
427		469
428	if (@SLOT_QUEUE) {	470	if (@SLOT_QUEUE) {
429	# we do not use wait_for_tick() as it returns immediately when tick is inactive	471	# we do not use wait_for_tick() as it returns immediately when tick is inactive
430	push @cf::WAIT_FOR_TICK, $signal;	472	push @cf::WAIT_FOR_TICK, $signal;
431	$signal->wait;	473	$signal->wait;
432	} else {	474	} else {
		475	$busy = 0;
433	Coro::schedule;	476	Coro::schedule;
434	}	477	}
435	}	478	}
436	};	479	};
437		480
438	sub get_slot($;$$) {	481	sub get_slot($;$$) {
439	return if tick_inhibit || $Coro::current == $Coro::main;	482	return if tick_inhibit || $Coro::current == $Coro::main;
440		483
441	my ($time, $pri, $name) = @_;	484	my ($time, $pri, $name) = @_;
442		485
443	$time = $TICK * .6 if $time > $TICK * .6;	486	$time = clamp $time, 0.01, $TICK * .6;
		487
444	my $sig = new Coro::Signal;	488	my $sig = new Coro::Signal;
445		489
446	push @SLOT_QUEUE, [$time, $pri, $sig, $name];	490	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
447	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;	491	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
448	$SLOT_QUEUE->ready;	492	$SLOT_QUEUE->ready;
…		…
474	=cut	518	=cut
475		519
476	sub sync_job(&) {	520	sub sync_job(&) {
477	my ($job) = @_;	521	my ($job) = @_;
478		522
479	if ($Coro::current == $Coro::main) {	523	if (in_main) {
480	my $time = EV::time;	524	my $time = AE::time;
481		525
482	# this is the main coro, too bad, we have to block	526	# this is the main coro, too bad, we have to block
483	# till the operation succeeds, freezing the server :/	527	# till the operation succeeds, freezing the server :/
484		528
485	LOG llevError, Carp::longmess "sync job";#d#	529	#LOG llevError, Carp::longmess "sync job";#d#
486		530
487	my $freeze_guard = freeze_mainloop;	531	my $freeze_guard = freeze_mainloop;
488		532
489	my $busy = 1;	533	my $busy = 1;
490	my @res;	534	my @res;
491		535
492	(async {	536	(async {
493	$Coro::current->desc ("sync job coro");	537	$Coro::current->desc ("sync job coro");
494	@res = eval { $job->() };	538	@res = eval { $job->() };
495	warn $@ if $@;	539	error $@ if $@;
496	undef $busy;	540	undef $busy;
497	})->prio (Coro::PRIO_MAX);	541	})->prio (Coro::PRIO_MAX);
498		542
499	while ($busy) {	543	while ($busy) {
500	if (Coro::nready) {	544	if (Coro::nready) {
…		…
502	} else {	546	} else {
503	EV::loop EV::LOOP_ONESHOT;	547	EV::loop EV::LOOP_ONESHOT;
504	}	548	}
505	}	549	}
506		550
507	my $time = EV::time - $time;	551	my $time = AE::time - $time;
508		552
509	$TICK_START += $time; # do not account sync jobs to server load	553	$TICK_START += $time; # do not account sync jobs to server load
510		554
511	wantarray ? @res : $res[0]	555	wantarray ? @res : $res[0]
512	} else {	556	} else {
…		…
556	reset_signals;	600	reset_signals;
557	&$cb	601	&$cb
558	}, @args;	602	}, @args;
559		603
560	wantarray ? @res : $res[-1]	604	wantarray ? @res : $res[-1]
		605	}
		606
		607	sub objinfo {
		608	(
		609	"counter value" => cf::object::object_count,
		610	"objects created" => cf::object::create_count,
		611	"objects destroyed" => cf::object::destroy_count,
		612	"freelist size" => cf::object::free_count,
		613	"allocated objects" => cf::object::objects_size,
		614	"active objects" => cf::object::actives_size,
		615	)
561	}	616	}
562		617
563	=item $coin = coin_from_name $name	618	=item $coin = coin_from_name $name
564		619
565	=cut	620	=cut
…		…
602	within each server.	657	within each server.
603		658
604	=cut	659	=cut
605		660
606	sub db_table($) {	661	sub db_table($) {
		662	cf::error "db_get called from main context"
		663	if $Coro::current == $Coro::main;
		664
607	my ($name) = @_;	665	my ($name) = @_;
608	my $db = BDB::db_create $DB_ENV;	666	my $db = BDB::db_create $DB_ENV;
609		667
610	eval {	668	eval {
611	$db->set_flags (BDB::CHKSUM);	669	$db->set_flags (BDB::CHKSUM);
…		…
621	}	679	}
622		680
623	our $DB;	681	our $DB;
624		682
625	sub db_init {	683	sub db_init {
626	cf::sync_job {
627	$DB ||= db_table "db";	684	$DB ||= db_table "db";
628	};
629	}	685	}
630		686
631	sub db_get($$) {	687	sub db_get($$) {
632	my $key = "$_[0]/$_[1]";	688	my $key = "$_[0]/$_[1]";
633		689
634	cf::sync_job {	690	cf::error "db_get called from main context"
		691	if $Coro::current == $Coro::main;
		692
635	BDB::db_get $DB, undef, $key, my $data;	693	BDB::db_get $DB, undef, $key, my $data;
636		694
637	$! ? ()	695	$! ? ()
638	: $data	696	: $data
639	}
640	}	697	}
641		698
642	sub db_put($$$) {	699	sub db_put($$$) {
643	BDB::dbreq_pri 4;	700	BDB::dbreq_pri 4;
644	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	701	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
700		757
701	my $t1 = Time::HiRes::time;	758	my $t1 = Time::HiRes::time;
702	my $data = $process->(\@data);	759	my $data = $process->(\@data);
703	my $t2 = Time::HiRes::time;	760	my $t2 = Time::HiRes::time;
704		761
705	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	762	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
706		763
707	db_put cache => "$id/data", $data;	764	db_put cache => "$id/data", $data;
708	db_put cache => "$id/md5" , $md5;	765	db_put cache => "$id/md5" , $md5;
709	db_put cache => "$id/meta", $meta;	766	db_put cache => "$id/meta", $meta;
710		767
…		…
720		777
721	=cut	778	=cut
722		779
723	sub datalog($@) {	780	sub datalog($@) {
724	my ($type, %kv) = @_;	781	my ($type, %kv) = @_;
725	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	782	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
726	}	783	}
727		784
728	=back	785	=back
729		786
730	=cut	787	=cut
…		…
925		982
926	} elsif (exists $cb_id{$type}) {	983	} elsif (exists $cb_id{$type}) {
927	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	984	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
928		985
929	} elsif (ref $type) {	986	} elsif (ref $type) {
930	warn "attaching objects not supported, ignoring.\n";	987	error "attaching objects not supported, ignoring.\n";
931		988
932	} else {	989	} else {
933	shift @arg;	990	shift @arg;
934	warn "attach argument '$type' not supported, ignoring.\n";	991	error "attach argument '$type' not supported, ignoring.\n";
935	}	992	}
936	}	993	}
937	}	994	}
938		995
939	sub _object_attach {	996	sub _object_attach {
…		…
949	_attach $registry, $klass, @attach;	1006	_attach $registry, $klass, @attach;
950	}	1007	}
951		1008
952	$obj->{$name} = \%arg;	1009	$obj->{$name} = \%arg;
953	} else {	1010	} else {
954	warn "object uses attachment '$name' which is not available, postponing.\n";	1011	info "object uses attachment '$name' which is not available, postponing.\n";
955	}	1012	}
956		1013
957	$obj->{_attachment}{$name} = undef;	1014	$obj->{_attachment}{$name} = undef;
958	}	1015	}
959		1016
…		…
1018		1075
1019	for (@$callbacks) {	1076	for (@$callbacks) {
1020	eval { &{$_->[1]} };	1077	eval { &{$_->[1]} };
1021		1078
1022	if ($@) {	1079	if ($@) {
1023	warn "$@";
1024	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1080	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1025	override;	1081	override;
1026	}	1082	}
1027		1083
1028	return 1 if $override;	1084	return 1 if $override;
1029	}	1085	}
…		…
1108	for (@$attach) {	1164	for (@$attach) {
1109	my ($klass, @attach) = @$_;	1165	my ($klass, @attach) = @$_;
1110	_attach $registry, $klass, @attach;	1166	_attach $registry, $klass, @attach;
1111	}	1167	}
1112	} else {	1168	} else {
1113	warn "object uses attachment '$name' that is not available, postponing.\n";	1169	info "object uses attachment '$name' that is not available, postponing.\n";
1114	}	1170	}
1115	}	1171	}
1116	}	1172	}
1117		1173
1118	cf::attachable->attach (	1174	cf::attachable->attach (
…		…
1145	my ($filename, $rdata, $objs) = @_;	1201	my ($filename, $rdata, $objs) = @_;
1146		1202
1147	sync_job {	1203	sync_job {
1148	if (length $$rdata) {	1204	if (length $$rdata) {
1149	utf8::decode (my $decname = $filename);	1205	utf8::decode (my $decname = $filename);
1150	warn sprintf "saving %s (%d,%d)\n",	1206	trace sprintf "saving %s (%d,%d)\n",
1151	$decname, length $$rdata, scalar @$objs;	1207	$decname, length $$rdata, scalar @$objs
		1208	if $VERBOSE_IO;
1152		1209
1153	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1210	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1154	aio_chmod $fh, SAVE_MODE;	1211	aio_chmod $fh, SAVE_MODE;
1155	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1212	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1156	aio_fsync $fh if $cf::USE_FSYNC;	1213	if ($cf::USE_FSYNC) {
		1214	aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
		1215	aio_fsync $fh;
		1216	}
1157	aio_close $fh;	1217	aio_close $fh;
1158		1218
1159	if (@$objs) {	1219	if (@$objs) {
1160	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {	1220	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1161	aio_chmod $fh, SAVE_MODE;	1221	aio_chmod $fh, SAVE_MODE;
1162	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };	1222	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1163	aio_write $fh, 0, (length $data), $data, 0;	1223	aio_write $fh, 0, (length $data), $data, 0;
1164	aio_fsync $fh if $cf::USE_FSYNC;	1224	if ($cf::USE_FSYNC) {
		1225	aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
		1226	aio_fsync $fh;
		1227	}
1165	aio_close $fh;	1228	aio_close $fh;
1166	aio_rename "$filename.pst~", "$filename.pst";	1229	aio_rename "$filename.pst~", "$filename.pst";
1167	}	1230	}
1168	} else {	1231	} else {
1169	aio_unlink "$filename.pst";	1232	aio_unlink "$filename.pst";
…		…
1172	aio_rename "$filename~", $filename;	1235	aio_rename "$filename~", $filename;
1173		1236
1174	$filename =~ s%/[^/]+$%%;	1237	$filename =~ s%/[^/]+$%%;
1175	aio_pathsync $filename if $cf::USE_FSYNC;	1238	aio_pathsync $filename if $cf::USE_FSYNC;
1176	} else {	1239	} else {
1177	warn "unable to save objects: $filename~: $!\n";	1240	error "unable to save objects: $filename~: $!\n";
1178	}	1241	}
1179	} else {	1242	} else {
1180	aio_unlink $filename;	1243	aio_unlink $filename;
1181	aio_unlink "$filename.pst";	1244	aio_unlink "$filename.pst";
1182	}	1245	}
…		…
1206	my $st = eval { Coro::Storable::thaw $av };	1269	my $st = eval { Coro::Storable::thaw $av };
1207	$av = $st->{objs};	1270	$av = $st->{objs};
1208	}	1271	}
1209		1272
1210	utf8::decode (my $decname = $filename);	1273	utf8::decode (my $decname = $filename);
1211	warn sprintf "loading %s (%d,%d)\n",	1274	trace sprintf "loading %s (%d,%d)\n",
1212	$decname, length $data, scalar @{$av || []};	1275	$decname, length $data, scalar @{$av || []}
		1276	if $VERBOSE_IO;
1213		1277
1214	($data, $av)	1278	($data, $av)
1215	}	1279	}
1216		1280
1217	=head2 COMMAND CALLBACKS	1281	=head2 COMMAND CALLBACKS
…		…
1276	}	1340	}
1277		1341
1278	use File::Glob ();	1342	use File::Glob ();
1279		1343
1280	cf::player->attach (	1344	cf::player->attach (
1281	on_command => sub {	1345	on_unknown_command => sub {
1282	my ($pl, $name, $params) = @_;	1346	my ($pl, $name, $params) = @_;
1283		1347
1284	my $cb = $COMMAND{$name}	1348	my $cb = $COMMAND{$name}
1285	or return;	1349	or return;
1286		1350
…		…
1309		1373
1310	$pl->ext_reply ($reply, @reply)	1374	$pl->ext_reply ($reply, @reply)
1311	if $reply;	1375	if $reply;
1312		1376
1313	} else {	1377	} else {
1314	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1378	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1315	}	1379	}
1316		1380
1317	cf::override;	1381	cf::override;
1318	},	1382	},
1319	);	1383	);
1320		1384
1321	# "readahead" all extensions	1385	# "readahead" all extensions
1322	sub cache_extensions {	1386	sub cache_extensions {
1323	my $grp = IO::AIO::aio_group;	1387	my $grp = IO::AIO::aio_group;
1324		1388
1325	add $grp IO::AIO::aio_readdir $LIBDIR, sub {	1389	add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1326	for (grep /\.ext$/, @{$_[0]}) {	1390	for (grep /\.ext$/, @{$_[0]}) {
1327	add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;	1391	add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1328	}	1392	}
1329	};	1393	};
1330		1394
1331	$grp	1395	$grp
1332	}	1396	}
1333		1397
1334	sub load_extensions {	1398	sub load_extensions {
		1399	info "loading extensions...";
		1400
1335	cf::sync_job {	1401	cf::sync_job {
1336	my %todo;	1402	my %todo;
1337		1403
1338	for my $path (<$LIBDIR/*.ext>) {	1404	for my $path (<$LIBDIR/*.ext>) {
1339	next unless -r $path;	1405	next unless -r $path;
…		…
1365	. "\n};\n1";	1431	. "\n};\n1";
1366		1432
1367	$todo{$base} = \%ext;	1433	$todo{$base} = \%ext;
1368	}	1434	}
1369		1435
		1436	my $pass = 0;
1370	my %done;	1437	my %done;
1371	while (%todo) {	1438	while (%todo) {
1372	my $progress;	1439	my $progress;
1373		1440
		1441	++$pass;
		1442
		1443	ext:
1374	while (my ($k, $v) = each %todo) {	1444	while (my ($k, $v) = each %todo) {
1375	for (split /,\s*/, $v->{meta}{depends}) {	1445	for (split /,\s*/, $v->{meta}{depends}) {
1376	goto skip	1446	next ext
1377	unless exists $done{$_};	1447	unless exists $done{$_};
1378	}	1448	}
1379		1449
1380	warn "... loading '$k' into '$v->{pkg}'\n";	1450	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1381		1451
1382	unless (eval $v->{source}) {	1452	my $active = eval $v->{source};
		1453
		1454	if (length $@) {
1383	my $msg = $@ ? "$v->{path}: $@\n"	1455	error "$v->{path}: $@\n";
1384	: "$v->{base}: extension inactive.\n";
1385		1456
1386	if (exists $v->{meta}{mandatory}) {
1387	warn $msg;
1388	cf::cleanup "mandatory extension failed to load, exiting.";	1457	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1389	}	1458	if exists $v->{meta}{mandatory};
1390		1459
1391	warn $msg;	1460	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
		1461	delete $todo{$k};
		1462	} else {
		1463	$done{$k} = delete $todo{$k};
		1464	push @EXTS, $v->{pkg};
		1465	$progress = 1;
		1466
		1467	info "$v->{base}: extension inactive.\n"
		1468	unless $active;
1392	}	1469	}
1393
1394	$done{$k} = delete $todo{$k};
1395	push @EXTS, $v->{pkg};
1396	$progress = 1;
1397	}	1470	}
1398		1471
1399	skip:	1472	unless ($progress) {
1400	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"	1473	warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1401	unless $progress;	1474
		1475	while (my ($k, $v) = each %todo) {
		1476	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
		1477	if exists $v->{meta}{mandatory};
		1478	}
		1479	}
1402	}	1480	}
1403	};	1481	};
1404	}	1482	}
1405		1483
1406	#############################################################################	1484	#############################################################################
…		…
1490	$cf::PLAYER{$login} = $pl	1568	$cf::PLAYER{$login} = $pl
1491	}	1569	}
1492	}	1570	}
1493	}	1571	}
1494		1572
		1573	cf::player->attach (
		1574	on_load => sub {
		1575	my ($pl, $path) = @_;
		1576
		1577	# restore slots saved in save, below
		1578	my $slots = delete $pl->{_slots};
		1579
		1580	$pl->ob->current_weapon ($slots->[0]);
		1581	$pl->combat_ob ($slots->[1]);
		1582	$pl->ranged_ob ($slots->[2]);
		1583	},
		1584	);
		1585
1495	sub save($) {	1586	sub save($) {
1496	my ($pl) = @_;	1587	my ($pl) = @_;
1497		1588
1498	return if $pl->{deny_save};	1589	return if $pl->{deny_save};
1499		1590
…		…
1504		1595
1505	aio_mkdir playerdir $pl, 0770;	1596	aio_mkdir playerdir $pl, 0770;
1506	$pl->{last_save} = $cf::RUNTIME;	1597	$pl->{last_save} = $cf::RUNTIME;
1507		1598
1508	cf::get_slot 0.01;	1599	cf::get_slot 0.01;
		1600
		1601	# save slots, to be restored later
		1602	local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1509		1603
1510	$pl->save_pl ($path);	1604	$pl->save_pl ($path);
1511	cf::cede_to_tick;	1605	cf::cede_to_tick;
1512	}	1606	}
1513		1607
…		…
1550	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1644	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1551		1645
1552	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1646	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1553	$pl->deactivate;	1647	$pl->deactivate;
1554	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1648	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1555	$pl->ob->check_score;
1556	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1649	$pl->invoke (cf::EVENT_PLAYER_QUIT);
1557	$pl->ns->destroy if $pl->ns;	1650	$pl->ns->destroy if $pl->ns;
1558		1651
1559	my $path = playerdir $pl;	1652	my $path = playerdir $pl;
1560	my $temp = "$path~$cf::RUNTIME~deleting~";	1653	my $temp = "$path~$cf::RUNTIME~deleting~";
…		…
1615	\@logins	1708	\@logins
1616	}	1709	}
1617		1710
1618	=item $player->maps	1711	=item $player->maps
1619		1712
		1713	=item cf::player::maps $login
		1714
1620	Returns an arrayref of map paths that are private for this	1715	Returns an arrayref of map paths that are private for this
1621	player. May block.	1716	player. May block.
1622		1717
1623	=cut	1718	=cut
1624		1719
…		…
1686	=cut	1781	=cut
1687		1782
1688	sub find_by_path($) {	1783	sub find_by_path($) {
1689	my ($path) = @_;	1784	my ($path) = @_;
1690		1785
		1786	$path =~ s/^~[^\/]*//; # skip ~login
		1787
1691	my ($match, $specificity);	1788	my ($match, $specificity);
1692		1789
1693	for my $region (list) {	1790	for my $region (list) {
1694	if ($region->{match} && $path =~ $region->{match}) {	1791	if ($region->{match} && $path =~ $region->{match}) {
1695	($match, $specificity) = ($region, $region->specificity)	1792	($match, $specificity) = ($region, $region->specificity)
…		…
1726	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	1823	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1727		1824
1728	# mit "rum" bekleckern, nicht	1825	# mit "rum" bekleckern, nicht
1729	$self->_create_random_map (	1826	$self->_create_random_map (
1730	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},	1827	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1731	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},	1828	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1732	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},	1829	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1733	$rmp->{exit_on_final_map},	1830	$rmp->{exit_on_final_map},
1734	$rmp->{xsize}, $rmp->{ysize},	1831	$rmp->{xsize}, $rmp->{ysize},
1735	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},	1832	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1736	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},	1833	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
…		…
1758		1855
1759	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	1856	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1760	}	1857	}
1761		1858
1762	# also paths starting with '/'	1859	# also paths starting with '/'
1763	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	1860	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1764		1861
1765	sub thawer_merge {	1862	sub thawer_merge {
1766	my ($self, $merge) = @_;	1863	my ($self, $merge) = @_;
1767		1864
1768	# we have to keep some variables in memory intact	1865	# we have to keep some variables in memory intact
…		…
1982		2079
1983	$cf::MAP{$path} = $map	2080	$cf::MAP{$path} = $map
1984	}	2081	}
1985	}	2082	}
1986		2083
1987	sub pre_load { }	2084	sub pre_load { }
1988	sub post_load { }	2085	#sub post_load { } # XS
1989		2086
1990	sub load {	2087	sub load {
1991	my ($self) = @_;	2088	my ($self) = @_;
1992		2089
1993	local $self->{deny_reset} = 1; # loading can take a long time	2090	local $self->{deny_reset} = 1; # loading can take a long time
…		…
2050	}	2147	}
2051		2148
2052	$self->post_load;	2149	$self->post_load;
2053	}	2150	}
2054		2151
		2152	# customize the map for a given player, i.e.
		2153	# return the _real_ map. used by e.g. per-player
		2154	# maps to change the path to ~playername/mappath
2055	sub customise_for {	2155	sub customise_for {
2056	my ($self, $ob) = @_;	2156	my ($self, $ob) = @_;
2057		2157
2058	return find "~" . $ob->name . "/" . $self->{path}	2158	return find "~" . $ob->name . "/" . $self->{path}
2059	if $self->per_player;	2159	if $self->per_player;
…		…
2075	or next;	2175	or next;
2076	$neigh = find $neigh, $map	2176	$neigh = find $neigh, $map
2077	or next;	2177	or next;
2078	$neigh->load;	2178	$neigh->load;
2079		2179
		2180	# now find the diagonal neighbours
2080	push @neigh,	2181	push @neigh,
2081	[$neigh->tile_path (($_ + 3) % 4), $neigh],	2182	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2082	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2183	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2083	}	2184	}
2084		2185
…		…
2091	}	2192	}
2092		2193
2093	sub find_sync {	2194	sub find_sync {
2094	my ($path, $origin) = @_;	2195	my ($path, $origin) = @_;
2095		2196
2096	cf::sync_job { find $path, $origin }	2197	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
		2198	if $Coro::current == $Coro::main;
		2199
		2200	find $path, $origin
2097	}	2201	}
2098		2202
2099	sub do_load_sync {	2203	sub do_load_sync {
2100	my ($map) = @_;	2204	my ($map) = @_;
2101		2205
2102	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2206	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2103	if $Coro::current == $Coro::main;	2207	if $Coro::current == $Coro::main;
2104		2208
2105	cf::sync_job { $map->load };	2209	$map->load;
2106	}	2210	}
2107		2211
2108	our %MAP_PREFETCH;	2212	our %MAP_PREFETCH;
2109	our $MAP_PREFETCHER = undef;	2213	our $MAP_PREFETCHER = undef;
2110		2214
…		…
2136	$MAP_PREFETCHER->prio (6);	2240	$MAP_PREFETCHER->prio (6);
2137		2241
2138	()	2242	()
2139	}	2243	}
2140		2244
		2245	# common code, used by both ->save and ->swapout
2141	sub save {	2246	sub _save {
2142	my ($self) = @_;	2247	my ($self) = @_;
2143
2144	my $lock = cf::lock_acquire "map_data:$self->{path}";
2145		2248
2146	$self->{last_save} = $cf::RUNTIME;	2249	$self->{last_save} = $cf::RUNTIME;
2147		2250
2148	return unless $self->dirty;	2251	return unless $self->dirty;
2149		2252
…		…
2169	} else {	2272	} else {
2170	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);	2273	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2171	}	2274	}
2172	}	2275	}
2173		2276
		2277	sub save {
		2278	my ($self) = @_;
		2279
		2280	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2281
		2282	$self->_save;
		2283	}
		2284
2174	sub swap_out {	2285	sub swap_out {
2175	my ($self) = @_;	2286	my ($self) = @_;
2176		2287
2177	# save first because save cedes
2178	$self->save;
2179
2180	my $lock = cf::lock_acquire "map_data:$self->{path}";	2288	my $lock = cf::lock_acquire "map_data:$self->{path}";
2181		2289
2182	return if $self->players;
2183	return if $self->in_memory != cf::MAP_ACTIVE;	2290	return if $self->in_memory != cf::MAP_ACTIVE;
2184	return if $self->{deny_save};	2291	return if $self->{deny_save};
		2292	return if $self->players;
2185		2293
		2294	# first deactivate the map and "unlink" it from the core
		2295	$self->deactivate;
		2296	$_->clear_links_to ($self) for values %cf::MAP;
2186	$self->in_memory (cf::MAP_SWAPPED);	2297	$self->in_memory (cf::MAP_SWAPPED);
		2298
		2299	# then atomically save
		2300	$self->_save;
		2301
		2302	# then free the map
		2303	$self->clear;
		2304	}
		2305
		2306	sub reset_at {
		2307	my ($self) = @_;
		2308
		2309	# TODO: safety, remove and allow resettable per-player maps
		2310	return 1e99 if $self->{deny_reset};
		2311
		2312	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
		2313	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
		2314
		2315	$time + $to
		2316	}
		2317
		2318	sub should_reset {
		2319	my ($self) = @_;
		2320
		2321	$self->reset_at <= $cf::RUNTIME
		2322	}
		2323
		2324	sub reset {
		2325	my ($self) = @_;
		2326
		2327	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2328
		2329	return if $self->players;
		2330
		2331	cf::trace "resetting map ", $self->path, "\n";
		2332
		2333	$self->in_memory (cf::MAP_SWAPPED);
		2334
		2335	# need to save uniques path
		2336	unless ($self->{deny_save}) {
		2337	my $uniq = $self->uniq_path; utf8::encode $uniq;
		2338
		2339	$self->_save_objects ($uniq, cf::IO_UNIQUES)
		2340	if $uniq;
		2341	}
		2342
		2343	delete $cf::MAP{$self->path};
2187		2344
2188	$self->deactivate;	2345	$self->deactivate;
2189	$_->clear_links_to ($self) for values %cf::MAP;	2346	$_->clear_links_to ($self) for values %cf::MAP;
2190	$self->clear;	2347	$self->clear;
2191	}
2192
2193	sub reset_at {
2194	my ($self) = @_;
2195
2196	# TODO: safety, remove and allow resettable per-player maps
2197	return 1e99 if $self->{deny_reset};
2198
2199	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2200	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2201
2202	$time + $to
2203	}
2204
2205	sub should_reset {
2206	my ($self) = @_;
2207
2208	$self->reset_at <= $cf::RUNTIME
2209	}
2210
2211	sub reset {
2212	my ($self) = @_;
2213
2214	my $lock = cf::lock_acquire "map_data:$self->{path}";
2215
2216	return if $self->players;
2217
2218	warn "resetting map ", $self->path;
2219
2220	$self->in_memory (cf::MAP_SWAPPED);
2221
2222	# need to save uniques path
2223	unless ($self->{deny_save}) {
2224	my $uniq = $self->uniq_path; utf8::encode $uniq;
2225
2226	$self->_save_objects ($uniq, cf::IO_UNIQUES)
2227	if $uniq;
2228	}
2229
2230	delete $cf::MAP{$self->path};
2231
2232	$self->deactivate;
2233	$_->clear_links_to ($self) for values %cf::MAP;
2234	$self->clear;
2235		2348
2236	$self->unlink_save;	2349	$self->unlink_save;
2237	$self->destroy;	2350	$self->destroy;
2238	}	2351	}
2239		2352
…		…
2247		2360
2248	delete $cf::MAP{$self->path};	2361	delete $cf::MAP{$self->path};
2249		2362
2250	$self->unlink_save;	2363	$self->unlink_save;
2251		2364
2252	bless $self, "cf::map";	2365	bless $self, "cf::map::wrap";
2253	delete $self->{deny_reset};	2366	delete $self->{deny_reset};
2254	$self->{deny_save} = 1;	2367	$self->{deny_save} = 1;
2255	$self->reset_timeout (1);	2368	$self->reset_timeout (1);
2256	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2369	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2257		2370
…		…
2314	: normalise $_	2427	: normalise $_
2315	} @{ aio_readdir $UNIQUEDIR or [] }	2428	} @{ aio_readdir $UNIQUEDIR or [] }
2316	]	2429	]
2317	}	2430	}
2318		2431
		2432	=item cf::map::static_maps
		2433
		2434	Returns an arrayref if paths of all static maps (all preinstalled F<.map>
		2435	file in the shared directory excluding F</styles> and F</editor>). May
		2436	block.
		2437
		2438	=cut
		2439
		2440	sub static_maps() {
		2441	my @dirs = "";
		2442	my @maps;
		2443
		2444	while (@dirs) {
		2445	my $dir = shift @dirs;
		2446
		2447	next if $dir eq "/styles" || $dir eq "/editor";
		2448
		2449	my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
		2450	or return;
		2451
		2452	for (@$files) {
		2453	s/\.map$// or next;
		2454	utf8::decode $_;
		2455	push @maps, "$dir/$_";
		2456	}
		2457
		2458	push @dirs, map "$dir/$_", @$dirs;
		2459	}
		2460
		2461	\@maps
		2462	}
		2463
2319	=back	2464	=back
2320		2465
2321	=head3 cf::object	2466	=head3 cf::object
2322		2467
2323	=cut	2468	=cut
…		…
2455		2600
2456	Freezes the player and moves him/her to a special map (C<{link}>).	2601	Freezes the player and moves him/her to a special map (C<{link}>).
2457		2602
2458	The player should be reasonably safe there for short amounts of time (e.g.	2603	The player should be reasonably safe there for short amounts of time (e.g.
2459	for loading a map). You I<MUST> call C<leave_link> as soon as possible,	2604	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2460	though, as the palyer cannot control the character while it is on the link	2605	though, as the player cannot control the character while it is on the link
2461	map.	2606	map.
2462		2607
2463	Will never block.	2608	Will never block.
2464		2609
2465	=item $player_object->leave_link ($map, $x, $y)	2610	=item $player_object->leave_link ($map, $x, $y)
…		…
2486	sub cf::object::player::enter_link {	2631	sub cf::object::player::enter_link {
2487	my ($self) = @_;	2632	my ($self) = @_;
2488		2633
2489	$self->deactivate_recursive;	2634	$self->deactivate_recursive;
2490		2635
		2636	++$self->{_link_recursion};
		2637
2491	return if UNIVERSAL::isa $self->map, "ext::map_link";	2638	return if UNIVERSAL::isa $self->map, "ext::map_link";
2492		2639
2493	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2640	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2494	if $self->map && $self->map->{path} ne "{link}";	2641	if $self->map && $self->map->{path} ne "{link}";
2495		2642
2496	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2643	$self->enter_map ($LINK_MAP || link_map, 3, 3);
2497	}	2644	}
2498		2645
2499	sub cf::object::player::leave_link {	2646	sub cf::object::player::leave_link {
2500	my ($self, $map, $x, $y) = @_;	2647	my ($self, $map, $x, $y) = @_;
2501		2648
…		…
2518	($x, $y) = (-1, -1)	2665	($x, $y) = (-1, -1)
2519	unless (defined $x) && (defined $y);	2666	unless (defined $x) && (defined $y);
2520		2667
2521	# use -1 or undef as default coordinates, not 0, 0	2668	# use -1 or undef as default coordinates, not 0, 0
2522	($x, $y) = ($map->enter_x, $map->enter_y)	2669	($x, $y) = ($map->enter_x, $map->enter_y)
2523	if $x <=0 && $y <= 0;	2670	if $x <= 0 && $y <= 0;
2524		2671
2525	$map->load;	2672	$map->load;
2526	$map->load_neighbours;	2673	$map->load_neighbours;
2527		2674
2528	return unless $self->contr->active;	2675	return unless $self->contr->active;
2529	$self->flag (cf::FLAG_DEBUG, 0);#d# temp
2530	$self->activate_recursive;
2531		2676
2532	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2677	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2533	$self->enter_map ($map, $x, $y);	2678	if ($self->enter_map ($map, $x, $y)) {
2534	}	2679	# entering was successful
		2680	delete $self->{_link_recursion};
		2681	# only activate afterwards, to support waiting in hooks
		2682	$self->activate_recursive;
		2683	}
2535		2684
		2685	}
		2686
2536	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2687	=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2537		2688
2538	Moves the player to the given map-path and coordinates by first freezing	2689	Moves the player to the given map-path and coordinates by first freezing
2539	her, loading and preparing them map, calling the provided $check callback	2690	her, loading and preparing them map, calling the provided $check callback
2540	that has to return the map if sucecssful, and then unfreezes the player on	2691	that has to return the map if sucecssful, and then unfreezes the player on
2541	the new (success) or old (failed) map position. In either case, $done will	2692	the new (success) or old (failed) map position. In either case, $done will
…		…
2548		2699
2549	our $GOTOGEN;	2700	our $GOTOGEN;
2550		2701
2551	sub cf::object::player::goto {	2702	sub cf::object::player::goto {
2552	my ($self, $path, $x, $y, $check, $done) = @_;	2703	my ($self, $path, $x, $y, $check, $done) = @_;
		2704
		2705	if ($self->{_link_recursion} >= $MAX_LINKS) {
		2706	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
		2707	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
		2708	($path, $x, $y) = @$EMERGENCY_POSITION;
		2709	}
2553		2710
2554	# do generation counting so two concurrent goto's will be executed in-order	2711	# do generation counting so two concurrent goto's will be executed in-order
2555	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2712	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2556		2713
2557	$self->enter_link;	2714	$self->enter_link;
…		…
2581	my $map = eval {	2738	my $map = eval {
2582	my $map = defined $path ? cf::map::find $path : undef;	2739	my $map = defined $path ? cf::map::find $path : undef;
2583		2740
2584	if ($map) {	2741	if ($map) {
2585	$map = $map->customise_for ($self);	2742	$map = $map->customise_for ($self);
2586	$map = $check->($map) if $check && $map;	2743	$map = $check->($map, $x, $y, $self) if $check && $map;
2587	} else {	2744	} else {
2588	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);	2745	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2589	}	2746	}
2590		2747
2591	$map	2748	$map
…		…
2599	if ($gen == $self->{_goto_generation}) {	2756	if ($gen == $self->{_goto_generation}) {
2600	delete $self->{_goto_generation};	2757	delete $self->{_goto_generation};
2601	$self->leave_link ($map, $x, $y);	2758	$self->leave_link ($map, $x, $y);
2602	}	2759	}
2603		2760
2604	$done->() if $done;	2761	$done->($self) if $done;
2605	})->prio (1);	2762	})->prio (1);
2606	}	2763	}
2607		2764
2608	=item $player_object->enter_exit ($exit_object)	2765	=item $player_object->enter_exit ($exit_object)
2609		2766
…		…
2702	$self->message ("Something went wrong deep within the deliantra server. "	2859	$self->message ("Something went wrong deep within the deliantra server. "
2703	. "I'll try to bring you back to the map you were before. "	2860	. "I'll try to bring you back to the map you were before. "
2704	. "Please report this to the dungeon master!",	2861	. "Please report this to the dungeon master!",
2705	cf::NDI_UNIQUE | cf::NDI_RED);	2862	cf::NDI_UNIQUE | cf::NDI_RED);
2706		2863
2707	warn "ERROR in enter_exit: $@";	2864	error "ERROR in enter_exit: $@";
2708	$self->leave_link;	2865	$self->leave_link;
2709	}	2866	}
2710	})->prio (1);	2867	})->prio (1);
2711	}	2868	}
2712		2869
…		…
2724	sub cf::client::send_drawinfo {	2881	sub cf::client::send_drawinfo {
2725	my ($self, $text, $flags) = @_;	2882	my ($self, $text, $flags) = @_;
2726		2883
2727	utf8::encode $text;	2884	utf8::encode $text;
2728	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2885	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
		2886	}
		2887
		2888	=item $client->send_big_packet ($pkt)
		2889
		2890	Like C<send_packet>, but tries to compress large packets, and fragments
		2891	them as required.
		2892
		2893	=cut
		2894
		2895	our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
		2896
		2897	sub cf::client::send_big_packet {
		2898	my ($self, $pkt) = @_;
		2899
		2900	# try lzf for large packets
		2901	$pkt = "lzf " . Compress::LZF::compress $pkt
		2902	if 1024 <= length $pkt and $self->{can_lzf};
		2903
		2904	# split very large packets
		2905	if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
		2906	$self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
		2907	$pkt = "frag";
		2908	}
		2909
		2910	$self->send_packet ($pkt);
2729	}	2911	}
2730		2912
2731	=item $client->send_msg ($channel, $msg, $color, [extra...])	2913	=item $client->send_msg ($channel, $msg, $color, [extra...])
2732		2914
2733	Send a drawinfo or msg packet to the client, formatting the msg for the	2915	Send a drawinfo or msg packet to the client, formatting the msg for the
…		…
2737		2919
2738	=cut	2920	=cut
2739		2921
2740	# non-persistent channels (usually the info channel)	2922	# non-persistent channels (usually the info channel)
2741	our %CHANNEL = (	2923	our %CHANNEL = (
		2924	"c/motd" => {
		2925	id => "infobox",
		2926	title => "MOTD",
		2927	reply => undef,
		2928	tooltip => "The message of the day",
		2929	},
2742	"c/identify" => {	2930	"c/identify" => {
2743	id => "infobox",	2931	id => "infobox",
2744	title => "Identify",	2932	title => "Identify",
2745	reply => undef,	2933	reply => undef,
2746	tooltip => "Items recently identified",	2934	tooltip => "Items recently identified",
…		…
2748	"c/examine" => {	2936	"c/examine" => {
2749	id => "infobox",	2937	id => "infobox",
2750	title => "Examine",	2938	title => "Examine",
2751	reply => undef,	2939	reply => undef,
2752	tooltip => "Signs and other items you examined",	2940	tooltip => "Signs and other items you examined",
		2941	},
		2942	"c/shopinfo" => {
		2943	id => "infobox",
		2944	title => "Shop Info",
		2945	reply => undef,
		2946	tooltip => "What your bargaining skill tells you about the shop",
2753	},	2947	},
2754	"c/book" => {	2948	"c/book" => {
2755	id => "infobox",	2949	id => "infobox",
2756	title => "Book",	2950	title => "Book",
2757	reply => undef,	2951	reply => undef,
…		…
2803	id => "infobox",	2997	id => "infobox",
2804	title => "Pets",	2998	title => "Pets",
2805	reply => undef,	2999	reply => undef,
2806	tooltip => "Shows information abotu your pets/a specific pet",	3000	tooltip => "Shows information abotu your pets/a specific pet",
2807	},	3001	},
		3002	"c/perceiveself" => {
		3003	id => "infobox",
		3004	title => "Perceive Self",
		3005	reply => undef,
		3006	tooltip => "You gained detailed knowledge about yourself",
		3007	},
2808	"c/uptime" => {	3008	"c/uptime" => {
2809	id => "infobox",	3009	id => "infobox",
2810	title => "Uptime",	3010	title => "Uptime",
2811	reply => undef,	3011	reply => undef,
2812	tooltip => "How long the server has been running since last restart",	3012	tooltip => "How long the server has been running since last restart",
…		…
2867	my $pkt = "msg "	3067	my $pkt = "msg "
2868	. $self->{json_coder}->encode (	3068	. $self->{json_coder}->encode (
2869	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]	3069	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2870	);	3070	);
2871		3071
2872	# try lzf for large packets
2873	$pkt = "lzf " . Compress::LZF::compress $pkt
2874	if 1024 <= length $pkt and $self->{can_lzf};
2875
2876	# split very large packets
2877	if (8192 < length $pkt and $self->{can_lzf}) {
2878	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2879	$pkt = "frag";
2880	}
2881
2882	$self->send_packet ($pkt);	3072	$self->send_big_packet ($pkt);
2883	}	3073	}
2884		3074
2885	=item $client->ext_msg ($type, @msg)	3075	=item $client->ext_msg ($type, @msg)
2886		3076
2887	Sends an ext event to the client.	3077	Sends an ext event to the client.
…		…
2890		3080
2891	sub cf::client::ext_msg($$@) {	3081	sub cf::client::ext_msg($$@) {
2892	my ($self, $type, @msg) = @_;	3082	my ($self, $type, @msg) = @_;
2893		3083
2894	if ($self->extcmd == 2) {	3084	if ($self->extcmd == 2) {
2895	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3085	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2896	} elsif ($self->extcmd == 1) { # TODO: remove	3086	} elsif ($self->extcmd == 1) { # TODO: remove
2897	push @msg, msgtype => "event_$type";	3087	push @msg, msgtype => "event_$type";
2898	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3088	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2899	}	3089	}
2900	}	3090	}
2901		3091
2902	=item $client->ext_reply ($msgid, @msg)	3092	=item $client->ext_reply ($msgid, @msg)
2903		3093
…		…
2907		3097
2908	sub cf::client::ext_reply($$@) {	3098	sub cf::client::ext_reply($$@) {
2909	my ($self, $id, @msg) = @_;	3099	my ($self, $id, @msg) = @_;
2910		3100
2911	if ($self->extcmd == 2) {	3101	if ($self->extcmd == 2) {
2912	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));	3102	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2913	} elsif ($self->extcmd == 1) {	3103	} elsif ($self->extcmd == 1) {
2914	#TODO: version 1, remove	3104	#TODO: version 1, remove
2915	unshift @msg, msgtype => "reply", msgid => $id;	3105	unshift @msg, msgtype => "reply", msgid => $id;
2916	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3106	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2917	}	3107	}
2918	}	3108	}
2919		3109
2920	=item $success = $client->query ($flags, "text", \&cb)	3110	=item $success = $client->query ($flags, "text", \&cb)
2921		3111
…		…
2992		3182
2993	$ns->ext_reply ($reply, @reply)	3183	$ns->ext_reply ($reply, @reply)
2994	if $reply;	3184	if $reply;
2995		3185
2996	} else {	3186	} else {
2997	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3187	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2998	}	3188	}
2999		3189
3000	cf::override;	3190	cf::override;
3001	},	3191	},
3002	);	3192	);
…		…
3022		3212
3023	$coro	3213	$coro
3024	}	3214	}
3025		3215
3026	cf::client->attach (	3216	cf::client->attach (
3027	on_destroy => sub {	3217	on_client_destroy => sub {
3028	my ($ns) = @_;	3218	my ($ns) = @_;
3029		3219
3030	$_->cancel for values %{ (delete $ns->{_coro}) || {} };	3220	$_->cancel for values %{ (delete $ns->{_coro}) || {} };
3031	},	3221	},
3032	);	3222	);
…		…
3048	our $safe_hole = new Safe::Hole;	3238	our $safe_hole = new Safe::Hole;
3049		3239
3050	$SIG{FPE} = 'IGNORE';	3240	$SIG{FPE} = 'IGNORE';
3051		3241
3052	$safe->permit_only (Opcode::opset qw(	3242	$safe->permit_only (Opcode::opset qw(
3053	:base_core :base_mem :base_orig :base_math	3243	:base_core :base_mem :base_orig :base_math :base_loop
3054	grepstart grepwhile mapstart mapwhile	3244	grepstart grepwhile mapstart mapwhile
3055	sort time	3245	sort time
3056	));	3246	));
3057		3247
3058	# here we export the classes and methods available to script code	3248	# here we export the classes and methods available to script code
…		…
3110	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3300	$qcode =~ s/"/‟/g; # not allowed in #line filenames
3111	$qcode =~ s/\n/\\n/g;	3301	$qcode =~ s/\n/\\n/g;
3112		3302
3113	%vars = (_dummy => 0) unless %vars;	3303	%vars = (_dummy => 0) unless %vars;
3114		3304
		3305	my @res;
3115	local $_;	3306	local $_;
3116	local @safe::cf::_safe_eval_args = values %vars;
3117		3307
3118	my $eval =	3308	my $eval =
3119	"do {\n"	3309	"do {\n"
3120	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"	3310	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3121	. "#line 0 \"{$qcode}\"\n"	3311	. "#line 0 \"{$qcode}\"\n"
3122	. $code	3312	. $code
3123	. "\n}"	3313	. "\n}"
3124	;	3314	;
3125		3315
		3316	if ($CFG{safe_eval}) {
3126	sub_generation_inc;	3317	sub_generation_inc;
		3318	local @safe::cf::_safe_eval_args = values %vars;
3127	my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);	3319	@res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3128	sub_generation_inc;	3320	sub_generation_inc;
		3321	} else {
		3322	local @cf::_safe_eval_args = values %vars;
		3323	@res = wantarray ? eval eval : scalar eval $eval;
		3324	}
3129		3325
3130	if ($@) {	3326	if ($@) {
3131	warn "$@";	3327	warn "$@",
3132	warn "while executing safe code '$code'\n";	3328	"while executing safe code '$code'\n",
3133	warn "with arguments " . (join " ", %vars) . "\n";	3329	"with arguments " . (join " ", %vars) . "\n";
3134	}	3330	}
3135		3331
3136	wantarray ? @res : $res[0]	3332	wantarray ? @res : $res[0]
3137	}	3333	}
3138		3334
…		…
3152	=cut	3348	=cut
3153		3349
3154	sub register_script_function {	3350	sub register_script_function {
3155	my ($fun, $cb) = @_;	3351	my ($fun, $cb) = @_;
3156		3352
3157	no strict 'refs';	3353	$fun = "safe::$fun" if $CFG{safe_eval};
3158	*{"safe::$fun"} = $safe_hole->wrap ($cb);	3354	*$fun = $safe_hole->wrap ($cb);
3159	}	3355	}
3160		3356
3161	=back	3357	=back
3162		3358
3163	=cut	3359	=cut
…		…
3172	# for this (global event?)	3368	# for this (global event?)
3173	%ext::player_env::MUSIC_FACE_CACHE = ();	3369	%ext::player_env::MUSIC_FACE_CACHE = ();
3174		3370
3175	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3371	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3176		3372
3177	warn "loading facedata from $path\n";	3373	trace "loading facedata from $path\n";
3178		3374
3179	my $facedata;	3375	my $facedata;
3180	0 < aio_load $path, $facedata	3376	0 < aio_load $path, $facedata
3181	or die "$path: $!";	3377	or die "$path: $!";
3182		3378
…		…
3184		3380
3185	$facedata->{version} == 2	3381	$facedata->{version} == 2
3186	or cf::cleanup "$path: version mismatch, cannot proceed.";	3382	or cf::cleanup "$path: version mismatch, cannot proceed.";
3187		3383
3188	# patch in the exptable	3384	# patch in the exptable
		3385	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3189	$facedata->{resource}{"res/exp_table"} = {	3386	$facedata->{resource}{"res/exp_table"} = {
3190	type => FT_RSRC,	3387	type => FT_RSRC,
3191	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),	3388	data => $exp_table,
		3389	hash => (Digest::MD5::md5 $exp_table),
3192	};	3390	};
3193	cf::cede_to_tick;	3391	cf::cede_to_tick;
3194		3392
3195	{	3393	{
3196	my $faces = $facedata->{faceinfo};	3394	my $faces = $facedata->{faceinfo};
…		…
3198	while (my ($face, $info) = each %$faces) {	3396	while (my ($face, $info) = each %$faces) {
3199	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3397	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3200		3398
3201	cf::face::set_visibility $idx, $info->{visibility};	3399	cf::face::set_visibility $idx, $info->{visibility};
3202	cf::face::set_magicmap $idx, $info->{magicmap};	3400	cf::face::set_magicmap $idx, $info->{magicmap};
3203	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};	3401	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3204	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};	3402	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3205		3403
3206	cf::cede_to_tick;	3404	cf::cede_to_tick;
3207	}	3405	}
3208		3406
3209	while (my ($face, $info) = each %$faces) {	3407	while (my ($face, $info) = each %$faces) {
…		…
3214		3412
3215	if (my $smooth = cf::face::find $info->{smooth}) {	3413	if (my $smooth = cf::face::find $info->{smooth}) {
3216	cf::face::set_smooth $idx, $smooth;	3414	cf::face::set_smooth $idx, $smooth;
3217	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3415	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3218	} else {	3416	} else {
3219	warn "smooth face '$info->{smooth}' not found for face '$face'";	3417	error "smooth face '$info->{smooth}' not found for face '$face'";
3220	}	3418	}
3221		3419
3222	cf::cede_to_tick;	3420	cf::cede_to_tick;
3223	}	3421	}
3224	}	3422	}
…		…
3233		3431
3234	cf::anim::invalidate_all; # d'oh	3432	cf::anim::invalidate_all; # d'oh
3235	}	3433	}
3236		3434
3237	{	3435	{
3238	# TODO: for gcfclient pleasure, we should give resources
3239	# that gcfclient doesn't grok a >10000 face index.
3240	my $res = $facedata->{resource};	3436	my $res = $facedata->{resource};
3241		3437
3242	while (my ($name, $info) = each %$res) {	3438	while (my ($name, $info) = each %$res) {
3243	if (defined $info->{type}) {	3439	if (defined $info->{type}) {
3244	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3440	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3245	my $data;
3246		3441
3247	if ($info->{type} & 1) {	3442	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3248	# prepend meta info
3249
3250	my $meta = $enc->encode ({
3251	name => $name,
3252	%{ $info->{meta} || {} },
3253	});
3254
3255	$data = pack "(w/a*)*", $meta, $info->{data};
3256	} else {
3257	$data = $info->{data};
3258	}
3259
3260	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3261	cf::face::set_type $idx, $info->{type};	3443	cf::face::set_type $idx, $info->{type};
3262	} else {	3444	} else {
3263	$RESOURCE{$name} = $info;	3445	$RESOURCE{$name} = $info; # unused
3264	}	3446	}
3265		3447
3266	cf::cede_to_tick;	3448	cf::cede_to_tick;
3267	}	3449	}
3268	}	3450	}
3269		3451
3270	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3452	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3271		3453
3272	1	3454	1
3273	}	3455	}
3274
3275	cf::global->attach (on_resource_update => sub {
3276	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3277	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3278
3279	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3280	my $sound = $soundconf->{compat}[$_]
3281	or next;
3282
3283	my $face = cf::face::find "sound/$sound->[1]";
3284	cf::sound::set $sound->[0] => $face;
3285	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3286	}
3287
3288	while (my ($k, $v) = each %{$soundconf->{event}}) {
3289	my $face = cf::face::find "sound/$v";
3290	cf::sound::set $k => $face;
3291	}
3292	}
3293	});
3294		3456
3295	register_exticmd fx_want => sub {	3457	register_exticmd fx_want => sub {
3296	my ($ns, $want) = @_;	3458	my ($ns, $want) = @_;
3297		3459
3298	while (my ($k, $v) = each %$want) {	3460	while (my ($k, $v) = each %$want) {
…		…
3337	sub reload_treasures {	3499	sub reload_treasures {
3338	load_resource_file "$DATADIR/treasures"	3500	load_resource_file "$DATADIR/treasures"
3339	or die "unable to load treasurelists\n";	3501	or die "unable to load treasurelists\n";
3340	}	3502	}
3341		3503
		3504	sub reload_sound {
		3505	trace "loading sound config from $DATADIR/sound\n";
		3506
		3507	0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
		3508	or die "$DATADIR/sound $!";
		3509
		3510	my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
		3511
		3512	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3513	my $sound = $soundconf->{compat}[$_]
		3514	or next;
		3515
		3516	my $face = cf::face::find "sound/$sound->[1]";
		3517	cf::sound::set $sound->[0] => $face;
		3518	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3519	}
		3520
		3521	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3522	my $face = cf::face::find "sound/$v";
		3523	cf::sound::set $k => $face;
		3524	}
		3525	}
		3526
3342	sub reload_resources {	3527	sub reload_resources {
3343	warn "reloading resource files...\n";	3528	trace "reloading resource files...\n";
3344		3529
3345	reload_facedata;	3530	reload_facedata;
		3531	reload_sound;
3346	reload_archetypes;	3532	reload_archetypes;
3347	reload_regions;	3533	reload_regions;
3348	reload_treasures;	3534	reload_treasures;
3349		3535
3350	warn "finished reloading resource files\n";	3536	trace "finished reloading resource files\n";
3351	}	3537	}
3352		3538
3353	sub reload_config {	3539	sub reload_config {
		3540	trace "reloading config file...\n";
		3541
3354	open my $fh, "<:utf8", "$CONFDIR/config"	3542	open my $fh, "<:utf8", "$CONFDIR/config"
3355	or return;	3543	or return;
3356		3544
3357	local $/;	3545	local $/;
3358	*CFG = YAML::Load <$fh>;	3546	*CFG = YAML::XS::Load scalar <$fh>;
3359		3547
3360	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3548	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3361		3549
3362	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3550	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3363	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3551	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3364		3552
3365	if (exists $CFG{mlockall}) {	3553	if (exists $CFG{mlockall}) {
…		…
3367	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3555	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3368	and die "WARNING: m(un)lockall failed: $!\n";	3556	and die "WARNING: m(un)lockall failed: $!\n";
3369	};	3557	};
3370	warn $@ if $@;	3558	warn $@ if $@;
3371	}	3559	}
		3560
		3561	trace "finished reloading resource files\n";
3372	}	3562	}
3373		3563
3374	sub pidfile() {	3564	sub pidfile() {
3375	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3565	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3376	or die "$PIDFILE: $!";	3566	or die "$PIDFILE: $!";
…		…
3388		3578
3389	seek $fh, 0, 0;	3579	seek $fh, 0, 0;
3390	print $fh $$;	3580	print $fh $$;
3391	}	3581	}
3392		3582
		3583	sub main_loop {
		3584	trace "EV::loop starting\n";
		3585	if (1) {
		3586	EV::loop;
		3587	}
		3588	trace "EV::loop returned\n";
		3589	goto &main_loop unless $REALLY_UNLOOP;
		3590	}
		3591
3393	sub main {	3592	sub main {
3394	cf::init_globals; # initialise logging	3593	cf::init_globals; # initialise logging
3395		3594
3396	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3595	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3397	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3596	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3398	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3597	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3399	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3598	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3400
3401	cf::init_experience;
3402	cf::init_anim;
3403	cf::init_attackmess;
3404	cf::init_dynamic;
3405		3599
3406	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3600	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3407		3601
3408	# we must not ever block the main coroutine	3602	# we must not ever block the main coroutine
3409	local $Coro::idle = sub {	3603	local $Coro::idle = sub {
…		…
3415	};	3609	};
3416		3610
3417	evthread_start IO::AIO::poll_fileno;	3611	evthread_start IO::AIO::poll_fileno;
3418		3612
3419	cf::sync_job {	3613	cf::sync_job {
		3614	cf::init_experience;
		3615	cf::init_anim;
		3616	cf::init_attackmess;
		3617	cf::init_dynamic;
		3618
		3619	cf::load_settings;
		3620	cf::load_materials;
		3621
3420	reload_resources;	3622	reload_resources;
3421	reload_config;	3623	reload_config;
3422	db_init;	3624	db_init;
3423		3625
3424	cf::load_settings;
3425	cf::load_materials;
3426	cf::init_uuid;	3626	cf::init_uuid;
3427	cf::init_signals;	3627	cf::init_signals;
3428	cf::init_commands;
3429	cf::init_skills;	3628	cf::init_skills;
3430		3629
3431	cf::init_beforeplay;	3630	cf::init_beforeplay;
3432		3631
3433	atomic;	3632	atomic;
…		…
3435	load_extensions;	3634	load_extensions;
3436		3635
3437	utime time, time, $RUNTIMEFILE;	3636	utime time, time, $RUNTIMEFILE;
3438		3637
3439	# no (long-running) fork's whatsoever before this point(!)	3638	# no (long-running) fork's whatsoever before this point(!)
		3639	use POSIX ();
3440	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3640	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3441		3641
3442	(pop @POST_INIT)->(0) while @POST_INIT;	3642	(pop @POST_INIT)->(0) while @POST_INIT;
3443	};	3643	};
3444		3644
3445	EV::loop;	3645	cf::object::thawer::errors_are_fatal 0;
		3646	info "parse errors in files are no longer fatal from this point on.\n";
		3647
		3648	main_loop;
3446	}	3649	}
3447		3650
3448	#############################################################################	3651	#############################################################################
3449	# initialisation and cleanup	3652	# initialisation and cleanup
3450		3653
3451	# install some emergency cleanup handlers	3654	# install some emergency cleanup handlers
3452	BEGIN {	3655	BEGIN {
3453	our %SIGWATCHER = ();	3656	our %SIGWATCHER = ();
3454	for my $signal (qw(INT HUP TERM)) {	3657	for my $signal (qw(INT HUP TERM)) {
3455	$SIGWATCHER{$signal} = EV::signal $signal, sub {	3658	$SIGWATCHER{$signal} = AE::signal $signal, sub {
3456	cf::cleanup "SIG$signal";	3659	cf::cleanup "SIG$signal";
3457	};	3660	};
3458	}	3661	}
3459	}	3662	}
3460		3663
3461	sub write_runtime_sync {	3664	sub write_runtime_sync {
		3665	my $t0 = AE::time;
		3666
3462	# first touch the runtime file to show we are still running:	3667	# first touch the runtime file to show we are still running:
3463	# the fsync below can take a very very long time.	3668	# the fsync below can take a very very long time.
3464		3669
3465	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;	3670	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3466		3671
3467	my $guard = cf::lock_acquire "write_runtime";	3672	my $guard = cf::lock_acquire "write_runtime";
3468		3673
3469	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644	3674	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3470	or return;	3675	or return;
3471		3676
3472	my $value = $cf::RUNTIME + 90 + 10;	3677	my $value = $cf::RUNTIME + 90 + 10;
3473	# 10 is the runtime save interval, for a monotonic clock	3678	# 10 is the runtime save interval, for a monotonic clock
3474	# 60 allows for the watchdog to kill the server.	3679	# 60 allows for the watchdog to kill the server.
…		…
3487	or return;	3692	or return;
3488		3693
3489	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3694	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3490	and return;	3695	and return;
3491		3696
3492	warn "runtime file written.\n";	3697	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3493		3698
3494	1	3699	1
3495	}	3700	}
3496		3701
3497	our $uuid_lock;	3702	our $uuid_lock;
…		…
3509	or return;	3714	or return;
3510		3715
3511	my $value = uuid_seq uuid_cur;	3716	my $value = uuid_seq uuid_cur;
3512		3717
3513	unless ($value) {	3718	unless ($value) {
3514	warn "cowardly refusing to write zero uuid value!\n";	3719	info "cowardly refusing to write zero uuid value!\n";
3515	return;	3720	return;
3516	}	3721	}
3517		3722
3518	my $value = uuid_str $value + $uuid_skip;	3723	my $value = uuid_str $value + $uuid_skip;
3519	$uuid_skip = 0;	3724	$uuid_skip = 0;
…		…
3529	or return;	3734	or return;
3530		3735
3531	aio_rename "$uuid~", $uuid	3736	aio_rename "$uuid~", $uuid
3532	and return;	3737	and return;
3533		3738
3534	warn "uuid file written ($value).\n";	3739	trace "uuid file written ($value).\n";
3535		3740
3536	1	3741	1
3537		3742
3538	}	3743	}
3539		3744
…		…
3545	}	3750	}
3546		3751
3547	sub emergency_save() {	3752	sub emergency_save() {
3548	my $freeze_guard = cf::freeze_mainloop;	3753	my $freeze_guard = cf::freeze_mainloop;
3549		3754
3550	warn "emergency_perl_save: enter\n";	3755	info "emergency_perl_save: enter\n";
		3756
		3757	# this is a trade-off: we want to be very quick here, so
		3758	# save all maps without fsync, and later call a global sync
		3759	# (which in turn might be very very slow)
		3760	local $USE_FSYNC = 0;
3551		3761
3552	cf::sync_job {	3762	cf::sync_job {
3553	# this is a trade-off: we want to be very quick here, so
3554	# save all maps without fsync, and later call a global sync
3555	# (which in turn might be very very slow)
3556	local $USE_FSYNC = 0;
3557
3558	# use a peculiar iteration method to avoid tripping on perl	3763	# use a peculiar iteration method to avoid tripping on perl
3559	# refcount bugs in for. also avoids problems with players	3764	# refcount bugs in for. also avoids problems with players
3560	# and maps saved/destroyed asynchronously.	3765	# and maps saved/destroyed asynchronously.
3561	warn "emergency_perl_save: begin player save\n";	3766	info "emergency_perl_save: begin player save\n";
3562	for my $login (keys %cf::PLAYER) {	3767	for my $login (keys %cf::PLAYER) {
3563	my $pl = $cf::PLAYER{$login} or next;	3768	my $pl = $cf::PLAYER{$login} or next;
3564	$pl->valid or next;	3769	$pl->valid or next;
3565	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3770	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3566	$pl->save;	3771	$pl->save;
3567	}	3772	}
3568	warn "emergency_perl_save: end player save\n";	3773	info "emergency_perl_save: end player save\n";
3569		3774
3570	warn "emergency_perl_save: begin map save\n";	3775	info "emergency_perl_save: begin map save\n";
3571	for my $path (keys %cf::MAP) {	3776	for my $path (keys %cf::MAP) {
3572	my $map = $cf::MAP{$path} or next;	3777	my $map = $cf::MAP{$path} or next;
3573	$map->valid or next;	3778	$map->valid or next;
3574	$map->save;	3779	$map->save;
3575	}	3780	}
3576	warn "emergency_perl_save: end map save\n";	3781	info "emergency_perl_save: end map save\n";
3577		3782
3578	warn "emergency_perl_save: begin database checkpoint\n";	3783	info "emergency_perl_save: begin database checkpoint\n";
3579	BDB::db_env_txn_checkpoint $DB_ENV;	3784	BDB::db_env_txn_checkpoint $DB_ENV;
3580	warn "emergency_perl_save: end database checkpoint\n";	3785	info "emergency_perl_save: end database checkpoint\n";
3581		3786
3582	warn "emergency_perl_save: begin write uuid\n";	3787	info "emergency_perl_save: begin write uuid\n";
3583	write_uuid_sync 1;	3788	write_uuid_sync 1;
3584	warn "emergency_perl_save: end write uuid\n";	3789	info "emergency_perl_save: end write uuid\n";
3585	};	3790	};
3586		3791
3587	warn "emergency_perl_save: starting sync()\n";	3792	info "emergency_perl_save: starting sync()\n";
3588	IO::AIO::aio_sync sub {	3793	IO::AIO::aio_sync sub {
3589	warn "emergency_perl_save: finished sync()\n";	3794	info "emergency_perl_save: finished sync()\n";
3590	};	3795	};
3591		3796
3592	warn "emergency_perl_save: leave\n";	3797	info "emergency_perl_save: leave\n";
3593	}	3798	}
3594		3799
3595	sub post_cleanup {	3800	sub post_cleanup {
3596	my ($make_core) = @_;	3801	my ($make_core) = @_;
3597		3802
3598	warn Carp::longmess "post_cleanup backtrace"	3803	error Carp::longmess "post_cleanup backtrace"
3599	if $make_core;	3804	if $make_core;
3600		3805
3601	my $fh = pidfile;	3806	my $fh = pidfile;
3602	unlink $PIDFILE if <$fh> == $$;	3807	unlink $PIDFILE if <$fh> == $$;
3603	}	3808	}
…		…
3623	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	3828	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3624	for my $name (keys %$leaf_symtab) {	3829	for my $name (keys %$leaf_symtab) {
3625	_gv_clear *{"$pkg$name"};	3830	_gv_clear *{"$pkg$name"};
3626	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	3831	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3627	}	3832	}
3628	warn "cleared package $pkg\n";#d#
3629	}	3833	}
3630		3834
3631	sub do_reload_perl() {	3835	sub do_reload_perl() {
3632	# can/must only be called in main	3836	# can/must only be called in main
3633	if ($Coro::current != $Coro::main) {	3837	if (in_main) {
3634	warn "can only reload from main coroutine";	3838	error "can only reload from main coroutine";
3635	return;	3839	return;
3636	}	3840	}
3637		3841
3638	return if $RELOAD++;	3842	return if $RELOAD++;
3639		3843
3640	my $t1 = EV::time;	3844	my $t1 = AE::time;
3641		3845
3642	while ($RELOAD) {	3846	while ($RELOAD) {
3643	warn "reloading...";	3847	info "reloading...";
3644		3848
3645	warn "entering sync_job";	3849	trace "entering sync_job";
3646		3850
3647	cf::sync_job {	3851	cf::sync_job {
3648	cf::write_runtime_sync; # external watchdog should not bark	3852	cf::write_runtime_sync; # external watchdog should not bark
3649	cf::emergency_save;	3853	cf::emergency_save;
3650	cf::write_runtime_sync; # external watchdog should not bark	3854	cf::write_runtime_sync; # external watchdog should not bark
3651		3855
3652	warn "syncing database to disk";	3856	trace "syncing database to disk";
3653	BDB::db_env_txn_checkpoint $DB_ENV;	3857	BDB::db_env_txn_checkpoint $DB_ENV;
3654		3858
3655	# if anything goes wrong in here, we should simply crash as we already saved	3859	# if anything goes wrong in here, we should simply crash as we already saved
3656		3860
3657	warn "flushing outstanding aio requests";	3861	trace "flushing outstanding aio requests";
3658	while (IO::AIO::nreqs || BDB::nreqs) {	3862	while (IO::AIO::nreqs || BDB::nreqs) {
3659	Coro::EV::timer_once 0.01; # let the sync_job do it's thing	3863	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3660	}	3864	}
3661		3865
3662	warn "cancelling all extension coros";	3866	trace "cancelling all extension coros";
3663	$_->cancel for values %EXT_CORO;	3867	$_->cancel for values %EXT_CORO;
3664	%EXT_CORO = ();	3868	%EXT_CORO = ();
3665		3869
3666	warn "removing commands";	3870	trace "removing commands";
3667	%COMMAND = ();	3871	%COMMAND = ();
3668		3872
3669	warn "removing ext/exti commands";	3873	trace "removing ext/exti commands";
3670	%EXTCMD = ();	3874	%EXTCMD = ();
3671	%EXTICMD = ();	3875	%EXTICMD = ();
3672		3876
3673	warn "unloading/nuking all extensions";	3877	trace "unloading/nuking all extensions";
3674	for my $pkg (@EXTS) {	3878	for my $pkg (@EXTS) {
3675	warn "... unloading $pkg";	3879	trace "... unloading $pkg";
3676		3880
3677	if (my $cb = $pkg->can ("unload")) {	3881	if (my $cb = $pkg->can ("unload")) {
3678	eval {	3882	eval {
3679	$cb->($pkg);	3883	$cb->($pkg);
3680	1	3884	1
3681	} or warn "$pkg unloaded, but with errors: $@";	3885	} or error "$pkg unloaded, but with errors: $@";
3682	}	3886	}
3683		3887
3684	warn "... clearing $pkg";	3888	trace "... clearing $pkg";
3685	clear_package $pkg;	3889	clear_package $pkg;
3686	}	3890	}
3687		3891
3688	warn "unloading all perl modules loaded from $LIBDIR";	3892	trace "unloading all perl modules loaded from $LIBDIR";
3689	while (my ($k, $v) = each %INC) {	3893	while (my ($k, $v) = each %INC) {
3690	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	3894	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3691		3895
3692	warn "... unloading $k";	3896	trace "... unloading $k";
3693	delete $INC{$k};	3897	delete $INC{$k};
3694		3898
3695	$k =~ s/\.pm$//;	3899	$k =~ s/\.pm$//;
3696	$k =~ s/\//::/g;	3900	$k =~ s/\//::/g;
3697		3901
…		…
3700	}	3904	}
3701		3905
3702	clear_package $k;	3906	clear_package $k;
3703	}	3907	}
3704		3908
3705	warn "getting rid of safe::, as good as possible";	3909	trace "getting rid of safe::, as good as possible";
3706	clear_package "safe::$_"	3910	clear_package "safe::$_"
3707	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	3911	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3708		3912
3709	warn "unloading cf.pm \"a bit\"";	3913	trace "unloading cf.pm \"a bit\"";
3710	delete $INC{"cf.pm"};	3914	delete $INC{"cf.pm"};
3711	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	3915	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3712		3916
3713	# don't, removes xs symbols, too,	3917	# don't, removes xs symbols, too,
3714	# and global variables created in xs	3918	# and global variables created in xs
3715	#clear_package __PACKAGE__;	3919	#clear_package __PACKAGE__;
3716		3920
3717	warn "unload completed, starting to reload now";	3921	info "unload completed, starting to reload now";
3718		3922
3719	warn "reloading cf.pm";	3923	trace "reloading cf.pm";
3720	require cf;	3924	require cf;
3721	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3925	cf::_connect_to_perl_1;
3722		3926
3723	warn "loading config and database again";	3927	trace "loading config and database again";
3724	cf::reload_config;	3928	cf::reload_config;
3725		3929
3726	warn "loading extensions";	3930	trace "loading extensions";
3727	cf::load_extensions;	3931	cf::load_extensions;
3728		3932
3729	if ($REATTACH_ON_RELOAD) {	3933	if ($REATTACH_ON_RELOAD) {
3730	warn "reattaching attachments to objects/players";	3934	trace "reattaching attachments to objects/players";
3731	_global_reattach; # objects, sockets	3935	_global_reattach; # objects, sockets
3732	warn "reattaching attachments to maps";	3936	trace "reattaching attachments to maps";
3733	reattach $_ for values %MAP;	3937	reattach $_ for values %MAP;
3734	warn "reattaching attachments to players";	3938	trace "reattaching attachments to players";
3735	reattach $_ for values %PLAYER;	3939	reattach $_ for values %PLAYER;
3736	}	3940	}
3737		3941
3738	warn "running post_init jobs";	3942	trace "running post_init jobs";
3739	(pop @POST_INIT)->(1) while @POST_INIT;	3943	(pop @POST_INIT)->(1) while @POST_INIT;
3740		3944
3741	warn "leaving sync_job";	3945	trace "leaving sync_job";
3742		3946
3743	1	3947	1
3744	} or do {	3948	} or do {
3745	warn $@;	3949	error $@;
3746	cf::cleanup "error while reloading, exiting.";	3950	cf::cleanup "error while reloading, exiting.";
3747	};	3951	};
3748		3952
3749	warn "reloaded";	3953	info "reloaded";
3750	--$RELOAD;	3954	--$RELOAD;
3751	}	3955	}
3752		3956
3753	$t1 = EV::time - $t1;	3957	$t1 = AE::time - $t1;
3754	warn "reload completed in ${t1}s\n";	3958	info "reload completed in ${t1}s\n";
3755	};	3959	};
3756		3960
3757	our $RELOAD_WATCHER; # used only during reload	3961	our $RELOAD_WATCHER; # used only during reload
3758		3962
3759	sub reload_perl() {	3963	sub reload_perl() {
…		…
3761	# coro crashes during coro_state_free->destroy here.	3965	# coro crashes during coro_state_free->destroy here.
3762		3966
3763	$RELOAD_WATCHER ||= cf::async {	3967	$RELOAD_WATCHER ||= cf::async {
3764	Coro::AIO::aio_wait cache_extensions;	3968	Coro::AIO::aio_wait cache_extensions;
3765		3969
3766	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {	3970	$RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3767	do_reload_perl;	3971	do_reload_perl;
3768	undef $RELOAD_WATCHER;	3972	undef $RELOAD_WATCHER;
3769	};	3973	};
3770	};	3974	};
3771	}	3975	}
…		…
3788		3992
3789	our @WAIT_FOR_TICK;	3993	our @WAIT_FOR_TICK;
3790	our @WAIT_FOR_TICK_BEGIN;	3994	our @WAIT_FOR_TICK_BEGIN;
3791		3995
3792	sub wait_for_tick {	3996	sub wait_for_tick {
3793	return if tick_inhibit || $Coro::current == $Coro::main;	3997	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3794		3998
3795	my $signal = new Coro::Signal;	3999	my $signal = new Coro::Signal;
3796	push @WAIT_FOR_TICK, $signal;	4000	push @WAIT_FOR_TICK, $signal;
3797	$signal->wait;	4001	$signal->wait;
3798	}	4002	}
3799		4003
3800	sub wait_for_tick_begin {	4004	sub wait_for_tick_begin {
3801	return if tick_inhibit || $Coro::current == $Coro::main;	4005	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3802		4006
3803	my $signal = new Coro::Signal;	4007	my $signal = new Coro::Signal;
3804	push @WAIT_FOR_TICK_BEGIN, $signal;	4008	push @WAIT_FOR_TICK_BEGIN, $signal;
3805	$signal->wait;	4009	$signal->wait;
3806	}	4010	}
…		…
3812	return;	4016	return;
3813	}	4017	}
3814		4018
3815	cf::server_tick; # one server iteration	4019	cf::server_tick; # one server iteration
3816		4020
		4021	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
		4022
3817	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4023	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3818	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4024	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3819	Coro::async_pool {	4025	Coro::async_pool {
3820	$Coro::current->{desc} = "runtime saver";	4026	$Coro::current->{desc} = "runtime saver";
3821	write_runtime_sync	4027	write_runtime_sync
3822	or warn "ERROR: unable to write runtime file: $!";	4028	or error "ERROR: unable to write runtime file: $!";
3823	};	4029	};
3824	}	4030	}
3825		4031
3826	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4032	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3827	$sig->send;	4033	$sig->send;
…		…
3835		4041
3836	if (0) {	4042	if (0) {
3837	if ($NEXT_TICK) {	4043	if ($NEXT_TICK) {
3838	my $jitter = $TICK_START - $NEXT_TICK;	4044	my $jitter = $TICK_START - $NEXT_TICK;
3839	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4045	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
3840	warn "jitter $JITTER\n";#d#	4046	debug "jitter $JITTER\n";#d#
3841	}	4047	}
3842	}	4048	}
3843	}	4049	}
3844		4050
3845	{	4051	{
3846	# configure BDB	4052	# configure BDB
3847		4053
3848	BDB::min_parallel 8;	4054	BDB::min_parallel 16;
3849	BDB::max_poll_reqs $TICK * 0.1;	4055	BDB::max_poll_reqs $TICK * 0.1;
3850	$AnyEvent::BDB::WATCHER->priority (1);	4056	$AnyEvent::BDB::WATCHER->priority (1);
3851		4057
3852	unless ($DB_ENV) {	4058	unless ($DB_ENV) {
3853	$DB_ENV = BDB::db_env_create;	4059	$DB_ENV = BDB::db_env_create;
…		…
3934	}	4140	}
3935	}	4141	}
3936		4142
3937	# load additional modules	4143	# load additional modules
3938	require "cf/$_.pm" for @EXTRA_MODULES;	4144	require "cf/$_.pm" for @EXTRA_MODULES;
		4145	cf::_connect_to_perl_2;
3939		4146
3940	END { cf::emergency_save }	4147	END { cf::emergency_save }
3941		4148
3942	1	4149	1
3943		4150

Diff Legend

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