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.356 by root, Tue Sep 4 05:43:21 2007 UTC vs.
Revision 1.511 by root, Wed Apr 7 18:35:56 2010 UTC

		1	#
		2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.
		3	#
		4	# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
		5	#
		6	# Deliantra is free software: you can redistribute it and/or modify it under
		7	# the terms of the Affero GNU General Public License as published by the
		8	# Free Software Foundation, either version 3 of the License, or (at your
		9	# option) any later version.
		10	#
		11	# This program is distributed in the hope that it will be useful,
		12	# but WITHOUT ANY WARRANTY; without even the implied warranty of
		13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		14	# GNU General Public License for more details.
		15	#
		16	# You should have received a copy of the Affero GNU General Public License
		17	# and the GNU General Public License along with this program. If not, see
		18	# <http://www.gnu.org/licenses/>.
		19	#
		20	# The authors can be reached via e-mail to <support@deliantra.net>
		21	#
		22
1	package cf;	23	package cf;
2		24
		25	use 5.10.0;
3	use utf8;	26	use utf8;
4	use strict;	27	use strict qw(vars subs);
5		28
6	use Symbol;	29	use Symbol;
7	use List::Util;	30	use List::Util;
8	use Socket;	31	use Socket;
9	use Storable;	32	use EV;
10	use Event;
11	use Opcode;	33	use Opcode;
12	use Safe;	34	use Safe;
13	use Safe::Hole;	35	use Safe::Hole;
		36	use Storable ();
		37	use Carp ();
14		38
		39	use Guard ();
15	use Coro 3.64 ();	40	use Coro ();
16	use Coro::State;	41	use Coro::State;
17	use Coro::Handle;	42	use Coro::Handle;
		43	use Coro::EV;
18	use Coro::Event;	44	use Coro::AnyEvent;
19	use Coro::Timer;	45	use Coro::Timer;
20	use Coro::Signal;	46	use Coro::Signal;
21	use Coro::Semaphore;	47	use Coro::Semaphore;
		48	use Coro::SemaphoreSet;
		49	use Coro::AnyEvent;
22	use Coro::AIO;	50	use Coro::AIO;
		51	use Coro::BDB 1.6;
23	use Coro::Storable;	52	use Coro::Storable;
24	use Coro::Util ();	53	use Coro::Util ();
25		54
26	use JSON::XS ();	55	use JSON::XS 2.01 ();
27	use BDB ();	56	use BDB ();
28	use Data::Dumper;	57	use Data::Dumper;
29	use Digest::MD5;
30	use Fcntl;	58	use Fcntl;
31	use YAML::Syck ();	59	use YAML::XS ();
32	use IO::AIO 2.32 ();	60	use IO::AIO ();
33	use Time::HiRes;	61	use Time::HiRes;
34	use Compress::LZF;	62	use Compress::LZF;
35	use Digest::MD5 ();	63	use Digest::MD5 ();
		64
		65	AnyEvent::detect;
36		66
37	# configure various modules to our taste	67	# configure various modules to our taste
38	#	68	#
39	$Storable::canonical = 1; # reduce rsync transfers	69	$Storable::canonical = 1; # reduce rsync transfers
40	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator	70	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
		71
		72	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
		73
		74	# make sure c-lzf reinitialises itself
		75	Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later	76	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42		77
43	$Event::Eval = 1; # no idea why this is required, but it is	78	# strictly for debugging
44		79	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46	$YAML::Syck::ImplicitUnicode = 1;
47
48	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49		80
50	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	81	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51		82
52	our %COMMAND = ();	83	our %COMMAND = ();
53	our %COMMAND_TIME = ();	84	our %COMMAND_TIME = ();
…		…
56	our %EXTCMD = ();	87	our %EXTCMD = ();
57	our %EXTICMD = ();	88	our %EXTICMD = ();
58	our %EXT_CORO = (); # coroutines bound to extensions	89	our %EXT_CORO = (); # coroutines bound to extensions
59	our %EXT_MAP = (); # pluggable maps	90	our %EXT_MAP = (); # pluggable maps
60		91
61	our $RELOAD; # number of reloads so far	92	our $RELOAD; # number of reloads so far, non-zero while in reload
62	our @EVENT;	93	our @EVENT;
		94	our @REFLECT; # set by XS
		95	our %REFLECT; # set by us
63		96
64	our $CONFDIR = confdir;	97	our $CONFDIR = confdir;
65	our $DATADIR = datadir;	98	our $DATADIR = datadir;
66	our $LIBDIR = "$DATADIR/ext";	99	our $LIBDIR = "$DATADIR/ext";
67	our $PODDIR = "$DATADIR/pod";	100	our $PODDIR = "$DATADIR/pod";
68	our $MAPDIR = "$DATADIR/" . mapdir;	101	our $MAPDIR = "$DATADIR/" . mapdir;
69	our $LOCALDIR = localdir;	102	our $LOCALDIR = localdir;
70	our $TMPDIR = "$LOCALDIR/" . tmpdir;	103	our $TMPDIR = "$LOCALDIR/" . tmpdir;
71	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	104	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	105	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73	our $RANDOMDIR = "$LOCALDIR/random";	106	our $RANDOMDIR = "$LOCALDIR/random";
74	our $BDBDIR = "$LOCALDIR/db";	107	our $BDBDIR = "$LOCALDIR/db";
		108	our $PIDFILE = "$LOCALDIR/pid";
		109	our $RUNTIMEFILE = "$LOCALDIR/runtime";
		110
		111	our %RESOURCE;
75		112
76	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	113	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77	our $TICK_WATCHER;
78	our $AIO_POLL_WATCHER;
79	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	114	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80	our $NEXT_TICK;	115	our $NEXT_TICK;
81	our $NOW;
82	our $USE_FSYNC = 1; # use fsync to write maps - default off	116	our $USE_FSYNC = 1; # use fsync to write maps - default on
83		117
		118	our $BDB_DEADLOCK_WATCHER;
		119	our $BDB_CHECKPOINT_WATCHER;
84	our $BDB_POLL_WATCHER;	120	our $BDB_TRICKLE_WATCHER;
85	our $DB_ENV;	121	our $DB_ENV;
		122
		123	our @EXTRA_MODULES = qw(pod match mapscript);
86		124
87	our %CFG;	125	our %CFG;
88		126
89	our $UPTIME; $UPTIME ||= time;	127	our $UPTIME; $UPTIME ||= time;
90	our $RUNTIME;	128	our $RUNTIME;
		129	our $NOW;
91		130
92	our (%PLAYER, %PLAYER_LOADING); # all users	131	our (%PLAYER, %PLAYER_LOADING); # all users
93	our (%MAP, %MAP_LOADING ); # all maps	132	our (%MAP, %MAP_LOADING ); # all maps
94	our $LINK_MAP; # the special {link} map, which is always available	133	our $LINK_MAP; # the special {link} map, which is always available
95		134
96	# used to convert map paths into valid unix filenames by replacing / by ∕	135	# used to convert map paths into valid unix filenames by replacing / by ∕
97	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	136	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98		137
99	our $LOAD; # a number between 0 (idle) and 1 (too many objects)	138	our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100	our $LOADAVG; # same thing, but with alpha-smoothing	139	our $LOADAVG; # same thing, but with alpha-smoothing
		140	our $JITTER; # average jitter
101	our $tick_start; # for load detecting purposes	141	our $TICK_START; # for load detecting purposes
		142
		143	our @POST_INIT;
		144
		145	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
		146	our $REALLY_UNLOOP; # never set to true, please :)
102		147
103	binmode STDOUT;	148	binmode STDOUT;
104	binmode STDERR;	149	binmode STDERR;
105		150
106	# read virtual server time, if available	151	# read virtual server time, if available
107	unless ($RUNTIME || !-e "$LOCALDIR/runtime") {	152	unless ($RUNTIME || !-e $RUNTIMEFILE) {
108	open my $fh, "<", "$LOCALDIR/runtime"	153	open my $fh, "<", $RUNTIMEFILE
109	or die "unable to read runtime file: $!";	154	or die "unable to read $RUNTIMEFILE file: $!";
110	$RUNTIME = <$fh> + 0.;	155	$RUNTIME = <$fh> + 0.;
111	}	156	}
		157
		158	eval "sub TICK() { $TICK } 1" or die;
112		159
113	mkdir $_	160	mkdir $_
114	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;	161	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
115		162
116	our $EMERGENCY_POSITION;	163	our $EMERGENCY_POSITION;
117		164
118	sub cf::map::normalise;	165	sub cf::map::normalise;
		166
		167	#############################################################################
		168
		169	%REFLECT = ();
		170	for (@REFLECT) {
		171	my $reflect = JSON::XS::decode_json $_;
		172	$REFLECT{$reflect->{class}} = $reflect;
		173	}
		174
		175	# this is decidedly evil
		176	$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
119		177
120	#############################################################################	178	#############################################################################
121		179
122	=head2 GLOBAL VARIABLES	180	=head2 GLOBAL VARIABLES
123		181
…		…
159		217
160	The raw value load value from the last tick.	218	The raw value load value from the last tick.
161		219
162	=item %cf::CFG	220	=item %cf::CFG
163		221
164	Configuration for the server, loaded from C</etc/crossfire/config>, or	222	Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165	from wherever your confdir points to.	223	from wherever your confdir points to.
166		224
167	=item cf::wait_for_tick, cf::wait_for_tick_begin	225	=item cf::wait_for_tick, cf::wait_for_tick_begin
168		226
169	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	227	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
170	returns directly I<after> the tick processing (and consequently, can only wake one process	228	returns directly I<after> the tick processing (and consequently, can only wake one process
171	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	229	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
172		230
173	=item @cf::INVOKE_RESULTS	231	=item @cf::INVOKE_RESULTS
174		232
175	This array contains the results of the last C<invoke ()> call. When	233	This array contains the results of the last C<invoke ()> call. When
176	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of	234	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177	that call.	235	that call.
178		236
		237	=item %cf::REFLECT
		238
		239	Contains, for each (C++) class name, a hash reference with information
		240	about object members (methods, scalars, arrays and flags) and other
		241	metadata, which is useful for introspection.
		242
179	=back	243	=back
180		244
181	=cut	245	=cut
182		246
183	BEGIN {	247	$Coro::State::WARNHOOK = sub {
184	*CORE::GLOBAL::warn = sub {
185	my $msg = join "", @_;	248	my $msg = join "", @_;
186		249
187	$msg .= "\n"	250	$msg .= "\n"
188	unless $msg =~ /\n$/;	251	unless $msg =~ /\n$/;
189		252
190	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	253	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191		254
192	utf8::encode $msg;
193	LOG llevError, $msg;	255	LOG llevError, $msg;
194	};	256	};
195	}	257
		258	$Coro::State::DIEHOOK = sub {
		259	return unless $^S eq 0; # "eq", not "=="
		260
		261	warn Carp::longmess $_[0];
		262
		263	if ($Coro::current == $Coro::main) {#d#
		264	warn "DIEHOOK called in main context, Coro bug?\n";#d#
		265	return;#d#
		266	}#d#
		267
		268	# kill coroutine otherwise
		269	Coro::terminate
		270	};
196		271
197	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	272	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	273	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	274	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	275	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
…		…
207	for my $pkg (qw(	282	for my $pkg (qw(
208	cf::global cf::attachable	283	cf::global cf::attachable
209	cf::object cf::object::player	284	cf::object cf::object::player
210	cf::client cf::player	285	cf::client cf::player
211	cf::arch cf::living	286	cf::arch cf::living
		287	cf::map cf::mapspace
212	cf::map cf::party cf::region	288	cf::party cf::region
213	)) {	289	)) {
214	no strict 'refs';
215	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	290	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216	}	291	}
217		292
218	$Event::DIED = sub {	293	$EV::DIED = sub {
219	warn "error in event callback: @_";	294	Carp::cluck "error in event callback: @_";
220	};	295	};
221		296
222	#############################################################################	297	#############################################################################
223		298
224	=head2 UTILITY FUNCTIONS	299	=head2 UTILITY FUNCTIONS
…		…
246	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	321	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247	$d	322	$d
248	} || "[unable to dump $_[0]: '$@']";	323	} || "[unable to dump $_[0]: '$@']";
249	}	324	}
250		325
251	=item $ref = cf::from_json $json	326	=item $ref = cf::decode_json $json
252		327
253	Converts a JSON string into the corresponding perl data structure.	328	Converts a JSON string into the corresponding perl data structure.
254		329
255	=item $json = cf::to_json $ref	330	=item $json = cf::encode_json $ref
256		331
257	Converts a perl data structure into its JSON representation.	332	Converts a perl data structure into its JSON representation.
258		333
259	=cut	334	=cut
260		335
261	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	336	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262		337
263	sub to_json ($) { $json_coder->encode ($_[0]) }	338	sub encode_json($) { $json_coder->encode ($_[0]) }
264	sub from_json ($) { $json_coder->decode ($_[0]) }	339	sub decode_json($) { $json_coder->decode ($_[0]) }
		340
		341	=item cf::post_init { BLOCK }
		342
		343	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
		344	but I<before> the server starts ticking again.
		345
		346	The cdoeblock will have a single boolean argument to indicate whether this
		347	is a reload or not.
		348
		349	=cut
		350
		351	sub post_init(&) {
		352	push @POST_INIT, shift;
		353	}
265		354
266	=item cf::lock_wait $string	355	=item cf::lock_wait $string
267		356
268	Wait until the given lock is available. See cf::lock_acquire.	357	Wait until the given lock is available. See cf::lock_acquire.
269		358
270	=item my $lock = cf::lock_acquire $string	359	=item my $lock = cf::lock_acquire $string
271		360
272	Wait until the given lock is available and then acquires it and returns	361	Wait until the given lock is available and then acquires it and returns
273	a Coro::guard object. If the guard object gets destroyed (goes out of scope,	362	a L<Guard> object. If the guard object gets destroyed (goes out of scope,
274	for example when the coroutine gets canceled), the lock is automatically	363	for example when the coroutine gets canceled), the lock is automatically
275	returned.	364	returned.
276		365
277	Locks are *not* recursive, locking from the same coro twice results in a	366	Locks are *not* recursive, locking from the same coro twice results in a
278	deadlocked coro.	367	deadlocked coro.
…		…
284		373
285	Return true if the lock is currently active, i.e. somebody has locked it.	374	Return true if the lock is currently active, i.e. somebody has locked it.
286		375
287	=cut	376	=cut
288		377
289	our %LOCK;	378	our $LOCKS = new Coro::SemaphoreSet;
290		379
291	sub lock_wait($) {	380	sub lock_wait($) {
292	my ($key) = @_;	381	$LOCKS->wait ($_[0]);
293
294	# wait for lock, if any
295	while ($LOCK{$key}) {
296	push @{ $LOCK{$key} }, $Coro::current;
297	Coro::schedule;
298	}
299	}	382	}
300		383
301	sub lock_acquire($) {	384	sub lock_acquire($) {
302	my ($key) = @_;	385	$LOCKS->guard ($_[0])
303
304	# wait, to be sure we are not locked
305	lock_wait $key;
306
307	$LOCK{$key} = [];
308
309	Coro::guard {
310	# wake up all waiters, to be on the safe side
311	$_->ready for @{ delete $LOCK{$key} };
312	}
313	}	386	}
314		387
315	sub lock_active($) {	388	sub lock_active($) {
316	my ($key) = @_;	389	$LOCKS->count ($_[0]) < 1
317
318	! ! $LOCK{$key}
319	}	390	}
320		391
321	sub freeze_mainloop {	392	sub freeze_mainloop {
322	return unless $TICK_WATCHER->is_active;	393	tick_inhibit_inc;
323		394
324	my $guard = Coro::guard {	395	&Guard::guard (\&tick_inhibit_dec);
325	$TICK_WATCHER->start;	396	}
326	};	397
327	$TICK_WATCHER->stop;	398	=item cf::periodic $interval, $cb
328	$guard	399
		400	Like EV::periodic, but randomly selects a starting point so that the actions
		401	get spread over timer.
		402
		403	=cut
		404
		405	sub periodic($$) {
		406	my ($interval, $cb) = @_;
		407
		408	my $start = rand List::Util::min 180, $interval;
		409
		410	EV::periodic $start, $interval, 0, $cb
329	}	411	}
330		412
331	=item cf::get_slot $time[, $priority[, $name]]	413	=item cf::get_slot $time[, $priority[, $name]]
332		414
333	Allocate $time seconds of blocking CPU time at priority C<$priority>:	415	Allocate $time seconds of blocking CPU time at priority C<$priority>:
…		…
341		423
342	=cut	424	=cut
343		425
344	our @SLOT_QUEUE;	426	our @SLOT_QUEUE;
345	our $SLOT_QUEUE;	427	our $SLOT_QUEUE;
		428	our $SLOT_DECAY = 0.9;
346		429
347	$SLOT_QUEUE->cancel if $SLOT_QUEUE;	430	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
348	$SLOT_QUEUE = Coro::async {	431	$SLOT_QUEUE = Coro::async {
		432	$Coro::current->desc ("timeslot manager");
		433
349	my $signal = new Coro::Signal;	434	my $signal = new Coro::Signal;
		435	my $busy;
350		436
351	while () {	437	while () {
352	next_job:	438	next_job:
		439
353	my $avail = cf::till_tick;	440	my $avail = cf::till_tick;
354	if ($avail > 0.01) {	441
355	for (0 .. $#SLOT_QUEUE) {	442	for (0 .. $#SLOT_QUEUE) {
356	if ($SLOT_QUEUE[$_][0] < $avail) {	443	if ($SLOT_QUEUE[$_][0] <= $avail) {
		444	$busy = 0;
357	my $job = splice @SLOT_QUEUE, $_, 1, ();	445	my $job = splice @SLOT_QUEUE, $_, 1, ();
358	$job->[2]->send;	446	$job->[2]->send;
359	Coro::cede;	447	Coro::cede;
360	goto next_job;	448	goto next_job;
361	}	449	} else {
		450	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
362	}	451	}
363	}	452	}
364		453
365	if (@SLOT_QUEUE) {	454	if (@SLOT_QUEUE) {
366	# we do not use wait_For_tick() as it returns immediately when tick is inactive	455	# we do not use wait_for_tick() as it returns immediately when tick is inactive
367	push @cf::WAIT_FOR_TICK, $signal;	456	push @cf::WAIT_FOR_TICK, $signal;
368	$signal->wait;	457	$signal->wait;
369	} else {	458	} else {
		459	$busy = 0;
370	Coro::schedule;	460	Coro::schedule;
371	}	461	}
372	}	462	}
373	};	463	};
374		464
375	sub get_slot($;$$) {	465	sub get_slot($;$$) {
		466	return if tick_inhibit || $Coro::current == $Coro::main;
		467
376	my ($time, $pri, $name) = @_;	468	my ($time, $pri, $name) = @_;
377		469
378	$time = $TICK * .6 if $time > $TICK * .6;	470	$time = clamp $time, 0.01, $TICK * .6;
		471
379	my $sig = new Coro::Signal;	472	my $sig = new Coro::Signal;
380		473
381	push @SLOT_QUEUE, [$time, $pri, $sig, $name];	474	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
382	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;	475	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
383	$SLOT_QUEUE->ready;	476	$SLOT_QUEUE->ready;
…		…
394		487
395	BEGIN { *async = \&Coro::async_pool }	488	BEGIN { *async = \&Coro::async_pool }
396		489
397	=item cf::sync_job { BLOCK }	490	=item cf::sync_job { BLOCK }
398		491
399	The design of Crossfire TRT requires that the main coroutine ($Coro::main)	492	The design of Deliantra requires that the main coroutine ($Coro::main)
400	is always able to handle events or runnable, as Crossfire TRT is only	493	is always able to handle events or runnable, as Deliantra is only
401	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not	494	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
402	acceptable.	495	acceptable.
403		496
404	If it must be done, put the blocking parts into C<sync_job>. This will run	497	If it must be done, put the blocking parts into C<sync_job>. This will run
405	the given BLOCK in another coroutine while waiting for the result. The	498	the given BLOCK in another coroutine while waiting for the result. The
…		…
410		503
411	sub sync_job(&) {	504	sub sync_job(&) {
412	my ($job) = @_;	505	my ($job) = @_;
413		506
414	if ($Coro::current == $Coro::main) {	507	if ($Coro::current == $Coro::main) {
415	my $time = Event::time;	508	my $time = EV::time;
416		509
417	# this is the main coro, too bad, we have to block	510	# this is the main coro, too bad, we have to block
418	# till the operation succeeds, freezing the server :/	511	# till the operation succeeds, freezing the server :/
419		512
420	# TODO: use suspend/resume instead	513	LOG llevError, Carp::longmess "sync job";#d#
421	# (but this is cancel-safe)	514
422	my $freeze_guard = freeze_mainloop;	515	my $freeze_guard = freeze_mainloop;
423		516
424	my $busy = 1;	517	my $busy = 1;
425	my @res;	518	my @res;
426		519
427	(async {	520	(async {
		521	$Coro::current->desc ("sync job coro");
428	@res = eval { $job->() };	522	@res = eval { $job->() };
429	warn $@ if $@;	523	warn $@ if $@;
430	undef $busy;	524	undef $busy;
431	})->prio (Coro::PRIO_MAX);	525	})->prio (Coro::PRIO_MAX);
432		526
433	while ($busy) {	527	while ($busy) {
434	Coro::cede or Event::one_event;	528	if (Coro::nready) {
		529	Coro::cede_notself;
		530	} else {
		531	EV::loop EV::LOOP_ONESHOT;
435	}	532	}
		533	}
436		534
437	$time = Event::time - $time;	535	my $time = EV::time - $time;
438		536
439	LOG llevError | logBacktrace, Carp::longmess "long sync job"
440	if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
441
442	$tick_start += $time; # do not account sync jobs to server load	537	$TICK_START += $time; # do not account sync jobs to server load
443		538
444	wantarray ? @res : $res[0]	539	wantarray ? @res : $res[0]
445	} else {	540	} else {
446	# we are in another coroutine, how wonderful, everything just works	541	# we are in another coroutine, how wonderful, everything just works
447		542
…		…
472	=item fork_call { }, $args	567	=item fork_call { }, $args
473		568
474	Executes the given code block with the given arguments in a seperate	569	Executes the given code block with the given arguments in a seperate
475	process, returning the results. Everything must be serialisable with	570	process, returning the results. Everything must be serialisable with
476	Coro::Storable. May, of course, block. Note that the executed sub may	571	Coro::Storable. May, of course, block. Note that the executed sub may
477	never block itself or use any form of Event handling.	572	never block itself or use any form of event handling.
478		573
479	=cut	574	=cut
480		575
481	sub fork_call(&@) {	576	sub fork_call(&@) {
482	my ($cb, @args) = @_;	577	my ($cb, @args) = @_;
…		…
491	}, @args;	586	}, @args;
492		587
493	wantarray ? @res : $res[-1]	588	wantarray ? @res : $res[-1]
494	}	589	}
495		590
		591	=item $coin = coin_from_name $name
		592
		593	=cut
		594
		595	our %coin_alias = (
		596	"silver" => "silvercoin",
		597	"silvercoin" => "silvercoin",
		598	"silvercoins" => "silvercoin",
		599	"gold" => "goldcoin",
		600	"goldcoin" => "goldcoin",
		601	"goldcoins" => "goldcoin",
		602	"platinum" => "platinacoin",
		603	"platinumcoin" => "platinacoin",
		604	"platinumcoins" => "platinacoin",
		605	"platina" => "platinacoin",
		606	"platinacoin" => "platinacoin",
		607	"platinacoins" => "platinacoin",
		608	"royalty" => "royalty",
		609	"royalties" => "royalty",
		610	);
		611
		612	sub coin_from_name($) {
		613	$coin_alias{$_[0]}
		614	? cf::arch::find $coin_alias{$_[0]}
		615	: undef
		616	}
		617
496	=item $value = cf::db_get $family => $key	618	=item $value = cf::db_get $family => $key
497		619
498	Returns a single value from the environment database.	620	Returns a single value from the environment database.
499		621
500	=item cf::db_put $family => $key => $value	622	=item cf::db_put $family => $key => $value
501		623
502	Stores the given C<$value> in the family. It can currently store binary	624	Stores the given C<$value> in the family. It can currently store binary
503	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).	625	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
504		626
		627	=item $db = cf::db_table "name"
		628
		629	Create and/or open a new database table. The string must not be "db" and must be unique
		630	within each server.
		631
505	=cut	632	=cut
		633
		634	sub db_table($) {
		635	my ($name) = @_;
		636	my $db = BDB::db_create $DB_ENV;
		637
		638	eval {
		639	$db->set_flags (BDB::CHKSUM);
		640
		641	utf8::encode $name;
		642	BDB::db_open $db, undef, $name, undef, BDB::BTREE,
		643	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
		644	cf::cleanup "db_open(db): $!" if $!;
		645	};
		646	cf::cleanup "db_open(db): $@" if $@;
		647
		648	$db
		649	}
506		650
507	our $DB;	651	our $DB;
508		652
509	sub db_init {	653	sub db_init {
510	unless ($DB) {
511	$DB = BDB::db_create $DB_ENV;
512
513	cf::sync_job {	654	cf::sync_job {
514	eval {	655	$DB ||= db_table "db";
515	$DB->set_flags (BDB::CHKSUM);
516
517	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
518	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
519	cf::cleanup "db_open(db): $!" if $!;
520	};
521	cf::cleanup "db_open(db): $@" if $@;
522	};
523	}	656	};
524	}	657	}
525		658
526	sub db_get($$) {	659	sub db_get($$) {
527	my $key = "$_[0]/$_[1]";	660	my $key = "$_[0]/$_[1]";
528		661
…		…
626		759
627	#############################################################################	760	#############################################################################
628		761
629	=head2 ATTACHABLE OBJECTS	762	=head2 ATTACHABLE OBJECTS
630		763
631	Many objects in crossfire are so-called attachable objects. That means you can	764	Many objects in deliantra are so-called attachable objects. That means you can
632	attach callbacks/event handlers (a collection of which is called an "attachment")	765	attach callbacks/event handlers (a collection of which is called an "attachment")
633	to it. All such attachable objects support the following methods.	766	to it. All such attachable objects support the following methods.
634		767
635	In the following description, CLASS can be any of C<global>, C<object>	768	In the following description, CLASS can be any of C<global>, C<object>
636	C<player>, C<client> or C<map> (i.e. the attachable objects in	769	C<player>, C<client> or C<map> (i.e. the attachable objects in
637	Crossfire TRT).	770	Deliantra).
638		771
639	=over 4	772	=over 4
640		773
641	=item $attachable->attach ($attachment, key => $value...)	774	=item $attachable->attach ($attachment, key => $value...)
642		775
…		…
686	=item cf::CLASS::attachment $name, ...	819	=item cf::CLASS::attachment $name, ...
687		820
688	Register an attachment by C<$name> through which attachable objects of the	821	Register an attachment by C<$name> through which attachable objects of the
689	given CLASS can refer to this attachment.	822	given CLASS can refer to this attachment.
690		823
691	Some classes such as crossfire maps and objects can specify attachments	824	Some classes such as deliantra maps and objects can specify attachments
692	that are attached at load/instantiate time, thus the need for a name.	825	that are attached at load/instantiate time, thus the need for a name.
693		826
694	These calls expect any number of the following handler/hook descriptions:	827	These calls expect any number of the following handler/hook descriptions:
695		828
696	=over 4	829	=over 4
…		…
924	}	1057	}
925		1058
926	0	1059	0
927	}	1060	}
928		1061
929	=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...)	1062	=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
930		1063
931	=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)	1064	=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
932		1065
933	Generate an object-specific event with the given arguments.	1066	Generate an object-specific event with the given arguments.
934		1067
…		…
940		1073
941	=cut	1074	=cut
942		1075
943	#############################################################################	1076	#############################################################################
944	# object support	1077	# object support
945	#
946		1078
		1079	sub _object_equal($$);
		1080	sub _object_equal($$) {
		1081	my ($a, $b) = @_;
		1082
		1083	return 0 unless (ref $a) eq (ref $b);
		1084
		1085	if ("HASH" eq ref $a) {
		1086	my @ka = keys %$a;
		1087	my @kb = keys %$b;
		1088
		1089	return 0 if @ka != @kb;
		1090
		1091	for (0 .. $#ka) {
		1092	return 0 unless $ka[$_] eq $kb[$_];
		1093	return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
		1094	}
		1095
		1096	} elsif ("ARRAY" eq ref $a) {
		1097
		1098	return 0 if @$a != @$b;
		1099
		1100	for (0 .. $#$a) {
		1101	return 0 unless _object_equal $a->[$_], $b->[$_];
		1102	}
		1103
		1104	} elsif ($a ne $b) {
		1105	return 0;
		1106	}
		1107
		1108	1
		1109	}
		1110
		1111	our $SLOW_MERGES;#d#
947	sub _can_merge {	1112	sub _can_merge {
948	my ($ob1, $ob2) = @_;	1113	my ($ob1, $ob2) = @_;
949		1114
950	local $Storable::canonical = 1;	1115	++$SLOW_MERGES;#d#
951	my $fob1 = Storable::freeze $ob1;
952	my $fob2 = Storable::freeze $ob2;
953		1116
954	$fob1 eq $fob2	1117	# we do the slow way here
		1118	return _object_equal $ob1, $ob2
955	}	1119	}
956		1120
957	sub reattach {	1121	sub reattach {
958	# basically do the same as instantiate, without calling instantiate	1122	# basically do the same as instantiate, without calling instantiate
959	my ($obj) = @_;	1123	my ($obj) = @_;
960		1124
		1125	# no longer needed after getting rid of delete_package?
961	bless $obj, ref $obj; # re-bless in case extensions have been reloaded	1126	#bless $obj, ref $obj; # re-bless in case extensions have been reloaded
962		1127
963	my $registry = $obj->registry;	1128	my $registry = $obj->registry;
964		1129
965	@$registry = ();	1130	@$registry = ();
966		1131
…		…
981	cf::attachable->attach (	1146	cf::attachable->attach (
982	prio => -1000000,	1147	prio => -1000000,
983	on_instantiate => sub {	1148	on_instantiate => sub {
984	my ($obj, $data) = @_;	1149	my ($obj, $data) = @_;
985		1150
986	$data = from_json $data;	1151	$data = decode_json $data;
987		1152
988	for (@$data) {	1153	for (@$data) {
989	my ($name, $args) = @$_;	1154	my ($name, $args) = @$_;
990		1155
991	$obj->attach ($name, %{$args || {} });	1156	$obj->attach ($name, %{$args || {} });
…		…
1005	);	1170	);
1006		1171
1007	sub object_freezer_save {	1172	sub object_freezer_save {
1008	my ($filename, $rdata, $objs) = @_;	1173	my ($filename, $rdata, $objs) = @_;
1009		1174
1010	my $guard = cf::lock_acquire "io";
1011
1012	sync_job {	1175	sync_job {
1013	if (length $$rdata) {	1176	if (length $$rdata) {
		1177	utf8::decode (my $decname = $filename);
1014	warn sprintf "saving %s (%d,%d)\n",	1178	warn sprintf "saving %s (%d,%d)\n",
1015	$filename, length $$rdata, scalar @$objs;	1179	$decname, length $$rdata, scalar @$objs;
1016		1180
1017	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1181	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1018	chmod SAVE_MODE, $fh;	1182	aio_chmod $fh, SAVE_MODE;
1019	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1183	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1020	aio_fsync $fh if $cf::USE_FSYNC;	1184	if ($cf::USE_FSYNC) {
		1185	aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
		1186	aio_fsync $fh;
		1187	}
1021	close $fh;	1188	aio_close $fh;
1022		1189
1023	if (@$objs) {	1190	if (@$objs) {
1024	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {	1191	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1025	chmod SAVE_MODE, $fh;	1192	aio_chmod $fh, SAVE_MODE;
1026	my $data = Storable::nfreeze { version => 1, objs => $objs };	1193	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1027	aio_write $fh, 0, (length $data), $data, 0;	1194	aio_write $fh, 0, (length $data), $data, 0;
1028	aio_fsync $fh if $cf::USE_FSYNC;	1195	if ($cf::USE_FSYNC) {
		1196	aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
		1197	aio_fsync $fh;
		1198	}
1029	close $fh;	1199	aio_close $fh;
1030	aio_rename "$filename.pst~", "$filename.pst";	1200	aio_rename "$filename.pst~", "$filename.pst";
1031	}	1201	}
1032	} else {	1202	} else {
1033	aio_unlink "$filename.pst";	1203	aio_unlink "$filename.pst";
1034	}	1204	}
1035		1205
1036	aio_rename "$filename~", $filename;	1206	aio_rename "$filename~", $filename;
		1207
		1208	$filename =~ s%/[^/]+$%%;
		1209	aio_pathsync $filename if $cf::USE_FSYNC;
1037	} else {	1210	} else {
1038	warn "FATAL: $filename~: $!\n";	1211	warn "unable to save objects: $filename~: $!\n";
1039	}	1212	}
1040	} else {	1213	} else {
1041	aio_unlink $filename;	1214	aio_unlink $filename;
1042	aio_unlink "$filename.pst";	1215	aio_unlink "$filename.pst";
1043	}	1216	}
1044	};	1217	};
1045
1046	undef $guard;
1047	}	1218	}
1048		1219
1049	sub object_freezer_as_string {	1220	sub object_freezer_as_string {
1050	my ($rdata, $objs) = @_;	1221	my ($rdata, $objs) = @_;
1051		1222
…		…
1056		1227
1057	sub object_thawer_load {	1228	sub object_thawer_load {
1058	my ($filename) = @_;	1229	my ($filename) = @_;
1059		1230
1060	my ($data, $av);	1231	my ($data, $av);
1061
1062	my $guard = cf::lock_acquire "io";
1063		1232
1064	(aio_load $filename, $data) >= 0	1233	(aio_load $filename, $data) >= 0
1065	or return;	1234	or return;
1066		1235
1067	unless (aio_stat "$filename.pst") {	1236	unless (aio_stat "$filename.pst") {
1068	(aio_load "$filename.pst", $av) >= 0	1237	(aio_load "$filename.pst", $av) >= 0
1069	or return;	1238	or return;
1070		1239
1071	undef $guard;
1072	$av = eval { (Storable::thaw $av)->{objs} };	1240	my $st = eval { Coro::Storable::thaw $av };
		1241	$av = $st->{objs};
1073	}	1242	}
1074		1243
		1244	utf8::decode (my $decname = $filename);
1075	warn sprintf "loading %s (%d)\n",	1245	warn sprintf "loading %s (%d,%d)\n",
1076	$filename, length $data, scalar @{$av || []};	1246	$decname, length $data, scalar @{$av || []};
1077		1247
1078	($data, $av)	1248	($data, $av)
1079	}	1249	}
1080		1250
1081	=head2 COMMAND CALLBACKS	1251	=head2 COMMAND CALLBACKS
…		…
1137	my ($name, $cb) = @_;	1307	my ($name, $cb) = @_;
1138		1308
1139	$EXTICMD{$name} = $cb;	1309	$EXTICMD{$name} = $cb;
1140	}	1310	}
1141		1311
		1312	use File::Glob ();
		1313
1142	cf::player->attach (	1314	cf::player->attach (
1143	on_command => sub {	1315	on_unknown_command => sub {
1144	my ($pl, $name, $params) = @_;	1316	my ($pl, $name, $params) = @_;
1145		1317
1146	my $cb = $COMMAND{$name}	1318	my $cb = $COMMAND{$name}
1147	or return;	1319	or return;
1148		1320
…		…
1178		1350
1179	cf::override;	1351	cf::override;
1180	},	1352	},
1181	);	1353	);
1182		1354
		1355	# "readahead" all extensions
		1356	sub cache_extensions {
		1357	my $grp = IO::AIO::aio_group;
		1358
		1359	add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
		1360	for (grep /\.ext$/, @{$_[0]}) {
		1361	add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
		1362	}
		1363	};
		1364
		1365	$grp
		1366	}
		1367
1183	sub load_extensions {	1368	sub load_extensions {
1184	cf::sync_job {	1369	cf::sync_job {
1185	my %todo;	1370	my %todo;
1186		1371
1187	for my $path (<$LIBDIR/*.ext>) {	1372	for my $path (<$LIBDIR/*.ext>) {
…		…
1206		1391
1207	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1392	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1208	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1393	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1209		1394
1210	$ext{source} =	1395	$ext{source} =
1211	"package $pkg; use strict; use utf8;\n"	1396	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1212	. "#line 1 \"$path\"\n{\n"	1397	. "#line 1 \"$path\"\n{\n"
1213	. $source	1398	. $source
1214	. "\n};\n1";	1399	. "\n};\n1";
1215		1400
1216	$todo{$base} = \%ext;	1401	$todo{$base} = \%ext;
1217	}	1402	}
1218		1403
		1404	my $pass = 0;
1219	my %done;	1405	my %done;
1220	while (%todo) {	1406	while (%todo) {
1221	my $progress;	1407	my $progress;
1222		1408
		1409	++$pass;
		1410
		1411	ext:
1223	while (my ($k, $v) = each %todo) {	1412	while (my ($k, $v) = each %todo) {
1224	for (split /,\s*/, $v->{meta}{depends}) {	1413	for (split /,\s*/, $v->{meta}{depends}) {
1225	goto skip	1414	next ext
1226	unless exists $done{$_};	1415	unless exists $done{$_};
1227	}	1416	}
1228		1417
1229	warn "... loading '$k' into '$v->{pkg}'\n";	1418	warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1230		1419
1231	unless (eval $v->{source}) {	1420	my $active = eval $v->{source};
		1421
		1422	if (length $@) {
1232	my $msg = $@ ? "$v->{path}: $@\n"	1423	warn "$v->{path}: $@\n";
1233	: "$v->{base}: extension inactive.\n";
1234		1424
		1425	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1235	if (exists $v->{meta}{mandatory}) {	1426	if exists $v->{meta}{mandatory};
1236	warn $msg;	1427	} else {
1237	warn "mandatory extension failed to load, exiting.\n";	1428	$done{$k} = delete $todo{$k};
1238	exit 1;	1429	push @EXTS, $v->{pkg};
1239	}	1430	$progress = 1;
1240		1431
1241	warn $msg;	1432	warn "$v->{base}: extension inactive.\n"
		1433	unless $active;
1242	}	1434	}
1243
1244	$done{$k} = delete $todo{$k};
1245	push @EXTS, $v->{pkg};
1246	$progress = 1;
1247	}	1435	}
1248		1436
1249	skip:	1437	unless ($progress) {
1250	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"	1438	warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1251	unless $progress;	1439
		1440	while (my ($k, $v) = each %todo) {
		1441	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
		1442	if exists $v->{meta}{mandatory};
		1443	}
		1444	}
1252	}	1445	}
1253	};	1446	};
1254	}	1447	}
1255		1448
1256	#############################################################################	1449	#############################################################################
1257		1450
1258	=back	1451	=back
1259		1452
1260	=head2 CORE EXTENSIONS	1453	=head2 CORE EXTENSIONS
1261		1454
1262	Functions and methods that extend core crossfire objects.	1455	Functions and methods that extend core deliantra objects.
1263		1456
1264	=cut	1457	=cut
1265		1458
1266	package cf::player;	1459	package cf::player;
1267		1460
1268	use Coro::AIO;	1461	use Coro::AIO;
1269		1462
1270	=head3 cf::player	1463	=head3 cf::player
1271		1464
1272	=over 4	1465	=over 4
		1466
		1467	=item cf::player::num_playing
		1468
		1469	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1470
		1471	=cut
		1472
		1473	sub num_playing {
		1474	scalar grep
		1475	$_->ob->map
		1476	&& !$_->hidden
		1477	&& !$_->ob->flag (cf::FLAG_WIZ),
		1478	cf::player::list
		1479	}
1273		1480
1274	=item cf::player::find $login	1481	=item cf::player::find $login
1275		1482
1276	Returns the given player object, loading it if necessary (might block).	1483	Returns the given player object, loading it if necessary (might block).
1277		1484
…		…
1296		1503
1297	sub exists($) {	1504	sub exists($) {
1298	my ($login) = @_;	1505	my ($login) = @_;
1299		1506
1300	$cf::PLAYER{$login}	1507	$cf::PLAYER{$login}
1301	or cf::sync_job { !aio_stat path $login }	1508	or !aio_stat path $login
1302	}	1509	}
1303		1510
1304	sub find($) {	1511	sub find($) {
1305	return $cf::PLAYER{$_[0]} || do {	1512	return $cf::PLAYER{$_[0]} || do {
1306	my $login = $_[0];	1513	my $login = $_[0];
…		…
1316	aio_unlink +(playerdir $login) . "/$login.pl";	1523	aio_unlink +(playerdir $login) . "/$login.pl";
1317		1524
1318	my $f = new_from_file cf::object::thawer path $login	1525	my $f = new_from_file cf::object::thawer path $login
1319	or return;	1526	or return;
1320		1527
1321	$f->next;
1322	my $pl = cf::player::load_pl $f	1528	my $pl = cf::player::load_pl $f
1323	or return;	1529	or return;
		1530
1324	local $cf::PLAYER_LOADING{$login} = $pl;	1531	local $cf::PLAYER_LOADING{$login} = $pl;
1325	$f->resolve_delayed_derefs;	1532	$f->resolve_delayed_derefs;
1326	$cf::PLAYER{$login} = $pl	1533	$cf::PLAYER{$login} = $pl
1327	}	1534	}
1328	}	1535	}
1329	}	1536	}
1330		1537
		1538	cf::player->attach (
		1539	on_load => sub {
		1540	my ($pl, $path) = @_;
		1541
		1542	# restore slots saved in save, below
		1543	my $slots = delete $pl->{_slots};
		1544
		1545	$pl->ob->current_weapon ($slots->[0]);
		1546	$pl->combat_ob ($slots->[1]);
		1547	$pl->ranged_ob ($slots->[2]);
		1548	},
		1549	);
		1550
1331	sub save($) {	1551	sub save($) {
1332	my ($pl) = @_;	1552	my ($pl) = @_;
1333		1553
1334	return if $pl->{deny_save};	1554	return if $pl->{deny_save};
1335		1555
…		…
1338		1558
1339	return if $pl->{deny_save};	1559	return if $pl->{deny_save};
1340		1560
1341	aio_mkdir playerdir $pl, 0770;	1561	aio_mkdir playerdir $pl, 0770;
1342	$pl->{last_save} = $cf::RUNTIME;	1562	$pl->{last_save} = $cf::RUNTIME;
		1563
		1564	cf::get_slot 0.01;
		1565
		1566	# save slots, to be restored later
		1567	local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1343		1568
1344	$pl->save_pl ($path);	1569	$pl->save_pl ($path);
1345	cf::cede_to_tick;	1570	cf::cede_to_tick;
1346	}	1571	}
1347		1572
…		…
1379	my ($pl) = @_;	1604	my ($pl) = @_;
1380		1605
1381	my $name = $pl->ob->name;	1606	my $name = $pl->ob->name;
1382		1607
1383	$pl->{deny_save} = 1;	1608	$pl->{deny_save} = 1;
1384	$pl->password ("*"); # this should lock out the player until we nuked the dir	1609	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1385		1610
1386	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1611	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1387	$pl->deactivate;	1612	$pl->deactivate;
		1613	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
		1614	$pl->ob->check_score;
1388	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1615	$pl->invoke (cf::EVENT_PLAYER_QUIT);
1389	$pl->ns->destroy if $pl->ns;	1616	$pl->ns->destroy if $pl->ns;
1390		1617
1391	my $path = playerdir $pl;	1618	my $path = playerdir $pl;
1392	my $temp = "$path~$cf::RUNTIME~deleting~";	1619	my $temp = "$path~$cf::RUNTIME~deleting~";
…		…
1431		1658
1432	for my $login (@$dirs) {	1659	for my $login (@$dirs) {
1433	my $path = path $login;	1660	my $path = path $login;
1434		1661
1435	# a .pst is a dead give-away for a valid player	1662	# a .pst is a dead give-away for a valid player
1436	unless (-e "$path.pst") {	1663	# if no pst file found, open and chekc for blocked users
		1664	if (aio_stat "$path.pst") {
1437	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;	1665	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1438	aio_read $fh, 0, 512, my $buf, 0 or next;	1666	aio_read $fh, 0, 512, my $buf, 0 or next;
1439	$buf !~ /^password -------------$/m or next; # official not-valid tag	1667	$buf !~ /^password -------------$/m or next; # official not-valid tag
1440	}	1668	}
1441		1669
…		…
1472	}	1700	}
1473		1701
1474	\@paths	1702	\@paths
1475	}	1703	}
1476		1704
1477	=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)	1705	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1478		1706
1479	Expand crossfire pod fragments into protocol xml.	1707	Expand deliantra pod fragments into protocol xml.
1480
1481	=cut
1482
1483	sub expand_cfpod {
1484	((my $self), (local $_)) = @_;
1485
1486	# escape & and <
1487	s/&/&amp;/g;
1488	s/(?<![BIUGHT])</&lt;/g;
1489
1490	# this is buggy, it needs to properly take care of nested <'s
1491
1492	1 while
1493	# replace B<>, I<>, U<> etc.
1494	s/B<([^\>]*)>/<b>$1<\/b>/
1495	|| s/I<([^\>]*)>/<i>$1<\/i>/
1496	|| s/U<([^\>]*)>/<u>$1<\/u>/
1497	|| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1498	# replace G<male|female> tags
1499	|| s{G<([^>|]*)\|([^>]*)>}{
1500	$self->gender ? $2 : $1
1501	}ge
1502	# replace H<hint text>
1503	|| s{H<([^\>]*)>}
1504	{
1505	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1506	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1507	"")
1508	[$self->{hintmode}]
1509	}ge;
1510
1511	# create single paragraphs (very hackish)
1512	s/(?<=\S)\n(?=\w)/ /g;
1513
1514	# compress some whitespace
1515	s/\s+\n/\n/g; # ws line-ends
1516	s/\n\n+/\n/g; # double lines
1517	s/^\n+//; # beginning lines
1518	s/\n+$//; # ending lines
1519
1520	$_
1521	}
1522
1523	sub hintmode {
1524	$_[0]{hintmode} = $_[1] if @_ > 1;
1525	$_[0]{hintmode}
1526	}
1527		1708
1528	=item $player->ext_reply ($msgid, @msg)	1709	=item $player->ext_reply ($msgid, @msg)
1529		1710
1530	Sends an ext reply to the player.	1711	Sends an ext reply to the player.
1531		1712
…		…
1598	our $MAX_RESET = 3600;	1779	our $MAX_RESET = 3600;
1599	our $DEFAULT_RESET = 3000;	1780	our $DEFAULT_RESET = 3000;
1600		1781
1601	sub generate_random_map {	1782	sub generate_random_map {
1602	my ($self, $rmp) = @_;	1783	my ($self, $rmp) = @_;
		1784
		1785	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
		1786
1603	# mit "rum" bekleckern, nicht	1787	# mit "rum" bekleckern, nicht
1604	$self->_create_random_map (	1788	$self->_create_random_map (
1605	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},	1789	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1606	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},	1790	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1607	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},	1791	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1608	$rmp->{exit_on_final_map},	1792	$rmp->{exit_on_final_map},
1609	$rmp->{xsize}, $rmp->{ysize},	1793	$rmp->{xsize}, $rmp->{ysize},
1610	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},	1794	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1611	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},	1795	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
…		…
1729		1913
1730	# the temporary/swap location	1914	# the temporary/swap location
1731	sub save_path {	1915	sub save_path {
1732	my ($self) = @_;	1916	my ($self) = @_;
1733		1917
1734	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1918	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1735	"$TMPDIR/$path.map"	1919	"$TMPDIR/$path.map"
1736	}	1920	}
1737		1921
1738	# the unique path, undef == no special unique path	1922	# the unique path, undef == no special unique path
1739	sub uniq_path {	1923	sub uniq_path {
1740	my ($self) = @_;	1924	my ($self) = @_;
1741		1925
1742	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1926	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1743	"$UNIQUEDIR/$path"	1927	"$UNIQUEDIR/$path"
1744	}
1745
1746	# and all this just because we cannot iterate over
1747	# all maps in C++...
1748	sub change_all_map_light {
1749	my ($change) = @_;
1750
1751	$_->change_map_light ($change)
1752	for grep $_->outdoor, values %cf::MAP;
1753	}	1928	}
1754		1929
1755	sub decay_objects {	1930	sub decay_objects {
1756	my ($self) = @_;	1931	my ($self) = @_;
1757		1932
…		…
1841	sub find {	2016	sub find {
1842	my ($path, $origin) = @_;	2017	my ($path, $origin) = @_;
1843		2018
1844	$path = normalise $path, $origin && $origin->path;	2019	$path = normalise $path, $origin && $origin->path;
1845		2020
		2021	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1846	cf::lock_wait "map_find:$path";	2022	my $guard2 = cf::lock_acquire "map_find:$path";
1847		2023
1848	$cf::MAP{$path} || do {	2024	$cf::MAP{$path} || do {
1849	my $guard = cf::lock_acquire "map_find:$path";
1850	my $map = new_from_path cf::map $path	2025	my $map = new_from_path cf::map $path
1851	or return;	2026	or return;
1852		2027
1853	$map->{last_save} = $cf::RUNTIME;	2028	$map->{last_save} = $cf::RUNTIME;
1854		2029
…		…
1856	or return;	2031	or return;
1857		2032
1858	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	2033	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1859	# doing this can freeze the server in a sync job, obviously	2034	# doing this can freeze the server in a sync job, obviously
1860	#$cf::WAIT_FOR_TICK->wait;	2035	#$cf::WAIT_FOR_TICK->wait;
		2036	undef $guard2;
		2037	undef $guard1;
1861	$map->reset;	2038	$map->reset;
1862	undef $guard;
1863	return find $path;	2039	return find $path;
1864	}	2040	}
1865		2041
1866	$cf::MAP{$path} = $map	2042	$cf::MAP{$path} = $map
1867	}	2043	}
1868	}	2044	}
1869		2045
1870	sub pre_load { }	2046	sub pre_load { }
1871	sub post_load { }	2047	#sub post_load { } # XS
1872		2048
1873	sub load {	2049	sub load {
1874	my ($self) = @_;	2050	my ($self) = @_;
1875		2051
1876	local $self->{deny_reset} = 1; # loading can take a long time	2052	local $self->{deny_reset} = 1; # loading can take a long time
1877		2053
1878	my $path = $self->{path};	2054	my $path = $self->{path};
1879		2055
1880	{	2056	{
1881	my $guard1 = cf::lock_acquire "map_data:$path";	2057	my $guard = cf::lock_acquire "map_data:$path";
1882	my $guard2 = cf::lock_acquire "map_load:$path";
1883		2058
		2059	return unless $self->valid;
1884	return if $self->in_memory != cf::MAP_SWAPPED;	2060	return unless $self->in_memory == cf::MAP_SWAPPED;
1885		2061
1886	$self->in_memory (cf::MAP_LOADING);	2062	$self->in_memory (cf::MAP_LOADING);
1887		2063
1888	$self->alloc;	2064	$self->alloc;
1889		2065
…		…
1893	my $f = new_from_file cf::object::thawer $self->{load_path};	2069	my $f = new_from_file cf::object::thawer $self->{load_path};
1894	$f->skip_block;	2070	$f->skip_block;
1895	$self->_load_objects ($f)	2071	$self->_load_objects ($f)
1896	or return;	2072	or return;
1897		2073
1898	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	2074	$self->post_load_original
1899	if delete $self->{load_original};	2075	if delete $self->{load_original};
1900		2076
1901	if (my $uniq = $self->uniq_path) {	2077	if (my $uniq = $self->uniq_path) {
1902	utf8::encode $uniq;	2078	utf8::encode $uniq;
1903	unless (aio_stat $uniq) {	2079	unless (aio_stat $uniq) {
…		…
1921	unless ($self->{deny_activate}) {	2097	unless ($self->{deny_activate}) {
1922	$self->decay_objects;	2098	$self->decay_objects;
1923	$self->fix_auto_apply;	2099	$self->fix_auto_apply;
1924	$self->update_buttons;	2100	$self->update_buttons;
1925	cf::cede_to_tick;	2101	cf::cede_to_tick;
1926	$self->set_darkness_map;
1927	cf::cede_to_tick;
1928	$self->activate;	2102	$self->activate;
1929	}	2103	}
1930		2104
1931	$self->{last_save} = $cf::RUNTIME;	2105	$self->{last_save} = $cf::RUNTIME;
1932	$self->last_access ($cf::RUNTIME);	2106	$self->last_access ($cf::RUNTIME);
1933		2107
1934	$self->in_memory (cf::MAP_IN_MEMORY);	2108	$self->in_memory (cf::MAP_ACTIVE);
1935	}	2109	}
1936		2110
1937	$self->post_load;	2111	$self->post_load;
1938	}	2112	}
1939		2113
		2114	# customize the map for a given player, i.e.
		2115	# return the _real_ map. used by e.g. per-player
		2116	# maps to change the path to ~playername/mappath
1940	sub customise_for {	2117	sub customise_for {
1941	my ($self, $ob) = @_;	2118	my ($self, $ob) = @_;
1942		2119
1943	return find "~" . $ob->name . "/" . $self->{path}	2120	return find "~" . $ob->name . "/" . $self->{path}
1944	if $self->per_player;	2121	if $self->per_player;
…		…
1997	my ($path, $origin, $load) = @_;	2174	my ($path, $origin, $load) = @_;
1998		2175
1999	$path = normalise $path, $origin && $origin->{path};	2176	$path = normalise $path, $origin && $origin->{path};
2000		2177
2001	if (my $map = $cf::MAP{$path}) {	2178	if (my $map = $cf::MAP{$path}) {
2002	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;	2179	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2003	}	2180	}
2004		2181
2005	$MAP_PREFETCH{$path} |= $load;	2182	$MAP_PREFETCH{$path} |= $load;
2006		2183
2007	$MAP_PREFETCHER ||= cf::async {	2184	$MAP_PREFETCHER ||= cf::async {
		2185	$Coro::current->{desc} = "map prefetcher";
		2186
2008	while (%MAP_PREFETCH) {	2187	while (%MAP_PREFETCH) {
2009	while (my ($k, $v) = each %MAP_PREFETCH) {	2188	while (my ($k, $v) = each %MAP_PREFETCH) {
2010	if (my $map = find $k) {	2189	if (my $map = find $k) {
2011	$map->load if $v;	2190	$map->load if $v;
2012	}	2191	}
…		…
2038	return if $self->{deny_save};	2217	return if $self->{deny_save};
2039		2218
2040	local $self->{last_access} = $self->last_access;#d#	2219	local $self->{last_access} = $self->last_access;#d#
2041		2220
2042	cf::async {	2221	cf::async {
		2222	$Coro::current->{desc} = "map player save";
2043	$_->contr->save for $self->players;	2223	$_->contr->save for $self->players;
2044	};	2224	};
		2225
		2226	cf::get_slot 0.02;
2045		2227
2046	if ($uniq) {	2228	if ($uniq) {
2047	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);	2229	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2048	$self->_save_objects ($uniq, cf::IO_UNIQUES);	2230	$self->_save_objects ($uniq, cf::IO_UNIQUES);
2049	} else {	2231	} else {
…		…
2058	$self->save;	2240	$self->save;
2059		2241
2060	my $lock = cf::lock_acquire "map_data:$self->{path}";	2242	my $lock = cf::lock_acquire "map_data:$self->{path}";
2061		2243
2062	return if $self->players;	2244	return if $self->players;
2063	return if $self->in_memory != cf::MAP_IN_MEMORY;	2245	return if $self->in_memory != cf::MAP_ACTIVE;
2064	return if $self->{deny_save};	2246	return if $self->{deny_save};
2065		2247
		2248	$self->in_memory (cf::MAP_SWAPPED);
		2249
		2250	$self->deactivate;
		2251	$_->clear_links_to ($self) for values %cf::MAP;
2066	$self->clear;	2252	$self->clear;
2067	$self->in_memory (cf::MAP_SWAPPED);
2068	}	2253	}
2069		2254
2070	sub reset_at {	2255	sub reset_at {
2071	my ($self) = @_;	2256	my ($self) = @_;
2072		2257
…		…
2090		2275
2091	my $lock = cf::lock_acquire "map_data:$self->{path}";	2276	my $lock = cf::lock_acquire "map_data:$self->{path}";
2092		2277
2093	return if $self->players;	2278	return if $self->players;
2094		2279
2095	warn "resetting map ", $self->path;	2280	warn "resetting map ", $self->path, "\n";
2096		2281
2097	$self->in_memory (cf::MAP_SWAPPED);	2282	$self->in_memory (cf::MAP_SWAPPED);
2098		2283
2099	# need to save uniques path	2284	# need to save uniques path
2100	unless ($self->{deny_save}) {	2285	unless ($self->{deny_save}) {
…		…
2104	if $uniq;	2289	if $uniq;
2105	}	2290	}
2106		2291
2107	delete $cf::MAP{$self->path};	2292	delete $cf::MAP{$self->path};
2108		2293
		2294	$self->deactivate;
		2295	$_->clear_links_to ($self) for values %cf::MAP;
2109	$self->clear;	2296	$self->clear;
2110
2111	$_->clear_links_to ($self) for values %cf::MAP;
2112		2297
2113	$self->unlink_save;	2298	$self->unlink_save;
2114	$self->destroy;	2299	$self->destroy;
2115	}	2300	}
2116		2301
…		…
2183		2368
2184	sub unique_maps() {	2369	sub unique_maps() {
2185	[	2370	[
2186	map {	2371	map {
2187	utf8::decode $_;	2372	utf8::decode $_;
2188	/\.map$/	2373	s/\.map$//; # TODO future compatibility hack
		2374	/\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
		2375	? ()
2189	? normalise $_	2376	: normalise $_
2190	: ()
2191	} @{ aio_readdir $UNIQUEDIR or [] }	2377	} @{ aio_readdir $UNIQUEDIR or [] }
2192	]	2378	]
2193	}	2379	}
2194		2380
2195	package cf;	2381	=item cf::map::static_maps
		2382
		2383	Returns an arrayref if paths of all static maps (all preinstalled F<.map>
		2384	file in the shared directory excluding F</styles> and F</editor>). May
		2385	block.
		2386
		2387	=cut
		2388
		2389	sub static_maps() {
		2390	my @dirs = "";
		2391	my @maps;
		2392
		2393	while (@dirs) {
		2394	my $dir = shift @dirs;
		2395
		2396	next if $dir eq "/styles" || $dir eq "/editor";
		2397
		2398	my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
		2399	or return;
		2400
		2401	for (@$files) {
		2402	s/\.map$// or next;
		2403	utf8::decode $_;
		2404	push @maps, "$dir/$_";
		2405	}
		2406
		2407	push @dirs, map "$dir/$_", @$dirs;
		2408	}
		2409
		2410	\@maps
		2411	}
2196		2412
2197	=back	2413	=back
2198		2414
2199	=head3 cf::object	2415	=head3 cf::object
2200		2416
…		…
2204		2420
2205	=over 4	2421	=over 4
2206		2422
2207	=item $ob->inv_recursive	2423	=item $ob->inv_recursive
2208		2424
2209	Returns the inventory of the object _and_ their inventories, recursively.	2425	Returns the inventory of the object I<and> their inventories, recursively,
		2426	but I<not> the object itself.
2210		2427
2211	=cut	2428	=cut
2212		2429
2213	sub inv_recursive_;	2430	sub inv_recursive_;
2214	sub inv_recursive_ {	2431	sub inv_recursive_ {
…		…
2219	inv_recursive_ inv $_[0]	2436	inv_recursive_ inv $_[0]
2220	}	2437	}
2221		2438
2222	=item $ref = $ob->ref	2439	=item $ref = $ob->ref
2223		2440
2224	creates and returns a persistent reference to an objetc that can be stored as a string.	2441	Creates and returns a persistent reference to an object that can be stored as a string.
2225		2442
2226	=item $ob = cf::object::deref ($refstring)	2443	=item $ob = cf::object::deref ($refstring)
2227		2444
2228	returns the objetc referenced by refstring. may return undef when it cnanot find the object,	2445	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2229	even if the object actually exists. May block.	2446	even if the object actually exists. May block.
…		…
2231	=cut	2448	=cut
2232		2449
2233	sub deref {	2450	sub deref {
2234	my ($ref) = @_;	2451	my ($ref) = @_;
2235		2452
2236	# temporary compatibility#TODO#remove
2237	$ref =~ s{^<}{player/<};
2238
2239	if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {	2453	if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2240	my ($uuid, $name) = ($1, $2);	2454	my ($uuid, $name) = ($1, $2);
2241	my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name	2455	my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2242	or return;	2456	or return;
2243	$pl->ob->uuid eq $uuid	2457	$pl->ob->uuid eq $uuid
2244	or return;	2458	or return;
…		…
2264	can be C<undef>. Does the right thing when the player is currently in a	2478	can be C<undef>. Does the right thing when the player is currently in a
2265	dialogue with the given NPC character.	2479	dialogue with the given NPC character.
2266		2480
2267	=cut	2481	=cut
2268		2482
		2483	our $SAY_CHANNEL = {
		2484	id => "say",
		2485	title => "Map",
		2486	reply => "say ",
		2487	tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
		2488	};
		2489
		2490	our $CHAT_CHANNEL = {
		2491	id => "chat",
		2492	title => "Chat",
		2493	reply => "chat ",
		2494	tooltip => "Player chat and shouts, global to the server.",
		2495	};
		2496
2269	# rough implementation of a future "reply" method that works	2497	# rough implementation of a future "reply" method that works
2270	# with dialog boxes.	2498	# with dialog boxes.
2271	#TODO: the first argument must go, split into a $npc->reply_to ( method	2499	#TODO: the first argument must go, split into a $npc->reply_to ( method
2272	sub cf::object::player::reply($$$;$) {	2500	sub cf::object::player::reply($$$;$) {
2273	my ($self, $npc, $msg, $flags) = @_;	2501	my ($self, $npc, $msg, $flags) = @_;
…		…
2284	my $dialog = $pl->{npc_dialog};	2512	my $dialog = $pl->{npc_dialog};
2285	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));	2513	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2286		2514
2287	} else {	2515	} else {
2288	$msg = $npc->name . " says: $msg" if $npc;	2516	$msg = $npc->name . " says: $msg" if $npc;
2289	$self->message ($msg, $flags);	2517	$self->send_msg ($SAY_CHANNEL => $msg, $flags);
2290	}	2518	}
2291	}	2519	}
2292	}	2520	}
2293		2521
2294	=item $object->send_msg ($channel, $msg, $color, [extra...])	2522	=item $object->send_msg ($channel, $msg, $color, [extra...])
…		…
2319		2547
2320	=item $player_object->enter_link	2548	=item $player_object->enter_link
2321		2549
2322	Freezes the player and moves him/her to a special map (C<{link}>).	2550	Freezes the player and moves him/her to a special map (C<{link}>).
2323		2551
2324	The player should be reasonably safe there for short amounts of time. You	2552	The player should be reasonably safe there for short amounts of time (e.g.
2325	I<MUST> call C<leave_link> as soon as possible, though.	2553	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
		2554	though, as the palyer cannot control the character while it is on the link
		2555	map.
2326		2556
2327	Will never block.	2557	Will never block.
2328		2558
2329	=item $player_object->leave_link ($map, $x, $y)	2559	=item $player_object->leave_link ($map, $x, $y)
2330		2560
…		…
2382	($x, $y) = (-1, -1)	2612	($x, $y) = (-1, -1)
2383	unless (defined $x) && (defined $y);	2613	unless (defined $x) && (defined $y);
2384		2614
2385	# use -1 or undef as default coordinates, not 0, 0	2615	# use -1 or undef as default coordinates, not 0, 0
2386	($x, $y) = ($map->enter_x, $map->enter_y)	2616	($x, $y) = ($map->enter_x, $map->enter_y)
2387	if $x <=0 && $y <= 0;	2617	if $x <= 0 && $y <= 0;
2388		2618
2389	$map->load;	2619	$map->load;
2390	$map->load_neighbours;	2620	$map->load_neighbours;
2391		2621
2392	return unless $self->contr->active;	2622	return unless $self->contr->active;
2393	$self->activate_recursive;
2394		2623
2395	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2624	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2396	$self->enter_map ($map, $x, $y);	2625	$self->enter_map ($map, $x, $y);
		2626
		2627	# only activate afterwards, to support waiting in hooks
		2628	$self->activate_recursive;
2397	}	2629	}
2398		2630
2399	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2631	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2400		2632
2401	Moves the player to the given map-path and coordinates by first freezing	2633	Moves the player to the given map-path and coordinates by first freezing
2402	her, loading and preparing them map, calling the provided $check callback	2634	her, loading and preparing them map, calling the provided $check callback
2403	that has to return the map if sucecssful, and then unfreezes the player on	2635	that has to return the map if sucecssful, and then unfreezes the player on
2404	the new (success) or old (failed) map position. In either case, $done will	2636	the new (success) or old (failed) map position. In either case, $done will
2405	be called at the end of this process.	2637	be called at the end of this process.
2406		2638
		2639	Note that $check will be called with a potentially non-loaded map, so if
		2640	it needs a loaded map it has to call C<< ->load >>.
		2641
2407	=cut	2642	=cut
2408		2643
2409	our $GOTOGEN;	2644	our $GOTOGEN;
2410		2645
2411	sub cf::object::player::goto {	2646	sub cf::object::player::goto {
…		…
2415	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2650	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2416		2651
2417	$self->enter_link;	2652	$self->enter_link;
2418		2653
2419	(async {	2654	(async {
		2655	$Coro::current->{desc} = "player::goto $path $x $y";
		2656
		2657	# *tag paths override both path and x|y
		2658	if ($path =~ /^\*(.*)$/) {
		2659	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2660	my $ob = $obs[rand @obs];
		2661
		2662	# see if we actually can go there
		2663	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2664	$ob = $obs[rand @obs];
		2665	} else {
		2666	$self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
		2667	}
		2668	# else put us there anyways for now #d#
		2669
		2670	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2671	} else {
		2672	($path, $x, $y) = (undef, undef, undef);
		2673	}
		2674	}
		2675
2420	my $map = eval {	2676	my $map = eval {
2421	my $map = cf::map::find $path;	2677	my $map = defined $path ? cf::map::find $path : undef;
2422		2678
2423	if ($map) {	2679	if ($map) {
2424	$map = $map->customise_for ($self);	2680	$map = $map->customise_for ($self);
2425	$map = $check->($map) if $check && $map;	2681	$map = $check->($map) if $check && $map;
2426	} else {	2682	} else {
2427	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);	2683	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2428	}	2684	}
2429		2685
2430	$map	2686	$map
2431	};	2687	};
2432		2688
…		…
2468	}	2724	}
2469		2725
2470	sub prepare_random_map {	2726	sub prepare_random_map {
2471	my ($exit) = @_;	2727	my ($exit) = @_;
2472		2728
2473	my $guard = cf::lock_acquire "exit_prepare:$exit";
2474
2475	# all this does is basically replace the /! path by	2729	# all this does is basically replace the /! path by
2476	# a new random map path (?random/...) with a seed	2730	# a new random map path (?random/...) with a seed
2477	# that depends on the exit object	2731	# that depends on the exit object
2478		2732
2479	my $rmp = parse_random_map_params $exit->msg;	2733	my $rmp = parse_random_map_params $exit->msg;
…		…
2481	if ($exit->map) {	2735	if ($exit->map) {
2482	$rmp->{region} = $exit->region->name;	2736	$rmp->{region} = $exit->region->name;
2483	$rmp->{origin_map} = $exit->map->path;	2737	$rmp->{origin_map} = $exit->map->path;
2484	$rmp->{origin_x} = $exit->x;	2738	$rmp->{origin_x} = $exit->x;
2485	$rmp->{origin_y} = $exit->y;	2739	$rmp->{origin_y} = $exit->y;
		2740
		2741	$exit->map->touch;
2486	}	2742	}
2487		2743
2488	$rmp->{random_seed} ||= $exit->random_seed;	2744	$rmp->{random_seed} ||= $exit->random_seed;
2489		2745
2490	my $data = cf::to_json $rmp;	2746	my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2491	my $md5 = Digest::MD5::md5_hex $data;	2747	my $md5 = Digest::MD5::md5_hex $data;
2492	my $meta = "$RANDOMDIR/$md5.meta";	2748	my $meta = "$RANDOMDIR/$md5.meta";
2493		2749
2494	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {	2750	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2495	aio_write $fh, 0, (length $data), $data, 0;	2751	aio_write $fh, 0, (length $data), $data, 0;
2496	undef $fh;	2752	undef $fh;
2497	aio_rename "$meta~", $meta;	2753	aio_rename "$meta~", $meta;
2498		2754
		2755	my $slaying = "?random/$md5";
		2756
		2757	if ($exit->valid) {
2499	$exit->slaying ("?random/$md5");	2758	$exit->slaying ("?random/$md5");
2500	$exit->msg (undef);	2759	$exit->msg (undef);
		2760	}
2501	}	2761	}
2502	}	2762	}
2503		2763
2504	sub cf::object::player::enter_exit {	2764	sub cf::object::player::enter_exit {
2505	my ($self, $exit) = @_;	2765	my ($self, $exit) = @_;
2506		2766
2507	return unless $self->type == cf::PLAYER;	2767	return unless $self->type == cf::PLAYER;
2508		2768
2509	if ($exit->slaying eq "/!") {
2510	#TODO: this should de-fi-ni-te-ly not be a sync-job
2511	# the problem is that $exit might not survive long enough
2512	# so it needs to be done right now, right here
2513	cf::sync_job { prepare_random_map $exit };
2514	}
2515
2516	my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2517	my $hp = $exit->stats->hp;
2518	my $sp = $exit->stats->sp;
2519
2520	$self->enter_link;	2769	$self->enter_link;
2521		2770
2522	# if exit is damned, update players death & WoR home-position
2523	$self->contr->savebed ($slaying, $hp, $sp)
2524	if $exit->flag (FLAG_DAMNED);
2525
2526	(async {	2771	(async {
2527	$self->deactivate_recursive; # just to be sure	2772	$Coro::current->{desc} = "enter_exit";
		2773
2528	unless (eval {	2774	unless (eval {
		2775	$self->deactivate_recursive; # just to be sure
		2776
		2777	# random map handling
		2778	{
		2779	my $guard = cf::lock_acquire "exit_prepare:$exit";
		2780
		2781	prepare_random_map $exit
		2782	if $exit->slaying eq "/!";
		2783	}
		2784
		2785	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
		2786	my $x = $exit->stats->hp;
		2787	my $y = $exit->stats->sp;
		2788
2529	$self->goto ($slaying, $hp, $sp);	2789	$self->goto ($map, $x, $y);
2530		2790
		2791	# if exit is damned, update players death & WoR home-position
		2792	$self->contr->savebed ($map, $x, $y)
		2793	if $exit->flag (cf::FLAG_DAMNED);
		2794
2531	1;	2795	1
2532	}) {	2796	}) {
2533	$self->message ("Something went wrong deep within the crossfire server. "	2797	$self->message ("Something went wrong deep within the deliantra server. "
2534	. "I'll try to bring you back to the map you were before. "	2798	. "I'll try to bring you back to the map you were before. "
2535	. "Please report this to the dungeon master!",	2799	. "Please report this to the dungeon master!",
2536	cf::NDI_UNIQUE | cf::NDI_RED);	2800	cf::NDI_UNIQUE | cf::NDI_RED);
2537		2801
2538	warn "ERROR in enter_exit: $@";	2802	warn "ERROR in enter_exit: $@";
…		…
2555	sub cf::client::send_drawinfo {	2819	sub cf::client::send_drawinfo {
2556	my ($self, $text, $flags) = @_;	2820	my ($self, $text, $flags) = @_;
2557		2821
2558	utf8::encode $text;	2822	utf8::encode $text;
2559	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2823	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
		2824	}
		2825
		2826	=item $client->send_big_packet ($pkt)
		2827
		2828	Like C<send_packet>, but tries to compress large packets, and fragments
		2829	them as required.
		2830
		2831	=cut
		2832
		2833	our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
		2834
		2835	sub cf::client::send_big_packet {
		2836	my ($self, $pkt) = @_;
		2837
		2838	# try lzf for large packets
		2839	$pkt = "lzf " . Compress::LZF::compress $pkt
		2840	if 1024 <= length $pkt and $self->{can_lzf};
		2841
		2842	# split very large packets
		2843	if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
		2844	$self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
		2845	$pkt = "frag";
		2846	}
		2847
		2848	$self->send_packet ($pkt);
2560	}	2849	}
2561		2850
2562	=item $client->send_msg ($channel, $msg, $color, [extra...])	2851	=item $client->send_msg ($channel, $msg, $color, [extra...])
2563		2852
2564	Send a drawinfo or msg packet to the client, formatting the msg for the	2853	Send a drawinfo or msg packet to the client, formatting the msg for the
…		…
2566	the message, with C<log> being the default. If C<$color> is negative, suppress	2855	the message, with C<log> being the default. If C<$color> is negative, suppress
2567	the message unless the client supports the msg packet.	2856	the message unless the client supports the msg packet.
2568		2857
2569	=cut	2858	=cut
2570		2859
		2860	# non-persistent channels (usually the info channel)
2571	our %CHANNEL = (	2861	our %CHANNEL = (
		2862	"c/motd" => {
		2863	id => "infobox",
		2864	title => "MOTD",
		2865	reply => undef,
		2866	tooltip => "The message of the day",
		2867	},
2572	"c/identify" => {	2868	"c/identify" => {
2573	id => "identify",	2869	id => "infobox",
2574	title => "Identify",	2870	title => "Identify",
2575	reply => undef,	2871	reply => undef,
2576	tooltip => "Items recently identified",	2872	tooltip => "Items recently identified",
2577	},	2873	},
2578	"c/examine" => {	2874	"c/examine" => {
2579	id => "examine",	2875	id => "infobox",
2580	title => "Examine",	2876	title => "Examine",
2581	reply => undef,	2877	reply => undef,
2582	tooltip => "Signs and other items you examined",	2878	tooltip => "Signs and other items you examined",
2583	},	2879	},
		2880	"c/shopinfo" => {
		2881	id => "infobox",
		2882	title => "Shop Info",
		2883	reply => undef,
		2884	tooltip => "What your bargaining skill tells you about the shop",
		2885	},
		2886	"c/book" => {
		2887	id => "infobox",
		2888	title => "Book",
		2889	reply => undef,
		2890	tooltip => "The contents of a note or book",
		2891	},
		2892	"c/lookat" => {
		2893	id => "infobox",
		2894	title => "Look",
		2895	reply => undef,
		2896	tooltip => "What you saw there",
		2897	},
		2898	"c/who" => {
		2899	id => "infobox",
		2900	title => "Players",
		2901	reply => undef,
		2902	tooltip => "Shows players who are currently online",
		2903	},
		2904	"c/body" => {
		2905	id => "infobox",
		2906	title => "Body Parts",
		2907	reply => undef,
		2908	tooltip => "Shows which body parts you posess and are available",
		2909	},
		2910	"c/statistics" => {
		2911	id => "infobox",
		2912	title => "Statistics",
		2913	reply => undef,
		2914	tooltip => "Shows your primary statistics",
		2915	},
		2916	"c/skills" => {
		2917	id => "infobox",
		2918	title => "Skills",
		2919	reply => undef,
		2920	tooltip => "Shows your experience per skill and item power",
		2921	},
		2922	"c/shopitems" => {
		2923	id => "infobox",
		2924	title => "Shop Items",
		2925	reply => undef,
		2926	tooltip => "Shows the items currently for sale in this shop",
		2927	},
		2928	"c/resistances" => {
		2929	id => "infobox",
		2930	title => "Resistances",
		2931	reply => undef,
		2932	tooltip => "Shows your resistances",
		2933	},
		2934	"c/pets" => {
		2935	id => "infobox",
		2936	title => "Pets",
		2937	reply => undef,
		2938	tooltip => "Shows information abotu your pets/a specific pet",
		2939	},
		2940	"c/perceiveself" => {
		2941	id => "infobox",
		2942	title => "Perceive Self",
		2943	reply => undef,
		2944	tooltip => "You gained detailed knowledge about yourself",
		2945	},
		2946	"c/uptime" => {
		2947	id => "infobox",
		2948	title => "Uptime",
		2949	reply => undef,
		2950	tooltip => "How long the server has been running since last restart",
		2951	},
		2952	"c/mapinfo" => {
		2953	id => "infobox",
		2954	title => "Map Info",
		2955	reply => undef,
		2956	tooltip => "Information related to the maps",
		2957	},
		2958	"c/party" => {
		2959	id => "party",
		2960	title => "Party",
		2961	reply => "gsay ",
		2962	tooltip => "Messages and chat related to your party",
		2963	},
		2964	"c/death" => {
		2965	id => "death",
		2966	title => "Death",
		2967	reply => undef,
		2968	tooltip => "Reason for and more info about your most recent death",
		2969	},
		2970	"c/say" => $SAY_CHANNEL,
		2971	"c/chat" => $CHAT_CHANNEL,
2584	);	2972	);
2585		2973
2586	sub cf::client::send_msg {	2974	sub cf::client::send_msg {
2587	my ($self, $channel, $msg, $color, @extra) = @_;	2975	my ($self, $channel, $msg, $color, @extra) = @_;
2588		2976
2589	$msg = $self->pl->expand_cfpod ($msg);	2977	$msg = $self->pl->expand_cfpod ($msg)
		2978	unless $color & cf::NDI_VERBATIM;
2590		2979
2591	$color &= cf::NDI_CLIENT_MASK; # just in case...	2980	$color &= cf::NDI_CLIENT_MASK; # just in case...
2592		2981
2593	# check predefined channels, for the benefit of C	2982	# check predefined channels, for the benefit of C
2594	$channel = $CHANNEL{$channel} if $CHANNEL{$channel};	2983	if ($CHANNEL{$channel}) {
		2984	$channel = $CHANNEL{$channel};
2595		2985
		2986	$self->ext_msg (channel_info => $channel);
		2987	$channel = $channel->{id};
		2988
2596	if (ref $channel) {	2989	} elsif (ref $channel) {
2597	# send meta info to client, if not yet sent	2990	# send meta info to client, if not yet sent
2598	unless (exists $self->{channel}{$channel->{id}}) {	2991	unless (exists $self->{channel}{$channel->{id}}) {
2599	$self->{channel}{$channel->{id}} = $channel;	2992	$self->{channel}{$channel->{id}} = $channel;
2600	$self->ext_msg (channel_info => $channel)	2993	$self->ext_msg (channel_info => $channel);
2601	if $self->can_msg;
2602	}	2994	}
2603		2995
2604	$channel = $channel->{id};	2996	$channel = $channel->{id};
2605	}	2997	}
2606		2998
2607	return unless @extra || length $msg;	2999	return unless @extra || length $msg;
2608		3000
2609	if ($self->can_msg) {
2610	# default colour, mask it out	3001	# default colour, mask it out
2611	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)	3002	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2612	if $color & cf::NDI_DEF;	3003	if $color & cf::NDI_DEF;
2613		3004
2614	$self->send_packet ("msg " . $self->{json_coder}->encode (	3005	my $pkt = "msg "
		3006	. $self->{json_coder}->encode (
2615	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));	3007	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2616	} else {	3008	);
2617	if ($color >= 0) {
2618	# replace some tags by gcfclient-compatible ones
2619	for ($msg) {
2620	1 while
2621	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2622	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2623	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2624	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2625	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2626	}
2627		3009
2628	$color &= cf::NDI_COLOR_MASK;	3010	$self->send_big_packet ($pkt);
2629
2630	utf8::encode $msg;
2631
2632	if (0 && $msg =~ /\[/) {
2633	# COMMAND/INFO
2634	$self->send_packet ("drawextinfo $color 10 8 $msg")
2635	} else {
2636	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2637	$self->send_packet ("drawinfo $color $msg")
2638	}
2639	}
2640	}
2641	}	3011	}
2642		3012
2643	=item $client->ext_msg ($type, @msg)	3013	=item $client->ext_msg ($type, @msg)
2644		3014
2645	Sends an ext event to the client.	3015	Sends an ext event to the client.
…		…
2648		3018
2649	sub cf::client::ext_msg($$@) {	3019	sub cf::client::ext_msg($$@) {
2650	my ($self, $type, @msg) = @_;	3020	my ($self, $type, @msg) = @_;
2651		3021
2652	if ($self->extcmd == 2) {	3022	if ($self->extcmd == 2) {
2653	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3023	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2654	} elsif ($self->extcmd == 1) { # TODO: remove	3024	} elsif ($self->extcmd == 1) { # TODO: remove
2655	push @msg, msgtype => "event_$type";	3025	push @msg, msgtype => "event_$type";
2656	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3026	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2657	}	3027	}
2658	}	3028	}
2659		3029
2660	=item $client->ext_reply ($msgid, @msg)	3030	=item $client->ext_reply ($msgid, @msg)
2661		3031
…		…
2665		3035
2666	sub cf::client::ext_reply($$@) {	3036	sub cf::client::ext_reply($$@) {
2667	my ($self, $id, @msg) = @_;	3037	my ($self, $id, @msg) = @_;
2668		3038
2669	if ($self->extcmd == 2) {	3039	if ($self->extcmd == 2) {
2670	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));	3040	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2671	} elsif ($self->extcmd == 1) {	3041	} elsif ($self->extcmd == 1) {
2672	#TODO: version 1, remove	3042	#TODO: version 1, remove
2673	unshift @msg, msgtype => "reply", msgid => $id;	3043	unshift @msg, msgtype => "reply", msgid => $id;
2674	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3044	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2675	}	3045	}
2676	}	3046	}
2677		3047
2678	=item $success = $client->query ($flags, "text", \&cb)	3048	=item $success = $client->query ($flags, "text", \&cb)
2679		3049
…		…
2780		3150
2781	$coro	3151	$coro
2782	}	3152	}
2783		3153
2784	cf::client->attach (	3154	cf::client->attach (
2785	on_destroy => sub {	3155	on_client_destroy => sub {
2786	my ($ns) = @_;	3156	my ($ns) = @_;
2787		3157
2788	$_->cancel for values %{ (delete $ns->{_coro}) || {} };	3158	$_->cancel for values %{ (delete $ns->{_coro}) || {} };
2789	},	3159	},
2790	);	3160	);
…		…
2806	our $safe_hole = new Safe::Hole;	3176	our $safe_hole = new Safe::Hole;
2807		3177
2808	$SIG{FPE} = 'IGNORE';	3178	$SIG{FPE} = 'IGNORE';
2809		3179
2810	$safe->permit_only (Opcode::opset qw(	3180	$safe->permit_only (Opcode::opset qw(
2811	:base_core :base_mem :base_orig :base_math	3181	:base_core :base_mem :base_orig :base_math :base_loop
2812	grepstart grepwhile mapstart mapwhile	3182	grepstart grepwhile mapstart mapwhile
2813	sort time	3183	sort time
2814	));	3184	));
2815		3185
2816	# here we export the classes and methods available to script code	3186	# here we export the classes and methods available to script code
…		…
2818	=pod	3188	=pod
2819		3189
2820	The following functions and methods are available within a safe environment:	3190	The following functions and methods are available within a safe environment:
2821		3191
2822	cf::object	3192	cf::object
2823	contr pay_amount pay_player map x y force_find force_add	3193	contr pay_amount pay_player map x y force_find force_add destroy
2824	insert remove name archname title slaying race decrease_ob_nr	3194	insert remove name archname title slaying race decrease split
		3195	value
2825		3196
2826	cf::object::player	3197	cf::object::player
2827	player	3198	player
2828		3199
2829	cf::player	3200	cf::player
…		…
2834		3205
2835	=cut	3206	=cut
2836		3207
2837	for (	3208	for (
2838	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	3209	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2839	insert remove inv name archname title slaying race	3210	insert remove inv nrof name archname title slaying race
2840	decrease_ob_nr)],	3211	decrease split destroy change_exp value msg lore send_msg)],
2841	["cf::object::player" => qw(player)],	3212	["cf::object::player" => qw(player)],
2842	["cf::player" => qw(peaceful)],	3213	["cf::player" => qw(peaceful send_msg)],
2843	["cf::map" => qw(trigger)],	3214	["cf::map" => qw(trigger)],
2844	) {	3215	) {
2845	no strict 'refs';	3216	no strict 'refs';
2846	my ($pkg, @funs) = @$_;	3217	my ($pkg, @funs) = @$_;
2847	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3218	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
…		…
2865		3236
2866	my $qcode = $code;	3237	my $qcode = $code;
2867	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3238	$qcode =~ s/"/‟/g; # not allowed in #line filenames
2868	$qcode =~ s/\n/\\n/g;	3239	$qcode =~ s/\n/\\n/g;
2869		3240
		3241	%vars = (_dummy => 0) unless %vars;
		3242
		3243	my @res;
2870	local $_;	3244	local $_;
2871	local @safe::cf::_safe_eval_args = values %vars;
2872		3245
2873	my $eval =	3246	my $eval =
2874	"do {\n"	3247	"do {\n"
2875	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"	3248	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2876	. "#line 0 \"{$qcode}\"\n"	3249	. "#line 0 \"{$qcode}\"\n"
2877	. $code	3250	. $code
2878	. "\n}"	3251	. "\n}"
2879	;	3252	;
2880		3253
		3254	if ($CFG{safe_eval}) {
2881	sub_generation_inc;	3255	sub_generation_inc;
		3256	local @safe::cf::_safe_eval_args = values %vars;
2882	my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);	3257	@res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2883	sub_generation_inc;	3258	sub_generation_inc;
		3259	} else {
		3260	local @cf::_safe_eval_args = values %vars;
		3261	@res = wantarray ? eval eval : scalar eval $eval;
		3262	}
2884		3263
2885	if ($@) {	3264	if ($@) {
2886	warn "$@";	3265	warn "$@";
2887	warn "while executing safe code '$code'\n";	3266	warn "while executing safe code '$code'\n";
2888	warn "with arguments " . (join " ", %vars) . "\n";	3267	warn "with arguments " . (join " ", %vars) . "\n";
…		…
2907	=cut	3286	=cut
2908		3287
2909	sub register_script_function {	3288	sub register_script_function {
2910	my ($fun, $cb) = @_;	3289	my ($fun, $cb) = @_;
2911		3290
2912	no strict 'refs';	3291	$fun = "safe::$fun" if $CFG{safe_eval};
2913	*{"safe::$fun"} = $safe_hole->wrap ($cb);	3292	*$fun = $safe_hole->wrap ($cb);
2914	}	3293	}
2915		3294
2916	=back	3295	=back
2917		3296
2918	=cut	3297	=cut
…		…
2939		3318
2940	$facedata->{version} == 2	3319	$facedata->{version} == 2
2941	or cf::cleanup "$path: version mismatch, cannot proceed.";	3320	or cf::cleanup "$path: version mismatch, cannot proceed.";
2942		3321
2943	# patch in the exptable	3322	# patch in the exptable
		3323	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
2944	$facedata->{resource}{"res/exp_table"} = {	3324	$facedata->{resource}{"res/exp_table"} = {
2945	type => FT_RSRC,	3325	type => FT_RSRC,
2946	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),	3326	data => $exp_table,
		3327	hash => (Digest::MD5::md5 $exp_table),
2947	};	3328	};
2948	cf::cede_to_tick;	3329	cf::cede_to_tick;
2949		3330
2950	{	3331	{
2951	my $faces = $facedata->{faceinfo};	3332	my $faces = $facedata->{faceinfo};
2952		3333
2953	while (my ($face, $info) = each %$faces) {	3334	while (my ($face, $info) = each %$faces) {
2954	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3335	my $idx = (cf::face::find $face) || cf::face::alloc $face;
		3336
2955	cf::face::set_visibility $idx, $info->{visibility};	3337	cf::face::set_visibility $idx, $info->{visibility};
2956	cf::face::set_magicmap $idx, $info->{magicmap};	3338	cf::face::set_magicmap $idx, $info->{magicmap};
2957	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};	3339	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2958	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};	3340	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
2959		3341
2960	cf::cede_to_tick;	3342	cf::cede_to_tick;
2961	}	3343	}
2962		3344
2963	while (my ($face, $info) = each %$faces) {	3345	while (my ($face, $info) = each %$faces) {
2964	next unless $info->{smooth};	3346	next unless $info->{smooth};
		3347
2965	my $idx = cf::face::find $face	3348	my $idx = cf::face::find $face
2966	or next;	3349	or next;
		3350
2967	if (my $smooth = cf::face::find $info->{smooth}) {	3351	if (my $smooth = cf::face::find $info->{smooth}) {
2968	cf::face::set_smooth $idx, $smooth;	3352	cf::face::set_smooth $idx, $smooth;
2969	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3353	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2970	} else {	3354	} else {
2971	warn "smooth face '$info->{smooth}' not found for face '$face'";	3355	warn "smooth face '$info->{smooth}' not found for face '$face'";
…		…
2985		3369
2986	cf::anim::invalidate_all; # d'oh	3370	cf::anim::invalidate_all; # d'oh
2987	}	3371	}
2988		3372
2989	{	3373	{
2990	# TODO: for gcfclient pleasure, we should give resources
2991	# that gcfclient doesn't grok a >10000 face index.
2992	my $res = $facedata->{resource};	3374	my $res = $facedata->{resource};
2993		3375
2994	my $soundconf = delete $res->{"res/sound.conf"};
2995
2996	while (my ($name, $info) = each %$res) {	3376	while (my ($name, $info) = each %$res) {
		3377	if (defined $info->{type}) {
2997	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3378	my $idx = (cf::face::find $name) || cf::face::alloc $name;
2998	my $data;
2999		3379
3000	if ($info->{type} & 1) {	3380	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3001	# prepend meta info	3381	cf::face::set_type $idx, $info->{type};
3002
3003	my $meta = $enc->encode ({
3004	name => $name,
3005	%{ $info->{meta} || {} },
3006	});
3007
3008	$data = pack "(w/a*)*", $meta, $info->{data};
3009	} else {	3382	} else {
3010	$data = $info->{data};	3383	$RESOURCE{$name} = $info;
3011	}	3384	}
3012		3385
3013	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3014	cf::face::set_type $idx, $info->{type};
3015
3016	cf::cede_to_tick;	3386	cf::cede_to_tick;
3017	}	3387	}
3018
3019	if ($soundconf) {
3020	$soundconf = $enc->decode (delete $soundconf->{data});
3021
3022	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3023	my $sound = $soundconf->{compat}[$_]
3024	or next;
3025
3026	my $face = cf::face::find "sound/$sound->[1]";
3027	cf::sound::set $sound->[0] => $face;
3028	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3029	}
3030
3031	while (my ($k, $v) = each %{$soundconf->{event}}) {
3032	my $face = cf::face::find "sound/$v";
3033	cf::sound::set $k => $face;
3034	}
3035	}
3036	}	3388	}
		3389
		3390	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3037		3391
3038	1	3392	1
3039	}	3393	}
		3394
		3395	cf::global->attach (on_resource_update => sub {
		3396	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
		3397	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
		3398
		3399	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3400	my $sound = $soundconf->{compat}[$_]
		3401	or next;
		3402
		3403	my $face = cf::face::find "sound/$sound->[1]";
		3404	cf::sound::set $sound->[0] => $face;
		3405	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3406	}
		3407
		3408	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3409	my $face = cf::face::find "sound/$v";
		3410	cf::sound::set $k => $face;
		3411	}
		3412	}
		3413	});
3040		3414
3041	register_exticmd fx_want => sub {	3415	register_exticmd fx_want => sub {
3042	my ($ns, $want) = @_;	3416	my ($ns, $want) = @_;
3043		3417
3044	while (my ($k, $v) = each %$want) {	3418	while (my ($k, $v) = each %$want) {
3045	$ns->fx_want ($k, $v);	3419	$ns->fx_want ($k, $v);
3046	}	3420	}
3047	};	3421	};
		3422
		3423	sub load_resource_file($) {
		3424	my $guard = lock_acquire "load_resource_file";
		3425
		3426	my $status = load_resource_file_ $_[0];
		3427	get_slot 0.1, 100;
		3428	cf::arch::commit_load;
		3429
		3430	$status
		3431	}
3048		3432
3049	sub reload_regions {	3433	sub reload_regions {
3050	# HACK to clear player env face cache, we need some signal framework	3434	# HACK to clear player env face cache, we need some signal framework
3051	# for this (global event?)	3435	# for this (global event?)
3052	%ext::player_env::MUSIC_FACE_CACHE = ();	3436	%ext::player_env::MUSIC_FACE_CACHE = ();
…		…
3066	}	3450	}
3067		3451
3068	sub reload_archetypes {	3452	sub reload_archetypes {
3069	load_resource_file "$DATADIR/archetypes"	3453	load_resource_file "$DATADIR/archetypes"
3070	or die "unable to load archetypes\n";	3454	or die "unable to load archetypes\n";
3071	#d# NEED to laod twice to resolve forward references
3072	# this really needs to be done in an extra post-pass
3073	# (which needs to be synchronous, so solve it differently)
3074	load_resource_file "$DATADIR/archetypes"
3075	or die "unable to load archetypes\n";
3076	}	3455	}
3077		3456
3078	sub reload_treasures {	3457	sub reload_treasures {
3079	load_resource_file "$DATADIR/treasures"	3458	load_resource_file "$DATADIR/treasures"
3080	or die "unable to load treasurelists\n";	3459	or die "unable to load treasurelists\n";
3081	}	3460	}
3082		3461
3083	sub reload_resources {	3462	sub reload_resources {
3084	warn "reloading resource files...\n";	3463	warn "reloading resource files...\n";
3085		3464
		3465	reload_facedata;
		3466	reload_archetypes;
3086	reload_regions;	3467	reload_regions;
3087	reload_facedata;
3088	#reload_archetypes;#d#
3089	reload_archetypes;
3090	reload_treasures;	3468	reload_treasures;
3091		3469
3092	warn "finished reloading resource files\n";	3470	warn "finished reloading resource files\n";
3093	}	3471	}
3094		3472
3095	sub init {
3096	reload_resources;
3097	}
3098
3099	sub reload_config {	3473	sub reload_config {
		3474	warn "reloading config file...\n";
		3475
3100	open my $fh, "<:utf8", "$CONFDIR/config"	3476	open my $fh, "<:utf8", "$CONFDIR/config"
3101	or return;	3477	or return;
3102		3478
3103	local $/;	3479	local $/;
3104	*CFG = YAML::Syck::Load <$fh>;	3480	*CFG = YAML::XS::Load scalar <$fh>;
3105		3481
3106	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3482	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3107		3483
3108	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3484	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3109	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3485	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
3113	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3489	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3114	and die "WARNING: m(un)lockall failed: $!\n";	3490	and die "WARNING: m(un)lockall failed: $!\n";
3115	};	3491	};
3116	warn $@ if $@;	3492	warn $@ if $@;
3117	}	3493	}
		3494
		3495	warn "finished reloading resource files\n";
		3496	}
		3497
		3498	sub pidfile() {
		3499	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
		3500	or die "$PIDFILE: $!";
		3501	flock $fh, &Fcntl::LOCK_EX
		3502	or die "$PIDFILE: flock: $!";
		3503	$fh
		3504	}
		3505
		3506	# make sure only one server instance is running at any one time
		3507	sub atomic {
		3508	my $fh = pidfile;
		3509
		3510	my $pid = <$fh>;
		3511	kill 9, $pid if $pid > 0;
		3512
		3513	seek $fh, 0, 0;
		3514	print $fh $$;
		3515	}
		3516
		3517	sub main_loop {
		3518	warn "EV::loop starting\n";
		3519	if (1) {
		3520	EV::loop;
		3521	}
		3522	warn "EV::loop returned\n";
		3523	goto &main_loop unless $REALLY_UNLOOP;
3118	}	3524	}
3119		3525
3120	sub main {	3526	sub main {
		3527	cf::init_globals; # initialise logging
		3528
		3529	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
		3530	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
		3531	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
		3532	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
		3533
		3534	cf::init_experience;
		3535	cf::init_anim;
		3536	cf::init_attackmess;
		3537	cf::init_dynamic;
		3538
		3539	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
		3540
3121	# we must not ever block the main coroutine	3541	# we must not ever block the main coroutine
3122	local $Coro::idle = sub {	3542	local $Coro::idle = sub {
3123	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3543	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3124	(async {	3544	(async {
3125	Event::one_event;	3545	$Coro::current->{desc} = "IDLE BUG HANDLER";
		3546	EV::loop EV::LOOP_ONESHOT;
3126	})->prio (Coro::PRIO_MAX);	3547	})->prio (Coro::PRIO_MAX);
3127	};	3548	};
3128		3549
		3550	evthread_start IO::AIO::poll_fileno;
		3551
		3552	cf::sync_job {
		3553	cf::load_settings;
		3554	cf::load_materials;
		3555
		3556	reload_resources;
3129	reload_config;	3557	reload_config;
3130	db_init;	3558	db_init;
		3559
		3560	cf::init_uuid;
		3561	cf::init_signals;
		3562	cf::init_skills;
		3563
		3564	cf::init_beforeplay;
		3565
		3566	atomic;
		3567
3131	load_extensions;	3568	load_extensions;
3132		3569
3133	$TICK_WATCHER->start;	3570	utime time, time, $RUNTIMEFILE;
3134	Event::loop;	3571
		3572	# no (long-running) fork's whatsoever before this point(!)
		3573	use POSIX ();
		3574	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
		3575
		3576	(pop @POST_INIT)->(0) while @POST_INIT;
		3577	};
		3578
		3579	main_loop;
3135	}	3580	}
3136		3581
3137	#############################################################################	3582	#############################################################################
3138	# initialisation and cleanup	3583	# initialisation and cleanup
3139		3584
3140	# install some emergency cleanup handlers	3585	# install some emergency cleanup handlers
3141	BEGIN {	3586	BEGIN {
		3587	our %SIGWATCHER = ();
3142	for my $signal (qw(INT HUP TERM)) {	3588	for my $signal (qw(INT HUP TERM)) {
3143	Event->signal (	3589	$SIGWATCHER{$signal} = EV::signal $signal, sub {
3144	reentrant => 0,
3145	data => WF_AUTOCANCEL,
3146	signal => $signal,
3147	prio => 0,
3148	cb => sub {
3149	cf::cleanup "SIG$signal";	3590	cf::cleanup "SIG$signal";
3150	},
3151	);	3591	};
3152	}	3592	}
3153	}	3593	}
3154		3594
3155	sub write_runtime {	3595	sub write_runtime_sync {
3156	my $runtime = "$LOCALDIR/runtime";	3596	my $t0 = EV::time;
3157		3597
3158	# first touch the runtime file to show we are still running:	3598	# first touch the runtime file to show we are still running:
3159	# the fsync below can take a very very long time.	3599	# the fsync below can take a very very long time.
3160		3600
3161	IO::AIO::aio_utime $runtime, undef, undef;	3601	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3162		3602
3163	my $guard = cf::lock_acquire "write_runtime";	3603	my $guard = cf::lock_acquire "write_runtime";
3164		3604
3165	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644	3605	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3166	or return;	3606	or return;
3167		3607
3168	my $value = $cf::RUNTIME + 90 + 10;	3608	my $value = $cf::RUNTIME + 90 + 10;
3169	# 10 is the runtime save interval, for a monotonic clock	3609	# 10 is the runtime save interval, for a monotonic clock
3170	# 60 allows for the watchdog to kill the server.	3610	# 60 allows for the watchdog to kill the server.
…		…
3180	aio_utime $fh, undef, undef;	3620	aio_utime $fh, undef, undef;
3181		3621
3182	close $fh	3622	close $fh
3183	or return;	3623	or return;
3184		3624
3185	aio_rename "$runtime~", $runtime	3625	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3186	and return;	3626	and return;
3187		3627
3188	warn "runtime file written.\n";	3628	warn sprintf "runtime file written (%gs).\n", EV::time - $t0;
3189		3629
3190	1	3630	1
		3631	}
		3632
		3633	our $uuid_lock;
		3634	our $uuid_skip;
		3635
		3636	sub write_uuid_sync($) {
		3637	$uuid_skip ||= $_[0];
		3638
		3639	return if $uuid_lock;
		3640	local $uuid_lock = 1;
		3641
		3642	my $uuid = "$LOCALDIR/uuid";
		3643
		3644	my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
		3645	or return;
		3646
		3647	my $value = uuid_seq uuid_cur;
		3648
		3649	unless ($value) {
		3650	warn "cowardly refusing to write zero uuid value!\n";
		3651	return;
		3652	}
		3653
		3654	my $value = uuid_str $value + $uuid_skip;
		3655	$uuid_skip = 0;
		3656
		3657	(aio_write $fh, 0, (length $value), $value, 0) <= 0
		3658	and return;
		3659
		3660	# always fsync - this file is important
		3661	aio_fsync $fh
		3662	and return;
		3663
		3664	close $fh
		3665	or return;
		3666
		3667	aio_rename "$uuid~", $uuid
		3668	and return;
		3669
		3670	warn "uuid file written ($value).\n";
		3671
		3672	1
		3673
		3674	}
		3675
		3676	sub write_uuid($$) {
		3677	my ($skip, $sync) = @_;
		3678
		3679	$sync ? write_uuid_sync $skip
		3680	: async { write_uuid_sync $skip };
3191	}	3681	}
3192		3682
3193	sub emergency_save() {	3683	sub emergency_save() {
3194	my $freeze_guard = cf::freeze_mainloop;	3684	my $freeze_guard = cf::freeze_mainloop;
3195		3685
3196	warn "enter emergency perl save\n";	3686	warn "emergency_perl_save: enter\n";
3197		3687
3198	cf::sync_job {	3688	cf::sync_job {
		3689	# this is a trade-off: we want to be very quick here, so
		3690	# save all maps without fsync, and later call a global sync
		3691	# (which in turn might be very very slow)
		3692	local $USE_FSYNC = 0;
		3693
3199	# use a peculiar iteration method to avoid tripping on perl	3694	# use a peculiar iteration method to avoid tripping on perl
3200	# refcount bugs in for. also avoids problems with players	3695	# refcount bugs in for. also avoids problems with players
3201	# and maps saved/destroyed asynchronously.	3696	# and maps saved/destroyed asynchronously.
3202	warn "begin emergency player save\n";	3697	warn "emergency_perl_save: begin player save\n";
3203	for my $login (keys %cf::PLAYER) {	3698	for my $login (keys %cf::PLAYER) {
3204	my $pl = $cf::PLAYER{$login} or next;	3699	my $pl = $cf::PLAYER{$login} or next;
3205	$pl->valid or next;	3700	$pl->valid or next;
		3701	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3206	$pl->save;	3702	$pl->save;
3207	}	3703	}
3208	warn "end emergency player save\n";	3704	warn "emergency_perl_save: end player save\n";
3209		3705
3210	warn "begin emergency map save\n";	3706	warn "emergency_perl_save: begin map save\n";
3211	for my $path (keys %cf::MAP) {	3707	for my $path (keys %cf::MAP) {
3212	my $map = $cf::MAP{$path} or next;	3708	my $map = $cf::MAP{$path} or next;
3213	$map->valid or next;	3709	$map->valid or next;
3214	$map->save;	3710	$map->save;
3215	}	3711	}
3216	warn "end emergency map save\n";	3712	warn "emergency_perl_save: end map save\n";
3217		3713
3218	warn "begin emergency database checkpoint\n";	3714	warn "emergency_perl_save: begin database checkpoint\n";
3219	BDB::db_env_txn_checkpoint $DB_ENV;	3715	BDB::db_env_txn_checkpoint $DB_ENV;
3220	warn "end emergency database checkpoint\n";	3716	warn "emergency_perl_save: end database checkpoint\n";
		3717
		3718	warn "emergency_perl_save: begin write uuid\n";
		3719	write_uuid_sync 1;
		3720	warn "emergency_perl_save: end write uuid\n";
3221	};	3721	};
3222		3722
		3723	warn "emergency_perl_save: starting sync()\n";
		3724	IO::AIO::aio_sync sub {
		3725	warn "emergency_perl_save: finished sync()\n";
		3726	};
		3727
3223	warn "leave emergency perl save\n";	3728	warn "emergency_perl_save: leave\n";
3224	}	3729	}
3225		3730
3226	sub post_cleanup {	3731	sub post_cleanup {
3227	my ($make_core) = @_;	3732	my ($make_core) = @_;
3228		3733
3229	warn Carp::longmess "post_cleanup backtrace"	3734	warn Carp::longmess "post_cleanup backtrace"
3230	if $make_core;	3735	if $make_core;
		3736
		3737	my $fh = pidfile;
		3738	unlink $PIDFILE if <$fh> == $$;
		3739	}
		3740
		3741	# a safer delete_package, copied from Symbol
		3742	sub clear_package($) {
		3743	my $pkg = shift;
		3744
		3745	# expand to full symbol table name if needed
		3746	unless ($pkg =~ /^main::.*::$/) {
		3747	$pkg = "main$pkg" if $pkg =~ /^::/;
		3748	$pkg = "main::$pkg" unless $pkg =~ /^main::/;
		3749	$pkg .= '::' unless $pkg =~ /::$/;
		3750	}
		3751
		3752	my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
		3753	my $stem_symtab = *{$stem}{HASH};
		3754
		3755	defined $stem_symtab and exists $stem_symtab->{$leaf}
		3756	or return;
		3757
		3758	# clear all symbols
		3759	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
		3760	for my $name (keys %$leaf_symtab) {
		3761	_gv_clear *{"$pkg$name"};
		3762	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
		3763	}
		3764	warn "cleared package $pkg\n";#d#
3231	}	3765	}
3232		3766
3233	sub do_reload_perl() {	3767	sub do_reload_perl() {
3234	# can/must only be called in main	3768	# can/must only be called in main
3235	if ($Coro::current != $Coro::main) {	3769	if ($Coro::current != $Coro::main) {
3236	warn "can only reload from main coroutine";	3770	warn "can only reload from main coroutine";
3237	return;	3771	return;
3238	}	3772	}
3239		3773
		3774	return if $RELOAD++;
		3775
		3776	my $t1 = EV::time;
		3777
		3778	while ($RELOAD) {
3240	warn "reloading...";	3779	warn "reloading...";
3241		3780
3242	warn "entering sync_job";	3781	warn "entering sync_job";
3243		3782
3244	cf::sync_job {	3783	cf::sync_job {
3245	cf::write_runtime; # external watchdog should not bark	3784	cf::write_runtime_sync; # external watchdog should not bark
3246	cf::emergency_save;	3785	cf::emergency_save;
3247	cf::write_runtime; # external watchdog should not bark	3786	cf::write_runtime_sync; # external watchdog should not bark
3248		3787
3249	warn "syncing database to disk";	3788	warn "syncing database to disk";
3250	BDB::db_env_txn_checkpoint $DB_ENV;	3789	BDB::db_env_txn_checkpoint $DB_ENV;
3251		3790
3252	# if anything goes wrong in here, we should simply crash as we already saved	3791	# if anything goes wrong in here, we should simply crash as we already saved
3253		3792
3254	warn "cancelling all WF_AUTOCANCEL watchers";
3255	for (Event::all_watchers) {
3256	$_->cancel if $_->data & WF_AUTOCANCEL;
3257	}
3258
3259	warn "flushing outstanding aio requests";	3793	warn "flushing outstanding aio requests";
3260	for (;;) {
3261	BDB::flush;
3262	IO::AIO::flush;
3263	Coro::cede;
3264	last unless IO::AIO::nreqs || BDB::nreqs;	3794	while (IO::AIO::nreqs || BDB::nreqs) {
3265	warn "iterate...";	3795	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3266	}
3267
3268	++$RELOAD;
3269
3270	warn "cancelling all extension coros";
3271	$_->cancel for values %EXT_CORO;
3272	%EXT_CORO = ();
3273
3274	warn "removing commands";
3275	%COMMAND = ();
3276
3277	warn "removing ext/exti commands";
3278	%EXTCMD = ();
3279	%EXTICMD = ();
3280
3281	warn "unloading/nuking all extensions";
3282	for my $pkg (@EXTS) {
3283	warn "... unloading $pkg";
3284
3285	if (my $cb = $pkg->can ("unload")) {
3286	eval {
3287	$cb->($pkg);
3288	1
3289	} or warn "$pkg unloaded, but with errors: $@";
3290	}	3796	}
3291		3797
3292	warn "... nuking $pkg";	3798	warn "cancelling all extension coros";
3293	Symbol::delete_package $pkg;	3799	$_->cancel for values %EXT_CORO;
3294	}	3800	%EXT_CORO = ();
3295		3801
3296	warn "unloading all perl modules loaded from $LIBDIR";	3802	warn "removing commands";
3297	while (my ($k, $v) = each %INC) {	3803	%COMMAND = ();
3298	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3299		3804
		3805	warn "removing ext/exti commands";
		3806	%EXTCMD = ();
		3807	%EXTICMD = ();
		3808
		3809	warn "unloading/nuking all extensions";
		3810	for my $pkg (@EXTS) {
3300	warn "... unloading $k";	3811	warn "... unloading $pkg";
3301	delete $INC{$k};
3302		3812
3303	$k =~ s/\.pm$//;
3304	$k =~ s/\//::/g;
3305
3306	if (my $cb = $k->can ("unload_module")) {	3813	if (my $cb = $pkg->can ("unload")) {
		3814	eval {
3307	$cb->();	3815	$cb->($pkg);
		3816	1
		3817	} or warn "$pkg unloaded, but with errors: $@";
		3818	}
		3819
		3820	warn "... clearing $pkg";
		3821	clear_package $pkg;
3308	}	3822	}
3309		3823
3310	Symbol::delete_package $k;	3824	warn "unloading all perl modules loaded from $LIBDIR";
		3825	while (my ($k, $v) = each %INC) {
		3826	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
		3827
		3828	warn "... unloading $k";
		3829	delete $INC{$k};
		3830
		3831	$k =~ s/\.pm$//;
		3832	$k =~ s/\//::/g;
		3833
		3834	if (my $cb = $k->can ("unload_module")) {
		3835	$cb->();
		3836	}
		3837
		3838	clear_package $k;
3311	}	3839	}
3312		3840
3313	warn "getting rid of safe::, as good as possible";	3841	warn "getting rid of safe::, as good as possible";
3314	Symbol::delete_package "safe::$_"	3842	clear_package "safe::$_"
3315	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	3843	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3316		3844
3317	warn "unloading cf.pm \"a bit\"";	3845	warn "unloading cf.pm \"a bit\"";
3318	delete $INC{"cf.pm"};	3846	delete $INC{"cf.pm"};
3319	delete $INC{"cf/pod.pm"};	3847	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3320		3848
3321	# don't, removes xs symbols, too,	3849	# don't, removes xs symbols, too,
3322	# and global variables created in xs	3850	# and global variables created in xs
3323	#Symbol::delete_package __PACKAGE__;	3851	#clear_package __PACKAGE__;
3324		3852
3325	warn "unload completed, starting to reload now";	3853	warn "unload completed, starting to reload now";
3326		3854
3327	warn "reloading cf.pm";	3855	warn "reloading cf.pm";
3328	require cf;	3856	require cf;
3329	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3857	cf::_connect_to_perl_1;
3330		3858
3331	warn "loading config and database again";	3859	warn "loading config and database again";
3332	cf::reload_config;	3860	cf::reload_config;
3333		3861
3334	warn "loading extensions";	3862	warn "loading extensions";
3335	cf::load_extensions;	3863	cf::load_extensions;
3336		3864
		3865	if ($REATTACH_ON_RELOAD) {
3337	warn "reattaching attachments to objects/players";	3866	warn "reattaching attachments to objects/players";
3338	_global_reattach; # objects, sockets	3867	_global_reattach; # objects, sockets
3339	warn "reattaching attachments to maps";	3868	warn "reattaching attachments to maps";
3340	reattach $_ for values %MAP;	3869	reattach $_ for values %MAP;
3341	warn "reattaching attachments to players";	3870	warn "reattaching attachments to players";
3342	reattach $_ for values %PLAYER;	3871	reattach $_ for values %PLAYER;
		3872	}
3343		3873
		3874	warn "running post_init jobs";
		3875	(pop @POST_INIT)->(1) while @POST_INIT;
		3876
3344	warn "leaving sync_job";	3877	warn "leaving sync_job";
3345		3878
3346	1	3879	1
3347	} or do {	3880	} or do {
3348	warn $@;	3881	warn $@;
3349	warn "error while reloading, exiting.";	3882	cf::cleanup "error while reloading, exiting.";
3350	exit 1;
3351	};	3883	};
3352		3884
3353	warn "reloaded";	3885	warn "reloaded";
		3886	--$RELOAD;
		3887	}
		3888
		3889	$t1 = EV::time - $t1;
		3890	warn "reload completed in ${t1}s\n";
3354	};	3891	};
3355		3892
3356	our $RELOAD_WATCHER; # used only during reload	3893	our $RELOAD_WATCHER; # used only during reload
3357		3894
3358	sub reload_perl() {	3895	sub reload_perl() {
3359	# doing reload synchronously and two reloads happen back-to-back,	3896	# doing reload synchronously and two reloads happen back-to-back,
3360	# coro crashes during coro_state_free->destroy here.	3897	# coro crashes during coro_state_free->destroy here.
3361		3898
3362	$RELOAD_WATCHER ||= Event->timer (	3899	$RELOAD_WATCHER ||= cf::async {
3363	reentrant => 0,	3900	Coro::AIO::aio_wait cache_extensions;
3364	after => 0,	3901
3365	data => WF_AUTOCANCEL,	3902	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3366	cb => sub {
3367	do_reload_perl;	3903	do_reload_perl;
3368	undef $RELOAD_WATCHER;	3904	undef $RELOAD_WATCHER;
3369	},	3905	};
3370	);	3906	};
3371	}	3907	}
3372		3908
3373	register_command "reload" => sub {	3909	register_command "reload" => sub {
3374	my ($who, $arg) = @_;	3910	my ($who, $arg) = @_;
3375		3911
3376	if ($who->flag (FLAG_WIZ)) {	3912	if ($who->flag (FLAG_WIZ)) {
3377	$who->message ("reloading server.");	3913	$who->message ("reloading server.");
		3914	async {
		3915	$Coro::current->{desc} = "perl_reload";
3378	async { reload_perl };	3916	reload_perl;
		3917	};
3379	}	3918	}
3380	};	3919	};
3381		3920
3382	unshift @INC, $LIBDIR;	3921	unshift @INC, $LIBDIR;
3383		3922
…		…
3385		3924
3386	our @WAIT_FOR_TICK;	3925	our @WAIT_FOR_TICK;
3387	our @WAIT_FOR_TICK_BEGIN;	3926	our @WAIT_FOR_TICK_BEGIN;
3388		3927
3389	sub wait_for_tick {	3928	sub wait_for_tick {
3390	return unless $TICK_WATCHER->is_active;
3391	return if $Coro::current == $Coro::main;	3929	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3392		3930
3393	my $signal = new Coro::Signal;	3931	my $signal = new Coro::Signal;
3394	push @WAIT_FOR_TICK, $signal;	3932	push @WAIT_FOR_TICK, $signal;
3395	$signal->wait;	3933	$signal->wait;
3396	}	3934	}
3397		3935
3398	sub wait_for_tick_begin {	3936	sub wait_for_tick_begin {
3399	return unless $TICK_WATCHER->is_active;
3400	return if $Coro::current == $Coro::main;	3937	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3401		3938
3402	my $signal = new Coro::Signal;	3939	my $signal = new Coro::Signal;
3403	push @WAIT_FOR_TICK_BEGIN, $signal;	3940	push @WAIT_FOR_TICK_BEGIN, $signal;
3404	$signal->wait;	3941	$signal->wait;
3405	}	3942	}
3406		3943
3407	my $min = 1e6;#d#	3944	sub tick {
3408	my $avg = 10;
3409	$TICK_WATCHER = Event->timer (
3410	reentrant => 0,
3411	parked => 1,
3412	prio => 0,
3413	at => $NEXT_TICK || $TICK,
3414	data => WF_AUTOCANCEL,
3415	cb => sub {
3416	if ($Coro::current != $Coro::main) {	3945	if ($Coro::current != $Coro::main) {
3417	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	3946	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3418	unless ++$bug_warning > 10;	3947	unless ++$bug_warning > 10;
3419	return;	3948	return;
3420	}	3949	}
3421		3950
3422	$NOW = $tick_start = Event::time;
3423
3424	cf::server_tick; # one server iteration	3951	cf::server_tick; # one server iteration
3425		3952
3426	0 && sync_job {#d#	3953	#for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#
3427	for(1..10) {
3428	my $t = Event::time;
3429	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3430	or die;
3431		3954
3432	$map->width (50);	3955	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3433	$map->height (50);	3956	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3434	$map->alloc;	3957	Coro::async_pool {
3435	$map->_load_objects ("/tmp/x.map", 1); #TODO: does not work	3958	$Coro::current->{desc} = "runtime saver";
3436	my $t = Event::time - $t;	3959	write_runtime_sync
3437		3960	or warn "ERROR: unable to write runtime file: $!";
3438	#next unless $t < 0.0013;#d#
3439	if ($t < $min) {
3440	$min = $t;
3441	}
3442	$avg = $avg * 0.99 + $t * 0.01;
3443	}
3444	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3445	exit 0;
3446	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3447	};	3961	};
		3962	}
3448		3963
3449	$RUNTIME += $TICK;
3450	$NEXT_TICK += $TICK;
3451
3452	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3453	$NEXT_RUNTIME_WRITE = $NOW + 10;
3454	Coro::async_pool {
3455	write_runtime
3456	or warn "ERROR: unable to write runtime file: $!";
3457	};
3458	}
3459
3460	# my $AFTER = Event::time;
3461	# warn $AFTER - $NOW;#d#
3462
3463	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3964	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3464	$sig->send;	3965	$sig->send;
3465	}	3966	}
3466	while (my $sig = shift @WAIT_FOR_TICK) {	3967	while (my $sig = shift @WAIT_FOR_TICK) {
3467	$sig->send;	3968	$sig->send;
3468	}	3969	}
3469		3970
3470	$NOW = Event::time;	3971	$LOAD = ($NOW - $TICK_START) / $TICK;
3471
3472	# if we are delayed by four ticks or more, skip them all
3473	$NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3474
3475	$TICK_WATCHER->at ($NEXT_TICK);
3476	$TICK_WATCHER->start;
3477
3478	$LOAD = ($NOW - $tick_start) / $TICK;
3479	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3972	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3480		3973
3481	_post_tick;	3974	if (0) {
3482		3975	if ($NEXT_TICK) {
3483		3976	my $jitter = $TICK_START - $NEXT_TICK;
		3977	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
		3978	warn "jitter $JITTER\n";#d#
		3979	}
3484	},	3980	}
3485	);	3981	}
3486		3982
3487	{	3983	{
3488	BDB::max_poll_time $TICK * 0.1;	3984	# configure BDB
3489	$BDB_POLL_WATCHER = Event->io (	3985
3490	reentrant => 0,
3491	fd => BDB::poll_fileno,
3492	poll => 'r',
3493	prio => 0,
3494	data => WF_AUTOCANCEL,
3495	cb => \&BDB::poll_cb,
3496	);
3497	BDB::min_parallel 8;	3986	BDB::min_parallel 16;
3498		3987	BDB::max_poll_reqs $TICK * 0.1;
3499	BDB::set_sync_prepare {	3988	$AnyEvent::BDB::WATCHER->priority (1);
3500	my $status;
3501	my $current = $Coro::current;
3502	(
3503	sub {
3504	$status = $!;
3505	$current->ready; undef $current;
3506	},
3507	sub {
3508	Coro::schedule while defined $current;
3509	$! = $status;
3510	},
3511	)
3512	};
3513		3989
3514	unless ($DB_ENV) {	3990	unless ($DB_ENV) {
3515	$DB_ENV = BDB::db_env_create;	3991	$DB_ENV = BDB::db_env_create;
		3992	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
		3993	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
		3994	$DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
		3995	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		3996	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3516		3997
3517	cf::sync_job {	3998	cf::sync_job {
3518	eval {	3999	eval {
3519	BDB::db_env_open	4000	BDB::db_env_open
3520	$DB_ENV,	4001	$DB_ENV,
…		…
3522	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN	4003	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3523	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,	4004	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3524	0666;	4005	0666;
3525		4006
3526	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	4007	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3527
3528	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3529	$DB_ENV->set_lk_detect;
3530	};	4008	};
3531		4009
3532	cf::cleanup "db_env_open(db): $@" if $@;	4010	cf::cleanup "db_env_open(db): $@" if $@;
3533	};	4011	};
3534	}	4012	}
		4013
		4014	$BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
		4015	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		4016	};
		4017	$BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
		4018	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		4019	};
		4020	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
		4021	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		4022	};
3535	}	4023	}
3536		4024
3537	{	4025	{
		4026	# configure IO::AIO
		4027
3538	IO::AIO::min_parallel 8;	4028	IO::AIO::min_parallel 8;
3539
3540	undef $Coro::AIO::WATCHER;
3541	IO::AIO::max_poll_time $TICK * 0.1;	4029	IO::AIO::max_poll_time $TICK * 0.1;
3542	$AIO_POLL_WATCHER = Event->io (	4030	undef $AnyEvent::AIO::WATCHER;
3543	reentrant => 0,
3544	data => WF_AUTOCANCEL,
3545	fd => IO::AIO::poll_fileno,
3546	poll => 'r',
3547	prio => 6,
3548	cb => \&IO::AIO::poll_cb,
3549	);
3550	}	4031	}
3551		4032
3552	my $_log_backtrace;	4033	my $_log_backtrace;
3553		4034
3554	sub _log_backtrace {	4035	sub _log_backtrace {
…		…
3557	$msg =~ s/\n//;	4038	$msg =~ s/\n//;
3558		4039
3559	# limit the # of concurrent backtraces	4040	# limit the # of concurrent backtraces
3560	if ($_log_backtrace < 2) {	4041	if ($_log_backtrace < 2) {
3561	++$_log_backtrace;	4042	++$_log_backtrace;
		4043	my $perl_bt = Carp::longmess $msg;
3562	async {	4044	async {
		4045	$Coro::current->{desc} = "abt $msg";
		4046
3563	my @bt = fork_call {	4047	my @bt = fork_call {
3564	@addr = map { sprintf "%x", $_ } @addr;	4048	@addr = map { sprintf "%x", $_ } @addr;
3565	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	4049	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3566	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"	4050	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3567	or die "addr2line: $!";	4051	or die "addr2line: $!";
…		…
3575	}	4059	}
3576		4060
3577	@funcs	4061	@funcs
3578	};	4062	};
3579		4063
3580	LOG llevInfo, "[ABT] $msg\n";	4064	LOG llevInfo, "[ABT] $perl_bt\n";
		4065	LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3581	LOG llevInfo, "[ABT] $_\n" for @bt;	4066	LOG llevInfo, "[ABT] $_\n" for @bt;
3582	--$_log_backtrace;	4067	--$_log_backtrace;
3583	};	4068	};
3584	} else {	4069	} else {
3585	LOG llevInfo, "[ABT] $msg\n";	4070	LOG llevInfo, "[ABT] $msg\n";
3586	LOG llevInfo, "[ABT] [suppressed]\n";	4071	LOG llevInfo, "[ABT] [suppressed]\n";
3587	}	4072	}
3588	}	4073	}
3589		4074
3590	# load additional modules	4075	# load additional modules
3591	use cf::pod;	4076	require "cf/$_.pm" for @EXTRA_MODULES;
		4077	cf::_connect_to_perl_2;
3592		4078
3593	END { cf::emergency_save }	4079	END { cf::emergency_save }
3594		4080
3595	1	4081	1
3596		4082

Diff Legend

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