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.369 by root, Thu Sep 13 08:35:25 2007 UTC vs.
Revision 1.469 by root, Mon Mar 2 22:25:19 2009 UTC

		1	#
		2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.
		3	#
		4	# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
		5	#
		6	# Deliantra is free software: you can redistribute it and/or modify
		7	# it under the terms of the GNU General Public License as published by
		8	# the Free Software Foundation, either version 3 of the License, or
		9	# (at your option) any later version.
		10	#
		11	# This program is distributed in the hope that it will be useful,
		12	# but WITHOUT ANY WARRANTY; without even the implied warranty of
		13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		14	# GNU General Public License for more details.
		15	#
		16	# You should have received a copy of the GNU General Public License
		17	# along with this program. If not, see <http://www.gnu.org/licenses/>.
		18	#
		19	# The authors can be reached via e-mail to <support@deliantra.net>
		20	#
		21
1	package cf;	22	package cf;
2		23
		24	use 5.10.0;
3	use utf8;	25	use utf8;
4	use strict;	26	use strict qw(vars subs);
5		27
6	use Symbol;	28	use Symbol;
7	use List::Util;	29	use List::Util;
8	use Socket;	30	use Socket;
9	use Storable;	31	use EV;
10	use Event;
11	use Opcode;	32	use Opcode;
12	use Safe;	33	use Safe;
13	use Safe::Hole;	34	use Safe::Hole;
		35	use Storable ();
14		36
		37	use Guard ();
15	use Coro 3.64 ();	38	use Coro ();
16	use Coro::State;	39	use Coro::State;
17	use Coro::Handle;	40	use Coro::Handle;
		41	use Coro::EV;
18	use Coro::Event;	42	use Coro::AnyEvent;
19	use Coro::Timer;	43	use Coro::Timer;
20	use Coro::Signal;	44	use Coro::Signal;
21	use Coro::Semaphore;	45	use Coro::Semaphore;
		46	use Coro::SemaphoreSet;
		47	use Coro::AnyEvent;
22	use Coro::AIO;	48	use Coro::AIO;
		49	use Coro::BDB 1.6;
23	use Coro::Storable;	50	use Coro::Storable;
24	use Coro::Util ();	51	use Coro::Util ();
25		52
26	use JSON::XS ();	53	use JSON::XS 2.01 ();
27	use BDB ();	54	use BDB ();
28	use Data::Dumper;	55	use Data::Dumper;
29	use Digest::MD5;	56	use Digest::MD5;
30	use Fcntl;	57	use Fcntl;
31	use YAML::Syck ();	58	use YAML ();
32	use IO::AIO 2.32 ();	59	use IO::AIO ();
33	use Time::HiRes;	60	use Time::HiRes;
34	use Compress::LZF;	61	use Compress::LZF;
35	use Digest::MD5 ();	62	use Digest::MD5 ();
		63
		64	AnyEvent::detect;
36		65
37	# configure various modules to our taste	66	# configure various modules to our taste
38	#	67	#
39	$Storable::canonical = 1; # reduce rsync transfers	68	$Storable::canonical = 1; # reduce rsync transfers
40	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator	69	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
		70
		71	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
		72
		73	# make sure c-lzf reinitialises itself
		74	Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later	75	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42
43	$Event::Eval = 1; # no idea why this is required, but it is
44
45	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46	$YAML::Syck::ImplicitUnicode = 1;
47
48	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49		76
50	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	77	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51		78
52	our %COMMAND = ();	79	our %COMMAND = ();
53	our %COMMAND_TIME = ();	80	our %COMMAND_TIME = ();
…		…
56	our %EXTCMD = ();	83	our %EXTCMD = ();
57	our %EXTICMD = ();	84	our %EXTICMD = ();
58	our %EXT_CORO = (); # coroutines bound to extensions	85	our %EXT_CORO = (); # coroutines bound to extensions
59	our %EXT_MAP = (); # pluggable maps	86	our %EXT_MAP = (); # pluggable maps
60		87
61	our $RELOAD; # number of reloads so far	88	our $RELOAD; # number of reloads so far, non-zero while in reload
62	our @EVENT;	89	our @EVENT;
63		90
64	our $CONFDIR = confdir;	91	our $CONFDIR = confdir;
65	our $DATADIR = datadir;	92	our $DATADIR = datadir;
66	our $LIBDIR = "$DATADIR/ext";	93	our $LIBDIR = "$DATADIR/ext";
67	our $PODDIR = "$DATADIR/pod";	94	our $PODDIR = "$DATADIR/pod";
68	our $MAPDIR = "$DATADIR/" . mapdir;	95	our $MAPDIR = "$DATADIR/" . mapdir;
69	our $LOCALDIR = localdir;	96	our $LOCALDIR = localdir;
70	our $TMPDIR = "$LOCALDIR/" . tmpdir;	97	our $TMPDIR = "$LOCALDIR/" . tmpdir;
71	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	98	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	99	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73	our $RANDOMDIR = "$LOCALDIR/random";	100	our $RANDOMDIR = "$LOCALDIR/random";
74	our $BDBDIR = "$LOCALDIR/db";	101	our $BDBDIR = "$LOCALDIR/db";
		102	our $PIDFILE = "$LOCALDIR/pid";
		103	our $RUNTIMEFILE = "$LOCALDIR/runtime";
		104
		105	our %RESOURCE;
75		106
76	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	107	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77	our $TICK_WATCHER;
78	our $AIO_POLL_WATCHER;
79	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	108	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80	our $NEXT_TICK;	109	our $NEXT_TICK;
81	our $NOW;
82	our $USE_FSYNC = 1; # use fsync to write maps - default off	110	our $USE_FSYNC = 1; # use fsync to write maps - default on
83		111
84	our $BDB_POLL_WATCHER;	112	our $BDB_DEADLOCK_WATCHER;
85	our $BDB_CHECKPOINT_WATCHER;	113	our $BDB_CHECKPOINT_WATCHER;
86	our $BDB_TRICKLE_WATCHER;	114	our $BDB_TRICKLE_WATCHER;
87	our $DB_ENV;	115	our $DB_ENV;
88		116
		117	our @EXTRA_MODULES = qw(pod mapscript);
		118
89	our %CFG;	119	our %CFG;
90		120
91	our $UPTIME; $UPTIME ||= time;	121	our $UPTIME; $UPTIME ||= time;
92	our $RUNTIME;	122	our $RUNTIME;
		123	our $NOW;
93		124
94	our (%PLAYER, %PLAYER_LOADING); # all users	125	our (%PLAYER, %PLAYER_LOADING); # all users
95	our (%MAP, %MAP_LOADING ); # all maps	126	our (%MAP, %MAP_LOADING ); # all maps
96	our $LINK_MAP; # the special {link} map, which is always available	127	our $LINK_MAP; # the special {link} map, which is always available
97		128
98	# used to convert map paths into valid unix filenames by replacing / by ∕	129	# used to convert map paths into valid unix filenames by replacing / by ∕
99	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	130	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
100		131
101	our $LOAD; # a number between 0 (idle) and 1 (too many objects)	132	our $LOAD; # a number between 0 (idle) and 1 (too many objects)
102	our $LOADAVG; # same thing, but with alpha-smoothing	133	our $LOADAVG; # same thing, but with alpha-smoothing
		134	our $JITTER; # average jitter
103	our $tick_start; # for load detecting purposes	135	our $TICK_START; # for load detecting purposes
		136
		137	our @POST_INIT;
		138
		139	our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
104		140
105	binmode STDOUT;	141	binmode STDOUT;
106	binmode STDERR;	142	binmode STDERR;
107		143
108	# read virtual server time, if available	144	# read virtual server time, if available
109	unless ($RUNTIME || !-e "$LOCALDIR/runtime") {	145	unless ($RUNTIME || !-e $RUNTIMEFILE) {
110	open my $fh, "<", "$LOCALDIR/runtime"	146	open my $fh, "<", $RUNTIMEFILE
111	or die "unable to read runtime file: $!";	147	or die "unable to read $RUNTIMEFILE file: $!";
112	$RUNTIME = <$fh> + 0.;	148	$RUNTIME = <$fh> + 0.;
113	}	149	}
		150
		151	eval "sub TICK() { $TICK } 1" or die;
114		152
115	mkdir $_	153	mkdir $_
116	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;	154	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
117		155
118	our $EMERGENCY_POSITION;	156	our $EMERGENCY_POSITION;
…		…
161		199
162	The raw value load value from the last tick.	200	The raw value load value from the last tick.
163		201
164	=item %cf::CFG	202	=item %cf::CFG
165		203
166	Configuration for the server, loaded from C</etc/crossfire/config>, or	204	Configuration for the server, loaded from C</etc/deliantra-server/config>, or
167	from wherever your confdir points to.	205	from wherever your confdir points to.
168		206
169	=item cf::wait_for_tick, cf::wait_for_tick_begin	207	=item cf::wait_for_tick, cf::wait_for_tick_begin
170		208
171	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	209	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
…		…
192	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	230	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
193		231
194	LOG llevError, $msg;	232	LOG llevError, $msg;
195	};	233	};
196	}	234	}
		235
		236	$Coro::State::DIEHOOK = sub {
		237	return unless $^S eq 0; # "eq", not "=="
		238
		239	if ($Coro::current == $Coro::main) {#d#
		240	warn "DIEHOOK called in main context, Coro bug?\n";#d#
		241	return;#d#
		242	}#d#
		243
		244	# kill coroutine otherwise
		245	warn Carp::longmess $_[0];
		246	Coro::terminate
		247	};
		248
		249	$SIG{__DIE__} = sub { }; #d#?
197		250
198	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	251	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
199	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	252	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
200	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	253	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
201	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	254	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
…		…
208	for my $pkg (qw(	261	for my $pkg (qw(
209	cf::global cf::attachable	262	cf::global cf::attachable
210	cf::object cf::object::player	263	cf::object cf::object::player
211	cf::client cf::player	264	cf::client cf::player
212	cf::arch cf::living	265	cf::arch cf::living
		266	cf::map cf::mapspace
213	cf::map cf::party cf::region	267	cf::party cf::region
214	)) {	268	)) {
215	no strict 'refs';
216	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	269	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
217	}	270	}
218		271
219	$Event::DIED = sub {	272	$EV::DIED = sub {
220	warn "error in event callback: @_";	273	warn "error in event callback: @_";
221	};	274	};
222		275
223	#############################################################################	276	#############################################################################
224		277
…		…
247	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	300	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
248	$d	301	$d
249	} || "[unable to dump $_[0]: '$@']";	302	} || "[unable to dump $_[0]: '$@']";
250	}	303	}
251		304
252	=item $ref = cf::from_json $json	305	=item $ref = cf::decode_json $json
253		306
254	Converts a JSON string into the corresponding perl data structure.	307	Converts a JSON string into the corresponding perl data structure.
255		308
256	=item $json = cf::to_json $ref	309	=item $json = cf::encode_json $ref
257		310
258	Converts a perl data structure into its JSON representation.	311	Converts a perl data structure into its JSON representation.
259		312
260	=cut	313	=cut
261		314
262	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	315	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
263		316
264	sub to_json ($) { $json_coder->encode ($_[0]) }	317	sub encode_json($) { $json_coder->encode ($_[0]) }
265	sub from_json ($) { $json_coder->decode ($_[0]) }	318	sub decode_json($) { $json_coder->decode ($_[0]) }
		319
		320	=item cf::post_init { BLOCK }
		321
		322	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
		323	but I<before> the server starts ticking again.
		324
		325	The cdoeblock will have a single boolean argument to indicate whether this
		326	is a reload or not.
		327
		328	=cut
		329
		330	sub post_init(&) {
		331	push @POST_INIT, shift;
		332	}
266		333
267	=item cf::lock_wait $string	334	=item cf::lock_wait $string
268		335
269	Wait until the given lock is available. See cf::lock_acquire.	336	Wait until the given lock is available. See cf::lock_acquire.
270		337
271	=item my $lock = cf::lock_acquire $string	338	=item my $lock = cf::lock_acquire $string
272		339
273	Wait until the given lock is available and then acquires it and returns	340	Wait until the given lock is available and then acquires it and returns
274	a Coro::guard object. If the guard object gets destroyed (goes out of scope,	341	a L<Guard> object. If the guard object gets destroyed (goes out of scope,
275	for example when the coroutine gets canceled), the lock is automatically	342	for example when the coroutine gets canceled), the lock is automatically
276	returned.	343	returned.
277		344
278	Locks are *not* recursive, locking from the same coro twice results in a	345	Locks are *not* recursive, locking from the same coro twice results in a
279	deadlocked coro.	346	deadlocked coro.
…		…
285		352
286	Return true if the lock is currently active, i.e. somebody has locked it.	353	Return true if the lock is currently active, i.e. somebody has locked it.
287		354
288	=cut	355	=cut
289		356
290	our %LOCK;	357	our $LOCKS = new Coro::SemaphoreSet;
291	our %LOCKER;#d#
292		358
293	sub lock_wait($) {	359	sub lock_wait($) {
294	my ($key) = @_;	360	$LOCKS->wait ($_[0]);
295
296	if ($LOCKER{$key} == $Coro::current) {#d#
297	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
298	return;#d#
299	}#d#
300
301	# wait for lock, if any
302	while ($LOCK{$key}) {
303	push @{ $LOCK{$key} }, $Coro::current;
304	Coro::schedule;
305	}
306	}	361	}
307		362
308	sub lock_acquire($) {	363	sub lock_acquire($) {
309	my ($key) = @_;	364	$LOCKS->guard ($_[0])
310
311	# wait, to be sure we are not locked
312	lock_wait $key;
313
314	$LOCK{$key} = [];
315	$LOCKER{$key} = $Coro::current;#d#
316
317	Coro::guard {
318	delete $LOCKER{$key};#d#
319	# wake up all waiters, to be on the safe side
320	$_->ready for @{ delete $LOCK{$key} };
321	}
322	}	365	}
323		366
324	sub lock_active($) {	367	sub lock_active($) {
325	my ($key) = @_;	368	$LOCKS->count ($_[0]) < 1
326
327	! ! $LOCK{$key}
328	}	369	}
329		370
330	sub freeze_mainloop {	371	sub freeze_mainloop {
331	return unless $TICK_WATCHER->is_active;	372	tick_inhibit_inc;
332		373
333	my $guard = Coro::guard {	374	&Guard::guard (\&tick_inhibit_dec);
334	$TICK_WATCHER->start;	375	}
335	};	376
336	$TICK_WATCHER->stop;	377	=item cf::periodic $interval, $cb
337	$guard	378
		379	Like EV::periodic, but randomly selects a starting point so that the actions
		380	get spread over timer.
		381
		382	=cut
		383
		384	sub periodic($$) {
		385	my ($interval, $cb) = @_;
		386
		387	my $start = rand List::Util::min 180, $interval;
		388
		389	EV::periodic $start, $interval, 0, $cb
338	}	390	}
339		391
340	=item cf::get_slot $time[, $priority[, $name]]	392	=item cf::get_slot $time[, $priority[, $name]]
341		393
342	Allocate $time seconds of blocking CPU time at priority C<$priority>:	394	Allocate $time seconds of blocking CPU time at priority C<$priority>:
…		…
353	our @SLOT_QUEUE;	405	our @SLOT_QUEUE;
354	our $SLOT_QUEUE;	406	our $SLOT_QUEUE;
355		407
356	$SLOT_QUEUE->cancel if $SLOT_QUEUE;	408	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
357	$SLOT_QUEUE = Coro::async {	409	$SLOT_QUEUE = Coro::async {
		410	$Coro::current->desc ("timeslot manager");
		411
358	my $signal = new Coro::Signal;	412	my $signal = new Coro::Signal;
359		413
360	while () {	414	while () {
361	next_job:	415	next_job:
362	my $avail = cf::till_tick;	416	my $avail = cf::till_tick;
…		…
370	}	424	}
371	}	425	}
372	}	426	}
373		427
374	if (@SLOT_QUEUE) {	428	if (@SLOT_QUEUE) {
375	# we do not use wait_For_tick() as it returns immediately when tick is inactive	429	# we do not use wait_for_tick() as it returns immediately when tick is inactive
376	push @cf::WAIT_FOR_TICK, $signal;	430	push @cf::WAIT_FOR_TICK, $signal;
377	$signal->wait;	431	$signal->wait;
378	} else {	432	} else {
379	Coro::schedule;	433	Coro::schedule;
380	}	434	}
381	}	435	}
382	};	436	};
383		437
384	sub get_slot($;$$) {	438	sub get_slot($;$$) {
		439	return if tick_inhibit || $Coro::current == $Coro::main;
		440
385	my ($time, $pri, $name) = @_;	441	my ($time, $pri, $name) = @_;
386		442
387	$time = $TICK * .6 if $time > $TICK * .6;	443	$time = $TICK * .6 if $time > $TICK * .6;
388	my $sig = new Coro::Signal;	444	my $sig = new Coro::Signal;
389		445
…		…
403		459
404	BEGIN { *async = \&Coro::async_pool }	460	BEGIN { *async = \&Coro::async_pool }
405		461
406	=item cf::sync_job { BLOCK }	462	=item cf::sync_job { BLOCK }
407		463
408	The design of Crossfire TRT requires that the main coroutine ($Coro::main)	464	The design of Deliantra requires that the main coroutine ($Coro::main)
409	is always able to handle events or runnable, as Crossfire TRT is only	465	is always able to handle events or runnable, as Deliantra is only
410	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not	466	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
411	acceptable.	467	acceptable.
412		468
413	If it must be done, put the blocking parts into C<sync_job>. This will run	469	If it must be done, put the blocking parts into C<sync_job>. This will run
414	the given BLOCK in another coroutine while waiting for the result. The	470	the given BLOCK in another coroutine while waiting for the result. The
…		…
419		475
420	sub sync_job(&) {	476	sub sync_job(&) {
421	my ($job) = @_;	477	my ($job) = @_;
422		478
423	if ($Coro::current == $Coro::main) {	479	if ($Coro::current == $Coro::main) {
424	my $time = Event::time;	480	my $time = EV::time;
425		481
426	# this is the main coro, too bad, we have to block	482	# this is the main coro, too bad, we have to block
427	# till the operation succeeds, freezing the server :/	483	# till the operation succeeds, freezing the server :/
428		484
429	# TODO: use suspend/resume instead	485	LOG llevError, Carp::longmess "sync job";#d#
430	# (but this is cancel-safe)	486
431	my $freeze_guard = freeze_mainloop;	487	my $freeze_guard = freeze_mainloop;
432		488
433	my $busy = 1;	489	my $busy = 1;
434	my @res;	490	my @res;
435		491
436	(async {	492	(async {
		493	$Coro::current->desc ("sync job coro");
437	@res = eval { $job->() };	494	@res = eval { $job->() };
438	warn $@ if $@;	495	warn $@ if $@;
439	undef $busy;	496	undef $busy;
440	})->prio (Coro::PRIO_MAX);	497	})->prio (Coro::PRIO_MAX);
441		498
442	while ($busy) {	499	while ($busy) {
443	Coro::cede or Event::one_event;	500	if (Coro::nready) {
		501	Coro::cede_notself;
		502	} else {
		503	EV::loop EV::LOOP_ONESHOT;
444	}	504	}
		505	}
445		506
446	$time = Event::time - $time;	507	my $time = EV::time - $time;
447		508
448	LOG llevError | logBacktrace, Carp::longmess "long sync job"
449	if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
450
451	$tick_start += $time; # do not account sync jobs to server load	509	$TICK_START += $time; # do not account sync jobs to server load
452		510
453	wantarray ? @res : $res[0]	511	wantarray ? @res : $res[0]
454	} else {	512	} else {
455	# we are in another coroutine, how wonderful, everything just works	513	# we are in another coroutine, how wonderful, everything just works
456		514
…		…
481	=item fork_call { }, $args	539	=item fork_call { }, $args
482		540
483	Executes the given code block with the given arguments in a seperate	541	Executes the given code block with the given arguments in a seperate
484	process, returning the results. Everything must be serialisable with	542	process, returning the results. Everything must be serialisable with
485	Coro::Storable. May, of course, block. Note that the executed sub may	543	Coro::Storable. May, of course, block. Note that the executed sub may
486	never block itself or use any form of Event handling.	544	never block itself or use any form of event handling.
487		545
488	=cut	546	=cut
489		547
490	sub fork_call(&@) {	548	sub fork_call(&@) {
491	my ($cb, @args) = @_;	549	my ($cb, @args) = @_;
…		…
498	reset_signals;	556	reset_signals;
499	&$cb	557	&$cb
500	}, @args;	558	}, @args;
501		559
502	wantarray ? @res : $res[-1]	560	wantarray ? @res : $res[-1]
		561	}
		562
		563	=item $coin = coin_from_name $name
		564
		565	=cut
		566
		567	our %coin_alias = (
		568	"silver" => "silvercoin",
		569	"silvercoin" => "silvercoin",
		570	"silvercoins" => "silvercoin",
		571	"gold" => "goldcoin",
		572	"goldcoin" => "goldcoin",
		573	"goldcoins" => "goldcoin",
		574	"platinum" => "platinacoin",
		575	"platinumcoin" => "platinacoin",
		576	"platinumcoins" => "platinacoin",
		577	"platina" => "platinacoin",
		578	"platinacoin" => "platinacoin",
		579	"platinacoins" => "platinacoin",
		580	"royalty" => "royalty",
		581	"royalties" => "royalty",
		582	);
		583
		584	sub coin_from_name($) {
		585	$coin_alias{$_[0]}
		586	? cf::arch::find $coin_alias{$_[0]}
		587	: undef
503	}	588	}
504		589
505	=item $value = cf::db_get $family => $key	590	=item $value = cf::db_get $family => $key
506		591
507	Returns a single value from the environment database.	592	Returns a single value from the environment database.
…		…
646		731
647	#############################################################################	732	#############################################################################
648		733
649	=head2 ATTACHABLE OBJECTS	734	=head2 ATTACHABLE OBJECTS
650		735
651	Many objects in crossfire are so-called attachable objects. That means you can	736	Many objects in deliantra are so-called attachable objects. That means you can
652	attach callbacks/event handlers (a collection of which is called an "attachment")	737	attach callbacks/event handlers (a collection of which is called an "attachment")
653	to it. All such attachable objects support the following methods.	738	to it. All such attachable objects support the following methods.
654		739
655	In the following description, CLASS can be any of C<global>, C<object>	740	In the following description, CLASS can be any of C<global>, C<object>
656	C<player>, C<client> or C<map> (i.e. the attachable objects in	741	C<player>, C<client> or C<map> (i.e. the attachable objects in
657	Crossfire TRT).	742	Deliantra).
658		743
659	=over 4	744	=over 4
660		745
661	=item $attachable->attach ($attachment, key => $value...)	746	=item $attachable->attach ($attachment, key => $value...)
662		747
…		…
706	=item cf::CLASS::attachment $name, ...	791	=item cf::CLASS::attachment $name, ...
707		792
708	Register an attachment by C<$name> through which attachable objects of the	793	Register an attachment by C<$name> through which attachable objects of the
709	given CLASS can refer to this attachment.	794	given CLASS can refer to this attachment.
710		795
711	Some classes such as crossfire maps and objects can specify attachments	796	Some classes such as deliantra maps and objects can specify attachments
712	that are attached at load/instantiate time, thus the need for a name.	797	that are attached at load/instantiate time, thus the need for a name.
713		798
714	These calls expect any number of the following handler/hook descriptions:	799	These calls expect any number of the following handler/hook descriptions:
715		800
716	=over 4	801	=over 4
…		…
944	}	1029	}
945		1030
946	0	1031	0
947	}	1032	}
948		1033
949	=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...)	1034	=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
950		1035
951	=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)	1036	=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
952		1037
953	Generate an object-specific event with the given arguments.	1038	Generate an object-specific event with the given arguments.
954		1039
…		…
960		1045
961	=cut	1046	=cut
962		1047
963	#############################################################################	1048	#############################################################################
964	# object support	1049	# object support
965	#
966		1050
		1051	sub _object_equal($$);
		1052	sub _object_equal($$) {
		1053	my ($a, $b) = @_;
		1054
		1055	return 0 unless (ref $a) eq (ref $b);
		1056
		1057	if ("HASH" eq ref $a) {
		1058	my @ka = keys %$a;
		1059	my @kb = keys %$b;
		1060
		1061	return 0 if @ka != @kb;
		1062
		1063	for (0 .. $#ka) {
		1064	return 0 unless $ka[$_] eq $kb[$_];
		1065	return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
		1066	}
		1067
		1068	} elsif ("ARRAY" eq ref $a) {
		1069
		1070	return 0 if @$a != @$b;
		1071
		1072	for (0 .. $#$a) {
		1073	return 0 unless _object_equal $a->[$_], $b->[$_];
		1074	}
		1075
		1076	} elsif ($a ne $b) {
		1077	return 0;
		1078	}
		1079
		1080	1
		1081	}
		1082
		1083	our $SLOW_MERGES;#d#
967	sub _can_merge {	1084	sub _can_merge {
968	my ($ob1, $ob2) = @_;	1085	my ($ob1, $ob2) = @_;
969		1086
970	local $Storable::canonical = 1;	1087	++$SLOW_MERGES;#d#
971	my $fob1 = Storable::freeze $ob1;
972	my $fob2 = Storable::freeze $ob2;
973		1088
974	$fob1 eq $fob2	1089	# we do the slow way here
		1090	return _object_equal $ob1, $ob2
975	}	1091	}
976		1092
977	sub reattach {	1093	sub reattach {
978	# basically do the same as instantiate, without calling instantiate	1094	# basically do the same as instantiate, without calling instantiate
979	my ($obj) = @_;	1095	my ($obj) = @_;
980		1096
		1097	# no longer needed after getting rid of delete_package?
981	bless $obj, ref $obj; # re-bless in case extensions have been reloaded	1098	#bless $obj, ref $obj; # re-bless in case extensions have been reloaded
982		1099
983	my $registry = $obj->registry;	1100	my $registry = $obj->registry;
984		1101
985	@$registry = ();	1102	@$registry = ();
986		1103
…		…
1001	cf::attachable->attach (	1118	cf::attachable->attach (
1002	prio => -1000000,	1119	prio => -1000000,
1003	on_instantiate => sub {	1120	on_instantiate => sub {
1004	my ($obj, $data) = @_;	1121	my ($obj, $data) = @_;
1005		1122
1006	$data = from_json $data;	1123	$data = decode_json $data;
1007		1124
1008	for (@$data) {	1125	for (@$data) {
1009	my ($name, $args) = @$_;	1126	my ($name, $args) = @$_;
1010		1127
1011	$obj->attach ($name, %{$args || {} });	1128	$obj->attach ($name, %{$args || {} });
…		…
1024	},	1141	},
1025	);	1142	);
1026		1143
1027	sub object_freezer_save {	1144	sub object_freezer_save {
1028	my ($filename, $rdata, $objs) = @_;	1145	my ($filename, $rdata, $objs) = @_;
1029
1030	my $guard = cf::lock_acquire "io";
1031		1146
1032	sync_job {	1147	sync_job {
1033	if (length $$rdata) {	1148	if (length $$rdata) {
1034	utf8::decode (my $decname = $filename);	1149	utf8::decode (my $decname = $filename);
1035	warn sprintf "saving %s (%d,%d)\n",	1150	warn sprintf "saving %s (%d,%d)\n",
1036	$decname, length $$rdata, scalar @$objs;	1151	$decname, length $$rdata, scalar @$objs;
1037		1152
1038	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1153	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1039	chmod SAVE_MODE, $fh;	1154	aio_chmod $fh, SAVE_MODE;
1040	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1155	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1041	aio_fsync $fh if $cf::USE_FSYNC;	1156	aio_fsync $fh if $cf::USE_FSYNC;
1042	close $fh;	1157	aio_close $fh;
1043		1158
1044	if (@$objs) {	1159	if (@$objs) {
1045	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {	1160	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1046	chmod SAVE_MODE, $fh;	1161	aio_chmod $fh, SAVE_MODE;
1047	my $data = Storable::nfreeze { version => 1, objs => $objs };	1162	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1048	aio_write $fh, 0, (length $data), $data, 0;	1163	aio_write $fh, 0, (length $data), $data, 0;
1049	aio_fsync $fh if $cf::USE_FSYNC;	1164	aio_fsync $fh if $cf::USE_FSYNC;
1050	close $fh;	1165	aio_close $fh;
1051	aio_rename "$filename.pst~", "$filename.pst";	1166	aio_rename "$filename.pst~", "$filename.pst";
1052	}	1167	}
1053	} else {	1168	} else {
1054	aio_unlink "$filename.pst";	1169	aio_unlink "$filename.pst";
1055	}	1170	}
1056		1171
1057	aio_rename "$filename~", $filename;	1172	aio_rename "$filename~", $filename;
		1173
		1174	$filename =~ s%/[^/]+$%%;
		1175	aio_pathsync $filename if $cf::USE_FSYNC;
1058	} else {	1176	} else {
1059	warn "FATAL: $filename~: $!\n";	1177	warn "unable to save objects: $filename~: $!\n";
1060	}	1178	}
1061	} else {	1179	} else {
1062	aio_unlink $filename;	1180	aio_unlink $filename;
1063	aio_unlink "$filename.pst";	1181	aio_unlink "$filename.pst";
1064	}	1182	}
1065	};	1183	};
1066
1067	undef $guard;
1068	}	1184	}
1069		1185
1070	sub object_freezer_as_string {	1186	sub object_freezer_as_string {
1071	my ($rdata, $objs) = @_;	1187	my ($rdata, $objs) = @_;
1072		1188
…		…
1077		1193
1078	sub object_thawer_load {	1194	sub object_thawer_load {
1079	my ($filename) = @_;	1195	my ($filename) = @_;
1080		1196
1081	my ($data, $av);	1197	my ($data, $av);
1082
1083	my $guard = cf::lock_acquire "io";
1084		1198
1085	(aio_load $filename, $data) >= 0	1199	(aio_load $filename, $data) >= 0
1086	or return;	1200	or return;
1087		1201
1088	unless (aio_stat "$filename.pst") {	1202	unless (aio_stat "$filename.pst") {
1089	(aio_load "$filename.pst", $av) >= 0	1203	(aio_load "$filename.pst", $av) >= 0
1090	or return;	1204	or return;
1091		1205
1092	undef $guard;
1093	$av = eval { (Storable::thaw $av)->{objs} };	1206	my $st = eval { Coro::Storable::thaw $av };
		1207	$av = $st->{objs};
1094	}	1208	}
1095		1209
1096	utf8::decode (my $decname = $filename);	1210	utf8::decode (my $decname = $filename);
1097	warn sprintf "loading %s (%d,%d)\n",	1211	warn sprintf "loading %s (%d,%d)\n",
1098	$decname, length $data, scalar @{$av || []};	1212	$decname, length $data, scalar @{$av || []};
…		…
1159	my ($name, $cb) = @_;	1273	my ($name, $cb) = @_;
1160		1274
1161	$EXTICMD{$name} = $cb;	1275	$EXTICMD{$name} = $cb;
1162	}	1276	}
1163		1277
		1278	use File::Glob ();
		1279
1164	cf::player->attach (	1280	cf::player->attach (
1165	on_command => sub {	1281	on_command => sub {
1166	my ($pl, $name, $params) = @_;	1282	my ($pl, $name, $params) = @_;
1167		1283
1168	my $cb = $COMMAND{$name}	1284	my $cb = $COMMAND{$name}
…		…
1200		1316
1201	cf::override;	1317	cf::override;
1202	},	1318	},
1203	);	1319	);
1204		1320
		1321	# "readahead" all extensions
		1322	sub cache_extensions {
		1323	my $grp = IO::AIO::aio_group;
		1324
		1325	add $grp IO::AIO::aio_readdir $LIBDIR, sub {
		1326	for (grep /\.ext$/, @{$_[0]}) {
		1327	add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
		1328	}
		1329	};
		1330
		1331	$grp
		1332	}
		1333
1205	sub load_extensions {	1334	sub load_extensions {
1206	cf::sync_job {	1335	cf::sync_job {
1207	my %todo;	1336	my %todo;
1208		1337
1209	for my $path (<$LIBDIR/*.ext>) {	1338	for my $path (<$LIBDIR/*.ext>) {
…		…
1228		1357
1229	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1358	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1230	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1359	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1231		1360
1232	$ext{source} =	1361	$ext{source} =
1233	"package $pkg; use strict; use utf8;\n"	1362	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1234	. "#line 1 \"$path\"\n{\n"	1363	. "#line 1 \"$path\"\n{\n"
1235	. $source	1364	. $source
1236	. "\n};\n1";	1365	. "\n};\n1";
1237		1366
1238	$todo{$base} = \%ext;	1367	$todo{$base} = \%ext;
…		…
1254	my $msg = $@ ? "$v->{path}: $@\n"	1383	my $msg = $@ ? "$v->{path}: $@\n"
1255	: "$v->{base}: extension inactive.\n";	1384	: "$v->{base}: extension inactive.\n";
1256		1385
1257	if (exists $v->{meta}{mandatory}) {	1386	if (exists $v->{meta}{mandatory}) {
1258	warn $msg;	1387	warn $msg;
1259	warn "mandatory extension failed to load, exiting.\n";	1388	cf::cleanup "mandatory extension failed to load, exiting.";
1260	exit 1;
1261	}	1389	}
1262		1390
1263	warn $msg;	1391	warn $msg;
1264	}	1392	}
1265		1393
…		…
1279		1407
1280	=back	1408	=back
1281		1409
1282	=head2 CORE EXTENSIONS	1410	=head2 CORE EXTENSIONS
1283		1411
1284	Functions and methods that extend core crossfire objects.	1412	Functions and methods that extend core deliantra objects.
1285		1413
1286	=cut	1414	=cut
1287		1415
1288	package cf::player;	1416	package cf::player;
1289		1417
…		…
1332		1460
1333	sub exists($) {	1461	sub exists($) {
1334	my ($login) = @_;	1462	my ($login) = @_;
1335		1463
1336	$cf::PLAYER{$login}	1464	$cf::PLAYER{$login}
1337	or cf::sync_job { !aio_stat path $login }	1465	or !aio_stat path $login
1338	}	1466	}
1339		1467
1340	sub find($) {	1468	sub find($) {
1341	return $cf::PLAYER{$_[0]} || do {	1469	return $cf::PLAYER{$_[0]} || do {
1342	my $login = $_[0];	1470	my $login = $_[0];
…		…
1352	aio_unlink +(playerdir $login) . "/$login.pl";	1480	aio_unlink +(playerdir $login) . "/$login.pl";
1353		1481
1354	my $f = new_from_file cf::object::thawer path $login	1482	my $f = new_from_file cf::object::thawer path $login
1355	or return;	1483	or return;
1356		1484
1357	$f->next;
1358	my $pl = cf::player::load_pl $f	1485	my $pl = cf::player::load_pl $f
1359	or return;	1486	or return;
		1487
1360	local $cf::PLAYER_LOADING{$login} = $pl;	1488	local $cf::PLAYER_LOADING{$login} = $pl;
1361	$f->resolve_delayed_derefs;	1489	$f->resolve_delayed_derefs;
1362	$cf::PLAYER{$login} = $pl	1490	$cf::PLAYER{$login} = $pl
1363	}	1491	}
1364	}	1492	}
…		…
1374		1502
1375	return if $pl->{deny_save};	1503	return if $pl->{deny_save};
1376		1504
1377	aio_mkdir playerdir $pl, 0770;	1505	aio_mkdir playerdir $pl, 0770;
1378	$pl->{last_save} = $cf::RUNTIME;	1506	$pl->{last_save} = $cf::RUNTIME;
		1507
		1508	cf::get_slot 0.01;
1379		1509
1380	$pl->save_pl ($path);	1510	$pl->save_pl ($path);
1381	cf::cede_to_tick;	1511	cf::cede_to_tick;
1382	}	1512	}
1383		1513
…		…
1415	my ($pl) = @_;	1545	my ($pl) = @_;
1416		1546
1417	my $name = $pl->ob->name;	1547	my $name = $pl->ob->name;
1418		1548
1419	$pl->{deny_save} = 1;	1549	$pl->{deny_save} = 1;
1420	$pl->password ("*"); # this should lock out the player until we nuked the dir	1550	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1421		1551
1422	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1552	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1423	$pl->deactivate;	1553	$pl->deactivate;
		1554	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
		1555	$pl->ob->check_score;
1424	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1556	$pl->invoke (cf::EVENT_PLAYER_QUIT);
1425	$pl->ns->destroy if $pl->ns;	1557	$pl->ns->destroy if $pl->ns;
1426		1558
1427	my $path = playerdir $pl;	1559	my $path = playerdir $pl;
1428	my $temp = "$path~$cf::RUNTIME~deleting~";	1560	my $temp = "$path~$cf::RUNTIME~deleting~";
…		…
1467		1599
1468	for my $login (@$dirs) {	1600	for my $login (@$dirs) {
1469	my $path = path $login;	1601	my $path = path $login;
1470		1602
1471	# a .pst is a dead give-away for a valid player	1603	# a .pst is a dead give-away for a valid player
1472	unless (-e "$path.pst") {	1604	# if no pst file found, open and chekc for blocked users
		1605	if (aio_stat "$path.pst") {
1473	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;	1606	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1474	aio_read $fh, 0, 512, my $buf, 0 or next;	1607	aio_read $fh, 0, 512, my $buf, 0 or next;
1475	$buf !~ /^password -------------$/m or next; # official not-valid tag	1608	$buf !~ /^password -------------$/m or next; # official not-valid tag
1476	}	1609	}
1477		1610
…		…
1508	}	1641	}
1509		1642
1510	\@paths	1643	\@paths
1511	}	1644	}
1512		1645
1513	=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)	1646	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1514		1647
1515	Expand crossfire pod fragments into protocol xml.	1648	Expand deliantra pod fragments into protocol xml.
1516
1517	=cut
1518
1519	sub expand_cfpod {
1520	((my $self), (local $_)) = @_;
1521
1522	# escape & and <
1523	s/&/&amp;/g;
1524	s/(?<![BIUGHT])</&lt;/g;
1525
1526	# this is buggy, it needs to properly take care of nested <'s
1527
1528	1 while
1529	# replace B<>, I<>, U<> etc.
1530	s/B<([^\>]*)>/<b>$1<\/b>/
1531	|| s/I<([^\>]*)>/<i>$1<\/i>/
1532	|| s/U<([^\>]*)>/<u>$1<\/u>/
1533	|| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1534	# replace G<male|female> tags
1535	|| s{G<([^>|]*)\|([^>]*)>}{
1536	$self->gender ? $2 : $1
1537	}ge
1538	# replace H<hint text>
1539	|| s{H<([^\>]*)>}
1540	{
1541	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1542	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1543	"")
1544	[$self->{hintmode}]
1545	}ge;
1546
1547	# create single paragraphs (very hackish)
1548	s/(?<=\S)\n(?=\w)/ /g;
1549
1550	# compress some whitespace
1551	s/\s+\n/\n/g; # ws line-ends
1552	s/\n\n+/\n/g; # double lines
1553	s/^\n+//; # beginning lines
1554	s/\n+$//; # ending lines
1555
1556	$_
1557	}
1558
1559	sub hintmode {
1560	$_[0]{hintmode} = $_[1] if @_ > 1;
1561	$_[0]{hintmode}
1562	}
1563		1649
1564	=item $player->ext_reply ($msgid, @msg)	1650	=item $player->ext_reply ($msgid, @msg)
1565		1651
1566	Sends an ext reply to the player.	1652	Sends an ext reply to the player.
1567		1653
…		…
1634	our $MAX_RESET = 3600;	1720	our $MAX_RESET = 3600;
1635	our $DEFAULT_RESET = 3000;	1721	our $DEFAULT_RESET = 3000;
1636		1722
1637	sub generate_random_map {	1723	sub generate_random_map {
1638	my ($self, $rmp) = @_;	1724	my ($self, $rmp) = @_;
		1725
		1726	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
		1727
1639	# mit "rum" bekleckern, nicht	1728	# mit "rum" bekleckern, nicht
1640	$self->_create_random_map (	1729	$self->_create_random_map (
1641	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},	1730	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1642	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},	1731	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1643	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},	1732	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
…		…
1765		1854
1766	# the temporary/swap location	1855	# the temporary/swap location
1767	sub save_path {	1856	sub save_path {
1768	my ($self) = @_;	1857	my ($self) = @_;
1769		1858
1770	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1859	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1771	"$TMPDIR/$path.map"	1860	"$TMPDIR/$path.map"
1772	}	1861	}
1773		1862
1774	# the unique path, undef == no special unique path	1863	# the unique path, undef == no special unique path
1775	sub uniq_path {	1864	sub uniq_path {
1776	my ($self) = @_;	1865	my ($self) = @_;
1777		1866
1778	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1867	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1779	"$UNIQUEDIR/$path"	1868	"$UNIQUEDIR/$path"
1780	}
1781
1782	# and all this just because we cannot iterate over
1783	# all maps in C++...
1784	sub change_all_map_light {
1785	my ($change) = @_;
1786
1787	$_->change_map_light ($change)
1788	for grep $_->outdoor, values %cf::MAP;
1789	}	1869	}
1790		1870
1791	sub decay_objects {	1871	sub decay_objects {
1792	my ($self) = @_;	1872	my ($self) = @_;
1793		1873
…		…
1877	sub find {	1957	sub find {
1878	my ($path, $origin) = @_;	1958	my ($path, $origin) = @_;
1879		1959
1880	$path = normalise $path, $origin && $origin->path;	1960	$path = normalise $path, $origin && $origin->path;
1881		1961
1882	cf::lock_wait "map_data:$path";#d#remove	1962	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1883	cf::lock_wait "map_find:$path";	1963	my $guard2 = cf::lock_acquire "map_find:$path";
1884		1964
1885	$cf::MAP{$path} || do {	1965	$cf::MAP{$path} || do {
1886	my $guard1 = cf::lock_acquire "map_find:$path";
1887	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1888
1889	my $map = new_from_path cf::map $path	1966	my $map = new_from_path cf::map $path
1890	or return;	1967	or return;
1891		1968
1892	$map->{last_save} = $cf::RUNTIME;	1969	$map->{last_save} = $cf::RUNTIME;
1893		1970
…		…
1895	or return;	1972	or return;
1896		1973
1897	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1974	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1898	# doing this can freeze the server in a sync job, obviously	1975	# doing this can freeze the server in a sync job, obviously
1899	#$cf::WAIT_FOR_TICK->wait;	1976	#$cf::WAIT_FOR_TICK->wait;
		1977	undef $guard2;
1900	undef $guard1;	1978	undef $guard1;
1901	undef $guard2;
1902	$map->reset;	1979	$map->reset;
1903	return find $path;	1980	return find $path;
1904	}	1981	}
1905		1982
1906	$cf::MAP{$path} = $map	1983	$cf::MAP{$path} = $map
…		…
1933	my $f = new_from_file cf::object::thawer $self->{load_path};	2010	my $f = new_from_file cf::object::thawer $self->{load_path};
1934	$f->skip_block;	2011	$f->skip_block;
1935	$self->_load_objects ($f)	2012	$self->_load_objects ($f)
1936	or return;	2013	or return;
1937		2014
1938	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	2015	$self->post_load_original
1939	if delete $self->{load_original};	2016	if delete $self->{load_original};
1940		2017
1941	if (my $uniq = $self->uniq_path) {	2018	if (my $uniq = $self->uniq_path) {
1942	utf8::encode $uniq;	2019	utf8::encode $uniq;
1943	unless (aio_stat $uniq) {	2020	unless (aio_stat $uniq) {
…		…
1961	unless ($self->{deny_activate}) {	2038	unless ($self->{deny_activate}) {
1962	$self->decay_objects;	2039	$self->decay_objects;
1963	$self->fix_auto_apply;	2040	$self->fix_auto_apply;
1964	$self->update_buttons;	2041	$self->update_buttons;
1965	cf::cede_to_tick;	2042	cf::cede_to_tick;
1966	$self->set_darkness_map;
1967	cf::cede_to_tick;
1968	$self->activate;	2043	$self->activate;
1969	}	2044	}
1970		2045
1971	$self->{last_save} = $cf::RUNTIME;	2046	$self->{last_save} = $cf::RUNTIME;
1972	$self->last_access ($cf::RUNTIME);	2047	$self->last_access ($cf::RUNTIME);
1973		2048
1974	$self->in_memory (cf::MAP_IN_MEMORY);	2049	$self->in_memory (cf::MAP_ACTIVE);
1975	}	2050	}
1976		2051
1977	$self->post_load;	2052	$self->post_load;
1978	}	2053	}
1979		2054
…		…
2037	my ($path, $origin, $load) = @_;	2112	my ($path, $origin, $load) = @_;
2038		2113
2039	$path = normalise $path, $origin && $origin->{path};	2114	$path = normalise $path, $origin && $origin->{path};
2040		2115
2041	if (my $map = $cf::MAP{$path}) {	2116	if (my $map = $cf::MAP{$path}) {
2042	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;	2117	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2043	}	2118	}
2044		2119
2045	$MAP_PREFETCH{$path} |= $load;	2120	$MAP_PREFETCH{$path} |= $load;
2046		2121
2047	$MAP_PREFETCHER ||= cf::async {	2122	$MAP_PREFETCHER ||= cf::async {
		2123	$Coro::current->{desc} = "map prefetcher";
		2124
2048	while (%MAP_PREFETCH) {	2125	while (%MAP_PREFETCH) {
2049	while (my ($k, $v) = each %MAP_PREFETCH) {	2126	while (my ($k, $v) = each %MAP_PREFETCH) {
2050	if (my $map = find $k) {	2127	if (my $map = find $k) {
2051	$map->load if $v;	2128	$map->load if $v;
2052	}	2129	}
…		…
2078	return if $self->{deny_save};	2155	return if $self->{deny_save};
2079		2156
2080	local $self->{last_access} = $self->last_access;#d#	2157	local $self->{last_access} = $self->last_access;#d#
2081		2158
2082	cf::async {	2159	cf::async {
		2160	$Coro::current->{desc} = "map player save";
2083	$_->contr->save for $self->players;	2161	$_->contr->save for $self->players;
2084	};	2162	};
		2163
		2164	cf::get_slot 0.02;
2085		2165
2086	if ($uniq) {	2166	if ($uniq) {
2087	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);	2167	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2088	$self->_save_objects ($uniq, cf::IO_UNIQUES);	2168	$self->_save_objects ($uniq, cf::IO_UNIQUES);
2089	} else {	2169	} else {
…		…
2098	$self->save;	2178	$self->save;
2099		2179
2100	my $lock = cf::lock_acquire "map_data:$self->{path}";	2180	my $lock = cf::lock_acquire "map_data:$self->{path}";
2101		2181
2102	return if $self->players;	2182	return if $self->players;
2103	return if $self->in_memory != cf::MAP_IN_MEMORY;	2183	return if $self->in_memory != cf::MAP_ACTIVE;
2104	return if $self->{deny_save};	2184	return if $self->{deny_save};
2105		2185
2106	$self->in_memory (cf::MAP_SWAPPED);	2186	$self->in_memory (cf::MAP_SWAPPED);
2107		2187
2108	$self->deactivate;	2188	$self->deactivate;
…		…
2226		2306
2227	sub unique_maps() {	2307	sub unique_maps() {
2228	[	2308	[
2229	map {	2309	map {
2230	utf8::decode $_;	2310	utf8::decode $_;
2231	/\.map$/	2311	s/\.map$//; # TODO future compatibility hack
		2312	/\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
		2313	? ()
2232	? normalise $_	2314	: normalise $_
2233	: ()
2234	} @{ aio_readdir $UNIQUEDIR or [] }	2315	} @{ aio_readdir $UNIQUEDIR or [] }
2235	]	2316	]
2236	}	2317	}
2237		2318
2238	package cf;
2239
2240	=back	2319	=back
2241		2320
2242	=head3 cf::object	2321	=head3 cf::object
2243		2322
2244	=cut	2323	=cut
…		…
2247		2326
2248	=over 4	2327	=over 4
2249		2328
2250	=item $ob->inv_recursive	2329	=item $ob->inv_recursive
2251		2330
2252	Returns the inventory of the object _and_ their inventories, recursively.	2331	Returns the inventory of the object I<and> their inventories, recursively,
		2332	but I<not> the object itself.
2253		2333
2254	=cut	2334	=cut
2255		2335
2256	sub inv_recursive_;	2336	sub inv_recursive_;
2257	sub inv_recursive_ {	2337	sub inv_recursive_ {
…		…
2262	inv_recursive_ inv $_[0]	2342	inv_recursive_ inv $_[0]
2263	}	2343	}
2264		2344
2265	=item $ref = $ob->ref	2345	=item $ref = $ob->ref
2266		2346
2267	creates and returns a persistent reference to an objetc that can be stored as a string.	2347	Creates and returns a persistent reference to an object that can be stored as a string.
2268		2348
2269	=item $ob = cf::object::deref ($refstring)	2349	=item $ob = cf::object::deref ($refstring)
2270		2350
2271	returns the objetc referenced by refstring. may return undef when it cnanot find the object,	2351	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2272	even if the object actually exists. May block.	2352	even if the object actually exists. May block.
…		…
2274	=cut	2354	=cut
2275		2355
2276	sub deref {	2356	sub deref {
2277	my ($ref) = @_;	2357	my ($ref) = @_;
2278		2358
2279	# temporary compatibility#TODO#remove
2280	$ref =~ s{^<}{player/<};
2281
2282	if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {	2359	if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283	my ($uuid, $name) = ($1, $2);	2360	my ($uuid, $name) = ($1, $2);
2284	my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name	2361	my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285	or return;	2362	or return;
2286	$pl->ob->uuid eq $uuid	2363	$pl->ob->uuid eq $uuid
2287	or return;	2364	or return;
…		…
2307	can be C<undef>. Does the right thing when the player is currently in a	2384	can be C<undef>. Does the right thing when the player is currently in a
2308	dialogue with the given NPC character.	2385	dialogue with the given NPC character.
2309		2386
2310	=cut	2387	=cut
2311		2388
		2389	our $SAY_CHANNEL = {
		2390	id => "say",
		2391	title => "Map",
		2392	reply => "say ",
		2393	tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
		2394	};
		2395
		2396	our $CHAT_CHANNEL = {
		2397	id => "chat",
		2398	title => "Chat",
		2399	reply => "chat ",
		2400	tooltip => "Player chat and shouts, global to the server.",
		2401	};
		2402
2312	# rough implementation of a future "reply" method that works	2403	# rough implementation of a future "reply" method that works
2313	# with dialog boxes.	2404	# with dialog boxes.
2314	#TODO: the first argument must go, split into a $npc->reply_to ( method	2405	#TODO: the first argument must go, split into a $npc->reply_to ( method
2315	sub cf::object::player::reply($$$;$) {	2406	sub cf::object::player::reply($$$;$) {
2316	my ($self, $npc, $msg, $flags) = @_;	2407	my ($self, $npc, $msg, $flags) = @_;
…		…
2327	my $dialog = $pl->{npc_dialog};	2418	my $dialog = $pl->{npc_dialog};
2328	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));	2419	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2329		2420
2330	} else {	2421	} else {
2331	$msg = $npc->name . " says: $msg" if $npc;	2422	$msg = $npc->name . " says: $msg" if $npc;
2332	$self->message ($msg, $flags);	2423	$self->send_msg ($SAY_CHANNEL => $msg, $flags);
2333	}	2424	}
2334	}	2425	}
2335	}	2426	}
2336		2427
2337	=item $object->send_msg ($channel, $msg, $color, [extra...])	2428	=item $object->send_msg ($channel, $msg, $color, [extra...])
…		…
2362		2453
2363	=item $player_object->enter_link	2454	=item $player_object->enter_link
2364		2455
2365	Freezes the player and moves him/her to a special map (C<{link}>).	2456	Freezes the player and moves him/her to a special map (C<{link}>).
2366		2457
2367	The player should be reasonably safe there for short amounts of time. You	2458	The player should be reasonably safe there for short amounts of time (e.g.
2368	I<MUST> call C<leave_link> as soon as possible, though.	2459	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
		2460	though, as the palyer cannot control the character while it is on the link
		2461	map.
2369		2462
2370	Will never block.	2463	Will never block.
2371		2464
2372	=item $player_object->leave_link ($map, $x, $y)	2465	=item $player_object->leave_link ($map, $x, $y)
2373		2466
…		…
2431		2524
2432	$map->load;	2525	$map->load;
2433	$map->load_neighbours;	2526	$map->load_neighbours;
2434		2527
2435	return unless $self->contr->active;	2528	return unless $self->contr->active;
		2529	$self->flag (cf::FLAG_DEBUG, 0);#d# temp
2436	$self->activate_recursive;	2530	$self->activate_recursive;
2437		2531
2438	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2532	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2439	$self->enter_map ($map, $x, $y);	2533	$self->enter_map ($map, $x, $y);
2440	}	2534	}
…		…
2445	her, loading and preparing them map, calling the provided $check callback	2539	her, loading and preparing them map, calling the provided $check callback
2446	that has to return the map if sucecssful, and then unfreezes the player on	2540	that has to return the map if sucecssful, and then unfreezes the player on
2447	the new (success) or old (failed) map position. In either case, $done will	2541	the new (success) or old (failed) map position. In either case, $done will
2448	be called at the end of this process.	2542	be called at the end of this process.
2449		2543
		2544	Note that $check will be called with a potentially non-loaded map, so if
		2545	it needs a loaded map it has to call C<< ->load >>.
		2546
2450	=cut	2547	=cut
2451		2548
2452	our $GOTOGEN;	2549	our $GOTOGEN;
2453		2550
2454	sub cf::object::player::goto {	2551	sub cf::object::player::goto {
…		…
2458	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2555	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2459		2556
2460	$self->enter_link;	2557	$self->enter_link;
2461		2558
2462	(async {	2559	(async {
		2560	$Coro::current->{desc} = "player::goto $path $x $y";
		2561
2463	# *tag paths override both path and x|y	2562	# *tag paths override both path and x|y
2464	if ($path =~ /^\*(.*)$/) {	2563	if ($path =~ /^\*(.*)$/) {
2465	if (my @obs = grep $_->map, ext::map_tags::find $1) {	2564	if (my @obs = grep $_->map, ext::map_tags::find $1) {
2466	my $ob = $obs[rand @obs];	2565	my $ob = $obs[rand @obs];
2467		2566
…		…
2530	}	2629	}
2531		2630
2532	sub prepare_random_map {	2631	sub prepare_random_map {
2533	my ($exit) = @_;	2632	my ($exit) = @_;
2534		2633
2535	my $guard = cf::lock_acquire "exit_prepare:$exit";
2536
2537	# all this does is basically replace the /! path by	2634	# all this does is basically replace the /! path by
2538	# a new random map path (?random/...) with a seed	2635	# a new random map path (?random/...) with a seed
2539	# that depends on the exit object	2636	# that depends on the exit object
2540		2637
2541	my $rmp = parse_random_map_params $exit->msg;	2638	my $rmp = parse_random_map_params $exit->msg;
…		…
2543	if ($exit->map) {	2640	if ($exit->map) {
2544	$rmp->{region} = $exit->region->name;	2641	$rmp->{region} = $exit->region->name;
2545	$rmp->{origin_map} = $exit->map->path;	2642	$rmp->{origin_map} = $exit->map->path;
2546	$rmp->{origin_x} = $exit->x;	2643	$rmp->{origin_x} = $exit->x;
2547	$rmp->{origin_y} = $exit->y;	2644	$rmp->{origin_y} = $exit->y;
		2645
		2646	$exit->map->touch;
2548	}	2647	}
2549		2648
2550	$rmp->{random_seed} ||= $exit->random_seed;	2649	$rmp->{random_seed} ||= $exit->random_seed;
2551		2650
2552	my $data = cf::to_json $rmp;	2651	my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2553	my $md5 = Digest::MD5::md5_hex $data;	2652	my $md5 = Digest::MD5::md5_hex $data;
2554	my $meta = "$RANDOMDIR/$md5.meta";	2653	my $meta = "$RANDOMDIR/$md5.meta";
2555		2654
2556	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {	2655	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2557	aio_write $fh, 0, (length $data), $data, 0;	2656	aio_write $fh, 0, (length $data), $data, 0;
2558	undef $fh;	2657	undef $fh;
2559	aio_rename "$meta~", $meta;	2658	aio_rename "$meta~", $meta;
2560		2659
		2660	my $slaying = "?random/$md5";
		2661
		2662	if ($exit->valid) {
2561	$exit->slaying ("?random/$md5");	2663	$exit->slaying ("?random/$md5");
2562	$exit->msg (undef);	2664	$exit->msg (undef);
		2665	}
2563	}	2666	}
2564	}	2667	}
2565		2668
2566	sub cf::object::player::enter_exit {	2669	sub cf::object::player::enter_exit {
2567	my ($self, $exit) = @_;	2670	my ($self, $exit) = @_;
2568		2671
2569	return unless $self->type == cf::PLAYER;	2672	return unless $self->type == cf::PLAYER;
2570		2673
2571	if ($exit->slaying eq "/!") {
2572	#TODO: this should de-fi-ni-te-ly not be a sync-job
2573	# the problem is that $exit might not survive long enough
2574	# so it needs to be done right now, right here
2575	cf::sync_job { prepare_random_map $exit };
2576	}
2577
2578	my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2579	my $hp = $exit->stats->hp;
2580	my $sp = $exit->stats->sp;
2581
2582	$self->enter_link;	2674	$self->enter_link;
2583		2675
2584	# if exit is damned, update players death & WoR home-position
2585	$self->contr->savebed ($slaying, $hp, $sp)
2586	if $exit->flag (FLAG_DAMNED);
2587
2588	(async {	2676	(async {
2589	$self->deactivate_recursive; # just to be sure	2677	$Coro::current->{desc} = "enter_exit";
		2678
2590	unless (eval {	2679	unless (eval {
		2680	$self->deactivate_recursive; # just to be sure
		2681
		2682	# random map handling
		2683	{
		2684	my $guard = cf::lock_acquire "exit_prepare:$exit";
		2685
		2686	prepare_random_map $exit
		2687	if $exit->slaying eq "/!";
		2688	}
		2689
		2690	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
		2691	my $x = $exit->stats->hp;
		2692	my $y = $exit->stats->sp;
		2693
2591	$self->goto ($slaying, $hp, $sp);	2694	$self->goto ($map, $x, $y);
2592		2695
		2696	# if exit is damned, update players death & WoR home-position
		2697	$self->contr->savebed ($map, $x, $y)
		2698	if $exit->flag (cf::FLAG_DAMNED);
		2699
2593	1;	2700	1
2594	}) {	2701	}) {
2595	$self->message ("Something went wrong deep within the crossfire server. "	2702	$self->message ("Something went wrong deep within the deliantra server. "
2596	. "I'll try to bring you back to the map you were before. "	2703	. "I'll try to bring you back to the map you were before. "
2597	. "Please report this to the dungeon master!",	2704	. "Please report this to the dungeon master!",
2598	cf::NDI_UNIQUE | cf::NDI_RED);	2705	cf::NDI_UNIQUE | cf::NDI_RED);
2599		2706
2600	warn "ERROR in enter_exit: $@";	2707	warn "ERROR in enter_exit: $@";
…		…
2628	the message, with C<log> being the default. If C<$color> is negative, suppress	2735	the message, with C<log> being the default. If C<$color> is negative, suppress
2629	the message unless the client supports the msg packet.	2736	the message unless the client supports the msg packet.
2630		2737
2631	=cut	2738	=cut
2632		2739
		2740	# non-persistent channels (usually the info channel)
2633	our %CHANNEL = (	2741	our %CHANNEL = (
2634	"c/identify" => {	2742	"c/identify" => {
2635	id => "identify",	2743	id => "infobox",
2636	title => "Identify",	2744	title => "Identify",
2637	reply => undef,	2745	reply => undef,
2638	tooltip => "Items recently identified",	2746	tooltip => "Items recently identified",
2639	},	2747	},
2640	"c/examine" => {	2748	"c/examine" => {
2641	id => "examine",	2749	id => "infobox",
2642	title => "Examine",	2750	title => "Examine",
2643	reply => undef,	2751	reply => undef,
2644	tooltip => "Signs and other items you examined",	2752	tooltip => "Signs and other items you examined",
2645	},	2753	},
		2754	"c/book" => {
		2755	id => "infobox",
		2756	title => "Book",
		2757	reply => undef,
		2758	tooltip => "The contents of a note or book",
		2759	},
		2760	"c/lookat" => {
		2761	id => "infobox",
		2762	title => "Look",
		2763	reply => undef,
		2764	tooltip => "What you saw there",
		2765	},
		2766	"c/who" => {
		2767	id => "infobox",
		2768	title => "Players",
		2769	reply => undef,
		2770	tooltip => "Shows players who are currently online",
		2771	},
		2772	"c/body" => {
		2773	id => "infobox",
		2774	title => "Body Parts",
		2775	reply => undef,
		2776	tooltip => "Shows which body parts you posess and are available",
		2777	},
		2778	"c/statistics" => {
		2779	id => "infobox",
		2780	title => "Statistics",
		2781	reply => undef,
		2782	tooltip => "Shows your primary statistics",
		2783	},
		2784	"c/skills" => {
		2785	id => "infobox",
		2786	title => "Skills",
		2787	reply => undef,
		2788	tooltip => "Shows your experience per skill and item power",
		2789	},
		2790	"c/resistances" => {
		2791	id => "infobox",
		2792	title => "Resistances",
		2793	reply => undef,
		2794	tooltip => "Shows your resistances",
		2795	},
		2796	"c/pets" => {
		2797	id => "infobox",
		2798	title => "Pets",
		2799	reply => undef,
		2800	tooltip => "Shows information abotu your pets/a specific pet",
		2801	},
		2802	"c/uptime" => {
		2803	id => "infobox",
		2804	title => "Uptime",
		2805	reply => undef,
		2806	tooltip => "How long the server has been running since last restart",
		2807	},
		2808	"c/mapinfo" => {
		2809	id => "infobox",
		2810	title => "Map Info",
		2811	reply => undef,
		2812	tooltip => "Information related to the maps",
		2813	},
		2814	"c/party" => {
		2815	id => "party",
		2816	title => "Party",
		2817	reply => "gsay ",
		2818	tooltip => "Messages and chat related to your party",
		2819	},
		2820	"c/death" => {
		2821	id => "death",
		2822	title => "Death",
		2823	reply => undef,
		2824	tooltip => "Reason for and more info about your most recent death",
		2825	},
		2826	"c/say" => $SAY_CHANNEL,
		2827	"c/chat" => $CHAT_CHANNEL,
2646	);	2828	);
2647		2829
2648	sub cf::client::send_msg {	2830	sub cf::client::send_msg {
2649	my ($self, $channel, $msg, $color, @extra) = @_;	2831	my ($self, $channel, $msg, $color, @extra) = @_;
2650		2832
2651	$msg = $self->pl->expand_cfpod ($msg);	2833	$msg = $self->pl->expand_cfpod ($msg)
		2834	unless $color & cf::NDI_VERBATIM;
2652		2835
2653	$color &= cf::NDI_CLIENT_MASK; # just in case...	2836	$color &= cf::NDI_CLIENT_MASK; # just in case...
2654		2837
2655	# check predefined channels, for the benefit of C	2838	# check predefined channels, for the benefit of C
2656	$channel = $CHANNEL{$channel} if $CHANNEL{$channel};	2839	if ($CHANNEL{$channel}) {
		2840	$channel = $CHANNEL{$channel};
2657		2841
		2842	$self->ext_msg (channel_info => $channel);
		2843	$channel = $channel->{id};
		2844
2658	if (ref $channel) {	2845	} elsif (ref $channel) {
2659	# send meta info to client, if not yet sent	2846	# send meta info to client, if not yet sent
2660	unless (exists $self->{channel}{$channel->{id}}) {	2847	unless (exists $self->{channel}{$channel->{id}}) {
2661	$self->{channel}{$channel->{id}} = $channel;	2848	$self->{channel}{$channel->{id}} = $channel;
2662	$self->ext_msg (channel_info => $channel)	2849	$self->ext_msg (channel_info => $channel);
2663	if $self->can_msg;
2664	}	2850	}
2665		2851
2666	$channel = $channel->{id};	2852	$channel = $channel->{id};
2667	}	2853	}
2668		2854
2669	return unless @extra || length $msg;	2855	return unless @extra || length $msg;
2670		2856
2671	if ($self->can_msg) {
2672	# default colour, mask it out	2857	# default colour, mask it out
2673	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)	2858	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2674	if $color & cf::NDI_DEF;	2859	if $color & cf::NDI_DEF;
2675		2860
2676	$self->send_packet ("msg " . $self->{json_coder}->encode (	2861	my $pkt = "msg "
		2862	. $self->{json_coder}->encode (
2677	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));	2863	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2678	} else {	2864	);
2679	if ($color >= 0) {
2680	# replace some tags by gcfclient-compatible ones
2681	for ($msg) {
2682	1 while
2683	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2684	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2685	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2686	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2687	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2688	}
2689		2865
2690	$color &= cf::NDI_COLOR_MASK;	2866	# try lzf for large packets
		2867	$pkt = "lzf " . Compress::LZF::compress $pkt
		2868	if 1024 <= length $pkt and $self->{can_lzf};
2691		2869
2692	utf8::encode $msg;	2870	# split very large packets
2693		2871	if (8192 < length $pkt and $self->{can_lzf}) {
2694	if (0 && $msg =~ /\[/) {	2872	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2695	# COMMAND/INFO	2873	$pkt = "frag";
2696	$self->send_packet ("drawextinfo $color 10 8 $msg")
2697	} else {
2698	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2699	$self->send_packet ("drawinfo $color $msg")
2700	}
2701	}
2702	}	2874	}
		2875
		2876	$self->send_packet ($pkt);
2703	}	2877	}
2704		2878
2705	=item $client->ext_msg ($type, @msg)	2879	=item $client->ext_msg ($type, @msg)
2706		2880
2707	Sends an ext event to the client.	2881	Sends an ext event to the client.
…		…
2880	=pod	3054	=pod
2881		3055
2882	The following functions and methods are available within a safe environment:	3056	The following functions and methods are available within a safe environment:
2883		3057
2884	cf::object	3058	cf::object
2885	contr pay_amount pay_player map x y force_find force_add	3059	contr pay_amount pay_player map x y force_find force_add destroy
2886	insert remove name archname title slaying race decrease_ob_nr	3060	insert remove name archname title slaying race decrease split
		3061	value
2887		3062
2888	cf::object::player	3063	cf::object::player
2889	player	3064	player
2890		3065
2891	cf::player	3066	cf::player
…		…
2896		3071
2897	=cut	3072	=cut
2898		3073
2899	for (	3074	for (
2900	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	3075	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2901	insert remove inv name archname title slaying race	3076	insert remove inv nrof name archname title slaying race
2902	decrease_ob_nr)],	3077	decrease split destroy change_exp value msg lore send_msg)],
2903	["cf::object::player" => qw(player)],	3078	["cf::object::player" => qw(player)],
2904	["cf::player" => qw(peaceful)],	3079	["cf::player" => qw(peaceful send_msg)],
2905	["cf::map" => qw(trigger)],	3080	["cf::map" => qw(trigger)],
2906	) {	3081	) {
2907	no strict 'refs';	3082	no strict 'refs';
2908	my ($pkg, @funs) = @$_;	3083	my ($pkg, @funs) = @$_;
2909	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3084	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
…		…
2926	my ($code, %vars) = @_;	3101	my ($code, %vars) = @_;
2927		3102
2928	my $qcode = $code;	3103	my $qcode = $code;
2929	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3104	$qcode =~ s/"/‟/g; # not allowed in #line filenames
2930	$qcode =~ s/\n/\\n/g;	3105	$qcode =~ s/\n/\\n/g;
		3106
		3107	%vars = (_dummy => 0) unless %vars;
2931		3108
2932	local $_;	3109	local $_;
2933	local @safe::cf::_safe_eval_args = values %vars;	3110	local @safe::cf::_safe_eval_args = values %vars;
2934		3111
2935	my $eval =	3112	my $eval =
…		…
3012	{	3189	{
3013	my $faces = $facedata->{faceinfo};	3190	my $faces = $facedata->{faceinfo};
3014		3191
3015	while (my ($face, $info) = each %$faces) {	3192	while (my ($face, $info) = each %$faces) {
3016	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3193	my $idx = (cf::face::find $face) || cf::face::alloc $face;
		3194
3017	cf::face::set_visibility $idx, $info->{visibility};	3195	cf::face::set_visibility $idx, $info->{visibility};
3018	cf::face::set_magicmap $idx, $info->{magicmap};	3196	cf::face::set_magicmap $idx, $info->{magicmap};
3019	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};	3197	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3020	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};	3198	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3021		3199
3022	cf::cede_to_tick;	3200	cf::cede_to_tick;
3023	}	3201	}
3024		3202
3025	while (my ($face, $info) = each %$faces) {	3203	while (my ($face, $info) = each %$faces) {
3026	next unless $info->{smooth};	3204	next unless $info->{smooth};
		3205
3027	my $idx = cf::face::find $face	3206	my $idx = cf::face::find $face
3028	or next;	3207	or next;
		3208
3029	if (my $smooth = cf::face::find $info->{smooth}) {	3209	if (my $smooth = cf::face::find $info->{smooth}) {
3030	cf::face::set_smooth $idx, $smooth;	3210	cf::face::set_smooth $idx, $smooth;
3031	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3211	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3032	} else {	3212	} else {
3033	warn "smooth face '$info->{smooth}' not found for face '$face'";	3213	warn "smooth face '$info->{smooth}' not found for face '$face'";
…		…
3051	{	3231	{
3052	# TODO: for gcfclient pleasure, we should give resources	3232	# TODO: for gcfclient pleasure, we should give resources
3053	# that gcfclient doesn't grok a >10000 face index.	3233	# that gcfclient doesn't grok a >10000 face index.
3054	my $res = $facedata->{resource};	3234	my $res = $facedata->{resource};
3055		3235
3056	my $soundconf = delete $res->{"res/sound.conf"};
3057
3058	while (my ($name, $info) = each %$res) {	3236	while (my ($name, $info) = each %$res) {
		3237	if (defined $info->{type}) {
3059	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3238	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3060	my $data;	3239	my $data;
3061		3240
3062	if ($info->{type} & 1) {	3241	if ($info->{type} & 1) {
3063	# prepend meta info	3242	# prepend meta info
3064		3243
3065	my $meta = $enc->encode ({	3244	my $meta = $enc->encode ({
3066	name => $name,	3245	name => $name,
3067	%{ $info->{meta} || {} },	3246	%{ $info->{meta} || {} },
3068	});	3247	});
3069		3248
3070	$data = pack "(w/a*)*", $meta, $info->{data};	3249	$data = pack "(w/a*)*", $meta, $info->{data};
		3250	} else {
		3251	$data = $info->{data};
		3252	}
		3253
		3254	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3255	cf::face::set_type $idx, $info->{type};
3071	} else {	3256	} else {
3072	$data = $info->{data};	3257	$RESOURCE{$name} = $info;
3073	}	3258	}
3074		3259
3075	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3076	cf::face::set_type $idx, $info->{type};
3077
3078	cf::cede_to_tick;	3260	cf::cede_to_tick;
3079	}	3261	}
3080
3081	if ($soundconf) {
3082	$soundconf = $enc->decode (delete $soundconf->{data});
3083
3084	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3085	my $sound = $soundconf->{compat}[$_]
3086	or next;
3087
3088	my $face = cf::face::find "sound/$sound->[1]";
3089	cf::sound::set $sound->[0] => $face;
3090	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3091	}
3092
3093	while (my ($k, $v) = each %{$soundconf->{event}}) {
3094	my $face = cf::face::find "sound/$v";
3095	cf::sound::set $k => $face;
3096	}
3097	}
3098	}	3262	}
		3263
		3264	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3099		3265
3100	1	3266	1
3101	}	3267	}
		3268
		3269	cf::global->attach (on_resource_update => sub {
		3270	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
		3271	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
		3272
		3273	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3274	my $sound = $soundconf->{compat}[$_]
		3275	or next;
		3276
		3277	my $face = cf::face::find "sound/$sound->[1]";
		3278	cf::sound::set $sound->[0] => $face;
		3279	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3280	}
		3281
		3282	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3283	my $face = cf::face::find "sound/$v";
		3284	cf::sound::set $k => $face;
		3285	}
		3286	}
		3287	});
3102		3288
3103	register_exticmd fx_want => sub {	3289	register_exticmd fx_want => sub {
3104	my ($ns, $want) = @_;	3290	my ($ns, $want) = @_;
3105		3291
3106	while (my ($k, $v) = each %$want) {	3292	while (my ($k, $v) = each %$want) {
3107	$ns->fx_want ($k, $v);	3293	$ns->fx_want ($k, $v);
3108	}	3294	}
3109	};	3295	};
		3296
		3297	sub load_resource_file($) {
		3298	my $guard = lock_acquire "load_resource_file";
		3299
		3300	my $status = load_resource_file_ $_[0];
		3301	get_slot 0.1, 100;
		3302	cf::arch::commit_load;
		3303
		3304	$status
		3305	}
3110		3306
3111	sub reload_regions {	3307	sub reload_regions {
3112	# HACK to clear player env face cache, we need some signal framework	3308	# HACK to clear player env face cache, we need some signal framework
3113	# for this (global event?)	3309	# for this (global event?)
3114	%ext::player_env::MUSIC_FACE_CACHE = ();	3310	%ext::player_env::MUSIC_FACE_CACHE = ();
…		…
3128	}	3324	}
3129		3325
3130	sub reload_archetypes {	3326	sub reload_archetypes {
3131	load_resource_file "$DATADIR/archetypes"	3327	load_resource_file "$DATADIR/archetypes"
3132	or die "unable to load archetypes\n";	3328	or die "unable to load archetypes\n";
3133	#d# NEED to laod twice to resolve forward references
3134	# this really needs to be done in an extra post-pass
3135	# (which needs to be synchronous, so solve it differently)
3136	load_resource_file "$DATADIR/archetypes"
3137	or die "unable to load archetypes\n";
3138	}	3329	}
3139		3330
3140	sub reload_treasures {	3331	sub reload_treasures {
3141	load_resource_file "$DATADIR/treasures"	3332	load_resource_file "$DATADIR/treasures"
3142	or die "unable to load treasurelists\n";	3333	or die "unable to load treasurelists\n";
3143	}	3334	}
3144		3335
3145	sub reload_resources {	3336	sub reload_resources {
3146	warn "reloading resource files...\n";	3337	warn "reloading resource files...\n";
3147		3338
		3339	reload_facedata;
		3340	reload_archetypes;
3148	reload_regions;	3341	reload_regions;
3149	reload_facedata;
3150	#reload_archetypes;#d#
3151	reload_archetypes;
3152	reload_treasures;	3342	reload_treasures;
3153		3343
3154	warn "finished reloading resource files\n";	3344	warn "finished reloading resource files\n";
3155	}
3156
3157	sub init {
3158	reload_resources;
3159	}	3345	}
3160		3346
3161	sub reload_config {	3347	sub reload_config {
3162	open my $fh, "<:utf8", "$CONFDIR/config"	3348	open my $fh, "<:utf8", "$CONFDIR/config"
3163	or return;	3349	or return;
3164		3350
3165	local $/;	3351	local $/;
3166	*CFG = YAML::Syck::Load <$fh>;	3352	*CFG = YAML::Load <$fh>;
3167		3353
3168	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3354	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3169		3355
3170	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3356	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3171	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3357	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
3177	};	3363	};
3178	warn $@ if $@;	3364	warn $@ if $@;
3179	}	3365	}
3180	}	3366	}
3181		3367
		3368	sub pidfile() {
		3369	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
		3370	or die "$PIDFILE: $!";
		3371	flock $fh, &Fcntl::LOCK_EX
		3372	or die "$PIDFILE: flock: $!";
		3373	$fh
		3374	}
		3375
		3376	# make sure only one server instance is running at any one time
		3377	sub atomic {
		3378	my $fh = pidfile;
		3379
		3380	my $pid = <$fh>;
		3381	kill 9, $pid if $pid > 0;
		3382
		3383	seek $fh, 0, 0;
		3384	print $fh $$;
		3385	}
		3386
3182	sub main {	3387	sub main {
		3388	cf::init_globals; # initialise logging
		3389
		3390	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
		3391	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
		3392	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
		3393	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
		3394
		3395	cf::init_experience;
		3396	cf::init_anim;
		3397	cf::init_attackmess;
		3398	cf::init_dynamic;
		3399
		3400	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
		3401
3183	# we must not ever block the main coroutine	3402	# we must not ever block the main coroutine
3184	local $Coro::idle = sub {	3403	local $Coro::idle = sub {
3185	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3404	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3186	(async {	3405	(async {
3187	Event::one_event;	3406	$Coro::current->{desc} = "IDLE BUG HANDLER";
		3407	EV::loop EV::LOOP_ONESHOT;
3188	})->prio (Coro::PRIO_MAX);	3408	})->prio (Coro::PRIO_MAX);
3189	};	3409	};
3190		3410
		3411	evthread_start IO::AIO::poll_fileno;
		3412
		3413	cf::sync_job {
		3414	reload_resources;
3191	reload_config;	3415	reload_config;
3192	db_init;	3416	db_init;
		3417
		3418	cf::load_settings;
		3419	cf::load_materials;
		3420	cf::init_uuid;
		3421	cf::init_signals;
		3422	cf::init_commands;
		3423	cf::init_skills;
		3424
		3425	cf::init_beforeplay;
		3426
		3427	atomic;
		3428
3193	load_extensions;	3429	load_extensions;
3194		3430
3195	$TICK_WATCHER->start;	3431	utime time, time, $RUNTIMEFILE;
		3432
		3433	# no (long-running) fork's whatsoever before this point(!)
		3434	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
		3435
		3436	(pop @POST_INIT)->(0) while @POST_INIT;
		3437	};
		3438
3196	Event::loop;	3439	EV::loop;
3197	}	3440	}
3198		3441
3199	#############################################################################	3442	#############################################################################
3200	# initialisation and cleanup	3443	# initialisation and cleanup
3201		3444
3202	# install some emergency cleanup handlers	3445	# install some emergency cleanup handlers
3203	BEGIN {	3446	BEGIN {
		3447	our %SIGWATCHER = ();
3204	for my $signal (qw(INT HUP TERM)) {	3448	for my $signal (qw(INT HUP TERM)) {
3205	Event->signal (	3449	$SIGWATCHER{$signal} = EV::signal $signal, sub {
3206	reentrant => 0,
3207	data => WF_AUTOCANCEL,
3208	signal => $signal,
3209	prio => 0,
3210	cb => sub {
3211	cf::cleanup "SIG$signal";	3450	cf::cleanup "SIG$signal";
3212	},
3213	);	3451	};
3214	}	3452	}
3215	}	3453	}
3216		3454
3217	sub write_runtime {	3455	sub write_runtime_sync {
3218	my $runtime = "$LOCALDIR/runtime";
3219
3220	# first touch the runtime file to show we are still running:	3456	# first touch the runtime file to show we are still running:
3221	# the fsync below can take a very very long time.	3457	# the fsync below can take a very very long time.
3222		3458
3223	IO::AIO::aio_utime $runtime, undef, undef;	3459	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3224		3460
3225	my $guard = cf::lock_acquire "write_runtime";	3461	my $guard = cf::lock_acquire "write_runtime";
3226		3462
3227	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644	3463	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3228	or return;	3464	or return;
3229		3465
3230	my $value = $cf::RUNTIME + 90 + 10;	3466	my $value = $cf::RUNTIME + 90 + 10;
3231	# 10 is the runtime save interval, for a monotonic clock	3467	# 10 is the runtime save interval, for a monotonic clock
3232	# 60 allows for the watchdog to kill the server.	3468	# 60 allows for the watchdog to kill the server.
…		…
3242	aio_utime $fh, undef, undef;	3478	aio_utime $fh, undef, undef;
3243		3479
3244	close $fh	3480	close $fh
3245	or return;	3481	or return;
3246		3482
3247	aio_rename "$runtime~", $runtime	3483	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3248	and return;	3484	and return;
3249		3485
3250	warn "runtime file written.\n";	3486	warn "runtime file written.\n";
3251		3487
3252	1	3488	1
		3489	}
		3490
		3491	our $uuid_lock;
		3492	our $uuid_skip;
		3493
		3494	sub write_uuid_sync($) {
		3495	$uuid_skip ||= $_[0];
		3496
		3497	return if $uuid_lock;
		3498	local $uuid_lock = 1;
		3499
		3500	my $uuid = "$LOCALDIR/uuid";
		3501
		3502	my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
		3503	or return;
		3504
		3505	my $value = uuid_seq uuid_cur;
		3506
		3507	unless ($value) {
		3508	warn "cowardly refusing to write zero uuid value!\n";
		3509	return;
		3510	}
		3511
		3512	my $value = uuid_str $value + $uuid_skip;
		3513	$uuid_skip = 0;
		3514
		3515	(aio_write $fh, 0, (length $value), $value, 0) <= 0
		3516	and return;
		3517
		3518	# always fsync - this file is important
		3519	aio_fsync $fh
		3520	and return;
		3521
		3522	close $fh
		3523	or return;
		3524
		3525	aio_rename "$uuid~", $uuid
		3526	and return;
		3527
		3528	warn "uuid file written ($value).\n";
		3529
		3530	1
		3531
		3532	}
		3533
		3534	sub write_uuid($$) {
		3535	my ($skip, $sync) = @_;
		3536
		3537	$sync ? write_uuid_sync $skip
		3538	: async { write_uuid_sync $skip };
3253	}	3539	}
3254		3540
3255	sub emergency_save() {	3541	sub emergency_save() {
3256	my $freeze_guard = cf::freeze_mainloop;	3542	my $freeze_guard = cf::freeze_mainloop;
3257		3543
3258	warn "enter emergency perl save\n";	3544	warn "emergency_perl_save: enter\n";
3259		3545
3260	cf::sync_job {	3546	cf::sync_job {
		3547	# this is a trade-off: we want to be very quick here, so
		3548	# save all maps without fsync, and later call a global sync
		3549	# (which in turn might be very very slow)
		3550	local $USE_FSYNC = 0;
		3551
3261	# use a peculiar iteration method to avoid tripping on perl	3552	# use a peculiar iteration method to avoid tripping on perl
3262	# refcount bugs in for. also avoids problems with players	3553	# refcount bugs in for. also avoids problems with players
3263	# and maps saved/destroyed asynchronously.	3554	# and maps saved/destroyed asynchronously.
3264	warn "begin emergency player save\n";	3555	warn "emergency_perl_save: begin player save\n";
3265	for my $login (keys %cf::PLAYER) {	3556	for my $login (keys %cf::PLAYER) {
3266	my $pl = $cf::PLAYER{$login} or next;	3557	my $pl = $cf::PLAYER{$login} or next;
3267	$pl->valid or next;	3558	$pl->valid or next;
		3559	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3268	$pl->save;	3560	$pl->save;
3269	}	3561	}
3270	warn "end emergency player save\n";	3562	warn "emergency_perl_save: end player save\n";
3271		3563
3272	warn "begin emergency map save\n";	3564	warn "emergency_perl_save: begin map save\n";
3273	for my $path (keys %cf::MAP) {	3565	for my $path (keys %cf::MAP) {
3274	my $map = $cf::MAP{$path} or next;	3566	my $map = $cf::MAP{$path} or next;
3275	$map->valid or next;	3567	$map->valid or next;
3276	$map->save;	3568	$map->save;
3277	}	3569	}
3278	warn "end emergency map save\n";	3570	warn "emergency_perl_save: end map save\n";
3279		3571
3280	warn "begin emergency database checkpoint\n";	3572	warn "emergency_perl_save: begin database checkpoint\n";
3281	BDB::db_env_txn_checkpoint $DB_ENV;	3573	BDB::db_env_txn_checkpoint $DB_ENV;
3282	warn "end emergency database checkpoint\n";	3574	warn "emergency_perl_save: end database checkpoint\n";
		3575
		3576	warn "emergency_perl_save: begin write uuid\n";
		3577	write_uuid_sync 1;
		3578	warn "emergency_perl_save: end write uuid\n";
3283	};	3579	};
3284		3580
		3581	warn "emergency_perl_save: starting sync()\n";
		3582	IO::AIO::aio_sync sub {
		3583	warn "emergency_perl_save: finished sync()\n";
		3584	};
		3585
3285	warn "leave emergency perl save\n";	3586	warn "emergency_perl_save: leave\n";
3286	}	3587	}
3287		3588
3288	sub post_cleanup {	3589	sub post_cleanup {
3289	my ($make_core) = @_;	3590	my ($make_core) = @_;
3290		3591
3291	warn Carp::longmess "post_cleanup backtrace"	3592	warn Carp::longmess "post_cleanup backtrace"
3292	if $make_core;	3593	if $make_core;
		3594
		3595	my $fh = pidfile;
		3596	unlink $PIDFILE if <$fh> == $$;
		3597	}
		3598
		3599	# a safer delete_package, copied from Symbol
		3600	sub clear_package($) {
		3601	my $pkg = shift;
		3602
		3603	# expand to full symbol table name if needed
		3604	unless ($pkg =~ /^main::.*::$/) {
		3605	$pkg = "main$pkg" if $pkg =~ /^::/;
		3606	$pkg = "main::$pkg" unless $pkg =~ /^main::/;
		3607	$pkg .= '::' unless $pkg =~ /::$/;
		3608	}
		3609
		3610	my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
		3611	my $stem_symtab = *{$stem}{HASH};
		3612
		3613	defined $stem_symtab and exists $stem_symtab->{$leaf}
		3614	or return;
		3615
		3616	# clear all symbols
		3617	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
		3618	for my $name (keys %$leaf_symtab) {
		3619	_gv_clear *{"$pkg$name"};
		3620	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
		3621	}
		3622	warn "cleared package $pkg\n";#d#
3293	}	3623	}
3294		3624
3295	sub do_reload_perl() {	3625	sub do_reload_perl() {
3296	# can/must only be called in main	3626	# can/must only be called in main
3297	if ($Coro::current != $Coro::main) {	3627	if ($Coro::current != $Coro::main) {
3298	warn "can only reload from main coroutine";	3628	warn "can only reload from main coroutine";
3299	return;	3629	return;
3300	}	3630	}
3301		3631
		3632	return if $RELOAD++;
		3633
		3634	my $t1 = EV::time;
		3635
		3636	while ($RELOAD) {
3302	warn "reloading...";	3637	warn "reloading...";
3303		3638
3304	warn "entering sync_job";	3639	warn "entering sync_job";
3305		3640
3306	cf::sync_job {	3641	cf::sync_job {
3307	cf::write_runtime; # external watchdog should not bark	3642	cf::write_runtime_sync; # external watchdog should not bark
3308	cf::emergency_save;	3643	cf::emergency_save;
3309	cf::write_runtime; # external watchdog should not bark	3644	cf::write_runtime_sync; # external watchdog should not bark
3310		3645
3311	warn "syncing database to disk";	3646	warn "syncing database to disk";
3312	BDB::db_env_txn_checkpoint $DB_ENV;	3647	BDB::db_env_txn_checkpoint $DB_ENV;
3313		3648
3314	# if anything goes wrong in here, we should simply crash as we already saved	3649	# if anything goes wrong in here, we should simply crash as we already saved
3315		3650
3316	warn "cancelling all WF_AUTOCANCEL watchers";
3317	for (Event::all_watchers) {
3318	$_->cancel if $_->data & WF_AUTOCANCEL;
3319	}
3320
3321	warn "flushing outstanding aio requests";	3651	warn "flushing outstanding aio requests";
3322	for (;;) {
3323	BDB::flush;
3324	IO::AIO::flush;
3325	Coro::cede;
3326	last unless IO::AIO::nreqs || BDB::nreqs;	3652	while (IO::AIO::nreqs || BDB::nreqs) {
3327	warn "iterate...";	3653	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3328	}
3329
3330	++$RELOAD;
3331
3332	warn "cancelling all extension coros";
3333	$_->cancel for values %EXT_CORO;
3334	%EXT_CORO = ();
3335
3336	warn "removing commands";
3337	%COMMAND = ();
3338
3339	warn "removing ext/exti commands";
3340	%EXTCMD = ();
3341	%EXTICMD = ();
3342
3343	warn "unloading/nuking all extensions";
3344	for my $pkg (@EXTS) {
3345	warn "... unloading $pkg";
3346
3347	if (my $cb = $pkg->can ("unload")) {
3348	eval {
3349	$cb->($pkg);
3350	1
3351	} or warn "$pkg unloaded, but with errors: $@";
3352	}	3654	}
3353		3655
3354	warn "... nuking $pkg";	3656	warn "cancelling all extension coros";
3355	Symbol::delete_package $pkg;	3657	$_->cancel for values %EXT_CORO;
3356	}	3658	%EXT_CORO = ();
3357		3659
3358	warn "unloading all perl modules loaded from $LIBDIR";	3660	warn "removing commands";
3359	while (my ($k, $v) = each %INC) {	3661	%COMMAND = ();
3360	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3361		3662
		3663	warn "removing ext/exti commands";
		3664	%EXTCMD = ();
		3665	%EXTICMD = ();
		3666
		3667	warn "unloading/nuking all extensions";
		3668	for my $pkg (@EXTS) {
3362	warn "... unloading $k";	3669	warn "... unloading $pkg";
3363	delete $INC{$k};
3364		3670
3365	$k =~ s/\.pm$//;
3366	$k =~ s/\//::/g;
3367
3368	if (my $cb = $k->can ("unload_module")) {	3671	if (my $cb = $pkg->can ("unload")) {
		3672	eval {
3369	$cb->();	3673	$cb->($pkg);
		3674	1
		3675	} or warn "$pkg unloaded, but with errors: $@";
		3676	}
		3677
		3678	warn "... clearing $pkg";
		3679	clear_package $pkg;
3370	}	3680	}
3371		3681
3372	Symbol::delete_package $k;	3682	warn "unloading all perl modules loaded from $LIBDIR";
		3683	while (my ($k, $v) = each %INC) {
		3684	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
		3685
		3686	warn "... unloading $k";
		3687	delete $INC{$k};
		3688
		3689	$k =~ s/\.pm$//;
		3690	$k =~ s/\//::/g;
		3691
		3692	if (my $cb = $k->can ("unload_module")) {
		3693	$cb->();
		3694	}
		3695
		3696	clear_package $k;
3373	}	3697	}
3374		3698
3375	warn "getting rid of safe::, as good as possible";	3699	warn "getting rid of safe::, as good as possible";
3376	Symbol::delete_package "safe::$_"	3700	clear_package "safe::$_"
3377	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	3701	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3378		3702
3379	warn "unloading cf.pm \"a bit\"";	3703	warn "unloading cf.pm \"a bit\"";
3380	delete $INC{"cf.pm"};	3704	delete $INC{"cf.pm"};
3381	delete $INC{"cf/pod.pm"};	3705	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3382		3706
3383	# don't, removes xs symbols, too,	3707	# don't, removes xs symbols, too,
3384	# and global variables created in xs	3708	# and global variables created in xs
3385	#Symbol::delete_package __PACKAGE__;	3709	#clear_package __PACKAGE__;
3386		3710
3387	warn "unload completed, starting to reload now";	3711	warn "unload completed, starting to reload now";
3388		3712
3389	warn "reloading cf.pm";	3713	warn "reloading cf.pm";
3390	require cf;	3714	require cf;
3391	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3715	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3392		3716
3393	warn "loading config and database again";	3717	warn "loading config and database again";
3394	cf::reload_config;	3718	cf::reload_config;
3395		3719
3396	warn "loading extensions";	3720	warn "loading extensions";
3397	cf::load_extensions;	3721	cf::load_extensions;
3398		3722
		3723	if ($REATTACH_ON_RELOAD) {
3399	warn "reattaching attachments to objects/players";	3724	warn "reattaching attachments to objects/players";
3400	_global_reattach; # objects, sockets	3725	_global_reattach; # objects, sockets
3401	warn "reattaching attachments to maps";	3726	warn "reattaching attachments to maps";
3402	reattach $_ for values %MAP;	3727	reattach $_ for values %MAP;
3403	warn "reattaching attachments to players";	3728	warn "reattaching attachments to players";
3404	reattach $_ for values %PLAYER;	3729	reattach $_ for values %PLAYER;
		3730	}
3405		3731
		3732	warn "running post_init jobs";
		3733	(pop @POST_INIT)->(1) while @POST_INIT;
		3734
3406	warn "leaving sync_job";	3735	warn "leaving sync_job";
3407		3736
3408	1	3737	1
3409	} or do {	3738	} or do {
3410	warn $@;	3739	warn $@;
3411	warn "error while reloading, exiting.";	3740	cf::cleanup "error while reloading, exiting.";
3412	exit 1;
3413	};	3741	};
3414		3742
3415	warn "reloaded";	3743	warn "reloaded";
		3744	--$RELOAD;
		3745	}
		3746
		3747	$t1 = EV::time - $t1;
		3748	warn "reload completed in ${t1}s\n";
3416	};	3749	};
3417		3750
3418	our $RELOAD_WATCHER; # used only during reload	3751	our $RELOAD_WATCHER; # used only during reload
3419		3752
3420	sub reload_perl() {	3753	sub reload_perl() {
3421	# doing reload synchronously and two reloads happen back-to-back,	3754	# doing reload synchronously and two reloads happen back-to-back,
3422	# coro crashes during coro_state_free->destroy here.	3755	# coro crashes during coro_state_free->destroy here.
3423		3756
3424	$RELOAD_WATCHER ||= Event->timer (	3757	$RELOAD_WATCHER ||= cf::async {
3425	reentrant => 0,	3758	Coro::AIO::aio_wait cache_extensions;
3426	after => 0,	3759
3427	data => WF_AUTOCANCEL,	3760	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3428	cb => sub {
3429	do_reload_perl;	3761	do_reload_perl;
3430	undef $RELOAD_WATCHER;	3762	undef $RELOAD_WATCHER;
3431	},	3763	};
3432	);	3764	};
3433	}	3765	}
3434		3766
3435	register_command "reload" => sub {	3767	register_command "reload" => sub {
3436	my ($who, $arg) = @_;	3768	my ($who, $arg) = @_;
3437		3769
3438	if ($who->flag (FLAG_WIZ)) {	3770	if ($who->flag (FLAG_WIZ)) {
3439	$who->message ("reloading server.");	3771	$who->message ("reloading server.");
		3772	async {
		3773	$Coro::current->{desc} = "perl_reload";
3440	async { reload_perl };	3774	reload_perl;
		3775	};
3441	}	3776	}
3442	};	3777	};
3443		3778
3444	unshift @INC, $LIBDIR;	3779	unshift @INC, $LIBDIR;
3445		3780
…		…
3447		3782
3448	our @WAIT_FOR_TICK;	3783	our @WAIT_FOR_TICK;
3449	our @WAIT_FOR_TICK_BEGIN;	3784	our @WAIT_FOR_TICK_BEGIN;
3450		3785
3451	sub wait_for_tick {	3786	sub wait_for_tick {
3452	return unless $TICK_WATCHER->is_active;
3453	return if $Coro::current == $Coro::main;	3787	return if tick_inhibit || $Coro::current == $Coro::main;
3454		3788
3455	my $signal = new Coro::Signal;	3789	my $signal = new Coro::Signal;
3456	push @WAIT_FOR_TICK, $signal;	3790	push @WAIT_FOR_TICK, $signal;
3457	$signal->wait;	3791	$signal->wait;
3458	}	3792	}
3459		3793
3460	sub wait_for_tick_begin {	3794	sub wait_for_tick_begin {
3461	return unless $TICK_WATCHER->is_active;
3462	return if $Coro::current == $Coro::main;	3795	return if tick_inhibit || $Coro::current == $Coro::main;
3463		3796
3464	my $signal = new Coro::Signal;	3797	my $signal = new Coro::Signal;
3465	push @WAIT_FOR_TICK_BEGIN, $signal;	3798	push @WAIT_FOR_TICK_BEGIN, $signal;
3466	$signal->wait;	3799	$signal->wait;
3467	}	3800	}
3468		3801
3469	our $stat_fh;	3802	sub tick {
3470	sysopen $stat_fh, "/tmp/cfstats", Fcntl::O_APPEND | Fcntl::O_CREAT | Fcntl::O_WRONLY, 0600;#d#
3471
3472	$TICK_WATCHER = Event->timer (
3473	reentrant => 0,
3474	parked => 1,
3475	prio => 0,
3476	at => $NEXT_TICK || $TICK,
3477	data => WF_AUTOCANCEL,
3478	cb => sub {
3479	if ($Coro::current != $Coro::main) {	3803	if ($Coro::current != $Coro::main) {
3480	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	3804	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3481	unless ++$bug_warning > 10;	3805	unless ++$bug_warning > 10;
3482	return;	3806	return;
3483	}	3807	}
3484		3808
3485	my @pl = cf::player::list; my $stats = sprintf "%.2f %d %d %d", $RUNTIME, (scalar @pl), cf::object::actives_size, cf::object::objects_size; #d#
3486
3487	$NOW = $tick_start = Event::time;
3488
3489	cf::server_tick; # one server iteration	3809	cf::server_tick; # one server iteration
3490		3810
3491	$RUNTIME += $TICK;
3492	$NEXT_TICK += $TICK;
3493
3494	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3811	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3495	$NEXT_RUNTIME_WRITE = $NOW + 10;	3812	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3496	Coro::async_pool {	3813	Coro::async_pool {
		3814	$Coro::current->{desc} = "runtime saver";
3497	write_runtime	3815	write_runtime_sync
3498	or warn "ERROR: unable to write runtime file: $!";	3816	or warn "ERROR: unable to write runtime file: $!";
3499	};
3500	}	3817	};
		3818	}
3501		3819
3502	# my $AFTER = Event::time;
3503	# warn $AFTER - $NOW;#d#
3504
3505	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3820	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3506	$sig->send;	3821	$sig->send;
3507	}	3822	}
3508	while (my $sig = shift @WAIT_FOR_TICK) {	3823	while (my $sig = shift @WAIT_FOR_TICK) {
3509	$sig->send;	3824	$sig->send;
3510	}	3825	}
3511		3826
3512	$NOW = Event::time;	3827	$LOAD = ($NOW - $TICK_START) / $TICK;
3513
3514	# if we are delayed by four ticks or more, skip them all
3515	$NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3516
3517	$TICK_WATCHER->at ($NEXT_TICK);
3518	$TICK_WATCHER->start;
3519
3520	$LOAD = ($NOW - $tick_start) / $TICK;
3521	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3828	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3522		3829
3523	_post_tick;	3830	if (0) {
3524		3831	if ($NEXT_TICK) {
3525	# gather some statistics#d#	3832	my $jitter = $TICK_START - $NEXT_TICK;
3526	$stats .= sprintf " %d\n", 10000 * ($NOW - $tick_start);#d#	3833	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
3527	IO::AIO::aio_write $stat_fh, undef, undef, $stats, 0;#d#	3834	warn "jitter $JITTER\n";#d#
		3835	}
3528	},	3836	}
3529	);	3837	}
3530		3838
3531	{	3839	{
		3840	# configure BDB
		3841
3532	BDB::min_parallel 8;	3842	BDB::min_parallel 8;
3533	BDB::max_poll_time $TICK * 0.1;	3843	BDB::max_poll_reqs $TICK * 0.1;
3534	$BDB_POLL_WATCHER = Event->io (	3844	$AnyEvent::BDB::WATCHER->priority (1);
3535	reentrant => 0,
3536	fd => BDB::poll_fileno,
3537	poll => 'r',
3538	prio => 0,
3539	data => WF_AUTOCANCEL,
3540	cb => \&BDB::poll_cb,
3541	);
3542
3543	BDB::set_sync_prepare {
3544	my $status;
3545	my $current = $Coro::current;
3546	(
3547	sub {
3548	$status = $!;
3549	$current->ready; undef $current;
3550	},
3551	sub {
3552	Coro::schedule while defined $current;
3553	$! = $status;
3554	},
3555	)
3556	};
3557		3845
3558	unless ($DB_ENV) {	3846	unless ($DB_ENV) {
3559	$DB_ENV = BDB::db_env_create;	3847	$DB_ENV = BDB::db_env_create;
		3848	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
		3849	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
		3850	$DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
		3851	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		3852	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3560		3853
3561	cf::sync_job {	3854	cf::sync_job {
3562	eval {	3855	eval {
3563	BDB::db_env_open	3856	BDB::db_env_open
3564	$DB_ENV,	3857	$DB_ENV,
…		…
3566	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN	3859	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3567	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,	3860	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3568	0666;	3861	0666;
3569		3862
3570	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3863	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3571
3572	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3573	| BDB::LOG_AUTOREMOVE, 1);
3574	$DB_ENV->set_lk_detect;
3575	};	3864	};
3576		3865
3577	cf::cleanup "db_env_open(db): $@" if $@;	3866	cf::cleanup "db_env_open(db): $@" if $@;
3578	};	3867	};
3579	}	3868	}
3580		3869
3581	$BDB_CHECKPOINT_WATCHER = Event->timer (	3870	$BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3582	after => 11,	3871	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3583	interval => 60,	3872	};
3584	hard => 1,	3873	$BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3585	prio => 0,
3586	data => WF_AUTOCANCEL,
3587	cb => sub {
3588	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	3874	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3589	},
3590	);	3875	};
3591	$BDB_TRICKLE_WATCHER = Event->timer (	3876	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3592	after => 5,
3593	interval => 10,
3594	hard => 1,
3595	prio => 0,
3596	data => WF_AUTOCANCEL,
3597	cb => sub {
3598	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	3877	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3599	},
3600	);	3878	};
3601	}	3879	}
3602		3880
3603	{	3881	{
		3882	# configure IO::AIO
		3883
3604	IO::AIO::min_parallel 8;	3884	IO::AIO::min_parallel 8;
3605
3606	undef $Coro::AIO::WATCHER;
3607	IO::AIO::max_poll_time $TICK * 0.1;	3885	IO::AIO::max_poll_time $TICK * 0.1;
3608	$AIO_POLL_WATCHER = Event->io (	3886	undef $AnyEvent::AIO::WATCHER;
3609	reentrant => 0,
3610	data => WF_AUTOCANCEL,
3611	fd => IO::AIO::poll_fileno,
3612	poll => 'r',
3613	prio => 6,
3614	cb => \&IO::AIO::poll_cb,
3615	);
3616	}	3887	}
3617		3888
3618	my $_log_backtrace;	3889	my $_log_backtrace;
3619		3890
3620	sub _log_backtrace {	3891	sub _log_backtrace {
…		…
3623	$msg =~ s/\n//;	3894	$msg =~ s/\n//;
3624		3895
3625	# limit the # of concurrent backtraces	3896	# limit the # of concurrent backtraces
3626	if ($_log_backtrace < 2) {	3897	if ($_log_backtrace < 2) {
3627	++$_log_backtrace;	3898	++$_log_backtrace;
		3899	my $perl_bt = Carp::longmess $msg;
3628	async {	3900	async {
		3901	$Coro::current->{desc} = "abt $msg";
		3902
3629	my @bt = fork_call {	3903	my @bt = fork_call {
3630	@addr = map { sprintf "%x", $_ } @addr;	3904	@addr = map { sprintf "%x", $_ } @addr;
3631	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3905	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3632	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"	3906	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3633	or die "addr2line: $!";	3907	or die "addr2line: $!";
…		…
3641	}	3915	}
3642		3916
3643	@funcs	3917	@funcs
3644	};	3918	};
3645		3919
3646	LOG llevInfo, "[ABT] $msg\n";	3920	LOG llevInfo, "[ABT] $perl_bt\n";
		3921	LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3647	LOG llevInfo, "[ABT] $_\n" for @bt;	3922	LOG llevInfo, "[ABT] $_\n" for @bt;
3648	--$_log_backtrace;	3923	--$_log_backtrace;
3649	};	3924	};
3650	} else {	3925	} else {
3651	LOG llevInfo, "[ABT] $msg\n";	3926	LOG llevInfo, "[ABT] $msg\n";
3652	LOG llevInfo, "[ABT] [suppressed]\n";	3927	LOG llevInfo, "[ABT] [suppressed]\n";
3653	}	3928	}
3654	}	3929	}
3655		3930
3656	# load additional modules	3931	# load additional modules
3657	use cf::pod;	3932	require "cf/$_.pm" for @EXTRA_MODULES;
3658		3933
3659	END { cf::emergency_save }	3934	END { cf::emergency_save }
3660		3935
3661	1	3936	1
3662		3937

Diff Legend

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