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.529 by root, Wed Apr 28 11:28: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
25	use 5.10.0;	25	use common::sense;
26	use utf8;
27	use strict qw(vars subs);
28		26
29	use Symbol;	27	use Symbol;
30	use List::Util;	28	use List::Util;
31	use Socket;	29	use Socket;
32	use EV;	30	use EV;
…		…
34	use Safe;	32	use Safe;
35	use Safe::Hole;	33	use Safe::Hole;
36	use Storable ();	34	use Storable ();
37	use Carp ();	35	use Carp ();
38		36
39	use Guard ();	37	use AnyEvent ();
		38	use AnyEvent::IO ();
		39	use AnyEvent::DNS ();
		40
40	use Coro ();	41	use Coro ();
41	use Coro::State;	42	use Coro::State;
42	use Coro::Handle;	43	use Coro::Handle;
43	use Coro::EV;	44	use Coro::EV;
44	use Coro::AnyEvent;	45	use Coro::AnyEvent;
…		…
50	use Coro::AIO;	51	use Coro::AIO;
51	use Coro::BDB 1.6;	52	use Coro::BDB 1.6;
52	use Coro::Storable;	53	use Coro::Storable;
53	use Coro::Util ();	54	use Coro::Util ();
54		55
		56	use Guard ();
55	use JSON::XS 2.01 ();	57	use JSON::XS 2.01 ();
56	use BDB ();	58	use BDB ();
57	use Data::Dumper;	59	use Data::Dumper;
58	use Fcntl;	60	use Fcntl;
59	use YAML::XS ();	61	use YAML::XS ();
60	use IO::AIO ();	62	use IO::AIO ();
61	use Time::HiRes;
62	use Compress::LZF;	63	use Compress::LZF;
63	use Digest::MD5 ();	64	use Digest::MD5 ();
64		65
65	AnyEvent::detect;	66	AnyEvent::detect;
66		67
…		…
78	# strictly for debugging	79	# strictly for debugging
79	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };	80	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80		81
81	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	82	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82		83
		84	our @ORIG_INC;
		85
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;	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
…		…
124	our $BDB_DEADLOCK_WATCHER;	131	our $BDB_DEADLOCK_WATCHER;
125	our $BDB_CHECKPOINT_WATCHER;	132	our $BDB_CHECKPOINT_WATCHER;
126	our $BDB_TRICKLE_WATCHER;	133	our $BDB_TRICKLE_WATCHER;
127	our $DB_ENV;	134	our $DB_ENV;
128		135
129	our @EXTRA_MODULES = qw(pod match mapscript);	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.
…		…
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. cf::wait_for_tick_begin only
238	returns directly I<after> the tick processing (and consequently, can only wake one process	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.
		271
		272	=cut
		273
		274	sub wait_for_tick();
		275	sub wait_for_tick_begin();
240		276
241	=item @cf::INVOKE_RESULTS	277	=item @cf::INVOKE_RESULTS
242		278
243	This array contains the results of the last C<invoke ()> call. When	279	This array contains the results of the last C<invoke ()> call. When
244	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of	280	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
…		…
252		288
253	=back	289	=back
254		290
255	=cut	291	=cut
256		292
		293	sub error(@) { LOG llevError, join "", @_ }
		294	sub warn (@) { LOG llevWarn , join "", @_ }
		295	sub info (@) { LOG llevInfo , join "", @_ }
		296	sub debug(@) { LOG llevDebug, join "", @_ }
		297	sub trace(@) { LOG llevTrace, join "", @_ }
		298
257	$Coro::State::WARNHOOK = sub {	299	$Coro::State::WARNHOOK = sub {
258	my $msg = join "", @_;	300	my $msg = join "", @_;
259		301
260	$msg .= "\n"	302	$msg .= "\n"
261	unless $msg =~ /\n$/;	303	unless $msg =~ /\n$/;
262		304
263	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	305	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
264		306
265	LOG llevError, $msg;	307	LOG llevWarn, $msg;
266	};	308	};
267		309
268	$Coro::State::DIEHOOK = sub {	310	$Coro::State::DIEHOOK = sub {
269	return unless $^S eq 0; # "eq", not "=="	311	return unless $^S eq 0; # "eq", not "=="
270		312
271	warn Carp::longmess $_[0];	313	error Carp::longmess $_[0];
272		314
273	if (in_main) {#d#	315	if (in_main) {#d#
274	warn "DIEHOOK called in main context, Coro bug?\n";#d#	316	error "DIEHOOK called in main context, Coro bug?\n";#d#
275	return;#d#	317	return;#d#
276	}#d#	318	}#d#
277		319
278	# kill coroutine otherwise	320	# kill coroutine otherwise
279	Coro::terminate	321	Coro::terminate
…		…
299	)) {	341	)) {
300	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	342	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
301	}	343	}
302		344
303	$EV::DIED = sub {	345	$EV::DIED = sub {
304	Carp::cluck "error in event callback: @_";	346	warn "error in event callback: $@";
305	};	347	};
		348
		349	#############################################################################
		350
		351	sub fork_call(&@);
		352	sub get_slot($;$$);
306		353
307	#############################################################################	354	#############################################################################
308		355
309	=head2 UTILITY FUNCTIONS	356	=head2 UTILITY FUNCTIONS
310		357
…		…
331	$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;
332	$d	379	$d
333	} || "[unable to dump $_[0]: '$@']";	380	} || "[unable to dump $_[0]: '$@']";
334	}	381	}
335		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
336	=item $ref = cf::decode_json $json	435	=item $ref = cf::decode_json $json
337		436
338	Converts a JSON string into the corresponding perl data structure.	437	Converts a JSON string into the corresponding perl data structure.
339		438
340	=item $json = cf::encode_json $ref	439	=item $json = cf::encode_json $ref
…		…
346	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
347		446
348	sub encode_json($) { $json_coder->encode ($_[0]) }	447	sub encode_json($) { $json_coder->encode ($_[0]) }
349	sub decode_json($) { $json_coder->decode ($_[0]) }	448	sub decode_json($) { $json_coder->decode ($_[0]) }
350		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
		458	=item $ref = cf::decode_yaml $scalar
		459
		460	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
		461
		462	=cut
		463
		464	sub decode_yaml($) {
		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]
		479	}
		480
351	=item cf::post_init { BLOCK }	481	=item cf::post_init { BLOCK }
352		482
353	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,
354	but I<before> the server starts ticking again.	484	but I<before> the server starts ticking again.
355		485
356	The cdoeblock will have a single boolean argument to indicate whether this	486	The codeblock will have a single boolean argument to indicate whether this
357	is a reload or not.	487	is a reload or not.
358		488
359	=cut	489	=cut
360		490
361	sub post_init(&) {	491	sub post_init(&) {
362	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	}
363	}	510	}
364		511
365	=item cf::lock_wait $string	512	=item cf::lock_wait $string
366		513
367	Wait until the given lock is available. See cf::lock_acquire.	514	Wait until the given lock is available. See cf::lock_acquire.
…		…
420	EV::periodic $start, $interval, 0, $cb	567	EV::periodic $start, $interval, 0, $cb
421	}	568	}
422		569
423	=item cf::get_slot $time[, $priority[, $name]]	570	=item cf::get_slot $time[, $priority[, $name]]
424		571
425	Allocate $time seconds of blocking CPU time at priority C<$priority>:	572	Allocate $time seconds of blocking CPU time at priority C<$priority>
426	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
427	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.
428		579
429	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
430	used for statistical purposes and should identify the same time-class.	581	used for statistical purposes and should identify the same time-class.
431		582
432	Useful for short background jobs.	583	Useful for short background jobs.
…		…
461	}	612	}
462	}	613	}
463		614
464	if (@SLOT_QUEUE) {	615	if (@SLOT_QUEUE) {
465	# 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
466	push @cf::WAIT_FOR_TICK, $signal;	617	$WAIT_FOR_TICK->wait;
467	$signal->wait;
468	} else {	618	} else {
469	$busy = 0;	619	$busy = 0;
470	Coro::schedule;	620	Coro::schedule;
471	}	621	}
472	}	622	}
…		…
512	=cut	662	=cut
513		663
514	sub sync_job(&) {	664	sub sync_job(&) {
515	my ($job) = @_;	665	my ($job) = @_;
516		666
517	if ($Coro::current == $Coro::main) {	667	if (in_main) {
518	my $time = AE::time;	668	my $time = AE::time;
519		669
520	# this is the main coro, too bad, we have to block	670	# this is the main coro, too bad, we have to block
521	# till the operation succeeds, freezing the server :/	671	# till the operation succeeds, freezing the server :/
522		672
523	LOG llevError, Carp::longmess "sync job";#d#	673	#LOG llevError, Carp::longmess "sync job";#d#
524		674
525	my $freeze_guard = freeze_mainloop;	675	my $freeze_guard = freeze_mainloop;
526		676
527	my $busy = 1;	677	my $busy = 1;
528	my @res;	678	my @res;
529		679
530	(async {	680	(async {
531	$Coro::current->desc ("sync job coro");	681	$Coro::current->desc ("sync job coro");
532	@res = eval { $job->() };	682	@res = eval { $job->() };
533	warn $@ if $@;	683	error $@ if $@;
534	undef $busy;	684	undef $busy;
535	})->prio (Coro::PRIO_MAX);	685	})->prio (Coro::PRIO_MAX);
536		686
537	while ($busy) {	687	while ($busy) {
538	if (Coro::nready) {	688	if (Coro::nready) {
…		…
572	$EXT_CORO{$coro+0} = $coro;	722	$EXT_CORO{$coro+0} = $coro;
573		723
574	$coro	724	$coro
575	}	725	}
576		726
577	=item fork_call { }, $args	727	=item fork_call { }, @args
578		728
579	Executes the given code block with the given arguments in a seperate	729	Executes the given code block with the given arguments in a seperate
580	process, returning the results. Everything must be serialisable with	730	process, returning the results. Everything must be serialisable with
581	Coro::Storable. May, of course, block. Note that the executed sub may	731	Coro::Storable. May, of course, block. Note that the executed sub may
582	never block itself or use any form of event handling.	732	never block itself or use any form of event handling.
583		733
584	=cut	734	=cut
585		735
		736	sub post_fork {
		737	reset_signals;
		738	}
		739
586	sub fork_call(&@) {	740	sub fork_call(&@) {
587	my ($cb, @args) = @_;	741	my ($cb, @args) = @_;
588		742
589	# we seemingly have to make a local copy of the whole thing,	743	# we seemingly have to make a local copy of the whole thing,
590	# otherwise perl prematurely frees the stuff :/	744	# otherwise perl prematurely frees the stuff :/
591	# TODO: investigate and fix (likely this will be rather laborious)	745	# TODO: investigate and fix (likely this will be rather laborious)
592		746
593	my @res = Coro::Util::fork_eval {	747	my @res = Coro::Util::fork_eval {
594	reset_signals;	748	cf::post_fork;
595	&$cb	749	&$cb
596	}, @args;	750	} @args;
597		751
598	wantarray ? @res : $res[-1]	752	wantarray ? @res : $res[-1]
599	}	753	}
600		754
601	sub objinfo {	755	sub objinfo {
…		…
651	within each server.	805	within each server.
652		806
653	=cut	807	=cut
654		808
655	sub db_table($) {	809	sub db_table($) {
		810	cf::error "db_get called from main context"
		811	if $Coro::current == $Coro::main;
		812
656	my ($name) = @_;	813	my ($name) = @_;
657	my $db = BDB::db_create $DB_ENV;	814	my $db = BDB::db_create $DB_ENV;
658		815
659	eval {	816	eval {
660	$db->set_flags (BDB::CHKSUM);	817	$db->set_flags (BDB::CHKSUM);
…		…
670	}	827	}
671		828
672	our $DB;	829	our $DB;
673		830
674	sub db_init {	831	sub db_init {
675	cf::sync_job {
676	$DB ||= db_table "db";	832	$DB ||= db_table "db";
677	};
678	}	833	}
679		834
680	sub db_get($$) {	835	sub db_get($$) {
681	my $key = "$_[0]/$_[1]";	836	my $key = "$_[0]/$_[1]";
682		837
683	cf::sync_job {	838	cf::error "db_get called from main context"
		839	if $Coro::current == $Coro::main;
		840
684	BDB::db_get $DB, undef, $key, my $data;	841	BDB::db_get $DB, undef, $key, my $data;
685		842
686	$! ? ()	843	$! ? ()
687	: $data	844	: $data
688	}
689	}	845	}
690		846
691	sub db_put($$$) {	847	sub db_put($$$) {
692	BDB::dbreq_pri 4;	848	BDB::dbreq_pri 4;
693	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	849	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
721		877
722	my @data;	878	my @data;
723	my $md5;	879	my $md5;
724		880
725	for (0 .. $#$src) {	881	for (0 .. $#$src) {
726	0 <= aio_load $src->[$_], $data[$_]	882	$data[$_] = load_file $src->[$_];
727	or Carp::croak "$src->[$_]: $!";
728	}	883	}
729		884
730	# if processing is expensive, check	885	# if processing is expensive, check
731	# checksum first	886	# checksum first
732	if (1) {	887	if (1) {
…		…
745		900
746	return db_get cache => "$id/data";	901	return db_get cache => "$id/data";
747	}	902	}
748	}	903	}
749		904
750	my $t1 = Time::HiRes::time;	905	my $t1 = EV::time;
751	my $data = $process->(\@data);	906	my $data = $process->(\@data);
752	my $t2 = Time::HiRes::time;	907	my $t2 = EV::time;
753		908
754	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	909	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
755		910
756	db_put cache => "$id/data", $data;	911	db_put cache => "$id/data", $data;
757	db_put cache => "$id/md5" , $md5;	912	db_put cache => "$id/md5" , $md5;
758	db_put cache => "$id/meta", $meta;	913	db_put cache => "$id/meta", $meta;
759		914
…		…
769		924
770	=cut	925	=cut
771		926
772	sub datalog($@) {	927	sub datalog($@) {
773	my ($type, %kv) = @_;	928	my ($type, %kv) = @_;
774	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	929	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
775	}	930	}
776		931
777	=back	932	=back
778		933
779	=cut	934	=cut
…		…
974		1129
975	} elsif (exists $cb_id{$type}) {	1130	} elsif (exists $cb_id{$type}) {
976	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	1131	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
977		1132
978	} elsif (ref $type) {	1133	} elsif (ref $type) {
979	warn "attaching objects not supported, ignoring.\n";	1134	error "attaching objects not supported, ignoring.\n";
980		1135
981	} else {	1136	} else {
982	shift @arg;	1137	shift @arg;
983	warn "attach argument '$type' not supported, ignoring.\n";	1138	error "attach argument '$type' not supported, ignoring.\n";
984	}	1139	}
985	}	1140	}
986	}	1141	}
987		1142
988	sub _object_attach {	1143	sub _object_attach {
…		…
998	_attach $registry, $klass, @attach;	1153	_attach $registry, $klass, @attach;
999	}	1154	}
1000		1155
1001	$obj->{$name} = \%arg;	1156	$obj->{$name} = \%arg;
1002	} else {	1157	} else {
1003	warn "object uses attachment '$name' which is not available, postponing.\n";	1158	info "object uses attachment '$name' which is not available, postponing.\n";
1004	}	1159	}
1005		1160
1006	$obj->{_attachment}{$name} = undef;	1161	$obj->{_attachment}{$name} = undef;
1007	}	1162	}
1008		1163
…		…
1067		1222
1068	for (@$callbacks) {	1223	for (@$callbacks) {
1069	eval { &{$_->[1]} };	1224	eval { &{$_->[1]} };
1070		1225
1071	if ($@) {	1226	if ($@) {
1072	warn "$@";
1073	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1227	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1074	override;	1228	override;
1075	}	1229	}
1076		1230
1077	return 1 if $override;	1231	return 1 if $override;
1078	}	1232	}
…		…
1157	for (@$attach) {	1311	for (@$attach) {
1158	my ($klass, @attach) = @$_;	1312	my ($klass, @attach) = @$_;
1159	_attach $registry, $klass, @attach;	1313	_attach $registry, $klass, @attach;
1160	}	1314	}
1161	} else {	1315	} else {
1162	warn "object uses attachment '$name' that is not available, postponing.\n";	1316	info "object uses attachment '$name' that is not available, postponing.\n";
1163	}	1317	}
1164	}	1318	}
1165	}	1319	}
1166		1320
1167	cf::attachable->attach (	1321	cf::attachable->attach (
…		…
1194	my ($filename, $rdata, $objs) = @_;	1348	my ($filename, $rdata, $objs) = @_;
1195		1349
1196	sync_job {	1350	sync_job {
1197	if (length $$rdata) {	1351	if (length $$rdata) {
1198	utf8::decode (my $decname = $filename);	1352	utf8::decode (my $decname = $filename);
1199	warn sprintf "saving %s (%d,%d)\n",	1353	trace sprintf "saving %s (%d,%d)\n",
1200	$decname, length $$rdata, scalar @$objs	1354	$decname, length $$rdata, scalar @$objs
1201	if $VERBOSE_IO;	1355	if $VERBOSE_IO;
1202		1356
1203	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1357	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1204	aio_chmod $fh, SAVE_MODE;	1358	aio_chmod $fh, SAVE_MODE;
1205	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1359	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
…		…
1228	aio_rename "$filename~", $filename;	1382	aio_rename "$filename~", $filename;
1229		1383
1230	$filename =~ s%/[^/]+$%%;	1384	$filename =~ s%/[^/]+$%%;
1231	aio_pathsync $filename if $cf::USE_FSYNC;	1385	aio_pathsync $filename if $cf::USE_FSYNC;
1232	} else {	1386	} else {
1233	warn "unable to save objects: $filename~: $!\n";	1387	error "unable to save objects: $filename~: $!\n";
1234	}	1388	}
1235	} else {	1389	} else {
1236	aio_unlink $filename;	1390	aio_unlink $filename;
1237	aio_unlink "$filename.pst";	1391	aio_unlink "$filename.pst";
1238	}	1392	}
…		…
1262	my $st = eval { Coro::Storable::thaw $av };	1416	my $st = eval { Coro::Storable::thaw $av };
1263	$av = $st->{objs};	1417	$av = $st->{objs};
1264	}	1418	}
1265		1419
1266	utf8::decode (my $decname = $filename);	1420	utf8::decode (my $decname = $filename);
1267	warn sprintf "loading %s (%d,%d)\n",	1421	trace sprintf "loading %s (%d,%d)\n",
1268	$decname, length $data, scalar @{$av || []}	1422	$decname, length $data, scalar @{$av || []}
1269	if $VERBOSE_IO;	1423	if $VERBOSE_IO;
1270		1424
1271	($data, $av)	1425	($data, $av)
1272	}	1426	}
1273		1427
…		…
1278	=cut	1432	=cut
1279		1433
1280	#############################################################################	1434	#############################################################################
1281	# command handling &c	1435	# command handling &c
1282		1436
1283	=item cf::register_command $name => \&callback($ob,$args);	1437	=item cf::register_command $name => \&callback($ob,$args)
1284		1438
1285	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
1286	$name.	1440	$name.
1287		1441
1288	=cut	1442	=cut
…		…
1294	#warn "registering command '$name/$time' to '$caller'";	1448	#warn "registering command '$name/$time' to '$caller'";
1295		1449
1296	push @{ $COMMAND{$name} }, [$caller, $cb];	1450	push @{ $COMMAND{$name} }, [$caller, $cb];
1297	}	1451	}
1298		1452
1299	=item cf::register_extcmd $name => \&callback($pl,$packet);	1453	=item cf::register_extcmd $name => \&callback($pl,@args)
1300		1454
1301	Register a callback for execution when the client sends an (synchronous)	1455	Register a callback for execution when the client sends an (synchronous)
1302	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
1303	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
1304	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
1305	has logged in successfully.	1459	has logged in successfully.
1306		1460
1307	If the callback returns something, it is sent back as if reply was being	1461	The values will be sent back to the client.
1308	called.
1309		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
1310	=item cf::register_exticmd $name => \&callback($ns,$packet);	1468	=item cf::register_exticmd $name => \&callback($ns,@args)
1311		1469
1312	Register a callback for execution when the client sends an (asynchronous)	1470	Register a callback for execution when the client sends an (asynchronous)
1313	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
1314	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
1315	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
1316	log-in.	1474	log-in.
1317		1475
1318	If the callback returns something, it is sent back as if reply was being	1476	The values will be sent back to the client.
1319	called.
1320		1477
1321	=cut	1478	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1322		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
1323	sub register_extcmd {	1485	sub register_extcmd($$) {
1324	my ($name, $cb) = @_;	1486	my ($name, $cb) = @_;
1325		1487
1326	$EXTCMD{$name} = $cb;	1488	$EXTCMD{$name} = $cb;
1327	}	1489	}
1328		1490
1329	sub register_exticmd {	1491	sub register_async_extcmd($$) {
1330	my ($name, $cb) = @_;	1492	my ($name, $cb) = @_;
1331		1493
		1494	$EXTACMD{$name} = $cb;
		1495	}
		1496
		1497	sub register_exticmd($$) {
		1498	my ($name, $cb) = @_;
		1499
1332	$EXTICMD{$name} = $cb;	1500	$EXTICMD{$name} = $cb;
		1501	}
		1502
		1503	sub register_async_exticmd($$) {
		1504	my ($name, $cb) = @_;
		1505
		1506	$EXTIACMD{$name} = $cb;
1333	}	1507	}
1334		1508
1335	use File::Glob ();	1509	use File::Glob ();
1336		1510
1337	cf::player->attach (	1511	cf::player->attach (
…		…
1351	my ($pl, $buf) = @_;	1525	my ($pl, $buf) = @_;
1352		1526
1353	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1527	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1354		1528
1355	if (ref $msg) {	1529	if (ref $msg) {
1356	my ($type, $reply, @payload) =	1530	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1357	"ARRAY" eq ref $msg
1358	? @$msg
1359	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1360		1531
1361	my @reply;
1362
1363	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}) {
1364	@reply = $cb->($pl, @payload);	1545	@reply = $cb->($pl, @payload);
		1546	}
		1547
		1548	$pl->ext_msg ("reply-$reply", @reply)
		1549	if $reply;
1365	}	1550	}
1366		1551
1367	$pl->ext_reply ($reply, @reply)
1368	if $reply;
1369
1370	} else {	1552	} else {
1371	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1553	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1372	}	1554	}
1373		1555
1374	cf::override;	1556	cf::override;
1375	},	1557	},
1376	);	1558	);
…		…
1386	};	1568	};
1387		1569
1388	$grp	1570	$grp
1389	}	1571	}
1390		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
1391	sub load_extensions {	1584	sub load_extensions {
		1585	info "loading extensions...";
		1586
		1587	%EXT_CFG = ();
		1588
1392	cf::sync_job {	1589	cf::sync_job {
1393	my %todo;	1590	my %todo;
1394		1591
1395	for my $path (<$LIBDIR/*.ext>) {	1592	for my $path (<$LIBDIR/*.ext>) {
1396	next unless -r $path;	1593	next unless -r $path;
…		…
1414		1611
1415	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1612	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1416	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1613	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1417		1614
1418	$ext{source} =	1615	$ext{source} =
1419	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1616	"package $pkg; use common::sense;\n"
1420	. "#line 1 \"$path\"\n{\n"	1617	. "#line 1 \"$path\"\n{\n"
1421	. $source	1618	. $source
1422	. "\n};\n1";	1619	. "\n};\n1";
1423		1620
1424	$todo{$base} = \%ext;	1621	$todo{$base} = \%ext;
…		…
1436	for (split /,\s*/, $v->{meta}{depends}) {	1633	for (split /,\s*/, $v->{meta}{depends}) {
1437	next ext	1634	next ext
1438	unless exists $done{$_};	1635	unless exists $done{$_};
1439	}	1636	}
1440		1637
1441	warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1638	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1442		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
1443	my $active = eval $v->{source};	1649	my $active = eval $source;
1444		1650
1445	if (length $@) {	1651	if (length $@) {
1446	warn "$v->{path}: $@\n";	1652	error "$v->{path}: $@\n";
1447		1653
1448	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1654	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1449	if exists $v->{meta}{mandatory};	1655	if exists $v->{meta}{mandatory};
1450		1656
1451	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";	1657	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
…		…
1453	} else {	1659	} else {
1454	$done{$k} = delete $todo{$k};	1660	$done{$k} = delete $todo{$k};
1455	push @EXTS, $v->{pkg};	1661	push @EXTS, $v->{pkg};
1456	$progress = 1;	1662	$progress = 1;
1457		1663
1458	warn "$v->{base}: extension inactive.\n"	1664	info "$v->{base}: extension inactive.\n"
1459	unless $active;	1665	unless $active;
1460	}	1666	}
1461	}	1667	}
1462		1668
1463	unless ($progress) {	1669	unless ($progress) {
…		…
1465		1671
1466	while (my ($k, $v) = each %todo) {	1672	while (my ($k, $v) = each %todo) {
1467	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1673	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1468	if exists $v->{meta}{mandatory};	1674	if exists $v->{meta}{mandatory};
1469	}	1675	}
		1676
		1677	last;
1470	}	1678	}
1471	}	1679	}
1472	};	1680	};
1473	}	1681	}
1474		1682
…		…
1632	my $name = $pl->ob->name;	1840	my $name = $pl->ob->name;
1633		1841
1634	$pl->{deny_save} = 1;	1842	$pl->{deny_save} = 1;
1635	$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
1636		1844
1637	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1845	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1638	$pl->deactivate;	1846	$pl->deactivate;
		1847
1639	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;
1640	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1849	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1850	ext::highscore::check ($pl->ob);
		1851
1641	$pl->ns->destroy if $pl->ns;	1852	$pl->ns->destroy if $pl->ns;
1642		1853
1643	my $path = playerdir $pl;	1854	my $path = playerdir $pl;
1644	my $temp = "$path~$cf::RUNTIME~deleting~";	1855	my $temp = "$path~$cf::RUNTIME~deleting~";
1645	aio_rename $path, $temp;	1856	aio_rename $path, $temp;
…		…
1731		1942
1732	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1943	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1733		1944
1734	Expand deliantra pod fragments into protocol xml.	1945	Expand deliantra pod fragments into protocol xml.
1735		1946
1736	=item $player->ext_reply ($msgid, @msg)
1737
1738	Sends an ext reply to the player.
1739
1740	=cut
1741
1742	sub ext_reply($$@) {
1743	my ($self, $id, @msg) = @_;
1744
1745	$self->ns->ext_reply ($id, @msg)
1746	}
1747
1748	=item $player->ext_msg ($type, @msg)	1947	=item $player->ext_msg ($type, @msg)
1749		1948
1750	Sends an ext event to the client.	1949	Sends an ext event to the client.
1751		1950
1752	=cut	1951	=cut
…		…
1811	sub generate_random_map {	2010	sub generate_random_map {
1812	my ($self, $rmp) = @_;	2011	my ($self, $rmp) = @_;
1813		2012
1814	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
1815		2014
1816	# mit "rum" bekleckern, nicht
1817	$self->_create_random_map (	2015	$self->_create_random_map ($rmp);
1818	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1819	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1820	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1821	$rmp->{exit_on_final_map},
1822	$rmp->{xsize}, $rmp->{ysize},
1823	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1824	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1825	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1826	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1827	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1828	(cf::region::find $rmp->{region}), $rmp->{custom}
1829	)
1830	}	2016	}
1831		2017
1832	=item cf::map->register ($regex, $prio)	2018	=item cf::map->register ($regex, $prio)
1833		2019
1834	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
…		…
1839		2025
1840	sub register {	2026	sub register {
1841	my (undef, $regex, $prio) = @_;	2027	my (undef, $regex, $prio) = @_;
1842	my $pkg = caller;	2028	my $pkg = caller;
1843		2029
1844	no strict;
1845	push @{"$pkg\::ISA"}, __PACKAGE__;	2030	push @{"$pkg\::ISA"}, __PACKAGE__;
1846		2031
1847	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	2032	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1848	}	2033	}
1849		2034
…		…
1861	}	2046	}
1862		2047
1863	sub normalise {	2048	sub normalise {
1864	my ($path, $base) = @_;	2049	my ($path, $base) = @_;
1865		2050
1866	$path = "$path"; # make sure its a string	2051	$path = "$path"; # make sure it's a string
1867		2052
1868	$path =~ s/\.map$//;	2053	$path =~ s/\.map$//;
1869		2054
1870	# map plan:	2055	# map plan:
1871	#	2056	#
…		…
1886	$base =~ s{[^/]+/?$}{};	2071	$base =~ s{[^/]+/?$}{};
1887	$path = "$base/$path";	2072	$path = "$base/$path";
1888	}	2073	}
1889		2074
1890	for ($path) {	2075	for ($path) {
1891	redo if s{//}{/};
1892	redo if s{/\.?/}{/};	2076	redo if s{/\.?/}{/};
1893	redo if s{/[^/]+/\.\./}{/};	2077	redo if s{/[^/]+/\.\./}{/};
1894	}	2078	}
1895		2079
1896	$path	2080	$path
…		…
1910	$self->init; # pass $1 etc.	2094	$self->init; # pass $1 etc.
1911	return $self;	2095	return $self;
1912	}	2096	}
1913	}	2097	}
1914		2098
1915	Carp::cluck "unable to resolve path '$path' (base '$base').";	2099	Carp::cluck "unable to resolve path '$path' (base '$base')";
1916	()	2100	()
1917	}	2101	}
1918		2102
		2103	# may re-bless or do other evil things
1919	sub init {	2104	sub init {
1920	my ($self) = @_;	2105	my ($self) = @_;
1921		2106
1922	$self	2107	$self
1923	}	2108	}
…		…
1988	$self->{load_path} = $path;	2173	$self->{load_path} = $path;
1989		2174
1990	1	2175	1
1991	}	2176	}
1992		2177
		2178	# used to laod the header of an original map
1993	sub load_header_orig {	2179	sub load_header_orig {
1994	my ($self) = @_;	2180	my ($self) = @_;
1995		2181
1996	$self->load_header_from ($self->load_path)	2182	$self->load_header_from ($self->load_path)
1997	}	2183	}
1998		2184
		2185	# used to laod the header of an instantiated map
1999	sub load_header_temp {	2186	sub load_header_temp {
2000	my ($self) = @_;	2187	my ($self) = @_;
2001		2188
2002	$self->load_header_from ($self->save_path)	2189	$self->load_header_from ($self->save_path)
2003	}	2190	}
2004		2191
		2192	# called after loading the header from an instantiated map
2005	sub prepare_temp {	2193	sub prepare_temp {
2006	my ($self) = @_;	2194	my ($self) = @_;
2007		2195
2008	$self->last_access ((delete $self->{last_access})	2196	$self->last_access ((delete $self->{last_access})
2009	|| $cf::RUNTIME); #d#	2197	|| $cf::RUNTIME); #d#
2010	# safety	2198	# safety
2011	$self->{instantiate_time} = $cf::RUNTIME	2199	$self->{instantiate_time} = $cf::RUNTIME
2012	if $self->{instantiate_time} > $cf::RUNTIME;	2200	if $self->{instantiate_time} > $cf::RUNTIME;
2013	}	2201	}
2014		2202
		2203	# called after loading the header from an original map
2015	sub prepare_orig {	2204	sub prepare_orig {
2016	my ($self) = @_;	2205	my ($self) = @_;
2017		2206
2018	$self->{load_original} = 1;	2207	$self->{load_original} = 1;
2019	$self->{instantiate_time} = $cf::RUNTIME;	2208	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2043		2232
2044	sub find;	2233	sub find;
2045	sub find {	2234	sub find {
2046	my ($path, $origin) = @_;	2235	my ($path, $origin) = @_;
2047		2236
		2237	cf::cede_to_tick;
		2238
2048	$path = normalise $path, $origin && $origin->path;	2239	$path = normalise $path, $origin;
2049		2240
2050	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2241	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2051	my $guard2 = cf::lock_acquire "map_find:$path";	2242	my $guard2 = cf::lock_acquire "map_find:$path";
2052		2243
2053	$cf::MAP{$path} || do {	2244	$cf::MAP{$path} || do {
…		…
2084		2275
2085	{	2276	{
2086	my $guard = cf::lock_acquire "map_data:$path";	2277	my $guard = cf::lock_acquire "map_data:$path";
2087		2278
2088	return unless $self->valid;	2279	return unless $self->valid;
2089	return unless $self->in_memory == cf::MAP_SWAPPED;	2280	return unless $self->state == cf::MAP_SWAPPED;
2090
2091	$self->in_memory (cf::MAP_LOADING);
2092		2281
2093	$self->alloc;	2282	$self->alloc;
2094		2283
2095	$self->pre_load;	2284	$self->pre_load;
2096	cf::cede_to_tick;	2285	cf::cede_to_tick;
2097		2286
		2287	if (exists $self->{load_path}) {
2098	my $f = new_from_file cf::object::thawer $self->{load_path};	2288	my $f = new_from_file cf::object::thawer $self->{load_path};
2099	$f->skip_block;	2289	$f->skip_block;
2100	$self->_load_objects ($f)	2290	$self->_load_objects ($f)
2101	or return;	2291	or return;
2102		2292
2103	$self->post_load_original	2293	$self->post_load_original
2104	if delete $self->{load_original};	2294	if delete $self->{load_original};
2105		2295
2106	if (my $uniq = $self->uniq_path) {	2296	if (my $uniq = $self->uniq_path) {
2107	utf8::encode $uniq;	2297	utf8::encode $uniq;
2108	unless (aio_stat $uniq) {	2298	unless (aio_stat $uniq) {
2109	if (my $f = new_from_file cf::object::thawer $uniq) {	2299	if (my $f = new_from_file cf::object::thawer $uniq) {
2110	$self->clear_unique_items;	2300	$self->clear_unique_items;
2111	$self->_load_objects ($f);	2301	$self->_load_objects ($f);
2112	$f->resolve_delayed_derefs;	2302	$f->resolve_delayed_derefs;
		2303	}
2113	}	2304	}
2114	}	2305	}
2115	}
2116		2306
2117	$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);
2118		2314
2119	cf::cede_to_tick;	2315	cf::cede_to_tick;
2120	# now do the right thing for maps	2316	# now do the right thing for maps
2121	$self->link_multipart_objects;	2317	$self->link_multipart_objects;
2122	$self->difficulty ($self->estimate_difficulty)	2318	$self->difficulty ($self->estimate_difficulty)
…		…
2126	unless ($self->{deny_activate}) {	2322	unless ($self->{deny_activate}) {
2127	$self->decay_objects;	2323	$self->decay_objects;
2128	$self->fix_auto_apply;	2324	$self->fix_auto_apply;
2129	$self->update_buttons;	2325	$self->update_buttons;
2130	cf::cede_to_tick;	2326	cf::cede_to_tick;
2131	$self->activate;	2327	#$self->activate; # no longer activate maps automatically
2132	}	2328	}
2133		2329
2134	$self->{last_save} = $cf::RUNTIME;	2330	$self->{last_save} = $cf::RUNTIME;
2135	$self->last_access ($cf::RUNTIME);	2331	$self->last_access ($cf::RUNTIME);
2136
2137	$self->in_memory (cf::MAP_ACTIVE);
2138	}	2332	}
2139		2333
2140	$self->post_load;	2334	$self->post_load;
		2335
		2336	1
2141	}	2337	}
2142		2338
2143	# customize the map for a given player, i.e.	2339	# customize the map for a given player, i.e.
2144	# return the _real_ map. used by e.g. per-player	2340	# return the _real_ map. used by e.g. per-player
2145	# maps to change the path to ~playername/mappath	2341	# maps to change the path to ~playername/mappath
…		…
2153	# if $self->per_party;	2349	# if $self->per_party;
2154		2350
2155	$self	2351	$self
2156	}	2352	}
2157		2353
2158	# find and load all maps in the 3x3 area around a map
2159	sub load_neighbours {
2160	my ($map) = @_;
2161
2162	my @neigh; # diagonal neighbours
2163
2164	for (0 .. 3) {
2165	my $neigh = $map->tile_path ($_)
2166	or next;
2167	$neigh = find $neigh, $map
2168	or next;
2169	$neigh->load;
2170
2171	# now find the diagonal neighbours
2172	push @neigh,
2173	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2174	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2175	}
2176
2177	for (grep defined $_->[0], @neigh) {
2178	my ($path, $origin) = @$_;
2179	my $neigh = find $path, $origin
2180	or next;
2181	$neigh->load;
2182	}
2183	}
2184
2185	sub find_sync {	2354	sub find_sync {
2186	my ($path, $origin) = @_;	2355	my ($path, $origin) = @_;
2187		2356
2188	cf::sync_job { find $path, $origin }	2357	# it's a bug to call this from the main context
		2358	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
		2359	if $Coro::current == $Coro::main;
		2360
		2361	find $path, $origin
2189	}	2362	}
2190		2363
2191	sub do_load_sync {	2364	sub do_load_sync {
2192	my ($map) = @_;	2365	my ($map) = @_;
2193		2366
		2367	# it's a bug to call this from the main context
2194	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2368	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2195	if $Coro::current == $Coro::main;	2369	if $Coro::current == $Coro::main;
2196		2370
2197	cf::sync_job { $map->load };	2371	$map->load;
2198	}	2372	}
2199		2373
2200	our %MAP_PREFETCH;	2374	our %MAP_PREFETCH;
2201	our $MAP_PREFETCHER = undef;	2375	our $MAP_PREFETCHER = undef;
2202		2376
2203	sub find_async {	2377	sub find_async {
2204	my ($path, $origin, $load) = @_;	2378	my ($path, $origin, $load) = @_;
2205		2379
2206	$path = normalise $path, $origin && $origin->{path};	2380	$path = normalise $path, $origin;
2207		2381
2208	if (my $map = $cf::MAP{$path}) {	2382	if (my $map = $cf::MAP{$path}) {
2209	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2383	return $map if !$load || $map->linkable;
2210	}	2384	}
2211		2385
2212	$MAP_PREFETCH{$path} |= $load;	2386	$MAP_PREFETCH{$path} |= $load;
2213		2387
2214	$MAP_PREFETCHER ||= cf::async {	2388	$MAP_PREFETCHER ||= cf::async {
…		…
2273	sub swap_out {	2447	sub swap_out {
2274	my ($self) = @_;	2448	my ($self) = @_;
2275		2449
2276	my $lock = cf::lock_acquire "map_data:$self->{path}";	2450	my $lock = cf::lock_acquire "map_data:$self->{path}";
2277		2451
2278	return if $self->in_memory != cf::MAP_ACTIVE;	2452	return if !$self->linkable;
2279	return if $self->{deny_save};	2453	return if $self->{deny_save};
2280	return if $self->players;	2454	return if $self->players;
2281		2455
2282	# first deactivate the map and "unlink" it from the core	2456	# first deactivate the map and "unlink" it from the core
2283	$self->deactivate;	2457	$self->deactivate;
2284	$_->clear_links_to ($self) for values %cf::MAP;	2458	$_->clear_links_to ($self) for values %cf::MAP;
2285	$self->in_memory (cf::MAP_SWAPPED);	2459	$self->state (cf::MAP_SWAPPED);
2286		2460
2287	# then atomically save	2461	# then atomically save
2288	$self->_save;	2462	$self->_save;
2289		2463
2290	# then free the map	2464	# then free the map
…		…
2314		2488
2315	my $lock = cf::lock_acquire "map_data:$self->{path}";	2489	my $lock = cf::lock_acquire "map_data:$self->{path}";
2316		2490
2317	return if $self->players;	2491	return if $self->players;
2318		2492
2319	warn "resetting map ", $self->path, "\n";	2493	cf::trace "resetting map ", $self->path, "\n";
2320		2494
2321	$self->in_memory (cf::MAP_SWAPPED);	2495	$self->state (cf::MAP_SWAPPED);
2322		2496
2323	# need to save uniques path	2497	# need to save uniques path
2324	unless ($self->{deny_save}) {	2498	unless ($self->{deny_save}) {
2325	my $uniq = $self->uniq_path; utf8::encode $uniq;	2499	my $uniq = $self->uniq_path; utf8::encode $uniq;
2326		2500
…		…
2656	# use -1 or undef as default coordinates, not 0, 0	2830	# use -1 or undef as default coordinates, not 0, 0
2657	($x, $y) = ($map->enter_x, $map->enter_y)	2831	($x, $y) = ($map->enter_x, $map->enter_y)
2658	if $x <= 0 && $y <= 0;	2832	if $x <= 0 && $y <= 0;
2659		2833
2660	$map->load;	2834	$map->load;
2661	$map->load_neighbours;
2662		2835
2663	return unless $self->contr->active;	2836	return unless $self->contr->active;
2664		2837
2665	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2838	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2666	if ($self->enter_map ($map, $x, $y)) {	2839	if ($self->enter_map ($map, $x, $y)) {
…		…
2689		2862
2690	sub cf::object::player::goto {	2863	sub cf::object::player::goto {
2691	my ($self, $path, $x, $y, $check, $done) = @_;	2864	my ($self, $path, $x, $y, $check, $done) = @_;
2692		2865
2693	if ($self->{_link_recursion} >= $MAX_LINKS) {	2866	if ($self->{_link_recursion} >= $MAX_LINKS) {
2694	warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";	2867	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2695	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");	2868	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2696	($path, $x, $y) = @$EMERGENCY_POSITION;	2869	($path, $x, $y) = @$EMERGENCY_POSITION;
2697	}	2870	}
2698		2871
2699	# do generation counting so two concurrent goto's will be executed in-order	2872	# do generation counting so two concurrent goto's will be executed in-order
…		…
2722	($path, $x, $y) = (undef, undef, undef);	2895	($path, $x, $y) = (undef, undef, undef);
2723	}	2896	}
2724	}	2897	}
2725		2898
2726	my $map = eval {	2899	my $map = eval {
2727	my $map = defined $path ? cf::map::find $path : undef;	2900	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2728		2901
2729	if ($map) {	2902	if ($map) {
2730	$map = $map->customise_for ($self);	2903	$map = $map->customise_for ($self);
2731	$map = $check->($map, $x, $y, $self) if $check && $map;	2904	$map = $check->($map, $x, $y, $self) if $check && $map;
2732	} else {	2905	} else {
…		…
2822	$Coro::current->{desc} = "enter_exit";	2995	$Coro::current->{desc} = "enter_exit";
2823		2996
2824	unless (eval {	2997	unless (eval {
2825	$self->deactivate_recursive; # just to be sure	2998	$self->deactivate_recursive; # just to be sure
2826		2999
2827	# random map handling
2828	{
2829	my $guard = cf::lock_acquire "exit_prepare:$exit";
2830
2831	prepare_random_map $exit
2832	if $exit->slaying eq "/!";
2833	}
2834
2835	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	3000	my $map = cf::map::normalise $exit->slaying, $exit->map;
2836	my $x = $exit->stats->hp;	3001	my $x = $exit->stats->hp;
2837	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	}
2838		3026
2839	$self->goto ($map, $x, $y);	3027	$self->goto ($map, $x, $y);
2840		3028
2841	# if exit is damned, update players death & WoR home-position	3029	# if exit is damned, update players death & WoR home-position
2842	$self->contr->savebed ($map, $x, $y)	3030	$self->contr->savebed ($map, $x, $y)
…		…
2847	$self->message ("Something went wrong deep within the deliantra server. "	3035	$self->message ("Something went wrong deep within the deliantra server. "
2848	. "I'll try to bring you back to the map you were before. "	3036	. "I'll try to bring you back to the map you were before. "
2849	. "Please report this to the dungeon master!",	3037	. "Please report this to the dungeon master!",
2850	cf::NDI_UNIQUE | cf::NDI_RED);	3038	cf::NDI_UNIQUE | cf::NDI_RED);
2851		3039
2852	warn "ERROR in enter_exit: $@";	3040	error "ERROR in enter_exit: $@";
2853	$self->leave_link;	3041	$self->leave_link;
2854	}	3042	}
2855	})->prio (1);	3043	})->prio (1);
2856	}	3044	}
2857		3045
…		…
3067	=cut	3255	=cut
3068		3256
3069	sub cf::client::ext_msg($$@) {	3257	sub cf::client::ext_msg($$@) {
3070	my ($self, $type, @msg) = @_;	3258	my ($self, $type, @msg) = @_;
3071		3259
3072	if ($self->extcmd == 2) {
3073	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3260	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3074	} elsif ($self->extcmd == 1) { # TODO: remove
3075	push @msg, msgtype => "event_$type";
3076	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3077	}
3078	}
3079
3080	=item $client->ext_reply ($msgid, @msg)
3081
3082	Sends an ext reply to the client.
3083
3084	=cut
3085
3086	sub cf::client::ext_reply($$@) {
3087	my ($self, $id, @msg) = @_;
3088
3089	if ($self->extcmd == 2) {
3090	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3091	} elsif ($self->extcmd == 1) {
3092	#TODO: version 1, remove
3093	unshift @msg, msgtype => "reply", msgid => $id;
3094	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3095	}
3096	}	3261	}
3097		3262
3098	=item $success = $client->query ($flags, "text", \&cb)	3263	=item $success = $client->query ($flags, "text", \&cb)
3099		3264
3100	Queues a query to the client, calling the given callback with	3265	Queues a query to the client, calling the given callback with
…		…
3155	my ($ns, $buf) = @_;	3320	my ($ns, $buf) = @_;
3156		3321
3157	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3322	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3158		3323
3159	if (ref $msg) {	3324	if (ref $msg) {
3160	my ($type, $reply, @payload) =	3325	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3161	"ARRAY" eq ref $msg
3162	? @$msg
3163	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3164		3326
3165	my @reply;
3166
3167	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}) {
3168	@reply = $cb->($ns, @payload);	3340	@reply = $cb->($ns, @payload);
		3341	}
		3342
		3343	$ns->ext_msg ("reply-$reply", @reply)
		3344	if $reply;
3169	}	3345	}
3170
3171	$ns->ext_reply ($reply, @reply)
3172	if $reply;
3173
3174	} else {	3346	} else {
3175	warn "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";
3176	}	3348	}
3177		3349
3178	cf::override;	3350	cf::override;
3179	},	3351	},
3180	);	3352	);
…		…
3261	decrease split destroy change_exp value msg lore send_msg)],	3433	decrease split destroy change_exp value msg lore send_msg)],
3262	["cf::object::player" => qw(player)],	3434	["cf::object::player" => qw(player)],
3263	["cf::player" => qw(peaceful send_msg)],	3435	["cf::player" => qw(peaceful send_msg)],
3264	["cf::map" => qw(trigger)],	3436	["cf::map" => qw(trigger)],
3265	) {	3437	) {
3266	no strict 'refs';
3267	my ($pkg, @funs) = @$_;	3438	my ($pkg, @funs) = @$_;
3268	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3439	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3269	for @funs;	3440	for @funs;
3270	}	3441	}
3271		3442
…		…
3310	local @cf::_safe_eval_args = values %vars;	3481	local @cf::_safe_eval_args = values %vars;
3311	@res = wantarray ? eval eval : scalar eval $eval;	3482	@res = wantarray ? eval eval : scalar eval $eval;
3312	}	3483	}
3313		3484
3314	if ($@) {	3485	if ($@) {
3315	warn "$@";	3486	warn "$@",
3316	warn "while executing safe code '$code'\n";	3487	"while executing safe code '$code'\n",
3317	warn "with arguments " . (join " ", %vars) . "\n";	3488	"with arguments " . (join " ", %vars) . "\n";
3318	}	3489	}
3319		3490
3320	wantarray ? @res : $res[0]	3491	wantarray ? @res : $res[0]
3321	}	3492	}
3322		3493
…		…
3347	=cut	3518	=cut
3348		3519
3349	#############################################################################	3520	#############################################################################
3350	# the server's init and main functions	3521	# the server's init and main functions
3351		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
3352	sub load_facedata($) {	3547	sub load_facedata($) {
3353	my ($path) = @_;	3548	my ($path) = @_;
3354		3549
3355	# 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
3356	# for this (global event?)	3551	# for this (global event?)
3357	%ext::player_env::MUSIC_FACE_CACHE = ();	3552	%ext::player_env::MUSIC_FACE_CACHE = ();
3358		3553
3359	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3554	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3360		3555
3361	warn "loading facedata from $path\n";	3556	trace "loading facedata from $path\n";
3362		3557
3363	my $facedata;	3558	my $facedata = decode_storable load_file $path;
3364	0 < aio_load $path, $facedata
3365	or die "$path: $!";
3366
3367	$facedata = Coro::Storable::thaw $facedata;
3368		3559
3369	$facedata->{version} == 2	3560	$facedata->{version} == 2
3370	or cf::cleanup "$path: version mismatch, cannot proceed.";	3561	or cf::cleanup "$path: version mismatch, cannot proceed.";
3371		3562
3372	# patch in the exptable
3373	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3374	$facedata->{resource}{"res/exp_table"} = {
3375	type => FT_RSRC,
3376	data => $exp_table,
3377	hash => (Digest::MD5::md5 $exp_table),
3378	};
3379	cf::cede_to_tick;	3563	cf::cede_to_tick;
3380		3564
3381	{	3565	{
3382	my $faces = $facedata->{faceinfo};	3566	my $faces = delete $facedata->{faceinfo};
3383		3567
3384	while (my ($face, $info) = each %$faces) {	3568	for my $face (sort keys %$faces) {
		3569	my $info = $faces->{$face};
3385	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3570	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3386		3571
3387	cf::face::set_visibility $idx, $info->{visibility};	3572	cf::face::set_visibility $idx, $info->{visibility};
3388	cf::face::set_magicmap $idx, $info->{magicmap};	3573	cf::face::set_magicmap $idx, $info->{magicmap};
3389	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3574	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3390	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3575	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3391		3576	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
		3577	$FACEHASH{$info->{hash64}} = $idx;#d#
		3578
3392	cf::cede_to_tick;	3579	cf::cede_to_tick;
3393	}	3580	}
3394		3581
3395	while (my ($face, $info) = each %$faces) {	3582	while (my ($face, $info) = each %$faces) {
3396	next unless $info->{smooth};	3583	next unless $info->{smooth};
…		…
3400		3587
3401	if (my $smooth = cf::face::find $info->{smooth}) {	3588	if (my $smooth = cf::face::find $info->{smooth}) {
3402	cf::face::set_smooth $idx, $smooth;	3589	cf::face::set_smooth $idx, $smooth;
3403	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3590	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3404	} else {	3591	} else {
3405	warn "smooth face '$info->{smooth}' not found for face '$face'";	3592	error "smooth face '$info->{smooth}' not found for face '$face'";
3406	}	3593	}
3407		3594
3408	cf::cede_to_tick;	3595	cf::cede_to_tick;
3409	}	3596	}
3410	}	3597	}
3411		3598
3412	{	3599	{
3413	my $anims = $facedata->{animinfo};	3600	my $anims = delete $facedata->{animinfo};
3414		3601
3415	while (my ($anim, $info) = each %$anims) {	3602	while (my ($anim, $info) = each %$anims) {
3416	cf::anim::set $anim, $info->{frames}, $info->{facings};	3603	cf::anim::set $anim, $info->{frames}, $info->{facings};
3417	cf::cede_to_tick;	3604	cf::cede_to_tick;
3418	}	3605	}
3419		3606
3420	cf::anim::invalidate_all; # d'oh	3607	cf::anim::invalidate_all; # d'oh
3421	}	3608	}
3422		3609
3423	{	3610	{
3424	my $res = $facedata->{resource};	3611	my $res = delete $facedata->{resource};
3425		3612
3426	while (my ($name, $info) = each %$res) {	3613	while (my ($name, $info) = each %$res) {
3427	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
3428	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3616	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3429		3617
		3618	cf::face::set_type $idx, $type;
3430	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};	3619	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3431	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#
3432	} else {	3622	} else {
3433	$RESOURCE{$name} = $info;	3623	# $RESOURCE{$name} = $info; # unused
3434	}	3624	}
3435		3625
3436	cf::cede_to_tick;	3626	cf::cede_to_tick;
3437	}	3627	}
3438	}	3628	}
3439		3629
3440	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3630	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3441		3631
3442	1	3632	1
3443	}	3633	}
3444
3445	cf::global->attach (on_resource_update => sub {
3446	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3447	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3448
3449	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3450	my $sound = $soundconf->{compat}[$_]
3451	or next;
3452
3453	my $face = cf::face::find "sound/$sound->[1]";
3454	cf::sound::set $sound->[0] => $face;
3455	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3456	}
3457
3458	while (my ($k, $v) = each %{$soundconf->{event}}) {
3459	my $face = cf::face::find "sound/$v";
3460	cf::sound::set $k => $face;
3461	}
3462	}
3463	});
3464		3634
3465	register_exticmd fx_want => sub {	3635	register_exticmd fx_want => sub {
3466	my ($ns, $want) = @_;	3636	my ($ns, $want) = @_;
3467		3637
3468	while (my ($k, $v) = each %$want) {	3638	while (my ($k, $v) = each %$want) {
…		…
3476	my $status = load_resource_file_ $_[0];	3646	my $status = load_resource_file_ $_[0];
3477	get_slot 0.1, 100;	3647	get_slot 0.1, 100;
3478	cf::arch::commit_load;	3648	cf::arch::commit_load;
3479		3649
3480	$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;
3481	}	3664	}
3482		3665
3483	sub reload_regions {	3666	sub reload_regions {
3484	# 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
3485	# for this (global event?)	3668	# for this (global event?)
…		…
3500	}	3683	}
3501		3684
3502	sub reload_archetypes {	3685	sub reload_archetypes {
3503	load_resource_file "$DATADIR/archetypes"	3686	load_resource_file "$DATADIR/archetypes"
3504	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	);
3505	}	3697	}
3506		3698
3507	sub reload_treasures {	3699	sub reload_treasures {
3508	load_resource_file "$DATADIR/treasures"	3700	load_resource_file "$DATADIR/treasures"
3509	or die "unable to load treasurelists\n";	3701	or die "unable to load treasurelists\n";
3510	}	3702	}
3511		3703
		3704	sub reload_sound {
		3705	trace "loading sound config from $DATADIR/sound\n";
		3706
		3707	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
		3708
		3709	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3710	my $sound = $soundconf->{compat}[$_]
		3711	or next;
		3712
		3713	my $face = cf::face::find "sound/$sound->[1]";
		3714	cf::sound::set $sound->[0] => $face;
		3715	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3716	}
		3717
		3718	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3719	my $face = cf::face::find "sound/$v";
		3720	cf::sound::set $k => $face;
		3721	}
		3722	}
		3723
3512	sub reload_resources {	3724	sub reload_resources {
3513	warn "reloading resource files...\n";	3725	trace "reloading resource files...\n";
3514		3726
		3727	reload_materials;
3515	reload_facedata;	3728	reload_facedata;
		3729	reload_exp_table;
		3730	reload_sound;
3516	reload_archetypes;	3731	reload_archetypes;
3517	reload_regions;	3732	reload_regions;
3518	reload_treasures;	3733	reload_treasures;
3519		3734
3520	warn "finished reloading resource files\n";	3735	trace "finished reloading resource files\n";
3521	}	3736	}
3522		3737
3523	sub reload_config {	3738	sub reload_config {
3524	warn "reloading config file...\n";	3739	trace "reloading config file...\n";
3525		3740
3526	open my $fh, "<:utf8", "$CONFDIR/config"	3741	my $config = load_file "$CONFDIR/config";
3527	or return;	3742	utf8::decode $config;
3528		3743	*CFG = decode_yaml $config;
3529	local $/;
3530	*CFG = YAML::XS::Load scalar <$fh>;
3531		3744
3532	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];	3745	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3533		3746
3534	$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};
3535	$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};
…		…
3539	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3752	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3540	and die "WARNING: m(un)lockall failed: $!\n";	3753	and die "WARNING: m(un)lockall failed: $!\n";
3541	};	3754	};
3542	warn $@ if $@;	3755	warn $@ if $@;
3543	}	3756	}
3544
3545	warn "finished reloading resource files\n";
3546	}	3757	}
3547		3758
3548	sub pidfile() {	3759	sub pidfile() {
3549	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3760	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3550	or die "$PIDFILE: $!";	3761	or die "$PIDFILE: $!";
…		…
3563	seek $fh, 0, 0;	3774	seek $fh, 0, 0;
3564	print $fh $$;	3775	print $fh $$;
3565	}	3776	}
3566		3777
3567	sub main_loop {	3778	sub main_loop {
3568	warn "EV::loop starting\n";	3779	trace "EV::loop starting\n";
3569	if (1) {	3780	if (1) {
3570	EV::loop;	3781	EV::loop;
3571	}	3782	}
3572	warn "EV::loop returned\n";	3783	trace "EV::loop returned\n";
3573	goto &main_loop unless $REALLY_UNLOOP;	3784	goto &main_loop unless $REALLY_UNLOOP;
3574	}	3785	}
3575		3786
3576	sub main {	3787	sub main {
3577	cf::init_globals; # initialise logging	3788	cf::init_globals; # initialise logging
3578		3789
3579	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3790	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3580	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3791	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3581	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3792	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3582	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3793	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3583		3794
3584	$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
3585		3796
3586	# we must not ever block the main coroutine	3797	# we must not ever block the main coroutine
3587	local $Coro::idle = sub {	3798	$Coro::idle = sub {
3588	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#
3589	(async {	3800	(async {
3590	$Coro::current->{desc} = "IDLE BUG HANDLER";	3801	$Coro::current->{desc} = "IDLE BUG HANDLER";
3591	EV::loop EV::LOOP_ONESHOT;	3802	EV::loop EV::LOOP_ONESHOT;
3592	})->prio (Coro::PRIO_MAX);	3803	})->prio (Coro::PRIO_MAX);
3593	};	3804	};
3594		3805
3595	evthread_start IO::AIO::poll_fileno;	3806	evthread_start IO::AIO::poll_fileno;
3596		3807
3597	cf::sync_job {	3808	cf::sync_job {
3598	cf::init_experience;	3809	cf::incloader::init ();
		3810
		3811	db_init;
		3812
3599	cf::init_anim;	3813	cf::init_anim;
3600	cf::init_attackmess;	3814	cf::init_attackmess;
3601	cf::init_dynamic;	3815	cf::init_dynamic;
3602		3816
3603	cf::load_settings;	3817	cf::load_settings;
3604	cf::load_materials;
3605		3818
3606	reload_resources;	3819	reload_resources;
3607	reload_config;	3820	reload_config;
3608	db_init;
3609		3821
3610	cf::init_uuid;	3822	cf::init_uuid;
3611	cf::init_signals;	3823	cf::init_signals;
3612	cf::init_skills;	3824	cf::init_skills;
3613		3825
…		…
3621		3833
3622	# no (long-running) fork's whatsoever before this point(!)	3834	# no (long-running) fork's whatsoever before this point(!)
3623	use POSIX ();	3835	use POSIX ();
3624	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};
3625		3837
3626	(pop @POST_INIT)->(0) while @POST_INIT;	3838	cf::_post_init 0;
3627	};	3839	};
3628		3840
3629	cf::object::thawer::errors_are_fatal 0;	3841	cf::object::thawer::errors_are_fatal 0;
3630	warn "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";
3631		3843
		3844	AE::postpone {
		3845	undef &main; # free gobs of memory :)
		3846	};
		3847
3632	main_loop;	3848	goto &main_loop;
3633	}	3849	}
3634		3850
3635	#############################################################################	3851	#############################################################################
3636	# initialisation and cleanup	3852	# initialisation and cleanup
3637		3853
…		…
3676	or return;	3892	or return;
3677		3893
3678	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3894	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3679	and return;	3895	and return;
3680		3896
3681	warn sprintf "runtime file written (%gs).\n", AE::time - $t0;	3897	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3682		3898
3683	1	3899	1
3684	}	3900	}
3685		3901
3686	our $uuid_lock;	3902	our $uuid_lock;
…		…
3698	or return;	3914	or return;
3699		3915
3700	my $value = uuid_seq uuid_cur;	3916	my $value = uuid_seq uuid_cur;
3701		3917
3702	unless ($value) {	3918	unless ($value) {
3703	warn "cowardly refusing to write zero uuid value!\n";	3919	info "cowardly refusing to write zero uuid value!\n";
3704	return;	3920	return;
3705	}	3921	}
3706		3922
3707	my $value = uuid_str $value + $uuid_skip;	3923	my $value = uuid_str $value + $uuid_skip;
3708	$uuid_skip = 0;	3924	$uuid_skip = 0;
…		…
3718	or return;	3934	or return;
3719		3935
3720	aio_rename "$uuid~", $uuid	3936	aio_rename "$uuid~", $uuid
3721	and return;	3937	and return;
3722		3938
3723	warn "uuid file written ($value).\n";	3939	trace "uuid file written ($value).\n";
3724		3940
3725	1	3941	1
3726		3942
3727	}	3943	}
3728		3944
…		…
3734	}	3950	}
3735		3951
3736	sub emergency_save() {	3952	sub emergency_save() {
3737	my $freeze_guard = cf::freeze_mainloop;	3953	my $freeze_guard = cf::freeze_mainloop;
3738		3954
3739	warn "emergency_perl_save: enter\n";	3955	info "emergency_perl_save: enter\n";
		3956
		3957	# this is a trade-off: we want to be very quick here, so
		3958	# save all maps without fsync, and later call a global sync
		3959	# (which in turn might be very very slow)
		3960	local $USE_FSYNC = 0;
3740		3961
3741	cf::sync_job {	3962	cf::sync_job {
3742	# this is a trade-off: we want to be very quick here, so	3963	cf::write_runtime_sync; # external watchdog should not bark
3743	# save all maps without fsync, and later call a global sync
3744	# (which in turn might be very very slow)
3745	local $USE_FSYNC = 0;
3746		3964
3747	# use a peculiar iteration method to avoid tripping on perl	3965	# use a peculiar iteration method to avoid tripping on perl
3748	# refcount bugs in for. also avoids problems with players	3966	# refcount bugs in for. also avoids problems with players
3749	# and maps saved/destroyed asynchronously.	3967	# and maps saved/destroyed asynchronously.
3750	warn "emergency_perl_save: begin player save\n";	3968	info "emergency_perl_save: begin player save\n";
3751	for my $login (keys %cf::PLAYER) {	3969	for my $login (keys %cf::PLAYER) {
3752	my $pl = $cf::PLAYER{$login} or next;	3970	my $pl = $cf::PLAYER{$login} or next;
3753	$pl->valid or next;	3971	$pl->valid or next;
3754	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3972	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3755	$pl->save;	3973	$pl->save;
3756	}	3974	}
3757	warn "emergency_perl_save: end player save\n";	3975	info "emergency_perl_save: end player save\n";
3758		3976
		3977	cf::write_runtime_sync; # external watchdog should not bark
		3978
3759	warn "emergency_perl_save: begin map save\n";	3979	info "emergency_perl_save: begin map save\n";
3760	for my $path (keys %cf::MAP) {	3980	for my $path (keys %cf::MAP) {
3761	my $map = $cf::MAP{$path} or next;	3981	my $map = $cf::MAP{$path} or next;
3762	$map->valid or next;	3982	$map->valid or next;
3763	$map->save;	3983	$map->save;
3764	}	3984	}
3765	warn "emergency_perl_save: end map save\n";	3985	info "emergency_perl_save: end map save\n";
3766		3986
		3987	cf::write_runtime_sync; # external watchdog should not bark
		3988
3767	warn "emergency_perl_save: begin database checkpoint\n";	3989	info "emergency_perl_save: begin database checkpoint\n";
3768	BDB::db_env_txn_checkpoint $DB_ENV;	3990	BDB::db_env_txn_checkpoint $DB_ENV;
3769	warn "emergency_perl_save: end database checkpoint\n";	3991	info "emergency_perl_save: end database checkpoint\n";
3770		3992
3771	warn "emergency_perl_save: begin write uuid\n";	3993	info "emergency_perl_save: begin write uuid\n";
3772	write_uuid_sync 1;	3994	write_uuid_sync 1;
3773	warn "emergency_perl_save: end write uuid\n";	3995	info "emergency_perl_save: end write uuid\n";
		3996
		3997	cf::write_runtime_sync; # external watchdog should not bark
		3998
		3999	trace "emergency_perl_save: syncing database to disk";
		4000	BDB::db_env_txn_checkpoint $DB_ENV;
		4001
		4002	info "emergency_perl_save: starting sync\n";
		4003	IO::AIO::aio_sync sub {
		4004	info "emergency_perl_save: finished sync\n";
		4005	};
		4006
		4007	cf::write_runtime_sync; # external watchdog should not bark
		4008
		4009	trace "emergency_perl_save: flushing outstanding aio requests";
		4010	while (IO::AIO::nreqs || BDB::nreqs) {
		4011	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
		4012	}
		4013
		4014	cf::write_runtime_sync; # external watchdog should not bark
3774	};	4015	};
3775		4016
3776	warn "emergency_perl_save: starting sync()\n";
3777	IO::AIO::aio_sync sub {
3778	warn "emergency_perl_save: finished sync()\n";
3779	};
3780
3781	warn "emergency_perl_save: leave\n";	4017	info "emergency_perl_save: leave\n";
3782	}	4018	}
3783		4019
3784	sub post_cleanup {	4020	sub post_cleanup {
3785	my ($make_core) = @_;	4021	my ($make_core) = @_;
3786		4022
		4023	IO::AIO::flush;
		4024
3787	warn Carp::longmess "post_cleanup backtrace"	4025	error Carp::longmess "post_cleanup backtrace"
3788	if $make_core;	4026	if $make_core;
3789		4027
3790	my $fh = pidfile;	4028	my $fh = pidfile;
3791	unlink $PIDFILE if <$fh> == $$;	4029	unlink $PIDFILE if <$fh> == $$;
3792	}	4030	}
…		…
3816	}	4054	}
3817	}	4055	}
3818		4056
3819	sub do_reload_perl() {	4057	sub do_reload_perl() {
3820	# can/must only be called in main	4058	# can/must only be called in main
3821	if (in_main) {	4059	unless (in_main) {
3822	warn "can only reload from main coroutine";	4060	error "can only reload from main coroutine";
3823	return;	4061	return;
3824	}	4062	}
3825		4063
3826	return if $RELOAD++;	4064	return if $RELOAD++;
3827		4065
3828	my $t1 = AE::time;	4066	my $t1 = AE::time;
3829		4067
3830	while ($RELOAD) {	4068	while ($RELOAD) {
3831	warn "reloading...";	4069	cf::get_slot 0.1, -1, "reload_perl";
		4070	info "perl_reload: reloading...";
3832		4071
3833	warn "entering sync_job";	4072	trace "perl_reload: entering sync_job";
3834		4073
3835	cf::sync_job {	4074	cf::sync_job {
3836	cf::write_runtime_sync; # external watchdog should not bark
3837	cf::emergency_save;	4075	#cf::emergency_save;
3838	cf::write_runtime_sync; # external watchdog should not bark
3839		4076
3840	warn "syncing database to disk";
3841	BDB::db_env_txn_checkpoint $DB_ENV;
3842
3843	# if anything goes wrong in here, we should simply crash as we already saved
3844
3845	warn "flushing outstanding aio requests";
3846	while (IO::AIO::nreqs || BDB::nreqs) {
3847	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3848	}
3849
3850	warn "cancelling all extension coros";	4077	trace "perl_reload: cancelling all extension coros";
3851	$_->cancel for values %EXT_CORO;	4078	$_->cancel for values %EXT_CORO;
3852	%EXT_CORO = ();	4079	%EXT_CORO = ();
3853		4080
3854	warn "removing commands";	4081	trace "perl_reload: removing commands";
3855	%COMMAND = ();	4082	%COMMAND = ();
3856		4083
3857	warn "removing ext/exti commands";	4084	trace "perl_reload: removing ext/exti commands";
3858	%EXTCMD = ();	4085	%EXTCMD = ();
3859	%EXTICMD = ();	4086	%EXTICMD = ();
3860		4087
3861	warn "unloading/nuking all extensions";	4088	trace "perl_reload: unloading/nuking all extensions";
3862	for my $pkg (@EXTS) {	4089	for my $pkg (@EXTS) {
3863	warn "... unloading $pkg";	4090	trace "... unloading $pkg";
3864		4091
3865	if (my $cb = $pkg->can ("unload")) {	4092	if (my $cb = $pkg->can ("unload")) {
3866	eval {	4093	eval {
3867	$cb->($pkg);	4094	$cb->($pkg);
3868	1	4095	1
3869	} or warn "$pkg unloaded, but with errors: $@";	4096	} or error "$pkg unloaded, but with errors: $@";
3870	}	4097	}
3871		4098
3872	warn "... clearing $pkg";	4099	trace "... clearing $pkg";
3873	clear_package $pkg;	4100	clear_package $pkg;
3874	}	4101	}
3875		4102
3876	warn "unloading all perl modules loaded from $LIBDIR";	4103	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3877	while (my ($k, $v) = each %INC) {	4104	while (my ($k, $v) = each %INC) {
3878	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4105	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3879		4106
3880	warn "... unloading $k";	4107	trace "... unloading $k";
3881	delete $INC{$k};	4108	delete $INC{$k};
3882		4109
3883	$k =~ s/\.pm$//;	4110	$k =~ s/\.pm$//;
3884	$k =~ s/\//::/g;	4111	$k =~ s/\//::/g;
3885		4112
…		…
3888	}	4115	}
3889		4116
3890	clear_package $k;	4117	clear_package $k;
3891	}	4118	}
3892		4119
3893	warn "getting rid of safe::, as good as possible";	4120	trace "perl_reload: getting rid of safe::, as good as possible";
3894	clear_package "safe::$_"	4121	clear_package "safe::$_"
3895	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);
3896		4123
3897	warn "unloading cf.pm \"a bit\"";	4124	trace "perl_reload: unloading cf.pm \"a bit\"";
3898	delete $INC{"cf.pm"};	4125	delete $INC{"cf.pm"};
3899	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4126	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3900		4127
3901	# don't, removes xs symbols, too,	4128	# don't, removes xs symbols, too,
3902	# and global variables created in xs	4129	# and global variables created in xs
3903	#clear_package __PACKAGE__;	4130	#clear_package __PACKAGE__;
3904		4131
3905	warn "unload completed, starting to reload now";	4132	info "perl_reload: unload completed, starting to reload now";
3906		4133
3907	warn "reloading cf.pm";	4134	trace "perl_reload: reloading cf.pm";
3908	require cf;	4135	require cf;
3909	cf::_connect_to_perl_1;	4136	cf::_connect_to_perl_1;
3910		4137
3911	warn "loading config and database again";	4138	trace "perl_reload: loading config and database again";
3912	cf::reload_config;	4139	cf::reload_config;
3913		4140
3914	warn "loading extensions";	4141	trace "perl_reload: loading extensions";
3915	cf::load_extensions;	4142	cf::load_extensions;
3916		4143
3917	if ($REATTACH_ON_RELOAD) {	4144	if ($REATTACH_ON_RELOAD) {
3918	warn "reattaching attachments to objects/players";	4145	trace "perl_reload: reattaching attachments to objects/players";
3919	_global_reattach; # objects, sockets	4146	_global_reattach; # objects, sockets
3920	warn "reattaching attachments to maps";	4147	trace "perl_reload: reattaching attachments to maps";
3921	reattach $_ for values %MAP;	4148	reattach $_ for values %MAP;
3922	warn "reattaching attachments to players";	4149	trace "perl_reload: reattaching attachments to players";
3923	reattach $_ for values %PLAYER;	4150	reattach $_ for values %PLAYER;
3924	}	4151	}
3925		4152
3926	warn "running post_init jobs";	4153	cf::_post_init 1;
3927	(pop @POST_INIT)->(1) while @POST_INIT;
3928		4154
3929	warn "leaving sync_job";	4155	trace "perl_reload: leaving sync_job";
3930		4156
3931	1	4157	1
3932	} or do {	4158	} or do {
3933	warn $@;	4159	error $@;
3934	cf::cleanup "error while reloading, exiting.";	4160	cf::cleanup "perl_reload: error, exiting.";
3935	};	4161	};
3936		4162
3937	warn "reloaded";
3938	--$RELOAD;	4163	--$RELOAD;
3939	}	4164	}
3940		4165
3941	$t1 = AE::time - $t1;	4166	$t1 = AE::time - $t1;
3942	warn "reload completed in ${t1}s\n";	4167	info "perl_reload: completed in ${t1}s\n";
3943	};	4168	};
3944		4169
3945	our $RELOAD_WATCHER; # used only during reload	4170	our $RELOAD_WATCHER; # used only during reload
3946		4171
3947	sub reload_perl() {	4172	sub reload_perl() {
…		…
3968	reload_perl;	4193	reload_perl;
3969	};	4194	};
3970	}	4195	}
3971	};	4196	};
3972		4197
3973	unshift @INC, $LIBDIR;	4198	#############################################################################
3974		4199
3975	my $bug_warning = 0;	4200	my $bug_warning = 0;
3976		4201
3977	our @WAIT_FOR_TICK;
3978	our @WAIT_FOR_TICK_BEGIN;
3979
3980	sub wait_for_tick {	4202	sub wait_for_tick() {
3981	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4203	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3982		4204
3983	my $signal = new Coro::Signal;	4205	$WAIT_FOR_TICK->wait;
3984	push @WAIT_FOR_TICK, $signal;
3985	$signal->wait;
3986	}	4206	}
3987		4207
3988	sub wait_for_tick_begin {	4208	sub wait_for_tick_begin() {
3989	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4209	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3990		4210
3991	my $signal = new Coro::Signal;	4211	my $signal = new Coro::Signal;
3992	push @WAIT_FOR_TICK_BEGIN, $signal;	4212	push @WAIT_FOR_TICK_BEGIN, $signal;
3993	$signal->wait;	4213	$signal->wait;
3994	}	4214	}
…		…
3998	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"
3999	unless ++$bug_warning > 10;	4219	unless ++$bug_warning > 10;
4000	return;	4220	return;
4001	}	4221	}
4002		4222
4003	cf::server_tick; # one server iteration	4223	cf::one_tick; # one server iteration
4004		4224
4005	#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#
4006		4226
4007	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4227	if ($NOW >= $NEXT_RUNTIME_WRITE) {
4008	$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.;
4009	Coro::async_pool {	4229	Coro::async_pool {
4010	$Coro::current->{desc} = "runtime saver";	4230	$Coro::current->{desc} = "runtime saver";
4011	write_runtime_sync	4231	write_runtime_sync
4012	or warn "ERROR: unable to write runtime file: $!";	4232	or error "ERROR: unable to write runtime file: $!";
4013	};	4233	};
4014	}	4234	}
4015		4235
4016	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4236	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4017	$sig->send;	4237	$sig->send;
4018	}	4238	}
4019	while (my $sig = shift @WAIT_FOR_TICK) {	4239	$WAIT_FOR_TICK->broadcast;
4020	$sig->send;
4021	}
4022		4240
4023	$LOAD = ($NOW - $TICK_START) / $TICK;	4241	$LOAD = ($NOW - $TICK_START) / $TICK;
4024	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4242	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4025		4243
4026	if (0) {	4244	if (0) {
4027	if ($NEXT_TICK) {	4245	if ($NEXT_TICK) {
4028	my $jitter = $TICK_START - $NEXT_TICK;	4246	my $jitter = $TICK_START - $NEXT_TICK;
4029	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4247	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
4030	warn "jitter $JITTER\n";#d#	4248	debug "jitter $JITTER\n";#d#
4031	}	4249	}
4032	}	4250	}
4033	}	4251	}
4034		4252
4035	{	4253	{
4036	# configure BDB	4254	# configure BDB
		4255	info "initialising database";
4037		4256
4038	BDB::min_parallel 16;	4257	BDB::min_parallel 16;
4039	BDB::max_poll_reqs $TICK * 0.1;	4258	BDB::max_poll_reqs $TICK * 0.1;
4040	$AnyEvent::BDB::WATCHER->priority (1);	4259	#$AnyEvent::BDB::WATCHER->priority (1);
4041		4260
4042	unless ($DB_ENV) {	4261	unless ($DB_ENV) {
4043	$DB_ENV = BDB::db_env_create;	4262	$DB_ENV = BDB::db_env_create;
4044	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4263	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4045	$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;
…		…
4070	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4289	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4071	};	4290	};
4072	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4291	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4073	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4292	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4074	};	4293	};
		4294
		4295	info "database initialised";
4075	}	4296	}
4076		4297
4077	{	4298	{
4078	# configure IO::AIO	4299	# configure IO::AIO
4079		4300
		4301	info "initialising aio";
4080	IO::AIO::min_parallel 8;	4302	IO::AIO::min_parallel 8;
4081	IO::AIO::max_poll_time $TICK * 0.1;	4303	IO::AIO::max_poll_time $TICK * 0.1;
4082	undef $AnyEvent::AIO::WATCHER;	4304	undef $AnyEvent::AIO::WATCHER;
		4305	info "aio initialised";
4083	}	4306	}
4084		4307
4085	my $_log_backtrace;	4308	our $_log_backtrace;
		4309	our $_log_backtrace_last;
4086		4310
4087	sub _log_backtrace {	4311	sub _log_backtrace {
4088	my ($msg, @addr) = @_;	4312	my ($msg, @addr) = @_;
4089		4313
4090	$msg =~ s/\n//;	4314	$msg =~ s/\n$//;
4091		4315
		4316	if ($_log_backtrace_last eq $msg) {
		4317	LOG llevInfo, "[ABT] $msg\n";
		4318	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4092	# limit the # of concurrent backtraces	4319	# limit the # of concurrent backtraces
4093	if ($_log_backtrace < 2) {	4320	} elsif ($_log_backtrace < 2) {
		4321	$_log_backtrace_last = $msg;
4094	++$_log_backtrace;	4322	++$_log_backtrace;
4095	my $perl_bt = Carp::longmess $msg;	4323	my $perl_bt = Carp::longmess $msg;
4096	async {	4324	async {
4097	$Coro::current->{desc} = "abt $msg";	4325	$Coro::current->{desc} = "abt $msg";
4098		4326
…		…
4118	LOG llevInfo, "[ABT] $_\n" for @bt;	4346	LOG llevInfo, "[ABT] $_\n" for @bt;
4119	--$_log_backtrace;	4347	--$_log_backtrace;
4120	};	4348	};
4121	} else {	4349	} else {
4122	LOG llevInfo, "[ABT] $msg\n";	4350	LOG llevInfo, "[ABT] $msg\n";
4123	LOG llevInfo, "[ABT] [suppressed]\n";	4351	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4124	}	4352	}
4125	}	4353	}
4126		4354
4127	# load additional modules	4355	# load additional modules
4128	require "cf/$_.pm" for @EXTRA_MODULES;	4356	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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