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.474 by root, Thu Jul 16 21:42:56 2009 UTC vs.
Revision 1.564 by elmex, Thu Apr 28 14:58:08 2011 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,2011 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 qw(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 Guard ();
38	use Coro ();	38	use Coro ();
39	use Coro::State;	39	use Coro::State;
40	use Coro::Handle;	40	use Coro::Handle;
…		…
51	use Coro::Util ();	51	use Coro::Util ();
52		52
53	use JSON::XS 2.01 ();	53	use JSON::XS 2.01 ();
54	use BDB ();	54	use BDB ();
55	use Data::Dumper;	55	use Data::Dumper;
56	use Digest::MD5;
57	use Fcntl;	56	use Fcntl;
58	use YAML ();	57	use YAML::XS ();
59	use IO::AIO ();	58	use IO::AIO ();
60	use Time::HiRes;	59	use Time::HiRes;
61	use Compress::LZF;	60	use Compress::LZF;
62	use Digest::MD5 ();	61	use Digest::MD5 ();
63		62
…		…
76		75
77	# strictly for debugging	76	# strictly for debugging
78	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };	77	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
79		78
80	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	79	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
		80
		81	our @ORIG_INC;
81		82
82	our %COMMAND = ();	83	our %COMMAND = ();
83	our %COMMAND_TIME = ();	84	our %COMMAND_TIME = ();
84		85
85	our @EXTS = (); # list of extension package names	86	our @EXTS = (); # list of extension package names
…		…
88	our %EXT_CORO = (); # coroutines bound to extensions	89	our %EXT_CORO = (); # coroutines bound to extensions
89	our %EXT_MAP = (); # pluggable maps	90	our %EXT_MAP = (); # pluggable maps
90		91
91	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
92	our @EVENT;	93	our @EVENT;
		94	our @REFLECT; # set by XS
		95	our %REFLECT; # set by us
93		96
94	our $CONFDIR = confdir;	97	our $CONFDIR = confdir;
		98
95	our $DATADIR = datadir;	99	our $DATADIR = datadir;
96	our $LIBDIR = "$DATADIR/ext";	100	our $LIBDIR = "$DATADIR/ext";
97	our $PODDIR = "$DATADIR/pod";	101	our $PODDIR = "$DATADIR/pod";
98	our $MAPDIR = "$DATADIR/" . mapdir;	102	our $MAPDIR = "$DATADIR/" . mapdir;
		103
99	our $LOCALDIR = localdir;	104	our $LOCALDIR = localdir;
100	our $TMPDIR = "$LOCALDIR/" . tmpdir;	105	our $TMPDIR = "$LOCALDIR/" . tmpdir;
101	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	106	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
102	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	107	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
103	our $RANDOMDIR = "$LOCALDIR/random";	108	our $RANDOMDIR = "$LOCALDIR/random";
104	our $BDBDIR = "$LOCALDIR/db";	109	our $BDBDIR = "$LOCALDIR/db";
105	our $PIDFILE = "$LOCALDIR/pid";	110	our $PIDFILE = "$LOCALDIR/pid";
106	our $RUNTIMEFILE = "$LOCALDIR/runtime";	111	our $RUNTIMEFILE = "$LOCALDIR/runtime";
107		112
108	our %RESOURCE;	113	our %RESOURCE; # unused
		114
		115	our $OUTPUT_RATE_MIN = 3000;
		116	our $OUTPUT_RATE_MAX = 1000000;
		117
		118	our $MAX_LINKS = 32; # how many chained exits to follow
		119	our $VERBOSE_IO = 1;
109		120
110	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	121	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
111	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	122	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
112	our $NEXT_TICK;	123	our $NEXT_TICK;
113	our $USE_FSYNC = 1; # use fsync to write maps - default on	124	our $USE_FSYNC = 1; # use fsync to write maps - default on
…		…
115	our $BDB_DEADLOCK_WATCHER;	126	our $BDB_DEADLOCK_WATCHER;
116	our $BDB_CHECKPOINT_WATCHER;	127	our $BDB_CHECKPOINT_WATCHER;
117	our $BDB_TRICKLE_WATCHER;	128	our $BDB_TRICKLE_WATCHER;
118	our $DB_ENV;	129	our $DB_ENV;
119		130
120	our @EXTRA_MODULES = qw(pod mapscript);	131	our @EXTRA_MODULES = qw(pod match mapscript incloader);
121		132
122	our %CFG;	133	our %CFG;
123		134
124	our $UPTIME; $UPTIME ||= time;	135	our $UPTIME; $UPTIME ||= time;
125	our $RUNTIME;	136	our $RUNTIME;
…		…
159		170
160	our $EMERGENCY_POSITION;	171	our $EMERGENCY_POSITION;
161		172
162	sub cf::map::normalise;	173	sub cf::map::normalise;
163		174
		175	sub in_main() {
		176	$Coro::current == $Coro::main
		177	}
		178
		179	#############################################################################
		180
		181	%REFLECT = ();
		182	for (@REFLECT) {
		183	my $reflect = JSON::XS::decode_json $_;
		184	$REFLECT{$reflect->{class}} = $reflect;
		185	}
		186
		187	# this is decidedly evil
		188	$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
		189
164	#############################################################################	190	#############################################################################
165		191
166	=head2 GLOBAL VARIABLES	192	=head2 GLOBAL VARIABLES
167		193
168	=over 4	194	=over 4
…		…
209	from wherever your confdir points to.	235	from wherever your confdir points to.
210		236
211	=item cf::wait_for_tick, cf::wait_for_tick_begin	237	=item cf::wait_for_tick, cf::wait_for_tick_begin
212		238
213	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	239	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
214	returns directly I<after> the tick processing (and consequently, can only wake one process	240	returns directly I<after> the tick processing (and consequently, can only wake one thread
215	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	241	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
216		242
		243	=cut
		244
		245	sub wait_for_tick();
		246	sub wait_for_tick_begin();
		247
217	=item @cf::INVOKE_RESULTS	248	=item @cf::INVOKE_RESULTS
218		249
219	This array contains the results of the last C<invoke ()> call. When	250	This array contains the results of the last C<invoke ()> call. When
220	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of	251	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
221	that call.	252	that call.
222		253
		254	=item %cf::REFLECT
		255
		256	Contains, for each (C++) class name, a hash reference with information
		257	about object members (methods, scalars, arrays and flags) and other
		258	metadata, which is useful for introspection.
		259
223	=back	260	=back
224		261
225	=cut	262	=cut
226		263
227	BEGIN {	264	sub error(@) { LOG llevError, join "", @_ }
228	*CORE::GLOBAL::warn = sub {	265	sub warn (@) { LOG llevWarn , join "", @_ }
		266	sub info (@) { LOG llevInfo , join "", @_ }
		267	sub debug(@) { LOG llevDebug, join "", @_ }
		268	sub trace(@) { LOG llevTrace, join "", @_ }
		269
		270	$Coro::State::WARNHOOK = sub {
229	my $msg = join "", @_;	271	my $msg = join "", @_;
230		272
231	$msg .= "\n"	273	$msg .= "\n"
232	unless $msg =~ /\n$/;	274	unless $msg =~ /\n$/;
233		275
234	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	276	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
235		277
236	LOG llevError, $msg;	278	LOG llevWarn, $msg;
237	};	279	};
238	}
239		280
240	$Coro::State::DIEHOOK = sub {	281	$Coro::State::DIEHOOK = sub {
241	return unless $^S eq 0; # "eq", not "=="	282	return unless $^S eq 0; # "eq", not "=="
242		283
243	if ($Coro::current == $Coro::main) {#d#	284	error Carp::longmess $_[0];
		285
		286	if (in_main) {#d#
244	warn "DIEHOOK called in main context, Coro bug?\n";#d#	287	error "DIEHOOK called in main context, Coro bug?\n";#d#
245	return;#d#	288	return;#d#
246	}#d#	289	}#d#
247		290
248	# kill coroutine otherwise	291	# kill coroutine otherwise
249	warn Carp::longmess $_[0];
250	Coro::terminate	292	Coro::terminate
251	};	293	};
252
253	$SIG{__DIE__} = sub { }; #d#?
254		294
255	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	295	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
256	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	296	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
257	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	297	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
258	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	298	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
…		…
272	)) {	312	)) {
273	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	313	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
274	}	314	}
275		315
276	$EV::DIED = sub {	316	$EV::DIED = sub {
277	warn "error in event callback: @_";	317	Carp::cluck "error in event callback: @_";
278	};	318	};
		319
		320	#############################################################################
		321
		322	sub fork_call(&@);
		323	sub get_slot($;$$);
279		324
280	#############################################################################	325	#############################################################################
281		326
282	=head2 UTILITY FUNCTIONS	327	=head2 UTILITY FUNCTIONS
283		328
…		…
304	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	349	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
305	$d	350	$d
306	} || "[unable to dump $_[0]: '$@']";	351	} || "[unable to dump $_[0]: '$@']";
307	}	352	}
308		353
		354	=item $scalar = load_file $path
		355
		356	Loads the given file from path and returns its contents. Croaks on error
		357	and can block.
		358
		359	=cut
		360
		361	sub load_file($) {
		362	0 <= aio_load $_[0], my $data
		363	or Carp::croak "$_[0]: $!";
		364
		365	$data
		366	}
		367
309	=item $ref = cf::decode_json $json	368	=item $ref = cf::decode_json $json
310		369
311	Converts a JSON string into the corresponding perl data structure.	370	Converts a JSON string into the corresponding perl data structure.
312		371
313	=item $json = cf::encode_json $ref	372	=item $json = cf::encode_json $ref
…		…
319	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	378	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
320		379
321	sub encode_json($) { $json_coder->encode ($_[0]) }	380	sub encode_json($) { $json_coder->encode ($_[0]) }
322	sub decode_json($) { $json_coder->decode ($_[0]) }	381	sub decode_json($) { $json_coder->decode ($_[0]) }
323		382
		383	=item $ref = cf::decode_storable $scalar
		384
		385	Same as Coro::Storable::thaw, so blocks.
		386
		387	=cut
		388
		389	BEGIN { *decode_storable = \&Coro::Storable::thaw }
		390
		391	=item $ref = cf::decode_yaml $scalar
		392
		393	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
		394
		395	=cut
		396
		397	sub decode_yaml($) {
		398	fork_call { YAML::XS::Load $_[0] } @_
		399	}
		400
		401	=item $scalar = cf::unlzf $scalar
		402
		403	Same as Compress::LZF::compress, but takes server ticks into account, so
		404	blocks.
		405
		406	=cut
		407
		408	sub unlzf($) {
		409	# we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
		410	cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
		411	Compress::LZF::decompress $_[0]
		412	}
		413
324	=item cf::post_init { BLOCK }	414	=item cf::post_init { BLOCK }
325		415
326	Execute the given codeblock, I<after> all extensions have been (re-)loaded,	416	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
327	but I<before> the server starts ticking again.	417	but I<before> the server starts ticking again.
328		418
329	The cdoeblock will have a single boolean argument to indicate whether this	419	The codeblock will have a single boolean argument to indicate whether this
330	is a reload or not.	420	is a reload or not.
331		421
332	=cut	422	=cut
333		423
334	sub post_init(&) {	424	sub post_init(&) {
335	push @POST_INIT, shift;	425	push @POST_INIT, shift;
		426	}
		427
		428	sub _post_init {
		429	trace "running post_init jobs";
		430
		431	# run them in parallel...
		432
		433	my @join;
		434
		435	while () {
		436	push @join, map &Coro::async ($_, 0), @POST_INIT;
		437	@POST_INIT = ();
		438
		439	@join or last;
		440
		441	(pop @join)->join;
		442	}
336	}	443	}
337		444
338	=item cf::lock_wait $string	445	=item cf::lock_wait $string
339		446
340	Wait until the given lock is available. See cf::lock_acquire.	447	Wait until the given lock is available. See cf::lock_acquire.
…		…
379	}	486	}
380		487
381	=item cf::periodic $interval, $cb	488	=item cf::periodic $interval, $cb
382		489
383	Like EV::periodic, but randomly selects a starting point so that the actions	490	Like EV::periodic, but randomly selects a starting point so that the actions
384	get spread over timer.	491	get spread over time.
385		492
386	=cut	493	=cut
387		494
388	sub periodic($$) {	495	sub periodic($$) {
389	my ($interval, $cb) = @_;	496	my ($interval, $cb) = @_;
…		…
393	EV::periodic $start, $interval, 0, $cb	500	EV::periodic $start, $interval, 0, $cb
394	}	501	}
395		502
396	=item cf::get_slot $time[, $priority[, $name]]	503	=item cf::get_slot $time[, $priority[, $name]]
397		504
398	Allocate $time seconds of blocking CPU time at priority C<$priority>:	505	Allocate $time seconds of blocking CPU time at priority C<$priority>
399	This call blocks and returns only when you have at least C<$time> seconds	506	(default: 0): This call blocks and returns only when you have at least
400	of cpu time till the next tick. The slot is only valid till the next cede.	507	C<$time> seconds of cpu time till the next tick. The slot is only valid
		508	till the next cede.
		509
		510	Background jobs should use a priority les than zero, interactive jobs
		511	should use 100 or more.
401		512
402	The optional C<$name> can be used to identify the job to run. It might be	513	The optional C<$name> can be used to identify the job to run. It might be
403	used for statistical purposes and should identify the same time-class.	514	used for statistical purposes and should identify the same time-class.
404		515
405	Useful for short background jobs.	516	Useful for short background jobs.
406		517
407	=cut	518	=cut
408		519
409	our @SLOT_QUEUE;	520	our @SLOT_QUEUE;
410	our $SLOT_QUEUE;	521	our $SLOT_QUEUE;
		522	our $SLOT_DECAY = 0.9;
411		523
412	$SLOT_QUEUE->cancel if $SLOT_QUEUE;	524	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
413	$SLOT_QUEUE = Coro::async {	525	$SLOT_QUEUE = Coro::async {
414	$Coro::current->desc ("timeslot manager");	526	$Coro::current->desc ("timeslot manager");
415		527
416	my $signal = new Coro::Signal;	528	my $signal = new Coro::Signal;
		529	my $busy;
417		530
418	while () {	531	while () {
419	next_job:	532	next_job:
		533
420	my $avail = cf::till_tick;	534	my $avail = cf::till_tick;
421	if ($avail > 0.01) {	535
422	for (0 .. $#SLOT_QUEUE) {	536	for (0 .. $#SLOT_QUEUE) {
423	if ($SLOT_QUEUE[$_][0] < $avail) {	537	if ($SLOT_QUEUE[$_][0] <= $avail) {
		538	$busy = 0;
424	my $job = splice @SLOT_QUEUE, $_, 1, ();	539	my $job = splice @SLOT_QUEUE, $_, 1, ();
425	$job->[2]->send;	540	$job->[2]->send;
426	Coro::cede;	541	Coro::cede;
427	goto next_job;	542	goto next_job;
428	}	543	} else {
		544	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
429	}	545	}
430	}	546	}
431		547
432	if (@SLOT_QUEUE) {	548	if (@SLOT_QUEUE) {
433	# we do not use wait_for_tick() as it returns immediately when tick is inactive	549	# we do not use wait_for_tick() as it returns immediately when tick is inactive
434	push @cf::WAIT_FOR_TICK, $signal;	550	push @cf::WAIT_FOR_TICK, $signal;
435	$signal->wait;	551	$signal->wait;
436	} else {	552	} else {
		553	$busy = 0;
437	Coro::schedule;	554	Coro::schedule;
438	}	555	}
439	}	556	}
440	};	557	};
441		558
442	sub get_slot($;$$) {	559	sub get_slot($;$$) {
443	return if tick_inhibit || $Coro::current == $Coro::main;	560	return if tick_inhibit || $Coro::current == $Coro::main;
444		561
445	my ($time, $pri, $name) = @_;	562	my ($time, $pri, $name) = @_;
446		563
447	$time = $TICK * .6 if $time > $TICK * .6;	564	$time = clamp $time, 0.01, $TICK * .6;
		565
448	my $sig = new Coro::Signal;	566	my $sig = new Coro::Signal;
449		567
450	push @SLOT_QUEUE, [$time, $pri, $sig, $name];	568	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
451	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;	569	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
452	$SLOT_QUEUE->ready;	570	$SLOT_QUEUE->ready;
…		…
478	=cut	596	=cut
479		597
480	sub sync_job(&) {	598	sub sync_job(&) {
481	my ($job) = @_;	599	my ($job) = @_;
482		600
483	if ($Coro::current == $Coro::main) {	601	if (in_main) {
484	my $time = EV::time;	602	my $time = AE::time;
485		603
486	# this is the main coro, too bad, we have to block	604	# this is the main coro, too bad, we have to block
487	# till the operation succeeds, freezing the server :/	605	# till the operation succeeds, freezing the server :/
488		606
489	LOG llevError, Carp::longmess "sync job";#d#	607	#LOG llevError, Carp::longmess "sync job";#d#
490		608
491	my $freeze_guard = freeze_mainloop;	609	my $freeze_guard = freeze_mainloop;
492		610
493	my $busy = 1;	611	my $busy = 1;
494	my @res;	612	my @res;
495		613
496	(async {	614	(async {
497	$Coro::current->desc ("sync job coro");	615	$Coro::current->desc ("sync job coro");
498	@res = eval { $job->() };	616	@res = eval { $job->() };
499	warn $@ if $@;	617	error $@ if $@;
500	undef $busy;	618	undef $busy;
501	})->prio (Coro::PRIO_MAX);	619	})->prio (Coro::PRIO_MAX);
502		620
503	while ($busy) {	621	while ($busy) {
504	if (Coro::nready) {	622	if (Coro::nready) {
…		…
506	} else {	624	} else {
507	EV::loop EV::LOOP_ONESHOT;	625	EV::loop EV::LOOP_ONESHOT;
508	}	626	}
509	}	627	}
510		628
511	my $time = EV::time - $time;	629	my $time = AE::time - $time;
512		630
513	$TICK_START += $time; # do not account sync jobs to server load	631	$TICK_START += $time; # do not account sync jobs to server load
514		632
515	wantarray ? @res : $res[0]	633	wantarray ? @res : $res[0]
516	} else {	634	} else {
…		…
538	$EXT_CORO{$coro+0} = $coro;	656	$EXT_CORO{$coro+0} = $coro;
539		657
540	$coro	658	$coro
541	}	659	}
542		660
543	=item fork_call { }, $args	661	=item fork_call { }, @args
544		662
545	Executes the given code block with the given arguments in a seperate	663	Executes the given code block with the given arguments in a seperate
546	process, returning the results. Everything must be serialisable with	664	process, returning the results. Everything must be serialisable with
547	Coro::Storable. May, of course, block. Note that the executed sub may	665	Coro::Storable. May, of course, block. Note that the executed sub may
548	never block itself or use any form of event handling.	666	never block itself or use any form of event handling.
549		667
550	=cut	668	=cut
551		669
		670	sub post_fork {
		671	reset_signals;
		672	}
		673
552	sub fork_call(&@) {	674	sub fork_call(&@) {
553	my ($cb, @args) = @_;	675	my ($cb, @args) = @_;
554		676
555	# we seemingly have to make a local copy of the whole thing,	677	# we seemingly have to make a local copy of the whole thing,
556	# otherwise perl prematurely frees the stuff :/	678	# otherwise perl prematurely frees the stuff :/
557	# TODO: investigate and fix (likely this will be rather laborious)	679	# TODO: investigate and fix (likely this will be rather laborious)
558		680
559	my @res = Coro::Util::fork_eval {	681	my @res = Coro::Util::fork_eval {
560	reset_signals;	682	cf::post_fork;
561	&$cb	683	&$cb
562	}, @args;	684	} @args;
563		685
564	wantarray ? @res : $res[-1]	686	wantarray ? @res : $res[-1]
		687	}
		688
		689	sub objinfo {
		690	(
		691	"counter value" => cf::object::object_count,
		692	"objects created" => cf::object::create_count,
		693	"objects destroyed" => cf::object::destroy_count,
		694	"freelist size" => cf::object::free_count,
		695	"allocated objects" => cf::object::objects_size,
		696	"active objects" => cf::object::actives_size,
		697	)
565	}	698	}
566		699
567	=item $coin = coin_from_name $name	700	=item $coin = coin_from_name $name
568		701
569	=cut	702	=cut
…		…
606	within each server.	739	within each server.
607		740
608	=cut	741	=cut
609		742
610	sub db_table($) {	743	sub db_table($) {
		744	cf::error "db_get called from main context"
		745	if $Coro::current == $Coro::main;
		746
611	my ($name) = @_;	747	my ($name) = @_;
612	my $db = BDB::db_create $DB_ENV;	748	my $db = BDB::db_create $DB_ENV;
613		749
614	eval {	750	eval {
615	$db->set_flags (BDB::CHKSUM);	751	$db->set_flags (BDB::CHKSUM);
…		…
625	}	761	}
626		762
627	our $DB;	763	our $DB;
628		764
629	sub db_init {	765	sub db_init {
630	cf::sync_job {
631	$DB ||= db_table "db";	766	$DB ||= db_table "db";
632	};
633	}	767	}
634		768
635	sub db_get($$) {	769	sub db_get($$) {
636	my $key = "$_[0]/$_[1]";	770	my $key = "$_[0]/$_[1]";
637		771
638	cf::sync_job {	772	cf::error "db_get called from main context"
		773	if $Coro::current == $Coro::main;
		774
639	BDB::db_get $DB, undef, $key, my $data;	775	BDB::db_get $DB, undef, $key, my $data;
640		776
641	$! ? ()	777	$! ? ()
642	: $data	778	: $data
643	}
644	}	779	}
645		780
646	sub db_put($$$) {	781	sub db_put($$$) {
647	BDB::dbreq_pri 4;	782	BDB::dbreq_pri 4;
648	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	783	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
676		811
677	my @data;	812	my @data;
678	my $md5;	813	my $md5;
679		814
680	for (0 .. $#$src) {	815	for (0 .. $#$src) {
681	0 <= aio_load $src->[$_], $data[$_]	816	$data[$_] = load_file $src->[$_];
682	or Carp::croak "$src->[$_]: $!";
683	}	817	}
684		818
685	# if processing is expensive, check	819	# if processing is expensive, check
686	# checksum first	820	# checksum first
687	if (1) {	821	if (1) {
…		…
704		838
705	my $t1 = Time::HiRes::time;	839	my $t1 = Time::HiRes::time;
706	my $data = $process->(\@data);	840	my $data = $process->(\@data);
707	my $t2 = Time::HiRes::time;	841	my $t2 = Time::HiRes::time;
708		842
709	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	843	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
710		844
711	db_put cache => "$id/data", $data;	845	db_put cache => "$id/data", $data;
712	db_put cache => "$id/md5" , $md5;	846	db_put cache => "$id/md5" , $md5;
713	db_put cache => "$id/meta", $meta;	847	db_put cache => "$id/meta", $meta;
714		848
…		…
724		858
725	=cut	859	=cut
726		860
727	sub datalog($@) {	861	sub datalog($@) {
728	my ($type, %kv) = @_;	862	my ($type, %kv) = @_;
729	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	863	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
730	}	864	}
731		865
732	=back	866	=back
733		867
734	=cut	868	=cut
…		…
929		1063
930	} elsif (exists $cb_id{$type}) {	1064	} elsif (exists $cb_id{$type}) {
931	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	1065	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
932		1066
933	} elsif (ref $type) {	1067	} elsif (ref $type) {
934	warn "attaching objects not supported, ignoring.\n";	1068	error "attaching objects not supported, ignoring.\n";
935		1069
936	} else {	1070	} else {
937	shift @arg;	1071	shift @arg;
938	warn "attach argument '$type' not supported, ignoring.\n";	1072	error "attach argument '$type' not supported, ignoring.\n";
939	}	1073	}
940	}	1074	}
941	}	1075	}
942		1076
943	sub _object_attach {	1077	sub _object_attach {
…		…
953	_attach $registry, $klass, @attach;	1087	_attach $registry, $klass, @attach;
954	}	1088	}
955		1089
956	$obj->{$name} = \%arg;	1090	$obj->{$name} = \%arg;
957	} else {	1091	} else {
958	warn "object uses attachment '$name' which is not available, postponing.\n";	1092	info "object uses attachment '$name' which is not available, postponing.\n";
959	}	1093	}
960		1094
961	$obj->{_attachment}{$name} = undef;	1095	$obj->{_attachment}{$name} = undef;
962	}	1096	}
963		1097
…		…
1022		1156
1023	for (@$callbacks) {	1157	for (@$callbacks) {
1024	eval { &{$_->[1]} };	1158	eval { &{$_->[1]} };
1025		1159
1026	if ($@) {	1160	if ($@) {
1027	warn "$@";
1028	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1161	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1029	override;	1162	override;
1030	}	1163	}
1031		1164
1032	return 1 if $override;	1165	return 1 if $override;
1033	}	1166	}
…		…
1112	for (@$attach) {	1245	for (@$attach) {
1113	my ($klass, @attach) = @$_;	1246	my ($klass, @attach) = @$_;
1114	_attach $registry, $klass, @attach;	1247	_attach $registry, $klass, @attach;
1115	}	1248	}
1116	} else {	1249	} else {
1117	warn "object uses attachment '$name' that is not available, postponing.\n";	1250	info "object uses attachment '$name' that is not available, postponing.\n";
1118	}	1251	}
1119	}	1252	}
1120	}	1253	}
1121		1254
1122	cf::attachable->attach (	1255	cf::attachable->attach (
…		…
1149	my ($filename, $rdata, $objs) = @_;	1282	my ($filename, $rdata, $objs) = @_;
1150		1283
1151	sync_job {	1284	sync_job {
1152	if (length $$rdata) {	1285	if (length $$rdata) {
1153	utf8::decode (my $decname = $filename);	1286	utf8::decode (my $decname = $filename);
1154	warn sprintf "saving %s (%d,%d)\n",	1287	trace sprintf "saving %s (%d,%d)\n",
1155	$decname, length $$rdata, scalar @$objs;	1288	$decname, length $$rdata, scalar @$objs
		1289	if $VERBOSE_IO;
1156		1290
1157	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1291	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1158	aio_chmod $fh, SAVE_MODE;	1292	aio_chmod $fh, SAVE_MODE;
1159	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1293	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1160	if ($cf::USE_FSYNC) {	1294	if ($cf::USE_FSYNC) {
…		…
1182	aio_rename "$filename~", $filename;	1316	aio_rename "$filename~", $filename;
1183		1317
1184	$filename =~ s%/[^/]+$%%;	1318	$filename =~ s%/[^/]+$%%;
1185	aio_pathsync $filename if $cf::USE_FSYNC;	1319	aio_pathsync $filename if $cf::USE_FSYNC;
1186	} else {	1320	} else {
1187	warn "unable to save objects: $filename~: $!\n";	1321	error "unable to save objects: $filename~: $!\n";
1188	}	1322	}
1189	} else {	1323	} else {
1190	aio_unlink $filename;	1324	aio_unlink $filename;
1191	aio_unlink "$filename.pst";	1325	aio_unlink "$filename.pst";
1192	}	1326	}
…		…
1216	my $st = eval { Coro::Storable::thaw $av };	1350	my $st = eval { Coro::Storable::thaw $av };
1217	$av = $st->{objs};	1351	$av = $st->{objs};
1218	}	1352	}
1219		1353
1220	utf8::decode (my $decname = $filename);	1354	utf8::decode (my $decname = $filename);
1221	warn sprintf "loading %s (%d,%d)\n",	1355	trace sprintf "loading %s (%d,%d)\n",
1222	$decname, length $data, scalar @{$av || []};	1356	$decname, length $data, scalar @{$av || []}
		1357	if $VERBOSE_IO;
1223		1358
1224	($data, $av)	1359	($data, $av)
1225	}	1360	}
1226		1361
1227	=head2 COMMAND CALLBACKS	1362	=head2 COMMAND CALLBACKS
…		…
1286	}	1421	}
1287		1422
1288	use File::Glob ();	1423	use File::Glob ();
1289		1424
1290	cf::player->attach (	1425	cf::player->attach (
1291	on_command => sub {	1426	on_unknown_command => sub {
1292	my ($pl, $name, $params) = @_;	1427	my ($pl, $name, $params) = @_;
1293		1428
1294	my $cb = $COMMAND{$name}	1429	my $cb = $COMMAND{$name}
1295	or return;	1430	or return;
1296		1431
…		…
1319		1454
1320	$pl->ext_reply ($reply, @reply)	1455	$pl->ext_reply ($reply, @reply)
1321	if $reply;	1456	if $reply;
1322		1457
1323	} else {	1458	} else {
1324	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1459	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1325	}	1460	}
1326		1461
1327	cf::override;	1462	cf::override;
1328	},	1463	},
1329	);	1464	);
…		…
1340		1475
1341	$grp	1476	$grp
1342	}	1477	}
1343		1478
1344	sub load_extensions {	1479	sub load_extensions {
		1480	info "loading extensions...";
		1481
1345	cf::sync_job {	1482	cf::sync_job {
1346	my %todo;	1483	my %todo;
1347		1484
1348	for my $path (<$LIBDIR/*.ext>) {	1485	for my $path (<$LIBDIR/*.ext>) {
1349	next unless -r $path;	1486	next unless -r $path;
…		…
1367		1504
1368	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1505	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1369	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1506	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1370		1507
1371	$ext{source} =	1508	$ext{source} =
1372	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1509	"package $pkg; use common::sense;\n"
1373	. "#line 1 \"$path\"\n{\n"	1510	. "#line 1 \"$path\"\n{\n"
1374	. $source	1511	. $source
1375	. "\n};\n1";	1512	. "\n};\n1";
1376		1513
1377	$todo{$base} = \%ext;	1514	$todo{$base} = \%ext;
1378	}	1515	}
1379		1516
		1517	my $pass = 0;
1380	my %done;	1518	my %done;
1381	while (%todo) {	1519	while (%todo) {
1382	my $progress;	1520	my $progress;
1383		1521
		1522	++$pass;
		1523
		1524	ext:
1384	while (my ($k, $v) = each %todo) {	1525	while (my ($k, $v) = each %todo) {
1385	for (split /,\s*/, $v->{meta}{depends}) {	1526	for (split /,\s*/, $v->{meta}{depends}) {
1386	goto skip	1527	next ext
1387	unless exists $done{$_};	1528	unless exists $done{$_};
1388	}	1529	}
1389		1530
1390	warn "... loading '$k' into '$v->{pkg}'\n";	1531	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1391		1532
1392	unless (eval $v->{source}) {	1533	my $active = eval $v->{source};
		1534
		1535	if (length $@) {
1393	my $msg = $@ ? "$v->{path}: $@\n"	1536	error "$v->{path}: $@\n";
1394	: "$v->{base}: extension inactive.\n";
1395		1537
1396	if (exists $v->{meta}{mandatory}) {
1397	warn $msg;
1398	cf::cleanup "mandatory extension failed to load, exiting.";	1538	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1399	}	1539	if exists $v->{meta}{mandatory};
1400		1540
1401	warn $msg;	1541	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
		1542	delete $todo{$k};
		1543	} else {
		1544	$done{$k} = delete $todo{$k};
		1545	push @EXTS, $v->{pkg};
		1546	$progress = 1;
		1547
		1548	info "$v->{base}: extension inactive.\n"
		1549	unless $active;
1402	}	1550	}
1403
1404	$done{$k} = delete $todo{$k};
1405	push @EXTS, $v->{pkg};
1406	$progress = 1;
1407	}	1551	}
1408		1552
1409	skip:	1553	unless ($progress) {
1410	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"	1554	warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1411	unless $progress;	1555
		1556	while (my ($k, $v) = each %todo) {
		1557	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
		1558	if exists $v->{meta}{mandatory};
		1559	}
		1560
		1561	last;
		1562	}
1412	}	1563	}
1413	};	1564	};
1414	}	1565	}
1415		1566
1416	#############################################################################	1567	#############################################################################
…		…
1500	$cf::PLAYER{$login} = $pl	1651	$cf::PLAYER{$login} = $pl
1501	}	1652	}
1502	}	1653	}
1503	}	1654	}
1504		1655
		1656	cf::player->attach (
		1657	on_load => sub {
		1658	my ($pl, $path) = @_;
		1659
		1660	# restore slots saved in save, below
		1661	my $slots = delete $pl->{_slots};
		1662
		1663	$pl->ob->current_weapon ($slots->[0]);
		1664	$pl->combat_ob ($slots->[1]);
		1665	$pl->ranged_ob ($slots->[2]);
		1666	},
		1667	);
		1668
1505	sub save($) {	1669	sub save($) {
1506	my ($pl) = @_;	1670	my ($pl) = @_;
1507		1671
1508	return if $pl->{deny_save};	1672	return if $pl->{deny_save};
1509		1673
…		…
1514		1678
1515	aio_mkdir playerdir $pl, 0770;	1679	aio_mkdir playerdir $pl, 0770;
1516	$pl->{last_save} = $cf::RUNTIME;	1680	$pl->{last_save} = $cf::RUNTIME;
1517		1681
1518	cf::get_slot 0.01;	1682	cf::get_slot 0.01;
		1683
		1684	# save slots, to be restored later
		1685	local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1519		1686
1520	$pl->save_pl ($path);	1687	$pl->save_pl ($path);
1521	cf::cede_to_tick;	1688	cf::cede_to_tick;
1522	}	1689	}
1523		1690
…		…
1557	my $name = $pl->ob->name;	1724	my $name = $pl->ob->name;
1558		1725
1559	$pl->{deny_save} = 1;	1726	$pl->{deny_save} = 1;
1560	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1727	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1561		1728
1562	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1729	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1563	$pl->deactivate;	1730	$pl->deactivate;
		1731
1564	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1732	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1565	$pl->ob->check_score;
1566	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1733	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1734	ext::highscore::check ($pl->ob);
		1735
1567	$pl->ns->destroy if $pl->ns;	1736	$pl->ns->destroy if $pl->ns;
1568		1737
1569	my $path = playerdir $pl;	1738	my $path = playerdir $pl;
1570	my $temp = "$path~$cf::RUNTIME~deleting~";	1739	my $temp = "$path~$cf::RUNTIME~deleting~";
1571	aio_rename $path, $temp;	1740	aio_rename $path, $temp;
…		…
1625	\@logins	1794	\@logins
1626	}	1795	}
1627		1796
1628	=item $player->maps	1797	=item $player->maps
1629		1798
		1799	=item cf::player::maps $login
		1800
1630	Returns an arrayref of map paths that are private for this	1801	Returns an arrayref of map paths that are private for this
1631	player. May block.	1802	player. May block.
1632		1803
1633	=cut	1804	=cut
1634		1805
…		…
1645	for (@$files) {	1816	for (@$files) {
1646	utf8::decode $_;	1817	utf8::decode $_;
1647	next if /\.(?:pl|pst)$/;	1818	next if /\.(?:pl|pst)$/;
1648	next unless /^$PATH_SEP/o;	1819	next unless /^$PATH_SEP/o;
1649		1820
1650	push @paths, cf::map::normalise "~$pl/$_";	1821	push @paths, cf::map::normalise "~$pl/$_", $pl->map;
1651	}	1822	}
1652		1823
1653	\@paths	1824	\@paths
1654	}	1825	}
1655		1826
…		…
1695		1866
1696	=cut	1867	=cut
1697		1868
1698	sub find_by_path($) {	1869	sub find_by_path($) {
1699	my ($path) = @_;	1870	my ($path) = @_;
		1871
		1872	$path =~ s/^~[^\/]*//; # skip ~login
1700		1873
1701	my ($match, $specificity);	1874	my ($match, $specificity);
1702		1875
1703	for my $region (list) {	1876	for my $region (list) {
1704	if ($region->{match} && $path =~ $region->{match}) {	1877	if ($region->{match} && $path =~ $region->{match}) {
…		…
1733	sub generate_random_map {	1906	sub generate_random_map {
1734	my ($self, $rmp) = @_;	1907	my ($self, $rmp) = @_;
1735		1908
1736	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	1909	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1737		1910
1738	# mit "rum" bekleckern, nicht
1739	$self->_create_random_map (	1911	$self->_create_random_map ($rmp);
1740	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1741	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1742	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1743	$rmp->{exit_on_final_map},
1744	$rmp->{xsize}, $rmp->{ysize},
1745	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1746	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1747	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1748	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1749	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1750	(cf::region::find $rmp->{region}), $rmp->{custom}
1751	)
1752	}	1912	}
1753		1913
1754	=item cf::map->register ($regex, $prio)	1914	=item cf::map->register ($regex, $prio)
1755		1915
1756	Register a handler for the map path matching the given regex at the	1916	Register a handler for the map path matching the given regex at the
…		…
1761		1921
1762	sub register {	1922	sub register {
1763	my (undef, $regex, $prio) = @_;	1923	my (undef, $regex, $prio) = @_;
1764	my $pkg = caller;	1924	my $pkg = caller;
1765		1925
1766	no strict;
1767	push @{"$pkg\::ISA"}, __PACKAGE__;	1926	push @{"$pkg\::ISA"}, __PACKAGE__;
1768		1927
1769	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	1928	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1770	}	1929	}
1771		1930
1772	# also paths starting with '/'	1931	# also paths starting with '/'
1773	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	1932	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1774		1933
1775	sub thawer_merge {	1934	sub thawer_merge {
1776	my ($self, $merge) = @_;	1935	my ($self, $merge) = @_;
1777		1936
1778	# we have to keep some variables in memory intact	1937	# we have to keep some variables in memory intact
…		…
1783	}	1942	}
1784		1943
1785	sub normalise {	1944	sub normalise {
1786	my ($path, $base) = @_;	1945	my ($path, $base) = @_;
1787		1946
1788	$path = "$path"; # make sure its a string	1947	$path = "$path"; # make sure it's a string
1789		1948
1790	$path =~ s/\.map$//;	1949	$path =~ s/\.map$//;
1791		1950
1792	# map plan:	1951	# map plan:
1793	#	1952	#
…		…
1795	# {... are special paths that are not being touched	1954	# {... are special paths that are not being touched
1796	# ?xxx/... are special absolute paths	1955	# ?xxx/... are special absolute paths
1797	# ?random/... random maps	1956	# ?random/... random maps
1798	# /... normal maps	1957	# /... normal maps
1799	# ~user/... per-player map of a specific user	1958	# ~user/... per-player map of a specific user
		1959	# !up !down for quad maps, or other maps with up/down layers
1800		1960
1801	$path =~ s/$PATH_SEP/\//go;	1961	$path =~ s/$PATH_SEP/\//go;
1802		1962
1803	# treat it as relative path if it starts with	1963	# treat it as relative path if it starts with
1804	# something that looks reasonable	1964	# something that looks reasonable
1805	if ($path =~ m{^(?:\./|\.\./|\w)}) {	1965	if ($path =~ m{^(?:\./|\.\./|\w)}) {
1806	$base or Carp::carp "normalise called with relative path and no base: '$path'";	1966	$base or Carp::carp "normalise called with relative path and no base: '$path'";
1807		1967
1808	$base =~ s{[^/]+/?$}{};	1968	$base =~ s{[^/]+/?$}{};
1809	$path = "$base/$path";	1969	$path = "$base/$path";
		1970
		1971	} elsif ($path eq '!up') {
		1972	$base && ref $base
		1973	or Carp::carp "normalise called with relative tile path and no base: '$path'";
		1974
		1975	my $uppth = $base->tile_path (cf::TILE_UP);
		1976	$path = $uppth if $uppth;
		1977
		1978	} elsif ($path eq '!down') {
		1979	$base && ref $base
		1980	or Carp::carp "normalise called with relative tile path and no base: '$path'";
		1981
		1982	my $dpth = $base->tile_path (cf::TILE_DOWN);
		1983	$path = $dpth if $dpth;
1810	}	1984	}
1811		1985
1812	for ($path) {	1986	for ($path) {
1813	redo if s{//}{/};
1814	redo if s{/\.?/}{/};	1987	redo if s{/\.?/}{/};
1815	redo if s{/[^/]+/\.\./}{/};	1988	redo if s{/[^/]+/\.\./}{/};
1816	}	1989	}
1817		1990
1818	$path	1991	$path
…		…
1832	$self->init; # pass $1 etc.	2005	$self->init; # pass $1 etc.
1833	return $self;	2006	return $self;
1834	}	2007	}
1835	}	2008	}
1836		2009
1837	Carp::cluck "unable to resolve path '$path' (base '$base').";	2010	Carp::cluck "unable to resolve path '$path' (base '$base')";
1838	()	2011	()
1839	}	2012	}
1840		2013
		2014	# may re-bless or do other evil things
1841	sub init {	2015	sub init {
1842	my ($self) = @_;	2016	my ($self) = @_;
1843		2017
1844	$self	2018	$self
1845	}	2019	}
…		…
1965		2139
1966	sub find;	2140	sub find;
1967	sub find {	2141	sub find {
1968	my ($path, $origin) = @_;	2142	my ($path, $origin) = @_;
1969		2143
		2144	cf::cede_to_tick;
		2145
1970	$path = normalise $path, $origin && $origin->path;	2146	$path = normalise $path, $origin;
1971		2147
1972	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2148	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973	my $guard2 = cf::lock_acquire "map_find:$path";	2149	my $guard2 = cf::lock_acquire "map_find:$path";
1974		2150
1975	$cf::MAP{$path} || do {	2151	$cf::MAP{$path} || do {
…		…
1992		2168
1993	$cf::MAP{$path} = $map	2169	$cf::MAP{$path} = $map
1994	}	2170	}
1995	}	2171	}
1996		2172
1997	sub pre_load { }	2173	sub pre_load { }
1998	sub post_load { }	2174	#sub post_load { } # XS
1999		2175
2000	sub load {	2176	sub load {
2001	my ($self) = @_;	2177	my ($self) = @_;
2002		2178
2003	local $self->{deny_reset} = 1; # loading can take a long time	2179	local $self->{deny_reset} = 1; # loading can take a long time
…		…
2015	$self->alloc;	2191	$self->alloc;
2016		2192
2017	$self->pre_load;	2193	$self->pre_load;
2018	cf::cede_to_tick;	2194	cf::cede_to_tick;
2019		2195
		2196	if (exists $self->{load_path}) {
2020	my $f = new_from_file cf::object::thawer $self->{load_path};	2197	my $f = new_from_file cf::object::thawer $self->{load_path};
2021	$f->skip_block;	2198	$f->skip_block;
2022	$self->_load_objects ($f)	2199	$self->_load_objects ($f)
2023	or return;	2200	or return;
2024		2201
2025	$self->post_load_original	2202	$self->post_load_original
2026	if delete $self->{load_original};	2203	if delete $self->{load_original};
2027		2204
2028	if (my $uniq = $self->uniq_path) {	2205	if (my $uniq = $self->uniq_path) {
2029	utf8::encode $uniq;	2206	utf8::encode $uniq;
2030	unless (aio_stat $uniq) {	2207	unless (aio_stat $uniq) {
2031	if (my $f = new_from_file cf::object::thawer $uniq) {	2208	if (my $f = new_from_file cf::object::thawer $uniq) {
2032	$self->clear_unique_items;	2209	$self->clear_unique_items;
2033	$self->_load_objects ($f);	2210	$self->_load_objects ($f);
2034	$f->resolve_delayed_derefs;	2211	$f->resolve_delayed_derefs;
		2212	}
2035	}	2213	}
2036	}	2214	}
2037	}
2038		2215
2039	$f->resolve_delayed_derefs;	2216	$f->resolve_delayed_derefs;
		2217	}
2040		2218
2041	cf::cede_to_tick;	2219	cf::cede_to_tick;
2042	# now do the right thing for maps	2220	# now do the right thing for maps
2043	$self->link_multipart_objects;	2221	$self->link_multipart_objects;
2044	$self->difficulty ($self->estimate_difficulty)	2222	$self->difficulty ($self->estimate_difficulty)
…		…
2058		2236
2059	$self->in_memory (cf::MAP_ACTIVE);	2237	$self->in_memory (cf::MAP_ACTIVE);
2060	}	2238	}
2061		2239
2062	$self->post_load;	2240	$self->post_load;
2063	}
2064		2241
		2242	1
		2243	}
		2244
		2245	# customize the map for a given player, i.e.
		2246	# return the _real_ map. used by e.g. per-player
		2247	# maps to change the path to ~playername/mappath
2065	sub customise_for {	2248	sub customise_for {
2066	my ($self, $ob) = @_;	2249	my ($self, $ob) = @_;
2067		2250
2068	return find "~" . $ob->name . "/" . $self->{path}	2251	return find "~" . $ob->name . "/" . $self->{path}
2069	if $self->per_player;	2252	if $self->per_player;
…		…
2085	or next;	2268	or next;
2086	$neigh = find $neigh, $map	2269	$neigh = find $neigh, $map
2087	or next;	2270	or next;
2088	$neigh->load;	2271	$neigh->load;
2089		2272
		2273	# now find the diagonal neighbours
2090	push @neigh,	2274	push @neigh,
2091	[$neigh->tile_path (($_ + 3) % 4), $neigh],	2275	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2092	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2276	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2093	}	2277	}
2094		2278
…		…
2101	}	2285	}
2102		2286
2103	sub find_sync {	2287	sub find_sync {
2104	my ($path, $origin) = @_;	2288	my ($path, $origin) = @_;
2105		2289
2106	cf::sync_job { find $path, $origin }	2290	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
		2291	if $Coro::current == $Coro::main;
		2292
		2293	find $path, $origin
2107	}	2294	}
2108		2295
2109	sub do_load_sync {	2296	sub do_load_sync {
2110	my ($map) = @_;	2297	my ($map) = @_;
2111		2298
2112	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2299	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2113	if $Coro::current == $Coro::main;	2300	if $Coro::current == $Coro::main;
2114		2301
2115	cf::sync_job { $map->load };	2302	$map->load;
2116	}	2303	}
2117		2304
2118	our %MAP_PREFETCH;	2305	our %MAP_PREFETCH;
2119	our $MAP_PREFETCHER = undef;	2306	our $MAP_PREFETCHER = undef;
2120		2307
2121	sub find_async {	2308	sub find_async {
2122	my ($path, $origin, $load) = @_;	2309	my ($path, $origin, $load) = @_;
2123		2310
2124	$path = normalise $path, $origin && $origin->{path};	2311	$path = normalise $path, $origin;
2125		2312
2126	if (my $map = $cf::MAP{$path}) {	2313	if (my $map = $cf::MAP{$path}) {
2127	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2314	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2128	}	2315	}
2129		2316
…		…
2146	$MAP_PREFETCHER->prio (6);	2333	$MAP_PREFETCHER->prio (6);
2147		2334
2148	()	2335	()
2149	}	2336	}
2150		2337
		2338	# common code, used by both ->save and ->swapout
2151	sub save {	2339	sub _save {
2152	my ($self) = @_;	2340	my ($self) = @_;
2153
2154	my $lock = cf::lock_acquire "map_data:$self->{path}";
2155		2341
2156	$self->{last_save} = $cf::RUNTIME;	2342	$self->{last_save} = $cf::RUNTIME;
2157		2343
2158	return unless $self->dirty;	2344	return unless $self->dirty;
2159		2345
…		…
2179	} else {	2365	} else {
2180	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);	2366	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2181	}	2367	}
2182	}	2368	}
2183		2369
		2370	sub save {
		2371	my ($self) = @_;
		2372
		2373	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2374
		2375	$self->_save;
		2376	}
		2377
2184	sub swap_out {	2378	sub swap_out {
2185	my ($self) = @_;	2379	my ($self) = @_;
2186		2380
2187	# save first because save cedes
2188	$self->save;
2189
2190	my $lock = cf::lock_acquire "map_data:$self->{path}";	2381	my $lock = cf::lock_acquire "map_data:$self->{path}";
2191		2382
2192	return if $self->players;
2193	return if $self->in_memory != cf::MAP_ACTIVE;	2383	return if $self->in_memory != cf::MAP_ACTIVE;
2194	return if $self->{deny_save};	2384	return if $self->{deny_save};
		2385	return if $self->players;
2195		2386
		2387	# first deactivate the map and "unlink" it from the core
		2388	$self->deactivate;
		2389	$_->clear_links_to ($self) for values %cf::MAP;
2196	$self->in_memory (cf::MAP_SWAPPED);	2390	$self->in_memory (cf::MAP_SWAPPED);
		2391
		2392	# then atomically save
		2393	$self->_save;
		2394
		2395	# then free the map
		2396	$self->clear;
		2397	}
		2398
		2399	sub reset_at {
		2400	my ($self) = @_;
		2401
		2402	# TODO: safety, remove and allow resettable per-player maps
		2403	return 1e99 if $self->{deny_reset};
		2404
		2405	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
		2406	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
		2407
		2408	$time + $to
		2409	}
		2410
		2411	sub should_reset {
		2412	my ($self) = @_;
		2413
		2414	$self->reset_at <= $cf::RUNTIME
		2415	}
		2416
		2417	sub reset {
		2418	my ($self) = @_;
		2419
		2420	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2421
		2422	return if $self->players;
		2423
		2424	cf::trace "resetting map ", $self->path, "\n";
		2425
		2426	$self->in_memory (cf::MAP_SWAPPED);
		2427
		2428	# need to save uniques path
		2429	unless ($self->{deny_save}) {
		2430	my $uniq = $self->uniq_path; utf8::encode $uniq;
		2431
		2432	$self->_save_objects ($uniq, cf::IO_UNIQUES)
		2433	if $uniq;
		2434	}
		2435
		2436	delete $cf::MAP{$self->path};
2197		2437
2198	$self->deactivate;	2438	$self->deactivate;
2199	$_->clear_links_to ($self) for values %cf::MAP;	2439	$_->clear_links_to ($self) for values %cf::MAP;
2200	$self->clear;	2440	$self->clear;
2201	}
2202
2203	sub reset_at {
2204	my ($self) = @_;
2205
2206	# TODO: safety, remove and allow resettable per-player maps
2207	return 1e99 if $self->{deny_reset};
2208
2209	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2210	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2211
2212	$time + $to
2213	}
2214
2215	sub should_reset {
2216	my ($self) = @_;
2217
2218	$self->reset_at <= $cf::RUNTIME
2219	}
2220
2221	sub reset {
2222	my ($self) = @_;
2223
2224	my $lock = cf::lock_acquire "map_data:$self->{path}";
2225
2226	return if $self->players;
2227
2228	warn "resetting map ", $self->path;
2229
2230	$self->in_memory (cf::MAP_SWAPPED);
2231
2232	# need to save uniques path
2233	unless ($self->{deny_save}) {
2234	my $uniq = $self->uniq_path; utf8::encode $uniq;
2235
2236	$self->_save_objects ($uniq, cf::IO_UNIQUES)
2237	if $uniq;
2238	}
2239
2240	delete $cf::MAP{$self->path};
2241
2242	$self->deactivate;
2243	$_->clear_links_to ($self) for values %cf::MAP;
2244	$self->clear;
2245		2441
2246	$self->unlink_save;	2442	$self->unlink_save;
2247	$self->destroy;	2443	$self->destroy;
2248	}	2444	}
2249		2445
…		…
2257		2453
2258	delete $cf::MAP{$self->path};	2454	delete $cf::MAP{$self->path};
2259		2455
2260	$self->unlink_save;	2456	$self->unlink_save;
2261		2457
2262	bless $self, "cf::map";	2458	bless $self, "cf::map::wrap";
2263	delete $self->{deny_reset};	2459	delete $self->{deny_reset};
2264	$self->{deny_save} = 1;	2460	$self->{deny_save} = 1;
2265	$self->reset_timeout (1);	2461	$self->reset_timeout (1);
2266	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2462	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2267		2463
…		…
2324	: normalise $_	2520	: normalise $_
2325	} @{ aio_readdir $UNIQUEDIR or [] }	2521	} @{ aio_readdir $UNIQUEDIR or [] }
2326	]	2522	]
2327	}	2523	}
2328		2524
		2525	=item cf::map::static_maps
		2526
		2527	Returns an arrayref if paths of all static maps (all preinstalled F<.map>
		2528	file in the shared directory excluding F</styles> and F</editor>). May
		2529	block.
		2530
		2531	=cut
		2532
		2533	sub static_maps() {
		2534	my @dirs = "";
		2535	my @maps;
		2536
		2537	while (@dirs) {
		2538	my $dir = shift @dirs;
		2539
		2540	next if $dir eq "/styles" || $dir eq "/editor";
		2541
		2542	my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
		2543	or return;
		2544
		2545	for (@$files) {
		2546	s/\.map$// or next;
		2547	utf8::decode $_;
		2548	push @maps, "$dir/$_";
		2549	}
		2550
		2551	push @dirs, map "$dir/$_", @$dirs;
		2552	}
		2553
		2554	\@maps
		2555	}
		2556
2329	=back	2557	=back
2330		2558
2331	=head3 cf::object	2559	=head3 cf::object
2332		2560
2333	=cut	2561	=cut
…		…
2465		2693
2466	Freezes the player and moves him/her to a special map (C<{link}>).	2694	Freezes the player and moves him/her to a special map (C<{link}>).
2467		2695
2468	The player should be reasonably safe there for short amounts of time (e.g.	2696	The player should be reasonably safe there for short amounts of time (e.g.
2469	for loading a map). You I<MUST> call C<leave_link> as soon as possible,	2697	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2470	though, as the palyer cannot control the character while it is on the link	2698	though, as the player cannot control the character while it is on the link
2471	map.	2699	map.
2472		2700
2473	Will never block.	2701	Will never block.
2474		2702
2475	=item $player_object->leave_link ($map, $x, $y)	2703	=item $player_object->leave_link ($map, $x, $y)
…		…
2496	sub cf::object::player::enter_link {	2724	sub cf::object::player::enter_link {
2497	my ($self) = @_;	2725	my ($self) = @_;
2498		2726
2499	$self->deactivate_recursive;	2727	$self->deactivate_recursive;
2500		2728
		2729	++$self->{_link_recursion};
		2730
2501	return if UNIVERSAL::isa $self->map, "ext::map_link";	2731	return if UNIVERSAL::isa $self->map, "ext::map_link";
2502		2732
2503	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2733	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2504	if $self->map && $self->map->{path} ne "{link}";	2734	if $self->map && $self->map->{path} ne "{link}";
2505		2735
2506	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2736	$self->enter_map ($LINK_MAP || link_map, 3, 3);
2507	}	2737	}
2508		2738
2509	sub cf::object::player::leave_link {	2739	sub cf::object::player::leave_link {
2510	my ($self, $map, $x, $y) = @_;	2740	my ($self, $map, $x, $y) = @_;
2511		2741
…		…
2528	($x, $y) = (-1, -1)	2758	($x, $y) = (-1, -1)
2529	unless (defined $x) && (defined $y);	2759	unless (defined $x) && (defined $y);
2530		2760
2531	# use -1 or undef as default coordinates, not 0, 0	2761	# use -1 or undef as default coordinates, not 0, 0
2532	($x, $y) = ($map->enter_x, $map->enter_y)	2762	($x, $y) = ($map->enter_x, $map->enter_y)
2533	if $x <=0 && $y <= 0;	2763	if $x <= 0 && $y <= 0;
2534		2764
2535	$map->load;	2765	$map->load;
2536	$map->load_neighbours;	2766	$map->load_neighbours;
2537		2767
2538	return unless $self->contr->active;	2768	return unless $self->contr->active;
2539	$self->flag (cf::FLAG_DEBUG, 0);#d# temp
2540	$self->activate_recursive;
2541		2769
2542	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2770	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2543	$self->enter_map ($map, $x, $y);	2771	if ($self->enter_map ($map, $x, $y)) {
2544	}	2772	# entering was successful
		2773	delete $self->{_link_recursion};
		2774	# only activate afterwards, to support waiting in hooks
		2775	$self->activate_recursive;
		2776	}
2545		2777
		2778	}
		2779
2546	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2780	=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2547		2781
2548	Moves the player to the given map-path and coordinates by first freezing	2782	Moves the player to the given map-path and coordinates by first freezing
2549	her, loading and preparing them map, calling the provided $check callback	2783	her, loading and preparing them map, calling the provided $check callback
2550	that has to return the map if sucecssful, and then unfreezes the player on	2784	that has to return the map if sucecssful, and then unfreezes the player on
2551	the new (success) or old (failed) map position. In either case, $done will	2785	the new (success) or old (failed) map position. In either case, $done will
…		…
2558		2792
2559	our $GOTOGEN;	2793	our $GOTOGEN;
2560		2794
2561	sub cf::object::player::goto {	2795	sub cf::object::player::goto {
2562	my ($self, $path, $x, $y, $check, $done) = @_;	2796	my ($self, $path, $x, $y, $check, $done) = @_;
		2797
		2798	if ($self->{_link_recursion} >= $MAX_LINKS) {
		2799	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
		2800	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
		2801	($path, $x, $y) = @$EMERGENCY_POSITION;
		2802	}
2563		2803
2564	# do generation counting so two concurrent goto's will be executed in-order	2804	# do generation counting so two concurrent goto's will be executed in-order
2565	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2805	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2566		2806
2567	$self->enter_link;	2807	$self->enter_link;
…		…
2587	($path, $x, $y) = (undef, undef, undef);	2827	($path, $x, $y) = (undef, undef, undef);
2588	}	2828	}
2589	}	2829	}
2590		2830
2591	my $map = eval {	2831	my $map = eval {
2592	my $map = defined $path ? cf::map::find $path : undef;	2832	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2593		2833
2594	if ($map) {	2834	if ($map) {
2595	$map = $map->customise_for ($self);	2835	$map = $map->customise_for ($self);
2596	$map = $check->($map) if $check && $map;	2836	$map = $check->($map, $x, $y, $self) if $check && $map;
2597	} else {	2837	} else {
2598	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);	2838	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2599	}	2839	}
2600		2840
2601	$map	2841	$map
…		…
2609	if ($gen == $self->{_goto_generation}) {	2849	if ($gen == $self->{_goto_generation}) {
2610	delete $self->{_goto_generation};	2850	delete $self->{_goto_generation};
2611	$self->leave_link ($map, $x, $y);	2851	$self->leave_link ($map, $x, $y);
2612	}	2852	}
2613		2853
2614	$done->() if $done;	2854	$done->($self) if $done;
2615	})->prio (1);	2855	})->prio (1);
2616	}	2856	}
2617		2857
2618	=item $player_object->enter_exit ($exit_object)	2858	=item $player_object->enter_exit ($exit_object)
2619		2859
…		…
2695		2935
2696	prepare_random_map $exit	2936	prepare_random_map $exit
2697	if $exit->slaying eq "/!";	2937	if $exit->slaying eq "/!";
2698	}	2938	}
2699		2939
2700	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2940	my $map = cf::map::normalise $exit->slaying, $exit->map;
2701	my $x = $exit->stats->hp;	2941	my $x = $exit->stats->hp;
2702	my $y = $exit->stats->sp;	2942	my $y = $exit->stats->sp;
2703		2943
2704	$self->goto ($map, $x, $y);	2944	$self->goto ($map, $x, $y);
2705		2945
…		…
2712	$self->message ("Something went wrong deep within the deliantra server. "	2952	$self->message ("Something went wrong deep within the deliantra server. "
2713	. "I'll try to bring you back to the map you were before. "	2953	. "I'll try to bring you back to the map you were before. "
2714	. "Please report this to the dungeon master!",	2954	. "Please report this to the dungeon master!",
2715	cf::NDI_UNIQUE | cf::NDI_RED);	2955	cf::NDI_UNIQUE | cf::NDI_RED);
2716		2956
2717	warn "ERROR in enter_exit: $@";	2957	error "ERROR in enter_exit: $@";
2718	$self->leave_link;	2958	$self->leave_link;
2719	}	2959	}
2720	})->prio (1);	2960	})->prio (1);
2721	}	2961	}
2722		2962
…		…
2734	sub cf::client::send_drawinfo {	2974	sub cf::client::send_drawinfo {
2735	my ($self, $text, $flags) = @_;	2975	my ($self, $text, $flags) = @_;
2736		2976
2737	utf8::encode $text;	2977	utf8::encode $text;
2738	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2978	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
		2979	}
		2980
		2981	=item $client->send_big_packet ($pkt)
		2982
		2983	Like C<send_packet>, but tries to compress large packets, and fragments
		2984	them as required.
		2985
		2986	=cut
		2987
		2988	our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
		2989
		2990	sub cf::client::send_big_packet {
		2991	my ($self, $pkt) = @_;
		2992
		2993	# try lzf for large packets
		2994	$pkt = "lzf " . Compress::LZF::compress $pkt
		2995	if 1024 <= length $pkt and $self->{can_lzf};
		2996
		2997	# split very large packets
		2998	if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
		2999	$self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
		3000	$pkt = "frag";
		3001	}
		3002
		3003	$self->send_packet ($pkt);
2739	}	3004	}
2740		3005
2741	=item $client->send_msg ($channel, $msg, $color, [extra...])	3006	=item $client->send_msg ($channel, $msg, $color, [extra...])
2742		3007
2743	Send a drawinfo or msg packet to the client, formatting the msg for the	3008	Send a drawinfo or msg packet to the client, formatting the msg for the
…		…
2747		3012
2748	=cut	3013	=cut
2749		3014
2750	# non-persistent channels (usually the info channel)	3015	# non-persistent channels (usually the info channel)
2751	our %CHANNEL = (	3016	our %CHANNEL = (
		3017	"c/motd" => {
		3018	id => "infobox",
		3019	title => "MOTD",
		3020	reply => undef,
		3021	tooltip => "The message of the day",
		3022	},
2752	"c/identify" => {	3023	"c/identify" => {
2753	id => "infobox",	3024	id => "infobox",
2754	title => "Identify",	3025	title => "Identify",
2755	reply => undef,	3026	reply => undef,
2756	tooltip => "Items recently identified",	3027	tooltip => "Items recently identified",
…		…
2758	"c/examine" => {	3029	"c/examine" => {
2759	id => "infobox",	3030	id => "infobox",
2760	title => "Examine",	3031	title => "Examine",
2761	reply => undef,	3032	reply => undef,
2762	tooltip => "Signs and other items you examined",	3033	tooltip => "Signs and other items you examined",
		3034	},
		3035	"c/shopinfo" => {
		3036	id => "infobox",
		3037	title => "Shop Info",
		3038	reply => undef,
		3039	tooltip => "What your bargaining skill tells you about the shop",
2763	},	3040	},
2764	"c/book" => {	3041	"c/book" => {
2765	id => "infobox",	3042	id => "infobox",
2766	title => "Book",	3043	title => "Book",
2767	reply => undef,	3044	reply => undef,
…		…
2883	my $pkt = "msg "	3160	my $pkt = "msg "
2884	. $self->{json_coder}->encode (	3161	. $self->{json_coder}->encode (
2885	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]	3162	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2886	);	3163	);
2887		3164
2888	# try lzf for large packets
2889	$pkt = "lzf " . Compress::LZF::compress $pkt
2890	if 1024 <= length $pkt and $self->{can_lzf};
2891
2892	# split very large packets
2893	if (8192 < length $pkt and $self->{can_lzf}) {
2894	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2895	$pkt = "frag";
2896	}
2897
2898	$self->send_packet ($pkt);	3165	$self->send_big_packet ($pkt);
2899	}	3166	}
2900		3167
2901	=item $client->ext_msg ($type, @msg)	3168	=item $client->ext_msg ($type, @msg)
2902		3169
2903	Sends an ext event to the client.	3170	Sends an ext event to the client.
…		…
2906		3173
2907	sub cf::client::ext_msg($$@) {	3174	sub cf::client::ext_msg($$@) {
2908	my ($self, $type, @msg) = @_;	3175	my ($self, $type, @msg) = @_;
2909		3176
2910	if ($self->extcmd == 2) {	3177	if ($self->extcmd == 2) {
2911	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3178	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2912	} elsif ($self->extcmd == 1) { # TODO: remove	3179	} elsif ($self->extcmd == 1) { # TODO: remove
2913	push @msg, msgtype => "event_$type";	3180	push @msg, msgtype => "event_$type";
2914	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3181	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2915	}	3182	}
2916	}	3183	}
2917		3184
2918	=item $client->ext_reply ($msgid, @msg)	3185	=item $client->ext_reply ($msgid, @msg)
2919		3186
…		…
2923		3190
2924	sub cf::client::ext_reply($$@) {	3191	sub cf::client::ext_reply($$@) {
2925	my ($self, $id, @msg) = @_;	3192	my ($self, $id, @msg) = @_;
2926		3193
2927	if ($self->extcmd == 2) {	3194	if ($self->extcmd == 2) {
2928	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));	3195	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2929	} elsif ($self->extcmd == 1) {	3196	} elsif ($self->extcmd == 1) {
2930	#TODO: version 1, remove	3197	#TODO: version 1, remove
2931	unshift @msg, msgtype => "reply", msgid => $id;	3198	unshift @msg, msgtype => "reply", msgid => $id;
2932	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3199	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2933	}	3200	}
2934	}	3201	}
2935		3202
2936	=item $success = $client->query ($flags, "text", \&cb)	3203	=item $success = $client->query ($flags, "text", \&cb)
2937		3204
…		…
3008		3275
3009	$ns->ext_reply ($reply, @reply)	3276	$ns->ext_reply ($reply, @reply)
3010	if $reply;	3277	if $reply;
3011		3278
3012	} else {	3279	} else {
3013	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3280	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3014	}	3281	}
3015		3282
3016	cf::override;	3283	cf::override;
3017	},	3284	},
3018	);	3285	);
…		…
3038		3305
3039	$coro	3306	$coro
3040	}	3307	}
3041		3308
3042	cf::client->attach (	3309	cf::client->attach (
3043	on_destroy => sub {	3310	on_client_destroy => sub {
3044	my ($ns) = @_;	3311	my ($ns) = @_;
3045		3312
3046	$_->cancel for values %{ (delete $ns->{_coro}) || {} };	3313	$_->cancel for values %{ (delete $ns->{_coro}) || {} };
3047	},	3314	},
3048	);	3315	);
…		…
3064	our $safe_hole = new Safe::Hole;	3331	our $safe_hole = new Safe::Hole;
3065		3332
3066	$SIG{FPE} = 'IGNORE';	3333	$SIG{FPE} = 'IGNORE';
3067		3334
3068	$safe->permit_only (Opcode::opset qw(	3335	$safe->permit_only (Opcode::opset qw(
3069	:base_core :base_mem :base_orig :base_math	3336	:base_core :base_mem :base_orig :base_math :base_loop
3070	grepstart grepwhile mapstart mapwhile	3337	grepstart grepwhile mapstart mapwhile
3071	sort time	3338	sort time
3072	));	3339	));
3073		3340
3074	# here we export the classes and methods available to script code	3341	# here we export the classes and methods available to script code
…		…
3099	decrease split destroy change_exp value msg lore send_msg)],	3366	decrease split destroy change_exp value msg lore send_msg)],
3100	["cf::object::player" => qw(player)],	3367	["cf::object::player" => qw(player)],
3101	["cf::player" => qw(peaceful send_msg)],	3368	["cf::player" => qw(peaceful send_msg)],
3102	["cf::map" => qw(trigger)],	3369	["cf::map" => qw(trigger)],
3103	) {	3370	) {
3104	no strict 'refs';
3105	my ($pkg, @funs) = @$_;	3371	my ($pkg, @funs) = @$_;
3106	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3372	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3107	for @funs;	3373	for @funs;
3108	}	3374	}
3109		3375
…		…
3126	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3392	$qcode =~ s/"/‟/g; # not allowed in #line filenames
3127	$qcode =~ s/\n/\\n/g;	3393	$qcode =~ s/\n/\\n/g;
3128		3394
3129	%vars = (_dummy => 0) unless %vars;	3395	%vars = (_dummy => 0) unless %vars;
3130		3396
		3397	my @res;
3131	local $_;	3398	local $_;
3132	local @safe::cf::_safe_eval_args = values %vars;
3133		3399
3134	my $eval =	3400	my $eval =
3135	"do {\n"	3401	"do {\n"
3136	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"	3402	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3137	. "#line 0 \"{$qcode}\"\n"	3403	. "#line 0 \"{$qcode}\"\n"
3138	. $code	3404	. $code
3139	. "\n}"	3405	. "\n}"
3140	;	3406	;
3141		3407
		3408	if ($CFG{safe_eval}) {
3142	sub_generation_inc;	3409	sub_generation_inc;
		3410	local @safe::cf::_safe_eval_args = values %vars;
3143	my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);	3411	@res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3144	sub_generation_inc;	3412	sub_generation_inc;
		3413	} else {
		3414	local @cf::_safe_eval_args = values %vars;
		3415	@res = wantarray ? eval eval : scalar eval $eval;
		3416	}
3145		3417
3146	if ($@) {	3418	if ($@) {
3147	warn "$@";	3419	warn "$@",
3148	warn "while executing safe code '$code'\n";	3420	"while executing safe code '$code'\n",
3149	warn "with arguments " . (join " ", %vars) . "\n";	3421	"with arguments " . (join " ", %vars) . "\n";
3150	}	3422	}
3151		3423
3152	wantarray ? @res : $res[0]	3424	wantarray ? @res : $res[0]
3153	}	3425	}
3154		3426
…		…
3168	=cut	3440	=cut
3169		3441
3170	sub register_script_function {	3442	sub register_script_function {
3171	my ($fun, $cb) = @_;	3443	my ($fun, $cb) = @_;
3172		3444
3173	no strict 'refs';	3445	$fun = "safe::$fun" if $CFG{safe_eval};
3174	*{"safe::$fun"} = $safe_hole->wrap ($cb);	3446	*$fun = $safe_hole->wrap ($cb);
3175	}	3447	}
3176		3448
3177	=back	3449	=back
3178		3450
3179	=cut	3451	=cut
…		…
3188	# for this (global event?)	3460	# for this (global event?)
3189	%ext::player_env::MUSIC_FACE_CACHE = ();	3461	%ext::player_env::MUSIC_FACE_CACHE = ();
3190		3462
3191	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3463	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3192		3464
3193	warn "loading facedata from $path\n";	3465	trace "loading facedata from $path\n";
3194		3466
3195	my $facedata;	3467	my $facedata = decode_storable load_file $path;
3196	0 < aio_load $path, $facedata
3197	or die "$path: $!";
3198
3199	$facedata = Coro::Storable::thaw $facedata;
3200		3468
3201	$facedata->{version} == 2	3469	$facedata->{version} == 2
3202	or cf::cleanup "$path: version mismatch, cannot proceed.";	3470	or cf::cleanup "$path: version mismatch, cannot proceed.";
3203		3471
3204	# patch in the exptable	3472	# patch in the exptable
		3473	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3205	$facedata->{resource}{"res/exp_table"} = {	3474	$facedata->{resource}{"res/exp_table"} = {
3206	type => FT_RSRC,	3475	type => FT_RSRC,
3207	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),	3476	data => $exp_table,
		3477	hash => (Digest::MD5::md5 $exp_table),
3208	};	3478	};
3209	cf::cede_to_tick;	3479	cf::cede_to_tick;
3210		3480
3211	{	3481	{
3212	my $faces = $facedata->{faceinfo};	3482	my $faces = $facedata->{faceinfo};
…		…
3214	while (my ($face, $info) = each %$faces) {	3484	while (my ($face, $info) = each %$faces) {
3215	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3485	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3216		3486
3217	cf::face::set_visibility $idx, $info->{visibility};	3487	cf::face::set_visibility $idx, $info->{visibility};
3218	cf::face::set_magicmap $idx, $info->{magicmap};	3488	cf::face::set_magicmap $idx, $info->{magicmap};
3219	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};	3489	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3220	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};	3490	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
		3491	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3221		3492
3222	cf::cede_to_tick;	3493	cf::cede_to_tick;
3223	}	3494	}
3224		3495
3225	while (my ($face, $info) = each %$faces) {	3496	while (my ($face, $info) = each %$faces) {
…		…
3230		3501
3231	if (my $smooth = cf::face::find $info->{smooth}) {	3502	if (my $smooth = cf::face::find $info->{smooth}) {
3232	cf::face::set_smooth $idx, $smooth;	3503	cf::face::set_smooth $idx, $smooth;
3233	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3504	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3234	} else {	3505	} else {
3235	warn "smooth face '$info->{smooth}' not found for face '$face'";	3506	error "smooth face '$info->{smooth}' not found for face '$face'";
3236	}	3507	}
3237		3508
3238	cf::cede_to_tick;	3509	cf::cede_to_tick;
3239	}	3510	}
3240	}	3511	}
…		…
3249		3520
3250	cf::anim::invalidate_all; # d'oh	3521	cf::anim::invalidate_all; # d'oh
3251	}	3522	}
3252		3523
3253	{	3524	{
3254	# TODO: for gcfclient pleasure, we should give resources
3255	# that gcfclient doesn't grok a >10000 face index.
3256	my $res = $facedata->{resource};	3525	my $res = $facedata->{resource};
3257		3526
3258	while (my ($name, $info) = each %$res) {	3527	while (my ($name, $info) = each %$res) {
3259	if (defined $info->{type}) {	3528	if (defined $info->{type}) {
3260	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3529	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3261	my $data;
3262		3530
3263	if ($info->{type} & 1) {	3531	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3264	# prepend meta info
3265
3266	my $meta = $enc->encode ({
3267	name => $name,
3268	%{ $info->{meta} || {} },
3269	});
3270
3271	$data = pack "(w/a*)*", $meta, $info->{data};
3272	} else {
3273	$data = $info->{data};
3274	}
3275
3276	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3277	cf::face::set_type $idx, $info->{type};	3532	cf::face::set_type $idx, $info->{type};
3278	} else {	3533	} else {
3279	$RESOURCE{$name} = $info;	3534	$RESOURCE{$name} = $info; # unused
3280	}	3535	}
3281		3536
3282	cf::cede_to_tick;	3537	cf::cede_to_tick;
3283	}	3538	}
3284	}	3539	}
3285		3540
3286	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3541	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3287		3542
3288	1	3543	1
3289	}	3544	}
3290
3291	cf::global->attach (on_resource_update => sub {
3292	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3293	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3294
3295	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3296	my $sound = $soundconf->{compat}[$_]
3297	or next;
3298
3299	my $face = cf::face::find "sound/$sound->[1]";
3300	cf::sound::set $sound->[0] => $face;
3301	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3302	}
3303
3304	while (my ($k, $v) = each %{$soundconf->{event}}) {
3305	my $face = cf::face::find "sound/$v";
3306	cf::sound::set $k => $face;
3307	}
3308	}
3309	});
3310		3545
3311	register_exticmd fx_want => sub {	3546	register_exticmd fx_want => sub {
3312	my ($ns, $want) = @_;	3547	my ($ns, $want) = @_;
3313		3548
3314	while (my ($k, $v) = each %$want) {	3549	while (my ($k, $v) = each %$want) {
…		…
3353	sub reload_treasures {	3588	sub reload_treasures {
3354	load_resource_file "$DATADIR/treasures"	3589	load_resource_file "$DATADIR/treasures"
3355	or die "unable to load treasurelists\n";	3590	or die "unable to load treasurelists\n";
3356	}	3591	}
3357		3592
		3593	sub reload_sound {
		3594	trace "loading sound config from $DATADIR/sound\n";
		3595
		3596	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
		3597
		3598	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3599	my $sound = $soundconf->{compat}[$_]
		3600	or next;
		3601
		3602	my $face = cf::face::find "sound/$sound->[1]";
		3603	cf::sound::set $sound->[0] => $face;
		3604	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3605	}
		3606
		3607	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3608	my $face = cf::face::find "sound/$v";
		3609	cf::sound::set $k => $face;
		3610	}
		3611	}
		3612
3358	sub reload_resources {	3613	sub reload_resources {
3359	warn "reloading resource files...\n";	3614	trace "reloading resource files...\n";
3360		3615
		3616	reload_exp_table;
		3617	reload_materials;
3361	reload_facedata;	3618	reload_facedata;
		3619	reload_sound;
3362	reload_archetypes;	3620	reload_archetypes;
3363	reload_regions;	3621	reload_regions;
3364	reload_treasures;	3622	reload_treasures;
3365		3623
3366	warn "finished reloading resource files\n";	3624	trace "finished reloading resource files\n";
3367	}	3625	}
3368		3626
3369	sub reload_config {	3627	sub reload_config {
3370	open my $fh, "<:utf8", "$CONFDIR/config"	3628	trace "reloading config file...\n";
3371	or return;
3372		3629
3373	local $/;	3630	my $config = load_file "$CONFDIR/config";
3374	*CFG = YAML::Load <$fh>;	3631	utf8::decode $config;
		3632	*CFG = decode_yaml $config;
3375		3633
3376	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3634	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3377		3635
3378	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3636	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3379	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3637	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3380		3638
3381	if (exists $CFG{mlockall}) {	3639	if (exists $CFG{mlockall}) {
…		…
3405	seek $fh, 0, 0;	3663	seek $fh, 0, 0;
3406	print $fh $$;	3664	print $fh $$;
3407	}	3665	}
3408		3666
3409	sub main_loop {	3667	sub main_loop {
3410	warn "EV::loop starting\n";	3668	trace "EV::loop starting\n";
3411	if (1) {	3669	if (1) {
3412	EV::loop;	3670	EV::loop;
3413	}	3671	}
3414	warn "EV::loop returned\n";	3672	trace "EV::loop returned\n";
3415	goto &main_loop unless $REALLY_UNLOOP;	3673	goto &main_loop unless $REALLY_UNLOOP;
3416	}	3674	}
3417		3675
3418	sub main {	3676	sub main {
3419	cf::init_globals; # initialise logging	3677	cf::init_globals; # initialise logging
3420		3678
3421	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3679	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3422	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3680	LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3423	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3681	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3424	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3682	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3425
3426	cf::init_experience;
3427	cf::init_anim;
3428	cf::init_attackmess;
3429	cf::init_dynamic;
3430		3683
3431	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3684	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3432		3685
3433	# we must not ever block the main coroutine	3686	# we must not ever block the main coroutine
3434	local $Coro::idle = sub {	3687	local $Coro::idle = sub {
…		…
3440	};	3693	};
3441		3694
3442	evthread_start IO::AIO::poll_fileno;	3695	evthread_start IO::AIO::poll_fileno;
3443		3696
3444	cf::sync_job {	3697	cf::sync_job {
		3698	cf::incloader::init ();
		3699
		3700	cf::init_anim;
		3701	cf::init_attackmess;
		3702	cf::init_dynamic;
		3703
		3704	cf::load_settings;
		3705
3445	reload_resources;	3706	reload_resources;
3446	reload_config;	3707	reload_config;
3447	db_init;	3708	db_init;
3448		3709
3449	cf::load_settings;
3450	cf::load_materials;
3451	cf::init_uuid;	3710	cf::init_uuid;
3452	cf::init_signals;	3711	cf::init_signals;
3453	cf::init_commands;
3454	cf::init_skills;	3712	cf::init_skills;
3455		3713
3456	cf::init_beforeplay;	3714	cf::init_beforeplay;
3457		3715
3458	atomic;	3716	atomic;
…		…
3460	load_extensions;	3718	load_extensions;
3461		3719
3462	utime time, time, $RUNTIMEFILE;	3720	utime time, time, $RUNTIMEFILE;
3463		3721
3464	# no (long-running) fork's whatsoever before this point(!)	3722	# no (long-running) fork's whatsoever before this point(!)
		3723	use POSIX ();
3465	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3724	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3466		3725
3467	(pop @POST_INIT)->(0) while @POST_INIT;	3726	cf::_post_init 0;
3468	};	3727	};
3469		3728
		3729	cf::object::thawer::errors_are_fatal 0;
		3730	info "parse errors in files are no longer fatal from this point on.\n";
		3731
		3732	my $free_main; $free_main = EV::idle sub {
		3733	undef $free_main;
		3734	undef &main; # free gobs of memory :)
		3735	};
		3736
3470	main_loop;	3737	goto &main_loop;
3471	}	3738	}
3472		3739
3473	#############################################################################	3740	#############################################################################
3474	# initialisation and cleanup	3741	# initialisation and cleanup
3475		3742
3476	# install some emergency cleanup handlers	3743	# install some emergency cleanup handlers
3477	BEGIN {	3744	BEGIN {
3478	our %SIGWATCHER = ();	3745	our %SIGWATCHER = ();
3479	for my $signal (qw(INT HUP TERM)) {	3746	for my $signal (qw(INT HUP TERM)) {
3480	$SIGWATCHER{$signal} = EV::signal $signal, sub {	3747	$SIGWATCHER{$signal} = AE::signal $signal, sub {
3481	cf::cleanup "SIG$signal";	3748	cf::cleanup "SIG$signal";
3482	};	3749	};
3483	}	3750	}
3484	}	3751	}
3485		3752
3486	sub write_runtime_sync {	3753	sub write_runtime_sync {
		3754	my $t0 = AE::time;
		3755
3487	# first touch the runtime file to show we are still running:	3756	# first touch the runtime file to show we are still running:
3488	# the fsync below can take a very very long time.	3757	# the fsync below can take a very very long time.
3489		3758
3490	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;	3759	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3491		3760
3492	my $guard = cf::lock_acquire "write_runtime";	3761	my $guard = cf::lock_acquire "write_runtime";
3493		3762
3494	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644	3763	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3495	or return;	3764	or return;
3496		3765
3497	my $value = $cf::RUNTIME + 90 + 10;	3766	my $value = $cf::RUNTIME + 90 + 10;
3498	# 10 is the runtime save interval, for a monotonic clock	3767	# 10 is the runtime save interval, for a monotonic clock
3499	# 60 allows for the watchdog to kill the server.	3768	# 60 allows for the watchdog to kill the server.
…		…
3512	or return;	3781	or return;
3513		3782
3514	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3783	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3515	and return;	3784	and return;
3516		3785
3517	warn "runtime file written.\n";	3786	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3518		3787
3519	1	3788	1
3520	}	3789	}
3521		3790
3522	our $uuid_lock;	3791	our $uuid_lock;
…		…
3534	or return;	3803	or return;
3535		3804
3536	my $value = uuid_seq uuid_cur;	3805	my $value = uuid_seq uuid_cur;
3537		3806
3538	unless ($value) {	3807	unless ($value) {
3539	warn "cowardly refusing to write zero uuid value!\n";	3808	info "cowardly refusing to write zero uuid value!\n";
3540	return;	3809	return;
3541	}	3810	}
3542		3811
3543	my $value = uuid_str $value + $uuid_skip;	3812	my $value = uuid_str $value + $uuid_skip;
3544	$uuid_skip = 0;	3813	$uuid_skip = 0;
…		…
3554	or return;	3823	or return;
3555		3824
3556	aio_rename "$uuid~", $uuid	3825	aio_rename "$uuid~", $uuid
3557	and return;	3826	and return;
3558		3827
3559	warn "uuid file written ($value).\n";	3828	trace "uuid file written ($value).\n";
3560		3829
3561	1	3830	1
3562		3831
3563	}	3832	}
3564		3833
…		…
3570	}	3839	}
3571		3840
3572	sub emergency_save() {	3841	sub emergency_save() {
3573	my $freeze_guard = cf::freeze_mainloop;	3842	my $freeze_guard = cf::freeze_mainloop;
3574		3843
3575	warn "emergency_perl_save: enter\n";	3844	info "emergency_perl_save: enter\n";
		3845
		3846	# this is a trade-off: we want to be very quick here, so
		3847	# save all maps without fsync, and later call a global sync
		3848	# (which in turn might be very very slow)
		3849	local $USE_FSYNC = 0;
3576		3850
3577	cf::sync_job {	3851	cf::sync_job {
3578	# this is a trade-off: we want to be very quick here, so	3852	cf::write_runtime_sync; # external watchdog should not bark
3579	# save all maps without fsync, and later call a global sync
3580	# (which in turn might be very very slow)
3581	local $USE_FSYNC = 0;
3582		3853
3583	# use a peculiar iteration method to avoid tripping on perl	3854	# use a peculiar iteration method to avoid tripping on perl
3584	# refcount bugs in for. also avoids problems with players	3855	# refcount bugs in for. also avoids problems with players
3585	# and maps saved/destroyed asynchronously.	3856	# and maps saved/destroyed asynchronously.
3586	warn "emergency_perl_save: begin player save\n";	3857	info "emergency_perl_save: begin player save\n";
3587	for my $login (keys %cf::PLAYER) {	3858	for my $login (keys %cf::PLAYER) {
3588	my $pl = $cf::PLAYER{$login} or next;	3859	my $pl = $cf::PLAYER{$login} or next;
3589	$pl->valid or next;	3860	$pl->valid or next;
3590	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3861	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3591	$pl->save;	3862	$pl->save;
3592	}	3863	}
3593	warn "emergency_perl_save: end player save\n";	3864	info "emergency_perl_save: end player save\n";
3594		3865
		3866	cf::write_runtime_sync; # external watchdog should not bark
		3867
3595	warn "emergency_perl_save: begin map save\n";	3868	info "emergency_perl_save: begin map save\n";
3596	for my $path (keys %cf::MAP) {	3869	for my $path (keys %cf::MAP) {
3597	my $map = $cf::MAP{$path} or next;	3870	my $map = $cf::MAP{$path} or next;
3598	$map->valid or next;	3871	$map->valid or next;
3599	$map->save;	3872	$map->save;
3600	}	3873	}
3601	warn "emergency_perl_save: end map save\n";	3874	info "emergency_perl_save: end map save\n";
3602		3875
		3876	cf::write_runtime_sync; # external watchdog should not bark
		3877
3603	warn "emergency_perl_save: begin database checkpoint\n";	3878	info "emergency_perl_save: begin database checkpoint\n";
3604	BDB::db_env_txn_checkpoint $DB_ENV;	3879	BDB::db_env_txn_checkpoint $DB_ENV;
3605	warn "emergency_perl_save: end database checkpoint\n";	3880	info "emergency_perl_save: end database checkpoint\n";
3606		3881
3607	warn "emergency_perl_save: begin write uuid\n";	3882	info "emergency_perl_save: begin write uuid\n";
3608	write_uuid_sync 1;	3883	write_uuid_sync 1;
3609	warn "emergency_perl_save: end write uuid\n";	3884	info "emergency_perl_save: end write uuid\n";
		3885
		3886	cf::write_runtime_sync; # external watchdog should not bark
		3887
		3888	trace "emergency_perl_save: syncing database to disk";
		3889	BDB::db_env_txn_checkpoint $DB_ENV;
		3890
		3891	info "emergency_perl_save: starting sync\n";
		3892	IO::AIO::aio_sync sub {
		3893	info "emergency_perl_save: finished sync\n";
		3894	};
		3895
		3896	cf::write_runtime_sync; # external watchdog should not bark
		3897
		3898	trace "emergency_perl_save: flushing outstanding aio requests";
		3899	while (IO::AIO::nreqs || BDB::nreqs) {
		3900	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
		3901	}
		3902
		3903	cf::write_runtime_sync; # external watchdog should not bark
3610	};	3904	};
3611		3905
3612	warn "emergency_perl_save: starting sync()\n";
3613	IO::AIO::aio_sync sub {
3614	warn "emergency_perl_save: finished sync()\n";
3615	};
3616
3617	warn "emergency_perl_save: leave\n";	3906	info "emergency_perl_save: leave\n";
3618	}	3907	}
3619		3908
3620	sub post_cleanup {	3909	sub post_cleanup {
3621	my ($make_core) = @_;	3910	my ($make_core) = @_;
3622		3911
		3912	IO::AIO::flush;
		3913
3623	warn Carp::longmess "post_cleanup backtrace"	3914	error Carp::longmess "post_cleanup backtrace"
3624	if $make_core;	3915	if $make_core;
3625		3916
3626	my $fh = pidfile;	3917	my $fh = pidfile;
3627	unlink $PIDFILE if <$fh> == $$;	3918	unlink $PIDFILE if <$fh> == $$;
3628	}	3919	}
…		…
3648	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	3939	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3649	for my $name (keys %$leaf_symtab) {	3940	for my $name (keys %$leaf_symtab) {
3650	_gv_clear *{"$pkg$name"};	3941	_gv_clear *{"$pkg$name"};
3651	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	3942	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3652	}	3943	}
3653	warn "cleared package $pkg\n";#d#
3654	}	3944	}
3655		3945
3656	sub do_reload_perl() {	3946	sub do_reload_perl() {
3657	# can/must only be called in main	3947	# can/must only be called in main
3658	if ($Coro::current != $Coro::main) {	3948	unless (in_main) {
3659	warn "can only reload from main coroutine";	3949	error "can only reload from main coroutine";
3660	return;	3950	return;
3661	}	3951	}
3662		3952
3663	return if $RELOAD++;	3953	return if $RELOAD++;
3664		3954
3665	my $t1 = EV::time;	3955	my $t1 = AE::time;
3666		3956
3667	while ($RELOAD) {	3957	while ($RELOAD) {
3668	warn "reloading...";	3958	cf::get_slot 0.1, -1, "reload_perl";
		3959	info "perl_reload: reloading...";
3669		3960
3670	warn "entering sync_job";	3961	trace "perl_reload: entering sync_job";
3671		3962
3672	cf::sync_job {	3963	cf::sync_job {
3673	cf::write_runtime_sync; # external watchdog should not bark
3674	cf::emergency_save;	3964	#cf::emergency_save;
3675	cf::write_runtime_sync; # external watchdog should not bark
3676		3965
3677	warn "syncing database to disk";
3678	BDB::db_env_txn_checkpoint $DB_ENV;
3679
3680	# if anything goes wrong in here, we should simply crash as we already saved
3681
3682	warn "flushing outstanding aio requests";
3683	while (IO::AIO::nreqs || BDB::nreqs) {
3684	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3685	}
3686
3687	warn "cancelling all extension coros";	3966	trace "perl_reload: cancelling all extension coros";
3688	$_->cancel for values %EXT_CORO;	3967	$_->cancel for values %EXT_CORO;
3689	%EXT_CORO = ();	3968	%EXT_CORO = ();
3690		3969
3691	warn "removing commands";	3970	trace "perl_reload: removing commands";
3692	%COMMAND = ();	3971	%COMMAND = ();
3693		3972
3694	warn "removing ext/exti commands";	3973	trace "perl_reload: removing ext/exti commands";
3695	%EXTCMD = ();	3974	%EXTCMD = ();
3696	%EXTICMD = ();	3975	%EXTICMD = ();
3697		3976
3698	warn "unloading/nuking all extensions";	3977	trace "perl_reload: unloading/nuking all extensions";
3699	for my $pkg (@EXTS) {	3978	for my $pkg (@EXTS) {
3700	warn "... unloading $pkg";	3979	trace "... unloading $pkg";
3701		3980
3702	if (my $cb = $pkg->can ("unload")) {	3981	if (my $cb = $pkg->can ("unload")) {
3703	eval {	3982	eval {
3704	$cb->($pkg);	3983	$cb->($pkg);
3705	1	3984	1
3706	} or warn "$pkg unloaded, but with errors: $@";	3985	} or error "$pkg unloaded, but with errors: $@";
3707	}	3986	}
3708		3987
3709	warn "... clearing $pkg";	3988	trace "... clearing $pkg";
3710	clear_package $pkg;	3989	clear_package $pkg;
3711	}	3990	}
3712		3991
3713	warn "unloading all perl modules loaded from $LIBDIR";	3992	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3714	while (my ($k, $v) = each %INC) {	3993	while (my ($k, $v) = each %INC) {
3715	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	3994	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3716		3995
3717	warn "... unloading $k";	3996	trace "... unloading $k";
3718	delete $INC{$k};	3997	delete $INC{$k};
3719		3998
3720	$k =~ s/\.pm$//;	3999	$k =~ s/\.pm$//;
3721	$k =~ s/\//::/g;	4000	$k =~ s/\//::/g;
3722		4001
…		…
3725	}	4004	}
3726		4005
3727	clear_package $k;	4006	clear_package $k;
3728	}	4007	}
3729		4008
3730	warn "getting rid of safe::, as good as possible";	4009	trace "perl_reload: getting rid of safe::, as good as possible";
3731	clear_package "safe::$_"	4010	clear_package "safe::$_"
3732	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4011	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3733		4012
3734	warn "unloading cf.pm \"a bit\"";	4013	trace "perl_reload: unloading cf.pm \"a bit\"";
3735	delete $INC{"cf.pm"};	4014	delete $INC{"cf.pm"};
3736	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4015	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3737		4016
3738	# don't, removes xs symbols, too,	4017	# don't, removes xs symbols, too,
3739	# and global variables created in xs	4018	# and global variables created in xs
3740	#clear_package __PACKAGE__;	4019	#clear_package __PACKAGE__;
3741		4020
3742	warn "unload completed, starting to reload now";	4021	info "perl_reload: unload completed, starting to reload now";
3743		4022
3744	warn "reloading cf.pm";	4023	trace "perl_reload: reloading cf.pm";
3745	require cf;	4024	require cf;
3746	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	4025	cf::_connect_to_perl_1;
3747		4026
3748	warn "loading config and database again";	4027	trace "perl_reload: loading config and database again";
3749	cf::reload_config;	4028	cf::reload_config;
3750		4029
3751	warn "loading extensions";	4030	trace "perl_reload: loading extensions";
3752	cf::load_extensions;	4031	cf::load_extensions;
3753		4032
3754	if ($REATTACH_ON_RELOAD) {	4033	if ($REATTACH_ON_RELOAD) {
3755	warn "reattaching attachments to objects/players";	4034	trace "perl_reload: reattaching attachments to objects/players";
3756	_global_reattach; # objects, sockets	4035	_global_reattach; # objects, sockets
3757	warn "reattaching attachments to maps";	4036	trace "perl_reload: reattaching attachments to maps";
3758	reattach $_ for values %MAP;	4037	reattach $_ for values %MAP;
3759	warn "reattaching attachments to players";	4038	trace "perl_reload: reattaching attachments to players";
3760	reattach $_ for values %PLAYER;	4039	reattach $_ for values %PLAYER;
3761	}	4040	}
3762		4041
3763	warn "running post_init jobs";	4042	cf::_post_init 1;
3764	(pop @POST_INIT)->(1) while @POST_INIT;
3765		4043
3766	warn "leaving sync_job";	4044	trace "perl_reload: leaving sync_job";
3767		4045
3768	1	4046	1
3769	} or do {	4047	} or do {
3770	warn $@;	4048	error $@;
3771	cf::cleanup "error while reloading, exiting.";	4049	cf::cleanup "perl_reload: error, exiting.";
3772	};	4050	};
3773		4051
3774	warn "reloaded";
3775	--$RELOAD;	4052	--$RELOAD;
3776	}	4053	}
3777		4054
3778	$t1 = EV::time - $t1;	4055	$t1 = AE::time - $t1;
3779	warn "reload completed in ${t1}s\n";	4056	info "perl_reload: completed in ${t1}s\n";
3780	};	4057	};
3781		4058
3782	our $RELOAD_WATCHER; # used only during reload	4059	our $RELOAD_WATCHER; # used only during reload
3783		4060
3784	sub reload_perl() {	4061	sub reload_perl() {
…		…
3786	# coro crashes during coro_state_free->destroy here.	4063	# coro crashes during coro_state_free->destroy here.
3787		4064
3788	$RELOAD_WATCHER ||= cf::async {	4065	$RELOAD_WATCHER ||= cf::async {
3789	Coro::AIO::aio_wait cache_extensions;	4066	Coro::AIO::aio_wait cache_extensions;
3790		4067
3791	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {	4068	$RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3792	do_reload_perl;	4069	do_reload_perl;
3793	undef $RELOAD_WATCHER;	4070	undef $RELOAD_WATCHER;
3794	};	4071	};
3795	};	4072	};
3796	}	4073	}
…		…
3805	reload_perl;	4082	reload_perl;
3806	};	4083	};
3807	}	4084	}
3808	};	4085	};
3809		4086
3810	unshift @INC, $LIBDIR;	4087	#############################################################################
3811		4088
3812	my $bug_warning = 0;	4089	my $bug_warning = 0;
3813		4090
3814	our @WAIT_FOR_TICK;	4091	our @WAIT_FOR_TICK;
3815	our @WAIT_FOR_TICK_BEGIN;	4092	our @WAIT_FOR_TICK_BEGIN;
3816		4093
3817	sub wait_for_tick {	4094	sub wait_for_tick() {
3818	return if tick_inhibit || $Coro::current == $Coro::main;	4095	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3819		4096
3820	my $signal = new Coro::Signal;	4097	my $signal = new Coro::Signal;
3821	push @WAIT_FOR_TICK, $signal;	4098	push @WAIT_FOR_TICK, $signal;
3822	$signal->wait;	4099	$signal->wait;
3823	}	4100	}
3824		4101
3825	sub wait_for_tick_begin {	4102	sub wait_for_tick_begin() {
3826	return if tick_inhibit || $Coro::current == $Coro::main;	4103	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3827		4104
3828	my $signal = new Coro::Signal;	4105	my $signal = new Coro::Signal;
3829	push @WAIT_FOR_TICK_BEGIN, $signal;	4106	push @WAIT_FOR_TICK_BEGIN, $signal;
3830	$signal->wait;	4107	$signal->wait;
3831	}	4108	}
…		…
3837	return;	4114	return;
3838	}	4115	}
3839		4116
3840	cf::server_tick; # one server iteration	4117	cf::server_tick; # one server iteration
3841		4118
		4119	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
		4120
3842	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4121	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3843	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4122	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3844	Coro::async_pool {	4123	Coro::async_pool {
3845	$Coro::current->{desc} = "runtime saver";	4124	$Coro::current->{desc} = "runtime saver";
3846	write_runtime_sync	4125	write_runtime_sync
3847	or warn "ERROR: unable to write runtime file: $!";	4126	or error "ERROR: unable to write runtime file: $!";
3848	};	4127	};
3849	}	4128	}
3850		4129
3851	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4130	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3852	$sig->send;	4131	$sig->send;
…		…
3860		4139
3861	if (0) {	4140	if (0) {
3862	if ($NEXT_TICK) {	4141	if ($NEXT_TICK) {
3863	my $jitter = $TICK_START - $NEXT_TICK;	4142	my $jitter = $TICK_START - $NEXT_TICK;
3864	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4143	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
3865	warn "jitter $JITTER\n";#d#	4144	debug "jitter $JITTER\n";#d#
3866	}	4145	}
3867	}	4146	}
3868	}	4147	}
3869		4148
3870	{	4149	{
3871	# configure BDB	4150	# configure BDB
3872		4151
3873	BDB::min_parallel 8;	4152	BDB::min_parallel 16;
3874	BDB::max_poll_reqs $TICK * 0.1;	4153	BDB::max_poll_reqs $TICK * 0.1;
3875	$AnyEvent::BDB::WATCHER->priority (1);	4154	$AnyEvent::BDB::WATCHER->priority (1);
3876		4155
3877	unless ($DB_ENV) {	4156	unless ($DB_ENV) {
3878	$DB_ENV = BDB::db_env_create;	4157	$DB_ENV = BDB::db_env_create;
…		…
3915	IO::AIO::min_parallel 8;	4194	IO::AIO::min_parallel 8;
3916	IO::AIO::max_poll_time $TICK * 0.1;	4195	IO::AIO::max_poll_time $TICK * 0.1;
3917	undef $AnyEvent::AIO::WATCHER;	4196	undef $AnyEvent::AIO::WATCHER;
3918	}	4197	}
3919		4198
3920	my $_log_backtrace;	4199	our $_log_backtrace;
		4200	our $_log_backtrace_last;
3921		4201
3922	sub _log_backtrace {	4202	sub _log_backtrace {
3923	my ($msg, @addr) = @_;	4203	my ($msg, @addr) = @_;
3924		4204
3925	$msg =~ s/\n//;	4205	$msg =~ s/\n$//;
3926		4206
		4207	if ($_log_backtrace_last eq $msg) {
		4208	LOG llevInfo, "[ABT] $msg\n";
		4209	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3927	# limit the # of concurrent backtraces	4210	# limit the # of concurrent backtraces
3928	if ($_log_backtrace < 2) {	4211	} elsif ($_log_backtrace < 2) {
		4212	$_log_backtrace_last = $msg;
3929	++$_log_backtrace;	4213	++$_log_backtrace;
3930	my $perl_bt = Carp::longmess $msg;	4214	my $perl_bt = Carp::longmess $msg;
3931	async {	4215	async {
3932	$Coro::current->{desc} = "abt $msg";	4216	$Coro::current->{desc} = "abt $msg";
3933		4217
…		…
3953	LOG llevInfo, "[ABT] $_\n" for @bt;	4237	LOG llevInfo, "[ABT] $_\n" for @bt;
3954	--$_log_backtrace;	4238	--$_log_backtrace;
3955	};	4239	};
3956	} else {	4240	} else {
3957	LOG llevInfo, "[ABT] $msg\n";	4241	LOG llevInfo, "[ABT] $msg\n";
3958	LOG llevInfo, "[ABT] [suppressed]\n";	4242	LOG llevInfo, "[ABT] [overload, suppressed]\n";
3959	}	4243	}
3960	}	4244	}
3961		4245
3962	# load additional modules	4246	# load additional modules
3963	require "cf/$_.pm" for @EXTRA_MODULES;	4247	require "cf/$_.pm" for @EXTRA_MODULES;
		4248	cf::_connect_to_perl_2;
3964		4249
3965	END { cf::emergency_save }	4250	END { cf::emergency_save }
3966		4251
3967	1	4252	1
3968		4253

Diff Legend

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