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.527 by root, Fri Apr 23 04:32:47 2010 UTC vs.
Revision 1.595 by root, Fri Nov 9 16:27:55 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 ();
…		…
78	# strictly for debugging	80	# strictly for debugging
79	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };	81	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80		82
81	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	83	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82		84
		85	our @ORIG_INC;
		86
83	our %COMMAND = ();	87	our %COMMAND = ();
84	our %COMMAND_TIME = ();	88	our %COMMAND_TIME = ();
85		89
86	our @EXTS = (); # list of extension package names	90	our @EXTS = (); # list of extension package names
87	our %EXTCMD = ();	91	our %EXTCMD = ();
		92	our %EXTACMD = ();
88	our %EXTICMD = ();	93	our %EXTICMD = ();
		94	our %EXTIACMD = ();
89	our %EXT_CORO = (); # coroutines bound to extensions	95	our %EXT_CORO = (); # coroutines bound to extensions
90	our %EXT_MAP = (); # pluggable maps	96	our %EXT_MAP = (); # pluggable maps
91		97
92	our $RELOAD; # number of reloads so far, non-zero while in reload	98	our $RELOAD; # number of reloads so far, non-zero while in reload
93	our @EVENT;	99	our @EVENT;
94	our @REFLECT; # set by XS	100	our @REFLECT; # set by XS
95	our %REFLECT; # set by us	101	our %REFLECT; # set by us
96		102
97	our $CONFDIR = confdir;	103	our $CONFDIR = confdir;
		104
98	our $DATADIR = datadir;	105	our $DATADIR = datadir;
99	our $LIBDIR = "$DATADIR/ext";	106	our $LIBDIR = "$DATADIR/ext";
100	our $PODDIR = "$DATADIR/pod";	107	our $PODDIR = "$DATADIR/pod";
101	our $MAPDIR = "$DATADIR/" . mapdir;	108	our $MAPDIR = "$DATADIR/" . mapdir;
		109
102	our $LOCALDIR = localdir;	110	our $LOCALDIR = localdir;
103	our $TMPDIR = "$LOCALDIR/" . tmpdir;	111	our $TMPDIR = "$LOCALDIR/" . tmpdir;
104	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	112	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	113	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106	our $RANDOMDIR = "$LOCALDIR/random";	114	our $RANDOMDIR = "$LOCALDIR/random";
107	our $BDBDIR = "$LOCALDIR/db";	115	our $BDBDIR = "$LOCALDIR/db";
108	our $PIDFILE = "$LOCALDIR/pid";	116	our $PIDFILE = "$LOCALDIR/pid";
109	our $RUNTIMEFILE = "$LOCALDIR/runtime";	117	our $RUNTIMEFILE = "$LOCALDIR/runtime";
110		118
111	our %RESOURCE;	119	#our %RESOURCE; # unused
112		120
113	our $OUTPUT_RATE_MIN = 3000;	121	our $OUTPUT_RATE_MIN = 3000;
114	our $OUTPUT_RATE_MAX = 1000000;	122	our $OUTPUT_RATE_MAX = 1000000;
115		123
116	our $MAX_LINKS = 32; # how many chained exits to follow	124	our $MAX_LINKS = 32; # how many chained exits to follow
117	our $VERBOSE_IO = 0;#d#	125	our $VERBOSE_IO = 1;
118		126
119	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	127	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
120	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	128	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
121	our $NEXT_TICK;	129	our $NEXT_TICK;
122	our $USE_FSYNC = 1; # use fsync to write maps - default on	130	our $USE_FSYNC = 1; # use fsync to write maps - default on
…		…
124	our $BDB_DEADLOCK_WATCHER;	132	our $BDB_DEADLOCK_WATCHER;
125	our $BDB_CHECKPOINT_WATCHER;	133	our $BDB_CHECKPOINT_WATCHER;
126	our $BDB_TRICKLE_WATCHER;	134	our $BDB_TRICKLE_WATCHER;
127	our $DB_ENV;	135	our $DB_ENV;
128		136
129	our @EXTRA_MODULES = qw(pod match mapscript);	137	our @EXTRA_MODULES = qw(pod match mapscript incloader);
130		138
131	our %CFG;	139	our %CFG;
		140	our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
132		141
133	our $UPTIME; $UPTIME ||= time;	142	our $UPTIME; $UPTIME ||= time;
134	our $RUNTIME;	143	our $RUNTIME = 0;
		144	our $SERVER_TICK = 0;
135	our $NOW;	145	our $NOW;
136		146
137	our (%PLAYER, %PLAYER_LOADING); # all users	147	our (%PLAYER, %PLAYER_LOADING); # all users
138	our (%MAP, %MAP_LOADING ); # all maps	148	our (%MAP, %MAP_LOADING ); # all maps
139	our $LINK_MAP; # the special {link} map, which is always available	149	our $LINK_MAP; # the special {link} map, which is always available
…		…
148		158
149	our @POST_INIT;	159	our @POST_INIT;
150		160
151	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)	161	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152	our $REALLY_UNLOOP; # never set to true, please :)	162	our $REALLY_UNLOOP; # never set to true, please :)
		163
		164	our $WAIT_FOR_TICK = new Coro::Signal;
		165	our @WAIT_FOR_TICK_BEGIN;
153		166
154	binmode STDOUT;	167	binmode STDOUT;
155	binmode STDERR;	168	binmode STDERR;
156		169
157	# read virtual server time, if available	170	# read virtual server time, if available
…		…
191		204
192	=over 4	205	=over 4
193		206
194	=item $cf::UPTIME	207	=item $cf::UPTIME
195		208
196	The timestamp of the server start (so not actually an uptime).	209	The timestamp of the server start (so not actually an "uptime").
		210
		211	=item $cf::SERVER_TICK
		212
		213	An unsigned integer that starts at zero when the server is started and is
		214	incremented on every tick.
		215
		216	=item $cf::NOW
		217
		218	The (real) time of the last (current) server tick - updated before and
		219	after tick processing, so this is useful only as a rough "what time is it
		220	now" estimate.
		221
		222	=item $cf::TICK
		223
		224	The interval between each server tick, in seconds.
197		225
198	=item $cf::RUNTIME	226	=item $cf::RUNTIME
199		227
200	The time this server has run, starts at 0 and is increased by $cf::TICK on	228	The time this server has run, starts at 0 and is increased by $cf::TICK on
201	every server tick.	229	every server tick.
202		230
203	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR	231	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
204	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR	232	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
205	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR	233	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
206		234
207	Various directories - "/etc", read-only install directory, perl-library	235	Various directories - "/etc", read-only install directory, perl-library
208	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	236	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
209	unique-items directory, player file directory, random maps directory and	237	unique-items directory, player file directory, random maps directory and
210	database environment.	238	database environment.
211		239
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	240	=item $cf::LOADAVG
221		241
222	The current CPU load on the server (alpha-smoothed), as a value between 0	242	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	243	(none) and 1 (overloaded), indicating how much time is spent on processing
224	objects per tick. Healthy values are < 0.5.	244	objects per tick. Healthy values are < 0.5.
…		…
233	from wherever your confdir points to.	253	from wherever your confdir points to.
234		254
235	=item cf::wait_for_tick, cf::wait_for_tick_begin	255	=item cf::wait_for_tick, cf::wait_for_tick_begin
236		256
237	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	257	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
238	returns directly I<after> the tick processing (and consequently, can only wake one process	258	returns directly I<after> the tick processing (and consequently, can only wake one thread
239	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	259	per tick), while 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) {
…		…
749		905
750	my $t1 = Time::HiRes::time;	906	my $t1 = Time::HiRes::time;
751	my $data = $process->(\@data);	907	my $data = $process->(\@data);
752	my $t2 = Time::HiRes::time;	908	my $t2 = Time::HiRes::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->ob->check_score;
1641	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1850	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1851	ext::highscore::check ($pl->ob);
		1852
1642	$pl->ns->destroy if $pl->ns;	1853	$pl->ns->destroy if $pl->ns;
1643		1854
1644	my $path = playerdir $pl;	1855	my $path = playerdir $pl;
1645	my $temp = "$path~$cf::RUNTIME~deleting~";	1856	my $temp = "$path~$cf::RUNTIME~deleting~";
1646	aio_rename $path, $temp;	1857	aio_rename $path, $temp;
…		…
1732		1943
1733	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1944	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1734		1945
1735	Expand deliantra pod fragments into protocol xml.	1946	Expand deliantra pod fragments into protocol xml.
1736		1947
1737	=item $player->ext_reply ($msgid, @msg)
1738
1739	Sends an ext reply to the player.
1740
1741	=cut
1742
1743	sub ext_reply($$@) {
1744	my ($self, $id, @msg) = @_;
1745
1746	$self->ns->ext_reply ($id, @msg)
1747	}
1748
1749	=item $player->ext_msg ($type, @msg)	1948	=item $player->ext_msg ($type, @msg)
1750		1949
1751	Sends an ext event to the client.	1950	Sends an ext event to the client.
1752		1951
1753	=cut	1952	=cut
…		…
1812	sub generate_random_map {	2011	sub generate_random_map {
1813	my ($self, $rmp) = @_;	2012	my ($self, $rmp) = @_;
1814		2013
1815	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
1816		2015
1817	# mit "rum" bekleckern, nicht
1818	$self->_create_random_map (	2016	$self->_create_random_map ($rmp);
1819	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1820	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1821	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1822	$rmp->{exit_on_final_map},
1823	$rmp->{xsize}, $rmp->{ysize},
1824	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1825	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1826	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1827	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1828	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1829	(cf::region::find $rmp->{region}), $rmp->{custom}
1830	)
1831	}	2017	}
1832		2018
1833	=item cf::map->register ($regex, $prio)	2019	=item cf::map->register ($regex, $prio)
1834		2020
1835	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
…		…
1840		2026
1841	sub register {	2027	sub register {
1842	my (undef, $regex, $prio) = @_;	2028	my (undef, $regex, $prio) = @_;
1843	my $pkg = caller;	2029	my $pkg = caller;
1844		2030
1845	no strict;
1846	push @{"$pkg\::ISA"}, __PACKAGE__;	2031	push @{"$pkg\::ISA"}, __PACKAGE__;
1847		2032
1848	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	2033	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1849	}	2034	}
1850		2035
…		…
1862	}	2047	}
1863		2048
1864	sub normalise {	2049	sub normalise {
1865	my ($path, $base) = @_;	2050	my ($path, $base) = @_;
1866		2051
1867	$path = "$path"; # make sure its a string	2052	$path = "$path"; # make sure it's a string
1868		2053
1869	$path =~ s/\.map$//;	2054	$path =~ s/\.map$//;
1870		2055
1871	# map plan:	2056	# map plan:
1872	#	2057	#
…		…
1887	$base =~ s{[^/]+/?$}{};	2072	$base =~ s{[^/]+/?$}{};
1888	$path = "$base/$path";	2073	$path = "$base/$path";
1889	}	2074	}
1890		2075
1891	for ($path) {	2076	for ($path) {
1892	redo if s{//}{/};
1893	redo if s{/\.?/}{/};	2077	redo if s{/\.?/}{/};
1894	redo if s{/[^/]+/\.\./}{/};	2078	redo if s{/[^/]+/\.\./}{/};
1895	}	2079	}
1896		2080
1897	$path	2081	$path
…		…
1911	$self->init; # pass $1 etc.	2095	$self->init; # pass $1 etc.
1912	return $self;	2096	return $self;
1913	}	2097	}
1914	}	2098	}
1915		2099
1916	Carp::cluck "unable to resolve path '$path' (base '$base').";	2100	Carp::cluck "unable to resolve path '$path' (base '$base')";
1917	()	2101	()
1918	}	2102	}
1919		2103
		2104	# may re-bless or do other evil things
1920	sub init {	2105	sub init {
1921	my ($self) = @_;	2106	my ($self) = @_;
1922		2107
1923	$self	2108	$self
1924	}	2109	}
…		…
1989	$self->{load_path} = $path;	2174	$self->{load_path} = $path;
1990		2175
1991	1	2176	1
1992	}	2177	}
1993		2178
		2179	# used to laod the header of an original map
1994	sub load_header_orig {	2180	sub load_header_orig {
1995	my ($self) = @_;	2181	my ($self) = @_;
1996		2182
1997	$self->load_header_from ($self->load_path)	2183	$self->load_header_from ($self->load_path)
1998	}	2184	}
1999		2185
		2186	# used to laod the header of an instantiated map
2000	sub load_header_temp {	2187	sub load_header_temp {
2001	my ($self) = @_;	2188	my ($self) = @_;
2002		2189
2003	$self->load_header_from ($self->save_path)	2190	$self->load_header_from ($self->save_path)
2004	}	2191	}
2005		2192
		2193	# called after loading the header from an instantiated map
2006	sub prepare_temp {	2194	sub prepare_temp {
2007	my ($self) = @_;	2195	my ($self) = @_;
2008		2196
2009	$self->last_access ((delete $self->{last_access})	2197	$self->last_access ((delete $self->{last_access})
2010	|| $cf::RUNTIME); #d#	2198	|| $cf::RUNTIME); #d#
2011	# safety	2199	# safety
2012	$self->{instantiate_time} = $cf::RUNTIME	2200	$self->{instantiate_time} = $cf::RUNTIME
2013	if $self->{instantiate_time} > $cf::RUNTIME;	2201	if $self->{instantiate_time} > $cf::RUNTIME;
2014	}	2202	}
2015		2203
		2204	# called after loading the header from an original map
2016	sub prepare_orig {	2205	sub prepare_orig {
2017	my ($self) = @_;	2206	my ($self) = @_;
2018		2207
2019	$self->{load_original} = 1;	2208	$self->{load_original} = 1;
2020	$self->{instantiate_time} = $cf::RUNTIME;	2209	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2044		2233
2045	sub find;	2234	sub find;
2046	sub find {	2235	sub find {
2047	my ($path, $origin) = @_;	2236	my ($path, $origin) = @_;
2048		2237
		2238	cf::cede_to_tick;
		2239
2049	$path = normalise $path, $origin && $origin->path;	2240	$path = normalise $path, $origin;
2050		2241
2051	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2242	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2052	my $guard2 = cf::lock_acquire "map_find:$path";	2243	my $guard2 = cf::lock_acquire "map_find:$path";
2053		2244
2054	$cf::MAP{$path} || do {	2245	$cf::MAP{$path} || do {
…		…
2085		2276
2086	{	2277	{
2087	my $guard = cf::lock_acquire "map_data:$path";	2278	my $guard = cf::lock_acquire "map_data:$path";
2088		2279
2089	return unless $self->valid;	2280	return unless $self->valid;
2090	return unless $self->in_memory == cf::MAP_SWAPPED;	2281	return unless $self->state == cf::MAP_SWAPPED;
2091
2092	$self->in_memory (cf::MAP_LOADING);
2093		2282
2094	$self->alloc;	2283	$self->alloc;
2095		2284
2096	$self->pre_load;	2285	$self->pre_load;
2097	cf::cede_to_tick;	2286	cf::cede_to_tick;
2098		2287
		2288	if (exists $self->{load_path}) {
2099	my $f = new_from_file cf::object::thawer $self->{load_path};	2289	my $f = new_from_file cf::object::thawer $self->{load_path};
2100	$f->skip_block;	2290	$f->skip_block;
2101	$self->_load_objects ($f)	2291	$self->_load_objects ($f)
2102	or return;	2292	or return;
2103		2293
2104	$self->post_load_original	2294	$self->post_load_original
2105	if delete $self->{load_original};	2295	if delete $self->{load_original};
2106		2296
2107	if (my $uniq = $self->uniq_path) {	2297	if (my $uniq = $self->uniq_path) {
2108	utf8::encode $uniq;	2298	utf8::encode $uniq;
2109	unless (aio_stat $uniq) {	2299	unless (aio_stat $uniq) {
2110	if (my $f = new_from_file cf::object::thawer $uniq) {	2300	if (my $f = new_from_file cf::object::thawer $uniq) {
2111	$self->clear_unique_items;	2301	$self->clear_unique_items;
2112	$self->_load_objects ($f);	2302	$self->_load_objects ($f);
2113	$f->resolve_delayed_derefs;	2303	$f->resolve_delayed_derefs;
		2304	}
2114	}	2305	}
2115	}	2306	}
2116	}
2117		2307
2118	$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);
2119		2315
2120	cf::cede_to_tick;	2316	cf::cede_to_tick;
2121	# now do the right thing for maps	2317	# now do the right thing for maps
2122	$self->link_multipart_objects;	2318	$self->link_multipart_objects;
2123	$self->difficulty ($self->estimate_difficulty)	2319	$self->difficulty ($self->estimate_difficulty)
…		…
2127	unless ($self->{deny_activate}) {	2323	unless ($self->{deny_activate}) {
2128	$self->decay_objects;	2324	$self->decay_objects;
2129	$self->fix_auto_apply;	2325	$self->fix_auto_apply;
2130	$self->update_buttons;	2326	$self->update_buttons;
2131	cf::cede_to_tick;	2327	cf::cede_to_tick;
2132	$self->activate;	2328	#$self->activate; # no longer activate maps automatically
2133	}	2329	}
2134		2330
2135	$self->{last_save} = $cf::RUNTIME;	2331	$self->{last_save} = $cf::RUNTIME;
2136	$self->last_access ($cf::RUNTIME);	2332	$self->last_access ($cf::RUNTIME);
2137
2138	$self->in_memory (cf::MAP_ACTIVE);
2139	}	2333	}
2140		2334
2141	$self->post_load;	2335	$self->post_load;
		2336
		2337	1
2142	}	2338	}
2143		2339
2144	# customize the map for a given player, i.e.	2340	# customize the map for a given player, i.e.
2145	# return the _real_ map. used by e.g. per-player	2341	# return the _real_ map. used by e.g. per-player
2146	# maps to change the path to ~playername/mappath	2342	# maps to change the path to ~playername/mappath
…		…
2154	# if $self->per_party;	2350	# if $self->per_party;
2155		2351
2156	$self	2352	$self
2157	}	2353	}
2158		2354
2159	# find and load all maps in the 3x3 area around a map
2160	sub load_neighbours {
2161	my ($map) = @_;
2162
2163	my @neigh; # diagonal neighbours
2164
2165	for (0 .. 3) {
2166	my $neigh = $map->tile_path ($_)
2167	or next;
2168	$neigh = find $neigh, $map
2169	or next;
2170	$neigh->load;
2171
2172	# now find the diagonal neighbours
2173	push @neigh,
2174	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2175	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2176	}
2177
2178	for (grep defined $_->[0], @neigh) {
2179	my ($path, $origin) = @$_;
2180	my $neigh = find $path, $origin
2181	or next;
2182	$neigh->load;
2183	}
2184	}
2185
2186	sub find_sync {	2355	sub find_sync {
2187	my ($path, $origin) = @_;	2356	my ($path, $origin) = @_;
2188		2357
2189	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
2190	}	2363	}
2191		2364
2192	sub do_load_sync {	2365	sub do_load_sync {
2193	my ($map) = @_;	2366	my ($map) = @_;
2194		2367
		2368	# it's a bug to call this from the main context
2195	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2369	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2196	if $Coro::current == $Coro::main;	2370	if $Coro::current == $Coro::main;
2197		2371
2198	cf::sync_job { $map->load };	2372	$map->load;
2199	}	2373	}
2200		2374
2201	our %MAP_PREFETCH;	2375	our %MAP_PREFETCH;
2202	our $MAP_PREFETCHER = undef;	2376	our $MAP_PREFETCHER = undef;
2203		2377
2204	sub find_async {	2378	sub find_async {
2205	my ($path, $origin, $load) = @_;	2379	my ($path, $origin, $load) = @_;
2206		2380
2207	$path = normalise $path, $origin && $origin->{path};	2381	$path = normalise $path, $origin;
2208		2382
2209	if (my $map = $cf::MAP{$path}) {	2383	if (my $map = $cf::MAP{$path}) {
2210	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2384	return $map if !$load || $map->linkable;
2211	}	2385	}
2212		2386
2213	$MAP_PREFETCH{$path} |= $load;	2387	$MAP_PREFETCH{$path} |= $load;
2214		2388
2215	$MAP_PREFETCHER ||= cf::async {	2389	$MAP_PREFETCHER ||= cf::async {
…		…
2274	sub swap_out {	2448	sub swap_out {
2275	my ($self) = @_;	2449	my ($self) = @_;
2276		2450
2277	my $lock = cf::lock_acquire "map_data:$self->{path}";	2451	my $lock = cf::lock_acquire "map_data:$self->{path}";
2278		2452
2279	return if $self->in_memory != cf::MAP_ACTIVE;	2453	return if !$self->linkable;
2280	return if $self->{deny_save};	2454	return if $self->{deny_save};
2281	return if $self->players;	2455	return if $self->players;
2282		2456
2283	# first deactivate the map and "unlink" it from the core	2457	# first deactivate the map and "unlink" it from the core
2284	$self->deactivate;	2458	$self->deactivate;
2285	$_->clear_links_to ($self) for values %cf::MAP;	2459	$_->clear_links_to ($self) for values %cf::MAP;
2286	$self->in_memory (cf::MAP_SWAPPED);	2460	$self->state (cf::MAP_SWAPPED);
2287		2461
2288	# then atomically save	2462	# then atomically save
2289	$self->_save;	2463	$self->_save;
2290		2464
2291	# then free the map	2465	# then free the map
…		…
2315		2489
2316	my $lock = cf::lock_acquire "map_data:$self->{path}";	2490	my $lock = cf::lock_acquire "map_data:$self->{path}";
2317		2491
2318	return if $self->players;	2492	return if $self->players;
2319		2493
2320	warn "resetting map ", $self->path, "\n";	2494	cf::trace "resetting map ", $self->path, "\n";
2321		2495
2322	$self->in_memory (cf::MAP_SWAPPED);	2496	$self->state (cf::MAP_SWAPPED);
2323		2497
2324	# need to save uniques path	2498	# need to save uniques path
2325	unless ($self->{deny_save}) {	2499	unless ($self->{deny_save}) {
2326	my $uniq = $self->uniq_path; utf8::encode $uniq;	2500	my $uniq = $self->uniq_path; utf8::encode $uniq;
2327		2501
…		…
2657	# use -1 or undef as default coordinates, not 0, 0	2831	# use -1 or undef as default coordinates, not 0, 0
2658	($x, $y) = ($map->enter_x, $map->enter_y)	2832	($x, $y) = ($map->enter_x, $map->enter_y)
2659	if $x <= 0 && $y <= 0;	2833	if $x <= 0 && $y <= 0;
2660		2834
2661	$map->load;	2835	$map->load;
2662	$map->load_neighbours;
2663		2836
2664	return unless $self->contr->active;	2837	return unless $self->contr->active;
2665		2838
2666	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2839	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2667	if ($self->enter_map ($map, $x, $y)) {	2840	if ($self->enter_map ($map, $x, $y)) {
…		…
2690		2863
2691	sub cf::object::player::goto {	2864	sub cf::object::player::goto {
2692	my ($self, $path, $x, $y, $check, $done) = @_;	2865	my ($self, $path, $x, $y, $check, $done) = @_;
2693		2866
2694	if ($self->{_link_recursion} >= $MAX_LINKS) {	2867	if ($self->{_link_recursion} >= $MAX_LINKS) {
2695	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.";
2696	$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!");
2697	($path, $x, $y) = @$EMERGENCY_POSITION;	2870	($path, $x, $y) = @$EMERGENCY_POSITION;
2698	}	2871	}
2699		2872
2700	# 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
…		…
2723	($path, $x, $y) = (undef, undef, undef);	2896	($path, $x, $y) = (undef, undef, undef);
2724	}	2897	}
2725	}	2898	}
2726		2899
2727	my $map = eval {	2900	my $map = eval {
2728	my $map = defined $path ? cf::map::find $path : undef;	2901	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2729		2902
2730	if ($map) {	2903	if ($map) {
2731	$map = $map->customise_for ($self);	2904	$map = $map->customise_for ($self);
2732	$map = $check->($map, $x, $y, $self) if $check && $map;	2905	$map = $check->($map, $x, $y, $self) if $check && $map;
2733	} else {	2906	} else {
…		…
2823	$Coro::current->{desc} = "enter_exit";	2996	$Coro::current->{desc} = "enter_exit";
2824		2997
2825	unless (eval {	2998	unless (eval {
2826	$self->deactivate_recursive; # just to be sure	2999	$self->deactivate_recursive; # just to be sure
2827		3000
2828	# random map handling
2829	{
2830	my $guard = cf::lock_acquire "exit_prepare:$exit";
2831
2832	prepare_random_map $exit
2833	if $exit->slaying eq "/!";
2834	}
2835
2836	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	3001	my $map = cf::map::normalise $exit->slaying, $exit->map;
2837	my $x = $exit->stats->hp;	3002	my $x = $exit->stats->hp;
2838	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	}
2839		3027
2840	$self->goto ($map, $x, $y);	3028	$self->goto ($map, $x, $y);
2841		3029
2842	# if exit is damned, update players death & WoR home-position	3030	# if exit is damned, update players death & WoR home-position
2843	$self->contr->savebed ($map, $x, $y)	3031	$self->contr->savebed ($map, $x, $y)
…		…
2848	$self->message ("Something went wrong deep within the deliantra server. "	3036	$self->message ("Something went wrong deep within the deliantra server. "
2849	. "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. "
2850	. "Please report this to the dungeon master!",	3038	. "Please report this to the dungeon master!",
2851	cf::NDI_UNIQUE | cf::NDI_RED);	3039	cf::NDI_UNIQUE | cf::NDI_RED);
2852		3040
2853	warn "ERROR in enter_exit: $@";	3041	error "ERROR in enter_exit: $@";
2854	$self->leave_link;	3042	$self->leave_link;
2855	}	3043	}
2856	})->prio (1);	3044	})->prio (1);
2857	}	3045	}
2858		3046
…		…
3068	=cut	3256	=cut
3069		3257
3070	sub cf::client::ext_msg($$@) {	3258	sub cf::client::ext_msg($$@) {
3071	my ($self, $type, @msg) = @_;	3259	my ($self, $type, @msg) = @_;
3072		3260
3073	if ($self->extcmd == 2) {
3074	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3261	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3075	} elsif ($self->extcmd == 1) { # TODO: remove
3076	push @msg, msgtype => "event_$type";
3077	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3078	}
3079	}
3080
3081	=item $client->ext_reply ($msgid, @msg)
3082
3083	Sends an ext reply to the client.
3084
3085	=cut
3086
3087	sub cf::client::ext_reply($$@) {
3088	my ($self, $id, @msg) = @_;
3089
3090	if ($self->extcmd == 2) {
3091	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3092	} elsif ($self->extcmd == 1) {
3093	#TODO: version 1, remove
3094	unshift @msg, msgtype => "reply", msgid => $id;
3095	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3096	}
3097	}	3262	}
3098		3263
3099	=item $success = $client->query ($flags, "text", \&cb)	3264	=item $success = $client->query ($flags, "text", \&cb)
3100		3265
3101	Queues a query to the client, calling the given callback with	3266	Queues a query to the client, calling the given callback with
…		…
3156	my ($ns, $buf) = @_;	3321	my ($ns, $buf) = @_;
3157		3322
3158	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3323	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3159		3324
3160	if (ref $msg) {	3325	if (ref $msg) {
3161	my ($type, $reply, @payload) =	3326	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3162	"ARRAY" eq ref $msg
3163	? @$msg
3164	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3165		3327
3166	my @reply;
3167
3168	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}) {
3169	@reply = $cb->($ns, @payload);	3341	@reply = $cb->($ns, @payload);
		3342	}
		3343
		3344	$ns->ext_msg ("reply-$reply", @reply)
		3345	if $reply;
3170	}	3346	}
3171
3172	$ns->ext_reply ($reply, @reply)
3173	if $reply;
3174
3175	} else {	3347	} else {
3176	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";
3177	}	3349	}
3178		3350
3179	cf::override;	3351	cf::override;
3180	},	3352	},
3181	);	3353	);
…		…
3262	decrease split destroy change_exp value msg lore send_msg)],	3434	decrease split destroy change_exp value msg lore send_msg)],
3263	["cf::object::player" => qw(player)],	3435	["cf::object::player" => qw(player)],
3264	["cf::player" => qw(peaceful send_msg)],	3436	["cf::player" => qw(peaceful send_msg)],
3265	["cf::map" => qw(trigger)],	3437	["cf::map" => qw(trigger)],
3266	) {	3438	) {
3267	no strict 'refs';
3268	my ($pkg, @funs) = @$_;	3439	my ($pkg, @funs) = @$_;
3269	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3440	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3270	for @funs;	3441	for @funs;
3271	}	3442	}
3272		3443
…		…
3311	local @cf::_safe_eval_args = values %vars;	3482	local @cf::_safe_eval_args = values %vars;
3312	@res = wantarray ? eval eval : scalar eval $eval;	3483	@res = wantarray ? eval eval : scalar eval $eval;
3313	}	3484	}
3314		3485
3315	if ($@) {	3486	if ($@) {
3316	warn "$@";	3487	warn "$@",
3317	warn "while executing safe code '$code'\n";	3488	"while executing safe code '$code'\n",
3318	warn "with arguments " . (join " ", %vars) . "\n";	3489	"with arguments " . (join " ", %vars) . "\n";
3319	}	3490	}
3320		3491
3321	wantarray ? @res : $res[0]	3492	wantarray ? @res : $res[0]
3322	}	3493	}
3323		3494
…		…
3348	=cut	3519	=cut
3349		3520
3350	#############################################################################	3521	#############################################################################
3351	# the server's init and main functions	3522	# the server's init and main functions
3352		3523
		3524	our %FACEHASH; # hash => idx, #d# HACK for http server
		3525
		3526	# internal api, not fianlised
		3527	sub add_face {
		3528	my ($name, $type, $data) = @_;
		3529
		3530	my $idx = cf::face::find $name;
		3531
		3532	if ($idx) {
		3533	delete $FACEHASH{cf::face::get_chksum $idx};
		3534	} else {
		3535	$idx = cf::face::alloc $name;
		3536	}
		3537
		3538	my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
		3539
		3540	cf::face::set_type $idx, $type;
		3541	cf::face::set_data $idx, 0, $data, $hash;
		3542	cf::face::set_meta $idx, $type & 1 ? undef : undef;
		3543	$FACEHASH{$hash} = $idx;#d#
		3544
		3545	$idx
		3546	}
		3547
3353	sub load_facedata($) {	3548	sub load_facedata($) {
3354	my ($path) = @_;	3549	my ($path) = @_;
3355		3550
3356	# HACK to clear player env face cache, we need some signal framework	3551	# HACK to clear player env face cache, we need some signal framework
3357	# for this (global event?)	3552	# for this (global event?)
3358	%ext::player_env::MUSIC_FACE_CACHE = ();	3553	%ext::player_env::MUSIC_FACE_CACHE = ();
3359		3554
3360	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3555	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3361		3556
3362	warn "loading facedata from $path\n";	3557	trace "loading facedata from $path\n";
3363		3558
3364	my $facedata;	3559	my $facedata = decode_storable load_file $path;
3365	0 < aio_load $path, $facedata
3366	or die "$path: $!";
3367
3368	$facedata = Coro::Storable::thaw $facedata;
3369		3560
3370	$facedata->{version} == 2	3561	$facedata->{version} == 2
3371	or cf::cleanup "$path: version mismatch, cannot proceed.";	3562	or cf::cleanup "$path: version mismatch, cannot proceed.";
3372		3563
3373	# patch in the exptable
3374	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3375	$facedata->{resource}{"res/exp_table"} = {
3376	type => FT_RSRC,
3377	data => $exp_table,
3378	hash => (Digest::MD5::md5 $exp_table),
3379	};
3380	cf::cede_to_tick;	3564	cf::cede_to_tick;
3381		3565
3382	{	3566	{
3383	my $faces = $facedata->{faceinfo};	3567	my $faces = $facedata->{faceinfo};
3384		3568
3385	while (my ($face, $info) = each %$faces) {	3569	for my $face (sort keys %$faces) {
		3570	my $info = $faces->{$face};
3386	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3571	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3387		3572
3388	cf::face::set_visibility $idx, $info->{visibility};	3573	cf::face::set_visibility $idx, $info->{visibility};
3389	cf::face::set_magicmap $idx, $info->{magicmap};	3574	cf::face::set_magicmap $idx, $info->{magicmap};
3390	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3575	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3391	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3576	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
		3577	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
		3578	$FACEHASH{$info->{hash64}} = $idx;#d#
3392		3579
3393	cf::cede_to_tick;	3580	cf::cede_to_tick;
3394	}	3581	}
3395		3582
3396	while (my ($face, $info) = each %$faces) {	3583	while (my ($face, $info) = each %$faces) {
…		…
3401		3588
3402	if (my $smooth = cf::face::find $info->{smooth}) {	3589	if (my $smooth = cf::face::find $info->{smooth}) {
3403	cf::face::set_smooth $idx, $smooth;	3590	cf::face::set_smooth $idx, $smooth;
3404	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3591	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3405	} else {	3592	} else {
3406	warn "smooth face '$info->{smooth}' not found for face '$face'";	3593	error "smooth face '$info->{smooth}' not found for face '$face'";
3407	}	3594	}
3408		3595
3409	cf::cede_to_tick;	3596	cf::cede_to_tick;
3410	}	3597	}
3411	}	3598	}
…		…
3423		3610
3424	{	3611	{
3425	my $res = $facedata->{resource};	3612	my $res = $facedata->{resource};
3426		3613
3427	while (my ($name, $info) = each %$res) {	3614	while (my ($name, $info) = each %$res) {
3428	if (defined $info->{type}) {	3615	if (defined (my $type = $info->{type})) {
		3616	# TODO: different hash - must free and use new index, or cache ixface data queue
3429	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3617	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3430		3618
		3619	cf::face::set_type $idx, $type;
3431	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};	3620	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3432	cf::face::set_type $idx, $info->{type};	3621	cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3622	$FACEHASH{$info->{hash}} = $idx;#d#
3433	} else {	3623	} else {
3434	$RESOURCE{$name} = $info;	3624	# $RESOURCE{$name} = $info; # unused
3435	}	3625	}
3436		3626
3437	cf::cede_to_tick;	3627	cf::cede_to_tick;
3438	}	3628	}
3439	}	3629	}
3440		3630
3441	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3631	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3442		3632
3443	1	3633	1
3444	}	3634	}
3445
3446	cf::global->attach (on_resource_update => sub {
3447	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3448	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3449
3450	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3451	my $sound = $soundconf->{compat}[$_]
3452	or next;
3453
3454	my $face = cf::face::find "sound/$sound->[1]";
3455	cf::sound::set $sound->[0] => $face;
3456	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3457	}
3458
3459	while (my ($k, $v) = each %{$soundconf->{event}}) {
3460	my $face = cf::face::find "sound/$v";
3461	cf::sound::set $k => $face;
3462	}
3463	}
3464	});
3465		3635
3466	register_exticmd fx_want => sub {	3636	register_exticmd fx_want => sub {
3467	my ($ns, $want) = @_;	3637	my ($ns, $want) = @_;
3468		3638
3469	while (my ($k, $v) = each %$want) {	3639	while (my ($k, $v) = each %$want) {
…		…
3477	my $status = load_resource_file_ $_[0];	3647	my $status = load_resource_file_ $_[0];
3478	get_slot 0.1, 100;	3648	get_slot 0.1, 100;
3479	cf::arch::commit_load;	3649	cf::arch::commit_load;
3480		3650
3481	$status	3651	$status
		3652	}
		3653
		3654	sub reload_exp_table {
		3655	_reload_exp_table;
		3656
		3657	add_face "res/exp_table" => FT_RSRC,
		3658	JSON::XS->new->utf8->canonical->encode (
		3659	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3660	);
		3661	}
		3662
		3663	sub reload_materials {
		3664	_reload_materials;
3482	}	3665	}
3483		3666
3484	sub reload_regions {	3667	sub reload_regions {
3485	# HACK to clear player env face cache, we need some signal framework	3668	# HACK to clear player env face cache, we need some signal framework
3486	# for this (global event?)	3669	# for this (global event?)
…		…
3501	}	3684	}
3502		3685
3503	sub reload_archetypes {	3686	sub reload_archetypes {
3504	load_resource_file "$DATADIR/archetypes"	3687	load_resource_file "$DATADIR/archetypes"
3505	or die "unable to load archetypes\n";	3688	or die "unable to load archetypes\n";
		3689
		3690	add_face "res/skill_info" => FT_RSRC,
		3691	JSON::XS->new->utf8->canonical->encode (
		3692	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3693	);
		3694	add_face "res/spell_paths" => FT_RSRC,
		3695	JSON::XS->new->utf8->canonical->encode (
		3696	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3697	);
3506	}	3698	}
3507		3699
3508	sub reload_treasures {	3700	sub reload_treasures {
3509	load_resource_file "$DATADIR/treasures"	3701	load_resource_file "$DATADIR/treasures"
3510	or die "unable to load treasurelists\n";	3702	or die "unable to load treasurelists\n";
3511	}	3703	}
3512		3704
		3705	sub reload_sound {
		3706	trace "loading sound config from $DATADIR/sound\n";
		3707
		3708	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
		3709
		3710	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3711	my $sound = $soundconf->{compat}[$_]
		3712	or next;
		3713
		3714	my $face = cf::face::find "sound/$sound->[1]";
		3715	cf::sound::set $sound->[0] => $face;
		3716	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3717	}
		3718
		3719	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3720	my $face = cf::face::find "sound/$v";
		3721	cf::sound::set $k => $face;
		3722	}
		3723	}
		3724
3513	sub reload_resources {	3725	sub reload_resources {
3514	warn "reloading resource files...\n";	3726	trace "reloading resource files...\n";
3515		3727
		3728	reload_materials;
3516	reload_facedata;	3729	reload_facedata;
		3730	reload_exp_table;
		3731	reload_sound;
3517	reload_archetypes;	3732	reload_archetypes;
3518	reload_regions;	3733	reload_regions;
3519	reload_treasures;	3734	reload_treasures;
3520		3735
3521	warn "finished reloading resource files\n";	3736	trace "finished reloading resource files\n";
3522	}	3737	}
3523		3738
3524	sub reload_config {	3739	sub reload_config {
3525	warn "reloading config file...\n";	3740	trace "reloading config file...\n";
3526		3741
3527	open my $fh, "<:utf8", "$CONFDIR/config"	3742	my $config = load_file "$CONFDIR/config";
3528	or return;	3743	utf8::decode $config;
3529		3744	*CFG = decode_yaml $config;
3530	local $/;
3531	*CFG = YAML::XS::Load scalar <$fh>;
3532		3745
3533	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];	3746	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3534		3747
3535	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3748	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3536	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3749	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
3540	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3753	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3541	and die "WARNING: m(un)lockall failed: $!\n";	3754	and die "WARNING: m(un)lockall failed: $!\n";
3542	};	3755	};
3543	warn $@ if $@;	3756	warn $@ if $@;
3544	}	3757	}
3545
3546	warn "finished reloading resource files\n";
3547	}	3758	}
3548		3759
3549	sub pidfile() {	3760	sub pidfile() {
3550	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3761	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3551	or die "$PIDFILE: $!";	3762	or die "$PIDFILE: $!";
…		…
3564	seek $fh, 0, 0;	3775	seek $fh, 0, 0;
3565	print $fh $$;	3776	print $fh $$;
3566	}	3777	}
3567		3778
3568	sub main_loop {	3779	sub main_loop {
3569	warn "EV::loop starting\n";	3780	trace "EV::loop starting\n";
3570	if (1) {	3781	if (1) {
3571	EV::loop;	3782	EV::loop;
3572	}	3783	}
3573	warn "EV::loop returned\n";	3784	trace "EV::loop returned\n";
3574	goto &main_loop unless $REALLY_UNLOOP;	3785	goto &main_loop unless $REALLY_UNLOOP;
3575	}	3786	}
3576		3787
3577	sub main {	3788	sub main {
3578	cf::init_globals; # initialise logging	3789	cf::init_globals; # initialise logging
3579		3790
3580	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3791	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3581	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3792	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3582	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3793	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3583	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3794	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3584		3795
3585	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3796	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3586		3797
3587	# we must not ever block the main coroutine	3798	# we must not ever block the main coroutine
3588	local $Coro::idle = sub {	3799	$Coro::idle = sub {
3589	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3800	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3590	(async {	3801	(async {
3591	$Coro::current->{desc} = "IDLE BUG HANDLER";	3802	$Coro::current->{desc} = "IDLE BUG HANDLER";
3592	EV::loop EV::LOOP_ONESHOT;	3803	EV::loop EV::LOOP_ONESHOT;
3593	})->prio (Coro::PRIO_MAX);	3804	})->prio (Coro::PRIO_MAX);
3594	};	3805	};
3595		3806
3596	evthread_start IO::AIO::poll_fileno;	3807	evthread_start IO::AIO::poll_fileno;
3597		3808
3598	cf::sync_job {	3809	cf::sync_job {
3599	cf::init_experience;	3810	cf::incloader::init ();
		3811
		3812	db_init;
		3813
3600	cf::init_anim;	3814	cf::init_anim;
3601	cf::init_attackmess;	3815	cf::init_attackmess;
3602	cf::init_dynamic;	3816	cf::init_dynamic;
3603		3817
3604	cf::load_settings;	3818	cf::load_settings;
3605	cf::load_materials;
3606		3819
3607	reload_resources;	3820	reload_resources;
3608	reload_config;	3821	reload_config;
3609	db_init;
3610		3822
3611	cf::init_uuid;	3823	cf::init_uuid;
3612	cf::init_signals;	3824	cf::init_signals;
3613	cf::init_skills;	3825	cf::init_skills;
3614		3826
…		…
3622		3834
3623	# no (long-running) fork's whatsoever before this point(!)	3835	# no (long-running) fork's whatsoever before this point(!)
3624	use POSIX ();	3836	use POSIX ();
3625	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3837	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3626		3838
3627	(pop @POST_INIT)->(0) while @POST_INIT;	3839	cf::_post_init 0;
3628	};	3840	};
3629		3841
3630	cf::object::thawer::errors_are_fatal 0;	3842	cf::object::thawer::errors_are_fatal 0;
3631	warn "parse errors in files are no longer fatal from this point on.\n";	3843	info "parse errors in files are no longer fatal from this point on.\n";
3632		3844
		3845	AE::postpone {
		3846	undef &main; # free gobs of memory :)
		3847	};
		3848
3633	main_loop;	3849	goto &main_loop;
3634	}	3850	}
3635		3851
3636	#############################################################################	3852	#############################################################################
3637	# initialisation and cleanup	3853	# initialisation and cleanup
3638		3854
…		…
3677	or return;	3893	or return;
3678		3894
3679	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3895	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3680	and return;	3896	and return;
3681		3897
3682	warn sprintf "runtime file written (%gs).\n", AE::time - $t0;	3898	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3683		3899
3684	1	3900	1
3685	}	3901	}
3686		3902
3687	our $uuid_lock;	3903	our $uuid_lock;
…		…
3699	or return;	3915	or return;
3700		3916
3701	my $value = uuid_seq uuid_cur;	3917	my $value = uuid_seq uuid_cur;
3702		3918
3703	unless ($value) {	3919	unless ($value) {
3704	warn "cowardly refusing to write zero uuid value!\n";	3920	info "cowardly refusing to write zero uuid value!\n";
3705	return;	3921	return;
3706	}	3922	}
3707		3923
3708	my $value = uuid_str $value + $uuid_skip;	3924	my $value = uuid_str $value + $uuid_skip;
3709	$uuid_skip = 0;	3925	$uuid_skip = 0;
…		…
3719	or return;	3935	or return;
3720		3936
3721	aio_rename "$uuid~", $uuid	3937	aio_rename "$uuid~", $uuid
3722	and return;	3938	and return;
3723		3939
3724	warn "uuid file written ($value).\n";	3940	trace "uuid file written ($value).\n";
3725		3941
3726	1	3942	1
3727		3943
3728	}	3944	}
3729		3945
…		…
3735	}	3951	}
3736		3952
3737	sub emergency_save() {	3953	sub emergency_save() {
3738	my $freeze_guard = cf::freeze_mainloop;	3954	my $freeze_guard = cf::freeze_mainloop;
3739		3955
3740	warn "emergency_perl_save: enter\n";	3956	info "emergency_perl_save: enter\n";
		3957
		3958	# this is a trade-off: we want to be very quick here, so
		3959	# save all maps without fsync, and later call a global sync
		3960	# (which in turn might be very very slow)
		3961	local $USE_FSYNC = 0;
3741		3962
3742	cf::sync_job {	3963	cf::sync_job {
3743	# this is a trade-off: we want to be very quick here, so	3964	cf::write_runtime_sync; # external watchdog should not bark
3744	# save all maps without fsync, and later call a global sync
3745	# (which in turn might be very very slow)
3746	local $USE_FSYNC = 0;
3747		3965
3748	# use a peculiar iteration method to avoid tripping on perl	3966	# use a peculiar iteration method to avoid tripping on perl
3749	# refcount bugs in for. also avoids problems with players	3967	# refcount bugs in for. also avoids problems with players
3750	# and maps saved/destroyed asynchronously.	3968	# and maps saved/destroyed asynchronously.
3751	warn "emergency_perl_save: begin player save\n";	3969	info "emergency_perl_save: begin player save\n";
3752	for my $login (keys %cf::PLAYER) {	3970	for my $login (keys %cf::PLAYER) {
3753	my $pl = $cf::PLAYER{$login} or next;	3971	my $pl = $cf::PLAYER{$login} or next;
3754	$pl->valid or next;	3972	$pl->valid or next;
3755	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3973	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3756	$pl->save;	3974	$pl->save;
3757	}	3975	}
3758	warn "emergency_perl_save: end player save\n";	3976	info "emergency_perl_save: end player save\n";
3759		3977
		3978	cf::write_runtime_sync; # external watchdog should not bark
		3979
3760	warn "emergency_perl_save: begin map save\n";	3980	info "emergency_perl_save: begin map save\n";
3761	for my $path (keys %cf::MAP) {	3981	for my $path (keys %cf::MAP) {
3762	my $map = $cf::MAP{$path} or next;	3982	my $map = $cf::MAP{$path} or next;
3763	$map->valid or next;	3983	$map->valid or next;
3764	$map->save;	3984	$map->save;
3765	}	3985	}
3766	warn "emergency_perl_save: end map save\n";	3986	info "emergency_perl_save: end map save\n";
3767		3987
		3988	cf::write_runtime_sync; # external watchdog should not bark
		3989
3768	warn "emergency_perl_save: begin database checkpoint\n";	3990	info "emergency_perl_save: begin database checkpoint\n";
3769	BDB::db_env_txn_checkpoint $DB_ENV;	3991	BDB::db_env_txn_checkpoint $DB_ENV;
3770	warn "emergency_perl_save: end database checkpoint\n";	3992	info "emergency_perl_save: end database checkpoint\n";
3771		3993
3772	warn "emergency_perl_save: begin write uuid\n";	3994	info "emergency_perl_save: begin write uuid\n";
3773	write_uuid_sync 1;	3995	write_uuid_sync 1;
3774	warn "emergency_perl_save: end write uuid\n";	3996	info "emergency_perl_save: end write uuid\n";
		3997
		3998	cf::write_runtime_sync; # external watchdog should not bark
		3999
		4000	trace "emergency_perl_save: syncing database to disk";
		4001	BDB::db_env_txn_checkpoint $DB_ENV;
		4002
		4003	info "emergency_perl_save: starting sync\n";
		4004	IO::AIO::aio_sync sub {
		4005	info "emergency_perl_save: finished sync\n";
		4006	};
		4007
		4008	cf::write_runtime_sync; # external watchdog should not bark
		4009
		4010	trace "emergency_perl_save: flushing outstanding aio requests";
		4011	while (IO::AIO::nreqs || BDB::nreqs) {
		4012	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
		4013	}
		4014
		4015	cf::write_runtime_sync; # external watchdog should not bark
3775	};	4016	};
3776		4017
3777	warn "emergency_perl_save: starting sync()\n";
3778	IO::AIO::aio_sync sub {
3779	warn "emergency_perl_save: finished sync()\n";
3780	};
3781
3782	warn "emergency_perl_save: leave\n";	4018	info "emergency_perl_save: leave\n";
3783	}	4019	}
3784		4020
3785	sub post_cleanup {	4021	sub post_cleanup {
3786	my ($make_core) = @_;	4022	my ($make_core) = @_;
3787		4023
		4024	IO::AIO::flush;
		4025
3788	warn Carp::longmess "post_cleanup backtrace"	4026	error Carp::longmess "post_cleanup backtrace"
3789	if $make_core;	4027	if $make_core;
3790		4028
3791	my $fh = pidfile;	4029	my $fh = pidfile;
3792	unlink $PIDFILE if <$fh> == $$;	4030	unlink $PIDFILE if <$fh> == $$;
3793	}	4031	}
…		…
3817	}	4055	}
3818	}	4056	}
3819		4057
3820	sub do_reload_perl() {	4058	sub do_reload_perl() {
3821	# can/must only be called in main	4059	# can/must only be called in main
3822	if (in_main) {	4060	unless (in_main) {
3823	warn "can only reload from main coroutine";	4061	error "can only reload from main coroutine";
3824	return;	4062	return;
3825	}	4063	}
3826		4064
3827	return if $RELOAD++;	4065	return if $RELOAD++;
3828		4066
3829	my $t1 = AE::time;	4067	my $t1 = AE::time;
3830		4068
3831	while ($RELOAD) {	4069	while ($RELOAD) {
3832	warn "reloading...";	4070	cf::get_slot 0.1, -1, "reload_perl";
		4071	info "perl_reload: reloading...";
3833		4072
3834	warn "entering sync_job";	4073	trace "perl_reload: entering sync_job";
3835		4074
3836	cf::sync_job {	4075	cf::sync_job {
3837	cf::write_runtime_sync; # external watchdog should not bark
3838	cf::emergency_save;	4076	#cf::emergency_save;
3839	cf::write_runtime_sync; # external watchdog should not bark
3840		4077
3841	warn "syncing database to disk";
3842	BDB::db_env_txn_checkpoint $DB_ENV;
3843
3844	# if anything goes wrong in here, we should simply crash as we already saved
3845
3846	warn "flushing outstanding aio requests";
3847	while (IO::AIO::nreqs || BDB::nreqs) {
3848	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3849	}
3850
3851	warn "cancelling all extension coros";	4078	trace "perl_reload: cancelling all extension coros";
3852	$_->cancel for values %EXT_CORO;	4079	$_->cancel for values %EXT_CORO;
3853	%EXT_CORO = ();	4080	%EXT_CORO = ();
3854		4081
3855	warn "removing commands";	4082	trace "perl_reload: removing commands";
3856	%COMMAND = ();	4083	%COMMAND = ();
3857		4084
3858	warn "removing ext/exti commands";	4085	trace "perl_reload: removing ext/exti commands";
3859	%EXTCMD = ();	4086	%EXTCMD = ();
3860	%EXTICMD = ();	4087	%EXTICMD = ();
3861		4088
3862	warn "unloading/nuking all extensions";	4089	trace "perl_reload: unloading/nuking all extensions";
3863	for my $pkg (@EXTS) {	4090	for my $pkg (@EXTS) {
3864	warn "... unloading $pkg";	4091	trace "... unloading $pkg";
3865		4092
3866	if (my $cb = $pkg->can ("unload")) {	4093	if (my $cb = $pkg->can ("unload")) {
3867	eval {	4094	eval {
3868	$cb->($pkg);	4095	$cb->($pkg);
3869	1	4096	1
3870	} or warn "$pkg unloaded, but with errors: $@";	4097	} or error "$pkg unloaded, but with errors: $@";
3871	}	4098	}
3872		4099
3873	warn "... clearing $pkg";	4100	trace "... clearing $pkg";
3874	clear_package $pkg;	4101	clear_package $pkg;
3875	}	4102	}
3876		4103
3877	warn "unloading all perl modules loaded from $LIBDIR";	4104	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3878	while (my ($k, $v) = each %INC) {	4105	while (my ($k, $v) = each %INC) {
3879	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4106	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3880		4107
3881	warn "... unloading $k";	4108	trace "... unloading $k";
3882	delete $INC{$k};	4109	delete $INC{$k};
3883		4110
3884	$k =~ s/\.pm$//;	4111	$k =~ s/\.pm$//;
3885	$k =~ s/\//::/g;	4112	$k =~ s/\//::/g;
3886		4113
…		…
3889	}	4116	}
3890		4117
3891	clear_package $k;	4118	clear_package $k;
3892	}	4119	}
3893		4120
3894	warn "getting rid of safe::, as good as possible";	4121	trace "perl_reload: getting rid of safe::, as good as possible";
3895	clear_package "safe::$_"	4122	clear_package "safe::$_"
3896	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4123	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3897		4124
3898	warn "unloading cf.pm \"a bit\"";	4125	trace "perl_reload: unloading cf.pm \"a bit\"";
3899	delete $INC{"cf.pm"};	4126	delete $INC{"cf.pm"};
3900	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4127	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3901		4128
3902	# don't, removes xs symbols, too,	4129	# don't, removes xs symbols, too,
3903	# and global variables created in xs	4130	# and global variables created in xs
3904	#clear_package __PACKAGE__;	4131	#clear_package __PACKAGE__;
3905		4132
3906	warn "unload completed, starting to reload now";	4133	info "perl_reload: unload completed, starting to reload now";
3907		4134
3908	warn "reloading cf.pm";	4135	trace "perl_reload: reloading cf.pm";
3909	require cf;	4136	require cf;
3910	cf::_connect_to_perl_1;	4137	cf::_connect_to_perl_1;
3911		4138
3912	warn "loading config and database again";	4139	trace "perl_reload: loading config and database again";
3913	cf::reload_config;	4140	cf::reload_config;
3914		4141
3915	warn "loading extensions";	4142	trace "perl_reload: loading extensions";
3916	cf::load_extensions;	4143	cf::load_extensions;
3917		4144
3918	if ($REATTACH_ON_RELOAD) {	4145	if ($REATTACH_ON_RELOAD) {
3919	warn "reattaching attachments to objects/players";	4146	trace "perl_reload: reattaching attachments to objects/players";
3920	_global_reattach; # objects, sockets	4147	_global_reattach; # objects, sockets
3921	warn "reattaching attachments to maps";	4148	trace "perl_reload: reattaching attachments to maps";
3922	reattach $_ for values %MAP;	4149	reattach $_ for values %MAP;
3923	warn "reattaching attachments to players";	4150	trace "perl_reload: reattaching attachments to players";
3924	reattach $_ for values %PLAYER;	4151	reattach $_ for values %PLAYER;
3925	}	4152	}
3926		4153
3927	warn "running post_init jobs";	4154	cf::_post_init 1;
3928	(pop @POST_INIT)->(1) while @POST_INIT;
3929		4155
3930	warn "leaving sync_job";	4156	trace "perl_reload: leaving sync_job";
3931		4157
3932	1	4158	1
3933	} or do {	4159	} or do {
3934	warn $@;	4160	error $@;
3935	cf::cleanup "error while reloading, exiting.";	4161	cf::cleanup "perl_reload: error, exiting.";
3936	};	4162	};
3937		4163
3938	warn "reloaded";
3939	--$RELOAD;	4164	--$RELOAD;
3940	}	4165	}
3941		4166
3942	$t1 = AE::time - $t1;	4167	$t1 = AE::time - $t1;
3943	warn "reload completed in ${t1}s\n";	4168	info "perl_reload: completed in ${t1}s\n";
3944	};	4169	};
3945		4170
3946	our $RELOAD_WATCHER; # used only during reload	4171	our $RELOAD_WATCHER; # used only during reload
3947		4172
3948	sub reload_perl() {	4173	sub reload_perl() {
…		…
3969	reload_perl;	4194	reload_perl;
3970	};	4195	};
3971	}	4196	}
3972	};	4197	};
3973		4198
3974	unshift @INC, $LIBDIR;	4199	#############################################################################
3975		4200
3976	my $bug_warning = 0;	4201	my $bug_warning = 0;
3977		4202
3978	our @WAIT_FOR_TICK;
3979	our @WAIT_FOR_TICK_BEGIN;
3980
3981	sub wait_for_tick {	4203	sub wait_for_tick() {
3982	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4204	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3983		4205
3984	my $signal = new Coro::Signal;	4206	$WAIT_FOR_TICK->wait;
3985	push @WAIT_FOR_TICK, $signal;
3986	$signal->wait;
3987	}	4207	}
3988		4208
3989	sub wait_for_tick_begin {	4209	sub wait_for_tick_begin() {
3990	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4210	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3991		4211
3992	my $signal = new Coro::Signal;	4212	my $signal = new Coro::Signal;
3993	push @WAIT_FOR_TICK_BEGIN, $signal;	4213	push @WAIT_FOR_TICK_BEGIN, $signal;
3994	$signal->wait;	4214	$signal->wait;
3995	}	4215	}
…		…
3999	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4219	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4000	unless ++$bug_warning > 10;	4220	unless ++$bug_warning > 10;
4001	return;	4221	return;
4002	}	4222	}
4003		4223
4004	cf::server_tick; # one server iteration	4224	cf::one_tick; # one server iteration
4005		4225
4006	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#	4226	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4007		4227
4008	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4228	if ($NOW >= $NEXT_RUNTIME_WRITE) {
4009	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4229	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
4010	Coro::async_pool {	4230	Coro::async_pool {
4011	$Coro::current->{desc} = "runtime saver";	4231	$Coro::current->{desc} = "runtime saver";
4012	write_runtime_sync	4232	write_runtime_sync
4013	or warn "ERROR: unable to write runtime file: $!";	4233	or error "ERROR: unable to write runtime file: $!";
4014	};	4234	};
4015	}	4235	}
4016		4236
4017	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4237	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4018	$sig->send;	4238	$sig->send;
4019	}	4239	}
4020	while (my $sig = shift @WAIT_FOR_TICK) {	4240	$WAIT_FOR_TICK->broadcast;
4021	$sig->send;
4022	}
4023		4241
4024	$LOAD = ($NOW - $TICK_START) / $TICK;	4242	$LOAD = ($NOW - $TICK_START) / $TICK;
4025	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4243	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4026		4244
4027	if (0) {	4245	if (0) {
4028	if ($NEXT_TICK) {	4246	if ($NEXT_TICK) {
4029	my $jitter = $TICK_START - $NEXT_TICK;	4247	my $jitter = $TICK_START - $NEXT_TICK;
4030	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4248	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
4031	warn "jitter $JITTER\n";#d#	4249	debug "jitter $JITTER\n";#d#
4032	}	4250	}
4033	}	4251	}
4034	}	4252	}
4035		4253
4036	{	4254	{
4037	# configure BDB	4255	# configure BDB
		4256	info "initialising database";
4038		4257
4039	BDB::min_parallel 16;	4258	BDB::min_parallel 16;
4040	BDB::max_poll_reqs $TICK * 0.1;	4259	BDB::max_poll_reqs $TICK * 0.1;
4041	$AnyEvent::BDB::WATCHER->priority (1);	4260	#$AnyEvent::BDB::WATCHER->priority (1);
4042		4261
4043	unless ($DB_ENV) {	4262	unless ($DB_ENV) {
4044	$DB_ENV = BDB::db_env_create;	4263	$DB_ENV = BDB::db_env_create;
4045	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4264	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4046	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4265	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
4071	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4290	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4072	};	4291	};
4073	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4292	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4074	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4293	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4075	};	4294	};
		4295
		4296	info "database initialised";
4076	}	4297	}
4077		4298
4078	{	4299	{
4079	# configure IO::AIO	4300	# configure IO::AIO
4080		4301
		4302	info "initialising aio";
4081	IO::AIO::min_parallel 8;	4303	IO::AIO::min_parallel 8;
4082	IO::AIO::max_poll_time $TICK * 0.1;	4304	IO::AIO::max_poll_time $TICK * 0.1;
4083	undef $AnyEvent::AIO::WATCHER;	4305	undef $AnyEvent::AIO::WATCHER;
		4306	info "aio initialised";
4084	}	4307	}
4085		4308
4086	my $_log_backtrace;	4309	our $_log_backtrace;
		4310	our $_log_backtrace_last;
4087		4311
4088	sub _log_backtrace {	4312	sub _log_backtrace {
4089	my ($msg, @addr) = @_;	4313	my ($msg, @addr) = @_;
4090		4314
4091	$msg =~ s/\n//;	4315	$msg =~ s/\n$//;
4092		4316
		4317	if ($_log_backtrace_last eq $msg) {
		4318	LOG llevInfo, "[ABT] $msg\n";
		4319	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4093	# limit the # of concurrent backtraces	4320	# limit the # of concurrent backtraces
4094	if ($_log_backtrace < 2) {	4321	} elsif ($_log_backtrace < 2) {
		4322	$_log_backtrace_last = $msg;
4095	++$_log_backtrace;	4323	++$_log_backtrace;
4096	my $perl_bt = Carp::longmess $msg;	4324	my $perl_bt = Carp::longmess $msg;
4097	async {	4325	async {
4098	$Coro::current->{desc} = "abt $msg";	4326	$Coro::current->{desc} = "abt $msg";
4099		4327
…		…
4119	LOG llevInfo, "[ABT] $_\n" for @bt;	4347	LOG llevInfo, "[ABT] $_\n" for @bt;
4120	--$_log_backtrace;	4348	--$_log_backtrace;
4121	};	4349	};
4122	} else {	4350	} else {
4123	LOG llevInfo, "[ABT] $msg\n";	4351	LOG llevInfo, "[ABT] $msg\n";
4124	LOG llevInfo, "[ABT] [suppressed]\n";	4352	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4125	}	4353	}
4126	}	4354	}
4127		4355
4128	# load additional modules	4356	# load additional modules
4129	require "cf/$_.pm" for @EXTRA_MODULES;	4357	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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