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.372 by root, Sat Sep 15 13:25:33 2007 UTC vs.
Revision 1.474 by root, Thu Jul 16 21:42:56 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 Storable;	31	use EV;
10	use Event;
11	use Opcode;	32	use Opcode;
12	use Safe;	33	use Safe;
13	use Safe::Hole;	34	use Safe::Hole;
		35	use Storable ();
14		36
		37	use Guard ();
15	use Coro 3.64 ();	38	use Coro ();
16	use Coro::State;	39	use Coro::State;
17	use Coro::Handle;	40	use Coro::Handle;
		41	use Coro::EV;
18	use Coro::Event;	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;
		49	use Coro::BDB 1.6;
23	use Coro::Storable;	50	use Coro::Storable;
24	use Coro::Util ();	51	use Coro::Util ();
25		52
26	use JSON::XS ();	53	use JSON::XS 2.01 ();
27	use BDB ();	54	use BDB ();
28	use Data::Dumper;	55	use Data::Dumper;
29	use Digest::MD5;	56	use Digest::MD5;
30	use Fcntl;	57	use Fcntl;
31	use YAML::Syck ();	58	use YAML ();
32	use IO::AIO 2.32 ();	59	use IO::AIO ();
33	use Time::HiRes;	60	use Time::HiRes;
34	use Compress::LZF;	61	use Compress::LZF;
35	use Digest::MD5 ();	62	use Digest::MD5 ();
		63
		64	AnyEvent::detect;
36		65
37	# configure various modules to our taste	66	# configure various modules to our taste
38	#	67	#
39	$Storable::canonical = 1; # reduce rsync transfers	68	$Storable::canonical = 1; # reduce rsync transfers
40	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";
41	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
42		76
43	$Event::Eval = 1; # no idea why this is required, but it is	77	# strictly for debugging
44		78	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46	$YAML::Syck::ImplicitUnicode = 1;
47
48	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49		79
50	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	80	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51		81
52	our %COMMAND = ();	82	our %COMMAND = ();
53	our %COMMAND_TIME = ();	83	our %COMMAND_TIME = ();
…		…
56	our %EXTCMD = ();	86	our %EXTCMD = ();
57	our %EXTICMD = ();	87	our %EXTICMD = ();
58	our %EXT_CORO = (); # coroutines bound to extensions	88	our %EXT_CORO = (); # coroutines bound to extensions
59	our %EXT_MAP = (); # pluggable maps	89	our %EXT_MAP = (); # pluggable maps
60		90
61	our $RELOAD; # number of reloads so far	91	our $RELOAD; # number of reloads so far, non-zero while in reload
62	our @EVENT;	92	our @EVENT;
63		93
64	our $CONFDIR = confdir;	94	our $CONFDIR = confdir;
65	our $DATADIR = datadir;	95	our $DATADIR = datadir;
66	our $LIBDIR = "$DATADIR/ext";	96	our $LIBDIR = "$DATADIR/ext";
67	our $PODDIR = "$DATADIR/pod";	97	our $PODDIR = "$DATADIR/pod";
68	our $MAPDIR = "$DATADIR/" . mapdir;	98	our $MAPDIR = "$DATADIR/" . mapdir;
69	our $LOCALDIR = localdir;	99	our $LOCALDIR = localdir;
70	our $TMPDIR = "$LOCALDIR/" . tmpdir;	100	our $TMPDIR = "$LOCALDIR/" . tmpdir;
71	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	101	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	102	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73	our $RANDOMDIR = "$LOCALDIR/random";	103	our $RANDOMDIR = "$LOCALDIR/random";
74	our $BDBDIR = "$LOCALDIR/db";	104	our $BDBDIR = "$LOCALDIR/db";
		105	our $PIDFILE = "$LOCALDIR/pid";
		106	our $RUNTIMEFILE = "$LOCALDIR/runtime";
		107
		108	our %RESOURCE;
75		109
76	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	110	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	111	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80	our $NEXT_TICK;	112	our $NEXT_TICK;
81	our $NOW;
82	our $USE_FSYNC = 1; # use fsync to write maps - default off	113	our $USE_FSYNC = 1; # use fsync to write maps - default on
83		114
84	our $BDB_POLL_WATCHER;
85	our $BDB_DEADLOCK_WATCHER;	115	our $BDB_DEADLOCK_WATCHER;
86	our $BDB_CHECKPOINT_WATCHER;	116	our $BDB_CHECKPOINT_WATCHER;
87	our $BDB_TRICKLE_WATCHER;	117	our $BDB_TRICKLE_WATCHER;
88	our $DB_ENV;	118	our $DB_ENV;
89		119
		120	our @EXTRA_MODULES = qw(pod mapscript);
		121
90	our %CFG;	122	our %CFG;
91		123
92	our $UPTIME; $UPTIME ||= time;	124	our $UPTIME; $UPTIME ||= time;
93	our $RUNTIME;	125	our $RUNTIME;
		126	our $NOW;
94		127
95	our (%PLAYER, %PLAYER_LOADING); # all users	128	our (%PLAYER, %PLAYER_LOADING); # all users
96	our (%MAP, %MAP_LOADING ); # all maps	129	our (%MAP, %MAP_LOADING ); # all maps
97	our $LINK_MAP; # the special {link} map, which is always available	130	our $LINK_MAP; # the special {link} map, which is always available
98		131
99	# used to convert map paths into valid unix filenames by replacing / by ∕	132	# used to convert map paths into valid unix filenames by replacing / by ∕
100	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	133	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101		134
102	our $LOAD; # a number between 0 (idle) and 1 (too many objects)	135	our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103	our $LOADAVG; # same thing, but with alpha-smoothing	136	our $LOADAVG; # same thing, but with alpha-smoothing
		137	our $JITTER; # average jitter
104	our $tick_start; # for load detecting purposes	138	our $TICK_START; # for load detecting purposes
		139
		140	our @POST_INIT;
		141
		142	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
		143	our $REALLY_UNLOOP; # never set to true, please :)
105		144
106	binmode STDOUT;	145	binmode STDOUT;
107	binmode STDERR;	146	binmode STDERR;
108		147
109	# read virtual server time, if available	148	# read virtual server time, if available
110	unless ($RUNTIME || !-e "$LOCALDIR/runtime") {	149	unless ($RUNTIME || !-e $RUNTIMEFILE) {
111	open my $fh, "<", "$LOCALDIR/runtime"	150	open my $fh, "<", $RUNTIMEFILE
112	or die "unable to read runtime file: $!";	151	or die "unable to read $RUNTIMEFILE file: $!";
113	$RUNTIME = <$fh> + 0.;	152	$RUNTIME = <$fh> + 0.;
114	}	153	}
		154
		155	eval "sub TICK() { $TICK } 1" or die;
115		156
116	mkdir $_	157	mkdir $_
117	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;	158	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
118		159
119	our $EMERGENCY_POSITION;	160	our $EMERGENCY_POSITION;
…		…
162		203
163	The raw value load value from the last tick.	204	The raw value load value from the last tick.
164		205
165	=item %cf::CFG	206	=item %cf::CFG
166		207
167	Configuration for the server, loaded from C</etc/crossfire/config>, or	208	Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168	from wherever your confdir points to.	209	from wherever your confdir points to.
169		210
170	=item cf::wait_for_tick, cf::wait_for_tick_begin	211	=item cf::wait_for_tick, cf::wait_for_tick_begin
171		212
172	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	213	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
…		…
193	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	234	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194		235
195	LOG llevError, $msg;	236	LOG llevError, $msg;
196	};	237	};
197	}	238	}
		239
		240	$Coro::State::DIEHOOK = sub {
		241	return unless $^S eq 0; # "eq", not "=="
		242
		243	if ($Coro::current == $Coro::main) {#d#
		244	warn "DIEHOOK called in main context, Coro bug?\n";#d#
		245	return;#d#
		246	}#d#
		247
		248	# kill coroutine otherwise
		249	warn Carp::longmess $_[0];
		250	Coro::terminate
		251	};
		252
		253	$SIG{__DIE__} = sub { }; #d#?
198		254
199	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	255	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	256	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	257	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	258	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
…		…
209	for my $pkg (qw(	265	for my $pkg (qw(
210	cf::global cf::attachable	266	cf::global cf::attachable
211	cf::object cf::object::player	267	cf::object cf::object::player
212	cf::client cf::player	268	cf::client cf::player
213	cf::arch cf::living	269	cf::arch cf::living
		270	cf::map cf::mapspace
214	cf::map cf::party cf::region	271	cf::party cf::region
215	)) {	272	)) {
216	no strict 'refs';
217	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	273	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218	}	274	}
219		275
220	$Event::DIED = sub {	276	$EV::DIED = sub {
221	warn "error in event callback: @_";	277	warn "error in event callback: @_";
222	};	278	};
223		279
224	#############################################################################	280	#############################################################################
225		281
…		…
248	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	304	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249	$d	305	$d
250	} || "[unable to dump $_[0]: '$@']";	306	} || "[unable to dump $_[0]: '$@']";
251	}	307	}
252		308
253	=item $ref = cf::from_json $json	309	=item $ref = cf::decode_json $json
254		310
255	Converts a JSON string into the corresponding perl data structure.	311	Converts a JSON string into the corresponding perl data structure.
256		312
257	=item $json = cf::to_json $ref	313	=item $json = cf::encode_json $ref
258		314
259	Converts a perl data structure into its JSON representation.	315	Converts a perl data structure into its JSON representation.
260		316
261	=cut	317	=cut
262		318
263	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	319	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264		320
265	sub to_json ($) { $json_coder->encode ($_[0]) }	321	sub encode_json($) { $json_coder->encode ($_[0]) }
266	sub from_json ($) { $json_coder->decode ($_[0]) }	322	sub decode_json($) { $json_coder->decode ($_[0]) }
		323
		324	=item cf::post_init { BLOCK }
		325
		326	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
		327	but I<before> the server starts ticking again.
		328
		329	The cdoeblock will have a single boolean argument to indicate whether this
		330	is a reload or not.
		331
		332	=cut
		333
		334	sub post_init(&) {
		335	push @POST_INIT, shift;
		336	}
267		337
268	=item cf::lock_wait $string	338	=item cf::lock_wait $string
269		339
270	Wait until the given lock is available. See cf::lock_acquire.	340	Wait until the given lock is available. See cf::lock_acquire.
271		341
272	=item my $lock = cf::lock_acquire $string	342	=item my $lock = cf::lock_acquire $string
273		343
274	Wait until the given lock is available and then acquires it and returns	344	Wait until the given lock is available and then acquires it and returns
275	a Coro::guard object. If the guard object gets destroyed (goes out of scope,	345	a L<Guard> object. If the guard object gets destroyed (goes out of scope,
276	for example when the coroutine gets canceled), the lock is automatically	346	for example when the coroutine gets canceled), the lock is automatically
277	returned.	347	returned.
278		348
279	Locks are *not* recursive, locking from the same coro twice results in a	349	Locks are *not* recursive, locking from the same coro twice results in a
280	deadlocked coro.	350	deadlocked coro.
…		…
286		356
287	Return true if the lock is currently active, i.e. somebody has locked it.	357	Return true if the lock is currently active, i.e. somebody has locked it.
288		358
289	=cut	359	=cut
290		360
291	our %LOCK;	361	our $LOCKS = new Coro::SemaphoreSet;
292	our %LOCKER;#d#
293		362
294	sub lock_wait($) {	363	sub lock_wait($) {
295	my ($key) = @_;	364	$LOCKS->wait ($_[0]);
296
297	if ($LOCKER{$key} == $Coro::current) {#d#
298	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299	return;#d#
300	}#d#
301
302	# wait for lock, if any
303	while ($LOCK{$key}) {
304	push @{ $LOCK{$key} }, $Coro::current;
305	Coro::schedule;
306	}
307	}	365	}
308		366
309	sub lock_acquire($) {	367	sub lock_acquire($) {
310	my ($key) = @_;	368	$LOCKS->guard ($_[0])
311
312	# wait, to be sure we are not locked
313	lock_wait $key;
314
315	$LOCK{$key} = [];
316	$LOCKER{$key} = $Coro::current;#d#
317
318	Coro::guard {
319	delete $LOCKER{$key};#d#
320	# wake up all waiters, to be on the safe side
321	$_->ready for @{ delete $LOCK{$key} };
322	}
323	}	369	}
324		370
325	sub lock_active($) {	371	sub lock_active($) {
326	my ($key) = @_;	372	$LOCKS->count ($_[0]) < 1
327
328	! ! $LOCK{$key}
329	}	373	}
330		374
331	sub freeze_mainloop {	375	sub freeze_mainloop {
332	return unless $TICK_WATCHER->is_active;	376	tick_inhibit_inc;
333		377
334	my $guard = Coro::guard {	378	&Guard::guard (\&tick_inhibit_dec);
335	$TICK_WATCHER->start;	379	}
336	};	380
337	$TICK_WATCHER->stop;	381	=item cf::periodic $interval, $cb
338	$guard	382
		383	Like EV::periodic, but randomly selects a starting point so that the actions
		384	get spread over timer.
		385
		386	=cut
		387
		388	sub periodic($$) {
		389	my ($interval, $cb) = @_;
		390
		391	my $start = rand List::Util::min 180, $interval;
		392
		393	EV::periodic $start, $interval, 0, $cb
339	}	394	}
340		395
341	=item cf::get_slot $time[, $priority[, $name]]	396	=item cf::get_slot $time[, $priority[, $name]]
342		397
343	Allocate $time seconds of blocking CPU time at priority C<$priority>:	398	Allocate $time seconds of blocking CPU time at priority C<$priority>:
…		…
354	our @SLOT_QUEUE;	409	our @SLOT_QUEUE;
355	our $SLOT_QUEUE;	410	our $SLOT_QUEUE;
356		411
357	$SLOT_QUEUE->cancel if $SLOT_QUEUE;	412	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358	$SLOT_QUEUE = Coro::async {	413	$SLOT_QUEUE = Coro::async {
		414	$Coro::current->desc ("timeslot manager");
		415
359	my $signal = new Coro::Signal;	416	my $signal = new Coro::Signal;
360		417
361	while () {	418	while () {
362	next_job:	419	next_job:
363	my $avail = cf::till_tick;	420	my $avail = cf::till_tick;
…		…
371	}	428	}
372	}	429	}
373	}	430	}
374		431
375	if (@SLOT_QUEUE) {	432	if (@SLOT_QUEUE) {
376	# we do not use wait_For_tick() as it returns immediately when tick is inactive	433	# we do not use wait_for_tick() as it returns immediately when tick is inactive
377	push @cf::WAIT_FOR_TICK, $signal;	434	push @cf::WAIT_FOR_TICK, $signal;
378	$signal->wait;	435	$signal->wait;
379	} else {	436	} else {
380	Coro::schedule;	437	Coro::schedule;
381	}	438	}
382	}	439	}
383	};	440	};
384		441
385	sub get_slot($;$$) {	442	sub get_slot($;$$) {
		443	return if tick_inhibit || $Coro::current == $Coro::main;
		444
386	my ($time, $pri, $name) = @_;	445	my ($time, $pri, $name) = @_;
387		446
388	$time = $TICK * .6 if $time > $TICK * .6;	447	$time = $TICK * .6 if $time > $TICK * .6;
389	my $sig = new Coro::Signal;	448	my $sig = new Coro::Signal;
390		449
…		…
404		463
405	BEGIN { *async = \&Coro::async_pool }	464	BEGIN { *async = \&Coro::async_pool }
406		465
407	=item cf::sync_job { BLOCK }	466	=item cf::sync_job { BLOCK }
408		467
409	The design of Crossfire TRT requires that the main coroutine ($Coro::main)	468	The design of Deliantra requires that the main coroutine ($Coro::main)
410	is always able to handle events or runnable, as Crossfire TRT is only	469	is always able to handle events or runnable, as Deliantra is only
411	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not	470	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
412	acceptable.	471	acceptable.
413		472
414	If it must be done, put the blocking parts into C<sync_job>. This will run	473	If it must be done, put the blocking parts into C<sync_job>. This will run
415	the given BLOCK in another coroutine while waiting for the result. The	474	the given BLOCK in another coroutine while waiting for the result. The
…		…
420		479
421	sub sync_job(&) {	480	sub sync_job(&) {
422	my ($job) = @_;	481	my ($job) = @_;
423		482
424	if ($Coro::current == $Coro::main) {	483	if ($Coro::current == $Coro::main) {
425	my $time = Event::time;	484	my $time = EV::time;
426		485
427	# this is the main coro, too bad, we have to block	486	# this is the main coro, too bad, we have to block
428	# till the operation succeeds, freezing the server :/	487	# till the operation succeeds, freezing the server :/
429		488
430	# TODO: use suspend/resume instead	489	LOG llevError, Carp::longmess "sync job";#d#
431	# (but this is cancel-safe)	490
432	my $freeze_guard = freeze_mainloop;	491	my $freeze_guard = freeze_mainloop;
433		492
434	my $busy = 1;	493	my $busy = 1;
435	my @res;	494	my @res;
436		495
437	(async {	496	(async {
		497	$Coro::current->desc ("sync job coro");
438	@res = eval { $job->() };	498	@res = eval { $job->() };
439	warn $@ if $@;	499	warn $@ if $@;
440	undef $busy;	500	undef $busy;
441	})->prio (Coro::PRIO_MAX);	501	})->prio (Coro::PRIO_MAX);
442		502
443	while ($busy) {	503	while ($busy) {
444	Coro::cede or Event::one_event;	504	if (Coro::nready) {
		505	Coro::cede_notself;
		506	} else {
		507	EV::loop EV::LOOP_ONESHOT;
445	}	508	}
		509	}
446		510
447	$time = Event::time - $time;	511	my $time = EV::time - $time;
448		512
449	LOG llevError | logBacktrace, Carp::longmess "long sync job"
450	if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
451
452	$tick_start += $time; # do not account sync jobs to server load	513	$TICK_START += $time; # do not account sync jobs to server load
453		514
454	wantarray ? @res : $res[0]	515	wantarray ? @res : $res[0]
455	} else {	516	} else {
456	# we are in another coroutine, how wonderful, everything just works	517	# we are in another coroutine, how wonderful, everything just works
457		518
…		…
482	=item fork_call { }, $args	543	=item fork_call { }, $args
483		544
484	Executes the given code block with the given arguments in a seperate	545	Executes the given code block with the given arguments in a seperate
485	process, returning the results. Everything must be serialisable with	546	process, returning the results. Everything must be serialisable with
486	Coro::Storable. May, of course, block. Note that the executed sub may	547	Coro::Storable. May, of course, block. Note that the executed sub may
487	never block itself or use any form of Event handling.	548	never block itself or use any form of event handling.
488		549
489	=cut	550	=cut
490		551
491	sub fork_call(&@) {	552	sub fork_call(&@) {
492	my ($cb, @args) = @_;	553	my ($cb, @args) = @_;
…		…
499	reset_signals;	560	reset_signals;
500	&$cb	561	&$cb
501	}, @args;	562	}, @args;
502		563
503	wantarray ? @res : $res[-1]	564	wantarray ? @res : $res[-1]
		565	}
		566
		567	=item $coin = coin_from_name $name
		568
		569	=cut
		570
		571	our %coin_alias = (
		572	"silver" => "silvercoin",
		573	"silvercoin" => "silvercoin",
		574	"silvercoins" => "silvercoin",
		575	"gold" => "goldcoin",
		576	"goldcoin" => "goldcoin",
		577	"goldcoins" => "goldcoin",
		578	"platinum" => "platinacoin",
		579	"platinumcoin" => "platinacoin",
		580	"platinumcoins" => "platinacoin",
		581	"platina" => "platinacoin",
		582	"platinacoin" => "platinacoin",
		583	"platinacoins" => "platinacoin",
		584	"royalty" => "royalty",
		585	"royalties" => "royalty",
		586	);
		587
		588	sub coin_from_name($) {
		589	$coin_alias{$_[0]}
		590	? cf::arch::find $coin_alias{$_[0]}
		591	: undef
504	}	592	}
505		593
506	=item $value = cf::db_get $family => $key	594	=item $value = cf::db_get $family => $key
507		595
508	Returns a single value from the environment database.	596	Returns a single value from the environment database.
…		…
647		735
648	#############################################################################	736	#############################################################################
649		737
650	=head2 ATTACHABLE OBJECTS	738	=head2 ATTACHABLE OBJECTS
651		739
652	Many objects in crossfire are so-called attachable objects. That means you can	740	Many objects in deliantra are so-called attachable objects. That means you can
653	attach callbacks/event handlers (a collection of which is called an "attachment")	741	attach callbacks/event handlers (a collection of which is called an "attachment")
654	to it. All such attachable objects support the following methods.	742	to it. All such attachable objects support the following methods.
655		743
656	In the following description, CLASS can be any of C<global>, C<object>	744	In the following description, CLASS can be any of C<global>, C<object>
657	C<player>, C<client> or C<map> (i.e. the attachable objects in	745	C<player>, C<client> or C<map> (i.e. the attachable objects in
658	Crossfire TRT).	746	Deliantra).
659		747
660	=over 4	748	=over 4
661		749
662	=item $attachable->attach ($attachment, key => $value...)	750	=item $attachable->attach ($attachment, key => $value...)
663		751
…		…
707	=item cf::CLASS::attachment $name, ...	795	=item cf::CLASS::attachment $name, ...
708		796
709	Register an attachment by C<$name> through which attachable objects of the	797	Register an attachment by C<$name> through which attachable objects of the
710	given CLASS can refer to this attachment.	798	given CLASS can refer to this attachment.
711		799
712	Some classes such as crossfire maps and objects can specify attachments	800	Some classes such as deliantra maps and objects can specify attachments
713	that are attached at load/instantiate time, thus the need for a name.	801	that are attached at load/instantiate time, thus the need for a name.
714		802
715	These calls expect any number of the following handler/hook descriptions:	803	These calls expect any number of the following handler/hook descriptions:
716		804
717	=over 4	805	=over 4
…		…
945	}	1033	}
946		1034
947	0	1035	0
948	}	1036	}
949		1037
950	=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...)	1038	=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
951		1039
952	=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)	1040	=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
953		1041
954	Generate an object-specific event with the given arguments.	1042	Generate an object-specific event with the given arguments.
955		1043
…		…
961		1049
962	=cut	1050	=cut
963		1051
964	#############################################################################	1052	#############################################################################
965	# object support	1053	# object support
966	#
967		1054
		1055	sub _object_equal($$);
		1056	sub _object_equal($$) {
		1057	my ($a, $b) = @_;
		1058
		1059	return 0 unless (ref $a) eq (ref $b);
		1060
		1061	if ("HASH" eq ref $a) {
		1062	my @ka = keys %$a;
		1063	my @kb = keys %$b;
		1064
		1065	return 0 if @ka != @kb;
		1066
		1067	for (0 .. $#ka) {
		1068	return 0 unless $ka[$_] eq $kb[$_];
		1069	return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
		1070	}
		1071
		1072	} elsif ("ARRAY" eq ref $a) {
		1073
		1074	return 0 if @$a != @$b;
		1075
		1076	for (0 .. $#$a) {
		1077	return 0 unless _object_equal $a->[$_], $b->[$_];
		1078	}
		1079
		1080	} elsif ($a ne $b) {
		1081	return 0;
		1082	}
		1083
		1084	1
		1085	}
		1086
		1087	our $SLOW_MERGES;#d#
968	sub _can_merge {	1088	sub _can_merge {
969	my ($ob1, $ob2) = @_;	1089	my ($ob1, $ob2) = @_;
970		1090
971	local $Storable::canonical = 1;	1091	++$SLOW_MERGES;#d#
972	my $fob1 = Storable::freeze $ob1;
973	my $fob2 = Storable::freeze $ob2;
974		1092
975	$fob1 eq $fob2	1093	# we do the slow way here
		1094	return _object_equal $ob1, $ob2
976	}	1095	}
977		1096
978	sub reattach {	1097	sub reattach {
979	# basically do the same as instantiate, without calling instantiate	1098	# basically do the same as instantiate, without calling instantiate
980	my ($obj) = @_;	1099	my ($obj) = @_;
981		1100
		1101	# no longer needed after getting rid of delete_package?
982	bless $obj, ref $obj; # re-bless in case extensions have been reloaded	1102	#bless $obj, ref $obj; # re-bless in case extensions have been reloaded
983		1103
984	my $registry = $obj->registry;	1104	my $registry = $obj->registry;
985		1105
986	@$registry = ();	1106	@$registry = ();
987		1107
…		…
1002	cf::attachable->attach (	1122	cf::attachable->attach (
1003	prio => -1000000,	1123	prio => -1000000,
1004	on_instantiate => sub {	1124	on_instantiate => sub {
1005	my ($obj, $data) = @_;	1125	my ($obj, $data) = @_;
1006		1126
1007	$data = from_json $data;	1127	$data = decode_json $data;
1008		1128
1009	for (@$data) {	1129	for (@$data) {
1010	my ($name, $args) = @$_;	1130	my ($name, $args) = @$_;
1011		1131
1012	$obj->attach ($name, %{$args || {} });	1132	$obj->attach ($name, %{$args || {} });
…		…
1025	},	1145	},
1026	);	1146	);
1027		1147
1028	sub object_freezer_save {	1148	sub object_freezer_save {
1029	my ($filename, $rdata, $objs) = @_;	1149	my ($filename, $rdata, $objs) = @_;
1030
1031	my $guard = cf::lock_acquire "io";
1032		1150
1033	sync_job {	1151	sync_job {
1034	if (length $$rdata) {	1152	if (length $$rdata) {
1035	utf8::decode (my $decname = $filename);	1153	utf8::decode (my $decname = $filename);
1036	warn sprintf "saving %s (%d,%d)\n",	1154	warn sprintf "saving %s (%d,%d)\n",
1037	$decname, length $$rdata, scalar @$objs;	1155	$decname, length $$rdata, scalar @$objs;
1038		1156
1039	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1157	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1040	chmod SAVE_MODE, $fh;	1158	aio_chmod $fh, SAVE_MODE;
1041	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1159	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1042	aio_fsync $fh if $cf::USE_FSYNC;	1160	if ($cf::USE_FSYNC) {
		1161	aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
		1162	aio_fsync $fh;
		1163	}
1043	close $fh;	1164	aio_close $fh;
1044		1165
1045	if (@$objs) {	1166	if (@$objs) {
1046	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {	1167	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1047	chmod SAVE_MODE, $fh;	1168	aio_chmod $fh, SAVE_MODE;
1048	my $data = Storable::nfreeze { version => 1, objs => $objs };	1169	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1049	aio_write $fh, 0, (length $data), $data, 0;	1170	aio_write $fh, 0, (length $data), $data, 0;
1050	aio_fsync $fh if $cf::USE_FSYNC;	1171	if ($cf::USE_FSYNC) {
		1172	aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
		1173	aio_fsync $fh;
		1174	}
1051	close $fh;	1175	aio_close $fh;
1052	aio_rename "$filename.pst~", "$filename.pst";	1176	aio_rename "$filename.pst~", "$filename.pst";
1053	}	1177	}
1054	} else {	1178	} else {
1055	aio_unlink "$filename.pst";	1179	aio_unlink "$filename.pst";
1056	}	1180	}
1057		1181
1058	aio_rename "$filename~", $filename;	1182	aio_rename "$filename~", $filename;
		1183
		1184	$filename =~ s%/[^/]+$%%;
		1185	aio_pathsync $filename if $cf::USE_FSYNC;
1059	} else {	1186	} else {
1060	warn "FATAL: $filename~: $!\n";	1187	warn "unable to save objects: $filename~: $!\n";
1061	}	1188	}
1062	} else {	1189	} else {
1063	aio_unlink $filename;	1190	aio_unlink $filename;
1064	aio_unlink "$filename.pst";	1191	aio_unlink "$filename.pst";
1065	}	1192	}
1066	};	1193	};
1067
1068	undef $guard;
1069	}	1194	}
1070		1195
1071	sub object_freezer_as_string {	1196	sub object_freezer_as_string {
1072	my ($rdata, $objs) = @_;	1197	my ($rdata, $objs) = @_;
1073		1198
…		…
1078		1203
1079	sub object_thawer_load {	1204	sub object_thawer_load {
1080	my ($filename) = @_;	1205	my ($filename) = @_;
1081		1206
1082	my ($data, $av);	1207	my ($data, $av);
1083
1084	my $guard = cf::lock_acquire "io";
1085		1208
1086	(aio_load $filename, $data) >= 0	1209	(aio_load $filename, $data) >= 0
1087	or return;	1210	or return;
1088		1211
1089	unless (aio_stat "$filename.pst") {	1212	unless (aio_stat "$filename.pst") {
1090	(aio_load "$filename.pst", $av) >= 0	1213	(aio_load "$filename.pst", $av) >= 0
1091	or return;	1214	or return;
1092		1215
1093	undef $guard;
1094	$av = eval { (Storable::thaw $av)->{objs} };	1216	my $st = eval { Coro::Storable::thaw $av };
		1217	$av = $st->{objs};
1095	}	1218	}
1096		1219
1097	utf8::decode (my $decname = $filename);	1220	utf8::decode (my $decname = $filename);
1098	warn sprintf "loading %s (%d,%d)\n",	1221	warn sprintf "loading %s (%d,%d)\n",
1099	$decname, length $data, scalar @{$av || []};	1222	$decname, length $data, scalar @{$av || []};
…		…
1160	my ($name, $cb) = @_;	1283	my ($name, $cb) = @_;
1161		1284
1162	$EXTICMD{$name} = $cb;	1285	$EXTICMD{$name} = $cb;
1163	}	1286	}
1164		1287
		1288	use File::Glob ();
		1289
1165	cf::player->attach (	1290	cf::player->attach (
1166	on_command => sub {	1291	on_command => sub {
1167	my ($pl, $name, $params) = @_;	1292	my ($pl, $name, $params) = @_;
1168		1293
1169	my $cb = $COMMAND{$name}	1294	my $cb = $COMMAND{$name}
…		…
1201		1326
1202	cf::override;	1327	cf::override;
1203	},	1328	},
1204	);	1329	);
1205		1330
		1331	# "readahead" all extensions
		1332	sub cache_extensions {
		1333	my $grp = IO::AIO::aio_group;
		1334
		1335	add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
		1336	for (grep /\.ext$/, @{$_[0]}) {
		1337	add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
		1338	}
		1339	};
		1340
		1341	$grp
		1342	}
		1343
1206	sub load_extensions {	1344	sub load_extensions {
1207	cf::sync_job {	1345	cf::sync_job {
1208	my %todo;	1346	my %todo;
1209		1347
1210	for my $path (<$LIBDIR/*.ext>) {	1348	for my $path (<$LIBDIR/*.ext>) {
…		…
1229		1367
1230	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1368	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1231	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1369	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1232		1370
1233	$ext{source} =	1371	$ext{source} =
1234	"package $pkg; use strict; use utf8;\n"	1372	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1235	. "#line 1 \"$path\"\n{\n"	1373	. "#line 1 \"$path\"\n{\n"
1236	. $source	1374	. $source
1237	. "\n};\n1";	1375	. "\n};\n1";
1238		1376
1239	$todo{$base} = \%ext;	1377	$todo{$base} = \%ext;
…		…
1255	my $msg = $@ ? "$v->{path}: $@\n"	1393	my $msg = $@ ? "$v->{path}: $@\n"
1256	: "$v->{base}: extension inactive.\n";	1394	: "$v->{base}: extension inactive.\n";
1257		1395
1258	if (exists $v->{meta}{mandatory}) {	1396	if (exists $v->{meta}{mandatory}) {
1259	warn $msg;	1397	warn $msg;
1260	warn "mandatory extension failed to load, exiting.\n";	1398	cf::cleanup "mandatory extension failed to load, exiting.";
1261	exit 1;
1262	}	1399	}
1263		1400
1264	warn $msg;	1401	warn $msg;
1265	}	1402	}
1266		1403
…		…
1280		1417
1281	=back	1418	=back
1282		1419
1283	=head2 CORE EXTENSIONS	1420	=head2 CORE EXTENSIONS
1284		1421
1285	Functions and methods that extend core crossfire objects.	1422	Functions and methods that extend core deliantra objects.
1286		1423
1287	=cut	1424	=cut
1288		1425
1289	package cf::player;	1426	package cf::player;
1290		1427
…		…
1333		1470
1334	sub exists($) {	1471	sub exists($) {
1335	my ($login) = @_;	1472	my ($login) = @_;
1336		1473
1337	$cf::PLAYER{$login}	1474	$cf::PLAYER{$login}
1338	or cf::sync_job { !aio_stat path $login }	1475	or !aio_stat path $login
1339	}	1476	}
1340		1477
1341	sub find($) {	1478	sub find($) {
1342	return $cf::PLAYER{$_[0]} || do {	1479	return $cf::PLAYER{$_[0]} || do {
1343	my $login = $_[0];	1480	my $login = $_[0];
…		…
1355	my $f = new_from_file cf::object::thawer path $login	1492	my $f = new_from_file cf::object::thawer path $login
1356	or return;	1493	or return;
1357		1494
1358	my $pl = cf::player::load_pl $f	1495	my $pl = cf::player::load_pl $f
1359	or return;	1496	or return;
		1497
1360	local $cf::PLAYER_LOADING{$login} = $pl;	1498	local $cf::PLAYER_LOADING{$login} = $pl;
1361	$f->resolve_delayed_derefs;	1499	$f->resolve_delayed_derefs;
1362	$cf::PLAYER{$login} = $pl	1500	$cf::PLAYER{$login} = $pl
1363	}	1501	}
1364	}	1502	}
…		…
1374		1512
1375	return if $pl->{deny_save};	1513	return if $pl->{deny_save};
1376		1514
1377	aio_mkdir playerdir $pl, 0770;	1515	aio_mkdir playerdir $pl, 0770;
1378	$pl->{last_save} = $cf::RUNTIME;	1516	$pl->{last_save} = $cf::RUNTIME;
		1517
		1518	cf::get_slot 0.01;
1379		1519
1380	$pl->save_pl ($path);	1520	$pl->save_pl ($path);
1381	cf::cede_to_tick;	1521	cf::cede_to_tick;
1382	}	1522	}
1383		1523
…		…
1415	my ($pl) = @_;	1555	my ($pl) = @_;
1416		1556
1417	my $name = $pl->ob->name;	1557	my $name = $pl->ob->name;
1418		1558
1419	$pl->{deny_save} = 1;	1559	$pl->{deny_save} = 1;
1420	$pl->password ("*"); # this should lock out the player until we nuked the dir	1560	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1421		1561
1422	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1562	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1423	$pl->deactivate;	1563	$pl->deactivate;
		1564	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
		1565	$pl->ob->check_score;
1424	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1566	$pl->invoke (cf::EVENT_PLAYER_QUIT);
1425	$pl->ns->destroy if $pl->ns;	1567	$pl->ns->destroy if $pl->ns;
1426		1568
1427	my $path = playerdir $pl;	1569	my $path = playerdir $pl;
1428	my $temp = "$path~$cf::RUNTIME~deleting~";	1570	my $temp = "$path~$cf::RUNTIME~deleting~";
…		…
1467		1609
1468	for my $login (@$dirs) {	1610	for my $login (@$dirs) {
1469	my $path = path $login;	1611	my $path = path $login;
1470		1612
1471	# a .pst is a dead give-away for a valid player	1613	# a .pst is a dead give-away for a valid player
1472	unless (-e "$path.pst") {	1614	# if no pst file found, open and chekc for blocked users
		1615	if (aio_stat "$path.pst") {
1473	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;	1616	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1474	aio_read $fh, 0, 512, my $buf, 0 or next;	1617	aio_read $fh, 0, 512, my $buf, 0 or next;
1475	$buf !~ /^password -------------$/m or next; # official not-valid tag	1618	$buf !~ /^password -------------$/m or next; # official not-valid tag
1476	}	1619	}
1477		1620
…		…
1508	}	1651	}
1509		1652
1510	\@paths	1653	\@paths
1511	}	1654	}
1512		1655
1513	=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)	1656	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1514		1657
1515	Expand crossfire pod fragments into protocol xml.	1658	Expand deliantra pod fragments into protocol xml.
1516
1517	=cut
1518
1519	sub expand_cfpod {
1520	((my $self), (local $_)) = @_;
1521
1522	# escape & and <
1523	s/&/&amp;/g;
1524	s/(?<![BIUGHT])</&lt;/g;
1525
1526	# this is buggy, it needs to properly take care of nested <'s
1527
1528	1 while
1529	# replace B<>, I<>, U<> etc.
1530	s/B<([^\>]*)>/<b>$1<\/b>/
1531	|| s/I<([^\>]*)>/<i>$1<\/i>/
1532	|| s/U<([^\>]*)>/<u>$1<\/u>/
1533	|| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1534	# replace G<male|female> tags
1535	|| s{G<([^>|]*)\|([^>]*)>}{
1536	$self->gender ? $2 : $1
1537	}ge
1538	# replace H<hint text>
1539	|| s{H<([^\>]*)>}
1540	{
1541	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1542	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1543	"")
1544	[$self->{hintmode}]
1545	}ge;
1546
1547	# create single paragraphs (very hackish)
1548	s/(?<=\S)\n(?=\w)/ /g;
1549
1550	# compress some whitespace
1551	s/\s+\n/\n/g; # ws line-ends
1552	s/\n\n+/\n/g; # double lines
1553	s/^\n+//; # beginning lines
1554	s/\n+$//; # ending lines
1555
1556	$_
1557	}
1558
1559	sub hintmode {
1560	$_[0]{hintmode} = $_[1] if @_ > 1;
1561	$_[0]{hintmode}
1562	}
1563		1659
1564	=item $player->ext_reply ($msgid, @msg)	1660	=item $player->ext_reply ($msgid, @msg)
1565		1661
1566	Sends an ext reply to the player.	1662	Sends an ext reply to the player.
1567		1663
…		…
1634	our $MAX_RESET = 3600;	1730	our $MAX_RESET = 3600;
1635	our $DEFAULT_RESET = 3000;	1731	our $DEFAULT_RESET = 3000;
1636		1732
1637	sub generate_random_map {	1733	sub generate_random_map {
1638	my ($self, $rmp) = @_;	1734	my ($self, $rmp) = @_;
		1735
		1736	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
		1737
1639	# mit "rum" bekleckern, nicht	1738	# mit "rum" bekleckern, nicht
1640	$self->_create_random_map (	1739	$self->_create_random_map (
1641	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},	1740	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1642	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},	1741	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1643	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},	1742	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
…		…
1765		1864
1766	# the temporary/swap location	1865	# the temporary/swap location
1767	sub save_path {	1866	sub save_path {
1768	my ($self) = @_;	1867	my ($self) = @_;
1769		1868
1770	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1869	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1771	"$TMPDIR/$path.map"	1870	"$TMPDIR/$path.map"
1772	}	1871	}
1773		1872
1774	# the unique path, undef == no special unique path	1873	# the unique path, undef == no special unique path
1775	sub uniq_path {	1874	sub uniq_path {
1776	my ($self) = @_;	1875	my ($self) = @_;
1777		1876
1778	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1877	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1779	"$UNIQUEDIR/$path"	1878	"$UNIQUEDIR/$path"
1780	}
1781
1782	# and all this just because we cannot iterate over
1783	# all maps in C++...
1784	sub change_all_map_light {
1785	my ($change) = @_;
1786
1787	$_->change_map_light ($change)
1788	for grep $_->outdoor, values %cf::MAP;
1789	}	1879	}
1790		1880
1791	sub decay_objects {	1881	sub decay_objects {
1792	my ($self) = @_;	1882	my ($self) = @_;
1793		1883
…		…
1877	sub find {	1967	sub find {
1878	my ($path, $origin) = @_;	1968	my ($path, $origin) = @_;
1879		1969
1880	$path = normalise $path, $origin && $origin->path;	1970	$path = normalise $path, $origin && $origin->path;
1881		1971
1882	cf::lock_wait "map_data:$path";#d#remove	1972	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1883	cf::lock_wait "map_find:$path";	1973	my $guard2 = cf::lock_acquire "map_find:$path";
1884		1974
1885	$cf::MAP{$path} || do {	1975	$cf::MAP{$path} || do {
1886	my $guard1 = cf::lock_acquire "map_find:$path";
1887	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1888
1889	my $map = new_from_path cf::map $path	1976	my $map = new_from_path cf::map $path
1890	or return;	1977	or return;
1891		1978
1892	$map->{last_save} = $cf::RUNTIME;	1979	$map->{last_save} = $cf::RUNTIME;
1893		1980
…		…
1895	or return;	1982	or return;
1896		1983
1897	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1984	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1898	# doing this can freeze the server in a sync job, obviously	1985	# doing this can freeze the server in a sync job, obviously
1899	#$cf::WAIT_FOR_TICK->wait;	1986	#$cf::WAIT_FOR_TICK->wait;
		1987	undef $guard2;
1900	undef $guard1;	1988	undef $guard1;
1901	undef $guard2;
1902	$map->reset;	1989	$map->reset;
1903	return find $path;	1990	return find $path;
1904	}	1991	}
1905		1992
1906	$cf::MAP{$path} = $map	1993	$cf::MAP{$path} = $map
…		…
1933	my $f = new_from_file cf::object::thawer $self->{load_path};	2020	my $f = new_from_file cf::object::thawer $self->{load_path};
1934	$f->skip_block;	2021	$f->skip_block;
1935	$self->_load_objects ($f)	2022	$self->_load_objects ($f)
1936	or return;	2023	or return;
1937		2024
1938	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	2025	$self->post_load_original
1939	if delete $self->{load_original};	2026	if delete $self->{load_original};
1940		2027
1941	if (my $uniq = $self->uniq_path) {	2028	if (my $uniq = $self->uniq_path) {
1942	utf8::encode $uniq;	2029	utf8::encode $uniq;
1943	unless (aio_stat $uniq) {	2030	unless (aio_stat $uniq) {
…		…
1961	unless ($self->{deny_activate}) {	2048	unless ($self->{deny_activate}) {
1962	$self->decay_objects;	2049	$self->decay_objects;
1963	$self->fix_auto_apply;	2050	$self->fix_auto_apply;
1964	$self->update_buttons;	2051	$self->update_buttons;
1965	cf::cede_to_tick;	2052	cf::cede_to_tick;
1966	$self->set_darkness_map;
1967	cf::cede_to_tick;
1968	$self->activate;	2053	$self->activate;
1969	}	2054	}
1970		2055
1971	$self->{last_save} = $cf::RUNTIME;	2056	$self->{last_save} = $cf::RUNTIME;
1972	$self->last_access ($cf::RUNTIME);	2057	$self->last_access ($cf::RUNTIME);
1973		2058
1974	$self->in_memory (cf::MAP_IN_MEMORY);	2059	$self->in_memory (cf::MAP_ACTIVE);
1975	}	2060	}
1976		2061
1977	$self->post_load;	2062	$self->post_load;
1978	}	2063	}
1979		2064
…		…
2037	my ($path, $origin, $load) = @_;	2122	my ($path, $origin, $load) = @_;
2038		2123
2039	$path = normalise $path, $origin && $origin->{path};	2124	$path = normalise $path, $origin && $origin->{path};
2040		2125
2041	if (my $map = $cf::MAP{$path}) {	2126	if (my $map = $cf::MAP{$path}) {
2042	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;	2127	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2043	}	2128	}
2044		2129
2045	$MAP_PREFETCH{$path} |= $load;	2130	$MAP_PREFETCH{$path} |= $load;
2046		2131
2047	$MAP_PREFETCHER ||= cf::async {	2132	$MAP_PREFETCHER ||= cf::async {
		2133	$Coro::current->{desc} = "map prefetcher";
		2134
2048	while (%MAP_PREFETCH) {	2135	while (%MAP_PREFETCH) {
2049	while (my ($k, $v) = each %MAP_PREFETCH) {	2136	while (my ($k, $v) = each %MAP_PREFETCH) {
2050	if (my $map = find $k) {	2137	if (my $map = find $k) {
2051	$map->load if $v;	2138	$map->load if $v;
2052	}	2139	}
…		…
2078	return if $self->{deny_save};	2165	return if $self->{deny_save};
2079		2166
2080	local $self->{last_access} = $self->last_access;#d#	2167	local $self->{last_access} = $self->last_access;#d#
2081		2168
2082	cf::async {	2169	cf::async {
		2170	$Coro::current->{desc} = "map player save";
2083	$_->contr->save for $self->players;	2171	$_->contr->save for $self->players;
2084	};	2172	};
		2173
		2174	cf::get_slot 0.02;
2085		2175
2086	if ($uniq) {	2176	if ($uniq) {
2087	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);	2177	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2088	$self->_save_objects ($uniq, cf::IO_UNIQUES);	2178	$self->_save_objects ($uniq, cf::IO_UNIQUES);
2089	} else {	2179	} else {
…		…
2098	$self->save;	2188	$self->save;
2099		2189
2100	my $lock = cf::lock_acquire "map_data:$self->{path}";	2190	my $lock = cf::lock_acquire "map_data:$self->{path}";
2101		2191
2102	return if $self->players;	2192	return if $self->players;
2103	return if $self->in_memory != cf::MAP_IN_MEMORY;	2193	return if $self->in_memory != cf::MAP_ACTIVE;
2104	return if $self->{deny_save};	2194	return if $self->{deny_save};
2105		2195
2106	$self->in_memory (cf::MAP_SWAPPED);	2196	$self->in_memory (cf::MAP_SWAPPED);
2107		2197
2108	$self->deactivate;	2198	$self->deactivate;
…		…
2226		2316
2227	sub unique_maps() {	2317	sub unique_maps() {
2228	[	2318	[
2229	map {	2319	map {
2230	utf8::decode $_;	2320	utf8::decode $_;
2231	/\.map$/	2321	s/\.map$//; # TODO future compatibility hack
		2322	/\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
		2323	? ()
2232	? normalise $_	2324	: normalise $_
2233	: ()
2234	} @{ aio_readdir $UNIQUEDIR or [] }	2325	} @{ aio_readdir $UNIQUEDIR or [] }
2235	]	2326	]
2236	}	2327	}
2237		2328
2238	package cf;
2239
2240	=back	2329	=back
2241		2330
2242	=head3 cf::object	2331	=head3 cf::object
2243		2332
2244	=cut	2333	=cut
…		…
2247		2336
2248	=over 4	2337	=over 4
2249		2338
2250	=item $ob->inv_recursive	2339	=item $ob->inv_recursive
2251		2340
2252	Returns the inventory of the object _and_ their inventories, recursively.	2341	Returns the inventory of the object I<and> their inventories, recursively,
		2342	but I<not> the object itself.
2253		2343
2254	=cut	2344	=cut
2255		2345
2256	sub inv_recursive_;	2346	sub inv_recursive_;
2257	sub inv_recursive_ {	2347	sub inv_recursive_ {
…		…
2262	inv_recursive_ inv $_[0]	2352	inv_recursive_ inv $_[0]
2263	}	2353	}
2264		2354
2265	=item $ref = $ob->ref	2355	=item $ref = $ob->ref
2266		2356
2267	creates and returns a persistent reference to an objetc that can be stored as a string.	2357	Creates and returns a persistent reference to an object that can be stored as a string.
2268		2358
2269	=item $ob = cf::object::deref ($refstring)	2359	=item $ob = cf::object::deref ($refstring)
2270		2360
2271	returns the objetc referenced by refstring. may return undef when it cnanot find the object,	2361	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2272	even if the object actually exists. May block.	2362	even if the object actually exists. May block.
…		…
2274	=cut	2364	=cut
2275		2365
2276	sub deref {	2366	sub deref {
2277	my ($ref) = @_;	2367	my ($ref) = @_;
2278		2368
2279	# temporary compatibility#TODO#remove
2280	$ref =~ s{^<}{player/<};
2281
2282	if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {	2369	if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283	my ($uuid, $name) = ($1, $2);	2370	my ($uuid, $name) = ($1, $2);
2284	my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name	2371	my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285	or return;	2372	or return;
2286	$pl->ob->uuid eq $uuid	2373	$pl->ob->uuid eq $uuid
2287	or return;	2374	or return;
…		…
2307	can be C<undef>. Does the right thing when the player is currently in a	2394	can be C<undef>. Does the right thing when the player is currently in a
2308	dialogue with the given NPC character.	2395	dialogue with the given NPC character.
2309		2396
2310	=cut	2397	=cut
2311		2398
		2399	our $SAY_CHANNEL = {
		2400	id => "say",
		2401	title => "Map",
		2402	reply => "say ",
		2403	tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
		2404	};
		2405
		2406	our $CHAT_CHANNEL = {
		2407	id => "chat",
		2408	title => "Chat",
		2409	reply => "chat ",
		2410	tooltip => "Player chat and shouts, global to the server.",
		2411	};
		2412
2312	# rough implementation of a future "reply" method that works	2413	# rough implementation of a future "reply" method that works
2313	# with dialog boxes.	2414	# with dialog boxes.
2314	#TODO: the first argument must go, split into a $npc->reply_to ( method	2415	#TODO: the first argument must go, split into a $npc->reply_to ( method
2315	sub cf::object::player::reply($$$;$) {	2416	sub cf::object::player::reply($$$;$) {
2316	my ($self, $npc, $msg, $flags) = @_;	2417	my ($self, $npc, $msg, $flags) = @_;
…		…
2327	my $dialog = $pl->{npc_dialog};	2428	my $dialog = $pl->{npc_dialog};
2328	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));	2429	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2329		2430
2330	} else {	2431	} else {
2331	$msg = $npc->name . " says: $msg" if $npc;	2432	$msg = $npc->name . " says: $msg" if $npc;
2332	$self->message ($msg, $flags);	2433	$self->send_msg ($SAY_CHANNEL => $msg, $flags);
2333	}	2434	}
2334	}	2435	}
2335	}	2436	}
2336		2437
2337	=item $object->send_msg ($channel, $msg, $color, [extra...])	2438	=item $object->send_msg ($channel, $msg, $color, [extra...])
…		…
2362		2463
2363	=item $player_object->enter_link	2464	=item $player_object->enter_link
2364		2465
2365	Freezes the player and moves him/her to a special map (C<{link}>).	2466	Freezes the player and moves him/her to a special map (C<{link}>).
2366		2467
2367	The player should be reasonably safe there for short amounts of time. You	2468	The player should be reasonably safe there for short amounts of time (e.g.
2368	I<MUST> call C<leave_link> as soon as possible, though.	2469	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
		2470	though, as the palyer cannot control the character while it is on the link
		2471	map.
2369		2472
2370	Will never block.	2473	Will never block.
2371		2474
2372	=item $player_object->leave_link ($map, $x, $y)	2475	=item $player_object->leave_link ($map, $x, $y)
2373		2476
…		…
2431		2534
2432	$map->load;	2535	$map->load;
2433	$map->load_neighbours;	2536	$map->load_neighbours;
2434		2537
2435	return unless $self->contr->active;	2538	return unless $self->contr->active;
		2539	$self->flag (cf::FLAG_DEBUG, 0);#d# temp
2436	$self->activate_recursive;	2540	$self->activate_recursive;
2437		2541
2438	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2542	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2439	$self->enter_map ($map, $x, $y);	2543	$self->enter_map ($map, $x, $y);
2440	}	2544	}
…		…
2445	her, loading and preparing them map, calling the provided $check callback	2549	her, loading and preparing them map, calling the provided $check callback
2446	that has to return the map if sucecssful, and then unfreezes the player on	2550	that has to return the map if sucecssful, and then unfreezes the player on
2447	the new (success) or old (failed) map position. In either case, $done will	2551	the new (success) or old (failed) map position. In either case, $done will
2448	be called at the end of this process.	2552	be called at the end of this process.
2449		2553
		2554	Note that $check will be called with a potentially non-loaded map, so if
		2555	it needs a loaded map it has to call C<< ->load >>.
		2556
2450	=cut	2557	=cut
2451		2558
2452	our $GOTOGEN;	2559	our $GOTOGEN;
2453		2560
2454	sub cf::object::player::goto {	2561	sub cf::object::player::goto {
…		…
2458	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2565	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2459		2566
2460	$self->enter_link;	2567	$self->enter_link;
2461		2568
2462	(async {	2569	(async {
		2570	$Coro::current->{desc} = "player::goto $path $x $y";
		2571
2463	# *tag paths override both path and x|y	2572	# *tag paths override both path and x|y
2464	if ($path =~ /^\*(.*)$/) {	2573	if ($path =~ /^\*(.*)$/) {
2465	if (my @obs = grep $_->map, ext::map_tags::find $1) {	2574	if (my @obs = grep $_->map, ext::map_tags::find $1) {
2466	my $ob = $obs[rand @obs];	2575	my $ob = $obs[rand @obs];
2467		2576
…		…
2530	}	2639	}
2531		2640
2532	sub prepare_random_map {	2641	sub prepare_random_map {
2533	my ($exit) = @_;	2642	my ($exit) = @_;
2534		2643
2535	my $guard = cf::lock_acquire "exit_prepare:$exit";
2536
2537	# all this does is basically replace the /! path by	2644	# all this does is basically replace the /! path by
2538	# a new random map path (?random/...) with a seed	2645	# a new random map path (?random/...) with a seed
2539	# that depends on the exit object	2646	# that depends on the exit object
2540		2647
2541	my $rmp = parse_random_map_params $exit->msg;	2648	my $rmp = parse_random_map_params $exit->msg;
…		…
2543	if ($exit->map) {	2650	if ($exit->map) {
2544	$rmp->{region} = $exit->region->name;	2651	$rmp->{region} = $exit->region->name;
2545	$rmp->{origin_map} = $exit->map->path;	2652	$rmp->{origin_map} = $exit->map->path;
2546	$rmp->{origin_x} = $exit->x;	2653	$rmp->{origin_x} = $exit->x;
2547	$rmp->{origin_y} = $exit->y;	2654	$rmp->{origin_y} = $exit->y;
		2655
		2656	$exit->map->touch;
2548	}	2657	}
2549		2658
2550	$rmp->{random_seed} ||= $exit->random_seed;	2659	$rmp->{random_seed} ||= $exit->random_seed;
2551		2660
2552	my $data = cf::to_json $rmp;	2661	my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2553	my $md5 = Digest::MD5::md5_hex $data;	2662	my $md5 = Digest::MD5::md5_hex $data;
2554	my $meta = "$RANDOMDIR/$md5.meta";	2663	my $meta = "$RANDOMDIR/$md5.meta";
2555		2664
2556	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {	2665	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2557	aio_write $fh, 0, (length $data), $data, 0;	2666	aio_write $fh, 0, (length $data), $data, 0;
2558	undef $fh;	2667	undef $fh;
2559	aio_rename "$meta~", $meta;	2668	aio_rename "$meta~", $meta;
2560		2669
		2670	my $slaying = "?random/$md5";
		2671
		2672	if ($exit->valid) {
2561	$exit->slaying ("?random/$md5");	2673	$exit->slaying ("?random/$md5");
2562	$exit->msg (undef);	2674	$exit->msg (undef);
		2675	}
2563	}	2676	}
2564	}	2677	}
2565		2678
2566	sub cf::object::player::enter_exit {	2679	sub cf::object::player::enter_exit {
2567	my ($self, $exit) = @_;	2680	my ($self, $exit) = @_;
2568		2681
2569	return unless $self->type == cf::PLAYER;	2682	return unless $self->type == cf::PLAYER;
2570		2683
2571	if ($exit->slaying eq "/!") {
2572	#TODO: this should de-fi-ni-te-ly not be a sync-job
2573	# the problem is that $exit might not survive long enough
2574	# so it needs to be done right now, right here
2575	cf::sync_job { prepare_random_map $exit };
2576	}
2577
2578	my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2579	my $hp = $exit->stats->hp;
2580	my $sp = $exit->stats->sp;
2581
2582	$self->enter_link;	2684	$self->enter_link;
2583		2685
2584	# if exit is damned, update players death & WoR home-position
2585	$self->contr->savebed ($slaying, $hp, $sp)
2586	if $exit->flag (FLAG_DAMNED);
2587
2588	(async {	2686	(async {
2589	$self->deactivate_recursive; # just to be sure	2687	$Coro::current->{desc} = "enter_exit";
		2688
2590	unless (eval {	2689	unless (eval {
		2690	$self->deactivate_recursive; # just to be sure
		2691
		2692	# random map handling
		2693	{
		2694	my $guard = cf::lock_acquire "exit_prepare:$exit";
		2695
		2696	prepare_random_map $exit
		2697	if $exit->slaying eq "/!";
		2698	}
		2699
		2700	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
		2701	my $x = $exit->stats->hp;
		2702	my $y = $exit->stats->sp;
		2703
2591	$self->goto ($slaying, $hp, $sp);	2704	$self->goto ($map, $x, $y);
2592		2705
		2706	# if exit is damned, update players death & WoR home-position
		2707	$self->contr->savebed ($map, $x, $y)
		2708	if $exit->flag (cf::FLAG_DAMNED);
		2709
2593	1;	2710	1
2594	}) {	2711	}) {
2595	$self->message ("Something went wrong deep within the crossfire server. "	2712	$self->message ("Something went wrong deep within the deliantra server. "
2596	. "I'll try to bring you back to the map you were before. "	2713	. "I'll try to bring you back to the map you were before. "
2597	. "Please report this to the dungeon master!",	2714	. "Please report this to the dungeon master!",
2598	cf::NDI_UNIQUE | cf::NDI_RED);	2715	cf::NDI_UNIQUE | cf::NDI_RED);
2599		2716
2600	warn "ERROR in enter_exit: $@";	2717	warn "ERROR in enter_exit: $@";
…		…
2628	the message, with C<log> being the default. If C<$color> is negative, suppress	2745	the message, with C<log> being the default. If C<$color> is negative, suppress
2629	the message unless the client supports the msg packet.	2746	the message unless the client supports the msg packet.
2630		2747
2631	=cut	2748	=cut
2632		2749
		2750	# non-persistent channels (usually the info channel)
2633	our %CHANNEL = (	2751	our %CHANNEL = (
2634	"c/identify" => {	2752	"c/identify" => {
2635	id => "identify",	2753	id => "infobox",
2636	title => "Identify",	2754	title => "Identify",
2637	reply => undef,	2755	reply => undef,
2638	tooltip => "Items recently identified",	2756	tooltip => "Items recently identified",
2639	},	2757	},
2640	"c/examine" => {	2758	"c/examine" => {
2641	id => "examine",	2759	id => "infobox",
2642	title => "Examine",	2760	title => "Examine",
2643	reply => undef,	2761	reply => undef,
2644	tooltip => "Signs and other items you examined",	2762	tooltip => "Signs and other items you examined",
2645	},	2763	},
		2764	"c/book" => {
		2765	id => "infobox",
		2766	title => "Book",
		2767	reply => undef,
		2768	tooltip => "The contents of a note or book",
		2769	},
		2770	"c/lookat" => {
		2771	id => "infobox",
		2772	title => "Look",
		2773	reply => undef,
		2774	tooltip => "What you saw there",
		2775	},
		2776	"c/who" => {
		2777	id => "infobox",
		2778	title => "Players",
		2779	reply => undef,
		2780	tooltip => "Shows players who are currently online",
		2781	},
		2782	"c/body" => {
		2783	id => "infobox",
		2784	title => "Body Parts",
		2785	reply => undef,
		2786	tooltip => "Shows which body parts you posess and are available",
		2787	},
		2788	"c/statistics" => {
		2789	id => "infobox",
		2790	title => "Statistics",
		2791	reply => undef,
		2792	tooltip => "Shows your primary statistics",
		2793	},
		2794	"c/skills" => {
		2795	id => "infobox",
		2796	title => "Skills",
		2797	reply => undef,
		2798	tooltip => "Shows your experience per skill and item power",
		2799	},
		2800	"c/shopitems" => {
		2801	id => "infobox",
		2802	title => "Shop Items",
		2803	reply => undef,
		2804	tooltip => "Shows the items currently for sale in this shop",
		2805	},
		2806	"c/resistances" => {
		2807	id => "infobox",
		2808	title => "Resistances",
		2809	reply => undef,
		2810	tooltip => "Shows your resistances",
		2811	},
		2812	"c/pets" => {
		2813	id => "infobox",
		2814	title => "Pets",
		2815	reply => undef,
		2816	tooltip => "Shows information abotu your pets/a specific pet",
		2817	},
		2818	"c/perceiveself" => {
		2819	id => "infobox",
		2820	title => "Perceive Self",
		2821	reply => undef,
		2822	tooltip => "You gained detailed knowledge about yourself",
		2823	},
		2824	"c/uptime" => {
		2825	id => "infobox",
		2826	title => "Uptime",
		2827	reply => undef,
		2828	tooltip => "How long the server has been running since last restart",
		2829	},
		2830	"c/mapinfo" => {
		2831	id => "infobox",
		2832	title => "Map Info",
		2833	reply => undef,
		2834	tooltip => "Information related to the maps",
		2835	},
		2836	"c/party" => {
		2837	id => "party",
		2838	title => "Party",
		2839	reply => "gsay ",
		2840	tooltip => "Messages and chat related to your party",
		2841	},
		2842	"c/death" => {
		2843	id => "death",
		2844	title => "Death",
		2845	reply => undef,
		2846	tooltip => "Reason for and more info about your most recent death",
		2847	},
		2848	"c/say" => $SAY_CHANNEL,
		2849	"c/chat" => $CHAT_CHANNEL,
2646	);	2850	);
2647		2851
2648	sub cf::client::send_msg {	2852	sub cf::client::send_msg {
2649	my ($self, $channel, $msg, $color, @extra) = @_;	2853	my ($self, $channel, $msg, $color, @extra) = @_;
2650		2854
2651	$msg = $self->pl->expand_cfpod ($msg);	2855	$msg = $self->pl->expand_cfpod ($msg)
		2856	unless $color & cf::NDI_VERBATIM;
2652		2857
2653	$color &= cf::NDI_CLIENT_MASK; # just in case...	2858	$color &= cf::NDI_CLIENT_MASK; # just in case...
2654		2859
2655	# check predefined channels, for the benefit of C	2860	# check predefined channels, for the benefit of C
2656	$channel = $CHANNEL{$channel} if $CHANNEL{$channel};	2861	if ($CHANNEL{$channel}) {
		2862	$channel = $CHANNEL{$channel};
2657		2863
		2864	$self->ext_msg (channel_info => $channel);
		2865	$channel = $channel->{id};
		2866
2658	if (ref $channel) {	2867	} elsif (ref $channel) {
2659	# send meta info to client, if not yet sent	2868	# send meta info to client, if not yet sent
2660	unless (exists $self->{channel}{$channel->{id}}) {	2869	unless (exists $self->{channel}{$channel->{id}}) {
2661	$self->{channel}{$channel->{id}} = $channel;	2870	$self->{channel}{$channel->{id}} = $channel;
2662	$self->ext_msg (channel_info => $channel)	2871	$self->ext_msg (channel_info => $channel);
2663	if $self->can_msg;
2664	}	2872	}
2665		2873
2666	$channel = $channel->{id};	2874	$channel = $channel->{id};
2667	}	2875	}
2668		2876
2669	return unless @extra || length $msg;	2877	return unless @extra || length $msg;
2670		2878
2671	if ($self->can_msg) {
2672	# default colour, mask it out	2879	# default colour, mask it out
2673	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)	2880	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2674	if $color & cf::NDI_DEF;	2881	if $color & cf::NDI_DEF;
2675		2882
2676	$self->send_packet ("msg " . $self->{json_coder}->encode (	2883	my $pkt = "msg "
		2884	. $self->{json_coder}->encode (
2677	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));	2885	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2678	} else {	2886	);
2679	if ($color >= 0) {
2680	# replace some tags by gcfclient-compatible ones
2681	for ($msg) {
2682	1 while
2683	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2684	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2685	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2686	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2687	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2688	}
2689		2887
2690	$color &= cf::NDI_COLOR_MASK;	2888	# try lzf for large packets
		2889	$pkt = "lzf " . Compress::LZF::compress $pkt
		2890	if 1024 <= length $pkt and $self->{can_lzf};
2691		2891
2692	utf8::encode $msg;	2892	# split very large packets
2693		2893	if (8192 < length $pkt and $self->{can_lzf}) {
2694	if (0 && $msg =~ /\[/) {	2894	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2695	# COMMAND/INFO	2895	$pkt = "frag";
2696	$self->send_packet ("drawextinfo $color 10 8 $msg")
2697	} else {
2698	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2699	$self->send_packet ("drawinfo $color $msg")
2700	}
2701	}
2702	}	2896	}
		2897
		2898	$self->send_packet ($pkt);
2703	}	2899	}
2704		2900
2705	=item $client->ext_msg ($type, @msg)	2901	=item $client->ext_msg ($type, @msg)
2706		2902
2707	Sends an ext event to the client.	2903	Sends an ext event to the client.
…		…
2880	=pod	3076	=pod
2881		3077
2882	The following functions and methods are available within a safe environment:	3078	The following functions and methods are available within a safe environment:
2883		3079
2884	cf::object	3080	cf::object
2885	contr pay_amount pay_player map x y force_find force_add	3081	contr pay_amount pay_player map x y force_find force_add destroy
2886	insert remove name archname title slaying race decrease_ob_nr	3082	insert remove name archname title slaying race decrease split
		3083	value
2887		3084
2888	cf::object::player	3085	cf::object::player
2889	player	3086	player
2890		3087
2891	cf::player	3088	cf::player
…		…
2896		3093
2897	=cut	3094	=cut
2898		3095
2899	for (	3096	for (
2900	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	3097	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2901	insert remove inv name archname title slaying race	3098	insert remove inv nrof name archname title slaying race
2902	decrease_ob_nr)],	3099	decrease split destroy change_exp value msg lore send_msg)],
2903	["cf::object::player" => qw(player)],	3100	["cf::object::player" => qw(player)],
2904	["cf::player" => qw(peaceful)],	3101	["cf::player" => qw(peaceful send_msg)],
2905	["cf::map" => qw(trigger)],	3102	["cf::map" => qw(trigger)],
2906	) {	3103	) {
2907	no strict 'refs';	3104	no strict 'refs';
2908	my ($pkg, @funs) = @$_;	3105	my ($pkg, @funs) = @$_;
2909	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3106	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
…		…
2926	my ($code, %vars) = @_;	3123	my ($code, %vars) = @_;
2927		3124
2928	my $qcode = $code;	3125	my $qcode = $code;
2929	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3126	$qcode =~ s/"/‟/g; # not allowed in #line filenames
2930	$qcode =~ s/\n/\\n/g;	3127	$qcode =~ s/\n/\\n/g;
		3128
		3129	%vars = (_dummy => 0) unless %vars;
2931		3130
2932	local $_;	3131	local $_;
2933	local @safe::cf::_safe_eval_args = values %vars;	3132	local @safe::cf::_safe_eval_args = values %vars;
2934		3133
2935	my $eval =	3134	my $eval =
…		…
3012	{	3211	{
3013	my $faces = $facedata->{faceinfo};	3212	my $faces = $facedata->{faceinfo};
3014		3213
3015	while (my ($face, $info) = each %$faces) {	3214	while (my ($face, $info) = each %$faces) {
3016	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3215	my $idx = (cf::face::find $face) || cf::face::alloc $face;
		3216
3017	cf::face::set_visibility $idx, $info->{visibility};	3217	cf::face::set_visibility $idx, $info->{visibility};
3018	cf::face::set_magicmap $idx, $info->{magicmap};	3218	cf::face::set_magicmap $idx, $info->{magicmap};
3019	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};	3219	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3020	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};	3220	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3021		3221
3022	cf::cede_to_tick;	3222	cf::cede_to_tick;
3023	}	3223	}
3024		3224
3025	while (my ($face, $info) = each %$faces) {	3225	while (my ($face, $info) = each %$faces) {
3026	next unless $info->{smooth};	3226	next unless $info->{smooth};
		3227
3027	my $idx = cf::face::find $face	3228	my $idx = cf::face::find $face
3028	or next;	3229	or next;
		3230
3029	if (my $smooth = cf::face::find $info->{smooth}) {	3231	if (my $smooth = cf::face::find $info->{smooth}) {
3030	cf::face::set_smooth $idx, $smooth;	3232	cf::face::set_smooth $idx, $smooth;
3031	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3233	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3032	} else {	3234	} else {
3033	warn "smooth face '$info->{smooth}' not found for face '$face'";	3235	warn "smooth face '$info->{smooth}' not found for face '$face'";
…		…
3051	{	3253	{
3052	# TODO: for gcfclient pleasure, we should give resources	3254	# TODO: for gcfclient pleasure, we should give resources
3053	# that gcfclient doesn't grok a >10000 face index.	3255	# that gcfclient doesn't grok a >10000 face index.
3054	my $res = $facedata->{resource};	3256	my $res = $facedata->{resource};
3055		3257
3056	my $soundconf = delete $res->{"res/sound.conf"};
3057
3058	while (my ($name, $info) = each %$res) {	3258	while (my ($name, $info) = each %$res) {
		3259	if (defined $info->{type}) {
3059	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3260	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3060	my $data;	3261	my $data;
3061		3262
3062	if ($info->{type} & 1) {	3263	if ($info->{type} & 1) {
3063	# prepend meta info	3264	# prepend meta info
3064		3265
3065	my $meta = $enc->encode ({	3266	my $meta = $enc->encode ({
3066	name => $name,	3267	name => $name,
3067	%{ $info->{meta} || {} },	3268	%{ $info->{meta} || {} },
3068	});	3269	});
3069		3270
3070	$data = pack "(w/a*)*", $meta, $info->{data};	3271	$data = pack "(w/a*)*", $meta, $info->{data};
		3272	} else {
		3273	$data = $info->{data};
		3274	}
		3275
		3276	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3277	cf::face::set_type $idx, $info->{type};
3071	} else {	3278	} else {
3072	$data = $info->{data};	3279	$RESOURCE{$name} = $info;
3073	}	3280	}
3074		3281
3075	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3076	cf::face::set_type $idx, $info->{type};
3077
3078	cf::cede_to_tick;	3282	cf::cede_to_tick;
3079	}	3283	}
3080
3081	if ($soundconf) {
3082	$soundconf = $enc->decode (delete $soundconf->{data});
3083
3084	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3085	my $sound = $soundconf->{compat}[$_]
3086	or next;
3087
3088	my $face = cf::face::find "sound/$sound->[1]";
3089	cf::sound::set $sound->[0] => $face;
3090	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3091	}
3092
3093	while (my ($k, $v) = each %{$soundconf->{event}}) {
3094	my $face = cf::face::find "sound/$v";
3095	cf::sound::set $k => $face;
3096	}
3097	}
3098	}	3284	}
		3285
		3286	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3099		3287
3100	1	3288	1
3101	}	3289	}
		3290
		3291	cf::global->attach (on_resource_update => sub {
		3292	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
		3293	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
		3294
		3295	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3296	my $sound = $soundconf->{compat}[$_]
		3297	or next;
		3298
		3299	my $face = cf::face::find "sound/$sound->[1]";
		3300	cf::sound::set $sound->[0] => $face;
		3301	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3302	}
		3303
		3304	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3305	my $face = cf::face::find "sound/$v";
		3306	cf::sound::set $k => $face;
		3307	}
		3308	}
		3309	});
3102		3310
3103	register_exticmd fx_want => sub {	3311	register_exticmd fx_want => sub {
3104	my ($ns, $want) = @_;	3312	my ($ns, $want) = @_;
3105		3313
3106	while (my ($k, $v) = each %$want) {	3314	while (my ($k, $v) = each %$want) {
3107	$ns->fx_want ($k, $v);	3315	$ns->fx_want ($k, $v);
3108	}	3316	}
3109	};	3317	};
		3318
		3319	sub load_resource_file($) {
		3320	my $guard = lock_acquire "load_resource_file";
		3321
		3322	my $status = load_resource_file_ $_[0];
		3323	get_slot 0.1, 100;
		3324	cf::arch::commit_load;
		3325
		3326	$status
		3327	}
3110		3328
3111	sub reload_regions {	3329	sub reload_regions {
3112	# HACK to clear player env face cache, we need some signal framework	3330	# HACK to clear player env face cache, we need some signal framework
3113	# for this (global event?)	3331	# for this (global event?)
3114	%ext::player_env::MUSIC_FACE_CACHE = ();	3332	%ext::player_env::MUSIC_FACE_CACHE = ();
…		…
3128	}	3346	}
3129		3347
3130	sub reload_archetypes {	3348	sub reload_archetypes {
3131	load_resource_file "$DATADIR/archetypes"	3349	load_resource_file "$DATADIR/archetypes"
3132	or die "unable to load archetypes\n";	3350	or die "unable to load archetypes\n";
3133	#d# NEED to laod twice to resolve forward references
3134	# this really needs to be done in an extra post-pass
3135	# (which needs to be synchronous, so solve it differently)
3136	load_resource_file "$DATADIR/archetypes"
3137	or die "unable to load archetypes\n";
3138	}	3351	}
3139		3352
3140	sub reload_treasures {	3353	sub reload_treasures {
3141	load_resource_file "$DATADIR/treasures"	3354	load_resource_file "$DATADIR/treasures"
3142	or die "unable to load treasurelists\n";	3355	or die "unable to load treasurelists\n";
3143	}	3356	}
3144		3357
3145	sub reload_resources {	3358	sub reload_resources {
3146	warn "reloading resource files...\n";	3359	warn "reloading resource files...\n";
3147		3360
		3361	reload_facedata;
		3362	reload_archetypes;
3148	reload_regions;	3363	reload_regions;
3149	reload_facedata;
3150	#reload_archetypes;#d#
3151	reload_archetypes;
3152	reload_treasures;	3364	reload_treasures;
3153		3365
3154	warn "finished reloading resource files\n";	3366	warn "finished reloading resource files\n";
3155	}
3156
3157	sub init {
3158	reload_resources;
3159	}	3367	}
3160		3368
3161	sub reload_config {	3369	sub reload_config {
3162	open my $fh, "<:utf8", "$CONFDIR/config"	3370	open my $fh, "<:utf8", "$CONFDIR/config"
3163	or return;	3371	or return;
3164		3372
3165	local $/;	3373	local $/;
3166	*CFG = YAML::Syck::Load <$fh>;	3374	*CFG = YAML::Load <$fh>;
3167		3375
3168	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3376	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3169		3377
3170	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3378	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3171	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3379	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
3177	};	3385	};
3178	warn $@ if $@;	3386	warn $@ if $@;
3179	}	3387	}
3180	}	3388	}
3181		3389
		3390	sub pidfile() {
		3391	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
		3392	or die "$PIDFILE: $!";
		3393	flock $fh, &Fcntl::LOCK_EX
		3394	or die "$PIDFILE: flock: $!";
		3395	$fh
		3396	}
		3397
		3398	# make sure only one server instance is running at any one time
		3399	sub atomic {
		3400	my $fh = pidfile;
		3401
		3402	my $pid = <$fh>;
		3403	kill 9, $pid if $pid > 0;
		3404
		3405	seek $fh, 0, 0;
		3406	print $fh $$;
		3407	}
		3408
		3409	sub main_loop {
		3410	warn "EV::loop starting\n";
		3411	if (1) {
		3412	EV::loop;
		3413	}
		3414	warn "EV::loop returned\n";
		3415	goto &main_loop unless $REALLY_UNLOOP;
		3416	}
		3417
3182	sub main {	3418	sub main {
		3419	cf::init_globals; # initialise logging
		3420
		3421	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
		3422	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
		3423	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
		3424	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
		3425
		3426	cf::init_experience;
		3427	cf::init_anim;
		3428	cf::init_attackmess;
		3429	cf::init_dynamic;
		3430
		3431	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
		3432
3183	# we must not ever block the main coroutine	3433	# we must not ever block the main coroutine
3184	local $Coro::idle = sub {	3434	local $Coro::idle = sub {
3185	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3435	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3186	(async {	3436	(async {
3187	Event::one_event;	3437	$Coro::current->{desc} = "IDLE BUG HANDLER";
		3438	EV::loop EV::LOOP_ONESHOT;
3188	})->prio (Coro::PRIO_MAX);	3439	})->prio (Coro::PRIO_MAX);
3189	};	3440	};
3190		3441
		3442	evthread_start IO::AIO::poll_fileno;
		3443
		3444	cf::sync_job {
		3445	reload_resources;
3191	reload_config;	3446	reload_config;
3192	db_init;	3447	db_init;
		3448
		3449	cf::load_settings;
		3450	cf::load_materials;
		3451	cf::init_uuid;
		3452	cf::init_signals;
		3453	cf::init_commands;
		3454	cf::init_skills;
		3455
		3456	cf::init_beforeplay;
		3457
		3458	atomic;
		3459
3193	load_extensions;	3460	load_extensions;
3194		3461
3195	$TICK_WATCHER->start;	3462	utime time, time, $RUNTIMEFILE;
3196	Event::loop;	3463
		3464	# no (long-running) fork's whatsoever before this point(!)
		3465	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
		3466
		3467	(pop @POST_INIT)->(0) while @POST_INIT;
		3468	};
		3469
		3470	main_loop;
3197	}	3471	}
3198		3472
3199	#############################################################################	3473	#############################################################################
3200	# initialisation and cleanup	3474	# initialisation and cleanup
3201		3475
3202	# install some emergency cleanup handlers	3476	# install some emergency cleanup handlers
3203	BEGIN {	3477	BEGIN {
		3478	our %SIGWATCHER = ();
3204	for my $signal (qw(INT HUP TERM)) {	3479	for my $signal (qw(INT HUP TERM)) {
3205	Event->signal (	3480	$SIGWATCHER{$signal} = EV::signal $signal, sub {
3206	reentrant => 0,
3207	data => WF_AUTOCANCEL,
3208	signal => $signal,
3209	prio => 0,
3210	cb => sub {
3211	cf::cleanup "SIG$signal";	3481	cf::cleanup "SIG$signal";
3212	},
3213	);	3482	};
3214	}	3483	}
3215	}	3484	}
3216		3485
3217	sub write_runtime {	3486	sub write_runtime_sync {
3218	my $runtime = "$LOCALDIR/runtime";
3219
3220	# first touch the runtime file to show we are still running:	3487	# first touch the runtime file to show we are still running:
3221	# the fsync below can take a very very long time.	3488	# the fsync below can take a very very long time.
3222		3489
3223	IO::AIO::aio_utime $runtime, undef, undef;	3490	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3224		3491
3225	my $guard = cf::lock_acquire "write_runtime";	3492	my $guard = cf::lock_acquire "write_runtime";
3226		3493
3227	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644	3494	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3228	or return;	3495	or return;
3229		3496
3230	my $value = $cf::RUNTIME + 90 + 10;	3497	my $value = $cf::RUNTIME + 90 + 10;
3231	# 10 is the runtime save interval, for a monotonic clock	3498	# 10 is the runtime save interval, for a monotonic clock
3232	# 60 allows for the watchdog to kill the server.	3499	# 60 allows for the watchdog to kill the server.
…		…
3242	aio_utime $fh, undef, undef;	3509	aio_utime $fh, undef, undef;
3243		3510
3244	close $fh	3511	close $fh
3245	or return;	3512	or return;
3246		3513
3247	aio_rename "$runtime~", $runtime	3514	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3248	and return;	3515	and return;
3249		3516
3250	warn "runtime file written.\n";	3517	warn "runtime file written.\n";
3251		3518
3252	1	3519	1
		3520	}
		3521
		3522	our $uuid_lock;
		3523	our $uuid_skip;
		3524
		3525	sub write_uuid_sync($) {
		3526	$uuid_skip ||= $_[0];
		3527
		3528	return if $uuid_lock;
		3529	local $uuid_lock = 1;
		3530
		3531	my $uuid = "$LOCALDIR/uuid";
		3532
		3533	my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
		3534	or return;
		3535
		3536	my $value = uuid_seq uuid_cur;
		3537
		3538	unless ($value) {
		3539	warn "cowardly refusing to write zero uuid value!\n";
		3540	return;
		3541	}
		3542
		3543	my $value = uuid_str $value + $uuid_skip;
		3544	$uuid_skip = 0;
		3545
		3546	(aio_write $fh, 0, (length $value), $value, 0) <= 0
		3547	and return;
		3548
		3549	# always fsync - this file is important
		3550	aio_fsync $fh
		3551	and return;
		3552
		3553	close $fh
		3554	or return;
		3555
		3556	aio_rename "$uuid~", $uuid
		3557	and return;
		3558
		3559	warn "uuid file written ($value).\n";
		3560
		3561	1
		3562
		3563	}
		3564
		3565	sub write_uuid($$) {
		3566	my ($skip, $sync) = @_;
		3567
		3568	$sync ? write_uuid_sync $skip
		3569	: async { write_uuid_sync $skip };
3253	}	3570	}
3254		3571
3255	sub emergency_save() {	3572	sub emergency_save() {
3256	my $freeze_guard = cf::freeze_mainloop;	3573	my $freeze_guard = cf::freeze_mainloop;
3257		3574
3258	warn "enter emergency perl save\n";	3575	warn "emergency_perl_save: enter\n";
3259		3576
3260	cf::sync_job {	3577	cf::sync_job {
		3578	# this is a trade-off: we want to be very quick here, so
		3579	# save all maps without fsync, and later call a global sync
		3580	# (which in turn might be very very slow)
		3581	local $USE_FSYNC = 0;
		3582
3261	# use a peculiar iteration method to avoid tripping on perl	3583	# use a peculiar iteration method to avoid tripping on perl
3262	# refcount bugs in for. also avoids problems with players	3584	# refcount bugs in for. also avoids problems with players
3263	# and maps saved/destroyed asynchronously.	3585	# and maps saved/destroyed asynchronously.
3264	warn "begin emergency player save\n";	3586	warn "emergency_perl_save: begin player save\n";
3265	for my $login (keys %cf::PLAYER) {	3587	for my $login (keys %cf::PLAYER) {
3266	my $pl = $cf::PLAYER{$login} or next;	3588	my $pl = $cf::PLAYER{$login} or next;
3267	$pl->valid or next;	3589	$pl->valid or next;
		3590	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3268	$pl->save;	3591	$pl->save;
3269	}	3592	}
3270	warn "end emergency player save\n";	3593	warn "emergency_perl_save: end player save\n";
3271		3594
3272	warn "begin emergency map save\n";	3595	warn "emergency_perl_save: begin map save\n";
3273	for my $path (keys %cf::MAP) {	3596	for my $path (keys %cf::MAP) {
3274	my $map = $cf::MAP{$path} or next;	3597	my $map = $cf::MAP{$path} or next;
3275	$map->valid or next;	3598	$map->valid or next;
3276	$map->save;	3599	$map->save;
3277	}	3600	}
3278	warn "end emergency map save\n";	3601	warn "emergency_perl_save: end map save\n";
3279		3602
3280	warn "begin emergency database checkpoint\n";	3603	warn "emergency_perl_save: begin database checkpoint\n";
3281	BDB::db_env_txn_checkpoint $DB_ENV;	3604	BDB::db_env_txn_checkpoint $DB_ENV;
3282	warn "end emergency database checkpoint\n";	3605	warn "emergency_perl_save: end database checkpoint\n";
		3606
		3607	warn "emergency_perl_save: begin write uuid\n";
		3608	write_uuid_sync 1;
		3609	warn "emergency_perl_save: end write uuid\n";
3283	};	3610	};
3284		3611
		3612	warn "emergency_perl_save: starting sync()\n";
		3613	IO::AIO::aio_sync sub {
		3614	warn "emergency_perl_save: finished sync()\n";
		3615	};
		3616
3285	warn "leave emergency perl save\n";	3617	warn "emergency_perl_save: leave\n";
3286	}	3618	}
3287		3619
3288	sub post_cleanup {	3620	sub post_cleanup {
3289	my ($make_core) = @_;	3621	my ($make_core) = @_;
3290		3622
3291	warn Carp::longmess "post_cleanup backtrace"	3623	warn Carp::longmess "post_cleanup backtrace"
3292	if $make_core;	3624	if $make_core;
		3625
		3626	my $fh = pidfile;
		3627	unlink $PIDFILE if <$fh> == $$;
		3628	}
		3629
		3630	# a safer delete_package, copied from Symbol
		3631	sub clear_package($) {
		3632	my $pkg = shift;
		3633
		3634	# expand to full symbol table name if needed
		3635	unless ($pkg =~ /^main::.*::$/) {
		3636	$pkg = "main$pkg" if $pkg =~ /^::/;
		3637	$pkg = "main::$pkg" unless $pkg =~ /^main::/;
		3638	$pkg .= '::' unless $pkg =~ /::$/;
		3639	}
		3640
		3641	my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
		3642	my $stem_symtab = *{$stem}{HASH};
		3643
		3644	defined $stem_symtab and exists $stem_symtab->{$leaf}
		3645	or return;
		3646
		3647	# clear all symbols
		3648	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
		3649	for my $name (keys %$leaf_symtab) {
		3650	_gv_clear *{"$pkg$name"};
		3651	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
		3652	}
		3653	warn "cleared package $pkg\n";#d#
3293	}	3654	}
3294		3655
3295	sub do_reload_perl() {	3656	sub do_reload_perl() {
3296	# can/must only be called in main	3657	# can/must only be called in main
3297	if ($Coro::current != $Coro::main) {	3658	if ($Coro::current != $Coro::main) {
3298	warn "can only reload from main coroutine";	3659	warn "can only reload from main coroutine";
3299	return;	3660	return;
3300	}	3661	}
3301		3662
		3663	return if $RELOAD++;
		3664
		3665	my $t1 = EV::time;
		3666
		3667	while ($RELOAD) {
3302	warn "reloading...";	3668	warn "reloading...";
3303		3669
3304	warn "entering sync_job";	3670	warn "entering sync_job";
3305		3671
3306	cf::sync_job {	3672	cf::sync_job {
3307	cf::write_runtime; # external watchdog should not bark	3673	cf::write_runtime_sync; # external watchdog should not bark
3308	cf::emergency_save;	3674	cf::emergency_save;
3309	cf::write_runtime; # external watchdog should not bark	3675	cf::write_runtime_sync; # external watchdog should not bark
3310		3676
3311	warn "syncing database to disk";	3677	warn "syncing database to disk";
3312	BDB::db_env_txn_checkpoint $DB_ENV;	3678	BDB::db_env_txn_checkpoint $DB_ENV;
3313		3679
3314	# if anything goes wrong in here, we should simply crash as we already saved	3680	# if anything goes wrong in here, we should simply crash as we already saved
3315		3681
3316	warn "cancelling all WF_AUTOCANCEL watchers";
3317	for (Event::all_watchers) {
3318	$_->cancel if $_->data & WF_AUTOCANCEL;
3319	}
3320
3321	warn "flushing outstanding aio requests";	3682	warn "flushing outstanding aio requests";
3322	for (;;) {
3323	BDB::flush;
3324	IO::AIO::flush;
3325	Coro::cede;
3326	last unless IO::AIO::nreqs || BDB::nreqs;	3683	while (IO::AIO::nreqs || BDB::nreqs) {
3327	warn "iterate...";	3684	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3328	}
3329
3330	++$RELOAD;
3331
3332	warn "cancelling all extension coros";
3333	$_->cancel for values %EXT_CORO;
3334	%EXT_CORO = ();
3335
3336	warn "removing commands";
3337	%COMMAND = ();
3338
3339	warn "removing ext/exti commands";
3340	%EXTCMD = ();
3341	%EXTICMD = ();
3342
3343	warn "unloading/nuking all extensions";
3344	for my $pkg (@EXTS) {
3345	warn "... unloading $pkg";
3346
3347	if (my $cb = $pkg->can ("unload")) {
3348	eval {
3349	$cb->($pkg);
3350	1
3351	} or warn "$pkg unloaded, but with errors: $@";
3352	}	3685	}
3353		3686
3354	warn "... nuking $pkg";	3687	warn "cancelling all extension coros";
3355	Symbol::delete_package $pkg;	3688	$_->cancel for values %EXT_CORO;
3356	}	3689	%EXT_CORO = ();
3357		3690
3358	warn "unloading all perl modules loaded from $LIBDIR";	3691	warn "removing commands";
3359	while (my ($k, $v) = each %INC) {	3692	%COMMAND = ();
3360	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3361		3693
		3694	warn "removing ext/exti commands";
		3695	%EXTCMD = ();
		3696	%EXTICMD = ();
		3697
		3698	warn "unloading/nuking all extensions";
		3699	for my $pkg (@EXTS) {
3362	warn "... unloading $k";	3700	warn "... unloading $pkg";
3363	delete $INC{$k};
3364		3701
3365	$k =~ s/\.pm$//;
3366	$k =~ s/\//::/g;
3367
3368	if (my $cb = $k->can ("unload_module")) {	3702	if (my $cb = $pkg->can ("unload")) {
		3703	eval {
3369	$cb->();	3704	$cb->($pkg);
		3705	1
		3706	} or warn "$pkg unloaded, but with errors: $@";
		3707	}
		3708
		3709	warn "... clearing $pkg";
		3710	clear_package $pkg;
3370	}	3711	}
3371		3712
3372	Symbol::delete_package $k;	3713	warn "unloading all perl modules loaded from $LIBDIR";
		3714	while (my ($k, $v) = each %INC) {
		3715	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
		3716
		3717	warn "... unloading $k";
		3718	delete $INC{$k};
		3719
		3720	$k =~ s/\.pm$//;
		3721	$k =~ s/\//::/g;
		3722
		3723	if (my $cb = $k->can ("unload_module")) {
		3724	$cb->();
		3725	}
		3726
		3727	clear_package $k;
3373	}	3728	}
3374		3729
3375	warn "getting rid of safe::, as good as possible";	3730	warn "getting rid of safe::, as good as possible";
3376	Symbol::delete_package "safe::$_"	3731	clear_package "safe::$_"
3377	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	3732	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3378		3733
3379	warn "unloading cf.pm \"a bit\"";	3734	warn "unloading cf.pm \"a bit\"";
3380	delete $INC{"cf.pm"};	3735	delete $INC{"cf.pm"};
3381	delete $INC{"cf/pod.pm"};	3736	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3382		3737
3383	# don't, removes xs symbols, too,	3738	# don't, removes xs symbols, too,
3384	# and global variables created in xs	3739	# and global variables created in xs
3385	#Symbol::delete_package __PACKAGE__;	3740	#clear_package __PACKAGE__;
3386		3741
3387	warn "unload completed, starting to reload now";	3742	warn "unload completed, starting to reload now";
3388		3743
3389	warn "reloading cf.pm";	3744	warn "reloading cf.pm";
3390	require cf;	3745	require cf;
3391	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3746	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3392		3747
3393	warn "loading config and database again";	3748	warn "loading config and database again";
3394	cf::reload_config;	3749	cf::reload_config;
3395		3750
3396	warn "loading extensions";	3751	warn "loading extensions";
3397	cf::load_extensions;	3752	cf::load_extensions;
3398		3753
		3754	if ($REATTACH_ON_RELOAD) {
3399	warn "reattaching attachments to objects/players";	3755	warn "reattaching attachments to objects/players";
3400	_global_reattach; # objects, sockets	3756	_global_reattach; # objects, sockets
3401	warn "reattaching attachments to maps";	3757	warn "reattaching attachments to maps";
3402	reattach $_ for values %MAP;	3758	reattach $_ for values %MAP;
3403	warn "reattaching attachments to players";	3759	warn "reattaching attachments to players";
3404	reattach $_ for values %PLAYER;	3760	reattach $_ for values %PLAYER;
		3761	}
3405		3762
		3763	warn "running post_init jobs";
		3764	(pop @POST_INIT)->(1) while @POST_INIT;
		3765
3406	warn "leaving sync_job";	3766	warn "leaving sync_job";
3407		3767
3408	1	3768	1
3409	} or do {	3769	} or do {
3410	warn $@;	3770	warn $@;
3411	warn "error while reloading, exiting.";	3771	cf::cleanup "error while reloading, exiting.";
3412	exit 1;
3413	};	3772	};
3414		3773
3415	warn "reloaded";	3774	warn "reloaded";
		3775	--$RELOAD;
		3776	}
		3777
		3778	$t1 = EV::time - $t1;
		3779	warn "reload completed in ${t1}s\n";
3416	};	3780	};
3417		3781
3418	our $RELOAD_WATCHER; # used only during reload	3782	our $RELOAD_WATCHER; # used only during reload
3419		3783
3420	sub reload_perl() {	3784	sub reload_perl() {
3421	# doing reload synchronously and two reloads happen back-to-back,	3785	# doing reload synchronously and two reloads happen back-to-back,
3422	# coro crashes during coro_state_free->destroy here.	3786	# coro crashes during coro_state_free->destroy here.
3423		3787
3424	$RELOAD_WATCHER ||= Event->timer (	3788	$RELOAD_WATCHER ||= cf::async {
3425	reentrant => 0,	3789	Coro::AIO::aio_wait cache_extensions;
3426	after => 0,	3790
3427	data => WF_AUTOCANCEL,	3791	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3428	cb => sub {
3429	do_reload_perl;	3792	do_reload_perl;
3430	undef $RELOAD_WATCHER;	3793	undef $RELOAD_WATCHER;
3431	},	3794	};
3432	);	3795	};
3433	}	3796	}
3434		3797
3435	register_command "reload" => sub {	3798	register_command "reload" => sub {
3436	my ($who, $arg) = @_;	3799	my ($who, $arg) = @_;
3437		3800
3438	if ($who->flag (FLAG_WIZ)) {	3801	if ($who->flag (FLAG_WIZ)) {
3439	$who->message ("reloading server.");	3802	$who->message ("reloading server.");
		3803	async {
		3804	$Coro::current->{desc} = "perl_reload";
3440	async { reload_perl };	3805	reload_perl;
		3806	};
3441	}	3807	}
3442	};	3808	};
3443		3809
3444	unshift @INC, $LIBDIR;	3810	unshift @INC, $LIBDIR;
3445		3811
…		…
3447		3813
3448	our @WAIT_FOR_TICK;	3814	our @WAIT_FOR_TICK;
3449	our @WAIT_FOR_TICK_BEGIN;	3815	our @WAIT_FOR_TICK_BEGIN;
3450		3816
3451	sub wait_for_tick {	3817	sub wait_for_tick {
3452	return unless $TICK_WATCHER->is_active;
3453	return if $Coro::current == $Coro::main;	3818	return if tick_inhibit || $Coro::current == $Coro::main;
3454		3819
3455	my $signal = new Coro::Signal;	3820	my $signal = new Coro::Signal;
3456	push @WAIT_FOR_TICK, $signal;	3821	push @WAIT_FOR_TICK, $signal;
3457	$signal->wait;	3822	$signal->wait;
3458	}	3823	}
3459		3824
3460	sub wait_for_tick_begin {	3825	sub wait_for_tick_begin {
3461	return unless $TICK_WATCHER->is_active;
3462	return if $Coro::current == $Coro::main;	3826	return if tick_inhibit || $Coro::current == $Coro::main;
3463		3827
3464	my $signal = new Coro::Signal;	3828	my $signal = new Coro::Signal;
3465	push @WAIT_FOR_TICK_BEGIN, $signal;	3829	push @WAIT_FOR_TICK_BEGIN, $signal;
3466	$signal->wait;	3830	$signal->wait;
3467	}	3831	}
3468		3832
3469	$TICK_WATCHER = Event->timer (	3833	sub tick {
3470	reentrant => 0,
3471	parked => 1,
3472	prio => 0,
3473	at => $NEXT_TICK || $TICK,
3474	data => WF_AUTOCANCEL,
3475	cb => sub {
3476	if ($Coro::current != $Coro::main) {	3834	if ($Coro::current != $Coro::main) {
3477	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	3835	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3478	unless ++$bug_warning > 10;	3836	unless ++$bug_warning > 10;
3479	return;	3837	return;
3480	}	3838	}
3481		3839
3482	$NOW = $tick_start = Event::time;
3483
3484	cf::server_tick; # one server iteration	3840	cf::server_tick; # one server iteration
3485		3841
3486	$RUNTIME += $TICK;
3487	$NEXT_TICK += $TICK;
3488
3489	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3842	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3490	$NEXT_RUNTIME_WRITE = $NOW + 10;	3843	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3491	Coro::async_pool {	3844	Coro::async_pool {
		3845	$Coro::current->{desc} = "runtime saver";
3492	write_runtime	3846	write_runtime_sync
3493	or warn "ERROR: unable to write runtime file: $!";	3847	or warn "ERROR: unable to write runtime file: $!";
3494	};
3495	}	3848	};
		3849	}
3496		3850
3497	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3851	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3498	$sig->send;	3852	$sig->send;
3499	}	3853	}
3500	while (my $sig = shift @WAIT_FOR_TICK) {	3854	while (my $sig = shift @WAIT_FOR_TICK) {
3501	$sig->send;	3855	$sig->send;
3502	}	3856	}
3503		3857
3504	$NOW = Event::time;	3858	$LOAD = ($NOW - $TICK_START) / $TICK;
3505
3506	# if we are delayed by four ticks or more, skip them all
3507	$NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3508
3509	$TICK_WATCHER->at ($NEXT_TICK);
3510	$TICK_WATCHER->start;
3511
3512	$LOAD = ($NOW - $tick_start) / $TICK;
3513	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3859	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3514		3860
3515	_post_tick;	3861	if (0) {
		3862	if ($NEXT_TICK) {
		3863	my $jitter = $TICK_START - $NEXT_TICK;
		3864	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
		3865	warn "jitter $JITTER\n";#d#
		3866	}
3516	},	3867	}
3517	);	3868	}
3518		3869
3519	{	3870	{
		3871	# configure BDB
		3872
3520	BDB::min_parallel 8;	3873	BDB::min_parallel 8;
3521	BDB::max_poll_time $TICK * 0.1;	3874	BDB::max_poll_reqs $TICK * 0.1;
3522	$BDB_POLL_WATCHER = Event->io (	3875	$AnyEvent::BDB::WATCHER->priority (1);
3523	reentrant => 0,
3524	fd => BDB::poll_fileno,
3525	poll => 'r',
3526	prio => 0,
3527	data => WF_AUTOCANCEL,
3528	cb => \&BDB::poll_cb,
3529	);
3530
3531	BDB::set_sync_prepare {
3532	my $status;
3533	my $current = $Coro::current;
3534	(
3535	sub {
3536	$status = $!;
3537	$current->ready; undef $current;
3538	},
3539	sub {
3540	Coro::schedule while defined $current;
3541	$! = $status;
3542	},
3543	)
3544	};
3545		3876
3546	unless ($DB_ENV) {	3877	unless ($DB_ENV) {
3547	$DB_ENV = BDB::db_env_create;	3878	$DB_ENV = BDB::db_env_create;
3548	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC	3879	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3549	| BDB::LOG_AUTOREMOVE, 1);	3880	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
		3881	$DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3550	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);	3882	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3551	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);	3883	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3552		3884
3553	cf::sync_job {	3885	cf::sync_job {
3554	eval {	3886	eval {
…		…
3564		3896
3565	cf::cleanup "db_env_open(db): $@" if $@;	3897	cf::cleanup "db_env_open(db): $@" if $@;
3566	};	3898	};
3567	}	3899	}
3568		3900
3569	$BDB_DEADLOCK_WATCHER = Event->timer (	3901	$BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3570	after => 3,
3571	interval => 1,
3572	hard => 1,
3573	prio => 0,
3574	data => WF_AUTOCANCEL,
3575	cb => sub {
3576	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };	3902	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3577	},
3578	);	3903	};
3579	$BDB_CHECKPOINT_WATCHER = Event->timer (	3904	$BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3580	after => 11,
3581	interval => 60,
3582	hard => 1,
3583	prio => 0,
3584	data => WF_AUTOCANCEL,
3585	cb => sub {
3586	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	3905	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3587	},
3588	);	3906	};
3589	$BDB_TRICKLE_WATCHER = Event->timer (	3907	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3590	after => 5,
3591	interval => 10,
3592	hard => 1,
3593	prio => 0,
3594	data => WF_AUTOCANCEL,
3595	cb => sub {
3596	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	3908	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3597	},
3598	);	3909	};
3599	}	3910	}
3600		3911
3601	{	3912	{
		3913	# configure IO::AIO
		3914
3602	IO::AIO::min_parallel 8;	3915	IO::AIO::min_parallel 8;
3603
3604	undef $Coro::AIO::WATCHER;
3605	IO::AIO::max_poll_time $TICK * 0.1;	3916	IO::AIO::max_poll_time $TICK * 0.1;
3606	$AIO_POLL_WATCHER = Event->io (	3917	undef $AnyEvent::AIO::WATCHER;
3607	reentrant => 0,
3608	data => WF_AUTOCANCEL,
3609	fd => IO::AIO::poll_fileno,
3610	poll => 'r',
3611	prio => 6,
3612	cb => \&IO::AIO::poll_cb,
3613	);
3614	}	3918	}
3615		3919
3616	my $_log_backtrace;	3920	my $_log_backtrace;
3617		3921
3618	sub _log_backtrace {	3922	sub _log_backtrace {
…		…
3621	$msg =~ s/\n//;	3925	$msg =~ s/\n//;
3622		3926
3623	# limit the # of concurrent backtraces	3927	# limit the # of concurrent backtraces
3624	if ($_log_backtrace < 2) {	3928	if ($_log_backtrace < 2) {
3625	++$_log_backtrace;	3929	++$_log_backtrace;
		3930	my $perl_bt = Carp::longmess $msg;
3626	async {	3931	async {
		3932	$Coro::current->{desc} = "abt $msg";
		3933
3627	my @bt = fork_call {	3934	my @bt = fork_call {
3628	@addr = map { sprintf "%x", $_ } @addr;	3935	@addr = map { sprintf "%x", $_ } @addr;
3629	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3936	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3630	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"	3937	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3631	or die "addr2line: $!";	3938	or die "addr2line: $!";
…		…
3639	}	3946	}
3640		3947
3641	@funcs	3948	@funcs
3642	};	3949	};
3643		3950
3644	LOG llevInfo, "[ABT] $msg\n";	3951	LOG llevInfo, "[ABT] $perl_bt\n";
		3952	LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3645	LOG llevInfo, "[ABT] $_\n" for @bt;	3953	LOG llevInfo, "[ABT] $_\n" for @bt;
3646	--$_log_backtrace;	3954	--$_log_backtrace;
3647	};	3955	};
3648	} else {	3956	} else {
3649	LOG llevInfo, "[ABT] $msg\n";	3957	LOG llevInfo, "[ABT] $msg\n";
3650	LOG llevInfo, "[ABT] [suppressed]\n";	3958	LOG llevInfo, "[ABT] [suppressed]\n";
3651	}	3959	}
3652	}	3960	}
3653		3961
3654	# load additional modules	3962	# load additional modules
3655	use cf::pod;	3963	require "cf/$_.pm" for @EXTRA_MODULES;
3656		3964
3657	END { cf::emergency_save }	3965	END { cf::emergency_save }
3658		3966
3659	1	3967	1
3660		3968

Diff Legend

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