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.548 by root, Mon May 10 21:40:22 2010 UTC vs.
Revision 1.602 by root, Sun Nov 11 18:21:21 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 les 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.
…		…
484	}	613	}
485	}	614	}
486		615
487	if (@SLOT_QUEUE) {	616	if (@SLOT_QUEUE) {
488	# we do not use wait_for_tick() as it returns immediately when tick is inactive	617	# we do not use wait_for_tick() as it returns immediately when tick is inactive
489	push @cf::WAIT_FOR_TICK, $signal;	618	$WAIT_FOR_TICK->wait;
490	$signal->wait;
491	} else {	619	} else {
492	$busy = 0;	620	$busy = 0;
493	Coro::schedule;	621	Coro::schedule;
494	}	622	}
495	}	623	}
…		…
750		878
751	my @data;	879	my @data;
752	my $md5;	880	my $md5;
753		881
754	for (0 .. $#$src) {	882	for (0 .. $#$src) {
755	0 <= aio_load $src->[$_], $data[$_]	883	$data[$_] = load_file $src->[$_];
756	or Carp::croak "$src->[$_]: $!";
757	}	884	}
758		885
759	# if processing is expensive, check	886	# if processing is expensive, check
760	# checksum first	887	# checksum first
761	if (1) {	888	if (1) {
…		…
774		901
775	return db_get cache => "$id/data";	902	return db_get cache => "$id/data";
776	}	903	}
777	}	904	}
778		905
779	my $t1 = Time::HiRes::time;	906	my $t1 = EV::time;
780	my $data = $process->(\@data);	907	my $data = $process->(\@data);
781	my $t2 = Time::HiRes::time;	908	my $t2 = EV::time;
782		909
783	info "cache: '$id' processed in ", $t2 - $t1, "s\n";	910	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
784		911
785	db_put cache => "$id/data", $data;	912	db_put cache => "$id/data", $data;
786	db_put cache => "$id/md5" , $md5;	913	db_put cache => "$id/md5" , $md5;
…		…
1306	=cut	1433	=cut
1307		1434
1308	#############################################################################	1435	#############################################################################
1309	# command handling &c	1436	# command handling &c
1310		1437
1311	=item cf::register_command $name => \&callback($ob,$args);	1438	=item cf::register_command $name => \&callback($ob,$args)
1312		1439
1313	Register a callback for execution when the client sends the user command	1440	Register a callback for execution when the client sends the user command
1314	$name.	1441	$name.
1315		1442
1316	=cut	1443	=cut
…		…
1322	#warn "registering command '$name/$time' to '$caller'";	1449	#warn "registering command '$name/$time' to '$caller'";
1323		1450
1324	push @{ $COMMAND{$name} }, [$caller, $cb];	1451	push @{ $COMMAND{$name} }, [$caller, $cb];
1325	}	1452	}
1326		1453
1327	=item cf::register_extcmd $name => \&callback($pl,$packet);	1454	=item cf::register_extcmd $name => \&callback($pl,@args)
1328		1455
1329	Register a callback for execution when the client sends an (synchronous)	1456	Register a callback for execution when the client sends an (synchronous)
1330	extcmd packet. Ext commands will be processed in the order they are	1457	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	1458	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	1459	the logged-in player. Ext commands can only be processed after a player
1333	has logged in successfully.	1460	has logged in successfully.
1334		1461
1335	If the callback returns something, it is sent back as if reply was being	1462	The values will be sent back to the client.
1336	called.
1337		1463
		1464	=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
		1465
		1466	Same as C<cf::register_extcmd>, but instead of returning values, the
		1467	callback needs to clal the C<$reply> function.
		1468
1338	=item cf::register_exticmd $name => \&callback($ns,$packet);	1469	=item cf::register_exticmd $name => \&callback($ns,@args)
1339		1470
1340	Register a callback for execution when the client sends an (asynchronous)	1471	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	1472	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	1473	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	1474	is a client socket. Exti commands can be received anytime, even before
1344	log-in.	1475	log-in.
1345		1476
1346	If the callback returns something, it is sent back as if reply was being	1477	The values will be sent back to the client.
1347	called.
1348		1478
1349	=cut	1479	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1350		1480
		1481	Same as C<cf::register_extcmd>, but instead of returning values, the
		1482	callback needs to clal the C<$reply> function.
		1483
		1484	=cut
		1485
1351	sub register_extcmd {	1486	sub register_extcmd($$) {
1352	my ($name, $cb) = @_;	1487	my ($name, $cb) = @_;
1353		1488
1354	$EXTCMD{$name} = $cb;	1489	$EXTCMD{$name} = $cb;
1355	}	1490	}
1356		1491
1357	sub register_exticmd {	1492	sub register_async_extcmd($$) {
1358	my ($name, $cb) = @_;	1493	my ($name, $cb) = @_;
1359		1494
		1495	$EXTACMD{$name} = $cb;
		1496	}
		1497
		1498	sub register_exticmd($$) {
		1499	my ($name, $cb) = @_;
		1500
1360	$EXTICMD{$name} = $cb;	1501	$EXTICMD{$name} = $cb;
		1502	}
		1503
		1504	sub register_async_exticmd($$) {
		1505	my ($name, $cb) = @_;
		1506
		1507	$EXTIACMD{$name} = $cb;
1361	}	1508	}
1362		1509
1363	use File::Glob ();	1510	use File::Glob ();
1364		1511
1365	cf::player->attach (	1512	cf::player->attach (
…		…
1379	my ($pl, $buf) = @_;	1526	my ($pl, $buf) = @_;
1380		1527
1381	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1528	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1382		1529
1383	if (ref $msg) {	1530	if (ref $msg) {
1384	my ($type, $reply, @payload) =	1531	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		1532
1389	my @reply;
1390
1391	if (my $cb = $EXTCMD{$type}) {	1533	if (my $cb = $EXTACMD{$type}) {
		1534	$cb->(
		1535	$pl,
		1536	sub {
		1537	$pl->ext_msg ("reply-$reply", @_)
		1538	if $reply;
		1539	},
		1540	@payload
		1541	);
		1542	} else {
		1543	my @reply;
		1544
		1545	if (my $cb = $EXTCMD{$type}) {
1392	@reply = $cb->($pl, @payload);	1546	@reply = $cb->($pl, @payload);
		1547	}
		1548
		1549	$pl->ext_msg ("reply-$reply", @reply)
		1550	if $reply;
1393	}	1551	}
1394
1395	$pl->ext_reply ($reply, @reply)
1396	if $reply;
1397		1552
1398	} else {	1553	} else {
1399	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1554	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1400	}	1555	}
1401		1556
…		…
1414	};	1569	};
1415		1570
1416	$grp	1571	$grp
1417	}	1572	}
1418		1573
		1574	sub _ext_cfg_reg($$$$) {
		1575	my ($rvar, $varname, $cfgname, $default) = @_;
		1576
		1577	$cfgname = lc $varname
		1578	unless length $cfgname;
		1579
		1580	$EXT_CFG{$cfgname} = [$rvar, $default];
		1581
		1582	$$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
		1583	}
		1584
1419	sub load_extensions {	1585	sub load_extensions {
1420	info "loading extensions...";	1586	info "loading extensions...";
		1587
		1588	%EXT_CFG = ();
1421		1589
1422	cf::sync_job {	1590	cf::sync_job {
1423	my %todo;	1591	my %todo;
1424		1592
1425	for my $path (<$LIBDIR/*.ext>) {	1593	for my $path (<$LIBDIR/*.ext>) {
…		…
1468	unless exists $done{$_};	1636	unless exists $done{$_};
1469	}	1637	}
1470		1638
1471	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1639	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1472		1640
		1641	my $source = $v->{source};
		1642
		1643	# support "CONF varname :confname = default" pseudo-statements
		1644	$source =~ s{
		1645	^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
		1646	}{
		1647	"our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
		1648	}gmxe;
		1649
1473	my $active = eval $v->{source};	1650	my $active = eval $source;
1474		1651
1475	if (length $@) {	1652	if (length $@) {
1476	error "$v->{path}: $@\n";	1653	error "$v->{path}: $@\n";
1477		1654
1478	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1655	cf::cleanup "mandatory extension '$k' failed to load, exiting."
…		…
1495		1672
1496	while (my ($k, $v) = each %todo) {	1673	while (my ($k, $v) = each %todo) {
1497	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1674	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1498	if exists $v->{meta}{mandatory};	1675	if exists $v->{meta}{mandatory};
1499	}	1676	}
		1677
		1678	last;
1500	}	1679	}
1501	}	1680	}
1502	};	1681	};
1503	}	1682	}
1504		1683
…		…
1662	my $name = $pl->ob->name;	1841	my $name = $pl->ob->name;
1663		1842
1664	$pl->{deny_save} = 1;	1843	$pl->{deny_save} = 1;
1665	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1844	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1666		1845
1667	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1846	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1668	$pl->deactivate;	1847	$pl->deactivate;
1669		1848
1670	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1849	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
		1850	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1671	ext::highscore::check ($pl->ob);	1851	ext::highscore::check ($pl->ob);
1672		1852
1673	$pl->invoke (cf::EVENT_PLAYER_QUIT);
1674	$pl->ns->destroy if $pl->ns;	1853	$pl->ns->destroy if $pl->ns;
1675		1854
1676	my $path = playerdir $pl;	1855	my $path = playerdir $pl;
1677	my $temp = "$path~$cf::RUNTIME~deleting~";	1856	my $temp = "$path~$cf::RUNTIME~deleting~";
1678	aio_rename $path, $temp;	1857	aio_rename $path, $temp;
…		…
1764		1943
1765	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1944	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1766		1945
1767	Expand deliantra pod fragments into protocol xml.	1946	Expand deliantra pod fragments into protocol xml.
1768		1947
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)	1948	=item $player->ext_msg ($type, @msg)
1782		1949
1783	Sends an ext event to the client.	1950	Sends an ext event to the client.
1784		1951
1785	=cut	1952	=cut
…		…
1844	sub generate_random_map {	2011	sub generate_random_map {
1845	my ($self, $rmp) = @_;	2012	my ($self, $rmp) = @_;
1846		2013
1847	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	2014	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1848		2015
1849	# mit "rum" bekleckern, nicht
1850	$self->_create_random_map (	2016	$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	}	2017	}
1864		2018
1865	=item cf::map->register ($regex, $prio)	2019	=item cf::map->register ($regex, $prio)
1866		2020
1867	Register a handler for the map path matching the given regex at the	2021	Register a handler for the map path matching the given regex at the
…		…
1918	$base =~ s{[^/]+/?$}{};	2072	$base =~ s{[^/]+/?$}{};
1919	$path = "$base/$path";	2073	$path = "$base/$path";
1920	}	2074	}
1921		2075
1922	for ($path) {	2076	for ($path) {
1923	redo if s{//}{/};
1924	redo if s{/\.?/}{/};	2077	redo if s{/\.?/}{/};
1925	redo if s{/[^/]+/\.\./}{/};	2078	redo if s{/[^/]+/\.\./}{/};
1926	}	2079	}
1927		2080
1928	$path	2081	$path
…		…
1946		2099
1947	Carp::cluck "unable to resolve path '$path' (base '$base')";	2100	Carp::cluck "unable to resolve path '$path' (base '$base')";
1948	()	2101	()
1949	}	2102	}
1950		2103
		2104	# may re-bless or do other evil things
1951	sub init {	2105	sub init {
1952	my ($self) = @_;	2106	my ($self) = @_;
1953		2107
1954	$self	2108	$self
1955	}	2109	}
…		…
2020	$self->{load_path} = $path;	2174	$self->{load_path} = $path;
2021		2175
2022	1	2176	1
2023	}	2177	}
2024		2178
		2179	# used to laod the header of an original map
2025	sub load_header_orig {	2180	sub load_header_orig {
2026	my ($self) = @_;	2181	my ($self) = @_;
2027		2182
2028	$self->load_header_from ($self->load_path)	2183	$self->load_header_from ($self->load_path)
2029	}	2184	}
2030		2185
		2186	# used to laod the header of an instantiated map
2031	sub load_header_temp {	2187	sub load_header_temp {
2032	my ($self) = @_;	2188	my ($self) = @_;
2033		2189
2034	$self->load_header_from ($self->save_path)	2190	$self->load_header_from ($self->save_path)
2035	}	2191	}
2036		2192
		2193	# called after loading the header from an instantiated map
2037	sub prepare_temp {	2194	sub prepare_temp {
2038	my ($self) = @_;	2195	my ($self) = @_;
2039		2196
2040	$self->last_access ((delete $self->{last_access})	2197	$self->last_access ((delete $self->{last_access})
2041	|| $cf::RUNTIME); #d#	2198	|| $cf::RUNTIME); #d#
2042	# safety	2199	# safety
2043	$self->{instantiate_time} = $cf::RUNTIME	2200	$self->{instantiate_time} = $cf::RUNTIME
2044	if $self->{instantiate_time} > $cf::RUNTIME;	2201	if $self->{instantiate_time} > $cf::RUNTIME;
2045	}	2202	}
2046		2203
		2204	# called after loading the header from an original map
2047	sub prepare_orig {	2205	sub prepare_orig {
2048	my ($self) = @_;	2206	my ($self) = @_;
2049		2207
2050	$self->{load_original} = 1;	2208	$self->{load_original} = 1;
2051	$self->{instantiate_time} = $cf::RUNTIME;	2209	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2077	sub find {	2235	sub find {
2078	my ($path, $origin) = @_;	2236	my ($path, $origin) = @_;
2079		2237
2080	cf::cede_to_tick;	2238	cf::cede_to_tick;
2081		2239
2082	$path = normalise $path, $origin && $origin->path;	2240	$path = normalise $path, $origin;
2083		2241
2084	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2242	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2085	my $guard2 = cf::lock_acquire "map_find:$path";	2243	my $guard2 = cf::lock_acquire "map_find:$path";
2086		2244
2087	$cf::MAP{$path} || do {	2245	$cf::MAP{$path} || do {
…		…
2118		2276
2119	{	2277	{
2120	my $guard = cf::lock_acquire "map_data:$path";	2278	my $guard = cf::lock_acquire "map_data:$path";
2121		2279
2122	return unless $self->valid;	2280	return unless $self->valid;
2123	return unless $self->in_memory == cf::MAP_SWAPPED;	2281	return unless $self->state == cf::MAP_SWAPPED;
2124
2125	$self->in_memory (cf::MAP_LOADING);
2126		2282
2127	$self->alloc;	2283	$self->alloc;
2128		2284
2129	$self->pre_load;	2285	$self->pre_load;
2130	cf::cede_to_tick;	2286	cf::cede_to_tick;
2131		2287
		2288	if (exists $self->{load_path}) {
2132	my $f = new_from_file cf::object::thawer $self->{load_path};	2289	my $f = new_from_file cf::object::thawer $self->{load_path};
2133	$f->skip_block;	2290	$f->skip_block;
2134	$self->_load_objects ($f)	2291	$self->_load_objects ($f)
2135	or return;	2292	or return;
2136		2293
2137	$self->post_load_original	2294	$self->post_load_original
2138	if delete $self->{load_original};	2295	if delete $self->{load_original};
2139		2296
2140	if (my $uniq = $self->uniq_path) {	2297	if (my $uniq = $self->uniq_path) {
2141	utf8::encode $uniq;	2298	utf8::encode $uniq;
2142	unless (aio_stat $uniq) {	2299	unless (aio_stat $uniq) {
2143	if (my $f = new_from_file cf::object::thawer $uniq) {	2300	if (my $f = new_from_file cf::object::thawer $uniq) {
2144	$self->clear_unique_items;	2301	$self->clear_unique_items;
2145	$self->_load_objects ($f);	2302	$self->_load_objects ($f);
2146	$f->resolve_delayed_derefs;	2303	$f->resolve_delayed_derefs;
		2304	}
2147	}	2305	}
2148	}	2306	}
2149	}
2150		2307
2151	$f->resolve_delayed_derefs;	2308	$f->resolve_delayed_derefs;
		2309	} else {
		2310	$self->post_load_original
		2311	if delete $self->{load_original};
		2312	}
		2313
		2314	$self->state (cf::MAP_INACTIVE);
2152		2315
2153	cf::cede_to_tick;	2316	cf::cede_to_tick;
2154	# now do the right thing for maps	2317	# now do the right thing for maps
2155	$self->link_multipart_objects;	2318	$self->link_multipart_objects;
2156	$self->difficulty ($self->estimate_difficulty)	2319	$self->difficulty ($self->estimate_difficulty)
…		…
2160	unless ($self->{deny_activate}) {	2323	unless ($self->{deny_activate}) {
2161	$self->decay_objects;	2324	$self->decay_objects;
2162	$self->fix_auto_apply;	2325	$self->fix_auto_apply;
2163	$self->update_buttons;	2326	$self->update_buttons;
2164	cf::cede_to_tick;	2327	cf::cede_to_tick;
2165	$self->activate;	2328	#$self->activate; # no longer activate maps automatically
2166	}	2329	}
2167		2330
2168	$self->{last_save} = $cf::RUNTIME;	2331	$self->{last_save} = $cf::RUNTIME;
2169	$self->last_access ($cf::RUNTIME);	2332	$self->last_access ($cf::RUNTIME);
2170
2171	$self->in_memory (cf::MAP_ACTIVE);
2172	}	2333	}
2173		2334
2174	$self->post_load;	2335	$self->post_load;
		2336
		2337	1
2175	}	2338	}
2176		2339
2177	# customize the map for a given player, i.e.	2340	# customize the map for a given player, i.e.
2178	# return the _real_ map. used by e.g. per-player	2341	# return the _real_ map. used by e.g. per-player
2179	# maps to change the path to ~playername/mappath	2342	# maps to change the path to ~playername/mappath
…		…
2187	# if $self->per_party;	2350	# if $self->per_party;
2188		2351
2189	$self	2352	$self
2190	}	2353	}
2191		2354
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 {	2355	sub find_sync {
2220	my ($path, $origin) = @_;	2356	my ($path, $origin) = @_;
2221		2357
		2358	# it's a bug to call this from the main context
2222	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"	2359	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2223	if $Coro::current == $Coro::main;	2360	if $Coro::current == $Coro::main;
2224		2361
2225	find $path, $origin	2362	find $path, $origin
2226	}	2363	}
2227		2364
2228	sub do_load_sync {	2365	sub do_load_sync {
2229	my ($map) = @_;	2366	my ($map) = @_;
2230		2367
		2368	# it's a bug to call this from the main context
2231	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"	2369	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2232	if $Coro::current == $Coro::main;	2370	if $Coro::current == $Coro::main;
2233		2371
2234	$map->load;	2372	$map->load;
2235	}	2373	}
…		…
2238	our $MAP_PREFETCHER = undef;	2376	our $MAP_PREFETCHER = undef;
2239		2377
2240	sub find_async {	2378	sub find_async {
2241	my ($path, $origin, $load) = @_;	2379	my ($path, $origin, $load) = @_;
2242		2380
2243	$path = normalise $path, $origin && $origin->{path};	2381	$path = normalise $path, $origin;
2244		2382
2245	if (my $map = $cf::MAP{$path}) {	2383	if (my $map = $cf::MAP{$path}) {
2246	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2384	return $map if !$load || $map->linkable;
2247	}	2385	}
2248		2386
2249	$MAP_PREFETCH{$path} |= $load;	2387	$MAP_PREFETCH{$path} |= $load;
2250		2388
2251	$MAP_PREFETCHER ||= cf::async {	2389	$MAP_PREFETCHER ||= cf::async {
…		…
2310	sub swap_out {	2448	sub swap_out {
2311	my ($self) = @_;	2449	my ($self) = @_;
2312		2450
2313	my $lock = cf::lock_acquire "map_data:$self->{path}";	2451	my $lock = cf::lock_acquire "map_data:$self->{path}";
2314		2452
2315	return if $self->in_memory != cf::MAP_ACTIVE;	2453	return if !$self->linkable;
2316	return if $self->{deny_save};	2454	return if $self->{deny_save};
2317	return if $self->players;	2455	return if $self->players;
2318		2456
2319	# first deactivate the map and "unlink" it from the core	2457	# first deactivate the map and "unlink" it from the core
2320	$self->deactivate;	2458	$self->deactivate;
2321	$_->clear_links_to ($self) for values %cf::MAP;	2459	$_->clear_links_to ($self) for values %cf::MAP;
2322	$self->in_memory (cf::MAP_SWAPPED);	2460	$self->state (cf::MAP_SWAPPED);
2323		2461
2324	# then atomically save	2462	# then atomically save
2325	$self->_save;	2463	$self->_save;
2326		2464
2327	# then free the map	2465	# then free the map
…		…
2353		2491
2354	return if $self->players;	2492	return if $self->players;
2355		2493
2356	cf::trace "resetting map ", $self->path, "\n";	2494	cf::trace "resetting map ", $self->path, "\n";
2357		2495
2358	$self->in_memory (cf::MAP_SWAPPED);	2496	$self->state (cf::MAP_SWAPPED);
2359		2497
2360	# need to save uniques path	2498	# need to save uniques path
2361	unless ($self->{deny_save}) {	2499	unless ($self->{deny_save}) {
2362	my $uniq = $self->uniq_path; utf8::encode $uniq;	2500	my $uniq = $self->uniq_path; utf8::encode $uniq;
2363		2501
…		…
2516		2654
2517	Creates and returns a persistent reference to an object that can be stored as a string.	2655	Creates and returns a persistent reference to an object that can be stored as a string.
2518		2656
2519	=item $ob = cf::object::deref ($refstring)	2657	=item $ob = cf::object::deref ($refstring)
2520		2658
2521	returns the objetc referenced by refstring. may return undef when it cnanot find the object,	2659	returns the objetc referenced by refstring. may return undef when it cannot find the object,
2522	even if the object actually exists. May block.	2660	even if the object actually exists. May block.
2523		2661
2524	=cut	2662	=cut
2525		2663
2526	sub deref {	2664	sub deref {
…		…
2693	# use -1 or undef as default coordinates, not 0, 0	2831	# use -1 or undef as default coordinates, not 0, 0
2694	($x, $y) = ($map->enter_x, $map->enter_y)	2832	($x, $y) = ($map->enter_x, $map->enter_y)
2695	if $x <= 0 && $y <= 0;	2833	if $x <= 0 && $y <= 0;
2696		2834
2697	$map->load;	2835	$map->load;
2698	$map->load_neighbours;
2699		2836
2700	return unless $self->contr->active;	2837	return unless $self->contr->active;
2701		2838
2702	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2839	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2703	if ($self->enter_map ($map, $x, $y)) {	2840	if ($self->enter_map ($map, $x, $y)) {
…		…
2759	($path, $x, $y) = (undef, undef, undef);	2896	($path, $x, $y) = (undef, undef, undef);
2760	}	2897	}
2761	}	2898	}
2762		2899
2763	my $map = eval {	2900	my $map = eval {
2764	my $map = defined $path ? cf::map::find $path : undef;	2901	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2765		2902
2766	if ($map) {	2903	if ($map) {
2767	$map = $map->customise_for ($self);	2904	$map = $map->customise_for ($self);
2768	$map = $check->($map, $x, $y, $self) if $check && $map;	2905	$map = $check->($map, $x, $y, $self) if $check && $map;
2769	} else {	2906	} else {
…		…
2859	$Coro::current->{desc} = "enter_exit";	2996	$Coro::current->{desc} = "enter_exit";
2860		2997
2861	unless (eval {	2998	unless (eval {
2862	$self->deactivate_recursive; # just to be sure	2999	$self->deactivate_recursive; # just to be sure
2863		3000
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;	3001	my $map = cf::map::normalise $exit->slaying, $exit->map;
2873	my $x = $exit->stats->hp;	3002	my $x = $exit->stats->hp;
2874	my $y = $exit->stats->sp;	3003	my $y = $exit->stats->sp;
		3004
		3005	# special map handling
		3006	my $slaying = $exit->slaying;
		3007
		3008	# special map handling
		3009	if ($slaying eq "/!") {
		3010	my $guard = cf::lock_acquire "exit_prepare:$exit";
		3011
		3012	prepare_random_map $exit
		3013	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		3014
		3015	$map = $exit->slaying;
		3016
		3017	} elsif ($slaying eq '!up') {
		3018	$map = $exit->map->tile_path (cf::TILE_UP);
		3019	$x = $exit->x;
		3020	$y = $exit->y;
		3021
		3022	} elsif ($slaying eq '!down') {
		3023	$map = $exit->map->tile_path (cf::TILE_DOWN);
		3024	$x = $exit->x;
		3025	$y = $exit->y;
		3026	}
2875		3027
2876	$self->goto ($map, $x, $y);	3028	$self->goto ($map, $x, $y);
2877		3029
2878	# if exit is damned, update players death & WoR home-position	3030	# if exit is damned, update players death & WoR home-position
2879	$self->contr->savebed ($map, $x, $y)	3031	$self->contr->savebed ($map, $x, $y)
…		…
3104	=cut	3256	=cut
3105		3257
3106	sub cf::client::ext_msg($$@) {	3258	sub cf::client::ext_msg($$@) {
3107	my ($self, $type, @msg) = @_;	3259	my ($self, $type, @msg) = @_;
3108		3260
3109	if ($self->extcmd == 2) {
3110	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3261	$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	}	3262	}
3134		3263
3135	=item $success = $client->query ($flags, "text", \&cb)	3264	=item $success = $client->query ($flags, "text", \&cb)
3136		3265
3137	Queues a query to the client, calling the given callback with	3266	Queues a query to the client, calling the given callback with
…		…
3192	my ($ns, $buf) = @_;	3321	my ($ns, $buf) = @_;
3193		3322
3194	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3323	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3195		3324
3196	if (ref $msg) {	3325	if (ref $msg) {
3197	my ($type, $reply, @payload) =	3326	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		3327
3202	my @reply;
3203
3204	if (my $cb = $EXTICMD{$type}) {	3328	if (my $cb = $EXTIACMD{$type}) {
		3329	$cb->(
		3330	$ns,
		3331	sub {
		3332	$ns->ext_msg ("reply-$reply", @_)
		3333	if $reply;
		3334	},
		3335	@payload
		3336	);
		3337	} else {
		3338	my @reply;
		3339
		3340	if (my $cb = $EXTICMD{$type}) {
3205	@reply = $cb->($ns, @payload);	3341	@reply = $cb->($ns, @payload);
		3342	}
		3343
		3344	$ns->ext_msg ("reply-$reply", @reply)
		3345	if $reply;
3206	}	3346	}
3207
3208	$ns->ext_reply ($reply, @reply)
3209	if $reply;
3210
3211	} else {	3347	} else {
3212	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3348	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3213	}	3349	}
3214		3350
3215	cf::override;	3351	cf::override;
…		…
3383	=cut	3519	=cut
3384		3520
3385	#############################################################################	3521	#############################################################################
3386	# the server's init and main functions	3522	# the server's init and main functions
3387		3523
		3524	{
		3525	package cf::face;
		3526
		3527	our %HASH; # hash => idx
		3528	our @DATA; # dynamically-created facedata, only faceste 0 used
		3529	our @FOFS; # file offset, if > 0
		3530	our @SIZE; # size of face, in octets
		3531	our @META; # meta hash of face, if any
		3532	our $DATAFH; # facedata filehandle
		3533
		3534	# internal api, not finalised
		3535	sub set {
		3536	my ($name, $type, $data) = @_;
		3537
		3538	my $idx = cf::face::find $name;
		3539
		3540	if ($idx) {
		3541	delete $HASH{cf::face::get_chksum $idx};
		3542	} else {
		3543	$idx = cf::face::alloc $name;
		3544	}
		3545
		3546	my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
		3547
		3548	cf::face::set_type $idx, $type;
		3549	cf::face::set_csum $idx, 0, $hash;
		3550
		3551	# we need to destroy the SV itself, not just modify it, as a running ix
		3552	# might hold a reference to it: "delete" achieves that.
		3553	delete $FOFS[0][$idx];
		3554	delete $DATA[0][$idx];
		3555	$DATA[0][$idx] = $data;
		3556	$SIZE[0][$idx] = length $data;
		3557	delete $META[$idx];
		3558	$HASH{$hash} = $idx;#d#
		3559
		3560	$idx
		3561	}
		3562
		3563	sub _get_data($$$) {
		3564	my ($idx, $set, $cb) = @_;
		3565
		3566	if (defined $DATA[$set][$idx]) {
		3567	$cb->($DATA[$set][$idx]);
		3568	} elsif (my $fofs = $FOFS[$set][$idx]) {
		3569	my $size = $SIZE[$set][$idx];
		3570	my $buf;
		3571	IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
		3572	if ($_[0] == $size) {
		3573	#cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
		3574	$cb->($buf);
		3575	} else {
		3576	cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
		3577	}
		3578	};
		3579	} else {
		3580	cf::error "requested facedata for unknown face $idx#$set, ignoring.";
		3581	}
		3582	}
		3583
		3584	# rather ineffient
		3585	sub cf::face::get_data($;$) {
		3586	my ($idx, $set) = @_;
		3587
		3588	_get_data $idx, $set, Coro::rouse_cb;
		3589	Coro::rouse_wait
		3590	}
		3591
		3592	sub cf::face::ix {
		3593	my ($ns, $set, $idx, $pri) = @_;
		3594
		3595	_get_data $idx, $set, sub {
		3596	$ns->ix_send ($idx, $pri, $_[0]);
		3597	};
		3598	}
		3599	}
		3600
3388	sub load_facedata($) {	3601	sub load_facedata($) {
3389	my ($path) = @_;	3602	my ($path) = @_;
3390		3603
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;	3604	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3396		3605
3397	trace "loading facedata from $path\n";	3606	trace "loading facedata from $path\n";
3398		3607
3399	0 < aio_load $path, my $facedata	3608	my $facedata = decode_storable load_file "$path/faceinfo";
3400	or die "$path: $!";
3401
3402	$facedata = Coro::Storable::thaw $facedata;
3403		3609
3404	$facedata->{version} == 2	3610	$facedata->{version} == 2
3405	or cf::cleanup "$path: version mismatch, cannot proceed.";	3611	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3406		3612
3407	# patch in the exptable	3613	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]);	3614	or cf::cleanup "$path/facedata: $!, cannot proceed.";
3409	$facedata->{resource}{"res/exp_table"} = {	3615
3410	type => FT_RSRC,	3616	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3411	data => $exp_table,	3617
3412	hash => (Digest::MD5::md5 $exp_table),	3618	# BEGIN ATOMIC
3413	};	3619	# from here on, everything must be atomic - no thread switch allowed
3414	cf::cede_to_tick;	3620	my $t1 = EV::time;
3415		3621
3416	{	3622	{
3417	my $faces = $facedata->{faceinfo};	3623	my $faces = $facedata->{faceinfo};
3418		3624
3419	while (my ($face, $info) = each %$faces) {	3625	for my $face (sort keys %$faces) {
		3626	my $info = $faces->{$face};
3420	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3627	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3421		3628
3422	cf::face::set_visibility $idx, $info->{visibility};	3629	cf::face::set_visibility $idx, $info->{visibility};
3423	cf::face::set_magicmap $idx, $info->{magicmap};	3630	cf::face::set_magicmap $idx, $info->{magicmap};
3424	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3631	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};	3632	cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3426		3633	cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3427	cf::cede_to_tick;	3634	$cf::face::HASH{$info->{hash64}} = $idx;
		3635	delete $cf::face::META[$idx];
3428	}	3636	}
3429		3637
3430	while (my ($face, $info) = each %$faces) {	3638	while (my ($face, $info) = each %$faces) {
3431	next unless $info->{smooth};	3639	next unless $info->{smooth};
3432		3640
…		…
3437	cf::face::set_smooth $idx, $smooth;	3645	cf::face::set_smooth $idx, $smooth;
3438	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3646	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3439	} else {	3647	} else {
3440	error "smooth face '$info->{smooth}' not found for face '$face'";	3648	error "smooth face '$info->{smooth}' not found for face '$face'";
3441	}	3649	}
3442
3443	cf::cede_to_tick;
3444	}	3650	}
3445	}	3651	}
3446		3652
3447	{	3653	{
3448	my $anims = $facedata->{animinfo};	3654	my $anims = $facedata->{animinfo};
3449		3655
3450	while (my ($anim, $info) = each %$anims) {	3656	while (my ($anim, $info) = each %$anims) {
3451	cf::anim::set $anim, $info->{frames}, $info->{facings};	3657	cf::anim::set $anim, $info->{frames}, $info->{facings};
3452	cf::cede_to_tick;
3453	}	3658	}
3454		3659
3455	cf::anim::invalidate_all; # d'oh	3660	cf::anim::invalidate_all; # d'oh
3456	}	3661	}
3457		3662
3458	{	3663	{
3459	my $res = $facedata->{resource};	3664	my $res = $facedata->{resource};
3460		3665
3461	while (my ($name, $info) = each %$res) {	3666	while (my ($name, $info) = each %$res) {
3462	if (defined $info->{type}) {	3667	if (defined (my $type = $info->{type})) {
		3668	# 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;	3669	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3464		3670
3465	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3466	cf::face::set_type $idx, $info->{type};	3671	cf::face::set_type $idx, $type;
		3672	cf::face::set_csum $idx, 0, $info->{hash};
		3673	$cf::face::SIZE[0][$idx] = $info->{size};
		3674	$cf::face::FOFS[0][$idx] = $info->{fofs};
		3675	$cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3676	$cf::face::HASH{$info->{hash}} = $idx;
3467	} else {	3677	} else {
3468	$RESOURCE{$name} = $info; # unused	3678	# $RESOURCE{$name} = $info; # unused
3469	}	3679	}
3470
3471	cf::cede_to_tick;
3472	}	3680	}
3473	}	3681	}
		3682
		3683	($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
		3684
		3685	# HACK to clear player env face cache, we need some signal framework
		3686	# for this (global event?)
		3687	%ext::player_env::MUSIC_FACE_CACHE = ();
		3688
		3689	# END ATOMIC
		3690
		3691	cf::debug "facedata atomic update time ", EV::time - $t1;
3474		3692
3475	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3693	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
		3694
		3695	aio_close $fh if $fh; # close old facedata
3476		3696
3477	1	3697	1
3478	}	3698	}
3479		3699
3480	register_exticmd fx_want => sub {	3700	register_exticmd fx_want => sub {
…		…
3491	my $status = load_resource_file_ $_[0];	3711	my $status = load_resource_file_ $_[0];
3492	get_slot 0.1, 100;	3712	get_slot 0.1, 100;
3493	cf::arch::commit_load;	3713	cf::arch::commit_load;
3494		3714
3495	$status	3715	$status
		3716	}
		3717
		3718	sub reload_exp_table {
		3719	_reload_exp_table;
		3720
		3721	cf::face::set
		3722	"res/exp_table" => FT_RSRC,
		3723	JSON::XS->new->utf8->canonical->encode (
		3724	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3725	);
		3726	}
		3727
		3728	sub reload_materials {
		3729	_reload_materials;
3496	}	3730	}
3497		3731
3498	sub reload_regions {	3732	sub reload_regions {
3499	# HACK to clear player env face cache, we need some signal framework	3733	# HACK to clear player env face cache, we need some signal framework
3500	# for this (global event?)	3734	# for this (global event?)
…		…
3508	if exists $_->{match};	3742	if exists $_->{match};
3509	}	3743	}
3510	}	3744	}
3511		3745
3512	sub reload_facedata {	3746	sub reload_facedata {
3513	load_facedata "$DATADIR/facedata"	3747	load_facedata $DATADIR
3514	or die "unable to load facedata\n";	3748	or die "unable to load facedata\n";
3515	}	3749	}
3516		3750
3517	sub reload_archetypes {	3751	sub reload_archetypes {
3518	load_resource_file "$DATADIR/archetypes"	3752	load_resource_file "$DATADIR/archetypes"
3519	or die "unable to load archetypes\n";	3753	or die "unable to load archetypes\n";
		3754
		3755	cf::face::set
		3756	"res/skill_info" => FT_RSRC,
		3757	JSON::XS->new->utf8->canonical->encode (
		3758	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3759	);
		3760
		3761	cf::face::set
		3762	"res/spell_paths" => FT_RSRC,
		3763	JSON::XS->new->utf8->canonical->encode (
		3764	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3765	);
3520	}	3766	}
3521		3767
3522	sub reload_treasures {	3768	sub reload_treasures {
3523	load_resource_file "$DATADIR/treasures"	3769	load_resource_file "$DATADIR/treasures"
3524	or die "unable to load treasurelists\n";	3770	or die "unable to load treasurelists\n";
3525	}	3771	}
3526		3772
3527	sub reload_sound {	3773	sub reload_sound {
3528	trace "loading sound config from $DATADIR/sound\n";	3774	trace "loading sound config from $DATADIR/sound\n";
3529		3775
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);	3776	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3534		3777
3535	for (0 .. SOUND_CAST_SPELL_0 - 1) {	3778	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3536	my $sound = $soundconf->{compat}[$_]	3779	my $sound = $soundconf->{compat}[$_]
3537	or next;	3780	or next;
3538		3781
…		…
3548	}	3791	}
3549		3792
3550	sub reload_resources {	3793	sub reload_resources {
3551	trace "reloading resource files...\n";	3794	trace "reloading resource files...\n";
3552		3795
3553	reload_exp_table;
3554	reload_materials;	3796	reload_materials;
3555	reload_facedata;	3797	reload_facedata;
		3798	reload_exp_table;
3556	reload_sound;	3799	reload_sound;
3557	reload_archetypes;	3800	reload_archetypes;
3558	reload_regions;	3801	reload_regions;
3559	reload_treasures;	3802	reload_treasures;
3560		3803
…		…
3562	}	3805	}
3563		3806
3564	sub reload_config {	3807	sub reload_config {
3565	trace "reloading config file...\n";	3808	trace "reloading config file...\n";
3566		3809
3567	0 < aio_load "$CONFDIR/config", my $config	3810	my $config = load_file "$CONFDIR/config";
3568	or die "$CONFDIR/config: $!";
3569
3570	utf8::decode $config;	3811	utf8::decode $config;
3571	*CFG = yaml_load $config;	3812	*CFG = decode_yaml $config;
3572		3813
3573	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];	3814	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3574		3815
3575	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3816	$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};	3817	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
3614		3855
3615	sub main {	3856	sub main {
3616	cf::init_globals; # initialise logging	3857	cf::init_globals; # initialise logging
3617		3858
3618	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3859	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3619	LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3860	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3620	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3861	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3621	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3862	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3622		3863
3623	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3864	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3624		3865
3625	# we must not ever block the main coroutine	3866	# we must not ever block the main coroutine
3626	local $Coro::idle = sub {	3867	$Coro::idle = sub {
3627	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3868	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3628	(async {	3869	(async {
3629	$Coro::current->{desc} = "IDLE BUG HANDLER";	3870	$Coro::current->{desc} = "IDLE BUG HANDLER";
3630	EV::loop EV::LOOP_ONESHOT;	3871	EV::loop EV::LOOP_ONESHOT;
3631	})->prio (Coro::PRIO_MAX);	3872	})->prio (Coro::PRIO_MAX);
…		…
3634	evthread_start IO::AIO::poll_fileno;	3875	evthread_start IO::AIO::poll_fileno;
3635		3876
3636	cf::sync_job {	3877	cf::sync_job {
3637	cf::incloader::init ();	3878	cf::incloader::init ();
3638		3879
		3880	db_init;
		3881
3639	cf::init_anim;	3882	cf::init_anim;
3640	cf::init_attackmess;	3883	cf::init_attackmess;
3641	cf::init_dynamic;	3884	cf::init_dynamic;
3642		3885
3643	cf::load_settings;	3886	cf::load_settings;
3644		3887
3645	reload_resources;	3888	reload_resources;
3646	reload_config;	3889	reload_config;
3647	db_init;
3648		3890
3649	cf::init_uuid;	3891	cf::init_uuid;
3650	cf::init_signals;	3892	cf::init_signals;
3651	cf::init_skills;	3893	cf::init_skills;
3652		3894
…		…
3660		3902
3661	# no (long-running) fork's whatsoever before this point(!)	3903	# no (long-running) fork's whatsoever before this point(!)
3662	use POSIX ();	3904	use POSIX ();
3663	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3905	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3664		3906
3665	(pop @POST_INIT)->(0) while @POST_INIT;	3907	cf::_post_init 0;
3666	};	3908	};
3667		3909
3668	cf::object::thawer::errors_are_fatal 0;	3910	cf::object::thawer::errors_are_fatal 0;
3669	info "parse errors in files are no longer fatal from this point on.\n";	3911	info "parse errors in files are no longer fatal from this point on.\n";
3670		3912
3671	my $free_main; $free_main = EV::idle sub {	3913	AE::postpone {
3672	undef $free_main;
3673	undef &main; # free gobs of memory :)	3914	undef &main; # free gobs of memory :)
3674	};	3915	};
3675		3916
3676	goto &main_loop;	3917	goto &main_loop;
3677	}	3918	}
…		…
3834		4075
3835	cf::write_runtime_sync; # external watchdog should not bark	4076	cf::write_runtime_sync; # external watchdog should not bark
3836		4077
3837	trace "emergency_perl_save: flushing outstanding aio requests";	4078	trace "emergency_perl_save: flushing outstanding aio requests";
3838	while (IO::AIO::nreqs || BDB::nreqs) {	4079	while (IO::AIO::nreqs || BDB::nreqs) {
3839	Coro::EV::timer_once 0.01; # let the sync_job do it's thing	4080	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3840	}	4081	}
3841		4082
3842	cf::write_runtime_sync; # external watchdog should not bark	4083	cf::write_runtime_sync; # external watchdog should not bark
3843	};	4084	};
3844		4085
…		…
3893		4134
3894	my $t1 = AE::time;	4135	my $t1 = AE::time;
3895		4136
3896	while ($RELOAD) {	4137	while ($RELOAD) {
3897	cf::get_slot 0.1, -1, "reload_perl";	4138	cf::get_slot 0.1, -1, "reload_perl";
3898	info "reloading...";	4139	info "perl_reload: reloading...";
3899		4140
3900	trace "entering sync_job";	4141	trace "perl_reload: entering sync_job";
3901		4142
3902	cf::sync_job {	4143	cf::sync_job {
3903	#cf::emergency_save;	4144	#cf::emergency_save;
3904		4145
3905	trace "cancelling all extension coros";	4146	trace "perl_reload: cancelling all extension coros";
3906	$_->cancel for values %EXT_CORO;	4147	$_->cancel for values %EXT_CORO;
3907	%EXT_CORO = ();	4148	%EXT_CORO = ();
3908		4149
3909	trace "removing commands";	4150	trace "perl_reload: removing commands";
3910	%COMMAND = ();	4151	%COMMAND = ();
3911		4152
3912	trace "removing ext/exti commands";	4153	trace "perl_reload: removing ext/exti commands";
3913	%EXTCMD = ();	4154	%EXTCMD = ();
3914	%EXTICMD = ();	4155	%EXTICMD = ();
3915		4156
3916	trace "unloading/nuking all extensions";	4157	trace "perl_reload: unloading/nuking all extensions";
3917	for my $pkg (@EXTS) {	4158	for my $pkg (@EXTS) {
3918	trace "... unloading $pkg";	4159	trace "... unloading $pkg";
3919		4160
3920	if (my $cb = $pkg->can ("unload")) {	4161	if (my $cb = $pkg->can ("unload")) {
3921	eval {	4162	eval {
…		…
3926		4167
3927	trace "... clearing $pkg";	4168	trace "... clearing $pkg";
3928	clear_package $pkg;	4169	clear_package $pkg;
3929	}	4170	}
3930		4171
3931	trace "unloading all perl modules loaded from $LIBDIR";	4172	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3932	while (my ($k, $v) = each %INC) {	4173	while (my ($k, $v) = each %INC) {
3933	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4174	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3934		4175
3935	trace "... unloading $k";	4176	trace "... unloading $k";
3936	delete $INC{$k};	4177	delete $INC{$k};
…		…
3943	}	4184	}
3944		4185
3945	clear_package $k;	4186	clear_package $k;
3946	}	4187	}
3947		4188
3948	trace "getting rid of safe::, as good as possible";	4189	trace "perl_reload: getting rid of safe::, as good as possible";
3949	clear_package "safe::$_"	4190	clear_package "safe::$_"
3950	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4191	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3951		4192
3952	trace "unloading cf.pm \"a bit\"";	4193	trace "perl_reload: unloading cf.pm \"a bit\"";
3953	delete $INC{"cf.pm"};	4194	delete $INC{"cf.pm"};
3954	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4195	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3955		4196
3956	# don't, removes xs symbols, too,	4197	# don't, removes xs symbols, too,
3957	# and global variables created in xs	4198	# and global variables created in xs
3958	#clear_package __PACKAGE__;	4199	#clear_package __PACKAGE__;
3959		4200
3960	info "unload completed, starting to reload now";	4201	info "perl_reload: unload completed, starting to reload now";
3961		4202
3962	trace "reloading cf.pm";	4203	trace "perl_reload: reloading cf.pm";
3963	require cf;	4204	require cf;
3964	cf::_connect_to_perl_1;	4205	cf::_connect_to_perl_1;
3965		4206
3966	trace "loading config and database again";	4207	trace "perl_reload: loading config and database again";
3967	cf::reload_config;	4208	cf::reload_config;
3968		4209
3969	trace "loading extensions";	4210	trace "perl_reload: loading extensions";
3970	cf::load_extensions;	4211	cf::load_extensions;
3971		4212
3972	if ($REATTACH_ON_RELOAD) {	4213	if ($REATTACH_ON_RELOAD) {
3973	trace "reattaching attachments to objects/players";	4214	trace "perl_reload: reattaching attachments to objects/players";
3974	_global_reattach; # objects, sockets	4215	_global_reattach; # objects, sockets
3975	trace "reattaching attachments to maps";	4216	trace "perl_reload: reattaching attachments to maps";
3976	reattach $_ for values %MAP;	4217	reattach $_ for values %MAP;
3977	trace "reattaching attachments to players";	4218	trace "perl_reload: reattaching attachments to players";
3978	reattach $_ for values %PLAYER;	4219	reattach $_ for values %PLAYER;
3979	}	4220	}
3980		4221
3981	trace "running post_init jobs";	4222	cf::_post_init 1;
3982	(pop @POST_INIT)->(1) while @POST_INIT;
3983		4223
3984	trace "leaving sync_job";	4224	trace "perl_reload: leaving sync_job";
3985		4225
3986	1	4226	1
3987	} or do {	4227	} or do {
3988	error $@;	4228	error $@;
3989	cf::cleanup "error while reloading, exiting.";	4229	cf::cleanup "perl_reload: error, exiting.";
3990	};	4230	};
3991		4231
3992	info "reloaded";
3993	--$RELOAD;	4232	--$RELOAD;
3994	}	4233	}
3995		4234
3996	$t1 = AE::time - $t1;	4235	$t1 = AE::time - $t1;
3997	info "reload completed in ${t1}s\n";	4236	info "perl_reload: completed in ${t1}s\n";
3998	};	4237	};
3999		4238
4000	our $RELOAD_WATCHER; # used only during reload	4239	our $RELOAD_WATCHER; # used only during reload
4001		4240
4002	sub reload_perl() {	4241	sub reload_perl() {
…		…
4027		4266
4028	#############################################################################	4267	#############################################################################
4029		4268
4030	my $bug_warning = 0;	4269	my $bug_warning = 0;
4031		4270
4032	our @WAIT_FOR_TICK;
4033	our @WAIT_FOR_TICK_BEGIN;
4034
4035	sub wait_for_tick() {	4271	sub wait_for_tick() {
4036	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4272	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4037		4273
4038	my $signal = new Coro::Signal;	4274	$WAIT_FOR_TICK->wait;
4039	push @WAIT_FOR_TICK, $signal;
4040	$signal->wait;
4041	}	4275	}
4042		4276
4043	sub wait_for_tick_begin() {	4277	sub wait_for_tick_begin() {
4044	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4278	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4045		4279
4046	my $signal = new Coro::Signal;	4280	my $signal = new Coro::Signal;
4047	push @WAIT_FOR_TICK_BEGIN, $signal;	4281	push @WAIT_FOR_TICK_BEGIN, $signal;
4048	$signal->wait;	4282	$signal->wait;
4049	}	4283	}
…		…
4053	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4287	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4054	unless ++$bug_warning > 10;	4288	unless ++$bug_warning > 10;
4055	return;	4289	return;
4056	}	4290	}
4057		4291
4058	cf::server_tick; # one server iteration	4292	cf::one_tick; # one server iteration
4059		4293
4060	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#	4294	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4061		4295
4062	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4296	if ($NOW >= $NEXT_RUNTIME_WRITE) {
4063	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4297	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
…		…
4069	}	4303	}
4070		4304
4071	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4305	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4072	$sig->send;	4306	$sig->send;
4073	}	4307	}
4074	while (my $sig = shift @WAIT_FOR_TICK) {	4308	$WAIT_FOR_TICK->broadcast;
4075	$sig->send;
4076	}
4077		4309
4078	$LOAD = ($NOW - $TICK_START) / $TICK;	4310	$LOAD = ($NOW - $TICK_START) / $TICK;
4079	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4311	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4080		4312
4081	if (0) {	4313	if (0) {
…		…
4087	}	4319	}
4088	}	4320	}
4089		4321
4090	{	4322	{
4091	# configure BDB	4323	# configure BDB
		4324	info "initialising database";
4092		4325
4093	BDB::min_parallel 16;	4326	BDB::min_parallel 16;
4094	BDB::max_poll_reqs $TICK * 0.1;	4327	BDB::max_poll_reqs $TICK * 0.1;
4095	$AnyEvent::BDB::WATCHER->priority (1);	4328	#$AnyEvent::BDB::WATCHER->priority (1);
4096		4329
4097	unless ($DB_ENV) {	4330	unless ($DB_ENV) {
4098	$DB_ENV = BDB::db_env_create;	4331	$DB_ENV = BDB::db_env_create;
4099	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4332	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4100	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4333	$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 { };	4358	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4126	};	4359	};
4127	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4360	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4128	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4361	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4129	};	4362	};
		4363
		4364	info "database initialised";
4130	}	4365	}
4131		4366
4132	{	4367	{
4133	# configure IO::AIO	4368	# configure IO::AIO
4134		4369
		4370	info "initialising aio";
4135	IO::AIO::min_parallel 8;	4371	IO::AIO::min_parallel 8;
4136	IO::AIO::max_poll_time $TICK * 0.1;	4372	IO::AIO::max_poll_time $TICK * 0.1;
4137	undef $AnyEvent::AIO::WATCHER;	4373	undef $AnyEvent::AIO::WATCHER;
		4374	info "aio initialised";
4138	}	4375	}
4139		4376
4140	my $_log_backtrace;	4377	our $_log_backtrace;
		4378	our $_log_backtrace_last;
4141		4379
4142	sub _log_backtrace {	4380	sub _log_backtrace {
4143	my ($msg, @addr) = @_;	4381	my ($msg, @addr) = @_;
4144		4382
4145	$msg =~ s/\n//;	4383	$msg =~ s/\n$//;
4146		4384
		4385	if ($_log_backtrace_last eq $msg) {
		4386	LOG llevInfo, "[ABT] $msg\n";
		4387	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4147	# limit the # of concurrent backtraces	4388	# limit the # of concurrent backtraces
4148	if ($_log_backtrace < 2) {	4389	} elsif ($_log_backtrace < 2) {
		4390	$_log_backtrace_last = $msg;
4149	++$_log_backtrace;	4391	++$_log_backtrace;
4150	my $perl_bt = Carp::longmess $msg;	4392	my $perl_bt = Carp::longmess $msg;
4151	async {	4393	async {
4152	$Coro::current->{desc} = "abt $msg";	4394	$Coro::current->{desc} = "abt $msg";
4153		4395
…		…
4173	LOG llevInfo, "[ABT] $_\n" for @bt;	4415	LOG llevInfo, "[ABT] $_\n" for @bt;
4174	--$_log_backtrace;	4416	--$_log_backtrace;
4175	};	4417	};
4176	} else {	4418	} else {
4177	LOG llevInfo, "[ABT] $msg\n";	4419	LOG llevInfo, "[ABT] $msg\n";
4178	LOG llevInfo, "[ABT] [suppressed]\n";	4420	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4179	}	4421	}
4180	}	4422	}
4181		4423
4182	# load additional modules	4424	# load additional modules
4183	require "cf/$_.pm" for @EXTRA_MODULES;	4425	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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