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.523 by root, Sat Apr 17 02:39:46 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 = 4000;	120	our $OUTPUT_RATE_MIN = 3000;
114	our $OUTPUT_RATE_MAX = 100000;	121	our $OUTPUT_RATE_MAX = 1000000;
		122
		123	our $MAX_LINKS = 32; # how many chained exits to follow
		124	our $VERBOSE_IO = 1;
115		125
116	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	126	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
117	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	127	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
118	our $NEXT_TICK;	128	our $NEXT_TICK;
119	our $USE_FSYNC = 1; # use fsync to write maps - default on	129	our $USE_FSYNC = 1; # use fsync to write maps - default on
…		…
121	our $BDB_DEADLOCK_WATCHER;	131	our $BDB_DEADLOCK_WATCHER;
122	our $BDB_CHECKPOINT_WATCHER;	132	our $BDB_CHECKPOINT_WATCHER;
123	our $BDB_TRICKLE_WATCHER;	133	our $BDB_TRICKLE_WATCHER;
124	our $DB_ENV;	134	our $DB_ENV;
125		135
126	our @EXTRA_MODULES = qw(pod match mapscript);	136	our @EXTRA_MODULES = qw(pod match mapscript incloader);
127		137
128	our %CFG;	138	our %CFG;
		139	our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
129		140
130	our $UPTIME; $UPTIME ||= time;	141	our $UPTIME; $UPTIME ||= time;
131	our $RUNTIME;	142	our $RUNTIME = 0;
		143	our $SERVER_TICK = 0;
132	our $NOW;	144	our $NOW;
133		145
134	our (%PLAYER, %PLAYER_LOADING); # all users	146	our (%PLAYER, %PLAYER_LOADING); # all users
135	our (%MAP, %MAP_LOADING ); # all maps	147	our (%MAP, %MAP_LOADING ); # all maps
136	our $LINK_MAP; # the special {link} map, which is always available	148	our $LINK_MAP; # the special {link} map, which is always available
…		…
145		157
146	our @POST_INIT;	158	our @POST_INIT;
147		159
148	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)
149	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;
150		165
151	binmode STDOUT;	166	binmode STDOUT;
152	binmode STDERR;	167	binmode STDERR;
153		168
154	# read virtual server time, if available	169	# read virtual server time, if available
…		…
188		203
189	=over 4	204	=over 4
190		205
191	=item $cf::UPTIME	206	=item $cf::UPTIME
192		207
193	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.
194		224
195	=item $cf::RUNTIME	225	=item $cf::RUNTIME
196		226
197	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
198	every server tick.	228	every server tick.
199		229
200	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR	230	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
201	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR	231	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
202	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR	232	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
203		233
204	Various directories - "/etc", read-only install directory, perl-library	234	Various directories - "/etc", read-only install directory, perl-library
205	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	235	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
206	unique-items directory, player file directory, random maps directory and	236	unique-items directory, player file directory, random maps directory and
207	database environment.	237	database environment.
208		238
209	=item $cf::NOW
210
211	The time of the last (current) server tick.
212
213	=item $cf::TICK
214
215	The interval between server ticks, in seconds.
216
217	=item $cf::LOADAVG	239	=item $cf::LOADAVG
218		240
219	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
220	(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
221	objects per tick. Healthy values are < 0.5.	243	objects per tick. Healthy values are < 0.5.
…		…
230	from wherever your confdir points to.	252	from wherever your confdir points to.
231		253
232	=item cf::wait_for_tick, cf::wait_for_tick_begin	254	=item cf::wait_for_tick, cf::wait_for_tick_begin
233		255
234	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
235	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
236	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();
237		276
238	=item @cf::INVOKE_RESULTS	277	=item @cf::INVOKE_RESULTS
239		278
240	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
241	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
…		…
249		288
250	=back	289	=back
251		290
252	=cut	291	=cut
253		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
254	$Coro::State::WARNHOOK = sub {	299	$Coro::State::WARNHOOK = sub {
255	my $msg = join "", @_;	300	my $msg = join "", @_;
256		301
257	$msg .= "\n"	302	$msg .= "\n"
258	unless $msg =~ /\n$/;	303	unless $msg =~ /\n$/;
259		304
260	$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;
261		306
262	LOG llevError, $msg;	307	LOG llevWarn, $msg;
263	};	308	};
264		309
265	$Coro::State::DIEHOOK = sub {	310	$Coro::State::DIEHOOK = sub {
266	return unless $^S eq 0; # "eq", not "=="	311	return unless $^S eq 0; # "eq", not "=="
267		312
268	warn Carp::longmess $_[0];	313	error Carp::longmess $_[0];
269		314
270	if (in_main) {#d#	315	if (in_main) {#d#
271	warn "DIEHOOK called in main context, Coro bug?\n";#d#	316	error "DIEHOOK called in main context, Coro bug?\n";#d#
272	return;#d#	317	return;#d#
273	}#d#	318	}#d#
274		319
275	# kill coroutine otherwise	320	# kill coroutine otherwise
276	Coro::terminate	321	Coro::terminate
…		…
296	)) {	341	)) {
297	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	342	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
298	}	343	}
299		344
300	$EV::DIED = sub {	345	$EV::DIED = sub {
301	Carp::cluck "error in event callback: @_";	346	warn "error in event callback: $@";
302	};	347	};
		348
		349	#############################################################################
		350
		351	sub fork_call(&@);
		352	sub get_slot($;$$);
303		353
304	#############################################################################	354	#############################################################################
305		355
306	=head2 UTILITY FUNCTIONS	356	=head2 UTILITY FUNCTIONS
307		357
…		…
328	$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;
329	$d	379	$d
330	} || "[unable to dump $_[0]: '$@']";	380	} || "[unable to dump $_[0]: '$@']";
331	}	381	}
332		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
333	=item $ref = cf::decode_json $json	435	=item $ref = cf::decode_json $json
334		436
335	Converts a JSON string into the corresponding perl data structure.	437	Converts a JSON string into the corresponding perl data structure.
336		438
337	=item $json = cf::encode_json $ref	439	=item $json = cf::encode_json $ref
…		…
343	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
344		446
345	sub encode_json($) { $json_coder->encode ($_[0]) }	447	sub encode_json($) { $json_coder->encode ($_[0]) }
346	sub decode_json($) { $json_coder->decode ($_[0]) }	448	sub decode_json($) { $json_coder->decode ($_[0]) }
347		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
348	=item cf::post_init { BLOCK }	481	=item cf::post_init { BLOCK }
349		482
350	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,
351	but I<before> the server starts ticking again.	484	but I<before> the server starts ticking again.
352		485
353	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
354	is a reload or not.	487	is a reload or not.
355		488
356	=cut	489	=cut
357		490
358	sub post_init(&) {	491	sub post_init(&) {
359	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	}
360	}	510	}
361		511
362	=item cf::lock_wait $string	512	=item cf::lock_wait $string
363		513
364	Wait until the given lock is available. See cf::lock_acquire.	514	Wait until the given lock is available. See cf::lock_acquire.
…		…
417	EV::periodic $start, $interval, 0, $cb	567	EV::periodic $start, $interval, 0, $cb
418	}	568	}
419		569
420	=item cf::get_slot $time[, $priority[, $name]]	570	=item cf::get_slot $time[, $priority[, $name]]
421		571
422	Allocate $time seconds of blocking CPU time at priority C<$priority>:	572	Allocate $time seconds of blocking CPU time at priority C<$priority>
423	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
424	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.
425		579
426	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
427	used for statistical purposes and should identify the same time-class.	581	used for statistical purposes and should identify the same time-class.
428		582
429	Useful for short background jobs.	583	Useful for short background jobs.
…		…
458	}	612	}
459	}	613	}
460		614
461	if (@SLOT_QUEUE) {	615	if (@SLOT_QUEUE) {
462	# 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
463	push @cf::WAIT_FOR_TICK, $signal;	617	$WAIT_FOR_TICK->wait;
464	$signal->wait;
465	} else {	618	} else {
466	$busy = 0;	619	$busy = 0;
467	Coro::schedule;	620	Coro::schedule;
468	}	621	}
469	}	622	}
…		…
509	=cut	662	=cut
510		663
511	sub sync_job(&) {	664	sub sync_job(&) {
512	my ($job) = @_;	665	my ($job) = @_;
513		666
514	if ($Coro::current == $Coro::main) {	667	if (in_main) {
515	my $time = AE::time;	668	my $time = AE::time;
516		669
517	# this is the main coro, too bad, we have to block	670	# this is the main coro, too bad, we have to block
518	# till the operation succeeds, freezing the server :/	671	# till the operation succeeds, freezing the server :/
519		672
520	LOG llevError, Carp::longmess "sync job";#d#	673	#LOG llevError, Carp::longmess "sync job";#d#
521		674
522	my $freeze_guard = freeze_mainloop;	675	my $freeze_guard = freeze_mainloop;
523		676
524	my $busy = 1;	677	my $busy = 1;
525	my @res;	678	my @res;
526		679
527	(async {	680	(async {
528	$Coro::current->desc ("sync job coro");	681	$Coro::current->desc ("sync job coro");
529	@res = eval { $job->() };	682	@res = eval { $job->() };
530	warn $@ if $@;	683	error $@ if $@;
531	undef $busy;	684	undef $busy;
532	})->prio (Coro::PRIO_MAX);	685	})->prio (Coro::PRIO_MAX);
533		686
534	while ($busy) {	687	while ($busy) {
535	if (Coro::nready) {	688	if (Coro::nready) {
…		…
569	$EXT_CORO{$coro+0} = $coro;	722	$EXT_CORO{$coro+0} = $coro;
570		723
571	$coro	724	$coro
572	}	725	}
573		726
574	=item fork_call { }, $args	727	=item fork_call { }, @args
575		728
576	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
577	process, returning the results. Everything must be serialisable with	730	process, returning the results. Everything must be serialisable with
578	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
579	never block itself or use any form of event handling.	732	never block itself or use any form of event handling.
580		733
581	=cut	734	=cut
582		735
		736	sub post_fork {
		737	reset_signals;
		738	}
		739
583	sub fork_call(&@) {	740	sub fork_call(&@) {
584	my ($cb, @args) = @_;	741	my ($cb, @args) = @_;
585		742
586	# 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,
587	# otherwise perl prematurely frees the stuff :/	744	# otherwise perl prematurely frees the stuff :/
588	# TODO: investigate and fix (likely this will be rather laborious)	745	# TODO: investigate and fix (likely this will be rather laborious)
589		746
590	my @res = Coro::Util::fork_eval {	747	my @res = Coro::Util::fork_eval {
591	reset_signals;	748	cf::post_fork;
592	&$cb	749	&$cb
593	}, @args;	750	} @args;
594		751
595	wantarray ? @res : $res[-1]	752	wantarray ? @res : $res[-1]
596	}	753	}
597		754
598	sub objinfo {	755	sub objinfo {
…		…
648	within each server.	805	within each server.
649		806
650	=cut	807	=cut
651		808
652	sub db_table($) {	809	sub db_table($) {
		810	cf::error "db_get called from main context"
		811	if $Coro::current == $Coro::main;
		812
653	my ($name) = @_;	813	my ($name) = @_;
654	my $db = BDB::db_create $DB_ENV;	814	my $db = BDB::db_create $DB_ENV;
655		815
656	eval {	816	eval {
657	$db->set_flags (BDB::CHKSUM);	817	$db->set_flags (BDB::CHKSUM);
…		…
667	}	827	}
668		828
669	our $DB;	829	our $DB;
670		830
671	sub db_init {	831	sub db_init {
672	cf::sync_job {
673	$DB ||= db_table "db";	832	$DB ||= db_table "db";
674	};
675	}	833	}
676		834
677	sub db_get($$) {	835	sub db_get($$) {
678	my $key = "$_[0]/$_[1]";	836	my $key = "$_[0]/$_[1]";
679		837
680	cf::sync_job {	838	cf::error "db_get called from main context"
		839	if $Coro::current == $Coro::main;
		840
681	BDB::db_get $DB, undef, $key, my $data;	841	BDB::db_get $DB, undef, $key, my $data;
682		842
683	$! ? ()	843	$! ? ()
684	: $data	844	: $data
685	}
686	}	845	}
687		846
688	sub db_put($$$) {	847	sub db_put($$$) {
689	BDB::dbreq_pri 4;	848	BDB::dbreq_pri 4;
690	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	849	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
718		877
719	my @data;	878	my @data;
720	my $md5;	879	my $md5;
721		880
722	for (0 .. $#$src) {	881	for (0 .. $#$src) {
723	0 <= aio_load $src->[$_], $data[$_]	882	$data[$_] = load_file $src->[$_];
724	or Carp::croak "$src->[$_]: $!";
725	}	883	}
726		884
727	# if processing is expensive, check	885	# if processing is expensive, check
728	# checksum first	886	# checksum first
729	if (1) {	887	if (1) {
…		…
742		900
743	return db_get cache => "$id/data";	901	return db_get cache => "$id/data";
744	}	902	}
745	}	903	}
746		904
747	my $t1 = Time::HiRes::time;	905	my $t1 = EV::time;
748	my $data = $process->(\@data);	906	my $data = $process->(\@data);
749	my $t2 = Time::HiRes::time;	907	my $t2 = EV::time;
750		908
751	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	909	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
752		910
753	db_put cache => "$id/data", $data;	911	db_put cache => "$id/data", $data;
754	db_put cache => "$id/md5" , $md5;	912	db_put cache => "$id/md5" , $md5;
755	db_put cache => "$id/meta", $meta;	913	db_put cache => "$id/meta", $meta;
756		914
…		…
766		924
767	=cut	925	=cut
768		926
769	sub datalog($@) {	927	sub datalog($@) {
770	my ($type, %kv) = @_;	928	my ($type, %kv) = @_;
771	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	929	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
772	}	930	}
773		931
774	=back	932	=back
775		933
776	=cut	934	=cut
…		…
971		1129
972	} elsif (exists $cb_id{$type}) {	1130	} elsif (exists $cb_id{$type}) {
973	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	1131	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
974		1132
975	} elsif (ref $type) {	1133	} elsif (ref $type) {
976	warn "attaching objects not supported, ignoring.\n";	1134	error "attaching objects not supported, ignoring.\n";
977		1135
978	} else {	1136	} else {
979	shift @arg;	1137	shift @arg;
980	warn "attach argument '$type' not supported, ignoring.\n";	1138	error "attach argument '$type' not supported, ignoring.\n";
981	}	1139	}
982	}	1140	}
983	}	1141	}
984		1142
985	sub _object_attach {	1143	sub _object_attach {
…		…
995	_attach $registry, $klass, @attach;	1153	_attach $registry, $klass, @attach;
996	}	1154	}
997		1155
998	$obj->{$name} = \%arg;	1156	$obj->{$name} = \%arg;
999	} else {	1157	} else {
1000	warn "object uses attachment '$name' which is not available, postponing.\n";	1158	info "object uses attachment '$name' which is not available, postponing.\n";
1001	}	1159	}
1002		1160
1003	$obj->{_attachment}{$name} = undef;	1161	$obj->{_attachment}{$name} = undef;
1004	}	1162	}
1005		1163
…		…
1064		1222
1065	for (@$callbacks) {	1223	for (@$callbacks) {
1066	eval { &{$_->[1]} };	1224	eval { &{$_->[1]} };
1067		1225
1068	if ($@) {	1226	if ($@) {
1069	warn "$@";
1070	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1227	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1071	override;	1228	override;
1072	}	1229	}
1073		1230
1074	return 1 if $override;	1231	return 1 if $override;
1075	}	1232	}
…		…
1154	for (@$attach) {	1311	for (@$attach) {
1155	my ($klass, @attach) = @$_;	1312	my ($klass, @attach) = @$_;
1156	_attach $registry, $klass, @attach;	1313	_attach $registry, $klass, @attach;
1157	}	1314	}
1158	} else {	1315	} else {
1159	warn "object uses attachment '$name' that is not available, postponing.\n";	1316	info "object uses attachment '$name' that is not available, postponing.\n";
1160	}	1317	}
1161	}	1318	}
1162	}	1319	}
1163		1320
1164	cf::attachable->attach (	1321	cf::attachable->attach (
…		…
1191	my ($filename, $rdata, $objs) = @_;	1348	my ($filename, $rdata, $objs) = @_;
1192		1349
1193	sync_job {	1350	sync_job {
1194	if (length $$rdata) {	1351	if (length $$rdata) {
1195	utf8::decode (my $decname = $filename);	1352	utf8::decode (my $decname = $filename);
1196	warn sprintf "saving %s (%d,%d)\n",	1353	trace sprintf "saving %s (%d,%d)\n",
1197	$decname, length $$rdata, scalar @$objs;	1354	$decname, length $$rdata, scalar @$objs
		1355	if $VERBOSE_IO;
1198		1356
1199	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1357	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1200	aio_chmod $fh, SAVE_MODE;	1358	aio_chmod $fh, SAVE_MODE;
1201	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1359	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1202	if ($cf::USE_FSYNC) {	1360	if ($cf::USE_FSYNC) {
…		…
1224	aio_rename "$filename~", $filename;	1382	aio_rename "$filename~", $filename;
1225		1383
1226	$filename =~ s%/[^/]+$%%;	1384	$filename =~ s%/[^/]+$%%;
1227	aio_pathsync $filename if $cf::USE_FSYNC;	1385	aio_pathsync $filename if $cf::USE_FSYNC;
1228	} else {	1386	} else {
1229	warn "unable to save objects: $filename~: $!\n";	1387	error "unable to save objects: $filename~: $!\n";
1230	}	1388	}
1231	} else {	1389	} else {
1232	aio_unlink $filename;	1390	aio_unlink $filename;
1233	aio_unlink "$filename.pst";	1391	aio_unlink "$filename.pst";
1234	}	1392	}
…		…
1258	my $st = eval { Coro::Storable::thaw $av };	1416	my $st = eval { Coro::Storable::thaw $av };
1259	$av = $st->{objs};	1417	$av = $st->{objs};
1260	}	1418	}
1261		1419
1262	utf8::decode (my $decname = $filename);	1420	utf8::decode (my $decname = $filename);
1263	warn sprintf "loading %s (%d,%d)\n",	1421	trace sprintf "loading %s (%d,%d)\n",
1264	$decname, length $data, scalar @{$av || []};	1422	$decname, length $data, scalar @{$av || []}
		1423	if $VERBOSE_IO;
1265		1424
1266	($data, $av)	1425	($data, $av)
1267	}	1426	}
1268		1427
1269	=head2 COMMAND CALLBACKS	1428	=head2 COMMAND CALLBACKS
…		…
1273	=cut	1432	=cut
1274		1433
1275	#############################################################################	1434	#############################################################################
1276	# command handling &c	1435	# command handling &c
1277		1436
1278	=item cf::register_command $name => \&callback($ob,$args);	1437	=item cf::register_command $name => \&callback($ob,$args)
1279		1438
1280	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
1281	$name.	1440	$name.
1282		1441
1283	=cut	1442	=cut
…		…
1289	#warn "registering command '$name/$time' to '$caller'";	1448	#warn "registering command '$name/$time' to '$caller'";
1290		1449
1291	push @{ $COMMAND{$name} }, [$caller, $cb];	1450	push @{ $COMMAND{$name} }, [$caller, $cb];
1292	}	1451	}
1293		1452
1294	=item cf::register_extcmd $name => \&callback($pl,$packet);	1453	=item cf::register_extcmd $name => \&callback($pl,@args)
1295		1454
1296	Register a callback for execution when the client sends an (synchronous)	1455	Register a callback for execution when the client sends an (synchronous)
1297	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
1298	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
1299	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
1300	has logged in successfully.	1459	has logged in successfully.
1301		1460
1302	If the callback returns something, it is sent back as if reply was being	1461	The values will be sent back to the client.
1303	called.
1304		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
1305	=item cf::register_exticmd $name => \&callback($ns,$packet);	1468	=item cf::register_exticmd $name => \&callback($ns,@args)
1306		1469
1307	Register a callback for execution when the client sends an (asynchronous)	1470	Register a callback for execution when the client sends an (asynchronous)
1308	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
1309	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
1310	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
1311	log-in.	1474	log-in.
1312		1475
1313	If the callback returns something, it is sent back as if reply was being	1476	The values will be sent back to the client.
1314	called.
1315		1477
1316	=cut	1478	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1317		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
1318	sub register_extcmd {	1485	sub register_extcmd($$) {
1319	my ($name, $cb) = @_;	1486	my ($name, $cb) = @_;
1320		1487
1321	$EXTCMD{$name} = $cb;	1488	$EXTCMD{$name} = $cb;
1322	}	1489	}
1323		1490
1324	sub register_exticmd {	1491	sub register_async_extcmd($$) {
1325	my ($name, $cb) = @_;	1492	my ($name, $cb) = @_;
1326		1493
		1494	$EXTACMD{$name} = $cb;
		1495	}
		1496
		1497	sub register_exticmd($$) {
		1498	my ($name, $cb) = @_;
		1499
1327	$EXTICMD{$name} = $cb;	1500	$EXTICMD{$name} = $cb;
		1501	}
		1502
		1503	sub register_async_exticmd($$) {
		1504	my ($name, $cb) = @_;
		1505
		1506	$EXTIACMD{$name} = $cb;
1328	}	1507	}
1329		1508
1330	use File::Glob ();	1509	use File::Glob ();
1331		1510
1332	cf::player->attach (	1511	cf::player->attach (
…		…
1346	my ($pl, $buf) = @_;	1525	my ($pl, $buf) = @_;
1347		1526
1348	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1527	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1349		1528
1350	if (ref $msg) {	1529	if (ref $msg) {
1351	my ($type, $reply, @payload) =	1530	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1352	"ARRAY" eq ref $msg
1353	? @$msg
1354	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1355		1531
1356	my @reply;
1357
1358	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}) {
1359	@reply = $cb->($pl, @payload);	1545	@reply = $cb->($pl, @payload);
		1546	}
		1547
		1548	$pl->ext_msg ("reply-$reply", @reply)
		1549	if $reply;
1360	}	1550	}
1361		1551
1362	$pl->ext_reply ($reply, @reply)
1363	if $reply;
1364
1365	} else {	1552	} else {
1366	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1553	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1367	}	1554	}
1368		1555
1369	cf::override;	1556	cf::override;
1370	},	1557	},
1371	);	1558	);
…		…
1381	};	1568	};
1382		1569
1383	$grp	1570	$grp
1384	}	1571	}
1385		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
1386	sub load_extensions {	1584	sub load_extensions {
		1585	info "loading extensions...";
		1586
		1587	%EXT_CFG = ();
		1588
1387	cf::sync_job {	1589	cf::sync_job {
1388	my %todo;	1590	my %todo;
1389		1591
1390	for my $path (<$LIBDIR/*.ext>) {	1592	for my $path (<$LIBDIR/*.ext>) {
1391	next unless -r $path;	1593	next unless -r $path;
…		…
1409		1611
1410	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1612	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1411	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1613	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1412		1614
1413	$ext{source} =	1615	$ext{source} =
1414	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1616	"package $pkg; use common::sense;\n"
1415	. "#line 1 \"$path\"\n{\n"	1617	. "#line 1 \"$path\"\n{\n"
1416	. $source	1618	. $source
1417	. "\n};\n1";	1619	. "\n};\n1";
1418		1620
1419	$todo{$base} = \%ext;	1621	$todo{$base} = \%ext;
…		…
1431	for (split /,\s*/, $v->{meta}{depends}) {	1633	for (split /,\s*/, $v->{meta}{depends}) {
1432	next ext	1634	next ext
1433	unless exists $done{$_};	1635	unless exists $done{$_};
1434	}	1636	}
1435		1637
1436	warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1638	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1437		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
1438	my $active = eval $v->{source};	1649	my $active = eval $source;
1439		1650
1440	if (length $@) {	1651	if (length $@) {
1441	warn "$v->{path}: $@\n";	1652	error "$v->{path}: $@\n";
1442		1653
1443	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1654	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1444	if exists $v->{meta}{mandatory};	1655	if exists $v->{meta}{mandatory};
1445		1656
1446	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";	1657	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
…		…
1448	} else {	1659	} else {
1449	$done{$k} = delete $todo{$k};	1660	$done{$k} = delete $todo{$k};
1450	push @EXTS, $v->{pkg};	1661	push @EXTS, $v->{pkg};
1451	$progress = 1;	1662	$progress = 1;
1452		1663
1453	warn "$v->{base}: extension inactive.\n"	1664	info "$v->{base}: extension inactive.\n"
1454	unless $active;	1665	unless $active;
1455	}	1666	}
1456	}	1667	}
1457		1668
1458	unless ($progress) {	1669	unless ($progress) {
…		…
1460		1671
1461	while (my ($k, $v) = each %todo) {	1672	while (my ($k, $v) = each %todo) {
1462	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1673	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1463	if exists $v->{meta}{mandatory};	1674	if exists $v->{meta}{mandatory};
1464	}	1675	}
		1676
		1677	last;
1465	}	1678	}
1466	}	1679	}
1467	};	1680	};
1468	}	1681	}
1469		1682
…		…
1627	my $name = $pl->ob->name;	1840	my $name = $pl->ob->name;
1628		1841
1629	$pl->{deny_save} = 1;	1842	$pl->{deny_save} = 1;
1630	$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
1631		1844
1632	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1845	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1633	$pl->deactivate;	1846	$pl->deactivate;
		1847
1634	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;
1635	$pl->ob->check_score;
1636	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1849	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1850	ext::highscore::check ($pl->ob);
		1851
1637	$pl->ns->destroy if $pl->ns;	1852	$pl->ns->destroy if $pl->ns;
1638		1853
1639	my $path = playerdir $pl;	1854	my $path = playerdir $pl;
1640	my $temp = "$path~$cf::RUNTIME~deleting~";	1855	my $temp = "$path~$cf::RUNTIME~deleting~";
1641	aio_rename $path, $temp;	1856	aio_rename $path, $temp;
…		…
1727		1942
1728	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1943	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1729		1944
1730	Expand deliantra pod fragments into protocol xml.	1945	Expand deliantra pod fragments into protocol xml.
1731		1946
1732	=item $player->ext_reply ($msgid, @msg)
1733
1734	Sends an ext reply to the player.
1735
1736	=cut
1737
1738	sub ext_reply($$@) {
1739	my ($self, $id, @msg) = @_;
1740
1741	$self->ns->ext_reply ($id, @msg)
1742	}
1743
1744	=item $player->ext_msg ($type, @msg)	1947	=item $player->ext_msg ($type, @msg)
1745		1948
1746	Sends an ext event to the client.	1949	Sends an ext event to the client.
1747		1950
1748	=cut	1951	=cut
…		…
1807	sub generate_random_map {	2010	sub generate_random_map {
1808	my ($self, $rmp) = @_;	2011	my ($self, $rmp) = @_;
1809		2012
1810	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
1811		2014
1812	# mit "rum" bekleckern, nicht
1813	$self->_create_random_map (	2015	$self->_create_random_map ($rmp);
1814	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1815	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1816	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1817	$rmp->{exit_on_final_map},
1818	$rmp->{xsize}, $rmp->{ysize},
1819	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1820	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1821	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1822	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1823	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1824	(cf::region::find $rmp->{region}), $rmp->{custom}
1825	)
1826	}	2016	}
1827		2017
1828	=item cf::map->register ($regex, $prio)	2018	=item cf::map->register ($regex, $prio)
1829		2019
1830	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
…		…
1835		2025
1836	sub register {	2026	sub register {
1837	my (undef, $regex, $prio) = @_;	2027	my (undef, $regex, $prio) = @_;
1838	my $pkg = caller;	2028	my $pkg = caller;
1839		2029
1840	no strict;
1841	push @{"$pkg\::ISA"}, __PACKAGE__;	2030	push @{"$pkg\::ISA"}, __PACKAGE__;
1842		2031
1843	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	2032	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1844	}	2033	}
1845		2034
1846	# also paths starting with '/'	2035	# also paths starting with '/'
1847	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	2036	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1848		2037
1849	sub thawer_merge {	2038	sub thawer_merge {
1850	my ($self, $merge) = @_;	2039	my ($self, $merge) = @_;
1851		2040
1852	# we have to keep some variables in memory intact	2041	# we have to keep some variables in memory intact
…		…
1857	}	2046	}
1858		2047
1859	sub normalise {	2048	sub normalise {
1860	my ($path, $base) = @_;	2049	my ($path, $base) = @_;
1861		2050
1862	$path = "$path"; # make sure its a string	2051	$path = "$path"; # make sure it's a string
1863		2052
1864	$path =~ s/\.map$//;	2053	$path =~ s/\.map$//;
1865		2054
1866	# map plan:	2055	# map plan:
1867	#	2056	#
…		…
1882	$base =~ s{[^/]+/?$}{};	2071	$base =~ s{[^/]+/?$}{};
1883	$path = "$base/$path";	2072	$path = "$base/$path";
1884	}	2073	}
1885		2074
1886	for ($path) {	2075	for ($path) {
1887	redo if s{//}{/};
1888	redo if s{/\.?/}{/};	2076	redo if s{/\.?/}{/};
1889	redo if s{/[^/]+/\.\./}{/};	2077	redo if s{/[^/]+/\.\./}{/};
1890	}	2078	}
1891		2079
1892	$path	2080	$path
…		…
1906	$self->init; # pass $1 etc.	2094	$self->init; # pass $1 etc.
1907	return $self;	2095	return $self;
1908	}	2096	}
1909	}	2097	}
1910		2098
1911	Carp::cluck "unable to resolve path '$path' (base '$base').";	2099	Carp::cluck "unable to resolve path '$path' (base '$base')";
1912	()	2100	()
1913	}	2101	}
1914		2102
		2103	# may re-bless or do other evil things
1915	sub init {	2104	sub init {
1916	my ($self) = @_;	2105	my ($self) = @_;
1917		2106
1918	$self	2107	$self
1919	}	2108	}
…		…
1984	$self->{load_path} = $path;	2173	$self->{load_path} = $path;
1985		2174
1986	1	2175	1
1987	}	2176	}
1988		2177
		2178	# used to laod the header of an original map
1989	sub load_header_orig {	2179	sub load_header_orig {
1990	my ($self) = @_;	2180	my ($self) = @_;
1991		2181
1992	$self->load_header_from ($self->load_path)	2182	$self->load_header_from ($self->load_path)
1993	}	2183	}
1994		2184
		2185	# used to laod the header of an instantiated map
1995	sub load_header_temp {	2186	sub load_header_temp {
1996	my ($self) = @_;	2187	my ($self) = @_;
1997		2188
1998	$self->load_header_from ($self->save_path)	2189	$self->load_header_from ($self->save_path)
1999	}	2190	}
2000		2191
		2192	# called after loading the header from an instantiated map
2001	sub prepare_temp {	2193	sub prepare_temp {
2002	my ($self) = @_;	2194	my ($self) = @_;
2003		2195
2004	$self->last_access ((delete $self->{last_access})	2196	$self->last_access ((delete $self->{last_access})
2005	|| $cf::RUNTIME); #d#	2197	|| $cf::RUNTIME); #d#
2006	# safety	2198	# safety
2007	$self->{instantiate_time} = $cf::RUNTIME	2199	$self->{instantiate_time} = $cf::RUNTIME
2008	if $self->{instantiate_time} > $cf::RUNTIME;	2200	if $self->{instantiate_time} > $cf::RUNTIME;
2009	}	2201	}
2010		2202
		2203	# called after loading the header from an original map
2011	sub prepare_orig {	2204	sub prepare_orig {
2012	my ($self) = @_;	2205	my ($self) = @_;
2013		2206
2014	$self->{load_original} = 1;	2207	$self->{load_original} = 1;
2015	$self->{instantiate_time} = $cf::RUNTIME;	2208	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2039		2232
2040	sub find;	2233	sub find;
2041	sub find {	2234	sub find {
2042	my ($path, $origin) = @_;	2235	my ($path, $origin) = @_;
2043		2236
		2237	cf::cede_to_tick;
		2238
2044	$path = normalise $path, $origin && $origin->path;	2239	$path = normalise $path, $origin;
2045		2240
2046	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2241	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2047	my $guard2 = cf::lock_acquire "map_find:$path";	2242	my $guard2 = cf::lock_acquire "map_find:$path";
2048		2243
2049	$cf::MAP{$path} || do {	2244	$cf::MAP{$path} || do {
…		…
2080		2275
2081	{	2276	{
2082	my $guard = cf::lock_acquire "map_data:$path";	2277	my $guard = cf::lock_acquire "map_data:$path";
2083		2278
2084	return unless $self->valid;	2279	return unless $self->valid;
2085	return unless $self->in_memory == cf::MAP_SWAPPED;	2280	return unless $self->state == cf::MAP_SWAPPED;
2086
2087	$self->in_memory (cf::MAP_LOADING);
2088		2281
2089	$self->alloc;	2282	$self->alloc;
2090		2283
2091	$self->pre_load;	2284	$self->pre_load;
2092	cf::cede_to_tick;	2285	cf::cede_to_tick;
2093		2286
		2287	if (exists $self->{load_path}) {
2094	my $f = new_from_file cf::object::thawer $self->{load_path};	2288	my $f = new_from_file cf::object::thawer $self->{load_path};
2095	$f->skip_block;	2289	$f->skip_block;
2096	$self->_load_objects ($f)	2290	$self->_load_objects ($f)
2097	or return;	2291	or return;
2098		2292
2099	$self->post_load_original	2293	$self->post_load_original
2100	if delete $self->{load_original};	2294	if delete $self->{load_original};
2101		2295
2102	if (my $uniq = $self->uniq_path) {	2296	if (my $uniq = $self->uniq_path) {
2103	utf8::encode $uniq;	2297	utf8::encode $uniq;
2104	unless (aio_stat $uniq) {	2298	unless (aio_stat $uniq) {
2105	if (my $f = new_from_file cf::object::thawer $uniq) {	2299	if (my $f = new_from_file cf::object::thawer $uniq) {
2106	$self->clear_unique_items;	2300	$self->clear_unique_items;
2107	$self->_load_objects ($f);	2301	$self->_load_objects ($f);
2108	$f->resolve_delayed_derefs;	2302	$f->resolve_delayed_derefs;
		2303	}
2109	}	2304	}
2110	}	2305	}
2111	}
2112		2306
2113	$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);
2114		2314
2115	cf::cede_to_tick;	2315	cf::cede_to_tick;
2116	# now do the right thing for maps	2316	# now do the right thing for maps
2117	$self->link_multipart_objects;	2317	$self->link_multipart_objects;
2118	$self->difficulty ($self->estimate_difficulty)	2318	$self->difficulty ($self->estimate_difficulty)
…		…
2122	unless ($self->{deny_activate}) {	2322	unless ($self->{deny_activate}) {
2123	$self->decay_objects;	2323	$self->decay_objects;
2124	$self->fix_auto_apply;	2324	$self->fix_auto_apply;
2125	$self->update_buttons;	2325	$self->update_buttons;
2126	cf::cede_to_tick;	2326	cf::cede_to_tick;
2127	$self->activate;	2327	#$self->activate; # no longer activate maps automatically
2128	}	2328	}
2129		2329
2130	$self->{last_save} = $cf::RUNTIME;	2330	$self->{last_save} = $cf::RUNTIME;
2131	$self->last_access ($cf::RUNTIME);	2331	$self->last_access ($cf::RUNTIME);
2132
2133	$self->in_memory (cf::MAP_ACTIVE);
2134	}	2332	}
2135		2333
2136	$self->post_load;	2334	$self->post_load;
		2335
		2336	1
2137	}	2337	}
2138		2338
2139	# customize the map for a given player, i.e.	2339	# customize the map for a given player, i.e.
2140	# return the _real_ map. used by e.g. per-player	2340	# return the _real_ map. used by e.g. per-player
2141	# maps to change the path to ~playername/mappath	2341	# maps to change the path to ~playername/mappath
…		…
2149	# if $self->per_party;	2349	# if $self->per_party;
2150		2350
2151	$self	2351	$self
2152	}	2352	}
2153		2353
2154	# find and load all maps in the 3x3 area around a map
2155	sub load_neighbours {
2156	my ($map) = @_;
2157
2158	my @neigh; # diagonal neighbours
2159
2160	for (0 .. 3) {
2161	my $neigh = $map->tile_path ($_)
2162	or next;
2163	$neigh = find $neigh, $map
2164	or next;
2165	$neigh->load;
2166
2167	push @neigh,
2168	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2169	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2170	}
2171
2172	for (grep defined $_->[0], @neigh) {
2173	my ($path, $origin) = @$_;
2174	my $neigh = find $path, $origin
2175	or next;
2176	$neigh->load;
2177	}
2178	}
2179
2180	sub find_sync {	2354	sub find_sync {
2181	my ($path, $origin) = @_;	2355	my ($path, $origin) = @_;
2182		2356
2183	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
2184	}	2362	}
2185		2363
2186	sub do_load_sync {	2364	sub do_load_sync {
2187	my ($map) = @_;	2365	my ($map) = @_;
2188		2366
		2367	# it's a bug to call this from the main context
2189	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2368	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2190	if $Coro::current == $Coro::main;	2369	if $Coro::current == $Coro::main;
2191		2370
2192	cf::sync_job { $map->load };	2371	$map->load;
2193	}	2372	}
2194		2373
2195	our %MAP_PREFETCH;	2374	our %MAP_PREFETCH;
2196	our $MAP_PREFETCHER = undef;	2375	our $MAP_PREFETCHER = undef;
2197		2376
2198	sub find_async {	2377	sub find_async {
2199	my ($path, $origin, $load) = @_;	2378	my ($path, $origin, $load) = @_;
2200		2379
2201	$path = normalise $path, $origin && $origin->{path};	2380	$path = normalise $path, $origin;
2202		2381
2203	if (my $map = $cf::MAP{$path}) {	2382	if (my $map = $cf::MAP{$path}) {
2204	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2383	return $map if !$load || $map->linkable;
2205	}	2384	}
2206		2385
2207	$MAP_PREFETCH{$path} |= $load;	2386	$MAP_PREFETCH{$path} |= $load;
2208		2387
2209	$MAP_PREFETCHER ||= cf::async {	2388	$MAP_PREFETCHER ||= cf::async {
…		…
2268	sub swap_out {	2447	sub swap_out {
2269	my ($self) = @_;	2448	my ($self) = @_;
2270		2449
2271	my $lock = cf::lock_acquire "map_data:$self->{path}";	2450	my $lock = cf::lock_acquire "map_data:$self->{path}";
2272		2451
2273	return if $self->in_memory != cf::MAP_ACTIVE;	2452	return if !$self->linkable;
2274	return if $self->{deny_save};	2453	return if $self->{deny_save};
2275	return if $self->players;	2454	return if $self->players;
2276		2455
2277	# first deactivate the map and "unlink" it from the core	2456	# first deactivate the map and "unlink" it from the core
2278	$self->deactivate;	2457	$self->deactivate;
2279	$_->clear_links_to ($self) for values %cf::MAP;	2458	$_->clear_links_to ($self) for values %cf::MAP;
2280	$self->in_memory (cf::MAP_SWAPPED);	2459	$self->state (cf::MAP_SWAPPED);
2281		2460
2282	# then atomically save	2461	# then atomically save
2283	$self->_save;	2462	$self->_save;
2284		2463
2285	# then free the map	2464	# then free the map
…		…
2309		2488
2310	my $lock = cf::lock_acquire "map_data:$self->{path}";	2489	my $lock = cf::lock_acquire "map_data:$self->{path}";
2311		2490
2312	return if $self->players;	2491	return if $self->players;
2313		2492
2314	warn "resetting map ", $self->path, "\n";	2493	cf::trace "resetting map ", $self->path, "\n";
2315		2494
2316	$self->in_memory (cf::MAP_SWAPPED);	2495	$self->state (cf::MAP_SWAPPED);
2317		2496
2318	# need to save uniques path	2497	# need to save uniques path
2319	unless ($self->{deny_save}) {	2498	unless ($self->{deny_save}) {
2320	my $uniq = $self->uniq_path; utf8::encode $uniq;	2499	my $uniq = $self->uniq_path; utf8::encode $uniq;
2321		2500
…		…
2343		2522
2344	delete $cf::MAP{$self->path};	2523	delete $cf::MAP{$self->path};
2345		2524
2346	$self->unlink_save;	2525	$self->unlink_save;
2347		2526
2348	bless $self, "cf::map";	2527	bless $self, "cf::map::wrap";
2349	delete $self->{deny_reset};	2528	delete $self->{deny_reset};
2350	$self->{deny_save} = 1;	2529	$self->{deny_save} = 1;
2351	$self->reset_timeout (1);	2530	$self->reset_timeout (1);
2352	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2531	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2353		2532
…		…
2583		2762
2584	Freezes the player and moves him/her to a special map (C<{link}>).	2763	Freezes the player and moves him/her to a special map (C<{link}>).
2585		2764
2586	The player should be reasonably safe there for short amounts of time (e.g.	2765	The player should be reasonably safe there for short amounts of time (e.g.
2587	for loading a map). You I<MUST> call C<leave_link> as soon as possible,	2766	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2588	though, as the palyer cannot control the character while it is on the link	2767	though, as the player cannot control the character while it is on the link
2589	map.	2768	map.
2590		2769
2591	Will never block.	2770	Will never block.
2592		2771
2593	=item $player_object->leave_link ($map, $x, $y)	2772	=item $player_object->leave_link ($map, $x, $y)
…		…
2614	sub cf::object::player::enter_link {	2793	sub cf::object::player::enter_link {
2615	my ($self) = @_;	2794	my ($self) = @_;
2616		2795
2617	$self->deactivate_recursive;	2796	$self->deactivate_recursive;
2618		2797
		2798	++$self->{_link_recursion};
		2799
2619	return if UNIVERSAL::isa $self->map, "ext::map_link";	2800	return if UNIVERSAL::isa $self->map, "ext::map_link";
2620		2801
2621	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2802	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2622	if $self->map && $self->map->{path} ne "{link}";	2803	if $self->map && $self->map->{path} ne "{link}";
2623		2804
…		…
2649	# use -1 or undef as default coordinates, not 0, 0	2830	# use -1 or undef as default coordinates, not 0, 0
2650	($x, $y) = ($map->enter_x, $map->enter_y)	2831	($x, $y) = ($map->enter_x, $map->enter_y)
2651	if $x <= 0 && $y <= 0;	2832	if $x <= 0 && $y <= 0;
2652		2833
2653	$map->load;	2834	$map->load;
2654	$map->load_neighbours;
2655		2835
2656	return unless $self->contr->active;	2836	return unless $self->contr->active;
2657		2837
2658	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2838	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2659	$self->enter_map ($map, $x, $y);	2839	if ($self->enter_map ($map, $x, $y)) {
2660		2840	# entering was successful
		2841	delete $self->{_link_recursion};
2661	# only activate afterwards, to support waiting in hooks	2842	# only activate afterwards, to support waiting in hooks
2662	$self->activate_recursive;	2843	$self->activate_recursive;
2663	}	2844	}
2664		2845
		2846	}
		2847
2665	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2848	=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2666		2849
2667	Moves the player to the given map-path and coordinates by first freezing	2850	Moves the player to the given map-path and coordinates by first freezing
2668	her, loading and preparing them map, calling the provided $check callback	2851	her, loading and preparing them map, calling the provided $check callback
2669	that has to return the map if sucecssful, and then unfreezes the player on	2852	that has to return the map if sucecssful, and then unfreezes the player on
2670	the new (success) or old (failed) map position. In either case, $done will	2853	the new (success) or old (failed) map position. In either case, $done will
…		…
2677		2860
2678	our $GOTOGEN;	2861	our $GOTOGEN;
2679		2862
2680	sub cf::object::player::goto {	2863	sub cf::object::player::goto {
2681	my ($self, $path, $x, $y, $check, $done) = @_;	2864	my ($self, $path, $x, $y, $check, $done) = @_;
		2865
		2866	if ($self->{_link_recursion} >= $MAX_LINKS) {
		2867	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
		2868	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
		2869	($path, $x, $y) = @$EMERGENCY_POSITION;
		2870	}
2682		2871
2683	# 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
2684	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2873	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2685		2874
2686	$self->enter_link;	2875	$self->enter_link;
…		…
2706	($path, $x, $y) = (undef, undef, undef);	2895	($path, $x, $y) = (undef, undef, undef);
2707	}	2896	}
2708	}	2897	}
2709		2898
2710	my $map = eval {	2899	my $map = eval {
2711	my $map = defined $path ? cf::map::find $path : undef;	2900	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2712		2901
2713	if ($map) {	2902	if ($map) {
2714	$map = $map->customise_for ($self);	2903	$map = $map->customise_for ($self);
2715	$map = $check->($map) if $check && $map;	2904	$map = $check->($map, $x, $y, $self) if $check && $map;
2716	} else {	2905	} else {
2717	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);	2906	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2718	}	2907	}
2719		2908
2720	$map	2909	$map
…		…
2728	if ($gen == $self->{_goto_generation}) {	2917	if ($gen == $self->{_goto_generation}) {
2729	delete $self->{_goto_generation};	2918	delete $self->{_goto_generation};
2730	$self->leave_link ($map, $x, $y);	2919	$self->leave_link ($map, $x, $y);
2731	}	2920	}
2732		2921
2733	$done->() if $done;	2922	$done->($self) if $done;
2734	})->prio (1);	2923	})->prio (1);
2735	}	2924	}
2736		2925
2737	=item $player_object->enter_exit ($exit_object)	2926	=item $player_object->enter_exit ($exit_object)
2738		2927
…		…
2806	$Coro::current->{desc} = "enter_exit";	2995	$Coro::current->{desc} = "enter_exit";
2807		2996
2808	unless (eval {	2997	unless (eval {
2809	$self->deactivate_recursive; # just to be sure	2998	$self->deactivate_recursive; # just to be sure
2810		2999
2811	# random map handling
2812	{
2813	my $guard = cf::lock_acquire "exit_prepare:$exit";
2814
2815	prepare_random_map $exit
2816	if $exit->slaying eq "/!";
2817	}
2818
2819	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	3000	my $map = cf::map::normalise $exit->slaying, $exit->map;
2820	my $x = $exit->stats->hp;	3001	my $x = $exit->stats->hp;
2821	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	}
2822		3026
2823	$self->goto ($map, $x, $y);	3027	$self->goto ($map, $x, $y);
2824		3028
2825	# if exit is damned, update players death & WoR home-position	3029	# if exit is damned, update players death & WoR home-position
2826	$self->contr->savebed ($map, $x, $y)	3030	$self->contr->savebed ($map, $x, $y)
…		…
2831	$self->message ("Something went wrong deep within the deliantra server. "	3035	$self->message ("Something went wrong deep within the deliantra server. "
2832	. "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. "
2833	. "Please report this to the dungeon master!",	3037	. "Please report this to the dungeon master!",
2834	cf::NDI_UNIQUE | cf::NDI_RED);	3038	cf::NDI_UNIQUE | cf::NDI_RED);
2835		3039
2836	warn "ERROR in enter_exit: $@";	3040	error "ERROR in enter_exit: $@";
2837	$self->leave_link;	3041	$self->leave_link;
2838	}	3042	}
2839	})->prio (1);	3043	})->prio (1);
2840	}	3044	}
2841		3045
…		…
3051	=cut	3255	=cut
3052		3256
3053	sub cf::client::ext_msg($$@) {	3257	sub cf::client::ext_msg($$@) {
3054	my ($self, $type, @msg) = @_;	3258	my ($self, $type, @msg) = @_;
3055		3259
3056	if ($self->extcmd == 2) {
3057	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3260	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3058	} elsif ($self->extcmd == 1) { # TODO: remove
3059	push @msg, msgtype => "event_$type";
3060	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3061	}
3062	}
3063
3064	=item $client->ext_reply ($msgid, @msg)
3065
3066	Sends an ext reply to the client.
3067
3068	=cut
3069
3070	sub cf::client::ext_reply($$@) {
3071	my ($self, $id, @msg) = @_;
3072
3073	if ($self->extcmd == 2) {
3074	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3075	} elsif ($self->extcmd == 1) {
3076	#TODO: version 1, remove
3077	unshift @msg, msgtype => "reply", msgid => $id;
3078	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3079	}
3080	}	3261	}
3081		3262
3082	=item $success = $client->query ($flags, "text", \&cb)	3263	=item $success = $client->query ($flags, "text", \&cb)
3083		3264
3084	Queues a query to the client, calling the given callback with	3265	Queues a query to the client, calling the given callback with
…		…
3139	my ($ns, $buf) = @_;	3320	my ($ns, $buf) = @_;
3140		3321
3141	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3322	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3142		3323
3143	if (ref $msg) {	3324	if (ref $msg) {
3144	my ($type, $reply, @payload) =	3325	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3145	"ARRAY" eq ref $msg
3146	? @$msg
3147	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3148		3326
3149	my @reply;
3150
3151	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}) {
3152	@reply = $cb->($ns, @payload);	3340	@reply = $cb->($ns, @payload);
		3341	}
		3342
		3343	$ns->ext_msg ("reply-$reply", @reply)
		3344	if $reply;
3153	}	3345	}
3154
3155	$ns->ext_reply ($reply, @reply)
3156	if $reply;
3157
3158	} else {	3346	} else {
3159	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";
3160	}	3348	}
3161		3349
3162	cf::override;	3350	cf::override;
3163	},	3351	},
3164	);	3352	);
…		…
3245	decrease split destroy change_exp value msg lore send_msg)],	3433	decrease split destroy change_exp value msg lore send_msg)],
3246	["cf::object::player" => qw(player)],	3434	["cf::object::player" => qw(player)],
3247	["cf::player" => qw(peaceful send_msg)],	3435	["cf::player" => qw(peaceful send_msg)],
3248	["cf::map" => qw(trigger)],	3436	["cf::map" => qw(trigger)],
3249	) {	3437	) {
3250	no strict 'refs';
3251	my ($pkg, @funs) = @$_;	3438	my ($pkg, @funs) = @$_;
3252	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3439	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3253	for @funs;	3440	for @funs;
3254	}	3441	}
3255		3442
…		…
3294	local @cf::_safe_eval_args = values %vars;	3481	local @cf::_safe_eval_args = values %vars;
3295	@res = wantarray ? eval eval : scalar eval $eval;	3482	@res = wantarray ? eval eval : scalar eval $eval;
3296	}	3483	}
3297		3484
3298	if ($@) {	3485	if ($@) {
3299	warn "$@";	3486	warn "$@",
3300	warn "while executing safe code '$code'\n";	3487	"while executing safe code '$code'\n",
3301	warn "with arguments " . (join " ", %vars) . "\n";	3488	"with arguments " . (join " ", %vars) . "\n";
3302	}	3489	}
3303		3490
3304	wantarray ? @res : $res[0]	3491	wantarray ? @res : $res[0]
3305	}	3492	}
3306		3493
…		…
3331	=cut	3518	=cut
3332		3519
3333	#############################################################################	3520	#############################################################################
3334	# the server's init and main functions	3521	# the server's init and main functions
3335		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
3336	sub load_facedata($) {	3547	sub load_facedata($) {
3337	my ($path) = @_;	3548	my ($path) = @_;
3338		3549
3339	# 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
3340	# for this (global event?)	3551	# for this (global event?)
3341	%ext::player_env::MUSIC_FACE_CACHE = ();	3552	%ext::player_env::MUSIC_FACE_CACHE = ();
3342		3553
3343	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3554	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3344		3555
3345	warn "loading facedata from $path\n";	3556	trace "loading facedata from $path\n";
3346		3557
3347	my $facedata;	3558	my $facedata = decode_storable load_file $path;
3348	0 < aio_load $path, $facedata
3349	or die "$path: $!";
3350
3351	$facedata = Coro::Storable::thaw $facedata;
3352		3559
3353	$facedata->{version} == 2	3560	$facedata->{version} == 2
3354	or cf::cleanup "$path: version mismatch, cannot proceed.";	3561	or cf::cleanup "$path: version mismatch, cannot proceed.";
3355		3562
3356	# patch in the exptable
3357	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3358	$facedata->{resource}{"res/exp_table"} = {
3359	type => FT_RSRC,
3360	data => $exp_table,
3361	hash => (Digest::MD5::md5 $exp_table),
3362	};
3363	cf::cede_to_tick;	3563	cf::cede_to_tick;
3364		3564
3365	{	3565	{
3366	my $faces = $facedata->{faceinfo};	3566	my $faces = delete $facedata->{faceinfo};
3367		3567
3368	while (my ($face, $info) = each %$faces) {	3568	for my $face (sort keys %$faces) {
		3569	my $info = $faces->{$face};
3369	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3570	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3370		3571
3371	cf::face::set_visibility $idx, $info->{visibility};	3572	cf::face::set_visibility $idx, $info->{visibility};
3372	cf::face::set_magicmap $idx, $info->{magicmap};	3573	cf::face::set_magicmap $idx, $info->{magicmap};
3373	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3574	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3374	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3575	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3375		3576	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
		3577	$FACEHASH{$info->{hash64}} = $idx;#d#
		3578
3376	cf::cede_to_tick;	3579	cf::cede_to_tick;
3377	}	3580	}
3378		3581
3379	while (my ($face, $info) = each %$faces) {	3582	while (my ($face, $info) = each %$faces) {
3380	next unless $info->{smooth};	3583	next unless $info->{smooth};
…		…
3384		3587
3385	if (my $smooth = cf::face::find $info->{smooth}) {	3588	if (my $smooth = cf::face::find $info->{smooth}) {
3386	cf::face::set_smooth $idx, $smooth;	3589	cf::face::set_smooth $idx, $smooth;
3387	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3590	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3388	} else {	3591	} else {
3389	warn "smooth face '$info->{smooth}' not found for face '$face'";	3592	error "smooth face '$info->{smooth}' not found for face '$face'";
3390	}	3593	}
3391		3594
3392	cf::cede_to_tick;	3595	cf::cede_to_tick;
3393	}	3596	}
3394	}	3597	}
3395		3598
3396	{	3599	{
3397	my $anims = $facedata->{animinfo};	3600	my $anims = delete $facedata->{animinfo};
3398		3601
3399	while (my ($anim, $info) = each %$anims) {	3602	while (my ($anim, $info) = each %$anims) {
3400	cf::anim::set $anim, $info->{frames}, $info->{facings};	3603	cf::anim::set $anim, $info->{frames}, $info->{facings};
3401	cf::cede_to_tick;	3604	cf::cede_to_tick;
3402	}	3605	}
3403		3606
3404	cf::anim::invalidate_all; # d'oh	3607	cf::anim::invalidate_all; # d'oh
3405	}	3608	}
3406		3609
3407	{	3610	{
3408	my $res = $facedata->{resource};	3611	my $res = delete $facedata->{resource};
3409		3612
3410	while (my ($name, $info) = each %$res) {	3613	while (my ($name, $info) = each %$res) {
3411	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
3412	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3616	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3413		3617
		3618	cf::face::set_type $idx, $type;
3414	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};	3619	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3415	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#
3416	} else {	3622	} else {
3417	$RESOURCE{$name} = $info;	3623	# $RESOURCE{$name} = $info; # unused
3418	}	3624	}
3419		3625
3420	cf::cede_to_tick;	3626	cf::cede_to_tick;
3421	}	3627	}
3422	}	3628	}
3423		3629
3424	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3630	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3425		3631
3426	1	3632	1
3427	}	3633	}
3428
3429	cf::global->attach (on_resource_update => sub {
3430	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3431	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3432
3433	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3434	my $sound = $soundconf->{compat}[$_]
3435	or next;
3436
3437	my $face = cf::face::find "sound/$sound->[1]";
3438	cf::sound::set $sound->[0] => $face;
3439	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3440	}
3441
3442	while (my ($k, $v) = each %{$soundconf->{event}}) {
3443	my $face = cf::face::find "sound/$v";
3444	cf::sound::set $k => $face;
3445	}
3446	}
3447	});
3448		3634
3449	register_exticmd fx_want => sub {	3635	register_exticmd fx_want => sub {
3450	my ($ns, $want) = @_;	3636	my ($ns, $want) = @_;
3451		3637
3452	while (my ($k, $v) = each %$want) {	3638	while (my ($k, $v) = each %$want) {
…		…
3460	my $status = load_resource_file_ $_[0];	3646	my $status = load_resource_file_ $_[0];
3461	get_slot 0.1, 100;	3647	get_slot 0.1, 100;
3462	cf::arch::commit_load;	3648	cf::arch::commit_load;
3463		3649
3464	$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;
3465	}	3664	}
3466		3665
3467	sub reload_regions {	3666	sub reload_regions {
3468	# 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
3469	# for this (global event?)	3668	# for this (global event?)
…		…
3484	}	3683	}
3485		3684
3486	sub reload_archetypes {	3685	sub reload_archetypes {
3487	load_resource_file "$DATADIR/archetypes"	3686	load_resource_file "$DATADIR/archetypes"
3488	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	);
3489	}	3697	}
3490		3698
3491	sub reload_treasures {	3699	sub reload_treasures {
3492	load_resource_file "$DATADIR/treasures"	3700	load_resource_file "$DATADIR/treasures"
3493	or die "unable to load treasurelists\n";	3701	or die "unable to load treasurelists\n";
3494	}	3702	}
3495		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
3496	sub reload_resources {	3724	sub reload_resources {
3497	warn "reloading resource files...\n";	3725	trace "reloading resource files...\n";
3498		3726
		3727	reload_materials;
3499	reload_facedata;	3728	reload_facedata;
		3729	reload_exp_table;
		3730	reload_sound;
3500	reload_archetypes;	3731	reload_archetypes;
3501	reload_regions;	3732	reload_regions;
3502	reload_treasures;	3733	reload_treasures;
3503		3734
3504	warn "finished reloading resource files\n";	3735	trace "finished reloading resource files\n";
3505	}	3736	}
3506		3737
3507	sub reload_config {	3738	sub reload_config {
3508	warn "reloading config file...\n";	3739	trace "reloading config file...\n";
3509		3740
3510	open my $fh, "<:utf8", "$CONFDIR/config"	3741	my $config = load_file "$CONFDIR/config";
3511	or return;	3742	utf8::decode $config;
		3743	*CFG = decode_yaml $config;
3512		3744
3513	local $/;
3514	*CFG = YAML::XS::Load scalar <$fh>;
3515
3516	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3745	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3517		3746
3518	$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};
3519	$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};
3520		3749
3521	if (exists $CFG{mlockall}) {	3750	if (exists $CFG{mlockall}) {
…		…
3523	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3752	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3524	and die "WARNING: m(un)lockall failed: $!\n";	3753	and die "WARNING: m(un)lockall failed: $!\n";
3525	};	3754	};
3526	warn $@ if $@;	3755	warn $@ if $@;
3527	}	3756	}
3528
3529	warn "finished reloading resource files\n";
3530	}	3757	}
3531		3758
3532	sub pidfile() {	3759	sub pidfile() {
3533	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3760	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3534	or die "$PIDFILE: $!";	3761	or die "$PIDFILE: $!";
…		…
3547	seek $fh, 0, 0;	3774	seek $fh, 0, 0;
3548	print $fh $$;	3775	print $fh $$;
3549	}	3776	}
3550		3777
3551	sub main_loop {	3778	sub main_loop {
3552	warn "EV::loop starting\n";	3779	trace "EV::loop starting\n";
3553	if (1) {	3780	if (1) {
3554	EV::loop;	3781	EV::loop;
3555	}	3782	}
3556	warn "EV::loop returned\n";	3783	trace "EV::loop returned\n";
3557	goto &main_loop unless $REALLY_UNLOOP;	3784	goto &main_loop unless $REALLY_UNLOOP;
3558	}	3785	}
3559		3786
3560	sub main {	3787	sub main {
3561	cf::init_globals; # initialise logging	3788	cf::init_globals; # initialise logging
3562		3789
3563	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3790	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3564	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.";
3565	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3792	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3566	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3793	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3567		3794
3568	$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
3569		3796
3570	# we must not ever block the main coroutine	3797	# we must not ever block the main coroutine
3571	local $Coro::idle = sub {	3798	$Coro::idle = sub {
3572	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#
3573	(async {	3800	(async {
3574	$Coro::current->{desc} = "IDLE BUG HANDLER";	3801	$Coro::current->{desc} = "IDLE BUG HANDLER";
3575	EV::loop EV::LOOP_ONESHOT;	3802	EV::loop EV::LOOP_ONESHOT;
3576	})->prio (Coro::PRIO_MAX);	3803	})->prio (Coro::PRIO_MAX);
3577	};	3804	};
3578		3805
3579	evthread_start IO::AIO::poll_fileno;	3806	evthread_start IO::AIO::poll_fileno;
3580		3807
3581	cf::sync_job {	3808	cf::sync_job {
3582	cf::init_experience;	3809	cf::incloader::init ();
		3810
		3811	db_init;
		3812
3583	cf::init_anim;	3813	cf::init_anim;
3584	cf::init_attackmess;	3814	cf::init_attackmess;
3585	cf::init_dynamic;	3815	cf::init_dynamic;
3586		3816
3587	cf::load_settings;	3817	cf::load_settings;
3588	cf::load_materials;
3589		3818
3590	reload_resources;	3819	reload_resources;
3591	reload_config;	3820	reload_config;
3592	db_init;
3593		3821
3594	cf::init_uuid;	3822	cf::init_uuid;
3595	cf::init_signals;	3823	cf::init_signals;
3596	cf::init_skills;	3824	cf::init_skills;
3597		3825
…		…
3605		3833
3606	# no (long-running) fork's whatsoever before this point(!)	3834	# no (long-running) fork's whatsoever before this point(!)
3607	use POSIX ();	3835	use POSIX ();
3608	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};
3609		3837
3610	(pop @POST_INIT)->(0) while @POST_INIT;	3838	cf::_post_init 0;
3611	};	3839	};
3612		3840
3613	cf::object::thawer::errors_are_fatal 0;	3841	cf::object::thawer::errors_are_fatal 0;
3614	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";
3615		3843
		3844	AE::postpone {
		3845	undef &main; # free gobs of memory :)
		3846	};
		3847
3616	main_loop;	3848	goto &main_loop;
3617	}	3849	}
3618		3850
3619	#############################################################################	3851	#############################################################################
3620	# initialisation and cleanup	3852	# initialisation and cleanup
3621		3853
…		…
3660	or return;	3892	or return;
3661		3893
3662	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3894	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3663	and return;	3895	and return;
3664		3896
3665	warn sprintf "runtime file written (%gs).\n", AE::time - $t0;	3897	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3666		3898
3667	1	3899	1
3668	}	3900	}
3669		3901
3670	our $uuid_lock;	3902	our $uuid_lock;
…		…
3682	or return;	3914	or return;
3683		3915
3684	my $value = uuid_seq uuid_cur;	3916	my $value = uuid_seq uuid_cur;
3685		3917
3686	unless ($value) {	3918	unless ($value) {
3687	warn "cowardly refusing to write zero uuid value!\n";	3919	info "cowardly refusing to write zero uuid value!\n";
3688	return;	3920	return;
3689	}	3921	}
3690		3922
3691	my $value = uuid_str $value + $uuid_skip;	3923	my $value = uuid_str $value + $uuid_skip;
3692	$uuid_skip = 0;	3924	$uuid_skip = 0;
…		…
3702	or return;	3934	or return;
3703		3935
3704	aio_rename "$uuid~", $uuid	3936	aio_rename "$uuid~", $uuid
3705	and return;	3937	and return;
3706		3938
3707	warn "uuid file written ($value).\n";	3939	trace "uuid file written ($value).\n";
3708		3940
3709	1	3941	1
3710		3942
3711	}	3943	}
3712		3944
…		…
3718	}	3950	}
3719		3951
3720	sub emergency_save() {	3952	sub emergency_save() {
3721	my $freeze_guard = cf::freeze_mainloop;	3953	my $freeze_guard = cf::freeze_mainloop;
3722		3954
3723	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;
3724		3961
3725	cf::sync_job {	3962	cf::sync_job {
3726	# this is a trade-off: we want to be very quick here, so	3963	cf::write_runtime_sync; # external watchdog should not bark
3727	# save all maps without fsync, and later call a global sync
3728	# (which in turn might be very very slow)
3729	local $USE_FSYNC = 0;
3730		3964
3731	# use a peculiar iteration method to avoid tripping on perl	3965	# use a peculiar iteration method to avoid tripping on perl
3732	# refcount bugs in for. also avoids problems with players	3966	# refcount bugs in for. also avoids problems with players
3733	# and maps saved/destroyed asynchronously.	3967	# and maps saved/destroyed asynchronously.
3734	warn "emergency_perl_save: begin player save\n";	3968	info "emergency_perl_save: begin player save\n";
3735	for my $login (keys %cf::PLAYER) {	3969	for my $login (keys %cf::PLAYER) {
3736	my $pl = $cf::PLAYER{$login} or next;	3970	my $pl = $cf::PLAYER{$login} or next;
3737	$pl->valid or next;	3971	$pl->valid or next;
3738	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3972	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3739	$pl->save;	3973	$pl->save;
3740	}	3974	}
3741	warn "emergency_perl_save: end player save\n";	3975	info "emergency_perl_save: end player save\n";
3742		3976
		3977	cf::write_runtime_sync; # external watchdog should not bark
		3978
3743	warn "emergency_perl_save: begin map save\n";	3979	info "emergency_perl_save: begin map save\n";
3744	for my $path (keys %cf::MAP) {	3980	for my $path (keys %cf::MAP) {
3745	my $map = $cf::MAP{$path} or next;	3981	my $map = $cf::MAP{$path} or next;
3746	$map->valid or next;	3982	$map->valid or next;
3747	$map->save;	3983	$map->save;
3748	}	3984	}
3749	warn "emergency_perl_save: end map save\n";	3985	info "emergency_perl_save: end map save\n";
3750		3986
		3987	cf::write_runtime_sync; # external watchdog should not bark
		3988
3751	warn "emergency_perl_save: begin database checkpoint\n";	3989	info "emergency_perl_save: begin database checkpoint\n";
3752	BDB::db_env_txn_checkpoint $DB_ENV;	3990	BDB::db_env_txn_checkpoint $DB_ENV;
3753	warn "emergency_perl_save: end database checkpoint\n";	3991	info "emergency_perl_save: end database checkpoint\n";
3754		3992
3755	warn "emergency_perl_save: begin write uuid\n";	3993	info "emergency_perl_save: begin write uuid\n";
3756	write_uuid_sync 1;	3994	write_uuid_sync 1;
3757	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
3758	};	4015	};
3759		4016
3760	warn "emergency_perl_save: starting sync()\n";
3761	IO::AIO::aio_sync sub {
3762	warn "emergency_perl_save: finished sync()\n";
3763	};
3764
3765	warn "emergency_perl_save: leave\n";	4017	info "emergency_perl_save: leave\n";
3766	}	4018	}
3767		4019
3768	sub post_cleanup {	4020	sub post_cleanup {
3769	my ($make_core) = @_;	4021	my ($make_core) = @_;
3770		4022
		4023	IO::AIO::flush;
		4024
3771	warn Carp::longmess "post_cleanup backtrace"	4025	error Carp::longmess "post_cleanup backtrace"
3772	if $make_core;	4026	if $make_core;
3773		4027
3774	my $fh = pidfile;	4028	my $fh = pidfile;
3775	unlink $PIDFILE if <$fh> == $$;	4029	unlink $PIDFILE if <$fh> == $$;
3776	}	4030	}
…		…
3800	}	4054	}
3801	}	4055	}
3802		4056
3803	sub do_reload_perl() {	4057	sub do_reload_perl() {
3804	# can/must only be called in main	4058	# can/must only be called in main
3805	if (in_main) {	4059	unless (in_main) {
3806	warn "can only reload from main coroutine";	4060	error "can only reload from main coroutine";
3807	return;	4061	return;
3808	}	4062	}
3809		4063
3810	return if $RELOAD++;	4064	return if $RELOAD++;
3811		4065
3812	my $t1 = AE::time;	4066	my $t1 = AE::time;
3813		4067
3814	while ($RELOAD) {	4068	while ($RELOAD) {
3815	warn "reloading...";	4069	cf::get_slot 0.1, -1, "reload_perl";
		4070	info "perl_reload: reloading...";
3816		4071
3817	warn "entering sync_job";	4072	trace "perl_reload: entering sync_job";
3818		4073
3819	cf::sync_job {	4074	cf::sync_job {
3820	cf::write_runtime_sync; # external watchdog should not bark
3821	cf::emergency_save;	4075	#cf::emergency_save;
3822	cf::write_runtime_sync; # external watchdog should not bark
3823		4076
3824	warn "syncing database to disk";
3825	BDB::db_env_txn_checkpoint $DB_ENV;
3826
3827	# if anything goes wrong in here, we should simply crash as we already saved
3828
3829	warn "flushing outstanding aio requests";
3830	while (IO::AIO::nreqs || BDB::nreqs) {
3831	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3832	}
3833
3834	warn "cancelling all extension coros";	4077	trace "perl_reload: cancelling all extension coros";
3835	$_->cancel for values %EXT_CORO;	4078	$_->cancel for values %EXT_CORO;
3836	%EXT_CORO = ();	4079	%EXT_CORO = ();
3837		4080
3838	warn "removing commands";	4081	trace "perl_reload: removing commands";
3839	%COMMAND = ();	4082	%COMMAND = ();
3840		4083
3841	warn "removing ext/exti commands";	4084	trace "perl_reload: removing ext/exti commands";
3842	%EXTCMD = ();	4085	%EXTCMD = ();
3843	%EXTICMD = ();	4086	%EXTICMD = ();
3844		4087
3845	warn "unloading/nuking all extensions";	4088	trace "perl_reload: unloading/nuking all extensions";
3846	for my $pkg (@EXTS) {	4089	for my $pkg (@EXTS) {
3847	warn "... unloading $pkg";	4090	trace "... unloading $pkg";
3848		4091
3849	if (my $cb = $pkg->can ("unload")) {	4092	if (my $cb = $pkg->can ("unload")) {
3850	eval {	4093	eval {
3851	$cb->($pkg);	4094	$cb->($pkg);
3852	1	4095	1
3853	} or warn "$pkg unloaded, but with errors: $@";	4096	} or error "$pkg unloaded, but with errors: $@";
3854	}	4097	}
3855		4098
3856	warn "... clearing $pkg";	4099	trace "... clearing $pkg";
3857	clear_package $pkg;	4100	clear_package $pkg;
3858	}	4101	}
3859		4102
3860	warn "unloading all perl modules loaded from $LIBDIR";	4103	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3861	while (my ($k, $v) = each %INC) {	4104	while (my ($k, $v) = each %INC) {
3862	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4105	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3863		4106
3864	warn "... unloading $k";	4107	trace "... unloading $k";
3865	delete $INC{$k};	4108	delete $INC{$k};
3866		4109
3867	$k =~ s/\.pm$//;	4110	$k =~ s/\.pm$//;
3868	$k =~ s/\//::/g;	4111	$k =~ s/\//::/g;
3869		4112
…		…
3872	}	4115	}
3873		4116
3874	clear_package $k;	4117	clear_package $k;
3875	}	4118	}
3876		4119
3877	warn "getting rid of safe::, as good as possible";	4120	trace "perl_reload: getting rid of safe::, as good as possible";
3878	clear_package "safe::$_"	4121	clear_package "safe::$_"
3879	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);
3880		4123
3881	warn "unloading cf.pm \"a bit\"";	4124	trace "perl_reload: unloading cf.pm \"a bit\"";
3882	delete $INC{"cf.pm"};	4125	delete $INC{"cf.pm"};
3883	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4126	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3884		4127
3885	# don't, removes xs symbols, too,	4128	# don't, removes xs symbols, too,
3886	# and global variables created in xs	4129	# and global variables created in xs
3887	#clear_package __PACKAGE__;	4130	#clear_package __PACKAGE__;
3888		4131
3889	warn "unload completed, starting to reload now";	4132	info "perl_reload: unload completed, starting to reload now";
3890		4133
3891	warn "reloading cf.pm";	4134	trace "perl_reload: reloading cf.pm";
3892	require cf;	4135	require cf;
3893	cf::_connect_to_perl_1;	4136	cf::_connect_to_perl_1;
3894		4137
3895	warn "loading config and database again";	4138	trace "perl_reload: loading config and database again";
3896	cf::reload_config;	4139	cf::reload_config;
3897		4140
3898	warn "loading extensions";	4141	trace "perl_reload: loading extensions";
3899	cf::load_extensions;	4142	cf::load_extensions;
3900		4143
3901	if ($REATTACH_ON_RELOAD) {	4144	if ($REATTACH_ON_RELOAD) {
3902	warn "reattaching attachments to objects/players";	4145	trace "perl_reload: reattaching attachments to objects/players";
3903	_global_reattach; # objects, sockets	4146	_global_reattach; # objects, sockets
3904	warn "reattaching attachments to maps";	4147	trace "perl_reload: reattaching attachments to maps";
3905	reattach $_ for values %MAP;	4148	reattach $_ for values %MAP;
3906	warn "reattaching attachments to players";	4149	trace "perl_reload: reattaching attachments to players";
3907	reattach $_ for values %PLAYER;	4150	reattach $_ for values %PLAYER;
3908	}	4151	}
3909		4152
3910	warn "running post_init jobs";	4153	cf::_post_init 1;
3911	(pop @POST_INIT)->(1) while @POST_INIT;
3912		4154
3913	warn "leaving sync_job";	4155	trace "perl_reload: leaving sync_job";
3914		4156
3915	1	4157	1
3916	} or do {	4158	} or do {
3917	warn $@;	4159	error $@;
3918	cf::cleanup "error while reloading, exiting.";	4160	cf::cleanup "perl_reload: error, exiting.";
3919	};	4161	};
3920		4162
3921	warn "reloaded";
3922	--$RELOAD;	4163	--$RELOAD;
3923	}	4164	}
3924		4165
3925	$t1 = AE::time - $t1;	4166	$t1 = AE::time - $t1;
3926	warn "reload completed in ${t1}s\n";	4167	info "perl_reload: completed in ${t1}s\n";
3927	};	4168	};
3928		4169
3929	our $RELOAD_WATCHER; # used only during reload	4170	our $RELOAD_WATCHER; # used only during reload
3930		4171
3931	sub reload_perl() {	4172	sub reload_perl() {
…		…
3952	reload_perl;	4193	reload_perl;
3953	};	4194	};
3954	}	4195	}
3955	};	4196	};
3956		4197
3957	unshift @INC, $LIBDIR;	4198	#############################################################################
3958		4199
3959	my $bug_warning = 0;	4200	my $bug_warning = 0;
3960		4201
3961	our @WAIT_FOR_TICK;
3962	our @WAIT_FOR_TICK_BEGIN;
3963
3964	sub wait_for_tick {	4202	sub wait_for_tick() {
3965	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4203	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3966		4204
3967	my $signal = new Coro::Signal;	4205	$WAIT_FOR_TICK->wait;
3968	push @WAIT_FOR_TICK, $signal;
3969	$signal->wait;
3970	}	4206	}
3971		4207
3972	sub wait_for_tick_begin {	4208	sub wait_for_tick_begin() {
3973	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4209	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3974		4210
3975	my $signal = new Coro::Signal;	4211	my $signal = new Coro::Signal;
3976	push @WAIT_FOR_TICK_BEGIN, $signal;	4212	push @WAIT_FOR_TICK_BEGIN, $signal;
3977	$signal->wait;	4213	$signal->wait;
3978	}	4214	}
…		…
3982	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"
3983	unless ++$bug_warning > 10;	4219	unless ++$bug_warning > 10;
3984	return;	4220	return;
3985	}	4221	}
3986		4222
3987	cf::server_tick; # one server iteration	4223	cf::one_tick; # one server iteration
3988		4224
3989	#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#
3990		4226
3991	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4227	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3992	$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.;
3993	Coro::async_pool {	4229	Coro::async_pool {
3994	$Coro::current->{desc} = "runtime saver";	4230	$Coro::current->{desc} = "runtime saver";
3995	write_runtime_sync	4231	write_runtime_sync
3996	or warn "ERROR: unable to write runtime file: $!";	4232	or error "ERROR: unable to write runtime file: $!";
3997	};	4233	};
3998	}	4234	}
3999		4235
4000	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4236	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4001	$sig->send;	4237	$sig->send;
4002	}	4238	}
4003	while (my $sig = shift @WAIT_FOR_TICK) {	4239	$WAIT_FOR_TICK->broadcast;
4004	$sig->send;
4005	}
4006		4240
4007	$LOAD = ($NOW - $TICK_START) / $TICK;	4241	$LOAD = ($NOW - $TICK_START) / $TICK;
4008	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4242	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4009		4243
4010	if (0) {	4244	if (0) {
4011	if ($NEXT_TICK) {	4245	if ($NEXT_TICK) {
4012	my $jitter = $TICK_START - $NEXT_TICK;	4246	my $jitter = $TICK_START - $NEXT_TICK;
4013	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4247	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
4014	warn "jitter $JITTER\n";#d#	4248	debug "jitter $JITTER\n";#d#
4015	}	4249	}
4016	}	4250	}
4017	}	4251	}
4018		4252
4019	{	4253	{
4020	# configure BDB	4254	# configure BDB
		4255	info "initialising database";
4021		4256
4022	BDB::min_parallel 16;	4257	BDB::min_parallel 16;
4023	BDB::max_poll_reqs $TICK * 0.1;	4258	BDB::max_poll_reqs $TICK * 0.1;
4024	$AnyEvent::BDB::WATCHER->priority (1);	4259	#$AnyEvent::BDB::WATCHER->priority (1);
4025		4260
4026	unless ($DB_ENV) {	4261	unless ($DB_ENV) {
4027	$DB_ENV = BDB::db_env_create;	4262	$DB_ENV = BDB::db_env_create;
4028	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4263	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4029	$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;
…		…
4054	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4289	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4055	};	4290	};
4056	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4291	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4057	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4292	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4058	};	4293	};
		4294
		4295	info "database initialised";
4059	}	4296	}
4060		4297
4061	{	4298	{
4062	# configure IO::AIO	4299	# configure IO::AIO
4063		4300
		4301	info "initialising aio";
4064	IO::AIO::min_parallel 8;	4302	IO::AIO::min_parallel 8;
4065	IO::AIO::max_poll_time $TICK * 0.1;	4303	IO::AIO::max_poll_time $TICK * 0.1;
4066	undef $AnyEvent::AIO::WATCHER;	4304	undef $AnyEvent::AIO::WATCHER;
		4305	info "aio initialised";
4067	}	4306	}
4068		4307
4069	my $_log_backtrace;	4308	our $_log_backtrace;
		4309	our $_log_backtrace_last;
4070		4310
4071	sub _log_backtrace {	4311	sub _log_backtrace {
4072	my ($msg, @addr) = @_;	4312	my ($msg, @addr) = @_;
4073		4313
4074	$msg =~ s/\n//;	4314	$msg =~ s/\n$//;
4075		4315
		4316	if ($_log_backtrace_last eq $msg) {
		4317	LOG llevInfo, "[ABT] $msg\n";
		4318	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4076	# limit the # of concurrent backtraces	4319	# limit the # of concurrent backtraces
4077	if ($_log_backtrace < 2) {	4320	} elsif ($_log_backtrace < 2) {
		4321	$_log_backtrace_last = $msg;
4078	++$_log_backtrace;	4322	++$_log_backtrace;
4079	my $perl_bt = Carp::longmess $msg;	4323	my $perl_bt = Carp::longmess $msg;
4080	async {	4324	async {
4081	$Coro::current->{desc} = "abt $msg";	4325	$Coro::current->{desc} = "abt $msg";
4082		4326
…		…
4102	LOG llevInfo, "[ABT] $_\n" for @bt;	4346	LOG llevInfo, "[ABT] $_\n" for @bt;
4103	--$_log_backtrace;	4347	--$_log_backtrace;
4104	};	4348	};
4105	} else {	4349	} else {
4106	LOG llevInfo, "[ABT] $msg\n";	4350	LOG llevInfo, "[ABT] $msg\n";
4107	LOG llevInfo, "[ABT] [suppressed]\n";	4351	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4108	}	4352	}
4109	}	4353	}
4110		4354
4111	# load additional modules	4355	# load additional modules
4112	require "cf/$_.pm" for @EXTRA_MODULES;	4356	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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