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.381 by root, Mon Oct 8 18:19:39 2007 UTC vs.
Revision 1.490 by root, Sat Oct 24 06:16:40 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 it under
		7	# the terms of the Affero GNU General Public License as published by the
		8	# Free Software Foundation, either version 3 of the License, or (at your
		9	# 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 Affero GNU General Public License
		17	# and the GNU General Public License along with this program. If not, see
		18	# <http://www.gnu.org/licenses/>.
		19	#
		20	# The authors can be reached via e-mail to <support@deliantra.net>
		21	#
		22
1	package cf;	23	package cf;
2		24
		25	use 5.10.0;
3	use utf8;	26	use utf8;
4	use strict;	27	use strict qw(vars subs);
5		28
6	use Symbol;	29	use Symbol;
7	use List::Util;	30	use List::Util;
8	use Socket;	31	use Socket;
9	use Storable;	32	use EV;
10	use Event;
11	use Opcode;	33	use Opcode;
12	use Safe;	34	use Safe;
13	use Safe::Hole;	35	use Safe::Hole;
		36	use Storable ();
14		37
		38	use Guard ();
15	use Coro 4.1 ();	39	use Coro ();
16	use Coro::State;	40	use Coro::State;
17	use Coro::Handle;	41	use Coro::Handle;
		42	use Coro::EV;
18	use Coro::Event;	43	use Coro::AnyEvent;
19	use Coro::Timer;	44	use Coro::Timer;
20	use Coro::Signal;	45	use Coro::Signal;
21	use Coro::Semaphore;	46	use Coro::Semaphore;
		47	use Coro::SemaphoreSet;
		48	use Coro::AnyEvent;
22	use Coro::AIO;	49	use Coro::AIO;
		50	use Coro::BDB 1.6;
23	use Coro::Storable;	51	use Coro::Storable;
24	use Coro::Util ();	52	use Coro::Util ();
25		53
26	use JSON::XS ();	54	use JSON::XS 2.01 ();
27	use BDB ();	55	use BDB ();
28	use Data::Dumper;	56	use Data::Dumper;
29	use Digest::MD5;	57	use Digest::MD5;
30	use Fcntl;	58	use Fcntl;
31	use YAML::Syck ();	59	use YAML::XS ();
32	use IO::AIO 2.51 ();	60	use IO::AIO ();
33	use Time::HiRes;	61	use Time::HiRes;
34	use Compress::LZF;	62	use Compress::LZF;
35	use Digest::MD5 ();	63	use Digest::MD5 ();
		64
		65	AnyEvent::detect;
36		66
37	# configure various modules to our taste	67	# configure various modules to our taste
38	#	68	#
39	$Storable::canonical = 1; # reduce rsync transfers	69	$Storable::canonical = 1; # reduce rsync transfers
40	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator	70	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
		71
		72	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
		73
		74	# make sure c-lzf reinitialises itself
		75	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	76	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42		77
43	$Event::Eval = 1; # no idea why this is required, but it is	78	# strictly for debugging
44		79	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
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		80
50	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	81	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51		82
52	our %COMMAND = ();	83	our %COMMAND = ();
53	our %COMMAND_TIME = ();	84	our %COMMAND_TIME = ();
…		…
56	our %EXTCMD = ();	87	our %EXTCMD = ();
57	our %EXTICMD = ();	88	our %EXTICMD = ();
58	our %EXT_CORO = (); # coroutines bound to extensions	89	our %EXT_CORO = (); # coroutines bound to extensions
59	our %EXT_MAP = (); # pluggable maps	90	our %EXT_MAP = (); # pluggable maps
60		91
61	our $RELOAD; # number of reloads so far	92	our $RELOAD; # number of reloads so far, non-zero while in reload
62	our @EVENT;	93	our @EVENT;
		94	our @REFLECT; # set by XS
		95	our %REFLECT; # set by us
63		96
64	our $CONFDIR = confdir;	97	our $CONFDIR = confdir;
65	our $DATADIR = datadir;	98	our $DATADIR = datadir;
66	our $LIBDIR = "$DATADIR/ext";	99	our $LIBDIR = "$DATADIR/ext";
67	our $PODDIR = "$DATADIR/pod";	100	our $PODDIR = "$DATADIR/pod";
68	our $MAPDIR = "$DATADIR/" . mapdir;	101	our $MAPDIR = "$DATADIR/" . mapdir;
69	our $LOCALDIR = localdir;	102	our $LOCALDIR = localdir;
70	our $TMPDIR = "$LOCALDIR/" . tmpdir;	103	our $TMPDIR = "$LOCALDIR/" . tmpdir;
71	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	104	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	105	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73	our $RANDOMDIR = "$LOCALDIR/random";	106	our $RANDOMDIR = "$LOCALDIR/random";
74	our $BDBDIR = "$LOCALDIR/db";	107	our $BDBDIR = "$LOCALDIR/db";
		108	our $PIDFILE = "$LOCALDIR/pid";
		109	our $RUNTIMEFILE = "$LOCALDIR/runtime";
		110
		111	our %RESOURCE;
75		112
76	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	113	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	114	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80	our $NEXT_TICK;	115	our $NEXT_TICK;
81	our $NOW;
82	our $USE_FSYNC = 1; # use fsync to write maps - default off	116	our $USE_FSYNC = 1; # use fsync to write maps - default on
83		117
84	our $BDB_POLL_WATCHER;
85	our $BDB_DEADLOCK_WATCHER;	118	our $BDB_DEADLOCK_WATCHER;
86	our $BDB_CHECKPOINT_WATCHER;	119	our $BDB_CHECKPOINT_WATCHER;
87	our $BDB_TRICKLE_WATCHER;	120	our $BDB_TRICKLE_WATCHER;
88	our $DB_ENV;	121	our $DB_ENV;
89		122
		123	our @EXTRA_MODULES = qw(pod match mapscript);
		124
90	our %CFG;	125	our %CFG;
91		126
92	our $UPTIME; $UPTIME ||= time;	127	our $UPTIME; $UPTIME ||= time;
93	our $RUNTIME;	128	our $RUNTIME;
		129	our $NOW;
94		130
95	our (%PLAYER, %PLAYER_LOADING); # all users	131	our (%PLAYER, %PLAYER_LOADING); # all users
96	our (%MAP, %MAP_LOADING ); # all maps	132	our (%MAP, %MAP_LOADING ); # all maps
97	our $LINK_MAP; # the special {link} map, which is always available	133	our $LINK_MAP; # the special {link} map, which is always available
98		134
99	# used to convert map paths into valid unix filenames by replacing / by ∕	135	# used to convert map paths into valid unix filenames by replacing / by ∕
100	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	136	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101		137
102	our $LOAD; # a number between 0 (idle) and 1 (too many objects)	138	our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103	our $LOADAVG; # same thing, but with alpha-smoothing	139	our $LOADAVG; # same thing, but with alpha-smoothing
		140	our $JITTER; # average jitter
104	our $tick_start; # for load detecting purposes	141	our $TICK_START; # for load detecting purposes
		142
		143	our @POST_INIT;
		144
		145	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
		146	our $REALLY_UNLOOP; # never set to true, please :)
105		147
106	binmode STDOUT;	148	binmode STDOUT;
107	binmode STDERR;	149	binmode STDERR;
108		150
109	# read virtual server time, if available	151	# read virtual server time, if available
110	unless ($RUNTIME || !-e "$LOCALDIR/runtime") {	152	unless ($RUNTIME || !-e $RUNTIMEFILE) {
111	open my $fh, "<", "$LOCALDIR/runtime"	153	open my $fh, "<", $RUNTIMEFILE
112	or die "unable to read runtime file: $!";	154	or die "unable to read $RUNTIMEFILE file: $!";
113	$RUNTIME = <$fh> + 0.;	155	$RUNTIME = <$fh> + 0.;
114	}	156	}
		157
		158	eval "sub TICK() { $TICK } 1" or die;
115		159
116	mkdir $_	160	mkdir $_
117	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;	161	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
118		162
119	our $EMERGENCY_POSITION;	163	our $EMERGENCY_POSITION;
120		164
121	sub cf::map::normalise;	165	sub cf::map::normalise;
		166
		167	#############################################################################
		168
		169	%REFLECT = ();
		170	for (@REFLECT) {
		171	my $reflect = JSON::XS::decode_json $_;
		172	$REFLECT{$reflect->{class}} = $reflect;
		173	}
		174
		175	# this is decidedly evil
		176	$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
122		177
123	#############################################################################	178	#############################################################################
124		179
125	=head2 GLOBAL VARIABLES	180	=head2 GLOBAL VARIABLES
126		181
…		…
162		217
163	The raw value load value from the last tick.	218	The raw value load value from the last tick.
164		219
165	=item %cf::CFG	220	=item %cf::CFG
166		221
167	Configuration for the server, loaded from C</etc/crossfire/config>, or	222	Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168	from wherever your confdir points to.	223	from wherever your confdir points to.
169		224
170	=item cf::wait_for_tick, cf::wait_for_tick_begin	225	=item cf::wait_for_tick, cf::wait_for_tick_begin
171		226
172	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	227	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
173	returns directly I<after> the tick processing (and consequently, can only wake one process	228	returns directly I<after> the tick processing (and consequently, can only wake one process
174	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	229	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
175		230
176	=item @cf::INVOKE_RESULTS	231	=item @cf::INVOKE_RESULTS
177		232
178	This array contains the results of the last C<invoke ()> call. When	233	This array contains the results of the last C<invoke ()> call. When
179	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of	234	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180	that call.	235	that call.
181		236
		237	=item %cf::REFLECT
		238
		239	Contains, for each (C++) class name, a hash reference with information
		240	about object members (methods, scalars, arrays and flags) and other
		241	metadata, which is useful for introspection.
		242
182	=back	243	=back
183		244
184	=cut	245	=cut
185		246
186	BEGIN {	247	$Coro::State::WARNHOOK = sub {
187	*CORE::GLOBAL::warn = sub {
188	my $msg = join "", @_;	248	my $msg = join "", @_;
189		249
190	$msg .= "\n"	250	$msg .= "\n"
191	unless $msg =~ /\n$/;	251	unless $msg =~ /\n$/;
192		252
193	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	253	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194		254
195	LOG llevError, $msg;	255	LOG llevError, $msg;
196	};	256	};
197	}	257
		258	$Coro::State::DIEHOOK = sub {
		259	return unless $^S eq 0; # "eq", not "=="
		260
		261	warn Carp::longmess $_[0];
		262
		263	if ($Coro::current == $Coro::main) {#d#
		264	warn "DIEHOOK called in main context, Coro bug?\n";#d#
		265	return;#d#
		266	}#d#
		267
		268	# kill coroutine otherwise
		269	Coro::terminate
		270	};
198		271
199	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	272	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	273	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	274	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	275	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
…		…
209	for my $pkg (qw(	282	for my $pkg (qw(
210	cf::global cf::attachable	283	cf::global cf::attachable
211	cf::object cf::object::player	284	cf::object cf::object::player
212	cf::client cf::player	285	cf::client cf::player
213	cf::arch cf::living	286	cf::arch cf::living
		287	cf::map cf::mapspace
214	cf::map cf::party cf::region	288	cf::party cf::region
215	)) {	289	)) {
216	no strict 'refs';
217	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	290	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218	}	291	}
219		292
220	$Event::DIED = sub {	293	$EV::DIED = sub {
221	warn "error in event callback: @_";	294	warn "error in event callback: @_";
222	};	295	};
223		296
224	#############################################################################	297	#############################################################################
225		298
…		…
248	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	321	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249	$d	322	$d
250	} || "[unable to dump $_[0]: '$@']";	323	} || "[unable to dump $_[0]: '$@']";
251	}	324	}
252		325
253	=item $ref = cf::from_json $json	326	=item $ref = cf::decode_json $json
254		327
255	Converts a JSON string into the corresponding perl data structure.	328	Converts a JSON string into the corresponding perl data structure.
256		329
257	=item $json = cf::to_json $ref	330	=item $json = cf::encode_json $ref
258		331
259	Converts a perl data structure into its JSON representation.	332	Converts a perl data structure into its JSON representation.
260		333
261	=cut	334	=cut
262		335
263	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	336	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264		337
265	sub to_json ($) { $json_coder->encode ($_[0]) }	338	sub encode_json($) { $json_coder->encode ($_[0]) }
266	sub from_json ($) { $json_coder->decode ($_[0]) }	339	sub decode_json($) { $json_coder->decode ($_[0]) }
		340
		341	=item cf::post_init { BLOCK }
		342
		343	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
		344	but I<before> the server starts ticking again.
		345
		346	The cdoeblock will have a single boolean argument to indicate whether this
		347	is a reload or not.
		348
		349	=cut
		350
		351	sub post_init(&) {
		352	push @POST_INIT, shift;
		353	}
267		354
268	=item cf::lock_wait $string	355	=item cf::lock_wait $string
269		356
270	Wait until the given lock is available. See cf::lock_acquire.	357	Wait until the given lock is available. See cf::lock_acquire.
271		358
272	=item my $lock = cf::lock_acquire $string	359	=item my $lock = cf::lock_acquire $string
273		360
274	Wait until the given lock is available and then acquires it and returns	361	Wait until the given lock is available and then acquires it and returns
275	a Coro::guard object. If the guard object gets destroyed (goes out of scope,	362	a L<Guard> object. If the guard object gets destroyed (goes out of scope,
276	for example when the coroutine gets canceled), the lock is automatically	363	for example when the coroutine gets canceled), the lock is automatically
277	returned.	364	returned.
278		365
279	Locks are *not* recursive, locking from the same coro twice results in a	366	Locks are *not* recursive, locking from the same coro twice results in a
280	deadlocked coro.	367	deadlocked coro.
…		…
286		373
287	Return true if the lock is currently active, i.e. somebody has locked it.	374	Return true if the lock is currently active, i.e. somebody has locked it.
288		375
289	=cut	376	=cut
290		377
291	our %LOCK;	378	our $LOCKS = new Coro::SemaphoreSet;
292	our %LOCKER;#d#
293		379
294	sub lock_wait($) {	380	sub lock_wait($) {
295	my ($key) = @_;	381	$LOCKS->wait ($_[0]);
296
297	if ($LOCKER{$key} == $Coro::current) {#d#
298	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299	return;#d#
300	}#d#
301
302	# wait for lock, if any
303	while ($LOCK{$key}) {
304	push @{ $LOCK{$key} }, $Coro::current;
305	Coro::schedule;
306	}
307	}	382	}
308		383
309	sub lock_acquire($) {	384	sub lock_acquire($) {
310	my ($key) = @_;	385	$LOCKS->guard ($_[0])
311
312	# wait, to be sure we are not locked
313	lock_wait $key;
314
315	$LOCK{$key} = [];
316	$LOCKER{$key} = $Coro::current;#d#
317
318	Coro::guard {
319	delete $LOCKER{$key};#d#
320	# wake up all waiters, to be on the safe side
321	$_->ready for @{ delete $LOCK{$key} };
322	}
323	}	386	}
324		387
325	sub lock_active($) {	388	sub lock_active($) {
326	my ($key) = @_;	389	$LOCKS->count ($_[0]) < 1
327
328	! ! $LOCK{$key}
329	}	390	}
330		391
331	sub freeze_mainloop {	392	sub freeze_mainloop {
332	return unless $TICK_WATCHER->is_active;	393	tick_inhibit_inc;
333		394
334	my $guard = Coro::guard {	395	&Guard::guard (\&tick_inhibit_dec);
335	$TICK_WATCHER->start;	396	}
336	};	397
337	$TICK_WATCHER->stop;	398	=item cf::periodic $interval, $cb
338	$guard	399
		400	Like EV::periodic, but randomly selects a starting point so that the actions
		401	get spread over timer.
		402
		403	=cut
		404
		405	sub periodic($$) {
		406	my ($interval, $cb) = @_;
		407
		408	my $start = rand List::Util::min 180, $interval;
		409
		410	EV::periodic $start, $interval, 0, $cb
339	}	411	}
340		412
341	=item cf::get_slot $time[, $priority[, $name]]	413	=item cf::get_slot $time[, $priority[, $name]]
342		414
343	Allocate $time seconds of blocking CPU time at priority C<$priority>:	415	Allocate $time seconds of blocking CPU time at priority C<$priority>:
…		…
383	}	455	}
384	}	456	}
385	};	457	};
386		458
387	sub get_slot($;$$) {	459	sub get_slot($;$$) {
		460	return if tick_inhibit || $Coro::current == $Coro::main;
		461
388	my ($time, $pri, $name) = @_;	462	my ($time, $pri, $name) = @_;
389		463
390	$time = $TICK * .6 if $time > $TICK * .6;	464	$time = $TICK * .6 if $time > $TICK * .6;
391	my $sig = new Coro::Signal;	465	my $sig = new Coro::Signal;
392		466
…		…
406		480
407	BEGIN { *async = \&Coro::async_pool }	481	BEGIN { *async = \&Coro::async_pool }
408		482
409	=item cf::sync_job { BLOCK }	483	=item cf::sync_job { BLOCK }
410		484
411	The design of Crossfire TRT requires that the main coroutine ($Coro::main)	485	The design of Deliantra requires that the main coroutine ($Coro::main)
412	is always able to handle events or runnable, as Crossfire TRT is only	486	is always able to handle events or runnable, as Deliantra is only
413	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not	487	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414	acceptable.	488	acceptable.
415		489
416	If it must be done, put the blocking parts into C<sync_job>. This will run	490	If it must be done, put the blocking parts into C<sync_job>. This will run
417	the given BLOCK in another coroutine while waiting for the result. The	491	the given BLOCK in another coroutine while waiting for the result. The
…		…
422		496
423	sub sync_job(&) {	497	sub sync_job(&) {
424	my ($job) = @_;	498	my ($job) = @_;
425		499
426	if ($Coro::current == $Coro::main) {	500	if ($Coro::current == $Coro::main) {
427	my $time = Event::time;	501	my $time = EV::time;
428		502
429	# this is the main coro, too bad, we have to block	503	# this is the main coro, too bad, we have to block
430	# till the operation succeeds, freezing the server :/	504	# till the operation succeeds, freezing the server :/
431		505
432	LOG llevError | logBacktrace, Carp::longmess "sync job";#d#	506	LOG llevError, Carp::longmess "sync job";#d#
433		507
434	# TODO: use suspend/resume instead
435	# (but this is cancel-safe)
436	my $freeze_guard = freeze_mainloop;	508	my $freeze_guard = freeze_mainloop;
437		509
438	my $busy = 1;	510	my $busy = 1;
439	my @res;	511	my @res;
440		512
…		…
444	warn $@ if $@;	516	warn $@ if $@;
445	undef $busy;	517	undef $busy;
446	})->prio (Coro::PRIO_MAX);	518	})->prio (Coro::PRIO_MAX);
447		519
448	while ($busy) {	520	while ($busy) {
449	Coro::cede or Event::one_event;	521	if (Coro::nready) {
		522	Coro::cede_notself;
		523	} else {
		524	EV::loop EV::LOOP_ONESHOT;
450	}	525	}
		526	}
451		527
452	$time = Event::time - $time;	528	my $time = EV::time - $time;
453		529
454	LOG llevError | logBacktrace, Carp::longmess "long sync job"
455	if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
456
457	$tick_start += $time; # do not account sync jobs to server load	530	$TICK_START += $time; # do not account sync jobs to server load
458		531
459	wantarray ? @res : $res[0]	532	wantarray ? @res : $res[0]
460	} else {	533	} else {
461	# we are in another coroutine, how wonderful, everything just works	534	# we are in another coroutine, how wonderful, everything just works
462		535
…		…
487	=item fork_call { }, $args	560	=item fork_call { }, $args
488		561
489	Executes the given code block with the given arguments in a seperate	562	Executes the given code block with the given arguments in a seperate
490	process, returning the results. Everything must be serialisable with	563	process, returning the results. Everything must be serialisable with
491	Coro::Storable. May, of course, block. Note that the executed sub may	564	Coro::Storable. May, of course, block. Note that the executed sub may
492	never block itself or use any form of Event handling.	565	never block itself or use any form of event handling.
493		566
494	=cut	567	=cut
495		568
496	sub fork_call(&@) {	569	sub fork_call(&@) {
497	my ($cb, @args) = @_;	570	my ($cb, @args) = @_;
…		…
504	reset_signals;	577	reset_signals;
505	&$cb	578	&$cb
506	}, @args;	579	}, @args;
507		580
508	wantarray ? @res : $res[-1]	581	wantarray ? @res : $res[-1]
		582	}
		583
		584	=item $coin = coin_from_name $name
		585
		586	=cut
		587
		588	our %coin_alias = (
		589	"silver" => "silvercoin",
		590	"silvercoin" => "silvercoin",
		591	"silvercoins" => "silvercoin",
		592	"gold" => "goldcoin",
		593	"goldcoin" => "goldcoin",
		594	"goldcoins" => "goldcoin",
		595	"platinum" => "platinacoin",
		596	"platinumcoin" => "platinacoin",
		597	"platinumcoins" => "platinacoin",
		598	"platina" => "platinacoin",
		599	"platinacoin" => "platinacoin",
		600	"platinacoins" => "platinacoin",
		601	"royalty" => "royalty",
		602	"royalties" => "royalty",
		603	);
		604
		605	sub coin_from_name($) {
		606	$coin_alias{$_[0]}
		607	? cf::arch::find $coin_alias{$_[0]}
		608	: undef
509	}	609	}
510		610
511	=item $value = cf::db_get $family => $key	611	=item $value = cf::db_get $family => $key
512		612
513	Returns a single value from the environment database.	613	Returns a single value from the environment database.
…		…
652		752
653	#############################################################################	753	#############################################################################
654		754
655	=head2 ATTACHABLE OBJECTS	755	=head2 ATTACHABLE OBJECTS
656		756
657	Many objects in crossfire are so-called attachable objects. That means you can	757	Many objects in deliantra are so-called attachable objects. That means you can
658	attach callbacks/event handlers (a collection of which is called an "attachment")	758	attach callbacks/event handlers (a collection of which is called an "attachment")
659	to it. All such attachable objects support the following methods.	759	to it. All such attachable objects support the following methods.
660		760
661	In the following description, CLASS can be any of C<global>, C<object>	761	In the following description, CLASS can be any of C<global>, C<object>
662	C<player>, C<client> or C<map> (i.e. the attachable objects in	762	C<player>, C<client> or C<map> (i.e. the attachable objects in
663	Crossfire TRT).	763	Deliantra).
664		764
665	=over 4	765	=over 4
666		766
667	=item $attachable->attach ($attachment, key => $value...)	767	=item $attachable->attach ($attachment, key => $value...)
668		768
…		…
712	=item cf::CLASS::attachment $name, ...	812	=item cf::CLASS::attachment $name, ...
713		813
714	Register an attachment by C<$name> through which attachable objects of the	814	Register an attachment by C<$name> through which attachable objects of the
715	given CLASS can refer to this attachment.	815	given CLASS can refer to this attachment.
716		816
717	Some classes such as crossfire maps and objects can specify attachments	817	Some classes such as deliantra maps and objects can specify attachments
718	that are attached at load/instantiate time, thus the need for a name.	818	that are attached at load/instantiate time, thus the need for a name.
719		819
720	These calls expect any number of the following handler/hook descriptions:	820	These calls expect any number of the following handler/hook descriptions:
721		821
722	=over 4	822	=over 4
…		…
950	}	1050	}
951		1051
952	0	1052	0
953	}	1053	}
954		1054
955	=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...)	1055	=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
956		1056
957	=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)	1057	=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
958		1058
959	Generate an object-specific event with the given arguments.	1059	Generate an object-specific event with the given arguments.
960		1060
…		…
966		1066
967	=cut	1067	=cut
968		1068
969	#############################################################################	1069	#############################################################################
970	# object support	1070	# object support
971	#
972		1071
		1072	sub _object_equal($$);
		1073	sub _object_equal($$) {
		1074	my ($a, $b) = @_;
		1075
		1076	return 0 unless (ref $a) eq (ref $b);
		1077
		1078	if ("HASH" eq ref $a) {
		1079	my @ka = keys %$a;
		1080	my @kb = keys %$b;
		1081
		1082	return 0 if @ka != @kb;
		1083
		1084	for (0 .. $#ka) {
		1085	return 0 unless $ka[$_] eq $kb[$_];
		1086	return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
		1087	}
		1088
		1089	} elsif ("ARRAY" eq ref $a) {
		1090
		1091	return 0 if @$a != @$b;
		1092
		1093	for (0 .. $#$a) {
		1094	return 0 unless _object_equal $a->[$_], $b->[$_];
		1095	}
		1096
		1097	} elsif ($a ne $b) {
		1098	return 0;
		1099	}
		1100
		1101	1
		1102	}
		1103
		1104	our $SLOW_MERGES;#d#
973	sub _can_merge {	1105	sub _can_merge {
974	my ($ob1, $ob2) = @_;	1106	my ($ob1, $ob2) = @_;
975		1107
976	local $Storable::canonical = 1;	1108	++$SLOW_MERGES;#d#
977	my $fob1 = Storable::freeze $ob1;
978	my $fob2 = Storable::freeze $ob2;
979		1109
980	$fob1 eq $fob2	1110	# we do the slow way here
		1111	return _object_equal $ob1, $ob2
981	}	1112	}
982		1113
983	sub reattach {	1114	sub reattach {
984	# basically do the same as instantiate, without calling instantiate	1115	# basically do the same as instantiate, without calling instantiate
985	my ($obj) = @_;	1116	my ($obj) = @_;
986		1117
		1118	# no longer needed after getting rid of delete_package?
987	bless $obj, ref $obj; # re-bless in case extensions have been reloaded	1119	#bless $obj, ref $obj; # re-bless in case extensions have been reloaded
988		1120
989	my $registry = $obj->registry;	1121	my $registry = $obj->registry;
990		1122
991	@$registry = ();	1123	@$registry = ();
992		1124
…		…
1007	cf::attachable->attach (	1139	cf::attachable->attach (
1008	prio => -1000000,	1140	prio => -1000000,
1009	on_instantiate => sub {	1141	on_instantiate => sub {
1010	my ($obj, $data) = @_;	1142	my ($obj, $data) = @_;
1011		1143
1012	$data = from_json $data;	1144	$data = decode_json $data;
1013		1145
1014	for (@$data) {	1146	for (@$data) {
1015	my ($name, $args) = @$_;	1147	my ($name, $args) = @$_;
1016		1148
1017	$obj->attach ($name, %{$args || {} });	1149	$obj->attach ($name, %{$args || {} });
…		…
1038	utf8::decode (my $decname = $filename);	1170	utf8::decode (my $decname = $filename);
1039	warn sprintf "saving %s (%d,%d)\n",	1171	warn sprintf "saving %s (%d,%d)\n",
1040	$decname, length $$rdata, scalar @$objs;	1172	$decname, length $$rdata, scalar @$objs;
1041		1173
1042	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1174	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1043	chmod SAVE_MODE, $fh;	1175	aio_chmod $fh, SAVE_MODE;
1044	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1176	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1045	aio_fsync $fh if $cf::USE_FSYNC;	1177	if ($cf::USE_FSYNC) {
		1178	aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
		1179	aio_fsync $fh;
		1180	}
1046	close $fh;	1181	aio_close $fh;
1047		1182
1048	if (@$objs) {	1183	if (@$objs) {
1049	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {	1184	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1050	chmod SAVE_MODE, $fh;	1185	aio_chmod $fh, SAVE_MODE;
1051	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };	1186	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1052	aio_write $fh, 0, (length $data), $data, 0;	1187	aio_write $fh, 0, (length $data), $data, 0;
1053	aio_fsync $fh if $cf::USE_FSYNC;	1188	if ($cf::USE_FSYNC) {
		1189	aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
		1190	aio_fsync $fh;
		1191	}
1054	close $fh;	1192	aio_close $fh;
1055	aio_rename "$filename.pst~", "$filename.pst";	1193	aio_rename "$filename.pst~", "$filename.pst";
1056	}	1194	}
1057	} else {	1195	} else {
1058	aio_unlink "$filename.pst";	1196	aio_unlink "$filename.pst";
1059	}	1197	}
1060		1198
1061	aio_rename "$filename~", $filename;	1199	aio_rename "$filename~", $filename;
		1200
		1201	$filename =~ s%/[^/]+$%%;
		1202	aio_pathsync $filename if $cf::USE_FSYNC;
1062	} else {	1203	} else {
1063	warn "FATAL: $filename~: $!\n";	1204	warn "unable to save objects: $filename~: $!\n";
1064	}	1205	}
1065	} else {	1206	} else {
1066	aio_unlink $filename;	1207	aio_unlink $filename;
1067	aio_unlink "$filename.pst";	1208	aio_unlink "$filename.pst";
1068	}	1209	}
…		…
1087		1228
1088	unless (aio_stat "$filename.pst") {	1229	unless (aio_stat "$filename.pst") {
1089	(aio_load "$filename.pst", $av) >= 0	1230	(aio_load "$filename.pst", $av) >= 0
1090	or return;	1231	or return;
1091		1232
1092	my $st = eval { Coro::Storable::thaw $av }	1233	my $st = eval { Coro::Storable::thaw $av };
1093	|| eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1094	$av = $st->{objs};	1234	$av = $st->{objs};
1095	}	1235	}
1096		1236
1097	utf8::decode (my $decname = $filename);	1237	utf8::decode (my $decname = $filename);
1098	warn sprintf "loading %s (%d,%d)\n",	1238	warn sprintf "loading %s (%d,%d)\n",
…		…
1160	my ($name, $cb) = @_;	1300	my ($name, $cb) = @_;
1161		1301
1162	$EXTICMD{$name} = $cb;	1302	$EXTICMD{$name} = $cb;
1163	}	1303	}
1164		1304
		1305	use File::Glob ();
		1306
1165	cf::player->attach (	1307	cf::player->attach (
1166	on_command => sub {	1308	on_command => sub {
1167	my ($pl, $name, $params) = @_;	1309	my ($pl, $name, $params) = @_;
1168		1310
1169	my $cb = $COMMAND{$name}	1311	my $cb = $COMMAND{$name}
…		…
1201		1343
1202	cf::override;	1344	cf::override;
1203	},	1345	},
1204	);	1346	);
1205		1347
		1348	# "readahead" all extensions
		1349	sub cache_extensions {
		1350	my $grp = IO::AIO::aio_group;
		1351
		1352	add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
		1353	for (grep /\.ext$/, @{$_[0]}) {
		1354	add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
		1355	}
		1356	};
		1357
		1358	$grp
		1359	}
		1360
1206	sub load_extensions {	1361	sub load_extensions {
1207	cf::sync_job {	1362	cf::sync_job {
1208	my %todo;	1363	my %todo;
1209		1364
1210	for my $path (<$LIBDIR/*.ext>) {	1365	for my $path (<$LIBDIR/*.ext>) {
…		…
1229		1384
1230	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1385	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1231	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1386	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1232		1387
1233	$ext{source} =	1388	$ext{source} =
1234	"package $pkg; use strict; use utf8;\n"	1389	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1235	. "#line 1 \"$path\"\n{\n"	1390	. "#line 1 \"$path\"\n{\n"
1236	. $source	1391	. $source
1237	. "\n};\n1";	1392	. "\n};\n1";
1238		1393
1239	$todo{$base} = \%ext;	1394	$todo{$base} = \%ext;
…		…
1255	my $msg = $@ ? "$v->{path}: $@\n"	1410	my $msg = $@ ? "$v->{path}: $@\n"
1256	: "$v->{base}: extension inactive.\n";	1411	: "$v->{base}: extension inactive.\n";
1257		1412
1258	if (exists $v->{meta}{mandatory}) {	1413	if (exists $v->{meta}{mandatory}) {
1259	warn $msg;	1414	warn $msg;
1260	warn "mandatory extension failed to load, exiting.\n";	1415	cf::cleanup "mandatory extension failed to load, exiting.";
1261	exit 1;
1262	}	1416	}
1263		1417
1264	warn $msg;	1418	warn $msg;
1265	}	1419	}
1266		1420
…		…
1280		1434
1281	=back	1435	=back
1282		1436
1283	=head2 CORE EXTENSIONS	1437	=head2 CORE EXTENSIONS
1284		1438
1285	Functions and methods that extend core crossfire objects.	1439	Functions and methods that extend core deliantra objects.
1286		1440
1287	=cut	1441	=cut
1288		1442
1289	package cf::player;	1443	package cf::player;
1290		1444
…		…
1333		1487
1334	sub exists($) {	1488	sub exists($) {
1335	my ($login) = @_;	1489	my ($login) = @_;
1336		1490
1337	$cf::PLAYER{$login}	1491	$cf::PLAYER{$login}
1338	or cf::sync_job { !aio_stat path $login }	1492	or !aio_stat path $login
1339	}	1493	}
1340		1494
1341	sub find($) {	1495	sub find($) {
1342	return $cf::PLAYER{$_[0]} || do {	1496	return $cf::PLAYER{$_[0]} || do {
1343	my $login = $_[0];	1497	my $login = $_[0];
…		…
1355	my $f = new_from_file cf::object::thawer path $login	1509	my $f = new_from_file cf::object::thawer path $login
1356	or return;	1510	or return;
1357		1511
1358	my $pl = cf::player::load_pl $f	1512	my $pl = cf::player::load_pl $f
1359	or return;	1513	or return;
		1514
1360	local $cf::PLAYER_LOADING{$login} = $pl;	1515	local $cf::PLAYER_LOADING{$login} = $pl;
1361	$f->resolve_delayed_derefs;	1516	$f->resolve_delayed_derefs;
1362	$cf::PLAYER{$login} = $pl	1517	$cf::PLAYER{$login} = $pl
1363	}	1518	}
1364	}	1519	}
…		…
1374		1529
1375	return if $pl->{deny_save};	1530	return if $pl->{deny_save};
1376		1531
1377	aio_mkdir playerdir $pl, 0770;	1532	aio_mkdir playerdir $pl, 0770;
1378	$pl->{last_save} = $cf::RUNTIME;	1533	$pl->{last_save} = $cf::RUNTIME;
		1534
		1535	cf::get_slot 0.01;
1379		1536
1380	$pl->save_pl ($path);	1537	$pl->save_pl ($path);
1381	cf::cede_to_tick;	1538	cf::cede_to_tick;
1382	}	1539	}
1383		1540
…		…
1415	my ($pl) = @_;	1572	my ($pl) = @_;
1416		1573
1417	my $name = $pl->ob->name;	1574	my $name = $pl->ob->name;
1418		1575
1419	$pl->{deny_save} = 1;	1576	$pl->{deny_save} = 1;
1420	$pl->password ("*"); # this should lock out the player until we nuked the dir	1577	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1421		1578
1422	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1579	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1423	$pl->deactivate;	1580	$pl->deactivate;
		1581	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
		1582	$pl->ob->check_score;
1424	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1583	$pl->invoke (cf::EVENT_PLAYER_QUIT);
1425	$pl->ns->destroy if $pl->ns;	1584	$pl->ns->destroy if $pl->ns;
1426		1585
1427	my $path = playerdir $pl;	1586	my $path = playerdir $pl;
1428	my $temp = "$path~$cf::RUNTIME~deleting~";	1587	my $temp = "$path~$cf::RUNTIME~deleting~";
…		…
1467		1626
1468	for my $login (@$dirs) {	1627	for my $login (@$dirs) {
1469	my $path = path $login;	1628	my $path = path $login;
1470		1629
1471	# a .pst is a dead give-away for a valid player	1630	# a .pst is a dead give-away for a valid player
1472	unless (-e "$path.pst") {	1631	# if no pst file found, open and chekc for blocked users
		1632	if (aio_stat "$path.pst") {
1473	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;	1633	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1474	aio_read $fh, 0, 512, my $buf, 0 or next;	1634	aio_read $fh, 0, 512, my $buf, 0 or next;
1475	$buf !~ /^password -------------$/m or next; # official not-valid tag	1635	$buf !~ /^password -------------$/m or next; # official not-valid tag
1476	}	1636	}
1477		1637
…		…
1508	}	1668	}
1509		1669
1510	\@paths	1670	\@paths
1511	}	1671	}
1512		1672
1513	=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)	1673	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1514		1674
1515	Expand crossfire pod fragments into protocol xml.	1675	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		1676
1564	=item $player->ext_reply ($msgid, @msg)	1677	=item $player->ext_reply ($msgid, @msg)
1565		1678
1566	Sends an ext reply to the player.	1679	Sends an ext reply to the player.
1567		1680
…		…
1634	our $MAX_RESET = 3600;	1747	our $MAX_RESET = 3600;
1635	our $DEFAULT_RESET = 3000;	1748	our $DEFAULT_RESET = 3000;
1636		1749
1637	sub generate_random_map {	1750	sub generate_random_map {
1638	my ($self, $rmp) = @_;	1751	my ($self, $rmp) = @_;
		1752
		1753	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
		1754
1639	# mit "rum" bekleckern, nicht	1755	# mit "rum" bekleckern, nicht
1640	$self->_create_random_map (	1756	$self->_create_random_map (
1641	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},	1757	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1642	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},	1758	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1643	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},	1759	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
…		…
1765		1881
1766	# the temporary/swap location	1882	# the temporary/swap location
1767	sub save_path {	1883	sub save_path {
1768	my ($self) = @_;	1884	my ($self) = @_;
1769		1885
1770	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1886	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1771	"$TMPDIR/$path.map"	1887	"$TMPDIR/$path.map"
1772	}	1888	}
1773		1889
1774	# the unique path, undef == no special unique path	1890	# the unique path, undef == no special unique path
1775	sub uniq_path {	1891	sub uniq_path {
1776	my ($self) = @_;	1892	my ($self) = @_;
1777		1893
1778	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1894	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1779	"$UNIQUEDIR/$path"	1895	"$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	}	1896	}
1790		1897
1791	sub decay_objects {	1898	sub decay_objects {
1792	my ($self) = @_;	1899	my ($self) = @_;
1793		1900
…		…
1877	sub find {	1984	sub find {
1878	my ($path, $origin) = @_;	1985	my ($path, $origin) = @_;
1879		1986
1880	$path = normalise $path, $origin && $origin->path;	1987	$path = normalise $path, $origin && $origin->path;
1881		1988
1882	cf::lock_wait "map_data:$path";#d#remove	1989	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1883	cf::lock_wait "map_find:$path";	1990	my $guard2 = cf::lock_acquire "map_find:$path";
1884		1991
1885	$cf::MAP{$path} || do {	1992	$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	1993	my $map = new_from_path cf::map $path
1890	or return;	1994	or return;
1891		1995
1892	$map->{last_save} = $cf::RUNTIME;	1996	$map->{last_save} = $cf::RUNTIME;
1893		1997
…		…
1895	or return;	1999	or return;
1896		2000
1897	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	2001	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1898	# doing this can freeze the server in a sync job, obviously	2002	# doing this can freeze the server in a sync job, obviously
1899	#$cf::WAIT_FOR_TICK->wait;	2003	#$cf::WAIT_FOR_TICK->wait;
		2004	undef $guard2;
1900	undef $guard1;	2005	undef $guard1;
1901	undef $guard2;
1902	$map->reset;	2006	$map->reset;
1903	return find $path;	2007	return find $path;
1904	}	2008	}
1905		2009
1906	$cf::MAP{$path} = $map	2010	$cf::MAP{$path} = $map
…		…
1933	my $f = new_from_file cf::object::thawer $self->{load_path};	2037	my $f = new_from_file cf::object::thawer $self->{load_path};
1934	$f->skip_block;	2038	$f->skip_block;
1935	$self->_load_objects ($f)	2039	$self->_load_objects ($f)
1936	or return;	2040	or return;
1937		2041
1938	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	2042	$self->post_load_original
1939	if delete $self->{load_original};	2043	if delete $self->{load_original};
1940		2044
1941	if (my $uniq = $self->uniq_path) {	2045	if (my $uniq = $self->uniq_path) {
1942	utf8::encode $uniq;	2046	utf8::encode $uniq;
1943	unless (aio_stat $uniq) {	2047	unless (aio_stat $uniq) {
…		…
1961	unless ($self->{deny_activate}) {	2065	unless ($self->{deny_activate}) {
1962	$self->decay_objects;	2066	$self->decay_objects;
1963	$self->fix_auto_apply;	2067	$self->fix_auto_apply;
1964	$self->update_buttons;	2068	$self->update_buttons;
1965	cf::cede_to_tick;	2069	cf::cede_to_tick;
1966	$self->set_darkness_map;
1967	cf::cede_to_tick;
1968	$self->activate;	2070	$self->activate;
1969	}	2071	}
1970		2072
1971	$self->{last_save} = $cf::RUNTIME;	2073	$self->{last_save} = $cf::RUNTIME;
1972	$self->last_access ($cf::RUNTIME);	2074	$self->last_access ($cf::RUNTIME);
1973		2075
1974	$self->in_memory (cf::MAP_IN_MEMORY);	2076	$self->in_memory (cf::MAP_ACTIVE);
1975	}	2077	}
1976		2078
1977	$self->post_load;	2079	$self->post_load;
1978	}	2080	}
1979		2081
…		…
2037	my ($path, $origin, $load) = @_;	2139	my ($path, $origin, $load) = @_;
2038		2140
2039	$path = normalise $path, $origin && $origin->{path};	2141	$path = normalise $path, $origin && $origin->{path};
2040		2142
2041	if (my $map = $cf::MAP{$path}) {	2143	if (my $map = $cf::MAP{$path}) {
2042	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;	2144	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2043	}	2145	}
2044		2146
2045	$MAP_PREFETCH{$path} |= $load;	2147	$MAP_PREFETCH{$path} |= $load;
2046		2148
2047	$MAP_PREFETCHER ||= cf::async {	2149	$MAP_PREFETCHER ||= cf::async {
…		…
2084	cf::async {	2186	cf::async {
2085	$Coro::current->{desc} = "map player save";	2187	$Coro::current->{desc} = "map player save";
2086	$_->contr->save for $self->players;	2188	$_->contr->save for $self->players;
2087	};	2189	};
2088		2190
		2191	cf::get_slot 0.02;
		2192
2089	if ($uniq) {	2193	if ($uniq) {
2090	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);	2194	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2091	$self->_save_objects ($uniq, cf::IO_UNIQUES);	2195	$self->_save_objects ($uniq, cf::IO_UNIQUES);
2092	} else {	2196	} else {
2093	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);	2197	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
…		…
2101	$self->save;	2205	$self->save;
2102		2206
2103	my $lock = cf::lock_acquire "map_data:$self->{path}";	2207	my $lock = cf::lock_acquire "map_data:$self->{path}";
2104		2208
2105	return if $self->players;	2209	return if $self->players;
2106	return if $self->in_memory != cf::MAP_IN_MEMORY;	2210	return if $self->in_memory != cf::MAP_ACTIVE;
2107	return if $self->{deny_save};	2211	return if $self->{deny_save};
2108		2212
2109	$self->in_memory (cf::MAP_SWAPPED);	2213	$self->in_memory (cf::MAP_SWAPPED);
2110		2214
2111	$self->deactivate;	2215	$self->deactivate;
…		…
2136		2240
2137	my $lock = cf::lock_acquire "map_data:$self->{path}";	2241	my $lock = cf::lock_acquire "map_data:$self->{path}";
2138		2242
2139	return if $self->players;	2243	return if $self->players;
2140		2244
2141	warn "resetting map ", $self->path;	2245	warn "resetting map ", $self->path, "\n";
2142		2246
2143	$self->in_memory (cf::MAP_SWAPPED);	2247	$self->in_memory (cf::MAP_SWAPPED);
2144		2248
2145	# need to save uniques path	2249	# need to save uniques path
2146	unless ($self->{deny_save}) {	2250	unless ($self->{deny_save}) {
…		…
2229		2333
2230	sub unique_maps() {	2334	sub unique_maps() {
2231	[	2335	[
2232	map {	2336	map {
2233	utf8::decode $_;	2337	utf8::decode $_;
2234	/\.map$/	2338	s/\.map$//; # TODO future compatibility hack
		2339	/\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
		2340	? ()
2235	? normalise $_	2341	: normalise $_
2236	: ()
2237	} @{ aio_readdir $UNIQUEDIR or [] }	2342	} @{ aio_readdir $UNIQUEDIR or [] }
2238	]	2343	]
2239	}	2344	}
2240		2345
2241	package cf;	2346	=item cf::map::static_maps
		2347
		2348	Returns an arrayref if paths of all static maps (all preinstalled F<.map>
		2349	file in the shared directory excluding F</styles>). May block.
		2350
		2351	=cut
		2352
		2353	sub static_maps() {
		2354	my @dirs = "";
		2355	my @maps;
		2356
		2357	while (@dirs) {
		2358	my $dir = shift @dirs;
		2359
		2360	next if $dir eq "/styles";
		2361
		2362	my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
		2363	or return;
		2364
		2365	for (@$files) {
		2366	s/\.map$// or next;
		2367	utf8::decode $_;
		2368	push @maps, "$dir/$_";
		2369	}
		2370
		2371	push @dirs, map "$dir/$_", @$dirs;
		2372	}
		2373
		2374	\@maps
		2375	}
2242		2376
2243	=back	2377	=back
2244		2378
2245	=head3 cf::object	2379	=head3 cf::object
2246		2380
…		…
2250		2384
2251	=over 4	2385	=over 4
2252		2386
2253	=item $ob->inv_recursive	2387	=item $ob->inv_recursive
2254		2388
2255	Returns the inventory of the object _and_ their inventories, recursively.	2389	Returns the inventory of the object I<and> their inventories, recursively,
		2390	but I<not> the object itself.
2256		2391
2257	=cut	2392	=cut
2258		2393
2259	sub inv_recursive_;	2394	sub inv_recursive_;
2260	sub inv_recursive_ {	2395	sub inv_recursive_ {
…		…
2265	inv_recursive_ inv $_[0]	2400	inv_recursive_ inv $_[0]
2266	}	2401	}
2267		2402
2268	=item $ref = $ob->ref	2403	=item $ref = $ob->ref
2269		2404
2270	creates and returns a persistent reference to an objetc that can be stored as a string.	2405	Creates and returns a persistent reference to an object that can be stored as a string.
2271		2406
2272	=item $ob = cf::object::deref ($refstring)	2407	=item $ob = cf::object::deref ($refstring)
2273		2408
2274	returns the objetc referenced by refstring. may return undef when it cnanot find the object,	2409	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2275	even if the object actually exists. May block.	2410	even if the object actually exists. May block.
…		…
2307	can be C<undef>. Does the right thing when the player is currently in a	2442	can be C<undef>. Does the right thing when the player is currently in a
2308	dialogue with the given NPC character.	2443	dialogue with the given NPC character.
2309		2444
2310	=cut	2445	=cut
2311		2446
		2447	our $SAY_CHANNEL = {
		2448	id => "say",
		2449	title => "Map",
		2450	reply => "say ",
		2451	tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
		2452	};
		2453
		2454	our $CHAT_CHANNEL = {
		2455	id => "chat",
		2456	title => "Chat",
		2457	reply => "chat ",
		2458	tooltip => "Player chat and shouts, global to the server.",
		2459	};
		2460
2312	# rough implementation of a future "reply" method that works	2461	# rough implementation of a future "reply" method that works
2313	# with dialog boxes.	2462	# with dialog boxes.
2314	#TODO: the first argument must go, split into a $npc->reply_to ( method	2463	#TODO: the first argument must go, split into a $npc->reply_to ( method
2315	sub cf::object::player::reply($$$;$) {	2464	sub cf::object::player::reply($$$;$) {
2316	my ($self, $npc, $msg, $flags) = @_;	2465	my ($self, $npc, $msg, $flags) = @_;
…		…
2327	my $dialog = $pl->{npc_dialog};	2476	my $dialog = $pl->{npc_dialog};
2328	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));	2477	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2329		2478
2330	} else {	2479	} else {
2331	$msg = $npc->name . " says: $msg" if $npc;	2480	$msg = $npc->name . " says: $msg" if $npc;
2332	$self->message ($msg, $flags);	2481	$self->send_msg ($SAY_CHANNEL => $msg, $flags);
2333	}	2482	}
2334	}	2483	}
2335	}	2484	}
2336		2485
2337	=item $object->send_msg ($channel, $msg, $color, [extra...])	2486	=item $object->send_msg ($channel, $msg, $color, [extra...])
…		…
2362		2511
2363	=item $player_object->enter_link	2512	=item $player_object->enter_link
2364		2513
2365	Freezes the player and moves him/her to a special map (C<{link}>).	2514	Freezes the player and moves him/her to a special map (C<{link}>).
2366		2515
2367	The player should be reasonably safe there for short amounts of time. You	2516	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.	2517	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
		2518	though, as the palyer cannot control the character while it is on the link
		2519	map.
2369		2520
2370	Will never block.	2521	Will never block.
2371		2522
2372	=item $player_object->leave_link ($map, $x, $y)	2523	=item $player_object->leave_link ($map, $x, $y)
2373		2524
…		…
2431		2582
2432	$map->load;	2583	$map->load;
2433	$map->load_neighbours;	2584	$map->load_neighbours;
2434		2585
2435	return unless $self->contr->active;	2586	return unless $self->contr->active;
2436	$self->activate_recursive;
2437		2587
2438	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2588	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2439	$self->enter_map ($map, $x, $y);	2589	$self->enter_map ($map, $x, $y);
		2590
		2591	# only activate afterwards, to support waiting in hooks
		2592	$self->activate_recursive;
2440	}	2593	}
2441		2594
2442	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2595	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2443		2596
2444	Moves the player to the given map-path and coordinates by first freezing	2597	Moves the player to the given map-path and coordinates by first freezing
2445	her, loading and preparing them map, calling the provided $check callback	2598	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	2599	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	2600	the new (success) or old (failed) map position. In either case, $done will
2448	be called at the end of this process.	2601	be called at the end of this process.
		2602
		2603	Note that $check will be called with a potentially non-loaded map, so if
		2604	it needs a loaded map it has to call C<< ->load >>.
2449		2605
2450	=cut	2606	=cut
2451		2607
2452	our $GOTOGEN;	2608	our $GOTOGEN;
2453		2609
…		…
2532	}	2688	}
2533		2689
2534	sub prepare_random_map {	2690	sub prepare_random_map {
2535	my ($exit) = @_;	2691	my ($exit) = @_;
2536		2692
2537	my $guard = cf::lock_acquire "exit_prepare:$exit";
2538
2539	# all this does is basically replace the /! path by	2693	# all this does is basically replace the /! path by
2540	# a new random map path (?random/...) with a seed	2694	# a new random map path (?random/...) with a seed
2541	# that depends on the exit object	2695	# that depends on the exit object
2542		2696
2543	my $rmp = parse_random_map_params $exit->msg;	2697	my $rmp = parse_random_map_params $exit->msg;
…		…
2545	if ($exit->map) {	2699	if ($exit->map) {
2546	$rmp->{region} = $exit->region->name;	2700	$rmp->{region} = $exit->region->name;
2547	$rmp->{origin_map} = $exit->map->path;	2701	$rmp->{origin_map} = $exit->map->path;
2548	$rmp->{origin_x} = $exit->x;	2702	$rmp->{origin_x} = $exit->x;
2549	$rmp->{origin_y} = $exit->y;	2703	$rmp->{origin_y} = $exit->y;
		2704
		2705	$exit->map->touch;
2550	}	2706	}
2551		2707
2552	$rmp->{random_seed} ||= $exit->random_seed;	2708	$rmp->{random_seed} ||= $exit->random_seed;
2553		2709
2554	my $data = cf::to_json $rmp;	2710	my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2555	my $md5 = Digest::MD5::md5_hex $data;	2711	my $md5 = Digest::MD5::md5_hex $data;
2556	my $meta = "$RANDOMDIR/$md5.meta";	2712	my $meta = "$RANDOMDIR/$md5.meta";
2557		2713
2558	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {	2714	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2559	aio_write $fh, 0, (length $data), $data, 0;	2715	aio_write $fh, 0, (length $data), $data, 0;
2560	undef $fh;	2716	undef $fh;
2561	aio_rename "$meta~", $meta;	2717	aio_rename "$meta~", $meta;
2562		2718
		2719	my $slaying = "?random/$md5";
		2720
		2721	if ($exit->valid) {
2563	$exit->slaying ("?random/$md5");	2722	$exit->slaying ("?random/$md5");
2564	$exit->msg (undef);	2723	$exit->msg (undef);
		2724	}
2565	}	2725	}
2566	}	2726	}
2567		2727
2568	sub cf::object::player::enter_exit {	2728	sub cf::object::player::enter_exit {
2569	my ($self, $exit) = @_;	2729	my ($self, $exit) = @_;
2570		2730
2571	return unless $self->type == cf::PLAYER;	2731	return unless $self->type == cf::PLAYER;
2572		2732
2573	if ($exit->slaying eq "/!") {
2574	#TODO: this should de-fi-ni-te-ly not be a sync-job
2575	# the problem is that $exit might not survive long enough
2576	# so it needs to be done right now, right here
2577	cf::sync_job { prepare_random_map $exit };
2578	}
2579
2580	my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2581	my $hp = $exit->stats->hp;
2582	my $sp = $exit->stats->sp;
2583
2584	$self->enter_link;	2733	$self->enter_link;
2585		2734
2586	# if exit is damned, update players death & WoR home-position
2587	$self->contr->savebed ($slaying, $hp, $sp)
2588	if $exit->flag (FLAG_DAMNED);
2589
2590	(async {	2735	(async {
2591	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";	2736	$Coro::current->{desc} = "enter_exit";
2592		2737
2593	$self->deactivate_recursive; # just to be sure
2594	unless (eval {	2738	unless (eval {
		2739	$self->deactivate_recursive; # just to be sure
		2740
		2741	# random map handling
		2742	{
		2743	my $guard = cf::lock_acquire "exit_prepare:$exit";
		2744
		2745	prepare_random_map $exit
		2746	if $exit->slaying eq "/!";
		2747	}
		2748
		2749	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
		2750	my $x = $exit->stats->hp;
		2751	my $y = $exit->stats->sp;
		2752
2595	$self->goto ($slaying, $hp, $sp);	2753	$self->goto ($map, $x, $y);
2596		2754
		2755	# if exit is damned, update players death & WoR home-position
		2756	$self->contr->savebed ($map, $x, $y)
		2757	if $exit->flag (cf::FLAG_DAMNED);
		2758
2597	1;	2759	1
2598	}) {	2760	}) {
2599	$self->message ("Something went wrong deep within the crossfire server. "	2761	$self->message ("Something went wrong deep within the deliantra server. "
2600	. "I'll try to bring you back to the map you were before. "	2762	. "I'll try to bring you back to the map you were before. "
2601	. "Please report this to the dungeon master!",	2763	. "Please report this to the dungeon master!",
2602	cf::NDI_UNIQUE | cf::NDI_RED);	2764	cf::NDI_UNIQUE | cf::NDI_RED);
2603		2765
2604	warn "ERROR in enter_exit: $@";	2766	warn "ERROR in enter_exit: $@";
…		…
2632	the message, with C<log> being the default. If C<$color> is negative, suppress	2794	the message, with C<log> being the default. If C<$color> is negative, suppress
2633	the message unless the client supports the msg packet.	2795	the message unless the client supports the msg packet.
2634		2796
2635	=cut	2797	=cut
2636		2798
		2799	# non-persistent channels (usually the info channel)
2637	our %CHANNEL = (	2800	our %CHANNEL = (
		2801	"c/motd" => {
		2802	id => "infobox",
		2803	title => "MOTD",
		2804	reply => undef,
		2805	tooltip => "The message of the day",
		2806	},
2638	"c/identify" => {	2807	"c/identify" => {
2639	id => "infobox",	2808	id => "infobox",
2640	title => "Identify",	2809	title => "Identify",
2641	reply => undef,	2810	reply => undef,
2642	tooltip => "Items recently identified",	2811	tooltip => "Items recently identified",
…		…
2645	id => "infobox",	2814	id => "infobox",
2646	title => "Examine",	2815	title => "Examine",
2647	reply => undef,	2816	reply => undef,
2648	tooltip => "Signs and other items you examined",	2817	tooltip => "Signs and other items you examined",
2649	},	2818	},
		2819	"c/shopinfo" => {
		2820	id => "infobox",
		2821	title => "Shop Info",
		2822	reply => undef,
		2823	tooltip => "What your bargaining skill tells you about the shop",
		2824	},
		2825	"c/book" => {
		2826	id => "infobox",
		2827	title => "Book",
		2828	reply => undef,
		2829	tooltip => "The contents of a note or book",
		2830	},
2650	"c/lookat" => {	2831	"c/lookat" => {
2651	id => "infobox",	2832	id => "infobox",
2652	title => "Look",	2833	title => "Look",
2653	reply => undef,	2834	reply => undef,
2654	tooltip => "What you saw there",	2835	tooltip => "What you saw there",
2655	},	2836	},
		2837	"c/who" => {
		2838	id => "infobox",
		2839	title => "Players",
		2840	reply => undef,
		2841	tooltip => "Shows players who are currently online",
		2842	},
		2843	"c/body" => {
		2844	id => "infobox",
		2845	title => "Body Parts",
		2846	reply => undef,
		2847	tooltip => "Shows which body parts you posess and are available",
		2848	},
		2849	"c/statistics" => {
		2850	id => "infobox",
		2851	title => "Statistics",
		2852	reply => undef,
		2853	tooltip => "Shows your primary statistics",
		2854	},
		2855	"c/skills" => {
		2856	id => "infobox",
		2857	title => "Skills",
		2858	reply => undef,
		2859	tooltip => "Shows your experience per skill and item power",
		2860	},
		2861	"c/shopitems" => {
		2862	id => "infobox",
		2863	title => "Shop Items",
		2864	reply => undef,
		2865	tooltip => "Shows the items currently for sale in this shop",
		2866	},
		2867	"c/resistances" => {
		2868	id => "infobox",
		2869	title => "Resistances",
		2870	reply => undef,
		2871	tooltip => "Shows your resistances",
		2872	},
		2873	"c/pets" => {
		2874	id => "infobox",
		2875	title => "Pets",
		2876	reply => undef,
		2877	tooltip => "Shows information abotu your pets/a specific pet",
		2878	},
		2879	"c/perceiveself" => {
		2880	id => "infobox",
		2881	title => "Perceive Self",
		2882	reply => undef,
		2883	tooltip => "You gained detailed knowledge about yourself",
		2884	},
		2885	"c/uptime" => {
		2886	id => "infobox",
		2887	title => "Uptime",
		2888	reply => undef,
		2889	tooltip => "How long the server has been running since last restart",
		2890	},
		2891	"c/mapinfo" => {
		2892	id => "infobox",
		2893	title => "Map Info",
		2894	reply => undef,
		2895	tooltip => "Information related to the maps",
		2896	},
		2897	"c/party" => {
		2898	id => "party",
		2899	title => "Party",
		2900	reply => "gsay ",
		2901	tooltip => "Messages and chat related to your party",
		2902	},
		2903	"c/death" => {
		2904	id => "death",
		2905	title => "Death",
		2906	reply => undef,
		2907	tooltip => "Reason for and more info about your most recent death",
		2908	},
		2909	"c/say" => $SAY_CHANNEL,
		2910	"c/chat" => $CHAT_CHANNEL,
2656	);	2911	);
2657		2912
2658	sub cf::client::send_msg {	2913	sub cf::client::send_msg {
2659	my ($self, $channel, $msg, $color, @extra) = @_;	2914	my ($self, $channel, $msg, $color, @extra) = @_;
2660		2915
2661	$msg = $self->pl->expand_cfpod ($msg);	2916	$msg = $self->pl->expand_cfpod ($msg)
		2917	unless $color & cf::NDI_VERBATIM;
2662		2918
2663	$color &= cf::NDI_CLIENT_MASK; # just in case...	2919	$color &= cf::NDI_CLIENT_MASK; # just in case...
2664		2920
2665	# check predefined channels, for the benefit of C	2921	# check predefined channels, for the benefit of C
2666	if ($CHANNEL{$channel}) {	2922	if ($CHANNEL{$channel}) {
2667	$channel = $CHANNEL{$channel};	2923	$channel = $CHANNEL{$channel};
2668		2924
2669	$self->ext_msg (channel_info => $channel)	2925	$self->ext_msg (channel_info => $channel);
2670	if $self->can_msg;
2671
2672	$channel = $channel->{id};	2926	$channel = $channel->{id};
2673		2927
2674	} elsif (ref $channel) {	2928	} elsif (ref $channel) {
2675	# send meta info to client, if not yet sent	2929	# send meta info to client, if not yet sent
2676	unless (exists $self->{channel}{$channel->{id}}) {	2930	unless (exists $self->{channel}{$channel->{id}}) {
2677	$self->{channel}{$channel->{id}} = $channel;	2931	$self->{channel}{$channel->{id}} = $channel;
2678	$self->ext_msg (channel_info => $channel)	2932	$self->ext_msg (channel_info => $channel);
2679	if $self->can_msg;
2680	}	2933	}
2681		2934
2682	$channel = $channel->{id};	2935	$channel = $channel->{id};
2683	}	2936	}
2684		2937
2685	return unless @extra || length $msg;	2938	return unless @extra || length $msg;
2686		2939
2687	if ($self->can_msg) {
2688	# default colour, mask it out	2940	# default colour, mask it out
2689	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)	2941	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2690	if $color & cf::NDI_DEF;	2942	if $color & cf::NDI_DEF;
2691		2943
2692	$self->send_packet ("msg " . $self->{json_coder}->encode (	2944	my $pkt = "msg "
		2945	. $self->{json_coder}->encode (
2693	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));	2946	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2694	} else {	2947	);
2695	if ($color >= 0) {
2696	# replace some tags by gcfclient-compatible ones
2697	for ($msg) {
2698	1 while
2699	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2700	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2701	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2702	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2703	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2704	}
2705		2948
2706	$color &= cf::NDI_COLOR_MASK;	2949	# try lzf for large packets
		2950	$pkt = "lzf " . Compress::LZF::compress $pkt
		2951	if 1024 <= length $pkt and $self->{can_lzf};
2707		2952
2708	utf8::encode $msg;	2953	# split very large packets
2709		2954	if (8192 < length $pkt and $self->{can_lzf}) {
2710	if (0 && $msg =~ /\[/) {	2955	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2711	# COMMAND/INFO	2956	$pkt = "frag";
2712	$self->send_packet ("drawextinfo $color 10 8 $msg")
2713	} else {
2714	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2715	$self->send_packet ("drawinfo $color $msg")
2716	}
2717	}
2718	}	2957	}
		2958
		2959	$self->send_packet ($pkt);
2719	}	2960	}
2720		2961
2721	=item $client->ext_msg ($type, @msg)	2962	=item $client->ext_msg ($type, @msg)
2722		2963
2723	Sends an ext event to the client.	2964	Sends an ext event to the client.
…		…
2896	=pod	3137	=pod
2897		3138
2898	The following functions and methods are available within a safe environment:	3139	The following functions and methods are available within a safe environment:
2899		3140
2900	cf::object	3141	cf::object
2901	contr pay_amount pay_player map x y force_find force_add	3142	contr pay_amount pay_player map x y force_find force_add destroy
2902	insert remove name archname title slaying race decrease_ob_nr	3143	insert remove name archname title slaying race decrease split
		3144	value
2903		3145
2904	cf::object::player	3146	cf::object::player
2905	player	3147	player
2906		3148
2907	cf::player	3149	cf::player
…		…
2912		3154
2913	=cut	3155	=cut
2914		3156
2915	for (	3157	for (
2916	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	3158	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2917	insert remove inv name archname title slaying race	3159	insert remove inv nrof name archname title slaying race
2918	decrease_ob_nr)],	3160	decrease split destroy change_exp value msg lore send_msg)],
2919	["cf::object::player" => qw(player)],	3161	["cf::object::player" => qw(player)],
2920	["cf::player" => qw(peaceful)],	3162	["cf::player" => qw(peaceful send_msg)],
2921	["cf::map" => qw(trigger)],	3163	["cf::map" => qw(trigger)],
2922	) {	3164	) {
2923	no strict 'refs';	3165	no strict 'refs';
2924	my ($pkg, @funs) = @$_;	3166	my ($pkg, @funs) = @$_;
2925	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3167	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
…		…
2942	my ($code, %vars) = @_;	3184	my ($code, %vars) = @_;
2943		3185
2944	my $qcode = $code;	3186	my $qcode = $code;
2945	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3187	$qcode =~ s/"/‟/g; # not allowed in #line filenames
2946	$qcode =~ s/\n/\\n/g;	3188	$qcode =~ s/\n/\\n/g;
		3189
		3190	%vars = (_dummy => 0) unless %vars;
2947		3191
2948	local $_;	3192	local $_;
2949	local @safe::cf::_safe_eval_args = values %vars;	3193	local @safe::cf::_safe_eval_args = values %vars;
2950		3194
2951	my $eval =	3195	my $eval =
…		…
3028	{	3272	{
3029	my $faces = $facedata->{faceinfo};	3273	my $faces = $facedata->{faceinfo};
3030		3274
3031	while (my ($face, $info) = each %$faces) {	3275	while (my ($face, $info) = each %$faces) {
3032	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3276	my $idx = (cf::face::find $face) || cf::face::alloc $face;
		3277
3033	cf::face::set_visibility $idx, $info->{visibility};	3278	cf::face::set_visibility $idx, $info->{visibility};
3034	cf::face::set_magicmap $idx, $info->{magicmap};	3279	cf::face::set_magicmap $idx, $info->{magicmap};
3035	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};	3280	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3036	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};	3281	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3037		3282
3038	cf::cede_to_tick;	3283	cf::cede_to_tick;
3039	}	3284	}
3040		3285
3041	while (my ($face, $info) = each %$faces) {	3286	while (my ($face, $info) = each %$faces) {
3042	next unless $info->{smooth};	3287	next unless $info->{smooth};
		3288
3043	my $idx = cf::face::find $face	3289	my $idx = cf::face::find $face
3044	or next;	3290	or next;
		3291
3045	if (my $smooth = cf::face::find $info->{smooth}) {	3292	if (my $smooth = cf::face::find $info->{smooth}) {
3046	cf::face::set_smooth $idx, $smooth;	3293	cf::face::set_smooth $idx, $smooth;
3047	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3294	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3048	} else {	3295	} else {
3049	warn "smooth face '$info->{smooth}' not found for face '$face'";	3296	warn "smooth face '$info->{smooth}' not found for face '$face'";
…		…
3067	{	3314	{
3068	# TODO: for gcfclient pleasure, we should give resources	3315	# TODO: for gcfclient pleasure, we should give resources
3069	# that gcfclient doesn't grok a >10000 face index.	3316	# that gcfclient doesn't grok a >10000 face index.
3070	my $res = $facedata->{resource};	3317	my $res = $facedata->{resource};
3071		3318
3072	my $soundconf = delete $res->{"res/sound.conf"};
3073
3074	while (my ($name, $info) = each %$res) {	3319	while (my ($name, $info) = each %$res) {
		3320	if (defined $info->{type}) {
3075	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3321	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3076	my $data;	3322	my $data;
3077		3323
3078	if ($info->{type} & 1) {	3324	if ($info->{type} & 1) {
3079	# prepend meta info	3325	# prepend meta info
3080		3326
3081	my $meta = $enc->encode ({	3327	my $meta = $enc->encode ({
3082	name => $name,	3328	name => $name,
3083	%{ $info->{meta} || {} },	3329	%{ $info->{meta} || {} },
3084	});	3330	});
3085		3331
3086	$data = pack "(w/a*)*", $meta, $info->{data};	3332	$data = pack "(w/a*)*", $meta, $info->{data};
		3333	} else {
		3334	$data = $info->{data};
		3335	}
		3336
		3337	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3338	cf::face::set_type $idx, $info->{type};
3087	} else {	3339	} else {
3088	$data = $info->{data};	3340	$RESOURCE{$name} = $info;
3089	}	3341	}
3090		3342
3091	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3092	cf::face::set_type $idx, $info->{type};
3093
3094	cf::cede_to_tick;	3343	cf::cede_to_tick;
3095	}	3344	}
3096
3097	if ($soundconf) {
3098	$soundconf = $enc->decode (delete $soundconf->{data});
3099
3100	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3101	my $sound = $soundconf->{compat}[$_]
3102	or next;
3103
3104	my $face = cf::face::find "sound/$sound->[1]";
3105	cf::sound::set $sound->[0] => $face;
3106	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3107	}
3108
3109	while (my ($k, $v) = each %{$soundconf->{event}}) {
3110	my $face = cf::face::find "sound/$v";
3111	cf::sound::set $k => $face;
3112	}
3113	}
3114	}	3345	}
		3346
		3347	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3115		3348
3116	1	3349	1
3117	}	3350	}
		3351
		3352	cf::global->attach (on_resource_update => sub {
		3353	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
		3354	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
		3355
		3356	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3357	my $sound = $soundconf->{compat}[$_]
		3358	or next;
		3359
		3360	my $face = cf::face::find "sound/$sound->[1]";
		3361	cf::sound::set $sound->[0] => $face;
		3362	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3363	}
		3364
		3365	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3366	my $face = cf::face::find "sound/$v";
		3367	cf::sound::set $k => $face;
		3368	}
		3369	}
		3370	});
3118		3371
3119	register_exticmd fx_want => sub {	3372	register_exticmd fx_want => sub {
3120	my ($ns, $want) = @_;	3373	my ($ns, $want) = @_;
3121		3374
3122	while (my ($k, $v) = each %$want) {	3375	while (my ($k, $v) = each %$want) {
3123	$ns->fx_want ($k, $v);	3376	$ns->fx_want ($k, $v);
3124	}	3377	}
3125	};	3378	};
		3379
		3380	sub load_resource_file($) {
		3381	my $guard = lock_acquire "load_resource_file";
		3382
		3383	my $status = load_resource_file_ $_[0];
		3384	get_slot 0.1, 100;
		3385	cf::arch::commit_load;
		3386
		3387	$status
		3388	}
3126		3389
3127	sub reload_regions {	3390	sub reload_regions {
3128	# HACK to clear player env face cache, we need some signal framework	3391	# HACK to clear player env face cache, we need some signal framework
3129	# for this (global event?)	3392	# for this (global event?)
3130	%ext::player_env::MUSIC_FACE_CACHE = ();	3393	%ext::player_env::MUSIC_FACE_CACHE = ();
…		…
3144	}	3407	}
3145		3408
3146	sub reload_archetypes {	3409	sub reload_archetypes {
3147	load_resource_file "$DATADIR/archetypes"	3410	load_resource_file "$DATADIR/archetypes"
3148	or die "unable to load archetypes\n";	3411	or die "unable to load archetypes\n";
3149	#d# NEED to laod twice to resolve forward references
3150	# this really needs to be done in an extra post-pass
3151	# (which needs to be synchronous, so solve it differently)
3152	load_resource_file "$DATADIR/archetypes"
3153	or die "unable to load archetypes\n";
3154	}	3412	}
3155		3413
3156	sub reload_treasures {	3414	sub reload_treasures {
3157	load_resource_file "$DATADIR/treasures"	3415	load_resource_file "$DATADIR/treasures"
3158	or die "unable to load treasurelists\n";	3416	or die "unable to load treasurelists\n";
3159	}	3417	}
3160		3418
3161	sub reload_resources {	3419	sub reload_resources {
3162	warn "reloading resource files...\n";	3420	warn "reloading resource files...\n";
3163		3421
		3422	reload_facedata;
		3423	reload_archetypes;
3164	reload_regions;	3424	reload_regions;
3165	reload_facedata;
3166	#reload_archetypes;#d#
3167	reload_archetypes;
3168	reload_treasures;	3425	reload_treasures;
3169		3426
3170	warn "finished reloading resource files\n";	3427	warn "finished reloading resource files\n";
3171	}	3428	}
3172		3429
3173	sub init {
3174	reload_resources;
3175	}
3176
3177	sub reload_config {	3430	sub reload_config {
		3431	warn "reloading config file...\n";
		3432
3178	open my $fh, "<:utf8", "$CONFDIR/config"	3433	open my $fh, "<:utf8", "$CONFDIR/config"
3179	or return;	3434	or return;
3180		3435
3181	local $/;	3436	local $/;
3182	*CFG = YAML::Syck::Load <$fh>;	3437	*CFG = YAML::XS::Load scalar <$fh>;
3183		3438
3184	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3439	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3185		3440
3186	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3441	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3187	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3442	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
3191	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3446	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3192	and die "WARNING: m(un)lockall failed: $!\n";	3447	and die "WARNING: m(un)lockall failed: $!\n";
3193	};	3448	};
3194	warn $@ if $@;	3449	warn $@ if $@;
3195	}	3450	}
		3451
		3452	warn "finished reloading resource files\n";
		3453	}
		3454
		3455	sub pidfile() {
		3456	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
		3457	or die "$PIDFILE: $!";
		3458	flock $fh, &Fcntl::LOCK_EX
		3459	or die "$PIDFILE: flock: $!";
		3460	$fh
		3461	}
		3462
		3463	# make sure only one server instance is running at any one time
		3464	sub atomic {
		3465	my $fh = pidfile;
		3466
		3467	my $pid = <$fh>;
		3468	kill 9, $pid if $pid > 0;
		3469
		3470	seek $fh, 0, 0;
		3471	print $fh $$;
		3472	}
		3473
		3474	sub main_loop {
		3475	warn "EV::loop starting\n";
		3476	if (1) {
		3477	EV::loop;
		3478	}
		3479	warn "EV::loop returned\n";
		3480	goto &main_loop unless $REALLY_UNLOOP;
3196	}	3481	}
3197		3482
3198	sub main {	3483	sub main {
		3484	cf::init_globals; # initialise logging
		3485
		3486	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
		3487	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
		3488	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
		3489	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
		3490
		3491	cf::init_experience;
		3492	cf::init_anim;
		3493	cf::init_attackmess;
		3494	cf::init_dynamic;
		3495
		3496	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
		3497
3199	# we must not ever block the main coroutine	3498	# we must not ever block the main coroutine
3200	local $Coro::idle = sub {	3499	local $Coro::idle = sub {
3201	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3500	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3202	(async {	3501	(async {
3203	$Coro::current->{desc} = "IDLE BUG HANDLER";	3502	$Coro::current->{desc} = "IDLE BUG HANDLER";
3204	Event::one_event;	3503	EV::loop EV::LOOP_ONESHOT;
3205	})->prio (Coro::PRIO_MAX);	3504	})->prio (Coro::PRIO_MAX);
3206	};	3505	};
3207		3506
		3507	evthread_start IO::AIO::poll_fileno;
		3508
		3509	cf::sync_job {
		3510	reload_resources;
3208	reload_config;	3511	reload_config;
3209	db_init;	3512	db_init;
		3513
		3514	cf::load_settings;
		3515	cf::load_materials;
		3516	cf::init_uuid;
		3517	cf::init_signals;
		3518	cf::init_commands;
		3519	cf::init_skills;
		3520
		3521	cf::init_beforeplay;
		3522
		3523	atomic;
		3524
3210	load_extensions;	3525	load_extensions;
3211		3526
3212	$TICK_WATCHER->start;	3527	utime time, time, $RUNTIMEFILE;
3213	Event::loop;	3528
		3529	# no (long-running) fork's whatsoever before this point(!)
		3530	use POSIX ();
		3531	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
		3532
		3533	(pop @POST_INIT)->(0) while @POST_INIT;
		3534	};
		3535
		3536	main_loop;
3214	}	3537	}
3215		3538
3216	#############################################################################	3539	#############################################################################
3217	# initialisation and cleanup	3540	# initialisation and cleanup
3218		3541
3219	# install some emergency cleanup handlers	3542	# install some emergency cleanup handlers
3220	BEGIN {	3543	BEGIN {
		3544	our %SIGWATCHER = ();
3221	for my $signal (qw(INT HUP TERM)) {	3545	for my $signal (qw(INT HUP TERM)) {
3222	Event->signal (	3546	$SIGWATCHER{$signal} = EV::signal $signal, sub {
3223	reentrant => 0,
3224	data => WF_AUTOCANCEL,
3225	signal => $signal,
3226	prio => 0,
3227	cb => sub {
3228	cf::cleanup "SIG$signal";	3547	cf::cleanup "SIG$signal";
3229	},
3230	);	3548	};
3231	}	3549	}
3232	}	3550	}
3233		3551
3234	sub write_runtime {	3552	sub write_runtime_sync {
3235	my $runtime = "$LOCALDIR/runtime";
3236
3237	# first touch the runtime file to show we are still running:	3553	# first touch the runtime file to show we are still running:
3238	# the fsync below can take a very very long time.	3554	# the fsync below can take a very very long time.
3239		3555
3240	IO::AIO::aio_utime $runtime, undef, undef;	3556	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3241		3557
3242	my $guard = cf::lock_acquire "write_runtime";	3558	my $guard = cf::lock_acquire "write_runtime";
3243		3559
3244	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644	3560	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3245	or return;	3561	or return;
3246		3562
3247	my $value = $cf::RUNTIME + 90 + 10;	3563	my $value = $cf::RUNTIME + 90 + 10;
3248	# 10 is the runtime save interval, for a monotonic clock	3564	# 10 is the runtime save interval, for a monotonic clock
3249	# 60 allows for the watchdog to kill the server.	3565	# 60 allows for the watchdog to kill the server.
…		…
3259	aio_utime $fh, undef, undef;	3575	aio_utime $fh, undef, undef;
3260		3576
3261	close $fh	3577	close $fh
3262	or return;	3578	or return;
3263		3579
3264	aio_rename "$runtime~", $runtime	3580	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3265	and return;	3581	and return;
3266		3582
3267	warn "runtime file written.\n";	3583	warn "runtime file written.\n";
3268		3584
3269	1	3585	1
		3586	}
		3587
		3588	our $uuid_lock;
		3589	our $uuid_skip;
		3590
		3591	sub write_uuid_sync($) {
		3592	$uuid_skip ||= $_[0];
		3593
		3594	return if $uuid_lock;
		3595	local $uuid_lock = 1;
		3596
		3597	my $uuid = "$LOCALDIR/uuid";
		3598
		3599	my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
		3600	or return;
		3601
		3602	my $value = uuid_seq uuid_cur;
		3603
		3604	unless ($value) {
		3605	warn "cowardly refusing to write zero uuid value!\n";
		3606	return;
		3607	}
		3608
		3609	my $value = uuid_str $value + $uuid_skip;
		3610	$uuid_skip = 0;
		3611
		3612	(aio_write $fh, 0, (length $value), $value, 0) <= 0
		3613	and return;
		3614
		3615	# always fsync - this file is important
		3616	aio_fsync $fh
		3617	and return;
		3618
		3619	close $fh
		3620	or return;
		3621
		3622	aio_rename "$uuid~", $uuid
		3623	and return;
		3624
		3625	warn "uuid file written ($value).\n";
		3626
		3627	1
		3628
		3629	}
		3630
		3631	sub write_uuid($$) {
		3632	my ($skip, $sync) = @_;
		3633
		3634	$sync ? write_uuid_sync $skip
		3635	: async { write_uuid_sync $skip };
3270	}	3636	}
3271		3637
3272	sub emergency_save() {	3638	sub emergency_save() {
3273	my $freeze_guard = cf::freeze_mainloop;	3639	my $freeze_guard = cf::freeze_mainloop;
3274		3640
3275	warn "enter emergency perl save\n";	3641	warn "emergency_perl_save: enter\n";
3276		3642
3277	cf::sync_job {	3643	cf::sync_job {
		3644	# this is a trade-off: we want to be very quick here, so
		3645	# save all maps without fsync, and later call a global sync
		3646	# (which in turn might be very very slow)
		3647	local $USE_FSYNC = 0;
		3648
3278	# use a peculiar iteration method to avoid tripping on perl	3649	# use a peculiar iteration method to avoid tripping on perl
3279	# refcount bugs in for. also avoids problems with players	3650	# refcount bugs in for. also avoids problems with players
3280	# and maps saved/destroyed asynchronously.	3651	# and maps saved/destroyed asynchronously.
3281	warn "begin emergency player save\n";	3652	warn "emergency_perl_save: begin player save\n";
3282	for my $login (keys %cf::PLAYER) {	3653	for my $login (keys %cf::PLAYER) {
3283	my $pl = $cf::PLAYER{$login} or next;	3654	my $pl = $cf::PLAYER{$login} or next;
3284	$pl->valid or next;	3655	$pl->valid or next;
3285	delete $pl->{unclean_save};	3656	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3286	$pl->save;	3657	$pl->save;
3287	}	3658	}
3288	warn "end emergency player save\n";	3659	warn "emergency_perl_save: end player save\n";
3289		3660
3290	warn "begin emergency map save\n";	3661	warn "emergency_perl_save: begin map save\n";
3291	for my $path (keys %cf::MAP) {	3662	for my $path (keys %cf::MAP) {
3292	my $map = $cf::MAP{$path} or next;	3663	my $map = $cf::MAP{$path} or next;
3293	$map->valid or next;	3664	$map->valid or next;
3294	$map->save;	3665	$map->save;
3295	}	3666	}
3296	warn "end emergency map save\n";	3667	warn "emergency_perl_save: end map save\n";
3297		3668
3298	warn "begin emergency database checkpoint\n";	3669	warn "emergency_perl_save: begin database checkpoint\n";
3299	BDB::db_env_txn_checkpoint $DB_ENV;	3670	BDB::db_env_txn_checkpoint $DB_ENV;
3300	warn "end emergency database checkpoint\n";	3671	warn "emergency_perl_save: end database checkpoint\n";
		3672
		3673	warn "emergency_perl_save: begin write uuid\n";
		3674	write_uuid_sync 1;
		3675	warn "emergency_perl_save: end write uuid\n";
3301	};	3676	};
3302		3677
		3678	warn "emergency_perl_save: starting sync()\n";
		3679	IO::AIO::aio_sync sub {
		3680	warn "emergency_perl_save: finished sync()\n";
		3681	};
		3682
3303	warn "leave emergency perl save\n";	3683	warn "emergency_perl_save: leave\n";
3304	}	3684	}
3305		3685
3306	sub post_cleanup {	3686	sub post_cleanup {
3307	my ($make_core) = @_;	3687	my ($make_core) = @_;
3308		3688
3309	warn Carp::longmess "post_cleanup backtrace"	3689	warn Carp::longmess "post_cleanup backtrace"
3310	if $make_core;	3690	if $make_core;
		3691
		3692	my $fh = pidfile;
		3693	unlink $PIDFILE if <$fh> == $$;
		3694	}
		3695
		3696	# a safer delete_package, copied from Symbol
		3697	sub clear_package($) {
		3698	my $pkg = shift;
		3699
		3700	# expand to full symbol table name if needed
		3701	unless ($pkg =~ /^main::.*::$/) {
		3702	$pkg = "main$pkg" if $pkg =~ /^::/;
		3703	$pkg = "main::$pkg" unless $pkg =~ /^main::/;
		3704	$pkg .= '::' unless $pkg =~ /::$/;
		3705	}
		3706
		3707	my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
		3708	my $stem_symtab = *{$stem}{HASH};
		3709
		3710	defined $stem_symtab and exists $stem_symtab->{$leaf}
		3711	or return;
		3712
		3713	# clear all symbols
		3714	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
		3715	for my $name (keys %$leaf_symtab) {
		3716	_gv_clear *{"$pkg$name"};
		3717	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
		3718	}
		3719	warn "cleared package $pkg\n";#d#
3311	}	3720	}
3312		3721
3313	sub do_reload_perl() {	3722	sub do_reload_perl() {
3314	# can/must only be called in main	3723	# can/must only be called in main
3315	if ($Coro::current != $Coro::main) {	3724	if ($Coro::current != $Coro::main) {
3316	warn "can only reload from main coroutine";	3725	warn "can only reload from main coroutine";
3317	return;	3726	return;
3318	}	3727	}
3319		3728
		3729	return if $RELOAD++;
		3730
		3731	my $t1 = EV::time;
		3732
		3733	while ($RELOAD) {
3320	warn "reloading...";	3734	warn "reloading...";
3321		3735
3322	warn "entering sync_job";	3736	warn "entering sync_job";
3323		3737
3324	cf::sync_job {	3738	cf::sync_job {
3325	cf::write_runtime; # external watchdog should not bark	3739	cf::write_runtime_sync; # external watchdog should not bark
3326	cf::emergency_save;	3740	cf::emergency_save;
3327	cf::write_runtime; # external watchdog should not bark	3741	cf::write_runtime_sync; # external watchdog should not bark
3328		3742
3329	warn "syncing database to disk";	3743	warn "syncing database to disk";
3330	BDB::db_env_txn_checkpoint $DB_ENV;	3744	BDB::db_env_txn_checkpoint $DB_ENV;
3331		3745
3332	# if anything goes wrong in here, we should simply crash as we already saved	3746	# if anything goes wrong in here, we should simply crash as we already saved
3333		3747
3334	warn "cancelling all WF_AUTOCANCEL watchers";
3335	for (Event::all_watchers) {
3336	$_->cancel if $_->data & WF_AUTOCANCEL;
3337	}
3338
3339	warn "flushing outstanding aio requests";	3748	warn "flushing outstanding aio requests";
3340	for (;;) {
3341	BDB::flush;
3342	IO::AIO::flush;
3343	Coro::cede;
3344	last unless IO::AIO::nreqs || BDB::nreqs;	3749	while (IO::AIO::nreqs || BDB::nreqs) {
3345	warn "iterate...";	3750	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3346	}
3347
3348	++$RELOAD;
3349
3350	warn "cancelling all extension coros";
3351	$_->cancel for values %EXT_CORO;
3352	%EXT_CORO = ();
3353
3354	warn "removing commands";
3355	%COMMAND = ();
3356
3357	warn "removing ext/exti commands";
3358	%EXTCMD = ();
3359	%EXTICMD = ();
3360
3361	warn "unloading/nuking all extensions";
3362	for my $pkg (@EXTS) {
3363	warn "... unloading $pkg";
3364
3365	if (my $cb = $pkg->can ("unload")) {
3366	eval {
3367	$cb->($pkg);
3368	1
3369	} or warn "$pkg unloaded, but with errors: $@";
3370	}	3751	}
3371		3752
3372	warn "... nuking $pkg";	3753	warn "cancelling all extension coros";
3373	Symbol::delete_package $pkg;	3754	$_->cancel for values %EXT_CORO;
3374	}	3755	%EXT_CORO = ();
3375		3756
3376	warn "unloading all perl modules loaded from $LIBDIR";	3757	warn "removing commands";
3377	while (my ($k, $v) = each %INC) {	3758	%COMMAND = ();
3378	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3379		3759
		3760	warn "removing ext/exti commands";
		3761	%EXTCMD = ();
		3762	%EXTICMD = ();
		3763
		3764	warn "unloading/nuking all extensions";
		3765	for my $pkg (@EXTS) {
3380	warn "... unloading $k";	3766	warn "... unloading $pkg";
3381	delete $INC{$k};
3382		3767
3383	$k =~ s/\.pm$//;
3384	$k =~ s/\//::/g;
3385
3386	if (my $cb = $k->can ("unload_module")) {	3768	if (my $cb = $pkg->can ("unload")) {
		3769	eval {
3387	$cb->();	3770	$cb->($pkg);
		3771	1
		3772	} or warn "$pkg unloaded, but with errors: $@";
		3773	}
		3774
		3775	warn "... clearing $pkg";
		3776	clear_package $pkg;
3388	}	3777	}
3389		3778
3390	Symbol::delete_package $k;	3779	warn "unloading all perl modules loaded from $LIBDIR";
		3780	while (my ($k, $v) = each %INC) {
		3781	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
		3782
		3783	warn "... unloading $k";
		3784	delete $INC{$k};
		3785
		3786	$k =~ s/\.pm$//;
		3787	$k =~ s/\//::/g;
		3788
		3789	if (my $cb = $k->can ("unload_module")) {
		3790	$cb->();
		3791	}
		3792
		3793	clear_package $k;
3391	}	3794	}
3392		3795
3393	warn "getting rid of safe::, as good as possible";	3796	warn "getting rid of safe::, as good as possible";
3394	Symbol::delete_package "safe::$_"	3797	clear_package "safe::$_"
3395	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	3798	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3396		3799
3397	warn "unloading cf.pm \"a bit\"";	3800	warn "unloading cf.pm \"a bit\"";
3398	delete $INC{"cf.pm"};	3801	delete $INC{"cf.pm"};
3399	delete $INC{"cf/pod.pm"};	3802	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3400		3803
3401	# don't, removes xs symbols, too,	3804	# don't, removes xs symbols, too,
3402	# and global variables created in xs	3805	# and global variables created in xs
3403	#Symbol::delete_package __PACKAGE__;	3806	#clear_package __PACKAGE__;
3404		3807
3405	warn "unload completed, starting to reload now";	3808	warn "unload completed, starting to reload now";
3406		3809
3407	warn "reloading cf.pm";	3810	warn "reloading cf.pm";
3408	require cf;	3811	require cf;
3409	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3812	cf::_connect_to_perl_1;
3410		3813
3411	warn "loading config and database again";	3814	warn "loading config and database again";
3412	cf::reload_config;	3815	cf::reload_config;
3413		3816
3414	warn "loading extensions";	3817	warn "loading extensions";
3415	cf::load_extensions;	3818	cf::load_extensions;
3416		3819
		3820	if ($REATTACH_ON_RELOAD) {
3417	warn "reattaching attachments to objects/players";	3821	warn "reattaching attachments to objects/players";
3418	_global_reattach; # objects, sockets	3822	_global_reattach; # objects, sockets
3419	warn "reattaching attachments to maps";	3823	warn "reattaching attachments to maps";
3420	reattach $_ for values %MAP;	3824	reattach $_ for values %MAP;
3421	warn "reattaching attachments to players";	3825	warn "reattaching attachments to players";
3422	reattach $_ for values %PLAYER;	3826	reattach $_ for values %PLAYER;
		3827	}
3423		3828
		3829	warn "running post_init jobs";
		3830	(pop @POST_INIT)->(1) while @POST_INIT;
		3831
3424	warn "leaving sync_job";	3832	warn "leaving sync_job";
3425		3833
3426	1	3834	1
3427	} or do {	3835	} or do {
3428	warn $@;	3836	warn $@;
3429	warn "error while reloading, exiting.";	3837	cf::cleanup "error while reloading, exiting.";
3430	exit 1;
3431	};	3838	};
3432		3839
3433	warn "reloaded";	3840	warn "reloaded";
		3841	--$RELOAD;
		3842	}
		3843
		3844	$t1 = EV::time - $t1;
		3845	warn "reload completed in ${t1}s\n";
3434	};	3846	};
3435		3847
3436	our $RELOAD_WATCHER; # used only during reload	3848	our $RELOAD_WATCHER; # used only during reload
3437		3849
3438	sub reload_perl() {	3850	sub reload_perl() {
3439	# doing reload synchronously and two reloads happen back-to-back,	3851	# doing reload synchronously and two reloads happen back-to-back,
3440	# coro crashes during coro_state_free->destroy here.	3852	# coro crashes during coro_state_free->destroy here.
3441		3853
3442	$RELOAD_WATCHER ||= Event->timer (	3854	$RELOAD_WATCHER ||= cf::async {
3443	reentrant => 0,	3855	Coro::AIO::aio_wait cache_extensions;
3444	after => 0,	3856
3445	data => WF_AUTOCANCEL,	3857	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3446	cb => sub {
3447	do_reload_perl;	3858	do_reload_perl;
3448	undef $RELOAD_WATCHER;	3859	undef $RELOAD_WATCHER;
3449	},	3860	};
3450	);	3861	};
3451	}	3862	}
3452		3863
3453	register_command "reload" => sub {	3864	register_command "reload" => sub {
3454	my ($who, $arg) = @_;	3865	my ($who, $arg) = @_;
3455		3866
…		…
3468		3879
3469	our @WAIT_FOR_TICK;	3880	our @WAIT_FOR_TICK;
3470	our @WAIT_FOR_TICK_BEGIN;	3881	our @WAIT_FOR_TICK_BEGIN;
3471		3882
3472	sub wait_for_tick {	3883	sub wait_for_tick {
3473	return unless $TICK_WATCHER->is_active;
3474	return if $Coro::current == $Coro::main;	3884	return if tick_inhibit || $Coro::current == $Coro::main;
3475		3885
3476	my $signal = new Coro::Signal;	3886	my $signal = new Coro::Signal;
3477	push @WAIT_FOR_TICK, $signal;	3887	push @WAIT_FOR_TICK, $signal;
3478	$signal->wait;	3888	$signal->wait;
3479	}	3889	}
3480		3890
3481	sub wait_for_tick_begin {	3891	sub wait_for_tick_begin {
3482	return unless $TICK_WATCHER->is_active;
3483	return if $Coro::current == $Coro::main;	3892	return if tick_inhibit || $Coro::current == $Coro::main;
3484		3893
3485	my $signal = new Coro::Signal;	3894	my $signal = new Coro::Signal;
3486	push @WAIT_FOR_TICK_BEGIN, $signal;	3895	push @WAIT_FOR_TICK_BEGIN, $signal;
3487	$signal->wait;	3896	$signal->wait;
3488	}	3897	}
3489		3898
3490	$TICK_WATCHER = Event->timer (	3899	sub tick {
3491	reentrant => 0,
3492	parked => 1,
3493	prio => 0,
3494	at => $NEXT_TICK || $TICK,
3495	data => WF_AUTOCANCEL,
3496	cb => sub {
3497	if ($Coro::current != $Coro::main) {	3900	if ($Coro::current != $Coro::main) {
3498	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	3901	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3499	unless ++$bug_warning > 10;	3902	unless ++$bug_warning > 10;
3500	return;	3903	return;
3501	}	3904	}
3502		3905
3503	$NOW = $tick_start = Event::time;
3504
3505	cf::server_tick; # one server iteration	3906	cf::server_tick; # one server iteration
3506		3907
3507	$RUNTIME += $TICK;
3508	$NEXT_TICK += $TICK;
3509
3510	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3908	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3511	$NEXT_RUNTIME_WRITE = $NOW + 10;	3909	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3512	Coro::async_pool {	3910	Coro::async_pool {
3513	$Coro::current->{desc} = "runtime saver";	3911	$Coro::current->{desc} = "runtime saver";
3514	write_runtime	3912	write_runtime_sync
3515	or warn "ERROR: unable to write runtime file: $!";	3913	or warn "ERROR: unable to write runtime file: $!";
3516	};
3517	}	3914	};
		3915	}
3518		3916
3519	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3917	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3520	$sig->send;	3918	$sig->send;
3521	}	3919	}
3522	while (my $sig = shift @WAIT_FOR_TICK) {	3920	while (my $sig = shift @WAIT_FOR_TICK) {
3523	$sig->send;	3921	$sig->send;
3524	}	3922	}
3525		3923
3526	$NOW = Event::time;	3924	$LOAD = ($NOW - $TICK_START) / $TICK;
3527
3528	# if we are delayed by four ticks or more, skip them all
3529	$NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3530
3531	$TICK_WATCHER->at ($NEXT_TICK);
3532	$TICK_WATCHER->start;
3533
3534	$LOAD = ($NOW - $tick_start) / $TICK;
3535	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3925	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3536		3926
3537	_post_tick;	3927	if (0) {
		3928	if ($NEXT_TICK) {
		3929	my $jitter = $TICK_START - $NEXT_TICK;
		3930	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
		3931	warn "jitter $JITTER\n";#d#
		3932	}
3538	},	3933	}
3539	);	3934	}
3540		3935
3541	{	3936	{
		3937	# configure BDB
		3938
3542	BDB::min_parallel 8;	3939	BDB::min_parallel 8;
3543	BDB::max_poll_time $TICK * 0.1;	3940	BDB::max_poll_reqs $TICK * 0.1;
3544	$BDB_POLL_WATCHER = Event->io (	3941	$AnyEvent::BDB::WATCHER->priority (1);
3545	reentrant => 0,
3546	fd => BDB::poll_fileno,
3547	poll => 'r',
3548	prio => 0,
3549	data => WF_AUTOCANCEL,
3550	cb => \&BDB::poll_cb,
3551	);
3552
3553	BDB::set_sync_prepare {
3554	my $status;
3555	my $current = $Coro::current;
3556	(
3557	sub {
3558	$status = $!;
3559	$current->ready; undef $current;
3560	},
3561	sub {
3562	Coro::schedule while defined $current;
3563	$! = $status;
3564	},
3565	)
3566	};
3567		3942
3568	unless ($DB_ENV) {	3943	unless ($DB_ENV) {
3569	$DB_ENV = BDB::db_env_create;	3944	$DB_ENV = BDB::db_env_create;
3570	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC	3945	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3571	| BDB::LOG_AUTOREMOVE, 1);	3946	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
		3947	$DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3572	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);	3948	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3573	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);	3949	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3574		3950
3575	cf::sync_job {	3951	cf::sync_job {
3576	eval {	3952	eval {
…		…
3586		3962
3587	cf::cleanup "db_env_open(db): $@" if $@;	3963	cf::cleanup "db_env_open(db): $@" if $@;
3588	};	3964	};
3589	}	3965	}
3590		3966
3591	$BDB_DEADLOCK_WATCHER = Event->timer (	3967	$BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3592	after => 3,
3593	interval => 1,
3594	hard => 1,
3595	prio => 0,
3596	data => WF_AUTOCANCEL,
3597	cb => sub {
3598	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };	3968	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3599	},
3600	);	3969	};
3601	$BDB_CHECKPOINT_WATCHER = Event->timer (	3970	$BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3602	after => 11,
3603	interval => 60,
3604	hard => 1,
3605	prio => 0,
3606	data => WF_AUTOCANCEL,
3607	cb => sub {
3608	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	3971	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3609	},
3610	);	3972	};
3611	$BDB_TRICKLE_WATCHER = Event->timer (	3973	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3612	after => 5,
3613	interval => 10,
3614	hard => 1,
3615	prio => 0,
3616	data => WF_AUTOCANCEL,
3617	cb => sub {
3618	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	3974	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3619	},
3620	);	3975	};
3621	}	3976	}
3622		3977
3623	{	3978	{
		3979	# configure IO::AIO
		3980
3624	IO::AIO::min_parallel 8;	3981	IO::AIO::min_parallel 8;
3625
3626	undef $Coro::AIO::WATCHER;
3627	IO::AIO::max_poll_time $TICK * 0.1;	3982	IO::AIO::max_poll_time $TICK * 0.1;
3628	$AIO_POLL_WATCHER = Event->io (	3983	undef $AnyEvent::AIO::WATCHER;
3629	reentrant => 0,
3630	data => WF_AUTOCANCEL,
3631	fd => IO::AIO::poll_fileno,
3632	poll => 'r',
3633	prio => 0,
3634	cb => \&IO::AIO::poll_cb,
3635	);
3636	}	3984	}
3637		3985
3638	my $_log_backtrace;	3986	my $_log_backtrace;
3639		3987
3640	sub _log_backtrace {	3988	sub _log_backtrace {
…		…
3643	$msg =~ s/\n//;	3991	$msg =~ s/\n//;
3644		3992
3645	# limit the # of concurrent backtraces	3993	# limit the # of concurrent backtraces
3646	if ($_log_backtrace < 2) {	3994	if ($_log_backtrace < 2) {
3647	++$_log_backtrace;	3995	++$_log_backtrace;
		3996	my $perl_bt = Carp::longmess $msg;
3648	async {	3997	async {
3649	$Coro::current->{desc} = "abt $msg";	3998	$Coro::current->{desc} = "abt $msg";
3650		3999
3651	my @bt = fork_call {	4000	my @bt = fork_call {
3652	@addr = map { sprintf "%x", $_ } @addr;	4001	@addr = map { sprintf "%x", $_ } @addr;
…		…
3663	}	4012	}
3664		4013
3665	@funcs	4014	@funcs
3666	};	4015	};
3667		4016
3668	LOG llevInfo, "[ABT] $msg\n";	4017	LOG llevInfo, "[ABT] $perl_bt\n";
		4018	LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3669	LOG llevInfo, "[ABT] $_\n" for @bt;	4019	LOG llevInfo, "[ABT] $_\n" for @bt;
3670	--$_log_backtrace;	4020	--$_log_backtrace;
3671	};	4021	};
3672	} else {	4022	} else {
3673	LOG llevInfo, "[ABT] $msg\n";	4023	LOG llevInfo, "[ABT] $msg\n";
3674	LOG llevInfo, "[ABT] [suppressed]\n";	4024	LOG llevInfo, "[ABT] [suppressed]\n";
3675	}	4025	}
3676	}	4026	}
3677		4027
3678	# load additional modules	4028	# load additional modules
3679	use cf::pod;	4029	require "cf/$_.pm" for @EXTRA_MODULES;
		4030	cf::_connect_to_perl_2;
3680		4031
3681	END { cf::emergency_save }	4032	END { cf::emergency_save }
3682		4033
3683	1	4034	1
3684		4035

Diff Legend

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