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.222 by root, Tue Mar 6 03:06:00 2007 UTC vs.
Revision 1.360 by root, Sun Sep 9 06:25:46 2007 UTC

…		…
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Symbol;	6	use Symbol;
7	use List::Util;	7	use List::Util;
		8	use Socket;
8	use Storable;	9	use Storable;
		10	use Event;
9	use Opcode;	11	use Opcode;
10	use Safe;	12	use Safe;
11	use Safe::Hole;	13	use Safe::Hole;
12		14
13	use Coro 3.5 ();	15	use Coro 3.64 ();
		16	use Coro::State;
		17	use Coro::Handle;
14	use Coro::Event;	18	use Coro::Event;
15	use Coro::Timer;	19	use Coro::Timer;
16	use Coro::Signal;	20	use Coro::Signal;
17	use Coro::Semaphore;	21	use Coro::Semaphore;
18	use Coro::AIO;	22	use Coro::AIO;
		23	use Coro::Storable;
		24	use Coro::Util ();
19		25
		26	use JSON::XS ();
20	use BDB ();	27	use BDB ();
21	use Data::Dumper;	28	use Data::Dumper;
22	use Digest::MD5;	29	use Digest::MD5;
23	use Fcntl;	30	use Fcntl;
		31	use YAML::Syck ();
24	use IO::AIO 2.32 ();	32	use IO::AIO 2.32 ();
25	use YAML::Syck ();
26	use Time::HiRes;	33	use Time::HiRes;
27	use Compress::LZF;	34	use Compress::LZF;
		35	use Digest::MD5 ();
28		36
		37	# configure various modules to our taste
		38	#
		39	$Storable::canonical = 1; # reduce rsync transfers
		40	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
29	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later	41	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
30		42
31	use Event; $Event::Eval = 1; # no idea why this is required, but it is	43	$Event::Eval = 1; # no idea why this is required, but it is
32
33	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34		44
35	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?	45	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
36	$YAML::Syck::ImplicitUnicode = 1;	46	$YAML::Syck::ImplicitUnicode = 1;
37		47
38	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority	48	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
39		49
		50	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
		51
40	our %COMMAND = ();	52	our %COMMAND = ();
41	our %COMMAND_TIME = ();	53	our %COMMAND_TIME = ();
42		54
43	our @EXTS = (); # list of extension package names	55	our @EXTS = (); # list of extension package names
44	our %EXTCMD = ();	56	our %EXTCMD = ();
		57	our %EXTICMD = ();
45	our %EXT_CORO = (); # coroutines bound to extensions	58	our %EXT_CORO = (); # coroutines bound to extensions
46	our %EXT_MAP = (); # pluggable maps	59	our %EXT_MAP = (); # pluggable maps
47		60
		61	our $RELOAD; # number of reloads so far
48	our @EVENT;	62	our @EVENT;
49	our $LIBDIR = datadir . "/ext";
50		63
51	our $TICK = MAX_TIME * 1e-6;	64	our $CONFDIR = confdir;
		65	our $DATADIR = datadir;
		66	our $LIBDIR = "$DATADIR/ext";
		67	our $PODDIR = "$DATADIR/pod";
		68	our $MAPDIR = "$DATADIR/" . mapdir;
		69	our $LOCALDIR = localdir;
		70	our $TMPDIR = "$LOCALDIR/" . tmpdir;
		71	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
		72	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
		73	our $RANDOMDIR = "$LOCALDIR/random";
		74	our $BDBDIR = "$LOCALDIR/db";
		75
		76	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
52	our $TICK_WATCHER;	77	our $TICK_WATCHER;
53	our $AIO_POLL_WATCHER;	78	our $AIO_POLL_WATCHER;
54	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	79	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
55	our $NEXT_TICK;	80	our $NEXT_TICK;
56	our $NOW;	81	our $NOW;
…		…
62	our %CFG;	87	our %CFG;
63		88
64	our $UPTIME; $UPTIME ||= time;	89	our $UPTIME; $UPTIME ||= time;
65	our $RUNTIME;	90	our $RUNTIME;
66		91
67	our %PLAYER; # all users	92	our (%PLAYER, %PLAYER_LOADING); # all users
68	our %MAP; # all maps	93	our (%MAP, %MAP_LOADING ); # all maps
69	our $LINK_MAP; # the special {link} map, which is always available	94	our $LINK_MAP; # the special {link} map, which is always available
70	our $RANDOM_MAPS = cf::localdir . "/random";
71	our $BDB_ENV_DIR = cf::localdir . "/db";
72
73	our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
74	our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
75		95
76	# used to convert map paths into valid unix filenames by replacing / by ∕	96	# used to convert map paths into valid unix filenames by replacing / by ∕
77	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	97	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
78		98
		99	our $LOAD; # a number between 0 (idle) and 1 (too many objects)
		100	our $LOADAVG; # same thing, but with alpha-smoothing
		101	our $tick_start; # for load detecting purposes
		102
79	binmode STDOUT;	103	binmode STDOUT;
80	binmode STDERR;	104	binmode STDERR;
81		105
82	# read virtual server time, if available	106	# read virtual server time, if available
83	unless ($RUNTIME || !-e cf::localdir . "/runtime") {	107	unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
84	open my $fh, "<", cf::localdir . "/runtime"	108	open my $fh, "<", "$LOCALDIR/runtime"
85	or die "unable to read runtime file: $!";	109	or die "unable to read runtime file: $!";
86	$RUNTIME = <$fh> + 0.;	110	$RUNTIME = <$fh> + 0.;
87	}	111	}
88		112
89	mkdir cf::localdir;	113	mkdir $_
90	mkdir cf::localdir . "/" . cf::playerdir;	114	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
91	mkdir cf::localdir . "/" . cf::tmpdir;
92	mkdir cf::localdir . "/" . cf::uniquedir;
93	mkdir $RANDOM_MAPS;
94	mkdir $BDB_ENV_DIR;
95		115
96	our $EMERGENCY_POSITION;	116	our $EMERGENCY_POSITION;
97		117
98	sub cf::map::normalise;	118	sub cf::map::normalise;
99		119
…		…
110	=item $cf::RUNTIME	130	=item $cf::RUNTIME
111		131
112	The time this server has run, starts at 0 and is increased by $cf::TICK on	132	The time this server has run, starts at 0 and is increased by $cf::TICK on
113	every server tick.	133	every server tick.
114		134
115	=item $cf::LIBDIR	135	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
		136	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
		137	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
116		138
117	The perl library directory, where extensions and cf-specific modules can	139	Various directories - "/etc", read-only install directory, perl-library
118	be found. It will be added to C<@INC> automatically.	140	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
		141	unique-items directory, player file directory, random maps directory and
		142	database environment.
119		143
120	=item $cf::NOW	144	=item $cf::NOW
121		145
122	The time of the last (current) server tick.	146	The time of the last (current) server tick.
123		147
124	=item $cf::TICK	148	=item $cf::TICK
125		149
126	The interval between server ticks, in seconds.	150	The interval between server ticks, in seconds.
		151
		152	=item $cf::LOADAVG
		153
		154	The current CPU load on the server (alpha-smoothed), as a value between 0
		155	(none) and 1 (overloaded), indicating how much time is spent on processing
		156	objects per tick. Healthy values are < 0.5.
		157
		158	=item $cf::LOAD
		159
		160	The raw value load value from the last tick.
127		161
128	=item %cf::CFG	162	=item %cf::CFG
129		163
130	Configuration for the server, loaded from C</etc/crossfire/config>, or	164	Configuration for the server, loaded from C</etc/crossfire/config>, or
131	from wherever your confdir points to.	165	from wherever your confdir points to.
132		166
133	=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE	167	=item cf::wait_for_tick, cf::wait_for_tick_begin
134		168
135	These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)	169	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
136	or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick	170	returns directly I<after> the tick processing (and consequently, can only wake one process
137	processing has been done. Call C<< ->wait >> on them to maximise the	171	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
138	window of cpu time available, or simply to synchronise to the server tick.	172
		173	=item @cf::INVOKE_RESULTS
		174
		175	This array contains the results of the last C<invoke ()> call. When
		176	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
		177	that call.
139		178
140	=back	179	=back
141		180
142	=cut	181	=cut
143		182
144	BEGIN {	183	BEGIN {
145	*CORE::GLOBAL::warn = sub {	184	*CORE::GLOBAL::warn = sub {
146	my $msg = join "", @_;	185	my $msg = join "", @_;
147	utf8::encode $msg;
148		186
149	$msg .= "\n"	187	$msg .= "\n"
150	unless $msg =~ /\n$/;	188	unless $msg =~ /\n$/;
151		189
		190	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
		191
		192	utf8::encode $msg;
152	LOG llevError, $msg;	193	LOG llevError, $msg;
153	};	194	};
154	}	195	}
155		196
156	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	197	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
157	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	198	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
158	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	199	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
159	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	200	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
160	@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';	201	@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
		202	@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
161	@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';	203	@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
162		204
163	# we bless all objects into (empty) derived classes to force a method lookup	205	# we bless all objects into (empty) derived classes to force a method lookup
164	# within the Safe compartment.	206	# within the Safe compartment.
165	for my $pkg (qw(	207	for my $pkg (qw(
166	cf::global cf::attachable	208	cf::global cf::attachable
…		…
174	}	216	}
175		217
176	$Event::DIED = sub {	218	$Event::DIED = sub {
177	warn "error in event callback: @_";	219	warn "error in event callback: @_";
178	};	220	};
		221
		222	#############################################################################
179		223
180	=head2 UTILITY FUNCTIONS	224	=head2 UTILITY FUNCTIONS
181		225
182	=over 4	226	=over 4
183		227
…		…
202	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	246	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
203	$d	247	$d
204	} || "[unable to dump $_[0]: '$@']";	248	} || "[unable to dump $_[0]: '$@']";
205	}	249	}
206		250
207	use JSON::Syck (); # TODO# replace by JSON::PC once working
208
209	=item $ref = cf::from_json $json	251	=item $ref = cf::from_json $json
210		252
211	Converts a JSON string into the corresponding perl data structure.	253	Converts a JSON string into the corresponding perl data structure.
212		254
213	=cut
214
215	sub from_json($) {
216	$JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
217	JSON::Syck::Load $_[0]
218	}
219
220	=item $json = cf::to_json $ref	255	=item $json = cf::to_json $ref
221		256
222	Converts a perl data structure into its JSON representation.	257	Converts a perl data structure into its JSON representation.
223		258
224	=cut	259	=cut
225		260
226	sub to_json($) {	261	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
227	$JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs	262
228	JSON::Syck::Dump $_[0]	263	sub to_json ($) { $json_coder->encode ($_[0]) }
229	}	264	sub from_json ($) { $json_coder->decode ($_[0]) }
230		265
231	=item cf::lock_wait $string	266	=item cf::lock_wait $string
232		267
233	Wait until the given lock is available. See cf::lock_acquire.	268	Wait until the given lock is available. See cf::lock_acquire.
234		269
…		…
237	Wait until the given lock is available and then acquires it and returns	272	Wait until the given lock is available and then acquires it and returns
238	a Coro::guard object. If the guard object gets destroyed (goes out of scope,	273	a Coro::guard object. If the guard object gets destroyed (goes out of scope,
239	for example when the coroutine gets canceled), the lock is automatically	274	for example when the coroutine gets canceled), the lock is automatically
240	returned.	275	returned.
241		276
		277	Locks are *not* recursive, locking from the same coro twice results in a
		278	deadlocked coro.
		279
242	Lock names should begin with a unique identifier (for example, cf::map::find	280	Lock names should begin with a unique identifier (for example, cf::map::find
243	uses map_find and cf::map::load uses map_load).	281	uses map_find and cf::map::load uses map_load).
244		282
		283	=item $locked = cf::lock_active $string
		284
		285	Return true if the lock is currently active, i.e. somebody has locked it.
		286
245	=cut	287	=cut
246		288
247	our %LOCK;	289	our %LOCK;
		290	our %LOCKER;#d#
248		291
249	sub lock_wait($) {	292	sub lock_wait($) {
250	my ($key) = @_;	293	my ($key) = @_;
		294
		295	if ($LOCKER{$key} == $Coro::current) {#d#
		296	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
		297	return;#d#
		298	}#d#
251		299
252	# wait for lock, if any	300	# wait for lock, if any
253	while ($LOCK{$key}) {	301	while ($LOCK{$key}) {
254	push @{ $LOCK{$key} }, $Coro::current;	302	push @{ $LOCK{$key} }, $Coro::current;
255	Coro::schedule;	303	Coro::schedule;
…		…
261		309
262	# wait, to be sure we are not locked	310	# wait, to be sure we are not locked
263	lock_wait $key;	311	lock_wait $key;
264		312
265	$LOCK{$key} = [];	313	$LOCK{$key} = [];
		314	$LOCKER{$key} = $Coro::current;#d#
266		315
267	Coro::guard {	316	Coro::guard {
		317	delete $LOCKER{$key};#d#
268	# wake up all waiters, to be on the safe side	318	# wake up all waiters, to be on the safe side
269	$_->ready for @{ delete $LOCK{$key} };	319	$_->ready for @{ delete $LOCK{$key} };
270	}	320	}
		321	}
		322
		323	sub lock_active($) {
		324	my ($key) = @_;
		325
		326	! ! $LOCK{$key}
271	}	327	}
272		328
273	sub freeze_mainloop {	329	sub freeze_mainloop {
274	return unless $TICK_WATCHER->is_active;	330	return unless $TICK_WATCHER->is_active;
275		331
…		…
278	};	334	};
279	$TICK_WATCHER->stop;	335	$TICK_WATCHER->stop;
280	$guard	336	$guard
281	}	337	}
282		338
		339	=item cf::get_slot $time[, $priority[, $name]]
		340
		341	Allocate $time seconds of blocking CPU time at priority C<$priority>:
		342	This call blocks and returns only when you have at least C<$time> seconds
		343	of cpu time till the next tick. The slot is only valid till the next cede.
		344
		345	The optional C<$name> can be used to identify the job to run. It might be
		346	used for statistical purposes and should identify the same time-class.
		347
		348	Useful for short background jobs.
		349
		350	=cut
		351
		352	our @SLOT_QUEUE;
		353	our $SLOT_QUEUE;
		354
		355	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
		356	$SLOT_QUEUE = Coro::async {
		357	my $signal = new Coro::Signal;
		358
		359	while () {
		360	next_job:
		361	my $avail = cf::till_tick;
		362	if ($avail > 0.01) {
		363	for (0 .. $#SLOT_QUEUE) {
		364	if ($SLOT_QUEUE[$_][0] < $avail) {
		365	my $job = splice @SLOT_QUEUE, $_, 1, ();
		366	$job->[2]->send;
		367	Coro::cede;
		368	goto next_job;
		369	}
		370	}
		371	}
		372
		373	if (@SLOT_QUEUE) {
		374	# we do not use wait_For_tick() as it returns immediately when tick is inactive
		375	push @cf::WAIT_FOR_TICK, $signal;
		376	$signal->wait;
		377	} else {
		378	Coro::schedule;
		379	}
		380	}
		381	};
		382
		383	sub get_slot($;$$) {
		384	my ($time, $pri, $name) = @_;
		385
		386	$time = $TICK * .6 if $time > $TICK * .6;
		387	my $sig = new Coro::Signal;
		388
		389	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
		390	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
		391	$SLOT_QUEUE->ready;
		392	$sig->wait;
		393	}
		394
283	=item cf::async { BLOCK }	395	=item cf::async { BLOCK }
284		396
285	Currently the same as Coro::async_pool, meaning you cannot use	397	Currently the same as Coro::async_pool, meaning you cannot use
286	C<on_destroy>, C<join> or other gimmicks on these coroutines. The only	398	C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
287	thing you are allowed to do is call C<prio> on it.	399	thing you are allowed to do is call C<prio> on it.
…		…
290		402
291	BEGIN { *async = \&Coro::async_pool }	403	BEGIN { *async = \&Coro::async_pool }
292		404
293	=item cf::sync_job { BLOCK }	405	=item cf::sync_job { BLOCK }
294		406
295	The design of crossfire+ requires that the main coro ($Coro::main) is	407	The design of Crossfire TRT requires that the main coroutine ($Coro::main)
296	always able to handle events or runnable, as crossfire+ is only partly	408	is always able to handle events or runnable, as Crossfire TRT is only
297	reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable.	409	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
		410	acceptable.
298		411
299	If it must be done, put the blocking parts into C<sync_job>. This will run	412	If it must be done, put the blocking parts into C<sync_job>. This will run
300	the given BLOCK in another coroutine while waiting for the result. The	413	the given BLOCK in another coroutine while waiting for the result. The
301	server will be frozen during this time, so the block should either finish	414	server will be frozen during this time, so the block should either finish
302	fast or be very important.	415	fast or be very important.
…		…
305		418
306	sub sync_job(&) {	419	sub sync_job(&) {
307	my ($job) = @_;	420	my ($job) = @_;
308		421
309	if ($Coro::current == $Coro::main) {	422	if ($Coro::current == $Coro::main) {
		423	my $time = Event::time;
		424
310	# this is the main coro, too bad, we have to block	425	# this is the main coro, too bad, we have to block
311	# till the operation succeeds, freezing the server :/	426	# till the operation succeeds, freezing the server :/
312		427
313	# TODO: use suspend/resume instead	428	# TODO: use suspend/resume instead
314	# (but this is cancel-safe)	429	# (but this is cancel-safe)
…		…
325		440
326	while ($busy) {	441	while ($busy) {
327	Coro::cede or Event::one_event;	442	Coro::cede or Event::one_event;
328	}	443	}
329		444
		445	$time = Event::time - $time;
		446
		447	LOG llevError | logBacktrace, Carp::longmess "long sync job"
		448	if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
		449
		450	$tick_start += $time; # do not account sync jobs to server load
		451
330	wantarray ? @res : $res[0]	452	wantarray ? @res : $res[0]
331	} else {	453	} else {
332	# we are in another coroutine, how wonderful, everything just works	454	# we are in another coroutine, how wonderful, everything just works
333		455
334	$job->()	456	$job->()
…		…
353	$EXT_CORO{$coro+0} = $coro;	475	$EXT_CORO{$coro+0} = $coro;
354		476
355	$coro	477	$coro
356	}	478	}
357		479
358	sub write_runtime {	480	=item fork_call { }, $args
359	my $guard = cf::lock_acquire "write_runtime";
360		481
361	my $runtime = cf::localdir . "/runtime";	482	Executes the given code block with the given arguments in a seperate
		483	process, returning the results. Everything must be serialisable with
		484	Coro::Storable. May, of course, block. Note that the executed sub may
		485	never block itself or use any form of Event handling.
362		486
363	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644	487	=cut
364	or return;
365		488
366	my $value = $cf::RUNTIME + 90 + 10;	489	sub fork_call(&@) {
367	# 10 is the runtime save interval, for a monotonic clock	490	my ($cb, @args) = @_;
368	# 60 allows for the watchdog to kill the server.
369		491
370	(aio_write $fh, 0, (length $value), $value, 0) <= 0	492	# we seemingly have to make a local copy of the whole thing,
371	and return;	493	# otherwise perl prematurely frees the stuff :/
		494	# TODO: investigate and fix (likely this will be rather laborious)
372		495
373	# always fsync - this file is important	496	my @res = Coro::Util::fork_eval {
374	aio_fsync $fh	497	reset_signals;
375	and return;	498	&$cb
		499	}, @args;
376		500
377	close $fh	501	wantarray ? @res : $res[-1]
378	or return;	502	}
379		503
380	aio_rename "$runtime~", $runtime	504	=item $value = cf::db_get $family => $key
381	and return;
382		505
		506	Returns a single value from the environment database.
		507
		508	=item cf::db_put $family => $key => $value
		509
		510	Stores the given C<$value> in the family. It can currently store binary
		511	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
		512
		513	=cut
		514
		515	our $DB;
		516
		517	sub db_init {
		518	unless ($DB) {
		519	$DB = BDB::db_create $DB_ENV;
		520
		521	cf::sync_job {
		522	eval {
		523	$DB->set_flags (BDB::CHKSUM);
		524
		525	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
		526	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
		527	cf::cleanup "db_open(db): $!" if $!;
		528	};
		529	cf::cleanup "db_open(db): $@" if $@;
		530	};
383	1	531	}
		532	}
		533
		534	sub db_get($$) {
		535	my $key = "$_[0]/$_[1]";
		536
		537	cf::sync_job {
		538	BDB::db_get $DB, undef, $key, my $data;
		539
		540	$! ? ()
		541	: $data
		542	}
		543	}
		544
		545	sub db_put($$$) {
		546	BDB::dbreq_pri 4;
		547	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
		548	}
		549
		550	=item cf::cache $id => [$paths...], $processversion => $process
		551
		552	Generic caching function that returns the value of the resource $id,
		553	caching and regenerating as required.
		554
		555	This function can block.
		556
		557	=cut
		558
		559	sub cache {
		560	my ($id, $src, $processversion, $process) = @_;
		561
		562	my $meta =
		563	join "\x00",
		564	$processversion,
		565	map {
		566	aio_stat $_
		567	and Carp::croak "$_: $!";
		568
		569	($_, (stat _)[7,9])
		570	} @$src;
		571
		572	my $dbmeta = db_get cache => "$id/meta";
		573	if ($dbmeta ne $meta) {
		574	# changed, we may need to process
		575
		576	my @data;
		577	my $md5;
		578
		579	for (0 .. $#$src) {
		580	0 <= aio_load $src->[$_], $data[$_]
		581	or Carp::croak "$src->[$_]: $!";
		582	}
		583
		584	# if processing is expensive, check
		585	# checksum first
		586	if (1) {
		587	$md5 =
		588	join "\x00",
		589	$processversion,
		590	map {
		591	cf::cede_to_tick;
		592	($src->[$_], Digest::MD5::md5_hex $data[$_])
		593	} 0.. $#$src;
		594
		595
		596	my $dbmd5 = db_get cache => "$id/md5";
		597	if ($dbmd5 eq $md5) {
		598	db_put cache => "$id/meta", $meta;
		599
		600	return db_get cache => "$id/data";
		601	}
		602	}
		603
		604	my $t1 = Time::HiRes::time;
		605	my $data = $process->(\@data);
		606	my $t2 = Time::HiRes::time;
		607
		608	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
		609
		610	db_put cache => "$id/data", $data;
		611	db_put cache => "$id/md5" , $md5;
		612	db_put cache => "$id/meta", $meta;
		613
		614	return $data;
		615	}
		616
		617	db_get cache => "$id/data"
		618	}
		619
		620	=item cf::datalog type => key => value, ...
		621
		622	Log a datalog packet of the given type with the given key-value pairs.
		623
		624	=cut
		625
		626	sub datalog($@) {
		627	my ($type, %kv) = @_;
		628	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
384	}	629	}
385		630
386	=back	631	=back
387		632
388	=cut	633	=cut
…		…
395	attach callbacks/event handlers (a collection of which is called an "attachment")	640	attach callbacks/event handlers (a collection of which is called an "attachment")
396	to it. All such attachable objects support the following methods.	641	to it. All such attachable objects support the following methods.
397		642
398	In the following description, CLASS can be any of C<global>, C<object>	643	In the following description, CLASS can be any of C<global>, C<object>
399	C<player>, C<client> or C<map> (i.e. the attachable objects in	644	C<player>, C<client> or C<map> (i.e. the attachable objects in
400	crossfire+).	645	Crossfire TRT).
401		646
402	=over 4	647	=over 4
403		648
404	=item $attachable->attach ($attachment, key => $value...)	649	=item $attachable->attach ($attachment, key => $value...)
405		650
…		…
568	$registry = $CB_TYPE[$object_type] ||= [];	813	$registry = $CB_TYPE[$object_type] ||= [];
569		814
570	} elsif ($type eq "subtype") {	815	} elsif ($type eq "subtype") {
571	defined $object_type or Carp::croak "subtype specified without type";	816	defined $object_type or Carp::croak "subtype specified without type";
572	my $object_subtype = shift @arg;	817	my $object_subtype = shift @arg;
573	$registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= [];	818	$registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
574		819
575	} elsif ($type eq "package") {	820	} elsif ($type eq "package") {
576	my $pkg = shift @arg;	821	my $pkg = shift @arg;
577		822
578	while (my ($name, $id) = each %cb_id) {	823	while (my ($name, $id) = each %cb_id) {
…		…
607	_attach $registry, $klass, @attach;	852	_attach $registry, $klass, @attach;
608	}	853	}
609		854
610	$obj->{$name} = \%arg;	855	$obj->{$name} = \%arg;
611	} else {	856	} else {
612	warn "object uses attachment '$name' that is not available, postponing.\n";	857	warn "object uses attachment '$name' which is not available, postponing.\n";
613	}	858	}
614		859
615	$obj->{_attachment}{$name} = undef;	860	$obj->{_attachment}{$name} = undef;
616	}	861	}
617		862
…		…
619	if (ref $_[0]) {	864	if (ref $_[0]) {
620	_object_attach @_;	865	_object_attach @_;
621	} else {	866	} else {
622	_attach shift->_attach_registry, @_;	867	_attach shift->_attach_registry, @_;
623	}	868	}
		869	_recalc_want;
624	};	870	};
625		871
626	# all those should be optimised	872	# all those should be optimised
627	sub cf::attachable::detach {	873	sub cf::attachable::detach {
628	my ($obj, $name) = @_;	874	my ($obj, $name) = @_;
…		…
631	delete $obj->{_attachment}{$name};	877	delete $obj->{_attachment}{$name};
632	reattach ($obj);	878	reattach ($obj);
633	} else {	879	} else {
634	Carp::croak "cannot, currently, detach class attachments";	880	Carp::croak "cannot, currently, detach class attachments";
635	}	881	}
		882	_recalc_want;
636	};	883	};
637		884
638	sub cf::attachable::attached {	885	sub cf::attachable::attached {
639	my ($obj, $name) = @_;	886	my ($obj, $name) = @_;
640		887
…		…
655	";	902	";
656	die if $@;	903	die if $@;
657	}	904	}
658		905
659	our $override;	906	our $override;
660	our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?	907	our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
661		908
662	sub override {	909	sub override {
663	$override = 1;	910	$override = 1;
664	@invoke_results = ();	911	@INVOKE_RESULTS = (@_);
665	}	912	}
666		913
667	sub do_invoke {	914	sub do_invoke {
668	my $event = shift;	915	my $event = shift;
669	my $callbacks = shift;	916	my $callbacks = shift;
670		917
671	@invoke_results = ();	918	@INVOKE_RESULTS = ();
672		919
673	local $override;	920	local $override;
674		921
675	for (@$callbacks) {	922	for (@$callbacks) {
676	eval { &{$_->[1]} };	923	eval { &{$_->[1]} };
…		…
693		940
694	Generate an object-specific event with the given arguments.	941	Generate an object-specific event with the given arguments.
695		942
696	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be	943	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
697	removed in future versions), and there is no public API to access override	944	removed in future versions), and there is no public API to access override
698	results (if you must, access C<@cf::invoke_results> directly).	945	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
699		946
700	=back	947	=back
701		948
702	=cut	949	=cut
703		950
704	#############################################################################	951	#############################################################################
705	# object support	952	# object support
		953	#
		954
		955	sub _can_merge {
		956	my ($ob1, $ob2) = @_;
		957
		958	local $Storable::canonical = 1;
		959	my $fob1 = Storable::freeze $ob1;
		960	my $fob2 = Storable::freeze $ob2;
		961
		962	$fob1 eq $fob2
		963	}
706		964
707	sub reattach {	965	sub reattach {
708	# basically do the same as instantiate, without calling instantiate	966	# basically do the same as instantiate, without calling instantiate
709	my ($obj) = @_;	967	my ($obj) = @_;
710		968
…		…
754	},	1012	},
755	);	1013	);
756		1014
757	sub object_freezer_save {	1015	sub object_freezer_save {
758	my ($filename, $rdata, $objs) = @_;	1016	my ($filename, $rdata, $objs) = @_;
		1017
		1018	my $guard = cf::lock_acquire "io";
759		1019
760	sync_job {	1020	sync_job {
761	if (length $$rdata) {	1021	if (length $$rdata) {
762	warn sprintf "saving %s (%d,%d)\n",	1022	warn sprintf "saving %s (%d,%d)\n",
763	$filename, length $$rdata, scalar @$objs;	1023	$filename, length $$rdata, scalar @$objs;
…		…
787	}	1047	}
788	} else {	1048	} else {
789	aio_unlink $filename;	1049	aio_unlink $filename;
790	aio_unlink "$filename.pst";	1050	aio_unlink "$filename.pst";
791	}	1051	}
792	}	1052	};
		1053
		1054	undef $guard;
793	}	1055	}
794		1056
795	sub object_freezer_as_string {	1057	sub object_freezer_as_string {
796	my ($rdata, $objs) = @_;	1058	my ($rdata, $objs) = @_;
797		1059
…		…
802		1064
803	sub object_thawer_load {	1065	sub object_thawer_load {
804	my ($filename) = @_;	1066	my ($filename) = @_;
805		1067
806	my ($data, $av);	1068	my ($data, $av);
		1069
		1070	my $guard = cf::lock_acquire "io";
807		1071
808	(aio_load $filename, $data) >= 0	1072	(aio_load $filename, $data) >= 0
809	or return;	1073	or return;
810		1074
811	unless (aio_stat "$filename.pst") {	1075	unless (aio_stat "$filename.pst") {
812	(aio_load "$filename.pst", $av) >= 0	1076	(aio_load "$filename.pst", $av) >= 0
813	or return;	1077	or return;
		1078
		1079	undef $guard;
814	$av = eval { (Storable::thaw $av)->{objs} };	1080	$av = eval { (Storable::thaw $av)->{objs} };
815	}	1081	}
816		1082
817	warn sprintf "loading %s (%d)\n",	1083	warn sprintf "loading %s (%d)\n",
818	$filename, length $data, scalar @{$av || []};#d#	1084	$filename, length $data, scalar @{$av || []};
		1085
819	return ($data, $av);	1086	($data, $av)
820	}	1087	}
		1088
		1089	=head2 COMMAND CALLBACKS
		1090
		1091	=over 4
		1092
		1093	=cut
821		1094
822	#############################################################################	1095	#############################################################################
823	# command handling &c	1096	# command handling &c
824		1097
825	=item cf::register_command $name => \&callback($ob,$args);	1098	=item cf::register_command $name => \&callback($ob,$args);
…		…
838	push @{ $COMMAND{$name} }, [$caller, $cb];	1111	push @{ $COMMAND{$name} }, [$caller, $cb];
839	}	1112	}
840		1113
841	=item cf::register_extcmd $name => \&callback($pl,$packet);	1114	=item cf::register_extcmd $name => \&callback($pl,$packet);
842		1115
843	Register a callbackf ro execution when the client sends an extcmd packet.	1116	Register a callback for execution when the client sends an (synchronous)
		1117	extcmd packet. Ext commands will be processed in the order they are
		1118	received by the server, like other user commands. The first argument is
		1119	the logged-in player. Ext commands can only be processed after a player
		1120	has logged in successfully.
844		1121
845	If the callback returns something, it is sent back as if reply was being	1122	If the callback returns something, it is sent back as if reply was being
846	called.	1123	called.
847		1124
		1125	=item cf::register_exticmd $name => \&callback($ns,$packet);
		1126
		1127	Register a callback for execution when the client sends an (asynchronous)
		1128	exticmd packet. Exti commands are processed by the server as soon as they
		1129	are received, i.e. out of order w.r.t. other commands. The first argument
		1130	is a client socket. Exti commands can be received anytime, even before
		1131	log-in.
		1132
		1133	If the callback returns something, it is sent back as if reply was being
		1134	called.
		1135
848	=cut	1136	=cut
849		1137
850	sub register_extcmd {	1138	sub register_extcmd {
851	my ($name, $cb) = @_;	1139	my ($name, $cb) = @_;
852		1140
853	$EXTCMD{$name} = $cb;	1141	$EXTCMD{$name} = $cb;
		1142	}
		1143
		1144	sub register_exticmd {
		1145	my ($name, $cb) = @_;
		1146
		1147	$EXTICMD{$name} = $cb;
854	}	1148	}
855		1149
856	cf::player->attach (	1150	cf::player->attach (
857	on_command => sub {	1151	on_command => sub {
858	my ($pl, $name, $params) = @_;	1152	my ($pl, $name, $params) = @_;
…		…
867	cf::override;	1161	cf::override;
868	},	1162	},
869	on_extcmd => sub {	1163	on_extcmd => sub {
870	my ($pl, $buf) = @_;	1164	my ($pl, $buf) = @_;
871		1165
872	my $msg = eval { from_json $buf };	1166	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
873		1167
874	if (ref $msg) {	1168	if (ref $msg) {
		1169	my ($type, $reply, @payload) =
		1170	"ARRAY" eq ref $msg
		1171	? @$msg
		1172	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1173
		1174	my @reply;
		1175
875	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1176	if (my $cb = $EXTCMD{$type}) {
876	if (my %reply = $cb->($pl, $msg)) {	1177	@reply = $cb->($pl, @payload);
877	$pl->ext_reply ($msg->{msgid}, %reply);
878	}
879	}	1178	}
		1179
		1180	$pl->ext_reply ($reply, @reply)
		1181	if $reply;
		1182
880	} else {	1183	} else {
881	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1184	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
882	}	1185	}
883		1186
884	cf::override;	1187	cf::override;
885	},	1188	},
886	);	1189	);
887		1190
888	sub load_extension {
889	my ($path) = @_;
890
891	$path =~ /([^\/\\]+)\.ext$/ or die "$path";
892	my $base = $1;
893	my $pkg = $1;
894	$pkg =~ s/[^[:word:]]/_/g;
895	$pkg = "ext::$pkg";
896
897	warn "... loading '$path' into '$pkg'\n";
898
899	open my $fh, "<:utf8", $path
900	or die "$path: $!";
901
902	my $source =
903	"package $pkg; use strict; use utf8;\n"
904	. "#line 1 \"$path\"\n{\n"
905	. (do { local $/; <$fh> })
906	. "\n};\n1";
907
908	unless (eval $source) {
909	my $msg = $@ ? "$path: $@\n"
910	: "extension disabled.\n";
911	if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
912	warn $@;
913	warn "mandatory extension failed to load, exiting.\n";
914	exit 1;
915	}
916	die $@;
917	}
918
919	push @EXTS, $pkg;
920	}
921
922	sub load_extensions {	1191	sub load_extensions {
		1192	cf::sync_job {
		1193	my %todo;
		1194
923	for my $ext (<$LIBDIR/*.ext>) {	1195	for my $path (<$LIBDIR/*.ext>) {
924	next unless -r $ext;	1196	next unless -r $path;
925	eval {	1197
926	load_extension $ext;	1198	$path =~ /([^\/\\]+)\.ext$/ or die "$path";
		1199	my $base = $1;
		1200	my $pkg = $1;
		1201	$pkg =~ s/[^[:word:]]/_/g;
		1202	$pkg = "ext::$pkg";
		1203
		1204	open my $fh, "<:utf8", $path
		1205	or die "$path: $!";
		1206
		1207	my $source = do { local $/; <$fh> };
		1208
		1209	my %ext = (
		1210	path => $path,
		1211	base => $base,
		1212	pkg => $pkg,
		1213	);
		1214
		1215	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
		1216	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
		1217
		1218	$ext{source} =
		1219	"package $pkg; use strict; use utf8;\n"
		1220	. "#line 1 \"$path\"\n{\n"
		1221	. $source
		1222	. "\n};\n1";
		1223
		1224	$todo{$base} = \%ext;
		1225	}
		1226
		1227	my %done;
		1228	while (%todo) {
		1229	my $progress;
		1230
		1231	while (my ($k, $v) = each %todo) {
		1232	for (split /,\s*/, $v->{meta}{depends}) {
		1233	goto skip
		1234	unless exists $done{$_};
		1235	}
		1236
		1237	warn "... loading '$k' into '$v->{pkg}'\n";
		1238
		1239	unless (eval $v->{source}) {
		1240	my $msg = $@ ? "$v->{path}: $@\n"
		1241	: "$v->{base}: extension inactive.\n";
		1242
		1243	if (exists $v->{meta}{mandatory}) {
		1244	warn $msg;
		1245	warn "mandatory extension failed to load, exiting.\n";
		1246	exit 1;
		1247	}
		1248
		1249	warn $msg;
		1250	}
		1251
		1252	$done{$k} = delete $todo{$k};
		1253	push @EXTS, $v->{pkg};
		1254	$progress = 1;
927	1	1255	}
928	} or warn "$ext not loaded: $@";	1256
		1257	skip:
		1258	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
		1259	unless $progress;
		1260	}
929	}	1261	};
930	}	1262	}
931		1263
932	#############################################################################	1264	#############################################################################
933		1265
		1266	=back
		1267
934	=head2 CORE EXTENSIONS	1268	=head2 CORE EXTENSIONS
935		1269
936	Functions and methods that extend core crossfire objects.	1270	Functions and methods that extend core crossfire objects.
937		1271
938	=cut	1272	=cut
…		…
950	Returns the given player object, loading it if necessary (might block).	1284	Returns the given player object, loading it if necessary (might block).
951		1285
952	=cut	1286	=cut
953		1287
954	sub playerdir($) {	1288	sub playerdir($) {
955	cf::localdir	1289	"$PLAYERDIR/"
956	. "/"
957	. cf::playerdir
958	. "/"
959	. (ref $_[0] ? $_[0]->ob->name : $_[0])	1290	. (ref $_[0] ? $_[0]->ob->name : $_[0])
960	}	1291	}
961		1292
962	sub path($) {	1293	sub path($) {
963	my $login = ref $_[0] ? $_[0]->ob->name : $_[0];	1294	my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
964		1295
965	(playerdir $login) . "/$login.pl"	1296	(playerdir $login) . "/playerdata"
966	}	1297	}
967		1298
968	sub find_active($) {	1299	sub find_active($) {
969	$cf::PLAYER{$_[0]}	1300	$cf::PLAYER{$_[0]}
970	and $cf::PLAYER{$_[0]}->active	1301	and $cf::PLAYER{$_[0]}->active
…		…
983	my $login = $_[0];	1314	my $login = $_[0];
984		1315
985	my $guard = cf::lock_acquire "user_find:$login";	1316	my $guard = cf::lock_acquire "user_find:$login";
986		1317
987	$cf::PLAYER{$_[0]} || do {	1318	$cf::PLAYER{$_[0]} || do {
988	my $pl = load_pl path $login	1319	# rename old playerfiles to new ones
		1320	#TODO: remove when no longer required
		1321	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
		1322	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
		1323	aio_unlink +(playerdir $login) . "/$login.pl.pst";
		1324	aio_unlink +(playerdir $login) . "/$login.pl";
		1325
		1326	my $f = new_from_file cf::object::thawer path $login
989	or return;	1327	or return;
		1328
		1329	$f->next;
		1330	my $pl = cf::player::load_pl $f
		1331	or return;
		1332	local $cf::PLAYER_LOADING{$login} = $pl;
		1333	$f->resolve_delayed_derefs;
990	$cf::PLAYER{$login} = $pl	1334	$cf::PLAYER{$login} = $pl
991	}	1335	}
992	}	1336	}
993	}	1337	}
994		1338
…		…
1004		1348
1005	aio_mkdir playerdir $pl, 0770;	1349	aio_mkdir playerdir $pl, 0770;
1006	$pl->{last_save} = $cf::RUNTIME;	1350	$pl->{last_save} = $cf::RUNTIME;
1007		1351
1008	$pl->save_pl ($path);	1352	$pl->save_pl ($path);
1009	Coro::cede;	1353	cf::cede_to_tick;
1010	}	1354	}
1011		1355
1012	sub new($) {	1356	sub new($) {
1013	my ($login) = @_;	1357	my ($login) = @_;
1014		1358
…		…
1018	$self->{deny_save} = 1;	1362	$self->{deny_save} = 1;
1019		1363
1020	$cf::PLAYER{$login} = $self;	1364	$cf::PLAYER{$login} = $self;
1021		1365
1022	$self	1366	$self
		1367	}
		1368
		1369	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1370
		1371	=cut
		1372
		1373	sub send_msg {
		1374	my $ns = shift->ns
		1375	or return;
		1376	$ns->send_msg (@_);
1023	}	1377	}
1024		1378
1025	=item $pl->quit_character	1379	=item $pl->quit_character
1026		1380
1027	Nukes the player without looking back. If logged in, the connection will	1381	Nukes the player without looking back. If logged in, the connection will
…		…
1076	while and may block, so not sync_job-capable, ever.	1430	while and may block, so not sync_job-capable, ever.
1077		1431
1078	=cut	1432	=cut
1079		1433
1080	sub list_logins {	1434	sub list_logins {
1081	my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir	1435	my $dirs = aio_readdir $PLAYERDIR
1082	or return [];	1436	or return [];
1083		1437
1084	my @logins;	1438	my @logins;
1085		1439
1086	for my $login (@$dirs) {	1440	for my $login (@$dirs) {
		1441	my $path = path $login;
		1442
		1443	# a .pst is a dead give-away for a valid player
		1444	unless (-e "$path.pst") {
1087	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1445	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1088	aio_read $fh, 0, 512, my $buf, 0 or next;	1446	aio_read $fh, 0, 512, my $buf, 0 or next;
1089	$buf !~ /^password -------------$/m or next; # official not-valid tag	1447	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1448	}
1090		1449
1091	utf8::decode $login;	1450	utf8::decode $login;
1092	push @logins, $login;	1451	push @logins, $login;
1093	}	1452	}
1094		1453
…		…
1121	}	1480	}
1122		1481
1123	\@paths	1482	\@paths
1124	}	1483	}
1125		1484
		1485	=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
		1486
		1487	Expand crossfire pod fragments into protocol xml.
		1488
		1489	=cut
		1490
		1491	sub expand_cfpod {
		1492	((my $self), (local $_)) = @_;
		1493
		1494	# escape & and <
		1495	s/&/&amp;/g;
		1496	s/(?<![BIUGHT])</&lt;/g;
		1497
		1498	# this is buggy, it needs to properly take care of nested <'s
		1499
		1500	1 while
		1501	# replace B<>, I<>, U<> etc.
		1502	s/B<([^\>]*)>/<b>$1<\/b>/
		1503	|| s/I<([^\>]*)>/<i>$1<\/i>/
		1504	|| s/U<([^\>]*)>/<u>$1<\/u>/
		1505	|| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
		1506	# replace G<male|female> tags
		1507	|| s{G<([^>|]*)\|([^>]*)>}{
		1508	$self->gender ? $2 : $1
		1509	}ge
		1510	# replace H<hint text>
		1511	|| s{H<([^\>]*)>}
		1512	{
		1513	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
		1514	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
		1515	"")
		1516	[$self->{hintmode}]
		1517	}ge;
		1518
		1519	# create single paragraphs (very hackish)
		1520	s/(?<=\S)\n(?=\w)/ /g;
		1521
		1522	# compress some whitespace
		1523	s/\s+\n/\n/g; # ws line-ends
		1524	s/\n\n+/\n/g; # double lines
		1525	s/^\n+//; # beginning lines
		1526	s/\n+$//; # ending lines
		1527
		1528	$_
		1529	}
		1530
		1531	sub hintmode {
		1532	$_[0]{hintmode} = $_[1] if @_ > 1;
		1533	$_[0]{hintmode}
		1534	}
		1535
1126	=item $player->ext_reply ($msgid, $msgtype, %msg)	1536	=item $player->ext_reply ($msgid, @msg)
1127		1537
1128	Sends an ext reply to the player.	1538	Sends an ext reply to the player.
1129		1539
1130	=cut	1540	=cut
1131		1541
1132	sub ext_reply($$$%) {	1542	sub ext_reply($$@) {
1133	my ($self, $id, %msg) = @_;	1543	my ($self, $id, @msg) = @_;
1134		1544
1135	$msg{msgid} = $id;	1545	$self->ns->ext_reply ($id, @msg)
1136
1137	$self->send ("ext " . cf::to_json \%msg);
1138	}	1546	}
1139		1547
1140	package cf;	1548	=item $player->ext_msg ($type, @msg)
		1549
		1550	Sends an ext event to the client.
		1551
		1552	=cut
		1553
		1554	sub ext_msg($$@) {
		1555	my ($self, $type, @msg) = @_;
		1556
		1557	$self->ns->ext_msg ($type, @msg);
		1558	}
		1559
		1560	=head3 cf::region
		1561
		1562	=over 4
		1563
		1564	=cut
		1565
		1566	package cf::region;
		1567
		1568	=item cf::region::find_by_path $path
		1569
		1570	Tries to decuce the likely region for a map knowing only its path.
		1571
		1572	=cut
		1573
		1574	sub find_by_path($) {
		1575	my ($path) = @_;
		1576
		1577	my ($match, $specificity);
		1578
		1579	for my $region (list) {
		1580	if ($region->{match} && $path =~ $region->{match}) {
		1581	($match, $specificity) = ($region, $region->specificity)
		1582	if $region->specificity > $specificity;
		1583	}
		1584	}
		1585
		1586	$match
		1587	}
1141		1588
1142	=back	1589	=back
1143
1144		1590
1145	=head3 cf::map	1591	=head3 cf::map
1146		1592
1147	=over 4	1593	=over 4
1148		1594
…		…
1203	my ($self, $merge) = @_;	1649	my ($self, $merge) = @_;
1204		1650
1205	# we have to keep some variables in memory intact	1651	# we have to keep some variables in memory intact
1206	local $self->{path};	1652	local $self->{path};
1207	local $self->{load_path};	1653	local $self->{load_path};
1208	local $self->{deny_save};
1209	local $self->{deny_reset};
1210		1654
1211	$self->SUPER::thawer_merge ($merge);	1655	$self->SUPER::thawer_merge ($merge);
1212	}	1656	}
1213		1657
1214	sub normalise {	1658	sub normalise {
…		…
1261	$self->init; # pass $1 etc.	1705	$self->init; # pass $1 etc.
1262	return $self;	1706	return $self;
1263	}	1707	}
1264	}	1708	}
1265		1709
1266	Carp::carp "unable to resolve path '$path' (base '$base').";	1710	Carp::cluck "unable to resolve path '$path' (base '$base').";
1267	()	1711	()
1268	}	1712	}
1269		1713
1270	sub init {	1714	sub init {
1271	my ($self) = @_;	1715	my ($self) = @_;
…		…
1286		1730
1287	# the original (read-only) location	1731	# the original (read-only) location
1288	sub load_path {	1732	sub load_path {
1289	my ($self) = @_;	1733	my ($self) = @_;
1290		1734
1291	sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}	1735	"$MAPDIR/$self->{path}.map"
1292	}	1736	}
1293		1737
1294	# the temporary/swap location	1738	# the temporary/swap location
1295	sub save_path {	1739	sub save_path {
1296	my ($self) = @_;	1740	my ($self) = @_;
1297		1741
1298	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1742	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1299	sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path	1743	"$TMPDIR/$path.map"
1300	}	1744	}
1301		1745
1302	# the unique path, undef == no special unique path	1746	# the unique path, undef == no special unique path
1303	sub uniq_path {	1747	sub uniq_path {
1304	my ($self) = @_;	1748	my ($self) = @_;
1305		1749
1306	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1750	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1307	sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path	1751	"$UNIQUEDIR/$path"
1308	}	1752	}
1309		1753
1310	# and all this just because we cannot iterate over	1754	# and all this just because we cannot iterate over
1311	# all maps in C++...	1755	# all maps in C++...
1312	sub change_all_map_light {	1756	sub change_all_map_light {
…		…
1314		1758
1315	$_->change_map_light ($change)	1759	$_->change_map_light ($change)
1316	for grep $_->outdoor, values %cf::MAP;	1760	for grep $_->outdoor, values %cf::MAP;
1317	}	1761	}
1318		1762
		1763	sub decay_objects {
		1764	my ($self) = @_;
		1765
		1766	return if $self->{deny_reset};
		1767
		1768	$self->do_decay_objects;
		1769	}
		1770
1319	sub unlink_save {	1771	sub unlink_save {
1320	my ($self) = @_;	1772	my ($self) = @_;
1321		1773
1322	utf8::encode (my $save = $self->save_path);	1774	utf8::encode (my $save = $self->save_path);
1323	IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;	1775	IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
…		…
1326		1778
1327	sub load_header_from($) {	1779	sub load_header_from($) {
1328	my ($self, $path) = @_;	1780	my ($self, $path) = @_;
1329		1781
1330	utf8::encode $path;	1782	utf8::encode $path;
1331	#aio_open $path, O_RDONLY, 0	1783	my $f = new_from_file cf::object::thawer $path
1332	# or return;
1333
1334	$self->_load_header ($path)
1335	or return;	1784	or return;
		1785
		1786	$self->_load_header ($f)
		1787	or return;
		1788
		1789	local $MAP_LOADING{$self->{path}} = $self;
		1790	$f->resolve_delayed_derefs;
1336		1791
1337	$self->{load_path} = $path;	1792	$self->{load_path} = $path;
1338		1793
1339	1	1794	1
1340	}	1795	}
…		…
1379	$self->load_header_orig	1834	$self->load_header_orig
1380	or return;	1835	or return;
1381	$self->prepare_orig;	1836	$self->prepare_orig;
1382	}	1837	}
1383		1838
		1839	$self->{deny_reset} = 1
		1840	if $self->no_reset;
		1841
		1842	$self->default_region (cf::region::find_by_path $self->{path})
		1843	unless $self->default_region;
		1844
1384	1	1845	1
1385	}	1846	}
1386		1847
1387	sub find;	1848	sub find;
1388	sub find {	1849	sub find {
1389	my ($path, $origin) = @_;	1850	my ($path, $origin) = @_;
1390		1851
1391	$path = normalise $path, $origin && $origin->path;	1852	$path = normalise $path, $origin && $origin->path;
1392		1853
		1854	cf::lock_wait "map_data:$path";#d#remove
1393	cf::lock_wait "map_find:$path";	1855	cf::lock_wait "map_find:$path";
1394		1856
1395	$cf::MAP{$path} || do {	1857	$cf::MAP{$path} || do {
1396	my $guard = cf::lock_acquire "map_find:$path";	1858	my $guard1 = cf::lock_acquire "map_find:$path";
		1859	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1860
1397	my $map = new_from_path cf::map $path	1861	my $map = new_from_path cf::map $path
1398	or return;	1862	or return;
1399		1863
1400	$map->{last_save} = $cf::RUNTIME;	1864	$map->{last_save} = $cf::RUNTIME;
1401		1865
1402	$map->load_header	1866	$map->load_header
1403	or return;	1867	or return;
1404		1868
1405	if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)	1869	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1406	# doing this can freeze the server in a sync job, obviously	1870	# doing this can freeze the server in a sync job, obviously
1407	#$cf::WAIT_FOR_TICK->wait;	1871	#$cf::WAIT_FOR_TICK->wait;
		1872	undef $guard1;
		1873	undef $guard2;
1408	$map->reset;	1874	$map->reset;
1409	undef $guard;
1410	return find $path;	1875	return find $path;
1411	}	1876	}
1412		1877
1413	$cf::MAP{$path} = $map	1878	$cf::MAP{$path} = $map
1414	}	1879	}
…		…
1421	my ($self) = @_;	1886	my ($self) = @_;
1422		1887
1423	local $self->{deny_reset} = 1; # loading can take a long time	1888	local $self->{deny_reset} = 1; # loading can take a long time
1424		1889
1425	my $path = $self->{path};	1890	my $path = $self->{path};
		1891
		1892	{
1426	my $guard = cf::lock_acquire "map_load:$path";	1893	my $guard = cf::lock_acquire "map_data:$path";
1427		1894
		1895	return unless $self->valid;
1428	return if $self->in_memory != cf::MAP_SWAPPED;	1896	return unless $self->in_memory == cf::MAP_SWAPPED;
1429		1897
1430	$self->in_memory (cf::MAP_LOADING);	1898	$self->in_memory (cf::MAP_LOADING);
1431		1899
1432	$self->alloc;	1900	$self->alloc;
1433		1901
1434	$self->pre_load;	1902	$self->pre_load;
		1903	cf::cede_to_tick;
1435		1904
1436	$self->_load_objects ($self->{load_path}, 1)	1905	my $f = new_from_file cf::object::thawer $self->{load_path};
		1906	$f->skip_block;
		1907	$self->_load_objects ($f)
1437	or return;	1908	or return;
1438		1909
1439	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1910	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1440	if delete $self->{load_original};	1911	if delete $self->{load_original};
1441		1912
1442	if (my $uniq = $self->uniq_path) {	1913	if (my $uniq = $self->uniq_path) {
1443	utf8::encode $uniq;	1914	utf8::encode $uniq;
1444	if (aio_open $uniq, O_RDONLY, 0) {	1915	unless (aio_stat $uniq) {
		1916	if (my $f = new_from_file cf::object::thawer $uniq) {
1445	$self->clear_unique_items;	1917	$self->clear_unique_items;
1446	$self->_load_objects ($uniq, 0);	1918	$self->_load_objects ($f);
		1919	$f->resolve_delayed_derefs;
		1920	}
1447	}	1921	}
1448	}	1922	}
1449		1923
1450	Coro::cede;	1924	$f->resolve_delayed_derefs;
1451		1925
		1926	cf::cede_to_tick;
1452	# now do the right thing for maps	1927	# now do the right thing for maps
1453	$self->link_multipart_objects;	1928	$self->link_multipart_objects;
1454
1455	unless ($self->{deny_activate}) {
1456	$self->decay_objects;
1457	$self->fix_auto_apply;
1458	$self->update_buttons;
1459	Coro::cede;
1460	$self->set_darkness_map;
1461	$self->difficulty ($self->estimate_difficulty)	1929	$self->difficulty ($self->estimate_difficulty)
1462	unless $self->difficulty;	1930	unless $self->difficulty;
1463	Coro::cede;	1931	cf::cede_to_tick;
		1932
		1933	unless ($self->{deny_activate}) {
		1934	$self->decay_objects;
		1935	$self->fix_auto_apply;
		1936	$self->update_buttons;
		1937	cf::cede_to_tick;
		1938	$self->set_darkness_map;
		1939	cf::cede_to_tick;
1464	$self->activate;	1940	$self->activate;
		1941	}
		1942
		1943	$self->{last_save} = $cf::RUNTIME;
		1944	$self->last_access ($cf::RUNTIME);
		1945
		1946	$self->in_memory (cf::MAP_IN_MEMORY);
1465	}	1947	}
1466		1948
1467	$self->post_load;	1949	$self->post_load;
1468
1469	$self->in_memory (cf::MAP_IN_MEMORY);
1470	}	1950	}
1471		1951
1472	sub customise_for {	1952	sub customise_for {
1473	my ($self, $ob) = @_;	1953	my ($self, $ob) = @_;
1474		1954
1475	return find "~" . $ob->name . "/" . $self->{path}	1955	return find "~" . $ob->name . "/" . $self->{path}
1476	if $self->per_player;	1956	if $self->per_player;
1477		1957
		1958	# return find "?party/" . $ob->name . "/" . $self->{path}
		1959	# if $self->per_party;
		1960
1478	$self	1961	$self
1479	}	1962	}
1480		1963
1481	# find and load all maps in the 3x3 area around a map	1964	# find and load all maps in the 3x3 area around a map
1482	sub load_diag {	1965	sub load_neighbours {
1483	my ($map) = @_;	1966	my ($map) = @_;
1484		1967
1485	my @diag; # diagonal neighbours	1968	my @neigh; # diagonal neighbours
1486		1969
1487	for (0 .. 3) {	1970	for (0 .. 3) {
1488	my $neigh = $map->tile_path ($_)	1971	my $neigh = $map->tile_path ($_)
1489	or next;	1972	or next;
1490	$neigh = find $neigh, $map	1973	$neigh = find $neigh, $map
1491	or next;	1974	or next;
1492	$neigh->load;	1975	$neigh->load;
1493		1976
		1977	push @neigh,
1494	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	1978	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1495	[$neigh->tile_path (($_ + 1) % 4), $neigh];	1979	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1496	}	1980	}
1497		1981
1498	for (@diag) {	1982	for (grep defined $_->[0], @neigh) {
		1983	my ($path, $origin) = @$_;
1499	my $neigh = find @$_	1984	my $neigh = find $path, $origin
1500	or next;	1985	or next;
1501	$neigh->load;	1986	$neigh->load;
1502	}	1987	}
1503	}	1988	}
1504		1989
…		…
1509	}	1994	}
1510		1995
1511	sub do_load_sync {	1996	sub do_load_sync {
1512	my ($map) = @_;	1997	my ($map) = @_;
1513		1998
		1999	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
		2000	if $Coro::current == $Coro::main;
		2001
1514	cf::sync_job { $map->load };	2002	cf::sync_job { $map->load };
1515	}	2003	}
1516		2004
1517	our %MAP_PREFETCH;	2005	our %MAP_PREFETCH;
1518	our $MAP_PREFETCHER = undef;	2006	our $MAP_PREFETCHER = undef;
1519		2007
1520	sub find_async {	2008	sub find_async {
1521	my ($path, $origin) = @_;	2009	my ($path, $origin, $load) = @_;
1522		2010
1523	$path = normalise $path, $origin && $origin->{path};	2011	$path = normalise $path, $origin && $origin->{path};
1524		2012
1525	if (my $map = $cf::MAP{$path}) {	2013	if (my $map = $cf::MAP{$path}) {
1526	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2014	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1527	}	2015	}
1528		2016
1529	undef $MAP_PREFETCH{$path};	2017	$MAP_PREFETCH{$path} |= $load;
		2018
1530	$MAP_PREFETCHER ||= cf::async {	2019	$MAP_PREFETCHER ||= cf::async {
1531	while (%MAP_PREFETCH) {	2020	while (%MAP_PREFETCH) {
1532	for my $path (keys %MAP_PREFETCH) {	2021	while (my ($k, $v) = each %MAP_PREFETCH) {
1533	my $map = find $path	2022	if (my $map = find $k) {
1534	or next;
1535	$map->load;	2023	$map->load if $v;
		2024	}
1536		2025
1537	delete $MAP_PREFETCH{$path};	2026	delete $MAP_PREFETCH{$k};
1538	}	2027	}
1539	}	2028	}
1540	undef $MAP_PREFETCHER;	2029	undef $MAP_PREFETCHER;
1541	};	2030	};
1542	$MAP_PREFETCHER->prio (6);	2031	$MAP_PREFETCHER->prio (6);
…		…
1545	}	2034	}
1546		2035
1547	sub save {	2036	sub save {
1548	my ($self) = @_;	2037	my ($self) = @_;
1549		2038
1550	my $lock = cf::lock_acquire "map_data:" . $self->path;	2039	my $lock = cf::lock_acquire "map_data:$self->{path}";
1551		2040
1552	$self->{last_save} = $cf::RUNTIME;	2041	$self->{last_save} = $cf::RUNTIME;
1553		2042
1554	return unless $self->dirty;	2043	return unless $self->dirty;
1555		2044
…		…
1578	my ($self) = @_;	2067	my ($self) = @_;
1579		2068
1580	# save first because save cedes	2069	# save first because save cedes
1581	$self->save;	2070	$self->save;
1582		2071
1583	my $lock = cf::lock_acquire "map_data:" . $self->path;	2072	my $lock = cf::lock_acquire "map_data:$self->{path}";
1584		2073
1585	return if $self->players;	2074	return if $self->players;
1586	return if $self->in_memory != cf::MAP_IN_MEMORY;	2075	return if $self->in_memory != cf::MAP_IN_MEMORY;
1587	return if $self->{deny_save};	2076	return if $self->{deny_save};
1588		2077
		2078	$self->in_memory (cf::MAP_SWAPPED);
		2079
		2080	$self->deactivate;
		2081	$_->clear_links_to ($self) for values %cf::MAP;
1589	$self->clear;	2082	$self->clear;
1590	$self->in_memory (cf::MAP_SWAPPED);
1591	}	2083	}
1592		2084
1593	sub reset_at {	2085	sub reset_at {
1594	my ($self) = @_;	2086	my ($self) = @_;
1595		2087
1596	# TODO: safety, remove and allow resettable per-player maps	2088	# TODO: safety, remove and allow resettable per-player maps
1597	return 1e99 if $self->isa ("ext::map_per_player");#d#
1598	return 1e99 if $self->{deny_reset};	2089	return 1e99 if $self->{deny_reset};
1599		2090
1600	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;	2091	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1601	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;	2092	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1602		2093
…		…
1613	my ($self) = @_;	2104	my ($self) = @_;
1614		2105
1615	my $lock = cf::lock_acquire "map_data:$self->{path}";	2106	my $lock = cf::lock_acquire "map_data:$self->{path}";
1616		2107
1617	return if $self->players;	2108	return if $self->players;
1618	return if $self->isa ("ext::map_per_player");#d#
1619		2109
1620	warn "resetting map ", $self->path;#d#	2110	warn "resetting map ", $self->path;
1621		2111
1622	$self->in_memory (cf::MAP_SWAPPED);	2112	$self->in_memory (cf::MAP_SWAPPED);
1623		2113
1624	# need to save uniques path	2114	# need to save uniques path
1625	unless ($self->{deny_save}) {	2115	unless ($self->{deny_save}) {
…		…
1629	if $uniq;	2119	if $uniq;
1630	}	2120	}
1631		2121
1632	delete $cf::MAP{$self->path};	2122	delete $cf::MAP{$self->path};
1633		2123
		2124	$self->deactivate;
		2125	$_->clear_links_to ($self) for values %cf::MAP;
1634	$self->clear;	2126	$self->clear;
1635
1636	$_->clear_links_to ($self) for values %cf::MAP;
1637		2127
1638	$self->unlink_save;	2128	$self->unlink_save;
1639	$self->destroy;	2129	$self->destroy;
1640	}	2130	}
1641		2131
1642	my $nuke_counter = "aaaa";	2132	my $nuke_counter = "aaaa";
1643		2133
1644	sub nuke {	2134	sub nuke {
1645	my ($self) = @_;	2135	my ($self) = @_;
1646		2136
		2137	{
		2138	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2139
1647	delete $cf::MAP{$self->path};	2140	delete $cf::MAP{$self->path};
1648		2141
1649	$self->unlink_save;	2142	$self->unlink_save;
1650		2143
1651	bless $self, "cf::map";	2144	bless $self, "cf::map";
1652	delete $self->{deny_reset};	2145	delete $self->{deny_reset};
1653	$self->{deny_save} = 1;	2146	$self->{deny_save} = 1;
1654	$self->reset_timeout (1);	2147	$self->reset_timeout (1);
1655	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2148	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1656		2149
1657	$cf::MAP{$self->path} = $self;	2150	$cf::MAP{$self->path} = $self;
		2151	}
1658		2152
1659	$self->reset; # polite request, might not happen	2153	$self->reset; # polite request, might not happen
		2154	}
		2155
		2156	=item $maps = cf::map::tmp_maps
		2157
		2158	Returns an arrayref with all map paths of currently instantiated and saved
		2159	maps. May block.
		2160
		2161	=cut
		2162
		2163	sub tmp_maps() {
		2164	[
		2165	map {
		2166	utf8::decode $_;
		2167	/\.map$/
		2168	? normalise $_
		2169	: ()
		2170	} @{ aio_readdir $TMPDIR or [] }
		2171	]
		2172	}
		2173
		2174	=item $maps = cf::map::random_maps
		2175
		2176	Returns an arrayref with all map paths of currently instantiated and saved
		2177	random maps. May block.
		2178
		2179	=cut
		2180
		2181	sub random_maps() {
		2182	[
		2183	map {
		2184	utf8::decode $_;
		2185	/\.map$/
		2186	? normalise "?random/$_"
		2187	: ()
		2188	} @{ aio_readdir $RANDOMDIR or [] }
		2189	]
1660	}	2190	}
1661		2191
1662	=item cf::map::unique_maps	2192	=item cf::map::unique_maps
1663		2193
1664	Returns an arrayref of paths of all shared maps that have	2194	Returns an arrayref of paths of all shared maps that have
1665	instantiated unique items. May block.	2195	instantiated unique items. May block.
1666		2196
1667	=cut	2197	=cut
1668		2198
1669	sub unique_maps() {	2199	sub unique_maps() {
1670	my $files = aio_readdir cf::localdir . "/" . cf::uniquedir	2200	[
1671	or return;	2201	map {
1672
1673	my @paths;
1674
1675	for (@$files) {
1676	utf8::decode $_;	2202	utf8::decode $_;
1677	next if /\.pst$/;	2203	/\.map$/
1678	next unless /^$PATH_SEP/o;	2204	? normalise $_
1679		2205	: ()
1680	push @paths, cf::map::normalise $_;	2206	} @{ aio_readdir $UNIQUEDIR or [] }
1681	}	2207	]
1682
1683	\@paths
1684	}	2208	}
1685		2209
1686	package cf;	2210	package cf;
1687		2211
1688	=back	2212	=back
…		…
1706	map { $_, inv_recursive_ $_->inv } @_	2230	map { $_, inv_recursive_ $_->inv } @_
1707	}	2231	}
1708		2232
1709	sub inv_recursive {	2233	sub inv_recursive {
1710	inv_recursive_ inv $_[0]	2234	inv_recursive_ inv $_[0]
		2235	}
		2236
		2237	=item $ref = $ob->ref
		2238
		2239	creates and returns a persistent reference to an objetc that can be stored as a string.
		2240
		2241	=item $ob = cf::object::deref ($refstring)
		2242
		2243	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2244	even if the object actually exists. May block.
		2245
		2246	=cut
		2247
		2248	sub deref {
		2249	my ($ref) = @_;
		2250
		2251	# temporary compatibility#TODO#remove
		2252	$ref =~ s{^<}{player/<};
		2253
		2254	if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
		2255	my ($uuid, $name) = ($1, $2);
		2256	my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
		2257	or return;
		2258	$pl->ob->uuid eq $uuid
		2259	or return;
		2260
		2261	$pl->ob
		2262	} else {
		2263	warn "$ref: cannot resolve object reference\n";
		2264	undef
		2265	}
1711	}	2266	}
1712		2267
1713	package cf;	2268	package cf;
1714		2269
1715	=back	2270	=back
…		…
1734		2289
1735	$flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;	2290	$flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1736		2291
1737	if ($self->{record_replies}) {	2292	if ($self->{record_replies}) {
1738	push @{ $self->{record_replies} }, [$npc, $msg, $flags];	2293	push @{ $self->{record_replies} }, [$npc, $msg, $flags];
		2294
1739	} else {	2295	} else {
		2296	my $pl = $self->contr;
		2297
		2298	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
		2299	my $dialog = $pl->{npc_dialog};
		2300	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
		2301
		2302	} else {
1740	$msg = $npc->name . " says: $msg" if $npc;	2303	$msg = $npc->name . " says: $msg" if $npc;
1741	$self->message ($msg, $flags);	2304	$self->message ($msg, $flags);
		2305	}
1742	}	2306	}
		2307	}
		2308
		2309	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2310
		2311	=cut
		2312
		2313	sub cf::object::send_msg {
		2314	my $pl = shift->contr
		2315	or return;
		2316	$pl->send_msg (@_);
1743	}	2317	}
1744		2318
1745	=item $player_object->may ("access")	2319	=item $player_object->may ("access")
1746		2320
1747	Returns wether the given player is authorized to access resource "access"	2321	Returns wether the given player is authorized to access resource "access"
…		…
1794	$self->deactivate_recursive;	2368	$self->deactivate_recursive;
1795		2369
1796	return if UNIVERSAL::isa $self->map, "ext::map_link";	2370	return if UNIVERSAL::isa $self->map, "ext::map_link";
1797		2371
1798	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2372	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1799	if $self->map;	2373	if $self->map && $self->map->{path} ne "{link}";
1800		2374
1801	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2375	$self->enter_map ($LINK_MAP || link_map, 10, 10);
1802	}	2376	}
1803		2377
1804	sub cf::object::player::leave_link {	2378	sub cf::object::player::leave_link {
1805	my ($self, $map, $x, $y) = @_;	2379	my ($self, $map, $x, $y) = @_;
		2380
		2381	return unless $self->contr->active;
1806		2382
1807	my $link_pos = delete $self->{_link_pos};	2383	my $link_pos = delete $self->{_link_pos};
1808		2384
1809	unless ($map) {	2385	unless ($map) {
1810	# restore original map position	2386	# restore original map position
…		…
1824	# use -1 or undef as default coordinates, not 0, 0	2400	# use -1 or undef as default coordinates, not 0, 0
1825	($x, $y) = ($map->enter_x, $map->enter_y)	2401	($x, $y) = ($map->enter_x, $map->enter_y)
1826	if $x <=0 && $y <= 0;	2402	if $x <=0 && $y <= 0;
1827		2403
1828	$map->load;	2404	$map->load;
1829	$map->load_diag;	2405	$map->load_neighbours;
1830		2406
1831	return unless $self->contr->active;	2407	return unless $self->contr->active;
1832	$self->activate_recursive;	2408	$self->activate_recursive;
1833		2409
1834	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2410	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1835	$self->enter_map ($map, $x, $y);	2411	$self->enter_map ($map, $x, $y);
1836	}	2412	}
1837		2413
1838	cf::player->attach (	2414	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1839	on_logout => sub {
1840	my ($pl) = @_;
1841		2415
1842	# abort map switching before logout	2416	Moves the player to the given map-path and coordinates by first freezing
1843	if ($pl->ob->{_link_pos}) {	2417	her, loading and preparing them map, calling the provided $check callback
1844	cf::sync_job {	2418	that has to return the map if sucecssful, and then unfreezes the player on
1845	$pl->ob->leave_link	2419	the new (success) or old (failed) map position. In either case, $done will
1846	};	2420	be called at the end of this process.
1847	}
1848	},
1849	on_login => sub {
1850	my ($pl) = @_;
1851		2421
1852	# try to abort aborted map switching on player login :)
1853	# should happen only on crashes
1854	if ($pl->ob->{_link_pos}) {
1855	$pl->ob->enter_link;
1856	(async {
1857	$pl->ob->reply (undef,
1858	"There was an internal problem at your last logout, "
1859	. "the server will try to bring you to your intended destination in a second.",
1860	cf::NDI_RED);
1861	# we need this sleep as the login has a concurrent enter_exit running
1862	# and this sleep increases chances of the player not ending up in scorn
1863	Coro::Timer::sleep 1;
1864	$pl->ob->leave_link;
1865	})->prio (2);
1866	}
1867	},
1868	);
1869
1870	=item $player_object->goto ($path, $x, $y)
1871
1872	=cut	2422	=cut
		2423
		2424	our $GOTOGEN;
1873		2425
1874	sub cf::object::player::goto {	2426	sub cf::object::player::goto {
1875	my ($self, $path, $x, $y) = @_;	2427	my ($self, $path, $x, $y, $check, $done) = @_;
		2428
		2429	# do generation counting so two concurrent goto's will be executed in-order
		2430	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1876		2431
1877	$self->enter_link;	2432	$self->enter_link;
1878		2433
1879	(async {	2434	(async {
1880	my $map = eval {	2435	my $map = eval {
1881	my $map = cf::map::find $path;	2436	my $map = cf::map::find $path;
		2437
		2438	if ($map) {
1882	$map = $map->customise_for ($self) if $map;	2439	$map = $map->customise_for ($self);
		2440	$map = $check->($map) if $check && $map;
		2441	} else {
		2442	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
		2443	}
		2444
1883	$map	2445	$map
		2446	};
		2447
		2448	if ($@) {
		2449	$self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
		2450	LOG llevError | logBacktrace, Carp::longmess $@;
1884	} or	2451	}
1885	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1886		2452
		2453	if ($gen == $self->{_goto_generation}) {
		2454	delete $self->{_goto_generation};
1887	$self->leave_link ($map, $x, $y);	2455	$self->leave_link ($map, $x, $y);
		2456	}
		2457
		2458	$done->() if $done;
1888	})->prio (1);	2459	})->prio (1);
1889	}	2460	}
1890		2461
1891	=item $player_object->enter_exit ($exit_object)	2462	=item $player_object->enter_exit ($exit_object)
1892		2463
…		…
1931		2502
1932	$rmp->{random_seed} ||= $exit->random_seed;	2503	$rmp->{random_seed} ||= $exit->random_seed;
1933		2504
1934	my $data = cf::to_json $rmp;	2505	my $data = cf::to_json $rmp;
1935	my $md5 = Digest::MD5::md5_hex $data;	2506	my $md5 = Digest::MD5::md5_hex $data;
1936	my $meta = "$cf::RANDOM_MAPS/$md5.meta";	2507	my $meta = "$RANDOMDIR/$md5.meta";
1937		2508
1938	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {	2509	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1939	aio_write $fh, 0, (length $data), $data, 0;	2510	aio_write $fh, 0, (length $data), $data, 0;
1940	undef $fh;	2511	undef $fh;
1941	aio_rename "$meta~", $meta;	2512	aio_rename "$meta~", $meta;
…		…
1950		2521
1951	return unless $self->type == cf::PLAYER;	2522	return unless $self->type == cf::PLAYER;
1952		2523
1953	if ($exit->slaying eq "/!") {	2524	if ($exit->slaying eq "/!") {
1954	#TODO: this should de-fi-ni-te-ly not be a sync-job	2525	#TODO: this should de-fi-ni-te-ly not be a sync-job
		2526	# the problem is that $exit might not survive long enough
		2527	# so it needs to be done right now, right here
1955	cf::sync_job { prepare_random_map $exit };	2528	cf::sync_job { prepare_random_map $exit };
1956	}	2529	}
1957		2530
1958	my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2531	my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1959	my $hp = $exit->stats->hp;	2532	my $hp = $exit->stats->hp;
1960	my $sp = $exit->stats->sp;	2533	my $sp = $exit->stats->sp;
1961		2534
1962	$self->enter_link;	2535	$self->enter_link;
		2536
		2537	# if exit is damned, update players death & WoR home-position
		2538	$self->contr->savebed ($slaying, $hp, $sp)
		2539	if $exit->flag (FLAG_DAMNED);
1963		2540
1964	(async {	2541	(async {
1965	$self->deactivate_recursive; # just to be sure	2542	$self->deactivate_recursive; # just to be sure
1966	unless (eval {	2543	unless (eval {
1967	$self->goto ($slaying, $hp, $sp);	2544	$self->goto ($slaying, $hp, $sp);
1968		2545
1969	1;	2546	1;
1970	}) {	2547	}) {
1971	$self->message ("Something went wrong deep within the crossfire server. "	2548	$self->message ("Something went wrong deep within the crossfire server. "
1972	. "I'll try to bring you back to the map you were before. "	2549	. "I'll try to bring you back to the map you were before. "
1973	. "Please report this to the dungeon master!",	2550	. "Please report this to the dungeon master!",
1974	cf::NDI_UNIQUE | cf::NDI_RED);	2551	cf::NDI_UNIQUE | cf::NDI_RED);
1975		2552
1976	warn "ERROR in enter_exit: $@";	2553	warn "ERROR in enter_exit: $@";
1977	$self->leave_link;	2554	$self->leave_link;
1978	}	2555	}
1979	})->prio (1);	2556	})->prio (1);
…		…
1992		2569
1993	sub cf::client::send_drawinfo {	2570	sub cf::client::send_drawinfo {
1994	my ($self, $text, $flags) = @_;	2571	my ($self, $text, $flags) = @_;
1995		2572
1996	utf8::encode $text;	2573	utf8::encode $text;
1997	$self->send_packet (sprintf "drawinfo %d %s", $flags, $text);	2574	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1998	}	2575	}
1999		2576
		2577	=item $client->send_msg ($channel, $msg, $color, [extra...])
		2578
		2579	Send a drawinfo or msg packet to the client, formatting the msg for the
		2580	client if neccessary. C<$type> should be a string identifying the type of
		2581	the message, with C<log> being the default. If C<$color> is negative, suppress
		2582	the message unless the client supports the msg packet.
		2583
		2584	=cut
		2585
		2586	our %CHANNEL = (
		2587	"c/identify" => {
		2588	id => "identify",
		2589	title => "Identify",
		2590	reply => undef,
		2591	tooltip => "Items recently identified",
		2592	},
		2593	"c/examine" => {
		2594	id => "examine",
		2595	title => "Examine",
		2596	reply => undef,
		2597	tooltip => "Signs and other items you examined",
		2598	},
		2599	);
		2600
		2601	sub cf::client::send_msg {
		2602	my ($self, $channel, $msg, $color, @extra) = @_;
		2603
		2604	$msg = $self->pl->expand_cfpod ($msg);
		2605
		2606	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2607
		2608	# check predefined channels, for the benefit of C
		2609	$channel = $CHANNEL{$channel} if $CHANNEL{$channel};
		2610
		2611	if (ref $channel) {
		2612	# send meta info to client, if not yet sent
		2613	unless (exists $self->{channel}{$channel->{id}}) {
		2614	$self->{channel}{$channel->{id}} = $channel;
		2615	$self->ext_msg (channel_info => $channel)
		2616	if $self->can_msg;
		2617	}
		2618
		2619	$channel = $channel->{id};
		2620	}
		2621
		2622	return unless @extra || length $msg;
		2623
		2624	if ($self->can_msg) {
		2625	# default colour, mask it out
		2626	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
		2627	if $color & cf::NDI_DEF;
		2628
		2629	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2630	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
		2631	} else {
		2632	if ($color >= 0) {
		2633	# replace some tags by gcfclient-compatible ones
		2634	for ($msg) {
		2635	1 while
		2636	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2637	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2638	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2639	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2640	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2641	}
		2642
		2643	$color &= cf::NDI_COLOR_MASK;
		2644
		2645	utf8::encode $msg;
		2646
		2647	if (0 && $msg =~ /\[/) {
		2648	# COMMAND/INFO
		2649	$self->send_packet ("drawextinfo $color 10 8 $msg")
		2650	} else {
		2651	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
		2652	$self->send_packet ("drawinfo $color $msg")
		2653	}
		2654	}
		2655	}
		2656	}
		2657
		2658	=item $client->ext_msg ($type, @msg)
		2659
		2660	Sends an ext event to the client.
		2661
		2662	=cut
		2663
		2664	sub cf::client::ext_msg($$@) {
		2665	my ($self, $type, @msg) = @_;
		2666
		2667	if ($self->extcmd == 2) {
		2668	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2669	} elsif ($self->extcmd == 1) { # TODO: remove
		2670	push @msg, msgtype => "event_$type";
		2671	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2672	}
		2673	}
		2674
		2675	=item $client->ext_reply ($msgid, @msg)
		2676
		2677	Sends an ext reply to the client.
		2678
		2679	=cut
		2680
		2681	sub cf::client::ext_reply($$@) {
		2682	my ($self, $id, @msg) = @_;
		2683
		2684	if ($self->extcmd == 2) {
		2685	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2686	} elsif ($self->extcmd == 1) {
		2687	#TODO: version 1, remove
		2688	unshift @msg, msgtype => "reply", msgid => $id;
		2689	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2690	}
		2691	}
2000		2692
2001	=item $success = $client->query ($flags, "text", \&cb)	2693	=item $success = $client->query ($flags, "text", \&cb)
2002		2694
2003	Queues a query to the client, calling the given callback with	2695	Queues a query to the client, calling the given callback with
2004	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,	2696	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2005	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.	2697	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2006		2698
2007	Queries can fail, so check the return code. Or don't, as queries will become	2699	Queries can fail, so check the return code. Or don't, as queries will
2008	reliable at some point in the future.	2700	become reliable at some point in the future.
2009		2701
2010	=cut	2702	=cut
2011		2703
2012	sub cf::client::query {	2704	sub cf::client::query {
2013	my ($self, $flags, $text, $cb) = @_;	2705	my ($self, $flags, $text, $cb) = @_;
…		…
2021	utf8::encode $text;	2713	utf8::encode $text;
2022	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];	2714	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2023		2715
2024	$self->send_packet ($self->{query_queue}[0][0])	2716	$self->send_packet ($self->{query_queue}[0][0])
2025	if @{ $self->{query_queue} } == 1;	2717	if @{ $self->{query_queue} } == 1;
		2718
		2719	1
2026	}	2720	}
2027		2721
2028	cf::client->attach (	2722	cf::client->attach (
		2723	on_connect => sub {
		2724	my ($ns) = @_;
		2725
		2726	$ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
		2727	},
2029	on_reply => sub {	2728	on_reply => sub {
2030	my ($ns, $msg) = @_;	2729	my ($ns, $msg) = @_;
2031		2730
2032	# this weird shuffling is so that direct followup queries	2731	# this weird shuffling is so that direct followup queries
2033	# get handled first	2732	# get handled first
…		…
2045	} else {	2744	} else {
2046	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;	2745	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2047	}	2746	}
2048	}	2747	}
2049	},	2748	},
		2749	on_exticmd => sub {
		2750	my ($ns, $buf) = @_;
		2751
		2752	my $msg = eval { $ns->{json_coder}->decode ($buf) };
		2753
		2754	if (ref $msg) {
		2755	my ($type, $reply, @payload) =
		2756	"ARRAY" eq ref $msg
		2757	? @$msg
		2758	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2759
		2760	my @reply;
		2761
		2762	if (my $cb = $EXTICMD{$type}) {
		2763	@reply = $cb->($ns, @payload);
		2764	}
		2765
		2766	$ns->ext_reply ($reply, @reply)
		2767	if $reply;
		2768
		2769	} else {
		2770	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
		2771	}
		2772
		2773	cf::override;
		2774	},
2050	);	2775	);
2051		2776
2052	=item $client->async (\&cb)	2777	=item $client->async (\&cb)
2053		2778
2054	Create a new coroutine, running the specified callback. The coroutine will	2779	Create a new coroutine, running the specified callback. The coroutine will
…		…
2095	our $safe = new Safe "safe";	2820	our $safe = new Safe "safe";
2096	our $safe_hole = new Safe::Hole;	2821	our $safe_hole = new Safe::Hole;
2097		2822
2098	$SIG{FPE} = 'IGNORE';	2823	$SIG{FPE} = 'IGNORE';
2099		2824
2100	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2825	$safe->permit_only (Opcode::opset qw(
		2826	:base_core :base_mem :base_orig :base_math
		2827	grepstart grepwhile mapstart mapwhile
		2828	sort time
		2829	));
2101		2830
2102	# here we export the classes and methods available to script code	2831	# here we export the classes and methods available to script code
2103		2832
2104	=pod	2833	=pod
2105		2834
2106	The following fucntions and emthods are available within a safe environment:	2835	The following functions and methods are available within a safe environment:
2107		2836
2108	cf::object contr pay_amount pay_player map	2837	cf::object
		2838	contr pay_amount pay_player map x y force_find force_add
		2839	insert remove name archname title slaying race decrease_ob_nr
		2840
2109	cf::object::player player	2841	cf::object::player
2110	cf::player peaceful	2842	player
2111	cf::map trigger	2843
		2844	cf::player
		2845	peaceful
		2846
		2847	cf::map
		2848	trigger
2112		2849
2113	=cut	2850	=cut
2114		2851
2115	for (	2852	for (
2116	["cf::object" => qw(contr pay_amount pay_player map)],	2853	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2854	insert remove inv name archname title slaying race
		2855	decrease_ob_nr)],
2117	["cf::object::player" => qw(player)],	2856	["cf::object::player" => qw(player)],
2118	["cf::player" => qw(peaceful)],	2857	["cf::player" => qw(peaceful)],
2119	["cf::map" => qw(trigger)],	2858	["cf::map" => qw(trigger)],
2120	) {	2859	) {
2121	no strict 'refs';	2860	no strict 'refs';
…		…
2192	=back	2931	=back
2193		2932
2194	=cut	2933	=cut
2195		2934
2196	#############################################################################	2935	#############################################################################
2197
2198	=head2 EXTENSION DATABASE SUPPORT
2199
2200	Crossfire maintains a very simple database for extension use. It can
2201	currently store anything that can be serialised using Storable, which
2202	excludes objects.
2203
2204	The parameter C<$family> should best start with the name of the extension
2205	using it, it should be unique.
2206
2207	=over 4
2208
2209	=item $value = cf::db_get $family => $key
2210
2211	Returns a single value from the database.
2212
2213	=item cf::db_put $family => $key => $value
2214
2215	Stores the given C<$value> in the family.
2216
2217	=cut
2218
2219	our $DB;
2220
2221	sub db_init {
2222	unless ($DB) {
2223	$DB = BDB::db_create $DB_ENV;
2224
2225	cf::sync_job {
2226	eval {
2227	$DB->set_flags (BDB::CHKSUM);
2228
2229	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2230	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2231	cf::cleanup "db_open(db): $!" if $!;
2232	};
2233	cf::cleanup "db_open(db): $@" if $@;
2234	};
2235
2236	my $path = cf::localdir . "/database.pst";
2237	if (stat $path) {
2238	cf::sync_job {
2239	my $pst = Storable::retrieve $path;
2240
2241	cf::db_put (board => data => $pst->{board});
2242	cf::db_put (guildrules => data => $pst->{guildrules});
2243	cf::db_put (rent => balance => $pst->{rent}{balance});
2244	BDB::db_env_txn_checkpoint $DB_ENV;
2245
2246	unlink $path;
2247	};
2248	}
2249	}
2250	}
2251
2252	sub db_get($$) {
2253	my $key = "$_[0]/$_[1]";
2254
2255	cf::sync_job {
2256	BDB::db_get $DB, undef, $key, my $data;
2257
2258	$! ? ()
2259	: Compress::LZF::sthaw $data
2260	}
2261	}
2262
2263	sub db_put($$$) {
2264	BDB::dbreq_pri 4;
2265	BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2266	}
2267
2268	#############################################################################
2269	# the server's init and main functions	2936	# the server's init and main functions
2270		2937
2271	sub init_resources {	2938	sub load_facedata($) {
2272	load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir	2939	my ($path) = @_;
		2940
		2941	# HACK to clear player env face cache, we need some signal framework
		2942	# for this (global event?)
		2943	%ext::player_env::MUSIC_FACE_CACHE = ();
		2944
		2945	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		2946
		2947	warn "loading facedata from $path\n";
		2948
		2949	my $facedata;
		2950	0 < aio_load $path, $facedata
		2951	or die "$path: $!";
		2952
		2953	$facedata = Coro::Storable::thaw $facedata;
		2954
		2955	$facedata->{version} == 2
		2956	or cf::cleanup "$path: version mismatch, cannot proceed.";
		2957
		2958	# patch in the exptable
		2959	$facedata->{resource}{"res/exp_table"} = {
		2960	type => FT_RSRC,
		2961	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		2962	};
		2963	cf::cede_to_tick;
		2964
		2965	{
		2966	my $faces = $facedata->{faceinfo};
		2967
		2968	while (my ($face, $info) = each %$faces) {
		2969	my $idx = (cf::face::find $face) || cf::face::alloc $face;
		2970	cf::face::set_visibility $idx, $info->{visibility};
		2971	cf::face::set_magicmap $idx, $info->{magicmap};
		2972	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
		2973	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
		2974
		2975	cf::cede_to_tick;
		2976	}
		2977
		2978	while (my ($face, $info) = each %$faces) {
		2979	next unless $info->{smooth};
		2980	my $idx = cf::face::find $face
		2981	or next;
		2982	if (my $smooth = cf::face::find $info->{smooth}) {
		2983	cf::face::set_smooth $idx, $smooth;
		2984	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
		2985	} else {
		2986	warn "smooth face '$info->{smooth}' not found for face '$face'";
		2987	}
		2988
		2989	cf::cede_to_tick;
		2990	}
		2991	}
		2992
		2993	{
		2994	my $anims = $facedata->{animinfo};
		2995
		2996	while (my ($anim, $info) = each %$anims) {
		2997	cf::anim::set $anim, $info->{frames}, $info->{facings};
		2998	cf::cede_to_tick;
		2999	}
		3000
		3001	cf::anim::invalidate_all; # d'oh
		3002	}
		3003
		3004	{
		3005	# TODO: for gcfclient pleasure, we should give resources
		3006	# that gcfclient doesn't grok a >10000 face index.
		3007	my $res = $facedata->{resource};
		3008
		3009	my $soundconf = delete $res->{"res/sound.conf"};
		3010
		3011	while (my ($name, $info) = each %$res) {
		3012	my $idx = (cf::face::find $name) || cf::face::alloc $name;
		3013	my $data;
		3014
		3015	if ($info->{type} & 1) {
		3016	# prepend meta info
		3017
		3018	my $meta = $enc->encode ({
		3019	name => $name,
		3020	%{ $info->{meta} || {} },
		3021	});
		3022
		3023	$data = pack "(w/a*)*", $meta, $info->{data};
		3024	} else {
		3025	$data = $info->{data};
		3026	}
		3027
		3028	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3029	cf::face::set_type $idx, $info->{type};
		3030
		3031	cf::cede_to_tick;
		3032	}
		3033
		3034	if ($soundconf) {
		3035	$soundconf = $enc->decode (delete $soundconf->{data});
		3036
		3037	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3038	my $sound = $soundconf->{compat}[$_]
		3039	or next;
		3040
		3041	my $face = cf::face::find "sound/$sound->[1]";
		3042	cf::sound::set $sound->[0] => $face;
		3043	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3044	}
		3045
		3046	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3047	my $face = cf::face::find "sound/$v";
		3048	cf::sound::set $k => $face;
		3049	}
		3050	}
		3051	}
		3052
		3053	1
		3054	}
		3055
		3056	register_exticmd fx_want => sub {
		3057	my ($ns, $want) = @_;
		3058
		3059	while (my ($k, $v) = each %$want) {
		3060	$ns->fx_want ($k, $v);
		3061	}
		3062	};
		3063
		3064	sub reload_regions {
		3065	# HACK to clear player env face cache, we need some signal framework
		3066	# for this (global event?)
		3067	%ext::player_env::MUSIC_FACE_CACHE = ();
		3068
		3069	load_resource_file "$MAPDIR/regions"
2273	or die "unable to load regions file\n";#d#	3070	or die "unable to load regions file\n";
2274	}
2275		3071
2276	sub cfg_load {	3072	for (cf::region::list) {
		3073	$_->{match} = qr/$_->{match}/
		3074	if exists $_->{match};
		3075	}
		3076	}
		3077
		3078	sub reload_facedata {
		3079	load_facedata "$DATADIR/facedata"
		3080	or die "unable to load facedata\n";
		3081	}
		3082
		3083	sub reload_archetypes {
		3084	load_resource_file "$DATADIR/archetypes"
		3085	or die "unable to load archetypes\n";
		3086	#d# NEED to laod twice to resolve forward references
		3087	# this really needs to be done in an extra post-pass
		3088	# (which needs to be synchronous, so solve it differently)
		3089	load_resource_file "$DATADIR/archetypes"
		3090	or die "unable to load archetypes\n";
		3091	}
		3092
		3093	sub reload_treasures {
		3094	load_resource_file "$DATADIR/treasures"
		3095	or die "unable to load treasurelists\n";
		3096	}
		3097
		3098	sub reload_resources {
		3099	warn "reloading resource files...\n";
		3100
		3101	reload_regions;
		3102	reload_facedata;
		3103	#reload_archetypes;#d#
		3104	reload_archetypes;
		3105	reload_treasures;
		3106
		3107	warn "finished reloading resource files\n";
		3108	}
		3109
		3110	sub init {
		3111	reload_resources;
		3112	}
		3113
		3114	sub reload_config {
2277	open my $fh, "<:utf8", cf::confdir . "/config"	3115	open my $fh, "<:utf8", "$CONFDIR/config"
2278	or return;	3116	or return;
2279		3117
2280	local $/;	3118	local $/;
2281	*CFG = YAML::Syck::Load <$fh>;	3119	*CFG = YAML::Syck::Load <$fh>;
2282		3120
…		…
2290	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3128	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2291	and die "WARNING: m(un)lockall failed: $!\n";	3129	and die "WARNING: m(un)lockall failed: $!\n";
2292	};	3130	};
2293	warn $@ if $@;	3131	warn $@ if $@;
2294	}	3132	}
2295	}
2296
2297	sub init {
2298	init_resources;
2299	}	3133	}
2300		3134
2301	sub main {	3135	sub main {
2302	# we must not ever block the main coroutine	3136	# we must not ever block the main coroutine
2303	local $Coro::idle = sub {	3137	local $Coro::idle = sub {
…		…
2305	(async {	3139	(async {
2306	Event::one_event;	3140	Event::one_event;
2307	})->prio (Coro::PRIO_MAX);	3141	})->prio (Coro::PRIO_MAX);
2308	};	3142	};
2309		3143
2310	cfg_load;	3144	reload_config;
2311	db_init;	3145	db_init;
2312	load_extensions;	3146	load_extensions;
2313		3147
2314	$TICK_WATCHER->start;	3148	$TICK_WATCHER->start;
2315	Event::loop;	3149	Event::loop;
…		…
2331	},	3165	},
2332	);	3166	);
2333	}	3167	}
2334	}	3168	}
2335		3169
		3170	sub write_runtime {
		3171	my $runtime = "$LOCALDIR/runtime";
		3172
		3173	# first touch the runtime file to show we are still running:
		3174	# the fsync below can take a very very long time.
		3175
		3176	IO::AIO::aio_utime $runtime, undef, undef;
		3177
		3178	my $guard = cf::lock_acquire "write_runtime";
		3179
		3180	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
		3181	or return;
		3182
		3183	my $value = $cf::RUNTIME + 90 + 10;
		3184	# 10 is the runtime save interval, for a monotonic clock
		3185	# 60 allows for the watchdog to kill the server.
		3186
		3187	(aio_write $fh, 0, (length $value), $value, 0) <= 0
		3188	and return;
		3189
		3190	# always fsync - this file is important
		3191	aio_fsync $fh
		3192	and return;
		3193
		3194	# touch it again to show we are up-to-date
		3195	aio_utime $fh, undef, undef;
		3196
		3197	close $fh
		3198	or return;
		3199
		3200	aio_rename "$runtime~", $runtime
		3201	and return;
		3202
		3203	warn "runtime file written.\n";
		3204
		3205	1
		3206	}
		3207
2336	sub emergency_save() {	3208	sub emergency_save() {
2337	my $freeze_guard = cf::freeze_mainloop;	3209	my $freeze_guard = cf::freeze_mainloop;
2338		3210
2339	warn "enter emergency perl save\n";	3211	warn "enter emergency perl save\n";
2340		3212
…		…
2371		3243
2372	warn Carp::longmess "post_cleanup backtrace"	3244	warn Carp::longmess "post_cleanup backtrace"
2373	if $make_core;	3245	if $make_core;
2374	}	3246	}
2375		3247
2376	sub reload() {	3248	sub do_reload_perl() {
2377	# can/must only be called in main	3249	# can/must only be called in main
2378	if ($Coro::current != $Coro::main) {	3250	if ($Coro::current != $Coro::main) {
2379	warn "can only reload from main coroutine";	3251	warn "can only reload from main coroutine";
2380	return;	3252	return;
2381	}	3253	}
…		…
2406	Coro::cede;	3278	Coro::cede;
2407	last unless IO::AIO::nreqs || BDB::nreqs;	3279	last unless IO::AIO::nreqs || BDB::nreqs;
2408	warn "iterate...";	3280	warn "iterate...";
2409	}	3281	}
2410		3282
		3283	++$RELOAD;
		3284
2411	warn "cancelling all extension coros";	3285	warn "cancelling all extension coros";
2412	$_->cancel for values %EXT_CORO;	3286	$_->cancel for values %EXT_CORO;
2413	%EXT_CORO = ();	3287	%EXT_CORO = ();
2414		3288
2415	warn "removing commands";	3289	warn "removing commands";
2416	%COMMAND = ();	3290	%COMMAND = ();
2417		3291
2418	warn "removing ext commands";	3292	warn "removing ext/exti commands";
2419	%EXTCMD = ();	3293	%EXTCMD = ();
		3294	%EXTICMD = ();
2420		3295
2421	warn "unloading/nuking all extensions";	3296	warn "unloading/nuking all extensions";
2422	for my $pkg (@EXTS) {	3297	for my $pkg (@EXTS) {
2423	warn "... unloading $pkg";	3298	warn "... unloading $pkg";
2424		3299
…		…
2454	Symbol::delete_package "safe::$_"	3329	Symbol::delete_package "safe::$_"
2455	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	3330	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2456		3331
2457	warn "unloading cf.pm \"a bit\"";	3332	warn "unloading cf.pm \"a bit\"";
2458	delete $INC{"cf.pm"};	3333	delete $INC{"cf.pm"};
		3334	delete $INC{"cf/pod.pm"};
2459		3335
2460	# don't, removes xs symbols, too,	3336	# don't, removes xs symbols, too,
2461	# and global variables created in xs	3337	# and global variables created in xs
2462	#Symbol::delete_package __PACKAGE__;	3338	#Symbol::delete_package __PACKAGE__;
2463		3339
…		…
2466	warn "reloading cf.pm";	3342	warn "reloading cf.pm";
2467	require cf;	3343	require cf;
2468	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3344	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2469		3345
2470	warn "loading config and database again";	3346	warn "loading config and database again";
2471	cf::cfg_load;	3347	cf::reload_config;
2472		3348
2473	warn "loading extensions";	3349	warn "loading extensions";
2474	cf::load_extensions;	3350	cf::load_extensions;
2475		3351
2476	warn "reattaching attachments to objects/players";	3352	warn "reattaching attachments to objects/players";
…		…
2478	warn "reattaching attachments to maps";	3354	warn "reattaching attachments to maps";
2479	reattach $_ for values %MAP;	3355	reattach $_ for values %MAP;
2480	warn "reattaching attachments to players";	3356	warn "reattaching attachments to players";
2481	reattach $_ for values %PLAYER;	3357	reattach $_ for values %PLAYER;
2482		3358
2483	warn "loading reloadable resources";
2484	init_resources;
2485
2486	warn "leaving sync_job";	3359	warn "leaving sync_job";
2487		3360
2488	1	3361	1
2489	} or do {	3362	} or do {
2490	warn $@;	3363	warn $@;
…		…
2495	warn "reloaded";	3368	warn "reloaded";
2496	};	3369	};
2497		3370
2498	our $RELOAD_WATCHER; # used only during reload	3371	our $RELOAD_WATCHER; # used only during reload
2499		3372
		3373	sub reload_perl() {
		3374	# doing reload synchronously and two reloads happen back-to-back,
		3375	# coro crashes during coro_state_free->destroy here.
		3376
		3377	$RELOAD_WATCHER ||= Event->timer (
		3378	reentrant => 0,
		3379	after => 0,
		3380	data => WF_AUTOCANCEL,
		3381	cb => sub {
		3382	do_reload_perl;
		3383	undef $RELOAD_WATCHER;
		3384	},
		3385	);
		3386	}
		3387
2500	register_command "reload" => sub {	3388	register_command "reload" => sub {
2501	my ($who, $arg) = @_;	3389	my ($who, $arg) = @_;
2502		3390
2503	if ($who->flag (FLAG_WIZ)) {	3391	if ($who->flag (FLAG_WIZ)) {
2504	$who->message ("reloading server.");	3392	$who->message ("reloading server.");
2505		3393	async { reload_perl };
2506	# doing reload synchronously and two reloads happen back-to-back,
2507	# coro crashes during coro_state_free->destroy here.
2508
2509	$RELOAD_WATCHER ||= Event->timer (
2510	reentrant => 0,
2511	after => 0,
2512	data => WF_AUTOCANCEL,
2513	cb => sub {
2514	reload;
2515	undef $RELOAD_WATCHER;
2516	},
2517	);
2518	}	3394	}
2519	};	3395	};
2520		3396
2521	unshift @INC, $LIBDIR;	3397	unshift @INC, $LIBDIR;
2522		3398
2523	my $bug_warning = 0;	3399	my $bug_warning = 0;
2524		3400
		3401	our @WAIT_FOR_TICK;
		3402	our @WAIT_FOR_TICK_BEGIN;
		3403
		3404	sub wait_for_tick {
		3405	return unless $TICK_WATCHER->is_active;
		3406	return if $Coro::current == $Coro::main;
		3407
		3408	my $signal = new Coro::Signal;
		3409	push @WAIT_FOR_TICK, $signal;
		3410	$signal->wait;
		3411	}
		3412
		3413	sub wait_for_tick_begin {
		3414	return unless $TICK_WATCHER->is_active;
		3415	return if $Coro::current == $Coro::main;
		3416
		3417	my $signal = new Coro::Signal;
		3418	push @WAIT_FOR_TICK_BEGIN, $signal;
		3419	$signal->wait;
		3420	}
		3421
		3422	my $min = 1e6;#d#
		3423	my $avg = 10;
2525	$TICK_WATCHER = Event->timer (	3424	$TICK_WATCHER = Event->timer (
2526	reentrant => 0,	3425	reentrant => 0,
2527	parked => 1,	3426	parked => 1,
2528	prio => 0,	3427	prio => 0,
2529	at => $NEXT_TICK || $TICK,	3428	at => $NEXT_TICK || $TICK,
…		…
2533	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	3432	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2534	unless ++$bug_warning > 10;	3433	unless ++$bug_warning > 10;
2535	return;	3434	return;
2536	}	3435	}
2537		3436
2538	$NOW = Event::time;	3437	$NOW = $tick_start = Event::time;
2539		3438
2540	cf::server_tick; # one server iteration	3439	cf::server_tick; # one server iteration
		3440
		3441	0 && sync_job {#d#
		3442	for(1..10) {
		3443	my $t = Event::time;
		3444	my $map = my $map = new_from_path cf::map "/tmp/x.map"
		3445	or die;
		3446
		3447	$map->width (50);
		3448	$map->height (50);
		3449	$map->alloc;
		3450	$map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
		3451	my $t = Event::time - $t;
		3452
		3453	#next unless $t < 0.0013;#d#
		3454	if ($t < $min) {
		3455	$min = $t;
		3456	}
		3457	$avg = $avg * 0.99 + $t * 0.01;
		3458	}
		3459	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
		3460	exit 0;
		3461	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
		3462	};
		3463
2541	$RUNTIME += $TICK;	3464	$RUNTIME += $TICK;
2542	$NEXT_TICK += $TICK;	3465	$NEXT_TICK += $TICK;
2543		3466
2544	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3467	if ($NOW >= $NEXT_RUNTIME_WRITE) {
2545	$NEXT_RUNTIME_WRITE = $NOW + 10;	3468	$NEXT_RUNTIME_WRITE = $NOW + 10;
…		…
2547	write_runtime	3470	write_runtime
2548	or warn "ERROR: unable to write runtime file: $!";	3471	or warn "ERROR: unable to write runtime file: $!";
2549	};	3472	};
2550	}	3473	}
2551		3474
2552	$WAIT_FOR_TICK->broadcast;
2553	$WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2554
2555	# my $AFTER = Event::time;	3475	# my $AFTER = Event::time;
2556	# warn $AFTER - $NOW;#d#	3476	# warn $AFTER - $NOW;#d#
2557		3477
		3478	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
		3479	$sig->send;
		3480	}
		3481	while (my $sig = shift @WAIT_FOR_TICK) {
		3482	$sig->send;
		3483	}
		3484
		3485	$NOW = Event::time;
		3486
2558	# if we are delayed by four ticks or more, skip them all	3487	# if we are delayed by four ticks or more, skip them all
2559	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;	3488	$NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2560		3489
2561	$TICK_WATCHER->at ($NEXT_TICK);	3490	$TICK_WATCHER->at ($NEXT_TICK);
2562	$TICK_WATCHER->start;	3491	$TICK_WATCHER->start;
		3492
		3493	$LOAD = ($NOW - $tick_start) / $TICK;
		3494	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
		3495
		3496	_post_tick;
		3497
		3498
2563	},	3499	},
2564	);	3500	);
2565		3501
2566	{	3502	{
2567	BDB::max_poll_time $TICK * 0.1;	3503	BDB::max_poll_time $TICK * 0.1;
…		…
2595		3531
2596	cf::sync_job {	3532	cf::sync_job {
2597	eval {	3533	eval {
2598	BDB::db_env_open	3534	BDB::db_env_open
2599	$DB_ENV,	3535	$DB_ENV,
2600	$BDB_ENV_DIR,	3536	$BDBDIR,
2601	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN	3537	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2602	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,	3538	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2603	0666;	3539	0666;
2604		3540
2605	cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;	3541	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2606		3542
2607	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);	3543	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2608	$DB_ENV->set_lk_detect;	3544	$DB_ENV->set_lk_detect;
2609	};	3545	};
2610		3546
…		…
2626	prio => 6,	3562	prio => 6,
2627	cb => \&IO::AIO::poll_cb,	3563	cb => \&IO::AIO::poll_cb,
2628	);	3564	);
2629	}	3565	}
2630		3566
		3567	my $_log_backtrace;
		3568
		3569	sub _log_backtrace {
		3570	my ($msg, @addr) = @_;
		3571
		3572	$msg =~ s/\n//;
		3573
		3574	# limit the # of concurrent backtraces
		3575	if ($_log_backtrace < 2) {
		3576	++$_log_backtrace;
		3577	async {
		3578	my @bt = fork_call {
		3579	@addr = map { sprintf "%x", $_ } @addr;
		3580	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
		3581	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
		3582	or die "addr2line: $!";
		3583
		3584	my @funcs;
		3585	my @res = <$fh>;
		3586	chomp for @res;
		3587	while (@res) {
		3588	my ($func, $line) = splice @res, 0, 2, ();
		3589	push @funcs, "[$func] $line";
		3590	}
		3591
		3592	@funcs
		3593	};
		3594
		3595	LOG llevInfo, "[ABT] $msg\n";
		3596	LOG llevInfo, "[ABT] $_\n" for @bt;
		3597	--$_log_backtrace;
		3598	};
		3599	} else {
		3600	LOG llevInfo, "[ABT] $msg\n";
		3601	LOG llevInfo, "[ABT] [suppressed]\n";
		3602	}
		3603	}
		3604
		3605	# load additional modules
		3606	use cf::pod;
		3607
2631	END { cf::emergency_save }	3608	END { cf::emergency_save }
2632		3609
2633	1	3610	1
2634		3611

Diff Legend

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