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.473 by root, Fri Jun 26 16:32:10 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
…		…
72		71
73	# make sure c-lzf reinitialises itself	72	# make sure c-lzf reinitialises itself
74	Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";	73	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	74	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
76		75
		76	# strictly for debugging
		77	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
		78
77	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;
78		82
79	our %COMMAND = ();	83	our %COMMAND = ();
80	our %COMMAND_TIME = ();	84	our %COMMAND_TIME = ();
81		85
82	our @EXTS = (); # list of extension package names	86	our @EXTS = (); # list of extension package names
…		…
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 incloader);
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	if ($cf::USE_FSYNC) {	1213	if ($cf::USE_FSYNC) {
…		…
1178	aio_rename "$filename~", $filename;	1235	aio_rename "$filename~", $filename;
1179		1236
1180	$filename =~ s%/[^/]+$%%;	1237	$filename =~ s%/[^/]+$%%;
1181	aio_pathsync $filename if $cf::USE_FSYNC;	1238	aio_pathsync $filename if $cf::USE_FSYNC;
1182	} else {	1239	} else {
1183	warn "unable to save objects: $filename~: $!\n";	1240	error "unable to save objects: $filename~: $!\n";
1184	}	1241	}
1185	} else {	1242	} else {
1186	aio_unlink $filename;	1243	aio_unlink $filename;
1187	aio_unlink "$filename.pst";	1244	aio_unlink "$filename.pst";
1188	}	1245	}
…		…
1212	my $st = eval { Coro::Storable::thaw $av };	1269	my $st = eval { Coro::Storable::thaw $av };
1213	$av = $st->{objs};	1270	$av = $st->{objs};
1214	}	1271	}
1215		1272
1216	utf8::decode (my $decname = $filename);	1273	utf8::decode (my $decname = $filename);
1217	warn sprintf "loading %s (%d,%d)\n",	1274	trace sprintf "loading %s (%d,%d)\n",
1218	$decname, length $data, scalar @{$av || []};	1275	$decname, length $data, scalar @{$av || []}
		1276	if $VERBOSE_IO;
1219		1277
1220	($data, $av)	1278	($data, $av)
1221	}	1279	}
1222		1280
1223	=head2 COMMAND CALLBACKS	1281	=head2 COMMAND CALLBACKS
…		…
1282	}	1340	}
1283		1341
1284	use File::Glob ();	1342	use File::Glob ();
1285		1343
1286	cf::player->attach (	1344	cf::player->attach (
1287	on_command => sub {	1345	on_unknown_command => sub {
1288	my ($pl, $name, $params) = @_;	1346	my ($pl, $name, $params) = @_;
1289		1347
1290	my $cb = $COMMAND{$name}	1348	my $cb = $COMMAND{$name}
1291	or return;	1349	or return;
1292		1350
…		…
1315		1373
1316	$pl->ext_reply ($reply, @reply)	1374	$pl->ext_reply ($reply, @reply)
1317	if $reply;	1375	if $reply;
1318		1376
1319	} else {	1377	} else {
1320	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1378	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1321	}	1379	}
1322		1380
1323	cf::override;	1381	cf::override;
1324	},	1382	},
1325	);	1383	);
…		…
1336		1394
1337	$grp	1395	$grp
1338	}	1396	}
1339		1397
1340	sub load_extensions {	1398	sub load_extensions {
		1399	info "loading extensions...";
		1400
1341	cf::sync_job {	1401	cf::sync_job {
1342	my %todo;	1402	my %todo;
1343		1403
1344	for my $path (<$LIBDIR/*.ext>) {	1404	for my $path (<$LIBDIR/*.ext>) {
1345	next unless -r $path;	1405	next unless -r $path;
…		…
1363		1423
1364	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1424	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1365	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1425	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1366		1426
1367	$ext{source} =	1427	$ext{source} =
1368	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1428	"package $pkg; use common::sense;\n"
1369	. "#line 1 \"$path\"\n{\n"	1429	. "#line 1 \"$path\"\n{\n"
1370	. $source	1430	. $source
1371	. "\n};\n1";	1431	. "\n};\n1";
1372		1432
1373	$todo{$base} = \%ext;	1433	$todo{$base} = \%ext;
1374	}	1434	}
1375		1435
		1436	my $pass = 0;
1376	my %done;	1437	my %done;
1377	while (%todo) {	1438	while (%todo) {
1378	my $progress;	1439	my $progress;
1379		1440
		1441	++$pass;
		1442
		1443	ext:
1380	while (my ($k, $v) = each %todo) {	1444	while (my ($k, $v) = each %todo) {
1381	for (split /,\s*/, $v->{meta}{depends}) {	1445	for (split /,\s*/, $v->{meta}{depends}) {
1382	goto skip	1446	next ext
1383	unless exists $done{$_};	1447	unless exists $done{$_};
1384	}	1448	}
1385		1449
1386	warn "... loading '$k' into '$v->{pkg}'\n";	1450	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1387		1451
1388	unless (eval $v->{source}) {	1452	my $active = eval $v->{source};
		1453
		1454	if (length $@) {
1389	my $msg = $@ ? "$v->{path}: $@\n"	1455	error "$v->{path}: $@\n";
1390	: "$v->{base}: extension inactive.\n";
1391		1456
1392	if (exists $v->{meta}{mandatory}) {
1393	warn $msg;
1394	cf::cleanup "mandatory extension failed to load, exiting.";	1457	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1395	}	1458	if exists $v->{meta}{mandatory};
1396		1459
1397	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;
1398	}	1469	}
1399
1400	$done{$k} = delete $todo{$k};
1401	push @EXTS, $v->{pkg};
1402	$progress = 1;
1403	}	1470	}
1404		1471
1405	skip:	1472	unless ($progress) {
1406	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"	1473	warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1407	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	}
1408	}	1480	}
1409	};	1481	};
1410	}	1482	}
1411		1483
1412	#############################################################################	1484	#############################################################################
…		…
1496	$cf::PLAYER{$login} = $pl	1568	$cf::PLAYER{$login} = $pl
1497	}	1569	}
1498	}	1570	}
1499	}	1571	}
1500		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
1501	sub save($) {	1586	sub save($) {
1502	my ($pl) = @_;	1587	my ($pl) = @_;
1503		1588
1504	return if $pl->{deny_save};	1589	return if $pl->{deny_save};
1505		1590
…		…
1510		1595
1511	aio_mkdir playerdir $pl, 0770;	1596	aio_mkdir playerdir $pl, 0770;
1512	$pl->{last_save} = $cf::RUNTIME;	1597	$pl->{last_save} = $cf::RUNTIME;
1513		1598
1514	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];
1515		1603
1516	$pl->save_pl ($path);	1604	$pl->save_pl ($path);
1517	cf::cede_to_tick;	1605	cf::cede_to_tick;
1518	}	1606	}
1519		1607
…		…
1556	$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
1557		1645
1558	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1646	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1559	$pl->deactivate;	1647	$pl->deactivate;
1560	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;
1561	$pl->ob->check_score;
1562	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1649	$pl->invoke (cf::EVENT_PLAYER_QUIT);
1563	$pl->ns->destroy if $pl->ns;	1650	$pl->ns->destroy if $pl->ns;
1564		1651
1565	my $path = playerdir $pl;	1652	my $path = playerdir $pl;
1566	my $temp = "$path~$cf::RUNTIME~deleting~";	1653	my $temp = "$path~$cf::RUNTIME~deleting~";
…		…
1621	\@logins	1708	\@logins
1622	}	1709	}
1623		1710
1624	=item $player->maps	1711	=item $player->maps
1625		1712
		1713	=item cf::player::maps $login
		1714
1626	Returns an arrayref of map paths that are private for this	1715	Returns an arrayref of map paths that are private for this
1627	player. May block.	1716	player. May block.
1628		1717
1629	=cut	1718	=cut
1630		1719
…		…
1692	=cut	1781	=cut
1693		1782
1694	sub find_by_path($) {	1783	sub find_by_path($) {
1695	my ($path) = @_;	1784	my ($path) = @_;
1696		1785
		1786	$path =~ s/^~[^\/]*//; # skip ~login
		1787
1697	my ($match, $specificity);	1788	my ($match, $specificity);
1698		1789
1699	for my $region (list) {	1790	for my $region (list) {
1700	if ($region->{match} && $path =~ $region->{match}) {	1791	if ($region->{match} && $path =~ $region->{match}) {
1701	($match, $specificity) = ($region, $region->specificity)	1792	($match, $specificity) = ($region, $region->specificity)
…		…
1732	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
1733		1824
1734	# mit "rum" bekleckern, nicht	1825	# mit "rum" bekleckern, nicht
1735	$self->_create_random_map (	1826	$self->_create_random_map (
1736	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},	1827	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1737	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},	1828	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1738	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},	1829	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1739	$rmp->{exit_on_final_map},	1830	$rmp->{exit_on_final_map},
1740	$rmp->{xsize}, $rmp->{ysize},	1831	$rmp->{xsize}, $rmp->{ysize},
1741	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},	1832	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1742	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},	1833	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
…		…
1757		1848
1758	sub register {	1849	sub register {
1759	my (undef, $regex, $prio) = @_;	1850	my (undef, $regex, $prio) = @_;
1760	my $pkg = caller;	1851	my $pkg = caller;
1761		1852
1762	no strict;
1763	push @{"$pkg\::ISA"}, __PACKAGE__;	1853	push @{"$pkg\::ISA"}, __PACKAGE__;
1764		1854
1765	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	1855	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1766	}	1856	}
1767		1857
1768	# also paths starting with '/'	1858	# also paths starting with '/'
1769	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	1859	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1770		1860
1771	sub thawer_merge {	1861	sub thawer_merge {
1772	my ($self, $merge) = @_;	1862	my ($self, $merge) = @_;
1773		1863
1774	# we have to keep some variables in memory intact	1864	# we have to keep some variables in memory intact
…		…
1779	}	1869	}
1780		1870
1781	sub normalise {	1871	sub normalise {
1782	my ($path, $base) = @_;	1872	my ($path, $base) = @_;
1783		1873
1784	$path = "$path"; # make sure its a string	1874	$path = "$path"; # make sure it's a string
1785		1875
1786	$path =~ s/\.map$//;	1876	$path =~ s/\.map$//;
1787		1877
1788	# map plan:	1878	# map plan:
1789	#	1879	#
…		…
1828	$self->init; # pass $1 etc.	1918	$self->init; # pass $1 etc.
1829	return $self;	1919	return $self;
1830	}	1920	}
1831	}	1921	}
1832		1922
1833	Carp::cluck "unable to resolve path '$path' (base '$base').";	1923	Carp::cluck "unable to resolve path '$path' (base '$base')";
1834	()	1924	()
1835	}	1925	}
1836		1926
1837	sub init {	1927	sub init {
1838	my ($self) = @_;	1928	my ($self) = @_;
…		…
1960	}	2050	}
1961		2051
1962	sub find;	2052	sub find;
1963	sub find {	2053	sub find {
1964	my ($path, $origin) = @_;	2054	my ($path, $origin) = @_;
		2055
		2056	cf::cede_to_tick;
1965		2057
1966	$path = normalise $path, $origin && $origin->path;	2058	$path = normalise $path, $origin && $origin->path;
1967		2059
1968	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2060	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1969	my $guard2 = cf::lock_acquire "map_find:$path";	2061	my $guard2 = cf::lock_acquire "map_find:$path";
…		…
1988		2080
1989	$cf::MAP{$path} = $map	2081	$cf::MAP{$path} = $map
1990	}	2082	}
1991	}	2083	}
1992		2084
1993	sub pre_load { }	2085	sub pre_load { }
1994	sub post_load { }	2086	#sub post_load { } # XS
1995		2087
1996	sub load {	2088	sub load {
1997	my ($self) = @_;	2089	my ($self) = @_;
1998		2090
1999	local $self->{deny_reset} = 1; # loading can take a long time	2091	local $self->{deny_reset} = 1; # loading can take a long time
…		…
2056	}	2148	}
2057		2149
2058	$self->post_load;	2150	$self->post_load;
2059	}	2151	}
2060		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
2061	sub customise_for {	2156	sub customise_for {
2062	my ($self, $ob) = @_;	2157	my ($self, $ob) = @_;
2063		2158
2064	return find "~" . $ob->name . "/" . $self->{path}	2159	return find "~" . $ob->name . "/" . $self->{path}
2065	if $self->per_player;	2160	if $self->per_player;
…		…
2081	or next;	2176	or next;
2082	$neigh = find $neigh, $map	2177	$neigh = find $neigh, $map
2083	or next;	2178	or next;
2084	$neigh->load;	2179	$neigh->load;
2085		2180
		2181	# now find the diagonal neighbours
2086	push @neigh,	2182	push @neigh,
2087	[$neigh->tile_path (($_ + 3) % 4), $neigh],	2183	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2088	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2184	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2089	}	2185	}
2090		2186
…		…
2097	}	2193	}
2098		2194
2099	sub find_sync {	2195	sub find_sync {
2100	my ($path, $origin) = @_;	2196	my ($path, $origin) = @_;
2101		2197
2102	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
2103	}	2202	}
2104		2203
2105	sub do_load_sync {	2204	sub do_load_sync {
2106	my ($map) = @_;	2205	my ($map) = @_;
2107		2206
2108	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2207	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2109	if $Coro::current == $Coro::main;	2208	if $Coro::current == $Coro::main;
2110		2209
2111	cf::sync_job { $map->load };	2210	$map->load;
2112	}	2211	}
2113		2212
2114	our %MAP_PREFETCH;	2213	our %MAP_PREFETCH;
2115	our $MAP_PREFETCHER = undef;	2214	our $MAP_PREFETCHER = undef;
2116		2215
…		…
2142	$MAP_PREFETCHER->prio (6);	2241	$MAP_PREFETCHER->prio (6);
2143		2242
2144	()	2243	()
2145	}	2244	}
2146		2245
		2246	# common code, used by both ->save and ->swapout
2147	sub save {	2247	sub _save {
2148	my ($self) = @_;	2248	my ($self) = @_;
2149
2150	my $lock = cf::lock_acquire "map_data:$self->{path}";
2151		2249
2152	$self->{last_save} = $cf::RUNTIME;	2250	$self->{last_save} = $cf::RUNTIME;
2153		2251
2154	return unless $self->dirty;	2252	return unless $self->dirty;
2155		2253
…		…
2175	} else {	2273	} else {
2176	$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);
2177	}	2275	}
2178	}	2276	}
2179		2277
		2278	sub save {
		2279	my ($self) = @_;
		2280
		2281	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2282
		2283	$self->_save;
		2284	}
		2285
2180	sub swap_out {	2286	sub swap_out {
2181	my ($self) = @_;	2287	my ($self) = @_;
2182		2288
2183	# save first because save cedes
2184	$self->save;
2185
2186	my $lock = cf::lock_acquire "map_data:$self->{path}";	2289	my $lock = cf::lock_acquire "map_data:$self->{path}";
2187		2290
2188	return if $self->players;
2189	return if $self->in_memory != cf::MAP_ACTIVE;	2291	return if $self->in_memory != cf::MAP_ACTIVE;
2190	return if $self->{deny_save};	2292	return if $self->{deny_save};
		2293	return if $self->players;
2191		2294
		2295	# first deactivate the map and "unlink" it from the core
		2296	$self->deactivate;
		2297	$_->clear_links_to ($self) for values %cf::MAP;
2192	$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};
2193		2345
2194	$self->deactivate;	2346	$self->deactivate;
2195	$_->clear_links_to ($self) for values %cf::MAP;	2347	$_->clear_links_to ($self) for values %cf::MAP;
2196	$self->clear;	2348	$self->clear;
2197	}
2198
2199	sub reset_at {
2200	my ($self) = @_;
2201
2202	# TODO: safety, remove and allow resettable per-player maps
2203	return 1e99 if $self->{deny_reset};
2204
2205	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2206	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2207
2208	$time + $to
2209	}
2210
2211	sub should_reset {
2212	my ($self) = @_;
2213
2214	$self->reset_at <= $cf::RUNTIME
2215	}
2216
2217	sub reset {
2218	my ($self) = @_;
2219
2220	my $lock = cf::lock_acquire "map_data:$self->{path}";
2221
2222	return if $self->players;
2223
2224	warn "resetting map ", $self->path;
2225
2226	$self->in_memory (cf::MAP_SWAPPED);
2227
2228	# need to save uniques path
2229	unless ($self->{deny_save}) {
2230	my $uniq = $self->uniq_path; utf8::encode $uniq;
2231
2232	$self->_save_objects ($uniq, cf::IO_UNIQUES)
2233	if $uniq;
2234	}
2235
2236	delete $cf::MAP{$self->path};
2237
2238	$self->deactivate;
2239	$_->clear_links_to ($self) for values %cf::MAP;
2240	$self->clear;
2241		2349
2242	$self->unlink_save;	2350	$self->unlink_save;
2243	$self->destroy;	2351	$self->destroy;
2244	}	2352	}
2245		2353
…		…
2253		2361
2254	delete $cf::MAP{$self->path};	2362	delete $cf::MAP{$self->path};
2255		2363
2256	$self->unlink_save;	2364	$self->unlink_save;
2257		2365
2258	bless $self, "cf::map";	2366	bless $self, "cf::map::wrap";
2259	delete $self->{deny_reset};	2367	delete $self->{deny_reset};
2260	$self->{deny_save} = 1;	2368	$self->{deny_save} = 1;
2261	$self->reset_timeout (1);	2369	$self->reset_timeout (1);
2262	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2370	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2263		2371
…		…
2320	: normalise $_	2428	: normalise $_
2321	} @{ aio_readdir $UNIQUEDIR or [] }	2429	} @{ aio_readdir $UNIQUEDIR or [] }
2322	]	2430	]
2323	}	2431	}
2324		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
2325	=back	2465	=back
2326		2466
2327	=head3 cf::object	2467	=head3 cf::object
2328		2468
2329	=cut	2469	=cut
…		…
2461		2601
2462	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}>).
2463		2603
2464	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.
2465	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,
2466	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
2467	map.	2607	map.
2468		2608
2469	Will never block.	2609	Will never block.
2470		2610
2471	=item $player_object->leave_link ($map, $x, $y)	2611	=item $player_object->leave_link ($map, $x, $y)
…		…
2492	sub cf::object::player::enter_link {	2632	sub cf::object::player::enter_link {
2493	my ($self) = @_;	2633	my ($self) = @_;
2494		2634
2495	$self->deactivate_recursive;	2635	$self->deactivate_recursive;
2496		2636
		2637	++$self->{_link_recursion};
		2638
2497	return if UNIVERSAL::isa $self->map, "ext::map_link";	2639	return if UNIVERSAL::isa $self->map, "ext::map_link";
2498		2640
2499	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2641	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2500	if $self->map && $self->map->{path} ne "{link}";	2642	if $self->map && $self->map->{path} ne "{link}";
2501		2643
2502	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2644	$self->enter_map ($LINK_MAP || link_map, 3, 3);
2503	}	2645	}
2504		2646
2505	sub cf::object::player::leave_link {	2647	sub cf::object::player::leave_link {
2506	my ($self, $map, $x, $y) = @_;	2648	my ($self, $map, $x, $y) = @_;
2507		2649
…		…
2524	($x, $y) = (-1, -1)	2666	($x, $y) = (-1, -1)
2525	unless (defined $x) && (defined $y);	2667	unless (defined $x) && (defined $y);
2526		2668
2527	# use -1 or undef as default coordinates, not 0, 0	2669	# use -1 or undef as default coordinates, not 0, 0
2528	($x, $y) = ($map->enter_x, $map->enter_y)	2670	($x, $y) = ($map->enter_x, $map->enter_y)
2529	if $x <=0 && $y <= 0;	2671	if $x <= 0 && $y <= 0;
2530		2672
2531	$map->load;	2673	$map->load;
2532	$map->load_neighbours;	2674	$map->load_neighbours;
2533		2675
2534	return unless $self->contr->active;	2676	return unless $self->contr->active;
2535	$self->flag (cf::FLAG_DEBUG, 0);#d# temp
2536	$self->activate_recursive;
2537		2677
2538	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2678	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2539	$self->enter_map ($map, $x, $y);	2679	if ($self->enter_map ($map, $x, $y)) {
2540	}	2680	# entering was successful
		2681	delete $self->{_link_recursion};
		2682	# only activate afterwards, to support waiting in hooks
		2683	$self->activate_recursive;
		2684	}
2541		2685
		2686	}
		2687
2542	=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)]])
2543		2689
2544	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
2545	her, loading and preparing them map, calling the provided $check callback	2691	her, loading and preparing them map, calling the provided $check callback
2546	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
2547	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
…		…
2554		2700
2555	our $GOTOGEN;	2701	our $GOTOGEN;
2556		2702
2557	sub cf::object::player::goto {	2703	sub cf::object::player::goto {
2558	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	}
2559		2711
2560	# 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
2561	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2713	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2562		2714
2563	$self->enter_link;	2715	$self->enter_link;
…		…
2587	my $map = eval {	2739	my $map = eval {
2588	my $map = defined $path ? cf::map::find $path : undef;	2740	my $map = defined $path ? cf::map::find $path : undef;
2589		2741
2590	if ($map) {	2742	if ($map) {
2591	$map = $map->customise_for ($self);	2743	$map = $map->customise_for ($self);
2592	$map = $check->($map) if $check && $map;	2744	$map = $check->($map, $x, $y, $self) if $check && $map;
2593	} else {	2745	} else {
2594	$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);
2595	}	2747	}
2596		2748
2597	$map	2749	$map
…		…
2605	if ($gen == $self->{_goto_generation}) {	2757	if ($gen == $self->{_goto_generation}) {
2606	delete $self->{_goto_generation};	2758	delete $self->{_goto_generation};
2607	$self->leave_link ($map, $x, $y);	2759	$self->leave_link ($map, $x, $y);
2608	}	2760	}
2609		2761
2610	$done->() if $done;	2762	$done->($self) if $done;
2611	})->prio (1);	2763	})->prio (1);
2612	}	2764	}
2613		2765
2614	=item $player_object->enter_exit ($exit_object)	2766	=item $player_object->enter_exit ($exit_object)
2615		2767
…		…
2708	$self->message ("Something went wrong deep within the deliantra server. "	2860	$self->message ("Something went wrong deep within the deliantra server. "
2709	. "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. "
2710	. "Please report this to the dungeon master!",	2862	. "Please report this to the dungeon master!",
2711	cf::NDI_UNIQUE | cf::NDI_RED);	2863	cf::NDI_UNIQUE | cf::NDI_RED);
2712		2864
2713	warn "ERROR in enter_exit: $@";	2865	error "ERROR in enter_exit: $@";
2714	$self->leave_link;	2866	$self->leave_link;
2715	}	2867	}
2716	})->prio (1);	2868	})->prio (1);
2717	}	2869	}
2718		2870
…		…
2730	sub cf::client::send_drawinfo {	2882	sub cf::client::send_drawinfo {
2731	my ($self, $text, $flags) = @_;	2883	my ($self, $text, $flags) = @_;
2732		2884
2733	utf8::encode $text;	2885	utf8::encode $text;
2734	$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);
2735	}	2912	}
2736		2913
2737	=item $client->send_msg ($channel, $msg, $color, [extra...])	2914	=item $client->send_msg ($channel, $msg, $color, [extra...])
2738		2915
2739	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
…		…
2743		2920
2744	=cut	2921	=cut
2745		2922
2746	# non-persistent channels (usually the info channel)	2923	# non-persistent channels (usually the info channel)
2747	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	},
2748	"c/identify" => {	2931	"c/identify" => {
2749	id => "infobox",	2932	id => "infobox",
2750	title => "Identify",	2933	title => "Identify",
2751	reply => undef,	2934	reply => undef,
2752	tooltip => "Items recently identified",	2935	tooltip => "Items recently identified",
…		…
2754	"c/examine" => {	2937	"c/examine" => {
2755	id => "infobox",	2938	id => "infobox",
2756	title => "Examine",	2939	title => "Examine",
2757	reply => undef,	2940	reply => undef,
2758	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",
2759	},	2948	},
2760	"c/book" => {	2949	"c/book" => {
2761	id => "infobox",	2950	id => "infobox",
2762	title => "Book",	2951	title => "Book",
2763	reply => undef,	2952	reply => undef,
…		…
2879	my $pkt = "msg "	3068	my $pkt = "msg "
2880	. $self->{json_coder}->encode (	3069	. $self->{json_coder}->encode (
2881	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]	3070	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2882	);	3071	);
2883		3072
2884	# try lzf for large packets
2885	$pkt = "lzf " . Compress::LZF::compress $pkt
2886	if 1024 <= length $pkt and $self->{can_lzf};
2887
2888	# split very large packets
2889	if (8192 < length $pkt and $self->{can_lzf}) {
2890	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2891	$pkt = "frag";
2892	}
2893
2894	$self->send_packet ($pkt);	3073	$self->send_big_packet ($pkt);
2895	}	3074	}
2896		3075
2897	=item $client->ext_msg ($type, @msg)	3076	=item $client->ext_msg ($type, @msg)
2898		3077
2899	Sends an ext event to the client.	3078	Sends an ext event to the client.
…		…
2902		3081
2903	sub cf::client::ext_msg($$@) {	3082	sub cf::client::ext_msg($$@) {
2904	my ($self, $type, @msg) = @_;	3083	my ($self, $type, @msg) = @_;
2905		3084
2906	if ($self->extcmd == 2) {	3085	if ($self->extcmd == 2) {
2907	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3086	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2908	} elsif ($self->extcmd == 1) { # TODO: remove	3087	} elsif ($self->extcmd == 1) { # TODO: remove
2909	push @msg, msgtype => "event_$type";	3088	push @msg, msgtype => "event_$type";
2910	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3089	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911	}	3090	}
2912	}	3091	}
2913		3092
2914	=item $client->ext_reply ($msgid, @msg)	3093	=item $client->ext_reply ($msgid, @msg)
2915		3094
…		…
2919		3098
2920	sub cf::client::ext_reply($$@) {	3099	sub cf::client::ext_reply($$@) {
2921	my ($self, $id, @msg) = @_;	3100	my ($self, $id, @msg) = @_;
2922		3101
2923	if ($self->extcmd == 2) {	3102	if ($self->extcmd == 2) {
2924	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));	3103	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2925	} elsif ($self->extcmd == 1) {	3104	} elsif ($self->extcmd == 1) {
2926	#TODO: version 1, remove	3105	#TODO: version 1, remove
2927	unshift @msg, msgtype => "reply", msgid => $id;	3106	unshift @msg, msgtype => "reply", msgid => $id;
2928	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3107	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2929	}	3108	}
2930	}	3109	}
2931		3110
2932	=item $success = $client->query ($flags, "text", \&cb)	3111	=item $success = $client->query ($flags, "text", \&cb)
2933		3112
…		…
3004		3183
3005	$ns->ext_reply ($reply, @reply)	3184	$ns->ext_reply ($reply, @reply)
3006	if $reply;	3185	if $reply;
3007		3186
3008	} else {	3187	} else {
3009	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";
3010	}	3189	}
3011		3190
3012	cf::override;	3191	cf::override;
3013	},	3192	},
3014	);	3193	);
…		…
3034		3213
3035	$coro	3214	$coro
3036	}	3215	}
3037		3216
3038	cf::client->attach (	3217	cf::client->attach (
3039	on_destroy => sub {	3218	on_client_destroy => sub {
3040	my ($ns) = @_;	3219	my ($ns) = @_;
3041		3220
3042	$_->cancel for values %{ (delete $ns->{_coro}) || {} };	3221	$_->cancel for values %{ (delete $ns->{_coro}) || {} };
3043	},	3222	},
3044	);	3223	);
…		…
3060	our $safe_hole = new Safe::Hole;	3239	our $safe_hole = new Safe::Hole;
3061		3240
3062	$SIG{FPE} = 'IGNORE';	3241	$SIG{FPE} = 'IGNORE';
3063		3242
3064	$safe->permit_only (Opcode::opset qw(	3243	$safe->permit_only (Opcode::opset qw(
3065	:base_core :base_mem :base_orig :base_math	3244	:base_core :base_mem :base_orig :base_math :base_loop
3066	grepstart grepwhile mapstart mapwhile	3245	grepstart grepwhile mapstart mapwhile
3067	sort time	3246	sort time
3068	));	3247	));
3069		3248
3070	# here we export the classes and methods available to script code	3249	# here we export the classes and methods available to script code
…		…
3095	decrease split destroy change_exp value msg lore send_msg)],	3274	decrease split destroy change_exp value msg lore send_msg)],
3096	["cf::object::player" => qw(player)],	3275	["cf::object::player" => qw(player)],
3097	["cf::player" => qw(peaceful send_msg)],	3276	["cf::player" => qw(peaceful send_msg)],
3098	["cf::map" => qw(trigger)],	3277	["cf::map" => qw(trigger)],
3099	) {	3278	) {
3100	no strict 'refs';
3101	my ($pkg, @funs) = @$_;	3279	my ($pkg, @funs) = @$_;
3102	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3280	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3103	for @funs;	3281	for @funs;
3104	}	3282	}
3105		3283
…		…
3122	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3300	$qcode =~ s/"/‟/g; # not allowed in #line filenames
3123	$qcode =~ s/\n/\\n/g;	3301	$qcode =~ s/\n/\\n/g;
3124		3302
3125	%vars = (_dummy => 0) unless %vars;	3303	%vars = (_dummy => 0) unless %vars;
3126		3304
		3305	my @res;
3127	local $_;	3306	local $_;
3128	local @safe::cf::_safe_eval_args = values %vars;
3129		3307
3130	my $eval =	3308	my $eval =
3131	"do {\n"	3309	"do {\n"
3132	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"	3310	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3133	. "#line 0 \"{$qcode}\"\n"	3311	. "#line 0 \"{$qcode}\"\n"
3134	. $code	3312	. $code
3135	. "\n}"	3313	. "\n}"
3136	;	3314	;
3137		3315
		3316	if ($CFG{safe_eval}) {
3138	sub_generation_inc;	3317	sub_generation_inc;
		3318	local @safe::cf::_safe_eval_args = values %vars;
3139	my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);	3319	@res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3140	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	}
3141		3325
3142	if ($@) {	3326	if ($@) {
3143	warn "$@";	3327	warn "$@",
3144	warn "while executing safe code '$code'\n";	3328	"while executing safe code '$code'\n",
3145	warn "with arguments " . (join " ", %vars) . "\n";	3329	"with arguments " . (join " ", %vars) . "\n";
3146	}	3330	}
3147		3331
3148	wantarray ? @res : $res[0]	3332	wantarray ? @res : $res[0]
3149	}	3333	}
3150		3334
…		…
3164	=cut	3348	=cut
3165		3349
3166	sub register_script_function {	3350	sub register_script_function {
3167	my ($fun, $cb) = @_;	3351	my ($fun, $cb) = @_;
3168		3352
3169	no strict 'refs';	3353	$fun = "safe::$fun" if $CFG{safe_eval};
3170	*{"safe::$fun"} = $safe_hole->wrap ($cb);	3354	*$fun = $safe_hole->wrap ($cb);
3171	}	3355	}
3172		3356
3173	=back	3357	=back
3174		3358
3175	=cut	3359	=cut
…		…
3184	# for this (global event?)	3368	# for this (global event?)
3185	%ext::player_env::MUSIC_FACE_CACHE = ();	3369	%ext::player_env::MUSIC_FACE_CACHE = ();
3186		3370
3187	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3371	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3188		3372
3189	warn "loading facedata from $path\n";	3373	trace "loading facedata from $path\n";
3190		3374
3191	my $facedata;	3375	my $facedata;
3192	0 < aio_load $path, $facedata	3376	0 < aio_load $path, $facedata
3193	or die "$path: $!";	3377	or die "$path: $!";
3194		3378
…		…
3196		3380
3197	$facedata->{version} == 2	3381	$facedata->{version} == 2
3198	or cf::cleanup "$path: version mismatch, cannot proceed.";	3382	or cf::cleanup "$path: version mismatch, cannot proceed.";
3199		3383
3200	# 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]);
3201	$facedata->{resource}{"res/exp_table"} = {	3386	$facedata->{resource}{"res/exp_table"} = {
3202	type => FT_RSRC,	3387	type => FT_RSRC,
3203	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),
3204	};	3390	};
3205	cf::cede_to_tick;	3391	cf::cede_to_tick;
3206		3392
3207	{	3393	{
3208	my $faces = $facedata->{faceinfo};	3394	my $faces = $facedata->{faceinfo};
…		…
3210	while (my ($face, $info) = each %$faces) {	3396	while (my ($face, $info) = each %$faces) {
3211	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3397	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3212		3398
3213	cf::face::set_visibility $idx, $info->{visibility};	3399	cf::face::set_visibility $idx, $info->{visibility};
3214	cf::face::set_magicmap $idx, $info->{magicmap};	3400	cf::face::set_magicmap $idx, $info->{magicmap};
3215	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};	3401	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3216	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};	3402	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3217		3403
3218	cf::cede_to_tick;	3404	cf::cede_to_tick;
3219	}	3405	}
3220		3406
3221	while (my ($face, $info) = each %$faces) {	3407	while (my ($face, $info) = each %$faces) {
…		…
3226		3412
3227	if (my $smooth = cf::face::find $info->{smooth}) {	3413	if (my $smooth = cf::face::find $info->{smooth}) {
3228	cf::face::set_smooth $idx, $smooth;	3414	cf::face::set_smooth $idx, $smooth;
3229	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3415	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3230	} else {	3416	} else {
3231	warn "smooth face '$info->{smooth}' not found for face '$face'";	3417	error "smooth face '$info->{smooth}' not found for face '$face'";
3232	}	3418	}
3233		3419
3234	cf::cede_to_tick;	3420	cf::cede_to_tick;
3235	}	3421	}
3236	}	3422	}
…		…
3245		3431
3246	cf::anim::invalidate_all; # d'oh	3432	cf::anim::invalidate_all; # d'oh
3247	}	3433	}
3248		3434
3249	{	3435	{
3250	# TODO: for gcfclient pleasure, we should give resources
3251	# that gcfclient doesn't grok a >10000 face index.
3252	my $res = $facedata->{resource};	3436	my $res = $facedata->{resource};
3253		3437
3254	while (my ($name, $info) = each %$res) {	3438	while (my ($name, $info) = each %$res) {
3255	if (defined $info->{type}) {	3439	if (defined $info->{type}) {
3256	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3440	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3257	my $data;
3258		3441
3259	if ($info->{type} & 1) {	3442	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3260	# prepend meta info
3261
3262	my $meta = $enc->encode ({
3263	name => $name,
3264	%{ $info->{meta} || {} },
3265	});
3266
3267	$data = pack "(w/a*)*", $meta, $info->{data};
3268	} else {
3269	$data = $info->{data};
3270	}
3271
3272	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3273	cf::face::set_type $idx, $info->{type};	3443	cf::face::set_type $idx, $info->{type};
3274	} else {	3444	} else {
3275	$RESOURCE{$name} = $info;	3445	$RESOURCE{$name} = $info; # unused
3276	}	3446	}
3277		3447
3278	cf::cede_to_tick;	3448	cf::cede_to_tick;
3279	}	3449	}
3280	}	3450	}
3281		3451
3282	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3452	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3283		3453
3284	1	3454	1
3285	}	3455	}
3286
3287	cf::global->attach (on_resource_update => sub {
3288	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3289	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3290
3291	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3292	my $sound = $soundconf->{compat}[$_]
3293	or next;
3294
3295	my $face = cf::face::find "sound/$sound->[1]";
3296	cf::sound::set $sound->[0] => $face;
3297	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3298	}
3299
3300	while (my ($k, $v) = each %{$soundconf->{event}}) {
3301	my $face = cf::face::find "sound/$v";
3302	cf::sound::set $k => $face;
3303	}
3304	}
3305	});
3306		3456
3307	register_exticmd fx_want => sub {	3457	register_exticmd fx_want => sub {
3308	my ($ns, $want) = @_;	3458	my ($ns, $want) = @_;
3309		3459
3310	while (my ($k, $v) = each %$want) {	3460	while (my ($k, $v) = each %$want) {
…		…
3349	sub reload_treasures {	3499	sub reload_treasures {
3350	load_resource_file "$DATADIR/treasures"	3500	load_resource_file "$DATADIR/treasures"
3351	or die "unable to load treasurelists\n";	3501	or die "unable to load treasurelists\n";
3352	}	3502	}
3353		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
3354	sub reload_resources {	3531	sub reload_resources {
3355	warn "reloading resource files...\n";	3532	trace "reloading resource files...\n";
3356		3533
		3534	reload_exp;
3357	reload_facedata;	3535	reload_facedata;
		3536	reload_sound;
3358	reload_archetypes;	3537	reload_archetypes;
3359	reload_regions;	3538	reload_regions;
3360	reload_treasures;	3539	reload_treasures;
3361		3540
3362	warn "finished reloading resource files\n";	3541	trace "finished reloading resource files\n";
3363	}	3542	}
3364		3543
3365	sub reload_config {	3544	sub reload_config {
		3545	trace "reloading config file...\n";
		3546
3366	open my $fh, "<:utf8", "$CONFDIR/config"	3547	open my $fh, "<:utf8", "$CONFDIR/config"
3367	or return;	3548	or return;
3368		3549
3369	local $/;	3550	local $/;
3370	*CFG = YAML::Load <$fh>;	3551	*CFG = YAML::XS::Load scalar <$fh>;
3371		3552
3372	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3553	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3373		3554
3374	$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};
3375	$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};
3376		3557
3377	if (exists $CFG{mlockall}) {	3558	if (exists $CFG{mlockall}) {
…		…
3379	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3560	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3380	and die "WARNING: m(un)lockall failed: $!\n";	3561	and die "WARNING: m(un)lockall failed: $!\n";
3381	};	3562	};
3382	warn $@ if $@;	3563	warn $@ if $@;
3383	}	3564	}
		3565
		3566	trace "finished reloading resource files\n";
3384	}	3567	}
3385		3568
3386	sub pidfile() {	3569	sub pidfile() {
3387	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3570	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3388	or die "$PIDFILE: $!";	3571	or die "$PIDFILE: $!";
…		…
3400		3583
3401	seek $fh, 0, 0;	3584	seek $fh, 0, 0;
3402	print $fh $$;	3585	print $fh $$;
3403	}	3586	}
3404		3587
		3588	sub main_loop {
		3589	trace "EV::loop starting\n";
		3590	if (1) {
		3591	EV::loop;
		3592	}
		3593	trace "EV::loop returned\n";
		3594	goto &main_loop unless $REALLY_UNLOOP;
		3595	}
		3596
3405	sub main {	3597	sub main {
3406	cf::init_globals; # initialise logging	3598	cf::init_globals; # initialise logging
3407		3599
3408	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3600	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3409	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.";
3410	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3602	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3411	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3603	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3412
3413	cf::init_experience;
3414	cf::init_anim;
3415	cf::init_attackmess;
3416	cf::init_dynamic;
3417		3604
3418	$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
3419		3606
3420	# we must not ever block the main coroutine	3607	# we must not ever block the main coroutine
3421	local $Coro::idle = sub {	3608	local $Coro::idle = sub {
…		…
3427	};	3614	};
3428		3615
3429	evthread_start IO::AIO::poll_fileno;	3616	evthread_start IO::AIO::poll_fileno;
3430		3617
3431	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
3432	reload_resources;	3628	reload_resources;
3433	reload_config;	3629	reload_config;
3434	db_init;	3630	db_init;
3435		3631
3436	cf::load_settings;
3437	cf::load_materials;
3438	cf::init_uuid;	3632	cf::init_uuid;
3439	cf::init_signals;	3633	cf::init_signals;
3440	cf::init_commands;
3441	cf::init_skills;	3634	cf::init_skills;
3442		3635
3443	cf::init_beforeplay;	3636	cf::init_beforeplay;
3444		3637
3445	atomic;	3638	atomic;
…		…
3447	load_extensions;	3640	load_extensions;
3448		3641
3449	utime time, time, $RUNTIMEFILE;	3642	utime time, time, $RUNTIMEFILE;
3450		3643
3451	# no (long-running) fork's whatsoever before this point(!)	3644	# no (long-running) fork's whatsoever before this point(!)
		3645	use POSIX ();
3452	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};
3453		3647
3454	(pop @POST_INIT)->(0) while @POST_INIT;	3648	(pop @POST_INIT)->(0) while @POST_INIT;
3455	};	3649	};
3456		3650
3457	EV::loop;	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
		3659	goto &main_loop;
3458	}	3660	}
3459		3661
3460	#############################################################################	3662	#############################################################################
3461	# initialisation and cleanup	3663	# initialisation and cleanup
3462		3664
3463	# install some emergency cleanup handlers	3665	# install some emergency cleanup handlers
3464	BEGIN {	3666	BEGIN {
3465	our %SIGWATCHER = ();	3667	our %SIGWATCHER = ();
3466	for my $signal (qw(INT HUP TERM)) {	3668	for my $signal (qw(INT HUP TERM)) {
3467	$SIGWATCHER{$signal} = EV::signal $signal, sub {	3669	$SIGWATCHER{$signal} = AE::signal $signal, sub {
3468	cf::cleanup "SIG$signal";	3670	cf::cleanup "SIG$signal";
3469	};	3671	};
3470	}	3672	}
3471	}	3673	}
3472		3674
3473	sub write_runtime_sync {	3675	sub write_runtime_sync {
		3676	my $t0 = AE::time;
		3677
3474	# first touch the runtime file to show we are still running:	3678	# first touch the runtime file to show we are still running:
3475	# the fsync below can take a very very long time.	3679	# the fsync below can take a very very long time.
3476		3680
3477	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;	3681	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3478		3682
3479	my $guard = cf::lock_acquire "write_runtime";	3683	my $guard = cf::lock_acquire "write_runtime";
3480		3684
3481	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644	3685	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3482	or return;	3686	or return;
3483		3687
3484	my $value = $cf::RUNTIME + 90 + 10;	3688	my $value = $cf::RUNTIME + 90 + 10;
3485	# 10 is the runtime save interval, for a monotonic clock	3689	# 10 is the runtime save interval, for a monotonic clock
3486	# 60 allows for the watchdog to kill the server.	3690	# 60 allows for the watchdog to kill the server.
…		…
3499	or return;	3703	or return;
3500		3704
3501	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3705	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3502	and return;	3706	and return;
3503		3707
3504	warn "runtime file written.\n";	3708	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3505		3709
3506	1	3710	1
3507	}	3711	}
3508		3712
3509	our $uuid_lock;	3713	our $uuid_lock;
…		…
3521	or return;	3725	or return;
3522		3726
3523	my $value = uuid_seq uuid_cur;	3727	my $value = uuid_seq uuid_cur;
3524		3728
3525	unless ($value) {	3729	unless ($value) {
3526	warn "cowardly refusing to write zero uuid value!\n";	3730	info "cowardly refusing to write zero uuid value!\n";
3527	return;	3731	return;
3528	}	3732	}
3529		3733
3530	my $value = uuid_str $value + $uuid_skip;	3734	my $value = uuid_str $value + $uuid_skip;
3531	$uuid_skip = 0;	3735	$uuid_skip = 0;
…		…
3541	or return;	3745	or return;
3542		3746
3543	aio_rename "$uuid~", $uuid	3747	aio_rename "$uuid~", $uuid
3544	and return;	3748	and return;
3545		3749
3546	warn "uuid file written ($value).\n";	3750	trace "uuid file written ($value).\n";
3547		3751
3548	1	3752	1
3549		3753
3550	}	3754	}
3551		3755
…		…
3557	}	3761	}
3558		3762
3559	sub emergency_save() {	3763	sub emergency_save() {
3560	my $freeze_guard = cf::freeze_mainloop;	3764	my $freeze_guard = cf::freeze_mainloop;
3561		3765
3562	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;
3563		3772
3564	cf::sync_job {	3773	cf::sync_job {
3565	# this is a trade-off: we want to be very quick here, so	3774	cf::write_runtime_sync; # external watchdog should not bark
3566	# save all maps without fsync, and later call a global sync
3567	# (which in turn might be very very slow)
3568	local $USE_FSYNC = 0;
3569		3775
3570	# use a peculiar iteration method to avoid tripping on perl	3776	# use a peculiar iteration method to avoid tripping on perl
3571	# refcount bugs in for. also avoids problems with players	3777	# refcount bugs in for. also avoids problems with players
3572	# and maps saved/destroyed asynchronously.	3778	# and maps saved/destroyed asynchronously.
3573	warn "emergency_perl_save: begin player save\n";	3779	info "emergency_perl_save: begin player save\n";
3574	for my $login (keys %cf::PLAYER) {	3780	for my $login (keys %cf::PLAYER) {
3575	my $pl = $cf::PLAYER{$login} or next;	3781	my $pl = $cf::PLAYER{$login} or next;
3576	$pl->valid or next;	3782	$pl->valid or next;
3577	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3783	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3578	$pl->save;	3784	$pl->save;
3579	}	3785	}
3580	warn "emergency_perl_save: end player save\n";	3786	info "emergency_perl_save: end player save\n";
3581		3787
		3788	cf::write_runtime_sync; # external watchdog should not bark
		3789
3582	warn "emergency_perl_save: begin map save\n";	3790	info "emergency_perl_save: begin map save\n";
3583	for my $path (keys %cf::MAP) {	3791	for my $path (keys %cf::MAP) {
3584	my $map = $cf::MAP{$path} or next;	3792	my $map = $cf::MAP{$path} or next;
3585	$map->valid or next;	3793	$map->valid or next;
3586	$map->save;	3794	$map->save;
3587	}	3795	}
3588	warn "emergency_perl_save: end map save\n";	3796	info "emergency_perl_save: end map save\n";
3589		3797
		3798	cf::write_runtime_sync; # external watchdog should not bark
		3799
3590	warn "emergency_perl_save: begin database checkpoint\n";	3800	info "emergency_perl_save: begin database checkpoint\n";
3591	BDB::db_env_txn_checkpoint $DB_ENV;	3801	BDB::db_env_txn_checkpoint $DB_ENV;
3592	warn "emergency_perl_save: end database checkpoint\n";	3802	info "emergency_perl_save: end database checkpoint\n";
3593		3803
3594	warn "emergency_perl_save: begin write uuid\n";	3804	info "emergency_perl_save: begin write uuid\n";
3595	write_uuid_sync 1;	3805	write_uuid_sync 1;
3596	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
3597	};	3826	};
3598		3827
3599	warn "emergency_perl_save: starting sync()\n";
3600	IO::AIO::aio_sync sub {
3601	warn "emergency_perl_save: finished sync()\n";
3602	};
3603
3604	warn "emergency_perl_save: leave\n";	3828	info "emergency_perl_save: leave\n";
3605	}	3829	}
3606		3830
3607	sub post_cleanup {	3831	sub post_cleanup {
3608	my ($make_core) = @_;	3832	my ($make_core) = @_;
3609		3833
		3834	IO::AIO::flush;
		3835
3610	warn Carp::longmess "post_cleanup backtrace"	3836	error Carp::longmess "post_cleanup backtrace"
3611	if $make_core;	3837	if $make_core;
3612		3838
3613	my $fh = pidfile;	3839	my $fh = pidfile;
3614	unlink $PIDFILE if <$fh> == $$;	3840	unlink $PIDFILE if <$fh> == $$;
3615	}	3841	}
…		…
3635	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	3861	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3636	for my $name (keys %$leaf_symtab) {	3862	for my $name (keys %$leaf_symtab) {
3637	_gv_clear *{"$pkg$name"};	3863	_gv_clear *{"$pkg$name"};
3638	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	3864	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3639	}	3865	}
3640	warn "cleared package $pkg\n";#d#
3641	}	3866	}
3642		3867
3643	sub do_reload_perl() {	3868	sub do_reload_perl() {
3644	# can/must only be called in main	3869	# can/must only be called in main
3645	if ($Coro::current != $Coro::main) {	3870	unless (in_main) {
3646	warn "can only reload from main coroutine";	3871	error "can only reload from main coroutine";
3647	return;	3872	return;
3648	}	3873	}
3649		3874
3650	return if $RELOAD++;	3875	return if $RELOAD++;
3651		3876
3652	my $t1 = EV::time;	3877	my $t1 = AE::time;
3653		3878
3654	while ($RELOAD) {	3879	while ($RELOAD) {
		3880	cf::get_slot 0.1, -1, "reload_perl";
3655	warn "reloading...";	3881	info "reloading...";
3656		3882
3657	warn "entering sync_job";	3883	trace "entering sync_job";
3658		3884
3659	cf::sync_job {	3885	cf::sync_job {
3660	cf::write_runtime_sync; # external watchdog should not bark
3661	cf::emergency_save;	3886	#cf::emergency_save;
3662	cf::write_runtime_sync; # external watchdog should not bark
3663		3887
3664	warn "syncing database to disk";
3665	BDB::db_env_txn_checkpoint $DB_ENV;
3666
3667	# if anything goes wrong in here, we should simply crash as we already saved
3668
3669	warn "flushing outstanding aio requests";
3670	while (IO::AIO::nreqs || BDB::nreqs) {
3671	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3672	}
3673
3674	warn "cancelling all extension coros";	3888	trace "cancelling all extension coros";
3675	$_->cancel for values %EXT_CORO;	3889	$_->cancel for values %EXT_CORO;
3676	%EXT_CORO = ();	3890	%EXT_CORO = ();
3677		3891
3678	warn "removing commands";	3892	trace "removing commands";
3679	%COMMAND = ();	3893	%COMMAND = ();
3680		3894
3681	warn "removing ext/exti commands";	3895	trace "removing ext/exti commands";
3682	%EXTCMD = ();	3896	%EXTCMD = ();
3683	%EXTICMD = ();	3897	%EXTICMD = ();
3684		3898
3685	warn "unloading/nuking all extensions";	3899	trace "unloading/nuking all extensions";
3686	for my $pkg (@EXTS) {	3900	for my $pkg (@EXTS) {
3687	warn "... unloading $pkg";	3901	trace "... unloading $pkg";
3688		3902
3689	if (my $cb = $pkg->can ("unload")) {	3903	if (my $cb = $pkg->can ("unload")) {
3690	eval {	3904	eval {
3691	$cb->($pkg);	3905	$cb->($pkg);
3692	1	3906	1
3693	} or warn "$pkg unloaded, but with errors: $@";	3907	} or error "$pkg unloaded, but with errors: $@";
3694	}	3908	}
3695		3909
3696	warn "... clearing $pkg";	3910	trace "... clearing $pkg";
3697	clear_package $pkg;	3911	clear_package $pkg;
3698	}	3912	}
3699		3913
3700	warn "unloading all perl modules loaded from $LIBDIR";	3914	trace "unloading all perl modules loaded from $LIBDIR";
3701	while (my ($k, $v) = each %INC) {	3915	while (my ($k, $v) = each %INC) {
3702	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	3916	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3703		3917
3704	warn "... unloading $k";	3918	trace "... unloading $k";
3705	delete $INC{$k};	3919	delete $INC{$k};
3706		3920
3707	$k =~ s/\.pm$//;	3921	$k =~ s/\.pm$//;
3708	$k =~ s/\//::/g;	3922	$k =~ s/\//::/g;
3709		3923
…		…
3712	}	3926	}
3713		3927
3714	clear_package $k;	3928	clear_package $k;
3715	}	3929	}
3716		3930
3717	warn "getting rid of safe::, as good as possible";	3931	trace "getting rid of safe::, as good as possible";
3718	clear_package "safe::$_"	3932	clear_package "safe::$_"
3719	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);
3720		3934
3721	warn "unloading cf.pm \"a bit\"";	3935	trace "unloading cf.pm \"a bit\"";
3722	delete $INC{"cf.pm"};	3936	delete $INC{"cf.pm"};
3723	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	3937	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3724		3938
3725	# don't, removes xs symbols, too,	3939	# don't, removes xs symbols, too,
3726	# and global variables created in xs	3940	# and global variables created in xs
3727	#clear_package __PACKAGE__;	3941	#clear_package __PACKAGE__;
3728		3942
3729	warn "unload completed, starting to reload now";	3943	info "unload completed, starting to reload now";
3730		3944
3731	warn "reloading cf.pm";	3945	trace "reloading cf.pm";
3732	require cf;	3946	require cf;
3733	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3947	cf::_connect_to_perl_1;
3734		3948
3735	warn "loading config and database again";	3949	trace "loading config and database again";
3736	cf::reload_config;	3950	cf::reload_config;
3737		3951
3738	warn "loading extensions";	3952	trace "loading extensions";
3739	cf::load_extensions;	3953	cf::load_extensions;
3740		3954
3741	if ($REATTACH_ON_RELOAD) {	3955	if ($REATTACH_ON_RELOAD) {
3742	warn "reattaching attachments to objects/players";	3956	trace "reattaching attachments to objects/players";
3743	_global_reattach; # objects, sockets	3957	_global_reattach; # objects, sockets
3744	warn "reattaching attachments to maps";	3958	trace "reattaching attachments to maps";
3745	reattach $_ for values %MAP;	3959	reattach $_ for values %MAP;
3746	warn "reattaching attachments to players";	3960	trace "reattaching attachments to players";
3747	reattach $_ for values %PLAYER;	3961	reattach $_ for values %PLAYER;
3748	}	3962	}
3749		3963
3750	warn "running post_init jobs";	3964	trace "running post_init jobs";
3751	(pop @POST_INIT)->(1) while @POST_INIT;	3965	(pop @POST_INIT)->(1) while @POST_INIT;
3752		3966
3753	warn "leaving sync_job";	3967	trace "leaving sync_job";
3754		3968
3755	1	3969	1
3756	} or do {	3970	} or do {
3757	warn $@;	3971	error $@;
3758	cf::cleanup "error while reloading, exiting.";	3972	cf::cleanup "error while reloading, exiting.";
3759	};	3973	};
3760		3974
3761	warn "reloaded";	3975	info "reloaded";
3762	--$RELOAD;	3976	--$RELOAD;
3763	}	3977	}
3764		3978
3765	$t1 = EV::time - $t1;	3979	$t1 = AE::time - $t1;
3766	warn "reload completed in ${t1}s\n";	3980	info "reload completed in ${t1}s\n";
3767	};	3981	};
3768		3982
3769	our $RELOAD_WATCHER; # used only during reload	3983	our $RELOAD_WATCHER; # used only during reload
3770		3984
3771	sub reload_perl() {	3985	sub reload_perl() {
…		…
3773	# coro crashes during coro_state_free->destroy here.	3987	# coro crashes during coro_state_free->destroy here.
3774		3988
3775	$RELOAD_WATCHER ||= cf::async {	3989	$RELOAD_WATCHER ||= cf::async {
3776	Coro::AIO::aio_wait cache_extensions;	3990	Coro::AIO::aio_wait cache_extensions;
3777		3991
3778	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {	3992	$RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3779	do_reload_perl;	3993	do_reload_perl;
3780	undef $RELOAD_WATCHER;	3994	undef $RELOAD_WATCHER;
3781	};	3995	};
3782	};	3996	};
3783	}	3997	}
…		…
3792	reload_perl;	4006	reload_perl;
3793	};	4007	};
3794	}	4008	}
3795	};	4009	};
3796		4010
3797	unshift @INC, $LIBDIR;	4011	#############################################################################
3798		4012
3799	my $bug_warning = 0;	4013	my $bug_warning = 0;
3800		4014
3801	our @WAIT_FOR_TICK;	4015	our @WAIT_FOR_TICK;
3802	our @WAIT_FOR_TICK_BEGIN;	4016	our @WAIT_FOR_TICK_BEGIN;
3803		4017
3804	sub wait_for_tick {	4018	sub wait_for_tick {
3805	return if tick_inhibit || $Coro::current == $Coro::main;	4019	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3806		4020
3807	my $signal = new Coro::Signal;	4021	my $signal = new Coro::Signal;
3808	push @WAIT_FOR_TICK, $signal;	4022	push @WAIT_FOR_TICK, $signal;
3809	$signal->wait;	4023	$signal->wait;
3810	}	4024	}
3811		4025
3812	sub wait_for_tick_begin {	4026	sub wait_for_tick_begin {
3813	return if tick_inhibit || $Coro::current == $Coro::main;	4027	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3814		4028
3815	my $signal = new Coro::Signal;	4029	my $signal = new Coro::Signal;
3816	push @WAIT_FOR_TICK_BEGIN, $signal;	4030	push @WAIT_FOR_TICK_BEGIN, $signal;
3817	$signal->wait;	4031	$signal->wait;
3818	}	4032	}
…		…
3824	return;	4038	return;
3825	}	4039	}
3826		4040
3827	cf::server_tick; # one server iteration	4041	cf::server_tick; # one server iteration
3828		4042
		4043	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
		4044
3829	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4045	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3830	$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.;
3831	Coro::async_pool {	4047	Coro::async_pool {
3832	$Coro::current->{desc} = "runtime saver";	4048	$Coro::current->{desc} = "runtime saver";
3833	write_runtime_sync	4049	write_runtime_sync
3834	or warn "ERROR: unable to write runtime file: $!";	4050	or error "ERROR: unable to write runtime file: $!";
3835	};	4051	};
3836	}	4052	}
3837		4053
3838	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4054	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3839	$sig->send;	4055	$sig->send;
…		…
3847		4063
3848	if (0) {	4064	if (0) {
3849	if ($NEXT_TICK) {	4065	if ($NEXT_TICK) {
3850	my $jitter = $TICK_START - $NEXT_TICK;	4066	my $jitter = $TICK_START - $NEXT_TICK;
3851	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4067	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
3852	warn "jitter $JITTER\n";#d#	4068	debug "jitter $JITTER\n";#d#
3853	}	4069	}
3854	}	4070	}
3855	}	4071	}
3856		4072
3857	{	4073	{
3858	# configure BDB	4074	# configure BDB
3859		4075
3860	BDB::min_parallel 8;	4076	BDB::min_parallel 16;
3861	BDB::max_poll_reqs $TICK * 0.1;	4077	BDB::max_poll_reqs $TICK * 0.1;
3862	$AnyEvent::BDB::WATCHER->priority (1);	4078	$AnyEvent::BDB::WATCHER->priority (1);
3863		4079
3864	unless ($DB_ENV) {	4080	unless ($DB_ENV) {
3865	$DB_ENV = BDB::db_env_create;	4081	$DB_ENV = BDB::db_env_create;
…		…
3946	}	4162	}
3947	}	4163	}
3948		4164
3949	# load additional modules	4165	# load additional modules
3950	require "cf/$_.pm" for @EXTRA_MODULES;	4166	require "cf/$_.pm" for @EXTRA_MODULES;
		4167	cf::_connect_to_perl_2;
3951		4168
3952	END { cf::emergency_save }	4169	END { cf::emergency_save }
3953		4170
3954	1	4171	1
3955		4172

Diff Legend

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