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.451 by root, Mon Sep 22 05:42:41 2008 UTC vs.
Revision 1.580 by root, Wed Jan 4 03:22:48 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 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	6	# Deliantra is free software: you can redistribute it and/or modify it under
7	# it under the terms of the GNU General Public License as published by	7	# the terms of the Affero GNU General Public License as published by the
8	# the Free Software Foundation, either version 3 of the License, or	8	# Free Software Foundation, either version 3 of the License, or (at your
9	# (at your 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 GNU General Public License	16	# You should have received a copy of the Affero GNU General Public License
17	# along with this program. If not, see <http://www.gnu.org/licenses/>.	17	# and the GNU General Public License along with this program. If not, see
		18	# <http://www.gnu.org/licenses/>.
18	#	19	#
19	# 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>
20	#	21	#
21		22
22	package cf;	23	package cf;
23		24
24	use 5.10.0;	25	use common::sense;
25	use utf8;
26	use strict "vars", "subs";
27		26
28	use Symbol;	27	use Symbol;
29	use List::Util;	28	use List::Util;
30	use Socket;	29	use Socket;
31	use EV;	30	use EV;
32	use Opcode;	31	use Opcode;
33	use Safe;	32	use Safe;
34	use Safe::Hole;	33	use Safe::Hole;
35	use Storable ();	34	use Storable ();
		35	use Carp ();
36		36
		37	use Guard ();
37	use Coro ();	38	use Coro ();
38	use Coro::State;	39	use Coro::State;
39	use Coro::Handle;	40	use Coro::Handle;
40	use Coro::EV;	41	use Coro::EV;
41	use Coro::AnyEvent;	42	use Coro::AnyEvent;
42	use Coro::Timer;	43	use Coro::Timer;
43	use Coro::Signal;	44	use Coro::Signal;
44	use Coro::Semaphore;	45	use Coro::Semaphore;
		46	use Coro::SemaphoreSet;
45	use Coro::AnyEvent;	47	use Coro::AnyEvent;
46	use Coro::AIO;	48	use Coro::AIO;
47	use Coro::BDB 1.6;	49	use Coro::BDB 1.6;
48	use Coro::Storable;	50	use Coro::Storable;
49	use Coro::Util ();	51	use Coro::Util ();
50		52
51	use JSON::XS 2.01 ();	53	use JSON::XS 2.01 ();
52	use BDB ();	54	use BDB ();
53	use Data::Dumper;	55	use Data::Dumper;
54	use Digest::MD5;
55	use Fcntl;	56	use Fcntl;
56	use YAML ();	57	use YAML::XS ();
57	use IO::AIO ();	58	use IO::AIO ();
58	use Time::HiRes;	59	use Time::HiRes;
59	use Compress::LZF;	60	use Compress::LZF;
60	use Digest::MD5 ();	61	use Digest::MD5 ();
61		62
…		…
70		71
71	# make sure c-lzf reinitialises itself	72	# make sure c-lzf reinitialises itself
72	Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";	73	Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
73	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later	74	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
74		75
		76	# strictly for debugging
		77	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
		78
75	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	79	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
		80
		81	our @ORIG_INC;
76		82
77	our %COMMAND = ();	83	our %COMMAND = ();
78	our %COMMAND_TIME = ();	84	our %COMMAND_TIME = ();
79		85
80	our @EXTS = (); # list of extension package names	86	our @EXTS = (); # list of extension package names
…		…
83	our %EXT_CORO = (); # coroutines bound to extensions	89	our %EXT_CORO = (); # coroutines bound to extensions
84	our %EXT_MAP = (); # pluggable maps	90	our %EXT_MAP = (); # pluggable maps
85		91
86	our $RELOAD; # number of reloads so far, non-zero while in reload	92	our $RELOAD; # number of reloads so far, non-zero while in reload
87	our @EVENT;	93	our @EVENT;
		94	our @REFLECT; # set by XS
		95	our %REFLECT; # set by us
88		96
89	our $CONFDIR = confdir;	97	our $CONFDIR = confdir;
		98
90	our $DATADIR = datadir;	99	our $DATADIR = datadir;
91	our $LIBDIR = "$DATADIR/ext";	100	our $LIBDIR = "$DATADIR/ext";
92	our $PODDIR = "$DATADIR/pod";	101	our $PODDIR = "$DATADIR/pod";
93	our $MAPDIR = "$DATADIR/" . mapdir;	102	our $MAPDIR = "$DATADIR/" . mapdir;
		103
94	our $LOCALDIR = localdir;	104	our $LOCALDIR = localdir;
95	our $TMPDIR = "$LOCALDIR/" . tmpdir;	105	our $TMPDIR = "$LOCALDIR/" . tmpdir;
96	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	106	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
97	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	107	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
98	our $RANDOMDIR = "$LOCALDIR/random";	108	our $RANDOMDIR = "$LOCALDIR/random";
99	our $BDBDIR = "$LOCALDIR/db";	109	our $BDBDIR = "$LOCALDIR/db";
100	our $PIDFILE = "$LOCALDIR/pid";	110	our $PIDFILE = "$LOCALDIR/pid";
101	our $RUNTIMEFILE = "$LOCALDIR/runtime";	111	our $RUNTIMEFILE = "$LOCALDIR/runtime";
102		112
103	our %RESOURCE;	113	#our %RESOURCE; # unused
		114
		115	our $OUTPUT_RATE_MIN = 3000;
		116	our $OUTPUT_RATE_MAX = 1000000;
		117
		118	our $MAX_LINKS = 32; # how many chained exits to follow
		119	our $VERBOSE_IO = 1;
104		120
105	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	121	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
106	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	122	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
107	our $NEXT_TICK;	123	our $NEXT_TICK;
108	our $USE_FSYNC = 1; # use fsync to write maps - default off	124	our $USE_FSYNC = 1; # use fsync to write maps - default on
109		125
110	our $BDB_DEADLOCK_WATCHER;	126	our $BDB_DEADLOCK_WATCHER;
111	our $BDB_CHECKPOINT_WATCHER;	127	our $BDB_CHECKPOINT_WATCHER;
112	our $BDB_TRICKLE_WATCHER;	128	our $BDB_TRICKLE_WATCHER;
113	our $DB_ENV;	129	our $DB_ENV;
114		130
		131	our @EXTRA_MODULES = qw(pod match mapscript incloader);
		132
115	our %CFG;	133	our %CFG;
116		134
117	our $UPTIME; $UPTIME ||= time;	135	our $UPTIME; $UPTIME ||= time;
118	our $RUNTIME;	136	our $RUNTIME = 0;
		137	our $SERVER_TICK = 0;
119	our $NOW;	138	our $NOW;
120		139
121	our (%PLAYER, %PLAYER_LOADING); # all users	140	our (%PLAYER, %PLAYER_LOADING); # all users
122	our (%MAP, %MAP_LOADING ); # all maps	141	our (%MAP, %MAP_LOADING ); # all maps
123	our $LINK_MAP; # the special {link} map, which is always available	142	our $LINK_MAP; # the special {link} map, which is always available
…		…
127		146
128	our $LOAD; # a number between 0 (idle) and 1 (too many objects)	147	our $LOAD; # a number between 0 (idle) and 1 (too many objects)
129	our $LOADAVG; # same thing, but with alpha-smoothing	148	our $LOADAVG; # same thing, but with alpha-smoothing
130	our $JITTER; # average jitter	149	our $JITTER; # average jitter
131	our $TICK_START; # for load detecting purposes	150	our $TICK_START; # for load detecting purposes
		151
		152	our @POST_INIT;
		153
		154	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
		155	our $REALLY_UNLOOP; # never set to true, please :)
		156
		157	our $WAIT_FOR_TICK = new Coro::Signal;
		158	our @WAIT_FOR_TICK_BEGIN;
132		159
133	binmode STDOUT;	160	binmode STDOUT;
134	binmode STDERR;	161	binmode STDERR;
135		162
136	# read virtual server time, if available	163	# read virtual server time, if available
…		…
138	open my $fh, "<", $RUNTIMEFILE	165	open my $fh, "<", $RUNTIMEFILE
139	or die "unable to read $RUNTIMEFILE file: $!";	166	or die "unable to read $RUNTIMEFILE file: $!";
140	$RUNTIME = <$fh> + 0.;	167	$RUNTIME = <$fh> + 0.;
141	}	168	}
142		169
		170	eval "sub TICK() { $TICK } 1" or die;
		171
143	mkdir $_	172	mkdir $_
144	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;	173	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
145		174
146	our $EMERGENCY_POSITION;	175	our $EMERGENCY_POSITION;
147		176
148	sub cf::map::normalise;	177	sub cf::map::normalise;
149		178
		179	sub in_main() {
		180	$Coro::current == $Coro::main
		181	}
		182
150	#############################################################################	183	#############################################################################
151		184
		185	%REFLECT = ();
		186	for (@REFLECT) {
		187	my $reflect = JSON::XS::decode_json $_;
		188	$REFLECT{$reflect->{class}} = $reflect;
		189	}
		190
		191	# this is decidedly evil
		192	$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
		193
		194	#############################################################################
		195
152	=head2 GLOBAL VARIABLES	196	=head2 GLOBAL VARIABLES
153		197
154	=over 4	198	=over 4
155		199
156	=item $cf::UPTIME	200	=item $cf::UPTIME
157		201
158	The timestamp of the server start (so not actually an uptime).	202	The timestamp of the server start (so not actually an "uptime").
		203
		204	=item $cf::SERVER_TICK
		205
		206	An unsigned integer that starts at zero when the server is started and is
		207	incremented on every tick.
		208
		209	=item $cf::NOW
		210
		211	The (real) time of the last (current) server tick - updated before and
		212	after tick processing, so this is useful only as a rough "what time is it
		213	now" estimate.
		214
		215	=item $cf::TICK
		216
		217	The interval between each server tick, in seconds.
159		218
160	=item $cf::RUNTIME	219	=item $cf::RUNTIME
161		220
162	The time this server has run, starts at 0 and is increased by $cf::TICK on	221	The time this server has run, starts at 0 and is increased by $cf::TICK on
163	every server tick.	222	every server tick.
…		…
169	Various directories - "/etc", read-only install directory, perl-library	228	Various directories - "/etc", read-only install directory, perl-library
170	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	229	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
171	unique-items directory, player file directory, random maps directory and	230	unique-items directory, player file directory, random maps directory and
172	database environment.	231	database environment.
173		232
174	=item $cf::NOW
175
176	The time of the last (current) server tick.
177
178	=item $cf::TICK
179
180	The interval between server ticks, in seconds.
181
182	=item $cf::LOADAVG	233	=item $cf::LOADAVG
183		234
184	The current CPU load on the server (alpha-smoothed), as a value between 0	235	The current CPU load on the server (alpha-smoothed), as a value between 0
185	(none) and 1 (overloaded), indicating how much time is spent on processing	236	(none) and 1 (overloaded), indicating how much time is spent on processing
186	objects per tick. Healthy values are < 0.5.	237	objects per tick. Healthy values are < 0.5.
…		…
195	from wherever your confdir points to.	246	from wherever your confdir points to.
196		247
197	=item cf::wait_for_tick, cf::wait_for_tick_begin	248	=item cf::wait_for_tick, cf::wait_for_tick_begin
198		249
199	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	250	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
200	returns directly I<after> the tick processing (and consequently, can only wake one process	251	returns directly I<after> the tick processing (and consequently, can only wake one thread
201	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	252	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
202		253
		254	Note that cf::Wait_for_tick will immediately return when the server is not
		255	ticking, making it suitable for small pauses in threads that need to run
		256	when the server is paused. If that is not applicable (i.e. you I<really>
		257	want to wait, use C<$cf::WAIT_FOR_TICK>).
		258
		259	=item $cf::WAIT_FOR_TICK
		260
		261	Note that C<cf::wait_for_tick> is probably the correct thing to use. This
		262	variable contains a L<Coro::Signal> that is broadcats after every server
		263	tick. Calling C<< ->wait >> on it will suspend the caller until after the
		264	next server tick.
		265
		266	=cut
		267
		268	sub wait_for_tick();
		269	sub wait_for_tick_begin();
		270
203	=item @cf::INVOKE_RESULTS	271	=item @cf::INVOKE_RESULTS
204		272
205	This array contains the results of the last C<invoke ()> call. When	273	This array contains the results of the last C<invoke ()> call. When
206	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of	274	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
207	that call.	275	that call.
208		276
		277	=item %cf::REFLECT
		278
		279	Contains, for each (C++) class name, a hash reference with information
		280	about object members (methods, scalars, arrays and flags) and other
		281	metadata, which is useful for introspection.
		282
209	=back	283	=back
210		284
211	=cut	285	=cut
212		286
213	BEGIN {	287	sub error(@) { LOG llevError, join "", @_ }
214	*CORE::GLOBAL::warn = sub {	288	sub warn (@) { LOG llevWarn , join "", @_ }
		289	sub info (@) { LOG llevInfo , join "", @_ }
		290	sub debug(@) { LOG llevDebug, join "", @_ }
		291	sub trace(@) { LOG llevTrace, join "", @_ }
		292
		293	$Coro::State::WARNHOOK = sub {
215	my $msg = join "", @_;	294	my $msg = join "", @_;
216		295
217	$msg .= "\n"	296	$msg .= "\n"
218	unless $msg =~ /\n$/;	297	unless $msg =~ /\n$/;
219		298
220	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	299	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
221		300
222	LOG llevError, $msg;	301	LOG llevWarn, $msg;
223	};	302	};
224	}
225		303
226	$Coro::State::DIEHOOK = sub {	304	$Coro::State::DIEHOOK = sub {
227	return unless $^S eq 0; # "eq", not "=="	305	return unless $^S eq 0; # "eq", not "=="
228		306
229	if ($Coro::current == $Coro::main) {#d#	307	error Carp::longmess $_[0];
		308
		309	if (in_main) {#d#
230	warn "DIEHOOK called in main context, Coro bug?\n";#d#	310	error "DIEHOOK called in main context, Coro bug?\n";#d#
231	return;#d#	311	return;#d#
232	}#d#	312	}#d#
233		313
234	# kill coroutine otherwise	314	# kill coroutine otherwise
235	warn Carp::longmess $_[0];
236	Coro::terminate	315	Coro::terminate
237	};	316	};
238
239	$SIG{__DIE__} = sub { }; #d#?
240		317
241	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	318	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
242	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	319	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
243	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	320	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
244	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	321	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
…		…
258	)) {	335	)) {
259	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	336	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
260	}	337	}
261		338
262	$EV::DIED = sub {	339	$EV::DIED = sub {
263	warn "error in event callback: @_";	340	Carp::cluck "error in event callback: @_";
264	};	341	};
		342
		343	#############################################################################
		344
		345	sub fork_call(&@);
		346	sub get_slot($;$$);
265		347
266	#############################################################################	348	#############################################################################
267		349
268	=head2 UTILITY FUNCTIONS	350	=head2 UTILITY FUNCTIONS
269		351
…		…
290	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	372	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
291	$d	373	$d
292	} || "[unable to dump $_[0]: '$@']";	374	} || "[unable to dump $_[0]: '$@']";
293	}	375	}
294		376
		377	=item $scalar = load_file $path
		378
		379	Loads the given file from path and returns its contents. Croaks on error
		380	and can block.
		381
		382	=cut
		383
		384	sub load_file($) {
		385	0 <= aio_load $_[0], my $data
		386	or Carp::croak "$_[0]: $!";
		387
		388	$data
		389	}
		390
295	=item $ref = cf::decode_json $json	391	=item $ref = cf::decode_json $json
296		392
297	Converts a JSON string into the corresponding perl data structure.	393	Converts a JSON string into the corresponding perl data structure.
298		394
299	=item $json = cf::encode_json $ref	395	=item $json = cf::encode_json $ref
…		…
305	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	401	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
306		402
307	sub encode_json($) { $json_coder->encode ($_[0]) }	403	sub encode_json($) { $json_coder->encode ($_[0]) }
308	sub decode_json($) { $json_coder->decode ($_[0]) }	404	sub decode_json($) { $json_coder->decode ($_[0]) }
309		405
		406	=item $ref = cf::decode_storable $scalar
		407
		408	Same as Coro::Storable::thaw, so blocks.
		409
		410	=cut
		411
		412	BEGIN { *decode_storable = \&Coro::Storable::thaw }
		413
		414	=item $ref = cf::decode_yaml $scalar
		415
		416	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
		417
		418	=cut
		419
		420	sub decode_yaml($) {
		421	fork_call { YAML::XS::Load $_[0] } @_
		422	}
		423
		424	=item $scalar = cf::unlzf $scalar
		425
		426	Same as Compress::LZF::compress, but takes server ticks into account, so
		427	blocks.
		428
		429	=cut
		430
		431	sub unlzf($) {
		432	# we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
		433	cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
		434	Compress::LZF::decompress $_[0]
		435	}
		436
		437	=item cf::post_init { BLOCK }
		438
		439	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
		440	but I<before> the server starts ticking again.
		441
		442	The codeblock will have a single boolean argument to indicate whether this
		443	is a reload or not.
		444
		445	=cut
		446
		447	sub post_init(&) {
		448	push @POST_INIT, shift;
		449	}
		450
		451	sub _post_init {
		452	trace "running post_init jobs";
		453
		454	# run them in parallel...
		455
		456	my @join;
		457
		458	while () {
		459	push @join, map &Coro::async ($_, 0), @POST_INIT;
		460	@POST_INIT = ();
		461
		462	@join or last;
		463
		464	(pop @join)->join;
		465	}
		466	}
		467
310	=item cf::lock_wait $string	468	=item cf::lock_wait $string
311		469
312	Wait until the given lock is available. See cf::lock_acquire.	470	Wait until the given lock is available. See cf::lock_acquire.
313		471
314	=item my $lock = cf::lock_acquire $string	472	=item my $lock = cf::lock_acquire $string
315		473
316	Wait until the given lock is available and then acquires it and returns	474	Wait until the given lock is available and then acquires it and returns
317	a Coro::guard object. If the guard object gets destroyed (goes out of scope,	475	a L<Guard> object. If the guard object gets destroyed (goes out of scope,
318	for example when the coroutine gets canceled), the lock is automatically	476	for example when the coroutine gets canceled), the lock is automatically
319	returned.	477	returned.
320		478
321	Locks are *not* recursive, locking from the same coro twice results in a	479	Locks are *not* recursive, locking from the same coro twice results in a
322	deadlocked coro.	480	deadlocked coro.
…		…
328		486
329	Return true if the lock is currently active, i.e. somebody has locked it.	487	Return true if the lock is currently active, i.e. somebody has locked it.
330		488
331	=cut	489	=cut
332		490
333	our %LOCK;	491	our $LOCKS = new Coro::SemaphoreSet;
334	our %LOCKER;#d#
335		492
336	sub lock_wait($) {	493	sub lock_wait($) {
337	my ($key) = @_;	494	$LOCKS->wait ($_[0]);
338
339	if ($LOCKER{$key} == $Coro::current) {#d#
340	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
341	return;#d#
342	}#d#
343
344	# wait for lock, if any
345	while ($LOCK{$key}) {
346	#local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
347	push @{ $LOCK{$key} }, $Coro::current;
348	Coro::schedule;
349	}
350	}	495	}
351		496
352	sub lock_acquire($) {	497	sub lock_acquire($) {
353	my ($key) = @_;	498	$LOCKS->guard ($_[0])
354
355	# wait, to be sure we are not locked
356	lock_wait $key;
357
358	$LOCK{$key} = [];
359	$LOCKER{$key} = $Coro::current;#d#
360
361	Coro::guard {
362	delete $LOCKER{$key};#d#
363	# wake up all waiters, to be on the safe side
364	$_->ready for @{ delete $LOCK{$key} };
365	}
366	}	499	}
367		500
368	sub lock_active($) {	501	sub lock_active($) {
369	my ($key) = @_;	502	$LOCKS->count ($_[0]) < 1
370
371	! ! $LOCK{$key}
372	}	503	}
373		504
374	sub freeze_mainloop {	505	sub freeze_mainloop {
375	tick_inhibit_inc;	506	tick_inhibit_inc;
376		507
377	Coro::guard \&tick_inhibit_dec;	508	&Guard::guard (\&tick_inhibit_dec);
378	}	509	}
379		510
380	=item cf::periodic $interval, $cb	511	=item cf::periodic $interval, $cb
381		512
382	Like EV::periodic, but randomly selects a starting point so that the actions	513	Like EV::periodic, but randomly selects a starting point so that the actions
383	get spread over timer.	514	get spread over time.
384		515
385	=cut	516	=cut
386		517
387	sub periodic($$) {	518	sub periodic($$) {
388	my ($interval, $cb) = @_;	519	my ($interval, $cb) = @_;
…		…
392	EV::periodic $start, $interval, 0, $cb	523	EV::periodic $start, $interval, 0, $cb
393	}	524	}
394		525
395	=item cf::get_slot $time[, $priority[, $name]]	526	=item cf::get_slot $time[, $priority[, $name]]
396		527
397	Allocate $time seconds of blocking CPU time at priority C<$priority>:	528	Allocate $time seconds of blocking CPU time at priority C<$priority>
398	This call blocks and returns only when you have at least C<$time> seconds	529	(default: 0): This call blocks and returns only when you have at least
399	of cpu time till the next tick. The slot is only valid till the next cede.	530	C<$time> seconds of cpu time till the next tick. The slot is only valid
		531	till the next cede.
		532
		533	Background jobs should use a priority les than zero, interactive jobs
		534	should use 100 or more.
400		535
401	The optional C<$name> can be used to identify the job to run. It might be	536	The optional C<$name> can be used to identify the job to run. It might be
402	used for statistical purposes and should identify the same time-class.	537	used for statistical purposes and should identify the same time-class.
403		538
404	Useful for short background jobs.	539	Useful for short background jobs.
405		540
406	=cut	541	=cut
407		542
408	our @SLOT_QUEUE;	543	our @SLOT_QUEUE;
409	our $SLOT_QUEUE;	544	our $SLOT_QUEUE;
		545	our $SLOT_DECAY = 0.9;
410		546
411	$SLOT_QUEUE->cancel if $SLOT_QUEUE;	547	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
412	$SLOT_QUEUE = Coro::async {	548	$SLOT_QUEUE = Coro::async {
413	$Coro::current->desc ("timeslot manager");	549	$Coro::current->desc ("timeslot manager");
414		550
415	my $signal = new Coro::Signal;	551	my $signal = new Coro::Signal;
		552	my $busy;
416		553
417	while () {	554	while () {
418	next_job:	555	next_job:
		556
419	my $avail = cf::till_tick;	557	my $avail = cf::till_tick;
420	if ($avail > 0.01) {	558
421	for (0 .. $#SLOT_QUEUE) {	559	for (0 .. $#SLOT_QUEUE) {
422	if ($SLOT_QUEUE[$_][0] < $avail) {	560	if ($SLOT_QUEUE[$_][0] <= $avail) {
		561	$busy = 0;
423	my $job = splice @SLOT_QUEUE, $_, 1, ();	562	my $job = splice @SLOT_QUEUE, $_, 1, ();
424	$job->[2]->send;	563	$job->[2]->send;
425	Coro::cede;	564	Coro::cede;
426	goto next_job;	565	goto next_job;
427	}	566	} else {
		567	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
428	}	568	}
429	}	569	}
430		570
431	if (@SLOT_QUEUE) {	571	if (@SLOT_QUEUE) {
432	# we do not use wait_for_tick() as it returns immediately when tick is inactive	572	# we do not use wait_for_tick() as it returns immediately when tick is inactive
433	push @cf::WAIT_FOR_TICK, $signal;	573	$WAIT_FOR_TICK->wait;
434	$signal->wait;
435	} else {	574	} else {
		575	$busy = 0;
436	Coro::schedule;	576	Coro::schedule;
437	}	577	}
438	}	578	}
439	};	579	};
440		580
441	sub get_slot($;$$) {	581	sub get_slot($;$$) {
442	return if tick_inhibit || $Coro::current == $Coro::main;	582	return if tick_inhibit || $Coro::current == $Coro::main;
443		583
444	my ($time, $pri, $name) = @_;	584	my ($time, $pri, $name) = @_;
445		585
446	$time = $TICK * .6 if $time > $TICK * .6;	586	$time = clamp $time, 0.01, $TICK * .6;
		587
447	my $sig = new Coro::Signal;	588	my $sig = new Coro::Signal;
448		589
449	push @SLOT_QUEUE, [$time, $pri, $sig, $name];	590	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
450	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;	591	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
451	$SLOT_QUEUE->ready;	592	$SLOT_QUEUE->ready;
…		…
477	=cut	618	=cut
478		619
479	sub sync_job(&) {	620	sub sync_job(&) {
480	my ($job) = @_;	621	my ($job) = @_;
481		622
482	if ($Coro::current == $Coro::main) {	623	if (in_main) {
483	my $time = EV::time;	624	my $time = AE::time;
484		625
485	# this is the main coro, too bad, we have to block	626	# this is the main coro, too bad, we have to block
486	# till the operation succeeds, freezing the server :/	627	# till the operation succeeds, freezing the server :/
487		628
488	LOG llevError, Carp::longmess "sync job";#d#	629	#LOG llevError, Carp::longmess "sync job";#d#
489		630
490	my $freeze_guard = freeze_mainloop;	631	my $freeze_guard = freeze_mainloop;
491		632
492	my $busy = 1;	633	my $busy = 1;
493	my @res;	634	my @res;
494		635
495	(async {	636	(async {
496	$Coro::current->desc ("sync job coro");	637	$Coro::current->desc ("sync job coro");
497	@res = eval { $job->() };	638	@res = eval { $job->() };
498	warn $@ if $@;	639	error $@ if $@;
499	undef $busy;	640	undef $busy;
500	})->prio (Coro::PRIO_MAX);	641	})->prio (Coro::PRIO_MAX);
501		642
502	while ($busy) {	643	while ($busy) {
503	if (Coro::nready) {	644	if (Coro::nready) {
…		…
505	} else {	646	} else {
506	EV::loop EV::LOOP_ONESHOT;	647	EV::loop EV::LOOP_ONESHOT;
507	}	648	}
508	}	649	}
509		650
510	my $time = EV::time - $time;	651	my $time = AE::time - $time;
511		652
512	$TICK_START += $time; # do not account sync jobs to server load	653	$TICK_START += $time; # do not account sync jobs to server load
513		654
514	wantarray ? @res : $res[0]	655	wantarray ? @res : $res[0]
515	} else {	656	} else {
…		…
537	$EXT_CORO{$coro+0} = $coro;	678	$EXT_CORO{$coro+0} = $coro;
538		679
539	$coro	680	$coro
540	}	681	}
541		682
542	=item fork_call { }, $args	683	=item fork_call { }, @args
543		684
544	Executes the given code block with the given arguments in a seperate	685	Executes the given code block with the given arguments in a seperate
545	process, returning the results. Everything must be serialisable with	686	process, returning the results. Everything must be serialisable with
546	Coro::Storable. May, of course, block. Note that the executed sub may	687	Coro::Storable. May, of course, block. Note that the executed sub may
547	never block itself or use any form of event handling.	688	never block itself or use any form of event handling.
548		689
549	=cut	690	=cut
550		691
		692	sub post_fork {
		693	reset_signals;
		694	}
		695
551	sub fork_call(&@) {	696	sub fork_call(&@) {
552	my ($cb, @args) = @_;	697	my ($cb, @args) = @_;
553		698
554	# we seemingly have to make a local copy of the whole thing,	699	# we seemingly have to make a local copy of the whole thing,
555	# otherwise perl prematurely frees the stuff :/	700	# otherwise perl prematurely frees the stuff :/
556	# TODO: investigate and fix (likely this will be rather laborious)	701	# TODO: investigate and fix (likely this will be rather laborious)
557		702
558	my @res = Coro::Util::fork_eval {	703	my @res = Coro::Util::fork_eval {
559	reset_signals;	704	cf::post_fork;
560	&$cb	705	&$cb
561	}, @args;	706	} @args;
562		707
563	wantarray ? @res : $res[-1]	708	wantarray ? @res : $res[-1]
		709	}
		710
		711	sub objinfo {
		712	(
		713	"counter value" => cf::object::object_count,
		714	"objects created" => cf::object::create_count,
		715	"objects destroyed" => cf::object::destroy_count,
		716	"freelist size" => cf::object::free_count,
		717	"allocated objects" => cf::object::objects_size,
		718	"active objects" => cf::object::actives_size,
		719	)
564	}	720	}
565		721
566	=item $coin = coin_from_name $name	722	=item $coin = coin_from_name $name
567		723
568	=cut	724	=cut
…		…
605	within each server.	761	within each server.
606		762
607	=cut	763	=cut
608		764
609	sub db_table($) {	765	sub db_table($) {
		766	cf::error "db_get called from main context"
		767	if $Coro::current == $Coro::main;
		768
610	my ($name) = @_;	769	my ($name) = @_;
611	my $db = BDB::db_create $DB_ENV;	770	my $db = BDB::db_create $DB_ENV;
612		771
613	eval {	772	eval {
614	$db->set_flags (BDB::CHKSUM);	773	$db->set_flags (BDB::CHKSUM);
…		…
624	}	783	}
625		784
626	our $DB;	785	our $DB;
627		786
628	sub db_init {	787	sub db_init {
629	cf::sync_job {
630	$DB ||= db_table "db";	788	$DB ||= db_table "db";
631	};
632	}	789	}
633		790
634	sub db_get($$) {	791	sub db_get($$) {
635	my $key = "$_[0]/$_[1]";	792	my $key = "$_[0]/$_[1]";
636		793
637	cf::sync_job {	794	cf::error "db_get called from main context"
		795	if $Coro::current == $Coro::main;
		796
638	BDB::db_get $DB, undef, $key, my $data;	797	BDB::db_get $DB, undef, $key, my $data;
639		798
640	$! ? ()	799	$! ? ()
641	: $data	800	: $data
642	}
643	}	801	}
644		802
645	sub db_put($$$) {	803	sub db_put($$$) {
646	BDB::dbreq_pri 4;	804	BDB::dbreq_pri 4;
647	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	805	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
675		833
676	my @data;	834	my @data;
677	my $md5;	835	my $md5;
678		836
679	for (0 .. $#$src) {	837	for (0 .. $#$src) {
680	0 <= aio_load $src->[$_], $data[$_]	838	$data[$_] = load_file $src->[$_];
681	or Carp::croak "$src->[$_]: $!";
682	}	839	}
683		840
684	# if processing is expensive, check	841	# if processing is expensive, check
685	# checksum first	842	# checksum first
686	if (1) {	843	if (1) {
…		…
703		860
704	my $t1 = Time::HiRes::time;	861	my $t1 = Time::HiRes::time;
705	my $data = $process->(\@data);	862	my $data = $process->(\@data);
706	my $t2 = Time::HiRes::time;	863	my $t2 = Time::HiRes::time;
707		864
708	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	865	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
709		866
710	db_put cache => "$id/data", $data;	867	db_put cache => "$id/data", $data;
711	db_put cache => "$id/md5" , $md5;	868	db_put cache => "$id/md5" , $md5;
712	db_put cache => "$id/meta", $meta;	869	db_put cache => "$id/meta", $meta;
713		870
…		…
723		880
724	=cut	881	=cut
725		882
726	sub datalog($@) {	883	sub datalog($@) {
727	my ($type, %kv) = @_;	884	my ($type, %kv) = @_;
728	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	885	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
729	}	886	}
730		887
731	=back	888	=back
732		889
733	=cut	890	=cut
…		…
928		1085
929	} elsif (exists $cb_id{$type}) {	1086	} elsif (exists $cb_id{$type}) {
930	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	1087	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
931		1088
932	} elsif (ref $type) {	1089	} elsif (ref $type) {
933	warn "attaching objects not supported, ignoring.\n";	1090	error "attaching objects not supported, ignoring.\n";
934		1091
935	} else {	1092	} else {
936	shift @arg;	1093	shift @arg;
937	warn "attach argument '$type' not supported, ignoring.\n";	1094	error "attach argument '$type' not supported, ignoring.\n";
938	}	1095	}
939	}	1096	}
940	}	1097	}
941		1098
942	sub _object_attach {	1099	sub _object_attach {
…		…
952	_attach $registry, $klass, @attach;	1109	_attach $registry, $klass, @attach;
953	}	1110	}
954		1111
955	$obj->{$name} = \%arg;	1112	$obj->{$name} = \%arg;
956	} else {	1113	} else {
957	warn "object uses attachment '$name' which is not available, postponing.\n";	1114	info "object uses attachment '$name' which is not available, postponing.\n";
958	}	1115	}
959		1116
960	$obj->{_attachment}{$name} = undef;	1117	$obj->{_attachment}{$name} = undef;
961	}	1118	}
962		1119
…		…
1021		1178
1022	for (@$callbacks) {	1179	for (@$callbacks) {
1023	eval { &{$_->[1]} };	1180	eval { &{$_->[1]} };
1024		1181
1025	if ($@) {	1182	if ($@) {
1026	warn "$@";
1027	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1183	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1028	override;	1184	override;
1029	}	1185	}
1030		1186
1031	return 1 if $override;	1187	return 1 if $override;
1032	}	1188	}
…		…
1111	for (@$attach) {	1267	for (@$attach) {
1112	my ($klass, @attach) = @$_;	1268	my ($klass, @attach) = @$_;
1113	_attach $registry, $klass, @attach;	1269	_attach $registry, $klass, @attach;
1114	}	1270	}
1115	} else {	1271	} else {
1116	warn "object uses attachment '$name' that is not available, postponing.\n";	1272	info "object uses attachment '$name' that is not available, postponing.\n";
1117	}	1273	}
1118	}	1274	}
1119	}	1275	}
1120		1276
1121	cf::attachable->attach (	1277	cf::attachable->attach (
…		…
1148	my ($filename, $rdata, $objs) = @_;	1304	my ($filename, $rdata, $objs) = @_;
1149		1305
1150	sync_job {	1306	sync_job {
1151	if (length $$rdata) {	1307	if (length $$rdata) {
1152	utf8::decode (my $decname = $filename);	1308	utf8::decode (my $decname = $filename);
1153	warn sprintf "saving %s (%d,%d)\n",	1309	trace sprintf "saving %s (%d,%d)\n",
1154	$decname, length $$rdata, scalar @$objs;	1310	$decname, length $$rdata, scalar @$objs
		1311	if $VERBOSE_IO;
1155		1312
1156	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1313	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1157	aio_chmod $fh, SAVE_MODE;	1314	aio_chmod $fh, SAVE_MODE;
1158	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1315	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1159	aio_fsync $fh if $cf::USE_FSYNC;	1316	if ($cf::USE_FSYNC) {
		1317	aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
		1318	aio_fsync $fh;
		1319	}
1160	aio_close $fh;	1320	aio_close $fh;
1161		1321
1162	if (@$objs) {	1322	if (@$objs) {
1163	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {	1323	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1164	aio_chmod $fh, SAVE_MODE;	1324	aio_chmod $fh, SAVE_MODE;
1165	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };	1325	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1166	aio_write $fh, 0, (length $data), $data, 0;	1326	aio_write $fh, 0, (length $data), $data, 0;
1167	aio_fsync $fh if $cf::USE_FSYNC;	1327	if ($cf::USE_FSYNC) {
		1328	aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
		1329	aio_fsync $fh;
		1330	}
1168	aio_close $fh;	1331	aio_close $fh;
1169	aio_rename "$filename.pst~", "$filename.pst";	1332	aio_rename "$filename.pst~", "$filename.pst";
1170	}	1333	}
1171	} else {	1334	} else {
1172	aio_unlink "$filename.pst";	1335	aio_unlink "$filename.pst";
1173	}	1336	}
1174		1337
1175	aio_rename "$filename~", $filename;	1338	aio_rename "$filename~", $filename;
		1339
		1340	$filename =~ s%/[^/]+$%%;
		1341	aio_pathsync $filename if $cf::USE_FSYNC;
1176	} else {	1342	} else {
1177	warn "FATAL: $filename~: $!\n";	1343	error "unable to save objects: $filename~: $!\n";
1178	}	1344	}
1179	} else {	1345	} else {
1180	aio_unlink $filename;	1346	aio_unlink $filename;
1181	aio_unlink "$filename.pst";	1347	aio_unlink "$filename.pst";
1182	}	1348	}
…		…
1206	my $st = eval { Coro::Storable::thaw $av };	1372	my $st = eval { Coro::Storable::thaw $av };
1207	$av = $st->{objs};	1373	$av = $st->{objs};
1208	}	1374	}
1209		1375
1210	utf8::decode (my $decname = $filename);	1376	utf8::decode (my $decname = $filename);
1211	warn sprintf "loading %s (%d,%d)\n",	1377	trace sprintf "loading %s (%d,%d)\n",
1212	$decname, length $data, scalar @{$av || []};	1378	$decname, length $data, scalar @{$av || []}
		1379	if $VERBOSE_IO;
1213		1380
1214	($data, $av)	1381	($data, $av)
1215	}	1382	}
1216		1383
1217	=head2 COMMAND CALLBACKS	1384	=head2 COMMAND CALLBACKS
…		…
1273	my ($name, $cb) = @_;	1440	my ($name, $cb) = @_;
1274		1441
1275	$EXTICMD{$name} = $cb;	1442	$EXTICMD{$name} = $cb;
1276	}	1443	}
1277		1444
		1445	use File::Glob ();
		1446
1278	cf::player->attach (	1447	cf::player->attach (
1279	on_command => sub {	1448	on_unknown_command => sub {
1280	my ($pl, $name, $params) = @_;	1449	my ($pl, $name, $params) = @_;
1281		1450
1282	my $cb = $COMMAND{$name}	1451	my $cb = $COMMAND{$name}
1283	or return;	1452	or return;
1284		1453
…		…
1292	my ($pl, $buf) = @_;	1461	my ($pl, $buf) = @_;
1293		1462
1294	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1463	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1295		1464
1296	if (ref $msg) {	1465	if (ref $msg) {
1297	my ($type, $reply, @payload) =	1466	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1298	"ARRAY" eq ref $msg
1299	? @$msg
1300	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1301		1467
1302	my @reply;	1468	my @reply;
1303		1469
1304	if (my $cb = $EXTCMD{$type}) {	1470	if (my $cb = $EXTCMD{$type}) {
1305	@reply = $cb->($pl, @payload);	1471	@reply = $cb->($pl, @payload);
…		…
1307		1473
1308	$pl->ext_reply ($reply, @reply)	1474	$pl->ext_reply ($reply, @reply)
1309	if $reply;	1475	if $reply;
1310		1476
1311	} else {	1477	} else {
1312	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1478	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1313	}	1479	}
1314		1480
1315	cf::override;	1481	cf::override;
1316	},	1482	},
1317	);	1483	);
1318		1484
		1485	# "readahead" all extensions
		1486	sub cache_extensions {
		1487	my $grp = IO::AIO::aio_group;
		1488
		1489	add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
		1490	for (grep /\.ext$/, @{$_[0]}) {
		1491	add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
		1492	}
		1493	};
		1494
		1495	$grp
		1496	}
		1497
1319	sub load_extensions {	1498	sub load_extensions {
		1499	info "loading extensions...";
		1500
1320	cf::sync_job {	1501	cf::sync_job {
1321	my %todo;	1502	my %todo;
1322		1503
1323	for my $path (<$LIBDIR/*.ext>) {	1504	for my $path (<$LIBDIR/*.ext>) {
1324	next unless -r $path;	1505	next unless -r $path;
…		…
1342		1523
1343	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1524	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1344	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1525	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1345		1526
1346	$ext{source} =	1527	$ext{source} =
1347	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1528	"package $pkg; use common::sense;\n"
1348	. "#line 1 \"$path\"\n{\n"	1529	. "#line 1 \"$path\"\n{\n"
1349	. $source	1530	. $source
1350	. "\n};\n1";	1531	. "\n};\n1";
1351		1532
1352	$todo{$base} = \%ext;	1533	$todo{$base} = \%ext;
1353	}	1534	}
1354		1535
		1536	my $pass = 0;
1355	my %done;	1537	my %done;
1356	while (%todo) {	1538	while (%todo) {
1357	my $progress;	1539	my $progress;
1358		1540
		1541	++$pass;
		1542
		1543	ext:
1359	while (my ($k, $v) = each %todo) {	1544	while (my ($k, $v) = each %todo) {
1360	for (split /,\s*/, $v->{meta}{depends}) {	1545	for (split /,\s*/, $v->{meta}{depends}) {
1361	goto skip	1546	next ext
1362	unless exists $done{$_};	1547	unless exists $done{$_};
1363	}	1548	}
1364		1549
1365	warn "... loading '$k' into '$v->{pkg}'\n";	1550	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1366		1551
1367	unless (eval $v->{source}) {	1552	my $active = eval $v->{source};
		1553
		1554	if (length $@) {
1368	my $msg = $@ ? "$v->{path}: $@\n"	1555	error "$v->{path}: $@\n";
1369	: "$v->{base}: extension inactive.\n";
1370		1556
1371	if (exists $v->{meta}{mandatory}) {
1372	warn $msg;
1373	cf::cleanup "mandatory extension failed to load, exiting.";	1557	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1374	}	1558	if exists $v->{meta}{mandatory};
1375		1559
1376	warn $msg;	1560	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
		1561	delete $todo{$k};
		1562	} else {
		1563	$done{$k} = delete $todo{$k};
		1564	push @EXTS, $v->{pkg};
		1565	$progress = 1;
		1566
		1567	info "$v->{base}: extension inactive.\n"
		1568	unless $active;
1377	}	1569	}
1378
1379	$done{$k} = delete $todo{$k};
1380	push @EXTS, $v->{pkg};
1381	$progress = 1;
1382	}	1570	}
1383		1571
1384	skip:	1572	unless ($progress) {
1385	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"	1573	warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1386	unless $progress;	1574
		1575	while (my ($k, $v) = each %todo) {
		1576	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
		1577	if exists $v->{meta}{mandatory};
		1578	}
		1579
		1580	last;
		1581	}
1387	}	1582	}
1388	};	1583	};
1389	}	1584	}
1390		1585
1391	#############################################################################	1586	#############################################################################
…		…
1445		1640
1446	sub exists($) {	1641	sub exists($) {
1447	my ($login) = @_;	1642	my ($login) = @_;
1448		1643
1449	$cf::PLAYER{$login}	1644	$cf::PLAYER{$login}
1450	or cf::sync_job { !aio_stat path $login }	1645	or !aio_stat path $login
1451	}	1646	}
1452		1647
1453	sub find($) {	1648	sub find($) {
1454	return $cf::PLAYER{$_[0]} || do {	1649	return $cf::PLAYER{$_[0]} || do {
1455	my $login = $_[0];	1650	my $login = $_[0];
…		…
1475	$cf::PLAYER{$login} = $pl	1670	$cf::PLAYER{$login} = $pl
1476	}	1671	}
1477	}	1672	}
1478	}	1673	}
1479		1674
		1675	cf::player->attach (
		1676	on_load => sub {
		1677	my ($pl, $path) = @_;
		1678
		1679	# restore slots saved in save, below
		1680	my $slots = delete $pl->{_slots};
		1681
		1682	$pl->ob->current_weapon ($slots->[0]);
		1683	$pl->combat_ob ($slots->[1]);
		1684	$pl->ranged_ob ($slots->[2]);
		1685	},
		1686	);
		1687
1480	sub save($) {	1688	sub save($) {
1481	my ($pl) = @_;	1689	my ($pl) = @_;
1482		1690
1483	return if $pl->{deny_save};	1691	return if $pl->{deny_save};
1484		1692
…		…
1489		1697
1490	aio_mkdir playerdir $pl, 0770;	1698	aio_mkdir playerdir $pl, 0770;
1491	$pl->{last_save} = $cf::RUNTIME;	1699	$pl->{last_save} = $cf::RUNTIME;
1492		1700
1493	cf::get_slot 0.01;	1701	cf::get_slot 0.01;
		1702
		1703	# save slots, to be restored later
		1704	local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1494		1705
1495	$pl->save_pl ($path);	1706	$pl->save_pl ($path);
1496	cf::cede_to_tick;	1707	cf::cede_to_tick;
1497	}	1708	}
1498		1709
…		…
1532	my $name = $pl->ob->name;	1743	my $name = $pl->ob->name;
1533		1744
1534	$pl->{deny_save} = 1;	1745	$pl->{deny_save} = 1;
1535	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1746	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1536		1747
1537	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1748	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1538	$pl->deactivate;	1749	$pl->deactivate;
		1750
1539	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1751	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1540	$pl->ob->check_score;
1541	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1752	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1753	ext::highscore::check ($pl->ob);
		1754
1542	$pl->ns->destroy if $pl->ns;	1755	$pl->ns->destroy if $pl->ns;
1543		1756
1544	my $path = playerdir $pl;	1757	my $path = playerdir $pl;
1545	my $temp = "$path~$cf::RUNTIME~deleting~";	1758	my $temp = "$path~$cf::RUNTIME~deleting~";
1546	aio_rename $path, $temp;	1759	aio_rename $path, $temp;
…		…
1600	\@logins	1813	\@logins
1601	}	1814	}
1602		1815
1603	=item $player->maps	1816	=item $player->maps
1604		1817
		1818	=item cf::player::maps $login
		1819
1605	Returns an arrayref of map paths that are private for this	1820	Returns an arrayref of map paths that are private for this
1606	player. May block.	1821	player. May block.
1607		1822
1608	=cut	1823	=cut
1609		1824
…		…
1671	=cut	1886	=cut
1672		1887
1673	sub find_by_path($) {	1888	sub find_by_path($) {
1674	my ($path) = @_;	1889	my ($path) = @_;
1675		1890
		1891	$path =~ s/^~[^\/]*//; # skip ~login
		1892
1676	my ($match, $specificity);	1893	my ($match, $specificity);
1677		1894
1678	for my $region (list) {	1895	for my $region (list) {
1679	if ($region->{match} && $path =~ $region->{match}) {	1896	if ($region->{match} && $path =~ $region->{match}) {
1680	($match, $specificity) = ($region, $region->specificity)	1897	($match, $specificity) = ($region, $region->specificity)
…		…
1708	sub generate_random_map {	1925	sub generate_random_map {
1709	my ($self, $rmp) = @_;	1926	my ($self, $rmp) = @_;
1710		1927
1711	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	1928	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1712		1929
1713	# mit "rum" bekleckern, nicht
1714	$self->_create_random_map (	1930	$self->_create_random_map ($rmp);
1715	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1716	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1717	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1718	$rmp->{exit_on_final_map},
1719	$rmp->{xsize}, $rmp->{ysize},
1720	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1721	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1722	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1723	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1724	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1725	(cf::region::find $rmp->{region}), $rmp->{custom}
1726	)
1727	}	1931	}
1728		1932
1729	=item cf::map->register ($regex, $prio)	1933	=item cf::map->register ($regex, $prio)
1730		1934
1731	Register a handler for the map path matching the given regex at the	1935	Register a handler for the map path matching the given regex at the
…		…
1736		1940
1737	sub register {	1941	sub register {
1738	my (undef, $regex, $prio) = @_;	1942	my (undef, $regex, $prio) = @_;
1739	my $pkg = caller;	1943	my $pkg = caller;
1740		1944
1741	no strict;
1742	push @{"$pkg\::ISA"}, __PACKAGE__;	1945	push @{"$pkg\::ISA"}, __PACKAGE__;
1743		1946
1744	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	1947	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1745	}	1948	}
1746		1949
1747	# also paths starting with '/'	1950	# also paths starting with '/'
1748	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	1951	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1749		1952
1750	sub thawer_merge {	1953	sub thawer_merge {
1751	my ($self, $merge) = @_;	1954	my ($self, $merge) = @_;
1752		1955
1753	# we have to keep some variables in memory intact	1956	# we have to keep some variables in memory intact
…		…
1758	}	1961	}
1759		1962
1760	sub normalise {	1963	sub normalise {
1761	my ($path, $base) = @_;	1964	my ($path, $base) = @_;
1762		1965
1763	$path = "$path"; # make sure its a string	1966	$path = "$path"; # make sure it's a string
1764		1967
1765	$path =~ s/\.map$//;	1968	$path =~ s/\.map$//;
1766		1969
1767	# map plan:	1970	# map plan:
1768	#	1971	#
…		…
1783	$base =~ s{[^/]+/?$}{};	1986	$base =~ s{[^/]+/?$}{};
1784	$path = "$base/$path";	1987	$path = "$base/$path";
1785	}	1988	}
1786		1989
1787	for ($path) {	1990	for ($path) {
1788	redo if s{//}{/};
1789	redo if s{/\.?/}{/};	1991	redo if s{/\.?/}{/};
1790	redo if s{/[^/]+/\.\./}{/};	1992	redo if s{/[^/]+/\.\./}{/};
1791	}	1993	}
1792		1994
1793	$path	1995	$path
…		…
1807	$self->init; # pass $1 etc.	2009	$self->init; # pass $1 etc.
1808	return $self;	2010	return $self;
1809	}	2011	}
1810	}	2012	}
1811		2013
1812	Carp::cluck "unable to resolve path '$path' (base '$base').";	2014	Carp::cluck "unable to resolve path '$path' (base '$base')";
1813	()	2015	()
1814	}	2016	}
1815		2017
		2018	# may re-bless or do other evil things
1816	sub init {	2019	sub init {
1817	my ($self) = @_;	2020	my ($self) = @_;
1818		2021
1819	$self	2022	$self
1820	}	2023	}
…		…
1851		2054
1852	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;	2055	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1853	"$UNIQUEDIR/$path"	2056	"$UNIQUEDIR/$path"
1854	}	2057	}
1855		2058
1856	# and all this just because we cannot iterate over
1857	# all maps in C++...
1858	sub change_all_map_light {
1859	my ($change) = @_;
1860
1861	$_->change_map_light ($change)
1862	for grep $_->outdoor, values %cf::MAP;
1863	}
1864
1865	sub decay_objects {	2059	sub decay_objects {
1866	my ($self) = @_;	2060	my ($self) = @_;
1867		2061
1868	return if $self->{deny_reset};	2062	return if $self->{deny_reset};
1869		2063
…		…
1894	$self->{load_path} = $path;	2088	$self->{load_path} = $path;
1895		2089
1896	1	2090	1
1897	}	2091	}
1898		2092
		2093	# used to laod the header of an original map
1899	sub load_header_orig {	2094	sub load_header_orig {
1900	my ($self) = @_;	2095	my ($self) = @_;
1901		2096
1902	$self->load_header_from ($self->load_path)	2097	$self->load_header_from ($self->load_path)
1903	}	2098	}
1904		2099
		2100	# used to laod the header of an instantiated map
1905	sub load_header_temp {	2101	sub load_header_temp {
1906	my ($self) = @_;	2102	my ($self) = @_;
1907		2103
1908	$self->load_header_from ($self->save_path)	2104	$self->load_header_from ($self->save_path)
1909	}	2105	}
1910		2106
		2107	# called after loading the header from an instantiated map
1911	sub prepare_temp {	2108	sub prepare_temp {
1912	my ($self) = @_;	2109	my ($self) = @_;
1913		2110
1914	$self->last_access ((delete $self->{last_access})	2111	$self->last_access ((delete $self->{last_access})
1915	|| $cf::RUNTIME); #d#	2112	|| $cf::RUNTIME); #d#
1916	# safety	2113	# safety
1917	$self->{instantiate_time} = $cf::RUNTIME	2114	$self->{instantiate_time} = $cf::RUNTIME
1918	if $self->{instantiate_time} > $cf::RUNTIME;	2115	if $self->{instantiate_time} > $cf::RUNTIME;
1919	}	2116	}
1920		2117
		2118	# called after loading the header from an original map
1921	sub prepare_orig {	2119	sub prepare_orig {
1922	my ($self) = @_;	2120	my ($self) = @_;
1923		2121
1924	$self->{load_original} = 1;	2122	$self->{load_original} = 1;
1925	$self->{instantiate_time} = $cf::RUNTIME;	2123	$self->{instantiate_time} = $cf::RUNTIME;
…		…
1949		2147
1950	sub find;	2148	sub find;
1951	sub find {	2149	sub find {
1952	my ($path, $origin) = @_;	2150	my ($path, $origin) = @_;
1953		2151
		2152	cf::cede_to_tick;
		2153
1954	$path = normalise $path, $origin && $origin->path;	2154	$path = normalise $path, $origin;
1955		2155
1956	cf::lock_wait "map_data:$path";#d#remove	2156	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1957	cf::lock_wait "map_find:$path";	2157	my $guard2 = cf::lock_acquire "map_find:$path";
1958		2158
1959	$cf::MAP{$path} || do {	2159	$cf::MAP{$path} || do {
1960	my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1961	my $guard2 = cf::lock_acquire "map_find:$path";
1962
1963	my $map = new_from_path cf::map $path	2160	my $map = new_from_path cf::map $path
1964	or return;	2161	or return;
1965		2162
1966	$map->{last_save} = $cf::RUNTIME;	2163	$map->{last_save} = $cf::RUNTIME;
1967		2164
…		…
1979		2176
1980	$cf::MAP{$path} = $map	2177	$cf::MAP{$path} = $map
1981	}	2178	}
1982	}	2179	}
1983		2180
1984	sub pre_load { }	2181	sub pre_load { }
1985	sub post_load { }	2182	#sub post_load { } # XS
1986		2183
1987	sub load {	2184	sub load {
1988	my ($self) = @_;	2185	my ($self) = @_;
1989		2186
1990	local $self->{deny_reset} = 1; # loading can take a long time	2187	local $self->{deny_reset} = 1; # loading can take a long time
…		…
1993		2190
1994	{	2191	{
1995	my $guard = cf::lock_acquire "map_data:$path";	2192	my $guard = cf::lock_acquire "map_data:$path";
1996		2193
1997	return unless $self->valid;	2194	return unless $self->valid;
1998	return unless $self->in_memory == cf::MAP_SWAPPED;	2195	return unless $self->state == cf::MAP_SWAPPED;
1999
2000	$self->in_memory (cf::MAP_LOADING);
2001		2196
2002	$self->alloc;	2197	$self->alloc;
2003		2198
2004	$self->pre_load;	2199	$self->pre_load;
2005	cf::cede_to_tick;	2200	cf::cede_to_tick;
2006		2201
		2202	if (exists $self->{load_path}) {
2007	my $f = new_from_file cf::object::thawer $self->{load_path};	2203	my $f = new_from_file cf::object::thawer $self->{load_path};
2008	$f->skip_block;	2204	$f->skip_block;
2009	$self->_load_objects ($f)	2205	$self->_load_objects ($f)
2010	or return;	2206	or return;
2011		2207
2012	$self->post_load_original	2208	$self->post_load_original
2013	if delete $self->{load_original};	2209	if delete $self->{load_original};
2014		2210
2015	if (my $uniq = $self->uniq_path) {	2211	if (my $uniq = $self->uniq_path) {
2016	utf8::encode $uniq;	2212	utf8::encode $uniq;
2017	unless (aio_stat $uniq) {	2213	unless (aio_stat $uniq) {
2018	if (my $f = new_from_file cf::object::thawer $uniq) {	2214	if (my $f = new_from_file cf::object::thawer $uniq) {
2019	$self->clear_unique_items;	2215	$self->clear_unique_items;
2020	$self->_load_objects ($f);	2216	$self->_load_objects ($f);
2021	$f->resolve_delayed_derefs;	2217	$f->resolve_delayed_derefs;
		2218	}
2022	}	2219	}
2023	}	2220	}
2024	}
2025		2221
2026	$f->resolve_delayed_derefs;	2222	$f->resolve_delayed_derefs;
		2223	} else {
		2224	$self->post_load_original
		2225	if delete $self->{load_original};
		2226	}
		2227
		2228	$self->state (cf::MAP_INACTIVE);
2027		2229
2028	cf::cede_to_tick;	2230	cf::cede_to_tick;
2029	# now do the right thing for maps	2231	# now do the right thing for maps
2030	$self->link_multipart_objects;	2232	$self->link_multipart_objects;
2031	$self->difficulty ($self->estimate_difficulty)	2233	$self->difficulty ($self->estimate_difficulty)
…		…
2035	unless ($self->{deny_activate}) {	2237	unless ($self->{deny_activate}) {
2036	$self->decay_objects;	2238	$self->decay_objects;
2037	$self->fix_auto_apply;	2239	$self->fix_auto_apply;
2038	$self->update_buttons;	2240	$self->update_buttons;
2039	cf::cede_to_tick;	2241	cf::cede_to_tick;
2040	$self->set_darkness_map;	2242	#$self->activate; # no longer activate maps automatically
2041	cf::cede_to_tick;
2042	$self->activate;
2043	}	2243	}
2044		2244
2045	$self->{last_save} = $cf::RUNTIME;	2245	$self->{last_save} = $cf::RUNTIME;
2046	$self->last_access ($cf::RUNTIME);	2246	$self->last_access ($cf::RUNTIME);
2047
2048	$self->in_memory (cf::MAP_ACTIVE);
2049	}	2247	}
2050		2248
2051	$self->post_load;	2249	$self->post_load;
2052	}
2053		2250
		2251	1
		2252	}
		2253
		2254	# customize the map for a given player, i.e.
		2255	# return the _real_ map. used by e.g. per-player
		2256	# maps to change the path to ~playername/mappath
2054	sub customise_for {	2257	sub customise_for {
2055	my ($self, $ob) = @_;	2258	my ($self, $ob) = @_;
2056		2259
2057	return find "~" . $ob->name . "/" . $self->{path}	2260	return find "~" . $ob->name . "/" . $self->{path}
2058	if $self->per_player;	2261	if $self->per_player;
…		…
2061	# if $self->per_party;	2264	# if $self->per_party;
2062		2265
2063	$self	2266	$self
2064	}	2267	}
2065		2268
2066	# find and load all maps in the 3x3 area around a map
2067	sub load_neighbours {
2068	my ($map) = @_;
2069
2070	my @neigh; # diagonal neighbours
2071
2072	for (0 .. 3) {
2073	my $neigh = $map->tile_path ($_)
2074	or next;
2075	$neigh = find $neigh, $map
2076	or next;
2077	$neigh->load;
2078
2079	push @neigh,
2080	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2081	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2082	}
2083
2084	for (grep defined $_->[0], @neigh) {
2085	my ($path, $origin) = @$_;
2086	my $neigh = find $path, $origin
2087	or next;
2088	$neigh->load;
2089	}
2090	}
2091
2092	sub find_sync {	2269	sub find_sync {
2093	my ($path, $origin) = @_;	2270	my ($path, $origin) = @_;
2094		2271
2095	cf::sync_job { find $path, $origin }	2272	# it's a bug to call this from the main context
		2273	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
		2274	if $Coro::current == $Coro::main;
		2275
		2276	find $path, $origin
2096	}	2277	}
2097		2278
2098	sub do_load_sync {	2279	sub do_load_sync {
2099	my ($map) = @_;	2280	my ($map) = @_;
2100		2281
		2282	# it's a bug to call this from the main context
2101	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2283	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2102	if $Coro::current == $Coro::main;	2284	if $Coro::current == $Coro::main;
2103		2285
2104	cf::sync_job { $map->load };	2286	$map->load;
2105	}	2287	}
2106		2288
2107	our %MAP_PREFETCH;	2289	our %MAP_PREFETCH;
2108	our $MAP_PREFETCHER = undef;	2290	our $MAP_PREFETCHER = undef;
2109		2291
2110	sub find_async {	2292	sub find_async {
2111	my ($path, $origin, $load) = @_;	2293	my ($path, $origin, $load) = @_;
2112		2294
2113	$path = normalise $path, $origin && $origin->{path};	2295	$path = normalise $path, $origin;
2114		2296
2115	if (my $map = $cf::MAP{$path}) {	2297	if (my $map = $cf::MAP{$path}) {
2116	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2298	return $map if !$load || $map->linkable;
2117	}	2299	}
2118		2300
2119	$MAP_PREFETCH{$path} |= $load;	2301	$MAP_PREFETCH{$path} |= $load;
2120		2302
2121	$MAP_PREFETCHER ||= cf::async {	2303	$MAP_PREFETCHER ||= cf::async {
…		…
2135	$MAP_PREFETCHER->prio (6);	2317	$MAP_PREFETCHER->prio (6);
2136		2318
2137	()	2319	()
2138	}	2320	}
2139		2321
		2322	# common code, used by both ->save and ->swapout
2140	sub save {	2323	sub _save {
2141	my ($self) = @_;	2324	my ($self) = @_;
2142
2143	my $lock = cf::lock_acquire "map_data:$self->{path}";
2144		2325
2145	$self->{last_save} = $cf::RUNTIME;	2326	$self->{last_save} = $cf::RUNTIME;
2146		2327
2147	return unless $self->dirty;	2328	return unless $self->dirty;
2148		2329
…		…
2168	} else {	2349	} else {
2169	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);	2350	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2170	}	2351	}
2171	}	2352	}
2172		2353
		2354	sub save {
		2355	my ($self) = @_;
		2356
		2357	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2358
		2359	$self->_save;
		2360	}
		2361
2173	sub swap_out {	2362	sub swap_out {
2174	my ($self) = @_;	2363	my ($self) = @_;
2175		2364
2176	# save first because save cedes
2177	$self->save;
2178
2179	my $lock = cf::lock_acquire "map_data:$self->{path}";	2365	my $lock = cf::lock_acquire "map_data:$self->{path}";
2180		2366
		2367	return if !$self->linkable;
		2368	return if $self->{deny_save};
2181	return if $self->players;	2369	return if $self->players;
2182	return if $self->in_memory != cf::MAP_ACTIVE;	2370
		2371	# first deactivate the map and "unlink" it from the core
		2372	$self->deactivate;
		2373	$_->clear_links_to ($self) for values %cf::MAP;
		2374	$self->state (cf::MAP_SWAPPED);
		2375
		2376	# then atomically save
		2377	$self->_save;
		2378
		2379	# then free the map
		2380	$self->clear;
		2381	}
		2382
		2383	sub reset_at {
		2384	my ($self) = @_;
		2385
		2386	# TODO: safety, remove and allow resettable per-player maps
2183	return if $self->{deny_save};	2387	return 1e99 if $self->{deny_reset};
2184		2388
		2389	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
		2390	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
		2391
		2392	$time + $to
		2393	}
		2394
		2395	sub should_reset {
		2396	my ($self) = @_;
		2397
		2398	$self->reset_at <= $cf::RUNTIME
		2399	}
		2400
		2401	sub reset {
		2402	my ($self) = @_;
		2403
		2404	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2405
		2406	return if $self->players;
		2407
		2408	cf::trace "resetting map ", $self->path, "\n";
		2409
2185	$self->in_memory (cf::MAP_SWAPPED);	2410	$self->state (cf::MAP_SWAPPED);
		2411
		2412	# need to save uniques path
		2413	unless ($self->{deny_save}) {
		2414	my $uniq = $self->uniq_path; utf8::encode $uniq;
		2415
		2416	$self->_save_objects ($uniq, cf::IO_UNIQUES)
		2417	if $uniq;
		2418	}
		2419
		2420	delete $cf::MAP{$self->path};
2186		2421
2187	$self->deactivate;	2422	$self->deactivate;
2188	$_->clear_links_to ($self) for values %cf::MAP;	2423	$_->clear_links_to ($self) for values %cf::MAP;
2189	$self->clear;	2424	$self->clear;
2190	}
2191
2192	sub reset_at {
2193	my ($self) = @_;
2194
2195	# TODO: safety, remove and allow resettable per-player maps
2196	return 1e99 if $self->{deny_reset};
2197
2198	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2199	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2200
2201	$time + $to
2202	}
2203
2204	sub should_reset {
2205	my ($self) = @_;
2206
2207	$self->reset_at <= $cf::RUNTIME
2208	}
2209
2210	sub reset {
2211	my ($self) = @_;
2212
2213	my $lock = cf::lock_acquire "map_data:$self->{path}";
2214
2215	return if $self->players;
2216
2217	warn "resetting map ", $self->path;
2218
2219	$self->in_memory (cf::MAP_SWAPPED);
2220
2221	# need to save uniques path
2222	unless ($self->{deny_save}) {
2223	my $uniq = $self->uniq_path; utf8::encode $uniq;
2224
2225	$self->_save_objects ($uniq, cf::IO_UNIQUES)
2226	if $uniq;
2227	}
2228
2229	delete $cf::MAP{$self->path};
2230
2231	$self->deactivate;
2232	$_->clear_links_to ($self) for values %cf::MAP;
2233	$self->clear;
2234		2425
2235	$self->unlink_save;	2426	$self->unlink_save;
2236	$self->destroy;	2427	$self->destroy;
2237	}	2428	}
2238		2429
…		…
2246		2437
2247	delete $cf::MAP{$self->path};	2438	delete $cf::MAP{$self->path};
2248		2439
2249	$self->unlink_save;	2440	$self->unlink_save;
2250		2441
2251	bless $self, "cf::map";	2442	bless $self, "cf::map::wrap";
2252	delete $self->{deny_reset};	2443	delete $self->{deny_reset};
2253	$self->{deny_save} = 1;	2444	$self->{deny_save} = 1;
2254	$self->reset_timeout (1);	2445	$self->reset_timeout (1);
2255	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2446	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2256		2447
…		…
2313	: normalise $_	2504	: normalise $_
2314	} @{ aio_readdir $UNIQUEDIR or [] }	2505	} @{ aio_readdir $UNIQUEDIR or [] }
2315	]	2506	]
2316	}	2507	}
2317		2508
		2509	=item cf::map::static_maps
		2510
		2511	Returns an arrayref if paths of all static maps (all preinstalled F<.map>
		2512	file in the shared directory excluding F</styles> and F</editor>). May
		2513	block.
		2514
		2515	=cut
		2516
		2517	sub static_maps() {
		2518	my @dirs = "";
		2519	my @maps;
		2520
		2521	while (@dirs) {
		2522	my $dir = shift @dirs;
		2523
		2524	next if $dir eq "/styles" || $dir eq "/editor";
		2525
		2526	my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
		2527	or return;
		2528
		2529	for (@$files) {
		2530	s/\.map$// or next;
		2531	utf8::decode $_;
		2532	push @maps, "$dir/$_";
		2533	}
		2534
		2535	push @dirs, map "$dir/$_", @$dirs;
		2536	}
		2537
		2538	\@maps
		2539	}
		2540
2318	=back	2541	=back
2319		2542
2320	=head3 cf::object	2543	=head3 cf::object
2321		2544
2322	=cut	2545	=cut
…		…
2387		2610
2388	our $SAY_CHANNEL = {	2611	our $SAY_CHANNEL = {
2389	id => "say",	2612	id => "say",
2390	title => "Map",	2613	title => "Map",
2391	reply => "say ",	2614	reply => "say ",
2392	tooltip => "Things said to and replied from npcs near you and other players on the same map only.",	2615	tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2393	};	2616	};
2394		2617
2395	our $CHAT_CHANNEL = {	2618	our $CHAT_CHANNEL = {
2396	id => "chat",	2619	id => "chat",
2397	title => "Chat",	2620	title => "Chat",
…		…
2454		2677
2455	Freezes the player and moves him/her to a special map (C<{link}>).	2678	Freezes the player and moves him/her to a special map (C<{link}>).
2456		2679
2457	The player should be reasonably safe there for short amounts of time (e.g.	2680	The player should be reasonably safe there for short amounts of time (e.g.
2458	for loading a map). You I<MUST> call C<leave_link> as soon as possible,	2681	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2459	though, as the palyer cannot control the character while it is on the link	2682	though, as the player cannot control the character while it is on the link
2460	map.	2683	map.
2461		2684
2462	Will never block.	2685	Will never block.
2463		2686
2464	=item $player_object->leave_link ($map, $x, $y)	2687	=item $player_object->leave_link ($map, $x, $y)
…		…
2485	sub cf::object::player::enter_link {	2708	sub cf::object::player::enter_link {
2486	my ($self) = @_;	2709	my ($self) = @_;
2487		2710
2488	$self->deactivate_recursive;	2711	$self->deactivate_recursive;
2489		2712
		2713	++$self->{_link_recursion};
		2714
2490	return if UNIVERSAL::isa $self->map, "ext::map_link";	2715	return if UNIVERSAL::isa $self->map, "ext::map_link";
2491		2716
2492	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2717	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2493	if $self->map && $self->map->{path} ne "{link}";	2718	if $self->map && $self->map->{path} ne "{link}";
2494		2719
2495	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2720	$self->enter_map ($LINK_MAP || link_map, 3, 3);
2496	}	2721	}
2497		2722
2498	sub cf::object::player::leave_link {	2723	sub cf::object::player::leave_link {
2499	my ($self, $map, $x, $y) = @_;	2724	my ($self, $map, $x, $y) = @_;
2500		2725
…		…
2517	($x, $y) = (-1, -1)	2742	($x, $y) = (-1, -1)
2518	unless (defined $x) && (defined $y);	2743	unless (defined $x) && (defined $y);
2519		2744
2520	# use -1 or undef as default coordinates, not 0, 0	2745	# use -1 or undef as default coordinates, not 0, 0
2521	($x, $y) = ($map->enter_x, $map->enter_y)	2746	($x, $y) = ($map->enter_x, $map->enter_y)
2522	if $x <=0 && $y <= 0;	2747	if $x <= 0 && $y <= 0;
2523		2748
2524	$map->load;	2749	$map->load;
2525	$map->load_neighbours;
2526		2750
2527	return unless $self->contr->active;	2751	return unless $self->contr->active;
2528	$self->flag (cf::FLAG_DEBUG, 0);#d# temp
2529	$self->activate_recursive;
2530		2752
2531	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2753	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2532	$self->enter_map ($map, $x, $y);	2754	if ($self->enter_map ($map, $x, $y)) {
2533	}	2755	# entering was successful
		2756	delete $self->{_link_recursion};
		2757	# only activate afterwards, to support waiting in hooks
		2758	$self->activate_recursive;
		2759	}
2534		2760
		2761	}
		2762
2535	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2763	=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2536		2764
2537	Moves the player to the given map-path and coordinates by first freezing	2765	Moves the player to the given map-path and coordinates by first freezing
2538	her, loading and preparing them map, calling the provided $check callback	2766	her, loading and preparing them map, calling the provided $check callback
2539	that has to return the map if sucecssful, and then unfreezes the player on	2767	that has to return the map if sucecssful, and then unfreezes the player on
2540	the new (success) or old (failed) map position. In either case, $done will	2768	the new (success) or old (failed) map position. In either case, $done will
…		…
2547		2775
2548	our $GOTOGEN;	2776	our $GOTOGEN;
2549		2777
2550	sub cf::object::player::goto {	2778	sub cf::object::player::goto {
2551	my ($self, $path, $x, $y, $check, $done) = @_;	2779	my ($self, $path, $x, $y, $check, $done) = @_;
		2780
		2781	if ($self->{_link_recursion} >= $MAX_LINKS) {
		2782	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
		2783	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
		2784	($path, $x, $y) = @$EMERGENCY_POSITION;
		2785	}
2552		2786
2553	# do generation counting so two concurrent goto's will be executed in-order	2787	# do generation counting so two concurrent goto's will be executed in-order
2554	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2788	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2555		2789
2556	$self->enter_link;	2790	$self->enter_link;
…		…
2576	($path, $x, $y) = (undef, undef, undef);	2810	($path, $x, $y) = (undef, undef, undef);
2577	}	2811	}
2578	}	2812	}
2579		2813
2580	my $map = eval {	2814	my $map = eval {
2581	my $map = defined $path ? cf::map::find $path : undef;	2815	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2582		2816
2583	if ($map) {	2817	if ($map) {
2584	$map = $map->customise_for ($self);	2818	$map = $map->customise_for ($self);
2585	$map = $check->($map) if $check && $map;	2819	$map = $check->($map, $x, $y, $self) if $check && $map;
2586	} else {	2820	} else {
2587	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);	2821	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2588	}	2822	}
2589		2823
2590	$map	2824	$map
…		…
2598	if ($gen == $self->{_goto_generation}) {	2832	if ($gen == $self->{_goto_generation}) {
2599	delete $self->{_goto_generation};	2833	delete $self->{_goto_generation};
2600	$self->leave_link ($map, $x, $y);	2834	$self->leave_link ($map, $x, $y);
2601	}	2835	}
2602		2836
2603	$done->() if $done;	2837	$done->($self) if $done;
2604	})->prio (1);	2838	})->prio (1);
2605	}	2839	}
2606		2840
2607	=item $player_object->enter_exit ($exit_object)	2841	=item $player_object->enter_exit ($exit_object)
2608		2842
…		…
2676	$Coro::current->{desc} = "enter_exit";	2910	$Coro::current->{desc} = "enter_exit";
2677		2911
2678	unless (eval {	2912	unless (eval {
2679	$self->deactivate_recursive; # just to be sure	2913	$self->deactivate_recursive; # just to be sure
2680		2914
2681	# random map handling
2682	{
2683	my $guard = cf::lock_acquire "exit_prepare:$exit";
2684
2685	prepare_random_map $exit
2686	if $exit->slaying eq "/!";
2687	}
2688
2689	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2915	my $map = cf::map::normalise $exit->slaying, $exit->map;
2690	my $x = $exit->stats->hp;	2916	my $x = $exit->stats->hp;
2691	my $y = $exit->stats->sp;	2917	my $y = $exit->stats->sp;
		2918
		2919	# special map handling
		2920	my $slaying = $exit->slaying;
		2921
		2922	# special map handling
		2923	if ($slaying eq "/!") {
		2924	my $guard = cf::lock_acquire "exit_prepare:$exit";
		2925
		2926	prepare_random_map $exit
		2927	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		2928
		2929	$map = $exit->slaying;
		2930
		2931	} elsif ($slaying eq '!up') {
		2932	$map = $exit->map->tile_path (cf::TILE_UP);
		2933	$x = $exit->x;
		2934	$y = $exit->y;
		2935
		2936	} elsif ($slaying eq '!down') {
		2937	$map = $exit->map->tile_path (cf::TILE_DOWN);
		2938	$x = $exit->x;
		2939	$y = $exit->y;
		2940	}
2692		2941
2693	$self->goto ($map, $x, $y);	2942	$self->goto ($map, $x, $y);
2694		2943
2695	# if exit is damned, update players death & WoR home-position	2944	# if exit is damned, update players death & WoR home-position
2696	$self->contr->savebed ($map, $x, $y)	2945	$self->contr->savebed ($map, $x, $y)
…		…
2701	$self->message ("Something went wrong deep within the deliantra server. "	2950	$self->message ("Something went wrong deep within the deliantra server. "
2702	. "I'll try to bring you back to the map you were before. "	2951	. "I'll try to bring you back to the map you were before. "
2703	. "Please report this to the dungeon master!",	2952	. "Please report this to the dungeon master!",
2704	cf::NDI_UNIQUE | cf::NDI_RED);	2953	cf::NDI_UNIQUE | cf::NDI_RED);
2705		2954
2706	warn "ERROR in enter_exit: $@";	2955	error "ERROR in enter_exit: $@";
2707	$self->leave_link;	2956	$self->leave_link;
2708	}	2957	}
2709	})->prio (1);	2958	})->prio (1);
2710	}	2959	}
2711		2960
…		…
2723	sub cf::client::send_drawinfo {	2972	sub cf::client::send_drawinfo {
2724	my ($self, $text, $flags) = @_;	2973	my ($self, $text, $flags) = @_;
2725		2974
2726	utf8::encode $text;	2975	utf8::encode $text;
2727	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2976	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
		2977	}
		2978
		2979	=item $client->send_big_packet ($pkt)
		2980
		2981	Like C<send_packet>, but tries to compress large packets, and fragments
		2982	them as required.
		2983
		2984	=cut
		2985
		2986	our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
		2987
		2988	sub cf::client::send_big_packet {
		2989	my ($self, $pkt) = @_;
		2990
		2991	# try lzf for large packets
		2992	$pkt = "lzf " . Compress::LZF::compress $pkt
		2993	if 1024 <= length $pkt and $self->{can_lzf};
		2994
		2995	# split very large packets
		2996	if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
		2997	$self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
		2998	$pkt = "frag";
		2999	}
		3000
		3001	$self->send_packet ($pkt);
2728	}	3002	}
2729		3003
2730	=item $client->send_msg ($channel, $msg, $color, [extra...])	3004	=item $client->send_msg ($channel, $msg, $color, [extra...])
2731		3005
2732	Send a drawinfo or msg packet to the client, formatting the msg for the	3006	Send a drawinfo or msg packet to the client, formatting the msg for the
…		…
2736		3010
2737	=cut	3011	=cut
2738		3012
2739	# non-persistent channels (usually the info channel)	3013	# non-persistent channels (usually the info channel)
2740	our %CHANNEL = (	3014	our %CHANNEL = (
		3015	"c/motd" => {
		3016	id => "infobox",
		3017	title => "MOTD",
		3018	reply => undef,
		3019	tooltip => "The message of the day",
		3020	},
2741	"c/identify" => {	3021	"c/identify" => {
2742	id => "infobox",	3022	id => "infobox",
2743	title => "Identify",	3023	title => "Identify",
2744	reply => undef,	3024	reply => undef,
2745	tooltip => "Items recently identified",	3025	tooltip => "Items recently identified",
…		…
2747	"c/examine" => {	3027	"c/examine" => {
2748	id => "infobox",	3028	id => "infobox",
2749	title => "Examine",	3029	title => "Examine",
2750	reply => undef,	3030	reply => undef,
2751	tooltip => "Signs and other items you examined",	3031	tooltip => "Signs and other items you examined",
		3032	},
		3033	"c/shopinfo" => {
		3034	id => "infobox",
		3035	title => "Shop Info",
		3036	reply => undef,
		3037	tooltip => "What your bargaining skill tells you about the shop",
2752	},	3038	},
2753	"c/book" => {	3039	"c/book" => {
2754	id => "infobox",	3040	id => "infobox",
2755	title => "Book",	3041	title => "Book",
2756	reply => undef,	3042	reply => undef,
…		…
2772	id => "infobox",	3058	id => "infobox",
2773	title => "Body Parts",	3059	title => "Body Parts",
2774	reply => undef,	3060	reply => undef,
2775	tooltip => "Shows which body parts you posess and are available",	3061	tooltip => "Shows which body parts you posess and are available",
2776	},	3062	},
		3063	"c/statistics" => {
		3064	id => "infobox",
		3065	title => "Statistics",
		3066	reply => undef,
		3067	tooltip => "Shows your primary statistics",
		3068	},
2777	"c/skills" => {	3069	"c/skills" => {
2778	id => "infobox",	3070	id => "infobox",
2779	title => "Skills",	3071	title => "Skills",
2780	reply => undef,	3072	reply => undef,
2781	tooltip => "Shows your experience per skill and item power",	3073	tooltip => "Shows your experience per skill and item power",
		3074	},
		3075	"c/shopitems" => {
		3076	id => "infobox",
		3077	title => "Shop Items",
		3078	reply => undef,
		3079	tooltip => "Shows the items currently for sale in this shop",
		3080	},
		3081	"c/resistances" => {
		3082	id => "infobox",
		3083	title => "Resistances",
		3084	reply => undef,
		3085	tooltip => "Shows your resistances",
		3086	},
		3087	"c/pets" => {
		3088	id => "infobox",
		3089	title => "Pets",
		3090	reply => undef,
		3091	tooltip => "Shows information abotu your pets/a specific pet",
		3092	},
		3093	"c/perceiveself" => {
		3094	id => "infobox",
		3095	title => "Perceive Self",
		3096	reply => undef,
		3097	tooltip => "You gained detailed knowledge about yourself",
2782	},	3098	},
2783	"c/uptime" => {	3099	"c/uptime" => {
2784	id => "infobox",	3100	id => "infobox",
2785	title => "Uptime",	3101	title => "Uptime",
2786	reply => undef,	3102	reply => undef,
…		…
2796	id => "party",	3112	id => "party",
2797	title => "Party",	3113	title => "Party",
2798	reply => "gsay ",	3114	reply => "gsay ",
2799	tooltip => "Messages and chat related to your party",	3115	tooltip => "Messages and chat related to your party",
2800	},	3116	},
		3117	"c/death" => {
		3118	id => "death",
		3119	title => "Death",
		3120	reply => undef,
		3121	tooltip => "Reason for and more info about your most recent death",
		3122	},
		3123	"c/say" => $SAY_CHANNEL,
		3124	"c/chat" => $CHAT_CHANNEL,
2801	);	3125	);
2802		3126
2803	sub cf::client::send_msg {	3127	sub cf::client::send_msg {
2804	my ($self, $channel, $msg, $color, @extra) = @_;	3128	my ($self, $channel, $msg, $color, @extra) = @_;
2805		3129
…		…
2810		3134
2811	# check predefined channels, for the benefit of C	3135	# check predefined channels, for the benefit of C
2812	if ($CHANNEL{$channel}) {	3136	if ($CHANNEL{$channel}) {
2813	$channel = $CHANNEL{$channel};	3137	$channel = $CHANNEL{$channel};
2814		3138
2815	$self->ext_msg (channel_info => $channel)	3139	$self->ext_msg (channel_info => $channel);
2816	if $self->can_msg;
2817
2818	$channel = $channel->{id};	3140	$channel = $channel->{id};
2819		3141
2820	} elsif (ref $channel) {	3142	} elsif (ref $channel) {
2821	# send meta info to client, if not yet sent	3143	# send meta info to client, if not yet sent
2822	unless (exists $self->{channel}{$channel->{id}}) {	3144	unless (exists $self->{channel}{$channel->{id}}) {
2823	$self->{channel}{$channel->{id}} = $channel;	3145	$self->{channel}{$channel->{id}} = $channel;
2824	$self->ext_msg (channel_info => $channel)	3146	$self->ext_msg (channel_info => $channel);
2825	if $self->can_msg;
2826	}	3147	}
2827		3148
2828	$channel = $channel->{id};	3149	$channel = $channel->{id};
2829	}	3150	}
2830		3151
2831	return unless @extra || length $msg;	3152	return unless @extra || length $msg;
2832		3153
2833	if ($self->can_msg) {
2834	# default colour, mask it out	3154	# default colour, mask it out
2835	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)	3155	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2836	if $color & cf::NDI_DEF;	3156	if $color & cf::NDI_DEF;
2837		3157
2838	my $pkt = "msg "	3158	my $pkt = "msg "
2839	. $self->{json_coder}->encode (	3159	. $self->{json_coder}->encode (
2840	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]	3160	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2841	);	3161	);
2842		3162
2843	# try lzf for large packets
2844	$pkt = "lzf " . Compress::LZF::compress $pkt
2845	if 1024 <= length $pkt and $self->{can_lzf};
2846
2847	# split very large packets
2848	if (8192 < length $pkt and $self->{can_lzf}) {
2849	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2850	$pkt = "frag";
2851	}
2852
2853	$self->send_packet ($pkt);	3163	$self->send_big_packet ($pkt);
2854	} else {
2855	if ($color >= 0) {
2856	# replace some tags by gcfclient-compatible ones
2857	for ($msg) {
2858	1 while
2859	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2860	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2861	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2862	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2863	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2864	}
2865
2866	$color &= cf::NDI_COLOR_MASK;
2867
2868	utf8::encode $msg;
2869
2870	if (0 && $msg =~ /\[/) {
2871	# COMMAND/INFO
2872	$self->send_packet ("drawextinfo $color 10 8 $msg")
2873	} else {
2874	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2875	$self->send_packet ("drawinfo $color $msg")
2876	}
2877	}
2878	}
2879	}	3164	}
2880		3165
2881	=item $client->ext_msg ($type, @msg)	3166	=item $client->ext_msg ($type, @msg)
2882		3167
2883	Sends an ext event to the client.	3168	Sends an ext event to the client.
…		…
2886		3171
2887	sub cf::client::ext_msg($$@) {	3172	sub cf::client::ext_msg($$@) {
2888	my ($self, $type, @msg) = @_;	3173	my ($self, $type, @msg) = @_;
2889		3174
2890	if ($self->extcmd == 2) {	3175	if ($self->extcmd == 2) {
2891	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3176	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2892	} elsif ($self->extcmd == 1) { # TODO: remove	3177	} elsif ($self->extcmd == 1) { # TODO: remove
2893	push @msg, msgtype => "event_$type";	3178	push @msg, msgtype => "event_$type";
2894	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3179	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2895	}	3180	}
2896	}	3181	}
2897		3182
2898	=item $client->ext_reply ($msgid, @msg)	3183	=item $client->ext_reply ($msgid, @msg)
2899		3184
…		…
2902	=cut	3187	=cut
2903		3188
2904	sub cf::client::ext_reply($$@) {	3189	sub cf::client::ext_reply($$@) {
2905	my ($self, $id, @msg) = @_;	3190	my ($self, $id, @msg) = @_;
2906		3191
2907	if ($self->extcmd == 2) {	3192	return unless $self->extcmd == 2;
		3193
2908	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));	3194	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2909	} elsif ($self->extcmd == 1) {
2910	#TODO: version 1, remove
2911	unshift @msg, msgtype => "reply", msgid => $id;
2912	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2913	}
2914	}	3195	}
2915		3196
2916	=item $success = $client->query ($flags, "text", \&cb)	3197	=item $success = $client->query ($flags, "text", \&cb)
2917		3198
2918	Queues a query to the client, calling the given callback with	3199	Queues a query to the client, calling the given callback with
…		…
2973	my ($ns, $buf) = @_;	3254	my ($ns, $buf) = @_;
2974		3255
2975	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3256	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2976		3257
2977	if (ref $msg) {	3258	if (ref $msg) {
2978	my ($type, $reply, @payload) =	3259	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2979	"ARRAY" eq ref $msg
2980	? @$msg
2981	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2982		3260
2983	my @reply;	3261	my @reply;
2984		3262
2985	if (my $cb = $EXTICMD{$type}) {	3263	if (my $cb = $EXTICMD{$type}) {
2986	@reply = $cb->($ns, @payload);	3264	@reply = $cb->($ns, @payload);
…		…
2988		3266
2989	$ns->ext_reply ($reply, @reply)	3267	$ns->ext_reply ($reply, @reply)
2990	if $reply;	3268	if $reply;
2991		3269
2992	} else {	3270	} else {
2993	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3271	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2994	}	3272	}
2995		3273
2996	cf::override;	3274	cf::override;
2997	},	3275	},
2998	);	3276	);
…		…
3018		3296
3019	$coro	3297	$coro
3020	}	3298	}
3021		3299
3022	cf::client->attach (	3300	cf::client->attach (
3023	on_destroy => sub {	3301	on_client_destroy => sub {
3024	my ($ns) = @_;	3302	my ($ns) = @_;
3025		3303
3026	$_->cancel for values %{ (delete $ns->{_coro}) || {} };	3304	$_->cancel for values %{ (delete $ns->{_coro}) || {} };
3027	},	3305	},
3028	);	3306	);
…		…
3044	our $safe_hole = new Safe::Hole;	3322	our $safe_hole = new Safe::Hole;
3045		3323
3046	$SIG{FPE} = 'IGNORE';	3324	$SIG{FPE} = 'IGNORE';
3047		3325
3048	$safe->permit_only (Opcode::opset qw(	3326	$safe->permit_only (Opcode::opset qw(
3049	:base_core :base_mem :base_orig :base_math	3327	:base_core :base_mem :base_orig :base_math :base_loop
3050	grepstart grepwhile mapstart mapwhile	3328	grepstart grepwhile mapstart mapwhile
3051	sort time	3329	sort time
3052	));	3330	));
3053		3331
3054	# here we export the classes and methods available to script code	3332	# here we export the classes and methods available to script code
…		…
3058	The following functions and methods are available within a safe environment:	3336	The following functions and methods are available within a safe environment:
3059		3337
3060	cf::object	3338	cf::object
3061	contr pay_amount pay_player map x y force_find force_add destroy	3339	contr pay_amount pay_player map x y force_find force_add destroy
3062	insert remove name archname title slaying race decrease split	3340	insert remove name archname title slaying race decrease split
		3341	value
3063		3342
3064	cf::object::player	3343	cf::object::player
3065	player	3344	player
3066		3345
3067	cf::player	3346	cf::player
…		…
3073	=cut	3352	=cut
3074		3353
3075	for (	3354	for (
3076	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	3355	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3077	insert remove inv nrof name archname title slaying race	3356	insert remove inv nrof name archname title slaying race
3078	decrease split destroy change_exp)],	3357	decrease split destroy change_exp value msg lore send_msg)],
3079	["cf::object::player" => qw(player)],	3358	["cf::object::player" => qw(player)],
3080	["cf::player" => qw(peaceful)],	3359	["cf::player" => qw(peaceful send_msg)],
3081	["cf::map" => qw(trigger)],	3360	["cf::map" => qw(trigger)],
3082	) {	3361	) {
3083	no strict 'refs';
3084	my ($pkg, @funs) = @$_;	3362	my ($pkg, @funs) = @$_;
3085	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3363	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3086	for @funs;	3364	for @funs;
3087	}	3365	}
3088		3366
…		…
3103		3381
3104	my $qcode = $code;	3382	my $qcode = $code;
3105	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3383	$qcode =~ s/"/‟/g; # not allowed in #line filenames
3106	$qcode =~ s/\n/\\n/g;	3384	$qcode =~ s/\n/\\n/g;
3107		3385
		3386	%vars = (_dummy => 0) unless %vars;
		3387
		3388	my @res;
3108	local $_;	3389	local $_;
3109	local @safe::cf::_safe_eval_args = values %vars;
3110		3390
3111	my $eval =	3391	my $eval =
3112	"do {\n"	3392	"do {\n"
3113	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"	3393	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3114	. "#line 0 \"{$qcode}\"\n"	3394	. "#line 0 \"{$qcode}\"\n"
3115	. $code	3395	. $code
3116	. "\n}"	3396	. "\n}"
3117	;	3397	;
3118		3398
		3399	if ($CFG{safe_eval}) {
3119	sub_generation_inc;	3400	sub_generation_inc;
		3401	local @safe::cf::_safe_eval_args = values %vars;
3120	my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);	3402	@res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3121	sub_generation_inc;	3403	sub_generation_inc;
		3404	} else {
		3405	local @cf::_safe_eval_args = values %vars;
		3406	@res = wantarray ? eval eval : scalar eval $eval;
		3407	}
3122		3408
3123	if ($@) {	3409	if ($@) {
3124	warn "$@";	3410	warn "$@",
3125	warn "while executing safe code '$code'\n";	3411	"while executing safe code '$code'\n",
3126	warn "with arguments " . (join " ", %vars) . "\n";	3412	"with arguments " . (join " ", %vars) . "\n";
3127	}	3413	}
3128		3414
3129	wantarray ? @res : $res[0]	3415	wantarray ? @res : $res[0]
3130	}	3416	}
3131		3417
…		…
3145	=cut	3431	=cut
3146		3432
3147	sub register_script_function {	3433	sub register_script_function {
3148	my ($fun, $cb) = @_;	3434	my ($fun, $cb) = @_;
3149		3435
3150	no strict 'refs';	3436	$fun = "safe::$fun" if $CFG{safe_eval};
3151	*{"safe::$fun"} = $safe_hole->wrap ($cb);	3437	*$fun = $safe_hole->wrap ($cb);
3152	}	3438	}
3153		3439
3154	=back	3440	=back
3155		3441
3156	=cut	3442	=cut
…		…
3165	# for this (global event?)	3451	# for this (global event?)
3166	%ext::player_env::MUSIC_FACE_CACHE = ();	3452	%ext::player_env::MUSIC_FACE_CACHE = ();
3167		3453
3168	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3454	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3169		3455
3170	warn "loading facedata from $path\n";	3456	trace "loading facedata from $path\n";
3171		3457
3172	my $facedata;	3458	my $facedata = decode_storable load_file $path;
3173	0 < aio_load $path, $facedata
3174	or die "$path: $!";
3175
3176	$facedata = Coro::Storable::thaw $facedata;
3177		3459
3178	$facedata->{version} == 2	3460	$facedata->{version} == 2
3179	or cf::cleanup "$path: version mismatch, cannot proceed.";	3461	or cf::cleanup "$path: version mismatch, cannot proceed.";
3180		3462
3181	# patch in the exptable	3463	# patch in the exptable
		3464	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3182	$facedata->{resource}{"res/exp_table"} = {	3465	$facedata->{resource}{"res/exp_table"} = {
3183	type => FT_RSRC,	3466	type => FT_RSRC,
3184	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),	3467	data => $exp_table,
		3468	hash => (Digest::MD5::md5 $exp_table),
3185	};	3469	};
3186	cf::cede_to_tick;	3470	cf::cede_to_tick;
3187		3471
3188	{	3472	{
3189	my $faces = $facedata->{faceinfo};	3473	my $faces = $facedata->{faceinfo};
…		…
3191	while (my ($face, $info) = each %$faces) {	3475	while (my ($face, $info) = each %$faces) {
3192	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3476	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3193		3477
3194	cf::face::set_visibility $idx, $info->{visibility};	3478	cf::face::set_visibility $idx, $info->{visibility};
3195	cf::face::set_magicmap $idx, $info->{magicmap};	3479	cf::face::set_magicmap $idx, $info->{magicmap};
3196	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};	3480	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3197	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};	3481	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
		3482	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3198		3483
3199	cf::cede_to_tick;	3484	cf::cede_to_tick;
3200	}	3485	}
3201		3486
3202	while (my ($face, $info) = each %$faces) {	3487	while (my ($face, $info) = each %$faces) {
…		…
3207		3492
3208	if (my $smooth = cf::face::find $info->{smooth}) {	3493	if (my $smooth = cf::face::find $info->{smooth}) {
3209	cf::face::set_smooth $idx, $smooth;	3494	cf::face::set_smooth $idx, $smooth;
3210	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3495	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3211	} else {	3496	} else {
3212	warn "smooth face '$info->{smooth}' not found for face '$face'";	3497	error "smooth face '$info->{smooth}' not found for face '$face'";
3213	}	3498	}
3214		3499
3215	cf::cede_to_tick;	3500	cf::cede_to_tick;
3216	}	3501	}
3217	}	3502	}
…		…
3226		3511
3227	cf::anim::invalidate_all; # d'oh	3512	cf::anim::invalidate_all; # d'oh
3228	}	3513	}
3229		3514
3230	{	3515	{
3231	# TODO: for gcfclient pleasure, we should give resources
3232	# that gcfclient doesn't grok a >10000 face index.
3233	my $res = $facedata->{resource};	3516	my $res = $facedata->{resource};
3234		3517
3235	while (my ($name, $info) = each %$res) {	3518	while (my ($name, $info) = each %$res) {
3236	if (defined $info->{type}) {	3519	if (defined (my $type = $info->{type})) {
		3520	# TODO: different hash - must free and use new index, or cache ixface data queue
3237	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3521	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3238	my $data;
3239		3522
3240	if ($info->{type} & 1) {	3523	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3241	# prepend meta info
3242
3243	my $meta = $enc->encode ({
3244	name => $name,
3245	%{ $info->{meta} || {} },
3246	});
3247
3248	$data = pack "(w/a*)*", $meta, $info->{data};
3249	} else {
3250	$data = $info->{data};
3251	}
3252
3253	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3254	cf::face::set_type $idx, $info->{type};	3524	cf::face::set_type $idx, $type;
		3525	cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3255	} else {	3526	} else {
3256	$RESOURCE{$name} = $info;	3527	# $RESOURCE{$name} = $info; # unused
3257	}	3528	}
3258		3529
3259	cf::cede_to_tick;	3530	cf::cede_to_tick;
3260	}	3531	}
3261	}	3532	}
3262		3533
3263	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3534	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3264		3535
3265	1	3536	1
3266	}	3537	}
3267
3268	cf::global->attach (on_resource_update => sub {
3269	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3270	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3271
3272	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3273	my $sound = $soundconf->{compat}[$_]
3274	or next;
3275
3276	my $face = cf::face::find "sound/$sound->[1]";
3277	cf::sound::set $sound->[0] => $face;
3278	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3279	}
3280
3281	while (my ($k, $v) = each %{$soundconf->{event}}) {
3282	my $face = cf::face::find "sound/$v";
3283	cf::sound::set $k => $face;
3284	}
3285	}
3286	});
3287		3538
3288	register_exticmd fx_want => sub {	3539	register_exticmd fx_want => sub {
3289	my ($ns, $want) = @_;	3540	my ($ns, $want) = @_;
3290		3541
3291	while (my ($k, $v) = each %$want) {	3542	while (my ($k, $v) = each %$want) {
…		…
3330	sub reload_treasures {	3581	sub reload_treasures {
3331	load_resource_file "$DATADIR/treasures"	3582	load_resource_file "$DATADIR/treasures"
3332	or die "unable to load treasurelists\n";	3583	or die "unable to load treasurelists\n";
3333	}	3584	}
3334		3585
		3586	sub reload_sound {
		3587	trace "loading sound config from $DATADIR/sound\n";
		3588
		3589	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
		3590
		3591	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3592	my $sound = $soundconf->{compat}[$_]
		3593	or next;
		3594
		3595	my $face = cf::face::find "sound/$sound->[1]";
		3596	cf::sound::set $sound->[0] => $face;
		3597	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3598	}
		3599
		3600	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3601	my $face = cf::face::find "sound/$v";
		3602	cf::sound::set $k => $face;
		3603	}
		3604	}
		3605
3335	sub reload_resources {	3606	sub reload_resources {
3336	warn "reloading resource files...\n";	3607	trace "reloading resource files...\n";
3337		3608
		3609	reload_exp_table;
		3610	reload_materials;
3338	reload_facedata;	3611	reload_facedata;
		3612	reload_sound;
3339	reload_archetypes;	3613	reload_archetypes;
3340	reload_regions;	3614	reload_regions;
3341	reload_treasures;	3615	reload_treasures;
3342		3616
3343	warn "finished reloading resource files\n";	3617	trace "finished reloading resource files\n";
3344	}
3345
3346	sub init {
3347	my $guard = freeze_mainloop;
3348
3349	evthread_start IO::AIO::poll_fileno;
3350
3351	reload_resources;
3352	}	3618	}
3353		3619
3354	sub reload_config {	3620	sub reload_config {
3355	open my $fh, "<:utf8", "$CONFDIR/config"	3621	trace "reloading config file...\n";
3356	or return;
3357		3622
3358	local $/;	3623	my $config = load_file "$CONFDIR/config";
3359	*CFG = YAML::Load <$fh>;	3624	utf8::decode $config;
		3625	*CFG = decode_yaml $config;
3360		3626
3361	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3627	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3362		3628
3363	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3629	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3364	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3630	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3365		3631
3366	if (exists $CFG{mlockall}) {	3632	if (exists $CFG{mlockall}) {
…		…
3389		3655
3390	seek $fh, 0, 0;	3656	seek $fh, 0, 0;
3391	print $fh $$;	3657	print $fh $$;
3392	}	3658	}
3393		3659
		3660	sub main_loop {
		3661	trace "EV::loop starting\n";
		3662	if (1) {
		3663	EV::loop;
		3664	}
		3665	trace "EV::loop returned\n";
		3666	goto &main_loop unless $REALLY_UNLOOP;
		3667	}
		3668
3394	sub main {	3669	sub main {
3395	atomic;	3670	cf::init_globals; # initialise logging
		3671
		3672	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
		3673	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
		3674	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
		3675	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
		3676
		3677	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3396		3678
3397	# we must not ever block the main coroutine	3679	# we must not ever block the main coroutine
3398	local $Coro::idle = sub {	3680	local $Coro::idle = sub {
3399	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3681	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3400	(async {	3682	(async {
3401	$Coro::current->{desc} = "IDLE BUG HANDLER";	3683	$Coro::current->{desc} = "IDLE BUG HANDLER";
3402	EV::loop EV::LOOP_ONESHOT;	3684	EV::loop EV::LOOP_ONESHOT;
3403	})->prio (Coro::PRIO_MAX);	3685	})->prio (Coro::PRIO_MAX);
3404	};	3686	};
3405		3687
3406	{	3688	evthread_start IO::AIO::poll_fileno;
3407	my $guard = freeze_mainloop;	3689
		3690	cf::sync_job {
		3691	cf::incloader::init ();
		3692
		3693	cf::init_anim;
		3694	cf::init_attackmess;
		3695	cf::init_dynamic;
		3696
		3697	cf::load_settings;
		3698
		3699	reload_resources;
3408	reload_config;	3700	reload_config;
3409	db_init;	3701	db_init;
		3702
		3703	cf::init_uuid;
		3704	cf::init_signals;
		3705	cf::init_skills;
		3706
		3707	cf::init_beforeplay;
		3708
		3709	atomic;
		3710
3410	load_extensions;	3711	load_extensions;
3411		3712
3412	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3413	}
3414
3415	utime time, time, $RUNTIMEFILE;	3713	utime time, time, $RUNTIMEFILE;
3416		3714
3417	# no (long-running) fork's whatsoever before this point(!)	3715	# no (long-running) fork's whatsoever before this point(!)
		3716	use POSIX ();
3418	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3717	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3419		3718
3420	EV::loop;	3719	cf::_post_init 0;
		3720	};
		3721
		3722	cf::object::thawer::errors_are_fatal 0;
		3723	info "parse errors in files are no longer fatal from this point on.\n";
		3724
		3725	AE::postpone {
		3726	undef &main; # free gobs of memory :)
		3727	};
		3728
		3729	goto &main_loop;
3421	}	3730	}
3422		3731
3423	#############################################################################	3732	#############################################################################
3424	# initialisation and cleanup	3733	# initialisation and cleanup
3425		3734
3426	# install some emergency cleanup handlers	3735	# install some emergency cleanup handlers
3427	BEGIN {	3736	BEGIN {
3428	our %SIGWATCHER = ();	3737	our %SIGWATCHER = ();
3429	for my $signal (qw(INT HUP TERM)) {	3738	for my $signal (qw(INT HUP TERM)) {
3430	$SIGWATCHER{$signal} = EV::signal $signal, sub {	3739	$SIGWATCHER{$signal} = AE::signal $signal, sub {
3431	cf::cleanup "SIG$signal";	3740	cf::cleanup "SIG$signal";
3432	};	3741	};
3433	}	3742	}
3434	}	3743	}
3435		3744
3436	sub write_runtime_sync {	3745	sub write_runtime_sync {
		3746	my $t0 = AE::time;
		3747
3437	# first touch the runtime file to show we are still running:	3748	# first touch the runtime file to show we are still running:
3438	# the fsync below can take a very very long time.	3749	# the fsync below can take a very very long time.
3439		3750
3440	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;	3751	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3441		3752
3442	my $guard = cf::lock_acquire "write_runtime";	3753	my $guard = cf::lock_acquire "write_runtime";
3443		3754
3444	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644	3755	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3445	or return;	3756	or return;
3446		3757
3447	my $value = $cf::RUNTIME + 90 + 10;	3758	my $value = $cf::RUNTIME + 90 + 10;
3448	# 10 is the runtime save interval, for a monotonic clock	3759	# 10 is the runtime save interval, for a monotonic clock
3449	# 60 allows for the watchdog to kill the server.	3760	# 60 allows for the watchdog to kill the server.
…		…
3462	or return;	3773	or return;
3463		3774
3464	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3775	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3465	and return;	3776	and return;
3466		3777
3467	warn "runtime file written.\n";	3778	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3468		3779
3469	1	3780	1
3470	}	3781	}
3471		3782
3472	our $uuid_lock;	3783	our $uuid_lock;
…		…
3481	my $uuid = "$LOCALDIR/uuid";	3792	my $uuid = "$LOCALDIR/uuid";
3482		3793
3483	my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644	3794	my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3484	or return;	3795	or return;
3485		3796
3486	my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;	3797	my $value = uuid_seq uuid_cur;
		3798
		3799	unless ($value) {
		3800	info "cowardly refusing to write zero uuid value!\n";
		3801	return;
		3802	}
		3803
		3804	my $value = uuid_str $value + $uuid_skip;
3487	$uuid_skip = 0;	3805	$uuid_skip = 0;
3488		3806
3489	(aio_write $fh, 0, (length $value), $value, 0) <= 0	3807	(aio_write $fh, 0, (length $value), $value, 0) <= 0
3490	and return;	3808	and return;
3491		3809
…		…
3497	or return;	3815	or return;
3498		3816
3499	aio_rename "$uuid~", $uuid	3817	aio_rename "$uuid~", $uuid
3500	and return;	3818	and return;
3501		3819
3502	warn "uuid file written ($value).\n";	3820	trace "uuid file written ($value).\n";
3503		3821
3504	1	3822	1
3505		3823
3506	}	3824	}
3507		3825
…		…
3513	}	3831	}
3514		3832
3515	sub emergency_save() {	3833	sub emergency_save() {
3516	my $freeze_guard = cf::freeze_mainloop;	3834	my $freeze_guard = cf::freeze_mainloop;
3517		3835
3518	warn "enter emergency perl save\n";	3836	info "emergency_perl_save: enter\n";
		3837
		3838	# this is a trade-off: we want to be very quick here, so
		3839	# save all maps without fsync, and later call a global sync
		3840	# (which in turn might be very very slow)
		3841	local $USE_FSYNC = 0;
3519		3842
3520	cf::sync_job {	3843	cf::sync_job {
		3844	cf::write_runtime_sync; # external watchdog should not bark
		3845
3521	# use a peculiar iteration method to avoid tripping on perl	3846	# use a peculiar iteration method to avoid tripping on perl
3522	# refcount bugs in for. also avoids problems with players	3847	# refcount bugs in for. also avoids problems with players
3523	# and maps saved/destroyed asynchronously.	3848	# and maps saved/destroyed asynchronously.
3524	warn "begin emergency player save\n";	3849	info "emergency_perl_save: begin player save\n";
3525	for my $login (keys %cf::PLAYER) {	3850	for my $login (keys %cf::PLAYER) {
3526	my $pl = $cf::PLAYER{$login} or next;	3851	my $pl = $cf::PLAYER{$login} or next;
3527	$pl->valid or next;	3852	$pl->valid or next;
3528	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3853	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3529	$pl->save;	3854	$pl->save;
3530	}	3855	}
3531	warn "end emergency player save\n";	3856	info "emergency_perl_save: end player save\n";
3532		3857
3533	warn "begin emergency map save\n";	3858	cf::write_runtime_sync; # external watchdog should not bark
		3859
		3860	info "emergency_perl_save: begin map save\n";
3534	for my $path (keys %cf::MAP) {	3861	for my $path (keys %cf::MAP) {
3535	my $map = $cf::MAP{$path} or next;	3862	my $map = $cf::MAP{$path} or next;
3536	$map->valid or next;	3863	$map->valid or next;
3537	$map->save;	3864	$map->save;
3538	}	3865	}
3539	warn "end emergency map save\n";	3866	info "emergency_perl_save: end map save\n";
3540		3867
3541	warn "begin emergency database checkpoint\n";	3868	cf::write_runtime_sync; # external watchdog should not bark
		3869
		3870	info "emergency_perl_save: begin database checkpoint\n";
3542	BDB::db_env_txn_checkpoint $DB_ENV;	3871	BDB::db_env_txn_checkpoint $DB_ENV;
3543	warn "end emergency database checkpoint\n";	3872	info "emergency_perl_save: end database checkpoint\n";
3544		3873
3545	warn "begin write uuid\n";	3874	info "emergency_perl_save: begin write uuid\n";
3546	write_uuid_sync 1;	3875	write_uuid_sync 1;
3547	warn "end write uuid\n";	3876	info "emergency_perl_save: end write uuid\n";
		3877
		3878	cf::write_runtime_sync; # external watchdog should not bark
		3879
		3880	trace "emergency_perl_save: syncing database to disk";
		3881	BDB::db_env_txn_checkpoint $DB_ENV;
		3882
		3883	info "emergency_perl_save: starting sync\n";
		3884	IO::AIO::aio_sync sub {
		3885	info "emergency_perl_save: finished sync\n";
		3886	};
		3887
		3888	cf::write_runtime_sync; # external watchdog should not bark
		3889
		3890	trace "emergency_perl_save: flushing outstanding aio requests";
		3891	while (IO::AIO::nreqs || BDB::nreqs) {
		3892	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
		3893	}
		3894
		3895	cf::write_runtime_sync; # external watchdog should not bark
3548	};	3896	};
3549		3897
3550	warn "leave emergency perl save\n";	3898	info "emergency_perl_save: leave\n";
3551	}	3899	}
3552		3900
3553	sub post_cleanup {	3901	sub post_cleanup {
3554	my ($make_core) = @_;	3902	my ($make_core) = @_;
3555		3903
		3904	IO::AIO::flush;
		3905
3556	warn Carp::longmess "post_cleanup backtrace"	3906	error Carp::longmess "post_cleanup backtrace"
3557	if $make_core;	3907	if $make_core;
3558		3908
3559	my $fh = pidfile;	3909	my $fh = pidfile;
3560	unlink $PIDFILE if <$fh> == $$;	3910	unlink $PIDFILE if <$fh> == $$;
3561	}	3911	}
…		…
3581	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	3931	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3582	for my $name (keys %$leaf_symtab) {	3932	for my $name (keys %$leaf_symtab) {
3583	_gv_clear *{"$pkg$name"};	3933	_gv_clear *{"$pkg$name"};
3584	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	3934	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3585	}	3935	}
3586	warn "cleared package $pkg\n";#d#
3587	}	3936	}
3588		3937
3589	sub do_reload_perl() {	3938	sub do_reload_perl() {
3590	# can/must only be called in main	3939	# can/must only be called in main
3591	if ($Coro::current != $Coro::main) {	3940	unless (in_main) {
3592	warn "can only reload from main coroutine";	3941	error "can only reload from main coroutine";
3593	return;	3942	return;
3594	}	3943	}
3595		3944
3596	return if $RELOAD++;	3945	return if $RELOAD++;
3597		3946
		3947	my $t1 = AE::time;
		3948
3598	while ($RELOAD) {	3949	while ($RELOAD) {
3599	warn "reloading...";	3950	cf::get_slot 0.1, -1, "reload_perl";
		3951	info "perl_reload: reloading...";
3600		3952
3601	warn "entering sync_job";	3953	trace "perl_reload: entering sync_job";
3602		3954
3603	cf::sync_job {	3955	cf::sync_job {
3604	cf::write_runtime_sync; # external watchdog should not bark
3605	cf::emergency_save;	3956	#cf::emergency_save;
3606	cf::write_runtime_sync; # external watchdog should not bark
3607		3957
3608	warn "syncing database to disk";
3609	BDB::db_env_txn_checkpoint $DB_ENV;
3610
3611	# if anything goes wrong in here, we should simply crash as we already saved
3612
3613	warn "flushing outstanding aio requests";
3614	while (IO::AIO::nreqs || BDB::nreqs) {
3615	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3616	}
3617
3618	warn "cancelling all extension coros";	3958	trace "perl_reload: cancelling all extension coros";
3619	$_->cancel for values %EXT_CORO;	3959	$_->cancel for values %EXT_CORO;
3620	%EXT_CORO = ();	3960	%EXT_CORO = ();
3621		3961
3622	warn "removing commands";	3962	trace "perl_reload: removing commands";
3623	%COMMAND = ();	3963	%COMMAND = ();
3624		3964
3625	warn "removing ext/exti commands";	3965	trace "perl_reload: removing ext/exti commands";
3626	%EXTCMD = ();	3966	%EXTCMD = ();
3627	%EXTICMD = ();	3967	%EXTICMD = ();
3628		3968
3629	warn "unloading/nuking all extensions";	3969	trace "perl_reload: unloading/nuking all extensions";
3630	for my $pkg (@EXTS) {	3970	for my $pkg (@EXTS) {
3631	warn "... unloading $pkg";	3971	trace "... unloading $pkg";
3632		3972
3633	if (my $cb = $pkg->can ("unload")) {	3973	if (my $cb = $pkg->can ("unload")) {
3634	eval {	3974	eval {
3635	$cb->($pkg);	3975	$cb->($pkg);
3636	1	3976	1
3637	} or warn "$pkg unloaded, but with errors: $@";	3977	} or error "$pkg unloaded, but with errors: $@";
3638	}	3978	}
3639		3979
3640	warn "... clearing $pkg";	3980	trace "... clearing $pkg";
3641	clear_package $pkg;	3981	clear_package $pkg;
3642	}	3982	}
3643		3983
3644	warn "unloading all perl modules loaded from $LIBDIR";	3984	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3645	while (my ($k, $v) = each %INC) {	3985	while (my ($k, $v) = each %INC) {
3646	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	3986	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3647		3987
3648	warn "... unloading $k";	3988	trace "... unloading $k";
3649	delete $INC{$k};	3989	delete $INC{$k};
3650		3990
3651	$k =~ s/\.pm$//;	3991	$k =~ s/\.pm$//;
3652	$k =~ s/\//::/g;	3992	$k =~ s/\//::/g;
3653		3993
…		…
3656	}	3996	}
3657		3997
3658	clear_package $k;	3998	clear_package $k;
3659	}	3999	}
3660		4000
3661	warn "getting rid of safe::, as good as possible";	4001	trace "perl_reload: getting rid of safe::, as good as possible";
3662	clear_package "safe::$_"	4002	clear_package "safe::$_"
3663	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4003	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3664		4004
3665	warn "unloading cf.pm \"a bit\"";	4005	trace "perl_reload: unloading cf.pm \"a bit\"";
3666	delete $INC{"cf.pm"};	4006	delete $INC{"cf.pm"};
3667	delete $INC{"cf/pod.pm"};	4007	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3668		4008
3669	# don't, removes xs symbols, too,	4009	# don't, removes xs symbols, too,
3670	# and global variables created in xs	4010	# and global variables created in xs
3671	#clear_package __PACKAGE__;	4011	#clear_package __PACKAGE__;
3672		4012
3673	warn "unload completed, starting to reload now";	4013	info "perl_reload: unload completed, starting to reload now";
3674		4014
3675	warn "reloading cf.pm";	4015	trace "perl_reload: reloading cf.pm";
3676	require cf;	4016	require cf;
3677	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	4017	cf::_connect_to_perl_1;
3678		4018
3679	warn "loading config and database again";	4019	trace "perl_reload: loading config and database again";
3680	cf::reload_config;	4020	cf::reload_config;
3681		4021
3682	warn "loading extensions";	4022	trace "perl_reload: loading extensions";
3683	cf::load_extensions;	4023	cf::load_extensions;
3684		4024
		4025	if ($REATTACH_ON_RELOAD) {
3685	warn "reattaching attachments to objects/players";	4026	trace "perl_reload: reattaching attachments to objects/players";
3686	_global_reattach; # objects, sockets	4027	_global_reattach; # objects, sockets
3687	warn "reattaching attachments to maps";	4028	trace "perl_reload: reattaching attachments to maps";
3688	reattach $_ for values %MAP;	4029	reattach $_ for values %MAP;
3689	warn "reattaching attachments to players";	4030	trace "perl_reload: reattaching attachments to players";
3690	reattach $_ for values %PLAYER;	4031	reattach $_ for values %PLAYER;
		4032	}
3691		4033
3692	warn "leaving sync_job";	4034	cf::_post_init 1;
		4035
		4036	trace "perl_reload: leaving sync_job";
3693		4037
3694	1	4038	1
3695	} or do {	4039	} or do {
3696	warn $@;	4040	error $@;
3697	cf::cleanup "error while reloading, exiting.";	4041	cf::cleanup "perl_reload: error, exiting.";
3698	};	4042	};
3699		4043
3700	warn "reloaded";
3701	--$RELOAD;	4044	--$RELOAD;
3702	}	4045	}
		4046
		4047	$t1 = AE::time - $t1;
		4048	info "perl_reload: completed in ${t1}s\n";
3703	};	4049	};
3704		4050
3705	our $RELOAD_WATCHER; # used only during reload	4051	our $RELOAD_WATCHER; # used only during reload
3706		4052
3707	sub reload_perl() {	4053	sub reload_perl() {
3708	# doing reload synchronously and two reloads happen back-to-back,	4054	# doing reload synchronously and two reloads happen back-to-back,
3709	# coro crashes during coro_state_free->destroy here.	4055	# coro crashes during coro_state_free->destroy here.
3710		4056
		4057	$RELOAD_WATCHER ||= cf::async {
		4058	Coro::AIO::aio_wait cache_extensions;
		4059
3711	$RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub {	4060	$RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3712	do_reload_perl;	4061	do_reload_perl;
3713	undef $RELOAD_WATCHER;	4062	undef $RELOAD_WATCHER;
		4063	};
3714	};	4064	};
3715	}	4065	}
3716		4066
3717	register_command "reload" => sub {	4067	register_command "reload" => sub {
3718	my ($who, $arg) = @_;	4068	my ($who, $arg) = @_;
…		…
3724	reload_perl;	4074	reload_perl;
3725	};	4075	};
3726	}	4076	}
3727	};	4077	};
3728		4078
3729	unshift @INC, $LIBDIR;	4079	#############################################################################
3730		4080
3731	my $bug_warning = 0;	4081	my $bug_warning = 0;
3732		4082
3733	our @WAIT_FOR_TICK;
3734	our @WAIT_FOR_TICK_BEGIN;
3735
3736	sub wait_for_tick {	4083	sub wait_for_tick() {
3737	return if tick_inhibit || $Coro::current == $Coro::main;	4084	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3738		4085
3739	my $signal = new Coro::Signal;	4086	$WAIT_FOR_TICK->wait;
3740	push @WAIT_FOR_TICK, $signal;
3741	$signal->wait;
3742	}	4087	}
3743		4088
3744	sub wait_for_tick_begin {	4089	sub wait_for_tick_begin() {
3745	return if tick_inhibit || $Coro::current == $Coro::main;	4090	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3746		4091
3747	my $signal = new Coro::Signal;	4092	my $signal = new Coro::Signal;
3748	push @WAIT_FOR_TICK_BEGIN, $signal;	4093	push @WAIT_FOR_TICK_BEGIN, $signal;
3749	$signal->wait;	4094	$signal->wait;
3750	}	4095	}
…		…
3754	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4099	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3755	unless ++$bug_warning > 10;	4100	unless ++$bug_warning > 10;
3756	return;	4101	return;
3757	}	4102	}
3758		4103
3759	cf::server_tick; # one server iteration	4104	cf::one_tick; # one server iteration
		4105
		4106	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3760		4107
3761	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4108	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3762	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4109	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3763	Coro::async_pool {	4110	Coro::async_pool {
3764	$Coro::current->{desc} = "runtime saver";	4111	$Coro::current->{desc} = "runtime saver";
3765	write_runtime_sync	4112	write_runtime_sync
3766	or warn "ERROR: unable to write runtime file: $!";	4113	or error "ERROR: unable to write runtime file: $!";
3767	};	4114	};
3768	}	4115	}
3769		4116
3770	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4117	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3771	$sig->send;	4118	$sig->send;
3772	}	4119	}
3773	while (my $sig = shift @WAIT_FOR_TICK) {	4120	$WAIT_FOR_TICK->broadcast;
3774	$sig->send;
3775	}
3776		4121
3777	$LOAD = ($NOW - $TICK_START) / $TICK;	4122	$LOAD = ($NOW - $TICK_START) / $TICK;
3778	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4123	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3779		4124
3780	if (0) {	4125	if (0) {
3781	if ($NEXT_TICK) {	4126	if ($NEXT_TICK) {
3782	my $jitter = $TICK_START - $NEXT_TICK;	4127	my $jitter = $TICK_START - $NEXT_TICK;
3783	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4128	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
3784	warn "jitter $JITTER\n";#d#	4129	debug "jitter $JITTER\n";#d#
3785	}	4130	}
3786	}	4131	}
3787	}	4132	}
3788		4133
3789	{	4134	{
3790	# configure BDB	4135	# configure BDB
3791		4136
3792	BDB::min_parallel 8;	4137	BDB::min_parallel 16;
3793	BDB::max_poll_reqs $TICK * 0.1;	4138	BDB::max_poll_reqs $TICK * 0.1;
3794	$AnyEvent::BDB::WATCHER->priority (1);	4139	#$AnyEvent::BDB::WATCHER->priority (1);
3795		4140
3796	unless ($DB_ENV) {	4141	unless ($DB_ENV) {
3797	$DB_ENV = BDB::db_env_create;	4142	$DB_ENV = BDB::db_env_create;
3798	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4143	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3799	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4144	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
3834	IO::AIO::min_parallel 8;	4179	IO::AIO::min_parallel 8;
3835	IO::AIO::max_poll_time $TICK * 0.1;	4180	IO::AIO::max_poll_time $TICK * 0.1;
3836	undef $AnyEvent::AIO::WATCHER;	4181	undef $AnyEvent::AIO::WATCHER;
3837	}	4182	}
3838		4183
3839	my $_log_backtrace;	4184	our $_log_backtrace;
		4185	our $_log_backtrace_last;
3840		4186
3841	sub _log_backtrace {	4187	sub _log_backtrace {
3842	my ($msg, @addr) = @_;	4188	my ($msg, @addr) = @_;
3843		4189
3844	$msg =~ s/\n//;	4190	$msg =~ s/\n$//;
3845		4191
		4192	if ($_log_backtrace_last eq $msg) {
		4193	LOG llevInfo, "[ABT] $msg\n";
		4194	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3846	# limit the # of concurrent backtraces	4195	# limit the # of concurrent backtraces
3847	if ($_log_backtrace < 2) {	4196	} elsif ($_log_backtrace < 2) {
		4197	$_log_backtrace_last = $msg;
3848	++$_log_backtrace;	4198	++$_log_backtrace;
3849	my $perl_bt = Carp::longmess $msg;	4199	my $perl_bt = Carp::longmess $msg;
3850	async {	4200	async {
3851	$Coro::current->{desc} = "abt $msg";	4201	$Coro::current->{desc} = "abt $msg";
3852		4202
…		…
3872	LOG llevInfo, "[ABT] $_\n" for @bt;	4222	LOG llevInfo, "[ABT] $_\n" for @bt;
3873	--$_log_backtrace;	4223	--$_log_backtrace;
3874	};	4224	};
3875	} else {	4225	} else {
3876	LOG llevInfo, "[ABT] $msg\n";	4226	LOG llevInfo, "[ABT] $msg\n";
3877	LOG llevInfo, "[ABT] [suppressed]\n";	4227	LOG llevInfo, "[ABT] [overload, suppressed]\n";
3878	}	4228	}
3879	}	4229	}
3880		4230
3881	# load additional modules	4231	# load additional modules
3882	use cf::pod;	4232	require "cf/$_.pm" for @EXTRA_MODULES;
		4233	cf::_connect_to_perl_2;
3883		4234
3884	END { cf::emergency_save }	4235	END { cf::emergency_save }
3885		4236
3886	1	4237	1
3887		4238

Diff Legend

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