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.407 by root, Sun Jan 13 09:53:53 2008 UTC vs.
Revision 1.471 by root, Mon Apr 27 01:38:48 2009 UTC

		1	#
		2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.
		3	#
		4	# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
		5	#
		6	# Deliantra is free software: you can redistribute it and/or modify
		7	# it under the terms of the GNU General Public License as published by
		8	# the Free Software Foundation, either version 3 of the License, or
		9	# (at your option) any later version.
		10	#
		11	# This program is distributed in the hope that it will be useful,
		12	# but WITHOUT ANY WARRANTY; without even the implied warranty of
		13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		14	# GNU General Public License for more details.
		15	#
		16	# You should have received a copy of the GNU General Public License
		17	# along with this program. If not, see <http://www.gnu.org/licenses/>.
		18	#
		19	# The authors can be reached via e-mail to <support@deliantra.net>
		20	#
		21
1	package cf;	22	package cf;
2		23
		24	use 5.10.0;
3	use utf8;	25	use utf8;
4	use strict;	26	use strict qw(vars subs);
5		27
6	use Symbol;	28	use Symbol;
7	use List::Util;	29	use List::Util;
8	use Socket;	30	use Socket;
9	use EV 1.86;	31	use EV;
10	use Opcode;	32	use Opcode;
11	use Safe;	33	use Safe;
12	use Safe::Hole;	34	use Safe::Hole;
13	use Storable ();	35	use Storable ();
14		36
		37	use Guard ();
15	use Coro 4.32 ();	38	use Coro ();
16	use Coro::State;	39	use Coro::State;
17	use Coro::Handle;	40	use Coro::Handle;
18	use Coro::EV;	41	use Coro::EV;
		42	use Coro::AnyEvent;
19	use Coro::Timer;	43	use Coro::Timer;
20	use Coro::Signal;	44	use Coro::Signal;
21	use Coro::Semaphore;	45	use Coro::Semaphore;
		46	use Coro::SemaphoreSet;
		47	use Coro::AnyEvent;
22	use Coro::AIO;	48	use Coro::AIO;
23	use Coro::BDB;	49	use Coro::BDB 1.6;
24	use Coro::Storable;	50	use Coro::Storable;
25	use Coro::Util ();	51	use Coro::Util ();
26		52
27	use JSON::XS 2.01 ();	53	use JSON::XS 2.01 ();
28	use BDB ();	54	use BDB ();
29	use Data::Dumper;	55	use Data::Dumper;
30	use Digest::MD5;	56	use Digest::MD5;
31	use Fcntl;	57	use Fcntl;
32	use YAML::Syck ();	58	use YAML ();
33	use IO::AIO 2.51 ();	59	use IO::AIO ();
34	use Time::HiRes;	60	use Time::HiRes;
35	use Compress::LZF;	61	use Compress::LZF;
36	use Digest::MD5 ();	62	use Digest::MD5 ();
		63
		64	AnyEvent::detect;
37		65
38	# configure various modules to our taste	66	# configure various modules to our taste
39	#	67	#
40	$Storable::canonical = 1; # reduce rsync transfers	68	$Storable::canonical = 1; # reduce rsync transfers
41	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator	69	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
		70
		71	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
		72
		73	# make sure c-lzf reinitialises itself
		74	Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
42	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later	75	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
43
44	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45	$YAML::Syck::ImplicitUnicode = 1;
46
47	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48		76
49	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	77	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50		78
51	our %COMMAND = ();	79	our %COMMAND = ();
52	our %COMMAND_TIME = ();	80	our %COMMAND_TIME = ();
…		…
55	our %EXTCMD = ();	83	our %EXTCMD = ();
56	our %EXTICMD = ();	84	our %EXTICMD = ();
57	our %EXT_CORO = (); # coroutines bound to extensions	85	our %EXT_CORO = (); # coroutines bound to extensions
58	our %EXT_MAP = (); # pluggable maps	86	our %EXT_MAP = (); # pluggable maps
59		87
60	our $RELOAD; # number of reloads so far	88	our $RELOAD; # number of reloads so far, non-zero while in reload
61	our @EVENT;	89	our @EVENT;
62		90
63	our $CONFDIR = confdir;	91	our $CONFDIR = confdir;
64	our $DATADIR = datadir;	92	our $DATADIR = datadir;
65	our $LIBDIR = "$DATADIR/ext";	93	our $LIBDIR = "$DATADIR/ext";
66	our $PODDIR = "$DATADIR/pod";	94	our $PODDIR = "$DATADIR/pod";
67	our $MAPDIR = "$DATADIR/" . mapdir;	95	our $MAPDIR = "$DATADIR/" . mapdir;
68	our $LOCALDIR = localdir;	96	our $LOCALDIR = localdir;
69	our $TMPDIR = "$LOCALDIR/" . tmpdir;	97	our $TMPDIR = "$LOCALDIR/" . tmpdir;
70	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	98	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	99	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72	our $RANDOMDIR = "$LOCALDIR/random";	100	our $RANDOMDIR = "$LOCALDIR/random";
73	our $BDBDIR = "$LOCALDIR/db";	101	our $BDBDIR = "$LOCALDIR/db";
		102	our $PIDFILE = "$LOCALDIR/pid";
		103	our $RUNTIMEFILE = "$LOCALDIR/runtime";
		104
74	our %RESOURCE;	105	our %RESOURCE;
75		106
76	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	107	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77	our $TICK_WATCHER;
78	our $AIO_POLL_WATCHER;
79	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	108	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80	our $NEXT_TICK;	109	our $NEXT_TICK;
81	our $USE_FSYNC = 1; # use fsync to write maps - default off	110	our $USE_FSYNC = 1; # use fsync to write maps - default on
82		111
83	our $BDB_POLL_WATCHER;
84	our $BDB_DEADLOCK_WATCHER;	112	our $BDB_DEADLOCK_WATCHER;
85	our $BDB_CHECKPOINT_WATCHER;	113	our $BDB_CHECKPOINT_WATCHER;
86	our $BDB_TRICKLE_WATCHER;	114	our $BDB_TRICKLE_WATCHER;
87	our $DB_ENV;	115	our $DB_ENV;
88		116
		117	our @EXTRA_MODULES = qw(pod mapscript);
		118
89	our %CFG;	119	our %CFG;
90		120
91	our $UPTIME; $UPTIME ||= time;	121	our $UPTIME; $UPTIME ||= time;
92	our $RUNTIME;	122	our $RUNTIME;
93	our $NOW;	123	our $NOW;
…		…
99	# used to convert map paths into valid unix filenames by replacing / by ∕	129	# used to convert map paths into valid unix filenames by replacing / by ∕
100	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	130	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101		131
102	our $LOAD; # a number between 0 (idle) and 1 (too many objects)	132	our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103	our $LOADAVG; # same thing, but with alpha-smoothing	133	our $LOADAVG; # same thing, but with alpha-smoothing
		134	our $JITTER; # average jitter
104	our $tick_start; # for load detecting purposes	135	our $TICK_START; # for load detecting purposes
		136
		137	our @POST_INIT;
		138
		139	our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
105		140
106	binmode STDOUT;	141	binmode STDOUT;
107	binmode STDERR;	142	binmode STDERR;
108		143
109	# read virtual server time, if available	144	# read virtual server time, if available
110	unless ($RUNTIME || !-e "$LOCALDIR/runtime") {	145	unless ($RUNTIME || !-e $RUNTIMEFILE) {
111	open my $fh, "<", "$LOCALDIR/runtime"	146	open my $fh, "<", $RUNTIMEFILE
112	or die "unable to read runtime file: $!";	147	or die "unable to read $RUNTIMEFILE file: $!";
113	$RUNTIME = <$fh> + 0.;	148	$RUNTIME = <$fh> + 0.;
114	}	149	}
		150
		151	eval "sub TICK() { $TICK } 1" or die;
115		152
116	mkdir $_	153	mkdir $_
117	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;	154	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
118		155
119	our $EMERGENCY_POSITION;	156	our $EMERGENCY_POSITION;
…		…
195	LOG llevError, $msg;	232	LOG llevError, $msg;
196	};	233	};
197	}	234	}
198		235
199	$Coro::State::DIEHOOK = sub {	236	$Coro::State::DIEHOOK = sub {
		237	return unless $^S eq 0; # "eq", not "=="
		238
		239	if ($Coro::current == $Coro::main) {#d#
		240	warn "DIEHOOK called in main context, Coro bug?\n";#d#
		241	return;#d#
		242	}#d#
		243
		244	# kill coroutine otherwise
200	warn Carp::longmess $_[0];	245	warn Carp::longmess $_[0];
201	Coro::terminate;	246	Coro::terminate
202	};	247	};
		248
		249	$SIG{__DIE__} = sub { }; #d#?
203		250
204	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	251	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
205	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	252	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
206	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	253	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
207	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	254	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
…		…
214	for my $pkg (qw(	261	for my $pkg (qw(
215	cf::global cf::attachable	262	cf::global cf::attachable
216	cf::object cf::object::player	263	cf::object cf::object::player
217	cf::client cf::player	264	cf::client cf::player
218	cf::arch cf::living	265	cf::arch cf::living
		266	cf::map cf::mapspace
219	cf::map cf::party cf::region	267	cf::party cf::region
220	)) {	268	)) {
221	no strict 'refs';
222	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	269	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
223	}	270	}
224		271
225	$EV::DIED = sub {	272	$EV::DIED = sub {
226	warn "error in event callback: @_";	273	warn "error in event callback: @_";
…		…
268	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	315	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
269		316
270	sub encode_json($) { $json_coder->encode ($_[0]) }	317	sub encode_json($) { $json_coder->encode ($_[0]) }
271	sub decode_json($) { $json_coder->decode ($_[0]) }	318	sub decode_json($) { $json_coder->decode ($_[0]) }
272		319
		320	=item cf::post_init { BLOCK }
		321
		322	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
		323	but I<before> the server starts ticking again.
		324
		325	The cdoeblock will have a single boolean argument to indicate whether this
		326	is a reload or not.
		327
		328	=cut
		329
		330	sub post_init(&) {
		331	push @POST_INIT, shift;
		332	}
		333
273	=item cf::lock_wait $string	334	=item cf::lock_wait $string
274		335
275	Wait until the given lock is available. See cf::lock_acquire.	336	Wait until the given lock is available. See cf::lock_acquire.
276		337
277	=item my $lock = cf::lock_acquire $string	338	=item my $lock = cf::lock_acquire $string
278		339
279	Wait until the given lock is available and then acquires it and returns	340	Wait until the given lock is available and then acquires it and returns
280	a Coro::guard object. If the guard object gets destroyed (goes out of scope,	341	a L<Guard> object. If the guard object gets destroyed (goes out of scope,
281	for example when the coroutine gets canceled), the lock is automatically	342	for example when the coroutine gets canceled), the lock is automatically
282	returned.	343	returned.
283		344
284	Locks are *not* recursive, locking from the same coro twice results in a	345	Locks are *not* recursive, locking from the same coro twice results in a
285	deadlocked coro.	346	deadlocked coro.
…		…
291		352
292	Return true if the lock is currently active, i.e. somebody has locked it.	353	Return true if the lock is currently active, i.e. somebody has locked it.
293		354
294	=cut	355	=cut
295		356
296	our %LOCK;	357	our $LOCKS = new Coro::SemaphoreSet;
297	our %LOCKER;#d#
298		358
299	sub lock_wait($) {	359	sub lock_wait($) {
300	my ($key) = @_;	360	$LOCKS->wait ($_[0]);
301
302	if ($LOCKER{$key} == $Coro::current) {#d#
303	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
304	return;#d#
305	}#d#
306
307	# wait for lock, if any
308	while ($LOCK{$key}) {
309	push @{ $LOCK{$key} }, $Coro::current;
310	Coro::schedule;
311	}
312	}	361	}
313		362
314	sub lock_acquire($) {	363	sub lock_acquire($) {
315	my ($key) = @_;	364	$LOCKS->guard ($_[0])
316
317	# wait, to be sure we are not locked
318	lock_wait $key;
319
320	$LOCK{$key} = [];
321	$LOCKER{$key} = $Coro::current;#d#
322
323	Coro::guard {
324	delete $LOCKER{$key};#d#
325	# wake up all waiters, to be on the safe side
326	$_->ready for @{ delete $LOCK{$key} };
327	}
328	}	365	}
329		366
330	sub lock_active($) {	367	sub lock_active($) {
331	my ($key) = @_;	368	$LOCKS->count ($_[0]) < 1
332
333	! ! $LOCK{$key}
334	}	369	}
335		370
336	sub freeze_mainloop {	371	sub freeze_mainloop {
337	return unless $TICK_WATCHER->is_active;	372	tick_inhibit_inc;
338		373
339	my $guard = Coro::guard {	374	&Guard::guard (\&tick_inhibit_dec);
340	$TICK_WATCHER->start;
341	};
342	$TICK_WATCHER->stop;
343	$guard
344	}	375	}
345		376
346	=item cf::periodic $interval, $cb	377	=item cf::periodic $interval, $cb
347		378
348	Like EV::periodic, but randomly selects a starting point so that the actions	379	Like EV::periodic, but randomly selects a starting point so that the actions
…		…
403	}	434	}
404	}	435	}
405	};	436	};
406		437
407	sub get_slot($;$$) {	438	sub get_slot($;$$) {
		439	return if tick_inhibit || $Coro::current == $Coro::main;
		440
408	my ($time, $pri, $name) = @_;	441	my ($time, $pri, $name) = @_;
409		442
410	$time = $TICK * .6 if $time > $TICK * .6;	443	$time = $TICK * .6 if $time > $TICK * .6;
411	my $sig = new Coro::Signal;	444	my $sig = new Coro::Signal;
412		445
…		…
449	# this is the main coro, too bad, we have to block	482	# this is the main coro, too bad, we have to block
450	# till the operation succeeds, freezing the server :/	483	# till the operation succeeds, freezing the server :/
451		484
452	LOG llevError, Carp::longmess "sync job";#d#	485	LOG llevError, Carp::longmess "sync job";#d#
453		486
454	# TODO: use suspend/resume instead
455	# (but this is cancel-safe)
456	my $freeze_guard = freeze_mainloop;	487	my $freeze_guard = freeze_mainloop;
457		488
458	my $busy = 1;	489	my $busy = 1;
459	my @res;	490	my @res;
460		491
…		…
471	} else {	502	} else {
472	EV::loop EV::LOOP_ONESHOT;	503	EV::loop EV::LOOP_ONESHOT;
473	}	504	}
474	}	505	}
475		506
476	$time = EV::time - $time;	507	my $time = EV::time - $time;
477		508
478	LOG llevError | logBacktrace, Carp::longmess "long sync job"
479	if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
480
481	$tick_start += $time; # do not account sync jobs to server load	509	$TICK_START += $time; # do not account sync jobs to server load
482		510
483	wantarray ? @res : $res[0]	511	wantarray ? @res : $res[0]
484	} else {	512	} else {
485	# we are in another coroutine, how wonderful, everything just works	513	# we are in another coroutine, how wonderful, everything just works
486		514
…		…
528	reset_signals;	556	reset_signals;
529	&$cb	557	&$cb
530	}, @args;	558	}, @args;
531		559
532	wantarray ? @res : $res[-1]	560	wantarray ? @res : $res[-1]
		561	}
		562
		563	=item $coin = coin_from_name $name
		564
		565	=cut
		566
		567	our %coin_alias = (
		568	"silver" => "silvercoin",
		569	"silvercoin" => "silvercoin",
		570	"silvercoins" => "silvercoin",
		571	"gold" => "goldcoin",
		572	"goldcoin" => "goldcoin",
		573	"goldcoins" => "goldcoin",
		574	"platinum" => "platinacoin",
		575	"platinumcoin" => "platinacoin",
		576	"platinumcoins" => "platinacoin",
		577	"platina" => "platinacoin",
		578	"platinacoin" => "platinacoin",
		579	"platinacoins" => "platinacoin",
		580	"royalty" => "royalty",
		581	"royalties" => "royalty",
		582	);
		583
		584	sub coin_from_name($) {
		585	$coin_alias{$_[0]}
		586	? cf::arch::find $coin_alias{$_[0]}
		587	: undef
533	}	588	}
534		589
535	=item $value = cf::db_get $family => $key	590	=item $value = cf::db_get $family => $key
536		591
537	Returns a single value from the environment database.	592	Returns a single value from the environment database.
…		…
676		731
677	#############################################################################	732	#############################################################################
678		733
679	=head2 ATTACHABLE OBJECTS	734	=head2 ATTACHABLE OBJECTS
680		735
681	Many objects in crossfire are so-called attachable objects. That means you can	736	Many objects in deliantra are so-called attachable objects. That means you can
682	attach callbacks/event handlers (a collection of which is called an "attachment")	737	attach callbacks/event handlers (a collection of which is called an "attachment")
683	to it. All such attachable objects support the following methods.	738	to it. All such attachable objects support the following methods.
684		739
685	In the following description, CLASS can be any of C<global>, C<object>	740	In the following description, CLASS can be any of C<global>, C<object>
686	C<player>, C<client> or C<map> (i.e. the attachable objects in	741	C<player>, C<client> or C<map> (i.e. the attachable objects in
…		…
736	=item cf::CLASS::attachment $name, ...	791	=item cf::CLASS::attachment $name, ...
737		792
738	Register an attachment by C<$name> through which attachable objects of the	793	Register an attachment by C<$name> through which attachable objects of the
739	given CLASS can refer to this attachment.	794	given CLASS can refer to this attachment.
740		795
741	Some classes such as crossfire maps and objects can specify attachments	796	Some classes such as deliantra maps and objects can specify attachments
742	that are attached at load/instantiate time, thus the need for a name.	797	that are attached at load/instantiate time, thus the need for a name.
743		798
744	These calls expect any number of the following handler/hook descriptions:	799	These calls expect any number of the following handler/hook descriptions:
745		800
746	=over 4	801	=over 4
…		…
1037		1092
1038	sub reattach {	1093	sub reattach {
1039	# basically do the same as instantiate, without calling instantiate	1094	# basically do the same as instantiate, without calling instantiate
1040	my ($obj) = @_;	1095	my ($obj) = @_;
1041		1096
		1097	# no longer needed after getting rid of delete_package?
1042	bless $obj, ref $obj; # re-bless in case extensions have been reloaded	1098	#bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1043		1099
1044	my $registry = $obj->registry;	1100	my $registry = $obj->registry;
1045		1101
1046	@$registry = ();	1102	@$registry = ();
1047		1103
…		…
1093	utf8::decode (my $decname = $filename);	1149	utf8::decode (my $decname = $filename);
1094	warn sprintf "saving %s (%d,%d)\n",	1150	warn sprintf "saving %s (%d,%d)\n",
1095	$decname, length $$rdata, scalar @$objs;	1151	$decname, length $$rdata, scalar @$objs;
1096		1152
1097	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1153	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1098	chmod SAVE_MODE, $fh;	1154	aio_chmod $fh, SAVE_MODE;
1099	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1155	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1100	aio_fsync $fh if $cf::USE_FSYNC;	1156	aio_fsync $fh if $cf::USE_FSYNC;
1101	close $fh;	1157	aio_close $fh;
1102		1158
1103	if (@$objs) {	1159	if (@$objs) {
1104	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {	1160	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1105	chmod SAVE_MODE, $fh;	1161	aio_chmod $fh, SAVE_MODE;
1106	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };	1162	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1107	aio_write $fh, 0, (length $data), $data, 0;	1163	aio_write $fh, 0, (length $data), $data, 0;
1108	aio_fsync $fh if $cf::USE_FSYNC;	1164	aio_fsync $fh if $cf::USE_FSYNC;
1109	close $fh;	1165	aio_close $fh;
1110	aio_rename "$filename.pst~", "$filename.pst";	1166	aio_rename "$filename.pst~", "$filename.pst";
1111	}	1167	}
1112	} else {	1168	} else {
1113	aio_unlink "$filename.pst";	1169	aio_unlink "$filename.pst";
1114	}	1170	}
1115		1171
1116	aio_rename "$filename~", $filename;	1172	aio_rename "$filename~", $filename;
		1173
		1174	$filename =~ s%/[^/]+$%%;
		1175	aio_pathsync $filename if $cf::USE_FSYNC;
1117	} else {	1176	} else {
1118	warn "FATAL: $filename~: $!\n";	1177	warn "unable to save objects: $filename~: $!\n";
1119	}	1178	}
1120	} else {	1179	} else {
1121	aio_unlink $filename;	1180	aio_unlink $filename;
1122	aio_unlink "$filename.pst";	1181	aio_unlink "$filename.pst";
1123	}	1182	}
…		…
1214	my ($name, $cb) = @_;	1273	my ($name, $cb) = @_;
1215		1274
1216	$EXTICMD{$name} = $cb;	1275	$EXTICMD{$name} = $cb;
1217	}	1276	}
1218		1277
		1278	use File::Glob ();
		1279
1219	cf::player->attach (	1280	cf::player->attach (
1220	on_command => sub {	1281	on_command => sub {
1221	my ($pl, $name, $params) = @_;	1282	my ($pl, $name, $params) = @_;
1222		1283
1223	my $cb = $COMMAND{$name}	1284	my $cb = $COMMAND{$name}
…		…
1255		1316
1256	cf::override;	1317	cf::override;
1257	},	1318	},
1258	);	1319	);
1259		1320
		1321	# "readahead" all extensions
		1322	sub cache_extensions {
		1323	my $grp = IO::AIO::aio_group;
		1324
		1325	add $grp IO::AIO::aio_readdir $LIBDIR, sub {
		1326	for (grep /\.ext$/, @{$_[0]}) {
		1327	add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
		1328	}
		1329	};
		1330
		1331	$grp
		1332	}
		1333
1260	sub load_extensions {	1334	sub load_extensions {
1261	cf::sync_job {	1335	cf::sync_job {
1262	my %todo;	1336	my %todo;
1263		1337
1264	for my $path (<$LIBDIR/*.ext>) {	1338	for my $path (<$LIBDIR/*.ext>) {
…		…
1283		1357
1284	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1358	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1285	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1359	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1286		1360
1287	$ext{source} =	1361	$ext{source} =
1288	"package $pkg; use strict; use utf8;\n"	1362	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1289	. "#line 1 \"$path\"\n{\n"	1363	. "#line 1 \"$path\"\n{\n"
1290	. $source	1364	. $source
1291	. "\n};\n1";	1365	. "\n};\n1";
1292		1366
1293	$todo{$base} = \%ext;	1367	$todo{$base} = \%ext;
…		…
1309	my $msg = $@ ? "$v->{path}: $@\n"	1383	my $msg = $@ ? "$v->{path}: $@\n"
1310	: "$v->{base}: extension inactive.\n";	1384	: "$v->{base}: extension inactive.\n";
1311		1385
1312	if (exists $v->{meta}{mandatory}) {	1386	if (exists $v->{meta}{mandatory}) {
1313	warn $msg;	1387	warn $msg;
1314	warn "mandatory extension failed to load, exiting.\n";	1388	cf::cleanup "mandatory extension failed to load, exiting.";
1315	exit 1;
1316	}	1389	}
1317		1390
1318	warn $msg;	1391	warn $msg;
1319	}	1392	}
1320		1393
…		…
1334		1407
1335	=back	1408	=back
1336		1409
1337	=head2 CORE EXTENSIONS	1410	=head2 CORE EXTENSIONS
1338		1411
1339	Functions and methods that extend core crossfire objects.	1412	Functions and methods that extend core deliantra objects.
1340		1413
1341	=cut	1414	=cut
1342		1415
1343	package cf::player;	1416	package cf::player;
1344		1417
…		…
1387		1460
1388	sub exists($) {	1461	sub exists($) {
1389	my ($login) = @_;	1462	my ($login) = @_;
1390		1463
1391	$cf::PLAYER{$login}	1464	$cf::PLAYER{$login}
1392	or cf::sync_job { !aio_stat path $login }	1465	or !aio_stat path $login
1393	}	1466	}
1394		1467
1395	sub find($) {	1468	sub find($) {
1396	return $cf::PLAYER{$_[0]} || do {	1469	return $cf::PLAYER{$_[0]} || do {
1397	my $login = $_[0];	1470	my $login = $_[0];
…		…
1409	my $f = new_from_file cf::object::thawer path $login	1482	my $f = new_from_file cf::object::thawer path $login
1410	or return;	1483	or return;
1411		1484
1412	my $pl = cf::player::load_pl $f	1485	my $pl = cf::player::load_pl $f
1413	or return;	1486	or return;
		1487
1414	local $cf::PLAYER_LOADING{$login} = $pl;	1488	local $cf::PLAYER_LOADING{$login} = $pl;
1415	$f->resolve_delayed_derefs;	1489	$f->resolve_delayed_derefs;
1416	$cf::PLAYER{$login} = $pl	1490	$cf::PLAYER{$login} = $pl
1417	}	1491	}
1418	}	1492	}
…		…
1428		1502
1429	return if $pl->{deny_save};	1503	return if $pl->{deny_save};
1430		1504
1431	aio_mkdir playerdir $pl, 0770;	1505	aio_mkdir playerdir $pl, 0770;
1432	$pl->{last_save} = $cf::RUNTIME;	1506	$pl->{last_save} = $cf::RUNTIME;
		1507
		1508	cf::get_slot 0.01;
1433		1509
1434	$pl->save_pl ($path);	1510	$pl->save_pl ($path);
1435	cf::cede_to_tick;	1511	cf::cede_to_tick;
1436	}	1512	}
1437		1513
…		…
1469	my ($pl) = @_;	1545	my ($pl) = @_;
1470		1546
1471	my $name = $pl->ob->name;	1547	my $name = $pl->ob->name;
1472		1548
1473	$pl->{deny_save} = 1;	1549	$pl->{deny_save} = 1;
1474	$pl->password ("*"); # this should lock out the player until we nuked the dir	1550	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1475		1551
1476	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1552	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1477	$pl->deactivate;	1553	$pl->deactivate;
		1554	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
		1555	$pl->ob->check_score;
1478	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1556	$pl->invoke (cf::EVENT_PLAYER_QUIT);
1479	$pl->ns->destroy if $pl->ns;	1557	$pl->ns->destroy if $pl->ns;
1480		1558
1481	my $path = playerdir $pl;	1559	my $path = playerdir $pl;
1482	my $temp = "$path~$cf::RUNTIME~deleting~";	1560	my $temp = "$path~$cf::RUNTIME~deleting~";
…		…
1521		1599
1522	for my $login (@$dirs) {	1600	for my $login (@$dirs) {
1523	my $path = path $login;	1601	my $path = path $login;
1524		1602
1525	# a .pst is a dead give-away for a valid player	1603	# a .pst is a dead give-away for a valid player
1526	unless (-e "$path.pst") {	1604	# if no pst file found, open and chekc for blocked users
		1605	if (aio_stat "$path.pst") {
1527	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;	1606	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1528	aio_read $fh, 0, 512, my $buf, 0 or next;	1607	aio_read $fh, 0, 512, my $buf, 0 or next;
1529	$buf !~ /^password -------------$/m or next; # official not-valid tag	1608	$buf !~ /^password -------------$/m or next; # official not-valid tag
1530	}	1609	}
1531		1610
…		…
1562	}	1641	}
1563		1642
1564	\@paths	1643	\@paths
1565	}	1644	}
1566		1645
1567	=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)	1646	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1568		1647
1569	Expand crossfire pod fragments into protocol xml.	1648	Expand deliantra pod fragments into protocol xml.
1570
1571	=cut
1572
1573	use re 'eval';
1574
1575	my $group;
1576	my $interior; $interior = qr{
1577	# match a pod interior sequence sans C<< >>
1578	(?:
1579	\ (.*?)\ (?{ $group = $^N })
1580	| < (??{$interior}) >
1581	)
1582	}x;
1583
1584	sub expand_cfpod {
1585	my ($self, $pod) = @_;
1586
1587	my $xml;
1588
1589	while () {
1590	if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1591	$group = $1;
1592
1593	$group =~ s/&/&amp;/g;
1594	$group =~ s/</&lt;/g;
1595
1596	$xml .= $group;
1597	} elsif ($pod =~ m%\G
1598	([BCGHITU])
1599	<
1600	(?:
1601	([^<>]*) (?{ $group = $^N })
1602	| < $interior >
1603	)
1604	>
1605	%gcsx
1606	) {
1607	my ($code, $data) = ($1, $group);
1608
1609	if ($code eq "B") {
1610	$xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1611	} elsif ($code eq "I") {
1612	$xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1613	} elsif ($code eq "U") {
1614	$xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1615	} elsif ($code eq "C") {
1616	$xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1617	} elsif ($code eq "T") {
1618	$xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1619	} elsif ($code eq "G") {
1620	my ($male, $female) = split /\|/, $data;
1621	$data = $self->gender ? $female : $male;
1622	$xml .= expand_cfpod ($self, $data);
1623	} elsif ($code eq "H") {
1624	$xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1625	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1626	"")
1627	[$self->{hintmode}];
1628	} else {
1629	$xml .= "error processing '$code($data)' directive";
1630	}
1631	} else {
1632	if ($pod =~ /\G(.+)/) {
1633	warn "parse error while expanding $pod (at $1)";
1634	}
1635	last;
1636	}
1637	}
1638
1639	for ($xml) {
1640	# create single paragraphs (very hackish)
1641	s/(?<=\S)\n(?=\w)/ /g;
1642
1643	# compress some whitespace
1644	s/\s+\n/\n/g; # ws line-ends
1645	s/\n\n+/\n/g; # double lines
1646	s/^\n+//; # beginning lines
1647	s/\n+$//; # ending lines
1648	}
1649
1650	$xml
1651	}
1652
1653	no re 'eval';
1654
1655	sub hintmode {
1656	$_[0]{hintmode} = $_[1] if @_ > 1;
1657	$_[0]{hintmode}
1658	}
1659		1649
1660	=item $player->ext_reply ($msgid, @msg)	1650	=item $player->ext_reply ($msgid, @msg)
1661		1651
1662	Sends an ext reply to the player.	1652	Sends an ext reply to the player.
1663		1653
…		…
1730	our $MAX_RESET = 3600;	1720	our $MAX_RESET = 3600;
1731	our $DEFAULT_RESET = 3000;	1721	our $DEFAULT_RESET = 3000;
1732		1722
1733	sub generate_random_map {	1723	sub generate_random_map {
1734	my ($self, $rmp) = @_;	1724	my ($self, $rmp) = @_;
		1725
		1726	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
		1727
1735	# mit "rum" bekleckern, nicht	1728	# mit "rum" bekleckern, nicht
1736	$self->_create_random_map (	1729	$self->_create_random_map (
1737	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},	1730	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1738	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},	1731	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1739	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},	1732	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
…		…
1861		1854
1862	# the temporary/swap location	1855	# the temporary/swap location
1863	sub save_path {	1856	sub save_path {
1864	my ($self) = @_;	1857	my ($self) = @_;
1865		1858
1866	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1859	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1867	"$TMPDIR/$path.map"	1860	"$TMPDIR/$path.map"
1868	}	1861	}
1869		1862
1870	# the unique path, undef == no special unique path	1863	# the unique path, undef == no special unique path
1871	sub uniq_path {	1864	sub uniq_path {
1872	my ($self) = @_;	1865	my ($self) = @_;
1873		1866
1874	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1867	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1875	"$UNIQUEDIR/$path"	1868	"$UNIQUEDIR/$path"
1876	}
1877
1878	# and all this just because we cannot iterate over
1879	# all maps in C++...
1880	sub change_all_map_light {
1881	my ($change) = @_;
1882
1883	$_->change_map_light ($change)
1884	for grep $_->outdoor, values %cf::MAP;
1885	}	1869	}
1886		1870
1887	sub decay_objects {	1871	sub decay_objects {
1888	my ($self) = @_;	1872	my ($self) = @_;
1889		1873
…		…
1973	sub find {	1957	sub find {
1974	my ($path, $origin) = @_;	1958	my ($path, $origin) = @_;
1975		1959
1976	$path = normalise $path, $origin && $origin->path;	1960	$path = normalise $path, $origin && $origin->path;
1977		1961
1978	cf::lock_wait "map_data:$path";#d#remove	1962	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1979	cf::lock_wait "map_find:$path";	1963	my $guard2 = cf::lock_acquire "map_find:$path";
1980		1964
1981	$cf::MAP{$path} || do {	1965	$cf::MAP{$path} || do {
1982	my $guard1 = cf::lock_acquire "map_find:$path";
1983	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1984
1985	my $map = new_from_path cf::map $path	1966	my $map = new_from_path cf::map $path
1986	or return;	1967	or return;
1987		1968
1988	$map->{last_save} = $cf::RUNTIME;	1969	$map->{last_save} = $cf::RUNTIME;
1989		1970
…		…
1991	or return;	1972	or return;
1992		1973
1993	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1974	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1994	# doing this can freeze the server in a sync job, obviously	1975	# doing this can freeze the server in a sync job, obviously
1995	#$cf::WAIT_FOR_TICK->wait;	1976	#$cf::WAIT_FOR_TICK->wait;
		1977	undef $guard2;
1996	undef $guard1;	1978	undef $guard1;
1997	undef $guard2;
1998	$map->reset;	1979	$map->reset;
1999	return find $path;	1980	return find $path;
2000	}	1981	}
2001		1982
2002	$cf::MAP{$path} = $map	1983	$cf::MAP{$path} = $map
…		…
2029	my $f = new_from_file cf::object::thawer $self->{load_path};	2010	my $f = new_from_file cf::object::thawer $self->{load_path};
2030	$f->skip_block;	2011	$f->skip_block;
2031	$self->_load_objects ($f)	2012	$self->_load_objects ($f)
2032	or return;	2013	or return;
2033		2014
2034	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	2015	$self->post_load_original
2035	if delete $self->{load_original};	2016	if delete $self->{load_original};
2036		2017
2037	if (my $uniq = $self->uniq_path) {	2018	if (my $uniq = $self->uniq_path) {
2038	utf8::encode $uniq;	2019	utf8::encode $uniq;
2039	unless (aio_stat $uniq) {	2020	unless (aio_stat $uniq) {
…		…
2057	unless ($self->{deny_activate}) {	2038	unless ($self->{deny_activate}) {
2058	$self->decay_objects;	2039	$self->decay_objects;
2059	$self->fix_auto_apply;	2040	$self->fix_auto_apply;
2060	$self->update_buttons;	2041	$self->update_buttons;
2061	cf::cede_to_tick;	2042	cf::cede_to_tick;
2062	$self->set_darkness_map;
2063	cf::cede_to_tick;
2064	$self->activate;	2043	$self->activate;
2065	}	2044	}
2066		2045
2067	$self->{last_save} = $cf::RUNTIME;	2046	$self->{last_save} = $cf::RUNTIME;
2068	$self->last_access ($cf::RUNTIME);	2047	$self->last_access ($cf::RUNTIME);
2069		2048
2070	$self->in_memory (cf::MAP_IN_MEMORY);	2049	$self->in_memory (cf::MAP_ACTIVE);
2071	}	2050	}
2072		2051
2073	$self->post_load;	2052	$self->post_load;
2074	}	2053	}
2075		2054
…		…
2133	my ($path, $origin, $load) = @_;	2112	my ($path, $origin, $load) = @_;
2134		2113
2135	$path = normalise $path, $origin && $origin->{path};	2114	$path = normalise $path, $origin && $origin->{path};
2136		2115
2137	if (my $map = $cf::MAP{$path}) {	2116	if (my $map = $cf::MAP{$path}) {
2138	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;	2117	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2139	}	2118	}
2140		2119
2141	$MAP_PREFETCH{$path} |= $load;	2120	$MAP_PREFETCH{$path} |= $load;
2142		2121
2143	$MAP_PREFETCHER ||= cf::async {	2122	$MAP_PREFETCHER ||= cf::async {
…		…
2180	cf::async {	2159	cf::async {
2181	$Coro::current->{desc} = "map player save";	2160	$Coro::current->{desc} = "map player save";
2182	$_->contr->save for $self->players;	2161	$_->contr->save for $self->players;
2183	};	2162	};
2184		2163
		2164	cf::get_slot 0.02;
		2165
2185	if ($uniq) {	2166	if ($uniq) {
2186	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);	2167	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2187	$self->_save_objects ($uniq, cf::IO_UNIQUES);	2168	$self->_save_objects ($uniq, cf::IO_UNIQUES);
2188	} else {	2169	} else {
2189	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);	2170	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
…		…
2197	$self->save;	2178	$self->save;
2198		2179
2199	my $lock = cf::lock_acquire "map_data:$self->{path}";	2180	my $lock = cf::lock_acquire "map_data:$self->{path}";
2200		2181
2201	return if $self->players;	2182	return if $self->players;
2202	return if $self->in_memory != cf::MAP_IN_MEMORY;	2183	return if $self->in_memory != cf::MAP_ACTIVE;
2203	return if $self->{deny_save};	2184	return if $self->{deny_save};
2204		2185
2205	$self->in_memory (cf::MAP_SWAPPED);	2186	$self->in_memory (cf::MAP_SWAPPED);
2206		2187
2207	$self->deactivate;	2188	$self->deactivate;
…		…
2325		2306
2326	sub unique_maps() {	2307	sub unique_maps() {
2327	[	2308	[
2328	map {	2309	map {
2329	utf8::decode $_;	2310	utf8::decode $_;
2330	/\.map$/	2311	s/\.map$//; # TODO future compatibility hack
		2312	/\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
		2313	? ()
2331	? normalise $_	2314	: normalise $_
2332	: ()
2333	} @{ aio_readdir $UNIQUEDIR or [] }	2315	} @{ aio_readdir $UNIQUEDIR or [] }
2334	]	2316	]
2335	}	2317	}
2336		2318
2337	package cf;
2338
2339	=back	2319	=back
2340		2320
2341	=head3 cf::object	2321	=head3 cf::object
2342		2322
2343	=cut	2323	=cut
…		…
2346		2326
2347	=over 4	2327	=over 4
2348		2328
2349	=item $ob->inv_recursive	2329	=item $ob->inv_recursive
2350		2330
2351	Returns the inventory of the object _and_ their inventories, recursively.	2331	Returns the inventory of the object I<and> their inventories, recursively,
		2332	but I<not> the object itself.
2352		2333
2353	=cut	2334	=cut
2354		2335
2355	sub inv_recursive_;	2336	sub inv_recursive_;
2356	sub inv_recursive_ {	2337	sub inv_recursive_ {
…		…
2361	inv_recursive_ inv $_[0]	2342	inv_recursive_ inv $_[0]
2362	}	2343	}
2363		2344
2364	=item $ref = $ob->ref	2345	=item $ref = $ob->ref
2365		2346
2366	creates and returns a persistent reference to an objetc that can be stored as a string.	2347	Creates and returns a persistent reference to an object that can be stored as a string.
2367		2348
2368	=item $ob = cf::object::deref ($refstring)	2349	=item $ob = cf::object::deref ($refstring)
2369		2350
2370	returns the objetc referenced by refstring. may return undef when it cnanot find the object,	2351	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2371	even if the object actually exists. May block.	2352	even if the object actually exists. May block.
…		…
2403	can be C<undef>. Does the right thing when the player is currently in a	2384	can be C<undef>. Does the right thing when the player is currently in a
2404	dialogue with the given NPC character.	2385	dialogue with the given NPC character.
2405		2386
2406	=cut	2387	=cut
2407		2388
		2389	our $SAY_CHANNEL = {
		2390	id => "say",
		2391	title => "Map",
		2392	reply => "say ",
		2393	tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
		2394	};
		2395
		2396	our $CHAT_CHANNEL = {
		2397	id => "chat",
		2398	title => "Chat",
		2399	reply => "chat ",
		2400	tooltip => "Player chat and shouts, global to the server.",
		2401	};
		2402
2408	# rough implementation of a future "reply" method that works	2403	# rough implementation of a future "reply" method that works
2409	# with dialog boxes.	2404	# with dialog boxes.
2410	#TODO: the first argument must go, split into a $npc->reply_to ( method	2405	#TODO: the first argument must go, split into a $npc->reply_to ( method
2411	sub cf::object::player::reply($$$;$) {	2406	sub cf::object::player::reply($$$;$) {
2412	my ($self, $npc, $msg, $flags) = @_;	2407	my ($self, $npc, $msg, $flags) = @_;
…		…
2423	my $dialog = $pl->{npc_dialog};	2418	my $dialog = $pl->{npc_dialog};
2424	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));	2419	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2425		2420
2426	} else {	2421	} else {
2427	$msg = $npc->name . " says: $msg" if $npc;	2422	$msg = $npc->name . " says: $msg" if $npc;
2428	$self->message ($msg, $flags);	2423	$self->send_msg ($SAY_CHANNEL => $msg, $flags);
2429	}	2424	}
2430	}	2425	}
2431	}	2426	}
2432		2427
2433	=item $object->send_msg ($channel, $msg, $color, [extra...])	2428	=item $object->send_msg ($channel, $msg, $color, [extra...])
…		…
2458		2453
2459	=item $player_object->enter_link	2454	=item $player_object->enter_link
2460		2455
2461	Freezes the player and moves him/her to a special map (C<{link}>).	2456	Freezes the player and moves him/her to a special map (C<{link}>).
2462		2457
2463	The player should be reasonably safe there for short amounts of time. You	2458	The player should be reasonably safe there for short amounts of time (e.g.
2464	I<MUST> call C<leave_link> as soon as possible, though.	2459	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
		2460	though, as the palyer cannot control the character while it is on the link
		2461	map.
2465		2462
2466	Will never block.	2463	Will never block.
2467		2464
2468	=item $player_object->leave_link ($map, $x, $y)	2465	=item $player_object->leave_link ($map, $x, $y)
2469		2466
…		…
2527		2524
2528	$map->load;	2525	$map->load;
2529	$map->load_neighbours;	2526	$map->load_neighbours;
2530		2527
2531	return unless $self->contr->active;	2528	return unless $self->contr->active;
		2529	$self->flag (cf::FLAG_DEBUG, 0);#d# temp
2532	$self->activate_recursive;	2530	$self->activate_recursive;
2533		2531
2534	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2532	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2535	$self->enter_map ($map, $x, $y);	2533	$self->enter_map ($map, $x, $y);
2536	}	2534	}
…		…
2540	Moves the player to the given map-path and coordinates by first freezing	2538	Moves the player to the given map-path and coordinates by first freezing
2541	her, loading and preparing them map, calling the provided $check callback	2539	her, loading and preparing them map, calling the provided $check callback
2542	that has to return the map if sucecssful, and then unfreezes the player on	2540	that has to return the map if sucecssful, and then unfreezes the player on
2543	the new (success) or old (failed) map position. In either case, $done will	2541	the new (success) or old (failed) map position. In either case, $done will
2544	be called at the end of this process.	2542	be called at the end of this process.
		2543
		2544	Note that $check will be called with a potentially non-loaded map, so if
		2545	it needs a loaded map it has to call C<< ->load >>.
2545		2546
2546	=cut	2547	=cut
2547		2548
2548	our $GOTOGEN;	2549	our $GOTOGEN;
2549		2550
…		…
2628	}	2629	}
2629		2630
2630	sub prepare_random_map {	2631	sub prepare_random_map {
2631	my ($exit) = @_;	2632	my ($exit) = @_;
2632		2633
2633	my $guard = cf::lock_acquire "exit_prepare:$exit";
2634
2635	# all this does is basically replace the /! path by	2634	# all this does is basically replace the /! path by
2636	# a new random map path (?random/...) with a seed	2635	# a new random map path (?random/...) with a seed
2637	# that depends on the exit object	2636	# that depends on the exit object
2638		2637
2639	my $rmp = parse_random_map_params $exit->msg;	2638	my $rmp = parse_random_map_params $exit->msg;
…		…
2641	if ($exit->map) {	2640	if ($exit->map) {
2642	$rmp->{region} = $exit->region->name;	2641	$rmp->{region} = $exit->region->name;
2643	$rmp->{origin_map} = $exit->map->path;	2642	$rmp->{origin_map} = $exit->map->path;
2644	$rmp->{origin_x} = $exit->x;	2643	$rmp->{origin_x} = $exit->x;
2645	$rmp->{origin_y} = $exit->y;	2644	$rmp->{origin_y} = $exit->y;
		2645
		2646	$exit->map->touch;
2646	}	2647	}
2647		2648
2648	$rmp->{random_seed} ||= $exit->random_seed;	2649	$rmp->{random_seed} ||= $exit->random_seed;
2649		2650
2650	my $data = cf::encode_json $rmp;	2651	my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2651	my $md5 = Digest::MD5::md5_hex $data;	2652	my $md5 = Digest::MD5::md5_hex $data;
2652	my $meta = "$RANDOMDIR/$md5.meta";	2653	my $meta = "$RANDOMDIR/$md5.meta";
2653		2654
2654	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {	2655	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2655	aio_write $fh, 0, (length $data), $data, 0;	2656	aio_write $fh, 0, (length $data), $data, 0;
2656	undef $fh;	2657	undef $fh;
2657	aio_rename "$meta~", $meta;	2658	aio_rename "$meta~", $meta;
2658		2659
		2660	my $slaying = "?random/$md5";
		2661
		2662	if ($exit->valid) {
2659	$exit->slaying ("?random/$md5");	2663	$exit->slaying ("?random/$md5");
2660	$exit->msg (undef);	2664	$exit->msg (undef);
		2665	}
2661	}	2666	}
2662	}	2667	}
2663		2668
2664	sub cf::object::player::enter_exit {	2669	sub cf::object::player::enter_exit {
2665	my ($self, $exit) = @_;	2670	my ($self, $exit) = @_;
2666		2671
2667	return unless $self->type == cf::PLAYER;	2672	return unless $self->type == cf::PLAYER;
2668		2673
2669	if ($exit->slaying eq "/!") {
2670	#TODO: this should de-fi-ni-te-ly not be a sync-job
2671	# the problem is that $exit might not survive long enough
2672	# so it needs to be done right now, right here
2673	cf::sync_job { prepare_random_map $exit };
2674	}
2675
2676	my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2677	my $hp = $exit->stats->hp;
2678	my $sp = $exit->stats->sp;
2679
2680	$self->enter_link;	2674	$self->enter_link;
2681		2675
2682	# if exit is damned, update players death & WoR home-position
2683	$self->contr->savebed ($slaying, $hp, $sp)
2684	if $exit->flag (FLAG_DAMNED);
2685
2686	(async {	2676	(async {
2687	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";	2677	$Coro::current->{desc} = "enter_exit";
2688		2678
2689	$self->deactivate_recursive; # just to be sure
2690	unless (eval {	2679	unless (eval {
		2680	$self->deactivate_recursive; # just to be sure
		2681
		2682	# random map handling
		2683	{
		2684	my $guard = cf::lock_acquire "exit_prepare:$exit";
		2685
		2686	prepare_random_map $exit
		2687	if $exit->slaying eq "/!";
		2688	}
		2689
		2690	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
		2691	my $x = $exit->stats->hp;
		2692	my $y = $exit->stats->sp;
		2693
2691	$self->goto ($slaying, $hp, $sp);	2694	$self->goto ($map, $x, $y);
2692		2695
		2696	# if exit is damned, update players death & WoR home-position
		2697	$self->contr->savebed ($map, $x, $y)
		2698	if $exit->flag (cf::FLAG_DAMNED);
		2699
2693	1;	2700	1
2694	}) {	2701	}) {
2695	$self->message ("Something went wrong deep within the crossfire server. "	2702	$self->message ("Something went wrong deep within the deliantra server. "
2696	. "I'll try to bring you back to the map you were before. "	2703	. "I'll try to bring you back to the map you were before. "
2697	. "Please report this to the dungeon master!",	2704	. "Please report this to the dungeon master!",
2698	cf::NDI_UNIQUE | cf::NDI_RED);	2705	cf::NDI_UNIQUE | cf::NDI_RED);
2699		2706
2700	warn "ERROR in enter_exit: $@";	2707	warn "ERROR in enter_exit: $@";
…		…
2766	id => "infobox",	2773	id => "infobox",
2767	title => "Body Parts",	2774	title => "Body Parts",
2768	reply => undef,	2775	reply => undef,
2769	tooltip => "Shows which body parts you posess and are available",	2776	tooltip => "Shows which body parts you posess and are available",
2770	},	2777	},
		2778	"c/statistics" => {
		2779	id => "infobox",
		2780	title => "Statistics",
		2781	reply => undef,
		2782	tooltip => "Shows your primary statistics",
		2783	},
		2784	"c/skills" => {
		2785	id => "infobox",
		2786	title => "Skills",
		2787	reply => undef,
		2788	tooltip => "Shows your experience per skill and item power",
		2789	},
		2790	"c/shopitems" => {
		2791	id => "infobox",
		2792	title => "Shop Items",
		2793	reply => undef,
		2794	tooltip => "Shows the items currently for sale in this shop",
		2795	},
		2796	"c/resistances" => {
		2797	id => "infobox",
		2798	title => "Resistances",
		2799	reply => undef,
		2800	tooltip => "Shows your resistances",
		2801	},
		2802	"c/pets" => {
		2803	id => "infobox",
		2804	title => "Pets",
		2805	reply => undef,
		2806	tooltip => "Shows information abotu your pets/a specific pet",
		2807	},
		2808	"c/perceiveself" => {
		2809	id => "infobox",
		2810	title => "Perceive Self",
		2811	reply => undef,
		2812	tooltip => "You gained detailed knowledge about yourself",
		2813	},
2771	"c/uptime" => {	2814	"c/uptime" => {
2772	id => "infobox",	2815	id => "infobox",
2773	title => "Uptime",	2816	title => "Uptime",
2774	reply => undef,	2817	reply => undef,
2775	tooltip => "How long the server has been running since last restart",	2818	tooltip => "How long the server has been running since last restart",
…		…
2778	id => "infobox",	2821	id => "infobox",
2779	title => "Map Info",	2822	title => "Map Info",
2780	reply => undef,	2823	reply => undef,
2781	tooltip => "Information related to the maps",	2824	tooltip => "Information related to the maps",
2782	},	2825	},
		2826	"c/party" => {
		2827	id => "party",
		2828	title => "Party",
		2829	reply => "gsay ",
		2830	tooltip => "Messages and chat related to your party",
		2831	},
		2832	"c/death" => {
		2833	id => "death",
		2834	title => "Death",
		2835	reply => undef,
		2836	tooltip => "Reason for and more info about your most recent death",
		2837	},
		2838	"c/say" => $SAY_CHANNEL,
		2839	"c/chat" => $CHAT_CHANNEL,
2783	);	2840	);
2784		2841
2785	sub cf::client::send_msg {	2842	sub cf::client::send_msg {
2786	my ($self, $channel, $msg, $color, @extra) = @_;	2843	my ($self, $channel, $msg, $color, @extra) = @_;
2787		2844
2788	$msg = $self->pl->expand_cfpod ($msg);	2845	$msg = $self->pl->expand_cfpod ($msg)
		2846	unless $color & cf::NDI_VERBATIM;
2789		2847
2790	$color &= cf::NDI_CLIENT_MASK; # just in case...	2848	$color &= cf::NDI_CLIENT_MASK; # just in case...
2791		2849
2792	# check predefined channels, for the benefit of C	2850	# check predefined channels, for the benefit of C
2793	if ($CHANNEL{$channel}) {	2851	if ($CHANNEL{$channel}) {
2794	$channel = $CHANNEL{$channel};	2852	$channel = $CHANNEL{$channel};
2795		2853
2796	$self->ext_msg (channel_info => $channel)	2854	$self->ext_msg (channel_info => $channel);
2797	if $self->can_msg;
2798
2799	$channel = $channel->{id};	2855	$channel = $channel->{id};
2800		2856
2801	} elsif (ref $channel) {	2857	} elsif (ref $channel) {
2802	# send meta info to client, if not yet sent	2858	# send meta info to client, if not yet sent
2803	unless (exists $self->{channel}{$channel->{id}}) {	2859	unless (exists $self->{channel}{$channel->{id}}) {
2804	$self->{channel}{$channel->{id}} = $channel;	2860	$self->{channel}{$channel->{id}} = $channel;
2805	$self->ext_msg (channel_info => $channel)	2861	$self->ext_msg (channel_info => $channel);
2806	if $self->can_msg;
2807	}	2862	}
2808		2863
2809	$channel = $channel->{id};	2864	$channel = $channel->{id};
2810	}	2865	}
2811		2866
2812	return unless @extra || length $msg;	2867	return unless @extra || length $msg;
2813		2868
2814	if ($self->can_msg) {
2815	# default colour, mask it out	2869	# default colour, mask it out
2816	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)	2870	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2817	if $color & cf::NDI_DEF;	2871	if $color & cf::NDI_DEF;
2818		2872
2819	$self->send_packet ("msg " . $self->{json_coder}->encode (	2873	my $pkt = "msg "
		2874	. $self->{json_coder}->encode (
2820	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));	2875	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2821	} else {	2876	);
2822	if ($color >= 0) {
2823	# replace some tags by gcfclient-compatible ones
2824	for ($msg) {
2825	1 while
2826	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2827	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2828	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2829	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2830	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2831	}
2832		2877
2833	$color &= cf::NDI_COLOR_MASK;	2878	# try lzf for large packets
		2879	$pkt = "lzf " . Compress::LZF::compress $pkt
		2880	if 1024 <= length $pkt and $self->{can_lzf};
2834		2881
2835	utf8::encode $msg;	2882	# split very large packets
2836		2883	if (8192 < length $pkt and $self->{can_lzf}) {
2837	if (0 && $msg =~ /\[/) {	2884	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2838	# COMMAND/INFO	2885	$pkt = "frag";
2839	$self->send_packet ("drawextinfo $color 10 8 $msg")
2840	} else {
2841	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2842	$self->send_packet ("drawinfo $color $msg")
2843	}
2844	}
2845	}	2886	}
		2887
		2888	$self->send_packet ($pkt);
2846	}	2889	}
2847		2890
2848	=item $client->ext_msg ($type, @msg)	2891	=item $client->ext_msg ($type, @msg)
2849		2892
2850	Sends an ext event to the client.	2893	Sends an ext event to the client.
…		…
3024		3067
3025	The following functions and methods are available within a safe environment:	3068	The following functions and methods are available within a safe environment:
3026		3069
3027	cf::object	3070	cf::object
3028	contr pay_amount pay_player map x y force_find force_add destroy	3071	contr pay_amount pay_player map x y force_find force_add destroy
3029	insert remove name archname title slaying race decrease_ob_nr	3072	insert remove name archname title slaying race decrease split
		3073	value
3030		3074
3031	cf::object::player	3075	cf::object::player
3032	player	3076	player
3033		3077
3034	cf::player	3078	cf::player
…		…
3039		3083
3040	=cut	3084	=cut
3041		3085
3042	for (	3086	for (
3043	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	3087	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3044	insert remove inv name archname title slaying race	3088	insert remove inv nrof name archname title slaying race
3045	decrease_ob_nr destroy)],	3089	decrease split destroy change_exp value msg lore send_msg)],
3046	["cf::object::player" => qw(player)],	3090	["cf::object::player" => qw(player)],
3047	["cf::player" => qw(peaceful)],	3091	["cf::player" => qw(peaceful send_msg)],
3048	["cf::map" => qw(trigger)],	3092	["cf::map" => qw(trigger)],
3049	) {	3093	) {
3050	no strict 'refs';	3094	no strict 'refs';
3051	my ($pkg, @funs) = @$_;	3095	my ($pkg, @funs) = @$_;
3052	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3096	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
…		…
3069	my ($code, %vars) = @_;	3113	my ($code, %vars) = @_;
3070		3114
3071	my $qcode = $code;	3115	my $qcode = $code;
3072	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3116	$qcode =~ s/"/‟/g; # not allowed in #line filenames
3073	$qcode =~ s/\n/\\n/g;	3117	$qcode =~ s/\n/\\n/g;
		3118
		3119	%vars = (_dummy => 0) unless %vars;
3074		3120
3075	local $_;	3121	local $_;
3076	local @safe::cf::_safe_eval_args = values %vars;	3122	local @safe::cf::_safe_eval_args = values %vars;
3077		3123
3078	my $eval =	3124	my $eval =
…		…
3258	while (my ($k, $v) = each %$want) {	3304	while (my ($k, $v) = each %$want) {
3259	$ns->fx_want ($k, $v);	3305	$ns->fx_want ($k, $v);
3260	}	3306	}
3261	};	3307	};
3262		3308
		3309	sub load_resource_file($) {
		3310	my $guard = lock_acquire "load_resource_file";
		3311
		3312	my $status = load_resource_file_ $_[0];
		3313	get_slot 0.1, 100;
		3314	cf::arch::commit_load;
		3315
		3316	$status
		3317	}
		3318
3263	sub reload_regions {	3319	sub reload_regions {
3264	# HACK to clear player env face cache, we need some signal framework	3320	# HACK to clear player env face cache, we need some signal framework
3265	# for this (global event?)	3321	# for this (global event?)
3266	%ext::player_env::MUSIC_FACE_CACHE = ();	3322	%ext::player_env::MUSIC_FACE_CACHE = ();
3267		3323
…		…
3280	}	3336	}
3281		3337
3282	sub reload_archetypes {	3338	sub reload_archetypes {
3283	load_resource_file "$DATADIR/archetypes"	3339	load_resource_file "$DATADIR/archetypes"
3284	or die "unable to load archetypes\n";	3340	or die "unable to load archetypes\n";
3285	#d# NEED to laod twice to resolve forward references
3286	# this really needs to be done in an extra post-pass
3287	# (which needs to be synchronous, so solve it differently)
3288	load_resource_file "$DATADIR/archetypes"
3289	or die "unable to load archetypes\n";
3290	}	3341	}
3291		3342
3292	sub reload_treasures {	3343	sub reload_treasures {
3293	load_resource_file "$DATADIR/treasures"	3344	load_resource_file "$DATADIR/treasures"
3294	or die "unable to load treasurelists\n";	3345	or die "unable to load treasurelists\n";
3295	}	3346	}
3296		3347
3297	sub reload_resources {	3348	sub reload_resources {
3298	warn "reloading resource files...\n";	3349	warn "reloading resource files...\n";
3299		3350
		3351	reload_facedata;
		3352	reload_archetypes;
3300	reload_regions;	3353	reload_regions;
3301	reload_facedata;
3302	#reload_archetypes;#d#
3303	reload_archetypes;
3304	reload_treasures;	3354	reload_treasures;
3305		3355
3306	warn "finished reloading resource files\n";	3356	warn "finished reloading resource files\n";
3307	}
3308
3309	sub init {
3310	reload_resources;
3311	}	3357	}
3312		3358
3313	sub reload_config {	3359	sub reload_config {
3314	open my $fh, "<:utf8", "$CONFDIR/config"	3360	open my $fh, "<:utf8", "$CONFDIR/config"
3315	or return;	3361	or return;
3316		3362
3317	local $/;	3363	local $/;
3318	*CFG = YAML::Syck::Load <$fh>;	3364	*CFG = YAML::Load <$fh>;
3319		3365
3320	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3366	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3321		3367
3322	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3368	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3323	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3369	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
3329	};	3375	};
3330	warn $@ if $@;	3376	warn $@ if $@;
3331	}	3377	}
3332	}	3378	}
3333		3379
		3380	sub pidfile() {
		3381	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
		3382	or die "$PIDFILE: $!";
		3383	flock $fh, &Fcntl::LOCK_EX
		3384	or die "$PIDFILE: flock: $!";
		3385	$fh
		3386	}
		3387
		3388	# make sure only one server instance is running at any one time
		3389	sub atomic {
		3390	my $fh = pidfile;
		3391
		3392	my $pid = <$fh>;
		3393	kill 9, $pid if $pid > 0;
		3394
		3395	seek $fh, 0, 0;
		3396	print $fh $$;
		3397	}
		3398
3334	sub main {	3399	sub main {
		3400	cf::init_globals; # initialise logging
		3401
		3402	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
		3403	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
		3404	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
		3405	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
		3406
		3407	cf::init_experience;
		3408	cf::init_anim;
		3409	cf::init_attackmess;
		3410	cf::init_dynamic;
		3411
		3412	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
		3413
3335	# we must not ever block the main coroutine	3414	# we must not ever block the main coroutine
3336	local $Coro::idle = sub {	3415	local $Coro::idle = sub {
3337	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3416	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3338	(async {	3417	(async {
3339	$Coro::current->{desc} = "IDLE BUG HANDLER";	3418	$Coro::current->{desc} = "IDLE BUG HANDLER";
3340	EV::loop EV::LOOP_ONESHOT;	3419	EV::loop EV::LOOP_ONESHOT;
3341	})->prio (Coro::PRIO_MAX);	3420	})->prio (Coro::PRIO_MAX);
3342	};	3421	};
3343		3422
		3423	evthread_start IO::AIO::poll_fileno;
		3424
		3425	cf::sync_job {
		3426	reload_resources;
3344	reload_config;	3427	reload_config;
3345	db_init;	3428	db_init;
		3429
		3430	cf::load_settings;
		3431	cf::load_materials;
		3432	cf::init_uuid;
		3433	cf::init_signals;
		3434	cf::init_commands;
		3435	cf::init_skills;
		3436
		3437	cf::init_beforeplay;
		3438
		3439	atomic;
		3440
3346	load_extensions;	3441	load_extensions;
3347		3442
3348	$TICK_WATCHER->start;	3443	utime time, time, $RUNTIMEFILE;
3349	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3444
		3445	# no (long-running) fork's whatsoever before this point(!)
		3446	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
		3447
		3448	(pop @POST_INIT)->(0) while @POST_INIT;
		3449	};
		3450
3350	EV::loop;	3451	EV::loop;
3351	}	3452	}
3352		3453
3353	#############################################################################	3454	#############################################################################
3354	# initialisation and cleanup	3455	# initialisation and cleanup
…		…
3361	cf::cleanup "SIG$signal";	3462	cf::cleanup "SIG$signal";
3362	};	3463	};
3363	}	3464	}
3364	}	3465	}
3365		3466
3366	sub write_runtime {	3467	sub write_runtime_sync {
3367	my $runtime = "$LOCALDIR/runtime";
3368
3369	# first touch the runtime file to show we are still running:	3468	# first touch the runtime file to show we are still running:
3370	# the fsync below can take a very very long time.	3469	# the fsync below can take a very very long time.
3371		3470
3372	IO::AIO::aio_utime $runtime, undef, undef;	3471	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3373		3472
3374	my $guard = cf::lock_acquire "write_runtime";	3473	my $guard = cf::lock_acquire "write_runtime";
3375		3474
3376	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644	3475	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3377	or return;	3476	or return;
3378		3477
3379	my $value = $cf::RUNTIME + 90 + 10;	3478	my $value = $cf::RUNTIME + 90 + 10;
3380	# 10 is the runtime save interval, for a monotonic clock	3479	# 10 is the runtime save interval, for a monotonic clock
3381	# 60 allows for the watchdog to kill the server.	3480	# 60 allows for the watchdog to kill the server.
…		…
3391	aio_utime $fh, undef, undef;	3490	aio_utime $fh, undef, undef;
3392		3491
3393	close $fh	3492	close $fh
3394	or return;	3493	or return;
3395		3494
3396	aio_rename "$runtime~", $runtime	3495	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3397	and return;	3496	and return;
3398		3497
3399	warn "runtime file written.\n";	3498	warn "runtime file written.\n";
3400		3499
3401	1	3500	1
		3501	}
		3502
		3503	our $uuid_lock;
		3504	our $uuid_skip;
		3505
		3506	sub write_uuid_sync($) {
		3507	$uuid_skip ||= $_[0];
		3508
		3509	return if $uuid_lock;
		3510	local $uuid_lock = 1;
		3511
		3512	my $uuid = "$LOCALDIR/uuid";
		3513
		3514	my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
		3515	or return;
		3516
		3517	my $value = uuid_seq uuid_cur;
		3518
		3519	unless ($value) {
		3520	warn "cowardly refusing to write zero uuid value!\n";
		3521	return;
		3522	}
		3523
		3524	my $value = uuid_str $value + $uuid_skip;
		3525	$uuid_skip = 0;
		3526
		3527	(aio_write $fh, 0, (length $value), $value, 0) <= 0
		3528	and return;
		3529
		3530	# always fsync - this file is important
		3531	aio_fsync $fh
		3532	and return;
		3533
		3534	close $fh
		3535	or return;
		3536
		3537	aio_rename "$uuid~", $uuid
		3538	and return;
		3539
		3540	warn "uuid file written ($value).\n";
		3541
		3542	1
		3543
		3544	}
		3545
		3546	sub write_uuid($$) {
		3547	my ($skip, $sync) = @_;
		3548
		3549	$sync ? write_uuid_sync $skip
		3550	: async { write_uuid_sync $skip };
3402	}	3551	}
3403		3552
3404	sub emergency_save() {	3553	sub emergency_save() {
3405	my $freeze_guard = cf::freeze_mainloop;	3554	my $freeze_guard = cf::freeze_mainloop;
3406		3555
3407	warn "enter emergency perl save\n";	3556	warn "emergency_perl_save: enter\n";
3408		3557
3409	cf::sync_job {	3558	cf::sync_job {
		3559	# this is a trade-off: we want to be very quick here, so
		3560	# save all maps without fsync, and later call a global sync
		3561	# (which in turn might be very very slow)
		3562	local $USE_FSYNC = 0;
		3563
3410	# use a peculiar iteration method to avoid tripping on perl	3564	# use a peculiar iteration method to avoid tripping on perl
3411	# refcount bugs in for. also avoids problems with players	3565	# refcount bugs in for. also avoids problems with players
3412	# and maps saved/destroyed asynchronously.	3566	# and maps saved/destroyed asynchronously.
3413	warn "begin emergency player save\n";	3567	warn "emergency_perl_save: begin player save\n";
3414	for my $login (keys %cf::PLAYER) {	3568	for my $login (keys %cf::PLAYER) {
3415	my $pl = $cf::PLAYER{$login} or next;	3569	my $pl = $cf::PLAYER{$login} or next;
3416	$pl->valid or next;	3570	$pl->valid or next;
3417	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3571	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3418	$pl->save;	3572	$pl->save;
3419	}	3573	}
3420	warn "end emergency player save\n";	3574	warn "emergency_perl_save: end player save\n";
3421		3575
3422	warn "begin emergency map save\n";	3576	warn "emergency_perl_save: begin map save\n";
3423	for my $path (keys %cf::MAP) {	3577	for my $path (keys %cf::MAP) {
3424	my $map = $cf::MAP{$path} or next;	3578	my $map = $cf::MAP{$path} or next;
3425	$map->valid or next;	3579	$map->valid or next;
3426	$map->save;	3580	$map->save;
3427	}	3581	}
3428	warn "end emergency map save\n";	3582	warn "emergency_perl_save: end map save\n";
3429		3583
3430	warn "begin emergency database checkpoint\n";	3584	warn "emergency_perl_save: begin database checkpoint\n";
3431	BDB::db_env_txn_checkpoint $DB_ENV;	3585	BDB::db_env_txn_checkpoint $DB_ENV;
3432	warn "end emergency database checkpoint\n";	3586	warn "emergency_perl_save: end database checkpoint\n";
		3587
		3588	warn "emergency_perl_save: begin write uuid\n";
		3589	write_uuid_sync 1;
		3590	warn "emergency_perl_save: end write uuid\n";
3433	};	3591	};
3434		3592
		3593	warn "emergency_perl_save: starting sync()\n";
		3594	IO::AIO::aio_sync sub {
		3595	warn "emergency_perl_save: finished sync()\n";
		3596	};
		3597
3435	warn "leave emergency perl save\n";	3598	warn "emergency_perl_save: leave\n";
3436	}	3599	}
3437		3600
3438	sub post_cleanup {	3601	sub post_cleanup {
3439	my ($make_core) = @_;	3602	my ($make_core) = @_;
3440		3603
3441	warn Carp::longmess "post_cleanup backtrace"	3604	warn Carp::longmess "post_cleanup backtrace"
3442	if $make_core;	3605	if $make_core;
		3606
		3607	my $fh = pidfile;
		3608	unlink $PIDFILE if <$fh> == $$;
		3609	}
		3610
		3611	# a safer delete_package, copied from Symbol
		3612	sub clear_package($) {
		3613	my $pkg = shift;
		3614
		3615	# expand to full symbol table name if needed
		3616	unless ($pkg =~ /^main::.*::$/) {
		3617	$pkg = "main$pkg" if $pkg =~ /^::/;
		3618	$pkg = "main::$pkg" unless $pkg =~ /^main::/;
		3619	$pkg .= '::' unless $pkg =~ /::$/;
		3620	}
		3621
		3622	my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
		3623	my $stem_symtab = *{$stem}{HASH};
		3624
		3625	defined $stem_symtab and exists $stem_symtab->{$leaf}
		3626	or return;
		3627
		3628	# clear all symbols
		3629	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
		3630	for my $name (keys %$leaf_symtab) {
		3631	_gv_clear *{"$pkg$name"};
		3632	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
		3633	}
		3634	warn "cleared package $pkg\n";#d#
3443	}	3635	}
3444		3636
3445	sub do_reload_perl() {	3637	sub do_reload_perl() {
3446	# can/must only be called in main	3638	# can/must only be called in main
3447	if ($Coro::current != $Coro::main) {	3639	if ($Coro::current != $Coro::main) {
3448	warn "can only reload from main coroutine";	3640	warn "can only reload from main coroutine";
3449	return;	3641	return;
3450	}	3642	}
3451		3643
		3644	return if $RELOAD++;
		3645
		3646	my $t1 = EV::time;
		3647
		3648	while ($RELOAD) {
3452	warn "reloading...";	3649	warn "reloading...";
3453		3650
3454	warn "entering sync_job";	3651	warn "entering sync_job";
3455		3652
3456	cf::sync_job {	3653	cf::sync_job {
3457	cf::write_runtime; # external watchdog should not bark	3654	cf::write_runtime_sync; # external watchdog should not bark
3458	cf::emergency_save;	3655	cf::emergency_save;
3459	cf::write_runtime; # external watchdog should not bark	3656	cf::write_runtime_sync; # external watchdog should not bark
3460		3657
3461	warn "syncing database to disk";	3658	warn "syncing database to disk";
3462	BDB::db_env_txn_checkpoint $DB_ENV;	3659	BDB::db_env_txn_checkpoint $DB_ENV;
3463		3660
3464	# if anything goes wrong in here, we should simply crash as we already saved	3661	# if anything goes wrong in here, we should simply crash as we already saved
3465		3662
3466	warn "flushing outstanding aio requests";	3663	warn "flushing outstanding aio requests";
3467	for (;;) {
3468	BDB::flush;
3469	IO::AIO::flush;
3470	Coro::cede_notself;
3471	last unless IO::AIO::nreqs || BDB::nreqs;	3664	while (IO::AIO::nreqs || BDB::nreqs) {
3472	warn "iterate...";	3665	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3473	}
3474
3475	++$RELOAD;
3476
3477	warn "cancelling all extension coros";
3478	$_->cancel for values %EXT_CORO;
3479	%EXT_CORO = ();
3480
3481	warn "removing commands";
3482	%COMMAND = ();
3483
3484	warn "removing ext/exti commands";
3485	%EXTCMD = ();
3486	%EXTICMD = ();
3487
3488	warn "unloading/nuking all extensions";
3489	for my $pkg (@EXTS) {
3490	warn "... unloading $pkg";
3491
3492	if (my $cb = $pkg->can ("unload")) {
3493	eval {
3494	$cb->($pkg);
3495	1
3496	} or warn "$pkg unloaded, but with errors: $@";
3497	}	3666	}
3498		3667
3499	warn "... nuking $pkg";	3668	warn "cancelling all extension coros";
3500	Symbol::delete_package $pkg;	3669	$_->cancel for values %EXT_CORO;
3501	}	3670	%EXT_CORO = ();
3502		3671
3503	warn "unloading all perl modules loaded from $LIBDIR";	3672	warn "removing commands";
3504	while (my ($k, $v) = each %INC) {	3673	%COMMAND = ();
3505	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3506		3674
		3675	warn "removing ext/exti commands";
		3676	%EXTCMD = ();
		3677	%EXTICMD = ();
		3678
		3679	warn "unloading/nuking all extensions";
		3680	for my $pkg (@EXTS) {
3507	warn "... unloading $k";	3681	warn "... unloading $pkg";
3508	delete $INC{$k};
3509		3682
3510	$k =~ s/\.pm$//;
3511	$k =~ s/\//::/g;
3512
3513	if (my $cb = $k->can ("unload_module")) {	3683	if (my $cb = $pkg->can ("unload")) {
		3684	eval {
3514	$cb->();	3685	$cb->($pkg);
		3686	1
		3687	} or warn "$pkg unloaded, but with errors: $@";
		3688	}
		3689
		3690	warn "... clearing $pkg";
		3691	clear_package $pkg;
3515	}	3692	}
3516		3693
3517	Symbol::delete_package $k;	3694	warn "unloading all perl modules loaded from $LIBDIR";
		3695	while (my ($k, $v) = each %INC) {
		3696	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
		3697
		3698	warn "... unloading $k";
		3699	delete $INC{$k};
		3700
		3701	$k =~ s/\.pm$//;
		3702	$k =~ s/\//::/g;
		3703
		3704	if (my $cb = $k->can ("unload_module")) {
		3705	$cb->();
		3706	}
		3707
		3708	clear_package $k;
3518	}	3709	}
3519		3710
3520	warn "getting rid of safe::, as good as possible";	3711	warn "getting rid of safe::, as good as possible";
3521	Symbol::delete_package "safe::$_"	3712	clear_package "safe::$_"
3522	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	3713	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3523		3714
3524	warn "unloading cf.pm \"a bit\"";	3715	warn "unloading cf.pm \"a bit\"";
3525	delete $INC{"cf.pm"};	3716	delete $INC{"cf.pm"};
3526	delete $INC{"cf/pod.pm"};	3717	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3527		3718
3528	# don't, removes xs symbols, too,	3719	# don't, removes xs symbols, too,
3529	# and global variables created in xs	3720	# and global variables created in xs
3530	#Symbol::delete_package __PACKAGE__;	3721	#clear_package __PACKAGE__;
3531		3722
3532	warn "unload completed, starting to reload now";	3723	warn "unload completed, starting to reload now";
3533		3724
3534	warn "reloading cf.pm";	3725	warn "reloading cf.pm";
3535	require cf;	3726	require cf;
3536	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3727	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3537		3728
3538	warn "loading config and database again";	3729	warn "loading config and database again";
3539	cf::reload_config;	3730	cf::reload_config;
3540		3731
3541	warn "loading extensions";	3732	warn "loading extensions";
3542	cf::load_extensions;	3733	cf::load_extensions;
3543		3734
		3735	if ($REATTACH_ON_RELOAD) {
3544	warn "reattaching attachments to objects/players";	3736	warn "reattaching attachments to objects/players";
3545	_global_reattach; # objects, sockets	3737	_global_reattach; # objects, sockets
3546	warn "reattaching attachments to maps";	3738	warn "reattaching attachments to maps";
3547	reattach $_ for values %MAP;	3739	reattach $_ for values %MAP;
3548	warn "reattaching attachments to players";	3740	warn "reattaching attachments to players";
3549	reattach $_ for values %PLAYER;	3741	reattach $_ for values %PLAYER;
		3742	}
3550		3743
		3744	warn "running post_init jobs";
		3745	(pop @POST_INIT)->(1) while @POST_INIT;
		3746
3551	warn "leaving sync_job";	3747	warn "leaving sync_job";
3552		3748
3553	1	3749	1
3554	} or do {	3750	} or do {
3555	warn $@;	3751	warn $@;
3556	warn "error while reloading, exiting.";	3752	cf::cleanup "error while reloading, exiting.";
3557	exit 1;
3558	};	3753	};
3559		3754
3560	warn "reloaded";	3755	warn "reloaded";
		3756	--$RELOAD;
		3757	}
		3758
		3759	$t1 = EV::time - $t1;
		3760	warn "reload completed in ${t1}s\n";
3561	};	3761	};
3562		3762
3563	our $RELOAD_WATCHER; # used only during reload	3763	our $RELOAD_WATCHER; # used only during reload
3564		3764
3565	sub reload_perl() {	3765	sub reload_perl() {
3566	# doing reload synchronously and two reloads happen back-to-back,	3766	# doing reload synchronously and two reloads happen back-to-back,
3567	# coro crashes during coro_state_free->destroy here.	3767	# coro crashes during coro_state_free->destroy here.
3568		3768
		3769	$RELOAD_WATCHER ||= cf::async {
		3770	Coro::AIO::aio_wait cache_extensions;
		3771
3569	$RELOAD_WATCHER ||= EV::timer 0, 0, sub {	3772	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
		3773	do_reload_perl;
3570	undef $RELOAD_WATCHER;	3774	undef $RELOAD_WATCHER;
3571	do_reload_perl;	3775	};
3572	};	3776	};
3573	}	3777	}
3574		3778
3575	register_command "reload" => sub {	3779	register_command "reload" => sub {
3576	my ($who, $arg) = @_;	3780	my ($who, $arg) = @_;
…		…
3590		3794
3591	our @WAIT_FOR_TICK;	3795	our @WAIT_FOR_TICK;
3592	our @WAIT_FOR_TICK_BEGIN;	3796	our @WAIT_FOR_TICK_BEGIN;
3593		3797
3594	sub wait_for_tick {	3798	sub wait_for_tick {
3595	return unless $TICK_WATCHER->is_active;
3596	return if $Coro::current == $Coro::main;	3799	return if tick_inhibit || $Coro::current == $Coro::main;
3597		3800
3598	my $signal = new Coro::Signal;	3801	my $signal = new Coro::Signal;
3599	push @WAIT_FOR_TICK, $signal;	3802	push @WAIT_FOR_TICK, $signal;
3600	$signal->wait;	3803	$signal->wait;
3601	}	3804	}
3602		3805
3603	sub wait_for_tick_begin {	3806	sub wait_for_tick_begin {
3604	return unless $TICK_WATCHER->is_active;
3605	return if $Coro::current == $Coro::main;	3807	return if tick_inhibit || $Coro::current == $Coro::main;
3606		3808
3607	my $signal = new Coro::Signal;	3809	my $signal = new Coro::Signal;
3608	push @WAIT_FOR_TICK_BEGIN, $signal;	3810	push @WAIT_FOR_TICK_BEGIN, $signal;
3609	$signal->wait;	3811	$signal->wait;
3610	}	3812	}
3611		3813
3612	$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {	3814	sub tick {
3613	if ($Coro::current != $Coro::main) {	3815	if ($Coro::current != $Coro::main) {
3614	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	3816	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3615	unless ++$bug_warning > 10;	3817	unless ++$bug_warning > 10;
3616	return;	3818	return;
3617	}	3819	}
3618		3820
3619	$NOW = $tick_start = EV::now;
3620
3621	cf::server_tick; # one server iteration	3821	cf::server_tick; # one server iteration
3622
3623	$RUNTIME += $TICK;
3624	$NEXT_TICK = $_[0]->at;
3625		3822
3626	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3823	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3627	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	3824	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3628	Coro::async_pool {	3825	Coro::async_pool {
3629	$Coro::current->{desc} = "runtime saver";	3826	$Coro::current->{desc} = "runtime saver";
3630	write_runtime	3827	write_runtime_sync
3631	or warn "ERROR: unable to write runtime file: $!";	3828	or warn "ERROR: unable to write runtime file: $!";
3632	};	3829	};
3633	}	3830	}
3634		3831
3635	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3832	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
…		…
3637	}	3834	}
3638	while (my $sig = shift @WAIT_FOR_TICK) {	3835	while (my $sig = shift @WAIT_FOR_TICK) {
3639	$sig->send;	3836	$sig->send;
3640	}	3837	}
3641		3838
3642	$LOAD = ($NOW - $tick_start) / $TICK;	3839	$LOAD = ($NOW - $TICK_START) / $TICK;
3643	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3840	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3644		3841
3645	_post_tick;	3842	if (0) {
3646	};	3843	if ($NEXT_TICK) {
3647	$TICK_WATCHER->priority (EV::MAXPRI);	3844	my $jitter = $TICK_START - $NEXT_TICK;
		3845	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
		3846	warn "jitter $JITTER\n";#d#
		3847	}
		3848	}
		3849	}
3648		3850
3649	{	3851	{
3650	# configure BDB	3852	# configure BDB
3651		3853
3652	BDB::min_parallel 8;	3854	BDB::min_parallel 8;
3653	BDB::max_poll_reqs $TICK * 0.1;	3855	BDB::max_poll_reqs $TICK * 0.1;
3654	$Coro::BDB::WATCHER->priority (1);	3856	$AnyEvent::BDB::WATCHER->priority (1);
3655		3857
3656	unless ($DB_ENV) {	3858	unless ($DB_ENV) {
3657	$DB_ENV = BDB::db_env_create;	3859	$DB_ENV = BDB::db_env_create;
3658	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC	3860	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3659	| BDB::LOG_AUTOREMOVE, 1);	3861	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
		3862	$DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3660	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);	3863	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3661	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);	3864	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3662		3865
3663	cf::sync_job {	3866	cf::sync_job {
3664	eval {	3867	eval {
…		…
3690	{	3893	{
3691	# configure IO::AIO	3894	# configure IO::AIO
3692		3895
3693	IO::AIO::min_parallel 8;	3896	IO::AIO::min_parallel 8;
3694	IO::AIO::max_poll_time $TICK * 0.1;	3897	IO::AIO::max_poll_time $TICK * 0.1;
3695	$Coro::AIO::WATCHER->priority (1);	3898	undef $AnyEvent::AIO::WATCHER;
3696	}	3899	}
3697		3900
3698	my $_log_backtrace;	3901	my $_log_backtrace;
3699		3902
3700	sub _log_backtrace {	3903	sub _log_backtrace {
…		…
3703	$msg =~ s/\n//;	3906	$msg =~ s/\n//;
3704		3907
3705	# limit the # of concurrent backtraces	3908	# limit the # of concurrent backtraces
3706	if ($_log_backtrace < 2) {	3909	if ($_log_backtrace < 2) {
3707	++$_log_backtrace;	3910	++$_log_backtrace;
		3911	my $perl_bt = Carp::longmess $msg;
3708	async {	3912	async {
3709	$Coro::current->{desc} = "abt $msg";	3913	$Coro::current->{desc} = "abt $msg";
3710		3914
3711	my @bt = fork_call {	3915	my @bt = fork_call {
3712	@addr = map { sprintf "%x", $_ } @addr;	3916	@addr = map { sprintf "%x", $_ } @addr;
…		…
3723	}	3927	}
3724		3928
3725	@funcs	3929	@funcs
3726	};	3930	};
3727		3931
3728	LOG llevInfo, "[ABT] $msg\n";	3932	LOG llevInfo, "[ABT] $perl_bt\n";
		3933	LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3729	LOG llevInfo, "[ABT] $_\n" for @bt;	3934	LOG llevInfo, "[ABT] $_\n" for @bt;
3730	--$_log_backtrace;	3935	--$_log_backtrace;
3731	};	3936	};
3732	} else {	3937	} else {
3733	LOG llevInfo, "[ABT] $msg\n";	3938	LOG llevInfo, "[ABT] $msg\n";
3734	LOG llevInfo, "[ABT] [suppressed]\n";	3939	LOG llevInfo, "[ABT] [suppressed]\n";
3735	}	3940	}
3736	}	3941	}
3737		3942
3738	# load additional modules	3943	# load additional modules
3739	use cf::pod;	3944	require "cf/$_.pm" for @EXTRA_MODULES;
3740		3945
3741	END { cf::emergency_save }	3946	END { cf::emergency_save }
3742		3947
3743	1	3948	1
3744		3949

Diff Legend

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