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.506 by root, Wed Feb 3 20:48:22 2010 UTC vs.
Revision 1.600 by root, Sun Nov 11 04:31:57 2012 UTC

1	#	1	#
2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	#	3	#
4	# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	#	5	#
6	# Deliantra is free software: you can redistribute it and/or modify it under	6	# Deliantra is free software: you can redistribute it and/or modify it under
7	# the terms of the Affero GNU General Public License as published by the	7	# the terms of the Affero GNU General Public License as published by the
8	# Free Software Foundation, either version 3 of the License, or (at your	8	# Free Software Foundation, either version 3 of the License, or (at your
9	# option) any later version.	9	# option) any later version.
10	#	10	#
11	# This program is distributed in the hope that it will be useful,	11	# This program is distributed in the hope that it will be useful,
12	# but WITHOUT ANY WARRANTY; without even the implied warranty of	12	# but WITHOUT ANY WARRANTY; without even the implied warranty of
13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14	# GNU General Public License for more details.	14	# GNU General Public License for more details.
15	#	15	#
16	# You should have received a copy of the Affero GNU General Public License	16	# You should have received a copy of the Affero GNU General Public License
17	# and the GNU General Public License along with this program. If not, see	17	# and the GNU General Public License along with this program. If not, see
18	# <http://www.gnu.org/licenses/>.	18	# <http://www.gnu.org/licenses/>.
19	#	19	#
20	# The authors can be reached via e-mail to <support@deliantra.net>	20	# The authors can be reached via e-mail to <support@deliantra.net>
21	#	21	#
22		22
23	package cf;	23	package cf;
24		24
25	use 5.10.0;	25	use common::sense;
26	use utf8;
27	use strict qw(vars subs);
28		26
29	use Symbol;	27	use Symbol;
30	use List::Util;	28	use List::Util;
31	use Socket;	29	use Socket;
32	use EV;	30	use EV;
…		…
34	use Safe;	32	use Safe;
35	use Safe::Hole;	33	use Safe::Hole;
36	use Storable ();	34	use Storable ();
37	use Carp ();	35	use Carp ();
38		36
39	use Guard ();	37	use AnyEvent ();
		38	use AnyEvent::IO ();
		39	use AnyEvent::DNS ();
		40
40	use Coro ();	41	use Coro ();
41	use Coro::State;	42	use Coro::State;
42	use Coro::Handle;	43	use Coro::Handle;
43	use Coro::EV;	44	use Coro::EV;
44	use Coro::AnyEvent;	45	use Coro::AnyEvent;
…		…
50	use Coro::AIO;	51	use Coro::AIO;
51	use Coro::BDB 1.6;	52	use Coro::BDB 1.6;
52	use Coro::Storable;	53	use Coro::Storable;
53	use Coro::Util ();	54	use Coro::Util ();
54		55
		56	use Guard ();
55	use JSON::XS 2.01 ();	57	use JSON::XS 2.01 ();
56	use BDB ();	58	use BDB ();
57	use Data::Dumper;	59	use Data::Dumper;
58	use Fcntl;	60	use Fcntl;
59	use YAML::XS ();	61	use YAML::XS ();
60	use IO::AIO ();	62	use IO::AIO ();
61	use Time::HiRes;
62	use Compress::LZF;	63	use Compress::LZF;
63	use Digest::MD5 ();	64	use Digest::MD5 ();
64		65
65	AnyEvent::detect;	66	AnyEvent::detect;
66		67
…		…
78	# strictly for debugging	79	# strictly for debugging
79	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };	80	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80		81
81	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	82	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82		83
		84	our @ORIG_INC;
		85
83	our %COMMAND = ();	86	our %COMMAND = ();
84	our %COMMAND_TIME = ();	87	our %COMMAND_TIME = ();
85		88
86	our @EXTS = (); # list of extension package names	89	our @EXTS = (); # list of extension package names
87	our %EXTCMD = ();	90	our %EXTCMD = ();
		91	our %EXTACMD = ();
88	our %EXTICMD = ();	92	our %EXTICMD = ();
		93	our %EXTIACMD = ();
89	our %EXT_CORO = (); # coroutines bound to extensions	94	our %EXT_CORO = (); # coroutines bound to extensions
90	our %EXT_MAP = (); # pluggable maps	95	our %EXT_MAP = (); # pluggable maps
91		96
92	our $RELOAD; # number of reloads so far, non-zero while in reload	97	our $RELOAD; # number of reloads so far, non-zero while in reload
93	our @EVENT;	98	our @EVENT;
94	our @REFLECT; # set by XS	99	our @REFLECT; # set by XS
95	our %REFLECT; # set by us	100	our %REFLECT; # set by us
96		101
97	our $CONFDIR = confdir;	102	our $CONFDIR = confdir;
		103
98	our $DATADIR = datadir;	104	our $DATADIR = datadir;
99	our $LIBDIR = "$DATADIR/ext";	105	our $LIBDIR = "$DATADIR/ext";
100	our $PODDIR = "$DATADIR/pod";	106	our $PODDIR = "$DATADIR/pod";
101	our $MAPDIR = "$DATADIR/" . mapdir;	107	our $MAPDIR = "$DATADIR/" . mapdir;
		108
102	our $LOCALDIR = localdir;	109	our $LOCALDIR = localdir;
103	our $TMPDIR = "$LOCALDIR/" . tmpdir;	110	our $TMPDIR = "$LOCALDIR/" . tmpdir;
104	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	111	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	112	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106	our $RANDOMDIR = "$LOCALDIR/random";	113	our $RANDOMDIR = "$LOCALDIR/random";
107	our $BDBDIR = "$LOCALDIR/db";	114	our $BDBDIR = "$LOCALDIR/db";
108	our $PIDFILE = "$LOCALDIR/pid";	115	our $PIDFILE = "$LOCALDIR/pid";
109	our $RUNTIMEFILE = "$LOCALDIR/runtime";	116	our $RUNTIMEFILE = "$LOCALDIR/runtime";
110		117
111	our %RESOURCE;	118	#our %RESOURCE; # unused
		119
		120	our $OUTPUT_RATE_MIN = 3000;
		121	our $OUTPUT_RATE_MAX = 1000000;
		122
		123	our $MAX_LINKS = 32; # how many chained exits to follow
		124	our $VERBOSE_IO = 1;
112		125
113	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	126	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
114	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	127	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
115	our $NEXT_TICK;	128	our $NEXT_TICK;
116	our $USE_FSYNC = 1; # use fsync to write maps - default on	129	our $USE_FSYNC = 1; # use fsync to write maps - default on
…		…
118	our $BDB_DEADLOCK_WATCHER;	131	our $BDB_DEADLOCK_WATCHER;
119	our $BDB_CHECKPOINT_WATCHER;	132	our $BDB_CHECKPOINT_WATCHER;
120	our $BDB_TRICKLE_WATCHER;	133	our $BDB_TRICKLE_WATCHER;
121	our $DB_ENV;	134	our $DB_ENV;
122		135
123	our @EXTRA_MODULES = qw(pod match mapscript);	136	our @EXTRA_MODULES = qw(pod match mapscript incloader);
124		137
125	our %CFG;	138	our %CFG;
		139	our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
126		140
127	our $UPTIME; $UPTIME ||= time;	141	our $UPTIME; $UPTIME ||= time;
128	our $RUNTIME;	142	our $RUNTIME = 0;
		143	our $SERVER_TICK = 0;
129	our $NOW;	144	our $NOW;
130		145
131	our (%PLAYER, %PLAYER_LOADING); # all users	146	our (%PLAYER, %PLAYER_LOADING); # all users
132	our (%MAP, %MAP_LOADING ); # all maps	147	our (%MAP, %MAP_LOADING ); # all maps
133	our $LINK_MAP; # the special {link} map, which is always available	148	our $LINK_MAP; # the special {link} map, which is always available
…		…
142		157
143	our @POST_INIT;	158	our @POST_INIT;
144		159
145	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)	160	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
146	our $REALLY_UNLOOP; # never set to true, please :)	161	our $REALLY_UNLOOP; # never set to true, please :)
		162
		163	our $WAIT_FOR_TICK = new Coro::Signal;
		164	our @WAIT_FOR_TICK_BEGIN;
147		165
148	binmode STDOUT;	166	binmode STDOUT;
149	binmode STDERR;	167	binmode STDERR;
150		168
151	# read virtual server time, if available	169	# read virtual server time, if available
…		…
162		180
163	our $EMERGENCY_POSITION;	181	our $EMERGENCY_POSITION;
164		182
165	sub cf::map::normalise;	183	sub cf::map::normalise;
166		184
		185	sub in_main() {
		186	$Coro::current == $Coro::main
		187	}
		188
167	#############################################################################	189	#############################################################################
168		190
169	%REFLECT = ();	191	%REFLECT = ();
170	for (@REFLECT) {	192	for (@REFLECT) {
171	my $reflect = JSON::XS::decode_json $_;	193	my $reflect = JSON::XS::decode_json $_;
…		…
181		203
182	=over 4	204	=over 4
183		205
184	=item $cf::UPTIME	206	=item $cf::UPTIME
185		207
186	The timestamp of the server start (so not actually an uptime).	208	The timestamp of the server start (so not actually an "uptime").
		209
		210	=item $cf::SERVER_TICK
		211
		212	An unsigned integer that starts at zero when the server is started and is
		213	incremented on every tick.
		214
		215	=item $cf::NOW
		216
		217	The (real) time of the last (current) server tick - updated before and
		218	after tick processing, so this is useful only as a rough "what time is it
		219	now" estimate.
		220
		221	=item $cf::TICK
		222
		223	The interval between each server tick, in seconds.
187		224
188	=item $cf::RUNTIME	225	=item $cf::RUNTIME
189		226
190	The time this server has run, starts at 0 and is increased by $cf::TICK on	227	The time this server has run, starts at 0 and is increased by $cf::TICK on
191	every server tick.	228	every server tick.
192		229
193	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR	230	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
194	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR	231	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
195	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR	232	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
196		233
197	Various directories - "/etc", read-only install directory, perl-library	234	Various directories - "/etc", read-only install directory, perl-library
198	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	235	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
199	unique-items directory, player file directory, random maps directory and	236	unique-items directory, player file directory, random maps directory and
200	database environment.	237	database environment.
201		238
202	=item $cf::NOW
203
204	The time of the last (current) server tick.
205
206	=item $cf::TICK
207
208	The interval between server ticks, in seconds.
209
210	=item $cf::LOADAVG	239	=item $cf::LOADAVG
211		240
212	The current CPU load on the server (alpha-smoothed), as a value between 0	241	The current CPU load on the server (alpha-smoothed), as a value between 0
213	(none) and 1 (overloaded), indicating how much time is spent on processing	242	(none) and 1 (overloaded), indicating how much time is spent on processing
214	objects per tick. Healthy values are < 0.5.	243	objects per tick. Healthy values are < 0.5.
…		…
222	Configuration for the server, loaded from C</etc/deliantra-server/config>, or	251	Configuration for the server, loaded from C</etc/deliantra-server/config>, or
223	from wherever your confdir points to.	252	from wherever your confdir points to.
224		253
225	=item cf::wait_for_tick, cf::wait_for_tick_begin	254	=item cf::wait_for_tick, cf::wait_for_tick_begin
226		255
227	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	256	These are functions that inhibit the current coroutine one tick.
228	returns directly I<after> the tick processing (and consequently, can only wake one process	257	cf::wait_for_tick_begin only returns directly I<after> the tick
		258	processing (and consequently, can only wake one thread per tick), while
229	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	259	cf::wait_for_tick wakes up all waiters after tick processing.
		260
		261	Note that cf::wait_for_tick will immediately return when the server is not
		262	ticking, making it suitable for small pauses in threads that need to run
		263	when the server is paused. If that is not applicable (i.e. you I<really>
		264	want to wait, use C<$cf::WAIT_FOR_TICK>).
		265
		266	=item $cf::WAIT_FOR_TICK
		267
		268	Note that C<cf::wait_for_tick> is probably the correct thing to use. This
		269	variable contains a L<Coro::Signal> that is broadcats after every server
		270	tick. Calling C<< ->wait >> on it will suspend the caller until after the
		271	next server tick.
		272
		273	=cut
		274
		275	sub wait_for_tick();
		276	sub wait_for_tick_begin();
230		277
231	=item @cf::INVOKE_RESULTS	278	=item @cf::INVOKE_RESULTS
232		279
233	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
234	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
…		…
242		289
243	=back	290	=back
244		291
245	=cut	292	=cut
246		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
247	$Coro::State::WARNHOOK = sub {	300	$Coro::State::WARNHOOK = sub {
248	my $msg = join "", @_;	301	my $msg = join "", @_;
249		302
250	$msg .= "\n"	303	$msg .= "\n"
251	unless $msg =~ /\n$/;	304	unless $msg =~ /\n$/;
252		305
253	$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;
254		307
255	LOG llevError, $msg;	308	LOG llevWarn, $msg;
256	};	309	};
257		310
258	$Coro::State::DIEHOOK = sub {	311	$Coro::State::DIEHOOK = sub {
259	return unless $^S eq 0; # "eq", not "=="	312	return unless $^S eq 0; # "eq", not "=="
260		313
261	warn Carp::longmess $_[0];	314	error Carp::longmess $_[0];
262		315
263	if ($Coro::current == $Coro::main) {#d#	316	if (in_main) {#d#
264	warn "DIEHOOK called in main context, Coro bug?\n";#d#	317	error "DIEHOOK called in main context, Coro bug?\n";#d#
265	return;#d#	318	return;#d#
266	}#d#	319	}#d#
267		320
268	# kill coroutine otherwise	321	# kill coroutine otherwise
269	Coro::terminate	322	Coro::terminate
…		…
289	)) {	342	)) {
290	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	343	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
291	}	344	}
292		345
293	$EV::DIED = sub {	346	$EV::DIED = sub {
294	Carp::cluck "error in event callback: @_";	347	warn "error in event callback: $@";
295	};	348	};
		349
		350	#############################################################################
		351
		352	sub fork_call(&@);
		353	sub get_slot($;$$);
296		354
297	#############################################################################	355	#############################################################################
298		356
299	=head2 UTILITY FUNCTIONS	357	=head2 UTILITY FUNCTIONS
300		358
…		…
321	$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;
322	$d	380	$d
323	} || "[unable to dump $_[0]: '$@']";	381	} || "[unable to dump $_[0]: '$@']";
324	}	382	}
325		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
326	=item $ref = cf::decode_json $json	436	=item $ref = cf::decode_json $json
327		437
328	Converts a JSON string into the corresponding perl data structure.	438	Converts a JSON string into the corresponding perl data structure.
329		439
330	=item $json = cf::encode_json $ref	440	=item $json = cf::encode_json $ref
…		…
336	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
337		447
338	sub encode_json($) { $json_coder->encode ($_[0]) }	448	sub encode_json($) { $json_coder->encode ($_[0]) }
339	sub decode_json($) { $json_coder->decode ($_[0]) }	449	sub decode_json($) { $json_coder->decode ($_[0]) }
340		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
341	=item cf::post_init { BLOCK }	482	=item cf::post_init { BLOCK }
342		483
343	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,
344	but I<before> the server starts ticking again.	485	but I<before> the server starts ticking again.
345		486
346	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
347	is a reload or not.	488	is a reload or not.
348		489
349	=cut	490	=cut
350		491
351	sub post_init(&) {	492	sub post_init(&) {
352	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	}
353	}	511	}
354		512
355	=item cf::lock_wait $string	513	=item cf::lock_wait $string
356		514
357	Wait until the given lock is available. See cf::lock_acquire.	515	Wait until the given lock is available. See cf::lock_acquire.
…		…
396	}	554	}
397		555
398	=item cf::periodic $interval, $cb	556	=item cf::periodic $interval, $cb
399		557
400	Like EV::periodic, but randomly selects a starting point so that the actions	558	Like EV::periodic, but randomly selects a starting point so that the actions
401	get spread over timer.	559	get spread over time.
402		560
403	=cut	561	=cut
404		562
405	sub periodic($$) {	563	sub periodic($$) {
406	my ($interval, $cb) = @_;	564	my ($interval, $cb) = @_;
…		…
410	EV::periodic $start, $interval, 0, $cb	568	EV::periodic $start, $interval, 0, $cb
411	}	569	}
412		570
413	=item cf::get_slot $time[, $priority[, $name]]	571	=item cf::get_slot $time[, $priority[, $name]]
414		572
415	Allocate $time seconds of blocking CPU time at priority C<$priority>:	573	Allocate $time seconds of blocking CPU time at priority C<$priority>
416	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
417	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.
418		580
419	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
420	used for statistical purposes and should identify the same time-class.	582	used for statistical purposes and should identify the same time-class.
421		583
422	Useful for short background jobs.	584	Useful for short background jobs.
…		…
451	}	613	}
452	}	614	}
453		615
454	if (@SLOT_QUEUE) {	616	if (@SLOT_QUEUE) {
455	# 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
456	push @cf::WAIT_FOR_TICK, $signal;	618	$WAIT_FOR_TICK->wait;
457	$signal->wait;
458	} else {	619	} else {
459	$busy = 0;	620	$busy = 0;
460	Coro::schedule;	621	Coro::schedule;
461	}	622	}
462	}	623	}
…		…
502	=cut	663	=cut
503		664
504	sub sync_job(&) {	665	sub sync_job(&) {
505	my ($job) = @_;	666	my ($job) = @_;
506		667
507	if ($Coro::current == $Coro::main) {	668	if (in_main) {
508	my $time = EV::time;	669	my $time = AE::time;
509		670
510	# this is the main coro, too bad, we have to block	671	# this is the main coro, too bad, we have to block
511	# till the operation succeeds, freezing the server :/	672	# till the operation succeeds, freezing the server :/
512		673
513	LOG llevError, Carp::longmess "sync job";#d#	674	#LOG llevError, Carp::longmess "sync job";#d#
514		675
515	my $freeze_guard = freeze_mainloop;	676	my $freeze_guard = freeze_mainloop;
516		677
517	my $busy = 1;	678	my $busy = 1;
518	my @res;	679	my @res;
519		680
520	(async {	681	(async {
521	$Coro::current->desc ("sync job coro");	682	$Coro::current->desc ("sync job coro");
522	@res = eval { $job->() };	683	@res = eval { $job->() };
523	warn $@ if $@;	684	error $@ if $@;
524	undef $busy;	685	undef $busy;
525	})->prio (Coro::PRIO_MAX);	686	})->prio (Coro::PRIO_MAX);
526		687
527	while ($busy) {	688	while ($busy) {
528	if (Coro::nready) {	689	if (Coro::nready) {
…		…
530	} else {	691	} else {
531	EV::loop EV::LOOP_ONESHOT;	692	EV::loop EV::LOOP_ONESHOT;
532	}	693	}
533	}	694	}
534		695
535	my $time = EV::time - $time;	696	my $time = AE::time - $time;
536		697
537	$TICK_START += $time; # do not account sync jobs to server load	698	$TICK_START += $time; # do not account sync jobs to server load
538		699
539	wantarray ? @res : $res[0]	700	wantarray ? @res : $res[0]
540	} else {	701	} else {
…		…
562	$EXT_CORO{$coro+0} = $coro;	723	$EXT_CORO{$coro+0} = $coro;
563		724
564	$coro	725	$coro
565	}	726	}
566		727
567	=item fork_call { }, $args	728	=item fork_call { }, @args
568		729
569	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
570	process, returning the results. Everything must be serialisable with	731	process, returning the results. Everything must be serialisable with
571	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
572	never block itself or use any form of event handling.	733	never block itself or use any form of event handling.
573		734
574	=cut	735	=cut
575		736
		737	sub post_fork {
		738	reset_signals;
		739	}
		740
576	sub fork_call(&@) {	741	sub fork_call(&@) {
577	my ($cb, @args) = @_;	742	my ($cb, @args) = @_;
578		743
579	# 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,
580	# otherwise perl prematurely frees the stuff :/	745	# otherwise perl prematurely frees the stuff :/
581	# TODO: investigate and fix (likely this will be rather laborious)	746	# TODO: investigate and fix (likely this will be rather laborious)
582		747
583	my @res = Coro::Util::fork_eval {	748	my @res = Coro::Util::fork_eval {
584	reset_signals;	749	cf::post_fork;
585	&$cb	750	&$cb
586	}, @args;	751	} @args;
587		752
588	wantarray ? @res : $res[-1]	753	wantarray ? @res : $res[-1]
		754	}
		755
		756	sub objinfo {
		757	(
		758	"counter value" => cf::object::object_count,
		759	"objects created" => cf::object::create_count,
		760	"objects destroyed" => cf::object::destroy_count,
		761	"freelist size" => cf::object::free_count,
		762	"allocated objects" => cf::object::objects_size,
		763	"active objects" => cf::object::actives_size,
		764	)
589	}	765	}
590		766
591	=item $coin = coin_from_name $name	767	=item $coin = coin_from_name $name
592		768
593	=cut	769	=cut
…		…
630	within each server.	806	within each server.
631		807
632	=cut	808	=cut
633		809
634	sub db_table($) {	810	sub db_table($) {
		811	cf::error "db_get called from main context"
		812	if $Coro::current == $Coro::main;
		813
635	my ($name) = @_;	814	my ($name) = @_;
636	my $db = BDB::db_create $DB_ENV;	815	my $db = BDB::db_create $DB_ENV;
637		816
638	eval {	817	eval {
639	$db->set_flags (BDB::CHKSUM);	818	$db->set_flags (BDB::CHKSUM);
…		…
649	}	828	}
650		829
651	our $DB;	830	our $DB;
652		831
653	sub db_init {	832	sub db_init {
654	cf::sync_job {
655	$DB ||= db_table "db";	833	$DB ||= db_table "db";
656	};
657	}	834	}
658		835
659	sub db_get($$) {	836	sub db_get($$) {
660	my $key = "$_[0]/$_[1]";	837	my $key = "$_[0]/$_[1]";
661		838
662	cf::sync_job {	839	cf::error "db_get called from main context"
		840	if $Coro::current == $Coro::main;
		841
663	BDB::db_get $DB, undef, $key, my $data;	842	BDB::db_get $DB, undef, $key, my $data;
664		843
665	$! ? ()	844	$! ? ()
666	: $data	845	: $data
667	}
668	}	846	}
669		847
670	sub db_put($$$) {	848	sub db_put($$$) {
671	BDB::dbreq_pri 4;	849	BDB::dbreq_pri 4;
672	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	850	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
700		878
701	my @data;	879	my @data;
702	my $md5;	880	my $md5;
703		881
704	for (0 .. $#$src) {	882	for (0 .. $#$src) {
705	0 <= aio_load $src->[$_], $data[$_]	883	$data[$_] = load_file $src->[$_];
706	or Carp::croak "$src->[$_]: $!";
707	}	884	}
708		885
709	# if processing is expensive, check	886	# if processing is expensive, check
710	# checksum first	887	# checksum first
711	if (1) {	888	if (1) {
…		…
724		901
725	return db_get cache => "$id/data";	902	return db_get cache => "$id/data";
726	}	903	}
727	}	904	}
728		905
729	my $t1 = Time::HiRes::time;	906	my $t1 = EV::time;
730	my $data = $process->(\@data);	907	my $data = $process->(\@data);
731	my $t2 = Time::HiRes::time;	908	my $t2 = EV::time;
732		909
733	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	910	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
734		911
735	db_put cache => "$id/data", $data;	912	db_put cache => "$id/data", $data;
736	db_put cache => "$id/md5" , $md5;	913	db_put cache => "$id/md5" , $md5;
737	db_put cache => "$id/meta", $meta;	914	db_put cache => "$id/meta", $meta;
738		915
…		…
748		925
749	=cut	926	=cut
750		927
751	sub datalog($@) {	928	sub datalog($@) {
752	my ($type, %kv) = @_;	929	my ($type, %kv) = @_;
753	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	930	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
754	}	931	}
755		932
756	=back	933	=back
757		934
758	=cut	935	=cut
…		…
953		1130
954	} elsif (exists $cb_id{$type}) {	1131	} elsif (exists $cb_id{$type}) {
955	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	1132	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
956		1133
957	} elsif (ref $type) {	1134	} elsif (ref $type) {
958	warn "attaching objects not supported, ignoring.\n";	1135	error "attaching objects not supported, ignoring.\n";
959		1136
960	} else {	1137	} else {
961	shift @arg;	1138	shift @arg;
962	warn "attach argument '$type' not supported, ignoring.\n";	1139	error "attach argument '$type' not supported, ignoring.\n";
963	}	1140	}
964	}	1141	}
965	}	1142	}
966		1143
967	sub _object_attach {	1144	sub _object_attach {
…		…
977	_attach $registry, $klass, @attach;	1154	_attach $registry, $klass, @attach;
978	}	1155	}
979		1156
980	$obj->{$name} = \%arg;	1157	$obj->{$name} = \%arg;
981	} else {	1158	} else {
982	warn "object uses attachment '$name' which is not available, postponing.\n";	1159	info "object uses attachment '$name' which is not available, postponing.\n";
983	}	1160	}
984		1161
985	$obj->{_attachment}{$name} = undef;	1162	$obj->{_attachment}{$name} = undef;
986	}	1163	}
987		1164
…		…
1046		1223
1047	for (@$callbacks) {	1224	for (@$callbacks) {
1048	eval { &{$_->[1]} };	1225	eval { &{$_->[1]} };
1049		1226
1050	if ($@) {	1227	if ($@) {
1051	warn "$@";
1052	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1228	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1053	override;	1229	override;
1054	}	1230	}
1055		1231
1056	return 1 if $override;	1232	return 1 if $override;
1057	}	1233	}
…		…
1136	for (@$attach) {	1312	for (@$attach) {
1137	my ($klass, @attach) = @$_;	1313	my ($klass, @attach) = @$_;
1138	_attach $registry, $klass, @attach;	1314	_attach $registry, $klass, @attach;
1139	}	1315	}
1140	} else {	1316	} else {
1141	warn "object uses attachment '$name' that is not available, postponing.\n";	1317	info "object uses attachment '$name' that is not available, postponing.\n";
1142	}	1318	}
1143	}	1319	}
1144	}	1320	}
1145		1321
1146	cf::attachable->attach (	1322	cf::attachable->attach (
…		…
1173	my ($filename, $rdata, $objs) = @_;	1349	my ($filename, $rdata, $objs) = @_;
1174		1350
1175	sync_job {	1351	sync_job {
1176	if (length $$rdata) {	1352	if (length $$rdata) {
1177	utf8::decode (my $decname = $filename);	1353	utf8::decode (my $decname = $filename);
1178	warn sprintf "saving %s (%d,%d)\n",	1354	trace sprintf "saving %s (%d,%d)\n",
1179	$decname, length $$rdata, scalar @$objs;	1355	$decname, length $$rdata, scalar @$objs
		1356	if $VERBOSE_IO;
1180		1357
1181	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1358	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1182	aio_chmod $fh, SAVE_MODE;	1359	aio_chmod $fh, SAVE_MODE;
1183	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1360	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1184	if ($cf::USE_FSYNC) {	1361	if ($cf::USE_FSYNC) {
…		…
1206	aio_rename "$filename~", $filename;	1383	aio_rename "$filename~", $filename;
1207		1384
1208	$filename =~ s%/[^/]+$%%;	1385	$filename =~ s%/[^/]+$%%;
1209	aio_pathsync $filename if $cf::USE_FSYNC;	1386	aio_pathsync $filename if $cf::USE_FSYNC;
1210	} else {	1387	} else {
1211	warn "unable to save objects: $filename~: $!\n";	1388	error "unable to save objects: $filename~: $!\n";
1212	}	1389	}
1213	} else {	1390	} else {
1214	aio_unlink $filename;	1391	aio_unlink $filename;
1215	aio_unlink "$filename.pst";	1392	aio_unlink "$filename.pst";
1216	}	1393	}
…		…
1240	my $st = eval { Coro::Storable::thaw $av };	1417	my $st = eval { Coro::Storable::thaw $av };
1241	$av = $st->{objs};	1418	$av = $st->{objs};
1242	}	1419	}
1243		1420
1244	utf8::decode (my $decname = $filename);	1421	utf8::decode (my $decname = $filename);
1245	warn sprintf "loading %s (%d,%d)\n",	1422	trace sprintf "loading %s (%d,%d)\n",
1246	$decname, length $data, scalar @{$av || []};	1423	$decname, length $data, scalar @{$av || []}
		1424	if $VERBOSE_IO;
1247		1425
1248	($data, $av)	1426	($data, $av)
1249	}	1427	}
1250		1428
1251	=head2 COMMAND CALLBACKS	1429	=head2 COMMAND CALLBACKS
…		…
1255	=cut	1433	=cut
1256		1434
1257	#############################################################################	1435	#############################################################################
1258	# command handling &c	1436	# command handling &c
1259		1437
1260	=item cf::register_command $name => \&callback($ob,$args);	1438	=item cf::register_command $name => \&callback($ob,$args)
1261		1439
1262	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
1263	$name.	1441	$name.
1264		1442
1265	=cut	1443	=cut
…		…
1271	#warn "registering command '$name/$time' to '$caller'";	1449	#warn "registering command '$name/$time' to '$caller'";
1272		1450
1273	push @{ $COMMAND{$name} }, [$caller, $cb];	1451	push @{ $COMMAND{$name} }, [$caller, $cb];
1274	}	1452	}
1275		1453
1276	=item cf::register_extcmd $name => \&callback($pl,$packet);	1454	=item cf::register_extcmd $name => \&callback($pl,@args)
1277		1455
1278	Register a callback for execution when the client sends an (synchronous)	1456	Register a callback for execution when the client sends an (synchronous)
1279	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
1280	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
1281	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
1282	has logged in successfully.	1460	has logged in successfully.
1283		1461
1284	If the callback returns something, it is sent back as if reply was being	1462	The values will be sent back to the client.
1285	called.
1286		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
1287	=item cf::register_exticmd $name => \&callback($ns,$packet);	1469	=item cf::register_exticmd $name => \&callback($ns,@args)
1288		1470
1289	Register a callback for execution when the client sends an (asynchronous)	1471	Register a callback for execution when the client sends an (asynchronous)
1290	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
1291	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
1292	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
1293	log-in.	1475	log-in.
1294		1476
1295	If the callback returns something, it is sent back as if reply was being	1477	The values will be sent back to the client.
1296	called.
1297		1478
1298	=cut	1479	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1299		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
1300	sub register_extcmd {	1486	sub register_extcmd($$) {
1301	my ($name, $cb) = @_;	1487	my ($name, $cb) = @_;
1302		1488
1303	$EXTCMD{$name} = $cb;	1489	$EXTCMD{$name} = $cb;
1304	}	1490	}
1305		1491
1306	sub register_exticmd {	1492	sub register_async_extcmd($$) {
1307	my ($name, $cb) = @_;	1493	my ($name, $cb) = @_;
1308		1494
		1495	$EXTACMD{$name} = $cb;
		1496	}
		1497
		1498	sub register_exticmd($$) {
		1499	my ($name, $cb) = @_;
		1500
1309	$EXTICMD{$name} = $cb;	1501	$EXTICMD{$name} = $cb;
1310	}	1502	}
1311		1503
		1504	sub register_async_exticmd($$) {
		1505	my ($name, $cb) = @_;
		1506
		1507	$EXTIACMD{$name} = $cb;
		1508	}
		1509
1312	use File::Glob ();	1510	use File::Glob ();
1313		1511
1314	cf::player->attach (	1512	cf::player->attach (
1315	on_command => sub {	1513	on_unknown_command => sub {
1316	my ($pl, $name, $params) = @_;	1514	my ($pl, $name, $params) = @_;
1317		1515
1318	my $cb = $COMMAND{$name}	1516	my $cb = $COMMAND{$name}
1319	or return;	1517	or return;
1320		1518
…		…
1328	my ($pl, $buf) = @_;	1526	my ($pl, $buf) = @_;
1329		1527
1330	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1528	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1331		1529
1332	if (ref $msg) {	1530	if (ref $msg) {
1333	my ($type, $reply, @payload) =	1531	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1334	"ARRAY" eq ref $msg
1335	? @$msg
1336	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1337		1532
1338	my @reply;
1339
1340	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}) {
1341	@reply = $cb->($pl, @payload);	1546	@reply = $cb->($pl, @payload);
		1547	}
		1548
		1549	$pl->ext_msg ("reply-$reply", @reply)
		1550	if $reply;
1342	}	1551	}
1343		1552
1344	$pl->ext_reply ($reply, @reply)
1345	if $reply;
1346
1347	} else {	1553	} else {
1348	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1554	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1349	}	1555	}
1350		1556
1351	cf::override;	1557	cf::override;
1352	},	1558	},
1353	);	1559	);
…		…
1363	};	1569	};
1364		1570
1365	$grp	1571	$grp
1366	}	1572	}
1367		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
1368	sub load_extensions {	1585	sub load_extensions {
		1586	info "loading extensions...";
		1587
		1588	%EXT_CFG = ();
		1589
1369	cf::sync_job {	1590	cf::sync_job {
1370	my %todo;	1591	my %todo;
1371		1592
1372	for my $path (<$LIBDIR/*.ext>) {	1593	for my $path (<$LIBDIR/*.ext>) {
1373	next unless -r $path;	1594	next unless -r $path;
…		…
1391		1612
1392	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1613	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1393	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1614	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1394		1615
1395	$ext{source} =	1616	$ext{source} =
1396	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1617	"package $pkg; use common::sense;\n"
1397	. "#line 1 \"$path\"\n{\n"	1618	. "#line 1 \"$path\"\n{\n"
1398	. $source	1619	. $source
1399	. "\n};\n1";	1620	. "\n};\n1";
1400		1621
1401	$todo{$base} = \%ext;	1622	$todo{$base} = \%ext;
…		…
1413	for (split /,\s*/, $v->{meta}{depends}) {	1634	for (split /,\s*/, $v->{meta}{depends}) {
1414	next ext	1635	next ext
1415	unless exists $done{$_};	1636	unless exists $done{$_};
1416	}	1637	}
1417		1638
1418	warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1639	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1419		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
1420	my $active = eval $v->{source};	1650	my $active = eval $source;
1421		1651
1422	if (length $@) {	1652	if (length $@) {
1423	warn "$v->{path}: $@\n";	1653	error "$v->{path}: $@\n";
1424		1654
1425	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1655	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1426	if exists $v->{meta}{mandatory};	1656	if exists $v->{meta}{mandatory};
		1657
		1658	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
		1659	delete $todo{$k};
1427	} else {	1660	} else {
1428	$done{$k} = delete $todo{$k};	1661	$done{$k} = delete $todo{$k};
1429	push @EXTS, $v->{pkg};	1662	push @EXTS, $v->{pkg};
1430	$progress = 1;	1663	$progress = 1;
1431		1664
1432	warn "$v->{base}: extension inactive.\n"	1665	info "$v->{base}: extension inactive.\n"
1433	unless $active;	1666	unless $active;
1434	}	1667	}
1435	}	1668	}
1436		1669
1437	unless ($progress) {	1670	unless ($progress) {
…		…
1439		1672
1440	while (my ($k, $v) = each %todo) {	1673	while (my ($k, $v) = each %todo) {
1441	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1674	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1442	if exists $v->{meta}{mandatory};	1675	if exists $v->{meta}{mandatory};
1443	}	1676	}
		1677
		1678	last;
1444	}	1679	}
1445	}	1680	}
1446	};	1681	};
1447	}	1682	}
1448		1683
…		…
1533	$cf::PLAYER{$login} = $pl	1768	$cf::PLAYER{$login} = $pl
1534	}	1769	}
1535	}	1770	}
1536	}	1771	}
1537		1772
		1773	cf::player->attach (
		1774	on_load => sub {
		1775	my ($pl, $path) = @_;
		1776
		1777	# restore slots saved in save, below
		1778	my $slots = delete $pl->{_slots};
		1779
		1780	$pl->ob->current_weapon ($slots->[0]);
		1781	$pl->combat_ob ($slots->[1]);
		1782	$pl->ranged_ob ($slots->[2]);
		1783	},
		1784	);
		1785
1538	sub save($) {	1786	sub save($) {
1539	my ($pl) = @_;	1787	my ($pl) = @_;
1540		1788
1541	return if $pl->{deny_save};	1789	return if $pl->{deny_save};
1542		1790
…		…
1547		1795
1548	aio_mkdir playerdir $pl, 0770;	1796	aio_mkdir playerdir $pl, 0770;
1549	$pl->{last_save} = $cf::RUNTIME;	1797	$pl->{last_save} = $cf::RUNTIME;
1550		1798
1551	cf::get_slot 0.01;	1799	cf::get_slot 0.01;
		1800
		1801	# save slots, to be restored later
		1802	local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1552		1803
1553	$pl->save_pl ($path);	1804	$pl->save_pl ($path);
1554	cf::cede_to_tick;	1805	cf::cede_to_tick;
1555	}	1806	}
1556		1807
…		…
1590	my $name = $pl->ob->name;	1841	my $name = $pl->ob->name;
1591		1842
1592	$pl->{deny_save} = 1;	1843	$pl->{deny_save} = 1;
1593	$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
1594		1845
1595	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1846	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1596	$pl->deactivate;	1847	$pl->deactivate;
		1848
1597	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;
1598	$pl->ob->check_score;
1599	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1850	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1851	ext::highscore::check ($pl->ob);
		1852
1600	$pl->ns->destroy if $pl->ns;	1853	$pl->ns->destroy if $pl->ns;
1601		1854
1602	my $path = playerdir $pl;	1855	my $path = playerdir $pl;
1603	my $temp = "$path~$cf::RUNTIME~deleting~";	1856	my $temp = "$path~$cf::RUNTIME~deleting~";
1604	aio_rename $path, $temp;	1857	aio_rename $path, $temp;
…		…
1658	\@logins	1911	\@logins
1659	}	1912	}
1660		1913
1661	=item $player->maps	1914	=item $player->maps
1662		1915
		1916	=item cf::player::maps $login
		1917
1663	Returns an arrayref of map paths that are private for this	1918	Returns an arrayref of map paths that are private for this
1664	player. May block.	1919	player. May block.
1665		1920
1666	=cut	1921	=cut
1667		1922
…		…
1688		1943
1689	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1944	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1690		1945
1691	Expand deliantra pod fragments into protocol xml.	1946	Expand deliantra pod fragments into protocol xml.
1692		1947
1693	=item $player->ext_reply ($msgid, @msg)
1694
1695	Sends an ext reply to the player.
1696
1697	=cut
1698
1699	sub ext_reply($$@) {
1700	my ($self, $id, @msg) = @_;
1701
1702	$self->ns->ext_reply ($id, @msg)
1703	}
1704
1705	=item $player->ext_msg ($type, @msg)	1948	=item $player->ext_msg ($type, @msg)
1706		1949
1707	Sends an ext event to the client.	1950	Sends an ext event to the client.
1708		1951
1709	=cut	1952	=cut
…		…
1728		1971
1729	=cut	1972	=cut
1730		1973
1731	sub find_by_path($) {	1974	sub find_by_path($) {
1732	my ($path) = @_;	1975	my ($path) = @_;
		1976
		1977	$path =~ s/^~[^\/]*//; # skip ~login
1733		1978
1734	my ($match, $specificity);	1979	my ($match, $specificity);
1735		1980
1736	for my $region (list) {	1981	for my $region (list) {
1737	if ($region->{match} && $path =~ $region->{match}) {	1982	if ($region->{match} && $path =~ $region->{match}) {
…		…
1766	sub generate_random_map {	2011	sub generate_random_map {
1767	my ($self, $rmp) = @_;	2012	my ($self, $rmp) = @_;
1768		2013
1769	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
1770		2015
1771	# mit "rum" bekleckern, nicht
1772	$self->_create_random_map (	2016	$self->_create_random_map ($rmp);
1773	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1774	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1775	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1776	$rmp->{exit_on_final_map},
1777	$rmp->{xsize}, $rmp->{ysize},
1778	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1779	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1780	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1781	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1782	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1783	(cf::region::find $rmp->{region}), $rmp->{custom}
1784	)
1785	}	2017	}
1786		2018
1787	=item cf::map->register ($regex, $prio)	2019	=item cf::map->register ($regex, $prio)
1788		2020
1789	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
…		…
1794		2026
1795	sub register {	2027	sub register {
1796	my (undef, $regex, $prio) = @_;	2028	my (undef, $regex, $prio) = @_;
1797	my $pkg = caller;	2029	my $pkg = caller;
1798		2030
1799	no strict;
1800	push @{"$pkg\::ISA"}, __PACKAGE__;	2031	push @{"$pkg\::ISA"}, __PACKAGE__;
1801		2032
1802	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	2033	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1803	}	2034	}
1804		2035
1805	# also paths starting with '/'	2036	# also paths starting with '/'
1806	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	2037	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1807		2038
1808	sub thawer_merge {	2039	sub thawer_merge {
1809	my ($self, $merge) = @_;	2040	my ($self, $merge) = @_;
1810		2041
1811	# we have to keep some variables in memory intact	2042	# we have to keep some variables in memory intact
…		…
1816	}	2047	}
1817		2048
1818	sub normalise {	2049	sub normalise {
1819	my ($path, $base) = @_;	2050	my ($path, $base) = @_;
1820		2051
1821	$path = "$path"; # make sure its a string	2052	$path = "$path"; # make sure it's a string
1822		2053
1823	$path =~ s/\.map$//;	2054	$path =~ s/\.map$//;
1824		2055
1825	# map plan:	2056	# map plan:
1826	#	2057	#
…		…
1841	$base =~ s{[^/]+/?$}{};	2072	$base =~ s{[^/]+/?$}{};
1842	$path = "$base/$path";	2073	$path = "$base/$path";
1843	}	2074	}
1844		2075
1845	for ($path) {	2076	for ($path) {
1846	redo if s{//}{/};
1847	redo if s{/\.?/}{/};	2077	redo if s{/\.?/}{/};
1848	redo if s{/[^/]+/\.\./}{/};	2078	redo if s{/[^/]+/\.\./}{/};
1849	}	2079	}
1850		2080
1851	$path	2081	$path
…		…
1865	$self->init; # pass $1 etc.	2095	$self->init; # pass $1 etc.
1866	return $self;	2096	return $self;
1867	}	2097	}
1868	}	2098	}
1869		2099
1870	Carp::cluck "unable to resolve path '$path' (base '$base').";	2100	Carp::cluck "unable to resolve path '$path' (base '$base')";
1871	()	2101	()
1872	}	2102	}
1873		2103
		2104	# may re-bless or do other evil things
1874	sub init {	2105	sub init {
1875	my ($self) = @_;	2106	my ($self) = @_;
1876		2107
1877	$self	2108	$self
1878	}	2109	}
…		…
1943	$self->{load_path} = $path;	2174	$self->{load_path} = $path;
1944		2175
1945	1	2176	1
1946	}	2177	}
1947		2178
		2179	# used to laod the header of an original map
1948	sub load_header_orig {	2180	sub load_header_orig {
1949	my ($self) = @_;	2181	my ($self) = @_;
1950		2182
1951	$self->load_header_from ($self->load_path)	2183	$self->load_header_from ($self->load_path)
1952	}	2184	}
1953		2185
		2186	# used to laod the header of an instantiated map
1954	sub load_header_temp {	2187	sub load_header_temp {
1955	my ($self) = @_;	2188	my ($self) = @_;
1956		2189
1957	$self->load_header_from ($self->save_path)	2190	$self->load_header_from ($self->save_path)
1958	}	2191	}
1959		2192
		2193	# called after loading the header from an instantiated map
1960	sub prepare_temp {	2194	sub prepare_temp {
1961	my ($self) = @_;	2195	my ($self) = @_;
1962		2196
1963	$self->last_access ((delete $self->{last_access})	2197	$self->last_access ((delete $self->{last_access})
1964	|| $cf::RUNTIME); #d#	2198	|| $cf::RUNTIME); #d#
1965	# safety	2199	# safety
1966	$self->{instantiate_time} = $cf::RUNTIME	2200	$self->{instantiate_time} = $cf::RUNTIME
1967	if $self->{instantiate_time} > $cf::RUNTIME;	2201	if $self->{instantiate_time} > $cf::RUNTIME;
1968	}	2202	}
1969		2203
		2204	# called after loading the header from an original map
1970	sub prepare_orig {	2205	sub prepare_orig {
1971	my ($self) = @_;	2206	my ($self) = @_;
1972		2207
1973	$self->{load_original} = 1;	2208	$self->{load_original} = 1;
1974	$self->{instantiate_time} = $cf::RUNTIME;	2209	$self->{instantiate_time} = $cf::RUNTIME;
…		…
1998		2233
1999	sub find;	2234	sub find;
2000	sub find {	2235	sub find {
2001	my ($path, $origin) = @_;	2236	my ($path, $origin) = @_;
2002		2237
		2238	cf::cede_to_tick;
		2239
2003	$path = normalise $path, $origin && $origin->path;	2240	$path = normalise $path, $origin;
2004		2241
2005	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2242	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2006	my $guard2 = cf::lock_acquire "map_find:$path";	2243	my $guard2 = cf::lock_acquire "map_find:$path";
2007		2244
2008	$cf::MAP{$path} || do {	2245	$cf::MAP{$path} || do {
…		…
2039		2276
2040	{	2277	{
2041	my $guard = cf::lock_acquire "map_data:$path";	2278	my $guard = cf::lock_acquire "map_data:$path";
2042		2279
2043	return unless $self->valid;	2280	return unless $self->valid;
2044	return unless $self->in_memory == cf::MAP_SWAPPED;	2281	return unless $self->state == cf::MAP_SWAPPED;
2045
2046	$self->in_memory (cf::MAP_LOADING);
2047		2282
2048	$self->alloc;	2283	$self->alloc;
2049		2284
2050	$self->pre_load;	2285	$self->pre_load;
2051	cf::cede_to_tick;	2286	cf::cede_to_tick;
2052		2287
		2288	if (exists $self->{load_path}) {
2053	my $f = new_from_file cf::object::thawer $self->{load_path};	2289	my $f = new_from_file cf::object::thawer $self->{load_path};
2054	$f->skip_block;	2290	$f->skip_block;
2055	$self->_load_objects ($f)	2291	$self->_load_objects ($f)
2056	or return;	2292	or return;
2057		2293
2058	$self->post_load_original	2294	$self->post_load_original
2059	if delete $self->{load_original};	2295	if delete $self->{load_original};
2060		2296
2061	if (my $uniq = $self->uniq_path) {	2297	if (my $uniq = $self->uniq_path) {
2062	utf8::encode $uniq;	2298	utf8::encode $uniq;
2063	unless (aio_stat $uniq) {	2299	unless (aio_stat $uniq) {
2064	if (my $f = new_from_file cf::object::thawer $uniq) {	2300	if (my $f = new_from_file cf::object::thawer $uniq) {
2065	$self->clear_unique_items;	2301	$self->clear_unique_items;
2066	$self->_load_objects ($f);	2302	$self->_load_objects ($f);
2067	$f->resolve_delayed_derefs;	2303	$f->resolve_delayed_derefs;
		2304	}
2068	}	2305	}
2069	}	2306	}
2070	}
2071		2307
2072	$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);
2073		2315
2074	cf::cede_to_tick;	2316	cf::cede_to_tick;
2075	# now do the right thing for maps	2317	# now do the right thing for maps
2076	$self->link_multipart_objects;	2318	$self->link_multipart_objects;
2077	$self->difficulty ($self->estimate_difficulty)	2319	$self->difficulty ($self->estimate_difficulty)
…		…
2081	unless ($self->{deny_activate}) {	2323	unless ($self->{deny_activate}) {
2082	$self->decay_objects;	2324	$self->decay_objects;
2083	$self->fix_auto_apply;	2325	$self->fix_auto_apply;
2084	$self->update_buttons;	2326	$self->update_buttons;
2085	cf::cede_to_tick;	2327	cf::cede_to_tick;
2086	$self->activate;	2328	#$self->activate; # no longer activate maps automatically
2087	}	2329	}
2088		2330
2089	$self->{last_save} = $cf::RUNTIME;	2331	$self->{last_save} = $cf::RUNTIME;
2090	$self->last_access ($cf::RUNTIME);	2332	$self->last_access ($cf::RUNTIME);
2091
2092	$self->in_memory (cf::MAP_ACTIVE);
2093	}	2333	}
2094		2334
2095	$self->post_load;	2335	$self->post_load;
2096	}
2097		2336
		2337	1
		2338	}
		2339
		2340	# customize the map for a given player, i.e.
		2341	# return the _real_ map. used by e.g. per-player
		2342	# maps to change the path to ~playername/mappath
2098	sub customise_for {	2343	sub customise_for {
2099	my ($self, $ob) = @_;	2344	my ($self, $ob) = @_;
2100		2345
2101	return find "~" . $ob->name . "/" . $self->{path}	2346	return find "~" . $ob->name . "/" . $self->{path}
2102	if $self->per_player;	2347	if $self->per_player;
…		…
2105	# if $self->per_party;	2350	# if $self->per_party;
2106		2351
2107	$self	2352	$self
2108	}	2353	}
2109		2354
2110	# find and load all maps in the 3x3 area around a map
2111	sub load_neighbours {
2112	my ($map) = @_;
2113
2114	my @neigh; # diagonal neighbours
2115
2116	for (0 .. 3) {
2117	my $neigh = $map->tile_path ($_)
2118	or next;
2119	$neigh = find $neigh, $map
2120	or next;
2121	$neigh->load;
2122
2123	push @neigh,
2124	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2125	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2126	}
2127
2128	for (grep defined $_->[0], @neigh) {
2129	my ($path, $origin) = @$_;
2130	my $neigh = find $path, $origin
2131	or next;
2132	$neigh->load;
2133	}
2134	}
2135
2136	sub find_sync {	2355	sub find_sync {
2137	my ($path, $origin) = @_;	2356	my ($path, $origin) = @_;
2138		2357
2139	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
2140	}	2363	}
2141		2364
2142	sub do_load_sync {	2365	sub do_load_sync {
2143	my ($map) = @_;	2366	my ($map) = @_;
2144		2367
		2368	# it's a bug to call this from the main context
2145	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2369	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2146	if $Coro::current == $Coro::main;	2370	if $Coro::current == $Coro::main;
2147		2371
2148	cf::sync_job { $map->load };	2372	$map->load;
2149	}	2373	}
2150		2374
2151	our %MAP_PREFETCH;	2375	our %MAP_PREFETCH;
2152	our $MAP_PREFETCHER = undef;	2376	our $MAP_PREFETCHER = undef;
2153		2377
2154	sub find_async {	2378	sub find_async {
2155	my ($path, $origin, $load) = @_;	2379	my ($path, $origin, $load) = @_;
2156		2380
2157	$path = normalise $path, $origin && $origin->{path};	2381	$path = normalise $path, $origin;
2158		2382
2159	if (my $map = $cf::MAP{$path}) {	2383	if (my $map = $cf::MAP{$path}) {
2160	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2384	return $map if !$load || $map->linkable;
2161	}	2385	}
2162		2386
2163	$MAP_PREFETCH{$path} |= $load;	2387	$MAP_PREFETCH{$path} |= $load;
2164		2388
2165	$MAP_PREFETCHER ||= cf::async {	2389	$MAP_PREFETCHER ||= cf::async {
…		…
2179	$MAP_PREFETCHER->prio (6);	2403	$MAP_PREFETCHER->prio (6);
2180		2404
2181	()	2405	()
2182	}	2406	}
2183		2407
		2408	# common code, used by both ->save and ->swapout
2184	sub save {	2409	sub _save {
2185	my ($self) = @_;	2410	my ($self) = @_;
2186
2187	my $lock = cf::lock_acquire "map_data:$self->{path}";
2188		2411
2189	$self->{last_save} = $cf::RUNTIME;	2412	$self->{last_save} = $cf::RUNTIME;
2190		2413
2191	return unless $self->dirty;	2414	return unless $self->dirty;
2192		2415
…		…
2212	} else {	2435	} else {
2213	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);	2436	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2214	}	2437	}
2215	}	2438	}
2216		2439
		2440	sub save {
		2441	my ($self) = @_;
		2442
		2443	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2444
		2445	$self->_save;
		2446	}
		2447
2217	sub swap_out {	2448	sub swap_out {
2218	my ($self) = @_;	2449	my ($self) = @_;
2219		2450
2220	# save first because save cedes
2221	$self->save;
2222
2223	my $lock = cf::lock_acquire "map_data:$self->{path}";	2451	my $lock = cf::lock_acquire "map_data:$self->{path}";
2224		2452
		2453	return if !$self->linkable;
		2454	return if $self->{deny_save};
2225	return if $self->players;	2455	return if $self->players;
2226	return if $self->in_memory != cf::MAP_ACTIVE;	2456
		2457	# first deactivate the map and "unlink" it from the core
		2458	$self->deactivate;
		2459	$_->clear_links_to ($self) for values %cf::MAP;
		2460	$self->state (cf::MAP_SWAPPED);
		2461
		2462	# then atomically save
		2463	$self->_save;
		2464
		2465	# then free the map
		2466	$self->clear;
		2467	}
		2468
		2469	sub reset_at {
		2470	my ($self) = @_;
		2471
		2472	# TODO: safety, remove and allow resettable per-player maps
2227	return if $self->{deny_save};	2473	return 1e99 if $self->{deny_reset};
2228		2474
		2475	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
		2476	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
		2477
		2478	$time + $to
		2479	}
		2480
		2481	sub should_reset {
		2482	my ($self) = @_;
		2483
		2484	$self->reset_at <= $cf::RUNTIME
		2485	}
		2486
		2487	sub reset {
		2488	my ($self) = @_;
		2489
		2490	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2491
		2492	return if $self->players;
		2493
		2494	cf::trace "resetting map ", $self->path, "\n";
		2495
2229	$self->in_memory (cf::MAP_SWAPPED);	2496	$self->state (cf::MAP_SWAPPED);
		2497
		2498	# need to save uniques path
		2499	unless ($self->{deny_save}) {
		2500	my $uniq = $self->uniq_path; utf8::encode $uniq;
		2501
		2502	$self->_save_objects ($uniq, cf::IO_UNIQUES)
		2503	if $uniq;
		2504	}
		2505
		2506	delete $cf::MAP{$self->path};
2230		2507
2231	$self->deactivate;	2508	$self->deactivate;
2232	$_->clear_links_to ($self) for values %cf::MAP;	2509	$_->clear_links_to ($self) for values %cf::MAP;
2233	$self->clear;	2510	$self->clear;
2234	}
2235
2236	sub reset_at {
2237	my ($self) = @_;
2238
2239	# TODO: safety, remove and allow resettable per-player maps
2240	return 1e99 if $self->{deny_reset};
2241
2242	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2243	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2244
2245	$time + $to
2246	}
2247
2248	sub should_reset {
2249	my ($self) = @_;
2250
2251	$self->reset_at <= $cf::RUNTIME
2252	}
2253
2254	sub reset {
2255	my ($self) = @_;
2256
2257	my $lock = cf::lock_acquire "map_data:$self->{path}";
2258
2259	return if $self->players;
2260
2261	warn "resetting map ", $self->path, "\n";
2262
2263	$self->in_memory (cf::MAP_SWAPPED);
2264
2265	# need to save uniques path
2266	unless ($self->{deny_save}) {
2267	my $uniq = $self->uniq_path; utf8::encode $uniq;
2268
2269	$self->_save_objects ($uniq, cf::IO_UNIQUES)
2270	if $uniq;
2271	}
2272
2273	delete $cf::MAP{$self->path};
2274
2275	$self->deactivate;
2276	$_->clear_links_to ($self) for values %cf::MAP;
2277	$self->clear;
2278		2511
2279	$self->unlink_save;	2512	$self->unlink_save;
2280	$self->destroy;	2513	$self->destroy;
2281	}	2514	}
2282		2515
…		…
2290		2523
2291	delete $cf::MAP{$self->path};	2524	delete $cf::MAP{$self->path};
2292		2525
2293	$self->unlink_save;	2526	$self->unlink_save;
2294		2527
2295	bless $self, "cf::map";	2528	bless $self, "cf::map::wrap";
2296	delete $self->{deny_reset};	2529	delete $self->{deny_reset};
2297	$self->{deny_save} = 1;	2530	$self->{deny_save} = 1;
2298	$self->reset_timeout (1);	2531	$self->reset_timeout (1);
2299	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2532	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2300		2533
…		…
2530		2763
2531	Freezes the player and moves him/her to a special map (C<{link}>).	2764	Freezes the player and moves him/her to a special map (C<{link}>).
2532		2765
2533	The player should be reasonably safe there for short amounts of time (e.g.	2766	The player should be reasonably safe there for short amounts of time (e.g.
2534	for loading a map). You I<MUST> call C<leave_link> as soon as possible,	2767	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2535	though, as the palyer cannot control the character while it is on the link	2768	though, as the player cannot control the character while it is on the link
2536	map.	2769	map.
2537		2770
2538	Will never block.	2771	Will never block.
2539		2772
2540	=item $player_object->leave_link ($map, $x, $y)	2773	=item $player_object->leave_link ($map, $x, $y)
…		…
2561	sub cf::object::player::enter_link {	2794	sub cf::object::player::enter_link {
2562	my ($self) = @_;	2795	my ($self) = @_;
2563		2796
2564	$self->deactivate_recursive;	2797	$self->deactivate_recursive;
2565		2798
		2799	++$self->{_link_recursion};
		2800
2566	return if UNIVERSAL::isa $self->map, "ext::map_link";	2801	return if UNIVERSAL::isa $self->map, "ext::map_link";
2567		2802
2568	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2803	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2569	if $self->map && $self->map->{path} ne "{link}";	2804	if $self->map && $self->map->{path} ne "{link}";
2570		2805
2571	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2806	$self->enter_map ($LINK_MAP || link_map, 3, 3);
2572	}	2807	}
2573		2808
2574	sub cf::object::player::leave_link {	2809	sub cf::object::player::leave_link {
2575	my ($self, $map, $x, $y) = @_;	2810	my ($self, $map, $x, $y) = @_;
2576		2811
…		…
2596	# use -1 or undef as default coordinates, not 0, 0	2831	# use -1 or undef as default coordinates, not 0, 0
2597	($x, $y) = ($map->enter_x, $map->enter_y)	2832	($x, $y) = ($map->enter_x, $map->enter_y)
2598	if $x <= 0 && $y <= 0;	2833	if $x <= 0 && $y <= 0;
2599		2834
2600	$map->load;	2835	$map->load;
2601	$map->load_neighbours;
2602		2836
2603	return unless $self->contr->active;	2837	return unless $self->contr->active;
2604		2838
2605	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2839	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2606	$self->enter_map ($map, $x, $y);	2840	if ($self->enter_map ($map, $x, $y)) {
2607		2841	# entering was successful
		2842	delete $self->{_link_recursion};
2608	# only activate afterwards, to support waiting in hooks	2843	# only activate afterwards, to support waiting in hooks
2609	$self->activate_recursive;	2844	$self->activate_recursive;
2610	}	2845	}
2611		2846
		2847	}
		2848
2612	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2849	=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2613		2850
2614	Moves the player to the given map-path and coordinates by first freezing	2851	Moves the player to the given map-path and coordinates by first freezing
2615	her, loading and preparing them map, calling the provided $check callback	2852	her, loading and preparing them map, calling the provided $check callback
2616	that has to return the map if sucecssful, and then unfreezes the player on	2853	that has to return the map if sucecssful, and then unfreezes the player on
2617	the new (success) or old (failed) map position. In either case, $done will	2854	the new (success) or old (failed) map position. In either case, $done will
…		…
2624		2861
2625	our $GOTOGEN;	2862	our $GOTOGEN;
2626		2863
2627	sub cf::object::player::goto {	2864	sub cf::object::player::goto {
2628	my ($self, $path, $x, $y, $check, $done) = @_;	2865	my ($self, $path, $x, $y, $check, $done) = @_;
		2866
		2867	if ($self->{_link_recursion} >= $MAX_LINKS) {
		2868	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
		2869	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
		2870	($path, $x, $y) = @$EMERGENCY_POSITION;
		2871	}
2629		2872
2630	# 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
2631	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2874	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2632		2875
2633	$self->enter_link;	2876	$self->enter_link;
…		…
2653	($path, $x, $y) = (undef, undef, undef);	2896	($path, $x, $y) = (undef, undef, undef);
2654	}	2897	}
2655	}	2898	}
2656		2899
2657	my $map = eval {	2900	my $map = eval {
2658	my $map = defined $path ? cf::map::find $path : undef;	2901	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2659		2902
2660	if ($map) {	2903	if ($map) {
2661	$map = $map->customise_for ($self);	2904	$map = $map->customise_for ($self);
2662	$map = $check->($map) if $check && $map;	2905	$map = $check->($map, $x, $y, $self) if $check && $map;
2663	} else {	2906	} else {
2664	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);	2907	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2665	}	2908	}
2666		2909
2667	$map	2910	$map
…		…
2675	if ($gen == $self->{_goto_generation}) {	2918	if ($gen == $self->{_goto_generation}) {
2676	delete $self->{_goto_generation};	2919	delete $self->{_goto_generation};
2677	$self->leave_link ($map, $x, $y);	2920	$self->leave_link ($map, $x, $y);
2678	}	2921	}
2679		2922
2680	$done->() if $done;	2923	$done->($self) if $done;
2681	})->prio (1);	2924	})->prio (1);
2682	}	2925	}
2683		2926
2684	=item $player_object->enter_exit ($exit_object)	2927	=item $player_object->enter_exit ($exit_object)
2685		2928
…		…
2753	$Coro::current->{desc} = "enter_exit";	2996	$Coro::current->{desc} = "enter_exit";
2754		2997
2755	unless (eval {	2998	unless (eval {
2756	$self->deactivate_recursive; # just to be sure	2999	$self->deactivate_recursive; # just to be sure
2757		3000
2758	# random map handling
2759	{
2760	my $guard = cf::lock_acquire "exit_prepare:$exit";
2761
2762	prepare_random_map $exit
2763	if $exit->slaying eq "/!";
2764	}
2765
2766	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	3001	my $map = cf::map::normalise $exit->slaying, $exit->map;
2767	my $x = $exit->stats->hp;	3002	my $x = $exit->stats->hp;
2768	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	}
2769		3027
2770	$self->goto ($map, $x, $y);	3028	$self->goto ($map, $x, $y);
2771		3029
2772	# if exit is damned, update players death & WoR home-position	3030	# if exit is damned, update players death & WoR home-position
2773	$self->contr->savebed ($map, $x, $y)	3031	$self->contr->savebed ($map, $x, $y)
…		…
2778	$self->message ("Something went wrong deep within the deliantra server. "	3036	$self->message ("Something went wrong deep within the deliantra server. "
2779	. "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. "
2780	. "Please report this to the dungeon master!",	3038	. "Please report this to the dungeon master!",
2781	cf::NDI_UNIQUE | cf::NDI_RED);	3039	cf::NDI_UNIQUE | cf::NDI_RED);
2782		3040
2783	warn "ERROR in enter_exit: $@";	3041	error "ERROR in enter_exit: $@";
2784	$self->leave_link;	3042	$self->leave_link;
2785	}	3043	}
2786	})->prio (1);	3044	})->prio (1);
2787	}	3045	}
2788		3046
…		…
2998	=cut	3256	=cut
2999		3257
3000	sub cf::client::ext_msg($$@) {	3258	sub cf::client::ext_msg($$@) {
3001	my ($self, $type, @msg) = @_;	3259	my ($self, $type, @msg) = @_;
3002		3260
3003	if ($self->extcmd == 2) {
3004	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3261	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3005	} elsif ($self->extcmd == 1) { # TODO: remove
3006	push @msg, msgtype => "event_$type";
3007	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3008	}
3009	}
3010
3011	=item $client->ext_reply ($msgid, @msg)
3012
3013	Sends an ext reply to the client.
3014
3015	=cut
3016
3017	sub cf::client::ext_reply($$@) {
3018	my ($self, $id, @msg) = @_;
3019
3020	if ($self->extcmd == 2) {
3021	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3022	} elsif ($self->extcmd == 1) {
3023	#TODO: version 1, remove
3024	unshift @msg, msgtype => "reply", msgid => $id;
3025	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3026	}
3027	}	3262	}
3028		3263
3029	=item $success = $client->query ($flags, "text", \&cb)	3264	=item $success = $client->query ($flags, "text", \&cb)
3030		3265
3031	Queues a query to the client, calling the given callback with	3266	Queues a query to the client, calling the given callback with
…		…
3086	my ($ns, $buf) = @_;	3321	my ($ns, $buf) = @_;
3087		3322
3088	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3323	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3089		3324
3090	if (ref $msg) {	3325	if (ref $msg) {
3091	my ($type, $reply, @payload) =	3326	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3092	"ARRAY" eq ref $msg
3093	? @$msg
3094	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3095		3327
3096	my @reply;
3097
3098	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}) {
3099	@reply = $cb->($ns, @payload);	3341	@reply = $cb->($ns, @payload);
		3342	}
		3343
		3344	$ns->ext_msg ("reply-$reply", @reply)
		3345	if $reply;
3100	}	3346	}
3101
3102	$ns->ext_reply ($reply, @reply)
3103	if $reply;
3104
3105	} else {	3347	} else {
3106	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";
3107	}	3349	}
3108		3350
3109	cf::override;	3351	cf::override;
3110	},	3352	},
3111	);	3353	);
…		…
3131		3373
3132	$coro	3374	$coro
3133	}	3375	}
3134		3376
3135	cf::client->attach (	3377	cf::client->attach (
3136	on_destroy => sub {	3378	on_client_destroy => sub {
3137	my ($ns) = @_;	3379	my ($ns) = @_;
3138		3380
3139	$_->cancel for values %{ (delete $ns->{_coro}) || {} };	3381	$_->cancel for values %{ (delete $ns->{_coro}) || {} };
3140	},	3382	},
3141	);	3383	);
…		…
3192	decrease split destroy change_exp value msg lore send_msg)],	3434	decrease split destroy change_exp value msg lore send_msg)],
3193	["cf::object::player" => qw(player)],	3435	["cf::object::player" => qw(player)],
3194	["cf::player" => qw(peaceful send_msg)],	3436	["cf::player" => qw(peaceful send_msg)],
3195	["cf::map" => qw(trigger)],	3437	["cf::map" => qw(trigger)],
3196	) {	3438	) {
3197	no strict 'refs';
3198	my ($pkg, @funs) = @$_;	3439	my ($pkg, @funs) = @$_;
3199	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3440	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3200	for @funs;	3441	for @funs;
3201	}	3442	}
3202		3443
…		…
3241	local @cf::_safe_eval_args = values %vars;	3482	local @cf::_safe_eval_args = values %vars;
3242	@res = wantarray ? eval eval : scalar eval $eval;	3483	@res = wantarray ? eval eval : scalar eval $eval;
3243	}	3484	}
3244		3485
3245	if ($@) {	3486	if ($@) {
3246	warn "$@";	3487	warn "$@",
3247	warn "while executing safe code '$code'\n";	3488	"while executing safe code '$code'\n",
3248	warn "with arguments " . (join " ", %vars) . "\n";	3489	"with arguments " . (join " ", %vars) . "\n";
3249	}	3490	}
3250		3491
3251	wantarray ? @res : $res[0]	3492	wantarray ? @res : $res[0]
3252	}	3493	}
3253		3494
…		…
3278	=cut	3519	=cut
3279		3520
3280	#############################################################################	3521	#############################################################################
3281	# the server's init and main functions	3522	# the server's init and main functions
3282		3523
		3524	our %FACEHASH; # hash => idx, #d# HACK for http server
		3525	our @FACEDATA; # dynamically-created facedata
		3526
		3527	# internal api, not fianlised
		3528	sub set_face {
		3529	my ($name, $type, $data) = @_;
		3530
		3531	my $idx = cf::face::find $name;
		3532
		3533	if ($idx) {
		3534	delete $FACEHASH{cf::face::get_chksum $idx};
		3535	} else {
		3536	$idx = cf::face::alloc $name;
		3537	}
		3538
		3539	my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
		3540
		3541	cf::face::set_type $idx, $type;
		3542	cf::face::set_data $idx, 0, (length $data), 0, $hash;
		3543	cf::face::set_meta $idx, $type & 1 ? undef : undef;
		3544
		3545	# we need to destroy the SV itself, not just overwrite,
		3546	# as a running ix might hold a reference to it.
		3547	# delete achieves that.
		3548	delete $FACEDATA[$idx];
		3549	$FACEDATA[$idx] = $data;
		3550	$FACEHASH{$hash} = $idx;#d#
		3551
		3552	$idx
		3553	}
		3554
		3555	our $FACEDATA; # facedata filehandle
		3556
		3557	sub _face_get_data($$$$) {
		3558	my ($idx, $size, $fofs, $cb) = @_;
		3559
		3560	if (defined $FACEDATA[$idx]) {
		3561	$cb->($FACEDATA[$idx]);
		3562	} elsif ($fofs) {
		3563	my $buf;
		3564	IO::AIO::aio_read $FACEDATA, $fofs, $size, $buf, 0, sub {
		3565	if ($_[0] == $size) {
		3566	#cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
		3567	$cb->($buf);
		3568	} else {
		3569	cf::error "INTERNAL ERROR: unable to read facedata for face $idx ($size, $fofs), ignoring request.";
		3570	}
		3571	};
		3572	} else {
		3573	cf::error "requested facedata for unknown face $idx ($size, $fofs), ignoring.";
		3574	}
		3575	}
		3576
		3577	# rather ineffient
		3578	sub cf::face::get_data($;$) {
		3579	my ($idx, $faceset) = @_;
		3580
		3581	my $size = cf::face::get_size $idx, $faceset;
		3582	my $fofs = cf::face::get_fofs $idx, $faceset;
		3583
		3584	_face_get_data $idx, $size, $fofs, Coro::rouse_cb;
		3585	Coro::rouse_wait
		3586	}
		3587
		3588	sub cf::face::ix {
		3589	my ($ns, $idx, $pri, $size, $fofs) = @_;
		3590
		3591	_face_get_data $idx, $size, $fofs, sub {
		3592	$ns->ix_send ($idx, $pri, $_[0]);
		3593	};
		3594	}
		3595
3283	sub load_facedata($) {	3596	sub load_facedata($) {
3284	my ($path) = @_;	3597	my ($path) = @_;
3285		3598
3286	# HACK to clear player env face cache, we need some signal framework
3287	# for this (global event?)
3288	%ext::player_env::MUSIC_FACE_CACHE = ();
3289
3290	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3599	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3291		3600
3292	warn "loading facedata from $path\n";	3601	trace "loading facedata from $path\n";
3293		3602
3294	my $facedata;	3603	my $facedata = decode_storable load_file "$path/faceinfo";
3295	0 < aio_load $path, $facedata
3296	or die "$path: $!";
3297
3298	$facedata = Coro::Storable::thaw $facedata;
3299		3604
3300	$facedata->{version} == 2	3605	$facedata->{version} == 2
3301	or cf::cleanup "$path: version mismatch, cannot proceed.";	3606	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3302		3607
3303	# patch in the exptable	3608	my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3304	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);	3609	or cf::cleanup "$path/facedata: $!, cnanot proceed.";
3305	$facedata->{resource}{"res/exp_table"} = {	3610
3306	type => FT_RSRC,	3611	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3307	data => $exp_table,	3612
3308	hash => (Digest::MD5::md5 $exp_table),	3613	# BEGIN ATOMIC
3309	};	3614	# from here on, everything must be atomic - no thread switch allowed
3310	cf::cede_to_tick;	3615	my $t1 = EV::time;
3311		3616
3312	{	3617	{
3313	my $faces = $facedata->{faceinfo};	3618	my $faces = $facedata->{faceinfo};
3314		3619
3315	while (my ($face, $info) = each %$faces) {	3620	for my $face (sort keys %$faces) {
		3621	my $info = $faces->{$face};
3316	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3622	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3317		3623
3318	cf::face::set_visibility $idx, $info->{visibility};	3624	cf::face::set_visibility $idx, $info->{visibility};
3319	cf::face::set_magicmap $idx, $info->{magicmap};	3625	cf::face::set_magicmap $idx, $info->{magicmap};
3320	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3626	cf::face::set_data $idx, 0, $info->{size32}, $info->{fofs32}, $info->{hash32};
3321	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3627	cf::face::set_data $idx, 1, $info->{size64}, $info->{fofs64}, $info->{hash64};
3322		3628	#cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph}; # glyphs no longer downloadable via ix
3323	cf::cede_to_tick;	3629	$FACEHASH{$info->{hash64}} = $idx;#d#
3324	}	3630	}
3325		3631
3326	while (my ($face, $info) = each %$faces) {	3632	while (my ($face, $info) = each %$faces) {
3327	next unless $info->{smooth};	3633	next unless $info->{smooth};
3328		3634
…		…
3331		3637
3332	if (my $smooth = cf::face::find $info->{smooth}) {	3638	if (my $smooth = cf::face::find $info->{smooth}) {
3333	cf::face::set_smooth $idx, $smooth;	3639	cf::face::set_smooth $idx, $smooth;
3334	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3640	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3335	} else {	3641	} else {
3336	warn "smooth face '$info->{smooth}' not found for face '$face'";	3642	error "smooth face '$info->{smooth}' not found for face '$face'";
3337	}	3643	}
3338
3339	cf::cede_to_tick;
3340	}	3644	}
3341	}	3645	}
3342		3646
3343	{	3647	{
3344	my $anims = $facedata->{animinfo};	3648	my $anims = $facedata->{animinfo};
3345		3649
3346	while (my ($anim, $info) = each %$anims) {	3650	while (my ($anim, $info) = each %$anims) {
3347	cf::anim::set $anim, $info->{frames}, $info->{facings};	3651	cf::anim::set $anim, $info->{frames}, $info->{facings};
3348	cf::cede_to_tick;
3349	}	3652	}
3350		3653
3351	cf::anim::invalidate_all; # d'oh	3654	cf::anim::invalidate_all; # d'oh
3352	}	3655	}
3353		3656
3354	{	3657	{
3355	my $res = $facedata->{resource};	3658	my $res = $facedata->{resource};
3356		3659
3357	while (my ($name, $info) = each %$res) {	3660	while (my ($name, $info) = each %$res) {
3358	if (defined $info->{type}) {	3661	if (defined (my $type = $info->{type})) {
		3662	# TODO: different hash - must free and use new index, or cache ixface data queue
3359	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3663	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3360		3664
3361	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3362	cf::face::set_type $idx, $info->{type};	3665	cf::face::set_type $idx, $type;
		3666	cf::face::set_data $idx, 0, $info->{size}, $info->{fofs}, $info->{hash};
		3667	cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3668	$FACEHASH{$info->{hash}} = $idx;#d#
3363	} else {	3669	} else {
3364	$RESOURCE{$name} = $info;	3670	# $RESOURCE{$name} = $info; # unused
3365	}	3671	}
3366
3367	cf::cede_to_tick;
3368	}	3672	}
3369	}	3673	}
		3674
		3675	($fh, $FACEDATA) = ($FACEDATA, $fh);
		3676
		3677	# HACK to clear player env face cache, we need some signal framework
		3678	# for this (global event?)
		3679	%ext::player_env::MUSIC_FACE_CACHE = ();
		3680
		3681	# END ATOMIC
		3682
		3683	cf::debug "facedata atomic update time ", EV::time - $t1;
3370		3684
3371	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3685	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3372		3686
		3687	aio_close $fh if $fh; # close old facedata
		3688
3373	1	3689	1
3374	}	3690	}
3375
3376	cf::global->attach (on_resource_update => sub {
3377	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3378	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3379
3380	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3381	my $sound = $soundconf->{compat}[$_]
3382	or next;
3383
3384	my $face = cf::face::find "sound/$sound->[1]";
3385	cf::sound::set $sound->[0] => $face;
3386	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3387	}
3388
3389	while (my ($k, $v) = each %{$soundconf->{event}}) {
3390	my $face = cf::face::find "sound/$v";
3391	cf::sound::set $k => $face;
3392	}
3393	}
3394	});
3395		3691
3396	register_exticmd fx_want => sub {	3692	register_exticmd fx_want => sub {
3397	my ($ns, $want) = @_;	3693	my ($ns, $want) = @_;
3398		3694
3399	while (my ($k, $v) = each %$want) {	3695	while (my ($k, $v) = each %$want) {
…		…
3407	my $status = load_resource_file_ $_[0];	3703	my $status = load_resource_file_ $_[0];
3408	get_slot 0.1, 100;	3704	get_slot 0.1, 100;
3409	cf::arch::commit_load;	3705	cf::arch::commit_load;
3410		3706
3411	$status	3707	$status
		3708	}
		3709
		3710	sub reload_exp_table {
		3711	_reload_exp_table;
		3712
		3713	set_face "res/exp_table" => FT_RSRC,
		3714	JSON::XS->new->utf8->canonical->encode (
		3715	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3716	);
		3717	}
		3718
		3719	sub reload_materials {
		3720	_reload_materials;
3412	}	3721	}
3413		3722
3414	sub reload_regions {	3723	sub reload_regions {
3415	# HACK to clear player env face cache, we need some signal framework	3724	# HACK to clear player env face cache, we need some signal framework
3416	# for this (global event?)	3725	# for this (global event?)
…		…
3424	if exists $_->{match};	3733	if exists $_->{match};
3425	}	3734	}
3426	}	3735	}
3427		3736
3428	sub reload_facedata {	3737	sub reload_facedata {
3429	load_facedata "$DATADIR/facedata"	3738	load_facedata $DATADIR
3430	or die "unable to load facedata\n";	3739	or die "unable to load facedata\n";
3431	}	3740	}
3432		3741
3433	sub reload_archetypes {	3742	sub reload_archetypes {
3434	load_resource_file "$DATADIR/archetypes"	3743	load_resource_file "$DATADIR/archetypes"
3435	or die "unable to load archetypes\n";	3744	or die "unable to load archetypes\n";
		3745
		3746	set_face "res/skill_info" => FT_RSRC,
		3747	JSON::XS->new->utf8->canonical->encode (
		3748	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3749	);
		3750	set_face "res/spell_paths" => FT_RSRC,
		3751	JSON::XS->new->utf8->canonical->encode (
		3752	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3753	);
3436	}	3754	}
3437		3755
3438	sub reload_treasures {	3756	sub reload_treasures {
3439	load_resource_file "$DATADIR/treasures"	3757	load_resource_file "$DATADIR/treasures"
3440	or die "unable to load treasurelists\n";	3758	or die "unable to load treasurelists\n";
3441	}	3759	}
3442		3760
		3761	sub reload_sound {
		3762	trace "loading sound config from $DATADIR/sound\n";
		3763
		3764	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
		3765
		3766	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3767	my $sound = $soundconf->{compat}[$_]
		3768	or next;
		3769
		3770	my $face = cf::face::find "sound/$sound->[1]";
		3771	cf::sound::set $sound->[0] => $face;
		3772	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3773	}
		3774
		3775	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3776	my $face = cf::face::find "sound/$v";
		3777	cf::sound::set $k => $face;
		3778	}
		3779	}
		3780
3443	sub reload_resources {	3781	sub reload_resources {
3444	warn "reloading resource files...\n";	3782	trace "reloading resource files...\n";
3445		3783
		3784	reload_materials;
3446	reload_facedata;	3785	reload_facedata;
		3786	reload_exp_table;
		3787	reload_sound;
3447	reload_archetypes;	3788	reload_archetypes;
3448	reload_regions;	3789	reload_regions;
3449	reload_treasures;	3790	reload_treasures;
3450		3791
3451	warn "finished reloading resource files\n";	3792	trace "finished reloading resource files\n";
3452	}	3793	}
3453		3794
3454	sub reload_config {	3795	sub reload_config {
3455	warn "reloading config file...\n";	3796	trace "reloading config file...\n";
3456		3797
3457	open my $fh, "<:utf8", "$CONFDIR/config"	3798	my $config = load_file "$CONFDIR/config";
3458	or return;	3799	utf8::decode $config;
		3800	*CFG = decode_yaml $config;
3459		3801
3460	local $/;
3461	*CFG = YAML::XS::Load scalar <$fh>;
3462
3463	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3802	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3464		3803
3465	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3804	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3466	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3805	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3467		3806
3468	if (exists $CFG{mlockall}) {	3807	if (exists $CFG{mlockall}) {
…		…
3470	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3809	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3471	and die "WARNING: m(un)lockall failed: $!\n";	3810	and die "WARNING: m(un)lockall failed: $!\n";
3472	};	3811	};
3473	warn $@ if $@;	3812	warn $@ if $@;
3474	}	3813	}
3475
3476	warn "finished reloading resource files\n";
3477	}	3814	}
3478		3815
3479	sub pidfile() {	3816	sub pidfile() {
3480	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3817	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3481	or die "$PIDFILE: $!";	3818	or die "$PIDFILE: $!";
…		…
3494	seek $fh, 0, 0;	3831	seek $fh, 0, 0;
3495	print $fh $$;	3832	print $fh $$;
3496	}	3833	}
3497		3834
3498	sub main_loop {	3835	sub main_loop {
3499	warn "EV::loop starting\n";	3836	trace "EV::loop starting\n";
3500	if (1) {	3837	if (1) {
3501	EV::loop;	3838	EV::loop;
3502	}	3839	}
3503	warn "EV::loop returned\n";	3840	trace "EV::loop returned\n";
3504	goto &main_loop unless $REALLY_UNLOOP;	3841	goto &main_loop unless $REALLY_UNLOOP;
3505	}	3842	}
3506		3843
3507	sub main {	3844	sub main {
3508	cf::init_globals; # initialise logging	3845	cf::init_globals; # initialise logging
3509		3846
3510	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3847	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3511	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3848	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3512	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3849	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3513	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3850	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3514		3851
3515	cf::init_experience;
3516	cf::init_anim;
3517	cf::init_attackmess;
3518	cf::init_dynamic;
3519
3520	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3852	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3521		3853
3522	# we must not ever block the main coroutine	3854	# we must not ever block the main coroutine
3523	local $Coro::idle = sub {	3855	$Coro::idle = sub {
3524	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3856	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3525	(async {	3857	(async {
3526	$Coro::current->{desc} = "IDLE BUG HANDLER";	3858	$Coro::current->{desc} = "IDLE BUG HANDLER";
3527	EV::loop EV::LOOP_ONESHOT;	3859	EV::loop EV::LOOP_ONESHOT;
3528	})->prio (Coro::PRIO_MAX);	3860	})->prio (Coro::PRIO_MAX);
3529	};	3861	};
3530		3862
3531	evthread_start IO::AIO::poll_fileno;	3863	evthread_start IO::AIO::poll_fileno;
3532		3864
3533	cf::sync_job {	3865	cf::sync_job {
		3866	cf::incloader::init ();
		3867
		3868	db_init;
		3869
		3870	cf::init_anim;
		3871	cf::init_attackmess;
		3872	cf::init_dynamic;
		3873
3534	cf::load_settings;	3874	cf::load_settings;
3535	cf::load_materials;
3536		3875
3537	reload_resources;	3876	reload_resources;
3538	reload_config;	3877	reload_config;
3539	db_init;
3540		3878
3541	cf::init_uuid;	3879	cf::init_uuid;
3542	cf::init_signals;	3880	cf::init_signals;
3543	cf::init_commands;
3544	cf::init_skills;	3881	cf::init_skills;
3545		3882
3546	cf::init_beforeplay;	3883	cf::init_beforeplay;
3547		3884
3548	atomic;	3885	atomic;
…		…
3553		3890
3554	# no (long-running) fork's whatsoever before this point(!)	3891	# no (long-running) fork's whatsoever before this point(!)
3555	use POSIX ();	3892	use POSIX ();
3556	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3893	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3557		3894
3558	(pop @POST_INIT)->(0) while @POST_INIT;	3895	cf::_post_init 0;
3559	};	3896	};
3560		3897
		3898	cf::object::thawer::errors_are_fatal 0;
		3899	info "parse errors in files are no longer fatal from this point on.\n";
		3900
		3901	AE::postpone {
		3902	undef &main; # free gobs of memory :)
		3903	};
		3904
3561	main_loop;	3905	goto &main_loop;
3562	}	3906	}
3563		3907
3564	#############################################################################	3908	#############################################################################
3565	# initialisation and cleanup	3909	# initialisation and cleanup
3566		3910
3567	# install some emergency cleanup handlers	3911	# install some emergency cleanup handlers
3568	BEGIN {	3912	BEGIN {
3569	our %SIGWATCHER = ();	3913	our %SIGWATCHER = ();
3570	for my $signal (qw(INT HUP TERM)) {	3914	for my $signal (qw(INT HUP TERM)) {
3571	$SIGWATCHER{$signal} = EV::signal $signal, sub {	3915	$SIGWATCHER{$signal} = AE::signal $signal, sub {
3572	cf::cleanup "SIG$signal";	3916	cf::cleanup "SIG$signal";
3573	};	3917	};
3574	}	3918	}
3575	}	3919	}
3576		3920
3577	sub write_runtime_sync {	3921	sub write_runtime_sync {
3578	my $t0 = EV::time;	3922	my $t0 = AE::time;
3579		3923
3580	# first touch the runtime file to show we are still running:	3924	# first touch the runtime file to show we are still running:
3581	# the fsync below can take a very very long time.	3925	# the fsync below can take a very very long time.
3582		3926
3583	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;	3927	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
…		…
3605	or return;	3949	or return;
3606		3950
3607	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3951	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3608	and return;	3952	and return;
3609		3953
3610	warn sprintf "runtime file written (%gs).\n", EV::time - $t0;	3954	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3611		3955
3612	1	3956	1
3613	}	3957	}
3614		3958
3615	our $uuid_lock;	3959	our $uuid_lock;
…		…
3627	or return;	3971	or return;
3628		3972
3629	my $value = uuid_seq uuid_cur;	3973	my $value = uuid_seq uuid_cur;
3630		3974
3631	unless ($value) {	3975	unless ($value) {
3632	warn "cowardly refusing to write zero uuid value!\n";	3976	info "cowardly refusing to write zero uuid value!\n";
3633	return;	3977	return;
3634	}	3978	}
3635		3979
3636	my $value = uuid_str $value + $uuid_skip;	3980	my $value = uuid_str $value + $uuid_skip;
3637	$uuid_skip = 0;	3981	$uuid_skip = 0;
…		…
3647	or return;	3991	or return;
3648		3992
3649	aio_rename "$uuid~", $uuid	3993	aio_rename "$uuid~", $uuid
3650	and return;	3994	and return;
3651		3995
3652	warn "uuid file written ($value).\n";	3996	trace "uuid file written ($value).\n";
3653		3997
3654	1	3998	1
3655		3999
3656	}	4000	}
3657		4001
…		…
3663	}	4007	}
3664		4008
3665	sub emergency_save() {	4009	sub emergency_save() {
3666	my $freeze_guard = cf::freeze_mainloop;	4010	my $freeze_guard = cf::freeze_mainloop;
3667		4011
3668	warn "emergency_perl_save: enter\n";	4012	info "emergency_perl_save: enter\n";
		4013
		4014	# this is a trade-off: we want to be very quick here, so
		4015	# save all maps without fsync, and later call a global sync
		4016	# (which in turn might be very very slow)
		4017	local $USE_FSYNC = 0;
3669		4018
3670	cf::sync_job {	4019	cf::sync_job {
3671	# this is a trade-off: we want to be very quick here, so	4020	cf::write_runtime_sync; # external watchdog should not bark
3672	# save all maps without fsync, and later call a global sync
3673	# (which in turn might be very very slow)
3674	local $USE_FSYNC = 0;
3675		4021
3676	# use a peculiar iteration method to avoid tripping on perl	4022	# use a peculiar iteration method to avoid tripping on perl
3677	# refcount bugs in for. also avoids problems with players	4023	# refcount bugs in for. also avoids problems with players
3678	# and maps saved/destroyed asynchronously.	4024	# and maps saved/destroyed asynchronously.
3679	warn "emergency_perl_save: begin player save\n";	4025	info "emergency_perl_save: begin player save\n";
3680	for my $login (keys %cf::PLAYER) {	4026	for my $login (keys %cf::PLAYER) {
3681	my $pl = $cf::PLAYER{$login} or next;	4027	my $pl = $cf::PLAYER{$login} or next;
3682	$pl->valid or next;	4028	$pl->valid or next;
3683	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	4029	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3684	$pl->save;	4030	$pl->save;
3685	}	4031	}
3686	warn "emergency_perl_save: end player save\n";	4032	info "emergency_perl_save: end player save\n";
3687		4033
		4034	cf::write_runtime_sync; # external watchdog should not bark
		4035
3688	warn "emergency_perl_save: begin map save\n";	4036	info "emergency_perl_save: begin map save\n";
3689	for my $path (keys %cf::MAP) {	4037	for my $path (keys %cf::MAP) {
3690	my $map = $cf::MAP{$path} or next;	4038	my $map = $cf::MAP{$path} or next;
3691	$map->valid or next;	4039	$map->valid or next;
3692	$map->save;	4040	$map->save;
3693	}	4041	}
3694	warn "emergency_perl_save: end map save\n";	4042	info "emergency_perl_save: end map save\n";
3695		4043
		4044	cf::write_runtime_sync; # external watchdog should not bark
		4045
3696	warn "emergency_perl_save: begin database checkpoint\n";	4046	info "emergency_perl_save: begin database checkpoint\n";
3697	BDB::db_env_txn_checkpoint $DB_ENV;	4047	BDB::db_env_txn_checkpoint $DB_ENV;
3698	warn "emergency_perl_save: end database checkpoint\n";	4048	info "emergency_perl_save: end database checkpoint\n";
3699		4049
3700	warn "emergency_perl_save: begin write uuid\n";	4050	info "emergency_perl_save: begin write uuid\n";
3701	write_uuid_sync 1;	4051	write_uuid_sync 1;
3702	warn "emergency_perl_save: end write uuid\n";	4052	info "emergency_perl_save: end write uuid\n";
		4053
		4054	cf::write_runtime_sync; # external watchdog should not bark
		4055
		4056	trace "emergency_perl_save: syncing database to disk";
		4057	BDB::db_env_txn_checkpoint $DB_ENV;
		4058
		4059	info "emergency_perl_save: starting sync\n";
		4060	IO::AIO::aio_sync sub {
		4061	info "emergency_perl_save: finished sync\n";
		4062	};
		4063
		4064	cf::write_runtime_sync; # external watchdog should not bark
		4065
		4066	trace "emergency_perl_save: flushing outstanding aio requests";
		4067	while (IO::AIO::nreqs || BDB::nreqs) {
		4068	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
		4069	}
		4070
		4071	cf::write_runtime_sync; # external watchdog should not bark
3703	};	4072	};
3704		4073
3705	warn "emergency_perl_save: starting sync()\n";
3706	IO::AIO::aio_sync sub {
3707	warn "emergency_perl_save: finished sync()\n";
3708	};
3709
3710	warn "emergency_perl_save: leave\n";	4074	info "emergency_perl_save: leave\n";
3711	}	4075	}
3712		4076
3713	sub post_cleanup {	4077	sub post_cleanup {
3714	my ($make_core) = @_;	4078	my ($make_core) = @_;
3715		4079
		4080	IO::AIO::flush;
		4081
3716	warn Carp::longmess "post_cleanup backtrace"	4082	error Carp::longmess "post_cleanup backtrace"
3717	if $make_core;	4083	if $make_core;
3718		4084
3719	my $fh = pidfile;	4085	my $fh = pidfile;
3720	unlink $PIDFILE if <$fh> == $$;	4086	unlink $PIDFILE if <$fh> == $$;
3721	}	4087	}
…		…
3741	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	4107	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3742	for my $name (keys %$leaf_symtab) {	4108	for my $name (keys %$leaf_symtab) {
3743	_gv_clear *{"$pkg$name"};	4109	_gv_clear *{"$pkg$name"};
3744	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	4110	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3745	}	4111	}
3746	warn "cleared package $pkg\n";#d#
3747	}	4112	}
3748		4113
3749	sub do_reload_perl() {	4114	sub do_reload_perl() {
3750	# can/must only be called in main	4115	# can/must only be called in main
3751	if ($Coro::current != $Coro::main) {	4116	unless (in_main) {
3752	warn "can only reload from main coroutine";	4117	error "can only reload from main coroutine";
3753	return;	4118	return;
3754	}	4119	}
3755		4120
3756	return if $RELOAD++;	4121	return if $RELOAD++;
3757		4122
3758	my $t1 = EV::time;	4123	my $t1 = AE::time;
3759		4124
3760	while ($RELOAD) {	4125	while ($RELOAD) {
3761	warn "reloading...";	4126	cf::get_slot 0.1, -1, "reload_perl";
		4127	info "perl_reload: reloading...";
3762		4128
3763	warn "entering sync_job";	4129	trace "perl_reload: entering sync_job";
3764		4130
3765	cf::sync_job {	4131	cf::sync_job {
3766	cf::write_runtime_sync; # external watchdog should not bark
3767	cf::emergency_save;	4132	#cf::emergency_save;
3768	cf::write_runtime_sync; # external watchdog should not bark
3769		4133
3770	warn "syncing database to disk";
3771	BDB::db_env_txn_checkpoint $DB_ENV;
3772
3773	# if anything goes wrong in here, we should simply crash as we already saved
3774
3775	warn "flushing outstanding aio requests";
3776	while (IO::AIO::nreqs || BDB::nreqs) {
3777	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3778	}
3779
3780	warn "cancelling all extension coros";	4134	trace "perl_reload: cancelling all extension coros";
3781	$_->cancel for values %EXT_CORO;	4135	$_->cancel for values %EXT_CORO;
3782	%EXT_CORO = ();	4136	%EXT_CORO = ();
3783		4137
3784	warn "removing commands";	4138	trace "perl_reload: removing commands";
3785	%COMMAND = ();	4139	%COMMAND = ();
3786		4140
3787	warn "removing ext/exti commands";	4141	trace "perl_reload: removing ext/exti commands";
3788	%EXTCMD = ();	4142	%EXTCMD = ();
3789	%EXTICMD = ();	4143	%EXTICMD = ();
3790		4144
3791	warn "unloading/nuking all extensions";	4145	trace "perl_reload: unloading/nuking all extensions";
3792	for my $pkg (@EXTS) {	4146	for my $pkg (@EXTS) {
3793	warn "... unloading $pkg";	4147	trace "... unloading $pkg";
3794		4148
3795	if (my $cb = $pkg->can ("unload")) {	4149	if (my $cb = $pkg->can ("unload")) {
3796	eval {	4150	eval {
3797	$cb->($pkg);	4151	$cb->($pkg);
3798	1	4152	1
3799	} or warn "$pkg unloaded, but with errors: $@";	4153	} or error "$pkg unloaded, but with errors: $@";
3800	}	4154	}
3801		4155
3802	warn "... clearing $pkg";	4156	trace "... clearing $pkg";
3803	clear_package $pkg;	4157	clear_package $pkg;
3804	}	4158	}
3805		4159
3806	warn "unloading all perl modules loaded from $LIBDIR";	4160	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3807	while (my ($k, $v) = each %INC) {	4161	while (my ($k, $v) = each %INC) {
3808	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4162	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3809		4163
3810	warn "... unloading $k";	4164	trace "... unloading $k";
3811	delete $INC{$k};	4165	delete $INC{$k};
3812		4166
3813	$k =~ s/\.pm$//;	4167	$k =~ s/\.pm$//;
3814	$k =~ s/\//::/g;	4168	$k =~ s/\//::/g;
3815		4169
…		…
3818	}	4172	}
3819		4173
3820	clear_package $k;	4174	clear_package $k;
3821	}	4175	}
3822		4176
3823	warn "getting rid of safe::, as good as possible";	4177	trace "perl_reload: getting rid of safe::, as good as possible";
3824	clear_package "safe::$_"	4178	clear_package "safe::$_"
3825	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4179	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3826		4180
3827	warn "unloading cf.pm \"a bit\"";	4181	trace "perl_reload: unloading cf.pm \"a bit\"";
3828	delete $INC{"cf.pm"};	4182	delete $INC{"cf.pm"};
3829	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4183	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3830		4184
3831	# don't, removes xs symbols, too,	4185	# don't, removes xs symbols, too,
3832	# and global variables created in xs	4186	# and global variables created in xs
3833	#clear_package __PACKAGE__;	4187	#clear_package __PACKAGE__;
3834		4188
3835	warn "unload completed, starting to reload now";	4189	info "perl_reload: unload completed, starting to reload now";
3836		4190
3837	warn "reloading cf.pm";	4191	trace "perl_reload: reloading cf.pm";
3838	require cf;	4192	require cf;
3839	cf::_connect_to_perl_1;	4193	cf::_connect_to_perl_1;
3840		4194
3841	warn "loading config and database again";	4195	trace "perl_reload: loading config and database again";
3842	cf::reload_config;	4196	cf::reload_config;
3843		4197
3844	warn "loading extensions";	4198	trace "perl_reload: loading extensions";
3845	cf::load_extensions;	4199	cf::load_extensions;
3846		4200
3847	if ($REATTACH_ON_RELOAD) {	4201	if ($REATTACH_ON_RELOAD) {
3848	warn "reattaching attachments to objects/players";	4202	trace "perl_reload: reattaching attachments to objects/players";
3849	_global_reattach; # objects, sockets	4203	_global_reattach; # objects, sockets
3850	warn "reattaching attachments to maps";	4204	trace "perl_reload: reattaching attachments to maps";
3851	reattach $_ for values %MAP;	4205	reattach $_ for values %MAP;
3852	warn "reattaching attachments to players";	4206	trace "perl_reload: reattaching attachments to players";
3853	reattach $_ for values %PLAYER;	4207	reattach $_ for values %PLAYER;
3854	}	4208	}
3855		4209
3856	warn "running post_init jobs";	4210	cf::_post_init 1;
3857	(pop @POST_INIT)->(1) while @POST_INIT;
3858		4211
3859	warn "leaving sync_job";	4212	trace "perl_reload: leaving sync_job";
3860		4213
3861	1	4214	1
3862	} or do {	4215	} or do {
3863	warn $@;	4216	error $@;
3864	cf::cleanup "error while reloading, exiting.";	4217	cf::cleanup "perl_reload: error, exiting.";
3865	};	4218	};
3866		4219
3867	warn "reloaded";
3868	--$RELOAD;	4220	--$RELOAD;
3869	}	4221	}
3870		4222
3871	$t1 = EV::time - $t1;	4223	$t1 = AE::time - $t1;
3872	warn "reload completed in ${t1}s\n";	4224	info "perl_reload: completed in ${t1}s\n";
3873	};	4225	};
3874		4226
3875	our $RELOAD_WATCHER; # used only during reload	4227	our $RELOAD_WATCHER; # used only during reload
3876		4228
3877	sub reload_perl() {	4229	sub reload_perl() {
…		…
3879	# coro crashes during coro_state_free->destroy here.	4231	# coro crashes during coro_state_free->destroy here.
3880		4232
3881	$RELOAD_WATCHER ||= cf::async {	4233	$RELOAD_WATCHER ||= cf::async {
3882	Coro::AIO::aio_wait cache_extensions;	4234	Coro::AIO::aio_wait cache_extensions;
3883		4235
3884	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {	4236	$RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3885	do_reload_perl;	4237	do_reload_perl;
3886	undef $RELOAD_WATCHER;	4238	undef $RELOAD_WATCHER;
3887	};	4239	};
3888	};	4240	};
3889	}	4241	}
…		…
3898	reload_perl;	4250	reload_perl;
3899	};	4251	};
3900	}	4252	}
3901	};	4253	};
3902		4254
3903	unshift @INC, $LIBDIR;	4255	#############################################################################
3904		4256
3905	my $bug_warning = 0;	4257	my $bug_warning = 0;
3906		4258
3907	our @WAIT_FOR_TICK;
3908	our @WAIT_FOR_TICK_BEGIN;
3909
3910	sub wait_for_tick {	4259	sub wait_for_tick() {
3911	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4260	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3912		4261
3913	my $signal = new Coro::Signal;	4262	$WAIT_FOR_TICK->wait;
3914	push @WAIT_FOR_TICK, $signal;
3915	$signal->wait;
3916	}	4263	}
3917		4264
3918	sub wait_for_tick_begin {	4265	sub wait_for_tick_begin() {
3919	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4266	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3920		4267
3921	my $signal = new Coro::Signal;	4268	my $signal = new Coro::Signal;
3922	push @WAIT_FOR_TICK_BEGIN, $signal;	4269	push @WAIT_FOR_TICK_BEGIN, $signal;
3923	$signal->wait;	4270	$signal->wait;
3924	}	4271	}
…		…
3928	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4275	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3929	unless ++$bug_warning > 10;	4276	unless ++$bug_warning > 10;
3930	return;	4277	return;
3931	}	4278	}
3932		4279
3933	cf::server_tick; # one server iteration	4280	cf::one_tick; # one server iteration
3934		4281
3935	#for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#	4282	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3936		4283
3937	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4284	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3938	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4285	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3939	Coro::async_pool {	4286	Coro::async_pool {
3940	$Coro::current->{desc} = "runtime saver";	4287	$Coro::current->{desc} = "runtime saver";
3941	write_runtime_sync	4288	write_runtime_sync
3942	or warn "ERROR: unable to write runtime file: $!";	4289	or error "ERROR: unable to write runtime file: $!";
3943	};	4290	};
3944	}	4291	}
3945		4292
3946	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4293	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3947	$sig->send;	4294	$sig->send;
3948	}	4295	}
3949	while (my $sig = shift @WAIT_FOR_TICK) {	4296	$WAIT_FOR_TICK->broadcast;
3950	$sig->send;
3951	}
3952		4297
3953	$LOAD = ($NOW - $TICK_START) / $TICK;	4298	$LOAD = ($NOW - $TICK_START) / $TICK;
3954	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4299	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3955		4300
3956	if (0) {	4301	if (0) {
3957	if ($NEXT_TICK) {	4302	if ($NEXT_TICK) {
3958	my $jitter = $TICK_START - $NEXT_TICK;	4303	my $jitter = $TICK_START - $NEXT_TICK;
3959	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4304	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
3960	warn "jitter $JITTER\n";#d#	4305	debug "jitter $JITTER\n";#d#
3961	}	4306	}
3962	}	4307	}
3963	}	4308	}
3964		4309
3965	{	4310	{
3966	# configure BDB	4311	# configure BDB
		4312	info "initialising database";
3967		4313
3968	BDB::min_parallel 16;	4314	BDB::min_parallel 16;
3969	BDB::max_poll_reqs $TICK * 0.1;	4315	BDB::max_poll_reqs $TICK * 0.1;
3970	$AnyEvent::BDB::WATCHER->priority (1);	4316	#$AnyEvent::BDB::WATCHER->priority (1);
3971		4317
3972	unless ($DB_ENV) {	4318	unless ($DB_ENV) {
3973	$DB_ENV = BDB::db_env_create;	4319	$DB_ENV = BDB::db_env_create;
3974	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4320	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3975	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4321	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
4000	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4346	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4001	};	4347	};
4002	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4348	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4003	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4349	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4004	};	4350	};
		4351
		4352	info "database initialised";
4005	}	4353	}
4006		4354
4007	{	4355	{
4008	# configure IO::AIO	4356	# configure IO::AIO
4009		4357
		4358	info "initialising aio";
4010	IO::AIO::min_parallel 8;	4359	IO::AIO::min_parallel 8;
4011	IO::AIO::max_poll_time $TICK * 0.1;	4360	IO::AIO::max_poll_time $TICK * 0.1;
4012	undef $AnyEvent::AIO::WATCHER;	4361	undef $AnyEvent::AIO::WATCHER;
		4362	info "aio initialised";
4013	}	4363	}
4014		4364
4015	my $_log_backtrace;	4365	our $_log_backtrace;
		4366	our $_log_backtrace_last;
4016		4367
4017	sub _log_backtrace {	4368	sub _log_backtrace {
4018	my ($msg, @addr) = @_;	4369	my ($msg, @addr) = @_;
4019		4370
4020	$msg =~ s/\n//;	4371	$msg =~ s/\n$//;
4021		4372
		4373	if ($_log_backtrace_last eq $msg) {
		4374	LOG llevInfo, "[ABT] $msg\n";
		4375	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4022	# limit the # of concurrent backtraces	4376	# limit the # of concurrent backtraces
4023	if ($_log_backtrace < 2) {	4377	} elsif ($_log_backtrace < 2) {
		4378	$_log_backtrace_last = $msg;
4024	++$_log_backtrace;	4379	++$_log_backtrace;
4025	my $perl_bt = Carp::longmess $msg;	4380	my $perl_bt = Carp::longmess $msg;
4026	async {	4381	async {
4027	$Coro::current->{desc} = "abt $msg";	4382	$Coro::current->{desc} = "abt $msg";
4028		4383
…		…
4048	LOG llevInfo, "[ABT] $_\n" for @bt;	4403	LOG llevInfo, "[ABT] $_\n" for @bt;
4049	--$_log_backtrace;	4404	--$_log_backtrace;
4050	};	4405	};
4051	} else {	4406	} else {
4052	LOG llevInfo, "[ABT] $msg\n";	4407	LOG llevInfo, "[ABT] $msg\n";
4053	LOG llevInfo, "[ABT] [suppressed]\n";	4408	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4054	}	4409	}
4055	}	4410	}
4056		4411
4057	# load additional modules	4412	# load additional modules
4058	require "cf/$_.pm" for @EXTRA_MODULES;	4413	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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