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.532 by root, Thu Apr 29 07:32:34 2010 UTC vs.
Revision 1.613 by root, Mon Nov 26 13:12:16 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 ();
60	use IO::AIO ();	62	use IO::AIO ();
61	use Time::HiRes;
62	use Compress::LZF;	63	use Compress::LZF;
63	use Digest::MD5 ();	64	use Digest::MD5 ();
64		65
65	AnyEvent::detect;	66	AnyEvent::detect;
66		67
…		…
78	# strictly for debugging	79	# strictly for debugging
79	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };	80	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80		81
81	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	82	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82		83
		84	our @ORIG_INC;
		85
83	our %COMMAND = ();	86	our %COMMAND = ();
84	our %COMMAND_TIME = ();	87	our %COMMAND_TIME = ();
85		88
86	our @EXTS = (); # list of extension package names	89	our @EXTS = (); # list of extension package names
87	our %EXTCMD = ();	90	our %EXTCMD = ();
		91	our %EXTACMD = ();
88	our %EXTICMD = ();	92	our %EXTICMD = ();
		93	our %EXTIACMD = ();
89	our %EXT_CORO = (); # coroutines bound to extensions	94	our %EXT_CORO = (); # coroutines bound to extensions
90	our %EXT_MAP = (); # pluggable maps	95	our %EXT_MAP = (); # pluggable maps
91		96
92	our $RELOAD; # number of reloads so far, non-zero while in reload	97	our $RELOAD; # number of reloads so far, non-zero while in reload
93	our @EVENT;	98	our @EVENT;
94	our @REFLECT; # set by XS	99	our @REFLECT; # set by XS
95	our %REFLECT; # set by us	100	our %REFLECT; # set by us
96		101
97	our $CONFDIR = confdir;	102	our $CONFDIR = confdir;
		103
98	our $DATADIR = datadir;	104	our $DATADIR = datadir;
99	our $LIBDIR = "$DATADIR/ext";	105	our $LIBDIR = "$DATADIR/ext";
100	our $PODDIR = "$DATADIR/pod";	106	our $PODDIR = "$DATADIR/pod";
101	our $MAPDIR = "$DATADIR/" . mapdir;	107	our $MAPDIR = "$DATADIR/" . mapdir;
		108
102	our $LOCALDIR = localdir;	109	our $LOCALDIR = localdir;
103	our $TMPDIR = "$LOCALDIR/" . tmpdir;	110	our $TMPDIR = "$LOCALDIR/" . tmpdir;
104	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	111	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	112	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106	our $RANDOMDIR = "$LOCALDIR/random";	113	our $RANDOMDIR = "$LOCALDIR/random";
107	our $BDBDIR = "$LOCALDIR/db";	114	our $BDBDIR = "$LOCALDIR/db";
108	our $PIDFILE = "$LOCALDIR/pid";	115	our $PIDFILE = "$LOCALDIR/pid";
109	our $RUNTIMEFILE = "$LOCALDIR/runtime";	116	our $RUNTIMEFILE = "$LOCALDIR/runtime";
110		117
111	our %RESOURCE; # unused	118	#our %RESOURCE; # unused
112		119
113	our $OUTPUT_RATE_MIN = 3000;	120	our $OUTPUT_RATE_MIN = 3000;
114	our $OUTPUT_RATE_MAX = 1000000;	121	our $OUTPUT_RATE_MAX = 1000000;
115		122
116	our $MAX_LINKS = 32; # how many chained exits to follow	123	our $MAX_LINKS = 32; # how many chained exits to follow
…		…
124	our $BDB_DEADLOCK_WATCHER;	131	our $BDB_DEADLOCK_WATCHER;
125	our $BDB_CHECKPOINT_WATCHER;	132	our $BDB_CHECKPOINT_WATCHER;
126	our $BDB_TRICKLE_WATCHER;	133	our $BDB_TRICKLE_WATCHER;
127	our $DB_ENV;	134	our $DB_ENV;
128		135
129	our @EXTRA_MODULES = qw(pod match mapscript);	136	our @EXTRA_MODULES = qw(pod match mapscript incloader);
130		137
131	our %CFG;	138	our %CFG;
		139	our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
132		140
133	our $UPTIME; $UPTIME ||= time;	141	our $UPTIME; $UPTIME ||= time;
134	our $RUNTIME;	142	our $RUNTIME = 0;
		143	our $SERVER_TICK = 0;
135	our $NOW;	144	our $NOW;
136		145
137	our (%PLAYER, %PLAYER_LOADING); # all users	146	our (%PLAYER, %PLAYER_LOADING); # all users
138	our (%MAP, %MAP_LOADING ); # all maps	147	our (%MAP, %MAP_LOADING ); # all maps
139	our $LINK_MAP; # the special {link} map, which is always available	148	our $LINK_MAP; # the special {link} map, which is always available
…		…
148		157
149	our @POST_INIT;	158	our @POST_INIT;
150		159
151	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)	160	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152	our $REALLY_UNLOOP; # never set to true, please :)	161	our $REALLY_UNLOOP; # never set to true, please :)
		162
		163	our $WAIT_FOR_TICK = new Coro::Signal;
		164	our @WAIT_FOR_TICK_BEGIN;
153		165
154	binmode STDOUT;	166	binmode STDOUT;
155	binmode STDERR;	167	binmode STDERR;
156		168
157	# read virtual server time, if available	169	# read virtual server time, if available
…		…
191		203
192	=over 4	204	=over 4
193		205
194	=item $cf::UPTIME	206	=item $cf::UPTIME
195		207
196	The timestamp of the server start (so not actually an uptime).	208	The timestamp of the server start (so not actually an "uptime").
		209
		210	=item $cf::SERVER_TICK
		211
		212	An unsigned integer that starts at zero when the server is started and is
		213	incremented on every tick.
		214
		215	=item $cf::NOW
		216
		217	The (real) time of the last (current) server tick - updated before and
		218	after tick processing, so this is useful only as a rough "what time is it
		219	now" estimate.
		220
		221	=item $cf::TICK
		222
		223	The interval between each server tick, in seconds.
197		224
198	=item $cf::RUNTIME	225	=item $cf::RUNTIME
199		226
200	The time this server has run, starts at 0 and is increased by $cf::TICK on	227	The time this server has run, starts at 0 and is increased by $cf::TICK on
201	every server tick.	228	every server tick.
202		229
203	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR	230	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
204	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR	231	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
205	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR	232	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
206		233
207	Various directories - "/etc", read-only install directory, perl-library	234	Various directories - "/etc", read-only install directory, perl-library
208	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	235	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
209	unique-items directory, player file directory, random maps directory and	236	unique-items directory, player file directory, random maps directory and
210	database environment.	237	database environment.
211		238
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	239	=item $cf::LOADAVG
221		240
222	The current CPU load on the server (alpha-smoothed), as a value between 0	241	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	242	(none) and 1 (overloaded), indicating how much time is spent on processing
224	objects per tick. Healthy values are < 0.5.	243	objects per tick. Healthy values are < 0.5.
…		…
232	Configuration for the server, loaded from C</etc/deliantra-server/config>, or	251	Configuration for the server, loaded from C</etc/deliantra-server/config>, or
233	from wherever your confdir points to.	252	from wherever your confdir points to.
234		253
235	=item cf::wait_for_tick, cf::wait_for_tick_begin	254	=item cf::wait_for_tick, cf::wait_for_tick_begin
236		255
237	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	256	These are functions that inhibit the current coroutine one tick.
238	returns directly I<after> the tick processing (and consequently, can only wake one process	257	cf::wait_for_tick_begin only returns directly I<after> the tick
		258	processing (and consequently, can only wake one thread per tick), while
239	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	259	cf::wait_for_tick wakes up all waiters after tick processing.
		260
		261	Note that cf::wait_for_tick will immediately return when the server is not
		262	ticking, making it suitable for small pauses in threads that need to run
		263	when the server is paused. If that is not applicable (i.e. you I<really>
		264	want to wait, use C<$cf::WAIT_FOR_TICK>).
		265
		266	=item $cf::WAIT_FOR_TICK
		267
		268	Note that C<cf::wait_for_tick> is probably the correct thing to use. This
		269	variable contains a L<Coro::Signal> that is broadcats after every server
		270	tick. Calling C<< ->wait >> on it will suspend the caller until after the
		271	next server tick.
		272
		273	=cut
		274
		275	sub wait_for_tick();
		276	sub wait_for_tick_begin();
240		277
241	=item @cf::INVOKE_RESULTS	278	=item @cf::INVOKE_RESULTS
242		279
243	This array contains the results of the last C<invoke ()> call. When	280	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	281	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
…		…
305	)) {	342	)) {
306	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	343	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
307	}	344	}
308		345
309	$EV::DIED = sub {	346	$EV::DIED = sub {
310	Carp::cluck "error in event callback: @_";	347	warn "error in event callback: $@";
311	};	348	};
		349
		350	#############################################################################
		351
		352	sub fork_call(&@);
		353	sub get_slot($;$$);
312		354
313	#############################################################################	355	#############################################################################
314		356
315	=head2 UTILITY FUNCTIONS	357	=head2 UTILITY FUNCTIONS
316		358
…		…
337	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	379	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
338	$d	380	$d
339	} || "[unable to dump $_[0]: '$@']";	381	} || "[unable to dump $_[0]: '$@']";
340	}	382	}
341		383
		384	=item $scalar = cf::load_file $path
		385
		386	Loads the given file from path and returns its contents. Croaks on error
		387	and can block.
		388
		389	=cut
		390
		391	sub load_file($) {
		392	0 <= aio_load $_[0], my $data
		393	or Carp::croak "$_[0]: $!";
		394
		395	$data
		396	}
		397
		398	=item $success = cf::replace_file $path, $data, $sync
		399
		400	Atomically replaces the file at the given $path with new $data, and
		401	optionally $sync the data to disk before replacing the file.
		402
		403	=cut
		404
		405	sub replace_file($$;$) {
		406	my ($path, $data, $sync) = @_;
		407
		408	my $lock = cf::lock_acquire ("replace_file:$path");
		409
		410	my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
		411	or return;
		412
		413	$data = $data->() if ref $data;
		414
		415	length $data == aio_write $fh, 0, (length $data), $data, 0
		416	or return;
		417
		418	!$sync
		419	or !aio_fsync $fh
		420	or return;
		421
		422	aio_close $fh
		423	and return;
		424
		425	aio_rename "$path~", $path
		426	and return;
		427
		428	if ($sync) {
		429	$path =~ s%/[^/]*$%%;
		430	aio_pathsync $path;
		431	}
		432
		433	1
		434	}
		435
342	=item $ref = cf::decode_json $json	436	=item $ref = cf::decode_json $json
343		437
344	Converts a JSON string into the corresponding perl data structure.	438	Converts a JSON string into the corresponding perl data structure.
345		439
346	=item $json = cf::encode_json $ref	440	=item $json = cf::encode_json $ref
…		…
352	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	446	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
353		447
354	sub encode_json($) { $json_coder->encode ($_[0]) }	448	sub encode_json($) { $json_coder->encode ($_[0]) }
355	sub decode_json($) { $json_coder->decode ($_[0]) }	449	sub decode_json($) { $json_coder->decode ($_[0]) }
356		450
		451	=item $ref = cf::decode_storable $scalar
		452
		453	Same as Coro::Storable::thaw, so blocks.
		454
		455	=cut
		456
		457	BEGIN { *decode_storable = \&Coro::Storable::thaw }
		458
		459	=item $ref = cf::decode_yaml $scalar
		460
		461	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
		462
		463	=cut
		464
		465	sub decode_yaml($) {
		466	fork_call { YAML::XS::Load $_[0] } @_
		467	}
		468
		469	=item $scalar = cf::unlzf $scalar
		470
		471	Same as Compress::LZF::compress, but takes server ticks into account, so
		472	blocks.
		473
		474	=cut
		475
		476	sub unlzf($) {
		477	# we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
		478	cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
		479	Compress::LZF::decompress $_[0]
		480	}
		481
357	=item cf::post_init { BLOCK }	482	=item cf::post_init { BLOCK }
358		483
359	Execute the given codeblock, I<after> all extensions have been (re-)loaded,	484	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
360	but I<before> the server starts ticking again.	485	but I<before> the server starts ticking again.
361		486
362	The cdoeblock will have a single boolean argument to indicate whether this	487	The codeblock will have a single boolean argument to indicate whether this
363	is a reload or not.	488	is a reload or not.
364		489
365	=cut	490	=cut
366		491
367	sub post_init(&) {	492	sub post_init(&) {
368	push @POST_INIT, shift;	493	push @POST_INIT, shift;
		494	}
		495
		496	sub _post_init {
		497	trace "running post_init jobs";
		498
		499	# run them in parallel...
		500
		501	my @join;
		502
		503	while () {
		504	push @join, map &Coro::async ($_, 0), @POST_INIT;
		505	@POST_INIT = ();
		506
		507	@join or last;
		508
		509	(pop @join)->join;
		510	}
369	}	511	}
370		512
371	=item cf::lock_wait $string	513	=item cf::lock_wait $string
372		514
373	Wait until the given lock is available. See cf::lock_acquire.	515	Wait until the given lock is available. See cf::lock_acquire.
…		…
426	EV::periodic $start, $interval, 0, $cb	568	EV::periodic $start, $interval, 0, $cb
427	}	569	}
428		570
429	=item cf::get_slot $time[, $priority[, $name]]	571	=item cf::get_slot $time[, $priority[, $name]]
430		572
431	Allocate $time seconds of blocking CPU time at priority C<$priority>:	573	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	574	(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.	575	C<$time> seconds of cpu time till the next tick. The slot is only valid
		576	till the next cede.
		577
		578	Background jobs should use a priority less than zero, interactive jobs
		579	should use 100 or more.
434		580
435	The optional C<$name> can be used to identify the job to run. It might be	581	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.	582	used for statistical purposes and should identify the same time-class.
437		583
438	Useful for short background jobs.	584	Useful for short background jobs.
…		…
450	my $signal = new Coro::Signal;	596	my $signal = new Coro::Signal;
451	my $busy;	597	my $busy;
452		598
453	while () {	599	while () {
454	next_job:	600	next_job:
		601
		602	Coro::cede;
455		603
456	my $avail = cf::till_tick;	604	my $avail = cf::till_tick;
457		605
458	for (0 .. $#SLOT_QUEUE) {	606	for (0 .. $#SLOT_QUEUE) {
459	if ($SLOT_QUEUE[$_][0] <= $avail) {	607	if ($SLOT_QUEUE[$_][0] <= $avail) {
460	$busy = 0;	608	$busy = 0;
461	my $job = splice @SLOT_QUEUE, $_, 1, ();	609	my $job = splice @SLOT_QUEUE, $_, 1, ();
462	$job->[2]->send;	610	$job->[2]->send;
463	Coro::cede;
464	goto next_job;	611	goto next_job;
465	} else {	612	} else {
466	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;	613	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
467	}	614	}
468	}	615	}
469		616
470	if (@SLOT_QUEUE) {	617	if (@SLOT_QUEUE) {
471	# we do not use wait_for_tick() as it returns immediately when tick is inactive	618	wait_for_tick;
472	push @cf::WAIT_FOR_TICK, $signal;
473	$signal->wait;
474	} else {	619	} else {
475	$busy = 0;	620	$busy = 0;
476	Coro::schedule;	621	Coro::schedule;
477	}	622	}
478	}	623	}
…		…
518	=cut	663	=cut
519		664
520	sub sync_job(&) {	665	sub sync_job(&) {
521	my ($job) = @_;	666	my ($job) = @_;
522		667
523	if ($Coro::current == $Coro::main) {	668	if (in_main) {
524	my $time = AE::time;	669	my $time = AE::time;
525		670
526	# this is the main coro, too bad, we have to block	671	# this is the main coro, too bad, we have to block
527	# till the operation succeeds, freezing the server :/	672	# till the operation succeeds, freezing the server :/
528		673
529	LOG llevError, Carp::longmess "sync job";#d#	674	#LOG llevError, Carp::longmess "sync job";#d#
530		675
531	my $freeze_guard = freeze_mainloop;	676	my $freeze_guard = freeze_mainloop;
532		677
533	my $busy = 1;	678	my $busy = 1;
534	my @res;	679	my @res;
…		…
578	$EXT_CORO{$coro+0} = $coro;	723	$EXT_CORO{$coro+0} = $coro;
579		724
580	$coro	725	$coro
581	}	726	}
582		727
583	=item fork_call { }, $args	728	=item fork_call { }, @args
584		729
585	Executes the given code block with the given arguments in a seperate	730	Executes the given code block with the given arguments in a seperate
586	process, returning the results. Everything must be serialisable with	731	process, returning the results. Everything must be serialisable with
587	Coro::Storable. May, of course, block. Note that the executed sub may	732	Coro::Storable. May, of course, block. Note that the executed sub may
588	never block itself or use any form of event handling.	733	never block itself or use any form of event handling.
589		734
590	=cut	735	=cut
591		736
		737	sub post_fork {
		738	reset_signals;
		739	}
		740
592	sub fork_call(&@) {	741	sub fork_call(&@) {
593	my ($cb, @args) = @_;	742	my ($cb, @args) = @_;
594		743
595	# we seemingly have to make a local copy of the whole thing,
596	# otherwise perl prematurely frees the stuff :/
597	# TODO: investigate and fix (likely this will be rather laborious)
598
599	my @res = Coro::Util::fork_eval {	744	my @res = Coro::Util::fork_eval {
600	reset_signals;	745	cf::post_fork;
601	&$cb	746	&$cb
602	}, @args;	747	} @args;
603		748
604	wantarray ? @res : $res[-1]	749	wantarray ? @res : $res[-1]
605	}	750	}
606		751
607	sub objinfo {	752	sub objinfo {
…		…
657	within each server.	802	within each server.
658		803
659	=cut	804	=cut
660		805
661	sub db_table($) {	806	sub db_table($) {
		807	cf::error "db_get called from main context"
		808	if $Coro::current == $Coro::main;
		809
662	my ($name) = @_;	810	my ($name) = @_;
663	my $db = BDB::db_create $DB_ENV;	811	my $db = BDB::db_create $DB_ENV;
664		812
665	eval {	813	eval {
666	$db->set_flags (BDB::CHKSUM);	814	$db->set_flags (BDB::CHKSUM);
…		…
676	}	824	}
677		825
678	our $DB;	826	our $DB;
679		827
680	sub db_init {	828	sub db_init {
681	cf::sync_job {
682	$DB ||= db_table "db";	829	$DB ||= db_table "db";
683	};
684	}	830	}
685		831
686	sub db_get($$) {	832	sub db_get($$) {
687	my $key = "$_[0]/$_[1]";	833	my $key = "$_[0]/$_[1]";
688		834
689	cf::sync_job {	835	cf::error "db_get called from main context"
		836	if $Coro::current == $Coro::main;
		837
690	BDB::db_get $DB, undef, $key, my $data;	838	BDB::db_get $DB, undef, $key, my $data;
691		839
692	$! ? ()	840	$! ? ()
693	: $data	841	: $data
694	}
695	}	842	}
696		843
697	sub db_put($$$) {	844	sub db_put($$$) {
698	BDB::dbreq_pri 4;	845	BDB::dbreq_pri 4;
699	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	846	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
727		874
728	my @data;	875	my @data;
729	my $md5;	876	my $md5;
730		877
731	for (0 .. $#$src) {	878	for (0 .. $#$src) {
732	0 <= aio_load $src->[$_], $data[$_]	879	$data[$_] = load_file $src->[$_];
733	or Carp::croak "$src->[$_]: $!";
734	}	880	}
735		881
736	# if processing is expensive, check	882	# if processing is expensive, check
737	# checksum first	883	# checksum first
738	if (1) {	884	if (1) {
…		…
751		897
752	return db_get cache => "$id/data";	898	return db_get cache => "$id/data";
753	}	899	}
754	}	900	}
755		901
756	my $t1 = Time::HiRes::time;	902	my $t1 = EV::time;
757	my $data = $process->(\@data);	903	my $data = $process->(\@data);
758	my $t2 = Time::HiRes::time;	904	my $t2 = EV::time;
759		905
760	info "cache: '$id' processed in ", $t2 - $t1, "s\n";	906	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
761		907
762	db_put cache => "$id/data", $data;	908	db_put cache => "$id/data", $data;
763	db_put cache => "$id/md5" , $md5;	909	db_put cache => "$id/md5" , $md5;
…		…
1283	=cut	1429	=cut
1284		1430
1285	#############################################################################	1431	#############################################################################
1286	# command handling &c	1432	# command handling &c
1287		1433
1288	=item cf::register_command $name => \&callback($ob,$args);	1434	=item cf::register_command $name => \&callback($ob,$args)
1289		1435
1290	Register a callback for execution when the client sends the user command	1436	Register a callback for execution when the client sends the user command
1291	$name.	1437	$name.
1292		1438
1293	=cut	1439	=cut
…		…
1299	#warn "registering command '$name/$time' to '$caller'";	1445	#warn "registering command '$name/$time' to '$caller'";
1300		1446
1301	push @{ $COMMAND{$name} }, [$caller, $cb];	1447	push @{ $COMMAND{$name} }, [$caller, $cb];
1302	}	1448	}
1303		1449
1304	=item cf::register_extcmd $name => \&callback($pl,$packet);	1450	=item cf::register_extcmd $name => \&callback($pl,@args)
1305		1451
1306	Register a callback for execution when the client sends an (synchronous)	1452	Register a callback for execution when the client sends an (synchronous)
1307	extcmd packet. Ext commands will be processed in the order they are	1453	extcmd packet. Ext commands will be processed in the order they are
1308	received by the server, like other user commands. The first argument is	1454	received by the server, like other user commands. The first argument is
1309	the logged-in player. Ext commands can only be processed after a player	1455	the logged-in player. Ext commands can only be processed after a player
1310	has logged in successfully.	1456	has logged in successfully.
1311		1457
1312	If the callback returns something, it is sent back as if reply was being	1458	The values will be sent back to the client.
1313	called.
1314		1459
		1460	=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
		1461
		1462	Same as C<cf::register_extcmd>, but instead of returning values, the
		1463	callback needs to clal the C<$reply> function.
		1464
1315	=item cf::register_exticmd $name => \&callback($ns,$packet);	1465	=item cf::register_exticmd $name => \&callback($ns,@args)
1316		1466
1317	Register a callback for execution when the client sends an (asynchronous)	1467	Register a callback for execution when the client sends an (asynchronous)
1318	exticmd packet. Exti commands are processed by the server as soon as they	1468	exticmd packet. Exti commands are processed by the server as soon as they
1319	are received, i.e. out of order w.r.t. other commands. The first argument	1469	are received, i.e. out of order w.r.t. other commands. The first argument
1320	is a client socket. Exti commands can be received anytime, even before	1470	is a client socket. Exti commands can be received anytime, even before
1321	log-in.	1471	log-in.
1322		1472
1323	If the callback returns something, it is sent back as if reply was being	1473	The values will be sent back to the client.
1324	called.
1325		1474
1326	=cut	1475	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1327		1476
		1477	Same as C<cf::register_extcmd>, but instead of returning values, the
		1478	callback needs to clal the C<$reply> function.
		1479
		1480	=cut
		1481
1328	sub register_extcmd {	1482	sub register_extcmd($$) {
1329	my ($name, $cb) = @_;	1483	my ($name, $cb) = @_;
1330		1484
1331	$EXTCMD{$name} = $cb;	1485	$EXTCMD{$name} = $cb;
1332	}	1486	}
1333		1487
1334	sub register_exticmd {	1488	sub register_async_extcmd($$) {
1335	my ($name, $cb) = @_;	1489	my ($name, $cb) = @_;
1336		1490
		1491	$EXTACMD{$name} = $cb;
		1492	}
		1493
		1494	sub register_exticmd($$) {
		1495	my ($name, $cb) = @_;
		1496
1337	$EXTICMD{$name} = $cb;	1497	$EXTICMD{$name} = $cb;
		1498	}
		1499
		1500	sub register_async_exticmd($$) {
		1501	my ($name, $cb) = @_;
		1502
		1503	$EXTIACMD{$name} = $cb;
1338	}	1504	}
1339		1505
1340	use File::Glob ();	1506	use File::Glob ();
1341		1507
1342	cf::player->attach (	1508	cf::player->attach (
…		…
1356	my ($pl, $buf) = @_;	1522	my ($pl, $buf) = @_;
1357		1523
1358	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1524	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1359		1525
1360	if (ref $msg) {	1526	if (ref $msg) {
1361	my ($type, $reply, @payload) =	1527	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		1528
1366	my @reply;
1367
1368	if (my $cb = $EXTCMD{$type}) {	1529	if (my $cb = $EXTACMD{$type}) {
		1530	$cb->(
		1531	$pl,
		1532	sub {
		1533	$pl->ext_msg ("reply-$reply", @_)
		1534	if $reply;
		1535	},
		1536	@payload
		1537	);
		1538	} else {
		1539	my @reply;
		1540
		1541	if (my $cb = $EXTCMD{$type}) {
1369	@reply = $cb->($pl, @payload);	1542	@reply = $cb->($pl, @payload);
		1543	}
		1544
		1545	$pl->ext_msg ("reply-$reply", @reply)
		1546	if $reply;
1370	}	1547	}
1371
1372	$pl->ext_reply ($reply, @reply)
1373	if $reply;
1374		1548
1375	} else {	1549	} else {
1376	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1550	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1377	}	1551	}
1378		1552
…		…
1391	};	1565	};
1392		1566
1393	$grp	1567	$grp
1394	}	1568	}
1395		1569
		1570	sub _ext_cfg_reg($$$$) {
		1571	my ($rvar, $varname, $cfgname, $default) = @_;
		1572
		1573	$cfgname = lc $varname
		1574	unless length $cfgname;
		1575
		1576	$EXT_CFG{$cfgname} = [$rvar, $default];
		1577
		1578	$$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
		1579	}
		1580
1396	sub load_extensions {	1581	sub load_extensions {
1397	info "loading extensions...";	1582	info "loading extensions...";
		1583
		1584	%EXT_CFG = ();
1398		1585
1399	cf::sync_job {	1586	cf::sync_job {
1400	my %todo;	1587	my %todo;
1401		1588
1402	for my $path (<$LIBDIR/*.ext>) {	1589	for my $path (<$LIBDIR/*.ext>) {
…		…
1421		1608
1422	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1609	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1423	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1610	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1424		1611
1425	$ext{source} =	1612	$ext{source} =
1426	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1613	"package $pkg; use common::sense;\n"
1427	. "#line 1 \"$path\"\n{\n"	1614	. "#line 1 \"$path\"\n{\n"
1428	. $source	1615	. $source
1429	. "\n};\n1";	1616	. "\n};\n1";
1430		1617
1431	$todo{$base} = \%ext;	1618	$todo{$base} = \%ext;
…		…
1445	unless exists $done{$_};	1632	unless exists $done{$_};
1446	}	1633	}
1447		1634
1448	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1635	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1449		1636
		1637	my $source = $v->{source};
		1638
		1639	# support "CONF varname :confname = default" pseudo-statements
		1640	$source =~ s{
		1641	^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
		1642	}{
		1643	"our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
		1644	}gmxe;
		1645
1450	my $active = eval $v->{source};	1646	my $active = eval $source;
1451		1647
1452	if (length $@) {	1648	if (length $@) {
1453	error "$v->{path}: $@\n";	1649	error "$v->{path}: $@\n";
1454		1650
1455	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1651	cf::cleanup "mandatory extension '$k' failed to load, exiting."
…		…
1472		1668
1473	while (my ($k, $v) = each %todo) {	1669	while (my ($k, $v) = each %todo) {
1474	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1670	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1475	if exists $v->{meta}{mandatory};	1671	if exists $v->{meta}{mandatory};
1476	}	1672	}
		1673
		1674	last;
1477	}	1675	}
1478	}	1676	}
1479	};	1677	};
1480	}	1678	}
1481		1679
…		…
1639	my $name = $pl->ob->name;	1837	my $name = $pl->ob->name;
1640		1838
1641	$pl->{deny_save} = 1;	1839	$pl->{deny_save} = 1;
1642	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1840	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1643		1841
1644	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1842	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1645	$pl->deactivate;	1843	$pl->deactivate;
		1844
1646	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1845	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1647	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1846	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1847	ext::highscore::check ($pl->ob);
		1848
1648	$pl->ns->destroy if $pl->ns;	1849	$pl->ns->destroy if $pl->ns;
1649		1850
1650	my $path = playerdir $pl;	1851	my $path = playerdir $pl;
1651	my $temp = "$path~$cf::RUNTIME~deleting~";	1852	my $temp = "$path~$cf::RUNTIME~deleting~";
1652	aio_rename $path, $temp;	1853	aio_rename $path, $temp;
…		…
1738		1939
1739	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1940	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1740		1941
1741	Expand deliantra pod fragments into protocol xml.	1942	Expand deliantra pod fragments into protocol xml.
1742		1943
1743	=item $player->ext_reply ($msgid, @msg)
1744
1745	Sends an ext reply to the player.
1746
1747	=cut
1748
1749	sub ext_reply($$@) {
1750	my ($self, $id, @msg) = @_;
1751
1752	$self->ns->ext_reply ($id, @msg)
1753	}
1754
1755	=item $player->ext_msg ($type, @msg)	1944	=item $player->ext_msg ($type, @msg)
1756		1945
1757	Sends an ext event to the client.	1946	Sends an ext event to the client.
1758		1947
1759	=cut	1948	=cut
…		…
1818	sub generate_random_map {	2007	sub generate_random_map {
1819	my ($self, $rmp) = @_;	2008	my ($self, $rmp) = @_;
1820		2009
1821	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	2010	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1822		2011
1823	# mit "rum" bekleckern, nicht
1824	$self->_create_random_map (	2012	$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	}	2013	}
1838		2014
1839	=item cf::map->register ($regex, $prio)	2015	=item cf::map->register ($regex, $prio)
1840		2016
1841	Register a handler for the map path matching the given regex at the	2017	Register a handler for the map path matching the given regex at the
…		…
1846		2022
1847	sub register {	2023	sub register {
1848	my (undef, $regex, $prio) = @_;	2024	my (undef, $regex, $prio) = @_;
1849	my $pkg = caller;	2025	my $pkg = caller;
1850		2026
1851	no strict;
1852	push @{"$pkg\::ISA"}, __PACKAGE__;	2027	push @{"$pkg\::ISA"}, __PACKAGE__;
1853		2028
1854	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	2029	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1855	}	2030	}
1856		2031
…		…
1868	}	2043	}
1869		2044
1870	sub normalise {	2045	sub normalise {
1871	my ($path, $base) = @_;	2046	my ($path, $base) = @_;
1872		2047
1873	$path = "$path"; # make sure its a string	2048	$path = "$path"; # make sure it's a string
1874		2049
1875	$path =~ s/\.map$//;	2050	$path =~ s/\.map$//;
1876		2051
1877	# map plan:	2052	# map plan:
1878	#	2053	#
…		…
1893	$base =~ s{[^/]+/?$}{};	2068	$base =~ s{[^/]+/?$}{};
1894	$path = "$base/$path";	2069	$path = "$base/$path";
1895	}	2070	}
1896		2071
1897	for ($path) {	2072	for ($path) {
1898	redo if s{//}{/};
1899	redo if s{/\.?/}{/};	2073	redo if s{/\.?/}{/};
1900	redo if s{/[^/]+/\.\./}{/};	2074	redo if s{/[^/]+/\.\./}{/};
1901	}	2075	}
1902		2076
1903	$path	2077	$path
…		…
1917	$self->init; # pass $1 etc.	2091	$self->init; # pass $1 etc.
1918	return $self;	2092	return $self;
1919	}	2093	}
1920	}	2094	}
1921		2095
1922	Carp::cluck "unable to resolve path '$path' (base '$base').";	2096	Carp::cluck "unable to resolve path '$path' (base '$base')";
1923	()	2097	()
1924	}	2098	}
1925		2099
		2100	# may re-bless or do other evil things
1926	sub init {	2101	sub init {
1927	my ($self) = @_;	2102	my ($self) = @_;
1928		2103
1929	$self	2104	$self
1930	}	2105	}
…		…
1995	$self->{load_path} = $path;	2170	$self->{load_path} = $path;
1996		2171
1997	1	2172	1
1998	}	2173	}
1999		2174
		2175	# used to laod the header of an original map
2000	sub load_header_orig {	2176	sub load_header_orig {
2001	my ($self) = @_;	2177	my ($self) = @_;
2002		2178
2003	$self->load_header_from ($self->load_path)	2179	$self->load_header_from ($self->load_path)
2004	}	2180	}
2005		2181
		2182	# used to laod the header of an instantiated map
2006	sub load_header_temp {	2183	sub load_header_temp {
2007	my ($self) = @_;	2184	my ($self) = @_;
2008		2185
2009	$self->load_header_from ($self->save_path)	2186	$self->load_header_from ($self->save_path)
2010	}	2187	}
2011		2188
		2189	# called after loading the header from an instantiated map
2012	sub prepare_temp {	2190	sub prepare_temp {
2013	my ($self) = @_;	2191	my ($self) = @_;
2014		2192
2015	$self->last_access ((delete $self->{last_access})	2193	$self->last_access ((delete $self->{last_access})
2016	|| $cf::RUNTIME); #d#	2194	|| $cf::RUNTIME); #d#
2017	# safety	2195	# safety
2018	$self->{instantiate_time} = $cf::RUNTIME	2196	$self->{instantiate_time} = $cf::RUNTIME
2019	if $self->{instantiate_time} > $cf::RUNTIME;	2197	if $self->{instantiate_time} > $cf::RUNTIME;
2020	}	2198	}
2021		2199
		2200	# called after loading the header from an original map
2022	sub prepare_orig {	2201	sub prepare_orig {
2023	my ($self) = @_;	2202	my ($self) = @_;
2024		2203
2025	$self->{load_original} = 1;	2204	$self->{load_original} = 1;
2026	$self->{instantiate_time} = $cf::RUNTIME;	2205	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2050		2229
2051	sub find;	2230	sub find;
2052	sub find {	2231	sub find {
2053	my ($path, $origin) = @_;	2232	my ($path, $origin) = @_;
2054		2233
		2234	cf::cede_to_tick;
		2235
2055	$path = normalise $path, $origin && $origin->path;	2236	$path = normalise $path, $origin;
2056		2237
2057	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2238	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2058	my $guard2 = cf::lock_acquire "map_find:$path";	2239	my $guard2 = cf::lock_acquire "map_find:$path";
2059		2240
2060	$cf::MAP{$path} || do {	2241	$cf::MAP{$path} || do {
…		…
2091		2272
2092	{	2273	{
2093	my $guard = cf::lock_acquire "map_data:$path";	2274	my $guard = cf::lock_acquire "map_data:$path";
2094		2275
2095	return unless $self->valid;	2276	return unless $self->valid;
2096	return unless $self->in_memory == cf::MAP_SWAPPED;	2277	return unless $self->state == cf::MAP_SWAPPED;
2097
2098	$self->in_memory (cf::MAP_LOADING);
2099		2278
2100	$self->alloc;	2279	$self->alloc;
2101		2280
2102	$self->pre_load;	2281	$self->pre_load;
2103	cf::cede_to_tick;	2282	cf::cede_to_tick;
2104		2283
		2284	if (exists $self->{load_path}) {
2105	my $f = new_from_file cf::object::thawer $self->{load_path};	2285	my $f = new_from_file cf::object::thawer $self->{load_path};
2106	$f->skip_block;	2286	$f->skip_block;
2107	$self->_load_objects ($f)	2287	$self->_load_objects ($f)
2108	or return;	2288	or return;
2109		2289
2110	$self->post_load_original	2290	$self->post_load_original
2111	if delete $self->{load_original};	2291	if delete $self->{load_original};
2112		2292
2113	if (my $uniq = $self->uniq_path) {	2293	if (my $uniq = $self->uniq_path) {
2114	utf8::encode $uniq;	2294	utf8::encode $uniq;
2115	unless (aio_stat $uniq) {	2295	unless (aio_stat $uniq) {
2116	if (my $f = new_from_file cf::object::thawer $uniq) {	2296	if (my $f = new_from_file cf::object::thawer $uniq) {
2117	$self->clear_unique_items;	2297	$self->clear_unique_items;
2118	$self->_load_objects ($f);	2298	$self->_load_objects ($f);
2119	$f->resolve_delayed_derefs;	2299	$f->resolve_delayed_derefs;
		2300	}
2120	}	2301	}
2121	}	2302	}
2122	}
2123		2303
2124	$f->resolve_delayed_derefs;	2304	$f->resolve_delayed_derefs;
		2305	} else {
		2306	$self->post_load_original
		2307	if delete $self->{load_original};
		2308	}
		2309
		2310	$self->state (cf::MAP_INACTIVE);
2125		2311
2126	cf::cede_to_tick;	2312	cf::cede_to_tick;
2127	# now do the right thing for maps	2313	# now do the right thing for maps
2128	$self->link_multipart_objects;	2314	$self->link_multipart_objects;
2129	$self->difficulty ($self->estimate_difficulty)	2315	$self->difficulty ($self->estimate_difficulty)
…		…
2133	unless ($self->{deny_activate}) {	2319	unless ($self->{deny_activate}) {
2134	$self->decay_objects;	2320	$self->decay_objects;
2135	$self->fix_auto_apply;	2321	$self->fix_auto_apply;
2136	$self->update_buttons;	2322	$self->update_buttons;
2137	cf::cede_to_tick;	2323	cf::cede_to_tick;
2138	$self->activate;	2324	#$self->activate; # no longer activate maps automatically
2139	}	2325	}
2140		2326
2141	$self->{last_save} = $cf::RUNTIME;	2327	$self->{last_save} = $cf::RUNTIME;
2142	$self->last_access ($cf::RUNTIME);	2328	$self->last_access ($cf::RUNTIME);
2143
2144	$self->in_memory (cf::MAP_ACTIVE);
2145	}	2329	}
2146		2330
2147	$self->post_load;	2331	$self->post_load;
		2332
		2333	1
2148	}	2334	}
2149		2335
2150	# customize the map for a given player, i.e.	2336	# customize the map for a given player, i.e.
2151	# return the _real_ map. used by e.g. per-player	2337	# return the _real_ map. used by e.g. per-player
2152	# maps to change the path to ~playername/mappath	2338	# maps to change the path to ~playername/mappath
…		…
2160	# if $self->per_party;	2346	# if $self->per_party;
2161		2347
2162	$self	2348	$self
2163	}	2349	}
2164		2350
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 {	2351	sub find_sync {
2193	my ($path, $origin) = @_;	2352	my ($path, $origin) = @_;
2194		2353
2195	cf::sync_job { find $path, $origin }	2354	# it's a bug to call this from the main context
		2355	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
		2356	if $Coro::current == $Coro::main;
		2357
		2358	find $path, $origin
2196	}	2359	}
2197		2360
2198	sub do_load_sync {	2361	sub do_load_sync {
2199	my ($map) = @_;	2362	my ($map) = @_;
2200		2363
		2364	# it's a bug to call this from the main context
2201	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2365	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2202	if $Coro::current == $Coro::main;	2366	if $Coro::current == $Coro::main;
2203		2367
2204	cf::sync_job { $map->load };	2368	$map->load;
2205	}	2369	}
2206		2370
2207	our %MAP_PREFETCH;	2371	our %MAP_PREFETCH;
2208	our $MAP_PREFETCHER = undef;	2372	our $MAP_PREFETCHER = undef;
2209		2373
2210	sub find_async {	2374	sub find_async {
2211	my ($path, $origin, $load) = @_;	2375	my ($path, $origin, $load) = @_;
2212		2376
2213	$path = normalise $path, $origin && $origin->{path};	2377	$path = normalise $path, $origin;
2214		2378
2215	if (my $map = $cf::MAP{$path}) {	2379	if (my $map = $cf::MAP{$path}) {
2216	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2380	return $map if !$load || $map->linkable;
2217	}	2381	}
2218		2382
2219	$MAP_PREFETCH{$path} |= $load;	2383	$MAP_PREFETCH{$path} |= $load;
2220		2384
2221	$MAP_PREFETCHER ||= cf::async {	2385	$MAP_PREFETCHER ||= cf::async {
…		…
2280	sub swap_out {	2444	sub swap_out {
2281	my ($self) = @_;	2445	my ($self) = @_;
2282		2446
2283	my $lock = cf::lock_acquire "map_data:$self->{path}";	2447	my $lock = cf::lock_acquire "map_data:$self->{path}";
2284		2448
2285	return if $self->in_memory != cf::MAP_ACTIVE;	2449	return if !$self->linkable;
2286	return if $self->{deny_save};	2450	return if $self->{deny_save};
2287	return if $self->players;	2451	return if $self->players;
2288		2452
2289	# first deactivate the map and "unlink" it from the core	2453	# first deactivate the map and "unlink" it from the core
2290	$self->deactivate;	2454	$self->deactivate;
2291	$_->clear_links_to ($self) for values %cf::MAP;	2455	$_->clear_links_to ($self) for values %cf::MAP;
2292	$self->in_memory (cf::MAP_SWAPPED);	2456	$self->state (cf::MAP_SWAPPED);
2293		2457
2294	# then atomically save	2458	# then atomically save
2295	$self->_save;	2459	$self->_save;
2296		2460
2297	# then free the map	2461	# then free the map
…		…
2323		2487
2324	return if $self->players;	2488	return if $self->players;
2325		2489
2326	cf::trace "resetting map ", $self->path, "\n";	2490	cf::trace "resetting map ", $self->path, "\n";
2327		2491
2328	$self->in_memory (cf::MAP_SWAPPED);	2492	$self->state (cf::MAP_SWAPPED);
2329		2493
2330	# need to save uniques path	2494	# need to save uniques path
2331	unless ($self->{deny_save}) {	2495	unless ($self->{deny_save}) {
2332	my $uniq = $self->uniq_path; utf8::encode $uniq;	2496	my $uniq = $self->uniq_path; utf8::encode $uniq;
2333		2497
…		…
2486		2650
2487	Creates and returns a persistent reference to an object that can be stored as a string.	2651	Creates and returns a persistent reference to an object that can be stored as a string.
2488		2652
2489	=item $ob = cf::object::deref ($refstring)	2653	=item $ob = cf::object::deref ($refstring)
2490		2654
2491	returns the objetc referenced by refstring. may return undef when it cnanot find the object,	2655	returns the objetc referenced by refstring. may return undef when it cannot find the object,
2492	even if the object actually exists. May block.	2656	even if the object actually exists. May block.
2493		2657
2494	=cut	2658	=cut
2495		2659
2496	sub deref {	2660	sub deref {
…		…
2663	# use -1 or undef as default coordinates, not 0, 0	2827	# use -1 or undef as default coordinates, not 0, 0
2664	($x, $y) = ($map->enter_x, $map->enter_y)	2828	($x, $y) = ($map->enter_x, $map->enter_y)
2665	if $x <= 0 && $y <= 0;	2829	if $x <= 0 && $y <= 0;
2666		2830
2667	$map->load;	2831	$map->load;
2668	$map->load_neighbours;
2669		2832
2670	return unless $self->contr->active;	2833	return unless $self->contr->active;
2671		2834
2672	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2835	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2673	if ($self->enter_map ($map, $x, $y)) {	2836	if ($self->enter_map ($map, $x, $y)) {
…		…
2729	($path, $x, $y) = (undef, undef, undef);	2892	($path, $x, $y) = (undef, undef, undef);
2730	}	2893	}
2731	}	2894	}
2732		2895
2733	my $map = eval {	2896	my $map = eval {
2734	my $map = defined $path ? cf::map::find $path : undef;	2897	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2735		2898
2736	if ($map) {	2899	if ($map) {
2737	$map = $map->customise_for ($self);	2900	$map = $map->customise_for ($self);
2738	$map = $check->($map, $x, $y, $self) if $check && $map;	2901	$map = $check->($map, $x, $y, $self) if $check && $map;
2739	} else {	2902	} else {
…		…
2829	$Coro::current->{desc} = "enter_exit";	2992	$Coro::current->{desc} = "enter_exit";
2830		2993
2831	unless (eval {	2994	unless (eval {
2832	$self->deactivate_recursive; # just to be sure	2995	$self->deactivate_recursive; # just to be sure
2833		2996
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;	2997	my $map = cf::map::normalise $exit->slaying, $exit->map;
2843	my $x = $exit->stats->hp;	2998	my $x = $exit->stats->hp;
2844	my $y = $exit->stats->sp;	2999	my $y = $exit->stats->sp;
		3000
		3001	# special map handling
		3002	my $slaying = $exit->slaying;
		3003
		3004	# special map handling
		3005	if ($slaying eq "/!") {
		3006	my $guard = cf::lock_acquire "exit_prepare:$exit";
		3007
		3008	prepare_random_map $exit
		3009	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		3010
		3011	$map = $exit->slaying;
		3012
		3013	} elsif ($slaying eq '!up') {
		3014	$map = $exit->map->tile_path (cf::TILE_UP);
		3015	$x = $exit->x;
		3016	$y = $exit->y;
		3017
		3018	} elsif ($slaying eq '!down') {
		3019	$map = $exit->map->tile_path (cf::TILE_DOWN);
		3020	$x = $exit->x;
		3021	$y = $exit->y;
		3022	}
2845		3023
2846	$self->goto ($map, $x, $y);	3024	$self->goto ($map, $x, $y);
2847		3025
2848	# if exit is damned, update players death & WoR home-position	3026	# if exit is damned, update players death & WoR home-position
2849	$self->contr->savebed ($map, $x, $y)	3027	$self->contr->savebed ($map, $x, $y)
…		…
2864		3042
2865	=head3 cf::client	3043	=head3 cf::client
2866		3044
2867	=over 4	3045	=over 4
2868		3046
2869	=item $client->send_drawinfo ($text, $flags)
2870
2871	Sends a drawinfo packet to the client. Circumvents output buffering so
2872	should not be used under normal circumstances.
2873
2874	=cut
2875
2876	sub cf::client::send_drawinfo {
2877	my ($self, $text, $flags) = @_;
2878
2879	utf8::encode $text;
2880	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2881	}
2882
2883	=item $client->send_big_packet ($pkt)	3047	=item $client->send_big_packet ($pkt)
2884		3048
2885	Like C<send_packet>, but tries to compress large packets, and fragments	3049	Like C<send_packet>, but tries to compress large packets, and fragments
2886	them as required.	3050	them as required.
2887		3051
…		…
2905	$self->send_packet ($pkt);	3069	$self->send_packet ($pkt);
2906	}	3070	}
2907		3071
2908	=item $client->send_msg ($channel, $msg, $color, [extra...])	3072	=item $client->send_msg ($channel, $msg, $color, [extra...])
2909		3073
2910	Send a drawinfo or msg packet to the client, formatting the msg for the	3074	Send a msg packet to the client, formatting the msg for the client if
2911	client if neccessary. C<$type> should be a string identifying the type of	3075	necessary. C<$type> should be a string identifying the type of the
2912	the message, with C<log> being the default. If C<$color> is negative, suppress	3076	message, with C<log> being the default. If C<$color> is negative, suppress
2913	the message unless the client supports the msg packet.	3077	the message unless the client supports the msg packet.
2914		3078
2915	=cut	3079	=cut
2916		3080
2917	# non-persistent channels (usually the info channel)	3081	# non-persistent channels (usually the info channel)
…		…
3022	id => "death",	3186	id => "death",
3023	title => "Death",	3187	title => "Death",
3024	reply => undef,	3188	reply => undef,
3025	tooltip => "Reason for and more info about your most recent death",	3189	tooltip => "Reason for and more info about your most recent death",
3026	},	3190	},
		3191	"c/fatal" => {
		3192	id => "fatal",
		3193	title => "Fatal Error",
		3194	reply => undef,
		3195	tooltip => "Reason for the server disconnect",
		3196	},
3027	"c/say" => $SAY_CHANNEL,	3197	"c/say" => $SAY_CHANNEL,
3028	"c/chat" => $CHAT_CHANNEL,	3198	"c/chat" => $CHAT_CHANNEL,
3029	);	3199	);
3030		3200
3031	sub cf::client::send_msg {	3201	sub cf::client::send_msg {
…		…
3074	=cut	3244	=cut
3075		3245
3076	sub cf::client::ext_msg($$@) {	3246	sub cf::client::ext_msg($$@) {
3077	my ($self, $type, @msg) = @_;	3247	my ($self, $type, @msg) = @_;
3078		3248
3079	if ($self->extcmd == 2) {
3080	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3249	$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	}
3086
3087	=item $client->ext_reply ($msgid, @msg)
3088
3089	Sends an ext reply to the client.
3090
3091	=cut
3092
3093	sub cf::client::ext_reply($$@) {
3094	my ($self, $id, @msg) = @_;
3095
3096	if ($self->extcmd == 2) {
3097	$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	}	3250	}
3104		3251
3105	=item $success = $client->query ($flags, "text", \&cb)	3252	=item $success = $client->query ($flags, "text", \&cb)
3106		3253
3107	Queues a query to the client, calling the given callback with	3254	Queues a query to the client, calling the given callback with
…		…
3127		3274
3128	$self->send_packet ($self->{query_queue}[0][0])	3275	$self->send_packet ($self->{query_queue}[0][0])
3129	if @{ $self->{query_queue} } == 1;	3276	if @{ $self->{query_queue} } == 1;
3130		3277
3131	1	3278	1
		3279	}
		3280
		3281	=item $client->update_command_faces
		3282
		3283	=cut
		3284
		3285	our %COMMAND_FACE;
		3286
		3287	sub cf::client::update_command_faces {
		3288	my ($self) = @_;
		3289
		3290	my @faces = grep $_,
		3291	$COMMAND_FACE{preferred},
		3292	$COMMAND_FACE{standard},
		3293	$COMMAND_FACE{skill},
		3294	$self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
		3295	$COMMAND_FACE{emote},
		3296	;
		3297
		3298	$self->send_face ($_)
		3299	for @faces;
		3300	$self->flush_fx;
		3301
		3302	$self->ext_msg (command_list => @faces);
		3303	}
		3304
		3305	=item cf::client::set_command_face $type, $commands
		3306
		3307	=cut
		3308
		3309	sub cf::client::set_command_face {
		3310	my ($type, $list) = @_;
		3311
		3312	my $idx = &cf::face::set ( #d# ugly forward reference
		3313	"command_list/$type" => cf::FT_RSRC,
		3314	JSON::XS->new->utf8->encode ([ sort @$list ])
		3315	);
		3316
		3317	$COMMAND_FACE{$type} = $idx;
3132	}	3318	}
3133		3319
3134	cf::client->attach (	3320	cf::client->attach (
3135	on_connect => sub {	3321	on_connect => sub {
3136	my ($ns) = @_;	3322	my ($ns) = @_;
…		…
3162	my ($ns, $buf) = @_;	3348	my ($ns, $buf) = @_;
3163		3349
3164	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3350	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3165		3351
3166	if (ref $msg) {	3352	if (ref $msg) {
3167	my ($type, $reply, @payload) =	3353	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		3354
3172	my @reply;
3173
3174	if (my $cb = $EXTICMD{$type}) {	3355	if (my $cb = $EXTIACMD{$type}) {
		3356	$cb->(
		3357	$ns,
		3358	sub {
		3359	$ns->ext_msg ("reply-$reply", @_)
		3360	if $reply;
		3361	},
		3362	@payload
		3363	);
		3364	} else {
		3365	my @reply;
		3366
		3367	if (my $cb = $EXTICMD{$type}) {
3175	@reply = $cb->($ns, @payload);	3368	@reply = $cb->($ns, @payload);
		3369	}
		3370
		3371	$ns->ext_msg ("reply-$reply", @reply)
		3372	if $reply;
3176	}	3373	}
3177
3178	$ns->ext_reply ($reply, @reply)
3179	if $reply;
3180
3181	} else {	3374	} else {
3182	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3375	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3183	}	3376	}
3184		3377
3185	cf::override;	3378	cf::override;
…		…
3268	decrease split destroy change_exp value msg lore send_msg)],	3461	decrease split destroy change_exp value msg lore send_msg)],
3269	["cf::object::player" => qw(player)],	3462	["cf::object::player" => qw(player)],
3270	["cf::player" => qw(peaceful send_msg)],	3463	["cf::player" => qw(peaceful send_msg)],
3271	["cf::map" => qw(trigger)],	3464	["cf::map" => qw(trigger)],
3272	) {	3465	) {
3273	no strict 'refs';
3274	my ($pkg, @funs) = @$_;	3466	my ($pkg, @funs) = @$_;
3275	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3467	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3276	for @funs;	3468	for @funs;
3277	}	3469	}
3278		3470
…		…
3354	=cut	3546	=cut
3355		3547
3356	#############################################################################	3548	#############################################################################
3357	# the server's init and main functions	3549	# the server's init and main functions
3358		3550
		3551	{
		3552	package cf::face;
		3553
		3554	our %HASH; # hash => idx
		3555	our @DATA; # dynamically-created facedata, only faceste 0 used
		3556	our @FOFS; # file offset, if > 0
		3557	our @SIZE; # size of face, in octets
		3558	our @META; # meta hash of face, if any
		3559	our $DATAFH; # facedata filehandle
		3560
		3561	# internal api, not finalised
		3562	sub set {
		3563	my ($name, $type, $data) = @_;
		3564
		3565	my $idx = cf::face::find $name;
		3566
		3567	if ($idx) {
		3568	delete $HASH{cf::face::get_csum $idx};
		3569	} else {
		3570	$idx = cf::face::alloc $name;
		3571	}
		3572
		3573	my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
		3574
		3575	cf::face::set_type $idx, $type;
		3576	cf::face::set_csum $idx, 0, $hash;
		3577
		3578	# we need to destroy the SV itself, not just modify it, as a running ix
		3579	# might hold a reference to it: "delete" achieves that.
		3580	delete $FOFS[0][$idx];
		3581	delete $DATA[0][$idx];
		3582	$DATA[0][$idx] = $data;
		3583	$SIZE[0][$idx] = length $data;
		3584	delete $META[$idx];
		3585	$HASH{$hash} = $idx;#d#
		3586
		3587	$idx
		3588	}
		3589
		3590	sub _get_data($$$) {
		3591	my ($idx, $set, $cb) = @_;
		3592
		3593	if (defined $DATA[$set][$idx]) {
		3594	$cb->($DATA[$set][$idx]);
		3595	} elsif (my $fofs = $FOFS[$set][$idx]) {
		3596	my $size = $SIZE[$set][$idx];
		3597	my $buf;
		3598	IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
		3599	if ($_[0] == $size) {
		3600	#cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
		3601	$cb->($buf);
		3602	} else {
		3603	cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
		3604	}
		3605	};
		3606	} else {
		3607	cf::error "requested facedata for unknown face $idx#$set, ignoring.";
		3608	}
		3609	}
		3610
		3611	# rather ineffient
		3612	sub cf::face::get_data($;$) {
		3613	my ($idx, $set) = @_;
		3614
		3615	_get_data $idx, $set, Coro::rouse_cb;
		3616	Coro::rouse_wait
		3617	}
		3618
		3619	sub cf::face::ix {
		3620	my ($ns, $set, $idx, $pri) = @_;
		3621
		3622	_get_data $idx, $set, sub {
		3623	$ns->ix_send ($idx, $pri, $_[0]);
		3624	};
		3625	}
		3626	}
		3627
3359	sub load_facedata($) {	3628	sub load_facedata($) {
3360	my ($path) = @_;	3629	my ($path) = @_;
3361		3630
3362	# HACK to clear player env face cache, we need some signal framework
3363	# for this (global event?)
3364	%ext::player_env::MUSIC_FACE_CACHE = ();
3365
3366	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3631	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3367		3632
3368	trace "loading facedata from $path\n";	3633	trace "loading facedata from $path\n";
3369		3634
3370	my $facedata;	3635	my $facedata = decode_storable load_file "$path/faceinfo";
3371	0 < aio_load $path, $facedata
3372	or die "$path: $!";
3373
3374	$facedata = Coro::Storable::thaw $facedata;
3375		3636
3376	$facedata->{version} == 2	3637	$facedata->{version} == 2
3377	or cf::cleanup "$path: version mismatch, cannot proceed.";	3638	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3378		3639
3379	# patch in the exptable	3640	my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3380	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);	3641	or cf::cleanup "$path/facedata: $!, cannot proceed.";
3381	$facedata->{resource}{"res/exp_table"} = {	3642
3382	type => FT_RSRC,	3643	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3383	data => $exp_table,	3644
3384	hash => (Digest::MD5::md5 $exp_table),	3645	# BEGIN ATOMIC
3385	};	3646	# from here on, everything must be atomic - no thread switch allowed
3386	cf::cede_to_tick;	3647	my $t1 = EV::time;
3387		3648
3388	{	3649	{
3389	my $faces = $facedata->{faceinfo};	3650	my $faces = $facedata->{faceinfo};
3390		3651
3391	while (my ($face, $info) = each %$faces) {	3652	for my $face (sort keys %$faces) {
		3653	my $info = $faces->{$face};
3392	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3654	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3393		3655
3394	cf::face::set_visibility $idx, $info->{visibility};	3656	cf::face::set_visibility $idx, $info->{visibility};
3395	cf::face::set_magicmap $idx, $info->{magicmap};	3657	cf::face::set_magicmap $idx, $info->{magicmap};
3396	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3658	cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3397	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3659	cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3398		3660	cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3399	cf::cede_to_tick;	3661	$cf::face::HASH{$info->{hash64}} = $idx;
		3662	delete $cf::face::META[$idx];
3400	}	3663	}
3401		3664
3402	while (my ($face, $info) = each %$faces) {	3665	while (my ($face, $info) = each %$faces) {
3403	next unless $info->{smooth};	3666	next unless $info->{smooth};
3404		3667
…		…
3409	cf::face::set_smooth $idx, $smooth;	3672	cf::face::set_smooth $idx, $smooth;
3410	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3673	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3411	} else {	3674	} else {
3412	error "smooth face '$info->{smooth}' not found for face '$face'";	3675	error "smooth face '$info->{smooth}' not found for face '$face'";
3413	}	3676	}
3414
3415	cf::cede_to_tick;
3416	}	3677	}
3417	}	3678	}
3418		3679
3419	{	3680	{
3420	my $anims = $facedata->{animinfo};	3681	my $anims = $facedata->{animinfo};
3421		3682
3422	while (my ($anim, $info) = each %$anims) {	3683	while (my ($anim, $info) = each %$anims) {
3423	cf::anim::set $anim, $info->{frames}, $info->{facings};	3684	cf::anim::set $anim, $info->{frames}, $info->{facings};
3424	cf::cede_to_tick;
3425	}	3685	}
3426		3686
3427	cf::anim::invalidate_all; # d'oh	3687	cf::anim::invalidate_all; # d'oh
3428	}	3688	}
3429		3689
3430	{	3690	{
3431	my $res = $facedata->{resource};	3691	my $res = $facedata->{resource};
3432		3692
3433	while (my ($name, $info) = each %$res) {	3693	while (my ($name, $info) = each %$res) {
3434	if (defined $info->{type}) {	3694	if (defined (my $type = $info->{type})) {
		3695	# 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;	3696	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3436		3697
3437	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3438	cf::face::set_type $idx, $info->{type};	3698	cf::face::set_type $idx, $type;
		3699	cf::face::set_csum $idx, 0, $info->{hash};
		3700	$cf::face::SIZE[0][$idx] = $info->{size};
		3701	$cf::face::FOFS[0][$idx] = $info->{fofs};
		3702	$cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3703	$cf::face::HASH{$info->{hash}} = $idx;
3439	} else {	3704	} else {
3440	$RESOURCE{$name} = $info; # unused	3705	# $RESOURCE{$name} = $info; # unused
3441	}	3706	}
3442
3443	cf::cede_to_tick;
3444	}	3707	}
3445	}	3708	}
		3709
		3710	($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
		3711
		3712	# HACK to clear player env face cache, we need some signal framework
		3713	# for this (global event?)
		3714	%ext::player_env::MUSIC_FACE_CACHE = ();
		3715
		3716	# END ATOMIC
		3717
		3718	cf::debug "facedata atomic update time ", EV::time - $t1;
3446		3719
3447	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3720	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
		3721
		3722	aio_close $fh if $fh; # close old facedata
3448		3723
3449	1	3724	1
3450	}	3725	}
3451		3726
3452	register_exticmd fx_want => sub {	3727	register_exticmd fx_want => sub {
…		…
3463	my $status = load_resource_file_ $_[0];	3738	my $status = load_resource_file_ $_[0];
3464	get_slot 0.1, 100;	3739	get_slot 0.1, 100;
3465	cf::arch::commit_load;	3740	cf::arch::commit_load;
3466		3741
3467	$status	3742	$status
		3743	}
		3744
		3745	sub reload_exp_table {
		3746	_reload_exp_table;
		3747
		3748	cf::face::set
		3749	"res/exp_table" => FT_RSRC,
		3750	JSON::XS->new->utf8->canonical->encode (
		3751	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3752	);
		3753	}
		3754
		3755	sub reload_materials {
		3756	_reload_materials;
3468	}	3757	}
3469		3758
3470	sub reload_regions {	3759	sub reload_regions {
3471	# HACK to clear player env face cache, we need some signal framework	3760	# HACK to clear player env face cache, we need some signal framework
3472	# for this (global event?)	3761	# for this (global event?)
…		…
3480	if exists $_->{match};	3769	if exists $_->{match};
3481	}	3770	}
3482	}	3771	}
3483		3772
3484	sub reload_facedata {	3773	sub reload_facedata {
3485	load_facedata "$DATADIR/facedata"	3774	load_facedata $DATADIR
3486	or die "unable to load facedata\n";	3775	or die "unable to load facedata\n";
3487	}	3776	}
3488		3777
3489	sub reload_archetypes {	3778	sub reload_archetypes {
3490	load_resource_file "$DATADIR/archetypes"	3779	load_resource_file "$DATADIR/archetypes"
3491	or die "unable to load archetypes\n";	3780	or die "unable to load archetypes\n";
		3781
		3782	cf::face::set
		3783	"res/skill_info" => FT_RSRC,
		3784	JSON::XS->new->utf8->canonical->encode (
		3785	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3786	);
		3787
		3788	cf::face::set
		3789	"res/spell_paths" => FT_RSRC,
		3790	JSON::XS->new->utf8->canonical->encode (
		3791	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3792	);
		3793
		3794	# command completion
		3795	my @commands;
		3796
		3797	for (0..cf::arch::skillvec_size - 1) {
		3798	my $skill = cf::arch::skillvec $_;
		3799	my $name = $skill->name;
		3800	my $flags = cf::skill_flags $skill->subtype;
		3801
		3802	push @commands, "ready_skill $name" if $flags & (SF_COMBAT | SF_RANGED | SF_GRACE);
		3803	push @commands, "use_skill $name" if $flags & (SF_USE | SF_AUTARK | SF_GRACE);
		3804	}
		3805
		3806	cf::client::set_command_face skill => \@commands;
3492	}	3807	}
3493		3808
3494	sub reload_treasures {	3809	sub reload_treasures {
3495	load_resource_file "$DATADIR/treasures"	3810	load_resource_file "$DATADIR/treasures"
3496	or die "unable to load treasurelists\n";	3811	or die "unable to load treasurelists\n";
3497	}	3812	}
3498		3813
3499	sub reload_sound {	3814	sub reload_sound {
3500	trace "loading sound config from $DATADIR/sound\n";	3815	trace "loading sound config from $DATADIR/sound\n";
3501		3816
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);	3817	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3506		3818
3507	for (0 .. SOUND_CAST_SPELL_0 - 1) {	3819	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3508	my $sound = $soundconf->{compat}[$_]	3820	my $sound = $soundconf->{compat}[$_]
3509	or next;	3821	or next;
3510		3822
…		…
3520	}	3832	}
3521		3833
3522	sub reload_resources {	3834	sub reload_resources {
3523	trace "reloading resource files...\n";	3835	trace "reloading resource files...\n";
3524		3836
		3837	reload_materials;
3525	reload_facedata;	3838	reload_facedata;
		3839	reload_exp_table;
3526	reload_sound;	3840	reload_sound;
3527	reload_archetypes;	3841	reload_archetypes;
3528	reload_regions;	3842	reload_regions;
3529	reload_treasures;	3843	reload_treasures;
3530		3844
…		…
3532	}	3846	}
3533		3847
3534	sub reload_config {	3848	sub reload_config {
3535	trace "reloading config file...\n";	3849	trace "reloading config file...\n";
3536		3850
3537	open my $fh, "<:utf8", "$CONFDIR/config"	3851	my $config = load_file "$CONFDIR/config";
3538	or return;	3852	utf8::decode $config;
3539		3853	*CFG = decode_yaml $config;
3540	local $/;
3541	*CFG = YAML::XS::Load scalar <$fh>;
3542		3854
3543	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];	3855	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3544		3856
3545	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3857	$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};	3858	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
3550	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3862	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3551	and die "WARNING: m(un)lockall failed: $!\n";	3863	and die "WARNING: m(un)lockall failed: $!\n";
3552	};	3864	};
3553	warn $@ if $@;	3865	warn $@ if $@;
3554	}	3866	}
3555
3556	trace "finished reloading resource files\n";
3557	}	3867	}
3558		3868
3559	sub pidfile() {	3869	sub pidfile() {
3560	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3870	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3561	or die "$PIDFILE: $!";	3871	or die "$PIDFILE: $!";
…		…
3586		3896
3587	sub main {	3897	sub main {
3588	cf::init_globals; # initialise logging	3898	cf::init_globals; # initialise logging
3589		3899
3590	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3900	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3591	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3901	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3592	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3902	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3593	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3903	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3594		3904
3595	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3905	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3596		3906
3597	# we must not ever block the main coroutine	3907	# we must not ever block the main coroutine
3598	local $Coro::idle = sub {	3908	$Coro::idle = sub {
3599	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3909	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3600	(async {	3910	(async {
3601	$Coro::current->{desc} = "IDLE BUG HANDLER";	3911	$Coro::current->{desc} = "IDLE BUG HANDLER";
3602	EV::loop EV::LOOP_ONESHOT;	3912	EV::loop EV::LOOP_ONESHOT;
3603	})->prio (Coro::PRIO_MAX);	3913	})->prio (Coro::PRIO_MAX);
3604	};	3914	};
3605		3915
3606	evthread_start IO::AIO::poll_fileno;	3916	evthread_start IO::AIO::poll_fileno;
3607		3917
3608	cf::sync_job {	3918	cf::sync_job {
3609	cf::init_experience;	3919	cf::incloader::init ();
		3920
		3921	db_init;
		3922
3610	cf::init_anim;	3923	cf::init_anim;
3611	cf::init_attackmess;	3924	cf::init_attackmess;
3612	cf::init_dynamic;	3925	cf::init_dynamic;
3613		3926
3614	cf::load_settings;	3927	cf::load_settings;
3615	cf::load_materials;
3616		3928
3617	reload_resources;	3929	reload_resources;
3618	reload_config;	3930	reload_config;
3619	db_init;
3620		3931
3621	cf::init_uuid;	3932	cf::init_uuid;
3622	cf::init_signals;	3933	cf::init_signals;
3623	cf::init_skills;	3934	cf::init_skills;
3624		3935
…		…
3632		3943
3633	# no (long-running) fork's whatsoever before this point(!)	3944	# no (long-running) fork's whatsoever before this point(!)
3634	use POSIX ();	3945	use POSIX ();
3635	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3946	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3636		3947
3637	(pop @POST_INIT)->(0) while @POST_INIT;	3948	cf::_post_init 0;
3638	};	3949	};
3639		3950
3640	cf::object::thawer::errors_are_fatal 0;	3951	cf::object::thawer::errors_are_fatal 0;
3641	info "parse errors in files are no longer fatal from this point on.\n";	3952	info "parse errors in files are no longer fatal from this point on.\n";
3642		3953
		3954	AE::postpone {
		3955	undef &main; # free gobs of memory :)
		3956	};
		3957
3643	main_loop;	3958	goto &main_loop;
3644	}	3959	}
3645		3960
3646	#############################################################################	3961	#############################################################################
3647	# initialisation and cleanup	3962	# initialisation and cleanup
3648		3963
…		…
3747	sub emergency_save() {	4062	sub emergency_save() {
3748	my $freeze_guard = cf::freeze_mainloop;	4063	my $freeze_guard = cf::freeze_mainloop;
3749		4064
3750	info "emergency_perl_save: enter\n";	4065	info "emergency_perl_save: enter\n";
3751		4066
		4067	# this is a trade-off: we want to be very quick here, so
		4068	# save all maps without fsync, and later call a global sync
		4069	# (which in turn might be very very slow)
		4070	local $USE_FSYNC = 0;
		4071
3752	cf::sync_job {	4072	cf::sync_job {
3753	# this is a trade-off: we want to be very quick here, so	4073	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		4074
3758	# use a peculiar iteration method to avoid tripping on perl	4075	# use a peculiar iteration method to avoid tripping on perl
3759	# refcount bugs in for. also avoids problems with players	4076	# refcount bugs in for. also avoids problems with players
3760	# and maps saved/destroyed asynchronously.	4077	# and maps saved/destroyed asynchronously.
3761	info "emergency_perl_save: begin player save\n";	4078	info "emergency_perl_save: begin player save\n";
…		…
3765	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	4082	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3766	$pl->save;	4083	$pl->save;
3767	}	4084	}
3768	info "emergency_perl_save: end player save\n";	4085	info "emergency_perl_save: end player save\n";
3769		4086
		4087	cf::write_runtime_sync; # external watchdog should not bark
		4088
3770	info "emergency_perl_save: begin map save\n";	4089	info "emergency_perl_save: begin map save\n";
3771	for my $path (keys %cf::MAP) {	4090	for my $path (keys %cf::MAP) {
3772	my $map = $cf::MAP{$path} or next;	4091	my $map = $cf::MAP{$path} or next;
3773	$map->valid or next;	4092	$map->valid or next;
3774	$map->save;	4093	$map->save;
3775	}	4094	}
3776	info "emergency_perl_save: end map save\n";	4095	info "emergency_perl_save: end map save\n";
3777		4096
		4097	cf::write_runtime_sync; # external watchdog should not bark
		4098
3778	info "emergency_perl_save: begin database checkpoint\n";	4099	info "emergency_perl_save: begin database checkpoint\n";
3779	BDB::db_env_txn_checkpoint $DB_ENV;	4100	BDB::db_env_txn_checkpoint $DB_ENV;
3780	info "emergency_perl_save: end database checkpoint\n";	4101	info "emergency_perl_save: end database checkpoint\n";
3781		4102
3782	info "emergency_perl_save: begin write uuid\n";	4103	info "emergency_perl_save: begin write uuid\n";
3783	write_uuid_sync 1;	4104	write_uuid_sync 1;
3784	info "emergency_perl_save: end write uuid\n";	4105	info "emergency_perl_save: end write uuid\n";
3785	};
3786		4106
		4107	cf::write_runtime_sync; # external watchdog should not bark
		4108
		4109	trace "emergency_perl_save: syncing database to disk";
		4110	BDB::db_env_txn_checkpoint $DB_ENV;
		4111
3787	info "emergency_perl_save: starting sync()\n";	4112	info "emergency_perl_save: starting sync\n";
3788	IO::AIO::aio_sync sub {	4113	IO::AIO::aio_sync sub {
3789	info "emergency_perl_save: finished sync()\n";	4114	info "emergency_perl_save: finished sync\n";
		4115	};
		4116
		4117	cf::write_runtime_sync; # external watchdog should not bark
		4118
		4119	trace "emergency_perl_save: flushing outstanding aio requests";
		4120	while (IO::AIO::nreqs || BDB::nreqs) {
		4121	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
		4122	}
		4123
		4124	cf::write_runtime_sync; # external watchdog should not bark
3790	};	4125	};
3791		4126
3792	info "emergency_perl_save: leave\n";	4127	info "emergency_perl_save: leave\n";
3793	}	4128	}
3794		4129
3795	sub post_cleanup {	4130	sub post_cleanup {
3796	my ($make_core) = @_;	4131	my ($make_core) = @_;
		4132
		4133	IO::AIO::flush;
3797		4134
3798	error Carp::longmess "post_cleanup backtrace"	4135	error Carp::longmess "post_cleanup backtrace"
3799	if $make_core;	4136	if $make_core;
3800		4137
3801	my $fh = pidfile;	4138	my $fh = pidfile;
…		…
3827	}	4164	}
3828	}	4165	}
3829		4166
3830	sub do_reload_perl() {	4167	sub do_reload_perl() {
3831	# can/must only be called in main	4168	# can/must only be called in main
3832	if (in_main) {	4169	unless (in_main) {
3833	error "can only reload from main coroutine";	4170	error "can only reload from main coroutine";
3834	return;	4171	return;
3835	}	4172	}
3836		4173
3837	return if $RELOAD++;	4174	return if $RELOAD++;
3838		4175
3839	my $t1 = AE::time;	4176	my $t1 = AE::time;
3840		4177
3841	while ($RELOAD) {	4178	while ($RELOAD) {
		4179	cf::get_slot 0.1, -1, "reload_perl";
3842	info "reloading...";	4180	info "perl_reload: reloading...";
3843		4181
3844	trace "entering sync_job";	4182	trace "perl_reload: entering sync_job";
3845		4183
3846	cf::sync_job {	4184	cf::sync_job {
3847	cf::write_runtime_sync; # external watchdog should not bark
3848	cf::emergency_save;	4185	#cf::emergency_save;
3849	cf::write_runtime_sync; # external watchdog should not bark
3850		4186
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";	4187	trace "perl_reload: cancelling all extension coros";
3862	$_->cancel for values %EXT_CORO;	4188	$_->cancel for values %EXT_CORO;
3863	%EXT_CORO = ();	4189	%EXT_CORO = ();
3864		4190
3865	trace "removing commands";	4191	trace "perl_reload: removing commands";
3866	%COMMAND = ();	4192	%COMMAND = ();
3867		4193
3868	trace "removing ext/exti commands";	4194	trace "perl_reload: removing ext/exti commands";
3869	%EXTCMD = ();	4195	%EXTCMD = ();
3870	%EXTICMD = ();	4196	%EXTICMD = ();
3871		4197
3872	trace "unloading/nuking all extensions";	4198	trace "perl_reload: unloading/nuking all extensions";
3873	for my $pkg (@EXTS) {	4199	for my $pkg (@EXTS) {
3874	trace "... unloading $pkg";	4200	trace "... unloading $pkg";
3875		4201
3876	if (my $cb = $pkg->can ("unload")) {	4202	if (my $cb = $pkg->can ("unload")) {
3877	eval {	4203	eval {
…		…
3882		4208
3883	trace "... clearing $pkg";	4209	trace "... clearing $pkg";
3884	clear_package $pkg;	4210	clear_package $pkg;
3885	}	4211	}
3886		4212
3887	trace "unloading all perl modules loaded from $LIBDIR";	4213	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3888	while (my ($k, $v) = each %INC) {	4214	while (my ($k, $v) = each %INC) {
3889	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4215	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3890		4216
3891	trace "... unloading $k";	4217	trace "... unloading $k";
3892	delete $INC{$k};	4218	delete $INC{$k};
…		…
3899	}	4225	}
3900		4226
3901	clear_package $k;	4227	clear_package $k;
3902	}	4228	}
3903		4229
3904	trace "getting rid of safe::, as good as possible";	4230	trace "perl_reload: getting rid of safe::, as good as possible";
3905	clear_package "safe::$_"	4231	clear_package "safe::$_"
3906	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4232	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3907		4233
3908	trace "unloading cf.pm \"a bit\"";	4234	trace "perl_reload: unloading cf.pm \"a bit\"";
3909	delete $INC{"cf.pm"};	4235	delete $INC{"cf.pm"};
3910	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4236	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3911		4237
3912	# don't, removes xs symbols, too,	4238	# don't, removes xs symbols, too,
3913	# and global variables created in xs	4239	# and global variables created in xs
3914	#clear_package __PACKAGE__;	4240	#clear_package __PACKAGE__;
3915		4241
3916	info "unload completed, starting to reload now";	4242	info "perl_reload: unload completed, starting to reload now";
3917		4243
3918	trace "reloading cf.pm";	4244	trace "perl_reload: reloading cf.pm";
3919	require cf;	4245	require cf;
3920	cf::_connect_to_perl_1;	4246	cf::_connect_to_perl_1;
3921		4247
3922	trace "loading config and database again";	4248	trace "perl_reload: loading config and database again";
3923	cf::reload_config;	4249	cf::reload_config;
3924		4250
3925	trace "loading extensions";	4251	trace "perl_reload: loading extensions";
3926	cf::load_extensions;	4252	cf::load_extensions;
3927		4253
3928	if ($REATTACH_ON_RELOAD) {	4254	if ($REATTACH_ON_RELOAD) {
3929	trace "reattaching attachments to objects/players";	4255	trace "perl_reload: reattaching attachments to objects/players";
3930	_global_reattach; # objects, sockets	4256	_global_reattach; # objects, sockets
3931	trace "reattaching attachments to maps";	4257	trace "perl_reload: reattaching attachments to maps";
3932	reattach $_ for values %MAP;	4258	reattach $_ for values %MAP;
3933	trace "reattaching attachments to players";	4259	trace "perl_reload: reattaching attachments to players";
3934	reattach $_ for values %PLAYER;	4260	reattach $_ for values %PLAYER;
3935	}	4261	}
3936		4262
3937	trace "running post_init jobs";	4263	cf::_post_init 1;
3938	(pop @POST_INIT)->(1) while @POST_INIT;
3939		4264
3940	trace "leaving sync_job";	4265	trace "perl_reload: leaving sync_job";
3941		4266
3942	1	4267	1
3943	} or do {	4268	} or do {
3944	error $@;	4269	error $@;
3945	cf::cleanup "error while reloading, exiting.";	4270	cf::cleanup "perl_reload: error, exiting.";
3946	};	4271	};
3947		4272
3948	info "reloaded";
3949	--$RELOAD;	4273	--$RELOAD;
3950	}	4274	}
3951		4275
3952	$t1 = AE::time - $t1;	4276	$t1 = AE::time - $t1;
3953	info "reload completed in ${t1}s\n";	4277	info "perl_reload: completed in ${t1}s\n";
3954	};	4278	};
3955		4279
3956	our $RELOAD_WATCHER; # used only during reload	4280	our $RELOAD_WATCHER; # used only during reload
3957		4281
3958	sub reload_perl() {	4282	sub reload_perl() {
…		…
3979	reload_perl;	4303	reload_perl;
3980	};	4304	};
3981	}	4305	}
3982	};	4306	};
3983		4307
3984	unshift @INC, $LIBDIR;	4308	#############################################################################
3985		4309
3986	my $bug_warning = 0;	4310	my $bug_warning = 0;
3987		4311
3988	our @WAIT_FOR_TICK;
3989	our @WAIT_FOR_TICK_BEGIN;
3990
3991	sub wait_for_tick {	4312	sub wait_for_tick() {
3992	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4313	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3993		4314
3994	my $signal = new Coro::Signal;	4315	$WAIT_FOR_TICK->wait;
3995	push @WAIT_FOR_TICK, $signal;
3996	$signal->wait;
3997	}	4316	}
3998		4317
3999	sub wait_for_tick_begin {	4318	sub wait_for_tick_begin() {
4000	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4319	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4001		4320
4002	my $signal = new Coro::Signal;	4321	my $signal = new Coro::Signal;
4003	push @WAIT_FOR_TICK_BEGIN, $signal;	4322	push @WAIT_FOR_TICK_BEGIN, $signal;
4004	$signal->wait;	4323	$signal->wait;
4005	}	4324	}
…		…
4009	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4328	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4010	unless ++$bug_warning > 10;	4329	unless ++$bug_warning > 10;
4011	return;	4330	return;
4012	}	4331	}
4013		4332
4014	cf::server_tick; # one server iteration	4333	cf::one_tick; # one server iteration
4015		4334
4016	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#	4335	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4017		4336
4018	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4337	if ($NOW >= $NEXT_RUNTIME_WRITE) {
4019	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4338	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
…		…
4025	}	4344	}
4026		4345
4027	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4346	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4028	$sig->send;	4347	$sig->send;
4029	}	4348	}
4030	while (my $sig = shift @WAIT_FOR_TICK) {	4349	$WAIT_FOR_TICK->broadcast;
4031	$sig->send;
4032	}
4033		4350
4034	$LOAD = ($NOW - $TICK_START) / $TICK;	4351	$LOAD = ($NOW - $TICK_START) / $TICK;
4035	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4352	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4036		4353
4037	if (0) {	4354	if (0) {
…		…
4043	}	4360	}
4044	}	4361	}
4045		4362
4046	{	4363	{
4047	# configure BDB	4364	# configure BDB
		4365	info "initialising database";
4048		4366
4049	BDB::min_parallel 16;	4367	BDB::min_parallel 16;
4050	BDB::max_poll_reqs $TICK * 0.1;	4368	BDB::max_poll_reqs $TICK * 0.1;
4051	$AnyEvent::BDB::WATCHER->priority (1);	4369	#$AnyEvent::BDB::WATCHER->priority (1);
4052		4370
4053	unless ($DB_ENV) {	4371	unless ($DB_ENV) {
4054	$DB_ENV = BDB::db_env_create;	4372	$DB_ENV = BDB::db_env_create;
4055	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4373	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4056	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4374	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
4081	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4399	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4082	};	4400	};
4083	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4401	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4084	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4402	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4085	};	4403	};
		4404
		4405	info "database initialised";
4086	}	4406	}
4087		4407
4088	{	4408	{
4089	# configure IO::AIO	4409	# configure IO::AIO
4090		4410
		4411	info "initialising aio";
4091	IO::AIO::min_parallel 8;	4412	IO::AIO::min_parallel 8;
4092	IO::AIO::max_poll_time $TICK * 0.1;	4413	IO::AIO::max_poll_time $TICK * 0.1;
4093	undef $AnyEvent::AIO::WATCHER;	4414	undef $AnyEvent::AIO::WATCHER;
		4415	info "aio initialised";
4094	}	4416	}
4095		4417
4096	my $_log_backtrace;	4418	our $_log_backtrace;
		4419	our $_log_backtrace_last;
4097		4420
4098	sub _log_backtrace {	4421	sub _log_backtrace {
4099	my ($msg, @addr) = @_;	4422	my ($msg, @addr) = @_;
4100		4423
4101	$msg =~ s/\n//;	4424	$msg =~ s/\n$//;
4102		4425
		4426	if ($_log_backtrace_last eq $msg) {
		4427	LOG llevInfo, "[ABT] $msg\n";
		4428	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4103	# limit the # of concurrent backtraces	4429	# limit the # of concurrent backtraces
4104	if ($_log_backtrace < 2) {	4430	} elsif ($_log_backtrace < 2) {
		4431	$_log_backtrace_last = $msg;
4105	++$_log_backtrace;	4432	++$_log_backtrace;
4106	my $perl_bt = Carp::longmess $msg;	4433	my $perl_bt = Carp::longmess $msg;
4107	async {	4434	async {
4108	$Coro::current->{desc} = "abt $msg";	4435	$Coro::current->{desc} = "abt $msg";
4109		4436
…		…
4129	LOG llevInfo, "[ABT] $_\n" for @bt;	4456	LOG llevInfo, "[ABT] $_\n" for @bt;
4130	--$_log_backtrace;	4457	--$_log_backtrace;
4131	};	4458	};
4132	} else {	4459	} else {
4133	LOG llevInfo, "[ABT] $msg\n";	4460	LOG llevInfo, "[ABT] $msg\n";
4134	LOG llevInfo, "[ABT] [suppressed]\n";	4461	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4135	}	4462	}
4136	}	4463	}
4137		4464
4138	# load additional modules	4465	# load additional modules
4139	require "cf/$_.pm" for @EXTRA_MODULES;	4466	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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