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.549 by root, Tue May 11 13:19:59 2010 UTC vs.
Revision 1.613 by root, Mon Nov 26 13:12:16 2012 UTC

1	#	1	#
2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	#	3	#
4	# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	#	5	#
6	# Deliantra is free software: you can redistribute it and/or modify it under	6	# Deliantra is free software: you can redistribute it and/or modify it under
7	# the terms of the Affero GNU General Public License as published by the	7	# the terms of the Affero GNU General Public License as published by the
8	# Free Software Foundation, either version 3 of the License, or (at your	8	# Free Software Foundation, either version 3 of the License, or (at your
9	# option) any later version.	9	# option) any later version.
10	#	10	#
11	# This program is distributed in the hope that it will be useful,	11	# This program is distributed in the hope that it will be useful,
12	# but WITHOUT ANY WARRANTY; without even the implied warranty of	12	# but WITHOUT ANY WARRANTY; without even the implied warranty of
13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14	# GNU General Public License for more details.	14	# GNU General Public License for more details.
15	#	15	#
16	# You should have received a copy of the Affero GNU General Public License	16	# You should have received a copy of the Affero GNU General Public License
17	# and the GNU General Public License along with this program. If not, see	17	# and the GNU General Public License along with this program. If not, see
18	# <http://www.gnu.org/licenses/>.	18	# <http://www.gnu.org/licenses/>.
19	#	19	#
20	# The authors can be reached via e-mail to <support@deliantra.net>	20	# The authors can be reached via e-mail to <support@deliantra.net>
21	#	21	#
22		22
23	package cf;	23	package cf;
24		24
…		…
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;
94	our @REFLECT; # set by XS	99	our @REFLECT; # set by XS
95	our %REFLECT; # set by us	100	our %REFLECT; # set by us
96		101
97	our $CONFDIR = confdir;	102	our $CONFDIR = confdir;
		103
98	our $DATADIR = datadir;	104	our $DATADIR = datadir;
99	our $LIBDIR = "$DATADIR/ext";	105	our $LIBDIR = "$DATADIR/ext";
100	our $PODDIR = "$DATADIR/pod";	106	our $PODDIR = "$DATADIR/pod";
101	our $MAPDIR = "$DATADIR/" . mapdir;	107	our $MAPDIR = "$DATADIR/" . mapdir;
		108
102	our $LOCALDIR = localdir;	109	our $LOCALDIR = localdir;
103	our $TMPDIR = "$LOCALDIR/" . tmpdir;	110	our $TMPDIR = "$LOCALDIR/" . tmpdir;
104	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	111	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	112	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106	our $RANDOMDIR = "$LOCALDIR/random";	113	our $RANDOMDIR = "$LOCALDIR/random";
107	our $BDBDIR = "$LOCALDIR/db";	114	our $BDBDIR = "$LOCALDIR/db";
108	our $PIDFILE = "$LOCALDIR/pid";	115	our $PIDFILE = "$LOCALDIR/pid";
109	our $RUNTIMEFILE = "$LOCALDIR/runtime";	116	our $RUNTIMEFILE = "$LOCALDIR/runtime";
110		117
111	our %RESOURCE; # unused	118	#our %RESOURCE; # unused
112		119
113	our $OUTPUT_RATE_MIN = 3000;	120	our $OUTPUT_RATE_MIN = 3000;
114	our $OUTPUT_RATE_MAX = 1000000;	121	our $OUTPUT_RATE_MAX = 1000000;
115		122
116	our $MAX_LINKS = 32; # how many chained exits to follow	123	our $MAX_LINKS = 32; # how many chained exits to follow
…		…
127	our $DB_ENV;	134	our $DB_ENV;
128		135
129	our @EXTRA_MODULES = qw(pod match mapscript incloader);	136	our @EXTRA_MODULES = qw(pod match mapscript incloader);
130		137
131	our %CFG;	138	our %CFG;
		139	our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
132		140
133	our $UPTIME; $UPTIME ||= time;	141	our $UPTIME; $UPTIME ||= time;
134	our $RUNTIME;	142	our $RUNTIME = 0;
		143	our $SERVER_TICK = 0;
135	our $NOW;	144	our $NOW;
136		145
137	our (%PLAYER, %PLAYER_LOADING); # all users	146	our (%PLAYER, %PLAYER_LOADING); # all users
138	our (%MAP, %MAP_LOADING ); # all maps	147	our (%MAP, %MAP_LOADING ); # all maps
139	our $LINK_MAP; # the special {link} map, which is always available	148	our $LINK_MAP; # the special {link} map, which is always available
…		…
148		157
149	our @POST_INIT;	158	our @POST_INIT;
150		159
151	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)	160	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152	our $REALLY_UNLOOP; # never set to true, please :)	161	our $REALLY_UNLOOP; # never set to true, please :)
		162
		163	our $WAIT_FOR_TICK = new Coro::Signal;
		164	our @WAIT_FOR_TICK_BEGIN;
153		165
154	binmode STDOUT;	166	binmode STDOUT;
155	binmode STDERR;	167	binmode STDERR;
156		168
157	# read virtual server time, if available	169	# read virtual server time, if available
…		…
191		203
192	=over 4	204	=over 4
193		205
194	=item $cf::UPTIME	206	=item $cf::UPTIME
195		207
196	The timestamp of the server start (so not actually an uptime).	208	The timestamp of the server start (so not actually an "uptime").
		209
		210	=item $cf::SERVER_TICK
		211
		212	An unsigned integer that starts at zero when the server is started and is
		213	incremented on every tick.
		214
		215	=item $cf::NOW
		216
		217	The (real) time of the last (current) server tick - updated before and
		218	after tick processing, so this is useful only as a rough "what time is it
		219	now" estimate.
		220
		221	=item $cf::TICK
		222
		223	The interval between each server tick, in seconds.
197		224
198	=item $cf::RUNTIME	225	=item $cf::RUNTIME
199		226
200	The time this server has run, starts at 0 and is increased by $cf::TICK on	227	The time this server has run, starts at 0 and is increased by $cf::TICK on
201	every server tick.	228	every server tick.
202		229
203	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR	230	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
204	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR	231	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
205	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR	232	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
206		233
207	Various directories - "/etc", read-only install directory, perl-library	234	Various directories - "/etc", read-only install directory, perl-library
208	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	235	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
209	unique-items directory, player file directory, random maps directory and	236	unique-items directory, player file directory, random maps directory and
210	database environment.	237	database environment.
211		238
212	=item $cf::NOW
213
214	The time of the last (current) server tick.
215
216	=item $cf::TICK
217
218	The interval between server ticks, in seconds.
219
220	=item $cf::LOADAVG	239	=item $cf::LOADAVG
221		240
222	The current CPU load on the server (alpha-smoothed), as a value between 0	241	The current CPU load on the server (alpha-smoothed), as a value between 0
223	(none) and 1 (overloaded), indicating how much time is spent on processing	242	(none) and 1 (overloaded), indicating how much time is spent on processing
224	objects per tick. Healthy values are < 0.5.	243	objects per tick. Healthy values are < 0.5.
…		…
232	Configuration for the server, loaded from C</etc/deliantra-server/config>, or	251	Configuration for the server, loaded from C</etc/deliantra-server/config>, or
233	from wherever your confdir points to.	252	from wherever your confdir points to.
234		253
235	=item cf::wait_for_tick, cf::wait_for_tick_begin	254	=item cf::wait_for_tick, cf::wait_for_tick_begin
236		255
237	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	256	These are functions that inhibit the current coroutine one tick.
238	returns directly I<after> the tick processing (and consequently, can only wake one 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
239	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	259	cf::wait_for_tick wakes up all waiters after tick processing.
		260
		261	Note that cf::wait_for_tick will immediately return when the server is not
		262	ticking, making it suitable for small pauses in threads that need to run
		263	when the server is paused. If that is not applicable (i.e. you I<really>
		264	want to wait, use C<$cf::WAIT_FOR_TICK>).
		265
		266	=item $cf::WAIT_FOR_TICK
		267
		268	Note that C<cf::wait_for_tick> is probably the correct thing to use. This
		269	variable contains a L<Coro::Signal> that is broadcats after every server
		270	tick. Calling C<< ->wait >> on it will suspend the caller until after the
		271	next server tick.
240		272
241	=cut	273	=cut
242		274
243	sub wait_for_tick();	275	sub wait_for_tick();
244	sub wait_for_tick_begin();	276	sub wait_for_tick_begin();
…		…
310	)) {	342	)) {
311	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	343	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
312	}	344	}
313		345
314	$EV::DIED = sub {	346	$EV::DIED = sub {
315	Carp::cluck "error in event callback: @_";	347	warn "error in event callback: $@";
316	};	348	};
		349
		350	#############################################################################
		351
		352	sub fork_call(&@);
		353	sub get_slot($;$$);
317		354
318	#############################################################################	355	#############################################################################
319		356
320	=head2 UTILITY FUNCTIONS	357	=head2 UTILITY FUNCTIONS
321		358
…		…
342	$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;
343	$d	380	$d
344	} || "[unable to dump $_[0]: '$@']";	381	} || "[unable to dump $_[0]: '$@']";
345	}	382	}
346		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
347	=item $ref = cf::decode_json $json	436	=item $ref = cf::decode_json $json
348		437
349	Converts a JSON string into the corresponding perl data structure.	438	Converts a JSON string into the corresponding perl data structure.
350		439
351	=item $json = cf::encode_json $ref	440	=item $json = cf::encode_json $ref
…		…
357	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
358		447
359	sub encode_json($) { $json_coder->encode ($_[0]) }	448	sub encode_json($) { $json_coder->encode ($_[0]) }
360	sub decode_json($) { $json_coder->decode ($_[0]) }	449	sub decode_json($) { $json_coder->decode ($_[0]) }
361		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
362	=item $ref = cf::yaml_load $scalar	459	=item $ref = cf::decode_yaml $scalar
363		460
364	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).
365		462
366	=cut	463	=cut
367		464
368	sub fork_call(&@);	465	sub decode_yaml($) {
369
370	sub yaml_load($) {
371	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]
372	}	480	}
373		481
374	=item cf::post_init { BLOCK }	482	=item cf::post_init { BLOCK }
375		483
376	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,
…		…
381		489
382	=cut	490	=cut
383		491
384	sub post_init(&) {	492	sub post_init(&) {
385	push @POST_INIT, shift;	493	push @POST_INIT, shift;
		494	}
		495
		496	sub _post_init {
		497	trace "running post_init jobs";
		498
		499	# run them in parallel...
		500
		501	my @join;
		502
		503	while () {
		504	push @join, map &Coro::async ($_, 0), @POST_INIT;
		505	@POST_INIT = ();
		506
		507	@join or last;
		508
		509	(pop @join)->join;
		510	}
386	}	511	}
387		512
388	=item cf::lock_wait $string	513	=item cf::lock_wait $string
389		514
390	Wait until the given lock is available. See cf::lock_acquire.	515	Wait until the given lock is available. See cf::lock_acquire.
…		…
443	EV::periodic $start, $interval, 0, $cb	568	EV::periodic $start, $interval, 0, $cb
444	}	569	}
445		570
446	=item cf::get_slot $time[, $priority[, $name]]	571	=item cf::get_slot $time[, $priority[, $name]]
447		572
448	Allocate $time seconds of blocking CPU time at priority C<$priority>:	573	Allocate $time seconds of blocking CPU time at priority C<$priority>
449	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
450	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.
451		580
452	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
453	used for statistical purposes and should identify the same time-class.	582	used for statistical purposes and should identify the same time-class.
454		583
455	Useful for short background jobs.	584	Useful for short background jobs.
…		…
467	my $signal = new Coro::Signal;	596	my $signal = new Coro::Signal;
468	my $busy;	597	my $busy;
469		598
470	while () {	599	while () {
471	next_job:	600	next_job:
		601
		602	Coro::cede;
472		603
473	my $avail = cf::till_tick;	604	my $avail = cf::till_tick;
474		605
475	for (0 .. $#SLOT_QUEUE) {	606	for (0 .. $#SLOT_QUEUE) {
476	if ($SLOT_QUEUE[$_][0] <= $avail) {	607	if ($SLOT_QUEUE[$_][0] <= $avail) {
477	$busy = 0;	608	$busy = 0;
478	my $job = splice @SLOT_QUEUE, $_, 1, ();	609	my $job = splice @SLOT_QUEUE, $_, 1, ();
479	$job->[2]->send;	610	$job->[2]->send;
480	Coro::cede;
481	goto next_job;	611	goto next_job;
482	} else {	612	} else {
483	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;	613	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
484	}	614	}
485	}	615	}
486		616
487	if (@SLOT_QUEUE) {	617	if (@SLOT_QUEUE) {
488	# we do not use wait_for_tick() as it returns immediately when tick is inactive	618	wait_for_tick;
489	push @cf::WAIT_FOR_TICK, $signal;
490	$signal->wait;
491	} else {	619	} else {
492	$busy = 0;	620	$busy = 0;
493	Coro::schedule;	621	Coro::schedule;
494	}	622	}
495	}	623	}
…		…
610	reset_signals;	738	reset_signals;
611	}	739	}
612		740
613	sub fork_call(&@) {	741	sub fork_call(&@) {
614	my ($cb, @args) = @_;	742	my ($cb, @args) = @_;
615
616	# we seemingly have to make a local copy of the whole thing,
617	# otherwise perl prematurely frees the stuff :/
618	# TODO: investigate and fix (likely this will be rather laborious)
619		743
620	my @res = Coro::Util::fork_eval {	744	my @res = Coro::Util::fork_eval {
621	cf::post_fork;	745	cf::post_fork;
622	&$cb	746	&$cb
623	} @args;	747	} @args;
…		…
750		874
751	my @data;	875	my @data;
752	my $md5;	876	my $md5;
753		877
754	for (0 .. $#$src) {	878	for (0 .. $#$src) {
755	0 <= aio_load $src->[$_], $data[$_]	879	$data[$_] = load_file $src->[$_];
756	or Carp::croak "$src->[$_]: $!";
757	}	880	}
758		881
759	# if processing is expensive, check	882	# if processing is expensive, check
760	# checksum first	883	# checksum first
761	if (1) {	884	if (1) {
…		…
774		897
775	return db_get cache => "$id/data";	898	return db_get cache => "$id/data";
776	}	899	}
777	}	900	}
778		901
779	my $t1 = Time::HiRes::time;	902	my $t1 = EV::time;
780	my $data = $process->(\@data);	903	my $data = $process->(\@data);
781	my $t2 = Time::HiRes::time;	904	my $t2 = EV::time;
782		905
783	info "cache: '$id' processed in ", $t2 - $t1, "s\n";	906	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
784		907
785	db_put cache => "$id/data", $data;	908	db_put cache => "$id/data", $data;
786	db_put cache => "$id/md5" , $md5;	909	db_put cache => "$id/md5" , $md5;
…		…
1306	=cut	1429	=cut
1307		1430
1308	#############################################################################	1431	#############################################################################
1309	# command handling &c	1432	# command handling &c
1310		1433
1311	=item cf::register_command $name => \&callback($ob,$args);	1434	=item cf::register_command $name => \&callback($ob,$args)
1312		1435
1313	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
1314	$name.	1437	$name.
1315		1438
1316	=cut	1439	=cut
…		…
1322	#warn "registering command '$name/$time' to '$caller'";	1445	#warn "registering command '$name/$time' to '$caller'";
1323		1446
1324	push @{ $COMMAND{$name} }, [$caller, $cb];	1447	push @{ $COMMAND{$name} }, [$caller, $cb];
1325	}	1448	}
1326		1449
1327	=item cf::register_extcmd $name => \&callback($pl,$packet);	1450	=item cf::register_extcmd $name => \&callback($pl,@args)
1328		1451
1329	Register a callback for execution when the client sends an (synchronous)	1452	Register a callback for execution when the client sends an (synchronous)
1330	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
1331	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
1332	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
1333	has logged in successfully.	1456	has logged in successfully.
1334		1457
1335	If the callback returns something, it is sent back as if reply was being	1458	The values will be sent back to the client.
1336	called.
1337		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
1338	=item cf::register_exticmd $name => \&callback($ns,$packet);	1465	=item cf::register_exticmd $name => \&callback($ns,@args)
1339		1466
1340	Register a callback for execution when the client sends an (asynchronous)	1467	Register a callback for execution when the client sends an (asynchronous)
1341	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
1342	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
1343	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
1344	log-in.	1471	log-in.
1345		1472
1346	If the callback returns something, it is sent back as if reply was being	1473	The values will be sent back to the client.
1347	called.
1348		1474
1349	=cut	1475	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1350		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
1351	sub register_extcmd {	1482	sub register_extcmd($$) {
1352	my ($name, $cb) = @_;	1483	my ($name, $cb) = @_;
1353		1484
1354	$EXTCMD{$name} = $cb;	1485	$EXTCMD{$name} = $cb;
1355	}	1486	}
1356		1487
1357	sub register_exticmd {	1488	sub register_async_extcmd($$) {
1358	my ($name, $cb) = @_;	1489	my ($name, $cb) = @_;
1359		1490
		1491	$EXTACMD{$name} = $cb;
		1492	}
		1493
		1494	sub register_exticmd($$) {
		1495	my ($name, $cb) = @_;
		1496
1360	$EXTICMD{$name} = $cb;	1497	$EXTICMD{$name} = $cb;
		1498	}
		1499
		1500	sub register_async_exticmd($$) {
		1501	my ($name, $cb) = @_;
		1502
		1503	$EXTIACMD{$name} = $cb;
1361	}	1504	}
1362		1505
1363	use File::Glob ();	1506	use File::Glob ();
1364		1507
1365	cf::player->attach (	1508	cf::player->attach (
…		…
1379	my ($pl, $buf) = @_;	1522	my ($pl, $buf) = @_;
1380		1523
1381	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1524	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1382		1525
1383	if (ref $msg) {	1526	if (ref $msg) {
1384	my ($type, $reply, @payload) =	1527	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1385	"ARRAY" eq ref $msg
1386	? @$msg
1387	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1388		1528
1389	my @reply;
1390
1391	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}) {
1392	@reply = $cb->($pl, @payload);	1542	@reply = $cb->($pl, @payload);
		1543	}
		1544
		1545	$pl->ext_msg ("reply-$reply", @reply)
		1546	if $reply;
1393	}	1547	}
1394
1395	$pl->ext_reply ($reply, @reply)
1396	if $reply;
1397		1548
1398	} else {	1549	} else {
1399	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1550	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1400	}	1551	}
1401		1552
…		…
1414	};	1565	};
1415		1566
1416	$grp	1567	$grp
1417	}	1568	}
1418		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
1419	sub load_extensions {	1581	sub load_extensions {
1420	info "loading extensions...";	1582	info "loading extensions...";
		1583
		1584	%EXT_CFG = ();
1421		1585
1422	cf::sync_job {	1586	cf::sync_job {
1423	my %todo;	1587	my %todo;
1424		1588
1425	for my $path (<$LIBDIR/*.ext>) {	1589	for my $path (<$LIBDIR/*.ext>) {
…		…
1468	unless exists $done{$_};	1632	unless exists $done{$_};
1469	}	1633	}
1470		1634
1471	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1635	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1472		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
1473	my $active = eval $v->{source};	1646	my $active = eval $source;
1474		1647
1475	if (length $@) {	1648	if (length $@) {
1476	error "$v->{path}: $@\n";	1649	error "$v->{path}: $@\n";
1477		1650
1478	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1651	cf::cleanup "mandatory extension '$k' failed to load, exiting."
…		…
1495		1668
1496	while (my ($k, $v) = each %todo) {	1669	while (my ($k, $v) = each %todo) {
1497	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1670	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1498	if exists $v->{meta}{mandatory};	1671	if exists $v->{meta}{mandatory};
1499	}	1672	}
		1673
		1674	last;
1500	}	1675	}
1501	}	1676	}
1502	};	1677	};
1503	}	1678	}
1504		1679
…		…
1764		1939
1765	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1940	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1766		1941
1767	Expand deliantra pod fragments into protocol xml.	1942	Expand deliantra pod fragments into protocol xml.
1768		1943
1769	=item $player->ext_reply ($msgid, @msg)
1770
1771	Sends an ext reply to the player.
1772
1773	=cut
1774
1775	sub ext_reply($$@) {
1776	my ($self, $id, @msg) = @_;
1777
1778	$self->ns->ext_reply ($id, @msg)
1779	}
1780
1781	=item $player->ext_msg ($type, @msg)	1944	=item $player->ext_msg ($type, @msg)
1782		1945
1783	Sends an ext event to the client.	1946	Sends an ext event to the client.
1784		1947
1785	=cut	1948	=cut
…		…
1844	sub generate_random_map {	2007	sub generate_random_map {
1845	my ($self, $rmp) = @_;	2008	my ($self, $rmp) = @_;
1846		2009
1847	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
1848		2011
1849	# mit "rum" bekleckern, nicht
1850	$self->_create_random_map (	2012	$self->_create_random_map ($rmp);
1851	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1852	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1853	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1854	$rmp->{exit_on_final_map},
1855	$rmp->{xsize}, $rmp->{ysize},
1856	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1857	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1858	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1859	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1860	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1861	(cf::region::find $rmp->{region}), $rmp->{custom}
1862	)
1863	}	2013	}
1864		2014
1865	=item cf::map->register ($regex, $prio)	2015	=item cf::map->register ($regex, $prio)
1866		2016
1867	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
…		…
1918	$base =~ s{[^/]+/?$}{};	2068	$base =~ s{[^/]+/?$}{};
1919	$path = "$base/$path";	2069	$path = "$base/$path";
1920	}	2070	}
1921		2071
1922	for ($path) {	2072	for ($path) {
1923	redo if s{//}{/};
1924	redo if s{/\.?/}{/};	2073	redo if s{/\.?/}{/};
1925	redo if s{/[^/]+/\.\./}{/};	2074	redo if s{/[^/]+/\.\./}{/};
1926	}	2075	}
1927		2076
1928	$path	2077	$path
…		…
1946		2095
1947	Carp::cluck "unable to resolve path '$path' (base '$base')";	2096	Carp::cluck "unable to resolve path '$path' (base '$base')";
1948	()	2097	()
1949	}	2098	}
1950		2099
		2100	# may re-bless or do other evil things
1951	sub init {	2101	sub init {
1952	my ($self) = @_;	2102	my ($self) = @_;
1953		2103
1954	$self	2104	$self
1955	}	2105	}
…		…
2020	$self->{load_path} = $path;	2170	$self->{load_path} = $path;
2021		2171
2022	1	2172	1
2023	}	2173	}
2024		2174
		2175	# used to laod the header of an original map
2025	sub load_header_orig {	2176	sub load_header_orig {
2026	my ($self) = @_;	2177	my ($self) = @_;
2027		2178
2028	$self->load_header_from ($self->load_path)	2179	$self->load_header_from ($self->load_path)
2029	}	2180	}
2030		2181
		2182	# used to laod the header of an instantiated map
2031	sub load_header_temp {	2183	sub load_header_temp {
2032	my ($self) = @_;	2184	my ($self) = @_;
2033		2185
2034	$self->load_header_from ($self->save_path)	2186	$self->load_header_from ($self->save_path)
2035	}	2187	}
2036		2188
		2189	# called after loading the header from an instantiated map
2037	sub prepare_temp {	2190	sub prepare_temp {
2038	my ($self) = @_;	2191	my ($self) = @_;
2039		2192
2040	$self->last_access ((delete $self->{last_access})	2193	$self->last_access ((delete $self->{last_access})
2041	|| $cf::RUNTIME); #d#	2194	|| $cf::RUNTIME); #d#
2042	# safety	2195	# safety
2043	$self->{instantiate_time} = $cf::RUNTIME	2196	$self->{instantiate_time} = $cf::RUNTIME
2044	if $self->{instantiate_time} > $cf::RUNTIME;	2197	if $self->{instantiate_time} > $cf::RUNTIME;
2045	}	2198	}
2046		2199
		2200	# called after loading the header from an original map
2047	sub prepare_orig {	2201	sub prepare_orig {
2048	my ($self) = @_;	2202	my ($self) = @_;
2049		2203
2050	$self->{load_original} = 1;	2204	$self->{load_original} = 1;
2051	$self->{instantiate_time} = $cf::RUNTIME;	2205	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2077	sub find {	2231	sub find {
2078	my ($path, $origin) = @_;	2232	my ($path, $origin) = @_;
2079		2233
2080	cf::cede_to_tick;	2234	cf::cede_to_tick;
2081		2235
2082	$path = normalise $path, $origin && $origin->path;	2236	$path = normalise $path, $origin;
2083		2237
2084	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2238	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2085	my $guard2 = cf::lock_acquire "map_find:$path";	2239	my $guard2 = cf::lock_acquire "map_find:$path";
2086		2240
2087	$cf::MAP{$path} || do {	2241	$cf::MAP{$path} || do {
…		…
2118		2272
2119	{	2273	{
2120	my $guard = cf::lock_acquire "map_data:$path";	2274	my $guard = cf::lock_acquire "map_data:$path";
2121		2275
2122	return unless $self->valid;	2276	return unless $self->valid;
2123	return unless $self->in_memory == cf::MAP_SWAPPED;	2277	return unless $self->state == cf::MAP_SWAPPED;
2124
2125	$self->in_memory (cf::MAP_LOADING);
2126		2278
2127	$self->alloc;	2279	$self->alloc;
2128		2280
2129	$self->pre_load;	2281	$self->pre_load;
2130	cf::cede_to_tick;	2282	cf::cede_to_tick;
2131		2283
		2284	if (exists $self->{load_path}) {
2132	my $f = new_from_file cf::object::thawer $self->{load_path};	2285	my $f = new_from_file cf::object::thawer $self->{load_path};
2133	$f->skip_block;	2286	$f->skip_block;
2134	$self->_load_objects ($f)	2287	$self->_load_objects ($f)
2135	or return;	2288	or return;
2136		2289
2137	$self->post_load_original	2290	$self->post_load_original
2138	if delete $self->{load_original};	2291	if delete $self->{load_original};
2139		2292
2140	if (my $uniq = $self->uniq_path) {	2293	if (my $uniq = $self->uniq_path) {
2141	utf8::encode $uniq;	2294	utf8::encode $uniq;
2142	unless (aio_stat $uniq) {	2295	unless (aio_stat $uniq) {
2143	if (my $f = new_from_file cf::object::thawer $uniq) {	2296	if (my $f = new_from_file cf::object::thawer $uniq) {
2144	$self->clear_unique_items;	2297	$self->clear_unique_items;
2145	$self->_load_objects ($f);	2298	$self->_load_objects ($f);
2146	$f->resolve_delayed_derefs;	2299	$f->resolve_delayed_derefs;
		2300	}
2147	}	2301	}
2148	}	2302	}
2149	}
2150		2303
2151	$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);
2152		2311
2153	cf::cede_to_tick;	2312	cf::cede_to_tick;
2154	# now do the right thing for maps	2313	# now do the right thing for maps
2155	$self->link_multipart_objects;	2314	$self->link_multipart_objects;
2156	$self->difficulty ($self->estimate_difficulty)	2315	$self->difficulty ($self->estimate_difficulty)
…		…
2160	unless ($self->{deny_activate}) {	2319	unless ($self->{deny_activate}) {
2161	$self->decay_objects;	2320	$self->decay_objects;
2162	$self->fix_auto_apply;	2321	$self->fix_auto_apply;
2163	$self->update_buttons;	2322	$self->update_buttons;
2164	cf::cede_to_tick;	2323	cf::cede_to_tick;
2165	$self->activate;	2324	#$self->activate; # no longer activate maps automatically
2166	}	2325	}
2167		2326
2168	$self->{last_save} = $cf::RUNTIME;	2327	$self->{last_save} = $cf::RUNTIME;
2169	$self->last_access ($cf::RUNTIME);	2328	$self->last_access ($cf::RUNTIME);
2170
2171	$self->in_memory (cf::MAP_ACTIVE);
2172	}	2329	}
2173		2330
2174	$self->post_load;	2331	$self->post_load;
		2332
		2333	1
2175	}	2334	}
2176		2335
2177	# customize the map for a given player, i.e.	2336	# customize the map for a given player, i.e.
2178	# return the _real_ map. used by e.g. per-player	2337	# return the _real_ map. used by e.g. per-player
2179	# maps to change the path to ~playername/mappath	2338	# maps to change the path to ~playername/mappath
…		…
2187	# if $self->per_party;	2346	# if $self->per_party;
2188		2347
2189	$self	2348	$self
2190	}	2349	}
2191		2350
2192	# find and load all maps in the 3x3 area around a map
2193	sub load_neighbours {
2194	my ($map) = @_;
2195
2196	my @neigh; # diagonal neighbours
2197
2198	for (0 .. 3) {
2199	my $neigh = $map->tile_path ($_)
2200	or next;
2201	$neigh = find $neigh, $map
2202	or next;
2203	$neigh->load;
2204
2205	# now find the diagonal neighbours
2206	push @neigh,
2207	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2208	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2209	}
2210
2211	for (grep defined $_->[0], @neigh) {
2212	my ($path, $origin) = @$_;
2213	my $neigh = find $path, $origin
2214	or next;
2215	$neigh->load;
2216	}
2217	}
2218
2219	sub find_sync {	2351	sub find_sync {
2220	my ($path, $origin) = @_;	2352	my ($path, $origin) = @_;
2221		2353
		2354	# it's a bug to call this from the main context
2222	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"	2355	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2223	if $Coro::current == $Coro::main;	2356	if $Coro::current == $Coro::main;
2224		2357
2225	find $path, $origin	2358	find $path, $origin
2226	}	2359	}
2227		2360
2228	sub do_load_sync {	2361	sub do_load_sync {
2229	my ($map) = @_;	2362	my ($map) = @_;
2230		2363
		2364	# it's a bug to call this from the main context
2231	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"	2365	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2232	if $Coro::current == $Coro::main;	2366	if $Coro::current == $Coro::main;
2233		2367
2234	$map->load;	2368	$map->load;
2235	}	2369	}
…		…
2238	our $MAP_PREFETCHER = undef;	2372	our $MAP_PREFETCHER = undef;
2239		2373
2240	sub find_async {	2374	sub find_async {
2241	my ($path, $origin, $load) = @_;	2375	my ($path, $origin, $load) = @_;
2242		2376
2243	$path = normalise $path, $origin && $origin->{path};	2377	$path = normalise $path, $origin;
2244		2378
2245	if (my $map = $cf::MAP{$path}) {	2379	if (my $map = $cf::MAP{$path}) {
2246	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2380	return $map if !$load || $map->linkable;
2247	}	2381	}
2248		2382
2249	$MAP_PREFETCH{$path} |= $load;	2383	$MAP_PREFETCH{$path} |= $load;
2250		2384
2251	$MAP_PREFETCHER ||= cf::async {	2385	$MAP_PREFETCHER ||= cf::async {
…		…
2310	sub swap_out {	2444	sub swap_out {
2311	my ($self) = @_;	2445	my ($self) = @_;
2312		2446
2313	my $lock = cf::lock_acquire "map_data:$self->{path}";	2447	my $lock = cf::lock_acquire "map_data:$self->{path}";
2314		2448
2315	return if $self->in_memory != cf::MAP_ACTIVE;	2449	return if !$self->linkable;
2316	return if $self->{deny_save};	2450	return if $self->{deny_save};
2317	return if $self->players;	2451	return if $self->players;
2318		2452
2319	# first deactivate the map and "unlink" it from the core	2453	# first deactivate the map and "unlink" it from the core
2320	$self->deactivate;	2454	$self->deactivate;
2321	$_->clear_links_to ($self) for values %cf::MAP;	2455	$_->clear_links_to ($self) for values %cf::MAP;
2322	$self->in_memory (cf::MAP_SWAPPED);	2456	$self->state (cf::MAP_SWAPPED);
2323		2457
2324	# then atomically save	2458	# then atomically save
2325	$self->_save;	2459	$self->_save;
2326		2460
2327	# then free the map	2461	# then free the map
…		…
2353		2487
2354	return if $self->players;	2488	return if $self->players;
2355		2489
2356	cf::trace "resetting map ", $self->path, "\n";	2490	cf::trace "resetting map ", $self->path, "\n";
2357		2491
2358	$self->in_memory (cf::MAP_SWAPPED);	2492	$self->state (cf::MAP_SWAPPED);
2359		2493
2360	# need to save uniques path	2494	# need to save uniques path
2361	unless ($self->{deny_save}) {	2495	unless ($self->{deny_save}) {
2362	my $uniq = $self->uniq_path; utf8::encode $uniq;	2496	my $uniq = $self->uniq_path; utf8::encode $uniq;
2363		2497
…		…
2516		2650
2517	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.
2518		2652
2519	=item $ob = cf::object::deref ($refstring)	2653	=item $ob = cf::object::deref ($refstring)
2520		2654
2521	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,
2522	even if the object actually exists. May block.	2656	even if the object actually exists. May block.
2523		2657
2524	=cut	2658	=cut
2525		2659
2526	sub deref {	2660	sub deref {
…		…
2693	# use -1 or undef as default coordinates, not 0, 0	2827	# use -1 or undef as default coordinates, not 0, 0
2694	($x, $y) = ($map->enter_x, $map->enter_y)	2828	($x, $y) = ($map->enter_x, $map->enter_y)
2695	if $x <= 0 && $y <= 0;	2829	if $x <= 0 && $y <= 0;
2696		2830
2697	$map->load;	2831	$map->load;
2698	$map->load_neighbours;
2699		2832
2700	return unless $self->contr->active;	2833	return unless $self->contr->active;
2701		2834
2702	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2835	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2703	if ($self->enter_map ($map, $x, $y)) {	2836	if ($self->enter_map ($map, $x, $y)) {
…		…
2759	($path, $x, $y) = (undef, undef, undef);	2892	($path, $x, $y) = (undef, undef, undef);
2760	}	2893	}
2761	}	2894	}
2762		2895
2763	my $map = eval {	2896	my $map = eval {
2764	my $map = defined $path ? cf::map::find $path : undef;	2897	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2765		2898
2766	if ($map) {	2899	if ($map) {
2767	$map = $map->customise_for ($self);	2900	$map = $map->customise_for ($self);
2768	$map = $check->($map, $x, $y, $self) if $check && $map;	2901	$map = $check->($map, $x, $y, $self) if $check && $map;
2769	} else {	2902	} else {
…		…
2859	$Coro::current->{desc} = "enter_exit";	2992	$Coro::current->{desc} = "enter_exit";
2860		2993
2861	unless (eval {	2994	unless (eval {
2862	$self->deactivate_recursive; # just to be sure	2995	$self->deactivate_recursive; # just to be sure
2863		2996
2864	# random map handling
2865	{
2866	my $guard = cf::lock_acquire "exit_prepare:$exit";
2867
2868	prepare_random_map $exit
2869	if $exit->slaying eq "/!";
2870	}
2871
2872	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2997	my $map = cf::map::normalise $exit->slaying, $exit->map;
2873	my $x = $exit->stats->hp;	2998	my $x = $exit->stats->hp;
2874	my $y = $exit->stats->sp;	2999	my $y = $exit->stats->sp;
		3000
		3001	# special map handling
		3002	my $slaying = $exit->slaying;
		3003
		3004	# special map handling
		3005	if ($slaying eq "/!") {
		3006	my $guard = cf::lock_acquire "exit_prepare:$exit";
		3007
		3008	prepare_random_map $exit
		3009	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		3010
		3011	$map = $exit->slaying;
		3012
		3013	} elsif ($slaying eq '!up') {
		3014	$map = $exit->map->tile_path (cf::TILE_UP);
		3015	$x = $exit->x;
		3016	$y = $exit->y;
		3017
		3018	} elsif ($slaying eq '!down') {
		3019	$map = $exit->map->tile_path (cf::TILE_DOWN);
		3020	$x = $exit->x;
		3021	$y = $exit->y;
		3022	}
2875		3023
2876	$self->goto ($map, $x, $y);	3024	$self->goto ($map, $x, $y);
2877		3025
2878	# if exit is damned, update players death & WoR home-position	3026	# if exit is damned, update players death & WoR home-position
2879	$self->contr->savebed ($map, $x, $y)	3027	$self->contr->savebed ($map, $x, $y)
…		…
2894		3042
2895	=head3 cf::client	3043	=head3 cf::client
2896		3044
2897	=over 4	3045	=over 4
2898		3046
2899	=item $client->send_drawinfo ($text, $flags)
2900
2901	Sends a drawinfo packet to the client. Circumvents output buffering so
2902	should not be used under normal circumstances.
2903
2904	=cut
2905
2906	sub cf::client::send_drawinfo {
2907	my ($self, $text, $flags) = @_;
2908
2909	utf8::encode $text;
2910	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2911	}
2912
2913	=item $client->send_big_packet ($pkt)	3047	=item $client->send_big_packet ($pkt)
2914		3048
2915	Like C<send_packet>, but tries to compress large packets, and fragments	3049	Like C<send_packet>, but tries to compress large packets, and fragments
2916	them as required.	3050	them as required.
2917		3051
…		…
2935	$self->send_packet ($pkt);	3069	$self->send_packet ($pkt);
2936	}	3070	}
2937		3071
2938	=item $client->send_msg ($channel, $msg, $color, [extra...])	3072	=item $client->send_msg ($channel, $msg, $color, [extra...])
2939		3073
2940	Send a drawinfo or msg packet to the client, formatting the msg for the	3074	Send a msg packet to the client, formatting the msg for the client if
2941	client if neccessary. C<$type> should be a string identifying the type of	3075	necessary. C<$type> should be a string identifying the type of the
2942	the message, with C<log> being the default. If C<$color> is negative, suppress	3076	message, with C<log> being the default. If C<$color> is negative, suppress
2943	the message unless the client supports the msg packet.	3077	the message unless the client supports the msg packet.
2944		3078
2945	=cut	3079	=cut
2946		3080
2947	# non-persistent channels (usually the info channel)	3081	# non-persistent channels (usually the info channel)
…		…
3052	id => "death",	3186	id => "death",
3053	title => "Death",	3187	title => "Death",
3054	reply => undef,	3188	reply => undef,
3055	tooltip => "Reason for and more info about your most recent death",	3189	tooltip => "Reason for and more info about your most recent death",
3056	},	3190	},
		3191	"c/fatal" => {
		3192	id => "fatal",
		3193	title => "Fatal Error",
		3194	reply => undef,
		3195	tooltip => "Reason for the server disconnect",
		3196	},
3057	"c/say" => $SAY_CHANNEL,	3197	"c/say" => $SAY_CHANNEL,
3058	"c/chat" => $CHAT_CHANNEL,	3198	"c/chat" => $CHAT_CHANNEL,
3059	);	3199	);
3060		3200
3061	sub cf::client::send_msg {	3201	sub cf::client::send_msg {
…		…
3104	=cut	3244	=cut
3105		3245
3106	sub cf::client::ext_msg($$@) {	3246	sub cf::client::ext_msg($$@) {
3107	my ($self, $type, @msg) = @_;	3247	my ($self, $type, @msg) = @_;
3108		3248
3109	if ($self->extcmd == 2) {
3110	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3249	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3111	} elsif ($self->extcmd == 1) { # TODO: remove
3112	push @msg, msgtype => "event_$type";
3113	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3114	}
3115	}
3116
3117	=item $client->ext_reply ($msgid, @msg)
3118
3119	Sends an ext reply to the client.
3120
3121	=cut
3122
3123	sub cf::client::ext_reply($$@) {
3124	my ($self, $id, @msg) = @_;
3125
3126	if ($self->extcmd == 2) {
3127	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3128	} elsif ($self->extcmd == 1) {
3129	#TODO: version 1, remove
3130	unshift @msg, msgtype => "reply", msgid => $id;
3131	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3132	}
3133	}	3250	}
3134		3251
3135	=item $success = $client->query ($flags, "text", \&cb)	3252	=item $success = $client->query ($flags, "text", \&cb)
3136		3253
3137	Queues a query to the client, calling the given callback with	3254	Queues a query to the client, calling the given callback with
…		…
3157		3274
3158	$self->send_packet ($self->{query_queue}[0][0])	3275	$self->send_packet ($self->{query_queue}[0][0])
3159	if @{ $self->{query_queue} } == 1;	3276	if @{ $self->{query_queue} } == 1;
3160		3277
3161	1	3278	1
		3279	}
		3280
		3281	=item $client->update_command_faces
		3282
		3283	=cut
		3284
		3285	our %COMMAND_FACE;
		3286
		3287	sub cf::client::update_command_faces {
		3288	my ($self) = @_;
		3289
		3290	my @faces = grep $_,
		3291	$COMMAND_FACE{preferred},
		3292	$COMMAND_FACE{standard},
		3293	$COMMAND_FACE{skill},
		3294	$self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
		3295	$COMMAND_FACE{emote},
		3296	;
		3297
		3298	$self->send_face ($_)
		3299	for @faces;
		3300	$self->flush_fx;
		3301
		3302	$self->ext_msg (command_list => @faces);
		3303	}
		3304
		3305	=item cf::client::set_command_face $type, $commands
		3306
		3307	=cut
		3308
		3309	sub cf::client::set_command_face {
		3310	my ($type, $list) = @_;
		3311
		3312	my $idx = &cf::face::set ( #d# ugly forward reference
		3313	"command_list/$type" => cf::FT_RSRC,
		3314	JSON::XS->new->utf8->encode ([ sort @$list ])
		3315	);
		3316
		3317	$COMMAND_FACE{$type} = $idx;
3162	}	3318	}
3163		3319
3164	cf::client->attach (	3320	cf::client->attach (
3165	on_connect => sub {	3321	on_connect => sub {
3166	my ($ns) = @_;	3322	my ($ns) = @_;
…		…
3192	my ($ns, $buf) = @_;	3348	my ($ns, $buf) = @_;
3193		3349
3194	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3350	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3195		3351
3196	if (ref $msg) {	3352	if (ref $msg) {
3197	my ($type, $reply, @payload) =	3353	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3198	"ARRAY" eq ref $msg
3199	? @$msg
3200	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3201		3354
3202	my @reply;
3203
3204	if (my $cb = $EXTICMD{$type}) {	3355	if (my $cb = $EXTIACMD{$type}) {
		3356	$cb->(
		3357	$ns,
		3358	sub {
		3359	$ns->ext_msg ("reply-$reply", @_)
		3360	if $reply;
		3361	},
		3362	@payload
		3363	);
		3364	} else {
		3365	my @reply;
		3366
		3367	if (my $cb = $EXTICMD{$type}) {
3205	@reply = $cb->($ns, @payload);	3368	@reply = $cb->($ns, @payload);
		3369	}
		3370
		3371	$ns->ext_msg ("reply-$reply", @reply)
		3372	if $reply;
3206	}	3373	}
3207
3208	$ns->ext_reply ($reply, @reply)
3209	if $reply;
3210
3211	} else {	3374	} else {
3212	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3375	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3213	}	3376	}
3214		3377
3215	cf::override;	3378	cf::override;
…		…
3383	=cut	3546	=cut
3384		3547
3385	#############################################################################	3548	#############################################################################
3386	# the server's init and main functions	3549	# the server's init and main functions
3387		3550
		3551	{
		3552	package cf::face;
		3553
		3554	our %HASH; # hash => idx
		3555	our @DATA; # dynamically-created facedata, only faceste 0 used
		3556	our @FOFS; # file offset, if > 0
		3557	our @SIZE; # size of face, in octets
		3558	our @META; # meta hash of face, if any
		3559	our $DATAFH; # facedata filehandle
		3560
		3561	# internal api, not finalised
		3562	sub set {
		3563	my ($name, $type, $data) = @_;
		3564
		3565	my $idx = cf::face::find $name;
		3566
		3567	if ($idx) {
		3568	delete $HASH{cf::face::get_csum $idx};
		3569	} else {
		3570	$idx = cf::face::alloc $name;
		3571	}
		3572
		3573	my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
		3574
		3575	cf::face::set_type $idx, $type;
		3576	cf::face::set_csum $idx, 0, $hash;
		3577
		3578	# we need to destroy the SV itself, not just modify it, as a running ix
		3579	# might hold a reference to it: "delete" achieves that.
		3580	delete $FOFS[0][$idx];
		3581	delete $DATA[0][$idx];
		3582	$DATA[0][$idx] = $data;
		3583	$SIZE[0][$idx] = length $data;
		3584	delete $META[$idx];
		3585	$HASH{$hash} = $idx;#d#
		3586
		3587	$idx
		3588	}
		3589
		3590	sub _get_data($$$) {
		3591	my ($idx, $set, $cb) = @_;
		3592
		3593	if (defined $DATA[$set][$idx]) {
		3594	$cb->($DATA[$set][$idx]);
		3595	} elsif (my $fofs = $FOFS[$set][$idx]) {
		3596	my $size = $SIZE[$set][$idx];
		3597	my $buf;
		3598	IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
		3599	if ($_[0] == $size) {
		3600	#cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
		3601	$cb->($buf);
		3602	} else {
		3603	cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
		3604	}
		3605	};
		3606	} else {
		3607	cf::error "requested facedata for unknown face $idx#$set, ignoring.";
		3608	}
		3609	}
		3610
		3611	# rather ineffient
		3612	sub cf::face::get_data($;$) {
		3613	my ($idx, $set) = @_;
		3614
		3615	_get_data $idx, $set, Coro::rouse_cb;
		3616	Coro::rouse_wait
		3617	}
		3618
		3619	sub cf::face::ix {
		3620	my ($ns, $set, $idx, $pri) = @_;
		3621
		3622	_get_data $idx, $set, sub {
		3623	$ns->ix_send ($idx, $pri, $_[0]);
		3624	};
		3625	}
		3626	}
		3627
3388	sub load_facedata($) {	3628	sub load_facedata($) {
3389	my ($path) = @_;	3629	my ($path) = @_;
3390		3630
3391	# HACK to clear player env face cache, we need some signal framework
3392	# for this (global event?)
3393	%ext::player_env::MUSIC_FACE_CACHE = ();
3394
3395	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3631	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3396		3632
3397	trace "loading facedata from $path\n";	3633	trace "loading facedata from $path\n";
3398		3634
3399	0 < aio_load $path, my $facedata	3635	my $facedata = decode_storable load_file "$path/faceinfo";
3400	or die "$path: $!";
3401
3402	$facedata = Coro::Storable::thaw $facedata;
3403		3636
3404	$facedata->{version} == 2	3637	$facedata->{version} == 2
3405	or cf::cleanup "$path: version mismatch, cannot proceed.";	3638	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3406		3639
3407	# patch in the exptable	3640	my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3408	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);	3641	or cf::cleanup "$path/facedata: $!, cannot proceed.";
3409	$facedata->{resource}{"res/exp_table"} = {	3642
3410	type => FT_RSRC,	3643	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3411	data => $exp_table,	3644
3412	hash => (Digest::MD5::md5 $exp_table),	3645	# BEGIN ATOMIC
3413	};	3646	# from here on, everything must be atomic - no thread switch allowed
3414	cf::cede_to_tick;	3647	my $t1 = EV::time;
3415		3648
3416	{	3649	{
3417	my $faces = $facedata->{faceinfo};	3650	my $faces = $facedata->{faceinfo};
3418		3651
3419	while (my ($face, $info) = each %$faces) {	3652	for my $face (sort keys %$faces) {
		3653	my $info = $faces->{$face};
3420	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3654	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3421		3655
3422	cf::face::set_visibility $idx, $info->{visibility};	3656	cf::face::set_visibility $idx, $info->{visibility};
3423	cf::face::set_magicmap $idx, $info->{magicmap};	3657	cf::face::set_magicmap $idx, $info->{magicmap};
3424	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3658	cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3425	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3659	cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3426		3660	cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3427	cf::cede_to_tick;	3661	$cf::face::HASH{$info->{hash64}} = $idx;
		3662	delete $cf::face::META[$idx];
3428	}	3663	}
3429		3664
3430	while (my ($face, $info) = each %$faces) {	3665	while (my ($face, $info) = each %$faces) {
3431	next unless $info->{smooth};	3666	next unless $info->{smooth};
3432		3667
…		…
3437	cf::face::set_smooth $idx, $smooth;	3672	cf::face::set_smooth $idx, $smooth;
3438	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3673	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3439	} else {	3674	} else {
3440	error "smooth face '$info->{smooth}' not found for face '$face'";	3675	error "smooth face '$info->{smooth}' not found for face '$face'";
3441	}	3676	}
3442
3443	cf::cede_to_tick;
3444	}	3677	}
3445	}	3678	}
3446		3679
3447	{	3680	{
3448	my $anims = $facedata->{animinfo};	3681	my $anims = $facedata->{animinfo};
3449		3682
3450	while (my ($anim, $info) = each %$anims) {	3683	while (my ($anim, $info) = each %$anims) {
3451	cf::anim::set $anim, $info->{frames}, $info->{facings};	3684	cf::anim::set $anim, $info->{frames}, $info->{facings};
3452	cf::cede_to_tick;
3453	}	3685	}
3454		3686
3455	cf::anim::invalidate_all; # d'oh	3687	cf::anim::invalidate_all; # d'oh
3456	}	3688	}
3457		3689
3458	{	3690	{
3459	my $res = $facedata->{resource};	3691	my $res = $facedata->{resource};
3460		3692
3461	while (my ($name, $info) = each %$res) {	3693	while (my ($name, $info) = each %$res) {
3462	if (defined $info->{type}) {	3694	if (defined (my $type = $info->{type})) {
		3695	# TODO: different hash - must free and use new index, or cache ixface data queue
3463	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3696	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3464		3697
3465	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3466	cf::face::set_type $idx, $info->{type};	3698	cf::face::set_type $idx, $type;
		3699	cf::face::set_csum $idx, 0, $info->{hash};
		3700	$cf::face::SIZE[0][$idx] = $info->{size};
		3701	$cf::face::FOFS[0][$idx] = $info->{fofs};
		3702	$cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3703	$cf::face::HASH{$info->{hash}} = $idx;
3467	} else {	3704	} else {
3468	$RESOURCE{$name} = $info; # unused	3705	# $RESOURCE{$name} = $info; # unused
3469	}	3706	}
3470
3471	cf::cede_to_tick;
3472	}	3707	}
3473	}	3708	}
		3709
		3710	($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
		3711
		3712	# HACK to clear player env face cache, we need some signal framework
		3713	# for this (global event?)
		3714	%ext::player_env::MUSIC_FACE_CACHE = ();
		3715
		3716	# END ATOMIC
		3717
		3718	cf::debug "facedata atomic update time ", EV::time - $t1;
3474		3719
3475	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3720	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
		3721
		3722	aio_close $fh if $fh; # close old facedata
3476		3723
3477	1	3724	1
3478	}	3725	}
3479		3726
3480	register_exticmd fx_want => sub {	3727	register_exticmd fx_want => sub {
…		…
3491	my $status = load_resource_file_ $_[0];	3738	my $status = load_resource_file_ $_[0];
3492	get_slot 0.1, 100;	3739	get_slot 0.1, 100;
3493	cf::arch::commit_load;	3740	cf::arch::commit_load;
3494		3741
3495	$status	3742	$status
		3743	}
		3744
		3745	sub reload_exp_table {
		3746	_reload_exp_table;
		3747
		3748	cf::face::set
		3749	"res/exp_table" => FT_RSRC,
		3750	JSON::XS->new->utf8->canonical->encode (
		3751	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3752	);
		3753	}
		3754
		3755	sub reload_materials {
		3756	_reload_materials;
3496	}	3757	}
3497		3758
3498	sub reload_regions {	3759	sub reload_regions {
3499	# HACK to clear player env face cache, we need some signal framework	3760	# HACK to clear player env face cache, we need some signal framework
3500	# for this (global event?)	3761	# for this (global event?)
…		…
3508	if exists $_->{match};	3769	if exists $_->{match};
3509	}	3770	}
3510	}	3771	}
3511		3772
3512	sub reload_facedata {	3773	sub reload_facedata {
3513	load_facedata "$DATADIR/facedata"	3774	load_facedata $DATADIR
3514	or die "unable to load facedata\n";	3775	or die "unable to load facedata\n";
3515	}	3776	}
3516		3777
3517	sub reload_archetypes {	3778	sub reload_archetypes {
3518	load_resource_file "$DATADIR/archetypes"	3779	load_resource_file "$DATADIR/archetypes"
3519	or die "unable to load archetypes\n";	3780	or die "unable to load archetypes\n";
		3781
		3782	cf::face::set
		3783	"res/skill_info" => FT_RSRC,
		3784	JSON::XS->new->utf8->canonical->encode (
		3785	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3786	);
		3787
		3788	cf::face::set
		3789	"res/spell_paths" => FT_RSRC,
		3790	JSON::XS->new->utf8->canonical->encode (
		3791	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3792	);
		3793
		3794	# command completion
		3795	my @commands;
		3796
		3797	for (0..cf::arch::skillvec_size - 1) {
		3798	my $skill = cf::arch::skillvec $_;
		3799	my $name = $skill->name;
		3800	my $flags = cf::skill_flags $skill->subtype;
		3801
		3802	push @commands, "ready_skill $name" if $flags & (SF_COMBAT | SF_RANGED | SF_GRACE);
		3803	push @commands, "use_skill $name" if $flags & (SF_USE | SF_AUTARK | SF_GRACE);
		3804	}
		3805
		3806	cf::client::set_command_face skill => \@commands;
3520	}	3807	}
3521		3808
3522	sub reload_treasures {	3809	sub reload_treasures {
3523	load_resource_file "$DATADIR/treasures"	3810	load_resource_file "$DATADIR/treasures"
3524	or die "unable to load treasurelists\n";	3811	or die "unable to load treasurelists\n";
3525	}	3812	}
3526		3813
3527	sub reload_sound {	3814	sub reload_sound {
3528	trace "loading sound config from $DATADIR/sound\n";	3815	trace "loading sound config from $DATADIR/sound\n";
3529		3816
3530	0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3531	or die "$DATADIR/sound $!";
3532
3533	my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);	3817	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3534		3818
3535	for (0 .. SOUND_CAST_SPELL_0 - 1) {	3819	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3536	my $sound = $soundconf->{compat}[$_]	3820	my $sound = $soundconf->{compat}[$_]
3537	or next;	3821	or next;
3538		3822
…		…
3548	}	3832	}
3549		3833
3550	sub reload_resources {	3834	sub reload_resources {
3551	trace "reloading resource files...\n";	3835	trace "reloading resource files...\n";
3552		3836
3553	reload_exp_table;
3554	reload_materials;	3837	reload_materials;
3555	reload_facedata;	3838	reload_facedata;
		3839	reload_exp_table;
3556	reload_sound;	3840	reload_sound;
3557	reload_archetypes;	3841	reload_archetypes;
3558	reload_regions;	3842	reload_regions;
3559	reload_treasures;	3843	reload_treasures;
3560		3844
…		…
3562	}	3846	}
3563		3847
3564	sub reload_config {	3848	sub reload_config {
3565	trace "reloading config file...\n";	3849	trace "reloading config file...\n";
3566		3850
3567	0 < aio_load "$CONFDIR/config", my $config	3851	my $config = load_file "$CONFDIR/config";
3568	or die "$CONFDIR/config: $!";
3569
3570	utf8::decode $config;	3852	utf8::decode $config;
3571	*CFG = yaml_load $config;	3853	*CFG = decode_yaml $config;
3572		3854
3573	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];	3855	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3574		3856
3575	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3857	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3576	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3858	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
3614		3896
3615	sub main {	3897	sub main {
3616	cf::init_globals; # initialise logging	3898	cf::init_globals; # initialise logging
3617		3899
3618	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3900	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3619	LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3901	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3620	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3902	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3621	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3903	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3622		3904
3623	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3905	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3624		3906
3625	# we must not ever block the main coroutine	3907	# we must not ever block the main coroutine
3626	local $Coro::idle = sub {	3908	$Coro::idle = sub {
3627	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3909	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3628	(async {	3910	(async {
3629	$Coro::current->{desc} = "IDLE BUG HANDLER";	3911	$Coro::current->{desc} = "IDLE BUG HANDLER";
3630	EV::loop EV::LOOP_ONESHOT;	3912	EV::loop EV::LOOP_ONESHOT;
3631	})->prio (Coro::PRIO_MAX);	3913	})->prio (Coro::PRIO_MAX);
…		…
3634	evthread_start IO::AIO::poll_fileno;	3916	evthread_start IO::AIO::poll_fileno;
3635		3917
3636	cf::sync_job {	3918	cf::sync_job {
3637	cf::incloader::init ();	3919	cf::incloader::init ();
3638		3920
		3921	db_init;
		3922
3639	cf::init_anim;	3923	cf::init_anim;
3640	cf::init_attackmess;	3924	cf::init_attackmess;
3641	cf::init_dynamic;	3925	cf::init_dynamic;
3642		3926
3643	cf::load_settings;	3927	cf::load_settings;
3644		3928
3645	reload_resources;	3929	reload_resources;
3646	reload_config;	3930	reload_config;
3647	db_init;
3648		3931
3649	cf::init_uuid;	3932	cf::init_uuid;
3650	cf::init_signals;	3933	cf::init_signals;
3651	cf::init_skills;	3934	cf::init_skills;
3652		3935
…		…
3660		3943
3661	# no (long-running) fork's whatsoever before this point(!)	3944	# no (long-running) fork's whatsoever before this point(!)
3662	use POSIX ();	3945	use POSIX ();
3663	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3946	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3664		3947
3665	(pop @POST_INIT)->(0) while @POST_INIT;	3948	cf::_post_init 0;
3666	};	3949	};
3667		3950
3668	cf::object::thawer::errors_are_fatal 0;	3951	cf::object::thawer::errors_are_fatal 0;
3669	info "parse errors in files are no longer fatal from this point on.\n";	3952	info "parse errors in files are no longer fatal from this point on.\n";
3670		3953
3671	my $free_main; $free_main = EV::idle sub {	3954	AE::postpone {
3672	undef $free_main;
3673	undef &main; # free gobs of memory :)	3955	undef &main; # free gobs of memory :)
3674	};	3956	};
3675		3957
3676	goto &main_loop;	3958	goto &main_loop;
3677	}	3959	}
…		…
3834		4116
3835	cf::write_runtime_sync; # external watchdog should not bark	4117	cf::write_runtime_sync; # external watchdog should not bark
3836		4118
3837	trace "emergency_perl_save: flushing outstanding aio requests";	4119	trace "emergency_perl_save: flushing outstanding aio requests";
3838	while (IO::AIO::nreqs || BDB::nreqs) {	4120	while (IO::AIO::nreqs || BDB::nreqs) {
3839	Coro::EV::timer_once 0.01; # let the sync_job do it's thing	4121	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3840	}	4122	}
3841		4123
3842	cf::write_runtime_sync; # external watchdog should not bark	4124	cf::write_runtime_sync; # external watchdog should not bark
3843	};	4125	};
3844		4126
…		…
3893		4175
3894	my $t1 = AE::time;	4176	my $t1 = AE::time;
3895		4177
3896	while ($RELOAD) {	4178	while ($RELOAD) {
3897	cf::get_slot 0.1, -1, "reload_perl";	4179	cf::get_slot 0.1, -1, "reload_perl";
3898	info "reloading...";	4180	info "perl_reload: reloading...";
3899		4181
3900	trace "entering sync_job";	4182	trace "perl_reload: entering sync_job";
3901		4183
3902	cf::sync_job {	4184	cf::sync_job {
3903	#cf::emergency_save;	4185	#cf::emergency_save;
3904		4186
3905	trace "cancelling all extension coros";	4187	trace "perl_reload: cancelling all extension coros";
3906	$_->cancel for values %EXT_CORO;	4188	$_->cancel for values %EXT_CORO;
3907	%EXT_CORO = ();	4189	%EXT_CORO = ();
3908		4190
3909	trace "removing commands";	4191	trace "perl_reload: removing commands";
3910	%COMMAND = ();	4192	%COMMAND = ();
3911		4193
3912	trace "removing ext/exti commands";	4194	trace "perl_reload: removing ext/exti commands";
3913	%EXTCMD = ();	4195	%EXTCMD = ();
3914	%EXTICMD = ();	4196	%EXTICMD = ();
3915		4197
3916	trace "unloading/nuking all extensions";	4198	trace "perl_reload: unloading/nuking all extensions";
3917	for my $pkg (@EXTS) {	4199	for my $pkg (@EXTS) {
3918	trace "... unloading $pkg";	4200	trace "... unloading $pkg";
3919		4201
3920	if (my $cb = $pkg->can ("unload")) {	4202	if (my $cb = $pkg->can ("unload")) {
3921	eval {	4203	eval {
…		…
3926		4208
3927	trace "... clearing $pkg";	4209	trace "... clearing $pkg";
3928	clear_package $pkg;	4210	clear_package $pkg;
3929	}	4211	}
3930		4212
3931	trace "unloading all perl modules loaded from $LIBDIR";	4213	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3932	while (my ($k, $v) = each %INC) {	4214	while (my ($k, $v) = each %INC) {
3933	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4215	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3934		4216
3935	trace "... unloading $k";	4217	trace "... unloading $k";
3936	delete $INC{$k};	4218	delete $INC{$k};
…		…
3943	}	4225	}
3944		4226
3945	clear_package $k;	4227	clear_package $k;
3946	}	4228	}
3947		4229
3948	trace "getting rid of safe::, as good as possible";	4230	trace "perl_reload: getting rid of safe::, as good as possible";
3949	clear_package "safe::$_"	4231	clear_package "safe::$_"
3950	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4232	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3951		4233
3952	trace "unloading cf.pm \"a bit\"";	4234	trace "perl_reload: unloading cf.pm \"a bit\"";
3953	delete $INC{"cf.pm"};	4235	delete $INC{"cf.pm"};
3954	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4236	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3955		4237
3956	# don't, removes xs symbols, too,	4238	# don't, removes xs symbols, too,
3957	# and global variables created in xs	4239	# and global variables created in xs
3958	#clear_package __PACKAGE__;	4240	#clear_package __PACKAGE__;
3959		4241
3960	info "unload completed, starting to reload now";	4242	info "perl_reload: unload completed, starting to reload now";
3961		4243
3962	trace "reloading cf.pm";	4244	trace "perl_reload: reloading cf.pm";
3963	require cf;	4245	require cf;
3964	cf::_connect_to_perl_1;	4246	cf::_connect_to_perl_1;
3965		4247
3966	trace "loading config and database again";	4248	trace "perl_reload: loading config and database again";
3967	cf::reload_config;	4249	cf::reload_config;
3968		4250
3969	trace "loading extensions";	4251	trace "perl_reload: loading extensions";
3970	cf::load_extensions;	4252	cf::load_extensions;
3971		4253
3972	if ($REATTACH_ON_RELOAD) {	4254	if ($REATTACH_ON_RELOAD) {
3973	trace "reattaching attachments to objects/players";	4255	trace "perl_reload: reattaching attachments to objects/players";
3974	_global_reattach; # objects, sockets	4256	_global_reattach; # objects, sockets
3975	trace "reattaching attachments to maps";	4257	trace "perl_reload: reattaching attachments to maps";
3976	reattach $_ for values %MAP;	4258	reattach $_ for values %MAP;
3977	trace "reattaching attachments to players";	4259	trace "perl_reload: reattaching attachments to players";
3978	reattach $_ for values %PLAYER;	4260	reattach $_ for values %PLAYER;
3979	}	4261	}
3980		4262
3981	trace "running post_init jobs";	4263	cf::_post_init 1;
3982	(pop @POST_INIT)->(1) while @POST_INIT;
3983		4264
3984	trace "leaving sync_job";	4265	trace "perl_reload: leaving sync_job";
3985		4266
3986	1	4267	1
3987	} or do {	4268	} or do {
3988	error $@;	4269	error $@;
3989	cf::cleanup "error while reloading, exiting.";	4270	cf::cleanup "perl_reload: error, exiting.";
3990	};	4271	};
3991		4272
3992	info "reloaded";
3993	--$RELOAD;	4273	--$RELOAD;
3994	}	4274	}
3995		4275
3996	$t1 = AE::time - $t1;	4276	$t1 = AE::time - $t1;
3997	info "reload completed in ${t1}s\n";	4277	info "perl_reload: completed in ${t1}s\n";
3998	};	4278	};
3999		4279
4000	our $RELOAD_WATCHER; # used only during reload	4280	our $RELOAD_WATCHER; # used only during reload
4001		4281
4002	sub reload_perl() {	4282	sub reload_perl() {
…		…
4027		4307
4028	#############################################################################	4308	#############################################################################
4029		4309
4030	my $bug_warning = 0;	4310	my $bug_warning = 0;
4031		4311
4032	our @WAIT_FOR_TICK;
4033	our @WAIT_FOR_TICK_BEGIN;
4034
4035	sub wait_for_tick() {	4312	sub wait_for_tick() {
4036	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4313	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4037		4314
4038	my $signal = new Coro::Signal;	4315	$WAIT_FOR_TICK->wait;
4039	push @WAIT_FOR_TICK, $signal;
4040	$signal->wait;
4041	}	4316	}
4042		4317
4043	sub wait_for_tick_begin() {	4318	sub wait_for_tick_begin() {
4044	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4319	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4045		4320
4046	my $signal = new Coro::Signal;	4321	my $signal = new Coro::Signal;
4047	push @WAIT_FOR_TICK_BEGIN, $signal;	4322	push @WAIT_FOR_TICK_BEGIN, $signal;
4048	$signal->wait;	4323	$signal->wait;
4049	}	4324	}
…		…
4053	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4328	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4054	unless ++$bug_warning > 10;	4329	unless ++$bug_warning > 10;
4055	return;	4330	return;
4056	}	4331	}
4057		4332
4058	cf::server_tick; # one server iteration	4333	cf::one_tick; # one server iteration
4059		4334
4060	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#	4335	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4061		4336
4062	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4337	if ($NOW >= $NEXT_RUNTIME_WRITE) {
4063	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4338	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
…		…
4069	}	4344	}
4070		4345
4071	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4346	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4072	$sig->send;	4347	$sig->send;
4073	}	4348	}
4074	while (my $sig = shift @WAIT_FOR_TICK) {	4349	$WAIT_FOR_TICK->broadcast;
4075	$sig->send;
4076	}
4077		4350
4078	$LOAD = ($NOW - $TICK_START) / $TICK;	4351	$LOAD = ($NOW - $TICK_START) / $TICK;
4079	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4352	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4080		4353
4081	if (0) {	4354	if (0) {
…		…
4087	}	4360	}
4088	}	4361	}
4089		4362
4090	{	4363	{
4091	# configure BDB	4364	# configure BDB
		4365	info "initialising database";
4092		4366
4093	BDB::min_parallel 16;	4367	BDB::min_parallel 16;
4094	BDB::max_poll_reqs $TICK * 0.1;	4368	BDB::max_poll_reqs $TICK * 0.1;
4095	$AnyEvent::BDB::WATCHER->priority (1);	4369	#$AnyEvent::BDB::WATCHER->priority (1);
4096		4370
4097	unless ($DB_ENV) {	4371	unless ($DB_ENV) {
4098	$DB_ENV = BDB::db_env_create;	4372	$DB_ENV = BDB::db_env_create;
4099	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4373	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4100	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4374	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
4125	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4399	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4126	};	4400	};
4127	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4401	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4128	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4402	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4129	};	4403	};
		4404
		4405	info "database initialised";
4130	}	4406	}
4131		4407
4132	{	4408	{
4133	# configure IO::AIO	4409	# configure IO::AIO
4134		4410
		4411	info "initialising aio";
4135	IO::AIO::min_parallel 8;	4412	IO::AIO::min_parallel 8;
4136	IO::AIO::max_poll_time $TICK * 0.1;	4413	IO::AIO::max_poll_time $TICK * 0.1;
4137	undef $AnyEvent::AIO::WATCHER;	4414	undef $AnyEvent::AIO::WATCHER;
		4415	info "aio initialised";
4138	}	4416	}
4139		4417
4140	my $_log_backtrace;	4418	our $_log_backtrace;
		4419	our $_log_backtrace_last;
4141		4420
4142	sub _log_backtrace {	4421	sub _log_backtrace {
4143	my ($msg, @addr) = @_;	4422	my ($msg, @addr) = @_;
4144		4423
4145	$msg =~ s/\n//;	4424	$msg =~ s/\n$//;
4146		4425
		4426	if ($_log_backtrace_last eq $msg) {
		4427	LOG llevInfo, "[ABT] $msg\n";
		4428	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4147	# limit the # of concurrent backtraces	4429	# limit the # of concurrent backtraces
4148	if ($_log_backtrace < 2) {	4430	} elsif ($_log_backtrace < 2) {
		4431	$_log_backtrace_last = $msg;
4149	++$_log_backtrace;	4432	++$_log_backtrace;
4150	my $perl_bt = Carp::longmess $msg;	4433	my $perl_bt = Carp::longmess $msg;
4151	async {	4434	async {
4152	$Coro::current->{desc} = "abt $msg";	4435	$Coro::current->{desc} = "abt $msg";
4153		4436
…		…
4173	LOG llevInfo, "[ABT] $_\n" for @bt;	4456	LOG llevInfo, "[ABT] $_\n" for @bt;
4174	--$_log_backtrace;	4457	--$_log_backtrace;
4175	};	4458	};
4176	} else {	4459	} else {
4177	LOG llevInfo, "[ABT] $msg\n";	4460	LOG llevInfo, "[ABT] $msg\n";
4178	LOG llevInfo, "[ABT] [suppressed]\n";	4461	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4179	}	4462	}
4180	}	4463	}
4181		4464
4182	# load additional modules	4465	# load additional modules
4183	require "cf/$_.pm" for @EXTRA_MODULES;	4466	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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