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.406 by root, Mon Dec 17 08:27:44 2007 UTC vs.
Revision 1.468 by root, Thu Jan 8 19:23:44 2009 UTC

		1	#
		2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.
		3	#
		4	# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
		5	#
		6	# Deliantra is free software: you can redistribute it and/or modify
		7	# it under the terms of the GNU General Public License as published by
		8	# the Free Software Foundation, either version 3 of the License, or
		9	# (at your option) any later version.
		10	#
		11	# This program is distributed in the hope that it will be useful,
		12	# but WITHOUT ANY WARRANTY; without even the implied warranty of
		13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		14	# GNU General Public License for more details.
		15	#
		16	# You should have received a copy of the GNU General Public License
		17	# along with this program. If not, see <http://www.gnu.org/licenses/>.
		18	#
		19	# The authors can be reached via e-mail to <support@deliantra.net>
		20	#
		21
1	package cf;	22	package cf;
2		23
		24	use 5.10.0;
3	use utf8;	25	use utf8;
4	use strict;	26	use strict qw(vars subs);
5		27
6	use Symbol;	28	use Symbol;
7	use List::Util;	29	use List::Util;
8	use Socket;	30	use Socket;
9	use EV 1.86;	31	use EV;
10	use Opcode;	32	use Opcode;
11	use Safe;	33	use Safe;
12	use Safe::Hole;	34	use Safe::Hole;
13	use Storable ();	35	use Storable ();
14		36
		37	use Guard ();
15	use Coro 4.32 ();	38	use Coro ();
16	use Coro::State;	39	use Coro::State;
17	use Coro::Handle;	40	use Coro::Handle;
18	use Coro::EV;	41	use Coro::EV;
		42	use Coro::AnyEvent;
19	use Coro::Timer;	43	use Coro::Timer;
20	use Coro::Signal;	44	use Coro::Signal;
21	use Coro::Semaphore;	45	use Coro::Semaphore;
		46	use Coro::SemaphoreSet;
		47	use Coro::AnyEvent;
22	use Coro::AIO;	48	use Coro::AIO;
23	use Coro::BDB;	49	use Coro::BDB 1.6;
24	use Coro::Storable;	50	use Coro::Storable;
25	use Coro::Util ();	51	use Coro::Util ();
26		52
27	use JSON::XS 2.01 ();	53	use JSON::XS 2.01 ();
28	use BDB ();	54	use BDB ();
29	use Data::Dumper;	55	use Data::Dumper;
30	use Digest::MD5;	56	use Digest::MD5;
31	use Fcntl;	57	use Fcntl;
32	use YAML::Syck ();	58	use YAML ();
33	use IO::AIO 2.51 ();	59	use IO::AIO ();
34	use Time::HiRes;	60	use Time::HiRes;
35	use Compress::LZF;	61	use Compress::LZF;
36	use Digest::MD5 ();	62	use Digest::MD5 ();
		63
		64	AnyEvent::detect;
37		65
38	# configure various modules to our taste	66	# configure various modules to our taste
39	#	67	#
40	$Storable::canonical = 1; # reduce rsync transfers	68	$Storable::canonical = 1; # reduce rsync transfers
41	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator	69	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
		70
		71	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
		72
		73	# make sure c-lzf reinitialises itself
		74	Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
42	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later	75	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
43
44	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45	$YAML::Syck::ImplicitUnicode = 1;
46
47	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48		76
49	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	77	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50		78
51	our %COMMAND = ();	79	our %COMMAND = ();
52	our %COMMAND_TIME = ();	80	our %COMMAND_TIME = ();
…		…
55	our %EXTCMD = ();	83	our %EXTCMD = ();
56	our %EXTICMD = ();	84	our %EXTICMD = ();
57	our %EXT_CORO = (); # coroutines bound to extensions	85	our %EXT_CORO = (); # coroutines bound to extensions
58	our %EXT_MAP = (); # pluggable maps	86	our %EXT_MAP = (); # pluggable maps
59		87
60	our $RELOAD; # number of reloads so far	88	our $RELOAD; # number of reloads so far, non-zero while in reload
61	our @EVENT;	89	our @EVENT;
62		90
63	our $CONFDIR = confdir;	91	our $CONFDIR = confdir;
64	our $DATADIR = datadir;	92	our $DATADIR = datadir;
65	our $LIBDIR = "$DATADIR/ext";	93	our $LIBDIR = "$DATADIR/ext";
66	our $PODDIR = "$DATADIR/pod";	94	our $PODDIR = "$DATADIR/pod";
67	our $MAPDIR = "$DATADIR/" . mapdir;	95	our $MAPDIR = "$DATADIR/" . mapdir;
68	our $LOCALDIR = localdir;	96	our $LOCALDIR = localdir;
69	our $TMPDIR = "$LOCALDIR/" . tmpdir;	97	our $TMPDIR = "$LOCALDIR/" . tmpdir;
70	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	98	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	99	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72	our $RANDOMDIR = "$LOCALDIR/random";	100	our $RANDOMDIR = "$LOCALDIR/random";
73	our $BDBDIR = "$LOCALDIR/db";	101	our $BDBDIR = "$LOCALDIR/db";
		102	our $PIDFILE = "$LOCALDIR/pid";
		103	our $RUNTIMEFILE = "$LOCALDIR/runtime";
		104
74	our %RESOURCE;	105	our %RESOURCE;
75		106
76	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	107	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77	our $TICK_WATCHER;
78	our $AIO_POLL_WATCHER;
79	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	108	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80	our $NEXT_TICK;	109	our $NEXT_TICK;
81	our $USE_FSYNC = 1; # use fsync to write maps - default off	110	our $USE_FSYNC = 1; # use fsync to write maps - default off
82		111
83	our $BDB_POLL_WATCHER;
84	our $BDB_DEADLOCK_WATCHER;	112	our $BDB_DEADLOCK_WATCHER;
85	our $BDB_CHECKPOINT_WATCHER;	113	our $BDB_CHECKPOINT_WATCHER;
86	our $BDB_TRICKLE_WATCHER;	114	our $BDB_TRICKLE_WATCHER;
87	our $DB_ENV;	115	our $DB_ENV;
88		116
		117	our @EXTRA_MODULES = qw(pod mapscript);
		118
89	our %CFG;	119	our %CFG;
90		120
91	our $UPTIME; $UPTIME ||= time;	121	our $UPTIME; $UPTIME ||= time;
92	our $RUNTIME;	122	our $RUNTIME;
93	our $NOW;	123	our $NOW;
…		…
99	# used to convert map paths into valid unix filenames by replacing / by ∕	129	# used to convert map paths into valid unix filenames by replacing / by ∕
100	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	130	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101		131
102	our $LOAD; # a number between 0 (idle) and 1 (too many objects)	132	our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103	our $LOADAVG; # same thing, but with alpha-smoothing	133	our $LOADAVG; # same thing, but with alpha-smoothing
		134	our $JITTER; # average jitter
104	our $tick_start; # for load detecting purposes	135	our $TICK_START; # for load detecting purposes
		136
		137	our @POST_INIT;
		138
		139	our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
105		140
106	binmode STDOUT;	141	binmode STDOUT;
107	binmode STDERR;	142	binmode STDERR;
108		143
109	# read virtual server time, if available	144	# read virtual server time, if available
110	unless ($RUNTIME || !-e "$LOCALDIR/runtime") {	145	unless ($RUNTIME || !-e $RUNTIMEFILE) {
111	open my $fh, "<", "$LOCALDIR/runtime"	146	open my $fh, "<", $RUNTIMEFILE
112	or die "unable to read runtime file: $!";	147	or die "unable to read $RUNTIMEFILE file: $!";
113	$RUNTIME = <$fh> + 0.;	148	$RUNTIME = <$fh> + 0.;
114	}	149	}
		150
		151	eval "sub TICK() { $TICK } 1" or die;
115		152
116	mkdir $_	153	mkdir $_
117	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;	154	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
118		155
119	our $EMERGENCY_POSITION;	156	our $EMERGENCY_POSITION;
…		…
193	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	230	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194		231
195	LOG llevError, $msg;	232	LOG llevError, $msg;
196	};	233	};
197	}	234	}
		235
		236	$Coro::State::DIEHOOK = sub {
		237	return unless $^S eq 0; # "eq", not "=="
		238
		239	if ($Coro::current == $Coro::main) {#d#
		240	warn "DIEHOOK called in main context, Coro bug?\n";#d#
		241	return;#d#
		242	}#d#
		243
		244	# kill coroutine otherwise
		245	warn Carp::longmess $_[0];
		246	Coro::terminate
		247	};
		248
		249	$SIG{__DIE__} = sub { }; #d#?
198		250
199	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	251	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	252	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	253	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	254	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
…		…
209	for my $pkg (qw(	261	for my $pkg (qw(
210	cf::global cf::attachable	262	cf::global cf::attachable
211	cf::object cf::object::player	263	cf::object cf::object::player
212	cf::client cf::player	264	cf::client cf::player
213	cf::arch cf::living	265	cf::arch cf::living
		266	cf::map cf::mapspace
214	cf::map cf::party cf::region	267	cf::party cf::region
215	)) {	268	)) {
216	no strict 'refs';
217	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	269	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218	}	270	}
219		271
220	$EV::DIED = sub {	272	$EV::DIED = sub {
221	warn "error in event callback: @_";	273	warn "error in event callback: @_";
…		…
263	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	315	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264		316
265	sub encode_json($) { $json_coder->encode ($_[0]) }	317	sub encode_json($) { $json_coder->encode ($_[0]) }
266	sub decode_json($) { $json_coder->decode ($_[0]) }	318	sub decode_json($) { $json_coder->decode ($_[0]) }
267		319
		320	=item cf::post_init { BLOCK }
		321
		322	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
		323	but I<before> the server starts ticking again.
		324
		325	The cdoeblock will have a single boolean argument to indicate whether this
		326	is a reload or not.
		327
		328	=cut
		329
		330	sub post_init(&) {
		331	push @POST_INIT, shift;
		332	}
		333
268	=item cf::lock_wait $string	334	=item cf::lock_wait $string
269		335
270	Wait until the given lock is available. See cf::lock_acquire.	336	Wait until the given lock is available. See cf::lock_acquire.
271		337
272	=item my $lock = cf::lock_acquire $string	338	=item my $lock = cf::lock_acquire $string
273		339
274	Wait until the given lock is available and then acquires it and returns	340	Wait until the given lock is available and then acquires it and returns
275	a Coro::guard object. If the guard object gets destroyed (goes out of scope,	341	a L<Guard> object. If the guard object gets destroyed (goes out of scope,
276	for example when the coroutine gets canceled), the lock is automatically	342	for example when the coroutine gets canceled), the lock is automatically
277	returned.	343	returned.
278		344
279	Locks are *not* recursive, locking from the same coro twice results in a	345	Locks are *not* recursive, locking from the same coro twice results in a
280	deadlocked coro.	346	deadlocked coro.
…		…
286		352
287	Return true if the lock is currently active, i.e. somebody has locked it.	353	Return true if the lock is currently active, i.e. somebody has locked it.
288		354
289	=cut	355	=cut
290		356
291	our %LOCK;	357	our $LOCKS = new Coro::SemaphoreSet;
292	our %LOCKER;#d#
293		358
294	sub lock_wait($) {	359	sub lock_wait($) {
295	my ($key) = @_;	360	$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	}	361	}
308		362
309	sub lock_acquire($) {	363	sub lock_acquire($) {
310	my ($key) = @_;	364	$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	}	365	}
324		366
325	sub lock_active($) {	367	sub lock_active($) {
326	my ($key) = @_;	368	$LOCKS->count ($_[0]) < 1
327
328	! ! $LOCK{$key}
329	}	369	}
330		370
331	sub freeze_mainloop {	371	sub freeze_mainloop {
332	return unless $TICK_WATCHER->is_active;	372	tick_inhibit_inc;
333		373
334	my $guard = Coro::guard {	374	&Guard::guard (\&tick_inhibit_dec);
335	$TICK_WATCHER->start;
336	};
337	$TICK_WATCHER->stop;
338	$guard
339	}	375	}
340		376
341	=item cf::periodic $interval, $cb	377	=item cf::periodic $interval, $cb
342		378
343	Like EV::periodic, but randomly selects a starting point so that the actions	379	Like EV::periodic, but randomly selects a starting point so that the actions
…		…
398	}	434	}
399	}	435	}
400	};	436	};
401		437
402	sub get_slot($;$$) {	438	sub get_slot($;$$) {
		439	return if tick_inhibit || $Coro::current == $Coro::main;
		440
403	my ($time, $pri, $name) = @_;	441	my ($time, $pri, $name) = @_;
404		442
405	$time = $TICK * .6 if $time > $TICK * .6;	443	$time = $TICK * .6 if $time > $TICK * .6;
406	my $sig = new Coro::Signal;	444	my $sig = new Coro::Signal;
407		445
…		…
444	# this is the main coro, too bad, we have to block	482	# this is the main coro, too bad, we have to block
445	# till the operation succeeds, freezing the server :/	483	# till the operation succeeds, freezing the server :/
446		484
447	LOG llevError, Carp::longmess "sync job";#d#	485	LOG llevError, Carp::longmess "sync job";#d#
448		486
449	# TODO: use suspend/resume instead
450	# (but this is cancel-safe)
451	my $freeze_guard = freeze_mainloop;	487	my $freeze_guard = freeze_mainloop;
452		488
453	my $busy = 1;	489	my $busy = 1;
454	my @res;	490	my @res;
455		491
…		…
466	} else {	502	} else {
467	EV::loop EV::LOOP_ONESHOT;	503	EV::loop EV::LOOP_ONESHOT;
468	}	504	}
469	}	505	}
470		506
471	$time = EV::time - $time;	507	my $time = EV::time - $time;
472		508
473	LOG llevError | logBacktrace, Carp::longmess "long sync job"
474	if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
475
476	$tick_start += $time; # do not account sync jobs to server load	509	$TICK_START += $time; # do not account sync jobs to server load
477		510
478	wantarray ? @res : $res[0]	511	wantarray ? @res : $res[0]
479	} else {	512	} else {
480	# we are in another coroutine, how wonderful, everything just works	513	# we are in another coroutine, how wonderful, everything just works
481		514
…		…
523	reset_signals;	556	reset_signals;
524	&$cb	557	&$cb
525	}, @args;	558	}, @args;
526		559
527	wantarray ? @res : $res[-1]	560	wantarray ? @res : $res[-1]
		561	}
		562
		563	=item $coin = coin_from_name $name
		564
		565	=cut
		566
		567	our %coin_alias = (
		568	"silver" => "silvercoin",
		569	"silvercoin" => "silvercoin",
		570	"silvercoins" => "silvercoin",
		571	"gold" => "goldcoin",
		572	"goldcoin" => "goldcoin",
		573	"goldcoins" => "goldcoin",
		574	"platinum" => "platinacoin",
		575	"platinumcoin" => "platinacoin",
		576	"platinumcoins" => "platinacoin",
		577	"platina" => "platinacoin",
		578	"platinacoin" => "platinacoin",
		579	"platinacoins" => "platinacoin",
		580	"royalty" => "royalty",
		581	"royalties" => "royalty",
		582	);
		583
		584	sub coin_from_name($) {
		585	$coin_alias{$_[0]}
		586	? cf::arch::find $coin_alias{$_[0]}
		587	: undef
528	}	588	}
529		589
530	=item $value = cf::db_get $family => $key	590	=item $value = cf::db_get $family => $key
531		591
532	Returns a single value from the environment database.	592	Returns a single value from the environment database.
…		…
671		731
672	#############################################################################	732	#############################################################################
673		733
674	=head2 ATTACHABLE OBJECTS	734	=head2 ATTACHABLE OBJECTS
675		735
676	Many objects in crossfire are so-called attachable objects. That means you can	736	Many objects in deliantra are so-called attachable objects. That means you can
677	attach callbacks/event handlers (a collection of which is called an "attachment")	737	attach callbacks/event handlers (a collection of which is called an "attachment")
678	to it. All such attachable objects support the following methods.	738	to it. All such attachable objects support the following methods.
679		739
680	In the following description, CLASS can be any of C<global>, C<object>	740	In the following description, CLASS can be any of C<global>, C<object>
681	C<player>, C<client> or C<map> (i.e. the attachable objects in	741	C<player>, C<client> or C<map> (i.e. the attachable objects in
…		…
731	=item cf::CLASS::attachment $name, ...	791	=item cf::CLASS::attachment $name, ...
732		792
733	Register an attachment by C<$name> through which attachable objects of the	793	Register an attachment by C<$name> through which attachable objects of the
734	given CLASS can refer to this attachment.	794	given CLASS can refer to this attachment.
735		795
736	Some classes such as crossfire maps and objects can specify attachments	796	Some classes such as deliantra maps and objects can specify attachments
737	that are attached at load/instantiate time, thus the need for a name.	797	that are attached at load/instantiate time, thus the need for a name.
738		798
739	These calls expect any number of the following handler/hook descriptions:	799	These calls expect any number of the following handler/hook descriptions:
740		800
741	=over 4	801	=over 4
…		…
1032		1092
1033	sub reattach {	1093	sub reattach {
1034	# basically do the same as instantiate, without calling instantiate	1094	# basically do the same as instantiate, without calling instantiate
1035	my ($obj) = @_;	1095	my ($obj) = @_;
1036		1096
		1097	# no longer needed after getting rid of delete_package?
1037	bless $obj, ref $obj; # re-bless in case extensions have been reloaded	1098	#bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1038		1099
1039	my $registry = $obj->registry;	1100	my $registry = $obj->registry;
1040		1101
1041	@$registry = ();	1102	@$registry = ();
1042		1103
…		…
1088	utf8::decode (my $decname = $filename);	1149	utf8::decode (my $decname = $filename);
1089	warn sprintf "saving %s (%d,%d)\n",	1150	warn sprintf "saving %s (%d,%d)\n",
1090	$decname, length $$rdata, scalar @$objs;	1151	$decname, length $$rdata, scalar @$objs;
1091		1152
1092	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1153	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1093	chmod SAVE_MODE, $fh;	1154	aio_chmod $fh, SAVE_MODE;
1094	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1155	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1095	aio_fsync $fh if $cf::USE_FSYNC;	1156	aio_fsync $fh if $cf::USE_FSYNC;
1096	close $fh;	1157	aio_close $fh;
1097		1158
1098	if (@$objs) {	1159	if (@$objs) {
1099	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {	1160	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1100	chmod SAVE_MODE, $fh;	1161	aio_chmod $fh, SAVE_MODE;
1101	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };	1162	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1102	aio_write $fh, 0, (length $data), $data, 0;	1163	aio_write $fh, 0, (length $data), $data, 0;
1103	aio_fsync $fh if $cf::USE_FSYNC;	1164	aio_fsync $fh if $cf::USE_FSYNC;
1104	close $fh;	1165	aio_close $fh;
1105	aio_rename "$filename.pst~", "$filename.pst";	1166	aio_rename "$filename.pst~", "$filename.pst";
1106	}	1167	}
1107	} else {	1168	} else {
1108	aio_unlink "$filename.pst";	1169	aio_unlink "$filename.pst";
1109	}	1170	}
1110		1171
1111	aio_rename "$filename~", $filename;	1172	aio_rename "$filename~", $filename;
		1173
		1174	$filename =~ s%/[^/]+$%%;
		1175	aio_pathsync $filename if $cf::USE_FSYNC;
1112	} else {	1176	} else {
1113	warn "FATAL: $filename~: $!\n";	1177	warn "unable to save objects: $filename~: $!\n";
1114	}	1178	}
1115	} else {	1179	} else {
1116	aio_unlink $filename;	1180	aio_unlink $filename;
1117	aio_unlink "$filename.pst";	1181	aio_unlink "$filename.pst";
1118	}	1182	}
…		…
1209	my ($name, $cb) = @_;	1273	my ($name, $cb) = @_;
1210		1274
1211	$EXTICMD{$name} = $cb;	1275	$EXTICMD{$name} = $cb;
1212	}	1276	}
1213		1277
		1278	use File::Glob ();
		1279
1214	cf::player->attach (	1280	cf::player->attach (
1215	on_command => sub {	1281	on_command => sub {
1216	my ($pl, $name, $params) = @_;	1282	my ($pl, $name, $params) = @_;
1217		1283
1218	my $cb = $COMMAND{$name}	1284	my $cb = $COMMAND{$name}
…		…
1250		1316
1251	cf::override;	1317	cf::override;
1252	},	1318	},
1253	);	1319	);
1254		1320
		1321	# "readahead" all extensions
		1322	sub cache_extensions {
		1323	my $grp = IO::AIO::aio_group;
		1324
		1325	add $grp IO::AIO::aio_readdir $LIBDIR, sub {
		1326	for (grep /\.ext$/, @{$_[0]}) {
		1327	add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
		1328	}
		1329	};
		1330
		1331	$grp
		1332	}
		1333
1255	sub load_extensions {	1334	sub load_extensions {
1256	cf::sync_job {	1335	cf::sync_job {
1257	my %todo;	1336	my %todo;
1258		1337
1259	for my $path (<$LIBDIR/*.ext>) {	1338	for my $path (<$LIBDIR/*.ext>) {
…		…
1278		1357
1279	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1358	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1280	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1359	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1281		1360
1282	$ext{source} =	1361	$ext{source} =
1283	"package $pkg; use strict; use utf8;\n"	1362	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1284	. "#line 1 \"$path\"\n{\n"	1363	. "#line 1 \"$path\"\n{\n"
1285	. $source	1364	. $source
1286	. "\n};\n1";	1365	. "\n};\n1";
1287		1366
1288	$todo{$base} = \%ext;	1367	$todo{$base} = \%ext;
…		…
1304	my $msg = $@ ? "$v->{path}: $@\n"	1383	my $msg = $@ ? "$v->{path}: $@\n"
1305	: "$v->{base}: extension inactive.\n";	1384	: "$v->{base}: extension inactive.\n";
1306		1385
1307	if (exists $v->{meta}{mandatory}) {	1386	if (exists $v->{meta}{mandatory}) {
1308	warn $msg;	1387	warn $msg;
1309	warn "mandatory extension failed to load, exiting.\n";	1388	cf::cleanup "mandatory extension failed to load, exiting.";
1310	exit 1;
1311	}	1389	}
1312		1390
1313	warn $msg;	1391	warn $msg;
1314	}	1392	}
1315		1393
…		…
1329		1407
1330	=back	1408	=back
1331		1409
1332	=head2 CORE EXTENSIONS	1410	=head2 CORE EXTENSIONS
1333		1411
1334	Functions and methods that extend core crossfire objects.	1412	Functions and methods that extend core deliantra objects.
1335		1413
1336	=cut	1414	=cut
1337		1415
1338	package cf::player;	1416	package cf::player;
1339		1417
…		…
1382		1460
1383	sub exists($) {	1461	sub exists($) {
1384	my ($login) = @_;	1462	my ($login) = @_;
1385		1463
1386	$cf::PLAYER{$login}	1464	$cf::PLAYER{$login}
1387	or cf::sync_job { !aio_stat path $login }	1465	or !aio_stat path $login
1388	}	1466	}
1389		1467
1390	sub find($) {	1468	sub find($) {
1391	return $cf::PLAYER{$_[0]} || do {	1469	return $cf::PLAYER{$_[0]} || do {
1392	my $login = $_[0];	1470	my $login = $_[0];
…		…
1404	my $f = new_from_file cf::object::thawer path $login	1482	my $f = new_from_file cf::object::thawer path $login
1405	or return;	1483	or return;
1406		1484
1407	my $pl = cf::player::load_pl $f	1485	my $pl = cf::player::load_pl $f
1408	or return;	1486	or return;
		1487
1409	local $cf::PLAYER_LOADING{$login} = $pl;	1488	local $cf::PLAYER_LOADING{$login} = $pl;
1410	$f->resolve_delayed_derefs;	1489	$f->resolve_delayed_derefs;
1411	$cf::PLAYER{$login} = $pl	1490	$cf::PLAYER{$login} = $pl
1412	}	1491	}
1413	}	1492	}
…		…
1423		1502
1424	return if $pl->{deny_save};	1503	return if $pl->{deny_save};
1425		1504
1426	aio_mkdir playerdir $pl, 0770;	1505	aio_mkdir playerdir $pl, 0770;
1427	$pl->{last_save} = $cf::RUNTIME;	1506	$pl->{last_save} = $cf::RUNTIME;
		1507
		1508	cf::get_slot 0.01;
1428		1509
1429	$pl->save_pl ($path);	1510	$pl->save_pl ($path);
1430	cf::cede_to_tick;	1511	cf::cede_to_tick;
1431	}	1512	}
1432		1513
…		…
1464	my ($pl) = @_;	1545	my ($pl) = @_;
1465		1546
1466	my $name = $pl->ob->name;	1547	my $name = $pl->ob->name;
1467		1548
1468	$pl->{deny_save} = 1;	1549	$pl->{deny_save} = 1;
1469	$pl->password ("*"); # this should lock out the player until we nuked the dir	1550	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1470		1551
1471	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1552	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1472	$pl->deactivate;	1553	$pl->deactivate;
		1554	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
		1555	$pl->ob->check_score;
1473	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1556	$pl->invoke (cf::EVENT_PLAYER_QUIT);
1474	$pl->ns->destroy if $pl->ns;	1557	$pl->ns->destroy if $pl->ns;
1475		1558
1476	my $path = playerdir $pl;	1559	my $path = playerdir $pl;
1477	my $temp = "$path~$cf::RUNTIME~deleting~";	1560	my $temp = "$path~$cf::RUNTIME~deleting~";
…		…
1516		1599
1517	for my $login (@$dirs) {	1600	for my $login (@$dirs) {
1518	my $path = path $login;	1601	my $path = path $login;
1519		1602
1520	# a .pst is a dead give-away for a valid player	1603	# a .pst is a dead give-away for a valid player
1521	unless (-e "$path.pst") {	1604	# if no pst file found, open and chekc for blocked users
		1605	if (aio_stat "$path.pst") {
1522	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;	1606	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1523	aio_read $fh, 0, 512, my $buf, 0 or next;	1607	aio_read $fh, 0, 512, my $buf, 0 or next;
1524	$buf !~ /^password -------------$/m or next; # official not-valid tag	1608	$buf !~ /^password -------------$/m or next; # official not-valid tag
1525	}	1609	}
1526		1610
…		…
1557	}	1641	}
1558		1642
1559	\@paths	1643	\@paths
1560	}	1644	}
1561		1645
1562	=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)	1646	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1563		1647
1564	Expand crossfire pod fragments into protocol xml.	1648	Expand deliantra pod fragments into protocol xml.
1565
1566	=cut
1567
1568	use re 'eval';
1569
1570	my $group;
1571	my $interior; $interior = qr{
1572	# match a pod interior sequence sans C<< >>
1573	(?:
1574	\ (.*?)\ (?{ $group = $^N })
1575	| < (??{$interior}) >
1576	)
1577	}x;
1578
1579	sub expand_cfpod {
1580	my ($self, $pod) = @_;
1581
1582	my $xml;
1583
1584	while () {
1585	if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1586	$group = $1;
1587
1588	$group =~ s/&/&amp;/g;
1589	$group =~ s/</&lt;/g;
1590
1591	$xml .= $group;
1592	} elsif ($pod =~ m%\G
1593	([BCGHITU])
1594	<
1595	(?:
1596	([^<>]*) (?{ $group = $^N })
1597	| < $interior >
1598	)
1599	>
1600	%gcsx
1601	) {
1602	my ($code, $data) = ($1, $group);
1603
1604	if ($code eq "B") {
1605	$xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1606	} elsif ($code eq "I") {
1607	$xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1608	} elsif ($code eq "U") {
1609	$xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1610	} elsif ($code eq "C") {
1611	$xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1612	} elsif ($code eq "T") {
1613	$xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1614	} elsif ($code eq "G") {
1615	my ($male, $female) = split /\|/, $data;
1616	$data = $self->gender ? $female : $male;
1617	$xml .= expand_cfpod ($self, $data);
1618	} elsif ($code eq "H") {
1619	$xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1620	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1621	"")
1622	[$self->{hintmode}];
1623	} else {
1624	$xml .= "error processing '$code($data)' directive";
1625	}
1626	} else {
1627	if ($pod =~ /\G(.+)/) {
1628	warn "parse error while expanding $pod (at $1)";
1629	}
1630	last;
1631	}
1632	}
1633
1634	for ($xml) {
1635	# create single paragraphs (very hackish)
1636	s/(?<=\S)\n(?=\w)/ /g;
1637
1638	# compress some whitespace
1639	s/\s+\n/\n/g; # ws line-ends
1640	s/\n\n+/\n/g; # double lines
1641	s/^\n+//; # beginning lines
1642	s/\n+$//; # ending lines
1643	}
1644
1645	$xml
1646	}
1647
1648	no re 'eval';
1649
1650	sub hintmode {
1651	$_[0]{hintmode} = $_[1] if @_ > 1;
1652	$_[0]{hintmode}
1653	}
1654		1649
1655	=item $player->ext_reply ($msgid, @msg)	1650	=item $player->ext_reply ($msgid, @msg)
1656		1651
1657	Sends an ext reply to the player.	1652	Sends an ext reply to the player.
1658		1653
…		…
1725	our $MAX_RESET = 3600;	1720	our $MAX_RESET = 3600;
1726	our $DEFAULT_RESET = 3000;	1721	our $DEFAULT_RESET = 3000;
1727		1722
1728	sub generate_random_map {	1723	sub generate_random_map {
1729	my ($self, $rmp) = @_;	1724	my ($self, $rmp) = @_;
		1725
		1726	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
		1727
1730	# mit "rum" bekleckern, nicht	1728	# mit "rum" bekleckern, nicht
1731	$self->_create_random_map (	1729	$self->_create_random_map (
1732	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},	1730	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1733	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},	1731	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1734	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},	1732	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
…		…
1856		1854
1857	# the temporary/swap location	1855	# the temporary/swap location
1858	sub save_path {	1856	sub save_path {
1859	my ($self) = @_;	1857	my ($self) = @_;
1860		1858
1861	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1859	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1862	"$TMPDIR/$path.map"	1860	"$TMPDIR/$path.map"
1863	}	1861	}
1864		1862
1865	# the unique path, undef == no special unique path	1863	# the unique path, undef == no special unique path
1866	sub uniq_path {	1864	sub uniq_path {
1867	my ($self) = @_;	1865	my ($self) = @_;
1868		1866
1869	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1867	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1870	"$UNIQUEDIR/$path"	1868	"$UNIQUEDIR/$path"
1871	}
1872
1873	# and all this just because we cannot iterate over
1874	# all maps in C++...
1875	sub change_all_map_light {
1876	my ($change) = @_;
1877
1878	$_->change_map_light ($change)
1879	for grep $_->outdoor, values %cf::MAP;
1880	}	1869	}
1881		1870
1882	sub decay_objects {	1871	sub decay_objects {
1883	my ($self) = @_;	1872	my ($self) = @_;
1884		1873
…		…
1968	sub find {	1957	sub find {
1969	my ($path, $origin) = @_;	1958	my ($path, $origin) = @_;
1970		1959
1971	$path = normalise $path, $origin && $origin->path;	1960	$path = normalise $path, $origin && $origin->path;
1972		1961
1973	cf::lock_wait "map_data:$path";#d#remove	1962	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1974	cf::lock_wait "map_find:$path";	1963	my $guard2 = cf::lock_acquire "map_find:$path";
1975		1964
1976	$cf::MAP{$path} || do {	1965	$cf::MAP{$path} || do {
1977	my $guard1 = cf::lock_acquire "map_find:$path";
1978	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1979
1980	my $map = new_from_path cf::map $path	1966	my $map = new_from_path cf::map $path
1981	or return;	1967	or return;
1982		1968
1983	$map->{last_save} = $cf::RUNTIME;	1969	$map->{last_save} = $cf::RUNTIME;
1984		1970
…		…
1986	or return;	1972	or return;
1987		1973
1988	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1974	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1989	# doing this can freeze the server in a sync job, obviously	1975	# doing this can freeze the server in a sync job, obviously
1990	#$cf::WAIT_FOR_TICK->wait;	1976	#$cf::WAIT_FOR_TICK->wait;
		1977	undef $guard2;
1991	undef $guard1;	1978	undef $guard1;
1992	undef $guard2;
1993	$map->reset;	1979	$map->reset;
1994	return find $path;	1980	return find $path;
1995	}	1981	}
1996		1982
1997	$cf::MAP{$path} = $map	1983	$cf::MAP{$path} = $map
…		…
2024	my $f = new_from_file cf::object::thawer $self->{load_path};	2010	my $f = new_from_file cf::object::thawer $self->{load_path};
2025	$f->skip_block;	2011	$f->skip_block;
2026	$self->_load_objects ($f)	2012	$self->_load_objects ($f)
2027	or return;	2013	or return;
2028		2014
2029	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	2015	$self->post_load_original
2030	if delete $self->{load_original};	2016	if delete $self->{load_original};
2031		2017
2032	if (my $uniq = $self->uniq_path) {	2018	if (my $uniq = $self->uniq_path) {
2033	utf8::encode $uniq;	2019	utf8::encode $uniq;
2034	unless (aio_stat $uniq) {	2020	unless (aio_stat $uniq) {
…		…
2052	unless ($self->{deny_activate}) {	2038	unless ($self->{deny_activate}) {
2053	$self->decay_objects;	2039	$self->decay_objects;
2054	$self->fix_auto_apply;	2040	$self->fix_auto_apply;
2055	$self->update_buttons;	2041	$self->update_buttons;
2056	cf::cede_to_tick;	2042	cf::cede_to_tick;
2057	$self->set_darkness_map;
2058	cf::cede_to_tick;
2059	$self->activate;	2043	$self->activate;
2060	}	2044	}
2061		2045
2062	$self->{last_save} = $cf::RUNTIME;	2046	$self->{last_save} = $cf::RUNTIME;
2063	$self->last_access ($cf::RUNTIME);	2047	$self->last_access ($cf::RUNTIME);
2064		2048
2065	$self->in_memory (cf::MAP_IN_MEMORY);	2049	$self->in_memory (cf::MAP_ACTIVE);
2066	}	2050	}
2067		2051
2068	$self->post_load;	2052	$self->post_load;
2069	}	2053	}
2070		2054
…		…
2128	my ($path, $origin, $load) = @_;	2112	my ($path, $origin, $load) = @_;
2129		2113
2130	$path = normalise $path, $origin && $origin->{path};	2114	$path = normalise $path, $origin && $origin->{path};
2131		2115
2132	if (my $map = $cf::MAP{$path}) {	2116	if (my $map = $cf::MAP{$path}) {
2133	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;	2117	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2134	}	2118	}
2135		2119
2136	$MAP_PREFETCH{$path} |= $load;	2120	$MAP_PREFETCH{$path} |= $load;
2137		2121
2138	$MAP_PREFETCHER ||= cf::async {	2122	$MAP_PREFETCHER ||= cf::async {
…		…
2175	cf::async {	2159	cf::async {
2176	$Coro::current->{desc} = "map player save";	2160	$Coro::current->{desc} = "map player save";
2177	$_->contr->save for $self->players;	2161	$_->contr->save for $self->players;
2178	};	2162	};
2179		2163
		2164	cf::get_slot 0.02;
		2165
2180	if ($uniq) {	2166	if ($uniq) {
2181	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);	2167	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2182	$self->_save_objects ($uniq, cf::IO_UNIQUES);	2168	$self->_save_objects ($uniq, cf::IO_UNIQUES);
2183	} else {	2169	} else {
2184	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);	2170	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
…		…
2192	$self->save;	2178	$self->save;
2193		2179
2194	my $lock = cf::lock_acquire "map_data:$self->{path}";	2180	my $lock = cf::lock_acquire "map_data:$self->{path}";
2195		2181
2196	return if $self->players;	2182	return if $self->players;
2197	return if $self->in_memory != cf::MAP_IN_MEMORY;	2183	return if $self->in_memory != cf::MAP_ACTIVE;
2198	return if $self->{deny_save};	2184	return if $self->{deny_save};
2199		2185
2200	$self->in_memory (cf::MAP_SWAPPED);	2186	$self->in_memory (cf::MAP_SWAPPED);
2201		2187
2202	$self->deactivate;	2188	$self->deactivate;
…		…
2320		2306
2321	sub unique_maps() {	2307	sub unique_maps() {
2322	[	2308	[
2323	map {	2309	map {
2324	utf8::decode $_;	2310	utf8::decode $_;
2325	/\.map$/	2311	s/\.map$//; # TODO future compatibility hack
		2312	/\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
		2313	? ()
2326	? normalise $_	2314	: normalise $_
2327	: ()
2328	} @{ aio_readdir $UNIQUEDIR or [] }	2315	} @{ aio_readdir $UNIQUEDIR or [] }
2329	]	2316	]
2330	}	2317	}
2331		2318
2332	package cf;
2333
2334	=back	2319	=back
2335		2320
2336	=head3 cf::object	2321	=head3 cf::object
2337		2322
2338	=cut	2323	=cut
…		…
2341		2326
2342	=over 4	2327	=over 4
2343		2328
2344	=item $ob->inv_recursive	2329	=item $ob->inv_recursive
2345		2330
2346	Returns the inventory of the object _and_ their inventories, recursively.	2331	Returns the inventory of the object I<and> their inventories, recursively,
		2332	but I<not> the object itself.
2347		2333
2348	=cut	2334	=cut
2349		2335
2350	sub inv_recursive_;	2336	sub inv_recursive_;
2351	sub inv_recursive_ {	2337	sub inv_recursive_ {
…		…
2356	inv_recursive_ inv $_[0]	2342	inv_recursive_ inv $_[0]
2357	}	2343	}
2358		2344
2359	=item $ref = $ob->ref	2345	=item $ref = $ob->ref
2360		2346
2361	creates and returns a persistent reference to an objetc that can be stored as a string.	2347	Creates and returns a persistent reference to an object that can be stored as a string.
2362		2348
2363	=item $ob = cf::object::deref ($refstring)	2349	=item $ob = cf::object::deref ($refstring)
2364		2350
2365	returns the objetc referenced by refstring. may return undef when it cnanot find the object,	2351	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2366	even if the object actually exists. May block.	2352	even if the object actually exists. May block.
…		…
2398	can be C<undef>. Does the right thing when the player is currently in a	2384	can be C<undef>. Does the right thing when the player is currently in a
2399	dialogue with the given NPC character.	2385	dialogue with the given NPC character.
2400		2386
2401	=cut	2387	=cut
2402		2388
		2389	our $SAY_CHANNEL = {
		2390	id => "say",
		2391	title => "Map",
		2392	reply => "say ",
		2393	tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
		2394	};
		2395
		2396	our $CHAT_CHANNEL = {
		2397	id => "chat",
		2398	title => "Chat",
		2399	reply => "chat ",
		2400	tooltip => "Player chat and shouts, global to the server.",
		2401	};
		2402
2403	# rough implementation of a future "reply" method that works	2403	# rough implementation of a future "reply" method that works
2404	# with dialog boxes.	2404	# with dialog boxes.
2405	#TODO: the first argument must go, split into a $npc->reply_to ( method	2405	#TODO: the first argument must go, split into a $npc->reply_to ( method
2406	sub cf::object::player::reply($$$;$) {	2406	sub cf::object::player::reply($$$;$) {
2407	my ($self, $npc, $msg, $flags) = @_;	2407	my ($self, $npc, $msg, $flags) = @_;
…		…
2418	my $dialog = $pl->{npc_dialog};	2418	my $dialog = $pl->{npc_dialog};
2419	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));	2419	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2420		2420
2421	} else {	2421	} else {
2422	$msg = $npc->name . " says: $msg" if $npc;	2422	$msg = $npc->name . " says: $msg" if $npc;
2423	$self->message ($msg, $flags);	2423	$self->send_msg ($SAY_CHANNEL => $msg, $flags);
2424	}	2424	}
2425	}	2425	}
2426	}	2426	}
2427		2427
2428	=item $object->send_msg ($channel, $msg, $color, [extra...])	2428	=item $object->send_msg ($channel, $msg, $color, [extra...])
…		…
2453		2453
2454	=item $player_object->enter_link	2454	=item $player_object->enter_link
2455		2455
2456	Freezes the player and moves him/her to a special map (C<{link}>).	2456	Freezes the player and moves him/her to a special map (C<{link}>).
2457		2457
2458	The player should be reasonably safe there for short amounts of time. You	2458	The player should be reasonably safe there for short amounts of time (e.g.
2459	I<MUST> call C<leave_link> as soon as possible, though.	2459	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
		2460	though, as the palyer cannot control the character while it is on the link
		2461	map.
2460		2462
2461	Will never block.	2463	Will never block.
2462		2464
2463	=item $player_object->leave_link ($map, $x, $y)	2465	=item $player_object->leave_link ($map, $x, $y)
2464		2466
…		…
2522		2524
2523	$map->load;	2525	$map->load;
2524	$map->load_neighbours;	2526	$map->load_neighbours;
2525		2527
2526	return unless $self->contr->active;	2528	return unless $self->contr->active;
		2529	$self->flag (cf::FLAG_DEBUG, 0);#d# temp
2527	$self->activate_recursive;	2530	$self->activate_recursive;
2528		2531
2529	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2532	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2530	$self->enter_map ($map, $x, $y);	2533	$self->enter_map ($map, $x, $y);
2531	}	2534	}
…		…
2535	Moves the player to the given map-path and coordinates by first freezing	2538	Moves the player to the given map-path and coordinates by first freezing
2536	her, loading and preparing them map, calling the provided $check callback	2539	her, loading and preparing them map, calling the provided $check callback
2537	that has to return the map if sucecssful, and then unfreezes the player on	2540	that has to return the map if sucecssful, and then unfreezes the player on
2538	the new (success) or old (failed) map position. In either case, $done will	2541	the new (success) or old (failed) map position. In either case, $done will
2539	be called at the end of this process.	2542	be called at the end of this process.
		2543
		2544	Note that $check will be called with a potentially non-loaded map, so if
		2545	it needs a loaded map it has to call C<< ->load >>.
2540		2546
2541	=cut	2547	=cut
2542		2548
2543	our $GOTOGEN;	2549	our $GOTOGEN;
2544		2550
…		…
2623	}	2629	}
2624		2630
2625	sub prepare_random_map {	2631	sub prepare_random_map {
2626	my ($exit) = @_;	2632	my ($exit) = @_;
2627		2633
2628	my $guard = cf::lock_acquire "exit_prepare:$exit";
2629
2630	# all this does is basically replace the /! path by	2634	# all this does is basically replace the /! path by
2631	# a new random map path (?random/...) with a seed	2635	# a new random map path (?random/...) with a seed
2632	# that depends on the exit object	2636	# that depends on the exit object
2633		2637
2634	my $rmp = parse_random_map_params $exit->msg;	2638	my $rmp = parse_random_map_params $exit->msg;
…		…
2636	if ($exit->map) {	2640	if ($exit->map) {
2637	$rmp->{region} = $exit->region->name;	2641	$rmp->{region} = $exit->region->name;
2638	$rmp->{origin_map} = $exit->map->path;	2642	$rmp->{origin_map} = $exit->map->path;
2639	$rmp->{origin_x} = $exit->x;	2643	$rmp->{origin_x} = $exit->x;
2640	$rmp->{origin_y} = $exit->y;	2644	$rmp->{origin_y} = $exit->y;
		2645
		2646	$exit->map->touch;
2641	}	2647	}
2642		2648
2643	$rmp->{random_seed} ||= $exit->random_seed;	2649	$rmp->{random_seed} ||= $exit->random_seed;
2644		2650
2645	my $data = cf::encode_json $rmp;	2651	my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2646	my $md5 = Digest::MD5::md5_hex $data;	2652	my $md5 = Digest::MD5::md5_hex $data;
2647	my $meta = "$RANDOMDIR/$md5.meta";	2653	my $meta = "$RANDOMDIR/$md5.meta";
2648		2654
2649	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {	2655	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2650	aio_write $fh, 0, (length $data), $data, 0;	2656	aio_write $fh, 0, (length $data), $data, 0;
2651	undef $fh;	2657	undef $fh;
2652	aio_rename "$meta~", $meta;	2658	aio_rename "$meta~", $meta;
2653		2659
		2660	my $slaying = "?random/$md5";
		2661
		2662	if ($exit->valid) {
2654	$exit->slaying ("?random/$md5");	2663	$exit->slaying ("?random/$md5");
2655	$exit->msg (undef);	2664	$exit->msg (undef);
		2665	}
2656	}	2666	}
2657	}	2667	}
2658		2668
2659	sub cf::object::player::enter_exit {	2669	sub cf::object::player::enter_exit {
2660	my ($self, $exit) = @_;	2670	my ($self, $exit) = @_;
2661		2671
2662	return unless $self->type == cf::PLAYER;	2672	return unless $self->type == cf::PLAYER;
2663		2673
2664	if ($exit->slaying eq "/!") {
2665	#TODO: this should de-fi-ni-te-ly not be a sync-job
2666	# the problem is that $exit might not survive long enough
2667	# so it needs to be done right now, right here
2668	cf::sync_job { prepare_random_map $exit };
2669	}
2670
2671	my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2672	my $hp = $exit->stats->hp;
2673	my $sp = $exit->stats->sp;
2674
2675	$self->enter_link;	2674	$self->enter_link;
2676		2675
2677	# if exit is damned, update players death & WoR home-position
2678	$self->contr->savebed ($slaying, $hp, $sp)
2679	if $exit->flag (FLAG_DAMNED);
2680
2681	(async {	2676	(async {
2682	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";	2677	$Coro::current->{desc} = "enter_exit";
2683		2678
2684	$self->deactivate_recursive; # just to be sure
2685	unless (eval {	2679	unless (eval {
		2680	$self->deactivate_recursive; # just to be sure
		2681
		2682	# random map handling
		2683	{
		2684	my $guard = cf::lock_acquire "exit_prepare:$exit";
		2685
		2686	prepare_random_map $exit
		2687	if $exit->slaying eq "/!";
		2688	}
		2689
		2690	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
		2691	my $x = $exit->stats->hp;
		2692	my $y = $exit->stats->sp;
		2693
2686	$self->goto ($slaying, $hp, $sp);	2694	$self->goto ($map, $x, $y);
2687		2695
		2696	# if exit is damned, update players death & WoR home-position
		2697	$self->contr->savebed ($map, $x, $y)
		2698	if $exit->flag (cf::FLAG_DAMNED);
		2699
2688	1;	2700	1
2689	}) {	2701	}) {
2690	$self->message ("Something went wrong deep within the crossfire server. "	2702	$self->message ("Something went wrong deep within the deliantra server. "
2691	. "I'll try to bring you back to the map you were before. "	2703	. "I'll try to bring you back to the map you were before. "
2692	. "Please report this to the dungeon master!",	2704	. "Please report this to the dungeon master!",
2693	cf::NDI_UNIQUE | cf::NDI_RED);	2705	cf::NDI_UNIQUE | cf::NDI_RED);
2694		2706
2695	warn "ERROR in enter_exit: $@";	2707	warn "ERROR in enter_exit: $@";
…		…
2761	id => "infobox",	2773	id => "infobox",
2762	title => "Body Parts",	2774	title => "Body Parts",
2763	reply => undef,	2775	reply => undef,
2764	tooltip => "Shows which body parts you posess and are available",	2776	tooltip => "Shows which body parts you posess and are available",
2765	},	2777	},
		2778	"c/statistics" => {
		2779	id => "infobox",
		2780	title => "Statistics",
		2781	reply => undef,
		2782	tooltip => "Shows your primary statistics",
		2783	},
		2784	"c/skills" => {
		2785	id => "infobox",
		2786	title => "Skills",
		2787	reply => undef,
		2788	tooltip => "Shows your experience per skill and item power",
		2789	},
		2790	"c/resistances" => {
		2791	id => "infobox",
		2792	title => "Resistances",
		2793	reply => undef,
		2794	tooltip => "Shows your resistances",
		2795	},
		2796	"c/pets" => {
		2797	id => "infobox",
		2798	title => "Pets",
		2799	reply => undef,
		2800	tooltip => "Shows information abotu your pets/a specific pet",
		2801	},
2766	"c/uptime" => {	2802	"c/uptime" => {
2767	id => "infobox",	2803	id => "infobox",
2768	title => "Uptime",	2804	title => "Uptime",
2769	reply => undef,	2805	reply => undef,
2770	tooltip => "How long the server has been running since last restart",	2806	tooltip => "How long the server has been running since last restart",
…		…
2773	id => "infobox",	2809	id => "infobox",
2774	title => "Map Info",	2810	title => "Map Info",
2775	reply => undef,	2811	reply => undef,
2776	tooltip => "Information related to the maps",	2812	tooltip => "Information related to the maps",
2777	},	2813	},
		2814	"c/party" => {
		2815	id => "party",
		2816	title => "Party",
		2817	reply => "gsay ",
		2818	tooltip => "Messages and chat related to your party",
		2819	},
		2820	"c/death" => {
		2821	id => "death",
		2822	title => "Death",
		2823	reply => undef,
		2824	tooltip => "Reason for and more info about your most recent death",
		2825	},
		2826	"c/say" => $SAY_CHANNEL,
		2827	"c/chat" => $CHAT_CHANNEL,
2778	);	2828	);
2779		2829
2780	sub cf::client::send_msg {	2830	sub cf::client::send_msg {
2781	my ($self, $channel, $msg, $color, @extra) = @_;	2831	my ($self, $channel, $msg, $color, @extra) = @_;
2782		2832
2783	$msg = $self->pl->expand_cfpod ($msg);	2833	$msg = $self->pl->expand_cfpod ($msg)
		2834	unless $color & cf::NDI_VERBATIM;
2784		2835
2785	$color &= cf::NDI_CLIENT_MASK; # just in case...	2836	$color &= cf::NDI_CLIENT_MASK; # just in case...
2786		2837
2787	# check predefined channels, for the benefit of C	2838	# check predefined channels, for the benefit of C
2788	if ($CHANNEL{$channel}) {	2839	if ($CHANNEL{$channel}) {
2789	$channel = $CHANNEL{$channel};	2840	$channel = $CHANNEL{$channel};
2790		2841
2791	$self->ext_msg (channel_info => $channel)	2842	$self->ext_msg (channel_info => $channel);
2792	if $self->can_msg;
2793
2794	$channel = $channel->{id};	2843	$channel = $channel->{id};
2795		2844
2796	} elsif (ref $channel) {	2845	} elsif (ref $channel) {
2797	# send meta info to client, if not yet sent	2846	# send meta info to client, if not yet sent
2798	unless (exists $self->{channel}{$channel->{id}}) {	2847	unless (exists $self->{channel}{$channel->{id}}) {
2799	$self->{channel}{$channel->{id}} = $channel;	2848	$self->{channel}{$channel->{id}} = $channel;
2800	$self->ext_msg (channel_info => $channel)	2849	$self->ext_msg (channel_info => $channel);
2801	if $self->can_msg;
2802	}	2850	}
2803		2851
2804	$channel = $channel->{id};	2852	$channel = $channel->{id};
2805	}	2853	}
2806		2854
2807	return unless @extra || length $msg;	2855	return unless @extra || length $msg;
2808		2856
2809	if ($self->can_msg) {
2810	# default colour, mask it out	2857	# default colour, mask it out
2811	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)	2858	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2812	if $color & cf::NDI_DEF;	2859	if $color & cf::NDI_DEF;
2813		2860
2814	$self->send_packet ("msg " . $self->{json_coder}->encode (	2861	my $pkt = "msg "
		2862	. $self->{json_coder}->encode (
2815	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));	2863	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2816	} else {	2864	);
2817	if ($color >= 0) {
2818	# replace some tags by gcfclient-compatible ones
2819	for ($msg) {
2820	1 while
2821	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2822	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2823	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2824	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2825	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2826	}
2827		2865
2828	$color &= cf::NDI_COLOR_MASK;	2866	# try lzf for large packets
		2867	$pkt = "lzf " . Compress::LZF::compress $pkt
		2868	if 1024 <= length $pkt and $self->{can_lzf};
2829		2869
2830	utf8::encode $msg;	2870	# split very large packets
2831		2871	if (8192 < length $pkt and $self->{can_lzf}) {
2832	if (0 && $msg =~ /\[/) {	2872	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2833	# COMMAND/INFO	2873	$pkt = "frag";
2834	$self->send_packet ("drawextinfo $color 10 8 $msg")
2835	} else {
2836	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2837	$self->send_packet ("drawinfo $color $msg")
2838	}
2839	}
2840	}	2874	}
		2875
		2876	$self->send_packet ($pkt);
2841	}	2877	}
2842		2878
2843	=item $client->ext_msg ($type, @msg)	2879	=item $client->ext_msg ($type, @msg)
2844		2880
2845	Sends an ext event to the client.	2881	Sends an ext event to the client.
…		…
3019		3055
3020	The following functions and methods are available within a safe environment:	3056	The following functions and methods are available within a safe environment:
3021		3057
3022	cf::object	3058	cf::object
3023	contr pay_amount pay_player map x y force_find force_add destroy	3059	contr pay_amount pay_player map x y force_find force_add destroy
3024	insert remove name archname title slaying race decrease_ob_nr	3060	insert remove name archname title slaying race decrease split
		3061	value
3025		3062
3026	cf::object::player	3063	cf::object::player
3027	player	3064	player
3028		3065
3029	cf::player	3066	cf::player
…		…
3034		3071
3035	=cut	3072	=cut
3036		3073
3037	for (	3074	for (
3038	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	3075	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3039	insert remove inv name archname title slaying race	3076	insert remove inv nrof name archname title slaying race
3040	decrease_ob_nr destroy)],	3077	decrease split destroy change_exp value msg lore send_msg)],
3041	["cf::object::player" => qw(player)],	3078	["cf::object::player" => qw(player)],
3042	["cf::player" => qw(peaceful)],	3079	["cf::player" => qw(peaceful send_msg)],
3043	["cf::map" => qw(trigger)],	3080	["cf::map" => qw(trigger)],
3044	) {	3081	) {
3045	no strict 'refs';	3082	no strict 'refs';
3046	my ($pkg, @funs) = @$_;	3083	my ($pkg, @funs) = @$_;
3047	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3084	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
…		…
3064	my ($code, %vars) = @_;	3101	my ($code, %vars) = @_;
3065		3102
3066	my $qcode = $code;	3103	my $qcode = $code;
3067	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3104	$qcode =~ s/"/‟/g; # not allowed in #line filenames
3068	$qcode =~ s/\n/\\n/g;	3105	$qcode =~ s/\n/\\n/g;
		3106
		3107	%vars = (_dummy => 0) unless %vars;
3069		3108
3070	local $_;	3109	local $_;
3071	local @safe::cf::_safe_eval_args = values %vars;	3110	local @safe::cf::_safe_eval_args = values %vars;
3072		3111
3073	my $eval =	3112	my $eval =
…		…
3253	while (my ($k, $v) = each %$want) {	3292	while (my ($k, $v) = each %$want) {
3254	$ns->fx_want ($k, $v);	3293	$ns->fx_want ($k, $v);
3255	}	3294	}
3256	};	3295	};
3257		3296
		3297	sub load_resource_file($) {
		3298	my $guard = lock_acquire "load_resource_file";
		3299
		3300	my $status = load_resource_file_ $_[0];
		3301	get_slot 0.1, 100;
		3302	cf::arch::commit_load;
		3303
		3304	$status
		3305	}
		3306
3258	sub reload_regions {	3307	sub reload_regions {
3259	# HACK to clear player env face cache, we need some signal framework	3308	# HACK to clear player env face cache, we need some signal framework
3260	# for this (global event?)	3309	# for this (global event?)
3261	%ext::player_env::MUSIC_FACE_CACHE = ();	3310	%ext::player_env::MUSIC_FACE_CACHE = ();
3262		3311
…		…
3275	}	3324	}
3276		3325
3277	sub reload_archetypes {	3326	sub reload_archetypes {
3278	load_resource_file "$DATADIR/archetypes"	3327	load_resource_file "$DATADIR/archetypes"
3279	or die "unable to load archetypes\n";	3328	or die "unable to load archetypes\n";
3280	#d# NEED to laod twice to resolve forward references
3281	# this really needs to be done in an extra post-pass
3282	# (which needs to be synchronous, so solve it differently)
3283	load_resource_file "$DATADIR/archetypes"
3284	or die "unable to load archetypes\n";
3285	}	3329	}
3286		3330
3287	sub reload_treasures {	3331	sub reload_treasures {
3288	load_resource_file "$DATADIR/treasures"	3332	load_resource_file "$DATADIR/treasures"
3289	or die "unable to load treasurelists\n";	3333	or die "unable to load treasurelists\n";
3290	}	3334	}
3291		3335
3292	sub reload_resources {	3336	sub reload_resources {
3293	warn "reloading resource files...\n";	3337	warn "reloading resource files...\n";
3294		3338
		3339	reload_facedata;
		3340	reload_archetypes;
3295	reload_regions;	3341	reload_regions;
3296	reload_facedata;
3297	#reload_archetypes;#d#
3298	reload_archetypes;
3299	reload_treasures;	3342	reload_treasures;
3300		3343
3301	warn "finished reloading resource files\n";	3344	warn "finished reloading resource files\n";
3302	}
3303
3304	sub init {
3305	reload_resources;
3306	}	3345	}
3307		3346
3308	sub reload_config {	3347	sub reload_config {
3309	open my $fh, "<:utf8", "$CONFDIR/config"	3348	open my $fh, "<:utf8", "$CONFDIR/config"
3310	or return;	3349	or return;
3311		3350
3312	local $/;	3351	local $/;
3313	*CFG = YAML::Syck::Load <$fh>;	3352	*CFG = YAML::Load <$fh>;
3314		3353
3315	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3354	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3316		3355
3317	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3356	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3318	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3357	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
3324	};	3363	};
3325	warn $@ if $@;	3364	warn $@ if $@;
3326	}	3365	}
3327	}	3366	}
3328		3367
		3368	sub pidfile() {
		3369	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
		3370	or die "$PIDFILE: $!";
		3371	flock $fh, &Fcntl::LOCK_EX
		3372	or die "$PIDFILE: flock: $!";
		3373	$fh
		3374	}
		3375
		3376	# make sure only one server instance is running at any one time
		3377	sub atomic {
		3378	my $fh = pidfile;
		3379
		3380	my $pid = <$fh>;
		3381	kill 9, $pid if $pid > 0;
		3382
		3383	seek $fh, 0, 0;
		3384	print $fh $$;
		3385	}
		3386
3329	sub main {	3387	sub main {
		3388	cf::init_globals; # initialise logging
		3389
		3390	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
		3391	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
		3392	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
		3393	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
		3394
		3395	cf::init_experience;
		3396	cf::init_anim;
		3397	cf::init_attackmess;
		3398	cf::init_dynamic;
		3399
		3400	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
		3401
3330	# we must not ever block the main coroutine	3402	# we must not ever block the main coroutine
3331	local $Coro::idle = sub {	3403	local $Coro::idle = sub {
3332	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3404	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3333	(async {	3405	(async {
3334	$Coro::current->{desc} = "IDLE BUG HANDLER";	3406	$Coro::current->{desc} = "IDLE BUG HANDLER";
3335	EV::loop EV::LOOP_ONESHOT;	3407	EV::loop EV::LOOP_ONESHOT;
3336	})->prio (Coro::PRIO_MAX);	3408	})->prio (Coro::PRIO_MAX);
3337	};	3409	};
3338		3410
		3411	evthread_start IO::AIO::poll_fileno;
		3412
		3413	cf::sync_job {
		3414	reload_resources;
3339	reload_config;	3415	reload_config;
3340	db_init;	3416	db_init;
		3417
		3418	cf::load_settings;
		3419	cf::load_materials;
		3420	cf::init_uuid;
		3421	cf::init_signals;
		3422	cf::init_commands;
		3423	cf::init_skills;
		3424
		3425	cf::init_beforeplay;
		3426
		3427	atomic;
		3428
3341	load_extensions;	3429	load_extensions;
3342		3430
3343	$TICK_WATCHER->start;	3431	utime time, time, $RUNTIMEFILE;
3344	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3432
		3433	# no (long-running) fork's whatsoever before this point(!)
		3434	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
		3435
		3436	(pop @POST_INIT)->(0) while @POST_INIT;
		3437	};
		3438
3345	EV::loop;	3439	EV::loop;
3346	}	3440	}
3347		3441
3348	#############################################################################	3442	#############################################################################
3349	# initialisation and cleanup	3443	# initialisation and cleanup
…		…
3356	cf::cleanup "SIG$signal";	3450	cf::cleanup "SIG$signal";
3357	};	3451	};
3358	}	3452	}
3359	}	3453	}
3360		3454
3361	sub write_runtime {	3455	sub write_runtime_sync {
3362	my $runtime = "$LOCALDIR/runtime";
3363
3364	# first touch the runtime file to show we are still running:	3456	# first touch the runtime file to show we are still running:
3365	# the fsync below can take a very very long time.	3457	# the fsync below can take a very very long time.
3366		3458
3367	IO::AIO::aio_utime $runtime, undef, undef;	3459	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3368		3460
3369	my $guard = cf::lock_acquire "write_runtime";	3461	my $guard = cf::lock_acquire "write_runtime";
3370		3462
3371	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644	3463	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3372	or return;	3464	or return;
3373		3465
3374	my $value = $cf::RUNTIME + 90 + 10;	3466	my $value = $cf::RUNTIME + 90 + 10;
3375	# 10 is the runtime save interval, for a monotonic clock	3467	# 10 is the runtime save interval, for a monotonic clock
3376	# 60 allows for the watchdog to kill the server.	3468	# 60 allows for the watchdog to kill the server.
…		…
3386	aio_utime $fh, undef, undef;	3478	aio_utime $fh, undef, undef;
3387		3479
3388	close $fh	3480	close $fh
3389	or return;	3481	or return;
3390		3482
3391	aio_rename "$runtime~", $runtime	3483	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3392	and return;	3484	and return;
3393		3485
3394	warn "runtime file written.\n";	3486	warn "runtime file written.\n";
3395		3487
3396	1	3488	1
		3489	}
		3490
		3491	our $uuid_lock;
		3492	our $uuid_skip;
		3493
		3494	sub write_uuid_sync($) {
		3495	$uuid_skip ||= $_[0];
		3496
		3497	return if $uuid_lock;
		3498	local $uuid_lock = 1;
		3499
		3500	my $uuid = "$LOCALDIR/uuid";
		3501
		3502	my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
		3503	or return;
		3504
		3505	my $value = uuid_seq uuid_cur;
		3506
		3507	unless ($value) {
		3508	warn "cowardly refusing to write zero uuid value!\n";
		3509	return;
		3510	}
		3511
		3512	my $value = uuid_str $value + $uuid_skip;
		3513	$uuid_skip = 0;
		3514
		3515	(aio_write $fh, 0, (length $value), $value, 0) <= 0
		3516	and return;
		3517
		3518	# always fsync - this file is important
		3519	aio_fsync $fh
		3520	and return;
		3521
		3522	close $fh
		3523	or return;
		3524
		3525	aio_rename "$uuid~", $uuid
		3526	and return;
		3527
		3528	warn "uuid file written ($value).\n";
		3529
		3530	1
		3531
		3532	}
		3533
		3534	sub write_uuid($$) {
		3535	my ($skip, $sync) = @_;
		3536
		3537	$sync ? write_uuid_sync $skip
		3538	: async { write_uuid_sync $skip };
3397	}	3539	}
3398		3540
3399	sub emergency_save() {	3541	sub emergency_save() {
3400	my $freeze_guard = cf::freeze_mainloop;	3542	my $freeze_guard = cf::freeze_mainloop;
3401		3543
3402	warn "enter emergency perl save\n";	3544	warn "emergency_perl_save: enter\n";
3403		3545
3404	cf::sync_job {	3546	cf::sync_job {
		3547	# this is a trade-off: we want to be very quick here, so
		3548	# save all maps without fsync, and later call a global sync
		3549	# (which in turn might be very very slow)
		3550	local $USE_FSYNC = 0;
		3551
3405	# use a peculiar iteration method to avoid tripping on perl	3552	# use a peculiar iteration method to avoid tripping on perl
3406	# refcount bugs in for. also avoids problems with players	3553	# refcount bugs in for. also avoids problems with players
3407	# and maps saved/destroyed asynchronously.	3554	# and maps saved/destroyed asynchronously.
3408	warn "begin emergency player save\n";	3555	warn "emergency_perl_save: begin player save\n";
3409	for my $login (keys %cf::PLAYER) {	3556	for my $login (keys %cf::PLAYER) {
3410	my $pl = $cf::PLAYER{$login} or next;	3557	my $pl = $cf::PLAYER{$login} or next;
3411	$pl->valid or next;	3558	$pl->valid or next;
3412	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3559	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3413	$pl->save;	3560	$pl->save;
3414	}	3561	}
3415	warn "end emergency player save\n";	3562	warn "emergency_perl_save: end player save\n";
3416		3563
3417	warn "begin emergency map save\n";	3564	warn "emergency_perl_save: begin map save\n";
3418	for my $path (keys %cf::MAP) {	3565	for my $path (keys %cf::MAP) {
3419	my $map = $cf::MAP{$path} or next;	3566	my $map = $cf::MAP{$path} or next;
3420	$map->valid or next;	3567	$map->valid or next;
3421	$map->save;	3568	$map->save;
3422	}	3569	}
3423	warn "end emergency map save\n";	3570	warn "emergency_perl_save: end map save\n";
3424		3571
3425	warn "begin emergency database checkpoint\n";	3572	warn "emergency_perl_save: begin database checkpoint\n";
3426	BDB::db_env_txn_checkpoint $DB_ENV;	3573	BDB::db_env_txn_checkpoint $DB_ENV;
3427	warn "end emergency database checkpoint\n";	3574	warn "emergency_perl_save: end database checkpoint\n";
		3575
		3576	warn "emergency_perl_save: begin write uuid\n";
		3577	write_uuid_sync 1;
		3578	warn "emergency_perl_save: end write uuid\n";
3428	};	3579	};
3429		3580
		3581	warn "emergency_perl_save: starting sync()\n";
		3582	IO::AIO::aio_sync sub {
		3583	warn "emergency_perl_save: finished sync()\n";
		3584	};
		3585
3430	warn "leave emergency perl save\n";	3586	warn "emergency_perl_save: leave\n";
3431	}	3587	}
3432		3588
3433	sub post_cleanup {	3589	sub post_cleanup {
3434	my ($make_core) = @_;	3590	my ($make_core) = @_;
3435		3591
3436	warn Carp::longmess "post_cleanup backtrace"	3592	warn Carp::longmess "post_cleanup backtrace"
3437	if $make_core;	3593	if $make_core;
		3594
		3595	my $fh = pidfile;
		3596	unlink $PIDFILE if <$fh> == $$;
		3597	}
		3598
		3599	# a safer delete_package, copied from Symbol
		3600	sub clear_package($) {
		3601	my $pkg = shift;
		3602
		3603	# expand to full symbol table name if needed
		3604	unless ($pkg =~ /^main::.*::$/) {
		3605	$pkg = "main$pkg" if $pkg =~ /^::/;
		3606	$pkg = "main::$pkg" unless $pkg =~ /^main::/;
		3607	$pkg .= '::' unless $pkg =~ /::$/;
		3608	}
		3609
		3610	my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
		3611	my $stem_symtab = *{$stem}{HASH};
		3612
		3613	defined $stem_symtab and exists $stem_symtab->{$leaf}
		3614	or return;
		3615
		3616	# clear all symbols
		3617	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
		3618	for my $name (keys %$leaf_symtab) {
		3619	_gv_clear *{"$pkg$name"};
		3620	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
		3621	}
		3622	warn "cleared package $pkg\n";#d#
3438	}	3623	}
3439		3624
3440	sub do_reload_perl() {	3625	sub do_reload_perl() {
3441	# can/must only be called in main	3626	# can/must only be called in main
3442	if ($Coro::current != $Coro::main) {	3627	if ($Coro::current != $Coro::main) {
3443	warn "can only reload from main coroutine";	3628	warn "can only reload from main coroutine";
3444	return;	3629	return;
3445	}	3630	}
3446		3631
		3632	return if $RELOAD++;
		3633
		3634	my $t1 = EV::time;
		3635
		3636	while ($RELOAD) {
3447	warn "reloading...";	3637	warn "reloading...";
3448		3638
3449	warn "entering sync_job";	3639	warn "entering sync_job";
3450		3640
3451	cf::sync_job {	3641	cf::sync_job {
3452	cf::write_runtime; # external watchdog should not bark	3642	cf::write_runtime_sync; # external watchdog should not bark
3453	cf::emergency_save;	3643	cf::emergency_save;
3454	cf::write_runtime; # external watchdog should not bark	3644	cf::write_runtime_sync; # external watchdog should not bark
3455		3645
3456	warn "syncing database to disk";	3646	warn "syncing database to disk";
3457	BDB::db_env_txn_checkpoint $DB_ENV;	3647	BDB::db_env_txn_checkpoint $DB_ENV;
3458		3648
3459	# if anything goes wrong in here, we should simply crash as we already saved	3649	# if anything goes wrong in here, we should simply crash as we already saved
3460		3650
3461	warn "flushing outstanding aio requests";	3651	warn "flushing outstanding aio requests";
3462	for (;;) {
3463	BDB::flush;
3464	IO::AIO::flush;
3465	Coro::cede_notself;
3466	last unless IO::AIO::nreqs || BDB::nreqs;	3652	while (IO::AIO::nreqs || BDB::nreqs) {
3467	warn "iterate...";	3653	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3468	}
3469
3470	++$RELOAD;
3471
3472	warn "cancelling all extension coros";
3473	$_->cancel for values %EXT_CORO;
3474	%EXT_CORO = ();
3475
3476	warn "removing commands";
3477	%COMMAND = ();
3478
3479	warn "removing ext/exti commands";
3480	%EXTCMD = ();
3481	%EXTICMD = ();
3482
3483	warn "unloading/nuking all extensions";
3484	for my $pkg (@EXTS) {
3485	warn "... unloading $pkg";
3486
3487	if (my $cb = $pkg->can ("unload")) {
3488	eval {
3489	$cb->($pkg);
3490	1
3491	} or warn "$pkg unloaded, but with errors: $@";
3492	}	3654	}
3493		3655
3494	warn "... nuking $pkg";	3656	warn "cancelling all extension coros";
3495	Symbol::delete_package $pkg;	3657	$_->cancel for values %EXT_CORO;
3496	}	3658	%EXT_CORO = ();
3497		3659
3498	warn "unloading all perl modules loaded from $LIBDIR";	3660	warn "removing commands";
3499	while (my ($k, $v) = each %INC) {	3661	%COMMAND = ();
3500	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3501		3662
		3663	warn "removing ext/exti commands";
		3664	%EXTCMD = ();
		3665	%EXTICMD = ();
		3666
		3667	warn "unloading/nuking all extensions";
		3668	for my $pkg (@EXTS) {
3502	warn "... unloading $k";	3669	warn "... unloading $pkg";
3503	delete $INC{$k};
3504		3670
3505	$k =~ s/\.pm$//;
3506	$k =~ s/\//::/g;
3507
3508	if (my $cb = $k->can ("unload_module")) {	3671	if (my $cb = $pkg->can ("unload")) {
		3672	eval {
3509	$cb->();	3673	$cb->($pkg);
		3674	1
		3675	} or warn "$pkg unloaded, but with errors: $@";
		3676	}
		3677
		3678	warn "... clearing $pkg";
		3679	clear_package $pkg;
3510	}	3680	}
3511		3681
3512	Symbol::delete_package $k;	3682	warn "unloading all perl modules loaded from $LIBDIR";
		3683	while (my ($k, $v) = each %INC) {
		3684	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
		3685
		3686	warn "... unloading $k";
		3687	delete $INC{$k};
		3688
		3689	$k =~ s/\.pm$//;
		3690	$k =~ s/\//::/g;
		3691
		3692	if (my $cb = $k->can ("unload_module")) {
		3693	$cb->();
		3694	}
		3695
		3696	clear_package $k;
3513	}	3697	}
3514		3698
3515	warn "getting rid of safe::, as good as possible";	3699	warn "getting rid of safe::, as good as possible";
3516	Symbol::delete_package "safe::$_"	3700	clear_package "safe::$_"
3517	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	3701	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3518		3702
3519	warn "unloading cf.pm \"a bit\"";	3703	warn "unloading cf.pm \"a bit\"";
3520	delete $INC{"cf.pm"};	3704	delete $INC{"cf.pm"};
3521	delete $INC{"cf/pod.pm"};	3705	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3522		3706
3523	# don't, removes xs symbols, too,	3707	# don't, removes xs symbols, too,
3524	# and global variables created in xs	3708	# and global variables created in xs
3525	#Symbol::delete_package __PACKAGE__;	3709	#clear_package __PACKAGE__;
3526		3710
3527	warn "unload completed, starting to reload now";	3711	warn "unload completed, starting to reload now";
3528		3712
3529	warn "reloading cf.pm";	3713	warn "reloading cf.pm";
3530	require cf;	3714	require cf;
3531	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3715	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3532		3716
3533	warn "loading config and database again";	3717	warn "loading config and database again";
3534	cf::reload_config;	3718	cf::reload_config;
3535		3719
3536	warn "loading extensions";	3720	warn "loading extensions";
3537	cf::load_extensions;	3721	cf::load_extensions;
3538		3722
		3723	if ($REATTACH_ON_RELOAD) {
3539	warn "reattaching attachments to objects/players";	3724	warn "reattaching attachments to objects/players";
3540	_global_reattach; # objects, sockets	3725	_global_reattach; # objects, sockets
3541	warn "reattaching attachments to maps";	3726	warn "reattaching attachments to maps";
3542	reattach $_ for values %MAP;	3727	reattach $_ for values %MAP;
3543	warn "reattaching attachments to players";	3728	warn "reattaching attachments to players";
3544	reattach $_ for values %PLAYER;	3729	reattach $_ for values %PLAYER;
		3730	}
3545		3731
		3732	warn "running post_init jobs";
		3733	(pop @POST_INIT)->(1) while @POST_INIT;
		3734
3546	warn "leaving sync_job";	3735	warn "leaving sync_job";
3547		3736
3548	1	3737	1
3549	} or do {	3738	} or do {
3550	warn $@;	3739	warn $@;
3551	warn "error while reloading, exiting.";	3740	cf::cleanup "error while reloading, exiting.";
3552	exit 1;
3553	};	3741	};
3554		3742
3555	warn "reloaded";	3743	warn "reloaded";
		3744	--$RELOAD;
		3745	}
		3746
		3747	$t1 = EV::time - $t1;
		3748	warn "reload completed in ${t1}s\n";
3556	};	3749	};
3557		3750
3558	our $RELOAD_WATCHER; # used only during reload	3751	our $RELOAD_WATCHER; # used only during reload
3559		3752
3560	sub reload_perl() {	3753	sub reload_perl() {
3561	# doing reload synchronously and two reloads happen back-to-back,	3754	# doing reload synchronously and two reloads happen back-to-back,
3562	# coro crashes during coro_state_free->destroy here.	3755	# coro crashes during coro_state_free->destroy here.
3563		3756
		3757	$RELOAD_WATCHER ||= cf::async {
		3758	Coro::AIO::aio_wait cache_extensions;
		3759
3564	$RELOAD_WATCHER ||= EV::timer 0, 0, sub {	3760	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
		3761	do_reload_perl;
3565	undef $RELOAD_WATCHER;	3762	undef $RELOAD_WATCHER;
3566	do_reload_perl;	3763	};
3567	};	3764	};
3568	}	3765	}
3569		3766
3570	register_command "reload" => sub {	3767	register_command "reload" => sub {
3571	my ($who, $arg) = @_;	3768	my ($who, $arg) = @_;
…		…
3585		3782
3586	our @WAIT_FOR_TICK;	3783	our @WAIT_FOR_TICK;
3587	our @WAIT_FOR_TICK_BEGIN;	3784	our @WAIT_FOR_TICK_BEGIN;
3588		3785
3589	sub wait_for_tick {	3786	sub wait_for_tick {
3590	return unless $TICK_WATCHER->is_active;
3591	return if $Coro::current == $Coro::main;	3787	return if tick_inhibit || $Coro::current == $Coro::main;
3592		3788
3593	my $signal = new Coro::Signal;	3789	my $signal = new Coro::Signal;
3594	push @WAIT_FOR_TICK, $signal;	3790	push @WAIT_FOR_TICK, $signal;
3595	$signal->wait;	3791	$signal->wait;
3596	}	3792	}
3597		3793
3598	sub wait_for_tick_begin {	3794	sub wait_for_tick_begin {
3599	return unless $TICK_WATCHER->is_active;
3600	return if $Coro::current == $Coro::main;	3795	return if tick_inhibit || $Coro::current == $Coro::main;
3601		3796
3602	my $signal = new Coro::Signal;	3797	my $signal = new Coro::Signal;
3603	push @WAIT_FOR_TICK_BEGIN, $signal;	3798	push @WAIT_FOR_TICK_BEGIN, $signal;
3604	$signal->wait;	3799	$signal->wait;
3605	}	3800	}
3606		3801
3607	$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {	3802	sub tick {
3608	if ($Coro::current != $Coro::main) {	3803	if ($Coro::current != $Coro::main) {
3609	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	3804	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3610	unless ++$bug_warning > 10;	3805	unless ++$bug_warning > 10;
3611	return;	3806	return;
3612	}	3807	}
3613		3808
3614	$NOW = $tick_start = EV::now;
3615
3616	cf::server_tick; # one server iteration	3809	cf::server_tick; # one server iteration
3617
3618	$RUNTIME += $TICK;
3619	$NEXT_TICK = $_[0]->at;
3620		3810
3621	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3811	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3622	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	3812	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3623	Coro::async_pool {	3813	Coro::async_pool {
3624	$Coro::current->{desc} = "runtime saver";	3814	$Coro::current->{desc} = "runtime saver";
3625	write_runtime	3815	write_runtime_sync
3626	or warn "ERROR: unable to write runtime file: $!";	3816	or warn "ERROR: unable to write runtime file: $!";
3627	};	3817	};
3628	}	3818	}
3629		3819
3630	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3820	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
…		…
3632	}	3822	}
3633	while (my $sig = shift @WAIT_FOR_TICK) {	3823	while (my $sig = shift @WAIT_FOR_TICK) {
3634	$sig->send;	3824	$sig->send;
3635	}	3825	}
3636		3826
3637	$LOAD = ($NOW - $tick_start) / $TICK;	3827	$LOAD = ($NOW - $TICK_START) / $TICK;
3638	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3828	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3639		3829
3640	_post_tick;	3830	if (0) {
3641	};	3831	if ($NEXT_TICK) {
3642	$TICK_WATCHER->priority (EV::MAXPRI);	3832	my $jitter = $TICK_START - $NEXT_TICK;
		3833	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
		3834	warn "jitter $JITTER\n";#d#
		3835	}
		3836	}
		3837	}
3643		3838
3644	{	3839	{
3645	# configure BDB	3840	# configure BDB
3646		3841
3647	BDB::min_parallel 8;	3842	BDB::min_parallel 8;
3648	BDB::max_poll_reqs $TICK * 0.1;	3843	BDB::max_poll_reqs $TICK * 0.1;
3649	$Coro::BDB::WATCHER->priority (1);	3844	$AnyEvent::BDB::WATCHER->priority (1);
3650		3845
3651	unless ($DB_ENV) {	3846	unless ($DB_ENV) {
3652	$DB_ENV = BDB::db_env_create;	3847	$DB_ENV = BDB::db_env_create;
3653	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC	3848	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3654	| BDB::LOG_AUTOREMOVE, 1);	3849	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
		3850	$DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3655	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);	3851	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3656	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);	3852	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3657		3853
3658	cf::sync_job {	3854	cf::sync_job {
3659	eval {	3855	eval {
…		…
3685	{	3881	{
3686	# configure IO::AIO	3882	# configure IO::AIO
3687		3883
3688	IO::AIO::min_parallel 8;	3884	IO::AIO::min_parallel 8;
3689	IO::AIO::max_poll_time $TICK * 0.1;	3885	IO::AIO::max_poll_time $TICK * 0.1;
3690	$Coro::AIO::WATCHER->priority (1);	3886	undef $AnyEvent::AIO::WATCHER;
3691	}	3887	}
3692		3888
3693	my $_log_backtrace;	3889	my $_log_backtrace;
3694		3890
3695	sub _log_backtrace {	3891	sub _log_backtrace {
…		…
3698	$msg =~ s/\n//;	3894	$msg =~ s/\n//;
3699		3895
3700	# limit the # of concurrent backtraces	3896	# limit the # of concurrent backtraces
3701	if ($_log_backtrace < 2) {	3897	if ($_log_backtrace < 2) {
3702	++$_log_backtrace;	3898	++$_log_backtrace;
		3899	my $perl_bt = Carp::longmess $msg;
3703	async {	3900	async {
3704	$Coro::current->{desc} = "abt $msg";	3901	$Coro::current->{desc} = "abt $msg";
3705		3902
3706	my @bt = fork_call {	3903	my @bt = fork_call {
3707	@addr = map { sprintf "%x", $_ } @addr;	3904	@addr = map { sprintf "%x", $_ } @addr;
…		…
3718	}	3915	}
3719		3916
3720	@funcs	3917	@funcs
3721	};	3918	};
3722		3919
3723	LOG llevInfo, "[ABT] $msg\n";	3920	LOG llevInfo, "[ABT] $perl_bt\n";
		3921	LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3724	LOG llevInfo, "[ABT] $_\n" for @bt;	3922	LOG llevInfo, "[ABT] $_\n" for @bt;
3725	--$_log_backtrace;	3923	--$_log_backtrace;
3726	};	3924	};
3727	} else {	3925	} else {
3728	LOG llevInfo, "[ABT] $msg\n";	3926	LOG llevInfo, "[ABT] $msg\n";
3729	LOG llevInfo, "[ABT] [suppressed]\n";	3927	LOG llevInfo, "[ABT] [suppressed]\n";
3730	}	3928	}
3731	}	3929	}
3732		3930
3733	# load additional modules	3931	# load additional modules
3734	use cf::pod;	3932	require "cf/$_.pm" for @EXTRA_MODULES;
3735		3933
3736	END { cf::emergency_save }	3934	END { cf::emergency_save }
3737		3935
3738	1	3936	1
3739		3937

Diff Legend

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