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.559 by root, Sat Feb 26 12:50:27 2011 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
…		…
83	our %COMMAND = ();	86	our %COMMAND = ();
84	our %COMMAND_TIME = ();	87	our %COMMAND_TIME = ();
85		88
86	our @EXTS = (); # list of extension package names	89	our @EXTS = (); # list of extension package names
87	our %EXTCMD = ();	90	our %EXTCMD = ();
		91	our %EXTACMD = ();
88	our %EXTICMD = ();	92	our %EXTICMD = ();
		93	our %EXTIACMD = ();
89	our %EXT_CORO = (); # coroutines bound to extensions	94	our %EXT_CORO = (); # coroutines bound to extensions
90	our %EXT_MAP = (); # pluggable maps	95	our %EXT_MAP = (); # pluggable maps
91		96
92	our $RELOAD; # number of reloads so far, non-zero while in reload	97	our $RELOAD; # number of reloads so far, non-zero while in reload
93	our @EVENT;	98	our @EVENT;
…		…
108	our $RANDOMDIR = "$LOCALDIR/random";	113	our $RANDOMDIR = "$LOCALDIR/random";
109	our $BDBDIR = "$LOCALDIR/db";	114	our $BDBDIR = "$LOCALDIR/db";
110	our $PIDFILE = "$LOCALDIR/pid";	115	our $PIDFILE = "$LOCALDIR/pid";
111	our $RUNTIMEFILE = "$LOCALDIR/runtime";	116	our $RUNTIMEFILE = "$LOCALDIR/runtime";
112		117
113	our %RESOURCE; # unused	118	#our %RESOURCE; # unused
114		119
115	our $OUTPUT_RATE_MIN = 3000;	120	our $OUTPUT_RATE_MIN = 3000;
116	our $OUTPUT_RATE_MAX = 1000000;	121	our $OUTPUT_RATE_MAX = 1000000;
117		122
118	our $MAX_LINKS = 32; # how many chained exits to follow	123	our $MAX_LINKS = 32; # how many chained exits to follow
…		…
129	our $DB_ENV;	134	our $DB_ENV;
130		135
131	our @EXTRA_MODULES = qw(pod match mapscript incloader);	136	our @EXTRA_MODULES = qw(pod match mapscript incloader);
132		137
133	our %CFG;	138	our %CFG;
		139	our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
134		140
135	our $UPTIME; $UPTIME ||= time;	141	our $UPTIME; $UPTIME ||= time;
136	our $RUNTIME;	142	our $RUNTIME = 0;
		143	our $SERVER_TICK = 0;
137	our $NOW;	144	our $NOW;
138		145
139	our (%PLAYER, %PLAYER_LOADING); # all users	146	our (%PLAYER, %PLAYER_LOADING); # all users
140	our (%MAP, %MAP_LOADING ); # all maps	147	our (%MAP, %MAP_LOADING ); # all maps
141	our $LINK_MAP; # the special {link} map, which is always available	148	our $LINK_MAP; # the special {link} map, which is always available
…		…
150		157
151	our @POST_INIT;	158	our @POST_INIT;
152		159
153	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)
154	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;
155		165
156	binmode STDOUT;	166	binmode STDOUT;
157	binmode STDERR;	167	binmode STDERR;
158		168
159	# read virtual server time, if available	169	# read virtual server time, if available
…		…
193		203
194	=over 4	204	=over 4
195		205
196	=item $cf::UPTIME	206	=item $cf::UPTIME
197		207
198	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.
199		224
200	=item $cf::RUNTIME	225	=item $cf::RUNTIME
201		226
202	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
203	every server tick.	228	every server tick.
204		229
205	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR	230	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
206	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR	231	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
207	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR	232	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
208		233
209	Various directories - "/etc", read-only install directory, perl-library	234	Various directories - "/etc", read-only install directory, perl-library
210	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	235	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
211	unique-items directory, player file directory, random maps directory and	236	unique-items directory, player file directory, random maps directory and
212	database environment.	237	database environment.
213		238
214	=item $cf::NOW
215
216	The time of the last (current) server tick.
217
218	=item $cf::TICK
219
220	The interval between server ticks, in seconds.
221
222	=item $cf::LOADAVG	239	=item $cf::LOADAVG
223		240
224	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
225	(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
226	objects per tick. Healthy values are < 0.5.	243	objects per tick. Healthy values are < 0.5.
…		…
234	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
235	from wherever your confdir points to.	252	from wherever your confdir points to.
236		253
237	=item cf::wait_for_tick, cf::wait_for_tick_begin	254	=item cf::wait_for_tick, cf::wait_for_tick_begin
238		255
239	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.
240	returns directly I<after> the tick processing (and consequently, can only wake one thread	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
241	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.
242		272
243	=cut	273	=cut
244		274
245	sub wait_for_tick();	275	sub wait_for_tick();
246	sub wait_for_tick_begin();	276	sub wait_for_tick_begin();
…		…
312	)) {	342	)) {
313	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	343	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
314	}	344	}
315		345
316	$EV::DIED = sub {	346	$EV::DIED = sub {
317	Carp::cluck "error in event callback: @_";	347	warn "error in event callback: $@";
318	};	348	};
		349
		350	#############################################################################
		351
		352	sub fork_call(&@);
		353	sub get_slot($;$$);
319		354
320	#############################################################################	355	#############################################################################
321		356
322	=head2 UTILITY FUNCTIONS	357	=head2 UTILITY FUNCTIONS
323		358
…		…
344	$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;
345	$d	380	$d
346	} || "[unable to dump $_[0]: '$@']";	381	} || "[unable to dump $_[0]: '$@']";
347	}	382	}
348		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
349	=item $ref = cf::decode_json $json	436	=item $ref = cf::decode_json $json
350		437
351	Converts a JSON string into the corresponding perl data structure.	438	Converts a JSON string into the corresponding perl data structure.
352		439
353	=item $json = cf::encode_json $ref	440	=item $json = cf::encode_json $ref
…		…
359	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
360		447
361	sub encode_json($) { $json_coder->encode ($_[0]) }	448	sub encode_json($) { $json_coder->encode ($_[0]) }
362	sub decode_json($) { $json_coder->decode ($_[0]) }	449	sub decode_json($) { $json_coder->decode ($_[0]) }
363		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
364	=item $ref = cf::yaml_load $scalar	459	=item $ref = cf::decode_yaml $scalar
365		460
366	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).	461	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
367		462
368	=cut	463	=cut
369		464
370	sub fork_call(&@);	465	sub decode_yaml($) {
371
372	sub yaml_load($) {
373	fork_call { YAML::XS::Load $_[0] } @_	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]
374	}	480	}
375		481
376	=item cf::post_init { BLOCK }	482	=item cf::post_init { BLOCK }
377		483
378	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,
…		…
404	}	510	}
405	}	511	}
406		512
407	=item cf::lock_wait $string	513	=item cf::lock_wait $string
408		514
409	Wait until the given lock is available. See cf::lock_acquire.	515	Wait until the given lock is available. See cf::lock_acquire.
410		516
411	=item my $lock = cf::lock_acquire $string	517	=item my $lock = cf::lock_acquire $string
412		518
413	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
414	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,
…		…
462	EV::periodic $start, $interval, 0, $cb	568	EV::periodic $start, $interval, 0, $cb
463	}	569	}
464		570
465	=item cf::get_slot $time[, $priority[, $name]]	571	=item cf::get_slot $time[, $priority[, $name]]
466		572
467	Allocate $time seconds of blocking CPU time at priority C<$priority>:	573	Allocate $time seconds of blocking CPU time at priority C<$priority>
468	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
469	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.
470		580
471	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
472	used for statistical purposes and should identify the same time-class.	582	used for statistical purposes and should identify the same time-class.
473		583
474	Useful for short background jobs.	584	Useful for short background jobs.
…		…
486	my $signal = new Coro::Signal;	596	my $signal = new Coro::Signal;
487	my $busy;	597	my $busy;
488		598
489	while () {	599	while () {
490	next_job:	600	next_job:
		601
		602	Coro::cede;
491		603
492	my $avail = cf::till_tick;	604	my $avail = cf::till_tick;
493		605
494	for (0 .. $#SLOT_QUEUE) {	606	for (0 .. $#SLOT_QUEUE) {
495	if ($SLOT_QUEUE[$_][0] <= $avail) {	607	if ($SLOT_QUEUE[$_][0] <= $avail) {
496	$busy = 0;	608	$busy = 0;
497	my $job = splice @SLOT_QUEUE, $_, 1, ();	609	my $job = splice @SLOT_QUEUE, $_, 1, ();
498	$job->[2]->send;	610	$job->[2]->send;
499	Coro::cede;
500	goto next_job;	611	goto next_job;
501	} else {	612	} else {
502	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;	613	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
503	}	614	}
504	}	615	}
505		616
506	if (@SLOT_QUEUE) {	617	if (@SLOT_QUEUE) {
507	# we do not use wait_for_tick() as it returns immediately when tick is inactive	618	wait_for_tick;
508	push @cf::WAIT_FOR_TICK, $signal;
509	$signal->wait;
510	} else {	619	} else {
511	$busy = 0;	620	$busy = 0;
512	Coro::schedule;	621	Coro::schedule;
513	}	622	}
514	}	623	}
…		…
540	BEGIN { *async = \&Coro::async_pool }	649	BEGIN { *async = \&Coro::async_pool }
541		650
542	=item cf::sync_job { BLOCK }	651	=item cf::sync_job { BLOCK }
543		652
544	The design of Deliantra requires that the main coroutine ($Coro::main)	653	The design of Deliantra requires that the main coroutine ($Coro::main)
545	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
546	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
547	acceptable.	656	acceptable.
548		657
549	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
550	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
…		…
578		687
579	while ($busy) {	688	while ($busy) {
580	if (Coro::nready) {	689	if (Coro::nready) {
581	Coro::cede_notself;	690	Coro::cede_notself;
582	} else {	691	} else {
583	EV::loop EV::LOOP_ONESHOT;	692	EV::run EV::RUN_ONCE;
584	}	693	}
585	}	694	}
586		695
587	my $time = AE::time - $time;	696	my $time = AE::time - $time;
588		697
…		…
629	reset_signals;	738	reset_signals;
630	}	739	}
631		740
632	sub fork_call(&@) {	741	sub fork_call(&@) {
633	my ($cb, @args) = @_;	742	my ($cb, @args) = @_;
634
635	# we seemingly have to make a local copy of the whole thing,
636	# otherwise perl prematurely frees the stuff :/
637	# TODO: investigate and fix (likely this will be rather laborious)
638		743
639	my @res = Coro::Util::fork_eval {	744	my @res = Coro::Util::fork_eval {
640	cf::post_fork;	745	cf::post_fork;
641	&$cb	746	&$cb
642	} @args;	747	} @args;
…		…
769		874
770	my @data;	875	my @data;
771	my $md5;	876	my $md5;
772		877
773	for (0 .. $#$src) {	878	for (0 .. $#$src) {
774	0 <= aio_load $src->[$_], $data[$_]	879	$data[$_] = load_file $src->[$_];
775	or Carp::croak "$src->[$_]: $!";
776	}	880	}
777		881
778	# if processing is expensive, check	882	# if processing is expensive, check
779	# checksum first	883	# checksum first
780	if (1) {	884	if (1) {
…		…
793		897
794	return db_get cache => "$id/data";	898	return db_get cache => "$id/data";
795	}	899	}
796	}	900	}
797		901
798	my $t1 = Time::HiRes::time;	902	my $t1 = EV::time;
799	my $data = $process->(\@data);	903	my $data = $process->(\@data);
800	my $t2 = Time::HiRes::time;	904	my $t2 = EV::time;
801		905
802	info "cache: '$id' processed in ", $t2 - $t1, "s\n";	906	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
803		907
804	db_put cache => "$id/data", $data;	908	db_put cache => "$id/data", $data;
805	db_put cache => "$id/md5" , $md5;	909	db_put cache => "$id/md5" , $md5;
…		…
1325	=cut	1429	=cut
1326		1430
1327	#############################################################################	1431	#############################################################################
1328	# command handling &c	1432	# command handling &c
1329		1433
1330	=item cf::register_command $name => \&callback($ob,$args);	1434	=item cf::register_command $name => \&callback($ob,$args)
1331		1435
1332	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
1333	$name.	1437	$name.
1334		1438
1335	=cut	1439	=cut
…		…
1341	#warn "registering command '$name/$time' to '$caller'";	1445	#warn "registering command '$name/$time' to '$caller'";
1342		1446
1343	push @{ $COMMAND{$name} }, [$caller, $cb];	1447	push @{ $COMMAND{$name} }, [$caller, $cb];
1344	}	1448	}
1345		1449
1346	=item cf::register_extcmd $name => \&callback($pl,$packet);	1450	=item cf::register_extcmd $name => \&callback($pl,@args)
1347		1451
1348	Register a callback for execution when the client sends an (synchronous)	1452	Register a callback for execution when the client sends an (synchronous)
1349	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
1350	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
1351	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
1352	has logged in successfully.	1456	has logged in successfully.
1353		1457
1354	If the callback returns something, it is sent back as if reply was being	1458	The values will be sent back to the client.
1355	called.
1356		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
1357	=item cf::register_exticmd $name => \&callback($ns,$packet);	1465	=item cf::register_exticmd $name => \&callback($ns,@args)
1358		1466
1359	Register a callback for execution when the client sends an (asynchronous)	1467	Register a callback for execution when the client sends an (asynchronous)
1360	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
1361	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
1362	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
1363	log-in.	1471	log-in.
1364		1472
1365	If the callback returns something, it is sent back as if reply was being	1473	The values will be sent back to the client.
1366	called.
1367		1474
1368	=cut	1475	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1369		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
1370	sub register_extcmd {	1482	sub register_extcmd($$) {
1371	my ($name, $cb) = @_;	1483	my ($name, $cb) = @_;
1372		1484
1373	$EXTCMD{$name} = $cb;	1485	$EXTCMD{$name} = $cb;
1374	}	1486	}
1375		1487
1376	sub register_exticmd {	1488	sub register_async_extcmd($$) {
1377	my ($name, $cb) = @_;	1489	my ($name, $cb) = @_;
1378		1490
		1491	$EXTACMD{$name} = $cb;
		1492	}
		1493
		1494	sub register_exticmd($$) {
		1495	my ($name, $cb) = @_;
		1496
1379	$EXTICMD{$name} = $cb;	1497	$EXTICMD{$name} = $cb;
		1498	}
		1499
		1500	sub register_async_exticmd($$) {
		1501	my ($name, $cb) = @_;
		1502
		1503	$EXTIACMD{$name} = $cb;
1380	}	1504	}
1381		1505
1382	use File::Glob ();	1506	use File::Glob ();
1383		1507
1384	cf::player->attach (	1508	cf::player->attach (
…		…
1398	my ($pl, $buf) = @_;	1522	my ($pl, $buf) = @_;
1399		1523
1400	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1524	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1401		1525
1402	if (ref $msg) {	1526	if (ref $msg) {
1403	my ($type, $reply, @payload) =	1527	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1404	"ARRAY" eq ref $msg
1405	? @$msg
1406	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1407		1528
1408	my @reply;
1409
1410	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}) {
1411	@reply = $cb->($pl, @payload);	1542	@reply = $cb->($pl, @payload);
		1543	}
		1544
		1545	$pl->ext_msg ("reply-$reply", @reply)
		1546	if $reply;
1412	}	1547	}
1413
1414	$pl->ext_reply ($reply, @reply)
1415	if $reply;
1416		1548
1417	} else {	1549	} else {
1418	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1550	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1419	}	1551	}
1420		1552
…		…
1433	};	1565	};
1434		1566
1435	$grp	1567	$grp
1436	}	1568	}
1437		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
1438	sub load_extensions {	1581	sub load_extensions {
1439	info "loading extensions...";	1582	info "loading extensions...";
		1583
		1584	%EXT_CFG = ();
1440		1585
1441	cf::sync_job {	1586	cf::sync_job {
1442	my %todo;	1587	my %todo;
1443		1588
1444	for my $path (<$LIBDIR/*.ext>) {	1589	for my $path (<$LIBDIR/*.ext>) {
…		…
1487	unless exists $done{$_};	1632	unless exists $done{$_};
1488	}	1633	}
1489		1634
1490	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1635	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1491		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
1492	my $active = eval $v->{source};	1646	my $active = eval $source;
1493		1647
1494	if (length $@) {	1648	if (length $@) {
1495	error "$v->{path}: $@\n";	1649	error "$v->{path}: $@\n";
1496		1650
1497	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1651	cf::cleanup "mandatory extension '$k' failed to load, exiting."
…		…
1514		1668
1515	while (my ($k, $v) = each %todo) {	1669	while (my ($k, $v) = each %todo) {
1516	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1670	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1517	if exists $v->{meta}{mandatory};	1671	if exists $v->{meta}{mandatory};
1518	}	1672	}
		1673
		1674	last;
1519	}	1675	}
1520	}	1676	}
1521	};	1677	};
1522	}	1678	}
1523		1679
…		…
1782	}	1938	}
1783		1939
1784	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1940	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1785		1941
1786	Expand deliantra pod fragments into protocol xml.	1942	Expand deliantra pod fragments into protocol xml.
1787
1788	=item $player->ext_reply ($msgid, @msg)
1789
1790	Sends an ext reply to the player.
1791
1792	=cut
1793
1794	sub ext_reply($$@) {
1795	my ($self, $id, @msg) = @_;
1796
1797	$self->ns->ext_reply ($id, @msg)
1798	}
1799		1943
1800	=item $player->ext_msg ($type, @msg)	1944	=item $player->ext_msg ($type, @msg)
1801		1945
1802	Sends an ext event to the client.	1946	Sends an ext event to the client.
1803		1947
…		…
1951		2095
1952	Carp::cluck "unable to resolve path '$path' (base '$base')";	2096	Carp::cluck "unable to resolve path '$path' (base '$base')";
1953	()	2097	()
1954	}	2098	}
1955		2099
		2100	# may re-bless or do other evil things
1956	sub init {	2101	sub init {
1957	my ($self) = @_;	2102	my ($self) = @_;
1958		2103
1959	$self	2104	$self
1960	}	2105	}
…		…
2025	$self->{load_path} = $path;	2170	$self->{load_path} = $path;
2026		2171
2027	1	2172	1
2028	}	2173	}
2029		2174
		2175	# used to laod the header of an original map
2030	sub load_header_orig {	2176	sub load_header_orig {
2031	my ($self) = @_;	2177	my ($self) = @_;
2032		2178
2033	$self->load_header_from ($self->load_path)	2179	$self->load_header_from ($self->load_path)
2034	}	2180	}
2035		2181
		2182	# used to laod the header of an instantiated map
2036	sub load_header_temp {	2183	sub load_header_temp {
2037	my ($self) = @_;	2184	my ($self) = @_;
2038		2185
2039	$self->load_header_from ($self->save_path)	2186	$self->load_header_from ($self->save_path)
2040	}	2187	}
2041		2188
		2189	# called after loading the header from an instantiated map
2042	sub prepare_temp {	2190	sub prepare_temp {
2043	my ($self) = @_;	2191	my ($self) = @_;
2044		2192
2045	$self->last_access ((delete $self->{last_access})	2193	$self->last_access ((delete $self->{last_access})
2046	|| $cf::RUNTIME); #d#	2194	|| $cf::RUNTIME); #d#
2047	# safety	2195	# safety
2048	$self->{instantiate_time} = $cf::RUNTIME	2196	$self->{instantiate_time} = $cf::RUNTIME
2049	if $self->{instantiate_time} > $cf::RUNTIME;	2197	if $self->{instantiate_time} > $cf::RUNTIME;
2050	}	2198	}
2051		2199
		2200	# called after loading the header from an original map
2052	sub prepare_orig {	2201	sub prepare_orig {
2053	my ($self) = @_;	2202	my ($self) = @_;
2054		2203
2055	$self->{load_original} = 1;	2204	$self->{load_original} = 1;
2056	$self->{instantiate_time} = $cf::RUNTIME;	2205	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2082	sub find {	2231	sub find {
2083	my ($path, $origin) = @_;	2232	my ($path, $origin) = @_;
2084		2233
2085	cf::cede_to_tick;	2234	cf::cede_to_tick;
2086		2235
2087	$path = normalise $path, $origin && $origin->path;	2236	$path = normalise $path, $origin;
2088		2237
2089	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2238	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2090	my $guard2 = cf::lock_acquire "map_find:$path";	2239	my $guard2 = cf::lock_acquire "map_find:$path";
2091		2240
2092	$cf::MAP{$path} || do {	2241	$cf::MAP{$path} || do {
…		…
2123		2272
2124	{	2273	{
2125	my $guard = cf::lock_acquire "map_data:$path";	2274	my $guard = cf::lock_acquire "map_data:$path";
2126		2275
2127	return unless $self->valid;	2276	return unless $self->valid;
2128	return unless $self->in_memory == cf::MAP_SWAPPED;	2277	return unless $self->state == cf::MAP_SWAPPED;
2129
2130	$self->in_memory (cf::MAP_LOADING);
2131		2278
2132	$self->alloc;	2279	$self->alloc;
2133		2280
2134	$self->pre_load;	2281	$self->pre_load;
2135	cf::cede_to_tick;	2282	cf::cede_to_tick;
2136		2283
		2284	if (exists $self->{load_path}) {
2137	my $f = new_from_file cf::object::thawer $self->{load_path};	2285	my $f = new_from_file cf::object::thawer $self->{load_path};
2138	$f->skip_block;	2286	$f->skip_block;
2139	$self->_load_objects ($f)	2287	$self->_load_objects ($f)
2140	or return;	2288	or return;
2141		2289
2142	$self->post_load_original	2290	$self->post_load_original
2143	if delete $self->{load_original};	2291	if delete $self->{load_original};
2144		2292
2145	if (my $uniq = $self->uniq_path) {	2293	if (my $uniq = $self->uniq_path) {
2146	utf8::encode $uniq;	2294	utf8::encode $uniq;
2147	unless (aio_stat $uniq) {	2295	unless (aio_stat $uniq) {
2148	if (my $f = new_from_file cf::object::thawer $uniq) {	2296	if (my $f = new_from_file cf::object::thawer $uniq) {
2149	$self->clear_unique_items;	2297	$self->clear_unique_items;
2150	$self->_load_objects ($f);	2298	$self->_load_objects ($f);
2151	$f->resolve_delayed_derefs;	2299	$f->resolve_delayed_derefs;
		2300	}
2152	}	2301	}
2153	}	2302	}
2154	}
2155		2303
2156	$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);
2157		2311
2158	cf::cede_to_tick;	2312	cf::cede_to_tick;
2159	# now do the right thing for maps	2313	# now do the right thing for maps
2160	$self->link_multipart_objects;	2314	$self->link_multipart_objects;
2161	$self->difficulty ($self->estimate_difficulty)	2315	$self->difficulty ($self->estimate_difficulty)
…		…
2165	unless ($self->{deny_activate}) {	2319	unless ($self->{deny_activate}) {
2166	$self->decay_objects;	2320	$self->decay_objects;
2167	$self->fix_auto_apply;	2321	$self->fix_auto_apply;
2168	$self->update_buttons;	2322	$self->update_buttons;
2169	cf::cede_to_tick;	2323	cf::cede_to_tick;
2170	$self->activate;	2324	#$self->activate; # no longer activate maps automatically
2171	}	2325	}
2172		2326
2173	$self->{last_save} = $cf::RUNTIME;	2327	$self->{last_save} = $cf::RUNTIME;
2174	$self->last_access ($cf::RUNTIME);	2328	$self->last_access ($cf::RUNTIME);
2175
2176	$self->in_memory (cf::MAP_ACTIVE);
2177	}	2329	}
2178		2330
2179	$self->post_load;	2331	$self->post_load;
2180		2332
2181	1	2333	1
…		…
2194	# if $self->per_party;	2346	# if $self->per_party;
2195		2347
2196	$self	2348	$self
2197	}	2349	}
2198		2350
2199	# find and load all maps in the 3x3 area around a map
2200	sub load_neighbours {
2201	my ($map) = @_;
2202
2203	my @neigh; # diagonal neighbours
2204
2205	for (0 .. 3) {
2206	my $neigh = $map->tile_path ($_)
2207	or next;
2208	$neigh = find $neigh, $map
2209	or next;
2210	$neigh->load;
2211
2212	# now find the diagonal neighbours
2213	push @neigh,
2214	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2215	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2216	}
2217
2218	for (grep defined $_->[0], @neigh) {
2219	my ($path, $origin) = @$_;
2220	my $neigh = find $path, $origin
2221	or next;
2222	$neigh->load;
2223	}
2224	}
2225
2226	sub find_sync {	2351	sub find_sync {
2227	my ($path, $origin) = @_;	2352	my ($path, $origin) = @_;
2228		2353
		2354	# it's a bug to call this from the main context
2229	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"	2355	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2230	if $Coro::current == $Coro::main;	2356	if $Coro::current == $Coro::main;
2231		2357
2232	find $path, $origin	2358	find $path, $origin
2233	}	2359	}
2234		2360
2235	sub do_load_sync {	2361	sub do_load_sync {
2236	my ($map) = @_;	2362	my ($map) = @_;
2237		2363
		2364	# it's a bug to call this from the main context
2238	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"	2365	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2239	if $Coro::current == $Coro::main;	2366	if $Coro::current == $Coro::main;
2240		2367
2241	$map->load;	2368	$map->load;
2242	}	2369	}
…		…
2245	our $MAP_PREFETCHER = undef;	2372	our $MAP_PREFETCHER = undef;
2246		2373
2247	sub find_async {	2374	sub find_async {
2248	my ($path, $origin, $load) = @_;	2375	my ($path, $origin, $load) = @_;
2249		2376
2250	$path = normalise $path, $origin && $origin->{path};	2377	$path = normalise $path, $origin;
2251		2378
2252	if (my $map = $cf::MAP{$path}) {	2379	if (my $map = $cf::MAP{$path}) {
2253	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2380	return $map if !$load || $map->linkable;
2254	}	2381	}
2255		2382
2256	$MAP_PREFETCH{$path} |= $load;	2383	$MAP_PREFETCH{$path} |= $load;
2257		2384
2258	$MAP_PREFETCHER ||= cf::async {	2385	$MAP_PREFETCHER ||= cf::async {
2259	$Coro::current->{desc} = "map prefetcher";	2386	$Coro::current->{desc} = "map prefetcher";
2260		2387
2261	while (%MAP_PREFETCH) {	2388	while (%MAP_PREFETCH) {
2262	while (my ($k, $v) = each %MAP_PREFETCH) {	2389	for my $k (keys %MAP_PREFETCH) {
2263	if (my $map = find $k) {	2390	if (my $map = find $k) {
2264	$map->load if $v;	2391	$map->load if $MAP_PREFETCH{$k};
2265	}	2392	}
2266		2393
2267	delete $MAP_PREFETCH{$k};	2394	delete $MAP_PREFETCH{$k};
2268	}	2395	}
2269	}	2396	}
…		…
2317	sub swap_out {	2444	sub swap_out {
2318	my ($self) = @_;	2445	my ($self) = @_;
2319		2446
2320	my $lock = cf::lock_acquire "map_data:$self->{path}";	2447	my $lock = cf::lock_acquire "map_data:$self->{path}";
2321		2448
2322	return if $self->in_memory != cf::MAP_ACTIVE;	2449	return if !$self->linkable;
2323	return if $self->{deny_save};	2450	return if $self->{deny_save};
2324	return if $self->players;	2451	return if $self->players;
2325		2452
2326	# first deactivate the map and "unlink" it from the core	2453	# first deactivate the map and "unlink" it from the core
2327	$self->deactivate;	2454	$self->deactivate;
2328	$_->clear_links_to ($self) for values %cf::MAP;	2455	$_->clear_links_to ($self) for values %cf::MAP;
2329	$self->in_memory (cf::MAP_SWAPPED);	2456	$self->state (cf::MAP_SWAPPED);
2330		2457
2331	# then atomically save	2458	# then atomically save
2332	$self->_save;	2459	$self->_save;
2333		2460
2334	# then free the map	2461	# then free the map
…		…
2360		2487
2361	return if $self->players;	2488	return if $self->players;
2362		2489
2363	cf::trace "resetting map ", $self->path, "\n";	2490	cf::trace "resetting map ", $self->path, "\n";
2364		2491
2365	$self->in_memory (cf::MAP_SWAPPED);	2492	$self->state (cf::MAP_SWAPPED);
2366		2493
2367	# need to save uniques path	2494	# need to save uniques path
2368	unless ($self->{deny_save}) {	2495	unless ($self->{deny_save}) {
2369	my $uniq = $self->uniq_path; utf8::encode $uniq;	2496	my $uniq = $self->uniq_path; utf8::encode $uniq;
2370		2497
…		…
2523		2650
2524	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.
2525		2652
2526	=item $ob = cf::object::deref ($refstring)	2653	=item $ob = cf::object::deref ($refstring)
2527		2654
2528	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,
2529	even if the object actually exists. May block.	2656	even if the object actually exists. May block.
2530		2657
2531	=cut	2658	=cut
2532		2659
2533	sub deref {	2660	sub deref {
…		…
2615	=item $player_object->may ("access")	2742	=item $player_object->may ("access")
2616		2743
2617	Returns wether the given player is authorized to access resource "access"	2744	Returns wether the given player is authorized to access resource "access"
2618	(e.g. "command_wizcast").	2745	(e.g. "command_wizcast").
2619		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
2620	=cut	2772	=cut
2621		2773
2622	sub cf::object::player::may {	2774	sub cf::object::player::may {
2623	my ($self, $access) = @_;	2775	my ($self, $access) = @_;
2624		2776
2625	$self->flag (cf::FLAG_WIZ) ||	2777	$self->flag (cf::FLAG_WIZ) ||
2626	(ref $cf::CFG{"may_$access"}	2778	(ref $cf::CFG{"may_$access"}
2627	? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}	2779	? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2628	: $cf::CFG{"may_$access"})	2780	: $cf::CFG{"may_$access"})
2629	}	2781	}
2630		2782
2631	=item $player_object->enter_link	2783	=item $player_object->enter_link
2632		2784
…		…
2635	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.
2636	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,
2637	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
2638	map.	2790	map.
2639		2791
2640	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.
2641		2799
2642	=item $player_object->leave_link ($map, $x, $y)	2800	=item $player_object->leave_link ($map, $x, $y)
2643		2801
2644	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
2645	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
…		…
2700	# use -1 or undef as default coordinates, not 0, 0	2858	# use -1 or undef as default coordinates, not 0, 0
2701	($x, $y) = ($map->enter_x, $map->enter_y)	2859	($x, $y) = ($map->enter_x, $map->enter_y)
2702	if $x <= 0 && $y <= 0;	2860	if $x <= 0 && $y <= 0;
2703		2861
2704	$map->load;	2862	$map->load;
2705	$map->load_neighbours;
2706		2863
2707	return unless $self->contr->active;	2864	return unless $self->contr->active;
2708		2865
2709	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2866	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2710	if ($self->enter_map ($map, $x, $y)) {	2867	if ($self->enter_map ($map, $x, $y)) {
…		…
2766	($path, $x, $y) = (undef, undef, undef);	2923	($path, $x, $y) = (undef, undef, undef);
2767	}	2924	}
2768	}	2925	}
2769		2926
2770	my $map = eval {	2927	my $map = eval {
2771	my $map = defined $path ? cf::map::find $path : undef;	2928	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2772		2929
2773	if ($map) {	2930	if ($map) {
2774	$map = $map->customise_for ($self);	2931	$map = $map->customise_for ($self);
2775	$map = $check->($map, $x, $y, $self) if $check && $map;	2932	$map = $check->($map, $x, $y, $self) if $check && $map;
2776	} else {	2933	} else {
…		…
2866	$Coro::current->{desc} = "enter_exit";	3023	$Coro::current->{desc} = "enter_exit";
2867		3024
2868	unless (eval {	3025	unless (eval {
2869	$self->deactivate_recursive; # just to be sure	3026	$self->deactivate_recursive; # just to be sure
2870		3027
2871	# random map handling
2872	{
2873	my $guard = cf::lock_acquire "exit_prepare:$exit";
2874
2875	prepare_random_map $exit
2876	if $exit->slaying eq "/!";
2877	}
2878
2879	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	3028	my $map = cf::map::normalise $exit->slaying, $exit->map;
2880	my $x = $exit->stats->hp;	3029	my $x = $exit->stats->hp;
2881	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	}
2882		3054
2883	$self->goto ($map, $x, $y);	3055	$self->goto ($map, $x, $y);
2884		3056
2885	# if exit is damned, update players death & WoR home-position	3057	# if exit is damned, update players death & WoR home-position
2886	$self->contr->savebed ($map, $x, $y)	3058	$self->contr->savebed ($map, $x, $y)
…		…
2901		3073
2902	=head3 cf::client	3074	=head3 cf::client
2903		3075
2904	=over 4	3076	=over 4
2905		3077
2906	=item $client->send_drawinfo ($text, $flags)
2907
2908	Sends a drawinfo packet to the client. Circumvents output buffering so
2909	should not be used under normal circumstances.
2910
2911	=cut
2912
2913	sub cf::client::send_drawinfo {
2914	my ($self, $text, $flags) = @_;
2915
2916	utf8::encode $text;
2917	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2918	}
2919
2920	=item $client->send_big_packet ($pkt)	3078	=item $client->send_big_packet ($pkt)
2921		3079
2922	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
2923	them as required.	3081	them as required.
2924		3082
…		…
2942	$self->send_packet ($pkt);	3100	$self->send_packet ($pkt);
2943	}	3101	}
2944		3102
2945	=item $client->send_msg ($channel, $msg, $color, [extra...])	3103	=item $client->send_msg ($channel, $msg, $color, [extra...])
2946		3104
2947	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
2948	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
2949	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
2950	the message unless the client supports the msg packet.	3108	the message unless the client supports the msg packet.
2951		3109
2952	=cut	3110	=cut
2953		3111
2954	# non-persistent channels (usually the info channel)	3112	# non-persistent channels (usually the info channel)
…		…
3059	id => "death",	3217	id => "death",
3060	title => "Death",	3218	title => "Death",
3061	reply => undef,	3219	reply => undef,
3062	tooltip => "Reason for and more info about your most recent death",	3220	tooltip => "Reason for and more info about your most recent death",
3063	},	3221	},
		3222	"c/fatal" => {
		3223	id => "fatal",
		3224	title => "Fatal Error",
		3225	reply => undef,
		3226	tooltip => "Reason for the server disconnect",
		3227	},
3064	"c/say" => $SAY_CHANNEL,	3228	"c/say" => $SAY_CHANNEL,
3065	"c/chat" => $CHAT_CHANNEL,	3229	"c/chat" => $CHAT_CHANNEL,
3066	);	3230	);
3067		3231
3068	sub cf::client::send_msg {	3232	sub cf::client::send_msg {
…		…
3111	=cut	3275	=cut
3112		3276
3113	sub cf::client::ext_msg($$@) {	3277	sub cf::client::ext_msg($$@) {
3114	my ($self, $type, @msg) = @_;	3278	my ($self, $type, @msg) = @_;
3115		3279
3116	if ($self->extcmd == 2) {
3117	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3280	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3118	} elsif ($self->extcmd == 1) { # TODO: remove
3119	push @msg, msgtype => "event_$type";
3120	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3121	}
3122	}
3123
3124	=item $client->ext_reply ($msgid, @msg)
3125
3126	Sends an ext reply to the client.
3127
3128	=cut
3129
3130	sub cf::client::ext_reply($$@) {
3131	my ($self, $id, @msg) = @_;
3132
3133	if ($self->extcmd == 2) {
3134	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3135	} elsif ($self->extcmd == 1) {
3136	#TODO: version 1, remove
3137	unshift @msg, msgtype => "reply", msgid => $id;
3138	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3139	}
3140	}	3281	}
3141		3282
3142	=item $success = $client->query ($flags, "text", \&cb)	3283	=item $success = $client->query ($flags, "text", \&cb)
3143		3284
3144	Queues a query to the client, calling the given callback with	3285	Queues a query to the client, calling the given callback with
…		…
3164		3305
3165	$self->send_packet ($self->{query_queue}[0][0])	3306	$self->send_packet ($self->{query_queue}[0][0])
3166	if @{ $self->{query_queue} } == 1;	3307	if @{ $self->{query_queue} } == 1;
3167		3308
3168	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;
3169	}	3349	}
3170		3350
3171	cf::client->attach (	3351	cf::client->attach (
3172	on_connect => sub {	3352	on_connect => sub {
3173	my ($ns) = @_;	3353	my ($ns) = @_;
…		…
3199	my ($ns, $buf) = @_;	3379	my ($ns, $buf) = @_;
3200		3380
3201	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3381	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3202		3382
3203	if (ref $msg) {	3383	if (ref $msg) {
3204	my ($type, $reply, @payload) =	3384	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3205	"ARRAY" eq ref $msg
3206	? @$msg
3207	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3208		3385
3209	my @reply;
3210
3211	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}) {
3212	@reply = $cb->($ns, @payload);	3399	@reply = $cb->($ns, @payload);
		3400	}
		3401
		3402	$ns->ext_msg ("reply-$reply", @reply)
		3403	if $reply;
3213	}	3404	}
3214
3215	$ns->ext_reply ($reply, @reply)
3216	if $reply;
3217
3218	} else {	3405	} else {
3219	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";
3220	}	3407	}
3221		3408
3222	cf::override;	3409	cf::override;
…		…
3390	=cut	3577	=cut
3391		3578
3392	#############################################################################	3579	#############################################################################
3393	# the server's init and main functions	3580	# the server's init and main functions
3394		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
3395	sub load_facedata($) {	3659	sub load_facedata($) {
3396	my ($path) = @_;	3660	my ($path) = @_;
3397		3661
3398	# HACK to clear player env face cache, we need some signal framework
3399	# for this (global event?)
3400	%ext::player_env::MUSIC_FACE_CACHE = ();
3401
3402	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3662	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3403		3663
3404	trace "loading facedata from $path\n";	3664	trace "loading facedata from $path\n";
3405		3665
3406	0 < aio_load $path, my $facedata	3666	my $facedata = decode_storable load_file "$path/faceinfo";
3407	or die "$path: $!";
3408
3409	$facedata = Coro::Storable::thaw $facedata;
3410		3667
3411	$facedata->{version} == 2	3668	$facedata->{version} == 2
3412	or cf::cleanup "$path: version mismatch, cannot proceed.";	3669	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3413		3670
3414	# patch in the exptable	3671	my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3415	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);	3672	or cf::cleanup "$path/facedata: $!, cannot proceed.";
3416	$facedata->{resource}{"res/exp_table"} = {	3673
3417	type => FT_RSRC,	3674	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3418	data => $exp_table,	3675
3419	hash => (Digest::MD5::md5 $exp_table),	3676	# BEGIN ATOMIC
3420	};	3677	# from here on, everything must be atomic - no thread switch allowed
3421	cf::cede_to_tick;	3678	my $t1 = EV::time;
3422		3679
3423	{	3680	{
3424	my $faces = $facedata->{faceinfo};	3681	my $faces = $facedata->{faceinfo};
3425		3682
3426	while (my ($face, $info) = each %$faces) {	3683	for my $face (sort keys %$faces) {
		3684	my $info = $faces->{$face};
3427	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3685	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3428		3686
3429	cf::face::set_visibility $idx, $info->{visibility};	3687	cf::face::set_visibility $idx, $info->{visibility};
3430	cf::face::set_magicmap $idx, $info->{magicmap};	3688	cf::face::set_magicmap $idx, $info->{magicmap};
3431	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};
3432	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};
3433	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;	3691	cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3434		3692	$cf::face::HASH{$info->{hash64}} = $idx;
3435	cf::cede_to_tick;	3693	delete $cf::face::META[$idx];
3436	}	3694	}
3437		3695
3438	while (my ($face, $info) = each %$faces) {	3696	while (my ($face, $info) = each %$faces) {
3439	next unless $info->{smooth};	3697	next unless $info->{smooth};
3440		3698
…		…
3445	cf::face::set_smooth $idx, $smooth;	3703	cf::face::set_smooth $idx, $smooth;
3446	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3704	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3447	} else {	3705	} else {
3448	error "smooth face '$info->{smooth}' not found for face '$face'";	3706	error "smooth face '$info->{smooth}' not found for face '$face'";
3449	}	3707	}
3450
3451	cf::cede_to_tick;
3452	}	3708	}
3453	}	3709	}
3454		3710
3455	{	3711	{
3456	my $anims = $facedata->{animinfo};	3712	my $anims = $facedata->{animinfo};
3457		3713
3458	while (my ($anim, $info) = each %$anims) {	3714	while (my ($anim, $info) = each %$anims) {
3459	cf::anim::set $anim, $info->{frames}, $info->{facings};	3715	cf::anim::set $anim, $info->{frames}, $info->{facings};
3460	cf::cede_to_tick;
3461	}	3716	}
3462		3717
3463	cf::anim::invalidate_all; # d'oh	3718	cf::anim::invalidate_all; # d'oh
3464	}	3719	}
3465		3720
3466	{	3721	{
3467	my $res = $facedata->{resource};	3722	my $res = $facedata->{resource};
3468		3723
3469	while (my ($name, $info) = each %$res) {	3724	while (my ($name, $info) = each %$res) {
3470	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
3471	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3727	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3472		3728
3473	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3474	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;
3475	} else {	3735	} else {
3476	$RESOURCE{$name} = $info; # unused	3736	# $RESOURCE{$name} = $info; # unused
3477	}	3737	}
3478
3479	cf::cede_to_tick;
3480	}	3738	}
3481	}	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;
3482		3750
3483	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
3484		3754
3485	1	3755	1
3486	}	3756	}
3487		3757
3488	register_exticmd fx_want => sub {	3758	register_exticmd fx_want => sub {
…		…
3499	my $status = load_resource_file_ $_[0];	3769	my $status = load_resource_file_ $_[0];
3500	get_slot 0.1, 100;	3770	get_slot 0.1, 100;
3501	cf::arch::commit_load;	3771	cf::arch::commit_load;
3502		3772
3503	$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;
3504	}	3788	}
3505		3789
3506	sub reload_regions {	3790	sub reload_regions {
3507	# 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
3508	# for this (global event?)	3792	# for this (global event?)
…		…
3516	if exists $_->{match};	3800	if exists $_->{match};
3517	}	3801	}
3518	}	3802	}
3519		3803
3520	sub reload_facedata {	3804	sub reload_facedata {
3521	load_facedata "$DATADIR/facedata"	3805	load_facedata $DATADIR
3522	or die "unable to load facedata\n";	3806	or die "unable to load facedata\n";
3523	}	3807	}
3524		3808
3525	sub reload_archetypes {	3809	sub reload_archetypes {
3526	load_resource_file "$DATADIR/archetypes"	3810	load_resource_file "$DATADIR/archetypes"
3527	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;
3528	}	3838	}
3529		3839
3530	sub reload_treasures {	3840	sub reload_treasures {
3531	load_resource_file "$DATADIR/treasures"	3841	load_resource_file "$DATADIR/treasures"
3532	or die "unable to load treasurelists\n";	3842	or die "unable to load treasurelists\n";
3533	}	3843	}
3534		3844
3535	sub reload_sound {	3845	sub reload_sound {
3536	trace "loading sound config from $DATADIR/sound\n";	3846	trace "loading sound config from $DATADIR/sound\n";
3537		3847
3538	0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3539	or die "$DATADIR/sound $!";
3540
3541	my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);	3848	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3542		3849
3543	for (0 .. SOUND_CAST_SPELL_0 - 1) {	3850	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3544	my $sound = $soundconf->{compat}[$_]	3851	my $sound = $soundconf->{compat}[$_]
3545	or next;	3852	or next;
3546		3853
…		…
3556	}	3863	}
3557		3864
3558	sub reload_resources {	3865	sub reload_resources {
3559	trace "reloading resource files...\n";	3866	trace "reloading resource files...\n";
3560		3867
3561	reload_exp_table;
3562	reload_materials;	3868	reload_materials;
3563	reload_facedata;	3869	reload_facedata;
		3870	reload_exp_table;
3564	reload_sound;	3871	reload_sound;
3565	reload_archetypes;	3872	reload_archetypes;
3566	reload_regions;	3873	reload_regions;
3567	reload_treasures;	3874	reload_treasures;
3568		3875
…		…
3570	}	3877	}
3571		3878
3572	sub reload_config {	3879	sub reload_config {
3573	trace "reloading config file...\n";	3880	trace "reloading config file...\n";
3574		3881
3575	0 < aio_load "$CONFDIR/config", my $config	3882	my $config = load_file "$CONFDIR/config";
3576	or die "$CONFDIR/config: $!";
3577
3578	utf8::decode $config;	3883	utf8::decode $config;
3579	*CFG = yaml_load $config;	3884	*CFG = decode_yaml $config;
3580		3885
3581	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];	3886	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3582		3887
3583	$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};
3584	$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};
…		…
3610	seek $fh, 0, 0;	3915	seek $fh, 0, 0;
3611	print $fh $$;	3916	print $fh $$;
3612	}	3917	}
3613		3918
3614	sub main_loop {	3919	sub main_loop {
3615	trace "EV::loop starting\n";	3920	trace "EV::run starting\n";
3616	if (1) {	3921	if (1) {
3617	EV::loop;	3922	EV::run;
3618	}	3923	}
3619	trace "EV::loop returned\n";	3924	trace "EV::run returned\n";
3620	goto &main_loop unless $REALLY_UNLOOP;	3925	goto &main_loop unless $REALLY_UNLOOP;
3621	}	3926	}
3622		3927
3623	sub main {	3928	sub main {
3624	cf::init_globals; # initialise logging	3929	cf::init_globals; # initialise logging
3625		3930
3626	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3931	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3627	LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3932	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3628	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3933	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3629	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3934	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3630		3935
3631	$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
3632		3937
3633	# we must not ever block the main coroutine	3938	# we must not ever block the main coroutine
3634	local $Coro::idle = sub {	3939	$Coro::idle = sub {
3635	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#
3636	(async {	3941	(async {
3637	$Coro::current->{desc} = "IDLE BUG HANDLER";	3942	$Coro::current->{desc} = "IDLE BUG HANDLER";
3638	EV::loop EV::LOOP_ONESHOT;	3943	EV::run EV::RUN_ONCE;
3639	})->prio (Coro::PRIO_MAX);	3944	})->prio (Coro::PRIO_MAX);
3640	};	3945	};
3641		3946
3642	evthread_start IO::AIO::poll_fileno;	3947	evthread_start IO::AIO::poll_fileno;
3643		3948
3644	cf::sync_job {	3949	cf::sync_job {
3645	cf::incloader::init ();	3950	cf::incloader::init ();
		3951
		3952	db_init;
3646		3953
3647	cf::init_anim;	3954	cf::init_anim;
3648	cf::init_attackmess;	3955	cf::init_attackmess;
3649	cf::init_dynamic;	3956	cf::init_dynamic;
3650		3957
3651	cf::load_settings;	3958	cf::load_settings;
3652		3959
3653	reload_resources;	3960	reload_resources;
3654	reload_config;	3961	reload_config;
3655	db_init;
3656		3962
3657	cf::init_uuid;	3963	cf::init_uuid;
3658	cf::init_signals;	3964	cf::init_signals;
3659	cf::init_skills;	3965	cf::init_skills;
3660		3966
…		…
3674	};	3980	};
3675		3981
3676	cf::object::thawer::errors_are_fatal 0;	3982	cf::object::thawer::errors_are_fatal 0;
3677	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";
3678		3984
3679	my $free_main; $free_main = EV::idle sub {	3985	AE::postpone {
3680	undef $free_main;
3681	undef &main; # free gobs of memory :)	3986	undef &main; # free gobs of memory :)
3682	};	3987	};
3683		3988
3684	goto &main_loop;	3989	goto &main_loop;
3685	}	3990	}
…		…
3842		4147
3843	cf::write_runtime_sync; # external watchdog should not bark	4148	cf::write_runtime_sync; # external watchdog should not bark
3844		4149
3845	trace "emergency_perl_save: flushing outstanding aio requests";	4150	trace "emergency_perl_save: flushing outstanding aio requests";
3846	while (IO::AIO::nreqs || BDB::nreqs) {	4151	while (IO::AIO::nreqs || BDB::nreqs) {
3847	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
3848	}	4153	}
3849		4154
3850	cf::write_runtime_sync; # external watchdog should not bark	4155	cf::write_runtime_sync; # external watchdog should not bark
3851	};	4156	};
3852		4157
…		…
4033		4338
4034	#############################################################################	4339	#############################################################################
4035		4340
4036	my $bug_warning = 0;	4341	my $bug_warning = 0;
4037		4342
4038	our @WAIT_FOR_TICK;
4039	our @WAIT_FOR_TICK_BEGIN;
4040
4041	sub wait_for_tick() {	4343	sub wait_for_tick() {
4042	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4344	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4043		4345
4044	my $signal = new Coro::Signal;	4346	$WAIT_FOR_TICK->wait;
4045	push @WAIT_FOR_TICK, $signal;
4046	$signal->wait;
4047	}	4347	}
4048		4348
4049	sub wait_for_tick_begin() {	4349	sub wait_for_tick_begin() {
4050	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4350	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4051		4351
4052	my $signal = new Coro::Signal;	4352	my $signal = new Coro::Signal;
4053	push @WAIT_FOR_TICK_BEGIN, $signal;	4353	push @WAIT_FOR_TICK_BEGIN, $signal;
4054	$signal->wait;	4354	$signal->wait;
4055	}	4355	}
…		…
4059	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"
4060	unless ++$bug_warning > 10;	4360	unless ++$bug_warning > 10;
4061	return;	4361	return;
4062	}	4362	}
4063		4363
4064	cf::server_tick; # one server iteration	4364	cf::one_tick; # one server iteration
4065		4365
4066	#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#
4067		4367
4068	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4368	if ($NOW >= $NEXT_RUNTIME_WRITE) {
4069	$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.;
…		…
4075	}	4375	}
4076		4376
4077	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4377	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4078	$sig->send;	4378	$sig->send;
4079	}	4379	}
4080	while (my $sig = shift @WAIT_FOR_TICK) {	4380	$WAIT_FOR_TICK->broadcast;
4081	$sig->send;
4082	}
4083		4381
4084	$LOAD = ($NOW - $TICK_START) / $TICK;	4382	$LOAD = ($NOW - $TICK_START) / $TICK;
4085	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4383	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4086		4384
4087	if (0) {	4385	if (0) {
…		…
4093	}	4391	}
4094	}	4392	}
4095		4393
4096	{	4394	{
4097	# configure BDB	4395	# configure BDB
		4396	info "initialising database";
4098		4397
4099	BDB::min_parallel 16;	4398	BDB::min_parallel 16;
4100	BDB::max_poll_reqs $TICK * 0.1;	4399	BDB::max_poll_reqs $TICK * 0.1;
4101	$AnyEvent::BDB::WATCHER->priority (1);	4400	#$AnyEvent::BDB::WATCHER->priority (1);
4102		4401
4103	unless ($DB_ENV) {	4402	unless ($DB_ENV) {
4104	$DB_ENV = BDB::db_env_create;	4403	$DB_ENV = BDB::db_env_create;
4105	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4404	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4106	$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;
…		…
4131	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4430	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4132	};	4431	};
4133	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4432	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4134	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4433	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4135	};	4434	};
		4435
		4436	info "database initialised";
4136	}	4437	}
4137		4438
4138	{	4439	{
4139	# configure IO::AIO	4440	# configure IO::AIO
4140		4441
		4442	info "initialising aio";
4141	IO::AIO::min_parallel 8;	4443	IO::AIO::min_parallel 8;
4142	IO::AIO::max_poll_time $TICK * 0.1;	4444	IO::AIO::max_poll_time $TICK * 0.1;
4143	undef $AnyEvent::AIO::WATCHER;	4445	undef $AnyEvent::AIO::WATCHER;
		4446	info "aio initialised";
4144	}	4447	}
4145		4448
4146	our $_log_backtrace;	4449	our $_log_backtrace;
4147	our $_log_backtrace_last;	4450	our $_log_backtrace_last;
4148		4451

Diff Legend

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