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

Diff Legend

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