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.187 by root, Sat Jan 20 21:06:52 2007 UTC vs.
Revision 1.282 by elmex, Tue Jun 19 18:15:34 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.4 ();	15	use Coro 3.61 ();
		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;
19		24
		25	use BDB ();
20	use Data::Dumper;	26	use Data::Dumper;
21	use Digest::MD5;	27	use Digest::MD5;
22	use Fcntl;	28	use Fcntl;
		29	use YAML::Syck ();
23	use IO::AIO 2.32 ();	30	use IO::AIO 2.32 ();
24	use YAML::Syck ();
25	use Time::HiRes;	31	use Time::HiRes;
		32	use Compress::LZF;
26		33
		34	# configure various modules to our taste
		35	#
		36	$Storable::canonical = 1; # reduce rsync transfers
		37	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
		38	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
		39
27	use Event; $Event::Eval = 1; # no idea why this is required, but it is	40	$Event::Eval = 1; # no idea why this is required, but it is
28
29	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30		41
31	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?	42	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
32	$YAML::Syck::ImplicitUnicode = 1;	43	$YAML::Syck::ImplicitUnicode = 1;
33		44
34	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority	45	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
		46
		47	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
35		48
36	our %COMMAND = ();	49	our %COMMAND = ();
37	our %COMMAND_TIME = ();	50	our %COMMAND_TIME = ();
38		51
39	our @EXTS = (); # list of extension package names	52	our @EXTS = (); # list of extension package names
40	our %EXTCMD = ();	53	our %EXTCMD = ();
41	our %EXT_CORO = (); # coroutines bound to extensions	54	our %EXT_CORO = (); # coroutines bound to extensions
42	our %EXT_MAP = (); # pluggable maps	55	our %EXT_MAP = (); # pluggable maps
43		56
		57	our $RELOAD; # number of reloads so far
44	our @EVENT;	58	our @EVENT;
45	our $LIBDIR = datadir . "/ext";
46		59
47	our $TICK = MAX_TIME * 1e-6;	60	our $CONFDIR = confdir;
		61	our $DATADIR = datadir;
		62	our $LIBDIR = "$DATADIR/ext";
		63	our $PODDIR = "$DATADIR/pod";
		64	our $MAPDIR = "$DATADIR/" . mapdir;
		65	our $LOCALDIR = localdir;
		66	our $TMPDIR = "$LOCALDIR/" . tmpdir;
		67	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
		68	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
		69	our $RANDOMDIR = "$LOCALDIR/random";
		70	our $BDBDIR = "$LOCALDIR/db";
		71
		72	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
48	our $TICK_WATCHER;	73	our $TICK_WATCHER;
49	our $AIO_POLL_WATCHER;	74	our $AIO_POLL_WATCHER;
50	our $WRITE_RUNTIME_WATCHER;	75	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
51	our $NEXT_TICK;	76	our $NEXT_TICK;
52	our $NOW;	77	our $NOW;
		78	our $USE_FSYNC = 1; # use fsync to write maps - default off
		79
		80	our $BDB_POLL_WATCHER;
		81	our $DB_ENV;
53		82
54	our %CFG;	83	our %CFG;
55		84
56	our $UPTIME; $UPTIME ||= time;	85	our $UPTIME; $UPTIME ||= time;
57	our $RUNTIME;	86	our $RUNTIME;
58		87
59	our %PLAYER; # all users	88	our %PLAYER; # all users
60	our %MAP; # all maps	89	our %MAP; # all maps
61	our $LINK_MAP; # the special {link} map, which is always available	90	our $LINK_MAP; # the special {link} map, which is always available
62	our $RANDOM_MAPS = cf::localdir . "/random";
63
64	our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
65	our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
66		91
67	# used to convert map paths into valid unix filenames by replacing / by ∕	92	# used to convert map paths into valid unix filenames by replacing / by ∕
68	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	93	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
69		94
		95	our $LOAD; # a number between 0 (idle) and 1 (too many objects)
		96	our $LOADAVG; # same thing, but with alpha-smoothing
		97	our $tick_start; # for load detecting purposes
		98
70	binmode STDOUT;	99	binmode STDOUT;
71	binmode STDERR;	100	binmode STDERR;
72		101
73	# read virtual server time, if available	102	# read virtual server time, if available
74	unless ($RUNTIME || !-e cf::localdir . "/runtime") {	103	unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
75	open my $fh, "<", cf::localdir . "/runtime"	104	open my $fh, "<", "$LOCALDIR/runtime"
76	or die "unable to read runtime file: $!";	105	or die "unable to read runtime file: $!";
77	$RUNTIME = <$fh> + 0.;	106	$RUNTIME = <$fh> + 0.;
78	}	107	}
79		108
80	mkdir cf::localdir;	109	mkdir $_
81	mkdir cf::localdir . "/" . cf::playerdir;	110	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
82	mkdir cf::localdir . "/" . cf::tmpdir;
83	mkdir cf::localdir . "/" . cf::uniquedir;
84	mkdir $RANDOM_MAPS;
85		111
86	our $EMERGENCY_POSITION;	112	our $EMERGENCY_POSITION;
		113
		114	sub cf::map::normalise;
87		115
88	#############################################################################	116	#############################################################################
89		117
90	=head2 GLOBAL VARIABLES	118	=head2 GLOBAL VARIABLES
91		119
…		…
98	=item $cf::RUNTIME	126	=item $cf::RUNTIME
99		127
100	The time this server has run, starts at 0 and is increased by $cf::TICK on	128	The time this server has run, starts at 0 and is increased by $cf::TICK on
101	every server tick.	129	every server tick.
102		130
103	=item $cf::LIBDIR	131	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
		132	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
		133	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
104		134
105	The perl library directory, where extensions and cf-specific modules can	135	Various directories - "/etc", read-only install directory, perl-library
106	be found. It will be added to C<@INC> automatically.	136	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
		137	unique-items directory, player file directory, random maps directory and
		138	database environment.
107		139
108	=item $cf::NOW	140	=item $cf::NOW
109		141
110	The time of the last (current) server tick.	142	The time of the last (current) server tick.
111		143
112	=item $cf::TICK	144	=item $cf::TICK
113		145
114	The interval between server ticks, in seconds.	146	The interval between server ticks, in seconds.
		147
		148	=item $cf::LOADAVG
		149
		150	The current CPU load on the server (alpha-smoothed), as a value between 0
		151	(none) and 1 (overloaded), indicating how much time is spent on processing
		152	objects per tick. Healthy values are < 0.5.
		153
		154	=item $cf::LOAD
		155
		156	The raw value load value from the last tick.
115		157
116	=item %cf::CFG	158	=item %cf::CFG
117		159
118	Configuration for the server, loaded from C</etc/crossfire/config>, or	160	Configuration for the server, loaded from C</etc/crossfire/config>, or
119	from wherever your confdir points to.	161	from wherever your confdir points to.
120		162
121	=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE	163	=item cf::wait_for_tick, cf::wait_for_tick_begin
122		164
123	These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)	165	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
124	or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick	166	returns directly I<after> the tick processing (and consequently, can only wake one process
125	processing has been done. Call C<< ->wait >> on them to maximise the	167	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
126	window of cpu time available, or simply to synchronise to the server tick.
127		168
128	=back	169	=back
129		170
130	=cut	171	=cut
131		172
132	BEGIN {	173	BEGIN {
133	*CORE::GLOBAL::warn = sub {	174	*CORE::GLOBAL::warn = sub {
134	my $msg = join "", @_;	175	my $msg = join "", @_;
135	utf8::encode $msg;
136		176
137	$msg .= "\n"	177	$msg .= "\n"
138	unless $msg =~ /\n$/;	178	unless $msg =~ /\n$/;
139		179
		180	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
		181
		182	utf8::encode $msg;
140	LOG llevError, $msg;	183	LOG llevError, $msg;
141	};	184	};
142	}	185	}
143		186
144	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	187	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
145	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	188	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
146	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	189	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
147	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	190	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
148	@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';	191	@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
		192	@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
149	@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';	193	@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
150		194
151	# we bless all objects into (empty) derived classes to force a method lookup	195	# we bless all objects into (empty) derived classes to force a method lookup
152	# within the Safe compartment.	196	# within the Safe compartment.
153	for my $pkg (qw(	197	for my $pkg (qw(
154	cf::global cf::attachable	198	cf::global cf::attachable
…		…
162	}	206	}
163		207
164	$Event::DIED = sub {	208	$Event::DIED = sub {
165	warn "error in event callback: @_";	209	warn "error in event callback: @_";
166	};	210	};
		211
		212	#############################################################################
167		213
168	=head2 UTILITY FUNCTIONS	214	=head2 UTILITY FUNCTIONS
169		215
170	=over 4	216	=over 4
171		217
…		…
190	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	236	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
191	$d	237	$d
192	} || "[unable to dump $_[0]: '$@']";	238	} || "[unable to dump $_[0]: '$@']";
193	}	239	}
194		240
195	use JSON::Syck (); # TODO# replace by JSON::PC once working	241	use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
196		242
197	=item $ref = cf::from_json $json	243	=item $ref = cf::from_json $json
198		244
199	Converts a JSON string into the corresponding perl data structure.	245	Converts a JSON string into the corresponding perl data structure.
200		246
201	=cut
202
203	sub from_json($) {
204	$JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
205	JSON::Syck::Load $_[0]
206	}
207
208	=item $json = cf::to_json $ref	247	=item $json = cf::to_json $ref
209		248
210	Converts a perl data structure into its JSON representation.	249	Converts a perl data structure into its JSON representation.
211
212	=cut
213
214	sub to_json($) {
215	$JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
216	JSON::Syck::Dump $_[0]
217	}
218		250
219	=item cf::lock_wait $string	251	=item cf::lock_wait $string
220		252
221	Wait until the given lock is available. See cf::lock_acquire.	253	Wait until the given lock is available. See cf::lock_acquire.
222		254
…		…
228	returned.	260	returned.
229		261
230	Lock names should begin with a unique identifier (for example, cf::map::find	262	Lock names should begin with a unique identifier (for example, cf::map::find
231	uses map_find and cf::map::load uses map_load).	263	uses map_find and cf::map::load uses map_load).
232		264
		265	=item $locked = cf::lock_active $string
		266
		267	Return true if the lock is currently active, i.e. somebody has locked it.
		268
233	=cut	269	=cut
234		270
235	our %LOCK;	271	our %LOCK;
236		272
237	sub lock_wait($) {	273	sub lock_wait($) {
…		…
256	# wake up all waiters, to be on the safe side	292	# wake up all waiters, to be on the safe side
257	$_->ready for @{ delete $LOCK{$key} };	293	$_->ready for @{ delete $LOCK{$key} };
258	}	294	}
259	}	295	}
260		296
		297	sub lock_active($) {
		298	my ($key) = @_;
		299
		300	! ! $LOCK{$key}
		301	}
		302
261	sub freeze_mainloop {	303	sub freeze_mainloop {
262	return unless $TICK_WATCHER->is_active;	304	return unless $TICK_WATCHER->is_active;
263		305
264	my $guard = Coro::guard {	306	my $guard = Coro::guard {
265	$TICK_WATCHER->start;	307	$TICK_WATCHER->start;
266	$WRITE_RUNTIME_WATCHER->start;
267	};	308	};
268	$WRITE_RUNTIME_WATCHER->stop;
269	$TICK_WATCHER->stop;	309	$TICK_WATCHER->stop;
270	$guard	310	$guard
271	}	311	}
272		312
273	=item cf::async { BLOCK }	313	=item cf::async { BLOCK }
…		…
280		320
281	BEGIN { *async = \&Coro::async_pool }	321	BEGIN { *async = \&Coro::async_pool }
282		322
283	=item cf::sync_job { BLOCK }	323	=item cf::sync_job { BLOCK }
284		324
285	The design of crossfire+ requires that the main coro ($Coro::main) is	325	The design of Crossfire TRT requires that the main coroutine ($Coro::main)
286	always able to handle events or runnable, as crossfire+ is only partly	326	is always able to handle events or runnable, as Crossfire TRT is only
287	reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable.	327	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
		328	acceptable.
288		329
289	If it must be done, put the blocking parts into C<sync_job>. This will run	330	If it must be done, put the blocking parts into C<sync_job>. This will run
290	the given BLOCK in another coroutine while waiting for the result. The	331	the given BLOCK in another coroutine while waiting for the result. The
291	server will be frozen during this time, so the block should either finish	332	server will be frozen during this time, so the block should either finish
292	fast or be very important.	333	fast or be very important.
…		…
295		336
296	sub sync_job(&) {	337	sub sync_job(&) {
297	my ($job) = @_;	338	my ($job) = @_;
298		339
299	if ($Coro::current == $Coro::main) {	340	if ($Coro::current == $Coro::main) {
		341	my $time = Event::time;
		342
300	# this is the main coro, too bad, we have to block	343	# this is the main coro, too bad, we have to block
301	# till the operation succeeds, freezing the server :/	344	# till the operation succeeds, freezing the server :/
302		345
303	# TODO: use suspend/resume instead	346	# TODO: use suspend/resume instead
304	# (but this is cancel-safe)	347	# (but this is cancel-safe)
…		…
315		358
316	while ($busy) {	359	while ($busy) {
317	Coro::cede or Event::one_event;	360	Coro::cede or Event::one_event;
318	}	361	}
319		362
		363	$time = Event::time - $time;
		364
		365	LOG llevError | logBacktrace, Carp::longmess "long sync job"
		366	if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
		367
		368	$tick_start += $time; # do not account sync jobs to server load
		369
320	wantarray ? @res : $res[0]	370	wantarray ? @res : $res[0]
321	} else {	371	} else {
322	# we are in another coroutine, how wonderful, everything just works	372	# we are in another coroutine, how wonderful, everything just works
323		373
324	$job->()	374	$job->()
…		…
343	$EXT_CORO{$coro+0} = $coro;	393	$EXT_CORO{$coro+0} = $coro;
344		394
345	$coro	395	$coro
346	}	396	}
347		397
348	sub write_runtime {	398	=item fork_call { }, $args
349	my $runtime = cf::localdir . "/runtime";
350		399
351	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644	400	Executes the given code block with the given arguments in a seperate
352	or return;	401	process, returning the results. Everything must be serialisable with
		402	Coro::Storable. May, of course, block. Note that the executed sub may
		403	never block itself or use any form of Event handling.
353		404
354	my $value = $cf::RUNTIME + 90 + 10;	405	=cut
355	# 10 is the runtime save interval, for a monotonic clock
356	# 60 allows for the watchdog to kill the server.
357		406
358	(aio_write $fh, 0, (length $value), $value, 0) <= 0	407	sub fork_call(&@) {
359	and return;	408	my ($cb, @args) = @_;
360		409
361	aio_fsync $fh	410	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
362	and return;	411	# or die "socketpair: $!";
		412	pipe my $fh1, my $fh2
		413	or die "pipe: $!";
363		414
		415	if (my $pid = fork) {
364	close $fh	416	close $fh2;
365	or return;
366		417
367	aio_rename "$runtime~", $runtime	418	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
368	and return;	419	$res = Coro::Storable::thaw $res;
369		420
		421	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
		422
		423	die $$res unless "ARRAY" eq ref $res;
		424
		425	return wantarray ? @$res : $res->[-1];
		426	} else {
		427	reset_signals;
		428	local $SIG{__WARN__};
		429	local $SIG{__DIE__};
		430	eval {
		431	close $fh1;
		432
		433	my @res = eval { $cb->(@args) };
		434	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
		435	};
		436
		437	warn $@ if $@;
		438	_exit 0;
370	1	439	}
		440	}
		441
		442	=item $value = cf::db_get $family => $key
		443
		444	Returns a single value from the environment database.
		445
		446	=item cf::db_put $family => $key => $value
		447
		448	Stores the given C<$value> in the family. It can currently store binary
		449	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
		450
		451	=cut
		452
		453	our $DB;
		454
		455	sub db_init {
		456	unless ($DB) {
		457	$DB = BDB::db_create $DB_ENV;
		458
		459	cf::sync_job {
		460	eval {
		461	$DB->set_flags (BDB::CHKSUM);
		462
		463	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
		464	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
		465	cf::cleanup "db_open(db): $!" if $!;
		466	};
		467	cf::cleanup "db_open(db): $@" if $@;
		468	};
		469	}
		470	}
		471
		472	sub db_get($$) {
		473	my $key = "$_[0]/$_[1]";
		474
		475	cf::sync_job {
		476	BDB::db_get $DB, undef, $key, my $data;
		477
		478	$! ? ()
		479	: $data
		480	}
		481	}
		482
		483	sub db_put($$$) {
		484	BDB::dbreq_pri 4;
		485	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
		486	}
		487
		488	=item cf::cache $id => [$paths...], $processversion => $process
		489
		490	Generic caching function that returns the value of the resource $id,
		491	caching and regenerating as required.
		492
		493	This function can block.
		494
		495	=cut
		496
		497	sub cache {
		498	my ($id, $src, $processversion, $process) = @_;
		499
		500	my $meta =
		501	join "\x00",
		502	$processversion,
		503	map {
		504	aio_stat $_
		505	and Carp::croak "$_: $!";
		506
		507	($_, (stat _)[7,9])
		508	} @$src;
		509
		510	my $dbmeta = db_get cache => "$id/meta";
		511	if ($dbmeta ne $meta) {
		512	# changed, we may need to process
		513
		514	my @data;
		515	my $md5;
		516
		517	for (0 .. $#$src) {
		518	0 <= aio_load $src->[$_], $data[$_]
		519	or Carp::croak "$src->[$_]: $!";
		520	}
		521
		522	# if processing is expensive, check
		523	# checksum first
		524	if (1) {
		525	$md5 =
		526	join "\x00",
		527	$processversion,
		528	map {
		529	Coro::cede;
		530	($src->[$_], Digest::MD5::md5_hex $data[$_])
		531	} 0.. $#$src;
		532
		533
		534	my $dbmd5 = db_get cache => "$id/md5";
		535	if ($dbmd5 eq $md5) {
		536	db_put cache => "$id/meta", $meta;
		537
		538	return db_get cache => "$id/data";
		539	}
		540	}
		541
		542	my $t1 = Time::HiRes::time;
		543	my $data = $process->(\@data);
		544	my $t2 = Time::HiRes::time;
		545
		546	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
		547
		548	db_put cache => "$id/data", $data;
		549	db_put cache => "$id/md5" , $md5;
		550	db_put cache => "$id/meta", $meta;
		551
		552	return $data;
		553	}
		554
		555	db_get cache => "$id/data"
		556	}
		557
		558	=item cf::datalog type => key => value, ...
		559
		560	Log a datalog packet of the given type with the given key-value pairs.
		561
		562	=cut
		563
		564	sub datalog($@) {
		565	my ($type, %kv) = @_;
		566	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
371	}	567	}
372		568
373	=back	569	=back
374		570
375	=cut	571	=cut
…		…
382	attach callbacks/event handlers (a collection of which is called an "attachment")	578	attach callbacks/event handlers (a collection of which is called an "attachment")
383	to it. All such attachable objects support the following methods.	579	to it. All such attachable objects support the following methods.
384		580
385	In the following description, CLASS can be any of C<global>, C<object>	581	In the following description, CLASS can be any of C<global>, C<object>
386	C<player>, C<client> or C<map> (i.e. the attachable objects in	582	C<player>, C<client> or C<map> (i.e. the attachable objects in
387	crossfire+).	583	Crossfire TRT).
388		584
389	=over 4	585	=over 4
390		586
391	=item $attachable->attach ($attachment, key => $value...)	587	=item $attachable->attach ($attachment, key => $value...)
392		588
…		…
555	$registry = $CB_TYPE[$object_type] ||= [];	751	$registry = $CB_TYPE[$object_type] ||= [];
556		752
557	} elsif ($type eq "subtype") {	753	} elsif ($type eq "subtype") {
558	defined $object_type or Carp::croak "subtype specified without type";	754	defined $object_type or Carp::croak "subtype specified without type";
559	my $object_subtype = shift @arg;	755	my $object_subtype = shift @arg;
560	$registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= [];	756	$registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
561		757
562	} elsif ($type eq "package") {	758	} elsif ($type eq "package") {
563	my $pkg = shift @arg;	759	my $pkg = shift @arg;
564		760
565	while (my ($name, $id) = each %cb_id) {	761	while (my ($name, $id) = each %cb_id) {
…		…
594	_attach $registry, $klass, @attach;	790	_attach $registry, $klass, @attach;
595	}	791	}
596		792
597	$obj->{$name} = \%arg;	793	$obj->{$name} = \%arg;
598	} else {	794	} else {
599	warn "object uses attachment '$name' that is not available, postponing.\n";	795	warn "object uses attachment '$name' which is not available, postponing.\n";
600	}	796	}
601		797
602	$obj->{_attachment}{$name} = undef;	798	$obj->{_attachment}{$name} = undef;
603	}	799	}
604		800
…		…
606	if (ref $_[0]) {	802	if (ref $_[0]) {
607	_object_attach @_;	803	_object_attach @_;
608	} else {	804	} else {
609	_attach shift->_attach_registry, @_;	805	_attach shift->_attach_registry, @_;
610	}	806	}
		807	_recalc_want;
611	};	808	};
612		809
613	# all those should be optimised	810	# all those should be optimised
614	sub cf::attachable::detach {	811	sub cf::attachable::detach {
615	my ($obj, $name) = @_;	812	my ($obj, $name) = @_;
…		…
618	delete $obj->{_attachment}{$name};	815	delete $obj->{_attachment}{$name};
619	reattach ($obj);	816	reattach ($obj);
620	} else {	817	} else {
621	Carp::croak "cannot, currently, detach class attachments";	818	Carp::croak "cannot, currently, detach class attachments";
622	}	819	}
		820	_recalc_want;
623	};	821	};
624		822
625	sub cf::attachable::attached {	823	sub cf::attachable::attached {
626	my ($obj, $name) = @_;	824	my ($obj, $name) = @_;
627		825
…		…
750	$filename, length $$rdata, scalar @$objs;	948	$filename, length $$rdata, scalar @$objs;
751		949
752	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	950	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
753	chmod SAVE_MODE, $fh;	951	chmod SAVE_MODE, $fh;
754	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	952	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
755	aio_fsync $fh;	953	aio_fsync $fh if $cf::USE_FSYNC;
756	close $fh;	954	close $fh;
757		955
758	if (@$objs) {	956	if (@$objs) {
759	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {	957	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
760	chmod SAVE_MODE, $fh;	958	chmod SAVE_MODE, $fh;
761	my $data = Storable::nfreeze { version => 1, objs => $objs };	959	my $data = Storable::nfreeze { version => 1, objs => $objs };
762	aio_write $fh, 0, (length $data), $data, 0;	960	aio_write $fh, 0, (length $data), $data, 0;
763	aio_fsync $fh;	961	aio_fsync $fh if $cf::USE_FSYNC;
764	close $fh;	962	close $fh;
765	aio_rename "$filename.pst~", "$filename.pst";	963	aio_rename "$filename.pst~", "$filename.pst";
766	}	964	}
767	} else {	965	} else {
768	aio_unlink "$filename.pst";	966	aio_unlink "$filename.pst";
…		…
800	or return;	998	or return;
801	$av = eval { (Storable::thaw $av)->{objs} };	999	$av = eval { (Storable::thaw $av)->{objs} };
802	}	1000	}
803		1001
804	warn sprintf "loading %s (%d)\n",	1002	warn sprintf "loading %s (%d)\n",
805	$filename, length $data, scalar @{$av || []};#d#	1003	$filename, length $data, scalar @{$av || []};
806	return ($data, $av);	1004	return ($data, $av);
807	}	1005	}
		1006
		1007	=head2 COMMAND CALLBACKS
		1008
		1009	=over 4
		1010
		1011	=cut
808		1012
809	#############################################################################	1013	#############################################################################
810	# command handling &c	1014	# command handling &c
811		1015
812	=item cf::register_command $name => \&callback($ob,$args);	1016	=item cf::register_command $name => \&callback($ob,$args);
…		…
825	push @{ $COMMAND{$name} }, [$caller, $cb];	1029	push @{ $COMMAND{$name} }, [$caller, $cb];
826	}	1030	}
827		1031
828	=item cf::register_extcmd $name => \&callback($pl,$packet);	1032	=item cf::register_extcmd $name => \&callback($pl,$packet);
829		1033
830	Register a callbackf ro execution when the client sends an extcmd packet.	1034	Register a callback fro execution when the client sends an extcmd packet.
831		1035
832	If the callback returns something, it is sent back as if reply was being	1036	If the callback returns something, it is sent back as if reply was being
833	called.	1037	called.
834		1038
835	=cut	1039	=cut
…		…
870		1074
871	cf::override;	1075	cf::override;
872	},	1076	},
873	);	1077	);
874		1078
875	sub load_extension {
876	my ($path) = @_;
877
878	$path =~ /([^\/\\]+)\.ext$/ or die "$path";
879	my $base = $1;
880	my $pkg = $1;
881	$pkg =~ s/[^[:word:]]/_/g;
882	$pkg = "ext::$pkg";
883
884	warn "... loading '$path' into '$pkg'\n";
885
886	open my $fh, "<:utf8", $path
887	or die "$path: $!";
888
889	my $source =
890	"package $pkg; use strict; use utf8;\n"
891	. "#line 1 \"$path\"\n{\n"
892	. (do { local $/; <$fh> })
893	. "\n};\n1";
894
895	unless (eval $source) {
896	my $msg = $@ ? "$path: $@\n"
897	: "extension disabled.\n";
898	if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
899	warn $@;
900	warn "mandatory extension failed to load, exiting.\n";
901	exit 1;
902	}
903	die $@;
904	}
905
906	push @EXTS, $pkg;
907	}
908
909	sub load_extensions {	1079	sub load_extensions {
		1080	cf::sync_job {
		1081	my %todo;
		1082
910	for my $ext (<$LIBDIR/*.ext>) {	1083	for my $path (<$LIBDIR/*.ext>) {
911	next unless -r $ext;	1084	next unless -r $path;
912	eval {	1085
913	load_extension $ext;	1086	$path =~ /([^\/\\]+)\.ext$/ or die "$path";
		1087	my $base = $1;
		1088	my $pkg = $1;
		1089	$pkg =~ s/[^[:word:]]/_/g;
		1090	$pkg = "ext::$pkg";
		1091
		1092	open my $fh, "<:utf8", $path
		1093	or die "$path: $!";
		1094
		1095	my $source = do { local $/; <$fh> };
		1096
		1097	my %ext = (
		1098	path => $path,
		1099	base => $base,
		1100	pkg => $pkg,
		1101	);
		1102
		1103	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
		1104	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
		1105
		1106	$ext{source} =
		1107	"package $pkg; use strict; use utf8;\n"
		1108	. "#line 1 \"$path\"\n{\n"
		1109	. $source
		1110	. "\n};\n1";
		1111
		1112	$todo{$base} = \%ext;
		1113	}
		1114
		1115	my %done;
		1116	while (%todo) {
		1117	my $progress;
		1118
		1119	while (my ($k, $v) = each %todo) {
		1120	for (split /,\s*/, $v->{meta}{depends}) {
		1121	goto skip
		1122	unless exists $done{$_};
		1123	}
		1124
		1125	warn "... loading '$k' into '$v->{pkg}'\n";
		1126
		1127	unless (eval $v->{source}) {
		1128	my $msg = $@ ? "$v->{path}: $@\n"
		1129	: "$v->{base}: extension inactive.\n";
		1130
		1131	if (exists $v->{meta}{mandatory}) {
		1132	warn $msg;
		1133	warn "mandatory extension failed to load, exiting.\n";
		1134	exit 1;
		1135	}
		1136
		1137	warn $msg;
		1138	}
		1139
		1140	$done{$k} = delete $todo{$k};
		1141	push @EXTS, $v->{pkg};
		1142	$progress = 1;
914	1	1143	}
915	} or warn "$ext not loaded: $@";	1144
		1145	skip:
		1146	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
		1147	unless $progress;
		1148	}
916	}	1149	};
917	}	1150	}
918		1151
919	#############################################################################	1152	#############################################################################
920		1153
		1154	=back
		1155
921	=head2 CORE EXTENSIONS	1156	=head2 CORE EXTENSIONS
922		1157
923	Functions and methods that extend core crossfire objects.	1158	Functions and methods that extend core crossfire objects.
924		1159
925	=cut	1160	=cut
…		…
937	Returns the given player object, loading it if necessary (might block).	1172	Returns the given player object, loading it if necessary (might block).
938		1173
939	=cut	1174	=cut
940		1175
941	sub playerdir($) {	1176	sub playerdir($) {
942	cf::localdir	1177	"$PLAYERDIR/"
943	. "/"
944	. cf::playerdir
945	. "/"
946	. (ref $_[0] ? $_[0]->ob->name : $_[0])	1178	. (ref $_[0] ? $_[0]->ob->name : $_[0])
947	}	1179	}
948		1180
949	sub path($) {	1181	sub path($) {
950	my $login = ref $_[0] ? $_[0]->ob->name : $_[0];	1182	my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
951		1183
952	(playerdir $login) . "/$login.pl"	1184	(playerdir $login) . "/playerdata"
953	}	1185	}
954		1186
955	sub find_active($) {	1187	sub find_active($) {
956	$cf::PLAYER{$_[0]}	1188	$cf::PLAYER{$_[0]}
957	and $cf::PLAYER{$_[0]}->active	1189	and $cf::PLAYER{$_[0]}->active
…		…
970	my $login = $_[0];	1202	my $login = $_[0];
971		1203
972	my $guard = cf::lock_acquire "user_find:$login";	1204	my $guard = cf::lock_acquire "user_find:$login";
973		1205
974	$cf::PLAYER{$_[0]} || do {	1206	$cf::PLAYER{$_[0]} || do {
		1207	# rename old playerfiles to new ones
		1208	#TODO: remove when no longer required
		1209	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
		1210	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
		1211	aio_unlink +(playerdir $login) . "/$login.pl.pst";
		1212	aio_unlink +(playerdir $login) . "/$login.pl";
		1213
975	my $pl = load_pl path $login	1214	my $pl = load_pl path $login
976	or return;	1215	or return;
977	$cf::PLAYER{$login} = $pl	1216	$cf::PLAYER{$login} = $pl
978	}	1217	}
979	}	1218	}
…		…
1016		1255
1017	=cut	1256	=cut
1018		1257
1019	sub quit_character {	1258	sub quit_character {
1020	my ($pl) = @_;	1259	my ($pl) = @_;
		1260
		1261	my $name = $pl->ob->name;
1021		1262
1022	$pl->{deny_save} = 1;	1263	$pl->{deny_save} = 1;
1023	$pl->password ("*"); # this should lock out the player until we nuked the dir	1264	$pl->password ("*"); # this should lock out the player until we nuked the dir
1024		1265
1025	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1266	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
…		…
1030	my $path = playerdir $pl;	1271	my $path = playerdir $pl;
1031	my $temp = "$path~$cf::RUNTIME~deleting~";	1272	my $temp = "$path~$cf::RUNTIME~deleting~";
1032	aio_rename $path, $temp;	1273	aio_rename $path, $temp;
1033	delete $cf::PLAYER{$pl->ob->name};	1274	delete $cf::PLAYER{$pl->ob->name};
1034	$pl->destroy;	1275	$pl->destroy;
		1276
		1277	my $prefix = qr<^~\Q$name\E/>;
		1278
		1279	# nuke player maps
		1280	$cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
		1281
1035	IO::AIO::aio_rmtree $temp;	1282	IO::AIO::aio_rmtree $temp;
		1283	}
		1284
		1285	=item $pl->kick
		1286
		1287	Kicks a player out of the game. This destroys the connection.
		1288
		1289	=cut
		1290
		1291	sub kick {
		1292	my ($pl, $kicker) = @_;
		1293
		1294	$pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
		1295	$pl->killer ("kicked");
		1296	$pl->ns->destroy;
1036	}	1297	}
1037		1298
1038	=item cf::player::list_logins	1299	=item cf::player::list_logins
1039		1300
1040	Returns am arrayref of all valid playernames in the system, can take a	1301	Returns am arrayref of all valid playernames in the system, can take a
1041	while and may block, so not sync_job-capable, ever.	1302	while and may block, so not sync_job-capable, ever.
1042		1303
1043	=cut	1304	=cut
1044		1305
1045	sub list_logins {	1306	sub list_logins {
1046	my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir	1307	my $dirs = aio_readdir $PLAYERDIR
1047	or return [];	1308	or return [];
1048		1309
1049	my @logins;	1310	my @logins;
1050		1311
1051	for my $login (@$dirs) {	1312	for my $login (@$dirs) {
…		…
1068	=cut	1329	=cut
1069		1330
1070	sub maps($) {	1331	sub maps($) {
1071	my ($pl) = @_;	1332	my ($pl) = @_;
1072		1333
		1334	$pl = ref $pl ? $pl->ob->name : $pl;
		1335
1073	my $files = aio_readdir playerdir $pl	1336	my $files = aio_readdir playerdir $pl
1074	or return;	1337	or return;
1075		1338
1076	my @paths;	1339	my @paths;
1077		1340
1078	for (@$files) {	1341	for (@$files) {
1079	utf8::decode $_;	1342	utf8::decode $_;
1080	next if /\.(?:pl|pst)$/;	1343	next if /\.(?:pl|pst)$/;
1081	next unless /^$PATH_SEP/o;	1344	next unless /^$PATH_SEP/o;
1082		1345
1083	s/\.map$//;	1346	push @paths, cf::map::normalise "~$pl/$_";
1084	push @paths, "~" . $pl->ob->name . "/" . $_;
1085	}	1347	}
1086		1348
1087	\@paths	1349	\@paths
1088	}	1350	}
1089		1351
1090	=item $player->ext_reply ($msgid, $msgtype, %msg)	1352	=item $player->ext_reply ($msgid, %msg)
1091		1353
1092	Sends an ext reply to the player.	1354	Sends an ext reply to the player.
1093		1355
1094	=cut	1356	=cut
1095		1357
1096	sub ext_reply($$$%) {	1358	sub ext_reply($$%) {
1097	my ($self, $id, %msg) = @_;	1359	my ($self, $id, %msg) = @_;
1098		1360
1099	$msg{msgid} = $id;	1361	$msg{msgid} = $id;
1100		1362
1101	$self->send ("ext " . cf::to_json \%msg);	1363	$self->send ("ext " . cf::to_json \%msg);
1102	}	1364	}
1103		1365
1104	package cf;	1366	=item $player->ext_event ($type, %msg)
		1367
		1368	Sends an ext event to the client.
		1369
		1370	=cut
		1371
		1372	sub ext_event($$%) {
		1373	my ($self, $type, %msg) = @_;
		1374
		1375	$self->ns->ext_event ($type, %msg);
		1376	}
		1377
		1378	=head3 cf::region
		1379
		1380	=over 4
		1381
		1382	=cut
		1383
		1384	package cf::region;
		1385
		1386	=item cf::region::find_by_path $path
		1387
		1388	Tries to decuce the likely region for a map knowing only its path.
		1389
		1390	=cut
		1391
		1392	sub find_by_path($) {
		1393	my ($path) = @_;
		1394
		1395	my ($match, $specificity);
		1396
		1397	for my $region (list) {
		1398	if ($region->match && $path =~ $region->match) {
		1399	($match, $specificity) = ($region, $region->specificity)
		1400	if $region->specificity > $specificity;
		1401	}
		1402	}
		1403
		1404	$match
		1405	}
1105		1406
1106	=back	1407	=back
1107
1108		1408
1109	=head3 cf::map	1409	=head3 cf::map
1110		1410
1111	=over 4	1411	=over 4
1112		1412
…		…
1167	my ($self, $merge) = @_;	1467	my ($self, $merge) = @_;
1168		1468
1169	# we have to keep some variables in memory intact	1469	# we have to keep some variables in memory intact
1170	local $self->{path};	1470	local $self->{path};
1171	local $self->{load_path};	1471	local $self->{load_path};
1172	local $self->{deny_save};
1173	local $self->{deny_reset};
1174		1472
1175	$self->SUPER::thawer_merge ($merge);	1473	$self->SUPER::thawer_merge ($merge);
1176	}	1474	}
1177		1475
1178	sub normalise {	1476	sub normalise {
1179	my ($path, $base) = @_;	1477	my ($path, $base) = @_;
		1478
		1479	$path = "$path"; # make sure its a string
		1480
		1481	$path =~ s/\.map$//;
1180		1482
1181	# map plan:	1483	# map plan:
1182	#	1484	#
1183	# /! non-realised random map exit (special hack!)	1485	# /! non-realised random map exit (special hack!)
1184	# {... are special paths that are not being touched	1486	# {... are special paths that are not being touched
…		…
1221	$self->init; # pass $1 etc.	1523	$self->init; # pass $1 etc.
1222	return $self;	1524	return $self;
1223	}	1525	}
1224	}	1526	}
1225		1527
1226	Carp::carp "unable to resolve path '$path'.";	1528	Carp::carp "unable to resolve path '$path' (base '$base').";
1227	()	1529	()
1228	}	1530	}
1229		1531
1230	sub init {	1532	sub init {
1231	my ($self) = @_;	1533	my ($self) = @_;
…		…
1246		1548
1247	# the original (read-only) location	1549	# the original (read-only) location
1248	sub load_path {	1550	sub load_path {
1249	my ($self) = @_;	1551	my ($self) = @_;
1250		1552
1251	sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}	1553	"$MAPDIR/$self->{path}.map"
1252	}	1554	}
1253		1555
1254	# the temporary/swap location	1556	# the temporary/swap location
1255	sub save_path {	1557	sub save_path {
1256	my ($self) = @_;	1558	my ($self) = @_;
1257		1559
1258	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1560	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1259	sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path	1561	"$TMPDIR/$path.map"
1260	}	1562	}
1261		1563
1262	# the unique path, undef == no special unique path	1564	# the unique path, undef == no special unique path
1263	sub uniq_path {	1565	sub uniq_path {
1264	my ($self) = @_;	1566	my ($self) = @_;
1265		1567
1266	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1568	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1267	sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path	1569	"$UNIQUEDIR/$path"
1268	}	1570	}
1269		1571
1270	# and all this just because we cannot iterate over	1572	# and all this just because we cannot iterate over
1271	# all maps in C++...	1573	# all maps in C++...
1272	sub change_all_map_light {	1574	sub change_all_map_light {
…		…
1274		1576
1275	$_->change_map_light ($change)	1577	$_->change_map_light ($change)
1276	for grep $_->outdoor, values %cf::MAP;	1578	for grep $_->outdoor, values %cf::MAP;
1277	}	1579	}
1278		1580
		1581	sub decay_objects {
		1582	my ($self) = @_;
		1583
		1584	return if $self->{deny_reset};
		1585
		1586	$self->do_decay_objects;
		1587	}
		1588
1279	sub unlink_save {	1589	sub unlink_save {
1280	my ($self) = @_;	1590	my ($self) = @_;
1281		1591
1282	utf8::encode (my $save = $self->save_path);	1592	utf8::encode (my $save = $self->save_path);
1283	IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;	1593	IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
…		…
1286		1596
1287	sub load_header_from($) {	1597	sub load_header_from($) {
1288	my ($self, $path) = @_;	1598	my ($self, $path) = @_;
1289		1599
1290	utf8::encode $path;	1600	utf8::encode $path;
1291	aio_open $path, O_RDONLY, 0	1601	#aio_open $path, O_RDONLY, 0
1292	or return;	1602	# or return;
1293		1603
1294	$self->_load_header ($path)	1604	$self->_load_header ($path)
1295	or return;	1605	or return;
1296		1606
1297	$self->{load_path} = $path;	1607	$self->{load_path} = $path;
1298		1608
1299	1	1609	1
1300	}	1610	}
1301		1611
1302	sub load_orig {	1612	sub load_header_orig {
1303	my ($self) = @_;	1613	my ($self) = @_;
1304		1614
1305	$self->load_header_from ($self->load_path)	1615	$self->load_header_from ($self->load_path)
1306	}	1616	}
1307		1617
1308	sub load_temp {	1618	sub load_header_temp {
1309	my ($self) = @_;	1619	my ($self) = @_;
1310		1620
1311	$self->load_header_from ($self->save_path)	1621	$self->load_header_from ($self->save_path)
		1622	}
		1623
		1624	sub prepare_temp {
		1625	my ($self) = @_;
		1626
		1627	$self->last_access ((delete $self->{last_access})
		1628	|| $cf::RUNTIME); #d#
		1629	# safety
		1630	$self->{instantiate_time} = $cf::RUNTIME
		1631	if $self->{instantiate_time} > $cf::RUNTIME;
		1632	}
		1633
		1634	sub prepare_orig {
		1635	my ($self) = @_;
		1636
		1637	$self->{load_original} = 1;
		1638	$self->{instantiate_time} = $cf::RUNTIME;
		1639	$self->last_access ($cf::RUNTIME);
		1640	$self->instantiate;
1312	}	1641	}
1313		1642
1314	sub load_header {	1643	sub load_header {
1315	my ($self) = @_;	1644	my ($self) = @_;
1316		1645
1317	if ($self->load_temp) {	1646	if ($self->load_header_temp) {
1318	$self->last_access ((delete $self->{last_access})	1647	$self->prepare_temp;
1319	|| $cf::RUNTIME); #d#
1320	# safety
1321	$self->{instantiate_time} = $cf::RUNTIME
1322	if $self->{instantiate_time} > $cf::RUNTIME;
1323	} else {	1648	} else {
1324	$self->load_orig	1649	$self->load_header_orig
1325	or return;	1650	or return;
1326		1651	$self->prepare_orig;
1327	$self->{load_original} = 1;
1328	$self->{instantiate_time} = $cf::RUNTIME;
1329	$self->last_access ($cf::RUNTIME);
1330	$self->instantiate;
1331	}	1652	}
		1653
		1654	$self->{deny_reset} = 1
		1655	if $self->no_reset;
		1656
		1657	$self->default_region (cf::region::find_by_path $self->{path})
		1658	unless $self->default_region;
1332		1659
1333	1	1660	1
1334	}	1661	}
1335		1662
1336	sub find;	1663	sub find;
…		…
1349	$map->{last_save} = $cf::RUNTIME;	1676	$map->{last_save} = $cf::RUNTIME;
1350		1677
1351	$map->load_header	1678	$map->load_header
1352	or return;	1679	or return;
1353		1680
1354	if ($map->should_reset) {	1681	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1355	# doing this can freeze the server in a sync job, obviously	1682	# doing this can freeze the server in a sync job, obviously
1356	#$cf::WAIT_FOR_TICK->wait;	1683	#$cf::WAIT_FOR_TICK->wait;
1357	$map->reset;	1684	$map->reset;
1358	undef $guard;	1685	undef $guard;
1359	$map = find $path	1686	return find $path;
1360	or return;
1361	}	1687	}
1362		1688
1363	$cf::MAP{$path} = $map	1689	$cf::MAP{$path} = $map
1364	}	1690	}
1365	}	1691	}
		1692
		1693	sub pre_load { }
		1694	sub post_load { }
1366		1695
1367	sub load {	1696	sub load {
1368	my ($self) = @_;	1697	my ($self) = @_;
1369		1698
		1699	local $self->{deny_reset} = 1; # loading can take a long time
		1700
1370	my $path = $self->{path};	1701	my $path = $self->{path};
		1702
		1703	{
1371	my $guard = cf::lock_acquire "map_load:$path";	1704	my $guard = cf::lock_acquire "map_load:$path";
1372		1705
1373	return if $self->in_memory != cf::MAP_SWAPPED;	1706	return if $self->in_memory != cf::MAP_SWAPPED;
1374		1707
1375	$self->in_memory (cf::MAP_LOADING);	1708	$self->in_memory (cf::MAP_LOADING);
1376		1709
1377	$self->alloc;	1710	$self->alloc;
1378	$self->_load_objects ($self->{load_path}, 1)
1379	or return;
1380		1711
1381	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1712	$self->pre_load;
1382	if delete $self->{load_original};
1383
1384	if (my $uniq = $self->uniq_path) {
1385	utf8::encode $uniq;
1386	if (aio_open $uniq, O_RDONLY, 0) {
1387	$self->clear_unique_items;
1388	$self->_load_objects ($uniq, 0);
1389	}
1390	}
1391
1392	Coro::cede;
1393
1394	# now do the right thing for maps
1395	$self->link_multipart_objects;
1396
1397	unless ($self->{deny_activate}) {
1398	$self->decay_objects;
1399	$self->fix_auto_apply;
1400	$self->update_buttons;
1401	Coro::cede;	1713	Coro::cede;
1402	$self->set_darkness_map;	1714
		1715	$self->_load_objects ($self->{load_path}, 1)
		1716	or return;
		1717
		1718	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
		1719	if delete $self->{load_original};
		1720
		1721	if (my $uniq = $self->uniq_path) {
		1722	utf8::encode $uniq;
		1723	if (aio_open $uniq, O_RDONLY, 0) {
		1724	$self->clear_unique_items;
		1725	$self->_load_objects ($uniq, 0);
		1726	}
		1727	}
		1728
		1729	Coro::cede;
		1730	# now do the right thing for maps
		1731	$self->link_multipart_objects;
1403	$self->difficulty ($self->estimate_difficulty)	1732	$self->difficulty ($self->estimate_difficulty)
1404	unless $self->difficulty;	1733	unless $self->difficulty;
1405	Coro::cede;	1734	Coro::cede;
		1735
		1736	unless ($self->{deny_activate}) {
		1737	$self->decay_objects;
		1738	$self->fix_auto_apply;
		1739	$self->update_buttons;
		1740	Coro::cede;
		1741	$self->set_darkness_map;
		1742	Coro::cede;
1406	$self->activate;	1743	$self->activate;
1407	}	1744	}
1408		1745
1409	$self->in_memory (cf::MAP_IN_MEMORY);	1746	$self->in_memory (cf::MAP_IN_MEMORY);
		1747	}
		1748
		1749	$self->post_load;
1410	}	1750	}
1411		1751
1412	sub customise_for {	1752	sub customise_for {
1413	my ($self, $ob) = @_;	1753	my ($self, $ob) = @_;
1414		1754
1415	return find "~" . $ob->name . "/" . $self->{path}	1755	return find "~" . $ob->name . "/" . $self->{path}
1416	if $self->per_player;	1756	if $self->per_player;
		1757
		1758	# return find "?party/" . $ob->name . "/" . $self->{path}
		1759	# if $self->per_party;
1417		1760
1418	$self	1761	$self
1419	}	1762	}
1420		1763
1421	# find and load all maps in the 3x3 area around a map	1764	# find and load all maps in the 3x3 area around a map
…		…
1477	delete $MAP_PREFETCH{$path};	1820	delete $MAP_PREFETCH{$path};
1478	}	1821	}
1479	}	1822	}
1480	undef $MAP_PREFETCHER;	1823	undef $MAP_PREFETCHER;
1481	};	1824	};
		1825	$MAP_PREFETCHER->prio (6);
1482		1826
1483	()	1827	()
1484	}	1828	}
1485		1829
1486	sub save {	1830	sub save {
…		…
1531		1875
1532	sub reset_at {	1876	sub reset_at {
1533	my ($self) = @_;	1877	my ($self) = @_;
1534		1878
1535	# TODO: safety, remove and allow resettable per-player maps	1879	# TODO: safety, remove and allow resettable per-player maps
1536	return 1e99 if $self->isa ("ext::map_per_player");#d#
1537	return 1e99 if $self->{deny_reset};	1880	return 1e99 if $self->{deny_reset};
1538		1881
1539	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;	1882	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1540	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;	1883	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1541		1884
…		…
1552	my ($self) = @_;	1895	my ($self) = @_;
1553		1896
1554	my $lock = cf::lock_acquire "map_data:$self->{path}";	1897	my $lock = cf::lock_acquire "map_data:$self->{path}";
1555		1898
1556	return if $self->players;	1899	return if $self->players;
1557	return if $self->isa ("ext::map_per_player");#d#
1558		1900
1559	warn "resetting map ", $self->path;#d#	1901	warn "resetting map ", $self->path;
		1902
		1903	$self->in_memory (cf::MAP_SWAPPED);
		1904
		1905	# need to save uniques path
		1906	unless ($self->{deny_save}) {
		1907	my $uniq = $self->uniq_path; utf8::encode $uniq;
		1908
		1909	$self->_save_objects ($uniq, cf::IO_UNIQUES)
		1910	if $uniq;
		1911	}
1560		1912
1561	delete $cf::MAP{$self->path};	1913	delete $cf::MAP{$self->path};
1562		1914
1563	$self->in_memory (cf::MAP_SWAPPED);
1564	$self->clear;	1915	$self->clear;
1565		1916
1566	$_->clear_links_to ($self) for values %cf::MAP;	1917	$_->clear_links_to ($self) for values %cf::MAP;
1567		1918
1568	$self->unlink_save;	1919	$self->unlink_save;
…		…
1587	$cf::MAP{$self->path} = $self;	1938	$cf::MAP{$self->path} = $self;
1588		1939
1589	$self->reset; # polite request, might not happen	1940	$self->reset; # polite request, might not happen
1590	}	1941	}
1591		1942
		1943	=item $maps = cf::map::tmp_maps
		1944
		1945	Returns an arrayref with all map paths of currently instantiated and saved
		1946	maps. May block.
		1947
		1948	=cut
		1949
		1950	sub tmp_maps() {
		1951	[
		1952	map {
		1953	utf8::decode $_;
		1954	/\.map$/
		1955	? normalise $_
		1956	: ()
		1957	} @{ aio_readdir $TMPDIR or [] }
		1958	]
		1959	}
		1960
		1961	=item $maps = cf::map::random_maps
		1962
		1963	Returns an arrayref with all map paths of currently instantiated and saved
		1964	random maps. May block.
		1965
		1966	=cut
		1967
		1968	sub random_maps() {
		1969	[
		1970	map {
		1971	utf8::decode $_;
		1972	/\.map$/
		1973	? normalise "?random/$_"
		1974	: ()
		1975	} @{ aio_readdir $RANDOMDIR or [] }
		1976	]
		1977	}
		1978
1592	=item cf::map::unique_maps	1979	=item cf::map::unique_maps
1593		1980
1594	Returns an arrayref of paths of all shared maps that have	1981	Returns an arrayref of paths of all shared maps that have
1595	instantiated unique items. May block.	1982	instantiated unique items. May block.
1596		1983
1597	=cut	1984	=cut
1598		1985
1599	sub unique_maps() {	1986	sub unique_maps() {
1600	my $files = aio_readdir cf::localdir . "/" . cf::uniquedir	1987	[
1601	or return;	1988	map {
1602
1603	my @paths;
1604
1605	for (@$files) {
1606	utf8::decode $_;	1989	utf8::decode $_;
1607	next if /\.pst$/;
1608	next unless /^$PATH_SEP/o;
1609
1610	s/\.map$//;	1990	/\.map$/
1611	push @paths, $_;	1991	? normalise $_
		1992	: ()
		1993	} @{ aio_readdir $UNIQUEDIR or [] }
1612	}	1994	]
1613
1614	\@paths
1615	}	1995	}
1616		1996
1617	package cf;	1997	package cf;
1618		1998
1619	=back	1999	=back
…		…
1665		2045
1666	$flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;	2046	$flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1667		2047
1668	if ($self->{record_replies}) {	2048	if ($self->{record_replies}) {
1669	push @{ $self->{record_replies} }, [$npc, $msg, $flags];	2049	push @{ $self->{record_replies} }, [$npc, $msg, $flags];
		2050
1670	} else {	2051	} else {
		2052	my $pl = $self->contr;
		2053
		2054	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
		2055	my $diag = $pl->{npc_dialog};
		2056	$diag->{pl}->ext_reply (
		2057	$diag->{id}, msgtype => "reply", msg => $msg, add_topics => []
		2058	);
		2059
		2060	} else {
1671	$msg = $npc->name . " says: $msg" if $npc;	2061	$msg = $npc->name . " says: $msg" if $npc;
1672	$self->message ($msg, $flags);	2062	$self->message ($msg, $flags);
		2063	}
1673	}	2064	}
1674	}	2065	}
1675		2066
1676	=item $player_object->may ("access")	2067	=item $player_object->may ("access")
1677		2068
…		…
1710	=cut	2101	=cut
1711		2102
1712	sub link_map {	2103	sub link_map {
1713	unless ($LINK_MAP) {	2104	unless ($LINK_MAP) {
1714	$LINK_MAP = cf::map::find "{link}"	2105	$LINK_MAP = cf::map::find "{link}"
1715	or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 };	2106	or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1716	$LINK_MAP->load;	2107	$LINK_MAP->load;
1717	}	2108	}
1718		2109
1719	$LINK_MAP	2110	$LINK_MAP
1720	}	2111	}
…		…
1725	$self->deactivate_recursive;	2116	$self->deactivate_recursive;
1726		2117
1727	return if UNIVERSAL::isa $self->map, "ext::map_link";	2118	return if UNIVERSAL::isa $self->map, "ext::map_link";
1728		2119
1729	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2120	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1730	if $self->map;	2121	if $self->map && $self->map->{path} ne "{link}";
1731		2122
1732	$self->enter_map ($LINK_MAP || link_map, 20, 20);	2123	$self->enter_map ($LINK_MAP || link_map, 10, 10);
1733	}	2124	}
1734		2125
1735	sub cf::object::player::leave_link {	2126	sub cf::object::player::leave_link {
1736	my ($self, $map, $x, $y) = @_;	2127	my ($self, $map, $x, $y) = @_;
		2128
		2129	return unless $self->contr->active;
1737		2130
1738	my $link_pos = delete $self->{_link_pos};	2131	my $link_pos = delete $self->{_link_pos};
1739		2132
1740	unless ($map) {	2133	unless ($map) {
1741	# restore original map position	2134	# restore original map position
…		…
1759	$map->load;	2152	$map->load;
1760	$map->load_diag;	2153	$map->load_diag;
1761		2154
1762	return unless $self->contr->active;	2155	return unless $self->contr->active;
1763	$self->activate_recursive;	2156	$self->activate_recursive;
		2157
		2158	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1764	$self->enter_map ($map, $x, $y);	2159	$self->enter_map ($map, $x, $y);
1765	}	2160	}
1766		2161
1767	cf::player->attach (
1768	on_logout => sub {
1769	my ($pl) = @_;
1770
1771	# abort map switching before logout
1772	if ($pl->ob->{_link_pos}) {
1773	cf::sync_job {
1774	$pl->ob->leave_link
1775	};
1776	}
1777	},
1778	on_login => sub {
1779	my ($pl) = @_;
1780
1781	# try to abort aborted map switching on player login :)
1782	# should happen only on crashes
1783	if ($pl->ob->{_link_pos}) {
1784	$pl->ob->enter_link;
1785	(async {
1786	# we need this sleep as the login has a concurrent enter_exit running
1787	# and this sleep increases chances of the player not ending up in scorn
1788	$pl->ob->reply (undef,
1789	"There was an internal problem at your last logout, "
1790	. "the server will try to bring you to your intended destination in a second.",
1791	cf::NDI_RED);
1792	Coro::Timer::sleep 1;
1793	$pl->ob->leave_link;
1794	})->prio (2);
1795	}
1796	},
1797	);
1798
1799	=item $player_object->goto ($path, $x, $y)	2162	=item $player_object->goto ($path, $x, $y[, $check->($map)])
1800		2163
		2164	Moves the player to the given map-path and coordinates by first freezing
		2165	her, loading and preparing them map, calling the provided $check callback
		2166	that has to return the map if sucecssful, and then unfreezes the player on
		2167	the new (success) or old (failed) map position.
		2168
1801	=cut	2169	=cut
		2170
		2171	our $GOTOGEN;
1802		2172
1803	sub cf::object::player::goto {	2173	sub cf::object::player::goto {
1804	my ($self, $path, $x, $y) = @_;	2174	my ($self, $path, $x, $y, $check) = @_;
		2175
		2176	# do generation counting so two concurrent goto's will be executed in-order
		2177	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1805		2178
1806	$self->enter_link;	2179	$self->enter_link;
1807		2180
1808	(async {	2181	(async {
		2182	my $map = eval {
1809	my $map = cf::map::find $path;	2183	my $map = cf::map::find $path;
		2184
		2185	if ($map) {
1810	$map = $map->customise_for ($self) if $map;	2186	$map = $map->customise_for ($self);
1811		2187	$map = $check->($map) if $check && $map;
1812	# warn "entering ", $map->path, " at ($x, $y)\n"	2188	} else {
1813	# if $map;
1814
1815	$map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);	2189	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
		2190	}
1816		2191
		2192	$map
		2193	};
		2194
		2195	if ($@) {
		2196	$self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
		2197	LOG llevError | logBacktrace, Carp::longmess $@;
		2198	}
		2199
		2200	if ($gen == $self->{_goto_generation}) {
		2201	delete $self->{_goto_generation};
1817	$self->leave_link ($map, $x, $y);	2202	$self->leave_link ($map, $x, $y);
		2203	}
1818	})->prio (1);	2204	})->prio (1);
1819	}	2205	}
1820		2206
1821	=item $player_object->enter_exit ($exit_object)	2207	=item $player_object->enter_exit ($exit_object)
1822		2208
…		…
1851	# that depends on the exit object	2237	# that depends on the exit object
1852		2238
1853	my $rmp = parse_random_map_params $exit->msg;	2239	my $rmp = parse_random_map_params $exit->msg;
1854		2240
1855	if ($exit->map) {	2241	if ($exit->map) {
1856	$rmp->{region} = $exit->map->region_name;	2242	$rmp->{region} = $exit->region->name;
1857	$rmp->{origin_map} = $exit->map->path;	2243	$rmp->{origin_map} = $exit->map->path;
1858	$rmp->{origin_x} = $exit->x;	2244	$rmp->{origin_x} = $exit->x;
1859	$rmp->{origin_y} = $exit->y;	2245	$rmp->{origin_y} = $exit->y;
1860	}	2246	}
1861		2247
1862	$rmp->{random_seed} ||= $exit->random_seed;	2248	$rmp->{random_seed} ||= $exit->random_seed;
1863		2249
1864	my $data = cf::to_json $rmp;	2250	my $data = cf::to_json $rmp;
1865	my $md5 = Digest::MD5::md5_hex $data;	2251	my $md5 = Digest::MD5::md5_hex $data;
1866	my $meta = "$cf::RANDOM_MAPS/$md5.meta";	2252	my $meta = "$RANDOMDIR/$md5.meta";
1867		2253
1868	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {	2254	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1869	aio_write $fh, 0, (length $data), $data, 0;	2255	aio_write $fh, 0, (length $data), $data, 0;
1870	undef $fh;	2256	undef $fh;
1871	aio_rename "$meta~", $meta;	2257	aio_rename "$meta~", $meta;
…		…
1878	sub cf::object::player::enter_exit {	2264	sub cf::object::player::enter_exit {
1879	my ($self, $exit) = @_;	2265	my ($self, $exit) = @_;
1880		2266
1881	return unless $self->type == cf::PLAYER;	2267	return unless $self->type == cf::PLAYER;
1882		2268
		2269	if ($exit->slaying eq "/!") {
		2270	#TODO: this should de-fi-ni-te-ly not be a sync-job
		2271	# the problem is that $exit might not survive long enough
		2272	# so it needs to be done right now, right here
		2273	cf::sync_job { prepare_random_map $exit };
		2274	}
		2275
		2276	my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
		2277	my $hp = $exit->stats->hp;
		2278	my $sp = $exit->stats->sp;
		2279
1883	$self->enter_link;	2280	$self->enter_link;
1884		2281
1885	(async {	2282	(async {
1886	$self->deactivate_recursive; # just to be sure	2283	$self->deactivate_recursive; # just to be sure
1887	unless (eval {	2284	unless (eval {
1888	prepare_random_map $exit	2285	$self->goto ($slaying, $hp, $sp);
1889	if $exit->slaying eq "/!";
1890
1891	my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1892	$self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1893		2286
1894	1;	2287	1;
1895	}) {	2288	}) {
1896	$self->message ("Something went wrong deep within the crossfire server. "	2289	$self->message ("Something went wrong deep within the crossfire server. "
1897	. "I'll try to bring you back to the map you were before. "	2290	. "I'll try to bring you back to the map you were before. "
1898	. "Please report this to the dungeon master!",	2291	. "Please report this to the dungeon master!",
1899	cf::NDI_UNIQUE | cf::NDI_RED);	2292	cf::NDI_UNIQUE | cf::NDI_RED);
1900		2293
1901	warn "ERROR in enter_exit: $@";	2294	warn "ERROR in enter_exit: $@";
1902	$self->leave_link;	2295	$self->leave_link;
1903	}	2296	}
1904	})->prio (1);	2297	})->prio (1);
…		…
1917		2310
1918	sub cf::client::send_drawinfo {	2311	sub cf::client::send_drawinfo {
1919	my ($self, $text, $flags) = @_;	2312	my ($self, $text, $flags) = @_;
1920		2313
1921	utf8::encode $text;	2314	utf8::encode $text;
1922	$self->send_packet (sprintf "drawinfo %d %s", $flags, $text);	2315	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1923	}	2316	}
1924		2317
		2318	=item $client->ext_event ($type, %msg)
		2319
		2320	Sends an exti event to the client.
		2321
		2322	=cut
		2323
		2324	sub cf::client::ext_event($$%) {
		2325	my ($self, $type, %msg) = @_;
		2326
		2327	$msg{msgtype} = "event_$type";
		2328	$self->send_packet ("ext " . cf::to_json \%msg);
		2329	}
1925		2330
1926	=item $success = $client->query ($flags, "text", \&cb)	2331	=item $success = $client->query ($flags, "text", \&cb)
1927		2332
1928	Queues a query to the client, calling the given callback with	2333	Queues a query to the client, calling the given callback with
1929	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,	2334	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
…		…
1958	# get handled first	2363	# get handled first
1959	my $queue = delete $ns->{query_queue}	2364	my $queue = delete $ns->{query_queue}
1960	or return; # be conservative, not sure how that can happen, but we saw a crash here	2365	or return; # be conservative, not sure how that can happen, but we saw a crash here
1961		2366
1962	(shift @$queue)->[1]->($msg);	2367	(shift @$queue)->[1]->($msg);
		2368	return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1963		2369
1964	push @{ $ns->{query_queue} }, @$queue;	2370	push @{ $ns->{query_queue} }, @$queue;
1965		2371
1966	if (@{ $ns->{query_queue} } == @$queue) {	2372	if (@{ $ns->{query_queue} } == @$queue) {
1967	if (@$queue) {	2373	if (@$queue) {
…		…
2025		2431
2026	# here we export the classes and methods available to script code	2432	# here we export the classes and methods available to script code
2027		2433
2028	=pod	2434	=pod
2029		2435
2030	The following fucntions and emthods are available within a safe environment:	2436	The following functions and methods are available within a safe environment:
2031		2437
2032	cf::object contr pay_amount pay_player map	2438	cf::object contr pay_amount pay_player map
2033	cf::object::player player	2439	cf::object::player player
2034	cf::player peaceful	2440	cf::player peaceful
2035	cf::map trigger	2441	cf::map trigger
…		…
2116	=back	2522	=back
2117		2523
2118	=cut	2524	=cut
2119		2525
2120	#############################################################################	2526	#############################################################################
		2527	# the server's init and main functions
2121		2528
2122	=head2 EXTENSION DATABASE SUPPORT	2529	sub load_facedata($) {
		2530	my ($path) = @_;
2123		2531
2124	Crossfire maintains a very simple database for extension use. It can	2532	warn "loading facedata from $path\n";
2125	currently store anything that can be serialised using Storable, which
2126	excludes objects.
2127		2533
2128	The parameter C<$family> should best start with the name of the extension	2534	my $facedata;
2129	using it, it should be unique.	2535	0 < aio_load $path, $facedata
		2536	or die "$path: $!";
2130		2537
2131	=over 4	2538	$facedata = Coro::Storable::thaw $facedata;
2132		2539
2133	=item $hashref = cf::db_get $family	2540	$facedata->{version} == 2
		2541	or cf::cleanup "$path: version mismatch, cannot proceed.";
2134		2542
2135	Return a hashref for use by the extension C<$family>, which can be
2136	modified. After modifications, you have to call C<cf::db_dirty> or
2137	C<cf::db_sync>.
2138
2139	=item $value = cf::db_get $family => $key
2140
2141	Returns a single value from the database
2142
2143	=item cf::db_put $family => $hashref
2144
2145	Stores the given family hashref into the database. Updates are delayed, if
2146	you want the data to be synced to disk immediately, use C<cf::db_sync>.
2147
2148	=item cf::db_put $family => $key => $value
2149
2150	Stores the given C<$value> in the family hash. Updates are delayed, if you
2151	want the data to be synced to disk immediately, use C<cf::db_sync>.
2152
2153	=item cf::db_dirty
2154
2155	Marks the database as dirty, to be updated at a later time.
2156
2157	=item cf::db_sync
2158
2159	Immediately write the database to disk I<if it is dirty>.
2160
2161	=cut
2162
2163	our $DB;
2164
2165	{
2166	my $path = cf::localdir . "/database.pst";
2167
2168	sub db_load() {
2169	$DB = stat $path ? Storable::retrieve $path : { };
2170	}	2543	{
		2544	my $faces = $facedata->{faceinfo};
2171		2545
2172	my $pid;	2546	while (my ($face, $info) = each %$faces) {
2173		2547	my $idx = (cf::face::find $face) || cf::face::alloc $face;
2174	sub db_save() {	2548	cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2175	waitpid $pid, 0 if $pid;	2549	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2176	if (0 == ($pid = fork)) {	2550	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2177	$DB->{_meta}{version} = 1;	2551	Coro::cede;
2178	Storable::nstore $DB, "$path~";
2179	rename "$path~", $path;
2180	cf::_exit 0 if defined $pid;
2181	}
2182	}
2183
2184	my $dirty;
2185
2186	sub db_sync() {
2187	db_save if $dirty;
2188	undef $dirty;
2189	}
2190
2191	my $idle = Event->idle (min => 10, max => 20, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2192	db_sync;
2193	});
2194
2195	sub db_dirty() {
2196	$dirty = 1;
2197	$idle->start;
2198	}
2199
2200	sub db_get($;$) {
2201	@_ >= 2
2202	? $DB->{$_[0]}{$_[1]}
2203	: ($DB->{$_[0]} ||= { })
2204	}
2205
2206	sub db_put($$;$) {
2207	if (@_ >= 3) {
2208	$DB->{$_[0]}{$_[1]} = $_[2];
2209	} else {
2210	$DB->{$_[0]} = $_[1];
2211	}
2212	db_dirty;
2213	}
2214
2215	cf::global->attach (
2216	prio => 10000,
2217	on_cleanup => sub {
2218	db_sync;
2219	},	2552	}
2220	);
2221	}
2222		2553
2223	#############################################################################	2554	while (my ($face, $info) = each %$faces) {
2224	# the server's main()	2555	next unless $info->{smooth};
		2556	my $idx = cf::face::find $face
		2557	or next;
		2558	if (my $smooth = cf::face::find $info->{smooth}) {
		2559	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
		2560	} else {
		2561	warn "smooth face '$info->{smooth}' not found for face '$face'";
		2562	}
		2563	Coro::cede;
		2564	}
		2565	}
		2566
		2567	{
		2568	my $anims = $facedata->{animinfo};
		2569
		2570	while (my ($anim, $info) = each %$anims) {
		2571	cf::anim::set $anim, $info->{frames}, $info->{facings};
		2572	Coro::cede;
		2573	}
		2574
		2575	cf::anim::invalidate_all; # d'oh
		2576	}
		2577
		2578	1
		2579	}
		2580
		2581	sub reload_regions {
		2582	load_resource_file "$MAPDIR/regions"
		2583	or die "unable to load regions file\n";
		2584	}
		2585
		2586	sub reload_facedata {
		2587	load_facedata "$DATADIR/facedata"
		2588	or die "unable to load facedata\n";
		2589	}
		2590
		2591	sub reload_archetypes {
		2592	load_resource_file "$DATADIR/archetypes"
		2593	or die "unable to load archetypes\n";
		2594	}
		2595
		2596	sub reload_treasures {
		2597	load_resource_file "$DATADIR/treasures"
		2598	or die "unable to load treasurelists\n";
		2599	}
		2600
		2601	sub reload_resources {
		2602	warn "reloading resource files...\n";
		2603
		2604	reload_regions;
		2605	reload_facedata;
		2606	#reload_archetypes;#d#
		2607	reload_archetypes;
		2608	reload_treasures;
		2609
		2610	warn "finished reloading resource files\n";
		2611	}
		2612
		2613	sub init {
		2614	reload_resources;
		2615	}
2225		2616
2226	sub cfg_load {	2617	sub cfg_load {
2227	open my $fh, "<:utf8", cf::confdir . "/config"	2618	open my $fh, "<:utf8", "$CONFDIR/config"
2228	or return;	2619	or return;
2229		2620
2230	local $/;	2621	local $/;
2231	*CFG = YAML::Syck::Load <$fh>;	2622	*CFG = YAML::Syck::Load <$fh>;
2232		2623
…		…
2252	Event::one_event;	2643	Event::one_event;
2253	})->prio (Coro::PRIO_MAX);	2644	})->prio (Coro::PRIO_MAX);
2254	};	2645	};
2255		2646
2256	cfg_load;	2647	cfg_load;
2257	db_load;	2648	db_init;
2258	load_extensions;	2649	load_extensions;
2259		2650
2260	$TICK_WATCHER->start;	2651	$TICK_WATCHER->start;
2261	Event::loop;	2652	Event::loop;
2262	}	2653	}
…		…
2266		2657
2267	# install some emergency cleanup handlers	2658	# install some emergency cleanup handlers
2268	BEGIN {	2659	BEGIN {
2269	for my $signal (qw(INT HUP TERM)) {	2660	for my $signal (qw(INT HUP TERM)) {
2270	Event->signal (	2661	Event->signal (
		2662	reentrant => 0,
2271	data => WF_AUTOCANCEL,	2663	data => WF_AUTOCANCEL,
2272	signal => $signal,	2664	signal => $signal,
		2665	prio => 0,
2273	cb => sub {	2666	cb => sub {
2274	cf::cleanup "SIG$signal";	2667	cf::cleanup "SIG$signal";
2275	},	2668	},
2276	);	2669	);
2277	}	2670	}
		2671	}
		2672
		2673	sub write_runtime {
		2674	my $runtime = "$LOCALDIR/runtime";
		2675
		2676	# first touch the runtime file to show we are still running:
		2677	# the fsync below can take a very very long time.
		2678
		2679	IO::AIO::aio_utime $runtime, undef, undef;
		2680
		2681	my $guard = cf::lock_acquire "write_runtime";
		2682
		2683	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
		2684	or return;
		2685
		2686	my $value = $cf::RUNTIME + 90 + 10;
		2687	# 10 is the runtime save interval, for a monotonic clock
		2688	# 60 allows for the watchdog to kill the server.
		2689
		2690	(aio_write $fh, 0, (length $value), $value, 0) <= 0
		2691	and return;
		2692
		2693	# always fsync - this file is important
		2694	aio_fsync $fh
		2695	and return;
		2696
		2697	# touch it again to show we are up-to-date
		2698	aio_utime $fh, undef, undef;
		2699
		2700	close $fh
		2701	or return;
		2702
		2703	aio_rename "$runtime~", $runtime
		2704	and return;
		2705
		2706	warn "runtime file written.\n";
		2707
		2708	1
2278	}	2709	}
2279		2710
2280	sub emergency_save() {	2711	sub emergency_save() {
2281	my $freeze_guard = cf::freeze_mainloop;	2712	my $freeze_guard = cf::freeze_mainloop;
2282		2713
…		…
2299	my $map = $cf::MAP{$path} or next;	2730	my $map = $cf::MAP{$path} or next;
2300	$map->valid or next;	2731	$map->valid or next;
2301	$map->save;	2732	$map->save;
2302	}	2733	}
2303	warn "end emergency map save\n";	2734	warn "end emergency map save\n";
		2735
		2736	warn "begin emergency database checkpoint\n";
		2737	BDB::db_env_txn_checkpoint $DB_ENV;
		2738	warn "end emergency database checkpoint\n";
2304	};	2739	};
2305		2740
2306	warn "leave emergency perl save\n";	2741	warn "leave emergency perl save\n";
2307	}	2742	}
2308		2743
		2744	sub post_cleanup {
		2745	my ($make_core) = @_;
		2746
		2747	warn Carp::longmess "post_cleanup backtrace"
		2748	if $make_core;
		2749	}
		2750
2309	sub reload() {	2751	sub do_reload_perl() {
2310	# can/must only be called in main	2752	# can/must only be called in main
2311	if ($Coro::current != $Coro::main) {	2753	if ($Coro::current != $Coro::main) {
2312	warn "can only reload from main coroutine";	2754	warn "can only reload from main coroutine";
2313	return;	2755	return;
2314	}	2756	}
2315		2757
2316	warn "reloading...";	2758	warn "reloading...";
2317		2759
2318	warn "cancelling server ticker";	2760	warn "entering sync_job";
2319	$TICK_WATCHER->cancel;
2320		2761
		2762	cf::sync_job {
		2763	cf::write_runtime; # external watchdog should not bark
2321	cf::emergency_save;	2764	cf::emergency_save;
		2765	cf::write_runtime; # external watchdog should not bark
2322		2766
2323	eval {	2767	warn "syncing database to disk";
		2768	BDB::db_env_txn_checkpoint $DB_ENV;
		2769
2324	# if anything goes wrong in here, we should simply crash as we already saved	2770	# if anything goes wrong in here, we should simply crash as we already saved
2325
2326	warn "syncing database to disk";
2327	cf::db_sync;
2328		2771
2329	warn "cancelling all WF_AUTOCANCEL watchers";	2772	warn "cancelling all WF_AUTOCANCEL watchers";
2330	for (Event::all_watchers) {	2773	for (Event::all_watchers) {
2331	$_->cancel if $_->data & WF_AUTOCANCEL;	2774	$_->cancel if $_->data & WF_AUTOCANCEL;
2332	}	2775	}
2333		2776
2334	warn "flushing outstanding aio requests";	2777	warn "flushing outstanding aio requests";
2335	for (;;) {	2778	for (;;) {
		2779	BDB::flush;
2336	IO::AIO::flush;	2780	IO::AIO::flush;
2337	Coro::cede;	2781	Coro::cede;
2338	last unless IO::AIO::nreqs;	2782	last unless IO::AIO::nreqs || BDB::nreqs;
2339	warn "iterate...";	2783	warn "iterate...";
2340	}	2784	}
		2785
		2786	++$RELOAD;
2341		2787
2342	warn "cancelling all extension coros";	2788	warn "cancelling all extension coros";
2343	$_->cancel for values %EXT_CORO;	2789	$_->cancel for values %EXT_CORO;
2344	%EXT_CORO = ();	2790	%EXT_CORO = ();
2345		2791
…		…
2385	Symbol::delete_package "safe::$_"	2831	Symbol::delete_package "safe::$_"
2386	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	2832	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2387		2833
2388	warn "unloading cf.pm \"a bit\"";	2834	warn "unloading cf.pm \"a bit\"";
2389	delete $INC{"cf.pm"};	2835	delete $INC{"cf.pm"};
		2836	delete $INC{"cf/pod.pm"};
2390		2837
2391	# don't, removes xs symbols, too,	2838	# don't, removes xs symbols, too,
2392	# and global variables created in xs	2839	# and global variables created in xs
2393	#Symbol::delete_package __PACKAGE__;	2840	#Symbol::delete_package __PACKAGE__;
2394		2841
…		…
2398	require cf;	2845	require cf;
2399	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	2846	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2400		2847
2401	warn "loading config and database again";	2848	warn "loading config and database again";
2402	cf::cfg_load;	2849	cf::cfg_load;
2403	cf::db_load;
2404		2850
2405	warn "loading extensions";	2851	warn "loading extensions";
2406	cf::load_extensions;	2852	cf::load_extensions;
2407		2853
2408	warn "reattaching attachments to objects/players";	2854	warn "reattaching attachments to objects/players";
2409	_global_reattach;	2855	_global_reattach; # objects, sockets
2410	warn "reattaching attachments to maps";	2856	warn "reattaching attachments to maps";
2411	reattach $_ for values %MAP;	2857	reattach $_ for values %MAP;
		2858	warn "reattaching attachments to players";
		2859	reattach $_ for values %PLAYER;
2412		2860
2413	warn "restarting server ticker";	2861	warn "leaving sync_job";
2414		2862
2415	$TICK_WATCHER->start;	2863	1
2416	};	2864	} or do {
2417
2418	if ($@) {
2419	warn $@;	2865	warn $@;
2420	warn "error while reloading, exiting.";	2866	warn "error while reloading, exiting.";
2421	exit 1;	2867	exit 1;
2422	}	2868	};
2423		2869
2424	warn "reloaded";	2870	warn "reloaded";
2425	};	2871	};
2426		2872
2427	our $RELOAD_WATCHER; # used only during reload	2873	our $RELOAD_WATCHER; # used only during reload
2428		2874
		2875	sub reload_perl() {
		2876	# doing reload synchronously and two reloads happen back-to-back,
		2877	# coro crashes during coro_state_free->destroy here.
		2878
		2879	$RELOAD_WATCHER ||= Event->timer (
		2880	reentrant => 0,
		2881	after => 0,
		2882	data => WF_AUTOCANCEL,
		2883	cb => sub {
		2884	do_reload_perl;
		2885	undef $RELOAD_WATCHER;
		2886	},
		2887	);
		2888	}
		2889
2429	register_command "reload" => sub {	2890	register_command "reload" => sub {
2430	my ($who, $arg) = @_;	2891	my ($who, $arg) = @_;
2431		2892
2432	if ($who->flag (FLAG_WIZ)) {	2893	if ($who->flag (FLAG_WIZ)) {
2433	$who->message ("reloading server.");	2894	$who->message ("reloading server.");
2434		2895	async { reload_perl };
2435	# doing reload synchronously and two reloads happen back-to-back,
2436	# coro crashes during coro_state_free->destroy here.
2437
2438	$RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub {
2439	reload;
2440	undef $RELOAD_WATCHER;
2441	});
2442	}	2896	}
2443	};	2897	};
2444		2898
2445	unshift @INC, $LIBDIR;	2899	unshift @INC, $LIBDIR;
2446		2900
2447	my $bug_warning = 0;	2901	my $bug_warning = 0;
2448		2902
		2903	our @WAIT_FOR_TICK;
		2904	our @WAIT_FOR_TICK_BEGIN;
		2905
		2906	sub wait_for_tick {
		2907	return unless $TICK_WATCHER->is_active;
		2908	return if $Coro::current == $Coro::main;
		2909
		2910	my $signal = new Coro::Signal;
		2911	push @WAIT_FOR_TICK, $signal;
		2912	$signal->wait;
		2913	}
		2914
		2915	sub wait_for_tick_begin {
		2916	return unless $TICK_WATCHER->is_active;
		2917	return if $Coro::current == $Coro::main;
		2918
		2919	my $signal = new Coro::Signal;
		2920	push @WAIT_FOR_TICK_BEGIN, $signal;
		2921	$signal->wait;
		2922	}
		2923
		2924	my $min = 1e6;#d#
		2925	my $avg = 10;
2449	$TICK_WATCHER = Event->timer (	2926	$TICK_WATCHER = Event->timer (
2450	reentrant => 0,	2927	reentrant => 0,
2451	parked => 1,	2928	parked => 1,
2452	prio => 0,	2929	prio => 0,
2453	at => $NEXT_TICK || $TICK,	2930	at => $NEXT_TICK || $TICK,
…		…
2457	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	2934	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2458	unless ++$bug_warning > 10;	2935	unless ++$bug_warning > 10;
2459	return;	2936	return;
2460	}	2937	}
2461		2938
2462	$NOW = Event::time;	2939	$NOW = $tick_start = Event::time;
2463		2940
2464	cf::server_tick; # one server iteration	2941	cf::server_tick; # one server iteration
		2942
		2943	0 && sync_job {#d#
		2944	for(1..10) {
		2945	my $t = Event::time;
		2946	my $map = my $map = new_from_path cf::map "/tmp/x.map"
		2947	or die;
		2948
		2949	$map->width (50);
		2950	$map->height (50);
		2951	$map->alloc;
		2952	$map->_load_objects ("/tmp/x.map", 1);
		2953	my $t = Event::time - $t;
		2954
		2955	#next unless $t < 0.0013;#d#
		2956	if ($t < $min) {
		2957	$min = $t;
		2958	}
		2959	$avg = $avg * 0.99 + $t * 0.01;
		2960	}
		2961	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
		2962	exit 0;
		2963	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
		2964	};
		2965
2465	$RUNTIME += $TICK;	2966	$RUNTIME += $TICK;
2466	$NEXT_TICK += $TICK;	2967	$NEXT_TICK += $TICK;
2467		2968
2468	$WAIT_FOR_TICK->broadcast;	2969	if ($NOW >= $NEXT_RUNTIME_WRITE) {
2469	$WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;	2970	$NEXT_RUNTIME_WRITE = $NOW + 10;
		2971	Coro::async_pool {
		2972	write_runtime
		2973	or warn "ERROR: unable to write runtime file: $!";
		2974	};
		2975	}
		2976
		2977	# my $AFTER = Event::time;
		2978	# warn $AFTER - $NOW;#d#
		2979
		2980	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
		2981	$sig->send;
		2982	}
		2983	while (my $sig = shift @WAIT_FOR_TICK) {
		2984	$sig->send;
		2985	}
		2986
		2987	$NOW = Event::time;
2470		2988
2471	# if we are delayed by four ticks or more, skip them all	2989	# if we are delayed by four ticks or more, skip them all
2472	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;	2990	$NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2473		2991
2474	$TICK_WATCHER->at ($NEXT_TICK);	2992	$TICK_WATCHER->at ($NEXT_TICK);
2475	$TICK_WATCHER->start;	2993	$TICK_WATCHER->start;
		2994
		2995	$LOAD = ($NOW - $tick_start) / $TICK;
		2996	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
		2997
		2998	_post_tick;
		2999
		3000
2476	},	3001	},
2477	);	3002	);
2478		3003
		3004	{
		3005	BDB::max_poll_time $TICK * 0.1;
		3006	$BDB_POLL_WATCHER = Event->io (
		3007	reentrant => 0,
		3008	fd => BDB::poll_fileno,
		3009	poll => 'r',
		3010	prio => 0,
		3011	data => WF_AUTOCANCEL,
		3012	cb => \&BDB::poll_cb,
		3013	);
		3014	BDB::min_parallel 8;
		3015
		3016	BDB::set_sync_prepare {
		3017	my $status;
		3018	my $current = $Coro::current;
		3019	(
		3020	sub {
		3021	$status = $!;
		3022	$current->ready; undef $current;
		3023	},
		3024	sub {
		3025	Coro::schedule while defined $current;
		3026	$! = $status;
		3027	},
		3028	)
		3029	};
		3030
		3031	unless ($DB_ENV) {
		3032	$DB_ENV = BDB::db_env_create;
		3033
		3034	cf::sync_job {
		3035	eval {
		3036	BDB::db_env_open
		3037	$DB_ENV,
		3038	$BDBDIR,
		3039	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
		3040	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
		3041	0666;
		3042
		3043	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
		3044
		3045	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
		3046	$DB_ENV->set_lk_detect;
		3047	};
		3048
		3049	cf::cleanup "db_env_open(db): $@" if $@;
		3050	};
		3051	}
		3052	}
		3053
		3054	{
		3055	IO::AIO::min_parallel 8;
		3056
		3057	undef $Coro::AIO::WATCHER;
2479	IO::AIO::max_poll_time $TICK * 0.2;	3058	IO::AIO::max_poll_time $TICK * 0.1;
2480
2481	$AIO_POLL_WATCHER = Event->io (	3059	$AIO_POLL_WATCHER = Event->io (
2482	fd => IO::AIO::poll_fileno,	3060	reentrant => 0,
2483	poll => 'r',
2484	prio => 5,
2485	data => WF_AUTOCANCEL,
2486	cb => \&IO::AIO::poll_cb,
2487	);
2488
2489	$WRITE_RUNTIME_WATCHER = Event->timer (
2490	data => WF_AUTOCANCEL,	3061	data => WF_AUTOCANCEL,
2491	after => 1,	3062	fd => IO::AIO::poll_fileno,
2492	interval => 10,	3063	poll => 'r',
2493	prio => 6, # keep it lowest so it acts like a watchdog	3064	prio => 6,
2494	cb => Coro::unblock_sub {	3065	cb => \&IO::AIO::poll_cb,
2495	write_runtime	3066	);
2496	or warn "ERROR: unable to write runtime file: $!";	3067	}
		3068
		3069	my $_log_backtrace;
		3070
		3071	sub _log_backtrace {
		3072	my ($msg, @addr) = @_;
		3073
		3074	$msg =~ s/\n//;
		3075
		3076	# limit the # of concurrent backtraces
		3077	if ($_log_backtrace < 2) {
		3078	++$_log_backtrace;
		3079	async {
		3080	my @bt = fork_call {
		3081	@addr = map { sprintf "%x", $_ } @addr;
		3082	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
		3083	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
		3084	or die "addr2line: $!";
		3085
		3086	my @funcs;
		3087	my @res = <$fh>;
		3088	chomp for @res;
		3089	while (@res) {
		3090	my ($func, $line) = splice @res, 0, 2, ();
		3091	push @funcs, "[$func] $line";
		3092	}
		3093
		3094	@funcs
		3095	};
		3096
		3097	LOG llevInfo, "[ABT] $msg\n";
		3098	LOG llevInfo, "[ABT] $_\n" for @bt;
		3099	--$_log_backtrace;
		3100	};
		3101	} else {
		3102	LOG llevInfo, "[ABT] $msg\n";
		3103	LOG llevInfo, "[ABT] [suppressed]\n";
2497	},	3104	}
2498	);	3105	}
		3106
		3107	# load additional modules
		3108	use cf::pod;
2499		3109
2500	END { cf::emergency_save }	3110	END { cf::emergency_save }
2501		3111
2502	1	3112	1
2503		3113

Diff Legend

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