ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.529 by root, Wed Apr 28 11:28:22 2010 UTC vs.
Revision 1.602 by root, Sun Nov 11 18:21:21 2012 UTC

1	#	1	#
2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	#	3	#
4	# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	#	5	#
6	# Deliantra is free software: you can redistribute it and/or modify it under	6	# Deliantra is free software: you can redistribute it and/or modify it under
7	# the terms of the Affero GNU General Public License as published by the	7	# the terms of the Affero GNU General Public License as published by the
8	# Free Software Foundation, either version 3 of the License, or (at your	8	# Free Software Foundation, either version 3 of the License, or (at your
9	# option) any later version.	9	# option) any later version.
10	#	10	#
11	# This program is distributed in the hope that it will be useful,	11	# This program is distributed in the hope that it will be useful,
12	# but WITHOUT ANY WARRANTY; without even the implied warranty of	12	# but WITHOUT ANY WARRANTY; without even the implied warranty of
13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14	# GNU General Public License for more details.	14	# GNU General Public License for more details.
15	#	15	#
16	# You should have received a copy of the Affero GNU General Public License	16	# You should have received a copy of the Affero GNU General Public License
17	# and the GNU General Public License along with this program. If not, see	17	# and the GNU General Public License along with this program. If not, see
18	# <http://www.gnu.org/licenses/>.	18	# <http://www.gnu.org/licenses/>.
19	#	19	#
20	# The authors can be reached via e-mail to <support@deliantra.net>	20	# The authors can be reached via e-mail to <support@deliantra.net>
21	#	21	#
22		22
23	package cf;	23	package cf;
24		24
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 les 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,	744	# we seemingly have to make a local copy of the whole thing,
590	# otherwise perl prematurely frees the stuff :/	745	# otherwise perl prematurely frees the stuff :/
591	# TODO: investigate and fix (likely this will be rather laborious)	746	# TODO: investigate and fix (likely this will be rather laborious)
592		747
593	my @res = Coro::Util::fork_eval {	748	my @res = Coro::Util::fork_eval {
594	reset_signals;	749	cf::post_fork;
595	&$cb	750	&$cb
596	}, @args;	751	} @args;
597		752
598	wantarray ? @res : $res[-1]	753	wantarray ? @res : $res[-1]
599	}	754	}
600		755
601	sub objinfo {	756	sub objinfo {
…		…
651	within each server.	806	within each server.
652		807
653	=cut	808	=cut
654		809
655	sub db_table($) {	810	sub db_table($) {
		811	cf::error "db_get called from main context"
		812	if $Coro::current == $Coro::main;
		813
656	my ($name) = @_;	814	my ($name) = @_;
657	my $db = BDB::db_create $DB_ENV;	815	my $db = BDB::db_create $DB_ENV;
658		816
659	eval {	817	eval {
660	$db->set_flags (BDB::CHKSUM);	818	$db->set_flags (BDB::CHKSUM);
…		…
670	}	828	}
671		829
672	our $DB;	830	our $DB;
673		831
674	sub db_init {	832	sub db_init {
675	cf::sync_job {
676	$DB ||= db_table "db";	833	$DB ||= db_table "db";
677	};
678	}	834	}
679		835
680	sub db_get($$) {	836	sub db_get($$) {
681	my $key = "$_[0]/$_[1]";	837	my $key = "$_[0]/$_[1]";
682		838
683	cf::sync_job {	839	cf::error "db_get called from main context"
		840	if $Coro::current == $Coro::main;
		841
684	BDB::db_get $DB, undef, $key, my $data;	842	BDB::db_get $DB, undef, $key, my $data;
685		843
686	$! ? ()	844	$! ? ()
687	: $data	845	: $data
688	}
689	}	846	}
690		847
691	sub db_put($$$) {	848	sub db_put($$$) {
692	BDB::dbreq_pri 4;	849	BDB::dbreq_pri 4;
693	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	850	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
721		878
722	my @data;	879	my @data;
723	my $md5;	880	my $md5;
724		881
725	for (0 .. $#$src) {	882	for (0 .. $#$src) {
726	0 <= aio_load $src->[$_], $data[$_]	883	$data[$_] = load_file $src->[$_];
727	or Carp::croak "$src->[$_]: $!";
728	}	884	}
729		885
730	# if processing is expensive, check	886	# if processing is expensive, check
731	# checksum first	887	# checksum first
732	if (1) {	888	if (1) {
…		…
745		901
746	return db_get cache => "$id/data";	902	return db_get cache => "$id/data";
747	}	903	}
748	}	904	}
749		905
750	my $t1 = Time::HiRes::time;	906	my $t1 = EV::time;
751	my $data = $process->(\@data);	907	my $data = $process->(\@data);
752	my $t2 = Time::HiRes::time;	908	my $t2 = EV::time;
753		909
754	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	910	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
755		911
756	db_put cache => "$id/data", $data;	912	db_put cache => "$id/data", $data;
757	db_put cache => "$id/md5" , $md5;	913	db_put cache => "$id/md5" , $md5;
758	db_put cache => "$id/meta", $meta;	914	db_put cache => "$id/meta", $meta;
759		915
…		…
769		925
770	=cut	926	=cut
771		927
772	sub datalog($@) {	928	sub datalog($@) {
773	my ($type, %kv) = @_;	929	my ($type, %kv) = @_;
774	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	930	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
775	}	931	}
776		932
777	=back	933	=back
778		934
779	=cut	935	=cut
…		…
974		1130
975	} elsif (exists $cb_id{$type}) {	1131	} elsif (exists $cb_id{$type}) {
976	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	1132	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
977		1133
978	} elsif (ref $type) {	1134	} elsif (ref $type) {
979	warn "attaching objects not supported, ignoring.\n";	1135	error "attaching objects not supported, ignoring.\n";
980		1136
981	} else {	1137	} else {
982	shift @arg;	1138	shift @arg;
983	warn "attach argument '$type' not supported, ignoring.\n";	1139	error "attach argument '$type' not supported, ignoring.\n";
984	}	1140	}
985	}	1141	}
986	}	1142	}
987		1143
988	sub _object_attach {	1144	sub _object_attach {
…		…
998	_attach $registry, $klass, @attach;	1154	_attach $registry, $klass, @attach;
999	}	1155	}
1000		1156
1001	$obj->{$name} = \%arg;	1157	$obj->{$name} = \%arg;
1002	} else {	1158	} else {
1003	warn "object uses attachment '$name' which is not available, postponing.\n";	1159	info "object uses attachment '$name' which is not available, postponing.\n";
1004	}	1160	}
1005		1161
1006	$obj->{_attachment}{$name} = undef;	1162	$obj->{_attachment}{$name} = undef;
1007	}	1163	}
1008		1164
…		…
1067		1223
1068	for (@$callbacks) {	1224	for (@$callbacks) {
1069	eval { &{$_->[1]} };	1225	eval { &{$_->[1]} };
1070		1226
1071	if ($@) {	1227	if ($@) {
1072	warn "$@";
1073	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1228	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1074	override;	1229	override;
1075	}	1230	}
1076		1231
1077	return 1 if $override;	1232	return 1 if $override;
1078	}	1233	}
…		…
1157	for (@$attach) {	1312	for (@$attach) {
1158	my ($klass, @attach) = @$_;	1313	my ($klass, @attach) = @$_;
1159	_attach $registry, $klass, @attach;	1314	_attach $registry, $klass, @attach;
1160	}	1315	}
1161	} else {	1316	} else {
1162	warn "object uses attachment '$name' that is not available, postponing.\n";	1317	info "object uses attachment '$name' that is not available, postponing.\n";
1163	}	1318	}
1164	}	1319	}
1165	}	1320	}
1166		1321
1167	cf::attachable->attach (	1322	cf::attachable->attach (
…		…
1194	my ($filename, $rdata, $objs) = @_;	1349	my ($filename, $rdata, $objs) = @_;
1195		1350
1196	sync_job {	1351	sync_job {
1197	if (length $$rdata) {	1352	if (length $$rdata) {
1198	utf8::decode (my $decname = $filename);	1353	utf8::decode (my $decname = $filename);
1199	warn sprintf "saving %s (%d,%d)\n",	1354	trace sprintf "saving %s (%d,%d)\n",
1200	$decname, length $$rdata, scalar @$objs	1355	$decname, length $$rdata, scalar @$objs
1201	if $VERBOSE_IO;	1356	if $VERBOSE_IO;
1202		1357
1203	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1358	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1204	aio_chmod $fh, SAVE_MODE;	1359	aio_chmod $fh, SAVE_MODE;
1205	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1360	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
…		…
1228	aio_rename "$filename~", $filename;	1383	aio_rename "$filename~", $filename;
1229		1384
1230	$filename =~ s%/[^/]+$%%;	1385	$filename =~ s%/[^/]+$%%;
1231	aio_pathsync $filename if $cf::USE_FSYNC;	1386	aio_pathsync $filename if $cf::USE_FSYNC;
1232	} else {	1387	} else {
1233	warn "unable to save objects: $filename~: $!\n";	1388	error "unable to save objects: $filename~: $!\n";
1234	}	1389	}
1235	} else {	1390	} else {
1236	aio_unlink $filename;	1391	aio_unlink $filename;
1237	aio_unlink "$filename.pst";	1392	aio_unlink "$filename.pst";
1238	}	1393	}
…		…
1262	my $st = eval { Coro::Storable::thaw $av };	1417	my $st = eval { Coro::Storable::thaw $av };
1263	$av = $st->{objs};	1418	$av = $st->{objs};
1264	}	1419	}
1265		1420
1266	utf8::decode (my $decname = $filename);	1421	utf8::decode (my $decname = $filename);
1267	warn sprintf "loading %s (%d,%d)\n",	1422	trace sprintf "loading %s (%d,%d)\n",
1268	$decname, length $data, scalar @{$av || []}	1423	$decname, length $data, scalar @{$av || []}
1269	if $VERBOSE_IO;	1424	if $VERBOSE_IO;
1270		1425
1271	($data, $av)	1426	($data, $av)
1272	}	1427	}
1273		1428
…		…
1278	=cut	1433	=cut
1279		1434
1280	#############################################################################	1435	#############################################################################
1281	# command handling &c	1436	# command handling &c
1282		1437
1283	=item cf::register_command $name => \&callback($ob,$args);	1438	=item cf::register_command $name => \&callback($ob,$args)
1284		1439
1285	Register a callback for execution when the client sends the user command	1440	Register a callback for execution when the client sends the user command
1286	$name.	1441	$name.
1287		1442
1288	=cut	1443	=cut
…		…
1294	#warn "registering command '$name/$time' to '$caller'";	1449	#warn "registering command '$name/$time' to '$caller'";
1295		1450
1296	push @{ $COMMAND{$name} }, [$caller, $cb];	1451	push @{ $COMMAND{$name} }, [$caller, $cb];
1297	}	1452	}
1298		1453
1299	=item cf::register_extcmd $name => \&callback($pl,$packet);	1454	=item cf::register_extcmd $name => \&callback($pl,@args)
1300		1455
1301	Register a callback for execution when the client sends an (synchronous)	1456	Register a callback for execution when the client sends an (synchronous)
1302	extcmd packet. Ext commands will be processed in the order they are	1457	extcmd packet. Ext commands will be processed in the order they are
1303	received by the server, like other user commands. The first argument is	1458	received by the server, like other user commands. The first argument is
1304	the logged-in player. Ext commands can only be processed after a player	1459	the logged-in player. Ext commands can only be processed after a player
1305	has logged in successfully.	1460	has logged in successfully.
1306		1461
1307	If the callback returns something, it is sent back as if reply was being	1462	The values will be sent back to the client.
1308	called.
1309		1463
		1464	=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
		1465
		1466	Same as C<cf::register_extcmd>, but instead of returning values, the
		1467	callback needs to clal the C<$reply> function.
		1468
1310	=item cf::register_exticmd $name => \&callback($ns,$packet);	1469	=item cf::register_exticmd $name => \&callback($ns,@args)
1311		1470
1312	Register a callback for execution when the client sends an (asynchronous)	1471	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	1472	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	1473	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	1474	is a client socket. Exti commands can be received anytime, even before
1316	log-in.	1475	log-in.
1317		1476
1318	If the callback returns something, it is sent back as if reply was being	1477	The values will be sent back to the client.
1319	called.
1320		1478
1321	=cut	1479	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1322		1480
		1481	Same as C<cf::register_extcmd>, but instead of returning values, the
		1482	callback needs to clal the C<$reply> function.
		1483
		1484	=cut
		1485
1323	sub register_extcmd {	1486	sub register_extcmd($$) {
1324	my ($name, $cb) = @_;	1487	my ($name, $cb) = @_;
1325		1488
1326	$EXTCMD{$name} = $cb;	1489	$EXTCMD{$name} = $cb;
1327	}	1490	}
1328		1491
1329	sub register_exticmd {	1492	sub register_async_extcmd($$) {
1330	my ($name, $cb) = @_;	1493	my ($name, $cb) = @_;
1331		1494
		1495	$EXTACMD{$name} = $cb;
		1496	}
		1497
		1498	sub register_exticmd($$) {
		1499	my ($name, $cb) = @_;
		1500
1332	$EXTICMD{$name} = $cb;	1501	$EXTICMD{$name} = $cb;
		1502	}
		1503
		1504	sub register_async_exticmd($$) {
		1505	my ($name, $cb) = @_;
		1506
		1507	$EXTIACMD{$name} = $cb;
1333	}	1508	}
1334		1509
1335	use File::Glob ();	1510	use File::Glob ();
1336		1511
1337	cf::player->attach (	1512	cf::player->attach (
…		…
1351	my ($pl, $buf) = @_;	1526	my ($pl, $buf) = @_;
1352		1527
1353	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1528	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1354		1529
1355	if (ref $msg) {	1530	if (ref $msg) {
1356	my ($type, $reply, @payload) =	1531	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		1532
1361	my @reply;
1362
1363	if (my $cb = $EXTCMD{$type}) {	1533	if (my $cb = $EXTACMD{$type}) {
		1534	$cb->(
		1535	$pl,
		1536	sub {
		1537	$pl->ext_msg ("reply-$reply", @_)
		1538	if $reply;
		1539	},
		1540	@payload
		1541	);
		1542	} else {
		1543	my @reply;
		1544
		1545	if (my $cb = $EXTCMD{$type}) {
1364	@reply = $cb->($pl, @payload);	1546	@reply = $cb->($pl, @payload);
		1547	}
		1548
		1549	$pl->ext_msg ("reply-$reply", @reply)
		1550	if $reply;
1365	}	1551	}
1366		1552
1367	$pl->ext_reply ($reply, @reply)
1368	if $reply;
1369
1370	} else {	1553	} else {
1371	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1554	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1372	}	1555	}
1373		1556
1374	cf::override;	1557	cf::override;
1375	},	1558	},
1376	);	1559	);
…		…
1386	};	1569	};
1387		1570
1388	$grp	1571	$grp
1389	}	1572	}
1390		1573
		1574	sub _ext_cfg_reg($$$$) {
		1575	my ($rvar, $varname, $cfgname, $default) = @_;
		1576
		1577	$cfgname = lc $varname
		1578	unless length $cfgname;
		1579
		1580	$EXT_CFG{$cfgname} = [$rvar, $default];
		1581
		1582	$$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
		1583	}
		1584
1391	sub load_extensions {	1585	sub load_extensions {
		1586	info "loading extensions...";
		1587
		1588	%EXT_CFG = ();
		1589
1392	cf::sync_job {	1590	cf::sync_job {
1393	my %todo;	1591	my %todo;
1394		1592
1395	for my $path (<$LIBDIR/*.ext>) {	1593	for my $path (<$LIBDIR/*.ext>) {
1396	next unless -r $path;	1594	next unless -r $path;
…		…
1414		1612
1415	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1613	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1416	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1614	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1417		1615
1418	$ext{source} =	1616	$ext{source} =
1419	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1617	"package $pkg; use common::sense;\n"
1420	. "#line 1 \"$path\"\n{\n"	1618	. "#line 1 \"$path\"\n{\n"
1421	. $source	1619	. $source
1422	. "\n};\n1";	1620	. "\n};\n1";
1423		1621
1424	$todo{$base} = \%ext;	1622	$todo{$base} = \%ext;
…		…
1436	for (split /,\s*/, $v->{meta}{depends}) {	1634	for (split /,\s*/, $v->{meta}{depends}) {
1437	next ext	1635	next ext
1438	unless exists $done{$_};	1636	unless exists $done{$_};
1439	}	1637	}
1440		1638
1441	warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1639	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1442		1640
		1641	my $source = $v->{source};
		1642
		1643	# support "CONF varname :confname = default" pseudo-statements
		1644	$source =~ s{
		1645	^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
		1646	}{
		1647	"our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
		1648	}gmxe;
		1649
1443	my $active = eval $v->{source};	1650	my $active = eval $source;
1444		1651
1445	if (length $@) {	1652	if (length $@) {
1446	warn "$v->{path}: $@\n";	1653	error "$v->{path}: $@\n";
1447		1654
1448	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1655	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1449	if exists $v->{meta}{mandatory};	1656	if exists $v->{meta}{mandatory};
1450		1657
1451	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";	1658	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
…		…
1453	} else {	1660	} else {
1454	$done{$k} = delete $todo{$k};	1661	$done{$k} = delete $todo{$k};
1455	push @EXTS, $v->{pkg};	1662	push @EXTS, $v->{pkg};
1456	$progress = 1;	1663	$progress = 1;
1457		1664
1458	warn "$v->{base}: extension inactive.\n"	1665	info "$v->{base}: extension inactive.\n"
1459	unless $active;	1666	unless $active;
1460	}	1667	}
1461	}	1668	}
1462		1669
1463	unless ($progress) {	1670	unless ($progress) {
…		…
1465		1672
1466	while (my ($k, $v) = each %todo) {	1673	while (my ($k, $v) = each %todo) {
1467	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1674	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1468	if exists $v->{meta}{mandatory};	1675	if exists $v->{meta}{mandatory};
1469	}	1676	}
		1677
		1678	last;
1470	}	1679	}
1471	}	1680	}
1472	};	1681	};
1473	}	1682	}
1474		1683
…		…
1632	my $name = $pl->ob->name;	1841	my $name = $pl->ob->name;
1633		1842
1634	$pl->{deny_save} = 1;	1843	$pl->{deny_save} = 1;
1635	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1844	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1636		1845
1637	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1846	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1638	$pl->deactivate;	1847	$pl->deactivate;
		1848
1639	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1849	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1640	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1850	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1851	ext::highscore::check ($pl->ob);
		1852
1641	$pl->ns->destroy if $pl->ns;	1853	$pl->ns->destroy if $pl->ns;
1642		1854
1643	my $path = playerdir $pl;	1855	my $path = playerdir $pl;
1644	my $temp = "$path~$cf::RUNTIME~deleting~";	1856	my $temp = "$path~$cf::RUNTIME~deleting~";
1645	aio_rename $path, $temp;	1857	aio_rename $path, $temp;
…		…
1731		1943
1732	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1944	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1733		1945
1734	Expand deliantra pod fragments into protocol xml.	1946	Expand deliantra pod fragments into protocol xml.
1735		1947
1736	=item $player->ext_reply ($msgid, @msg)
1737
1738	Sends an ext reply to the player.
1739
1740	=cut
1741
1742	sub ext_reply($$@) {
1743	my ($self, $id, @msg) = @_;
1744
1745	$self->ns->ext_reply ($id, @msg)
1746	}
1747
1748	=item $player->ext_msg ($type, @msg)	1948	=item $player->ext_msg ($type, @msg)
1749		1949
1750	Sends an ext event to the client.	1950	Sends an ext event to the client.
1751		1951
1752	=cut	1952	=cut
…		…
1811	sub generate_random_map {	2011	sub generate_random_map {
1812	my ($self, $rmp) = @_;	2012	my ($self, $rmp) = @_;
1813		2013
1814	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	2014	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1815		2015
1816	# mit "rum" bekleckern, nicht
1817	$self->_create_random_map (	2016	$self->_create_random_map ($rmp);
1818	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1819	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1820	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1821	$rmp->{exit_on_final_map},
1822	$rmp->{xsize}, $rmp->{ysize},
1823	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1824	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1825	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1826	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1827	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1828	(cf::region::find $rmp->{region}), $rmp->{custom}
1829	)
1830	}	2017	}
1831		2018
1832	=item cf::map->register ($regex, $prio)	2019	=item cf::map->register ($regex, $prio)
1833		2020
1834	Register a handler for the map path matching the given regex at the	2021	Register a handler for the map path matching the given regex at the
…		…
1839		2026
1840	sub register {	2027	sub register {
1841	my (undef, $regex, $prio) = @_;	2028	my (undef, $regex, $prio) = @_;
1842	my $pkg = caller;	2029	my $pkg = caller;
1843		2030
1844	no strict;
1845	push @{"$pkg\::ISA"}, __PACKAGE__;	2031	push @{"$pkg\::ISA"}, __PACKAGE__;
1846		2032
1847	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	2033	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1848	}	2034	}
1849		2035
…		…
1861	}	2047	}
1862		2048
1863	sub normalise {	2049	sub normalise {
1864	my ($path, $base) = @_;	2050	my ($path, $base) = @_;
1865		2051
1866	$path = "$path"; # make sure its a string	2052	$path = "$path"; # make sure it's a string
1867		2053
1868	$path =~ s/\.map$//;	2054	$path =~ s/\.map$//;
1869		2055
1870	# map plan:	2056	# map plan:
1871	#	2057	#
…		…
1886	$base =~ s{[^/]+/?$}{};	2072	$base =~ s{[^/]+/?$}{};
1887	$path = "$base/$path";	2073	$path = "$base/$path";
1888	}	2074	}
1889		2075
1890	for ($path) {	2076	for ($path) {
1891	redo if s{//}{/};
1892	redo if s{/\.?/}{/};	2077	redo if s{/\.?/}{/};
1893	redo if s{/[^/]+/\.\./}{/};	2078	redo if s{/[^/]+/\.\./}{/};
1894	}	2079	}
1895		2080
1896	$path	2081	$path
…		…
1910	$self->init; # pass $1 etc.	2095	$self->init; # pass $1 etc.
1911	return $self;	2096	return $self;
1912	}	2097	}
1913	}	2098	}
1914		2099
1915	Carp::cluck "unable to resolve path '$path' (base '$base').";	2100	Carp::cluck "unable to resolve path '$path' (base '$base')";
1916	()	2101	()
1917	}	2102	}
1918		2103
		2104	# may re-bless or do other evil things
1919	sub init {	2105	sub init {
1920	my ($self) = @_;	2106	my ($self) = @_;
1921		2107
1922	$self	2108	$self
1923	}	2109	}
…		…
1988	$self->{load_path} = $path;	2174	$self->{load_path} = $path;
1989		2175
1990	1	2176	1
1991	}	2177	}
1992		2178
		2179	# used to laod the header of an original map
1993	sub load_header_orig {	2180	sub load_header_orig {
1994	my ($self) = @_;	2181	my ($self) = @_;
1995		2182
1996	$self->load_header_from ($self->load_path)	2183	$self->load_header_from ($self->load_path)
1997	}	2184	}
1998		2185
		2186	# used to laod the header of an instantiated map
1999	sub load_header_temp {	2187	sub load_header_temp {
2000	my ($self) = @_;	2188	my ($self) = @_;
2001		2189
2002	$self->load_header_from ($self->save_path)	2190	$self->load_header_from ($self->save_path)
2003	}	2191	}
2004		2192
		2193	# called after loading the header from an instantiated map
2005	sub prepare_temp {	2194	sub prepare_temp {
2006	my ($self) = @_;	2195	my ($self) = @_;
2007		2196
2008	$self->last_access ((delete $self->{last_access})	2197	$self->last_access ((delete $self->{last_access})
2009	|| $cf::RUNTIME); #d#	2198	|| $cf::RUNTIME); #d#
2010	# safety	2199	# safety
2011	$self->{instantiate_time} = $cf::RUNTIME	2200	$self->{instantiate_time} = $cf::RUNTIME
2012	if $self->{instantiate_time} > $cf::RUNTIME;	2201	if $self->{instantiate_time} > $cf::RUNTIME;
2013	}	2202	}
2014		2203
		2204	# called after loading the header from an original map
2015	sub prepare_orig {	2205	sub prepare_orig {
2016	my ($self) = @_;	2206	my ($self) = @_;
2017		2207
2018	$self->{load_original} = 1;	2208	$self->{load_original} = 1;
2019	$self->{instantiate_time} = $cf::RUNTIME;	2209	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2043		2233
2044	sub find;	2234	sub find;
2045	sub find {	2235	sub find {
2046	my ($path, $origin) = @_;	2236	my ($path, $origin) = @_;
2047		2237
		2238	cf::cede_to_tick;
		2239
2048	$path = normalise $path, $origin && $origin->path;	2240	$path = normalise $path, $origin;
2049		2241
2050	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2242	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2051	my $guard2 = cf::lock_acquire "map_find:$path";	2243	my $guard2 = cf::lock_acquire "map_find:$path";
2052		2244
2053	$cf::MAP{$path} || do {	2245	$cf::MAP{$path} || do {
…		…
2084		2276
2085	{	2277	{
2086	my $guard = cf::lock_acquire "map_data:$path";	2278	my $guard = cf::lock_acquire "map_data:$path";
2087		2279
2088	return unless $self->valid;	2280	return unless $self->valid;
2089	return unless $self->in_memory == cf::MAP_SWAPPED;	2281	return unless $self->state == cf::MAP_SWAPPED;
2090
2091	$self->in_memory (cf::MAP_LOADING);
2092		2282
2093	$self->alloc;	2283	$self->alloc;
2094		2284
2095	$self->pre_load;	2285	$self->pre_load;
2096	cf::cede_to_tick;	2286	cf::cede_to_tick;
2097		2287
		2288	if (exists $self->{load_path}) {
2098	my $f = new_from_file cf::object::thawer $self->{load_path};	2289	my $f = new_from_file cf::object::thawer $self->{load_path};
2099	$f->skip_block;	2290	$f->skip_block;
2100	$self->_load_objects ($f)	2291	$self->_load_objects ($f)
2101	or return;	2292	or return;
2102		2293
2103	$self->post_load_original	2294	$self->post_load_original
2104	if delete $self->{load_original};	2295	if delete $self->{load_original};
2105		2296
2106	if (my $uniq = $self->uniq_path) {	2297	if (my $uniq = $self->uniq_path) {
2107	utf8::encode $uniq;	2298	utf8::encode $uniq;
2108	unless (aio_stat $uniq) {	2299	unless (aio_stat $uniq) {
2109	if (my $f = new_from_file cf::object::thawer $uniq) {	2300	if (my $f = new_from_file cf::object::thawer $uniq) {
2110	$self->clear_unique_items;	2301	$self->clear_unique_items;
2111	$self->_load_objects ($f);	2302	$self->_load_objects ($f);
2112	$f->resolve_delayed_derefs;	2303	$f->resolve_delayed_derefs;
		2304	}
2113	}	2305	}
2114	}	2306	}
2115	}
2116		2307
2117	$f->resolve_delayed_derefs;	2308	$f->resolve_delayed_derefs;
		2309	} else {
		2310	$self->post_load_original
		2311	if delete $self->{load_original};
		2312	}
		2313
		2314	$self->state (cf::MAP_INACTIVE);
2118		2315
2119	cf::cede_to_tick;	2316	cf::cede_to_tick;
2120	# now do the right thing for maps	2317	# now do the right thing for maps
2121	$self->link_multipart_objects;	2318	$self->link_multipart_objects;
2122	$self->difficulty ($self->estimate_difficulty)	2319	$self->difficulty ($self->estimate_difficulty)
…		…
2126	unless ($self->{deny_activate}) {	2323	unless ($self->{deny_activate}) {
2127	$self->decay_objects;	2324	$self->decay_objects;
2128	$self->fix_auto_apply;	2325	$self->fix_auto_apply;
2129	$self->update_buttons;	2326	$self->update_buttons;
2130	cf::cede_to_tick;	2327	cf::cede_to_tick;
2131	$self->activate;	2328	#$self->activate; # no longer activate maps automatically
2132	}	2329	}
2133		2330
2134	$self->{last_save} = $cf::RUNTIME;	2331	$self->{last_save} = $cf::RUNTIME;
2135	$self->last_access ($cf::RUNTIME);	2332	$self->last_access ($cf::RUNTIME);
2136
2137	$self->in_memory (cf::MAP_ACTIVE);
2138	}	2333	}
2139		2334
2140	$self->post_load;	2335	$self->post_load;
		2336
		2337	1
2141	}	2338	}
2142		2339
2143	# customize the map for a given player, i.e.	2340	# customize the map for a given player, i.e.
2144	# return the _real_ map. used by e.g. per-player	2341	# return the _real_ map. used by e.g. per-player
2145	# maps to change the path to ~playername/mappath	2342	# maps to change the path to ~playername/mappath
…		…
2153	# if $self->per_party;	2350	# if $self->per_party;
2154		2351
2155	$self	2352	$self
2156	}	2353	}
2157		2354
2158	# find and load all maps in the 3x3 area around a map
2159	sub load_neighbours {
2160	my ($map) = @_;
2161
2162	my @neigh; # diagonal neighbours
2163
2164	for (0 .. 3) {
2165	my $neigh = $map->tile_path ($_)
2166	or next;
2167	$neigh = find $neigh, $map
2168	or next;
2169	$neigh->load;
2170
2171	# now find the diagonal neighbours
2172	push @neigh,
2173	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2174	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2175	}
2176
2177	for (grep defined $_->[0], @neigh) {
2178	my ($path, $origin) = @$_;
2179	my $neigh = find $path, $origin
2180	or next;
2181	$neigh->load;
2182	}
2183	}
2184
2185	sub find_sync {	2355	sub find_sync {
2186	my ($path, $origin) = @_;	2356	my ($path, $origin) = @_;
2187		2357
2188	cf::sync_job { find $path, $origin }	2358	# it's a bug to call this from the main context
		2359	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
		2360	if $Coro::current == $Coro::main;
		2361
		2362	find $path, $origin
2189	}	2363	}
2190		2364
2191	sub do_load_sync {	2365	sub do_load_sync {
2192	my ($map) = @_;	2366	my ($map) = @_;
2193		2367
		2368	# it's a bug to call this from the main context
2194	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2369	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2195	if $Coro::current == $Coro::main;	2370	if $Coro::current == $Coro::main;
2196		2371
2197	cf::sync_job { $map->load };	2372	$map->load;
2198	}	2373	}
2199		2374
2200	our %MAP_PREFETCH;	2375	our %MAP_PREFETCH;
2201	our $MAP_PREFETCHER = undef;	2376	our $MAP_PREFETCHER = undef;
2202		2377
2203	sub find_async {	2378	sub find_async {
2204	my ($path, $origin, $load) = @_;	2379	my ($path, $origin, $load) = @_;
2205		2380
2206	$path = normalise $path, $origin && $origin->{path};	2381	$path = normalise $path, $origin;
2207		2382
2208	if (my $map = $cf::MAP{$path}) {	2383	if (my $map = $cf::MAP{$path}) {
2209	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2384	return $map if !$load || $map->linkable;
2210	}	2385	}
2211		2386
2212	$MAP_PREFETCH{$path} |= $load;	2387	$MAP_PREFETCH{$path} |= $load;
2213		2388
2214	$MAP_PREFETCHER ||= cf::async {	2389	$MAP_PREFETCHER ||= cf::async {
…		…
2273	sub swap_out {	2448	sub swap_out {
2274	my ($self) = @_;	2449	my ($self) = @_;
2275		2450
2276	my $lock = cf::lock_acquire "map_data:$self->{path}";	2451	my $lock = cf::lock_acquire "map_data:$self->{path}";
2277		2452
2278	return if $self->in_memory != cf::MAP_ACTIVE;	2453	return if !$self->linkable;
2279	return if $self->{deny_save};	2454	return if $self->{deny_save};
2280	return if $self->players;	2455	return if $self->players;
2281		2456
2282	# first deactivate the map and "unlink" it from the core	2457	# first deactivate the map and "unlink" it from the core
2283	$self->deactivate;	2458	$self->deactivate;
2284	$_->clear_links_to ($self) for values %cf::MAP;	2459	$_->clear_links_to ($self) for values %cf::MAP;
2285	$self->in_memory (cf::MAP_SWAPPED);	2460	$self->state (cf::MAP_SWAPPED);
2286		2461
2287	# then atomically save	2462	# then atomically save
2288	$self->_save;	2463	$self->_save;
2289		2464
2290	# then free the map	2465	# then free the map
…		…
2314		2489
2315	my $lock = cf::lock_acquire "map_data:$self->{path}";	2490	my $lock = cf::lock_acquire "map_data:$self->{path}";
2316		2491
2317	return if $self->players;	2492	return if $self->players;
2318		2493
2319	warn "resetting map ", $self->path, "\n";	2494	cf::trace "resetting map ", $self->path, "\n";
2320		2495
2321	$self->in_memory (cf::MAP_SWAPPED);	2496	$self->state (cf::MAP_SWAPPED);
2322		2497
2323	# need to save uniques path	2498	# need to save uniques path
2324	unless ($self->{deny_save}) {	2499	unless ($self->{deny_save}) {
2325	my $uniq = $self->uniq_path; utf8::encode $uniq;	2500	my $uniq = $self->uniq_path; utf8::encode $uniq;
2326		2501
…		…
2479		2654
2480	Creates and returns a persistent reference to an object that can be stored as a string.	2655	Creates and returns a persistent reference to an object that can be stored as a string.
2481		2656
2482	=item $ob = cf::object::deref ($refstring)	2657	=item $ob = cf::object::deref ($refstring)
2483		2658
2484	returns the objetc referenced by refstring. may return undef when it cnanot find the object,	2659	returns the objetc referenced by refstring. may return undef when it cannot find the object,
2485	even if the object actually exists. May block.	2660	even if the object actually exists. May block.
2486		2661
2487	=cut	2662	=cut
2488		2663
2489	sub deref {	2664	sub deref {
…		…
2656	# use -1 or undef as default coordinates, not 0, 0	2831	# use -1 or undef as default coordinates, not 0, 0
2657	($x, $y) = ($map->enter_x, $map->enter_y)	2832	($x, $y) = ($map->enter_x, $map->enter_y)
2658	if $x <= 0 && $y <= 0;	2833	if $x <= 0 && $y <= 0;
2659		2834
2660	$map->load;	2835	$map->load;
2661	$map->load_neighbours;
2662		2836
2663	return unless $self->contr->active;	2837	return unless $self->contr->active;
2664		2838
2665	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2839	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2666	if ($self->enter_map ($map, $x, $y)) {	2840	if ($self->enter_map ($map, $x, $y)) {
…		…
2689		2863
2690	sub cf::object::player::goto {	2864	sub cf::object::player::goto {
2691	my ($self, $path, $x, $y, $check, $done) = @_;	2865	my ($self, $path, $x, $y, $check, $done) = @_;
2692		2866
2693	if ($self->{_link_recursion} >= $MAX_LINKS) {	2867	if ($self->{_link_recursion} >= $MAX_LINKS) {
2694	warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";	2868	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2695	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");	2869	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2696	($path, $x, $y) = @$EMERGENCY_POSITION;	2870	($path, $x, $y) = @$EMERGENCY_POSITION;
2697	}	2871	}
2698		2872
2699	# do generation counting so two concurrent goto's will be executed in-order	2873	# do generation counting so two concurrent goto's will be executed in-order
…		…
2722	($path, $x, $y) = (undef, undef, undef);	2896	($path, $x, $y) = (undef, undef, undef);
2723	}	2897	}
2724	}	2898	}
2725		2899
2726	my $map = eval {	2900	my $map = eval {
2727	my $map = defined $path ? cf::map::find $path : undef;	2901	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2728		2902
2729	if ($map) {	2903	if ($map) {
2730	$map = $map->customise_for ($self);	2904	$map = $map->customise_for ($self);
2731	$map = $check->($map, $x, $y, $self) if $check && $map;	2905	$map = $check->($map, $x, $y, $self) if $check && $map;
2732	} else {	2906	} else {
…		…
2822	$Coro::current->{desc} = "enter_exit";	2996	$Coro::current->{desc} = "enter_exit";
2823		2997
2824	unless (eval {	2998	unless (eval {
2825	$self->deactivate_recursive; # just to be sure	2999	$self->deactivate_recursive; # just to be sure
2826		3000
2827	# random map handling
2828	{
2829	my $guard = cf::lock_acquire "exit_prepare:$exit";
2830
2831	prepare_random_map $exit
2832	if $exit->slaying eq "/!";
2833	}
2834
2835	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	3001	my $map = cf::map::normalise $exit->slaying, $exit->map;
2836	my $x = $exit->stats->hp;	3002	my $x = $exit->stats->hp;
2837	my $y = $exit->stats->sp;	3003	my $y = $exit->stats->sp;
		3004
		3005	# special map handling
		3006	my $slaying = $exit->slaying;
		3007
		3008	# special map handling
		3009	if ($slaying eq "/!") {
		3010	my $guard = cf::lock_acquire "exit_prepare:$exit";
		3011
		3012	prepare_random_map $exit
		3013	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		3014
		3015	$map = $exit->slaying;
		3016
		3017	} elsif ($slaying eq '!up') {
		3018	$map = $exit->map->tile_path (cf::TILE_UP);
		3019	$x = $exit->x;
		3020	$y = $exit->y;
		3021
		3022	} elsif ($slaying eq '!down') {
		3023	$map = $exit->map->tile_path (cf::TILE_DOWN);
		3024	$x = $exit->x;
		3025	$y = $exit->y;
		3026	}
2838		3027
2839	$self->goto ($map, $x, $y);	3028	$self->goto ($map, $x, $y);
2840		3029
2841	# if exit is damned, update players death & WoR home-position	3030	# if exit is damned, update players death & WoR home-position
2842	$self->contr->savebed ($map, $x, $y)	3031	$self->contr->savebed ($map, $x, $y)
…		…
2847	$self->message ("Something went wrong deep within the deliantra server. "	3036	$self->message ("Something went wrong deep within the deliantra server. "
2848	. "I'll try to bring you back to the map you were before. "	3037	. "I'll try to bring you back to the map you were before. "
2849	. "Please report this to the dungeon master!",	3038	. "Please report this to the dungeon master!",
2850	cf::NDI_UNIQUE | cf::NDI_RED);	3039	cf::NDI_UNIQUE | cf::NDI_RED);
2851		3040
2852	warn "ERROR in enter_exit: $@";	3041	error "ERROR in enter_exit: $@";
2853	$self->leave_link;	3042	$self->leave_link;
2854	}	3043	}
2855	})->prio (1);	3044	})->prio (1);
2856	}	3045	}
2857		3046
…		…
3067	=cut	3256	=cut
3068		3257
3069	sub cf::client::ext_msg($$@) {	3258	sub cf::client::ext_msg($$@) {
3070	my ($self, $type, @msg) = @_;	3259	my ($self, $type, @msg) = @_;
3071		3260
3072	if ($self->extcmd == 2) {
3073	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3261	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3074	} elsif ($self->extcmd == 1) { # TODO: remove
3075	push @msg, msgtype => "event_$type";
3076	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3077	}
3078	}
3079
3080	=item $client->ext_reply ($msgid, @msg)
3081
3082	Sends an ext reply to the client.
3083
3084	=cut
3085
3086	sub cf::client::ext_reply($$@) {
3087	my ($self, $id, @msg) = @_;
3088
3089	if ($self->extcmd == 2) {
3090	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3091	} elsif ($self->extcmd == 1) {
3092	#TODO: version 1, remove
3093	unshift @msg, msgtype => "reply", msgid => $id;
3094	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3095	}
3096	}	3262	}
3097		3263
3098	=item $success = $client->query ($flags, "text", \&cb)	3264	=item $success = $client->query ($flags, "text", \&cb)
3099		3265
3100	Queues a query to the client, calling the given callback with	3266	Queues a query to the client, calling the given callback with
…		…
3155	my ($ns, $buf) = @_;	3321	my ($ns, $buf) = @_;
3156		3322
3157	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3323	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3158		3324
3159	if (ref $msg) {	3325	if (ref $msg) {
3160	my ($type, $reply, @payload) =	3326	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3161	"ARRAY" eq ref $msg
3162	? @$msg
3163	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3164		3327
3165	my @reply;
3166
3167	if (my $cb = $EXTICMD{$type}) {	3328	if (my $cb = $EXTIACMD{$type}) {
		3329	$cb->(
		3330	$ns,
		3331	sub {
		3332	$ns->ext_msg ("reply-$reply", @_)
		3333	if $reply;
		3334	},
		3335	@payload
		3336	);
		3337	} else {
		3338	my @reply;
		3339
		3340	if (my $cb = $EXTICMD{$type}) {
3168	@reply = $cb->($ns, @payload);	3341	@reply = $cb->($ns, @payload);
		3342	}
		3343
		3344	$ns->ext_msg ("reply-$reply", @reply)
		3345	if $reply;
3169	}	3346	}
3170
3171	$ns->ext_reply ($reply, @reply)
3172	if $reply;
3173
3174	} else {	3347	} else {
3175	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3348	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3176	}	3349	}
3177		3350
3178	cf::override;	3351	cf::override;
3179	},	3352	},
3180	);	3353	);
…		…
3261	decrease split destroy change_exp value msg lore send_msg)],	3434	decrease split destroy change_exp value msg lore send_msg)],
3262	["cf::object::player" => qw(player)],	3435	["cf::object::player" => qw(player)],
3263	["cf::player" => qw(peaceful send_msg)],	3436	["cf::player" => qw(peaceful send_msg)],
3264	["cf::map" => qw(trigger)],	3437	["cf::map" => qw(trigger)],
3265	) {	3438	) {
3266	no strict 'refs';
3267	my ($pkg, @funs) = @$_;	3439	my ($pkg, @funs) = @$_;
3268	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3440	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3269	for @funs;	3441	for @funs;
3270	}	3442	}
3271		3443
…		…
3310	local @cf::_safe_eval_args = values %vars;	3482	local @cf::_safe_eval_args = values %vars;
3311	@res = wantarray ? eval eval : scalar eval $eval;	3483	@res = wantarray ? eval eval : scalar eval $eval;
3312	}	3484	}
3313		3485
3314	if ($@) {	3486	if ($@) {
3315	warn "$@";	3487	warn "$@",
3316	warn "while executing safe code '$code'\n";	3488	"while executing safe code '$code'\n",
3317	warn "with arguments " . (join " ", %vars) . "\n";	3489	"with arguments " . (join " ", %vars) . "\n";
3318	}	3490	}
3319		3491
3320	wantarray ? @res : $res[0]	3492	wantarray ? @res : $res[0]
3321	}	3493	}
3322		3494
…		…
3347	=cut	3519	=cut
3348		3520
3349	#############################################################################	3521	#############################################################################
3350	# the server's init and main functions	3522	# the server's init and main functions
3351		3523
		3524	{
		3525	package cf::face;
		3526
		3527	our %HASH; # hash => idx
		3528	our @DATA; # dynamically-created facedata, only faceste 0 used
		3529	our @FOFS; # file offset, if > 0
		3530	our @SIZE; # size of face, in octets
		3531	our @META; # meta hash of face, if any
		3532	our $DATAFH; # facedata filehandle
		3533
		3534	# internal api, not finalised
		3535	sub set {
		3536	my ($name, $type, $data) = @_;
		3537
		3538	my $idx = cf::face::find $name;
		3539
		3540	if ($idx) {
		3541	delete $HASH{cf::face::get_chksum $idx};
		3542	} else {
		3543	$idx = cf::face::alloc $name;
		3544	}
		3545
		3546	my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
		3547
		3548	cf::face::set_type $idx, $type;
		3549	cf::face::set_csum $idx, 0, $hash;
		3550
		3551	# we need to destroy the SV itself, not just modify it, as a running ix
		3552	# might hold a reference to it: "delete" achieves that.
		3553	delete $FOFS[0][$idx];
		3554	delete $DATA[0][$idx];
		3555	$DATA[0][$idx] = $data;
		3556	$SIZE[0][$idx] = length $data;
		3557	delete $META[$idx];
		3558	$HASH{$hash} = $idx;#d#
		3559
		3560	$idx
		3561	}
		3562
		3563	sub _get_data($$$) {
		3564	my ($idx, $set, $cb) = @_;
		3565
		3566	if (defined $DATA[$set][$idx]) {
		3567	$cb->($DATA[$set][$idx]);
		3568	} elsif (my $fofs = $FOFS[$set][$idx]) {
		3569	my $size = $SIZE[$set][$idx];
		3570	my $buf;
		3571	IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
		3572	if ($_[0] == $size) {
		3573	#cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
		3574	$cb->($buf);
		3575	} else {
		3576	cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
		3577	}
		3578	};
		3579	} else {
		3580	cf::error "requested facedata for unknown face $idx#$set, ignoring.";
		3581	}
		3582	}
		3583
		3584	# rather ineffient
		3585	sub cf::face::get_data($;$) {
		3586	my ($idx, $set) = @_;
		3587
		3588	_get_data $idx, $set, Coro::rouse_cb;
		3589	Coro::rouse_wait
		3590	}
		3591
		3592	sub cf::face::ix {
		3593	my ($ns, $set, $idx, $pri) = @_;
		3594
		3595	_get_data $idx, $set, sub {
		3596	$ns->ix_send ($idx, $pri, $_[0]);
		3597	};
		3598	}
		3599	}
		3600
3352	sub load_facedata($) {	3601	sub load_facedata($) {
3353	my ($path) = @_;	3602	my ($path) = @_;
3354		3603
3355	# HACK to clear player env face cache, we need some signal framework
3356	# for this (global event?)
3357	%ext::player_env::MUSIC_FACE_CACHE = ();
3358
3359	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3604	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3360		3605
3361	warn "loading facedata from $path\n";	3606	trace "loading facedata from $path\n";
3362		3607
3363	my $facedata;	3608	my $facedata = decode_storable load_file "$path/faceinfo";
3364	0 < aio_load $path, $facedata
3365	or die "$path: $!";
3366
3367	$facedata = Coro::Storable::thaw $facedata;
3368		3609
3369	$facedata->{version} == 2	3610	$facedata->{version} == 2
3370	or cf::cleanup "$path: version mismatch, cannot proceed.";	3611	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3371		3612
3372	# patch in the exptable	3613	my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3373	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);	3614	or cf::cleanup "$path/facedata: $!, cannot proceed.";
3374	$facedata->{resource}{"res/exp_table"} = {	3615
3375	type => FT_RSRC,	3616	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3376	data => $exp_table,	3617
3377	hash => (Digest::MD5::md5 $exp_table),	3618	# BEGIN ATOMIC
3378	};	3619	# from here on, everything must be atomic - no thread switch allowed
3379	cf::cede_to_tick;	3620	my $t1 = EV::time;
3380		3621
3381	{	3622	{
3382	my $faces = $facedata->{faceinfo};	3623	my $faces = $facedata->{faceinfo};
3383		3624
3384	while (my ($face, $info) = each %$faces) {	3625	for my $face (sort keys %$faces) {
		3626	my $info = $faces->{$face};
3385	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3627	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3386		3628
3387	cf::face::set_visibility $idx, $info->{visibility};	3629	cf::face::set_visibility $idx, $info->{visibility};
3388	cf::face::set_magicmap $idx, $info->{magicmap};	3630	cf::face::set_magicmap $idx, $info->{magicmap};
3389	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3631	cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3390	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3632	cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3391		3633	cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3392	cf::cede_to_tick;	3634	$cf::face::HASH{$info->{hash64}} = $idx;
		3635	delete $cf::face::META[$idx];
3393	}	3636	}
3394		3637
3395	while (my ($face, $info) = each %$faces) {	3638	while (my ($face, $info) = each %$faces) {
3396	next unless $info->{smooth};	3639	next unless $info->{smooth};
3397		3640
…		…
3400		3643
3401	if (my $smooth = cf::face::find $info->{smooth}) {	3644	if (my $smooth = cf::face::find $info->{smooth}) {
3402	cf::face::set_smooth $idx, $smooth;	3645	cf::face::set_smooth $idx, $smooth;
3403	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3646	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3404	} else {	3647	} else {
3405	warn "smooth face '$info->{smooth}' not found for face '$face'";	3648	error "smooth face '$info->{smooth}' not found for face '$face'";
3406	}	3649	}
3407
3408	cf::cede_to_tick;
3409	}	3650	}
3410	}	3651	}
3411		3652
3412	{	3653	{
3413	my $anims = $facedata->{animinfo};	3654	my $anims = $facedata->{animinfo};
3414		3655
3415	while (my ($anim, $info) = each %$anims) {	3656	while (my ($anim, $info) = each %$anims) {
3416	cf::anim::set $anim, $info->{frames}, $info->{facings};	3657	cf::anim::set $anim, $info->{frames}, $info->{facings};
3417	cf::cede_to_tick;
3418	}	3658	}
3419		3659
3420	cf::anim::invalidate_all; # d'oh	3660	cf::anim::invalidate_all; # d'oh
3421	}	3661	}
3422		3662
3423	{	3663	{
3424	my $res = $facedata->{resource};	3664	my $res = $facedata->{resource};
3425		3665
3426	while (my ($name, $info) = each %$res) {	3666	while (my ($name, $info) = each %$res) {
3427	if (defined $info->{type}) {	3667	if (defined (my $type = $info->{type})) {
		3668	# TODO: different hash - must free and use new index, or cache ixface data queue
3428	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3669	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3429		3670
3430	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3431	cf::face::set_type $idx, $info->{type};	3671	cf::face::set_type $idx, $type;
		3672	cf::face::set_csum $idx, 0, $info->{hash};
		3673	$cf::face::SIZE[0][$idx] = $info->{size};
		3674	$cf::face::FOFS[0][$idx] = $info->{fofs};
		3675	$cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3676	$cf::face::HASH{$info->{hash}} = $idx;
3432	} else {	3677	} else {
3433	$RESOURCE{$name} = $info;	3678	# $RESOURCE{$name} = $info; # unused
3434	}	3679	}
3435
3436	cf::cede_to_tick;
3437	}	3680	}
3438	}	3681	}
		3682
		3683	($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
		3684
		3685	# HACK to clear player env face cache, we need some signal framework
		3686	# for this (global event?)
		3687	%ext::player_env::MUSIC_FACE_CACHE = ();
		3688
		3689	# END ATOMIC
		3690
		3691	cf::debug "facedata atomic update time ", EV::time - $t1;
3439		3692
3440	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3693	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3441		3694
		3695	aio_close $fh if $fh; # close old facedata
		3696
3442	1	3697	1
3443	}	3698	}
3444
3445	cf::global->attach (on_resource_update => sub {
3446	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3447	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3448
3449	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3450	my $sound = $soundconf->{compat}[$_]
3451	or next;
3452
3453	my $face = cf::face::find "sound/$sound->[1]";
3454	cf::sound::set $sound->[0] => $face;
3455	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3456	}
3457
3458	while (my ($k, $v) = each %{$soundconf->{event}}) {
3459	my $face = cf::face::find "sound/$v";
3460	cf::sound::set $k => $face;
3461	}
3462	}
3463	});
3464		3699
3465	register_exticmd fx_want => sub {	3700	register_exticmd fx_want => sub {
3466	my ($ns, $want) = @_;	3701	my ($ns, $want) = @_;
3467		3702
3468	while (my ($k, $v) = each %$want) {	3703	while (my ($k, $v) = each %$want) {
…		…
3476	my $status = load_resource_file_ $_[0];	3711	my $status = load_resource_file_ $_[0];
3477	get_slot 0.1, 100;	3712	get_slot 0.1, 100;
3478	cf::arch::commit_load;	3713	cf::arch::commit_load;
3479		3714
3480	$status	3715	$status
		3716	}
		3717
		3718	sub reload_exp_table {
		3719	_reload_exp_table;
		3720
		3721	cf::face::set
		3722	"res/exp_table" => FT_RSRC,
		3723	JSON::XS->new->utf8->canonical->encode (
		3724	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3725	);
		3726	}
		3727
		3728	sub reload_materials {
		3729	_reload_materials;
3481	}	3730	}
3482		3731
3483	sub reload_regions {	3732	sub reload_regions {
3484	# HACK to clear player env face cache, we need some signal framework	3733	# HACK to clear player env face cache, we need some signal framework
3485	# for this (global event?)	3734	# for this (global event?)
…		…
3493	if exists $_->{match};	3742	if exists $_->{match};
3494	}	3743	}
3495	}	3744	}
3496		3745
3497	sub reload_facedata {	3746	sub reload_facedata {
3498	load_facedata "$DATADIR/facedata"	3747	load_facedata $DATADIR
3499	or die "unable to load facedata\n";	3748	or die "unable to load facedata\n";
3500	}	3749	}
3501		3750
3502	sub reload_archetypes {	3751	sub reload_archetypes {
3503	load_resource_file "$DATADIR/archetypes"	3752	load_resource_file "$DATADIR/archetypes"
3504	or die "unable to load archetypes\n";	3753	or die "unable to load archetypes\n";
		3754
		3755	cf::face::set
		3756	"res/skill_info" => FT_RSRC,
		3757	JSON::XS->new->utf8->canonical->encode (
		3758	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3759	);
		3760
		3761	cf::face::set
		3762	"res/spell_paths" => FT_RSRC,
		3763	JSON::XS->new->utf8->canonical->encode (
		3764	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3765	);
3505	}	3766	}
3506		3767
3507	sub reload_treasures {	3768	sub reload_treasures {
3508	load_resource_file "$DATADIR/treasures"	3769	load_resource_file "$DATADIR/treasures"
3509	or die "unable to load treasurelists\n";	3770	or die "unable to load treasurelists\n";
3510	}	3771	}
3511		3772
		3773	sub reload_sound {
		3774	trace "loading sound config from $DATADIR/sound\n";
		3775
		3776	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
		3777
		3778	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3779	my $sound = $soundconf->{compat}[$_]
		3780	or next;
		3781
		3782	my $face = cf::face::find "sound/$sound->[1]";
		3783	cf::sound::set $sound->[0] => $face;
		3784	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3785	}
		3786
		3787	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3788	my $face = cf::face::find "sound/$v";
		3789	cf::sound::set $k => $face;
		3790	}
		3791	}
		3792
3512	sub reload_resources {	3793	sub reload_resources {
3513	warn "reloading resource files...\n";	3794	trace "reloading resource files...\n";
3514		3795
		3796	reload_materials;
3515	reload_facedata;	3797	reload_facedata;
		3798	reload_exp_table;
		3799	reload_sound;
3516	reload_archetypes;	3800	reload_archetypes;
3517	reload_regions;	3801	reload_regions;
3518	reload_treasures;	3802	reload_treasures;
3519		3803
3520	warn "finished reloading resource files\n";	3804	trace "finished reloading resource files\n";
3521	}	3805	}
3522		3806
3523	sub reload_config {	3807	sub reload_config {
3524	warn "reloading config file...\n";	3808	trace "reloading config file...\n";
3525		3809
3526	open my $fh, "<:utf8", "$CONFDIR/config"	3810	my $config = load_file "$CONFDIR/config";
3527	or return;	3811	utf8::decode $config;
3528		3812	*CFG = decode_yaml $config;
3529	local $/;
3530	*CFG = YAML::XS::Load scalar <$fh>;
3531		3813
3532	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];	3814	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3533		3815
3534	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3816	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3535	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3817	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
3539	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3821	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3540	and die "WARNING: m(un)lockall failed: $!\n";	3822	and die "WARNING: m(un)lockall failed: $!\n";
3541	};	3823	};
3542	warn $@ if $@;	3824	warn $@ if $@;
3543	}	3825	}
3544
3545	warn "finished reloading resource files\n";
3546	}	3826	}
3547		3827
3548	sub pidfile() {	3828	sub pidfile() {
3549	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3829	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3550	or die "$PIDFILE: $!";	3830	or die "$PIDFILE: $!";
…		…
3563	seek $fh, 0, 0;	3843	seek $fh, 0, 0;
3564	print $fh $$;	3844	print $fh $$;
3565	}	3845	}
3566		3846
3567	sub main_loop {	3847	sub main_loop {
3568	warn "EV::loop starting\n";	3848	trace "EV::loop starting\n";
3569	if (1) {	3849	if (1) {
3570	EV::loop;	3850	EV::loop;
3571	}	3851	}
3572	warn "EV::loop returned\n";	3852	trace "EV::loop returned\n";
3573	goto &main_loop unless $REALLY_UNLOOP;	3853	goto &main_loop unless $REALLY_UNLOOP;
3574	}	3854	}
3575		3855
3576	sub main {	3856	sub main {
3577	cf::init_globals; # initialise logging	3857	cf::init_globals; # initialise logging
3578		3858
3579	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3859	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3580	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3860	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3581	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3861	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3582	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3862	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3583		3863
3584	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3864	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3585		3865
3586	# we must not ever block the main coroutine	3866	# we must not ever block the main coroutine
3587	local $Coro::idle = sub {	3867	$Coro::idle = sub {
3588	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3868	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3589	(async {	3869	(async {
3590	$Coro::current->{desc} = "IDLE BUG HANDLER";	3870	$Coro::current->{desc} = "IDLE BUG HANDLER";
3591	EV::loop EV::LOOP_ONESHOT;	3871	EV::loop EV::LOOP_ONESHOT;
3592	})->prio (Coro::PRIO_MAX);	3872	})->prio (Coro::PRIO_MAX);
3593	};	3873	};
3594		3874
3595	evthread_start IO::AIO::poll_fileno;	3875	evthread_start IO::AIO::poll_fileno;
3596		3876
3597	cf::sync_job {	3877	cf::sync_job {
3598	cf::init_experience;	3878	cf::incloader::init ();
		3879
		3880	db_init;
		3881
3599	cf::init_anim;	3882	cf::init_anim;
3600	cf::init_attackmess;	3883	cf::init_attackmess;
3601	cf::init_dynamic;	3884	cf::init_dynamic;
3602		3885
3603	cf::load_settings;	3886	cf::load_settings;
3604	cf::load_materials;
3605		3887
3606	reload_resources;	3888	reload_resources;
3607	reload_config;	3889	reload_config;
3608	db_init;
3609		3890
3610	cf::init_uuid;	3891	cf::init_uuid;
3611	cf::init_signals;	3892	cf::init_signals;
3612	cf::init_skills;	3893	cf::init_skills;
3613		3894
…		…
3621		3902
3622	# no (long-running) fork's whatsoever before this point(!)	3903	# no (long-running) fork's whatsoever before this point(!)
3623	use POSIX ();	3904	use POSIX ();
3624	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3905	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3625		3906
3626	(pop @POST_INIT)->(0) while @POST_INIT;	3907	cf::_post_init 0;
3627	};	3908	};
3628		3909
3629	cf::object::thawer::errors_are_fatal 0;	3910	cf::object::thawer::errors_are_fatal 0;
3630	warn "parse errors in files are no longer fatal from this point on.\n";	3911	info "parse errors in files are no longer fatal from this point on.\n";
3631		3912
		3913	AE::postpone {
		3914	undef &main; # free gobs of memory :)
		3915	};
		3916
3632	main_loop;	3917	goto &main_loop;
3633	}	3918	}
3634		3919
3635	#############################################################################	3920	#############################################################################
3636	# initialisation and cleanup	3921	# initialisation and cleanup
3637		3922
…		…
3676	or return;	3961	or return;
3677		3962
3678	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3963	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3679	and return;	3964	and return;
3680		3965
3681	warn sprintf "runtime file written (%gs).\n", AE::time - $t0;	3966	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3682		3967
3683	1	3968	1
3684	}	3969	}
3685		3970
3686	our $uuid_lock;	3971	our $uuid_lock;
…		…
3698	or return;	3983	or return;
3699		3984
3700	my $value = uuid_seq uuid_cur;	3985	my $value = uuid_seq uuid_cur;
3701		3986
3702	unless ($value) {	3987	unless ($value) {
3703	warn "cowardly refusing to write zero uuid value!\n";	3988	info "cowardly refusing to write zero uuid value!\n";
3704	return;	3989	return;
3705	}	3990	}
3706		3991
3707	my $value = uuid_str $value + $uuid_skip;	3992	my $value = uuid_str $value + $uuid_skip;
3708	$uuid_skip = 0;	3993	$uuid_skip = 0;
…		…
3718	or return;	4003	or return;
3719		4004
3720	aio_rename "$uuid~", $uuid	4005	aio_rename "$uuid~", $uuid
3721	and return;	4006	and return;
3722		4007
3723	warn "uuid file written ($value).\n";	4008	trace "uuid file written ($value).\n";
3724		4009
3725	1	4010	1
3726		4011
3727	}	4012	}
3728		4013
…		…
3734	}	4019	}
3735		4020
3736	sub emergency_save() {	4021	sub emergency_save() {
3737	my $freeze_guard = cf::freeze_mainloop;	4022	my $freeze_guard = cf::freeze_mainloop;
3738		4023
3739	warn "emergency_perl_save: enter\n";	4024	info "emergency_perl_save: enter\n";
		4025
		4026	# this is a trade-off: we want to be very quick here, so
		4027	# save all maps without fsync, and later call a global sync
		4028	# (which in turn might be very very slow)
		4029	local $USE_FSYNC = 0;
3740		4030
3741	cf::sync_job {	4031	cf::sync_job {
3742	# this is a trade-off: we want to be very quick here, so	4032	cf::write_runtime_sync; # external watchdog should not bark
3743	# save all maps without fsync, and later call a global sync
3744	# (which in turn might be very very slow)
3745	local $USE_FSYNC = 0;
3746		4033
3747	# use a peculiar iteration method to avoid tripping on perl	4034	# use a peculiar iteration method to avoid tripping on perl
3748	# refcount bugs in for. also avoids problems with players	4035	# refcount bugs in for. also avoids problems with players
3749	# and maps saved/destroyed asynchronously.	4036	# and maps saved/destroyed asynchronously.
3750	warn "emergency_perl_save: begin player save\n";	4037	info "emergency_perl_save: begin player save\n";
3751	for my $login (keys %cf::PLAYER) {	4038	for my $login (keys %cf::PLAYER) {
3752	my $pl = $cf::PLAYER{$login} or next;	4039	my $pl = $cf::PLAYER{$login} or next;
3753	$pl->valid or next;	4040	$pl->valid or next;
3754	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	4041	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3755	$pl->save;	4042	$pl->save;
3756	}	4043	}
3757	warn "emergency_perl_save: end player save\n";	4044	info "emergency_perl_save: end player save\n";
3758		4045
		4046	cf::write_runtime_sync; # external watchdog should not bark
		4047
3759	warn "emergency_perl_save: begin map save\n";	4048	info "emergency_perl_save: begin map save\n";
3760	for my $path (keys %cf::MAP) {	4049	for my $path (keys %cf::MAP) {
3761	my $map = $cf::MAP{$path} or next;	4050	my $map = $cf::MAP{$path} or next;
3762	$map->valid or next;	4051	$map->valid or next;
3763	$map->save;	4052	$map->save;
3764	}	4053	}
3765	warn "emergency_perl_save: end map save\n";	4054	info "emergency_perl_save: end map save\n";
3766		4055
		4056	cf::write_runtime_sync; # external watchdog should not bark
		4057
3767	warn "emergency_perl_save: begin database checkpoint\n";	4058	info "emergency_perl_save: begin database checkpoint\n";
3768	BDB::db_env_txn_checkpoint $DB_ENV;	4059	BDB::db_env_txn_checkpoint $DB_ENV;
3769	warn "emergency_perl_save: end database checkpoint\n";	4060	info "emergency_perl_save: end database checkpoint\n";
3770		4061
3771	warn "emergency_perl_save: begin write uuid\n";	4062	info "emergency_perl_save: begin write uuid\n";
3772	write_uuid_sync 1;	4063	write_uuid_sync 1;
3773	warn "emergency_perl_save: end write uuid\n";	4064	info "emergency_perl_save: end write uuid\n";
		4065
		4066	cf::write_runtime_sync; # external watchdog should not bark
		4067
		4068	trace "emergency_perl_save: syncing database to disk";
		4069	BDB::db_env_txn_checkpoint $DB_ENV;
		4070
		4071	info "emergency_perl_save: starting sync\n";
		4072	IO::AIO::aio_sync sub {
		4073	info "emergency_perl_save: finished sync\n";
		4074	};
		4075
		4076	cf::write_runtime_sync; # external watchdog should not bark
		4077
		4078	trace "emergency_perl_save: flushing outstanding aio requests";
		4079	while (IO::AIO::nreqs || BDB::nreqs) {
		4080	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
		4081	}
		4082
		4083	cf::write_runtime_sync; # external watchdog should not bark
3774	};	4084	};
3775		4085
3776	warn "emergency_perl_save: starting sync()\n";
3777	IO::AIO::aio_sync sub {
3778	warn "emergency_perl_save: finished sync()\n";
3779	};
3780
3781	warn "emergency_perl_save: leave\n";	4086	info "emergency_perl_save: leave\n";
3782	}	4087	}
3783		4088
3784	sub post_cleanup {	4089	sub post_cleanup {
3785	my ($make_core) = @_;	4090	my ($make_core) = @_;
3786		4091
		4092	IO::AIO::flush;
		4093
3787	warn Carp::longmess "post_cleanup backtrace"	4094	error Carp::longmess "post_cleanup backtrace"
3788	if $make_core;	4095	if $make_core;
3789		4096
3790	my $fh = pidfile;	4097	my $fh = pidfile;
3791	unlink $PIDFILE if <$fh> == $$;	4098	unlink $PIDFILE if <$fh> == $$;
3792	}	4099	}
…		…
3816	}	4123	}
3817	}	4124	}
3818		4125
3819	sub do_reload_perl() {	4126	sub do_reload_perl() {
3820	# can/must only be called in main	4127	# can/must only be called in main
3821	if (in_main) {	4128	unless (in_main) {
3822	warn "can only reload from main coroutine";	4129	error "can only reload from main coroutine";
3823	return;	4130	return;
3824	}	4131	}
3825		4132
3826	return if $RELOAD++;	4133	return if $RELOAD++;
3827		4134
3828	my $t1 = AE::time;	4135	my $t1 = AE::time;
3829		4136
3830	while ($RELOAD) {	4137	while ($RELOAD) {
3831	warn "reloading...";	4138	cf::get_slot 0.1, -1, "reload_perl";
		4139	info "perl_reload: reloading...";
3832		4140
3833	warn "entering sync_job";	4141	trace "perl_reload: entering sync_job";
3834		4142
3835	cf::sync_job {	4143	cf::sync_job {
3836	cf::write_runtime_sync; # external watchdog should not bark
3837	cf::emergency_save;	4144	#cf::emergency_save;
3838	cf::write_runtime_sync; # external watchdog should not bark
3839		4145
3840	warn "syncing database to disk";
3841	BDB::db_env_txn_checkpoint $DB_ENV;
3842
3843	# if anything goes wrong in here, we should simply crash as we already saved
3844
3845	warn "flushing outstanding aio requests";
3846	while (IO::AIO::nreqs || BDB::nreqs) {
3847	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3848	}
3849
3850	warn "cancelling all extension coros";	4146	trace "perl_reload: cancelling all extension coros";
3851	$_->cancel for values %EXT_CORO;	4147	$_->cancel for values %EXT_CORO;
3852	%EXT_CORO = ();	4148	%EXT_CORO = ();
3853		4149
3854	warn "removing commands";	4150	trace "perl_reload: removing commands";
3855	%COMMAND = ();	4151	%COMMAND = ();
3856		4152
3857	warn "removing ext/exti commands";	4153	trace "perl_reload: removing ext/exti commands";
3858	%EXTCMD = ();	4154	%EXTCMD = ();
3859	%EXTICMD = ();	4155	%EXTICMD = ();
3860		4156
3861	warn "unloading/nuking all extensions";	4157	trace "perl_reload: unloading/nuking all extensions";
3862	for my $pkg (@EXTS) {	4158	for my $pkg (@EXTS) {
3863	warn "... unloading $pkg";	4159	trace "... unloading $pkg";
3864		4160
3865	if (my $cb = $pkg->can ("unload")) {	4161	if (my $cb = $pkg->can ("unload")) {
3866	eval {	4162	eval {
3867	$cb->($pkg);	4163	$cb->($pkg);
3868	1	4164	1
3869	} or warn "$pkg unloaded, but with errors: $@";	4165	} or error "$pkg unloaded, but with errors: $@";
3870	}	4166	}
3871		4167
3872	warn "... clearing $pkg";	4168	trace "... clearing $pkg";
3873	clear_package $pkg;	4169	clear_package $pkg;
3874	}	4170	}
3875		4171
3876	warn "unloading all perl modules loaded from $LIBDIR";	4172	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3877	while (my ($k, $v) = each %INC) {	4173	while (my ($k, $v) = each %INC) {
3878	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4174	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3879		4175
3880	warn "... unloading $k";	4176	trace "... unloading $k";
3881	delete $INC{$k};	4177	delete $INC{$k};
3882		4178
3883	$k =~ s/\.pm$//;	4179	$k =~ s/\.pm$//;
3884	$k =~ s/\//::/g;	4180	$k =~ s/\//::/g;
3885		4181
…		…
3888	}	4184	}
3889		4185
3890	clear_package $k;	4186	clear_package $k;
3891	}	4187	}
3892		4188
3893	warn "getting rid of safe::, as good as possible";	4189	trace "perl_reload: getting rid of safe::, as good as possible";
3894	clear_package "safe::$_"	4190	clear_package "safe::$_"
3895	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4191	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3896		4192
3897	warn "unloading cf.pm \"a bit\"";	4193	trace "perl_reload: unloading cf.pm \"a bit\"";
3898	delete $INC{"cf.pm"};	4194	delete $INC{"cf.pm"};
3899	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4195	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3900		4196
3901	# don't, removes xs symbols, too,	4197	# don't, removes xs symbols, too,
3902	# and global variables created in xs	4198	# and global variables created in xs
3903	#clear_package __PACKAGE__;	4199	#clear_package __PACKAGE__;
3904		4200
3905	warn "unload completed, starting to reload now";	4201	info "perl_reload: unload completed, starting to reload now";
3906		4202
3907	warn "reloading cf.pm";	4203	trace "perl_reload: reloading cf.pm";
3908	require cf;	4204	require cf;
3909	cf::_connect_to_perl_1;	4205	cf::_connect_to_perl_1;
3910		4206
3911	warn "loading config and database again";	4207	trace "perl_reload: loading config and database again";
3912	cf::reload_config;	4208	cf::reload_config;
3913		4209
3914	warn "loading extensions";	4210	trace "perl_reload: loading extensions";
3915	cf::load_extensions;	4211	cf::load_extensions;
3916		4212
3917	if ($REATTACH_ON_RELOAD) {	4213	if ($REATTACH_ON_RELOAD) {
3918	warn "reattaching attachments to objects/players";	4214	trace "perl_reload: reattaching attachments to objects/players";
3919	_global_reattach; # objects, sockets	4215	_global_reattach; # objects, sockets
3920	warn "reattaching attachments to maps";	4216	trace "perl_reload: reattaching attachments to maps";
3921	reattach $_ for values %MAP;	4217	reattach $_ for values %MAP;
3922	warn "reattaching attachments to players";	4218	trace "perl_reload: reattaching attachments to players";
3923	reattach $_ for values %PLAYER;	4219	reattach $_ for values %PLAYER;
3924	}	4220	}
3925		4221
3926	warn "running post_init jobs";	4222	cf::_post_init 1;
3927	(pop @POST_INIT)->(1) while @POST_INIT;
3928		4223
3929	warn "leaving sync_job";	4224	trace "perl_reload: leaving sync_job";
3930		4225
3931	1	4226	1
3932	} or do {	4227	} or do {
3933	warn $@;	4228	error $@;
3934	cf::cleanup "error while reloading, exiting.";	4229	cf::cleanup "perl_reload: error, exiting.";
3935	};	4230	};
3936		4231
3937	warn "reloaded";
3938	--$RELOAD;	4232	--$RELOAD;
3939	}	4233	}
3940		4234
3941	$t1 = AE::time - $t1;	4235	$t1 = AE::time - $t1;
3942	warn "reload completed in ${t1}s\n";	4236	info "perl_reload: completed in ${t1}s\n";
3943	};	4237	};
3944		4238
3945	our $RELOAD_WATCHER; # used only during reload	4239	our $RELOAD_WATCHER; # used only during reload
3946		4240
3947	sub reload_perl() {	4241	sub reload_perl() {
…		…
3968	reload_perl;	4262	reload_perl;
3969	};	4263	};
3970	}	4264	}
3971	};	4265	};
3972		4266
3973	unshift @INC, $LIBDIR;	4267	#############################################################################
3974		4268
3975	my $bug_warning = 0;	4269	my $bug_warning = 0;
3976		4270
3977	our @WAIT_FOR_TICK;
3978	our @WAIT_FOR_TICK_BEGIN;
3979
3980	sub wait_for_tick {	4271	sub wait_for_tick() {
3981	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4272	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3982		4273
3983	my $signal = new Coro::Signal;	4274	$WAIT_FOR_TICK->wait;
3984	push @WAIT_FOR_TICK, $signal;
3985	$signal->wait;
3986	}	4275	}
3987		4276
3988	sub wait_for_tick_begin {	4277	sub wait_for_tick_begin() {
3989	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4278	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3990		4279
3991	my $signal = new Coro::Signal;	4280	my $signal = new Coro::Signal;
3992	push @WAIT_FOR_TICK_BEGIN, $signal;	4281	push @WAIT_FOR_TICK_BEGIN, $signal;
3993	$signal->wait;	4282	$signal->wait;
3994	}	4283	}
…		…
3998	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4287	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3999	unless ++$bug_warning > 10;	4288	unless ++$bug_warning > 10;
4000	return;	4289	return;
4001	}	4290	}
4002		4291
4003	cf::server_tick; # one server iteration	4292	cf::one_tick; # one server iteration
4004		4293
4005	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#	4294	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4006		4295
4007	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4296	if ($NOW >= $NEXT_RUNTIME_WRITE) {
4008	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4297	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
4009	Coro::async_pool {	4298	Coro::async_pool {
4010	$Coro::current->{desc} = "runtime saver";	4299	$Coro::current->{desc} = "runtime saver";
4011	write_runtime_sync	4300	write_runtime_sync
4012	or warn "ERROR: unable to write runtime file: $!";	4301	or error "ERROR: unable to write runtime file: $!";
4013	};	4302	};
4014	}	4303	}
4015		4304
4016	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4305	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4017	$sig->send;	4306	$sig->send;
4018	}	4307	}
4019	while (my $sig = shift @WAIT_FOR_TICK) {	4308	$WAIT_FOR_TICK->broadcast;
4020	$sig->send;
4021	}
4022		4309
4023	$LOAD = ($NOW - $TICK_START) / $TICK;	4310	$LOAD = ($NOW - $TICK_START) / $TICK;
4024	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4311	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4025		4312
4026	if (0) {	4313	if (0) {
4027	if ($NEXT_TICK) {	4314	if ($NEXT_TICK) {
4028	my $jitter = $TICK_START - $NEXT_TICK;	4315	my $jitter = $TICK_START - $NEXT_TICK;
4029	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4316	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
4030	warn "jitter $JITTER\n";#d#	4317	debug "jitter $JITTER\n";#d#
4031	}	4318	}
4032	}	4319	}
4033	}	4320	}
4034		4321
4035	{	4322	{
4036	# configure BDB	4323	# configure BDB
		4324	info "initialising database";
4037		4325
4038	BDB::min_parallel 16;	4326	BDB::min_parallel 16;
4039	BDB::max_poll_reqs $TICK * 0.1;	4327	BDB::max_poll_reqs $TICK * 0.1;
4040	$AnyEvent::BDB::WATCHER->priority (1);	4328	#$AnyEvent::BDB::WATCHER->priority (1);
4041		4329
4042	unless ($DB_ENV) {	4330	unless ($DB_ENV) {
4043	$DB_ENV = BDB::db_env_create;	4331	$DB_ENV = BDB::db_env_create;
4044	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4332	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4045	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4333	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
4070	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4358	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4071	};	4359	};
4072	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4360	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4073	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4361	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4074	};	4362	};
		4363
		4364	info "database initialised";
4075	}	4365	}
4076		4366
4077	{	4367	{
4078	# configure IO::AIO	4368	# configure IO::AIO
4079		4369
		4370	info "initialising aio";
4080	IO::AIO::min_parallel 8;	4371	IO::AIO::min_parallel 8;
4081	IO::AIO::max_poll_time $TICK * 0.1;	4372	IO::AIO::max_poll_time $TICK * 0.1;
4082	undef $AnyEvent::AIO::WATCHER;	4373	undef $AnyEvent::AIO::WATCHER;
		4374	info "aio initialised";
4083	}	4375	}
4084		4376
4085	my $_log_backtrace;	4377	our $_log_backtrace;
		4378	our $_log_backtrace_last;
4086		4379
4087	sub _log_backtrace {	4380	sub _log_backtrace {
4088	my ($msg, @addr) = @_;	4381	my ($msg, @addr) = @_;
4089		4382
4090	$msg =~ s/\n//;	4383	$msg =~ s/\n$//;
4091		4384
		4385	if ($_log_backtrace_last eq $msg) {
		4386	LOG llevInfo, "[ABT] $msg\n";
		4387	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4092	# limit the # of concurrent backtraces	4388	# limit the # of concurrent backtraces
4093	if ($_log_backtrace < 2) {	4389	} elsif ($_log_backtrace < 2) {
		4390	$_log_backtrace_last = $msg;
4094	++$_log_backtrace;	4391	++$_log_backtrace;
4095	my $perl_bt = Carp::longmess $msg;	4392	my $perl_bt = Carp::longmess $msg;
4096	async {	4393	async {
4097	$Coro::current->{desc} = "abt $msg";	4394	$Coro::current->{desc} = "abt $msg";
4098		4395
…		…
4118	LOG llevInfo, "[ABT] $_\n" for @bt;	4415	LOG llevInfo, "[ABT] $_\n" for @bt;
4119	--$_log_backtrace;	4416	--$_log_backtrace;
4120	};	4417	};
4121	} else {	4418	} else {
4122	LOG llevInfo, "[ABT] $msg\n";	4419	LOG llevInfo, "[ABT] $msg\n";
4123	LOG llevInfo, "[ABT] [suppressed]\n";	4420	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4124	}	4421	}
4125	}	4422	}
4126		4423
4127	# load additional modules	4424	# load additional modules
4128	require "cf/$_.pm" for @EXTRA_MODULES;	4425	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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