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.474 by root, Thu Jul 16 21:42:56 2009 UTC vs.
Revision 1.546 by root, Thu May 6 22:57:49 2010 UTC

1	#	1	#
2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	#	3	#
4	# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	#	5	#
6	# Deliantra is free software: you can redistribute it and/or modify	6	# Deliantra is free software: you can redistribute it and/or modify it under
7	# it under the terms of the GNU General Public License as published by	7	# the terms of the Affero GNU General Public License as published by the
8	# the Free Software Foundation, either version 3 of the License, or	8	# Free Software Foundation, either version 3 of the License, or (at your
9	# (at your option) any later version.	9	# option) any later version.
10	#	10	#
11	# This program is distributed in the hope that it will be useful,	11	# This program is distributed in the hope that it will be useful,
12	# but WITHOUT ANY WARRANTY; without even the implied warranty of	12	# but WITHOUT ANY WARRANTY; without even the implied warranty of
13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14	# GNU General Public License for more details.	14	# GNU General Public License for more details.
15	#	15	#
16	# You should have received a copy of the GNU General Public License	16	# You should have received a copy of the Affero GNU General Public License
17	# along with this program. If not, see <http://www.gnu.org/licenses/>.	17	# and the GNU General Public License along with this program. If not, see
		18	# <http://www.gnu.org/licenses/>.
18	#	19	#
19	# The authors can be reached via e-mail to <support@deliantra.net>	20	# The authors can be reached via e-mail to <support@deliantra.net>
20	#	21	#
21		22
22	package cf;	23	package cf;
23		24
24	use 5.10.0;	25	use common::sense;
25	use utf8;
26	use strict qw(vars subs);
27		26
28	use Symbol;	27	use Symbol;
29	use List::Util;	28	use List::Util;
30	use Socket;	29	use Socket;
31	use EV;	30	use EV;
32	use Opcode;	31	use Opcode;
33	use Safe;	32	use Safe;
34	use Safe::Hole;	33	use Safe::Hole;
35	use Storable ();	34	use Storable ();
		35	use Carp ();
36		36
37	use Guard ();	37	use Guard ();
38	use Coro ();	38	use Coro ();
39	use Coro::State;	39	use Coro::State;
40	use Coro::Handle;	40	use Coro::Handle;
…		…
51	use Coro::Util ();	51	use Coro::Util ();
52		52
53	use JSON::XS 2.01 ();	53	use JSON::XS 2.01 ();
54	use BDB ();	54	use BDB ();
55	use Data::Dumper;	55	use Data::Dumper;
56	use Digest::MD5;
57	use Fcntl;	56	use Fcntl;
58	use YAML ();	57	use YAML::XS ();
59	use IO::AIO ();	58	use IO::AIO ();
60	use Time::HiRes;	59	use Time::HiRes;
61	use Compress::LZF;	60	use Compress::LZF;
62	use Digest::MD5 ();	61	use Digest::MD5 ();
63		62
…		…
76		75
77	# strictly for debugging	76	# strictly for debugging
78	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };	77	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
79		78
80	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	79	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
		80
		81	our @ORIG_INC;
81		82
82	our %COMMAND = ();	83	our %COMMAND = ();
83	our %COMMAND_TIME = ();	84	our %COMMAND_TIME = ();
84		85
85	our @EXTS = (); # list of extension package names	86	our @EXTS = (); # list of extension package names
…		…
88	our %EXT_CORO = (); # coroutines bound to extensions	89	our %EXT_CORO = (); # coroutines bound to extensions
89	our %EXT_MAP = (); # pluggable maps	90	our %EXT_MAP = (); # pluggable maps
90		91
91	our $RELOAD; # number of reloads so far, non-zero while in reload	92	our $RELOAD; # number of reloads so far, non-zero while in reload
92	our @EVENT;	93	our @EVENT;
		94	our @REFLECT; # set by XS
		95	our %REFLECT; # set by us
93		96
94	our $CONFDIR = confdir;	97	our $CONFDIR = confdir;
95	our $DATADIR = datadir;	98	our $DATADIR = datadir;
96	our $LIBDIR = "$DATADIR/ext";	99	our $LIBDIR = "$DATADIR/ext";
97	our $PODDIR = "$DATADIR/pod";	100	our $PODDIR = "$DATADIR/pod";
…		…
103	our $RANDOMDIR = "$LOCALDIR/random";	106	our $RANDOMDIR = "$LOCALDIR/random";
104	our $BDBDIR = "$LOCALDIR/db";	107	our $BDBDIR = "$LOCALDIR/db";
105	our $PIDFILE = "$LOCALDIR/pid";	108	our $PIDFILE = "$LOCALDIR/pid";
106	our $RUNTIMEFILE = "$LOCALDIR/runtime";	109	our $RUNTIMEFILE = "$LOCALDIR/runtime";
107		110
108	our %RESOURCE;	111	our %RESOURCE; # unused
		112
		113	our $OUTPUT_RATE_MIN = 3000;
		114	our $OUTPUT_RATE_MAX = 1000000;
		115
		116	our $MAX_LINKS = 32; # how many chained exits to follow
		117	our $VERBOSE_IO = 1;
109		118
110	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	119	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
111	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	120	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
112	our $NEXT_TICK;	121	our $NEXT_TICK;
113	our $USE_FSYNC = 1; # use fsync to write maps - default on	122	our $USE_FSYNC = 1; # use fsync to write maps - default on
…		…
115	our $BDB_DEADLOCK_WATCHER;	124	our $BDB_DEADLOCK_WATCHER;
116	our $BDB_CHECKPOINT_WATCHER;	125	our $BDB_CHECKPOINT_WATCHER;
117	our $BDB_TRICKLE_WATCHER;	126	our $BDB_TRICKLE_WATCHER;
118	our $DB_ENV;	127	our $DB_ENV;
119		128
120	our @EXTRA_MODULES = qw(pod mapscript);	129	our @EXTRA_MODULES = qw(pod match mapscript incloader);
121		130
122	our %CFG;	131	our %CFG;
123		132
124	our $UPTIME; $UPTIME ||= time;	133	our $UPTIME; $UPTIME ||= time;
125	our $RUNTIME;	134	our $RUNTIME;
…		…
159		168
160	our $EMERGENCY_POSITION;	169	our $EMERGENCY_POSITION;
161		170
162	sub cf::map::normalise;	171	sub cf::map::normalise;
163		172
		173	sub in_main() {
		174	$Coro::current == $Coro::main
		175	}
		176
		177	#############################################################################
		178
		179	%REFLECT = ();
		180	for (@REFLECT) {
		181	my $reflect = JSON::XS::decode_json $_;
		182	$REFLECT{$reflect->{class}} = $reflect;
		183	}
		184
		185	# this is decidedly evil
		186	$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
		187
164	#############################################################################	188	#############################################################################
165		189
166	=head2 GLOBAL VARIABLES	190	=head2 GLOBAL VARIABLES
167		191
168	=over 4	192	=over 4
…		…
209	from wherever your confdir points to.	233	from wherever your confdir points to.
210		234
211	=item cf::wait_for_tick, cf::wait_for_tick_begin	235	=item cf::wait_for_tick, cf::wait_for_tick_begin
212		236
213	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	237	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
214	returns directly I<after> the tick processing (and consequently, can only wake one process	238	returns directly I<after> the tick processing (and consequently, can only wake one thread
215	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	239	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
216		240
		241	=cut
		242
		243	sub wait_for_tick();
		244	sub wait_for_tick_begin();
		245
217	=item @cf::INVOKE_RESULTS	246	=item @cf::INVOKE_RESULTS
218		247
219	This array contains the results of the last C<invoke ()> call. When	248	This array contains the results of the last C<invoke ()> call. When
220	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of	249	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
221	that call.	250	that call.
222		251
		252	=item %cf::REFLECT
		253
		254	Contains, for each (C++) class name, a hash reference with information
		255	about object members (methods, scalars, arrays and flags) and other
		256	metadata, which is useful for introspection.
		257
223	=back	258	=back
224		259
225	=cut	260	=cut
226		261
227	BEGIN {	262	sub error(@) { LOG llevError, join "", @_ }
228	*CORE::GLOBAL::warn = sub {	263	sub warn (@) { LOG llevWarn , join "", @_ }
		264	sub info (@) { LOG llevInfo , join "", @_ }
		265	sub debug(@) { LOG llevDebug, join "", @_ }
		266	sub trace(@) { LOG llevTrace, join "", @_ }
		267
		268	$Coro::State::WARNHOOK = sub {
229	my $msg = join "", @_;	269	my $msg = join "", @_;
230		270
231	$msg .= "\n"	271	$msg .= "\n"
232	unless $msg =~ /\n$/;	272	unless $msg =~ /\n$/;
233		273
234	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	274	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
235		275
236	LOG llevError, $msg;	276	LOG llevWarn, $msg;
237	};	277	};
238	}
239		278
240	$Coro::State::DIEHOOK = sub {	279	$Coro::State::DIEHOOK = sub {
241	return unless $^S eq 0; # "eq", not "=="	280	return unless $^S eq 0; # "eq", not "=="
242		281
243	if ($Coro::current == $Coro::main) {#d#	282	error Carp::longmess $_[0];
		283
		284	if (in_main) {#d#
244	warn "DIEHOOK called in main context, Coro bug?\n";#d#	285	error "DIEHOOK called in main context, Coro bug?\n";#d#
245	return;#d#	286	return;#d#
246	}#d#	287	}#d#
247		288
248	# kill coroutine otherwise	289	# kill coroutine otherwise
249	warn Carp::longmess $_[0];
250	Coro::terminate	290	Coro::terminate
251	};	291	};
252
253	$SIG{__DIE__} = sub { }; #d#?
254		292
255	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	293	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
256	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	294	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
257	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	295	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
258	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	296	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
…		…
272	)) {	310	)) {
273	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	311	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
274	}	312	}
275		313
276	$EV::DIED = sub {	314	$EV::DIED = sub {
277	warn "error in event callback: @_";	315	Carp::cluck "error in event callback: @_";
278	};	316	};
279		317
280	#############################################################################	318	#############################################################################
281		319
282	=head2 UTILITY FUNCTIONS	320	=head2 UTILITY FUNCTIONS
…		…
379	}	417	}
380		418
381	=item cf::periodic $interval, $cb	419	=item cf::periodic $interval, $cb
382		420
383	Like EV::periodic, but randomly selects a starting point so that the actions	421	Like EV::periodic, but randomly selects a starting point so that the actions
384	get spread over timer.	422	get spread over time.
385		423
386	=cut	424	=cut
387		425
388	sub periodic($$) {	426	sub periodic($$) {
389	my ($interval, $cb) = @_;	427	my ($interval, $cb) = @_;
…		…
406		444
407	=cut	445	=cut
408		446
409	our @SLOT_QUEUE;	447	our @SLOT_QUEUE;
410	our $SLOT_QUEUE;	448	our $SLOT_QUEUE;
		449	our $SLOT_DECAY = 0.9;
411		450
412	$SLOT_QUEUE->cancel if $SLOT_QUEUE;	451	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
413	$SLOT_QUEUE = Coro::async {	452	$SLOT_QUEUE = Coro::async {
414	$Coro::current->desc ("timeslot manager");	453	$Coro::current->desc ("timeslot manager");
415		454
416	my $signal = new Coro::Signal;	455	my $signal = new Coro::Signal;
		456	my $busy;
417		457
418	while () {	458	while () {
419	next_job:	459	next_job:
		460
420	my $avail = cf::till_tick;	461	my $avail = cf::till_tick;
421	if ($avail > 0.01) {	462
422	for (0 .. $#SLOT_QUEUE) {	463	for (0 .. $#SLOT_QUEUE) {
423	if ($SLOT_QUEUE[$_][0] < $avail) {	464	if ($SLOT_QUEUE[$_][0] <= $avail) {
		465	$busy = 0;
424	my $job = splice @SLOT_QUEUE, $_, 1, ();	466	my $job = splice @SLOT_QUEUE, $_, 1, ();
425	$job->[2]->send;	467	$job->[2]->send;
426	Coro::cede;	468	Coro::cede;
427	goto next_job;	469	goto next_job;
428	}	470	} else {
		471	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
429	}	472	}
430	}	473	}
431		474
432	if (@SLOT_QUEUE) {	475	if (@SLOT_QUEUE) {
433	# we do not use wait_for_tick() as it returns immediately when tick is inactive	476	# we do not use wait_for_tick() as it returns immediately when tick is inactive
434	push @cf::WAIT_FOR_TICK, $signal;	477	push @cf::WAIT_FOR_TICK, $signal;
435	$signal->wait;	478	$signal->wait;
436	} else {	479	} else {
		480	$busy = 0;
437	Coro::schedule;	481	Coro::schedule;
438	}	482	}
439	}	483	}
440	};	484	};
441		485
442	sub get_slot($;$$) {	486	sub get_slot($;$$) {
443	return if tick_inhibit || $Coro::current == $Coro::main;	487	return if tick_inhibit || $Coro::current == $Coro::main;
444		488
445	my ($time, $pri, $name) = @_;	489	my ($time, $pri, $name) = @_;
446		490
447	$time = $TICK * .6 if $time > $TICK * .6;	491	$time = clamp $time, 0.01, $TICK * .6;
		492
448	my $sig = new Coro::Signal;	493	my $sig = new Coro::Signal;
449		494
450	push @SLOT_QUEUE, [$time, $pri, $sig, $name];	495	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
451	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;	496	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
452	$SLOT_QUEUE->ready;	497	$SLOT_QUEUE->ready;
…		…
478	=cut	523	=cut
479		524
480	sub sync_job(&) {	525	sub sync_job(&) {
481	my ($job) = @_;	526	my ($job) = @_;
482		527
483	if ($Coro::current == $Coro::main) {	528	if (in_main) {
484	my $time = EV::time;	529	my $time = AE::time;
485		530
486	# this is the main coro, too bad, we have to block	531	# this is the main coro, too bad, we have to block
487	# till the operation succeeds, freezing the server :/	532	# till the operation succeeds, freezing the server :/
488		533
489	LOG llevError, Carp::longmess "sync job";#d#	534	#LOG llevError, Carp::longmess "sync job";#d#
490		535
491	my $freeze_guard = freeze_mainloop;	536	my $freeze_guard = freeze_mainloop;
492		537
493	my $busy = 1;	538	my $busy = 1;
494	my @res;	539	my @res;
495		540
496	(async {	541	(async {
497	$Coro::current->desc ("sync job coro");	542	$Coro::current->desc ("sync job coro");
498	@res = eval { $job->() };	543	@res = eval { $job->() };
499	warn $@ if $@;	544	error $@ if $@;
500	undef $busy;	545	undef $busy;
501	})->prio (Coro::PRIO_MAX);	546	})->prio (Coro::PRIO_MAX);
502		547
503	while ($busy) {	548	while ($busy) {
504	if (Coro::nready) {	549	if (Coro::nready) {
…		…
506	} else {	551	} else {
507	EV::loop EV::LOOP_ONESHOT;	552	EV::loop EV::LOOP_ONESHOT;
508	}	553	}
509	}	554	}
510		555
511	my $time = EV::time - $time;	556	my $time = AE::time - $time;
512		557
513	$TICK_START += $time; # do not account sync jobs to server load	558	$TICK_START += $time; # do not account sync jobs to server load
514		559
515	wantarray ? @res : $res[0]	560	wantarray ? @res : $res[0]
516	} else {	561	} else {
…		…
560	reset_signals;	605	reset_signals;
561	&$cb	606	&$cb
562	}, @args;	607	}, @args;
563		608
564	wantarray ? @res : $res[-1]	609	wantarray ? @res : $res[-1]
		610	}
		611
		612	sub objinfo {
		613	(
		614	"counter value" => cf::object::object_count,
		615	"objects created" => cf::object::create_count,
		616	"objects destroyed" => cf::object::destroy_count,
		617	"freelist size" => cf::object::free_count,
		618	"allocated objects" => cf::object::objects_size,
		619	"active objects" => cf::object::actives_size,
		620	)
565	}	621	}
566		622
567	=item $coin = coin_from_name $name	623	=item $coin = coin_from_name $name
568		624
569	=cut	625	=cut
…		…
606	within each server.	662	within each server.
607		663
608	=cut	664	=cut
609		665
610	sub db_table($) {	666	sub db_table($) {
		667	cf::error "db_get called from main context"
		668	if $Coro::current == $Coro::main;
		669
611	my ($name) = @_;	670	my ($name) = @_;
612	my $db = BDB::db_create $DB_ENV;	671	my $db = BDB::db_create $DB_ENV;
613		672
614	eval {	673	eval {
615	$db->set_flags (BDB::CHKSUM);	674	$db->set_flags (BDB::CHKSUM);
…		…
625	}	684	}
626		685
627	our $DB;	686	our $DB;
628		687
629	sub db_init {	688	sub db_init {
630	cf::sync_job {
631	$DB ||= db_table "db";	689	$DB ||= db_table "db";
632	};
633	}	690	}
634		691
635	sub db_get($$) {	692	sub db_get($$) {
636	my $key = "$_[0]/$_[1]";	693	my $key = "$_[0]/$_[1]";
637		694
638	cf::sync_job {	695	cf::error "db_get called from main context"
		696	if $Coro::current == $Coro::main;
		697
639	BDB::db_get $DB, undef, $key, my $data;	698	BDB::db_get $DB, undef, $key, my $data;
640		699
641	$! ? ()	700	$! ? ()
642	: $data	701	: $data
643	}
644	}	702	}
645		703
646	sub db_put($$$) {	704	sub db_put($$$) {
647	BDB::dbreq_pri 4;	705	BDB::dbreq_pri 4;
648	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	706	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
704		762
705	my $t1 = Time::HiRes::time;	763	my $t1 = Time::HiRes::time;
706	my $data = $process->(\@data);	764	my $data = $process->(\@data);
707	my $t2 = Time::HiRes::time;	765	my $t2 = Time::HiRes::time;
708		766
709	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	767	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
710		768
711	db_put cache => "$id/data", $data;	769	db_put cache => "$id/data", $data;
712	db_put cache => "$id/md5" , $md5;	770	db_put cache => "$id/md5" , $md5;
713	db_put cache => "$id/meta", $meta;	771	db_put cache => "$id/meta", $meta;
714		772
…		…
724		782
725	=cut	783	=cut
726		784
727	sub datalog($@) {	785	sub datalog($@) {
728	my ($type, %kv) = @_;	786	my ($type, %kv) = @_;
729	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	787	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
730	}	788	}
731		789
732	=back	790	=back
733		791
734	=cut	792	=cut
…		…
929		987
930	} elsif (exists $cb_id{$type}) {	988	} elsif (exists $cb_id{$type}) {
931	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	989	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
932		990
933	} elsif (ref $type) {	991	} elsif (ref $type) {
934	warn "attaching objects not supported, ignoring.\n";	992	error "attaching objects not supported, ignoring.\n";
935		993
936	} else {	994	} else {
937	shift @arg;	995	shift @arg;
938	warn "attach argument '$type' not supported, ignoring.\n";	996	error "attach argument '$type' not supported, ignoring.\n";
939	}	997	}
940	}	998	}
941	}	999	}
942		1000
943	sub _object_attach {	1001	sub _object_attach {
…		…
953	_attach $registry, $klass, @attach;	1011	_attach $registry, $klass, @attach;
954	}	1012	}
955		1013
956	$obj->{$name} = \%arg;	1014	$obj->{$name} = \%arg;
957	} else {	1015	} else {
958	warn "object uses attachment '$name' which is not available, postponing.\n";	1016	info "object uses attachment '$name' which is not available, postponing.\n";
959	}	1017	}
960		1018
961	$obj->{_attachment}{$name} = undef;	1019	$obj->{_attachment}{$name} = undef;
962	}	1020	}
963		1021
…		…
1022		1080
1023	for (@$callbacks) {	1081	for (@$callbacks) {
1024	eval { &{$_->[1]} };	1082	eval { &{$_->[1]} };
1025		1083
1026	if ($@) {	1084	if ($@) {
1027	warn "$@";
1028	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1085	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1029	override;	1086	override;
1030	}	1087	}
1031		1088
1032	return 1 if $override;	1089	return 1 if $override;
1033	}	1090	}
…		…
1112	for (@$attach) {	1169	for (@$attach) {
1113	my ($klass, @attach) = @$_;	1170	my ($klass, @attach) = @$_;
1114	_attach $registry, $klass, @attach;	1171	_attach $registry, $klass, @attach;
1115	}	1172	}
1116	} else {	1173	} else {
1117	warn "object uses attachment '$name' that is not available, postponing.\n";	1174	info "object uses attachment '$name' that is not available, postponing.\n";
1118	}	1175	}
1119	}	1176	}
1120	}	1177	}
1121		1178
1122	cf::attachable->attach (	1179	cf::attachable->attach (
…		…
1149	my ($filename, $rdata, $objs) = @_;	1206	my ($filename, $rdata, $objs) = @_;
1150		1207
1151	sync_job {	1208	sync_job {
1152	if (length $$rdata) {	1209	if (length $$rdata) {
1153	utf8::decode (my $decname = $filename);	1210	utf8::decode (my $decname = $filename);
1154	warn sprintf "saving %s (%d,%d)\n",	1211	trace sprintf "saving %s (%d,%d)\n",
1155	$decname, length $$rdata, scalar @$objs;	1212	$decname, length $$rdata, scalar @$objs
		1213	if $VERBOSE_IO;
1156		1214
1157	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1215	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1158	aio_chmod $fh, SAVE_MODE;	1216	aio_chmod $fh, SAVE_MODE;
1159	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1217	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1160	if ($cf::USE_FSYNC) {	1218	if ($cf::USE_FSYNC) {
…		…
1182	aio_rename "$filename~", $filename;	1240	aio_rename "$filename~", $filename;
1183		1241
1184	$filename =~ s%/[^/]+$%%;	1242	$filename =~ s%/[^/]+$%%;
1185	aio_pathsync $filename if $cf::USE_FSYNC;	1243	aio_pathsync $filename if $cf::USE_FSYNC;
1186	} else {	1244	} else {
1187	warn "unable to save objects: $filename~: $!\n";	1245	error "unable to save objects: $filename~: $!\n";
1188	}	1246	}
1189	} else {	1247	} else {
1190	aio_unlink $filename;	1248	aio_unlink $filename;
1191	aio_unlink "$filename.pst";	1249	aio_unlink "$filename.pst";
1192	}	1250	}
…		…
1216	my $st = eval { Coro::Storable::thaw $av };	1274	my $st = eval { Coro::Storable::thaw $av };
1217	$av = $st->{objs};	1275	$av = $st->{objs};
1218	}	1276	}
1219		1277
1220	utf8::decode (my $decname = $filename);	1278	utf8::decode (my $decname = $filename);
1221	warn sprintf "loading %s (%d,%d)\n",	1279	trace sprintf "loading %s (%d,%d)\n",
1222	$decname, length $data, scalar @{$av || []};	1280	$decname, length $data, scalar @{$av || []}
		1281	if $VERBOSE_IO;
1223		1282
1224	($data, $av)	1283	($data, $av)
1225	}	1284	}
1226		1285
1227	=head2 COMMAND CALLBACKS	1286	=head2 COMMAND CALLBACKS
…		…
1286	}	1345	}
1287		1346
1288	use File::Glob ();	1347	use File::Glob ();
1289		1348
1290	cf::player->attach (	1349	cf::player->attach (
1291	on_command => sub {	1350	on_unknown_command => sub {
1292	my ($pl, $name, $params) = @_;	1351	my ($pl, $name, $params) = @_;
1293		1352
1294	my $cb = $COMMAND{$name}	1353	my $cb = $COMMAND{$name}
1295	or return;	1354	or return;
1296		1355
…		…
1319		1378
1320	$pl->ext_reply ($reply, @reply)	1379	$pl->ext_reply ($reply, @reply)
1321	if $reply;	1380	if $reply;
1322		1381
1323	} else {	1382	} else {
1324	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1383	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1325	}	1384	}
1326		1385
1327	cf::override;	1386	cf::override;
1328	},	1387	},
1329	);	1388	);
…		…
1340		1399
1341	$grp	1400	$grp
1342	}	1401	}
1343		1402
1344	sub load_extensions {	1403	sub load_extensions {
		1404	info "loading extensions...";
		1405
1345	cf::sync_job {	1406	cf::sync_job {
1346	my %todo;	1407	my %todo;
1347		1408
1348	for my $path (<$LIBDIR/*.ext>) {	1409	for my $path (<$LIBDIR/*.ext>) {
1349	next unless -r $path;	1410	next unless -r $path;
…		…
1367		1428
1368	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1429	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1369	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1430	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1370		1431
1371	$ext{source} =	1432	$ext{source} =
1372	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1433	"package $pkg; use common::sense;\n"
1373	. "#line 1 \"$path\"\n{\n"	1434	. "#line 1 \"$path\"\n{\n"
1374	. $source	1435	. $source
1375	. "\n};\n1";	1436	. "\n};\n1";
1376		1437
1377	$todo{$base} = \%ext;	1438	$todo{$base} = \%ext;
1378	}	1439	}
1379		1440
		1441	my $pass = 0;
1380	my %done;	1442	my %done;
1381	while (%todo) {	1443	while (%todo) {
1382	my $progress;	1444	my $progress;
1383		1445
		1446	++$pass;
		1447
		1448	ext:
1384	while (my ($k, $v) = each %todo) {	1449	while (my ($k, $v) = each %todo) {
1385	for (split /,\s*/, $v->{meta}{depends}) {	1450	for (split /,\s*/, $v->{meta}{depends}) {
1386	goto skip	1451	next ext
1387	unless exists $done{$_};	1452	unless exists $done{$_};
1388	}	1453	}
1389		1454
1390	warn "... loading '$k' into '$v->{pkg}'\n";	1455	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1391		1456
1392	unless (eval $v->{source}) {	1457	my $active = eval $v->{source};
		1458
		1459	if (length $@) {
1393	my $msg = $@ ? "$v->{path}: $@\n"	1460	error "$v->{path}: $@\n";
1394	: "$v->{base}: extension inactive.\n";
1395		1461
1396	if (exists $v->{meta}{mandatory}) {
1397	warn $msg;
1398	cf::cleanup "mandatory extension failed to load, exiting.";	1462	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1399	}	1463	if exists $v->{meta}{mandatory};
1400		1464
1401	warn $msg;	1465	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
		1466	delete $todo{$k};
		1467	} else {
		1468	$done{$k} = delete $todo{$k};
		1469	push @EXTS, $v->{pkg};
		1470	$progress = 1;
		1471
		1472	info "$v->{base}: extension inactive.\n"
		1473	unless $active;
1402	}	1474	}
1403
1404	$done{$k} = delete $todo{$k};
1405	push @EXTS, $v->{pkg};
1406	$progress = 1;
1407	}	1475	}
1408		1476
1409	skip:	1477	unless ($progress) {
1410	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"	1478	warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1411	unless $progress;	1479
		1480	while (my ($k, $v) = each %todo) {
		1481	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
		1482	if exists $v->{meta}{mandatory};
		1483	}
		1484	}
1412	}	1485	}
1413	};	1486	};
1414	}	1487	}
1415		1488
1416	#############################################################################	1489	#############################################################################
…		…
1500	$cf::PLAYER{$login} = $pl	1573	$cf::PLAYER{$login} = $pl
1501	}	1574	}
1502	}	1575	}
1503	}	1576	}
1504		1577
		1578	cf::player->attach (
		1579	on_load => sub {
		1580	my ($pl, $path) = @_;
		1581
		1582	# restore slots saved in save, below
		1583	my $slots = delete $pl->{_slots};
		1584
		1585	$pl->ob->current_weapon ($slots->[0]);
		1586	$pl->combat_ob ($slots->[1]);
		1587	$pl->ranged_ob ($slots->[2]);
		1588	},
		1589	);
		1590
1505	sub save($) {	1591	sub save($) {
1506	my ($pl) = @_;	1592	my ($pl) = @_;
1507		1593
1508	return if $pl->{deny_save};	1594	return if $pl->{deny_save};
1509		1595
…		…
1514		1600
1515	aio_mkdir playerdir $pl, 0770;	1601	aio_mkdir playerdir $pl, 0770;
1516	$pl->{last_save} = $cf::RUNTIME;	1602	$pl->{last_save} = $cf::RUNTIME;
1517		1603
1518	cf::get_slot 0.01;	1604	cf::get_slot 0.01;
		1605
		1606	# save slots, to be restored later
		1607	local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1519		1608
1520	$pl->save_pl ($path);	1609	$pl->save_pl ($path);
1521	cf::cede_to_tick;	1610	cf::cede_to_tick;
1522	}	1611	}
1523		1612
…		…
1560	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1649	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1561		1650
1562	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1651	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1563	$pl->deactivate;	1652	$pl->deactivate;
1564	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1653	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1565	$pl->ob->check_score;
1566	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1654	$pl->invoke (cf::EVENT_PLAYER_QUIT);
1567	$pl->ns->destroy if $pl->ns;	1655	$pl->ns->destroy if $pl->ns;
1568		1656
1569	my $path = playerdir $pl;	1657	my $path = playerdir $pl;
1570	my $temp = "$path~$cf::RUNTIME~deleting~";	1658	my $temp = "$path~$cf::RUNTIME~deleting~";
…		…
1625	\@logins	1713	\@logins
1626	}	1714	}
1627		1715
1628	=item $player->maps	1716	=item $player->maps
1629		1717
		1718	=item cf::player::maps $login
		1719
1630	Returns an arrayref of map paths that are private for this	1720	Returns an arrayref of map paths that are private for this
1631	player. May block.	1721	player. May block.
1632		1722
1633	=cut	1723	=cut
1634		1724
…		…
1696	=cut	1786	=cut
1697		1787
1698	sub find_by_path($) {	1788	sub find_by_path($) {
1699	my ($path) = @_;	1789	my ($path) = @_;
1700		1790
		1791	$path =~ s/^~[^\/]*//; # skip ~login
		1792
1701	my ($match, $specificity);	1793	my ($match, $specificity);
1702		1794
1703	for my $region (list) {	1795	for my $region (list) {
1704	if ($region->{match} && $path =~ $region->{match}) {	1796	if ($region->{match} && $path =~ $region->{match}) {
1705	($match, $specificity) = ($region, $region->specificity)	1797	($match, $specificity) = ($region, $region->specificity)
…		…
1736	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	1828	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1737		1829
1738	# mit "rum" bekleckern, nicht	1830	# mit "rum" bekleckern, nicht
1739	$self->_create_random_map (	1831	$self->_create_random_map (
1740	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},	1832	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1741	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},	1833	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1742	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},	1834	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1743	$rmp->{exit_on_final_map},	1835	$rmp->{exit_on_final_map},
1744	$rmp->{xsize}, $rmp->{ysize},	1836	$rmp->{xsize}, $rmp->{ysize},
1745	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},	1837	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1746	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},	1838	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
…		…
1761		1853
1762	sub register {	1854	sub register {
1763	my (undef, $regex, $prio) = @_;	1855	my (undef, $regex, $prio) = @_;
1764	my $pkg = caller;	1856	my $pkg = caller;
1765		1857
1766	no strict;
1767	push @{"$pkg\::ISA"}, __PACKAGE__;	1858	push @{"$pkg\::ISA"}, __PACKAGE__;
1768		1859
1769	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	1860	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1770	}	1861	}
1771		1862
1772	# also paths starting with '/'	1863	# also paths starting with '/'
1773	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	1864	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1774		1865
1775	sub thawer_merge {	1866	sub thawer_merge {
1776	my ($self, $merge) = @_;	1867	my ($self, $merge) = @_;
1777		1868
1778	# we have to keep some variables in memory intact	1869	# we have to keep some variables in memory intact
…		…
1783	}	1874	}
1784		1875
1785	sub normalise {	1876	sub normalise {
1786	my ($path, $base) = @_;	1877	my ($path, $base) = @_;
1787		1878
1788	$path = "$path"; # make sure its a string	1879	$path = "$path"; # make sure it's a string
1789		1880
1790	$path =~ s/\.map$//;	1881	$path =~ s/\.map$//;
1791		1882
1792	# map plan:	1883	# map plan:
1793	#	1884	#
…		…
1832	$self->init; # pass $1 etc.	1923	$self->init; # pass $1 etc.
1833	return $self;	1924	return $self;
1834	}	1925	}
1835	}	1926	}
1836		1927
1837	Carp::cluck "unable to resolve path '$path' (base '$base').";	1928	Carp::cluck "unable to resolve path '$path' (base '$base')";
1838	()	1929	()
1839	}	1930	}
1840		1931
1841	sub init {	1932	sub init {
1842	my ($self) = @_;	1933	my ($self) = @_;
…		…
1964	}	2055	}
1965		2056
1966	sub find;	2057	sub find;
1967	sub find {	2058	sub find {
1968	my ($path, $origin) = @_;	2059	my ($path, $origin) = @_;
		2060
		2061	cf::cede_to_tick;
1969		2062
1970	$path = normalise $path, $origin && $origin->path;	2063	$path = normalise $path, $origin && $origin->path;
1971		2064
1972	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2065	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973	my $guard2 = cf::lock_acquire "map_find:$path";	2066	my $guard2 = cf::lock_acquire "map_find:$path";
…		…
1992		2085
1993	$cf::MAP{$path} = $map	2086	$cf::MAP{$path} = $map
1994	}	2087	}
1995	}	2088	}
1996		2089
1997	sub pre_load { }	2090	sub pre_load { }
1998	sub post_load { }	2091	#sub post_load { } # XS
1999		2092
2000	sub load {	2093	sub load {
2001	my ($self) = @_;	2094	my ($self) = @_;
2002		2095
2003	local $self->{deny_reset} = 1; # loading can take a long time	2096	local $self->{deny_reset} = 1; # loading can take a long time
…		…
2060	}	2153	}
2061		2154
2062	$self->post_load;	2155	$self->post_load;
2063	}	2156	}
2064		2157
		2158	# customize the map for a given player, i.e.
		2159	# return the _real_ map. used by e.g. per-player
		2160	# maps to change the path to ~playername/mappath
2065	sub customise_for {	2161	sub customise_for {
2066	my ($self, $ob) = @_;	2162	my ($self, $ob) = @_;
2067		2163
2068	return find "~" . $ob->name . "/" . $self->{path}	2164	return find "~" . $ob->name . "/" . $self->{path}
2069	if $self->per_player;	2165	if $self->per_player;
…		…
2085	or next;	2181	or next;
2086	$neigh = find $neigh, $map	2182	$neigh = find $neigh, $map
2087	or next;	2183	or next;
2088	$neigh->load;	2184	$neigh->load;
2089		2185
		2186	# now find the diagonal neighbours
2090	push @neigh,	2187	push @neigh,
2091	[$neigh->tile_path (($_ + 3) % 4), $neigh],	2188	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2092	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2189	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2093	}	2190	}
2094		2191
…		…
2101	}	2198	}
2102		2199
2103	sub find_sync {	2200	sub find_sync {
2104	my ($path, $origin) = @_;	2201	my ($path, $origin) = @_;
2105		2202
2106	cf::sync_job { find $path, $origin }	2203	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
		2204	if $Coro::current == $Coro::main;
		2205
		2206	find $path, $origin
2107	}	2207	}
2108		2208
2109	sub do_load_sync {	2209	sub do_load_sync {
2110	my ($map) = @_;	2210	my ($map) = @_;
2111		2211
2112	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2212	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2113	if $Coro::current == $Coro::main;	2213	if $Coro::current == $Coro::main;
2114		2214
2115	cf::sync_job { $map->load };	2215	$map->load;
2116	}	2216	}
2117		2217
2118	our %MAP_PREFETCH;	2218	our %MAP_PREFETCH;
2119	our $MAP_PREFETCHER = undef;	2219	our $MAP_PREFETCHER = undef;
2120		2220
…		…
2146	$MAP_PREFETCHER->prio (6);	2246	$MAP_PREFETCHER->prio (6);
2147		2247
2148	()	2248	()
2149	}	2249	}
2150		2250
		2251	# common code, used by both ->save and ->swapout
2151	sub save {	2252	sub _save {
2152	my ($self) = @_;	2253	my ($self) = @_;
2153
2154	my $lock = cf::lock_acquire "map_data:$self->{path}";
2155		2254
2156	$self->{last_save} = $cf::RUNTIME;	2255	$self->{last_save} = $cf::RUNTIME;
2157		2256
2158	return unless $self->dirty;	2257	return unless $self->dirty;
2159		2258
…		…
2179	} else {	2278	} else {
2180	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);	2279	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2181	}	2280	}
2182	}	2281	}
2183		2282
		2283	sub save {
		2284	my ($self) = @_;
		2285
		2286	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2287
		2288	$self->_save;
		2289	}
		2290
2184	sub swap_out {	2291	sub swap_out {
2185	my ($self) = @_;	2292	my ($self) = @_;
2186		2293
2187	# save first because save cedes
2188	$self->save;
2189
2190	my $lock = cf::lock_acquire "map_data:$self->{path}";	2294	my $lock = cf::lock_acquire "map_data:$self->{path}";
2191		2295
2192	return if $self->players;
2193	return if $self->in_memory != cf::MAP_ACTIVE;	2296	return if $self->in_memory != cf::MAP_ACTIVE;
2194	return if $self->{deny_save};	2297	return if $self->{deny_save};
		2298	return if $self->players;
2195		2299
		2300	# first deactivate the map and "unlink" it from the core
		2301	$self->deactivate;
		2302	$_->clear_links_to ($self) for values %cf::MAP;
2196	$self->in_memory (cf::MAP_SWAPPED);	2303	$self->in_memory (cf::MAP_SWAPPED);
		2304
		2305	# then atomically save
		2306	$self->_save;
		2307
		2308	# then free the map
		2309	$self->clear;
		2310	}
		2311
		2312	sub reset_at {
		2313	my ($self) = @_;
		2314
		2315	# TODO: safety, remove and allow resettable per-player maps
		2316	return 1e99 if $self->{deny_reset};
		2317
		2318	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
		2319	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
		2320
		2321	$time + $to
		2322	}
		2323
		2324	sub should_reset {
		2325	my ($self) = @_;
		2326
		2327	$self->reset_at <= $cf::RUNTIME
		2328	}
		2329
		2330	sub reset {
		2331	my ($self) = @_;
		2332
		2333	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2334
		2335	return if $self->players;
		2336
		2337	cf::trace "resetting map ", $self->path, "\n";
		2338
		2339	$self->in_memory (cf::MAP_SWAPPED);
		2340
		2341	# need to save uniques path
		2342	unless ($self->{deny_save}) {
		2343	my $uniq = $self->uniq_path; utf8::encode $uniq;
		2344
		2345	$self->_save_objects ($uniq, cf::IO_UNIQUES)
		2346	if $uniq;
		2347	}
		2348
		2349	delete $cf::MAP{$self->path};
2197		2350
2198	$self->deactivate;	2351	$self->deactivate;
2199	$_->clear_links_to ($self) for values %cf::MAP;	2352	$_->clear_links_to ($self) for values %cf::MAP;
2200	$self->clear;	2353	$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		2354
2246	$self->unlink_save;	2355	$self->unlink_save;
2247	$self->destroy;	2356	$self->destroy;
2248	}	2357	}
2249		2358
…		…
2257		2366
2258	delete $cf::MAP{$self->path};	2367	delete $cf::MAP{$self->path};
2259		2368
2260	$self->unlink_save;	2369	$self->unlink_save;
2261		2370
2262	bless $self, "cf::map";	2371	bless $self, "cf::map::wrap";
2263	delete $self->{deny_reset};	2372	delete $self->{deny_reset};
2264	$self->{deny_save} = 1;	2373	$self->{deny_save} = 1;
2265	$self->reset_timeout (1);	2374	$self->reset_timeout (1);
2266	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2375	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2267		2376
…		…
2324	: normalise $_	2433	: normalise $_
2325	} @{ aio_readdir $UNIQUEDIR or [] }	2434	} @{ aio_readdir $UNIQUEDIR or [] }
2326	]	2435	]
2327	}	2436	}
2328		2437
		2438	=item cf::map::static_maps
		2439
		2440	Returns an arrayref if paths of all static maps (all preinstalled F<.map>
		2441	file in the shared directory excluding F</styles> and F</editor>). May
		2442	block.
		2443
		2444	=cut
		2445
		2446	sub static_maps() {
		2447	my @dirs = "";
		2448	my @maps;
		2449
		2450	while (@dirs) {
		2451	my $dir = shift @dirs;
		2452
		2453	next if $dir eq "/styles" || $dir eq "/editor";
		2454
		2455	my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
		2456	or return;
		2457
		2458	for (@$files) {
		2459	s/\.map$// or next;
		2460	utf8::decode $_;
		2461	push @maps, "$dir/$_";
		2462	}
		2463
		2464	push @dirs, map "$dir/$_", @$dirs;
		2465	}
		2466
		2467	\@maps
		2468	}
		2469
2329	=back	2470	=back
2330		2471
2331	=head3 cf::object	2472	=head3 cf::object
2332		2473
2333	=cut	2474	=cut
…		…
2465		2606
2466	Freezes the player and moves him/her to a special map (C<{link}>).	2607	Freezes the player and moves him/her to a special map (C<{link}>).
2467		2608
2468	The player should be reasonably safe there for short amounts of time (e.g.	2609	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,	2610	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	2611	though, as the player cannot control the character while it is on the link
2471	map.	2612	map.
2472		2613
2473	Will never block.	2614	Will never block.
2474		2615
2475	=item $player_object->leave_link ($map, $x, $y)	2616	=item $player_object->leave_link ($map, $x, $y)
…		…
2496	sub cf::object::player::enter_link {	2637	sub cf::object::player::enter_link {
2497	my ($self) = @_;	2638	my ($self) = @_;
2498		2639
2499	$self->deactivate_recursive;	2640	$self->deactivate_recursive;
2500		2641
		2642	++$self->{_link_recursion};
		2643
2501	return if UNIVERSAL::isa $self->map, "ext::map_link";	2644	return if UNIVERSAL::isa $self->map, "ext::map_link";
2502		2645
2503	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2646	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2504	if $self->map && $self->map->{path} ne "{link}";	2647	if $self->map && $self->map->{path} ne "{link}";
2505		2648
2506	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2649	$self->enter_map ($LINK_MAP || link_map, 3, 3);
2507	}	2650	}
2508		2651
2509	sub cf::object::player::leave_link {	2652	sub cf::object::player::leave_link {
2510	my ($self, $map, $x, $y) = @_;	2653	my ($self, $map, $x, $y) = @_;
2511		2654
…		…
2528	($x, $y) = (-1, -1)	2671	($x, $y) = (-1, -1)
2529	unless (defined $x) && (defined $y);	2672	unless (defined $x) && (defined $y);
2530		2673
2531	# use -1 or undef as default coordinates, not 0, 0	2674	# use -1 or undef as default coordinates, not 0, 0
2532	($x, $y) = ($map->enter_x, $map->enter_y)	2675	($x, $y) = ($map->enter_x, $map->enter_y)
2533	if $x <=0 && $y <= 0;	2676	if $x <= 0 && $y <= 0;
2534		2677
2535	$map->load;	2678	$map->load;
2536	$map->load_neighbours;	2679	$map->load_neighbours;
2537		2680
2538	return unless $self->contr->active;	2681	return unless $self->contr->active;
2539	$self->flag (cf::FLAG_DEBUG, 0);#d# temp
2540	$self->activate_recursive;
2541		2682
2542	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2683	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2543	$self->enter_map ($map, $x, $y);	2684	if ($self->enter_map ($map, $x, $y)) {
2544	}	2685	# entering was successful
		2686	delete $self->{_link_recursion};
		2687	# only activate afterwards, to support waiting in hooks
		2688	$self->activate_recursive;
		2689	}
2545		2690
		2691	}
		2692
2546	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2693	=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2547		2694
2548	Moves the player to the given map-path and coordinates by first freezing	2695	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	2696	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	2697	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	2698	the new (success) or old (failed) map position. In either case, $done will
…		…
2558		2705
2559	our $GOTOGEN;	2706	our $GOTOGEN;
2560		2707
2561	sub cf::object::player::goto {	2708	sub cf::object::player::goto {
2562	my ($self, $path, $x, $y, $check, $done) = @_;	2709	my ($self, $path, $x, $y, $check, $done) = @_;
		2710
		2711	if ($self->{_link_recursion} >= $MAX_LINKS) {
		2712	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
		2713	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
		2714	($path, $x, $y) = @$EMERGENCY_POSITION;
		2715	}
2563		2716
2564	# do generation counting so two concurrent goto's will be executed in-order	2717	# do generation counting so two concurrent goto's will be executed in-order
2565	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2718	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2566		2719
2567	$self->enter_link;	2720	$self->enter_link;
…		…
2591	my $map = eval {	2744	my $map = eval {
2592	my $map = defined $path ? cf::map::find $path : undef;	2745	my $map = defined $path ? cf::map::find $path : undef;
2593		2746
2594	if ($map) {	2747	if ($map) {
2595	$map = $map->customise_for ($self);	2748	$map = $map->customise_for ($self);
2596	$map = $check->($map) if $check && $map;	2749	$map = $check->($map, $x, $y, $self) if $check && $map;
2597	} else {	2750	} else {
2598	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);	2751	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2599	}	2752	}
2600		2753
2601	$map	2754	$map
…		…
2609	if ($gen == $self->{_goto_generation}) {	2762	if ($gen == $self->{_goto_generation}) {
2610	delete $self->{_goto_generation};	2763	delete $self->{_goto_generation};
2611	$self->leave_link ($map, $x, $y);	2764	$self->leave_link ($map, $x, $y);
2612	}	2765	}
2613		2766
2614	$done->() if $done;	2767	$done->($self) if $done;
2615	})->prio (1);	2768	})->prio (1);
2616	}	2769	}
2617		2770
2618	=item $player_object->enter_exit ($exit_object)	2771	=item $player_object->enter_exit ($exit_object)
2619		2772
…		…
2712	$self->message ("Something went wrong deep within the deliantra server. "	2865	$self->message ("Something went wrong deep within the deliantra server. "
2713	. "I'll try to bring you back to the map you were before. "	2866	. "I'll try to bring you back to the map you were before. "
2714	. "Please report this to the dungeon master!",	2867	. "Please report this to the dungeon master!",
2715	cf::NDI_UNIQUE | cf::NDI_RED);	2868	cf::NDI_UNIQUE | cf::NDI_RED);
2716		2869
2717	warn "ERROR in enter_exit: $@";	2870	error "ERROR in enter_exit: $@";
2718	$self->leave_link;	2871	$self->leave_link;
2719	}	2872	}
2720	})->prio (1);	2873	})->prio (1);
2721	}	2874	}
2722		2875
…		…
2734	sub cf::client::send_drawinfo {	2887	sub cf::client::send_drawinfo {
2735	my ($self, $text, $flags) = @_;	2888	my ($self, $text, $flags) = @_;
2736		2889
2737	utf8::encode $text;	2890	utf8::encode $text;
2738	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2891	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
		2892	}
		2893
		2894	=item $client->send_big_packet ($pkt)
		2895
		2896	Like C<send_packet>, but tries to compress large packets, and fragments
		2897	them as required.
		2898
		2899	=cut
		2900
		2901	our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
		2902
		2903	sub cf::client::send_big_packet {
		2904	my ($self, $pkt) = @_;
		2905
		2906	# try lzf for large packets
		2907	$pkt = "lzf " . Compress::LZF::compress $pkt
		2908	if 1024 <= length $pkt and $self->{can_lzf};
		2909
		2910	# split very large packets
		2911	if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
		2912	$self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
		2913	$pkt = "frag";
		2914	}
		2915
		2916	$self->send_packet ($pkt);
2739	}	2917	}
2740		2918
2741	=item $client->send_msg ($channel, $msg, $color, [extra...])	2919	=item $client->send_msg ($channel, $msg, $color, [extra...])
2742		2920
2743	Send a drawinfo or msg packet to the client, formatting the msg for the	2921	Send a drawinfo or msg packet to the client, formatting the msg for the
…		…
2747		2925
2748	=cut	2926	=cut
2749		2927
2750	# non-persistent channels (usually the info channel)	2928	# non-persistent channels (usually the info channel)
2751	our %CHANNEL = (	2929	our %CHANNEL = (
		2930	"c/motd" => {
		2931	id => "infobox",
		2932	title => "MOTD",
		2933	reply => undef,
		2934	tooltip => "The message of the day",
		2935	},
2752	"c/identify" => {	2936	"c/identify" => {
2753	id => "infobox",	2937	id => "infobox",
2754	title => "Identify",	2938	title => "Identify",
2755	reply => undef,	2939	reply => undef,
2756	tooltip => "Items recently identified",	2940	tooltip => "Items recently identified",
…		…
2758	"c/examine" => {	2942	"c/examine" => {
2759	id => "infobox",	2943	id => "infobox",
2760	title => "Examine",	2944	title => "Examine",
2761	reply => undef,	2945	reply => undef,
2762	tooltip => "Signs and other items you examined",	2946	tooltip => "Signs and other items you examined",
		2947	},
		2948	"c/shopinfo" => {
		2949	id => "infobox",
		2950	title => "Shop Info",
		2951	reply => undef,
		2952	tooltip => "What your bargaining skill tells you about the shop",
2763	},	2953	},
2764	"c/book" => {	2954	"c/book" => {
2765	id => "infobox",	2955	id => "infobox",
2766	title => "Book",	2956	title => "Book",
2767	reply => undef,	2957	reply => undef,
…		…
2883	my $pkt = "msg "	3073	my $pkt = "msg "
2884	. $self->{json_coder}->encode (	3074	. $self->{json_coder}->encode (
2885	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]	3075	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2886	);	3076	);
2887		3077
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);	3078	$self->send_big_packet ($pkt);
2899	}	3079	}
2900		3080
2901	=item $client->ext_msg ($type, @msg)	3081	=item $client->ext_msg ($type, @msg)
2902		3082
2903	Sends an ext event to the client.	3083	Sends an ext event to the client.
…		…
2906		3086
2907	sub cf::client::ext_msg($$@) {	3087	sub cf::client::ext_msg($$@) {
2908	my ($self, $type, @msg) = @_;	3088	my ($self, $type, @msg) = @_;
2909		3089
2910	if ($self->extcmd == 2) {	3090	if ($self->extcmd == 2) {
2911	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3091	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2912	} elsif ($self->extcmd == 1) { # TODO: remove	3092	} elsif ($self->extcmd == 1) { # TODO: remove
2913	push @msg, msgtype => "event_$type";	3093	push @msg, msgtype => "event_$type";
2914	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3094	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2915	}	3095	}
2916	}	3096	}
2917		3097
2918	=item $client->ext_reply ($msgid, @msg)	3098	=item $client->ext_reply ($msgid, @msg)
2919		3099
…		…
2923		3103
2924	sub cf::client::ext_reply($$@) {	3104	sub cf::client::ext_reply($$@) {
2925	my ($self, $id, @msg) = @_;	3105	my ($self, $id, @msg) = @_;
2926		3106
2927	if ($self->extcmd == 2) {	3107	if ($self->extcmd == 2) {
2928	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));	3108	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2929	} elsif ($self->extcmd == 1) {	3109	} elsif ($self->extcmd == 1) {
2930	#TODO: version 1, remove	3110	#TODO: version 1, remove
2931	unshift @msg, msgtype => "reply", msgid => $id;	3111	unshift @msg, msgtype => "reply", msgid => $id;
2932	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3112	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2933	}	3113	}
2934	}	3114	}
2935		3115
2936	=item $success = $client->query ($flags, "text", \&cb)	3116	=item $success = $client->query ($flags, "text", \&cb)
2937		3117
…		…
3008		3188
3009	$ns->ext_reply ($reply, @reply)	3189	$ns->ext_reply ($reply, @reply)
3010	if $reply;	3190	if $reply;
3011		3191
3012	} else {	3192	} else {
3013	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3193	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3014	}	3194	}
3015		3195
3016	cf::override;	3196	cf::override;
3017	},	3197	},
3018	);	3198	);
…		…
3038		3218
3039	$coro	3219	$coro
3040	}	3220	}
3041		3221
3042	cf::client->attach (	3222	cf::client->attach (
3043	on_destroy => sub {	3223	on_client_destroy => sub {
3044	my ($ns) = @_;	3224	my ($ns) = @_;
3045		3225
3046	$_->cancel for values %{ (delete $ns->{_coro}) || {} };	3226	$_->cancel for values %{ (delete $ns->{_coro}) || {} };
3047	},	3227	},
3048	);	3228	);
…		…
3064	our $safe_hole = new Safe::Hole;	3244	our $safe_hole = new Safe::Hole;
3065		3245
3066	$SIG{FPE} = 'IGNORE';	3246	$SIG{FPE} = 'IGNORE';
3067		3247
3068	$safe->permit_only (Opcode::opset qw(	3248	$safe->permit_only (Opcode::opset qw(
3069	:base_core :base_mem :base_orig :base_math	3249	:base_core :base_mem :base_orig :base_math :base_loop
3070	grepstart grepwhile mapstart mapwhile	3250	grepstart grepwhile mapstart mapwhile
3071	sort time	3251	sort time
3072	));	3252	));
3073		3253
3074	# here we export the classes and methods available to script code	3254	# here we export the classes and methods available to script code
…		…
3099	decrease split destroy change_exp value msg lore send_msg)],	3279	decrease split destroy change_exp value msg lore send_msg)],
3100	["cf::object::player" => qw(player)],	3280	["cf::object::player" => qw(player)],
3101	["cf::player" => qw(peaceful send_msg)],	3281	["cf::player" => qw(peaceful send_msg)],
3102	["cf::map" => qw(trigger)],	3282	["cf::map" => qw(trigger)],
3103	) {	3283	) {
3104	no strict 'refs';
3105	my ($pkg, @funs) = @$_;	3284	my ($pkg, @funs) = @$_;
3106	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3285	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3107	for @funs;	3286	for @funs;
3108	}	3287	}
3109		3288
…		…
3126	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3305	$qcode =~ s/"/‟/g; # not allowed in #line filenames
3127	$qcode =~ s/\n/\\n/g;	3306	$qcode =~ s/\n/\\n/g;
3128		3307
3129	%vars = (_dummy => 0) unless %vars;	3308	%vars = (_dummy => 0) unless %vars;
3130		3309
		3310	my @res;
3131	local $_;	3311	local $_;
3132	local @safe::cf::_safe_eval_args = values %vars;
3133		3312
3134	my $eval =	3313	my $eval =
3135	"do {\n"	3314	"do {\n"
3136	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"	3315	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3137	. "#line 0 \"{$qcode}\"\n"	3316	. "#line 0 \"{$qcode}\"\n"
3138	. $code	3317	. $code
3139	. "\n}"	3318	. "\n}"
3140	;	3319	;
3141		3320
		3321	if ($CFG{safe_eval}) {
3142	sub_generation_inc;	3322	sub_generation_inc;
		3323	local @safe::cf::_safe_eval_args = values %vars;
3143	my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);	3324	@res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3144	sub_generation_inc;	3325	sub_generation_inc;
		3326	} else {
		3327	local @cf::_safe_eval_args = values %vars;
		3328	@res = wantarray ? eval eval : scalar eval $eval;
		3329	}
3145		3330
3146	if ($@) {	3331	if ($@) {
3147	warn "$@";	3332	warn "$@",
3148	warn "while executing safe code '$code'\n";	3333	"while executing safe code '$code'\n",
3149	warn "with arguments " . (join " ", %vars) . "\n";	3334	"with arguments " . (join " ", %vars) . "\n";
3150	}	3335	}
3151		3336
3152	wantarray ? @res : $res[0]	3337	wantarray ? @res : $res[0]
3153	}	3338	}
3154		3339
…		…
3168	=cut	3353	=cut
3169		3354
3170	sub register_script_function {	3355	sub register_script_function {
3171	my ($fun, $cb) = @_;	3356	my ($fun, $cb) = @_;
3172		3357
3173	no strict 'refs';	3358	$fun = "safe::$fun" if $CFG{safe_eval};
3174	*{"safe::$fun"} = $safe_hole->wrap ($cb);	3359	*$fun = $safe_hole->wrap ($cb);
3175	}	3360	}
3176		3361
3177	=back	3362	=back
3178		3363
3179	=cut	3364	=cut
…		…
3188	# for this (global event?)	3373	# for this (global event?)
3189	%ext::player_env::MUSIC_FACE_CACHE = ();	3374	%ext::player_env::MUSIC_FACE_CACHE = ();
3190		3375
3191	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3376	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3192		3377
3193	warn "loading facedata from $path\n";	3378	trace "loading facedata from $path\n";
3194		3379
3195	my $facedata;
3196	0 < aio_load $path, $facedata	3380	0 < aio_load $path, my $facedata
3197	or die "$path: $!";	3381	or die "$path: $!";
3198		3382
3199	$facedata = Coro::Storable::thaw $facedata;	3383	$facedata = Coro::Storable::thaw $facedata;
3200		3384
3201	$facedata->{version} == 2	3385	$facedata->{version} == 2
3202	or cf::cleanup "$path: version mismatch, cannot proceed.";	3386	or cf::cleanup "$path: version mismatch, cannot proceed.";
3203		3387
3204	# patch in the exptable	3388	# patch in the exptable
		3389	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3205	$facedata->{resource}{"res/exp_table"} = {	3390	$facedata->{resource}{"res/exp_table"} = {
3206	type => FT_RSRC,	3391	type => FT_RSRC,
3207	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),	3392	data => $exp_table,
		3393	hash => (Digest::MD5::md5 $exp_table),
3208	};	3394	};
3209	cf::cede_to_tick;	3395	cf::cede_to_tick;
3210		3396
3211	{	3397	{
3212	my $faces = $facedata->{faceinfo};	3398	my $faces = $facedata->{faceinfo};
…		…
3214	while (my ($face, $info) = each %$faces) {	3400	while (my ($face, $info) = each %$faces) {
3215	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3401	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3216		3402
3217	cf::face::set_visibility $idx, $info->{visibility};	3403	cf::face::set_visibility $idx, $info->{visibility};
3218	cf::face::set_magicmap $idx, $info->{magicmap};	3404	cf::face::set_magicmap $idx, $info->{magicmap};
3219	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};	3405	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3220	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};	3406	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3221		3407
3222	cf::cede_to_tick;	3408	cf::cede_to_tick;
3223	}	3409	}
3224		3410
3225	while (my ($face, $info) = each %$faces) {	3411	while (my ($face, $info) = each %$faces) {
…		…
3230		3416
3231	if (my $smooth = cf::face::find $info->{smooth}) {	3417	if (my $smooth = cf::face::find $info->{smooth}) {
3232	cf::face::set_smooth $idx, $smooth;	3418	cf::face::set_smooth $idx, $smooth;
3233	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3419	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3234	} else {	3420	} else {
3235	warn "smooth face '$info->{smooth}' not found for face '$face'";	3421	error "smooth face '$info->{smooth}' not found for face '$face'";
3236	}	3422	}
3237		3423
3238	cf::cede_to_tick;	3424	cf::cede_to_tick;
3239	}	3425	}
3240	}	3426	}
…		…
3249		3435
3250	cf::anim::invalidate_all; # d'oh	3436	cf::anim::invalidate_all; # d'oh
3251	}	3437	}
3252		3438
3253	{	3439	{
3254	# TODO: for gcfclient pleasure, we should give resources
3255	# that gcfclient doesn't grok a >10000 face index.
3256	my $res = $facedata->{resource};	3440	my $res = $facedata->{resource};
3257		3441
3258	while (my ($name, $info) = each %$res) {	3442	while (my ($name, $info) = each %$res) {
3259	if (defined $info->{type}) {	3443	if (defined $info->{type}) {
3260	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3444	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3261	my $data;
3262		3445
3263	if ($info->{type} & 1) {	3446	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};	3447	cf::face::set_type $idx, $info->{type};
3278	} else {	3448	} else {
3279	$RESOURCE{$name} = $info;	3449	$RESOURCE{$name} = $info; # unused
3280	}	3450	}
3281		3451
3282	cf::cede_to_tick;	3452	cf::cede_to_tick;
3283	}	3453	}
3284	}	3454	}
3285		3455
3286	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3456	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3287		3457
3288	1	3458	1
3289	}	3459	}
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		3460
3311	register_exticmd fx_want => sub {	3461	register_exticmd fx_want => sub {
3312	my ($ns, $want) = @_;	3462	my ($ns, $want) = @_;
3313		3463
3314	while (my ($k, $v) = each %$want) {	3464	while (my ($k, $v) = each %$want) {
…		…
3353	sub reload_treasures {	3503	sub reload_treasures {
3354	load_resource_file "$DATADIR/treasures"	3504	load_resource_file "$DATADIR/treasures"
3355	or die "unable to load treasurelists\n";	3505	or die "unable to load treasurelists\n";
3356	}	3506	}
3357		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_table;
		3535	reload_materials;
3361	reload_facedata;	3536	reload_facedata;
		3537	reload_sound;
3362	reload_archetypes;	3538	reload_archetypes;
3363	reload_regions;	3539	reload_regions;
3364	reload_treasures;	3540	reload_treasures;
3365		3541
3366	warn "finished reloading resource files\n";	3542	trace "finished reloading resource files\n";
3367	}	3543	}
3368		3544
3369	sub reload_config {	3545	sub reload_config {
3370	open my $fh, "<:utf8", "$CONFDIR/config"	3546	trace "reloading config file...\n";
3371	or return;
3372		3547
3373	local $/;	3548	0 < aio_load "$CONFDIR/config", my $config
		3549	or die "$CONFDIR/config: $!";
		3550
		3551	utf8::decode $config;
		3552
		3553	cf::get_slot 0.1, 10, "reload_config"; # yaml might be slow...
3374	*CFG = YAML::Load <$fh>;	3554	*CFG = YAML::XS::Load $config;
3375		3555
3376	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3556	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3377		3557
3378	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3558	$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};	3559	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3380		3560
3381	if (exists $CFG{mlockall}) {	3561	if (exists $CFG{mlockall}) {
…		…
3405	seek $fh, 0, 0;	3585	seek $fh, 0, 0;
3406	print $fh $$;	3586	print $fh $$;
3407	}	3587	}
3408		3588
3409	sub main_loop {	3589	sub main_loop {
3410	warn "EV::loop starting\n";	3590	trace "EV::loop starting\n";
3411	if (1) {	3591	if (1) {
3412	EV::loop;	3592	EV::loop;
3413	}	3593	}
3414	warn "EV::loop returned\n";	3594	trace "EV::loop returned\n";
3415	goto &main_loop unless $REALLY_UNLOOP;	3595	goto &main_loop unless $REALLY_UNLOOP;
3416	}	3596	}
3417		3597
3418	sub main {	3598	sub main {
3419	cf::init_globals; # initialise logging	3599	cf::init_globals; # initialise logging
3420		3600
3421	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3601	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3422	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3602	LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3423	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3603	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3424	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3604	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		3605
3431	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3606	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3432		3607
3433	# we must not ever block the main coroutine	3608	# we must not ever block the main coroutine
3434	local $Coro::idle = sub {	3609	local $Coro::idle = sub {
…		…
3440	};	3615	};
3441		3616
3442	evthread_start IO::AIO::poll_fileno;	3617	evthread_start IO::AIO::poll_fileno;
3443		3618
3444	cf::sync_job {	3619	cf::sync_job {
		3620	cf::incloader::init ();
		3621
		3622	cf::init_anim;
		3623	cf::init_attackmess;
		3624	cf::init_dynamic;
		3625
		3626	cf::load_settings;
		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;
…		…
3460	load_extensions;	3640	load_extensions;
3461		3641
3462	utime time, time, $RUNTIMEFILE;	3642	utime time, time, $RUNTIMEFILE;
3463		3643
3464	# no (long-running) fork's whatsoever before this point(!)	3644	# no (long-running) fork's whatsoever before this point(!)
		3645	use POSIX ();
3465	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};
3466		3647
3467	(pop @POST_INIT)->(0) while @POST_INIT;	3648	(pop @POST_INIT)->(0) while @POST_INIT;
3468	};	3649	};
3469		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
3470	main_loop;	3659	goto &main_loop;
3471	}	3660	}
3472		3661
3473	#############################################################################	3662	#############################################################################
3474	# initialisation and cleanup	3663	# initialisation and cleanup
3475		3664
3476	# install some emergency cleanup handlers	3665	# install some emergency cleanup handlers
3477	BEGIN {	3666	BEGIN {
3478	our %SIGWATCHER = ();	3667	our %SIGWATCHER = ();
3479	for my $signal (qw(INT HUP TERM)) {	3668	for my $signal (qw(INT HUP TERM)) {
3480	$SIGWATCHER{$signal} = EV::signal $signal, sub {	3669	$SIGWATCHER{$signal} = AE::signal $signal, sub {
3481	cf::cleanup "SIG$signal";	3670	cf::cleanup "SIG$signal";
3482	};	3671	};
3483	}	3672	}
3484	}	3673	}
3485		3674
3486	sub write_runtime_sync {	3675	sub write_runtime_sync {
		3676	my $t0 = AE::time;
		3677
3487	# first touch the runtime file to show we are still running:	3678	# first touch the runtime file to show we are still running:
3488	# the fsync below can take a very very long time.	3679	# the fsync below can take a very very long time.
3489		3680
3490	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;	3681	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3491		3682
3492	my $guard = cf::lock_acquire "write_runtime";	3683	my $guard = cf::lock_acquire "write_runtime";
3493		3684
3494	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644	3685	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3495	or return;	3686	or return;
3496		3687
3497	my $value = $cf::RUNTIME + 90 + 10;	3688	my $value = $cf::RUNTIME + 90 + 10;
3498	# 10 is the runtime save interval, for a monotonic clock	3689	# 10 is the runtime save interval, for a monotonic clock
3499	# 60 allows for the watchdog to kill the server.	3690	# 60 allows for the watchdog to kill the server.
…		…
3512	or return;	3703	or return;
3513		3704
3514	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3705	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3515	and return;	3706	and return;
3516		3707
3517	warn "runtime file written.\n";	3708	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3518		3709
3519	1	3710	1
3520	}	3711	}
3521		3712
3522	our $uuid_lock;	3713	our $uuid_lock;
…		…
3534	or return;	3725	or return;
3535		3726
3536	my $value = uuid_seq uuid_cur;	3727	my $value = uuid_seq uuid_cur;
3537		3728
3538	unless ($value) {	3729	unless ($value) {
3539	warn "cowardly refusing to write zero uuid value!\n";	3730	info "cowardly refusing to write zero uuid value!\n";
3540	return;	3731	return;
3541	}	3732	}
3542		3733
3543	my $value = uuid_str $value + $uuid_skip;	3734	my $value = uuid_str $value + $uuid_skip;
3544	$uuid_skip = 0;	3735	$uuid_skip = 0;
…		…
3554	or return;	3745	or return;
3555		3746
3556	aio_rename "$uuid~", $uuid	3747	aio_rename "$uuid~", $uuid
3557	and return;	3748	and return;
3558		3749
3559	warn "uuid file written ($value).\n";	3750	trace "uuid file written ($value).\n";
3560		3751
3561	1	3752	1
3562		3753
3563	}	3754	}
3564		3755
…		…
3570	}	3761	}
3571		3762
3572	sub emergency_save() {	3763	sub emergency_save() {
3573	my $freeze_guard = cf::freeze_mainloop;	3764	my $freeze_guard = cf::freeze_mainloop;
3574		3765
3575	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;
3576		3772
3577	cf::sync_job {	3773	cf::sync_job {
3578	# this is a trade-off: we want to be very quick here, so	3774	cf::write_runtime_sync; # external watchdog should not bark
3579	# save all maps without fsync, and later call a global sync
3580	# (which in turn might be very very slow)
3581	local $USE_FSYNC = 0;
3582		3775
3583	# use a peculiar iteration method to avoid tripping on perl	3776	# use a peculiar iteration method to avoid tripping on perl
3584	# refcount bugs in for. also avoids problems with players	3777	# refcount bugs in for. also avoids problems with players
3585	# and maps saved/destroyed asynchronously.	3778	# and maps saved/destroyed asynchronously.
3586	warn "emergency_perl_save: begin player save\n";	3779	info "emergency_perl_save: begin player save\n";
3587	for my $login (keys %cf::PLAYER) {	3780	for my $login (keys %cf::PLAYER) {
3588	my $pl = $cf::PLAYER{$login} or next;	3781	my $pl = $cf::PLAYER{$login} or next;
3589	$pl->valid or next;	3782	$pl->valid or next;
3590	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3783	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3591	$pl->save;	3784	$pl->save;
3592	}	3785	}
3593	warn "emergency_perl_save: end player save\n";	3786	info "emergency_perl_save: end player save\n";
3594		3787
		3788	cf::write_runtime_sync; # external watchdog should not bark
		3789
3595	warn "emergency_perl_save: begin map save\n";	3790	info "emergency_perl_save: begin map save\n";
3596	for my $path (keys %cf::MAP) {	3791	for my $path (keys %cf::MAP) {
3597	my $map = $cf::MAP{$path} or next;	3792	my $map = $cf::MAP{$path} or next;
3598	$map->valid or next;	3793	$map->valid or next;
3599	$map->save;	3794	$map->save;
3600	}	3795	}
3601	warn "emergency_perl_save: end map save\n";	3796	info "emergency_perl_save: end map save\n";
3602		3797
		3798	cf::write_runtime_sync; # external watchdog should not bark
		3799
3603	warn "emergency_perl_save: begin database checkpoint\n";	3800	info "emergency_perl_save: begin database checkpoint\n";
3604	BDB::db_env_txn_checkpoint $DB_ENV;	3801	BDB::db_env_txn_checkpoint $DB_ENV;
3605	warn "emergency_perl_save: end database checkpoint\n";	3802	info "emergency_perl_save: end database checkpoint\n";
3606		3803
3607	warn "emergency_perl_save: begin write uuid\n";	3804	info "emergency_perl_save: begin write uuid\n";
3608	write_uuid_sync 1;	3805	write_uuid_sync 1;
3609	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
3610	};	3826	};
3611		3827
3612	warn "emergency_perl_save: starting sync()\n";
3613	IO::AIO::aio_sync sub {
3614	warn "emergency_perl_save: finished sync()\n";
3615	};
3616
3617	warn "emergency_perl_save: leave\n";	3828	info "emergency_perl_save: leave\n";
3618	}	3829	}
3619		3830
3620	sub post_cleanup {	3831	sub post_cleanup {
3621	my ($make_core) = @_;	3832	my ($make_core) = @_;
3622		3833
		3834	IO::AIO::flush;
		3835
3623	warn Carp::longmess "post_cleanup backtrace"	3836	error Carp::longmess "post_cleanup backtrace"
3624	if $make_core;	3837	if $make_core;
3625		3838
3626	my $fh = pidfile;	3839	my $fh = pidfile;
3627	unlink $PIDFILE if <$fh> == $$;	3840	unlink $PIDFILE if <$fh> == $$;
3628	}	3841	}
…		…
3648	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	3861	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3649	for my $name (keys %$leaf_symtab) {	3862	for my $name (keys %$leaf_symtab) {
3650	_gv_clear *{"$pkg$name"};	3863	_gv_clear *{"$pkg$name"};
3651	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	3864	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3652	}	3865	}
3653	warn "cleared package $pkg\n";#d#
3654	}	3866	}
3655		3867
3656	sub do_reload_perl() {	3868	sub do_reload_perl() {
3657	# can/must only be called in main	3869	# can/must only be called in main
3658	if ($Coro::current != $Coro::main) {	3870	unless (in_main) {
3659	warn "can only reload from main coroutine";	3871	error "can only reload from main coroutine";
3660	return;	3872	return;
3661	}	3873	}
3662		3874
3663	return if $RELOAD++;	3875	return if $RELOAD++;
3664		3876
3665	my $t1 = EV::time;	3877	my $t1 = AE::time;
3666		3878
3667	while ($RELOAD) {	3879	while ($RELOAD) {
		3880	cf::get_slot 0.1, -1, "reload_perl";
3668	warn "reloading...";	3881	info "reloading...";
3669		3882
3670	warn "entering sync_job";	3883	trace "entering sync_job";
3671		3884
3672	cf::sync_job {	3885	cf::sync_job {
3673	cf::write_runtime_sync; # external watchdog should not bark
3674	cf::emergency_save;	3886	#cf::emergency_save;
3675	cf::write_runtime_sync; # external watchdog should not bark
3676		3887
3677	warn "syncing database to disk";
3678	BDB::db_env_txn_checkpoint $DB_ENV;
3679
3680	# if anything goes wrong in here, we should simply crash as we already saved
3681
3682	warn "flushing outstanding aio requests";
3683	while (IO::AIO::nreqs || BDB::nreqs) {
3684	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3685	}
3686
3687	warn "cancelling all extension coros";	3888	trace "cancelling all extension coros";
3688	$_->cancel for values %EXT_CORO;	3889	$_->cancel for values %EXT_CORO;
3689	%EXT_CORO = ();	3890	%EXT_CORO = ();
3690		3891
3691	warn "removing commands";	3892	trace "removing commands";
3692	%COMMAND = ();	3893	%COMMAND = ();
3693		3894
3694	warn "removing ext/exti commands";	3895	trace "removing ext/exti commands";
3695	%EXTCMD = ();	3896	%EXTCMD = ();
3696	%EXTICMD = ();	3897	%EXTICMD = ();
3697		3898
3698	warn "unloading/nuking all extensions";	3899	trace "unloading/nuking all extensions";
3699	for my $pkg (@EXTS) {	3900	for my $pkg (@EXTS) {
3700	warn "... unloading $pkg";	3901	trace "... unloading $pkg";
3701		3902
3702	if (my $cb = $pkg->can ("unload")) {	3903	if (my $cb = $pkg->can ("unload")) {
3703	eval {	3904	eval {
3704	$cb->($pkg);	3905	$cb->($pkg);
3705	1	3906	1
3706	} or warn "$pkg unloaded, but with errors: $@";	3907	} or error "$pkg unloaded, but with errors: $@";
3707	}	3908	}
3708		3909
3709	warn "... clearing $pkg";	3910	trace "... clearing $pkg";
3710	clear_package $pkg;	3911	clear_package $pkg;
3711	}	3912	}
3712		3913
3713	warn "unloading all perl modules loaded from $LIBDIR";	3914	trace "unloading all perl modules loaded from $LIBDIR";
3714	while (my ($k, $v) = each %INC) {	3915	while (my ($k, $v) = each %INC) {
3715	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	3916	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3716		3917
3717	warn "... unloading $k";	3918	trace "... unloading $k";
3718	delete $INC{$k};	3919	delete $INC{$k};
3719		3920
3720	$k =~ s/\.pm$//;	3921	$k =~ s/\.pm$//;
3721	$k =~ s/\//::/g;	3922	$k =~ s/\//::/g;
3722		3923
…		…
3725	}	3926	}
3726		3927
3727	clear_package $k;	3928	clear_package $k;
3728	}	3929	}
3729		3930
3730	warn "getting rid of safe::, as good as possible";	3931	trace "getting rid of safe::, as good as possible";
3731	clear_package "safe::$_"	3932	clear_package "safe::$_"
3732	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);
3733		3934
3734	warn "unloading cf.pm \"a bit\"";	3935	trace "unloading cf.pm \"a bit\"";
3735	delete $INC{"cf.pm"};	3936	delete $INC{"cf.pm"};
3736	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	3937	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3737		3938
3738	# don't, removes xs symbols, too,	3939	# don't, removes xs symbols, too,
3739	# and global variables created in xs	3940	# and global variables created in xs
3740	#clear_package __PACKAGE__;	3941	#clear_package __PACKAGE__;
3741		3942
3742	warn "unload completed, starting to reload now";	3943	info "unload completed, starting to reload now";
3743		3944
3744	warn "reloading cf.pm";	3945	trace "reloading cf.pm";
3745	require cf;	3946	require cf;
3746	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3947	cf::_connect_to_perl_1;
3747		3948
3748	warn "loading config and database again";	3949	trace "loading config and database again";
3749	cf::reload_config;	3950	cf::reload_config;
3750		3951
3751	warn "loading extensions";	3952	trace "loading extensions";
3752	cf::load_extensions;	3953	cf::load_extensions;
3753		3954
3754	if ($REATTACH_ON_RELOAD) {	3955	if ($REATTACH_ON_RELOAD) {
3755	warn "reattaching attachments to objects/players";	3956	trace "reattaching attachments to objects/players";
3756	_global_reattach; # objects, sockets	3957	_global_reattach; # objects, sockets
3757	warn "reattaching attachments to maps";	3958	trace "reattaching attachments to maps";
3758	reattach $_ for values %MAP;	3959	reattach $_ for values %MAP;
3759	warn "reattaching attachments to players";	3960	trace "reattaching attachments to players";
3760	reattach $_ for values %PLAYER;	3961	reattach $_ for values %PLAYER;
3761	}	3962	}
3762		3963
3763	warn "running post_init jobs";	3964	trace "running post_init jobs";
3764	(pop @POST_INIT)->(1) while @POST_INIT;	3965	(pop @POST_INIT)->(1) while @POST_INIT;
3765		3966
3766	warn "leaving sync_job";	3967	trace "leaving sync_job";
3767		3968
3768	1	3969	1
3769	} or do {	3970	} or do {
3770	warn $@;	3971	error $@;
3771	cf::cleanup "error while reloading, exiting.";	3972	cf::cleanup "error while reloading, exiting.";
3772	};	3973	};
3773		3974
3774	warn "reloaded";	3975	info "reloaded";
3775	--$RELOAD;	3976	--$RELOAD;
3776	}	3977	}
3777		3978
3778	$t1 = EV::time - $t1;	3979	$t1 = AE::time - $t1;
3779	warn "reload completed in ${t1}s\n";	3980	info "reload completed in ${t1}s\n";
3780	};	3981	};
3781		3982
3782	our $RELOAD_WATCHER; # used only during reload	3983	our $RELOAD_WATCHER; # used only during reload
3783		3984
3784	sub reload_perl() {	3985	sub reload_perl() {
…		…
3786	# coro crashes during coro_state_free->destroy here.	3987	# coro crashes during coro_state_free->destroy here.
3787		3988
3788	$RELOAD_WATCHER ||= cf::async {	3989	$RELOAD_WATCHER ||= cf::async {
3789	Coro::AIO::aio_wait cache_extensions;	3990	Coro::AIO::aio_wait cache_extensions;
3790		3991
3791	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {	3992	$RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3792	do_reload_perl;	3993	do_reload_perl;
3793	undef $RELOAD_WATCHER;	3994	undef $RELOAD_WATCHER;
3794	};	3995	};
3795	};	3996	};
3796	}	3997	}
…		…
3805	reload_perl;	4006	reload_perl;
3806	};	4007	};
3807	}	4008	}
3808	};	4009	};
3809		4010
3810	unshift @INC, $LIBDIR;	4011	#############################################################################
3811		4012
3812	my $bug_warning = 0;	4013	my $bug_warning = 0;
3813		4014
3814	our @WAIT_FOR_TICK;	4015	our @WAIT_FOR_TICK;
3815	our @WAIT_FOR_TICK_BEGIN;	4016	our @WAIT_FOR_TICK_BEGIN;
3816		4017
3817	sub wait_for_tick {	4018	sub wait_for_tick() {
3818	return if tick_inhibit || $Coro::current == $Coro::main;	4019	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3819		4020
3820	my $signal = new Coro::Signal;	4021	my $signal = new Coro::Signal;
3821	push @WAIT_FOR_TICK, $signal;	4022	push @WAIT_FOR_TICK, $signal;
3822	$signal->wait;	4023	$signal->wait;
3823	}	4024	}
3824		4025
3825	sub wait_for_tick_begin {	4026	sub wait_for_tick_begin() {
3826	return if tick_inhibit || $Coro::current == $Coro::main;	4027	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3827		4028
3828	my $signal = new Coro::Signal;	4029	my $signal = new Coro::Signal;
3829	push @WAIT_FOR_TICK_BEGIN, $signal;	4030	push @WAIT_FOR_TICK_BEGIN, $signal;
3830	$signal->wait;	4031	$signal->wait;
3831	}	4032	}
…		…
3837	return;	4038	return;
3838	}	4039	}
3839		4040
3840	cf::server_tick; # one server iteration	4041	cf::server_tick; # one server iteration
3841		4042
		4043	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
		4044
3842	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4045	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3843	$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.;
3844	Coro::async_pool {	4047	Coro::async_pool {
3845	$Coro::current->{desc} = "runtime saver";	4048	$Coro::current->{desc} = "runtime saver";
3846	write_runtime_sync	4049	write_runtime_sync
3847	or warn "ERROR: unable to write runtime file: $!";	4050	or error "ERROR: unable to write runtime file: $!";
3848	};	4051	};
3849	}	4052	}
3850		4053
3851	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4054	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3852	$sig->send;	4055	$sig->send;
…		…
3860		4063
3861	if (0) {	4064	if (0) {
3862	if ($NEXT_TICK) {	4065	if ($NEXT_TICK) {
3863	my $jitter = $TICK_START - $NEXT_TICK;	4066	my $jitter = $TICK_START - $NEXT_TICK;
3864	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4067	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
3865	warn "jitter $JITTER\n";#d#	4068	debug "jitter $JITTER\n";#d#
3866	}	4069	}
3867	}	4070	}
3868	}	4071	}
3869		4072
3870	{	4073	{
3871	# configure BDB	4074	# configure BDB
3872		4075
3873	BDB::min_parallel 8;	4076	BDB::min_parallel 16;
3874	BDB::max_poll_reqs $TICK * 0.1;	4077	BDB::max_poll_reqs $TICK * 0.1;
3875	$AnyEvent::BDB::WATCHER->priority (1);	4078	$AnyEvent::BDB::WATCHER->priority (1);
3876		4079
3877	unless ($DB_ENV) {	4080	unless ($DB_ENV) {
3878	$DB_ENV = BDB::db_env_create;	4081	$DB_ENV = BDB::db_env_create;
…		…
3959	}	4162	}
3960	}	4163	}
3961		4164
3962	# load additional modules	4165	# load additional modules
3963	require "cf/$_.pm" for @EXTRA_MODULES;	4166	require "cf/$_.pm" for @EXTRA_MODULES;
		4167	cf::_connect_to_perl_2;
3964		4168
3965	END { cf::emergency_save }	4169	END { cf::emergency_save }
3966		4170
3967	1	4171	1
3968		4172

Diff Legend

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