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.454 by root, Thu Sep 25 12:14:32 2008 UTC vs.
Revision 1.527 by root, Fri Apr 23 04:32:47 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 5.10.0;
25	use utf8;	26	use utf8;
26	use strict "vars", "subs";	27	use strict qw(vars subs);
27		28
28	use Symbol;	29	use Symbol;
29	use List::Util;	30	use List::Util;
30	use Socket;	31	use Socket;
31	use EV;	32	use EV;
32	use Opcode;	33	use Opcode;
33	use Safe;	34	use Safe;
34	use Safe::Hole;	35	use Safe::Hole;
35	use Storable ();	36	use Storable ();
		37	use Carp ();
36		38
		39	use Guard ();
37	use Coro ();	40	use Coro ();
38	use Coro::State;	41	use Coro::State;
39	use Coro::Handle;	42	use Coro::Handle;
40	use Coro::EV;	43	use Coro::EV;
41	use Coro::AnyEvent;	44	use Coro::AnyEvent;
42	use Coro::Timer;	45	use Coro::Timer;
43	use Coro::Signal;	46	use Coro::Signal;
44	use Coro::Semaphore;	47	use Coro::Semaphore;
		48	use Coro::SemaphoreSet;
45	use Coro::AnyEvent;	49	use Coro::AnyEvent;
46	use Coro::AIO;	50	use Coro::AIO;
47	use Coro::BDB 1.6;	51	use Coro::BDB 1.6;
48	use Coro::Storable;	52	use Coro::Storable;
49	use Coro::Util ();	53	use Coro::Util ();
50		54
51	use JSON::XS 2.01 ();	55	use JSON::XS 2.01 ();
52	use BDB ();	56	use BDB ();
53	use Data::Dumper;	57	use Data::Dumper;
54	use Digest::MD5;
55	use Fcntl;	58	use Fcntl;
56	use YAML ();	59	use YAML::XS ();
57	use IO::AIO ();	60	use IO::AIO ();
58	use Time::HiRes;	61	use Time::HiRes;
59	use Compress::LZF;	62	use Compress::LZF;
60	use Digest::MD5 ();	63	use Digest::MD5 ();
61		64
…		…
69	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority	72	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70		73
71	# make sure c-lzf reinitialises itself	74	# make sure c-lzf reinitialises itself
72	Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";	75	Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
73	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later	76	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
		77
		78	# strictly for debugging
		79	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
74		80
75	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	81	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
76		82
77	our %COMMAND = ();	83	our %COMMAND = ();
78	our %COMMAND_TIME = ();	84	our %COMMAND_TIME = ();
…		…
83	our %EXT_CORO = (); # coroutines bound to extensions	89	our %EXT_CORO = (); # coroutines bound to extensions
84	our %EXT_MAP = (); # pluggable maps	90	our %EXT_MAP = (); # pluggable maps
85		91
86	our $RELOAD; # number of reloads so far, non-zero while in reload	92	our $RELOAD; # number of reloads so far, non-zero while in reload
87	our @EVENT;	93	our @EVENT;
		94	our @REFLECT; # set by XS
		95	our %REFLECT; # set by us
88		96
89	our $CONFDIR = confdir;	97	our $CONFDIR = confdir;
90	our $DATADIR = datadir;	98	our $DATADIR = datadir;
91	our $LIBDIR = "$DATADIR/ext";	99	our $LIBDIR = "$DATADIR/ext";
92	our $PODDIR = "$DATADIR/pod";	100	our $PODDIR = "$DATADIR/pod";
…		…
100	our $PIDFILE = "$LOCALDIR/pid";	108	our $PIDFILE = "$LOCALDIR/pid";
101	our $RUNTIMEFILE = "$LOCALDIR/runtime";	109	our $RUNTIMEFILE = "$LOCALDIR/runtime";
102		110
103	our %RESOURCE;	111	our %RESOURCE;
104		112
		113	our $OUTPUT_RATE_MIN = 3000;
		114	our $OUTPUT_RATE_MAX = 1000000;
		115
		116	our $MAX_LINKS = 32; # how many chained exits to follow
		117	our $VERBOSE_IO = 0;#d#
		118
105	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	119	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
106	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	120	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
107	our $NEXT_TICK;	121	our $NEXT_TICK;
108	our $USE_FSYNC = 1; # use fsync to write maps - default off	122	our $USE_FSYNC = 1; # use fsync to write maps - default on
109		123
110	our $BDB_DEADLOCK_WATCHER;	124	our $BDB_DEADLOCK_WATCHER;
111	our $BDB_CHECKPOINT_WATCHER;	125	our $BDB_CHECKPOINT_WATCHER;
112	our $BDB_TRICKLE_WATCHER;	126	our $BDB_TRICKLE_WATCHER;
113	our $DB_ENV;	127	our $DB_ENV;
114		128
		129	our @EXTRA_MODULES = qw(pod match mapscript);
		130
115	our %CFG;	131	our %CFG;
116		132
117	our $UPTIME; $UPTIME ||= time;	133	our $UPTIME; $UPTIME ||= time;
118	our $RUNTIME;	134	our $RUNTIME;
119	our $NOW;	135	our $NOW;
…		…
129	our $LOADAVG; # same thing, but with alpha-smoothing	145	our $LOADAVG; # same thing, but with alpha-smoothing
130	our $JITTER; # average jitter	146	our $JITTER; # average jitter
131	our $TICK_START; # for load detecting purposes	147	our $TICK_START; # for load detecting purposes
132		148
133	our @POST_INIT;	149	our @POST_INIT;
		150
		151	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
		152	our $REALLY_UNLOOP; # never set to true, please :)
134		153
135	binmode STDOUT;	154	binmode STDOUT;
136	binmode STDERR;	155	binmode STDERR;
137		156
138	# read virtual server time, if available	157	# read virtual server time, if available
…		…
140	open my $fh, "<", $RUNTIMEFILE	159	open my $fh, "<", $RUNTIMEFILE
141	or die "unable to read $RUNTIMEFILE file: $!";	160	or die "unable to read $RUNTIMEFILE file: $!";
142	$RUNTIME = <$fh> + 0.;	161	$RUNTIME = <$fh> + 0.;
143	}	162	}
144		163
		164	eval "sub TICK() { $TICK } 1" or die;
		165
145	mkdir $_	166	mkdir $_
146	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;	167	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
147		168
148	our $EMERGENCY_POSITION;	169	our $EMERGENCY_POSITION;
149		170
150	sub cf::map::normalise;	171	sub cf::map::normalise;
		172
		173	sub in_main() {
		174	$Coro::current == $Coro::main
		175	}
		176
		177	#############################################################################
		178
		179	%REFLECT = ();
		180	for (@REFLECT) {
		181	my $reflect = JSON::XS::decode_json $_;
		182	$REFLECT{$reflect->{class}} = $reflect;
		183	}
		184
		185	# this is decidedly evil
		186	$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
151		187
152	#############################################################################	188	#############################################################################
153		189
154	=head2 GLOBAL VARIABLES	190	=head2 GLOBAL VARIABLES
155		191
…		…
202	returns directly I<after> the tick processing (and consequently, can only wake one process	238	returns directly I<after> the tick processing (and consequently, can only wake one process
203	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	239	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
204		240
205	=item @cf::INVOKE_RESULTS	241	=item @cf::INVOKE_RESULTS
206		242
207	This array contains the results of the last C<invoke ()> call. When	243	This array contains the results of the last C<invoke ()> call. When
208	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of	244	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
209	that call.	245	that call.
210		246
		247	=item %cf::REFLECT
		248
		249	Contains, for each (C++) class name, a hash reference with information
		250	about object members (methods, scalars, arrays and flags) and other
		251	metadata, which is useful for introspection.
		252
211	=back	253	=back
212		254
213	=cut	255	=cut
214		256
215	BEGIN {	257	$Coro::State::WARNHOOK = sub {
216	*CORE::GLOBAL::warn = sub {
217	my $msg = join "", @_;	258	my $msg = join "", @_;
218		259
219	$msg .= "\n"	260	$msg .= "\n"
220	unless $msg =~ /\n$/;	261	unless $msg =~ /\n$/;
221		262
222	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	263	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
223		264
224	LOG llevError, $msg;	265	LOG llevError, $msg;
225	};	266	};
226	}
227		267
228	$Coro::State::DIEHOOK = sub {	268	$Coro::State::DIEHOOK = sub {
229	return unless $^S eq 0; # "eq", not "=="	269	return unless $^S eq 0; # "eq", not "=="
230		270
231	if ($Coro::current == $Coro::main) {#d#	271	warn Carp::longmess $_[0];
		272
		273	if (in_main) {#d#
232	warn "DIEHOOK called in main context, Coro bug?\n";#d#	274	warn "DIEHOOK called in main context, Coro bug?\n";#d#
233	return;#d#	275	return;#d#
234	}#d#	276	}#d#
235		277
236	# kill coroutine otherwise	278	# kill coroutine otherwise
237	warn Carp::longmess $_[0];
238	Coro::terminate	279	Coro::terminate
239	};	280	};
240
241	$SIG{__DIE__} = sub { }; #d#?
242		281
243	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	282	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
244	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	283	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
245	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	284	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
246	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	285	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
…		…
260	)) {	299	)) {
261	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	300	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
262	}	301	}
263		302
264	$EV::DIED = sub {	303	$EV::DIED = sub {
265	warn "error in event callback: @_";	304	Carp::cluck "error in event callback: @_";
266	};	305	};
267		306
268	#############################################################################	307	#############################################################################
269		308
270	=head2 UTILITY FUNCTIONS	309	=head2 UTILITY FUNCTIONS
…		…
328	Wait until the given lock is available. See cf::lock_acquire.	367	Wait until the given lock is available. See cf::lock_acquire.
329		368
330	=item my $lock = cf::lock_acquire $string	369	=item my $lock = cf::lock_acquire $string
331		370
332	Wait until the given lock is available and then acquires it and returns	371	Wait until the given lock is available and then acquires it and returns
333	a Coro::guard object. If the guard object gets destroyed (goes out of scope,	372	a L<Guard> object. If the guard object gets destroyed (goes out of scope,
334	for example when the coroutine gets canceled), the lock is automatically	373	for example when the coroutine gets canceled), the lock is automatically
335	returned.	374	returned.
336		375
337	Locks are *not* recursive, locking from the same coro twice results in a	376	Locks are *not* recursive, locking from the same coro twice results in a
338	deadlocked coro.	377	deadlocked coro.
…		…
344		383
345	Return true if the lock is currently active, i.e. somebody has locked it.	384	Return true if the lock is currently active, i.e. somebody has locked it.
346		385
347	=cut	386	=cut
348		387
349	our %LOCK;	388	our $LOCKS = new Coro::SemaphoreSet;
350	our %LOCKER;#d#
351		389
352	sub lock_wait($) {	390	sub lock_wait($) {
353	my ($key) = @_;	391	$LOCKS->wait ($_[0]);
354
355	if ($LOCKER{$key} == $Coro::current) {#d#
356	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
357	return;#d#
358	}#d#
359
360	# wait for lock, if any
361	while ($LOCK{$key}) {
362	#local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
363	push @{ $LOCK{$key} }, $Coro::current;
364	Coro::schedule;
365	}
366	}	392	}
367		393
368	sub lock_acquire($) {	394	sub lock_acquire($) {
369	my ($key) = @_;	395	$LOCKS->guard ($_[0])
370
371	# wait, to be sure we are not locked
372	lock_wait $key;
373
374	$LOCK{$key} = [];
375	$LOCKER{$key} = $Coro::current;#d#
376
377	Coro::guard {
378	delete $LOCKER{$key};#d#
379	# wake up all waiters, to be on the safe side
380	$_->ready for @{ delete $LOCK{$key} };
381	}
382	}	396	}
383		397
384	sub lock_active($) {	398	sub lock_active($) {
385	my ($key) = @_;	399	$LOCKS->count ($_[0]) < 1
386
387	! ! $LOCK{$key}
388	}	400	}
389		401
390	sub freeze_mainloop {	402	sub freeze_mainloop {
391	tick_inhibit_inc;	403	tick_inhibit_inc;
392		404
393	Coro::guard \&tick_inhibit_dec;	405	&Guard::guard (\&tick_inhibit_dec);
394	}	406	}
395		407
396	=item cf::periodic $interval, $cb	408	=item cf::periodic $interval, $cb
397		409
398	Like EV::periodic, but randomly selects a starting point so that the actions	410	Like EV::periodic, but randomly selects a starting point so that the actions
399	get spread over timer.	411	get spread over time.
400		412
401	=cut	413	=cut
402		414
403	sub periodic($$) {	415	sub periodic($$) {
404	my ($interval, $cb) = @_;	416	my ($interval, $cb) = @_;
…		…
421		433
422	=cut	434	=cut
423		435
424	our @SLOT_QUEUE;	436	our @SLOT_QUEUE;
425	our $SLOT_QUEUE;	437	our $SLOT_QUEUE;
		438	our $SLOT_DECAY = 0.9;
426		439
427	$SLOT_QUEUE->cancel if $SLOT_QUEUE;	440	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
428	$SLOT_QUEUE = Coro::async {	441	$SLOT_QUEUE = Coro::async {
429	$Coro::current->desc ("timeslot manager");	442	$Coro::current->desc ("timeslot manager");
430		443
431	my $signal = new Coro::Signal;	444	my $signal = new Coro::Signal;
		445	my $busy;
432		446
433	while () {	447	while () {
434	next_job:	448	next_job:
		449
435	my $avail = cf::till_tick;	450	my $avail = cf::till_tick;
436	if ($avail > 0.01) {	451
437	for (0 .. $#SLOT_QUEUE) {	452	for (0 .. $#SLOT_QUEUE) {
438	if ($SLOT_QUEUE[$_][0] < $avail) {	453	if ($SLOT_QUEUE[$_][0] <= $avail) {
		454	$busy = 0;
439	my $job = splice @SLOT_QUEUE, $_, 1, ();	455	my $job = splice @SLOT_QUEUE, $_, 1, ();
440	$job->[2]->send;	456	$job->[2]->send;
441	Coro::cede;	457	Coro::cede;
442	goto next_job;	458	goto next_job;
443	}	459	} else {
		460	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
444	}	461	}
445	}	462	}
446		463
447	if (@SLOT_QUEUE) {	464	if (@SLOT_QUEUE) {
448	# we do not use wait_for_tick() as it returns immediately when tick is inactive	465	# we do not use wait_for_tick() as it returns immediately when tick is inactive
449	push @cf::WAIT_FOR_TICK, $signal;	466	push @cf::WAIT_FOR_TICK, $signal;
450	$signal->wait;	467	$signal->wait;
451	} else {	468	} else {
		469	$busy = 0;
452	Coro::schedule;	470	Coro::schedule;
453	}	471	}
454	}	472	}
455	};	473	};
456		474
457	sub get_slot($;$$) {	475	sub get_slot($;$$) {
458	return if tick_inhibit || $Coro::current == $Coro::main;	476	return if tick_inhibit || $Coro::current == $Coro::main;
459		477
460	my ($time, $pri, $name) = @_;	478	my ($time, $pri, $name) = @_;
461		479
462	$time = $TICK * .6 if $time > $TICK * .6;	480	$time = clamp $time, 0.01, $TICK * .6;
		481
463	my $sig = new Coro::Signal;	482	my $sig = new Coro::Signal;
464		483
465	push @SLOT_QUEUE, [$time, $pri, $sig, $name];	484	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
466	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;	485	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
467	$SLOT_QUEUE->ready;	486	$SLOT_QUEUE->ready;
…		…
494		513
495	sub sync_job(&) {	514	sub sync_job(&) {
496	my ($job) = @_;	515	my ($job) = @_;
497		516
498	if ($Coro::current == $Coro::main) {	517	if ($Coro::current == $Coro::main) {
499	my $time = EV::time;	518	my $time = AE::time;
500		519
501	# this is the main coro, too bad, we have to block	520	# this is the main coro, too bad, we have to block
502	# till the operation succeeds, freezing the server :/	521	# till the operation succeeds, freezing the server :/
503		522
504	LOG llevError, Carp::longmess "sync job";#d#	523	LOG llevError, Carp::longmess "sync job";#d#
…		…
521	} else {	540	} else {
522	EV::loop EV::LOOP_ONESHOT;	541	EV::loop EV::LOOP_ONESHOT;
523	}	542	}
524	}	543	}
525		544
526	my $time = EV::time - $time;	545	my $time = AE::time - $time;
527		546
528	$TICK_START += $time; # do not account sync jobs to server load	547	$TICK_START += $time; # do not account sync jobs to server load
529		548
530	wantarray ? @res : $res[0]	549	wantarray ? @res : $res[0]
531	} else {	550	} else {
…		…
575	reset_signals;	594	reset_signals;
576	&$cb	595	&$cb
577	}, @args;	596	}, @args;
578		597
579	wantarray ? @res : $res[-1]	598	wantarray ? @res : $res[-1]
		599	}
		600
		601	sub objinfo {
		602	(
		603	"counter value" => cf::object::object_count,
		604	"objects created" => cf::object::create_count,
		605	"objects destroyed" => cf::object::destroy_count,
		606	"freelist size" => cf::object::free_count,
		607	"allocated objects" => cf::object::objects_size,
		608	"active objects" => cf::object::actives_size,
		609	)
580	}	610	}
581		611
582	=item $coin = coin_from_name $name	612	=item $coin = coin_from_name $name
583		613
584	=cut	614	=cut
…		…
1165		1195
1166	sync_job {	1196	sync_job {
1167	if (length $$rdata) {	1197	if (length $$rdata) {
1168	utf8::decode (my $decname = $filename);	1198	utf8::decode (my $decname = $filename);
1169	warn sprintf "saving %s (%d,%d)\n",	1199	warn sprintf "saving %s (%d,%d)\n",
1170	$decname, length $$rdata, scalar @$objs;	1200	$decname, length $$rdata, scalar @$objs
		1201	if $VERBOSE_IO;
1171		1202
1172	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1203	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1173	aio_chmod $fh, SAVE_MODE;	1204	aio_chmod $fh, SAVE_MODE;
1174	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1205	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1175	aio_fsync $fh if $cf::USE_FSYNC;	1206	if ($cf::USE_FSYNC) {
		1207	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;
		1208	aio_fsync $fh;
		1209	}
1176	aio_close $fh;	1210	aio_close $fh;
1177		1211
1178	if (@$objs) {	1212	if (@$objs) {
1179	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {	1213	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1180	aio_chmod $fh, SAVE_MODE;	1214	aio_chmod $fh, SAVE_MODE;
1181	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };	1215	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1182	aio_write $fh, 0, (length $data), $data, 0;	1216	aio_write $fh, 0, (length $data), $data, 0;
1183	aio_fsync $fh if $cf::USE_FSYNC;	1217	if ($cf::USE_FSYNC) {
		1218	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;
		1219	aio_fsync $fh;
		1220	}
1184	aio_close $fh;	1221	aio_close $fh;
1185	aio_rename "$filename.pst~", "$filename.pst";	1222	aio_rename "$filename.pst~", "$filename.pst";
1186	}	1223	}
1187	} else {	1224	} else {
1188	aio_unlink "$filename.pst";	1225	aio_unlink "$filename.pst";
1189	}	1226	}
1190		1227
1191	aio_rename "$filename~", $filename;	1228	aio_rename "$filename~", $filename;
		1229
		1230	$filename =~ s%/[^/]+$%%;
		1231	aio_pathsync $filename if $cf::USE_FSYNC;
1192	} else {	1232	} else {
1193	warn "FATAL: $filename~: $!\n";	1233	warn "unable to save objects: $filename~: $!\n";
1194	}	1234	}
1195	} else {	1235	} else {
1196	aio_unlink $filename;	1236	aio_unlink $filename;
1197	aio_unlink "$filename.pst";	1237	aio_unlink "$filename.pst";
1198	}	1238	}
…		…
1223	$av = $st->{objs};	1263	$av = $st->{objs};
1224	}	1264	}
1225		1265
1226	utf8::decode (my $decname = $filename);	1266	utf8::decode (my $decname = $filename);
1227	warn sprintf "loading %s (%d,%d)\n",	1267	warn sprintf "loading %s (%d,%d)\n",
1228	$decname, length $data, scalar @{$av || []};	1268	$decname, length $data, scalar @{$av || []}
		1269	if $VERBOSE_IO;
1229		1270
1230	($data, $av)	1271	($data, $av)
1231	}	1272	}
1232		1273
1233	=head2 COMMAND CALLBACKS	1274	=head2 COMMAND CALLBACKS
…		…
1289	my ($name, $cb) = @_;	1330	my ($name, $cb) = @_;
1290		1331
1291	$EXTICMD{$name} = $cb;	1332	$EXTICMD{$name} = $cb;
1292	}	1333	}
1293		1334
		1335	use File::Glob ();
		1336
1294	cf::player->attach (	1337	cf::player->attach (
1295	on_command => sub {	1338	on_unknown_command => sub {
1296	my ($pl, $name, $params) = @_;	1339	my ($pl, $name, $params) = @_;
1297		1340
1298	my $cb = $COMMAND{$name}	1341	my $cb = $COMMAND{$name}
1299	or return;	1342	or return;
1300		1343
…		…
1330		1373
1331	cf::override;	1374	cf::override;
1332	},	1375	},
1333	);	1376	);
1334		1377
		1378	# "readahead" all extensions
		1379	sub cache_extensions {
		1380	my $grp = IO::AIO::aio_group;
		1381
		1382	add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
		1383	for (grep /\.ext$/, @{$_[0]}) {
		1384	add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
		1385	}
		1386	};
		1387
		1388	$grp
		1389	}
		1390
1335	sub load_extensions {	1391	sub load_extensions {
1336	cf::sync_job {	1392	cf::sync_job {
1337	my %todo;	1393	my %todo;
1338		1394
1339	for my $path (<$LIBDIR/*.ext>) {	1395	for my $path (<$LIBDIR/*.ext>) {
…		…
1366	. "\n};\n1";	1422	. "\n};\n1";
1367		1423
1368	$todo{$base} = \%ext;	1424	$todo{$base} = \%ext;
1369	}	1425	}
1370		1426
		1427	my $pass = 0;
1371	my %done;	1428	my %done;
1372	while (%todo) {	1429	while (%todo) {
1373	my $progress;	1430	my $progress;
1374		1431
		1432	++$pass;
		1433
		1434	ext:
1375	while (my ($k, $v) = each %todo) {	1435	while (my ($k, $v) = each %todo) {
1376	for (split /,\s*/, $v->{meta}{depends}) {	1436	for (split /,\s*/, $v->{meta}{depends}) {
1377	goto skip	1437	next ext
1378	unless exists $done{$_};	1438	unless exists $done{$_};
1379	}	1439	}
1380		1440
1381	warn "... loading '$k' into '$v->{pkg}'\n";	1441	warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1382		1442
1383	unless (eval $v->{source}) {	1443	my $active = eval $v->{source};
		1444
		1445	if (length $@) {
1384	my $msg = $@ ? "$v->{path}: $@\n"	1446	warn "$v->{path}: $@\n";
1385	: "$v->{base}: extension inactive.\n";
1386		1447
1387	if (exists $v->{meta}{mandatory}) {
1388	warn $msg;
1389	cf::cleanup "mandatory extension failed to load, exiting.";	1448	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1390	}	1449	if exists $v->{meta}{mandatory};
1391		1450
1392	warn $msg;	1451	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
		1452	delete $todo{$k};
		1453	} else {
		1454	$done{$k} = delete $todo{$k};
		1455	push @EXTS, $v->{pkg};
		1456	$progress = 1;
		1457
		1458	warn "$v->{base}: extension inactive.\n"
		1459	unless $active;
1393	}	1460	}
1394
1395	$done{$k} = delete $todo{$k};
1396	push @EXTS, $v->{pkg};
1397	$progress = 1;
1398	}	1461	}
1399		1462
1400	skip:	1463	unless ($progress) {
1401	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"	1464	warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1402	unless $progress;	1465
		1466	while (my ($k, $v) = each %todo) {
		1467	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
		1468	if exists $v->{meta}{mandatory};
		1469	}
		1470	}
1403	}	1471	}
1404	};	1472	};
1405	}	1473	}
1406		1474
1407	#############################################################################	1475	#############################################################################
…		…
1491	$cf::PLAYER{$login} = $pl	1559	$cf::PLAYER{$login} = $pl
1492	}	1560	}
1493	}	1561	}
1494	}	1562	}
1495		1563
		1564	cf::player->attach (
		1565	on_load => sub {
		1566	my ($pl, $path) = @_;
		1567
		1568	# restore slots saved in save, below
		1569	my $slots = delete $pl->{_slots};
		1570
		1571	$pl->ob->current_weapon ($slots->[0]);
		1572	$pl->combat_ob ($slots->[1]);
		1573	$pl->ranged_ob ($slots->[2]);
		1574	},
		1575	);
		1576
1496	sub save($) {	1577	sub save($) {
1497	my ($pl) = @_;	1578	my ($pl) = @_;
1498		1579
1499	return if $pl->{deny_save};	1580	return if $pl->{deny_save};
1500		1581
…		…
1505		1586
1506	aio_mkdir playerdir $pl, 0770;	1587	aio_mkdir playerdir $pl, 0770;
1507	$pl->{last_save} = $cf::RUNTIME;	1588	$pl->{last_save} = $cf::RUNTIME;
1508		1589
1509	cf::get_slot 0.01;	1590	cf::get_slot 0.01;
		1591
		1592	# save slots, to be restored later
		1593	local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1510		1594
1511	$pl->save_pl ($path);	1595	$pl->save_pl ($path);
1512	cf::cede_to_tick;	1596	cf::cede_to_tick;
1513	}	1597	}
1514		1598
…		…
1616	\@logins	1700	\@logins
1617	}	1701	}
1618		1702
1619	=item $player->maps	1703	=item $player->maps
1620		1704
		1705	=item cf::player::maps $login
		1706
1621	Returns an arrayref of map paths that are private for this	1707	Returns an arrayref of map paths that are private for this
1622	player. May block.	1708	player. May block.
1623		1709
1624	=cut	1710	=cut
1625		1711
…		…
1687	=cut	1773	=cut
1688		1774
1689	sub find_by_path($) {	1775	sub find_by_path($) {
1690	my ($path) = @_;	1776	my ($path) = @_;
1691		1777
		1778	$path =~ s/^~[^\/]*//; # skip ~login
		1779
1692	my ($match, $specificity);	1780	my ($match, $specificity);
1693		1781
1694	for my $region (list) {	1782	for my $region (list) {
1695	if ($region->{match} && $path =~ $region->{match}) {	1783	if ($region->{match} && $path =~ $region->{match}) {
1696	($match, $specificity) = ($region, $region->specificity)	1784	($match, $specificity) = ($region, $region->specificity)
…		…
1727	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	1815	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1728		1816
1729	# mit "rum" bekleckern, nicht	1817	# mit "rum" bekleckern, nicht
1730	$self->_create_random_map (	1818	$self->_create_random_map (
1731	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},	1819	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1732	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},	1820	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1733	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},	1821	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1734	$rmp->{exit_on_final_map},	1822	$rmp->{exit_on_final_map},
1735	$rmp->{xsize}, $rmp->{ysize},	1823	$rmp->{xsize}, $rmp->{ysize},
1736	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},	1824	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1737	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},	1825	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
…		…
1759		1847
1760	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	1848	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1761	}	1849	}
1762		1850
1763	# also paths starting with '/'	1851	# also paths starting with '/'
1764	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	1852	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1765		1853
1766	sub thawer_merge {	1854	sub thawer_merge {
1767	my ($self, $merge) = @_;	1855	my ($self, $merge) = @_;
1768		1856
1769	# we have to keep some variables in memory intact	1857	# we have to keep some variables in memory intact
…		…
1867		1955
1868	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;	1956	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1869	"$UNIQUEDIR/$path"	1957	"$UNIQUEDIR/$path"
1870	}	1958	}
1871		1959
1872	# and all this just because we cannot iterate over
1873	# all maps in C++...
1874	sub change_all_map_light {
1875	my ($change) = @_;
1876
1877	$_->change_map_light ($change)
1878	for grep $_->outdoor, values %cf::MAP;
1879	}
1880
1881	sub decay_objects {	1960	sub decay_objects {
1882	my ($self) = @_;	1961	my ($self) = @_;
1883		1962
1884	return if $self->{deny_reset};	1963	return if $self->{deny_reset};
1885		1964
…		…
1967	sub find {	2046	sub find {
1968	my ($path, $origin) = @_;	2047	my ($path, $origin) = @_;
1969		2048
1970	$path = normalise $path, $origin && $origin->path;	2049	$path = normalise $path, $origin && $origin->path;
1971		2050
1972	cf::lock_wait "map_data:$path";#d#remove	2051	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973	cf::lock_wait "map_find:$path";	2052	my $guard2 = cf::lock_acquire "map_find:$path";
1974		2053
1975	$cf::MAP{$path} || do {	2054	$cf::MAP{$path} || do {
1976	my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1977	my $guard2 = cf::lock_acquire "map_find:$path";
1978
1979	my $map = new_from_path cf::map $path	2055	my $map = new_from_path cf::map $path
1980	or return;	2056	or return;
1981		2057
1982	$map->{last_save} = $cf::RUNTIME;	2058	$map->{last_save} = $cf::RUNTIME;
1983		2059
…		…
1995		2071
1996	$cf::MAP{$path} = $map	2072	$cf::MAP{$path} = $map
1997	}	2073	}
1998	}	2074	}
1999		2075
2000	sub pre_load { }	2076	sub pre_load { }
2001	sub post_load { }	2077	#sub post_load { } # XS
2002		2078
2003	sub load {	2079	sub load {
2004	my ($self) = @_;	2080	my ($self) = @_;
2005		2081
2006	local $self->{deny_reset} = 1; # loading can take a long time	2082	local $self->{deny_reset} = 1; # loading can take a long time
…		…
2051	unless ($self->{deny_activate}) {	2127	unless ($self->{deny_activate}) {
2052	$self->decay_objects;	2128	$self->decay_objects;
2053	$self->fix_auto_apply;	2129	$self->fix_auto_apply;
2054	$self->update_buttons;	2130	$self->update_buttons;
2055	cf::cede_to_tick;	2131	cf::cede_to_tick;
2056	$self->set_darkness_map;
2057	cf::cede_to_tick;
2058	$self->activate;	2132	$self->activate;
2059	}	2133	}
2060		2134
2061	$self->{last_save} = $cf::RUNTIME;	2135	$self->{last_save} = $cf::RUNTIME;
2062	$self->last_access ($cf::RUNTIME);	2136	$self->last_access ($cf::RUNTIME);
…		…
2065	}	2139	}
2066		2140
2067	$self->post_load;	2141	$self->post_load;
2068	}	2142	}
2069		2143
		2144	# customize the map for a given player, i.e.
		2145	# return the _real_ map. used by e.g. per-player
		2146	# maps to change the path to ~playername/mappath
2070	sub customise_for {	2147	sub customise_for {
2071	my ($self, $ob) = @_;	2148	my ($self, $ob) = @_;
2072		2149
2073	return find "~" . $ob->name . "/" . $self->{path}	2150	return find "~" . $ob->name . "/" . $self->{path}
2074	if $self->per_player;	2151	if $self->per_player;
…		…
2090	or next;	2167	or next;
2091	$neigh = find $neigh, $map	2168	$neigh = find $neigh, $map
2092	or next;	2169	or next;
2093	$neigh->load;	2170	$neigh->load;
2094		2171
		2172	# now find the diagonal neighbours
2095	push @neigh,	2173	push @neigh,
2096	[$neigh->tile_path (($_ + 3) % 4), $neigh],	2174	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2097	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2175	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2098	}	2176	}
2099		2177
…		…
2151	$MAP_PREFETCHER->prio (6);	2229	$MAP_PREFETCHER->prio (6);
2152		2230
2153	()	2231	()
2154	}	2232	}
2155		2233
		2234	# common code, used by both ->save and ->swapout
2156	sub save {	2235	sub _save {
2157	my ($self) = @_;	2236	my ($self) = @_;
2158
2159	my $lock = cf::lock_acquire "map_data:$self->{path}";
2160		2237
2161	$self->{last_save} = $cf::RUNTIME;	2238	$self->{last_save} = $cf::RUNTIME;
2162		2239
2163	return unless $self->dirty;	2240	return unless $self->dirty;
2164		2241
…		…
2184	} else {	2261	} else {
2185	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);	2262	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2186	}	2263	}
2187	}	2264	}
2188		2265
		2266	sub save {
		2267	my ($self) = @_;
		2268
		2269	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2270
		2271	$self->_save;
		2272	}
		2273
2189	sub swap_out {	2274	sub swap_out {
2190	my ($self) = @_;	2275	my ($self) = @_;
2191		2276
2192	# save first because save cedes
2193	$self->save;
2194
2195	my $lock = cf::lock_acquire "map_data:$self->{path}";	2277	my $lock = cf::lock_acquire "map_data:$self->{path}";
2196		2278
2197	return if $self->players;
2198	return if $self->in_memory != cf::MAP_ACTIVE;	2279	return if $self->in_memory != cf::MAP_ACTIVE;
2199	return if $self->{deny_save};	2280	return if $self->{deny_save};
		2281	return if $self->players;
2200		2282
		2283	# first deactivate the map and "unlink" it from the core
		2284	$self->deactivate;
		2285	$_->clear_links_to ($self) for values %cf::MAP;
2201	$self->in_memory (cf::MAP_SWAPPED);	2286	$self->in_memory (cf::MAP_SWAPPED);
		2287
		2288	# then atomically save
		2289	$self->_save;
		2290
		2291	# then free the map
		2292	$self->clear;
		2293	}
		2294
		2295	sub reset_at {
		2296	my ($self) = @_;
		2297
		2298	# TODO: safety, remove and allow resettable per-player maps
		2299	return 1e99 if $self->{deny_reset};
		2300
		2301	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
		2302	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
		2303
		2304	$time + $to
		2305	}
		2306
		2307	sub should_reset {
		2308	my ($self) = @_;
		2309
		2310	$self->reset_at <= $cf::RUNTIME
		2311	}
		2312
		2313	sub reset {
		2314	my ($self) = @_;
		2315
		2316	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2317
		2318	return if $self->players;
		2319
		2320	warn "resetting map ", $self->path, "\n";
		2321
		2322	$self->in_memory (cf::MAP_SWAPPED);
		2323
		2324	# need to save uniques path
		2325	unless ($self->{deny_save}) {
		2326	my $uniq = $self->uniq_path; utf8::encode $uniq;
		2327
		2328	$self->_save_objects ($uniq, cf::IO_UNIQUES)
		2329	if $uniq;
		2330	}
		2331
		2332	delete $cf::MAP{$self->path};
2202		2333
2203	$self->deactivate;	2334	$self->deactivate;
2204	$_->clear_links_to ($self) for values %cf::MAP;	2335	$_->clear_links_to ($self) for values %cf::MAP;
2205	$self->clear;	2336	$self->clear;
2206	}
2207
2208	sub reset_at {
2209	my ($self) = @_;
2210
2211	# TODO: safety, remove and allow resettable per-player maps
2212	return 1e99 if $self->{deny_reset};
2213
2214	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2215	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2216
2217	$time + $to
2218	}
2219
2220	sub should_reset {
2221	my ($self) = @_;
2222
2223	$self->reset_at <= $cf::RUNTIME
2224	}
2225
2226	sub reset {
2227	my ($self) = @_;
2228
2229	my $lock = cf::lock_acquire "map_data:$self->{path}";
2230
2231	return if $self->players;
2232
2233	warn "resetting map ", $self->path;
2234
2235	$self->in_memory (cf::MAP_SWAPPED);
2236
2237	# need to save uniques path
2238	unless ($self->{deny_save}) {
2239	my $uniq = $self->uniq_path; utf8::encode $uniq;
2240
2241	$self->_save_objects ($uniq, cf::IO_UNIQUES)
2242	if $uniq;
2243	}
2244
2245	delete $cf::MAP{$self->path};
2246
2247	$self->deactivate;
2248	$_->clear_links_to ($self) for values %cf::MAP;
2249	$self->clear;
2250		2337
2251	$self->unlink_save;	2338	$self->unlink_save;
2252	$self->destroy;	2339	$self->destroy;
2253	}	2340	}
2254		2341
…		…
2262		2349
2263	delete $cf::MAP{$self->path};	2350	delete $cf::MAP{$self->path};
2264		2351
2265	$self->unlink_save;	2352	$self->unlink_save;
2266		2353
2267	bless $self, "cf::map";	2354	bless $self, "cf::map::wrap";
2268	delete $self->{deny_reset};	2355	delete $self->{deny_reset};
2269	$self->{deny_save} = 1;	2356	$self->{deny_save} = 1;
2270	$self->reset_timeout (1);	2357	$self->reset_timeout (1);
2271	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2358	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2272		2359
…		…
2329	: normalise $_	2416	: normalise $_
2330	} @{ aio_readdir $UNIQUEDIR or [] }	2417	} @{ aio_readdir $UNIQUEDIR or [] }
2331	]	2418	]
2332	}	2419	}
2333		2420
		2421	=item cf::map::static_maps
		2422
		2423	Returns an arrayref if paths of all static maps (all preinstalled F<.map>
		2424	file in the shared directory excluding F</styles> and F</editor>). May
		2425	block.
		2426
		2427	=cut
		2428
		2429	sub static_maps() {
		2430	my @dirs = "";
		2431	my @maps;
		2432
		2433	while (@dirs) {
		2434	my $dir = shift @dirs;
		2435
		2436	next if $dir eq "/styles" || $dir eq "/editor";
		2437
		2438	my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
		2439	or return;
		2440
		2441	for (@$files) {
		2442	s/\.map$// or next;
		2443	utf8::decode $_;
		2444	push @maps, "$dir/$_";
		2445	}
		2446
		2447	push @dirs, map "$dir/$_", @$dirs;
		2448	}
		2449
		2450	\@maps
		2451	}
		2452
2334	=back	2453	=back
2335		2454
2336	=head3 cf::object	2455	=head3 cf::object
2337		2456
2338	=cut	2457	=cut
…		…
2403		2522
2404	our $SAY_CHANNEL = {	2523	our $SAY_CHANNEL = {
2405	id => "say",	2524	id => "say",
2406	title => "Map",	2525	title => "Map",
2407	reply => "say ",	2526	reply => "say ",
2408	tooltip => "Things said to and replied from npcs near you and other players on the same map only.",	2527	tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2409	};	2528	};
2410		2529
2411	our $CHAT_CHANNEL = {	2530	our $CHAT_CHANNEL = {
2412	id => "chat",	2531	id => "chat",
2413	title => "Chat",	2532	title => "Chat",
…		…
2470		2589
2471	Freezes the player and moves him/her to a special map (C<{link}>).	2590	Freezes the player and moves him/her to a special map (C<{link}>).
2472		2591
2473	The player should be reasonably safe there for short amounts of time (e.g.	2592	The player should be reasonably safe there for short amounts of time (e.g.
2474	for loading a map). You I<MUST> call C<leave_link> as soon as possible,	2593	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2475	though, as the palyer cannot control the character while it is on the link	2594	though, as the player cannot control the character while it is on the link
2476	map.	2595	map.
2477		2596
2478	Will never block.	2597	Will never block.
2479		2598
2480	=item $player_object->leave_link ($map, $x, $y)	2599	=item $player_object->leave_link ($map, $x, $y)
…		…
2501	sub cf::object::player::enter_link {	2620	sub cf::object::player::enter_link {
2502	my ($self) = @_;	2621	my ($self) = @_;
2503		2622
2504	$self->deactivate_recursive;	2623	$self->deactivate_recursive;
2505		2624
		2625	++$self->{_link_recursion};
		2626
2506	return if UNIVERSAL::isa $self->map, "ext::map_link";	2627	return if UNIVERSAL::isa $self->map, "ext::map_link";
2507		2628
2508	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2629	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2509	if $self->map && $self->map->{path} ne "{link}";	2630	if $self->map && $self->map->{path} ne "{link}";
2510		2631
2511	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2632	$self->enter_map ($LINK_MAP || link_map, 3, 3);
2512	}	2633	}
2513		2634
2514	sub cf::object::player::leave_link {	2635	sub cf::object::player::leave_link {
2515	my ($self, $map, $x, $y) = @_;	2636	my ($self, $map, $x, $y) = @_;
2516		2637
…		…
2533	($x, $y) = (-1, -1)	2654	($x, $y) = (-1, -1)
2534	unless (defined $x) && (defined $y);	2655	unless (defined $x) && (defined $y);
2535		2656
2536	# use -1 or undef as default coordinates, not 0, 0	2657	# use -1 or undef as default coordinates, not 0, 0
2537	($x, $y) = ($map->enter_x, $map->enter_y)	2658	($x, $y) = ($map->enter_x, $map->enter_y)
2538	if $x <=0 && $y <= 0;	2659	if $x <= 0 && $y <= 0;
2539		2660
2540	$map->load;	2661	$map->load;
2541	$map->load_neighbours;	2662	$map->load_neighbours;
2542		2663
2543	return unless $self->contr->active;	2664	return unless $self->contr->active;
2544	$self->flag (cf::FLAG_DEBUG, 0);#d# temp
2545	$self->activate_recursive;
2546		2665
2547	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2666	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2548	$self->enter_map ($map, $x, $y);	2667	if ($self->enter_map ($map, $x, $y)) {
2549	}	2668	# entering was successful
		2669	delete $self->{_link_recursion};
		2670	# only activate afterwards, to support waiting in hooks
		2671	$self->activate_recursive;
		2672	}
2550		2673
		2674	}
		2675
2551	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2676	=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2552		2677
2553	Moves the player to the given map-path and coordinates by first freezing	2678	Moves the player to the given map-path and coordinates by first freezing
2554	her, loading and preparing them map, calling the provided $check callback	2679	her, loading and preparing them map, calling the provided $check callback
2555	that has to return the map if sucecssful, and then unfreezes the player on	2680	that has to return the map if sucecssful, and then unfreezes the player on
2556	the new (success) or old (failed) map position. In either case, $done will	2681	the new (success) or old (failed) map position. In either case, $done will
…		…
2563		2688
2564	our $GOTOGEN;	2689	our $GOTOGEN;
2565		2690
2566	sub cf::object::player::goto {	2691	sub cf::object::player::goto {
2567	my ($self, $path, $x, $y, $check, $done) = @_;	2692	my ($self, $path, $x, $y, $check, $done) = @_;
		2693
		2694	if ($self->{_link_recursion} >= $MAX_LINKS) {
		2695	warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
		2696	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
		2697	($path, $x, $y) = @$EMERGENCY_POSITION;
		2698	}
2568		2699
2569	# do generation counting so two concurrent goto's will be executed in-order	2700	# do generation counting so two concurrent goto's will be executed in-order
2570	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2701	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2571		2702
2572	$self->enter_link;	2703	$self->enter_link;
…		…
2596	my $map = eval {	2727	my $map = eval {
2597	my $map = defined $path ? cf::map::find $path : undef;	2728	my $map = defined $path ? cf::map::find $path : undef;
2598		2729
2599	if ($map) {	2730	if ($map) {
2600	$map = $map->customise_for ($self);	2731	$map = $map->customise_for ($self);
2601	$map = $check->($map) if $check && $map;	2732	$map = $check->($map, $x, $y, $self) if $check && $map;
2602	} else {	2733	} else {
2603	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);	2734	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2604	}	2735	}
2605		2736
2606	$map	2737	$map
…		…
2614	if ($gen == $self->{_goto_generation}) {	2745	if ($gen == $self->{_goto_generation}) {
2615	delete $self->{_goto_generation};	2746	delete $self->{_goto_generation};
2616	$self->leave_link ($map, $x, $y);	2747	$self->leave_link ($map, $x, $y);
2617	}	2748	}
2618		2749
2619	$done->() if $done;	2750	$done->($self) if $done;
2620	})->prio (1);	2751	})->prio (1);
2621	}	2752	}
2622		2753
2623	=item $player_object->enter_exit ($exit_object)	2754	=item $player_object->enter_exit ($exit_object)
2624		2755
…		…
2741		2872
2742	utf8::encode $text;	2873	utf8::encode $text;
2743	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2874	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2744	}	2875	}
2745		2876
		2877	=item $client->send_big_packet ($pkt)
		2878
		2879	Like C<send_packet>, but tries to compress large packets, and fragments
		2880	them as required.
		2881
		2882	=cut
		2883
		2884	our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
		2885
		2886	sub cf::client::send_big_packet {
		2887	my ($self, $pkt) = @_;
		2888
		2889	# try lzf for large packets
		2890	$pkt = "lzf " . Compress::LZF::compress $pkt
		2891	if 1024 <= length $pkt and $self->{can_lzf};
		2892
		2893	# split very large packets
		2894	if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
		2895	$self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
		2896	$pkt = "frag";
		2897	}
		2898
		2899	$self->send_packet ($pkt);
		2900	}
		2901
2746	=item $client->send_msg ($channel, $msg, $color, [extra...])	2902	=item $client->send_msg ($channel, $msg, $color, [extra...])
2747		2903
2748	Send a drawinfo or msg packet to the client, formatting the msg for the	2904	Send a drawinfo or msg packet to the client, formatting the msg for the
2749	client if neccessary. C<$type> should be a string identifying the type of	2905	client if neccessary. C<$type> should be a string identifying the type of
2750	the message, with C<log> being the default. If C<$color> is negative, suppress	2906	the message, with C<log> being the default. If C<$color> is negative, suppress
…		…
2752		2908
2753	=cut	2909	=cut
2754		2910
2755	# non-persistent channels (usually the info channel)	2911	# non-persistent channels (usually the info channel)
2756	our %CHANNEL = (	2912	our %CHANNEL = (
		2913	"c/motd" => {
		2914	id => "infobox",
		2915	title => "MOTD",
		2916	reply => undef,
		2917	tooltip => "The message of the day",
		2918	},
2757	"c/identify" => {	2919	"c/identify" => {
2758	id => "infobox",	2920	id => "infobox",
2759	title => "Identify",	2921	title => "Identify",
2760	reply => undef,	2922	reply => undef,
2761	tooltip => "Items recently identified",	2923	tooltip => "Items recently identified",
…		…
2763	"c/examine" => {	2925	"c/examine" => {
2764	id => "infobox",	2926	id => "infobox",
2765	title => "Examine",	2927	title => "Examine",
2766	reply => undef,	2928	reply => undef,
2767	tooltip => "Signs and other items you examined",	2929	tooltip => "Signs and other items you examined",
		2930	},
		2931	"c/shopinfo" => {
		2932	id => "infobox",
		2933	title => "Shop Info",
		2934	reply => undef,
		2935	tooltip => "What your bargaining skill tells you about the shop",
2768	},	2936	},
2769	"c/book" => {	2937	"c/book" => {
2770	id => "infobox",	2938	id => "infobox",
2771	title => "Book",	2939	title => "Book",
2772	reply => undef,	2940	reply => undef,
…		…
2788	id => "infobox",	2956	id => "infobox",
2789	title => "Body Parts",	2957	title => "Body Parts",
2790	reply => undef,	2958	reply => undef,
2791	tooltip => "Shows which body parts you posess and are available",	2959	tooltip => "Shows which body parts you posess and are available",
2792	},	2960	},
		2961	"c/statistics" => {
		2962	id => "infobox",
		2963	title => "Statistics",
		2964	reply => undef,
		2965	tooltip => "Shows your primary statistics",
		2966	},
2793	"c/skills" => {	2967	"c/skills" => {
2794	id => "infobox",	2968	id => "infobox",
2795	title => "Skills",	2969	title => "Skills",
2796	reply => undef,	2970	reply => undef,
2797	tooltip => "Shows your experience per skill and item power",	2971	tooltip => "Shows your experience per skill and item power",
		2972	},
		2973	"c/shopitems" => {
		2974	id => "infobox",
		2975	title => "Shop Items",
		2976	reply => undef,
		2977	tooltip => "Shows the items currently for sale in this shop",
		2978	},
		2979	"c/resistances" => {
		2980	id => "infobox",
		2981	title => "Resistances",
		2982	reply => undef,
		2983	tooltip => "Shows your resistances",
		2984	},
		2985	"c/pets" => {
		2986	id => "infobox",
		2987	title => "Pets",
		2988	reply => undef,
		2989	tooltip => "Shows information abotu your pets/a specific pet",
		2990	},
		2991	"c/perceiveself" => {
		2992	id => "infobox",
		2993	title => "Perceive Self",
		2994	reply => undef,
		2995	tooltip => "You gained detailed knowledge about yourself",
2798	},	2996	},
2799	"c/uptime" => {	2997	"c/uptime" => {
2800	id => "infobox",	2998	id => "infobox",
2801	title => "Uptime",	2999	title => "Uptime",
2802	reply => undef,	3000	reply => undef,
…		…
2812	id => "party",	3010	id => "party",
2813	title => "Party",	3011	title => "Party",
2814	reply => "gsay ",	3012	reply => "gsay ",
2815	tooltip => "Messages and chat related to your party",	3013	tooltip => "Messages and chat related to your party",
2816	},	3014	},
		3015	"c/death" => {
		3016	id => "death",
		3017	title => "Death",
		3018	reply => undef,
		3019	tooltip => "Reason for and more info about your most recent death",
		3020	},
		3021	"c/say" => $SAY_CHANNEL,
		3022	"c/chat" => $CHAT_CHANNEL,
2817	);	3023	);
2818		3024
2819	sub cf::client::send_msg {	3025	sub cf::client::send_msg {
2820	my ($self, $channel, $msg, $color, @extra) = @_;	3026	my ($self, $channel, $msg, $color, @extra) = @_;
2821		3027
…		…
2826		3032
2827	# check predefined channels, for the benefit of C	3033	# check predefined channels, for the benefit of C
2828	if ($CHANNEL{$channel}) {	3034	if ($CHANNEL{$channel}) {
2829	$channel = $CHANNEL{$channel};	3035	$channel = $CHANNEL{$channel};
2830		3036
2831	$self->ext_msg (channel_info => $channel)	3037	$self->ext_msg (channel_info => $channel);
2832	if $self->can_msg;
2833
2834	$channel = $channel->{id};	3038	$channel = $channel->{id};
2835		3039
2836	} elsif (ref $channel) {	3040	} elsif (ref $channel) {
2837	# send meta info to client, if not yet sent	3041	# send meta info to client, if not yet sent
2838	unless (exists $self->{channel}{$channel->{id}}) {	3042	unless (exists $self->{channel}{$channel->{id}}) {
2839	$self->{channel}{$channel->{id}} = $channel;	3043	$self->{channel}{$channel->{id}} = $channel;
2840	$self->ext_msg (channel_info => $channel)	3044	$self->ext_msg (channel_info => $channel);
2841	if $self->can_msg;
2842	}	3045	}
2843		3046
2844	$channel = $channel->{id};	3047	$channel = $channel->{id};
2845	}	3048	}
2846		3049
2847	return unless @extra || length $msg;	3050	return unless @extra || length $msg;
2848		3051
2849	if ($self->can_msg) {
2850	# default colour, mask it out	3052	# default colour, mask it out
2851	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)	3053	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2852	if $color & cf::NDI_DEF;	3054	if $color & cf::NDI_DEF;
2853		3055
2854	my $pkt = "msg "	3056	my $pkt = "msg "
2855	. $self->{json_coder}->encode (	3057	. $self->{json_coder}->encode (
2856	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]	3058	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2857	);	3059	);
2858		3060
2859	# try lzf for large packets
2860	$pkt = "lzf " . Compress::LZF::compress $pkt
2861	if 1024 <= length $pkt and $self->{can_lzf};
2862
2863	# split very large packets
2864	if (8192 < length $pkt and $self->{can_lzf}) {
2865	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2866	$pkt = "frag";
2867	}
2868
2869	$self->send_packet ($pkt);	3061	$self->send_big_packet ($pkt);
2870	} else {
2871	if ($color >= 0) {
2872	# replace some tags by gcfclient-compatible ones
2873	for ($msg) {
2874	1 while
2875	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2876	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2877	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2878	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2879	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2880	}
2881
2882	$color &= cf::NDI_COLOR_MASK;
2883
2884	utf8::encode $msg;
2885
2886	if (0 && $msg =~ /\[/) {
2887	# COMMAND/INFO
2888	$self->send_packet ("drawextinfo $color 10 8 $msg")
2889	} else {
2890	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2891	$self->send_packet ("drawinfo $color $msg")
2892	}
2893	}
2894	}
2895	}	3062	}
2896		3063
2897	=item $client->ext_msg ($type, @msg)	3064	=item $client->ext_msg ($type, @msg)
2898		3065
2899	Sends an ext event to the client.	3066	Sends an ext event to the client.
…		…
2902		3069
2903	sub cf::client::ext_msg($$@) {	3070	sub cf::client::ext_msg($$@) {
2904	my ($self, $type, @msg) = @_;	3071	my ($self, $type, @msg) = @_;
2905		3072
2906	if ($self->extcmd == 2) {	3073	if ($self->extcmd == 2) {
2907	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3074	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2908	} elsif ($self->extcmd == 1) { # TODO: remove	3075	} elsif ($self->extcmd == 1) { # TODO: remove
2909	push @msg, msgtype => "event_$type";	3076	push @msg, msgtype => "event_$type";
2910	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3077	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911	}	3078	}
2912	}	3079	}
2913		3080
2914	=item $client->ext_reply ($msgid, @msg)	3081	=item $client->ext_reply ($msgid, @msg)
2915		3082
…		…
2919		3086
2920	sub cf::client::ext_reply($$@) {	3087	sub cf::client::ext_reply($$@) {
2921	my ($self, $id, @msg) = @_;	3088	my ($self, $id, @msg) = @_;
2922		3089
2923	if ($self->extcmd == 2) {	3090	if ($self->extcmd == 2) {
2924	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));	3091	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2925	} elsif ($self->extcmd == 1) {	3092	} elsif ($self->extcmd == 1) {
2926	#TODO: version 1, remove	3093	#TODO: version 1, remove
2927	unshift @msg, msgtype => "reply", msgid => $id;	3094	unshift @msg, msgtype => "reply", msgid => $id;
2928	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3095	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2929	}	3096	}
2930	}	3097	}
2931		3098
2932	=item $success = $client->query ($flags, "text", \&cb)	3099	=item $success = $client->query ($flags, "text", \&cb)
2933		3100
…		…
3034		3201
3035	$coro	3202	$coro
3036	}	3203	}
3037		3204
3038	cf::client->attach (	3205	cf::client->attach (
3039	on_destroy => sub {	3206	on_client_destroy => sub {
3040	my ($ns) = @_;	3207	my ($ns) = @_;
3041		3208
3042	$_->cancel for values %{ (delete $ns->{_coro}) || {} };	3209	$_->cancel for values %{ (delete $ns->{_coro}) || {} };
3043	},	3210	},
3044	);	3211	);
…		…
3060	our $safe_hole = new Safe::Hole;	3227	our $safe_hole = new Safe::Hole;
3061		3228
3062	$SIG{FPE} = 'IGNORE';	3229	$SIG{FPE} = 'IGNORE';
3063		3230
3064	$safe->permit_only (Opcode::opset qw(	3231	$safe->permit_only (Opcode::opset qw(
3065	:base_core :base_mem :base_orig :base_math	3232	:base_core :base_mem :base_orig :base_math :base_loop
3066	grepstart grepwhile mapstart mapwhile	3233	grepstart grepwhile mapstart mapwhile
3067	sort time	3234	sort time
3068	));	3235	));
3069		3236
3070	# here we export the classes and methods available to script code	3237	# here we export the classes and methods available to script code
…		…
3074	The following functions and methods are available within a safe environment:	3241	The following functions and methods are available within a safe environment:
3075		3242
3076	cf::object	3243	cf::object
3077	contr pay_amount pay_player map x y force_find force_add destroy	3244	contr pay_amount pay_player map x y force_find force_add destroy
3078	insert remove name archname title slaying race decrease split	3245	insert remove name archname title slaying race decrease split
		3246	value
3079		3247
3080	cf::object::player	3248	cf::object::player
3081	player	3249	player
3082		3250
3083	cf::player	3251	cf::player
…		…
3089	=cut	3257	=cut
3090		3258
3091	for (	3259	for (
3092	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	3260	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3093	insert remove inv nrof name archname title slaying race	3261	insert remove inv nrof name archname title slaying race
3094	decrease split destroy change_exp)],	3262	decrease split destroy change_exp value msg lore send_msg)],
3095	["cf::object::player" => qw(player)],	3263	["cf::object::player" => qw(player)],
3096	["cf::player" => qw(peaceful)],	3264	["cf::player" => qw(peaceful send_msg)],
3097	["cf::map" => qw(trigger)],	3265	["cf::map" => qw(trigger)],
3098	) {	3266	) {
3099	no strict 'refs';	3267	no strict 'refs';
3100	my ($pkg, @funs) = @$_;	3268	my ($pkg, @funs) = @$_;
3101	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3269	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
…		…
3119		3287
3120	my $qcode = $code;	3288	my $qcode = $code;
3121	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3289	$qcode =~ s/"/‟/g; # not allowed in #line filenames
3122	$qcode =~ s/\n/\\n/g;	3290	$qcode =~ s/\n/\\n/g;
3123		3291
		3292	%vars = (_dummy => 0) unless %vars;
		3293
		3294	my @res;
3124	local $_;	3295	local $_;
3125	local @safe::cf::_safe_eval_args = values %vars;
3126		3296
3127	my $eval =	3297	my $eval =
3128	"do {\n"	3298	"do {\n"
3129	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"	3299	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3130	. "#line 0 \"{$qcode}\"\n"	3300	. "#line 0 \"{$qcode}\"\n"
3131	. $code	3301	. $code
3132	. "\n}"	3302	. "\n}"
3133	;	3303	;
3134		3304
		3305	if ($CFG{safe_eval}) {
3135	sub_generation_inc;	3306	sub_generation_inc;
		3307	local @safe::cf::_safe_eval_args = values %vars;
3136	my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);	3308	@res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3137	sub_generation_inc;	3309	sub_generation_inc;
		3310	} else {
		3311	local @cf::_safe_eval_args = values %vars;
		3312	@res = wantarray ? eval eval : scalar eval $eval;
		3313	}
3138		3314
3139	if ($@) {	3315	if ($@) {
3140	warn "$@";	3316	warn "$@";
3141	warn "while executing safe code '$code'\n";	3317	warn "while executing safe code '$code'\n";
3142	warn "with arguments " . (join " ", %vars) . "\n";	3318	warn "with arguments " . (join " ", %vars) . "\n";
…		…
3161	=cut	3337	=cut
3162		3338
3163	sub register_script_function {	3339	sub register_script_function {
3164	my ($fun, $cb) = @_;	3340	my ($fun, $cb) = @_;
3165		3341
3166	no strict 'refs';	3342	$fun = "safe::$fun" if $CFG{safe_eval};
3167	*{"safe::$fun"} = $safe_hole->wrap ($cb);	3343	*$fun = $safe_hole->wrap ($cb);
3168	}	3344	}
3169		3345
3170	=back	3346	=back
3171		3347
3172	=cut	3348	=cut
…		…
3193		3369
3194	$facedata->{version} == 2	3370	$facedata->{version} == 2
3195	or cf::cleanup "$path: version mismatch, cannot proceed.";	3371	or cf::cleanup "$path: version mismatch, cannot proceed.";
3196		3372
3197	# patch in the exptable	3373	# patch in the exptable
		3374	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3198	$facedata->{resource}{"res/exp_table"} = {	3375	$facedata->{resource}{"res/exp_table"} = {
3199	type => FT_RSRC,	3376	type => FT_RSRC,
3200	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),	3377	data => $exp_table,
		3378	hash => (Digest::MD5::md5 $exp_table),
3201	};	3379	};
3202	cf::cede_to_tick;	3380	cf::cede_to_tick;
3203		3381
3204	{	3382	{
3205	my $faces = $facedata->{faceinfo};	3383	my $faces = $facedata->{faceinfo};
…		…
3207	while (my ($face, $info) = each %$faces) {	3385	while (my ($face, $info) = each %$faces) {
3208	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3386	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3209		3387
3210	cf::face::set_visibility $idx, $info->{visibility};	3388	cf::face::set_visibility $idx, $info->{visibility};
3211	cf::face::set_magicmap $idx, $info->{magicmap};	3389	cf::face::set_magicmap $idx, $info->{magicmap};
3212	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};	3390	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3213	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};	3391	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3214		3392
3215	cf::cede_to_tick;	3393	cf::cede_to_tick;
3216	}	3394	}
3217		3395
3218	while (my ($face, $info) = each %$faces) {	3396	while (my ($face, $info) = each %$faces) {
…		…
3242		3420
3243	cf::anim::invalidate_all; # d'oh	3421	cf::anim::invalidate_all; # d'oh
3244	}	3422	}
3245		3423
3246	{	3424	{
3247	# TODO: for gcfclient pleasure, we should give resources
3248	# that gcfclient doesn't grok a >10000 face index.
3249	my $res = $facedata->{resource};	3425	my $res = $facedata->{resource};
3250		3426
3251	while (my ($name, $info) = each %$res) {	3427	while (my ($name, $info) = each %$res) {
3252	if (defined $info->{type}) {	3428	if (defined $info->{type}) {
3253	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3429	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3254	my $data;
3255		3430
3256	if ($info->{type} & 1) {	3431	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3257	# prepend meta info
3258
3259	my $meta = $enc->encode ({
3260	name => $name,
3261	%{ $info->{meta} || {} },
3262	});
3263
3264	$data = pack "(w/a*)*", $meta, $info->{data};
3265	} else {
3266	$data = $info->{data};
3267	}
3268
3269	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3270	cf::face::set_type $idx, $info->{type};	3432	cf::face::set_type $idx, $info->{type};
3271	} else {	3433	} else {
3272	$RESOURCE{$name} = $info;	3434	$RESOURCE{$name} = $info;
3273	}	3435	}
3274		3436
…		…
3358		3520
3359	warn "finished reloading resource files\n";	3521	warn "finished reloading resource files\n";
3360	}	3522	}
3361		3523
3362	sub reload_config {	3524	sub reload_config {
		3525	warn "reloading config file...\n";
		3526
3363	open my $fh, "<:utf8", "$CONFDIR/config"	3527	open my $fh, "<:utf8", "$CONFDIR/config"
3364	or return;	3528	or return;
3365		3529
3366	local $/;	3530	local $/;
3367	*CFG = YAML::Load <$fh>;	3531	*CFG = YAML::XS::Load scalar <$fh>;
3368		3532
3369	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3533	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3370		3534
3371	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3535	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3372	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3536	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3373		3537
3374	if (exists $CFG{mlockall}) {	3538	if (exists $CFG{mlockall}) {
…		…
3376	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3540	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3377	and die "WARNING: m(un)lockall failed: $!\n";	3541	and die "WARNING: m(un)lockall failed: $!\n";
3378	};	3542	};
3379	warn $@ if $@;	3543	warn $@ if $@;
3380	}	3544	}
		3545
		3546	warn "finished reloading resource files\n";
3381	}	3547	}
3382		3548
3383	sub pidfile() {	3549	sub pidfile() {
3384	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3550	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3385	or die "$PIDFILE: $!";	3551	or die "$PIDFILE: $!";
…		…
3397		3563
3398	seek $fh, 0, 0;	3564	seek $fh, 0, 0;
3399	print $fh $$;	3565	print $fh $$;
3400	}	3566	}
3401		3567
		3568	sub main_loop {
		3569	warn "EV::loop starting\n";
		3570	if (1) {
		3571	EV::loop;
		3572	}
		3573	warn "EV::loop returned\n";
		3574	goto &main_loop unless $REALLY_UNLOOP;
		3575	}
		3576
3402	sub main {	3577	sub main {
3403	cf::init_globals; # initialise logging	3578	cf::init_globals; # initialise logging
3404		3579
3405	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3580	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3406	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3581	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3407	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3582	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3408	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3583	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3409
3410	cf::init_experience;
3411	cf::init_anim;
3412	cf::init_attackmess;
3413	cf::init_dynamic;
3414	cf::init_block;
3415		3584
3416	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3585	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3417		3586
3418	# we must not ever block the main coroutine	3587	# we must not ever block the main coroutine
3419	local $Coro::idle = sub {	3588	local $Coro::idle = sub {
…		…
3425	};	3594	};
3426		3595
3427	evthread_start IO::AIO::poll_fileno;	3596	evthread_start IO::AIO::poll_fileno;
3428		3597
3429	cf::sync_job {	3598	cf::sync_job {
		3599	cf::init_experience;
		3600	cf::init_anim;
		3601	cf::init_attackmess;
		3602	cf::init_dynamic;
		3603
		3604	cf::load_settings;
		3605	cf::load_materials;
		3606
3430	reload_resources;	3607	reload_resources;
3431	reload_config;	3608	reload_config;
3432	db_init;	3609	db_init;
3433		3610
3434	cf::load_settings;
3435	cf::load_materials;
3436	cf::init_uuid;	3611	cf::init_uuid;
3437	cf::init_signals;	3612	cf::init_signals;
3438	cf::init_commands;
3439	cf::init_skills;	3613	cf::init_skills;
3440		3614
3441	cf::init_beforeplay;	3615	cf::init_beforeplay;
3442		3616
3443	atomic;	3617	atomic;
…		…
3445	load_extensions;	3619	load_extensions;
3446		3620
3447	utime time, time, $RUNTIMEFILE;	3621	utime time, time, $RUNTIMEFILE;
3448		3622
3449	# no (long-running) fork's whatsoever before this point(!)	3623	# no (long-running) fork's whatsoever before this point(!)
		3624	use POSIX ();
3450	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3625	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3451		3626
3452	(pop @POST_INIT)->(0) while @POST_INIT;	3627	(pop @POST_INIT)->(0) while @POST_INIT;
3453	};	3628	};
3454		3629
3455	EV::loop;	3630	cf::object::thawer::errors_are_fatal 0;
		3631	warn "parse errors in files are no longer fatal from this point on.\n";
		3632
		3633	main_loop;
3456	}	3634	}
3457		3635
3458	#############################################################################	3636	#############################################################################
3459	# initialisation and cleanup	3637	# initialisation and cleanup
3460		3638
3461	# install some emergency cleanup handlers	3639	# install some emergency cleanup handlers
3462	BEGIN {	3640	BEGIN {
3463	our %SIGWATCHER = ();	3641	our %SIGWATCHER = ();
3464	for my $signal (qw(INT HUP TERM)) {	3642	for my $signal (qw(INT HUP TERM)) {
3465	$SIGWATCHER{$signal} = EV::signal $signal, sub {	3643	$SIGWATCHER{$signal} = AE::signal $signal, sub {
3466	cf::cleanup "SIG$signal";	3644	cf::cleanup "SIG$signal";
3467	};	3645	};
3468	}	3646	}
3469	}	3647	}
3470		3648
3471	sub write_runtime_sync {	3649	sub write_runtime_sync {
		3650	my $t0 = AE::time;
		3651
3472	# first touch the runtime file to show we are still running:	3652	# first touch the runtime file to show we are still running:
3473	# the fsync below can take a very very long time.	3653	# the fsync below can take a very very long time.
3474		3654
3475	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;	3655	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3476		3656
3477	my $guard = cf::lock_acquire "write_runtime";	3657	my $guard = cf::lock_acquire "write_runtime";
3478		3658
3479	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644	3659	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3480	or return;	3660	or return;
3481		3661
3482	my $value = $cf::RUNTIME + 90 + 10;	3662	my $value = $cf::RUNTIME + 90 + 10;
3483	# 10 is the runtime save interval, for a monotonic clock	3663	# 10 is the runtime save interval, for a monotonic clock
3484	# 60 allows for the watchdog to kill the server.	3664	# 60 allows for the watchdog to kill the server.
…		…
3497	or return;	3677	or return;
3498		3678
3499	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3679	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3500	and return;	3680	and return;
3501		3681
3502	warn "runtime file written.\n";	3682	warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3503		3683
3504	1	3684	1
3505	}	3685	}
3506		3686
3507	our $uuid_lock;	3687	our $uuid_lock;
…		…
3518	my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644	3698	my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3519	or return;	3699	or return;
3520		3700
3521	my $value = uuid_seq uuid_cur;	3701	my $value = uuid_seq uuid_cur;
3522		3702
3523	if ($value < 1024) {	3703	unless ($value) {
3524	warn "cowardly refusing to write low uuid value ($value)!\n";	3704	warn "cowardly refusing to write zero uuid value!\n";
3525	return;	3705	return;
3526	}	3706	}
3527		3707
3528	my $value = uuid_str $value + $uuid_skip;	3708	my $value = uuid_str $value + $uuid_skip;
3529	$uuid_skip = 0;	3709	$uuid_skip = 0;
…		…
3555	}	3735	}
3556		3736
3557	sub emergency_save() {	3737	sub emergency_save() {
3558	my $freeze_guard = cf::freeze_mainloop;	3738	my $freeze_guard = cf::freeze_mainloop;
3559		3739
3560	warn "enter emergency perl save\n";	3740	warn "emergency_perl_save: enter\n";
3561		3741
3562	cf::sync_job {	3742	cf::sync_job {
		3743	# this is a trade-off: we want to be very quick here, so
		3744	# save all maps without fsync, and later call a global sync
		3745	# (which in turn might be very very slow)
		3746	local $USE_FSYNC = 0;
		3747
3563	# use a peculiar iteration method to avoid tripping on perl	3748	# use a peculiar iteration method to avoid tripping on perl
3564	# refcount bugs in for. also avoids problems with players	3749	# refcount bugs in for. also avoids problems with players
3565	# and maps saved/destroyed asynchronously.	3750	# and maps saved/destroyed asynchronously.
3566	warn "begin emergency player save\n";	3751	warn "emergency_perl_save: begin player save\n";
3567	for my $login (keys %cf::PLAYER) {	3752	for my $login (keys %cf::PLAYER) {
3568	my $pl = $cf::PLAYER{$login} or next;	3753	my $pl = $cf::PLAYER{$login} or next;
3569	$pl->valid or next;	3754	$pl->valid or next;
3570	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3755	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3571	$pl->save;	3756	$pl->save;
3572	}	3757	}
3573	warn "end emergency player save\n";	3758	warn "emergency_perl_save: end player save\n";
3574		3759
3575	warn "begin emergency map save\n";	3760	warn "emergency_perl_save: begin map save\n";
3576	for my $path (keys %cf::MAP) {	3761	for my $path (keys %cf::MAP) {
3577	my $map = $cf::MAP{$path} or next;	3762	my $map = $cf::MAP{$path} or next;
3578	$map->valid or next;	3763	$map->valid or next;
3579	$map->save;	3764	$map->save;
3580	}	3765	}
3581	warn "end emergency map save\n";	3766	warn "emergency_perl_save: end map save\n";
3582		3767
3583	warn "begin emergency database checkpoint\n";	3768	warn "emergency_perl_save: begin database checkpoint\n";
3584	BDB::db_env_txn_checkpoint $DB_ENV;	3769	BDB::db_env_txn_checkpoint $DB_ENV;
3585	warn "end emergency database checkpoint\n";	3770	warn "emergency_perl_save: end database checkpoint\n";
3586		3771
3587	warn "begin write uuid\n";	3772	warn "emergency_perl_save: begin write uuid\n";
3588	write_uuid_sync 1;	3773	write_uuid_sync 1;
3589	warn "end write uuid\n";	3774	warn "emergency_perl_save: end write uuid\n";
3590	};	3775	};
3591		3776
		3777	warn "emergency_perl_save: starting sync()\n";
		3778	IO::AIO::aio_sync sub {
		3779	warn "emergency_perl_save: finished sync()\n";
		3780	};
		3781
3592	warn "leave emergency perl save\n";	3782	warn "emergency_perl_save: leave\n";
3593	}	3783	}
3594		3784
3595	sub post_cleanup {	3785	sub post_cleanup {
3596	my ($make_core) = @_;	3786	my ($make_core) = @_;
3597		3787
…		…
3623	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	3813	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3624	for my $name (keys %$leaf_symtab) {	3814	for my $name (keys %$leaf_symtab) {
3625	_gv_clear *{"$pkg$name"};	3815	_gv_clear *{"$pkg$name"};
3626	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	3816	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3627	}	3817	}
3628	warn "cleared package $pkg\n";#d#
3629	}	3818	}
3630		3819
3631	sub do_reload_perl() {	3820	sub do_reload_perl() {
3632	# can/must only be called in main	3821	# can/must only be called in main
3633	if ($Coro::current != $Coro::main) {	3822	if (in_main) {
3634	warn "can only reload from main coroutine";	3823	warn "can only reload from main coroutine";
3635	return;	3824	return;
3636	}	3825	}
3637		3826
3638	return if $RELOAD++;	3827	return if $RELOAD++;
		3828
		3829	my $t1 = AE::time;
3639		3830
3640	while ($RELOAD) {	3831	while ($RELOAD) {
3641	warn "reloading...";	3832	warn "reloading...";
3642		3833
3643	warn "entering sync_job";	3834	warn "entering sync_job";
…		…
3704	clear_package "safe::$_"	3895	clear_package "safe::$_"
3705	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	3896	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3706		3897
3707	warn "unloading cf.pm \"a bit\"";	3898	warn "unloading cf.pm \"a bit\"";
3708	delete $INC{"cf.pm"};	3899	delete $INC{"cf.pm"};
3709	delete $INC{"cf/pod.pm"};	3900	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3710		3901
3711	# don't, removes xs symbols, too,	3902	# don't, removes xs symbols, too,
3712	# and global variables created in xs	3903	# and global variables created in xs
3713	#clear_package __PACKAGE__;	3904	#clear_package __PACKAGE__;
3714		3905
3715	warn "unload completed, starting to reload now";	3906	warn "unload completed, starting to reload now";
3716		3907
3717	warn "reloading cf.pm";	3908	warn "reloading cf.pm";
3718	require cf;	3909	require cf;
3719	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3910	cf::_connect_to_perl_1;
3720		3911
3721	warn "loading config and database again";	3912	warn "loading config and database again";
3722	cf::reload_config;	3913	cf::reload_config;
3723		3914
3724	warn "loading extensions";	3915	warn "loading extensions";
3725	cf::load_extensions;	3916	cf::load_extensions;
3726		3917
		3918	if ($REATTACH_ON_RELOAD) {
3727	warn "reattaching attachments to objects/players";	3919	warn "reattaching attachments to objects/players";
3728	_global_reattach; # objects, sockets	3920	_global_reattach; # objects, sockets
3729	warn "reattaching attachments to maps";	3921	warn "reattaching attachments to maps";
3730	reattach $_ for values %MAP;	3922	reattach $_ for values %MAP;
3731	warn "reattaching attachments to players";	3923	warn "reattaching attachments to players";
3732	reattach $_ for values %PLAYER;	3924	reattach $_ for values %PLAYER;
		3925	}
3733		3926
3734	warn "running post_load";	3927	warn "running post_init jobs";
3735	(pop @POST_INIT)->(1) while @POST_INIT;	3928	(pop @POST_INIT)->(1) while @POST_INIT;
3736		3929
3737	warn "leaving sync_job";	3930	warn "leaving sync_job";
3738		3931
3739	1	3932	1
…		…
3743	};	3936	};
3744		3937
3745	warn "reloaded";	3938	warn "reloaded";
3746	--$RELOAD;	3939	--$RELOAD;
3747	}	3940	}
		3941
		3942	$t1 = AE::time - $t1;
		3943	warn "reload completed in ${t1}s\n";
3748	};	3944	};
3749		3945
3750	our $RELOAD_WATCHER; # used only during reload	3946	our $RELOAD_WATCHER; # used only during reload
3751		3947
3752	sub reload_perl() {	3948	sub reload_perl() {
3753	# doing reload synchronously and two reloads happen back-to-back,	3949	# doing reload synchronously and two reloads happen back-to-back,
3754	# coro crashes during coro_state_free->destroy here.	3950	# coro crashes during coro_state_free->destroy here.
3755		3951
		3952	$RELOAD_WATCHER ||= cf::async {
		3953	Coro::AIO::aio_wait cache_extensions;
		3954
3756	$RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub {	3955	$RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3757	do_reload_perl;	3956	do_reload_perl;
3758	undef $RELOAD_WATCHER;	3957	undef $RELOAD_WATCHER;
		3958	};
3759	};	3959	};
3760	}	3960	}
3761		3961
3762	register_command "reload" => sub {	3962	register_command "reload" => sub {
3763	my ($who, $arg) = @_;	3963	my ($who, $arg) = @_;
…		…
3777		3977
3778	our @WAIT_FOR_TICK;	3978	our @WAIT_FOR_TICK;
3779	our @WAIT_FOR_TICK_BEGIN;	3979	our @WAIT_FOR_TICK_BEGIN;
3780		3980
3781	sub wait_for_tick {	3981	sub wait_for_tick {
3782	return if tick_inhibit || $Coro::current == $Coro::main;	3982	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3783		3983
3784	my $signal = new Coro::Signal;	3984	my $signal = new Coro::Signal;
3785	push @WAIT_FOR_TICK, $signal;	3985	push @WAIT_FOR_TICK, $signal;
3786	$signal->wait;	3986	$signal->wait;
3787	}	3987	}
3788		3988
3789	sub wait_for_tick_begin {	3989	sub wait_for_tick_begin {
3790	return if tick_inhibit || $Coro::current == $Coro::main;	3990	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3791		3991
3792	my $signal = new Coro::Signal;	3992	my $signal = new Coro::Signal;
3793	push @WAIT_FOR_TICK_BEGIN, $signal;	3993	push @WAIT_FOR_TICK_BEGIN, $signal;
3794	$signal->wait;	3994	$signal->wait;
3795	}	3995	}
…		…
3800	unless ++$bug_warning > 10;	4000	unless ++$bug_warning > 10;
3801	return;	4001	return;
3802	}	4002	}
3803		4003
3804	cf::server_tick; # one server iteration	4004	cf::server_tick; # one server iteration
		4005
		4006	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3805		4007
3806	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4008	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3807	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4009	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3808	Coro::async_pool {	4010	Coro::async_pool {
3809	$Coro::current->{desc} = "runtime saver";	4011	$Coro::current->{desc} = "runtime saver";
…		…
3832	}	4034	}
3833		4035
3834	{	4036	{
3835	# configure BDB	4037	# configure BDB
3836		4038
3837	BDB::min_parallel 8;	4039	BDB::min_parallel 16;
3838	BDB::max_poll_reqs $TICK * 0.1;	4040	BDB::max_poll_reqs $TICK * 0.1;
3839	$AnyEvent::BDB::WATCHER->priority (1);	4041	$AnyEvent::BDB::WATCHER->priority (1);
3840		4042
3841	unless ($DB_ENV) {	4043	unless ($DB_ENV) {
3842	$DB_ENV = BDB::db_env_create;	4044	$DB_ENV = BDB::db_env_create;
…		…
3922	LOG llevInfo, "[ABT] [suppressed]\n";	4124	LOG llevInfo, "[ABT] [suppressed]\n";
3923	}	4125	}
3924	}	4126	}
3925		4127
3926	# load additional modules	4128	# load additional modules
3927	use cf::pod;	4129	require "cf/$_.pm" for @EXTRA_MODULES;
		4130	cf::_connect_to_perl_2;
3928		4131
3929	END { cf::emergency_save }	4132	END { cf::emergency_save }
3930		4133
3931	1	4134	1
3932		4135

Diff Legend

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