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.447 by root, Fri Sep 19 01:39:45 2008 UTC vs.
Revision 1.539 by root, Tue May 4 22:49:21 2010 UTC

1	#	1	#
2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	#	3	#
4	# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	#	5	#
6	# Deliantra is free software: you can redistribute it and/or modify	6	# Deliantra is free software: you can redistribute it and/or modify it under
7	# it under the terms of the GNU General Public License as published by	7	# the terms of the Affero GNU General Public License as published by the
8	# the Free Software Foundation, either version 3 of the License, or	8	# Free Software Foundation, either version 3 of the License, or (at your
9	# (at your option) any later version.	9	# option) any later version.
10	#	10	#
11	# This program is distributed in the hope that it will be useful,	11	# This program is distributed in the hope that it will be useful,
12	# but WITHOUT ANY WARRANTY; without even the implied warranty of	12	# but WITHOUT ANY WARRANTY; without even the implied warranty of
13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14	# GNU General Public License for more details.	14	# GNU General Public License for more details.
15	#	15	#
16	# You should have received a copy of the GNU General Public License	16	# You should have received a copy of the Affero GNU General Public License
17	# along with this program. If not, see <http://www.gnu.org/licenses/>.	17	# and the GNU General Public License along with this program. If not, see
		18	# <http://www.gnu.org/licenses/>.
18	#	19	#
19	# The authors can be reached via e-mail to <support@deliantra.net>	20	# The authors can be reached via e-mail to <support@deliantra.net>
20	#	21	#
21		22
22	package cf;	23	package cf;
23		24
24	use 5.10.0;	25	use common::sense;
25	use utf8;
26	use strict "vars", "subs";
27		26
28	use Symbol;	27	use Symbol;
29	use List::Util;	28	use List::Util;
30	use Socket;	29	use Socket;
31	use EV;	30	use EV;
32	use Opcode;	31	use Opcode;
33	use Safe;	32	use Safe;
34	use Safe::Hole;	33	use Safe::Hole;
35	use Storable ();	34	use Storable ();
		35	use Carp ();
36		36
		37	use Guard ();
37	use Coro ();	38	use Coro ();
38	use Coro::State;	39	use Coro::State;
39	use Coro::Handle;	40	use Coro::Handle;
40	use Coro::EV;	41	use Coro::EV;
41	use Coro::AnyEvent;	42	use Coro::AnyEvent;
42	use Coro::Timer;	43	use Coro::Timer;
43	use Coro::Signal;	44	use Coro::Signal;
44	use Coro::Semaphore;	45	use Coro::Semaphore;
		46	use Coro::SemaphoreSet;
45	use Coro::AnyEvent;	47	use Coro::AnyEvent;
46	use Coro::AIO;	48	use Coro::AIO;
47	use Coro::BDB 1.6;	49	use Coro::BDB 1.6;
48	use Coro::Storable;	50	use Coro::Storable;
49	use Coro::Util ();	51	use Coro::Util ();
50		52
51	use JSON::XS 2.01 ();	53	use JSON::XS 2.01 ();
52	use BDB ();	54	use BDB ();
53	use Data::Dumper;	55	use Data::Dumper;
54	use Digest::MD5;
55	use Fcntl;	56	use Fcntl;
56	use YAML ();	57	use YAML::XS ();
57	use IO::AIO ();	58	use IO::AIO ();
58	use Time::HiRes;	59	use Time::HiRes;
59	use Compress::LZF;	60	use Compress::LZF;
60	use Digest::MD5 ();	61	use Digest::MD5 ();
61		62
…		…
63		64
64	# configure various modules to our taste	65	# configure various modules to our taste
65	#	66	#
66	$Storable::canonical = 1; # reduce rsync transfers	67	$Storable::canonical = 1; # reduce rsync transfers
67	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator	68	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
		69
		70	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
		71
		72	# make sure c-lzf reinitialises itself
		73	Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
68	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later	74	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
69		75
70	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority	76	# strictly for debugging
		77	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
71		78
72	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	79	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
73		80
74	our %COMMAND = ();	81	our %COMMAND = ();
75	our %COMMAND_TIME = ();	82	our %COMMAND_TIME = ();
…		…
78	our %EXTCMD = ();	85	our %EXTCMD = ();
79	our %EXTICMD = ();	86	our %EXTICMD = ();
80	our %EXT_CORO = (); # coroutines bound to extensions	87	our %EXT_CORO = (); # coroutines bound to extensions
81	our %EXT_MAP = (); # pluggable maps	88	our %EXT_MAP = (); # pluggable maps
82		89
83	our $RELOAD; # number of reloads so far	90	our $RELOAD; # number of reloads so far, non-zero while in reload
84	our @EVENT;	91	our @EVENT;
		92	our @REFLECT; # set by XS
		93	our %REFLECT; # set by us
85		94
86	our $CONFDIR = confdir;	95	our $CONFDIR = confdir;
87	our $DATADIR = datadir;	96	our $DATADIR = datadir;
88	our $LIBDIR = "$DATADIR/ext";	97	our $LIBDIR = "$DATADIR/ext";
89	our $PODDIR = "$DATADIR/pod";	98	our $PODDIR = "$DATADIR/pod";
…		…
95	our $RANDOMDIR = "$LOCALDIR/random";	104	our $RANDOMDIR = "$LOCALDIR/random";
96	our $BDBDIR = "$LOCALDIR/db";	105	our $BDBDIR = "$LOCALDIR/db";
97	our $PIDFILE = "$LOCALDIR/pid";	106	our $PIDFILE = "$LOCALDIR/pid";
98	our $RUNTIMEFILE = "$LOCALDIR/runtime";	107	our $RUNTIMEFILE = "$LOCALDIR/runtime";
99		108
100	our %RESOURCE;	109	our %RESOURCE; # unused
		110
		111	our $OUTPUT_RATE_MIN = 3000;
		112	our $OUTPUT_RATE_MAX = 1000000;
		113
		114	our $MAX_LINKS = 32; # how many chained exits to follow
		115	our $VERBOSE_IO = 1;
101		116
102	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	117	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
103	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	118	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
104	our $NEXT_TICK;	119	our $NEXT_TICK;
105	our $USE_FSYNC = 1; # use fsync to write maps - default off	120	our $USE_FSYNC = 1; # use fsync to write maps - default on
106		121
107	our $BDB_DEADLOCK_WATCHER;	122	our $BDB_DEADLOCK_WATCHER;
108	our $BDB_CHECKPOINT_WATCHER;	123	our $BDB_CHECKPOINT_WATCHER;
109	our $BDB_TRICKLE_WATCHER;	124	our $BDB_TRICKLE_WATCHER;
110	our $DB_ENV;	125	our $DB_ENV;
111		126
		127	our @EXTRA_MODULES = qw(pod match mapscript);
		128
112	our %CFG;	129	our %CFG;
113		130
114	our $UPTIME; $UPTIME ||= time;	131	our $UPTIME; $UPTIME ||= time;
115	our $RUNTIME;	132	our $RUNTIME;
116	our $NOW;	133	our $NOW;
…		…
124		141
125	our $LOAD; # a number between 0 (idle) and 1 (too many objects)	142	our $LOAD; # a number between 0 (idle) and 1 (too many objects)
126	our $LOADAVG; # same thing, but with alpha-smoothing	143	our $LOADAVG; # same thing, but with alpha-smoothing
127	our $JITTER; # average jitter	144	our $JITTER; # average jitter
128	our $TICK_START; # for load detecting purposes	145	our $TICK_START; # for load detecting purposes
		146
		147	our @POST_INIT;
		148
		149	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
		150	our $REALLY_UNLOOP; # never set to true, please :)
129		151
130	binmode STDOUT;	152	binmode STDOUT;
131	binmode STDERR;	153	binmode STDERR;
132		154
133	# read virtual server time, if available	155	# read virtual server time, if available
…		…
135	open my $fh, "<", $RUNTIMEFILE	157	open my $fh, "<", $RUNTIMEFILE
136	or die "unable to read $RUNTIMEFILE file: $!";	158	or die "unable to read $RUNTIMEFILE file: $!";
137	$RUNTIME = <$fh> + 0.;	159	$RUNTIME = <$fh> + 0.;
138	}	160	}
139		161
		162	eval "sub TICK() { $TICK } 1" or die;
		163
140	mkdir $_	164	mkdir $_
141	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;	165	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
142		166
143	our $EMERGENCY_POSITION;	167	our $EMERGENCY_POSITION;
144		168
145	sub cf::map::normalise;	169	sub cf::map::normalise;
		170
		171	sub in_main() {
		172	$Coro::current == $Coro::main
		173	}
		174
		175	#############################################################################
		176
		177	%REFLECT = ();
		178	for (@REFLECT) {
		179	my $reflect = JSON::XS::decode_json $_;
		180	$REFLECT{$reflect->{class}} = $reflect;
		181	}
		182
		183	# this is decidedly evil
		184	$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
146		185
147	#############################################################################	186	#############################################################################
148		187
149	=head2 GLOBAL VARIABLES	188	=head2 GLOBAL VARIABLES
150		189
…		…
197	returns directly I<after> the tick processing (and consequently, can only wake one process	236	returns directly I<after> the tick processing (and consequently, can only wake one process
198	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	237	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
199		238
200	=item @cf::INVOKE_RESULTS	239	=item @cf::INVOKE_RESULTS
201		240
202	This array contains the results of the last C<invoke ()> call. When	241	This array contains the results of the last C<invoke ()> call. When
203	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of	242	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
204	that call.	243	that call.
205		244
		245	=item %cf::REFLECT
		246
		247	Contains, for each (C++) class name, a hash reference with information
		248	about object members (methods, scalars, arrays and flags) and other
		249	metadata, which is useful for introspection.
		250
206	=back	251	=back
207		252
208	=cut	253	=cut
209		254
210	BEGIN {	255	sub error(@) { LOG llevError, join "", @_ }
211	*CORE::GLOBAL::warn = sub {	256	sub warn (@) { LOG llevWarn , join "", @_ }
		257	sub info (@) { LOG llevInfo , join "", @_ }
		258	sub debug(@) { LOG llevDebug, join "", @_ }
		259	sub trace(@) { LOG llevTrace, join "", @_ }
		260
		261	$Coro::State::WARNHOOK = sub {
212	my $msg = join "", @_;	262	my $msg = join "", @_;
213		263
214	$msg .= "\n"	264	$msg .= "\n"
215	unless $msg =~ /\n$/;	265	unless $msg =~ /\n$/;
216		266
217	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	267	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
218		268
219	LOG llevError, $msg;	269	LOG llevWarn, $msg;
220	};	270	};
221	}
222		271
223	$Coro::State::DIEHOOK = sub {	272	$Coro::State::DIEHOOK = sub {
224	return unless $^S eq 0; # "eq", not "=="	273	return unless $^S eq 0; # "eq", not "=="
225		274
226	if ($Coro::current == $Coro::main) {#d#	275	error Carp::longmess $_[0];
		276
		277	if (in_main) {#d#
227	warn "DIEHOOK called in main context, Coro bug?\n";#d#	278	error "DIEHOOK called in main context, Coro bug?\n";#d#
228	return;#d#	279	return;#d#
229	}#d#	280	}#d#
230		281
231	# kill coroutine otherwise	282	# kill coroutine otherwise
232	warn Carp::longmess $_[0];
233	Coro::terminate	283	Coro::terminate
234	};	284	};
235
236	$SIG{__DIE__} = sub { }; #d#?
237		285
238	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	286	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
239	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	287	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
240	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	288	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
241	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	289	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
…		…
255	)) {	303	)) {
256	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	304	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
257	}	305	}
258		306
259	$EV::DIED = sub {	307	$EV::DIED = sub {
260	warn "error in event callback: @_";	308	Carp::cluck "error in event callback: @_";
261	};	309	};
262		310
263	#############################################################################	311	#############################################################################
264		312
265	=head2 UTILITY FUNCTIONS	313	=head2 UTILITY FUNCTIONS
…		…
302	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	350	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
303		351
304	sub encode_json($) { $json_coder->encode ($_[0]) }	352	sub encode_json($) { $json_coder->encode ($_[0]) }
305	sub decode_json($) { $json_coder->decode ($_[0]) }	353	sub decode_json($) { $json_coder->decode ($_[0]) }
306		354
		355	=item cf::post_init { BLOCK }
		356
		357	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
		358	but I<before> the server starts ticking again.
		359
		360	The cdoeblock will have a single boolean argument to indicate whether this
		361	is a reload or not.
		362
		363	=cut
		364
		365	sub post_init(&) {
		366	push @POST_INIT, shift;
		367	}
		368
307	=item cf::lock_wait $string	369	=item cf::lock_wait $string
308		370
309	Wait until the given lock is available. See cf::lock_acquire.	371	Wait until the given lock is available. See cf::lock_acquire.
310		372
311	=item my $lock = cf::lock_acquire $string	373	=item my $lock = cf::lock_acquire $string
312		374
313	Wait until the given lock is available and then acquires it and returns	375	Wait until the given lock is available and then acquires it and returns
314	a Coro::guard object. If the guard object gets destroyed (goes out of scope,	376	a L<Guard> object. If the guard object gets destroyed (goes out of scope,
315	for example when the coroutine gets canceled), the lock is automatically	377	for example when the coroutine gets canceled), the lock is automatically
316	returned.	378	returned.
317		379
318	Locks are *not* recursive, locking from the same coro twice results in a	380	Locks are *not* recursive, locking from the same coro twice results in a
319	deadlocked coro.	381	deadlocked coro.
…		…
325		387
326	Return true if the lock is currently active, i.e. somebody has locked it.	388	Return true if the lock is currently active, i.e. somebody has locked it.
327		389
328	=cut	390	=cut
329		391
330	our %LOCK;	392	our $LOCKS = new Coro::SemaphoreSet;
331	our %LOCKER;#d#
332		393
333	sub lock_wait($) {	394	sub lock_wait($) {
334	my ($key) = @_;	395	$LOCKS->wait ($_[0]);
335
336	if ($LOCKER{$key} == $Coro::current) {#d#
337	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
338	return;#d#
339	}#d#
340
341	# wait for lock, if any
342	while ($LOCK{$key}) {
343	push @{ $LOCK{$key} }, $Coro::current;
344	Coro::schedule;
345	}
346	}	396	}
347		397
348	sub lock_acquire($) {	398	sub lock_acquire($) {
349	my ($key) = @_;	399	$LOCKS->guard ($_[0])
350
351	# wait, to be sure we are not locked
352	lock_wait $key;
353
354	$LOCK{$key} = [];
355	$LOCKER{$key} = $Coro::current;#d#
356
357	Coro::guard {
358	delete $LOCKER{$key};#d#
359	# wake up all waiters, to be on the safe side
360	$_->ready for @{ delete $LOCK{$key} };
361	}
362	}	400	}
363		401
364	sub lock_active($) {	402	sub lock_active($) {
365	my ($key) = @_;	403	$LOCKS->count ($_[0]) < 1
366
367	! ! $LOCK{$key}
368	}	404	}
369		405
370	sub freeze_mainloop {	406	sub freeze_mainloop {
371	tick_inhibit_inc;	407	tick_inhibit_inc;
372		408
373	Coro::guard \&tick_inhibit_dec;	409	&Guard::guard (\&tick_inhibit_dec);
374	}	410	}
375		411
376	=item cf::periodic $interval, $cb	412	=item cf::periodic $interval, $cb
377		413
378	Like EV::periodic, but randomly selects a starting point so that the actions	414	Like EV::periodic, but randomly selects a starting point so that the actions
379	get spread over timer.	415	get spread over time.
380		416
381	=cut	417	=cut
382		418
383	sub periodic($$) {	419	sub periodic($$) {
384	my ($interval, $cb) = @_;	420	my ($interval, $cb) = @_;
…		…
401		437
402	=cut	438	=cut
403		439
404	our @SLOT_QUEUE;	440	our @SLOT_QUEUE;
405	our $SLOT_QUEUE;	441	our $SLOT_QUEUE;
		442	our $SLOT_DECAY = 0.9;
406		443
407	$SLOT_QUEUE->cancel if $SLOT_QUEUE;	444	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
408	$SLOT_QUEUE = Coro::async {	445	$SLOT_QUEUE = Coro::async {
409	$Coro::current->desc ("timeslot manager");	446	$Coro::current->desc ("timeslot manager");
410		447
411	my $signal = new Coro::Signal;	448	my $signal = new Coro::Signal;
		449	my $busy;
412		450
413	while () {	451	while () {
414	next_job:	452	next_job:
		453
415	my $avail = cf::till_tick;	454	my $avail = cf::till_tick;
416	if ($avail > 0.01) {	455
417	for (0 .. $#SLOT_QUEUE) {	456	for (0 .. $#SLOT_QUEUE) {
418	if ($SLOT_QUEUE[$_][0] < $avail) {	457	if ($SLOT_QUEUE[$_][0] <= $avail) {
		458	$busy = 0;
419	my $job = splice @SLOT_QUEUE, $_, 1, ();	459	my $job = splice @SLOT_QUEUE, $_, 1, ();
420	$job->[2]->send;	460	$job->[2]->send;
421	Coro::cede;	461	Coro::cede;
422	goto next_job;	462	goto next_job;
423	}	463	} else {
		464	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
424	}	465	}
425	}	466	}
426		467
427	if (@SLOT_QUEUE) {	468	if (@SLOT_QUEUE) {
428	# we do not use wait_for_tick() as it returns immediately when tick is inactive	469	# we do not use wait_for_tick() as it returns immediately when tick is inactive
429	push @cf::WAIT_FOR_TICK, $signal;	470	push @cf::WAIT_FOR_TICK, $signal;
430	$signal->wait;	471	$signal->wait;
431	} else {	472	} else {
		473	$busy = 0;
432	Coro::schedule;	474	Coro::schedule;
433	}	475	}
434	}	476	}
435	};	477	};
436		478
437	sub get_slot($;$$) {	479	sub get_slot($;$$) {
438	return if tick_inhibit || $Coro::current == $Coro::main;	480	return if tick_inhibit || $Coro::current == $Coro::main;
439		481
440	my ($time, $pri, $name) = @_;	482	my ($time, $pri, $name) = @_;
441		483
442	$time = $TICK * .6 if $time > $TICK * .6;	484	$time = clamp $time, 0.01, $TICK * .6;
		485
443	my $sig = new Coro::Signal;	486	my $sig = new Coro::Signal;
444		487
445	push @SLOT_QUEUE, [$time, $pri, $sig, $name];	488	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
446	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;	489	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
447	$SLOT_QUEUE->ready;	490	$SLOT_QUEUE->ready;
…		…
473	=cut	516	=cut
474		517
475	sub sync_job(&) {	518	sub sync_job(&) {
476	my ($job) = @_;	519	my ($job) = @_;
477		520
478	if ($Coro::current == $Coro::main) {	521	if (in_main) {
479	my $time = EV::time;	522	my $time = AE::time;
480		523
481	# this is the main coro, too bad, we have to block	524	# this is the main coro, too bad, we have to block
482	# till the operation succeeds, freezing the server :/	525	# till the operation succeeds, freezing the server :/
483		526
484	LOG llevError, Carp::longmess "sync job";#d#	527	#LOG llevError, Carp::longmess "sync job";#d#
485		528
486	my $freeze_guard = freeze_mainloop;	529	my $freeze_guard = freeze_mainloop;
487		530
488	my $busy = 1;	531	my $busy = 1;
489	my @res;	532	my @res;
490		533
491	(async {	534	(async {
492	$Coro::current->desc ("sync job coro");	535	$Coro::current->desc ("sync job coro");
493	@res = eval { $job->() };	536	@res = eval { $job->() };
494	warn $@ if $@;	537	error $@ if $@;
495	undef $busy;	538	undef $busy;
496	})->prio (Coro::PRIO_MAX);	539	})->prio (Coro::PRIO_MAX);
497		540
498	while ($busy) {	541	while ($busy) {
499	if (Coro::nready) {	542	if (Coro::nready) {
…		…
501	} else {	544	} else {
502	EV::loop EV::LOOP_ONESHOT;	545	EV::loop EV::LOOP_ONESHOT;
503	}	546	}
504	}	547	}
505		548
506	my $time = EV::time - $time;	549	my $time = AE::time - $time;
507		550
508	$TICK_START += $time; # do not account sync jobs to server load	551	$TICK_START += $time; # do not account sync jobs to server load
509		552
510	wantarray ? @res : $res[0]	553	wantarray ? @res : $res[0]
511	} else {	554	} else {
…		…
555	reset_signals;	598	reset_signals;
556	&$cb	599	&$cb
557	}, @args;	600	}, @args;
558		601
559	wantarray ? @res : $res[-1]	602	wantarray ? @res : $res[-1]
		603	}
		604
		605	sub objinfo {
		606	(
		607	"counter value" => cf::object::object_count,
		608	"objects created" => cf::object::create_count,
		609	"objects destroyed" => cf::object::destroy_count,
		610	"freelist size" => cf::object::free_count,
		611	"allocated objects" => cf::object::objects_size,
		612	"active objects" => cf::object::actives_size,
		613	)
560	}	614	}
561		615
562	=item $coin = coin_from_name $name	616	=item $coin = coin_from_name $name
563		617
564	=cut	618	=cut
…		…
601	within each server.	655	within each server.
602		656
603	=cut	657	=cut
604		658
605	sub db_table($) {	659	sub db_table($) {
		660	cf::error "db_get called from main context"
		661	if $Coro::current == $Coro::main;
		662
606	my ($name) = @_;	663	my ($name) = @_;
607	my $db = BDB::db_create $DB_ENV;	664	my $db = BDB::db_create $DB_ENV;
608		665
609	eval {	666	eval {
610	$db->set_flags (BDB::CHKSUM);	667	$db->set_flags (BDB::CHKSUM);
…		…
620	}	677	}
621		678
622	our $DB;	679	our $DB;
623		680
624	sub db_init {	681	sub db_init {
625	cf::sync_job {
626	$DB ||= db_table "db";	682	$DB ||= db_table "db";
627	};
628	}	683	}
629		684
630	sub db_get($$) {	685	sub db_get($$) {
631	my $key = "$_[0]/$_[1]";	686	my $key = "$_[0]/$_[1]";
632		687
633	cf::sync_job {	688	cf::error "db_get called from main context"
		689	if $Coro::current == $Coro::main;
		690
634	BDB::db_get $DB, undef, $key, my $data;	691	BDB::db_get $DB, undef, $key, my $data;
635		692
636	$! ? ()	693	$! ? ()
637	: $data	694	: $data
638	}
639	}	695	}
640		696
641	sub db_put($$$) {	697	sub db_put($$$) {
642	BDB::dbreq_pri 4;	698	BDB::dbreq_pri 4;
643	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	699	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
699		755
700	my $t1 = Time::HiRes::time;	756	my $t1 = Time::HiRes::time;
701	my $data = $process->(\@data);	757	my $data = $process->(\@data);
702	my $t2 = Time::HiRes::time;	758	my $t2 = Time::HiRes::time;
703		759
704	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	760	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
705		761
706	db_put cache => "$id/data", $data;	762	db_put cache => "$id/data", $data;
707	db_put cache => "$id/md5" , $md5;	763	db_put cache => "$id/md5" , $md5;
708	db_put cache => "$id/meta", $meta;	764	db_put cache => "$id/meta", $meta;
709		765
…		…
719		775
720	=cut	776	=cut
721		777
722	sub datalog($@) {	778	sub datalog($@) {
723	my ($type, %kv) = @_;	779	my ($type, %kv) = @_;
724	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	780	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
725	}	781	}
726		782
727	=back	783	=back
728		784
729	=cut	785	=cut
…		…
924		980
925	} elsif (exists $cb_id{$type}) {	981	} elsif (exists $cb_id{$type}) {
926	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	982	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
927		983
928	} elsif (ref $type) {	984	} elsif (ref $type) {
929	warn "attaching objects not supported, ignoring.\n";	985	error "attaching objects not supported, ignoring.\n";
930		986
931	} else {	987	} else {
932	shift @arg;	988	shift @arg;
933	warn "attach argument '$type' not supported, ignoring.\n";	989	error "attach argument '$type' not supported, ignoring.\n";
934	}	990	}
935	}	991	}
936	}	992	}
937		993
938	sub _object_attach {	994	sub _object_attach {
…		…
948	_attach $registry, $klass, @attach;	1004	_attach $registry, $klass, @attach;
949	}	1005	}
950		1006
951	$obj->{$name} = \%arg;	1007	$obj->{$name} = \%arg;
952	} else {	1008	} else {
953	warn "object uses attachment '$name' which is not available, postponing.\n";	1009	info "object uses attachment '$name' which is not available, postponing.\n";
954	}	1010	}
955		1011
956	$obj->{_attachment}{$name} = undef;	1012	$obj->{_attachment}{$name} = undef;
957	}	1013	}
958		1014
…		…
1017		1073
1018	for (@$callbacks) {	1074	for (@$callbacks) {
1019	eval { &{$_->[1]} };	1075	eval { &{$_->[1]} };
1020		1076
1021	if ($@) {	1077	if ($@) {
1022	warn "$@";
1023	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1078	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1024	override;	1079	override;
1025	}	1080	}
1026		1081
1027	return 1 if $override;	1082	return 1 if $override;
1028	}	1083	}
…		…
1107	for (@$attach) {	1162	for (@$attach) {
1108	my ($klass, @attach) = @$_;	1163	my ($klass, @attach) = @$_;
1109	_attach $registry, $klass, @attach;	1164	_attach $registry, $klass, @attach;
1110	}	1165	}
1111	} else {	1166	} else {
1112	warn "object uses attachment '$name' that is not available, postponing.\n";	1167	info "object uses attachment '$name' that is not available, postponing.\n";
1113	}	1168	}
1114	}	1169	}
1115	}	1170	}
1116		1171
1117	cf::attachable->attach (	1172	cf::attachable->attach (
…		…
1144	my ($filename, $rdata, $objs) = @_;	1199	my ($filename, $rdata, $objs) = @_;
1145		1200
1146	sync_job {	1201	sync_job {
1147	if (length $$rdata) {	1202	if (length $$rdata) {
1148	utf8::decode (my $decname = $filename);	1203	utf8::decode (my $decname = $filename);
1149	warn sprintf "saving %s (%d,%d)\n",	1204	trace sprintf "saving %s (%d,%d)\n",
1150	$decname, length $$rdata, scalar @$objs;	1205	$decname, length $$rdata, scalar @$objs
		1206	if $VERBOSE_IO;
1151		1207
1152	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1208	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1153	aio_chmod $fh, SAVE_MODE;	1209	aio_chmod $fh, SAVE_MODE;
1154	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1210	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1155	aio_fsync $fh if $cf::USE_FSYNC;	1211	if ($cf::USE_FSYNC) {
		1212	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;
		1213	aio_fsync $fh;
		1214	}
1156	aio_close $fh;	1215	aio_close $fh;
1157		1216
1158	if (@$objs) {	1217	if (@$objs) {
1159	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {	1218	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1160	aio_chmod $fh, SAVE_MODE;	1219	aio_chmod $fh, SAVE_MODE;
1161	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };	1220	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1162	aio_write $fh, 0, (length $data), $data, 0;	1221	aio_write $fh, 0, (length $data), $data, 0;
1163	aio_fsync $fh if $cf::USE_FSYNC;	1222	if ($cf::USE_FSYNC) {
		1223	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;
		1224	aio_fsync $fh;
		1225	}
1164	aio_close $fh;	1226	aio_close $fh;
1165	aio_rename "$filename.pst~", "$filename.pst";	1227	aio_rename "$filename.pst~", "$filename.pst";
1166	}	1228	}
1167	} else {	1229	} else {
1168	aio_unlink "$filename.pst";	1230	aio_unlink "$filename.pst";
1169	}	1231	}
1170		1232
1171	aio_rename "$filename~", $filename;	1233	aio_rename "$filename~", $filename;
		1234
		1235	$filename =~ s%/[^/]+$%%;
		1236	aio_pathsync $filename if $cf::USE_FSYNC;
1172	} else {	1237	} else {
1173	warn "FATAL: $filename~: $!\n";	1238	error "unable to save objects: $filename~: $!\n";
1174	}	1239	}
1175	} else {	1240	} else {
1176	aio_unlink $filename;	1241	aio_unlink $filename;
1177	aio_unlink "$filename.pst";	1242	aio_unlink "$filename.pst";
1178	}	1243	}
…		…
1202	my $st = eval { Coro::Storable::thaw $av };	1267	my $st = eval { Coro::Storable::thaw $av };
1203	$av = $st->{objs};	1268	$av = $st->{objs};
1204	}	1269	}
1205		1270
1206	utf8::decode (my $decname = $filename);	1271	utf8::decode (my $decname = $filename);
1207	warn sprintf "loading %s (%d,%d)\n",	1272	trace sprintf "loading %s (%d,%d)\n",
1208	$decname, length $data, scalar @{$av || []};	1273	$decname, length $data, scalar @{$av || []}
		1274	if $VERBOSE_IO;
1209		1275
1210	($data, $av)	1276	($data, $av)
1211	}	1277	}
1212		1278
1213	=head2 COMMAND CALLBACKS	1279	=head2 COMMAND CALLBACKS
…		…
1269	my ($name, $cb) = @_;	1335	my ($name, $cb) = @_;
1270		1336
1271	$EXTICMD{$name} = $cb;	1337	$EXTICMD{$name} = $cb;
1272	}	1338	}
1273		1339
		1340	use File::Glob ();
		1341
1274	cf::player->attach (	1342	cf::player->attach (
1275	on_command => sub {	1343	on_unknown_command => sub {
1276	my ($pl, $name, $params) = @_;	1344	my ($pl, $name, $params) = @_;
1277		1345
1278	my $cb = $COMMAND{$name}	1346	my $cb = $COMMAND{$name}
1279	or return;	1347	or return;
1280		1348
…		…
1303		1371
1304	$pl->ext_reply ($reply, @reply)	1372	$pl->ext_reply ($reply, @reply)
1305	if $reply;	1373	if $reply;
1306		1374
1307	} else {	1375	} else {
1308	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1376	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1309	}	1377	}
1310		1378
1311	cf::override;	1379	cf::override;
1312	},	1380	},
1313	);	1381	);
1314		1382
		1383	# "readahead" all extensions
		1384	sub cache_extensions {
		1385	my $grp = IO::AIO::aio_group;
		1386
		1387	add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
		1388	for (grep /\.ext$/, @{$_[0]}) {
		1389	add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
		1390	}
		1391	};
		1392
		1393	$grp
		1394	}
		1395
1315	sub load_extensions {	1396	sub load_extensions {
		1397	info "loading extensions...";
		1398
1316	cf::sync_job {	1399	cf::sync_job {
1317	my %todo;	1400	my %todo;
1318		1401
1319	for my $path (<$LIBDIR/*.ext>) {	1402	for my $path (<$LIBDIR/*.ext>) {
1320	next unless -r $path;	1403	next unless -r $path;
…		…
1338		1421
1339	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1422	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1340	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1423	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1341		1424
1342	$ext{source} =	1425	$ext{source} =
1343	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1426	"package $pkg; use common::sense;\n"
1344	. "#line 1 \"$path\"\n{\n"	1427	. "#line 1 \"$path\"\n{\n"
1345	. $source	1428	. $source
1346	. "\n};\n1";	1429	. "\n};\n1";
1347		1430
1348	$todo{$base} = \%ext;	1431	$todo{$base} = \%ext;
1349	}	1432	}
1350		1433
		1434	my $pass = 0;
1351	my %done;	1435	my %done;
1352	while (%todo) {	1436	while (%todo) {
1353	my $progress;	1437	my $progress;
1354		1438
		1439	++$pass;
		1440
		1441	ext:
1355	while (my ($k, $v) = each %todo) {	1442	while (my ($k, $v) = each %todo) {
1356	for (split /,\s*/, $v->{meta}{depends}) {	1443	for (split /,\s*/, $v->{meta}{depends}) {
1357	goto skip	1444	next ext
1358	unless exists $done{$_};	1445	unless exists $done{$_};
1359	}	1446	}
1360		1447
1361	warn "... loading '$k' into '$v->{pkg}'\n";	1448	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1362		1449
1363	unless (eval $v->{source}) {	1450	my $active = eval $v->{source};
		1451
		1452	if (length $@) {
1364	my $msg = $@ ? "$v->{path}: $@\n"	1453	error "$v->{path}: $@\n";
1365	: "$v->{base}: extension inactive.\n";	1454	undef $@; # work around perl 5.10.0 utf-8 caching bug
1366		1455
1367	if (exists $v->{meta}{mandatory}) {
1368	warn $msg;
1369	cf::cleanup "mandatory extension failed to load, exiting.";	1456	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1370	}	1457	if exists $v->{meta}{mandatory};
1371		1458
1372	warn $msg;	1459	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
		1460	delete $todo{$k};
		1461	} else {
		1462	$done{$k} = delete $todo{$k};
		1463	push @EXTS, $v->{pkg};
		1464	$progress = 1;
		1465
		1466	info "$v->{base}: extension inactive.\n"
		1467	unless $active;
1373	}	1468	}
1374
1375	$done{$k} = delete $todo{$k};
1376	push @EXTS, $v->{pkg};
1377	$progress = 1;
1378	}	1469	}
1379		1470
1380	skip:	1471	unless ($progress) {
1381	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"	1472	warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1382	unless $progress;	1473
		1474	while (my ($k, $v) = each %todo) {
		1475	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
		1476	if exists $v->{meta}{mandatory};
		1477	}
		1478	}
1383	}	1479	}
1384	};	1480	};
1385	}	1481	}
1386		1482
1387	#############################################################################	1483	#############################################################################
…		…
1441		1537
1442	sub exists($) {	1538	sub exists($) {
1443	my ($login) = @_;	1539	my ($login) = @_;
1444		1540
1445	$cf::PLAYER{$login}	1541	$cf::PLAYER{$login}
1446	or cf::sync_job { !aio_stat path $login }	1542	or !aio_stat path $login
1447	}	1543	}
1448		1544
1449	sub find($) {	1545	sub find($) {
1450	return $cf::PLAYER{$_[0]} || do {	1546	return $cf::PLAYER{$_[0]} || do {
1451	my $login = $_[0];	1547	my $login = $_[0];
…		…
1471	$cf::PLAYER{$login} = $pl	1567	$cf::PLAYER{$login} = $pl
1472	}	1568	}
1473	}	1569	}
1474	}	1570	}
1475		1571
		1572	cf::player->attach (
		1573	on_load => sub {
		1574	my ($pl, $path) = @_;
		1575
		1576	# restore slots saved in save, below
		1577	my $slots = delete $pl->{_slots};
		1578
		1579	$pl->ob->current_weapon ($slots->[0]);
		1580	$pl->combat_ob ($slots->[1]);
		1581	$pl->ranged_ob ($slots->[2]);
		1582	},
		1583	);
		1584
1476	sub save($) {	1585	sub save($) {
1477	my ($pl) = @_;	1586	my ($pl) = @_;
1478		1587
1479	return if $pl->{deny_save};	1588	return if $pl->{deny_save};
1480		1589
…		…
1485		1594
1486	aio_mkdir playerdir $pl, 0770;	1595	aio_mkdir playerdir $pl, 0770;
1487	$pl->{last_save} = $cf::RUNTIME;	1596	$pl->{last_save} = $cf::RUNTIME;
1488		1597
1489	cf::get_slot 0.01;	1598	cf::get_slot 0.01;
		1599
		1600	# save slots, to be restored later
		1601	local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1490		1602
1491	$pl->save_pl ($path);	1603	$pl->save_pl ($path);
1492	cf::cede_to_tick;	1604	cf::cede_to_tick;
1493	}	1605	}
1494		1606
…		…
1531	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1643	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1532		1644
1533	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1645	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1534	$pl->deactivate;	1646	$pl->deactivate;
1535	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1647	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1536	$pl->ob->check_score;
1537	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1648	$pl->invoke (cf::EVENT_PLAYER_QUIT);
1538	$pl->ns->destroy if $pl->ns;	1649	$pl->ns->destroy if $pl->ns;
1539		1650
1540	my $path = playerdir $pl;	1651	my $path = playerdir $pl;
1541	my $temp = "$path~$cf::RUNTIME~deleting~";	1652	my $temp = "$path~$cf::RUNTIME~deleting~";
…		…
1596	\@logins	1707	\@logins
1597	}	1708	}
1598		1709
1599	=item $player->maps	1710	=item $player->maps
1600		1711
		1712	=item cf::player::maps $login
		1713
1601	Returns an arrayref of map paths that are private for this	1714	Returns an arrayref of map paths that are private for this
1602	player. May block.	1715	player. May block.
1603		1716
1604	=cut	1717	=cut
1605		1718
…		…
1667	=cut	1780	=cut
1668		1781
1669	sub find_by_path($) {	1782	sub find_by_path($) {
1670	my ($path) = @_;	1783	my ($path) = @_;
1671		1784
		1785	$path =~ s/^~[^\/]*//; # skip ~login
		1786
1672	my ($match, $specificity);	1787	my ($match, $specificity);
1673		1788
1674	for my $region (list) {	1789	for my $region (list) {
1675	if ($region->{match} && $path =~ $region->{match}) {	1790	if ($region->{match} && $path =~ $region->{match}) {
1676	($match, $specificity) = ($region, $region->specificity)	1791	($match, $specificity) = ($region, $region->specificity)
…		…
1707	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	1822	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1708		1823
1709	# mit "rum" bekleckern, nicht	1824	# mit "rum" bekleckern, nicht
1710	$self->_create_random_map (	1825	$self->_create_random_map (
1711	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},	1826	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1712	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},	1827	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1713	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},	1828	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1714	$rmp->{exit_on_final_map},	1829	$rmp->{exit_on_final_map},
1715	$rmp->{xsize}, $rmp->{ysize},	1830	$rmp->{xsize}, $rmp->{ysize},
1716	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},	1831	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1717	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},	1832	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
…		…
1732		1847
1733	sub register {	1848	sub register {
1734	my (undef, $regex, $prio) = @_;	1849	my (undef, $regex, $prio) = @_;
1735	my $pkg = caller;	1850	my $pkg = caller;
1736		1851
1737	no strict;
1738	push @{"$pkg\::ISA"}, __PACKAGE__;	1852	push @{"$pkg\::ISA"}, __PACKAGE__;
1739		1853
1740	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	1854	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1741	}	1855	}
1742		1856
1743	# also paths starting with '/'	1857	# also paths starting with '/'
1744	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	1858	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1745		1859
1746	sub thawer_merge {	1860	sub thawer_merge {
1747	my ($self, $merge) = @_;	1861	my ($self, $merge) = @_;
1748		1862
1749	# we have to keep some variables in memory intact	1863	# we have to keep some variables in memory intact
…		…
1847		1961
1848	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;	1962	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1849	"$UNIQUEDIR/$path"	1963	"$UNIQUEDIR/$path"
1850	}	1964	}
1851		1965
1852	# and all this just because we cannot iterate over
1853	# all maps in C++...
1854	sub change_all_map_light {
1855	my ($change) = @_;
1856
1857	$_->change_map_light ($change)
1858	for grep $_->outdoor, values %cf::MAP;
1859	}
1860
1861	sub decay_objects {	1966	sub decay_objects {
1862	my ($self) = @_;	1967	my ($self) = @_;
1863		1968
1864	return if $self->{deny_reset};	1969	return if $self->{deny_reset};
1865		1970
…		…
1947	sub find {	2052	sub find {
1948	my ($path, $origin) = @_;	2053	my ($path, $origin) = @_;
1949		2054
1950	$path = normalise $path, $origin && $origin->path;	2055	$path = normalise $path, $origin && $origin->path;
1951		2056
1952	cf::lock_wait "map_data:$path";#d#remove	2057	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1953	cf::lock_wait "map_find:$path";	2058	my $guard2 = cf::lock_acquire "map_find:$path";
1954		2059
1955	$cf::MAP{$path} || do {	2060	$cf::MAP{$path} || do {
1956	my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1957	my $guard2 = cf::lock_acquire "map_find:$path";
1958
1959	my $map = new_from_path cf::map $path	2061	my $map = new_from_path cf::map $path
1960	or return;	2062	or return;
1961		2063
1962	$map->{last_save} = $cf::RUNTIME;	2064	$map->{last_save} = $cf::RUNTIME;
1963		2065
…		…
1975		2077
1976	$cf::MAP{$path} = $map	2078	$cf::MAP{$path} = $map
1977	}	2079	}
1978	}	2080	}
1979		2081
1980	sub pre_load { }	2082	sub pre_load { }
1981	sub post_load { }	2083	#sub post_load { } # XS
1982		2084
1983	sub load {	2085	sub load {
1984	my ($self) = @_;	2086	my ($self) = @_;
1985		2087
1986	local $self->{deny_reset} = 1; # loading can take a long time	2088	local $self->{deny_reset} = 1; # loading can take a long time
…		…
2031	unless ($self->{deny_activate}) {	2133	unless ($self->{deny_activate}) {
2032	$self->decay_objects;	2134	$self->decay_objects;
2033	$self->fix_auto_apply;	2135	$self->fix_auto_apply;
2034	$self->update_buttons;	2136	$self->update_buttons;
2035	cf::cede_to_tick;	2137	cf::cede_to_tick;
2036	$self->set_darkness_map;
2037	cf::cede_to_tick;
2038	$self->activate;	2138	$self->activate;
2039	}	2139	}
2040		2140
2041	$self->{last_save} = $cf::RUNTIME;	2141	$self->{last_save} = $cf::RUNTIME;
2042	$self->last_access ($cf::RUNTIME);	2142	$self->last_access ($cf::RUNTIME);
…		…
2045	}	2145	}
2046		2146
2047	$self->post_load;	2147	$self->post_load;
2048	}	2148	}
2049		2149
		2150	# customize the map for a given player, i.e.
		2151	# return the _real_ map. used by e.g. per-player
		2152	# maps to change the path to ~playername/mappath
2050	sub customise_for {	2153	sub customise_for {
2051	my ($self, $ob) = @_;	2154	my ($self, $ob) = @_;
2052		2155
2053	return find "~" . $ob->name . "/" . $self->{path}	2156	return find "~" . $ob->name . "/" . $self->{path}
2054	if $self->per_player;	2157	if $self->per_player;
…		…
2070	or next;	2173	or next;
2071	$neigh = find $neigh, $map	2174	$neigh = find $neigh, $map
2072	or next;	2175	or next;
2073	$neigh->load;	2176	$neigh->load;
2074		2177
		2178	# now find the diagonal neighbours
2075	push @neigh,	2179	push @neigh,
2076	[$neigh->tile_path (($_ + 3) % 4), $neigh],	2180	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2077	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2181	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2078	}	2182	}
2079		2183
…		…
2086	}	2190	}
2087		2191
2088	sub find_sync {	2192	sub find_sync {
2089	my ($path, $origin) = @_;	2193	my ($path, $origin) = @_;
2090		2194
2091	cf::sync_job { find $path, $origin }	2195	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
		2196	if $Coro::current == $Coro::main;
		2197
		2198	find $path, $origin
2092	}	2199	}
2093		2200
2094	sub do_load_sync {	2201	sub do_load_sync {
2095	my ($map) = @_;	2202	my ($map) = @_;
2096		2203
2097	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2204	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2098	if $Coro::current == $Coro::main;	2205	if $Coro::current == $Coro::main;
2099		2206
2100	cf::sync_job { $map->load };	2207	$map->load;
2101	}	2208	}
2102		2209
2103	our %MAP_PREFETCH;	2210	our %MAP_PREFETCH;
2104	our $MAP_PREFETCHER = undef;	2211	our $MAP_PREFETCHER = undef;
2105		2212
…		…
2131	$MAP_PREFETCHER->prio (6);	2238	$MAP_PREFETCHER->prio (6);
2132		2239
2133	()	2240	()
2134	}	2241	}
2135		2242
		2243	# common code, used by both ->save and ->swapout
2136	sub save {	2244	sub _save {
2137	my ($self) = @_;	2245	my ($self) = @_;
2138
2139	my $lock = cf::lock_acquire "map_data:$self->{path}";
2140		2246
2141	$self->{last_save} = $cf::RUNTIME;	2247	$self->{last_save} = $cf::RUNTIME;
2142		2248
2143	return unless $self->dirty;	2249	return unless $self->dirty;
2144		2250
…		…
2164	} else {	2270	} else {
2165	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);	2271	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2166	}	2272	}
2167	}	2273	}
2168		2274
		2275	sub save {
		2276	my ($self) = @_;
		2277
		2278	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2279
		2280	$self->_save;
		2281	}
		2282
2169	sub swap_out {	2283	sub swap_out {
2170	my ($self) = @_;	2284	my ($self) = @_;
2171		2285
2172	# save first because save cedes
2173	$self->save;
2174
2175	my $lock = cf::lock_acquire "map_data:$self->{path}";	2286	my $lock = cf::lock_acquire "map_data:$self->{path}";
2176		2287
2177	return if $self->players;
2178	return if $self->in_memory != cf::MAP_ACTIVE;	2288	return if $self->in_memory != cf::MAP_ACTIVE;
2179	return if $self->{deny_save};	2289	return if $self->{deny_save};
		2290	return if $self->players;
2180		2291
		2292	# first deactivate the map and "unlink" it from the core
		2293	$self->deactivate;
		2294	$_->clear_links_to ($self) for values %cf::MAP;
2181	$self->in_memory (cf::MAP_SWAPPED);	2295	$self->in_memory (cf::MAP_SWAPPED);
		2296
		2297	# then atomically save
		2298	$self->_save;
		2299
		2300	# then free the map
		2301	$self->clear;
		2302	}
		2303
		2304	sub reset_at {
		2305	my ($self) = @_;
		2306
		2307	# TODO: safety, remove and allow resettable per-player maps
		2308	return 1e99 if $self->{deny_reset};
		2309
		2310	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
		2311	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
		2312
		2313	$time + $to
		2314	}
		2315
		2316	sub should_reset {
		2317	my ($self) = @_;
		2318
		2319	$self->reset_at <= $cf::RUNTIME
		2320	}
		2321
		2322	sub reset {
		2323	my ($self) = @_;
		2324
		2325	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2326
		2327	return if $self->players;
		2328
		2329	cf::trace "resetting map ", $self->path, "\n";
		2330
		2331	$self->in_memory (cf::MAP_SWAPPED);
		2332
		2333	# need to save uniques path
		2334	unless ($self->{deny_save}) {
		2335	my $uniq = $self->uniq_path; utf8::encode $uniq;
		2336
		2337	$self->_save_objects ($uniq, cf::IO_UNIQUES)
		2338	if $uniq;
		2339	}
		2340
		2341	delete $cf::MAP{$self->path};
2182		2342
2183	$self->deactivate;	2343	$self->deactivate;
2184	$_->clear_links_to ($self) for values %cf::MAP;	2344	$_->clear_links_to ($self) for values %cf::MAP;
2185	$self->clear;	2345	$self->clear;
2186	}
2187
2188	sub reset_at {
2189	my ($self) = @_;
2190
2191	# TODO: safety, remove and allow resettable per-player maps
2192	return 1e99 if $self->{deny_reset};
2193
2194	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2195	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2196
2197	$time + $to
2198	}
2199
2200	sub should_reset {
2201	my ($self) = @_;
2202
2203	$self->reset_at <= $cf::RUNTIME
2204	}
2205
2206	sub reset {
2207	my ($self) = @_;
2208
2209	my $lock = cf::lock_acquire "map_data:$self->{path}";
2210
2211	return if $self->players;
2212
2213	warn "resetting map ", $self->path;
2214
2215	$self->in_memory (cf::MAP_SWAPPED);
2216
2217	# need to save uniques path
2218	unless ($self->{deny_save}) {
2219	my $uniq = $self->uniq_path; utf8::encode $uniq;
2220
2221	$self->_save_objects ($uniq, cf::IO_UNIQUES)
2222	if $uniq;
2223	}
2224
2225	delete $cf::MAP{$self->path};
2226
2227	$self->deactivate;
2228	$_->clear_links_to ($self) for values %cf::MAP;
2229	$self->clear;
2230		2346
2231	$self->unlink_save;	2347	$self->unlink_save;
2232	$self->destroy;	2348	$self->destroy;
2233	}	2349	}
2234		2350
…		…
2242		2358
2243	delete $cf::MAP{$self->path};	2359	delete $cf::MAP{$self->path};
2244		2360
2245	$self->unlink_save;	2361	$self->unlink_save;
2246		2362
2247	bless $self, "cf::map";	2363	bless $self, "cf::map::wrap";
2248	delete $self->{deny_reset};	2364	delete $self->{deny_reset};
2249	$self->{deny_save} = 1;	2365	$self->{deny_save} = 1;
2250	$self->reset_timeout (1);	2366	$self->reset_timeout (1);
2251	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2367	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2252		2368
…		…
2309	: normalise $_	2425	: normalise $_
2310	} @{ aio_readdir $UNIQUEDIR or [] }	2426	} @{ aio_readdir $UNIQUEDIR or [] }
2311	]	2427	]
2312	}	2428	}
2313		2429
		2430	=item cf::map::static_maps
		2431
		2432	Returns an arrayref if paths of all static maps (all preinstalled F<.map>
		2433	file in the shared directory excluding F</styles> and F</editor>). May
		2434	block.
		2435
		2436	=cut
		2437
		2438	sub static_maps() {
		2439	my @dirs = "";
		2440	my @maps;
		2441
		2442	while (@dirs) {
		2443	my $dir = shift @dirs;
		2444
		2445	next if $dir eq "/styles" || $dir eq "/editor";
		2446
		2447	my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
		2448	or return;
		2449
		2450	for (@$files) {
		2451	s/\.map$// or next;
		2452	utf8::decode $_;
		2453	push @maps, "$dir/$_";
		2454	}
		2455
		2456	push @dirs, map "$dir/$_", @$dirs;
		2457	}
		2458
		2459	\@maps
		2460	}
		2461
2314	=back	2462	=back
2315		2463
2316	=head3 cf::object	2464	=head3 cf::object
2317		2465
2318	=cut	2466	=cut
…		…
2383		2531
2384	our $SAY_CHANNEL = {	2532	our $SAY_CHANNEL = {
2385	id => "say",	2533	id => "say",
2386	title => "Map",	2534	title => "Map",
2387	reply => "say ",	2535	reply => "say ",
2388	tooltip => "Things said to and replied from npcs near you and other players on the same map only.",	2536	tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2389	};	2537	};
2390		2538
2391	our $CHAT_CHANNEL = {	2539	our $CHAT_CHANNEL = {
2392	id => "chat",	2540	id => "chat",
2393	title => "Chat",	2541	title => "Chat",
…		…
2450		2598
2451	Freezes the player and moves him/her to a special map (C<{link}>).	2599	Freezes the player and moves him/her to a special map (C<{link}>).
2452		2600
2453	The player should be reasonably safe there for short amounts of time (e.g.	2601	The player should be reasonably safe there for short amounts of time (e.g.
2454	for loading a map). You I<MUST> call C<leave_link> as soon as possible,	2602	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2455	though, as the palyer cannot control the character while it is on the link	2603	though, as the player cannot control the character while it is on the link
2456	map.	2604	map.
2457		2605
2458	Will never block.	2606	Will never block.
2459		2607
2460	=item $player_object->leave_link ($map, $x, $y)	2608	=item $player_object->leave_link ($map, $x, $y)
…		…
2481	sub cf::object::player::enter_link {	2629	sub cf::object::player::enter_link {
2482	my ($self) = @_;	2630	my ($self) = @_;
2483		2631
2484	$self->deactivate_recursive;	2632	$self->deactivate_recursive;
2485		2633
		2634	++$self->{_link_recursion};
		2635
2486	return if UNIVERSAL::isa $self->map, "ext::map_link";	2636	return if UNIVERSAL::isa $self->map, "ext::map_link";
2487		2637
2488	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2638	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2489	if $self->map && $self->map->{path} ne "{link}";	2639	if $self->map && $self->map->{path} ne "{link}";
2490		2640
2491	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2641	$self->enter_map ($LINK_MAP || link_map, 3, 3);
2492	}	2642	}
2493		2643
2494	sub cf::object::player::leave_link {	2644	sub cf::object::player::leave_link {
2495	my ($self, $map, $x, $y) = @_;	2645	my ($self, $map, $x, $y) = @_;
2496		2646
…		…
2513	($x, $y) = (-1, -1)	2663	($x, $y) = (-1, -1)
2514	unless (defined $x) && (defined $y);	2664	unless (defined $x) && (defined $y);
2515		2665
2516	# use -1 or undef as default coordinates, not 0, 0	2666	# use -1 or undef as default coordinates, not 0, 0
2517	($x, $y) = ($map->enter_x, $map->enter_y)	2667	($x, $y) = ($map->enter_x, $map->enter_y)
2518	if $x <=0 && $y <= 0;	2668	if $x <= 0 && $y <= 0;
2519		2669
2520	$map->load;	2670	$map->load;
2521	$map->load_neighbours;	2671	$map->load_neighbours;
2522		2672
2523	return unless $self->contr->active;	2673	return unless $self->contr->active;
2524	$self->flag (cf::FLAG_DEBUG, 0);#d# temp
2525	$self->activate_recursive;
2526		2674
2527	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2675	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2528	$self->enter_map ($map, $x, $y);	2676	if ($self->enter_map ($map, $x, $y)) {
2529	}	2677	# entering was successful
		2678	delete $self->{_link_recursion};
		2679	# only activate afterwards, to support waiting in hooks
		2680	$self->activate_recursive;
		2681	}
2530		2682
		2683	}
		2684
2531	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2685	=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2532		2686
2533	Moves the player to the given map-path and coordinates by first freezing	2687	Moves the player to the given map-path and coordinates by first freezing
2534	her, loading and preparing them map, calling the provided $check callback	2688	her, loading and preparing them map, calling the provided $check callback
2535	that has to return the map if sucecssful, and then unfreezes the player on	2689	that has to return the map if sucecssful, and then unfreezes the player on
2536	the new (success) or old (failed) map position. In either case, $done will	2690	the new (success) or old (failed) map position. In either case, $done will
…		…
2543		2697
2544	our $GOTOGEN;	2698	our $GOTOGEN;
2545		2699
2546	sub cf::object::player::goto {	2700	sub cf::object::player::goto {
2547	my ($self, $path, $x, $y, $check, $done) = @_;	2701	my ($self, $path, $x, $y, $check, $done) = @_;
		2702
		2703	if ($self->{_link_recursion} >= $MAX_LINKS) {
		2704	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
		2705	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
		2706	($path, $x, $y) = @$EMERGENCY_POSITION;
		2707	}
2548		2708
2549	# do generation counting so two concurrent goto's will be executed in-order	2709	# do generation counting so two concurrent goto's will be executed in-order
2550	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2710	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2551		2711
2552	$self->enter_link;	2712	$self->enter_link;
…		…
2576	my $map = eval {	2736	my $map = eval {
2577	my $map = defined $path ? cf::map::find $path : undef;	2737	my $map = defined $path ? cf::map::find $path : undef;
2578		2738
2579	if ($map) {	2739	if ($map) {
2580	$map = $map->customise_for ($self);	2740	$map = $map->customise_for ($self);
2581	$map = $check->($map) if $check && $map;	2741	$map = $check->($map, $x, $y, $self) if $check && $map;
2582	} else {	2742	} else {
2583	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);	2743	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2584	}	2744	}
2585		2745
2586	$map	2746	$map
…		…
2594	if ($gen == $self->{_goto_generation}) {	2754	if ($gen == $self->{_goto_generation}) {
2595	delete $self->{_goto_generation};	2755	delete $self->{_goto_generation};
2596	$self->leave_link ($map, $x, $y);	2756	$self->leave_link ($map, $x, $y);
2597	}	2757	}
2598		2758
2599	$done->() if $done;	2759	$done->($self) if $done;
2600	})->prio (1);	2760	})->prio (1);
2601	}	2761	}
2602		2762
2603	=item $player_object->enter_exit ($exit_object)	2763	=item $player_object->enter_exit ($exit_object)
2604		2764
…		…
2697	$self->message ("Something went wrong deep within the deliantra server. "	2857	$self->message ("Something went wrong deep within the deliantra server. "
2698	. "I'll try to bring you back to the map you were before. "	2858	. "I'll try to bring you back to the map you were before. "
2699	. "Please report this to the dungeon master!",	2859	. "Please report this to the dungeon master!",
2700	cf::NDI_UNIQUE | cf::NDI_RED);	2860	cf::NDI_UNIQUE | cf::NDI_RED);
2701		2861
2702	warn "ERROR in enter_exit: $@";	2862	error "ERROR in enter_exit: $@";
2703	$self->leave_link;	2863	$self->leave_link;
2704	}	2864	}
2705	})->prio (1);	2865	})->prio (1);
2706	}	2866	}
2707		2867
…		…
2719	sub cf::client::send_drawinfo {	2879	sub cf::client::send_drawinfo {
2720	my ($self, $text, $flags) = @_;	2880	my ($self, $text, $flags) = @_;
2721		2881
2722	utf8::encode $text;	2882	utf8::encode $text;
2723	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2883	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
		2884	}
		2885
		2886	=item $client->send_big_packet ($pkt)
		2887
		2888	Like C<send_packet>, but tries to compress large packets, and fragments
		2889	them as required.
		2890
		2891	=cut
		2892
		2893	our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
		2894
		2895	sub cf::client::send_big_packet {
		2896	my ($self, $pkt) = @_;
		2897
		2898	# try lzf for large packets
		2899	$pkt = "lzf " . Compress::LZF::compress $pkt
		2900	if 1024 <= length $pkt and $self->{can_lzf};
		2901
		2902	# split very large packets
		2903	if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
		2904	$self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
		2905	$pkt = "frag";
		2906	}
		2907
		2908	$self->send_packet ($pkt);
2724	}	2909	}
2725		2910
2726	=item $client->send_msg ($channel, $msg, $color, [extra...])	2911	=item $client->send_msg ($channel, $msg, $color, [extra...])
2727		2912
2728	Send a drawinfo or msg packet to the client, formatting the msg for the	2913	Send a drawinfo or msg packet to the client, formatting the msg for the
…		…
2732		2917
2733	=cut	2918	=cut
2734		2919
2735	# non-persistent channels (usually the info channel)	2920	# non-persistent channels (usually the info channel)
2736	our %CHANNEL = (	2921	our %CHANNEL = (
		2922	"c/motd" => {
		2923	id => "infobox",
		2924	title => "MOTD",
		2925	reply => undef,
		2926	tooltip => "The message of the day",
		2927	},
2737	"c/identify" => {	2928	"c/identify" => {
2738	id => "infobox",	2929	id => "infobox",
2739	title => "Identify",	2930	title => "Identify",
2740	reply => undef,	2931	reply => undef,
2741	tooltip => "Items recently identified",	2932	tooltip => "Items recently identified",
…		…
2743	"c/examine" => {	2934	"c/examine" => {
2744	id => "infobox",	2935	id => "infobox",
2745	title => "Examine",	2936	title => "Examine",
2746	reply => undef,	2937	reply => undef,
2747	tooltip => "Signs and other items you examined",	2938	tooltip => "Signs and other items you examined",
		2939	},
		2940	"c/shopinfo" => {
		2941	id => "infobox",
		2942	title => "Shop Info",
		2943	reply => undef,
		2944	tooltip => "What your bargaining skill tells you about the shop",
2748	},	2945	},
2749	"c/book" => {	2946	"c/book" => {
2750	id => "infobox",	2947	id => "infobox",
2751	title => "Book",	2948	title => "Book",
2752	reply => undef,	2949	reply => undef,
…		…
2768	id => "infobox",	2965	id => "infobox",
2769	title => "Body Parts",	2966	title => "Body Parts",
2770	reply => undef,	2967	reply => undef,
2771	tooltip => "Shows which body parts you posess and are available",	2968	tooltip => "Shows which body parts you posess and are available",
2772	},	2969	},
		2970	"c/statistics" => {
		2971	id => "infobox",
		2972	title => "Statistics",
		2973	reply => undef,
		2974	tooltip => "Shows your primary statistics",
		2975	},
		2976	"c/skills" => {
		2977	id => "infobox",
		2978	title => "Skills",
		2979	reply => undef,
		2980	tooltip => "Shows your experience per skill and item power",
		2981	},
		2982	"c/shopitems" => {
		2983	id => "infobox",
		2984	title => "Shop Items",
		2985	reply => undef,
		2986	tooltip => "Shows the items currently for sale in this shop",
		2987	},
		2988	"c/resistances" => {
		2989	id => "infobox",
		2990	title => "Resistances",
		2991	reply => undef,
		2992	tooltip => "Shows your resistances",
		2993	},
		2994	"c/pets" => {
		2995	id => "infobox",
		2996	title => "Pets",
		2997	reply => undef,
		2998	tooltip => "Shows information abotu your pets/a specific pet",
		2999	},
		3000	"c/perceiveself" => {
		3001	id => "infobox",
		3002	title => "Perceive Self",
		3003	reply => undef,
		3004	tooltip => "You gained detailed knowledge about yourself",
		3005	},
2773	"c/uptime" => {	3006	"c/uptime" => {
2774	id => "infobox",	3007	id => "infobox",
2775	title => "Uptime",	3008	title => "Uptime",
2776	reply => undef,	3009	reply => undef,
2777	tooltip => "How long the server has been running since last restart",	3010	tooltip => "How long the server has been running since last restart",
…		…
2786	id => "party",	3019	id => "party",
2787	title => "Party",	3020	title => "Party",
2788	reply => "gsay ",	3021	reply => "gsay ",
2789	tooltip => "Messages and chat related to your party",	3022	tooltip => "Messages and chat related to your party",
2790	},	3023	},
		3024	"c/death" => {
		3025	id => "death",
		3026	title => "Death",
		3027	reply => undef,
		3028	tooltip => "Reason for and more info about your most recent death",
		3029	},
		3030	"c/say" => $SAY_CHANNEL,
		3031	"c/chat" => $CHAT_CHANNEL,
2791	);	3032	);
2792		3033
2793	sub cf::client::send_msg {	3034	sub cf::client::send_msg {
2794	my ($self, $channel, $msg, $color, @extra) = @_;	3035	my ($self, $channel, $msg, $color, @extra) = @_;
2795		3036
…		…
2800		3041
2801	# check predefined channels, for the benefit of C	3042	# check predefined channels, for the benefit of C
2802	if ($CHANNEL{$channel}) {	3043	if ($CHANNEL{$channel}) {
2803	$channel = $CHANNEL{$channel};	3044	$channel = $CHANNEL{$channel};
2804		3045
2805	$self->ext_msg (channel_info => $channel)	3046	$self->ext_msg (channel_info => $channel);
2806	if $self->can_msg;
2807
2808	$channel = $channel->{id};	3047	$channel = $channel->{id};
2809		3048
2810	} elsif (ref $channel) {	3049	} elsif (ref $channel) {
2811	# send meta info to client, if not yet sent	3050	# send meta info to client, if not yet sent
2812	unless (exists $self->{channel}{$channel->{id}}) {	3051	unless (exists $self->{channel}{$channel->{id}}) {
2813	$self->{channel}{$channel->{id}} = $channel;	3052	$self->{channel}{$channel->{id}} = $channel;
2814	$self->ext_msg (channel_info => $channel)	3053	$self->ext_msg (channel_info => $channel);
2815	if $self->can_msg;
2816	}	3054	}
2817		3055
2818	$channel = $channel->{id};	3056	$channel = $channel->{id};
2819	}	3057	}
2820		3058
2821	return unless @extra || length $msg;	3059	return unless @extra || length $msg;
2822		3060
2823	if ($self->can_msg) {
2824	# default colour, mask it out	3061	# default colour, mask it out
2825	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)	3062	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2826	if $color & cf::NDI_DEF;	3063	if $color & cf::NDI_DEF;
2827		3064
2828	my $pkt = "msg "	3065	my $pkt = "msg "
2829	. $self->{json_coder}->encode (	3066	. $self->{json_coder}->encode (
2830	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]	3067	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2831	);	3068	);
2832		3069
2833	# try lzf for large packets
2834	$pkt = "lzf " . Compress::LZF::compress $pkt
2835	if 1024 <= length $pkt and $self->{can_lzf};
2836
2837	# split very large packets
2838	if (8192 < length $pkt and $self->{can_lzf}) {
2839	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2840	$pkt = "frag";
2841	}
2842
2843	$self->send_packet ($pkt);	3070	$self->send_big_packet ($pkt);
2844	} else {
2845	if ($color >= 0) {
2846	# replace some tags by gcfclient-compatible ones
2847	for ($msg) {
2848	1 while
2849	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2850	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2851	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2852	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2853	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2854	}
2855
2856	$color &= cf::NDI_COLOR_MASK;
2857
2858	utf8::encode $msg;
2859
2860	if (0 && $msg =~ /\[/) {
2861	# COMMAND/INFO
2862	$self->send_packet ("drawextinfo $color 10 8 $msg")
2863	} else {
2864	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2865	$self->send_packet ("drawinfo $color $msg")
2866	}
2867	}
2868	}
2869	}	3071	}
2870		3072
2871	=item $client->ext_msg ($type, @msg)	3073	=item $client->ext_msg ($type, @msg)
2872		3074
2873	Sends an ext event to the client.	3075	Sends an ext event to the client.
…		…
2876		3078
2877	sub cf::client::ext_msg($$@) {	3079	sub cf::client::ext_msg($$@) {
2878	my ($self, $type, @msg) = @_;	3080	my ($self, $type, @msg) = @_;
2879		3081
2880	if ($self->extcmd == 2) {	3082	if ($self->extcmd == 2) {
2881	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3083	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2882	} elsif ($self->extcmd == 1) { # TODO: remove	3084	} elsif ($self->extcmd == 1) { # TODO: remove
2883	push @msg, msgtype => "event_$type";	3085	push @msg, msgtype => "event_$type";
2884	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3086	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2885	}	3087	}
2886	}	3088	}
2887		3089
2888	=item $client->ext_reply ($msgid, @msg)	3090	=item $client->ext_reply ($msgid, @msg)
2889		3091
…		…
2893		3095
2894	sub cf::client::ext_reply($$@) {	3096	sub cf::client::ext_reply($$@) {
2895	my ($self, $id, @msg) = @_;	3097	my ($self, $id, @msg) = @_;
2896		3098
2897	if ($self->extcmd == 2) {	3099	if ($self->extcmd == 2) {
2898	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));	3100	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2899	} elsif ($self->extcmd == 1) {	3101	} elsif ($self->extcmd == 1) {
2900	#TODO: version 1, remove	3102	#TODO: version 1, remove
2901	unshift @msg, msgtype => "reply", msgid => $id;	3103	unshift @msg, msgtype => "reply", msgid => $id;
2902	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3104	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2903	}	3105	}
2904	}	3106	}
2905		3107
2906	=item $success = $client->query ($flags, "text", \&cb)	3108	=item $success = $client->query ($flags, "text", \&cb)
2907		3109
…		…
2978		3180
2979	$ns->ext_reply ($reply, @reply)	3181	$ns->ext_reply ($reply, @reply)
2980	if $reply;	3182	if $reply;
2981		3183
2982	} else {	3184	} else {
2983	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3185	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2984	}	3186	}
2985		3187
2986	cf::override;	3188	cf::override;
2987	},	3189	},
2988	);	3190	);
…		…
3008		3210
3009	$coro	3211	$coro
3010	}	3212	}
3011		3213
3012	cf::client->attach (	3214	cf::client->attach (
3013	on_destroy => sub {	3215	on_client_destroy => sub {
3014	my ($ns) = @_;	3216	my ($ns) = @_;
3015		3217
3016	$_->cancel for values %{ (delete $ns->{_coro}) || {} };	3218	$_->cancel for values %{ (delete $ns->{_coro}) || {} };
3017	},	3219	},
3018	);	3220	);
…		…
3034	our $safe_hole = new Safe::Hole;	3236	our $safe_hole = new Safe::Hole;
3035		3237
3036	$SIG{FPE} = 'IGNORE';	3238	$SIG{FPE} = 'IGNORE';
3037		3239
3038	$safe->permit_only (Opcode::opset qw(	3240	$safe->permit_only (Opcode::opset qw(
3039	:base_core :base_mem :base_orig :base_math	3241	:base_core :base_mem :base_orig :base_math :base_loop
3040	grepstart grepwhile mapstart mapwhile	3242	grepstart grepwhile mapstart mapwhile
3041	sort time	3243	sort time
3042	));	3244	));
3043		3245
3044	# here we export the classes and methods available to script code	3246	# here we export the classes and methods available to script code
…		…
3048	The following functions and methods are available within a safe environment:	3250	The following functions and methods are available within a safe environment:
3049		3251
3050	cf::object	3252	cf::object
3051	contr pay_amount pay_player map x y force_find force_add destroy	3253	contr pay_amount pay_player map x y force_find force_add destroy
3052	insert remove name archname title slaying race decrease split	3254	insert remove name archname title slaying race decrease split
		3255	value
3053		3256
3054	cf::object::player	3257	cf::object::player
3055	player	3258	player
3056		3259
3057	cf::player	3260	cf::player
…		…
3063	=cut	3266	=cut
3064		3267
3065	for (	3268	for (
3066	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	3269	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3067	insert remove inv nrof name archname title slaying race	3270	insert remove inv nrof name archname title slaying race
3068	decrease split destroy change_exp)],	3271	decrease split destroy change_exp value msg lore send_msg)],
3069	["cf::object::player" => qw(player)],	3272	["cf::object::player" => qw(player)],
3070	["cf::player" => qw(peaceful)],	3273	["cf::player" => qw(peaceful send_msg)],
3071	["cf::map" => qw(trigger)],	3274	["cf::map" => qw(trigger)],
3072	) {	3275	) {
3073	no strict 'refs';
3074	my ($pkg, @funs) = @$_;	3276	my ($pkg, @funs) = @$_;
3075	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3277	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3076	for @funs;	3278	for @funs;
3077	}	3279	}
3078		3280
…		…
3093		3295
3094	my $qcode = $code;	3296	my $qcode = $code;
3095	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3297	$qcode =~ s/"/‟/g; # not allowed in #line filenames
3096	$qcode =~ s/\n/\\n/g;	3298	$qcode =~ s/\n/\\n/g;
3097		3299
		3300	%vars = (_dummy => 0) unless %vars;
		3301
		3302	my @res;
3098	local $_;	3303	local $_;
3099	local @safe::cf::_safe_eval_args = values %vars;
3100		3304
3101	my $eval =	3305	my $eval =
3102	"do {\n"	3306	"do {\n"
3103	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"	3307	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3104	. "#line 0 \"{$qcode}\"\n"	3308	. "#line 0 \"{$qcode}\"\n"
3105	. $code	3309	. $code
3106	. "\n}"	3310	. "\n}"
3107	;	3311	;
3108		3312
		3313	if ($CFG{safe_eval}) {
3109	sub_generation_inc;	3314	sub_generation_inc;
		3315	local @safe::cf::_safe_eval_args = values %vars;
3110	my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);	3316	@res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3111	sub_generation_inc;	3317	sub_generation_inc;
		3318	} else {
		3319	local @cf::_safe_eval_args = values %vars;
		3320	@res = wantarray ? eval eval : scalar eval $eval;
		3321	}
3112		3322
3113	if ($@) {	3323	if ($@) {
3114	warn "$@";	3324	warn "$@",
3115	warn "while executing safe code '$code'\n";	3325	"while executing safe code '$code'\n",
3116	warn "with arguments " . (join " ", %vars) . "\n";	3326	"with arguments " . (join " ", %vars) . "\n";
3117	}	3327	}
3118		3328
3119	wantarray ? @res : $res[0]	3329	wantarray ? @res : $res[0]
3120	}	3330	}
3121		3331
…		…
3135	=cut	3345	=cut
3136		3346
3137	sub register_script_function {	3347	sub register_script_function {
3138	my ($fun, $cb) = @_;	3348	my ($fun, $cb) = @_;
3139		3349
3140	no strict 'refs';	3350	$fun = "safe::$fun" if $CFG{safe_eval};
3141	*{"safe::$fun"} = $safe_hole->wrap ($cb);	3351	*$fun = $safe_hole->wrap ($cb);
3142	}	3352	}
3143		3353
3144	=back	3354	=back
3145		3355
3146	=cut	3356	=cut
…		…
3155	# for this (global event?)	3365	# for this (global event?)
3156	%ext::player_env::MUSIC_FACE_CACHE = ();	3366	%ext::player_env::MUSIC_FACE_CACHE = ();
3157		3367
3158	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3368	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3159		3369
3160	warn "loading facedata from $path\n";	3370	trace "loading facedata from $path\n";
3161		3371
3162	my $facedata;	3372	my $facedata;
3163	0 < aio_load $path, $facedata	3373	0 < aio_load $path, $facedata
3164	or die "$path: $!";	3374	or die "$path: $!";
3165		3375
…		…
3167		3377
3168	$facedata->{version} == 2	3378	$facedata->{version} == 2
3169	or cf::cleanup "$path: version mismatch, cannot proceed.";	3379	or cf::cleanup "$path: version mismatch, cannot proceed.";
3170		3380
3171	# patch in the exptable	3381	# patch in the exptable
		3382	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3172	$facedata->{resource}{"res/exp_table"} = {	3383	$facedata->{resource}{"res/exp_table"} = {
3173	type => FT_RSRC,	3384	type => FT_RSRC,
3174	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),	3385	data => $exp_table,
		3386	hash => (Digest::MD5::md5 $exp_table),
3175	};	3387	};
3176	cf::cede_to_tick;	3388	cf::cede_to_tick;
3177		3389
3178	{	3390	{
3179	my $faces = $facedata->{faceinfo};	3391	my $faces = $facedata->{faceinfo};
…		…
3181	while (my ($face, $info) = each %$faces) {	3393	while (my ($face, $info) = each %$faces) {
3182	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3394	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3183		3395
3184	cf::face::set_visibility $idx, $info->{visibility};	3396	cf::face::set_visibility $idx, $info->{visibility};
3185	cf::face::set_magicmap $idx, $info->{magicmap};	3397	cf::face::set_magicmap $idx, $info->{magicmap};
3186	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};	3398	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3187	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};	3399	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3188		3400
3189	cf::cede_to_tick;	3401	cf::cede_to_tick;
3190	}	3402	}
3191		3403
3192	while (my ($face, $info) = each %$faces) {	3404	while (my ($face, $info) = each %$faces) {
…		…
3197		3409
3198	if (my $smooth = cf::face::find $info->{smooth}) {	3410	if (my $smooth = cf::face::find $info->{smooth}) {
3199	cf::face::set_smooth $idx, $smooth;	3411	cf::face::set_smooth $idx, $smooth;
3200	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3412	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3201	} else {	3413	} else {
3202	warn "smooth face '$info->{smooth}' not found for face '$face'";	3414	error "smooth face '$info->{smooth}' not found for face '$face'";
3203	}	3415	}
3204		3416
3205	cf::cede_to_tick;	3417	cf::cede_to_tick;
3206	}	3418	}
3207	}	3419	}
…		…
3216		3428
3217	cf::anim::invalidate_all; # d'oh	3429	cf::anim::invalidate_all; # d'oh
3218	}	3430	}
3219		3431
3220	{	3432	{
3221	# TODO: for gcfclient pleasure, we should give resources
3222	# that gcfclient doesn't grok a >10000 face index.
3223	my $res = $facedata->{resource};	3433	my $res = $facedata->{resource};
3224		3434
3225	while (my ($name, $info) = each %$res) {	3435	while (my ($name, $info) = each %$res) {
3226	if (defined $info->{type}) {	3436	if (defined $info->{type}) {
3227	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3437	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3228	my $data;
3229		3438
3230	if ($info->{type} & 1) {	3439	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3231	# prepend meta info
3232
3233	my $meta = $enc->encode ({
3234	name => $name,
3235	%{ $info->{meta} || {} },
3236	});
3237
3238	$data = pack "(w/a*)*", $meta, $info->{data};
3239	} else {
3240	$data = $info->{data};
3241	}
3242
3243	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3244	cf::face::set_type $idx, $info->{type};	3440	cf::face::set_type $idx, $info->{type};
3245	} else {	3441	} else {
3246	$RESOURCE{$name} = $info;	3442	$RESOURCE{$name} = $info; # unused
3247	}	3443	}
3248		3444
3249	cf::cede_to_tick;	3445	cf::cede_to_tick;
3250	}	3446	}
3251	}	3447	}
3252		3448
3253	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3449	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3254		3450
3255	1	3451	1
3256	}	3452	}
3257
3258	cf::global->attach (on_resource_update => sub {
3259	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3260	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3261
3262	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3263	my $sound = $soundconf->{compat}[$_]
3264	or next;
3265
3266	my $face = cf::face::find "sound/$sound->[1]";
3267	cf::sound::set $sound->[0] => $face;
3268	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3269	}
3270
3271	while (my ($k, $v) = each %{$soundconf->{event}}) {
3272	my $face = cf::face::find "sound/$v";
3273	cf::sound::set $k => $face;
3274	}
3275	}
3276	});
3277		3453
3278	register_exticmd fx_want => sub {	3454	register_exticmd fx_want => sub {
3279	my ($ns, $want) = @_;	3455	my ($ns, $want) = @_;
3280		3456
3281	while (my ($k, $v) = each %$want) {	3457	while (my ($k, $v) = each %$want) {
…		…
3320	sub reload_treasures {	3496	sub reload_treasures {
3321	load_resource_file "$DATADIR/treasures"	3497	load_resource_file "$DATADIR/treasures"
3322	or die "unable to load treasurelists\n";	3498	or die "unable to load treasurelists\n";
3323	}	3499	}
3324		3500
		3501	sub reload_sound {
		3502	trace "loading sound config from $DATADIR/sound\n";
		3503
		3504	0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
		3505	or die "$DATADIR/sound $!";
		3506
		3507	my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
		3508
		3509	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3510	my $sound = $soundconf->{compat}[$_]
		3511	or next;
		3512
		3513	my $face = cf::face::find "sound/$sound->[1]";
		3514	cf::sound::set $sound->[0] => $face;
		3515	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3516	}
		3517
		3518	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3519	my $face = cf::face::find "sound/$v";
		3520	cf::sound::set $k => $face;
		3521	}
		3522	}
		3523
3325	sub reload_resources {	3524	sub reload_resources {
3326	warn "reloading resource files...\n";	3525	trace "reloading resource files...\n";
3327		3526
3328	reload_facedata;	3527	reload_facedata;
		3528	reload_sound;
3329	reload_archetypes;	3529	reload_archetypes;
3330	reload_regions;	3530	reload_regions;
3331	reload_treasures;	3531	reload_treasures;
3332		3532
3333	warn "finished reloading resource files\n";	3533	trace "finished reloading resource files\n";
3334	}
3335
3336	sub init {
3337	my $guard = freeze_mainloop;
3338
3339	evthread_start IO::AIO::poll_fileno;
3340
3341	reload_resources;
3342	}	3534	}
3343		3535
3344	sub reload_config {	3536	sub reload_config {
		3537	trace "reloading config file...\n";
		3538
3345	open my $fh, "<:utf8", "$CONFDIR/config"	3539	open my $fh, "<:utf8", "$CONFDIR/config"
3346	or return;	3540	or return;
3347		3541
3348	local $/;	3542	local $/;
3349	*CFG = YAML::Load <$fh>;	3543	*CFG = YAML::XS::Load scalar <$fh>;
3350		3544
3351	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3545	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3352		3546
3353	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3547	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3354	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3548	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3355		3549
3356	if (exists $CFG{mlockall}) {	3550	if (exists $CFG{mlockall}) {
…		…
3358	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3552	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3359	and die "WARNING: m(un)lockall failed: $!\n";	3553	and die "WARNING: m(un)lockall failed: $!\n";
3360	};	3554	};
3361	warn $@ if $@;	3555	warn $@ if $@;
3362	}	3556	}
		3557
		3558	trace "finished reloading resource files\n";
3363	}	3559	}
3364		3560
3365	sub pidfile() {	3561	sub pidfile() {
3366	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3562	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3367	or die "$PIDFILE: $!";	3563	or die "$PIDFILE: $!";
…		…
3379		3575
3380	seek $fh, 0, 0;	3576	seek $fh, 0, 0;
3381	print $fh $$;	3577	print $fh $$;
3382	}	3578	}
3383		3579
		3580	sub main_loop {
		3581	trace "EV::loop starting\n";
		3582	if (1) {
		3583	EV::loop;
		3584	}
		3585	trace "EV::loop returned\n";
		3586	goto &main_loop unless $REALLY_UNLOOP;
		3587	}
		3588
3384	sub main {	3589	sub main {
3385	atomic;	3590	cf::init_globals; # initialise logging
		3591
		3592	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
		3593	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
		3594	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
		3595	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
		3596
		3597	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3386		3598
3387	# we must not ever block the main coroutine	3599	# we must not ever block the main coroutine
3388	local $Coro::idle = sub {	3600	local $Coro::idle = sub {
3389	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3601	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3390	(async {	3602	(async {
3391	$Coro::current->{desc} = "IDLE BUG HANDLER";	3603	$Coro::current->{desc} = "IDLE BUG HANDLER";
3392	EV::loop EV::LOOP_ONESHOT;	3604	EV::loop EV::LOOP_ONESHOT;
3393	})->prio (Coro::PRIO_MAX);	3605	})->prio (Coro::PRIO_MAX);
3394	};	3606	};
3395		3607
3396	{	3608	evthread_start IO::AIO::poll_fileno;
3397	my $guard = freeze_mainloop;	3609
		3610	cf::sync_job {
		3611	cf::init_experience;
		3612	cf::init_anim;
		3613	cf::init_attackmess;
		3614	cf::init_dynamic;
		3615
		3616	cf::load_settings;
		3617	cf::load_materials;
		3618
		3619	reload_resources;
3398	reload_config;	3620	reload_config;
3399	db_init;	3621	db_init;
		3622
		3623	cf::init_uuid;
		3624	cf::init_signals;
		3625	cf::init_skills;
		3626
		3627	cf::init_beforeplay;
		3628
		3629	atomic;
		3630
3400	load_extensions;	3631	load_extensions;
3401		3632
3402	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3403	}
3404
3405	utime time, time, $RUNTIMEFILE;	3633	utime time, time, $RUNTIMEFILE;
3406		3634
3407	# no (long-running) fork's whatsoever before this point(!)	3635	# no (long-running) fork's whatsoever before this point(!)
		3636	use POSIX ();
3408	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3637	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3409		3638
3410	EV::loop;	3639	(pop @POST_INIT)->(0) while @POST_INIT;
		3640	};
		3641
		3642	cf::object::thawer::errors_are_fatal 0;
		3643	info "parse errors in files are no longer fatal from this point on.\n";
		3644
		3645	main_loop;
3411	}	3646	}
3412		3647
3413	#############################################################################	3648	#############################################################################
3414	# initialisation and cleanup	3649	# initialisation and cleanup
3415		3650
3416	# install some emergency cleanup handlers	3651	# install some emergency cleanup handlers
3417	BEGIN {	3652	BEGIN {
3418	our %SIGWATCHER = ();	3653	our %SIGWATCHER = ();
3419	for my $signal (qw(INT HUP TERM)) {	3654	for my $signal (qw(INT HUP TERM)) {
3420	$SIGWATCHER{$signal} = EV::signal $signal, sub {	3655	$SIGWATCHER{$signal} = AE::signal $signal, sub {
3421	cf::cleanup "SIG$signal";	3656	cf::cleanup "SIG$signal";
3422	};	3657	};
3423	}	3658	}
3424	}	3659	}
3425		3660
3426	sub write_runtime_sync {	3661	sub write_runtime_sync {
		3662	my $t0 = AE::time;
		3663
3427	# first touch the runtime file to show we are still running:	3664	# first touch the runtime file to show we are still running:
3428	# the fsync below can take a very very long time.	3665	# the fsync below can take a very very long time.
3429		3666
3430	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;	3667	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3431		3668
3432	my $guard = cf::lock_acquire "write_runtime";	3669	my $guard = cf::lock_acquire "write_runtime";
3433		3670
3434	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644	3671	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3435	or return;	3672	or return;
3436		3673
3437	my $value = $cf::RUNTIME + 90 + 10;	3674	my $value = $cf::RUNTIME + 90 + 10;
3438	# 10 is the runtime save interval, for a monotonic clock	3675	# 10 is the runtime save interval, for a monotonic clock
3439	# 60 allows for the watchdog to kill the server.	3676	# 60 allows for the watchdog to kill the server.
…		…
3452	or return;	3689	or return;
3453		3690
3454	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3691	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3455	and return;	3692	and return;
3456		3693
3457	warn "runtime file written.\n";	3694	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3458		3695
3459	1	3696	1
3460	}	3697	}
3461		3698
3462	our $uuid_lock;	3699	our $uuid_lock;
…		…
3471	my $uuid = "$LOCALDIR/uuid";	3708	my $uuid = "$LOCALDIR/uuid";
3472		3709
3473	my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644	3710	my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3474	or return;	3711	or return;
3475		3712
3476	my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;	3713	my $value = uuid_seq uuid_cur;
		3714
		3715	unless ($value) {
		3716	info "cowardly refusing to write zero uuid value!\n";
		3717	return;
		3718	}
		3719
		3720	my $value = uuid_str $value + $uuid_skip;
3477	$uuid_skip = 0;	3721	$uuid_skip = 0;
3478		3722
3479	(aio_write $fh, 0, (length $value), $value, 0) <= 0	3723	(aio_write $fh, 0, (length $value), $value, 0) <= 0
3480	and return;	3724	and return;
3481		3725
…		…
3487	or return;	3731	or return;
3488		3732
3489	aio_rename "$uuid~", $uuid	3733	aio_rename "$uuid~", $uuid
3490	and return;	3734	and return;
3491		3735
3492	warn "uuid file written ($value).\n";	3736	trace "uuid file written ($value).\n";
3493		3737
3494	1	3738	1
3495		3739
3496	}	3740	}
3497		3741
…		…
3503	}	3747	}
3504		3748
3505	sub emergency_save() {	3749	sub emergency_save() {
3506	my $freeze_guard = cf::freeze_mainloop;	3750	my $freeze_guard = cf::freeze_mainloop;
3507		3751
3508	warn "enter emergency perl save\n";	3752	info "emergency_perl_save: enter\n";
		3753
		3754	# this is a trade-off: we want to be very quick here, so
		3755	# save all maps without fsync, and later call a global sync
		3756	# (which in turn might be very very slow)
		3757	local $USE_FSYNC = 0;
3509		3758
3510	cf::sync_job {	3759	cf::sync_job {
		3760	cf::write_runtime_sync; # external watchdog should not bark
		3761
3511	# use a peculiar iteration method to avoid tripping on perl	3762	# use a peculiar iteration method to avoid tripping on perl
3512	# refcount bugs in for. also avoids problems with players	3763	# refcount bugs in for. also avoids problems with players
3513	# and maps saved/destroyed asynchronously.	3764	# and maps saved/destroyed asynchronously.
3514	warn "begin emergency player save\n";	3765	info "emergency_perl_save: begin player save\n";
3515	for my $login (keys %cf::PLAYER) {	3766	for my $login (keys %cf::PLAYER) {
3516	my $pl = $cf::PLAYER{$login} or next;	3767	my $pl = $cf::PLAYER{$login} or next;
3517	$pl->valid or next;	3768	$pl->valid or next;
3518	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3769	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3519	$pl->save;	3770	$pl->save;
3520	}	3771	}
3521	warn "end emergency player save\n";	3772	info "emergency_perl_save: end player save\n";
3522		3773
3523	warn "begin emergency map save\n";	3774	cf::write_runtime_sync; # external watchdog should not bark
		3775
		3776	info "emergency_perl_save: begin map save\n";
3524	for my $path (keys %cf::MAP) {	3777	for my $path (keys %cf::MAP) {
3525	my $map = $cf::MAP{$path} or next;	3778	my $map = $cf::MAP{$path} or next;
3526	$map->valid or next;	3779	$map->valid or next;
3527	$map->save;	3780	$map->save;
3528	}	3781	}
3529	warn "end emergency map save\n";	3782	info "emergency_perl_save: end map save\n";
3530		3783
3531	warn "begin emergency database checkpoint\n";	3784	cf::write_runtime_sync; # external watchdog should not bark
		3785
		3786	info "emergency_perl_save: begin database checkpoint\n";
3532	BDB::db_env_txn_checkpoint $DB_ENV;	3787	BDB::db_env_txn_checkpoint $DB_ENV;
3533	warn "end emergency database checkpoint\n";	3788	info "emergency_perl_save: end database checkpoint\n";
3534		3789
3535	warn "begin write uuid\n";	3790	info "emergency_perl_save: begin write uuid\n";
3536	write_uuid_sync 1;	3791	write_uuid_sync 1;
3537	warn "end write uuid\n";	3792	info "emergency_perl_save: end write uuid\n";
		3793
		3794	cf::write_runtime_sync; # external watchdog should not bark
		3795
		3796	trace "emergency_perl_save: syncing database to disk";
		3797	BDB::db_env_txn_checkpoint $DB_ENV;
		3798
		3799	info "emergency_perl_save: starting sync\n";
		3800	IO::AIO::aio_sync sub {
		3801	info "emergency_perl_save: finished sync\n";
		3802	};
		3803
		3804	cf::write_runtime_sync; # external watchdog should not bark
		3805
		3806	trace "emergency_perl_save: flushing outstanding aio requests";
		3807	while (IO::AIO::nreqs || BDB::nreqs) {
		3808	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
		3809	}
		3810
		3811	cf::write_runtime_sync; # external watchdog should not bark
3538	};	3812	};
3539		3813
3540	warn "leave emergency perl save\n";	3814	info "emergency_perl_save: leave\n";
3541	}	3815	}
3542		3816
3543	sub post_cleanup {	3817	sub post_cleanup {
3544	my ($make_core) = @_;	3818	my ($make_core) = @_;
3545		3819
		3820	IO::AIO::flush;
		3821
3546	warn Carp::longmess "post_cleanup backtrace"	3822	error Carp::longmess "post_cleanup backtrace"
3547	if $make_core;	3823	if $make_core;
3548		3824
3549	my $fh = pidfile;	3825	my $fh = pidfile;
3550	unlink $PIDFILE if <$fh> == $$;	3826	unlink $PIDFILE if <$fh> == $$;
3551	}	3827	}
…		…
3571	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	3847	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3572	for my $name (keys %$leaf_symtab) {	3848	for my $name (keys %$leaf_symtab) {
3573	_gv_clear *{"$pkg$name"};	3849	_gv_clear *{"$pkg$name"};
3574	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	3850	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3575	}	3851	}
3576	warn "cleared package #$pkg\n";#d#
3577	}	3852	}
3578
3579	our $RELOAD; # how many times to reload
3580		3853
3581	sub do_reload_perl() {	3854	sub do_reload_perl() {
3582	# can/must only be called in main	3855	# can/must only be called in main
3583	if ($Coro::current != $Coro::main) {	3856	if (in_main) {
3584	warn "can only reload from main coroutine";	3857	error "can only reload from main coroutine";
3585	return;	3858	return;
3586	}	3859	}
3587		3860
3588	return if $RELOAD++;	3861	return if $RELOAD++;
3589		3862
		3863	my $t1 = AE::time;
		3864
3590	while ($RELOAD) {	3865	while ($RELOAD) {
3591	warn "reloading...";	3866	info "reloading...";
3592		3867
3593	warn "entering sync_job";	3868	trace "entering sync_job";
3594		3869
3595	cf::sync_job {	3870	cf::sync_job {
3596	cf::write_runtime_sync; # external watchdog should not bark
3597	cf::emergency_save;	3871	cf::emergency_save;
3598	cf::write_runtime_sync; # external watchdog should not bark
3599		3872
3600	warn "syncing database to disk";
3601	BDB::db_env_txn_checkpoint $DB_ENV;
3602
3603	# if anything goes wrong in here, we should simply crash as we already saved
3604
3605	warn "flushing outstanding aio requests";
3606	while (IO::AIO::nreqs || BDB::nreqs) {
3607	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3608	}
3609
3610	warn "cancelling all extension coros";	3873	trace "cancelling all extension coros";
3611	$_->cancel for values %EXT_CORO;	3874	$_->cancel for values %EXT_CORO;
3612	%EXT_CORO = ();	3875	%EXT_CORO = ();
3613		3876
3614	warn "removing commands";	3877	trace "removing commands";
3615	%COMMAND = ();	3878	%COMMAND = ();
3616		3879
3617	warn "removing ext/exti commands";	3880	trace "removing ext/exti commands";
3618	%EXTCMD = ();	3881	%EXTCMD = ();
3619	%EXTICMD = ();	3882	%EXTICMD = ();
3620		3883
3621	warn "unloading/nuking all extensions";	3884	trace "unloading/nuking all extensions";
3622	for my $pkg (@EXTS) {	3885	for my $pkg (@EXTS) {
3623	warn "... unloading $pkg";	3886	trace "... unloading $pkg";
3624		3887
3625	if (my $cb = $pkg->can ("unload")) {	3888	if (my $cb = $pkg->can ("unload")) {
3626	eval {	3889	eval {
3627	$cb->($pkg);	3890	$cb->($pkg);
3628	1	3891	1
3629	} or warn "$pkg unloaded, but with errors: $@";	3892	} or error "$pkg unloaded, but with errors: $@";
3630	}	3893	}
3631		3894
3632	warn "... clearing $pkg";	3895	trace "... clearing $pkg";
3633	clear_package $pkg;	3896	clear_package $pkg;
3634	}	3897	}
3635		3898
3636	warn "unloading all perl modules loaded from $LIBDIR";	3899	trace "unloading all perl modules loaded from $LIBDIR";
3637	while (my ($k, $v) = each %INC) {	3900	while (my ($k, $v) = each %INC) {
3638	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	3901	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3639		3902
3640	warn "... unloading $k";	3903	trace "... unloading $k";
3641	delete $INC{$k};	3904	delete $INC{$k};
3642		3905
3643	$k =~ s/\.pm$//;	3906	$k =~ s/\.pm$//;
3644	$k =~ s/\//::/g;	3907	$k =~ s/\//::/g;
3645		3908
…		…
3648	}	3911	}
3649		3912
3650	clear_package $k;	3913	clear_package $k;
3651	}	3914	}
3652		3915
3653	warn "getting rid of safe::, as good as possible";	3916	trace "getting rid of safe::, as good as possible";
3654	clear_package "safe::$_"	3917	clear_package "safe::$_"
3655	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	3918	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3656		3919
3657	warn "unloading cf.pm \"a bit\"";	3920	trace "unloading cf.pm \"a bit\"";
3658	delete $INC{"cf.pm"};	3921	delete $INC{"cf.pm"};
3659	delete $INC{"cf/pod.pm"};	3922	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3660		3923
3661	# don't, removes xs symbols, too,	3924	# don't, removes xs symbols, too,
3662	# and global variables created in xs	3925	# and global variables created in xs
3663	#clear_package __PACKAGE__;	3926	#clear_package __PACKAGE__;
3664		3927
3665	warn "unload completed, starting to reload now";	3928	info "unload completed, starting to reload now";
3666		3929
3667	warn "reloading cf.pm";	3930	trace "reloading cf.pm";
3668	require cf;	3931	require cf;
3669	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3932	cf::_connect_to_perl_1;
3670		3933
3671	warn "loading config and database again";	3934	trace "loading config and database again";
3672	cf::reload_config;	3935	cf::reload_config;
3673		3936
3674	warn "loading extensions";	3937	trace "loading extensions";
3675	cf::load_extensions;	3938	cf::load_extensions;
3676		3939
		3940	if ($REATTACH_ON_RELOAD) {
3677	warn "reattaching attachments to objects/players";	3941	trace "reattaching attachments to objects/players";
3678	_global_reattach; # objects, sockets	3942	_global_reattach; # objects, sockets
3679	warn "reattaching attachments to maps";	3943	trace "reattaching attachments to maps";
3680	reattach $_ for values %MAP;	3944	reattach $_ for values %MAP;
3681	warn "reattaching attachments to players";	3945	trace "reattaching attachments to players";
3682	reattach $_ for values %PLAYER;	3946	reattach $_ for values %PLAYER;
		3947	}
3683		3948
		3949	trace "running post_init jobs";
		3950	(pop @POST_INIT)->(1) while @POST_INIT;
		3951
3684	warn "leaving sync_job";	3952	trace "leaving sync_job";
3685		3953
3686	1	3954	1
3687	} or do {	3955	} or do {
3688	warn $@;	3956	error $@;
3689	cf::cleanup "error while reloading, exiting.";	3957	cf::cleanup "error while reloading, exiting.";
3690	};	3958	};
3691		3959
3692	warn "reloaded";	3960	info "reloaded";
3693	--$RELOAD;	3961	--$RELOAD;
3694	}	3962	}
		3963
		3964	$t1 = AE::time - $t1;
		3965	info "reload completed in ${t1}s\n";
3695	};	3966	};
3696		3967
3697	our $RELOAD_WATCHER; # used only during reload	3968	our $RELOAD_WATCHER; # used only during reload
3698		3969
3699	sub reload_perl() {	3970	sub reload_perl() {
3700	# doing reload synchronously and two reloads happen back-to-back,	3971	# doing reload synchronously and two reloads happen back-to-back,
3701	# coro crashes during coro_state_free->destroy here.	3972	# coro crashes during coro_state_free->destroy here.
3702		3973
		3974	$RELOAD_WATCHER ||= cf::async {
		3975	Coro::AIO::aio_wait cache_extensions;
		3976
3703	$RELOAD_WATCHER ||= EV::timer 0, 0, sub {	3977	$RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3704	do_reload_perl;	3978	do_reload_perl;
3705	undef $RELOAD_WATCHER;	3979	undef $RELOAD_WATCHER;
		3980	};
3706	};	3981	};
3707	}	3982	}
3708		3983
3709	register_command "reload" => sub {	3984	register_command "reload" => sub {
3710	my ($who, $arg) = @_;	3985	my ($who, $arg) = @_;
…		…
3724		3999
3725	our @WAIT_FOR_TICK;	4000	our @WAIT_FOR_TICK;
3726	our @WAIT_FOR_TICK_BEGIN;	4001	our @WAIT_FOR_TICK_BEGIN;
3727		4002
3728	sub wait_for_tick {	4003	sub wait_for_tick {
3729	return if tick_inhibit || $Coro::current == $Coro::main;	4004	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3730		4005
3731	my $signal = new Coro::Signal;	4006	my $signal = new Coro::Signal;
3732	push @WAIT_FOR_TICK, $signal;	4007	push @WAIT_FOR_TICK, $signal;
3733	$signal->wait;	4008	$signal->wait;
3734	}	4009	}
3735		4010
3736	sub wait_for_tick_begin {	4011	sub wait_for_tick_begin {
3737	return if tick_inhibit || $Coro::current == $Coro::main;	4012	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3738		4013
3739	my $signal = new Coro::Signal;	4014	my $signal = new Coro::Signal;
3740	push @WAIT_FOR_TICK_BEGIN, $signal;	4015	push @WAIT_FOR_TICK_BEGIN, $signal;
3741	$signal->wait;	4016	$signal->wait;
3742	}	4017	}
…		…
3748	return;	4023	return;
3749	}	4024	}
3750		4025
3751	cf::server_tick; # one server iteration	4026	cf::server_tick; # one server iteration
3752		4027
		4028	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
		4029
3753	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4030	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3754	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4031	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3755	Coro::async_pool {	4032	Coro::async_pool {
3756	$Coro::current->{desc} = "runtime saver";	4033	$Coro::current->{desc} = "runtime saver";
3757	write_runtime_sync	4034	write_runtime_sync
3758	or warn "ERROR: unable to write runtime file: $!";	4035	or error "ERROR: unable to write runtime file: $!";
3759	};	4036	};
3760	}	4037	}
3761		4038
3762	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4039	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3763	$sig->send;	4040	$sig->send;
…		…
3771		4048
3772	if (0) {	4049	if (0) {
3773	if ($NEXT_TICK) {	4050	if ($NEXT_TICK) {
3774	my $jitter = $TICK_START - $NEXT_TICK;	4051	my $jitter = $TICK_START - $NEXT_TICK;
3775	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4052	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
3776	warn "jitter $JITTER\n";#d#	4053	debug "jitter $JITTER\n";#d#
3777	}	4054	}
3778	}	4055	}
3779	}	4056	}
3780		4057
3781	{	4058	{
3782	# configure BDB	4059	# configure BDB
3783		4060
3784	BDB::min_parallel 8;	4061	BDB::min_parallel 16;
3785	BDB::max_poll_reqs $TICK * 0.1;	4062	BDB::max_poll_reqs $TICK * 0.1;
3786	$AnyEvent::BDB::WATCHER->priority (1);	4063	$AnyEvent::BDB::WATCHER->priority (1);
3787		4064
3788	unless ($DB_ENV) {	4065	unless ($DB_ENV) {
3789	$DB_ENV = BDB::db_env_create;	4066	$DB_ENV = BDB::db_env_create;
…		…
3869	LOG llevInfo, "[ABT] [suppressed]\n";	4146	LOG llevInfo, "[ABT] [suppressed]\n";
3870	}	4147	}
3871	}	4148	}
3872		4149
3873	# load additional modules	4150	# load additional modules
3874	use cf::pod;	4151	require "cf/$_.pm" for @EXTRA_MODULES;
		4152	cf::_connect_to_perl_2;
3875		4153
3876	END { cf::emergency_save }	4154	END { cf::emergency_save }
3877		4155
3878	1	4156	1
3879		4157

Diff Legend

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