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.314 by root, Mon Jul 23 16:53:15 2007 UTC vs.
Revision 1.534 by root, Thu Apr 29 08:13:51 2010 UTC

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

Diff Legend

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