ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.222 by root, Tue Mar 6 03:06:00 2007 UTC vs.
Revision 1.313 by root, Sun Jul 22 14:17:58 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.61 ();
		16	use Coro::State;
		17	use Coro::Handle;
14	use Coro::Event;	18	use Coro::Event;
15	use Coro::Timer;	19	use Coro::Timer;
16	use Coro::Signal;	20	use Coro::Signal;
17	use Coro::Semaphore;	21	use Coro::Semaphore;
18	use Coro::AIO;	22	use Coro::AIO;
		23	use Coro::Storable;
19		24
		25	use JSON::XS 1.4 ();
20	use BDB ();	26	use BDB ();
21	use Data::Dumper;	27	use Data::Dumper;
22	use Digest::MD5;	28	use Digest::MD5;
23	use Fcntl;	29	use Fcntl;
		30	use YAML::Syck ();
24	use IO::AIO 2.32 ();	31	use IO::AIO 2.32 ();
25	use YAML::Syck ();
26	use Time::HiRes;	32	use Time::HiRes;
27	use Compress::LZF;	33	use Compress::LZF;
		34	use Digest::MD5 ();
28		35
		36	# configure various modules to our taste
		37	#
		38	$Storable::canonical = 1; # reduce rsync transfers
		39	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
29	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later	40	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
30		41
31	use Event; $Event::Eval = 1; # no idea why this is required, but it is	42	$Event::Eval = 1; # no idea why this is required, but it is
32
33	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34		43
35	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?	44	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
36	$YAML::Syck::ImplicitUnicode = 1;	45	$YAML::Syck::ImplicitUnicode = 1;
37		46
38	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority	47	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
39		48
		49	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
		50
40	our %COMMAND = ();	51	our %COMMAND = ();
41	our %COMMAND_TIME = ();	52	our %COMMAND_TIME = ();
42		53
43	our @EXTS = (); # list of extension package names	54	our @EXTS = (); # list of extension package names
44	our %EXTCMD = ();	55	our %EXTCMD = ();
		56	our %EXTICMD = ();
45	our %EXT_CORO = (); # coroutines bound to extensions	57	our %EXT_CORO = (); # coroutines bound to extensions
46	our %EXT_MAP = (); # pluggable maps	58	our %EXT_MAP = (); # pluggable maps
47		59
		60	our $RELOAD; # number of reloads so far
48	our @EVENT;	61	our @EVENT;
49	our $LIBDIR = datadir . "/ext";
50		62
51	our $TICK = MAX_TIME * 1e-6;	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";
		74
		75	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
52	our $TICK_WATCHER;	76	our $TICK_WATCHER;
53	our $AIO_POLL_WATCHER;	77	our $AIO_POLL_WATCHER;
54	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	78	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
55	our $NEXT_TICK;	79	our $NEXT_TICK;
56	our $NOW;	80	our $NOW;
…		…
65	our $RUNTIME;	89	our $RUNTIME;
66		90
67	our %PLAYER; # all users	91	our %PLAYER; # all users
68	our %MAP; # all maps	92	our %MAP; # all maps
69	our $LINK_MAP; # the special {link} map, which is always available	93	our $LINK_MAP; # the special {link} map, which is always available
70	our $RANDOM_MAPS = cf::localdir . "/random";
71	our $BDB_ENV_DIR = cf::localdir . "/db";
72
73	our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
74	our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
75		94
76	# 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 ∕
77	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	96	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
78		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
79	binmode STDOUT;	102	binmode STDOUT;
80	binmode STDERR;	103	binmode STDERR;
81		104
82	# read virtual server time, if available	105	# read virtual server time, if available
83	unless ($RUNTIME || !-e cf::localdir . "/runtime") {	106	unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
84	open my $fh, "<", cf::localdir . "/runtime"	107	open my $fh, "<", "$LOCALDIR/runtime"
85	or die "unable to read runtime file: $!";	108	or die "unable to read runtime file: $!";
86	$RUNTIME = <$fh> + 0.;	109	$RUNTIME = <$fh> + 0.;
87	}	110	}
88		111
89	mkdir cf::localdir;	112	mkdir $_
90	mkdir cf::localdir . "/" . cf::playerdir;	113	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
91	mkdir cf::localdir . "/" . cf::tmpdir;
92	mkdir cf::localdir . "/" . cf::uniquedir;
93	mkdir $RANDOM_MAPS;
94	mkdir $BDB_ENV_DIR;
95		114
96	our $EMERGENCY_POSITION;	115	our $EMERGENCY_POSITION;
97		116
98	sub cf::map::normalise;	117	sub cf::map::normalise;
99		118
…		…
110	=item $cf::RUNTIME	129	=item $cf::RUNTIME
111		130
112	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
113	every server tick.	132	every server tick.
114		133
115	=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
116		137
117	The perl library directory, where extensions and cf-specific modules can	138	Various directories - "/etc", read-only install directory, perl-library
118	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.
119		142
120	=item $cf::NOW	143	=item $cf::NOW
121		144
122	The time of the last (current) server tick.	145	The time of the last (current) server tick.
123		146
124	=item $cf::TICK	147	=item $cf::TICK
125		148
126	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.
127		160
128	=item %cf::CFG	161	=item %cf::CFG
129		162
130	Configuration for the server, loaded from C</etc/crossfire/config>, or	163	Configuration for the server, loaded from C</etc/crossfire/config>, or
131	from wherever your confdir points to.	164	from wherever your confdir points to.
132		165
133	=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE	166	=item cf::wait_for_tick, cf::wait_for_tick_begin
134		167
135	These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)	168	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
136	or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick	169	returns directly I<after> the tick processing (and consequently, can only wake one process
137	processing has been done. Call C<< ->wait >> on them to maximise the	170	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
138	window of cpu time available, or simply to synchronise to the server tick.	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.
139		177
140	=back	178	=back
141		179
142	=cut	180	=cut
143		181
144	BEGIN {	182	BEGIN {
145	*CORE::GLOBAL::warn = sub {	183	*CORE::GLOBAL::warn = sub {
146	my $msg = join "", @_;	184	my $msg = join "", @_;
147	utf8::encode $msg;
148		185
149	$msg .= "\n"	186	$msg .= "\n"
150	unless $msg =~ /\n$/;	187	unless $msg =~ /\n$/;
151		188
		189	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
		190
		191	utf8::encode $msg;
152	LOG llevError, $msg;	192	LOG llevError, $msg;
153	};	193	};
154	}	194	}
155		195
156	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	196	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
157	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	197	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
158	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	198	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
159	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	199	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
160	@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';
161	@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)
162		203
163	# 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
164	# within the Safe compartment.	205	# within the Safe compartment.
165	for my $pkg (qw(	206	for my $pkg (qw(
166	cf::global cf::attachable	207	cf::global cf::attachable
…		…
174	}	215	}
175		216
176	$Event::DIED = sub {	217	$Event::DIED = sub {
177	warn "error in event callback: @_";	218	warn "error in event callback: @_";
178	};	219	};
		220
		221	#############################################################################
179		222
180	=head2 UTILITY FUNCTIONS	223	=head2 UTILITY FUNCTIONS
181		224
182	=over 4	225	=over 4
183		226
…		…
202	$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;
203	$d	246	$d
204	} || "[unable to dump $_[0]: '$@']";	247	} || "[unable to dump $_[0]: '$@']";
205	}	248	}
206		249
207	use JSON::Syck (); # TODO# replace by JSON::PC once working
208
209	=item $ref = cf::from_json $json	250	=item $ref = cf::from_json $json
210		251
211	Converts a JSON string into the corresponding perl data structure.	252	Converts a JSON string into the corresponding perl data structure.
212		253
213	=cut
214
215	sub from_json($) {
216	$JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
217	JSON::Syck::Load $_[0]
218	}
219
220	=item $json = cf::to_json $ref	254	=item $json = cf::to_json $ref
221		255
222	Converts a perl data structure into its JSON representation.	256	Converts a perl data structure into its JSON representation.
223		257
224	=cut	258	=cut
225		259
226	sub to_json($) {	260	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
227	$JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs	261
228	JSON::Syck::Dump $_[0]	262	sub to_json ($) { $json_coder->encode ($_[0]) }
229	}	263	sub from_json ($) { $json_coder->decode ($_[0]) }
230		264
231	=item cf::lock_wait $string	265	=item cf::lock_wait $string
232		266
233	Wait until the given lock is available. See cf::lock_acquire.	267	Wait until the given lock is available. See cf::lock_acquire.
234		268
…		…
240	returned.	274	returned.
241		275
242	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
243	uses map_find and cf::map::load uses map_load).	277	uses map_find and cf::map::load uses map_load).
244		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
245	=cut	283	=cut
246		284
247	our %LOCK;	285	our %LOCK;
248		286
249	sub lock_wait($) {	287	sub lock_wait($) {
…		…
266		304
267	Coro::guard {	305	Coro::guard {
268	# wake up all waiters, to be on the safe side	306	# wake up all waiters, to be on the safe side
269	$_->ready for @{ delete $LOCK{$key} };	307	$_->ready for @{ delete $LOCK{$key} };
270	}	308	}
		309	}
		310
		311	sub lock_active($) {
		312	my ($key) = @_;
		313
		314	! ! $LOCK{$key}
271	}	315	}
272		316
273	sub freeze_mainloop {	317	sub freeze_mainloop {
274	return unless $TICK_WATCHER->is_active;	318	return unless $TICK_WATCHER->is_active;
275		319
…		…
290		334
291	BEGIN { *async = \&Coro::async_pool }	335	BEGIN { *async = \&Coro::async_pool }
292		336
293	=item cf::sync_job { BLOCK }	337	=item cf::sync_job { BLOCK }
294		338
295	The design of crossfire+ requires that the main coro ($Coro::main) is	339	The design of Crossfire TRT requires that the main coroutine ($Coro::main)
296	always able to handle events or runnable, as crossfire+ is only partly	340	is always able to handle events or runnable, as Crossfire TRT is only
297	reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable.	341	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
		342	acceptable.
298		343
299	If it must be done, put the blocking parts into C<sync_job>. This will run	344	If it must be done, put the blocking parts into C<sync_job>. This will run
300	the given BLOCK in another coroutine while waiting for the result. The	345	the given BLOCK in another coroutine while waiting for the result. The
301	server will be frozen during this time, so the block should either finish	346	server will be frozen during this time, so the block should either finish
302	fast or be very important.	347	fast or be very important.
…		…
305		350
306	sub sync_job(&) {	351	sub sync_job(&) {
307	my ($job) = @_;	352	my ($job) = @_;
308		353
309	if ($Coro::current == $Coro::main) {	354	if ($Coro::current == $Coro::main) {
		355	my $time = Event::time;
		356
310	# this is the main coro, too bad, we have to block	357	# this is the main coro, too bad, we have to block
311	# till the operation succeeds, freezing the server :/	358	# till the operation succeeds, freezing the server :/
312		359
313	# TODO: use suspend/resume instead	360	# TODO: use suspend/resume instead
314	# (but this is cancel-safe)	361	# (but this is cancel-safe)
…		…
325		372
326	while ($busy) {	373	while ($busy) {
327	Coro::cede or Event::one_event;	374	Coro::cede or Event::one_event;
328	}	375	}
329		376
		377	$time = Event::time - $time;
		378
		379	LOG llevError | logBacktrace, Carp::longmess "long sync job"
		380	if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
		381
		382	$tick_start += $time; # do not account sync jobs to server load
		383
330	wantarray ? @res : $res[0]	384	wantarray ? @res : $res[0]
331	} else {	385	} else {
332	# we are in another coroutine, how wonderful, everything just works	386	# we are in another coroutine, how wonderful, everything just works
333		387
334	$job->()	388	$job->()
…		…
353	$EXT_CORO{$coro+0} = $coro;	407	$EXT_CORO{$coro+0} = $coro;
354		408
355	$coro	409	$coro
356	}	410	}
357		411
358	sub write_runtime {	412	=item fork_call { }, $args
359	my $guard = cf::lock_acquire "write_runtime";
360		413
361	my $runtime = cf::localdir . "/runtime";	414	Executes the given code block with the given arguments in a seperate
		415	process, returning the results. Everything must be serialisable with
		416	Coro::Storable. May, of course, block. Note that the executed sub may
		417	never block itself or use any form of Event handling.
362		418
363	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644	419	=cut
364	or return;
365		420
366	my $value = $cf::RUNTIME + 90 + 10;	421	sub _store_scalar {
367	# 10 is the runtime save interval, for a monotonic clock	422	open my $fh, ">", \my $buf
368	# 60 allows for the watchdog to kill the server.	423	or die "fork_call: cannot open fh-to-buf in child : $!";
369		424	Storable::store_fd $_[0], $fh;
370	(aio_write $fh, 0, (length $value), $value, 0) <= 0
371	and return;
372
373	# always fsync - this file is important
374	aio_fsync $fh
375	and return;
376
377	close $fh	425	close $fh;
378	or return;
379		426
380	aio_rename "$runtime~", $runtime	427	$buf
381	and return;	428	}
382		429
		430	sub fork_call(&@) {
		431	my ($cb, @args) = @_;
		432
		433	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
		434	# or die "socketpair: $!";
		435	pipe my $fh1, my $fh2
		436	or die "pipe: $!";
		437
		438	if (my $pid = fork) {
		439	close $fh2;
		440
		441	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
		442	warn "pst<$res>" unless $res =~ /^pst/;
		443	$res = Coro::Storable::thaw $res;
		444
		445	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
		446
		447	Carp::confess $$res unless "ARRAY" eq ref $res;
		448
		449	return wantarray ? @$res : $res->[-1];
		450	} else {
		451	reset_signals;
		452	local $SIG{__WARN__};
		453	local $SIG{__DIE__};
		454	# just in case, this hack effectively disables event
		455	# in the child. cleaner and slower would be canceling all watchers,
		456	# but this works for the time being.
		457	local $Coro::idle;
		458	$Coro::current->prio (Coro::PRIO_MAX);
		459
		460	eval {
		461	close $fh1;
		462
		463	my @res = eval { $cb->(@args) };
		464
		465	syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
		466	close $fh2;
		467	};
		468
		469	warn $@ if $@;
		470	_exit 0;
383	1	471	}
		472	}
		473
		474	=item $value = cf::db_get $family => $key
		475
		476	Returns a single value from the environment database.
		477
		478	=item cf::db_put $family => $key => $value
		479
		480	Stores the given C<$value> in the family. It can currently store binary
		481	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
		482
		483	=cut
		484
		485	our $DB;
		486
		487	sub db_init {
		488	unless ($DB) {
		489	$DB = BDB::db_create $DB_ENV;
		490
		491	cf::sync_job {
		492	eval {
		493	$DB->set_flags (BDB::CHKSUM);
		494
		495	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
		496	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
		497	cf::cleanup "db_open(db): $!" if $!;
		498	};
		499	cf::cleanup "db_open(db): $@" if $@;
		500	};
		501	}
		502	}
		503
		504	sub db_get($$) {
		505	my $key = "$_[0]/$_[1]";
		506
		507	cf::sync_job {
		508	BDB::db_get $DB, undef, $key, my $data;
		509
		510	$! ? ()
		511	: $data
		512	}
		513	}
		514
		515	sub db_put($$$) {
		516	BDB::dbreq_pri 4;
		517	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
		518	}
		519
		520	=item cf::cache $id => [$paths...], $processversion => $process
		521
		522	Generic caching function that returns the value of the resource $id,
		523	caching and regenerating as required.
		524
		525	This function can block.
		526
		527	=cut
		528
		529	sub cache {
		530	my ($id, $src, $processversion, $process) = @_;
		531
		532	my $meta =
		533	join "\x00",
		534	$processversion,
		535	map {
		536	aio_stat $_
		537	and Carp::croak "$_: $!";
		538
		539	($_, (stat _)[7,9])
		540	} @$src;
		541
		542	my $dbmeta = db_get cache => "$id/meta";
		543	if ($dbmeta ne $meta) {
		544	# changed, we may need to process
		545
		546	my @data;
		547	my $md5;
		548
		549	for (0 .. $#$src) {
		550	0 <= aio_load $src->[$_], $data[$_]
		551	or Carp::croak "$src->[$_]: $!";
		552	}
		553
		554	# if processing is expensive, check
		555	# checksum first
		556	if (1) {
		557	$md5 =
		558	join "\x00",
		559	$processversion,
		560	map {
		561	Coro::cede;
		562	($src->[$_], Digest::MD5::md5_hex $data[$_])
		563	} 0.. $#$src;
		564
		565
		566	my $dbmd5 = db_get cache => "$id/md5";
		567	if ($dbmd5 eq $md5) {
		568	db_put cache => "$id/meta", $meta;
		569
		570	return db_get cache => "$id/data";
		571	}
		572	}
		573
		574	my $t1 = Time::HiRes::time;
		575	my $data = $process->(\@data);
		576	my $t2 = Time::HiRes::time;
		577
		578	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
		579
		580	db_put cache => "$id/data", $data;
		581	db_put cache => "$id/md5" , $md5;
		582	db_put cache => "$id/meta", $meta;
		583
		584	return $data;
		585	}
		586
		587	db_get cache => "$id/data"
		588	}
		589
		590	=item cf::datalog type => key => value, ...
		591
		592	Log a datalog packet of the given type with the given key-value pairs.
		593
		594	=cut
		595
		596	sub datalog($@) {
		597	my ($type, %kv) = @_;
		598	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
384	}	599	}
385		600
386	=back	601	=back
387		602
388	=cut	603	=cut
…		…
395	attach callbacks/event handlers (a collection of which is called an "attachment")	610	attach callbacks/event handlers (a collection of which is called an "attachment")
396	to it. All such attachable objects support the following methods.	611	to it. All such attachable objects support the following methods.
397		612
398	In the following description, CLASS can be any of C<global>, C<object>	613	In the following description, CLASS can be any of C<global>, C<object>
399	C<player>, C<client> or C<map> (i.e. the attachable objects in	614	C<player>, C<client> or C<map> (i.e. the attachable objects in
400	crossfire+).	615	Crossfire TRT).
401		616
402	=over 4	617	=over 4
403		618
404	=item $attachable->attach ($attachment, key => $value...)	619	=item $attachable->attach ($attachment, key => $value...)
405		620
…		…
568	$registry = $CB_TYPE[$object_type] ||= [];	783	$registry = $CB_TYPE[$object_type] ||= [];
569		784
570	} elsif ($type eq "subtype") {	785	} elsif ($type eq "subtype") {
571	defined $object_type or Carp::croak "subtype specified without type";	786	defined $object_type or Carp::croak "subtype specified without type";
572	my $object_subtype = shift @arg;	787	my $object_subtype = shift @arg;
573	$registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= [];	788	$registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
574		789
575	} elsif ($type eq "package") {	790	} elsif ($type eq "package") {
576	my $pkg = shift @arg;	791	my $pkg = shift @arg;
577		792
578	while (my ($name, $id) = each %cb_id) {	793	while (my ($name, $id) = each %cb_id) {
…		…
607	_attach $registry, $klass, @attach;	822	_attach $registry, $klass, @attach;
608	}	823	}
609		824
610	$obj->{$name} = \%arg;	825	$obj->{$name} = \%arg;
611	} else {	826	} else {
612	warn "object uses attachment '$name' that is not available, postponing.\n";	827	warn "object uses attachment '$name' which is not available, postponing.\n";
613	}	828	}
614		829
615	$obj->{_attachment}{$name} = undef;	830	$obj->{_attachment}{$name} = undef;
616	}	831	}
617		832
…		…
619	if (ref $_[0]) {	834	if (ref $_[0]) {
620	_object_attach @_;	835	_object_attach @_;
621	} else {	836	} else {
622	_attach shift->_attach_registry, @_;	837	_attach shift->_attach_registry, @_;
623	}	838	}
		839	_recalc_want;
624	};	840	};
625		841
626	# all those should be optimised	842	# all those should be optimised
627	sub cf::attachable::detach {	843	sub cf::attachable::detach {
628	my ($obj, $name) = @_;	844	my ($obj, $name) = @_;
…		…
631	delete $obj->{_attachment}{$name};	847	delete $obj->{_attachment}{$name};
632	reattach ($obj);	848	reattach ($obj);
633	} else {	849	} else {
634	Carp::croak "cannot, currently, detach class attachments";	850	Carp::croak "cannot, currently, detach class attachments";
635	}	851	}
		852	_recalc_want;
636	};	853	};
637		854
638	sub cf::attachable::attached {	855	sub cf::attachable::attached {
639	my ($obj, $name) = @_;	856	my ($obj, $name) = @_;
640		857
…		…
655	";	872	";
656	die if $@;	873	die if $@;
657	}	874	}
658		875
659	our $override;	876	our $override;
660	our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?	877	our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
661		878
662	sub override {	879	sub override {
663	$override = 1;	880	$override = 1;
664	@invoke_results = ();	881	@INVOKE_RESULTS = (@_);
665	}	882	}
666		883
667	sub do_invoke {	884	sub do_invoke {
668	my $event = shift;	885	my $event = shift;
669	my $callbacks = shift;	886	my $callbacks = shift;
670		887
671	@invoke_results = ();	888	@INVOKE_RESULTS = ();
672		889
673	local $override;	890	local $override;
674		891
675	for (@$callbacks) {	892	for (@$callbacks) {
676	eval { &{$_->[1]} };	893	eval { &{$_->[1]} };
…		…
693		910
694	Generate an object-specific event with the given arguments.	911	Generate an object-specific event with the given arguments.
695		912
696	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be	913	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
697	removed in future versions), and there is no public API to access override	914	removed in future versions), and there is no public API to access override
698	results (if you must, access C<@cf::invoke_results> directly).	915	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
699		916
700	=back	917	=back
701		918
702	=cut	919	=cut
703		920
704	#############################################################################	921	#############################################################################
705	# object support	922	# object support
		923	#
		924
		925	sub _can_merge {
		926	my ($ob1, $ob2) = @_;
		927
		928	local $Storable::canonical = 1;
		929	my $fob1 = Storable::freeze $ob1;
		930	my $fob2 = Storable::freeze $ob2;
		931
		932	$fob1 eq $fob2
		933	}
706		934
707	sub reattach {	935	sub reattach {
708	# basically do the same as instantiate, without calling instantiate	936	# basically do the same as instantiate, without calling instantiate
709	my ($obj) = @_;	937	my ($obj) = @_;
710		938
…		…
813	or return;	1041	or return;
814	$av = eval { (Storable::thaw $av)->{objs} };	1042	$av = eval { (Storable::thaw $av)->{objs} };
815	}	1043	}
816		1044
817	warn sprintf "loading %s (%d)\n",	1045	warn sprintf "loading %s (%d)\n",
818	$filename, length $data, scalar @{$av || []};#d#	1046	$filename, length $data, scalar @{$av || []};
819	return ($data, $av);	1047	return ($data, $av);
820	}	1048	}
		1049
		1050	=head2 COMMAND CALLBACKS
		1051
		1052	=over 4
		1053
		1054	=cut
821		1055
822	#############################################################################	1056	#############################################################################
823	# command handling &c	1057	# command handling &c
824		1058
825	=item cf::register_command $name => \&callback($ob,$args);	1059	=item cf::register_command $name => \&callback($ob,$args);
…		…
838	push @{ $COMMAND{$name} }, [$caller, $cb];	1072	push @{ $COMMAND{$name} }, [$caller, $cb];
839	}	1073	}
840		1074
841	=item cf::register_extcmd $name => \&callback($pl,$packet);	1075	=item cf::register_extcmd $name => \&callback($pl,$packet);
842		1076
843	Register a callbackf ro execution when the client sends an extcmd packet.	1077	Register a callback for execution when the client sends an (synchronous)
		1078	extcmd packet. Ext commands will be processed in the order they are
		1079	received by the server, like other user commands. The first argument is
		1080	the logged-in player. Ext commands can only be processed after a player
		1081	has logged in successfully.
844		1082
845	If the callback returns something, it is sent back as if reply was being	1083	If the callback returns something, it is sent back as if reply was being
846	called.	1084	called.
847		1085
		1086	=item cf::register_exticmd $name => \&callback($ns,$packet);
		1087
		1088	Register a callback for execution when the client sends an (asynchronous)
		1089	exticmd packet. Exti commands are processed by the server as soon as they
		1090	are received, i.e. out of order w.r.t. other commands. The first argument
		1091	is a client socket. Exti commands can be received anytime, even before
		1092	log-in.
		1093
		1094	If the callback returns something, it is sent back as if reply was being
		1095	called.
		1096
848	=cut	1097	=cut
849		1098
850	sub register_extcmd {	1099	sub register_extcmd {
851	my ($name, $cb) = @_;	1100	my ($name, $cb) = @_;
852		1101
853	$EXTCMD{$name} = $cb;	1102	$EXTCMD{$name} = $cb;
		1103	}
		1104
		1105	sub register_exticmd {
		1106	my ($name, $cb) = @_;
		1107
		1108	$EXTICMD{$name} = $cb;
854	}	1109	}
855		1110
856	cf::player->attach (	1111	cf::player->attach (
857	on_command => sub {	1112	on_command => sub {
858	my ($pl, $name, $params) = @_;	1113	my ($pl, $name, $params) = @_;
…		…
867	cf::override;	1122	cf::override;
868	},	1123	},
869	on_extcmd => sub {	1124	on_extcmd => sub {
870	my ($pl, $buf) = @_;	1125	my ($pl, $buf) = @_;
871		1126
872	my $msg = eval { from_json $buf };	1127	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
873		1128
874	if (ref $msg) {	1129	if (ref $msg) {
875	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1130	if (my $cb = $EXTCMD{$msg->{msgtype}}) {
876	if (my %reply = $cb->($pl, $msg)) {	1131	if (my %reply = $cb->($pl, $msg)) {
877	$pl->ext_reply ($msg->{msgid}, %reply);	1132	$pl->ext_reply ($msg->{msgid}, %reply);
…		…
883		1138
884	cf::override;	1139	cf::override;
885	},	1140	},
886	);	1141	);
887		1142
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 {	1143	sub load_extensions {
		1144	cf::sync_job {
		1145	my %todo;
		1146
923	for my $ext (<$LIBDIR/*.ext>) {	1147	for my $path (<$LIBDIR/*.ext>) {
924	next unless -r $ext;	1148	next unless -r $path;
925	eval {	1149
926	load_extension $ext;	1150	$path =~ /([^\/\\]+)\.ext$/ or die "$path";
		1151	my $base = $1;
		1152	my $pkg = $1;
		1153	$pkg =~ s/[^[:word:]]/_/g;
		1154	$pkg = "ext::$pkg";
		1155
		1156	open my $fh, "<:utf8", $path
		1157	or die "$path: $!";
		1158
		1159	my $source = do { local $/; <$fh> };
		1160
		1161	my %ext = (
		1162	path => $path,
		1163	base => $base,
		1164	pkg => $pkg,
		1165	);
		1166
		1167	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
		1168	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
		1169
		1170	$ext{source} =
		1171	"package $pkg; use strict; use utf8;\n"
		1172	. "#line 1 \"$path\"\n{\n"
		1173	. $source
		1174	. "\n};\n1";
		1175
		1176	$todo{$base} = \%ext;
		1177	}
		1178
		1179	my %done;
		1180	while (%todo) {
		1181	my $progress;
		1182
		1183	while (my ($k, $v) = each %todo) {
		1184	for (split /,\s*/, $v->{meta}{depends}) {
		1185	goto skip
		1186	unless exists $done{$_};
		1187	}
		1188
		1189	warn "... loading '$k' into '$v->{pkg}'\n";
		1190
		1191	unless (eval $v->{source}) {
		1192	my $msg = $@ ? "$v->{path}: $@\n"
		1193	: "$v->{base}: extension inactive.\n";
		1194
		1195	if (exists $v->{meta}{mandatory}) {
		1196	warn $msg;
		1197	warn "mandatory extension failed to load, exiting.\n";
		1198	exit 1;
		1199	}
		1200
		1201	warn $msg;
		1202	}
		1203
		1204	$done{$k} = delete $todo{$k};
		1205	push @EXTS, $v->{pkg};
		1206	$progress = 1;
927	1	1207	}
928	} or warn "$ext not loaded: $@";	1208
		1209	skip:
		1210	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
		1211	unless $progress;
		1212	}
929	}	1213	};
930	}	1214	}
931		1215
932	#############################################################################	1216	#############################################################################
933		1217
		1218	=back
		1219
934	=head2 CORE EXTENSIONS	1220	=head2 CORE EXTENSIONS
935		1221
936	Functions and methods that extend core crossfire objects.	1222	Functions and methods that extend core crossfire objects.
937		1223
938	=cut	1224	=cut
…		…
950	Returns the given player object, loading it if necessary (might block).	1236	Returns the given player object, loading it if necessary (might block).
951		1237
952	=cut	1238	=cut
953		1239
954	sub playerdir($) {	1240	sub playerdir($) {
955	cf::localdir	1241	"$PLAYERDIR/"
956	. "/"
957	. cf::playerdir
958	. "/"
959	. (ref $_[0] ? $_[0]->ob->name : $_[0])	1242	. (ref $_[0] ? $_[0]->ob->name : $_[0])
960	}	1243	}
961		1244
962	sub path($) {	1245	sub path($) {
963	my $login = ref $_[0] ? $_[0]->ob->name : $_[0];	1246	my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
964		1247
965	(playerdir $login) . "/$login.pl"	1248	(playerdir $login) . "/playerdata"
966	}	1249	}
967		1250
968	sub find_active($) {	1251	sub find_active($) {
969	$cf::PLAYER{$_[0]}	1252	$cf::PLAYER{$_[0]}
970	and $cf::PLAYER{$_[0]}->active	1253	and $cf::PLAYER{$_[0]}->active
…		…
983	my $login = $_[0];	1266	my $login = $_[0];
984		1267
985	my $guard = cf::lock_acquire "user_find:$login";	1268	my $guard = cf::lock_acquire "user_find:$login";
986		1269
987	$cf::PLAYER{$_[0]} || do {	1270	$cf::PLAYER{$_[0]} || do {
		1271	# rename old playerfiles to new ones
		1272	#TODO: remove when no longer required
		1273	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
		1274	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
		1275	aio_unlink +(playerdir $login) . "/$login.pl.pst";
		1276	aio_unlink +(playerdir $login) . "/$login.pl";
		1277
988	my $pl = load_pl path $login	1278	my $pl = load_pl path $login
989	or return;	1279	or return;
990	$cf::PLAYER{$login} = $pl	1280	$cf::PLAYER{$login} = $pl
991	}	1281	}
992	}	1282	}
…		…
1076	while and may block, so not sync_job-capable, ever.	1366	while and may block, so not sync_job-capable, ever.
1077		1367
1078	=cut	1368	=cut
1079		1369
1080	sub list_logins {	1370	sub list_logins {
1081	my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir	1371	my $dirs = aio_readdir $PLAYERDIR
1082	or return [];	1372	or return [];
1083		1373
1084	my @logins;	1374	my @logins;
1085		1375
1086	for my $login (@$dirs) {	1376	for my $login (@$dirs) {
…		…
1121	}	1411	}
1122		1412
1123	\@paths	1413	\@paths
1124	}	1414	}
1125		1415
		1416	=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
		1417
		1418	Expand crossfire pod fragments into protocol xml.
		1419
		1420	=cut
		1421
		1422	sub expand_cfpod {
		1423	((my $self), (local $_)) = @_;
		1424
		1425	# escape & and <
		1426	s/&/&amp;/g;
		1427	s/(?<![BIUGH])</&lt;/g;
		1428
		1429	# this is buggy, it needs to properly take care of nested <'s
		1430
		1431	1 while
		1432	# replace B<>, I<>, U<> etc.
		1433	s/B<([^\>]*)>/<b>$1<\/b>/
		1434	|| s/I<([^\>]*)>/<i>$1<\/i>/
		1435	|| s/U<([^\>]*)>/<u>$1<\/u>/
		1436	# replace G<male|female> tags
		1437	|| s{G<([^>|]*)\|([^>]*)>}{
		1438	$self->gender ? $2 : $1
		1439	}ge
		1440	# replace H<hint text>
		1441	|| s{H<([^\>]*)>}
		1442	{
		1443	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
		1444	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
		1445	"")
		1446	[$self->{hintmode}]
		1447	}ge;
		1448
		1449	# create single paragraphs (very hackish)
		1450	s/(?<=\S)\n(?=\w)/ /g;
		1451
		1452	# compress some whitespace
		1453	s/\s+\n/\n/g; # ws line-ends
		1454	s/\n\n+/\n/g; # double lines
		1455	s/^\n+//; # beginning lines
		1456	s/\n+$//; # ending lines
		1457
		1458	$_
		1459	}
		1460
		1461	sub hintmode {
		1462	$_[0]{hintmode} = $_[1] if @_ > 1;
		1463	$_[0]{hintmode}
		1464	}
		1465
1126	=item $player->ext_reply ($msgid, $msgtype, %msg)	1466	=item $player->ext_reply ($msgid, %msg)
1127		1467
1128	Sends an ext reply to the player.	1468	Sends an ext reply to the player.
1129		1469
1130	=cut	1470	=cut
1131		1471
1132	sub ext_reply($$$%) {	1472	sub ext_reply($$%) {
1133	my ($self, $id, %msg) = @_;	1473	my ($self, $id, %msg) = @_;
1134		1474
1135	$msg{msgid} = $id;	1475	$msg{msgid} = $id;
1136		1476	$self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1137	$self->send ("ext " . cf::to_json \%msg);
1138	}	1477	}
1139		1478
1140	package cf;	1479	=item $player->ext_event ($type, %msg)
		1480
		1481	Sends an ext event to the client.
		1482
		1483	=cut
		1484
		1485	sub ext_event($$%) {
		1486	my ($self, $type, %msg) = @_;
		1487
		1488	$self->ns->ext_event ($type, %msg);
		1489	}
		1490
		1491	=head3 cf::region
		1492
		1493	=over 4
		1494
		1495	=cut
		1496
		1497	package cf::region;
		1498
		1499	=item cf::region::find_by_path $path
		1500
		1501	Tries to decuce the likely region for a map knowing only its path.
		1502
		1503	=cut
		1504
		1505	sub find_by_path($) {
		1506	my ($path) = @_;
		1507
		1508	my ($match, $specificity);
		1509
		1510	for my $region (list) {
		1511	if ($region->{match} && $path =~ $region->{match}) {
		1512	($match, $specificity) = ($region, $region->specificity)
		1513	if $region->specificity > $specificity;
		1514	}
		1515	}
		1516
		1517	$match
		1518	}
1141		1519
1142	=back	1520	=back
1143
1144		1521
1145	=head3 cf::map	1522	=head3 cf::map
1146		1523
1147	=over 4	1524	=over 4
1148		1525
…		…
1203	my ($self, $merge) = @_;	1580	my ($self, $merge) = @_;
1204		1581
1205	# we have to keep some variables in memory intact	1582	# we have to keep some variables in memory intact
1206	local $self->{path};	1583	local $self->{path};
1207	local $self->{load_path};	1584	local $self->{load_path};
1208	local $self->{deny_save};
1209	local $self->{deny_reset};
1210		1585
1211	$self->SUPER::thawer_merge ($merge);	1586	$self->SUPER::thawer_merge ($merge);
1212	}	1587	}
1213		1588
1214	sub normalise {	1589	sub normalise {
…		…
1261	$self->init; # pass $1 etc.	1636	$self->init; # pass $1 etc.
1262	return $self;	1637	return $self;
1263	}	1638	}
1264	}	1639	}
1265		1640
1266	Carp::carp "unable to resolve path '$path' (base '$base').";	1641	Carp::cluck "unable to resolve path '$path' (base '$base').";
1267	()	1642	()
1268	}	1643	}
1269		1644
1270	sub init {	1645	sub init {
1271	my ($self) = @_;	1646	my ($self) = @_;
…		…
1286		1661
1287	# the original (read-only) location	1662	# the original (read-only) location
1288	sub load_path {	1663	sub load_path {
1289	my ($self) = @_;	1664	my ($self) = @_;
1290		1665
1291	sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}	1666	"$MAPDIR/$self->{path}.map"
1292	}	1667	}
1293		1668
1294	# the temporary/swap location	1669	# the temporary/swap location
1295	sub save_path {	1670	sub save_path {
1296	my ($self) = @_;	1671	my ($self) = @_;
1297		1672
1298	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1673	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1299	sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path	1674	"$TMPDIR/$path.map"
1300	}	1675	}
1301		1676
1302	# the unique path, undef == no special unique path	1677	# the unique path, undef == no special unique path
1303	sub uniq_path {	1678	sub uniq_path {
1304	my ($self) = @_;	1679	my ($self) = @_;
1305		1680
1306	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1681	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1307	sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path	1682	"$UNIQUEDIR/$path"
1308	}	1683	}
1309		1684
1310	# and all this just because we cannot iterate over	1685	# and all this just because we cannot iterate over
1311	# all maps in C++...	1686	# all maps in C++...
1312	sub change_all_map_light {	1687	sub change_all_map_light {
1313	my ($change) = @_;	1688	my ($change) = @_;
1314		1689
1315	$_->change_map_light ($change)	1690	$_->change_map_light ($change)
1316	for grep $_->outdoor, values %cf::MAP;	1691	for grep $_->outdoor, values %cf::MAP;
		1692	}
		1693
		1694	sub decay_objects {
		1695	my ($self) = @_;
		1696
		1697	return if $self->{deny_reset};
		1698
		1699	$self->do_decay_objects;
1317	}	1700	}
1318		1701
1319	sub unlink_save {	1702	sub unlink_save {
1320	my ($self) = @_;	1703	my ($self) = @_;
1321		1704
…		…
1379	$self->load_header_orig	1762	$self->load_header_orig
1380	or return;	1763	or return;
1381	$self->prepare_orig;	1764	$self->prepare_orig;
1382	}	1765	}
1383		1766
		1767	$self->{deny_reset} = 1
		1768	if $self->no_reset;
		1769
		1770	$self->default_region (cf::region::find_by_path $self->{path})
		1771	unless $self->default_region;
		1772
1384	1	1773	1
1385	}	1774	}
1386		1775
1387	sub find;	1776	sub find;
1388	sub find {	1777	sub find {
…		…
1400	$map->{last_save} = $cf::RUNTIME;	1789	$map->{last_save} = $cf::RUNTIME;
1401		1790
1402	$map->load_header	1791	$map->load_header
1403	or return;	1792	or return;
1404		1793
1405	if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)	1794	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1406	# doing this can freeze the server in a sync job, obviously	1795	# doing this can freeze the server in a sync job, obviously
1407	#$cf::WAIT_FOR_TICK->wait;	1796	#$cf::WAIT_FOR_TICK->wait;
1408	$map->reset;	1797	$map->reset;
1409	undef $guard;	1798	undef $guard;
1410	return find $path;	1799	return find $path;
…		…
1421	my ($self) = @_;	1810	my ($self) = @_;
1422		1811
1423	local $self->{deny_reset} = 1; # loading can take a long time	1812	local $self->{deny_reset} = 1; # loading can take a long time
1424		1813
1425	my $path = $self->{path};	1814	my $path = $self->{path};
		1815
		1816	{
1426	my $guard = cf::lock_acquire "map_load:$path";	1817	my $guard = cf::lock_acquire "map_load:$path";
1427		1818
1428	return if $self->in_memory != cf::MAP_SWAPPED;	1819	return if $self->in_memory != cf::MAP_SWAPPED;
1429		1820
1430	$self->in_memory (cf::MAP_LOADING);	1821	$self->in_memory (cf::MAP_LOADING);
1431		1822
1432	$self->alloc;	1823	$self->alloc;
1433		1824
1434	$self->pre_load;	1825	$self->pre_load;
1435
1436	$self->_load_objects ($self->{load_path}, 1)
1437	or return;
1438
1439	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1440	if delete $self->{load_original};
1441
1442	if (my $uniq = $self->uniq_path) {
1443	utf8::encode $uniq;
1444	if (aio_open $uniq, O_RDONLY, 0) {
1445	$self->clear_unique_items;
1446	$self->_load_objects ($uniq, 0);
1447	}
1448	}
1449
1450	Coro::cede;
1451
1452	# now do the right thing for maps
1453	$self->link_multipart_objects;
1454
1455	unless ($self->{deny_activate}) {
1456	$self->decay_objects;
1457	$self->fix_auto_apply;
1458	$self->update_buttons;
1459	Coro::cede;	1826	Coro::cede;
1460	$self->set_darkness_map;	1827
		1828	$self->_load_objects ($self->{load_path}, 1)
		1829	or return;
		1830
		1831	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
		1832	if delete $self->{load_original};
		1833
		1834	if (my $uniq = $self->uniq_path) {
		1835	utf8::encode $uniq;
		1836	if (aio_open $uniq, O_RDONLY, 0) {
		1837	$self->clear_unique_items;
		1838	$self->_load_objects ($uniq, 0);
		1839	}
		1840	}
		1841
		1842	Coro::cede;
		1843	# now do the right thing for maps
		1844	$self->link_multipart_objects;
1461	$self->difficulty ($self->estimate_difficulty)	1845	$self->difficulty ($self->estimate_difficulty)
1462	unless $self->difficulty;	1846	unless $self->difficulty;
1463	Coro::cede;	1847	Coro::cede;
		1848
		1849	unless ($self->{deny_activate}) {
		1850	$self->decay_objects;
		1851	$self->fix_auto_apply;
		1852	$self->update_buttons;
		1853	Coro::cede;
		1854	$self->set_darkness_map;
		1855	Coro::cede;
1464	$self->activate;	1856	$self->activate;
		1857	}
		1858
		1859	$self->in_memory (cf::MAP_IN_MEMORY);
1465	}	1860	}
1466		1861
1467	$self->post_load;	1862	$self->post_load;
1468
1469	$self->in_memory (cf::MAP_IN_MEMORY);
1470	}	1863	}
1471		1864
1472	sub customise_for {	1865	sub customise_for {
1473	my ($self, $ob) = @_;	1866	my ($self, $ob) = @_;
1474		1867
1475	return find "~" . $ob->name . "/" . $self->{path}	1868	return find "~" . $ob->name . "/" . $self->{path}
1476	if $self->per_player;	1869	if $self->per_player;
		1870
		1871	# return find "?party/" . $ob->name . "/" . $self->{path}
		1872	# if $self->per_party;
1477		1873
1478	$self	1874	$self
1479	}	1875	}
1480		1876
1481	# find and load all maps in the 3x3 area around a map	1877	# find and load all maps in the 3x3 area around a map
…		…
1528		1924
1529	undef $MAP_PREFETCH{$path};	1925	undef $MAP_PREFETCH{$path};
1530	$MAP_PREFETCHER ||= cf::async {	1926	$MAP_PREFETCHER ||= cf::async {
1531	while (%MAP_PREFETCH) {	1927	while (%MAP_PREFETCH) {
1532	for my $path (keys %MAP_PREFETCH) {	1928	for my $path (keys %MAP_PREFETCH) {
1533	my $map = find $path	1929	if (my $map = find $path) {
1534	or next;
1535	$map->load;	1930	$map->load;
		1931	}
1536		1932
1537	delete $MAP_PREFETCH{$path};	1933	delete $MAP_PREFETCH{$path};
1538	}	1934	}
1539	}	1935	}
1540	undef $MAP_PREFETCHER;	1936	undef $MAP_PREFETCHER;
…		…
1592		1988
1593	sub reset_at {	1989	sub reset_at {
1594	my ($self) = @_;	1990	my ($self) = @_;
1595		1991
1596	# TODO: safety, remove and allow resettable per-player maps	1992	# TODO: safety, remove and allow resettable per-player maps
1597	return 1e99 if $self->isa ("ext::map_per_player");#d#
1598	return 1e99 if $self->{deny_reset};	1993	return 1e99 if $self->{deny_reset};
1599		1994
1600	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;	1995	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1601	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;	1996	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1602		1997
…		…
1613	my ($self) = @_;	2008	my ($self) = @_;
1614		2009
1615	my $lock = cf::lock_acquire "map_data:$self->{path}";	2010	my $lock = cf::lock_acquire "map_data:$self->{path}";
1616		2011
1617	return if $self->players;	2012	return if $self->players;
1618	return if $self->isa ("ext::map_per_player");#d#
1619		2013
1620	warn "resetting map ", $self->path;#d#	2014	warn "resetting map ", $self->path;
1621		2015
1622	$self->in_memory (cf::MAP_SWAPPED);	2016	$self->in_memory (cf::MAP_SWAPPED);
1623		2017
1624	# need to save uniques path	2018	# need to save uniques path
1625	unless ($self->{deny_save}) {	2019	unless ($self->{deny_save}) {
…		…
1657	$cf::MAP{$self->path} = $self;	2051	$cf::MAP{$self->path} = $self;
1658		2052
1659	$self->reset; # polite request, might not happen	2053	$self->reset; # polite request, might not happen
1660	}	2054	}
1661		2055
		2056	=item $maps = cf::map::tmp_maps
		2057
		2058	Returns an arrayref with all map paths of currently instantiated and saved
		2059	maps. May block.
		2060
		2061	=cut
		2062
		2063	sub tmp_maps() {
		2064	[
		2065	map {
		2066	utf8::decode $_;
		2067	/\.map$/
		2068	? normalise $_
		2069	: ()
		2070	} @{ aio_readdir $TMPDIR or [] }
		2071	]
		2072	}
		2073
		2074	=item $maps = cf::map::random_maps
		2075
		2076	Returns an arrayref with all map paths of currently instantiated and saved
		2077	random maps. May block.
		2078
		2079	=cut
		2080
		2081	sub random_maps() {
		2082	[
		2083	map {
		2084	utf8::decode $_;
		2085	/\.map$/
		2086	? normalise "?random/$_"
		2087	: ()
		2088	} @{ aio_readdir $RANDOMDIR or [] }
		2089	]
		2090	}
		2091
1662	=item cf::map::unique_maps	2092	=item cf::map::unique_maps
1663		2093
1664	Returns an arrayref of paths of all shared maps that have	2094	Returns an arrayref of paths of all shared maps that have
1665	instantiated unique items. May block.	2095	instantiated unique items. May block.
1666		2096
1667	=cut	2097	=cut
1668		2098
1669	sub unique_maps() {	2099	sub unique_maps() {
1670	my $files = aio_readdir cf::localdir . "/" . cf::uniquedir	2100	[
1671	or return;	2101	map {
1672
1673	my @paths;
1674
1675	for (@$files) {
1676	utf8::decode $_;	2102	utf8::decode $_;
1677	next if /\.pst$/;	2103	/\.map$/
1678	next unless /^$PATH_SEP/o;	2104	? normalise $_
1679		2105	: ()
1680	push @paths, cf::map::normalise $_;	2106	} @{ aio_readdir $UNIQUEDIR or [] }
1681	}	2107	]
1682
1683	\@paths
1684	}	2108	}
1685		2109
1686	package cf;	2110	package cf;
1687		2111
1688	=back	2112	=back
…		…
1734		2158
1735	$flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;	2159	$flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1736		2160
1737	if ($self->{record_replies}) {	2161	if ($self->{record_replies}) {
1738	push @{ $self->{record_replies} }, [$npc, $msg, $flags];	2162	push @{ $self->{record_replies} }, [$npc, $msg, $flags];
		2163
1739	} else {	2164	} else {
		2165	my $pl = $self->contr;
		2166
		2167	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
		2168	my $diag = $pl->{npc_dialog};
		2169	$diag->{pl}->ext_reply (
		2170	$diag->{id},
		2171	msgtype => "reply",
		2172	msg => $diag->{pl}->expand_cfpod ($msg),
		2173	add_topics => []
		2174	);
		2175
		2176	} else {
1740	$msg = $npc->name . " says: $msg" if $npc;	2177	$msg = $npc->name . " says: $msg" if $npc;
1741	$self->message ($msg, $flags);	2178	$self->message ($msg, $flags);
		2179	}
1742	}	2180	}
1743	}	2181	}
1744		2182
1745	=item $player_object->may ("access")	2183	=item $player_object->may ("access")
1746		2184
…		…
1794	$self->deactivate_recursive;	2232	$self->deactivate_recursive;
1795		2233
1796	return if UNIVERSAL::isa $self->map, "ext::map_link";	2234	return if UNIVERSAL::isa $self->map, "ext::map_link";
1797		2235
1798	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2236	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1799	if $self->map;	2237	if $self->map && $self->map->{path} ne "{link}";
1800		2238
1801	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2239	$self->enter_map ($LINK_MAP || link_map, 10, 10);
1802	}	2240	}
1803		2241
1804	sub cf::object::player::leave_link {	2242	sub cf::object::player::leave_link {
1805	my ($self, $map, $x, $y) = @_;	2243	my ($self, $map, $x, $y) = @_;
		2244
		2245	return unless $self->contr->active;
1806		2246
1807	my $link_pos = delete $self->{_link_pos};	2247	my $link_pos = delete $self->{_link_pos};
1808		2248
1809	unless ($map) {	2249	unless ($map) {
1810	# restore original map position	2250	# restore original map position
…		…
1833		2273
1834	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2274	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1835	$self->enter_map ($map, $x, $y);	2275	$self->enter_map ($map, $x, $y);
1836	}	2276	}
1837		2277
1838	cf::player->attach (	2278	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1839	on_logout => sub {
1840	my ($pl) = @_;
1841		2279
1842	# abort map switching before logout	2280	Moves the player to the given map-path and coordinates by first freezing
1843	if ($pl->ob->{_link_pos}) {	2281	her, loading and preparing them map, calling the provided $check callback
1844	cf::sync_job {	2282	that has to return the map if sucecssful, and then unfreezes the player on
1845	$pl->ob->leave_link	2283	the new (success) or old (failed) map position. In either case, $done will
1846	};	2284	be called at the end of this process.
1847	}
1848	},
1849	on_login => sub {
1850	my ($pl) = @_;
1851		2285
1852	# try to abort aborted map switching on player login :)
1853	# should happen only on crashes
1854	if ($pl->ob->{_link_pos}) {
1855	$pl->ob->enter_link;
1856	(async {
1857	$pl->ob->reply (undef,
1858	"There was an internal problem at your last logout, "
1859	. "the server will try to bring you to your intended destination in a second.",
1860	cf::NDI_RED);
1861	# we need this sleep as the login has a concurrent enter_exit running
1862	# and this sleep increases chances of the player not ending up in scorn
1863	Coro::Timer::sleep 1;
1864	$pl->ob->leave_link;
1865	})->prio (2);
1866	}
1867	},
1868	);
1869
1870	=item $player_object->goto ($path, $x, $y)
1871
1872	=cut	2286	=cut
		2287
		2288	our $GOTOGEN;
1873		2289
1874	sub cf::object::player::goto {	2290	sub cf::object::player::goto {
1875	my ($self, $path, $x, $y) = @_;	2291	my ($self, $path, $x, $y, $check, $done) = @_;
		2292
		2293	# do generation counting so two concurrent goto's will be executed in-order
		2294	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1876		2295
1877	$self->enter_link;	2296	$self->enter_link;
1878		2297
1879	(async {	2298	(async {
1880	my $map = eval {	2299	my $map = eval {
1881	my $map = cf::map::find $path;	2300	my $map = cf::map::find $path;
		2301
		2302	if ($map) {
1882	$map = $map->customise_for ($self) if $map;	2303	$map = $map->customise_for ($self);
		2304	$map = $check->($map) if $check && $map;
		2305	} else {
		2306	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
		2307	}
		2308
1883	$map	2309	$map
		2310	};
		2311
		2312	if ($@) {
		2313	$self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
		2314	LOG llevError | logBacktrace, Carp::longmess $@;
1884	} or	2315	}
1885	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1886		2316
		2317	if ($gen == $self->{_goto_generation}) {
		2318	delete $self->{_goto_generation};
1887	$self->leave_link ($map, $x, $y);	2319	$self->leave_link ($map, $x, $y);
		2320	}
		2321
		2322	$done->() if $done;
1888	})->prio (1);	2323	})->prio (1);
1889	}	2324	}
1890		2325
1891	=item $player_object->enter_exit ($exit_object)	2326	=item $player_object->enter_exit ($exit_object)
1892		2327
…		…
1931		2366
1932	$rmp->{random_seed} ||= $exit->random_seed;	2367	$rmp->{random_seed} ||= $exit->random_seed;
1933		2368
1934	my $data = cf::to_json $rmp;	2369	my $data = cf::to_json $rmp;
1935	my $md5 = Digest::MD5::md5_hex $data;	2370	my $md5 = Digest::MD5::md5_hex $data;
1936	my $meta = "$cf::RANDOM_MAPS/$md5.meta";	2371	my $meta = "$RANDOMDIR/$md5.meta";
1937		2372
1938	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {	2373	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1939	aio_write $fh, 0, (length $data), $data, 0;	2374	aio_write $fh, 0, (length $data), $data, 0;
1940	undef $fh;	2375	undef $fh;
1941	aio_rename "$meta~", $meta;	2376	aio_rename "$meta~", $meta;
…		…
1950		2385
1951	return unless $self->type == cf::PLAYER;	2386	return unless $self->type == cf::PLAYER;
1952		2387
1953	if ($exit->slaying eq "/!") {	2388	if ($exit->slaying eq "/!") {
1954	#TODO: this should de-fi-ni-te-ly not be a sync-job	2389	#TODO: this should de-fi-ni-te-ly not be a sync-job
		2390	# the problem is that $exit might not survive long enough
		2391	# so it needs to be done right now, right here
1955	cf::sync_job { prepare_random_map $exit };	2392	cf::sync_job { prepare_random_map $exit };
1956	}	2393	}
1957		2394
1958	my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2395	my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1959	my $hp = $exit->stats->hp;	2396	my $hp = $exit->stats->hp;
1960	my $sp = $exit->stats->sp;	2397	my $sp = $exit->stats->sp;
1961		2398
1962	$self->enter_link;	2399	$self->enter_link;
		2400
		2401	# if exit is damned, update players death & WoR home-position
		2402	$self->contr->savebed ($slaying, $hp, $sp)
		2403	if $exit->flag (FLAG_DAMNED);
1963		2404
1964	(async {	2405	(async {
1965	$self->deactivate_recursive; # just to be sure	2406	$self->deactivate_recursive; # just to be sure
1966	unless (eval {	2407	unless (eval {
1967	$self->goto ($slaying, $hp, $sp);	2408	$self->goto ($slaying, $hp, $sp);
1968		2409
1969	1;	2410	1;
1970	}) {	2411	}) {
1971	$self->message ("Something went wrong deep within the crossfire server. "	2412	$self->message ("Something went wrong deep within the crossfire server. "
1972	. "I'll try to bring you back to the map you were before. "	2413	. "I'll try to bring you back to the map you were before. "
1973	. "Please report this to the dungeon master!",	2414	. "Please report this to the dungeon master!",
1974	cf::NDI_UNIQUE | cf::NDI_RED);	2415	cf::NDI_UNIQUE | cf::NDI_RED);
1975		2416
1976	warn "ERROR in enter_exit: $@";	2417	warn "ERROR in enter_exit: $@";
1977	$self->leave_link;	2418	$self->leave_link;
1978	}	2419	}
1979	})->prio (1);	2420	})->prio (1);
…		…
1992		2433
1993	sub cf::client::send_drawinfo {	2434	sub cf::client::send_drawinfo {
1994	my ($self, $text, $flags) = @_;	2435	my ($self, $text, $flags) = @_;
1995		2436
1996	utf8::encode $text;	2437	utf8::encode $text;
1997	$self->send_packet (sprintf "drawinfo %d %s", $flags, $text);	2438	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1998	}	2439	}
1999		2440
		2441	=item $client->send_msg ($channel, $msg, $color, [extra...])
		2442
		2443	Send a drawinfo or msg packet to the client, formatting the msg for the
		2444	client if neccessary. C<$type> should be a string identifying the type of
		2445	the message, with C<log> being the default. If C<$color> is negative, suppress
		2446	the message unless the client supports the msg packet.
		2447
		2448	=cut
		2449
		2450	sub cf::client::send_msg {
		2451	my ($self, $channel, $msg, $color, @extra) = @_;
		2452
		2453	$msg = $self->pl->expand_cfpod ($msg);
		2454
		2455	$color &= ~cf::NDI_UNIQUE; # just in case...
		2456
		2457	if (ref $channel) {
		2458	# send meta info to client, if not yet sent
		2459	unless (exists $self->{channel}{$channel->{id}}) {
		2460	$self->{channel}{$channel->{id}} = $channel;
		2461	$self->ext_event (channel_info => %$channel);
		2462	}
		2463
		2464	$channel = $channel->{id};
		2465	}
		2466
		2467	return unless @extra || length $msg;
		2468
		2469	if ($self->can_msg) {
		2470	$self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra]));
		2471	} else {
		2472	# replace some tags by gcfclient-compatible ones
		2473	for ($msg) {
		2474	1 while
		2475	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2476	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2477	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2478	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2479	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2480	}
		2481
		2482	if ($color >= 0) {
		2483	if (0 && $msg =~ /\[/) {
		2484	$self->send_packet ("drawextinfo $color 4 0 $msg")
		2485	} else {
		2486	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
		2487	$self->send_packet ("drawinfo $color $msg")
		2488	}
		2489	}
		2490	}
		2491	}
		2492
		2493	=item $client->ext_event ($type, %msg)
		2494
		2495	Sends an ext event to the client.
		2496
		2497	=cut
		2498
		2499	sub cf::client::ext_event($$%) {
		2500	my ($self, $type, %msg) = @_;
		2501
		2502	return unless $self->extcmd;
		2503
		2504	$msg{msgtype} = "event_$type";
		2505	$self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
		2506	}
2000		2507
2001	=item $success = $client->query ($flags, "text", \&cb)	2508	=item $success = $client->query ($flags, "text", \&cb)
2002		2509
2003	Queues a query to the client, calling the given callback with	2510	Queues a query to the client, calling the given callback with
2004	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,	2511	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2005	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.	2512	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2006		2513
2007	Queries can fail, so check the return code. Or don't, as queries will become	2514	Queries can fail, so check the return code. Or don't, as queries will
2008	reliable at some point in the future.	2515	become reliable at some point in the future.
2009		2516
2010	=cut	2517	=cut
2011		2518
2012	sub cf::client::query {	2519	sub cf::client::query {
2013	my ($self, $flags, $text, $cb) = @_;	2520	my ($self, $flags, $text, $cb) = @_;
…		…
2021	utf8::encode $text;	2528	utf8::encode $text;
2022	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];	2529	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2023		2530
2024	$self->send_packet ($self->{query_queue}[0][0])	2531	$self->send_packet ($self->{query_queue}[0][0])
2025	if @{ $self->{query_queue} } == 1;	2532	if @{ $self->{query_queue} } == 1;
		2533
		2534	1
2026	}	2535	}
2027		2536
2028	cf::client->attach (	2537	cf::client->attach (
		2538	on_connect => sub {
		2539	my ($ns) = @_;
		2540
		2541	$ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
		2542	},
2029	on_reply => sub {	2543	on_reply => sub {
2030	my ($ns, $msg) = @_;	2544	my ($ns, $msg) = @_;
2031		2545
2032	# this weird shuffling is so that direct followup queries	2546	# this weird shuffling is so that direct followup queries
2033	# get handled first	2547	# get handled first
…		…
2045	} else {	2559	} else {
2046	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;	2560	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2047	}	2561	}
2048	}	2562	}
2049	},	2563	},
		2564	on_exticmd => sub {
		2565	my ($ns, $buf) = @_;
		2566
		2567	my $msg = eval { $ns->{json_coder}->decode ($buf) };
		2568
		2569	if (ref $msg) {
		2570	if (my $cb = $EXTICMD{$msg->{msgtype}}) {
		2571	if (my %reply = $cb->($ns, $msg)) {
		2572	$reply{msgid} = $msg->{msgid};
		2573	$ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
		2574	}
		2575	}
		2576	} else {
		2577	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
		2578	}
		2579
		2580	cf::override;
		2581	},
2050	);	2582	);
2051		2583
2052	=item $client->async (\&cb)	2584	=item $client->async (\&cb)
2053		2585
2054	Create a new coroutine, running the specified callback. The coroutine will	2586	Create a new coroutine, running the specified callback. The coroutine will
…		…
2101		2633
2102	# here we export the classes and methods available to script code	2634	# here we export the classes and methods available to script code
2103		2635
2104	=pod	2636	=pod
2105		2637
2106	The following fucntions and emthods are available within a safe environment:	2638	The following functions and methods are available within a safe environment:
2107		2639
2108	cf::object contr pay_amount pay_player map	2640	cf::object
		2641	contr pay_amount pay_player map x y force_find force_add
		2642	insert remove
		2643
2109	cf::object::player player	2644	cf::object::player
2110	cf::player peaceful	2645	player
2111	cf::map trigger	2646
		2647	cf::player
		2648	peaceful
		2649
		2650	cf::map
		2651	trigger
2112		2652
2113	=cut	2653	=cut
2114		2654
2115	for (	2655	for (
2116	["cf::object" => qw(contr pay_amount pay_player map)],	2656	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2657	insert remove)],
2117	["cf::object::player" => qw(player)],	2658	["cf::object::player" => qw(player)],
2118	["cf::player" => qw(peaceful)],	2659	["cf::player" => qw(peaceful)],
2119	["cf::map" => qw(trigger)],	2660	["cf::map" => qw(trigger)],
2120	) {	2661	) {
2121	no strict 'refs';	2662	no strict 'refs';
…		…
2192	=back	2733	=back
2193		2734
2194	=cut	2735	=cut
2195		2736
2196	#############################################################################	2737	#############################################################################
2197
2198	=head2 EXTENSION DATABASE SUPPORT
2199
2200	Crossfire maintains a very simple database for extension use. It can
2201	currently store anything that can be serialised using Storable, which
2202	excludes objects.
2203
2204	The parameter C<$family> should best start with the name of the extension
2205	using it, it should be unique.
2206
2207	=over 4
2208
2209	=item $value = cf::db_get $family => $key
2210
2211	Returns a single value from the database.
2212
2213	=item cf::db_put $family => $key => $value
2214
2215	Stores the given C<$value> in the family.
2216
2217	=cut
2218
2219	our $DB;
2220
2221	sub db_init {
2222	unless ($DB) {
2223	$DB = BDB::db_create $DB_ENV;
2224
2225	cf::sync_job {
2226	eval {
2227	$DB->set_flags (BDB::CHKSUM);
2228
2229	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2230	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2231	cf::cleanup "db_open(db): $!" if $!;
2232	};
2233	cf::cleanup "db_open(db): $@" if $@;
2234	};
2235
2236	my $path = cf::localdir . "/database.pst";
2237	if (stat $path) {
2238	cf::sync_job {
2239	my $pst = Storable::retrieve $path;
2240
2241	cf::db_put (board => data => $pst->{board});
2242	cf::db_put (guildrules => data => $pst->{guildrules});
2243	cf::db_put (rent => balance => $pst->{rent}{balance});
2244	BDB::db_env_txn_checkpoint $DB_ENV;
2245
2246	unlink $path;
2247	};
2248	}
2249	}
2250	}
2251
2252	sub db_get($$) {
2253	my $key = "$_[0]/$_[1]";
2254
2255	cf::sync_job {
2256	BDB::db_get $DB, undef, $key, my $data;
2257
2258	$! ? ()
2259	: Compress::LZF::sthaw $data
2260	}
2261	}
2262
2263	sub db_put($$$) {
2264	BDB::dbreq_pri 4;
2265	BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2266	}
2267
2268	#############################################################################
2269	# the server's init and main functions	2738	# the server's init and main functions
2270		2739
2271	sub init_resources {	2740	sub load_facedata($) {
2272	load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir	2741	my ($path) = @_;
		2742
		2743	warn "loading facedata from $path\n";
		2744
		2745	my $facedata;
		2746	0 < aio_load $path, $facedata
		2747	or die "$path: $!";
		2748
		2749	$facedata = Coro::Storable::thaw $facedata;
		2750
		2751	$facedata->{version} == 2
		2752	or cf::cleanup "$path: version mismatch, cannot proceed.";
		2753
		2754	{
		2755	my $faces = $facedata->{faceinfo};
		2756
		2757	while (my ($face, $info) = each %$faces) {
		2758	my $idx = (cf::face::find $face) || cf::face::alloc $face;
		2759	cf::face::set_visibility $idx, $info->{visibility};
		2760	cf::face::set_magicmap $idx, $info->{magicmap};
		2761	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
		2762	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
		2763
		2764	cf::cede_to_tick;
		2765	}
		2766
		2767	while (my ($face, $info) = each %$faces) {
		2768	next unless $info->{smooth};
		2769	my $idx = cf::face::find $face
		2770	or next;
		2771	if (my $smooth = cf::face::find $info->{smooth}) {
		2772	cf::face::set_smooth $idx, $smooth;
		2773	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
		2774	} else {
		2775	warn "smooth face '$info->{smooth}' not found for face '$face'";
		2776	}
		2777
		2778	cf::cede_to_tick;
		2779	}
		2780	}
		2781
		2782	{
		2783	my $anims = $facedata->{animinfo};
		2784
		2785	while (my ($anim, $info) = each %$anims) {
		2786	cf::anim::set $anim, $info->{frames}, $info->{facings};
		2787	cf::cede_to_tick;
		2788	}
		2789
		2790	cf::anim::invalidate_all; # d'oh
		2791	}
		2792
		2793	{
		2794	# TODO: for gcfclient pleasure, we should give resources
		2795	# that gcfclient doesn't grok a >10000 face index.
		2796	my $res = $facedata->{resource};
		2797	my $enc = JSON::XS->new->utf8->canonical;
		2798
		2799	while (my ($name, $info) = each %$res) {
		2800	my $meta = $enc->encode ({
		2801	name => $name,
		2802	type => $info->{type},
		2803	copyright => $info->{copyright}, #TODO#
		2804	});
		2805
		2806	my $idx = (cf::face::find $name) || cf::face::alloc $name;
		2807
		2808	if ($name =~ /\.jpg$/) {
		2809	cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack
		2810	cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack
		2811	} else {
		2812	my $data = pack "(w/a*)*", $meta, $info->{data};
		2813	my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
		2814
		2815	cf::face::set_type $idx, 1;
		2816	cf::face::set_data $idx, 0, $data, $chk;
		2817	}
		2818
		2819	cf::cede_to_tick;
		2820	}
		2821	}
		2822
		2823	1
		2824	}
		2825
		2826	sub reload_regions {
		2827	load_resource_file "$MAPDIR/regions"
2273	or die "unable to load regions file\n";#d#	2828	or die "unable to load regions file\n";
		2829
		2830	for (cf::region::list) {
		2831	$_->{match} = qr/$_->{match}/
		2832	if exists $_->{match};
		2833	}
		2834	}
		2835
		2836	sub reload_facedata {
		2837	load_facedata "$DATADIR/facedata"
		2838	or die "unable to load facedata\n";
		2839	}
		2840
		2841	sub reload_archetypes {
		2842	load_resource_file "$DATADIR/archetypes"
		2843	or die "unable to load archetypes\n";
		2844	#d# NEED to laod twice to resolve forward references
		2845	# this really needs to be done in an extra post-pass
		2846	# (which needs to be synchronous, so solve it differently)
		2847	load_resource_file "$DATADIR/archetypes"
		2848	or die "unable to load archetypes\n";
		2849	}
		2850
		2851	sub reload_treasures {
		2852	load_resource_file "$DATADIR/treasures"
		2853	or die "unable to load treasurelists\n";
		2854	}
		2855
		2856	sub reload_resources {
		2857	warn "reloading resource files...\n";
		2858
		2859	reload_regions;
		2860	reload_facedata;
		2861	#reload_archetypes;#d#
		2862	reload_archetypes;
		2863	reload_treasures;
		2864
		2865	warn "finished reloading resource files\n";
		2866	}
		2867
		2868	sub init {
		2869	reload_resources;
2274	}	2870	}
2275		2871
2276	sub cfg_load {	2872	sub cfg_load {
2277	open my $fh, "<:utf8", cf::confdir . "/config"	2873	open my $fh, "<:utf8", "$CONFDIR/config"
2278	or return;	2874	or return;
2279		2875
2280	local $/;	2876	local $/;
2281	*CFG = YAML::Syck::Load <$fh>;	2877	*CFG = YAML::Syck::Load <$fh>;
2282		2878
…		…
2290	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	2886	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2291	and die "WARNING: m(un)lockall failed: $!\n";	2887	and die "WARNING: m(un)lockall failed: $!\n";
2292	};	2888	};
2293	warn $@ if $@;	2889	warn $@ if $@;
2294	}	2890	}
2295	}
2296
2297	sub init {
2298	init_resources;
2299	}	2891	}
2300		2892
2301	sub main {	2893	sub main {
2302	# we must not ever block the main coroutine	2894	# we must not ever block the main coroutine
2303	local $Coro::idle = sub {	2895	local $Coro::idle = sub {
…		…
2331	},	2923	},
2332	);	2924	);
2333	}	2925	}
2334	}	2926	}
2335		2927
		2928	sub write_runtime {
		2929	my $runtime = "$LOCALDIR/runtime";
		2930
		2931	# first touch the runtime file to show we are still running:
		2932	# the fsync below can take a very very long time.
		2933
		2934	IO::AIO::aio_utime $runtime, undef, undef;
		2935
		2936	my $guard = cf::lock_acquire "write_runtime";
		2937
		2938	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
		2939	or return;
		2940
		2941	my $value = $cf::RUNTIME + 90 + 10;
		2942	# 10 is the runtime save interval, for a monotonic clock
		2943	# 60 allows for the watchdog to kill the server.
		2944
		2945	(aio_write $fh, 0, (length $value), $value, 0) <= 0
		2946	and return;
		2947
		2948	# always fsync - this file is important
		2949	aio_fsync $fh
		2950	and return;
		2951
		2952	# touch it again to show we are up-to-date
		2953	aio_utime $fh, undef, undef;
		2954
		2955	close $fh
		2956	or return;
		2957
		2958	aio_rename "$runtime~", $runtime
		2959	and return;
		2960
		2961	warn "runtime file written.\n";
		2962
		2963	1
		2964	}
		2965
2336	sub emergency_save() {	2966	sub emergency_save() {
2337	my $freeze_guard = cf::freeze_mainloop;	2967	my $freeze_guard = cf::freeze_mainloop;
2338		2968
2339	warn "enter emergency perl save\n";	2969	warn "enter emergency perl save\n";
2340		2970
…		…
2371		3001
2372	warn Carp::longmess "post_cleanup backtrace"	3002	warn Carp::longmess "post_cleanup backtrace"
2373	if $make_core;	3003	if $make_core;
2374	}	3004	}
2375		3005
2376	sub reload() {	3006	sub do_reload_perl() {
2377	# can/must only be called in main	3007	# can/must only be called in main
2378	if ($Coro::current != $Coro::main) {	3008	if ($Coro::current != $Coro::main) {
2379	warn "can only reload from main coroutine";	3009	warn "can only reload from main coroutine";
2380	return;	3010	return;
2381	}	3011	}
…		…
2406	Coro::cede;	3036	Coro::cede;
2407	last unless IO::AIO::nreqs || BDB::nreqs;	3037	last unless IO::AIO::nreqs || BDB::nreqs;
2408	warn "iterate...";	3038	warn "iterate...";
2409	}	3039	}
2410		3040
		3041	++$RELOAD;
		3042
2411	warn "cancelling all extension coros";	3043	warn "cancelling all extension coros";
2412	$_->cancel for values %EXT_CORO;	3044	$_->cancel for values %EXT_CORO;
2413	%EXT_CORO = ();	3045	%EXT_CORO = ();
2414		3046
2415	warn "removing commands";	3047	warn "removing commands";
2416	%COMMAND = ();	3048	%COMMAND = ();
2417		3049
2418	warn "removing ext commands";	3050	warn "removing ext/exti commands";
2419	%EXTCMD = ();	3051	%EXTCMD = ();
		3052	%EXTICMD = ();
2420		3053
2421	warn "unloading/nuking all extensions";	3054	warn "unloading/nuking all extensions";
2422	for my $pkg (@EXTS) {	3055	for my $pkg (@EXTS) {
2423	warn "... unloading $pkg";	3056	warn "... unloading $pkg";
2424		3057
…		…
2454	Symbol::delete_package "safe::$_"	3087	Symbol::delete_package "safe::$_"
2455	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	3088	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2456		3089
2457	warn "unloading cf.pm \"a bit\"";	3090	warn "unloading cf.pm \"a bit\"";
2458	delete $INC{"cf.pm"};	3091	delete $INC{"cf.pm"};
		3092	delete $INC{"cf/pod.pm"};
2459		3093
2460	# don't, removes xs symbols, too,	3094	# don't, removes xs symbols, too,
2461	# and global variables created in xs	3095	# and global variables created in xs
2462	#Symbol::delete_package __PACKAGE__;	3096	#Symbol::delete_package __PACKAGE__;
2463		3097
…		…
2478	warn "reattaching attachments to maps";	3112	warn "reattaching attachments to maps";
2479	reattach $_ for values %MAP;	3113	reattach $_ for values %MAP;
2480	warn "reattaching attachments to players";	3114	warn "reattaching attachments to players";
2481	reattach $_ for values %PLAYER;	3115	reattach $_ for values %PLAYER;
2482		3116
2483	warn "loading reloadable resources";
2484	init_resources;
2485
2486	warn "leaving sync_job";	3117	warn "leaving sync_job";
2487		3118
2488	1	3119	1
2489	} or do {	3120	} or do {
2490	warn $@;	3121	warn $@;
…		…
2495	warn "reloaded";	3126	warn "reloaded";
2496	};	3127	};
2497		3128
2498	our $RELOAD_WATCHER; # used only during reload	3129	our $RELOAD_WATCHER; # used only during reload
2499		3130
		3131	sub reload_perl() {
		3132	# doing reload synchronously and two reloads happen back-to-back,
		3133	# coro crashes during coro_state_free->destroy here.
		3134
		3135	$RELOAD_WATCHER ||= Event->timer (
		3136	reentrant => 0,
		3137	after => 0,
		3138	data => WF_AUTOCANCEL,
		3139	cb => sub {
		3140	do_reload_perl;
		3141	undef $RELOAD_WATCHER;
		3142	},
		3143	);
		3144	}
		3145
2500	register_command "reload" => sub {	3146	register_command "reload" => sub {
2501	my ($who, $arg) = @_;	3147	my ($who, $arg) = @_;
2502		3148
2503	if ($who->flag (FLAG_WIZ)) {	3149	if ($who->flag (FLAG_WIZ)) {
2504	$who->message ("reloading server.");	3150	$who->message ("reloading server.");
2505		3151	async { reload_perl };
2506	# doing reload synchronously and two reloads happen back-to-back,
2507	# coro crashes during coro_state_free->destroy here.
2508
2509	$RELOAD_WATCHER ||= Event->timer (
2510	reentrant => 0,
2511	after => 0,
2512	data => WF_AUTOCANCEL,
2513	cb => sub {
2514	reload;
2515	undef $RELOAD_WATCHER;
2516	},
2517	);
2518	}	3152	}
2519	};	3153	};
2520		3154
2521	unshift @INC, $LIBDIR;	3155	unshift @INC, $LIBDIR;
2522		3156
2523	my $bug_warning = 0;	3157	my $bug_warning = 0;
2524		3158
		3159	our @WAIT_FOR_TICK;
		3160	our @WAIT_FOR_TICK_BEGIN;
		3161
		3162	sub wait_for_tick {
		3163	return unless $TICK_WATCHER->is_active;
		3164	return if $Coro::current == $Coro::main;
		3165
		3166	my $signal = new Coro::Signal;
		3167	push @WAIT_FOR_TICK, $signal;
		3168	$signal->wait;
		3169	}
		3170
		3171	sub wait_for_tick_begin {
		3172	return unless $TICK_WATCHER->is_active;
		3173	return if $Coro::current == $Coro::main;
		3174
		3175	my $signal = new Coro::Signal;
		3176	push @WAIT_FOR_TICK_BEGIN, $signal;
		3177	$signal->wait;
		3178	}
		3179
		3180	my $min = 1e6;#d#
		3181	my $avg = 10;
2525	$TICK_WATCHER = Event->timer (	3182	$TICK_WATCHER = Event->timer (
2526	reentrant => 0,	3183	reentrant => 0,
2527	parked => 1,	3184	parked => 1,
2528	prio => 0,	3185	prio => 0,
2529	at => $NEXT_TICK || $TICK,	3186	at => $NEXT_TICK || $TICK,
…		…
2533	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	3190	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2534	unless ++$bug_warning > 10;	3191	unless ++$bug_warning > 10;
2535	return;	3192	return;
2536	}	3193	}
2537		3194
2538	$NOW = Event::time;	3195	$NOW = $tick_start = Event::time;
2539		3196
2540	cf::server_tick; # one server iteration	3197	cf::server_tick; # one server iteration
		3198
		3199	0 && sync_job {#d#
		3200	for(1..10) {
		3201	my $t = Event::time;
		3202	my $map = my $map = new_from_path cf::map "/tmp/x.map"
		3203	or die;
		3204
		3205	$map->width (50);
		3206	$map->height (50);
		3207	$map->alloc;
		3208	$map->_load_objects ("/tmp/x.map", 1);
		3209	my $t = Event::time - $t;
		3210
		3211	#next unless $t < 0.0013;#d#
		3212	if ($t < $min) {
		3213	$min = $t;
		3214	}
		3215	$avg = $avg * 0.99 + $t * 0.01;
		3216	}
		3217	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
		3218	exit 0;
		3219	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
		3220	};
		3221
2541	$RUNTIME += $TICK;	3222	$RUNTIME += $TICK;
2542	$NEXT_TICK += $TICK;	3223	$NEXT_TICK += $TICK;
2543		3224
2544	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3225	if ($NOW >= $NEXT_RUNTIME_WRITE) {
2545	$NEXT_RUNTIME_WRITE = $NOW + 10;	3226	$NEXT_RUNTIME_WRITE = $NOW + 10;
…		…
2547	write_runtime	3228	write_runtime
2548	or warn "ERROR: unable to write runtime file: $!";	3229	or warn "ERROR: unable to write runtime file: $!";
2549	};	3230	};
2550	}	3231	}
2551		3232
2552	$WAIT_FOR_TICK->broadcast;
2553	$WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2554
2555	# my $AFTER = Event::time;	3233	# my $AFTER = Event::time;
2556	# warn $AFTER - $NOW;#d#	3234	# warn $AFTER - $NOW;#d#
2557		3235
		3236	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
		3237	$sig->send;
		3238	}
		3239	while (my $sig = shift @WAIT_FOR_TICK) {
		3240	$sig->send;
		3241	}
		3242
		3243	$NOW = Event::time;
		3244
2558	# if we are delayed by four ticks or more, skip them all	3245	# if we are delayed by four ticks or more, skip them all
2559	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;	3246	$NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2560		3247
2561	$TICK_WATCHER->at ($NEXT_TICK);	3248	$TICK_WATCHER->at ($NEXT_TICK);
2562	$TICK_WATCHER->start;	3249	$TICK_WATCHER->start;
		3250
		3251	$LOAD = ($NOW - $tick_start) / $TICK;
		3252	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
		3253
		3254	_post_tick;
		3255
		3256
2563	},	3257	},
2564	);	3258	);
2565		3259
2566	{	3260	{
2567	BDB::max_poll_time $TICK * 0.1;	3261	BDB::max_poll_time $TICK * 0.1;
…		…
2595		3289
2596	cf::sync_job {	3290	cf::sync_job {
2597	eval {	3291	eval {
2598	BDB::db_env_open	3292	BDB::db_env_open
2599	$DB_ENV,	3293	$DB_ENV,
2600	$BDB_ENV_DIR,	3294	$BDBDIR,
2601	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN	3295	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2602	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,	3296	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2603	0666;	3297	0666;
2604		3298
2605	cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;	3299	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2606		3300
2607	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);	3301	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2608	$DB_ENV->set_lk_detect;	3302	$DB_ENV->set_lk_detect;
2609	};	3303	};
2610		3304
…		…
2626	prio => 6,	3320	prio => 6,
2627	cb => \&IO::AIO::poll_cb,	3321	cb => \&IO::AIO::poll_cb,
2628	);	3322	);
2629	}	3323	}
2630		3324
		3325	my $_log_backtrace;
		3326
		3327	sub _log_backtrace {
		3328	my ($msg, @addr) = @_;
		3329
		3330	$msg =~ s/\n//;
		3331
		3332	# limit the # of concurrent backtraces
		3333	if ($_log_backtrace < 2) {
		3334	++$_log_backtrace;
		3335	async {
		3336	my @bt = fork_call {
		3337	@addr = map { sprintf "%x", $_ } @addr;
		3338	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
		3339	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
		3340	or die "addr2line: $!";
		3341
		3342	my @funcs;
		3343	my @res = <$fh>;
		3344	chomp for @res;
		3345	while (@res) {
		3346	my ($func, $line) = splice @res, 0, 2, ();
		3347	push @funcs, "[$func] $line";
		3348	}
		3349
		3350	@funcs
		3351	};
		3352
		3353	LOG llevInfo, "[ABT] $msg\n";
		3354	LOG llevInfo, "[ABT] $_\n" for @bt;
		3355	--$_log_backtrace;
		3356	};
		3357	} else {
		3358	LOG llevInfo, "[ABT] $msg\n";
		3359	LOG llevInfo, "[ABT] [suppressed]\n";
		3360	}
		3361	}
		3362
		3363	# load additional modules
		3364	use cf::pod;
		3365
2631	END { cf::emergency_save }	3366	END { cf::emergency_save }
2632		3367
2633	1	3368	1
2634		3369

Diff Legend

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