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.205 by root, Mon Feb 5 18:29:20 2007 UTC vs.
Revision 1.353 by root, Sun Sep 2 08:43: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 ();
		27	use BDB ();
20	use Data::Dumper;	28	use Data::Dumper;
21	use Digest::MD5;	29	use Digest::MD5;
22	use Fcntl;	30	use Fcntl;
		31	use YAML::Syck ();
23	use IO::AIO 2.32 ();	32	use IO::AIO 2.32 ();
24	use YAML::Syck ();
25	use Time::HiRes;	33	use Time::HiRes;
		34	use Compress::LZF;
		35	use Digest::MD5 ();
26		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
		41	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
		42
27	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
28
29	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30		44
31	# 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?
32	$YAML::Syck::ImplicitUnicode = 1;	46	$YAML::Syck::ImplicitUnicode = 1;
33		47
34	$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
35		49
		50	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
		51
36	our %COMMAND = ();	52	our %COMMAND = ();
37	our %COMMAND_TIME = ();	53	our %COMMAND_TIME = ();
38		54
39	our @EXTS = (); # list of extension package names	55	our @EXTS = (); # list of extension package names
40	our %EXTCMD = ();	56	our %EXTCMD = ();
		57	our %EXTICMD = ();
41	our %EXT_CORO = (); # coroutines bound to extensions	58	our %EXT_CORO = (); # coroutines bound to extensions
42	our %EXT_MAP = (); # pluggable maps	59	our %EXT_MAP = (); # pluggable maps
43		60
		61	our $RELOAD; # number of reloads so far
44	our @EVENT;	62	our @EVENT;
45	our $LIBDIR = datadir . "/ext";
46		63
47	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(!)
48	our $TICK_WATCHER;	77	our $TICK_WATCHER;
49	our $AIO_POLL_WATCHER;	78	our $AIO_POLL_WATCHER;
50	our $WRITE_RUNTIME_WATCHER;	79	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
51	our $NEXT_TICK;	80	our $NEXT_TICK;
52	our $NOW;	81	our $NOW;
53	our $USE_FSYNC = 1; # use fsync to write maps - default off	82	our $USE_FSYNC = 1; # use fsync to write maps - default off
54		83
		84	our $BDB_POLL_WATCHER;
		85	our $DB_ENV;
		86
55	our %CFG;	87	our %CFG;
56		88
57	our $UPTIME; $UPTIME ||= time;	89	our $UPTIME; $UPTIME ||= time;
58	our $RUNTIME;	90	our $RUNTIME;
59		91
60	our %PLAYER; # all users	92	our %PLAYER; # all users
61	our %MAP; # all maps	93	our %MAP; # all maps
62	our $LINK_MAP; # the special {link} map, which is always available	94	our $LINK_MAP; # the special {link} map, which is always available
63	our $RANDOM_MAPS = cf::localdir . "/random";
64
65	our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
66	our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
67		95
68	# 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 ∕
69	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	97	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
70		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
71	binmode STDOUT;	103	binmode STDOUT;
72	binmode STDERR;	104	binmode STDERR;
73		105
74	# read virtual server time, if available	106	# read virtual server time, if available
75	unless ($RUNTIME || !-e cf::localdir . "/runtime") {	107	unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
76	open my $fh, "<", cf::localdir . "/runtime"	108	open my $fh, "<", "$LOCALDIR/runtime"
77	or die "unable to read runtime file: $!";	109	or die "unable to read runtime file: $!";
78	$RUNTIME = <$fh> + 0.;	110	$RUNTIME = <$fh> + 0.;
79	}	111	}
80		112
81	mkdir cf::localdir;	113	mkdir $_
82	mkdir cf::localdir . "/" . cf::playerdir;	114	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
83	mkdir cf::localdir . "/" . cf::tmpdir;
84	mkdir cf::localdir . "/" . cf::uniquedir;
85	mkdir $RANDOM_MAPS;
86		115
87	our $EMERGENCY_POSITION;	116	our $EMERGENCY_POSITION;
88		117
89	sub cf::map::normalise;	118	sub cf::map::normalise;
90		119
…		…
101	=item $cf::RUNTIME	130	=item $cf::RUNTIME
102		131
103	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
104	every server tick.	133	every server tick.
105		134
106	=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
107		138
108	The perl library directory, where extensions and cf-specific modules can	139	Various directories - "/etc", read-only install directory, perl-library
109	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.
110		143
111	=item $cf::NOW	144	=item $cf::NOW
112		145
113	The time of the last (current) server tick.	146	The time of the last (current) server tick.
114		147
115	=item $cf::TICK	148	=item $cf::TICK
116		149
117	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.
118		161
119	=item %cf::CFG	162	=item %cf::CFG
120		163
121	Configuration for the server, loaded from C</etc/crossfire/config>, or	164	Configuration for the server, loaded from C</etc/crossfire/config>, or
122	from wherever your confdir points to.	165	from wherever your confdir points to.
123		166
124	=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE	167	=item cf::wait_for_tick, cf::wait_for_tick_begin
125		168
126	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
127	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
128	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.
129	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.
130		178
131	=back	179	=back
132		180
133	=cut	181	=cut
134		182
135	BEGIN {	183	BEGIN {
136	*CORE::GLOBAL::warn = sub {	184	*CORE::GLOBAL::warn = sub {
137	my $msg = join "", @_;	185	my $msg = join "", @_;
138	utf8::encode $msg;
139		186
140	$msg .= "\n"	187	$msg .= "\n"
141	unless $msg =~ /\n$/;	188	unless $msg =~ /\n$/;
142		189
		190	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
		191
		192	utf8::encode $msg;
143	LOG llevError, $msg;	193	LOG llevError, $msg;
144	};	194	};
145	}	195	}
146		196
147	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	197	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
148	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	198	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
149	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	199	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
150	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	200	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
151	@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';
152	@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)
153		204
154	# 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
155	# within the Safe compartment.	206	# within the Safe compartment.
156	for my $pkg (qw(	207	for my $pkg (qw(
157	cf::global cf::attachable	208	cf::global cf::attachable
…		…
165	}	216	}
166		217
167	$Event::DIED = sub {	218	$Event::DIED = sub {
168	warn "error in event callback: @_";	219	warn "error in event callback: @_";
169	};	220	};
		221
		222	#############################################################################
170		223
171	=head2 UTILITY FUNCTIONS	224	=head2 UTILITY FUNCTIONS
172		225
173	=over 4	226	=over 4
174		227
…		…
193	$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;
194	$d	247	$d
195	} || "[unable to dump $_[0]: '$@']";	248	} || "[unable to dump $_[0]: '$@']";
196	}	249	}
197		250
198	use JSON::Syck (); # TODO# replace by JSON::PC once working
199
200	=item $ref = cf::from_json $json	251	=item $ref = cf::from_json $json
201		252
202	Converts a JSON string into the corresponding perl data structure.	253	Converts a JSON string into the corresponding perl data structure.
203		254
204	=cut
205
206	sub from_json($) {
207	$JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
208	JSON::Syck::Load $_[0]
209	}
210
211	=item $json = cf::to_json $ref	255	=item $json = cf::to_json $ref
212		256
213	Converts a perl data structure into its JSON representation.	257	Converts a perl data structure into its JSON representation.
214		258
215	=cut	259	=cut
216		260
217	sub to_json($) {	261	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
218	$JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs	262
219	JSON::Syck::Dump $_[0]	263	sub to_json ($) { $json_coder->encode ($_[0]) }
220	}	264	sub from_json ($) { $json_coder->decode ($_[0]) }
221		265
222	=item cf::lock_wait $string	266	=item cf::lock_wait $string
223		267
224	Wait until the given lock is available. See cf::lock_acquire.	268	Wait until the given lock is available. See cf::lock_acquire.
225		269
…		…
228	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
229	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,
230	for example when the coroutine gets canceled), the lock is automatically	274	for example when the coroutine gets canceled), the lock is automatically
231	returned.	275	returned.
232		276
		277	Locks are *not* recursive, locking from the same coro twice results in a
		278	deadlocked coro.
		279
233	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
234	uses map_find and cf::map::load uses map_load).	281	uses map_find and cf::map::load uses map_load).
		282
		283	=item $locked = cf::lock_active $string
		284
		285	Return true if the lock is currently active, i.e. somebody has locked it.
235		286
236	=cut	287	=cut
237		288
238	our %LOCK;	289	our %LOCK;
239		290
…		…
259	# wake up all waiters, to be on the safe side	310	# wake up all waiters, to be on the safe side
260	$_->ready for @{ delete $LOCK{$key} };	311	$_->ready for @{ delete $LOCK{$key} };
261	}	312	}
262	}	313	}
263		314
		315	sub lock_active($) {
		316	my ($key) = @_;
		317
		318	! ! $LOCK{$key}
		319	}
		320
264	sub freeze_mainloop {	321	sub freeze_mainloop {
265	return unless $TICK_WATCHER->is_active;	322	return unless $TICK_WATCHER->is_active;
266		323
267	my $guard = Coro::guard {	324	my $guard = Coro::guard {
268	$TICK_WATCHER->start;	325	$TICK_WATCHER->start;
269	$WRITE_RUNTIME_WATCHER->start;
270	};	326	};
271	$WRITE_RUNTIME_WATCHER->stop;
272	$TICK_WATCHER->stop;	327	$TICK_WATCHER->stop;
273	$guard	328	$guard
		329	}
		330
		331	=item cf::get_slot $time[, $priority[, $name]]
		332
		333	Allocate $time seconds of blocking CPU time at priority C<$priority>:
		334	This call blocks and returns only when you have at least C<$time> seconds
		335	of cpu time till the next tick. The slot is only valid till the next cede.
		336
		337	The optional C<$name> can be used to identify the job to run. It might be
		338	used for statistical purposes and should identify the same time-class.
		339
		340	Useful for short background jobs.
		341
		342	=cut
		343
		344	our @SLOT_QUEUE;
		345	our $SLOT_QUEUE;
		346
		347	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
		348	$SLOT_QUEUE = Coro::async {
		349	my $signal = new Coro::Signal;
		350
		351	while () {
		352	next_job:
		353	my $avail = cf::till_tick;
		354	if ($avail > 0.01) {
		355	for (0 .. $#SLOT_QUEUE) {
		356	if ($SLOT_QUEUE[$_][0] < $avail) {
		357	my $job = splice @SLOT_QUEUE, $_, 1, ();
		358	$job->[2]->send;
		359	Coro::cede;
		360	goto next_job;
		361	}
		362	}
		363	}
		364
		365	if (@SLOT_QUEUE) {
		366	# we do not use wait_For_tick() as it returns immediately when tick is inactive
		367	push @cf::WAIT_FOR_TICK, $signal;
		368	$signal->wait;
		369	} else {
		370	Coro::schedule;
		371	}
		372	}
		373	};
		374
		375	sub get_slot($;$$) {
		376	my ($time, $pri, $name) = @_;
		377
		378	$time = $TICK * .6 if $time > $TICK * .6;
		379	my $sig = new Coro::Signal;
		380
		381	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
		382	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
		383	$SLOT_QUEUE->ready;
		384	$sig->wait;
274	}	385	}
275		386
276	=item cf::async { BLOCK }	387	=item cf::async { BLOCK }
277		388
278	Currently the same as Coro::async_pool, meaning you cannot use	389	Currently the same as Coro::async_pool, meaning you cannot use
…		…
283		394
284	BEGIN { *async = \&Coro::async_pool }	395	BEGIN { *async = \&Coro::async_pool }
285		396
286	=item cf::sync_job { BLOCK }	397	=item cf::sync_job { BLOCK }
287		398
288	The design of crossfire+ requires that the main coro ($Coro::main) is	399	The design of Crossfire TRT requires that the main coroutine ($Coro::main)
289	always able to handle events or runnable, as crossfire+ is only partly	400	is always able to handle events or runnable, as Crossfire TRT is only
290	reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable.	401	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
		402	acceptable.
291		403
292	If it must be done, put the blocking parts into C<sync_job>. This will run	404	If it must be done, put the blocking parts into C<sync_job>. This will run
293	the given BLOCK in another coroutine while waiting for the result. The	405	the given BLOCK in another coroutine while waiting for the result. The
294	server will be frozen during this time, so the block should either finish	406	server will be frozen during this time, so the block should either finish
295	fast or be very important.	407	fast or be very important.
…		…
298		410
299	sub sync_job(&) {	411	sub sync_job(&) {
300	my ($job) = @_;	412	my ($job) = @_;
301		413
302	if ($Coro::current == $Coro::main) {	414	if ($Coro::current == $Coro::main) {
		415	my $time = Event::time;
		416
303	# this is the main coro, too bad, we have to block	417	# this is the main coro, too bad, we have to block
304	# till the operation succeeds, freezing the server :/	418	# till the operation succeeds, freezing the server :/
305		419
306	# TODO: use suspend/resume instead	420	# TODO: use suspend/resume instead
307	# (but this is cancel-safe)	421	# (but this is cancel-safe)
…		…
318		432
319	while ($busy) {	433	while ($busy) {
320	Coro::cede or Event::one_event;	434	Coro::cede or Event::one_event;
321	}	435	}
322		436
		437	$time = Event::time - $time;
		438
		439	LOG llevError | logBacktrace, Carp::longmess "long sync job"
		440	if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
		441
		442	$tick_start += $time; # do not account sync jobs to server load
		443
323	wantarray ? @res : $res[0]	444	wantarray ? @res : $res[0]
324	} else {	445	} else {
325	# we are in another coroutine, how wonderful, everything just works	446	# we are in another coroutine, how wonderful, everything just works
326		447
327	$job->()	448	$job->()
…		…
346	$EXT_CORO{$coro+0} = $coro;	467	$EXT_CORO{$coro+0} = $coro;
347		468
348	$coro	469	$coro
349	}	470	}
350		471
351	sub write_runtime {	472	=item fork_call { }, $args
352	my $runtime = cf::localdir . "/runtime";
353		473
354	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644	474	Executes the given code block with the given arguments in a seperate
355	or return;	475	process, returning the results. Everything must be serialisable with
		476	Coro::Storable. May, of course, block. Note that the executed sub may
		477	never block itself or use any form of Event handling.
356		478
357	my $value = $cf::RUNTIME + 90 + 10;	479	=cut
358	# 10 is the runtime save interval, for a monotonic clock
359	# 60 allows for the watchdog to kill the server.
360		480
361	(aio_write $fh, 0, (length $value), $value, 0) <= 0	481	sub fork_call(&@) {
362	and return;	482	my ($cb, @args) = @_;
363		483
364	# always fsync - this file is important	484	# we seemingly have to make a local copy of the whole thing,
365	aio_fsync $fh	485	# otherwise perl prematurely frees the stuff :/
366	and return;	486	# TODO: investigate and fix (liekly this will be rather laborious)
367		487
368	close $fh	488	my @res = Coro::Util::fork_eval {
369	or return;	489	reset_signals;
		490	&$cb
		491	}, @args;
370		492
371	aio_rename "$runtime~", $runtime	493	wantarray ? @res : $res[-1]
372	and return;	494	}
373		495
		496	=item $value = cf::db_get $family => $key
		497
		498	Returns a single value from the environment database.
		499
		500	=item cf::db_put $family => $key => $value
		501
		502	Stores the given C<$value> in the family. It can currently store binary
		503	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
		504
		505	=cut
		506
		507	our $DB;
		508
		509	sub db_init {
		510	unless ($DB) {
		511	$DB = BDB::db_create $DB_ENV;
		512
		513	cf::sync_job {
		514	eval {
		515	$DB->set_flags (BDB::CHKSUM);
		516
		517	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
		518	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
		519	cf::cleanup "db_open(db): $!" if $!;
		520	};
		521	cf::cleanup "db_open(db): $@" if $@;
		522	};
374	1	523	}
		524	}
		525
		526	sub db_get($$) {
		527	my $key = "$_[0]/$_[1]";
		528
		529	cf::sync_job {
		530	BDB::db_get $DB, undef, $key, my $data;
		531
		532	$! ? ()
		533	: $data
		534	}
		535	}
		536
		537	sub db_put($$$) {
		538	BDB::dbreq_pri 4;
		539	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
		540	}
		541
		542	=item cf::cache $id => [$paths...], $processversion => $process
		543
		544	Generic caching function that returns the value of the resource $id,
		545	caching and regenerating as required.
		546
		547	This function can block.
		548
		549	=cut
		550
		551	sub cache {
		552	my ($id, $src, $processversion, $process) = @_;
		553
		554	my $meta =
		555	join "\x00",
		556	$processversion,
		557	map {
		558	aio_stat $_
		559	and Carp::croak "$_: $!";
		560
		561	($_, (stat _)[7,9])
		562	} @$src;
		563
		564	my $dbmeta = db_get cache => "$id/meta";
		565	if ($dbmeta ne $meta) {
		566	# changed, we may need to process
		567
		568	my @data;
		569	my $md5;
		570
		571	for (0 .. $#$src) {
		572	0 <= aio_load $src->[$_], $data[$_]
		573	or Carp::croak "$src->[$_]: $!";
		574	}
		575
		576	# if processing is expensive, check
		577	# checksum first
		578	if (1) {
		579	$md5 =
		580	join "\x00",
		581	$processversion,
		582	map {
		583	cf::cede_to_tick;
		584	($src->[$_], Digest::MD5::md5_hex $data[$_])
		585	} 0.. $#$src;
		586
		587
		588	my $dbmd5 = db_get cache => "$id/md5";
		589	if ($dbmd5 eq $md5) {
		590	db_put cache => "$id/meta", $meta;
		591
		592	return db_get cache => "$id/data";
		593	}
		594	}
		595
		596	my $t1 = Time::HiRes::time;
		597	my $data = $process->(\@data);
		598	my $t2 = Time::HiRes::time;
		599
		600	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
		601
		602	db_put cache => "$id/data", $data;
		603	db_put cache => "$id/md5" , $md5;
		604	db_put cache => "$id/meta", $meta;
		605
		606	return $data;
		607	}
		608
		609	db_get cache => "$id/data"
		610	}
		611
		612	=item cf::datalog type => key => value, ...
		613
		614	Log a datalog packet of the given type with the given key-value pairs.
		615
		616	=cut
		617
		618	sub datalog($@) {
		619	my ($type, %kv) = @_;
		620	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
375	}	621	}
376		622
377	=back	623	=back
378		624
379	=cut	625	=cut
…		…
386	attach callbacks/event handlers (a collection of which is called an "attachment")	632	attach callbacks/event handlers (a collection of which is called an "attachment")
387	to it. All such attachable objects support the following methods.	633	to it. All such attachable objects support the following methods.
388		634
389	In the following description, CLASS can be any of C<global>, C<object>	635	In the following description, CLASS can be any of C<global>, C<object>
390	C<player>, C<client> or C<map> (i.e. the attachable objects in	636	C<player>, C<client> or C<map> (i.e. the attachable objects in
391	crossfire+).	637	Crossfire TRT).
392		638
393	=over 4	639	=over 4
394		640
395	=item $attachable->attach ($attachment, key => $value...)	641	=item $attachable->attach ($attachment, key => $value...)
396		642
…		…
559	$registry = $CB_TYPE[$object_type] ||= [];	805	$registry = $CB_TYPE[$object_type] ||= [];
560		806
561	} elsif ($type eq "subtype") {	807	} elsif ($type eq "subtype") {
562	defined $object_type or Carp::croak "subtype specified without type";	808	defined $object_type or Carp::croak "subtype specified without type";
563	my $object_subtype = shift @arg;	809	my $object_subtype = shift @arg;
564	$registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= [];	810	$registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
565		811
566	} elsif ($type eq "package") {	812	} elsif ($type eq "package") {
567	my $pkg = shift @arg;	813	my $pkg = shift @arg;
568		814
569	while (my ($name, $id) = each %cb_id) {	815	while (my ($name, $id) = each %cb_id) {
…		…
598	_attach $registry, $klass, @attach;	844	_attach $registry, $klass, @attach;
599	}	845	}
600		846
601	$obj->{$name} = \%arg;	847	$obj->{$name} = \%arg;
602	} else {	848	} else {
603	warn "object uses attachment '$name' that is not available, postponing.\n";	849	warn "object uses attachment '$name' which is not available, postponing.\n";
604	}	850	}
605		851
606	$obj->{_attachment}{$name} = undef;	852	$obj->{_attachment}{$name} = undef;
607	}	853	}
608		854
…		…
610	if (ref $_[0]) {	856	if (ref $_[0]) {
611	_object_attach @_;	857	_object_attach @_;
612	} else {	858	} else {
613	_attach shift->_attach_registry, @_;	859	_attach shift->_attach_registry, @_;
614	}	860	}
		861	_recalc_want;
615	};	862	};
616		863
617	# all those should be optimised	864	# all those should be optimised
618	sub cf::attachable::detach {	865	sub cf::attachable::detach {
619	my ($obj, $name) = @_;	866	my ($obj, $name) = @_;
…		…
622	delete $obj->{_attachment}{$name};	869	delete $obj->{_attachment}{$name};
623	reattach ($obj);	870	reattach ($obj);
624	} else {	871	} else {
625	Carp::croak "cannot, currently, detach class attachments";	872	Carp::croak "cannot, currently, detach class attachments";
626	}	873	}
		874	_recalc_want;
627	};	875	};
628		876
629	sub cf::attachable::attached {	877	sub cf::attachable::attached {
630	my ($obj, $name) = @_;	878	my ($obj, $name) = @_;
631		879
…		…
646	";	894	";
647	die if $@;	895	die if $@;
648	}	896	}
649		897
650	our $override;	898	our $override;
651	our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?	899	our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
652		900
653	sub override {	901	sub override {
654	$override = 1;	902	$override = 1;
655	@invoke_results = ();	903	@INVOKE_RESULTS = (@_);
656	}	904	}
657		905
658	sub do_invoke {	906	sub do_invoke {
659	my $event = shift;	907	my $event = shift;
660	my $callbacks = shift;	908	my $callbacks = shift;
661		909
662	@invoke_results = ();	910	@INVOKE_RESULTS = ();
663		911
664	local $override;	912	local $override;
665		913
666	for (@$callbacks) {	914	for (@$callbacks) {
667	eval { &{$_->[1]} };	915	eval { &{$_->[1]} };
…		…
684		932
685	Generate an object-specific event with the given arguments.	933	Generate an object-specific event with the given arguments.
686		934
687	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be	935	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
688	removed in future versions), and there is no public API to access override	936	removed in future versions), and there is no public API to access override
689	results (if you must, access C<@cf::invoke_results> directly).	937	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
690		938
691	=back	939	=back
692		940
693	=cut	941	=cut
694		942
695	#############################################################################	943	#############################################################################
696	# object support	944	# object support
		945	#
		946
		947	sub _can_merge {
		948	my ($ob1, $ob2) = @_;
		949
		950	local $Storable::canonical = 1;
		951	my $fob1 = Storable::freeze $ob1;
		952	my $fob2 = Storable::freeze $ob2;
		953
		954	$fob1 eq $fob2
		955	}
697		956
698	sub reattach {	957	sub reattach {
699	# basically do the same as instantiate, without calling instantiate	958	# basically do the same as instantiate, without calling instantiate
700	my ($obj) = @_;	959	my ($obj) = @_;
701		960
…		…
778	}	1037	}
779	} else {	1038	} else {
780	aio_unlink $filename;	1039	aio_unlink $filename;
781	aio_unlink "$filename.pst";	1040	aio_unlink "$filename.pst";
782	}	1041	}
783
784	#d##TODO# nuke non .map-files if exist
785	if ($filename =~ s/\.map$//) {
786	aio_unlink $filename;
787	aio_unlink "$filename.pst";
788	}
789	}	1042	}
790	}	1043	}
791		1044
792	sub object_freezer_as_string {	1045	sub object_freezer_as_string {
793	my ($rdata, $objs) = @_;	1046	my ($rdata, $objs) = @_;
…		…
799		1052
800	sub object_thawer_load {	1053	sub object_thawer_load {
801	my ($filename) = @_;	1054	my ($filename) = @_;
802		1055
803	my ($data, $av);	1056	my ($data, $av);
804
805	#d#TODO remove .map if file does not exist
806	aio_stat $filename and $filename =~ s/\.map$//;
807		1057
808	(aio_load $filename, $data) >= 0	1058	(aio_load $filename, $data) >= 0
809	or return;	1059	or return;
810		1060
811	unless (aio_stat "$filename.pst") {	1061	unless (aio_stat "$filename.pst") {
…		…
813	or return;	1063	or return;
814	$av = eval { (Storable::thaw $av)->{objs} };	1064	$av = eval { (Storable::thaw $av)->{objs} };
815	}	1065	}
816		1066
817	warn sprintf "loading %s (%d)\n",	1067	warn sprintf "loading %s (%d)\n",
818	$filename, length $data, scalar @{$av || []};#d#	1068	$filename, length $data, scalar @{$av || []};
819	return ($data, $av);	1069	return ($data, $av);
820	}	1070	}
		1071
		1072	=head2 COMMAND CALLBACKS
		1073
		1074	=over 4
		1075
		1076	=cut
821		1077
822	#############################################################################	1078	#############################################################################
823	# command handling &c	1079	# command handling &c
824		1080
825	=item cf::register_command $name => \&callback($ob,$args);	1081	=item cf::register_command $name => \&callback($ob,$args);
…		…
838	push @{ $COMMAND{$name} }, [$caller, $cb];	1094	push @{ $COMMAND{$name} }, [$caller, $cb];
839	}	1095	}
840		1096
841	=item cf::register_extcmd $name => \&callback($pl,$packet);	1097	=item cf::register_extcmd $name => \&callback($pl,$packet);
842		1098
843	Register a callbackf ro execution when the client sends an extcmd packet.	1099	Register a callback for execution when the client sends an (synchronous)
		1100	extcmd packet. Ext commands will be processed in the order they are
		1101	received by the server, like other user commands. The first argument is
		1102	the logged-in player. Ext commands can only be processed after a player
		1103	has logged in successfully.
844		1104
845	If the callback returns something, it is sent back as if reply was being	1105	If the callback returns something, it is sent back as if reply was being
846	called.	1106	called.
847		1107
		1108	=item cf::register_exticmd $name => \&callback($ns,$packet);
		1109
		1110	Register a callback for execution when the client sends an (asynchronous)
		1111	exticmd packet. Exti commands are processed by the server as soon as they
		1112	are received, i.e. out of order w.r.t. other commands. The first argument
		1113	is a client socket. Exti commands can be received anytime, even before
		1114	log-in.
		1115
		1116	If the callback returns something, it is sent back as if reply was being
		1117	called.
		1118
848	=cut	1119	=cut
849		1120
850	sub register_extcmd {	1121	sub register_extcmd {
851	my ($name, $cb) = @_;	1122	my ($name, $cb) = @_;
852		1123
853	$EXTCMD{$name} = $cb;	1124	$EXTCMD{$name} = $cb;
		1125	}
		1126
		1127	sub register_exticmd {
		1128	my ($name, $cb) = @_;
		1129
		1130	$EXTICMD{$name} = $cb;
854	}	1131	}
855		1132
856	cf::player->attach (	1133	cf::player->attach (
857	on_command => sub {	1134	on_command => sub {
858	my ($pl, $name, $params) = @_;	1135	my ($pl, $name, $params) = @_;
…		…
867	cf::override;	1144	cf::override;
868	},	1145	},
869	on_extcmd => sub {	1146	on_extcmd => sub {
870	my ($pl, $buf) = @_;	1147	my ($pl, $buf) = @_;
871		1148
872	my $msg = eval { from_json $buf };	1149	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
873		1150
874	if (ref $msg) {	1151	if (ref $msg) {
		1152	my ($type, $reply, @payload) =
		1153	"ARRAY" eq ref $msg
		1154	? @$msg
		1155	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1156
		1157	my @reply;
		1158
875	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1159	if (my $cb = $EXTCMD{$type}) {
876	if (my %reply = $cb->($pl, $msg)) {	1160	@reply = $cb->($pl, @payload);
877	$pl->ext_reply ($msg->{msgid}, %reply);
878	}
879	}	1161	}
		1162
		1163	$pl->ext_reply ($reply, @reply)
		1164	if $reply;
		1165
880	} else {	1166	} else {
881	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1167	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
882	}	1168	}
883		1169
884	cf::override;	1170	cf::override;
885	},	1171	},
886	);	1172	);
887		1173
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 {	1174	sub load_extensions {
		1175	cf::sync_job {
		1176	my %todo;
		1177
923	for my $ext (<$LIBDIR/*.ext>) {	1178	for my $path (<$LIBDIR/*.ext>) {
924	next unless -r $ext;	1179	next unless -r $path;
925	eval {	1180
926	load_extension $ext;	1181	$path =~ /([^\/\\]+)\.ext$/ or die "$path";
		1182	my $base = $1;
		1183	my $pkg = $1;
		1184	$pkg =~ s/[^[:word:]]/_/g;
		1185	$pkg = "ext::$pkg";
		1186
		1187	open my $fh, "<:utf8", $path
		1188	or die "$path: $!";
		1189
		1190	my $source = do { local $/; <$fh> };
		1191
		1192	my %ext = (
		1193	path => $path,
		1194	base => $base,
		1195	pkg => $pkg,
		1196	);
		1197
		1198	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
		1199	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
		1200
		1201	$ext{source} =
		1202	"package $pkg; use strict; use utf8;\n"
		1203	. "#line 1 \"$path\"\n{\n"
		1204	. $source
		1205	. "\n};\n1";
		1206
		1207	$todo{$base} = \%ext;
		1208	}
		1209
		1210	my %done;
		1211	while (%todo) {
		1212	my $progress;
		1213
		1214	while (my ($k, $v) = each %todo) {
		1215	for (split /,\s*/, $v->{meta}{depends}) {
		1216	goto skip
		1217	unless exists $done{$_};
		1218	}
		1219
		1220	warn "... loading '$k' into '$v->{pkg}'\n";
		1221
		1222	unless (eval $v->{source}) {
		1223	my $msg = $@ ? "$v->{path}: $@\n"
		1224	: "$v->{base}: extension inactive.\n";
		1225
		1226	if (exists $v->{meta}{mandatory}) {
		1227	warn $msg;
		1228	warn "mandatory extension failed to load, exiting.\n";
		1229	exit 1;
		1230	}
		1231
		1232	warn $msg;
		1233	}
		1234
		1235	$done{$k} = delete $todo{$k};
		1236	push @EXTS, $v->{pkg};
		1237	$progress = 1;
927	1	1238	}
928	} or warn "$ext not loaded: $@";	1239
		1240	skip:
		1241	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
		1242	unless $progress;
		1243	}
929	}	1244	};
930	}	1245	}
931		1246
932	#############################################################################	1247	#############################################################################
933		1248
		1249	=back
		1250
934	=head2 CORE EXTENSIONS	1251	=head2 CORE EXTENSIONS
935		1252
936	Functions and methods that extend core crossfire objects.	1253	Functions and methods that extend core crossfire objects.
937		1254
938	=cut	1255	=cut
…		…
950	Returns the given player object, loading it if necessary (might block).	1267	Returns the given player object, loading it if necessary (might block).
951		1268
952	=cut	1269	=cut
953		1270
954	sub playerdir($) {	1271	sub playerdir($) {
955	cf::localdir	1272	"$PLAYERDIR/"
956	. "/"
957	. cf::playerdir
958	. "/"
959	. (ref $_[0] ? $_[0]->ob->name : $_[0])	1273	. (ref $_[0] ? $_[0]->ob->name : $_[0])
960	}	1274	}
961		1275
962	sub path($) {	1276	sub path($) {
963	my $login = ref $_[0] ? $_[0]->ob->name : $_[0];	1277	my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
964		1278
965	(playerdir $login) . "/$login.pl"	1279	(playerdir $login) . "/playerdata"
966	}	1280	}
967		1281
968	sub find_active($) {	1282	sub find_active($) {
969	$cf::PLAYER{$_[0]}	1283	$cf::PLAYER{$_[0]}
970	and $cf::PLAYER{$_[0]}->active	1284	and $cf::PLAYER{$_[0]}->active
…		…
983	my $login = $_[0];	1297	my $login = $_[0];
984		1298
985	my $guard = cf::lock_acquire "user_find:$login";	1299	my $guard = cf::lock_acquire "user_find:$login";
986		1300
987	$cf::PLAYER{$_[0]} || do {	1301	$cf::PLAYER{$_[0]} || do {
		1302	# rename old playerfiles to new ones
		1303	#TODO: remove when no longer required
		1304	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
		1305	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
		1306	aio_unlink +(playerdir $login) . "/$login.pl.pst";
		1307	aio_unlink +(playerdir $login) . "/$login.pl";
		1308
988	my $pl = load_pl path $login	1309	my $pl = load_pl path $login
989	or return;	1310	or return;
990	$cf::PLAYER{$login} = $pl	1311	$cf::PLAYER{$login} = $pl
991	}	1312	}
992	}	1313	}
…		…
1004		1325
1005	aio_mkdir playerdir $pl, 0770;	1326	aio_mkdir playerdir $pl, 0770;
1006	$pl->{last_save} = $cf::RUNTIME;	1327	$pl->{last_save} = $cf::RUNTIME;
1007		1328
1008	$pl->save_pl ($path);	1329	$pl->save_pl ($path);
1009	Coro::cede;	1330	cf::cede_to_tick;
1010	}	1331	}
1011		1332
1012	sub new($) {	1333	sub new($) {
1013	my ($login) = @_;	1334	my ($login) = @_;
1014		1335
…		…
1020	$cf::PLAYER{$login} = $self;	1341	$cf::PLAYER{$login} = $self;
1021		1342
1022	$self	1343	$self
1023	}	1344	}
1024		1345
		1346	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1347
		1348	=cut
		1349
		1350	sub send_msg {
		1351	my $ns = shift->ns
		1352	or return;
		1353	$ns->send_msg (@_);
		1354	}
		1355
1025	=item $pl->quit_character	1356	=item $pl->quit_character
1026		1357
1027	Nukes the player without looking back. If logged in, the connection will	1358	Nukes the player without looking back. If logged in, the connection will
1028	be destroyed. May block for a long time.	1359	be destroyed. May block for a long time.
1029		1360
1030	=cut	1361	=cut
1031		1362
1032	sub quit_character {	1363	sub quit_character {
1033	my ($pl) = @_;	1364	my ($pl) = @_;
		1365
		1366	my $name = $pl->ob->name;
1034		1367
1035	$pl->{deny_save} = 1;	1368	$pl->{deny_save} = 1;
1036	$pl->password ("*"); # this should lock out the player until we nuked the dir	1369	$pl->password ("*"); # this should lock out the player until we nuked the dir
1037		1370
1038	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1371	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
…		…
1043	my $path = playerdir $pl;	1376	my $path = playerdir $pl;
1044	my $temp = "$path~$cf::RUNTIME~deleting~";	1377	my $temp = "$path~$cf::RUNTIME~deleting~";
1045	aio_rename $path, $temp;	1378	aio_rename $path, $temp;
1046	delete $cf::PLAYER{$pl->ob->name};	1379	delete $cf::PLAYER{$pl->ob->name};
1047	$pl->destroy;	1380	$pl->destroy;
		1381
		1382	my $prefix = qr<^~\Q$name\E/>;
		1383
		1384	# nuke player maps
		1385	$cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
		1386
1048	IO::AIO::aio_rmtree $temp;	1387	IO::AIO::aio_rmtree $temp;
		1388	}
		1389
		1390	=item $pl->kick
		1391
		1392	Kicks a player out of the game. This destroys the connection.
		1393
		1394	=cut
		1395
		1396	sub kick {
		1397	my ($pl, $kicker) = @_;
		1398
		1399	$pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
		1400	$pl->killer ("kicked");
		1401	$pl->ns->destroy;
1049	}	1402	}
1050		1403
1051	=item cf::player::list_logins	1404	=item cf::player::list_logins
1052		1405
1053	Returns am arrayref of all valid playernames in the system, can take a	1406	Returns am arrayref of all valid playernames in the system, can take a
1054	while and may block, so not sync_job-capable, ever.	1407	while and may block, so not sync_job-capable, ever.
1055		1408
1056	=cut	1409	=cut
1057		1410
1058	sub list_logins {	1411	sub list_logins {
1059	my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir	1412	my $dirs = aio_readdir $PLAYERDIR
1060	or return [];	1413	or return [];
1061		1414
1062	my @logins;	1415	my @logins;
1063		1416
1064	for my $login (@$dirs) {	1417	for my $login (@$dirs) {
…		…
1099	}	1452	}
1100		1453
1101	\@paths	1454	\@paths
1102	}	1455	}
1103		1456
		1457	=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
		1458
		1459	Expand crossfire pod fragments into protocol xml.
		1460
		1461	=cut
		1462
		1463	sub expand_cfpod {
		1464	((my $self), (local $_)) = @_;
		1465
		1466	# escape & and <
		1467	s/&/&amp;/g;
		1468	s/(?<![BIUGHT])</&lt;/g;
		1469
		1470	# this is buggy, it needs to properly take care of nested <'s
		1471
		1472	1 while
		1473	# replace B<>, I<>, U<> etc.
		1474	s/B<([^\>]*)>/<b>$1<\/b>/
		1475	|| s/I<([^\>]*)>/<i>$1<\/i>/
		1476	|| s/U<([^\>]*)>/<u>$1<\/u>/
		1477	|| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
		1478	# replace G<male|female> tags
		1479	|| s{G<([^>|]*)\|([^>]*)>}{
		1480	$self->gender ? $2 : $1
		1481	}ge
		1482	# replace H<hint text>
		1483	|| s{H<([^\>]*)>}
		1484	{
		1485	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
		1486	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
		1487	"")
		1488	[$self->{hintmode}]
		1489	}ge;
		1490
		1491	# create single paragraphs (very hackish)
		1492	s/(?<=\S)\n(?=\w)/ /g;
		1493
		1494	# compress some whitespace
		1495	s/\s+\n/\n/g; # ws line-ends
		1496	s/\n\n+/\n/g; # double lines
		1497	s/^\n+//; # beginning lines
		1498	s/\n+$//; # ending lines
		1499
		1500	$_
		1501	}
		1502
		1503	sub hintmode {
		1504	$_[0]{hintmode} = $_[1] if @_ > 1;
		1505	$_[0]{hintmode}
		1506	}
		1507
1104	=item $player->ext_reply ($msgid, $msgtype, %msg)	1508	=item $player->ext_reply ($msgid, @msg)
1105		1509
1106	Sends an ext reply to the player.	1510	Sends an ext reply to the player.
1107		1511
1108	=cut	1512	=cut
1109		1513
1110	sub ext_reply($$$%) {	1514	sub ext_reply($$@) {
1111	my ($self, $id, %msg) = @_;	1515	my ($self, $id, @msg) = @_;
1112		1516
1113	$msg{msgid} = $id;	1517	$self->ns->ext_reply ($id, @msg)
1114
1115	$self->send ("ext " . cf::to_json \%msg);
1116	}	1518	}
1117		1519
1118	package cf;	1520	=item $player->ext_msg ($type, @msg)
		1521
		1522	Sends an ext event to the client.
		1523
		1524	=cut
		1525
		1526	sub ext_msg($$@) {
		1527	my ($self, $type, @msg) = @_;
		1528
		1529	$self->ns->ext_msg ($type, @msg);
		1530	}
		1531
		1532	=head3 cf::region
		1533
		1534	=over 4
		1535
		1536	=cut
		1537
		1538	package cf::region;
		1539
		1540	=item cf::region::find_by_path $path
		1541
		1542	Tries to decuce the likely region for a map knowing only its path.
		1543
		1544	=cut
		1545
		1546	sub find_by_path($) {
		1547	my ($path) = @_;
		1548
		1549	my ($match, $specificity);
		1550
		1551	for my $region (list) {
		1552	if ($region->{match} && $path =~ $region->{match}) {
		1553	($match, $specificity) = ($region, $region->specificity)
		1554	if $region->specificity > $specificity;
		1555	}
		1556	}
		1557
		1558	$match
		1559	}
1119		1560
1120	=back	1561	=back
1121
1122		1562
1123	=head3 cf::map	1563	=head3 cf::map
1124		1564
1125	=over 4	1565	=over 4
1126		1566
…		…
1181	my ($self, $merge) = @_;	1621	my ($self, $merge) = @_;
1182		1622
1183	# we have to keep some variables in memory intact	1623	# we have to keep some variables in memory intact
1184	local $self->{path};	1624	local $self->{path};
1185	local $self->{load_path};	1625	local $self->{load_path};
1186	local $self->{deny_save};
1187	local $self->{deny_reset};
1188		1626
1189	$self->SUPER::thawer_merge ($merge);	1627	$self->SUPER::thawer_merge ($merge);
1190	}	1628	}
1191		1629
1192	sub normalise {	1630	sub normalise {
…		…
1239	$self->init; # pass $1 etc.	1677	$self->init; # pass $1 etc.
1240	return $self;	1678	return $self;
1241	}	1679	}
1242	}	1680	}
1243		1681
1244	Carp::carp "unable to resolve path '$path' (base '$base').";	1682	Carp::cluck "unable to resolve path '$path' (base '$base').";
1245	()	1683	()
1246	}	1684	}
1247		1685
1248	sub init {	1686	sub init {
1249	my ($self) = @_;	1687	my ($self) = @_;
…		…
1264		1702
1265	# the original (read-only) location	1703	# the original (read-only) location
1266	sub load_path {	1704	sub load_path {
1267	my ($self) = @_;	1705	my ($self) = @_;
1268		1706
1269	sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}	1707	"$MAPDIR/$self->{path}.map"
1270	}	1708	}
1271		1709
1272	# the temporary/swap location	1710	# the temporary/swap location
1273	sub save_path {	1711	sub save_path {
1274	my ($self) = @_;	1712	my ($self) = @_;
1275		1713
1276	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1714	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1277	sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path	1715	"$TMPDIR/$path.map"
1278	}	1716	}
1279		1717
1280	# the unique path, undef == no special unique path	1718	# the unique path, undef == no special unique path
1281	sub uniq_path {	1719	sub uniq_path {
1282	my ($self) = @_;	1720	my ($self) = @_;
1283		1721
1284	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1722	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1285	sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path	1723	"$UNIQUEDIR/$path"
1286	}	1724	}
1287		1725
1288	# and all this just because we cannot iterate over	1726	# and all this just because we cannot iterate over
1289	# all maps in C++...	1727	# all maps in C++...
1290	sub change_all_map_light {	1728	sub change_all_map_light {
…		…
1292		1730
1293	$_->change_map_light ($change)	1731	$_->change_map_light ($change)
1294	for grep $_->outdoor, values %cf::MAP;	1732	for grep $_->outdoor, values %cf::MAP;
1295	}	1733	}
1296		1734
		1735	sub decay_objects {
		1736	my ($self) = @_;
		1737
		1738	return if $self->{deny_reset};
		1739
		1740	$self->do_decay_objects;
		1741	}
		1742
1297	sub unlink_save {	1743	sub unlink_save {
1298	my ($self) = @_;	1744	my ($self) = @_;
1299		1745
1300	utf8::encode (my $save = $self->save_path);	1746	utf8::encode (my $save = $self->save_path);
1301	IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;	1747	IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1302	IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";	1748	IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1303
1304	#d#TODO remove .map and also nuke
1305	$save =~ s/\.map// or return;#d#
1306	IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1307	IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1308	}	1749	}
1309		1750
1310	sub load_header_from($) {	1751	sub load_header_from($) {
1311	my ($self, $path) = @_;	1752	my ($self, $path) = @_;
1312		1753
…		…
1362	$self->load_header_orig	1803	$self->load_header_orig
1363	or return;	1804	or return;
1364	$self->prepare_orig;	1805	$self->prepare_orig;
1365	}	1806	}
1366		1807
		1808	$self->{deny_reset} = 1
		1809	if $self->no_reset;
		1810
		1811	$self->default_region (cf::region::find_by_path $self->{path})
		1812	unless $self->default_region;
		1813
1367	1	1814	1
1368	}	1815	}
1369		1816
1370	sub find;	1817	sub find;
1371	sub find {	1818	sub find {
…		…
1383	$map->{last_save} = $cf::RUNTIME;	1830	$map->{last_save} = $cf::RUNTIME;
1384		1831
1385	$map->load_header	1832	$map->load_header
1386	or return;	1833	or return;
1387		1834
1388	if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)	1835	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1389	# doing this can freeze the server in a sync job, obviously	1836	# doing this can freeze the server in a sync job, obviously
1390	#$cf::WAIT_FOR_TICK->wait;	1837	#$cf::WAIT_FOR_TICK->wait;
1391	$map->reset;	1838	$map->reset;
1392	undef $guard;	1839	undef $guard;
1393	return find $path;	1840	return find $path;
…		…
1404	my ($self) = @_;	1851	my ($self) = @_;
1405		1852
1406	local $self->{deny_reset} = 1; # loading can take a long time	1853	local $self->{deny_reset} = 1; # loading can take a long time
1407		1854
1408	my $path = $self->{path};	1855	my $path = $self->{path};
		1856
		1857	{
		1858	my $guard1 = cf::lock_acquire "map_data:$path";
1409	my $guard = cf::lock_acquire "map_load:$path";	1859	my $guard2 = cf::lock_acquire "map_load:$path";
1410		1860
1411	return if $self->in_memory != cf::MAP_SWAPPED;	1861	return if $self->in_memory != cf::MAP_SWAPPED;
1412		1862
1413	$self->in_memory (cf::MAP_LOADING);	1863	$self->in_memory (cf::MAP_LOADING);
1414		1864
1415	$self->alloc;	1865	$self->alloc;
1416		1866
1417	$self->pre_load;	1867	$self->pre_load;
		1868	cf::cede_to_tick;
1418		1869
1419	$self->_load_objects ($self->{load_path}, 1)	1870	$self->_load_objects ($self->{load_path}, 1)
1420	or return;	1871	or return;
1421		1872
1422	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1873	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1423	if delete $self->{load_original};	1874	if delete $self->{load_original};
1424		1875
1425	if (my $uniq = $self->uniq_path) {	1876	if (my $uniq = $self->uniq_path) {
1426	utf8::encode $uniq;	1877	utf8::encode $uniq;
1427	if (aio_open $uniq, O_RDONLY, 0) {	1878	if (aio_open $uniq, O_RDONLY, 0) {
1428	$self->clear_unique_items;	1879	$self->clear_unique_items;
1429	$self->_load_objects ($uniq, 0);	1880	$self->_load_objects ($uniq, 0);
1430	}	1881	}
1431	}	1882	}
1432		1883
1433	Coro::cede;	1884	cf::cede_to_tick;
1434
1435	# now do the right thing for maps	1885	# now do the right thing for maps
1436	$self->link_multipart_objects;	1886	$self->link_multipart_objects;
1437
1438	unless ($self->{deny_activate}) {
1439	$self->decay_objects;
1440	$self->fix_auto_apply;
1441	$self->update_buttons;
1442	Coro::cede;
1443	$self->set_darkness_map;
1444	$self->difficulty ($self->estimate_difficulty)	1887	$self->difficulty ($self->estimate_difficulty)
1445	unless $self->difficulty;	1888	unless $self->difficulty;
1446	Coro::cede;	1889	cf::cede_to_tick;
		1890
		1891	unless ($self->{deny_activate}) {
		1892	$self->decay_objects;
		1893	$self->fix_auto_apply;
		1894	$self->update_buttons;
		1895	cf::cede_to_tick;
		1896	$self->set_darkness_map;
		1897	cf::cede_to_tick;
1447	$self->activate;	1898	$self->activate;
		1899	}
		1900
		1901	$self->{last_save} = $cf::RUNTIME;
		1902	$self->last_access ($cf::RUNTIME);
		1903
		1904	$self->in_memory (cf::MAP_IN_MEMORY);
1448	}	1905	}
1449		1906
1450	$self->post_load;	1907	$self->post_load;
1451
1452	$self->in_memory (cf::MAP_IN_MEMORY);
1453	}	1908	}
1454		1909
1455	sub customise_for {	1910	sub customise_for {
1456	my ($self, $ob) = @_;	1911	my ($self, $ob) = @_;
1457		1912
1458	return find "~" . $ob->name . "/" . $self->{path}	1913	return find "~" . $ob->name . "/" . $self->{path}
1459	if $self->per_player;	1914	if $self->per_player;
1460		1915
		1916	# return find "?party/" . $ob->name . "/" . $self->{path}
		1917	# if $self->per_party;
		1918
1461	$self	1919	$self
1462	}	1920	}
1463		1921
1464	# find and load all maps in the 3x3 area around a map	1922	# find and load all maps in the 3x3 area around a map
1465	sub load_diag {	1923	sub load_neighbours {
1466	my ($map) = @_;	1924	my ($map) = @_;
1467		1925
1468	my @diag; # diagonal neighbours	1926	my @neigh; # diagonal neighbours
1469		1927
1470	for (0 .. 3) {	1928	for (0 .. 3) {
1471	my $neigh = $map->tile_path ($_)	1929	my $neigh = $map->tile_path ($_)
1472	or next;	1930	or next;
1473	$neigh = find $neigh, $map	1931	$neigh = find $neigh, $map
1474	or next;	1932	or next;
1475	$neigh->load;	1933	$neigh->load;
1476		1934
		1935	push @neigh,
1477	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	1936	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1478	[$neigh->tile_path (($_ + 1) % 4), $neigh];	1937	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1479	}	1938	}
1480		1939
1481	for (@diag) {	1940	for (grep defined $_->[0], @neigh) {
		1941	my ($path, $origin) = @$_;
1482	my $neigh = find @$_	1942	my $neigh = find $path, $origin
1483	or next;	1943	or next;
1484	$neigh->load;	1944	$neigh->load;
1485	}	1945	}
1486	}	1946	}
1487		1947
…		…
1492	}	1952	}
1493		1953
1494	sub do_load_sync {	1954	sub do_load_sync {
1495	my ($map) = @_;	1955	my ($map) = @_;
1496		1956
		1957	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
		1958	if $Coro::current == $Coro::main;
		1959
1497	cf::sync_job { $map->load };	1960	cf::sync_job { $map->load };
1498	}	1961	}
1499		1962
1500	our %MAP_PREFETCH;	1963	our %MAP_PREFETCH;
1501	our $MAP_PREFETCHER = undef;	1964	our $MAP_PREFETCHER = undef;
1502		1965
1503	sub find_async {	1966	sub find_async {
1504	my ($path, $origin) = @_;	1967	my ($path, $origin, $load) = @_;
1505		1968
1506	$path = normalise $path, $origin && $origin->{path};	1969	$path = normalise $path, $origin && $origin->{path};
1507		1970
1508	if (my $map = $cf::MAP{$path}) {	1971	if (my $map = $cf::MAP{$path}) {
1509	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	1972	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1510	}	1973	}
1511		1974
1512	undef $MAP_PREFETCH{$path};	1975	$MAP_PREFETCH{$path} |= $load;
		1976
1513	$MAP_PREFETCHER ||= cf::async {	1977	$MAP_PREFETCHER ||= cf::async {
1514	while (%MAP_PREFETCH) {	1978	while (%MAP_PREFETCH) {
1515	for my $path (keys %MAP_PREFETCH) {	1979	while (my ($k, $v) = each %MAP_PREFETCH) {
1516	my $map = find $path	1980	if (my $map = find $k) {
1517	or next;
1518	$map->load;	1981	$map->load if $v;
		1982	}
1519		1983
1520	delete $MAP_PREFETCH{$path};	1984	delete $MAP_PREFETCH{$k};
1521	}	1985	}
1522	}	1986	}
1523	undef $MAP_PREFETCHER;	1987	undef $MAP_PREFETCHER;
1524	};	1988	};
1525	$MAP_PREFETCHER->prio (6);	1989	$MAP_PREFETCHER->prio (6);
…		…
1528	}	1992	}
1529		1993
1530	sub save {	1994	sub save {
1531	my ($self) = @_;	1995	my ($self) = @_;
1532		1996
1533	my $lock = cf::lock_acquire "map_data:" . $self->path;	1997	my $lock = cf::lock_acquire "map_data:$self->{path}";
1534		1998
1535	$self->{last_save} = $cf::RUNTIME;	1999	$self->{last_save} = $cf::RUNTIME;
1536		2000
1537	return unless $self->dirty;	2001	return unless $self->dirty;
1538		2002
…		…
1561	my ($self) = @_;	2025	my ($self) = @_;
1562		2026
1563	# save first because save cedes	2027	# save first because save cedes
1564	$self->save;	2028	$self->save;
1565		2029
1566	my $lock = cf::lock_acquire "map_data:" . $self->path;	2030	my $lock = cf::lock_acquire "map_data:$self->{path}";
1567		2031
1568	return if $self->players;	2032	return if $self->players;
1569	return if $self->in_memory != cf::MAP_IN_MEMORY;	2033	return if $self->in_memory != cf::MAP_IN_MEMORY;
1570	return if $self->{deny_save};	2034	return if $self->{deny_save};
1571		2035
…		…
1575		2039
1576	sub reset_at {	2040	sub reset_at {
1577	my ($self) = @_;	2041	my ($self) = @_;
1578		2042
1579	# TODO: safety, remove and allow resettable per-player maps	2043	# TODO: safety, remove and allow resettable per-player maps
1580	return 1e99 if $self->isa ("ext::map_per_player");#d#
1581	return 1e99 if $self->{deny_reset};	2044	return 1e99 if $self->{deny_reset};
1582		2045
1583	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;	2046	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1584	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;	2047	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1585		2048
…		…
1596	my ($self) = @_;	2059	my ($self) = @_;
1597		2060
1598	my $lock = cf::lock_acquire "map_data:$self->{path}";	2061	my $lock = cf::lock_acquire "map_data:$self->{path}";
1599		2062
1600	return if $self->players;	2063	return if $self->players;
1601	return if $self->isa ("ext::map_per_player");#d#
1602		2064
1603	warn "resetting map ", $self->path;#d#	2065	warn "resetting map ", $self->path;
		2066
		2067	$self->in_memory (cf::MAP_SWAPPED);
		2068
		2069	# need to save uniques path
		2070	unless ($self->{deny_save}) {
		2071	my $uniq = $self->uniq_path; utf8::encode $uniq;
		2072
		2073	$self->_save_objects ($uniq, cf::IO_UNIQUES)
		2074	if $uniq;
		2075	}
1604		2076
1605	delete $cf::MAP{$self->path};	2077	delete $cf::MAP{$self->path};
1606		2078
1607	$self->in_memory (cf::MAP_SWAPPED);
1608	$self->clear;	2079	$self->clear;
1609		2080
1610	$_->clear_links_to ($self) for values %cf::MAP;	2081	$_->clear_links_to ($self) for values %cf::MAP;
1611		2082
1612	$self->unlink_save;	2083	$self->unlink_save;
…		…
1616	my $nuke_counter = "aaaa";	2087	my $nuke_counter = "aaaa";
1617		2088
1618	sub nuke {	2089	sub nuke {
1619	my ($self) = @_;	2090	my ($self) = @_;
1620		2091
		2092	{
		2093	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2094
1621	delete $cf::MAP{$self->path};	2095	delete $cf::MAP{$self->path};
1622		2096
1623	$self->unlink_save;	2097	$self->unlink_save;
1624		2098
1625	bless $self, "cf::map";	2099	bless $self, "cf::map";
1626	delete $self->{deny_reset};	2100	delete $self->{deny_reset};
1627	$self->{deny_save} = 1;	2101	$self->{deny_save} = 1;
1628	$self->reset_timeout (1);	2102	$self->reset_timeout (1);
1629	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2103	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1630		2104
1631	$cf::MAP{$self->path} = $self;	2105	$cf::MAP{$self->path} = $self;
		2106	}
1632		2107
1633	$self->reset; # polite request, might not happen	2108	$self->reset; # polite request, might not happen
		2109	}
		2110
		2111	=item $maps = cf::map::tmp_maps
		2112
		2113	Returns an arrayref with all map paths of currently instantiated and saved
		2114	maps. May block.
		2115
		2116	=cut
		2117
		2118	sub tmp_maps() {
		2119	[
		2120	map {
		2121	utf8::decode $_;
		2122	/\.map$/
		2123	? normalise $_
		2124	: ()
		2125	} @{ aio_readdir $TMPDIR or [] }
		2126	]
		2127	}
		2128
		2129	=item $maps = cf::map::random_maps
		2130
		2131	Returns an arrayref with all map paths of currently instantiated and saved
		2132	random maps. May block.
		2133
		2134	=cut
		2135
		2136	sub random_maps() {
		2137	[
		2138	map {
		2139	utf8::decode $_;
		2140	/\.map$/
		2141	? normalise "?random/$_"
		2142	: ()
		2143	} @{ aio_readdir $RANDOMDIR or [] }
		2144	]
1634	}	2145	}
1635		2146
1636	=item cf::map::unique_maps	2147	=item cf::map::unique_maps
1637		2148
1638	Returns an arrayref of paths of all shared maps that have	2149	Returns an arrayref of paths of all shared maps that have
1639	instantiated unique items. May block.	2150	instantiated unique items. May block.
1640		2151
1641	=cut	2152	=cut
1642		2153
1643	sub unique_maps() {	2154	sub unique_maps() {
1644	my $files = aio_readdir cf::localdir . "/" . cf::uniquedir	2155	[
1645	or return;	2156	map {
1646
1647	my @paths;
1648
1649	for (@$files) {
1650	utf8::decode $_;	2157	utf8::decode $_;
1651	next if /\.pst$/;	2158	/\.map$/
1652	next unless /^$PATH_SEP/o;	2159	? normalise $_
1653		2160	: ()
1654	push @paths, cf::map::normalise $_;	2161	} @{ aio_readdir $UNIQUEDIR or [] }
1655	}	2162	]
1656
1657	\@paths
1658	}	2163	}
1659		2164
1660	package cf;	2165	package cf;
1661		2166
1662	=back	2167	=back
…		…
1708		2213
1709	$flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;	2214	$flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1710		2215
1711	if ($self->{record_replies}) {	2216	if ($self->{record_replies}) {
1712	push @{ $self->{record_replies} }, [$npc, $msg, $flags];	2217	push @{ $self->{record_replies} }, [$npc, $msg, $flags];
		2218
1713	} else {	2219	} else {
		2220	my $pl = $self->contr;
		2221
		2222	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
		2223	my $dialog = $pl->{npc_dialog};
		2224	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
		2225
		2226	} else {
1714	$msg = $npc->name . " says: $msg" if $npc;	2227	$msg = $npc->name . " says: $msg" if $npc;
1715	$self->message ($msg, $flags);	2228	$self->message ($msg, $flags);
		2229	}
1716	}	2230	}
		2231	}
		2232
		2233	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2234
		2235	=cut
		2236
		2237	sub cf::object::send_msg {
		2238	my $pl = shift->contr
		2239	or return;
		2240	$pl->send_msg (@_);
1717	}	2241	}
1718		2242
1719	=item $player_object->may ("access")	2243	=item $player_object->may ("access")
1720		2244
1721	Returns wether the given player is authorized to access resource "access"	2245	Returns wether the given player is authorized to access resource "access"
…		…
1768	$self->deactivate_recursive;	2292	$self->deactivate_recursive;
1769		2293
1770	return if UNIVERSAL::isa $self->map, "ext::map_link";	2294	return if UNIVERSAL::isa $self->map, "ext::map_link";
1771		2295
1772	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2296	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1773	if $self->map;	2297	if $self->map && $self->map->{path} ne "{link}";
1774		2298
1775	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2299	$self->enter_map ($LINK_MAP || link_map, 10, 10);
1776	}	2300	}
1777		2301
1778	sub cf::object::player::leave_link {	2302	sub cf::object::player::leave_link {
1779	my ($self, $map, $x, $y) = @_;	2303	my ($self, $map, $x, $y) = @_;
		2304
		2305	return unless $self->contr->active;
1780		2306
1781	my $link_pos = delete $self->{_link_pos};	2307	my $link_pos = delete $self->{_link_pos};
1782		2308
1783	unless ($map) {	2309	unless ($map) {
1784	# restore original map position	2310	# restore original map position
…		…
1798	# use -1 or undef as default coordinates, not 0, 0	2324	# use -1 or undef as default coordinates, not 0, 0
1799	($x, $y) = ($map->enter_x, $map->enter_y)	2325	($x, $y) = ($map->enter_x, $map->enter_y)
1800	if $x <=0 && $y <= 0;	2326	if $x <=0 && $y <= 0;
1801		2327
1802	$map->load;	2328	$map->load;
1803	$map->load_diag;	2329	$map->load_neighbours;
1804		2330
1805	return unless $self->contr->active;	2331	return unless $self->contr->active;
1806	$self->activate_recursive;	2332	$self->activate_recursive;
		2333
		2334	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1807	$self->enter_map ($map, $x, $y);	2335	$self->enter_map ($map, $x, $y);
1808	}	2336	}
1809		2337
1810	cf::player->attach (	2338	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1811	on_logout => sub {
1812	my ($pl) = @_;
1813		2339
1814	# abort map switching before logout	2340	Moves the player to the given map-path and coordinates by first freezing
1815	if ($pl->ob->{_link_pos}) {	2341	her, loading and preparing them map, calling the provided $check callback
1816	cf::sync_job {	2342	that has to return the map if sucecssful, and then unfreezes the player on
1817	$pl->ob->leave_link	2343	the new (success) or old (failed) map position. In either case, $done will
1818	};	2344	be called at the end of this process.
1819	}
1820	},
1821	on_login => sub {
1822	my ($pl) = @_;
1823		2345
1824	# try to abort aborted map switching on player login :)
1825	# should happen only on crashes
1826	if ($pl->ob->{_link_pos}) {
1827	$pl->ob->enter_link;
1828	(async {
1829	# we need this sleep as the login has a concurrent enter_exit running
1830	# and this sleep increases chances of the player not ending up in scorn
1831	$pl->ob->reply (undef,
1832	"There was an internal problem at your last logout, "
1833	. "the server will try to bring you to your intended destination in a second.",
1834	cf::NDI_RED);
1835	Coro::Timer::sleep 1;
1836	$pl->ob->leave_link;
1837	})->prio (2);
1838	}
1839	},
1840	);
1841
1842	=item $player_object->goto ($path, $x, $y)
1843
1844	=cut	2346	=cut
		2347
		2348	our $GOTOGEN;
1845		2349
1846	sub cf::object::player::goto {	2350	sub cf::object::player::goto {
1847	my ($self, $path, $x, $y) = @_;	2351	my ($self, $path, $x, $y, $check, $done) = @_;
		2352
		2353	# do generation counting so two concurrent goto's will be executed in-order
		2354	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1848		2355
1849	$self->enter_link;	2356	$self->enter_link;
1850		2357
1851	(async {	2358	(async {
1852	my $map = eval {	2359	my $map = eval {
1853	my $map = cf::map::find $path;	2360	my $map = cf::map::find $path;
		2361
		2362	if ($map) {
1854	$map = $map->customise_for ($self) if $map;	2363	$map = $map->customise_for ($self);
		2364	$map = $check->($map) if $check && $map;
		2365	} else {
		2366	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
		2367	}
		2368
1855	$map	2369	$map
		2370	};
		2371
		2372	if ($@) {
		2373	$self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
		2374	LOG llevError | logBacktrace, Carp::longmess $@;
1856	} or	2375	}
1857	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1858		2376
		2377	if ($gen == $self->{_goto_generation}) {
		2378	delete $self->{_goto_generation};
1859	$self->leave_link ($map, $x, $y);	2379	$self->leave_link ($map, $x, $y);
		2380	}
		2381
		2382	$done->() if $done;
1860	})->prio (1);	2383	})->prio (1);
1861	}	2384	}
1862		2385
1863	=item $player_object->enter_exit ($exit_object)	2386	=item $player_object->enter_exit ($exit_object)
1864		2387
…		…
1903		2426
1904	$rmp->{random_seed} ||= $exit->random_seed;	2427	$rmp->{random_seed} ||= $exit->random_seed;
1905		2428
1906	my $data = cf::to_json $rmp;	2429	my $data = cf::to_json $rmp;
1907	my $md5 = Digest::MD5::md5_hex $data;	2430	my $md5 = Digest::MD5::md5_hex $data;
1908	my $meta = "$cf::RANDOM_MAPS/$md5.meta";	2431	my $meta = "$RANDOMDIR/$md5.meta";
1909		2432
1910	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {	2433	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1911	aio_write $fh, 0, (length $data), $data, 0;	2434	aio_write $fh, 0, (length $data), $data, 0;
1912	undef $fh;	2435	undef $fh;
1913	aio_rename "$meta~", $meta;	2436	aio_rename "$meta~", $meta;
…		…
1922		2445
1923	return unless $self->type == cf::PLAYER;	2446	return unless $self->type == cf::PLAYER;
1924		2447
1925	if ($exit->slaying eq "/!") {	2448	if ($exit->slaying eq "/!") {
1926	#TODO: this should de-fi-ni-te-ly not be a sync-job	2449	#TODO: this should de-fi-ni-te-ly not be a sync-job
		2450	# the problem is that $exit might not survive long enough
		2451	# so it needs to be done right now, right here
1927	cf::sync_job { prepare_random_map $exit };	2452	cf::sync_job { prepare_random_map $exit };
1928	}	2453	}
1929		2454
1930	my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2455	my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1931	my $hp = $exit->stats->hp;	2456	my $hp = $exit->stats->hp;
1932	my $sp = $exit->stats->sp;	2457	my $sp = $exit->stats->sp;
1933		2458
1934	$self->enter_link;	2459	$self->enter_link;
		2460
		2461	# if exit is damned, update players death & WoR home-position
		2462	$self->contr->savebed ($slaying, $hp, $sp)
		2463	if $exit->flag (FLAG_DAMNED);
1935		2464
1936	(async {	2465	(async {
1937	$self->deactivate_recursive; # just to be sure	2466	$self->deactivate_recursive; # just to be sure
1938	unless (eval {	2467	unless (eval {
1939	$self->goto ($slaying, $hp, $sp);	2468	$self->goto ($slaying, $hp, $sp);
1940		2469
1941	1;	2470	1;
1942	}) {	2471	}) {
1943	$self->message ("Something went wrong deep within the crossfire server. "	2472	$self->message ("Something went wrong deep within the crossfire server. "
1944	. "I'll try to bring you back to the map you were before. "	2473	. "I'll try to bring you back to the map you were before. "
1945	. "Please report this to the dungeon master!",	2474	. "Please report this to the dungeon master!",
1946	cf::NDI_UNIQUE | cf::NDI_RED);	2475	cf::NDI_UNIQUE | cf::NDI_RED);
1947		2476
1948	warn "ERROR in enter_exit: $@";	2477	warn "ERROR in enter_exit: $@";
1949	$self->leave_link;	2478	$self->leave_link;
1950	}	2479	}
1951	})->prio (1);	2480	})->prio (1);
…		…
1964		2493
1965	sub cf::client::send_drawinfo {	2494	sub cf::client::send_drawinfo {
1966	my ($self, $text, $flags) = @_;	2495	my ($self, $text, $flags) = @_;
1967		2496
1968	utf8::encode $text;	2497	utf8::encode $text;
1969	$self->send_packet (sprintf "drawinfo %d %s", $flags, $text);	2498	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1970	}	2499	}
1971		2500
		2501	=item $client->send_msg ($channel, $msg, $color, [extra...])
		2502
		2503	Send a drawinfo or msg packet to the client, formatting the msg for the
		2504	client if neccessary. C<$type> should be a string identifying the type of
		2505	the message, with C<log> being the default. If C<$color> is negative, suppress
		2506	the message unless the client supports the msg packet.
		2507
		2508	=cut
		2509
		2510	our %CHANNEL = (
		2511	"c/identify" => {
		2512	id => "identify",
		2513	title => "Identify",
		2514	reply => undef,
		2515	tooltip => "Items recently identified",
		2516	},
		2517	"c/examine" => {
		2518	id => "examine",
		2519	title => "Examine",
		2520	reply => undef,
		2521	tooltip => "Signs and other items you examined",
		2522	},
		2523	);
		2524
		2525	sub cf::client::send_msg {
		2526	my ($self, $channel, $msg, $color, @extra) = @_;
		2527
		2528	$msg = $self->pl->expand_cfpod ($msg);
		2529
		2530	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2531
		2532	# check predefined channels, for the benefit of C
		2533	$channel = $CHANNEL{$channel} if $CHANNEL{$channel};
		2534
		2535	if (ref $channel) {
		2536	# send meta info to client, if not yet sent
		2537	unless (exists $self->{channel}{$channel->{id}}) {
		2538	$self->{channel}{$channel->{id}} = $channel;
		2539	$self->ext_msg (channel_info => $channel)
		2540	if $self->can_msg;
		2541	}
		2542
		2543	$channel = $channel->{id};
		2544	}
		2545
		2546	return unless @extra || length $msg;
		2547
		2548	if ($self->can_msg) {
		2549	# default colour, mask it out
		2550	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
		2551	if $color & cf::NDI_DEF;
		2552
		2553	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2554	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
		2555	} else {
		2556	if ($color >= 0) {
		2557	# replace some tags by gcfclient-compatible ones
		2558	for ($msg) {
		2559	1 while
		2560	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2561	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2562	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2563	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2564	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2565	}
		2566
		2567	$color &= cf::NDI_COLOR_MASK;
		2568
		2569	utf8::encode $msg;
		2570
		2571	if (0 && $msg =~ /\[/) {
		2572	# COMMAND/INFO
		2573	$self->send_packet ("drawextinfo $color 10 8 $msg")
		2574	} else {
		2575	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
		2576	$self->send_packet ("drawinfo $color $msg")
		2577	}
		2578	}
		2579	}
		2580	}
		2581
		2582	=item $client->ext_msg ($type, @msg)
		2583
		2584	Sends an ext event to the client.
		2585
		2586	=cut
		2587
		2588	sub cf::client::ext_msg($$@) {
		2589	my ($self, $type, @msg) = @_;
		2590
		2591	if ($self->extcmd == 2) {
		2592	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2593	} elsif ($self->extcmd == 1) { # TODO: remove
		2594	push @msg, msgtype => "event_$type";
		2595	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2596	}
		2597	}
		2598
		2599	=item $client->ext_reply ($msgid, @msg)
		2600
		2601	Sends an ext reply to the client.
		2602
		2603	=cut
		2604
		2605	sub cf::client::ext_reply($$@) {
		2606	my ($self, $id, @msg) = @_;
		2607
		2608	if ($self->extcmd == 2) {
		2609	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2610	} elsif ($self->extcmd == 1) {
		2611	#TODO: version 1, remove
		2612	unshift @msg, msgtype => "reply", msgid => $id;
		2613	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2614	}
		2615	}
1972		2616
1973	=item $success = $client->query ($flags, "text", \&cb)	2617	=item $success = $client->query ($flags, "text", \&cb)
1974		2618
1975	Queues a query to the client, calling the given callback with	2619	Queues a query to the client, calling the given callback with
1976	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,	2620	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
1977	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.	2621	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
1978		2622
1979	Queries can fail, so check the return code. Or don't, as queries will become	2623	Queries can fail, so check the return code. Or don't, as queries will
1980	reliable at some point in the future.	2624	become reliable at some point in the future.
1981		2625
1982	=cut	2626	=cut
1983		2627
1984	sub cf::client::query {	2628	sub cf::client::query {
1985	my ($self, $flags, $text, $cb) = @_;	2629	my ($self, $flags, $text, $cb) = @_;
…		…
1993	utf8::encode $text;	2637	utf8::encode $text;
1994	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];	2638	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
1995		2639
1996	$self->send_packet ($self->{query_queue}[0][0])	2640	$self->send_packet ($self->{query_queue}[0][0])
1997	if @{ $self->{query_queue} } == 1;	2641	if @{ $self->{query_queue} } == 1;
		2642
		2643	1
1998	}	2644	}
1999		2645
2000	cf::client->attach (	2646	cf::client->attach (
		2647	on_connect => sub {
		2648	my ($ns) = @_;
		2649
		2650	$ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
		2651	},
2001	on_reply => sub {	2652	on_reply => sub {
2002	my ($ns, $msg) = @_;	2653	my ($ns, $msg) = @_;
2003		2654
2004	# this weird shuffling is so that direct followup queries	2655	# this weird shuffling is so that direct followup queries
2005	# get handled first	2656	# get handled first
…		…
2017	} else {	2668	} else {
2018	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;	2669	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2019	}	2670	}
2020	}	2671	}
2021	},	2672	},
		2673	on_exticmd => sub {
		2674	my ($ns, $buf) = @_;
		2675
		2676	my $msg = eval { $ns->{json_coder}->decode ($buf) };
		2677
		2678	if (ref $msg) {
		2679	my ($type, $reply, @payload) =
		2680	"ARRAY" eq ref $msg
		2681	? @$msg
		2682	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2683
		2684	my @reply;
		2685
		2686	if (my $cb = $EXTICMD{$type}) {
		2687	@reply = $cb->($ns, @payload);
		2688	}
		2689
		2690	$ns->ext_reply ($reply, @reply)
		2691	if $reply;
		2692
		2693	} else {
		2694	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
		2695	}
		2696
		2697	cf::override;
		2698	},
2022	);	2699	);
2023		2700
2024	=item $client->async (\&cb)	2701	=item $client->async (\&cb)
2025		2702
2026	Create a new coroutine, running the specified callback. The coroutine will	2703	Create a new coroutine, running the specified callback. The coroutine will
…		…
2067	our $safe = new Safe "safe";	2744	our $safe = new Safe "safe";
2068	our $safe_hole = new Safe::Hole;	2745	our $safe_hole = new Safe::Hole;
2069		2746
2070	$SIG{FPE} = 'IGNORE';	2747	$SIG{FPE} = 'IGNORE';
2071		2748
2072	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2749	$safe->permit_only (Opcode::opset qw(
		2750	:base_core :base_mem :base_orig :base_math
		2751	grepstart grepwhile mapstart mapwhile
		2752	sort time
		2753	));
2073		2754
2074	# here we export the classes and methods available to script code	2755	# here we export the classes and methods available to script code
2075		2756
2076	=pod	2757	=pod
2077		2758
2078	The following fucntions and emthods are available within a safe environment:	2759	The following functions and methods are available within a safe environment:
2079		2760
2080	cf::object contr pay_amount pay_player map	2761	cf::object
		2762	contr pay_amount pay_player map x y force_find force_add
		2763	insert remove name archname title slaying race decrease_ob_nr
		2764
2081	cf::object::player player	2765	cf::object::player
2082	cf::player peaceful	2766	player
2083	cf::map trigger	2767
		2768	cf::player
		2769	peaceful
		2770
		2771	cf::map
		2772	trigger
2084		2773
2085	=cut	2774	=cut
2086		2775
2087	for (	2776	for (
2088	["cf::object" => qw(contr pay_amount pay_player map)],	2777	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2778	insert remove inv name archname title slaying race
		2779	decrease_ob_nr)],
2089	["cf::object::player" => qw(player)],	2780	["cf::object::player" => qw(player)],
2090	["cf::player" => qw(peaceful)],	2781	["cf::player" => qw(peaceful)],
2091	["cf::map" => qw(trigger)],	2782	["cf::map" => qw(trigger)],
2092	) {	2783	) {
2093	no strict 'refs';	2784	no strict 'refs';
…		…
2164	=back	2855	=back
2165		2856
2166	=cut	2857	=cut
2167		2858
2168	#############################################################################	2859	#############################################################################
2169
2170	=head2 EXTENSION DATABASE SUPPORT
2171
2172	Crossfire maintains a very simple database for extension use. It can
2173	currently store anything that can be serialised using Storable, which
2174	excludes objects.
2175
2176	The parameter C<$family> should best start with the name of the extension
2177	using it, it should be unique.
2178
2179	=over 4
2180
2181	=item $hashref = cf::db_get $family
2182
2183	Return a hashref for use by the extension C<$family>, which can be
2184	modified. After modifications, you have to call C<cf::db_dirty> or
2185	C<cf::db_sync>.
2186
2187	=item $value = cf::db_get $family => $key
2188
2189	Returns a single value from the database
2190
2191	=item cf::db_put $family => $hashref
2192
2193	Stores the given family hashref into the database. Updates are delayed, if
2194	you want the data to be synced to disk immediately, use C<cf::db_sync>.
2195
2196	=item cf::db_put $family => $key => $value
2197
2198	Stores the given C<$value> in the family hash. Updates are delayed, if you
2199	want the data to be synced to disk immediately, use C<cf::db_sync>.
2200
2201	=item cf::db_dirty
2202
2203	Marks the database as dirty, to be updated at a later time.
2204
2205	=item cf::db_sync
2206
2207	Immediately write the database to disk I<if it is dirty>.
2208
2209	=cut
2210
2211	our $DB;
2212
2213	{
2214	my $path = cf::localdir . "/database.pst";
2215
2216	sub db_load() {
2217	$DB = stat $path ? Storable::retrieve $path : { };
2218	}
2219
2220	my $pid;
2221
2222	sub db_save() {
2223	waitpid $pid, 0 if $pid;
2224	if (0 == ($pid = fork)) {
2225	$DB->{_meta}{version} = 1;
2226	Storable::nstore $DB, "$path~";
2227	rename "$path~", $path;
2228	cf::_exit 0 if defined $pid;
2229	}
2230	}
2231
2232	my $dirty;
2233
2234	sub db_sync() {
2235	db_save if $dirty;
2236	undef $dirty;
2237	}
2238
2239	my $idle = Event->idle (
2240	reentrant => 0,
2241	min => 10,
2242	max => 20,
2243	repeat => 0,
2244	data => WF_AUTOCANCEL,
2245	cb => \&db_sync,
2246	);
2247
2248	sub db_dirty() {
2249	$dirty = 1;
2250	$idle->start;
2251	}
2252
2253	sub db_get($;$) {
2254	@_ >= 2
2255	? $DB->{$_[0]}{$_[1]}
2256	: ($DB->{$_[0]} ||= { })
2257	}
2258
2259	sub db_put($$;$) {
2260	if (@_ >= 3) {
2261	$DB->{$_[0]}{$_[1]} = $_[2];
2262	} else {
2263	$DB->{$_[0]} = $_[1];
2264	}
2265	db_dirty;
2266	}
2267
2268	cf::global->attach (
2269	prio => 10000,
2270	on_cleanup => sub {
2271	db_sync;
2272	},
2273	);
2274	}
2275
2276	#############################################################################
2277	# the server's init and main functions	2860	# the server's init and main functions
2278		2861
2279	sub load_resources {	2862	sub load_facedata($) {
2280	load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir	2863	my ($path) = @_;
		2864
		2865	# HACK to clear player env face cache, we need some signal framework
		2866	# for this (global event?)
		2867	%ext::player_env::MUSIC_FACE_CACHE = ();
		2868
		2869	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		2870
		2871	warn "loading facedata from $path\n";
		2872
		2873	my $facedata;
		2874	0 < aio_load $path, $facedata
		2875	or die "$path: $!";
		2876
		2877	$facedata = Coro::Storable::thaw $facedata;
		2878
		2879	$facedata->{version} == 2
		2880	or cf::cleanup "$path: version mismatch, cannot proceed.";
		2881
		2882	# patch in the exptable
		2883	$facedata->{resource}{"res/exp_table"} = {
		2884	type => FT_RSRC,
		2885	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		2886	};
		2887	cf::cede_to_tick;
		2888
		2889	{
		2890	my $faces = $facedata->{faceinfo};
		2891
		2892	while (my ($face, $info) = each %$faces) {
		2893	my $idx = (cf::face::find $face) || cf::face::alloc $face;
		2894	cf::face::set_visibility $idx, $info->{visibility};
		2895	cf::face::set_magicmap $idx, $info->{magicmap};
		2896	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
		2897	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
		2898
		2899	cf::cede_to_tick;
		2900	}
		2901
		2902	while (my ($face, $info) = each %$faces) {
		2903	next unless $info->{smooth};
		2904	my $idx = cf::face::find $face
		2905	or next;
		2906	if (my $smooth = cf::face::find $info->{smooth}) {
		2907	cf::face::set_smooth $idx, $smooth;
		2908	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
		2909	} else {
		2910	warn "smooth face '$info->{smooth}' not found for face '$face'";
		2911	}
		2912
		2913	cf::cede_to_tick;
		2914	}
		2915	}
		2916
		2917	{
		2918	my $anims = $facedata->{animinfo};
		2919
		2920	while (my ($anim, $info) = each %$anims) {
		2921	cf::anim::set $anim, $info->{frames}, $info->{facings};
		2922	cf::cede_to_tick;
		2923	}
		2924
		2925	cf::anim::invalidate_all; # d'oh
		2926	}
		2927
		2928	{
		2929	# TODO: for gcfclient pleasure, we should give resources
		2930	# that gcfclient doesn't grok a >10000 face index.
		2931	my $res = $facedata->{resource};
		2932
		2933	my $soundconf = delete $res->{"res/sound.conf"};
		2934
		2935	while (my ($name, $info) = each %$res) {
		2936	my $idx = (cf::face::find $name) || cf::face::alloc $name;
		2937	my $data;
		2938
		2939	if ($info->{type} & 1) {
		2940	# prepend meta info
		2941
		2942	my $meta = $enc->encode ({
		2943	name => $name,
		2944	%{ $info->{meta} || {} },
		2945	});
		2946
		2947	$data = pack "(w/a*)*", $meta, $info->{data};
		2948	} else {
		2949	$data = $info->{data};
		2950	}
		2951
		2952	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		2953	cf::face::set_type $idx, $info->{type};
		2954
		2955	cf::cede_to_tick;
		2956	}
		2957
		2958	if ($soundconf) {
		2959	$soundconf = $enc->decode (delete $soundconf->{data});
		2960
		2961	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		2962	my $sound = $soundconf->{compat}[$_]
		2963	or next;
		2964
		2965	my $face = cf::face::find "sound/$sound->[1]";
		2966	cf::sound::set $sound->[0] => $face;
		2967	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		2968	}
		2969
		2970	while (my ($k, $v) = each %{$soundconf->{event}}) {
		2971	my $face = cf::face::find "sound/$v";
		2972	cf::sound::set $k => $face;
		2973	}
		2974	}
		2975	}
		2976
		2977	1
		2978	}
		2979
		2980	register_exticmd fx_want => sub {
		2981	my ($ns, $want) = @_;
		2982
		2983	while (my ($k, $v) = each %$want) {
		2984	$ns->fx_want ($k, $v);
		2985	}
		2986	};
		2987
		2988	sub reload_regions {
		2989	# HACK to clear player env face cache, we need some signal framework
		2990	# for this (global event?)
		2991	%ext::player_env::MUSIC_FACE_CACHE = ();
		2992
		2993	load_resource_file "$MAPDIR/regions"
2281	or die "unable to load regions file\n";#d#	2994	or die "unable to load regions file\n";
2282	}
2283		2995
2284	sub cfg_load {	2996	for (cf::region::list) {
		2997	$_->{match} = qr/$_->{match}/
		2998	if exists $_->{match};
		2999	}
		3000	}
		3001
		3002	sub reload_facedata {
		3003	load_facedata "$DATADIR/facedata"
		3004	or die "unable to load facedata\n";
		3005	}
		3006
		3007	sub reload_archetypes {
		3008	load_resource_file "$DATADIR/archetypes"
		3009	or die "unable to load archetypes\n";
		3010	#d# NEED to laod twice to resolve forward references
		3011	# this really needs to be done in an extra post-pass
		3012	# (which needs to be synchronous, so solve it differently)
		3013	load_resource_file "$DATADIR/archetypes"
		3014	or die "unable to load archetypes\n";
		3015	}
		3016
		3017	sub reload_treasures {
		3018	load_resource_file "$DATADIR/treasures"
		3019	or die "unable to load treasurelists\n";
		3020	}
		3021
		3022	sub reload_resources {
		3023	warn "reloading resource files...\n";
		3024
		3025	reload_regions;
		3026	reload_facedata;
		3027	#reload_archetypes;#d#
		3028	reload_archetypes;
		3029	reload_treasures;
		3030
		3031	warn "finished reloading resource files\n";
		3032	}
		3033
		3034	sub init {
		3035	reload_resources;
		3036	}
		3037
		3038	sub reload_config {
2285	open my $fh, "<:utf8", cf::confdir . "/config"	3039	open my $fh, "<:utf8", "$CONFDIR/config"
2286	or return;	3040	or return;
2287		3041
2288	local $/;	3042	local $/;
2289	*CFG = YAML::Syck::Load <$fh>;	3043	*CFG = YAML::Syck::Load <$fh>;
2290		3044
…		…
2298	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3052	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2299	and die "WARNING: m(un)lockall failed: $!\n";	3053	and die "WARNING: m(un)lockall failed: $!\n";
2300	};	3054	};
2301	warn $@ if $@;	3055	warn $@ if $@;
2302	}	3056	}
2303	}
2304
2305	sub init {
2306	load_resources;
2307	}	3057	}
2308		3058
2309	sub main {	3059	sub main {
2310	# we must not ever block the main coroutine	3060	# we must not ever block the main coroutine
2311	local $Coro::idle = sub {	3061	local $Coro::idle = sub {
…		…
2313	(async {	3063	(async {
2314	Event::one_event;	3064	Event::one_event;
2315	})->prio (Coro::PRIO_MAX);	3065	})->prio (Coro::PRIO_MAX);
2316	};	3066	};
2317		3067
2318	cfg_load;	3068	reload_config;
2319	db_load;	3069	db_init;
2320	load_extensions;	3070	load_extensions;
2321		3071
2322	$TICK_WATCHER->start;	3072	$TICK_WATCHER->start;
2323	Event::loop;	3073	Event::loop;
2324	}	3074	}
…		…
2339	},	3089	},
2340	);	3090	);
2341	}	3091	}
2342	}	3092	}
2343		3093
		3094	sub write_runtime {
		3095	my $runtime = "$LOCALDIR/runtime";
		3096
		3097	# first touch the runtime file to show we are still running:
		3098	# the fsync below can take a very very long time.
		3099
		3100	IO::AIO::aio_utime $runtime, undef, undef;
		3101
		3102	my $guard = cf::lock_acquire "write_runtime";
		3103
		3104	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
		3105	or return;
		3106
		3107	my $value = $cf::RUNTIME + 90 + 10;
		3108	# 10 is the runtime save interval, for a monotonic clock
		3109	# 60 allows for the watchdog to kill the server.
		3110
		3111	(aio_write $fh, 0, (length $value), $value, 0) <= 0
		3112	and return;
		3113
		3114	# always fsync - this file is important
		3115	aio_fsync $fh
		3116	and return;
		3117
		3118	# touch it again to show we are up-to-date
		3119	aio_utime $fh, undef, undef;
		3120
		3121	close $fh
		3122	or return;
		3123
		3124	aio_rename "$runtime~", $runtime
		3125	and return;
		3126
		3127	warn "runtime file written.\n";
		3128
		3129	1
		3130	}
		3131
2344	sub emergency_save() {	3132	sub emergency_save() {
2345	my $freeze_guard = cf::freeze_mainloop;	3133	my $freeze_guard = cf::freeze_mainloop;
2346		3134
2347	warn "enter emergency perl save\n";	3135	warn "enter emergency perl save\n";
2348		3136
…		…
2363	my $map = $cf::MAP{$path} or next;	3151	my $map = $cf::MAP{$path} or next;
2364	$map->valid or next;	3152	$map->valid or next;
2365	$map->save;	3153	$map->save;
2366	}	3154	}
2367	warn "end emergency map save\n";	3155	warn "end emergency map save\n";
		3156
		3157	warn "begin emergency database checkpoint\n";
		3158	BDB::db_env_txn_checkpoint $DB_ENV;
		3159	warn "end emergency database checkpoint\n";
2368	};	3160	};
2369		3161
2370	warn "leave emergency perl save\n";	3162	warn "leave emergency perl save\n";
2371	}	3163	}
2372		3164
		3165	sub post_cleanup {
		3166	my ($make_core) = @_;
		3167
		3168	warn Carp::longmess "post_cleanup backtrace"
		3169	if $make_core;
		3170	}
		3171
2373	sub reload() {	3172	sub do_reload_perl() {
2374	# can/must only be called in main	3173	# can/must only be called in main
2375	if ($Coro::current != $Coro::main) {	3174	if ($Coro::current != $Coro::main) {
2376	warn "can only reload from main coroutine";	3175	warn "can only reload from main coroutine";
2377	return;	3176	return;
2378	}	3177	}
2379		3178
2380	warn "reloading...";	3179	warn "reloading...";
2381		3180
2382	warn "cancelling server ticker";	3181	warn "entering sync_job";
2383	$TICK_WATCHER->cancel;
2384		3182
		3183	cf::sync_job {
		3184	cf::write_runtime; # external watchdog should not bark
2385	cf::emergency_save;	3185	cf::emergency_save;
		3186	cf::write_runtime; # external watchdog should not bark
2386		3187
2387	eval {	3188	warn "syncing database to disk";
		3189	BDB::db_env_txn_checkpoint $DB_ENV;
		3190
2388	# if anything goes wrong in here, we should simply crash as we already saved	3191	# if anything goes wrong in here, we should simply crash as we already saved
2389
2390	warn "syncing database to disk";
2391	cf::db_sync;
2392		3192
2393	warn "cancelling all WF_AUTOCANCEL watchers";	3193	warn "cancelling all WF_AUTOCANCEL watchers";
2394	for (Event::all_watchers) {	3194	for (Event::all_watchers) {
2395	$_->cancel if $_->data & WF_AUTOCANCEL;	3195	$_->cancel if $_->data & WF_AUTOCANCEL;
2396	}	3196	}
2397		3197
2398	warn "flushing outstanding aio requests";	3198	warn "flushing outstanding aio requests";
2399	for (;;) {	3199	for (;;) {
		3200	BDB::flush;
2400	IO::AIO::flush;	3201	IO::AIO::flush;
2401	Coro::cede;	3202	Coro::cede;
2402	last unless IO::AIO::nreqs;	3203	last unless IO::AIO::nreqs || BDB::nreqs;
2403	warn "iterate...";	3204	warn "iterate...";
2404	}	3205	}
		3206
		3207	++$RELOAD;
2405		3208
2406	warn "cancelling all extension coros";	3209	warn "cancelling all extension coros";
2407	$_->cancel for values %EXT_CORO;	3210	$_->cancel for values %EXT_CORO;
2408	%EXT_CORO = ();	3211	%EXT_CORO = ();
2409		3212
2410	warn "removing commands";	3213	warn "removing commands";
2411	%COMMAND = ();	3214	%COMMAND = ();
2412		3215
2413	warn "removing ext commands";	3216	warn "removing ext/exti commands";
2414	%EXTCMD = ();	3217	%EXTCMD = ();
		3218	%EXTICMD = ();
2415		3219
2416	warn "unloading/nuking all extensions";	3220	warn "unloading/nuking all extensions";
2417	for my $pkg (@EXTS) {	3221	for my $pkg (@EXTS) {
2418	warn "... unloading $pkg";	3222	warn "... unloading $pkg";
2419		3223
…		…
2449	Symbol::delete_package "safe::$_"	3253	Symbol::delete_package "safe::$_"
2450	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	3254	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2451		3255
2452	warn "unloading cf.pm \"a bit\"";	3256	warn "unloading cf.pm \"a bit\"";
2453	delete $INC{"cf.pm"};	3257	delete $INC{"cf.pm"};
		3258	delete $INC{"cf/pod.pm"};
2454		3259
2455	# don't, removes xs symbols, too,	3260	# don't, removes xs symbols, too,
2456	# and global variables created in xs	3261	# and global variables created in xs
2457	#Symbol::delete_package __PACKAGE__;	3262	#Symbol::delete_package __PACKAGE__;
2458		3263
…		…
2461	warn "reloading cf.pm";	3266	warn "reloading cf.pm";
2462	require cf;	3267	require cf;
2463	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3268	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2464		3269
2465	warn "loading config and database again";	3270	warn "loading config and database again";
2466	cf::cfg_load;	3271	cf::reload_config;
2467	cf::db_load;
2468		3272
2469	warn "loading extensions";	3273	warn "loading extensions";
2470	cf::load_extensions;	3274	cf::load_extensions;
2471		3275
2472	warn "reattaching attachments to objects/players";	3276	warn "reattaching attachments to objects/players";
2473	_global_reattach;	3277	_global_reattach; # objects, sockets
2474	warn "reattaching attachments to maps";	3278	warn "reattaching attachments to maps";
2475	reattach $_ for values %MAP;	3279	reattach $_ for values %MAP;
		3280	warn "reattaching attachments to players";
		3281	reattach $_ for values %PLAYER;
2476		3282
2477	warn "loading reloadable resources";	3283	warn "leaving sync_job";
2478	load_resources;
2479		3284
2480	warn "restarting server ticker";	3285	1
2481		3286	} or do {
2482	$TICK_WATCHER->start;
2483	};
2484
2485	if ($@) {
2486	warn $@;	3287	warn $@;
2487	warn "error while reloading, exiting.";	3288	warn "error while reloading, exiting.";
2488	exit 1;	3289	exit 1;
2489	}	3290	};
2490		3291
2491	warn "reloaded";	3292	warn "reloaded";
2492	};	3293	};
2493		3294
2494	our $RELOAD_WATCHER; # used only during reload	3295	our $RELOAD_WATCHER; # used only during reload
2495		3296
		3297	sub reload_perl() {
		3298	# doing reload synchronously and two reloads happen back-to-back,
		3299	# coro crashes during coro_state_free->destroy here.
		3300
		3301	$RELOAD_WATCHER ||= Event->timer (
		3302	reentrant => 0,
		3303	after => 0,
		3304	data => WF_AUTOCANCEL,
		3305	cb => sub {
		3306	do_reload_perl;
		3307	undef $RELOAD_WATCHER;
		3308	},
		3309	);
		3310	}
		3311
2496	register_command "reload" => sub {	3312	register_command "reload" => sub {
2497	my ($who, $arg) = @_;	3313	my ($who, $arg) = @_;
2498		3314
2499	if ($who->flag (FLAG_WIZ)) {	3315	if ($who->flag (FLAG_WIZ)) {
2500	$who->message ("reloading server.");	3316	$who->message ("reloading server.");
2501		3317	async { reload_perl };
2502	# doing reload synchronously and two reloads happen back-to-back,
2503	# coro crashes during coro_state_free->destroy here.
2504
2505	$RELOAD_WATCHER ||= Event->timer (
2506	reentrant => 0,
2507	after => 0,
2508	data => WF_AUTOCANCEL,
2509	cb => sub {
2510	reload;
2511	undef $RELOAD_WATCHER;
2512	},
2513	);
2514	}	3318	}
2515	};	3319	};
2516		3320
2517	unshift @INC, $LIBDIR;	3321	unshift @INC, $LIBDIR;
2518		3322
2519	my $bug_warning = 0;	3323	my $bug_warning = 0;
2520		3324
		3325	our @WAIT_FOR_TICK;
		3326	our @WAIT_FOR_TICK_BEGIN;
		3327
		3328	sub wait_for_tick {
		3329	return unless $TICK_WATCHER->is_active;
		3330	return if $Coro::current == $Coro::main;
		3331
		3332	my $signal = new Coro::Signal;
		3333	push @WAIT_FOR_TICK, $signal;
		3334	$signal->wait;
		3335	}
		3336
		3337	sub wait_for_tick_begin {
		3338	return unless $TICK_WATCHER->is_active;
		3339	return if $Coro::current == $Coro::main;
		3340
		3341	my $signal = new Coro::Signal;
		3342	push @WAIT_FOR_TICK_BEGIN, $signal;
		3343	$signal->wait;
		3344	}
		3345
		3346	my $min = 1e6;#d#
		3347	my $avg = 10;
2521	$TICK_WATCHER = Event->timer (	3348	$TICK_WATCHER = Event->timer (
2522	reentrant => 0,	3349	reentrant => 0,
2523	parked => 1,	3350	parked => 1,
2524	prio => 0,	3351	prio => 0,
2525	at => $NEXT_TICK || $TICK,	3352	at => $NEXT_TICK || $TICK,
…		…
2529	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	3356	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2530	unless ++$bug_warning > 10;	3357	unless ++$bug_warning > 10;
2531	return;	3358	return;
2532	}	3359	}
2533		3360
2534	$NOW = Event::time;	3361	$NOW = $tick_start = Event::time;
2535		3362
2536	cf::server_tick; # one server iteration	3363	cf::server_tick; # one server iteration
		3364
		3365	0 && sync_job {#d#
		3366	for(1..10) {
		3367	my $t = Event::time;
		3368	my $map = my $map = new_from_path cf::map "/tmp/x.map"
		3369	or die;
		3370
		3371	$map->width (50);
		3372	$map->height (50);
		3373	$map->alloc;
		3374	$map->_load_objects ("/tmp/x.map", 1);
		3375	my $t = Event::time - $t;
		3376
		3377	#next unless $t < 0.0013;#d#
		3378	if ($t < $min) {
		3379	$min = $t;
		3380	}
		3381	$avg = $avg * 0.99 + $t * 0.01;
		3382	}
		3383	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
		3384	exit 0;
		3385	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
		3386	};
		3387
2537	$RUNTIME += $TICK;	3388	$RUNTIME += $TICK;
2538	$NEXT_TICK += $TICK;	3389	$NEXT_TICK += $TICK;
2539		3390
2540	$WAIT_FOR_TICK->broadcast;	3391	if ($NOW >= $NEXT_RUNTIME_WRITE) {
2541	$WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;	3392	$NEXT_RUNTIME_WRITE = $NOW + 10;
2542		3393	Coro::async_pool {
2543	Event::sweep;	3394	write_runtime
2544	Coro::cede_notself;	3395	or warn "ERROR: unable to write runtime file: $!";
		3396	};
2545		3397	}
		3398
2546	# my $AFTER = Event::time;	3399	# my $AFTER = Event::time;
2547	# warn $AFTER - $NOW;#d#	3400	# warn $AFTER - $NOW;#d#
2548		3401
		3402	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
		3403	$sig->send;
		3404	}
		3405	while (my $sig = shift @WAIT_FOR_TICK) {
		3406	$sig->send;
		3407	}
		3408
		3409	$NOW = Event::time;
		3410
2549	# if we are delayed by four ticks or more, skip them all	3411	# if we are delayed by four ticks or more, skip them all
2550	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;	3412	$NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2551		3413
2552	$TICK_WATCHER->at ($NEXT_TICK);	3414	$TICK_WATCHER->at ($NEXT_TICK);
2553	$TICK_WATCHER->start;	3415	$TICK_WATCHER->start;
		3416
		3417	$LOAD = ($NOW - $tick_start) / $TICK;
		3418	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
		3419
		3420	_post_tick;
		3421
		3422
2554	},	3423	},
2555	);	3424	);
2556		3425
		3426	{
		3427	BDB::max_poll_time $TICK * 0.1;
		3428	$BDB_POLL_WATCHER = Event->io (
		3429	reentrant => 0,
		3430	fd => BDB::poll_fileno,
		3431	poll => 'r',
		3432	prio => 0,
		3433	data => WF_AUTOCANCEL,
		3434	cb => \&BDB::poll_cb,
		3435	);
		3436	BDB::min_parallel 8;
		3437
		3438	BDB::set_sync_prepare {
		3439	my $status;
		3440	my $current = $Coro::current;
		3441	(
		3442	sub {
		3443	$status = $!;
		3444	$current->ready; undef $current;
		3445	},
		3446	sub {
		3447	Coro::schedule while defined $current;
		3448	$! = $status;
		3449	},
		3450	)
		3451	};
		3452
		3453	unless ($DB_ENV) {
		3454	$DB_ENV = BDB::db_env_create;
		3455
		3456	cf::sync_job {
		3457	eval {
		3458	BDB::db_env_open
		3459	$DB_ENV,
		3460	$BDBDIR,
		3461	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
		3462	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
		3463	0666;
		3464
		3465	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
		3466
		3467	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
		3468	$DB_ENV->set_lk_detect;
		3469	};
		3470
		3471	cf::cleanup "db_env_open(db): $@" if $@;
		3472	};
		3473	}
		3474	}
		3475
		3476	{
		3477	IO::AIO::min_parallel 8;
		3478
		3479	undef $Coro::AIO::WATCHER;
2557	IO::AIO::max_poll_time $TICK * 0.1;	3480	IO::AIO::max_poll_time $TICK * 0.1;
2558
2559	undef $Coro::AIO::WATCHER;
2560	$AIO_POLL_WATCHER = Event->io (	3481	$AIO_POLL_WATCHER = Event->io (
2561	reentrant => 0,	3482	reentrant => 0,
		3483	data => WF_AUTOCANCEL,
2562	fd => IO::AIO::poll_fileno,	3484	fd => IO::AIO::poll_fileno,
2563	poll => 'r',	3485	poll => 'r',
2564	prio => 6,	3486	prio => 6,
2565	data => WF_AUTOCANCEL,
2566	cb => \&IO::AIO::poll_cb,	3487	cb => \&IO::AIO::poll_cb,
2567	);	3488	);
		3489	}
2568		3490
2569	$WRITE_RUNTIME_WATCHER = Event->timer (	3491	my $_log_backtrace;
2570	reentrant => 0,	3492
2571	data => WF_AUTOCANCEL,	3493	sub _log_backtrace {
2572	after => 1,	3494	my ($msg, @addr) = @_;
2573	interval => 10,	3495
2574	prio => 6, # keep it lowest so it acts like a watchdog	3496	$msg =~ s/\n//;
2575	cb => Coro::unblock_sub {	3497
2576	write_runtime	3498	# limit the # of concurrent backtraces
2577	or warn "ERROR: unable to write runtime file: $!";	3499	if ($_log_backtrace < 2) {
		3500	++$_log_backtrace;
		3501	async {
		3502	my @bt = fork_call {
		3503	@addr = map { sprintf "%x", $_ } @addr;
		3504	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
		3505	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
		3506	or die "addr2line: $!";
		3507
		3508	my @funcs;
		3509	my @res = <$fh>;
		3510	chomp for @res;
		3511	while (@res) {
		3512	my ($func, $line) = splice @res, 0, 2, ();
		3513	push @funcs, "[$func] $line";
		3514	}
		3515
		3516	@funcs
		3517	};
		3518
		3519	LOG llevInfo, "[ABT] $msg\n";
		3520	LOG llevInfo, "[ABT] $_\n" for @bt;
		3521	--$_log_backtrace;
		3522	};
		3523	} else {
		3524	LOG llevInfo, "[ABT] $msg\n";
		3525	LOG llevInfo, "[ABT] [suppressed]\n";
2578	},	3526	}
2579	);	3527	}
		3528
		3529	# load additional modules
		3530	use cf::pod;
2580		3531
2581	END { cf::emergency_save }	3532	END { cf::emergency_save }
2582		3533
2583	1	3534	1
2584		3535

Diff Legend

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