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.475 by root, Tue Jul 21 06:17:00 2009 UTC vs.
Revision 1.544 by root, Thu May 6 21:58:07 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
…		…
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 process
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
217	=item @cf::INVOKE_RESULTS	241	=item @cf::INVOKE_RESULTS
218		242
219	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
220	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
221	that call.	245	that call.
222		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
223	=back	253	=back
224		254
225	=cut	255	=cut
226		256
227	BEGIN {	257	sub error(@) { LOG llevError, join "", @_ }
228	*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 {
229	my $msg = join "", @_;	264	my $msg = join "", @_;
230		265
231	$msg .= "\n"	266	$msg .= "\n"
232	unless $msg =~ /\n$/;	267	unless $msg =~ /\n$/;
233		268
234	$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;
235		270
236	LOG llevError, $msg;	271	LOG llevWarn, $msg;
237	};	272	};
238	}
239		273
240	$Coro::State::DIEHOOK = sub {	274	$Coro::State::DIEHOOK = sub {
241	return unless $^S eq 0; # "eq", not "=="	275	return unless $^S eq 0; # "eq", not "=="
242		276
243	if ($Coro::current == $Coro::main) {#d#	277	error Carp::longmess $_[0];
		278
		279	if (in_main) {#d#
244	warn "DIEHOOK called in main context, Coro bug?\n";#d#	280	error "DIEHOOK called in main context, Coro bug?\n";#d#
245	return;#d#	281	return;#d#
246	}#d#	282	}#d#
247		283
248	# kill coroutine otherwise	284	# kill coroutine otherwise
249	warn Carp::longmess $_[0];
250	Coro::terminate	285	Coro::terminate
251	};	286	};
252
253	$SIG{__DIE__} = sub { }; #d#?
254		287
255	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	288	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
256	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	289	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
257	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	290	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
258	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	291	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
…		…
272	)) {	305	)) {
273	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	306	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
274	}	307	}
275		308
276	$EV::DIED = sub {	309	$EV::DIED = sub {
277	warn "error in event callback: @_";	310	Carp::cluck "error in event callback: @_";
278	};	311	};
279		312
280	#############################################################################	313	#############################################################################
281		314
282	=head2 UTILITY FUNCTIONS	315	=head2 UTILITY FUNCTIONS
…		…
379	}	412	}
380		413
381	=item cf::periodic $interval, $cb	414	=item cf::periodic $interval, $cb
382		415
383	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
384	get spread over timer.	417	get spread over time.
385		418
386	=cut	419	=cut
387		420
388	sub periodic($$) {	421	sub periodic($$) {
389	my ($interval, $cb) = @_;	422	my ($interval, $cb) = @_;
…		…
406		439
407	=cut	440	=cut
408		441
409	our @SLOT_QUEUE;	442	our @SLOT_QUEUE;
410	our $SLOT_QUEUE;	443	our $SLOT_QUEUE;
		444	our $SLOT_DECAY = 0.9;
411		445
412	$SLOT_QUEUE->cancel if $SLOT_QUEUE;	446	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
413	$SLOT_QUEUE = Coro::async {	447	$SLOT_QUEUE = Coro::async {
414	$Coro::current->desc ("timeslot manager");	448	$Coro::current->desc ("timeslot manager");
415		449
416	my $signal = new Coro::Signal;	450	my $signal = new Coro::Signal;
		451	my $busy;
417		452
418	while () {	453	while () {
419	next_job:	454	next_job:
		455
420	my $avail = cf::till_tick;	456	my $avail = cf::till_tick;
421	if ($avail > 0.01) {	457
422	for (0 .. $#SLOT_QUEUE) {	458	for (0 .. $#SLOT_QUEUE) {
423	if ($SLOT_QUEUE[$_][0] < $avail) {	459	if ($SLOT_QUEUE[$_][0] <= $avail) {
		460	$busy = 0;
424	my $job = splice @SLOT_QUEUE, $_, 1, ();	461	my $job = splice @SLOT_QUEUE, $_, 1, ();
425	$job->[2]->send;	462	$job->[2]->send;
426	Coro::cede;	463	Coro::cede;
427	goto next_job;	464	goto next_job;
428	}	465	} else {
		466	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
429	}	467	}
430	}	468	}
431		469
432	if (@SLOT_QUEUE) {	470	if (@SLOT_QUEUE) {
433	# 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
434	push @cf::WAIT_FOR_TICK, $signal;	472	push @cf::WAIT_FOR_TICK, $signal;
435	$signal->wait;	473	$signal->wait;
436	} else {	474	} else {
		475	$busy = 0;
437	Coro::schedule;	476	Coro::schedule;
438	}	477	}
439	}	478	}
440	};	479	};
441		480
442	sub get_slot($;$$) {	481	sub get_slot($;$$) {
443	return if tick_inhibit || $Coro::current == $Coro::main;	482	return if tick_inhibit || $Coro::current == $Coro::main;
444		483
445	my ($time, $pri, $name) = @_;	484	my ($time, $pri, $name) = @_;
446		485
447	$time = $TICK * .6 if $time > $TICK * .6;	486	$time = clamp $time, 0.01, $TICK * .6;
		487
448	my $sig = new Coro::Signal;	488	my $sig = new Coro::Signal;
449		489
450	push @SLOT_QUEUE, [$time, $pri, $sig, $name];	490	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
451	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;	491	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
452	$SLOT_QUEUE->ready;	492	$SLOT_QUEUE->ready;
…		…
478	=cut	518	=cut
479		519
480	sub sync_job(&) {	520	sub sync_job(&) {
481	my ($job) = @_;	521	my ($job) = @_;
482		522
483	if ($Coro::current == $Coro::main) {	523	if (in_main) {
484	my $time = EV::time;	524	my $time = AE::time;
485		525
486	# this is the main coro, too bad, we have to block	526	# this is the main coro, too bad, we have to block
487	# till the operation succeeds, freezing the server :/	527	# till the operation succeeds, freezing the server :/
488		528
489	LOG llevError, Carp::longmess "sync job";#d#	529	#LOG llevError, Carp::longmess "sync job";#d#
490		530
491	my $freeze_guard = freeze_mainloop;	531	my $freeze_guard = freeze_mainloop;
492		532
493	my $busy = 1;	533	my $busy = 1;
494	my @res;	534	my @res;
495		535
496	(async {	536	(async {
497	$Coro::current->desc ("sync job coro");	537	$Coro::current->desc ("sync job coro");
498	@res = eval { $job->() };	538	@res = eval { $job->() };
499	warn $@ if $@;	539	error $@ if $@;
500	undef $busy;	540	undef $busy;
501	})->prio (Coro::PRIO_MAX);	541	})->prio (Coro::PRIO_MAX);
502		542
503	while ($busy) {	543	while ($busy) {
504	if (Coro::nready) {	544	if (Coro::nready) {
…		…
506	} else {	546	} else {
507	EV::loop EV::LOOP_ONESHOT;	547	EV::loop EV::LOOP_ONESHOT;
508	}	548	}
509	}	549	}
510		550
511	my $time = EV::time - $time;	551	my $time = AE::time - $time;
512		552
513	$TICK_START += $time; # do not account sync jobs to server load	553	$TICK_START += $time; # do not account sync jobs to server load
514		554
515	wantarray ? @res : $res[0]	555	wantarray ? @res : $res[0]
516	} else {	556	} else {
…		…
560	reset_signals;	600	reset_signals;
561	&$cb	601	&$cb
562	}, @args;	602	}, @args;
563		603
564	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	)
565	}	616	}
566		617
567	=item $coin = coin_from_name $name	618	=item $coin = coin_from_name $name
568		619
569	=cut	620	=cut
…		…
606	within each server.	657	within each server.
607		658
608	=cut	659	=cut
609		660
610	sub db_table($) {	661	sub db_table($) {
		662	cf::error "db_get called from main context"
		663	if $Coro::current == $Coro::main;
		664
611	my ($name) = @_;	665	my ($name) = @_;
612	my $db = BDB::db_create $DB_ENV;	666	my $db = BDB::db_create $DB_ENV;
613		667
614	eval {	668	eval {
615	$db->set_flags (BDB::CHKSUM);	669	$db->set_flags (BDB::CHKSUM);
…		…
625	}	679	}
626		680
627	our $DB;	681	our $DB;
628		682
629	sub db_init {	683	sub db_init {
630	cf::sync_job {
631	$DB ||= db_table "db";	684	$DB ||= db_table "db";
632	};
633	}	685	}
634		686
635	sub db_get($$) {	687	sub db_get($$) {
636	my $key = "$_[0]/$_[1]";	688	my $key = "$_[0]/$_[1]";
637		689
638	cf::sync_job {	690	cf::error "db_get called from main context"
		691	if $Coro::current == $Coro::main;
		692
639	BDB::db_get $DB, undef, $key, my $data;	693	BDB::db_get $DB, undef, $key, my $data;
640		694
641	$! ? ()	695	$! ? ()
642	: $data	696	: $data
643	}
644	}	697	}
645		698
646	sub db_put($$$) {	699	sub db_put($$$) {
647	BDB::dbreq_pri 4;	700	BDB::dbreq_pri 4;
648	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	701	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
704		757
705	my $t1 = Time::HiRes::time;	758	my $t1 = Time::HiRes::time;
706	my $data = $process->(\@data);	759	my $data = $process->(\@data);
707	my $t2 = Time::HiRes::time;	760	my $t2 = Time::HiRes::time;
708		761
709	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	762	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
710		763
711	db_put cache => "$id/data", $data;	764	db_put cache => "$id/data", $data;
712	db_put cache => "$id/md5" , $md5;	765	db_put cache => "$id/md5" , $md5;
713	db_put cache => "$id/meta", $meta;	766	db_put cache => "$id/meta", $meta;
714		767
…		…
724		777
725	=cut	778	=cut
726		779
727	sub datalog($@) {	780	sub datalog($@) {
728	my ($type, %kv) = @_;	781	my ($type, %kv) = @_;
729	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	782	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
730	}	783	}
731		784
732	=back	785	=back
733		786
734	=cut	787	=cut
…		…
929		982
930	} elsif (exists $cb_id{$type}) {	983	} elsif (exists $cb_id{$type}) {
931	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	984	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
932		985
933	} elsif (ref $type) {	986	} elsif (ref $type) {
934	warn "attaching objects not supported, ignoring.\n";	987	error "attaching objects not supported, ignoring.\n";
935		988
936	} else {	989	} else {
937	shift @arg;	990	shift @arg;
938	warn "attach argument '$type' not supported, ignoring.\n";	991	error "attach argument '$type' not supported, ignoring.\n";
939	}	992	}
940	}	993	}
941	}	994	}
942		995
943	sub _object_attach {	996	sub _object_attach {
…		…
953	_attach $registry, $klass, @attach;	1006	_attach $registry, $klass, @attach;
954	}	1007	}
955		1008
956	$obj->{$name} = \%arg;	1009	$obj->{$name} = \%arg;
957	} else {	1010	} else {
958	warn "object uses attachment '$name' which is not available, postponing.\n";	1011	info "object uses attachment '$name' which is not available, postponing.\n";
959	}	1012	}
960		1013
961	$obj->{_attachment}{$name} = undef;	1014	$obj->{_attachment}{$name} = undef;
962	}	1015	}
963		1016
…		…
1022		1075
1023	for (@$callbacks) {	1076	for (@$callbacks) {
1024	eval { &{$_->[1]} };	1077	eval { &{$_->[1]} };
1025		1078
1026	if ($@) {	1079	if ($@) {
1027	warn "$@";
1028	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1080	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1029	override;	1081	override;
1030	}	1082	}
1031		1083
1032	return 1 if $override;	1084	return 1 if $override;
1033	}	1085	}
…		…
1112	for (@$attach) {	1164	for (@$attach) {
1113	my ($klass, @attach) = @$_;	1165	my ($klass, @attach) = @$_;
1114	_attach $registry, $klass, @attach;	1166	_attach $registry, $klass, @attach;
1115	}	1167	}
1116	} else {	1168	} else {
1117	warn "object uses attachment '$name' that is not available, postponing.\n";	1169	info "object uses attachment '$name' that is not available, postponing.\n";
1118	}	1170	}
1119	}	1171	}
1120	}	1172	}
1121		1173
1122	cf::attachable->attach (	1174	cf::attachable->attach (
…		…
1149	my ($filename, $rdata, $objs) = @_;	1201	my ($filename, $rdata, $objs) = @_;
1150		1202
1151	sync_job {	1203	sync_job {
1152	if (length $$rdata) {	1204	if (length $$rdata) {
1153	utf8::decode (my $decname = $filename);	1205	utf8::decode (my $decname = $filename);
1154	warn sprintf "saving %s (%d,%d)\n",	1206	trace sprintf "saving %s (%d,%d)\n",
1155	$decname, length $$rdata, scalar @$objs;	1207	$decname, length $$rdata, scalar @$objs
		1208	if $VERBOSE_IO;
1156		1209
1157	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1210	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1158	aio_chmod $fh, SAVE_MODE;	1211	aio_chmod $fh, SAVE_MODE;
1159	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1212	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1160	if ($cf::USE_FSYNC) {	1213	if ($cf::USE_FSYNC) {
…		…
1182	aio_rename "$filename~", $filename;	1235	aio_rename "$filename~", $filename;
1183		1236
1184	$filename =~ s%/[^/]+$%%;	1237	$filename =~ s%/[^/]+$%%;
1185	aio_pathsync $filename if $cf::USE_FSYNC;	1238	aio_pathsync $filename if $cf::USE_FSYNC;
1186	} else {	1239	} else {
1187	warn "unable to save objects: $filename~: $!\n";	1240	error "unable to save objects: $filename~: $!\n";
1188	}	1241	}
1189	} else {	1242	} else {
1190	aio_unlink $filename;	1243	aio_unlink $filename;
1191	aio_unlink "$filename.pst";	1244	aio_unlink "$filename.pst";
1192	}	1245	}
…		…
1216	my $st = eval { Coro::Storable::thaw $av };	1269	my $st = eval { Coro::Storable::thaw $av };
1217	$av = $st->{objs};	1270	$av = $st->{objs};
1218	}	1271	}
1219		1272
1220	utf8::decode (my $decname = $filename);	1273	utf8::decode (my $decname = $filename);
1221	warn sprintf "loading %s (%d,%d)\n",	1274	trace sprintf "loading %s (%d,%d)\n",
1222	$decname, length $data, scalar @{$av || []};	1275	$decname, length $data, scalar @{$av || []}
		1276	if $VERBOSE_IO;
1223		1277
1224	($data, $av)	1278	($data, $av)
1225	}	1279	}
1226		1280
1227	=head2 COMMAND CALLBACKS	1281	=head2 COMMAND CALLBACKS
…		…
1286	}	1340	}
1287		1341
1288	use File::Glob ();	1342	use File::Glob ();
1289		1343
1290	cf::player->attach (	1344	cf::player->attach (
1291	on_command => sub {	1345	on_unknown_command => sub {
1292	my ($pl, $name, $params) = @_;	1346	my ($pl, $name, $params) = @_;
1293		1347
1294	my $cb = $COMMAND{$name}	1348	my $cb = $COMMAND{$name}
1295	or return;	1349	or return;
1296		1350
…		…
1319		1373
1320	$pl->ext_reply ($reply, @reply)	1374	$pl->ext_reply ($reply, @reply)
1321	if $reply;	1375	if $reply;
1322		1376
1323	} else {	1377	} else {
1324	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1378	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1325	}	1379	}
1326		1380
1327	cf::override;	1381	cf::override;
1328	},	1382	},
1329	);	1383	);
…		…
1340		1394
1341	$grp	1395	$grp
1342	}	1396	}
1343		1397
1344	sub load_extensions {	1398	sub load_extensions {
		1399	info "loading extensions...";
		1400
1345	cf::sync_job {	1401	cf::sync_job {
1346	my %todo;	1402	my %todo;
1347		1403
1348	for my $path (<$LIBDIR/*.ext>) {	1404	for my $path (<$LIBDIR/*.ext>) {
1349	next unless -r $path;	1405	next unless -r $path;
…		…
1367		1423
1368	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1424	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1369	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1425	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1370		1426
1371	$ext{source} =	1427	$ext{source} =
1372	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1428	"package $pkg; use common::sense;\n"
1373	. "#line 1 \"$path\"\n{\n"	1429	. "#line 1 \"$path\"\n{\n"
1374	. $source	1430	. $source
1375	. "\n};\n1";	1431	. "\n};\n1";
1376		1432
1377	$todo{$base} = \%ext;	1433	$todo{$base} = \%ext;
1378	}	1434	}
1379		1435
		1436	my $pass = 0;
1380	my %done;	1437	my %done;
1381	while (%todo) {	1438	while (%todo) {
1382	my $progress;	1439	my $progress;
1383		1440
		1441	++$pass;
		1442
		1443	ext:
1384	while (my ($k, $v) = each %todo) {	1444	while (my ($k, $v) = each %todo) {
1385	for (split /,\s*/, $v->{meta}{depends}) {	1445	for (split /,\s*/, $v->{meta}{depends}) {
1386	goto skip	1446	next ext
1387	unless exists $done{$_};	1447	unless exists $done{$_};
1388	}	1448	}
1389		1449
1390	warn "... loading '$k' into '$v->{pkg}'\n";	1450	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1391		1451
1392	unless (eval $v->{source}) {	1452	my $active = eval $v->{source};
		1453
		1454	if (length $@) {
1393	my $msg = $@ ? "$v->{path}: $@\n"	1455	error "$v->{path}: $@\n";
1394	: "$v->{base}: extension inactive.\n";
1395		1456
1396	if (exists $v->{meta}{mandatory}) {
1397	warn $msg;
1398	cf::cleanup "mandatory extension failed to load, exiting.";	1457	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1399	}	1458	if exists $v->{meta}{mandatory};
1400		1459
1401	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;
1402	}	1469	}
1403
1404	$done{$k} = delete $todo{$k};
1405	push @EXTS, $v->{pkg};
1406	$progress = 1;
1407	}	1470	}
1408		1471
1409	skip:	1472	unless ($progress) {
1410	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"	1473	warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1411	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	}
1412	}	1480	}
1413	};	1481	};
1414	}	1482	}
1415		1483
1416	#############################################################################	1484	#############################################################################
…		…
1500	$cf::PLAYER{$login} = $pl	1568	$cf::PLAYER{$login} = $pl
1501	}	1569	}
1502	}	1570	}
1503	}	1571	}
1504		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
1505	sub save($) {	1586	sub save($) {
1506	my ($pl) = @_;	1587	my ($pl) = @_;
1507		1588
1508	return if $pl->{deny_save};	1589	return if $pl->{deny_save};
1509		1590
…		…
1514		1595
1515	aio_mkdir playerdir $pl, 0770;	1596	aio_mkdir playerdir $pl, 0770;
1516	$pl->{last_save} = $cf::RUNTIME;	1597	$pl->{last_save} = $cf::RUNTIME;
1517		1598
1518	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];
1519		1603
1520	$pl->save_pl ($path);	1604	$pl->save_pl ($path);
1521	cf::cede_to_tick;	1605	cf::cede_to_tick;
1522	}	1606	}
1523		1607
…		…
1560	$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
1561		1645
1562	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1646	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1563	$pl->deactivate;	1647	$pl->deactivate;
1564	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;
1565	$pl->ob->check_score;
1566	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1649	$pl->invoke (cf::EVENT_PLAYER_QUIT);
1567	$pl->ns->destroy if $pl->ns;	1650	$pl->ns->destroy if $pl->ns;
1568		1651
1569	my $path = playerdir $pl;	1652	my $path = playerdir $pl;
1570	my $temp = "$path~$cf::RUNTIME~deleting~";	1653	my $temp = "$path~$cf::RUNTIME~deleting~";
…		…
1625	\@logins	1708	\@logins
1626	}	1709	}
1627		1710
1628	=item $player->maps	1711	=item $player->maps
1629		1712
		1713	=item cf::player::maps $login
		1714
1630	Returns an arrayref of map paths that are private for this	1715	Returns an arrayref of map paths that are private for this
1631	player. May block.	1716	player. May block.
1632		1717
1633	=cut	1718	=cut
1634		1719
…		…
1696	=cut	1781	=cut
1697		1782
1698	sub find_by_path($) {	1783	sub find_by_path($) {
1699	my ($path) = @_;	1784	my ($path) = @_;
1700		1785
		1786	$path =~ s/^~[^\/]*//; # skip ~login
		1787
1701	my ($match, $specificity);	1788	my ($match, $specificity);
1702		1789
1703	for my $region (list) {	1790	for my $region (list) {
1704	if ($region->{match} && $path =~ $region->{match}) {	1791	if ($region->{match} && $path =~ $region->{match}) {
1705	($match, $specificity) = ($region, $region->specificity)	1792	($match, $specificity) = ($region, $region->specificity)
…		…
1736	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
1737		1824
1738	# mit "rum" bekleckern, nicht	1825	# mit "rum" bekleckern, nicht
1739	$self->_create_random_map (	1826	$self->_create_random_map (
1740	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},	1827	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1741	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},	1828	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1742	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},	1829	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1743	$rmp->{exit_on_final_map},	1830	$rmp->{exit_on_final_map},
1744	$rmp->{xsize}, $rmp->{ysize},	1831	$rmp->{xsize}, $rmp->{ysize},
1745	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},	1832	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1746	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},	1833	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
…		…
1761		1848
1762	sub register {	1849	sub register {
1763	my (undef, $regex, $prio) = @_;	1850	my (undef, $regex, $prio) = @_;
1764	my $pkg = caller;	1851	my $pkg = caller;
1765		1852
1766	no strict;
1767	push @{"$pkg\::ISA"}, __PACKAGE__;	1853	push @{"$pkg\::ISA"}, __PACKAGE__;
1768		1854
1769	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	1855	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1770	}	1856	}
1771		1857
1772	# also paths starting with '/'	1858	# also paths starting with '/'
1773	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	1859	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1774		1860
1775	sub thawer_merge {	1861	sub thawer_merge {
1776	my ($self, $merge) = @_;	1862	my ($self, $merge) = @_;
1777		1863
1778	# we have to keep some variables in memory intact	1864	# we have to keep some variables in memory intact
…		…
1783	}	1869	}
1784		1870
1785	sub normalise {	1871	sub normalise {
1786	my ($path, $base) = @_;	1872	my ($path, $base) = @_;
1787		1873
1788	$path = "$path"; # make sure its a string	1874	$path = "$path"; # make sure it's a string
1789		1875
1790	$path =~ s/\.map$//;	1876	$path =~ s/\.map$//;
1791		1877
1792	# map plan:	1878	# map plan:
1793	#	1879	#
…		…
1832	$self->init; # pass $1 etc.	1918	$self->init; # pass $1 etc.
1833	return $self;	1919	return $self;
1834	}	1920	}
1835	}	1921	}
1836		1922
1837	Carp::cluck "unable to resolve path '$path' (base '$base').";	1923	Carp::cluck "unable to resolve path '$path' (base '$base')";
1838	()	1924	()
1839	}	1925	}
1840		1926
1841	sub init {	1927	sub init {
1842	my ($self) = @_;	1928	my ($self) = @_;
…		…
1964	}	2050	}
1965		2051
1966	sub find;	2052	sub find;
1967	sub find {	2053	sub find {
1968	my ($path, $origin) = @_;	2054	my ($path, $origin) = @_;
		2055
		2056	cf::cede_to_tick;
1969		2057
1970	$path = normalise $path, $origin && $origin->path;	2058	$path = normalise $path, $origin && $origin->path;
1971		2059
1972	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2060	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973	my $guard2 = cf::lock_acquire "map_find:$path";	2061	my $guard2 = cf::lock_acquire "map_find:$path";
…		…
1992		2080
1993	$cf::MAP{$path} = $map	2081	$cf::MAP{$path} = $map
1994	}	2082	}
1995	}	2083	}
1996		2084
1997	sub pre_load { }	2085	sub pre_load { }
1998	sub post_load { }	2086	#sub post_load { } # XS
1999		2087
2000	sub load {	2088	sub load {
2001	my ($self) = @_;	2089	my ($self) = @_;
2002		2090
2003	local $self->{deny_reset} = 1; # loading can take a long time	2091	local $self->{deny_reset} = 1; # loading can take a long time
…		…
2060	}	2148	}
2061		2149
2062	$self->post_load;	2150	$self->post_load;
2063	}	2151	}
2064		2152
		2153	# customize the map for a given player, i.e.
		2154	# return the _real_ map. used by e.g. per-player
		2155	# maps to change the path to ~playername/mappath
2065	sub customise_for {	2156	sub customise_for {
2066	my ($self, $ob) = @_;	2157	my ($self, $ob) = @_;
2067		2158
2068	return find "~" . $ob->name . "/" . $self->{path}	2159	return find "~" . $ob->name . "/" . $self->{path}
2069	if $self->per_player;	2160	if $self->per_player;
…		…
2085	or next;	2176	or next;
2086	$neigh = find $neigh, $map	2177	$neigh = find $neigh, $map
2087	or next;	2178	or next;
2088	$neigh->load;	2179	$neigh->load;
2089		2180
		2181	# now find the diagonal neighbours
2090	push @neigh,	2182	push @neigh,
2091	[$neigh->tile_path (($_ + 3) % 4), $neigh],	2183	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2092	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2184	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2093	}	2185	}
2094		2186
…		…
2101	}	2193	}
2102		2194
2103	sub find_sync {	2195	sub find_sync {
2104	my ($path, $origin) = @_;	2196	my ($path, $origin) = @_;
2105		2197
2106	cf::sync_job { find $path, $origin }	2198	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
		2199	if $Coro::current == $Coro::main;
		2200
		2201	find $path, $origin
2107	}	2202	}
2108		2203
2109	sub do_load_sync {	2204	sub do_load_sync {
2110	my ($map) = @_;	2205	my ($map) = @_;
2111		2206
2112	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2207	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2113	if $Coro::current == $Coro::main;	2208	if $Coro::current == $Coro::main;
2114		2209
2115	cf::sync_job { $map->load };	2210	$map->load;
2116	}	2211	}
2117		2212
2118	our %MAP_PREFETCH;	2213	our %MAP_PREFETCH;
2119	our $MAP_PREFETCHER = undef;	2214	our $MAP_PREFETCHER = undef;
2120		2215
…		…
2146	$MAP_PREFETCHER->prio (6);	2241	$MAP_PREFETCHER->prio (6);
2147		2242
2148	()	2243	()
2149	}	2244	}
2150		2245
		2246	# common code, used by both ->save and ->swapout
2151	sub save {	2247	sub _save {
2152	my ($self) = @_;	2248	my ($self) = @_;
2153
2154	my $lock = cf::lock_acquire "map_data:$self->{path}";
2155		2249
2156	$self->{last_save} = $cf::RUNTIME;	2250	$self->{last_save} = $cf::RUNTIME;
2157		2251
2158	return unless $self->dirty;	2252	return unless $self->dirty;
2159		2253
…		…
2179	} else {	2273	} else {
2180	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);	2274	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2181	}	2275	}
2182	}	2276	}
2183		2277
		2278	sub save {
		2279	my ($self) = @_;
		2280
		2281	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2282
		2283	$self->_save;
		2284	}
		2285
2184	sub swap_out {	2286	sub swap_out {
2185	my ($self) = @_;	2287	my ($self) = @_;
2186		2288
2187	# save first because save cedes
2188	$self->save;
2189
2190	my $lock = cf::lock_acquire "map_data:$self->{path}";	2289	my $lock = cf::lock_acquire "map_data:$self->{path}";
2191		2290
2192	return if $self->players;
2193	return if $self->in_memory != cf::MAP_ACTIVE;	2291	return if $self->in_memory != cf::MAP_ACTIVE;
2194	return if $self->{deny_save};	2292	return if $self->{deny_save};
		2293	return if $self->players;
2195		2294
		2295	# first deactivate the map and "unlink" it from the core
		2296	$self->deactivate;
		2297	$_->clear_links_to ($self) for values %cf::MAP;
2196	$self->in_memory (cf::MAP_SWAPPED);	2298	$self->in_memory (cf::MAP_SWAPPED);
		2299
		2300	# then atomically save
		2301	$self->_save;
		2302
		2303	# then free the map
		2304	$self->clear;
		2305	}
		2306
		2307	sub reset_at {
		2308	my ($self) = @_;
		2309
		2310	# TODO: safety, remove and allow resettable per-player maps
		2311	return 1e99 if $self->{deny_reset};
		2312
		2313	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
		2314	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
		2315
		2316	$time + $to
		2317	}
		2318
		2319	sub should_reset {
		2320	my ($self) = @_;
		2321
		2322	$self->reset_at <= $cf::RUNTIME
		2323	}
		2324
		2325	sub reset {
		2326	my ($self) = @_;
		2327
		2328	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2329
		2330	return if $self->players;
		2331
		2332	cf::trace "resetting map ", $self->path, "\n";
		2333
		2334	$self->in_memory (cf::MAP_SWAPPED);
		2335
		2336	# need to save uniques path
		2337	unless ($self->{deny_save}) {
		2338	my $uniq = $self->uniq_path; utf8::encode $uniq;
		2339
		2340	$self->_save_objects ($uniq, cf::IO_UNIQUES)
		2341	if $uniq;
		2342	}
		2343
		2344	delete $cf::MAP{$self->path};
2197		2345
2198	$self->deactivate;	2346	$self->deactivate;
2199	$_->clear_links_to ($self) for values %cf::MAP;	2347	$_->clear_links_to ($self) for values %cf::MAP;
2200	$self->clear;	2348	$self->clear;
2201	}
2202
2203	sub reset_at {
2204	my ($self) = @_;
2205
2206	# TODO: safety, remove and allow resettable per-player maps
2207	return 1e99 if $self->{deny_reset};
2208
2209	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2210	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2211
2212	$time + $to
2213	}
2214
2215	sub should_reset {
2216	my ($self) = @_;
2217
2218	$self->reset_at <= $cf::RUNTIME
2219	}
2220
2221	sub reset {
2222	my ($self) = @_;
2223
2224	my $lock = cf::lock_acquire "map_data:$self->{path}";
2225
2226	return if $self->players;
2227
2228	warn "resetting map ", $self->path;
2229
2230	$self->in_memory (cf::MAP_SWAPPED);
2231
2232	# need to save uniques path
2233	unless ($self->{deny_save}) {
2234	my $uniq = $self->uniq_path; utf8::encode $uniq;
2235
2236	$self->_save_objects ($uniq, cf::IO_UNIQUES)
2237	if $uniq;
2238	}
2239
2240	delete $cf::MAP{$self->path};
2241
2242	$self->deactivate;
2243	$_->clear_links_to ($self) for values %cf::MAP;
2244	$self->clear;
2245		2349
2246	$self->unlink_save;	2350	$self->unlink_save;
2247	$self->destroy;	2351	$self->destroy;
2248	}	2352	}
2249		2353
…		…
2257		2361
2258	delete $cf::MAP{$self->path};	2362	delete $cf::MAP{$self->path};
2259		2363
2260	$self->unlink_save;	2364	$self->unlink_save;
2261		2365
2262	bless $self, "cf::map";	2366	bless $self, "cf::map::wrap";
2263	delete $self->{deny_reset};	2367	delete $self->{deny_reset};
2264	$self->{deny_save} = 1;	2368	$self->{deny_save} = 1;
2265	$self->reset_timeout (1);	2369	$self->reset_timeout (1);
2266	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2370	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2267		2371
…		…
2324	: normalise $_	2428	: normalise $_
2325	} @{ aio_readdir $UNIQUEDIR or [] }	2429	} @{ aio_readdir $UNIQUEDIR or [] }
2326	]	2430	]
2327	}	2431	}
2328		2432
		2433	=item cf::map::static_maps
		2434
		2435	Returns an arrayref if paths of all static maps (all preinstalled F<.map>
		2436	file in the shared directory excluding F</styles> and F</editor>). May
		2437	block.
		2438
		2439	=cut
		2440
		2441	sub static_maps() {
		2442	my @dirs = "";
		2443	my @maps;
		2444
		2445	while (@dirs) {
		2446	my $dir = shift @dirs;
		2447
		2448	next if $dir eq "/styles" || $dir eq "/editor";
		2449
		2450	my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
		2451	or return;
		2452
		2453	for (@$files) {
		2454	s/\.map$// or next;
		2455	utf8::decode $_;
		2456	push @maps, "$dir/$_";
		2457	}
		2458
		2459	push @dirs, map "$dir/$_", @$dirs;
		2460	}
		2461
		2462	\@maps
		2463	}
		2464
2329	=back	2465	=back
2330		2466
2331	=head3 cf::object	2467	=head3 cf::object
2332		2468
2333	=cut	2469	=cut
…		…
2465		2601
2466	Freezes the player and moves him/her to a special map (C<{link}>).	2602	Freezes the player and moves him/her to a special map (C<{link}>).
2467		2603
2468	The player should be reasonably safe there for short amounts of time (e.g.	2604	The player should be reasonably safe there for short amounts of time (e.g.
2469	for loading a map). You I<MUST> call C<leave_link> as soon as possible,	2605	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2470	though, as the palyer cannot control the character while it is on the link	2606	though, as the player cannot control the character while it is on the link
2471	map.	2607	map.
2472		2608
2473	Will never block.	2609	Will never block.
2474		2610
2475	=item $player_object->leave_link ($map, $x, $y)	2611	=item $player_object->leave_link ($map, $x, $y)
…		…
2496	sub cf::object::player::enter_link {	2632	sub cf::object::player::enter_link {
2497	my ($self) = @_;	2633	my ($self) = @_;
2498		2634
2499	$self->deactivate_recursive;	2635	$self->deactivate_recursive;
2500		2636
		2637	++$self->{_link_recursion};
		2638
2501	return if UNIVERSAL::isa $self->map, "ext::map_link";	2639	return if UNIVERSAL::isa $self->map, "ext::map_link";
2502		2640
2503	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2641	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2504	if $self->map && $self->map->{path} ne "{link}";	2642	if $self->map && $self->map->{path} ne "{link}";
2505		2643
2506	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2644	$self->enter_map ($LINK_MAP || link_map, 3, 3);
2507	}	2645	}
2508		2646
2509	sub cf::object::player::leave_link {	2647	sub cf::object::player::leave_link {
2510	my ($self, $map, $x, $y) = @_;	2648	my ($self, $map, $x, $y) = @_;
2511		2649
…		…
2528	($x, $y) = (-1, -1)	2666	($x, $y) = (-1, -1)
2529	unless (defined $x) && (defined $y);	2667	unless (defined $x) && (defined $y);
2530		2668
2531	# use -1 or undef as default coordinates, not 0, 0	2669	# use -1 or undef as default coordinates, not 0, 0
2532	($x, $y) = ($map->enter_x, $map->enter_y)	2670	($x, $y) = ($map->enter_x, $map->enter_y)
2533	if $x <=0 && $y <= 0;	2671	if $x <= 0 && $y <= 0;
2534		2672
2535	$map->load;	2673	$map->load;
2536	$map->load_neighbours;	2674	$map->load_neighbours;
2537		2675
2538	return unless $self->contr->active;	2676	return unless $self->contr->active;
2539	$self->flag (cf::FLAG_DEBUG, 0);#d# temp
2540	$self->activate_recursive;
2541		2677
2542	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2678	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2543	$self->enter_map ($map, $x, $y);	2679	if ($self->enter_map ($map, $x, $y)) {
2544	}	2680	# entering was successful
		2681	delete $self->{_link_recursion};
		2682	# only activate afterwards, to support waiting in hooks
		2683	$self->activate_recursive;
		2684	}
2545		2685
		2686	}
		2687
2546	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2688	=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2547		2689
2548	Moves the player to the given map-path and coordinates by first freezing	2690	Moves the player to the given map-path and coordinates by first freezing
2549	her, loading and preparing them map, calling the provided $check callback	2691	her, loading and preparing them map, calling the provided $check callback
2550	that has to return the map if sucecssful, and then unfreezes the player on	2692	that has to return the map if sucecssful, and then unfreezes the player on
2551	the new (success) or old (failed) map position. In either case, $done will	2693	the new (success) or old (failed) map position. In either case, $done will
…		…
2558		2700
2559	our $GOTOGEN;	2701	our $GOTOGEN;
2560		2702
2561	sub cf::object::player::goto {	2703	sub cf::object::player::goto {
2562	my ($self, $path, $x, $y, $check, $done) = @_;	2704	my ($self, $path, $x, $y, $check, $done) = @_;
		2705
		2706	if ($self->{_link_recursion} >= $MAX_LINKS) {
		2707	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
		2708	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
		2709	($path, $x, $y) = @$EMERGENCY_POSITION;
		2710	}
2563		2711
2564	# do generation counting so two concurrent goto's will be executed in-order	2712	# do generation counting so two concurrent goto's will be executed in-order
2565	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2713	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2566		2714
2567	$self->enter_link;	2715	$self->enter_link;
…		…
2591	my $map = eval {	2739	my $map = eval {
2592	my $map = defined $path ? cf::map::find $path : undef;	2740	my $map = defined $path ? cf::map::find $path : undef;
2593		2741
2594	if ($map) {	2742	if ($map) {
2595	$map = $map->customise_for ($self);	2743	$map = $map->customise_for ($self);
2596	$map = $check->($map) if $check && $map;	2744	$map = $check->($map, $x, $y, $self) if $check && $map;
2597	} else {	2745	} else {
2598	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);	2746	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2599	}	2747	}
2600		2748
2601	$map	2749	$map
…		…
2609	if ($gen == $self->{_goto_generation}) {	2757	if ($gen == $self->{_goto_generation}) {
2610	delete $self->{_goto_generation};	2758	delete $self->{_goto_generation};
2611	$self->leave_link ($map, $x, $y);	2759	$self->leave_link ($map, $x, $y);
2612	}	2760	}
2613		2761
2614	$done->() if $done;	2762	$done->($self) if $done;
2615	})->prio (1);	2763	})->prio (1);
2616	}	2764	}
2617		2765
2618	=item $player_object->enter_exit ($exit_object)	2766	=item $player_object->enter_exit ($exit_object)
2619		2767
…		…
2712	$self->message ("Something went wrong deep within the deliantra server. "	2860	$self->message ("Something went wrong deep within the deliantra server. "
2713	. "I'll try to bring you back to the map you were before. "	2861	. "I'll try to bring you back to the map you were before. "
2714	. "Please report this to the dungeon master!",	2862	. "Please report this to the dungeon master!",
2715	cf::NDI_UNIQUE | cf::NDI_RED);	2863	cf::NDI_UNIQUE | cf::NDI_RED);
2716		2864
2717	warn "ERROR in enter_exit: $@";	2865	error "ERROR in enter_exit: $@";
2718	$self->leave_link;	2866	$self->leave_link;
2719	}	2867	}
2720	})->prio (1);	2868	})->prio (1);
2721	}	2869	}
2722		2870
…		…
2734	sub cf::client::send_drawinfo {	2882	sub cf::client::send_drawinfo {
2735	my ($self, $text, $flags) = @_;	2883	my ($self, $text, $flags) = @_;
2736		2884
2737	utf8::encode $text;	2885	utf8::encode $text;
2738	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2886	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
		2887	}
		2888
		2889	=item $client->send_big_packet ($pkt)
		2890
		2891	Like C<send_packet>, but tries to compress large packets, and fragments
		2892	them as required.
		2893
		2894	=cut
		2895
		2896	our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
		2897
		2898	sub cf::client::send_big_packet {
		2899	my ($self, $pkt) = @_;
		2900
		2901	# try lzf for large packets
		2902	$pkt = "lzf " . Compress::LZF::compress $pkt
		2903	if 1024 <= length $pkt and $self->{can_lzf};
		2904
		2905	# split very large packets
		2906	if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
		2907	$self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
		2908	$pkt = "frag";
		2909	}
		2910
		2911	$self->send_packet ($pkt);
2739	}	2912	}
2740		2913
2741	=item $client->send_msg ($channel, $msg, $color, [extra...])	2914	=item $client->send_msg ($channel, $msg, $color, [extra...])
2742		2915
2743	Send a drawinfo or msg packet to the client, formatting the msg for the	2916	Send a drawinfo or msg packet to the client, formatting the msg for the
…		…
2747		2920
2748	=cut	2921	=cut
2749		2922
2750	# non-persistent channels (usually the info channel)	2923	# non-persistent channels (usually the info channel)
2751	our %CHANNEL = (	2924	our %CHANNEL = (
		2925	"c/motd" => {
		2926	id => "infobox",
		2927	title => "MOTD",
		2928	reply => undef,
		2929	tooltip => "The message of the day",
		2930	},
2752	"c/identify" => {	2931	"c/identify" => {
2753	id => "infobox",	2932	id => "infobox",
2754	title => "Identify",	2933	title => "Identify",
2755	reply => undef,	2934	reply => undef,
2756	tooltip => "Items recently identified",	2935	tooltip => "Items recently identified",
…		…
2758	"c/examine" => {	2937	"c/examine" => {
2759	id => "infobox",	2938	id => "infobox",
2760	title => "Examine",	2939	title => "Examine",
2761	reply => undef,	2940	reply => undef,
2762	tooltip => "Signs and other items you examined",	2941	tooltip => "Signs and other items you examined",
		2942	},
		2943	"c/shopinfo" => {
		2944	id => "infobox",
		2945	title => "Shop Info",
		2946	reply => undef,
		2947	tooltip => "What your bargaining skill tells you about the shop",
2763	},	2948	},
2764	"c/book" => {	2949	"c/book" => {
2765	id => "infobox",	2950	id => "infobox",
2766	title => "Book",	2951	title => "Book",
2767	reply => undef,	2952	reply => undef,
…		…
2883	my $pkt = "msg "	3068	my $pkt = "msg "
2884	. $self->{json_coder}->encode (	3069	. $self->{json_coder}->encode (
2885	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]	3070	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2886	);	3071	);
2887		3072
2888	# try lzf for large packets
2889	$pkt = "lzf " . Compress::LZF::compress $pkt
2890	if 1024 <= length $pkt and $self->{can_lzf};
2891
2892	# split very large packets
2893	if (8192 < length $pkt and $self->{can_lzf}) {
2894	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2895	$pkt = "frag";
2896	}
2897
2898	$self->send_packet ($pkt);	3073	$self->send_big_packet ($pkt);
2899	}	3074	}
2900		3075
2901	=item $client->ext_msg ($type, @msg)	3076	=item $client->ext_msg ($type, @msg)
2902		3077
2903	Sends an ext event to the client.	3078	Sends an ext event to the client.
…		…
2906		3081
2907	sub cf::client::ext_msg($$@) {	3082	sub cf::client::ext_msg($$@) {
2908	my ($self, $type, @msg) = @_;	3083	my ($self, $type, @msg) = @_;
2909		3084
2910	if ($self->extcmd == 2) {	3085	if ($self->extcmd == 2) {
2911	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3086	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2912	} elsif ($self->extcmd == 1) { # TODO: remove	3087	} elsif ($self->extcmd == 1) { # TODO: remove
2913	push @msg, msgtype => "event_$type";	3088	push @msg, msgtype => "event_$type";
2914	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3089	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2915	}	3090	}
2916	}	3091	}
2917		3092
2918	=item $client->ext_reply ($msgid, @msg)	3093	=item $client->ext_reply ($msgid, @msg)
2919		3094
…		…
2923		3098
2924	sub cf::client::ext_reply($$@) {	3099	sub cf::client::ext_reply($$@) {
2925	my ($self, $id, @msg) = @_;	3100	my ($self, $id, @msg) = @_;
2926		3101
2927	if ($self->extcmd == 2) {	3102	if ($self->extcmd == 2) {
2928	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));	3103	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2929	} elsif ($self->extcmd == 1) {	3104	} elsif ($self->extcmd == 1) {
2930	#TODO: version 1, remove	3105	#TODO: version 1, remove
2931	unshift @msg, msgtype => "reply", msgid => $id;	3106	unshift @msg, msgtype => "reply", msgid => $id;
2932	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3107	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2933	}	3108	}
2934	}	3109	}
2935		3110
2936	=item $success = $client->query ($flags, "text", \&cb)	3111	=item $success = $client->query ($flags, "text", \&cb)
2937		3112
…		…
3008		3183
3009	$ns->ext_reply ($reply, @reply)	3184	$ns->ext_reply ($reply, @reply)
3010	if $reply;	3185	if $reply;
3011		3186
3012	} else {	3187	} else {
3013	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3188	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3014	}	3189	}
3015		3190
3016	cf::override;	3191	cf::override;
3017	},	3192	},
3018	);	3193	);
…		…
3038		3213
3039	$coro	3214	$coro
3040	}	3215	}
3041		3216
3042	cf::client->attach (	3217	cf::client->attach (
3043	on_destroy => sub {	3218	on_client_destroy => sub {
3044	my ($ns) = @_;	3219	my ($ns) = @_;
3045		3220
3046	$_->cancel for values %{ (delete $ns->{_coro}) || {} };	3221	$_->cancel for values %{ (delete $ns->{_coro}) || {} };
3047	},	3222	},
3048	);	3223	);
…		…
3064	our $safe_hole = new Safe::Hole;	3239	our $safe_hole = new Safe::Hole;
3065		3240
3066	$SIG{FPE} = 'IGNORE';	3241	$SIG{FPE} = 'IGNORE';
3067		3242
3068	$safe->permit_only (Opcode::opset qw(	3243	$safe->permit_only (Opcode::opset qw(
3069	:base_core :base_mem :base_orig :base_math	3244	:base_core :base_mem :base_orig :base_math :base_loop
3070	grepstart grepwhile mapstart mapwhile	3245	grepstart grepwhile mapstart mapwhile
3071	sort time	3246	sort time
3072	));	3247	));
3073		3248
3074	# here we export the classes and methods available to script code	3249	# here we export the classes and methods available to script code
…		…
3099	decrease split destroy change_exp value msg lore send_msg)],	3274	decrease split destroy change_exp value msg lore send_msg)],
3100	["cf::object::player" => qw(player)],	3275	["cf::object::player" => qw(player)],
3101	["cf::player" => qw(peaceful send_msg)],	3276	["cf::player" => qw(peaceful send_msg)],
3102	["cf::map" => qw(trigger)],	3277	["cf::map" => qw(trigger)],
3103	) {	3278	) {
3104	no strict 'refs';
3105	my ($pkg, @funs) = @$_;	3279	my ($pkg, @funs) = @$_;
3106	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3280	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3107	for @funs;	3281	for @funs;
3108	}	3282	}
3109		3283
…		…
3126	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3300	$qcode =~ s/"/‟/g; # not allowed in #line filenames
3127	$qcode =~ s/\n/\\n/g;	3301	$qcode =~ s/\n/\\n/g;
3128		3302
3129	%vars = (_dummy => 0) unless %vars;	3303	%vars = (_dummy => 0) unless %vars;
3130		3304
		3305	my @res;
3131	local $_;	3306	local $_;
3132	local @safe::cf::_safe_eval_args = values %vars;
3133		3307
3134	my $eval =	3308	my $eval =
3135	"do {\n"	3309	"do {\n"
3136	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"	3310	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3137	. "#line 0 \"{$qcode}\"\n"	3311	. "#line 0 \"{$qcode}\"\n"
3138	. $code	3312	. $code
3139	. "\n}"	3313	. "\n}"
3140	;	3314	;
3141		3315
		3316	if ($CFG{safe_eval}) {
3142	sub_generation_inc;	3317	sub_generation_inc;
		3318	local @safe::cf::_safe_eval_args = values %vars;
3143	my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);	3319	@res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3144	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	}
3145		3325
3146	if ($@) {	3326	if ($@) {
3147	warn "$@";	3327	warn "$@",
3148	warn "while executing safe code '$code'\n";	3328	"while executing safe code '$code'\n",
3149	warn "with arguments " . (join " ", %vars) . "\n";	3329	"with arguments " . (join " ", %vars) . "\n";
3150	}	3330	}
3151		3331
3152	wantarray ? @res : $res[0]	3332	wantarray ? @res : $res[0]
3153	}	3333	}
3154		3334
…		…
3168	=cut	3348	=cut
3169		3349
3170	sub register_script_function {	3350	sub register_script_function {
3171	my ($fun, $cb) = @_;	3351	my ($fun, $cb) = @_;
3172		3352
3173	no strict 'refs';	3353	$fun = "safe::$fun" if $CFG{safe_eval};
3174	*{"safe::$fun"} = $safe_hole->wrap ($cb);	3354	*$fun = $safe_hole->wrap ($cb);
3175	}	3355	}
3176		3356
3177	=back	3357	=back
3178		3358
3179	=cut	3359	=cut
…		…
3188	# for this (global event?)	3368	# for this (global event?)
3189	%ext::player_env::MUSIC_FACE_CACHE = ();	3369	%ext::player_env::MUSIC_FACE_CACHE = ();
3190		3370
3191	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3371	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3192		3372
3193	warn "loading facedata from $path\n";	3373	trace "loading facedata from $path\n";
3194		3374
3195	my $facedata;	3375	my $facedata;
3196	0 < aio_load $path, $facedata	3376	0 < aio_load $path, $facedata
3197	or die "$path: $!";	3377	or die "$path: $!";
3198		3378
…		…
3200		3380
3201	$facedata->{version} == 2	3381	$facedata->{version} == 2
3202	or cf::cleanup "$path: version mismatch, cannot proceed.";	3382	or cf::cleanup "$path: version mismatch, cannot proceed.";
3203		3383
3204	# 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]);
3205	$facedata->{resource}{"res/exp_table"} = {	3386	$facedata->{resource}{"res/exp_table"} = {
3206	type => FT_RSRC,	3387	type => FT_RSRC,
3207	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),
3208	};	3390	};
3209	cf::cede_to_tick;	3391	cf::cede_to_tick;
3210		3392
3211	{	3393	{
3212	my $faces = $facedata->{faceinfo};	3394	my $faces = $facedata->{faceinfo};
…		…
3214	while (my ($face, $info) = each %$faces) {	3396	while (my ($face, $info) = each %$faces) {
3215	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3397	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3216		3398
3217	cf::face::set_visibility $idx, $info->{visibility};	3399	cf::face::set_visibility $idx, $info->{visibility};
3218	cf::face::set_magicmap $idx, $info->{magicmap};	3400	cf::face::set_magicmap $idx, $info->{magicmap};
3219	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};	3401	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3220	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};	3402	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3221		3403
3222	cf::cede_to_tick;	3404	cf::cede_to_tick;
3223	}	3405	}
3224		3406
3225	while (my ($face, $info) = each %$faces) {	3407	while (my ($face, $info) = each %$faces) {
…		…
3230		3412
3231	if (my $smooth = cf::face::find $info->{smooth}) {	3413	if (my $smooth = cf::face::find $info->{smooth}) {
3232	cf::face::set_smooth $idx, $smooth;	3414	cf::face::set_smooth $idx, $smooth;
3233	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3415	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3234	} else {	3416	} else {
3235	warn "smooth face '$info->{smooth}' not found for face '$face'";	3417	error "smooth face '$info->{smooth}' not found for face '$face'";
3236	}	3418	}
3237		3419
3238	cf::cede_to_tick;	3420	cf::cede_to_tick;
3239	}	3421	}
3240	}	3422	}
…		…
3249		3431
3250	cf::anim::invalidate_all; # d'oh	3432	cf::anim::invalidate_all; # d'oh
3251	}	3433	}
3252		3434
3253	{	3435	{
3254	# TODO: for gcfclient pleasure, we should give resources
3255	# that gcfclient doesn't grok a >10000 face index.
3256	my $res = $facedata->{resource};	3436	my $res = $facedata->{resource};
3257		3437
3258	while (my ($name, $info) = each %$res) {	3438	while (my ($name, $info) = each %$res) {
3259	if (defined $info->{type}) {	3439	if (defined $info->{type}) {
3260	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3440	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3261	my $data;
3262		3441
3263	if ($info->{type} & 1) {	3442	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3264	# prepend meta info
3265
3266	my $meta = $enc->encode ({
3267	name => $name,
3268	%{ $info->{meta} || {} },
3269	});
3270
3271	$data = pack "(w/a*)*", $meta, $info->{data};
3272	} else {
3273	$data = $info->{data};
3274	}
3275
3276	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3277	cf::face::set_type $idx, $info->{type};	3443	cf::face::set_type $idx, $info->{type};
3278	} else {	3444	} else {
3279	$RESOURCE{$name} = $info;	3445	$RESOURCE{$name} = $info; # unused
3280	}	3446	}
3281		3447
3282	cf::cede_to_tick;	3448	cf::cede_to_tick;
3283	}	3449	}
3284	}	3450	}
3285		3451
3286	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3452	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3287		3453
3288	1	3454	1
3289	}	3455	}
3290
3291	cf::global->attach (on_resource_update => sub {
3292	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3293	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3294
3295	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3296	my $sound = $soundconf->{compat}[$_]
3297	or next;
3298
3299	my $face = cf::face::find "sound/$sound->[1]";
3300	cf::sound::set $sound->[0] => $face;
3301	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3302	}
3303
3304	while (my ($k, $v) = each %{$soundconf->{event}}) {
3305	my $face = cf::face::find "sound/$v";
3306	cf::sound::set $k => $face;
3307	}
3308	}
3309	});
3310		3456
3311	register_exticmd fx_want => sub {	3457	register_exticmd fx_want => sub {
3312	my ($ns, $want) = @_;	3458	my ($ns, $want) = @_;
3313		3459
3314	while (my ($k, $v) = each %$want) {	3460	while (my ($k, $v) = each %$want) {
…		…
3353	sub reload_treasures {	3499	sub reload_treasures {
3354	load_resource_file "$DATADIR/treasures"	3500	load_resource_file "$DATADIR/treasures"
3355	or die "unable to load treasurelists\n";	3501	or die "unable to load treasurelists\n";
3356	}	3502	}
3357		3503
		3504	sub reload_exp {
		3505	cf::init_experience;
		3506	}
		3507
		3508	sub reload_sound {
		3509	trace "loading sound config from $DATADIR/sound\n";
		3510
		3511	0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
		3512	or die "$DATADIR/sound $!";
		3513
		3514	my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
		3515
		3516	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3517	my $sound = $soundconf->{compat}[$_]
		3518	or next;
		3519
		3520	my $face = cf::face::find "sound/$sound->[1]";
		3521	cf::sound::set $sound->[0] => $face;
		3522	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3523	}
		3524
		3525	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3526	my $face = cf::face::find "sound/$v";
		3527	cf::sound::set $k => $face;
		3528	}
		3529	}
		3530
3358	sub reload_resources {	3531	sub reload_resources {
3359	warn "reloading resource files...\n";	3532	trace "reloading resource files...\n";
3360		3533
		3534	reload_exp;
3361	reload_facedata;	3535	reload_facedata;
		3536	reload_sound;
3362	reload_archetypes;	3537	reload_archetypes;
3363	reload_regions;	3538	reload_regions;
3364	reload_treasures;	3539	reload_treasures;
3365		3540
3366	warn "finished reloading resource files\n";	3541	trace "finished reloading resource files\n";
3367	}	3542	}
3368		3543
3369	sub reload_config {	3544	sub reload_config {
		3545	trace "reloading config file...\n";
		3546
3370	open my $fh, "<:utf8", "$CONFDIR/config"	3547	open my $fh, "<:utf8", "$CONFDIR/config"
3371	or return;	3548	or return;
3372		3549
3373	local $/;	3550	local $/;
3374	*CFG = YAML::Load <$fh>;	3551	*CFG = YAML::XS::Load scalar <$fh>;
3375		3552
3376	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3553	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3377		3554
3378	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3555	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3379	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3556	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3380		3557
3381	if (exists $CFG{mlockall}) {	3558	if (exists $CFG{mlockall}) {
…		…
3383	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3560	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3384	and die "WARNING: m(un)lockall failed: $!\n";	3561	and die "WARNING: m(un)lockall failed: $!\n";
3385	};	3562	};
3386	warn $@ if $@;	3563	warn $@ if $@;
3387	}	3564	}
		3565
		3566	trace "finished reloading resource files\n";
3388	}	3567	}
3389		3568
3390	sub pidfile() {	3569	sub pidfile() {
3391	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3570	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3392	or die "$PIDFILE: $!";	3571	or die "$PIDFILE: $!";
…		…
3405	seek $fh, 0, 0;	3584	seek $fh, 0, 0;
3406	print $fh $$;	3585	print $fh $$;
3407	}	3586	}
3408		3587
3409	sub main_loop {	3588	sub main_loop {
3410	warn "EV::loop starting\n";	3589	trace "EV::loop starting\n";
3411	if (1) {	3590	if (1) {
3412	EV::loop;	3591	EV::loop;
3413	}	3592	}
3414	warn "EV::loop returned\n";	3593	trace "EV::loop returned\n";
3415	goto &main_loop unless $REALLY_UNLOOP;	3594	goto &main_loop unless $REALLY_UNLOOP;
3416	}	3595	}
3417		3596
3418	sub main {	3597	sub main {
3419	cf::init_globals; # initialise logging	3598	cf::init_globals; # initialise logging
3420		3599
3421	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3600	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3422	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3601	LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3423	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3602	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3424	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3603	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3425
3426	cf::init_experience;
3427	cf::init_anim;
3428	cf::init_attackmess;
3429	cf::init_dynamic;
3430		3604
3431	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3605	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3432		3606
3433	# we must not ever block the main coroutine	3607	# we must not ever block the main coroutine
3434	local $Coro::idle = sub {	3608	local $Coro::idle = sub {
…		…
3440	};	3614	};
3441		3615
3442	evthread_start IO::AIO::poll_fileno;	3616	evthread_start IO::AIO::poll_fileno;
3443		3617
3444	cf::sync_job {	3618	cf::sync_job {
		3619	cf::incloader::init ();
		3620
		3621	cf::init_anim;
		3622	cf::init_attackmess;
		3623	cf::init_dynamic;
		3624
		3625	cf::load_settings;
		3626	cf::load_materials;
		3627
3445	reload_resources;	3628	reload_resources;
3446	reload_config;	3629	reload_config;
3447	db_init;	3630	db_init;
3448		3631
3449	cf::load_settings;
3450	cf::load_materials;
3451	cf::init_uuid;	3632	cf::init_uuid;
3452	cf::init_signals;	3633	cf::init_signals;
3453	cf::init_commands;
3454	cf::init_skills;	3634	cf::init_skills;
3455		3635
3456	cf::init_beforeplay;	3636	cf::init_beforeplay;
3457		3637
3458	atomic;	3638	atomic;
…		…
3466	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3646	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3467		3647
3468	(pop @POST_INIT)->(0) while @POST_INIT;	3648	(pop @POST_INIT)->(0) while @POST_INIT;
3469	};	3649	};
3470		3650
		3651	cf::object::thawer::errors_are_fatal 0;
		3652	info "parse errors in files are no longer fatal from this point on.\n";
		3653
		3654	my $free_main; $free_main = EV::idle sub {
		3655	undef $free_main;
		3656	undef &main; # free gobs of memory :)
		3657	};
		3658
3471	main_loop;	3659	goto &main_loop;
3472	}	3660	}
3473		3661
3474	#############################################################################	3662	#############################################################################
3475	# initialisation and cleanup	3663	# initialisation and cleanup
3476		3664
3477	# install some emergency cleanup handlers	3665	# install some emergency cleanup handlers
3478	BEGIN {	3666	BEGIN {
3479	our %SIGWATCHER = ();	3667	our %SIGWATCHER = ();
3480	for my $signal (qw(INT HUP TERM)) {	3668	for my $signal (qw(INT HUP TERM)) {
3481	$SIGWATCHER{$signal} = EV::signal $signal, sub {	3669	$SIGWATCHER{$signal} = AE::signal $signal, sub {
3482	cf::cleanup "SIG$signal";	3670	cf::cleanup "SIG$signal";
3483	};	3671	};
3484	}	3672	}
3485	}	3673	}
3486		3674
3487	sub write_runtime_sync {	3675	sub write_runtime_sync {
		3676	my $t0 = AE::time;
		3677
3488	# first touch the runtime file to show we are still running:	3678	# first touch the runtime file to show we are still running:
3489	# the fsync below can take a very very long time.	3679	# the fsync below can take a very very long time.
3490		3680
3491	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;	3681	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3492		3682
3493	my $guard = cf::lock_acquire "write_runtime";	3683	my $guard = cf::lock_acquire "write_runtime";
3494		3684
3495	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644	3685	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3496	or return;	3686	or return;
3497		3687
3498	my $value = $cf::RUNTIME + 90 + 10;	3688	my $value = $cf::RUNTIME + 90 + 10;
3499	# 10 is the runtime save interval, for a monotonic clock	3689	# 10 is the runtime save interval, for a monotonic clock
3500	# 60 allows for the watchdog to kill the server.	3690	# 60 allows for the watchdog to kill the server.
…		…
3513	or return;	3703	or return;
3514		3704
3515	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3705	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3516	and return;	3706	and return;
3517		3707
3518	warn "runtime file written.\n";	3708	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3519		3709
3520	1	3710	1
3521	}	3711	}
3522		3712
3523	our $uuid_lock;	3713	our $uuid_lock;
…		…
3535	or return;	3725	or return;
3536		3726
3537	my $value = uuid_seq uuid_cur;	3727	my $value = uuid_seq uuid_cur;
3538		3728
3539	unless ($value) {	3729	unless ($value) {
3540	warn "cowardly refusing to write zero uuid value!\n";	3730	info "cowardly refusing to write zero uuid value!\n";
3541	return;	3731	return;
3542	}	3732	}
3543		3733
3544	my $value = uuid_str $value + $uuid_skip;	3734	my $value = uuid_str $value + $uuid_skip;
3545	$uuid_skip = 0;	3735	$uuid_skip = 0;
…		…
3555	or return;	3745	or return;
3556		3746
3557	aio_rename "$uuid~", $uuid	3747	aio_rename "$uuid~", $uuid
3558	and return;	3748	and return;
3559		3749
3560	warn "uuid file written ($value).\n";	3750	trace "uuid file written ($value).\n";
3561		3751
3562	1	3752	1
3563		3753
3564	}	3754	}
3565		3755
…		…
3571	}	3761	}
3572		3762
3573	sub emergency_save() {	3763	sub emergency_save() {
3574	my $freeze_guard = cf::freeze_mainloop;	3764	my $freeze_guard = cf::freeze_mainloop;
3575		3765
3576	warn "emergency_perl_save: enter\n";	3766	info "emergency_perl_save: enter\n";
		3767
		3768	# this is a trade-off: we want to be very quick here, so
		3769	# save all maps without fsync, and later call a global sync
		3770	# (which in turn might be very very slow)
		3771	local $USE_FSYNC = 0;
3577		3772
3578	cf::sync_job {	3773	cf::sync_job {
3579	# this is a trade-off: we want to be very quick here, so	3774	cf::write_runtime_sync; # external watchdog should not bark
3580	# save all maps without fsync, and later call a global sync
3581	# (which in turn might be very very slow)
3582	local $USE_FSYNC = 0;
3583		3775
3584	# use a peculiar iteration method to avoid tripping on perl	3776	# use a peculiar iteration method to avoid tripping on perl
3585	# refcount bugs in for. also avoids problems with players	3777	# refcount bugs in for. also avoids problems with players
3586	# and maps saved/destroyed asynchronously.	3778	# and maps saved/destroyed asynchronously.
3587	warn "emergency_perl_save: begin player save\n";	3779	info "emergency_perl_save: begin player save\n";
3588	for my $login (keys %cf::PLAYER) {	3780	for my $login (keys %cf::PLAYER) {
3589	my $pl = $cf::PLAYER{$login} or next;	3781	my $pl = $cf::PLAYER{$login} or next;
3590	$pl->valid or next;	3782	$pl->valid or next;
3591	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3783	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3592	$pl->save;	3784	$pl->save;
3593	}	3785	}
3594	warn "emergency_perl_save: end player save\n";	3786	info "emergency_perl_save: end player save\n";
3595		3787
		3788	cf::write_runtime_sync; # external watchdog should not bark
		3789
3596	warn "emergency_perl_save: begin map save\n";	3790	info "emergency_perl_save: begin map save\n";
3597	for my $path (keys %cf::MAP) {	3791	for my $path (keys %cf::MAP) {
3598	my $map = $cf::MAP{$path} or next;	3792	my $map = $cf::MAP{$path} or next;
3599	$map->valid or next;	3793	$map->valid or next;
3600	$map->save;	3794	$map->save;
3601	}	3795	}
3602	warn "emergency_perl_save: end map save\n";	3796	info "emergency_perl_save: end map save\n";
3603		3797
		3798	cf::write_runtime_sync; # external watchdog should not bark
		3799
3604	warn "emergency_perl_save: begin database checkpoint\n";	3800	info "emergency_perl_save: begin database checkpoint\n";
3605	BDB::db_env_txn_checkpoint $DB_ENV;	3801	BDB::db_env_txn_checkpoint $DB_ENV;
3606	warn "emergency_perl_save: end database checkpoint\n";	3802	info "emergency_perl_save: end database checkpoint\n";
3607		3803
3608	warn "emergency_perl_save: begin write uuid\n";	3804	info "emergency_perl_save: begin write uuid\n";
3609	write_uuid_sync 1;	3805	write_uuid_sync 1;
3610	warn "emergency_perl_save: end write uuid\n";	3806	info "emergency_perl_save: end write uuid\n";
		3807
		3808	cf::write_runtime_sync; # external watchdog should not bark
		3809
		3810	trace "emergency_perl_save: syncing database to disk";
		3811	BDB::db_env_txn_checkpoint $DB_ENV;
		3812
		3813	info "emergency_perl_save: starting sync\n";
		3814	IO::AIO::aio_sync sub {
		3815	info "emergency_perl_save: finished sync\n";
		3816	};
		3817
		3818	cf::write_runtime_sync; # external watchdog should not bark
		3819
		3820	trace "emergency_perl_save: flushing outstanding aio requests";
		3821	while (IO::AIO::nreqs || BDB::nreqs) {
		3822	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
		3823	}
		3824
		3825	cf::write_runtime_sync; # external watchdog should not bark
3611	};	3826	};
3612		3827
3613	warn "emergency_perl_save: starting sync()\n";
3614	IO::AIO::aio_sync sub {
3615	warn "emergency_perl_save: finished sync()\n";
3616	};
3617
3618	warn "emergency_perl_save: leave\n";	3828	info "emergency_perl_save: leave\n";
3619	}	3829	}
3620		3830
3621	sub post_cleanup {	3831	sub post_cleanup {
3622	my ($make_core) = @_;	3832	my ($make_core) = @_;
3623		3833
		3834	IO::AIO::flush;
		3835
3624	warn Carp::longmess "post_cleanup backtrace"	3836	error Carp::longmess "post_cleanup backtrace"
3625	if $make_core;	3837	if $make_core;
3626		3838
3627	my $fh = pidfile;	3839	my $fh = pidfile;
3628	unlink $PIDFILE if <$fh> == $$;	3840	unlink $PIDFILE if <$fh> == $$;
3629	}	3841	}
…		…
3649	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	3861	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3650	for my $name (keys %$leaf_symtab) {	3862	for my $name (keys %$leaf_symtab) {
3651	_gv_clear *{"$pkg$name"};	3863	_gv_clear *{"$pkg$name"};
3652	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	3864	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3653	}	3865	}
3654	warn "cleared package $pkg\n";#d#
3655	}	3866	}
3656		3867
3657	sub do_reload_perl() {	3868	sub do_reload_perl() {
3658	# can/must only be called in main	3869	# can/must only be called in main
3659	if ($Coro::current != $Coro::main) {	3870	unless (in_main) {
3660	warn "can only reload from main coroutine";	3871	error "can only reload from main coroutine";
3661	return;	3872	return;
3662	}	3873	}
3663		3874
3664	return if $RELOAD++;	3875	return if $RELOAD++;
3665		3876
3666	my $t1 = EV::time;	3877	my $t1 = AE::time;
3667		3878
3668	while ($RELOAD) {	3879	while ($RELOAD) {
		3880	cf::get_slot 0.1, -1, "reload_perl";
3669	warn "reloading...";	3881	info "reloading...";
3670		3882
3671	warn "entering sync_job";	3883	trace "entering sync_job";
3672		3884
3673	cf::sync_job {	3885	cf::sync_job {
3674	cf::write_runtime_sync; # external watchdog should not bark
3675	cf::emergency_save;	3886	#cf::emergency_save;
3676	cf::write_runtime_sync; # external watchdog should not bark
3677		3887
3678	warn "syncing database to disk";
3679	BDB::db_env_txn_checkpoint $DB_ENV;
3680
3681	# if anything goes wrong in here, we should simply crash as we already saved
3682
3683	warn "flushing outstanding aio requests";
3684	while (IO::AIO::nreqs || BDB::nreqs) {
3685	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3686	}
3687
3688	warn "cancelling all extension coros";	3888	trace "cancelling all extension coros";
3689	$_->cancel for values %EXT_CORO;	3889	$_->cancel for values %EXT_CORO;
3690	%EXT_CORO = ();	3890	%EXT_CORO = ();
3691		3891
3692	warn "removing commands";	3892	trace "removing commands";
3693	%COMMAND = ();	3893	%COMMAND = ();
3694		3894
3695	warn "removing ext/exti commands";	3895	trace "removing ext/exti commands";
3696	%EXTCMD = ();	3896	%EXTCMD = ();
3697	%EXTICMD = ();	3897	%EXTICMD = ();
3698		3898
3699	warn "unloading/nuking all extensions";	3899	trace "unloading/nuking all extensions";
3700	for my $pkg (@EXTS) {	3900	for my $pkg (@EXTS) {
3701	warn "... unloading $pkg";	3901	trace "... unloading $pkg";
3702		3902
3703	if (my $cb = $pkg->can ("unload")) {	3903	if (my $cb = $pkg->can ("unload")) {
3704	eval {	3904	eval {
3705	$cb->($pkg);	3905	$cb->($pkg);
3706	1	3906	1
3707	} or warn "$pkg unloaded, but with errors: $@";	3907	} or error "$pkg unloaded, but with errors: $@";
3708	}	3908	}
3709		3909
3710	warn "... clearing $pkg";	3910	trace "... clearing $pkg";
3711	clear_package $pkg;	3911	clear_package $pkg;
3712	}	3912	}
3713		3913
3714	warn "unloading all perl modules loaded from $LIBDIR";	3914	trace "unloading all perl modules loaded from $LIBDIR";
3715	while (my ($k, $v) = each %INC) {	3915	while (my ($k, $v) = each %INC) {
3716	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	3916	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3717		3917
3718	warn "... unloading $k";	3918	trace "... unloading $k";
3719	delete $INC{$k};	3919	delete $INC{$k};
3720		3920
3721	$k =~ s/\.pm$//;	3921	$k =~ s/\.pm$//;
3722	$k =~ s/\//::/g;	3922	$k =~ s/\//::/g;
3723		3923
…		…
3726	}	3926	}
3727		3927
3728	clear_package $k;	3928	clear_package $k;
3729	}	3929	}
3730		3930
3731	warn "getting rid of safe::, as good as possible";	3931	trace "getting rid of safe::, as good as possible";
3732	clear_package "safe::$_"	3932	clear_package "safe::$_"
3733	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	3933	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3734		3934
3735	warn "unloading cf.pm \"a bit\"";	3935	trace "unloading cf.pm \"a bit\"";
3736	delete $INC{"cf.pm"};	3936	delete $INC{"cf.pm"};
3737	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	3937	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3738		3938
3739	# don't, removes xs symbols, too,	3939	# don't, removes xs symbols, too,
3740	# and global variables created in xs	3940	# and global variables created in xs
3741	#clear_package __PACKAGE__;	3941	#clear_package __PACKAGE__;
3742		3942
3743	warn "unload completed, starting to reload now";	3943	info "unload completed, starting to reload now";
3744		3944
3745	warn "reloading cf.pm";	3945	trace "reloading cf.pm";
3746	require cf;	3946	require cf;
3747	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3947	cf::_connect_to_perl_1;
3748		3948
3749	warn "loading config and database again";	3949	trace "loading config and database again";
3750	cf::reload_config;	3950	cf::reload_config;
3751		3951
3752	warn "loading extensions";	3952	trace "loading extensions";
3753	cf::load_extensions;	3953	cf::load_extensions;
3754		3954
3755	if ($REATTACH_ON_RELOAD) {	3955	if ($REATTACH_ON_RELOAD) {
3756	warn "reattaching attachments to objects/players";	3956	trace "reattaching attachments to objects/players";
3757	_global_reattach; # objects, sockets	3957	_global_reattach; # objects, sockets
3758	warn "reattaching attachments to maps";	3958	trace "reattaching attachments to maps";
3759	reattach $_ for values %MAP;	3959	reattach $_ for values %MAP;
3760	warn "reattaching attachments to players";	3960	trace "reattaching attachments to players";
3761	reattach $_ for values %PLAYER;	3961	reattach $_ for values %PLAYER;
3762	}	3962	}
3763		3963
3764	warn "running post_init jobs";	3964	trace "running post_init jobs";
3765	(pop @POST_INIT)->(1) while @POST_INIT;	3965	(pop @POST_INIT)->(1) while @POST_INIT;
3766		3966
3767	warn "leaving sync_job";	3967	trace "leaving sync_job";
3768		3968
3769	1	3969	1
3770	} or do {	3970	} or do {
3771	warn $@;	3971	error $@;
3772	cf::cleanup "error while reloading, exiting.";	3972	cf::cleanup "error while reloading, exiting.";
3773	};	3973	};
3774		3974
3775	warn "reloaded";	3975	info "reloaded";
3776	--$RELOAD;	3976	--$RELOAD;
3777	}	3977	}
3778		3978
3779	$t1 = EV::time - $t1;	3979	$t1 = AE::time - $t1;
3780	warn "reload completed in ${t1}s\n";	3980	info "reload completed in ${t1}s\n";
3781	};	3981	};
3782		3982
3783	our $RELOAD_WATCHER; # used only during reload	3983	our $RELOAD_WATCHER; # used only during reload
3784		3984
3785	sub reload_perl() {	3985	sub reload_perl() {
…		…
3787	# coro crashes during coro_state_free->destroy here.	3987	# coro crashes during coro_state_free->destroy here.
3788		3988
3789	$RELOAD_WATCHER ||= cf::async {	3989	$RELOAD_WATCHER ||= cf::async {
3790	Coro::AIO::aio_wait cache_extensions;	3990	Coro::AIO::aio_wait cache_extensions;
3791		3991
3792	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {	3992	$RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3793	do_reload_perl;	3993	do_reload_perl;
3794	undef $RELOAD_WATCHER;	3994	undef $RELOAD_WATCHER;
3795	};	3995	};
3796	};	3996	};
3797	}	3997	}
…		…
3806	reload_perl;	4006	reload_perl;
3807	};	4007	};
3808	}	4008	}
3809	};	4009	};
3810		4010
3811	unshift @INC, $LIBDIR;	4011	#############################################################################
3812		4012
3813	my $bug_warning = 0;	4013	my $bug_warning = 0;
3814		4014
3815	our @WAIT_FOR_TICK;	4015	our @WAIT_FOR_TICK;
3816	our @WAIT_FOR_TICK_BEGIN;	4016	our @WAIT_FOR_TICK_BEGIN;
3817		4017
3818	sub wait_for_tick {	4018	sub wait_for_tick {
3819	return if tick_inhibit || $Coro::current == $Coro::main;	4019	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3820		4020
3821	my $signal = new Coro::Signal;	4021	my $signal = new Coro::Signal;
3822	push @WAIT_FOR_TICK, $signal;	4022	push @WAIT_FOR_TICK, $signal;
3823	$signal->wait;	4023	$signal->wait;
3824	}	4024	}
3825		4025
3826	sub wait_for_tick_begin {	4026	sub wait_for_tick_begin {
3827	return if tick_inhibit || $Coro::current == $Coro::main;	4027	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3828		4028
3829	my $signal = new Coro::Signal;	4029	my $signal = new Coro::Signal;
3830	push @WAIT_FOR_TICK_BEGIN, $signal;	4030	push @WAIT_FOR_TICK_BEGIN, $signal;
3831	$signal->wait;	4031	$signal->wait;
3832	}	4032	}
…		…
3838	return;	4038	return;
3839	}	4039	}
3840		4040
3841	cf::server_tick; # one server iteration	4041	cf::server_tick; # one server iteration
3842		4042
		4043	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
		4044
3843	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4045	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3844	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4046	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3845	Coro::async_pool {	4047	Coro::async_pool {
3846	$Coro::current->{desc} = "runtime saver";	4048	$Coro::current->{desc} = "runtime saver";
3847	write_runtime_sync	4049	write_runtime_sync
3848	or warn "ERROR: unable to write runtime file: $!";	4050	or error "ERROR: unable to write runtime file: $!";
3849	};	4051	};
3850	}	4052	}
3851		4053
3852	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4054	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3853	$sig->send;	4055	$sig->send;
…		…
3861		4063
3862	if (0) {	4064	if (0) {
3863	if ($NEXT_TICK) {	4065	if ($NEXT_TICK) {
3864	my $jitter = $TICK_START - $NEXT_TICK;	4066	my $jitter = $TICK_START - $NEXT_TICK;
3865	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4067	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
3866	warn "jitter $JITTER\n";#d#	4068	debug "jitter $JITTER\n";#d#
3867	}	4069	}
3868	}	4070	}
3869	}	4071	}
3870		4072
3871	{	4073	{
3872	# configure BDB	4074	# configure BDB
3873		4075
3874	BDB::min_parallel 8;	4076	BDB::min_parallel 16;
3875	BDB::max_poll_reqs $TICK * 0.1;	4077	BDB::max_poll_reqs $TICK * 0.1;
3876	$AnyEvent::BDB::WATCHER->priority (1);	4078	$AnyEvent::BDB::WATCHER->priority (1);
3877		4079
3878	unless ($DB_ENV) {	4080	unless ($DB_ENV) {
3879	$DB_ENV = BDB::db_env_create;	4081	$DB_ENV = BDB::db_env_create;
…		…
3960	}	4162	}
3961	}	4163	}
3962		4164
3963	# load additional modules	4165	# load additional modules
3964	require "cf/$_.pm" for @EXTRA_MODULES;	4166	require "cf/$_.pm" for @EXTRA_MODULES;
		4167	cf::_connect_to_perl_2;
3965		4168
3966	END { cf::emergency_save }	4169	END { cf::emergency_save }
3967		4170
3968	1	4171	1
3969		4172

Diff Legend

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