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.391 by root, Fri Oct 26 04:22:05 2007 UTC vs.
Revision 1.449 by root, Sat Sep 20 00:09:27 2008 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 "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 Event;	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
15	use Coro 4.1 ();	37	use Coro ();
16	use Coro::State;	38	use Coro::State;
17	use Coro::Handle;	39	use Coro::Handle;
		40	use Coro::EV;
18	use Coro::Event;	41	use Coro::AnyEvent;
19	use Coro::Timer;	42	use Coro::Timer;
20	use Coro::Signal;	43	use Coro::Signal;
21	use Coro::Semaphore;	44	use Coro::Semaphore;
		45	use Coro::AnyEvent;
22	use Coro::AIO;	46	use Coro::AIO;
		47	use Coro::BDB 1.6;
23	use Coro::Storable;	48	use Coro::Storable;
24	use Coro::Util ();	49	use Coro::Util ();
25		50
26	use JSON::XS ();	51	use JSON::XS 2.01 ();
27	use BDB ();	52	use BDB ();
28	use Data::Dumper;	53	use Data::Dumper;
29	use Digest::MD5;	54	use Digest::MD5;
30	use Fcntl;	55	use Fcntl;
31	use YAML::Syck ();	56	use YAML ();
32	use IO::AIO 2.51 ();	57	use IO::AIO ();
33	use Time::HiRes;	58	use Time::HiRes;
34	use Compress::LZF;	59	use Compress::LZF;
35	use Digest::MD5 ();	60	use Digest::MD5 ();
		61
		62	AnyEvent::detect;
36		63
37	# configure various modules to our taste	64	# configure various modules to our taste
38	#	65	#
39	$Storable::canonical = 1; # reduce rsync transfers	66	$Storable::canonical = 1; # reduce rsync transfers
40	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator	67	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
		68
		69	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
		70
		71	# make sure c-lzf reinitialises itself
		72	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	73	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42
43	$Event::Eval = 1; # no idea why this is required, but it is
44
45	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46	$YAML::Syck::ImplicitUnicode = 1;
47
48	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49		74
50	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	75	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51		76
52	our %COMMAND = ();	77	our %COMMAND = ();
53	our %COMMAND_TIME = ();	78	our %COMMAND_TIME = ();
…		…
59	our %EXT_MAP = (); # pluggable maps	84	our %EXT_MAP = (); # pluggable maps
60		85
61	our $RELOAD; # number of reloads so far	86	our $RELOAD; # number of reloads so far
62	our @EVENT;	87	our @EVENT;
63		88
64	our $CONFDIR = confdir;	89	our $CONFDIR = confdir;
65	our $DATADIR = datadir;	90	our $DATADIR = datadir;
66	our $LIBDIR = "$DATADIR/ext";	91	our $LIBDIR = "$DATADIR/ext";
67	our $PODDIR = "$DATADIR/pod";	92	our $PODDIR = "$DATADIR/pod";
68	our $MAPDIR = "$DATADIR/" . mapdir;	93	our $MAPDIR = "$DATADIR/" . mapdir;
69	our $LOCALDIR = localdir;	94	our $LOCALDIR = localdir;
70	our $TMPDIR = "$LOCALDIR/" . tmpdir;	95	our $TMPDIR = "$LOCALDIR/" . tmpdir;
71	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	96	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	97	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73	our $RANDOMDIR = "$LOCALDIR/random";	98	our $RANDOMDIR = "$LOCALDIR/random";
74	our $BDBDIR = "$LOCALDIR/db";	99	our $BDBDIR = "$LOCALDIR/db";
		100	our $PIDFILE = "$LOCALDIR/pid";
		101	our $RUNTIMEFILE = "$LOCALDIR/runtime";
		102
		103	our %RESOURCE;
75		104
76	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	105	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	106	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80	our $NEXT_TICK;	107	our $NEXT_TICK;
81	our $NOW;
82	our $USE_FSYNC = 1; # use fsync to write maps - default off	108	our $USE_FSYNC = 1; # use fsync to write maps - default off
83		109
84	our $BDB_POLL_WATCHER;
85	our $BDB_DEADLOCK_WATCHER;	110	our $BDB_DEADLOCK_WATCHER;
86	our $BDB_CHECKPOINT_WATCHER;	111	our $BDB_CHECKPOINT_WATCHER;
87	our $BDB_TRICKLE_WATCHER;	112	our $BDB_TRICKLE_WATCHER;
88	our $DB_ENV;	113	our $DB_ENV;
89		114
90	our %CFG;	115	our %CFG;
91		116
92	our $UPTIME; $UPTIME ||= time;	117	our $UPTIME; $UPTIME ||= time;
93	our $RUNTIME;	118	our $RUNTIME;
		119	our $NOW;
94		120
95	our (%PLAYER, %PLAYER_LOADING); # all users	121	our (%PLAYER, %PLAYER_LOADING); # all users
96	our (%MAP, %MAP_LOADING ); # all maps	122	our (%MAP, %MAP_LOADING ); # all maps
97	our $LINK_MAP; # the special {link} map, which is always available	123	our $LINK_MAP; # the special {link} map, which is always available
98		124
99	# used to convert map paths into valid unix filenames by replacing / by ∕	125	# used to convert map paths into valid unix filenames by replacing / by ∕
100	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	126	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101		127
102	our $LOAD; # a number between 0 (idle) and 1 (too many objects)	128	our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103	our $LOADAVG; # same thing, but with alpha-smoothing	129	our $LOADAVG; # same thing, but with alpha-smoothing
		130	our $JITTER; # average jitter
104	our $tick_start; # for load detecting purposes	131	our $TICK_START; # for load detecting purposes
105		132
106	binmode STDOUT;	133	binmode STDOUT;
107	binmode STDERR;	134	binmode STDERR;
108		135
109	# read virtual server time, if available	136	# read virtual server time, if available
110	unless ($RUNTIME || !-e "$LOCALDIR/runtime") {	137	unless ($RUNTIME || !-e $RUNTIMEFILE) {
111	open my $fh, "<", "$LOCALDIR/runtime"	138	open my $fh, "<", $RUNTIMEFILE
112	or die "unable to read runtime file: $!";	139	or die "unable to read $RUNTIMEFILE file: $!";
113	$RUNTIME = <$fh> + 0.;	140	$RUNTIME = <$fh> + 0.;
114	}	141	}
115		142
116	mkdir $_	143	mkdir $_
117	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;	144	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
…		…
162		189
163	The raw value load value from the last tick.	190	The raw value load value from the last tick.
164		191
165	=item %cf::CFG	192	=item %cf::CFG
166		193
167	Configuration for the server, loaded from C</etc/crossfire/config>, or	194	Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168	from wherever your confdir points to.	195	from wherever your confdir points to.
169		196
170	=item cf::wait_for_tick, cf::wait_for_tick_begin	197	=item cf::wait_for_tick, cf::wait_for_tick_begin
171		198
172	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	199	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
…		…
193	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	220	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194		221
195	LOG llevError, $msg;	222	LOG llevError, $msg;
196	};	223	};
197	}	224	}
		225
		226	$Coro::State::DIEHOOK = sub {
		227	return unless $^S eq 0; # "eq", not "=="
		228
		229	if ($Coro::current == $Coro::main) {#d#
		230	warn "DIEHOOK called in main context, Coro bug?\n";#d#
		231	return;#d#
		232	}#d#
		233
		234	# kill coroutine otherwise
		235	warn Carp::longmess $_[0];
		236	Coro::terminate
		237	};
		238
		239	$SIG{__DIE__} = sub { }; #d#?
198		240
199	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	241	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	242	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	243	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	244	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
…		…
209	for my $pkg (qw(	251	for my $pkg (qw(
210	cf::global cf::attachable	252	cf::global cf::attachable
211	cf::object cf::object::player	253	cf::object cf::object::player
212	cf::client cf::player	254	cf::client cf::player
213	cf::arch cf::living	255	cf::arch cf::living
		256	cf::map cf::mapspace
214	cf::map cf::party cf::region	257	cf::party cf::region
215	)) {	258	)) {
216	no strict 'refs';
217	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	259	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218	}	260	}
219		261
220	$Event::DIED = sub {	262	$EV::DIED = sub {
221	warn "error in event callback: @_";	263	warn "error in event callback: @_";
222	};	264	};
223		265
224	#############################################################################	266	#############################################################################
225		267
…		…
248	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	290	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249	$d	291	$d
250	} || "[unable to dump $_[0]: '$@']";	292	} || "[unable to dump $_[0]: '$@']";
251	}	293	}
252		294
253	=item $ref = cf::from_json $json	295	=item $ref = cf::decode_json $json
254		296
255	Converts a JSON string into the corresponding perl data structure.	297	Converts a JSON string into the corresponding perl data structure.
256		298
257	=item $json = cf::to_json $ref	299	=item $json = cf::encode_json $ref
258		300
259	Converts a perl data structure into its JSON representation.	301	Converts a perl data structure into its JSON representation.
260		302
261	=cut	303	=cut
262		304
263	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	305	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264		306
265	sub to_json ($) { $json_coder->encode ($_[0]) }	307	sub encode_json($) { $json_coder->encode ($_[0]) }
266	sub from_json ($) { $json_coder->decode ($_[0]) }	308	sub decode_json($) { $json_coder->decode ($_[0]) }
267		309
268	=item cf::lock_wait $string	310	=item cf::lock_wait $string
269		311
270	Wait until the given lock is available. See cf::lock_acquire.	312	Wait until the given lock is available. See cf::lock_acquire.
271		313
…		…
327		369
328	! ! $LOCK{$key}	370	! ! $LOCK{$key}
329	}	371	}
330		372
331	sub freeze_mainloop {	373	sub freeze_mainloop {
332	return unless $TICK_WATCHER->is_active;	374	tick_inhibit_inc;
333		375
334	my $guard = Coro::guard {	376	Coro::guard \&tick_inhibit_dec;
335	$TICK_WATCHER->start;	377	}
336	};	378
337	$TICK_WATCHER->stop;	379	=item cf::periodic $interval, $cb
338	$guard	380
		381	Like EV::periodic, but randomly selects a starting point so that the actions
		382	get spread over timer.
		383
		384	=cut
		385
		386	sub periodic($$) {
		387	my ($interval, $cb) = @_;
		388
		389	my $start = rand List::Util::min 180, $interval;
		390
		391	EV::periodic $start, $interval, 0, $cb
339	}	392	}
340		393
341	=item cf::get_slot $time[, $priority[, $name]]	394	=item cf::get_slot $time[, $priority[, $name]]
342		395
343	Allocate $time seconds of blocking CPU time at priority C<$priority>:	396	Allocate $time seconds of blocking CPU time at priority C<$priority>:
…		…
383	}	436	}
384	}	437	}
385	};	438	};
386		439
387	sub get_slot($;$$) {	440	sub get_slot($;$$) {
		441	return if tick_inhibit || $Coro::current == $Coro::main;
		442
388	my ($time, $pri, $name) = @_;	443	my ($time, $pri, $name) = @_;
389		444
390	$time = $TICK * .6 if $time > $TICK * .6;	445	$time = $TICK * .6 if $time > $TICK * .6;
391	my $sig = new Coro::Signal;	446	my $sig = new Coro::Signal;
392		447
…		…
406		461
407	BEGIN { *async = \&Coro::async_pool }	462	BEGIN { *async = \&Coro::async_pool }
408		463
409	=item cf::sync_job { BLOCK }	464	=item cf::sync_job { BLOCK }
410		465
411	The design of Crossfire TRT requires that the main coroutine ($Coro::main)	466	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	467	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	468	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414	acceptable.	469	acceptable.
415		470
416	If it must be done, put the blocking parts into C<sync_job>. This will run	471	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	472	the given BLOCK in another coroutine while waiting for the result. The
…		…
422		477
423	sub sync_job(&) {	478	sub sync_job(&) {
424	my ($job) = @_;	479	my ($job) = @_;
425		480
426	if ($Coro::current == $Coro::main) {	481	if ($Coro::current == $Coro::main) {
427	my $time = Event::time;	482	my $time = EV::time;
428		483
429	# this is the main coro, too bad, we have to block	484	# this is the main coro, too bad, we have to block
430	# till the operation succeeds, freezing the server :/	485	# till the operation succeeds, freezing the server :/
431		486
432	LOG llevError, Carp::longmess "sync job";#d#	487	LOG llevError, Carp::longmess "sync job";#d#
433		488
434	# TODO: use suspend/resume instead
435	# (but this is cancel-safe)
436	my $freeze_guard = freeze_mainloop;	489	my $freeze_guard = freeze_mainloop;
437		490
438	my $busy = 1;	491	my $busy = 1;
439	my @res;	492	my @res;
440		493
…		…
447		500
448	while ($busy) {	501	while ($busy) {
449	if (Coro::nready) {	502	if (Coro::nready) {
450	Coro::cede_notself;	503	Coro::cede_notself;
451	} else {	504	} else {
452	Event::one_event;	505	EV::loop EV::LOOP_ONESHOT;
453	}	506	}
454	}	507	}
455		508
456	$time = Event::time - $time;	509	my $time = EV::time - $time;
457		510
458	LOG llevError | logBacktrace, Carp::longmess "long sync job"
459	if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
460
461	$tick_start += $time; # do not account sync jobs to server load	511	$TICK_START += $time; # do not account sync jobs to server load
462		512
463	wantarray ? @res : $res[0]	513	wantarray ? @res : $res[0]
464	} else {	514	} else {
465	# we are in another coroutine, how wonderful, everything just works	515	# we are in another coroutine, how wonderful, everything just works
466		516
…		…
491	=item fork_call { }, $args	541	=item fork_call { }, $args
492		542
493	Executes the given code block with the given arguments in a seperate	543	Executes the given code block with the given arguments in a seperate
494	process, returning the results. Everything must be serialisable with	544	process, returning the results. Everything must be serialisable with
495	Coro::Storable. May, of course, block. Note that the executed sub may	545	Coro::Storable. May, of course, block. Note that the executed sub may
496	never block itself or use any form of Event handling.	546	never block itself or use any form of event handling.
497		547
498	=cut	548	=cut
499		549
500	sub fork_call(&@) {	550	sub fork_call(&@) {
501	my ($cb, @args) = @_;	551	my ($cb, @args) = @_;
…		…
508	reset_signals;	558	reset_signals;
509	&$cb	559	&$cb
510	}, @args;	560	}, @args;
511		561
512	wantarray ? @res : $res[-1]	562	wantarray ? @res : $res[-1]
		563	}
		564
		565	=item $coin = coin_from_name $name
		566
		567	=cut
		568
		569	our %coin_alias = (
		570	"silver" => "silvercoin",
		571	"silvercoin" => "silvercoin",
		572	"silvercoins" => "silvercoin",
		573	"gold" => "goldcoin",
		574	"goldcoin" => "goldcoin",
		575	"goldcoins" => "goldcoin",
		576	"platinum" => "platinacoin",
		577	"platinumcoin" => "platinacoin",
		578	"platinumcoins" => "platinacoin",
		579	"platina" => "platinacoin",
		580	"platinacoin" => "platinacoin",
		581	"platinacoins" => "platinacoin",
		582	"royalty" => "royalty",
		583	"royalties" => "royalty",
		584	);
		585
		586	sub coin_from_name($) {
		587	$coin_alias{$_[0]}
		588	? cf::arch::find $coin_alias{$_[0]}
		589	: undef
513	}	590	}
514		591
515	=item $value = cf::db_get $family => $key	592	=item $value = cf::db_get $family => $key
516		593
517	Returns a single value from the environment database.	594	Returns a single value from the environment database.
…		…
656		733
657	#############################################################################	734	#############################################################################
658		735
659	=head2 ATTACHABLE OBJECTS	736	=head2 ATTACHABLE OBJECTS
660		737
661	Many objects in crossfire are so-called attachable objects. That means you can	738	Many objects in deliantra are so-called attachable objects. That means you can
662	attach callbacks/event handlers (a collection of which is called an "attachment")	739	attach callbacks/event handlers (a collection of which is called an "attachment")
663	to it. All such attachable objects support the following methods.	740	to it. All such attachable objects support the following methods.
664		741
665	In the following description, CLASS can be any of C<global>, C<object>	742	In the following description, CLASS can be any of C<global>, C<object>
666	C<player>, C<client> or C<map> (i.e. the attachable objects in	743	C<player>, C<client> or C<map> (i.e. the attachable objects in
667	Crossfire TRT).	744	Deliantra).
668		745
669	=over 4	746	=over 4
670		747
671	=item $attachable->attach ($attachment, key => $value...)	748	=item $attachable->attach ($attachment, key => $value...)
672		749
…		…
716	=item cf::CLASS::attachment $name, ...	793	=item cf::CLASS::attachment $name, ...
717		794
718	Register an attachment by C<$name> through which attachable objects of the	795	Register an attachment by C<$name> through which attachable objects of the
719	given CLASS can refer to this attachment.	796	given CLASS can refer to this attachment.
720		797
721	Some classes such as crossfire maps and objects can specify attachments	798	Some classes such as deliantra maps and objects can specify attachments
722	that are attached at load/instantiate time, thus the need for a name.	799	that are attached at load/instantiate time, thus the need for a name.
723		800
724	These calls expect any number of the following handler/hook descriptions:	801	These calls expect any number of the following handler/hook descriptions:
725		802
726	=over 4	803	=over 4
…		…
954	}	1031	}
955		1032
956	0	1033	0
957	}	1034	}
958		1035
959	=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...)	1036	=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
960		1037
961	=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)	1038	=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
962		1039
963	Generate an object-specific event with the given arguments.	1040	Generate an object-specific event with the given arguments.
964		1041
…		…
1017		1094
1018	sub reattach {	1095	sub reattach {
1019	# basically do the same as instantiate, without calling instantiate	1096	# basically do the same as instantiate, without calling instantiate
1020	my ($obj) = @_;	1097	my ($obj) = @_;
1021		1098
		1099	# no longer needed after getting rid of delete_package?
1022	bless $obj, ref $obj; # re-bless in case extensions have been reloaded	1100	#bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1023		1101
1024	my $registry = $obj->registry;	1102	my $registry = $obj->registry;
1025		1103
1026	@$registry = ();	1104	@$registry = ();
1027		1105
…		…
1042	cf::attachable->attach (	1120	cf::attachable->attach (
1043	prio => -1000000,	1121	prio => -1000000,
1044	on_instantiate => sub {	1122	on_instantiate => sub {
1045	my ($obj, $data) = @_;	1123	my ($obj, $data) = @_;
1046		1124
1047	$data = from_json $data;	1125	$data = decode_json $data;
1048		1126
1049	for (@$data) {	1127	for (@$data) {
1050	my ($name, $args) = @$_;	1128	my ($name, $args) = @$_;
1051		1129
1052	$obj->attach ($name, %{$args || {} });	1130	$obj->attach ($name, %{$args || {} });
…		…
1073	utf8::decode (my $decname = $filename);	1151	utf8::decode (my $decname = $filename);
1074	warn sprintf "saving %s (%d,%d)\n",	1152	warn sprintf "saving %s (%d,%d)\n",
1075	$decname, length $$rdata, scalar @$objs;	1153	$decname, length $$rdata, scalar @$objs;
1076		1154
1077	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1155	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1078	chmod SAVE_MODE, $fh;	1156	aio_chmod $fh, SAVE_MODE;
1079	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1157	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1080	aio_fsync $fh if $cf::USE_FSYNC;	1158	aio_fsync $fh if $cf::USE_FSYNC;
1081	close $fh;	1159	aio_close $fh;
1082		1160
1083	if (@$objs) {	1161	if (@$objs) {
1084	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {	1162	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1085	chmod SAVE_MODE, $fh;	1163	aio_chmod $fh, SAVE_MODE;
1086	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };	1164	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1087	aio_write $fh, 0, (length $data), $data, 0;	1165	aio_write $fh, 0, (length $data), $data, 0;
1088	aio_fsync $fh if $cf::USE_FSYNC;	1166	aio_fsync $fh if $cf::USE_FSYNC;
1089	close $fh;	1167	aio_close $fh;
1090	aio_rename "$filename.pst~", "$filename.pst";	1168	aio_rename "$filename.pst~", "$filename.pst";
1091	}	1169	}
1092	} else {	1170	} else {
1093	aio_unlink "$filename.pst";	1171	aio_unlink "$filename.pst";
1094	}	1172	}
…		…
1263		1341
1264	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1342	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1265	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1343	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1266		1344
1267	$ext{source} =	1345	$ext{source} =
1268	"package $pkg; use strict; use utf8;\n"	1346	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1269	. "#line 1 \"$path\"\n{\n"	1347	. "#line 1 \"$path\"\n{\n"
1270	. $source	1348	. $source
1271	. "\n};\n1";	1349	. "\n};\n1";
1272		1350
1273	$todo{$base} = \%ext;	1351	$todo{$base} = \%ext;
…		…
1289	my $msg = $@ ? "$v->{path}: $@\n"	1367	my $msg = $@ ? "$v->{path}: $@\n"
1290	: "$v->{base}: extension inactive.\n";	1368	: "$v->{base}: extension inactive.\n";
1291		1369
1292	if (exists $v->{meta}{mandatory}) {	1370	if (exists $v->{meta}{mandatory}) {
1293	warn $msg;	1371	warn $msg;
1294	warn "mandatory extension failed to load, exiting.\n";	1372	cf::cleanup "mandatory extension failed to load, exiting.";
1295	exit 1;
1296	}	1373	}
1297		1374
1298	warn $msg;	1375	warn $msg;
1299	}	1376	}
1300		1377
…		…
1314		1391
1315	=back	1392	=back
1316		1393
1317	=head2 CORE EXTENSIONS	1394	=head2 CORE EXTENSIONS
1318		1395
1319	Functions and methods that extend core crossfire objects.	1396	Functions and methods that extend core deliantra objects.
1320		1397
1321	=cut	1398	=cut
1322		1399
1323	package cf::player;	1400	package cf::player;
1324		1401
…		…
1389	my $f = new_from_file cf::object::thawer path $login	1466	my $f = new_from_file cf::object::thawer path $login
1390	or return;	1467	or return;
1391		1468
1392	my $pl = cf::player::load_pl $f	1469	my $pl = cf::player::load_pl $f
1393	or return;	1470	or return;
		1471
1394	local $cf::PLAYER_LOADING{$login} = $pl;	1472	local $cf::PLAYER_LOADING{$login} = $pl;
1395	$f->resolve_delayed_derefs;	1473	$f->resolve_delayed_derefs;
1396	$cf::PLAYER{$login} = $pl	1474	$cf::PLAYER{$login} = $pl
1397	}	1475	}
1398	}	1476	}
…		…
1408		1486
1409	return if $pl->{deny_save};	1487	return if $pl->{deny_save};
1410		1488
1411	aio_mkdir playerdir $pl, 0770;	1489	aio_mkdir playerdir $pl, 0770;
1412	$pl->{last_save} = $cf::RUNTIME;	1490	$pl->{last_save} = $cf::RUNTIME;
		1491
		1492	cf::get_slot 0.01;
1413		1493
1414	$pl->save_pl ($path);	1494	$pl->save_pl ($path);
1415	cf::cede_to_tick;	1495	cf::cede_to_tick;
1416	}	1496	}
1417		1497
…		…
1449	my ($pl) = @_;	1529	my ($pl) = @_;
1450		1530
1451	my $name = $pl->ob->name;	1531	my $name = $pl->ob->name;
1452		1532
1453	$pl->{deny_save} = 1;	1533	$pl->{deny_save} = 1;
1454	$pl->password ("*"); # this should lock out the player until we nuked the dir	1534	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1455		1535
1456	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1536	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1457	$pl->deactivate;	1537	$pl->deactivate;
		1538	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
		1539	$pl->ob->check_score;
1458	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1540	$pl->invoke (cf::EVENT_PLAYER_QUIT);
1459	$pl->ns->destroy if $pl->ns;	1541	$pl->ns->destroy if $pl->ns;
1460		1542
1461	my $path = playerdir $pl;	1543	my $path = playerdir $pl;
1462	my $temp = "$path~$cf::RUNTIME~deleting~";	1544	my $temp = "$path~$cf::RUNTIME~deleting~";
…		…
1501		1583
1502	for my $login (@$dirs) {	1584	for my $login (@$dirs) {
1503	my $path = path $login;	1585	my $path = path $login;
1504		1586
1505	# a .pst is a dead give-away for a valid player	1587	# a .pst is a dead give-away for a valid player
1506	unless (-e "$path.pst") {	1588	# if no pst file found, open and chekc for blocked users
		1589	if (aio_stat "$path.pst") {
1507	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;	1590	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1508	aio_read $fh, 0, 512, my $buf, 0 or next;	1591	aio_read $fh, 0, 512, my $buf, 0 or next;
1509	$buf !~ /^password -------------$/m or next; # official not-valid tag	1592	$buf !~ /^password -------------$/m or next; # official not-valid tag
1510	}	1593	}
1511		1594
…		…
1542	}	1625	}
1543		1626
1544	\@paths	1627	\@paths
1545	}	1628	}
1546		1629
1547	=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)	1630	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1548		1631
1549	Expand crossfire pod fragments into protocol xml.	1632	Expand deliantra pod fragments into protocol xml.
1550
1551	=cut
1552
1553	use re 'eval';
1554
1555	my $group;
1556	my $interior; $interior = qr{
1557	(?:
1558	\ (.*?)\ (?{ $group = $^N })
1559	| < (??{$interior}) >
1560	)
1561	}x;
1562
1563	sub expand_cfpod {
1564	my ($self, $pod) = @_;
1565
1566	my $xml;
1567
1568	while () {
1569	if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?=[^<]) )+ )/xgcs) {
1570	$group = $1;
1571
1572	$group =~ s/&/&amp;/g;
1573	$group =~ s/</&lt;/g;
1574
1575	$xml .= $group;
1576	} elsif ($pod =~ m%\G
1577	([BCGHITU])
1578	<
1579	(?:
1580	([^<>]*) (?{ $group = $^N })
1581	| < $interior >
1582	)
1583	>
1584	%gcsx
1585	) {
1586	my ($code, $data) = ($1, $group);
1587
1588	if ($code eq "B") {
1589	$xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1590	} elsif ($code eq "I") {
1591	$xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1592	} elsif ($code eq "U") {
1593	$xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1594	} elsif ($code eq "C") {
1595	$xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1596	} elsif ($code eq "T") {
1597	$xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1598	} elsif ($code eq "G") {
1599	my ($male, $female) = split /\|/, $data;
1600	$data = $self->gender ? $female : $male;
1601	$xml .= expand_cfpod ($self, $data);
1602	} elsif ($code eq "H") {
1603	$xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1604	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1605	"")
1606	[$self->{hintmode}];
1607	} else {
1608	$xml .= "error processing '$code($data)' directive";
1609	}
1610	} else {
1611	if ($pod =~ /\G(.+)/) {
1612	warn "parse error while expanding $pod (at $1)";
1613	}
1614	last;
1615	}
1616	}
1617
1618	for ($xml) {
1619	# create single paragraphs (very hackish)
1620	s/(?<=\S)\n(?=\w)/ /g;
1621
1622	# compress some whitespace
1623	s/\s+\n/\n/g; # ws line-ends
1624	s/\n\n+/\n/g; # double lines
1625	s/^\n+//; # beginning lines
1626	s/\n+$//; # ending lines
1627	}
1628
1629	$xml
1630	}
1631
1632	sub hintmode {
1633	$_[0]{hintmode} = $_[1] if @_ > 1;
1634	$_[0]{hintmode}
1635	}
1636		1633
1637	=item $player->ext_reply ($msgid, @msg)	1634	=item $player->ext_reply ($msgid, @msg)
1638		1635
1639	Sends an ext reply to the player.	1636	Sends an ext reply to the player.
1640		1637
…		…
1707	our $MAX_RESET = 3600;	1704	our $MAX_RESET = 3600;
1708	our $DEFAULT_RESET = 3000;	1705	our $DEFAULT_RESET = 3000;
1709		1706
1710	sub generate_random_map {	1707	sub generate_random_map {
1711	my ($self, $rmp) = @_;	1708	my ($self, $rmp) = @_;
		1709
		1710	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
		1711
1712	# mit "rum" bekleckern, nicht	1712	# mit "rum" bekleckern, nicht
1713	$self->_create_random_map (	1713	$self->_create_random_map (
1714	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},	1714	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1715	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},	1715	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1716	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},	1716	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
…		…
1838		1838
1839	# the temporary/swap location	1839	# the temporary/swap location
1840	sub save_path {	1840	sub save_path {
1841	my ($self) = @_;	1841	my ($self) = @_;
1842		1842
1843	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1843	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1844	"$TMPDIR/$path.map"	1844	"$TMPDIR/$path.map"
1845	}	1845	}
1846		1846
1847	# the unique path, undef == no special unique path	1847	# the unique path, undef == no special unique path
1848	sub uniq_path {	1848	sub uniq_path {
1849	my ($self) = @_;	1849	my ($self) = @_;
1850		1850
1851	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1851	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1852	"$UNIQUEDIR/$path"	1852	"$UNIQUEDIR/$path"
1853	}	1853	}
1854		1854
1855	# and all this just because we cannot iterate over	1855	# and all this just because we cannot iterate over
1856	# all maps in C++...	1856	# all maps in C++...
…		…
1954		1954
1955	cf::lock_wait "map_data:$path";#d#remove	1955	cf::lock_wait "map_data:$path";#d#remove
1956	cf::lock_wait "map_find:$path";	1956	cf::lock_wait "map_find:$path";
1957		1957
1958	$cf::MAP{$path} || do {	1958	$cf::MAP{$path} || do {
1959	my $guard1 = cf::lock_acquire "map_find:$path";
1960	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it	1959	my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1960	my $guard2 = cf::lock_acquire "map_find:$path";
1961		1961
1962	my $map = new_from_path cf::map $path	1962	my $map = new_from_path cf::map $path
1963	or return;	1963	or return;
1964		1964
1965	$map->{last_save} = $cf::RUNTIME;	1965	$map->{last_save} = $cf::RUNTIME;
…		…
1968	or return;	1968	or return;
1969		1969
1970	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1970	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1971	# doing this can freeze the server in a sync job, obviously	1971	# doing this can freeze the server in a sync job, obviously
1972	#$cf::WAIT_FOR_TICK->wait;	1972	#$cf::WAIT_FOR_TICK->wait;
		1973	undef $guard2;
1973	undef $guard1;	1974	undef $guard1;
1974	undef $guard2;
1975	$map->reset;	1975	$map->reset;
1976	return find $path;	1976	return find $path;
1977	}	1977	}
1978		1978
1979	$cf::MAP{$path} = $map	1979	$cf::MAP{$path} = $map
…		…
2006	my $f = new_from_file cf::object::thawer $self->{load_path};	2006	my $f = new_from_file cf::object::thawer $self->{load_path};
2007	$f->skip_block;	2007	$f->skip_block;
2008	$self->_load_objects ($f)	2008	$self->_load_objects ($f)
2009	or return;	2009	or return;
2010		2010
2011	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	2011	$self->post_load_original
2012	if delete $self->{load_original};	2012	if delete $self->{load_original};
2013		2013
2014	if (my $uniq = $self->uniq_path) {	2014	if (my $uniq = $self->uniq_path) {
2015	utf8::encode $uniq;	2015	utf8::encode $uniq;
2016	unless (aio_stat $uniq) {	2016	unless (aio_stat $uniq) {
…		…
2042	}	2042	}
2043		2043
2044	$self->{last_save} = $cf::RUNTIME;	2044	$self->{last_save} = $cf::RUNTIME;
2045	$self->last_access ($cf::RUNTIME);	2045	$self->last_access ($cf::RUNTIME);
2046		2046
2047	$self->in_memory (cf::MAP_IN_MEMORY);	2047	$self->in_memory (cf::MAP_ACTIVE);
2048	}	2048	}
2049		2049
2050	$self->post_load;	2050	$self->post_load;
2051	}	2051	}
2052		2052
…		…
2110	my ($path, $origin, $load) = @_;	2110	my ($path, $origin, $load) = @_;
2111		2111
2112	$path = normalise $path, $origin && $origin->{path};	2112	$path = normalise $path, $origin && $origin->{path};
2113		2113
2114	if (my $map = $cf::MAP{$path}) {	2114	if (my $map = $cf::MAP{$path}) {
2115	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;	2115	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2116	}	2116	}
2117		2117
2118	$MAP_PREFETCH{$path} |= $load;	2118	$MAP_PREFETCH{$path} |= $load;
2119		2119
2120	$MAP_PREFETCHER ||= cf::async {	2120	$MAP_PREFETCHER ||= cf::async {
…		…
2157	cf::async {	2157	cf::async {
2158	$Coro::current->{desc} = "map player save";	2158	$Coro::current->{desc} = "map player save";
2159	$_->contr->save for $self->players;	2159	$_->contr->save for $self->players;
2160	};	2160	};
2161		2161
		2162	cf::get_slot 0.02;
		2163
2162	if ($uniq) {	2164	if ($uniq) {
2163	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);	2165	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2164	$self->_save_objects ($uniq, cf::IO_UNIQUES);	2166	$self->_save_objects ($uniq, cf::IO_UNIQUES);
2165	} else {	2167	} else {
2166	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);	2168	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
…		…
2174	$self->save;	2176	$self->save;
2175		2177
2176	my $lock = cf::lock_acquire "map_data:$self->{path}";	2178	my $lock = cf::lock_acquire "map_data:$self->{path}";
2177		2179
2178	return if $self->players;	2180	return if $self->players;
2179	return if $self->in_memory != cf::MAP_IN_MEMORY;	2181	return if $self->in_memory != cf::MAP_ACTIVE;
2180	return if $self->{deny_save};	2182	return if $self->{deny_save};
2181		2183
2182	$self->in_memory (cf::MAP_SWAPPED);	2184	$self->in_memory (cf::MAP_SWAPPED);
2183		2185
2184	$self->deactivate;	2186	$self->deactivate;
…		…
2302		2304
2303	sub unique_maps() {	2305	sub unique_maps() {
2304	[	2306	[
2305	map {	2307	map {
2306	utf8::decode $_;	2308	utf8::decode $_;
2307	/\.map$/	2309	s/\.map$//; # TODO future compatibility hack
		2310	/\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
		2311	? ()
2308	? normalise $_	2312	: normalise $_
2309	: ()
2310	} @{ aio_readdir $UNIQUEDIR or [] }	2313	} @{ aio_readdir $UNIQUEDIR or [] }
2311	]	2314	]
2312	}	2315	}
2313		2316
2314	package cf;
2315
2316	=back	2317	=back
2317		2318
2318	=head3 cf::object	2319	=head3 cf::object
2319		2320
2320	=cut	2321	=cut
…		…
2323		2324
2324	=over 4	2325	=over 4
2325		2326
2326	=item $ob->inv_recursive	2327	=item $ob->inv_recursive
2327		2328
2328	Returns the inventory of the object _and_ their inventories, recursively.	2329	Returns the inventory of the object I<and> their inventories, recursively,
		2330	but I<not> the object itself.
2329		2331
2330	=cut	2332	=cut
2331		2333
2332	sub inv_recursive_;	2334	sub inv_recursive_;
2333	sub inv_recursive_ {	2335	sub inv_recursive_ {
…		…
2338	inv_recursive_ inv $_[0]	2340	inv_recursive_ inv $_[0]
2339	}	2341	}
2340		2342
2341	=item $ref = $ob->ref	2343	=item $ref = $ob->ref
2342		2344
2343	creates and returns a persistent reference to an objetc that can be stored as a string.	2345	Creates and returns a persistent reference to an object that can be stored as a string.
2344		2346
2345	=item $ob = cf::object::deref ($refstring)	2347	=item $ob = cf::object::deref ($refstring)
2346		2348
2347	returns the objetc referenced by refstring. may return undef when it cnanot find the object,	2349	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2348	even if the object actually exists. May block.	2350	even if the object actually exists. May block.
…		…
2380	can be C<undef>. Does the right thing when the player is currently in a	2382	can be C<undef>. Does the right thing when the player is currently in a
2381	dialogue with the given NPC character.	2383	dialogue with the given NPC character.
2382		2384
2383	=cut	2385	=cut
2384		2386
		2387	our $SAY_CHANNEL = {
		2388	id => "say",
		2389	title => "Map",
		2390	reply => "say ",
		2391	tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
		2392	};
		2393
		2394	our $CHAT_CHANNEL = {
		2395	id => "chat",
		2396	title => "Chat",
		2397	reply => "chat ",
		2398	tooltip => "Player chat and shouts, global to the server.",
		2399	};
		2400
2385	# rough implementation of a future "reply" method that works	2401	# rough implementation of a future "reply" method that works
2386	# with dialog boxes.	2402	# with dialog boxes.
2387	#TODO: the first argument must go, split into a $npc->reply_to ( method	2403	#TODO: the first argument must go, split into a $npc->reply_to ( method
2388	sub cf::object::player::reply($$$;$) {	2404	sub cf::object::player::reply($$$;$) {
2389	my ($self, $npc, $msg, $flags) = @_;	2405	my ($self, $npc, $msg, $flags) = @_;
…		…
2400	my $dialog = $pl->{npc_dialog};	2416	my $dialog = $pl->{npc_dialog};
2401	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));	2417	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2402		2418
2403	} else {	2419	} else {
2404	$msg = $npc->name . " says: $msg" if $npc;	2420	$msg = $npc->name . " says: $msg" if $npc;
2405	$self->message ($msg, $flags);	2421	$self->send_msg ($SAY_CHANNEL => $msg, $flags);
2406	}	2422	}
2407	}	2423	}
2408	}	2424	}
2409		2425
2410	=item $object->send_msg ($channel, $msg, $color, [extra...])	2426	=item $object->send_msg ($channel, $msg, $color, [extra...])
…		…
2435		2451
2436	=item $player_object->enter_link	2452	=item $player_object->enter_link
2437		2453
2438	Freezes the player and moves him/her to a special map (C<{link}>).	2454	Freezes the player and moves him/her to a special map (C<{link}>).
2439		2455
2440	The player should be reasonably safe there for short amounts of time. You	2456	The player should be reasonably safe there for short amounts of time (e.g.
2441	I<MUST> call C<leave_link> as soon as possible, though.	2457	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
		2458	though, as the palyer cannot control the character while it is on the link
		2459	map.
2442		2460
2443	Will never block.	2461	Will never block.
2444		2462
2445	=item $player_object->leave_link ($map, $x, $y)	2463	=item $player_object->leave_link ($map, $x, $y)
2446		2464
…		…
2504		2522
2505	$map->load;	2523	$map->load;
2506	$map->load_neighbours;	2524	$map->load_neighbours;
2507		2525
2508	return unless $self->contr->active;	2526	return unless $self->contr->active;
		2527	$self->flag (cf::FLAG_DEBUG, 0);#d# temp
2509	$self->activate_recursive;	2528	$self->activate_recursive;
2510		2529
2511	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2530	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2512	$self->enter_map ($map, $x, $y);	2531	$self->enter_map ($map, $x, $y);
2513	}	2532	}
…		…
2517	Moves the player to the given map-path and coordinates by first freezing	2536	Moves the player to the given map-path and coordinates by first freezing
2518	her, loading and preparing them map, calling the provided $check callback	2537	her, loading and preparing them map, calling the provided $check callback
2519	that has to return the map if sucecssful, and then unfreezes the player on	2538	that has to return the map if sucecssful, and then unfreezes the player on
2520	the new (success) or old (failed) map position. In either case, $done will	2539	the new (success) or old (failed) map position. In either case, $done will
2521	be called at the end of this process.	2540	be called at the end of this process.
		2541
		2542	Note that $check will be called with a potentially non-loaded map, so if
		2543	it needs a loaded map it has to call C<< ->load >>.
2522		2544
2523	=cut	2545	=cut
2524		2546
2525	our $GOTOGEN;	2547	our $GOTOGEN;
2526		2548
…		…
2605	}	2627	}
2606		2628
2607	sub prepare_random_map {	2629	sub prepare_random_map {
2608	my ($exit) = @_;	2630	my ($exit) = @_;
2609		2631
2610	my $guard = cf::lock_acquire "exit_prepare:$exit";
2611
2612	# all this does is basically replace the /! path by	2632	# all this does is basically replace the /! path by
2613	# a new random map path (?random/...) with a seed	2633	# a new random map path (?random/...) with a seed
2614	# that depends on the exit object	2634	# that depends on the exit object
2615		2635
2616	my $rmp = parse_random_map_params $exit->msg;	2636	my $rmp = parse_random_map_params $exit->msg;
…		…
2618	if ($exit->map) {	2638	if ($exit->map) {
2619	$rmp->{region} = $exit->region->name;	2639	$rmp->{region} = $exit->region->name;
2620	$rmp->{origin_map} = $exit->map->path;	2640	$rmp->{origin_map} = $exit->map->path;
2621	$rmp->{origin_x} = $exit->x;	2641	$rmp->{origin_x} = $exit->x;
2622	$rmp->{origin_y} = $exit->y;	2642	$rmp->{origin_y} = $exit->y;
		2643
		2644	$exit->map->touch;
2623	}	2645	}
2624		2646
2625	$rmp->{random_seed} ||= $exit->random_seed;	2647	$rmp->{random_seed} ||= $exit->random_seed;
2626		2648
2627	my $data = cf::to_json $rmp;	2649	my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2628	my $md5 = Digest::MD5::md5_hex $data;	2650	my $md5 = Digest::MD5::md5_hex $data;
2629	my $meta = "$RANDOMDIR/$md5.meta";	2651	my $meta = "$RANDOMDIR/$md5.meta";
2630		2652
2631	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {	2653	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2632	aio_write $fh, 0, (length $data), $data, 0;	2654	aio_write $fh, 0, (length $data), $data, 0;
2633	undef $fh;	2655	undef $fh;
2634	aio_rename "$meta~", $meta;	2656	aio_rename "$meta~", $meta;
2635		2657
		2658	my $slaying = "?random/$md5";
		2659
		2660	if ($exit->valid) {
2636	$exit->slaying ("?random/$md5");	2661	$exit->slaying ("?random/$md5");
2637	$exit->msg (undef);	2662	$exit->msg (undef);
		2663	}
2638	}	2664	}
2639	}	2665	}
2640		2666
2641	sub cf::object::player::enter_exit {	2667	sub cf::object::player::enter_exit {
2642	my ($self, $exit) = @_;	2668	my ($self, $exit) = @_;
2643		2669
2644	return unless $self->type == cf::PLAYER;	2670	return unless $self->type == cf::PLAYER;
2645		2671
2646	if ($exit->slaying eq "/!") {
2647	#TODO: this should de-fi-ni-te-ly not be a sync-job
2648	# the problem is that $exit might not survive long enough
2649	# so it needs to be done right now, right here
2650	cf::sync_job { prepare_random_map $exit };
2651	}
2652
2653	my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2654	my $hp = $exit->stats->hp;
2655	my $sp = $exit->stats->sp;
2656
2657	$self->enter_link;	2672	$self->enter_link;
2658		2673
2659	# if exit is damned, update players death & WoR home-position
2660	$self->contr->savebed ($slaying, $hp, $sp)
2661	if $exit->flag (FLAG_DAMNED);
2662
2663	(async {	2674	(async {
2664	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";	2675	$Coro::current->{desc} = "enter_exit";
2665		2676
2666	$self->deactivate_recursive; # just to be sure
2667	unless (eval {	2677	unless (eval {
		2678	$self->deactivate_recursive; # just to be sure
		2679
		2680	# random map handling
		2681	{
		2682	my $guard = cf::lock_acquire "exit_prepare:$exit";
		2683
		2684	prepare_random_map $exit
		2685	if $exit->slaying eq "/!";
		2686	}
		2687
		2688	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
		2689	my $x = $exit->stats->hp;
		2690	my $y = $exit->stats->sp;
		2691
2668	$self->goto ($slaying, $hp, $sp);	2692	$self->goto ($map, $x, $y);
2669		2693
		2694	# if exit is damned, update players death & WoR home-position
		2695	$self->contr->savebed ($map, $x, $y)
		2696	if $exit->flag (cf::FLAG_DAMNED);
		2697
2670	1;	2698	1
2671	}) {	2699	}) {
2672	$self->message ("Something went wrong deep within the crossfire server. "	2700	$self->message ("Something went wrong deep within the deliantra server. "
2673	. "I'll try to bring you back to the map you were before. "	2701	. "I'll try to bring you back to the map you were before. "
2674	. "Please report this to the dungeon master!",	2702	. "Please report this to the dungeon master!",
2675	cf::NDI_UNIQUE | cf::NDI_RED);	2703	cf::NDI_UNIQUE | cf::NDI_RED);
2676		2704
2677	warn "ERROR in enter_exit: $@";	2705	warn "ERROR in enter_exit: $@";
…		…
2755	id => "infobox",	2783	id => "infobox",
2756	title => "Map Info",	2784	title => "Map Info",
2757	reply => undef,	2785	reply => undef,
2758	tooltip => "Information related to the maps",	2786	tooltip => "Information related to the maps",
2759	},	2787	},
		2788	"c/party" => {
		2789	id => "party",
		2790	title => "Party",
		2791	reply => "gsay ",
		2792	tooltip => "Messages and chat related to your party",
		2793	},
2760	);	2794	);
2761		2795
2762	sub cf::client::send_msg {	2796	sub cf::client::send_msg {
2763	my ($self, $channel, $msg, $color, @extra) = @_;	2797	my ($self, $channel, $msg, $color, @extra) = @_;
2764		2798
2765	$msg = $self->pl->expand_cfpod ($msg);	2799	$msg = $self->pl->expand_cfpod ($msg)
		2800	unless $color & cf::NDI_VERBATIM;
2766		2801
2767	$color &= cf::NDI_CLIENT_MASK; # just in case...	2802	$color &= cf::NDI_CLIENT_MASK; # just in case...
2768		2803
2769	# check predefined channels, for the benefit of C	2804	# check predefined channels, for the benefit of C
2770	if ($CHANNEL{$channel}) {	2805	if ($CHANNEL{$channel}) {
…		…
2791	if ($self->can_msg) {	2826	if ($self->can_msg) {
2792	# default colour, mask it out	2827	# default colour, mask it out
2793	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)	2828	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2794	if $color & cf::NDI_DEF;	2829	if $color & cf::NDI_DEF;
2795		2830
2796	$self->send_packet ("msg " . $self->{json_coder}->encode (	2831	my $pkt = "msg "
		2832	. $self->{json_coder}->encode (
2797	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));	2833	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
		2834	);
		2835
		2836	# try lzf for large packets
		2837	$pkt = "lzf " . Compress::LZF::compress $pkt
		2838	if 1024 <= length $pkt and $self->{can_lzf};
		2839
		2840	# split very large packets
		2841	if (8192 < length $pkt and $self->{can_lzf}) {
		2842	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
		2843	$pkt = "frag";
		2844	}
		2845
		2846	$self->send_packet ($pkt);
2798	} else {	2847	} else {
2799	if ($color >= 0) {	2848	if ($color >= 0) {
2800	# replace some tags by gcfclient-compatible ones	2849	# replace some tags by gcfclient-compatible ones
2801	for ($msg) {	2850	for ($msg) {
2802	1 while	2851	1 while
…		…
3001		3050
3002	The following functions and methods are available within a safe environment:	3051	The following functions and methods are available within a safe environment:
3003		3052
3004	cf::object	3053	cf::object
3005	contr pay_amount pay_player map x y force_find force_add destroy	3054	contr pay_amount pay_player map x y force_find force_add destroy
3006	insert remove name archname title slaying race decrease_ob_nr	3055	insert remove name archname title slaying race decrease split
3007		3056
3008	cf::object::player	3057	cf::object::player
3009	player	3058	player
3010		3059
3011	cf::player	3060	cf::player
…		…
3016		3065
3017	=cut	3066	=cut
3018		3067
3019	for (	3068	for (
3020	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	3069	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3021	insert remove inv name archname title slaying race	3070	insert remove inv nrof name archname title slaying race
3022	decrease_ob_nr destroy)],	3071	decrease split destroy change_exp)],
3023	["cf::object::player" => qw(player)],	3072	["cf::object::player" => qw(player)],
3024	["cf::player" => qw(peaceful)],	3073	["cf::player" => qw(peaceful)],
3025	["cf::map" => qw(trigger)],	3074	["cf::map" => qw(trigger)],
3026	) {	3075	) {
3027	no strict 'refs';	3076	no strict 'refs';
…		…
3132	{	3181	{
3133	my $faces = $facedata->{faceinfo};	3182	my $faces = $facedata->{faceinfo};
3134		3183
3135	while (my ($face, $info) = each %$faces) {	3184	while (my ($face, $info) = each %$faces) {
3136	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3185	my $idx = (cf::face::find $face) || cf::face::alloc $face;
		3186
3137	cf::face::set_visibility $idx, $info->{visibility};	3187	cf::face::set_visibility $idx, $info->{visibility};
3138	cf::face::set_magicmap $idx, $info->{magicmap};	3188	cf::face::set_magicmap $idx, $info->{magicmap};
3139	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};	3189	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3140	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};	3190	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3141		3191
3142	cf::cede_to_tick;	3192	cf::cede_to_tick;
3143	}	3193	}
3144		3194
3145	while (my ($face, $info) = each %$faces) {	3195	while (my ($face, $info) = each %$faces) {
3146	next unless $info->{smooth};	3196	next unless $info->{smooth};
		3197
3147	my $idx = cf::face::find $face	3198	my $idx = cf::face::find $face
3148	or next;	3199	or next;
		3200
3149	if (my $smooth = cf::face::find $info->{smooth}) {	3201	if (my $smooth = cf::face::find $info->{smooth}) {
3150	cf::face::set_smooth $idx, $smooth;	3202	cf::face::set_smooth $idx, $smooth;
3151	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3203	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3152	} else {	3204	} else {
3153	warn "smooth face '$info->{smooth}' not found for face '$face'";	3205	warn "smooth face '$info->{smooth}' not found for face '$face'";
…		…
3171	{	3223	{
3172	# TODO: for gcfclient pleasure, we should give resources	3224	# TODO: for gcfclient pleasure, we should give resources
3173	# that gcfclient doesn't grok a >10000 face index.	3225	# that gcfclient doesn't grok a >10000 face index.
3174	my $res = $facedata->{resource};	3226	my $res = $facedata->{resource};
3175		3227
3176	my $soundconf = delete $res->{"res/sound.conf"};
3177
3178	while (my ($name, $info) = each %$res) {	3228	while (my ($name, $info) = each %$res) {
		3229	if (defined $info->{type}) {
3179	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3230	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3180	my $data;	3231	my $data;
3181		3232
3182	if ($info->{type} & 1) {	3233	if ($info->{type} & 1) {
3183	# prepend meta info	3234	# prepend meta info
3184		3235
3185	my $meta = $enc->encode ({	3236	my $meta = $enc->encode ({
3186	name => $name,	3237	name => $name,
3187	%{ $info->{meta} || {} },	3238	%{ $info->{meta} || {} },
3188	});	3239	});
3189		3240
3190	$data = pack "(w/a*)*", $meta, $info->{data};	3241	$data = pack "(w/a*)*", $meta, $info->{data};
		3242	} else {
		3243	$data = $info->{data};
		3244	}
		3245
		3246	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3247	cf::face::set_type $idx, $info->{type};
3191	} else {	3248	} else {
3192	$data = $info->{data};	3249	$RESOURCE{$name} = $info;
3193	}	3250	}
3194		3251
3195	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3196	cf::face::set_type $idx, $info->{type};
3197
3198	cf::cede_to_tick;	3252	cf::cede_to_tick;
3199	}	3253	}
3200
3201	if ($soundconf) {
3202	$soundconf = $enc->decode (delete $soundconf->{data});
3203
3204	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3205	my $sound = $soundconf->{compat}[$_]
3206	or next;
3207
3208	my $face = cf::face::find "sound/$sound->[1]";
3209	cf::sound::set $sound->[0] => $face;
3210	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3211	}
3212
3213	while (my ($k, $v) = each %{$soundconf->{event}}) {
3214	my $face = cf::face::find "sound/$v";
3215	cf::sound::set $k => $face;
3216	}
3217	}
3218	}	3254	}
		3255
		3256	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3219		3257
3220	1	3258	1
3221	}	3259	}
		3260
		3261	cf::global->attach (on_resource_update => sub {
		3262	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
		3263	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
		3264
		3265	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3266	my $sound = $soundconf->{compat}[$_]
		3267	or next;
		3268
		3269	my $face = cf::face::find "sound/$sound->[1]";
		3270	cf::sound::set $sound->[0] => $face;
		3271	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3272	}
		3273
		3274	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3275	my $face = cf::face::find "sound/$v";
		3276	cf::sound::set $k => $face;
		3277	}
		3278	}
		3279	});
3222		3280
3223	register_exticmd fx_want => sub {	3281	register_exticmd fx_want => sub {
3224	my ($ns, $want) = @_;	3282	my ($ns, $want) = @_;
3225		3283
3226	while (my ($k, $v) = each %$want) {	3284	while (my ($k, $v) = each %$want) {
3227	$ns->fx_want ($k, $v);	3285	$ns->fx_want ($k, $v);
3228	}	3286	}
3229	};	3287	};
		3288
		3289	sub load_resource_file($) {
		3290	my $guard = lock_acquire "load_resource_file";
		3291
		3292	my $status = load_resource_file_ $_[0];
		3293	get_slot 0.1, 100;
		3294	cf::arch::commit_load;
		3295
		3296	$status
		3297	}
3230		3298
3231	sub reload_regions {	3299	sub reload_regions {
3232	# HACK to clear player env face cache, we need some signal framework	3300	# HACK to clear player env face cache, we need some signal framework
3233	# for this (global event?)	3301	# for this (global event?)
3234	%ext::player_env::MUSIC_FACE_CACHE = ();	3302	%ext::player_env::MUSIC_FACE_CACHE = ();
…		…
3248	}	3316	}
3249		3317
3250	sub reload_archetypes {	3318	sub reload_archetypes {
3251	load_resource_file "$DATADIR/archetypes"	3319	load_resource_file "$DATADIR/archetypes"
3252	or die "unable to load archetypes\n";	3320	or die "unable to load archetypes\n";
3253	#d# NEED to laod twice to resolve forward references
3254	# this really needs to be done in an extra post-pass
3255	# (which needs to be synchronous, so solve it differently)
3256	load_resource_file "$DATADIR/archetypes"
3257	or die "unable to load archetypes\n";
3258	}	3321	}
3259		3322
3260	sub reload_treasures {	3323	sub reload_treasures {
3261	load_resource_file "$DATADIR/treasures"	3324	load_resource_file "$DATADIR/treasures"
3262	or die "unable to load treasurelists\n";	3325	or die "unable to load treasurelists\n";
3263	}	3326	}
3264		3327
3265	sub reload_resources {	3328	sub reload_resources {
3266	warn "reloading resource files...\n";	3329	warn "reloading resource files...\n";
3267		3330
		3331	reload_facedata;
		3332	reload_archetypes;
3268	reload_regions;	3333	reload_regions;
3269	reload_facedata;
3270	#reload_archetypes;#d#
3271	reload_archetypes;
3272	reload_treasures;	3334	reload_treasures;
3273		3335
3274	warn "finished reloading resource files\n";	3336	warn "finished reloading resource files\n";
3275	}	3337	}
3276		3338
3277	sub init {	3339	sub init {
		3340	my $guard = freeze_mainloop;
		3341
		3342	evthread_start IO::AIO::poll_fileno;
		3343
3278	reload_resources;	3344	reload_resources;
3279	}	3345	}
3280		3346
3281	sub reload_config {	3347	sub reload_config {
3282	open my $fh, "<:utf8", "$CONFDIR/config"	3348	open my $fh, "<:utf8", "$CONFDIR/config"
3283	or return;	3349	or return;
3284		3350
3285	local $/;	3351	local $/;
3286	*CFG = YAML::Syck::Load <$fh>;	3352	*CFG = YAML::Load <$fh>;
3287		3353
3288	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3354	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3289		3355
3290	$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};
3291	$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};
…		…
3297	};	3363	};
3298	warn $@ if $@;	3364	warn $@ if $@;
3299	}	3365	}
3300	}	3366	}
3301		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
3302	sub main {	3387	sub main {
		3388	atomic;
		3389
3303	# we must not ever block the main coroutine	3390	# we must not ever block the main coroutine
3304	local $Coro::idle = sub {	3391	local $Coro::idle = sub {
3305	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3392	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3306	(async {	3393	(async {
3307	$Coro::current->{desc} = "IDLE BUG HANDLER";	3394	$Coro::current->{desc} = "IDLE BUG HANDLER";
3308	Event::one_event;	3395	EV::loop EV::LOOP_ONESHOT;
3309	})->prio (Coro::PRIO_MAX);	3396	})->prio (Coro::PRIO_MAX);
3310	};	3397	};
3311		3398
		3399	{
		3400	my $guard = freeze_mainloop;
3312	reload_config;	3401	reload_config;
3313	db_init;	3402	db_init;
3314	load_extensions;	3403	load_extensions;
3315		3404
3316	$TICK_WATCHER->start;	3405	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
		3406	}
		3407
		3408	utime time, time, $RUNTIMEFILE;
		3409
		3410	# no (long-running) fork's whatsoever before this point(!)
		3411	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
		3412
3317	Event::loop;	3413	EV::loop;
3318	}	3414	}
3319		3415
3320	#############################################################################	3416	#############################################################################
3321	# initialisation and cleanup	3417	# initialisation and cleanup
3322		3418
3323	# install some emergency cleanup handlers	3419	# install some emergency cleanup handlers
3324	BEGIN {	3420	BEGIN {
		3421	our %SIGWATCHER = ();
3325	for my $signal (qw(INT HUP TERM)) {	3422	for my $signal (qw(INT HUP TERM)) {
3326	Event->signal (	3423	$SIGWATCHER{$signal} = EV::signal $signal, sub {
3327	reentrant => 0,
3328	data => WF_AUTOCANCEL,
3329	signal => $signal,
3330	prio => 0,
3331	cb => sub {
3332	cf::cleanup "SIG$signal";	3424	cf::cleanup "SIG$signal";
3333	},
3334	);	3425	};
3335	}	3426	}
3336	}	3427	}
3337		3428
3338	sub write_runtime {	3429	sub write_runtime_sync {
3339	my $runtime = "$LOCALDIR/runtime";
3340
3341	# first touch the runtime file to show we are still running:	3430	# first touch the runtime file to show we are still running:
3342	# the fsync below can take a very very long time.	3431	# the fsync below can take a very very long time.
3343		3432
3344	IO::AIO::aio_utime $runtime, undef, undef;	3433	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3345		3434
3346	my $guard = cf::lock_acquire "write_runtime";	3435	my $guard = cf::lock_acquire "write_runtime";
3347		3436
3348	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644	3437	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3349	or return;	3438	or return;
3350		3439
3351	my $value = $cf::RUNTIME + 90 + 10;	3440	my $value = $cf::RUNTIME + 90 + 10;
3352	# 10 is the runtime save interval, for a monotonic clock	3441	# 10 is the runtime save interval, for a monotonic clock
3353	# 60 allows for the watchdog to kill the server.	3442	# 60 allows for the watchdog to kill the server.
…		…
3363	aio_utime $fh, undef, undef;	3452	aio_utime $fh, undef, undef;
3364		3453
3365	close $fh	3454	close $fh
3366	or return;	3455	or return;
3367		3456
3368	aio_rename "$runtime~", $runtime	3457	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3369	and return;	3458	and return;
3370		3459
3371	warn "runtime file written.\n";	3460	warn "runtime file written.\n";
3372		3461
3373	1	3462	1
		3463	}
		3464
		3465	our $uuid_lock;
		3466	our $uuid_skip;
		3467
		3468	sub write_uuid_sync($) {
		3469	$uuid_skip ||= $_[0];
		3470
		3471	return if $uuid_lock;
		3472	local $uuid_lock = 1;
		3473
		3474	my $uuid = "$LOCALDIR/uuid";
		3475
		3476	my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
		3477	or return;
		3478
		3479	my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
		3480	$uuid_skip = 0;
		3481
		3482	(aio_write $fh, 0, (length $value), $value, 0) <= 0
		3483	and return;
		3484
		3485	# always fsync - this file is important
		3486	aio_fsync $fh
		3487	and return;
		3488
		3489	close $fh
		3490	or return;
		3491
		3492	aio_rename "$uuid~", $uuid
		3493	and return;
		3494
		3495	warn "uuid file written ($value).\n";
		3496
		3497	1
		3498
		3499	}
		3500
		3501	sub write_uuid($$) {
		3502	my ($skip, $sync) = @_;
		3503
		3504	$sync ? write_uuid_sync $skip
		3505	: async { write_uuid_sync $skip };
3374	}	3506	}
3375		3507
3376	sub emergency_save() {	3508	sub emergency_save() {
3377	my $freeze_guard = cf::freeze_mainloop;	3509	my $freeze_guard = cf::freeze_mainloop;
3378		3510
…		…
3400	warn "end emergency map save\n";	3532	warn "end emergency map save\n";
3401		3533
3402	warn "begin emergency database checkpoint\n";	3534	warn "begin emergency database checkpoint\n";
3403	BDB::db_env_txn_checkpoint $DB_ENV;	3535	BDB::db_env_txn_checkpoint $DB_ENV;
3404	warn "end emergency database checkpoint\n";	3536	warn "end emergency database checkpoint\n";
		3537
		3538	warn "begin write uuid\n";
		3539	write_uuid_sync 1;
		3540	warn "end write uuid\n";
3405	};	3541	};
3406		3542
3407	warn "leave emergency perl save\n";	3543	warn "leave emergency perl save\n";
3408	}	3544	}
3409		3545
3410	sub post_cleanup {	3546	sub post_cleanup {
3411	my ($make_core) = @_;	3547	my ($make_core) = @_;
3412		3548
3413	warn Carp::longmess "post_cleanup backtrace"	3549	warn Carp::longmess "post_cleanup backtrace"
3414	if $make_core;	3550	if $make_core;
		3551
		3552	my $fh = pidfile;
		3553	unlink $PIDFILE if <$fh> == $$;
3415	}	3554	}
		3555
		3556	# a safer delete_package, copied from Symbol
		3557	sub clear_package($) {
		3558	my $pkg = shift;
		3559
		3560	# expand to full symbol table name if needed
		3561	unless ($pkg =~ /^main::.*::$/) {
		3562	$pkg = "main$pkg" if $pkg =~ /^::/;
		3563	$pkg = "main::$pkg" unless $pkg =~ /^main::/;
		3564	$pkg .= '::' unless $pkg =~ /::$/;
		3565	}
		3566
		3567	my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
		3568	my $stem_symtab = *{$stem}{HASH};
		3569
		3570	defined $stem_symtab and exists $stem_symtab->{$leaf}
		3571	or return;
		3572
		3573	# clear all symbols
		3574	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
		3575	for my $name (keys %$leaf_symtab) {
		3576	_gv_clear *{"$pkg$name"};
		3577	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
		3578	}
		3579	warn "cleared package #$pkg\n";#d#
		3580	}
		3581
		3582	our $RELOAD; # how many times to reload
3416		3583
3417	sub do_reload_perl() {	3584	sub do_reload_perl() {
3418	# can/must only be called in main	3585	# can/must only be called in main
3419	if ($Coro::current != $Coro::main) {	3586	if ($Coro::current != $Coro::main) {
3420	warn "can only reload from main coroutine";	3587	warn "can only reload from main coroutine";
3421	return;	3588	return;
3422	}	3589	}
3423		3590
		3591	return if $RELOAD++;
		3592
		3593	while ($RELOAD) {
3424	warn "reloading...";	3594	warn "reloading...";
3425		3595
3426	warn "entering sync_job";	3596	warn "entering sync_job";
3427		3597
3428	cf::sync_job {	3598	cf::sync_job {
3429	cf::write_runtime; # external watchdog should not bark	3599	cf::write_runtime_sync; # external watchdog should not bark
3430	cf::emergency_save;	3600	cf::emergency_save;
3431	cf::write_runtime; # external watchdog should not bark	3601	cf::write_runtime_sync; # external watchdog should not bark
3432		3602
3433	warn "syncing database to disk";	3603	warn "syncing database to disk";
3434	BDB::db_env_txn_checkpoint $DB_ENV;	3604	BDB::db_env_txn_checkpoint $DB_ENV;
3435		3605
3436	# if anything goes wrong in here, we should simply crash as we already saved	3606	# if anything goes wrong in here, we should simply crash as we already saved
3437		3607
3438	warn "cancelling all WF_AUTOCANCEL watchers";
3439	for (Event::all_watchers) {
3440	$_->cancel if $_->data & WF_AUTOCANCEL;
3441	}
3442
3443	warn "flushing outstanding aio requests";	3608	warn "flushing outstanding aio requests";
3444	for (;;) {
3445	BDB::flush;
3446	IO::AIO::flush;
3447	Coro::cede_notself;
3448	last unless IO::AIO::nreqs || BDB::nreqs;	3609	while (IO::AIO::nreqs || BDB::nreqs) {
3449	warn "iterate...";	3610	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3450	}
3451
3452	++$RELOAD;
3453
3454	warn "cancelling all extension coros";
3455	$_->cancel for values %EXT_CORO;
3456	%EXT_CORO = ();
3457
3458	warn "removing commands";
3459	%COMMAND = ();
3460
3461	warn "removing ext/exti commands";
3462	%EXTCMD = ();
3463	%EXTICMD = ();
3464
3465	warn "unloading/nuking all extensions";
3466	for my $pkg (@EXTS) {
3467	warn "... unloading $pkg";
3468
3469	if (my $cb = $pkg->can ("unload")) {
3470	eval {
3471	$cb->($pkg);
3472	1
3473	} or warn "$pkg unloaded, but with errors: $@";
3474	}	3611	}
3475		3612
3476	warn "... nuking $pkg";	3613	warn "cancelling all extension coros";
3477	Symbol::delete_package $pkg;	3614	$_->cancel for values %EXT_CORO;
3478	}	3615	%EXT_CORO = ();
3479		3616
3480	warn "unloading all perl modules loaded from $LIBDIR";	3617	warn "removing commands";
3481	while (my ($k, $v) = each %INC) {	3618	%COMMAND = ();
3482	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3483		3619
		3620	warn "removing ext/exti commands";
		3621	%EXTCMD = ();
		3622	%EXTICMD = ();
		3623
		3624	warn "unloading/nuking all extensions";
		3625	for my $pkg (@EXTS) {
3484	warn "... unloading $k";	3626	warn "... unloading $pkg";
3485	delete $INC{$k};
3486		3627
3487	$k =~ s/\.pm$//;
3488	$k =~ s/\//::/g;
3489
3490	if (my $cb = $k->can ("unload_module")) {	3628	if (my $cb = $pkg->can ("unload")) {
		3629	eval {
3491	$cb->();	3630	$cb->($pkg);
		3631	1
		3632	} or warn "$pkg unloaded, but with errors: $@";
		3633	}
		3634
		3635	warn "... clearing $pkg";
		3636	clear_package $pkg;
3492	}	3637	}
3493		3638
3494	Symbol::delete_package $k;	3639	warn "unloading all perl modules loaded from $LIBDIR";
		3640	while (my ($k, $v) = each %INC) {
		3641	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
		3642
		3643	warn "... unloading $k";
		3644	delete $INC{$k};
		3645
		3646	$k =~ s/\.pm$//;
		3647	$k =~ s/\//::/g;
		3648
		3649	if (my $cb = $k->can ("unload_module")) {
		3650	$cb->();
		3651	}
		3652
		3653	clear_package $k;
3495	}	3654	}
3496		3655
3497	warn "getting rid of safe::, as good as possible";	3656	warn "getting rid of safe::, as good as possible";
3498	Symbol::delete_package "safe::$_"	3657	clear_package "safe::$_"
3499	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	3658	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3500		3659
3501	warn "unloading cf.pm \"a bit\"";	3660	warn "unloading cf.pm \"a bit\"";
3502	delete $INC{"cf.pm"};	3661	delete $INC{"cf.pm"};
3503	delete $INC{"cf/pod.pm"};	3662	delete $INC{"cf/pod.pm"};
3504		3663
3505	# don't, removes xs symbols, too,	3664	# don't, removes xs symbols, too,
3506	# and global variables created in xs	3665	# and global variables created in xs
3507	#Symbol::delete_package __PACKAGE__;	3666	#clear_package __PACKAGE__;
3508		3667
3509	warn "unload completed, starting to reload now";	3668	warn "unload completed, starting to reload now";
3510		3669
3511	warn "reloading cf.pm";	3670	warn "reloading cf.pm";
3512	require cf;	3671	require cf;
3513	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3672	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3514		3673
3515	warn "loading config and database again";	3674	warn "loading config and database again";
3516	cf::reload_config;	3675	cf::reload_config;
3517		3676
3518	warn "loading extensions";	3677	warn "loading extensions";
3519	cf::load_extensions;	3678	cf::load_extensions;
3520		3679
3521	warn "reattaching attachments to objects/players";	3680	warn "reattaching attachments to objects/players";
3522	_global_reattach; # objects, sockets	3681	_global_reattach; # objects, sockets
3523	warn "reattaching attachments to maps";	3682	warn "reattaching attachments to maps";
3524	reattach $_ for values %MAP;	3683	reattach $_ for values %MAP;
3525	warn "reattaching attachments to players";	3684	warn "reattaching attachments to players";
3526	reattach $_ for values %PLAYER;	3685	reattach $_ for values %PLAYER;
3527		3686
3528	warn "leaving sync_job";	3687	warn "leaving sync_job";
3529		3688
3530	1	3689	1
3531	} or do {	3690	} or do {
3532	warn $@;	3691	warn $@;
3533	warn "error while reloading, exiting.";	3692	cf::cleanup "error while reloading, exiting.";
3534	exit 1;
3535	};	3693	};
3536		3694
3537	warn "reloaded";	3695	warn "reloaded";
		3696	--$RELOAD;
		3697	}
3538	};	3698	};
3539		3699
3540	our $RELOAD_WATCHER; # used only during reload	3700	our $RELOAD_WATCHER; # used only during reload
3541		3701
3542	sub reload_perl() {	3702	sub reload_perl() {
3543	# doing reload synchronously and two reloads happen back-to-back,	3703	# doing reload synchronously and two reloads happen back-to-back,
3544	# coro crashes during coro_state_free->destroy here.	3704	# coro crashes during coro_state_free->destroy here.
3545		3705
3546	$RELOAD_WATCHER ||= Event->timer (	3706	$RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3547	reentrant => 0,
3548	after => 0,
3549	data => WF_AUTOCANCEL,
3550	cb => sub {
3551	do_reload_perl;	3707	do_reload_perl;
3552	undef $RELOAD_WATCHER;	3708	undef $RELOAD_WATCHER;
3553	},
3554	);	3709	};
3555	}	3710	}
3556		3711
3557	register_command "reload" => sub {	3712	register_command "reload" => sub {
3558	my ($who, $arg) = @_;	3713	my ($who, $arg) = @_;
3559		3714
…		…
3572		3727
3573	our @WAIT_FOR_TICK;	3728	our @WAIT_FOR_TICK;
3574	our @WAIT_FOR_TICK_BEGIN;	3729	our @WAIT_FOR_TICK_BEGIN;
3575		3730
3576	sub wait_for_tick {	3731	sub wait_for_tick {
3577	return unless $TICK_WATCHER->is_active;
3578	return if $Coro::current == $Coro::main;	3732	return if tick_inhibit || $Coro::current == $Coro::main;
3579		3733
3580	my $signal = new Coro::Signal;	3734	my $signal = new Coro::Signal;
3581	push @WAIT_FOR_TICK, $signal;	3735	push @WAIT_FOR_TICK, $signal;
3582	$signal->wait;	3736	$signal->wait;
3583	}	3737	}
3584		3738
3585	sub wait_for_tick_begin {	3739	sub wait_for_tick_begin {
3586	return unless $TICK_WATCHER->is_active;
3587	return if $Coro::current == $Coro::main;	3740	return if tick_inhibit || $Coro::current == $Coro::main;
3588		3741
3589	my $signal = new Coro::Signal;	3742	my $signal = new Coro::Signal;
3590	push @WAIT_FOR_TICK_BEGIN, $signal;	3743	push @WAIT_FOR_TICK_BEGIN, $signal;
3591	$signal->wait;	3744	$signal->wait;
3592	}	3745	}
3593		3746
3594	$TICK_WATCHER = Event->timer (	3747	sub tick {
3595	reentrant => 0,
3596	parked => 1,
3597	prio => 0,
3598	at => $NEXT_TICK || $TICK,
3599	data => WF_AUTOCANCEL,
3600	cb => sub {
3601	if ($Coro::current != $Coro::main) {	3748	if ($Coro::current != $Coro::main) {
3602	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	3749	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3603	unless ++$bug_warning > 10;	3750	unless ++$bug_warning > 10;
3604	return;	3751	return;
3605	}	3752	}
3606		3753
3607	$NOW = $tick_start = Event::time;
3608
3609	cf::server_tick; # one server iteration	3754	cf::server_tick; # one server iteration
3610		3755
3611	$RUNTIME += $TICK;
3612	$NEXT_TICK += $TICK;
3613
3614	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3756	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3615	$NEXT_RUNTIME_WRITE = $NOW + 10;	3757	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3616	Coro::async_pool {	3758	Coro::async_pool {
3617	$Coro::current->{desc} = "runtime saver";	3759	$Coro::current->{desc} = "runtime saver";
3618	write_runtime	3760	write_runtime_sync
3619	or warn "ERROR: unable to write runtime file: $!";	3761	or warn "ERROR: unable to write runtime file: $!";
3620	};
3621	}	3762	};
		3763	}
3622		3764
3623	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3765	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3624	$sig->send;	3766	$sig->send;
3625	}	3767	}
3626	while (my $sig = shift @WAIT_FOR_TICK) {	3768	while (my $sig = shift @WAIT_FOR_TICK) {
3627	$sig->send;	3769	$sig->send;
3628	}	3770	}
3629		3771
3630	$NOW = Event::time;	3772	$LOAD = ($NOW - $TICK_START) / $TICK;
3631
3632	# if we are delayed by four ticks or more, skip them all
3633	$NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3634
3635	$TICK_WATCHER->at ($NEXT_TICK);
3636	$TICK_WATCHER->start;
3637
3638	$LOAD = ($NOW - $tick_start) / $TICK;
3639	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3773	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3640		3774
3641	_post_tick;	3775	if (0) {
		3776	if ($NEXT_TICK) {
		3777	my $jitter = $TICK_START - $NEXT_TICK;
		3778	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
		3779	warn "jitter $JITTER\n";#d#
		3780	}
3642	},	3781	}
3643	);	3782	}
3644		3783
3645	{	3784	{
		3785	# configure BDB
		3786
3646	BDB::min_parallel 8;	3787	BDB::min_parallel 8;
3647	BDB::max_poll_time $TICK * 0.1;	3788	BDB::max_poll_reqs $TICK * 0.1;
3648	$BDB_POLL_WATCHER = Event->io (	3789	$AnyEvent::BDB::WATCHER->priority (1);
3649	reentrant => 0,
3650	fd => BDB::poll_fileno,
3651	poll => 'r',
3652	prio => 0,
3653	data => WF_AUTOCANCEL,
3654	cb => \&BDB::poll_cb,
3655	);
3656
3657	BDB::set_sync_prepare {
3658	my $status;
3659	my $current = $Coro::current;
3660	(
3661	sub {
3662	$status = $!;
3663	$current->ready; undef $current;
3664	},
3665	sub {
3666	Coro::schedule while defined $current;
3667	$! = $status;
3668	},
3669	)
3670	};
3671		3790
3672	unless ($DB_ENV) {	3791	unless ($DB_ENV) {
3673	$DB_ENV = BDB::db_env_create;	3792	$DB_ENV = BDB::db_env_create;
3674	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC	3793	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3675	| BDB::LOG_AUTOREMOVE, 1);	3794	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
		3795	$DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3676	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);	3796	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3677	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);	3797	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3678		3798
3679	cf::sync_job {	3799	cf::sync_job {
3680	eval {	3800	eval {
…		…
3690		3810
3691	cf::cleanup "db_env_open(db): $@" if $@;	3811	cf::cleanup "db_env_open(db): $@" if $@;
3692	};	3812	};
3693	}	3813	}
3694		3814
3695	$BDB_DEADLOCK_WATCHER = Event->timer (	3815	$BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3696	after => 3,
3697	interval => 1,
3698	hard => 1,
3699	prio => 0,
3700	data => WF_AUTOCANCEL,
3701	cb => sub {
3702	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };	3816	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3703	},
3704	);	3817	};
3705	$BDB_CHECKPOINT_WATCHER = Event->timer (	3818	$BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3706	after => 11,
3707	interval => 60,
3708	hard => 1,
3709	prio => 0,
3710	data => WF_AUTOCANCEL,
3711	cb => sub {
3712	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	3819	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3713	},
3714	);	3820	};
3715	$BDB_TRICKLE_WATCHER = Event->timer (	3821	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3716	after => 5,
3717	interval => 10,
3718	hard => 1,
3719	prio => 0,
3720	data => WF_AUTOCANCEL,
3721	cb => sub {
3722	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	3822	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3723	},
3724	);	3823	};
3725	}	3824	}
3726		3825
3727	{	3826	{
		3827	# configure IO::AIO
		3828
3728	IO::AIO::min_parallel 8;	3829	IO::AIO::min_parallel 8;
3729
3730	undef $Coro::AIO::WATCHER;
3731	IO::AIO::max_poll_time $TICK * 0.1;	3830	IO::AIO::max_poll_time $TICK * 0.1;
3732	$AIO_POLL_WATCHER = Event->io (	3831	undef $AnyEvent::AIO::WATCHER;
3733	reentrant => 0,
3734	data => WF_AUTOCANCEL,
3735	fd => IO::AIO::poll_fileno,
3736	poll => 'r',
3737	prio => 0,
3738	cb => \&IO::AIO::poll_cb,
3739	);
3740	}	3832	}
3741		3833
3742	my $_log_backtrace;	3834	my $_log_backtrace;
3743		3835
3744	sub _log_backtrace {	3836	sub _log_backtrace {
…		…
3747	$msg =~ s/\n//;	3839	$msg =~ s/\n//;
3748		3840
3749	# limit the # of concurrent backtraces	3841	# limit the # of concurrent backtraces
3750	if ($_log_backtrace < 2) {	3842	if ($_log_backtrace < 2) {
3751	++$_log_backtrace;	3843	++$_log_backtrace;
		3844	my $perl_bt = Carp::longmess $msg;
3752	async {	3845	async {
3753	$Coro::current->{desc} = "abt $msg";	3846	$Coro::current->{desc} = "abt $msg";
3754		3847
3755	my @bt = fork_call {	3848	my @bt = fork_call {
3756	@addr = map { sprintf "%x", $_ } @addr;	3849	@addr = map { sprintf "%x", $_ } @addr;
…		…
3767	}	3860	}
3768		3861
3769	@funcs	3862	@funcs
3770	};	3863	};
3771		3864
3772	LOG llevInfo, "[ABT] $msg\n";	3865	LOG llevInfo, "[ABT] $perl_bt\n";
		3866	LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3773	LOG llevInfo, "[ABT] $_\n" for @bt;	3867	LOG llevInfo, "[ABT] $_\n" for @bt;
3774	--$_log_backtrace;	3868	--$_log_backtrace;
3775	};	3869	};
3776	} else {	3870	} else {
3777	LOG llevInfo, "[ABT] $msg\n";	3871	LOG llevInfo, "[ABT] $msg\n";

Diff Legend

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