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.533 by root, Thu Apr 29 07:59:17 2010 UTC vs.
Revision 1.590 by root, Sun Nov 4 02:20:11 2012 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,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	#	5	#
6	# Deliantra is free software: you can redistribute it and/or modify it under	6	# Deliantra is free software: you can redistribute it and/or modify it under
7	# the terms of the Affero GNU General Public License as published by the	7	# the terms of the Affero GNU General Public License as published by the
8	# Free Software Foundation, either version 3 of the License, or (at your	8	# Free Software Foundation, either version 3 of the License, or (at your
9	# 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 Affero GNU General Public License	16	# You should have received a copy of the Affero GNU General Public License
17	# and the GNU General Public License along with this program. If not, see	17	# and the GNU General Public License along with this program. If not, see
18	# <http://www.gnu.org/licenses/>.	18	# <http://www.gnu.org/licenses/>.
19	#	19	#
20	# 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>
21	#	21	#
22		22
23	package cf;	23	package cf;
24		24
25	use 5.10.0;	25	use common::sense;
26	use utf8;
27	use strict qw(vars subs);
28		26
29	use Symbol;	27	use Symbol;
30	use List::Util;	28	use List::Util;
31	use Socket;	29	use Socket;
32	use EV;	30	use EV;
…		…
34	use Safe;	32	use Safe;
35	use Safe::Hole;	33	use Safe::Hole;
36	use Storable ();	34	use Storable ();
37	use Carp ();	35	use Carp ();
38		36
39	use Guard ();	37	use AnyEvent ();
		38	use AnyEvent::IO ();
		39	use AnyEvent::DNS ();
		40
40	use Coro ();	41	use Coro ();
41	use Coro::State;	42	use Coro::State;
42	use Coro::Handle;	43	use Coro::Handle;
43	use Coro::EV;	44	use Coro::EV;
44	use Coro::AnyEvent;	45	use Coro::AnyEvent;
…		…
50	use Coro::AIO;	51	use Coro::AIO;
51	use Coro::BDB 1.6;	52	use Coro::BDB 1.6;
52	use Coro::Storable;	53	use Coro::Storable;
53	use Coro::Util ();	54	use Coro::Util ();
54		55
		56	use Guard ();
55	use JSON::XS 2.01 ();	57	use JSON::XS 2.01 ();
56	use BDB ();	58	use BDB ();
57	use Data::Dumper;	59	use Data::Dumper;
58	use Fcntl;	60	use Fcntl;
59	use YAML::XS ();	61	use YAML::XS ();
…		…
78	# strictly for debugging	80	# strictly for debugging
79	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };	81	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80		82
81	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	83	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82		84
		85	our @ORIG_INC;
		86
83	our %COMMAND = ();	87	our %COMMAND = ();
84	our %COMMAND_TIME = ();	88	our %COMMAND_TIME = ();
85		89
86	our @EXTS = (); # list of extension package names	90	our @EXTS = (); # list of extension package names
87	our %EXTCMD = ();	91	our %EXTCMD = ();
…		…
93	our @EVENT;	97	our @EVENT;
94	our @REFLECT; # set by XS	98	our @REFLECT; # set by XS
95	our %REFLECT; # set by us	99	our %REFLECT; # set by us
96		100
97	our $CONFDIR = confdir;	101	our $CONFDIR = confdir;
		102
98	our $DATADIR = datadir;	103	our $DATADIR = datadir;
99	our $LIBDIR = "$DATADIR/ext";	104	our $LIBDIR = "$DATADIR/ext";
100	our $PODDIR = "$DATADIR/pod";	105	our $PODDIR = "$DATADIR/pod";
101	our $MAPDIR = "$DATADIR/" . mapdir;	106	our $MAPDIR = "$DATADIR/" . mapdir;
		107
102	our $LOCALDIR = localdir;	108	our $LOCALDIR = localdir;
103	our $TMPDIR = "$LOCALDIR/" . tmpdir;	109	our $TMPDIR = "$LOCALDIR/" . tmpdir;
104	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	110	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	111	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106	our $RANDOMDIR = "$LOCALDIR/random";	112	our $RANDOMDIR = "$LOCALDIR/random";
107	our $BDBDIR = "$LOCALDIR/db";	113	our $BDBDIR = "$LOCALDIR/db";
108	our $PIDFILE = "$LOCALDIR/pid";	114	our $PIDFILE = "$LOCALDIR/pid";
109	our $RUNTIMEFILE = "$LOCALDIR/runtime";	115	our $RUNTIMEFILE = "$LOCALDIR/runtime";
110		116
111	our %RESOURCE; # unused	117	#our %RESOURCE; # unused
112		118
113	our $OUTPUT_RATE_MIN = 3000;	119	our $OUTPUT_RATE_MIN = 3000;
114	our $OUTPUT_RATE_MAX = 1000000;	120	our $OUTPUT_RATE_MAX = 1000000;
115		121
116	our $MAX_LINKS = 32; # how many chained exits to follow	122	our $MAX_LINKS = 32; # how many chained exits to follow
…		…
124	our $BDB_DEADLOCK_WATCHER;	130	our $BDB_DEADLOCK_WATCHER;
125	our $BDB_CHECKPOINT_WATCHER;	131	our $BDB_CHECKPOINT_WATCHER;
126	our $BDB_TRICKLE_WATCHER;	132	our $BDB_TRICKLE_WATCHER;
127	our $DB_ENV;	133	our $DB_ENV;
128		134
129	our @EXTRA_MODULES = qw(pod match mapscript);	135	our @EXTRA_MODULES = qw(pod match mapscript incloader);
130		136
131	our %CFG;	137	our %CFG;
		138	our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
132		139
133	our $UPTIME; $UPTIME ||= time;	140	our $UPTIME; $UPTIME ||= time;
134	our $RUNTIME;	141	our $RUNTIME = 0;
		142	our $SERVER_TICK = 0;
135	our $NOW;	143	our $NOW;
136		144
137	our (%PLAYER, %PLAYER_LOADING); # all users	145	our (%PLAYER, %PLAYER_LOADING); # all users
138	our (%MAP, %MAP_LOADING ); # all maps	146	our (%MAP, %MAP_LOADING ); # all maps
139	our $LINK_MAP; # the special {link} map, which is always available	147	our $LINK_MAP; # the special {link} map, which is always available
…		…
148		156
149	our @POST_INIT;	157	our @POST_INIT;
150		158
151	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)	159	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152	our $REALLY_UNLOOP; # never set to true, please :)	160	our $REALLY_UNLOOP; # never set to true, please :)
		161
		162	our $WAIT_FOR_TICK = new Coro::Signal;
		163	our @WAIT_FOR_TICK_BEGIN;
153		164
154	binmode STDOUT;	165	binmode STDOUT;
155	binmode STDERR;	166	binmode STDERR;
156		167
157	# read virtual server time, if available	168	# read virtual server time, if available
…		…
191		202
192	=over 4	203	=over 4
193		204
194	=item $cf::UPTIME	205	=item $cf::UPTIME
195		206
196	The timestamp of the server start (so not actually an uptime).	207	The timestamp of the server start (so not actually an "uptime").
		208
		209	=item $cf::SERVER_TICK
		210
		211	An unsigned integer that starts at zero when the server is started and is
		212	incremented on every tick.
		213
		214	=item $cf::NOW
		215
		216	The (real) time of the last (current) server tick - updated before and
		217	after tick processing, so this is useful only as a rough "what time is it
		218	now" estimate.
		219
		220	=item $cf::TICK
		221
		222	The interval between each server tick, in seconds.
197		223
198	=item $cf::RUNTIME	224	=item $cf::RUNTIME
199		225
200	The time this server has run, starts at 0 and is increased by $cf::TICK on	226	The time this server has run, starts at 0 and is increased by $cf::TICK on
201	every server tick.	227	every server tick.
…		…
207	Various directories - "/etc", read-only install directory, perl-library	233	Various directories - "/etc", read-only install directory, perl-library
208	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	234	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
209	unique-items directory, player file directory, random maps directory and	235	unique-items directory, player file directory, random maps directory and
210	database environment.	236	database environment.
211		237
212	=item $cf::NOW
213
214	The time of the last (current) server tick.
215
216	=item $cf::TICK
217
218	The interval between server ticks, in seconds.
219
220	=item $cf::LOADAVG	238	=item $cf::LOADAVG
221		239
222	The current CPU load on the server (alpha-smoothed), as a value between 0	240	The current CPU load on the server (alpha-smoothed), as a value between 0
223	(none) and 1 (overloaded), indicating how much time is spent on processing	241	(none) and 1 (overloaded), indicating how much time is spent on processing
224	objects per tick. Healthy values are < 0.5.	242	objects per tick. Healthy values are < 0.5.
…		…
233	from wherever your confdir points to.	251	from wherever your confdir points to.
234		252
235	=item cf::wait_for_tick, cf::wait_for_tick_begin	253	=item cf::wait_for_tick, cf::wait_for_tick_begin
236		254
237	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	255	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
238	returns directly I<after> the tick processing (and consequently, can only wake one process	256	returns directly I<after> the tick processing (and consequently, can only wake one thread
239	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	257	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
		258
		259	Note that cf::Wait_for_tick will immediately return when the server is not
		260	ticking, making it suitable for small pauses in threads that need to run
		261	when the server is paused. If that is not applicable (i.e. you I<really>
		262	want to wait, use C<$cf::WAIT_FOR_TICK>).
		263
		264	=item $cf::WAIT_FOR_TICK
		265
		266	Note that C<cf::wait_for_tick> is probably the correct thing to use. This
		267	variable contains a L<Coro::Signal> that is broadcats after every server
		268	tick. Calling C<< ->wait >> on it will suspend the caller until after the
		269	next server tick.
		270
		271	=cut
		272
		273	sub wait_for_tick();
		274	sub wait_for_tick_begin();
240		275
241	=item @cf::INVOKE_RESULTS	276	=item @cf::INVOKE_RESULTS
242		277
243	This array contains the results of the last C<invoke ()> call. When	278	This array contains the results of the last C<invoke ()> call. When
244	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of	279	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
…		…
305	)) {	340	)) {
306	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	341	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
307	}	342	}
308		343
309	$EV::DIED = sub {	344	$EV::DIED = sub {
310	Carp::cluck "error in event callback: @_";	345	warn "error in event callback: $@";
311	};	346	};
		347
		348	#############################################################################
		349
		350	sub fork_call(&@);
		351	sub get_slot($;$$);
312		352
313	#############################################################################	353	#############################################################################
314		354
315	=head2 UTILITY FUNCTIONS	355	=head2 UTILITY FUNCTIONS
316		356
…		…
337	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	377	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
338	$d	378	$d
339	} || "[unable to dump $_[0]: '$@']";	379	} || "[unable to dump $_[0]: '$@']";
340	}	380	}
341		381
		382	=item $scalar = cf::load_file $path
		383
		384	Loads the given file from path and returns its contents. Croaks on error
		385	and can block.
		386
		387	=cut
		388
		389	sub load_file($) {
		390	0 <= aio_load $_[0], my $data
		391	or Carp::croak "$_[0]: $!";
		392
		393	$data
		394	}
		395
		396	=item $success = cf::replace_file $path, $data, $sync
		397
		398	Atomically replaces the file at the given $path with new $data, and
		399	optionally $sync the data to disk before replacing the file.
		400
		401	=cut
		402
		403	sub replace_file($$;$) {
		404	my ($path, $data, $sync) = @_;
		405
		406	my $lock = cf::lock_acquire ("replace_file:$path");
		407
		408	my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
		409	or return;
		410
		411	$data = $data->() if ref $data;
		412
		413	length $data == aio_write $fh, 0, (length $data), $data, 0
		414	or return;
		415
		416	!$sync
		417	or !aio_fsync $fh
		418	or return;
		419
		420	aio_close $fh
		421	and return;
		422
		423	aio_rename "$path~", $path
		424	and return;
		425
		426	if ($sync) {
		427	$path =~ s%/[^/]*$%%;
		428	aio_pathsync $path;
		429	}
		430
		431	1
		432	}
		433
342	=item $ref = cf::decode_json $json	434	=item $ref = cf::decode_json $json
343		435
344	Converts a JSON string into the corresponding perl data structure.	436	Converts a JSON string into the corresponding perl data structure.
345		437
346	=item $json = cf::encode_json $ref	438	=item $json = cf::encode_json $ref
…		…
352	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	444	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
353		445
354	sub encode_json($) { $json_coder->encode ($_[0]) }	446	sub encode_json($) { $json_coder->encode ($_[0]) }
355	sub decode_json($) { $json_coder->decode ($_[0]) }	447	sub decode_json($) { $json_coder->decode ($_[0]) }
356		448
		449	=item $ref = cf::decode_storable $scalar
		450
		451	Same as Coro::Storable::thaw, so blocks.
		452
		453	=cut
		454
		455	BEGIN { *decode_storable = \&Coro::Storable::thaw }
		456
		457	=item $ref = cf::decode_yaml $scalar
		458
		459	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
		460
		461	=cut
		462
		463	sub decode_yaml($) {
		464	fork_call { YAML::XS::Load $_[0] } @_
		465	}
		466
		467	=item $scalar = cf::unlzf $scalar
		468
		469	Same as Compress::LZF::compress, but takes server ticks into account, so
		470	blocks.
		471
		472	=cut
		473
		474	sub unlzf($) {
		475	# we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
		476	cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
		477	Compress::LZF::decompress $_[0]
		478	}
		479
357	=item cf::post_init { BLOCK }	480	=item cf::post_init { BLOCK }
358		481
359	Execute the given codeblock, I<after> all extensions have been (re-)loaded,	482	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
360	but I<before> the server starts ticking again.	483	but I<before> the server starts ticking again.
361		484
362	The cdoeblock will have a single boolean argument to indicate whether this	485	The codeblock will have a single boolean argument to indicate whether this
363	is a reload or not.	486	is a reload or not.
364		487
365	=cut	488	=cut
366		489
367	sub post_init(&) {	490	sub post_init(&) {
368	push @POST_INIT, shift;	491	push @POST_INIT, shift;
		492	}
		493
		494	sub _post_init {
		495	trace "running post_init jobs";
		496
		497	# run them in parallel...
		498
		499	my @join;
		500
		501	while () {
		502	push @join, map &Coro::async ($_, 0), @POST_INIT;
		503	@POST_INIT = ();
		504
		505	@join or last;
		506
		507	(pop @join)->join;
		508	}
369	}	509	}
370		510
371	=item cf::lock_wait $string	511	=item cf::lock_wait $string
372		512
373	Wait until the given lock is available. See cf::lock_acquire.	513	Wait until the given lock is available. See cf::lock_acquire.
…		…
426	EV::periodic $start, $interval, 0, $cb	566	EV::periodic $start, $interval, 0, $cb
427	}	567	}
428		568
429	=item cf::get_slot $time[, $priority[, $name]]	569	=item cf::get_slot $time[, $priority[, $name]]
430		570
431	Allocate $time seconds of blocking CPU time at priority C<$priority>:	571	Allocate $time seconds of blocking CPU time at priority C<$priority>
432	This call blocks and returns only when you have at least C<$time> seconds	572	(default: 0): This call blocks and returns only when you have at least
433	of cpu time till the next tick. The slot is only valid till the next cede.	573	C<$time> seconds of cpu time till the next tick. The slot is only valid
		574	till the next cede.
		575
		576	Background jobs should use a priority les than zero, interactive jobs
		577	should use 100 or more.
434		578
435	The optional C<$name> can be used to identify the job to run. It might be	579	The optional C<$name> can be used to identify the job to run. It might be
436	used for statistical purposes and should identify the same time-class.	580	used for statistical purposes and should identify the same time-class.
437		581
438	Useful for short background jobs.	582	Useful for short background jobs.
…		…
467	}	611	}
468	}	612	}
469		613
470	if (@SLOT_QUEUE) {	614	if (@SLOT_QUEUE) {
471	# we do not use wait_for_tick() as it returns immediately when tick is inactive	615	# we do not use wait_for_tick() as it returns immediately when tick is inactive
472	push @cf::WAIT_FOR_TICK, $signal;	616	$WAIT_FOR_TICK->wait;
473	$signal->wait;
474	} else {	617	} else {
475	$busy = 0;	618	$busy = 0;
476	Coro::schedule;	619	Coro::schedule;
477	}	620	}
478	}	621	}
…		…
518	=cut	661	=cut
519		662
520	sub sync_job(&) {	663	sub sync_job(&) {
521	my ($job) = @_;	664	my ($job) = @_;
522		665
523	if ($Coro::current == $Coro::main) {	666	if (in_main) {
524	my $time = AE::time;	667	my $time = AE::time;
525		668
526	# this is the main coro, too bad, we have to block	669	# this is the main coro, too bad, we have to block
527	# till the operation succeeds, freezing the server :/	670	# till the operation succeeds, freezing the server :/
528		671
529	LOG llevError, Carp::longmess "sync job";#d#	672	#LOG llevError, Carp::longmess "sync job";#d#
530		673
531	my $freeze_guard = freeze_mainloop;	674	my $freeze_guard = freeze_mainloop;
532		675
533	my $busy = 1;	676	my $busy = 1;
534	my @res;	677	my @res;
…		…
578	$EXT_CORO{$coro+0} = $coro;	721	$EXT_CORO{$coro+0} = $coro;
579		722
580	$coro	723	$coro
581	}	724	}
582		725
583	=item fork_call { }, $args	726	=item fork_call { }, @args
584		727
585	Executes the given code block with the given arguments in a seperate	728	Executes the given code block with the given arguments in a seperate
586	process, returning the results. Everything must be serialisable with	729	process, returning the results. Everything must be serialisable with
587	Coro::Storable. May, of course, block. Note that the executed sub may	730	Coro::Storable. May, of course, block. Note that the executed sub may
588	never block itself or use any form of event handling.	731	never block itself or use any form of event handling.
589		732
590	=cut	733	=cut
591		734
		735	sub post_fork {
		736	reset_signals;
		737	}
		738
592	sub fork_call(&@) {	739	sub fork_call(&@) {
593	my ($cb, @args) = @_;	740	my ($cb, @args) = @_;
594		741
595	# we seemingly have to make a local copy of the whole thing,	742	# we seemingly have to make a local copy of the whole thing,
596	# otherwise perl prematurely frees the stuff :/	743	# otherwise perl prematurely frees the stuff :/
597	# TODO: investigate and fix (likely this will be rather laborious)	744	# TODO: investigate and fix (likely this will be rather laborious)
598		745
599	my @res = Coro::Util::fork_eval {	746	my @res = Coro::Util::fork_eval {
600	reset_signals;	747	cf::post_fork;
601	&$cb	748	&$cb
602	}, @args;	749	} @args;
603		750
604	wantarray ? @res : $res[-1]	751	wantarray ? @res : $res[-1]
605	}	752	}
606		753
607	sub objinfo {	754	sub objinfo {
…		…
657	within each server.	804	within each server.
658		805
659	=cut	806	=cut
660		807
661	sub db_table($) {	808	sub db_table($) {
		809	cf::error "db_get called from main context"
		810	if $Coro::current == $Coro::main;
		811
662	my ($name) = @_;	812	my ($name) = @_;
663	my $db = BDB::db_create $DB_ENV;	813	my $db = BDB::db_create $DB_ENV;
664		814
665	eval {	815	eval {
666	$db->set_flags (BDB::CHKSUM);	816	$db->set_flags (BDB::CHKSUM);
…		…
676	}	826	}
677		827
678	our $DB;	828	our $DB;
679		829
680	sub db_init {	830	sub db_init {
681	cf::sync_job {
682	$DB ||= db_table "db";	831	$DB ||= db_table "db";
683	};
684	}	832	}
685		833
686	sub db_get($$) {	834	sub db_get($$) {
687	my $key = "$_[0]/$_[1]";	835	my $key = "$_[0]/$_[1]";
688		836
689	cf::sync_job {	837	cf::error "db_get called from main context"
		838	if $Coro::current == $Coro::main;
		839
690	BDB::db_get $DB, undef, $key, my $data;	840	BDB::db_get $DB, undef, $key, my $data;
691		841
692	$! ? ()	842	$! ? ()
693	: $data	843	: $data
694	}
695	}	844	}
696		845
697	sub db_put($$$) {	846	sub db_put($$$) {
698	BDB::dbreq_pri 4;	847	BDB::dbreq_pri 4;
699	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	848	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
727		876
728	my @data;	877	my @data;
729	my $md5;	878	my $md5;
730		879
731	for (0 .. $#$src) {	880	for (0 .. $#$src) {
732	0 <= aio_load $src->[$_], $data[$_]	881	$data[$_] = load_file $src->[$_];
733	or Carp::croak "$src->[$_]: $!";
734	}	882	}
735		883
736	# if processing is expensive, check	884	# if processing is expensive, check
737	# checksum first	885	# checksum first
738	if (1) {	886	if (1) {
…		…
1356	my ($pl, $buf) = @_;	1504	my ($pl, $buf) = @_;
1357		1505
1358	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1506	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1359		1507
1360	if (ref $msg) {	1508	if (ref $msg) {
1361	my ($type, $reply, @payload) =	1509	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1362	"ARRAY" eq ref $msg
1363	? @$msg
1364	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1365		1510
1366	my @reply;	1511	my @reply;
1367		1512
1368	if (my $cb = $EXTCMD{$type}) {	1513	if (my $cb = $EXTCMD{$type}) {
1369	@reply = $cb->($pl, @payload);	1514	@reply = $cb->($pl, @payload);
…		…
1391	};	1536	};
1392		1537
1393	$grp	1538	$grp
1394	}	1539	}
1395		1540
		1541	sub _ext_cfg_reg($$$$) {
		1542	my ($rvar, $varname, $cfgname, $default) = @_;
		1543
		1544	$cfgname = lc $varname
		1545	unless length $cfgname;
		1546
		1547	$EXT_CFG{$cfgname} = [$rvar, $default];
		1548
		1549	$$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
		1550	}
		1551
1396	sub load_extensions {	1552	sub load_extensions {
1397	info "loading extensions...";	1553	info "loading extensions...";
		1554
		1555	%EXT_CFG = ();
1398		1556
1399	cf::sync_job {	1557	cf::sync_job {
1400	my %todo;	1558	my %todo;
1401		1559
1402	for my $path (<$LIBDIR/*.ext>) {	1560	for my $path (<$LIBDIR/*.ext>) {
…		…
1421		1579
1422	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1580	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1423	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1581	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1424		1582
1425	$ext{source} =	1583	$ext{source} =
1426	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1584	"package $pkg; use common::sense;\n"
1427	. "#line 1 \"$path\"\n{\n"	1585	. "#line 1 \"$path\"\n{\n"
1428	. $source	1586	. $source
1429	. "\n};\n1";	1587	. "\n};\n1";
1430		1588
1431	$todo{$base} = \%ext;	1589	$todo{$base} = \%ext;
…		…
1445	unless exists $done{$_};	1603	unless exists $done{$_};
1446	}	1604	}
1447		1605
1448	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1606	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1449		1607
		1608	my $source = $v->{source};
		1609
		1610	# support "CONF varname :confname = default" pseudo-statements
		1611	$source =~ s{
		1612	^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
		1613	}{
		1614	"our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
		1615	}gmxe;
		1616
1450	my $active = eval $v->{source};	1617	my $active = eval $source;
1451		1618
1452	if (length $@) {	1619	if (length $@) {
1453	error "$v->{path}: $@\n";	1620	error "$v->{path}: $@\n";
1454		1621
1455	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1622	cf::cleanup "mandatory extension '$k' failed to load, exiting."
…		…
1472		1639
1473	while (my ($k, $v) = each %todo) {	1640	while (my ($k, $v) = each %todo) {
1474	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1641	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1475	if exists $v->{meta}{mandatory};	1642	if exists $v->{meta}{mandatory};
1476	}	1643	}
		1644
		1645	last;
1477	}	1646	}
1478	}	1647	}
1479	};	1648	};
1480	}	1649	}
1481		1650
…		…
1639	my $name = $pl->ob->name;	1808	my $name = $pl->ob->name;
1640		1809
1641	$pl->{deny_save} = 1;	1810	$pl->{deny_save} = 1;
1642	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1811	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1643		1812
1644	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1813	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1645	$pl->deactivate;	1814	$pl->deactivate;
		1815
1646	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1816	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1647	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1817	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1818	ext::highscore::check ($pl->ob);
		1819
1648	$pl->ns->destroy if $pl->ns;	1820	$pl->ns->destroy if $pl->ns;
1649		1821
1650	my $path = playerdir $pl;	1822	my $path = playerdir $pl;
1651	my $temp = "$path~$cf::RUNTIME~deleting~";	1823	my $temp = "$path~$cf::RUNTIME~deleting~";
1652	aio_rename $path, $temp;	1824	aio_rename $path, $temp;
…		…
1818	sub generate_random_map {	1990	sub generate_random_map {
1819	my ($self, $rmp) = @_;	1991	my ($self, $rmp) = @_;
1820		1992
1821	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	1993	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1822		1994
1823	# mit "rum" bekleckern, nicht
1824	$self->_create_random_map (	1995	$self->_create_random_map ($rmp);
1825	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1826	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1827	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1828	$rmp->{exit_on_final_map},
1829	$rmp->{xsize}, $rmp->{ysize},
1830	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1831	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1832	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1833	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1834	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1835	(cf::region::find $rmp->{region}), $rmp->{custom}
1836	)
1837	}	1996	}
1838		1997
1839	=item cf::map->register ($regex, $prio)	1998	=item cf::map->register ($regex, $prio)
1840		1999
1841	Register a handler for the map path matching the given regex at the	2000	Register a handler for the map path matching the given regex at the
…		…
1846		2005
1847	sub register {	2006	sub register {
1848	my (undef, $regex, $prio) = @_;	2007	my (undef, $regex, $prio) = @_;
1849	my $pkg = caller;	2008	my $pkg = caller;
1850		2009
1851	no strict;
1852	push @{"$pkg\::ISA"}, __PACKAGE__;	2010	push @{"$pkg\::ISA"}, __PACKAGE__;
1853		2011
1854	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	2012	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1855	}	2013	}
1856		2014
…		…
1868	}	2026	}
1869		2027
1870	sub normalise {	2028	sub normalise {
1871	my ($path, $base) = @_;	2029	my ($path, $base) = @_;
1872		2030
1873	$path = "$path"; # make sure its a string	2031	$path = "$path"; # make sure it's a string
1874		2032
1875	$path =~ s/\.map$//;	2033	$path =~ s/\.map$//;
1876		2034
1877	# map plan:	2035	# map plan:
1878	#	2036	#
…		…
1893	$base =~ s{[^/]+/?$}{};	2051	$base =~ s{[^/]+/?$}{};
1894	$path = "$base/$path";	2052	$path = "$base/$path";
1895	}	2053	}
1896		2054
1897	for ($path) {	2055	for ($path) {
1898	redo if s{//}{/};
1899	redo if s{/\.?/}{/};	2056	redo if s{/\.?/}{/};
1900	redo if s{/[^/]+/\.\./}{/};	2057	redo if s{/[^/]+/\.\./}{/};
1901	}	2058	}
1902		2059
1903	$path	2060	$path
…		…
1917	$self->init; # pass $1 etc.	2074	$self->init; # pass $1 etc.
1918	return $self;	2075	return $self;
1919	}	2076	}
1920	}	2077	}
1921		2078
1922	Carp::cluck "unable to resolve path '$path' (base '$base').";	2079	Carp::cluck "unable to resolve path '$path' (base '$base')";
1923	()	2080	()
1924	}	2081	}
1925		2082
		2083	# may re-bless or do other evil things
1926	sub init {	2084	sub init {
1927	my ($self) = @_;	2085	my ($self) = @_;
1928		2086
1929	$self	2087	$self
1930	}	2088	}
…		…
1995	$self->{load_path} = $path;	2153	$self->{load_path} = $path;
1996		2154
1997	1	2155	1
1998	}	2156	}
1999		2157
		2158	# used to laod the header of an original map
2000	sub load_header_orig {	2159	sub load_header_orig {
2001	my ($self) = @_;	2160	my ($self) = @_;
2002		2161
2003	$self->load_header_from ($self->load_path)	2162	$self->load_header_from ($self->load_path)
2004	}	2163	}
2005		2164
		2165	# used to laod the header of an instantiated map
2006	sub load_header_temp {	2166	sub load_header_temp {
2007	my ($self) = @_;	2167	my ($self) = @_;
2008		2168
2009	$self->load_header_from ($self->save_path)	2169	$self->load_header_from ($self->save_path)
2010	}	2170	}
2011		2171
		2172	# called after loading the header from an instantiated map
2012	sub prepare_temp {	2173	sub prepare_temp {
2013	my ($self) = @_;	2174	my ($self) = @_;
2014		2175
2015	$self->last_access ((delete $self->{last_access})	2176	$self->last_access ((delete $self->{last_access})
2016	|| $cf::RUNTIME); #d#	2177	|| $cf::RUNTIME); #d#
2017	# safety	2178	# safety
2018	$self->{instantiate_time} = $cf::RUNTIME	2179	$self->{instantiate_time} = $cf::RUNTIME
2019	if $self->{instantiate_time} > $cf::RUNTIME;	2180	if $self->{instantiate_time} > $cf::RUNTIME;
2020	}	2181	}
2021		2182
		2183	# called after loading the header from an original map
2022	sub prepare_orig {	2184	sub prepare_orig {
2023	my ($self) = @_;	2185	my ($self) = @_;
2024		2186
2025	$self->{load_original} = 1;	2187	$self->{load_original} = 1;
2026	$self->{instantiate_time} = $cf::RUNTIME;	2188	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2050		2212
2051	sub find;	2213	sub find;
2052	sub find {	2214	sub find {
2053	my ($path, $origin) = @_;	2215	my ($path, $origin) = @_;
2054		2216
		2217	cf::cede_to_tick;
		2218
2055	$path = normalise $path, $origin && $origin->path;	2219	$path = normalise $path, $origin;
2056		2220
2057	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2221	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2058	my $guard2 = cf::lock_acquire "map_find:$path";	2222	my $guard2 = cf::lock_acquire "map_find:$path";
2059		2223
2060	$cf::MAP{$path} || do {	2224	$cf::MAP{$path} || do {
…		…
2091		2255
2092	{	2256	{
2093	my $guard = cf::lock_acquire "map_data:$path";	2257	my $guard = cf::lock_acquire "map_data:$path";
2094		2258
2095	return unless $self->valid;	2259	return unless $self->valid;
2096	return unless $self->in_memory == cf::MAP_SWAPPED;	2260	return unless $self->state == cf::MAP_SWAPPED;
2097
2098	$self->in_memory (cf::MAP_LOADING);
2099		2261
2100	$self->alloc;	2262	$self->alloc;
2101		2263
2102	$self->pre_load;	2264	$self->pre_load;
2103	cf::cede_to_tick;	2265	cf::cede_to_tick;
2104		2266
		2267	if (exists $self->{load_path}) {
2105	my $f = new_from_file cf::object::thawer $self->{load_path};	2268	my $f = new_from_file cf::object::thawer $self->{load_path};
2106	$f->skip_block;	2269	$f->skip_block;
2107	$self->_load_objects ($f)	2270	$self->_load_objects ($f)
2108	or return;	2271	or return;
2109		2272
2110	$self->post_load_original	2273	$self->post_load_original
2111	if delete $self->{load_original};	2274	if delete $self->{load_original};
2112		2275
2113	if (my $uniq = $self->uniq_path) {	2276	if (my $uniq = $self->uniq_path) {
2114	utf8::encode $uniq;	2277	utf8::encode $uniq;
2115	unless (aio_stat $uniq) {	2278	unless (aio_stat $uniq) {
2116	if (my $f = new_from_file cf::object::thawer $uniq) {	2279	if (my $f = new_from_file cf::object::thawer $uniq) {
2117	$self->clear_unique_items;	2280	$self->clear_unique_items;
2118	$self->_load_objects ($f);	2281	$self->_load_objects ($f);
2119	$f->resolve_delayed_derefs;	2282	$f->resolve_delayed_derefs;
		2283	}
2120	}	2284	}
2121	}	2285	}
2122	}
2123		2286
2124	$f->resolve_delayed_derefs;	2287	$f->resolve_delayed_derefs;
		2288	} else {
		2289	$self->post_load_original
		2290	if delete $self->{load_original};
		2291	}
		2292
		2293	$self->state (cf::MAP_INACTIVE);
2125		2294
2126	cf::cede_to_tick;	2295	cf::cede_to_tick;
2127	# now do the right thing for maps	2296	# now do the right thing for maps
2128	$self->link_multipart_objects;	2297	$self->link_multipart_objects;
2129	$self->difficulty ($self->estimate_difficulty)	2298	$self->difficulty ($self->estimate_difficulty)
…		…
2133	unless ($self->{deny_activate}) {	2302	unless ($self->{deny_activate}) {
2134	$self->decay_objects;	2303	$self->decay_objects;
2135	$self->fix_auto_apply;	2304	$self->fix_auto_apply;
2136	$self->update_buttons;	2305	$self->update_buttons;
2137	cf::cede_to_tick;	2306	cf::cede_to_tick;
2138	$self->activate;	2307	#$self->activate; # no longer activate maps automatically
2139	}	2308	}
2140		2309
2141	$self->{last_save} = $cf::RUNTIME;	2310	$self->{last_save} = $cf::RUNTIME;
2142	$self->last_access ($cf::RUNTIME);	2311	$self->last_access ($cf::RUNTIME);
2143
2144	$self->in_memory (cf::MAP_ACTIVE);
2145	}	2312	}
2146		2313
2147	$self->post_load;	2314	$self->post_load;
		2315
		2316	1
2148	}	2317	}
2149		2318
2150	# customize the map for a given player, i.e.	2319	# customize the map for a given player, i.e.
2151	# return the _real_ map. used by e.g. per-player	2320	# return the _real_ map. used by e.g. per-player
2152	# maps to change the path to ~playername/mappath	2321	# maps to change the path to ~playername/mappath
…		…
2160	# if $self->per_party;	2329	# if $self->per_party;
2161		2330
2162	$self	2331	$self
2163	}	2332	}
2164		2333
2165	# find and load all maps in the 3x3 area around a map
2166	sub load_neighbours {
2167	my ($map) = @_;
2168
2169	my @neigh; # diagonal neighbours
2170
2171	for (0 .. 3) {
2172	my $neigh = $map->tile_path ($_)
2173	or next;
2174	$neigh = find $neigh, $map
2175	or next;
2176	$neigh->load;
2177
2178	# now find the diagonal neighbours
2179	push @neigh,
2180	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2181	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2182	}
2183
2184	for (grep defined $_->[0], @neigh) {
2185	my ($path, $origin) = @$_;
2186	my $neigh = find $path, $origin
2187	or next;
2188	$neigh->load;
2189	}
2190	}
2191
2192	sub find_sync {	2334	sub find_sync {
2193	my ($path, $origin) = @_;	2335	my ($path, $origin) = @_;
2194		2336
2195	cf::sync_job { find $path, $origin }	2337	# it's a bug to call this from the main context
		2338	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
		2339	if $Coro::current == $Coro::main;
		2340
		2341	find $path, $origin
2196	}	2342	}
2197		2343
2198	sub do_load_sync {	2344	sub do_load_sync {
2199	my ($map) = @_;	2345	my ($map) = @_;
2200		2346
		2347	# it's a bug to call this from the main context
2201	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2348	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2202	if $Coro::current == $Coro::main;	2349	if $Coro::current == $Coro::main;
2203		2350
2204	cf::sync_job { $map->load };	2351	$map->load;
2205	}	2352	}
2206		2353
2207	our %MAP_PREFETCH;	2354	our %MAP_PREFETCH;
2208	our $MAP_PREFETCHER = undef;	2355	our $MAP_PREFETCHER = undef;
2209		2356
2210	sub find_async {	2357	sub find_async {
2211	my ($path, $origin, $load) = @_;	2358	my ($path, $origin, $load) = @_;
2212		2359
2213	$path = normalise $path, $origin && $origin->{path};	2360	$path = normalise $path, $origin;
2214		2361
2215	if (my $map = $cf::MAP{$path}) {	2362	if (my $map = $cf::MAP{$path}) {
2216	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2363	return $map if !$load || $map->linkable;
2217	}	2364	}
2218		2365
2219	$MAP_PREFETCH{$path} |= $load;	2366	$MAP_PREFETCH{$path} |= $load;
2220		2367
2221	$MAP_PREFETCHER ||= cf::async {	2368	$MAP_PREFETCHER ||= cf::async {
…		…
2280	sub swap_out {	2427	sub swap_out {
2281	my ($self) = @_;	2428	my ($self) = @_;
2282		2429
2283	my $lock = cf::lock_acquire "map_data:$self->{path}";	2430	my $lock = cf::lock_acquire "map_data:$self->{path}";
2284		2431
2285	return if $self->in_memory != cf::MAP_ACTIVE;	2432	return if !$self->linkable;
2286	return if $self->{deny_save};	2433	return if $self->{deny_save};
2287	return if $self->players;	2434	return if $self->players;
2288		2435
2289	# first deactivate the map and "unlink" it from the core	2436	# first deactivate the map and "unlink" it from the core
2290	$self->deactivate;	2437	$self->deactivate;
2291	$_->clear_links_to ($self) for values %cf::MAP;	2438	$_->clear_links_to ($self) for values %cf::MAP;
2292	$self->in_memory (cf::MAP_SWAPPED);	2439	$self->state (cf::MAP_SWAPPED);
2293		2440
2294	# then atomically save	2441	# then atomically save
2295	$self->_save;	2442	$self->_save;
2296		2443
2297	# then free the map	2444	# then free the map
…		…
2323		2470
2324	return if $self->players;	2471	return if $self->players;
2325		2472
2326	cf::trace "resetting map ", $self->path, "\n";	2473	cf::trace "resetting map ", $self->path, "\n";
2327		2474
2328	$self->in_memory (cf::MAP_SWAPPED);	2475	$self->state (cf::MAP_SWAPPED);
2329		2476
2330	# need to save uniques path	2477	# need to save uniques path
2331	unless ($self->{deny_save}) {	2478	unless ($self->{deny_save}) {
2332	my $uniq = $self->uniq_path; utf8::encode $uniq;	2479	my $uniq = $self->uniq_path; utf8::encode $uniq;
2333		2480
…		…
2663	# use -1 or undef as default coordinates, not 0, 0	2810	# use -1 or undef as default coordinates, not 0, 0
2664	($x, $y) = ($map->enter_x, $map->enter_y)	2811	($x, $y) = ($map->enter_x, $map->enter_y)
2665	if $x <= 0 && $y <= 0;	2812	if $x <= 0 && $y <= 0;
2666		2813
2667	$map->load;	2814	$map->load;
2668	$map->load_neighbours;
2669		2815
2670	return unless $self->contr->active;	2816	return unless $self->contr->active;
2671		2817
2672	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2818	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2673	if ($self->enter_map ($map, $x, $y)) {	2819	if ($self->enter_map ($map, $x, $y)) {
…		…
2729	($path, $x, $y) = (undef, undef, undef);	2875	($path, $x, $y) = (undef, undef, undef);
2730	}	2876	}
2731	}	2877	}
2732		2878
2733	my $map = eval {	2879	my $map = eval {
2734	my $map = defined $path ? cf::map::find $path : undef;	2880	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2735		2881
2736	if ($map) {	2882	if ($map) {
2737	$map = $map->customise_for ($self);	2883	$map = $map->customise_for ($self);
2738	$map = $check->($map, $x, $y, $self) if $check && $map;	2884	$map = $check->($map, $x, $y, $self) if $check && $map;
2739	} else {	2885	} else {
…		…
2829	$Coro::current->{desc} = "enter_exit";	2975	$Coro::current->{desc} = "enter_exit";
2830		2976
2831	unless (eval {	2977	unless (eval {
2832	$self->deactivate_recursive; # just to be sure	2978	$self->deactivate_recursive; # just to be sure
2833		2979
2834	# random map handling
2835	{
2836	my $guard = cf::lock_acquire "exit_prepare:$exit";
2837
2838	prepare_random_map $exit
2839	if $exit->slaying eq "/!";
2840	}
2841
2842	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2980	my $map = cf::map::normalise $exit->slaying, $exit->map;
2843	my $x = $exit->stats->hp;	2981	my $x = $exit->stats->hp;
2844	my $y = $exit->stats->sp;	2982	my $y = $exit->stats->sp;
		2983
		2984	# special map handling
		2985	my $slaying = $exit->slaying;
		2986
		2987	# special map handling
		2988	if ($slaying eq "/!") {
		2989	my $guard = cf::lock_acquire "exit_prepare:$exit";
		2990
		2991	prepare_random_map $exit
		2992	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		2993
		2994	$map = $exit->slaying;
		2995
		2996	} elsif ($slaying eq '!up') {
		2997	$map = $exit->map->tile_path (cf::TILE_UP);
		2998	$x = $exit->x;
		2999	$y = $exit->y;
		3000
		3001	} elsif ($slaying eq '!down') {
		3002	$map = $exit->map->tile_path (cf::TILE_DOWN);
		3003	$x = $exit->x;
		3004	$y = $exit->y;
		3005	}
2845		3006
2846	$self->goto ($map, $x, $y);	3007	$self->goto ($map, $x, $y);
2847		3008
2848	# if exit is damned, update players death & WoR home-position	3009	# if exit is damned, update players death & WoR home-position
2849	$self->contr->savebed ($map, $x, $y)	3010	$self->contr->savebed ($map, $x, $y)
…		…
3074	=cut	3235	=cut
3075		3236
3076	sub cf::client::ext_msg($$@) {	3237	sub cf::client::ext_msg($$@) {
3077	my ($self, $type, @msg) = @_;	3238	my ($self, $type, @msg) = @_;
3078		3239
3079	if ($self->extcmd == 2) {
3080	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3240	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3081	} elsif ($self->extcmd == 1) { # TODO: remove
3082	push @msg, msgtype => "event_$type";
3083	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3084	}
3085	}	3241	}
3086		3242
3087	=item $client->ext_reply ($msgid, @msg)	3243	=item $client->ext_reply ($msgid, @msg)
3088		3244
3089	Sends an ext reply to the client.	3245	Sends an ext reply to the client.
…		…
3091	=cut	3247	=cut
3092		3248
3093	sub cf::client::ext_reply($$@) {	3249	sub cf::client::ext_reply($$@) {
3094	my ($self, $id, @msg) = @_;	3250	my ($self, $id, @msg) = @_;
3095		3251
3096	if ($self->extcmd == 2) {
3097	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));	3252	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3098	} elsif ($self->extcmd == 1) {
3099	#TODO: version 1, remove
3100	unshift @msg, msgtype => "reply", msgid => $id;
3101	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3102	}
3103	}	3253	}
3104		3254
3105	=item $success = $client->query ($flags, "text", \&cb)	3255	=item $success = $client->query ($flags, "text", \&cb)
3106		3256
3107	Queues a query to the client, calling the given callback with	3257	Queues a query to the client, calling the given callback with
…		…
3162	my ($ns, $buf) = @_;	3312	my ($ns, $buf) = @_;
3163		3313
3164	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3314	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3165		3315
3166	if (ref $msg) {	3316	if (ref $msg) {
3167	my ($type, $reply, @payload) =	3317	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3168	"ARRAY" eq ref $msg
3169	? @$msg
3170	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3171		3318
3172	my @reply;	3319	my @reply;
3173		3320
3174	if (my $cb = $EXTICMD{$type}) {	3321	if (my $cb = $EXTICMD{$type}) {
3175	@reply = $cb->($ns, @payload);	3322	@reply = $cb->($ns, @payload);
…		…
3268	decrease split destroy change_exp value msg lore send_msg)],	3415	decrease split destroy change_exp value msg lore send_msg)],
3269	["cf::object::player" => qw(player)],	3416	["cf::object::player" => qw(player)],
3270	["cf::player" => qw(peaceful send_msg)],	3417	["cf::player" => qw(peaceful send_msg)],
3271	["cf::map" => qw(trigger)],	3418	["cf::map" => qw(trigger)],
3272	) {	3419	) {
3273	no strict 'refs';
3274	my ($pkg, @funs) = @$_;	3420	my ($pkg, @funs) = @$_;
3275	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3421	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3276	for @funs;	3422	for @funs;
3277	}	3423	}
3278		3424
…		…
3354	=cut	3500	=cut
3355		3501
3356	#############################################################################	3502	#############################################################################
3357	# the server's init and main functions	3503	# the server's init and main functions
3358		3504
		3505	our %FACEHASH; # hash => idx, #d# HACK for http server
		3506
		3507	# internal api, not fianlised
		3508	sub add_face {
		3509	my ($name, $type, $data) = @_;
		3510
		3511	my $idx = cf::face::find $name;
		3512
		3513	if ($idx) {
		3514	delete $FACEHASH{cf::face::get_chksum $idx};
		3515	} else {
		3516	$idx = cf::face::alloc $name;
		3517	}
		3518
		3519	my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
		3520
		3521	cf::face::set_type $idx, $type;
		3522	cf::face::set_data $idx, 0, $data, $hash;
		3523	cf::face::set_meta $idx, $type & 1 ? undef : undef;
		3524	$FACEHASH{$hash} = $idx;#d#
		3525
		3526	$idx
		3527	}
		3528
3359	sub load_facedata($) {	3529	sub load_facedata($) {
3360	my ($path) = @_;	3530	my ($path) = @_;
3361		3531
3362	# HACK to clear player env face cache, we need some signal framework	3532	# HACK to clear player env face cache, we need some signal framework
3363	# for this (global event?)	3533	# for this (global event?)
…		…
3365		3535
3366	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3536	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3367		3537
3368	trace "loading facedata from $path\n";	3538	trace "loading facedata from $path\n";
3369		3539
3370	my $facedata;	3540	my $facedata = decode_storable load_file $path;
3371	0 < aio_load $path, $facedata
3372	or die "$path: $!";
3373
3374	$facedata = Coro::Storable::thaw $facedata;
3375		3541
3376	$facedata->{version} == 2	3542	$facedata->{version} == 2
3377	or cf::cleanup "$path: version mismatch, cannot proceed.";	3543	or cf::cleanup "$path: version mismatch, cannot proceed.";
3378		3544
3379	# patch in the exptable
3380	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3381	$facedata->{resource}{"res/exp_table"} = {
3382	type => FT_RSRC,
3383	data => $exp_table,
3384	hash => (Digest::MD5::md5 $exp_table),
3385	};
3386	cf::cede_to_tick;	3545	cf::cede_to_tick;
3387		3546
3388	{	3547	{
3389	my $faces = $facedata->{faceinfo};	3548	my $faces = $facedata->{faceinfo};
3390		3549
3391	while (my ($face, $info) = each %$faces) {	3550	for my $face (sort keys %$faces) {
		3551	my $info = $faces->{$face};
3392	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3552	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3393		3553
3394	cf::face::set_visibility $idx, $info->{visibility};	3554	cf::face::set_visibility $idx, $info->{visibility};
3395	cf::face::set_magicmap $idx, $info->{magicmap};	3555	cf::face::set_magicmap $idx, $info->{magicmap};
3396	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3556	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3397	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3557	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
		3558	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
		3559	$FACEHASH{$info->{hash64}} = $idx;#d#
3398		3560
3399	cf::cede_to_tick;	3561	cf::cede_to_tick;
3400	}	3562	}
3401		3563
3402	while (my ($face, $info) = each %$faces) {	3564	while (my ($face, $info) = each %$faces) {
…		…
3429		3591
3430	{	3592	{
3431	my $res = $facedata->{resource};	3593	my $res = $facedata->{resource};
3432		3594
3433	while (my ($name, $info) = each %$res) {	3595	while (my ($name, $info) = each %$res) {
3434	if (defined $info->{type}) {	3596	if (defined (my $type = $info->{type})) {
		3597	# TODO: different hash - must free and use new index, or cache ixface data queue
3435	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3598	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3436		3599
		3600	cf::face::set_type $idx, $type;
3437	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};	3601	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3438	cf::face::set_type $idx, $info->{type};	3602	cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3603	$FACEHASH{$info->{hash}} = $idx;#d#
3439	} else {	3604	} else {
3440	$RESOURCE{$name} = $info; # unused	3605	# $RESOURCE{$name} = $info; # unused
3441	}	3606	}
3442		3607
3443	cf::cede_to_tick;	3608	cf::cede_to_tick;
3444	}	3609	}
3445	}	3610	}
…		…
3463	my $status = load_resource_file_ $_[0];	3628	my $status = load_resource_file_ $_[0];
3464	get_slot 0.1, 100;	3629	get_slot 0.1, 100;
3465	cf::arch::commit_load;	3630	cf::arch::commit_load;
3466		3631
3467	$status	3632	$status
		3633	}
		3634
		3635	sub reload_exp_table {
		3636	_reload_exp_table;
		3637
		3638	add_face "res/exp_table" => FT_RSRC,
		3639	JSON::XS->new->utf8->canonical->encode (
		3640	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3641	);
		3642	}
		3643
		3644	sub reload_materials {
		3645	_reload_materials;
3468	}	3646	}
3469		3647
3470	sub reload_regions {	3648	sub reload_regions {
3471	# HACK to clear player env face cache, we need some signal framework	3649	# HACK to clear player env face cache, we need some signal framework
3472	# for this (global event?)	3650	# for this (global event?)
…		…
3487	}	3665	}
3488		3666
3489	sub reload_archetypes {	3667	sub reload_archetypes {
3490	load_resource_file "$DATADIR/archetypes"	3668	load_resource_file "$DATADIR/archetypes"
3491	or die "unable to load archetypes\n";	3669	or die "unable to load archetypes\n";
		3670
		3671	add_face "res/skill_info" => FT_RSRC,
		3672	JSON::XS->new->utf8->canonical->encode (
		3673	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3674	);
		3675	add_face "res/spell_paths" => FT_RSRC,
		3676	JSON::XS->new->utf8->canonical->encode (
		3677	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3678	);
3492	}	3679	}
3493		3680
3494	sub reload_treasures {	3681	sub reload_treasures {
3495	load_resource_file "$DATADIR/treasures"	3682	load_resource_file "$DATADIR/treasures"
3496	or die "unable to load treasurelists\n";	3683	or die "unable to load treasurelists\n";
3497	}	3684	}
3498		3685
3499	sub reload_sound {	3686	sub reload_sound {
3500	trace "loading sound config from $DATADIR/sound\n";	3687	trace "loading sound config from $DATADIR/sound\n";
3501		3688
3502	0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3503	or die "$DATADIR/sound $!";
3504
3505	my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);	3689	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3506		3690
3507	for (0 .. SOUND_CAST_SPELL_0 - 1) {	3691	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3508	my $sound = $soundconf->{compat}[$_]	3692	my $sound = $soundconf->{compat}[$_]
3509	or next;	3693	or next;
3510		3694
…		…
3520	}	3704	}
3521		3705
3522	sub reload_resources {	3706	sub reload_resources {
3523	trace "reloading resource files...\n";	3707	trace "reloading resource files...\n";
3524		3708
		3709	reload_materials;
3525	reload_facedata;	3710	reload_facedata;
		3711	reload_exp_table;
3526	reload_sound;	3712	reload_sound;
3527	reload_archetypes;	3713	reload_archetypes;
3528	reload_regions;	3714	reload_regions;
3529	reload_treasures;	3715	reload_treasures;
3530		3716
…		…
3532	}	3718	}
3533		3719
3534	sub reload_config {	3720	sub reload_config {
3535	trace "reloading config file...\n";	3721	trace "reloading config file...\n";
3536		3722
3537	open my $fh, "<:utf8", "$CONFDIR/config"	3723	my $config = load_file "$CONFDIR/config";
3538	or return;	3724	utf8::decode $config;
3539		3725	*CFG = decode_yaml $config;
3540	local $/;
3541	*CFG = YAML::XS::Load scalar <$fh>;
3542		3726
3543	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];	3727	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3544		3728
3545	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3729	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3546	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3730	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
3550	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3734	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3551	and die "WARNING: m(un)lockall failed: $!\n";	3735	and die "WARNING: m(un)lockall failed: $!\n";
3552	};	3736	};
3553	warn $@ if $@;	3737	warn $@ if $@;
3554	}	3738	}
3555
3556	trace "finished reloading resource files\n";
3557	}	3739	}
3558		3740
3559	sub pidfile() {	3741	sub pidfile() {
3560	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3742	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3561	or die "$PIDFILE: $!";	3743	or die "$PIDFILE: $!";
…		…
3586		3768
3587	sub main {	3769	sub main {
3588	cf::init_globals; # initialise logging	3770	cf::init_globals; # initialise logging
3589		3771
3590	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3772	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3591	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3773	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3592	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3774	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3593	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3775	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3594		3776
3595	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3777	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3596		3778
3597	# we must not ever block the main coroutine	3779	# we must not ever block the main coroutine
3598	local $Coro::idle = sub {	3780	$Coro::idle = sub {
3599	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3781	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3600	(async {	3782	(async {
3601	$Coro::current->{desc} = "IDLE BUG HANDLER";	3783	$Coro::current->{desc} = "IDLE BUG HANDLER";
3602	EV::loop EV::LOOP_ONESHOT;	3784	EV::loop EV::LOOP_ONESHOT;
3603	})->prio (Coro::PRIO_MAX);	3785	})->prio (Coro::PRIO_MAX);
3604	};	3786	};
3605		3787
3606	evthread_start IO::AIO::poll_fileno;	3788	evthread_start IO::AIO::poll_fileno;
3607		3789
3608	cf::sync_job {	3790	cf::sync_job {
3609	cf::init_experience;	3791	cf::incloader::init ();
		3792
3610	cf::init_anim;	3793	cf::init_anim;
3611	cf::init_attackmess;	3794	cf::init_attackmess;
3612	cf::init_dynamic;	3795	cf::init_dynamic;
3613		3796
3614	cf::load_settings;	3797	cf::load_settings;
3615	cf::load_materials;
3616		3798
3617	reload_resources;	3799	reload_resources;
3618	reload_config;	3800	reload_config;
3619	db_init;	3801	db_init;
3620		3802
…		…
3632		3814
3633	# no (long-running) fork's whatsoever before this point(!)	3815	# no (long-running) fork's whatsoever before this point(!)
3634	use POSIX ();	3816	use POSIX ();
3635	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3817	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3636		3818
3637	(pop @POST_INIT)->(0) while @POST_INIT;	3819	cf::_post_init 0;
3638	};	3820	};
3639		3821
3640	cf::object::thawer::errors_are_fatal 0;	3822	cf::object::thawer::errors_are_fatal 0;
3641	info "parse errors in files are no longer fatal from this point on.\n";	3823	info "parse errors in files are no longer fatal from this point on.\n";
3642		3824
		3825	AE::postpone {
		3826	undef &main; # free gobs of memory :)
		3827	};
		3828
3643	main_loop;	3829	goto &main_loop;
3644	}	3830	}
3645		3831
3646	#############################################################################	3832	#############################################################################
3647	# initialisation and cleanup	3833	# initialisation and cleanup
3648		3834
…		…
3747	sub emergency_save() {	3933	sub emergency_save() {
3748	my $freeze_guard = cf::freeze_mainloop;	3934	my $freeze_guard = cf::freeze_mainloop;
3749		3935
3750	info "emergency_perl_save: enter\n";	3936	info "emergency_perl_save: enter\n";
3751		3937
		3938	# this is a trade-off: we want to be very quick here, so
		3939	# save all maps without fsync, and later call a global sync
		3940	# (which in turn might be very very slow)
		3941	local $USE_FSYNC = 0;
		3942
3752	cf::sync_job {	3943	cf::sync_job {
3753	# this is a trade-off: we want to be very quick here, so	3944	cf::write_runtime_sync; # external watchdog should not bark
3754	# save all maps without fsync, and later call a global sync
3755	# (which in turn might be very very slow)
3756	local $USE_FSYNC = 0;
3757		3945
3758	# use a peculiar iteration method to avoid tripping on perl	3946	# use a peculiar iteration method to avoid tripping on perl
3759	# refcount bugs in for. also avoids problems with players	3947	# refcount bugs in for. also avoids problems with players
3760	# and maps saved/destroyed asynchronously.	3948	# and maps saved/destroyed asynchronously.
3761	info "emergency_perl_save: begin player save\n";	3949	info "emergency_perl_save: begin player save\n";
…		…
3765	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3953	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3766	$pl->save;	3954	$pl->save;
3767	}	3955	}
3768	info "emergency_perl_save: end player save\n";	3956	info "emergency_perl_save: end player save\n";
3769		3957
		3958	cf::write_runtime_sync; # external watchdog should not bark
		3959
3770	info "emergency_perl_save: begin map save\n";	3960	info "emergency_perl_save: begin map save\n";
3771	for my $path (keys %cf::MAP) {	3961	for my $path (keys %cf::MAP) {
3772	my $map = $cf::MAP{$path} or next;	3962	my $map = $cf::MAP{$path} or next;
3773	$map->valid or next;	3963	$map->valid or next;
3774	$map->save;	3964	$map->save;
3775	}	3965	}
3776	info "emergency_perl_save: end map save\n";	3966	info "emergency_perl_save: end map save\n";
3777		3967
		3968	cf::write_runtime_sync; # external watchdog should not bark
		3969
3778	info "emergency_perl_save: begin database checkpoint\n";	3970	info "emergency_perl_save: begin database checkpoint\n";
3779	BDB::db_env_txn_checkpoint $DB_ENV;	3971	BDB::db_env_txn_checkpoint $DB_ENV;
3780	info "emergency_perl_save: end database checkpoint\n";	3972	info "emergency_perl_save: end database checkpoint\n";
3781		3973
3782	info "emergency_perl_save: begin write uuid\n";	3974	info "emergency_perl_save: begin write uuid\n";
3783	write_uuid_sync 1;	3975	write_uuid_sync 1;
3784	info "emergency_perl_save: end write uuid\n";	3976	info "emergency_perl_save: end write uuid\n";
3785	};
3786		3977
		3978	cf::write_runtime_sync; # external watchdog should not bark
		3979
		3980	trace "emergency_perl_save: syncing database to disk";
		3981	BDB::db_env_txn_checkpoint $DB_ENV;
		3982
3787	info "emergency_perl_save: starting sync()\n";	3983	info "emergency_perl_save: starting sync\n";
3788	IO::AIO::aio_sync sub {	3984	IO::AIO::aio_sync sub {
3789	info "emergency_perl_save: finished sync()\n";	3985	info "emergency_perl_save: finished sync\n";
		3986	};
		3987
		3988	cf::write_runtime_sync; # external watchdog should not bark
		3989
		3990	trace "emergency_perl_save: flushing outstanding aio requests";
		3991	while (IO::AIO::nreqs || BDB::nreqs) {
		3992	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
		3993	}
		3994
		3995	cf::write_runtime_sync; # external watchdog should not bark
3790	};	3996	};
3791		3997
3792	info "emergency_perl_save: leave\n";	3998	info "emergency_perl_save: leave\n";
3793	}	3999	}
3794		4000
3795	sub post_cleanup {	4001	sub post_cleanup {
3796	my ($make_core) = @_;	4002	my ($make_core) = @_;
		4003
		4004	IO::AIO::flush;
3797		4005
3798	error Carp::longmess "post_cleanup backtrace"	4006	error Carp::longmess "post_cleanup backtrace"
3799	if $make_core;	4007	if $make_core;
3800		4008
3801	my $fh = pidfile;	4009	my $fh = pidfile;
…		…
3827	}	4035	}
3828	}	4036	}
3829		4037
3830	sub do_reload_perl() {	4038	sub do_reload_perl() {
3831	# can/must only be called in main	4039	# can/must only be called in main
3832	if (in_main) {	4040	unless (in_main) {
3833	error "can only reload from main coroutine";	4041	error "can only reload from main coroutine";
3834	return;	4042	return;
3835	}	4043	}
3836		4044
3837	return if $RELOAD++;	4045	return if $RELOAD++;
3838		4046
3839	my $t1 = AE::time;	4047	my $t1 = AE::time;
3840		4048
3841	while ($RELOAD) {	4049	while ($RELOAD) {
		4050	cf::get_slot 0.1, -1, "reload_perl";
3842	info "reloading...";	4051	info "perl_reload: reloading...";
3843		4052
3844	trace "entering sync_job";	4053	trace "perl_reload: entering sync_job";
3845		4054
3846	cf::sync_job {	4055	cf::sync_job {
3847	cf::write_runtime_sync; # external watchdog should not bark
3848	cf::emergency_save;	4056	#cf::emergency_save;
3849	cf::write_runtime_sync; # external watchdog should not bark
3850		4057
3851	trace "syncing database to disk";
3852	BDB::db_env_txn_checkpoint $DB_ENV;
3853
3854	# if anything goes wrong in here, we should simply crash as we already saved
3855
3856	trace "flushing outstanding aio requests";
3857	while (IO::AIO::nreqs || BDB::nreqs) {
3858	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3859	}
3860
3861	trace "cancelling all extension coros";	4058	trace "perl_reload: cancelling all extension coros";
3862	$_->cancel for values %EXT_CORO;	4059	$_->cancel for values %EXT_CORO;
3863	%EXT_CORO = ();	4060	%EXT_CORO = ();
3864		4061
3865	trace "removing commands";	4062	trace "perl_reload: removing commands";
3866	%COMMAND = ();	4063	%COMMAND = ();
3867		4064
3868	trace "removing ext/exti commands";	4065	trace "perl_reload: removing ext/exti commands";
3869	%EXTCMD = ();	4066	%EXTCMD = ();
3870	%EXTICMD = ();	4067	%EXTICMD = ();
3871		4068
3872	trace "unloading/nuking all extensions";	4069	trace "perl_reload: unloading/nuking all extensions";
3873	for my $pkg (@EXTS) {	4070	for my $pkg (@EXTS) {
3874	trace "... unloading $pkg";	4071	trace "... unloading $pkg";
3875		4072
3876	if (my $cb = $pkg->can ("unload")) {	4073	if (my $cb = $pkg->can ("unload")) {
3877	eval {	4074	eval {
…		…
3882		4079
3883	trace "... clearing $pkg";	4080	trace "... clearing $pkg";
3884	clear_package $pkg;	4081	clear_package $pkg;
3885	}	4082	}
3886		4083
3887	trace "unloading all perl modules loaded from $LIBDIR";	4084	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3888	while (my ($k, $v) = each %INC) {	4085	while (my ($k, $v) = each %INC) {
3889	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4086	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3890		4087
3891	trace "... unloading $k";	4088	trace "... unloading $k";
3892	delete $INC{$k};	4089	delete $INC{$k};
…		…
3899	}	4096	}
3900		4097
3901	clear_package $k;	4098	clear_package $k;
3902	}	4099	}
3903		4100
3904	trace "getting rid of safe::, as good as possible";	4101	trace "perl_reload: getting rid of safe::, as good as possible";
3905	clear_package "safe::$_"	4102	clear_package "safe::$_"
3906	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4103	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3907		4104
3908	trace "unloading cf.pm \"a bit\"";	4105	trace "perl_reload: unloading cf.pm \"a bit\"";
3909	delete $INC{"cf.pm"};	4106	delete $INC{"cf.pm"};
3910	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4107	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3911		4108
3912	# don't, removes xs symbols, too,	4109	# don't, removes xs symbols, too,
3913	# and global variables created in xs	4110	# and global variables created in xs
3914	#clear_package __PACKAGE__;	4111	#clear_package __PACKAGE__;
3915		4112
3916	info "unload completed, starting to reload now";	4113	info "perl_reload: unload completed, starting to reload now";
3917		4114
3918	trace "reloading cf.pm";	4115	trace "perl_reload: reloading cf.pm";
3919	require cf;	4116	require cf;
3920	cf::_connect_to_perl_1;	4117	cf::_connect_to_perl_1;
3921		4118
3922	trace "loading config and database again";	4119	trace "perl_reload: loading config and database again";
3923	cf::reload_config;	4120	cf::reload_config;
3924		4121
3925	trace "loading extensions";	4122	trace "perl_reload: loading extensions";
3926	cf::load_extensions;	4123	cf::load_extensions;
3927		4124
3928	if ($REATTACH_ON_RELOAD) {	4125	if ($REATTACH_ON_RELOAD) {
3929	trace "reattaching attachments to objects/players";	4126	trace "perl_reload: reattaching attachments to objects/players";
3930	_global_reattach; # objects, sockets	4127	_global_reattach; # objects, sockets
3931	trace "reattaching attachments to maps";	4128	trace "perl_reload: reattaching attachments to maps";
3932	reattach $_ for values %MAP;	4129	reattach $_ for values %MAP;
3933	trace "reattaching attachments to players";	4130	trace "perl_reload: reattaching attachments to players";
3934	reattach $_ for values %PLAYER;	4131	reattach $_ for values %PLAYER;
3935	}	4132	}
3936		4133
3937	trace "running post_init jobs";	4134	cf::_post_init 1;
3938	(pop @POST_INIT)->(1) while @POST_INIT;
3939		4135
3940	trace "leaving sync_job";	4136	trace "perl_reload: leaving sync_job";
3941		4137
3942	1	4138	1
3943	} or do {	4139	} or do {
3944	error $@;	4140	error $@;
3945	cf::cleanup "error while reloading, exiting.";	4141	cf::cleanup "perl_reload: error, exiting.";
3946	};	4142	};
3947		4143
3948	info "reloaded";
3949	--$RELOAD;	4144	--$RELOAD;
3950	}	4145	}
3951		4146
3952	$t1 = AE::time - $t1;	4147	$t1 = AE::time - $t1;
3953	info "reload completed in ${t1}s\n";	4148	info "perl_reload: completed in ${t1}s\n";
3954	};	4149	};
3955		4150
3956	our $RELOAD_WATCHER; # used only during reload	4151	our $RELOAD_WATCHER; # used only during reload
3957		4152
3958	sub reload_perl() {	4153	sub reload_perl() {
…		…
3979	reload_perl;	4174	reload_perl;
3980	};	4175	};
3981	}	4176	}
3982	};	4177	};
3983		4178
3984	unshift @INC, $LIBDIR;	4179	#############################################################################
3985		4180
3986	my $bug_warning = 0;	4181	my $bug_warning = 0;
3987		4182
3988	our @WAIT_FOR_TICK;
3989	our @WAIT_FOR_TICK_BEGIN;
3990
3991	sub wait_for_tick {	4183	sub wait_for_tick() {
3992	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4184	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3993		4185
3994	my $signal = new Coro::Signal;	4186	$WAIT_FOR_TICK->wait;
3995	push @WAIT_FOR_TICK, $signal;
3996	$signal->wait;
3997	}	4187	}
3998		4188
3999	sub wait_for_tick_begin {	4189	sub wait_for_tick_begin() {
4000	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4190	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4001		4191
4002	my $signal = new Coro::Signal;	4192	my $signal = new Coro::Signal;
4003	push @WAIT_FOR_TICK_BEGIN, $signal;	4193	push @WAIT_FOR_TICK_BEGIN, $signal;
4004	$signal->wait;	4194	$signal->wait;
4005	}	4195	}
…		…
4009	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4199	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4010	unless ++$bug_warning > 10;	4200	unless ++$bug_warning > 10;
4011	return;	4201	return;
4012	}	4202	}
4013		4203
4014	cf::server_tick; # one server iteration	4204	cf::one_tick; # one server iteration
4015		4205
4016	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#	4206	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4017		4207
4018	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4208	if ($NOW >= $NEXT_RUNTIME_WRITE) {
4019	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4209	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
…		…
4025	}	4215	}
4026		4216
4027	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4217	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4028	$sig->send;	4218	$sig->send;
4029	}	4219	}
4030	while (my $sig = shift @WAIT_FOR_TICK) {	4220	$WAIT_FOR_TICK->broadcast;
4031	$sig->send;
4032	}
4033		4221
4034	$LOAD = ($NOW - $TICK_START) / $TICK;	4222	$LOAD = ($NOW - $TICK_START) / $TICK;
4035	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4223	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4036		4224
4037	if (0) {	4225	if (0) {
…		…
4046	{	4234	{
4047	# configure BDB	4235	# configure BDB
4048		4236
4049	BDB::min_parallel 16;	4237	BDB::min_parallel 16;
4050	BDB::max_poll_reqs $TICK * 0.1;	4238	BDB::max_poll_reqs $TICK * 0.1;
4051	$AnyEvent::BDB::WATCHER->priority (1);	4239	#$AnyEvent::BDB::WATCHER->priority (1);
4052		4240
4053	unless ($DB_ENV) {	4241	unless ($DB_ENV) {
4054	$DB_ENV = BDB::db_env_create;	4242	$DB_ENV = BDB::db_env_create;
4055	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4243	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4056	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4244	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4057	$DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;	4245	$DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
4058	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);	4246	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
4059	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);	4247	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
4060		4248
4061	(Coro::async { # async to keep sync_job from complaining
4062	cf::sync_job {	4249	cf::sync_job {
4063	eval {	4250	eval {
4064	BDB::db_env_open	4251	BDB::db_env_open
4065	$DB_ENV,	4252	$DB_ENV,
4066	$BDBDIR,	4253	$BDBDIR,
4067	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN	4254	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
4068	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,	4255	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
4069	0666;	4256	0666;
4070		4257
4071	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	4258	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
4072	};
4073
4074	cf::cleanup "db_env_open(db): $@" if $@;
4075	};	4259	};
4076	})->join;	4260
		4261	cf::cleanup "db_env_open(db): $@" if $@;
		4262	};
4077	}	4263	}
4078		4264
4079	$BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {	4265	$BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
4080	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };	4266	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
4081	};	4267	};
…		…
4093	IO::AIO::min_parallel 8;	4279	IO::AIO::min_parallel 8;
4094	IO::AIO::max_poll_time $TICK * 0.1;	4280	IO::AIO::max_poll_time $TICK * 0.1;
4095	undef $AnyEvent::AIO::WATCHER;	4281	undef $AnyEvent::AIO::WATCHER;
4096	}	4282	}
4097		4283
4098	my $_log_backtrace;	4284	our $_log_backtrace;
		4285	our $_log_backtrace_last;
4099		4286
4100	sub _log_backtrace {	4287	sub _log_backtrace {
4101	my ($msg, @addr) = @_;	4288	my ($msg, @addr) = @_;
4102		4289
4103	$msg =~ s/\n//;	4290	$msg =~ s/\n$//;
4104		4291
		4292	if ($_log_backtrace_last eq $msg) {
		4293	LOG llevInfo, "[ABT] $msg\n";
		4294	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4105	# limit the # of concurrent backtraces	4295	# limit the # of concurrent backtraces
4106	if ($_log_backtrace < 2) {	4296	} elsif ($_log_backtrace < 2) {
		4297	$_log_backtrace_last = $msg;
4107	++$_log_backtrace;	4298	++$_log_backtrace;
4108	my $perl_bt = Carp::longmess $msg;	4299	my $perl_bt = Carp::longmess $msg;
4109	async {	4300	async {
4110	$Coro::current->{desc} = "abt $msg";	4301	$Coro::current->{desc} = "abt $msg";
4111		4302
…		…
4131	LOG llevInfo, "[ABT] $_\n" for @bt;	4322	LOG llevInfo, "[ABT] $_\n" for @bt;
4132	--$_log_backtrace;	4323	--$_log_backtrace;
4133	};	4324	};
4134	} else {	4325	} else {
4135	LOG llevInfo, "[ABT] $msg\n";	4326	LOG llevInfo, "[ABT] $msg\n";
4136	LOG llevInfo, "[ABT] [suppressed]\n";	4327	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4137	}	4328	}
4138	}	4329	}
4139		4330
4140	# load additional modules	4331	# load additional modules
4141	require "cf/$_.pm" for @EXTRA_MODULES;	4332	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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