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.215 by root, Thu Feb 15 03:19:02 2007 UTC vs.
Revision 1.276 by root, Sun Jun 10 04:05:47 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 {
359	my $runtime = cf::localdir . "/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
		403	my $guard = cf::lock_acquire "write_runtime";
360		404
361	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644	405	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
362	or return;	406	or return;
363		407
364	my $value = $cf::RUNTIME + 90 + 10;	408	my $value = $cf::RUNTIME + 90 + 10;
…		…
370		414
371	# always fsync - this file is important	415	# always fsync - this file is important
372	aio_fsync $fh	416	aio_fsync $fh
373	and return;	417	and return;
374		418
		419	# touch it again to show we are up-to-date
		420	aio_utime $fh, undef, undef;
		421
375	close $fh	422	close $fh
376	or return;	423	or return;
377		424
378	aio_rename "$runtime~", $runtime	425	aio_rename "$runtime~", $runtime
379	and return;	426	and return;
380		427
		428	warn "runtime file written.\n";
		429
381	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 });
382	}	442	}
383		443
384	=back	444	=back
385		445
386	=cut	446	=cut
…		…
566	$registry = $CB_TYPE[$object_type] ||= [];	626	$registry = $CB_TYPE[$object_type] ||= [];
567		627
568	} elsif ($type eq "subtype") {	628	} elsif ($type eq "subtype") {
569	defined $object_type or Carp::croak "subtype specified without type";	629	defined $object_type or Carp::croak "subtype specified without type";
570	my $object_subtype = shift @arg;	630	my $object_subtype = shift @arg;
571	$registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= [];	631	$registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
572		632
573	} elsif ($type eq "package") {	633	} elsif ($type eq "package") {
574	my $pkg = shift @arg;	634	my $pkg = shift @arg;
575		635
576	while (my ($name, $id) = each %cb_id) {	636	while (my ($name, $id) = each %cb_id) {
…		…
617	if (ref $_[0]) {	677	if (ref $_[0]) {
618	_object_attach @_;	678	_object_attach @_;
619	} else {	679	} else {
620	_attach shift->_attach_registry, @_;	680	_attach shift->_attach_registry, @_;
621	}	681	}
		682	_recalc_want;
622	};	683	};
623		684
624	# all those should be optimised	685	# all those should be optimised
625	sub cf::attachable::detach {	686	sub cf::attachable::detach {
626	my ($obj, $name) = @_;	687	my ($obj, $name) = @_;
…		…
629	delete $obj->{_attachment}{$name};	690	delete $obj->{_attachment}{$name};
630	reattach ($obj);	691	reattach ($obj);
631	} else {	692	} else {
632	Carp::croak "cannot, currently, detach class attachments";	693	Carp::croak "cannot, currently, detach class attachments";
633	}	694	}
		695	_recalc_want;
634	};	696	};
635		697
636	sub cf::attachable::attached {	698	sub cf::attachable::attached {
637	my ($obj, $name) = @_;	699	my ($obj, $name) = @_;
638		700
…		…
785	}	847	}
786	} else {	848	} else {
787	aio_unlink $filename;	849	aio_unlink $filename;
788	aio_unlink "$filename.pst";	850	aio_unlink "$filename.pst";
789	}	851	}
790
791	#d##TODO# nuke non .map-files if exist
792	if ($filename =~ s/\.map$//) {
793	aio_unlink $filename;
794	aio_unlink "$filename.pst";
795	}
796	}	852	}
797	}	853	}
798		854
799	sub object_freezer_as_string {	855	sub object_freezer_as_string {
800	my ($rdata, $objs) = @_;	856	my ($rdata, $objs) = @_;
…		…
806		862
807	sub object_thawer_load {	863	sub object_thawer_load {
808	my ($filename) = @_;	864	my ($filename) = @_;
809		865
810	my ($data, $av);	866	my ($data, $av);
811
812	#d#TODO remove .map if file does not exist
813	aio_stat $filename and $filename =~ s/\.map$//;
814		867
815	(aio_load $filename, $data) >= 0	868	(aio_load $filename, $data) >= 0
816	or return;	869	or return;
817		870
818	unless (aio_stat "$filename.pst") {	871	unless (aio_stat "$filename.pst") {
…		…
820	or return;	873	or return;
821	$av = eval { (Storable::thaw $av)->{objs} };	874	$av = eval { (Storable::thaw $av)->{objs} };
822	}	875	}
823		876
824	warn sprintf "loading %s (%d)\n",	877	warn sprintf "loading %s (%d)\n",
825	$filename, length $data, scalar @{$av || []};#d#	878	$filename, length $data, scalar @{$av || []};
826	return ($data, $av);	879	return ($data, $av);
827	}	880	}
828		881
829	#############################################################################	882	#############################################################################
830	# command handling &c	883	# command handling &c
…		…
957	Returns the given player object, loading it if necessary (might block).	1010	Returns the given player object, loading it if necessary (might block).
958		1011
959	=cut	1012	=cut
960		1013
961	sub playerdir($) {	1014	sub playerdir($) {
962	cf::localdir	1015	"$PLAYERDIR/"
963	. "/"
964	. cf::playerdir
965	. "/"
966	. (ref $_[0] ? $_[0]->ob->name : $_[0])	1016	. (ref $_[0] ? $_[0]->ob->name : $_[0])
967	}	1017	}
968		1018
969	sub path($) {	1019	sub path($) {
970	my $login = ref $_[0] ? $_[0]->ob->name : $_[0];	1020	my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
971		1021
972	(playerdir $login) . "/$login.pl"	1022	(playerdir $login) . "/playerdata"
973	}	1023	}
974		1024
975	sub find_active($) {	1025	sub find_active($) {
976	$cf::PLAYER{$_[0]}	1026	$cf::PLAYER{$_[0]}
977	and $cf::PLAYER{$_[0]}->active	1027	and $cf::PLAYER{$_[0]}->active
…		…
990	my $login = $_[0];	1040	my $login = $_[0];
991		1041
992	my $guard = cf::lock_acquire "user_find:$login";	1042	my $guard = cf::lock_acquire "user_find:$login";
993		1043
994	$cf::PLAYER{$_[0]} || do {	1044	$cf::PLAYER{$_[0]} || do {
		1045	# rename old playerfiles to new ones
		1046	#TODO: remove when no longer required
		1047	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
		1048	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
		1049	aio_unlink +(playerdir $login) . "/$login.pl.pst";
		1050	aio_unlink +(playerdir $login) . "/$login.pl";
		1051
995	my $pl = load_pl path $login	1052	my $pl = load_pl path $login
996	or return;	1053	or return;
997	$cf::PLAYER{$login} = $pl	1054	$cf::PLAYER{$login} = $pl
998	}	1055	}
999	}	1056	}
…		…
1036		1093
1037	=cut	1094	=cut
1038		1095
1039	sub quit_character {	1096	sub quit_character {
1040	my ($pl) = @_;	1097	my ($pl) = @_;
		1098
		1099	my $name = $pl->ob->name;
1041		1100
1042	$pl->{deny_save} = 1;	1101	$pl->{deny_save} = 1;
1043	$pl->password ("*"); # this should lock out the player until we nuked the dir	1102	$pl->password ("*"); # this should lock out the player until we nuked the dir
1044		1103
1045	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1104	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
…		…
1050	my $path = playerdir $pl;	1109	my $path = playerdir $pl;
1051	my $temp = "$path~$cf::RUNTIME~deleting~";	1110	my $temp = "$path~$cf::RUNTIME~deleting~";
1052	aio_rename $path, $temp;	1111	aio_rename $path, $temp;
1053	delete $cf::PLAYER{$pl->ob->name};	1112	delete $cf::PLAYER{$pl->ob->name};
1054	$pl->destroy;	1113	$pl->destroy;
		1114
		1115	my $prefix = qr<^~\Q$name\E/>;
		1116
		1117	# nuke player maps
		1118	$cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
		1119
1055	IO::AIO::aio_rmtree $temp;	1120	IO::AIO::aio_rmtree $temp;
		1121	}
		1122
		1123	=item $pl->kick
		1124
		1125	Kicks a player out of the game. This destroys the connection.
		1126
		1127	=cut
		1128
		1129	sub kick {
		1130	my ($pl, $kicker) = @_;
		1131
		1132	$pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
		1133	$pl->killer ("kicked");
		1134	$pl->ns->destroy;
1056	}	1135	}
1057		1136
1058	=item cf::player::list_logins	1137	=item cf::player::list_logins
1059		1138
1060	Returns am arrayref of all valid playernames in the system, can take a	1139	Returns am arrayref of all valid playernames in the system, can take a
1061	while and may block, so not sync_job-capable, ever.	1140	while and may block, so not sync_job-capable, ever.
1062		1141
1063	=cut	1142	=cut
1064		1143
1065	sub list_logins {	1144	sub list_logins {
1066	my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir	1145	my $dirs = aio_readdir $PLAYERDIR
1067	or return [];	1146	or return [];
1068		1147
1069	my @logins;	1148	my @logins;
1070		1149
1071	for my $login (@$dirs) {	1150	for my $login (@$dirs) {
…		…
1106	}	1185	}
1107		1186
1108	\@paths	1187	\@paths
1109	}	1188	}
1110		1189
1111	=item $player->ext_reply ($msgid, $msgtype, %msg)	1190	=item $player->ext_reply ($msgid, %msg)
1112		1191
1113	Sends an ext reply to the player.	1192	Sends an ext reply to the player.
1114		1193
1115	=cut	1194	=cut
1116		1195
1117	sub ext_reply($$$%) {	1196	sub ext_reply($$%) {
1118	my ($self, $id, %msg) = @_;	1197	my ($self, $id, %msg) = @_;
1119		1198
1120	$msg{msgid} = $id;	1199	$msg{msgid} = $id;
1121		1200
1122	$self->send ("ext " . cf::to_json \%msg);	1201	$self->send ("ext " . cf::to_json \%msg);
1123	}	1202	}
1124		1203
1125	package cf;	1204	=item $player->ext_event ($type, %msg)
		1205
		1206	Sends an ext event to the client.
		1207
		1208	=cut
		1209
		1210	sub ext_event($$%) {
		1211	my ($self, $type, %msg) = @_;
		1212
		1213	$self->ns->ext_event ($type, %msg);
		1214	}
		1215
		1216	=head3 cf::region
		1217
		1218	=over 4
		1219
		1220	=cut
		1221
		1222	package cf::region;
		1223
		1224	=item cf::region::find_by_path $path
		1225
		1226	Tries to decuce the probable region for a map knowing only its path.
		1227
		1228	=cut
		1229
		1230	sub find_by_path($) {
		1231	my ($path) = @_;
		1232
		1233	my ($match, $specificity);
		1234
		1235	for my $region (list) {
		1236	if ($region->match && $path =~ $region->match) {
		1237	($match, $specificity) = ($region, $region->specificity)
		1238	if $region->specificity > $specificity;
		1239	}
		1240	}
		1241
		1242	$match
		1243	}
1126		1244
1127	=back	1245	=back
1128
1129		1246
1130	=head3 cf::map	1247	=head3 cf::map
1131		1248
1132	=over 4	1249	=over 4
1133		1250
…		…
1188	my ($self, $merge) = @_;	1305	my ($self, $merge) = @_;
1189		1306
1190	# we have to keep some variables in memory intact	1307	# we have to keep some variables in memory intact
1191	local $self->{path};	1308	local $self->{path};
1192	local $self->{load_path};	1309	local $self->{load_path};
1193	local $self->{deny_save};
1194	local $self->{deny_reset};
1195		1310
1196	$self->SUPER::thawer_merge ($merge);	1311	$self->SUPER::thawer_merge ($merge);
1197	}	1312	}
1198		1313
1199	sub normalise {	1314	sub normalise {
…		…
1271		1386
1272	# the original (read-only) location	1387	# the original (read-only) location
1273	sub load_path {	1388	sub load_path {
1274	my ($self) = @_;	1389	my ($self) = @_;
1275		1390
1276	sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}	1391	"$MAPDIR/$self->{path}.map"
1277	}	1392	}
1278		1393
1279	# the temporary/swap location	1394	# the temporary/swap location
1280	sub save_path {	1395	sub save_path {
1281	my ($self) = @_;	1396	my ($self) = @_;
1282		1397
1283	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1398	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1284	sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path	1399	"$TMPDIR/$path.map"
1285	}	1400	}
1286		1401
1287	# the unique path, undef == no special unique path	1402	# the unique path, undef == no special unique path
1288	sub uniq_path {	1403	sub uniq_path {
1289	my ($self) = @_;	1404	my ($self) = @_;
1290		1405
1291	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1406	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1292	sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path	1407	"$UNIQUEDIR/$path"
1293	}	1408	}
1294		1409
1295	# and all this just because we cannot iterate over	1410	# and all this just because we cannot iterate over
1296	# all maps in C++...	1411	# all maps in C++...
1297	sub change_all_map_light {	1412	sub change_all_map_light {
…		…
1299		1414
1300	$_->change_map_light ($change)	1415	$_->change_map_light ($change)
1301	for grep $_->outdoor, values %cf::MAP;	1416	for grep $_->outdoor, values %cf::MAP;
1302	}	1417	}
1303		1418
		1419	sub decay_objects {
		1420	my ($self) = @_;
		1421
		1422	return if $self->{deny_reset};
		1423
		1424	$self->do_decay_objects;
		1425	}
		1426
1304	sub unlink_save {	1427	sub unlink_save {
1305	my ($self) = @_;	1428	my ($self) = @_;
1306		1429
1307	utf8::encode (my $save = $self->save_path);	1430	utf8::encode (my $save = $self->save_path);
1308	IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;	1431	IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1309	IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";	1432	IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1310
1311	#d#TODO remove .map and also nuke
1312	$save =~ s/\.map// or return;#d#
1313	IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1314	IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1315	}	1433	}
1316		1434
1317	sub load_header_from($) {	1435	sub load_header_from($) {
1318	my ($self, $path) = @_;	1436	my ($self, $path) = @_;
1319		1437
…		…
1369	$self->load_header_orig	1487	$self->load_header_orig
1370	or return;	1488	or return;
1371	$self->prepare_orig;	1489	$self->prepare_orig;
1372	}	1490	}
1373		1491
		1492	$self->{deny_reset} = 1
		1493	if $self->no_reset;
		1494
		1495	$self->default_region (cf::region::find_by_path $self->{path})
		1496	unless $self->default_region;
		1497
1374	1	1498	1
1375	}	1499	}
1376		1500
1377	sub find;	1501	sub find;
1378	sub find {	1502	sub find {
…		…
1390	$map->{last_save} = $cf::RUNTIME;	1514	$map->{last_save} = $cf::RUNTIME;
1391		1515
1392	$map->load_header	1516	$map->load_header
1393	or return;	1517	or return;
1394		1518
1395	if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)	1519	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1396	# doing this can freeze the server in a sync job, obviously	1520	# doing this can freeze the server in a sync job, obviously
1397	#$cf::WAIT_FOR_TICK->wait;	1521	#$cf::WAIT_FOR_TICK->wait;
1398	$map->reset;	1522	$map->reset;
1399	undef $guard;	1523	undef $guard;
1400	return find $path;	1524	return find $path;
…		…
1411	my ($self) = @_;	1535	my ($self) = @_;
1412		1536
1413	local $self->{deny_reset} = 1; # loading can take a long time	1537	local $self->{deny_reset} = 1; # loading can take a long time
1414		1538
1415	my $path = $self->{path};	1539	my $path = $self->{path};
		1540
		1541	{
1416	my $guard = cf::lock_acquire "map_load:$path";	1542	my $guard = cf::lock_acquire "map_load:$path";
1417		1543
1418	return if $self->in_memory != cf::MAP_SWAPPED;	1544	return if $self->in_memory != cf::MAP_SWAPPED;
1419		1545
1420	$self->in_memory (cf::MAP_LOADING);	1546	$self->in_memory (cf::MAP_LOADING);
1421		1547
1422	$self->alloc;	1548	$self->alloc;
1423		1549
1424	$self->pre_load;	1550	$self->pre_load;
1425
1426	$self->_load_objects ($self->{load_path}, 1)
1427	or return;
1428
1429	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1430	if delete $self->{load_original};
1431
1432	if (my $uniq = $self->uniq_path) {
1433	utf8::encode $uniq;
1434	if (aio_open $uniq, O_RDONLY, 0) {
1435	$self->clear_unique_items;
1436	$self->_load_objects ($uniq, 0);
1437	}
1438	}
1439
1440	Coro::cede;
1441
1442	# now do the right thing for maps
1443	$self->link_multipart_objects;
1444
1445	unless ($self->{deny_activate}) {
1446	$self->decay_objects;
1447	$self->fix_auto_apply;
1448	$self->update_buttons;
1449	Coro::cede;	1551	Coro::cede;
1450	$self->set_darkness_map;	1552
		1553	$self->_load_objects ($self->{load_path}, 1)
		1554	or return;
		1555
		1556	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
		1557	if delete $self->{load_original};
		1558
		1559	if (my $uniq = $self->uniq_path) {
		1560	utf8::encode $uniq;
		1561	if (aio_open $uniq, O_RDONLY, 0) {
		1562	$self->clear_unique_items;
		1563	$self->_load_objects ($uniq, 0);
		1564	}
		1565	}
		1566
		1567	Coro::cede;
		1568	# now do the right thing for maps
		1569	$self->link_multipart_objects;
1451	$self->difficulty ($self->estimate_difficulty)	1570	$self->difficulty ($self->estimate_difficulty)
1452	unless $self->difficulty;	1571	unless $self->difficulty;
1453	Coro::cede;	1572	Coro::cede;
		1573
		1574	unless ($self->{deny_activate}) {
		1575	$self->decay_objects;
		1576	$self->fix_auto_apply;
		1577	$self->update_buttons;
		1578	Coro::cede;
		1579	$self->set_darkness_map;
		1580	Coro::cede;
1454	$self->activate;	1581	$self->activate;
		1582	}
		1583
		1584	$self->in_memory (cf::MAP_IN_MEMORY);
1455	}	1585	}
1456		1586
1457	$self->post_load;	1587	$self->post_load;
1458
1459	$self->in_memory (cf::MAP_IN_MEMORY);
1460	}	1588	}
1461		1589
1462	sub customise_for {	1590	sub customise_for {
1463	my ($self, $ob) = @_;	1591	my ($self, $ob) = @_;
1464		1592
1465	return find "~" . $ob->name . "/" . $self->{path}	1593	return find "~" . $ob->name . "/" . $self->{path}
1466	if $self->per_player;	1594	if $self->per_player;
		1595
		1596	# return find "?party/" . $ob->name . "/" . $self->{path}
		1597	# if $self->per_party;
1467		1598
1468	$self	1599	$self
1469	}	1600	}
1470		1601
1471	# find and load all maps in the 3x3 area around a map	1602	# find and load all maps in the 3x3 area around a map
…		…
1582		1713
1583	sub reset_at {	1714	sub reset_at {
1584	my ($self) = @_;	1715	my ($self) = @_;
1585		1716
1586	# TODO: safety, remove and allow resettable per-player maps	1717	# TODO: safety, remove and allow resettable per-player maps
1587	return 1e99 if $self->isa ("ext::map_per_player");#d#
1588	return 1e99 if $self->{deny_reset};	1718	return 1e99 if $self->{deny_reset};
1589		1719
1590	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;	1720	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1591	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;	1721	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1592		1722
…		…
1603	my ($self) = @_;	1733	my ($self) = @_;
1604		1734
1605	my $lock = cf::lock_acquire "map_data:$self->{path}";	1735	my $lock = cf::lock_acquire "map_data:$self->{path}";
1606		1736
1607	return if $self->players;	1737	return if $self->players;
1608	return if $self->isa ("ext::map_per_player");#d#
1609		1738
1610	warn "resetting map ", $self->path;#d#	1739	warn "resetting map ", $self->path;
1611		1740
1612	$self->in_memory (cf::MAP_SWAPPED);	1741	$self->in_memory (cf::MAP_SWAPPED);
1613		1742
1614	# need to save uniques path	1743	# need to save uniques path
1615	unless ($self->{deny_save}) {	1744	unless ($self->{deny_save}) {
…		…
1647	$cf::MAP{$self->path} = $self;	1776	$cf::MAP{$self->path} = $self;
1648		1777
1649	$self->reset; # polite request, might not happen	1778	$self->reset; # polite request, might not happen
1650	}	1779	}
1651		1780
		1781	=item $maps = cf::map::tmp_maps
		1782
		1783	Returns an arrayref with all map paths of currently instantiated and saved
		1784	maps.
		1785
		1786	=cut
		1787
		1788	sub tmp_maps() {
		1789	[
		1790	map {
		1791	utf8::decode $_;
		1792	!/\.(?:pst|meta)$/ && /^$PATH_SEP/o
		1793	? normalise $_
		1794	: ()
		1795	} @{ aio_readdir $TMPDIR or [] }
		1796	]
		1797	}
		1798
1652	=item cf::map::unique_maps	1799	=item cf::map::unique_maps
1653		1800
1654	Returns an arrayref of paths of all shared maps that have	1801	Returns an arrayref of paths of all shared maps that have
1655	instantiated unique items. May block.	1802	instantiated unique items. May block.
1656		1803
1657	=cut	1804	=cut
1658		1805
1659	sub unique_maps() {	1806	sub unique_maps() {
1660	my $files = aio_readdir cf::localdir . "/" . cf::uniquedir	1807	[
1661	or return;	1808	map {
1662
1663	my @paths;
1664
1665	for (@$files) {
1666	utf8::decode $_;	1809	utf8::decode $_;
1667	next if /\.pst$/;	1810	!/\.(?:pst|meta)$/ && /^$PATH_SEP/o
1668	next unless /^$PATH_SEP/o;	1811	? normalise $_
1669		1812	: ()
1670	push @paths, cf::map::normalise $_;	1813	} @{ aio_readdir $UNIQUEDIR or [] }
1671	}	1814	]
1672
1673	\@paths
1674	}	1815	}
1675		1816
1676	package cf;	1817	package cf;
1677		1818
1678	=back	1819	=back
…		…
1784	$self->deactivate_recursive;	1925	$self->deactivate_recursive;
1785		1926
1786	return if UNIVERSAL::isa $self->map, "ext::map_link";	1927	return if UNIVERSAL::isa $self->map, "ext::map_link";
1787		1928
1788	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	1929	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1789	if $self->map;	1930	if $self->map && $self->map->{path} ne "{link}";
1790		1931
1791	$self->enter_map ($LINK_MAP || link_map, 10, 10);	1932	$self->enter_map ($LINK_MAP || link_map, 10, 10);
1792	}	1933	}
1793		1934
1794	sub cf::object::player::leave_link {	1935	sub cf::object::player::leave_link {
1795	my ($self, $map, $x, $y) = @_;	1936	my ($self, $map, $x, $y) = @_;
		1937
		1938	return unless $self->contr->active;
1796		1939
1797	my $link_pos = delete $self->{_link_pos};	1940	my $link_pos = delete $self->{_link_pos};
1798		1941
1799	unless ($map) {	1942	unless ($map) {
1800	# restore original map position	1943	# restore original map position
…		…
1823		1966
1824	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	1967	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1825	$self->enter_map ($map, $x, $y);	1968	$self->enter_map ($map, $x, $y);
1826	}	1969	}
1827		1970
1828	cf::player->attach (
1829	on_logout => sub {
1830	my ($pl) = @_;
1831
1832	# abort map switching before logout
1833	if ($pl->ob->{_link_pos}) {
1834	cf::sync_job {
1835	$pl->ob->leave_link
1836	};
1837	}
1838	},
1839	on_login => sub {
1840	my ($pl) = @_;
1841
1842	# try to abort aborted map switching on player login :)
1843	# should happen only on crashes
1844	if ($pl->ob->{_link_pos}) {
1845	$pl->ob->enter_link;
1846	(async {
1847	$pl->ob->reply (undef,
1848	"There was an internal problem at your last logout, "
1849	. "the server will try to bring you to your intended destination in a second.",
1850	cf::NDI_RED);
1851	# we need this sleep as the login has a concurrent enter_exit running
1852	# and this sleep increases chances of the player not ending up in scorn
1853	Coro::Timer::sleep 1;
1854	$pl->ob->leave_link;
1855	})->prio (2);
1856	}
1857	},
1858	);
1859
1860	=item $player_object->goto ($path, $x, $y)	1971	=item $player_object->goto ($path, $x, $y[, $check->($map)])
1861		1972
		1973	Moves the player to the given map-path and coordinates by first freezing
		1974	her, loading and preparing them map, calling the provided $check callback
		1975	that has to return the map if sucecssful, and then unfreezes the player on
		1976	the new (success) or old (failed) map position.
		1977
1862	=cut	1978	=cut
		1979
		1980	our $GOTOGEN;
1863		1981
1864	sub cf::object::player::goto {	1982	sub cf::object::player::goto {
1865	my ($self, $path, $x, $y) = @_;	1983	my ($self, $path, $x, $y, $check) = @_;
		1984
		1985	# do generation counting so two concurrent goto's will be executed in-order
		1986	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1866		1987
1867	$self->enter_link;	1988	$self->enter_link;
1868		1989
1869	(async {	1990	(async {
1870	my $map = eval {	1991	my $map = eval {
1871	my $map = cf::map::find $path;	1992	my $map = cf::map::find $path;
		1993
		1994	if ($map) {
1872	$map = $map->customise_for ($self) if $map;	1995	$map = $map->customise_for ($self);
		1996	$map = $check->($map) if $check && $map;
		1997	} else {
		1998	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
		1999	}
		2000
1873	$map	2001	$map
		2002	};
		2003
		2004	if ($@) {
		2005	$self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
		2006	LOG llevError | logBacktrace, Carp::longmess $@;
1874	} or	2007	}
1875	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1876		2008
		2009	if ($gen == $self->{_goto_generation}) {
		2010	delete $self->{_goto_generation};
1877	$self->leave_link ($map, $x, $y);	2011	$self->leave_link ($map, $x, $y);
		2012	}
1878	})->prio (1);	2013	})->prio (1);
1879	}	2014	}
1880		2015
1881	=item $player_object->enter_exit ($exit_object)	2016	=item $player_object->enter_exit ($exit_object)
1882		2017
…		…
1921		2056
1922	$rmp->{random_seed} ||= $exit->random_seed;	2057	$rmp->{random_seed} ||= $exit->random_seed;
1923		2058
1924	my $data = cf::to_json $rmp;	2059	my $data = cf::to_json $rmp;
1925	my $md5 = Digest::MD5::md5_hex $data;	2060	my $md5 = Digest::MD5::md5_hex $data;
1926	my $meta = "$cf::RANDOM_MAPS/$md5.meta";	2061	my $meta = "$RANDOMDIR/$md5.meta";
1927		2062
1928	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {	2063	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1929	aio_write $fh, 0, (length $data), $data, 0;	2064	aio_write $fh, 0, (length $data), $data, 0;
1930	undef $fh;	2065	undef $fh;
1931	aio_rename "$meta~", $meta;	2066	aio_rename "$meta~", $meta;
…		…
1940		2075
1941	return unless $self->type == cf::PLAYER;	2076	return unless $self->type == cf::PLAYER;
1942		2077
1943	if ($exit->slaying eq "/!") {	2078	if ($exit->slaying eq "/!") {
1944	#TODO: this should de-fi-ni-te-ly not be a sync-job	2079	#TODO: this should de-fi-ni-te-ly not be a sync-job
		2080	# the problem is that $exit might not survive long enough
		2081	# so it needs to be done right now, right here
1945	cf::sync_job { prepare_random_map $exit };	2082	cf::sync_job { prepare_random_map $exit };
1946	}	2083	}
1947		2084
1948	my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2085	my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1949	my $hp = $exit->stats->hp;	2086	my $hp = $exit->stats->hp;
…		…
1957	$self->goto ($slaying, $hp, $sp);	2094	$self->goto ($slaying, $hp, $sp);
1958		2095
1959	1;	2096	1;
1960	}) {	2097	}) {
1961	$self->message ("Something went wrong deep within the crossfire server. "	2098	$self->message ("Something went wrong deep within the crossfire server. "
1962	. "I'll try to bring you back to the map you were before. "	2099	. "I'll try to bring you back to the map you were before. "
1963	. "Please report this to the dungeon master!",	2100	. "Please report this to the dungeon master!",
1964	cf::NDI_UNIQUE | cf::NDI_RED);	2101	cf::NDI_UNIQUE | cf::NDI_RED);
1965		2102
1966	warn "ERROR in enter_exit: $@";	2103	warn "ERROR in enter_exit: $@";
1967	$self->leave_link;	2104	$self->leave_link;
1968	}	2105	}
1969	})->prio (1);	2106	})->prio (1);
…		…
1982		2119
1983	sub cf::client::send_drawinfo {	2120	sub cf::client::send_drawinfo {
1984	my ($self, $text, $flags) = @_;	2121	my ($self, $text, $flags) = @_;
1985		2122
1986	utf8::encode $text;	2123	utf8::encode $text;
1987	$self->send_packet (sprintf "drawinfo %d %s", $flags, $text);	2124	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1988	}	2125	}
1989		2126
		2127	=item $client->ext_event ($type, %msg)
		2128
		2129	Sends an exti event to the client.
		2130
		2131	=cut
		2132
		2133	sub cf::client::ext_event($$%) {
		2134	my ($self, $type, %msg) = @_;
		2135
		2136	$msg{msgtype} = "event_$type";
		2137	$self->send_packet ("ext " . cf::to_json \%msg);
		2138	}
1990		2139
1991	=item $success = $client->query ($flags, "text", \&cb)	2140	=item $success = $client->query ($flags, "text", \&cb)
1992		2141
1993	Queues a query to the client, calling the given callback with	2142	Queues a query to the client, calling the given callback with
1994	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,	2143	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
…		…
2091		2240
2092	# here we export the classes and methods available to script code	2241	# here we export the classes and methods available to script code
2093		2242
2094	=pod	2243	=pod
2095		2244
2096	The following fucntions and emthods are available within a safe environment:	2245	The following functions and methods are available within a safe environment:
2097		2246
2098	cf::object contr pay_amount pay_player map	2247	cf::object contr pay_amount pay_player map
2099	cf::object::player player	2248	cf::object::player player
2100	cf::player peaceful	2249	cf::player peaceful
2101	cf::map trigger	2250	cf::map trigger
…		…
2186	#############################################################################	2335	#############################################################################
2187		2336
2188	=head2 EXTENSION DATABASE SUPPORT	2337	=head2 EXTENSION DATABASE SUPPORT
2189		2338
2190	Crossfire maintains a very simple database for extension use. It can	2339	Crossfire maintains a very simple database for extension use. It can
2191	currently store anything that can be serialised using Storable, which	2340	currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2192	excludes objects.	2341	convert to/from binary).
2193		2342
2194	The parameter C<$family> should best start with the name of the extension	2343	The parameter C<$family> should best start with the name of the extension
2195	using it, it should be unique.	2344	using it, it should be unique.
2196		2345
2197	=over 4	2346	=over 4
…		…
2220	BDB::CREATE | BDB::AUTO_COMMIT, 0666;	2369	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2221	cf::cleanup "db_open(db): $!" if $!;	2370	cf::cleanup "db_open(db): $!" if $!;
2222	};	2371	};
2223	cf::cleanup "db_open(db): $@" if $@;	2372	cf::cleanup "db_open(db): $@" if $@;
2224	};	2373	};
2225
2226	my $path = cf::localdir . "/database.pst";
2227	if (stat $path) {
2228	cf::sync_job {
2229	my $pst = Storable::retrieve $path;
2230
2231	cf::db_put (board => data => $pst->{board});
2232	cf::db_put (guildrules => data => $pst->{guildrules});
2233	cf::db_put (rent => balance => $pst->{rent}{balance});
2234	BDB::db_env_txn_checkpoint $DB_ENV;
2235
2236	unlink $path;
2237	};
2238	}
2239	}	2374	}
2240	}	2375	}
2241		2376
2242	sub db_get($$) {	2377	sub db_get($$) {
2243	my $key = "$_[0]/$_[1]";	2378	my $key = "$_[0]/$_[1]";
2244		2379
2245	cf::sync_job {	2380	cf::sync_job {
2246	BDB::db_get $DB, undef, $key, my $data;	2381	BDB::db_get $DB, undef, $key, my $data;
2247		2382
2248	$! ? ()	2383	$! ? ()
2249	: Compress::LZF::sthaw $data	2384	: $data
2250	}	2385	}
2251	}	2386	}
2252		2387
2253	sub db_put($$$) {	2388	sub db_put($$$) {
2254	BDB::dbreq_pri 4;	2389	BDB::dbreq_pri 4;
2255	BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };	2390	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
		2391	}
		2392
		2393	=item cf::cache $id => [$paths...], $processversion => $process
		2394
		2395	Generic caching function that returns the value of the resource $id,
		2396	caching and regenerating as required.
		2397
		2398	This function can block.
		2399
		2400	=cut
		2401
		2402	sub cache {
		2403	my ($id, $src, $processversion, $process) = @_;
		2404
		2405	my $meta =
		2406	join "\x00",
		2407	$processversion,
		2408	map {
		2409	aio_stat $_
		2410	and Carp::croak "$_: $!";
		2411
		2412	($_, (stat _)[7,9])
		2413	} @$src;
		2414
		2415	my $dbmeta = db_get cache => "$id/meta";
		2416	if ($dbmeta ne $meta) {
		2417	# changed, we may need to process
		2418
		2419	my @data;
		2420	my $md5;
		2421
		2422	for (0 .. $#$src) {
		2423	0 <= aio_load $src->[$_], $data[$_]
		2424	or Carp::croak "$src->[$_]: $!";
		2425	}
		2426
		2427	# if processing is expensive, check
		2428	# checksum first
		2429	if (1) {
		2430	$md5 =
		2431	join "\x00",
		2432	$processversion,
		2433	map {
		2434	Coro::cede;
		2435	($src->[$_], Digest::MD5::md5_hex $data[$_])
		2436	} 0.. $#$src;
		2437
		2438
		2439	my $dbmd5 = db_get cache => "$id/md5";
		2440	if ($dbmd5 eq $md5) {
		2441	db_put cache => "$id/meta", $meta;
		2442
		2443	return db_get cache => "$id/data";
		2444	}
		2445	}
		2446
		2447	my $t1 = Time::HiRes::time;
		2448	my $data = $process->(\@data);
		2449	my $t2 = Time::HiRes::time;
		2450
		2451	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
		2452
		2453	db_put cache => "$id/data", $data;
		2454	db_put cache => "$id/md5" , $md5;
		2455	db_put cache => "$id/meta", $meta;
		2456
		2457	return $data;
		2458	}
		2459
		2460	db_get cache => "$id/data"
		2461	}
		2462
		2463	=item fork_call { }, $args
		2464
		2465	Executes the given code block with the given arguments in a seperate
		2466	process, returning the results. Everything must be serialisable with
		2467	Coro::Storable. May, of course, block. Note that the executed sub may
		2468	never block itself or use any form of Event handling.
		2469
		2470	=cut
		2471
		2472	sub fork_call(&@) {
		2473	my ($cb, @args) = @_;
		2474
		2475	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
		2476	# or die "socketpair: $!";
		2477	pipe my $fh1, my $fh2
		2478	or die "pipe: $!";
		2479
		2480	if (my $pid = fork) {
		2481	close $fh2;
		2482
		2483	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
		2484	$res = Coro::Storable::thaw $res;
		2485
		2486	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
		2487
		2488	die $$res unless "ARRAY" eq ref $res;
		2489
		2490	return wantarray ? @$res : $res->[-1];
		2491	} else {
		2492	reset_signals;
		2493	local $SIG{__WARN__};
		2494	local $SIG{__DIE__};
		2495	eval {
		2496	close $fh1;
		2497
		2498	my @res = eval { $cb->(@args) };
		2499	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
		2500	};
		2501
		2502	warn $@ if $@;
		2503	_exit 0;
		2504	}
2256	}	2505	}
2257		2506
2258	#############################################################################	2507	#############################################################################
2259	# the server's init and main functions	2508	# the server's init and main functions
2260		2509
2261	sub load_resources {	2510	sub load_facedata($) {
2262	load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir	2511	my ($path) = @_;
		2512
		2513	warn "loading facedata from $path\n";
		2514
		2515	my $facedata;
		2516	0 < aio_load $path, $facedata
		2517	or die "$path: $!";
		2518
		2519	$facedata = Coro::Storable::thaw $facedata;
		2520
		2521	$facedata->{version} == 2
		2522	or cf::cleanup "$path: version mismatch, cannot proceed.";
		2523
		2524	{
		2525	my $faces = $facedata->{faceinfo};
		2526
		2527	while (my ($face, $info) = each %$faces) {
		2528	my $idx = (cf::face::find $face) || cf::face::alloc $face;
		2529	cf::face::set $idx, $info->{visibility}, $info->{magicmap};
		2530	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
		2531	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
		2532	Coro::cede;
		2533	}
		2534
		2535	while (my ($face, $info) = each %$faces) {
		2536	next unless $info->{smooth};
		2537	my $idx = cf::face::find $face
		2538	or next;
		2539	if (my $smooth = cf::face::find $info->{smooth}) {
		2540	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
		2541	} else {
		2542	warn "smooth face '$info->{smooth}' not found for face '$face'";
		2543	}
		2544	Coro::cede;
		2545	}
		2546	}
		2547
		2548	{
		2549	my $anims = $facedata->{animinfo};
		2550
		2551	while (my ($anim, $info) = each %$anims) {
		2552	cf::anim::set $anim, $info->{frames}, $info->{facings};
		2553	Coro::cede;
		2554	}
		2555
		2556	cf::anim::invalidate_all; # d'oh
		2557	}
		2558
		2559	1
		2560	}
		2561
		2562	sub reload_regions {
		2563	load_resource_file "$MAPDIR/regions"
2263	or die "unable to load regions file\n";#d#	2564	or die "unable to load regions file\n";
		2565	}
		2566
		2567	sub reload_facedata {
		2568	load_facedata "$DATADIR/facedata"
		2569	or die "unable to load facedata\n";
		2570	}
		2571
		2572	sub reload_archetypes {
		2573	load_resource_file "$DATADIR/archetypes"
		2574	or die "unable to load archetypes\n";
		2575	}
		2576
		2577	sub reload_treasures {
		2578	load_resource_file "$DATADIR/treasures"
		2579	or die "unable to load treasurelists\n";
		2580	}
		2581
		2582	sub reload_resources {
		2583	warn "reloading resource files...\n";
		2584
		2585	reload_regions;
		2586	reload_facedata;
		2587	#reload_archetypes;#d#
		2588	reload_archetypes;
		2589	reload_treasures;
		2590
		2591	warn "finished reloading resource files\n";
		2592	}
		2593
		2594	sub init {
		2595	reload_resources;
2264	}	2596	}
2265		2597
2266	sub cfg_load {	2598	sub cfg_load {
2267	open my $fh, "<:utf8", cf::confdir . "/config"	2599	open my $fh, "<:utf8", "$CONFDIR/config"
2268	or return;	2600	or return;
2269		2601
2270	local $/;	2602	local $/;
2271	*CFG = YAML::Syck::Load <$fh>;	2603	*CFG = YAML::Syck::Load <$fh>;
2272		2604
…		…
2280	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	2612	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2281	and die "WARNING: m(un)lockall failed: $!\n";	2613	and die "WARNING: m(un)lockall failed: $!\n";
2282	};	2614	};
2283	warn $@ if $@;	2615	warn $@ if $@;
2284	}	2616	}
2285	}
2286
2287	sub init {
2288	load_resources;
2289	}	2617	}
2290		2618
2291	sub main {	2619	sub main {
2292	# we must not ever block the main coroutine	2620	# we must not ever block the main coroutine
2293	local $Coro::idle = sub {	2621	local $Coro::idle = sub {
…		…
2361		2689
2362	warn Carp::longmess "post_cleanup backtrace"	2690	warn Carp::longmess "post_cleanup backtrace"
2363	if $make_core;	2691	if $make_core;
2364	}	2692	}
2365		2693
2366	sub reload() {	2694	sub do_reload_perl() {
2367	# can/must only be called in main	2695	# can/must only be called in main
2368	if ($Coro::current != $Coro::main) {	2696	if ($Coro::current != $Coro::main) {
2369	warn "can only reload from main coroutine";	2697	warn "can only reload from main coroutine";
2370	return;	2698	return;
2371	}	2699	}
…		…
2396	Coro::cede;	2724	Coro::cede;
2397	last unless IO::AIO::nreqs || BDB::nreqs;	2725	last unless IO::AIO::nreqs || BDB::nreqs;
2398	warn "iterate...";	2726	warn "iterate...";
2399	}	2727	}
2400		2728
		2729	++$RELOAD;
		2730
2401	warn "cancelling all extension coros";	2731	warn "cancelling all extension coros";
2402	$_->cancel for values %EXT_CORO;	2732	$_->cancel for values %EXT_CORO;
2403	%EXT_CORO = ();	2733	%EXT_CORO = ();
2404		2734
2405	warn "removing commands";	2735	warn "removing commands";
…		…
2444	Symbol::delete_package "safe::$_"	2774	Symbol::delete_package "safe::$_"
2445	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	2775	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2446		2776
2447	warn "unloading cf.pm \"a bit\"";	2777	warn "unloading cf.pm \"a bit\"";
2448	delete $INC{"cf.pm"};	2778	delete $INC{"cf.pm"};
		2779	delete $INC{"cf/pod.pm"};
2449		2780
2450	# don't, removes xs symbols, too,	2781	# don't, removes xs symbols, too,
2451	# and global variables created in xs	2782	# and global variables created in xs
2452	#Symbol::delete_package __PACKAGE__;	2783	#Symbol::delete_package __PACKAGE__;
2453		2784
…		…
2462		2793
2463	warn "loading extensions";	2794	warn "loading extensions";
2464	cf::load_extensions;	2795	cf::load_extensions;
2465		2796
2466	warn "reattaching attachments to objects/players";	2797	warn "reattaching attachments to objects/players";
2467	_global_reattach;	2798	_global_reattach; # objects, sockets
2468	warn "reattaching attachments to maps";	2799	warn "reattaching attachments to maps";
2469	reattach $_ for values %MAP;	2800	reattach $_ for values %MAP;
2470		2801	warn "reattaching attachments to players";
2471	warn "loading reloadable resources";	2802	reattach $_ for values %PLAYER;
2472	load_resources;
2473		2803
2474	warn "leaving sync_job";	2804	warn "leaving sync_job";
2475		2805
2476	1	2806	1
2477	} or do {	2807	} or do {
…		…
2483	warn "reloaded";	2813	warn "reloaded";
2484	};	2814	};
2485		2815
2486	our $RELOAD_WATCHER; # used only during reload	2816	our $RELOAD_WATCHER; # used only during reload
2487		2817
		2818	sub reload_perl() {
		2819	# doing reload synchronously and two reloads happen back-to-back,
		2820	# coro crashes during coro_state_free->destroy here.
		2821
		2822	$RELOAD_WATCHER ||= Event->timer (
		2823	reentrant => 0,
		2824	after => 0,
		2825	data => WF_AUTOCANCEL,
		2826	cb => sub {
		2827	do_reload_perl;
		2828	undef $RELOAD_WATCHER;
		2829	},
		2830	);
		2831	}
		2832
2488	register_command "reload" => sub {	2833	register_command "reload" => sub {
2489	my ($who, $arg) = @_;	2834	my ($who, $arg) = @_;
2490		2835
2491	if ($who->flag (FLAG_WIZ)) {	2836	if ($who->flag (FLAG_WIZ)) {
2492	$who->message ("reloading server.");	2837	$who->message ("reloading server.");
2493		2838	async { reload_perl };
2494	# doing reload synchronously and two reloads happen back-to-back,
2495	# coro crashes during coro_state_free->destroy here.
2496
2497	$RELOAD_WATCHER ||= Event->timer (
2498	reentrant => 0,
2499	after => 0,
2500	data => WF_AUTOCANCEL,
2501	cb => sub {
2502	reload;
2503	undef $RELOAD_WATCHER;
2504	},
2505	);
2506	}	2839	}
2507	};	2840	};
2508		2841
2509	unshift @INC, $LIBDIR;	2842	unshift @INC, $LIBDIR;
2510		2843
2511	my $bug_warning = 0;	2844	my $bug_warning = 0;
2512		2845
		2846	our @WAIT_FOR_TICK;
		2847	our @WAIT_FOR_TICK_BEGIN;
		2848
		2849	sub wait_for_tick {
		2850	return unless $TICK_WATCHER->is_active;
		2851	return if $Coro::current == $Coro::main;
		2852
		2853	my $signal = new Coro::Signal;
		2854	push @WAIT_FOR_TICK, $signal;
		2855	$signal->wait;
		2856	}
		2857
		2858	sub wait_for_tick_begin {
		2859	return unless $TICK_WATCHER->is_active;
		2860	return if $Coro::current == $Coro::main;
		2861
		2862	my $signal = new Coro::Signal;
		2863	push @WAIT_FOR_TICK_BEGIN, $signal;
		2864	$signal->wait;
		2865	}
		2866
		2867	my $min = 1e6;#d#
		2868	my $avg = 10;
2513	$TICK_WATCHER = Event->timer (	2869	$TICK_WATCHER = Event->timer (
2514	reentrant => 0,	2870	reentrant => 0,
2515	parked => 1,	2871	parked => 1,
2516	prio => 0,	2872	prio => 0,
2517	at => $NEXT_TICK || $TICK,	2873	at => $NEXT_TICK || $TICK,
…		…
2521	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	2877	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2522	unless ++$bug_warning > 10;	2878	unless ++$bug_warning > 10;
2523	return;	2879	return;
2524	}	2880	}
2525		2881
2526	$NOW = Event::time;	2882	$NOW = $tick_start = Event::time;
2527		2883
2528	cf::server_tick; # one server iteration	2884	cf::server_tick; # one server iteration
		2885
		2886	0 && sync_job {#d#
		2887	for(1..10) {
		2888	my $t = Event::time;
		2889	my $map = my $map = new_from_path cf::map "/tmp/x.map"
		2890	or die;
		2891
		2892	$map->width (50);
		2893	$map->height (50);
		2894	$map->alloc;
		2895	$map->_load_objects ("/tmp/x.map", 1);
		2896	my $t = Event::time - $t;
		2897
		2898	#next unless $t < 0.0013;#d#
		2899	if ($t < $min) {
		2900	$min = $t;
		2901	}
		2902	$avg = $avg * 0.99 + $t * 0.01;
		2903	}
		2904	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
		2905	exit 0;
		2906	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
		2907	};
		2908
2529	$RUNTIME += $TICK;	2909	$RUNTIME += $TICK;
2530	$NEXT_TICK += $TICK;	2910	$NEXT_TICK += $TICK;
2531		2911
2532	if ($NOW >= $NEXT_RUNTIME_WRITE) {	2912	if ($NOW >= $NEXT_RUNTIME_WRITE) {
2533	$NEXT_RUNTIME_WRITE = $NOW + 10;	2913	$NEXT_RUNTIME_WRITE = $NOW + 10;
…		…
2535	write_runtime	2915	write_runtime
2536	or warn "ERROR: unable to write runtime file: $!";	2916	or warn "ERROR: unable to write runtime file: $!";
2537	};	2917	};
2538	}	2918	}
2539		2919
2540
2541	$WAIT_FOR_TICK->broadcast;
2542	$WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2543
2544	# my $AFTER = Event::time;	2920	# my $AFTER = Event::time;
2545	# warn $AFTER - $NOW;#d#	2921	# warn $AFTER - $NOW;#d#
2546		2922
		2923	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
		2924	$sig->send;
		2925	}
		2926	while (my $sig = shift @WAIT_FOR_TICK) {
		2927	$sig->send;
		2928	}
		2929
		2930	$NOW = Event::time;
		2931
2547	# if we are delayed by four ticks or more, skip them all	2932	# if we are delayed by four ticks or more, skip them all
2548	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;	2933	$NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2549		2934
2550	$TICK_WATCHER->at ($NEXT_TICK);	2935	$TICK_WATCHER->at ($NEXT_TICK);
2551	$TICK_WATCHER->start;	2936	$TICK_WATCHER->start;
		2937
		2938	$LOAD = ($NOW - $tick_start) / $TICK;
		2939	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
		2940
		2941	_post_tick;
		2942
		2943
2552	},	2944	},
2553	);	2945	);
2554		2946
2555	{	2947	{
2556	BDB::max_poll_time $TICK * 0.1;	2948	BDB::max_poll_time $TICK * 0.1;
…		…
2584		2976
2585	cf::sync_job {	2977	cf::sync_job {
2586	eval {	2978	eval {
2587	BDB::db_env_open	2979	BDB::db_env_open
2588	$DB_ENV,	2980	$DB_ENV,
2589	$BDB_ENV_DIR,	2981	$BDBDIR,
2590	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN	2982	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2591	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,	2983	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2592	0666;	2984	0666;
2593		2985
2594	cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;	2986	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2595		2987
2596	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);	2988	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2597	$DB_ENV->set_lk_detect;	2989	$DB_ENV->set_lk_detect;
2598	};	2990	};
2599		2991
…		…
2615	prio => 6,	3007	prio => 6,
2616	cb => \&IO::AIO::poll_cb,	3008	cb => \&IO::AIO::poll_cb,
2617	);	3009	);
2618	}	3010	}
2619		3011
		3012	my $_log_backtrace;
		3013
		3014	sub _log_backtrace {
		3015	my ($msg, @addr) = @_;
		3016
		3017	$msg =~ s/\n//;
		3018
		3019	# limit the # of concurrent backtraces
		3020	if ($_log_backtrace < 2) {
		3021	++$_log_backtrace;
		3022	async {
		3023	my @bt = fork_call {
		3024	@addr = map { sprintf "%x", $_ } @addr;
		3025	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
		3026	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
		3027	or die "addr2line: $!";
		3028
		3029	my @funcs;
		3030	my @res = <$fh>;
		3031	chomp for @res;
		3032	while (@res) {
		3033	my ($func, $line) = splice @res, 0, 2, ();
		3034	push @funcs, "[$func] $line";
		3035	}
		3036
		3037	@funcs
		3038	};
		3039
		3040	LOG llevInfo, "[ABT] $msg\n";
		3041	LOG llevInfo, "[ABT] $_\n" for @bt;
		3042	--$_log_backtrace;
		3043	};
		3044	} else {
		3045	LOG llevInfo, "[ABT] $msg\n";
		3046	LOG llevInfo, "[ABT] [suppressed]\n";
		3047	}
		3048	}
		3049
		3050	# load additional modules
		3051	use cf::pod;
		3052
2620	END { cf::emergency_save }	3053	END { cf::emergency_save }
2621		3054
2622	1	3055	1
2623		3056

Diff Legend

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