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.321 by root, Thu Jul 26 21:44:43 2007 UTC vs.
Revision 1.539 by root, Tue May 4 22:49:21 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
3	use utf8;	25	use common::sense;
4	use strict;
5		26
6	use Symbol;	27	use Symbol;
7	use List::Util;	28	use List::Util;
8	use Socket;	29	use Socket;
9	use Storable;	30	use EV;
10	use Event;
11	use Opcode;	31	use Opcode;
12	use Safe;	32	use Safe;
13	use Safe::Hole;	33	use Safe::Hole;
		34	use Storable ();
		35	use Carp ();
14		36
		37	use Guard ();
15	use Coro 3.61 ();	38	use Coro ();
16	use Coro::State;	39	use Coro::State;
17	use Coro::Handle;	40	use Coro::Handle;
		41	use Coro::EV;
18	use Coro::Event;	42	use Coro::AnyEvent;
19	use Coro::Timer;	43	use Coro::Timer;
20	use Coro::Signal;	44	use Coro::Signal;
21	use Coro::Semaphore;	45	use Coro::Semaphore;
		46	use Coro::SemaphoreSet;
		47	use Coro::AnyEvent;
22	use Coro::AIO;	48	use Coro::AIO;
		49	use Coro::BDB 1.6;
23	use Coro::Storable;	50	use Coro::Storable;
		51	use Coro::Util ();
24		52
25	use JSON::XS 1.4 ();	53	use JSON::XS 2.01 ();
26	use BDB ();	54	use BDB ();
27	use Data::Dumper;	55	use Data::Dumper;
28	use Digest::MD5;
29	use Fcntl;	56	use Fcntl;
30	use YAML::Syck ();	57	use YAML::XS ();
31	use IO::AIO 2.32 ();	58	use IO::AIO ();
32	use Time::HiRes;	59	use Time::HiRes;
33	use Compress::LZF;	60	use Compress::LZF;
34	use Digest::MD5 ();	61	use Digest::MD5 ();
		62
		63	AnyEvent::detect;
35		64
36	# configure various modules to our taste	65	# configure various modules to our taste
37	#	66	#
38	$Storable::canonical = 1; # reduce rsync transfers	67	$Storable::canonical = 1; # reduce rsync transfers
39	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator	68	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
		69
		70	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
		71
		72	# make sure c-lzf reinitialises itself
		73	Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
40	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later	74	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
41		75
42	$Event::Eval = 1; # no idea why this is required, but it is	76	# strictly for debugging
43		77	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
44	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45	$YAML::Syck::ImplicitUnicode = 1;
46
47	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48		78
49	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	79	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50		80
51	our %COMMAND = ();	81	our %COMMAND = ();
52	our %COMMAND_TIME = ();	82	our %COMMAND_TIME = ();
…		…
55	our %EXTCMD = ();	85	our %EXTCMD = ();
56	our %EXTICMD = ();	86	our %EXTICMD = ();
57	our %EXT_CORO = (); # coroutines bound to extensions	87	our %EXT_CORO = (); # coroutines bound to extensions
58	our %EXT_MAP = (); # pluggable maps	88	our %EXT_MAP = (); # pluggable maps
59		89
60	our $RELOAD; # number of reloads so far	90	our $RELOAD; # number of reloads so far, non-zero while in reload
61	our @EVENT;	91	our @EVENT;
		92	our @REFLECT; # set by XS
		93	our %REFLECT; # set by us
62		94
63	our $CONFDIR = confdir;	95	our $CONFDIR = confdir;
64	our $DATADIR = datadir;	96	our $DATADIR = datadir;
65	our $LIBDIR = "$DATADIR/ext";	97	our $LIBDIR = "$DATADIR/ext";
66	our $PODDIR = "$DATADIR/pod";	98	our $PODDIR = "$DATADIR/pod";
67	our $MAPDIR = "$DATADIR/" . mapdir;	99	our $MAPDIR = "$DATADIR/" . mapdir;
68	our $LOCALDIR = localdir;	100	our $LOCALDIR = localdir;
69	our $TMPDIR = "$LOCALDIR/" . tmpdir;	101	our $TMPDIR = "$LOCALDIR/" . tmpdir;
70	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	102	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	103	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72	our $RANDOMDIR = "$LOCALDIR/random";	104	our $RANDOMDIR = "$LOCALDIR/random";
73	our $BDBDIR = "$LOCALDIR/db";	105	our $BDBDIR = "$LOCALDIR/db";
		106	our $PIDFILE = "$LOCALDIR/pid";
		107	our $RUNTIMEFILE = "$LOCALDIR/runtime";
		108
		109	our %RESOURCE; # unused
		110
		111	our $OUTPUT_RATE_MIN = 3000;
		112	our $OUTPUT_RATE_MAX = 1000000;
		113
		114	our $MAX_LINKS = 32; # how many chained exits to follow
		115	our $VERBOSE_IO = 1;
74		116
75	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	117	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76	our $TICK_WATCHER;
77	our $AIO_POLL_WATCHER;
78	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	118	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79	our $NEXT_TICK;	119	our $NEXT_TICK;
80	our $NOW;
81	our $USE_FSYNC = 1; # use fsync to write maps - default off	120	our $USE_FSYNC = 1; # use fsync to write maps - default on
82		121
		122	our $BDB_DEADLOCK_WATCHER;
		123	our $BDB_CHECKPOINT_WATCHER;
83	our $BDB_POLL_WATCHER;	124	our $BDB_TRICKLE_WATCHER;
84	our $DB_ENV;	125	our $DB_ENV;
		126
		127	our @EXTRA_MODULES = qw(pod match mapscript);
85		128
86	our %CFG;	129	our %CFG;
87		130
88	our $UPTIME; $UPTIME ||= time;	131	our $UPTIME; $UPTIME ||= time;
89	our $RUNTIME;	132	our $RUNTIME;
		133	our $NOW;
90		134
91	our %PLAYER; # all users	135	our (%PLAYER, %PLAYER_LOADING); # all users
92	our %MAP; # all maps	136	our (%MAP, %MAP_LOADING ); # all maps
93	our $LINK_MAP; # the special {link} map, which is always available	137	our $LINK_MAP; # the special {link} map, which is always available
94		138
95	# used to convert map paths into valid unix filenames by replacing / by ∕	139	# used to convert map paths into valid unix filenames by replacing / by ∕
96	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	140	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97		141
98	our $LOAD; # a number between 0 (idle) and 1 (too many objects)	142	our $LOAD; # a number between 0 (idle) and 1 (too many objects)
99	our $LOADAVG; # same thing, but with alpha-smoothing	143	our $LOADAVG; # same thing, but with alpha-smoothing
		144	our $JITTER; # average jitter
100	our $tick_start; # for load detecting purposes	145	our $TICK_START; # for load detecting purposes
		146
		147	our @POST_INIT;
		148
		149	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
		150	our $REALLY_UNLOOP; # never set to true, please :)
101		151
102	binmode STDOUT;	152	binmode STDOUT;
103	binmode STDERR;	153	binmode STDERR;
104		154
105	# read virtual server time, if available	155	# read virtual server time, if available
106	unless ($RUNTIME || !-e "$LOCALDIR/runtime") {	156	unless ($RUNTIME || !-e $RUNTIMEFILE) {
107	open my $fh, "<", "$LOCALDIR/runtime"	157	open my $fh, "<", $RUNTIMEFILE
108	or die "unable to read runtime file: $!";	158	or die "unable to read $RUNTIMEFILE file: $!";
109	$RUNTIME = <$fh> + 0.;	159	$RUNTIME = <$fh> + 0.;
110	}	160	}
		161
		162	eval "sub TICK() { $TICK } 1" or die;
111		163
112	mkdir $_	164	mkdir $_
113	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;	165	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
114		166
115	our $EMERGENCY_POSITION;	167	our $EMERGENCY_POSITION;
116		168
117	sub cf::map::normalise;	169	sub cf::map::normalise;
		170
		171	sub in_main() {
		172	$Coro::current == $Coro::main
		173	}
		174
		175	#############################################################################
		176
		177	%REFLECT = ();
		178	for (@REFLECT) {
		179	my $reflect = JSON::XS::decode_json $_;
		180	$REFLECT{$reflect->{class}} = $reflect;
		181	}
		182
		183	# this is decidedly evil
		184	$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
118		185
119	#############################################################################	186	#############################################################################
120		187
121	=head2 GLOBAL VARIABLES	188	=head2 GLOBAL VARIABLES
122		189
…		…
158		225
159	The raw value load value from the last tick.	226	The raw value load value from the last tick.
160		227
161	=item %cf::CFG	228	=item %cf::CFG
162		229
163	Configuration for the server, loaded from C</etc/crossfire/config>, or	230	Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164	from wherever your confdir points to.	231	from wherever your confdir points to.
165		232
166	=item cf::wait_for_tick, cf::wait_for_tick_begin	233	=item cf::wait_for_tick, cf::wait_for_tick_begin
167		234
168	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	235	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
169	returns directly I<after> the tick processing (and consequently, can only wake one process	236	returns directly I<after> the tick processing (and consequently, can only wake one process
170	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	237	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
171		238
172	=item @cf::INVOKE_RESULTS	239	=item @cf::INVOKE_RESULTS
173		240
174	This array contains the results of the last C<invoke ()> call. When	241	This array contains the results of the last C<invoke ()> call. When
175	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of	242	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
176	that call.	243	that call.
177		244
		245	=item %cf::REFLECT
		246
		247	Contains, for each (C++) class name, a hash reference with information
		248	about object members (methods, scalars, arrays and flags) and other
		249	metadata, which is useful for introspection.
		250
178	=back	251	=back
179		252
180	=cut	253	=cut
181		254
182	BEGIN {	255	sub error(@) { LOG llevError, join "", @_ }
183	*CORE::GLOBAL::warn = sub {	256	sub warn (@) { LOG llevWarn , join "", @_ }
		257	sub info (@) { LOG llevInfo , join "", @_ }
		258	sub debug(@) { LOG llevDebug, join "", @_ }
		259	sub trace(@) { LOG llevTrace, join "", @_ }
		260
		261	$Coro::State::WARNHOOK = sub {
184	my $msg = join "", @_;	262	my $msg = join "", @_;
185		263
186	$msg .= "\n"	264	$msg .= "\n"
187	unless $msg =~ /\n$/;	265	unless $msg =~ /\n$/;
188		266
189	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	267	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
190		268
191	utf8::encode $msg;
192	LOG llevError, $msg;	269	LOG llevWarn, $msg;
193	};	270	};
194	}	271
		272	$Coro::State::DIEHOOK = sub {
		273	return unless $^S eq 0; # "eq", not "=="
		274
		275	error Carp::longmess $_[0];
		276
		277	if (in_main) {#d#
		278	error "DIEHOOK called in main context, Coro bug?\n";#d#
		279	return;#d#
		280	}#d#
		281
		282	# kill coroutine otherwise
		283	Coro::terminate
		284	};
195		285
196	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	286	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
197	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	287	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
198	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	288	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
199	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	289	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
…		…
206	for my $pkg (qw(	296	for my $pkg (qw(
207	cf::global cf::attachable	297	cf::global cf::attachable
208	cf::object cf::object::player	298	cf::object cf::object::player
209	cf::client cf::player	299	cf::client cf::player
210	cf::arch cf::living	300	cf::arch cf::living
		301	cf::map cf::mapspace
211	cf::map cf::party cf::region	302	cf::party cf::region
212	)) {	303	)) {
213	no strict 'refs';
214	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	304	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
215	}	305	}
216		306
217	$Event::DIED = sub {	307	$EV::DIED = sub {
218	warn "error in event callback: @_";	308	Carp::cluck "error in event callback: @_";
219	};	309	};
220		310
221	#############################################################################	311	#############################################################################
222		312
223	=head2 UTILITY FUNCTIONS	313	=head2 UTILITY FUNCTIONS
…		…
245	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	335	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
246	$d	336	$d
247	} || "[unable to dump $_[0]: '$@']";	337	} || "[unable to dump $_[0]: '$@']";
248	}	338	}
249		339
250	=item $ref = cf::from_json $json	340	=item $ref = cf::decode_json $json
251		341
252	Converts a JSON string into the corresponding perl data structure.	342	Converts a JSON string into the corresponding perl data structure.
253		343
254	=item $json = cf::to_json $ref	344	=item $json = cf::encode_json $ref
255		345
256	Converts a perl data structure into its JSON representation.	346	Converts a perl data structure into its JSON representation.
257		347
258	=cut	348	=cut
259		349
260	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	350	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
261		351
262	sub to_json ($) { $json_coder->encode ($_[0]) }	352	sub encode_json($) { $json_coder->encode ($_[0]) }
263	sub from_json ($) { $json_coder->decode ($_[0]) }	353	sub decode_json($) { $json_coder->decode ($_[0]) }
		354
		355	=item cf::post_init { BLOCK }
		356
		357	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
		358	but I<before> the server starts ticking again.
		359
		360	The cdoeblock will have a single boolean argument to indicate whether this
		361	is a reload or not.
		362
		363	=cut
		364
		365	sub post_init(&) {
		366	push @POST_INIT, shift;
		367	}
264		368
265	=item cf::lock_wait $string	369	=item cf::lock_wait $string
266		370
267	Wait until the given lock is available. See cf::lock_acquire.	371	Wait until the given lock is available. See cf::lock_acquire.
268		372
269	=item my $lock = cf::lock_acquire $string	373	=item my $lock = cf::lock_acquire $string
270		374
271	Wait until the given lock is available and then acquires it and returns	375	Wait until the given lock is available and then acquires it and returns
272	a Coro::guard object. If the guard object gets destroyed (goes out of scope,	376	a L<Guard> object. If the guard object gets destroyed (goes out of scope,
273	for example when the coroutine gets canceled), the lock is automatically	377	for example when the coroutine gets canceled), the lock is automatically
274	returned.	378	returned.
275		379
		380	Locks are *not* recursive, locking from the same coro twice results in a
		381	deadlocked coro.
		382
276	Lock names should begin with a unique identifier (for example, cf::map::find	383	Lock names should begin with a unique identifier (for example, cf::map::find
277	uses map_find and cf::map::load uses map_load).	384	uses map_find and cf::map::load uses map_load).
278		385
279	=item $locked = cf::lock_active $string	386	=item $locked = cf::lock_active $string
280		387
281	Return true if the lock is currently active, i.e. somebody has locked it.	388	Return true if the lock is currently active, i.e. somebody has locked it.
282		389
283	=cut	390	=cut
284		391
285	our %LOCK;	392	our $LOCKS = new Coro::SemaphoreSet;
286		393
287	sub lock_wait($) {	394	sub lock_wait($) {
288	my ($key) = @_;	395	$LOCKS->wait ($_[0]);
289
290	# wait for lock, if any
291	while ($LOCK{$key}) {
292	push @{ $LOCK{$key} }, $Coro::current;
293	Coro::schedule;
294	}
295	}	396	}
296		397
297	sub lock_acquire($) {	398	sub lock_acquire($) {
298	my ($key) = @_;	399	$LOCKS->guard ($_[0])
299
300	# wait, to be sure we are not locked
301	lock_wait $key;
302
303	$LOCK{$key} = [];
304
305	Coro::guard {
306	# wake up all waiters, to be on the safe side
307	$_->ready for @{ delete $LOCK{$key} };
308	}
309	}	400	}
310		401
311	sub lock_active($) {	402	sub lock_active($) {
312	my ($key) = @_;	403	$LOCKS->count ($_[0]) < 1
313
314	! ! $LOCK{$key}
315	}	404	}
316		405
317	sub freeze_mainloop {	406	sub freeze_mainloop {
318	return unless $TICK_WATCHER->is_active;	407	tick_inhibit_inc;
319		408
320	my $guard = Coro::guard {	409	&Guard::guard (\&tick_inhibit_dec);
321	$TICK_WATCHER->start;	410	}
322	};	411
323	$TICK_WATCHER->stop;	412	=item cf::periodic $interval, $cb
324	$guard	413
		414	Like EV::periodic, but randomly selects a starting point so that the actions
		415	get spread over time.
		416
		417	=cut
		418
		419	sub periodic($$) {
		420	my ($interval, $cb) = @_;
		421
		422	my $start = rand List::Util::min 180, $interval;
		423
		424	EV::periodic $start, $interval, 0, $cb
325	}	425	}
326		426
327	=item cf::get_slot $time[, $priority[, $name]]	427	=item cf::get_slot $time[, $priority[, $name]]
328		428
329	Allocate $time seconds of blocking CPU time at priority C<$priority>:	429	Allocate $time seconds of blocking CPU time at priority C<$priority>:
…		…
337		437
338	=cut	438	=cut
339		439
340	our @SLOT_QUEUE;	440	our @SLOT_QUEUE;
341	our $SLOT_QUEUE;	441	our $SLOT_QUEUE;
		442	our $SLOT_DECAY = 0.9;
342		443
343	$SLOT_QUEUE->cancel if $SLOT_QUEUE;	444	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
344	$SLOT_QUEUE = Coro::async {	445	$SLOT_QUEUE = Coro::async {
		446	$Coro::current->desc ("timeslot manager");
		447
345	my $signal = new Coro::Signal;	448	my $signal = new Coro::Signal;
		449	my $busy;
346		450
347	while () {	451	while () {
348	next_job:	452	next_job:
		453
349	my $avail = cf::till_tick;	454	my $avail = cf::till_tick;
350	if ($avail > 0.01) {	455
351	for (0 .. $#SLOT_QUEUE) {	456	for (0 .. $#SLOT_QUEUE) {
352	if ($SLOT_QUEUE[$_][0] < $avail) {	457	if ($SLOT_QUEUE[$_][0] <= $avail) {
		458	$busy = 0;
353	my $job = splice @SLOT_QUEUE, $_, 1, ();	459	my $job = splice @SLOT_QUEUE, $_, 1, ();
354	$job->[2]->send;	460	$job->[2]->send;
355	Coro::cede;	461	Coro::cede;
356	goto next_job;	462	goto next_job;
357	}	463	} else {
		464	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
358	}	465	}
359	}	466	}
360		467
361	if (@SLOT_QUEUE) {	468	if (@SLOT_QUEUE) {
362	# we do not use wait_For_tick() as it returns immediately when tick is inactive	469	# we do not use wait_for_tick() as it returns immediately when tick is inactive
363	push @cf::WAIT_FOR_TICK, $signal;	470	push @cf::WAIT_FOR_TICK, $signal;
364	$signal->wait;	471	$signal->wait;
365	} else {	472	} else {
		473	$busy = 0;
366	Coro::schedule;	474	Coro::schedule;
367	}	475	}
368	}	476	}
369	};	477	};
370		478
371	sub get_slot($;$$) {	479	sub get_slot($;$$) {
		480	return if tick_inhibit || $Coro::current == $Coro::main;
		481
372	my ($time, $pri, $name) = @_;	482	my ($time, $pri, $name) = @_;
373		483
374	$time = $TICK * .6 if $time > $TICK * .6;	484	$time = clamp $time, 0.01, $TICK * .6;
		485
375	my $sig = new Coro::Signal;	486	my $sig = new Coro::Signal;
376		487
377	push @SLOT_QUEUE, [$time, $pri, $sig, $name];	488	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
378	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;	489	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
379	$SLOT_QUEUE->ready;	490	$SLOT_QUEUE->ready;
…		…
390		501
391	BEGIN { *async = \&Coro::async_pool }	502	BEGIN { *async = \&Coro::async_pool }
392		503
393	=item cf::sync_job { BLOCK }	504	=item cf::sync_job { BLOCK }
394		505
395	The design of Crossfire TRT requires that the main coroutine ($Coro::main)	506	The design of Deliantra requires that the main coroutine ($Coro::main)
396	is always able to handle events or runnable, as Crossfire TRT is only	507	is always able to handle events or runnable, as Deliantra is only
397	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not	508	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
398	acceptable.	509	acceptable.
399		510
400	If it must be done, put the blocking parts into C<sync_job>. This will run	511	If it must be done, put the blocking parts into C<sync_job>. This will run
401	the given BLOCK in another coroutine while waiting for the result. The	512	the given BLOCK in another coroutine while waiting for the result. The
…		…
405	=cut	516	=cut
406		517
407	sub sync_job(&) {	518	sub sync_job(&) {
408	my ($job) = @_;	519	my ($job) = @_;
409		520
410	if ($Coro::current == $Coro::main) {	521	if (in_main) {
411	my $time = Event::time;	522	my $time = AE::time;
412		523
413	# this is the main coro, too bad, we have to block	524	# this is the main coro, too bad, we have to block
414	# till the operation succeeds, freezing the server :/	525	# till the operation succeeds, freezing the server :/
415		526
416	# TODO: use suspend/resume instead	527	#LOG llevError, Carp::longmess "sync job";#d#
417	# (but this is cancel-safe)	528
418	my $freeze_guard = freeze_mainloop;	529	my $freeze_guard = freeze_mainloop;
419		530
420	my $busy = 1;	531	my $busy = 1;
421	my @res;	532	my @res;
422		533
423	(async {	534	(async {
		535	$Coro::current->desc ("sync job coro");
424	@res = eval { $job->() };	536	@res = eval { $job->() };
425	warn $@ if $@;	537	error $@ if $@;
426	undef $busy;	538	undef $busy;
427	})->prio (Coro::PRIO_MAX);	539	})->prio (Coro::PRIO_MAX);
428		540
429	while ($busy) {	541	while ($busy) {
430	Coro::cede or Event::one_event;	542	if (Coro::nready) {
		543	Coro::cede_notself;
		544	} else {
		545	EV::loop EV::LOOP_ONESHOT;
431	}	546	}
		547	}
432		548
433	$time = Event::time - $time;	549	my $time = AE::time - $time;
434		550
435	LOG llevError | logBacktrace, Carp::longmess "long sync job"
436	if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
437
438	$tick_start += $time; # do not account sync jobs to server load	551	$TICK_START += $time; # do not account sync jobs to server load
439		552
440	wantarray ? @res : $res[0]	553	wantarray ? @res : $res[0]
441	} else {	554	} else {
442	# we are in another coroutine, how wonderful, everything just works	555	# we are in another coroutine, how wonderful, everything just works
443		556
…		…
468	=item fork_call { }, $args	581	=item fork_call { }, $args
469		582
470	Executes the given code block with the given arguments in a seperate	583	Executes the given code block with the given arguments in a seperate
471	process, returning the results. Everything must be serialisable with	584	process, returning the results. Everything must be serialisable with
472	Coro::Storable. May, of course, block. Note that the executed sub may	585	Coro::Storable. May, of course, block. Note that the executed sub may
473	never block itself or use any form of Event handling.	586	never block itself or use any form of event handling.
474		587
475	=cut	588	=cut
476
477	sub _store_scalar {
478	open my $fh, ">", \my $buf
479	or die "fork_call: cannot open fh-to-buf in child : $!";
480	Storable::store_fd $_[0], $fh;
481	close $fh;
482
483	$buf
484	}
485		589
486	sub fork_call(&@) {	590	sub fork_call(&@) {
487	my ($cb, @args) = @_;	591	my ($cb, @args) = @_;
488		592
489	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC	593	# we seemingly have to make a local copy of the whole thing,
490	# or die "socketpair: $!";	594	# otherwise perl prematurely frees the stuff :/
491	pipe my $fh1, my $fh2	595	# TODO: investigate and fix (likely this will be rather laborious)
492	or die "pipe: $!";
493		596
494	if (my $pid = fork) {	597	my @res = Coro::Util::fork_eval {
495	close $fh2;
496
497	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
498	warn "pst<$res>" unless $res =~ /^pst/;
499	$res = Coro::Storable::thaw $res;
500
501	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
502
503	Carp::confess $$res unless "ARRAY" eq ref $res;
504
505	return wantarray ? @$res : $res->[-1];
506	} else {
507	reset_signals;	598	reset_signals;
508	local $SIG{__WARN__};	599	&$cb
509	local $SIG{__DIE__};	600	}, @args;
510	# just in case, this hack effectively disables event
511	# in the child. cleaner and slower would be canceling all watchers,
512	# but this works for the time being.
513	local $Coro::idle;
514	$Coro::current->prio (Coro::PRIO_MAX);
515		601
516	eval {	602	wantarray ? @res : $res[-1]
517	close $fh1;	603	}
518		604
519	my @res = eval { $cb->(@args) };	605	sub objinfo {
520
521	syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
522	close $fh2;
523	};
524
525	warn $@ if $@;
526	_exit 0;
527	}	606	(
		607	"counter value" => cf::object::object_count,
		608	"objects created" => cf::object::create_count,
		609	"objects destroyed" => cf::object::destroy_count,
		610	"freelist size" => cf::object::free_count,
		611	"allocated objects" => cf::object::objects_size,
		612	"active objects" => cf::object::actives_size,
		613	)
		614	}
		615
		616	=item $coin = coin_from_name $name
		617
		618	=cut
		619
		620	our %coin_alias = (
		621	"silver" => "silvercoin",
		622	"silvercoin" => "silvercoin",
		623	"silvercoins" => "silvercoin",
		624	"gold" => "goldcoin",
		625	"goldcoin" => "goldcoin",
		626	"goldcoins" => "goldcoin",
		627	"platinum" => "platinacoin",
		628	"platinumcoin" => "platinacoin",
		629	"platinumcoins" => "platinacoin",
		630	"platina" => "platinacoin",
		631	"platinacoin" => "platinacoin",
		632	"platinacoins" => "platinacoin",
		633	"royalty" => "royalty",
		634	"royalties" => "royalty",
		635	);
		636
		637	sub coin_from_name($) {
		638	$coin_alias{$_[0]}
		639	? cf::arch::find $coin_alias{$_[0]}
		640	: undef
528	}	641	}
529		642
530	=item $value = cf::db_get $family => $key	643	=item $value = cf::db_get $family => $key
531		644
532	Returns a single value from the environment database.	645	Returns a single value from the environment database.
…		…
534	=item cf::db_put $family => $key => $value	647	=item cf::db_put $family => $key => $value
535		648
536	Stores the given C<$value> in the family. It can currently store binary	649	Stores the given C<$value> in the family. It can currently store binary
537	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).	650	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
538		651
		652	=item $db = cf::db_table "name"
		653
		654	Create and/or open a new database table. The string must not be "db" and must be unique
		655	within each server.
		656
539	=cut	657	=cut
		658
		659	sub db_table($) {
		660	cf::error "db_get called from main context"
		661	if $Coro::current == $Coro::main;
		662
		663	my ($name) = @_;
		664	my $db = BDB::db_create $DB_ENV;
		665
		666	eval {
		667	$db->set_flags (BDB::CHKSUM);
		668
		669	utf8::encode $name;
		670	BDB::db_open $db, undef, $name, undef, BDB::BTREE,
		671	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
		672	cf::cleanup "db_open(db): $!" if $!;
		673	};
		674	cf::cleanup "db_open(db): $@" if $@;
		675
		676	$db
		677	}
540		678
541	our $DB;	679	our $DB;
542		680
543	sub db_init {	681	sub db_init {
544	unless ($DB) {	682	$DB ||= db_table "db";
545	$DB = BDB::db_create $DB_ENV;
546
547	cf::sync_job {
548	eval {
549	$DB->set_flags (BDB::CHKSUM);
550
551	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
552	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
553	cf::cleanup "db_open(db): $!" if $!;
554	};
555	cf::cleanup "db_open(db): $@" if $@;
556	};
557	}
558	}	683	}
559		684
560	sub db_get($$) {	685	sub db_get($$) {
561	my $key = "$_[0]/$_[1]";	686	my $key = "$_[0]/$_[1]";
562		687
563	cf::sync_job {	688	cf::error "db_get called from main context"
		689	if $Coro::current == $Coro::main;
		690
564	BDB::db_get $DB, undef, $key, my $data;	691	BDB::db_get $DB, undef, $key, my $data;
565		692
566	$! ? ()	693	$! ? ()
567	: $data	694	: $data
568	}
569	}	695	}
570		696
571	sub db_put($$$) {	697	sub db_put($$$) {
572	BDB::dbreq_pri 4;	698	BDB::dbreq_pri 4;
573	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	699	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
612	if (1) {	738	if (1) {
613	$md5 =	739	$md5 =
614	join "\x00",	740	join "\x00",
615	$processversion,	741	$processversion,
616	map {	742	map {
617	Coro::cede;	743	cf::cede_to_tick;
618	($src->[$_], Digest::MD5::md5_hex $data[$_])	744	($src->[$_], Digest::MD5::md5_hex $data[$_])
619	} 0.. $#$src;	745	} 0.. $#$src;
620		746
621		747
622	my $dbmd5 = db_get cache => "$id/md5";	748	my $dbmd5 = db_get cache => "$id/md5";
…		…
629		755
630	my $t1 = Time::HiRes::time;	756	my $t1 = Time::HiRes::time;
631	my $data = $process->(\@data);	757	my $data = $process->(\@data);
632	my $t2 = Time::HiRes::time;	758	my $t2 = Time::HiRes::time;
633		759
634	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	760	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
635		761
636	db_put cache => "$id/data", $data;	762	db_put cache => "$id/data", $data;
637	db_put cache => "$id/md5" , $md5;	763	db_put cache => "$id/md5" , $md5;
638	db_put cache => "$id/meta", $meta;	764	db_put cache => "$id/meta", $meta;
639		765
…		…
649		775
650	=cut	776	=cut
651		777
652	sub datalog($@) {	778	sub datalog($@) {
653	my ($type, %kv) = @_;	779	my ($type, %kv) = @_;
654	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	780	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
655	}	781	}
656		782
657	=back	783	=back
658		784
659	=cut	785	=cut
660		786
661	#############################################################################	787	#############################################################################
662		788
663	=head2 ATTACHABLE OBJECTS	789	=head2 ATTACHABLE OBJECTS
664		790
665	Many objects in crossfire are so-called attachable objects. That means you can	791	Many objects in deliantra are so-called attachable objects. That means you can
666	attach callbacks/event handlers (a collection of which is called an "attachment")	792	attach callbacks/event handlers (a collection of which is called an "attachment")
667	to it. All such attachable objects support the following methods.	793	to it. All such attachable objects support the following methods.
668		794
669	In the following description, CLASS can be any of C<global>, C<object>	795	In the following description, CLASS can be any of C<global>, C<object>
670	C<player>, C<client> or C<map> (i.e. the attachable objects in	796	C<player>, C<client> or C<map> (i.e. the attachable objects in
671	Crossfire TRT).	797	Deliantra).
672		798
673	=over 4	799	=over 4
674		800
675	=item $attachable->attach ($attachment, key => $value...)	801	=item $attachable->attach ($attachment, key => $value...)
676		802
…		…
720	=item cf::CLASS::attachment $name, ...	846	=item cf::CLASS::attachment $name, ...
721		847
722	Register an attachment by C<$name> through which attachable objects of the	848	Register an attachment by C<$name> through which attachable objects of the
723	given CLASS can refer to this attachment.	849	given CLASS can refer to this attachment.
724		850
725	Some classes such as crossfire maps and objects can specify attachments	851	Some classes such as deliantra maps and objects can specify attachments
726	that are attached at load/instantiate time, thus the need for a name.	852	that are attached at load/instantiate time, thus the need for a name.
727		853
728	These calls expect any number of the following handler/hook descriptions:	854	These calls expect any number of the following handler/hook descriptions:
729		855
730	=over 4	856	=over 4
…		…
854		980
855	} elsif (exists $cb_id{$type}) {	981	} elsif (exists $cb_id{$type}) {
856	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	982	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
857		983
858	} elsif (ref $type) {	984	} elsif (ref $type) {
859	warn "attaching objects not supported, ignoring.\n";	985	error "attaching objects not supported, ignoring.\n";
860		986
861	} else {	987	} else {
862	shift @arg;	988	shift @arg;
863	warn "attach argument '$type' not supported, ignoring.\n";	989	error "attach argument '$type' not supported, ignoring.\n";
864	}	990	}
865	}	991	}
866	}	992	}
867		993
868	sub _object_attach {	994	sub _object_attach {
…		…
878	_attach $registry, $klass, @attach;	1004	_attach $registry, $klass, @attach;
879	}	1005	}
880		1006
881	$obj->{$name} = \%arg;	1007	$obj->{$name} = \%arg;
882	} else {	1008	} else {
883	warn "object uses attachment '$name' which is not available, postponing.\n";	1009	info "object uses attachment '$name' which is not available, postponing.\n";
884	}	1010	}
885		1011
886	$obj->{_attachment}{$name} = undef;	1012	$obj->{_attachment}{$name} = undef;
887	}	1013	}
888		1014
…		…
947		1073
948	for (@$callbacks) {	1074	for (@$callbacks) {
949	eval { &{$_->[1]} };	1075	eval { &{$_->[1]} };
950		1076
951	if ($@) {	1077	if ($@) {
952	warn "$@";
953	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1078	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
954	override;	1079	override;
955	}	1080	}
956		1081
957	return 1 if $override;	1082	return 1 if $override;
958	}	1083	}
959		1084
960	0	1085	0
961	}	1086	}
962		1087
963	=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...)	1088	=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
964		1089
965	=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)	1090	=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
966		1091
967	Generate an object-specific event with the given arguments.	1092	Generate an object-specific event with the given arguments.
968		1093
…		…
974		1099
975	=cut	1100	=cut
976		1101
977	#############################################################################	1102	#############################################################################
978	# object support	1103	# object support
979	#
980		1104
		1105	sub _object_equal($$);
		1106	sub _object_equal($$) {
		1107	my ($a, $b) = @_;
		1108
		1109	return 0 unless (ref $a) eq (ref $b);
		1110
		1111	if ("HASH" eq ref $a) {
		1112	my @ka = keys %$a;
		1113	my @kb = keys %$b;
		1114
		1115	return 0 if @ka != @kb;
		1116
		1117	for (0 .. $#ka) {
		1118	return 0 unless $ka[$_] eq $kb[$_];
		1119	return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
		1120	}
		1121
		1122	} elsif ("ARRAY" eq ref $a) {
		1123
		1124	return 0 if @$a != @$b;
		1125
		1126	for (0 .. $#$a) {
		1127	return 0 unless _object_equal $a->[$_], $b->[$_];
		1128	}
		1129
		1130	} elsif ($a ne $b) {
		1131	return 0;
		1132	}
		1133
		1134	1
		1135	}
		1136
		1137	our $SLOW_MERGES;#d#
981	sub _can_merge {	1138	sub _can_merge {
982	my ($ob1, $ob2) = @_;	1139	my ($ob1, $ob2) = @_;
983		1140
984	local $Storable::canonical = 1;	1141	++$SLOW_MERGES;#d#
985	my $fob1 = Storable::freeze $ob1;
986	my $fob2 = Storable::freeze $ob2;
987		1142
988	$fob1 eq $fob2	1143	# we do the slow way here
		1144	return _object_equal $ob1, $ob2
989	}	1145	}
990		1146
991	sub reattach {	1147	sub reattach {
992	# basically do the same as instantiate, without calling instantiate	1148	# basically do the same as instantiate, without calling instantiate
993	my ($obj) = @_;	1149	my ($obj) = @_;
994		1150
		1151	# no longer needed after getting rid of delete_package?
995	bless $obj, ref $obj; # re-bless in case extensions have been reloaded	1152	#bless $obj, ref $obj; # re-bless in case extensions have been reloaded
996		1153
997	my $registry = $obj->registry;	1154	my $registry = $obj->registry;
998		1155
999	@$registry = ();	1156	@$registry = ();
1000		1157
…		…
1005	for (@$attach) {	1162	for (@$attach) {
1006	my ($klass, @attach) = @$_;	1163	my ($klass, @attach) = @$_;
1007	_attach $registry, $klass, @attach;	1164	_attach $registry, $klass, @attach;
1008	}	1165	}
1009	} else {	1166	} else {
1010	warn "object uses attachment '$name' that is not available, postponing.\n";	1167	info "object uses attachment '$name' that is not available, postponing.\n";
1011	}	1168	}
1012	}	1169	}
1013	}	1170	}
1014		1171
1015	cf::attachable->attach (	1172	cf::attachable->attach (
1016	prio => -1000000,	1173	prio => -1000000,
1017	on_instantiate => sub {	1174	on_instantiate => sub {
1018	my ($obj, $data) = @_;	1175	my ($obj, $data) = @_;
1019		1176
1020	$data = from_json $data;	1177	$data = decode_json $data;
1021		1178
1022	for (@$data) {	1179	for (@$data) {
1023	my ($name, $args) = @$_;	1180	my ($name, $args) = @$_;
1024		1181
1025	$obj->attach ($name, %{$args || {} });	1182	$obj->attach ($name, %{$args || {} });
…		…
1041	sub object_freezer_save {	1198	sub object_freezer_save {
1042	my ($filename, $rdata, $objs) = @_;	1199	my ($filename, $rdata, $objs) = @_;
1043		1200
1044	sync_job {	1201	sync_job {
1045	if (length $$rdata) {	1202	if (length $$rdata) {
		1203	utf8::decode (my $decname = $filename);
1046	warn sprintf "saving %s (%d,%d)\n",	1204	trace sprintf "saving %s (%d,%d)\n",
1047	$filename, length $$rdata, scalar @$objs;	1205	$decname, length $$rdata, scalar @$objs
		1206	if $VERBOSE_IO;
1048		1207
1049	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1208	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1050	chmod SAVE_MODE, $fh;	1209	aio_chmod $fh, SAVE_MODE;
1051	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1210	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1052	aio_fsync $fh if $cf::USE_FSYNC;	1211	if ($cf::USE_FSYNC) {
		1212	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;
		1213	aio_fsync $fh;
		1214	}
1053	close $fh;	1215	aio_close $fh;
1054		1216
1055	if (@$objs) {	1217	if (@$objs) {
1056	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {	1218	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1057	chmod SAVE_MODE, $fh;	1219	aio_chmod $fh, SAVE_MODE;
1058	my $data = Storable::nfreeze { version => 1, objs => $objs };	1220	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1059	aio_write $fh, 0, (length $data), $data, 0;	1221	aio_write $fh, 0, (length $data), $data, 0;
1060	aio_fsync $fh if $cf::USE_FSYNC;	1222	if ($cf::USE_FSYNC) {
		1223	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;
		1224	aio_fsync $fh;
		1225	}
1061	close $fh;	1226	aio_close $fh;
1062	aio_rename "$filename.pst~", "$filename.pst";	1227	aio_rename "$filename.pst~", "$filename.pst";
1063	}	1228	}
1064	} else {	1229	} else {
1065	aio_unlink "$filename.pst";	1230	aio_unlink "$filename.pst";
1066	}	1231	}
1067		1232
1068	aio_rename "$filename~", $filename;	1233	aio_rename "$filename~", $filename;
		1234
		1235	$filename =~ s%/[^/]+$%%;
		1236	aio_pathsync $filename if $cf::USE_FSYNC;
1069	} else {	1237	} else {
1070	warn "FATAL: $filename~: $!\n";	1238	error "unable to save objects: $filename~: $!\n";
1071	}	1239	}
1072	} else {	1240	} else {
1073	aio_unlink $filename;	1241	aio_unlink $filename;
1074	aio_unlink "$filename.pst";	1242	aio_unlink "$filename.pst";
1075	}	1243	}
1076	}	1244	};
1077	}	1245	}
1078		1246
1079	sub object_freezer_as_string {	1247	sub object_freezer_as_string {
1080	my ($rdata, $objs) = @_;	1248	my ($rdata, $objs) = @_;
1081		1249
…		…
1093	or return;	1261	or return;
1094		1262
1095	unless (aio_stat "$filename.pst") {	1263	unless (aio_stat "$filename.pst") {
1096	(aio_load "$filename.pst", $av) >= 0	1264	(aio_load "$filename.pst", $av) >= 0
1097	or return;	1265	or return;
		1266
1098	$av = eval { (Storable::thaw $av)->{objs} };	1267	my $st = eval { Coro::Storable::thaw $av };
		1268	$av = $st->{objs};
1099	}	1269	}
1100		1270
		1271	utf8::decode (my $decname = $filename);
1101	warn sprintf "loading %s (%d)\n",	1272	trace sprintf "loading %s (%d,%d)\n",
1102	$filename, length $data, scalar @{$av || []};	1273	$decname, length $data, scalar @{$av || []}
		1274	if $VERBOSE_IO;
		1275
1103	return ($data, $av);	1276	($data, $av)
1104	}	1277	}
1105		1278
1106	=head2 COMMAND CALLBACKS	1279	=head2 COMMAND CALLBACKS
1107		1280
1108	=over 4	1281	=over 4
…		…
1162	my ($name, $cb) = @_;	1335	my ($name, $cb) = @_;
1163		1336
1164	$EXTICMD{$name} = $cb;	1337	$EXTICMD{$name} = $cb;
1165	}	1338	}
1166		1339
		1340	use File::Glob ();
		1341
1167	cf::player->attach (	1342	cf::player->attach (
1168	on_command => sub {	1343	on_unknown_command => sub {
1169	my ($pl, $name, $params) = @_;	1344	my ($pl, $name, $params) = @_;
1170		1345
1171	my $cb = $COMMAND{$name}	1346	my $cb = $COMMAND{$name}
1172	or return;	1347	or return;
1173		1348
…		…
1186	my ($type, $reply, @payload) =	1361	my ($type, $reply, @payload) =
1187	"ARRAY" eq ref $msg	1362	"ARRAY" eq ref $msg
1188	? @$msg	1363	? @$msg
1189	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove	1364	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190		1365
		1366	my @reply;
		1367
1191	if (my $cb = $EXTCMD{$type}) {	1368	if (my $cb = $EXTCMD{$type}) {
1192	my @reply = $cb->($pl, @payload);	1369	@reply = $cb->($pl, @payload);
1193
1194	$pl->ext_reply ($reply, @reply)
1195	if $reply;
1196	}	1370	}
		1371
		1372	$pl->ext_reply ($reply, @reply)
		1373	if $reply;
		1374
1197	} else {	1375	} else {
1198	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1376	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199	}	1377	}
1200		1378
1201	cf::override;	1379	cf::override;
1202	},	1380	},
1203	);	1381	);
1204		1382
		1383	# "readahead" all extensions
		1384	sub cache_extensions {
		1385	my $grp = IO::AIO::aio_group;
		1386
		1387	add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
		1388	for (grep /\.ext$/, @{$_[0]}) {
		1389	add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
		1390	}
		1391	};
		1392
		1393	$grp
		1394	}
		1395
1205	sub load_extensions {	1396	sub load_extensions {
		1397	info "loading extensions...";
		1398
1206	cf::sync_job {	1399	cf::sync_job {
1207	my %todo;	1400	my %todo;
1208		1401
1209	for my $path (<$LIBDIR/*.ext>) {	1402	for my $path (<$LIBDIR/*.ext>) {
1210	next unless -r $path;	1403	next unless -r $path;
…		…
1228		1421
1229	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1422	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1230	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1423	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1231		1424
1232	$ext{source} =	1425	$ext{source} =
1233	"package $pkg; use strict; use utf8;\n"	1426	"package $pkg; use common::sense;\n"
1234	. "#line 1 \"$path\"\n{\n"	1427	. "#line 1 \"$path\"\n{\n"
1235	. $source	1428	. $source
1236	. "\n};\n1";	1429	. "\n};\n1";
1237		1430
1238	$todo{$base} = \%ext;	1431	$todo{$base} = \%ext;
1239	}	1432	}
1240		1433
		1434	my $pass = 0;
1241	my %done;	1435	my %done;
1242	while (%todo) {	1436	while (%todo) {
1243	my $progress;	1437	my $progress;
1244		1438
		1439	++$pass;
		1440
		1441	ext:
1245	while (my ($k, $v) = each %todo) {	1442	while (my ($k, $v) = each %todo) {
1246	for (split /,\s*/, $v->{meta}{depends}) {	1443	for (split /,\s*/, $v->{meta}{depends}) {
1247	goto skip	1444	next ext
1248	unless exists $done{$_};	1445	unless exists $done{$_};
1249	}	1446	}
1250		1447
1251	warn "... loading '$k' into '$v->{pkg}'\n";	1448	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1252		1449
1253	unless (eval $v->{source}) {	1450	my $active = eval $v->{source};
		1451
		1452	if (length $@) {
1254	my $msg = $@ ? "$v->{path}: $@\n"	1453	error "$v->{path}: $@\n";
1255	: "$v->{base}: extension inactive.\n";	1454	undef $@; # work around perl 5.10.0 utf-8 caching bug
1256		1455
		1456	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1257	if (exists $v->{meta}{mandatory}) {	1457	if exists $v->{meta}{mandatory};
1258	warn $msg;	1458
1259	warn "mandatory extension failed to load, exiting.\n";	1459	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1260	exit 1;	1460	delete $todo{$k};
1261	}	1461	} else {
1262		1462	$done{$k} = delete $todo{$k};
1263	warn $msg;	1463	push @EXTS, $v->{pkg};
		1464	$progress = 1;
		1465
		1466	info "$v->{base}: extension inactive.\n"
		1467	unless $active;
1264	}	1468	}
1265
1266	$done{$k} = delete $todo{$k};
1267	push @EXTS, $v->{pkg};
1268	$progress = 1;
1269	}	1469	}
1270		1470
1271	skip:	1471	unless ($progress) {
1272	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"	1472	warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1273	unless $progress;	1473
		1474	while (my ($k, $v) = each %todo) {
		1475	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
		1476	if exists $v->{meta}{mandatory};
		1477	}
		1478	}
1274	}	1479	}
1275	};	1480	};
1276	}	1481	}
1277		1482
1278	#############################################################################	1483	#############################################################################
1279		1484
1280	=back	1485	=back
1281		1486
1282	=head2 CORE EXTENSIONS	1487	=head2 CORE EXTENSIONS
1283		1488
1284	Functions and methods that extend core crossfire objects.	1489	Functions and methods that extend core deliantra objects.
1285		1490
1286	=cut	1491	=cut
1287		1492
1288	package cf::player;	1493	package cf::player;
1289		1494
1290	use Coro::AIO;	1495	use Coro::AIO;
1291		1496
1292	=head3 cf::player	1497	=head3 cf::player
1293		1498
1294	=over 4	1499	=over 4
		1500
		1501	=item cf::player::num_playing
		1502
		1503	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1504
		1505	=cut
		1506
		1507	sub num_playing {
		1508	scalar grep
		1509	$_->ob->map
		1510	&& !$_->hidden
		1511	&& !$_->ob->flag (cf::FLAG_WIZ),
		1512	cf::player::list
		1513	}
1295		1514
1296	=item cf::player::find $login	1515	=item cf::player::find $login
1297		1516
1298	Returns the given player object, loading it if necessary (might block).	1517	Returns the given player object, loading it if necessary (might block).
1299		1518
…		…
1318		1537
1319	sub exists($) {	1538	sub exists($) {
1320	my ($login) = @_;	1539	my ($login) = @_;
1321		1540
1322	$cf::PLAYER{$login}	1541	$cf::PLAYER{$login}
1323	or cf::sync_job { !aio_stat path $login }	1542	or !aio_stat path $login
1324	}	1543	}
1325		1544
1326	sub find($) {	1545	sub find($) {
1327	return $cf::PLAYER{$_[0]} || do {	1546	return $cf::PLAYER{$_[0]} || do {
1328	my $login = $_[0];	1547	my $login = $_[0];
…		…
1335	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1554	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1336	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1555	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1337	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1556	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1338	aio_unlink +(playerdir $login) . "/$login.pl";	1557	aio_unlink +(playerdir $login) . "/$login.pl";
1339		1558
1340	my $pl = load_pl path $login	1559	my $f = new_from_file cf::object::thawer path $login
1341	or return;	1560	or return;
		1561
		1562	my $pl = cf::player::load_pl $f
		1563	or return;
		1564
		1565	local $cf::PLAYER_LOADING{$login} = $pl;
		1566	$f->resolve_delayed_derefs;
1342	$cf::PLAYER{$login} = $pl	1567	$cf::PLAYER{$login} = $pl
1343	}	1568	}
1344	}	1569	}
1345	}	1570	}
		1571
		1572	cf::player->attach (
		1573	on_load => sub {
		1574	my ($pl, $path) = @_;
		1575
		1576	# restore slots saved in save, below
		1577	my $slots = delete $pl->{_slots};
		1578
		1579	$pl->ob->current_weapon ($slots->[0]);
		1580	$pl->combat_ob ($slots->[1]);
		1581	$pl->ranged_ob ($slots->[2]);
		1582	},
		1583	);
1346		1584
1347	sub save($) {	1585	sub save($) {
1348	my ($pl) = @_;	1586	my ($pl) = @_;
1349		1587
1350	return if $pl->{deny_save};	1588	return if $pl->{deny_save};
…		…
1355	return if $pl->{deny_save};	1593	return if $pl->{deny_save};
1356		1594
1357	aio_mkdir playerdir $pl, 0770;	1595	aio_mkdir playerdir $pl, 0770;
1358	$pl->{last_save} = $cf::RUNTIME;	1596	$pl->{last_save} = $cf::RUNTIME;
1359		1597
		1598	cf::get_slot 0.01;
		1599
		1600	# save slots, to be restored later
		1601	local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
		1602
1360	$pl->save_pl ($path);	1603	$pl->save_pl ($path);
1361	Coro::cede;	1604	cf::cede_to_tick;
1362	}	1605	}
1363		1606
1364	sub new($) {	1607	sub new($) {
1365	my ($login) = @_;	1608	my ($login) = @_;
1366		1609
…		…
1372	$cf::PLAYER{$login} = $self;	1615	$cf::PLAYER{$login} = $self;
1373		1616
1374	$self	1617	$self
1375	}	1618	}
1376		1619
		1620	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1621
		1622	=cut
		1623
		1624	sub send_msg {
		1625	my $ns = shift->ns
		1626	or return;
		1627	$ns->send_msg (@_);
		1628	}
		1629
1377	=item $pl->quit_character	1630	=item $pl->quit_character
1378		1631
1379	Nukes the player without looking back. If logged in, the connection will	1632	Nukes the player without looking back. If logged in, the connection will
1380	be destroyed. May block for a long time.	1633	be destroyed. May block for a long time.
1381		1634
…		…
1385	my ($pl) = @_;	1638	my ($pl) = @_;
1386		1639
1387	my $name = $pl->ob->name;	1640	my $name = $pl->ob->name;
1388		1641
1389	$pl->{deny_save} = 1;	1642	$pl->{deny_save} = 1;
1390	$pl->password ("*"); # this should lock out the player until we nuked the dir	1643	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1391		1644
1392	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1645	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1393	$pl->deactivate;	1646	$pl->deactivate;
		1647	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1394	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1648	$pl->invoke (cf::EVENT_PLAYER_QUIT);
1395	$pl->ns->destroy if $pl->ns;	1649	$pl->ns->destroy if $pl->ns;
1396		1650
1397	my $path = playerdir $pl;	1651	my $path = playerdir $pl;
1398	my $temp = "$path~$cf::RUNTIME~deleting~";	1652	my $temp = "$path~$cf::RUNTIME~deleting~";
…		…
1434	or return [];	1688	or return [];
1435		1689
1436	my @logins;	1690	my @logins;
1437		1691
1438	for my $login (@$dirs) {	1692	for my $login (@$dirs) {
		1693	my $path = path $login;
		1694
		1695	# a .pst is a dead give-away for a valid player
		1696	# if no pst file found, open and chekc for blocked users
		1697	if (aio_stat "$path.pst") {
1439	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1698	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1440	aio_read $fh, 0, 512, my $buf, 0 or next;	1699	aio_read $fh, 0, 512, my $buf, 0 or next;
1441	$buf !~ /^password -------------$/m or next; # official not-valid tag	1700	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1701	}
1442		1702
1443	utf8::decode $login;	1703	utf8::decode $login;
1444	push @logins, $login;	1704	push @logins, $login;
1445	}	1705	}
1446		1706
1447	\@logins	1707	\@logins
1448	}	1708	}
1449		1709
1450	=item $player->maps	1710	=item $player->maps
		1711
		1712	=item cf::player::maps $login
1451		1713
1452	Returns an arrayref of map paths that are private for this	1714	Returns an arrayref of map paths that are private for this
1453	player. May block.	1715	player. May block.
1454		1716
1455	=cut	1717	=cut
…		…
1473	}	1735	}
1474		1736
1475	\@paths	1737	\@paths
1476	}	1738	}
1477		1739
1478	=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)	1740	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1479		1741
1480	Expand crossfire pod fragments into protocol xml.	1742	Expand deliantra pod fragments into protocol xml.
1481
1482	=cut
1483
1484	sub expand_cfpod {
1485	((my $self), (local $_)) = @_;
1486
1487	# escape & and <
1488	s/&/&amp;/g;
1489	s/(?<![BIUGH])</&lt;/g;
1490
1491	# this is buggy, it needs to properly take care of nested <'s
1492
1493	1 while
1494	# replace B<>, I<>, U<> etc.
1495	s/B<([^\>]*)>/<b>$1<\/b>/
1496	|| s/I<([^\>]*)>/<i>$1<\/i>/
1497	|| s/U<([^\>]*)>/<u>$1<\/u>/
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		1743
1528	=item $player->ext_reply ($msgid, @msg)	1744	=item $player->ext_reply ($msgid, @msg)
1529		1745
1530	Sends an ext reply to the player.	1746	Sends an ext reply to the player.
1531		1747
1532	=cut	1748	=cut
1533		1749
1534	sub ext_reply($$@) {	1750	sub ext_reply($$@) {
1535	my ($self, $id, @msg) = @_;	1751	my ($self, $id, @msg) = @_;
1536		1752
1537	if ($self->ns->extcmd == 2) {	1753	$self->ns->ext_reply ($id, @msg)
1538	$self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1539	} elsif ($self->ns->extcmd == 1) {
1540	#TODO: version 1, remove
1541	unshift @msg, msgtype => "reply", msgid => $id;
1542	$self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1543	}
1544	}	1754	}
1545		1755
1546	=item $player->ext_msg ($type, @msg)	1756	=item $player->ext_msg ($type, @msg)
1547		1757
1548	Sends an ext event to the client.	1758	Sends an ext event to the client.
…		…
1569		1779
1570	=cut	1780	=cut
1571		1781
1572	sub find_by_path($) {	1782	sub find_by_path($) {
1573	my ($path) = @_;	1783	my ($path) = @_;
		1784
		1785	$path =~ s/^~[^\/]*//; # skip ~login
1574		1786
1575	my ($match, $specificity);	1787	my ($match, $specificity);
1576		1788
1577	for my $region (list) {	1789	for my $region (list) {
1578	if ($region->{match} && $path =~ $region->{match}) {	1790	if ($region->{match} && $path =~ $region->{match}) {
…		…
1604	our $MAX_RESET = 3600;	1816	our $MAX_RESET = 3600;
1605	our $DEFAULT_RESET = 3000;	1817	our $DEFAULT_RESET = 3000;
1606		1818
1607	sub generate_random_map {	1819	sub generate_random_map {
1608	my ($self, $rmp) = @_;	1820	my ($self, $rmp) = @_;
		1821
		1822	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
		1823
1609	# mit "rum" bekleckern, nicht	1824	# mit "rum" bekleckern, nicht
1610	$self->_create_random_map (	1825	$self->_create_random_map (
1611	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},	1826	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1612	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},	1827	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1613	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},	1828	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1614	$rmp->{exit_on_final_map},	1829	$rmp->{exit_on_final_map},
1615	$rmp->{xsize}, $rmp->{ysize},	1830	$rmp->{xsize}, $rmp->{ysize},
1616	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},	1831	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1617	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},	1832	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
…		…
1632		1847
1633	sub register {	1848	sub register {
1634	my (undef, $regex, $prio) = @_;	1849	my (undef, $regex, $prio) = @_;
1635	my $pkg = caller;	1850	my $pkg = caller;
1636		1851
1637	no strict;
1638	push @{"$pkg\::ISA"}, __PACKAGE__;	1852	push @{"$pkg\::ISA"}, __PACKAGE__;
1639		1853
1640	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	1854	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1641	}	1855	}
1642		1856
1643	# also paths starting with '/'	1857	# also paths starting with '/'
1644	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	1858	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1645		1859
1646	sub thawer_merge {	1860	sub thawer_merge {
1647	my ($self, $merge) = @_;	1861	my ($self, $merge) = @_;
1648		1862
1649	# we have to keep some variables in memory intact	1863	# we have to keep some variables in memory intact
…		…
1735		1949
1736	# the temporary/swap location	1950	# the temporary/swap location
1737	sub save_path {	1951	sub save_path {
1738	my ($self) = @_;	1952	my ($self) = @_;
1739		1953
1740	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1954	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1741	"$TMPDIR/$path.map"	1955	"$TMPDIR/$path.map"
1742	}	1956	}
1743		1957
1744	# the unique path, undef == no special unique path	1958	# the unique path, undef == no special unique path
1745	sub uniq_path {	1959	sub uniq_path {
1746	my ($self) = @_;	1960	my ($self) = @_;
1747		1961
1748	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1962	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1749	"$UNIQUEDIR/$path"	1963	"$UNIQUEDIR/$path"
1750	}
1751
1752	# and all this just because we cannot iterate over
1753	# all maps in C++...
1754	sub change_all_map_light {
1755	my ($change) = @_;
1756
1757	$_->change_map_light ($change)
1758	for grep $_->outdoor, values %cf::MAP;
1759	}	1964	}
1760		1965
1761	sub decay_objects {	1966	sub decay_objects {
1762	my ($self) = @_;	1967	my ($self) = @_;
1763		1968
…		…
1776		1981
1777	sub load_header_from($) {	1982	sub load_header_from($) {
1778	my ($self, $path) = @_;	1983	my ($self, $path) = @_;
1779		1984
1780	utf8::encode $path;	1985	utf8::encode $path;
1781	#aio_open $path, O_RDONLY, 0	1986	my $f = new_from_file cf::object::thawer $path
1782	# or return;
1783
1784	$self->_load_header ($path)
1785	or return;	1987	or return;
		1988
		1989	$self->_load_header ($f)
		1990	or return;
		1991
		1992	local $MAP_LOADING{$self->{path}} = $self;
		1993	$f->resolve_delayed_derefs;
1786		1994
1787	$self->{load_path} = $path;	1995	$self->{load_path} = $path;
1788		1996
1789	1	1997	1
1790	}	1998	}
…		…
1844	sub find {	2052	sub find {
1845	my ($path, $origin) = @_;	2053	my ($path, $origin) = @_;
1846		2054
1847	$path = normalise $path, $origin && $origin->path;	2055	$path = normalise $path, $origin && $origin->path;
1848		2056
		2057	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1849	cf::lock_wait "map_find:$path";	2058	my $guard2 = cf::lock_acquire "map_find:$path";
1850		2059
1851	$cf::MAP{$path} || do {	2060	$cf::MAP{$path} || do {
1852	my $guard = cf::lock_acquire "map_find:$path";
1853	my $map = new_from_path cf::map $path	2061	my $map = new_from_path cf::map $path
1854	or return;	2062	or return;
1855		2063
1856	$map->{last_save} = $cf::RUNTIME;	2064	$map->{last_save} = $cf::RUNTIME;
1857		2065
…		…
1859	or return;	2067	or return;
1860		2068
1861	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	2069	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1862	# doing this can freeze the server in a sync job, obviously	2070	# doing this can freeze the server in a sync job, obviously
1863	#$cf::WAIT_FOR_TICK->wait;	2071	#$cf::WAIT_FOR_TICK->wait;
		2072	undef $guard2;
		2073	undef $guard1;
1864	$map->reset;	2074	$map->reset;
1865	undef $guard;
1866	return find $path;	2075	return find $path;
1867	}	2076	}
1868		2077
1869	$cf::MAP{$path} = $map	2078	$cf::MAP{$path} = $map
1870	}	2079	}
1871	}	2080	}
1872		2081
1873	sub pre_load { }	2082	sub pre_load { }
1874	sub post_load { }	2083	#sub post_load { } # XS
1875		2084
1876	sub load {	2085	sub load {
1877	my ($self) = @_;	2086	my ($self) = @_;
1878		2087
1879	local $self->{deny_reset} = 1; # loading can take a long time	2088	local $self->{deny_reset} = 1; # loading can take a long time
1880		2089
1881	my $path = $self->{path};	2090	my $path = $self->{path};
1882		2091
1883	{	2092	{
1884	my $guard = cf::lock_acquire "map_load:$path";	2093	my $guard = cf::lock_acquire "map_data:$path";
1885		2094
		2095	return unless $self->valid;
1886	return if $self->in_memory != cf::MAP_SWAPPED;	2096	return unless $self->in_memory == cf::MAP_SWAPPED;
1887		2097
1888	$self->in_memory (cf::MAP_LOADING);	2098	$self->in_memory (cf::MAP_LOADING);
1889		2099
1890	$self->alloc;	2100	$self->alloc;
1891		2101
1892	$self->pre_load;	2102	$self->pre_load;
1893	Coro::cede;	2103	cf::cede_to_tick;
1894		2104
		2105	my $f = new_from_file cf::object::thawer $self->{load_path};
		2106	$f->skip_block;
1895	$self->_load_objects ($self->{load_path}, 1)	2107	$self->_load_objects ($f)
1896	or return;	2108	or return;
1897		2109
1898	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	2110	$self->post_load_original
1899	if delete $self->{load_original};	2111	if delete $self->{load_original};
1900		2112
1901	if (my $uniq = $self->uniq_path) {	2113	if (my $uniq = $self->uniq_path) {
1902	utf8::encode $uniq;	2114	utf8::encode $uniq;
1903	if (aio_open $uniq, O_RDONLY, 0) {	2115	unless (aio_stat $uniq) {
		2116	if (my $f = new_from_file cf::object::thawer $uniq) {
1904	$self->clear_unique_items;	2117	$self->clear_unique_items;
1905	$self->_load_objects ($uniq, 0);	2118	$self->_load_objects ($f);
		2119	$f->resolve_delayed_derefs;
		2120	}
1906	}	2121	}
1907	}	2122	}
1908		2123
1909	Coro::cede;	2124	$f->resolve_delayed_derefs;
		2125
		2126	cf::cede_to_tick;
1910	# now do the right thing for maps	2127	# now do the right thing for maps
1911	$self->link_multipart_objects;	2128	$self->link_multipart_objects;
1912	$self->difficulty ($self->estimate_difficulty)	2129	$self->difficulty ($self->estimate_difficulty)
1913	unless $self->difficulty;	2130	unless $self->difficulty;
1914	Coro::cede;	2131	cf::cede_to_tick;
1915		2132
1916	unless ($self->{deny_activate}) {	2133	unless ($self->{deny_activate}) {
1917	$self->decay_objects;	2134	$self->decay_objects;
1918	$self->fix_auto_apply;	2135	$self->fix_auto_apply;
1919	$self->update_buttons;	2136	$self->update_buttons;
1920	Coro::cede;	2137	cf::cede_to_tick;
1921	$self->set_darkness_map;
1922	Coro::cede;
1923	$self->activate;	2138	$self->activate;
1924	}	2139	}
1925		2140
		2141	$self->{last_save} = $cf::RUNTIME;
		2142	$self->last_access ($cf::RUNTIME);
		2143
1926	$self->in_memory (cf::MAP_IN_MEMORY);	2144	$self->in_memory (cf::MAP_ACTIVE);
1927	}	2145	}
1928		2146
1929	$self->post_load;	2147	$self->post_load;
1930	}	2148	}
1931		2149
		2150	# customize the map for a given player, i.e.
		2151	# return the _real_ map. used by e.g. per-player
		2152	# maps to change the path to ~playername/mappath
1932	sub customise_for {	2153	sub customise_for {
1933	my ($self, $ob) = @_;	2154	my ($self, $ob) = @_;
1934		2155
1935	return find "~" . $ob->name . "/" . $self->{path}	2156	return find "~" . $ob->name . "/" . $self->{path}
1936	if $self->per_player;	2157	if $self->per_player;
…		…
1940		2161
1941	$self	2162	$self
1942	}	2163	}
1943		2164
1944	# find and load all maps in the 3x3 area around a map	2165	# find and load all maps in the 3x3 area around a map
1945	sub load_diag {	2166	sub load_neighbours {
1946	my ($map) = @_;	2167	my ($map) = @_;
1947		2168
1948	my @diag; # diagonal neighbours	2169	my @neigh; # diagonal neighbours
1949		2170
1950	for (0 .. 3) {	2171	for (0 .. 3) {
1951	my $neigh = $map->tile_path ($_)	2172	my $neigh = $map->tile_path ($_)
1952	or next;	2173	or next;
1953	$neigh = find $neigh, $map	2174	$neigh = find $neigh, $map
1954	or next;	2175	or next;
1955	$neigh->load;	2176	$neigh->load;
1956		2177
		2178	# now find the diagonal neighbours
		2179	push @neigh,
1957	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2180	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1958	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2181	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1959	}	2182	}
1960		2183
1961	for (@diag) {	2184	for (grep defined $_->[0], @neigh) {
		2185	my ($path, $origin) = @$_;
1962	my $neigh = find @$_	2186	my $neigh = find $path, $origin
1963	or next;	2187	or next;
1964	$neigh->load;	2188	$neigh->load;
1965	}	2189	}
1966	}	2190	}
1967		2191
1968	sub find_sync {	2192	sub find_sync {
1969	my ($path, $origin) = @_;	2193	my ($path, $origin) = @_;
1970		2194
1971	cf::sync_job { find $path, $origin }	2195	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
		2196	if $Coro::current == $Coro::main;
		2197
		2198	find $path, $origin
1972	}	2199	}
1973		2200
1974	sub do_load_sync {	2201	sub do_load_sync {
1975	my ($map) = @_;	2202	my ($map) = @_;
1976		2203
1977	cf::sync_job { $map->load };	2204	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
		2205	if $Coro::current == $Coro::main;
		2206
		2207	$map->load;
1978	}	2208	}
1979		2209
1980	our %MAP_PREFETCH;	2210	our %MAP_PREFETCH;
1981	our $MAP_PREFETCHER = undef;	2211	our $MAP_PREFETCHER = undef;
1982		2212
1983	sub find_async {	2213	sub find_async {
1984	my ($path, $origin) = @_;	2214	my ($path, $origin, $load) = @_;
1985		2215
1986	$path = normalise $path, $origin && $origin->{path};	2216	$path = normalise $path, $origin && $origin->{path};
1987		2217
1988	if (my $map = $cf::MAP{$path}) {	2218	if (my $map = $cf::MAP{$path}) {
1989	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2219	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1990	}	2220	}
1991		2221
1992	undef $MAP_PREFETCH{$path};	2222	$MAP_PREFETCH{$path} |= $load;
		2223
1993	$MAP_PREFETCHER ||= cf::async {	2224	$MAP_PREFETCHER ||= cf::async {
		2225	$Coro::current->{desc} = "map prefetcher";
		2226
1994	while (%MAP_PREFETCH) {	2227	while (%MAP_PREFETCH) {
1995	for my $path (keys %MAP_PREFETCH) {	2228	while (my ($k, $v) = each %MAP_PREFETCH) {
1996	if (my $map = find $path) {	2229	if (my $map = find $k) {
1997	$map->load;	2230	$map->load if $v;
1998	}	2231	}
1999		2232
2000	delete $MAP_PREFETCH{$path};	2233	delete $MAP_PREFETCH{$k};
2001	}	2234	}
2002	}	2235	}
2003	undef $MAP_PREFETCHER;	2236	undef $MAP_PREFETCHER;
2004	};	2237	};
2005	$MAP_PREFETCHER->prio (6);	2238	$MAP_PREFETCHER->prio (6);
2006		2239
2007	()	2240	()
2008	}	2241	}
2009		2242
		2243	# common code, used by both ->save and ->swapout
2010	sub save {	2244	sub _save {
2011	my ($self) = @_;	2245	my ($self) = @_;
2012
2013	my $lock = cf::lock_acquire "map_data:" . $self->path;
2014		2246
2015	$self->{last_save} = $cf::RUNTIME;	2247	$self->{last_save} = $cf::RUNTIME;
2016		2248
2017	return unless $self->dirty;	2249	return unless $self->dirty;
2018		2250
…		…
2024	return if $self->{deny_save};	2256	return if $self->{deny_save};
2025		2257
2026	local $self->{last_access} = $self->last_access;#d#	2258	local $self->{last_access} = $self->last_access;#d#
2027		2259
2028	cf::async {	2260	cf::async {
		2261	$Coro::current->{desc} = "map player save";
2029	$_->contr->save for $self->players;	2262	$_->contr->save for $self->players;
2030	};	2263	};
		2264
		2265	cf::get_slot 0.02;
2031		2266
2032	if ($uniq) {	2267	if ($uniq) {
2033	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);	2268	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2034	$self->_save_objects ($uniq, cf::IO_UNIQUES);	2269	$self->_save_objects ($uniq, cf::IO_UNIQUES);
2035	} else {	2270	} else {
2036	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);	2271	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2037	}	2272	}
2038	}	2273	}
2039		2274
		2275	sub save {
		2276	my ($self) = @_;
		2277
		2278	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2279
		2280	$self->_save;
		2281	}
		2282
2040	sub swap_out {	2283	sub swap_out {
2041	my ($self) = @_;	2284	my ($self) = @_;
2042		2285
2043	# save first because save cedes
2044	$self->save;
2045
2046	my $lock = cf::lock_acquire "map_data:" . $self->path;	2286	my $lock = cf::lock_acquire "map_data:$self->{path}";
2047		2287
		2288	return if $self->in_memory != cf::MAP_ACTIVE;
		2289	return if $self->{deny_save};
2048	return if $self->players;	2290	return if $self->players;
2049	return if $self->in_memory != cf::MAP_IN_MEMORY;
2050	return if $self->{deny_save};
2051		2291
		2292	# first deactivate the map and "unlink" it from the core
		2293	$self->deactivate;
		2294	$_->clear_links_to ($self) for values %cf::MAP;
		2295	$self->in_memory (cf::MAP_SWAPPED);
		2296
		2297	# then atomically save
		2298	$self->_save;
		2299
		2300	# then free the map
2052	$self->clear;	2301	$self->clear;
2053	$self->in_memory (cf::MAP_SWAPPED);
2054	}	2302	}
2055		2303
2056	sub reset_at {	2304	sub reset_at {
2057	my ($self) = @_;	2305	my ($self) = @_;
2058		2306
…		…
2076		2324
2077	my $lock = cf::lock_acquire "map_data:$self->{path}";	2325	my $lock = cf::lock_acquire "map_data:$self->{path}";
2078		2326
2079	return if $self->players;	2327	return if $self->players;
2080		2328
2081	warn "resetting map ", $self->path;	2329	cf::trace "resetting map ", $self->path, "\n";
2082		2330
2083	$self->in_memory (cf::MAP_SWAPPED);	2331	$self->in_memory (cf::MAP_SWAPPED);
2084		2332
2085	# need to save uniques path	2333	# need to save uniques path
2086	unless ($self->{deny_save}) {	2334	unless ($self->{deny_save}) {
…		…
2090	if $uniq;	2338	if $uniq;
2091	}	2339	}
2092		2340
2093	delete $cf::MAP{$self->path};	2341	delete $cf::MAP{$self->path};
2094		2342
		2343	$self->deactivate;
		2344	$_->clear_links_to ($self) for values %cf::MAP;
2095	$self->clear;	2345	$self->clear;
2096
2097	$_->clear_links_to ($self) for values %cf::MAP;
2098		2346
2099	$self->unlink_save;	2347	$self->unlink_save;
2100	$self->destroy;	2348	$self->destroy;
2101	}	2349	}
2102		2350
2103	my $nuke_counter = "aaaa";	2351	my $nuke_counter = "aaaa";
2104		2352
2105	sub nuke {	2353	sub nuke {
2106	my ($self) = @_;	2354	my ($self) = @_;
2107		2355
		2356	{
		2357	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2358
2108	delete $cf::MAP{$self->path};	2359	delete $cf::MAP{$self->path};
2109		2360
2110	$self->unlink_save;	2361	$self->unlink_save;
2111		2362
2112	bless $self, "cf::map";	2363	bless $self, "cf::map::wrap";
2113	delete $self->{deny_reset};	2364	delete $self->{deny_reset};
2114	$self->{deny_save} = 1;	2365	$self->{deny_save} = 1;
2115	$self->reset_timeout (1);	2366	$self->reset_timeout (1);
2116	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2367	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2117		2368
2118	$cf::MAP{$self->path} = $self;	2369	$cf::MAP{$self->path} = $self;
		2370	}
2119		2371
2120	$self->reset; # polite request, might not happen	2372	$self->reset; # polite request, might not happen
2121	}	2373	}
2122		2374
2123	=item $maps = cf::map::tmp_maps	2375	=item $maps = cf::map::tmp_maps
…		…
2165		2417
2166	sub unique_maps() {	2418	sub unique_maps() {
2167	[	2419	[
2168	map {	2420	map {
2169	utf8::decode $_;	2421	utf8::decode $_;
2170	/\.map$/	2422	s/\.map$//; # TODO future compatibility hack
		2423	/\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
		2424	? ()
2171	? normalise $_	2425	: normalise $_
2172	: ()
2173	} @{ aio_readdir $UNIQUEDIR or [] }	2426	} @{ aio_readdir $UNIQUEDIR or [] }
2174	]	2427	]
2175	}	2428	}
2176		2429
2177	package cf;	2430	=item cf::map::static_maps
		2431
		2432	Returns an arrayref if paths of all static maps (all preinstalled F<.map>
		2433	file in the shared directory excluding F</styles> and F</editor>). May
		2434	block.
		2435
		2436	=cut
		2437
		2438	sub static_maps() {
		2439	my @dirs = "";
		2440	my @maps;
		2441
		2442	while (@dirs) {
		2443	my $dir = shift @dirs;
		2444
		2445	next if $dir eq "/styles" || $dir eq "/editor";
		2446
		2447	my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
		2448	or return;
		2449
		2450	for (@$files) {
		2451	s/\.map$// or next;
		2452	utf8::decode $_;
		2453	push @maps, "$dir/$_";
		2454	}
		2455
		2456	push @dirs, map "$dir/$_", @$dirs;
		2457	}
		2458
		2459	\@maps
		2460	}
2178		2461
2179	=back	2462	=back
2180		2463
2181	=head3 cf::object	2464	=head3 cf::object
2182		2465
…		…
2186		2469
2187	=over 4	2470	=over 4
2188		2471
2189	=item $ob->inv_recursive	2472	=item $ob->inv_recursive
2190		2473
2191	Returns the inventory of the object _and_ their inventories, recursively.	2474	Returns the inventory of the object I<and> their inventories, recursively,
		2475	but I<not> the object itself.
2192		2476
2193	=cut	2477	=cut
2194		2478
2195	sub inv_recursive_;	2479	sub inv_recursive_;
2196	sub inv_recursive_ {	2480	sub inv_recursive_ {
…		…
2199		2483
2200	sub inv_recursive {	2484	sub inv_recursive {
2201	inv_recursive_ inv $_[0]	2485	inv_recursive_ inv $_[0]
2202	}	2486	}
2203		2487
		2488	=item $ref = $ob->ref
		2489
		2490	Creates and returns a persistent reference to an object that can be stored as a string.
		2491
		2492	=item $ob = cf::object::deref ($refstring)
		2493
		2494	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2495	even if the object actually exists. May block.
		2496
		2497	=cut
		2498
		2499	sub deref {
		2500	my ($ref) = @_;
		2501
		2502	if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
		2503	my ($uuid, $name) = ($1, $2);
		2504	my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
		2505	or return;
		2506	$pl->ob->uuid eq $uuid
		2507	or return;
		2508
		2509	$pl->ob
		2510	} else {
		2511	warn "$ref: cannot resolve object reference\n";
		2512	undef
		2513	}
		2514	}
		2515
2204	package cf;	2516	package cf;
2205		2517
2206	=back	2518	=back
2207		2519
2208	=head3 cf::object::player	2520	=head3 cf::object::player
…		…
2214	Sends a message to the player, as if the npc C<$npc> replied. C<$npc>	2526	Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2215	can be C<undef>. Does the right thing when the player is currently in a	2527	can be C<undef>. Does the right thing when the player is currently in a
2216	dialogue with the given NPC character.	2528	dialogue with the given NPC character.
2217		2529
2218	=cut	2530	=cut
		2531
		2532	our $SAY_CHANNEL = {
		2533	id => "say",
		2534	title => "Map",
		2535	reply => "say ",
		2536	tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
		2537	};
		2538
		2539	our $CHAT_CHANNEL = {
		2540	id => "chat",
		2541	title => "Chat",
		2542	reply => "chat ",
		2543	tooltip => "Player chat and shouts, global to the server.",
		2544	};
2219		2545
2220	# rough implementation of a future "reply" method that works	2546	# rough implementation of a future "reply" method that works
2221	# with dialog boxes.	2547	# with dialog boxes.
2222	#TODO: the first argument must go, split into a $npc->reply_to ( method	2548	#TODO: the first argument must go, split into a $npc->reply_to ( method
2223	sub cf::object::player::reply($$$;$) {	2549	sub cf::object::player::reply($$$;$) {
…		…
2235	my $dialog = $pl->{npc_dialog};	2561	my $dialog = $pl->{npc_dialog};
2236	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));	2562	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2237		2563
2238	} else {	2564	} else {
2239	$msg = $npc->name . " says: $msg" if $npc;	2565	$msg = $npc->name . " says: $msg" if $npc;
2240	$self->message ($msg, $flags);	2566	$self->send_msg ($SAY_CHANNEL => $msg, $flags);
2241	}	2567	}
2242	}	2568	}
		2569	}
		2570
		2571	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2572
		2573	=cut
		2574
		2575	sub cf::object::send_msg {
		2576	my $pl = shift->contr
		2577	or return;
		2578	$pl->send_msg (@_);
2243	}	2579	}
2244		2580
2245	=item $player_object->may ("access")	2581	=item $player_object->may ("access")
2246		2582
2247	Returns wether the given player is authorized to access resource "access"	2583	Returns wether the given player is authorized to access resource "access"
…		…
2260		2596
2261	=item $player_object->enter_link	2597	=item $player_object->enter_link
2262		2598
2263	Freezes the player and moves him/her to a special map (C<{link}>).	2599	Freezes the player and moves him/her to a special map (C<{link}>).
2264		2600
2265	The player should be reasonably safe there for short amounts of time. You	2601	The player should be reasonably safe there for short amounts of time (e.g.
2266	I<MUST> call C<leave_link> as soon as possible, though.	2602	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
		2603	though, as the player cannot control the character while it is on the link
		2604	map.
2267		2605
2268	Will never block.	2606	Will never block.
2269		2607
2270	=item $player_object->leave_link ($map, $x, $y)	2608	=item $player_object->leave_link ($map, $x, $y)
2271		2609
…		…
2291	sub cf::object::player::enter_link {	2629	sub cf::object::player::enter_link {
2292	my ($self) = @_;	2630	my ($self) = @_;
2293		2631
2294	$self->deactivate_recursive;	2632	$self->deactivate_recursive;
2295		2633
		2634	++$self->{_link_recursion};
		2635
2296	return if UNIVERSAL::isa $self->map, "ext::map_link";	2636	return if UNIVERSAL::isa $self->map, "ext::map_link";
2297		2637
2298	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2638	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2299	if $self->map && $self->map->{path} ne "{link}";	2639	if $self->map && $self->map->{path} ne "{link}";
2300		2640
2301	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2641	$self->enter_map ($LINK_MAP || link_map, 3, 3);
2302	}	2642	}
2303		2643
2304	sub cf::object::player::leave_link {	2644	sub cf::object::player::leave_link {
2305	my ($self, $map, $x, $y) = @_;	2645	my ($self, $map, $x, $y) = @_;
2306		2646
…		…
2323	($x, $y) = (-1, -1)	2663	($x, $y) = (-1, -1)
2324	unless (defined $x) && (defined $y);	2664	unless (defined $x) && (defined $y);
2325		2665
2326	# use -1 or undef as default coordinates, not 0, 0	2666	# use -1 or undef as default coordinates, not 0, 0
2327	($x, $y) = ($map->enter_x, $map->enter_y)	2667	($x, $y) = ($map->enter_x, $map->enter_y)
2328	if $x <=0 && $y <= 0;	2668	if $x <= 0 && $y <= 0;
2329		2669
2330	$map->load;	2670	$map->load;
2331	$map->load_diag;	2671	$map->load_neighbours;
2332		2672
2333	return unless $self->contr->active;	2673	return unless $self->contr->active;
2334	$self->activate_recursive;
2335		2674
2336	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2675	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2337	$self->enter_map ($map, $x, $y);	2676	if ($self->enter_map ($map, $x, $y)) {
2338	}	2677	# entering was successful
		2678	delete $self->{_link_recursion};
		2679	# only activate afterwards, to support waiting in hooks
		2680	$self->activate_recursive;
		2681	}
2339		2682
		2683	}
		2684
2340	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2685	=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2341		2686
2342	Moves the player to the given map-path and coordinates by first freezing	2687	Moves the player to the given map-path and coordinates by first freezing
2343	her, loading and preparing them map, calling the provided $check callback	2688	her, loading and preparing them map, calling the provided $check callback
2344	that has to return the map if sucecssful, and then unfreezes the player on	2689	that has to return the map if sucecssful, and then unfreezes the player on
2345	the new (success) or old (failed) map position. In either case, $done will	2690	the new (success) or old (failed) map position. In either case, $done will
2346	be called at the end of this process.	2691	be called at the end of this process.
2347		2692
		2693	Note that $check will be called with a potentially non-loaded map, so if
		2694	it needs a loaded map it has to call C<< ->load >>.
		2695
2348	=cut	2696	=cut
2349		2697
2350	our $GOTOGEN;	2698	our $GOTOGEN;
2351		2699
2352	sub cf::object::player::goto {	2700	sub cf::object::player::goto {
2353	my ($self, $path, $x, $y, $check, $done) = @_;	2701	my ($self, $path, $x, $y, $check, $done) = @_;
2354		2702
		2703	if ($self->{_link_recursion} >= $MAX_LINKS) {
		2704	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
		2705	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
		2706	($path, $x, $y) = @$EMERGENCY_POSITION;
		2707	}
		2708
2355	# do generation counting so two concurrent goto's will be executed in-order	2709	# do generation counting so two concurrent goto's will be executed in-order
2356	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2710	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2357		2711
2358	$self->enter_link;	2712	$self->enter_link;
2359		2713
2360	(async {	2714	(async {
		2715	$Coro::current->{desc} = "player::goto $path $x $y";
		2716
		2717	# *tag paths override both path and x|y
		2718	if ($path =~ /^\*(.*)$/) {
		2719	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2720	my $ob = $obs[rand @obs];
		2721
		2722	# see if we actually can go there
		2723	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2724	$ob = $obs[rand @obs];
		2725	} else {
		2726	$self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
		2727	}
		2728	# else put us there anyways for now #d#
		2729
		2730	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2731	} else {
		2732	($path, $x, $y) = (undef, undef, undef);
		2733	}
		2734	}
		2735
2361	my $map = eval {	2736	my $map = eval {
2362	my $map = cf::map::find $path;	2737	my $map = defined $path ? cf::map::find $path : undef;
2363		2738
2364	if ($map) {	2739	if ($map) {
2365	$map = $map->customise_for ($self);	2740	$map = $map->customise_for ($self);
2366	$map = $check->($map) if $check && $map;	2741	$map = $check->($map, $x, $y, $self) if $check && $map;
2367	} else {	2742	} else {
2368	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);	2743	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2369	}	2744	}
2370		2745
2371	$map	2746	$map
2372	};	2747	};
2373		2748
…		…
2379	if ($gen == $self->{_goto_generation}) {	2754	if ($gen == $self->{_goto_generation}) {
2380	delete $self->{_goto_generation};	2755	delete $self->{_goto_generation};
2381	$self->leave_link ($map, $x, $y);	2756	$self->leave_link ($map, $x, $y);
2382	}	2757	}
2383		2758
2384	$done->() if $done;	2759	$done->($self) if $done;
2385	})->prio (1);	2760	})->prio (1);
2386	}	2761	}
2387		2762
2388	=item $player_object->enter_exit ($exit_object)	2763	=item $player_object->enter_exit ($exit_object)
2389		2764
…		…
2409	}	2784	}
2410		2785
2411	sub prepare_random_map {	2786	sub prepare_random_map {
2412	my ($exit) = @_;	2787	my ($exit) = @_;
2413		2788
2414	my $guard = cf::lock_acquire "exit_prepare:$exit";
2415
2416	# all this does is basically replace the /! path by	2789	# all this does is basically replace the /! path by
2417	# a new random map path (?random/...) with a seed	2790	# a new random map path (?random/...) with a seed
2418	# that depends on the exit object	2791	# that depends on the exit object
2419		2792
2420	my $rmp = parse_random_map_params $exit->msg;	2793	my $rmp = parse_random_map_params $exit->msg;
…		…
2422	if ($exit->map) {	2795	if ($exit->map) {
2423	$rmp->{region} = $exit->region->name;	2796	$rmp->{region} = $exit->region->name;
2424	$rmp->{origin_map} = $exit->map->path;	2797	$rmp->{origin_map} = $exit->map->path;
2425	$rmp->{origin_x} = $exit->x;	2798	$rmp->{origin_x} = $exit->x;
2426	$rmp->{origin_y} = $exit->y;	2799	$rmp->{origin_y} = $exit->y;
		2800
		2801	$exit->map->touch;
2427	}	2802	}
2428		2803
2429	$rmp->{random_seed} ||= $exit->random_seed;	2804	$rmp->{random_seed} ||= $exit->random_seed;
2430		2805
2431	my $data = cf::to_json $rmp;	2806	my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2432	my $md5 = Digest::MD5::md5_hex $data;	2807	my $md5 = Digest::MD5::md5_hex $data;
2433	my $meta = "$RANDOMDIR/$md5.meta";	2808	my $meta = "$RANDOMDIR/$md5.meta";
2434		2809
2435	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {	2810	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2436	aio_write $fh, 0, (length $data), $data, 0;	2811	aio_write $fh, 0, (length $data), $data, 0;
2437	undef $fh;	2812	undef $fh;
2438	aio_rename "$meta~", $meta;	2813	aio_rename "$meta~", $meta;
2439		2814
		2815	my $slaying = "?random/$md5";
		2816
		2817	if ($exit->valid) {
2440	$exit->slaying ("?random/$md5");	2818	$exit->slaying ("?random/$md5");
2441	$exit->msg (undef);	2819	$exit->msg (undef);
		2820	}
2442	}	2821	}
2443	}	2822	}
2444		2823
2445	sub cf::object::player::enter_exit {	2824	sub cf::object::player::enter_exit {
2446	my ($self, $exit) = @_;	2825	my ($self, $exit) = @_;
2447		2826
2448	return unless $self->type == cf::PLAYER;	2827	return unless $self->type == cf::PLAYER;
2449		2828
2450	if ($exit->slaying eq "/!") {
2451	#TODO: this should de-fi-ni-te-ly not be a sync-job
2452	# the problem is that $exit might not survive long enough
2453	# so it needs to be done right now, right here
2454	cf::sync_job { prepare_random_map $exit };
2455	}
2456
2457	my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2458	my $hp = $exit->stats->hp;
2459	my $sp = $exit->stats->sp;
2460
2461	$self->enter_link;	2829	$self->enter_link;
2462		2830
2463	# if exit is damned, update players death & WoR home-position
2464	$self->contr->savebed ($slaying, $hp, $sp)
2465	if $exit->flag (FLAG_DAMNED);
2466
2467	(async {	2831	(async {
2468	$self->deactivate_recursive; # just to be sure	2832	$Coro::current->{desc} = "enter_exit";
		2833
2469	unless (eval {	2834	unless (eval {
		2835	$self->deactivate_recursive; # just to be sure
		2836
		2837	# random map handling
		2838	{
		2839	my $guard = cf::lock_acquire "exit_prepare:$exit";
		2840
		2841	prepare_random_map $exit
		2842	if $exit->slaying eq "/!";
		2843	}
		2844
		2845	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
		2846	my $x = $exit->stats->hp;
		2847	my $y = $exit->stats->sp;
		2848
2470	$self->goto ($slaying, $hp, $sp);	2849	$self->goto ($map, $x, $y);
2471		2850
		2851	# if exit is damned, update players death & WoR home-position
		2852	$self->contr->savebed ($map, $x, $y)
		2853	if $exit->flag (cf::FLAG_DAMNED);
		2854
2472	1;	2855	1
2473	}) {	2856	}) {
2474	$self->message ("Something went wrong deep within the crossfire server. "	2857	$self->message ("Something went wrong deep within the deliantra server. "
2475	. "I'll try to bring you back to the map you were before. "	2858	. "I'll try to bring you back to the map you were before. "
2476	. "Please report this to the dungeon master!",	2859	. "Please report this to the dungeon master!",
2477	cf::NDI_UNIQUE | cf::NDI_RED);	2860	cf::NDI_UNIQUE | cf::NDI_RED);
2478		2861
2479	warn "ERROR in enter_exit: $@";	2862	error "ERROR in enter_exit: $@";
2480	$self->leave_link;	2863	$self->leave_link;
2481	}	2864	}
2482	})->prio (1);	2865	})->prio (1);
2483	}	2866	}
2484		2867
…		…
2496	sub cf::client::send_drawinfo {	2879	sub cf::client::send_drawinfo {
2497	my ($self, $text, $flags) = @_;	2880	my ($self, $text, $flags) = @_;
2498		2881
2499	utf8::encode $text;	2882	utf8::encode $text;
2500	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2883	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
		2884	}
		2885
		2886	=item $client->send_big_packet ($pkt)
		2887
		2888	Like C<send_packet>, but tries to compress large packets, and fragments
		2889	them as required.
		2890
		2891	=cut
		2892
		2893	our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
		2894
		2895	sub cf::client::send_big_packet {
		2896	my ($self, $pkt) = @_;
		2897
		2898	# try lzf for large packets
		2899	$pkt = "lzf " . Compress::LZF::compress $pkt
		2900	if 1024 <= length $pkt and $self->{can_lzf};
		2901
		2902	# split very large packets
		2903	if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
		2904	$self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
		2905	$pkt = "frag";
		2906	}
		2907
		2908	$self->send_packet ($pkt);
2501	}	2909	}
2502		2910
2503	=item $client->send_msg ($channel, $msg, $color, [extra...])	2911	=item $client->send_msg ($channel, $msg, $color, [extra...])
2504		2912
2505	Send a drawinfo or msg packet to the client, formatting the msg for the	2913	Send a drawinfo or msg packet to the client, formatting the msg for the
…		…
2507	the message, with C<log> being the default. If C<$color> is negative, suppress	2915	the message, with C<log> being the default. If C<$color> is negative, suppress
2508	the message unless the client supports the msg packet.	2916	the message unless the client supports the msg packet.
2509		2917
2510	=cut	2918	=cut
2511		2919
		2920	# non-persistent channels (usually the info channel)
		2921	our %CHANNEL = (
		2922	"c/motd" => {
		2923	id => "infobox",
		2924	title => "MOTD",
		2925	reply => undef,
		2926	tooltip => "The message of the day",
		2927	},
		2928	"c/identify" => {
		2929	id => "infobox",
		2930	title => "Identify",
		2931	reply => undef,
		2932	tooltip => "Items recently identified",
		2933	},
		2934	"c/examine" => {
		2935	id => "infobox",
		2936	title => "Examine",
		2937	reply => undef,
		2938	tooltip => "Signs and other items you examined",
		2939	},
		2940	"c/shopinfo" => {
		2941	id => "infobox",
		2942	title => "Shop Info",
		2943	reply => undef,
		2944	tooltip => "What your bargaining skill tells you about the shop",
		2945	},
		2946	"c/book" => {
		2947	id => "infobox",
		2948	title => "Book",
		2949	reply => undef,
		2950	tooltip => "The contents of a note or book",
		2951	},
		2952	"c/lookat" => {
		2953	id => "infobox",
		2954	title => "Look",
		2955	reply => undef,
		2956	tooltip => "What you saw there",
		2957	},
		2958	"c/who" => {
		2959	id => "infobox",
		2960	title => "Players",
		2961	reply => undef,
		2962	tooltip => "Shows players who are currently online",
		2963	},
		2964	"c/body" => {
		2965	id => "infobox",
		2966	title => "Body Parts",
		2967	reply => undef,
		2968	tooltip => "Shows which body parts you posess and are available",
		2969	},
		2970	"c/statistics" => {
		2971	id => "infobox",
		2972	title => "Statistics",
		2973	reply => undef,
		2974	tooltip => "Shows your primary statistics",
		2975	},
		2976	"c/skills" => {
		2977	id => "infobox",
		2978	title => "Skills",
		2979	reply => undef,
		2980	tooltip => "Shows your experience per skill and item power",
		2981	},
		2982	"c/shopitems" => {
		2983	id => "infobox",
		2984	title => "Shop Items",
		2985	reply => undef,
		2986	tooltip => "Shows the items currently for sale in this shop",
		2987	},
		2988	"c/resistances" => {
		2989	id => "infobox",
		2990	title => "Resistances",
		2991	reply => undef,
		2992	tooltip => "Shows your resistances",
		2993	},
		2994	"c/pets" => {
		2995	id => "infobox",
		2996	title => "Pets",
		2997	reply => undef,
		2998	tooltip => "Shows information abotu your pets/a specific pet",
		2999	},
		3000	"c/perceiveself" => {
		3001	id => "infobox",
		3002	title => "Perceive Self",
		3003	reply => undef,
		3004	tooltip => "You gained detailed knowledge about yourself",
		3005	},
		3006	"c/uptime" => {
		3007	id => "infobox",
		3008	title => "Uptime",
		3009	reply => undef,
		3010	tooltip => "How long the server has been running since last restart",
		3011	},
		3012	"c/mapinfo" => {
		3013	id => "infobox",
		3014	title => "Map Info",
		3015	reply => undef,
		3016	tooltip => "Information related to the maps",
		3017	},
		3018	"c/party" => {
		3019	id => "party",
		3020	title => "Party",
		3021	reply => "gsay ",
		3022	tooltip => "Messages and chat related to your party",
		3023	},
		3024	"c/death" => {
		3025	id => "death",
		3026	title => "Death",
		3027	reply => undef,
		3028	tooltip => "Reason for and more info about your most recent death",
		3029	},
		3030	"c/say" => $SAY_CHANNEL,
		3031	"c/chat" => $CHAT_CHANNEL,
		3032	);
		3033
2512	sub cf::client::send_msg {	3034	sub cf::client::send_msg {
2513	my ($self, $channel, $msg, $color, @extra) = @_;	3035	my ($self, $channel, $msg, $color, @extra) = @_;
2514		3036
2515	$msg = $self->pl->expand_cfpod ($msg);	3037	$msg = $self->pl->expand_cfpod ($msg)
		3038	unless $color & cf::NDI_VERBATIM;
2516		3039
2517	$color &= ~cf::NDI_UNIQUE; # just in case...	3040	$color &= cf::NDI_CLIENT_MASK; # just in case...
2518		3041
		3042	# check predefined channels, for the benefit of C
		3043	if ($CHANNEL{$channel}) {
		3044	$channel = $CHANNEL{$channel};
		3045
		3046	$self->ext_msg (channel_info => $channel);
		3047	$channel = $channel->{id};
		3048
2519	if (ref $channel) {	3049	} elsif (ref $channel) {
2520	# send meta info to client, if not yet sent	3050	# send meta info to client, if not yet sent
2521	unless (exists $self->{channel}{$channel->{id}}) {	3051	unless (exists $self->{channel}{$channel->{id}}) {
2522	$self->{channel}{$channel->{id}} = $channel;	3052	$self->{channel}{$channel->{id}} = $channel;
2523	$self->ext_msg (channel_info => $channel);	3053	$self->ext_msg (channel_info => $channel);
2524	}	3054	}
…		…
2526	$channel = $channel->{id};	3056	$channel = $channel->{id};
2527	}	3057	}
2528		3058
2529	return unless @extra || length $msg;	3059	return unless @extra || length $msg;
2530		3060
2531	if ($self->can_msg) {	3061	# default colour, mask it out
2532	$self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra]));	3062	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2533	} else {	3063	if $color & cf::NDI_DEF;
2534	# replace some tags by gcfclient-compatible ones
2535	for ($msg) {
2536	1 while
2537	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2538	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2539	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2540	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2541	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2542	}
2543		3064
2544	if ($color >= 0) {	3065	my $pkt = "msg "
2545	if (0 && $msg =~ /\[/) {	3066	. $self->{json_coder}->encode (
2546	$self->send_packet ("drawextinfo $color 4 0 $msg")	3067	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2547	} else {	3068	);
2548	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;	3069
2549	$self->send_packet ("drawinfo $color $msg")	3070	$self->send_big_packet ($pkt);
2550	}
2551	}
2552	}
2553	}	3071	}
2554		3072
2555	=item $client->ext_msg ($type, @msg)	3073	=item $client->ext_msg ($type, @msg)
2556		3074
2557	Sends an ext event to the client.	3075	Sends an ext event to the client.
…		…
2559	=cut	3077	=cut
2560		3078
2561	sub cf::client::ext_msg($$@) {	3079	sub cf::client::ext_msg($$@) {
2562	my ($self, $type, @msg) = @_;	3080	my ($self, $type, @msg) = @_;
2563		3081
2564	my $extcmd = $self->extcmd;
2565
2566	if ($extcmd == 2) {	3082	if ($self->extcmd == 2) {
2567	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3083	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2568	} elsif ($extcmd == 1) { # TODO: remove	3084	} elsif ($self->extcmd == 1) { # TODO: remove
2569	push @msg, msgtype => "event_$type";	3085	push @msg, msgtype => "event_$type";
2570	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3086	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		3087	}
		3088	}
		3089
		3090	=item $client->ext_reply ($msgid, @msg)
		3091
		3092	Sends an ext reply to the client.
		3093
		3094	=cut
		3095
		3096	sub cf::client::ext_reply($$@) {
		3097	my ($self, $id, @msg) = @_;
		3098
		3099	if ($self->extcmd == 2) {
		3100	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		3101	} elsif ($self->extcmd == 1) {
		3102	#TODO: version 1, remove
		3103	unshift @msg, msgtype => "reply", msgid => $id;
		3104	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2571	}	3105	}
2572	}	3106	}
2573		3107
2574	=item $success = $client->query ($flags, "text", \&cb)	3108	=item $success = $client->query ($flags, "text", \&cb)
2575		3109
…		…
2636	my ($type, $reply, @payload) =	3170	my ($type, $reply, @payload) =
2637	"ARRAY" eq ref $msg	3171	"ARRAY" eq ref $msg
2638	? @$msg	3172	? @$msg
2639	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove	3173	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2640		3174
		3175	my @reply;
		3176
2641	if (my $cb = $EXTICMD{$type}) {	3177	if (my $cb = $EXTICMD{$type}) {
2642	my @reply = $cb->($ns, @payload);	3178	@reply = $cb->($ns, @payload);
2643
2644	$ns->ext_reply ($reply, @reply)
2645	if $reply;
2646	}	3179	}
		3180
		3181	$ns->ext_reply ($reply, @reply)
		3182	if $reply;
		3183
2647	} else {	3184	} else {
2648	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3185	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2649	}	3186	}
2650		3187
2651	cf::override;	3188	cf::override;
2652	},	3189	},
2653	);	3190	);
…		…
2673		3210
2674	$coro	3211	$coro
2675	}	3212	}
2676		3213
2677	cf::client->attach (	3214	cf::client->attach (
2678	on_destroy => sub {	3215	on_client_destroy => sub {
2679	my ($ns) = @_;	3216	my ($ns) = @_;
2680		3217
2681	$_->cancel for values %{ (delete $ns->{_coro}) || {} };	3218	$_->cancel for values %{ (delete $ns->{_coro}) || {} };
2682	},	3219	},
2683	);	3220	);
…		…
2698	our $safe = new Safe "safe";	3235	our $safe = new Safe "safe";
2699	our $safe_hole = new Safe::Hole;	3236	our $safe_hole = new Safe::Hole;
2700		3237
2701	$SIG{FPE} = 'IGNORE';	3238	$SIG{FPE} = 'IGNORE';
2702		3239
2703	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	3240	$safe->permit_only (Opcode::opset qw(
		3241	:base_core :base_mem :base_orig :base_math :base_loop
		3242	grepstart grepwhile mapstart mapwhile
		3243	sort time
		3244	));
2704		3245
2705	# here we export the classes and methods available to script code	3246	# here we export the classes and methods available to script code
2706		3247
2707	=pod	3248	=pod
2708		3249
2709	The following functions and methods are available within a safe environment:	3250	The following functions and methods are available within a safe environment:
2710		3251
2711	cf::object	3252	cf::object
2712	contr pay_amount pay_player map x y force_find force_add	3253	contr pay_amount pay_player map x y force_find force_add destroy
2713	insert remove	3254	insert remove name archname title slaying race decrease split
		3255	value
2714		3256
2715	cf::object::player	3257	cf::object::player
2716	player	3258	player
2717		3259
2718	cf::player	3260	cf::player
…		…
2723		3265
2724	=cut	3266	=cut
2725		3267
2726	for (	3268	for (
2727	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	3269	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2728	insert remove)],	3270	insert remove inv nrof name archname title slaying race
		3271	decrease split destroy change_exp value msg lore send_msg)],
2729	["cf::object::player" => qw(player)],	3272	["cf::object::player" => qw(player)],
2730	["cf::player" => qw(peaceful)],	3273	["cf::player" => qw(peaceful send_msg)],
2731	["cf::map" => qw(trigger)],	3274	["cf::map" => qw(trigger)],
2732	) {	3275	) {
2733	no strict 'refs';
2734	my ($pkg, @funs) = @$_;	3276	my ($pkg, @funs) = @$_;
2735	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3277	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2736	for @funs;	3278	for @funs;
2737	}	3279	}
2738		3280
…		…
2753		3295
2754	my $qcode = $code;	3296	my $qcode = $code;
2755	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3297	$qcode =~ s/"/‟/g; # not allowed in #line filenames
2756	$qcode =~ s/\n/\\n/g;	3298	$qcode =~ s/\n/\\n/g;
2757		3299
		3300	%vars = (_dummy => 0) unless %vars;
		3301
		3302	my @res;
2758	local $_;	3303	local $_;
2759	local @safe::cf::_safe_eval_args = values %vars;
2760		3304
2761	my $eval =	3305	my $eval =
2762	"do {\n"	3306	"do {\n"
2763	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"	3307	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2764	. "#line 0 \"{$qcode}\"\n"	3308	. "#line 0 \"{$qcode}\"\n"
2765	. $code	3309	. $code
2766	. "\n}"	3310	. "\n}"
2767	;	3311	;
2768		3312
		3313	if ($CFG{safe_eval}) {
2769	sub_generation_inc;	3314	sub_generation_inc;
		3315	local @safe::cf::_safe_eval_args = values %vars;
2770	my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);	3316	@res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2771	sub_generation_inc;	3317	sub_generation_inc;
		3318	} else {
		3319	local @cf::_safe_eval_args = values %vars;
		3320	@res = wantarray ? eval eval : scalar eval $eval;
		3321	}
2772		3322
2773	if ($@) {	3323	if ($@) {
2774	warn "$@";	3324	warn "$@",
2775	warn "while executing safe code '$code'\n";	3325	"while executing safe code '$code'\n",
2776	warn "with arguments " . (join " ", %vars) . "\n";	3326	"with arguments " . (join " ", %vars) . "\n";
2777	}	3327	}
2778		3328
2779	wantarray ? @res : $res[0]	3329	wantarray ? @res : $res[0]
2780	}	3330	}
2781		3331
…		…
2795	=cut	3345	=cut
2796		3346
2797	sub register_script_function {	3347	sub register_script_function {
2798	my ($fun, $cb) = @_;	3348	my ($fun, $cb) = @_;
2799		3349
2800	no strict 'refs';	3350	$fun = "safe::$fun" if $CFG{safe_eval};
2801	*{"safe::$fun"} = $safe_hole->wrap ($cb);	3351	*$fun = $safe_hole->wrap ($cb);
2802	}	3352	}
2803		3353
2804	=back	3354	=back
2805		3355
2806	=cut	3356	=cut
…		…
2809	# the server's init and main functions	3359	# the server's init and main functions
2810		3360
2811	sub load_facedata($) {	3361	sub load_facedata($) {
2812	my ($path) = @_;	3362	my ($path) = @_;
2813		3363
		3364	# HACK to clear player env face cache, we need some signal framework
		3365	# for this (global event?)
		3366	%ext::player_env::MUSIC_FACE_CACHE = ();
		3367
		3368	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		3369
2814	warn "loading facedata from $path\n";	3370	trace "loading facedata from $path\n";
2815		3371
2816	my $facedata;	3372	my $facedata;
2817	0 < aio_load $path, $facedata	3373	0 < aio_load $path, $facedata
2818	or die "$path: $!";	3374	or die "$path: $!";
2819		3375
2820	$facedata = Coro::Storable::thaw $facedata;	3376	$facedata = Coro::Storable::thaw $facedata;
2821		3377
2822	$facedata->{version} == 2	3378	$facedata->{version} == 2
2823	or cf::cleanup "$path: version mismatch, cannot proceed.";	3379	or cf::cleanup "$path: version mismatch, cannot proceed.";
2824		3380
		3381	# patch in the exptable
		3382	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
		3383	$facedata->{resource}{"res/exp_table"} = {
		3384	type => FT_RSRC,
		3385	data => $exp_table,
		3386	hash => (Digest::MD5::md5 $exp_table),
		3387	};
		3388	cf::cede_to_tick;
		3389
2825	{	3390	{
2826	my $faces = $facedata->{faceinfo};	3391	my $faces = $facedata->{faceinfo};
2827		3392
2828	while (my ($face, $info) = each %$faces) {	3393	while (my ($face, $info) = each %$faces) {
2829	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3394	my $idx = (cf::face::find $face) || cf::face::alloc $face;
		3395
2830	cf::face::set_visibility $idx, $info->{visibility};	3396	cf::face::set_visibility $idx, $info->{visibility};
2831	cf::face::set_magicmap $idx, $info->{magicmap};	3397	cf::face::set_magicmap $idx, $info->{magicmap};
2832	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3398	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2833	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3399	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
2834		3400
2835	cf::cede_to_tick;	3401	cf::cede_to_tick;
2836	}	3402	}
2837		3403
2838	while (my ($face, $info) = each %$faces) {	3404	while (my ($face, $info) = each %$faces) {
2839	next unless $info->{smooth};	3405	next unless $info->{smooth};
		3406
2840	my $idx = cf::face::find $face	3407	my $idx = cf::face::find $face
2841	or next;	3408	or next;
		3409
2842	if (my $smooth = cf::face::find $info->{smooth}) {	3410	if (my $smooth = cf::face::find $info->{smooth}) {
2843	cf::face::set_smooth $idx, $smooth;	3411	cf::face::set_smooth $idx, $smooth;
2844	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3412	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2845	} else {	3413	} else {
2846	warn "smooth face '$info->{smooth}' not found for face '$face'";	3414	error "smooth face '$info->{smooth}' not found for face '$face'";
2847	}	3415	}
2848		3416
2849	cf::cede_to_tick;	3417	cf::cede_to_tick;
2850	}	3418	}
2851	}	3419	}
…		…
2860		3428
2861	cf::anim::invalidate_all; # d'oh	3429	cf::anim::invalidate_all; # d'oh
2862	}	3430	}
2863		3431
2864	{	3432	{
2865	# TODO: for gcfclient pleasure, we should give resources
2866	# that gcfclient doesn't grok a >10000 face index.
2867	my $res = $facedata->{resource};	3433	my $res = $facedata->{resource};
2868	my $enc = JSON::XS->new->utf8->canonical;
2869
2870	my $soundconf = delete $res->{"res/sound.conf"};
2871		3434
2872	while (my ($name, $info) = each %$res) {	3435	while (my ($name, $info) = each %$res) {
2873	my $meta = $enc->encode ({	3436	if (defined $info->{type}) {
2874	name => $name,
2875	%{ $info->{meta} || {} },
2876	});
2877
2878	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3437	my $idx = (cf::face::find $name) || cf::face::alloc $name;
2879		3438
2880	if ($info->{type} & 1) {
2881	# prepend meta info
2882
2883	my $data = pack "(w/a*)*", $meta, $info->{data};
2884	my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2885
2886	cf::face::set_data $idx, 0, $data, $chk;	3439	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
		3440	cf::face::set_type $idx, $info->{type};
2887	} else {	3441	} else {
2888	cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};	3442	$RESOURCE{$name} = $info; # unused
2889	}	3443	}
2890		3444
2891	cf::face::set_type $idx, $info->{type};
2892
2893	cf::cede_to_tick;	3445	cf::cede_to_tick;
2894	}	3446	}
2895
2896	if ($soundconf) {
2897	$soundconf = $enc->decode (delete $soundconf->{data});
2898
2899	for (0 .. SOUND_CAST_SPELL_0 - 1) {
2900	my $sound = $soundconf->{compat}[$_]
2901	or next;
2902
2903	my $face = cf::face::find "sound/$sound->[1]";
2904	warn "$sound->[0]: $face\n";#d#
2905
2906	cf::sound::set $sound->[0] => $face;
2907	cf::sound::old_sound_index $_, $face; # gcfclient-compat
2908	}
2909
2910	#TODO
2911	}
2912	}	3447	}
		3448
		3449	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2913		3450
2914	1	3451	1
2915	}	3452	}
2916		3453
2917	register_exticmd fx_want => sub {	3454	register_exticmd fx_want => sub {
…		…
2920	while (my ($k, $v) = each %$want) {	3457	while (my ($k, $v) = each %$want) {
2921	$ns->fx_want ($k, $v);	3458	$ns->fx_want ($k, $v);
2922	}	3459	}
2923	};	3460	};
2924		3461
		3462	sub load_resource_file($) {
		3463	my $guard = lock_acquire "load_resource_file";
		3464
		3465	my $status = load_resource_file_ $_[0];
		3466	get_slot 0.1, 100;
		3467	cf::arch::commit_load;
		3468
		3469	$status
		3470	}
		3471
2925	sub reload_regions {	3472	sub reload_regions {
		3473	# HACK to clear player env face cache, we need some signal framework
		3474	# for this (global event?)
		3475	%ext::player_env::MUSIC_FACE_CACHE = ();
		3476
2926	load_resource_file "$MAPDIR/regions"	3477	load_resource_file "$MAPDIR/regions"
2927	or die "unable to load regions file\n";	3478	or die "unable to load regions file\n";
2928		3479
2929	for (cf::region::list) {	3480	for (cf::region::list) {
2930	$_->{match} = qr/$_->{match}/	3481	$_->{match} = qr/$_->{match}/
…		…
2938	}	3489	}
2939		3490
2940	sub reload_archetypes {	3491	sub reload_archetypes {
2941	load_resource_file "$DATADIR/archetypes"	3492	load_resource_file "$DATADIR/archetypes"
2942	or die "unable to load archetypes\n";	3493	or die "unable to load archetypes\n";
2943	#d# NEED to laod twice to resolve forward references
2944	# this really needs to be done in an extra post-pass
2945	# (which needs to be synchronous, so solve it differently)
2946	load_resource_file "$DATADIR/archetypes"
2947	or die "unable to load archetypes\n";
2948	}	3494	}
2949		3495
2950	sub reload_treasures {	3496	sub reload_treasures {
2951	load_resource_file "$DATADIR/treasures"	3497	load_resource_file "$DATADIR/treasures"
2952	or die "unable to load treasurelists\n";	3498	or die "unable to load treasurelists\n";
2953	}	3499	}
2954		3500
		3501	sub reload_sound {
		3502	trace "loading sound config from $DATADIR/sound\n";
		3503
		3504	0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
		3505	or die "$DATADIR/sound $!";
		3506
		3507	my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
		3508
		3509	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3510	my $sound = $soundconf->{compat}[$_]
		3511	or next;
		3512
		3513	my $face = cf::face::find "sound/$sound->[1]";
		3514	cf::sound::set $sound->[0] => $face;
		3515	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3516	}
		3517
		3518	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3519	my $face = cf::face::find "sound/$v";
		3520	cf::sound::set $k => $face;
		3521	}
		3522	}
		3523
2955	sub reload_resources {	3524	sub reload_resources {
2956	warn "reloading resource files...\n";	3525	trace "reloading resource files...\n";
2957		3526
		3527	reload_facedata;
		3528	reload_sound;
		3529	reload_archetypes;
2958	reload_regions;	3530	reload_regions;
2959	reload_facedata;
2960	#reload_archetypes;#d#
2961	reload_archetypes;
2962	reload_treasures;	3531	reload_treasures;
2963		3532
2964	warn "finished reloading resource files\n";	3533	trace "finished reloading resource files\n";
2965	}	3534	}
2966		3535
2967	sub init {	3536	sub reload_config {
2968	reload_resources;	3537	trace "reloading config file...\n";
2969	}
2970		3538
2971	sub cfg_load {
2972	open my $fh, "<:utf8", "$CONFDIR/config"	3539	open my $fh, "<:utf8", "$CONFDIR/config"
2973	or return;	3540	or return;
2974		3541
2975	local $/;	3542	local $/;
2976	*CFG = YAML::Syck::Load <$fh>;	3543	*CFG = YAML::XS::Load scalar <$fh>;
2977		3544
2978	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3545	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
2979		3546
2980	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3547	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2981	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3548	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2982		3549
2983	if (exists $CFG{mlockall}) {	3550	if (exists $CFG{mlockall}) {
…		…
2985	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3552	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2986	and die "WARNING: m(un)lockall failed: $!\n";	3553	and die "WARNING: m(un)lockall failed: $!\n";
2987	};	3554	};
2988	warn $@ if $@;	3555	warn $@ if $@;
2989	}	3556	}
		3557
		3558	trace "finished reloading resource files\n";
		3559	}
		3560
		3561	sub pidfile() {
		3562	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
		3563	or die "$PIDFILE: $!";
		3564	flock $fh, &Fcntl::LOCK_EX
		3565	or die "$PIDFILE: flock: $!";
		3566	$fh
		3567	}
		3568
		3569	# make sure only one server instance is running at any one time
		3570	sub atomic {
		3571	my $fh = pidfile;
		3572
		3573	my $pid = <$fh>;
		3574	kill 9, $pid if $pid > 0;
		3575
		3576	seek $fh, 0, 0;
		3577	print $fh $$;
		3578	}
		3579
		3580	sub main_loop {
		3581	trace "EV::loop starting\n";
		3582	if (1) {
		3583	EV::loop;
		3584	}
		3585	trace "EV::loop returned\n";
		3586	goto &main_loop unless $REALLY_UNLOOP;
2990	}	3587	}
2991		3588
2992	sub main {	3589	sub main {
		3590	cf::init_globals; # initialise logging
		3591
		3592	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
		3593	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
		3594	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
		3595	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
		3596
		3597	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
		3598
2993	# we must not ever block the main coroutine	3599	# we must not ever block the main coroutine
2994	local $Coro::idle = sub {	3600	local $Coro::idle = sub {
2995	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3601	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2996	(async {	3602	(async {
2997	Event::one_event;	3603	$Coro::current->{desc} = "IDLE BUG HANDLER";
		3604	EV::loop EV::LOOP_ONESHOT;
2998	})->prio (Coro::PRIO_MAX);	3605	})->prio (Coro::PRIO_MAX);
2999	};	3606	};
3000		3607
3001	cfg_load;	3608	evthread_start IO::AIO::poll_fileno;
		3609
		3610	cf::sync_job {
		3611	cf::init_experience;
		3612	cf::init_anim;
		3613	cf::init_attackmess;
		3614	cf::init_dynamic;
		3615
		3616	cf::load_settings;
		3617	cf::load_materials;
		3618
		3619	reload_resources;
		3620	reload_config;
3002	db_init;	3621	db_init;
		3622
		3623	cf::init_uuid;
		3624	cf::init_signals;
		3625	cf::init_skills;
		3626
		3627	cf::init_beforeplay;
		3628
		3629	atomic;
		3630
3003	load_extensions;	3631	load_extensions;
3004		3632
3005	$TICK_WATCHER->start;	3633	utime time, time, $RUNTIMEFILE;
3006	Event::loop;	3634
		3635	# no (long-running) fork's whatsoever before this point(!)
		3636	use POSIX ();
		3637	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
		3638
		3639	(pop @POST_INIT)->(0) while @POST_INIT;
		3640	};
		3641
		3642	cf::object::thawer::errors_are_fatal 0;
		3643	info "parse errors in files are no longer fatal from this point on.\n";
		3644
		3645	main_loop;
3007	}	3646	}
3008		3647
3009	#############################################################################	3648	#############################################################################
3010	# initialisation and cleanup	3649	# initialisation and cleanup
3011		3650
3012	# install some emergency cleanup handlers	3651	# install some emergency cleanup handlers
3013	BEGIN {	3652	BEGIN {
		3653	our %SIGWATCHER = ();
3014	for my $signal (qw(INT HUP TERM)) {	3654	for my $signal (qw(INT HUP TERM)) {
3015	Event->signal (	3655	$SIGWATCHER{$signal} = AE::signal $signal, sub {
3016	reentrant => 0,
3017	data => WF_AUTOCANCEL,
3018	signal => $signal,
3019	prio => 0,
3020	cb => sub {
3021	cf::cleanup "SIG$signal";	3656	cf::cleanup "SIG$signal";
3022	},
3023	);	3657	};
3024	}	3658	}
3025	}	3659	}
3026		3660
3027	sub write_runtime {	3661	sub write_runtime_sync {
3028	my $runtime = "$LOCALDIR/runtime";	3662	my $t0 = AE::time;
3029		3663
3030	# first touch the runtime file to show we are still running:	3664	# first touch the runtime file to show we are still running:
3031	# the fsync below can take a very very long time.	3665	# the fsync below can take a very very long time.
3032		3666
3033	IO::AIO::aio_utime $runtime, undef, undef;	3667	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3034		3668
3035	my $guard = cf::lock_acquire "write_runtime";	3669	my $guard = cf::lock_acquire "write_runtime";
3036		3670
3037	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644	3671	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3038	or return;	3672	or return;
3039		3673
3040	my $value = $cf::RUNTIME + 90 + 10;	3674	my $value = $cf::RUNTIME + 90 + 10;
3041	# 10 is the runtime save interval, for a monotonic clock	3675	# 10 is the runtime save interval, for a monotonic clock
3042	# 60 allows for the watchdog to kill the server.	3676	# 60 allows for the watchdog to kill the server.
…		…
3052	aio_utime $fh, undef, undef;	3686	aio_utime $fh, undef, undef;
3053		3687
3054	close $fh	3688	close $fh
3055	or return;	3689	or return;
3056		3690
3057	aio_rename "$runtime~", $runtime	3691	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3058	and return;	3692	and return;
3059		3693
3060	warn "runtime file written.\n";	3694	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3061		3695
3062	1	3696	1
		3697	}
		3698
		3699	our $uuid_lock;
		3700	our $uuid_skip;
		3701
		3702	sub write_uuid_sync($) {
		3703	$uuid_skip ||= $_[0];
		3704
		3705	return if $uuid_lock;
		3706	local $uuid_lock = 1;
		3707
		3708	my $uuid = "$LOCALDIR/uuid";
		3709
		3710	my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
		3711	or return;
		3712
		3713	my $value = uuid_seq uuid_cur;
		3714
		3715	unless ($value) {
		3716	info "cowardly refusing to write zero uuid value!\n";
		3717	return;
		3718	}
		3719
		3720	my $value = uuid_str $value + $uuid_skip;
		3721	$uuid_skip = 0;
		3722
		3723	(aio_write $fh, 0, (length $value), $value, 0) <= 0
		3724	and return;
		3725
		3726	# always fsync - this file is important
		3727	aio_fsync $fh
		3728	and return;
		3729
		3730	close $fh
		3731	or return;
		3732
		3733	aio_rename "$uuid~", $uuid
		3734	and return;
		3735
		3736	trace "uuid file written ($value).\n";
		3737
		3738	1
		3739
		3740	}
		3741
		3742	sub write_uuid($$) {
		3743	my ($skip, $sync) = @_;
		3744
		3745	$sync ? write_uuid_sync $skip
		3746	: async { write_uuid_sync $skip };
3063	}	3747	}
3064		3748
3065	sub emergency_save() {	3749	sub emergency_save() {
3066	my $freeze_guard = cf::freeze_mainloop;	3750	my $freeze_guard = cf::freeze_mainloop;
3067		3751
3068	warn "enter emergency perl save\n";	3752	info "emergency_perl_save: enter\n";
		3753
		3754	# this is a trade-off: we want to be very quick here, so
		3755	# save all maps without fsync, and later call a global sync
		3756	# (which in turn might be very very slow)
		3757	local $USE_FSYNC = 0;
3069		3758
3070	cf::sync_job {	3759	cf::sync_job {
		3760	cf::write_runtime_sync; # external watchdog should not bark
		3761
3071	# use a peculiar iteration method to avoid tripping on perl	3762	# use a peculiar iteration method to avoid tripping on perl
3072	# refcount bugs in for. also avoids problems with players	3763	# refcount bugs in for. also avoids problems with players
3073	# and maps saved/destroyed asynchronously.	3764	# and maps saved/destroyed asynchronously.
3074	warn "begin emergency player save\n";	3765	info "emergency_perl_save: begin player save\n";
3075	for my $login (keys %cf::PLAYER) {	3766	for my $login (keys %cf::PLAYER) {
3076	my $pl = $cf::PLAYER{$login} or next;	3767	my $pl = $cf::PLAYER{$login} or next;
3077	$pl->valid or next;	3768	$pl->valid or next;
		3769	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3078	$pl->save;	3770	$pl->save;
3079	}	3771	}
3080	warn "end emergency player save\n";	3772	info "emergency_perl_save: end player save\n";
3081		3773
3082	warn "begin emergency map save\n";	3774	cf::write_runtime_sync; # external watchdog should not bark
		3775
		3776	info "emergency_perl_save: begin map save\n";
3083	for my $path (keys %cf::MAP) {	3777	for my $path (keys %cf::MAP) {
3084	my $map = $cf::MAP{$path} or next;	3778	my $map = $cf::MAP{$path} or next;
3085	$map->valid or next;	3779	$map->valid or next;
3086	$map->save;	3780	$map->save;
3087	}	3781	}
3088	warn "end emergency map save\n";	3782	info "emergency_perl_save: end map save\n";
3089		3783
3090	warn "begin emergency database checkpoint\n";	3784	cf::write_runtime_sync; # external watchdog should not bark
		3785
		3786	info "emergency_perl_save: begin database checkpoint\n";
3091	BDB::db_env_txn_checkpoint $DB_ENV;	3787	BDB::db_env_txn_checkpoint $DB_ENV;
3092	warn "end emergency database checkpoint\n";	3788	info "emergency_perl_save: end database checkpoint\n";
		3789
		3790	info "emergency_perl_save: begin write uuid\n";
		3791	write_uuid_sync 1;
		3792	info "emergency_perl_save: end write uuid\n";
		3793
		3794	cf::write_runtime_sync; # external watchdog should not bark
		3795
		3796	trace "emergency_perl_save: syncing database to disk";
		3797	BDB::db_env_txn_checkpoint $DB_ENV;
		3798
		3799	info "emergency_perl_save: starting sync\n";
		3800	IO::AIO::aio_sync sub {
		3801	info "emergency_perl_save: finished sync\n";
		3802	};
		3803
		3804	cf::write_runtime_sync; # external watchdog should not bark
		3805
		3806	trace "emergency_perl_save: flushing outstanding aio requests";
		3807	while (IO::AIO::nreqs || BDB::nreqs) {
		3808	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
		3809	}
		3810
		3811	cf::write_runtime_sync; # external watchdog should not bark
3093	};	3812	};
3094		3813
3095	warn "leave emergency perl save\n";	3814	info "emergency_perl_save: leave\n";
3096	}	3815	}
3097		3816
3098	sub post_cleanup {	3817	sub post_cleanup {
3099	my ($make_core) = @_;	3818	my ($make_core) = @_;
3100		3819
		3820	IO::AIO::flush;
		3821
3101	warn Carp::longmess "post_cleanup backtrace"	3822	error Carp::longmess "post_cleanup backtrace"
3102	if $make_core;	3823	if $make_core;
		3824
		3825	my $fh = pidfile;
		3826	unlink $PIDFILE if <$fh> == $$;
		3827	}
		3828
		3829	# a safer delete_package, copied from Symbol
		3830	sub clear_package($) {
		3831	my $pkg = shift;
		3832
		3833	# expand to full symbol table name if needed
		3834	unless ($pkg =~ /^main::.*::$/) {
		3835	$pkg = "main$pkg" if $pkg =~ /^::/;
		3836	$pkg = "main::$pkg" unless $pkg =~ /^main::/;
		3837	$pkg .= '::' unless $pkg =~ /::$/;
		3838	}
		3839
		3840	my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
		3841	my $stem_symtab = *{$stem}{HASH};
		3842
		3843	defined $stem_symtab and exists $stem_symtab->{$leaf}
		3844	or return;
		3845
		3846	# clear all symbols
		3847	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
		3848	for my $name (keys %$leaf_symtab) {
		3849	_gv_clear *{"$pkg$name"};
		3850	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
		3851	}
3103	}	3852	}
3104		3853
3105	sub do_reload_perl() {	3854	sub do_reload_perl() {
3106	# can/must only be called in main	3855	# can/must only be called in main
3107	if ($Coro::current != $Coro::main) {	3856	if (in_main) {
3108	warn "can only reload from main coroutine";	3857	error "can only reload from main coroutine";
3109	return;	3858	return;
3110	}	3859	}
3111		3860
		3861	return if $RELOAD++;
		3862
		3863	my $t1 = AE::time;
		3864
		3865	while ($RELOAD) {
3112	warn "reloading...";	3866	info "reloading...";
3113		3867
3114	warn "entering sync_job";	3868	trace "entering sync_job";
3115		3869
3116	cf::sync_job {	3870	cf::sync_job {
3117	cf::write_runtime; # external watchdog should not bark
3118	cf::emergency_save;	3871	cf::emergency_save;
3119	cf::write_runtime; # external watchdog should not bark
3120		3872
3121	warn "syncing database to disk";
3122	BDB::db_env_txn_checkpoint $DB_ENV;
3123
3124	# if anything goes wrong in here, we should simply crash as we already saved
3125
3126	warn "cancelling all WF_AUTOCANCEL watchers";
3127	for (Event::all_watchers) {
3128	$_->cancel if $_->data & WF_AUTOCANCEL;
3129	}
3130
3131	warn "flushing outstanding aio requests";
3132	for (;;) {
3133	BDB::flush;
3134	IO::AIO::flush;
3135	Coro::cede;
3136	last unless IO::AIO::nreqs || BDB::nreqs;
3137	warn "iterate...";
3138	}
3139
3140	++$RELOAD;
3141
3142	warn "cancelling all extension coros";	3873	trace "cancelling all extension coros";
3143	$_->cancel for values %EXT_CORO;	3874	$_->cancel for values %EXT_CORO;
3144	%EXT_CORO = ();	3875	%EXT_CORO = ();
3145		3876
3146	warn "removing commands";	3877	trace "removing commands";
3147	%COMMAND = ();	3878	%COMMAND = ();
3148		3879
3149	warn "removing ext/exti commands";	3880	trace "removing ext/exti commands";
3150	%EXTCMD = ();	3881	%EXTCMD = ();
3151	%EXTICMD = ();	3882	%EXTICMD = ();
3152		3883
3153	warn "unloading/nuking all extensions";	3884	trace "unloading/nuking all extensions";
3154	for my $pkg (@EXTS) {	3885	for my $pkg (@EXTS) {
3155	warn "... unloading $pkg";	3886	trace "... unloading $pkg";
3156		3887
3157	if (my $cb = $pkg->can ("unload")) {	3888	if (my $cb = $pkg->can ("unload")) {
3158	eval {	3889	eval {
3159	$cb->($pkg);	3890	$cb->($pkg);
3160	1	3891	1
3161	} or warn "$pkg unloaded, but with errors: $@";	3892	} or error "$pkg unloaded, but with errors: $@";
		3893	}
		3894
		3895	trace "... clearing $pkg";
		3896	clear_package $pkg;
3162	}	3897	}
3163		3898
3164	warn "... nuking $pkg";
3165	Symbol::delete_package $pkg;
3166	}
3167
3168	warn "unloading all perl modules loaded from $LIBDIR";	3899	trace "unloading all perl modules loaded from $LIBDIR";
3169	while (my ($k, $v) = each %INC) {	3900	while (my ($k, $v) = each %INC) {
3170	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	3901	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3171		3902
3172	warn "... unloading $k";	3903	trace "... unloading $k";
3173	delete $INC{$k};	3904	delete $INC{$k};
3174		3905
3175	$k =~ s/\.pm$//;	3906	$k =~ s/\.pm$//;
3176	$k =~ s/\//::/g;	3907	$k =~ s/\//::/g;
3177		3908
3178	if (my $cb = $k->can ("unload_module")) {	3909	if (my $cb = $k->can ("unload_module")) {
3179	$cb->();	3910	$cb->();
		3911	}
		3912
		3913	clear_package $k;
3180	}	3914	}
3181		3915
3182	Symbol::delete_package $k;
3183	}
3184
3185	warn "getting rid of safe::, as good as possible";	3916	trace "getting rid of safe::, as good as possible";
3186	Symbol::delete_package "safe::$_"	3917	clear_package "safe::$_"
3187	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	3918	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3188		3919
3189	warn "unloading cf.pm \"a bit\"";	3920	trace "unloading cf.pm \"a bit\"";
3190	delete $INC{"cf.pm"};	3921	delete $INC{"cf.pm"};
3191	delete $INC{"cf/pod.pm"};	3922	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3192		3923
3193	# don't, removes xs symbols, too,	3924	# don't, removes xs symbols, too,
3194	# and global variables created in xs	3925	# and global variables created in xs
3195	#Symbol::delete_package __PACKAGE__;	3926	#clear_package __PACKAGE__;
3196		3927
3197	warn "unload completed, starting to reload now";	3928	info "unload completed, starting to reload now";
3198		3929
3199	warn "reloading cf.pm";	3930	trace "reloading cf.pm";
3200	require cf;	3931	require cf;
3201	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3932	cf::_connect_to_perl_1;
3202		3933
3203	warn "loading config and database again";	3934	trace "loading config and database again";
3204	cf::cfg_load;	3935	cf::reload_config;
3205		3936
3206	warn "loading extensions";	3937	trace "loading extensions";
3207	cf::load_extensions;	3938	cf::load_extensions;
3208		3939
		3940	if ($REATTACH_ON_RELOAD) {
3209	warn "reattaching attachments to objects/players";	3941	trace "reattaching attachments to objects/players";
3210	_global_reattach; # objects, sockets	3942	_global_reattach; # objects, sockets
3211	warn "reattaching attachments to maps";	3943	trace "reattaching attachments to maps";
3212	reattach $_ for values %MAP;	3944	reattach $_ for values %MAP;
3213	warn "reattaching attachments to players";	3945	trace "reattaching attachments to players";
3214	reattach $_ for values %PLAYER;	3946	reattach $_ for values %PLAYER;
		3947	}
3215		3948
		3949	trace "running post_init jobs";
		3950	(pop @POST_INIT)->(1) while @POST_INIT;
		3951
3216	warn "leaving sync_job";	3952	trace "leaving sync_job";
3217		3953
3218	1	3954	1
3219	} or do {	3955	} or do {
3220	warn $@;	3956	error $@;
3221	warn "error while reloading, exiting.";	3957	cf::cleanup "error while reloading, exiting.";
3222	exit 1;	3958	};
		3959
		3960	info "reloaded";
		3961	--$RELOAD;
3223	};	3962	}
3224		3963
3225	warn "reloaded";	3964	$t1 = AE::time - $t1;
		3965	info "reload completed in ${t1}s\n";
3226	};	3966	};
3227		3967
3228	our $RELOAD_WATCHER; # used only during reload	3968	our $RELOAD_WATCHER; # used only during reload
3229		3969
3230	sub reload_perl() {	3970	sub reload_perl() {
3231	# doing reload synchronously and two reloads happen back-to-back,	3971	# doing reload synchronously and two reloads happen back-to-back,
3232	# coro crashes during coro_state_free->destroy here.	3972	# coro crashes during coro_state_free->destroy here.
3233		3973
3234	$RELOAD_WATCHER ||= Event->timer (	3974	$RELOAD_WATCHER ||= cf::async {
3235	reentrant => 0,	3975	Coro::AIO::aio_wait cache_extensions;
3236	after => 0,	3976
3237	data => WF_AUTOCANCEL,	3977	$RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3238	cb => sub {
3239	do_reload_perl;	3978	do_reload_perl;
3240	undef $RELOAD_WATCHER;	3979	undef $RELOAD_WATCHER;
3241	},	3980	};
3242	);	3981	};
3243	}	3982	}
3244		3983
3245	register_command "reload" => sub {	3984	register_command "reload" => sub {
3246	my ($who, $arg) = @_;	3985	my ($who, $arg) = @_;
3247		3986
3248	if ($who->flag (FLAG_WIZ)) {	3987	if ($who->flag (FLAG_WIZ)) {
3249	$who->message ("reloading server.");	3988	$who->message ("reloading server.");
		3989	async {
		3990	$Coro::current->{desc} = "perl_reload";
3250	async { reload_perl };	3991	reload_perl;
		3992	};
3251	}	3993	}
3252	};	3994	};
3253		3995
3254	unshift @INC, $LIBDIR;	3996	unshift @INC, $LIBDIR;
3255		3997
…		…
3257		3999
3258	our @WAIT_FOR_TICK;	4000	our @WAIT_FOR_TICK;
3259	our @WAIT_FOR_TICK_BEGIN;	4001	our @WAIT_FOR_TICK_BEGIN;
3260		4002
3261	sub wait_for_tick {	4003	sub wait_for_tick {
3262	return unless $TICK_WATCHER->is_active;
3263	return if $Coro::current == $Coro::main;	4004	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3264		4005
3265	my $signal = new Coro::Signal;	4006	my $signal = new Coro::Signal;
3266	push @WAIT_FOR_TICK, $signal;	4007	push @WAIT_FOR_TICK, $signal;
3267	$signal->wait;	4008	$signal->wait;
3268	}	4009	}
3269		4010
3270	sub wait_for_tick_begin {	4011	sub wait_for_tick_begin {
3271	return unless $TICK_WATCHER->is_active;
3272	return if $Coro::current == $Coro::main;	4012	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3273		4013
3274	my $signal = new Coro::Signal;	4014	my $signal = new Coro::Signal;
3275	push @WAIT_FOR_TICK_BEGIN, $signal;	4015	push @WAIT_FOR_TICK_BEGIN, $signal;
3276	$signal->wait;	4016	$signal->wait;
3277	}	4017	}
3278		4018
3279	my $min = 1e6;#d#	4019	sub tick {
3280	my $avg = 10;
3281	$TICK_WATCHER = Event->timer (
3282	reentrant => 0,
3283	parked => 1,
3284	prio => 0,
3285	at => $NEXT_TICK || $TICK,
3286	data => WF_AUTOCANCEL,
3287	cb => sub {
3288	if ($Coro::current != $Coro::main) {	4020	if ($Coro::current != $Coro::main) {
3289	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4021	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3290	unless ++$bug_warning > 10;	4022	unless ++$bug_warning > 10;
3291	return;	4023	return;
3292	}	4024	}
3293		4025
3294	$NOW = $tick_start = Event::time;
3295
3296	cf::server_tick; # one server iteration	4026	cf::server_tick; # one server iteration
3297		4027
3298	0 && sync_job {#d#	4028	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3299	for(1..10) {
3300	my $t = Event::time;
3301	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3302	or die;
3303		4029
3304	$map->width (50);	4030	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3305	$map->height (50);	4031	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3306	$map->alloc;	4032	Coro::async_pool {
3307	$map->_load_objects ("/tmp/x.map", 1);	4033	$Coro::current->{desc} = "runtime saver";
3308	my $t = Event::time - $t;	4034	write_runtime_sync
3309		4035	or error "ERROR: unable to write runtime file: $!";
3310	#next unless $t < 0.0013;#d#
3311	if ($t < $min) {
3312	$min = $t;
3313	}
3314	$avg = $avg * 0.99 + $t * 0.01;
3315	}
3316	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3317	exit 0;
3318	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3319	};	4036	};
		4037	}
3320		4038
3321	$RUNTIME += $TICK;
3322	$NEXT_TICK += $TICK;
3323
3324	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3325	$NEXT_RUNTIME_WRITE = $NOW + 10;
3326	Coro::async_pool {
3327	write_runtime
3328	or warn "ERROR: unable to write runtime file: $!";
3329	};
3330	}
3331
3332	# my $AFTER = Event::time;
3333	# warn $AFTER - $NOW;#d#
3334
3335	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4039	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3336	$sig->send;	4040	$sig->send;
3337	}	4041	}
3338	while (my $sig = shift @WAIT_FOR_TICK) {	4042	while (my $sig = shift @WAIT_FOR_TICK) {
3339	$sig->send;	4043	$sig->send;
3340	}	4044	}
3341		4045
3342	$NOW = Event::time;	4046	$LOAD = ($NOW - $TICK_START) / $TICK;
3343
3344	# if we are delayed by four ticks or more, skip them all
3345	$NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3346
3347	$TICK_WATCHER->at ($NEXT_TICK);
3348	$TICK_WATCHER->start;
3349
3350	$LOAD = ($NOW - $tick_start) / $TICK;
3351	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4047	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3352		4048
3353	_post_tick;	4049	if (0) {
3354		4050	if ($NEXT_TICK) {
3355		4051	my $jitter = $TICK_START - $NEXT_TICK;
		4052	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
		4053	debug "jitter $JITTER\n";#d#
		4054	}
3356	},	4055	}
3357	);	4056	}
3358		4057
3359	{	4058	{
3360	BDB::max_poll_time $TICK * 0.1;	4059	# configure BDB
3361	$BDB_POLL_WATCHER = Event->io (	4060
3362	reentrant => 0,
3363	fd => BDB::poll_fileno,
3364	poll => 'r',
3365	prio => 0,
3366	data => WF_AUTOCANCEL,
3367	cb => \&BDB::poll_cb,
3368	);
3369	BDB::min_parallel 8;	4061	BDB::min_parallel 16;
3370		4062	BDB::max_poll_reqs $TICK * 0.1;
3371	BDB::set_sync_prepare {	4063	$AnyEvent::BDB::WATCHER->priority (1);
3372	my $status;
3373	my $current = $Coro::current;
3374	(
3375	sub {
3376	$status = $!;
3377	$current->ready; undef $current;
3378	},
3379	sub {
3380	Coro::schedule while defined $current;
3381	$! = $status;
3382	},
3383	)
3384	};
3385		4064
3386	unless ($DB_ENV) {	4065	unless ($DB_ENV) {
3387	$DB_ENV = BDB::db_env_create;	4066	$DB_ENV = BDB::db_env_create;
		4067	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
		4068	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
		4069	$DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
		4070	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		4071	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3388		4072
3389	cf::sync_job {	4073	cf::sync_job {
3390	eval {	4074	eval {
3391	BDB::db_env_open	4075	BDB::db_env_open
3392	$DB_ENV,	4076	$DB_ENV,
…		…
3394	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN	4078	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3395	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,	4079	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3396	0666;	4080	0666;
3397		4081
3398	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	4082	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3399
3400	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3401	$DB_ENV->set_lk_detect;
3402	};	4083	};
3403		4084
3404	cf::cleanup "db_env_open(db): $@" if $@;	4085	cf::cleanup "db_env_open(db): $@" if $@;
3405	};	4086	};
3406	}	4087	}
		4088
		4089	$BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
		4090	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		4091	};
		4092	$BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
		4093	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		4094	};
		4095	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
		4096	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		4097	};
3407	}	4098	}
3408		4099
3409	{	4100	{
		4101	# configure IO::AIO
		4102
3410	IO::AIO::min_parallel 8;	4103	IO::AIO::min_parallel 8;
3411
3412	undef $Coro::AIO::WATCHER;
3413	IO::AIO::max_poll_time $TICK * 0.1;	4104	IO::AIO::max_poll_time $TICK * 0.1;
3414	$AIO_POLL_WATCHER = Event->io (	4105	undef $AnyEvent::AIO::WATCHER;
3415	reentrant => 0,
3416	data => WF_AUTOCANCEL,
3417	fd => IO::AIO::poll_fileno,
3418	poll => 'r',
3419	prio => 6,
3420	cb => \&IO::AIO::poll_cb,
3421	);
3422	}	4106	}
3423		4107
3424	my $_log_backtrace;	4108	my $_log_backtrace;
3425		4109
3426	sub _log_backtrace {	4110	sub _log_backtrace {
…		…
3429	$msg =~ s/\n//;	4113	$msg =~ s/\n//;
3430		4114
3431	# limit the # of concurrent backtraces	4115	# limit the # of concurrent backtraces
3432	if ($_log_backtrace < 2) {	4116	if ($_log_backtrace < 2) {
3433	++$_log_backtrace;	4117	++$_log_backtrace;
		4118	my $perl_bt = Carp::longmess $msg;
3434	async {	4119	async {
		4120	$Coro::current->{desc} = "abt $msg";
		4121
3435	my @bt = fork_call {	4122	my @bt = fork_call {
3436	@addr = map { sprintf "%x", $_ } @addr;	4123	@addr = map { sprintf "%x", $_ } @addr;
3437	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	4124	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3438	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"	4125	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3439	or die "addr2line: $!";	4126	or die "addr2line: $!";
…		…
3447	}	4134	}
3448		4135
3449	@funcs	4136	@funcs
3450	};	4137	};
3451		4138
3452	LOG llevInfo, "[ABT] $msg\n";	4139	LOG llevInfo, "[ABT] $perl_bt\n";
		4140	LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3453	LOG llevInfo, "[ABT] $_\n" for @bt;	4141	LOG llevInfo, "[ABT] $_\n" for @bt;
3454	--$_log_backtrace;	4142	--$_log_backtrace;
3455	};	4143	};
3456	} else {	4144	} else {
3457	LOG llevInfo, "[ABT] $msg\n";	4145	LOG llevInfo, "[ABT] $msg\n";
3458	LOG llevInfo, "[ABT] [suppressed]\n";	4146	LOG llevInfo, "[ABT] [suppressed]\n";
3459	}	4147	}
3460	}	4148	}
3461		4149
3462	# load additional modules	4150	# load additional modules
3463	use cf::pod;	4151	require "cf/$_.pm" for @EXTRA_MODULES;
		4152	cf::_connect_to_perl_2;
3464		4153
3465	END { cf::emergency_save }	4154	END { cf::emergency_save }
3466		4155
3467	1	4156	1
3468		4157

Diff Legend

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