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.598 by root, Sun Nov 11 02:38:10 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.
…		…
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. cf::wait_for_tick_begin only
238	returns directly I<after> the tick processing (and consequently, can only wake one thread	257	returns directly I<after> the tick processing (and consequently, can only wake one thread
239	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	258	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
		259
		260	Note that cf::Wait_for_tick will immediately return when the server is not
		261	ticking, making it suitable for small pauses in threads that need to run
		262	when the server is paused. If that is not applicable (i.e. you I<really>
		263	want to wait, use C<$cf::WAIT_FOR_TICK>).
		264
		265	=item $cf::WAIT_FOR_TICK
		266
		267	Note that C<cf::wait_for_tick> is probably the correct thing to use. This
		268	variable contains a L<Coro::Signal> that is broadcats after every server
		269	tick. Calling C<< ->wait >> on it will suspend the caller until after the
		270	next server tick.
240		271
241	=cut	272	=cut
242		273
243	sub wait_for_tick();	274	sub wait_for_tick();
244	sub wait_for_tick_begin();	275	sub wait_for_tick_begin();
…		…
310	)) {	341	)) {
311	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	342	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
312	}	343	}
313		344
314	$EV::DIED = sub {	345	$EV::DIED = sub {
315	Carp::cluck "error in event callback: @_";	346	warn "error in event callback: $@";
316	};	347	};
		348
		349	#############################################################################
		350
		351	sub fork_call(&@);
		352	sub get_slot($;$$);
317		353
318	#############################################################################	354	#############################################################################
319		355
320	=head2 UTILITY FUNCTIONS	356	=head2 UTILITY FUNCTIONS
321		357
…		…
342	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	378	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
343	$d	379	$d
344	} || "[unable to dump $_[0]: '$@']";	380	} || "[unable to dump $_[0]: '$@']";
345	}	381	}
346		382
		383	=item $scalar = cf::load_file $path
		384
		385	Loads the given file from path and returns its contents. Croaks on error
		386	and can block.
		387
		388	=cut
		389
		390	sub load_file($) {
		391	0 <= aio_load $_[0], my $data
		392	or Carp::croak "$_[0]: $!";
		393
		394	$data
		395	}
		396
		397	=item $success = cf::replace_file $path, $data, $sync
		398
		399	Atomically replaces the file at the given $path with new $data, and
		400	optionally $sync the data to disk before replacing the file.
		401
		402	=cut
		403
		404	sub replace_file($$;$) {
		405	my ($path, $data, $sync) = @_;
		406
		407	my $lock = cf::lock_acquire ("replace_file:$path");
		408
		409	my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
		410	or return;
		411
		412	$data = $data->() if ref $data;
		413
		414	length $data == aio_write $fh, 0, (length $data), $data, 0
		415	or return;
		416
		417	!$sync
		418	or !aio_fsync $fh
		419	or return;
		420
		421	aio_close $fh
		422	and return;
		423
		424	aio_rename "$path~", $path
		425	and return;
		426
		427	if ($sync) {
		428	$path =~ s%/[^/]*$%%;
		429	aio_pathsync $path;
		430	}
		431
		432	1
		433	}
		434
347	=item $ref = cf::decode_json $json	435	=item $ref = cf::decode_json $json
348		436
349	Converts a JSON string into the corresponding perl data structure.	437	Converts a JSON string into the corresponding perl data structure.
350		438
351	=item $json = cf::encode_json $ref	439	=item $json = cf::encode_json $ref
…		…
357	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	445	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
358		446
359	sub encode_json($) { $json_coder->encode ($_[0]) }	447	sub encode_json($) { $json_coder->encode ($_[0]) }
360	sub decode_json($) { $json_coder->decode ($_[0]) }	448	sub decode_json($) { $json_coder->decode ($_[0]) }
361		449
		450	=item $ref = cf::decode_storable $scalar
		451
		452	Same as Coro::Storable::thaw, so blocks.
		453
		454	=cut
		455
		456	BEGIN { *decode_storable = \&Coro::Storable::thaw }
		457
362	=item $ref = cf::yaml_load $scalar	458	=item $ref = cf::decode_yaml $scalar
363		459
364	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).	460	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
365		461
366	=cut	462	=cut
367		463
368	sub fork_call(&@);	464	sub decode_yaml($) {
369
370	sub yaml_load($) {
371	fork_call { YAML::XS::Load $_[0] } @_	465	fork_call { YAML::XS::Load $_[0] } @_
		466	}
		467
		468	=item $scalar = cf::unlzf $scalar
		469
		470	Same as Compress::LZF::compress, but takes server ticks into account, so
		471	blocks.
		472
		473	=cut
		474
		475	sub unlzf($) {
		476	# we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
		477	cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
		478	Compress::LZF::decompress $_[0]
372	}	479	}
373		480
374	=item cf::post_init { BLOCK }	481	=item cf::post_init { BLOCK }
375		482
376	Execute the given codeblock, I<after> all extensions have been (re-)loaded,	483	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
…		…
381		488
382	=cut	489	=cut
383		490
384	sub post_init(&) {	491	sub post_init(&) {
385	push @POST_INIT, shift;	492	push @POST_INIT, shift;
		493	}
		494
		495	sub _post_init {
		496	trace "running post_init jobs";
		497
		498	# run them in parallel...
		499
		500	my @join;
		501
		502	while () {
		503	push @join, map &Coro::async ($_, 0), @POST_INIT;
		504	@POST_INIT = ();
		505
		506	@join or last;
		507
		508	(pop @join)->join;
		509	}
386	}	510	}
387		511
388	=item cf::lock_wait $string	512	=item cf::lock_wait $string
389		513
390	Wait until the given lock is available. See cf::lock_acquire.	514	Wait until the given lock is available. See cf::lock_acquire.
…		…
443	EV::periodic $start, $interval, 0, $cb	567	EV::periodic $start, $interval, 0, $cb
444	}	568	}
445		569
446	=item cf::get_slot $time[, $priority[, $name]]	570	=item cf::get_slot $time[, $priority[, $name]]
447		571
448	Allocate $time seconds of blocking CPU time at priority C<$priority>:	572	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	573	(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.	574	C<$time> seconds of cpu time till the next tick. The slot is only valid
		575	till the next cede.
		576
		577	Background jobs should use a priority les than zero, interactive jobs
		578	should use 100 or more.
451		579
452	The optional C<$name> can be used to identify the job to run. It might be	580	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.	581	used for statistical purposes and should identify the same time-class.
454		582
455	Useful for short background jobs.	583	Useful for short background jobs.
…		…
484	}	612	}
485	}	613	}
486		614
487	if (@SLOT_QUEUE) {	615	if (@SLOT_QUEUE) {
488	# we do not use wait_for_tick() as it returns immediately when tick is inactive	616	# we do not use wait_for_tick() as it returns immediately when tick is inactive
489	push @cf::WAIT_FOR_TICK, $signal;	617	$WAIT_FOR_TICK->wait;
490	$signal->wait;
491	} else {	618	} else {
492	$busy = 0;	619	$busy = 0;
493	Coro::schedule;	620	Coro::schedule;
494	}	621	}
495	}	622	}
…		…
750		877
751	my @data;	878	my @data;
752	my $md5;	879	my $md5;
753		880
754	for (0 .. $#$src) {	881	for (0 .. $#$src) {
755	0 <= aio_load $src->[$_], $data[$_]	882	$data[$_] = load_file $src->[$_];
756	or Carp::croak "$src->[$_]: $!";
757	}	883	}
758		884
759	# if processing is expensive, check	885	# if processing is expensive, check
760	# checksum first	886	# checksum first
761	if (1) {	887	if (1) {
…		…
774		900
775	return db_get cache => "$id/data";	901	return db_get cache => "$id/data";
776	}	902	}
777	}	903	}
778		904
779	my $t1 = Time::HiRes::time;	905	my $t1 = EV::time;
780	my $data = $process->(\@data);	906	my $data = $process->(\@data);
781	my $t2 = Time::HiRes::time;	907	my $t2 = EV::time;
782		908
783	info "cache: '$id' processed in ", $t2 - $t1, "s\n";	909	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
784		910
785	db_put cache => "$id/data", $data;	911	db_put cache => "$id/data", $data;
786	db_put cache => "$id/md5" , $md5;	912	db_put cache => "$id/md5" , $md5;
…		…
1306	=cut	1432	=cut
1307		1433
1308	#############################################################################	1434	#############################################################################
1309	# command handling &c	1435	# command handling &c
1310		1436
1311	=item cf::register_command $name => \&callback($ob,$args);	1437	=item cf::register_command $name => \&callback($ob,$args)
1312		1438
1313	Register a callback for execution when the client sends the user command	1439	Register a callback for execution when the client sends the user command
1314	$name.	1440	$name.
1315		1441
1316	=cut	1442	=cut
…		…
1322	#warn "registering command '$name/$time' to '$caller'";	1448	#warn "registering command '$name/$time' to '$caller'";
1323		1449
1324	push @{ $COMMAND{$name} }, [$caller, $cb];	1450	push @{ $COMMAND{$name} }, [$caller, $cb];
1325	}	1451	}
1326		1452
1327	=item cf::register_extcmd $name => \&callback($pl,$packet);	1453	=item cf::register_extcmd $name => \&callback($pl,@args)
1328		1454
1329	Register a callback for execution when the client sends an (synchronous)	1455	Register a callback for execution when the client sends an (synchronous)
1330	extcmd packet. Ext commands will be processed in the order they are	1456	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	1457	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	1458	the logged-in player. Ext commands can only be processed after a player
1333	has logged in successfully.	1459	has logged in successfully.
1334		1460
1335	If the callback returns something, it is sent back as if reply was being	1461	The values will be sent back to the client.
1336	called.
1337		1462
		1463	=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
		1464
		1465	Same as C<cf::register_extcmd>, but instead of returning values, the
		1466	callback needs to clal the C<$reply> function.
		1467
1338	=item cf::register_exticmd $name => \&callback($ns,$packet);	1468	=item cf::register_exticmd $name => \&callback($ns,@args)
1339		1469
1340	Register a callback for execution when the client sends an (asynchronous)	1470	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	1471	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	1472	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	1473	is a client socket. Exti commands can be received anytime, even before
1344	log-in.	1474	log-in.
1345		1475
1346	If the callback returns something, it is sent back as if reply was being	1476	The values will be sent back to the client.
1347	called.
1348		1477
1349	=cut	1478	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1350		1479
		1480	Same as C<cf::register_extcmd>, but instead of returning values, the
		1481	callback needs to clal the C<$reply> function.
		1482
		1483	=cut
		1484
1351	sub register_extcmd {	1485	sub register_extcmd($$) {
1352	my ($name, $cb) = @_;	1486	my ($name, $cb) = @_;
1353		1487
1354	$EXTCMD{$name} = $cb;	1488	$EXTCMD{$name} = $cb;
1355	}	1489	}
1356		1490
1357	sub register_exticmd {	1491	sub register_async_extcmd($$) {
1358	my ($name, $cb) = @_;	1492	my ($name, $cb) = @_;
1359		1493
		1494	$EXTACMD{$name} = $cb;
		1495	}
		1496
		1497	sub register_exticmd($$) {
		1498	my ($name, $cb) = @_;
		1499
1360	$EXTICMD{$name} = $cb;	1500	$EXTICMD{$name} = $cb;
		1501	}
		1502
		1503	sub register_async_exticmd($$) {
		1504	my ($name, $cb) = @_;
		1505
		1506	$EXTIACMD{$name} = $cb;
1361	}	1507	}
1362		1508
1363	use File::Glob ();	1509	use File::Glob ();
1364		1510
1365	cf::player->attach (	1511	cf::player->attach (
…		…
1379	my ($pl, $buf) = @_;	1525	my ($pl, $buf) = @_;
1380		1526
1381	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1527	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1382		1528
1383	if (ref $msg) {	1529	if (ref $msg) {
1384	my ($type, $reply, @payload) =	1530	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		1531
1389	my @reply;
1390
1391	if (my $cb = $EXTCMD{$type}) {	1532	if (my $cb = $EXTACMD{$type}) {
		1533	$cb->(
		1534	$pl,
		1535	sub {
		1536	$pl->ext_msg ("reply-$reply", @_)
		1537	if $reply;
		1538	},
		1539	@payload
		1540	);
		1541	} else {
		1542	my @reply;
		1543
		1544	if (my $cb = $EXTCMD{$type}) {
1392	@reply = $cb->($pl, @payload);	1545	@reply = $cb->($pl, @payload);
		1546	}
		1547
		1548	$pl->ext_msg ("reply-$reply", @reply)
		1549	if $reply;
1393	}	1550	}
1394
1395	$pl->ext_reply ($reply, @reply)
1396	if $reply;
1397		1551
1398	} else {	1552	} else {
1399	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1553	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1400	}	1554	}
1401		1555
…		…
1414	};	1568	};
1415		1569
1416	$grp	1570	$grp
1417	}	1571	}
1418		1572
		1573	sub _ext_cfg_reg($$$$) {
		1574	my ($rvar, $varname, $cfgname, $default) = @_;
		1575
		1576	$cfgname = lc $varname
		1577	unless length $cfgname;
		1578
		1579	$EXT_CFG{$cfgname} = [$rvar, $default];
		1580
		1581	$$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
		1582	}
		1583
1419	sub load_extensions {	1584	sub load_extensions {
1420	info "loading extensions...";	1585	info "loading extensions...";
		1586
		1587	%EXT_CFG = ();
1421		1588
1422	cf::sync_job {	1589	cf::sync_job {
1423	my %todo;	1590	my %todo;
1424		1591
1425	for my $path (<$LIBDIR/*.ext>) {	1592	for my $path (<$LIBDIR/*.ext>) {
…		…
1468	unless exists $done{$_};	1635	unless exists $done{$_};
1469	}	1636	}
1470		1637
1471	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1638	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1472		1639
		1640	my $source = $v->{source};
		1641
		1642	# support "CONF varname :confname = default" pseudo-statements
		1643	$source =~ s{
		1644	^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
		1645	}{
		1646	"our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
		1647	}gmxe;
		1648
1473	my $active = eval $v->{source};	1649	my $active = eval $source;
1474		1650
1475	if (length $@) {	1651	if (length $@) {
1476	error "$v->{path}: $@\n";	1652	error "$v->{path}: $@\n";
1477		1653
1478	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1654	cf::cleanup "mandatory extension '$k' failed to load, exiting."
…		…
1495		1671
1496	while (my ($k, $v) = each %todo) {	1672	while (my ($k, $v) = each %todo) {
1497	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1673	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1498	if exists $v->{meta}{mandatory};	1674	if exists $v->{meta}{mandatory};
1499	}	1675	}
		1676
		1677	last;
1500	}	1678	}
1501	}	1679	}
1502	};	1680	};
1503	}	1681	}
1504		1682
…		…
1662	my $name = $pl->ob->name;	1840	my $name = $pl->ob->name;
1663		1841
1664	$pl->{deny_save} = 1;	1842	$pl->{deny_save} = 1;
1665	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1843	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1666		1844
1667	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1845	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1668	$pl->deactivate;	1846	$pl->deactivate;
1669		1847
1670	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1848	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
		1849	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1671	ext::highscore::check ($pl->ob);	1850	ext::highscore::check ($pl->ob);
1672		1851
1673	$pl->invoke (cf::EVENT_PLAYER_QUIT);
1674	$pl->ns->destroy if $pl->ns;	1852	$pl->ns->destroy if $pl->ns;
1675		1853
1676	my $path = playerdir $pl;	1854	my $path = playerdir $pl;
1677	my $temp = "$path~$cf::RUNTIME~deleting~";	1855	my $temp = "$path~$cf::RUNTIME~deleting~";
1678	aio_rename $path, $temp;	1856	aio_rename $path, $temp;
…		…
1764		1942
1765	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1943	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1766		1944
1767	Expand deliantra pod fragments into protocol xml.	1945	Expand deliantra pod fragments into protocol xml.
1768		1946
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)	1947	=item $player->ext_msg ($type, @msg)
1782		1948
1783	Sends an ext event to the client.	1949	Sends an ext event to the client.
1784		1950
1785	=cut	1951	=cut
…		…
1844	sub generate_random_map {	2010	sub generate_random_map {
1845	my ($self, $rmp) = @_;	2011	my ($self, $rmp) = @_;
1846		2012
1847	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	2013	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1848		2014
1849	# mit "rum" bekleckern, nicht
1850	$self->_create_random_map (	2015	$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	}	2016	}
1864		2017
1865	=item cf::map->register ($regex, $prio)	2018	=item cf::map->register ($regex, $prio)
1866		2019
1867	Register a handler for the map path matching the given regex at the	2020	Register a handler for the map path matching the given regex at the
…		…
1918	$base =~ s{[^/]+/?$}{};	2071	$base =~ s{[^/]+/?$}{};
1919	$path = "$base/$path";	2072	$path = "$base/$path";
1920	}	2073	}
1921		2074
1922	for ($path) {	2075	for ($path) {
1923	redo if s{//}{/};
1924	redo if s{/\.?/}{/};	2076	redo if s{/\.?/}{/};
1925	redo if s{/[^/]+/\.\./}{/};	2077	redo if s{/[^/]+/\.\./}{/};
1926	}	2078	}
1927		2079
1928	$path	2080	$path
…		…
1946		2098
1947	Carp::cluck "unable to resolve path '$path' (base '$base')";	2099	Carp::cluck "unable to resolve path '$path' (base '$base')";
1948	()	2100	()
1949	}	2101	}
1950		2102
		2103	# may re-bless or do other evil things
1951	sub init {	2104	sub init {
1952	my ($self) = @_;	2105	my ($self) = @_;
1953		2106
1954	$self	2107	$self
1955	}	2108	}
…		…
2020	$self->{load_path} = $path;	2173	$self->{load_path} = $path;
2021		2174
2022	1	2175	1
2023	}	2176	}
2024		2177
		2178	# used to laod the header of an original map
2025	sub load_header_orig {	2179	sub load_header_orig {
2026	my ($self) = @_;	2180	my ($self) = @_;
2027		2181
2028	$self->load_header_from ($self->load_path)	2182	$self->load_header_from ($self->load_path)
2029	}	2183	}
2030		2184
		2185	# used to laod the header of an instantiated map
2031	sub load_header_temp {	2186	sub load_header_temp {
2032	my ($self) = @_;	2187	my ($self) = @_;
2033		2188
2034	$self->load_header_from ($self->save_path)	2189	$self->load_header_from ($self->save_path)
2035	}	2190	}
2036		2191
		2192	# called after loading the header from an instantiated map
2037	sub prepare_temp {	2193	sub prepare_temp {
2038	my ($self) = @_;	2194	my ($self) = @_;
2039		2195
2040	$self->last_access ((delete $self->{last_access})	2196	$self->last_access ((delete $self->{last_access})
2041	|| $cf::RUNTIME); #d#	2197	|| $cf::RUNTIME); #d#
2042	# safety	2198	# safety
2043	$self->{instantiate_time} = $cf::RUNTIME	2199	$self->{instantiate_time} = $cf::RUNTIME
2044	if $self->{instantiate_time} > $cf::RUNTIME;	2200	if $self->{instantiate_time} > $cf::RUNTIME;
2045	}	2201	}
2046		2202
		2203	# called after loading the header from an original map
2047	sub prepare_orig {	2204	sub prepare_orig {
2048	my ($self) = @_;	2205	my ($self) = @_;
2049		2206
2050	$self->{load_original} = 1;	2207	$self->{load_original} = 1;
2051	$self->{instantiate_time} = $cf::RUNTIME;	2208	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2077	sub find {	2234	sub find {
2078	my ($path, $origin) = @_;	2235	my ($path, $origin) = @_;
2079		2236
2080	cf::cede_to_tick;	2237	cf::cede_to_tick;
2081		2238
2082	$path = normalise $path, $origin && $origin->path;	2239	$path = normalise $path, $origin;
2083		2240
2084	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2241	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2085	my $guard2 = cf::lock_acquire "map_find:$path";	2242	my $guard2 = cf::lock_acquire "map_find:$path";
2086		2243
2087	$cf::MAP{$path} || do {	2244	$cf::MAP{$path} || do {
…		…
2118		2275
2119	{	2276	{
2120	my $guard = cf::lock_acquire "map_data:$path";	2277	my $guard = cf::lock_acquire "map_data:$path";
2121		2278
2122	return unless $self->valid;	2279	return unless $self->valid;
2123	return unless $self->in_memory == cf::MAP_SWAPPED;	2280	return unless $self->state == cf::MAP_SWAPPED;
2124
2125	$self->in_memory (cf::MAP_LOADING);
2126		2281
2127	$self->alloc;	2282	$self->alloc;
2128		2283
2129	$self->pre_load;	2284	$self->pre_load;
2130	cf::cede_to_tick;	2285	cf::cede_to_tick;
2131		2286
		2287	if (exists $self->{load_path}) {
2132	my $f = new_from_file cf::object::thawer $self->{load_path};	2288	my $f = new_from_file cf::object::thawer $self->{load_path};
2133	$f->skip_block;	2289	$f->skip_block;
2134	$self->_load_objects ($f)	2290	$self->_load_objects ($f)
2135	or return;	2291	or return;
2136		2292
2137	$self->post_load_original	2293	$self->post_load_original
2138	if delete $self->{load_original};	2294	if delete $self->{load_original};
2139		2295
2140	if (my $uniq = $self->uniq_path) {	2296	if (my $uniq = $self->uniq_path) {
2141	utf8::encode $uniq;	2297	utf8::encode $uniq;
2142	unless (aio_stat $uniq) {	2298	unless (aio_stat $uniq) {
2143	if (my $f = new_from_file cf::object::thawer $uniq) {	2299	if (my $f = new_from_file cf::object::thawer $uniq) {
2144	$self->clear_unique_items;	2300	$self->clear_unique_items;
2145	$self->_load_objects ($f);	2301	$self->_load_objects ($f);
2146	$f->resolve_delayed_derefs;	2302	$f->resolve_delayed_derefs;
		2303	}
2147	}	2304	}
2148	}	2305	}
2149	}
2150		2306
2151	$f->resolve_delayed_derefs;	2307	$f->resolve_delayed_derefs;
		2308	} else {
		2309	$self->post_load_original
		2310	if delete $self->{load_original};
		2311	}
		2312
		2313	$self->state (cf::MAP_INACTIVE);
2152		2314
2153	cf::cede_to_tick;	2315	cf::cede_to_tick;
2154	# now do the right thing for maps	2316	# now do the right thing for maps
2155	$self->link_multipart_objects;	2317	$self->link_multipart_objects;
2156	$self->difficulty ($self->estimate_difficulty)	2318	$self->difficulty ($self->estimate_difficulty)
…		…
2160	unless ($self->{deny_activate}) {	2322	unless ($self->{deny_activate}) {
2161	$self->decay_objects;	2323	$self->decay_objects;
2162	$self->fix_auto_apply;	2324	$self->fix_auto_apply;
2163	$self->update_buttons;	2325	$self->update_buttons;
2164	cf::cede_to_tick;	2326	cf::cede_to_tick;
2165	$self->activate;	2327	#$self->activate; # no longer activate maps automatically
2166	}	2328	}
2167		2329
2168	$self->{last_save} = $cf::RUNTIME;	2330	$self->{last_save} = $cf::RUNTIME;
2169	$self->last_access ($cf::RUNTIME);	2331	$self->last_access ($cf::RUNTIME);
2170
2171	$self->in_memory (cf::MAP_ACTIVE);
2172	}	2332	}
2173		2333
2174	$self->post_load;	2334	$self->post_load;
		2335
		2336	1
2175	}	2337	}
2176		2338
2177	# customize the map for a given player, i.e.	2339	# customize the map for a given player, i.e.
2178	# return the _real_ map. used by e.g. per-player	2340	# return the _real_ map. used by e.g. per-player
2179	# maps to change the path to ~playername/mappath	2341	# maps to change the path to ~playername/mappath
…		…
2187	# if $self->per_party;	2349	# if $self->per_party;
2188		2350
2189	$self	2351	$self
2190	}	2352	}
2191		2353
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 {	2354	sub find_sync {
2220	my ($path, $origin) = @_;	2355	my ($path, $origin) = @_;
2221		2356
		2357	# it's a bug to call this from the main context
2222	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"	2358	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2223	if $Coro::current == $Coro::main;	2359	if $Coro::current == $Coro::main;
2224		2360
2225	find $path, $origin	2361	find $path, $origin
2226	}	2362	}
2227		2363
2228	sub do_load_sync {	2364	sub do_load_sync {
2229	my ($map) = @_;	2365	my ($map) = @_;
2230		2366
		2367	# it's a bug to call this from the main context
2231	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"	2368	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2232	if $Coro::current == $Coro::main;	2369	if $Coro::current == $Coro::main;
2233		2370
2234	$map->load;	2371	$map->load;
2235	}	2372	}
…		…
2238	our $MAP_PREFETCHER = undef;	2375	our $MAP_PREFETCHER = undef;
2239		2376
2240	sub find_async {	2377	sub find_async {
2241	my ($path, $origin, $load) = @_;	2378	my ($path, $origin, $load) = @_;
2242		2379
2243	$path = normalise $path, $origin && $origin->{path};	2380	$path = normalise $path, $origin;
2244		2381
2245	if (my $map = $cf::MAP{$path}) {	2382	if (my $map = $cf::MAP{$path}) {
2246	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2383	return $map if !$load || $map->linkable;
2247	}	2384	}
2248		2385
2249	$MAP_PREFETCH{$path} |= $load;	2386	$MAP_PREFETCH{$path} |= $load;
2250		2387
2251	$MAP_PREFETCHER ||= cf::async {	2388	$MAP_PREFETCHER ||= cf::async {
…		…
2310	sub swap_out {	2447	sub swap_out {
2311	my ($self) = @_;	2448	my ($self) = @_;
2312		2449
2313	my $lock = cf::lock_acquire "map_data:$self->{path}";	2450	my $lock = cf::lock_acquire "map_data:$self->{path}";
2314		2451
2315	return if $self->in_memory != cf::MAP_ACTIVE;	2452	return if !$self->linkable;
2316	return if $self->{deny_save};	2453	return if $self->{deny_save};
2317	return if $self->players;	2454	return if $self->players;
2318		2455
2319	# first deactivate the map and "unlink" it from the core	2456	# first deactivate the map and "unlink" it from the core
2320	$self->deactivate;	2457	$self->deactivate;
2321	$_->clear_links_to ($self) for values %cf::MAP;	2458	$_->clear_links_to ($self) for values %cf::MAP;
2322	$self->in_memory (cf::MAP_SWAPPED);	2459	$self->state (cf::MAP_SWAPPED);
2323		2460
2324	# then atomically save	2461	# then atomically save
2325	$self->_save;	2462	$self->_save;
2326		2463
2327	# then free the map	2464	# then free the map
…		…
2353		2490
2354	return if $self->players;	2491	return if $self->players;
2355		2492
2356	cf::trace "resetting map ", $self->path, "\n";	2493	cf::trace "resetting map ", $self->path, "\n";
2357		2494
2358	$self->in_memory (cf::MAP_SWAPPED);	2495	$self->state (cf::MAP_SWAPPED);
2359		2496
2360	# need to save uniques path	2497	# need to save uniques path
2361	unless ($self->{deny_save}) {	2498	unless ($self->{deny_save}) {
2362	my $uniq = $self->uniq_path; utf8::encode $uniq;	2499	my $uniq = $self->uniq_path; utf8::encode $uniq;
2363		2500
…		…
2693	# use -1 or undef as default coordinates, not 0, 0	2830	# use -1 or undef as default coordinates, not 0, 0
2694	($x, $y) = ($map->enter_x, $map->enter_y)	2831	($x, $y) = ($map->enter_x, $map->enter_y)
2695	if $x <= 0 && $y <= 0;	2832	if $x <= 0 && $y <= 0;
2696		2833
2697	$map->load;	2834	$map->load;
2698	$map->load_neighbours;
2699		2835
2700	return unless $self->contr->active;	2836	return unless $self->contr->active;
2701		2837
2702	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2838	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2703	if ($self->enter_map ($map, $x, $y)) {	2839	if ($self->enter_map ($map, $x, $y)) {
…		…
2759	($path, $x, $y) = (undef, undef, undef);	2895	($path, $x, $y) = (undef, undef, undef);
2760	}	2896	}
2761	}	2897	}
2762		2898
2763	my $map = eval {	2899	my $map = eval {
2764	my $map = defined $path ? cf::map::find $path : undef;	2900	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2765		2901
2766	if ($map) {	2902	if ($map) {
2767	$map = $map->customise_for ($self);	2903	$map = $map->customise_for ($self);
2768	$map = $check->($map, $x, $y, $self) if $check && $map;	2904	$map = $check->($map, $x, $y, $self) if $check && $map;
2769	} else {	2905	} else {
…		…
2859	$Coro::current->{desc} = "enter_exit";	2995	$Coro::current->{desc} = "enter_exit";
2860		2996
2861	unless (eval {	2997	unless (eval {
2862	$self->deactivate_recursive; # just to be sure	2998	$self->deactivate_recursive; # just to be sure
2863		2999
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;	3000	my $map = cf::map::normalise $exit->slaying, $exit->map;
2873	my $x = $exit->stats->hp;	3001	my $x = $exit->stats->hp;
2874	my $y = $exit->stats->sp;	3002	my $y = $exit->stats->sp;
		3003
		3004	# special map handling
		3005	my $slaying = $exit->slaying;
		3006
		3007	# special map handling
		3008	if ($slaying eq "/!") {
		3009	my $guard = cf::lock_acquire "exit_prepare:$exit";
		3010
		3011	prepare_random_map $exit
		3012	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		3013
		3014	$map = $exit->slaying;
		3015
		3016	} elsif ($slaying eq '!up') {
		3017	$map = $exit->map->tile_path (cf::TILE_UP);
		3018	$x = $exit->x;
		3019	$y = $exit->y;
		3020
		3021	} elsif ($slaying eq '!down') {
		3022	$map = $exit->map->tile_path (cf::TILE_DOWN);
		3023	$x = $exit->x;
		3024	$y = $exit->y;
		3025	}
2875		3026
2876	$self->goto ($map, $x, $y);	3027	$self->goto ($map, $x, $y);
2877		3028
2878	# if exit is damned, update players death & WoR home-position	3029	# if exit is damned, update players death & WoR home-position
2879	$self->contr->savebed ($map, $x, $y)	3030	$self->contr->savebed ($map, $x, $y)
…		…
3104	=cut	3255	=cut
3105		3256
3106	sub cf::client::ext_msg($$@) {	3257	sub cf::client::ext_msg($$@) {
3107	my ($self, $type, @msg) = @_;	3258	my ($self, $type, @msg) = @_;
3108		3259
3109	if ($self->extcmd == 2) {
3110	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3260	$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	}	3261	}
3134		3262
3135	=item $success = $client->query ($flags, "text", \&cb)	3263	=item $success = $client->query ($flags, "text", \&cb)
3136		3264
3137	Queues a query to the client, calling the given callback with	3265	Queues a query to the client, calling the given callback with
…		…
3192	my ($ns, $buf) = @_;	3320	my ($ns, $buf) = @_;
3193		3321
3194	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3322	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3195		3323
3196	if (ref $msg) {	3324	if (ref $msg) {
3197	my ($type, $reply, @payload) =	3325	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		3326
3202	my @reply;
3203
3204	if (my $cb = $EXTICMD{$type}) {	3327	if (my $cb = $EXTIACMD{$type}) {
		3328	$cb->(
		3329	$ns,
		3330	sub {
		3331	$ns->ext_msg ("reply-$reply", @_)
		3332	if $reply;
		3333	},
		3334	@payload
		3335	);
		3336	} else {
		3337	my @reply;
		3338
		3339	if (my $cb = $EXTICMD{$type}) {
3205	@reply = $cb->($ns, @payload);	3340	@reply = $cb->($ns, @payload);
		3341	}
		3342
		3343	$ns->ext_msg ("reply-$reply", @reply)
		3344	if $reply;
3206	}	3345	}
3207
3208	$ns->ext_reply ($reply, @reply)
3209	if $reply;
3210
3211	} else {	3346	} else {
3212	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3347	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3213	}	3348	}
3214		3349
3215	cf::override;	3350	cf::override;
…		…
3383	=cut	3518	=cut
3384		3519
3385	#############################################################################	3520	#############################################################################
3386	# the server's init and main functions	3521	# the server's init and main functions
3387		3522
		3523	our %FACEHASH; # hash => idx, #d# HACK for http server
		3524
		3525	# internal api, not fianlised
		3526	sub set_face {
		3527	my ($name, $type, $data) = @_;
		3528
		3529	my $idx = cf::face::find $name;
		3530
		3531	if ($idx) {
		3532	delete $FACEHASH{cf::face::get_chksum $idx};
		3533	} else {
		3534	$idx = cf::face::alloc $name;
		3535	}
		3536
		3537	my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
		3538
		3539	cf::face::set_type $idx, $type;
		3540	cf::face::set_data $idx, 0, $data, $hash;
		3541	cf::face::set_meta $idx, $type & 1 ? undef : undef;
		3542	$FACEHASH{$hash} = $idx;#d#
		3543
		3544	$idx
		3545	}
		3546
3388	sub load_facedata($) {	3547	sub load_facedata($) {
3389	my ($path) = @_;	3548	my ($path) = @_;
3390		3549
3391	# HACK to clear player env face cache, we need some signal framework	3550	# HACK to clear player env face cache, we need some signal framework
3392	# for this (global event?)	3551	# for this (global event?)
…		…
3394		3553
3395	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3554	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3396		3555
3397	trace "loading facedata from $path\n";	3556	trace "loading facedata from $path\n";
3398		3557
3399	0 < aio_load $path, my $facedata	3558	my $facedata = decode_storable load_file $path;
3400	or die "$path: $!";
3401
3402	$facedata = Coro::Storable::thaw $facedata;
3403		3559
3404	$facedata->{version} == 2	3560	$facedata->{version} == 2
3405	or cf::cleanup "$path: version mismatch, cannot proceed.";	3561	or cf::cleanup "$path: version mismatch, cannot proceed.";
3406		3562
3407	# patch in the exptable
3408	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3409	$facedata->{resource}{"res/exp_table"} = {
3410	type => FT_RSRC,
3411	data => $exp_table,
3412	hash => (Digest::MD5::md5 $exp_table),
3413	};
3414	cf::cede_to_tick;	3563	cf::cede_to_tick;
3415		3564
3416	{	3565	{
3417	my $faces = $facedata->{faceinfo};	3566	my $faces = delete $facedata->{faceinfo};
3418		3567
3419	while (my ($face, $info) = each %$faces) {	3568	for my $face (sort keys %$faces) {
		3569	my $info = $faces->{$face};
3420	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3570	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3421		3571
3422	cf::face::set_visibility $idx, $info->{visibility};	3572	cf::face::set_visibility $idx, $info->{visibility};
3423	cf::face::set_magicmap $idx, $info->{magicmap};	3573	cf::face::set_magicmap $idx, $info->{magicmap};
3424	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3574	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3425	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3575	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3426		3576	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
		3577	$FACEHASH{$info->{hash64}} = $idx;#d#
		3578
3427	cf::cede_to_tick;	3579	cf::cede_to_tick;
3428	}	3580	}
3429		3581
3430	while (my ($face, $info) = each %$faces) {	3582	while (my ($face, $info) = each %$faces) {
3431	next unless $info->{smooth};	3583	next unless $info->{smooth};
…		…
3443	cf::cede_to_tick;	3595	cf::cede_to_tick;
3444	}	3596	}
3445	}	3597	}
3446		3598
3447	{	3599	{
3448	my $anims = $facedata->{animinfo};	3600	my $anims = delete $facedata->{animinfo};
3449		3601
3450	while (my ($anim, $info) = each %$anims) {	3602	while (my ($anim, $info) = each %$anims) {
3451	cf::anim::set $anim, $info->{frames}, $info->{facings};	3603	cf::anim::set $anim, $info->{frames}, $info->{facings};
3452	cf::cede_to_tick;	3604	cf::cede_to_tick;
3453	}	3605	}
3454		3606
3455	cf::anim::invalidate_all; # d'oh	3607	cf::anim::invalidate_all; # d'oh
3456	}	3608	}
3457		3609
3458	{	3610	{
3459	my $res = $facedata->{resource};	3611	my $res = delete $facedata->{resource};
3460		3612
3461	while (my ($name, $info) = each %$res) {	3613	while (my ($name, $info) = each %$res) {
3462	if (defined $info->{type}) {	3614	if (defined (my $type = $info->{type})) {
		3615	# 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;	3616	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3464		3617
		3618	cf::face::set_type $idx, $type;
3465	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};	3619	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3466	cf::face::set_type $idx, $info->{type};	3620	cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3621	$FACEHASH{$info->{hash}} = $idx;#d#
3467	} else {	3622	} else {
3468	$RESOURCE{$name} = $info; # unused	3623	# $RESOURCE{$name} = $info; # unused
3469	}	3624	}
3470		3625
3471	cf::cede_to_tick;	3626	cf::cede_to_tick;
3472	}	3627	}
3473	}	3628	}
…		…
3491	my $status = load_resource_file_ $_[0];	3646	my $status = load_resource_file_ $_[0];
3492	get_slot 0.1, 100;	3647	get_slot 0.1, 100;
3493	cf::arch::commit_load;	3648	cf::arch::commit_load;
3494		3649
3495	$status	3650	$status
		3651	}
		3652
		3653	sub reload_exp_table {
		3654	_reload_exp_table;
		3655
		3656	set_face "res/exp_table" => FT_RSRC,
		3657	JSON::XS->new->utf8->canonical->encode (
		3658	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3659	);
		3660	}
		3661
		3662	sub reload_materials {
		3663	_reload_materials;
3496	}	3664	}
3497		3665
3498	sub reload_regions {	3666	sub reload_regions {
3499	# HACK to clear player env face cache, we need some signal framework	3667	# HACK to clear player env face cache, we need some signal framework
3500	# for this (global event?)	3668	# for this (global event?)
…		…
3515	}	3683	}
3516		3684
3517	sub reload_archetypes {	3685	sub reload_archetypes {
3518	load_resource_file "$DATADIR/archetypes"	3686	load_resource_file "$DATADIR/archetypes"
3519	or die "unable to load archetypes\n";	3687	or die "unable to load archetypes\n";
		3688
		3689	set_face "res/skill_info" => FT_RSRC,
		3690	JSON::XS->new->utf8->canonical->encode (
		3691	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3692	);
		3693	set_face "res/spell_paths" => FT_RSRC,
		3694	JSON::XS->new->utf8->canonical->encode (
		3695	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3696	);
3520	}	3697	}
3521		3698
3522	sub reload_treasures {	3699	sub reload_treasures {
3523	load_resource_file "$DATADIR/treasures"	3700	load_resource_file "$DATADIR/treasures"
3524	or die "unable to load treasurelists\n";	3701	or die "unable to load treasurelists\n";
3525	}	3702	}
3526		3703
3527	sub reload_sound {	3704	sub reload_sound {
3528	trace "loading sound config from $DATADIR/sound\n";	3705	trace "loading sound config from $DATADIR/sound\n";
3529		3706
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);	3707	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3534		3708
3535	for (0 .. SOUND_CAST_SPELL_0 - 1) {	3709	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3536	my $sound = $soundconf->{compat}[$_]	3710	my $sound = $soundconf->{compat}[$_]
3537	or next;	3711	or next;
3538		3712
…		…
3548	}	3722	}
3549		3723
3550	sub reload_resources {	3724	sub reload_resources {
3551	trace "reloading resource files...\n";	3725	trace "reloading resource files...\n";
3552		3726
3553	reload_exp_table;
3554	reload_materials;	3727	reload_materials;
3555	reload_facedata;	3728	reload_facedata;
		3729	reload_exp_table;
3556	reload_sound;	3730	reload_sound;
3557	reload_archetypes;	3731	reload_archetypes;
3558	reload_regions;	3732	reload_regions;
3559	reload_treasures;	3733	reload_treasures;
3560		3734
…		…
3562	}	3736	}
3563		3737
3564	sub reload_config {	3738	sub reload_config {
3565	trace "reloading config file...\n";	3739	trace "reloading config file...\n";
3566		3740
3567	0 < aio_load "$CONFDIR/config", my $config	3741	my $config = load_file "$CONFDIR/config";
3568	or die "$CONFDIR/config: $!";
3569
3570	utf8::decode $config;	3742	utf8::decode $config;
3571	*CFG = yaml_load $config;	3743	*CFG = decode_yaml $config;
3572		3744
3573	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];	3745	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3574		3746
3575	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3747	$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};	3748	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
3614		3786
3615	sub main {	3787	sub main {
3616	cf::init_globals; # initialise logging	3788	cf::init_globals; # initialise logging
3617		3789
3618	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3790	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3619	LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3791	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3620	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3792	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3621	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3793	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3622		3794
3623	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3795	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3624		3796
3625	# we must not ever block the main coroutine	3797	# we must not ever block the main coroutine
3626	local $Coro::idle = sub {	3798	$Coro::idle = sub {
3627	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3799	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3628	(async {	3800	(async {
3629	$Coro::current->{desc} = "IDLE BUG HANDLER";	3801	$Coro::current->{desc} = "IDLE BUG HANDLER";
3630	EV::loop EV::LOOP_ONESHOT;	3802	EV::loop EV::LOOP_ONESHOT;
3631	})->prio (Coro::PRIO_MAX);	3803	})->prio (Coro::PRIO_MAX);
…		…
3634	evthread_start IO::AIO::poll_fileno;	3806	evthread_start IO::AIO::poll_fileno;
3635		3807
3636	cf::sync_job {	3808	cf::sync_job {
3637	cf::incloader::init ();	3809	cf::incloader::init ();
3638		3810
		3811	db_init;
		3812
3639	cf::init_anim;	3813	cf::init_anim;
3640	cf::init_attackmess;	3814	cf::init_attackmess;
3641	cf::init_dynamic;	3815	cf::init_dynamic;
3642		3816
3643	cf::load_settings;	3817	cf::load_settings;
3644		3818
3645	reload_resources;	3819	reload_resources;
3646	reload_config;	3820	reload_config;
3647	db_init;
3648		3821
3649	cf::init_uuid;	3822	cf::init_uuid;
3650	cf::init_signals;	3823	cf::init_signals;
3651	cf::init_skills;	3824	cf::init_skills;
3652		3825
…		…
3660		3833
3661	# no (long-running) fork's whatsoever before this point(!)	3834	# no (long-running) fork's whatsoever before this point(!)
3662	use POSIX ();	3835	use POSIX ();
3663	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3836	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3664		3837
3665	(pop @POST_INIT)->(0) while @POST_INIT;	3838	cf::_post_init 0;
3666	};	3839	};
3667		3840
3668	cf::object::thawer::errors_are_fatal 0;	3841	cf::object::thawer::errors_are_fatal 0;
3669	info "parse errors in files are no longer fatal from this point on.\n";	3842	info "parse errors in files are no longer fatal from this point on.\n";
3670		3843
3671	my $free_main; $free_main = EV::idle sub {	3844	AE::postpone {
3672	undef $free_main;
3673	undef &main; # free gobs of memory :)	3845	undef &main; # free gobs of memory :)
3674	};	3846	};
3675		3847
3676	goto &main_loop;	3848	goto &main_loop;
3677	}	3849	}
…		…
3834		4006
3835	cf::write_runtime_sync; # external watchdog should not bark	4007	cf::write_runtime_sync; # external watchdog should not bark
3836		4008
3837	trace "emergency_perl_save: flushing outstanding aio requests";	4009	trace "emergency_perl_save: flushing outstanding aio requests";
3838	while (IO::AIO::nreqs || BDB::nreqs) {	4010	while (IO::AIO::nreqs || BDB::nreqs) {
3839	Coro::EV::timer_once 0.01; # let the sync_job do it's thing	4011	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3840	}	4012	}
3841		4013
3842	cf::write_runtime_sync; # external watchdog should not bark	4014	cf::write_runtime_sync; # external watchdog should not bark
3843	};	4015	};
3844		4016
…		…
3893		4065
3894	my $t1 = AE::time;	4066	my $t1 = AE::time;
3895		4067
3896	while ($RELOAD) {	4068	while ($RELOAD) {
3897	cf::get_slot 0.1, -1, "reload_perl";	4069	cf::get_slot 0.1, -1, "reload_perl";
3898	info "reloading...";	4070	info "perl_reload: reloading...";
3899		4071
3900	trace "entering sync_job";	4072	trace "perl_reload: entering sync_job";
3901		4073
3902	cf::sync_job {	4074	cf::sync_job {
3903	#cf::emergency_save;	4075	#cf::emergency_save;
3904		4076
3905	trace "cancelling all extension coros";	4077	trace "perl_reload: cancelling all extension coros";
3906	$_->cancel for values %EXT_CORO;	4078	$_->cancel for values %EXT_CORO;
3907	%EXT_CORO = ();	4079	%EXT_CORO = ();
3908		4080
3909	trace "removing commands";	4081	trace "perl_reload: removing commands";
3910	%COMMAND = ();	4082	%COMMAND = ();
3911		4083
3912	trace "removing ext/exti commands";	4084	trace "perl_reload: removing ext/exti commands";
3913	%EXTCMD = ();	4085	%EXTCMD = ();
3914	%EXTICMD = ();	4086	%EXTICMD = ();
3915		4087
3916	trace "unloading/nuking all extensions";	4088	trace "perl_reload: unloading/nuking all extensions";
3917	for my $pkg (@EXTS) {	4089	for my $pkg (@EXTS) {
3918	trace "... unloading $pkg";	4090	trace "... unloading $pkg";
3919		4091
3920	if (my $cb = $pkg->can ("unload")) {	4092	if (my $cb = $pkg->can ("unload")) {
3921	eval {	4093	eval {
…		…
3926		4098
3927	trace "... clearing $pkg";	4099	trace "... clearing $pkg";
3928	clear_package $pkg;	4100	clear_package $pkg;
3929	}	4101	}
3930		4102
3931	trace "unloading all perl modules loaded from $LIBDIR";	4103	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3932	while (my ($k, $v) = each %INC) {	4104	while (my ($k, $v) = each %INC) {
3933	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4105	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3934		4106
3935	trace "... unloading $k";	4107	trace "... unloading $k";
3936	delete $INC{$k};	4108	delete $INC{$k};
…		…
3943	}	4115	}
3944		4116
3945	clear_package $k;	4117	clear_package $k;
3946	}	4118	}
3947		4119
3948	trace "getting rid of safe::, as good as possible";	4120	trace "perl_reload: getting rid of safe::, as good as possible";
3949	clear_package "safe::$_"	4121	clear_package "safe::$_"
3950	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4122	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3951		4123
3952	trace "unloading cf.pm \"a bit\"";	4124	trace "perl_reload: unloading cf.pm \"a bit\"";
3953	delete $INC{"cf.pm"};	4125	delete $INC{"cf.pm"};
3954	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4126	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3955		4127
3956	# don't, removes xs symbols, too,	4128	# don't, removes xs symbols, too,
3957	# and global variables created in xs	4129	# and global variables created in xs
3958	#clear_package __PACKAGE__;	4130	#clear_package __PACKAGE__;
3959		4131
3960	info "unload completed, starting to reload now";	4132	info "perl_reload: unload completed, starting to reload now";
3961		4133
3962	trace "reloading cf.pm";	4134	trace "perl_reload: reloading cf.pm";
3963	require cf;	4135	require cf;
3964	cf::_connect_to_perl_1;	4136	cf::_connect_to_perl_1;
3965		4137
3966	trace "loading config and database again";	4138	trace "perl_reload: loading config and database again";
3967	cf::reload_config;	4139	cf::reload_config;
3968		4140
3969	trace "loading extensions";	4141	trace "perl_reload: loading extensions";
3970	cf::load_extensions;	4142	cf::load_extensions;
3971		4143
3972	if ($REATTACH_ON_RELOAD) {	4144	if ($REATTACH_ON_RELOAD) {
3973	trace "reattaching attachments to objects/players";	4145	trace "perl_reload: reattaching attachments to objects/players";
3974	_global_reattach; # objects, sockets	4146	_global_reattach; # objects, sockets
3975	trace "reattaching attachments to maps";	4147	trace "perl_reload: reattaching attachments to maps";
3976	reattach $_ for values %MAP;	4148	reattach $_ for values %MAP;
3977	trace "reattaching attachments to players";	4149	trace "perl_reload: reattaching attachments to players";
3978	reattach $_ for values %PLAYER;	4150	reattach $_ for values %PLAYER;
3979	}	4151	}
3980		4152
3981	trace "running post_init jobs";	4153	cf::_post_init 1;
3982	(pop @POST_INIT)->(1) while @POST_INIT;
3983		4154
3984	trace "leaving sync_job";	4155	trace "perl_reload: leaving sync_job";
3985		4156
3986	1	4157	1
3987	} or do {	4158	} or do {
3988	error $@;	4159	error $@;
3989	cf::cleanup "error while reloading, exiting.";	4160	cf::cleanup "perl_reload: error, exiting.";
3990	};	4161	};
3991		4162
3992	info "reloaded";
3993	--$RELOAD;	4163	--$RELOAD;
3994	}	4164	}
3995		4165
3996	$t1 = AE::time - $t1;	4166	$t1 = AE::time - $t1;
3997	info "reload completed in ${t1}s\n";	4167	info "perl_reload: completed in ${t1}s\n";
3998	};	4168	};
3999		4169
4000	our $RELOAD_WATCHER; # used only during reload	4170	our $RELOAD_WATCHER; # used only during reload
4001		4171
4002	sub reload_perl() {	4172	sub reload_perl() {
…		…
4027		4197
4028	#############################################################################	4198	#############################################################################
4029		4199
4030	my $bug_warning = 0;	4200	my $bug_warning = 0;
4031		4201
4032	our @WAIT_FOR_TICK;
4033	our @WAIT_FOR_TICK_BEGIN;
4034
4035	sub wait_for_tick() {	4202	sub wait_for_tick() {
4036	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4203	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4037		4204
4038	my $signal = new Coro::Signal;	4205	$WAIT_FOR_TICK->wait;
4039	push @WAIT_FOR_TICK, $signal;
4040	$signal->wait;
4041	}	4206	}
4042		4207
4043	sub wait_for_tick_begin() {	4208	sub wait_for_tick_begin() {
4044	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4209	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4045		4210
4046	my $signal = new Coro::Signal;	4211	my $signal = new Coro::Signal;
4047	push @WAIT_FOR_TICK_BEGIN, $signal;	4212	push @WAIT_FOR_TICK_BEGIN, $signal;
4048	$signal->wait;	4213	$signal->wait;
4049	}	4214	}
…		…
4053	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4218	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4054	unless ++$bug_warning > 10;	4219	unless ++$bug_warning > 10;
4055	return;	4220	return;
4056	}	4221	}
4057		4222
4058	cf::server_tick; # one server iteration	4223	cf::one_tick; # one server iteration
4059		4224
4060	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#	4225	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4061		4226
4062	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4227	if ($NOW >= $NEXT_RUNTIME_WRITE) {
4063	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4228	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
…		…
4069	}	4234	}
4070		4235
4071	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4236	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4072	$sig->send;	4237	$sig->send;
4073	}	4238	}
4074	while (my $sig = shift @WAIT_FOR_TICK) {	4239	$WAIT_FOR_TICK->broadcast;
4075	$sig->send;
4076	}
4077		4240
4078	$LOAD = ($NOW - $TICK_START) / $TICK;	4241	$LOAD = ($NOW - $TICK_START) / $TICK;
4079	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4242	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4080		4243
4081	if (0) {	4244	if (0) {
…		…
4087	}	4250	}
4088	}	4251	}
4089		4252
4090	{	4253	{
4091	# configure BDB	4254	# configure BDB
		4255	info "initialising database";
4092		4256
4093	BDB::min_parallel 16;	4257	BDB::min_parallel 16;
4094	BDB::max_poll_reqs $TICK * 0.1;	4258	BDB::max_poll_reqs $TICK * 0.1;
4095	$AnyEvent::BDB::WATCHER->priority (1);	4259	#$AnyEvent::BDB::WATCHER->priority (1);
4096		4260
4097	unless ($DB_ENV) {	4261	unless ($DB_ENV) {
4098	$DB_ENV = BDB::db_env_create;	4262	$DB_ENV = BDB::db_env_create;
4099	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4263	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4100	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4264	$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 { };	4289	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4126	};	4290	};
4127	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4291	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4128	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4292	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4129	};	4293	};
		4294
		4295	info "database initialised";
4130	}	4296	}
4131		4297
4132	{	4298	{
4133	# configure IO::AIO	4299	# configure IO::AIO
4134		4300
		4301	info "initialising aio";
4135	IO::AIO::min_parallel 8;	4302	IO::AIO::min_parallel 8;
4136	IO::AIO::max_poll_time $TICK * 0.1;	4303	IO::AIO::max_poll_time $TICK * 0.1;
4137	undef $AnyEvent::AIO::WATCHER;	4304	undef $AnyEvent::AIO::WATCHER;
		4305	info "aio initialised";
4138	}	4306	}
4139		4307
4140	my $_log_backtrace;	4308	our $_log_backtrace;
		4309	our $_log_backtrace_last;
4141		4310
4142	sub _log_backtrace {	4311	sub _log_backtrace {
4143	my ($msg, @addr) = @_;	4312	my ($msg, @addr) = @_;
4144		4313
4145	$msg =~ s/\n//;	4314	$msg =~ s/\n$//;
4146		4315
		4316	if ($_log_backtrace_last eq $msg) {
		4317	LOG llevInfo, "[ABT] $msg\n";
		4318	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4147	# limit the # of concurrent backtraces	4319	# limit the # of concurrent backtraces
4148	if ($_log_backtrace < 2) {	4320	} elsif ($_log_backtrace < 2) {
		4321	$_log_backtrace_last = $msg;
4149	++$_log_backtrace;	4322	++$_log_backtrace;
4150	my $perl_bt = Carp::longmess $msg;	4323	my $perl_bt = Carp::longmess $msg;
4151	async {	4324	async {
4152	$Coro::current->{desc} = "abt $msg";	4325	$Coro::current->{desc} = "abt $msg";
4153		4326
…		…
4173	LOG llevInfo, "[ABT] $_\n" for @bt;	4346	LOG llevInfo, "[ABT] $_\n" for @bt;
4174	--$_log_backtrace;	4347	--$_log_backtrace;
4175	};	4348	};
4176	} else {	4349	} else {
4177	LOG llevInfo, "[ABT] $msg\n";	4350	LOG llevInfo, "[ABT] $msg\n";
4178	LOG llevInfo, "[ABT] [suppressed]\n";	4351	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4179	}	4352	}
4180	}	4353	}
4181		4354
4182	# load additional modules	4355	# load additional modules
4183	require "cf/$_.pm" for @EXTRA_MODULES;	4356	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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