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.528 by root, Fri Apr 23 04:42:12 2010 UTC vs.
Revision 1.606 by root, Sun Nov 18 08:34:23 2012 UTC

1	#	1	#
2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	#	3	#
4	# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	#	5	#
6	# Deliantra is free software: you can redistribute it and/or modify it under	6	# Deliantra is free software: you can redistribute it and/or modify it under
7	# the terms of the Affero GNU General Public License as published by the	7	# the terms of the Affero GNU General Public License as published by the
8	# Free Software Foundation, either version 3 of the License, or (at your	8	# Free Software Foundation, either version 3 of the License, or (at your
9	# option) any later version.	9	# option) any later version.
10	#	10	#
11	# This program is distributed in the hope that it will be useful,	11	# This program is distributed in the hope that it will be useful,
12	# but WITHOUT ANY WARRANTY; without even the implied warranty of	12	# but WITHOUT ANY WARRANTY; without even the implied warranty of
13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14	# GNU General Public License for more details.	14	# GNU General Public License for more details.
15	#	15	#
16	# You should have received a copy of the Affero GNU General Public License	16	# You should have received a copy of the Affero GNU General Public License
17	# and the GNU General Public License along with this program. If not, see	17	# and the GNU General Public License along with this program. If not, see
18	# <http://www.gnu.org/licenses/>.	18	# <http://www.gnu.org/licenses/>.
19	#	19	#
20	# The authors can be reached via e-mail to <support@deliantra.net>	20	# The authors can be reached via e-mail to <support@deliantra.net>
21	#	21	#
22		22
23	package cf;	23	package cf;
24		24
25	use 5.10.0;	25	use common::sense;
26	use utf8;
27	use strict qw(vars subs);
28		26
29	use Symbol;	27	use Symbol;
30	use List::Util;	28	use List::Util;
31	use Socket;	29	use Socket;
32	use EV;	30	use EV;
…		…
34	use Safe;	32	use Safe;
35	use Safe::Hole;	33	use Safe::Hole;
36	use Storable ();	34	use Storable ();
37	use Carp ();	35	use Carp ();
38		36
39	use Guard ();	37	use AnyEvent ();
		38	use AnyEvent::IO ();
		39	use AnyEvent::DNS ();
		40
40	use Coro ();	41	use Coro ();
41	use Coro::State;	42	use Coro::State;
42	use Coro::Handle;	43	use Coro::Handle;
43	use Coro::EV;	44	use Coro::EV;
44	use Coro::AnyEvent;	45	use Coro::AnyEvent;
…		…
50	use Coro::AIO;	51	use Coro::AIO;
51	use Coro::BDB 1.6;	52	use Coro::BDB 1.6;
52	use Coro::Storable;	53	use Coro::Storable;
53	use Coro::Util ();	54	use Coro::Util ();
54		55
		56	use Guard ();
55	use JSON::XS 2.01 ();	57	use JSON::XS 2.01 ();
56	use BDB ();	58	use BDB ();
57	use Data::Dumper;	59	use Data::Dumper;
58	use Fcntl;	60	use Fcntl;
59	use YAML::XS ();	61	use YAML::XS ();
60	use IO::AIO ();	62	use IO::AIO ();
61	use Time::HiRes;
62	use Compress::LZF;	63	use Compress::LZF;
63	use Digest::MD5 ();	64	use Digest::MD5 ();
64		65
65	AnyEvent::detect;	66	AnyEvent::detect;
66		67
…		…
78	# strictly for debugging	79	# strictly for debugging
79	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };	80	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80		81
81	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	82	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82		83
		84	our @ORIG_INC;
		85
83	our %COMMAND = ();	86	our %COMMAND = ();
84	our %COMMAND_TIME = ();	87	our %COMMAND_TIME = ();
85		88
86	our @EXTS = (); # list of extension package names	89	our @EXTS = (); # list of extension package names
87	our %EXTCMD = ();	90	our %EXTCMD = ();
		91	our %EXTACMD = ();
88	our %EXTICMD = ();	92	our %EXTICMD = ();
		93	our %EXTIACMD = ();
89	our %EXT_CORO = (); # coroutines bound to extensions	94	our %EXT_CORO = (); # coroutines bound to extensions
90	our %EXT_MAP = (); # pluggable maps	95	our %EXT_MAP = (); # pluggable maps
91		96
92	our $RELOAD; # number of reloads so far, non-zero while in reload	97	our $RELOAD; # number of reloads so far, non-zero while in reload
93	our @EVENT;	98	our @EVENT;
94	our @REFLECT; # set by XS	99	our @REFLECT; # set by XS
95	our %REFLECT; # set by us	100	our %REFLECT; # set by us
96		101
97	our $CONFDIR = confdir;	102	our $CONFDIR = confdir;
		103
98	our $DATADIR = datadir;	104	our $DATADIR = datadir;
99	our $LIBDIR = "$DATADIR/ext";	105	our $LIBDIR = "$DATADIR/ext";
100	our $PODDIR = "$DATADIR/pod";	106	our $PODDIR = "$DATADIR/pod";
101	our $MAPDIR = "$DATADIR/" . mapdir;	107	our $MAPDIR = "$DATADIR/" . mapdir;
		108
102	our $LOCALDIR = localdir;	109	our $LOCALDIR = localdir;
103	our $TMPDIR = "$LOCALDIR/" . tmpdir;	110	our $TMPDIR = "$LOCALDIR/" . tmpdir;
104	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	111	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	112	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106	our $RANDOMDIR = "$LOCALDIR/random";	113	our $RANDOMDIR = "$LOCALDIR/random";
107	our $BDBDIR = "$LOCALDIR/db";	114	our $BDBDIR = "$LOCALDIR/db";
108	our $PIDFILE = "$LOCALDIR/pid";	115	our $PIDFILE = "$LOCALDIR/pid";
109	our $RUNTIMEFILE = "$LOCALDIR/runtime";	116	our $RUNTIMEFILE = "$LOCALDIR/runtime";
110		117
111	our %RESOURCE;	118	#our %RESOURCE; # unused
112		119
113	our $OUTPUT_RATE_MIN = 3000;	120	our $OUTPUT_RATE_MIN = 3000;
114	our $OUTPUT_RATE_MAX = 1000000;	121	our $OUTPUT_RATE_MAX = 1000000;
115		122
116	our $MAX_LINKS = 32; # how many chained exits to follow	123	our $MAX_LINKS = 32; # how many chained exits to follow
…		…
124	our $BDB_DEADLOCK_WATCHER;	131	our $BDB_DEADLOCK_WATCHER;
125	our $BDB_CHECKPOINT_WATCHER;	132	our $BDB_CHECKPOINT_WATCHER;
126	our $BDB_TRICKLE_WATCHER;	133	our $BDB_TRICKLE_WATCHER;
127	our $DB_ENV;	134	our $DB_ENV;
128		135
129	our @EXTRA_MODULES = qw(pod match mapscript);	136	our @EXTRA_MODULES = qw(pod match mapscript incloader);
130		137
131	our %CFG;	138	our %CFG;
		139	our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
132		140
133	our $UPTIME; $UPTIME ||= time;	141	our $UPTIME; $UPTIME ||= time;
134	our $RUNTIME;	142	our $RUNTIME = 0;
		143	our $SERVER_TICK = 0;
135	our $NOW;	144	our $NOW;
136		145
137	our (%PLAYER, %PLAYER_LOADING); # all users	146	our (%PLAYER, %PLAYER_LOADING); # all users
138	our (%MAP, %MAP_LOADING ); # all maps	147	our (%MAP, %MAP_LOADING ); # all maps
139	our $LINK_MAP; # the special {link} map, which is always available	148	our $LINK_MAP; # the special {link} map, which is always available
…		…
148		157
149	our @POST_INIT;	158	our @POST_INIT;
150		159
151	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)	160	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152	our $REALLY_UNLOOP; # never set to true, please :)	161	our $REALLY_UNLOOP; # never set to true, please :)
		162
		163	our $WAIT_FOR_TICK = new Coro::Signal;
		164	our @WAIT_FOR_TICK_BEGIN;
153		165
154	binmode STDOUT;	166	binmode STDOUT;
155	binmode STDERR;	167	binmode STDERR;
156		168
157	# read virtual server time, if available	169	# read virtual server time, if available
…		…
191		203
192	=over 4	204	=over 4
193		205
194	=item $cf::UPTIME	206	=item $cf::UPTIME
195		207
196	The timestamp of the server start (so not actually an uptime).	208	The timestamp of the server start (so not actually an "uptime").
		209
		210	=item $cf::SERVER_TICK
		211
		212	An unsigned integer that starts at zero when the server is started and is
		213	incremented on every tick.
		214
		215	=item $cf::NOW
		216
		217	The (real) time of the last (current) server tick - updated before and
		218	after tick processing, so this is useful only as a rough "what time is it
		219	now" estimate.
		220
		221	=item $cf::TICK
		222
		223	The interval between each server tick, in seconds.
197		224
198	=item $cf::RUNTIME	225	=item $cf::RUNTIME
199		226
200	The time this server has run, starts at 0 and is increased by $cf::TICK on	227	The time this server has run, starts at 0 and is increased by $cf::TICK on
201	every server tick.	228	every server tick.
202		229
203	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR	230	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
204	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR	231	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
205	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR	232	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
206		233
207	Various directories - "/etc", read-only install directory, perl-library	234	Various directories - "/etc", read-only install directory, perl-library
208	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	235	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
209	unique-items directory, player file directory, random maps directory and	236	unique-items directory, player file directory, random maps directory and
210	database environment.	237	database environment.
211		238
212	=item $cf::NOW
213
214	The time of the last (current) server tick.
215
216	=item $cf::TICK
217
218	The interval between server ticks, in seconds.
219
220	=item $cf::LOADAVG	239	=item $cf::LOADAVG
221		240
222	The current CPU load on the server (alpha-smoothed), as a value between 0	241	The current CPU load on the server (alpha-smoothed), as a value between 0
223	(none) and 1 (overloaded), indicating how much time is spent on processing	242	(none) and 1 (overloaded), indicating how much time is spent on processing
224	objects per tick. Healthy values are < 0.5.	243	objects per tick. Healthy values are < 0.5.
…		…
232	Configuration for the server, loaded from C</etc/deliantra-server/config>, or	251	Configuration for the server, loaded from C</etc/deliantra-server/config>, or
233	from wherever your confdir points to.	252	from wherever your confdir points to.
234		253
235	=item cf::wait_for_tick, cf::wait_for_tick_begin	254	=item cf::wait_for_tick, cf::wait_for_tick_begin
236		255
237	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	256	These are functions that inhibit the current coroutine one tick.
238	returns directly I<after> the tick processing (and consequently, can only wake one process	257	cf::wait_for_tick_begin only returns directly I<after> the tick
		258	processing (and consequently, can only wake one thread per tick), while
239	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	259	cf::wait_for_tick wakes up all waiters after tick processing.
		260
		261	Note that cf::wait_for_tick will immediately return when the server is not
		262	ticking, making it suitable for small pauses in threads that need to run
		263	when the server is paused. If that is not applicable (i.e. you I<really>
		264	want to wait, use C<$cf::WAIT_FOR_TICK>).
		265
		266	=item $cf::WAIT_FOR_TICK
		267
		268	Note that C<cf::wait_for_tick> is probably the correct thing to use. This
		269	variable contains a L<Coro::Signal> that is broadcats after every server
		270	tick. Calling C<< ->wait >> on it will suspend the caller until after the
		271	next server tick.
		272
		273	=cut
		274
		275	sub wait_for_tick();
		276	sub wait_for_tick_begin();
240		277
241	=item @cf::INVOKE_RESULTS	278	=item @cf::INVOKE_RESULTS
242		279
243	This array contains the results of the last C<invoke ()> call. When	280	This array contains the results of the last C<invoke ()> call. When
244	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of	281	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
…		…
252		289
253	=back	290	=back
254		291
255	=cut	292	=cut
256		293
		294	sub error(@) { LOG llevError, join "", @_ }
		295	sub warn (@) { LOG llevWarn , join "", @_ }
		296	sub info (@) { LOG llevInfo , join "", @_ }
		297	sub debug(@) { LOG llevDebug, join "", @_ }
		298	sub trace(@) { LOG llevTrace, join "", @_ }
		299
257	$Coro::State::WARNHOOK = sub {	300	$Coro::State::WARNHOOK = sub {
258	my $msg = join "", @_;	301	my $msg = join "", @_;
259		302
260	$msg .= "\n"	303	$msg .= "\n"
261	unless $msg =~ /\n$/;	304	unless $msg =~ /\n$/;
262		305
263	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	306	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
264		307
265	LOG llevError, $msg;	308	LOG llevWarn, $msg;
266	};	309	};
267		310
268	$Coro::State::DIEHOOK = sub {	311	$Coro::State::DIEHOOK = sub {
269	return unless $^S eq 0; # "eq", not "=="	312	return unless $^S eq 0; # "eq", not "=="
270		313
271	warn Carp::longmess $_[0];	314	error Carp::longmess $_[0];
272		315
273	if (in_main) {#d#	316	if (in_main) {#d#
274	warn "DIEHOOK called in main context, Coro bug?\n";#d#	317	error "DIEHOOK called in main context, Coro bug?\n";#d#
275	return;#d#	318	return;#d#
276	}#d#	319	}#d#
277		320
278	# kill coroutine otherwise	321	# kill coroutine otherwise
279	Coro::terminate	322	Coro::terminate
…		…
299	)) {	342	)) {
300	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	343	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
301	}	344	}
302		345
303	$EV::DIED = sub {	346	$EV::DIED = sub {
304	Carp::cluck "error in event callback: @_";	347	warn "error in event callback: $@";
305	};	348	};
		349
		350	#############################################################################
		351
		352	sub fork_call(&@);
		353	sub get_slot($;$$);
306		354
307	#############################################################################	355	#############################################################################
308		356
309	=head2 UTILITY FUNCTIONS	357	=head2 UTILITY FUNCTIONS
310		358
…		…
331	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	379	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
332	$d	380	$d
333	} || "[unable to dump $_[0]: '$@']";	381	} || "[unable to dump $_[0]: '$@']";
334	}	382	}
335		383
		384	=item $scalar = cf::load_file $path
		385
		386	Loads the given file from path and returns its contents. Croaks on error
		387	and can block.
		388
		389	=cut
		390
		391	sub load_file($) {
		392	0 <= aio_load $_[0], my $data
		393	or Carp::croak "$_[0]: $!";
		394
		395	$data
		396	}
		397
		398	=item $success = cf::replace_file $path, $data, $sync
		399
		400	Atomically replaces the file at the given $path with new $data, and
		401	optionally $sync the data to disk before replacing the file.
		402
		403	=cut
		404
		405	sub replace_file($$;$) {
		406	my ($path, $data, $sync) = @_;
		407
		408	my $lock = cf::lock_acquire ("replace_file:$path");
		409
		410	my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
		411	or return;
		412
		413	$data = $data->() if ref $data;
		414
		415	length $data == aio_write $fh, 0, (length $data), $data, 0
		416	or return;
		417
		418	!$sync
		419	or !aio_fsync $fh
		420	or return;
		421
		422	aio_close $fh
		423	and return;
		424
		425	aio_rename "$path~", $path
		426	and return;
		427
		428	if ($sync) {
		429	$path =~ s%/[^/]*$%%;
		430	aio_pathsync $path;
		431	}
		432
		433	1
		434	}
		435
336	=item $ref = cf::decode_json $json	436	=item $ref = cf::decode_json $json
337		437
338	Converts a JSON string into the corresponding perl data structure.	438	Converts a JSON string into the corresponding perl data structure.
339		439
340	=item $json = cf::encode_json $ref	440	=item $json = cf::encode_json $ref
…		…
346	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	446	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
347		447
348	sub encode_json($) { $json_coder->encode ($_[0]) }	448	sub encode_json($) { $json_coder->encode ($_[0]) }
349	sub decode_json($) { $json_coder->decode ($_[0]) }	449	sub decode_json($) { $json_coder->decode ($_[0]) }
350		450
		451	=item $ref = cf::decode_storable $scalar
		452
		453	Same as Coro::Storable::thaw, so blocks.
		454
		455	=cut
		456
		457	BEGIN { *decode_storable = \&Coro::Storable::thaw }
		458
		459	=item $ref = cf::decode_yaml $scalar
		460
		461	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
		462
		463	=cut
		464
		465	sub decode_yaml($) {
		466	fork_call { YAML::XS::Load $_[0] } @_
		467	}
		468
		469	=item $scalar = cf::unlzf $scalar
		470
		471	Same as Compress::LZF::compress, but takes server ticks into account, so
		472	blocks.
		473
		474	=cut
		475
		476	sub unlzf($) {
		477	# we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
		478	cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
		479	Compress::LZF::decompress $_[0]
		480	}
		481
351	=item cf::post_init { BLOCK }	482	=item cf::post_init { BLOCK }
352		483
353	Execute the given codeblock, I<after> all extensions have been (re-)loaded,	484	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
354	but I<before> the server starts ticking again.	485	but I<before> the server starts ticking again.
355		486
356	The cdoeblock will have a single boolean argument to indicate whether this	487	The codeblock will have a single boolean argument to indicate whether this
357	is a reload or not.	488	is a reload or not.
358		489
359	=cut	490	=cut
360		491
361	sub post_init(&) {	492	sub post_init(&) {
362	push @POST_INIT, shift;	493	push @POST_INIT, shift;
		494	}
		495
		496	sub _post_init {
		497	trace "running post_init jobs";
		498
		499	# run them in parallel...
		500
		501	my @join;
		502
		503	while () {
		504	push @join, map &Coro::async ($_, 0), @POST_INIT;
		505	@POST_INIT = ();
		506
		507	@join or last;
		508
		509	(pop @join)->join;
		510	}
363	}	511	}
364		512
365	=item cf::lock_wait $string	513	=item cf::lock_wait $string
366		514
367	Wait until the given lock is available. See cf::lock_acquire.	515	Wait until the given lock is available. See cf::lock_acquire.
…		…
420	EV::periodic $start, $interval, 0, $cb	568	EV::periodic $start, $interval, 0, $cb
421	}	569	}
422		570
423	=item cf::get_slot $time[, $priority[, $name]]	571	=item cf::get_slot $time[, $priority[, $name]]
424		572
425	Allocate $time seconds of blocking CPU time at priority C<$priority>:	573	Allocate $time seconds of blocking CPU time at priority C<$priority>
426	This call blocks and returns only when you have at least C<$time> seconds	574	(default: 0): This call blocks and returns only when you have at least
427	of cpu time till the next tick. The slot is only valid till the next cede.	575	C<$time> seconds of cpu time till the next tick. The slot is only valid
		576	till the next cede.
		577
		578	Background jobs should use a priority less than zero, interactive jobs
		579	should use 100 or more.
428		580
429	The optional C<$name> can be used to identify the job to run. It might be	581	The optional C<$name> can be used to identify the job to run. It might be
430	used for statistical purposes and should identify the same time-class.	582	used for statistical purposes and should identify the same time-class.
431		583
432	Useful for short background jobs.	584	Useful for short background jobs.
…		…
461	}	613	}
462	}	614	}
463		615
464	if (@SLOT_QUEUE) {	616	if (@SLOT_QUEUE) {
465	# we do not use wait_for_tick() as it returns immediately when tick is inactive	617	# we do not use wait_for_tick() as it returns immediately when tick is inactive
466	push @cf::WAIT_FOR_TICK, $signal;	618	$WAIT_FOR_TICK->wait;
467	$signal->wait;
468	} else {	619	} else {
469	$busy = 0;	620	$busy = 0;
470	Coro::schedule;	621	Coro::schedule;
471	}	622	}
472	}	623	}
…		…
512	=cut	663	=cut
513		664
514	sub sync_job(&) {	665	sub sync_job(&) {
515	my ($job) = @_;	666	my ($job) = @_;
516		667
517	if ($Coro::current == $Coro::main) {	668	if (in_main) {
518	my $time = AE::time;	669	my $time = AE::time;
519		670
520	# this is the main coro, too bad, we have to block	671	# this is the main coro, too bad, we have to block
521	# till the operation succeeds, freezing the server :/	672	# till the operation succeeds, freezing the server :/
522		673
523	LOG llevError, Carp::longmess "sync job";#d#	674	#LOG llevError, Carp::longmess "sync job";#d#
524		675
525	my $freeze_guard = freeze_mainloop;	676	my $freeze_guard = freeze_mainloop;
526		677
527	my $busy = 1;	678	my $busy = 1;
528	my @res;	679	my @res;
529		680
530	(async {	681	(async {
531	$Coro::current->desc ("sync job coro");	682	$Coro::current->desc ("sync job coro");
532	@res = eval { $job->() };	683	@res = eval { $job->() };
533	warn $@ if $@;	684	error $@ if $@;
534	undef $busy;	685	undef $busy;
535	})->prio (Coro::PRIO_MAX);	686	})->prio (Coro::PRIO_MAX);
536		687
537	while ($busy) {	688	while ($busy) {
538	if (Coro::nready) {	689	if (Coro::nready) {
…		…
572	$EXT_CORO{$coro+0} = $coro;	723	$EXT_CORO{$coro+0} = $coro;
573		724
574	$coro	725	$coro
575	}	726	}
576		727
577	=item fork_call { }, $args	728	=item fork_call { }, @args
578		729
579	Executes the given code block with the given arguments in a seperate	730	Executes the given code block with the given arguments in a seperate
580	process, returning the results. Everything must be serialisable with	731	process, returning the results. Everything must be serialisable with
581	Coro::Storable. May, of course, block. Note that the executed sub may	732	Coro::Storable. May, of course, block. Note that the executed sub may
582	never block itself or use any form of event handling.	733	never block itself or use any form of event handling.
583		734
584	=cut	735	=cut
585		736
		737	sub post_fork {
		738	reset_signals;
		739	}
		740
586	sub fork_call(&@) {	741	sub fork_call(&@) {
587	my ($cb, @args) = @_;	742	my ($cb, @args) = @_;
588		743
589	# we seemingly have to make a local copy of the whole thing,
590	# otherwise perl prematurely frees the stuff :/
591	# TODO: investigate and fix (likely this will be rather laborious)
592
593	my @res = Coro::Util::fork_eval {	744	my @res = Coro::Util::fork_eval {
594	reset_signals;	745	cf::post_fork;
595	&$cb	746	&$cb
596	}, @args;	747	} @args;
597		748
598	wantarray ? @res : $res[-1]	749	wantarray ? @res : $res[-1]
599	}	750	}
600		751
601	sub objinfo {	752	sub objinfo {
…		…
651	within each server.	802	within each server.
652		803
653	=cut	804	=cut
654		805
655	sub db_table($) {	806	sub db_table($) {
		807	cf::error "db_get called from main context"
		808	if $Coro::current == $Coro::main;
		809
656	my ($name) = @_;	810	my ($name) = @_;
657	my $db = BDB::db_create $DB_ENV;	811	my $db = BDB::db_create $DB_ENV;
658		812
659	eval {	813	eval {
660	$db->set_flags (BDB::CHKSUM);	814	$db->set_flags (BDB::CHKSUM);
…		…
670	}	824	}
671		825
672	our $DB;	826	our $DB;
673		827
674	sub db_init {	828	sub db_init {
675	cf::sync_job {
676	$DB ||= db_table "db";	829	$DB ||= db_table "db";
677	};
678	}	830	}
679		831
680	sub db_get($$) {	832	sub db_get($$) {
681	my $key = "$_[0]/$_[1]";	833	my $key = "$_[0]/$_[1]";
682		834
683	cf::sync_job {	835	cf::error "db_get called from main context"
		836	if $Coro::current == $Coro::main;
		837
684	BDB::db_get $DB, undef, $key, my $data;	838	BDB::db_get $DB, undef, $key, my $data;
685		839
686	$! ? ()	840	$! ? ()
687	: $data	841	: $data
688	}
689	}	842	}
690		843
691	sub db_put($$$) {	844	sub db_put($$$) {
692	BDB::dbreq_pri 4;	845	BDB::dbreq_pri 4;
693	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	846	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
721		874
722	my @data;	875	my @data;
723	my $md5;	876	my $md5;
724		877
725	for (0 .. $#$src) {	878	for (0 .. $#$src) {
726	0 <= aio_load $src->[$_], $data[$_]	879	$data[$_] = load_file $src->[$_];
727	or Carp::croak "$src->[$_]: $!";
728	}	880	}
729		881
730	# if processing is expensive, check	882	# if processing is expensive, check
731	# checksum first	883	# checksum first
732	if (1) {	884	if (1) {
…		…
745		897
746	return db_get cache => "$id/data";	898	return db_get cache => "$id/data";
747	}	899	}
748	}	900	}
749		901
750	my $t1 = Time::HiRes::time;	902	my $t1 = EV::time;
751	my $data = $process->(\@data);	903	my $data = $process->(\@data);
752	my $t2 = Time::HiRes::time;	904	my $t2 = EV::time;
753		905
754	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	906	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
755		907
756	db_put cache => "$id/data", $data;	908	db_put cache => "$id/data", $data;
757	db_put cache => "$id/md5" , $md5;	909	db_put cache => "$id/md5" , $md5;
758	db_put cache => "$id/meta", $meta;	910	db_put cache => "$id/meta", $meta;
759		911
…		…
769		921
770	=cut	922	=cut
771		923
772	sub datalog($@) {	924	sub datalog($@) {
773	my ($type, %kv) = @_;	925	my ($type, %kv) = @_;
774	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	926	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
775	}	927	}
776		928
777	=back	929	=back
778		930
779	=cut	931	=cut
…		…
974		1126
975	} elsif (exists $cb_id{$type}) {	1127	} elsif (exists $cb_id{$type}) {
976	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	1128	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
977		1129
978	} elsif (ref $type) {	1130	} elsif (ref $type) {
979	warn "attaching objects not supported, ignoring.\n";	1131	error "attaching objects not supported, ignoring.\n";
980		1132
981	} else {	1133	} else {
982	shift @arg;	1134	shift @arg;
983	warn "attach argument '$type' not supported, ignoring.\n";	1135	error "attach argument '$type' not supported, ignoring.\n";
984	}	1136	}
985	}	1137	}
986	}	1138	}
987		1139
988	sub _object_attach {	1140	sub _object_attach {
…		…
998	_attach $registry, $klass, @attach;	1150	_attach $registry, $klass, @attach;
999	}	1151	}
1000		1152
1001	$obj->{$name} = \%arg;	1153	$obj->{$name} = \%arg;
1002	} else {	1154	} else {
1003	warn "object uses attachment '$name' which is not available, postponing.\n";	1155	info "object uses attachment '$name' which is not available, postponing.\n";
1004	}	1156	}
1005		1157
1006	$obj->{_attachment}{$name} = undef;	1158	$obj->{_attachment}{$name} = undef;
1007	}	1159	}
1008		1160
…		…
1067		1219
1068	for (@$callbacks) {	1220	for (@$callbacks) {
1069	eval { &{$_->[1]} };	1221	eval { &{$_->[1]} };
1070		1222
1071	if ($@) {	1223	if ($@) {
1072	warn "$@";
1073	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1224	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1074	override;	1225	override;
1075	}	1226	}
1076		1227
1077	return 1 if $override;	1228	return 1 if $override;
1078	}	1229	}
…		…
1157	for (@$attach) {	1308	for (@$attach) {
1158	my ($klass, @attach) = @$_;	1309	my ($klass, @attach) = @$_;
1159	_attach $registry, $klass, @attach;	1310	_attach $registry, $klass, @attach;
1160	}	1311	}
1161	} else {	1312	} else {
1162	warn "object uses attachment '$name' that is not available, postponing.\n";	1313	info "object uses attachment '$name' that is not available, postponing.\n";
1163	}	1314	}
1164	}	1315	}
1165	}	1316	}
1166		1317
1167	cf::attachable->attach (	1318	cf::attachable->attach (
…		…
1194	my ($filename, $rdata, $objs) = @_;	1345	my ($filename, $rdata, $objs) = @_;
1195		1346
1196	sync_job {	1347	sync_job {
1197	if (length $$rdata) {	1348	if (length $$rdata) {
1198	utf8::decode (my $decname = $filename);	1349	utf8::decode (my $decname = $filename);
1199	warn sprintf "saving %s (%d,%d)\n",	1350	trace sprintf "saving %s (%d,%d)\n",
1200	$decname, length $$rdata, scalar @$objs	1351	$decname, length $$rdata, scalar @$objs
1201	if $VERBOSE_IO;	1352	if $VERBOSE_IO;
1202		1353
1203	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1354	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1204	aio_chmod $fh, SAVE_MODE;	1355	aio_chmod $fh, SAVE_MODE;
1205	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1356	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
…		…
1228	aio_rename "$filename~", $filename;	1379	aio_rename "$filename~", $filename;
1229		1380
1230	$filename =~ s%/[^/]+$%%;	1381	$filename =~ s%/[^/]+$%%;
1231	aio_pathsync $filename if $cf::USE_FSYNC;	1382	aio_pathsync $filename if $cf::USE_FSYNC;
1232	} else {	1383	} else {
1233	warn "unable to save objects: $filename~: $!\n";	1384	error "unable to save objects: $filename~: $!\n";
1234	}	1385	}
1235	} else {	1386	} else {
1236	aio_unlink $filename;	1387	aio_unlink $filename;
1237	aio_unlink "$filename.pst";	1388	aio_unlink "$filename.pst";
1238	}	1389	}
…		…
1262	my $st = eval { Coro::Storable::thaw $av };	1413	my $st = eval { Coro::Storable::thaw $av };
1263	$av = $st->{objs};	1414	$av = $st->{objs};
1264	}	1415	}
1265		1416
1266	utf8::decode (my $decname = $filename);	1417	utf8::decode (my $decname = $filename);
1267	warn sprintf "loading %s (%d,%d)\n",	1418	trace sprintf "loading %s (%d,%d)\n",
1268	$decname, length $data, scalar @{$av || []}	1419	$decname, length $data, scalar @{$av || []}
1269	if $VERBOSE_IO;	1420	if $VERBOSE_IO;
1270		1421
1271	($data, $av)	1422	($data, $av)
1272	}	1423	}
1273		1424
…		…
1278	=cut	1429	=cut
1279		1430
1280	#############################################################################	1431	#############################################################################
1281	# command handling &c	1432	# command handling &c
1282		1433
1283	=item cf::register_command $name => \&callback($ob,$args);	1434	=item cf::register_command $name => \&callback($ob,$args)
1284		1435
1285	Register a callback for execution when the client sends the user command	1436	Register a callback for execution when the client sends the user command
1286	$name.	1437	$name.
1287		1438
1288	=cut	1439	=cut
…		…
1294	#warn "registering command '$name/$time' to '$caller'";	1445	#warn "registering command '$name/$time' to '$caller'";
1295		1446
1296	push @{ $COMMAND{$name} }, [$caller, $cb];	1447	push @{ $COMMAND{$name} }, [$caller, $cb];
1297	}	1448	}
1298		1449
1299	=item cf::register_extcmd $name => \&callback($pl,$packet);	1450	=item cf::register_extcmd $name => \&callback($pl,@args)
1300		1451
1301	Register a callback for execution when the client sends an (synchronous)	1452	Register a callback for execution when the client sends an (synchronous)
1302	extcmd packet. Ext commands will be processed in the order they are	1453	extcmd packet. Ext commands will be processed in the order they are
1303	received by the server, like other user commands. The first argument is	1454	received by the server, like other user commands. The first argument is
1304	the logged-in player. Ext commands can only be processed after a player	1455	the logged-in player. Ext commands can only be processed after a player
1305	has logged in successfully.	1456	has logged in successfully.
1306		1457
1307	If the callback returns something, it is sent back as if reply was being	1458	The values will be sent back to the client.
1308	called.
1309		1459
		1460	=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
		1461
		1462	Same as C<cf::register_extcmd>, but instead of returning values, the
		1463	callback needs to clal the C<$reply> function.
		1464
1310	=item cf::register_exticmd $name => \&callback($ns,$packet);	1465	=item cf::register_exticmd $name => \&callback($ns,@args)
1311		1466
1312	Register a callback for execution when the client sends an (asynchronous)	1467	Register a callback for execution when the client sends an (asynchronous)
1313	exticmd packet. Exti commands are processed by the server as soon as they	1468	exticmd packet. Exti commands are processed by the server as soon as they
1314	are received, i.e. out of order w.r.t. other commands. The first argument	1469	are received, i.e. out of order w.r.t. other commands. The first argument
1315	is a client socket. Exti commands can be received anytime, even before	1470	is a client socket. Exti commands can be received anytime, even before
1316	log-in.	1471	log-in.
1317		1472
1318	If the callback returns something, it is sent back as if reply was being	1473	The values will be sent back to the client.
1319	called.
1320		1474
1321	=cut	1475	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1322		1476
		1477	Same as C<cf::register_extcmd>, but instead of returning values, the
		1478	callback needs to clal the C<$reply> function.
		1479
		1480	=cut
		1481
1323	sub register_extcmd {	1482	sub register_extcmd($$) {
1324	my ($name, $cb) = @_;	1483	my ($name, $cb) = @_;
1325		1484
1326	$EXTCMD{$name} = $cb;	1485	$EXTCMD{$name} = $cb;
1327	}	1486	}
1328		1487
1329	sub register_exticmd {	1488	sub register_async_extcmd($$) {
1330	my ($name, $cb) = @_;	1489	my ($name, $cb) = @_;
1331		1490
		1491	$EXTACMD{$name} = $cb;
		1492	}
		1493
		1494	sub register_exticmd($$) {
		1495	my ($name, $cb) = @_;
		1496
1332	$EXTICMD{$name} = $cb;	1497	$EXTICMD{$name} = $cb;
		1498	}
		1499
		1500	sub register_async_exticmd($$) {
		1501	my ($name, $cb) = @_;
		1502
		1503	$EXTIACMD{$name} = $cb;
1333	}	1504	}
1334		1505
1335	use File::Glob ();	1506	use File::Glob ();
1336		1507
1337	cf::player->attach (	1508	cf::player->attach (
…		…
1351	my ($pl, $buf) = @_;	1522	my ($pl, $buf) = @_;
1352		1523
1353	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1524	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1354		1525
1355	if (ref $msg) {	1526	if (ref $msg) {
1356	my ($type, $reply, @payload) =	1527	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1357	"ARRAY" eq ref $msg
1358	? @$msg
1359	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1360		1528
1361	my @reply;
1362
1363	if (my $cb = $EXTCMD{$type}) {	1529	if (my $cb = $EXTACMD{$type}) {
		1530	$cb->(
		1531	$pl,
		1532	sub {
		1533	$pl->ext_msg ("reply-$reply", @_)
		1534	if $reply;
		1535	},
		1536	@payload
		1537	);
		1538	} else {
		1539	my @reply;
		1540
		1541	if (my $cb = $EXTCMD{$type}) {
1364	@reply = $cb->($pl, @payload);	1542	@reply = $cb->($pl, @payload);
		1543	}
		1544
		1545	$pl->ext_msg ("reply-$reply", @reply)
		1546	if $reply;
1365	}	1547	}
1366		1548
1367	$pl->ext_reply ($reply, @reply)
1368	if $reply;
1369
1370	} else {	1549	} else {
1371	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1550	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1372	}	1551	}
1373		1552
1374	cf::override;	1553	cf::override;
1375	},	1554	},
1376	);	1555	);
…		…
1386	};	1565	};
1387		1566
1388	$grp	1567	$grp
1389	}	1568	}
1390		1569
		1570	sub _ext_cfg_reg($$$$) {
		1571	my ($rvar, $varname, $cfgname, $default) = @_;
		1572
		1573	$cfgname = lc $varname
		1574	unless length $cfgname;
		1575
		1576	$EXT_CFG{$cfgname} = [$rvar, $default];
		1577
		1578	$$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
		1579	}
		1580
1391	sub load_extensions {	1581	sub load_extensions {
		1582	info "loading extensions...";
		1583
		1584	%EXT_CFG = ();
		1585
1392	cf::sync_job {	1586	cf::sync_job {
1393	my %todo;	1587	my %todo;
1394		1588
1395	for my $path (<$LIBDIR/*.ext>) {	1589	for my $path (<$LIBDIR/*.ext>) {
1396	next unless -r $path;	1590	next unless -r $path;
…		…
1414		1608
1415	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1609	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1416	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1610	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1417		1611
1418	$ext{source} =	1612	$ext{source} =
1419	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1613	"package $pkg; use common::sense;\n"
1420	. "#line 1 \"$path\"\n{\n"	1614	. "#line 1 \"$path\"\n{\n"
1421	. $source	1615	. $source
1422	. "\n};\n1";	1616	. "\n};\n1";
1423		1617
1424	$todo{$base} = \%ext;	1618	$todo{$base} = \%ext;
…		…
1436	for (split /,\s*/, $v->{meta}{depends}) {	1630	for (split /,\s*/, $v->{meta}{depends}) {
1437	next ext	1631	next ext
1438	unless exists $done{$_};	1632	unless exists $done{$_};
1439	}	1633	}
1440		1634
1441	warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1635	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1442		1636
		1637	my $source = $v->{source};
		1638
		1639	# support "CONF varname :confname = default" pseudo-statements
		1640	$source =~ s{
		1641	^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
		1642	}{
		1643	"our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
		1644	}gmxe;
		1645
1443	my $active = eval $v->{source};	1646	my $active = eval $source;
1444		1647
1445	if (length $@) {	1648	if (length $@) {
1446	warn "$v->{path}: $@\n";	1649	error "$v->{path}: $@\n";
1447		1650
1448	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1651	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1449	if exists $v->{meta}{mandatory};	1652	if exists $v->{meta}{mandatory};
1450		1653
1451	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";	1654	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
…		…
1453	} else {	1656	} else {
1454	$done{$k} = delete $todo{$k};	1657	$done{$k} = delete $todo{$k};
1455	push @EXTS, $v->{pkg};	1658	push @EXTS, $v->{pkg};
1456	$progress = 1;	1659	$progress = 1;
1457		1660
1458	warn "$v->{base}: extension inactive.\n"	1661	info "$v->{base}: extension inactive.\n"
1459	unless $active;	1662	unless $active;
1460	}	1663	}
1461	}	1664	}
1462		1665
1463	unless ($progress) {	1666	unless ($progress) {
…		…
1465		1668
1466	while (my ($k, $v) = each %todo) {	1669	while (my ($k, $v) = each %todo) {
1467	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1670	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1468	if exists $v->{meta}{mandatory};	1671	if exists $v->{meta}{mandatory};
1469	}	1672	}
		1673
		1674	last;
1470	}	1675	}
1471	}	1676	}
1472	};	1677	};
1473	}	1678	}
1474		1679
…		…
1632	my $name = $pl->ob->name;	1837	my $name = $pl->ob->name;
1633		1838
1634	$pl->{deny_save} = 1;	1839	$pl->{deny_save} = 1;
1635	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1840	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1636		1841
1637	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1842	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1638	$pl->deactivate;	1843	$pl->deactivate;
		1844
1639	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1845	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1640	$pl->ob->check_score;
1641	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1846	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1847	ext::highscore::check ($pl->ob);
		1848
1642	$pl->ns->destroy if $pl->ns;	1849	$pl->ns->destroy if $pl->ns;
1643		1850
1644	my $path = playerdir $pl;	1851	my $path = playerdir $pl;
1645	my $temp = "$path~$cf::RUNTIME~deleting~";	1852	my $temp = "$path~$cf::RUNTIME~deleting~";
1646	aio_rename $path, $temp;	1853	aio_rename $path, $temp;
…		…
1732		1939
1733	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1940	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1734		1941
1735	Expand deliantra pod fragments into protocol xml.	1942	Expand deliantra pod fragments into protocol xml.
1736		1943
1737	=item $player->ext_reply ($msgid, @msg)
1738
1739	Sends an ext reply to the player.
1740
1741	=cut
1742
1743	sub ext_reply($$@) {
1744	my ($self, $id, @msg) = @_;
1745
1746	$self->ns->ext_reply ($id, @msg)
1747	}
1748
1749	=item $player->ext_msg ($type, @msg)	1944	=item $player->ext_msg ($type, @msg)
1750		1945
1751	Sends an ext event to the client.	1946	Sends an ext event to the client.
1752		1947
1753	=cut	1948	=cut
…		…
1812	sub generate_random_map {	2007	sub generate_random_map {
1813	my ($self, $rmp) = @_;	2008	my ($self, $rmp) = @_;
1814		2009
1815	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	2010	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1816		2011
1817	# mit "rum" bekleckern, nicht
1818	$self->_create_random_map (	2012	$self->_create_random_map ($rmp);
1819	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1820	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1821	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1822	$rmp->{exit_on_final_map},
1823	$rmp->{xsize}, $rmp->{ysize},
1824	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1825	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1826	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1827	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1828	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1829	(cf::region::find $rmp->{region}), $rmp->{custom}
1830	)
1831	}	2013	}
1832		2014
1833	=item cf::map->register ($regex, $prio)	2015	=item cf::map->register ($regex, $prio)
1834		2016
1835	Register a handler for the map path matching the given regex at the	2017	Register a handler for the map path matching the given regex at the
…		…
1840		2022
1841	sub register {	2023	sub register {
1842	my (undef, $regex, $prio) = @_;	2024	my (undef, $regex, $prio) = @_;
1843	my $pkg = caller;	2025	my $pkg = caller;
1844		2026
1845	no strict;
1846	push @{"$pkg\::ISA"}, __PACKAGE__;	2027	push @{"$pkg\::ISA"}, __PACKAGE__;
1847		2028
1848	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	2029	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1849	}	2030	}
1850		2031
…		…
1862	}	2043	}
1863		2044
1864	sub normalise {	2045	sub normalise {
1865	my ($path, $base) = @_;	2046	my ($path, $base) = @_;
1866		2047
1867	$path = "$path"; # make sure its a string	2048	$path = "$path"; # make sure it's a string
1868		2049
1869	$path =~ s/\.map$//;	2050	$path =~ s/\.map$//;
1870		2051
1871	# map plan:	2052	# map plan:
1872	#	2053	#
…		…
1887	$base =~ s{[^/]+/?$}{};	2068	$base =~ s{[^/]+/?$}{};
1888	$path = "$base/$path";	2069	$path = "$base/$path";
1889	}	2070	}
1890		2071
1891	for ($path) {	2072	for ($path) {
1892	redo if s{//}{/};
1893	redo if s{/\.?/}{/};	2073	redo if s{/\.?/}{/};
1894	redo if s{/[^/]+/\.\./}{/};	2074	redo if s{/[^/]+/\.\./}{/};
1895	}	2075	}
1896		2076
1897	$path	2077	$path
…		…
1911	$self->init; # pass $1 etc.	2091	$self->init; # pass $1 etc.
1912	return $self;	2092	return $self;
1913	}	2093	}
1914	}	2094	}
1915		2095
1916	Carp::cluck "unable to resolve path '$path' (base '$base').";	2096	Carp::cluck "unable to resolve path '$path' (base '$base')";
1917	()	2097	()
1918	}	2098	}
1919		2099
		2100	# may re-bless or do other evil things
1920	sub init {	2101	sub init {
1921	my ($self) = @_;	2102	my ($self) = @_;
1922		2103
1923	$self	2104	$self
1924	}	2105	}
…		…
1989	$self->{load_path} = $path;	2170	$self->{load_path} = $path;
1990		2171
1991	1	2172	1
1992	}	2173	}
1993		2174
		2175	# used to laod the header of an original map
1994	sub load_header_orig {	2176	sub load_header_orig {
1995	my ($self) = @_;	2177	my ($self) = @_;
1996		2178
1997	$self->load_header_from ($self->load_path)	2179	$self->load_header_from ($self->load_path)
1998	}	2180	}
1999		2181
		2182	# used to laod the header of an instantiated map
2000	sub load_header_temp {	2183	sub load_header_temp {
2001	my ($self) = @_;	2184	my ($self) = @_;
2002		2185
2003	$self->load_header_from ($self->save_path)	2186	$self->load_header_from ($self->save_path)
2004	}	2187	}
2005		2188
		2189	# called after loading the header from an instantiated map
2006	sub prepare_temp {	2190	sub prepare_temp {
2007	my ($self) = @_;	2191	my ($self) = @_;
2008		2192
2009	$self->last_access ((delete $self->{last_access})	2193	$self->last_access ((delete $self->{last_access})
2010	|| $cf::RUNTIME); #d#	2194	|| $cf::RUNTIME); #d#
2011	# safety	2195	# safety
2012	$self->{instantiate_time} = $cf::RUNTIME	2196	$self->{instantiate_time} = $cf::RUNTIME
2013	if $self->{instantiate_time} > $cf::RUNTIME;	2197	if $self->{instantiate_time} > $cf::RUNTIME;
2014	}	2198	}
2015		2199
		2200	# called after loading the header from an original map
2016	sub prepare_orig {	2201	sub prepare_orig {
2017	my ($self) = @_;	2202	my ($self) = @_;
2018		2203
2019	$self->{load_original} = 1;	2204	$self->{load_original} = 1;
2020	$self->{instantiate_time} = $cf::RUNTIME;	2205	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2044		2229
2045	sub find;	2230	sub find;
2046	sub find {	2231	sub find {
2047	my ($path, $origin) = @_;	2232	my ($path, $origin) = @_;
2048		2233
		2234	cf::cede_to_tick;
		2235
2049	$path = normalise $path, $origin && $origin->path;	2236	$path = normalise $path, $origin;
2050		2237
2051	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2238	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2052	my $guard2 = cf::lock_acquire "map_find:$path";	2239	my $guard2 = cf::lock_acquire "map_find:$path";
2053		2240
2054	$cf::MAP{$path} || do {	2241	$cf::MAP{$path} || do {
…		…
2085		2272
2086	{	2273	{
2087	my $guard = cf::lock_acquire "map_data:$path";	2274	my $guard = cf::lock_acquire "map_data:$path";
2088		2275
2089	return unless $self->valid;	2276	return unless $self->valid;
2090	return unless $self->in_memory == cf::MAP_SWAPPED;	2277	return unless $self->state == cf::MAP_SWAPPED;
2091
2092	$self->in_memory (cf::MAP_LOADING);
2093		2278
2094	$self->alloc;	2279	$self->alloc;
2095		2280
2096	$self->pre_load;	2281	$self->pre_load;
2097	cf::cede_to_tick;	2282	cf::cede_to_tick;
2098		2283
		2284	if (exists $self->{load_path}) {
2099	my $f = new_from_file cf::object::thawer $self->{load_path};	2285	my $f = new_from_file cf::object::thawer $self->{load_path};
2100	$f->skip_block;	2286	$f->skip_block;
2101	$self->_load_objects ($f)	2287	$self->_load_objects ($f)
2102	or return;	2288	or return;
2103		2289
2104	$self->post_load_original	2290	$self->post_load_original
2105	if delete $self->{load_original};	2291	if delete $self->{load_original};
2106		2292
2107	if (my $uniq = $self->uniq_path) {	2293	if (my $uniq = $self->uniq_path) {
2108	utf8::encode $uniq;	2294	utf8::encode $uniq;
2109	unless (aio_stat $uniq) {	2295	unless (aio_stat $uniq) {
2110	if (my $f = new_from_file cf::object::thawer $uniq) {	2296	if (my $f = new_from_file cf::object::thawer $uniq) {
2111	$self->clear_unique_items;	2297	$self->clear_unique_items;
2112	$self->_load_objects ($f);	2298	$self->_load_objects ($f);
2113	$f->resolve_delayed_derefs;	2299	$f->resolve_delayed_derefs;
		2300	}
2114	}	2301	}
2115	}	2302	}
2116	}
2117		2303
2118	$f->resolve_delayed_derefs;	2304	$f->resolve_delayed_derefs;
		2305	} else {
		2306	$self->post_load_original
		2307	if delete $self->{load_original};
		2308	}
		2309
		2310	$self->state (cf::MAP_INACTIVE);
2119		2311
2120	cf::cede_to_tick;	2312	cf::cede_to_tick;
2121	# now do the right thing for maps	2313	# now do the right thing for maps
2122	$self->link_multipart_objects;	2314	$self->link_multipart_objects;
2123	$self->difficulty ($self->estimate_difficulty)	2315	$self->difficulty ($self->estimate_difficulty)
…		…
2127	unless ($self->{deny_activate}) {	2319	unless ($self->{deny_activate}) {
2128	$self->decay_objects;	2320	$self->decay_objects;
2129	$self->fix_auto_apply;	2321	$self->fix_auto_apply;
2130	$self->update_buttons;	2322	$self->update_buttons;
2131	cf::cede_to_tick;	2323	cf::cede_to_tick;
2132	$self->activate;	2324	#$self->activate; # no longer activate maps automatically
2133	}	2325	}
2134		2326
2135	$self->{last_save} = $cf::RUNTIME;	2327	$self->{last_save} = $cf::RUNTIME;
2136	$self->last_access ($cf::RUNTIME);	2328	$self->last_access ($cf::RUNTIME);
2137
2138	$self->in_memory (cf::MAP_ACTIVE);
2139	}	2329	}
2140		2330
2141	$self->post_load;	2331	$self->post_load;
		2332
		2333	1
2142	}	2334	}
2143		2335
2144	# customize the map for a given player, i.e.	2336	# customize the map for a given player, i.e.
2145	# return the _real_ map. used by e.g. per-player	2337	# return the _real_ map. used by e.g. per-player
2146	# maps to change the path to ~playername/mappath	2338	# maps to change the path to ~playername/mappath
…		…
2154	# if $self->per_party;	2346	# if $self->per_party;
2155		2347
2156	$self	2348	$self
2157	}	2349	}
2158		2350
2159	# find and load all maps in the 3x3 area around a map
2160	sub load_neighbours {
2161	my ($map) = @_;
2162
2163	my @neigh; # diagonal neighbours
2164
2165	for (0 .. 3) {
2166	my $neigh = $map->tile_path ($_)
2167	or next;
2168	$neigh = find $neigh, $map
2169	or next;
2170	$neigh->load;
2171
2172	# now find the diagonal neighbours
2173	push @neigh,
2174	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2175	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2176	}
2177
2178	for (grep defined $_->[0], @neigh) {
2179	my ($path, $origin) = @$_;
2180	my $neigh = find $path, $origin
2181	or next;
2182	$neigh->load;
2183	}
2184	}
2185
2186	sub find_sync {	2351	sub find_sync {
2187	my ($path, $origin) = @_;	2352	my ($path, $origin) = @_;
2188		2353
2189	cf::sync_job { find $path, $origin }	2354	# it's a bug to call this from the main context
		2355	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
		2356	if $Coro::current == $Coro::main;
		2357
		2358	find $path, $origin
2190	}	2359	}
2191		2360
2192	sub do_load_sync {	2361	sub do_load_sync {
2193	my ($map) = @_;	2362	my ($map) = @_;
2194		2363
		2364	# it's a bug to call this from the main context
2195	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2365	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2196	if $Coro::current == $Coro::main;	2366	if $Coro::current == $Coro::main;
2197		2367
2198	cf::sync_job { $map->load };	2368	$map->load;
2199	}	2369	}
2200		2370
2201	our %MAP_PREFETCH;	2371	our %MAP_PREFETCH;
2202	our $MAP_PREFETCHER = undef;	2372	our $MAP_PREFETCHER = undef;
2203		2373
2204	sub find_async {	2374	sub find_async {
2205	my ($path, $origin, $load) = @_;	2375	my ($path, $origin, $load) = @_;
2206		2376
2207	$path = normalise $path, $origin && $origin->{path};	2377	$path = normalise $path, $origin;
2208		2378
2209	if (my $map = $cf::MAP{$path}) {	2379	if (my $map = $cf::MAP{$path}) {
2210	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2380	return $map if !$load || $map->linkable;
2211	}	2381	}
2212		2382
2213	$MAP_PREFETCH{$path} |= $load;	2383	$MAP_PREFETCH{$path} |= $load;
2214		2384
2215	$MAP_PREFETCHER ||= cf::async {	2385	$MAP_PREFETCHER ||= cf::async {
…		…
2274	sub swap_out {	2444	sub swap_out {
2275	my ($self) = @_;	2445	my ($self) = @_;
2276		2446
2277	my $lock = cf::lock_acquire "map_data:$self->{path}";	2447	my $lock = cf::lock_acquire "map_data:$self->{path}";
2278		2448
2279	return if $self->in_memory != cf::MAP_ACTIVE;	2449	return if !$self->linkable;
2280	return if $self->{deny_save};	2450	return if $self->{deny_save};
2281	return if $self->players;	2451	return if $self->players;
2282		2452
2283	# first deactivate the map and "unlink" it from the core	2453	# first deactivate the map and "unlink" it from the core
2284	$self->deactivate;	2454	$self->deactivate;
2285	$_->clear_links_to ($self) for values %cf::MAP;	2455	$_->clear_links_to ($self) for values %cf::MAP;
2286	$self->in_memory (cf::MAP_SWAPPED);	2456	$self->state (cf::MAP_SWAPPED);
2287		2457
2288	# then atomically save	2458	# then atomically save
2289	$self->_save;	2459	$self->_save;
2290		2460
2291	# then free the map	2461	# then free the map
…		…
2315		2485
2316	my $lock = cf::lock_acquire "map_data:$self->{path}";	2486	my $lock = cf::lock_acquire "map_data:$self->{path}";
2317		2487
2318	return if $self->players;	2488	return if $self->players;
2319		2489
2320	warn "resetting map ", $self->path, "\n";	2490	cf::trace "resetting map ", $self->path, "\n";
2321		2491
2322	$self->in_memory (cf::MAP_SWAPPED);	2492	$self->state (cf::MAP_SWAPPED);
2323		2493
2324	# need to save uniques path	2494	# need to save uniques path
2325	unless ($self->{deny_save}) {	2495	unless ($self->{deny_save}) {
2326	my $uniq = $self->uniq_path; utf8::encode $uniq;	2496	my $uniq = $self->uniq_path; utf8::encode $uniq;
2327		2497
…		…
2480		2650
2481	Creates and returns a persistent reference to an object that can be stored as a string.	2651	Creates and returns a persistent reference to an object that can be stored as a string.
2482		2652
2483	=item $ob = cf::object::deref ($refstring)	2653	=item $ob = cf::object::deref ($refstring)
2484		2654
2485	returns the objetc referenced by refstring. may return undef when it cnanot find the object,	2655	returns the objetc referenced by refstring. may return undef when it cannot find the object,
2486	even if the object actually exists. May block.	2656	even if the object actually exists. May block.
2487		2657
2488	=cut	2658	=cut
2489		2659
2490	sub deref {	2660	sub deref {
…		…
2657	# use -1 or undef as default coordinates, not 0, 0	2827	# use -1 or undef as default coordinates, not 0, 0
2658	($x, $y) = ($map->enter_x, $map->enter_y)	2828	($x, $y) = ($map->enter_x, $map->enter_y)
2659	if $x <= 0 && $y <= 0;	2829	if $x <= 0 && $y <= 0;
2660		2830
2661	$map->load;	2831	$map->load;
2662	$map->load_neighbours;
2663		2832
2664	return unless $self->contr->active;	2833	return unless $self->contr->active;
2665		2834
2666	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2835	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2667	if ($self->enter_map ($map, $x, $y)) {	2836	if ($self->enter_map ($map, $x, $y)) {
…		…
2690		2859
2691	sub cf::object::player::goto {	2860	sub cf::object::player::goto {
2692	my ($self, $path, $x, $y, $check, $done) = @_;	2861	my ($self, $path, $x, $y, $check, $done) = @_;
2693		2862
2694	if ($self->{_link_recursion} >= $MAX_LINKS) {	2863	if ($self->{_link_recursion} >= $MAX_LINKS) {
2695	warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";	2864	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2696	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");	2865	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2697	($path, $x, $y) = @$EMERGENCY_POSITION;	2866	($path, $x, $y) = @$EMERGENCY_POSITION;
2698	}	2867	}
2699		2868
2700	# do generation counting so two concurrent goto's will be executed in-order	2869	# do generation counting so two concurrent goto's will be executed in-order
…		…
2723	($path, $x, $y) = (undef, undef, undef);	2892	($path, $x, $y) = (undef, undef, undef);
2724	}	2893	}
2725	}	2894	}
2726		2895
2727	my $map = eval {	2896	my $map = eval {
2728	my $map = defined $path ? cf::map::find $path : undef;	2897	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2729		2898
2730	if ($map) {	2899	if ($map) {
2731	$map = $map->customise_for ($self);	2900	$map = $map->customise_for ($self);
2732	$map = $check->($map, $x, $y, $self) if $check && $map;	2901	$map = $check->($map, $x, $y, $self) if $check && $map;
2733	} else {	2902	} else {
…		…
2823	$Coro::current->{desc} = "enter_exit";	2992	$Coro::current->{desc} = "enter_exit";
2824		2993
2825	unless (eval {	2994	unless (eval {
2826	$self->deactivate_recursive; # just to be sure	2995	$self->deactivate_recursive; # just to be sure
2827		2996
2828	# random map handling
2829	{
2830	my $guard = cf::lock_acquire "exit_prepare:$exit";
2831
2832	prepare_random_map $exit
2833	if $exit->slaying eq "/!";
2834	}
2835
2836	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2997	my $map = cf::map::normalise $exit->slaying, $exit->map;
2837	my $x = $exit->stats->hp;	2998	my $x = $exit->stats->hp;
2838	my $y = $exit->stats->sp;	2999	my $y = $exit->stats->sp;
		3000
		3001	# special map handling
		3002	my $slaying = $exit->slaying;
		3003
		3004	# special map handling
		3005	if ($slaying eq "/!") {
		3006	my $guard = cf::lock_acquire "exit_prepare:$exit";
		3007
		3008	prepare_random_map $exit
		3009	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		3010
		3011	$map = $exit->slaying;
		3012
		3013	} elsif ($slaying eq '!up') {
		3014	$map = $exit->map->tile_path (cf::TILE_UP);
		3015	$x = $exit->x;
		3016	$y = $exit->y;
		3017
		3018	} elsif ($slaying eq '!down') {
		3019	$map = $exit->map->tile_path (cf::TILE_DOWN);
		3020	$x = $exit->x;
		3021	$y = $exit->y;
		3022	}
2839		3023
2840	$self->goto ($map, $x, $y);	3024	$self->goto ($map, $x, $y);
2841		3025
2842	# if exit is damned, update players death & WoR home-position	3026	# if exit is damned, update players death & WoR home-position
2843	$self->contr->savebed ($map, $x, $y)	3027	$self->contr->savebed ($map, $x, $y)
…		…
2848	$self->message ("Something went wrong deep within the deliantra server. "	3032	$self->message ("Something went wrong deep within the deliantra server. "
2849	. "I'll try to bring you back to the map you were before. "	3033	. "I'll try to bring you back to the map you were before. "
2850	. "Please report this to the dungeon master!",	3034	. "Please report this to the dungeon master!",
2851	cf::NDI_UNIQUE | cf::NDI_RED);	3035	cf::NDI_UNIQUE | cf::NDI_RED);
2852		3036
2853	warn "ERROR in enter_exit: $@";	3037	error "ERROR in enter_exit: $@";
2854	$self->leave_link;	3038	$self->leave_link;
2855	}	3039	}
2856	})->prio (1);	3040	})->prio (1);
2857	}	3041	}
2858		3042
…		…
2869		3053
2870	sub cf::client::send_drawinfo {	3054	sub cf::client::send_drawinfo {
2871	my ($self, $text, $flags) = @_;	3055	my ($self, $text, $flags) = @_;
2872		3056
2873	utf8::encode $text;	3057	utf8::encode $text;
2874	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	3058	$self->send_packet (sprintf "msg %d 0 %s", $flags || cf::NDI_BLACK, $text);
2875	}	3059	}
2876		3060
2877	=item $client->send_big_packet ($pkt)	3061	=item $client->send_big_packet ($pkt)
2878		3062
2879	Like C<send_packet>, but tries to compress large packets, and fragments	3063	Like C<send_packet>, but tries to compress large packets, and fragments
…		…
2899	$self->send_packet ($pkt);	3083	$self->send_packet ($pkt);
2900	}	3084	}
2901		3085
2902	=item $client->send_msg ($channel, $msg, $color, [extra...])	3086	=item $client->send_msg ($channel, $msg, $color, [extra...])
2903		3087
2904	Send a drawinfo or msg packet to the client, formatting the msg for the	3088	Send a msg packet to the client, formatting the msg for the client if
2905	client if neccessary. C<$type> should be a string identifying the type of	3089	necessary. C<$type> should be a string identifying the type of the
2906	the message, with C<log> being the default. If C<$color> is negative, suppress	3090	message, with C<log> being the default. If C<$color> is negative, suppress
2907	the message unless the client supports the msg packet.	3091	the message unless the client supports the msg packet.
2908		3092
2909	=cut	3093	=cut
2910		3094
2911	# non-persistent channels (usually the info channel)	3095	# non-persistent channels (usually the info channel)
…		…
3016	id => "death",	3200	id => "death",
3017	title => "Death",	3201	title => "Death",
3018	reply => undef,	3202	reply => undef,
3019	tooltip => "Reason for and more info about your most recent death",	3203	tooltip => "Reason for and more info about your most recent death",
3020	},	3204	},
		3205	"c/fatal" => {
		3206	id => "fatal",
		3207	title => "Fatal Error",
		3208	reply => undef,
		3209	tooltip => "Reason for the server disconnect",
		3210	},
3021	"c/say" => $SAY_CHANNEL,	3211	"c/say" => $SAY_CHANNEL,
3022	"c/chat" => $CHAT_CHANNEL,	3212	"c/chat" => $CHAT_CHANNEL,
3023	);	3213	);
3024		3214
3025	sub cf::client::send_msg {	3215	sub cf::client::send_msg {
…		…
3068	=cut	3258	=cut
3069		3259
3070	sub cf::client::ext_msg($$@) {	3260	sub cf::client::ext_msg($$@) {
3071	my ($self, $type, @msg) = @_;	3261	my ($self, $type, @msg) = @_;
3072		3262
3073	if ($self->extcmd == 2) {
3074	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3263	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3075	} elsif ($self->extcmd == 1) { # TODO: remove
3076	push @msg, msgtype => "event_$type";
3077	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3078	}
3079	}
3080
3081	=item $client->ext_reply ($msgid, @msg)
3082
3083	Sends an ext reply to the client.
3084
3085	=cut
3086
3087	sub cf::client::ext_reply($$@) {
3088	my ($self, $id, @msg) = @_;
3089
3090	if ($self->extcmd == 2) {
3091	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3092	} elsif ($self->extcmd == 1) {
3093	#TODO: version 1, remove
3094	unshift @msg, msgtype => "reply", msgid => $id;
3095	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3096	}
3097	}	3264	}
3098		3265
3099	=item $success = $client->query ($flags, "text", \&cb)	3266	=item $success = $client->query ($flags, "text", \&cb)
3100		3267
3101	Queues a query to the client, calling the given callback with	3268	Queues a query to the client, calling the given callback with
…		…
3156	my ($ns, $buf) = @_;	3323	my ($ns, $buf) = @_;
3157		3324
3158	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3325	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3159		3326
3160	if (ref $msg) {	3327	if (ref $msg) {
3161	my ($type, $reply, @payload) =	3328	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3162	"ARRAY" eq ref $msg
3163	? @$msg
3164	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3165		3329
3166	my @reply;
3167
3168	if (my $cb = $EXTICMD{$type}) {	3330	if (my $cb = $EXTIACMD{$type}) {
		3331	$cb->(
		3332	$ns,
		3333	sub {
		3334	$ns->ext_msg ("reply-$reply", @_)
		3335	if $reply;
		3336	},
		3337	@payload
		3338	);
		3339	} else {
		3340	my @reply;
		3341
		3342	if (my $cb = $EXTICMD{$type}) {
3169	@reply = $cb->($ns, @payload);	3343	@reply = $cb->($ns, @payload);
		3344	}
		3345
		3346	$ns->ext_msg ("reply-$reply", @reply)
		3347	if $reply;
3170	}	3348	}
3171
3172	$ns->ext_reply ($reply, @reply)
3173	if $reply;
3174
3175	} else {	3349	} else {
3176	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3350	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3177	}	3351	}
3178		3352
3179	cf::override;	3353	cf::override;
3180	},	3354	},
3181	);	3355	);
…		…
3262	decrease split destroy change_exp value msg lore send_msg)],	3436	decrease split destroy change_exp value msg lore send_msg)],
3263	["cf::object::player" => qw(player)],	3437	["cf::object::player" => qw(player)],
3264	["cf::player" => qw(peaceful send_msg)],	3438	["cf::player" => qw(peaceful send_msg)],
3265	["cf::map" => qw(trigger)],	3439	["cf::map" => qw(trigger)],
3266	) {	3440	) {
3267	no strict 'refs';
3268	my ($pkg, @funs) = @$_;	3441	my ($pkg, @funs) = @$_;
3269	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3442	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3270	for @funs;	3443	for @funs;
3271	}	3444	}
3272		3445
…		…
3311	local @cf::_safe_eval_args = values %vars;	3484	local @cf::_safe_eval_args = values %vars;
3312	@res = wantarray ? eval eval : scalar eval $eval;	3485	@res = wantarray ? eval eval : scalar eval $eval;
3313	}	3486	}
3314		3487
3315	if ($@) {	3488	if ($@) {
3316	warn "$@";	3489	warn "$@",
3317	warn "while executing safe code '$code'\n";	3490	"while executing safe code '$code'\n",
3318	warn "with arguments " . (join " ", %vars) . "\n";	3491	"with arguments " . (join " ", %vars) . "\n";
3319	}	3492	}
3320		3493
3321	wantarray ? @res : $res[0]	3494	wantarray ? @res : $res[0]
3322	}	3495	}
3323		3496
…		…
3348	=cut	3521	=cut
3349		3522
3350	#############################################################################	3523	#############################################################################
3351	# the server's init and main functions	3524	# the server's init and main functions
3352		3525
		3526	{
		3527	package cf::face;
		3528
		3529	our %HASH; # hash => idx
		3530	our @DATA; # dynamically-created facedata, only faceste 0 used
		3531	our @FOFS; # file offset, if > 0
		3532	our @SIZE; # size of face, in octets
		3533	our @META; # meta hash of face, if any
		3534	our $DATAFH; # facedata filehandle
		3535
		3536	# internal api, not finalised
		3537	sub set {
		3538	my ($name, $type, $data) = @_;
		3539
		3540	my $idx = cf::face::find $name;
		3541
		3542	if ($idx) {
		3543	delete $HASH{cf::face::get_csum $idx};
		3544	} else {
		3545	$idx = cf::face::alloc $name;
		3546	}
		3547
		3548	my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
		3549
		3550	cf::face::set_type $idx, $type;
		3551	cf::face::set_csum $idx, 0, $hash;
		3552
		3553	# we need to destroy the SV itself, not just modify it, as a running ix
		3554	# might hold a reference to it: "delete" achieves that.
		3555	delete $FOFS[0][$idx];
		3556	delete $DATA[0][$idx];
		3557	$DATA[0][$idx] = $data;
		3558	$SIZE[0][$idx] = length $data;
		3559	delete $META[$idx];
		3560	$HASH{$hash} = $idx;#d#
		3561
		3562	$idx
		3563	}
		3564
		3565	sub _get_data($$$) {
		3566	my ($idx, $set, $cb) = @_;
		3567
		3568	if (defined $DATA[$set][$idx]) {
		3569	$cb->($DATA[$set][$idx]);
		3570	} elsif (my $fofs = $FOFS[$set][$idx]) {
		3571	my $size = $SIZE[$set][$idx];
		3572	my $buf;
		3573	IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
		3574	if ($_[0] == $size) {
		3575	#cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
		3576	$cb->($buf);
		3577	} else {
		3578	cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
		3579	}
		3580	};
		3581	} else {
		3582	cf::error "requested facedata for unknown face $idx#$set, ignoring.";
		3583	}
		3584	}
		3585
		3586	# rather ineffient
		3587	sub cf::face::get_data($;$) {
		3588	my ($idx, $set) = @_;
		3589
		3590	_get_data $idx, $set, Coro::rouse_cb;
		3591	Coro::rouse_wait
		3592	}
		3593
		3594	sub cf::face::ix {
		3595	my ($ns, $set, $idx, $pri) = @_;
		3596
		3597	_get_data $idx, $set, sub {
		3598	$ns->ix_send ($idx, $pri, $_[0]);
		3599	};
		3600	}
		3601	}
		3602
3353	sub load_facedata($) {	3603	sub load_facedata($) {
3354	my ($path) = @_;	3604	my ($path) = @_;
3355		3605
3356	# HACK to clear player env face cache, we need some signal framework
3357	# for this (global event?)
3358	%ext::player_env::MUSIC_FACE_CACHE = ();
3359
3360	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3606	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3361		3607
3362	warn "loading facedata from $path\n";	3608	trace "loading facedata from $path\n";
3363		3609
3364	my $facedata;	3610	my $facedata = decode_storable load_file "$path/faceinfo";
3365	0 < aio_load $path, $facedata
3366	or die "$path: $!";
3367
3368	$facedata = Coro::Storable::thaw $facedata;
3369		3611
3370	$facedata->{version} == 2	3612	$facedata->{version} == 2
3371	or cf::cleanup "$path: version mismatch, cannot proceed.";	3613	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3372		3614
3373	# patch in the exptable	3615	my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3374	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);	3616	or cf::cleanup "$path/facedata: $!, cannot proceed.";
3375	$facedata->{resource}{"res/exp_table"} = {	3617
3376	type => FT_RSRC,	3618	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3377	data => $exp_table,	3619
3378	hash => (Digest::MD5::md5 $exp_table),	3620	# BEGIN ATOMIC
3379	};	3621	# from here on, everything must be atomic - no thread switch allowed
3380	cf::cede_to_tick;	3622	my $t1 = EV::time;
3381		3623
3382	{	3624	{
3383	my $faces = $facedata->{faceinfo};	3625	my $faces = $facedata->{faceinfo};
3384		3626
3385	while (my ($face, $info) = each %$faces) {	3627	for my $face (sort keys %$faces) {
		3628	my $info = $faces->{$face};
3386	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3629	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3387		3630
3388	cf::face::set_visibility $idx, $info->{visibility};	3631	cf::face::set_visibility $idx, $info->{visibility};
3389	cf::face::set_magicmap $idx, $info->{magicmap};	3632	cf::face::set_magicmap $idx, $info->{magicmap};
3390	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3633	cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3391	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3634	cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3392		3635	cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3393	cf::cede_to_tick;	3636	$cf::face::HASH{$info->{hash64}} = $idx;
		3637	delete $cf::face::META[$idx];
3394	}	3638	}
3395		3639
3396	while (my ($face, $info) = each %$faces) {	3640	while (my ($face, $info) = each %$faces) {
3397	next unless $info->{smooth};	3641	next unless $info->{smooth};
3398		3642
…		…
3401		3645
3402	if (my $smooth = cf::face::find $info->{smooth}) {	3646	if (my $smooth = cf::face::find $info->{smooth}) {
3403	cf::face::set_smooth $idx, $smooth;	3647	cf::face::set_smooth $idx, $smooth;
3404	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3648	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3405	} else {	3649	} else {
3406	warn "smooth face '$info->{smooth}' not found for face '$face'";	3650	error "smooth face '$info->{smooth}' not found for face '$face'";
3407	}	3651	}
3408
3409	cf::cede_to_tick;
3410	}	3652	}
3411	}	3653	}
3412		3654
3413	{	3655	{
3414	my $anims = $facedata->{animinfo};	3656	my $anims = $facedata->{animinfo};
3415		3657
3416	while (my ($anim, $info) = each %$anims) {	3658	while (my ($anim, $info) = each %$anims) {
3417	cf::anim::set $anim, $info->{frames}, $info->{facings};	3659	cf::anim::set $anim, $info->{frames}, $info->{facings};
3418	cf::cede_to_tick;
3419	}	3660	}
3420		3661
3421	cf::anim::invalidate_all; # d'oh	3662	cf::anim::invalidate_all; # d'oh
3422	}	3663	}
3423		3664
3424	{	3665	{
3425	my $res = $facedata->{resource};	3666	my $res = $facedata->{resource};
3426		3667
3427	while (my ($name, $info) = each %$res) {	3668	while (my ($name, $info) = each %$res) {
3428	if (defined $info->{type}) {	3669	if (defined (my $type = $info->{type})) {
		3670	# TODO: different hash - must free and use new index, or cache ixface data queue
3429	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3671	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3430		3672
3431	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3432	cf::face::set_type $idx, $info->{type};	3673	cf::face::set_type $idx, $type;
		3674	cf::face::set_csum $idx, 0, $info->{hash};
		3675	$cf::face::SIZE[0][$idx] = $info->{size};
		3676	$cf::face::FOFS[0][$idx] = $info->{fofs};
		3677	$cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3678	$cf::face::HASH{$info->{hash}} = $idx;
3433	} else {	3679	} else {
3434	$RESOURCE{$name} = $info;	3680	# $RESOURCE{$name} = $info; # unused
3435	}	3681	}
3436
3437	cf::cede_to_tick;
3438	}	3682	}
3439	}	3683	}
		3684
		3685	($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
		3686
		3687	# HACK to clear player env face cache, we need some signal framework
		3688	# for this (global event?)
		3689	%ext::player_env::MUSIC_FACE_CACHE = ();
		3690
		3691	# END ATOMIC
		3692
		3693	cf::debug "facedata atomic update time ", EV::time - $t1;
3440		3694
3441	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3695	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3442		3696
		3697	aio_close $fh if $fh; # close old facedata
		3698
3443	1	3699	1
3444	}	3700	}
3445
3446	cf::global->attach (on_resource_update => sub {
3447	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3448	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3449
3450	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3451	my $sound = $soundconf->{compat}[$_]
3452	or next;
3453
3454	my $face = cf::face::find "sound/$sound->[1]";
3455	cf::sound::set $sound->[0] => $face;
3456	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3457	}
3458
3459	while (my ($k, $v) = each %{$soundconf->{event}}) {
3460	my $face = cf::face::find "sound/$v";
3461	cf::sound::set $k => $face;
3462	}
3463	}
3464	});
3465		3701
3466	register_exticmd fx_want => sub {	3702	register_exticmd fx_want => sub {
3467	my ($ns, $want) = @_;	3703	my ($ns, $want) = @_;
3468		3704
3469	while (my ($k, $v) = each %$want) {	3705	while (my ($k, $v) = each %$want) {
…		…
3477	my $status = load_resource_file_ $_[0];	3713	my $status = load_resource_file_ $_[0];
3478	get_slot 0.1, 100;	3714	get_slot 0.1, 100;
3479	cf::arch::commit_load;	3715	cf::arch::commit_load;
3480		3716
3481	$status	3717	$status
		3718	}
		3719
		3720	sub reload_exp_table {
		3721	_reload_exp_table;
		3722
		3723	cf::face::set
		3724	"res/exp_table" => FT_RSRC,
		3725	JSON::XS->new->utf8->canonical->encode (
		3726	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3727	);
		3728	}
		3729
		3730	sub reload_materials {
		3731	_reload_materials;
3482	}	3732	}
3483		3733
3484	sub reload_regions {	3734	sub reload_regions {
3485	# HACK to clear player env face cache, we need some signal framework	3735	# HACK to clear player env face cache, we need some signal framework
3486	# for this (global event?)	3736	# for this (global event?)
…		…
3494	if exists $_->{match};	3744	if exists $_->{match};
3495	}	3745	}
3496	}	3746	}
3497		3747
3498	sub reload_facedata {	3748	sub reload_facedata {
3499	load_facedata "$DATADIR/facedata"	3749	load_facedata $DATADIR
3500	or die "unable to load facedata\n";	3750	or die "unable to load facedata\n";
3501	}	3751	}
3502		3752
3503	sub reload_archetypes {	3753	sub reload_archetypes {
3504	load_resource_file "$DATADIR/archetypes"	3754	load_resource_file "$DATADIR/archetypes"
3505	or die "unable to load archetypes\n";	3755	or die "unable to load archetypes\n";
		3756
		3757	cf::face::set
		3758	"res/skill_info" => FT_RSRC,
		3759	JSON::XS->new->utf8->canonical->encode (
		3760	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3761	);
		3762
		3763	cf::face::set
		3764	"res/spell_paths" => FT_RSRC,
		3765	JSON::XS->new->utf8->canonical->encode (
		3766	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3767	);
3506	}	3768	}
3507		3769
3508	sub reload_treasures {	3770	sub reload_treasures {
3509	load_resource_file "$DATADIR/treasures"	3771	load_resource_file "$DATADIR/treasures"
3510	or die "unable to load treasurelists\n";	3772	or die "unable to load treasurelists\n";
3511	}	3773	}
3512		3774
		3775	sub reload_sound {
		3776	trace "loading sound config from $DATADIR/sound\n";
		3777
		3778	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
		3779
		3780	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3781	my $sound = $soundconf->{compat}[$_]
		3782	or next;
		3783
		3784	my $face = cf::face::find "sound/$sound->[1]";
		3785	cf::sound::set $sound->[0] => $face;
		3786	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3787	}
		3788
		3789	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3790	my $face = cf::face::find "sound/$v";
		3791	cf::sound::set $k => $face;
		3792	}
		3793	}
		3794
3513	sub reload_resources {	3795	sub reload_resources {
3514	warn "reloading resource files...\n";	3796	trace "reloading resource files...\n";
3515		3797
		3798	reload_materials;
3516	reload_facedata;	3799	reload_facedata;
		3800	reload_exp_table;
		3801	reload_sound;
3517	reload_archetypes;	3802	reload_archetypes;
3518	reload_regions;	3803	reload_regions;
3519	reload_treasures;	3804	reload_treasures;
3520		3805
3521	warn "finished reloading resource files\n";	3806	trace "finished reloading resource files\n";
3522	}	3807	}
3523		3808
3524	sub reload_config {	3809	sub reload_config {
3525	warn "reloading config file...\n";	3810	trace "reloading config file...\n";
3526		3811
3527	open my $fh, "<:utf8", "$CONFDIR/config"	3812	my $config = load_file "$CONFDIR/config";
3528	or return;	3813	utf8::decode $config;
3529		3814	*CFG = decode_yaml $config;
3530	local $/;
3531	*CFG = YAML::XS::Load scalar <$fh>;
3532		3815
3533	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];	3816	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3534		3817
3535	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3818	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3536	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3819	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
3540	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3823	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3541	and die "WARNING: m(un)lockall failed: $!\n";	3824	and die "WARNING: m(un)lockall failed: $!\n";
3542	};	3825	};
3543	warn $@ if $@;	3826	warn $@ if $@;
3544	}	3827	}
3545
3546	warn "finished reloading resource files\n";
3547	}	3828	}
3548		3829
3549	sub pidfile() {	3830	sub pidfile() {
3550	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3831	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3551	or die "$PIDFILE: $!";	3832	or die "$PIDFILE: $!";
…		…
3564	seek $fh, 0, 0;	3845	seek $fh, 0, 0;
3565	print $fh $$;	3846	print $fh $$;
3566	}	3847	}
3567		3848
3568	sub main_loop {	3849	sub main_loop {
3569	warn "EV::loop starting\n";	3850	trace "EV::loop starting\n";
3570	if (1) {	3851	if (1) {
3571	EV::loop;	3852	EV::loop;
3572	}	3853	}
3573	warn "EV::loop returned\n";	3854	trace "EV::loop returned\n";
3574	goto &main_loop unless $REALLY_UNLOOP;	3855	goto &main_loop unless $REALLY_UNLOOP;
3575	}	3856	}
3576		3857
3577	sub main {	3858	sub main {
3578	cf::init_globals; # initialise logging	3859	cf::init_globals; # initialise logging
3579		3860
3580	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3861	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3581	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3862	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3582	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3863	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3583	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3864	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3584		3865
3585	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3866	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3586		3867
3587	# we must not ever block the main coroutine	3868	# we must not ever block the main coroutine
3588	local $Coro::idle = sub {	3869	$Coro::idle = sub {
3589	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3870	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3590	(async {	3871	(async {
3591	$Coro::current->{desc} = "IDLE BUG HANDLER";	3872	$Coro::current->{desc} = "IDLE BUG HANDLER";
3592	EV::loop EV::LOOP_ONESHOT;	3873	EV::loop EV::LOOP_ONESHOT;
3593	})->prio (Coro::PRIO_MAX);	3874	})->prio (Coro::PRIO_MAX);
3594	};	3875	};
3595		3876
3596	evthread_start IO::AIO::poll_fileno;	3877	evthread_start IO::AIO::poll_fileno;
3597		3878
3598	cf::sync_job {	3879	cf::sync_job {
3599	cf::init_experience;	3880	cf::incloader::init ();
		3881
		3882	db_init;
		3883
3600	cf::init_anim;	3884	cf::init_anim;
3601	cf::init_attackmess;	3885	cf::init_attackmess;
3602	cf::init_dynamic;	3886	cf::init_dynamic;
3603		3887
3604	cf::load_settings;	3888	cf::load_settings;
3605	cf::load_materials;
3606		3889
3607	reload_resources;	3890	reload_resources;
3608	reload_config;	3891	reload_config;
3609	db_init;
3610		3892
3611	cf::init_uuid;	3893	cf::init_uuid;
3612	cf::init_signals;	3894	cf::init_signals;
3613	cf::init_skills;	3895	cf::init_skills;
3614		3896
…		…
3622		3904
3623	# no (long-running) fork's whatsoever before this point(!)	3905	# no (long-running) fork's whatsoever before this point(!)
3624	use POSIX ();	3906	use POSIX ();
3625	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3907	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3626		3908
3627	(pop @POST_INIT)->(0) while @POST_INIT;	3909	cf::_post_init 0;
3628	};	3910	};
3629		3911
3630	cf::object::thawer::errors_are_fatal 0;	3912	cf::object::thawer::errors_are_fatal 0;
3631	warn "parse errors in files are no longer fatal from this point on.\n";	3913	info "parse errors in files are no longer fatal from this point on.\n";
3632		3914
		3915	AE::postpone {
		3916	undef &main; # free gobs of memory :)
		3917	};
		3918
3633	main_loop;	3919	goto &main_loop;
3634	}	3920	}
3635		3921
3636	#############################################################################	3922	#############################################################################
3637	# initialisation and cleanup	3923	# initialisation and cleanup
3638		3924
…		…
3677	or return;	3963	or return;
3678		3964
3679	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3965	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3680	and return;	3966	and return;
3681		3967
3682	warn sprintf "runtime file written (%gs).\n", AE::time - $t0;	3968	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3683		3969
3684	1	3970	1
3685	}	3971	}
3686		3972
3687	our $uuid_lock;	3973	our $uuid_lock;
…		…
3699	or return;	3985	or return;
3700		3986
3701	my $value = uuid_seq uuid_cur;	3987	my $value = uuid_seq uuid_cur;
3702		3988
3703	unless ($value) {	3989	unless ($value) {
3704	warn "cowardly refusing to write zero uuid value!\n";	3990	info "cowardly refusing to write zero uuid value!\n";
3705	return;	3991	return;
3706	}	3992	}
3707		3993
3708	my $value = uuid_str $value + $uuid_skip;	3994	my $value = uuid_str $value + $uuid_skip;
3709	$uuid_skip = 0;	3995	$uuid_skip = 0;
…		…
3719	or return;	4005	or return;
3720		4006
3721	aio_rename "$uuid~", $uuid	4007	aio_rename "$uuid~", $uuid
3722	and return;	4008	and return;
3723		4009
3724	warn "uuid file written ($value).\n";	4010	trace "uuid file written ($value).\n";
3725		4011
3726	1	4012	1
3727		4013
3728	}	4014	}
3729		4015
…		…
3735	}	4021	}
3736		4022
3737	sub emergency_save() {	4023	sub emergency_save() {
3738	my $freeze_guard = cf::freeze_mainloop;	4024	my $freeze_guard = cf::freeze_mainloop;
3739		4025
3740	warn "emergency_perl_save: enter\n";	4026	info "emergency_perl_save: enter\n";
		4027
		4028	# this is a trade-off: we want to be very quick here, so
		4029	# save all maps without fsync, and later call a global sync
		4030	# (which in turn might be very very slow)
		4031	local $USE_FSYNC = 0;
3741		4032
3742	cf::sync_job {	4033	cf::sync_job {
3743	# this is a trade-off: we want to be very quick here, so	4034	cf::write_runtime_sync; # external watchdog should not bark
3744	# save all maps without fsync, and later call a global sync
3745	# (which in turn might be very very slow)
3746	local $USE_FSYNC = 0;
3747		4035
3748	# use a peculiar iteration method to avoid tripping on perl	4036	# use a peculiar iteration method to avoid tripping on perl
3749	# refcount bugs in for. also avoids problems with players	4037	# refcount bugs in for. also avoids problems with players
3750	# and maps saved/destroyed asynchronously.	4038	# and maps saved/destroyed asynchronously.
3751	warn "emergency_perl_save: begin player save\n";	4039	info "emergency_perl_save: begin player save\n";
3752	for my $login (keys %cf::PLAYER) {	4040	for my $login (keys %cf::PLAYER) {
3753	my $pl = $cf::PLAYER{$login} or next;	4041	my $pl = $cf::PLAYER{$login} or next;
3754	$pl->valid or next;	4042	$pl->valid or next;
3755	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	4043	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3756	$pl->save;	4044	$pl->save;
3757	}	4045	}
3758	warn "emergency_perl_save: end player save\n";	4046	info "emergency_perl_save: end player save\n";
3759		4047
		4048	cf::write_runtime_sync; # external watchdog should not bark
		4049
3760	warn "emergency_perl_save: begin map save\n";	4050	info "emergency_perl_save: begin map save\n";
3761	for my $path (keys %cf::MAP) {	4051	for my $path (keys %cf::MAP) {
3762	my $map = $cf::MAP{$path} or next;	4052	my $map = $cf::MAP{$path} or next;
3763	$map->valid or next;	4053	$map->valid or next;
3764	$map->save;	4054	$map->save;
3765	}	4055	}
3766	warn "emergency_perl_save: end map save\n";	4056	info "emergency_perl_save: end map save\n";
3767		4057
		4058	cf::write_runtime_sync; # external watchdog should not bark
		4059
3768	warn "emergency_perl_save: begin database checkpoint\n";	4060	info "emergency_perl_save: begin database checkpoint\n";
3769	BDB::db_env_txn_checkpoint $DB_ENV;	4061	BDB::db_env_txn_checkpoint $DB_ENV;
3770	warn "emergency_perl_save: end database checkpoint\n";	4062	info "emergency_perl_save: end database checkpoint\n";
3771		4063
3772	warn "emergency_perl_save: begin write uuid\n";	4064	info "emergency_perl_save: begin write uuid\n";
3773	write_uuid_sync 1;	4065	write_uuid_sync 1;
3774	warn "emergency_perl_save: end write uuid\n";	4066	info "emergency_perl_save: end write uuid\n";
		4067
		4068	cf::write_runtime_sync; # external watchdog should not bark
		4069
		4070	trace "emergency_perl_save: syncing database to disk";
		4071	BDB::db_env_txn_checkpoint $DB_ENV;
		4072
		4073	info "emergency_perl_save: starting sync\n";
		4074	IO::AIO::aio_sync sub {
		4075	info "emergency_perl_save: finished sync\n";
		4076	};
		4077
		4078	cf::write_runtime_sync; # external watchdog should not bark
		4079
		4080	trace "emergency_perl_save: flushing outstanding aio requests";
		4081	while (IO::AIO::nreqs || BDB::nreqs) {
		4082	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
		4083	}
		4084
		4085	cf::write_runtime_sync; # external watchdog should not bark
3775	};	4086	};
3776		4087
3777	warn "emergency_perl_save: starting sync()\n";
3778	IO::AIO::aio_sync sub {
3779	warn "emergency_perl_save: finished sync()\n";
3780	};
3781
3782	warn "emergency_perl_save: leave\n";	4088	info "emergency_perl_save: leave\n";
3783	}	4089	}
3784		4090
3785	sub post_cleanup {	4091	sub post_cleanup {
3786	my ($make_core) = @_;	4092	my ($make_core) = @_;
3787		4093
		4094	IO::AIO::flush;
		4095
3788	warn Carp::longmess "post_cleanup backtrace"	4096	error Carp::longmess "post_cleanup backtrace"
3789	if $make_core;	4097	if $make_core;
3790		4098
3791	my $fh = pidfile;	4099	my $fh = pidfile;
3792	unlink $PIDFILE if <$fh> == $$;	4100	unlink $PIDFILE if <$fh> == $$;
3793	}	4101	}
…		…
3817	}	4125	}
3818	}	4126	}
3819		4127
3820	sub do_reload_perl() {	4128	sub do_reload_perl() {
3821	# can/must only be called in main	4129	# can/must only be called in main
3822	if (in_main) {	4130	unless (in_main) {
3823	warn "can only reload from main coroutine";	4131	error "can only reload from main coroutine";
3824	return;	4132	return;
3825	}	4133	}
3826		4134
3827	return if $RELOAD++;	4135	return if $RELOAD++;
3828		4136
3829	my $t1 = AE::time;	4137	my $t1 = AE::time;
3830		4138
3831	while ($RELOAD) {	4139	while ($RELOAD) {
3832	warn "reloading...";	4140	cf::get_slot 0.1, -1, "reload_perl";
		4141	info "perl_reload: reloading...";
3833		4142
3834	warn "entering sync_job";	4143	trace "perl_reload: entering sync_job";
3835		4144
3836	cf::sync_job {	4145	cf::sync_job {
3837	cf::write_runtime_sync; # external watchdog should not bark
3838	cf::emergency_save;	4146	#cf::emergency_save;
3839	cf::write_runtime_sync; # external watchdog should not bark
3840		4147
3841	warn "syncing database to disk";
3842	BDB::db_env_txn_checkpoint $DB_ENV;
3843
3844	# if anything goes wrong in here, we should simply crash as we already saved
3845
3846	warn "flushing outstanding aio requests";
3847	while (IO::AIO::nreqs || BDB::nreqs) {
3848	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3849	}
3850
3851	warn "cancelling all extension coros";	4148	trace "perl_reload: cancelling all extension coros";
3852	$_->cancel for values %EXT_CORO;	4149	$_->cancel for values %EXT_CORO;
3853	%EXT_CORO = ();	4150	%EXT_CORO = ();
3854		4151
3855	warn "removing commands";	4152	trace "perl_reload: removing commands";
3856	%COMMAND = ();	4153	%COMMAND = ();
3857		4154
3858	warn "removing ext/exti commands";	4155	trace "perl_reload: removing ext/exti commands";
3859	%EXTCMD = ();	4156	%EXTCMD = ();
3860	%EXTICMD = ();	4157	%EXTICMD = ();
3861		4158
3862	warn "unloading/nuking all extensions";	4159	trace "perl_reload: unloading/nuking all extensions";
3863	for my $pkg (@EXTS) {	4160	for my $pkg (@EXTS) {
3864	warn "... unloading $pkg";	4161	trace "... unloading $pkg";
3865		4162
3866	if (my $cb = $pkg->can ("unload")) {	4163	if (my $cb = $pkg->can ("unload")) {
3867	eval {	4164	eval {
3868	$cb->($pkg);	4165	$cb->($pkg);
3869	1	4166	1
3870	} or warn "$pkg unloaded, but with errors: $@";	4167	} or error "$pkg unloaded, but with errors: $@";
3871	}	4168	}
3872		4169
3873	warn "... clearing $pkg";	4170	trace "... clearing $pkg";
3874	clear_package $pkg;	4171	clear_package $pkg;
3875	}	4172	}
3876		4173
3877	warn "unloading all perl modules loaded from $LIBDIR";	4174	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3878	while (my ($k, $v) = each %INC) {	4175	while (my ($k, $v) = each %INC) {
3879	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4176	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3880		4177
3881	warn "... unloading $k";	4178	trace "... unloading $k";
3882	delete $INC{$k};	4179	delete $INC{$k};
3883		4180
3884	$k =~ s/\.pm$//;	4181	$k =~ s/\.pm$//;
3885	$k =~ s/\//::/g;	4182	$k =~ s/\//::/g;
3886		4183
…		…
3889	}	4186	}
3890		4187
3891	clear_package $k;	4188	clear_package $k;
3892	}	4189	}
3893		4190
3894	warn "getting rid of safe::, as good as possible";	4191	trace "perl_reload: getting rid of safe::, as good as possible";
3895	clear_package "safe::$_"	4192	clear_package "safe::$_"
3896	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4193	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3897		4194
3898	warn "unloading cf.pm \"a bit\"";	4195	trace "perl_reload: unloading cf.pm \"a bit\"";
3899	delete $INC{"cf.pm"};	4196	delete $INC{"cf.pm"};
3900	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4197	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3901		4198
3902	# don't, removes xs symbols, too,	4199	# don't, removes xs symbols, too,
3903	# and global variables created in xs	4200	# and global variables created in xs
3904	#clear_package __PACKAGE__;	4201	#clear_package __PACKAGE__;
3905		4202
3906	warn "unload completed, starting to reload now";	4203	info "perl_reload: unload completed, starting to reload now";
3907		4204
3908	warn "reloading cf.pm";	4205	trace "perl_reload: reloading cf.pm";
3909	require cf;	4206	require cf;
3910	cf::_connect_to_perl_1;	4207	cf::_connect_to_perl_1;
3911		4208
3912	warn "loading config and database again";	4209	trace "perl_reload: loading config and database again";
3913	cf::reload_config;	4210	cf::reload_config;
3914		4211
3915	warn "loading extensions";	4212	trace "perl_reload: loading extensions";
3916	cf::load_extensions;	4213	cf::load_extensions;
3917		4214
3918	if ($REATTACH_ON_RELOAD) {	4215	if ($REATTACH_ON_RELOAD) {
3919	warn "reattaching attachments to objects/players";	4216	trace "perl_reload: reattaching attachments to objects/players";
3920	_global_reattach; # objects, sockets	4217	_global_reattach; # objects, sockets
3921	warn "reattaching attachments to maps";	4218	trace "perl_reload: reattaching attachments to maps";
3922	reattach $_ for values %MAP;	4219	reattach $_ for values %MAP;
3923	warn "reattaching attachments to players";	4220	trace "perl_reload: reattaching attachments to players";
3924	reattach $_ for values %PLAYER;	4221	reattach $_ for values %PLAYER;
3925	}	4222	}
3926		4223
3927	warn "running post_init jobs";	4224	cf::_post_init 1;
3928	(pop @POST_INIT)->(1) while @POST_INIT;
3929		4225
3930	warn "leaving sync_job";	4226	trace "perl_reload: leaving sync_job";
3931		4227
3932	1	4228	1
3933	} or do {	4229	} or do {
3934	warn $@;	4230	error $@;
3935	cf::cleanup "error while reloading, exiting.";	4231	cf::cleanup "perl_reload: error, exiting.";
3936	};	4232	};
3937		4233
3938	warn "reloaded";
3939	--$RELOAD;	4234	--$RELOAD;
3940	}	4235	}
3941		4236
3942	$t1 = AE::time - $t1;	4237	$t1 = AE::time - $t1;
3943	warn "reload completed in ${t1}s\n";	4238	info "perl_reload: completed in ${t1}s\n";
3944	};	4239	};
3945		4240
3946	our $RELOAD_WATCHER; # used only during reload	4241	our $RELOAD_WATCHER; # used only during reload
3947		4242
3948	sub reload_perl() {	4243	sub reload_perl() {
…		…
3969	reload_perl;	4264	reload_perl;
3970	};	4265	};
3971	}	4266	}
3972	};	4267	};
3973		4268
3974	unshift @INC, $LIBDIR;	4269	#############################################################################
3975		4270
3976	my $bug_warning = 0;	4271	my $bug_warning = 0;
3977		4272
3978	our @WAIT_FOR_TICK;
3979	our @WAIT_FOR_TICK_BEGIN;
3980
3981	sub wait_for_tick {	4273	sub wait_for_tick() {
3982	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4274	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3983		4275
3984	my $signal = new Coro::Signal;	4276	$WAIT_FOR_TICK->wait;
3985	push @WAIT_FOR_TICK, $signal;
3986	$signal->wait;
3987	}	4277	}
3988		4278
3989	sub wait_for_tick_begin {	4279	sub wait_for_tick_begin() {
3990	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4280	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3991		4281
3992	my $signal = new Coro::Signal;	4282	my $signal = new Coro::Signal;
3993	push @WAIT_FOR_TICK_BEGIN, $signal;	4283	push @WAIT_FOR_TICK_BEGIN, $signal;
3994	$signal->wait;	4284	$signal->wait;
3995	}	4285	}
…		…
3999	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4289	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4000	unless ++$bug_warning > 10;	4290	unless ++$bug_warning > 10;
4001	return;	4291	return;
4002	}	4292	}
4003		4293
4004	cf::server_tick; # one server iteration	4294	cf::one_tick; # one server iteration
4005		4295
4006	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#	4296	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4007		4297
4008	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4298	if ($NOW >= $NEXT_RUNTIME_WRITE) {
4009	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4299	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
4010	Coro::async_pool {	4300	Coro::async_pool {
4011	$Coro::current->{desc} = "runtime saver";	4301	$Coro::current->{desc} = "runtime saver";
4012	write_runtime_sync	4302	write_runtime_sync
4013	or warn "ERROR: unable to write runtime file: $!";	4303	or error "ERROR: unable to write runtime file: $!";
4014	};	4304	};
4015	}	4305	}
4016		4306
4017	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4307	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4018	$sig->send;	4308	$sig->send;
4019	}	4309	}
4020	while (my $sig = shift @WAIT_FOR_TICK) {	4310	$WAIT_FOR_TICK->broadcast;
4021	$sig->send;
4022	}
4023		4311
4024	$LOAD = ($NOW - $TICK_START) / $TICK;	4312	$LOAD = ($NOW - $TICK_START) / $TICK;
4025	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4313	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4026		4314
4027	if (0) {	4315	if (0) {
4028	if ($NEXT_TICK) {	4316	if ($NEXT_TICK) {
4029	my $jitter = $TICK_START - $NEXT_TICK;	4317	my $jitter = $TICK_START - $NEXT_TICK;
4030	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4318	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
4031	warn "jitter $JITTER\n";#d#	4319	debug "jitter $JITTER\n";#d#
4032	}	4320	}
4033	}	4321	}
4034	}	4322	}
4035		4323
4036	{	4324	{
4037	# configure BDB	4325	# configure BDB
		4326	info "initialising database";
4038		4327
4039	BDB::min_parallel 16;	4328	BDB::min_parallel 16;
4040	BDB::max_poll_reqs $TICK * 0.1;	4329	BDB::max_poll_reqs $TICK * 0.1;
4041	$AnyEvent::BDB::WATCHER->priority (1);	4330	#$AnyEvent::BDB::WATCHER->priority (1);
4042		4331
4043	unless ($DB_ENV) {	4332	unless ($DB_ENV) {
4044	$DB_ENV = BDB::db_env_create;	4333	$DB_ENV = BDB::db_env_create;
4045	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4334	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4046	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4335	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
4071	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4360	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4072	};	4361	};
4073	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4362	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4074	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4363	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4075	};	4364	};
		4365
		4366	info "database initialised";
4076	}	4367	}
4077		4368
4078	{	4369	{
4079	# configure IO::AIO	4370	# configure IO::AIO
4080		4371
		4372	info "initialising aio";
4081	IO::AIO::min_parallel 8;	4373	IO::AIO::min_parallel 8;
4082	IO::AIO::max_poll_time $TICK * 0.1;	4374	IO::AIO::max_poll_time $TICK * 0.1;
4083	undef $AnyEvent::AIO::WATCHER;	4375	undef $AnyEvent::AIO::WATCHER;
		4376	info "aio initialised";
4084	}	4377	}
4085		4378
4086	my $_log_backtrace;	4379	our $_log_backtrace;
		4380	our $_log_backtrace_last;
4087		4381
4088	sub _log_backtrace {	4382	sub _log_backtrace {
4089	my ($msg, @addr) = @_;	4383	my ($msg, @addr) = @_;
4090		4384
4091	$msg =~ s/\n//;	4385	$msg =~ s/\n$//;
4092		4386
		4387	if ($_log_backtrace_last eq $msg) {
		4388	LOG llevInfo, "[ABT] $msg\n";
		4389	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4093	# limit the # of concurrent backtraces	4390	# limit the # of concurrent backtraces
4094	if ($_log_backtrace < 2) {	4391	} elsif ($_log_backtrace < 2) {
		4392	$_log_backtrace_last = $msg;
4095	++$_log_backtrace;	4393	++$_log_backtrace;
4096	my $perl_bt = Carp::longmess $msg;	4394	my $perl_bt = Carp::longmess $msg;
4097	async {	4395	async {
4098	$Coro::current->{desc} = "abt $msg";	4396	$Coro::current->{desc} = "abt $msg";
4099		4397
…		…
4119	LOG llevInfo, "[ABT] $_\n" for @bt;	4417	LOG llevInfo, "[ABT] $_\n" for @bt;
4120	--$_log_backtrace;	4418	--$_log_backtrace;
4121	};	4419	};
4122	} else {	4420	} else {
4123	LOG llevInfo, "[ABT] $msg\n";	4421	LOG llevInfo, "[ABT] $msg\n";
4124	LOG llevInfo, "[ABT] [suppressed]\n";	4422	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4125	}	4423	}
4126	}	4424	}
4127		4425
4128	# load additional modules	4426	# load additional modules
4129	require "cf/$_.pm" for @EXTRA_MODULES;	4427	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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