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.540 by root, Tue May 4 23:32:29 2010 UTC vs.
Revision 1.624 by root, Sat Nov 17 23:40:02 2018 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 (©) 2018 Marc Alexander Lehmann / the Deliantra team
4	# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	5	# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	#	6	#
6	# Deliantra is free software: you can redistribute it and/or modify it under	7	# 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	8	# 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	9	# Free Software Foundation, either version 3 of the License, or (at your
9	# option) any later version.	10	# option) any later version.
10	#	11	#
11	# This program is distributed in the hope that it will be useful,	12	# This program is distributed in the hope that it will be useful,
12	# but WITHOUT ANY WARRANTY; without even the implied warranty of	13	# but WITHOUT ANY WARRANTY; without even the implied warranty of
13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	14	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14	# GNU General Public License for more details.	15	# GNU General Public License for more details.
15	#	16	#
16	# You should have received a copy of the Affero GNU General Public License	17	# 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	18	# and the GNU General Public License along with this program. If not, see
18	# <http://www.gnu.org/licenses/>.	19	# <http://www.gnu.org/licenses/>.
19	#	20	#
20	# The authors can be reached via e-mail to <support@deliantra.net>	21	# The authors can be reached via e-mail to <support@deliantra.net>
21	#	22	#
22		23
23	package cf;	24	package cf;
24		25
…		…
32	use Safe;	33	use Safe;
33	use Safe::Hole;	34	use Safe::Hole;
34	use Storable ();	35	use Storable ();
35	use Carp ();	36	use Carp ();
36		37
37	use Guard ();	38	use AnyEvent ();
		39	use AnyEvent::IO ();
		40	use AnyEvent::DNS ();
		41
38	use Coro ();	42	use Coro ();
39	use Coro::State;	43	use Coro::State;
40	use Coro::Handle;	44	use Coro::Handle;
41	use Coro::EV;	45	use Coro::EV;
42	use Coro::AnyEvent;	46	use Coro::AnyEvent;
…		…
48	use Coro::AIO;	52	use Coro::AIO;
49	use Coro::BDB 1.6;	53	use Coro::BDB 1.6;
50	use Coro::Storable;	54	use Coro::Storable;
51	use Coro::Util ();	55	use Coro::Util ();
52		56
		57	use Guard ();
53	use JSON::XS 2.01 ();	58	use JSON::XS 2.01 ();
54	use BDB ();	59	use BDB ();
55	use Data::Dumper;	60	use Data::Dumper;
56	use Fcntl;	61	use Fcntl;
57	use YAML::XS ();	62	use YAML::XS ();
		63	use CBOR::XS ();
58	use IO::AIO ();	64	use IO::AIO ();
59	use Time::HiRes;
60	use Compress::LZF;	65	use Compress::LZF;
61	use Digest::MD5 ();	66	use Digest::MD5 ();
62		67
63	AnyEvent::detect;	68	AnyEvent::detect;
64		69
…		…
83	our %COMMAND = ();	88	our %COMMAND = ();
84	our %COMMAND_TIME = ();	89	our %COMMAND_TIME = ();
85		90
86	our @EXTS = (); # list of extension package names	91	our @EXTS = (); # list of extension package names
87	our %EXTCMD = ();	92	our %EXTCMD = ();
		93	our %EXTACMD = ();
88	our %EXTICMD = ();	94	our %EXTICMD = ();
		95	our %EXTIACMD = ();
89	our %EXT_CORO = (); # coroutines bound to extensions	96	our %EXT_CORO = (); # coroutines bound to extensions
90	our %EXT_MAP = (); # pluggable maps	97	our %EXT_MAP = (); # pluggable maps
91		98
92	our $RELOAD; # number of reloads so far, non-zero while in reload	99	our $RELOAD; # number of reloads so far, non-zero while in reload
93	our @EVENT;	100	our @EVENT;
94	our @REFLECT; # set by XS	101	our @REFLECT; # set by XS
95	our %REFLECT; # set by us	102	our %REFLECT; # set by us
96		103
97	our $CONFDIR = confdir;	104	our $CONFDIR = confdir;
		105
98	our $DATADIR = datadir;	106	our $DATADIR = datadir;
99	our $LIBDIR = "$DATADIR/ext";	107	our $LIBDIR = "$DATADIR/ext";
100	our $PODDIR = "$DATADIR/pod";	108	our $PODDIR = "$DATADIR/pod";
101	our $MAPDIR = "$DATADIR/" . mapdir;	109	our $MAPDIR = "$DATADIR/" . mapdir;
		110
102	our $LOCALDIR = localdir;	111	our $LOCALDIR = localdir;
103	our $TMPDIR = "$LOCALDIR/" . tmpdir;	112	our $TMPDIR = "$LOCALDIR/" . tmpdir;
104	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	113	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	114	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106	our $RANDOMDIR = "$LOCALDIR/random";	115	our $RANDOMDIR = "$LOCALDIR/random";
107	our $BDBDIR = "$LOCALDIR/db";	116	our $BDBDIR = "$LOCALDIR/db";
108	our $PIDFILE = "$LOCALDIR/pid";	117	our $PIDFILE = "$LOCALDIR/pid";
109	our $RUNTIMEFILE = "$LOCALDIR/runtime";	118	our $RUNTIMEFILE = "$LOCALDIR/runtime";
110		119
111	our %RESOURCE; # unused	120	#our %RESOURCE; # unused
112		121
113	our $OUTPUT_RATE_MIN = 3000;	122	our $OUTPUT_RATE_MIN = 3000;
114	our $OUTPUT_RATE_MAX = 1000000;	123	our $OUTPUT_RATE_MAX = 1000000;
115		124
116	our $MAX_LINKS = 32; # how many chained exits to follow	125	our $MAX_LINKS = 32; # how many chained exits to follow
…		…
124	our $BDB_DEADLOCK_WATCHER;	133	our $BDB_DEADLOCK_WATCHER;
125	our $BDB_CHECKPOINT_WATCHER;	134	our $BDB_CHECKPOINT_WATCHER;
126	our $BDB_TRICKLE_WATCHER;	135	our $BDB_TRICKLE_WATCHER;
127	our $DB_ENV;	136	our $DB_ENV;
128		137
129	our @EXTRA_MODULES = qw(pod match mapscript);	138	our @EXTRA_MODULES = qw(pod match mapscript incloader);
130		139
131	our %CFG;	140	our %CFG;
		141	our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
132		142
133	our $UPTIME; $UPTIME ||= time;	143	our $UPTIME; $UPTIME ||= time;
134	our $RUNTIME;	144	our $RUNTIME = 0;
		145	our $SERVER_TICK = 0;
135	our $NOW;	146	our $NOW;
136		147
137	our (%PLAYER, %PLAYER_LOADING); # all users	148	our (%PLAYER, %PLAYER_LOADING); # all users
138	our (%MAP, %MAP_LOADING ); # all maps	149	our (%MAP, %MAP_LOADING ); # all maps
139	our $LINK_MAP; # the special {link} map, which is always available	150	our $LINK_MAP; # the special {link} map, which is always available
…		…
148		159
149	our @POST_INIT;	160	our @POST_INIT;
150		161
151	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)	162	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152	our $REALLY_UNLOOP; # never set to true, please :)	163	our $REALLY_UNLOOP; # never set to true, please :)
		164
		165	our $WAIT_FOR_TICK = new Coro::Signal;
		166	our @WAIT_FOR_TICK_BEGIN;
153		167
154	binmode STDOUT;	168	binmode STDOUT;
155	binmode STDERR;	169	binmode STDERR;
156		170
157	# read virtual server time, if available	171	# read virtual server time, if available
…		…
191		205
192	=over 4	206	=over 4
193		207
194	=item $cf::UPTIME	208	=item $cf::UPTIME
195		209
196	The timestamp of the server start (so not actually an uptime).	210	The timestamp of the server start (so not actually an "uptime").
		211
		212	=item $cf::SERVER_TICK
		213
		214	An unsigned integer that starts at zero when the server is started and is
		215	incremented on every tick.
		216
		217	=item $cf::NOW
		218
		219	The (real) time of the last (current) server tick - updated before and
		220	after tick processing, so this is useful only as a rough "what time is it
		221	now" estimate.
		222
		223	=item $cf::TICK
		224
		225	The interval between each server tick, in seconds.
197		226
198	=item $cf::RUNTIME	227	=item $cf::RUNTIME
199		228
200	The time this server has run, starts at 0 and is increased by $cf::TICK on	229	The time this server has run, starts at 0 and is increased by $cf::TICK on
201	every server tick.	230	every server tick.
202		231
203	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR	232	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
204	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR	233	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
205	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR	234	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
206		235
207	Various directories - "/etc", read-only install directory, perl-library	236	Various directories - "/etc", read-only install directory, perl-library
208	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	237	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
209	unique-items directory, player file directory, random maps directory and	238	unique-items directory, player file directory, random maps directory and
210	database environment.	239	database environment.
211		240
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	241	=item $cf::LOADAVG
221		242
222	The current CPU load on the server (alpha-smoothed), as a value between 0	243	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	244	(none) and 1 (overloaded), indicating how much time is spent on processing
224	objects per tick. Healthy values are < 0.5.	245	objects per tick. Healthy values are < 0.5.
…		…
232	Configuration for the server, loaded from C</etc/deliantra-server/config>, or	253	Configuration for the server, loaded from C</etc/deliantra-server/config>, or
233	from wherever your confdir points to.	254	from wherever your confdir points to.
234		255
235	=item cf::wait_for_tick, cf::wait_for_tick_begin	256	=item cf::wait_for_tick, cf::wait_for_tick_begin
236		257
237	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	258	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	259	cf::wait_for_tick_begin only returns directly I<after> the tick
		260	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.	261	cf::wait_for_tick wakes up all waiters after tick processing.
		262
		263	Note that cf::wait_for_tick will immediately return when the server is not
		264	ticking, making it suitable for small pauses in threads that need to run
		265	when the server is paused. If that is not applicable (i.e. you I<really>
		266	want to wait, use C<$cf::WAIT_FOR_TICK>).
		267
		268	=item $cf::WAIT_FOR_TICK
		269
		270	Note that C<cf::wait_for_tick> is probably the correct thing to use. This
		271	variable contains a L<Coro::Signal> that is broadcats after every server
		272	tick. Calling C<< ->wait >> on it will suspend the caller until after the
		273	next server tick.
		274
		275	=cut
		276
		277	sub wait_for_tick();
		278	sub wait_for_tick_begin();
240		279
241	=item @cf::INVOKE_RESULTS	280	=item @cf::INVOKE_RESULTS
242		281
243	This array contains the results of the last C<invoke ()> call. When	282	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	283	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
…		…
305	)) {	344	)) {
306	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	345	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
307	}	346	}
308		347
309	$EV::DIED = sub {	348	$EV::DIED = sub {
310	Carp::cluck "error in event callback: @_";	349	warn "error in event callback: $@";
311	};	350	};
		351
		352	#############################################################################
		353
		354	sub fork_call(&@);
		355	sub get_slot($;$$);
312		356
313	#############################################################################	357	#############################################################################
314		358
315	=head2 UTILITY FUNCTIONS	359	=head2 UTILITY FUNCTIONS
316		360
…		…
337	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	381	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
338	$d	382	$d
339	} || "[unable to dump $_[0]: '$@']";	383	} || "[unable to dump $_[0]: '$@']";
340	}	384	}
341		385
		386	=item $scalar = cf::load_file $path
		387
		388	Loads the given file from path and returns its contents. Croaks on error
		389	and can block.
		390
		391	=cut
		392
		393	sub load_file($) {
		394	0 <= aio_load $_[0], my $data
		395	or Carp::croak "$_[0]: $!";
		396
		397	$data
		398	}
		399
		400	=item $success = cf::replace_file $path, $data, $sync
		401
		402	Atomically replaces the file at the given $path with new $data, and
		403	optionally $sync the data to disk before replacing the file.
		404
		405	=cut
		406
		407	sub replace_file($$;$) {
		408	my ($path, $data, $sync) = @_;
		409
		410	my $lock = cf::lock_acquire ("replace_file:$path");
		411
		412	my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
		413	or return;
		414
		415	$data = $data->() if ref $data;
		416
		417	length $data == aio_write $fh, 0, (length $data), $data, 0
		418	or return;
		419
		420	!$sync
		421	or !aio_fsync $fh
		422	or return;
		423
		424	aio_close $fh
		425	and return;
		426
		427	aio_rename "$path~", $path
		428	and return;
		429
		430	if ($sync) {
		431	$path =~ s%/[^/]*$%%;
		432	aio_pathsync $path;
		433	}
		434
		435	1
		436	}
		437
342	=item $ref = cf::decode_json $json	438	=item $ref = cf::decode_json $json
343		439
344	Converts a JSON string into the corresponding perl data structure.	440	Converts a JSON string into the corresponding perl data structure.
345		441
346	=item $json = cf::encode_json $ref	442	=item $json = cf::encode_json $ref
…		…
352	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	448	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
353		449
354	sub encode_json($) { $json_coder->encode ($_[0]) }	450	sub encode_json($) { $json_coder->encode ($_[0]) }
355	sub decode_json($) { $json_coder->decode ($_[0]) }	451	sub decode_json($) { $json_coder->decode ($_[0]) }
356		452
		453	=item $ref = cf::decode_storable $scalar
		454
		455	Same as Coro::Storable::thaw, so blocks.
		456
		457	=cut
		458
		459	BEGIN { *decode_storable = \&Coro::Storable::thaw }
		460
		461	=item $ref = cf::decode_yaml $scalar
		462
		463	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
		464
		465	=cut
		466
		467	sub decode_yaml($) {
		468	fork_call { YAML::XS::Load $_[0] } @_
		469	}
		470
		471	=item $scalar = cf::decode_cbor $scalar
		472
		473	Same as CBOR::XS::decode_cbor, but takes server ticks into account, so
		474	blocks. For small amounts of data, C<CBOR::XS::decode_cbor> is the better
		475	alternative.
		476
		477	=cut
		478
		479	sub decode_cbor($) {
		480	# we assume 10mb/s minimum decoding speed (on a ~2ghz machine)
		481	cf::get_slot +(length $_[0]) / 10_000_000, 0, "decode_cbor";
		482	CBOR::XS::decode_cbor $_[0]
		483	}
		484
		485	=item $scalar = cf::unlzf $scalar
		486
		487	Same as Compress::LZF::compress, but takes server ticks into account, so
		488	blocks.
		489
		490	=cut
		491
		492	sub unlzf($) {
		493	# we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
		494	cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
		495	Compress::LZF::decompress $_[0]
		496	}
		497
357	=item cf::post_init { BLOCK }	498	=item cf::post_init { BLOCK }
358		499
359	Execute the given codeblock, I<after> all extensions have been (re-)loaded,	500	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
360	but I<before> the server starts ticking again.	501	but I<before> the server starts ticking again.
361		502
362	The cdoeblock will have a single boolean argument to indicate whether this	503	The codeblock will have a single boolean argument to indicate whether this
363	is a reload or not.	504	is a reload or not.
364		505
365	=cut	506	=cut
366		507
367	sub post_init(&) {	508	sub post_init(&) {
368	push @POST_INIT, shift;	509	push @POST_INIT, shift;
369	}	510	}
370		511
		512	sub _post_init {
		513	trace "running post_init jobs";
		514
		515	# run them in parallel...
		516
		517	my @join;
		518
		519	while () {
		520	push @join, map &Coro::async ($_, 0), @POST_INIT;
		521	@POST_INIT = ();
		522
		523	@join or last;
		524
		525	(pop @join)->join;
		526	}
		527	}
		528
371	=item cf::lock_wait $string	529	=item cf::lock_wait $string
372		530
373	Wait until the given lock is available. See cf::lock_acquire.	531	Wait until the given lock is available. See cf::lock_acquire.
374		532
375	=item my $lock = cf::lock_acquire $string	533	=item my $lock = cf::lock_acquire $string
376		534
377	Wait until the given lock is available and then acquires it and returns	535	Wait until the given lock is available and then acquires it and returns
378	a L<Guard> object. If the guard object gets destroyed (goes out of scope,	536	a L<Guard> object. If the guard object gets destroyed (goes out of scope,
…		…
426	EV::periodic $start, $interval, 0, $cb	584	EV::periodic $start, $interval, 0, $cb
427	}	585	}
428		586
429	=item cf::get_slot $time[, $priority[, $name]]	587	=item cf::get_slot $time[, $priority[, $name]]
430		588
431	Allocate $time seconds of blocking CPU time at priority C<$priority>:	589	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	590	(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.	591	C<$time> seconds of cpu time till the next tick. The slot is only valid
		592	till the next cede.
		593
		594	Background jobs should use a priority less than zero, interactive jobs
		595	should use 100 or more.
434		596
435	The optional C<$name> can be used to identify the job to run. It might be	597	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.	598	used for statistical purposes and should identify the same time-class.
437		599
438	Useful for short background jobs.	600	Useful for short background jobs.
…		…
450	my $signal = new Coro::Signal;	612	my $signal = new Coro::Signal;
451	my $busy;	613	my $busy;
452		614
453	while () {	615	while () {
454	next_job:	616	next_job:
		617
		618	Coro::cede;
455		619
456	my $avail = cf::till_tick;	620	my $avail = cf::till_tick;
457		621
458	for (0 .. $#SLOT_QUEUE) {	622	for (0 .. $#SLOT_QUEUE) {
459	if ($SLOT_QUEUE[$_][0] <= $avail) {	623	if ($SLOT_QUEUE[$_][0] <= $avail) {
460	$busy = 0;	624	$busy = 0;
461	my $job = splice @SLOT_QUEUE, $_, 1, ();	625	my $job = splice @SLOT_QUEUE, $_, 1, ();
462	$job->[2]->send;	626	$job->[2]->send;
463	Coro::cede;
464	goto next_job;	627	goto next_job;
465	} else {	628	} else {
466	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;	629	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
467	}	630	}
468	}	631	}
469		632
470	if (@SLOT_QUEUE) {	633	if (@SLOT_QUEUE) {
471	# we do not use wait_for_tick() as it returns immediately when tick is inactive	634	wait_for_tick;
472	push @cf::WAIT_FOR_TICK, $signal;
473	$signal->wait;
474	} else {	635	} else {
475	$busy = 0;	636	$busy = 0;
476	Coro::schedule;	637	Coro::schedule;
477	}	638	}
478	}	639	}
…		…
504	BEGIN { *async = \&Coro::async_pool }	665	BEGIN { *async = \&Coro::async_pool }
505		666
506	=item cf::sync_job { BLOCK }	667	=item cf::sync_job { BLOCK }
507		668
508	The design of Deliantra requires that the main coroutine ($Coro::main)	669	The design of Deliantra requires that the main coroutine ($Coro::main)
509	is always able to handle events or runnable, as Deliantra is only	670	is always able to handle events or is runnable, as Deliantra is only
510	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not	671	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
511	acceptable.	672	acceptable.
512		673
513	If it must be done, put the blocking parts into C<sync_job>. This will run	674	If it must be done, put the blocking parts into C<sync_job>. This will run
514	the given BLOCK in another coroutine while waiting for the result. The	675	the given BLOCK in another coroutine while waiting for the result. The
…		…
542		703
543	while ($busy) {	704	while ($busy) {
544	if (Coro::nready) {	705	if (Coro::nready) {
545	Coro::cede_notself;	706	Coro::cede_notself;
546	} else {	707	} else {
547	EV::loop EV::LOOP_ONESHOT;	708	EV::run EV::RUN_ONCE;
548	}	709	}
549	}	710	}
550		711
551	my $time = AE::time - $time;	712	my $time = AE::time - $time;
552		713
…		…
578	$EXT_CORO{$coro+0} = $coro;	739	$EXT_CORO{$coro+0} = $coro;
579		740
580	$coro	741	$coro
581	}	742	}
582		743
583	=item fork_call { }, $args	744	=item fork_call { }, @args
584		745
585	Executes the given code block with the given arguments in a seperate	746	Executes the given code block with the given arguments in a seperate
586	process, returning the results. Everything must be serialisable with	747	process, returning the results. Everything must be serialisable with
587	Coro::Storable. May, of course, block. Note that the executed sub may	748	Coro::Storable. May, of course, block. Note that the executed sub may
588	never block itself or use any form of event handling.	749	never block itself or use any form of event handling.
589		750
590	=cut	751	=cut
591		752
		753	sub post_fork {
		754	reset_signals;
		755	}
		756
592	sub fork_call(&@) {	757	sub fork_call(&@) {
593	my ($cb, @args) = @_;	758	my ($cb, @args) = @_;
594		759
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 {	760	my @res = Coro::Util::fork_eval {
600	reset_signals;	761	cf::post_fork;
601	&$cb	762	&$cb
602	}, @args;	763	} @args;
603		764
604	wantarray ? @res : $res[-1]	765	wantarray ? @res : $res[-1]
605	}	766	}
606		767
607	sub objinfo {	768	sub objinfo {
…		…
729		890
730	my @data;	891	my @data;
731	my $md5;	892	my $md5;
732		893
733	for (0 .. $#$src) {	894	for (0 .. $#$src) {
734	0 <= aio_load $src->[$_], $data[$_]	895	$data[$_] = load_file $src->[$_];
735	or Carp::croak "$src->[$_]: $!";
736	}	896	}
737		897
738	# if processing is expensive, check	898	# if processing is expensive, check
739	# checksum first	899	# checksum first
740	if (1) {	900	if (1) {
…		…
753		913
754	return db_get cache => "$id/data";	914	return db_get cache => "$id/data";
755	}	915	}
756	}	916	}
757		917
758	my $t1 = Time::HiRes::time;	918	my $t1 = EV::time;
759	my $data = $process->(\@data);	919	my $data = $process->(\@data);
760	my $t2 = Time::HiRes::time;	920	my $t2 = EV::time;
761		921
762	info "cache: '$id' processed in ", $t2 - $t1, "s\n";	922	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
763		923
764	db_put cache => "$id/data", $data;	924	db_put cache => "$id/data", $data;
765	db_put cache => "$id/md5" , $md5;	925	db_put cache => "$id/md5" , $md5;
…		…
1285	=cut	1445	=cut
1286		1446
1287	#############################################################################	1447	#############################################################################
1288	# command handling &c	1448	# command handling &c
1289		1449
1290	=item cf::register_command $name => \&callback($ob,$args);	1450	=item cf::register_command $name => \&callback($ob,$args)
1291		1451
1292	Register a callback for execution when the client sends the user command	1452	Register a callback for execution when the client sends the user command
1293	$name.	1453	$name.
1294		1454
1295	=cut	1455	=cut
…		…
1301	#warn "registering command '$name/$time' to '$caller'";	1461	#warn "registering command '$name/$time' to '$caller'";
1302		1462
1303	push @{ $COMMAND{$name} }, [$caller, $cb];	1463	push @{ $COMMAND{$name} }, [$caller, $cb];
1304	}	1464	}
1305		1465
1306	=item cf::register_extcmd $name => \&callback($pl,$packet);	1466	=item cf::register_extcmd $name => \&callback($pl,@args)
1307		1467
1308	Register a callback for execution when the client sends an (synchronous)	1468	Register a callback for execution when the client sends an (synchronous)
1309	extcmd packet. Ext commands will be processed in the order they are	1469	extcmd packet. Ext commands will be processed in the order they are
1310	received by the server, like other user commands. The first argument is	1470	received by the server, like other user commands. The first argument is
1311	the logged-in player. Ext commands can only be processed after a player	1471	the logged-in player. Ext commands can only be processed after a player
1312	has logged in successfully.	1472	has logged in successfully.
1313		1473
1314	If the callback returns something, it is sent back as if reply was being	1474	The values will be sent back to the client.
1315	called.
1316		1475
		1476	=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
		1477
		1478	Same as C<cf::register_extcmd>, but instead of returning values, the
		1479	callback needs to clal the C<$reply> function.
		1480
1317	=item cf::register_exticmd $name => \&callback($ns,$packet);	1481	=item cf::register_exticmd $name => \&callback($ns,@args)
1318		1482
1319	Register a callback for execution when the client sends an (asynchronous)	1483	Register a callback for execution when the client sends an (asynchronous)
1320	exticmd packet. Exti commands are processed by the server as soon as they	1484	exticmd packet. Exti commands are processed by the server as soon as they
1321	are received, i.e. out of order w.r.t. other commands. The first argument	1485	are received, i.e. out of order w.r.t. other commands. The first argument
1322	is a client socket. Exti commands can be received anytime, even before	1486	is a client socket. Exti commands can be received anytime, even before
1323	log-in.	1487	log-in.
1324		1488
1325	If the callback returns something, it is sent back as if reply was being	1489	The values will be sent back to the client.
1326	called.
1327		1490
1328	=cut	1491	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1329		1492
		1493	Same as C<cf::register_extcmd>, but instead of returning values, the
		1494	callback needs to clal the C<$reply> function.
		1495
		1496	=cut
		1497
1330	sub register_extcmd {	1498	sub register_extcmd($$) {
1331	my ($name, $cb) = @_;	1499	my ($name, $cb) = @_;
1332		1500
1333	$EXTCMD{$name} = $cb;	1501	$EXTCMD{$name} = $cb;
1334	}	1502	}
1335		1503
1336	sub register_exticmd {	1504	sub register_async_extcmd($$) {
1337	my ($name, $cb) = @_;	1505	my ($name, $cb) = @_;
1338		1506
		1507	$EXTACMD{$name} = $cb;
		1508	}
		1509
		1510	sub register_exticmd($$) {
		1511	my ($name, $cb) = @_;
		1512
1339	$EXTICMD{$name} = $cb;	1513	$EXTICMD{$name} = $cb;
		1514	}
		1515
		1516	sub register_async_exticmd($$) {
		1517	my ($name, $cb) = @_;
		1518
		1519	$EXTIACMD{$name} = $cb;
1340	}	1520	}
1341		1521
1342	use File::Glob ();	1522	use File::Glob ();
1343		1523
1344	cf::player->attach (	1524	cf::player->attach (
…		…
1358	my ($pl, $buf) = @_;	1538	my ($pl, $buf) = @_;
1359		1539
1360	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1540	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1361		1541
1362	if (ref $msg) {	1542	if (ref $msg) {
1363	my ($type, $reply, @payload) =	1543	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1364	"ARRAY" eq ref $msg
1365	? @$msg
1366	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1367		1544
1368	my @reply;
1369
1370	if (my $cb = $EXTCMD{$type}) {	1545	if (my $cb = $EXTACMD{$type}) {
		1546	$cb->(
		1547	$pl,
		1548	sub {
		1549	$pl->ext_msg ("reply-$reply", @_)
		1550	if $reply;
		1551	},
		1552	@payload
		1553	);
		1554	} else {
		1555	my @reply;
		1556
		1557	if (my $cb = $EXTCMD{$type}) {
1371	@reply = $cb->($pl, @payload);	1558	@reply = $cb->($pl, @payload);
		1559	}
		1560
		1561	$pl->ext_msg ("reply-$reply", @reply)
		1562	if $reply;
1372	}	1563	}
1373
1374	$pl->ext_reply ($reply, @reply)
1375	if $reply;
1376		1564
1377	} else {	1565	} else {
1378	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1566	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1379	}	1567	}
1380		1568
…		…
1393	};	1581	};
1394		1582
1395	$grp	1583	$grp
1396	}	1584	}
1397		1585
		1586	sub _ext_cfg_reg($$$$) {
		1587	my ($rvar, $varname, $cfgname, $default) = @_;
		1588
		1589	$cfgname = lc $varname
		1590	unless length $cfgname;
		1591
		1592	$EXT_CFG{$cfgname} = [$rvar, $default];
		1593
		1594	$$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
		1595	}
		1596
1398	sub load_extensions {	1597	sub load_extensions {
1399	info "loading extensions...";	1598	info "loading extensions...";
		1599
		1600	%EXT_CFG = ();
1400		1601
1401	cf::sync_job {	1602	cf::sync_job {
1402	my %todo;	1603	my %todo;
1403		1604
1404	for my $path (<$LIBDIR/*.ext>) {	1605	for my $path (<$LIBDIR/*.ext>) {
…		…
1447	unless exists $done{$_};	1648	unless exists $done{$_};
1448	}	1649	}
1449		1650
1450	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1651	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1451		1652
		1653	my $source = $v->{source};
		1654
		1655	# support "CONF varname :confname = default" pseudo-statements
		1656	$source =~ s{
		1657	^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
		1658	}{
		1659	"our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
		1660	}gmxe;
		1661
1452	my $active = eval $v->{source};	1662	my $active = eval $source;
1453		1663
1454	if (length $@) {	1664	if (length $@) {
1455	error "$v->{path}: $@\n";	1665	error "$v->{path}: $@\n";
1456	undef $@; # work around perl 5.10.0 utf-8 caching bug
1457		1666
1458	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1667	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1459	if exists $v->{meta}{mandatory};	1668	if exists $v->{meta}{mandatory};
1460		1669
1461	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";	1670	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
…		…
1475		1684
1476	while (my ($k, $v) = each %todo) {	1685	while (my ($k, $v) = each %todo) {
1477	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1686	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1478	if exists $v->{meta}{mandatory};	1687	if exists $v->{meta}{mandatory};
1479	}	1688	}
		1689
		1690	last;
1480	}	1691	}
1481	}	1692	}
1482	};	1693	};
1483	}	1694	}
1484		1695
…		…
1642	my $name = $pl->ob->name;	1853	my $name = $pl->ob->name;
1643		1854
1644	$pl->{deny_save} = 1;	1855	$pl->{deny_save} = 1;
1645	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1856	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1646		1857
1647	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1858	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1648	$pl->deactivate;	1859	$pl->deactivate;
		1860
1649	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1861	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1650	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1862	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1863	ext::highscore::check ($pl->ob);
		1864
1651	$pl->ns->destroy if $pl->ns;	1865	$pl->ns->destroy if $pl->ns;
1652		1866
1653	my $path = playerdir $pl;	1867	my $path = playerdir $pl;
1654	my $temp = "$path~$cf::RUNTIME~deleting~";	1868	my $temp = "$path~$cf::RUNTIME~deleting~";
1655	aio_rename $path, $temp;	1869	aio_rename $path, $temp;
…		…
1741		1955
1742	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1956	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1743		1957
1744	Expand deliantra pod fragments into protocol xml.	1958	Expand deliantra pod fragments into protocol xml.
1745		1959
1746	=item $player->ext_reply ($msgid, @msg)
1747
1748	Sends an ext reply to the player.
1749
1750	=cut
1751
1752	sub ext_reply($$@) {
1753	my ($self, $id, @msg) = @_;
1754
1755	$self->ns->ext_reply ($id, @msg)
1756	}
1757
1758	=item $player->ext_msg ($type, @msg)	1960	=item $player->ext_msg ($type, @msg)
1759		1961
1760	Sends an ext event to the client.	1962	Sends an ext event to the client.
1761		1963
1762	=cut	1964	=cut
…		…
1821	sub generate_random_map {	2023	sub generate_random_map {
1822	my ($self, $rmp) = @_;	2024	my ($self, $rmp) = @_;
1823		2025
1824	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	2026	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1825		2027
1826	# mit "rum" bekleckern, nicht
1827	$self->_create_random_map (	2028	$self->_create_random_map ($rmp);
1828	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1829	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1830	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1831	$rmp->{exit_on_final_map},
1832	$rmp->{xsize}, $rmp->{ysize},
1833	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1834	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1835	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1836	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1837	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1838	(cf::region::find $rmp->{region}), $rmp->{custom}
1839	)
1840	}	2029	}
1841		2030
1842	=item cf::map->register ($regex, $prio)	2031	=item cf::map->register ($regex, $prio)
1843		2032
1844	Register a handler for the map path matching the given regex at the	2033	Register a handler for the map path matching the given regex at the
…		…
1870	}	2059	}
1871		2060
1872	sub normalise {	2061	sub normalise {
1873	my ($path, $base) = @_;	2062	my ($path, $base) = @_;
1874		2063
1875	$path = "$path"; # make sure its a string	2064	$path = "$path"; # make sure it's a string
1876		2065
1877	$path =~ s/\.map$//;	2066	$path =~ s/\.map$//;
1878		2067
1879	# map plan:	2068	# map plan:
1880	#	2069	#
…		…
1895	$base =~ s{[^/]+/?$}{};	2084	$base =~ s{[^/]+/?$}{};
1896	$path = "$base/$path";	2085	$path = "$base/$path";
1897	}	2086	}
1898		2087
1899	for ($path) {	2088	for ($path) {
1900	redo if s{//}{/};
1901	redo if s{/\.?/}{/};	2089	redo if s{/\.?/}{/};
1902	redo if s{/[^/]+/\.\./}{/};	2090	redo if s{/[^/]+/\.\./}{/};
1903	}	2091	}
1904		2092
1905	$path	2093	$path
…		…
1919	$self->init; # pass $1 etc.	2107	$self->init; # pass $1 etc.
1920	return $self;	2108	return $self;
1921	}	2109	}
1922	}	2110	}
1923		2111
1924	Carp::cluck "unable to resolve path '$path' (base '$base').";	2112	Carp::cluck "unable to resolve path '$path' (base '$base')";
1925	()	2113	()
1926	}	2114	}
1927		2115
		2116	# may re-bless or do other evil things
1928	sub init {	2117	sub init {
1929	my ($self) = @_;	2118	my ($self) = @_;
1930		2119
1931	$self	2120	$self
1932	}	2121	}
…		…
1997	$self->{load_path} = $path;	2186	$self->{load_path} = $path;
1998		2187
1999	1	2188	1
2000	}	2189	}
2001		2190
		2191	# used to laod the header of an original map
2002	sub load_header_orig {	2192	sub load_header_orig {
2003	my ($self) = @_;	2193	my ($self) = @_;
2004		2194
2005	$self->load_header_from ($self->load_path)	2195	$self->load_header_from ($self->load_path)
2006	}	2196	}
2007		2197
		2198	# used to laod the header of an instantiated map
2008	sub load_header_temp {	2199	sub load_header_temp {
2009	my ($self) = @_;	2200	my ($self) = @_;
2010		2201
2011	$self->load_header_from ($self->save_path)	2202	$self->load_header_from ($self->save_path)
2012	}	2203	}
2013		2204
		2205	# called after loading the header from an instantiated map
2014	sub prepare_temp {	2206	sub prepare_temp {
2015	my ($self) = @_;	2207	my ($self) = @_;
2016		2208
2017	$self->last_access ((delete $self->{last_access})	2209	$self->last_access ((delete $self->{last_access})
2018	|| $cf::RUNTIME); #d#	2210	|| $cf::RUNTIME); #d#
2019	# safety	2211	# safety
2020	$self->{instantiate_time} = $cf::RUNTIME	2212	$self->{instantiate_time} = $cf::RUNTIME
2021	if $self->{instantiate_time} > $cf::RUNTIME;	2213	if $self->{instantiate_time} > $cf::RUNTIME;
2022	}	2214	}
2023		2215
		2216	# called after loading the header from an original map
2024	sub prepare_orig {	2217	sub prepare_orig {
2025	my ($self) = @_;	2218	my ($self) = @_;
2026		2219
2027	$self->{load_original} = 1;	2220	$self->{load_original} = 1;
2028	$self->{instantiate_time} = $cf::RUNTIME;	2221	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2052		2245
2053	sub find;	2246	sub find;
2054	sub find {	2247	sub find {
2055	my ($path, $origin) = @_;	2248	my ($path, $origin) = @_;
2056		2249
		2250	cf::cede_to_tick;
		2251
2057	$path = normalise $path, $origin && $origin->path;	2252	$path = normalise $path, $origin;
2058		2253
2059	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2254	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2060	my $guard2 = cf::lock_acquire "map_find:$path";	2255	my $guard2 = cf::lock_acquire "map_find:$path";
2061		2256
2062	$cf::MAP{$path} || do {	2257	$cf::MAP{$path} || do {
…		…
2093		2288
2094	{	2289	{
2095	my $guard = cf::lock_acquire "map_data:$path";	2290	my $guard = cf::lock_acquire "map_data:$path";
2096		2291
2097	return unless $self->valid;	2292	return unless $self->valid;
2098	return unless $self->in_memory == cf::MAP_SWAPPED;	2293	return unless $self->state == cf::MAP_SWAPPED;
2099
2100	$self->in_memory (cf::MAP_LOADING);
2101		2294
2102	$self->alloc;	2295	$self->alloc;
2103		2296
2104	$self->pre_load;	2297	$self->pre_load;
2105	cf::cede_to_tick;	2298	cf::cede_to_tick;
2106		2299
		2300	if (exists $self->{load_path}) {
2107	my $f = new_from_file cf::object::thawer $self->{load_path};	2301	my $f = new_from_file cf::object::thawer $self->{load_path};
2108	$f->skip_block;	2302	$f->skip_block;
2109	$self->_load_objects ($f)	2303	$self->_load_objects ($f)
2110	or return;	2304	or return;
2111		2305
2112	$self->post_load_original	2306	$self->post_load_original
2113	if delete $self->{load_original};	2307	if delete $self->{load_original};
2114		2308
2115	if (my $uniq = $self->uniq_path) {	2309	if (my $uniq = $self->uniq_path) {
2116	utf8::encode $uniq;	2310	utf8::encode $uniq;
2117	unless (aio_stat $uniq) {	2311	unless (aio_stat $uniq) {
2118	if (my $f = new_from_file cf::object::thawer $uniq) {	2312	if (my $f = new_from_file cf::object::thawer $uniq) {
2119	$self->clear_unique_items;	2313	$self->clear_unique_items;
2120	$self->_load_objects ($f);	2314	$self->_load_objects ($f);
2121	$f->resolve_delayed_derefs;	2315	$f->resolve_delayed_derefs;
		2316	}
2122	}	2317	}
2123	}	2318	}
2124	}
2125		2319
2126	$f->resolve_delayed_derefs;	2320	$f->resolve_delayed_derefs;
		2321	} else {
		2322	$self->post_load_original
		2323	if delete $self->{load_original};
		2324	}
		2325
		2326	$self->state (cf::MAP_INACTIVE);
2127		2327
2128	cf::cede_to_tick;	2328	cf::cede_to_tick;
2129	# now do the right thing for maps	2329	# now do the right thing for maps
2130	$self->link_multipart_objects;	2330	$self->link_multipart_objects;
2131	$self->difficulty ($self->estimate_difficulty)	2331	$self->difficulty ($self->estimate_difficulty)
…		…
2135	unless ($self->{deny_activate}) {	2335	unless ($self->{deny_activate}) {
2136	$self->decay_objects;	2336	$self->decay_objects;
2137	$self->fix_auto_apply;	2337	$self->fix_auto_apply;
2138	$self->update_buttons;	2338	$self->update_buttons;
2139	cf::cede_to_tick;	2339	cf::cede_to_tick;
2140	$self->activate;	2340	#$self->activate; # no longer activate maps automatically
2141	}	2341	}
2142		2342
2143	$self->{last_save} = $cf::RUNTIME;	2343	$self->{last_save} = $cf::RUNTIME;
2144	$self->last_access ($cf::RUNTIME);	2344	$self->last_access ($cf::RUNTIME);
2145
2146	$self->in_memory (cf::MAP_ACTIVE);
2147	}	2345	}
2148		2346
2149	$self->post_load;	2347	$self->post_load;
		2348
		2349	1
2150	}	2350	}
2151		2351
2152	# customize the map for a given player, i.e.	2352	# customize the map for a given player, i.e.
2153	# return the _real_ map. used by e.g. per-player	2353	# return the _real_ map. used by e.g. per-player
2154	# maps to change the path to ~playername/mappath	2354	# maps to change the path to ~playername/mappath
…		…
2162	# if $self->per_party;	2362	# if $self->per_party;
2163		2363
2164	$self	2364	$self
2165	}	2365	}
2166		2366
2167	# find and load all maps in the 3x3 area around a map
2168	sub load_neighbours {
2169	my ($map) = @_;
2170
2171	my @neigh; # diagonal neighbours
2172
2173	for (0 .. 3) {
2174	my $neigh = $map->tile_path ($_)
2175	or next;
2176	$neigh = find $neigh, $map
2177	or next;
2178	$neigh->load;
2179
2180	# now find the diagonal neighbours
2181	push @neigh,
2182	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2183	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2184	}
2185
2186	for (grep defined $_->[0], @neigh) {
2187	my ($path, $origin) = @$_;
2188	my $neigh = find $path, $origin
2189	or next;
2190	$neigh->load;
2191	}
2192	}
2193
2194	sub find_sync {	2367	sub find_sync {
2195	my ($path, $origin) = @_;	2368	my ($path, $origin) = @_;
2196		2369
		2370	# it's a bug to call this from the main context
2197	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"	2371	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2198	if $Coro::current == $Coro::main;	2372	if $Coro::current == $Coro::main;
2199		2373
2200	find $path, $origin	2374	find $path, $origin
2201	}	2375	}
2202		2376
2203	sub do_load_sync {	2377	sub do_load_sync {
2204	my ($map) = @_;	2378	my ($map) = @_;
2205		2379
		2380	# it's a bug to call this from the main context
2206	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"	2381	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2207	if $Coro::current == $Coro::main;	2382	if $Coro::current == $Coro::main;
2208		2383
2209	$map->load;	2384	$map->load;
2210	}	2385	}
…		…
2213	our $MAP_PREFETCHER = undef;	2388	our $MAP_PREFETCHER = undef;
2214		2389
2215	sub find_async {	2390	sub find_async {
2216	my ($path, $origin, $load) = @_;	2391	my ($path, $origin, $load) = @_;
2217		2392
2218	$path = normalise $path, $origin && $origin->{path};	2393	$path = normalise $path, $origin;
2219		2394
2220	if (my $map = $cf::MAP{$path}) {	2395	if (my $map = $cf::MAP{$path}) {
2221	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2396	return $map if !$load || $map->linkable;
2222	}	2397	}
2223		2398
2224	$MAP_PREFETCH{$path} |= $load;	2399	$MAP_PREFETCH{$path} |= $load;
2225		2400
2226	$MAP_PREFETCHER ||= cf::async {	2401	$MAP_PREFETCHER ||= cf::async {
2227	$Coro::current->{desc} = "map prefetcher";	2402	$Coro::current->{desc} = "map prefetcher";
2228		2403
2229	while (%MAP_PREFETCH) {	2404	while (%MAP_PREFETCH) {
2230	while (my ($k, $v) = each %MAP_PREFETCH) {	2405	for my $k (keys %MAP_PREFETCH) {
2231	if (my $map = find $k) {	2406	if (my $map = find $k) {
2232	$map->load if $v;	2407	$map->load if $MAP_PREFETCH{$k};
2233	}	2408	}
2234		2409
2235	delete $MAP_PREFETCH{$k};	2410	delete $MAP_PREFETCH{$k};
2236	}	2411	}
2237	}	2412	}
…		…
2285	sub swap_out {	2460	sub swap_out {
2286	my ($self) = @_;	2461	my ($self) = @_;
2287		2462
2288	my $lock = cf::lock_acquire "map_data:$self->{path}";	2463	my $lock = cf::lock_acquire "map_data:$self->{path}";
2289		2464
2290	return if $self->in_memory != cf::MAP_ACTIVE;	2465	return if !$self->linkable;
2291	return if $self->{deny_save};	2466	return if $self->{deny_save};
2292	return if $self->players;	2467	return if $self->players;
2293		2468
2294	# first deactivate the map and "unlink" it from the core	2469	# first deactivate the map and "unlink" it from the core
2295	$self->deactivate;	2470	$self->deactivate;
2296	$_->clear_links_to ($self) for values %cf::MAP;	2471	$_->clear_links_to ($self) for values %cf::MAP;
2297	$self->in_memory (cf::MAP_SWAPPED);	2472	$self->state (cf::MAP_SWAPPED);
2298		2473
2299	# then atomically save	2474	# then atomically save
2300	$self->_save;	2475	$self->_save;
2301		2476
2302	# then free the map	2477	# then free the map
…		…
2328		2503
2329	return if $self->players;	2504	return if $self->players;
2330		2505
2331	cf::trace "resetting map ", $self->path, "\n";	2506	cf::trace "resetting map ", $self->path, "\n";
2332		2507
2333	$self->in_memory (cf::MAP_SWAPPED);	2508	$self->state (cf::MAP_SWAPPED);
2334		2509
2335	# need to save uniques path	2510	# need to save uniques path
2336	unless ($self->{deny_save}) {	2511	unless ($self->{deny_save}) {
2337	my $uniq = $self->uniq_path; utf8::encode $uniq;	2512	my $uniq = $self->uniq_path; utf8::encode $uniq;
2338		2513
…		…
2491		2666
2492	Creates and returns a persistent reference to an object that can be stored as a string.	2667	Creates and returns a persistent reference to an object that can be stored as a string.
2493		2668
2494	=item $ob = cf::object::deref ($refstring)	2669	=item $ob = cf::object::deref ($refstring)
2495		2670
2496	returns the objetc referenced by refstring. may return undef when it cnanot find the object,	2671	returns the objetc referenced by refstring. may return undef when it cannot find the object,
2497	even if the object actually exists. May block.	2672	even if the object actually exists. May block.
2498		2673
2499	=cut	2674	=cut
2500		2675
2501	sub deref {	2676	sub deref {
…		…
2583	=item $player_object->may ("access")	2758	=item $player_object->may ("access")
2584		2759
2585	Returns wether the given player is authorized to access resource "access"	2760	Returns wether the given player is authorized to access resource "access"
2586	(e.g. "command_wizcast").	2761	(e.g. "command_wizcast").
2587		2762
		2763	This is implemented by checking a config setting of C<may_access> where
		2764	C<access> is replaced by the access string. The following alternatives are
		2765	possible (and are tested in order):
		2766
		2767	=over 4
		2768
		2769	=item * Player is DM
		2770
		2771	The request will succeed.
		2772
		2773	=item * may_access is an array reference
		2774
		2775	If either the player nickname or UUID is in the array, the request will
		2776	succeed, otherwise it will fail.
		2777
		2778	=item * may_access is a true value
		2779
		2780	The request will succeed.
		2781
		2782	=item * may_access is missing or false
		2783
		2784	The request will fail.
		2785
		2786	=back
		2787
2588	=cut	2788	=cut
2589		2789
2590	sub cf::object::player::may {	2790	sub cf::object::player::may {
2591	my ($self, $access) = @_;	2791	my ($self, $access) = @_;
2592		2792
2593	$self->flag (cf::FLAG_WIZ) ||	2793	$self->flag (cf::FLAG_WIZ) ||
2594	(ref $cf::CFG{"may_$access"}	2794	(ref $cf::CFG{"may_$access"}
2595	? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}	2795	? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2596	: $cf::CFG{"may_$access"})	2796	: $cf::CFG{"may_$access"})
2597	}	2797	}
2598		2798
2599	=item $player_object->enter_link	2799	=item $player_object->enter_link
2600		2800
…		…
2603	The player should be reasonably safe there for short amounts of time (e.g.	2803	The player should be reasonably safe there for short amounts of time (e.g.
2604	for loading a map). You I<MUST> call C<leave_link> as soon as possible,	2804	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2605	though, as the player cannot control the character while it is on the link	2805	though, as the player cannot control the character while it is on the link
2606	map.	2806	map.
2607		2807
2608	Will never block.	2808	This method will never block, which is the whole reaosn for it's
		2809	existance: you can I<always> put a player onto the link map, which is the
		2810	only place to put objects that is guaranteed to exist.
		2811
		2812	A typical usage pattern is to call C<enter_link> synchronously from the
		2813	server, then start a new thread, do your blocking stuff there and then
		2814	call C<leave_link> from that thread.
2609		2815
2610	=item $player_object->leave_link ($map, $x, $y)	2816	=item $player_object->leave_link ($map, $x, $y)
2611		2817
2612	Moves the player out of the special C<{link}> map onto the specified	2818	Moves the player out of the special C<{link}> map onto the specified
2613	map. If the map is not valid (or omitted), the player will be moved back	2819	map. If the map is not valid (or omitted), the player will be moved back
…		…
2668	# use -1 or undef as default coordinates, not 0, 0	2874	# use -1 or undef as default coordinates, not 0, 0
2669	($x, $y) = ($map->enter_x, $map->enter_y)	2875	($x, $y) = ($map->enter_x, $map->enter_y)
2670	if $x <= 0 && $y <= 0;	2876	if $x <= 0 && $y <= 0;
2671		2877
2672	$map->load;	2878	$map->load;
2673	$map->load_neighbours;
2674		2879
2675	return unless $self->contr->active;	2880	return unless $self->contr->active;
2676		2881
2677	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2882	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2678	if ($self->enter_map ($map, $x, $y)) {	2883	if ($self->enter_map ($map, $x, $y)) {
…		…
2734	($path, $x, $y) = (undef, undef, undef);	2939	($path, $x, $y) = (undef, undef, undef);
2735	}	2940	}
2736	}	2941	}
2737		2942
2738	my $map = eval {	2943	my $map = eval {
2739	my $map = defined $path ? cf::map::find $path : undef;	2944	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2740		2945
2741	if ($map) {	2946	if ($map) {
2742	$map = $map->customise_for ($self);	2947	$map = $map->customise_for ($self);
2743	$map = $check->($map, $x, $y, $self) if $check && $map;	2948	$map = $check->($map, $x, $y, $self) if $check && $map;
2744	} else {	2949	} else {
…		…
2834	$Coro::current->{desc} = "enter_exit";	3039	$Coro::current->{desc} = "enter_exit";
2835		3040
2836	unless (eval {	3041	unless (eval {
2837	$self->deactivate_recursive; # just to be sure	3042	$self->deactivate_recursive; # just to be sure
2838		3043
2839	# random map handling
2840	{
2841	my $guard = cf::lock_acquire "exit_prepare:$exit";
2842
2843	prepare_random_map $exit
2844	if $exit->slaying eq "/!";
2845	}
2846
2847	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	3044	my $map = cf::map::normalise $exit->slaying, $exit->map;
2848	my $x = $exit->stats->hp;	3045	my $x = $exit->stats->hp;
2849	my $y = $exit->stats->sp;	3046	my $y = $exit->stats->sp;
		3047
		3048	# special map handling
		3049	my $slaying = $exit->slaying;
		3050
		3051	# special map handling
		3052	if ($slaying eq "/!") {
		3053	my $guard = cf::lock_acquire "exit_prepare:$exit";
		3054
		3055	prepare_random_map $exit
		3056	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		3057
		3058	$map = $exit->slaying;
		3059
		3060	} elsif ($slaying eq '!up') {
		3061	$map = $exit->map->tile_path (cf::TILE_UP);
		3062	$x = $exit->x;
		3063	$y = $exit->y;
		3064
		3065	} elsif ($slaying eq '!down') {
		3066	$map = $exit->map->tile_path (cf::TILE_DOWN);
		3067	$x = $exit->x;
		3068	$y = $exit->y;
		3069	}
2850		3070
2851	$self->goto ($map, $x, $y);	3071	$self->goto ($map, $x, $y);
2852		3072
2853	# if exit is damned, update players death & WoR home-position	3073	# if exit is damned, update players death & WoR home-position
2854	$self->contr->savebed ($map, $x, $y)	3074	$self->contr->savebed ($map, $x, $y)
…		…
2869		3089
2870	=head3 cf::client	3090	=head3 cf::client
2871		3091
2872	=over 4	3092	=over 4
2873		3093
2874	=item $client->send_drawinfo ($text, $flags)
2875
2876	Sends a drawinfo packet to the client. Circumvents output buffering so
2877	should not be used under normal circumstances.
2878
2879	=cut
2880
2881	sub cf::client::send_drawinfo {
2882	my ($self, $text, $flags) = @_;
2883
2884	utf8::encode $text;
2885	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2886	}
2887
2888	=item $client->send_big_packet ($pkt)	3094	=item $client->send_big_packet ($pkt)
2889		3095
2890	Like C<send_packet>, but tries to compress large packets, and fragments	3096	Like C<send_packet>, but tries to compress large packets, and fragments
2891	them as required.	3097	them as required.
2892		3098
…		…
2910	$self->send_packet ($pkt);	3116	$self->send_packet ($pkt);
2911	}	3117	}
2912		3118
2913	=item $client->send_msg ($channel, $msg, $color, [extra...])	3119	=item $client->send_msg ($channel, $msg, $color, [extra...])
2914		3120
2915	Send a drawinfo or msg packet to the client, formatting the msg for the	3121	Send a msg packet to the client, formatting the msg for the client if
2916	client if neccessary. C<$type> should be a string identifying the type of	3122	necessary. C<$type> should be a string identifying the type of the
2917	the message, with C<log> being the default. If C<$color> is negative, suppress	3123	message, with C<log> being the default. If C<$color> is negative, suppress
2918	the message unless the client supports the msg packet.	3124	the message unless the client supports the msg packet.
2919		3125
2920	=cut	3126	=cut
2921		3127
2922	# non-persistent channels (usually the info channel)	3128	# non-persistent channels (usually the info channel)
…		…
2965	},	3171	},
2966	"c/body" => {	3172	"c/body" => {
2967	id => "infobox",	3173	id => "infobox",
2968	title => "Body Parts",	3174	title => "Body Parts",
2969	reply => undef,	3175	reply => undef,
2970	tooltip => "Shows which body parts you posess and are available",	3176	tooltip => "Shows which body parts you possess and are available",
2971	},	3177	},
2972	"c/statistics" => {	3178	"c/statistics" => {
2973	id => "infobox",	3179	id => "infobox",
2974	title => "Statistics",	3180	title => "Statistics",
2975	reply => undef,	3181	reply => undef,
…		…
3027	id => "death",	3233	id => "death",
3028	title => "Death",	3234	title => "Death",
3029	reply => undef,	3235	reply => undef,
3030	tooltip => "Reason for and more info about your most recent death",	3236	tooltip => "Reason for and more info about your most recent death",
3031	},	3237	},
		3238	"c/fatal" => {
		3239	id => "fatal",
		3240	title => "Fatal Error",
		3241	reply => undef,
		3242	tooltip => "Reason for the server disconnect",
		3243	},
3032	"c/say" => $SAY_CHANNEL,	3244	"c/say" => $SAY_CHANNEL,
3033	"c/chat" => $CHAT_CHANNEL,	3245	"c/chat" => $CHAT_CHANNEL,
3034	);	3246	);
3035		3247
3036	sub cf::client::send_msg {	3248	sub cf::client::send_msg {
…		…
3079	=cut	3291	=cut
3080		3292
3081	sub cf::client::ext_msg($$@) {	3293	sub cf::client::ext_msg($$@) {
3082	my ($self, $type, @msg) = @_;	3294	my ($self, $type, @msg) = @_;
3083		3295
3084	if ($self->extcmd == 2) {
3085	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3296	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3086	} elsif ($self->extcmd == 1) { # TODO: remove
3087	push @msg, msgtype => "event_$type";
3088	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3089	}
3090	}
3091
3092	=item $client->ext_reply ($msgid, @msg)
3093
3094	Sends an ext reply to the client.
3095
3096	=cut
3097
3098	sub cf::client::ext_reply($$@) {
3099	my ($self, $id, @msg) = @_;
3100
3101	if ($self->extcmd == 2) {
3102	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3103	} elsif ($self->extcmd == 1) {
3104	#TODO: version 1, remove
3105	unshift @msg, msgtype => "reply", msgid => $id;
3106	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3107	}
3108	}	3297	}
3109		3298
3110	=item $success = $client->query ($flags, "text", \&cb)	3299	=item $success = $client->query ($flags, "text", \&cb)
3111		3300
3112	Queues a query to the client, calling the given callback with	3301	Queues a query to the client, calling the given callback with
…		…
3132		3321
3133	$self->send_packet ($self->{query_queue}[0][0])	3322	$self->send_packet ($self->{query_queue}[0][0])
3134	if @{ $self->{query_queue} } == 1;	3323	if @{ $self->{query_queue} } == 1;
3135		3324
3136	1	3325	1
		3326	}
		3327
		3328	=item $client->update_command_faces
		3329
		3330	=cut
		3331
		3332	our %COMMAND_FACE;
		3333
		3334	sub cf::client::update_command_faces {
		3335	my ($self) = @_;
		3336
		3337	my @faces = grep $_,
		3338	$COMMAND_FACE{preferred},
		3339	$COMMAND_FACE{standard},
		3340	$COMMAND_FACE{skill},
		3341	$self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
		3342	$COMMAND_FACE{emote},
		3343	;
		3344
		3345	$self->send_face ($_)
		3346	for @faces;
		3347	$self->flush_fx;
		3348
		3349	$self->ext_msg (command_list => @faces);
		3350	}
		3351
		3352	=item cf::client::set_command_face $type, $commands
		3353
		3354	=cut
		3355
		3356	sub cf::client::set_command_face {
		3357	my ($type, $list) = @_;
		3358
		3359	my $idx = &cf::face::set ( #d# ugly forward reference
		3360	"command_list/$type" => cf::FT_RSRC,
		3361	JSON::XS->new->utf8->encode ([ sort @$list ])
		3362	);
		3363
		3364	$COMMAND_FACE{$type} = $idx;
3137	}	3365	}
3138		3366
3139	cf::client->attach (	3367	cf::client->attach (
3140	on_connect => sub {	3368	on_connect => sub {
3141	my ($ns) = @_;	3369	my ($ns) = @_;
…		…
3167	my ($ns, $buf) = @_;	3395	my ($ns, $buf) = @_;
3168		3396
3169	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3397	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3170		3398
3171	if (ref $msg) {	3399	if (ref $msg) {
3172	my ($type, $reply, @payload) =	3400	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3173	"ARRAY" eq ref $msg
3174	? @$msg
3175	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3176		3401
3177	my @reply;
3178
3179	if (my $cb = $EXTICMD{$type}) {	3402	if (my $cb = $EXTIACMD{$type}) {
		3403	$cb->(
		3404	$ns,
		3405	sub {
		3406	$ns->ext_msg ("reply-$reply", @_)
		3407	if $reply;
		3408	},
		3409	@payload
		3410	);
		3411	} else {
		3412	my @reply;
		3413
		3414	if (my $cb = $EXTICMD{$type}) {
3180	@reply = $cb->($ns, @payload);	3415	@reply = $cb->($ns, @payload);
		3416	}
		3417
		3418	$ns->ext_msg ("reply-$reply", @reply)
		3419	if $reply;
3181	}	3420	}
3182
3183	$ns->ext_reply ($reply, @reply)
3184	if $reply;
3185
3186	} else {	3421	} else {
3187	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3422	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3188	}	3423	}
3189		3424
3190	cf::override;	3425	cf::override;
…		…
3358	=cut	3593	=cut
3359		3594
3360	#############################################################################	3595	#############################################################################
3361	# the server's init and main functions	3596	# the server's init and main functions
3362		3597
3363	# async inc loader. yay.	3598	{
3364	sub inc_loader {	3599	package cf::face;
3365	my $mod = $_[1];
3366		3600
3367	if (in_main && !tick_inhibit) {	3601	our %HASH; # hash => idx
3368	Carp::cluck "ERROR: attempted synchronous perl module load ($mod)";	3602	our @DATA; # dynamically-created facedata, only faceste 0 used
		3603	our @FOFS; # file offset, if > 0
		3604	our @SIZE; # size of face, in octets
		3605	our @META; # meta hash of face, if any
		3606	our $DATAFH; # facedata filehandle
		3607
		3608	# internal api, not finalised
		3609	sub set {
		3610	my ($name, $type, $data) = @_;
		3611
		3612	my $idx = cf::face::find $name;
		3613
		3614	if ($idx) {
		3615	delete $HASH{cf::face::get_csum $idx};
3369	} else {	3616	} else {
3370	debug "loading perl module $mod\n";	3617	$idx = cf::face::alloc $name;
3371	}	3618	}
3372		3619
3373	# 1. find real file	3620	my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3374	for my $dir (@ORIG_INC) {
3375	warn "$dir/$mod\n";#d#
3376	ref $dir and next;
3377	0 <= Coro::AIO::aio_load "$dir/$mod", my $data
3378	or next;
3379		3621
3380	$data = "#line 1 $dir/$mod\n$data";	3622	cf::face::set_type $idx, $type;
		3623	cf::face::set_csum $idx, 0, $hash;
3381		3624
3382	open my $fh, "<", \$data or die;	3625	# we need to destroy the SV itself, not just modify it, as a running ix
		3626	# might hold a reference to it: "delete" achieves that.
		3627	delete $FOFS[0][$idx];
		3628	delete $DATA[0][$idx];
		3629	$DATA[0][$idx] = $data;
		3630	$SIZE[0][$idx] = length $data;
		3631	delete $META[$idx];
		3632	$HASH{$hash} = $idx;#d#
3383		3633
3384	return $fh;	3634	$idx
3385	}	3635	}
3386		3636
3387	()	3637	sub _get_data($$$) {
3388	}	3638	my ($idx, $set, $cb) = @_;
3389		3639
3390	sub init_inc {	3640	if (defined $DATA[$set][$idx]) {
3391	# save original @INC	3641	$cb->($DATA[$set][$idx]);
3392	@ORIG_INC = ($LIBDIR, @INC) unless @ORIG_INC;	3642	} elsif (my $fofs = $FOFS[$set][$idx]) {
		3643	my $size = $SIZE[$set][$idx];
		3644	my $buf;
		3645	IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
		3646	if ($_[0] == $size) {
		3647	#cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
		3648	$cb->($buf);
		3649	} else {
		3650	cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
		3651	}
		3652	};
		3653	} else {
		3654	cf::error "requested facedata for unknown face $idx#$set, ignoring.";
		3655	}
		3656	}
3393		3657
3394	# make sure we can do scalar-opens	3658	# rather ineffient
3395	open my $dummy, "<", \my $dummy2;	3659	sub cf::face::get_data($;$) {
		3660	my ($idx, $set) = @_;
3396		3661
3397	# execute some stuff so perl load's some of the core modules	3662	_get_data $idx, $set, Coro::rouse_cb;
3398	/Ü/ =~ /ü/i;	3663	Coro::rouse_wait
3399	eval { &Storable::nstore_fd };	3664	}
3400		3665
3401	@INC = (\&inc_loader, @ORIG_INC); # @ORIG_INC is needed for DynaLoader, AutoLoad etc.	3666	sub cf::face::ix {
		3667	my ($ns, $set, $idx, $pri) = @_;
3402		3668
3403	debug "module loading will be asynchronous from this point on.";	3669	_get_data $idx, $set, sub {
		3670	$ns->ix_send ($idx, $pri, $_[0]);
		3671	};
		3672	}
3404	}	3673	}
3405		3674
3406	sub load_facedata($) {	3675	sub load_facedata($) {
3407	my ($path) = @_;	3676	my ($path) = @_;
3408		3677
3409	# HACK to clear player env face cache, we need some signal framework
3410	# for this (global event?)
3411	%ext::player_env::MUSIC_FACE_CACHE = ();
3412
3413	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3678	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3414		3679
3415	trace "loading facedata from $path\n";	3680	trace "loading facedata from $path\n";
3416		3681
3417	my $facedata;	3682	my $facedata = decode_storable load_file "$path/faceinfo";
3418	0 < aio_load $path, $facedata
3419	or die "$path: $!";
3420
3421	$facedata = Coro::Storable::thaw $facedata;
3422		3683
3423	$facedata->{version} == 2	3684	$facedata->{version} == 2
3424	or cf::cleanup "$path: version mismatch, cannot proceed.";	3685	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3425		3686
3426	# patch in the exptable	3687	my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3427	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);	3688	or cf::cleanup "$path/facedata: $!, cannot proceed.";
3428	$facedata->{resource}{"res/exp_table"} = {	3689
3429	type => FT_RSRC,	3690	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3430	data => $exp_table,	3691
3431	hash => (Digest::MD5::md5 $exp_table),	3692	# BEGIN ATOMIC
3432	};	3693	# from here on, everything must be atomic - no thread switch allowed
3433	cf::cede_to_tick;	3694	my $t1 = EV::time;
3434		3695
3435	{	3696	{
3436	my $faces = $facedata->{faceinfo};	3697	my $faces = $facedata->{faceinfo};
3437		3698
3438	while (my ($face, $info) = each %$faces) {	3699	for my $face (sort keys %$faces) {
		3700	my $info = $faces->{$face};
3439	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3701	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3440		3702
3441	cf::face::set_visibility $idx, $info->{visibility};	3703	cf::face::set_visibility $idx, $info->{visibility};
3442	cf::face::set_magicmap $idx, $info->{magicmap};	3704	cf::face::set_magicmap $idx, $info->{magicmap};
3443	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3705	cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3444	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3706	cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3445		3707	cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3446	cf::cede_to_tick;	3708	$cf::face::HASH{$info->{hash64}} = $idx;
		3709	delete $cf::face::META[$idx];
3447	}	3710	}
3448		3711
3449	while (my ($face, $info) = each %$faces) {	3712	while (my ($face, $info) = each %$faces) {
3450	next unless $info->{smooth};	3713	next unless $info->{smooth};
3451		3714
…		…
3456	cf::face::set_smooth $idx, $smooth;	3719	cf::face::set_smooth $idx, $smooth;
3457	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3720	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3458	} else {	3721	} else {
3459	error "smooth face '$info->{smooth}' not found for face '$face'";	3722	error "smooth face '$info->{smooth}' not found for face '$face'";
3460	}	3723	}
3461
3462	cf::cede_to_tick;
3463	}	3724	}
3464	}	3725	}
3465		3726
3466	{	3727	{
3467	my $anims = $facedata->{animinfo};	3728	my $anims = $facedata->{animinfo};
3468		3729
3469	while (my ($anim, $info) = each %$anims) {	3730	while (my ($anim, $info) = each %$anims) {
3470	cf::anim::set $anim, $info->{frames}, $info->{facings};	3731	cf::anim::set $anim, $info->{frames}, $info->{facings};
3471	cf::cede_to_tick;
3472	}	3732	}
3473		3733
3474	cf::anim::invalidate_all; # d'oh	3734	cf::anim::invalidate_all; # d'oh
3475	}	3735	}
3476		3736
3477	{	3737	{
3478	my $res = $facedata->{resource};	3738	my $res = $facedata->{resource};
3479		3739
3480	while (my ($name, $info) = each %$res) {	3740	while (my ($name, $info) = each %$res) {
3481	if (defined $info->{type}) {	3741	if (defined (my $type = $info->{type})) {
		3742	# TODO: different hash - must free and use new index, or cache ixface data queue
3482	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3743	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3483		3744
3484	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3485	cf::face::set_type $idx, $info->{type};	3745	cf::face::set_type $idx, $type;
		3746	cf::face::set_csum $idx, 0, $info->{hash};
		3747	$cf::face::SIZE[0][$idx] = $info->{size};
		3748	$cf::face::FOFS[0][$idx] = $info->{fofs};
		3749	$cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3750	$cf::face::HASH{$info->{hash}} = $idx;
3486	} else {	3751	} else {
3487	$RESOURCE{$name} = $info; # unused	3752	# $RESOURCE{$name} = $info; # unused
3488	}	3753	}
3489
3490	cf::cede_to_tick;
3491	}	3754	}
3492	}	3755	}
		3756
		3757	($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
		3758
		3759	# HACK to clear player env face cache, we need some signal framework
		3760	# for this (global event?)
		3761	%ext::player_env::MUSIC_FACE_CACHE = ();
		3762
		3763	# END ATOMIC
		3764
		3765	cf::debug "facedata atomic update time ", EV::time - $t1;
3493		3766
3494	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3767	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
		3768
		3769	aio_close $fh if $fh; # close old facedata
3495		3770
3496	1	3771	1
3497	}	3772	}
3498		3773
3499	register_exticmd fx_want => sub {	3774	register_exticmd fx_want => sub {
…		…
3510	my $status = load_resource_file_ $_[0];	3785	my $status = load_resource_file_ $_[0];
3511	get_slot 0.1, 100;	3786	get_slot 0.1, 100;
3512	cf::arch::commit_load;	3787	cf::arch::commit_load;
3513		3788
3514	$status	3789	$status
		3790	}
		3791
		3792	sub reload_exp_table {
		3793	_reload_exp_table;
		3794
		3795	cf::face::set
		3796	"res/exp_table" => FT_RSRC,
		3797	JSON::XS->new->utf8->canonical->encode (
		3798	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3799	);
		3800	}
		3801
		3802	sub reload_materials {
		3803	_reload_materials;
3515	}	3804	}
3516		3805
3517	sub reload_regions {	3806	sub reload_regions {
3518	# HACK to clear player env face cache, we need some signal framework	3807	# HACK to clear player env face cache, we need some signal framework
3519	# for this (global event?)	3808	# for this (global event?)
…		…
3527	if exists $_->{match};	3816	if exists $_->{match};
3528	}	3817	}
3529	}	3818	}
3530		3819
3531	sub reload_facedata {	3820	sub reload_facedata {
3532	load_facedata "$DATADIR/facedata"	3821	load_facedata $DATADIR
3533	or die "unable to load facedata\n";	3822	or die "unable to load facedata\n";
3534	}	3823	}
3535		3824
3536	sub reload_archetypes {	3825	sub reload_archetypes {
3537	load_resource_file "$DATADIR/archetypes"	3826	load_resource_file "$DATADIR/archetypes"
3538	or die "unable to load archetypes\n";	3827	or die "unable to load archetypes\n";
		3828
		3829	cf::face::set
		3830	"res/skill_info" => FT_RSRC,
		3831	JSON::XS->new->utf8->canonical->encode (
		3832	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3833	);
		3834
		3835	cf::face::set
		3836	"res/spell_paths" => FT_RSRC,
		3837	JSON::XS->new->utf8->canonical->encode (
		3838	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3839	);
		3840
		3841	# command completion
		3842	my @commands;
		3843
		3844	for (0..cf::arch::skillvec_size - 1) {
		3845	my $skill = cf::arch::skillvec $_;
		3846	my $name = $skill->name;
		3847	my $flags = cf::skill_flags $skill->subtype;
		3848
		3849	push @commands, "ready_skill $name" if $flags & (SF_COMBAT | SF_RANGED | SF_GRACE);
		3850	push @commands, "use_skill $name" if $flags & (SF_USE | SF_AUTARK | SF_GRACE);
		3851	}
		3852
		3853	cf::client::set_command_face skill => \@commands;
3539	}	3854	}
3540		3855
3541	sub reload_treasures {	3856	sub reload_treasures {
3542	load_resource_file "$DATADIR/treasures"	3857	load_resource_file "$DATADIR/treasures"
3543	or die "unable to load treasurelists\n";	3858	or die "unable to load treasurelists\n";
3544	}	3859	}
3545		3860
3546	sub reload_sound {	3861	sub reload_sound {
3547	trace "loading sound config from $DATADIR/sound\n";	3862	trace "loading sound config from $DATADIR/sound\n";
3548		3863
3549	0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3550	or die "$DATADIR/sound $!";
3551
3552	my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);	3864	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3553		3865
3554	for (0 .. SOUND_CAST_SPELL_0 - 1) {	3866	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3555	my $sound = $soundconf->{compat}[$_]	3867	my $sound = $soundconf->{compat}[$_]
3556	or next;	3868	or next;
3557		3869
…		…
3567	}	3879	}
3568		3880
3569	sub reload_resources {	3881	sub reload_resources {
3570	trace "reloading resource files...\n";	3882	trace "reloading resource files...\n";
3571		3883
		3884	reload_materials;
3572	reload_facedata;	3885	reload_facedata;
		3886	reload_exp_table;
3573	reload_sound;	3887	reload_sound;
3574	reload_archetypes;	3888	reload_archetypes;
3575	reload_regions;	3889	reload_regions;
3576	reload_treasures;	3890	reload_treasures;
3577		3891
…		…
3579	}	3893	}
3580		3894
3581	sub reload_config {	3895	sub reload_config {
3582	trace "reloading config file...\n";	3896	trace "reloading config file...\n";
3583		3897
3584	open my $fh, "<:utf8", "$CONFDIR/config"	3898	my $config = load_file "$CONFDIR/config";
3585	or return;	3899	utf8::decode $config;
3586		3900	*CFG = decode_yaml $config;
3587	local $/;
3588	*CFG = YAML::XS::Load scalar <$fh>;
3589		3901
3590	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];	3902	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3591		3903
3592	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3904	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3593	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3905	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
3597	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3909	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3598	and die "WARNING: m(un)lockall failed: $!\n";	3910	and die "WARNING: m(un)lockall failed: $!\n";
3599	};	3911	};
3600	warn $@ if $@;	3912	warn $@ if $@;
3601	}	3913	}
3602
3603	trace "finished reloading resource files\n";
3604	}	3914	}
3605		3915
3606	sub pidfile() {	3916	sub pidfile() {
3607	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3917	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3608	or die "$PIDFILE: $!";	3918	or die "$PIDFILE: $!";
…		…
3621	seek $fh, 0, 0;	3931	seek $fh, 0, 0;
3622	print $fh $$;	3932	print $fh $$;
3623	}	3933	}
3624		3934
3625	sub main_loop {	3935	sub main_loop {
3626	trace "EV::loop starting\n";	3936	trace "EV::run starting\n";
3627	if (1) {	3937	if (1) {
3628	EV::loop;	3938	EV::run;
3629	}	3939	}
3630	trace "EV::loop returned\n";	3940	trace "EV::run returned\n";
3631	goto &main_loop unless $REALLY_UNLOOP;	3941	goto &main_loop unless $REALLY_UNLOOP;
3632	}	3942	}
3633		3943
3634	sub main {	3944	sub main {
3635	cf::init_globals; # initialise logging	3945	cf::init_globals; # initialise logging
3636		3946
3637	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3947	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
		3948	LOG llevInfo, "Copyright (C) 2017-2018 Marc Alexander Lehmann / the Deliantra team.";
3638	LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3949	LOG llevInfo, "Copyright (C) 2005-2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3639	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3950	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3640	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3951	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3641		3952
3642	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3953	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3643		3954
3644	# we must not ever block the main coroutine	3955	# we must not ever block the main coroutine
3645	local $Coro::idle = sub {	3956	$Coro::idle = sub {
3646	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3957	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3647	(async {	3958	(async {
3648	$Coro::current->{desc} = "IDLE BUG HANDLER";	3959	$Coro::current->{desc} = "IDLE BUG HANDLER";
3649	EV::loop EV::LOOP_ONESHOT;	3960	EV::run EV::RUN_ONCE;
3650	})->prio (Coro::PRIO_MAX);	3961	})->prio (Coro::PRIO_MAX);
3651	};	3962	};
3652		3963
3653	evthread_start IO::AIO::poll_fileno;	3964	evthread_start IO::AIO::poll_fileno;
3654		3965
3655	cf::sync_job {	3966	cf::sync_job {
		3967	cf::incloader::init ();
		3968
3656	init_inc;	3969	db_init;
3657		3970
3658	cf::init_experience;
3659	cf::init_anim;	3971	cf::init_anim;
3660	cf::init_attackmess;	3972	cf::init_attackmess;
3661	cf::init_dynamic;	3973	cf::init_dynamic;
3662		3974
3663	cf::load_settings;	3975	cf::load_settings;
3664	cf::load_materials;
3665		3976
3666	reload_resources;	3977	reload_resources;
3667	reload_config;	3978	reload_config;
3668	db_init;
3669		3979
3670	cf::init_uuid;	3980	cf::init_uuid;
3671	cf::init_signals;	3981	cf::init_signals;
3672	cf::init_skills;	3982	cf::init_skills;
3673		3983
…		…
3681		3991
3682	# no (long-running) fork's whatsoever before this point(!)	3992	# no (long-running) fork's whatsoever before this point(!)
3683	use POSIX ();	3993	use POSIX ();
3684	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3994	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3685		3995
3686	(pop @POST_INIT)->(0) while @POST_INIT;	3996	cf::_post_init 0;
3687	};	3997	};
3688		3998
3689	cf::object::thawer::errors_are_fatal 0;	3999	cf::object::thawer::errors_are_fatal 0;
3690	info "parse errors in files are no longer fatal from this point on.\n";	4000	info "parse errors in files are no longer fatal from this point on.\n";
3691		4001
3692	my $free_main; $free_main = EV::idle sub {	4002	AE::postpone {
3693	undef $free_main;
3694	undef &main; # free gobs of memory :)	4003	undef &main; # free gobs of memory :)
3695	};	4004	};
3696		4005
3697	goto &main_loop;	4006	goto &main_loop;
3698	}	4007	}
…		…
3855		4164
3856	cf::write_runtime_sync; # external watchdog should not bark	4165	cf::write_runtime_sync; # external watchdog should not bark
3857		4166
3858	trace "emergency_perl_save: flushing outstanding aio requests";	4167	trace "emergency_perl_save: flushing outstanding aio requests";
3859	while (IO::AIO::nreqs || BDB::nreqs) {	4168	while (IO::AIO::nreqs || BDB::nreqs) {
3860	Coro::EV::timer_once 0.01; # let the sync_job do it's thing	4169	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3861	}	4170	}
3862		4171
3863	cf::write_runtime_sync; # external watchdog should not bark	4172	cf::write_runtime_sync; # external watchdog should not bark
3864	};	4173	};
3865		4174
…		…
3903	}	4212	}
3904	}	4213	}
3905		4214
3906	sub do_reload_perl() {	4215	sub do_reload_perl() {
3907	# can/must only be called in main	4216	# can/must only be called in main
3908	if (in_main) {	4217	unless (in_main) {
3909	error "can only reload from main coroutine";	4218	error "can only reload from main coroutine";
3910	return;	4219	return;
3911	}	4220	}
3912		4221
3913	return if $RELOAD++;	4222	return if $RELOAD++;
3914		4223
3915	my $t1 = AE::time;	4224	my $t1 = AE::time;
3916		4225
3917	while ($RELOAD) {	4226	while ($RELOAD) {
		4227	cf::get_slot 0.1, -1, "reload_perl";
3918	info "reloading...";	4228	info "perl_reload: reloading...";
3919		4229
3920	trace "entering sync_job";	4230	trace "perl_reload: entering sync_job";
3921		4231
3922	cf::sync_job {	4232	cf::sync_job {
3923	cf::emergency_save;	4233	#cf::emergency_save;
3924		4234
3925	trace "cancelling all extension coros";	4235	trace "perl_reload: cancelling all extension coros";
3926	$_->cancel for values %EXT_CORO;	4236	$_->cancel for values %EXT_CORO;
3927	%EXT_CORO = ();	4237	%EXT_CORO = ();
3928		4238
3929	trace "removing commands";	4239	trace "perl_reload: removing commands";
3930	%COMMAND = ();	4240	%COMMAND = ();
3931		4241
3932	trace "removing ext/exti commands";	4242	trace "perl_reload: removing ext/exti commands";
3933	%EXTCMD = ();	4243	%EXTCMD = ();
3934	%EXTICMD = ();	4244	%EXTICMD = ();
3935		4245
3936	trace "unloading/nuking all extensions";	4246	trace "perl_reload: unloading/nuking all extensions";
3937	for my $pkg (@EXTS) {	4247	for my $pkg (@EXTS) {
3938	trace "... unloading $pkg";	4248	trace "... unloading $pkg";
3939		4249
3940	if (my $cb = $pkg->can ("unload")) {	4250	if (my $cb = $pkg->can ("unload")) {
3941	eval {	4251	eval {
…		…
3946		4256
3947	trace "... clearing $pkg";	4257	trace "... clearing $pkg";
3948	clear_package $pkg;	4258	clear_package $pkg;
3949	}	4259	}
3950		4260
3951	trace "unloading all perl modules loaded from $LIBDIR";	4261	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3952	while (my ($k, $v) = each %INC) {	4262	while (my ($k, $v) = each %INC) {
3953	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4263	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3954		4264
3955	trace "... unloading $k";	4265	trace "... unloading $k";
3956	delete $INC{$k};	4266	delete $INC{$k};
…		…
3963	}	4273	}
3964		4274
3965	clear_package $k;	4275	clear_package $k;
3966	}	4276	}
3967		4277
3968	trace "getting rid of safe::, as good as possible";	4278	trace "perl_reload: getting rid of safe::, as good as possible";
3969	clear_package "safe::$_"	4279	clear_package "safe::$_"
3970	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4280	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3971		4281
3972	trace "unloading cf.pm \"a bit\"";	4282	trace "perl_reload: unloading cf.pm \"a bit\"";
3973	delete $INC{"cf.pm"};	4283	delete $INC{"cf.pm"};
3974	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4284	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3975		4285
3976	# don't, removes xs symbols, too,	4286	# don't, removes xs symbols, too,
3977	# and global variables created in xs	4287	# and global variables created in xs
3978	#clear_package __PACKAGE__;	4288	#clear_package __PACKAGE__;
3979		4289
3980	info "unload completed, starting to reload now";	4290	info "perl_reload: unload completed, starting to reload now";
3981		4291
3982	trace "reloading cf.pm";	4292	trace "perl_reload: reloading cf.pm";
3983	require cf;	4293	require cf;
3984	cf::_connect_to_perl_1;	4294	cf::_connect_to_perl_1;
3985		4295
3986	trace "loading config and database again";	4296	trace "perl_reload: loading config and database again";
3987	cf::reload_config;	4297	cf::reload_config;
3988		4298
3989	trace "loading extensions";	4299	trace "perl_reload: loading extensions";
3990	cf::load_extensions;	4300	cf::load_extensions;
3991		4301
3992	if ($REATTACH_ON_RELOAD) {	4302	if ($REATTACH_ON_RELOAD) {
3993	trace "reattaching attachments to objects/players";	4303	trace "perl_reload: reattaching attachments to objects/players";
3994	_global_reattach; # objects, sockets	4304	_global_reattach; # objects, sockets
3995	trace "reattaching attachments to maps";	4305	trace "perl_reload: reattaching attachments to maps";
3996	reattach $_ for values %MAP;	4306	reattach $_ for values %MAP;
3997	trace "reattaching attachments to players";	4307	trace "perl_reload: reattaching attachments to players";
3998	reattach $_ for values %PLAYER;	4308	reattach $_ for values %PLAYER;
3999	}	4309	}
4000		4310
4001	trace "running post_init jobs";	4311	cf::_post_init 1;
4002	(pop @POST_INIT)->(1) while @POST_INIT;
4003		4312
4004	trace "leaving sync_job";	4313	trace "perl_reload: leaving sync_job";
4005		4314
4006	1	4315	1
4007	} or do {	4316	} or do {
4008	error $@;	4317	error $@;
4009	cf::cleanup "error while reloading, exiting.";	4318	cf::cleanup "perl_reload: error, exiting.";
4010	};	4319	};
4011		4320
4012	info "reloaded";
4013	--$RELOAD;	4321	--$RELOAD;
4014	}	4322	}
4015		4323
4016	$t1 = AE::time - $t1;	4324	$t1 = AE::time - $t1;
4017	info "reload completed in ${t1}s\n";	4325	info "perl_reload: completed in ${t1}s\n";
4018	};	4326	};
4019		4327
4020	our $RELOAD_WATCHER; # used only during reload	4328	our $RELOAD_WATCHER; # used only during reload
4021		4329
4022	sub reload_perl() {	4330	sub reload_perl() {
…		…
4047		4355
4048	#############################################################################	4356	#############################################################################
4049		4357
4050	my $bug_warning = 0;	4358	my $bug_warning = 0;
4051		4359
4052	our @WAIT_FOR_TICK;
4053	our @WAIT_FOR_TICK_BEGIN;
4054
4055	sub wait_for_tick {	4360	sub wait_for_tick() {
4056	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4361	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4057		4362
4058	my $signal = new Coro::Signal;	4363	$WAIT_FOR_TICK->wait;
4059	push @WAIT_FOR_TICK, $signal;
4060	$signal->wait;
4061	}	4364	}
4062		4365
4063	sub wait_for_tick_begin {	4366	sub wait_for_tick_begin() {
4064	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4367	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4065		4368
4066	my $signal = new Coro::Signal;	4369	my $signal = new Coro::Signal;
4067	push @WAIT_FOR_TICK_BEGIN, $signal;	4370	push @WAIT_FOR_TICK_BEGIN, $signal;
4068	$signal->wait;	4371	$signal->wait;
4069	}	4372	}
…		…
4073	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4376	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4074	unless ++$bug_warning > 10;	4377	unless ++$bug_warning > 10;
4075	return;	4378	return;
4076	}	4379	}
4077		4380
4078	cf::server_tick; # one server iteration	4381	cf::one_tick; # one server iteration
4079		4382
4080	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#	4383	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4081		4384
4082	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4385	if ($NOW >= $NEXT_RUNTIME_WRITE) {
4083	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4386	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
…		…
4089	}	4392	}
4090		4393
4091	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4394	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4092	$sig->send;	4395	$sig->send;
4093	}	4396	}
4094	while (my $sig = shift @WAIT_FOR_TICK) {	4397	$WAIT_FOR_TICK->broadcast;
4095	$sig->send;
4096	}
4097		4398
4098	$LOAD = ($NOW - $TICK_START) / $TICK;	4399	$LOAD = ($NOW - $TICK_START) / $TICK;
4099	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4400	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4100		4401
4101	if (0) {	4402	if (0) {
…		…
4107	}	4408	}
4108	}	4409	}
4109		4410
4110	{	4411	{
4111	# configure BDB	4412	# configure BDB
		4413	info "initialising database";
4112		4414
4113	BDB::min_parallel 16;	4415	BDB::min_parallel 16;
4114	BDB::max_poll_reqs $TICK * 0.1;	4416	BDB::max_poll_reqs $TICK * 0.1;
4115	$AnyEvent::BDB::WATCHER->priority (1);	4417	#$AnyEvent::BDB::WATCHER->priority (1);
4116		4418
4117	unless ($DB_ENV) {	4419	unless ($DB_ENV) {
4118	$DB_ENV = BDB::db_env_create;	4420	$DB_ENV = BDB::db_env_create;
4119	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4421	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4120	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4422	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
4145	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4447	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4146	};	4448	};
4147	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4449	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4148	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4450	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4149	};	4451	};
		4452
		4453	info "database initialised";
4150	}	4454	}
4151		4455
4152	{	4456	{
4153	# configure IO::AIO	4457	# configure IO::AIO
4154		4458
		4459	info "initialising aio";
4155	IO::AIO::min_parallel 8;	4460	IO::AIO::min_parallel 8;
4156	IO::AIO::max_poll_time $TICK * 0.1;	4461	IO::AIO::max_poll_time $TICK * 0.1;
4157	undef $AnyEvent::AIO::WATCHER;	4462	undef $AnyEvent::AIO::WATCHER;
		4463	info "aio initialised";
4158	}	4464	}
4159		4465
4160	my $_log_backtrace;	4466	our $_log_backtrace;
		4467	our $_log_backtrace_last;
4161		4468
4162	sub _log_backtrace {	4469	sub _log_backtrace {
4163	my ($msg, @addr) = @_;	4470	my ($msg, @addr) = @_;
4164		4471
4165	$msg =~ s/\n//;	4472	$msg =~ s/\n$//;
4166		4473
		4474	if ($_log_backtrace_last eq $msg) {
		4475	LOG llevInfo, "[ABT] $msg\n";
		4476	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4167	# limit the # of concurrent backtraces	4477	# limit the # of concurrent backtraces
4168	if ($_log_backtrace < 2) {	4478	} elsif ($_log_backtrace < 2) {
		4479	$_log_backtrace_last = $msg;
4169	++$_log_backtrace;	4480	++$_log_backtrace;
4170	my $perl_bt = Carp::longmess $msg;	4481	my $perl_bt = Carp::longmess $msg;
4171	async {	4482	async {
4172	$Coro::current->{desc} = "abt $msg";	4483	$Coro::current->{desc} = "abt $msg";
4173		4484
…		…
4193	LOG llevInfo, "[ABT] $_\n" for @bt;	4504	LOG llevInfo, "[ABT] $_\n" for @bt;
4194	--$_log_backtrace;	4505	--$_log_backtrace;
4195	};	4506	};
4196	} else {	4507	} else {
4197	LOG llevInfo, "[ABT] $msg\n";	4508	LOG llevInfo, "[ABT] $msg\n";
4198	LOG llevInfo, "[ABT] [suppressed]\n";	4509	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4199	}	4510	}
4200	}	4511	}
4201		4512
4202	# load additional modules	4513	# load additional modules
4203	require "cf/$_.pm" for @EXTRA_MODULES;	4514	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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