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.509 by root, Mon Apr 5 03:22:25 2010 UTC vs.
Revision 1.604 by root, Thu Nov 15 07:08:08 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 less 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,
580	# otherwise perl prematurely frees the stuff :/
581	# TODO: investigate and fix (likely this will be rather laborious)
582
583	my @res = Coro::Util::fork_eval {	744	my @res = Coro::Util::fork_eval {
584	reset_signals;	745	cf::post_fork;
585	&$cb	746	&$cb
586	}, @args;	747	} @args;
587		748
588	wantarray ? @res : $res[-1]	749	wantarray ? @res : $res[-1]
		750	}
		751
		752	sub objinfo {
		753	(
		754	"counter value" => cf::object::object_count,
		755	"objects created" => cf::object::create_count,
		756	"objects destroyed" => cf::object::destroy_count,
		757	"freelist size" => cf::object::free_count,
		758	"allocated objects" => cf::object::objects_size,
		759	"active objects" => cf::object::actives_size,
		760	)
589	}	761	}
590		762
591	=item $coin = coin_from_name $name	763	=item $coin = coin_from_name $name
592		764
593	=cut	765	=cut
…		…
630	within each server.	802	within each server.
631		803
632	=cut	804	=cut
633		805
634	sub db_table($) {	806	sub db_table($) {
		807	cf::error "db_get called from main context"
		808	if $Coro::current == $Coro::main;
		809
635	my ($name) = @_;	810	my ($name) = @_;
636	my $db = BDB::db_create $DB_ENV;	811	my $db = BDB::db_create $DB_ENV;
637		812
638	eval {	813	eval {
639	$db->set_flags (BDB::CHKSUM);	814	$db->set_flags (BDB::CHKSUM);
…		…
649	}	824	}
650		825
651	our $DB;	826	our $DB;
652		827
653	sub db_init {	828	sub db_init {
654	cf::sync_job {
655	$DB ||= db_table "db";	829	$DB ||= db_table "db";
656	};
657	}	830	}
658		831
659	sub db_get($$) {	832	sub db_get($$) {
660	my $key = "$_[0]/$_[1]";	833	my $key = "$_[0]/$_[1]";
661		834
662	cf::sync_job {	835	cf::error "db_get called from main context"
		836	if $Coro::current == $Coro::main;
		837
663	BDB::db_get $DB, undef, $key, my $data;	838	BDB::db_get $DB, undef, $key, my $data;
664		839
665	$! ? ()	840	$! ? ()
666	: $data	841	: $data
667	}
668	}	842	}
669		843
670	sub db_put($$$) {	844	sub db_put($$$) {
671	BDB::dbreq_pri 4;	845	BDB::dbreq_pri 4;
672	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	846	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
700		874
701	my @data;	875	my @data;
702	my $md5;	876	my $md5;
703		877
704	for (0 .. $#$src) {	878	for (0 .. $#$src) {
705	0 <= aio_load $src->[$_], $data[$_]	879	$data[$_] = load_file $src->[$_];
706	or Carp::croak "$src->[$_]: $!";
707	}	880	}
708		881
709	# if processing is expensive, check	882	# if processing is expensive, check
710	# checksum first	883	# checksum first
711	if (1) {	884	if (1) {
…		…
724		897
725	return db_get cache => "$id/data";	898	return db_get cache => "$id/data";
726	}	899	}
727	}	900	}
728		901
729	my $t1 = Time::HiRes::time;	902	my $t1 = EV::time;
730	my $data = $process->(\@data);	903	my $data = $process->(\@data);
731	my $t2 = Time::HiRes::time;	904	my $t2 = EV::time;
732		905
733	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	906	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
734		907
735	db_put cache => "$id/data", $data;	908	db_put cache => "$id/data", $data;
736	db_put cache => "$id/md5" , $md5;	909	db_put cache => "$id/md5" , $md5;
737	db_put cache => "$id/meta", $meta;	910	db_put cache => "$id/meta", $meta;
738		911
…		…
748		921
749	=cut	922	=cut
750		923
751	sub datalog($@) {	924	sub datalog($@) {
752	my ($type, %kv) = @_;	925	my ($type, %kv) = @_;
753	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	926	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
754	}	927	}
755		928
756	=back	929	=back
757		930
758	=cut	931	=cut
…		…
953		1126
954	} elsif (exists $cb_id{$type}) {	1127	} elsif (exists $cb_id{$type}) {
955	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	1128	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
956		1129
957	} elsif (ref $type) {	1130	} elsif (ref $type) {
958	warn "attaching objects not supported, ignoring.\n";	1131	error "attaching objects not supported, ignoring.\n";
959		1132
960	} else {	1133	} else {
961	shift @arg;	1134	shift @arg;
962	warn "attach argument '$type' not supported, ignoring.\n";	1135	error "attach argument '$type' not supported, ignoring.\n";
963	}	1136	}
964	}	1137	}
965	}	1138	}
966		1139
967	sub _object_attach {	1140	sub _object_attach {
…		…
977	_attach $registry, $klass, @attach;	1150	_attach $registry, $klass, @attach;
978	}	1151	}
979		1152
980	$obj->{$name} = \%arg;	1153	$obj->{$name} = \%arg;
981	} else {	1154	} else {
982	warn "object uses attachment '$name' which is not available, postponing.\n";	1155	info "object uses attachment '$name' which is not available, postponing.\n";
983	}	1156	}
984		1157
985	$obj->{_attachment}{$name} = undef;	1158	$obj->{_attachment}{$name} = undef;
986	}	1159	}
987		1160
…		…
1046		1219
1047	for (@$callbacks) {	1220	for (@$callbacks) {
1048	eval { &{$_->[1]} };	1221	eval { &{$_->[1]} };
1049		1222
1050	if ($@) {	1223	if ($@) {
1051	warn "$@";
1052	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1224	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1053	override;	1225	override;
1054	}	1226	}
1055		1227
1056	return 1 if $override;	1228	return 1 if $override;
1057	}	1229	}
…		…
1136	for (@$attach) {	1308	for (@$attach) {
1137	my ($klass, @attach) = @$_;	1309	my ($klass, @attach) = @$_;
1138	_attach $registry, $klass, @attach;	1310	_attach $registry, $klass, @attach;
1139	}	1311	}
1140	} else {	1312	} else {
1141	warn "object uses attachment '$name' that is not available, postponing.\n";	1313	info "object uses attachment '$name' that is not available, postponing.\n";
1142	}	1314	}
1143	}	1315	}
1144	}	1316	}
1145		1317
1146	cf::attachable->attach (	1318	cf::attachable->attach (
…		…
1173	my ($filename, $rdata, $objs) = @_;	1345	my ($filename, $rdata, $objs) = @_;
1174		1346
1175	sync_job {	1347	sync_job {
1176	if (length $$rdata) {	1348	if (length $$rdata) {
1177	utf8::decode (my $decname = $filename);	1349	utf8::decode (my $decname = $filename);
1178	warn sprintf "saving %s (%d,%d)\n",	1350	trace sprintf "saving %s (%d,%d)\n",
1179	$decname, length $$rdata, scalar @$objs;	1351	$decname, length $$rdata, scalar @$objs
		1352	if $VERBOSE_IO;
1180		1353
1181	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1354	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1182	aio_chmod $fh, SAVE_MODE;	1355	aio_chmod $fh, SAVE_MODE;
1183	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1356	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1184	if ($cf::USE_FSYNC) {	1357	if ($cf::USE_FSYNC) {
…		…
1206	aio_rename "$filename~", $filename;	1379	aio_rename "$filename~", $filename;
1207		1380
1208	$filename =~ s%/[^/]+$%%;	1381	$filename =~ s%/[^/]+$%%;
1209	aio_pathsync $filename if $cf::USE_FSYNC;	1382	aio_pathsync $filename if $cf::USE_FSYNC;
1210	} else {	1383	} else {
1211	warn "unable to save objects: $filename~: $!\n";	1384	error "unable to save objects: $filename~: $!\n";
1212	}	1385	}
1213	} else {	1386	} else {
1214	aio_unlink $filename;	1387	aio_unlink $filename;
1215	aio_unlink "$filename.pst";	1388	aio_unlink "$filename.pst";
1216	}	1389	}
…		…
1240	my $st = eval { Coro::Storable::thaw $av };	1413	my $st = eval { Coro::Storable::thaw $av };
1241	$av = $st->{objs};	1414	$av = $st->{objs};
1242	}	1415	}
1243		1416
1244	utf8::decode (my $decname = $filename);	1417	utf8::decode (my $decname = $filename);
1245	warn sprintf "loading %s (%d,%d)\n",	1418	trace sprintf "loading %s (%d,%d)\n",
1246	$decname, length $data, scalar @{$av || []};	1419	$decname, length $data, scalar @{$av || []}
		1420	if $VERBOSE_IO;
1247		1421
1248	($data, $av)	1422	($data, $av)
1249	}	1423	}
1250		1424
1251	=head2 COMMAND CALLBACKS	1425	=head2 COMMAND CALLBACKS
…		…
1255	=cut	1429	=cut
1256		1430
1257	#############################################################################	1431	#############################################################################
1258	# command handling &c	1432	# command handling &c
1259		1433
1260	=item cf::register_command $name => \&callback($ob,$args);	1434	=item cf::register_command $name => \&callback($ob,$args)
1261		1435
1262	Register a callback for execution when the client sends the user command	1436	Register a callback for execution when the client sends the user command
1263	$name.	1437	$name.
1264		1438
1265	=cut	1439	=cut
…		…
1271	#warn "registering command '$name/$time' to '$caller'";	1445	#warn "registering command '$name/$time' to '$caller'";
1272		1446
1273	push @{ $COMMAND{$name} }, [$caller, $cb];	1447	push @{ $COMMAND{$name} }, [$caller, $cb];
1274	}	1448	}
1275		1449
1276	=item cf::register_extcmd $name => \&callback($pl,$packet);	1450	=item cf::register_extcmd $name => \&callback($pl,@args)
1277		1451
1278	Register a callback for execution when the client sends an (synchronous)	1452	Register a callback for execution when the client sends an (synchronous)
1279	extcmd packet. Ext commands will be processed in the order they are	1453	extcmd packet. Ext commands will be processed in the order they are
1280	received by the server, like other user commands. The first argument is	1454	received by the server, like other user commands. The first argument is
1281	the logged-in player. Ext commands can only be processed after a player	1455	the logged-in player. Ext commands can only be processed after a player
1282	has logged in successfully.	1456	has logged in successfully.
1283		1457
1284	If the callback returns something, it is sent back as if reply was being	1458	The values will be sent back to the client.
1285	called.
1286		1459
		1460	=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
		1461
		1462	Same as C<cf::register_extcmd>, but instead of returning values, the
		1463	callback needs to clal the C<$reply> function.
		1464
1287	=item cf::register_exticmd $name => \&callback($ns,$packet);	1465	=item cf::register_exticmd $name => \&callback($ns,@args)
1288		1466
1289	Register a callback for execution when the client sends an (asynchronous)	1467	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	1468	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	1469	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	1470	is a client socket. Exti commands can be received anytime, even before
1293	log-in.	1471	log-in.
1294		1472
1295	If the callback returns something, it is sent back as if reply was being	1473	The values will be sent back to the client.
1296	called.
1297		1474
1298	=cut	1475	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1299		1476
		1477	Same as C<cf::register_extcmd>, but instead of returning values, the
		1478	callback needs to clal the C<$reply> function.
		1479
		1480	=cut
		1481
1300	sub register_extcmd {	1482	sub register_extcmd($$) {
1301	my ($name, $cb) = @_;	1483	my ($name, $cb) = @_;
1302		1484
1303	$EXTCMD{$name} = $cb;	1485	$EXTCMD{$name} = $cb;
1304	}	1486	}
1305		1487
1306	sub register_exticmd {	1488	sub register_async_extcmd($$) {
1307	my ($name, $cb) = @_;	1489	my ($name, $cb) = @_;
1308		1490
		1491	$EXTACMD{$name} = $cb;
		1492	}
		1493
		1494	sub register_exticmd($$) {
		1495	my ($name, $cb) = @_;
		1496
1309	$EXTICMD{$name} = $cb;	1497	$EXTICMD{$name} = $cb;
		1498	}
		1499
		1500	sub register_async_exticmd($$) {
		1501	my ($name, $cb) = @_;
		1502
		1503	$EXTIACMD{$name} = $cb;
1310	}	1504	}
1311		1505
1312	use File::Glob ();	1506	use File::Glob ();
1313		1507
1314	cf::player->attach (	1508	cf::player->attach (
…		…
1328	my ($pl, $buf) = @_;	1522	my ($pl, $buf) = @_;
1329		1523
1330	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1524	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1331		1525
1332	if (ref $msg) {	1526	if (ref $msg) {
1333	my ($type, $reply, @payload) =	1527	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		1528
1338	my @reply;
1339
1340	if (my $cb = $EXTCMD{$type}) {	1529	if (my $cb = $EXTACMD{$type}) {
		1530	$cb->(
		1531	$pl,
		1532	sub {
		1533	$pl->ext_msg ("reply-$reply", @_)
		1534	if $reply;
		1535	},
		1536	@payload
		1537	);
		1538	} else {
		1539	my @reply;
		1540
		1541	if (my $cb = $EXTCMD{$type}) {
1341	@reply = $cb->($pl, @payload);	1542	@reply = $cb->($pl, @payload);
		1543	}
		1544
		1545	$pl->ext_msg ("reply-$reply", @reply)
		1546	if $reply;
1342	}	1547	}
1343		1548
1344	$pl->ext_reply ($reply, @reply)
1345	if $reply;
1346
1347	} else {	1549	} else {
1348	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1550	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1349	}	1551	}
1350		1552
1351	cf::override;	1553	cf::override;
1352	},	1554	},
1353	);	1555	);
…		…
1363	};	1565	};
1364		1566
1365	$grp	1567	$grp
1366	}	1568	}
1367		1569
		1570	sub _ext_cfg_reg($$$$) {
		1571	my ($rvar, $varname, $cfgname, $default) = @_;
		1572
		1573	$cfgname = lc $varname
		1574	unless length $cfgname;
		1575
		1576	$EXT_CFG{$cfgname} = [$rvar, $default];
		1577
		1578	$$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
		1579	}
		1580
1368	sub load_extensions {	1581	sub load_extensions {
		1582	info "loading extensions...";
		1583
		1584	%EXT_CFG = ();
		1585
1369	cf::sync_job {	1586	cf::sync_job {
1370	my %todo;	1587	my %todo;
1371		1588
1372	for my $path (<$LIBDIR/*.ext>) {	1589	for my $path (<$LIBDIR/*.ext>) {
1373	next unless -r $path;	1590	next unless -r $path;
…		…
1391		1608
1392	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1609	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1393	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1610	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1394		1611
1395	$ext{source} =	1612	$ext{source} =
1396	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1613	"package $pkg; use common::sense;\n"
1397	. "#line 1 \"$path\"\n{\n"	1614	. "#line 1 \"$path\"\n{\n"
1398	. $source	1615	. $source
1399	. "\n};\n1";	1616	. "\n};\n1";
1400		1617
1401	$todo{$base} = \%ext;	1618	$todo{$base} = \%ext;
…		…
1413	for (split /,\s*/, $v->{meta}{depends}) {	1630	for (split /,\s*/, $v->{meta}{depends}) {
1414	next ext	1631	next ext
1415	unless exists $done{$_};	1632	unless exists $done{$_};
1416	}	1633	}
1417		1634
1418	warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1635	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1419		1636
		1637	my $source = $v->{source};
		1638
		1639	# support "CONF varname :confname = default" pseudo-statements
		1640	$source =~ s{
		1641	^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
		1642	}{
		1643	"our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
		1644	}gmxe;
		1645
1420	my $active = eval $v->{source};	1646	my $active = eval $source;
1421		1647
1422	if (length $@) {	1648	if (length $@) {
1423	warn "$v->{path}: $@\n";	1649	error "$v->{path}: $@\n";
1424		1650
1425	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1651	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1426	if exists $v->{meta}{mandatory};	1652	if exists $v->{meta}{mandatory};
		1653
		1654	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
		1655	delete $todo{$k};
1427	} else {	1656	} else {
1428	$done{$k} = delete $todo{$k};	1657	$done{$k} = delete $todo{$k};
1429	push @EXTS, $v->{pkg};	1658	push @EXTS, $v->{pkg};
1430	$progress = 1;	1659	$progress = 1;
1431		1660
1432	warn "$v->{base}: extension inactive.\n"	1661	info "$v->{base}: extension inactive.\n"
1433	unless $active;	1662	unless $active;
1434	}	1663	}
1435	}	1664	}
1436		1665
1437	unless ($progress) {	1666	unless ($progress) {
…		…
1439		1668
1440	while (my ($k, $v) = each %todo) {	1669	while (my ($k, $v) = each %todo) {
1441	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1670	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1442	if exists $v->{meta}{mandatory};	1671	if exists $v->{meta}{mandatory};
1443	}	1672	}
		1673
		1674	last;
1444	}	1675	}
1445	}	1676	}
1446	};	1677	};
1447	}	1678	}
1448		1679
…		…
1533	$cf::PLAYER{$login} = $pl	1764	$cf::PLAYER{$login} = $pl
1534	}	1765	}
1535	}	1766	}
1536	}	1767	}
1537		1768
		1769	cf::player->attach (
		1770	on_load => sub {
		1771	my ($pl, $path) = @_;
		1772
		1773	# restore slots saved in save, below
		1774	my $slots = delete $pl->{_slots};
		1775
		1776	$pl->ob->current_weapon ($slots->[0]);
		1777	$pl->combat_ob ($slots->[1]);
		1778	$pl->ranged_ob ($slots->[2]);
		1779	},
		1780	);
		1781
1538	sub save($) {	1782	sub save($) {
1539	my ($pl) = @_;	1783	my ($pl) = @_;
1540		1784
1541	return if $pl->{deny_save};	1785	return if $pl->{deny_save};
1542		1786
…		…
1547		1791
1548	aio_mkdir playerdir $pl, 0770;	1792	aio_mkdir playerdir $pl, 0770;
1549	$pl->{last_save} = $cf::RUNTIME;	1793	$pl->{last_save} = $cf::RUNTIME;
1550		1794
1551	cf::get_slot 0.01;	1795	cf::get_slot 0.01;
		1796
		1797	# save slots, to be restored later
		1798	local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1552		1799
1553	$pl->save_pl ($path);	1800	$pl->save_pl ($path);
1554	cf::cede_to_tick;	1801	cf::cede_to_tick;
1555	}	1802	}
1556		1803
…		…
1590	my $name = $pl->ob->name;	1837	my $name = $pl->ob->name;
1591		1838
1592	$pl->{deny_save} = 1;	1839	$pl->{deny_save} = 1;
1593	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1840	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1594		1841
1595	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1842	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1596	$pl->deactivate;	1843	$pl->deactivate;
		1844
1597	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1845	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1598	$pl->ob->check_score;
1599	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1846	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1847	ext::highscore::check ($pl->ob);
		1848
1600	$pl->ns->destroy if $pl->ns;	1849	$pl->ns->destroy if $pl->ns;
1601		1850
1602	my $path = playerdir $pl;	1851	my $path = playerdir $pl;
1603	my $temp = "$path~$cf::RUNTIME~deleting~";	1852	my $temp = "$path~$cf::RUNTIME~deleting~";
1604	aio_rename $path, $temp;	1853	aio_rename $path, $temp;
…		…
1658	\@logins	1907	\@logins
1659	}	1908	}
1660		1909
1661	=item $player->maps	1910	=item $player->maps
1662		1911
		1912	=item cf::player::maps $login
		1913
1663	Returns an arrayref of map paths that are private for this	1914	Returns an arrayref of map paths that are private for this
1664	player. May block.	1915	player. May block.
1665		1916
1666	=cut	1917	=cut
1667		1918
…		…
1688		1939
1689	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1940	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1690		1941
1691	Expand deliantra pod fragments into protocol xml.	1942	Expand deliantra pod fragments into protocol xml.
1692		1943
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)	1944	=item $player->ext_msg ($type, @msg)
1706		1945
1707	Sends an ext event to the client.	1946	Sends an ext event to the client.
1708		1947
1709	=cut	1948	=cut
…		…
1728		1967
1729	=cut	1968	=cut
1730		1969
1731	sub find_by_path($) {	1970	sub find_by_path($) {
1732	my ($path) = @_;	1971	my ($path) = @_;
		1972
		1973	$path =~ s/^~[^\/]*//; # skip ~login
1733		1974
1734	my ($match, $specificity);	1975	my ($match, $specificity);
1735		1976
1736	for my $region (list) {	1977	for my $region (list) {
1737	if ($region->{match} && $path =~ $region->{match}) {	1978	if ($region->{match} && $path =~ $region->{match}) {
…		…
1766	sub generate_random_map {	2007	sub generate_random_map {
1767	my ($self, $rmp) = @_;	2008	my ($self, $rmp) = @_;
1768		2009
1769	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	2010	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1770		2011
1771	# mit "rum" bekleckern, nicht
1772	$self->_create_random_map (	2012	$self->_create_random_map ($rmp);
1773	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1774	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
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	}	2013	}
1786		2014
1787	=item cf::map->register ($regex, $prio)	2015	=item cf::map->register ($regex, $prio)
1788		2016
1789	Register a handler for the map path matching the given regex at the	2017	Register a handler for the map path matching the given regex at the
…		…
1794		2022
1795	sub register {	2023	sub register {
1796	my (undef, $regex, $prio) = @_;	2024	my (undef, $regex, $prio) = @_;
1797	my $pkg = caller;	2025	my $pkg = caller;
1798		2026
1799	no strict;
1800	push @{"$pkg\::ISA"}, __PACKAGE__;	2027	push @{"$pkg\::ISA"}, __PACKAGE__;
1801		2028
1802	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	2029	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1803	}	2030	}
1804		2031
1805	# also paths starting with '/'	2032	# also paths starting with '/'
1806	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	2033	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1807		2034
1808	sub thawer_merge {	2035	sub thawer_merge {
1809	my ($self, $merge) = @_;	2036	my ($self, $merge) = @_;
1810		2037
1811	# we have to keep some variables in memory intact	2038	# we have to keep some variables in memory intact
…		…
1816	}	2043	}
1817		2044
1818	sub normalise {	2045	sub normalise {
1819	my ($path, $base) = @_;	2046	my ($path, $base) = @_;
1820		2047
1821	$path = "$path"; # make sure its a string	2048	$path = "$path"; # make sure it's a string
1822		2049
1823	$path =~ s/\.map$//;	2050	$path =~ s/\.map$//;
1824		2051
1825	# map plan:	2052	# map plan:
1826	#	2053	#
…		…
1841	$base =~ s{[^/]+/?$}{};	2068	$base =~ s{[^/]+/?$}{};
1842	$path = "$base/$path";	2069	$path = "$base/$path";
1843	}	2070	}
1844		2071
1845	for ($path) {	2072	for ($path) {
1846	redo if s{//}{/};
1847	redo if s{/\.?/}{/};	2073	redo if s{/\.?/}{/};
1848	redo if s{/[^/]+/\.\./}{/};	2074	redo if s{/[^/]+/\.\./}{/};
1849	}	2075	}
1850		2076
1851	$path	2077	$path
…		…
1865	$self->init; # pass $1 etc.	2091	$self->init; # pass $1 etc.
1866	return $self;	2092	return $self;
1867	}	2093	}
1868	}	2094	}
1869		2095
1870	Carp::cluck "unable to resolve path '$path' (base '$base').";	2096	Carp::cluck "unable to resolve path '$path' (base '$base')";
1871	()	2097	()
1872	}	2098	}
1873		2099
		2100	# may re-bless or do other evil things
1874	sub init {	2101	sub init {
1875	my ($self) = @_;	2102	my ($self) = @_;
1876		2103
1877	$self	2104	$self
1878	}	2105	}
…		…
1943	$self->{load_path} = $path;	2170	$self->{load_path} = $path;
1944		2171
1945	1	2172	1
1946	}	2173	}
1947		2174
		2175	# used to laod the header of an original map
1948	sub load_header_orig {	2176	sub load_header_orig {
1949	my ($self) = @_;	2177	my ($self) = @_;
1950		2178
1951	$self->load_header_from ($self->load_path)	2179	$self->load_header_from ($self->load_path)
1952	}	2180	}
1953		2181
		2182	# used to laod the header of an instantiated map
1954	sub load_header_temp {	2183	sub load_header_temp {
1955	my ($self) = @_;	2184	my ($self) = @_;
1956		2185
1957	$self->load_header_from ($self->save_path)	2186	$self->load_header_from ($self->save_path)
1958	}	2187	}
1959		2188
		2189	# called after loading the header from an instantiated map
1960	sub prepare_temp {	2190	sub prepare_temp {
1961	my ($self) = @_;	2191	my ($self) = @_;
1962		2192
1963	$self->last_access ((delete $self->{last_access})	2193	$self->last_access ((delete $self->{last_access})
1964	|| $cf::RUNTIME); #d#	2194	|| $cf::RUNTIME); #d#
1965	# safety	2195	# safety
1966	$self->{instantiate_time} = $cf::RUNTIME	2196	$self->{instantiate_time} = $cf::RUNTIME
1967	if $self->{instantiate_time} > $cf::RUNTIME;	2197	if $self->{instantiate_time} > $cf::RUNTIME;
1968	}	2198	}
1969		2199
		2200	# called after loading the header from an original map
1970	sub prepare_orig {	2201	sub prepare_orig {
1971	my ($self) = @_;	2202	my ($self) = @_;
1972		2203
1973	$self->{load_original} = 1;	2204	$self->{load_original} = 1;
1974	$self->{instantiate_time} = $cf::RUNTIME;	2205	$self->{instantiate_time} = $cf::RUNTIME;
…		…
1998		2229
1999	sub find;	2230	sub find;
2000	sub find {	2231	sub find {
2001	my ($path, $origin) = @_;	2232	my ($path, $origin) = @_;
2002		2233
		2234	cf::cede_to_tick;
		2235
2003	$path = normalise $path, $origin && $origin->path;	2236	$path = normalise $path, $origin;
2004		2237
2005	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2238	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2006	my $guard2 = cf::lock_acquire "map_find:$path";	2239	my $guard2 = cf::lock_acquire "map_find:$path";
2007		2240
2008	$cf::MAP{$path} || do {	2241	$cf::MAP{$path} || do {
…		…
2039		2272
2040	{	2273	{
2041	my $guard = cf::lock_acquire "map_data:$path";	2274	my $guard = cf::lock_acquire "map_data:$path";
2042		2275
2043	return unless $self->valid;	2276	return unless $self->valid;
2044	return unless $self->in_memory == cf::MAP_SWAPPED;	2277	return unless $self->state == cf::MAP_SWAPPED;
2045
2046	$self->in_memory (cf::MAP_LOADING);
2047		2278
2048	$self->alloc;	2279	$self->alloc;
2049		2280
2050	$self->pre_load;	2281	$self->pre_load;
2051	cf::cede_to_tick;	2282	cf::cede_to_tick;
2052		2283
		2284	if (exists $self->{load_path}) {
2053	my $f = new_from_file cf::object::thawer $self->{load_path};	2285	my $f = new_from_file cf::object::thawer $self->{load_path};
2054	$f->skip_block;	2286	$f->skip_block;
2055	$self->_load_objects ($f)	2287	$self->_load_objects ($f)
2056	or return;	2288	or return;
2057		2289
2058	$self->post_load_original	2290	$self->post_load_original
2059	if delete $self->{load_original};	2291	if delete $self->{load_original};
2060		2292
2061	if (my $uniq = $self->uniq_path) {	2293	if (my $uniq = $self->uniq_path) {
2062	utf8::encode $uniq;	2294	utf8::encode $uniq;
2063	unless (aio_stat $uniq) {	2295	unless (aio_stat $uniq) {
2064	if (my $f = new_from_file cf::object::thawer $uniq) {	2296	if (my $f = new_from_file cf::object::thawer $uniq) {
2065	$self->clear_unique_items;	2297	$self->clear_unique_items;
2066	$self->_load_objects ($f);	2298	$self->_load_objects ($f);
2067	$f->resolve_delayed_derefs;	2299	$f->resolve_delayed_derefs;
		2300	}
2068	}	2301	}
2069	}	2302	}
2070	}
2071		2303
2072	$f->resolve_delayed_derefs;	2304	$f->resolve_delayed_derefs;
		2305	} else {
		2306	$self->post_load_original
		2307	if delete $self->{load_original};
		2308	}
		2309
		2310	$self->state (cf::MAP_INACTIVE);
2073		2311
2074	cf::cede_to_tick;	2312	cf::cede_to_tick;
2075	# now do the right thing for maps	2313	# now do the right thing for maps
2076	$self->link_multipart_objects;	2314	$self->link_multipart_objects;
2077	$self->difficulty ($self->estimate_difficulty)	2315	$self->difficulty ($self->estimate_difficulty)
…		…
2081	unless ($self->{deny_activate}) {	2319	unless ($self->{deny_activate}) {
2082	$self->decay_objects;	2320	$self->decay_objects;
2083	$self->fix_auto_apply;	2321	$self->fix_auto_apply;
2084	$self->update_buttons;	2322	$self->update_buttons;
2085	cf::cede_to_tick;	2323	cf::cede_to_tick;
2086	$self->activate;	2324	#$self->activate; # no longer activate maps automatically
2087	}	2325	}
2088		2326
2089	$self->{last_save} = $cf::RUNTIME;	2327	$self->{last_save} = $cf::RUNTIME;
2090	$self->last_access ($cf::RUNTIME);	2328	$self->last_access ($cf::RUNTIME);
2091
2092	$self->in_memory (cf::MAP_ACTIVE);
2093	}	2329	}
2094		2330
2095	$self->post_load;	2331	$self->post_load;
		2332
		2333	1
2096	}	2334	}
2097		2335
2098	# customize the map for a given player, i.e.	2336	# customize the map for a given player, i.e.
2099	# return the _real_ map. used by e.g. per-player	2337	# return the _real_ map. used by e.g. per-player
2100	# maps to change the path to ~playername/mappath	2338	# maps to change the path to ~playername/mappath
…		…
2108	# if $self->per_party;	2346	# if $self->per_party;
2109		2347
2110	$self	2348	$self
2111	}	2349	}
2112		2350
2113	# find and load all maps in the 3x3 area around a map
2114	sub load_neighbours {
2115	my ($map) = @_;
2116
2117	my @neigh; # diagonal neighbours
2118
2119	for (0 .. 3) {
2120	my $neigh = $map->tile_path ($_)
2121	or next;
2122	$neigh = find $neigh, $map
2123	or next;
2124	$neigh->load;
2125
2126	push @neigh,
2127	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2128	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2129	}
2130
2131	for (grep defined $_->[0], @neigh) {
2132	my ($path, $origin) = @$_;
2133	my $neigh = find $path, $origin
2134	or next;
2135	$neigh->load;
2136	}
2137	}
2138
2139	sub find_sync {	2351	sub find_sync {
2140	my ($path, $origin) = @_;	2352	my ($path, $origin) = @_;
2141		2353
2142	cf::sync_job { find $path, $origin }	2354	# it's a bug to call this from the main context
		2355	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
		2356	if $Coro::current == $Coro::main;
		2357
		2358	find $path, $origin
2143	}	2359	}
2144		2360
2145	sub do_load_sync {	2361	sub do_load_sync {
2146	my ($map) = @_;	2362	my ($map) = @_;
2147		2363
		2364	# it's a bug to call this from the main context
2148	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2365	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2149	if $Coro::current == $Coro::main;	2366	if $Coro::current == $Coro::main;
2150		2367
2151	cf::sync_job { $map->load };	2368	$map->load;
2152	}	2369	}
2153		2370
2154	our %MAP_PREFETCH;	2371	our %MAP_PREFETCH;
2155	our $MAP_PREFETCHER = undef;	2372	our $MAP_PREFETCHER = undef;
2156		2373
2157	sub find_async {	2374	sub find_async {
2158	my ($path, $origin, $load) = @_;	2375	my ($path, $origin, $load) = @_;
2159		2376
2160	$path = normalise $path, $origin && $origin->{path};	2377	$path = normalise $path, $origin;
2161		2378
2162	if (my $map = $cf::MAP{$path}) {	2379	if (my $map = $cf::MAP{$path}) {
2163	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2380	return $map if !$load || $map->linkable;
2164	}	2381	}
2165		2382
2166	$MAP_PREFETCH{$path} |= $load;	2383	$MAP_PREFETCH{$path} |= $load;
2167		2384
2168	$MAP_PREFETCHER ||= cf::async {	2385	$MAP_PREFETCHER ||= cf::async {
…		…
2182	$MAP_PREFETCHER->prio (6);	2399	$MAP_PREFETCHER->prio (6);
2183		2400
2184	()	2401	()
2185	}	2402	}
2186		2403
		2404	# common code, used by both ->save and ->swapout
2187	sub save {	2405	sub _save {
2188	my ($self) = @_;	2406	my ($self) = @_;
2189
2190	my $lock = cf::lock_acquire "map_data:$self->{path}";
2191		2407
2192	$self->{last_save} = $cf::RUNTIME;	2408	$self->{last_save} = $cf::RUNTIME;
2193		2409
2194	return unless $self->dirty;	2410	return unless $self->dirty;
2195		2411
…		…
2215	} else {	2431	} else {
2216	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);	2432	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2217	}	2433	}
2218	}	2434	}
2219		2435
		2436	sub save {
		2437	my ($self) = @_;
		2438
		2439	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2440
		2441	$self->_save;
		2442	}
		2443
2220	sub swap_out {	2444	sub swap_out {
2221	my ($self) = @_;	2445	my ($self) = @_;
2222		2446
2223	# save first because save cedes
2224	$self->save;
2225
2226	my $lock = cf::lock_acquire "map_data:$self->{path}";	2447	my $lock = cf::lock_acquire "map_data:$self->{path}";
2227		2448
		2449	return if !$self->linkable;
		2450	return if $self->{deny_save};
2228	return if $self->players;	2451	return if $self->players;
2229	return if $self->in_memory != cf::MAP_ACTIVE;	2452
		2453	# first deactivate the map and "unlink" it from the core
		2454	$self->deactivate;
		2455	$_->clear_links_to ($self) for values %cf::MAP;
		2456	$self->state (cf::MAP_SWAPPED);
		2457
		2458	# then atomically save
		2459	$self->_save;
		2460
		2461	# then free the map
		2462	$self->clear;
		2463	}
		2464
		2465	sub reset_at {
		2466	my ($self) = @_;
		2467
		2468	# TODO: safety, remove and allow resettable per-player maps
2230	return if $self->{deny_save};	2469	return 1e99 if $self->{deny_reset};
2231		2470
		2471	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
		2472	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
		2473
		2474	$time + $to
		2475	}
		2476
		2477	sub should_reset {
		2478	my ($self) = @_;
		2479
		2480	$self->reset_at <= $cf::RUNTIME
		2481	}
		2482
		2483	sub reset {
		2484	my ($self) = @_;
		2485
		2486	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2487
		2488	return if $self->players;
		2489
		2490	cf::trace "resetting map ", $self->path, "\n";
		2491
2232	$self->in_memory (cf::MAP_SWAPPED);	2492	$self->state (cf::MAP_SWAPPED);
		2493
		2494	# need to save uniques path
		2495	unless ($self->{deny_save}) {
		2496	my $uniq = $self->uniq_path; utf8::encode $uniq;
		2497
		2498	$self->_save_objects ($uniq, cf::IO_UNIQUES)
		2499	if $uniq;
		2500	}
		2501
		2502	delete $cf::MAP{$self->path};
2233		2503
2234	$self->deactivate;	2504	$self->deactivate;
2235	$_->clear_links_to ($self) for values %cf::MAP;	2505	$_->clear_links_to ($self) for values %cf::MAP;
2236	$self->clear;	2506	$self->clear;
2237	}
2238
2239	sub reset_at {
2240	my ($self) = @_;
2241
2242	# TODO: safety, remove and allow resettable per-player maps
2243	return 1e99 if $self->{deny_reset};
2244
2245	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2246	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2247
2248	$time + $to
2249	}
2250
2251	sub should_reset {
2252	my ($self) = @_;
2253
2254	$self->reset_at <= $cf::RUNTIME
2255	}
2256
2257	sub reset {
2258	my ($self) = @_;
2259
2260	my $lock = cf::lock_acquire "map_data:$self->{path}";
2261
2262	return if $self->players;
2263
2264	warn "resetting map ", $self->path, "\n";
2265
2266	$self->in_memory (cf::MAP_SWAPPED);
2267
2268	# need to save uniques path
2269	unless ($self->{deny_save}) {
2270	my $uniq = $self->uniq_path; utf8::encode $uniq;
2271
2272	$self->_save_objects ($uniq, cf::IO_UNIQUES)
2273	if $uniq;
2274	}
2275
2276	delete $cf::MAP{$self->path};
2277
2278	$self->deactivate;
2279	$_->clear_links_to ($self) for values %cf::MAP;
2280	$self->clear;
2281		2507
2282	$self->unlink_save;	2508	$self->unlink_save;
2283	$self->destroy;	2509	$self->destroy;
2284	}	2510	}
2285		2511
…		…
2293		2519
2294	delete $cf::MAP{$self->path};	2520	delete $cf::MAP{$self->path};
2295		2521
2296	$self->unlink_save;	2522	$self->unlink_save;
2297		2523
2298	bless $self, "cf::map";	2524	bless $self, "cf::map::wrap";
2299	delete $self->{deny_reset};	2525	delete $self->{deny_reset};
2300	$self->{deny_save} = 1;	2526	$self->{deny_save} = 1;
2301	$self->reset_timeout (1);	2527	$self->reset_timeout (1);
2302	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2528	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2303		2529
…		…
2424		2650
2425	Creates and returns a persistent reference to an object that can be stored as a string.	2651	Creates and returns a persistent reference to an object that can be stored as a string.
2426		2652
2427	=item $ob = cf::object::deref ($refstring)	2653	=item $ob = cf::object::deref ($refstring)
2428		2654
2429	returns the objetc referenced by refstring. may return undef when it cnanot find the object,	2655	returns the objetc referenced by refstring. may return undef when it cannot find the object,
2430	even if the object actually exists. May block.	2656	even if the object actually exists. May block.
2431		2657
2432	=cut	2658	=cut
2433		2659
2434	sub deref {	2660	sub deref {
…		…
2533		2759
2534	Freezes the player and moves him/her to a special map (C<{link}>).	2760	Freezes the player and moves him/her to a special map (C<{link}>).
2535		2761
2536	The player should be reasonably safe there for short amounts of time (e.g.	2762	The player should be reasonably safe there for short amounts of time (e.g.
2537	for loading a map). You I<MUST> call C<leave_link> as soon as possible,	2763	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2538	though, as the palyer cannot control the character while it is on the link	2764	though, as the player cannot control the character while it is on the link
2539	map.	2765	map.
2540		2766
2541	Will never block.	2767	Will never block.
2542		2768
2543	=item $player_object->leave_link ($map, $x, $y)	2769	=item $player_object->leave_link ($map, $x, $y)
…		…
2564	sub cf::object::player::enter_link {	2790	sub cf::object::player::enter_link {
2565	my ($self) = @_;	2791	my ($self) = @_;
2566		2792
2567	$self->deactivate_recursive;	2793	$self->deactivate_recursive;
2568		2794
		2795	++$self->{_link_recursion};
		2796
2569	return if UNIVERSAL::isa $self->map, "ext::map_link";	2797	return if UNIVERSAL::isa $self->map, "ext::map_link";
2570		2798
2571	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2799	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2572	if $self->map && $self->map->{path} ne "{link}";	2800	if $self->map && $self->map->{path} ne "{link}";
2573		2801
2574	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2802	$self->enter_map ($LINK_MAP || link_map, 3, 3);
2575	}	2803	}
2576		2804
2577	sub cf::object::player::leave_link {	2805	sub cf::object::player::leave_link {
2578	my ($self, $map, $x, $y) = @_;	2806	my ($self, $map, $x, $y) = @_;
2579		2807
…		…
2599	# use -1 or undef as default coordinates, not 0, 0	2827	# use -1 or undef as default coordinates, not 0, 0
2600	($x, $y) = ($map->enter_x, $map->enter_y)	2828	($x, $y) = ($map->enter_x, $map->enter_y)
2601	if $x <= 0 && $y <= 0;	2829	if $x <= 0 && $y <= 0;
2602		2830
2603	$map->load;	2831	$map->load;
2604	$map->load_neighbours;
2605		2832
2606	return unless $self->contr->active;	2833	return unless $self->contr->active;
2607		2834
2608	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2835	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2609	$self->enter_map ($map, $x, $y);	2836	if ($self->enter_map ($map, $x, $y)) {
2610		2837	# entering was successful
		2838	delete $self->{_link_recursion};
2611	# only activate afterwards, to support waiting in hooks	2839	# only activate afterwards, to support waiting in hooks
2612	$self->activate_recursive;	2840	$self->activate_recursive;
2613	}	2841	}
2614		2842
		2843	}
		2844
2615	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2845	=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2616		2846
2617	Moves the player to the given map-path and coordinates by first freezing	2847	Moves the player to the given map-path and coordinates by first freezing
2618	her, loading and preparing them map, calling the provided $check callback	2848	her, loading and preparing them map, calling the provided $check callback
2619	that has to return the map if sucecssful, and then unfreezes the player on	2849	that has to return the map if sucecssful, and then unfreezes the player on
2620	the new (success) or old (failed) map position. In either case, $done will	2850	the new (success) or old (failed) map position. In either case, $done will
…		…
2627		2857
2628	our $GOTOGEN;	2858	our $GOTOGEN;
2629		2859
2630	sub cf::object::player::goto {	2860	sub cf::object::player::goto {
2631	my ($self, $path, $x, $y, $check, $done) = @_;	2861	my ($self, $path, $x, $y, $check, $done) = @_;
		2862
		2863	if ($self->{_link_recursion} >= $MAX_LINKS) {
		2864	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
		2865	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
		2866	($path, $x, $y) = @$EMERGENCY_POSITION;
		2867	}
2632		2868
2633	# do generation counting so two concurrent goto's will be executed in-order	2869	# do generation counting so two concurrent goto's will be executed in-order
2634	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2870	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2635		2871
2636	$self->enter_link;	2872	$self->enter_link;
…		…
2656	($path, $x, $y) = (undef, undef, undef);	2892	($path, $x, $y) = (undef, undef, undef);
2657	}	2893	}
2658	}	2894	}
2659		2895
2660	my $map = eval {	2896	my $map = eval {
2661	my $map = defined $path ? cf::map::find $path : undef;	2897	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2662		2898
2663	if ($map) {	2899	if ($map) {
2664	$map = $map->customise_for ($self);	2900	$map = $map->customise_for ($self);
2665	$map = $check->($map) if $check && $map;	2901	$map = $check->($map, $x, $y, $self) if $check && $map;
2666	} else {	2902	} else {
2667	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);	2903	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2668	}	2904	}
2669		2905
2670	$map	2906	$map
…		…
2678	if ($gen == $self->{_goto_generation}) {	2914	if ($gen == $self->{_goto_generation}) {
2679	delete $self->{_goto_generation};	2915	delete $self->{_goto_generation};
2680	$self->leave_link ($map, $x, $y);	2916	$self->leave_link ($map, $x, $y);
2681	}	2917	}
2682		2918
2683	$done->() if $done;	2919	$done->($self) if $done;
2684	})->prio (1);	2920	})->prio (1);
2685	}	2921	}
2686		2922
2687	=item $player_object->enter_exit ($exit_object)	2923	=item $player_object->enter_exit ($exit_object)
2688		2924
…		…
2756	$Coro::current->{desc} = "enter_exit";	2992	$Coro::current->{desc} = "enter_exit";
2757		2993
2758	unless (eval {	2994	unless (eval {
2759	$self->deactivate_recursive; # just to be sure	2995	$self->deactivate_recursive; # just to be sure
2760		2996
2761	# random map handling
2762	{
2763	my $guard = cf::lock_acquire "exit_prepare:$exit";
2764
2765	prepare_random_map $exit
2766	if $exit->slaying eq "/!";
2767	}
2768
2769	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2997	my $map = cf::map::normalise $exit->slaying, $exit->map;
2770	my $x = $exit->stats->hp;	2998	my $x = $exit->stats->hp;
2771	my $y = $exit->stats->sp;	2999	my $y = $exit->stats->sp;
		3000
		3001	# special map handling
		3002	my $slaying = $exit->slaying;
		3003
		3004	# special map handling
		3005	if ($slaying eq "/!") {
		3006	my $guard = cf::lock_acquire "exit_prepare:$exit";
		3007
		3008	prepare_random_map $exit
		3009	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		3010
		3011	$map = $exit->slaying;
		3012
		3013	} elsif ($slaying eq '!up') {
		3014	$map = $exit->map->tile_path (cf::TILE_UP);
		3015	$x = $exit->x;
		3016	$y = $exit->y;
		3017
		3018	} elsif ($slaying eq '!down') {
		3019	$map = $exit->map->tile_path (cf::TILE_DOWN);
		3020	$x = $exit->x;
		3021	$y = $exit->y;
		3022	}
2772		3023
2773	$self->goto ($map, $x, $y);	3024	$self->goto ($map, $x, $y);
2774		3025
2775	# if exit is damned, update players death & WoR home-position	3026	# if exit is damned, update players death & WoR home-position
2776	$self->contr->savebed ($map, $x, $y)	3027	$self->contr->savebed ($map, $x, $y)
…		…
2781	$self->message ("Something went wrong deep within the deliantra server. "	3032	$self->message ("Something went wrong deep within the deliantra server. "
2782	. "I'll try to bring you back to the map you were before. "	3033	. "I'll try to bring you back to the map you were before. "
2783	. "Please report this to the dungeon master!",	3034	. "Please report this to the dungeon master!",
2784	cf::NDI_UNIQUE | cf::NDI_RED);	3035	cf::NDI_UNIQUE | cf::NDI_RED);
2785		3036
2786	warn "ERROR in enter_exit: $@";	3037	error "ERROR in enter_exit: $@";
2787	$self->leave_link;	3038	$self->leave_link;
2788	}	3039	}
2789	})->prio (1);	3040	})->prio (1);
2790	}	3041	}
2791		3042
…		…
2949	id => "death",	3200	id => "death",
2950	title => "Death",	3201	title => "Death",
2951	reply => undef,	3202	reply => undef,
2952	tooltip => "Reason for and more info about your most recent death",	3203	tooltip => "Reason for and more info about your most recent death",
2953	},	3204	},
		3205	"c/fatal" => {
		3206	id => "fatal",
		3207	title => "Fatal Error",
		3208	reply => undef,
		3209	tooltip => "Reason for the server disconnect",
		3210	},
2954	"c/say" => $SAY_CHANNEL,	3211	"c/say" => $SAY_CHANNEL,
2955	"c/chat" => $CHAT_CHANNEL,	3212	"c/chat" => $CHAT_CHANNEL,
2956	);	3213	);
2957		3214
2958	sub cf::client::send_msg {	3215	sub cf::client::send_msg {
…		…
3001	=cut	3258	=cut
3002		3259
3003	sub cf::client::ext_msg($$@) {	3260	sub cf::client::ext_msg($$@) {
3004	my ($self, $type, @msg) = @_;	3261	my ($self, $type, @msg) = @_;
3005		3262
3006	if ($self->extcmd == 2) {
3007	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3263	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3008	} elsif ($self->extcmd == 1) { # TODO: remove
3009	push @msg, msgtype => "event_$type";
3010	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3011	}
3012	}
3013
3014	=item $client->ext_reply ($msgid, @msg)
3015
3016	Sends an ext reply to the client.
3017
3018	=cut
3019
3020	sub cf::client::ext_reply($$@) {
3021	my ($self, $id, @msg) = @_;
3022
3023	if ($self->extcmd == 2) {
3024	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3025	} elsif ($self->extcmd == 1) {
3026	#TODO: version 1, remove
3027	unshift @msg, msgtype => "reply", msgid => $id;
3028	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3029	}
3030	}	3264	}
3031		3265
3032	=item $success = $client->query ($flags, "text", \&cb)	3266	=item $success = $client->query ($flags, "text", \&cb)
3033		3267
3034	Queues a query to the client, calling the given callback with	3268	Queues a query to the client, calling the given callback with
…		…
3089	my ($ns, $buf) = @_;	3323	my ($ns, $buf) = @_;
3090		3324
3091	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3325	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3092		3326
3093	if (ref $msg) {	3327	if (ref $msg) {
3094	my ($type, $reply, @payload) =	3328	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3095	"ARRAY" eq ref $msg
3096	? @$msg
3097	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3098		3329
3099	my @reply;
3100
3101	if (my $cb = $EXTICMD{$type}) {	3330	if (my $cb = $EXTIACMD{$type}) {
		3331	$cb->(
		3332	$ns,
		3333	sub {
		3334	$ns->ext_msg ("reply-$reply", @_)
		3335	if $reply;
		3336	},
		3337	@payload
		3338	);
		3339	} else {
		3340	my @reply;
		3341
		3342	if (my $cb = $EXTICMD{$type}) {
3102	@reply = $cb->($ns, @payload);	3343	@reply = $cb->($ns, @payload);
		3344	}
		3345
		3346	$ns->ext_msg ("reply-$reply", @reply)
		3347	if $reply;
3103	}	3348	}
3104
3105	$ns->ext_reply ($reply, @reply)
3106	if $reply;
3107
3108	} else {	3349	} else {
3109	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3350	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3110	}	3351	}
3111		3352
3112	cf::override;	3353	cf::override;
3113	},	3354	},
3114	);	3355	);
…		…
3195	decrease split destroy change_exp value msg lore send_msg)],	3436	decrease split destroy change_exp value msg lore send_msg)],
3196	["cf::object::player" => qw(player)],	3437	["cf::object::player" => qw(player)],
3197	["cf::player" => qw(peaceful send_msg)],	3438	["cf::player" => qw(peaceful send_msg)],
3198	["cf::map" => qw(trigger)],	3439	["cf::map" => qw(trigger)],
3199	) {	3440	) {
3200	no strict 'refs';
3201	my ($pkg, @funs) = @$_;	3441	my ($pkg, @funs) = @$_;
3202	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3442	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3203	for @funs;	3443	for @funs;
3204	}	3444	}
3205		3445
…		…
3244	local @cf::_safe_eval_args = values %vars;	3484	local @cf::_safe_eval_args = values %vars;
3245	@res = wantarray ? eval eval : scalar eval $eval;	3485	@res = wantarray ? eval eval : scalar eval $eval;
3246	}	3486	}
3247		3487
3248	if ($@) {	3488	if ($@) {
3249	warn "$@";	3489	warn "$@",
3250	warn "while executing safe code '$code'\n";	3490	"while executing safe code '$code'\n",
3251	warn "with arguments " . (join " ", %vars) . "\n";	3491	"with arguments " . (join " ", %vars) . "\n";
3252	}	3492	}
3253		3493
3254	wantarray ? @res : $res[0]	3494	wantarray ? @res : $res[0]
3255	}	3495	}
3256		3496
…		…
3281	=cut	3521	=cut
3282		3522
3283	#############################################################################	3523	#############################################################################
3284	# the server's init and main functions	3524	# the server's init and main functions
3285		3525
		3526	{
		3527	package cf::face;
		3528
		3529	our %HASH; # hash => idx
		3530	our @DATA; # dynamically-created facedata, only faceste 0 used
		3531	our @FOFS; # file offset, if > 0
		3532	our @SIZE; # size of face, in octets
		3533	our @META; # meta hash of face, if any
		3534	our $DATAFH; # facedata filehandle
		3535
		3536	# internal api, not finalised
		3537	sub set {
		3538	my ($name, $type, $data) = @_;
		3539
		3540	my $idx = cf::face::find $name;
		3541
		3542	if ($idx) {
		3543	delete $HASH{cf::face::get_chksum $idx};
		3544	} else {
		3545	$idx = cf::face::alloc $name;
		3546	}
		3547
		3548	my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
		3549
		3550	cf::face::set_type $idx, $type;
		3551	cf::face::set_csum $idx, 0, $hash;
		3552
		3553	# we need to destroy the SV itself, not just modify it, as a running ix
		3554	# might hold a reference to it: "delete" achieves that.
		3555	delete $FOFS[0][$idx];
		3556	delete $DATA[0][$idx];
		3557	$DATA[0][$idx] = $data;
		3558	$SIZE[0][$idx] = length $data;
		3559	delete $META[$idx];
		3560	$HASH{$hash} = $idx;#d#
		3561
		3562	$idx
		3563	}
		3564
		3565	sub _get_data($$$) {
		3566	my ($idx, $set, $cb) = @_;
		3567
		3568	if (defined $DATA[$set][$idx]) {
		3569	$cb->($DATA[$set][$idx]);
		3570	} elsif (my $fofs = $FOFS[$set][$idx]) {
		3571	my $size = $SIZE[$set][$idx];
		3572	my $buf;
		3573	IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
		3574	if ($_[0] == $size) {
		3575	#cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
		3576	$cb->($buf);
		3577	} else {
		3578	cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
		3579	}
		3580	};
		3581	} else {
		3582	cf::error "requested facedata for unknown face $idx#$set, ignoring.";
		3583	}
		3584	}
		3585
		3586	# rather ineffient
		3587	sub cf::face::get_data($;$) {
		3588	my ($idx, $set) = @_;
		3589
		3590	_get_data $idx, $set, Coro::rouse_cb;
		3591	Coro::rouse_wait
		3592	}
		3593
		3594	sub cf::face::ix {
		3595	my ($ns, $set, $idx, $pri) = @_;
		3596
		3597	_get_data $idx, $set, sub {
		3598	$ns->ix_send ($idx, $pri, $_[0]);
		3599	};
		3600	}
		3601	}
		3602
3286	sub load_facedata($) {	3603	sub load_facedata($) {
3287	my ($path) = @_;	3604	my ($path) = @_;
3288		3605
3289	# HACK to clear player env face cache, we need some signal framework
3290	# for this (global event?)
3291	%ext::player_env::MUSIC_FACE_CACHE = ();
3292
3293	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3606	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3294		3607
3295	warn "loading facedata from $path\n";	3608	trace "loading facedata from $path\n";
3296		3609
3297	my $facedata;	3610	my $facedata = decode_storable load_file "$path/faceinfo";
3298	0 < aio_load $path, $facedata
3299	or die "$path: $!";
3300
3301	$facedata = Coro::Storable::thaw $facedata;
3302		3611
3303	$facedata->{version} == 2	3612	$facedata->{version} == 2
3304	or cf::cleanup "$path: version mismatch, cannot proceed.";	3613	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3305		3614
3306	# patch in the exptable	3615	my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3307	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);	3616	or cf::cleanup "$path/facedata: $!, cannot proceed.";
3308	$facedata->{resource}{"res/exp_table"} = {	3617
3309	type => FT_RSRC,	3618	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3310	data => $exp_table,	3619
3311	hash => (Digest::MD5::md5 $exp_table),	3620	# BEGIN ATOMIC
3312	};	3621	# from here on, everything must be atomic - no thread switch allowed
3313	cf::cede_to_tick;	3622	my $t1 = EV::time;
3314		3623
3315	{	3624	{
3316	my $faces = $facedata->{faceinfo};	3625	my $faces = $facedata->{faceinfo};
3317		3626
3318	while (my ($face, $info) = each %$faces) {	3627	for my $face (sort keys %$faces) {
		3628	my $info = $faces->{$face};
3319	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3629	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3320		3630
3321	cf::face::set_visibility $idx, $info->{visibility};	3631	cf::face::set_visibility $idx, $info->{visibility};
3322	cf::face::set_magicmap $idx, $info->{magicmap};	3632	cf::face::set_magicmap $idx, $info->{magicmap};
3323	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3633	cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3324	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3634	cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3325		3635	cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3326	cf::cede_to_tick;	3636	$cf::face::HASH{$info->{hash64}} = $idx;
		3637	delete $cf::face::META[$idx];
3327	}	3638	}
3328		3639
3329	while (my ($face, $info) = each %$faces) {	3640	while (my ($face, $info) = each %$faces) {
3330	next unless $info->{smooth};	3641	next unless $info->{smooth};
3331		3642
…		…
3334		3645
3335	if (my $smooth = cf::face::find $info->{smooth}) {	3646	if (my $smooth = cf::face::find $info->{smooth}) {
3336	cf::face::set_smooth $idx, $smooth;	3647	cf::face::set_smooth $idx, $smooth;
3337	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3648	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3338	} else {	3649	} else {
3339	warn "smooth face '$info->{smooth}' not found for face '$face'";	3650	error "smooth face '$info->{smooth}' not found for face '$face'";
3340	}	3651	}
3341
3342	cf::cede_to_tick;
3343	}	3652	}
3344	}	3653	}
3345		3654
3346	{	3655	{
3347	my $anims = $facedata->{animinfo};	3656	my $anims = $facedata->{animinfo};
3348		3657
3349	while (my ($anim, $info) = each %$anims) {	3658	while (my ($anim, $info) = each %$anims) {
3350	cf::anim::set $anim, $info->{frames}, $info->{facings};	3659	cf::anim::set $anim, $info->{frames}, $info->{facings};
3351	cf::cede_to_tick;
3352	}	3660	}
3353		3661
3354	cf::anim::invalidate_all; # d'oh	3662	cf::anim::invalidate_all; # d'oh
3355	}	3663	}
3356		3664
3357	{	3665	{
3358	my $res = $facedata->{resource};	3666	my $res = $facedata->{resource};
3359		3667
3360	while (my ($name, $info) = each %$res) {	3668	while (my ($name, $info) = each %$res) {
3361	if (defined $info->{type}) {	3669	if (defined (my $type = $info->{type})) {
		3670	# TODO: different hash - must free and use new index, or cache ixface data queue
3362	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3671	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3363		3672
3364	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3365	cf::face::set_type $idx, $info->{type};	3673	cf::face::set_type $idx, $type;
		3674	cf::face::set_csum $idx, 0, $info->{hash};
		3675	$cf::face::SIZE[0][$idx] = $info->{size};
		3676	$cf::face::FOFS[0][$idx] = $info->{fofs};
		3677	$cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3678	$cf::face::HASH{$info->{hash}} = $idx;
3366	} else {	3679	} else {
3367	$RESOURCE{$name} = $info;	3680	# $RESOURCE{$name} = $info; # unused
3368	}	3681	}
3369
3370	cf::cede_to_tick;
3371	}	3682	}
3372	}	3683	}
		3684
		3685	($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
		3686
		3687	# HACK to clear player env face cache, we need some signal framework
		3688	# for this (global event?)
		3689	%ext::player_env::MUSIC_FACE_CACHE = ();
		3690
		3691	# END ATOMIC
		3692
		3693	cf::debug "facedata atomic update time ", EV::time - $t1;
3373		3694
3374	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3695	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3375		3696
		3697	aio_close $fh if $fh; # close old facedata
		3698
3376	1	3699	1
3377	}	3700	}
3378
3379	cf::global->attach (on_resource_update => sub {
3380	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3381	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3382
3383	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3384	my $sound = $soundconf->{compat}[$_]
3385	or next;
3386
3387	my $face = cf::face::find "sound/$sound->[1]";
3388	cf::sound::set $sound->[0] => $face;
3389	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3390	}
3391
3392	while (my ($k, $v) = each %{$soundconf->{event}}) {
3393	my $face = cf::face::find "sound/$v";
3394	cf::sound::set $k => $face;
3395	}
3396	}
3397	});
3398		3701
3399	register_exticmd fx_want => sub {	3702	register_exticmd fx_want => sub {
3400	my ($ns, $want) = @_;	3703	my ($ns, $want) = @_;
3401		3704
3402	while (my ($k, $v) = each %$want) {	3705	while (my ($k, $v) = each %$want) {
…		…
3410	my $status = load_resource_file_ $_[0];	3713	my $status = load_resource_file_ $_[0];
3411	get_slot 0.1, 100;	3714	get_slot 0.1, 100;
3412	cf::arch::commit_load;	3715	cf::arch::commit_load;
3413		3716
3414	$status	3717	$status
		3718	}
		3719
		3720	sub reload_exp_table {
		3721	_reload_exp_table;
		3722
		3723	cf::face::set
		3724	"res/exp_table" => FT_RSRC,
		3725	JSON::XS->new->utf8->canonical->encode (
		3726	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3727	);
		3728	}
		3729
		3730	sub reload_materials {
		3731	_reload_materials;
3415	}	3732	}
3416		3733
3417	sub reload_regions {	3734	sub reload_regions {
3418	# HACK to clear player env face cache, we need some signal framework	3735	# HACK to clear player env face cache, we need some signal framework
3419	# for this (global event?)	3736	# for this (global event?)
…		…
3427	if exists $_->{match};	3744	if exists $_->{match};
3428	}	3745	}
3429	}	3746	}
3430		3747
3431	sub reload_facedata {	3748	sub reload_facedata {
3432	load_facedata "$DATADIR/facedata"	3749	load_facedata $DATADIR
3433	or die "unable to load facedata\n";	3750	or die "unable to load facedata\n";
3434	}	3751	}
3435		3752
3436	sub reload_archetypes {	3753	sub reload_archetypes {
3437	load_resource_file "$DATADIR/archetypes"	3754	load_resource_file "$DATADIR/archetypes"
3438	or die "unable to load archetypes\n";	3755	or die "unable to load archetypes\n";
		3756
		3757	cf::face::set
		3758	"res/skill_info" => FT_RSRC,
		3759	JSON::XS->new->utf8->canonical->encode (
		3760	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3761	);
		3762
		3763	cf::face::set
		3764	"res/spell_paths" => FT_RSRC,
		3765	JSON::XS->new->utf8->canonical->encode (
		3766	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3767	);
3439	}	3768	}
3440		3769
3441	sub reload_treasures {	3770	sub reload_treasures {
3442	load_resource_file "$DATADIR/treasures"	3771	load_resource_file "$DATADIR/treasures"
3443	or die "unable to load treasurelists\n";	3772	or die "unable to load treasurelists\n";
3444	}	3773	}
3445		3774
		3775	sub reload_sound {
		3776	trace "loading sound config from $DATADIR/sound\n";
		3777
		3778	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
		3779
		3780	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3781	my $sound = $soundconf->{compat}[$_]
		3782	or next;
		3783
		3784	my $face = cf::face::find "sound/$sound->[1]";
		3785	cf::sound::set $sound->[0] => $face;
		3786	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3787	}
		3788
		3789	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3790	my $face = cf::face::find "sound/$v";
		3791	cf::sound::set $k => $face;
		3792	}
		3793	}
		3794
3446	sub reload_resources {	3795	sub reload_resources {
3447	warn "reloading resource files...\n";	3796	trace "reloading resource files...\n";
3448		3797
		3798	reload_materials;
3449	reload_facedata;	3799	reload_facedata;
		3800	reload_exp_table;
		3801	reload_sound;
3450	reload_archetypes;	3802	reload_archetypes;
3451	reload_regions;	3803	reload_regions;
3452	reload_treasures;	3804	reload_treasures;
3453		3805
3454	warn "finished reloading resource files\n";	3806	trace "finished reloading resource files\n";
3455	}	3807	}
3456		3808
3457	sub reload_config {	3809	sub reload_config {
3458	warn "reloading config file...\n";	3810	trace "reloading config file...\n";
3459		3811
3460	open my $fh, "<:utf8", "$CONFDIR/config"	3812	my $config = load_file "$CONFDIR/config";
3461	or return;	3813	utf8::decode $config;
		3814	*CFG = decode_yaml $config;
3462		3815
3463	local $/;
3464	*CFG = YAML::XS::Load scalar <$fh>;
3465
3466	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3816	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3467		3817
3468	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3818	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3469	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3819	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3470		3820
3471	if (exists $CFG{mlockall}) {	3821	if (exists $CFG{mlockall}) {
…		…
3473	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3823	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3474	and die "WARNING: m(un)lockall failed: $!\n";	3824	and die "WARNING: m(un)lockall failed: $!\n";
3475	};	3825	};
3476	warn $@ if $@;	3826	warn $@ if $@;
3477	}	3827	}
3478
3479	warn "finished reloading resource files\n";
3480	}	3828	}
3481		3829
3482	sub pidfile() {	3830	sub pidfile() {
3483	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3831	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3484	or die "$PIDFILE: $!";	3832	or die "$PIDFILE: $!";
…		…
3497	seek $fh, 0, 0;	3845	seek $fh, 0, 0;
3498	print $fh $$;	3846	print $fh $$;
3499	}	3847	}
3500		3848
3501	sub main_loop {	3849	sub main_loop {
3502	warn "EV::loop starting\n";	3850	trace "EV::loop starting\n";
3503	if (1) {	3851	if (1) {
3504	EV::loop;	3852	EV::loop;
3505	}	3853	}
3506	warn "EV::loop returned\n";	3854	trace "EV::loop returned\n";
3507	goto &main_loop unless $REALLY_UNLOOP;	3855	goto &main_loop unless $REALLY_UNLOOP;
3508	}	3856	}
3509		3857
3510	sub main {	3858	sub main {
3511	cf::init_globals; # initialise logging	3859	cf::init_globals; # initialise logging
3512		3860
3513	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3861	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3514	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3862	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3515	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3863	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3516	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3864	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3517		3865
3518	cf::init_experience;
3519	cf::init_anim;
3520	cf::init_attackmess;
3521	cf::init_dynamic;
3522
3523	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3866	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3524		3867
3525	# we must not ever block the main coroutine	3868	# we must not ever block the main coroutine
3526	local $Coro::idle = sub {	3869	$Coro::idle = sub {
3527	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3870	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3528	(async {	3871	(async {
3529	$Coro::current->{desc} = "IDLE BUG HANDLER";	3872	$Coro::current->{desc} = "IDLE BUG HANDLER";
3530	EV::loop EV::LOOP_ONESHOT;	3873	EV::loop EV::LOOP_ONESHOT;
3531	})->prio (Coro::PRIO_MAX);	3874	})->prio (Coro::PRIO_MAX);
3532	};	3875	};
3533		3876
3534	evthread_start IO::AIO::poll_fileno;	3877	evthread_start IO::AIO::poll_fileno;
3535		3878
3536	cf::sync_job {	3879	cf::sync_job {
		3880	cf::incloader::init ();
		3881
		3882	db_init;
		3883
		3884	cf::init_anim;
		3885	cf::init_attackmess;
		3886	cf::init_dynamic;
		3887
3537	cf::load_settings;	3888	cf::load_settings;
3538	cf::load_materials;
3539		3889
3540	reload_resources;	3890	reload_resources;
3541	reload_config;	3891	reload_config;
3542	db_init;
3543		3892
3544	cf::init_uuid;	3893	cf::init_uuid;
3545	cf::init_signals;	3894	cf::init_signals;
3546	cf::init_commands;
3547	cf::init_skills;	3895	cf::init_skills;
3548		3896
3549	cf::init_beforeplay;	3897	cf::init_beforeplay;
3550		3898
3551	atomic;	3899	atomic;
…		…
3556		3904
3557	# no (long-running) fork's whatsoever before this point(!)	3905	# no (long-running) fork's whatsoever before this point(!)
3558	use POSIX ();	3906	use POSIX ();
3559	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3907	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3560		3908
3561	(pop @POST_INIT)->(0) while @POST_INIT;	3909	cf::_post_init 0;
3562	};	3910	};
3563		3911
		3912	cf::object::thawer::errors_are_fatal 0;
		3913	info "parse errors in files are no longer fatal from this point on.\n";
		3914
		3915	AE::postpone {
		3916	undef &main; # free gobs of memory :)
		3917	};
		3918
3564	main_loop;	3919	goto &main_loop;
3565	}	3920	}
3566		3921
3567	#############################################################################	3922	#############################################################################
3568	# initialisation and cleanup	3923	# initialisation and cleanup
3569		3924
3570	# install some emergency cleanup handlers	3925	# install some emergency cleanup handlers
3571	BEGIN {	3926	BEGIN {
3572	our %SIGWATCHER = ();	3927	our %SIGWATCHER = ();
3573	for my $signal (qw(INT HUP TERM)) {	3928	for my $signal (qw(INT HUP TERM)) {
3574	$SIGWATCHER{$signal} = EV::signal $signal, sub {	3929	$SIGWATCHER{$signal} = AE::signal $signal, sub {
3575	cf::cleanup "SIG$signal";	3930	cf::cleanup "SIG$signal";
3576	};	3931	};
3577	}	3932	}
3578	}	3933	}
3579		3934
3580	sub write_runtime_sync {	3935	sub write_runtime_sync {
3581	my $t0 = EV::time;	3936	my $t0 = AE::time;
3582		3937
3583	# first touch the runtime file to show we are still running:	3938	# first touch the runtime file to show we are still running:
3584	# the fsync below can take a very very long time.	3939	# the fsync below can take a very very long time.
3585		3940
3586	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;	3941	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
…		…
3608	or return;	3963	or return;
3609		3964
3610	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3965	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3611	and return;	3966	and return;
3612		3967
3613	warn sprintf "runtime file written (%gs).\n", EV::time - $t0;	3968	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3614		3969
3615	1	3970	1
3616	}	3971	}
3617		3972
3618	our $uuid_lock;	3973	our $uuid_lock;
…		…
3630	or return;	3985	or return;
3631		3986
3632	my $value = uuid_seq uuid_cur;	3987	my $value = uuid_seq uuid_cur;
3633		3988
3634	unless ($value) {	3989	unless ($value) {
3635	warn "cowardly refusing to write zero uuid value!\n";	3990	info "cowardly refusing to write zero uuid value!\n";
3636	return;	3991	return;
3637	}	3992	}
3638		3993
3639	my $value = uuid_str $value + $uuid_skip;	3994	my $value = uuid_str $value + $uuid_skip;
3640	$uuid_skip = 0;	3995	$uuid_skip = 0;
…		…
3650	or return;	4005	or return;
3651		4006
3652	aio_rename "$uuid~", $uuid	4007	aio_rename "$uuid~", $uuid
3653	and return;	4008	and return;
3654		4009
3655	warn "uuid file written ($value).\n";	4010	trace "uuid file written ($value).\n";
3656		4011
3657	1	4012	1
3658		4013
3659	}	4014	}
3660		4015
…		…
3666	}	4021	}
3667		4022
3668	sub emergency_save() {	4023	sub emergency_save() {
3669	my $freeze_guard = cf::freeze_mainloop;	4024	my $freeze_guard = cf::freeze_mainloop;
3670		4025
3671	warn "emergency_perl_save: enter\n";	4026	info "emergency_perl_save: enter\n";
		4027
		4028	# this is a trade-off: we want to be very quick here, so
		4029	# save all maps without fsync, and later call a global sync
		4030	# (which in turn might be very very slow)
		4031	local $USE_FSYNC = 0;
3672		4032
3673	cf::sync_job {	4033	cf::sync_job {
3674	# this is a trade-off: we want to be very quick here, so	4034	cf::write_runtime_sync; # external watchdog should not bark
3675	# save all maps without fsync, and later call a global sync
3676	# (which in turn might be very very slow)
3677	local $USE_FSYNC = 0;
3678		4035
3679	# use a peculiar iteration method to avoid tripping on perl	4036	# use a peculiar iteration method to avoid tripping on perl
3680	# refcount bugs in for. also avoids problems with players	4037	# refcount bugs in for. also avoids problems with players
3681	# and maps saved/destroyed asynchronously.	4038	# and maps saved/destroyed asynchronously.
3682	warn "emergency_perl_save: begin player save\n";	4039	info "emergency_perl_save: begin player save\n";
3683	for my $login (keys %cf::PLAYER) {	4040	for my $login (keys %cf::PLAYER) {
3684	my $pl = $cf::PLAYER{$login} or next;	4041	my $pl = $cf::PLAYER{$login} or next;
3685	$pl->valid or next;	4042	$pl->valid or next;
3686	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	4043	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3687	$pl->save;	4044	$pl->save;
3688	}	4045	}
3689	warn "emergency_perl_save: end player save\n";	4046	info "emergency_perl_save: end player save\n";
3690		4047
		4048	cf::write_runtime_sync; # external watchdog should not bark
		4049
3691	warn "emergency_perl_save: begin map save\n";	4050	info "emergency_perl_save: begin map save\n";
3692	for my $path (keys %cf::MAP) {	4051	for my $path (keys %cf::MAP) {
3693	my $map = $cf::MAP{$path} or next;	4052	my $map = $cf::MAP{$path} or next;
3694	$map->valid or next;	4053	$map->valid or next;
3695	$map->save;	4054	$map->save;
3696	}	4055	}
3697	warn "emergency_perl_save: end map save\n";	4056	info "emergency_perl_save: end map save\n";
3698		4057
		4058	cf::write_runtime_sync; # external watchdog should not bark
		4059
3699	warn "emergency_perl_save: begin database checkpoint\n";	4060	info "emergency_perl_save: begin database checkpoint\n";
3700	BDB::db_env_txn_checkpoint $DB_ENV;	4061	BDB::db_env_txn_checkpoint $DB_ENV;
3701	warn "emergency_perl_save: end database checkpoint\n";	4062	info "emergency_perl_save: end database checkpoint\n";
3702		4063
3703	warn "emergency_perl_save: begin write uuid\n";	4064	info "emergency_perl_save: begin write uuid\n";
3704	write_uuid_sync 1;	4065	write_uuid_sync 1;
3705	warn "emergency_perl_save: end write uuid\n";	4066	info "emergency_perl_save: end write uuid\n";
		4067
		4068	cf::write_runtime_sync; # external watchdog should not bark
		4069
		4070	trace "emergency_perl_save: syncing database to disk";
		4071	BDB::db_env_txn_checkpoint $DB_ENV;
		4072
		4073	info "emergency_perl_save: starting sync\n";
		4074	IO::AIO::aio_sync sub {
		4075	info "emergency_perl_save: finished sync\n";
		4076	};
		4077
		4078	cf::write_runtime_sync; # external watchdog should not bark
		4079
		4080	trace "emergency_perl_save: flushing outstanding aio requests";
		4081	while (IO::AIO::nreqs || BDB::nreqs) {
		4082	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
		4083	}
		4084
		4085	cf::write_runtime_sync; # external watchdog should not bark
3706	};	4086	};
3707		4087
3708	warn "emergency_perl_save: starting sync()\n";
3709	IO::AIO::aio_sync sub {
3710	warn "emergency_perl_save: finished sync()\n";
3711	};
3712
3713	warn "emergency_perl_save: leave\n";	4088	info "emergency_perl_save: leave\n";
3714	}	4089	}
3715		4090
3716	sub post_cleanup {	4091	sub post_cleanup {
3717	my ($make_core) = @_;	4092	my ($make_core) = @_;
3718		4093
		4094	IO::AIO::flush;
		4095
3719	warn Carp::longmess "post_cleanup backtrace"	4096	error Carp::longmess "post_cleanup backtrace"
3720	if $make_core;	4097	if $make_core;
3721		4098
3722	my $fh = pidfile;	4099	my $fh = pidfile;
3723	unlink $PIDFILE if <$fh> == $$;	4100	unlink $PIDFILE if <$fh> == $$;
3724	}	4101	}
…		…
3744	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	4121	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3745	for my $name (keys %$leaf_symtab) {	4122	for my $name (keys %$leaf_symtab) {
3746	_gv_clear *{"$pkg$name"};	4123	_gv_clear *{"$pkg$name"};
3747	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	4124	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3748	}	4125	}
3749	warn "cleared package $pkg\n";#d#
3750	}	4126	}
3751		4127
3752	sub do_reload_perl() {	4128	sub do_reload_perl() {
3753	# can/must only be called in main	4129	# can/must only be called in main
3754	if ($Coro::current != $Coro::main) {	4130	unless (in_main) {
3755	warn "can only reload from main coroutine";	4131	error "can only reload from main coroutine";
3756	return;	4132	return;
3757	}	4133	}
3758		4134
3759	return if $RELOAD++;	4135	return if $RELOAD++;
3760		4136
3761	my $t1 = EV::time;	4137	my $t1 = AE::time;
3762		4138
3763	while ($RELOAD) {	4139	while ($RELOAD) {
3764	warn "reloading...";	4140	cf::get_slot 0.1, -1, "reload_perl";
		4141	info "perl_reload: reloading...";
3765		4142
3766	warn "entering sync_job";	4143	trace "perl_reload: entering sync_job";
3767		4144
3768	cf::sync_job {	4145	cf::sync_job {
3769	cf::write_runtime_sync; # external watchdog should not bark
3770	cf::emergency_save;	4146	#cf::emergency_save;
3771	cf::write_runtime_sync; # external watchdog should not bark
3772		4147
3773	warn "syncing database to disk";
3774	BDB::db_env_txn_checkpoint $DB_ENV;
3775
3776	# if anything goes wrong in here, we should simply crash as we already saved
3777
3778	warn "flushing outstanding aio requests";
3779	while (IO::AIO::nreqs || BDB::nreqs) {
3780	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3781	}
3782
3783	warn "cancelling all extension coros";	4148	trace "perl_reload: cancelling all extension coros";
3784	$_->cancel for values %EXT_CORO;	4149	$_->cancel for values %EXT_CORO;
3785	%EXT_CORO = ();	4150	%EXT_CORO = ();
3786		4151
3787	warn "removing commands";	4152	trace "perl_reload: removing commands";
3788	%COMMAND = ();	4153	%COMMAND = ();
3789		4154
3790	warn "removing ext/exti commands";	4155	trace "perl_reload: removing ext/exti commands";
3791	%EXTCMD = ();	4156	%EXTCMD = ();
3792	%EXTICMD = ();	4157	%EXTICMD = ();
3793		4158
3794	warn "unloading/nuking all extensions";	4159	trace "perl_reload: unloading/nuking all extensions";
3795	for my $pkg (@EXTS) {	4160	for my $pkg (@EXTS) {
3796	warn "... unloading $pkg";	4161	trace "... unloading $pkg";
3797		4162
3798	if (my $cb = $pkg->can ("unload")) {	4163	if (my $cb = $pkg->can ("unload")) {
3799	eval {	4164	eval {
3800	$cb->($pkg);	4165	$cb->($pkg);
3801	1	4166	1
3802	} or warn "$pkg unloaded, but with errors: $@";	4167	} or error "$pkg unloaded, but with errors: $@";
3803	}	4168	}
3804		4169
3805	warn "... clearing $pkg";	4170	trace "... clearing $pkg";
3806	clear_package $pkg;	4171	clear_package $pkg;
3807	}	4172	}
3808		4173
3809	warn "unloading all perl modules loaded from $LIBDIR";	4174	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3810	while (my ($k, $v) = each %INC) {	4175	while (my ($k, $v) = each %INC) {
3811	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4176	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3812		4177
3813	warn "... unloading $k";	4178	trace "... unloading $k";
3814	delete $INC{$k};	4179	delete $INC{$k};
3815		4180
3816	$k =~ s/\.pm$//;	4181	$k =~ s/\.pm$//;
3817	$k =~ s/\//::/g;	4182	$k =~ s/\//::/g;
3818		4183
…		…
3821	}	4186	}
3822		4187
3823	clear_package $k;	4188	clear_package $k;
3824	}	4189	}
3825		4190
3826	warn "getting rid of safe::, as good as possible";	4191	trace "perl_reload: getting rid of safe::, as good as possible";
3827	clear_package "safe::$_"	4192	clear_package "safe::$_"
3828	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4193	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3829		4194
3830	warn "unloading cf.pm \"a bit\"";	4195	trace "perl_reload: unloading cf.pm \"a bit\"";
3831	delete $INC{"cf.pm"};	4196	delete $INC{"cf.pm"};
3832	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4197	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3833		4198
3834	# don't, removes xs symbols, too,	4199	# don't, removes xs symbols, too,
3835	# and global variables created in xs	4200	# and global variables created in xs
3836	#clear_package __PACKAGE__;	4201	#clear_package __PACKAGE__;
3837		4202
3838	warn "unload completed, starting to reload now";	4203	info "perl_reload: unload completed, starting to reload now";
3839		4204
3840	warn "reloading cf.pm";	4205	trace "perl_reload: reloading cf.pm";
3841	require cf;	4206	require cf;
3842	cf::_connect_to_perl_1;	4207	cf::_connect_to_perl_1;
3843		4208
3844	warn "loading config and database again";	4209	trace "perl_reload: loading config and database again";
3845	cf::reload_config;	4210	cf::reload_config;
3846		4211
3847	warn "loading extensions";	4212	trace "perl_reload: loading extensions";
3848	cf::load_extensions;	4213	cf::load_extensions;
3849		4214
3850	if ($REATTACH_ON_RELOAD) {	4215	if ($REATTACH_ON_RELOAD) {
3851	warn "reattaching attachments to objects/players";	4216	trace "perl_reload: reattaching attachments to objects/players";
3852	_global_reattach; # objects, sockets	4217	_global_reattach; # objects, sockets
3853	warn "reattaching attachments to maps";	4218	trace "perl_reload: reattaching attachments to maps";
3854	reattach $_ for values %MAP;	4219	reattach $_ for values %MAP;
3855	warn "reattaching attachments to players";	4220	trace "perl_reload: reattaching attachments to players";
3856	reattach $_ for values %PLAYER;	4221	reattach $_ for values %PLAYER;
3857	}	4222	}
3858		4223
3859	warn "running post_init jobs";	4224	cf::_post_init 1;
3860	(pop @POST_INIT)->(1) while @POST_INIT;
3861		4225
3862	warn "leaving sync_job";	4226	trace "perl_reload: leaving sync_job";
3863		4227
3864	1	4228	1
3865	} or do {	4229	} or do {
3866	warn $@;	4230	error $@;
3867	cf::cleanup "error while reloading, exiting.";	4231	cf::cleanup "perl_reload: error, exiting.";
3868	};	4232	};
3869		4233
3870	warn "reloaded";
3871	--$RELOAD;	4234	--$RELOAD;
3872	}	4235	}
3873		4236
3874	$t1 = EV::time - $t1;	4237	$t1 = AE::time - $t1;
3875	warn "reload completed in ${t1}s\n";	4238	info "perl_reload: completed in ${t1}s\n";
3876	};	4239	};
3877		4240
3878	our $RELOAD_WATCHER; # used only during reload	4241	our $RELOAD_WATCHER; # used only during reload
3879		4242
3880	sub reload_perl() {	4243	sub reload_perl() {
…		…
3882	# coro crashes during coro_state_free->destroy here.	4245	# coro crashes during coro_state_free->destroy here.
3883		4246
3884	$RELOAD_WATCHER ||= cf::async {	4247	$RELOAD_WATCHER ||= cf::async {
3885	Coro::AIO::aio_wait cache_extensions;	4248	Coro::AIO::aio_wait cache_extensions;
3886		4249
3887	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {	4250	$RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3888	do_reload_perl;	4251	do_reload_perl;
3889	undef $RELOAD_WATCHER;	4252	undef $RELOAD_WATCHER;
3890	};	4253	};
3891	};	4254	};
3892	}	4255	}
…		…
3901	reload_perl;	4264	reload_perl;
3902	};	4265	};
3903	}	4266	}
3904	};	4267	};
3905		4268
3906	unshift @INC, $LIBDIR;	4269	#############################################################################
3907		4270
3908	my $bug_warning = 0;	4271	my $bug_warning = 0;
3909		4272
3910	our @WAIT_FOR_TICK;
3911	our @WAIT_FOR_TICK_BEGIN;
3912
3913	sub wait_for_tick {	4273	sub wait_for_tick() {
3914	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4274	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3915		4275
3916	my $signal = new Coro::Signal;	4276	$WAIT_FOR_TICK->wait;
3917	push @WAIT_FOR_TICK, $signal;
3918	$signal->wait;
3919	}	4277	}
3920		4278
3921	sub wait_for_tick_begin {	4279	sub wait_for_tick_begin() {
3922	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4280	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3923		4281
3924	my $signal = new Coro::Signal;	4282	my $signal = new Coro::Signal;
3925	push @WAIT_FOR_TICK_BEGIN, $signal;	4283	push @WAIT_FOR_TICK_BEGIN, $signal;
3926	$signal->wait;	4284	$signal->wait;
3927	}	4285	}
…		…
3931	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4289	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3932	unless ++$bug_warning > 10;	4290	unless ++$bug_warning > 10;
3933	return;	4291	return;
3934	}	4292	}
3935		4293
3936	cf::server_tick; # one server iteration	4294	cf::one_tick; # one server iteration
3937		4295
3938	#for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#	4296	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3939		4297
3940	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4298	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3941	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4299	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3942	Coro::async_pool {	4300	Coro::async_pool {
3943	$Coro::current->{desc} = "runtime saver";	4301	$Coro::current->{desc} = "runtime saver";
3944	write_runtime_sync	4302	write_runtime_sync
3945	or warn "ERROR: unable to write runtime file: $!";	4303	or error "ERROR: unable to write runtime file: $!";
3946	};	4304	};
3947	}	4305	}
3948		4306
3949	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4307	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3950	$sig->send;	4308	$sig->send;
3951	}	4309	}
3952	while (my $sig = shift @WAIT_FOR_TICK) {	4310	$WAIT_FOR_TICK->broadcast;
3953	$sig->send;
3954	}
3955		4311
3956	$LOAD = ($NOW - $TICK_START) / $TICK;	4312	$LOAD = ($NOW - $TICK_START) / $TICK;
3957	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4313	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3958		4314
3959	if (0) {	4315	if (0) {
3960	if ($NEXT_TICK) {	4316	if ($NEXT_TICK) {
3961	my $jitter = $TICK_START - $NEXT_TICK;	4317	my $jitter = $TICK_START - $NEXT_TICK;
3962	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4318	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
3963	warn "jitter $JITTER\n";#d#	4319	debug "jitter $JITTER\n";#d#
3964	}	4320	}
3965	}	4321	}
3966	}	4322	}
3967		4323
3968	{	4324	{
3969	# configure BDB	4325	# configure BDB
		4326	info "initialising database";
3970		4327
3971	BDB::min_parallel 16;	4328	BDB::min_parallel 16;
3972	BDB::max_poll_reqs $TICK * 0.1;	4329	BDB::max_poll_reqs $TICK * 0.1;
3973	$AnyEvent::BDB::WATCHER->priority (1);	4330	#$AnyEvent::BDB::WATCHER->priority (1);
3974		4331
3975	unless ($DB_ENV) {	4332	unless ($DB_ENV) {
3976	$DB_ENV = BDB::db_env_create;	4333	$DB_ENV = BDB::db_env_create;
3977	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4334	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3978	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4335	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
4003	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4360	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4004	};	4361	};
4005	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4362	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4006	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4363	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4007	};	4364	};
		4365
		4366	info "database initialised";
4008	}	4367	}
4009		4368
4010	{	4369	{
4011	# configure IO::AIO	4370	# configure IO::AIO
4012		4371
		4372	info "initialising aio";
4013	IO::AIO::min_parallel 8;	4373	IO::AIO::min_parallel 8;
4014	IO::AIO::max_poll_time $TICK * 0.1;	4374	IO::AIO::max_poll_time $TICK * 0.1;
4015	undef $AnyEvent::AIO::WATCHER;	4375	undef $AnyEvent::AIO::WATCHER;
		4376	info "aio initialised";
4016	}	4377	}
4017		4378
4018	my $_log_backtrace;	4379	our $_log_backtrace;
		4380	our $_log_backtrace_last;
4019		4381
4020	sub _log_backtrace {	4382	sub _log_backtrace {
4021	my ($msg, @addr) = @_;	4383	my ($msg, @addr) = @_;
4022		4384
4023	$msg =~ s/\n//;	4385	$msg =~ s/\n$//;
4024		4386
		4387	if ($_log_backtrace_last eq $msg) {
		4388	LOG llevInfo, "[ABT] $msg\n";
		4389	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4025	# limit the # of concurrent backtraces	4390	# limit the # of concurrent backtraces
4026	if ($_log_backtrace < 2) {	4391	} elsif ($_log_backtrace < 2) {
		4392	$_log_backtrace_last = $msg;
4027	++$_log_backtrace;	4393	++$_log_backtrace;
4028	my $perl_bt = Carp::longmess $msg;	4394	my $perl_bt = Carp::longmess $msg;
4029	async {	4395	async {
4030	$Coro::current->{desc} = "abt $msg";	4396	$Coro::current->{desc} = "abt $msg";
4031		4397
…		…
4051	LOG llevInfo, "[ABT] $_\n" for @bt;	4417	LOG llevInfo, "[ABT] $_\n" for @bt;
4052	--$_log_backtrace;	4418	--$_log_backtrace;
4053	};	4419	};
4054	} else {	4420	} else {
4055	LOG llevInfo, "[ABT] $msg\n";	4421	LOG llevInfo, "[ABT] $msg\n";
4056	LOG llevInfo, "[ABT] [suppressed]\n";	4422	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4057	}	4423	}
4058	}	4424	}
4059		4425
4060	# load additional modules	4426	# load additional modules
4061	require "cf/$_.pm" for @EXTRA_MODULES;	4427	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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