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.250 by root, Wed Apr 18 14:24:10 2007 UTC vs.
Revision 1.324 by root, Sat Jul 28 14:23:17 2007 UTC

…		…
20	use Coro::Signal;	20	use Coro::Signal;
21	use Coro::Semaphore;	21	use Coro::Semaphore;
22	use Coro::AIO;	22	use Coro::AIO;
23	use Coro::Storable;	23	use Coro::Storable;
24		24
		25	use JSON::XS 1.4 ();
25	use BDB ();	26	use BDB ();
26	use Data::Dumper;	27	use Data::Dumper;
27	use Digest::MD5;	28	use Digest::MD5;
28	use Fcntl;	29	use Fcntl;
29	use YAML::Syck ();	30	use YAML::Syck ();
30	use IO::AIO 2.32 ();	31	use IO::AIO 2.32 ();
31	use Time::HiRes;	32	use Time::HiRes;
32	use Compress::LZF;	33	use Compress::LZF;
		34	use Digest::MD5 ();
33		35
34	# configure various modules to our taste	36	# configure various modules to our taste
35	#	37	#
36	$Storable::canonical = 1; # reduce rsync transfers	38	$Storable::canonical = 1; # reduce rsync transfers
37	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator	39	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
…		…
49	our %COMMAND = ();	51	our %COMMAND = ();
50	our %COMMAND_TIME = ();	52	our %COMMAND_TIME = ();
51		53
52	our @EXTS = (); # list of extension package names	54	our @EXTS = (); # list of extension package names
53	our %EXTCMD = ();	55	our %EXTCMD = ();
		56	our %EXTICMD = ();
54	our %EXT_CORO = (); # coroutines bound to extensions	57	our %EXT_CORO = (); # coroutines bound to extensions
55	our %EXT_MAP = (); # pluggable maps	58	our %EXT_MAP = (); # pluggable maps
56		59
57	our $RELOAD; # number of reloads so far	60	our $RELOAD; # number of reloads so far
58	our @EVENT;	61	our @EVENT;
59	our $LIBDIR = datadir . "/ext";	62
		63	our $CONFDIR = confdir;
		64	our $DATADIR = datadir;
		65	our $LIBDIR = "$DATADIR/ext";
		66	our $PODDIR = "$DATADIR/pod";
		67	our $MAPDIR = "$DATADIR/" . mapdir;
		68	our $LOCALDIR = localdir;
		69	our $TMPDIR = "$LOCALDIR/" . tmpdir;
		70	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
		71	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
		72	our $RANDOMDIR = "$LOCALDIR/random";
		73	our $BDBDIR = "$LOCALDIR/db";
60		74
61	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	75	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
62	our $TICK_WATCHER;	76	our $TICK_WATCHER;
63	our $AIO_POLL_WATCHER;	77	our $AIO_POLL_WATCHER;
64	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	78	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
…		…
75	our $RUNTIME;	89	our $RUNTIME;
76		90
77	our %PLAYER; # all users	91	our %PLAYER; # all users
78	our %MAP; # all maps	92	our %MAP; # all maps
79	our $LINK_MAP; # the special {link} map, which is always available	93	our $LINK_MAP; # the special {link} map, which is always available
80	our $RANDOM_MAPS = cf::localdir . "/random";
81	our $BDB_ENV_DIR = cf::localdir . "/db";
82		94
83	# used to convert map paths into valid unix filenames by replacing / by ∕	95	# used to convert map paths into valid unix filenames by replacing / by ∕
84	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	96	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
85		97
		98	our $LOAD; # a number between 0 (idle) and 1 (too many objects)
		99	our $LOADAVG; # same thing, but with alpha-smoothing
		100	our $tick_start; # for load detecting purposes
		101
86	binmode STDOUT;	102	binmode STDOUT;
87	binmode STDERR;	103	binmode STDERR;
88		104
89	# read virtual server time, if available	105	# read virtual server time, if available
90	unless ($RUNTIME || !-e cf::localdir . "/runtime") {	106	unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
91	open my $fh, "<", cf::localdir . "/runtime"	107	open my $fh, "<", "$LOCALDIR/runtime"
92	or die "unable to read runtime file: $!";	108	or die "unable to read runtime file: $!";
93	$RUNTIME = <$fh> + 0.;	109	$RUNTIME = <$fh> + 0.;
94	}	110	}
95		111
96	mkdir cf::localdir;	112	mkdir $_
97	mkdir cf::localdir . "/" . cf::playerdir;	113	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
98	mkdir cf::localdir . "/" . cf::tmpdir;
99	mkdir cf::localdir . "/" . cf::uniquedir;
100	mkdir $RANDOM_MAPS;
101	mkdir $BDB_ENV_DIR;
102		114
103	our $EMERGENCY_POSITION;	115	our $EMERGENCY_POSITION;
104		116
105	sub cf::map::normalise;	117	sub cf::map::normalise;
106		118
…		…
117	=item $cf::RUNTIME	129	=item $cf::RUNTIME
118		130
119	The time this server has run, starts at 0 and is increased by $cf::TICK on	131	The time this server has run, starts at 0 and is increased by $cf::TICK on
120	every server tick.	132	every server tick.
121		133
122	=item $cf::LIBDIR	134	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
		135	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
		136	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
123		137
124	The perl library directory, where extensions and cf-specific modules can	138	Various directories - "/etc", read-only install directory, perl-library
125	be found. It will be added to C<@INC> automatically.	139	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
		140	unique-items directory, player file directory, random maps directory and
		141	database environment.
126		142
127	=item $cf::NOW	143	=item $cf::NOW
128		144
129	The time of the last (current) server tick.	145	The time of the last (current) server tick.
130		146
131	=item $cf::TICK	147	=item $cf::TICK
132		148
133	The interval between server ticks, in seconds.	149	The interval between server ticks, in seconds.
		150
		151	=item $cf::LOADAVG
		152
		153	The current CPU load on the server (alpha-smoothed), as a value between 0
		154	(none) and 1 (overloaded), indicating how much time is spent on processing
		155	objects per tick. Healthy values are < 0.5.
		156
		157	=item $cf::LOAD
		158
		159	The raw value load value from the last tick.
134		160
135	=item %cf::CFG	161	=item %cf::CFG
136		162
137	Configuration for the server, loaded from C</etc/crossfire/config>, or	163	Configuration for the server, loaded from C</etc/crossfire/config>, or
138	from wherever your confdir points to.	164	from wherever your confdir points to.
…		…
141		167
142	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	168	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
143	returns directly I<after> the tick processing (and consequently, can only wake one process	169	returns directly I<after> the tick processing (and consequently, can only wake one process
144	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	170	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
145		171
		172	=item @cf::INVOKE_RESULTS
		173
		174	This array contains the results of the last C<invoke ()> call. When
		175	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
		176	that call.
		177
146	=back	178	=back
147		179
148	=cut	180	=cut
149		181
150	BEGIN {	182	BEGIN {
…		…
152	my $msg = join "", @_;	184	my $msg = join "", @_;
153		185
154	$msg .= "\n"	186	$msg .= "\n"
155	unless $msg =~ /\n$/;	187	unless $msg =~ /\n$/;
156		188
157	$msg =~ s/([\x00-\x09\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	189	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
158		190
159	utf8::encode $msg;	191	utf8::encode $msg;
160	LOG llevError, $msg;	192	LOG llevError, $msg;
161	};	193	};
162	}	194	}
…		…
164	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	196	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
165	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	197	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
166	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	198	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
167	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	199	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
168	@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';	200	@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
		201	@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
169	@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';	202	@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
170		203
171	# we bless all objects into (empty) derived classes to force a method lookup	204	# we bless all objects into (empty) derived classes to force a method lookup
172	# within the Safe compartment.	205	# within the Safe compartment.
173	for my $pkg (qw(	206	for my $pkg (qw(
174	cf::global cf::attachable	207	cf::global cf::attachable
…		…
182	}	215	}
183		216
184	$Event::DIED = sub {	217	$Event::DIED = sub {
185	warn "error in event callback: @_";	218	warn "error in event callback: @_";
186	};	219	};
		220
		221	#############################################################################
187		222
188	=head2 UTILITY FUNCTIONS	223	=head2 UTILITY FUNCTIONS
189		224
190	=over 4	225	=over 4
191		226
…		…
210	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	245	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
211	$d	246	$d
212	} || "[unable to dump $_[0]: '$@']";	247	} || "[unable to dump $_[0]: '$@']";
213	}	248	}
214		249
215	use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
216
217	=item $ref = cf::from_json $json	250	=item $ref = cf::from_json $json
218		251
219	Converts a JSON string into the corresponding perl data structure.	252	Converts a JSON string into the corresponding perl data structure.
220		253
221	=item $json = cf::to_json $ref	254	=item $json = cf::to_json $ref
222		255
223	Converts a perl data structure into its JSON representation.	256	Converts a perl data structure into its JSON representation.
		257
		258	=cut
		259
		260	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
		261
		262	sub to_json ($) { $json_coder->encode ($_[0]) }
		263	sub from_json ($) { $json_coder->decode ($_[0]) }
224		264
225	=item cf::lock_wait $string	265	=item cf::lock_wait $string
226		266
227	Wait until the given lock is available. See cf::lock_acquire.	267	Wait until the given lock is available. See cf::lock_acquire.
228		268
…		…
234	returned.	274	returned.
235		275
236	Lock names should begin with a unique identifier (for example, cf::map::find	276	Lock names should begin with a unique identifier (for example, cf::map::find
237	uses map_find and cf::map::load uses map_load).	277	uses map_find and cf::map::load uses map_load).
238		278
		279	=item $locked = cf::lock_active $string
		280
		281	Return true if the lock is currently active, i.e. somebody has locked it.
		282
239	=cut	283	=cut
240		284
241	our %LOCK;	285	our %LOCK;
242		286
243	sub lock_wait($) {	287	sub lock_wait($) {
…		…
260		304
261	Coro::guard {	305	Coro::guard {
262	# wake up all waiters, to be on the safe side	306	# wake up all waiters, to be on the safe side
263	$_->ready for @{ delete $LOCK{$key} };	307	$_->ready for @{ delete $LOCK{$key} };
264	}	308	}
		309	}
		310
		311	sub lock_active($) {
		312	my ($key) = @_;
		313
		314	! ! $LOCK{$key}
265	}	315	}
266		316
267	sub freeze_mainloop {	317	sub freeze_mainloop {
268	return unless $TICK_WATCHER->is_active;	318	return unless $TICK_WATCHER->is_active;
269		319
…		…
272	};	322	};
273	$TICK_WATCHER->stop;	323	$TICK_WATCHER->stop;
274	$guard	324	$guard
275	}	325	}
276		326
		327	=item cf::get_slot $time[, $priority[, $name]]
		328
		329	Allocate $time seconds of blocking CPU time at priority C<$priority>:
		330	This call blocks and returns only when you have at least C<$time> seconds
		331	of cpu time till the next tick. The slot is only valid till the next cede.
		332
		333	The optional C<$name> can be used to identify the job to run. It might be
		334	used for statistical purposes and should identify the same time-class.
		335
		336	Useful for short background jobs.
		337
		338	=cut
		339
		340	our @SLOT_QUEUE;
		341	our $SLOT_QUEUE;
		342
		343	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
		344	$SLOT_QUEUE = Coro::async {
		345	my $signal = new Coro::Signal;
		346
		347	while () {
		348	next_job:
		349	my $avail = cf::till_tick;
		350	if ($avail > 0.01) {
		351	for (0 .. $#SLOT_QUEUE) {
		352	if ($SLOT_QUEUE[$_][0] < $avail) {
		353	my $job = splice @SLOT_QUEUE, $_, 1, ();
		354	$job->[2]->send;
		355	Coro::cede;
		356	goto next_job;
		357	}
		358	}
		359	}
		360
		361	if (@SLOT_QUEUE) {
		362	# we do not use wait_For_tick() as it returns immediately when tick is inactive
		363	push @cf::WAIT_FOR_TICK, $signal;
		364	$signal->wait;
		365	} else {
		366	Coro::schedule;
		367	}
		368	}
		369	};
		370
		371	sub get_slot($;$$) {
		372	my ($time, $pri, $name) = @_;
		373
		374	$time = $TICK * .6 if $time > $TICK * .6;
		375	my $sig = new Coro::Signal;
		376
		377	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
		378	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
		379	$SLOT_QUEUE->ready;
		380	$sig->wait;
		381	}
		382
277	=item cf::async { BLOCK }	383	=item cf::async { BLOCK }
278		384
279	Currently the same as Coro::async_pool, meaning you cannot use	385	Currently the same as Coro::async_pool, meaning you cannot use
280	C<on_destroy>, C<join> or other gimmicks on these coroutines. The only	386	C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
281	thing you are allowed to do is call C<prio> on it.	387	thing you are allowed to do is call C<prio> on it.
…		…
284		390
285	BEGIN { *async = \&Coro::async_pool }	391	BEGIN { *async = \&Coro::async_pool }
286		392
287	=item cf::sync_job { BLOCK }	393	=item cf::sync_job { BLOCK }
288		394
289	The design of crossfire+ requires that the main coro ($Coro::main) is	395	The design of Crossfire TRT requires that the main coroutine ($Coro::main)
290	always able to handle events or runnable, as crossfire+ is only partly	396	is always able to handle events or runnable, as Crossfire TRT is only
291	reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable.	397	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
		398	acceptable.
292		399
293	If it must be done, put the blocking parts into C<sync_job>. This will run	400	If it must be done, put the blocking parts into C<sync_job>. This will run
294	the given BLOCK in another coroutine while waiting for the result. The	401	the given BLOCK in another coroutine while waiting for the result. The
295	server will be frozen during this time, so the block should either finish	402	server will be frozen during this time, so the block should either finish
296	fast or be very important.	403	fast or be very important.
…		…
299		406
300	sub sync_job(&) {	407	sub sync_job(&) {
301	my ($job) = @_;	408	my ($job) = @_;
302		409
303	if ($Coro::current == $Coro::main) {	410	if ($Coro::current == $Coro::main) {
		411	my $time = Event::time;
		412
304	# this is the main coro, too bad, we have to block	413	# this is the main coro, too bad, we have to block
305	# till the operation succeeds, freezing the server :/	414	# till the operation succeeds, freezing the server :/
306		415
307	# TODO: use suspend/resume instead	416	# TODO: use suspend/resume instead
308	# (but this is cancel-safe)	417	# (but this is cancel-safe)
…		…
319		428
320	while ($busy) {	429	while ($busy) {
321	Coro::cede or Event::one_event;	430	Coro::cede or Event::one_event;
322	}	431	}
323		432
		433	$time = Event::time - $time;
		434
		435	LOG llevError | logBacktrace, Carp::longmess "long sync job"
		436	if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
		437
		438	$tick_start += $time; # do not account sync jobs to server load
		439
324	wantarray ? @res : $res[0]	440	wantarray ? @res : $res[0]
325	} else {	441	} else {
326	# we are in another coroutine, how wonderful, everything just works	442	# we are in another coroutine, how wonderful, everything just works
327		443
328	$job->()	444	$job->()
…		…
347	$EXT_CORO{$coro+0} = $coro;	463	$EXT_CORO{$coro+0} = $coro;
348		464
349	$coro	465	$coro
350	}	466	}
351		467
352	sub write_runtime {	468	=item fork_call { }, $args
353	my $guard = cf::lock_acquire "write_runtime";
354		469
355	my $runtime = cf::localdir . "/runtime";	470	Executes the given code block with the given arguments in a seperate
		471	process, returning the results. Everything must be serialisable with
		472	Coro::Storable. May, of course, block. Note that the executed sub may
		473	never block itself or use any form of Event handling.
356		474
357	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644	475	=cut
358	or return;
359		476
360	my $value = $cf::RUNTIME + 90 + 10;	477	sub _store_scalar {
361	# 10 is the runtime save interval, for a monotonic clock	478	open my $fh, ">", \my $buf
362	# 60 allows for the watchdog to kill the server.	479	or die "fork_call: cannot open fh-to-buf in child : $!";
363		480	Storable::store_fd $_[0], $fh;
364	(aio_write $fh, 0, (length $value), $value, 0) <= 0
365	and return;
366
367	# always fsync - this file is important
368	aio_fsync $fh
369	and return;
370
371	close $fh	481	close $fh;
372	or return;
373		482
374	aio_rename "$runtime~", $runtime	483	$buf
375	and return;	484	}
376		485
		486	sub fork_call(&@) {
		487	my ($cb, @args) = @_;
		488
		489	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
		490	# or die "socketpair: $!";
		491	pipe my $fh1, my $fh2
		492	or die "pipe: $!";
		493
		494	if (my $pid = fork) {
		495	close $fh2;
		496
		497	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
		498	warn "pst<$res>" unless $res =~ /^pst/;
		499	$res = Coro::Storable::thaw $res;
		500
		501	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
		502
		503	Carp::confess $$res unless "ARRAY" eq ref $res;
		504
		505	return wantarray ? @$res : $res->[-1];
		506	} else {
		507	reset_signals;
		508	local $SIG{__WARN__};
		509	local $SIG{__DIE__};
		510	# just in case, this hack effectively disables event
		511	# in the child. cleaner and slower would be canceling all watchers,
		512	# but this works for the time being.
		513	local $Coro::idle;
		514	$Coro::current->prio (Coro::PRIO_MAX);
		515
		516	eval {
		517	close $fh1;
		518
		519	my @res = eval { $cb->(@args) };
		520
		521	syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
		522	close $fh2;
		523	};
		524
		525	warn $@ if $@;
		526	_exit 0;
377	1	527	}
		528	}
		529
		530	=item $value = cf::db_get $family => $key
		531
		532	Returns a single value from the environment database.
		533
		534	=item cf::db_put $family => $key => $value
		535
		536	Stores the given C<$value> in the family. It can currently store binary
		537	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
		538
		539	=cut
		540
		541	our $DB;
		542
		543	sub db_init {
		544	unless ($DB) {
		545	$DB = BDB::db_create $DB_ENV;
		546
		547	cf::sync_job {
		548	eval {
		549	$DB->set_flags (BDB::CHKSUM);
		550
		551	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
		552	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
		553	cf::cleanup "db_open(db): $!" if $!;
		554	};
		555	cf::cleanup "db_open(db): $@" if $@;
		556	};
		557	}
		558	}
		559
		560	sub db_get($$) {
		561	my $key = "$_[0]/$_[1]";
		562
		563	cf::sync_job {
		564	BDB::db_get $DB, undef, $key, my $data;
		565
		566	$! ? ()
		567	: $data
		568	}
		569	}
		570
		571	sub db_put($$$) {
		572	BDB::dbreq_pri 4;
		573	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
		574	}
		575
		576	=item cf::cache $id => [$paths...], $processversion => $process
		577
		578	Generic caching function that returns the value of the resource $id,
		579	caching and regenerating as required.
		580
		581	This function can block.
		582
		583	=cut
		584
		585	sub cache {
		586	my ($id, $src, $processversion, $process) = @_;
		587
		588	my $meta =
		589	join "\x00",
		590	$processversion,
		591	map {
		592	aio_stat $_
		593	and Carp::croak "$_: $!";
		594
		595	($_, (stat _)[7,9])
		596	} @$src;
		597
		598	my $dbmeta = db_get cache => "$id/meta";
		599	if ($dbmeta ne $meta) {
		600	# changed, we may need to process
		601
		602	my @data;
		603	my $md5;
		604
		605	for (0 .. $#$src) {
		606	0 <= aio_load $src->[$_], $data[$_]
		607	or Carp::croak "$src->[$_]: $!";
		608	}
		609
		610	# if processing is expensive, check
		611	# checksum first
		612	if (1) {
		613	$md5 =
		614	join "\x00",
		615	$processversion,
		616	map {
		617	Coro::cede;
		618	($src->[$_], Digest::MD5::md5_hex $data[$_])
		619	} 0.. $#$src;
		620
		621
		622	my $dbmd5 = db_get cache => "$id/md5";
		623	if ($dbmd5 eq $md5) {
		624	db_put cache => "$id/meta", $meta;
		625
		626	return db_get cache => "$id/data";
		627	}
		628	}
		629
		630	my $t1 = Time::HiRes::time;
		631	my $data = $process->(\@data);
		632	my $t2 = Time::HiRes::time;
		633
		634	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
		635
		636	db_put cache => "$id/data", $data;
		637	db_put cache => "$id/md5" , $md5;
		638	db_put cache => "$id/meta", $meta;
		639
		640	return $data;
		641	}
		642
		643	db_get cache => "$id/data"
378	}	644	}
379		645
380	=item cf::datalog type => key => value, ...	646	=item cf::datalog type => key => value, ...
381		647
382	Log a datalog packet of the given type with the given key-value pairs.	648	Log a datalog packet of the given type with the given key-value pairs.
…		…
400	attach callbacks/event handlers (a collection of which is called an "attachment")	666	attach callbacks/event handlers (a collection of which is called an "attachment")
401	to it. All such attachable objects support the following methods.	667	to it. All such attachable objects support the following methods.
402		668
403	In the following description, CLASS can be any of C<global>, C<object>	669	In the following description, CLASS can be any of C<global>, C<object>
404	C<player>, C<client> or C<map> (i.e. the attachable objects in	670	C<player>, C<client> or C<map> (i.e. the attachable objects in
405	crossfire+).	671	Crossfire TRT).
406		672
407	=over 4	673	=over 4
408		674
409	=item $attachable->attach ($attachment, key => $value...)	675	=item $attachable->attach ($attachment, key => $value...)
410		676
…		…
573	$registry = $CB_TYPE[$object_type] ||= [];	839	$registry = $CB_TYPE[$object_type] ||= [];
574		840
575	} elsif ($type eq "subtype") {	841	} elsif ($type eq "subtype") {
576	defined $object_type or Carp::croak "subtype specified without type";	842	defined $object_type or Carp::croak "subtype specified without type";
577	my $object_subtype = shift @arg;	843	my $object_subtype = shift @arg;
578	$registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= [];	844	$registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
579		845
580	} elsif ($type eq "package") {	846	} elsif ($type eq "package") {
581	my $pkg = shift @arg;	847	my $pkg = shift @arg;
582		848
583	while (my ($name, $id) = each %cb_id) {	849	while (my ($name, $id) = each %cb_id) {
…		…
612	_attach $registry, $klass, @attach;	878	_attach $registry, $klass, @attach;
613	}	879	}
614		880
615	$obj->{$name} = \%arg;	881	$obj->{$name} = \%arg;
616	} else {	882	} else {
617	warn "object uses attachment '$name' that is not available, postponing.\n";	883	warn "object uses attachment '$name' which is not available, postponing.\n";
618	}	884	}
619		885
620	$obj->{_attachment}{$name} = undef;	886	$obj->{_attachment}{$name} = undef;
621	}	887	}
622		888
…		…
624	if (ref $_[0]) {	890	if (ref $_[0]) {
625	_object_attach @_;	891	_object_attach @_;
626	} else {	892	} else {
627	_attach shift->_attach_registry, @_;	893	_attach shift->_attach_registry, @_;
628	}	894	}
		895	_recalc_want;
629	};	896	};
630		897
631	# all those should be optimised	898	# all those should be optimised
632	sub cf::attachable::detach {	899	sub cf::attachable::detach {
633	my ($obj, $name) = @_;	900	my ($obj, $name) = @_;
…		…
636	delete $obj->{_attachment}{$name};	903	delete $obj->{_attachment}{$name};
637	reattach ($obj);	904	reattach ($obj);
638	} else {	905	} else {
639	Carp::croak "cannot, currently, detach class attachments";	906	Carp::croak "cannot, currently, detach class attachments";
640	}	907	}
		908	_recalc_want;
641	};	909	};
642		910
643	sub cf::attachable::attached {	911	sub cf::attachable::attached {
644	my ($obj, $name) = @_;	912	my ($obj, $name) = @_;
645		913
…		…
660	";	928	";
661	die if $@;	929	die if $@;
662	}	930	}
663		931
664	our $override;	932	our $override;
665	our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?	933	our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
666		934
667	sub override {	935	sub override {
668	$override = 1;	936	$override = 1;
669	@invoke_results = ();	937	@INVOKE_RESULTS = (@_);
670	}	938	}
671		939
672	sub do_invoke {	940	sub do_invoke {
673	my $event = shift;	941	my $event = shift;
674	my $callbacks = shift;	942	my $callbacks = shift;
675		943
676	@invoke_results = ();	944	@INVOKE_RESULTS = ();
677		945
678	local $override;	946	local $override;
679		947
680	for (@$callbacks) {	948	for (@$callbacks) {
681	eval { &{$_->[1]} };	949	eval { &{$_->[1]} };
…		…
698		966
699	Generate an object-specific event with the given arguments.	967	Generate an object-specific event with the given arguments.
700		968
701	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be	969	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
702	removed in future versions), and there is no public API to access override	970	removed in future versions), and there is no public API to access override
703	results (if you must, access C<@cf::invoke_results> directly).	971	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
704		972
705	=back	973	=back
706		974
707	=cut	975	=cut
708		976
709	#############################################################################	977	#############################################################################
710	# object support	978	# object support
		979	#
		980
		981	sub _can_merge {
		982	my ($ob1, $ob2) = @_;
		983
		984	local $Storable::canonical = 1;
		985	my $fob1 = Storable::freeze $ob1;
		986	my $fob2 = Storable::freeze $ob2;
		987
		988	$fob1 eq $fob2
		989	}
711		990
712	sub reattach {	991	sub reattach {
713	# basically do the same as instantiate, without calling instantiate	992	# basically do the same as instantiate, without calling instantiate
714	my ($obj) = @_;	993	my ($obj) = @_;
715		994
…		…
818	or return;	1097	or return;
819	$av = eval { (Storable::thaw $av)->{objs} };	1098	$av = eval { (Storable::thaw $av)->{objs} };
820	}	1099	}
821		1100
822	warn sprintf "loading %s (%d)\n",	1101	warn sprintf "loading %s (%d)\n",
823	$filename, length $data, scalar @{$av || []};#d#	1102	$filename, length $data, scalar @{$av || []};
824	return ($data, $av);	1103	return ($data, $av);
825	}	1104	}
		1105
		1106	=head2 COMMAND CALLBACKS
		1107
		1108	=over 4
		1109
		1110	=cut
826		1111
827	#############################################################################	1112	#############################################################################
828	# command handling &c	1113	# command handling &c
829		1114
830	=item cf::register_command $name => \&callback($ob,$args);	1115	=item cf::register_command $name => \&callback($ob,$args);
…		…
843	push @{ $COMMAND{$name} }, [$caller, $cb];	1128	push @{ $COMMAND{$name} }, [$caller, $cb];
844	}	1129	}
845		1130
846	=item cf::register_extcmd $name => \&callback($pl,$packet);	1131	=item cf::register_extcmd $name => \&callback($pl,$packet);
847		1132
848	Register a callbackf ro execution when the client sends an extcmd packet.	1133	Register a callback for execution when the client sends an (synchronous)
		1134	extcmd packet. Ext commands will be processed in the order they are
		1135	received by the server, like other user commands. The first argument is
		1136	the logged-in player. Ext commands can only be processed after a player
		1137	has logged in successfully.
849		1138
850	If the callback returns something, it is sent back as if reply was being	1139	If the callback returns something, it is sent back as if reply was being
851	called.	1140	called.
852		1141
		1142	=item cf::register_exticmd $name => \&callback($ns,$packet);
		1143
		1144	Register a callback for execution when the client sends an (asynchronous)
		1145	exticmd packet. Exti commands are processed by the server as soon as they
		1146	are received, i.e. out of order w.r.t. other commands. The first argument
		1147	is a client socket. Exti commands can be received anytime, even before
		1148	log-in.
		1149
		1150	If the callback returns something, it is sent back as if reply was being
		1151	called.
		1152
853	=cut	1153	=cut
854		1154
855	sub register_extcmd {	1155	sub register_extcmd {
856	my ($name, $cb) = @_;	1156	my ($name, $cb) = @_;
857		1157
858	$EXTCMD{$name} = $cb;	1158	$EXTCMD{$name} = $cb;
		1159	}
		1160
		1161	sub register_exticmd {
		1162	my ($name, $cb) = @_;
		1163
		1164	$EXTICMD{$name} = $cb;
859	}	1165	}
860		1166
861	cf::player->attach (	1167	cf::player->attach (
862	on_command => sub {	1168	on_command => sub {
863	my ($pl, $name, $params) = @_;	1169	my ($pl, $name, $params) = @_;
…		…
872	cf::override;	1178	cf::override;
873	},	1179	},
874	on_extcmd => sub {	1180	on_extcmd => sub {
875	my ($pl, $buf) = @_;	1181	my ($pl, $buf) = @_;
876		1182
877	my $msg = eval { from_json $buf };	1183	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
878		1184
879	if (ref $msg) {	1185	if (ref $msg) {
		1186	my ($type, $reply, @payload) =
		1187	"ARRAY" eq ref $msg
		1188	? @$msg
		1189	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1190
880	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1191	if (my $cb = $EXTCMD{$type}) {
881	if (my %reply = $cb->($pl, $msg)) {	1192	my @reply = $cb->($pl, @payload);
		1193
882	$pl->ext_reply ($msg->{msgid}, %reply);	1194	$pl->ext_reply ($reply, @reply)
883	}	1195	if $reply;
884	}	1196	}
885	} else {	1197	} else {
886	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1198	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
887	}	1199	}
888		1200
889	cf::override;	1201	cf::override;
890	},	1202	},
891	);	1203	);
892		1204
893	sub load_extension {
894	my ($path) = @_;
895
896	$path =~ /([^\/\\]+)\.ext$/ or die "$path";
897	my $base = $1;
898	my $pkg = $1;
899	$pkg =~ s/[^[:word:]]/_/g;
900	$pkg = "ext::$pkg";
901
902	warn "... loading '$path' into '$pkg'\n";
903
904	open my $fh, "<:utf8", $path
905	or die "$path: $!";
906
907	my $source =
908	"package $pkg; use strict; use utf8;\n"
909	. "#line 1 \"$path\"\n{\n"
910	. (do { local $/; <$fh> })
911	. "\n};\n1";
912
913	unless (eval $source) {
914	my $msg = $@ ? "$path: $@\n"
915	: "extension disabled.\n";
916	if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
917	warn $@;
918	warn "mandatory extension failed to load, exiting.\n";
919	exit 1;
920	}
921	die $@;
922	}
923
924	push @EXTS, $pkg;
925	}
926
927	sub load_extensions {	1205	sub load_extensions {
		1206	cf::sync_job {
		1207	my %todo;
		1208
928	for my $ext (<$LIBDIR/*.ext>) {	1209	for my $path (<$LIBDIR/*.ext>) {
929	next unless -r $ext;	1210	next unless -r $path;
930	eval {	1211
931	load_extension $ext;	1212	$path =~ /([^\/\\]+)\.ext$/ or die "$path";
		1213	my $base = $1;
		1214	my $pkg = $1;
		1215	$pkg =~ s/[^[:word:]]/_/g;
		1216	$pkg = "ext::$pkg";
		1217
		1218	open my $fh, "<:utf8", $path
		1219	or die "$path: $!";
		1220
		1221	my $source = do { local $/; <$fh> };
		1222
		1223	my %ext = (
		1224	path => $path,
		1225	base => $base,
		1226	pkg => $pkg,
		1227	);
		1228
		1229	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
		1230	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
		1231
		1232	$ext{source} =
		1233	"package $pkg; use strict; use utf8;\n"
		1234	. "#line 1 \"$path\"\n{\n"
		1235	. $source
		1236	. "\n};\n1";
		1237
		1238	$todo{$base} = \%ext;
		1239	}
		1240
		1241	my %done;
		1242	while (%todo) {
		1243	my $progress;
		1244
		1245	while (my ($k, $v) = each %todo) {
		1246	for (split /,\s*/, $v->{meta}{depends}) {
		1247	goto skip
		1248	unless exists $done{$_};
		1249	}
		1250
		1251	warn "... loading '$k' into '$v->{pkg}'\n";
		1252
		1253	unless (eval $v->{source}) {
		1254	my $msg = $@ ? "$v->{path}: $@\n"
		1255	: "$v->{base}: extension inactive.\n";
		1256
		1257	if (exists $v->{meta}{mandatory}) {
		1258	warn $msg;
		1259	warn "mandatory extension failed to load, exiting.\n";
		1260	exit 1;
		1261	}
		1262
		1263	warn $msg;
		1264	}
		1265
		1266	$done{$k} = delete $todo{$k};
		1267	push @EXTS, $v->{pkg};
		1268	$progress = 1;
932	1	1269	}
933	} or warn "$ext not loaded: $@";	1270
		1271	skip:
		1272	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
		1273	unless $progress;
		1274	}
934	}	1275	};
935	}	1276	}
936		1277
937	#############################################################################	1278	#############################################################################
938		1279
		1280	=back
		1281
939	=head2 CORE EXTENSIONS	1282	=head2 CORE EXTENSIONS
940		1283
941	Functions and methods that extend core crossfire objects.	1284	Functions and methods that extend core crossfire objects.
942		1285
943	=cut	1286	=cut
…		…
955	Returns the given player object, loading it if necessary (might block).	1298	Returns the given player object, loading it if necessary (might block).
956		1299
957	=cut	1300	=cut
958		1301
959	sub playerdir($) {	1302	sub playerdir($) {
960	cf::localdir	1303	"$PLAYERDIR/"
961	. "/"
962	. cf::playerdir
963	. "/"
964	. (ref $_[0] ? $_[0]->ob->name : $_[0])	1304	. (ref $_[0] ? $_[0]->ob->name : $_[0])
965	}	1305	}
966		1306
967	sub path($) {	1307	sub path($) {
968	my $login = ref $_[0] ? $_[0]->ob->name : $_[0];	1308	my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
…		…
1088	while and may block, so not sync_job-capable, ever.	1428	while and may block, so not sync_job-capable, ever.
1089		1429
1090	=cut	1430	=cut
1091		1431
1092	sub list_logins {	1432	sub list_logins {
1093	my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir	1433	my $dirs = aio_readdir $PLAYERDIR
1094	or return [];	1434	or return [];
1095		1435
1096	my @logins;	1436	my @logins;
1097		1437
1098	for my $login (@$dirs) {	1438	for my $login (@$dirs) {
…		…
1133	}	1473	}
1134		1474
1135	\@paths	1475	\@paths
1136	}	1476	}
1137		1477
		1478	=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
		1479
		1480	Expand crossfire pod fragments into protocol xml.
		1481
		1482	=cut
		1483
		1484	sub expand_cfpod {
		1485	((my $self), (local $_)) = @_;
		1486
		1487	# escape & and <
		1488	s/&/&amp;/g;
		1489	s/(?<![BIUGH])</&lt;/g;
		1490
		1491	# this is buggy, it needs to properly take care of nested <'s
		1492
		1493	1 while
		1494	# replace B<>, I<>, U<> etc.
		1495	s/B<([^\>]*)>/<b>$1<\/b>/
		1496	|| s/I<([^\>]*)>/<i>$1<\/i>/
		1497	|| s/U<([^\>]*)>/<u>$1<\/u>/
		1498	# replace G<male|female> tags
		1499	|| s{G<([^>|]*)\|([^>]*)>}{
		1500	$self->gender ? $2 : $1
		1501	}ge
		1502	# replace H<hint text>
		1503	|| s{H<([^\>]*)>}
		1504	{
		1505	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
		1506	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
		1507	"")
		1508	[$self->{hintmode}]
		1509	}ge;
		1510
		1511	# create single paragraphs (very hackish)
		1512	s/(?<=\S)\n(?=\w)/ /g;
		1513
		1514	# compress some whitespace
		1515	s/\s+\n/\n/g; # ws line-ends
		1516	s/\n\n+/\n/g; # double lines
		1517	s/^\n+//; # beginning lines
		1518	s/\n+$//; # ending lines
		1519
		1520	$_
		1521	}
		1522
		1523	sub hintmode {
		1524	$_[0]{hintmode} = $_[1] if @_ > 1;
		1525	$_[0]{hintmode}
		1526	}
		1527
1138	=item $player->ext_reply ($msgid, %msg)	1528	=item $player->ext_reply ($msgid, @msg)
1139		1529
1140	Sends an ext reply to the player.	1530	Sends an ext reply to the player.
1141		1531
1142	=cut	1532	=cut
1143		1533
1144	sub ext_reply($$%) {	1534	sub ext_reply($$@) {
1145	my ($self, $id, %msg) = @_;	1535	my ($self, $id, @msg) = @_;
1146		1536
1147	$msg{msgid} = $id;	1537	if ($self->ns->extcmd == 2) {
1148		1538	$self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1149	$self->send ("ext " . cf::to_json \%msg);	1539	} elsif ($self->ns->extcmd == 1) {
		1540	#TODO: version 1, remove
		1541	unshift @msg, msgtype => "reply", msgid => $id;
		1542	$self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
		1543	}
1150	}	1544	}
1151		1545
1152	=item $player->ext_event ($type, %msg)	1546	=item $player->ext_msg ($type, @msg)
1153		1547
1154	Sends an ext event to the client.	1548	Sends an ext event to the client.
1155		1549
1156	=cut	1550	=cut
1157		1551
1158	sub ext_event($$%) {	1552	sub ext_msg($$@) {
1159	my ($self, $type, %msg) = @_;	1553	my ($self, $type, @msg) = @_;
1160		1554
1161	$self->ns->ext_event ($type, %msg);	1555	$self->ns->ext_msg ($type, @msg);
1162	}	1556	}
1163		1557
1164	=head3 cf::region	1558	=head3 cf::region
1165		1559
1166	=over 4	1560	=over 4
…		…
1169		1563
1170	package cf::region;	1564	package cf::region;
1171		1565
1172	=item cf::region::find_by_path $path	1566	=item cf::region::find_by_path $path
1173		1567
1174	Tries to decuce the probable region for a map knowing only its path.	1568	Tries to decuce the likely region for a map knowing only its path.
1175		1569
1176	=cut	1570	=cut
1177		1571
1178	sub find_by_path($) {	1572	sub find_by_path($) {
1179	my ($path) = @_;	1573	my ($path) = @_;
1180		1574
1181	my ($match, $specificity);	1575	my ($match, $specificity);
1182		1576
1183	for my $region (list) {	1577	for my $region (list) {
1184	if ($region->match && $path =~ $region->match) {	1578	if ($region->{match} && $path =~ $region->{match}) {
1185	($match, $specificity) = ($region, $region->specificity)	1579	($match, $specificity) = ($region, $region->specificity)
1186	if $region->specificity > $specificity;	1580	if $region->specificity > $specificity;
1187	}	1581	}
1188	}	1582	}
1189		1583
…		…
1253	my ($self, $merge) = @_;	1647	my ($self, $merge) = @_;
1254		1648
1255	# we have to keep some variables in memory intact	1649	# we have to keep some variables in memory intact
1256	local $self->{path};	1650	local $self->{path};
1257	local $self->{load_path};	1651	local $self->{load_path};
1258	local $self->{deny_save};
1259	local $self->{deny_reset};
1260		1652
1261	$self->SUPER::thawer_merge ($merge);	1653	$self->SUPER::thawer_merge ($merge);
1262	}	1654	}
1263		1655
1264	sub normalise {	1656	sub normalise {
…		…
1311	$self->init; # pass $1 etc.	1703	$self->init; # pass $1 etc.
1312	return $self;	1704	return $self;
1313	}	1705	}
1314	}	1706	}
1315		1707
1316	Carp::carp "unable to resolve path '$path' (base '$base').";	1708	Carp::cluck "unable to resolve path '$path' (base '$base').";
1317	()	1709	()
1318	}	1710	}
1319		1711
1320	sub init {	1712	sub init {
1321	my ($self) = @_;	1713	my ($self) = @_;
…		…
1336		1728
1337	# the original (read-only) location	1729	# the original (read-only) location
1338	sub load_path {	1730	sub load_path {
1339	my ($self) = @_;	1731	my ($self) = @_;
1340		1732
1341	sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}	1733	"$MAPDIR/$self->{path}.map"
1342	}	1734	}
1343		1735
1344	# the temporary/swap location	1736	# the temporary/swap location
1345	sub save_path {	1737	sub save_path {
1346	my ($self) = @_;	1738	my ($self) = @_;
1347		1739
1348	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1740	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1349	sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path	1741	"$TMPDIR/$path.map"
1350	}	1742	}
1351		1743
1352	# the unique path, undef == no special unique path	1744	# the unique path, undef == no special unique path
1353	sub uniq_path {	1745	sub uniq_path {
1354	my ($self) = @_;	1746	my ($self) = @_;
1355		1747
1356	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1748	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1357	sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path	1749	"$UNIQUEDIR/$path"
1358	}	1750	}
1359		1751
1360	# and all this just because we cannot iterate over	1752	# and all this just because we cannot iterate over
1361	# all maps in C++...	1753	# all maps in C++...
1362	sub change_all_map_light {	1754	sub change_all_map_light {
1363	my ($change) = @_;	1755	my ($change) = @_;
1364		1756
1365	$_->change_map_light ($change)	1757	$_->change_map_light ($change)
1366	for grep $_->outdoor, values %cf::MAP;	1758	for grep $_->outdoor, values %cf::MAP;
		1759	}
		1760
		1761	sub decay_objects {
		1762	my ($self) = @_;
		1763
		1764	return if $self->{deny_reset};
		1765
		1766	$self->do_decay_objects;
1367	}	1767	}
1368		1768
1369	sub unlink_save {	1769	sub unlink_save {
1370	my ($self) = @_;	1770	my ($self) = @_;
1371		1771
…		…
1429	$self->load_header_orig	1829	$self->load_header_orig
1430	or return;	1830	or return;
1431	$self->prepare_orig;	1831	$self->prepare_orig;
1432	}	1832	}
1433		1833
		1834	$self->{deny_reset} = 1
		1835	if $self->no_reset;
		1836
1434	$self->default_region (cf::region::find_by_path $self->{path})	1837	$self->default_region (cf::region::find_by_path $self->{path})
1435	unless $self->default_region;	1838	unless $self->default_region;
1436		1839
1437	1	1840	1
1438	}	1841	}
…		…
1453	$map->{last_save} = $cf::RUNTIME;	1856	$map->{last_save} = $cf::RUNTIME;
1454		1857
1455	$map->load_header	1858	$map->load_header
1456	or return;	1859	or return;
1457		1860
1458	if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)	1861	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1459	# doing this can freeze the server in a sync job, obviously	1862	# doing this can freeze the server in a sync job, obviously
1460	#$cf::WAIT_FOR_TICK->wait;	1863	#$cf::WAIT_FOR_TICK->wait;
1461	$map->reset;	1864	$map->reset;
1462	undef $guard;	1865	undef $guard;
1463	return find $path;	1866	return find $path;
…		…
1474	my ($self) = @_;	1877	my ($self) = @_;
1475		1878
1476	local $self->{deny_reset} = 1; # loading can take a long time	1879	local $self->{deny_reset} = 1; # loading can take a long time
1477		1880
1478	my $path = $self->{path};	1881	my $path = $self->{path};
		1882
		1883	{
1479	my $guard = cf::lock_acquire "map_load:$path";	1884	my $guard = cf::lock_acquire "map_load:$path";
1480		1885
1481	return if $self->in_memory != cf::MAP_SWAPPED;	1886	return if $self->in_memory != cf::MAP_SWAPPED;
1482		1887
1483	$self->in_memory (cf::MAP_LOADING);	1888	$self->in_memory (cf::MAP_LOADING);
1484		1889
1485	$self->alloc;	1890	$self->alloc;
1486		1891
1487	$self->pre_load;	1892	$self->pre_load;
1488	Coro::cede;
1489
1490	$self->_load_objects ($self->{load_path}, 1)
1491	or return;
1492
1493	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1494	if delete $self->{load_original};
1495
1496	if (my $uniq = $self->uniq_path) {
1497	utf8::encode $uniq;
1498	if (aio_open $uniq, O_RDONLY, 0) {
1499	$self->clear_unique_items;
1500	$self->_load_objects ($uniq, 0);
1501	}
1502	}
1503
1504	Coro::cede;
1505	# now do the right thing for maps
1506	$self->link_multipart_objects;
1507	Coro::cede;
1508
1509	unless ($self->{deny_activate}) {
1510	$self->decay_objects;
1511	$self->fix_auto_apply;
1512	$self->update_buttons;
1513	Coro::cede;	1893	Coro::cede;
1514	$self->set_darkness_map;	1894
		1895	$self->_load_objects ($self->{load_path}, 1)
		1896	or return;
		1897
		1898	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
		1899	if delete $self->{load_original};
		1900
		1901	if (my $uniq = $self->uniq_path) {
		1902	utf8::encode $uniq;
		1903	if (aio_open $uniq, O_RDONLY, 0) {
		1904	$self->clear_unique_items;
		1905	$self->_load_objects ($uniq, 0);
		1906	}
		1907	}
		1908
		1909	Coro::cede;
		1910	# now do the right thing for maps
		1911	$self->link_multipart_objects;
1515	$self->difficulty ($self->estimate_difficulty)	1912	$self->difficulty ($self->estimate_difficulty)
1516	unless $self->difficulty;	1913	unless $self->difficulty;
1517	Coro::cede;	1914	Coro::cede;
		1915
		1916	unless ($self->{deny_activate}) {
		1917	$self->decay_objects;
		1918	$self->fix_auto_apply;
		1919	$self->update_buttons;
		1920	Coro::cede;
		1921	$self->set_darkness_map;
		1922	Coro::cede;
1518	$self->activate;	1923	$self->activate;
1519	Coro::cede;	1924	}
		1925
		1926	$map->{last_save} = $cf::RUNTIME;
		1927	$map->last_access ($cf::RUNTIME);
		1928
		1929	$self->in_memory (cf::MAP_IN_MEMORY);
1520	}	1930	}
1521		1931
1522	$self->post_load;	1932	$self->post_load;
1523	Coro::cede;
1524
1525	$self->in_memory (cf::MAP_IN_MEMORY);
1526	}	1933	}
1527		1934
1528	sub customise_for {	1935	sub customise_for {
1529	my ($self, $ob) = @_;	1936	my ($self, $ob) = @_;
1530		1937
1531	return find "~" . $ob->name . "/" . $self->{path}	1938	return find "~" . $ob->name . "/" . $self->{path}
1532	if $self->per_player;	1939	if $self->per_player;
		1940
		1941	# return find "?party/" . $ob->name . "/" . $self->{path}
		1942	# if $self->per_party;
1533		1943
1534	$self	1944	$self
1535	}	1945	}
1536		1946
1537	# find and load all maps in the 3x3 area around a map	1947	# find and load all maps in the 3x3 area around a map
…		…
1584		1994
1585	undef $MAP_PREFETCH{$path};	1995	undef $MAP_PREFETCH{$path};
1586	$MAP_PREFETCHER ||= cf::async {	1996	$MAP_PREFETCHER ||= cf::async {
1587	while (%MAP_PREFETCH) {	1997	while (%MAP_PREFETCH) {
1588	for my $path (keys %MAP_PREFETCH) {	1998	for my $path (keys %MAP_PREFETCH) {
1589	my $map = find $path	1999	if (my $map = find $path) {
1590	or next;
1591	$map->load;	2000	$map->load;
		2001	}
1592		2002
1593	delete $MAP_PREFETCH{$path};	2003	delete $MAP_PREFETCH{$path};
1594	}	2004	}
1595	}	2005	}
1596	undef $MAP_PREFETCHER;	2006	undef $MAP_PREFETCHER;
…		…
1648		2058
1649	sub reset_at {	2059	sub reset_at {
1650	my ($self) = @_;	2060	my ($self) = @_;
1651		2061
1652	# TODO: safety, remove and allow resettable per-player maps	2062	# TODO: safety, remove and allow resettable per-player maps
1653	return 1e99 if $self->isa ("ext::map_per_player");#d#
1654	return 1e99 if $self->{deny_reset};	2063	return 1e99 if $self->{deny_reset};
1655		2064
1656	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;	2065	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1657	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;	2066	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1658		2067
…		…
1669	my ($self) = @_;	2078	my ($self) = @_;
1670		2079
1671	my $lock = cf::lock_acquire "map_data:$self->{path}";	2080	my $lock = cf::lock_acquire "map_data:$self->{path}";
1672		2081
1673	return if $self->players;	2082	return if $self->players;
1674	return if $self->isa ("ext::map_per_player");#d#
1675		2083
1676	warn "resetting map ", $self->path;#d#	2084	warn "resetting map ", $self->path;
1677		2085
1678	$self->in_memory (cf::MAP_SWAPPED);	2086	$self->in_memory (cf::MAP_SWAPPED);
1679		2087
1680	# need to save uniques path	2088	# need to save uniques path
1681	unless ($self->{deny_save}) {	2089	unless ($self->{deny_save}) {
…		…
1713	$cf::MAP{$self->path} = $self;	2121	$cf::MAP{$self->path} = $self;
1714		2122
1715	$self->reset; # polite request, might not happen	2123	$self->reset; # polite request, might not happen
1716	}	2124	}
1717		2125
		2126	=item $maps = cf::map::tmp_maps
		2127
		2128	Returns an arrayref with all map paths of currently instantiated and saved
		2129	maps. May block.
		2130
		2131	=cut
		2132
		2133	sub tmp_maps() {
		2134	[
		2135	map {
		2136	utf8::decode $_;
		2137	/\.map$/
		2138	? normalise $_
		2139	: ()
		2140	} @{ aio_readdir $TMPDIR or [] }
		2141	]
		2142	}
		2143
		2144	=item $maps = cf::map::random_maps
		2145
		2146	Returns an arrayref with all map paths of currently instantiated and saved
		2147	random maps. May block.
		2148
		2149	=cut
		2150
		2151	sub random_maps() {
		2152	[
		2153	map {
		2154	utf8::decode $_;
		2155	/\.map$/
		2156	? normalise "?random/$_"
		2157	: ()
		2158	} @{ aio_readdir $RANDOMDIR or [] }
		2159	]
		2160	}
		2161
1718	=item cf::map::unique_maps	2162	=item cf::map::unique_maps
1719		2163
1720	Returns an arrayref of paths of all shared maps that have	2164	Returns an arrayref of paths of all shared maps that have
1721	instantiated unique items. May block.	2165	instantiated unique items. May block.
1722		2166
1723	=cut	2167	=cut
1724		2168
1725	sub unique_maps() {	2169	sub unique_maps() {
1726	my $files = aio_readdir cf::localdir . "/" . cf::uniquedir	2170	[
1727	or return;	2171	map {
1728
1729	my @paths;
1730
1731	for (@$files) {
1732	utf8::decode $_;	2172	utf8::decode $_;
1733	next if /\.pst$/;	2173	/\.map$/
1734	next unless /^$PATH_SEP/o;	2174	? normalise $_
1735		2175	: ()
1736	push @paths, cf::map::normalise $_;	2176	} @{ aio_readdir $UNIQUEDIR or [] }
1737	}	2177	]
1738
1739	\@paths
1740	}	2178	}
1741		2179
1742	package cf;	2180	package cf;
1743		2181
1744	=back	2182	=back
…		…
1790		2228
1791	$flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;	2229	$flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1792		2230
1793	if ($self->{record_replies}) {	2231	if ($self->{record_replies}) {
1794	push @{ $self->{record_replies} }, [$npc, $msg, $flags];	2232	push @{ $self->{record_replies} }, [$npc, $msg, $flags];
		2233
1795	} else {	2234	} else {
		2235	my $pl = $self->contr;
		2236
		2237	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
		2238	my $dialog = $pl->{npc_dialog};
		2239	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
		2240
		2241	} else {
1796	$msg = $npc->name . " says: $msg" if $npc;	2242	$msg = $npc->name . " says: $msg" if $npc;
1797	$self->message ($msg, $flags);	2243	$self->message ($msg, $flags);
		2244	}
1798	}	2245	}
1799	}	2246	}
1800		2247
1801	=item $player_object->may ("access")	2248	=item $player_object->may ("access")
1802		2249
…		…
1850	$self->deactivate_recursive;	2297	$self->deactivate_recursive;
1851		2298
1852	return if UNIVERSAL::isa $self->map, "ext::map_link";	2299	return if UNIVERSAL::isa $self->map, "ext::map_link";
1853		2300
1854	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2301	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1855	if $self->map;	2302	if $self->map && $self->map->{path} ne "{link}";
1856		2303
1857	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2304	$self->enter_map ($LINK_MAP || link_map, 10, 10);
1858	}	2305	}
1859		2306
1860	sub cf::object::player::leave_link {	2307	sub cf::object::player::leave_link {
1861	my ($self, $map, $x, $y) = @_;	2308	my ($self, $map, $x, $y) = @_;
		2309
		2310	return unless $self->contr->active;
1862		2311
1863	my $link_pos = delete $self->{_link_pos};	2312	my $link_pos = delete $self->{_link_pos};
1864		2313
1865	unless ($map) {	2314	unless ($map) {
1866	# restore original map position	2315	# restore original map position
…		…
1889		2338
1890	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2339	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1891	$self->enter_map ($map, $x, $y);	2340	$self->enter_map ($map, $x, $y);
1892	}	2341	}
1893		2342
1894	cf::player->attach (	2343	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1895	on_logout => sub {
1896	my ($pl) = @_;
1897		2344
1898	# abort map switching before logout	2345	Moves the player to the given map-path and coordinates by first freezing
1899	if ($pl->ob->{_link_pos}) {	2346	her, loading and preparing them map, calling the provided $check callback
1900	cf::sync_job {	2347	that has to return the map if sucecssful, and then unfreezes the player on
1901	$pl->ob->leave_link	2348	the new (success) or old (failed) map position. In either case, $done will
1902	};	2349	be called at the end of this process.
1903	}
1904	},
1905	on_login => sub {
1906	my ($pl) = @_;
1907		2350
1908	# try to abort aborted map switching on player login :)
1909	# should happen only on crashes
1910	if ($pl->ob->{_link_pos}) {
1911	$pl->ob->enter_link;
1912	(async {
1913	$pl->ob->reply (undef,
1914	"There was an internal problem at your last logout, "
1915	. "the server will try to bring you to your intended destination in a second.",
1916	cf::NDI_RED);
1917	# we need this sleep as the login has a concurrent enter_exit running
1918	# and this sleep increases chances of the player not ending up in scorn
1919	Coro::Timer::sleep 1;
1920	$pl->ob->leave_link;
1921	})->prio (2);
1922	}
1923	},
1924	);
1925
1926	=item $player_object->goto ($path, $x, $y)
1927
1928	=cut	2351	=cut
		2352
		2353	our $GOTOGEN;
1929		2354
1930	sub cf::object::player::goto {	2355	sub cf::object::player::goto {
1931	my ($self, $path, $x, $y) = @_;	2356	my ($self, $path, $x, $y, $check, $done) = @_;
		2357
		2358	# do generation counting so two concurrent goto's will be executed in-order
		2359	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1932		2360
1933	$self->enter_link;	2361	$self->enter_link;
1934		2362
1935	(async {	2363	(async {
1936	my $map = eval {	2364	my $map = eval {
1937	my $map = cf::map::find $path;	2365	my $map = cf::map::find $path;
		2366
		2367	if ($map) {
1938	$map = $map->customise_for ($self) if $map;	2368	$map = $map->customise_for ($self);
		2369	$map = $check->($map) if $check && $map;
		2370	} else {
		2371	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
		2372	}
		2373
1939	$map	2374	$map
		2375	};
		2376
		2377	if ($@) {
		2378	$self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
		2379	LOG llevError | logBacktrace, Carp::longmess $@;
1940	} or	2380	}
1941	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1942		2381
		2382	if ($gen == $self->{_goto_generation}) {
		2383	delete $self->{_goto_generation};
1943	$self->leave_link ($map, $x, $y);	2384	$self->leave_link ($map, $x, $y);
		2385	}
		2386
		2387	$done->() if $done;
1944	})->prio (1);	2388	})->prio (1);
1945	}	2389	}
1946		2390
1947	=item $player_object->enter_exit ($exit_object)	2391	=item $player_object->enter_exit ($exit_object)
1948		2392
…		…
1987		2431
1988	$rmp->{random_seed} ||= $exit->random_seed;	2432	$rmp->{random_seed} ||= $exit->random_seed;
1989		2433
1990	my $data = cf::to_json $rmp;	2434	my $data = cf::to_json $rmp;
1991	my $md5 = Digest::MD5::md5_hex $data;	2435	my $md5 = Digest::MD5::md5_hex $data;
1992	my $meta = "$cf::RANDOM_MAPS/$md5.meta";	2436	my $meta = "$RANDOMDIR/$md5.meta";
1993		2437
1994	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {	2438	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1995	aio_write $fh, 0, (length $data), $data, 0;	2439	aio_write $fh, 0, (length $data), $data, 0;
1996	undef $fh;	2440	undef $fh;
1997	aio_rename "$meta~", $meta;	2441	aio_rename "$meta~", $meta;
…		…
2016	my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2460	my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2017	my $hp = $exit->stats->hp;	2461	my $hp = $exit->stats->hp;
2018	my $sp = $exit->stats->sp;	2462	my $sp = $exit->stats->sp;
2019		2463
2020	$self->enter_link;	2464	$self->enter_link;
		2465
		2466	# if exit is damned, update players death & WoR home-position
		2467	$self->contr->savebed ($slaying, $hp, $sp)
		2468	if $exit->flag (FLAG_DAMNED);
2021		2469
2022	(async {	2470	(async {
2023	$self->deactivate_recursive; # just to be sure	2471	$self->deactivate_recursive; # just to be sure
2024	unless (eval {	2472	unless (eval {
2025	$self->goto ($slaying, $hp, $sp);	2473	$self->goto ($slaying, $hp, $sp);
…		…
2053		2501
2054	utf8::encode $text;	2502	utf8::encode $text;
2055	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2503	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2056	}	2504	}
2057		2505
		2506	=item $client->send_msg ($channel, $msg, $color, [extra...])
		2507
		2508	Send a drawinfo or msg packet to the client, formatting the msg for the
		2509	client if neccessary. C<$type> should be a string identifying the type of
		2510	the message, with C<log> being the default. If C<$color> is negative, suppress
		2511	the message unless the client supports the msg packet.
		2512
		2513	=cut
		2514
		2515	sub cf::client::send_msg {
		2516	my ($self, $channel, $msg, $color, @extra) = @_;
		2517
		2518	$msg = $self->pl->expand_cfpod ($msg);
		2519
		2520	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2521
		2522	if (ref $channel) {
		2523	# send meta info to client, if not yet sent
		2524	unless (exists $self->{channel}{$channel->{id}}) {
		2525	$self->{channel}{$channel->{id}} = $channel;
		2526	$self->ext_msg (channel_info => $channel);
		2527	}
		2528
		2529	$channel = $channel->{id};
		2530	}
		2531
		2532	return unless @extra || length $msg;
		2533
		2534	if ($self->can_msg) {
		2535	# default colour, mask it out
		2536	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
		2537	if $color & cf::NDI_DEF;
		2538
		2539	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2540	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
		2541	} else {
		2542	if ($color >= 0) {
		2543	# replace some tags by gcfclient-compatible ones
		2544	for ($msg) {
		2545	1 while
		2546	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2547	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2548	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2549	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2550	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2551	}
		2552
		2553	$color &= cf::NDI_COLOR_MASK;
		2554
		2555	if (0 && $msg =~ /\[/) {
		2556	$self->send_packet ("drawextinfo $color 4 0 $msg")
		2557	} else {
		2558	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
		2559	$self->send_packet ("drawinfo $color $msg")
		2560	}
		2561	}
		2562	}
		2563	}
		2564
2058	=item $client->ext_event ($type, %msg)	2565	=item $client->ext_msg ($type, @msg)
2059		2566
2060	Sends an exti event to the client.	2567	Sends an ext event to the client.
2061		2568
2062	=cut	2569	=cut
2063		2570
2064	sub cf::client::ext_event($$%) {	2571	sub cf::client::ext_msg($$@) {
2065	my ($self, $type, %msg) = @_;	2572	my ($self, $type, @msg) = @_;
2066		2573
		2574	my $extcmd = $self->extcmd;
		2575
		2576	if ($extcmd == 2) {
		2577	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2578	} elsif ($extcmd == 1) { # TODO: remove
2067	$msg{msgtype} = "event_$type";	2579	push @msg, msgtype => "event_$type";
2068	$self->send_packet ("ext " . cf::to_json \%msg);	2580	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2581	}
2069	}	2582	}
2070		2583
2071	=item $success = $client->query ($flags, "text", \&cb)	2584	=item $success = $client->query ($flags, "text", \&cb)
2072		2585
2073	Queues a query to the client, calling the given callback with	2586	Queues a query to the client, calling the given callback with
2074	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,	2587	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2075	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.	2588	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2076		2589
2077	Queries can fail, so check the return code. Or don't, as queries will become	2590	Queries can fail, so check the return code. Or don't, as queries will
2078	reliable at some point in the future.	2591	become reliable at some point in the future.
2079		2592
2080	=cut	2593	=cut
2081		2594
2082	sub cf::client::query {	2595	sub cf::client::query {
2083	my ($self, $flags, $text, $cb) = @_;	2596	my ($self, $flags, $text, $cb) = @_;
…		…
2091	utf8::encode $text;	2604	utf8::encode $text;
2092	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];	2605	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2093		2606
2094	$self->send_packet ($self->{query_queue}[0][0])	2607	$self->send_packet ($self->{query_queue}[0][0])
2095	if @{ $self->{query_queue} } == 1;	2608	if @{ $self->{query_queue} } == 1;
		2609
		2610	1
2096	}	2611	}
2097		2612
2098	cf::client->attach (	2613	cf::client->attach (
		2614	on_connect => sub {
		2615	my ($ns) = @_;
		2616
		2617	$ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
		2618	},
2099	on_reply => sub {	2619	on_reply => sub {
2100	my ($ns, $msg) = @_;	2620	my ($ns, $msg) = @_;
2101		2621
2102	# this weird shuffling is so that direct followup queries	2622	# this weird shuffling is so that direct followup queries
2103	# get handled first	2623	# get handled first
…		…
2115	} else {	2635	} else {
2116	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;	2636	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2117	}	2637	}
2118	}	2638	}
2119	},	2639	},
		2640	on_exticmd => sub {
		2641	my ($ns, $buf) = @_;
		2642
		2643	my $msg = eval { $ns->{json_coder}->decode ($buf) };
		2644
		2645	if (ref $msg) {
		2646	my ($type, $reply, @payload) =
		2647	"ARRAY" eq ref $msg
		2648	? @$msg
		2649	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2650
		2651	if (my $cb = $EXTICMD{$type}) {
		2652	my @reply = $cb->($ns, @payload);
		2653
		2654	$ns->ext_reply ($reply, @reply)
		2655	if $reply;
		2656	}
		2657	} else {
		2658	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
		2659	}
		2660
		2661	cf::override;
		2662	},
2120	);	2663	);
2121		2664
2122	=item $client->async (\&cb)	2665	=item $client->async (\&cb)
2123		2666
2124	Create a new coroutine, running the specified callback. The coroutine will	2667	Create a new coroutine, running the specified callback. The coroutine will
…		…
2173		2716
2174	=pod	2717	=pod
2175		2718
2176	The following functions and methods are available within a safe environment:	2719	The following functions and methods are available within a safe environment:
2177		2720
2178	cf::object contr pay_amount pay_player map	2721	cf::object
		2722	contr pay_amount pay_player map x y force_find force_add
		2723	insert remove
		2724
2179	cf::object::player player	2725	cf::object::player
2180	cf::player peaceful	2726	player
2181	cf::map trigger	2727
		2728	cf::player
		2729	peaceful
		2730
		2731	cf::map
		2732	trigger
2182		2733
2183	=cut	2734	=cut
2184		2735
2185	for (	2736	for (
2186	["cf::object" => qw(contr pay_amount pay_player map)],	2737	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2738	insert remove)],
2187	["cf::object::player" => qw(player)],	2739	["cf::object::player" => qw(player)],
2188	["cf::player" => qw(peaceful)],	2740	["cf::player" => qw(peaceful)],
2189	["cf::map" => qw(trigger)],	2741	["cf::map" => qw(trigger)],
2190	) {	2742	) {
2191	no strict 'refs';	2743	no strict 'refs';
…		…
2262	=back	2814	=back
2263		2815
2264	=cut	2816	=cut
2265		2817
2266	#############################################################################	2818	#############################################################################
2267
2268	=head2 EXTENSION DATABASE SUPPORT
2269
2270	Crossfire maintains a very simple database for extension use. It can
2271	currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2272	convert to/from binary).
2273
2274	The parameter C<$family> should best start with the name of the extension
2275	using it, it should be unique.
2276
2277	=over 4
2278
2279	=item $value = cf::db_get $family => $key
2280
2281	Returns a single value from the database.
2282
2283	=item cf::db_put $family => $key => $value
2284
2285	Stores the given C<$value> in the family.
2286
2287	=cut
2288
2289	our $DB;
2290
2291	sub db_init {
2292	unless ($DB) {
2293	$DB = BDB::db_create $DB_ENV;
2294
2295	cf::sync_job {
2296	eval {
2297	$DB->set_flags (BDB::CHKSUM);
2298
2299	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2300	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2301	cf::cleanup "db_open(db): $!" if $!;
2302	};
2303	cf::cleanup "db_open(db): $@" if $@;
2304	};
2305	}
2306	}
2307
2308	sub db_get($$) {
2309	my $key = "$_[0]/$_[1]";
2310
2311	cf::sync_job {
2312	BDB::db_get $DB, undef, $key, my $data;
2313
2314	$! ? ()
2315	: $data
2316	}
2317	}
2318
2319	sub db_put($$$) {
2320	BDB::dbreq_pri 4;
2321	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2322	}
2323
2324	=item cf::cache $id => [$paths...], $processversion => $process
2325
2326	Generic caching function that returns the value of the resource $id,
2327	caching and regenerating as required.
2328
2329	This function can block.
2330
2331	=cut
2332
2333	sub cache {
2334	my ($id, $src, $processversion, $process) = @_;
2335
2336	my $meta =
2337	join "\x00",
2338	$processversion,
2339	map {
2340	aio_stat $_
2341	and Carp::croak "$_: $!";
2342
2343	($_, (stat _)[7,9])
2344	} @$src;
2345
2346	my $dbmeta = db_get cache => "$id/meta";
2347	if ($dbmeta ne $meta) {
2348	# changed, we may need to process
2349
2350	my @data;
2351	my $md5;
2352
2353	for (0 .. $#$src) {
2354	0 <= aio_load $src->[$_], $data[$_]
2355	or Carp::croak "$src->[$_]: $!";
2356	}
2357
2358	# if processing is expensive, check
2359	# checksum first
2360	if (1) {
2361	$md5 =
2362	join "\x00",
2363	$processversion,
2364	map {
2365	Coro::cede;
2366	($src->[$_], Digest::MD5::md5_hex $data[$_])
2367	} 0.. $#$src;
2368
2369
2370	my $dbmd5 = db_get cache => "$id/md5";
2371	if ($dbmd5 eq $md5) {
2372	db_put cache => "$id/meta", $meta;
2373
2374	return db_get cache => "$id/data";
2375	}
2376	}
2377
2378	my $data = $process->(\@data);
2379
2380	db_put cache => "$id/data", $data;
2381	db_put cache => "$id/md5" , $md5;
2382	db_put cache => "$id/meta", $meta;
2383
2384	return $data;
2385	}
2386
2387	db_get cache => "$id/data"
2388	}
2389
2390	=item fork_call { }, $args
2391
2392	Executes the given code block with the given arguments in a seperate
2393	process, returning the results. Everything must be serialisable with
2394	Coro::Storable. May, of course, block. Note that the executed sub may
2395	never block itself or use any form of Event handling.
2396
2397	=cut
2398
2399	sub fork_call(&@) {
2400	my ($cb, @args) = @_;
2401
2402	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2403	# or die "socketpair: $!";
2404	pipe my $fh1, my $fh2
2405	or die "pipe: $!";
2406
2407	if (my $pid = fork) {
2408	close $fh2;
2409
2410	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2411	$res = Coro::Storable::thaw $res;
2412
2413	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2414
2415	die $$res unless "ARRAY" eq ref $res;
2416
2417	return wantarray ? @$res : $res->[-1];
2418	} else {
2419	eval {
2420	local $SIG{__DIE__};
2421	local $SIG{__WARN__};
2422	close $fh1;
2423
2424	my @res = eval { $cb->(@args) };
2425	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2426	};
2427
2428	_exit 0;
2429	}
2430	}
2431
2432
2433
2434	#############################################################################
2435	# the server's init and main functions	2819	# the server's init and main functions
2436		2820
2437	sub load_facedata($) {	2821	sub load_facedata($) {
2438	my ($path) = @_;	2822	my ($path) = @_;
2439		2823
…		…
2451	{	2835	{
2452	my $faces = $facedata->{faceinfo};	2836	my $faces = $facedata->{faceinfo};
2453		2837
2454	while (my ($face, $info) = each %$faces) {	2838	while (my ($face, $info) = each %$faces) {
2455	my $idx = (cf::face::find $face) || cf::face::alloc $face;	2839	my $idx = (cf::face::find $face) || cf::face::alloc $face;
2456	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	2840	cf::face::set_visibility $idx, $info->{visibility};
		2841	cf::face::set_magicmap $idx, $info->{magicmap};
2457	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	2842	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2458	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	2843	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2459	Coro::cede;	2844
		2845	cf::cede_to_tick;
2460	}	2846	}
2461		2847
2462	while (my ($face, $info) = each %$faces) {	2848	while (my ($face, $info) = each %$faces) {
2463	next unless $info->{smooth};	2849	next unless $info->{smooth};
2464	my $idx = cf::face::find $face	2850	my $idx = cf::face::find $face
2465	or next;	2851	or next;
2466	if (my $smooth = cf::face::find $info->{smooth}) {	2852	if (my $smooth = cf::face::find $info->{smooth}) {
		2853	cf::face::set_smooth $idx, $smooth;
2467	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	2854	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2468	} else {	2855	} else {
2469	warn "smooth face '$info->{smooth}' not found for face '$face'";	2856	warn "smooth face '$info->{smooth}' not found for face '$face'";
2470	}	2857	}
2471	Coro::cede;	2858
		2859	cf::cede_to_tick;
2472	}	2860	}
2473	}	2861	}
2474		2862
2475	{	2863	{
2476	my $anims = $facedata->{animinfo};	2864	my $anims = $facedata->{animinfo};
2477		2865
2478	while (my ($anim, $info) = each %$anims) {	2866	while (my ($anim, $info) = each %$anims) {
2479	cf::anim::set $anim, $info->{frames}, $info->{facings};	2867	cf::anim::set $anim, $info->{frames}, $info->{facings};
2480	Coro::cede;	2868	cf::cede_to_tick;
2481	}	2869	}
2482		2870
2483	cf::anim::invalidate_all; # d'oh	2871	cf::anim::invalidate_all; # d'oh
2484	}	2872	}
2485		2873
		2874	{
		2875	# TODO: for gcfclient pleasure, we should give resources
		2876	# that gcfclient doesn't grok a >10000 face index.
		2877	my $res = $facedata->{resource};
		2878	my $enc = JSON::XS->new->utf8->canonical;
		2879
		2880	my $soundconf = delete $res->{"res/sound.conf"};
		2881
		2882	while (my ($name, $info) = each %$res) {
		2883	my $meta = $enc->encode ({
		2884	name => $name,
		2885	%{ $info->{meta} || {} },
		2886	});
		2887
		2888	my $idx = (cf::face::find $name) || cf::face::alloc $name;
		2889
		2890	if ($info->{type} & 1) {
		2891	# prepend meta info
		2892
		2893	my $data = pack "(w/a*)*", $meta, $info->{data};
		2894	my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
		2895
		2896	cf::face::set_data $idx, 0, $data, $chk;
		2897	} else {
		2898	cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};
		2899	}
		2900
		2901	cf::face::set_type $idx, $info->{type};
		2902
		2903	cf::cede_to_tick;
		2904	}
		2905
		2906	if ($soundconf) {
		2907	$soundconf = $enc->decode (delete $soundconf->{data});
		2908
		2909	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		2910	my $sound = $soundconf->{compat}[$_]
		2911	or next;
		2912
		2913	my $face = cf::face::find "sound/$sound->[1]";
		2914
		2915	cf::sound::set $sound->[0] => $face;
		2916	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		2917	}
		2918
		2919	#TODO
		2920	}
		2921	}
		2922
2486	1	2923	1
2487	}	2924	}
2488		2925
		2926	register_exticmd fx_want => sub {
		2927	my ($ns, $want) = @_;
		2928
		2929	while (my ($k, $v) = each %$want) {
		2930	$ns->fx_want ($k, $v);
		2931	}
		2932	};
		2933
		2934	sub reload_regions {
		2935	load_resource_file "$MAPDIR/regions"
		2936	or die "unable to load regions file\n";
		2937
		2938	for (cf::region::list) {
		2939	$_->{match} = qr/$_->{match}/
		2940	if exists $_->{match};
		2941	}
		2942	}
		2943
2489	sub reload_facedata {	2944	sub reload_facedata {
2490	load_facedata sprintf "%s/facedata", cf::datadir	2945	load_facedata "$DATADIR/facedata"
2491	or die "unable to load facedata\n";	2946	or die "unable to load facedata\n";
2492	}	2947	}
2493		2948
2494	sub reload_regions {
2495	load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2496	or die "unable to load regions file\n";
2497	}
2498
2499	sub reload_archetypes {	2949	sub reload_archetypes {
2500	load_resource_file sprintf "%s/archetypes", cf::datadir	2950	load_resource_file "$DATADIR/archetypes"
2501	or die "unable to load archetypes\n";	2951	or die "unable to load archetypes\n";
		2952	#d# NEED to laod twice to resolve forward references
		2953	# this really needs to be done in an extra post-pass
		2954	# (which needs to be synchronous, so solve it differently)
		2955	load_resource_file "$DATADIR/archetypes"
		2956	or die "unable to load archetypes\n";
2502	}	2957	}
2503		2958
2504	sub reload_treasures {	2959	sub reload_treasures {
2505	load_resource_file sprintf "%s/treasures", cf::datadir	2960	load_resource_file "$DATADIR/treasures"
2506	or die "unable to load treasurelists\n";	2961	or die "unable to load treasurelists\n";
2507	}	2962	}
2508		2963
2509	sub reload_resources {	2964	sub reload_resources {
2510	warn "reloading resource files...\n";	2965	warn "reloading resource files...\n";
2511		2966
2512	reload_regions;	2967	reload_regions;
2513	reload_facedata;	2968	reload_facedata;
		2969	#reload_archetypes;#d#
2514	reload_archetypes;	2970	reload_archetypes;
2515	reload_treasures;	2971	reload_treasures;
2516		2972
2517	warn "finished reloading resource files\n";	2973	warn "finished reloading resource files\n";
2518	}	2974	}
…		…
2520	sub init {	2976	sub init {
2521	reload_resources;	2977	reload_resources;
2522	}	2978	}
2523		2979
2524	sub cfg_load {	2980	sub cfg_load {
2525	open my $fh, "<:utf8", cf::confdir . "/config"	2981	open my $fh, "<:utf8", "$CONFDIR/config"
2526	or return;	2982	or return;
2527		2983
2528	local $/;	2984	local $/;
2529	*CFG = YAML::Syck::Load <$fh>;	2985	*CFG = YAML::Syck::Load <$fh>;
2530		2986
…		…
2575	},	3031	},
2576	);	3032	);
2577	}	3033	}
2578	}	3034	}
2579		3035
		3036	sub write_runtime {
		3037	my $runtime = "$LOCALDIR/runtime";
		3038
		3039	# first touch the runtime file to show we are still running:
		3040	# the fsync below can take a very very long time.
		3041
		3042	IO::AIO::aio_utime $runtime, undef, undef;
		3043
		3044	my $guard = cf::lock_acquire "write_runtime";
		3045
		3046	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
		3047	or return;
		3048
		3049	my $value = $cf::RUNTIME + 90 + 10;
		3050	# 10 is the runtime save interval, for a monotonic clock
		3051	# 60 allows for the watchdog to kill the server.
		3052
		3053	(aio_write $fh, 0, (length $value), $value, 0) <= 0
		3054	and return;
		3055
		3056	# always fsync - this file is important
		3057	aio_fsync $fh
		3058	and return;
		3059
		3060	# touch it again to show we are up-to-date
		3061	aio_utime $fh, undef, undef;
		3062
		3063	close $fh
		3064	or return;
		3065
		3066	aio_rename "$runtime~", $runtime
		3067	and return;
		3068
		3069	warn "runtime file written.\n";
		3070
		3071	1
		3072	}
		3073
2580	sub emergency_save() {	3074	sub emergency_save() {
2581	my $freeze_guard = cf::freeze_mainloop;	3075	my $freeze_guard = cf::freeze_mainloop;
2582		3076
2583	warn "enter emergency perl save\n";	3077	warn "enter emergency perl save\n";
2584		3078
…		…
2659	%EXT_CORO = ();	3153	%EXT_CORO = ();
2660		3154
2661	warn "removing commands";	3155	warn "removing commands";
2662	%COMMAND = ();	3156	%COMMAND = ();
2663		3157
2664	warn "removing ext commands";	3158	warn "removing ext/exti commands";
2665	%EXTCMD = ();	3159	%EXTCMD = ();
		3160	%EXTICMD = ();
2666		3161
2667	warn "unloading/nuking all extensions";	3162	warn "unloading/nuking all extensions";
2668	for my $pkg (@EXTS) {	3163	for my $pkg (@EXTS) {
2669	warn "... unloading $pkg";	3164	warn "... unloading $pkg";
2670		3165
…		…
2700	Symbol::delete_package "safe::$_"	3195	Symbol::delete_package "safe::$_"
2701	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	3196	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2702		3197
2703	warn "unloading cf.pm \"a bit\"";	3198	warn "unloading cf.pm \"a bit\"";
2704	delete $INC{"cf.pm"};	3199	delete $INC{"cf.pm"};
		3200	delete $INC{"cf/pod.pm"};
2705		3201
2706	# don't, removes xs symbols, too,	3202	# don't, removes xs symbols, too,
2707	# and global variables created in xs	3203	# and global variables created in xs
2708	#Symbol::delete_package __PACKAGE__;	3204	#Symbol::delete_package __PACKAGE__;
2709		3205
…		…
2787	my $signal = new Coro::Signal;	3283	my $signal = new Coro::Signal;
2788	push @WAIT_FOR_TICK_BEGIN, $signal;	3284	push @WAIT_FOR_TICK_BEGIN, $signal;
2789	$signal->wait;	3285	$signal->wait;
2790	}	3286	}
2791		3287
		3288	my $min = 1e6;#d#
		3289	my $avg = 10;
2792	$TICK_WATCHER = Event->timer (	3290	$TICK_WATCHER = Event->timer (
2793	reentrant => 0,	3291	reentrant => 0,
2794	parked => 1,	3292	parked => 1,
2795	prio => 0,	3293	prio => 0,
2796	at => $NEXT_TICK || $TICK,	3294	at => $NEXT_TICK || $TICK,
…		…
2800	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	3298	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2801	unless ++$bug_warning > 10;	3299	unless ++$bug_warning > 10;
2802	return;	3300	return;
2803	}	3301	}
2804		3302
2805	$NOW = Event::time;	3303	$NOW = $tick_start = Event::time;
2806		3304
2807	cf::server_tick; # one server iteration	3305	cf::server_tick; # one server iteration
		3306
		3307	0 && sync_job {#d#
		3308	for(1..10) {
		3309	my $t = Event::time;
		3310	my $map = my $map = new_from_path cf::map "/tmp/x.map"
		3311	or die;
		3312
		3313	$map->width (50);
		3314	$map->height (50);
		3315	$map->alloc;
		3316	$map->_load_objects ("/tmp/x.map", 1);
		3317	my $t = Event::time - $t;
		3318
		3319	#next unless $t < 0.0013;#d#
		3320	if ($t < $min) {
		3321	$min = $t;
		3322	}
		3323	$avg = $avg * 0.99 + $t * 0.01;
		3324	}
		3325	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
		3326	exit 0;
		3327	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
		3328	};
2808		3329
2809	$RUNTIME += $TICK;	3330	$RUNTIME += $TICK;
2810	$NEXT_TICK += $TICK;	3331	$NEXT_TICK += $TICK;
2811		3332
2812	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3333	if ($NOW >= $NEXT_RUNTIME_WRITE) {
…		…
2818	}	3339	}
2819		3340
2820	# my $AFTER = Event::time;	3341	# my $AFTER = Event::time;
2821	# warn $AFTER - $NOW;#d#	3342	# warn $AFTER - $NOW;#d#
2822		3343
		3344	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
		3345	$sig->send;
		3346	}
		3347	while (my $sig = shift @WAIT_FOR_TICK) {
		3348	$sig->send;
		3349	}
		3350
		3351	$NOW = Event::time;
		3352
2823	# if we are delayed by four ticks or more, skip them all	3353	# if we are delayed by four ticks or more, skip them all
2824	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;	3354	$NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2825		3355
2826	$TICK_WATCHER->at ($NEXT_TICK);	3356	$TICK_WATCHER->at ($NEXT_TICK);
2827	$TICK_WATCHER->start;	3357	$TICK_WATCHER->start;
2828		3358
2829	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3359	$LOAD = ($NOW - $tick_start) / $TICK;
2830	$sig->send;	3360	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2831	}
2832	while (my $sig = shift @WAIT_FOR_TICK) {
2833	$sig->send;
2834	}
2835		3361
2836	_post_tick;	3362	_post_tick;
		3363
		3364
2837	},	3365	},
2838	);	3366	);
2839		3367
2840	{	3368	{
2841	BDB::max_poll_time $TICK * 0.1;	3369	BDB::max_poll_time $TICK * 0.1;
…		…
2869		3397
2870	cf::sync_job {	3398	cf::sync_job {
2871	eval {	3399	eval {
2872	BDB::db_env_open	3400	BDB::db_env_open
2873	$DB_ENV,	3401	$DB_ENV,
2874	$BDB_ENV_DIR,	3402	$BDBDIR,
2875	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN	3403	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2876	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,	3404	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2877	0666;	3405	0666;
2878		3406
2879	cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;	3407	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2880		3408
2881	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);	3409	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2882	$DB_ENV->set_lk_detect;	3410	$DB_ENV->set_lk_detect;
2883	};	3411	};
2884		3412
…		…
2900	prio => 6,	3428	prio => 6,
2901	cb => \&IO::AIO::poll_cb,	3429	cb => \&IO::AIO::poll_cb,
2902	);	3430	);
2903	}	3431	}
2904		3432
		3433	my $_log_backtrace;
		3434
		3435	sub _log_backtrace {
		3436	my ($msg, @addr) = @_;
		3437
		3438	$msg =~ s/\n//;
		3439
		3440	# limit the # of concurrent backtraces
		3441	if ($_log_backtrace < 2) {
		3442	++$_log_backtrace;
		3443	async {
		3444	my @bt = fork_call {
		3445	@addr = map { sprintf "%x", $_ } @addr;
		3446	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
		3447	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
		3448	or die "addr2line: $!";
		3449
		3450	my @funcs;
		3451	my @res = <$fh>;
		3452	chomp for @res;
		3453	while (@res) {
		3454	my ($func, $line) = splice @res, 0, 2, ();
		3455	push @funcs, "[$func] $line";
		3456	}
		3457
		3458	@funcs
		3459	};
		3460
		3461	LOG llevInfo, "[ABT] $msg\n";
		3462	LOG llevInfo, "[ABT] $_\n" for @bt;
		3463	--$_log_backtrace;
		3464	};
		3465	} else {
		3466	LOG llevInfo, "[ABT] $msg\n";
		3467	LOG llevInfo, "[ABT] [suppressed]\n";
		3468	}
		3469	}
		3470
2905	# load additional modules	3471	# load additional modules
2906	use cf::pod;	3472	use cf::pod;
2907		3473
2908	END { cf::emergency_save }	3474	END { cf::emergency_save }
2909		3475

Diff Legend

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