ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.470 by root, Sun Apr 26 19:42:45 2009 UTC vs.
Revision 1.547 by root, Sun May 9 22:51:13 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
…		…
205	from wherever your confdir points to.	233	from wherever your confdir points to.
206		234
207	=item cf::wait_for_tick, cf::wait_for_tick_begin	235	=item cf::wait_for_tick, cf::wait_for_tick_begin
208		236
209	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
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 thread
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
		241	=cut
		242
		243	sub wait_for_tick();
		244	sub wait_for_tick_begin();
		245
213	=item @cf::INVOKE_RESULTS	246	=item @cf::INVOKE_RESULTS
214		247
215	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
216	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
217	that call.	250	that call.
218		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
219	=back	258	=back
220		259
221	=cut	260	=cut
222		261
223	BEGIN {	262	sub error(@) { LOG llevError, join "", @_ }
224	*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 {
225	my $msg = join "", @_;	269	my $msg = join "", @_;
226		270
227	$msg .= "\n"	271	$msg .= "\n"
228	unless $msg =~ /\n$/;	272	unless $msg =~ /\n$/;
229		273
230	$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;
231		275
232	LOG llevError, $msg;	276	LOG llevWarn, $msg;
233	};	277	};
234	}
235		278
236	$Coro::State::DIEHOOK = sub {	279	$Coro::State::DIEHOOK = sub {
237	return unless $^S eq 0; # "eq", not "=="	280	return unless $^S eq 0; # "eq", not "=="
238		281
239	if ($Coro::current == $Coro::main) {#d#	282	error Carp::longmess $_[0];
		283
		284	if (in_main) {#d#
240	warn "DIEHOOK called in main context, Coro bug?\n";#d#	285	error "DIEHOOK called in main context, Coro bug?\n";#d#
241	return;#d#	286	return;#d#
242	}#d#	287	}#d#
243		288
244	# kill coroutine otherwise	289	# kill coroutine otherwise
245	warn Carp::longmess $_[0];
246	Coro::terminate	290	Coro::terminate
247	};	291	};
248
249	$SIG{__DIE__} = sub { }; #d#?
250		292
251	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	293	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
252	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	294	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
253	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	295	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
254	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	296	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
…		…
268	)) {	310	)) {
269	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	311	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
270	}	312	}
271		313
272	$EV::DIED = sub {	314	$EV::DIED = sub {
273	warn "error in event callback: @_";	315	Carp::cluck "error in event callback: @_";
274	};	316	};
275		317
276	#############################################################################	318	#############################################################################
277		319
278	=head2 UTILITY FUNCTIONS	320	=head2 UTILITY FUNCTIONS
…		…
375	}	417	}
376		418
377	=item cf::periodic $interval, $cb	419	=item cf::periodic $interval, $cb
378		420
379	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
380	get spread over timer.	422	get spread over time.
381		423
382	=cut	424	=cut
383		425
384	sub periodic($$) {	426	sub periodic($$) {
385	my ($interval, $cb) = @_;	427	my ($interval, $cb) = @_;
…		…
402		444
403	=cut	445	=cut
404		446
405	our @SLOT_QUEUE;	447	our @SLOT_QUEUE;
406	our $SLOT_QUEUE;	448	our $SLOT_QUEUE;
		449	our $SLOT_DECAY = 0.9;
407		450
408	$SLOT_QUEUE->cancel if $SLOT_QUEUE;	451	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
409	$SLOT_QUEUE = Coro::async {	452	$SLOT_QUEUE = Coro::async {
410	$Coro::current->desc ("timeslot manager");	453	$Coro::current->desc ("timeslot manager");
411		454
412	my $signal = new Coro::Signal;	455	my $signal = new Coro::Signal;
		456	my $busy;
413		457
414	while () {	458	while () {
415	next_job:	459	next_job:
		460
416	my $avail = cf::till_tick;	461	my $avail = cf::till_tick;
417	if ($avail > 0.01) {	462
418	for (0 .. $#SLOT_QUEUE) {	463	for (0 .. $#SLOT_QUEUE) {
419	if ($SLOT_QUEUE[$_][0] < $avail) {	464	if ($SLOT_QUEUE[$_][0] <= $avail) {
		465	$busy = 0;
420	my $job = splice @SLOT_QUEUE, $_, 1, ();	466	my $job = splice @SLOT_QUEUE, $_, 1, ();
421	$job->[2]->send;	467	$job->[2]->send;
422	Coro::cede;	468	Coro::cede;
423	goto next_job;	469	goto next_job;
424	}	470	} else {
		471	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
425	}	472	}
426	}	473	}
427		474
428	if (@SLOT_QUEUE) {	475	if (@SLOT_QUEUE) {
429	# 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
430	push @cf::WAIT_FOR_TICK, $signal;	477	push @cf::WAIT_FOR_TICK, $signal;
431	$signal->wait;	478	$signal->wait;
432	} else {	479	} else {
		480	$busy = 0;
433	Coro::schedule;	481	Coro::schedule;
434	}	482	}
435	}	483	}
436	};	484	};
437		485
438	sub get_slot($;$$) {	486	sub get_slot($;$$) {
439	return if tick_inhibit || $Coro::current == $Coro::main;	487	return if tick_inhibit || $Coro::current == $Coro::main;
440		488
441	my ($time, $pri, $name) = @_;	489	my ($time, $pri, $name) = @_;
442		490
443	$time = $TICK * .6 if $time > $TICK * .6;	491	$time = clamp $time, 0.01, $TICK * .6;
		492
444	my $sig = new Coro::Signal;	493	my $sig = new Coro::Signal;
445		494
446	push @SLOT_QUEUE, [$time, $pri, $sig, $name];	495	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
447	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;	496	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
448	$SLOT_QUEUE->ready;	497	$SLOT_QUEUE->ready;
…		…
474	=cut	523	=cut
475		524
476	sub sync_job(&) {	525	sub sync_job(&) {
477	my ($job) = @_;	526	my ($job) = @_;
478		527
479	if ($Coro::current == $Coro::main) {	528	if (in_main) {
480	my $time = EV::time;	529	my $time = AE::time;
481		530
482	# this is the main coro, too bad, we have to block	531	# this is the main coro, too bad, we have to block
483	# till the operation succeeds, freezing the server :/	532	# till the operation succeeds, freezing the server :/
484		533
485	LOG llevError, Carp::longmess "sync job";#d#	534	#LOG llevError, Carp::longmess "sync job";#d#
486		535
487	my $freeze_guard = freeze_mainloop;	536	my $freeze_guard = freeze_mainloop;
488		537
489	my $busy = 1;	538	my $busy = 1;
490	my @res;	539	my @res;
491		540
492	(async {	541	(async {
493	$Coro::current->desc ("sync job coro");	542	$Coro::current->desc ("sync job coro");
494	@res = eval { $job->() };	543	@res = eval { $job->() };
495	warn $@ if $@;	544	error $@ if $@;
496	undef $busy;	545	undef $busy;
497	})->prio (Coro::PRIO_MAX);	546	})->prio (Coro::PRIO_MAX);
498		547
499	while ($busy) {	548	while ($busy) {
500	if (Coro::nready) {	549	if (Coro::nready) {
…		…
502	} else {	551	} else {
503	EV::loop EV::LOOP_ONESHOT;	552	EV::loop EV::LOOP_ONESHOT;
504	}	553	}
505	}	554	}
506		555
507	my $time = EV::time - $time;	556	my $time = AE::time - $time;
508		557
509	$TICK_START += $time; # do not account sync jobs to server load	558	$TICK_START += $time; # do not account sync jobs to server load
510		559
511	wantarray ? @res : $res[0]	560	wantarray ? @res : $res[0]
512	} else {	561	} else {
…		…
543	Coro::Storable. May, of course, block. Note that the executed sub may	592	Coro::Storable. May, of course, block. Note that the executed sub may
544	never block itself or use any form of event handling.	593	never block itself or use any form of event handling.
545		594
546	=cut	595	=cut
547		596
		597	sub post_fork {
		598	reset_signals;
		599	}
		600
548	sub fork_call(&@) {	601	sub fork_call(&@) {
549	my ($cb, @args) = @_;	602	my ($cb, @args) = @_;
550		603
551	# we seemingly have to make a local copy of the whole thing,	604	# we seemingly have to make a local copy of the whole thing,
552	# otherwise perl prematurely frees the stuff :/	605	# otherwise perl prematurely frees the stuff :/
553	# TODO: investigate and fix (likely this will be rather laborious)	606	# TODO: investigate and fix (likely this will be rather laborious)
554		607
555	my @res = Coro::Util::fork_eval {	608	my @res = Coro::Util::fork_eval {
556	reset_signals;	609	cf::post_fork;
557	&$cb	610	&$cb
558	}, @args;	611	}, @args;
559		612
560	wantarray ? @res : $res[-1]	613	wantarray ? @res : $res[-1]
		614	}
		615
		616	sub objinfo {
		617	(
		618	"counter value" => cf::object::object_count,
		619	"objects created" => cf::object::create_count,
		620	"objects destroyed" => cf::object::destroy_count,
		621	"freelist size" => cf::object::free_count,
		622	"allocated objects" => cf::object::objects_size,
		623	"active objects" => cf::object::actives_size,
		624	)
561	}	625	}
562		626
563	=item $coin = coin_from_name $name	627	=item $coin = coin_from_name $name
564		628
565	=cut	629	=cut
…		…
602	within each server.	666	within each server.
603		667
604	=cut	668	=cut
605		669
606	sub db_table($) {	670	sub db_table($) {
		671	cf::error "db_get called from main context"
		672	if $Coro::current == $Coro::main;
		673
607	my ($name) = @_;	674	my ($name) = @_;
608	my $db = BDB::db_create $DB_ENV;	675	my $db = BDB::db_create $DB_ENV;
609		676
610	eval {	677	eval {
611	$db->set_flags (BDB::CHKSUM);	678	$db->set_flags (BDB::CHKSUM);
…		…
621	}	688	}
622		689
623	our $DB;	690	our $DB;
624		691
625	sub db_init {	692	sub db_init {
626	cf::sync_job {
627	$DB ||= db_table "db";	693	$DB ||= db_table "db";
628	};
629	}	694	}
630		695
631	sub db_get($$) {	696	sub db_get($$) {
632	my $key = "$_[0]/$_[1]";	697	my $key = "$_[0]/$_[1]";
633		698
634	cf::sync_job {	699	cf::error "db_get called from main context"
		700	if $Coro::current == $Coro::main;
		701
635	BDB::db_get $DB, undef, $key, my $data;	702	BDB::db_get $DB, undef, $key, my $data;
636		703
637	$! ? ()	704	$! ? ()
638	: $data	705	: $data
639	}
640	}	706	}
641		707
642	sub db_put($$$) {	708	sub db_put($$$) {
643	BDB::dbreq_pri 4;	709	BDB::dbreq_pri 4;
644	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	710	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
700		766
701	my $t1 = Time::HiRes::time;	767	my $t1 = Time::HiRes::time;
702	my $data = $process->(\@data);	768	my $data = $process->(\@data);
703	my $t2 = Time::HiRes::time;	769	my $t2 = Time::HiRes::time;
704		770
705	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	771	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
706		772
707	db_put cache => "$id/data", $data;	773	db_put cache => "$id/data", $data;
708	db_put cache => "$id/md5" , $md5;	774	db_put cache => "$id/md5" , $md5;
709	db_put cache => "$id/meta", $meta;	775	db_put cache => "$id/meta", $meta;
710		776
…		…
720		786
721	=cut	787	=cut
722		788
723	sub datalog($@) {	789	sub datalog($@) {
724	my ($type, %kv) = @_;	790	my ($type, %kv) = @_;
725	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	791	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
726	}	792	}
727		793
728	=back	794	=back
729		795
730	=cut	796	=cut
…		…
925		991
926	} elsif (exists $cb_id{$type}) {	992	} elsif (exists $cb_id{$type}) {
927	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	993	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
928		994
929	} elsif (ref $type) {	995	} elsif (ref $type) {
930	warn "attaching objects not supported, ignoring.\n";	996	error "attaching objects not supported, ignoring.\n";
931		997
932	} else {	998	} else {
933	shift @arg;	999	shift @arg;
934	warn "attach argument '$type' not supported, ignoring.\n";	1000	error "attach argument '$type' not supported, ignoring.\n";
935	}	1001	}
936	}	1002	}
937	}	1003	}
938		1004
939	sub _object_attach {	1005	sub _object_attach {
…		…
949	_attach $registry, $klass, @attach;	1015	_attach $registry, $klass, @attach;
950	}	1016	}
951		1017
952	$obj->{$name} = \%arg;	1018	$obj->{$name} = \%arg;
953	} else {	1019	} else {
954	warn "object uses attachment '$name' which is not available, postponing.\n";	1020	info "object uses attachment '$name' which is not available, postponing.\n";
955	}	1021	}
956		1022
957	$obj->{_attachment}{$name} = undef;	1023	$obj->{_attachment}{$name} = undef;
958	}	1024	}
959		1025
…		…
1018		1084
1019	for (@$callbacks) {	1085	for (@$callbacks) {
1020	eval { &{$_->[1]} };	1086	eval { &{$_->[1]} };
1021		1087
1022	if ($@) {	1088	if ($@) {
1023	warn "$@";
1024	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1089	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1025	override;	1090	override;
1026	}	1091	}
1027		1092
1028	return 1 if $override;	1093	return 1 if $override;
1029	}	1094	}
…		…
1108	for (@$attach) {	1173	for (@$attach) {
1109	my ($klass, @attach) = @$_;	1174	my ($klass, @attach) = @$_;
1110	_attach $registry, $klass, @attach;	1175	_attach $registry, $klass, @attach;
1111	}	1176	}
1112	} else {	1177	} else {
1113	warn "object uses attachment '$name' that is not available, postponing.\n";	1178	info "object uses attachment '$name' that is not available, postponing.\n";
1114	}	1179	}
1115	}	1180	}
1116	}	1181	}
1117		1182
1118	cf::attachable->attach (	1183	cf::attachable->attach (
…		…
1145	my ($filename, $rdata, $objs) = @_;	1210	my ($filename, $rdata, $objs) = @_;
1146		1211
1147	sync_job {	1212	sync_job {
1148	if (length $$rdata) {	1213	if (length $$rdata) {
1149	utf8::decode (my $decname = $filename);	1214	utf8::decode (my $decname = $filename);
1150	warn sprintf "saving %s (%d,%d)\n",	1215	trace sprintf "saving %s (%d,%d)\n",
1151	$decname, length $$rdata, scalar @$objs;	1216	$decname, length $$rdata, scalar @$objs
		1217	if $VERBOSE_IO;
1152		1218
1153	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1219	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1154	aio_chmod $fh, SAVE_MODE;	1220	aio_chmod $fh, SAVE_MODE;
1155	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1221	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1156	aio_fsync $fh if $cf::USE_FSYNC;	1222	if ($cf::USE_FSYNC) {
		1223	aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
		1224	aio_fsync $fh;
		1225	}
1157	aio_close $fh;	1226	aio_close $fh;
1158		1227
1159	if (@$objs) {	1228	if (@$objs) {
1160	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {	1229	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1161	aio_chmod $fh, SAVE_MODE;	1230	aio_chmod $fh, SAVE_MODE;
1162	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };	1231	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1163	aio_write $fh, 0, (length $data), $data, 0;	1232	aio_write $fh, 0, (length $data), $data, 0;
1164	aio_fsync $fh if $cf::USE_FSYNC;	1233	if ($cf::USE_FSYNC) {
		1234	aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
		1235	aio_fsync $fh;
		1236	}
1165	aio_close $fh;	1237	aio_close $fh;
1166	aio_rename "$filename.pst~", "$filename.pst";	1238	aio_rename "$filename.pst~", "$filename.pst";
1167	}	1239	}
1168	} else {	1240	} else {
1169	aio_unlink "$filename.pst";	1241	aio_unlink "$filename.pst";
…		…
1172	aio_rename "$filename~", $filename;	1244	aio_rename "$filename~", $filename;
1173		1245
1174	$filename =~ s%/[^/]+$%%;	1246	$filename =~ s%/[^/]+$%%;
1175	aio_pathsync $filename if $cf::USE_FSYNC;	1247	aio_pathsync $filename if $cf::USE_FSYNC;
1176	} else {	1248	} else {
1177	warn "unable to save objects: $filename~: $!\n";	1249	error "unable to save objects: $filename~: $!\n";
1178	}	1250	}
1179	} else {	1251	} else {
1180	aio_unlink $filename;	1252	aio_unlink $filename;
1181	aio_unlink "$filename.pst";	1253	aio_unlink "$filename.pst";
1182	}	1254	}
…		…
1206	my $st = eval { Coro::Storable::thaw $av };	1278	my $st = eval { Coro::Storable::thaw $av };
1207	$av = $st->{objs};	1279	$av = $st->{objs};
1208	}	1280	}
1209		1281
1210	utf8::decode (my $decname = $filename);	1282	utf8::decode (my $decname = $filename);
1211	warn sprintf "loading %s (%d,%d)\n",	1283	trace sprintf "loading %s (%d,%d)\n",
1212	$decname, length $data, scalar @{$av || []};	1284	$decname, length $data, scalar @{$av || []}
		1285	if $VERBOSE_IO;
1213		1286
1214	($data, $av)	1287	($data, $av)
1215	}	1288	}
1216		1289
1217	=head2 COMMAND CALLBACKS	1290	=head2 COMMAND CALLBACKS
…		…
1276	}	1349	}
1277		1350
1278	use File::Glob ();	1351	use File::Glob ();
1279		1352
1280	cf::player->attach (	1353	cf::player->attach (
1281	on_command => sub {	1354	on_unknown_command => sub {
1282	my ($pl, $name, $params) = @_;	1355	my ($pl, $name, $params) = @_;
1283		1356
1284	my $cb = $COMMAND{$name}	1357	my $cb = $COMMAND{$name}
1285	or return;	1358	or return;
1286		1359
…		…
1309		1382
1310	$pl->ext_reply ($reply, @reply)	1383	$pl->ext_reply ($reply, @reply)
1311	if $reply;	1384	if $reply;
1312		1385
1313	} else {	1386	} else {
1314	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1387	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1315	}	1388	}
1316		1389
1317	cf::override;	1390	cf::override;
1318	},	1391	},
1319	);	1392	);
1320		1393
1321	# "readahead" all extensions	1394	# "readahead" all extensions
1322	sub cache_extensions {	1395	sub cache_extensions {
1323	my $grp = IO::AIO::aio_group;	1396	my $grp = IO::AIO::aio_group;
1324		1397
1325	add $grp IO::AIO::aio_readdir $LIBDIR, sub {	1398	add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1326	for (grep /\.ext$/, @{$_[0]}) {	1399	for (grep /\.ext$/, @{$_[0]}) {
1327	add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;	1400	add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1328	}	1401	}
1329	};	1402	};
1330		1403
1331	$grp	1404	$grp
1332	}	1405	}
1333		1406
1334	sub load_extensions {	1407	sub load_extensions {
		1408	info "loading extensions...";
		1409
1335	cf::sync_job {	1410	cf::sync_job {
1336	my %todo;	1411	my %todo;
1337		1412
1338	for my $path (<$LIBDIR/*.ext>) {	1413	for my $path (<$LIBDIR/*.ext>) {
1339	next unless -r $path;	1414	next unless -r $path;
…		…
1357		1432
1358	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1433	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1359	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1434	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1360		1435
1361	$ext{source} =	1436	$ext{source} =
1362	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1437	"package $pkg; use common::sense;\n"
1363	. "#line 1 \"$path\"\n{\n"	1438	. "#line 1 \"$path\"\n{\n"
1364	. $source	1439	. $source
1365	. "\n};\n1";	1440	. "\n};\n1";
1366		1441
1367	$todo{$base} = \%ext;	1442	$todo{$base} = \%ext;
1368	}	1443	}
1369		1444
		1445	my $pass = 0;
1370	my %done;	1446	my %done;
1371	while (%todo) {	1447	while (%todo) {
1372	my $progress;	1448	my $progress;
1373		1449
		1450	++$pass;
		1451
		1452	ext:
1374	while (my ($k, $v) = each %todo) {	1453	while (my ($k, $v) = each %todo) {
1375	for (split /,\s*/, $v->{meta}{depends}) {	1454	for (split /,\s*/, $v->{meta}{depends}) {
1376	goto skip	1455	next ext
1377	unless exists $done{$_};	1456	unless exists $done{$_};
1378	}	1457	}
1379		1458
1380	warn "... loading '$k' into '$v->{pkg}'\n";	1459	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1381		1460
1382	unless (eval $v->{source}) {	1461	my $active = eval $v->{source};
		1462
		1463	if (length $@) {
1383	my $msg = $@ ? "$v->{path}: $@\n"	1464	error "$v->{path}: $@\n";
1384	: "$v->{base}: extension inactive.\n";
1385		1465
1386	if (exists $v->{meta}{mandatory}) {
1387	warn $msg;
1388	cf::cleanup "mandatory extension failed to load, exiting.";	1466	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1389	}	1467	if exists $v->{meta}{mandatory};
1390		1468
1391	warn $msg;	1469	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
		1470	delete $todo{$k};
		1471	} else {
		1472	$done{$k} = delete $todo{$k};
		1473	push @EXTS, $v->{pkg};
		1474	$progress = 1;
		1475
		1476	info "$v->{base}: extension inactive.\n"
		1477	unless $active;
1392	}	1478	}
1393
1394	$done{$k} = delete $todo{$k};
1395	push @EXTS, $v->{pkg};
1396	$progress = 1;
1397	}	1479	}
1398		1480
1399	skip:	1481	unless ($progress) {
1400	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"	1482	warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1401	unless $progress;	1483
		1484	while (my ($k, $v) = each %todo) {
		1485	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
		1486	if exists $v->{meta}{mandatory};
		1487	}
		1488	}
1402	}	1489	}
1403	};	1490	};
1404	}	1491	}
1405		1492
1406	#############################################################################	1493	#############################################################################
…		…
1490	$cf::PLAYER{$login} = $pl	1577	$cf::PLAYER{$login} = $pl
1491	}	1578	}
1492	}	1579	}
1493	}	1580	}
1494		1581
		1582	cf::player->attach (
		1583	on_load => sub {
		1584	my ($pl, $path) = @_;
		1585
		1586	# restore slots saved in save, below
		1587	my $slots = delete $pl->{_slots};
		1588
		1589	$pl->ob->current_weapon ($slots->[0]);
		1590	$pl->combat_ob ($slots->[1]);
		1591	$pl->ranged_ob ($slots->[2]);
		1592	},
		1593	);
		1594
1495	sub save($) {	1595	sub save($) {
1496	my ($pl) = @_;	1596	my ($pl) = @_;
1497		1597
1498	return if $pl->{deny_save};	1598	return if $pl->{deny_save};
1499		1599
…		…
1504		1604
1505	aio_mkdir playerdir $pl, 0770;	1605	aio_mkdir playerdir $pl, 0770;
1506	$pl->{last_save} = $cf::RUNTIME;	1606	$pl->{last_save} = $cf::RUNTIME;
1507		1607
1508	cf::get_slot 0.01;	1608	cf::get_slot 0.01;
		1609
		1610	# save slots, to be restored later
		1611	local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1509		1612
1510	$pl->save_pl ($path);	1613	$pl->save_pl ($path);
1511	cf::cede_to_tick;	1614	cf::cede_to_tick;
1512	}	1615	}
1513		1616
…		…
1549	$pl->{deny_save} = 1;	1652	$pl->{deny_save} = 1;
1550	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1653	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1551		1654
1552	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1655	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1553	$pl->deactivate;	1656	$pl->deactivate;
		1657
1554	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1658	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1555	$pl->ob->check_score;	1659	ext::highscore::check ($pl->ob);
		1660
1556	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1661	$pl->invoke (cf::EVENT_PLAYER_QUIT);
1557	$pl->ns->destroy if $pl->ns;	1662	$pl->ns->destroy if $pl->ns;
1558		1663
1559	my $path = playerdir $pl;	1664	my $path = playerdir $pl;
1560	my $temp = "$path~$cf::RUNTIME~deleting~";	1665	my $temp = "$path~$cf::RUNTIME~deleting~";
…		…
1615	\@logins	1720	\@logins
1616	}	1721	}
1617		1722
1618	=item $player->maps	1723	=item $player->maps
1619		1724
		1725	=item cf::player::maps $login
		1726
1620	Returns an arrayref of map paths that are private for this	1727	Returns an arrayref of map paths that are private for this
1621	player. May block.	1728	player. May block.
1622		1729
1623	=cut	1730	=cut
1624		1731
…		…
1686	=cut	1793	=cut
1687		1794
1688	sub find_by_path($) {	1795	sub find_by_path($) {
1689	my ($path) = @_;	1796	my ($path) = @_;
1690		1797
		1798	$path =~ s/^~[^\/]*//; # skip ~login
		1799
1691	my ($match, $specificity);	1800	my ($match, $specificity);
1692		1801
1693	for my $region (list) {	1802	for my $region (list) {
1694	if ($region->{match} && $path =~ $region->{match}) {	1803	if ($region->{match} && $path =~ $region->{match}) {
1695	($match, $specificity) = ($region, $region->specificity)	1804	($match, $specificity) = ($region, $region->specificity)
…		…
1726	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	1835	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1727		1836
1728	# mit "rum" bekleckern, nicht	1837	# mit "rum" bekleckern, nicht
1729	$self->_create_random_map (	1838	$self->_create_random_map (
1730	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},	1839	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1731	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},	1840	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1732	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},	1841	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1733	$rmp->{exit_on_final_map},	1842	$rmp->{exit_on_final_map},
1734	$rmp->{xsize}, $rmp->{ysize},	1843	$rmp->{xsize}, $rmp->{ysize},
1735	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},	1844	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1736	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},	1845	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
…		…
1751		1860
1752	sub register {	1861	sub register {
1753	my (undef, $regex, $prio) = @_;	1862	my (undef, $regex, $prio) = @_;
1754	my $pkg = caller;	1863	my $pkg = caller;
1755		1864
1756	no strict;
1757	push @{"$pkg\::ISA"}, __PACKAGE__;	1865	push @{"$pkg\::ISA"}, __PACKAGE__;
1758		1866
1759	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	1867	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1760	}	1868	}
1761		1869
1762	# also paths starting with '/'	1870	# also paths starting with '/'
1763	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	1871	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1764		1872
1765	sub thawer_merge {	1873	sub thawer_merge {
1766	my ($self, $merge) = @_;	1874	my ($self, $merge) = @_;
1767		1875
1768	# we have to keep some variables in memory intact	1876	# we have to keep some variables in memory intact
…		…
1773	}	1881	}
1774		1882
1775	sub normalise {	1883	sub normalise {
1776	my ($path, $base) = @_;	1884	my ($path, $base) = @_;
1777		1885
1778	$path = "$path"; # make sure its a string	1886	$path = "$path"; # make sure it's a string
1779		1887
1780	$path =~ s/\.map$//;	1888	$path =~ s/\.map$//;
1781		1889
1782	# map plan:	1890	# map plan:
1783	#	1891	#
…		…
1822	$self->init; # pass $1 etc.	1930	$self->init; # pass $1 etc.
1823	return $self;	1931	return $self;
1824	}	1932	}
1825	}	1933	}
1826		1934
1827	Carp::cluck "unable to resolve path '$path' (base '$base').";	1935	Carp::cluck "unable to resolve path '$path' (base '$base')";
1828	()	1936	()
1829	}	1937	}
1830		1938
1831	sub init {	1939	sub init {
1832	my ($self) = @_;	1940	my ($self) = @_;
…		…
1954	}	2062	}
1955		2063
1956	sub find;	2064	sub find;
1957	sub find {	2065	sub find {
1958	my ($path, $origin) = @_;	2066	my ($path, $origin) = @_;
		2067
		2068	cf::cede_to_tick;
1959		2069
1960	$path = normalise $path, $origin && $origin->path;	2070	$path = normalise $path, $origin && $origin->path;
1961		2071
1962	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2072	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1963	my $guard2 = cf::lock_acquire "map_find:$path";	2073	my $guard2 = cf::lock_acquire "map_find:$path";
…		…
1982		2092
1983	$cf::MAP{$path} = $map	2093	$cf::MAP{$path} = $map
1984	}	2094	}
1985	}	2095	}
1986		2096
1987	sub pre_load { }	2097	sub pre_load { }
1988	sub post_load { }	2098	#sub post_load { } # XS
1989		2099
1990	sub load {	2100	sub load {
1991	my ($self) = @_;	2101	my ($self) = @_;
1992		2102
1993	local $self->{deny_reset} = 1; # loading can take a long time	2103	local $self->{deny_reset} = 1; # loading can take a long time
…		…
2050	}	2160	}
2051		2161
2052	$self->post_load;	2162	$self->post_load;
2053	}	2163	}
2054		2164
		2165	# customize the map for a given player, i.e.
		2166	# return the _real_ map. used by e.g. per-player
		2167	# maps to change the path to ~playername/mappath
2055	sub customise_for {	2168	sub customise_for {
2056	my ($self, $ob) = @_;	2169	my ($self, $ob) = @_;
2057		2170
2058	return find "~" . $ob->name . "/" . $self->{path}	2171	return find "~" . $ob->name . "/" . $self->{path}
2059	if $self->per_player;	2172	if $self->per_player;
…		…
2075	or next;	2188	or next;
2076	$neigh = find $neigh, $map	2189	$neigh = find $neigh, $map
2077	or next;	2190	or next;
2078	$neigh->load;	2191	$neigh->load;
2079		2192
		2193	# now find the diagonal neighbours
2080	push @neigh,	2194	push @neigh,
2081	[$neigh->tile_path (($_ + 3) % 4), $neigh],	2195	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2082	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2196	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2083	}	2197	}
2084		2198
…		…
2091	}	2205	}
2092		2206
2093	sub find_sync {	2207	sub find_sync {
2094	my ($path, $origin) = @_;	2208	my ($path, $origin) = @_;
2095		2209
2096	cf::sync_job { find $path, $origin }	2210	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
		2211	if $Coro::current == $Coro::main;
		2212
		2213	find $path, $origin
2097	}	2214	}
2098		2215
2099	sub do_load_sync {	2216	sub do_load_sync {
2100	my ($map) = @_;	2217	my ($map) = @_;
2101		2218
2102	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2219	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2103	if $Coro::current == $Coro::main;	2220	if $Coro::current == $Coro::main;
2104		2221
2105	cf::sync_job { $map->load };	2222	$map->load;
2106	}	2223	}
2107		2224
2108	our %MAP_PREFETCH;	2225	our %MAP_PREFETCH;
2109	our $MAP_PREFETCHER = undef;	2226	our $MAP_PREFETCHER = undef;
2110		2227
…		…
2136	$MAP_PREFETCHER->prio (6);	2253	$MAP_PREFETCHER->prio (6);
2137		2254
2138	()	2255	()
2139	}	2256	}
2140		2257
		2258	# common code, used by both ->save and ->swapout
2141	sub save {	2259	sub _save {
2142	my ($self) = @_;	2260	my ($self) = @_;
2143
2144	my $lock = cf::lock_acquire "map_data:$self->{path}";
2145		2261
2146	$self->{last_save} = $cf::RUNTIME;	2262	$self->{last_save} = $cf::RUNTIME;
2147		2263
2148	return unless $self->dirty;	2264	return unless $self->dirty;
2149		2265
…		…
2169	} else {	2285	} else {
2170	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);	2286	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2171	}	2287	}
2172	}	2288	}
2173		2289
		2290	sub save {
		2291	my ($self) = @_;
		2292
		2293	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2294
		2295	$self->_save;
		2296	}
		2297
2174	sub swap_out {	2298	sub swap_out {
2175	my ($self) = @_;	2299	my ($self) = @_;
2176		2300
2177	# save first because save cedes
2178	$self->save;
2179
2180	my $lock = cf::lock_acquire "map_data:$self->{path}";	2301	my $lock = cf::lock_acquire "map_data:$self->{path}";
2181		2302
2182	return if $self->players;
2183	return if $self->in_memory != cf::MAP_ACTIVE;	2303	return if $self->in_memory != cf::MAP_ACTIVE;
2184	return if $self->{deny_save};	2304	return if $self->{deny_save};
		2305	return if $self->players;
2185		2306
		2307	# first deactivate the map and "unlink" it from the core
		2308	$self->deactivate;
		2309	$_->clear_links_to ($self) for values %cf::MAP;
2186	$self->in_memory (cf::MAP_SWAPPED);	2310	$self->in_memory (cf::MAP_SWAPPED);
		2311
		2312	# then atomically save
		2313	$self->_save;
		2314
		2315	# then free the map
		2316	$self->clear;
		2317	}
		2318
		2319	sub reset_at {
		2320	my ($self) = @_;
		2321
		2322	# TODO: safety, remove and allow resettable per-player maps
		2323	return 1e99 if $self->{deny_reset};
		2324
		2325	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
		2326	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
		2327
		2328	$time + $to
		2329	}
		2330
		2331	sub should_reset {
		2332	my ($self) = @_;
		2333
		2334	$self->reset_at <= $cf::RUNTIME
		2335	}
		2336
		2337	sub reset {
		2338	my ($self) = @_;
		2339
		2340	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2341
		2342	return if $self->players;
		2343
		2344	cf::trace "resetting map ", $self->path, "\n";
		2345
		2346	$self->in_memory (cf::MAP_SWAPPED);
		2347
		2348	# need to save uniques path
		2349	unless ($self->{deny_save}) {
		2350	my $uniq = $self->uniq_path; utf8::encode $uniq;
		2351
		2352	$self->_save_objects ($uniq, cf::IO_UNIQUES)
		2353	if $uniq;
		2354	}
		2355
		2356	delete $cf::MAP{$self->path};
2187		2357
2188	$self->deactivate;	2358	$self->deactivate;
2189	$_->clear_links_to ($self) for values %cf::MAP;	2359	$_->clear_links_to ($self) for values %cf::MAP;
2190	$self->clear;	2360	$self->clear;
2191	}
2192
2193	sub reset_at {
2194	my ($self) = @_;
2195
2196	# TODO: safety, remove and allow resettable per-player maps
2197	return 1e99 if $self->{deny_reset};
2198
2199	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2200	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2201
2202	$time + $to
2203	}
2204
2205	sub should_reset {
2206	my ($self) = @_;
2207
2208	$self->reset_at <= $cf::RUNTIME
2209	}
2210
2211	sub reset {
2212	my ($self) = @_;
2213
2214	my $lock = cf::lock_acquire "map_data:$self->{path}";
2215
2216	return if $self->players;
2217
2218	warn "resetting map ", $self->path;
2219
2220	$self->in_memory (cf::MAP_SWAPPED);
2221
2222	# need to save uniques path
2223	unless ($self->{deny_save}) {
2224	my $uniq = $self->uniq_path; utf8::encode $uniq;
2225
2226	$self->_save_objects ($uniq, cf::IO_UNIQUES)
2227	if $uniq;
2228	}
2229
2230	delete $cf::MAP{$self->path};
2231
2232	$self->deactivate;
2233	$_->clear_links_to ($self) for values %cf::MAP;
2234	$self->clear;
2235		2361
2236	$self->unlink_save;	2362	$self->unlink_save;
2237	$self->destroy;	2363	$self->destroy;
2238	}	2364	}
2239		2365
…		…
2247		2373
2248	delete $cf::MAP{$self->path};	2374	delete $cf::MAP{$self->path};
2249		2375
2250	$self->unlink_save;	2376	$self->unlink_save;
2251		2377
2252	bless $self, "cf::map";	2378	bless $self, "cf::map::wrap";
2253	delete $self->{deny_reset};	2379	delete $self->{deny_reset};
2254	$self->{deny_save} = 1;	2380	$self->{deny_save} = 1;
2255	$self->reset_timeout (1);	2381	$self->reset_timeout (1);
2256	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2382	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2257		2383
…		…
2314	: normalise $_	2440	: normalise $_
2315	} @{ aio_readdir $UNIQUEDIR or [] }	2441	} @{ aio_readdir $UNIQUEDIR or [] }
2316	]	2442	]
2317	}	2443	}
2318		2444
		2445	=item cf::map::static_maps
		2446
		2447	Returns an arrayref if paths of all static maps (all preinstalled F<.map>
		2448	file in the shared directory excluding F</styles> and F</editor>). May
		2449	block.
		2450
		2451	=cut
		2452
		2453	sub static_maps() {
		2454	my @dirs = "";
		2455	my @maps;
		2456
		2457	while (@dirs) {
		2458	my $dir = shift @dirs;
		2459
		2460	next if $dir eq "/styles" || $dir eq "/editor";
		2461
		2462	my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
		2463	or return;
		2464
		2465	for (@$files) {
		2466	s/\.map$// or next;
		2467	utf8::decode $_;
		2468	push @maps, "$dir/$_";
		2469	}
		2470
		2471	push @dirs, map "$dir/$_", @$dirs;
		2472	}
		2473
		2474	\@maps
		2475	}
		2476
2319	=back	2477	=back
2320		2478
2321	=head3 cf::object	2479	=head3 cf::object
2322		2480
2323	=cut	2481	=cut
…		…
2455		2613
2456	Freezes the player and moves him/her to a special map (C<{link}>).	2614	Freezes the player and moves him/her to a special map (C<{link}>).
2457		2615
2458	The player should be reasonably safe there for short amounts of time (e.g.	2616	The player should be reasonably safe there for short amounts of time (e.g.
2459	for loading a map). You I<MUST> call C<leave_link> as soon as possible,	2617	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2460	though, as the palyer cannot control the character while it is on the link	2618	though, as the player cannot control the character while it is on the link
2461	map.	2619	map.
2462		2620
2463	Will never block.	2621	Will never block.
2464		2622
2465	=item $player_object->leave_link ($map, $x, $y)	2623	=item $player_object->leave_link ($map, $x, $y)
…		…
2486	sub cf::object::player::enter_link {	2644	sub cf::object::player::enter_link {
2487	my ($self) = @_;	2645	my ($self) = @_;
2488		2646
2489	$self->deactivate_recursive;	2647	$self->deactivate_recursive;
2490		2648
		2649	++$self->{_link_recursion};
		2650
2491	return if UNIVERSAL::isa $self->map, "ext::map_link";	2651	return if UNIVERSAL::isa $self->map, "ext::map_link";
2492		2652
2493	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2653	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2494	if $self->map && $self->map->{path} ne "{link}";	2654	if $self->map && $self->map->{path} ne "{link}";
2495		2655
2496	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2656	$self->enter_map ($LINK_MAP || link_map, 3, 3);
2497	}	2657	}
2498		2658
2499	sub cf::object::player::leave_link {	2659	sub cf::object::player::leave_link {
2500	my ($self, $map, $x, $y) = @_;	2660	my ($self, $map, $x, $y) = @_;
2501		2661
…		…
2518	($x, $y) = (-1, -1)	2678	($x, $y) = (-1, -1)
2519	unless (defined $x) && (defined $y);	2679	unless (defined $x) && (defined $y);
2520		2680
2521	# use -1 or undef as default coordinates, not 0, 0	2681	# use -1 or undef as default coordinates, not 0, 0
2522	($x, $y) = ($map->enter_x, $map->enter_y)	2682	($x, $y) = ($map->enter_x, $map->enter_y)
2523	if $x <=0 && $y <= 0;	2683	if $x <= 0 && $y <= 0;
2524		2684
2525	$map->load;	2685	$map->load;
2526	$map->load_neighbours;	2686	$map->load_neighbours;
2527		2687
2528	return unless $self->contr->active;	2688	return unless $self->contr->active;
2529	$self->flag (cf::FLAG_DEBUG, 0);#d# temp
2530	$self->activate_recursive;
2531		2689
2532	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2690	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2533	$self->enter_map ($map, $x, $y);	2691	if ($self->enter_map ($map, $x, $y)) {
2534	}	2692	# entering was successful
		2693	delete $self->{_link_recursion};
		2694	# only activate afterwards, to support waiting in hooks
		2695	$self->activate_recursive;
		2696	}
2535		2697
		2698	}
		2699
2536	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2700	=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2537		2701
2538	Moves the player to the given map-path and coordinates by first freezing	2702	Moves the player to the given map-path and coordinates by first freezing
2539	her, loading and preparing them map, calling the provided $check callback	2703	her, loading and preparing them map, calling the provided $check callback
2540	that has to return the map if sucecssful, and then unfreezes the player on	2704	that has to return the map if sucecssful, and then unfreezes the player on
2541	the new (success) or old (failed) map position. In either case, $done will	2705	the new (success) or old (failed) map position. In either case, $done will
…		…
2548		2712
2549	our $GOTOGEN;	2713	our $GOTOGEN;
2550		2714
2551	sub cf::object::player::goto {	2715	sub cf::object::player::goto {
2552	my ($self, $path, $x, $y, $check, $done) = @_;	2716	my ($self, $path, $x, $y, $check, $done) = @_;
		2717
		2718	if ($self->{_link_recursion} >= $MAX_LINKS) {
		2719	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
		2720	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
		2721	($path, $x, $y) = @$EMERGENCY_POSITION;
		2722	}
2553		2723
2554	# do generation counting so two concurrent goto's will be executed in-order	2724	# do generation counting so two concurrent goto's will be executed in-order
2555	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2725	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2556		2726
2557	$self->enter_link;	2727	$self->enter_link;
…		…
2581	my $map = eval {	2751	my $map = eval {
2582	my $map = defined $path ? cf::map::find $path : undef;	2752	my $map = defined $path ? cf::map::find $path : undef;
2583		2753
2584	if ($map) {	2754	if ($map) {
2585	$map = $map->customise_for ($self);	2755	$map = $map->customise_for ($self);
2586	$map = $check->($map) if $check && $map;	2756	$map = $check->($map, $x, $y, $self) if $check && $map;
2587	} else {	2757	} else {
2588	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);	2758	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2589	}	2759	}
2590		2760
2591	$map	2761	$map
…		…
2599	if ($gen == $self->{_goto_generation}) {	2769	if ($gen == $self->{_goto_generation}) {
2600	delete $self->{_goto_generation};	2770	delete $self->{_goto_generation};
2601	$self->leave_link ($map, $x, $y);	2771	$self->leave_link ($map, $x, $y);
2602	}	2772	}
2603		2773
2604	$done->() if $done;	2774	$done->($self) if $done;
2605	})->prio (1);	2775	})->prio (1);
2606	}	2776	}
2607		2777
2608	=item $player_object->enter_exit ($exit_object)	2778	=item $player_object->enter_exit ($exit_object)
2609		2779
…		…
2702	$self->message ("Something went wrong deep within the deliantra server. "	2872	$self->message ("Something went wrong deep within the deliantra server. "
2703	. "I'll try to bring you back to the map you were before. "	2873	. "I'll try to bring you back to the map you were before. "
2704	. "Please report this to the dungeon master!",	2874	. "Please report this to the dungeon master!",
2705	cf::NDI_UNIQUE | cf::NDI_RED);	2875	cf::NDI_UNIQUE | cf::NDI_RED);
2706		2876
2707	warn "ERROR in enter_exit: $@";	2877	error "ERROR in enter_exit: $@";
2708	$self->leave_link;	2878	$self->leave_link;
2709	}	2879	}
2710	})->prio (1);	2880	})->prio (1);
2711	}	2881	}
2712		2882
…		…
2724	sub cf::client::send_drawinfo {	2894	sub cf::client::send_drawinfo {
2725	my ($self, $text, $flags) = @_;	2895	my ($self, $text, $flags) = @_;
2726		2896
2727	utf8::encode $text;	2897	utf8::encode $text;
2728	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2898	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
		2899	}
		2900
		2901	=item $client->send_big_packet ($pkt)
		2902
		2903	Like C<send_packet>, but tries to compress large packets, and fragments
		2904	them as required.
		2905
		2906	=cut
		2907
		2908	our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
		2909
		2910	sub cf::client::send_big_packet {
		2911	my ($self, $pkt) = @_;
		2912
		2913	# try lzf for large packets
		2914	$pkt = "lzf " . Compress::LZF::compress $pkt
		2915	if 1024 <= length $pkt and $self->{can_lzf};
		2916
		2917	# split very large packets
		2918	if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
		2919	$self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
		2920	$pkt = "frag";
		2921	}
		2922
		2923	$self->send_packet ($pkt);
2729	}	2924	}
2730		2925
2731	=item $client->send_msg ($channel, $msg, $color, [extra...])	2926	=item $client->send_msg ($channel, $msg, $color, [extra...])
2732		2927
2733	Send a drawinfo or msg packet to the client, formatting the msg for the	2928	Send a drawinfo or msg packet to the client, formatting the msg for the
…		…
2737		2932
2738	=cut	2933	=cut
2739		2934
2740	# non-persistent channels (usually the info channel)	2935	# non-persistent channels (usually the info channel)
2741	our %CHANNEL = (	2936	our %CHANNEL = (
		2937	"c/motd" => {
		2938	id => "infobox",
		2939	title => "MOTD",
		2940	reply => undef,
		2941	tooltip => "The message of the day",
		2942	},
2742	"c/identify" => {	2943	"c/identify" => {
2743	id => "infobox",	2944	id => "infobox",
2744	title => "Identify",	2945	title => "Identify",
2745	reply => undef,	2946	reply => undef,
2746	tooltip => "Items recently identified",	2947	tooltip => "Items recently identified",
…		…
2748	"c/examine" => {	2949	"c/examine" => {
2749	id => "infobox",	2950	id => "infobox",
2750	title => "Examine",	2951	title => "Examine",
2751	reply => undef,	2952	reply => undef,
2752	tooltip => "Signs and other items you examined",	2953	tooltip => "Signs and other items you examined",
		2954	},
		2955	"c/shopinfo" => {
		2956	id => "infobox",
		2957	title => "Shop Info",
		2958	reply => undef,
		2959	tooltip => "What your bargaining skill tells you about the shop",
2753	},	2960	},
2754	"c/book" => {	2961	"c/book" => {
2755	id => "infobox",	2962	id => "infobox",
2756	title => "Book",	2963	title => "Book",
2757	reply => undef,	2964	reply => undef,
…		…
2803	id => "infobox",	3010	id => "infobox",
2804	title => "Pets",	3011	title => "Pets",
2805	reply => undef,	3012	reply => undef,
2806	tooltip => "Shows information abotu your pets/a specific pet",	3013	tooltip => "Shows information abotu your pets/a specific pet",
2807	},	3014	},
		3015	"c/perceiveself" => {
		3016	id => "infobox",
		3017	title => "Perceive Self",
		3018	reply => undef,
		3019	tooltip => "You gained detailed knowledge about yourself",
		3020	},
2808	"c/uptime" => {	3021	"c/uptime" => {
2809	id => "infobox",	3022	id => "infobox",
2810	title => "Uptime",	3023	title => "Uptime",
2811	reply => undef,	3024	reply => undef,
2812	tooltip => "How long the server has been running since last restart",	3025	tooltip => "How long the server has been running since last restart",
…		…
2867	my $pkt = "msg "	3080	my $pkt = "msg "
2868	. $self->{json_coder}->encode (	3081	. $self->{json_coder}->encode (
2869	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]	3082	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2870	);	3083	);
2871		3084
2872	# try lzf for large packets
2873	$pkt = "lzf " . Compress::LZF::compress $pkt
2874	if 1024 <= length $pkt and $self->{can_lzf};
2875
2876	# split very large packets
2877	if (8192 < length $pkt and $self->{can_lzf}) {
2878	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2879	$pkt = "frag";
2880	}
2881
2882	$self->send_packet ($pkt);	3085	$self->send_big_packet ($pkt);
2883	}	3086	}
2884		3087
2885	=item $client->ext_msg ($type, @msg)	3088	=item $client->ext_msg ($type, @msg)
2886		3089
2887	Sends an ext event to the client.	3090	Sends an ext event to the client.
…		…
2890		3093
2891	sub cf::client::ext_msg($$@) {	3094	sub cf::client::ext_msg($$@) {
2892	my ($self, $type, @msg) = @_;	3095	my ($self, $type, @msg) = @_;
2893		3096
2894	if ($self->extcmd == 2) {	3097	if ($self->extcmd == 2) {
2895	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3098	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2896	} elsif ($self->extcmd == 1) { # TODO: remove	3099	} elsif ($self->extcmd == 1) { # TODO: remove
2897	push @msg, msgtype => "event_$type";	3100	push @msg, msgtype => "event_$type";
2898	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3101	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2899	}	3102	}
2900	}	3103	}
2901		3104
2902	=item $client->ext_reply ($msgid, @msg)	3105	=item $client->ext_reply ($msgid, @msg)
2903		3106
…		…
2907		3110
2908	sub cf::client::ext_reply($$@) {	3111	sub cf::client::ext_reply($$@) {
2909	my ($self, $id, @msg) = @_;	3112	my ($self, $id, @msg) = @_;
2910		3113
2911	if ($self->extcmd == 2) {	3114	if ($self->extcmd == 2) {
2912	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));	3115	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2913	} elsif ($self->extcmd == 1) {	3116	} elsif ($self->extcmd == 1) {
2914	#TODO: version 1, remove	3117	#TODO: version 1, remove
2915	unshift @msg, msgtype => "reply", msgid => $id;	3118	unshift @msg, msgtype => "reply", msgid => $id;
2916	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3119	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2917	}	3120	}
2918	}	3121	}
2919		3122
2920	=item $success = $client->query ($flags, "text", \&cb)	3123	=item $success = $client->query ($flags, "text", \&cb)
2921		3124
…		…
2992		3195
2993	$ns->ext_reply ($reply, @reply)	3196	$ns->ext_reply ($reply, @reply)
2994	if $reply;	3197	if $reply;
2995		3198
2996	} else {	3199	} else {
2997	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3200	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2998	}	3201	}
2999		3202
3000	cf::override;	3203	cf::override;
3001	},	3204	},
3002	);	3205	);
…		…
3022		3225
3023	$coro	3226	$coro
3024	}	3227	}
3025		3228
3026	cf::client->attach (	3229	cf::client->attach (
3027	on_destroy => sub {	3230	on_client_destroy => sub {
3028	my ($ns) = @_;	3231	my ($ns) = @_;
3029		3232
3030	$_->cancel for values %{ (delete $ns->{_coro}) || {} };	3233	$_->cancel for values %{ (delete $ns->{_coro}) || {} };
3031	},	3234	},
3032	);	3235	);
…		…
3048	our $safe_hole = new Safe::Hole;	3251	our $safe_hole = new Safe::Hole;
3049		3252
3050	$SIG{FPE} = 'IGNORE';	3253	$SIG{FPE} = 'IGNORE';
3051		3254
3052	$safe->permit_only (Opcode::opset qw(	3255	$safe->permit_only (Opcode::opset qw(
3053	:base_core :base_mem :base_orig :base_math	3256	:base_core :base_mem :base_orig :base_math :base_loop
3054	grepstart grepwhile mapstart mapwhile	3257	grepstart grepwhile mapstart mapwhile
3055	sort time	3258	sort time
3056	));	3259	));
3057		3260
3058	# here we export the classes and methods available to script code	3261	# here we export the classes and methods available to script code
…		…
3083	decrease split destroy change_exp value msg lore send_msg)],	3286	decrease split destroy change_exp value msg lore send_msg)],
3084	["cf::object::player" => qw(player)],	3287	["cf::object::player" => qw(player)],
3085	["cf::player" => qw(peaceful send_msg)],	3288	["cf::player" => qw(peaceful send_msg)],
3086	["cf::map" => qw(trigger)],	3289	["cf::map" => qw(trigger)],
3087	) {	3290	) {
3088	no strict 'refs';
3089	my ($pkg, @funs) = @$_;	3291	my ($pkg, @funs) = @$_;
3090	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3292	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3091	for @funs;	3293	for @funs;
3092	}	3294	}
3093		3295
…		…
3110	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3312	$qcode =~ s/"/‟/g; # not allowed in #line filenames
3111	$qcode =~ s/\n/\\n/g;	3313	$qcode =~ s/\n/\\n/g;
3112		3314
3113	%vars = (_dummy => 0) unless %vars;	3315	%vars = (_dummy => 0) unless %vars;
3114		3316
		3317	my @res;
3115	local $_;	3318	local $_;
3116	local @safe::cf::_safe_eval_args = values %vars;
3117		3319
3118	my $eval =	3320	my $eval =
3119	"do {\n"	3321	"do {\n"
3120	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"	3322	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3121	. "#line 0 \"{$qcode}\"\n"	3323	. "#line 0 \"{$qcode}\"\n"
3122	. $code	3324	. $code
3123	. "\n}"	3325	. "\n}"
3124	;	3326	;
3125		3327
		3328	if ($CFG{safe_eval}) {
3126	sub_generation_inc;	3329	sub_generation_inc;
		3330	local @safe::cf::_safe_eval_args = values %vars;
3127	my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);	3331	@res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3128	sub_generation_inc;	3332	sub_generation_inc;
		3333	} else {
		3334	local @cf::_safe_eval_args = values %vars;
		3335	@res = wantarray ? eval eval : scalar eval $eval;
		3336	}
3129		3337
3130	if ($@) {	3338	if ($@) {
3131	warn "$@";	3339	warn "$@",
3132	warn "while executing safe code '$code'\n";	3340	"while executing safe code '$code'\n",
3133	warn "with arguments " . (join " ", %vars) . "\n";	3341	"with arguments " . (join " ", %vars) . "\n";
3134	}	3342	}
3135		3343
3136	wantarray ? @res : $res[0]	3344	wantarray ? @res : $res[0]
3137	}	3345	}
3138		3346
…		…
3152	=cut	3360	=cut
3153		3361
3154	sub register_script_function {	3362	sub register_script_function {
3155	my ($fun, $cb) = @_;	3363	my ($fun, $cb) = @_;
3156		3364
3157	no strict 'refs';	3365	$fun = "safe::$fun" if $CFG{safe_eval};
3158	*{"safe::$fun"} = $safe_hole->wrap ($cb);	3366	*$fun = $safe_hole->wrap ($cb);
3159	}	3367	}
3160		3368
3161	=back	3369	=back
3162		3370
3163	=cut	3371	=cut
…		…
3172	# for this (global event?)	3380	# for this (global event?)
3173	%ext::player_env::MUSIC_FACE_CACHE = ();	3381	%ext::player_env::MUSIC_FACE_CACHE = ();
3174		3382
3175	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3383	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3176		3384
3177	warn "loading facedata from $path\n";	3385	trace "loading facedata from $path\n";
3178		3386
3179	my $facedata;
3180	0 < aio_load $path, $facedata	3387	0 < aio_load $path, my $facedata
3181	or die "$path: $!";	3388	or die "$path: $!";
3182		3389
3183	$facedata = Coro::Storable::thaw $facedata;	3390	$facedata = Coro::Storable::thaw $facedata;
3184		3391
3185	$facedata->{version} == 2	3392	$facedata->{version} == 2
3186	or cf::cleanup "$path: version mismatch, cannot proceed.";	3393	or cf::cleanup "$path: version mismatch, cannot proceed.";
3187		3394
3188	# patch in the exptable	3395	# patch in the exptable
		3396	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3189	$facedata->{resource}{"res/exp_table"} = {	3397	$facedata->{resource}{"res/exp_table"} = {
3190	type => FT_RSRC,	3398	type => FT_RSRC,
3191	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),	3399	data => $exp_table,
		3400	hash => (Digest::MD5::md5 $exp_table),
3192	};	3401	};
3193	cf::cede_to_tick;	3402	cf::cede_to_tick;
3194		3403
3195	{	3404	{
3196	my $faces = $facedata->{faceinfo};	3405	my $faces = $facedata->{faceinfo};
…		…
3198	while (my ($face, $info) = each %$faces) {	3407	while (my ($face, $info) = each %$faces) {
3199	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3408	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3200		3409
3201	cf::face::set_visibility $idx, $info->{visibility};	3410	cf::face::set_visibility $idx, $info->{visibility};
3202	cf::face::set_magicmap $idx, $info->{magicmap};	3411	cf::face::set_magicmap $idx, $info->{magicmap};
3203	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};	3412	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3204	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};	3413	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3205		3414
3206	cf::cede_to_tick;	3415	cf::cede_to_tick;
3207	}	3416	}
3208		3417
3209	while (my ($face, $info) = each %$faces) {	3418	while (my ($face, $info) = each %$faces) {
…		…
3214		3423
3215	if (my $smooth = cf::face::find $info->{smooth}) {	3424	if (my $smooth = cf::face::find $info->{smooth}) {
3216	cf::face::set_smooth $idx, $smooth;	3425	cf::face::set_smooth $idx, $smooth;
3217	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3426	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3218	} else {	3427	} else {
3219	warn "smooth face '$info->{smooth}' not found for face '$face'";	3428	error "smooth face '$info->{smooth}' not found for face '$face'";
3220	}	3429	}
3221		3430
3222	cf::cede_to_tick;	3431	cf::cede_to_tick;
3223	}	3432	}
3224	}	3433	}
…		…
3233		3442
3234	cf::anim::invalidate_all; # d'oh	3443	cf::anim::invalidate_all; # d'oh
3235	}	3444	}
3236		3445
3237	{	3446	{
3238	# TODO: for gcfclient pleasure, we should give resources
3239	# that gcfclient doesn't grok a >10000 face index.
3240	my $res = $facedata->{resource};	3447	my $res = $facedata->{resource};
3241		3448
3242	while (my ($name, $info) = each %$res) {	3449	while (my ($name, $info) = each %$res) {
3243	if (defined $info->{type}) {	3450	if (defined $info->{type}) {
3244	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3451	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3245	my $data;
3246		3452
3247	if ($info->{type} & 1) {	3453	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3248	# prepend meta info
3249
3250	my $meta = $enc->encode ({
3251	name => $name,
3252	%{ $info->{meta} || {} },
3253	});
3254
3255	$data = pack "(w/a*)*", $meta, $info->{data};
3256	} else {
3257	$data = $info->{data};
3258	}
3259
3260	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3261	cf::face::set_type $idx, $info->{type};	3454	cf::face::set_type $idx, $info->{type};
3262	} else {	3455	} else {
3263	$RESOURCE{$name} = $info;	3456	$RESOURCE{$name} = $info; # unused
3264	}	3457	}
3265		3458
3266	cf::cede_to_tick;	3459	cf::cede_to_tick;
3267	}	3460	}
3268	}	3461	}
3269		3462
3270	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3463	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3271		3464
3272	1	3465	1
3273	}	3466	}
3274
3275	cf::global->attach (on_resource_update => sub {
3276	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3277	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3278
3279	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3280	my $sound = $soundconf->{compat}[$_]
3281	or next;
3282
3283	my $face = cf::face::find "sound/$sound->[1]";
3284	cf::sound::set $sound->[0] => $face;
3285	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3286	}
3287
3288	while (my ($k, $v) = each %{$soundconf->{event}}) {
3289	my $face = cf::face::find "sound/$v";
3290	cf::sound::set $k => $face;
3291	}
3292	}
3293	});
3294		3467
3295	register_exticmd fx_want => sub {	3468	register_exticmd fx_want => sub {
3296	my ($ns, $want) = @_;	3469	my ($ns, $want) = @_;
3297		3470
3298	while (my ($k, $v) = each %$want) {	3471	while (my ($k, $v) = each %$want) {
…		…
3337	sub reload_treasures {	3510	sub reload_treasures {
3338	load_resource_file "$DATADIR/treasures"	3511	load_resource_file "$DATADIR/treasures"
3339	or die "unable to load treasurelists\n";	3512	or die "unable to load treasurelists\n";
3340	}	3513	}
3341		3514
		3515	sub reload_sound {
		3516	trace "loading sound config from $DATADIR/sound\n";
		3517
		3518	0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
		3519	or die "$DATADIR/sound $!";
		3520
		3521	my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
		3522
		3523	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3524	my $sound = $soundconf->{compat}[$_]
		3525	or next;
		3526
		3527	my $face = cf::face::find "sound/$sound->[1]";
		3528	cf::sound::set $sound->[0] => $face;
		3529	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3530	}
		3531
		3532	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3533	my $face = cf::face::find "sound/$v";
		3534	cf::sound::set $k => $face;
		3535	}
		3536	}
		3537
3342	sub reload_resources {	3538	sub reload_resources {
3343	warn "reloading resource files...\n";	3539	trace "reloading resource files...\n";
3344		3540
		3541	reload_exp_table;
		3542	reload_materials;
3345	reload_facedata;	3543	reload_facedata;
		3544	reload_sound;
3346	reload_archetypes;	3545	reload_archetypes;
3347	reload_regions;	3546	reload_regions;
3348	reload_treasures;	3547	reload_treasures;
3349		3548
3350	warn "finished reloading resource files\n";	3549	trace "finished reloading resource files\n";
3351	}	3550	}
3352		3551
3353	sub reload_config {	3552	sub reload_config {
3354	open my $fh, "<:utf8", "$CONFDIR/config"	3553	trace "reloading config file...\n";
3355	or return;
3356		3554
3357	local $/;	3555	0 < aio_load "$CONFDIR/config", my $config
		3556	or die "$CONFDIR/config: $!";
		3557
		3558	utf8::decode $config;
		3559
		3560	cf::get_slot 0.1, 10, "reload_config"; # yaml might be slow...
3358	*CFG = YAML::Load <$fh>;	3561	*CFG = YAML::XS::Load $config;
3359		3562
3360	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3563	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3361		3564
3362	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3565	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3363	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3566	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3364		3567
3365	if (exists $CFG{mlockall}) {	3568	if (exists $CFG{mlockall}) {
…		…
3388		3591
3389	seek $fh, 0, 0;	3592	seek $fh, 0, 0;
3390	print $fh $$;	3593	print $fh $$;
3391	}	3594	}
3392		3595
		3596	sub main_loop {
		3597	trace "EV::loop starting\n";
		3598	if (1) {
		3599	EV::loop;
		3600	}
		3601	trace "EV::loop returned\n";
		3602	goto &main_loop unless $REALLY_UNLOOP;
		3603	}
		3604
3393	sub main {	3605	sub main {
3394	cf::init_globals; # initialise logging	3606	cf::init_globals; # initialise logging
3395		3607
3396	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3608	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3397	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3609	LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3398	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3610	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3399	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3611	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3400
3401	cf::init_experience;
3402	cf::init_anim;
3403	cf::init_attackmess;
3404	cf::init_dynamic;
3405		3612
3406	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3613	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3407		3614
3408	# we must not ever block the main coroutine	3615	# we must not ever block the main coroutine
3409	local $Coro::idle = sub {	3616	local $Coro::idle = sub {
…		…
3415	};	3622	};
3416		3623
3417	evthread_start IO::AIO::poll_fileno;	3624	evthread_start IO::AIO::poll_fileno;
3418		3625
3419	cf::sync_job {	3626	cf::sync_job {
		3627	cf::incloader::init ();
		3628
		3629	cf::init_anim;
		3630	cf::init_attackmess;
		3631	cf::init_dynamic;
		3632
		3633	cf::load_settings;
		3634
3420	reload_resources;	3635	reload_resources;
3421	reload_config;	3636	reload_config;
3422	db_init;	3637	db_init;
3423		3638
3424	cf::load_settings;
3425	cf::load_materials;
3426	cf::init_uuid;	3639	cf::init_uuid;
3427	cf::init_signals;	3640	cf::init_signals;
3428	cf::init_commands;
3429	cf::init_skills;	3641	cf::init_skills;
3430		3642
3431	cf::init_beforeplay;	3643	cf::init_beforeplay;
3432		3644
3433	atomic;	3645	atomic;
…		…
3435	load_extensions;	3647	load_extensions;
3436		3648
3437	utime time, time, $RUNTIMEFILE;	3649	utime time, time, $RUNTIMEFILE;
3438		3650
3439	# no (long-running) fork's whatsoever before this point(!)	3651	# no (long-running) fork's whatsoever before this point(!)
		3652	use POSIX ();
3440	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3653	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3441		3654
3442	(pop @POST_INIT)->(0) while @POST_INIT;	3655	(pop @POST_INIT)->(0) while @POST_INIT;
3443	};	3656	};
3444		3657
3445	EV::loop;	3658	cf::object::thawer::errors_are_fatal 0;
		3659	info "parse errors in files are no longer fatal from this point on.\n";
		3660
		3661	my $free_main; $free_main = EV::idle sub {
		3662	undef $free_main;
		3663	undef &main; # free gobs of memory :)
		3664	};
		3665
		3666	goto &main_loop;
3446	}	3667	}
3447		3668
3448	#############################################################################	3669	#############################################################################
3449	# initialisation and cleanup	3670	# initialisation and cleanup
3450		3671
3451	# install some emergency cleanup handlers	3672	# install some emergency cleanup handlers
3452	BEGIN {	3673	BEGIN {
3453	our %SIGWATCHER = ();	3674	our %SIGWATCHER = ();
3454	for my $signal (qw(INT HUP TERM)) {	3675	for my $signal (qw(INT HUP TERM)) {
3455	$SIGWATCHER{$signal} = EV::signal $signal, sub {	3676	$SIGWATCHER{$signal} = AE::signal $signal, sub {
3456	cf::cleanup "SIG$signal";	3677	cf::cleanup "SIG$signal";
3457	};	3678	};
3458	}	3679	}
3459	}	3680	}
3460		3681
3461	sub write_runtime_sync {	3682	sub write_runtime_sync {
		3683	my $t0 = AE::time;
		3684
3462	# first touch the runtime file to show we are still running:	3685	# first touch the runtime file to show we are still running:
3463	# the fsync below can take a very very long time.	3686	# the fsync below can take a very very long time.
3464		3687
3465	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;	3688	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3466		3689
3467	my $guard = cf::lock_acquire "write_runtime";	3690	my $guard = cf::lock_acquire "write_runtime";
3468		3691
3469	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644	3692	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3470	or return;	3693	or return;
3471		3694
3472	my $value = $cf::RUNTIME + 90 + 10;	3695	my $value = $cf::RUNTIME + 90 + 10;
3473	# 10 is the runtime save interval, for a monotonic clock	3696	# 10 is the runtime save interval, for a monotonic clock
3474	# 60 allows for the watchdog to kill the server.	3697	# 60 allows for the watchdog to kill the server.
…		…
3487	or return;	3710	or return;
3488		3711
3489	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3712	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3490	and return;	3713	and return;
3491		3714
3492	warn "runtime file written.\n";	3715	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3493		3716
3494	1	3717	1
3495	}	3718	}
3496		3719
3497	our $uuid_lock;	3720	our $uuid_lock;
…		…
3509	or return;	3732	or return;
3510		3733
3511	my $value = uuid_seq uuid_cur;	3734	my $value = uuid_seq uuid_cur;
3512		3735
3513	unless ($value) {	3736	unless ($value) {
3514	warn "cowardly refusing to write zero uuid value!\n";	3737	info "cowardly refusing to write zero uuid value!\n";
3515	return;	3738	return;
3516	}	3739	}
3517		3740
3518	my $value = uuid_str $value + $uuid_skip;	3741	my $value = uuid_str $value + $uuid_skip;
3519	$uuid_skip = 0;	3742	$uuid_skip = 0;
…		…
3529	or return;	3752	or return;
3530		3753
3531	aio_rename "$uuid~", $uuid	3754	aio_rename "$uuid~", $uuid
3532	and return;	3755	and return;
3533		3756
3534	warn "uuid file written ($value).\n";	3757	trace "uuid file written ($value).\n";
3535		3758
3536	1	3759	1
3537		3760
3538	}	3761	}
3539		3762
…		…
3545	}	3768	}
3546		3769
3547	sub emergency_save() {	3770	sub emergency_save() {
3548	my $freeze_guard = cf::freeze_mainloop;	3771	my $freeze_guard = cf::freeze_mainloop;
3549		3772
3550	warn "emergency_perl_save: enter\n";	3773	info "emergency_perl_save: enter\n";
		3774
		3775	# this is a trade-off: we want to be very quick here, so
		3776	# save all maps without fsync, and later call a global sync
		3777	# (which in turn might be very very slow)
		3778	local $USE_FSYNC = 0;
3551		3779
3552	cf::sync_job {	3780	cf::sync_job {
3553	# this is a trade-off: we want to be very quick here, so	3781	cf::write_runtime_sync; # external watchdog should not bark
3554	# save all maps without fsync, and later call a global sync
3555	# (which in turn might be very very slow)
3556	local $USE_FSYNC = 0;
3557		3782
3558	# use a peculiar iteration method to avoid tripping on perl	3783	# use a peculiar iteration method to avoid tripping on perl
3559	# refcount bugs in for. also avoids problems with players	3784	# refcount bugs in for. also avoids problems with players
3560	# and maps saved/destroyed asynchronously.	3785	# and maps saved/destroyed asynchronously.
3561	warn "emergency_perl_save: begin player save\n";	3786	info "emergency_perl_save: begin player save\n";
3562	for my $login (keys %cf::PLAYER) {	3787	for my $login (keys %cf::PLAYER) {
3563	my $pl = $cf::PLAYER{$login} or next;	3788	my $pl = $cf::PLAYER{$login} or next;
3564	$pl->valid or next;	3789	$pl->valid or next;
3565	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3790	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3566	$pl->save;	3791	$pl->save;
3567	}	3792	}
3568	warn "emergency_perl_save: end player save\n";	3793	info "emergency_perl_save: end player save\n";
3569		3794
		3795	cf::write_runtime_sync; # external watchdog should not bark
		3796
3570	warn "emergency_perl_save: begin map save\n";	3797	info "emergency_perl_save: begin map save\n";
3571	for my $path (keys %cf::MAP) {	3798	for my $path (keys %cf::MAP) {
3572	my $map = $cf::MAP{$path} or next;	3799	my $map = $cf::MAP{$path} or next;
3573	$map->valid or next;	3800	$map->valid or next;
3574	$map->save;	3801	$map->save;
3575	}	3802	}
3576	warn "emergency_perl_save: end map save\n";	3803	info "emergency_perl_save: end map save\n";
3577		3804
		3805	cf::write_runtime_sync; # external watchdog should not bark
		3806
3578	warn "emergency_perl_save: begin database checkpoint\n";	3807	info "emergency_perl_save: begin database checkpoint\n";
3579	BDB::db_env_txn_checkpoint $DB_ENV;	3808	BDB::db_env_txn_checkpoint $DB_ENV;
3580	warn "emergency_perl_save: end database checkpoint\n";	3809	info "emergency_perl_save: end database checkpoint\n";
3581		3810
3582	warn "emergency_perl_save: begin write uuid\n";	3811	info "emergency_perl_save: begin write uuid\n";
3583	write_uuid_sync 1;	3812	write_uuid_sync 1;
3584	warn "emergency_perl_save: end write uuid\n";	3813	info "emergency_perl_save: end write uuid\n";
		3814
		3815	cf::write_runtime_sync; # external watchdog should not bark
		3816
		3817	trace "emergency_perl_save: syncing database to disk";
		3818	BDB::db_env_txn_checkpoint $DB_ENV;
		3819
		3820	info "emergency_perl_save: starting sync\n";
		3821	IO::AIO::aio_sync sub {
		3822	info "emergency_perl_save: finished sync\n";
		3823	};
		3824
		3825	cf::write_runtime_sync; # external watchdog should not bark
		3826
		3827	trace "emergency_perl_save: flushing outstanding aio requests";
		3828	while (IO::AIO::nreqs || BDB::nreqs) {
		3829	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
		3830	}
		3831
		3832	cf::write_runtime_sync; # external watchdog should not bark
3585	};	3833	};
3586		3834
3587	warn "emergency_perl_save: starting sync()\n";
3588	IO::AIO::aio_sync sub {
3589	warn "emergency_perl_save: finished sync()\n";
3590	};
3591
3592	warn "emergency_perl_save: leave\n";	3835	info "emergency_perl_save: leave\n";
3593	}	3836	}
3594		3837
3595	sub post_cleanup {	3838	sub post_cleanup {
3596	my ($make_core) = @_;	3839	my ($make_core) = @_;
3597		3840
		3841	IO::AIO::flush;
		3842
3598	warn Carp::longmess "post_cleanup backtrace"	3843	error Carp::longmess "post_cleanup backtrace"
3599	if $make_core;	3844	if $make_core;
3600		3845
3601	my $fh = pidfile;	3846	my $fh = pidfile;
3602	unlink $PIDFILE if <$fh> == $$;	3847	unlink $PIDFILE if <$fh> == $$;
3603	}	3848	}
…		…
3623	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	3868	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3624	for my $name (keys %$leaf_symtab) {	3869	for my $name (keys %$leaf_symtab) {
3625	_gv_clear *{"$pkg$name"};	3870	_gv_clear *{"$pkg$name"};
3626	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	3871	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3627	}	3872	}
3628	warn "cleared package $pkg\n";#d#
3629	}	3873	}
3630		3874
3631	sub do_reload_perl() {	3875	sub do_reload_perl() {
3632	# can/must only be called in main	3876	# can/must only be called in main
3633	if ($Coro::current != $Coro::main) {	3877	unless (in_main) {
3634	warn "can only reload from main coroutine";	3878	error "can only reload from main coroutine";
3635	return;	3879	return;
3636	}	3880	}
3637		3881
3638	return if $RELOAD++;	3882	return if $RELOAD++;
3639		3883
3640	my $t1 = EV::time;	3884	my $t1 = AE::time;
3641		3885
3642	while ($RELOAD) {	3886	while ($RELOAD) {
		3887	cf::get_slot 0.1, -1, "reload_perl";
3643	warn "reloading...";	3888	info "reloading...";
3644		3889
3645	warn "entering sync_job";	3890	trace "entering sync_job";
3646		3891
3647	cf::sync_job {	3892	cf::sync_job {
3648	cf::write_runtime_sync; # external watchdog should not bark
3649	cf::emergency_save;	3893	#cf::emergency_save;
3650	cf::write_runtime_sync; # external watchdog should not bark
3651		3894
3652	warn "syncing database to disk";
3653	BDB::db_env_txn_checkpoint $DB_ENV;
3654
3655	# if anything goes wrong in here, we should simply crash as we already saved
3656
3657	warn "flushing outstanding aio requests";
3658	while (IO::AIO::nreqs || BDB::nreqs) {
3659	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3660	}
3661
3662	warn "cancelling all extension coros";	3895	trace "cancelling all extension coros";
3663	$_->cancel for values %EXT_CORO;	3896	$_->cancel for values %EXT_CORO;
3664	%EXT_CORO = ();	3897	%EXT_CORO = ();
3665		3898
3666	warn "removing commands";	3899	trace "removing commands";
3667	%COMMAND = ();	3900	%COMMAND = ();
3668		3901
3669	warn "removing ext/exti commands";	3902	trace "removing ext/exti commands";
3670	%EXTCMD = ();	3903	%EXTCMD = ();
3671	%EXTICMD = ();	3904	%EXTICMD = ();
3672		3905
3673	warn "unloading/nuking all extensions";	3906	trace "unloading/nuking all extensions";
3674	for my $pkg (@EXTS) {	3907	for my $pkg (@EXTS) {
3675	warn "... unloading $pkg";	3908	trace "... unloading $pkg";
3676		3909
3677	if (my $cb = $pkg->can ("unload")) {	3910	if (my $cb = $pkg->can ("unload")) {
3678	eval {	3911	eval {
3679	$cb->($pkg);	3912	$cb->($pkg);
3680	1	3913	1
3681	} or warn "$pkg unloaded, but with errors: $@";	3914	} or error "$pkg unloaded, but with errors: $@";
3682	}	3915	}
3683		3916
3684	warn "... clearing $pkg";	3917	trace "... clearing $pkg";
3685	clear_package $pkg;	3918	clear_package $pkg;
3686	}	3919	}
3687		3920
3688	warn "unloading all perl modules loaded from $LIBDIR";	3921	trace "unloading all perl modules loaded from $LIBDIR";
3689	while (my ($k, $v) = each %INC) {	3922	while (my ($k, $v) = each %INC) {
3690	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	3923	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3691		3924
3692	warn "... unloading $k";	3925	trace "... unloading $k";
3693	delete $INC{$k};	3926	delete $INC{$k};
3694		3927
3695	$k =~ s/\.pm$//;	3928	$k =~ s/\.pm$//;
3696	$k =~ s/\//::/g;	3929	$k =~ s/\//::/g;
3697		3930
…		…
3700	}	3933	}
3701		3934
3702	clear_package $k;	3935	clear_package $k;
3703	}	3936	}
3704		3937
3705	warn "getting rid of safe::, as good as possible";	3938	trace "getting rid of safe::, as good as possible";
3706	clear_package "safe::$_"	3939	clear_package "safe::$_"
3707	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	3940	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3708		3941
3709	warn "unloading cf.pm \"a bit\"";	3942	trace "unloading cf.pm \"a bit\"";
3710	delete $INC{"cf.pm"};	3943	delete $INC{"cf.pm"};
3711	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	3944	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3712		3945
3713	# don't, removes xs symbols, too,	3946	# don't, removes xs symbols, too,
3714	# and global variables created in xs	3947	# and global variables created in xs
3715	#clear_package __PACKAGE__;	3948	#clear_package __PACKAGE__;
3716		3949
3717	warn "unload completed, starting to reload now";	3950	info "unload completed, starting to reload now";
3718		3951
3719	warn "reloading cf.pm";	3952	trace "reloading cf.pm";
3720	require cf;	3953	require cf;
3721	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3954	cf::_connect_to_perl_1;
3722		3955
3723	warn "loading config and database again";	3956	trace "loading config and database again";
3724	cf::reload_config;	3957	cf::reload_config;
3725		3958
3726	warn "loading extensions";	3959	trace "loading extensions";
3727	cf::load_extensions;	3960	cf::load_extensions;
3728		3961
3729	if ($REATTACH_ON_RELOAD) {	3962	if ($REATTACH_ON_RELOAD) {
3730	warn "reattaching attachments to objects/players";	3963	trace "reattaching attachments to objects/players";
3731	_global_reattach; # objects, sockets	3964	_global_reattach; # objects, sockets
3732	warn "reattaching attachments to maps";	3965	trace "reattaching attachments to maps";
3733	reattach $_ for values %MAP;	3966	reattach $_ for values %MAP;
3734	warn "reattaching attachments to players";	3967	trace "reattaching attachments to players";
3735	reattach $_ for values %PLAYER;	3968	reattach $_ for values %PLAYER;
3736	}	3969	}
3737		3970
3738	warn "running post_init jobs";	3971	trace "running post_init jobs";
3739	(pop @POST_INIT)->(1) while @POST_INIT;	3972	(pop @POST_INIT)->(1) while @POST_INIT;
3740		3973
3741	warn "leaving sync_job";	3974	trace "leaving sync_job";
3742		3975
3743	1	3976	1
3744	} or do {	3977	} or do {
3745	warn $@;	3978	error $@;
3746	cf::cleanup "error while reloading, exiting.";	3979	cf::cleanup "error while reloading, exiting.";
3747	};	3980	};
3748		3981
3749	warn "reloaded";	3982	info "reloaded";
3750	--$RELOAD;	3983	--$RELOAD;
3751	}	3984	}
3752		3985
3753	$t1 = EV::time - $t1;	3986	$t1 = AE::time - $t1;
3754	warn "reload completed in ${t1}s\n";	3987	info "reload completed in ${t1}s\n";
3755	};	3988	};
3756		3989
3757	our $RELOAD_WATCHER; # used only during reload	3990	our $RELOAD_WATCHER; # used only during reload
3758		3991
3759	sub reload_perl() {	3992	sub reload_perl() {
…		…
3761	# coro crashes during coro_state_free->destroy here.	3994	# coro crashes during coro_state_free->destroy here.
3762		3995
3763	$RELOAD_WATCHER ||= cf::async {	3996	$RELOAD_WATCHER ||= cf::async {
3764	Coro::AIO::aio_wait cache_extensions;	3997	Coro::AIO::aio_wait cache_extensions;
3765		3998
3766	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {	3999	$RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3767	do_reload_perl;	4000	do_reload_perl;
3768	undef $RELOAD_WATCHER;	4001	undef $RELOAD_WATCHER;
3769	};	4002	};
3770	};	4003	};
3771	}	4004	}
…		…
3780	reload_perl;	4013	reload_perl;
3781	};	4014	};
3782	}	4015	}
3783	};	4016	};
3784		4017
3785	unshift @INC, $LIBDIR;	4018	#############################################################################
3786		4019
3787	my $bug_warning = 0;	4020	my $bug_warning = 0;
3788		4021
3789	our @WAIT_FOR_TICK;	4022	our @WAIT_FOR_TICK;
3790	our @WAIT_FOR_TICK_BEGIN;	4023	our @WAIT_FOR_TICK_BEGIN;
3791		4024
3792	sub wait_for_tick {	4025	sub wait_for_tick() {
3793	return if tick_inhibit || $Coro::current == $Coro::main;	4026	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3794		4027
3795	my $signal = new Coro::Signal;	4028	my $signal = new Coro::Signal;
3796	push @WAIT_FOR_TICK, $signal;	4029	push @WAIT_FOR_TICK, $signal;
3797	$signal->wait;	4030	$signal->wait;
3798	}	4031	}
3799		4032
3800	sub wait_for_tick_begin {	4033	sub wait_for_tick_begin() {
3801	return if tick_inhibit || $Coro::current == $Coro::main;	4034	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3802		4035
3803	my $signal = new Coro::Signal;	4036	my $signal = new Coro::Signal;
3804	push @WAIT_FOR_TICK_BEGIN, $signal;	4037	push @WAIT_FOR_TICK_BEGIN, $signal;
3805	$signal->wait;	4038	$signal->wait;
3806	}	4039	}
…		…
3812	return;	4045	return;
3813	}	4046	}
3814		4047
3815	cf::server_tick; # one server iteration	4048	cf::server_tick; # one server iteration
3816		4049
		4050	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
		4051
3817	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4052	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3818	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4053	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3819	Coro::async_pool {	4054	Coro::async_pool {
3820	$Coro::current->{desc} = "runtime saver";	4055	$Coro::current->{desc} = "runtime saver";
3821	write_runtime_sync	4056	write_runtime_sync
3822	or warn "ERROR: unable to write runtime file: $!";	4057	or error "ERROR: unable to write runtime file: $!";
3823	};	4058	};
3824	}	4059	}
3825		4060
3826	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4061	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3827	$sig->send;	4062	$sig->send;
…		…
3835		4070
3836	if (0) {	4071	if (0) {
3837	if ($NEXT_TICK) {	4072	if ($NEXT_TICK) {
3838	my $jitter = $TICK_START - $NEXT_TICK;	4073	my $jitter = $TICK_START - $NEXT_TICK;
3839	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4074	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
3840	warn "jitter $JITTER\n";#d#	4075	debug "jitter $JITTER\n";#d#
3841	}	4076	}
3842	}	4077	}
3843	}	4078	}
3844		4079
3845	{	4080	{
3846	# configure BDB	4081	# configure BDB
3847		4082
3848	BDB::min_parallel 8;	4083	BDB::min_parallel 16;
3849	BDB::max_poll_reqs $TICK * 0.1;	4084	BDB::max_poll_reqs $TICK * 0.1;
3850	$AnyEvent::BDB::WATCHER->priority (1);	4085	$AnyEvent::BDB::WATCHER->priority (1);
3851		4086
3852	unless ($DB_ENV) {	4087	unless ($DB_ENV) {
3853	$DB_ENV = BDB::db_env_create;	4088	$DB_ENV = BDB::db_env_create;
…		…
3934	}	4169	}
3935	}	4170	}
3936		4171
3937	# load additional modules	4172	# load additional modules
3938	require "cf/$_.pm" for @EXTRA_MODULES;	4173	require "cf/$_.pm" for @EXTRA_MODULES;
		4174	cf::_connect_to_perl_2;
3939		4175
3940	END { cf::emergency_save }	4176	END { cf::emergency_save }
3941		4177
3942	1	4178	1
3943		4179

Diff Legend

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