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.539 by root, Tue May 4 22:49:21 2010 UTC vs.
Revision 1.621 by root, Fri Nov 18 20:55:00 2016 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
…		…
32	use Safe;	32	use Safe;
33	use Safe::Hole;	33	use Safe::Hole;
34	use Storable ();	34	use Storable ();
35	use Carp ();	35	use Carp ();
36		36
37	use Guard ();	37	use AnyEvent ();
		38	use AnyEvent::IO ();
		39	use AnyEvent::DNS ();
		40
38	use Coro ();	41	use Coro ();
39	use Coro::State;	42	use Coro::State;
40	use Coro::Handle;	43	use Coro::Handle;
41	use Coro::EV;	44	use Coro::EV;
42	use Coro::AnyEvent;	45	use Coro::AnyEvent;
…		…
48	use Coro::AIO;	51	use Coro::AIO;
49	use Coro::BDB 1.6;	52	use Coro::BDB 1.6;
50	use Coro::Storable;	53	use Coro::Storable;
51	use Coro::Util ();	54	use Coro::Util ();
52		55
		56	use Guard ();
53	use JSON::XS 2.01 ();	57	use JSON::XS 2.01 ();
54	use BDB ();	58	use BDB ();
55	use Data::Dumper;	59	use Data::Dumper;
56	use Fcntl;	60	use Fcntl;
57	use YAML::XS ();	61	use YAML::XS ();
58	use IO::AIO ();	62	use IO::AIO ();
59	use Time::HiRes;
60	use Compress::LZF;	63	use Compress::LZF;
61	use Digest::MD5 ();	64	use Digest::MD5 ();
62		65
63	AnyEvent::detect;	66	AnyEvent::detect;
64		67
…		…
76	# strictly for debugging	79	# strictly for debugging
77	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };	80	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
78		81
79	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	82	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80		83
		84	our @ORIG_INC;
		85
81	our %COMMAND = ();	86	our %COMMAND = ();
82	our %COMMAND_TIME = ();	87	our %COMMAND_TIME = ();
83		88
84	our @EXTS = (); # list of extension package names	89	our @EXTS = (); # list of extension package names
85	our %EXTCMD = ();	90	our %EXTCMD = ();
		91	our %EXTACMD = ();
86	our %EXTICMD = ();	92	our %EXTICMD = ();
		93	our %EXTIACMD = ();
87	our %EXT_CORO = (); # coroutines bound to extensions	94	our %EXT_CORO = (); # coroutines bound to extensions
88	our %EXT_MAP = (); # pluggable maps	95	our %EXT_MAP = (); # pluggable maps
89		96
90	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
91	our @EVENT;	98	our @EVENT;
92	our @REFLECT; # set by XS	99	our @REFLECT; # set by XS
93	our %REFLECT; # set by us	100	our %REFLECT; # set by us
94		101
95	our $CONFDIR = confdir;	102	our $CONFDIR = confdir;
		103
96	our $DATADIR = datadir;	104	our $DATADIR = datadir;
97	our $LIBDIR = "$DATADIR/ext";	105	our $LIBDIR = "$DATADIR/ext";
98	our $PODDIR = "$DATADIR/pod";	106	our $PODDIR = "$DATADIR/pod";
99	our $MAPDIR = "$DATADIR/" . mapdir;	107	our $MAPDIR = "$DATADIR/" . mapdir;
		108
100	our $LOCALDIR = localdir;	109	our $LOCALDIR = localdir;
101	our $TMPDIR = "$LOCALDIR/" . tmpdir;	110	our $TMPDIR = "$LOCALDIR/" . tmpdir;
102	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	111	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
103	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	112	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
104	our $RANDOMDIR = "$LOCALDIR/random";	113	our $RANDOMDIR = "$LOCALDIR/random";
105	our $BDBDIR = "$LOCALDIR/db";	114	our $BDBDIR = "$LOCALDIR/db";
106	our $PIDFILE = "$LOCALDIR/pid";	115	our $PIDFILE = "$LOCALDIR/pid";
107	our $RUNTIMEFILE = "$LOCALDIR/runtime";	116	our $RUNTIMEFILE = "$LOCALDIR/runtime";
108		117
109	our %RESOURCE; # unused	118	#our %RESOURCE; # unused
110		119
111	our $OUTPUT_RATE_MIN = 3000;	120	our $OUTPUT_RATE_MIN = 3000;
112	our $OUTPUT_RATE_MAX = 1000000;	121	our $OUTPUT_RATE_MAX = 1000000;
113		122
114	our $MAX_LINKS = 32; # how many chained exits to follow	123	our $MAX_LINKS = 32; # how many chained exits to follow
…		…
122	our $BDB_DEADLOCK_WATCHER;	131	our $BDB_DEADLOCK_WATCHER;
123	our $BDB_CHECKPOINT_WATCHER;	132	our $BDB_CHECKPOINT_WATCHER;
124	our $BDB_TRICKLE_WATCHER;	133	our $BDB_TRICKLE_WATCHER;
125	our $DB_ENV;	134	our $DB_ENV;
126		135
127	our @EXTRA_MODULES = qw(pod match mapscript);	136	our @EXTRA_MODULES = qw(pod match mapscript incloader);
128		137
129	our %CFG;	138	our %CFG;
		139	our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
130		140
131	our $UPTIME; $UPTIME ||= time;	141	our $UPTIME; $UPTIME ||= time;
132	our $RUNTIME;	142	our $RUNTIME = 0;
		143	our $SERVER_TICK = 0;
133	our $NOW;	144	our $NOW;
134		145
135	our (%PLAYER, %PLAYER_LOADING); # all users	146	our (%PLAYER, %PLAYER_LOADING); # all users
136	our (%MAP, %MAP_LOADING ); # all maps	147	our (%MAP, %MAP_LOADING ); # all maps
137	our $LINK_MAP; # the special {link} map, which is always available	148	our $LINK_MAP; # the special {link} map, which is always available
…		…
146		157
147	our @POST_INIT;	158	our @POST_INIT;
148		159
149	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)
150	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;
151		165
152	binmode STDOUT;	166	binmode STDOUT;
153	binmode STDERR;	167	binmode STDERR;
154		168
155	# read virtual server time, if available	169	# read virtual server time, if available
…		…
189		203
190	=over 4	204	=over 4
191		205
192	=item $cf::UPTIME	206	=item $cf::UPTIME
193		207
194	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.
195		224
196	=item $cf::RUNTIME	225	=item $cf::RUNTIME
197		226
198	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
199	every server tick.	228	every server tick.
200		229
201	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR	230	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
202	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR	231	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
203	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR	232	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
204		233
205	Various directories - "/etc", read-only install directory, perl-library	234	Various directories - "/etc", read-only install directory, perl-library
206	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	235	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
207	unique-items directory, player file directory, random maps directory and	236	unique-items directory, player file directory, random maps directory and
208	database environment.	237	database environment.
209		238
210	=item $cf::NOW
211
212	The time of the last (current) server tick.
213
214	=item $cf::TICK
215
216	The interval between server ticks, in seconds.
217
218	=item $cf::LOADAVG	239	=item $cf::LOADAVG
219		240
220	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
221	(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
222	objects per tick. Healthy values are < 0.5.	243	objects per tick. Healthy values are < 0.5.
…		…
230	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
231	from wherever your confdir points to.	252	from wherever your confdir points to.
232		253
233	=item cf::wait_for_tick, cf::wait_for_tick_begin	254	=item cf::wait_for_tick, cf::wait_for_tick_begin
234		255
235	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.
236	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
237	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();
238		277
239	=item @cf::INVOKE_RESULTS	278	=item @cf::INVOKE_RESULTS
240		279
241	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
242	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
…		…
303	)) {	342	)) {
304	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	343	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
305	}	344	}
306		345
307	$EV::DIED = sub {	346	$EV::DIED = sub {
308	Carp::cluck "error in event callback: @_";	347	warn "error in event callback: $@";
309	};	348	};
		349
		350	#############################################################################
		351
		352	sub fork_call(&@);
		353	sub get_slot($;$$);
310		354
311	#############################################################################	355	#############################################################################
312		356
313	=head2 UTILITY FUNCTIONS	357	=head2 UTILITY FUNCTIONS
314		358
…		…
335	$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;
336	$d	380	$d
337	} || "[unable to dump $_[0]: '$@']";	381	} || "[unable to dump $_[0]: '$@']";
338	}	382	}
339		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
340	=item $ref = cf::decode_json $json	436	=item $ref = cf::decode_json $json
341		437
342	Converts a JSON string into the corresponding perl data structure.	438	Converts a JSON string into the corresponding perl data structure.
343		439
344	=item $json = cf::encode_json $ref	440	=item $json = cf::encode_json $ref
…		…
350	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
351		447
352	sub encode_json($) { $json_coder->encode ($_[0]) }	448	sub encode_json($) { $json_coder->encode ($_[0]) }
353	sub decode_json($) { $json_coder->decode ($_[0]) }	449	sub decode_json($) { $json_coder->decode ($_[0]) }
354		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
355	=item cf::post_init { BLOCK }	482	=item cf::post_init { BLOCK }
356		483
357	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,
358	but I<before> the server starts ticking again.	485	but I<before> the server starts ticking again.
359		486
360	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
361	is a reload or not.	488	is a reload or not.
362		489
363	=cut	490	=cut
364		491
365	sub post_init(&) {	492	sub post_init(&) {
366	push @POST_INIT, shift;	493	push @POST_INIT, shift;
367	}	494	}
368		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	}
		511	}
		512
369	=item cf::lock_wait $string	513	=item cf::lock_wait $string
370		514
371	Wait until the given lock is available. See cf::lock_acquire.	515	Wait until the given lock is available. See cf::lock_acquire.
372		516
373	=item my $lock = cf::lock_acquire $string	517	=item my $lock = cf::lock_acquire $string
374		518
375	Wait until the given lock is available and then acquires it and returns	519	Wait until the given lock is available and then acquires it and returns
376	a L<Guard> object. If the guard object gets destroyed (goes out of scope,	520	a L<Guard> object. If the guard object gets destroyed (goes out of scope,
…		…
424	EV::periodic $start, $interval, 0, $cb	568	EV::periodic $start, $interval, 0, $cb
425	}	569	}
426		570
427	=item cf::get_slot $time[, $priority[, $name]]	571	=item cf::get_slot $time[, $priority[, $name]]
428		572
429	Allocate $time seconds of blocking CPU time at priority C<$priority>:	573	Allocate $time seconds of blocking CPU time at priority C<$priority>
430	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
431	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.
432		580
433	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
434	used for statistical purposes and should identify the same time-class.	582	used for statistical purposes and should identify the same time-class.
435		583
436	Useful for short background jobs.	584	Useful for short background jobs.
…		…
448	my $signal = new Coro::Signal;	596	my $signal = new Coro::Signal;
449	my $busy;	597	my $busy;
450		598
451	while () {	599	while () {
452	next_job:	600	next_job:
		601
		602	Coro::cede;
453		603
454	my $avail = cf::till_tick;	604	my $avail = cf::till_tick;
455		605
456	for (0 .. $#SLOT_QUEUE) {	606	for (0 .. $#SLOT_QUEUE) {
457	if ($SLOT_QUEUE[$_][0] <= $avail) {	607	if ($SLOT_QUEUE[$_][0] <= $avail) {
458	$busy = 0;	608	$busy = 0;
459	my $job = splice @SLOT_QUEUE, $_, 1, ();	609	my $job = splice @SLOT_QUEUE, $_, 1, ();
460	$job->[2]->send;	610	$job->[2]->send;
461	Coro::cede;
462	goto next_job;	611	goto next_job;
463	} else {	612	} else {
464	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;	613	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
465	}	614	}
466	}	615	}
467		616
468	if (@SLOT_QUEUE) {	617	if (@SLOT_QUEUE) {
469	# we do not use wait_for_tick() as it returns immediately when tick is inactive	618	wait_for_tick;
470	push @cf::WAIT_FOR_TICK, $signal;
471	$signal->wait;
472	} else {	619	} else {
473	$busy = 0;	620	$busy = 0;
474	Coro::schedule;	621	Coro::schedule;
475	}	622	}
476	}	623	}
…		…
502	BEGIN { *async = \&Coro::async_pool }	649	BEGIN { *async = \&Coro::async_pool }
503		650
504	=item cf::sync_job { BLOCK }	651	=item cf::sync_job { BLOCK }
505		652
506	The design of Deliantra requires that the main coroutine ($Coro::main)	653	The design of Deliantra requires that the main coroutine ($Coro::main)
507	is always able to handle events or runnable, as Deliantra is only	654	is always able to handle events or is runnable, as Deliantra is only
508	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not	655	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
509	acceptable.	656	acceptable.
510		657
511	If it must be done, put the blocking parts into C<sync_job>. This will run	658	If it must be done, put the blocking parts into C<sync_job>. This will run
512	the given BLOCK in another coroutine while waiting for the result. The	659	the given BLOCK in another coroutine while waiting for the result. The
…		…
540		687
541	while ($busy) {	688	while ($busy) {
542	if (Coro::nready) {	689	if (Coro::nready) {
543	Coro::cede_notself;	690	Coro::cede_notself;
544	} else {	691	} else {
545	EV::loop EV::LOOP_ONESHOT;	692	EV::run EV::RUN_ONCE;
546	}	693	}
547	}	694	}
548		695
549	my $time = AE::time - $time;	696	my $time = AE::time - $time;
550		697
…		…
576	$EXT_CORO{$coro+0} = $coro;	723	$EXT_CORO{$coro+0} = $coro;
577		724
578	$coro	725	$coro
579	}	726	}
580		727
581	=item fork_call { }, $args	728	=item fork_call { }, @args
582		729
583	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
584	process, returning the results. Everything must be serialisable with	731	process, returning the results. Everything must be serialisable with
585	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
586	never block itself or use any form of event handling.	733	never block itself or use any form of event handling.
587		734
588	=cut	735	=cut
589		736
		737	sub post_fork {
		738	reset_signals;
		739	}
		740
590	sub fork_call(&@) {	741	sub fork_call(&@) {
591	my ($cb, @args) = @_;	742	my ($cb, @args) = @_;
592		743
593	# we seemingly have to make a local copy of the whole thing,
594	# otherwise perl prematurely frees the stuff :/
595	# TODO: investigate and fix (likely this will be rather laborious)
596
597	my @res = Coro::Util::fork_eval {	744	my @res = Coro::Util::fork_eval {
598	reset_signals;	745	cf::post_fork;
599	&$cb	746	&$cb
600	}, @args;	747	} @args;
601		748
602	wantarray ? @res : $res[-1]	749	wantarray ? @res : $res[-1]
603	}	750	}
604		751
605	sub objinfo {	752	sub objinfo {
…		…
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>) {
…		…
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	undef $@; # work around perl 5.10.0 utf-8 caching bug
1455		1650
1456	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1651	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1457	if exists $v->{meta}{mandatory};	1652	if exists $v->{meta}{mandatory};
1458		1653
1459	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";	1654	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
…		…
1473		1668
1474	while (my ($k, $v) = each %todo) {	1669	while (my ($k, $v) = each %todo) {
1475	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1670	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1476	if exists $v->{meta}{mandatory};	1671	if exists $v->{meta}{mandatory};
1477	}	1672	}
		1673
		1674	last;
1478	}	1675	}
1479	}	1676	}
1480	};	1677	};
1481	}	1678	}
1482		1679
…		…
1640	my $name = $pl->ob->name;	1837	my $name = $pl->ob->name;
1641		1838
1642	$pl->{deny_save} = 1;	1839	$pl->{deny_save} = 1;
1643	$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
1644		1841
1645	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1842	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1646	$pl->deactivate;	1843	$pl->deactivate;
		1844
1647	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;
1648	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1846	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1847	ext::highscore::check ($pl->ob);
		1848
1649	$pl->ns->destroy if $pl->ns;	1849	$pl->ns->destroy if $pl->ns;
1650		1850
1651	my $path = playerdir $pl;	1851	my $path = playerdir $pl;
1652	my $temp = "$path~$cf::RUNTIME~deleting~";	1852	my $temp = "$path~$cf::RUNTIME~deleting~";
1653	aio_rename $path, $temp;	1853	aio_rename $path, $temp;
…		…
1739		1939
1740	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1940	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1741		1941
1742	Expand deliantra pod fragments into protocol xml.	1942	Expand deliantra pod fragments into protocol xml.
1743		1943
1744	=item $player->ext_reply ($msgid, @msg)
1745
1746	Sends an ext reply to the player.
1747
1748	=cut
1749
1750	sub ext_reply($$@) {
1751	my ($self, $id, @msg) = @_;
1752
1753	$self->ns->ext_reply ($id, @msg)
1754	}
1755
1756	=item $player->ext_msg ($type, @msg)	1944	=item $player->ext_msg ($type, @msg)
1757		1945
1758	Sends an ext event to the client.	1946	Sends an ext event to the client.
1759		1947
1760	=cut	1948	=cut
…		…
1819	sub generate_random_map {	2007	sub generate_random_map {
1820	my ($self, $rmp) = @_;	2008	my ($self, $rmp) = @_;
1821		2009
1822	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
1823		2011
1824	# mit "rum" bekleckern, nicht
1825	$self->_create_random_map (	2012	$self->_create_random_map ($rmp);
1826	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1827	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1828	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1829	$rmp->{exit_on_final_map},
1830	$rmp->{xsize}, $rmp->{ysize},
1831	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1832	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1833	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1834	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1835	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1836	(cf::region::find $rmp->{region}), $rmp->{custom}
1837	)
1838	}	2013	}
1839		2014
1840	=item cf::map->register ($regex, $prio)	2015	=item cf::map->register ($regex, $prio)
1841		2016
1842	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
…		…
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
		2354	# it's a bug to call this from the main context
2195	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"	2355	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2196	if $Coro::current == $Coro::main;	2356	if $Coro::current == $Coro::main;
2197		2357
2198	find $path, $origin	2358	find $path, $origin
2199	}	2359	}
2200		2360
2201	sub do_load_sync {	2361	sub do_load_sync {
2202	my ($map) = @_;	2362	my ($map) = @_;
2203		2363
		2364	# it's a bug to call this from the main context
2204	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"	2365	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2205	if $Coro::current == $Coro::main;	2366	if $Coro::current == $Coro::main;
2206		2367
2207	$map->load;	2368	$map->load;
2208	}	2369	}
…		…
2211	our $MAP_PREFETCHER = undef;	2372	our $MAP_PREFETCHER = undef;
2212		2373
2213	sub find_async {	2374	sub find_async {
2214	my ($path, $origin, $load) = @_;	2375	my ($path, $origin, $load) = @_;
2215		2376
2216	$path = normalise $path, $origin && $origin->{path};	2377	$path = normalise $path, $origin;
2217		2378
2218	if (my $map = $cf::MAP{$path}) {	2379	if (my $map = $cf::MAP{$path}) {
2219	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2380	return $map if !$load || $map->linkable;
2220	}	2381	}
2221		2382
2222	$MAP_PREFETCH{$path} |= $load;	2383	$MAP_PREFETCH{$path} |= $load;
2223		2384
2224	$MAP_PREFETCHER ||= cf::async {	2385	$MAP_PREFETCHER ||= cf::async {
2225	$Coro::current->{desc} = "map prefetcher";	2386	$Coro::current->{desc} = "map prefetcher";
2226		2387
2227	while (%MAP_PREFETCH) {	2388	while (%MAP_PREFETCH) {
2228	while (my ($k, $v) = each %MAP_PREFETCH) {	2389	for my $k (keys %MAP_PREFETCH) {
2229	if (my $map = find $k) {	2390	if (my $map = find $k) {
2230	$map->load if $v;	2391	$map->load if $MAP_PREFETCH{$k};
2231	}	2392	}
2232		2393
2233	delete $MAP_PREFETCH{$k};	2394	delete $MAP_PREFETCH{$k};
2234	}	2395	}
2235	}	2396	}
…		…
2283	sub swap_out {	2444	sub swap_out {
2284	my ($self) = @_;	2445	my ($self) = @_;
2285		2446
2286	my $lock = cf::lock_acquire "map_data:$self->{path}";	2447	my $lock = cf::lock_acquire "map_data:$self->{path}";
2287		2448
2288	return if $self->in_memory != cf::MAP_ACTIVE;	2449	return if !$self->linkable;
2289	return if $self->{deny_save};	2450	return if $self->{deny_save};
2290	return if $self->players;	2451	return if $self->players;
2291		2452
2292	# first deactivate the map and "unlink" it from the core	2453	# first deactivate the map and "unlink" it from the core
2293	$self->deactivate;	2454	$self->deactivate;
2294	$_->clear_links_to ($self) for values %cf::MAP;	2455	$_->clear_links_to ($self) for values %cf::MAP;
2295	$self->in_memory (cf::MAP_SWAPPED);	2456	$self->state (cf::MAP_SWAPPED);
2296		2457
2297	# then atomically save	2458	# then atomically save
2298	$self->_save;	2459	$self->_save;
2299		2460
2300	# then free the map	2461	# then free the map
…		…
2326		2487
2327	return if $self->players;	2488	return if $self->players;
2328		2489
2329	cf::trace "resetting map ", $self->path, "\n";	2490	cf::trace "resetting map ", $self->path, "\n";
2330		2491
2331	$self->in_memory (cf::MAP_SWAPPED);	2492	$self->state (cf::MAP_SWAPPED);
2332		2493
2333	# need to save uniques path	2494	# need to save uniques path
2334	unless ($self->{deny_save}) {	2495	unless ($self->{deny_save}) {
2335	my $uniq = $self->uniq_path; utf8::encode $uniq;	2496	my $uniq = $self->uniq_path; utf8::encode $uniq;
2336		2497
…		…
2489		2650
2490	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.
2491		2652
2492	=item $ob = cf::object::deref ($refstring)	2653	=item $ob = cf::object::deref ($refstring)
2493		2654
2494	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,
2495	even if the object actually exists. May block.	2656	even if the object actually exists. May block.
2496		2657
2497	=cut	2658	=cut
2498		2659
2499	sub deref {	2660	sub deref {
…		…
2581	=item $player_object->may ("access")	2742	=item $player_object->may ("access")
2582		2743
2583	Returns wether the given player is authorized to access resource "access"	2744	Returns wether the given player is authorized to access resource "access"
2584	(e.g. "command_wizcast").	2745	(e.g. "command_wizcast").
2585		2746
		2747	This is implemented by checking a config setting of C<may_access> where
		2748	C<access> is replaced by the access string. The following alternatives are
		2749	possible (and are tested in order):
		2750
		2751	=over 4
		2752
		2753	=item * Player is DM
		2754
		2755	The request will succeed.
		2756
		2757	=item * may_access is an array reference
		2758
		2759	If either the player nickname or UUID is in the array, the request will
		2760	succeed, otherwise it will fail.
		2761
		2762	=item * may_access is a true value
		2763
		2764	The request will succeed.
		2765
		2766	=item * may_access is missing or false
		2767
		2768	The request will fail.
		2769
		2770	=back
		2771
2586	=cut	2772	=cut
2587		2773
2588	sub cf::object::player::may {	2774	sub cf::object::player::may {
2589	my ($self, $access) = @_;	2775	my ($self, $access) = @_;
2590		2776
2591	$self->flag (cf::FLAG_WIZ) ||	2777	$self->flag (cf::FLAG_WIZ) ||
2592	(ref $cf::CFG{"may_$access"}	2778	(ref $cf::CFG{"may_$access"}
2593	? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}	2779	? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2594	: $cf::CFG{"may_$access"})	2780	: $cf::CFG{"may_$access"})
2595	}	2781	}
2596		2782
2597	=item $player_object->enter_link	2783	=item $player_object->enter_link
2598		2784
…		…
2601	The player should be reasonably safe there for short amounts of time (e.g.	2787	The player should be reasonably safe there for short amounts of time (e.g.
2602	for loading a map). You I<MUST> call C<leave_link> as soon as possible,	2788	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2603	though, as the player cannot control the character while it is on the link	2789	though, as the player cannot control the character while it is on the link
2604	map.	2790	map.
2605		2791
2606	Will never block.	2792	This method will never block, which is the whole reaosn for it's
		2793	existance: you can I<always> put a player onto the link map, which is the
		2794	only place to put objects that is guaranteed to exist.
		2795
		2796	A typical usage pattern is to call C<enter_link> synchronously from the
		2797	server, then start a new thread, do your blocking stuff there and then
		2798	call C<leave_link> from that thread.
2607		2799
2608	=item $player_object->leave_link ($map, $x, $y)	2800	=item $player_object->leave_link ($map, $x, $y)
2609		2801
2610	Moves the player out of the special C<{link}> map onto the specified	2802	Moves the player out of the special C<{link}> map onto the specified
2611	map. If the map is not valid (or omitted), the player will be moved back	2803	map. If the map is not valid (or omitted), the player will be moved back
…		…
2666	# use -1 or undef as default coordinates, not 0, 0	2858	# use -1 or undef as default coordinates, not 0, 0
2667	($x, $y) = ($map->enter_x, $map->enter_y)	2859	($x, $y) = ($map->enter_x, $map->enter_y)
2668	if $x <= 0 && $y <= 0;	2860	if $x <= 0 && $y <= 0;
2669		2861
2670	$map->load;	2862	$map->load;
2671	$map->load_neighbours;
2672		2863
2673	return unless $self->contr->active;	2864	return unless $self->contr->active;
2674		2865
2675	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2866	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2676	if ($self->enter_map ($map, $x, $y)) {	2867	if ($self->enter_map ($map, $x, $y)) {
…		…
2732	($path, $x, $y) = (undef, undef, undef);	2923	($path, $x, $y) = (undef, undef, undef);
2733	}	2924	}
2734	}	2925	}
2735		2926
2736	my $map = eval {	2927	my $map = eval {
2737	my $map = defined $path ? cf::map::find $path : undef;	2928	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2738		2929
2739	if ($map) {	2930	if ($map) {
2740	$map = $map->customise_for ($self);	2931	$map = $map->customise_for ($self);
2741	$map = $check->($map, $x, $y, $self) if $check && $map;	2932	$map = $check->($map, $x, $y, $self) if $check && $map;
2742	} else {	2933	} else {
…		…
2832	$Coro::current->{desc} = "enter_exit";	3023	$Coro::current->{desc} = "enter_exit";
2833		3024
2834	unless (eval {	3025	unless (eval {
2835	$self->deactivate_recursive; # just to be sure	3026	$self->deactivate_recursive; # just to be sure
2836		3027
2837	# random map handling
2838	{
2839	my $guard = cf::lock_acquire "exit_prepare:$exit";
2840
2841	prepare_random_map $exit
2842	if $exit->slaying eq "/!";
2843	}
2844
2845	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	3028	my $map = cf::map::normalise $exit->slaying, $exit->map;
2846	my $x = $exit->stats->hp;	3029	my $x = $exit->stats->hp;
2847	my $y = $exit->stats->sp;	3030	my $y = $exit->stats->sp;
		3031
		3032	# special map handling
		3033	my $slaying = $exit->slaying;
		3034
		3035	# special map handling
		3036	if ($slaying eq "/!") {
		3037	my $guard = cf::lock_acquire "exit_prepare:$exit";
		3038
		3039	prepare_random_map $exit
		3040	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		3041
		3042	$map = $exit->slaying;
		3043
		3044	} elsif ($slaying eq '!up') {
		3045	$map = $exit->map->tile_path (cf::TILE_UP);
		3046	$x = $exit->x;
		3047	$y = $exit->y;
		3048
		3049	} elsif ($slaying eq '!down') {
		3050	$map = $exit->map->tile_path (cf::TILE_DOWN);
		3051	$x = $exit->x;
		3052	$y = $exit->y;
		3053	}
2848		3054
2849	$self->goto ($map, $x, $y);	3055	$self->goto ($map, $x, $y);
2850		3056
2851	# if exit is damned, update players death & WoR home-position	3057	# if exit is damned, update players death & WoR home-position
2852	$self->contr->savebed ($map, $x, $y)	3058	$self->contr->savebed ($map, $x, $y)
…		…
2867		3073
2868	=head3 cf::client	3074	=head3 cf::client
2869		3075
2870	=over 4	3076	=over 4
2871		3077
2872	=item $client->send_drawinfo ($text, $flags)
2873
2874	Sends a drawinfo packet to the client. Circumvents output buffering so
2875	should not be used under normal circumstances.
2876
2877	=cut
2878
2879	sub cf::client::send_drawinfo {
2880	my ($self, $text, $flags) = @_;
2881
2882	utf8::encode $text;
2883	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2884	}
2885
2886	=item $client->send_big_packet ($pkt)	3078	=item $client->send_big_packet ($pkt)
2887		3079
2888	Like C<send_packet>, but tries to compress large packets, and fragments	3080	Like C<send_packet>, but tries to compress large packets, and fragments
2889	them as required.	3081	them as required.
2890		3082
…		…
2908	$self->send_packet ($pkt);	3100	$self->send_packet ($pkt);
2909	}	3101	}
2910		3102
2911	=item $client->send_msg ($channel, $msg, $color, [extra...])	3103	=item $client->send_msg ($channel, $msg, $color, [extra...])
2912		3104
2913	Send a drawinfo or msg packet to the client, formatting the msg for the	3105	Send a msg packet to the client, formatting the msg for the client if
2914	client if neccessary. C<$type> should be a string identifying the type of	3106	necessary. C<$type> should be a string identifying the type of the
2915	the message, with C<log> being the default. If C<$color> is negative, suppress	3107	message, with C<log> being the default. If C<$color> is negative, suppress
2916	the message unless the client supports the msg packet.	3108	the message unless the client supports the msg packet.
2917		3109
2918	=cut	3110	=cut
2919		3111
2920	# non-persistent channels (usually the info channel)	3112	# non-persistent channels (usually the info channel)
…		…
3025	id => "death",	3217	id => "death",
3026	title => "Death",	3218	title => "Death",
3027	reply => undef,	3219	reply => undef,
3028	tooltip => "Reason for and more info about your most recent death",	3220	tooltip => "Reason for and more info about your most recent death",
3029	},	3221	},
		3222	"c/fatal" => {
		3223	id => "fatal",
		3224	title => "Fatal Error",
		3225	reply => undef,
		3226	tooltip => "Reason for the server disconnect",
		3227	},
3030	"c/say" => $SAY_CHANNEL,	3228	"c/say" => $SAY_CHANNEL,
3031	"c/chat" => $CHAT_CHANNEL,	3229	"c/chat" => $CHAT_CHANNEL,
3032	);	3230	);
3033		3231
3034	sub cf::client::send_msg {	3232	sub cf::client::send_msg {
…		…
3077	=cut	3275	=cut
3078		3276
3079	sub cf::client::ext_msg($$@) {	3277	sub cf::client::ext_msg($$@) {
3080	my ($self, $type, @msg) = @_;	3278	my ($self, $type, @msg) = @_;
3081		3279
3082	if ($self->extcmd == 2) {
3083	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3280	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3084	} elsif ($self->extcmd == 1) { # TODO: remove
3085	push @msg, msgtype => "event_$type";
3086	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3087	}
3088	}
3089
3090	=item $client->ext_reply ($msgid, @msg)
3091
3092	Sends an ext reply to the client.
3093
3094	=cut
3095
3096	sub cf::client::ext_reply($$@) {
3097	my ($self, $id, @msg) = @_;
3098
3099	if ($self->extcmd == 2) {
3100	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3101	} elsif ($self->extcmd == 1) {
3102	#TODO: version 1, remove
3103	unshift @msg, msgtype => "reply", msgid => $id;
3104	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3105	}
3106	}	3281	}
3107		3282
3108	=item $success = $client->query ($flags, "text", \&cb)	3283	=item $success = $client->query ($flags, "text", \&cb)
3109		3284
3110	Queues a query to the client, calling the given callback with	3285	Queues a query to the client, calling the given callback with
…		…
3130		3305
3131	$self->send_packet ($self->{query_queue}[0][0])	3306	$self->send_packet ($self->{query_queue}[0][0])
3132	if @{ $self->{query_queue} } == 1;	3307	if @{ $self->{query_queue} } == 1;
3133		3308
3134	1	3309	1
		3310	}
		3311
		3312	=item $client->update_command_faces
		3313
		3314	=cut
		3315
		3316	our %COMMAND_FACE;
		3317
		3318	sub cf::client::update_command_faces {
		3319	my ($self) = @_;
		3320
		3321	my @faces = grep $_,
		3322	$COMMAND_FACE{preferred},
		3323	$COMMAND_FACE{standard},
		3324	$COMMAND_FACE{skill},
		3325	$self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
		3326	$COMMAND_FACE{emote},
		3327	;
		3328
		3329	$self->send_face ($_)
		3330	for @faces;
		3331	$self->flush_fx;
		3332
		3333	$self->ext_msg (command_list => @faces);
		3334	}
		3335
		3336	=item cf::client::set_command_face $type, $commands
		3337
		3338	=cut
		3339
		3340	sub cf::client::set_command_face {
		3341	my ($type, $list) = @_;
		3342
		3343	my $idx = &cf::face::set ( #d# ugly forward reference
		3344	"command_list/$type" => cf::FT_RSRC,
		3345	JSON::XS->new->utf8->encode ([ sort @$list ])
		3346	);
		3347
		3348	$COMMAND_FACE{$type} = $idx;
3135	}	3349	}
3136		3350
3137	cf::client->attach (	3351	cf::client->attach (
3138	on_connect => sub {	3352	on_connect => sub {
3139	my ($ns) = @_;	3353	my ($ns) = @_;
…		…
3165	my ($ns, $buf) = @_;	3379	my ($ns, $buf) = @_;
3166		3380
3167	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3381	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3168		3382
3169	if (ref $msg) {	3383	if (ref $msg) {
3170	my ($type, $reply, @payload) =	3384	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3171	"ARRAY" eq ref $msg
3172	? @$msg
3173	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3174		3385
3175	my @reply;
3176
3177	if (my $cb = $EXTICMD{$type}) {	3386	if (my $cb = $EXTIACMD{$type}) {
		3387	$cb->(
		3388	$ns,
		3389	sub {
		3390	$ns->ext_msg ("reply-$reply", @_)
		3391	if $reply;
		3392	},
		3393	@payload
		3394	);
		3395	} else {
		3396	my @reply;
		3397
		3398	if (my $cb = $EXTICMD{$type}) {
3178	@reply = $cb->($ns, @payload);	3399	@reply = $cb->($ns, @payload);
		3400	}
		3401
		3402	$ns->ext_msg ("reply-$reply", @reply)
		3403	if $reply;
3179	}	3404	}
3180
3181	$ns->ext_reply ($reply, @reply)
3182	if $reply;
3183
3184	} else {	3405	} else {
3185	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3406	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3186	}	3407	}
3187		3408
3188	cf::override;	3409	cf::override;
…		…
3356	=cut	3577	=cut
3357		3578
3358	#############################################################################	3579	#############################################################################
3359	# the server's init and main functions	3580	# the server's init and main functions
3360		3581
		3582	{
		3583	package cf::face;
		3584
		3585	our %HASH; # hash => idx
		3586	our @DATA; # dynamically-created facedata, only faceste 0 used
		3587	our @FOFS; # file offset, if > 0
		3588	our @SIZE; # size of face, in octets
		3589	our @META; # meta hash of face, if any
		3590	our $DATAFH; # facedata filehandle
		3591
		3592	# internal api, not finalised
		3593	sub set {
		3594	my ($name, $type, $data) = @_;
		3595
		3596	my $idx = cf::face::find $name;
		3597
		3598	if ($idx) {
		3599	delete $HASH{cf::face::get_csum $idx};
		3600	} else {
		3601	$idx = cf::face::alloc $name;
		3602	}
		3603
		3604	my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
		3605
		3606	cf::face::set_type $idx, $type;
		3607	cf::face::set_csum $idx, 0, $hash;
		3608
		3609	# we need to destroy the SV itself, not just modify it, as a running ix
		3610	# might hold a reference to it: "delete" achieves that.
		3611	delete $FOFS[0][$idx];
		3612	delete $DATA[0][$idx];
		3613	$DATA[0][$idx] = $data;
		3614	$SIZE[0][$idx] = length $data;
		3615	delete $META[$idx];
		3616	$HASH{$hash} = $idx;#d#
		3617
		3618	$idx
		3619	}
		3620
		3621	sub _get_data($$$) {
		3622	my ($idx, $set, $cb) = @_;
		3623
		3624	if (defined $DATA[$set][$idx]) {
		3625	$cb->($DATA[$set][$idx]);
		3626	} elsif (my $fofs = $FOFS[$set][$idx]) {
		3627	my $size = $SIZE[$set][$idx];
		3628	my $buf;
		3629	IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
		3630	if ($_[0] == $size) {
		3631	#cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
		3632	$cb->($buf);
		3633	} else {
		3634	cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
		3635	}
		3636	};
		3637	} else {
		3638	cf::error "requested facedata for unknown face $idx#$set, ignoring.";
		3639	}
		3640	}
		3641
		3642	# rather ineffient
		3643	sub cf::face::get_data($;$) {
		3644	my ($idx, $set) = @_;
		3645
		3646	_get_data $idx, $set, Coro::rouse_cb;
		3647	Coro::rouse_wait
		3648	}
		3649
		3650	sub cf::face::ix {
		3651	my ($ns, $set, $idx, $pri) = @_;
		3652
		3653	_get_data $idx, $set, sub {
		3654	$ns->ix_send ($idx, $pri, $_[0]);
		3655	};
		3656	}
		3657	}
		3658
3361	sub load_facedata($) {	3659	sub load_facedata($) {
3362	my ($path) = @_;	3660	my ($path) = @_;
3363		3661
3364	# HACK to clear player env face cache, we need some signal framework
3365	# for this (global event?)
3366	%ext::player_env::MUSIC_FACE_CACHE = ();
3367
3368	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3662	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3369		3663
3370	trace "loading facedata from $path\n";	3664	trace "loading facedata from $path\n";
3371		3665
3372	my $facedata;	3666	my $facedata = decode_storable load_file "$path/faceinfo";
3373	0 < aio_load $path, $facedata
3374	or die "$path: $!";
3375
3376	$facedata = Coro::Storable::thaw $facedata;
3377		3667
3378	$facedata->{version} == 2	3668	$facedata->{version} == 2
3379	or cf::cleanup "$path: version mismatch, cannot proceed.";	3669	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3380		3670
3381	# patch in the exptable	3671	my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3382	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);	3672	or cf::cleanup "$path/facedata: $!, cannot proceed.";
3383	$facedata->{resource}{"res/exp_table"} = {	3673
3384	type => FT_RSRC,	3674	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3385	data => $exp_table,	3675
3386	hash => (Digest::MD5::md5 $exp_table),	3676	# BEGIN ATOMIC
3387	};	3677	# from here on, everything must be atomic - no thread switch allowed
3388	cf::cede_to_tick;	3678	my $t1 = EV::time;
3389		3679
3390	{	3680	{
3391	my $faces = $facedata->{faceinfo};	3681	my $faces = $facedata->{faceinfo};
3392		3682
3393	while (my ($face, $info) = each %$faces) {	3683	for my $face (sort keys %$faces) {
		3684	my $info = $faces->{$face};
3394	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3685	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3395		3686
3396	cf::face::set_visibility $idx, $info->{visibility};	3687	cf::face::set_visibility $idx, $info->{visibility};
3397	cf::face::set_magicmap $idx, $info->{magicmap};	3688	cf::face::set_magicmap $idx, $info->{magicmap};
3398	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3689	cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3399	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3690	cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3400		3691	cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3401	cf::cede_to_tick;	3692	$cf::face::HASH{$info->{hash64}} = $idx;
		3693	delete $cf::face::META[$idx];
3402	}	3694	}
3403		3695
3404	while (my ($face, $info) = each %$faces) {	3696	while (my ($face, $info) = each %$faces) {
3405	next unless $info->{smooth};	3697	next unless $info->{smooth};
3406		3698
…		…
3411	cf::face::set_smooth $idx, $smooth;	3703	cf::face::set_smooth $idx, $smooth;
3412	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3704	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3413	} else {	3705	} else {
3414	error "smooth face '$info->{smooth}' not found for face '$face'";	3706	error "smooth face '$info->{smooth}' not found for face '$face'";
3415	}	3707	}
3416
3417	cf::cede_to_tick;
3418	}	3708	}
3419	}	3709	}
3420		3710
3421	{	3711	{
3422	my $anims = $facedata->{animinfo};	3712	my $anims = $facedata->{animinfo};
3423		3713
3424	while (my ($anim, $info) = each %$anims) {	3714	while (my ($anim, $info) = each %$anims) {
3425	cf::anim::set $anim, $info->{frames}, $info->{facings};	3715	cf::anim::set $anim, $info->{frames}, $info->{facings};
3426	cf::cede_to_tick;
3427	}	3716	}
3428		3717
3429	cf::anim::invalidate_all; # d'oh	3718	cf::anim::invalidate_all; # d'oh
3430	}	3719	}
3431		3720
3432	{	3721	{
3433	my $res = $facedata->{resource};	3722	my $res = $facedata->{resource};
3434		3723
3435	while (my ($name, $info) = each %$res) {	3724	while (my ($name, $info) = each %$res) {
3436	if (defined $info->{type}) {	3725	if (defined (my $type = $info->{type})) {
		3726	# TODO: different hash - must free and use new index, or cache ixface data queue
3437	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3727	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3438		3728
3439	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3440	cf::face::set_type $idx, $info->{type};	3729	cf::face::set_type $idx, $type;
		3730	cf::face::set_csum $idx, 0, $info->{hash};
		3731	$cf::face::SIZE[0][$idx] = $info->{size};
		3732	$cf::face::FOFS[0][$idx] = $info->{fofs};
		3733	$cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3734	$cf::face::HASH{$info->{hash}} = $idx;
3441	} else {	3735	} else {
3442	$RESOURCE{$name} = $info; # unused	3736	# $RESOURCE{$name} = $info; # unused
3443	}	3737	}
3444
3445	cf::cede_to_tick;
3446	}	3738	}
3447	}	3739	}
		3740
		3741	($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
		3742
		3743	# HACK to clear player env face cache, we need some signal framework
		3744	# for this (global event?)
		3745	%ext::player_env::MUSIC_FACE_CACHE = ();
		3746
		3747	# END ATOMIC
		3748
		3749	cf::debug "facedata atomic update time ", EV::time - $t1;
3448		3750
3449	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3751	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
		3752
		3753	aio_close $fh if $fh; # close old facedata
3450		3754
3451	1	3755	1
3452	}	3756	}
3453		3757
3454	register_exticmd fx_want => sub {	3758	register_exticmd fx_want => sub {
…		…
3465	my $status = load_resource_file_ $_[0];	3769	my $status = load_resource_file_ $_[0];
3466	get_slot 0.1, 100;	3770	get_slot 0.1, 100;
3467	cf::arch::commit_load;	3771	cf::arch::commit_load;
3468		3772
3469	$status	3773	$status
		3774	}
		3775
		3776	sub reload_exp_table {
		3777	_reload_exp_table;
		3778
		3779	cf::face::set
		3780	"res/exp_table" => FT_RSRC,
		3781	JSON::XS->new->utf8->canonical->encode (
		3782	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3783	);
		3784	}
		3785
		3786	sub reload_materials {
		3787	_reload_materials;
3470	}	3788	}
3471		3789
3472	sub reload_regions {	3790	sub reload_regions {
3473	# HACK to clear player env face cache, we need some signal framework	3791	# HACK to clear player env face cache, we need some signal framework
3474	# for this (global event?)	3792	# for this (global event?)
…		…
3482	if exists $_->{match};	3800	if exists $_->{match};
3483	}	3801	}
3484	}	3802	}
3485		3803
3486	sub reload_facedata {	3804	sub reload_facedata {
3487	load_facedata "$DATADIR/facedata"	3805	load_facedata $DATADIR
3488	or die "unable to load facedata\n";	3806	or die "unable to load facedata\n";
3489	}	3807	}
3490		3808
3491	sub reload_archetypes {	3809	sub reload_archetypes {
3492	load_resource_file "$DATADIR/archetypes"	3810	load_resource_file "$DATADIR/archetypes"
3493	or die "unable to load archetypes\n";	3811	or die "unable to load archetypes\n";
		3812
		3813	cf::face::set
		3814	"res/skill_info" => FT_RSRC,
		3815	JSON::XS->new->utf8->canonical->encode (
		3816	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3817	);
		3818
		3819	cf::face::set
		3820	"res/spell_paths" => FT_RSRC,
		3821	JSON::XS->new->utf8->canonical->encode (
		3822	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3823	);
		3824
		3825	# command completion
		3826	my @commands;
		3827
		3828	for (0..cf::arch::skillvec_size - 1) {
		3829	my $skill = cf::arch::skillvec $_;
		3830	my $name = $skill->name;
		3831	my $flags = cf::skill_flags $skill->subtype;
		3832
		3833	push @commands, "ready_skill $name" if $flags & (SF_COMBAT | SF_RANGED | SF_GRACE);
		3834	push @commands, "use_skill $name" if $flags & (SF_USE | SF_AUTARK | SF_GRACE);
		3835	}
		3836
		3837	cf::client::set_command_face skill => \@commands;
3494	}	3838	}
3495		3839
3496	sub reload_treasures {	3840	sub reload_treasures {
3497	load_resource_file "$DATADIR/treasures"	3841	load_resource_file "$DATADIR/treasures"
3498	or die "unable to load treasurelists\n";	3842	or die "unable to load treasurelists\n";
3499	}	3843	}
3500		3844
3501	sub reload_sound {	3845	sub reload_sound {
3502	trace "loading sound config from $DATADIR/sound\n";	3846	trace "loading sound config from $DATADIR/sound\n";
3503		3847
3504	0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3505	or die "$DATADIR/sound $!";
3506
3507	my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);	3848	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3508		3849
3509	for (0 .. SOUND_CAST_SPELL_0 - 1) {	3850	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3510	my $sound = $soundconf->{compat}[$_]	3851	my $sound = $soundconf->{compat}[$_]
3511	or next;	3852	or next;
3512		3853
…		…
3522	}	3863	}
3523		3864
3524	sub reload_resources {	3865	sub reload_resources {
3525	trace "reloading resource files...\n";	3866	trace "reloading resource files...\n";
3526		3867
		3868	reload_materials;
3527	reload_facedata;	3869	reload_facedata;
		3870	reload_exp_table;
3528	reload_sound;	3871	reload_sound;
3529	reload_archetypes;	3872	reload_archetypes;
3530	reload_regions;	3873	reload_regions;
3531	reload_treasures;	3874	reload_treasures;
3532		3875
…		…
3534	}	3877	}
3535		3878
3536	sub reload_config {	3879	sub reload_config {
3537	trace "reloading config file...\n";	3880	trace "reloading config file...\n";
3538		3881
3539	open my $fh, "<:utf8", "$CONFDIR/config"	3882	my $config = load_file "$CONFDIR/config";
3540	or return;	3883	utf8::decode $config;
3541		3884	*CFG = decode_yaml $config;
3542	local $/;
3543	*CFG = YAML::XS::Load scalar <$fh>;
3544		3885
3545	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];	3886	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3546		3887
3547	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3888	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3548	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3889	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
3552	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3893	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3553	and die "WARNING: m(un)lockall failed: $!\n";	3894	and die "WARNING: m(un)lockall failed: $!\n";
3554	};	3895	};
3555	warn $@ if $@;	3896	warn $@ if $@;
3556	}	3897	}
3557
3558	trace "finished reloading resource files\n";
3559	}	3898	}
3560		3899
3561	sub pidfile() {	3900	sub pidfile() {
3562	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3901	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3563	or die "$PIDFILE: $!";	3902	or die "$PIDFILE: $!";
…		…
3576	seek $fh, 0, 0;	3915	seek $fh, 0, 0;
3577	print $fh $$;	3916	print $fh $$;
3578	}	3917	}
3579		3918
3580	sub main_loop {	3919	sub main_loop {
3581	trace "EV::loop starting\n";	3920	trace "EV::run starting\n";
3582	if (1) {	3921	if (1) {
3583	EV::loop;	3922	EV::run;
3584	}	3923	}
3585	trace "EV::loop returned\n";	3924	trace "EV::run returned\n";
3586	goto &main_loop unless $REALLY_UNLOOP;	3925	goto &main_loop unless $REALLY_UNLOOP;
3587	}	3926	}
3588		3927
3589	sub main {	3928	sub main {
3590	cf::init_globals; # initialise logging	3929	cf::init_globals; # initialise logging
3591		3930
3592	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3931	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3593	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3932	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3594	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3933	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3595	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3934	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3596		3935
3597	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3936	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3598		3937
3599	# we must not ever block the main coroutine	3938	# we must not ever block the main coroutine
3600	local $Coro::idle = sub {	3939	$Coro::idle = sub {
3601	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3940	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3602	(async {	3941	(async {
3603	$Coro::current->{desc} = "IDLE BUG HANDLER";	3942	$Coro::current->{desc} = "IDLE BUG HANDLER";
3604	EV::loop EV::LOOP_ONESHOT;	3943	EV::run EV::RUN_ONCE;
3605	})->prio (Coro::PRIO_MAX);	3944	})->prio (Coro::PRIO_MAX);
3606	};	3945	};
3607		3946
3608	evthread_start IO::AIO::poll_fileno;	3947	evthread_start IO::AIO::poll_fileno;
3609		3948
3610	cf::sync_job {	3949	cf::sync_job {
3611	cf::init_experience;	3950	cf::incloader::init ();
		3951
		3952	db_init;
		3953
3612	cf::init_anim;	3954	cf::init_anim;
3613	cf::init_attackmess;	3955	cf::init_attackmess;
3614	cf::init_dynamic;	3956	cf::init_dynamic;
3615		3957
3616	cf::load_settings;	3958	cf::load_settings;
3617	cf::load_materials;
3618		3959
3619	reload_resources;	3960	reload_resources;
3620	reload_config;	3961	reload_config;
3621	db_init;
3622		3962
3623	cf::init_uuid;	3963	cf::init_uuid;
3624	cf::init_signals;	3964	cf::init_signals;
3625	cf::init_skills;	3965	cf::init_skills;
3626		3966
…		…
3634		3974
3635	# no (long-running) fork's whatsoever before this point(!)	3975	# no (long-running) fork's whatsoever before this point(!)
3636	use POSIX ();	3976	use POSIX ();
3637	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3977	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3638		3978
3639	(pop @POST_INIT)->(0) while @POST_INIT;	3979	cf::_post_init 0;
3640	};	3980	};
3641		3981
3642	cf::object::thawer::errors_are_fatal 0;	3982	cf::object::thawer::errors_are_fatal 0;
3643	info "parse errors in files are no longer fatal from this point on.\n";	3983	info "parse errors in files are no longer fatal from this point on.\n";
3644		3984
		3985	AE::postpone {
		3986	undef &main; # free gobs of memory :)
		3987	};
		3988
3645	main_loop;	3989	goto &main_loop;
3646	}	3990	}
3647		3991
3648	#############################################################################	3992	#############################################################################
3649	# initialisation and cleanup	3993	# initialisation and cleanup
3650		3994
…		…
3803		4147
3804	cf::write_runtime_sync; # external watchdog should not bark	4148	cf::write_runtime_sync; # external watchdog should not bark
3805		4149
3806	trace "emergency_perl_save: flushing outstanding aio requests";	4150	trace "emergency_perl_save: flushing outstanding aio requests";
3807	while (IO::AIO::nreqs || BDB::nreqs) {	4151	while (IO::AIO::nreqs || BDB::nreqs) {
3808	Coro::EV::timer_once 0.01; # let the sync_job do it's thing	4152	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3809	}	4153	}
3810		4154
3811	cf::write_runtime_sync; # external watchdog should not bark	4155	cf::write_runtime_sync; # external watchdog should not bark
3812	};	4156	};
3813		4157
…		…
3851	}	4195	}
3852	}	4196	}
3853		4197
3854	sub do_reload_perl() {	4198	sub do_reload_perl() {
3855	# can/must only be called in main	4199	# can/must only be called in main
3856	if (in_main) {	4200	unless (in_main) {
3857	error "can only reload from main coroutine";	4201	error "can only reload from main coroutine";
3858	return;	4202	return;
3859	}	4203	}
3860		4204
3861	return if $RELOAD++;	4205	return if $RELOAD++;
3862		4206
3863	my $t1 = AE::time;	4207	my $t1 = AE::time;
3864		4208
3865	while ($RELOAD) {	4209	while ($RELOAD) {
		4210	cf::get_slot 0.1, -1, "reload_perl";
3866	info "reloading...";	4211	info "perl_reload: reloading...";
3867		4212
3868	trace "entering sync_job";	4213	trace "perl_reload: entering sync_job";
3869		4214
3870	cf::sync_job {	4215	cf::sync_job {
3871	cf::emergency_save;	4216	#cf::emergency_save;
3872		4217
3873	trace "cancelling all extension coros";	4218	trace "perl_reload: cancelling all extension coros";
3874	$_->cancel for values %EXT_CORO;	4219	$_->cancel for values %EXT_CORO;
3875	%EXT_CORO = ();	4220	%EXT_CORO = ();
3876		4221
3877	trace "removing commands";	4222	trace "perl_reload: removing commands";
3878	%COMMAND = ();	4223	%COMMAND = ();
3879		4224
3880	trace "removing ext/exti commands";	4225	trace "perl_reload: removing ext/exti commands";
3881	%EXTCMD = ();	4226	%EXTCMD = ();
3882	%EXTICMD = ();	4227	%EXTICMD = ();
3883		4228
3884	trace "unloading/nuking all extensions";	4229	trace "perl_reload: unloading/nuking all extensions";
3885	for my $pkg (@EXTS) {	4230	for my $pkg (@EXTS) {
3886	trace "... unloading $pkg";	4231	trace "... unloading $pkg";
3887		4232
3888	if (my $cb = $pkg->can ("unload")) {	4233	if (my $cb = $pkg->can ("unload")) {
3889	eval {	4234	eval {
…		…
3894		4239
3895	trace "... clearing $pkg";	4240	trace "... clearing $pkg";
3896	clear_package $pkg;	4241	clear_package $pkg;
3897	}	4242	}
3898		4243
3899	trace "unloading all perl modules loaded from $LIBDIR";	4244	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3900	while (my ($k, $v) = each %INC) {	4245	while (my ($k, $v) = each %INC) {
3901	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4246	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3902		4247
3903	trace "... unloading $k";	4248	trace "... unloading $k";
3904	delete $INC{$k};	4249	delete $INC{$k};
…		…
3911	}	4256	}
3912		4257
3913	clear_package $k;	4258	clear_package $k;
3914	}	4259	}
3915		4260
3916	trace "getting rid of safe::, as good as possible";	4261	trace "perl_reload: getting rid of safe::, as good as possible";
3917	clear_package "safe::$_"	4262	clear_package "safe::$_"
3918	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4263	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3919		4264
3920	trace "unloading cf.pm \"a bit\"";	4265	trace "perl_reload: unloading cf.pm \"a bit\"";
3921	delete $INC{"cf.pm"};	4266	delete $INC{"cf.pm"};
3922	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4267	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3923		4268
3924	# don't, removes xs symbols, too,	4269	# don't, removes xs symbols, too,
3925	# and global variables created in xs	4270	# and global variables created in xs
3926	#clear_package __PACKAGE__;	4271	#clear_package __PACKAGE__;
3927		4272
3928	info "unload completed, starting to reload now";	4273	info "perl_reload: unload completed, starting to reload now";
3929		4274
3930	trace "reloading cf.pm";	4275	trace "perl_reload: reloading cf.pm";
3931	require cf;	4276	require cf;
3932	cf::_connect_to_perl_1;	4277	cf::_connect_to_perl_1;
3933		4278
3934	trace "loading config and database again";	4279	trace "perl_reload: loading config and database again";
3935	cf::reload_config;	4280	cf::reload_config;
3936		4281
3937	trace "loading extensions";	4282	trace "perl_reload: loading extensions";
3938	cf::load_extensions;	4283	cf::load_extensions;
3939		4284
3940	if ($REATTACH_ON_RELOAD) {	4285	if ($REATTACH_ON_RELOAD) {
3941	trace "reattaching attachments to objects/players";	4286	trace "perl_reload: reattaching attachments to objects/players";
3942	_global_reattach; # objects, sockets	4287	_global_reattach; # objects, sockets
3943	trace "reattaching attachments to maps";	4288	trace "perl_reload: reattaching attachments to maps";
3944	reattach $_ for values %MAP;	4289	reattach $_ for values %MAP;
3945	trace "reattaching attachments to players";	4290	trace "perl_reload: reattaching attachments to players";
3946	reattach $_ for values %PLAYER;	4291	reattach $_ for values %PLAYER;
3947	}	4292	}
3948		4293
3949	trace "running post_init jobs";	4294	cf::_post_init 1;
3950	(pop @POST_INIT)->(1) while @POST_INIT;
3951		4295
3952	trace "leaving sync_job";	4296	trace "perl_reload: leaving sync_job";
3953		4297
3954	1	4298	1
3955	} or do {	4299	} or do {
3956	error $@;	4300	error $@;
3957	cf::cleanup "error while reloading, exiting.";	4301	cf::cleanup "perl_reload: error, exiting.";
3958	};	4302	};
3959		4303
3960	info "reloaded";
3961	--$RELOAD;	4304	--$RELOAD;
3962	}	4305	}
3963		4306
3964	$t1 = AE::time - $t1;	4307	$t1 = AE::time - $t1;
3965	info "reload completed in ${t1}s\n";	4308	info "perl_reload: completed in ${t1}s\n";
3966	};	4309	};
3967		4310
3968	our $RELOAD_WATCHER; # used only during reload	4311	our $RELOAD_WATCHER; # used only during reload
3969		4312
3970	sub reload_perl() {	4313	sub reload_perl() {
…		…
3991	reload_perl;	4334	reload_perl;
3992	};	4335	};
3993	}	4336	}
3994	};	4337	};
3995		4338
3996	unshift @INC, $LIBDIR;	4339	#############################################################################
3997		4340
3998	my $bug_warning = 0;	4341	my $bug_warning = 0;
3999		4342
4000	our @WAIT_FOR_TICK;
4001	our @WAIT_FOR_TICK_BEGIN;
4002
4003	sub wait_for_tick {	4343	sub wait_for_tick() {
4004	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4344	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4005		4345
4006	my $signal = new Coro::Signal;	4346	$WAIT_FOR_TICK->wait;
4007	push @WAIT_FOR_TICK, $signal;
4008	$signal->wait;
4009	}	4347	}
4010		4348
4011	sub wait_for_tick_begin {	4349	sub wait_for_tick_begin() {
4012	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4350	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4013		4351
4014	my $signal = new Coro::Signal;	4352	my $signal = new Coro::Signal;
4015	push @WAIT_FOR_TICK_BEGIN, $signal;	4353	push @WAIT_FOR_TICK_BEGIN, $signal;
4016	$signal->wait;	4354	$signal->wait;
4017	}	4355	}
…		…
4021	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4359	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4022	unless ++$bug_warning > 10;	4360	unless ++$bug_warning > 10;
4023	return;	4361	return;
4024	}	4362	}
4025		4363
4026	cf::server_tick; # one server iteration	4364	cf::one_tick; # one server iteration
4027		4365
4028	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#	4366	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4029		4367
4030	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4368	if ($NOW >= $NEXT_RUNTIME_WRITE) {
4031	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4369	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
…		…
4037	}	4375	}
4038		4376
4039	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4377	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4040	$sig->send;	4378	$sig->send;
4041	}	4379	}
4042	while (my $sig = shift @WAIT_FOR_TICK) {	4380	$WAIT_FOR_TICK->broadcast;
4043	$sig->send;
4044	}
4045		4381
4046	$LOAD = ($NOW - $TICK_START) / $TICK;	4382	$LOAD = ($NOW - $TICK_START) / $TICK;
4047	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4383	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4048		4384
4049	if (0) {	4385	if (0) {
…		…
4055	}	4391	}
4056	}	4392	}
4057		4393
4058	{	4394	{
4059	# configure BDB	4395	# configure BDB
		4396	info "initialising database";
4060		4397
4061	BDB::min_parallel 16;	4398	BDB::min_parallel 16;
4062	BDB::max_poll_reqs $TICK * 0.1;	4399	BDB::max_poll_reqs $TICK * 0.1;
4063	$AnyEvent::BDB::WATCHER->priority (1);	4400	#$AnyEvent::BDB::WATCHER->priority (1);
4064		4401
4065	unless ($DB_ENV) {	4402	unless ($DB_ENV) {
4066	$DB_ENV = BDB::db_env_create;	4403	$DB_ENV = BDB::db_env_create;
4067	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4404	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4068	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4405	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
4093	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4430	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4094	};	4431	};
4095	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4432	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4096	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4433	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4097	};	4434	};
		4435
		4436	info "database initialised";
4098	}	4437	}
4099		4438
4100	{	4439	{
4101	# configure IO::AIO	4440	# configure IO::AIO
4102		4441
		4442	info "initialising aio";
4103	IO::AIO::min_parallel 8;	4443	IO::AIO::min_parallel 8;
4104	IO::AIO::max_poll_time $TICK * 0.1;	4444	IO::AIO::max_poll_time $TICK * 0.1;
4105	undef $AnyEvent::AIO::WATCHER;	4445	undef $AnyEvent::AIO::WATCHER;
		4446	info "aio initialised";
4106	}	4447	}
4107		4448
4108	my $_log_backtrace;	4449	our $_log_backtrace;
		4450	our $_log_backtrace_last;
4109		4451
4110	sub _log_backtrace {	4452	sub _log_backtrace {
4111	my ($msg, @addr) = @_;	4453	my ($msg, @addr) = @_;
4112		4454
4113	$msg =~ s/\n//;	4455	$msg =~ s/\n$//;
4114		4456
		4457	if ($_log_backtrace_last eq $msg) {
		4458	LOG llevInfo, "[ABT] $msg\n";
		4459	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4115	# limit the # of concurrent backtraces	4460	# limit the # of concurrent backtraces
4116	if ($_log_backtrace < 2) {	4461	} elsif ($_log_backtrace < 2) {
		4462	$_log_backtrace_last = $msg;
4117	++$_log_backtrace;	4463	++$_log_backtrace;
4118	my $perl_bt = Carp::longmess $msg;	4464	my $perl_bt = Carp::longmess $msg;
4119	async {	4465	async {
4120	$Coro::current->{desc} = "abt $msg";	4466	$Coro::current->{desc} = "abt $msg";
4121		4467
…		…
4141	LOG llevInfo, "[ABT] $_\n" for @bt;	4487	LOG llevInfo, "[ABT] $_\n" for @bt;
4142	--$_log_backtrace;	4488	--$_log_backtrace;
4143	};	4489	};
4144	} else {	4490	} else {
4145	LOG llevInfo, "[ABT] $msg\n";	4491	LOG llevInfo, "[ABT] $msg\n";
4146	LOG llevInfo, "[ABT] [suppressed]\n";	4492	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4147	}	4493	}
4148	}	4494	}
4149		4495
4150	# load additional modules	4496	# load additional modules
4151	require "cf/$_.pm" for @EXTRA_MODULES;	4497	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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