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.278 by root, Mon Jun 11 21:38:14 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
20	use BDB ();	25	use BDB ();
21	use Data::Dumper;	26	use Data::Dumper;
22	use Digest::MD5;	27	use Digest::MD5;
23	use Fcntl;	28	use Fcntl;
		29	use YAML::Syck ();
24	use IO::AIO 2.32 ();	30	use IO::AIO 2.32 ();
25	use YAML::Syck ();
26	use Time::HiRes;	31	use Time::HiRes;
27	use Compress::LZF;	32	use Compress::LZF;
28		33
		34	# configure various modules to our taste
		35	#
		36	$Storable::canonical = 1; # reduce rsync transfers
		37	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
29	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later	38	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
30		39
31	use Event; $Event::Eval = 1; # no idea why this is required, but it is	40	$Event::Eval = 1; # no idea why this is required, but it is
32
33	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34		41
35	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?	42	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
36	$YAML::Syck::ImplicitUnicode = 1;	43	$YAML::Syck::ImplicitUnicode = 1;
37		44
38	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority	45	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
		46
		47	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
39		48
40	our %COMMAND = ();	49	our %COMMAND = ();
41	our %COMMAND_TIME = ();	50	our %COMMAND_TIME = ();
42		51
43	our @EXTS = (); # list of extension package names	52	our @EXTS = (); # list of extension package names
44	our %EXTCMD = ();	53	our %EXTCMD = ();
45	our %EXT_CORO = (); # coroutines bound to extensions	54	our %EXT_CORO = (); # coroutines bound to extensions
46	our %EXT_MAP = (); # pluggable maps	55	our %EXT_MAP = (); # pluggable maps
47		56
		57	our $RELOAD; # number of reloads so far
48	our @EVENT;	58	our @EVENT;
49	our $LIBDIR = datadir . "/ext";
50		59
51	our $TICK = MAX_TIME * 1e-6;	60	our $CONFDIR = confdir;
		61	our $DATADIR = datadir;
		62	our $LIBDIR = "$DATADIR/ext";
		63	our $PODDIR = "$DATADIR/pod";
		64	our $MAPDIR = "$DATADIR/" . mapdir;
		65	our $LOCALDIR = localdir;
		66	our $TMPDIR = "$LOCALDIR/" . tmpdir;
		67	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
		68	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
		69	our $RANDOMDIR = "$LOCALDIR/random";
		70	our $BDBDIR = "$LOCALDIR/db";
		71
		72	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
52	our $TICK_WATCHER;	73	our $TICK_WATCHER;
53	our $AIO_POLL_WATCHER;	74	our $AIO_POLL_WATCHER;
54	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	75	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
55	our $NEXT_TICK;	76	our $NEXT_TICK;
56	our $NOW;	77	our $NOW;
…		…
65	our $RUNTIME;	86	our $RUNTIME;
66		87
67	our %PLAYER; # all users	88	our %PLAYER; # all users
68	our %MAP; # all maps	89	our %MAP; # all maps
69	our $LINK_MAP; # the special {link} map, which is always available	90	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		91
76	# used to convert map paths into valid unix filenames by replacing / by ∕	92	# used to convert map paths into valid unix filenames by replacing / by ∕
77	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	93	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
78		94
		95	our $LOAD; # a number between 0 (idle) and 1 (too many objects)
		96	our $LOADAVG; # same thing, but with alpha-smoothing
		97	our $tick_start; # for load detecting purposes
		98
79	binmode STDOUT;	99	binmode STDOUT;
80	binmode STDERR;	100	binmode STDERR;
81		101
82	# read virtual server time, if available	102	# read virtual server time, if available
83	unless ($RUNTIME || !-e cf::localdir . "/runtime") {	103	unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
84	open my $fh, "<", cf::localdir . "/runtime"	104	open my $fh, "<", "$LOCALDIR/runtime"
85	or die "unable to read runtime file: $!";	105	or die "unable to read runtime file: $!";
86	$RUNTIME = <$fh> + 0.;	106	$RUNTIME = <$fh> + 0.;
87	}	107	}
88		108
89	mkdir cf::localdir;	109	mkdir $_
90	mkdir cf::localdir . "/" . cf::playerdir;	110	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		111
96	our $EMERGENCY_POSITION;	112	our $EMERGENCY_POSITION;
97		113
98	sub cf::map::normalise;	114	sub cf::map::normalise;
99		115
…		…
110	=item $cf::RUNTIME	126	=item $cf::RUNTIME
111		127
112	The time this server has run, starts at 0 and is increased by $cf::TICK on	128	The time this server has run, starts at 0 and is increased by $cf::TICK on
113	every server tick.	129	every server tick.
114		130
115	=item $cf::LIBDIR	131	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
		132	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
		133	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
116		134
117	The perl library directory, where extensions and cf-specific modules can	135	Various directories - "/etc", read-only install directory, perl-library
118	be found. It will be added to C<@INC> automatically.	136	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
		137	unique-items directory, player file directory, random maps directory and
		138	database environment.
119		139
120	=item $cf::NOW	140	=item $cf::NOW
121		141
122	The time of the last (current) server tick.	142	The time of the last (current) server tick.
123		143
124	=item $cf::TICK	144	=item $cf::TICK
125		145
126	The interval between server ticks, in seconds.	146	The interval between server ticks, in seconds.
		147
		148	=item $cf::LOADAVG
		149
		150	The current CPU load on the server (alpha-smoothed), as a value between 0
		151	(none) and 1 (overloaded), indicating how much time is spent on processing
		152	objects per tick. Healthy values are < 0.5.
		153
		154	=item $cf::LOAD
		155
		156	The raw value load value from the last tick.
127		157
128	=item %cf::CFG	158	=item %cf::CFG
129		159
130	Configuration for the server, loaded from C</etc/crossfire/config>, or	160	Configuration for the server, loaded from C</etc/crossfire/config>, or
131	from wherever your confdir points to.	161	from wherever your confdir points to.
132		162
133	=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE	163	=item cf::wait_for_tick, cf::wait_for_tick_begin
134		164
135	These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)	165	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
136	or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick	166	returns directly I<after> the tick processing (and consequently, can only wake one process
137	processing has been done. Call C<< ->wait >> on them to maximise the	167	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
138	window of cpu time available, or simply to synchronise to the server tick.
139		168
140	=back	169	=back
141		170
142	=cut	171	=cut
143		172
144	BEGIN {	173	BEGIN {
145	*CORE::GLOBAL::warn = sub {	174	*CORE::GLOBAL::warn = sub {
146	my $msg = join "", @_;	175	my $msg = join "", @_;
147	utf8::encode $msg;
148		176
149	$msg .= "\n"	177	$msg .= "\n"
150	unless $msg =~ /\n$/;	178	unless $msg =~ /\n$/;
151		179
		180	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
		181
		182	utf8::encode $msg;
152	LOG llevError, $msg;	183	LOG llevError, $msg;
153	};	184	};
154	}	185	}
155		186
156	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	187	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
157	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	188	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
158	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	189	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
159	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	190	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
160	@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';	191	@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
		192	@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
161	@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';	193	@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
162		194
163	# we bless all objects into (empty) derived classes to force a method lookup	195	# we bless all objects into (empty) derived classes to force a method lookup
164	# within the Safe compartment.	196	# within the Safe compartment.
165	for my $pkg (qw(	197	for my $pkg (qw(
166	cf::global cf::attachable	198	cf::global cf::attachable
…		…
202	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	234	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
203	$d	235	$d
204	} || "[unable to dump $_[0]: '$@']";	236	} || "[unable to dump $_[0]: '$@']";
205	}	237	}
206		238
207	use JSON::Syck (); # TODO# replace by JSON::PC once working	239	use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
208		240
209	=item $ref = cf::from_json $json	241	=item $ref = cf::from_json $json
210		242
211	Converts a JSON string into the corresponding perl data structure.	243	Converts a JSON string into the corresponding perl data structure.
212		244
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	245	=item $json = cf::to_json $ref
221		246
222	Converts a perl data structure into its JSON representation.	247	Converts a perl data structure into its JSON representation.
223
224	=cut
225
226	sub to_json($) {
227	$JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
228	JSON::Syck::Dump $_[0]
229	}
230		248
231	=item cf::lock_wait $string	249	=item cf::lock_wait $string
232		250
233	Wait until the given lock is available. See cf::lock_acquire.	251	Wait until the given lock is available. See cf::lock_acquire.
234		252
…		…
240	returned.	258	returned.
241		259
242	Lock names should begin with a unique identifier (for example, cf::map::find	260	Lock names should begin with a unique identifier (for example, cf::map::find
243	uses map_find and cf::map::load uses map_load).	261	uses map_find and cf::map::load uses map_load).
244		262
		263	=item $locked = cf::lock_active $string
		264
		265	Return true if the lock is currently active, i.e. somebody has locked it.
		266
245	=cut	267	=cut
246		268
247	our %LOCK;	269	our %LOCK;
248		270
249	sub lock_wait($) {	271	sub lock_wait($) {
…		…
266		288
267	Coro::guard {	289	Coro::guard {
268	# wake up all waiters, to be on the safe side	290	# wake up all waiters, to be on the safe side
269	$_->ready for @{ delete $LOCK{$key} };	291	$_->ready for @{ delete $LOCK{$key} };
270	}	292	}
		293	}
		294
		295	sub lock_active($) {
		296	my ($key) = @_;
		297
		298	! ! $LOCK{$key}
271	}	299	}
272		300
273	sub freeze_mainloop {	301	sub freeze_mainloop {
274	return unless $TICK_WATCHER->is_active;	302	return unless $TICK_WATCHER->is_active;
275		303
…		…
305		333
306	sub sync_job(&) {	334	sub sync_job(&) {
307	my ($job) = @_;	335	my ($job) = @_;
308		336
309	if ($Coro::current == $Coro::main) {	337	if ($Coro::current == $Coro::main) {
		338	my $time = Event::time;
		339
310	# this is the main coro, too bad, we have to block	340	# this is the main coro, too bad, we have to block
311	# till the operation succeeds, freezing the server :/	341	# till the operation succeeds, freezing the server :/
312		342
313	# TODO: use suspend/resume instead	343	# TODO: use suspend/resume instead
314	# (but this is cancel-safe)	344	# (but this is cancel-safe)
…		…
325		355
326	while ($busy) {	356	while ($busy) {
327	Coro::cede or Event::one_event;	357	Coro::cede or Event::one_event;
328	}	358	}
329		359
		360	$time = Event::time - $time;
		361
		362	LOG llevError | logBacktrace, Carp::longmess "long sync job"
		363	if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
		364
		365	$tick_start += $time; # do not account sync jobs to server load
		366
330	wantarray ? @res : $res[0]	367	wantarray ? @res : $res[0]
331	} else {	368	} else {
332	# we are in another coroutine, how wonderful, everything just works	369	# we are in another coroutine, how wonderful, everything just works
333		370
334	$job->()	371	$job->()
…		…
354		391
355	$coro	392	$coro
356	}	393	}
357		394
358	sub write_runtime {	395	sub write_runtime {
		396	my $runtime = "$LOCALDIR/runtime";
		397
		398	# first touch the runtime file to show we are still running:
		399	# the fsync below can take a very very long time.
		400
		401	IO::AIO::aio_utime $runtime, undef, undef;
		402
359	my $guard = cf::lock_acquire "write_runtime";	403	my $guard = cf::lock_acquire "write_runtime";
360
361	my $runtime = cf::localdir . "/runtime";
362		404
363	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644	405	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
364	or return;	406	or return;
365		407
366	my $value = $cf::RUNTIME + 90 + 10;	408	my $value = $cf::RUNTIME + 90 + 10;
…		…
372		414
373	# always fsync - this file is important	415	# always fsync - this file is important
374	aio_fsync $fh	416	aio_fsync $fh
375	and return;	417	and return;
376		418
		419	# touch it again to show we are up-to-date
		420	aio_utime $fh, undef, undef;
		421
377	close $fh	422	close $fh
378	or return;	423	or return;
379		424
380	aio_rename "$runtime~", $runtime	425	aio_rename "$runtime~", $runtime
381	and return;	426	and return;
382		427
		428	warn "runtime file written.\n";
		429
383	1	430	1
		431	}
		432
		433	=item cf::datalog type => key => value, ...
		434
		435	Log a datalog packet of the given type with the given key-value pairs.
		436
		437	=cut
		438
		439	sub datalog($@) {
		440	my ($type, %kv) = @_;
		441	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
384	}	442	}
385		443
386	=back	444	=back
387		445
388	=cut	446	=cut
…		…
568	$registry = $CB_TYPE[$object_type] ||= [];	626	$registry = $CB_TYPE[$object_type] ||= [];
569		627
570	} elsif ($type eq "subtype") {	628	} elsif ($type eq "subtype") {
571	defined $object_type or Carp::croak "subtype specified without type";	629	defined $object_type or Carp::croak "subtype specified without type";
572	my $object_subtype = shift @arg;	630	my $object_subtype = shift @arg;
573	$registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= [];	631	$registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
574		632
575	} elsif ($type eq "package") {	633	} elsif ($type eq "package") {
576	my $pkg = shift @arg;	634	my $pkg = shift @arg;
577		635
578	while (my ($name, $id) = each %cb_id) {	636	while (my ($name, $id) = each %cb_id) {
…		…
619	if (ref $_[0]) {	677	if (ref $_[0]) {
620	_object_attach @_;	678	_object_attach @_;
621	} else {	679	} else {
622	_attach shift->_attach_registry, @_;	680	_attach shift->_attach_registry, @_;
623	}	681	}
		682	_recalc_want;
624	};	683	};
625		684
626	# all those should be optimised	685	# all those should be optimised
627	sub cf::attachable::detach {	686	sub cf::attachable::detach {
628	my ($obj, $name) = @_;	687	my ($obj, $name) = @_;
…		…
631	delete $obj->{_attachment}{$name};	690	delete $obj->{_attachment}{$name};
632	reattach ($obj);	691	reattach ($obj);
633	} else {	692	} else {
634	Carp::croak "cannot, currently, detach class attachments";	693	Carp::croak "cannot, currently, detach class attachments";
635	}	694	}
		695	_recalc_want;
636	};	696	};
637		697
638	sub cf::attachable::attached {	698	sub cf::attachable::attached {
639	my ($obj, $name) = @_;	699	my ($obj, $name) = @_;
640		700
…		…
813	or return;	873	or return;
814	$av = eval { (Storable::thaw $av)->{objs} };	874	$av = eval { (Storable::thaw $av)->{objs} };
815	}	875	}
816		876
817	warn sprintf "loading %s (%d)\n",	877	warn sprintf "loading %s (%d)\n",
818	$filename, length $data, scalar @{$av || []};#d#	878	$filename, length $data, scalar @{$av || []};
819	return ($data, $av);	879	return ($data, $av);
820	}	880	}
821		881
822	#############################################################################	882	#############################################################################
823	# command handling &c	883	# command handling &c
…		…
883		943
884	cf::override;	944	cf::override;
885	},	945	},
886	);	946	);
887		947
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 {	948	sub load_extensions {
		949	cf::sync_job {
		950	my %todo;
		951
923	for my $ext (<$LIBDIR/*.ext>) {	952	for my $path (<$LIBDIR/*.ext>) {
924	next unless -r $ext;	953	next unless -r $path;
925	eval {	954
926	load_extension $ext;	955	$path =~ /([^\/\\]+)\.ext$/ or die "$path";
		956	my $base = $1;
		957	my $pkg = $1;
		958	$pkg =~ s/[^[:word:]]/_/g;
		959	$pkg = "ext::$pkg";
		960
		961	open my $fh, "<:utf8", $path
		962	or die "$path: $!";
		963
		964	my $source = do { local $/; <$fh> };
		965
		966	my %ext = (
		967	path => $path,
		968	base => $base,
		969	pkg => $pkg,
		970	);
		971
		972	$ext{meta} = { map { split /=/, $_, 2 } split /\s+/, $1 }
		973	if $source =~ /^#!.*?perl.*?#\s*(.*)$/;
		974
		975	$ext{source} =
		976	"package $pkg; use strict; use utf8;\n"
		977	. "#line 1 \"$path\"\n{\n"
		978	. $source
		979	. "\n};\n1";
		980
		981	$todo{$base} = \%ext;
		982	}
		983
		984	my %done;
		985	while (%todo) {
		986	my $progress;
		987
		988	while (my ($k, $v) = each %todo) {
		989	for (split /,\s*/, $ext{meta}{depends}) {
		990	goto skip
		991	unless exists $done{$_};
		992	}
		993
		994	warn "... loading '$k' into '$v->{pkg}'\n";
		995
		996	unless (eval $v->{source}) {
		997	my $msg = $@ ? "$v->{path}: $@\n"
		998	: "extension disabled.\n";
		999
		1000	if (exists $v->{meta}{mandatory}) {
		1001	warn $msg;
		1002	warn "mandatory extension failed to load, exiting.\n";
		1003	exit 1;
		1004	}
		1005
		1006	die $msg;
		1007	}
		1008
		1009	$done{$k} = delete $todo{$k};
		1010	push @EXTS, $v->{pkg};
927	1	1011	}
928	} or warn "$ext not loaded: $@";	1012
		1013	skip:
		1014	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
		1015	unless $progress;
		1016	}
929	}	1017	};
930	}	1018	}
931		1019
932	#############################################################################	1020	#############################################################################
933		1021
934	=head2 CORE EXTENSIONS	1022	=head2 CORE EXTENSIONS
…		…
950	Returns the given player object, loading it if necessary (might block).	1038	Returns the given player object, loading it if necessary (might block).
951		1039
952	=cut	1040	=cut
953		1041
954	sub playerdir($) {	1042	sub playerdir($) {
955	cf::localdir	1043	"$PLAYERDIR/"
956	. "/"
957	. cf::playerdir
958	. "/"
959	. (ref $_[0] ? $_[0]->ob->name : $_[0])	1044	. (ref $_[0] ? $_[0]->ob->name : $_[0])
960	}	1045	}
961		1046
962	sub path($) {	1047	sub path($) {
963	my $login = ref $_[0] ? $_[0]->ob->name : $_[0];	1048	my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
964		1049
965	(playerdir $login) . "/$login.pl"	1050	(playerdir $login) . "/playerdata"
966	}	1051	}
967		1052
968	sub find_active($) {	1053	sub find_active($) {
969	$cf::PLAYER{$_[0]}	1054	$cf::PLAYER{$_[0]}
970	and $cf::PLAYER{$_[0]}->active	1055	and $cf::PLAYER{$_[0]}->active
…		…
983	my $login = $_[0];	1068	my $login = $_[0];
984		1069
985	my $guard = cf::lock_acquire "user_find:$login";	1070	my $guard = cf::lock_acquire "user_find:$login";
986		1071
987	$cf::PLAYER{$_[0]} || do {	1072	$cf::PLAYER{$_[0]} || do {
		1073	# rename old playerfiles to new ones
		1074	#TODO: remove when no longer required
		1075	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
		1076	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
		1077	aio_unlink +(playerdir $login) . "/$login.pl.pst";
		1078	aio_unlink +(playerdir $login) . "/$login.pl";
		1079
988	my $pl = load_pl path $login	1080	my $pl = load_pl path $login
989	or return;	1081	or return;
990	$cf::PLAYER{$login} = $pl	1082	$cf::PLAYER{$login} = $pl
991	}	1083	}
992	}	1084	}
…		…
1076	while and may block, so not sync_job-capable, ever.	1168	while and may block, so not sync_job-capable, ever.
1077		1169
1078	=cut	1170	=cut
1079		1171
1080	sub list_logins {	1172	sub list_logins {
1081	my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir	1173	my $dirs = aio_readdir $PLAYERDIR
1082	or return [];	1174	or return [];
1083		1175
1084	my @logins;	1176	my @logins;
1085		1177
1086	for my $login (@$dirs) {	1178	for my $login (@$dirs) {
…		…
1121	}	1213	}
1122		1214
1123	\@paths	1215	\@paths
1124	}	1216	}
1125		1217
1126	=item $player->ext_reply ($msgid, $msgtype, %msg)	1218	=item $player->ext_reply ($msgid, %msg)
1127		1219
1128	Sends an ext reply to the player.	1220	Sends an ext reply to the player.
1129		1221
1130	=cut	1222	=cut
1131		1223
1132	sub ext_reply($$$%) {	1224	sub ext_reply($$%) {
1133	my ($self, $id, %msg) = @_;	1225	my ($self, $id, %msg) = @_;
1134		1226
1135	$msg{msgid} = $id;	1227	$msg{msgid} = $id;
1136		1228
1137	$self->send ("ext " . cf::to_json \%msg);	1229	$self->send ("ext " . cf::to_json \%msg);
1138	}	1230	}
1139		1231
1140	package cf;	1232	=item $player->ext_event ($type, %msg)
		1233
		1234	Sends an ext event to the client.
		1235
		1236	=cut
		1237
		1238	sub ext_event($$%) {
		1239	my ($self, $type, %msg) = @_;
		1240
		1241	$self->ns->ext_event ($type, %msg);
		1242	}
		1243
		1244	=head3 cf::region
		1245
		1246	=over 4
		1247
		1248	=cut
		1249
		1250	package cf::region;
		1251
		1252	=item cf::region::find_by_path $path
		1253
		1254	Tries to decuce the probable region for a map knowing only its path.
		1255
		1256	=cut
		1257
		1258	sub find_by_path($) {
		1259	my ($path) = @_;
		1260
		1261	my ($match, $specificity);
		1262
		1263	for my $region (list) {
		1264	if ($region->match && $path =~ $region->match) {
		1265	($match, $specificity) = ($region, $region->specificity)
		1266	if $region->specificity > $specificity;
		1267	}
		1268	}
		1269
		1270	$match
		1271	}
1141		1272
1142	=back	1273	=back
1143
1144		1274
1145	=head3 cf::map	1275	=head3 cf::map
1146		1276
1147	=over 4	1277	=over 4
1148		1278
…		…
1203	my ($self, $merge) = @_;	1333	my ($self, $merge) = @_;
1204		1334
1205	# we have to keep some variables in memory intact	1335	# we have to keep some variables in memory intact
1206	local $self->{path};	1336	local $self->{path};
1207	local $self->{load_path};	1337	local $self->{load_path};
1208	local $self->{deny_save};
1209	local $self->{deny_reset};
1210		1338
1211	$self->SUPER::thawer_merge ($merge);	1339	$self->SUPER::thawer_merge ($merge);
1212	}	1340	}
1213		1341
1214	sub normalise {	1342	sub normalise {
…		…
1286		1414
1287	# the original (read-only) location	1415	# the original (read-only) location
1288	sub load_path {	1416	sub load_path {
1289	my ($self) = @_;	1417	my ($self) = @_;
1290		1418
1291	sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}	1419	"$MAPDIR/$self->{path}.map"
1292	}	1420	}
1293		1421
1294	# the temporary/swap location	1422	# the temporary/swap location
1295	sub save_path {	1423	sub save_path {
1296	my ($self) = @_;	1424	my ($self) = @_;
1297		1425
1298	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1426	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1299	sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path	1427	"$TMPDIR/$path.map"
1300	}	1428	}
1301		1429
1302	# the unique path, undef == no special unique path	1430	# the unique path, undef == no special unique path
1303	sub uniq_path {	1431	sub uniq_path {
1304	my ($self) = @_;	1432	my ($self) = @_;
1305		1433
1306	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1434	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1307	sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path	1435	"$UNIQUEDIR/$path"
1308	}	1436	}
1309		1437
1310	# and all this just because we cannot iterate over	1438	# and all this just because we cannot iterate over
1311	# all maps in C++...	1439	# all maps in C++...
1312	sub change_all_map_light {	1440	sub change_all_map_light {
1313	my ($change) = @_;	1441	my ($change) = @_;
1314		1442
1315	$_->change_map_light ($change)	1443	$_->change_map_light ($change)
1316	for grep $_->outdoor, values %cf::MAP;	1444	for grep $_->outdoor, values %cf::MAP;
		1445	}
		1446
		1447	sub decay_objects {
		1448	my ($self) = @_;
		1449
		1450	return if $self->{deny_reset};
		1451
		1452	$self->do_decay_objects;
1317	}	1453	}
1318		1454
1319	sub unlink_save {	1455	sub unlink_save {
1320	my ($self) = @_;	1456	my ($self) = @_;
1321		1457
…		…
1379	$self->load_header_orig	1515	$self->load_header_orig
1380	or return;	1516	or return;
1381	$self->prepare_orig;	1517	$self->prepare_orig;
1382	}	1518	}
1383		1519
		1520	$self->{deny_reset} = 1
		1521	if $self->no_reset;
		1522
		1523	$self->default_region (cf::region::find_by_path $self->{path})
		1524	unless $self->default_region;
		1525
1384	1	1526	1
1385	}	1527	}
1386		1528
1387	sub find;	1529	sub find;
1388	sub find {	1530	sub find {
…		…
1400	$map->{last_save} = $cf::RUNTIME;	1542	$map->{last_save} = $cf::RUNTIME;
1401		1543
1402	$map->load_header	1544	$map->load_header
1403	or return;	1545	or return;
1404		1546
1405	if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)	1547	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1406	# doing this can freeze the server in a sync job, obviously	1548	# doing this can freeze the server in a sync job, obviously
1407	#$cf::WAIT_FOR_TICK->wait;	1549	#$cf::WAIT_FOR_TICK->wait;
1408	$map->reset;	1550	$map->reset;
1409	undef $guard;	1551	undef $guard;
1410	return find $path;	1552	return find $path;
…		…
1421	my ($self) = @_;	1563	my ($self) = @_;
1422		1564
1423	local $self->{deny_reset} = 1; # loading can take a long time	1565	local $self->{deny_reset} = 1; # loading can take a long time
1424		1566
1425	my $path = $self->{path};	1567	my $path = $self->{path};
		1568
		1569	{
1426	my $guard = cf::lock_acquire "map_load:$path";	1570	my $guard = cf::lock_acquire "map_load:$path";
1427		1571
1428	return if $self->in_memory != cf::MAP_SWAPPED;	1572	return if $self->in_memory != cf::MAP_SWAPPED;
1429		1573
1430	$self->in_memory (cf::MAP_LOADING);	1574	$self->in_memory (cf::MAP_LOADING);
1431		1575
1432	$self->alloc;	1576	$self->alloc;
1433		1577
1434	$self->pre_load;	1578	$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;	1579	Coro::cede;
1460	$self->set_darkness_map;	1580
		1581	$self->_load_objects ($self->{load_path}, 1)
		1582	or return;
		1583
		1584	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
		1585	if delete $self->{load_original};
		1586
		1587	if (my $uniq = $self->uniq_path) {
		1588	utf8::encode $uniq;
		1589	if (aio_open $uniq, O_RDONLY, 0) {
		1590	$self->clear_unique_items;
		1591	$self->_load_objects ($uniq, 0);
		1592	}
		1593	}
		1594
		1595	Coro::cede;
		1596	# now do the right thing for maps
		1597	$self->link_multipart_objects;
1461	$self->difficulty ($self->estimate_difficulty)	1598	$self->difficulty ($self->estimate_difficulty)
1462	unless $self->difficulty;	1599	unless $self->difficulty;
1463	Coro::cede;	1600	Coro::cede;
		1601
		1602	unless ($self->{deny_activate}) {
		1603	$self->decay_objects;
		1604	$self->fix_auto_apply;
		1605	$self->update_buttons;
		1606	Coro::cede;
		1607	$self->set_darkness_map;
		1608	Coro::cede;
1464	$self->activate;	1609	$self->activate;
		1610	}
		1611
		1612	$self->in_memory (cf::MAP_IN_MEMORY);
1465	}	1613	}
1466		1614
1467	$self->post_load;	1615	$self->post_load;
1468
1469	$self->in_memory (cf::MAP_IN_MEMORY);
1470	}	1616	}
1471		1617
1472	sub customise_for {	1618	sub customise_for {
1473	my ($self, $ob) = @_;	1619	my ($self, $ob) = @_;
1474		1620
1475	return find "~" . $ob->name . "/" . $self->{path}	1621	return find "~" . $ob->name . "/" . $self->{path}
1476	if $self->per_player;	1622	if $self->per_player;
		1623
		1624	# return find "?party/" . $ob->name . "/" . $self->{path}
		1625	# if $self->per_party;
1477		1626
1478	$self	1627	$self
1479	}	1628	}
1480		1629
1481	# find and load all maps in the 3x3 area around a map	1630	# find and load all maps in the 3x3 area around a map
…		…
1592		1741
1593	sub reset_at {	1742	sub reset_at {
1594	my ($self) = @_;	1743	my ($self) = @_;
1595		1744
1596	# TODO: safety, remove and allow resettable per-player maps	1745	# 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};	1746	return 1e99 if $self->{deny_reset};
1599		1747
1600	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;	1748	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1601	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;	1749	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1602		1750
…		…
1613	my ($self) = @_;	1761	my ($self) = @_;
1614		1762
1615	my $lock = cf::lock_acquire "map_data:$self->{path}";	1763	my $lock = cf::lock_acquire "map_data:$self->{path}";
1616		1764
1617	return if $self->players;	1765	return if $self->players;
1618	return if $self->isa ("ext::map_per_player");#d#
1619		1766
1620	warn "resetting map ", $self->path;#d#	1767	warn "resetting map ", $self->path;
1621		1768
1622	$self->in_memory (cf::MAP_SWAPPED);	1769	$self->in_memory (cf::MAP_SWAPPED);
1623		1770
1624	# need to save uniques path	1771	# need to save uniques path
1625	unless ($self->{deny_save}) {	1772	unless ($self->{deny_save}) {
…		…
1657	$cf::MAP{$self->path} = $self;	1804	$cf::MAP{$self->path} = $self;
1658		1805
1659	$self->reset; # polite request, might not happen	1806	$self->reset; # polite request, might not happen
1660	}	1807	}
1661		1808
		1809	=item $maps = cf::map::tmp_maps
		1810
		1811	Returns an arrayref with all map paths of currently instantiated and saved
		1812	maps. May block.
		1813
		1814	=cut
		1815
		1816	sub tmp_maps() {
		1817	[
		1818	map {
		1819	utf8::decode $_;
		1820	/\.map$/
		1821	? normalise $_
		1822	: ()
		1823	} @{ aio_readdir $TMPDIR or [] }
		1824	]
		1825	}
		1826
		1827	=item $maps = cf::map::random_maps
		1828
		1829	Returns an arrayref with all map paths of currently instantiated and saved
		1830	random maps. May block.
		1831
		1832	=cut
		1833
		1834	sub random_maps() {
		1835	[
		1836	map {
		1837	utf8::decode $_;
		1838	/\.map$/
		1839	? normalise "?random/$_"
		1840	: ()
		1841	} @{ aio_readdir $RANDOMDIR or [] }
		1842	]
		1843	}
		1844
1662	=item cf::map::unique_maps	1845	=item cf::map::unique_maps
1663		1846
1664	Returns an arrayref of paths of all shared maps that have	1847	Returns an arrayref of paths of all shared maps that have
1665	instantiated unique items. May block.	1848	instantiated unique items. May block.
1666		1849
1667	=cut	1850	=cut
1668		1851
1669	sub unique_maps() {	1852	sub unique_maps() {
1670	my $files = aio_readdir cf::localdir . "/" . cf::uniquedir	1853	[
1671	or return;	1854	map {
1672
1673	my @paths;
1674
1675	for (@$files) {
1676	utf8::decode $_;	1855	utf8::decode $_;
1677	next if /\.pst$/;	1856	/\.map$/
1678	next unless /^$PATH_SEP/o;	1857	? normalise $_
1679		1858	: ()
1680	push @paths, cf::map::normalise $_;	1859	} @{ aio_readdir $UNIQUEDIR or [] }
1681	}	1860	]
1682
1683	\@paths
1684	}	1861	}
1685		1862
1686	package cf;	1863	package cf;
1687		1864
1688	=back	1865	=back
…		…
1794	$self->deactivate_recursive;	1971	$self->deactivate_recursive;
1795		1972
1796	return if UNIVERSAL::isa $self->map, "ext::map_link";	1973	return if UNIVERSAL::isa $self->map, "ext::map_link";
1797		1974
1798	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	1975	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1799	if $self->map;	1976	if $self->map && $self->map->{path} ne "{link}";
1800		1977
1801	$self->enter_map ($LINK_MAP || link_map, 10, 10);	1978	$self->enter_map ($LINK_MAP || link_map, 10, 10);
1802	}	1979	}
1803		1980
1804	sub cf::object::player::leave_link {	1981	sub cf::object::player::leave_link {
1805	my ($self, $map, $x, $y) = @_;	1982	my ($self, $map, $x, $y) = @_;
		1983
		1984	return unless $self->contr->active;
1806		1985
1807	my $link_pos = delete $self->{_link_pos};	1986	my $link_pos = delete $self->{_link_pos};
1808		1987
1809	unless ($map) {	1988	unless ($map) {
1810	# restore original map position	1989	# restore original map position
…		…
1833		2012
1834	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2013	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1835	$self->enter_map ($map, $x, $y);	2014	$self->enter_map ($map, $x, $y);
1836	}	2015	}
1837		2016
1838	cf::player->attach (
1839	on_logout => sub {
1840	my ($pl) = @_;
1841
1842	# abort map switching before logout
1843	if ($pl->ob->{_link_pos}) {
1844	cf::sync_job {
1845	$pl->ob->leave_link
1846	};
1847	}
1848	},
1849	on_login => sub {
1850	my ($pl) = @_;
1851
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)	2017	=item $player_object->goto ($path, $x, $y[, $check->($map)])
1871		2018
		2019	Moves the player to the given map-path and coordinates by first freezing
		2020	her, loading and preparing them map, calling the provided $check callback
		2021	that has to return the map if sucecssful, and then unfreezes the player on
		2022	the new (success) or old (failed) map position.
		2023
1872	=cut	2024	=cut
		2025
		2026	our $GOTOGEN;
1873		2027
1874	sub cf::object::player::goto {	2028	sub cf::object::player::goto {
1875	my ($self, $path, $x, $y) = @_;	2029	my ($self, $path, $x, $y, $check) = @_;
		2030
		2031	# do generation counting so two concurrent goto's will be executed in-order
		2032	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1876		2033
1877	$self->enter_link;	2034	$self->enter_link;
1878		2035
1879	(async {	2036	(async {
1880	my $map = eval {	2037	my $map = eval {
1881	my $map = cf::map::find $path;	2038	my $map = cf::map::find $path;
		2039
		2040	if ($map) {
1882	$map = $map->customise_for ($self) if $map;	2041	$map = $map->customise_for ($self);
		2042	$map = $check->($map) if $check && $map;
		2043	} else {
		2044	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
		2045	}
		2046
1883	$map	2047	$map
		2048	};
		2049
		2050	if ($@) {
		2051	$self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
		2052	LOG llevError | logBacktrace, Carp::longmess $@;
1884	} or	2053	}
1885	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1886		2054
		2055	if ($gen == $self->{_goto_generation}) {
		2056	delete $self->{_goto_generation};
1887	$self->leave_link ($map, $x, $y);	2057	$self->leave_link ($map, $x, $y);
		2058	}
1888	})->prio (1);	2059	})->prio (1);
1889	}	2060	}
1890		2061
1891	=item $player_object->enter_exit ($exit_object)	2062	=item $player_object->enter_exit ($exit_object)
1892		2063
…		…
1931		2102
1932	$rmp->{random_seed} ||= $exit->random_seed;	2103	$rmp->{random_seed} ||= $exit->random_seed;
1933		2104
1934	my $data = cf::to_json $rmp;	2105	my $data = cf::to_json $rmp;
1935	my $md5 = Digest::MD5::md5_hex $data;	2106	my $md5 = Digest::MD5::md5_hex $data;
1936	my $meta = "$cf::RANDOM_MAPS/$md5.meta";	2107	my $meta = "$RANDOMDIR/$md5.meta";
1937		2108
1938	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {	2109	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1939	aio_write $fh, 0, (length $data), $data, 0;	2110	aio_write $fh, 0, (length $data), $data, 0;
1940	undef $fh;	2111	undef $fh;
1941	aio_rename "$meta~", $meta;	2112	aio_rename "$meta~", $meta;
…		…
1950		2121
1951	return unless $self->type == cf::PLAYER;	2122	return unless $self->type == cf::PLAYER;
1952		2123
1953	if ($exit->slaying eq "/!") {	2124	if ($exit->slaying eq "/!") {
1954	#TODO: this should de-fi-ni-te-ly not be a sync-job	2125	#TODO: this should de-fi-ni-te-ly not be a sync-job
		2126	# the problem is that $exit might not survive long enough
		2127	# so it needs to be done right now, right here
1955	cf::sync_job { prepare_random_map $exit };	2128	cf::sync_job { prepare_random_map $exit };
1956	}	2129	}
1957		2130
1958	my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2131	my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1959	my $hp = $exit->stats->hp;	2132	my $hp = $exit->stats->hp;
…		…
1967	$self->goto ($slaying, $hp, $sp);	2140	$self->goto ($slaying, $hp, $sp);
1968		2141
1969	1;	2142	1;
1970	}) {	2143	}) {
1971	$self->message ("Something went wrong deep within the crossfire server. "	2144	$self->message ("Something went wrong deep within the crossfire server. "
1972	. "I'll try to bring you back to the map you were before. "	2145	. "I'll try to bring you back to the map you were before. "
1973	. "Please report this to the dungeon master!",	2146	. "Please report this to the dungeon master!",
1974	cf::NDI_UNIQUE | cf::NDI_RED);	2147	cf::NDI_UNIQUE | cf::NDI_RED);
1975		2148
1976	warn "ERROR in enter_exit: $@";	2149	warn "ERROR in enter_exit: $@";
1977	$self->leave_link;	2150	$self->leave_link;
1978	}	2151	}
1979	})->prio (1);	2152	})->prio (1);
…		…
1992		2165
1993	sub cf::client::send_drawinfo {	2166	sub cf::client::send_drawinfo {
1994	my ($self, $text, $flags) = @_;	2167	my ($self, $text, $flags) = @_;
1995		2168
1996	utf8::encode $text;	2169	utf8::encode $text;
1997	$self->send_packet (sprintf "drawinfo %d %s", $flags, $text);	2170	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1998	}	2171	}
1999		2172
		2173	=item $client->ext_event ($type, %msg)
		2174
		2175	Sends an exti event to the client.
		2176
		2177	=cut
		2178
		2179	sub cf::client::ext_event($$%) {
		2180	my ($self, $type, %msg) = @_;
		2181
		2182	$msg{msgtype} = "event_$type";
		2183	$self->send_packet ("ext " . cf::to_json \%msg);
		2184	}
2000		2185
2001	=item $success = $client->query ($flags, "text", \&cb)	2186	=item $success = $client->query ($flags, "text", \&cb)
2002		2187
2003	Queues a query to the client, calling the given callback with	2188	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>,	2189	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
…		…
2101		2286
2102	# here we export the classes and methods available to script code	2287	# here we export the classes and methods available to script code
2103		2288
2104	=pod	2289	=pod
2105		2290
2106	The following fucntions and emthods are available within a safe environment:	2291	The following functions and methods are available within a safe environment:
2107		2292
2108	cf::object contr pay_amount pay_player map	2293	cf::object contr pay_amount pay_player map
2109	cf::object::player player	2294	cf::object::player player
2110	cf::player peaceful	2295	cf::player peaceful
2111	cf::map trigger	2296	cf::map trigger
…		…
2196	#############################################################################	2381	#############################################################################
2197		2382
2198	=head2 EXTENSION DATABASE SUPPORT	2383	=head2 EXTENSION DATABASE SUPPORT
2199		2384
2200	Crossfire maintains a very simple database for extension use. It can	2385	Crossfire maintains a very simple database for extension use. It can
2201	currently store anything that can be serialised using Storable, which	2386	currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2202	excludes objects.	2387	convert to/from binary).
2203		2388
2204	The parameter C<$family> should best start with the name of the extension	2389	The parameter C<$family> should best start with the name of the extension
2205	using it, it should be unique.	2390	using it, it should be unique.
2206		2391
2207	=over 4	2392	=over 4
…		…
2230	BDB::CREATE | BDB::AUTO_COMMIT, 0666;	2415	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2231	cf::cleanup "db_open(db): $!" if $!;	2416	cf::cleanup "db_open(db): $!" if $!;
2232	};	2417	};
2233	cf::cleanup "db_open(db): $@" if $@;	2418	cf::cleanup "db_open(db): $@" if $@;
2234	};	2419	};
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	}	2420	}
2250	}	2421	}
2251		2422
2252	sub db_get($$) {	2423	sub db_get($$) {
2253	my $key = "$_[0]/$_[1]";	2424	my $key = "$_[0]/$_[1]";
2254		2425
2255	cf::sync_job {	2426	cf::sync_job {
2256	BDB::db_get $DB, undef, $key, my $data;	2427	BDB::db_get $DB, undef, $key, my $data;
2257		2428
2258	$! ? ()	2429	$! ? ()
2259	: Compress::LZF::sthaw $data	2430	: $data
2260	}	2431	}
2261	}	2432	}
2262		2433
2263	sub db_put($$$) {	2434	sub db_put($$$) {
2264	BDB::dbreq_pri 4;	2435	BDB::dbreq_pri 4;
2265	BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };	2436	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
		2437	}
		2438
		2439	=item cf::cache $id => [$paths...], $processversion => $process
		2440
		2441	Generic caching function that returns the value of the resource $id,
		2442	caching and regenerating as required.
		2443
		2444	This function can block.
		2445
		2446	=cut
		2447
		2448	sub cache {
		2449	my ($id, $src, $processversion, $process) = @_;
		2450
		2451	my $meta =
		2452	join "\x00",
		2453	$processversion,
		2454	map {
		2455	aio_stat $_
		2456	and Carp::croak "$_: $!";
		2457
		2458	($_, (stat _)[7,9])
		2459	} @$src;
		2460
		2461	my $dbmeta = db_get cache => "$id/meta";
		2462	if ($dbmeta ne $meta) {
		2463	# changed, we may need to process
		2464
		2465	my @data;
		2466	my $md5;
		2467
		2468	for (0 .. $#$src) {
		2469	0 <= aio_load $src->[$_], $data[$_]
		2470	or Carp::croak "$src->[$_]: $!";
		2471	}
		2472
		2473	# if processing is expensive, check
		2474	# checksum first
		2475	if (1) {
		2476	$md5 =
		2477	join "\x00",
		2478	$processversion,
		2479	map {
		2480	Coro::cede;
		2481	($src->[$_], Digest::MD5::md5_hex $data[$_])
		2482	} 0.. $#$src;
		2483
		2484
		2485	my $dbmd5 = db_get cache => "$id/md5";
		2486	if ($dbmd5 eq $md5) {
		2487	db_put cache => "$id/meta", $meta;
		2488
		2489	return db_get cache => "$id/data";
		2490	}
		2491	}
		2492
		2493	my $t1 = Time::HiRes::time;
		2494	my $data = $process->(\@data);
		2495	my $t2 = Time::HiRes::time;
		2496
		2497	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
		2498
		2499	db_put cache => "$id/data", $data;
		2500	db_put cache => "$id/md5" , $md5;
		2501	db_put cache => "$id/meta", $meta;
		2502
		2503	return $data;
		2504	}
		2505
		2506	db_get cache => "$id/data"
		2507	}
		2508
		2509	=item fork_call { }, $args
		2510
		2511	Executes the given code block with the given arguments in a seperate
		2512	process, returning the results. Everything must be serialisable with
		2513	Coro::Storable. May, of course, block. Note that the executed sub may
		2514	never block itself or use any form of Event handling.
		2515
		2516	=cut
		2517
		2518	sub fork_call(&@) {
		2519	my ($cb, @args) = @_;
		2520
		2521	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
		2522	# or die "socketpair: $!";
		2523	pipe my $fh1, my $fh2
		2524	or die "pipe: $!";
		2525
		2526	if (my $pid = fork) {
		2527	close $fh2;
		2528
		2529	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
		2530	$res = Coro::Storable::thaw $res;
		2531
		2532	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
		2533
		2534	die $$res unless "ARRAY" eq ref $res;
		2535
		2536	return wantarray ? @$res : $res->[-1];
		2537	} else {
		2538	reset_signals;
		2539	local $SIG{__WARN__};
		2540	local $SIG{__DIE__};
		2541	eval {
		2542	close $fh1;
		2543
		2544	my @res = eval { $cb->(@args) };
		2545	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
		2546	};
		2547
		2548	warn $@ if $@;
		2549	_exit 0;
		2550	}
2266	}	2551	}
2267		2552
2268	#############################################################################	2553	#############################################################################
2269	# the server's init and main functions	2554	# the server's init and main functions
2270		2555
2271	sub init_resources {	2556	sub load_facedata($) {
2272	load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir	2557	my ($path) = @_;
		2558
		2559	warn "loading facedata from $path\n";
		2560
		2561	my $facedata;
		2562	0 < aio_load $path, $facedata
		2563	or die "$path: $!";
		2564
		2565	$facedata = Coro::Storable::thaw $facedata;
		2566
		2567	$facedata->{version} == 2
		2568	or cf::cleanup "$path: version mismatch, cannot proceed.";
		2569
		2570	{
		2571	my $faces = $facedata->{faceinfo};
		2572
		2573	while (my ($face, $info) = each %$faces) {
		2574	my $idx = (cf::face::find $face) || cf::face::alloc $face;
		2575	cf::face::set $idx, $info->{visibility}, $info->{magicmap};
		2576	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
		2577	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
		2578	Coro::cede;
		2579	}
		2580
		2581	while (my ($face, $info) = each %$faces) {
		2582	next unless $info->{smooth};
		2583	my $idx = cf::face::find $face
		2584	or next;
		2585	if (my $smooth = cf::face::find $info->{smooth}) {
		2586	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
		2587	} else {
		2588	warn "smooth face '$info->{smooth}' not found for face '$face'";
		2589	}
		2590	Coro::cede;
		2591	}
		2592	}
		2593
		2594	{
		2595	my $anims = $facedata->{animinfo};
		2596
		2597	while (my ($anim, $info) = each %$anims) {
		2598	cf::anim::set $anim, $info->{frames}, $info->{facings};
		2599	Coro::cede;
		2600	}
		2601
		2602	cf::anim::invalidate_all; # d'oh
		2603	}
		2604
		2605	1
		2606	}
		2607
		2608	sub reload_regions {
		2609	load_resource_file "$MAPDIR/regions"
2273	or die "unable to load regions file\n";#d#	2610	or die "unable to load regions file\n";
		2611	}
		2612
		2613	sub reload_facedata {
		2614	load_facedata "$DATADIR/facedata"
		2615	or die "unable to load facedata\n";
		2616	}
		2617
		2618	sub reload_archetypes {
		2619	load_resource_file "$DATADIR/archetypes"
		2620	or die "unable to load archetypes\n";
		2621	}
		2622
		2623	sub reload_treasures {
		2624	load_resource_file "$DATADIR/treasures"
		2625	or die "unable to load treasurelists\n";
		2626	}
		2627
		2628	sub reload_resources {
		2629	warn "reloading resource files...\n";
		2630
		2631	reload_regions;
		2632	reload_facedata;
		2633	#reload_archetypes;#d#
		2634	reload_archetypes;
		2635	reload_treasures;
		2636
		2637	warn "finished reloading resource files\n";
		2638	}
		2639
		2640	sub init {
		2641	reload_resources;
2274	}	2642	}
2275		2643
2276	sub cfg_load {	2644	sub cfg_load {
2277	open my $fh, "<:utf8", cf::confdir . "/config"	2645	open my $fh, "<:utf8", "$CONFDIR/config"
2278	or return;	2646	or return;
2279		2647
2280	local $/;	2648	local $/;
2281	*CFG = YAML::Syck::Load <$fh>;	2649	*CFG = YAML::Syck::Load <$fh>;
2282		2650
…		…
2290	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	2658	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2291	and die "WARNING: m(un)lockall failed: $!\n";	2659	and die "WARNING: m(un)lockall failed: $!\n";
2292	};	2660	};
2293	warn $@ if $@;	2661	warn $@ if $@;
2294	}	2662	}
2295	}
2296
2297	sub init {
2298	init_resources;
2299	}	2663	}
2300		2664
2301	sub main {	2665	sub main {
2302	# we must not ever block the main coroutine	2666	# we must not ever block the main coroutine
2303	local $Coro::idle = sub {	2667	local $Coro::idle = sub {
…		…
2371		2735
2372	warn Carp::longmess "post_cleanup backtrace"	2736	warn Carp::longmess "post_cleanup backtrace"
2373	if $make_core;	2737	if $make_core;
2374	}	2738	}
2375		2739
2376	sub reload() {	2740	sub do_reload_perl() {
2377	# can/must only be called in main	2741	# can/must only be called in main
2378	if ($Coro::current != $Coro::main) {	2742	if ($Coro::current != $Coro::main) {
2379	warn "can only reload from main coroutine";	2743	warn "can only reload from main coroutine";
2380	return;	2744	return;
2381	}	2745	}
…		…
2406	Coro::cede;	2770	Coro::cede;
2407	last unless IO::AIO::nreqs || BDB::nreqs;	2771	last unless IO::AIO::nreqs || BDB::nreqs;
2408	warn "iterate...";	2772	warn "iterate...";
2409	}	2773	}
2410		2774
		2775	++$RELOAD;
		2776
2411	warn "cancelling all extension coros";	2777	warn "cancelling all extension coros";
2412	$_->cancel for values %EXT_CORO;	2778	$_->cancel for values %EXT_CORO;
2413	%EXT_CORO = ();	2779	%EXT_CORO = ();
2414		2780
2415	warn "removing commands";	2781	warn "removing commands";
…		…
2454	Symbol::delete_package "safe::$_"	2820	Symbol::delete_package "safe::$_"
2455	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	2821	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2456		2822
2457	warn "unloading cf.pm \"a bit\"";	2823	warn "unloading cf.pm \"a bit\"";
2458	delete $INC{"cf.pm"};	2824	delete $INC{"cf.pm"};
		2825	delete $INC{"cf/pod.pm"};
2459		2826
2460	# don't, removes xs symbols, too,	2827	# don't, removes xs symbols, too,
2461	# and global variables created in xs	2828	# and global variables created in xs
2462	#Symbol::delete_package __PACKAGE__;	2829	#Symbol::delete_package __PACKAGE__;
2463		2830
…		…
2478	warn "reattaching attachments to maps";	2845	warn "reattaching attachments to maps";
2479	reattach $_ for values %MAP;	2846	reattach $_ for values %MAP;
2480	warn "reattaching attachments to players";	2847	warn "reattaching attachments to players";
2481	reattach $_ for values %PLAYER;	2848	reattach $_ for values %PLAYER;
2482		2849
2483	warn "loading reloadable resources";
2484	init_resources;
2485
2486	warn "leaving sync_job";	2850	warn "leaving sync_job";
2487		2851
2488	1	2852	1
2489	} or do {	2853	} or do {
2490	warn $@;	2854	warn $@;
…		…
2495	warn "reloaded";	2859	warn "reloaded";
2496	};	2860	};
2497		2861
2498	our $RELOAD_WATCHER; # used only during reload	2862	our $RELOAD_WATCHER; # used only during reload
2499		2863
		2864	sub reload_perl() {
		2865	# doing reload synchronously and two reloads happen back-to-back,
		2866	# coro crashes during coro_state_free->destroy here.
		2867
		2868	$RELOAD_WATCHER ||= Event->timer (
		2869	reentrant => 0,
		2870	after => 0,
		2871	data => WF_AUTOCANCEL,
		2872	cb => sub {
		2873	do_reload_perl;
		2874	undef $RELOAD_WATCHER;
		2875	},
		2876	);
		2877	}
		2878
2500	register_command "reload" => sub {	2879	register_command "reload" => sub {
2501	my ($who, $arg) = @_;	2880	my ($who, $arg) = @_;
2502		2881
2503	if ($who->flag (FLAG_WIZ)) {	2882	if ($who->flag (FLAG_WIZ)) {
2504	$who->message ("reloading server.");	2883	$who->message ("reloading server.");
2505		2884	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	}	2885	}
2519	};	2886	};
2520		2887
2521	unshift @INC, $LIBDIR;	2888	unshift @INC, $LIBDIR;
2522		2889
2523	my $bug_warning = 0;	2890	my $bug_warning = 0;
2524		2891
		2892	our @WAIT_FOR_TICK;
		2893	our @WAIT_FOR_TICK_BEGIN;
		2894
		2895	sub wait_for_tick {
		2896	return unless $TICK_WATCHER->is_active;
		2897	return if $Coro::current == $Coro::main;
		2898
		2899	my $signal = new Coro::Signal;
		2900	push @WAIT_FOR_TICK, $signal;
		2901	$signal->wait;
		2902	}
		2903
		2904	sub wait_for_tick_begin {
		2905	return unless $TICK_WATCHER->is_active;
		2906	return if $Coro::current == $Coro::main;
		2907
		2908	my $signal = new Coro::Signal;
		2909	push @WAIT_FOR_TICK_BEGIN, $signal;
		2910	$signal->wait;
		2911	}
		2912
		2913	my $min = 1e6;#d#
		2914	my $avg = 10;
2525	$TICK_WATCHER = Event->timer (	2915	$TICK_WATCHER = Event->timer (
2526	reentrant => 0,	2916	reentrant => 0,
2527	parked => 1,	2917	parked => 1,
2528	prio => 0,	2918	prio => 0,
2529	at => $NEXT_TICK || $TICK,	2919	at => $NEXT_TICK || $TICK,
…		…
2533	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	2923	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2534	unless ++$bug_warning > 10;	2924	unless ++$bug_warning > 10;
2535	return;	2925	return;
2536	}	2926	}
2537		2927
2538	$NOW = Event::time;	2928	$NOW = $tick_start = Event::time;
2539		2929
2540	cf::server_tick; # one server iteration	2930	cf::server_tick; # one server iteration
		2931
		2932	0 && sync_job {#d#
		2933	for(1..10) {
		2934	my $t = Event::time;
		2935	my $map = my $map = new_from_path cf::map "/tmp/x.map"
		2936	or die;
		2937
		2938	$map->width (50);
		2939	$map->height (50);
		2940	$map->alloc;
		2941	$map->_load_objects ("/tmp/x.map", 1);
		2942	my $t = Event::time - $t;
		2943
		2944	#next unless $t < 0.0013;#d#
		2945	if ($t < $min) {
		2946	$min = $t;
		2947	}
		2948	$avg = $avg * 0.99 + $t * 0.01;
		2949	}
		2950	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
		2951	exit 0;
		2952	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
		2953	};
		2954
2541	$RUNTIME += $TICK;	2955	$RUNTIME += $TICK;
2542	$NEXT_TICK += $TICK;	2956	$NEXT_TICK += $TICK;
2543		2957
2544	if ($NOW >= $NEXT_RUNTIME_WRITE) {	2958	if ($NOW >= $NEXT_RUNTIME_WRITE) {
2545	$NEXT_RUNTIME_WRITE = $NOW + 10;	2959	$NEXT_RUNTIME_WRITE = $NOW + 10;
…		…
2547	write_runtime	2961	write_runtime
2548	or warn "ERROR: unable to write runtime file: $!";	2962	or warn "ERROR: unable to write runtime file: $!";
2549	};	2963	};
2550	}	2964	}
2551		2965
2552	$WAIT_FOR_TICK->broadcast;
2553	$WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2554
2555	# my $AFTER = Event::time;	2966	# my $AFTER = Event::time;
2556	# warn $AFTER - $NOW;#d#	2967	# warn $AFTER - $NOW;#d#
2557		2968
		2969	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
		2970	$sig->send;
		2971	}
		2972	while (my $sig = shift @WAIT_FOR_TICK) {
		2973	$sig->send;
		2974	}
		2975
		2976	$NOW = Event::time;
		2977
2558	# if we are delayed by four ticks or more, skip them all	2978	# if we are delayed by four ticks or more, skip them all
2559	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;	2979	$NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2560		2980
2561	$TICK_WATCHER->at ($NEXT_TICK);	2981	$TICK_WATCHER->at ($NEXT_TICK);
2562	$TICK_WATCHER->start;	2982	$TICK_WATCHER->start;
		2983
		2984	$LOAD = ($NOW - $tick_start) / $TICK;
		2985	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
		2986
		2987	_post_tick;
		2988
		2989
2563	},	2990	},
2564	);	2991	);
2565		2992
2566	{	2993	{
2567	BDB::max_poll_time $TICK * 0.1;	2994	BDB::max_poll_time $TICK * 0.1;
…		…
2595		3022
2596	cf::sync_job {	3023	cf::sync_job {
2597	eval {	3024	eval {
2598	BDB::db_env_open	3025	BDB::db_env_open
2599	$DB_ENV,	3026	$DB_ENV,
2600	$BDB_ENV_DIR,	3027	$BDBDIR,
2601	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN	3028	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2602	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,	3029	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2603	0666;	3030	0666;
2604		3031
2605	cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;	3032	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2606		3033
2607	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);	3034	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2608	$DB_ENV->set_lk_detect;	3035	$DB_ENV->set_lk_detect;
2609	};	3036	};
2610		3037
…		…
2626	prio => 6,	3053	prio => 6,
2627	cb => \&IO::AIO::poll_cb,	3054	cb => \&IO::AIO::poll_cb,
2628	);	3055	);
2629	}	3056	}
2630		3057
		3058	my $_log_backtrace;
		3059
		3060	sub _log_backtrace {
		3061	my ($msg, @addr) = @_;
		3062
		3063	$msg =~ s/\n//;
		3064
		3065	# limit the # of concurrent backtraces
		3066	if ($_log_backtrace < 2) {
		3067	++$_log_backtrace;
		3068	async {
		3069	my @bt = fork_call {
		3070	@addr = map { sprintf "%x", $_ } @addr;
		3071	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
		3072	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
		3073	or die "addr2line: $!";
		3074
		3075	my @funcs;
		3076	my @res = <$fh>;
		3077	chomp for @res;
		3078	while (@res) {
		3079	my ($func, $line) = splice @res, 0, 2, ();
		3080	push @funcs, "[$func] $line";
		3081	}
		3082
		3083	@funcs
		3084	};
		3085
		3086	LOG llevInfo, "[ABT] $msg\n";
		3087	LOG llevInfo, "[ABT] $_\n" for @bt;
		3088	--$_log_backtrace;
		3089	};
		3090	} else {
		3091	LOG llevInfo, "[ABT] $msg\n";
		3092	LOG llevInfo, "[ABT] [suppressed]\n";
		3093	}
		3094	}
		3095
		3096	# load additional modules
		3097	use cf::pod;
		3098
2631	END { cf::emergency_save }	3099	END { cf::emergency_save }
2632		3100
2633	1	3101	1
2634		3102

Diff Legend

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