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.226 by root, Wed Mar 14 04:12:29 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;
9	use Event;	10	use Event;
10	use Opcode;	11	use Opcode;
11	use Safe;	12	use Safe;
12	use Safe::Hole;	13	use Safe::Hole;
13		14
14	use Coro 3.52 ();	15	use Coro 3.61 ();
15	use Coro::State;	16	use Coro::State;
		17	use Coro::Handle;
16	use Coro::Event;	18	use Coro::Event;
17	use Coro::Timer;	19	use Coro::Timer;
18	use Coro::Signal;	20	use Coro::Signal;
19	use Coro::Semaphore;	21	use Coro::Semaphore;
20	use Coro::AIO;	22	use Coro::AIO;
		23	use Coro::Storable;
21		24
22	use BDB ();	25	use BDB ();
23	use Data::Dumper;	26	use Data::Dumper;
24	use Digest::MD5;	27	use Digest::MD5;
25	use Fcntl;	28	use Fcntl;
		29	use YAML::Syck ();
26	use IO::AIO 2.32 ();	30	use IO::AIO 2.32 ();
27	use YAML::Syck ();
28	use Time::HiRes;	31	use Time::HiRes;
29	use Compress::LZF;	32	use Compress::LZF;
30		33
		34	# configure various modules to our taste
		35	#
		36	$Storable::canonical = 1; # reduce rsync transfers
31	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator	37	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
32	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
		39
33	$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
34
35	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
36		41
37	# 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?
38	$YAML::Syck::ImplicitUnicode = 1;	43	$YAML::Syck::ImplicitUnicode = 1;
39		44
40	$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
41		48
42	our %COMMAND = ();	49	our %COMMAND = ();
43	our %COMMAND_TIME = ();	50	our %COMMAND_TIME = ();
44		51
45	our @EXTS = (); # list of extension package names	52	our @EXTS = (); # list of extension package names
…		…
47	our %EXT_CORO = (); # coroutines bound to extensions	54	our %EXT_CORO = (); # coroutines bound to extensions
48	our %EXT_MAP = (); # pluggable maps	55	our %EXT_MAP = (); # pluggable maps
49		56
50	our $RELOAD; # number of reloads so far	57	our $RELOAD; # number of reloads so far
51	our @EVENT;	58	our @EVENT;
52	our $LIBDIR = datadir . "/ext";
53		59
54	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(!)
55	our $TICK_WATCHER;	73	our $TICK_WATCHER;
56	our $AIO_POLL_WATCHER;	74	our $AIO_POLL_WATCHER;
57	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	75	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
58	our $NEXT_TICK;	76	our $NEXT_TICK;
59	our $NOW;	77	our $NOW;
…		…
68	our $RUNTIME;	86	our $RUNTIME;
69		87
70	our %PLAYER; # all users	88	our %PLAYER; # all users
71	our %MAP; # all maps	89	our %MAP; # all maps
72	our $LINK_MAP; # the special {link} map, which is always available	90	our $LINK_MAP; # the special {link} map, which is always available
73	our $RANDOM_MAPS = cf::localdir . "/random";
74	our $BDB_ENV_DIR = cf::localdir . "/db";
75
76	our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
77	our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
78		91
79	# 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 ∕
80	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	93	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
81		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
82	binmode STDOUT;	99	binmode STDOUT;
83	binmode STDERR;	100	binmode STDERR;
84		101
85	# read virtual server time, if available	102	# read virtual server time, if available
86	unless ($RUNTIME || !-e cf::localdir . "/runtime") {	103	unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
87	open my $fh, "<", cf::localdir . "/runtime"	104	open my $fh, "<", "$LOCALDIR/runtime"
88	or die "unable to read runtime file: $!";	105	or die "unable to read runtime file: $!";
89	$RUNTIME = <$fh> + 0.;	106	$RUNTIME = <$fh> + 0.;
90	}	107	}
91		108
92	mkdir cf::localdir;	109	mkdir $_
93	mkdir cf::localdir . "/" . cf::playerdir;	110	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
94	mkdir cf::localdir . "/" . cf::tmpdir;
95	mkdir cf::localdir . "/" . cf::uniquedir;
96	mkdir $RANDOM_MAPS;
97	mkdir $BDB_ENV_DIR;
98		111
99	our $EMERGENCY_POSITION;	112	our $EMERGENCY_POSITION;
100		113
101	sub cf::map::normalise;	114	sub cf::map::normalise;
102		115
…		…
113	=item $cf::RUNTIME	126	=item $cf::RUNTIME
114		127
115	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
116	every server tick.	129	every server tick.
117		130
118	=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
119		134
120	The perl library directory, where extensions and cf-specific modules can	135	Various directories - "/etc", read-only install directory, perl-library
121	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.
122		139
123	=item $cf::NOW	140	=item $cf::NOW
124		141
125	The time of the last (current) server tick.	142	The time of the last (current) server tick.
126		143
127	=item $cf::TICK	144	=item $cf::TICK
128		145
129	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.
130		157
131	=item %cf::CFG	158	=item %cf::CFG
132		159
133	Configuration for the server, loaded from C</etc/crossfire/config>, or	160	Configuration for the server, loaded from C</etc/crossfire/config>, or
134	from wherever your confdir points to.	161	from wherever your confdir points to.
135		162
136	=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE	163	=item cf::wait_for_tick, cf::wait_for_tick_begin
137		164
138	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
139	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
140	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.
141	window of cpu time available, or simply to synchronise to the server tick.
142		168
143	=back	169	=back
144		170
145	=cut	171	=cut
146		172
147	BEGIN {	173	BEGIN {
148	*CORE::GLOBAL::warn = sub {	174	*CORE::GLOBAL::warn = sub {
149	my $msg = join "", @_;	175	my $msg = join "", @_;
150	utf8::encode $msg;
151		176
152	$msg .= "\n"	177	$msg .= "\n"
153	unless $msg =~ /\n$/;	178	unless $msg =~ /\n$/;
154		179
		180	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
		181
		182	utf8::encode $msg;
155	LOG llevError, $msg;	183	LOG llevError, $msg;
156	};	184	};
157	}	185	}
158		186
159	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	187	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
160	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	188	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
161	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	189	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
162	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	190	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
163	@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';
164	@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)
165		194
166	# 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
167	# within the Safe compartment.	196	# within the Safe compartment.
168	for my $pkg (qw(	197	for my $pkg (qw(
169	cf::global cf::attachable	198	cf::global cf::attachable
…		…
205	$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;
206	$d	235	$d
207	} || "[unable to dump $_[0]: '$@']";	236	} || "[unable to dump $_[0]: '$@']";
208	}	237	}
209		238
210	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
211		240
212	=item $ref = cf::from_json $json	241	=item $ref = cf::from_json $json
213		242
214	Converts a JSON string into the corresponding perl data structure.	243	Converts a JSON string into the corresponding perl data structure.
215		244
216	=cut
217
218	sub from_json($) {
219	$JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
220	JSON::Syck::Load $_[0]
221	}
222
223	=item $json = cf::to_json $ref	245	=item $json = cf::to_json $ref
224		246
225	Converts a perl data structure into its JSON representation.	247	Converts a perl data structure into its JSON representation.
226
227	=cut
228
229	sub to_json($) {
230	$JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
231	JSON::Syck::Dump $_[0]
232	}
233		248
234	=item cf::lock_wait $string	249	=item cf::lock_wait $string
235		250
236	Wait until the given lock is available. See cf::lock_acquire.	251	Wait until the given lock is available. See cf::lock_acquire.
237		252
…		…
243	returned.	258	returned.
244		259
245	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
246	uses map_find and cf::map::load uses map_load).	261	uses map_find and cf::map::load uses map_load).
247		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
248	=cut	267	=cut
249		268
250	our %LOCK;	269	our %LOCK;
251		270
252	sub lock_wait($) {	271	sub lock_wait($) {
…		…
269		288
270	Coro::guard {	289	Coro::guard {
271	# wake up all waiters, to be on the safe side	290	# wake up all waiters, to be on the safe side
272	$_->ready for @{ delete $LOCK{$key} };	291	$_->ready for @{ delete $LOCK{$key} };
273	}	292	}
		293	}
		294
		295	sub lock_active($) {
		296	my ($key) = @_;
		297
		298	! ! $LOCK{$key}
274	}	299	}
275		300
276	sub freeze_mainloop {	301	sub freeze_mainloop {
277	return unless $TICK_WATCHER->is_active;	302	return unless $TICK_WATCHER->is_active;
278		303
…		…
308		333
309	sub sync_job(&) {	334	sub sync_job(&) {
310	my ($job) = @_;	335	my ($job) = @_;
311		336
312	if ($Coro::current == $Coro::main) {	337	if ($Coro::current == $Coro::main) {
		338	my $time = Event::time;
		339
313	# this is the main coro, too bad, we have to block	340	# this is the main coro, too bad, we have to block
314	# till the operation succeeds, freezing the server :/	341	# till the operation succeeds, freezing the server :/
315		342
316	# TODO: use suspend/resume instead	343	# TODO: use suspend/resume instead
317	# (but this is cancel-safe)	344	# (but this is cancel-safe)
…		…
328		355
329	while ($busy) {	356	while ($busy) {
330	Coro::cede or Event::one_event;	357	Coro::cede or Event::one_event;
331	}	358	}
332		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
333	wantarray ? @res : $res[0]	367	wantarray ? @res : $res[0]
334	} else {	368	} else {
335	# we are in another coroutine, how wonderful, everything just works	369	# we are in another coroutine, how wonderful, everything just works
336		370
337	$job->()	371	$job->()
…		…
357		391
358	$coro	392	$coro
359	}	393	}
360		394
361	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
362	my $guard = cf::lock_acquire "write_runtime";	403	my $guard = cf::lock_acquire "write_runtime";
363
364	my $runtime = cf::localdir . "/runtime";
365		404
366	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644	405	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
367	or return;	406	or return;
368		407
369	my $value = $cf::RUNTIME + 90 + 10;	408	my $value = $cf::RUNTIME + 90 + 10;
…		…
375		414
376	# always fsync - this file is important	415	# always fsync - this file is important
377	aio_fsync $fh	416	aio_fsync $fh
378	and return;	417	and return;
379		418
		419	# touch it again to show we are up-to-date
		420	aio_utime $fh, undef, undef;
		421
380	close $fh	422	close $fh
381	or return;	423	or return;
382		424
383	aio_rename "$runtime~", $runtime	425	aio_rename "$runtime~", $runtime
384	and return;	426	and return;
385		427
		428	warn "runtime file written.\n";
		429
386	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 });
387	}	442	}
388		443
389	=back	444	=back
390		445
391	=cut	446	=cut
…		…
571	$registry = $CB_TYPE[$object_type] ||= [];	626	$registry = $CB_TYPE[$object_type] ||= [];
572		627
573	} elsif ($type eq "subtype") {	628	} elsif ($type eq "subtype") {
574	defined $object_type or Carp::croak "subtype specified without type";	629	defined $object_type or Carp::croak "subtype specified without type";
575	my $object_subtype = shift @arg;	630	my $object_subtype = shift @arg;
576	$registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= [];	631	$registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
577		632
578	} elsif ($type eq "package") {	633	} elsif ($type eq "package") {
579	my $pkg = shift @arg;	634	my $pkg = shift @arg;
580		635
581	while (my ($name, $id) = each %cb_id) {	636	while (my ($name, $id) = each %cb_id) {
…		…
622	if (ref $_[0]) {	677	if (ref $_[0]) {
623	_object_attach @_;	678	_object_attach @_;
624	} else {	679	} else {
625	_attach shift->_attach_registry, @_;	680	_attach shift->_attach_registry, @_;
626	}	681	}
		682	_recalc_want;
627	};	683	};
628		684
629	# all those should be optimised	685	# all those should be optimised
630	sub cf::attachable::detach {	686	sub cf::attachable::detach {
631	my ($obj, $name) = @_;	687	my ($obj, $name) = @_;
…		…
634	delete $obj->{_attachment}{$name};	690	delete $obj->{_attachment}{$name};
635	reattach ($obj);	691	reattach ($obj);
636	} else {	692	} else {
637	Carp::croak "cannot, currently, detach class attachments";	693	Carp::croak "cannot, currently, detach class attachments";
638	}	694	}
		695	_recalc_want;
639	};	696	};
640		697
641	sub cf::attachable::attached {	698	sub cf::attachable::attached {
642	my ($obj, $name) = @_;	699	my ($obj, $name) = @_;
643		700
…		…
816	or return;	873	or return;
817	$av = eval { (Storable::thaw $av)->{objs} };	874	$av = eval { (Storable::thaw $av)->{objs} };
818	}	875	}
819		876
820	warn sprintf "loading %s (%d)\n",	877	warn sprintf "loading %s (%d)\n",
821	$filename, length $data, scalar @{$av || []};#d#	878	$filename, length $data, scalar @{$av || []};
822	return ($data, $av);	879	return ($data, $av);
823	}	880	}
824		881
825	#############################################################################	882	#############################################################################
826	# command handling &c	883	# command handling &c
…		…
886		943
887	cf::override;	944	cf::override;
888	},	945	},
889	);	946	);
890		947
891	sub load_extension {
892	my ($path) = @_;
893
894	$path =~ /([^\/\\]+)\.ext$/ or die "$path";
895	my $base = $1;
896	my $pkg = $1;
897	$pkg =~ s/[^[:word:]]/_/g;
898	$pkg = "ext::$pkg";
899
900	warn "... loading '$path' into '$pkg'\n";
901
902	open my $fh, "<:utf8", $path
903	or die "$path: $!";
904
905	my $source =
906	"package $pkg; use strict; use utf8;\n"
907	. "#line 1 \"$path\"\n{\n"
908	. (do { local $/; <$fh> })
909	. "\n};\n1";
910
911	unless (eval $source) {
912	my $msg = $@ ? "$path: $@\n"
913	: "extension disabled.\n";
914	if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
915	warn $@;
916	warn "mandatory extension failed to load, exiting.\n";
917	exit 1;
918	}
919	die $@;
920	}
921
922	push @EXTS, $pkg;
923	}
924
925	sub load_extensions {	948	sub load_extensions {
		949	cf::sync_job {
		950	my %todo;
		951
926	for my $ext (<$LIBDIR/*.ext>) {	952	for my $path (<$LIBDIR/*.ext>) {
927	next unless -r $ext;	953	next unless -r $path;
928	eval {	954
929	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};
930	1	1011	}
931	} or warn "$ext not loaded: $@";	1012
		1013	skip:
		1014	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
		1015	unless $progress;
		1016	}
932	}	1017	};
933	}	1018	}
934		1019
935	#############################################################################	1020	#############################################################################
936		1021
937	=head2 CORE EXTENSIONS	1022	=head2 CORE EXTENSIONS
…		…
953	Returns the given player object, loading it if necessary (might block).	1038	Returns the given player object, loading it if necessary (might block).
954		1039
955	=cut	1040	=cut
956		1041
957	sub playerdir($) {	1042	sub playerdir($) {
958	cf::localdir	1043	"$PLAYERDIR/"
959	. "/"
960	. cf::playerdir
961	. "/"
962	. (ref $_[0] ? $_[0]->ob->name : $_[0])	1044	. (ref $_[0] ? $_[0]->ob->name : $_[0])
963	}	1045	}
964		1046
965	sub path($) {	1047	sub path($) {
966	my $login = ref $_[0] ? $_[0]->ob->name : $_[0];	1048	my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
967		1049
968	(playerdir $login) . "/$login.pl"	1050	(playerdir $login) . "/playerdata"
969	}	1051	}
970		1052
971	sub find_active($) {	1053	sub find_active($) {
972	$cf::PLAYER{$_[0]}	1054	$cf::PLAYER{$_[0]}
973	and $cf::PLAYER{$_[0]}->active	1055	and $cf::PLAYER{$_[0]}->active
…		…
986	my $login = $_[0];	1068	my $login = $_[0];
987		1069
988	my $guard = cf::lock_acquire "user_find:$login";	1070	my $guard = cf::lock_acquire "user_find:$login";
989		1071
990	$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
991	my $pl = load_pl path $login	1080	my $pl = load_pl path $login
992	or return;	1081	or return;
993	$cf::PLAYER{$login} = $pl	1082	$cf::PLAYER{$login} = $pl
994	}	1083	}
995	}	1084	}
…		…
1079	while and may block, so not sync_job-capable, ever.	1168	while and may block, so not sync_job-capable, ever.
1080		1169
1081	=cut	1170	=cut
1082		1171
1083	sub list_logins {	1172	sub list_logins {
1084	my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir	1173	my $dirs = aio_readdir $PLAYERDIR
1085	or return [];	1174	or return [];
1086		1175
1087	my @logins;	1176	my @logins;
1088		1177
1089	for my $login (@$dirs) {	1178	for my $login (@$dirs) {
…		…
1124	}	1213	}
1125		1214
1126	\@paths	1215	\@paths
1127	}	1216	}
1128		1217
1129	=item $player->ext_reply ($msgid, $msgtype, %msg)	1218	=item $player->ext_reply ($msgid, %msg)
1130		1219
1131	Sends an ext reply to the player.	1220	Sends an ext reply to the player.
1132		1221
1133	=cut	1222	=cut
1134		1223
1135	sub ext_reply($$$%) {	1224	sub ext_reply($$%) {
1136	my ($self, $id, %msg) = @_;	1225	my ($self, $id, %msg) = @_;
1137		1226
1138	$msg{msgid} = $id;	1227	$msg{msgid} = $id;
1139		1228
1140	$self->send ("ext " . cf::to_json \%msg);	1229	$self->send ("ext " . cf::to_json \%msg);
1141	}	1230	}
1142		1231
1143	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	}
1144		1272
1145	=back	1273	=back
1146
1147		1274
1148	=head3 cf::map	1275	=head3 cf::map
1149		1276
1150	=over 4	1277	=over 4
1151		1278
…		…
1206	my ($self, $merge) = @_;	1333	my ($self, $merge) = @_;
1207		1334
1208	# we have to keep some variables in memory intact	1335	# we have to keep some variables in memory intact
1209	local $self->{path};	1336	local $self->{path};
1210	local $self->{load_path};	1337	local $self->{load_path};
1211	local $self->{deny_save};
1212	local $self->{deny_reset};
1213		1338
1214	$self->SUPER::thawer_merge ($merge);	1339	$self->SUPER::thawer_merge ($merge);
1215	}	1340	}
1216		1341
1217	sub normalise {	1342	sub normalise {
…		…
1289		1414
1290	# the original (read-only) location	1415	# the original (read-only) location
1291	sub load_path {	1416	sub load_path {
1292	my ($self) = @_;	1417	my ($self) = @_;
1293		1418
1294	sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}	1419	"$MAPDIR/$self->{path}.map"
1295	}	1420	}
1296		1421
1297	# the temporary/swap location	1422	# the temporary/swap location
1298	sub save_path {	1423	sub save_path {
1299	my ($self) = @_;	1424	my ($self) = @_;
1300		1425
1301	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1426	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1302	sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path	1427	"$TMPDIR/$path.map"
1303	}	1428	}
1304		1429
1305	# the unique path, undef == no special unique path	1430	# the unique path, undef == no special unique path
1306	sub uniq_path {	1431	sub uniq_path {
1307	my ($self) = @_;	1432	my ($self) = @_;
1308		1433
1309	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1434	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1310	sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path	1435	"$UNIQUEDIR/$path"
1311	}	1436	}
1312		1437
1313	# and all this just because we cannot iterate over	1438	# and all this just because we cannot iterate over
1314	# all maps in C++...	1439	# all maps in C++...
1315	sub change_all_map_light {	1440	sub change_all_map_light {
1316	my ($change) = @_;	1441	my ($change) = @_;
1317		1442
1318	$_->change_map_light ($change)	1443	$_->change_map_light ($change)
1319	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;
1320	}	1453	}
1321		1454
1322	sub unlink_save {	1455	sub unlink_save {
1323	my ($self) = @_;	1456	my ($self) = @_;
1324		1457
…		…
1382	$self->load_header_orig	1515	$self->load_header_orig
1383	or return;	1516	or return;
1384	$self->prepare_orig;	1517	$self->prepare_orig;
1385	}	1518	}
1386		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
1387	1	1526	1
1388	}	1527	}
1389		1528
1390	sub find;	1529	sub find;
1391	sub find {	1530	sub find {
…		…
1403	$map->{last_save} = $cf::RUNTIME;	1542	$map->{last_save} = $cf::RUNTIME;
1404		1543
1405	$map->load_header	1544	$map->load_header
1406	or return;	1545	or return;
1407		1546
1408	if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)	1547	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1409	# doing this can freeze the server in a sync job, obviously	1548	# doing this can freeze the server in a sync job, obviously
1410	#$cf::WAIT_FOR_TICK->wait;	1549	#$cf::WAIT_FOR_TICK->wait;
1411	$map->reset;	1550	$map->reset;
1412	undef $guard;	1551	undef $guard;
1413	return find $path;	1552	return find $path;
…		…
1424	my ($self) = @_;	1563	my ($self) = @_;
1425		1564
1426	local $self->{deny_reset} = 1; # loading can take a long time	1565	local $self->{deny_reset} = 1; # loading can take a long time
1427		1566
1428	my $path = $self->{path};	1567	my $path = $self->{path};
		1568
		1569	{
1429	my $guard = cf::lock_acquire "map_load:$path";	1570	my $guard = cf::lock_acquire "map_load:$path";
1430		1571
1431	return if $self->in_memory != cf::MAP_SWAPPED;	1572	return if $self->in_memory != cf::MAP_SWAPPED;
1432		1573
1433	$self->in_memory (cf::MAP_LOADING);	1574	$self->in_memory (cf::MAP_LOADING);
1434		1575
1435	$self->alloc;	1576	$self->alloc;
1436		1577
1437	$self->pre_load;	1578	$self->pre_load;
1438
1439	$self->_load_objects ($self->{load_path}, 1)
1440	or return;
1441
1442	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1443	if delete $self->{load_original};
1444
1445	if (my $uniq = $self->uniq_path) {
1446	utf8::encode $uniq;
1447	if (aio_open $uniq, O_RDONLY, 0) {
1448	$self->clear_unique_items;
1449	$self->_load_objects ($uniq, 0);
1450	}
1451	}
1452
1453	Coro::cede;
1454
1455	# now do the right thing for maps
1456	$self->link_multipart_objects;
1457
1458	unless ($self->{deny_activate}) {
1459	$self->decay_objects;
1460	$self->fix_auto_apply;
1461	$self->update_buttons;
1462	Coro::cede;	1579	Coro::cede;
1463	$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;
1464	$self->difficulty ($self->estimate_difficulty)	1598	$self->difficulty ($self->estimate_difficulty)
1465	unless $self->difficulty;	1599	unless $self->difficulty;
1466	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;
1467	$self->activate;	1609	$self->activate;
		1610	}
		1611
		1612	$self->in_memory (cf::MAP_IN_MEMORY);
1468	}	1613	}
1469		1614
1470	$self->post_load;	1615	$self->post_load;
1471
1472	$self->in_memory (cf::MAP_IN_MEMORY);
1473	}	1616	}
1474		1617
1475	sub customise_for {	1618	sub customise_for {
1476	my ($self, $ob) = @_;	1619	my ($self, $ob) = @_;
1477		1620
1478	return find "~" . $ob->name . "/" . $self->{path}	1621	return find "~" . $ob->name . "/" . $self->{path}
1479	if $self->per_player;	1622	if $self->per_player;
		1623
		1624	# return find "?party/" . $ob->name . "/" . $self->{path}
		1625	# if $self->per_party;
1480		1626
1481	$self	1627	$self
1482	}	1628	}
1483		1629
1484	# 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
…		…
1595		1741
1596	sub reset_at {	1742	sub reset_at {
1597	my ($self) = @_;	1743	my ($self) = @_;
1598		1744
1599	# TODO: safety, remove and allow resettable per-player maps	1745	# TODO: safety, remove and allow resettable per-player maps
1600	return 1e99 if $self->isa ("ext::map_per_player");#d#
1601	return 1e99 if $self->{deny_reset};	1746	return 1e99 if $self->{deny_reset};
1602		1747
1603	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;	1748	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1604	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;
1605		1750
…		…
1616	my ($self) = @_;	1761	my ($self) = @_;
1617		1762
1618	my $lock = cf::lock_acquire "map_data:$self->{path}";	1763	my $lock = cf::lock_acquire "map_data:$self->{path}";
1619		1764
1620	return if $self->players;	1765	return if $self->players;
1621	return if $self->isa ("ext::map_per_player");#d#
1622		1766
1623	warn "resetting map ", $self->path;#d#	1767	warn "resetting map ", $self->path;
1624		1768
1625	$self->in_memory (cf::MAP_SWAPPED);	1769	$self->in_memory (cf::MAP_SWAPPED);
1626		1770
1627	# need to save uniques path	1771	# need to save uniques path
1628	unless ($self->{deny_save}) {	1772	unless ($self->{deny_save}) {
…		…
1660	$cf::MAP{$self->path} = $self;	1804	$cf::MAP{$self->path} = $self;
1661		1805
1662	$self->reset; # polite request, might not happen	1806	$self->reset; # polite request, might not happen
1663	}	1807	}
1664		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
1665	=item cf::map::unique_maps	1845	=item cf::map::unique_maps
1666		1846
1667	Returns an arrayref of paths of all shared maps that have	1847	Returns an arrayref of paths of all shared maps that have
1668	instantiated unique items. May block.	1848	instantiated unique items. May block.
1669		1849
1670	=cut	1850	=cut
1671		1851
1672	sub unique_maps() {	1852	sub unique_maps() {
1673	my $files = aio_readdir cf::localdir . "/" . cf::uniquedir	1853	[
1674	or return;	1854	map {
1675
1676	my @paths;
1677
1678	for (@$files) {
1679	utf8::decode $_;	1855	utf8::decode $_;
1680	next if /\.pst$/;	1856	/\.map$/
1681	next unless /^$PATH_SEP/o;	1857	? normalise $_
1682		1858	: ()
1683	push @paths, cf::map::normalise $_;	1859	} @{ aio_readdir $UNIQUEDIR or [] }
1684	}	1860	]
1685
1686	\@paths
1687	}	1861	}
1688		1862
1689	package cf;	1863	package cf;
1690		1864
1691	=back	1865	=back
…		…
1797	$self->deactivate_recursive;	1971	$self->deactivate_recursive;
1798		1972
1799	return if UNIVERSAL::isa $self->map, "ext::map_link";	1973	return if UNIVERSAL::isa $self->map, "ext::map_link";
1800		1974
1801	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	1975	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1802	if $self->map;	1976	if $self->map && $self->map->{path} ne "{link}";
1803		1977
1804	$self->enter_map ($LINK_MAP || link_map, 10, 10);	1978	$self->enter_map ($LINK_MAP || link_map, 10, 10);
1805	}	1979	}
1806		1980
1807	sub cf::object::player::leave_link {	1981	sub cf::object::player::leave_link {
1808	my ($self, $map, $x, $y) = @_;	1982	my ($self, $map, $x, $y) = @_;
		1983
		1984	return unless $self->contr->active;
1809		1985
1810	my $link_pos = delete $self->{_link_pos};	1986	my $link_pos = delete $self->{_link_pos};
1811		1987
1812	unless ($map) {	1988	unless ($map) {
1813	# restore original map position	1989	# restore original map position
…		…
1836		2012
1837	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2013	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1838	$self->enter_map ($map, $x, $y);	2014	$self->enter_map ($map, $x, $y);
1839	}	2015	}
1840		2016
1841	cf::player->attach (
1842	on_logout => sub {
1843	my ($pl) = @_;
1844
1845	# abort map switching before logout
1846	if ($pl->ob->{_link_pos}) {
1847	cf::sync_job {
1848	$pl->ob->leave_link
1849	};
1850	}
1851	},
1852	on_login => sub {
1853	my ($pl) = @_;
1854
1855	# try to abort aborted map switching on player login :)
1856	# should happen only on crashes
1857	if ($pl->ob->{_link_pos}) {
1858	$pl->ob->enter_link;
1859	(async {
1860	$pl->ob->reply (undef,
1861	"There was an internal problem at your last logout, "
1862	. "the server will try to bring you to your intended destination in a second.",
1863	cf::NDI_RED);
1864	# we need this sleep as the login has a concurrent enter_exit running
1865	# and this sleep increases chances of the player not ending up in scorn
1866	Coro::Timer::sleep 1;
1867	$pl->ob->leave_link;
1868	})->prio (2);
1869	}
1870	},
1871	);
1872
1873	=item $player_object->goto ($path, $x, $y)	2017	=item $player_object->goto ($path, $x, $y[, $check->($map)])
1874		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
1875	=cut	2024	=cut
		2025
		2026	our $GOTOGEN;
1876		2027
1877	sub cf::object::player::goto {	2028	sub cf::object::player::goto {
1878	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;
1879		2033
1880	$self->enter_link;	2034	$self->enter_link;
1881		2035
1882	(async {	2036	(async {
1883	my $map = eval {	2037	my $map = eval {
1884	my $map = cf::map::find $path;	2038	my $map = cf::map::find $path;
		2039
		2040	if ($map) {
1885	$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
1886	$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 $@;
1887	} or	2053	}
1888	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1889		2054
		2055	if ($gen == $self->{_goto_generation}) {
		2056	delete $self->{_goto_generation};
1890	$self->leave_link ($map, $x, $y);	2057	$self->leave_link ($map, $x, $y);
		2058	}
1891	})->prio (1);	2059	})->prio (1);
1892	}	2060	}
1893		2061
1894	=item $player_object->enter_exit ($exit_object)	2062	=item $player_object->enter_exit ($exit_object)
1895		2063
…		…
1934		2102
1935	$rmp->{random_seed} ||= $exit->random_seed;	2103	$rmp->{random_seed} ||= $exit->random_seed;
1936		2104
1937	my $data = cf::to_json $rmp;	2105	my $data = cf::to_json $rmp;
1938	my $md5 = Digest::MD5::md5_hex $data;	2106	my $md5 = Digest::MD5::md5_hex $data;
1939	my $meta = "$cf::RANDOM_MAPS/$md5.meta";	2107	my $meta = "$RANDOMDIR/$md5.meta";
1940		2108
1941	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {	2109	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1942	aio_write $fh, 0, (length $data), $data, 0;	2110	aio_write $fh, 0, (length $data), $data, 0;
1943	undef $fh;	2111	undef $fh;
1944	aio_rename "$meta~", $meta;	2112	aio_rename "$meta~", $meta;
…		…
1953		2121
1954	return unless $self->type == cf::PLAYER;	2122	return unless $self->type == cf::PLAYER;
1955		2123
1956	if ($exit->slaying eq "/!") {	2124	if ($exit->slaying eq "/!") {
1957	#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
1958	cf::sync_job { prepare_random_map $exit };	2128	cf::sync_job { prepare_random_map $exit };
1959	}	2129	}
1960		2130
1961	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;
1962	my $hp = $exit->stats->hp;	2132	my $hp = $exit->stats->hp;
…		…
1970	$self->goto ($slaying, $hp, $sp);	2140	$self->goto ($slaying, $hp, $sp);
1971		2141
1972	1;	2142	1;
1973	}) {	2143	}) {
1974	$self->message ("Something went wrong deep within the crossfire server. "	2144	$self->message ("Something went wrong deep within the crossfire server. "
1975	. "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. "
1976	. "Please report this to the dungeon master!",	2146	. "Please report this to the dungeon master!",
1977	cf::NDI_UNIQUE | cf::NDI_RED);	2147	cf::NDI_UNIQUE | cf::NDI_RED);
1978		2148
1979	warn "ERROR in enter_exit: $@";	2149	warn "ERROR in enter_exit: $@";
1980	$self->leave_link;	2150	$self->leave_link;
1981	}	2151	}
1982	})->prio (1);	2152	})->prio (1);
…		…
1998		2168
1999	utf8::encode $text;	2169	utf8::encode $text;
2000	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2170	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2001	}	2171	}
2002		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	}
2003		2185
2004	=item $success = $client->query ($flags, "text", \&cb)	2186	=item $success = $client->query ($flags, "text", \&cb)
2005		2187
2006	Queues a query to the client, calling the given callback with	2188	Queues a query to the client, calling the given callback with
2007	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>,
…		…
2104		2286
2105	# here we export the classes and methods available to script code	2287	# here we export the classes and methods available to script code
2106		2288
2107	=pod	2289	=pod
2108		2290
2109	The following fucntions and emthods are available within a safe environment:	2291	The following functions and methods are available within a safe environment:
2110		2292
2111	cf::object contr pay_amount pay_player map	2293	cf::object contr pay_amount pay_player map
2112	cf::object::player player	2294	cf::object::player player
2113	cf::player peaceful	2295	cf::player peaceful
2114	cf::map trigger	2296	cf::map trigger
…		…
2199	#############################################################################	2381	#############################################################################
2200		2382
2201	=head2 EXTENSION DATABASE SUPPORT	2383	=head2 EXTENSION DATABASE SUPPORT
2202		2384
2203	Crossfire maintains a very simple database for extension use. It can	2385	Crossfire maintains a very simple database for extension use. It can
2204	currently store anything that can be serialised using Storable, which	2386	currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2205	excludes objects.	2387	convert to/from binary).
2206		2388
2207	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
2208	using it, it should be unique.	2390	using it, it should be unique.
2209		2391
2210	=over 4	2392	=over 4
…		…
2233	BDB::CREATE | BDB::AUTO_COMMIT, 0666;	2415	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2234	cf::cleanup "db_open(db): $!" if $!;	2416	cf::cleanup "db_open(db): $!" if $!;
2235	};	2417	};
2236	cf::cleanup "db_open(db): $@" if $@;	2418	cf::cleanup "db_open(db): $@" if $@;
2237	};	2419	};
2238
2239	my $path = cf::localdir . "/database.pst";
2240	if (stat $path) {
2241	cf::sync_job {
2242	my $pst = Storable::retrieve $path;
2243
2244	cf::db_put (board => data => $pst->{board});
2245	cf::db_put (guildrules => data => $pst->{guildrules});
2246	cf::db_put (rent => balance => $pst->{rent}{balance});
2247	BDB::db_env_txn_checkpoint $DB_ENV;
2248
2249	unlink $path;
2250	};
2251	}
2252	}	2420	}
2253	}	2421	}
2254		2422
2255	sub db_get($$) {	2423	sub db_get($$) {
2256	my $key = "$_[0]/$_[1]";	2424	my $key = "$_[0]/$_[1]";
2257		2425
2258	cf::sync_job {	2426	cf::sync_job {
2259	BDB::db_get $DB, undef, $key, my $data;	2427	BDB::db_get $DB, undef, $key, my $data;
2260		2428
2261	$! ? ()	2429	$! ? ()
2262	: Compress::LZF::sthaw $data	2430	: $data
2263	}	2431	}
2264	}	2432	}
2265		2433
2266	sub db_put($$$) {	2434	sub db_put($$$) {
2267	BDB::dbreq_pri 4;	2435	BDB::dbreq_pri 4;
2268	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	}
2269	}	2551	}
2270		2552
2271	#############################################################################	2553	#############################################################################
2272	# the server's init and main functions	2554	# the server's init and main functions
2273		2555
2274	sub load_faces {	2556	sub load_facedata($) {
2275	my $path = sprintf "%s/faces", cf::datadir;	2557	my ($path) = @_;
2276		2558
2277	warn "loading faces from $path\n";	2559	warn "loading facedata from $path\n";
2278		2560
2279	my $faces;	2561	my $facedata;
2280	0 < aio_load $path, $faces	2562	0 < aio_load $path, $facedata
2281	or die "$path: $!";	2563	or die "$path: $!";
2282		2564
2283	Coro::cede;
2284	$faces = Storable::thaw $faces;	2565	$facedata = Coro::Storable::thaw $facedata;
2285	Coro::cede;
2286		2566
2287	my $meta = delete $faces->{""};
2288	$meta->{version} == 1	2567	$facedata->{version} == 2
2289	or cf::cleanup "$path: version mismatch, cannot proceed.";	2568	or cf::cleanup "$path: version mismatch, cannot proceed.";
2290		2569
		2570	{
		2571	my $faces = $facedata->{faceinfo};
		2572
2291	while (my ($face, $info) = each %$faces) {	2573	while (my ($face, $info) = each %$faces) {
2292	my $idx = (cf::face::find $face) || cf::face::alloc $face;	2574	my $idx = (cf::face::find $face) || cf::face::alloc $face;
2293	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	2575	cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2294	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	2576	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
		2577	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2295	Coro::cede;	2578	Coro::cede;
2296	}	2579	}
2297		2580
2298	while (my ($face, $info) = each %$faces) {	2581	while (my ($face, $info) = each %$faces) {
2299	next unless $info->{smooth};	2582	next unless $info->{smooth};
2300	my $idx = cf::face::find $face	2583	my $idx = cf::face::find $face
2301	or next;	2584	or next;
2302	if (my $smooth = cf::face::find $info->{smooth}) {	2585	if (my $smooth = cf::face::find $info->{smooth}) {
2303	cf::face::set_smooth $idx, $smooth;	2586	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2304	} else {	2587	} else {
2305	warn "smooth face '$info->{smooth}' not found for face '$face'";	2588	warn "smooth face '$info->{smooth}' not found for face '$face'";
2306	}	2589	}
2307	Coro::cede;	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
2308	}	2603	}
2309		2604
2310	1	2605	1
2311	}	2606	}
2312		2607
		2608	sub reload_regions {
		2609	load_resource_file "$MAPDIR/regions"
		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
2313	sub reload_resources {	2628	sub reload_resources {
2314	load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir	2629	warn "reloading resource files...\n";
2315	or die "unable to load regions file\n";#d#	2630
		2631	reload_regions;
2316	load_faces	2632	reload_facedata;
2317	or die "unable to load faces\n";#d#	2633	#reload_archetypes;#d#
		2634	reload_archetypes;
		2635	reload_treasures;
		2636
		2637	warn "finished reloading resource files\n";
2318	}	2638	}
2319		2639
2320	sub init {	2640	sub init {
2321	reload_resources;	2641	reload_resources;
2322	}	2642	}
2323		2643
2324	sub cfg_load {	2644	sub cfg_load {
2325	open my $fh, "<:utf8", cf::confdir . "/config"	2645	open my $fh, "<:utf8", "$CONFDIR/config"
2326	or return;	2646	or return;
2327		2647
2328	local $/;	2648	local $/;
2329	*CFG = YAML::Syck::Load <$fh>;	2649	*CFG = YAML::Syck::Load <$fh>;
2330		2650
…		…
2415		2735
2416	warn Carp::longmess "post_cleanup backtrace"	2736	warn Carp::longmess "post_cleanup backtrace"
2417	if $make_core;	2737	if $make_core;
2418	}	2738	}
2419		2739
2420	sub reload() {	2740	sub do_reload_perl() {
2421	# can/must only be called in main	2741	# can/must only be called in main
2422	if ($Coro::current != $Coro::main) {	2742	if ($Coro::current != $Coro::main) {
2423	warn "can only reload from main coroutine";	2743	warn "can only reload from main coroutine";
2424	return;	2744	return;
2425	}	2745	}
…		…
2500	Symbol::delete_package "safe::$_"	2820	Symbol::delete_package "safe::$_"
2501	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);
2502		2822
2503	warn "unloading cf.pm \"a bit\"";	2823	warn "unloading cf.pm \"a bit\"";
2504	delete $INC{"cf.pm"};	2824	delete $INC{"cf.pm"};
		2825	delete $INC{"cf/pod.pm"};
2505		2826
2506	# don't, removes xs symbols, too,	2827	# don't, removes xs symbols, too,
2507	# and global variables created in xs	2828	# and global variables created in xs
2508	#Symbol::delete_package __PACKAGE__;	2829	#Symbol::delete_package __PACKAGE__;
2509		2830
…		…
2524	warn "reattaching attachments to maps";	2845	warn "reattaching attachments to maps";
2525	reattach $_ for values %MAP;	2846	reattach $_ for values %MAP;
2526	warn "reattaching attachments to players";	2847	warn "reattaching attachments to players";
2527	reattach $_ for values %PLAYER;	2848	reattach $_ for values %PLAYER;
2528		2849
2529	warn "loading reloadable resources";
2530	reload_resources;
2531
2532	warn "leaving sync_job";	2850	warn "leaving sync_job";
2533		2851
2534	1	2852	1
2535	} or do {	2853	} or do {
2536	warn $@;	2854	warn $@;
…		…
2541	warn "reloaded";	2859	warn "reloaded";
2542	};	2860	};
2543		2861
2544	our $RELOAD_WATCHER; # used only during reload	2862	our $RELOAD_WATCHER; # used only during reload
2545		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
2546	register_command "reload" => sub {	2879	register_command "reload" => sub {
2547	my ($who, $arg) = @_;	2880	my ($who, $arg) = @_;
2548		2881
2549	if ($who->flag (FLAG_WIZ)) {	2882	if ($who->flag (FLAG_WIZ)) {
2550	$who->message ("reloading server.");	2883	$who->message ("reloading server.");
2551		2884	async { reload_perl };
2552	# doing reload synchronously and two reloads happen back-to-back,
2553	# coro crashes during coro_state_free->destroy here.
2554
2555	$RELOAD_WATCHER ||= Event->timer (
2556	reentrant => 0,
2557	after => 0,
2558	data => WF_AUTOCANCEL,
2559	cb => sub {
2560	reload;
2561	undef $RELOAD_WATCHER;
2562	},
2563	);
2564	}	2885	}
2565	};	2886	};
2566		2887
2567	unshift @INC, $LIBDIR;	2888	unshift @INC, $LIBDIR;
2568		2889
2569	my $bug_warning = 0;	2890	my $bug_warning = 0;
2570		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;
2571	$TICK_WATCHER = Event->timer (	2915	$TICK_WATCHER = Event->timer (
2572	reentrant => 0,	2916	reentrant => 0,
2573	parked => 1,	2917	parked => 1,
2574	prio => 0,	2918	prio => 0,
2575	at => $NEXT_TICK || $TICK,	2919	at => $NEXT_TICK || $TICK,
…		…
2579	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"
2580	unless ++$bug_warning > 10;	2924	unless ++$bug_warning > 10;
2581	return;	2925	return;
2582	}	2926	}
2583		2927
2584	$NOW = Event::time;	2928	$NOW = $tick_start = Event::time;
2585		2929
2586	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
2587	$RUNTIME += $TICK;	2955	$RUNTIME += $TICK;
2588	$NEXT_TICK += $TICK;	2956	$NEXT_TICK += $TICK;
2589		2957
2590	if ($NOW >= $NEXT_RUNTIME_WRITE) {	2958	if ($NOW >= $NEXT_RUNTIME_WRITE) {
2591	$NEXT_RUNTIME_WRITE = $NOW + 10;	2959	$NEXT_RUNTIME_WRITE = $NOW + 10;
…		…
2593	write_runtime	2961	write_runtime
2594	or warn "ERROR: unable to write runtime file: $!";	2962	or warn "ERROR: unable to write runtime file: $!";
2595	};	2963	};
2596	}	2964	}
2597		2965
2598	$WAIT_FOR_TICK->broadcast;
2599	$WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2600
2601	# my $AFTER = Event::time;	2966	# my $AFTER = Event::time;
2602	# warn $AFTER - $NOW;#d#	2967	# warn $AFTER - $NOW;#d#
2603		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
2604	# 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
2605	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;	2979	$NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2606		2980
2607	$TICK_WATCHER->at ($NEXT_TICK);	2981	$TICK_WATCHER->at ($NEXT_TICK);
2608	$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
2609	},	2990	},
2610	);	2991	);
2611		2992
2612	{	2993	{
2613	BDB::max_poll_time $TICK * 0.1;	2994	BDB::max_poll_time $TICK * 0.1;
…		…
2641		3022
2642	cf::sync_job {	3023	cf::sync_job {
2643	eval {	3024	eval {
2644	BDB::db_env_open	3025	BDB::db_env_open
2645	$DB_ENV,	3026	$DB_ENV,
2646	$BDB_ENV_DIR,	3027	$BDBDIR,
2647	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
2648	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,	3029	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2649	0666;	3030	0666;
2650		3031
2651	cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;	3032	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2652		3033
2653	$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);
2654	$DB_ENV->set_lk_detect;	3035	$DB_ENV->set_lk_detect;
2655	};	3036	};
2656		3037
…		…
2672	prio => 6,	3053	prio => 6,
2673	cb => \&IO::AIO::poll_cb,	3054	cb => \&IO::AIO::poll_cb,
2674	);	3055	);
2675	}	3056	}
2676		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
2677	END { cf::emergency_save }	3099	END { cf::emergency_save }
2678		3100
2679	1	3101	1
2680		3102

Diff Legend

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