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.494 by root, Mon Oct 26 05:18:00 2009 UTC vs.
Revision 1.580 by root, Wed Jan 4 03:22:48 2012 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,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	#	5	#
6	# Deliantra is free software: you can redistribute it and/or modify it under	6	# Deliantra is free software: you can redistribute it and/or modify it under
7	# the terms of the Affero GNU General Public License as published by the	7	# the terms of the Affero GNU General Public License as published by the
8	# Free Software Foundation, either version 3 of the License, or (at your	8	# Free Software Foundation, either version 3 of the License, or (at your
9	# option) any later version.	9	# option) any later version.
…		…
20	# 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>
21	#	21	#
22		22
23	package cf;	23	package cf;
24		24
25	use 5.10.0;	25	use common::sense;
26	use utf8;
27	use strict qw(vars subs);
28		26
29	use Symbol;	27	use Symbol;
30	use List::Util;	28	use List::Util;
31	use Socket;	29	use Socket;
32	use EV;	30	use EV;
…		…
53	use Coro::Util ();	51	use Coro::Util ();
54		52
55	use JSON::XS 2.01 ();	53	use JSON::XS 2.01 ();
56	use BDB ();	54	use BDB ();
57	use Data::Dumper;	55	use Data::Dumper;
58	use Digest::MD5;
59	use Fcntl;	56	use Fcntl;
60	use YAML::XS ();	57	use YAML::XS ();
61	use IO::AIO ();	58	use IO::AIO ();
62	use Time::HiRes;	59	use Time::HiRes;
63	use Compress::LZF;	60	use Compress::LZF;
…		…
79	# strictly for debugging	76	# strictly for debugging
80	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };	77	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
81		78
82	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	79	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
83		80
		81	our @ORIG_INC;
		82
84	our %COMMAND = ();	83	our %COMMAND = ();
85	our %COMMAND_TIME = ();	84	our %COMMAND_TIME = ();
86		85
87	our @EXTS = (); # list of extension package names	86	our @EXTS = (); # list of extension package names
88	our %EXTCMD = ();	87	our %EXTCMD = ();
…		…
94	our @EVENT;	93	our @EVENT;
95	our @REFLECT; # set by XS	94	our @REFLECT; # set by XS
96	our %REFLECT; # set by us	95	our %REFLECT; # set by us
97		96
98	our $CONFDIR = confdir;	97	our $CONFDIR = confdir;
		98
99	our $DATADIR = datadir;	99	our $DATADIR = datadir;
100	our $LIBDIR = "$DATADIR/ext";	100	our $LIBDIR = "$DATADIR/ext";
101	our $PODDIR = "$DATADIR/pod";	101	our $PODDIR = "$DATADIR/pod";
102	our $MAPDIR = "$DATADIR/" . mapdir;	102	our $MAPDIR = "$DATADIR/" . mapdir;
		103
103	our $LOCALDIR = localdir;	104	our $LOCALDIR = localdir;
104	our $TMPDIR = "$LOCALDIR/" . tmpdir;	105	our $TMPDIR = "$LOCALDIR/" . tmpdir;
105	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	106	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
106	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	107	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
107	our $RANDOMDIR = "$LOCALDIR/random";	108	our $RANDOMDIR = "$LOCALDIR/random";
108	our $BDBDIR = "$LOCALDIR/db";	109	our $BDBDIR = "$LOCALDIR/db";
109	our $PIDFILE = "$LOCALDIR/pid";	110	our $PIDFILE = "$LOCALDIR/pid";
110	our $RUNTIMEFILE = "$LOCALDIR/runtime";	111	our $RUNTIMEFILE = "$LOCALDIR/runtime";
111		112
112	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;
113		120
114	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	121	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
115	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	122	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
116	our $NEXT_TICK;	123	our $NEXT_TICK;
117	our $USE_FSYNC = 1; # use fsync to write maps - default on	124	our $USE_FSYNC = 1; # use fsync to write maps - default on
…		…
119	our $BDB_DEADLOCK_WATCHER;	126	our $BDB_DEADLOCK_WATCHER;
120	our $BDB_CHECKPOINT_WATCHER;	127	our $BDB_CHECKPOINT_WATCHER;
121	our $BDB_TRICKLE_WATCHER;	128	our $BDB_TRICKLE_WATCHER;
122	our $DB_ENV;	129	our $DB_ENV;
123		130
124	our @EXTRA_MODULES = qw(pod match mapscript);	131	our @EXTRA_MODULES = qw(pod match mapscript incloader);
125		132
126	our %CFG;	133	our %CFG;
127		134
128	our $UPTIME; $UPTIME ||= time;	135	our $UPTIME; $UPTIME ||= time;
129	our $RUNTIME;	136	our $RUNTIME = 0;
		137	our $SERVER_TICK = 0;
130	our $NOW;	138	our $NOW;
131		139
132	our (%PLAYER, %PLAYER_LOADING); # all users	140	our (%PLAYER, %PLAYER_LOADING); # all users
133	our (%MAP, %MAP_LOADING ); # all maps	141	our (%MAP, %MAP_LOADING ); # all maps
134	our $LINK_MAP; # the special {link} map, which is always available	142	our $LINK_MAP; # the special {link} map, which is always available
…		…
143		151
144	our @POST_INIT;	152	our @POST_INIT;
145		153
146	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)	154	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
147	our $REALLY_UNLOOP; # never set to true, please :)	155	our $REALLY_UNLOOP; # never set to true, please :)
		156
		157	our $WAIT_FOR_TICK = new Coro::Signal;
		158	our @WAIT_FOR_TICK_BEGIN;
148		159
149	binmode STDOUT;	160	binmode STDOUT;
150	binmode STDERR;	161	binmode STDERR;
151		162
152	# read virtual server time, if available	163	# read virtual server time, if available
…		…
163		174
164	our $EMERGENCY_POSITION;	175	our $EMERGENCY_POSITION;
165		176
166	sub cf::map::normalise;	177	sub cf::map::normalise;
167		178
		179	sub in_main() {
		180	$Coro::current == $Coro::main
		181	}
		182
168	#############################################################################	183	#############################################################################
169		184
170	%REFLECT = ();	185	%REFLECT = ();
171	for (@REFLECT) {	186	for (@REFLECT) {
172	my $reflect = JSON::XS::decode_json $_;	187	my $reflect = JSON::XS::decode_json $_;
…		…
182		197
183	=over 4	198	=over 4
184		199
185	=item $cf::UPTIME	200	=item $cf::UPTIME
186		201
187	The timestamp of the server start (so not actually an uptime).	202	The timestamp of the server start (so not actually an "uptime").
		203
		204	=item $cf::SERVER_TICK
		205
		206	An unsigned integer that starts at zero when the server is started and is
		207	incremented on every tick.
		208
		209	=item $cf::NOW
		210
		211	The (real) time of the last (current) server tick - updated before and
		212	after tick processing, so this is useful only as a rough "what time is it
		213	now" estimate.
		214
		215	=item $cf::TICK
		216
		217	The interval between each server tick, in seconds.
188		218
189	=item $cf::RUNTIME	219	=item $cf::RUNTIME
190		220
191	The time this server has run, starts at 0 and is increased by $cf::TICK on	221	The time this server has run, starts at 0 and is increased by $cf::TICK on
192	every server tick.	222	every server tick.
…		…
198	Various directories - "/etc", read-only install directory, perl-library	228	Various directories - "/etc", read-only install directory, perl-library
199	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	229	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
200	unique-items directory, player file directory, random maps directory and	230	unique-items directory, player file directory, random maps directory and
201	database environment.	231	database environment.
202		232
203	=item $cf::NOW
204
205	The time of the last (current) server tick.
206
207	=item $cf::TICK
208
209	The interval between server ticks, in seconds.
210
211	=item $cf::LOADAVG	233	=item $cf::LOADAVG
212		234
213	The current CPU load on the server (alpha-smoothed), as a value between 0	235	The current CPU load on the server (alpha-smoothed), as a value between 0
214	(none) and 1 (overloaded), indicating how much time is spent on processing	236	(none) and 1 (overloaded), indicating how much time is spent on processing
215	objects per tick. Healthy values are < 0.5.	237	objects per tick. Healthy values are < 0.5.
…		…
224	from wherever your confdir points to.	246	from wherever your confdir points to.
225		247
226	=item cf::wait_for_tick, cf::wait_for_tick_begin	248	=item cf::wait_for_tick, cf::wait_for_tick_begin
227		249
228	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	250	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
229	returns directly I<after> the tick processing (and consequently, can only wake one process	251	returns directly I<after> the tick processing (and consequently, can only wake one thread
230	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	252	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
		253
		254	Note that cf::Wait_for_tick will immediately return when the server is not
		255	ticking, making it suitable for small pauses in threads that need to run
		256	when the server is paused. If that is not applicable (i.e. you I<really>
		257	want to wait, use C<$cf::WAIT_FOR_TICK>).
		258
		259	=item $cf::WAIT_FOR_TICK
		260
		261	Note that C<cf::wait_for_tick> is probably the correct thing to use. This
		262	variable contains a L<Coro::Signal> that is broadcats after every server
		263	tick. Calling C<< ->wait >> on it will suspend the caller until after the
		264	next server tick.
		265
		266	=cut
		267
		268	sub wait_for_tick();
		269	sub wait_for_tick_begin();
231		270
232	=item @cf::INVOKE_RESULTS	271	=item @cf::INVOKE_RESULTS
233		272
234	This array contains the results of the last C<invoke ()> call. When	273	This array contains the results of the last C<invoke ()> call. When
235	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of	274	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
…		…
243		282
244	=back	283	=back
245		284
246	=cut	285	=cut
247		286
		287	sub error(@) { LOG llevError, join "", @_ }
		288	sub warn (@) { LOG llevWarn , join "", @_ }
		289	sub info (@) { LOG llevInfo , join "", @_ }
		290	sub debug(@) { LOG llevDebug, join "", @_ }
		291	sub trace(@) { LOG llevTrace, join "", @_ }
		292
248	$Coro::State::WARNHOOK = sub {	293	$Coro::State::WARNHOOK = sub {
249	my $msg = join "", @_;	294	my $msg = join "", @_;
250		295
251	$msg .= "\n"	296	$msg .= "\n"
252	unless $msg =~ /\n$/;	297	unless $msg =~ /\n$/;
253		298
254	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	299	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
255		300
256	LOG llevError, $msg;	301	LOG llevWarn, $msg;
257	};	302	};
258		303
259	$Coro::State::DIEHOOK = sub {	304	$Coro::State::DIEHOOK = sub {
260	return unless $^S eq 0; # "eq", not "=="	305	return unless $^S eq 0; # "eq", not "=="
261		306
262	warn Carp::longmess $_[0];	307	error Carp::longmess $_[0];
263		308
264	if ($Coro::current == $Coro::main) {#d#	309	if (in_main) {#d#
265	warn "DIEHOOK called in main context, Coro bug?\n";#d#	310	error "DIEHOOK called in main context, Coro bug?\n";#d#
266	return;#d#	311	return;#d#
267	}#d#	312	}#d#
268		313
269	# kill coroutine otherwise	314	# kill coroutine otherwise
270	Coro::terminate	315	Coro::terminate
…		…
292	}	337	}
293		338
294	$EV::DIED = sub {	339	$EV::DIED = sub {
295	Carp::cluck "error in event callback: @_";	340	Carp::cluck "error in event callback: @_";
296	};	341	};
		342
		343	#############################################################################
		344
		345	sub fork_call(&@);
		346	sub get_slot($;$$);
297		347
298	#############################################################################	348	#############################################################################
299		349
300	=head2 UTILITY FUNCTIONS	350	=head2 UTILITY FUNCTIONS
301		351
…		…
322	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	372	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
323	$d	373	$d
324	} || "[unable to dump $_[0]: '$@']";	374	} || "[unable to dump $_[0]: '$@']";
325	}	375	}
326		376
		377	=item $scalar = load_file $path
		378
		379	Loads the given file from path and returns its contents. Croaks on error
		380	and can block.
		381
		382	=cut
		383
		384	sub load_file($) {
		385	0 <= aio_load $_[0], my $data
		386	or Carp::croak "$_[0]: $!";
		387
		388	$data
		389	}
		390
327	=item $ref = cf::decode_json $json	391	=item $ref = cf::decode_json $json
328		392
329	Converts a JSON string into the corresponding perl data structure.	393	Converts a JSON string into the corresponding perl data structure.
330		394
331	=item $json = cf::encode_json $ref	395	=item $json = cf::encode_json $ref
…		…
337	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	401	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
338		402
339	sub encode_json($) { $json_coder->encode ($_[0]) }	403	sub encode_json($) { $json_coder->encode ($_[0]) }
340	sub decode_json($) { $json_coder->decode ($_[0]) }	404	sub decode_json($) { $json_coder->decode ($_[0]) }
341		405
		406	=item $ref = cf::decode_storable $scalar
		407
		408	Same as Coro::Storable::thaw, so blocks.
		409
		410	=cut
		411
		412	BEGIN { *decode_storable = \&Coro::Storable::thaw }
		413
		414	=item $ref = cf::decode_yaml $scalar
		415
		416	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
		417
		418	=cut
		419
		420	sub decode_yaml($) {
		421	fork_call { YAML::XS::Load $_[0] } @_
		422	}
		423
		424	=item $scalar = cf::unlzf $scalar
		425
		426	Same as Compress::LZF::compress, but takes server ticks into account, so
		427	blocks.
		428
		429	=cut
		430
		431	sub unlzf($) {
		432	# we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
		433	cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
		434	Compress::LZF::decompress $_[0]
		435	}
		436
342	=item cf::post_init { BLOCK }	437	=item cf::post_init { BLOCK }
343		438
344	Execute the given codeblock, I<after> all extensions have been (re-)loaded,	439	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
345	but I<before> the server starts ticking again.	440	but I<before> the server starts ticking again.
346		441
347	The cdoeblock will have a single boolean argument to indicate whether this	442	The codeblock will have a single boolean argument to indicate whether this
348	is a reload or not.	443	is a reload or not.
349		444
350	=cut	445	=cut
351		446
352	sub post_init(&) {	447	sub post_init(&) {
353	push @POST_INIT, shift;	448	push @POST_INIT, shift;
		449	}
		450
		451	sub _post_init {
		452	trace "running post_init jobs";
		453
		454	# run them in parallel...
		455
		456	my @join;
		457
		458	while () {
		459	push @join, map &Coro::async ($_, 0), @POST_INIT;
		460	@POST_INIT = ();
		461
		462	@join or last;
		463
		464	(pop @join)->join;
		465	}
354	}	466	}
355		467
356	=item cf::lock_wait $string	468	=item cf::lock_wait $string
357		469
358	Wait until the given lock is available. See cf::lock_acquire.	470	Wait until the given lock is available. See cf::lock_acquire.
…		…
397	}	509	}
398		510
399	=item cf::periodic $interval, $cb	511	=item cf::periodic $interval, $cb
400		512
401	Like EV::periodic, but randomly selects a starting point so that the actions	513	Like EV::periodic, but randomly selects a starting point so that the actions
402	get spread over timer.	514	get spread over time.
403		515
404	=cut	516	=cut
405		517
406	sub periodic($$) {	518	sub periodic($$) {
407	my ($interval, $cb) = @_;	519	my ($interval, $cb) = @_;
…		…
411	EV::periodic $start, $interval, 0, $cb	523	EV::periodic $start, $interval, 0, $cb
412	}	524	}
413		525
414	=item cf::get_slot $time[, $priority[, $name]]	526	=item cf::get_slot $time[, $priority[, $name]]
415		527
416	Allocate $time seconds of blocking CPU time at priority C<$priority>:	528	Allocate $time seconds of blocking CPU time at priority C<$priority>
417	This call blocks and returns only when you have at least C<$time> seconds	529	(default: 0): This call blocks and returns only when you have at least
418	of cpu time till the next tick. The slot is only valid till the next cede.	530	C<$time> seconds of cpu time till the next tick. The slot is only valid
		531	till the next cede.
		532
		533	Background jobs should use a priority les than zero, interactive jobs
		534	should use 100 or more.
419		535
420	The optional C<$name> can be used to identify the job to run. It might be	536	The optional C<$name> can be used to identify the job to run. It might be
421	used for statistical purposes and should identify the same time-class.	537	used for statistical purposes and should identify the same time-class.
422		538
423	Useful for short background jobs.	539	Useful for short background jobs.
424		540
425	=cut	541	=cut
426		542
427	our @SLOT_QUEUE;	543	our @SLOT_QUEUE;
428	our $SLOT_QUEUE;	544	our $SLOT_QUEUE;
		545	our $SLOT_DECAY = 0.9;
429		546
430	$SLOT_QUEUE->cancel if $SLOT_QUEUE;	547	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
431	$SLOT_QUEUE = Coro::async {	548	$SLOT_QUEUE = Coro::async {
432	$Coro::current->desc ("timeslot manager");	549	$Coro::current->desc ("timeslot manager");
433		550
434	my $signal = new Coro::Signal;	551	my $signal = new Coro::Signal;
		552	my $busy;
435		553
436	while () {	554	while () {
437	next_job:	555	next_job:
		556
438	my $avail = cf::till_tick;	557	my $avail = cf::till_tick;
439	if ($avail > 0.01) {	558
440	for (0 .. $#SLOT_QUEUE) {	559	for (0 .. $#SLOT_QUEUE) {
441	if ($SLOT_QUEUE[$_][0] < $avail) {	560	if ($SLOT_QUEUE[$_][0] <= $avail) {
		561	$busy = 0;
442	my $job = splice @SLOT_QUEUE, $_, 1, ();	562	my $job = splice @SLOT_QUEUE, $_, 1, ();
443	$job->[2]->send;	563	$job->[2]->send;
444	Coro::cede;	564	Coro::cede;
445	goto next_job;	565	goto next_job;
446	}	566	} else {
		567	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
447	}	568	}
448	}	569	}
449		570
450	if (@SLOT_QUEUE) {	571	if (@SLOT_QUEUE) {
451	# we do not use wait_for_tick() as it returns immediately when tick is inactive	572	# we do not use wait_for_tick() as it returns immediately when tick is inactive
452	push @cf::WAIT_FOR_TICK, $signal;	573	$WAIT_FOR_TICK->wait;
453	$signal->wait;
454	} else {	574	} else {
		575	$busy = 0;
455	Coro::schedule;	576	Coro::schedule;
456	}	577	}
457	}	578	}
458	};	579	};
459		580
460	sub get_slot($;$$) {	581	sub get_slot($;$$) {
461	return if tick_inhibit || $Coro::current == $Coro::main;	582	return if tick_inhibit || $Coro::current == $Coro::main;
462		583
463	my ($time, $pri, $name) = @_;	584	my ($time, $pri, $name) = @_;
464		585
465	$time = $TICK * .6 if $time > $TICK * .6;	586	$time = clamp $time, 0.01, $TICK * .6;
		587
466	my $sig = new Coro::Signal;	588	my $sig = new Coro::Signal;
467		589
468	push @SLOT_QUEUE, [$time, $pri, $sig, $name];	590	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
469	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;	591	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
470	$SLOT_QUEUE->ready;	592	$SLOT_QUEUE->ready;
…		…
496	=cut	618	=cut
497		619
498	sub sync_job(&) {	620	sub sync_job(&) {
499	my ($job) = @_;	621	my ($job) = @_;
500		622
501	if ($Coro::current == $Coro::main) {	623	if (in_main) {
502	my $time = EV::time;	624	my $time = AE::time;
503		625
504	# this is the main coro, too bad, we have to block	626	# this is the main coro, too bad, we have to block
505	# till the operation succeeds, freezing the server :/	627	# till the operation succeeds, freezing the server :/
506		628
507	LOG llevError, Carp::longmess "sync job";#d#	629	#LOG llevError, Carp::longmess "sync job";#d#
508		630
509	my $freeze_guard = freeze_mainloop;	631	my $freeze_guard = freeze_mainloop;
510		632
511	my $busy = 1;	633	my $busy = 1;
512	my @res;	634	my @res;
513		635
514	(async {	636	(async {
515	$Coro::current->desc ("sync job coro");	637	$Coro::current->desc ("sync job coro");
516	@res = eval { $job->() };	638	@res = eval { $job->() };
517	warn $@ if $@;	639	error $@ if $@;
518	undef $busy;	640	undef $busy;
519	})->prio (Coro::PRIO_MAX);	641	})->prio (Coro::PRIO_MAX);
520		642
521	while ($busy) {	643	while ($busy) {
522	if (Coro::nready) {	644	if (Coro::nready) {
…		…
524	} else {	646	} else {
525	EV::loop EV::LOOP_ONESHOT;	647	EV::loop EV::LOOP_ONESHOT;
526	}	648	}
527	}	649	}
528		650
529	my $time = EV::time - $time;	651	my $time = AE::time - $time;
530		652
531	$TICK_START += $time; # do not account sync jobs to server load	653	$TICK_START += $time; # do not account sync jobs to server load
532		654
533	wantarray ? @res : $res[0]	655	wantarray ? @res : $res[0]
534	} else {	656	} else {
…		…
556	$EXT_CORO{$coro+0} = $coro;	678	$EXT_CORO{$coro+0} = $coro;
557		679
558	$coro	680	$coro
559	}	681	}
560		682
561	=item fork_call { }, $args	683	=item fork_call { }, @args
562		684
563	Executes the given code block with the given arguments in a seperate	685	Executes the given code block with the given arguments in a seperate
564	process, returning the results. Everything must be serialisable with	686	process, returning the results. Everything must be serialisable with
565	Coro::Storable. May, of course, block. Note that the executed sub may	687	Coro::Storable. May, of course, block. Note that the executed sub may
566	never block itself or use any form of event handling.	688	never block itself or use any form of event handling.
567		689
568	=cut	690	=cut
569		691
		692	sub post_fork {
		693	reset_signals;
		694	}
		695
570	sub fork_call(&@) {	696	sub fork_call(&@) {
571	my ($cb, @args) = @_;	697	my ($cb, @args) = @_;
572		698
573	# we seemingly have to make a local copy of the whole thing,	699	# we seemingly have to make a local copy of the whole thing,
574	# otherwise perl prematurely frees the stuff :/	700	# otherwise perl prematurely frees the stuff :/
575	# TODO: investigate and fix (likely this will be rather laborious)	701	# TODO: investigate and fix (likely this will be rather laborious)
576		702
577	my @res = Coro::Util::fork_eval {	703	my @res = Coro::Util::fork_eval {
578	reset_signals;	704	cf::post_fork;
579	&$cb	705	&$cb
580	}, @args;	706	} @args;
581		707
582	wantarray ? @res : $res[-1]	708	wantarray ? @res : $res[-1]
		709	}
		710
		711	sub objinfo {
		712	(
		713	"counter value" => cf::object::object_count,
		714	"objects created" => cf::object::create_count,
		715	"objects destroyed" => cf::object::destroy_count,
		716	"freelist size" => cf::object::free_count,
		717	"allocated objects" => cf::object::objects_size,
		718	"active objects" => cf::object::actives_size,
		719	)
583	}	720	}
584		721
585	=item $coin = coin_from_name $name	722	=item $coin = coin_from_name $name
586		723
587	=cut	724	=cut
…		…
624	within each server.	761	within each server.
625		762
626	=cut	763	=cut
627		764
628	sub db_table($) {	765	sub db_table($) {
		766	cf::error "db_get called from main context"
		767	if $Coro::current == $Coro::main;
		768
629	my ($name) = @_;	769	my ($name) = @_;
630	my $db = BDB::db_create $DB_ENV;	770	my $db = BDB::db_create $DB_ENV;
631		771
632	eval {	772	eval {
633	$db->set_flags (BDB::CHKSUM);	773	$db->set_flags (BDB::CHKSUM);
…		…
643	}	783	}
644		784
645	our $DB;	785	our $DB;
646		786
647	sub db_init {	787	sub db_init {
648	cf::sync_job {
649	$DB ||= db_table "db";	788	$DB ||= db_table "db";
650	};
651	}	789	}
652		790
653	sub db_get($$) {	791	sub db_get($$) {
654	my $key = "$_[0]/$_[1]";	792	my $key = "$_[0]/$_[1]";
655		793
656	cf::sync_job {	794	cf::error "db_get called from main context"
		795	if $Coro::current == $Coro::main;
		796
657	BDB::db_get $DB, undef, $key, my $data;	797	BDB::db_get $DB, undef, $key, my $data;
658		798
659	$! ? ()	799	$! ? ()
660	: $data	800	: $data
661	}
662	}	801	}
663		802
664	sub db_put($$$) {	803	sub db_put($$$) {
665	BDB::dbreq_pri 4;	804	BDB::dbreq_pri 4;
666	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	805	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
694		833
695	my @data;	834	my @data;
696	my $md5;	835	my $md5;
697		836
698	for (0 .. $#$src) {	837	for (0 .. $#$src) {
699	0 <= aio_load $src->[$_], $data[$_]	838	$data[$_] = load_file $src->[$_];
700	or Carp::croak "$src->[$_]: $!";
701	}	839	}
702		840
703	# if processing is expensive, check	841	# if processing is expensive, check
704	# checksum first	842	# checksum first
705	if (1) {	843	if (1) {
…		…
722		860
723	my $t1 = Time::HiRes::time;	861	my $t1 = Time::HiRes::time;
724	my $data = $process->(\@data);	862	my $data = $process->(\@data);
725	my $t2 = Time::HiRes::time;	863	my $t2 = Time::HiRes::time;
726		864
727	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	865	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
728		866
729	db_put cache => "$id/data", $data;	867	db_put cache => "$id/data", $data;
730	db_put cache => "$id/md5" , $md5;	868	db_put cache => "$id/md5" , $md5;
731	db_put cache => "$id/meta", $meta;	869	db_put cache => "$id/meta", $meta;
732		870
…		…
742		880
743	=cut	881	=cut
744		882
745	sub datalog($@) {	883	sub datalog($@) {
746	my ($type, %kv) = @_;	884	my ($type, %kv) = @_;
747	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	885	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
748	}	886	}
749		887
750	=back	888	=back
751		889
752	=cut	890	=cut
…		…
947		1085
948	} elsif (exists $cb_id{$type}) {	1086	} elsif (exists $cb_id{$type}) {
949	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	1087	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
950		1088
951	} elsif (ref $type) {	1089	} elsif (ref $type) {
952	warn "attaching objects not supported, ignoring.\n";	1090	error "attaching objects not supported, ignoring.\n";
953		1091
954	} else {	1092	} else {
955	shift @arg;	1093	shift @arg;
956	warn "attach argument '$type' not supported, ignoring.\n";	1094	error "attach argument '$type' not supported, ignoring.\n";
957	}	1095	}
958	}	1096	}
959	}	1097	}
960		1098
961	sub _object_attach {	1099	sub _object_attach {
…		…
971	_attach $registry, $klass, @attach;	1109	_attach $registry, $klass, @attach;
972	}	1110	}
973		1111
974	$obj->{$name} = \%arg;	1112	$obj->{$name} = \%arg;
975	} else {	1113	} else {
976	warn "object uses attachment '$name' which is not available, postponing.\n";	1114	info "object uses attachment '$name' which is not available, postponing.\n";
977	}	1115	}
978		1116
979	$obj->{_attachment}{$name} = undef;	1117	$obj->{_attachment}{$name} = undef;
980	}	1118	}
981		1119
…		…
1040		1178
1041	for (@$callbacks) {	1179	for (@$callbacks) {
1042	eval { &{$_->[1]} };	1180	eval { &{$_->[1]} };
1043		1181
1044	if ($@) {	1182	if ($@) {
1045	warn "$@";
1046	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1183	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1047	override;	1184	override;
1048	}	1185	}
1049		1186
1050	return 1 if $override;	1187	return 1 if $override;
1051	}	1188	}
…		…
1130	for (@$attach) {	1267	for (@$attach) {
1131	my ($klass, @attach) = @$_;	1268	my ($klass, @attach) = @$_;
1132	_attach $registry, $klass, @attach;	1269	_attach $registry, $klass, @attach;
1133	}	1270	}
1134	} else {	1271	} else {
1135	warn "object uses attachment '$name' that is not available, postponing.\n";	1272	info "object uses attachment '$name' that is not available, postponing.\n";
1136	}	1273	}
1137	}	1274	}
1138	}	1275	}
1139		1276
1140	cf::attachable->attach (	1277	cf::attachable->attach (
…		…
1167	my ($filename, $rdata, $objs) = @_;	1304	my ($filename, $rdata, $objs) = @_;
1168		1305
1169	sync_job {	1306	sync_job {
1170	if (length $$rdata) {	1307	if (length $$rdata) {
1171	utf8::decode (my $decname = $filename);	1308	utf8::decode (my $decname = $filename);
1172	warn sprintf "saving %s (%d,%d)\n",	1309	trace sprintf "saving %s (%d,%d)\n",
1173	$decname, length $$rdata, scalar @$objs;	1310	$decname, length $$rdata, scalar @$objs
		1311	if $VERBOSE_IO;
1174		1312
1175	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1313	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1176	aio_chmod $fh, SAVE_MODE;	1314	aio_chmod $fh, SAVE_MODE;
1177	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1315	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1178	if ($cf::USE_FSYNC) {	1316	if ($cf::USE_FSYNC) {
…		…
1200	aio_rename "$filename~", $filename;	1338	aio_rename "$filename~", $filename;
1201		1339
1202	$filename =~ s%/[^/]+$%%;	1340	$filename =~ s%/[^/]+$%%;
1203	aio_pathsync $filename if $cf::USE_FSYNC;	1341	aio_pathsync $filename if $cf::USE_FSYNC;
1204	} else {	1342	} else {
1205	warn "unable to save objects: $filename~: $!\n";	1343	error "unable to save objects: $filename~: $!\n";
1206	}	1344	}
1207	} else {	1345	} else {
1208	aio_unlink $filename;	1346	aio_unlink $filename;
1209	aio_unlink "$filename.pst";	1347	aio_unlink "$filename.pst";
1210	}	1348	}
…		…
1234	my $st = eval { Coro::Storable::thaw $av };	1372	my $st = eval { Coro::Storable::thaw $av };
1235	$av = $st->{objs};	1373	$av = $st->{objs};
1236	}	1374	}
1237		1375
1238	utf8::decode (my $decname = $filename);	1376	utf8::decode (my $decname = $filename);
1239	warn sprintf "loading %s (%d,%d)\n",	1377	trace sprintf "loading %s (%d,%d)\n",
1240	$decname, length $data, scalar @{$av || []};	1378	$decname, length $data, scalar @{$av || []}
		1379	if $VERBOSE_IO;
1241		1380
1242	($data, $av)	1381	($data, $av)
1243	}	1382	}
1244		1383
1245	=head2 COMMAND CALLBACKS	1384	=head2 COMMAND CALLBACKS
…		…
1304	}	1443	}
1305		1444
1306	use File::Glob ();	1445	use File::Glob ();
1307		1446
1308	cf::player->attach (	1447	cf::player->attach (
1309	on_command => sub {	1448	on_unknown_command => sub {
1310	my ($pl, $name, $params) = @_;	1449	my ($pl, $name, $params) = @_;
1311		1450
1312	my $cb = $COMMAND{$name}	1451	my $cb = $COMMAND{$name}
1313	or return;	1452	or return;
1314		1453
…		…
1322	my ($pl, $buf) = @_;	1461	my ($pl, $buf) = @_;
1323		1462
1324	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1463	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1325		1464
1326	if (ref $msg) {	1465	if (ref $msg) {
1327	my ($type, $reply, @payload) =	1466	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1328	"ARRAY" eq ref $msg
1329	? @$msg
1330	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1331		1467
1332	my @reply;	1468	my @reply;
1333		1469
1334	if (my $cb = $EXTCMD{$type}) {	1470	if (my $cb = $EXTCMD{$type}) {
1335	@reply = $cb->($pl, @payload);	1471	@reply = $cb->($pl, @payload);
…		…
1337		1473
1338	$pl->ext_reply ($reply, @reply)	1474	$pl->ext_reply ($reply, @reply)
1339	if $reply;	1475	if $reply;
1340		1476
1341	} else {	1477	} else {
1342	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1478	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1343	}	1479	}
1344		1480
1345	cf::override;	1481	cf::override;
1346	},	1482	},
1347	);	1483	);
…		…
1358		1494
1359	$grp	1495	$grp
1360	}	1496	}
1361		1497
1362	sub load_extensions {	1498	sub load_extensions {
		1499	info "loading extensions...";
		1500
1363	cf::sync_job {	1501	cf::sync_job {
1364	my %todo;	1502	my %todo;
1365		1503
1366	for my $path (<$LIBDIR/*.ext>) {	1504	for my $path (<$LIBDIR/*.ext>) {
1367	next unless -r $path;	1505	next unless -r $path;
…		…
1385		1523
1386	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1524	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1387	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1525	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1388		1526
1389	$ext{source} =	1527	$ext{source} =
1390	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1528	"package $pkg; use common::sense;\n"
1391	. "#line 1 \"$path\"\n{\n"	1529	. "#line 1 \"$path\"\n{\n"
1392	. $source	1530	. $source
1393	. "\n};\n1";	1531	. "\n};\n1";
1394		1532
1395	$todo{$base} = \%ext;	1533	$todo{$base} = \%ext;
1396	}	1534	}
1397		1535
		1536	my $pass = 0;
1398	my %done;	1537	my %done;
1399	while (%todo) {	1538	while (%todo) {
1400	my $progress;	1539	my $progress;
1401		1540
		1541	++$pass;
		1542
		1543	ext:
1402	while (my ($k, $v) = each %todo) {	1544	while (my ($k, $v) = each %todo) {
1403	for (split /,\s*/, $v->{meta}{depends}) {	1545	for (split /,\s*/, $v->{meta}{depends}) {
1404	goto skip	1546	next ext
1405	unless exists $done{$_};	1547	unless exists $done{$_};
1406	}	1548	}
1407		1549
1408	warn "... loading '$k' into '$v->{pkg}'\n";	1550	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1409		1551
1410	unless (eval $v->{source}) {	1552	my $active = eval $v->{source};
		1553
		1554	if (length $@) {
1411	my $msg = $@ ? "$v->{path}: $@\n"	1555	error "$v->{path}: $@\n";
1412	: "$v->{base}: extension inactive.\n";
1413		1556
1414	if (exists $v->{meta}{mandatory}) {
1415	warn $msg;
1416	cf::cleanup "mandatory extension failed to load, exiting.";	1557	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1417	}	1558	if exists $v->{meta}{mandatory};
1418		1559
1419	warn $msg;	1560	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
		1561	delete $todo{$k};
		1562	} else {
		1563	$done{$k} = delete $todo{$k};
		1564	push @EXTS, $v->{pkg};
		1565	$progress = 1;
		1566
		1567	info "$v->{base}: extension inactive.\n"
		1568	unless $active;
1420	}	1569	}
1421
1422	$done{$k} = delete $todo{$k};
1423	push @EXTS, $v->{pkg};
1424	$progress = 1;
1425	}	1570	}
1426		1571
1427	skip:	1572	unless ($progress) {
1428	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"	1573	warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1429	unless $progress;	1574
		1575	while (my ($k, $v) = each %todo) {
		1576	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
		1577	if exists $v->{meta}{mandatory};
		1578	}
		1579
		1580	last;
		1581	}
1430	}	1582	}
1431	};	1583	};
1432	}	1584	}
1433		1585
1434	#############################################################################	1586	#############################################################################
…		…
1518	$cf::PLAYER{$login} = $pl	1670	$cf::PLAYER{$login} = $pl
1519	}	1671	}
1520	}	1672	}
1521	}	1673	}
1522		1674
		1675	cf::player->attach (
		1676	on_load => sub {
		1677	my ($pl, $path) = @_;
		1678
		1679	# restore slots saved in save, below
		1680	my $slots = delete $pl->{_slots};
		1681
		1682	$pl->ob->current_weapon ($slots->[0]);
		1683	$pl->combat_ob ($slots->[1]);
		1684	$pl->ranged_ob ($slots->[2]);
		1685	},
		1686	);
		1687
1523	sub save($) {	1688	sub save($) {
1524	my ($pl) = @_;	1689	my ($pl) = @_;
1525		1690
1526	return if $pl->{deny_save};	1691	return if $pl->{deny_save};
1527		1692
…		…
1532		1697
1533	aio_mkdir playerdir $pl, 0770;	1698	aio_mkdir playerdir $pl, 0770;
1534	$pl->{last_save} = $cf::RUNTIME;	1699	$pl->{last_save} = $cf::RUNTIME;
1535		1700
1536	cf::get_slot 0.01;	1701	cf::get_slot 0.01;
		1702
		1703	# save slots, to be restored later
		1704	local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1537		1705
1538	$pl->save_pl ($path);	1706	$pl->save_pl ($path);
1539	cf::cede_to_tick;	1707	cf::cede_to_tick;
1540	}	1708	}
1541		1709
…		…
1575	my $name = $pl->ob->name;	1743	my $name = $pl->ob->name;
1576		1744
1577	$pl->{deny_save} = 1;	1745	$pl->{deny_save} = 1;
1578	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1746	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1579		1747
1580	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1748	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1581	$pl->deactivate;	1749	$pl->deactivate;
		1750
1582	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1751	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1583	$pl->ob->check_score;
1584	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1752	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1753	ext::highscore::check ($pl->ob);
		1754
1585	$pl->ns->destroy if $pl->ns;	1755	$pl->ns->destroy if $pl->ns;
1586		1756
1587	my $path = playerdir $pl;	1757	my $path = playerdir $pl;
1588	my $temp = "$path~$cf::RUNTIME~deleting~";	1758	my $temp = "$path~$cf::RUNTIME~deleting~";
1589	aio_rename $path, $temp;	1759	aio_rename $path, $temp;
…		…
1643	\@logins	1813	\@logins
1644	}	1814	}
1645		1815
1646	=item $player->maps	1816	=item $player->maps
1647		1817
		1818	=item cf::player::maps $login
		1819
1648	Returns an arrayref of map paths that are private for this	1820	Returns an arrayref of map paths that are private for this
1649	player. May block.	1821	player. May block.
1650		1822
1651	=cut	1823	=cut
1652		1824
…		…
1714	=cut	1886	=cut
1715		1887
1716	sub find_by_path($) {	1888	sub find_by_path($) {
1717	my ($path) = @_;	1889	my ($path) = @_;
1718		1890
		1891	$path =~ s/^~[^\/]*//; # skip ~login
		1892
1719	my ($match, $specificity);	1893	my ($match, $specificity);
1720		1894
1721	for my $region (list) {	1895	for my $region (list) {
1722	if ($region->{match} && $path =~ $region->{match}) {	1896	if ($region->{match} && $path =~ $region->{match}) {
1723	($match, $specificity) = ($region, $region->specificity)	1897	($match, $specificity) = ($region, $region->specificity)
…		…
1751	sub generate_random_map {	1925	sub generate_random_map {
1752	my ($self, $rmp) = @_;	1926	my ($self, $rmp) = @_;
1753		1927
1754	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	1928	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1755		1929
1756	# mit "rum" bekleckern, nicht
1757	$self->_create_random_map (	1930	$self->_create_random_map ($rmp);
1758	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1759	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1760	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1761	$rmp->{exit_on_final_map},
1762	$rmp->{xsize}, $rmp->{ysize},
1763	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1764	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1765	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1766	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1767	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1768	(cf::region::find $rmp->{region}), $rmp->{custom}
1769	)
1770	}	1931	}
1771		1932
1772	=item cf::map->register ($regex, $prio)	1933	=item cf::map->register ($regex, $prio)
1773		1934
1774	Register a handler for the map path matching the given regex at the	1935	Register a handler for the map path matching the given regex at the
…		…
1779		1940
1780	sub register {	1941	sub register {
1781	my (undef, $regex, $prio) = @_;	1942	my (undef, $regex, $prio) = @_;
1782	my $pkg = caller;	1943	my $pkg = caller;
1783		1944
1784	no strict;
1785	push @{"$pkg\::ISA"}, __PACKAGE__;	1945	push @{"$pkg\::ISA"}, __PACKAGE__;
1786		1946
1787	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	1947	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1788	}	1948	}
1789		1949
1790	# also paths starting with '/'	1950	# also paths starting with '/'
1791	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	1951	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1792		1952
1793	sub thawer_merge {	1953	sub thawer_merge {
1794	my ($self, $merge) = @_;	1954	my ($self, $merge) = @_;
1795		1955
1796	# we have to keep some variables in memory intact	1956	# we have to keep some variables in memory intact
…		…
1801	}	1961	}
1802		1962
1803	sub normalise {	1963	sub normalise {
1804	my ($path, $base) = @_;	1964	my ($path, $base) = @_;
1805		1965
1806	$path = "$path"; # make sure its a string	1966	$path = "$path"; # make sure it's a string
1807		1967
1808	$path =~ s/\.map$//;	1968	$path =~ s/\.map$//;
1809		1969
1810	# map plan:	1970	# map plan:
1811	#	1971	#
…		…
1826	$base =~ s{[^/]+/?$}{};	1986	$base =~ s{[^/]+/?$}{};
1827	$path = "$base/$path";	1987	$path = "$base/$path";
1828	}	1988	}
1829		1989
1830	for ($path) {	1990	for ($path) {
1831	redo if s{//}{/};
1832	redo if s{/\.?/}{/};	1991	redo if s{/\.?/}{/};
1833	redo if s{/[^/]+/\.\./}{/};	1992	redo if s{/[^/]+/\.\./}{/};
1834	}	1993	}
1835		1994
1836	$path	1995	$path
…		…
1850	$self->init; # pass $1 etc.	2009	$self->init; # pass $1 etc.
1851	return $self;	2010	return $self;
1852	}	2011	}
1853	}	2012	}
1854		2013
1855	Carp::cluck "unable to resolve path '$path' (base '$base').";	2014	Carp::cluck "unable to resolve path '$path' (base '$base')";
1856	()	2015	()
1857	}	2016	}
1858		2017
		2018	# may re-bless or do other evil things
1859	sub init {	2019	sub init {
1860	my ($self) = @_;	2020	my ($self) = @_;
1861		2021
1862	$self	2022	$self
1863	}	2023	}
…		…
1928	$self->{load_path} = $path;	2088	$self->{load_path} = $path;
1929		2089
1930	1	2090	1
1931	}	2091	}
1932		2092
		2093	# used to laod the header of an original map
1933	sub load_header_orig {	2094	sub load_header_orig {
1934	my ($self) = @_;	2095	my ($self) = @_;
1935		2096
1936	$self->load_header_from ($self->load_path)	2097	$self->load_header_from ($self->load_path)
1937	}	2098	}
1938		2099
		2100	# used to laod the header of an instantiated map
1939	sub load_header_temp {	2101	sub load_header_temp {
1940	my ($self) = @_;	2102	my ($self) = @_;
1941		2103
1942	$self->load_header_from ($self->save_path)	2104	$self->load_header_from ($self->save_path)
1943	}	2105	}
1944		2106
		2107	# called after loading the header from an instantiated map
1945	sub prepare_temp {	2108	sub prepare_temp {
1946	my ($self) = @_;	2109	my ($self) = @_;
1947		2110
1948	$self->last_access ((delete $self->{last_access})	2111	$self->last_access ((delete $self->{last_access})
1949	|| $cf::RUNTIME); #d#	2112	|| $cf::RUNTIME); #d#
1950	# safety	2113	# safety
1951	$self->{instantiate_time} = $cf::RUNTIME	2114	$self->{instantiate_time} = $cf::RUNTIME
1952	if $self->{instantiate_time} > $cf::RUNTIME;	2115	if $self->{instantiate_time} > $cf::RUNTIME;
1953	}	2116	}
1954		2117
		2118	# called after loading the header from an original map
1955	sub prepare_orig {	2119	sub prepare_orig {
1956	my ($self) = @_;	2120	my ($self) = @_;
1957		2121
1958	$self->{load_original} = 1;	2122	$self->{load_original} = 1;
1959	$self->{instantiate_time} = $cf::RUNTIME;	2123	$self->{instantiate_time} = $cf::RUNTIME;
…		…
1983		2147
1984	sub find;	2148	sub find;
1985	sub find {	2149	sub find {
1986	my ($path, $origin) = @_;	2150	my ($path, $origin) = @_;
1987		2151
		2152	cf::cede_to_tick;
		2153
1988	$path = normalise $path, $origin && $origin->path;	2154	$path = normalise $path, $origin;
1989		2155
1990	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2156	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1991	my $guard2 = cf::lock_acquire "map_find:$path";	2157	my $guard2 = cf::lock_acquire "map_find:$path";
1992		2158
1993	$cf::MAP{$path} || do {	2159	$cf::MAP{$path} || do {
…		…
2010		2176
2011	$cf::MAP{$path} = $map	2177	$cf::MAP{$path} = $map
2012	}	2178	}
2013	}	2179	}
2014		2180
2015	sub pre_load { }	2181	sub pre_load { }
2016	sub post_load { }	2182	#sub post_load { } # XS
2017		2183
2018	sub load {	2184	sub load {
2019	my ($self) = @_;	2185	my ($self) = @_;
2020		2186
2021	local $self->{deny_reset} = 1; # loading can take a long time	2187	local $self->{deny_reset} = 1; # loading can take a long time
…		…
2024		2190
2025	{	2191	{
2026	my $guard = cf::lock_acquire "map_data:$path";	2192	my $guard = cf::lock_acquire "map_data:$path";
2027		2193
2028	return unless $self->valid;	2194	return unless $self->valid;
2029	return unless $self->in_memory == cf::MAP_SWAPPED;	2195	return unless $self->state == cf::MAP_SWAPPED;
2030
2031	$self->in_memory (cf::MAP_LOADING);
2032		2196
2033	$self->alloc;	2197	$self->alloc;
2034		2198
2035	$self->pre_load;	2199	$self->pre_load;
2036	cf::cede_to_tick;	2200	cf::cede_to_tick;
2037		2201
		2202	if (exists $self->{load_path}) {
2038	my $f = new_from_file cf::object::thawer $self->{load_path};	2203	my $f = new_from_file cf::object::thawer $self->{load_path};
2039	$f->skip_block;	2204	$f->skip_block;
2040	$self->_load_objects ($f)	2205	$self->_load_objects ($f)
2041	or return;	2206	or return;
2042		2207
2043	$self->post_load_original	2208	$self->post_load_original
2044	if delete $self->{load_original};	2209	if delete $self->{load_original};
2045		2210
2046	if (my $uniq = $self->uniq_path) {	2211	if (my $uniq = $self->uniq_path) {
2047	utf8::encode $uniq;	2212	utf8::encode $uniq;
2048	unless (aio_stat $uniq) {	2213	unless (aio_stat $uniq) {
2049	if (my $f = new_from_file cf::object::thawer $uniq) {	2214	if (my $f = new_from_file cf::object::thawer $uniq) {
2050	$self->clear_unique_items;	2215	$self->clear_unique_items;
2051	$self->_load_objects ($f);	2216	$self->_load_objects ($f);
2052	$f->resolve_delayed_derefs;	2217	$f->resolve_delayed_derefs;
		2218	}
2053	}	2219	}
2054	}	2220	}
2055	}
2056		2221
2057	$f->resolve_delayed_derefs;	2222	$f->resolve_delayed_derefs;
		2223	} else {
		2224	$self->post_load_original
		2225	if delete $self->{load_original};
		2226	}
		2227
		2228	$self->state (cf::MAP_INACTIVE);
2058		2229
2059	cf::cede_to_tick;	2230	cf::cede_to_tick;
2060	# now do the right thing for maps	2231	# now do the right thing for maps
2061	$self->link_multipart_objects;	2232	$self->link_multipart_objects;
2062	$self->difficulty ($self->estimate_difficulty)	2233	$self->difficulty ($self->estimate_difficulty)
…		…
2066	unless ($self->{deny_activate}) {	2237	unless ($self->{deny_activate}) {
2067	$self->decay_objects;	2238	$self->decay_objects;
2068	$self->fix_auto_apply;	2239	$self->fix_auto_apply;
2069	$self->update_buttons;	2240	$self->update_buttons;
2070	cf::cede_to_tick;	2241	cf::cede_to_tick;
2071	$self->activate;	2242	#$self->activate; # no longer activate maps automatically
2072	}	2243	}
2073		2244
2074	$self->{last_save} = $cf::RUNTIME;	2245	$self->{last_save} = $cf::RUNTIME;
2075	$self->last_access ($cf::RUNTIME);	2246	$self->last_access ($cf::RUNTIME);
2076
2077	$self->in_memory (cf::MAP_ACTIVE);
2078	}	2247	}
2079		2248
2080	$self->post_load;	2249	$self->post_load;
2081	}
2082		2250
		2251	1
		2252	}
		2253
		2254	# customize the map for a given player, i.e.
		2255	# return the _real_ map. used by e.g. per-player
		2256	# maps to change the path to ~playername/mappath
2083	sub customise_for {	2257	sub customise_for {
2084	my ($self, $ob) = @_;	2258	my ($self, $ob) = @_;
2085		2259
2086	return find "~" . $ob->name . "/" . $self->{path}	2260	return find "~" . $ob->name . "/" . $self->{path}
2087	if $self->per_player;	2261	if $self->per_player;
…		…
2090	# if $self->per_party;	2264	# if $self->per_party;
2091		2265
2092	$self	2266	$self
2093	}	2267	}
2094		2268
2095	# find and load all maps in the 3x3 area around a map
2096	sub load_neighbours {
2097	my ($map) = @_;
2098
2099	my @neigh; # diagonal neighbours
2100
2101	for (0 .. 3) {
2102	my $neigh = $map->tile_path ($_)
2103	or next;
2104	$neigh = find $neigh, $map
2105	or next;
2106	$neigh->load;
2107
2108	push @neigh,
2109	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2110	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2111	}
2112
2113	for (grep defined $_->[0], @neigh) {
2114	my ($path, $origin) = @$_;
2115	my $neigh = find $path, $origin
2116	or next;
2117	$neigh->load;
2118	}
2119	}
2120
2121	sub find_sync {	2269	sub find_sync {
2122	my ($path, $origin) = @_;	2270	my ($path, $origin) = @_;
2123		2271
2124	cf::sync_job { find $path, $origin }	2272	# it's a bug to call this from the main context
		2273	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
		2274	if $Coro::current == $Coro::main;
		2275
		2276	find $path, $origin
2125	}	2277	}
2126		2278
2127	sub do_load_sync {	2279	sub do_load_sync {
2128	my ($map) = @_;	2280	my ($map) = @_;
2129		2281
		2282	# it's a bug to call this from the main context
2130	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2283	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2131	if $Coro::current == $Coro::main;	2284	if $Coro::current == $Coro::main;
2132		2285
2133	cf::sync_job { $map->load };	2286	$map->load;
2134	}	2287	}
2135		2288
2136	our %MAP_PREFETCH;	2289	our %MAP_PREFETCH;
2137	our $MAP_PREFETCHER = undef;	2290	our $MAP_PREFETCHER = undef;
2138		2291
2139	sub find_async {	2292	sub find_async {
2140	my ($path, $origin, $load) = @_;	2293	my ($path, $origin, $load) = @_;
2141		2294
2142	$path = normalise $path, $origin && $origin->{path};	2295	$path = normalise $path, $origin;
2143		2296
2144	if (my $map = $cf::MAP{$path}) {	2297	if (my $map = $cf::MAP{$path}) {
2145	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2298	return $map if !$load || $map->linkable;
2146	}	2299	}
2147		2300
2148	$MAP_PREFETCH{$path} |= $load;	2301	$MAP_PREFETCH{$path} |= $load;
2149		2302
2150	$MAP_PREFETCHER ||= cf::async {	2303	$MAP_PREFETCHER ||= cf::async {
…		…
2164	$MAP_PREFETCHER->prio (6);	2317	$MAP_PREFETCHER->prio (6);
2165		2318
2166	()	2319	()
2167	}	2320	}
2168		2321
		2322	# common code, used by both ->save and ->swapout
2169	sub save {	2323	sub _save {
2170	my ($self) = @_;	2324	my ($self) = @_;
2171
2172	my $lock = cf::lock_acquire "map_data:$self->{path}";
2173		2325
2174	$self->{last_save} = $cf::RUNTIME;	2326	$self->{last_save} = $cf::RUNTIME;
2175		2327
2176	return unless $self->dirty;	2328	return unless $self->dirty;
2177		2329
…		…
2197	} else {	2349	} else {
2198	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);	2350	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2199	}	2351	}
2200	}	2352	}
2201		2353
		2354	sub save {
		2355	my ($self) = @_;
		2356
		2357	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2358
		2359	$self->_save;
		2360	}
		2361
2202	sub swap_out {	2362	sub swap_out {
2203	my ($self) = @_;	2363	my ($self) = @_;
2204		2364
2205	# save first because save cedes
2206	$self->save;
2207
2208	my $lock = cf::lock_acquire "map_data:$self->{path}";	2365	my $lock = cf::lock_acquire "map_data:$self->{path}";
2209		2366
		2367	return if !$self->linkable;
		2368	return if $self->{deny_save};
2210	return if $self->players;	2369	return if $self->players;
2211	return if $self->in_memory != cf::MAP_ACTIVE;	2370
		2371	# first deactivate the map and "unlink" it from the core
		2372	$self->deactivate;
		2373	$_->clear_links_to ($self) for values %cf::MAP;
		2374	$self->state (cf::MAP_SWAPPED);
		2375
		2376	# then atomically save
		2377	$self->_save;
		2378
		2379	# then free the map
		2380	$self->clear;
		2381	}
		2382
		2383	sub reset_at {
		2384	my ($self) = @_;
		2385
		2386	# TODO: safety, remove and allow resettable per-player maps
2212	return if $self->{deny_save};	2387	return 1e99 if $self->{deny_reset};
2213		2388
		2389	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
		2390	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
		2391
		2392	$time + $to
		2393	}
		2394
		2395	sub should_reset {
		2396	my ($self) = @_;
		2397
		2398	$self->reset_at <= $cf::RUNTIME
		2399	}
		2400
		2401	sub reset {
		2402	my ($self) = @_;
		2403
		2404	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2405
		2406	return if $self->players;
		2407
		2408	cf::trace "resetting map ", $self->path, "\n";
		2409
2214	$self->in_memory (cf::MAP_SWAPPED);	2410	$self->state (cf::MAP_SWAPPED);
		2411
		2412	# need to save uniques path
		2413	unless ($self->{deny_save}) {
		2414	my $uniq = $self->uniq_path; utf8::encode $uniq;
		2415
		2416	$self->_save_objects ($uniq, cf::IO_UNIQUES)
		2417	if $uniq;
		2418	}
		2419
		2420	delete $cf::MAP{$self->path};
2215		2421
2216	$self->deactivate;	2422	$self->deactivate;
2217	$_->clear_links_to ($self) for values %cf::MAP;	2423	$_->clear_links_to ($self) for values %cf::MAP;
2218	$self->clear;	2424	$self->clear;
2219	}
2220
2221	sub reset_at {
2222	my ($self) = @_;
2223
2224	# TODO: safety, remove and allow resettable per-player maps
2225	return 1e99 if $self->{deny_reset};
2226
2227	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2228	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2229
2230	$time + $to
2231	}
2232
2233	sub should_reset {
2234	my ($self) = @_;
2235
2236	$self->reset_at <= $cf::RUNTIME
2237	}
2238
2239	sub reset {
2240	my ($self) = @_;
2241
2242	my $lock = cf::lock_acquire "map_data:$self->{path}";
2243
2244	return if $self->players;
2245
2246	warn "resetting map ", $self->path, "\n";
2247
2248	$self->in_memory (cf::MAP_SWAPPED);
2249
2250	# need to save uniques path
2251	unless ($self->{deny_save}) {
2252	my $uniq = $self->uniq_path; utf8::encode $uniq;
2253
2254	$self->_save_objects ($uniq, cf::IO_UNIQUES)
2255	if $uniq;
2256	}
2257
2258	delete $cf::MAP{$self->path};
2259
2260	$self->deactivate;
2261	$_->clear_links_to ($self) for values %cf::MAP;
2262	$self->clear;
2263		2425
2264	$self->unlink_save;	2426	$self->unlink_save;
2265	$self->destroy;	2427	$self->destroy;
2266	}	2428	}
2267		2429
…		…
2275		2437
2276	delete $cf::MAP{$self->path};	2438	delete $cf::MAP{$self->path};
2277		2439
2278	$self->unlink_save;	2440	$self->unlink_save;
2279		2441
2280	bless $self, "cf::map";	2442	bless $self, "cf::map::wrap";
2281	delete $self->{deny_reset};	2443	delete $self->{deny_reset};
2282	$self->{deny_save} = 1;	2444	$self->{deny_save} = 1;
2283	$self->reset_timeout (1);	2445	$self->reset_timeout (1);
2284	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2446	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2285		2447
…		…
2515		2677
2516	Freezes the player and moves him/her to a special map (C<{link}>).	2678	Freezes the player and moves him/her to a special map (C<{link}>).
2517		2679
2518	The player should be reasonably safe there for short amounts of time (e.g.	2680	The player should be reasonably safe there for short amounts of time (e.g.
2519	for loading a map). You I<MUST> call C<leave_link> as soon as possible,	2681	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2520	though, as the palyer cannot control the character while it is on the link	2682	though, as the player cannot control the character while it is on the link
2521	map.	2683	map.
2522		2684
2523	Will never block.	2685	Will never block.
2524		2686
2525	=item $player_object->leave_link ($map, $x, $y)	2687	=item $player_object->leave_link ($map, $x, $y)
…		…
2546	sub cf::object::player::enter_link {	2708	sub cf::object::player::enter_link {
2547	my ($self) = @_;	2709	my ($self) = @_;
2548		2710
2549	$self->deactivate_recursive;	2711	$self->deactivate_recursive;
2550		2712
		2713	++$self->{_link_recursion};
		2714
2551	return if UNIVERSAL::isa $self->map, "ext::map_link";	2715	return if UNIVERSAL::isa $self->map, "ext::map_link";
2552		2716
2553	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2717	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2554	if $self->map && $self->map->{path} ne "{link}";	2718	if $self->map && $self->map->{path} ne "{link}";
2555		2719
2556	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2720	$self->enter_map ($LINK_MAP || link_map, 3, 3);
2557	}	2721	}
2558		2722
2559	sub cf::object::player::leave_link {	2723	sub cf::object::player::leave_link {
2560	my ($self, $map, $x, $y) = @_;	2724	my ($self, $map, $x, $y) = @_;
2561		2725
…		…
2581	# use -1 or undef as default coordinates, not 0, 0	2745	# use -1 or undef as default coordinates, not 0, 0
2582	($x, $y) = ($map->enter_x, $map->enter_y)	2746	($x, $y) = ($map->enter_x, $map->enter_y)
2583	if $x <= 0 && $y <= 0;	2747	if $x <= 0 && $y <= 0;
2584		2748
2585	$map->load;	2749	$map->load;
2586	$map->load_neighbours;
2587		2750
2588	return unless $self->contr->active;	2751	return unless $self->contr->active;
2589		2752
2590	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2753	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2591	$self->enter_map ($map, $x, $y);	2754	if ($self->enter_map ($map, $x, $y)) {
2592		2755	# entering was successful
		2756	delete $self->{_link_recursion};
2593	# only activate afterwards, to support waiting in hooks	2757	# only activate afterwards, to support waiting in hooks
2594	$self->activate_recursive;	2758	$self->activate_recursive;
2595	}	2759	}
2596		2760
		2761	}
		2762
2597	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2763	=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2598		2764
2599	Moves the player to the given map-path and coordinates by first freezing	2765	Moves the player to the given map-path and coordinates by first freezing
2600	her, loading and preparing them map, calling the provided $check callback	2766	her, loading and preparing them map, calling the provided $check callback
2601	that has to return the map if sucecssful, and then unfreezes the player on	2767	that has to return the map if sucecssful, and then unfreezes the player on
2602	the new (success) or old (failed) map position. In either case, $done will	2768	the new (success) or old (failed) map position. In either case, $done will
…		…
2609		2775
2610	our $GOTOGEN;	2776	our $GOTOGEN;
2611		2777
2612	sub cf::object::player::goto {	2778	sub cf::object::player::goto {
2613	my ($self, $path, $x, $y, $check, $done) = @_;	2779	my ($self, $path, $x, $y, $check, $done) = @_;
		2780
		2781	if ($self->{_link_recursion} >= $MAX_LINKS) {
		2782	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
		2783	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
		2784	($path, $x, $y) = @$EMERGENCY_POSITION;
		2785	}
2614		2786
2615	# do generation counting so two concurrent goto's will be executed in-order	2787	# do generation counting so two concurrent goto's will be executed in-order
2616	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2788	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2617		2789
2618	$self->enter_link;	2790	$self->enter_link;
…		…
2638	($path, $x, $y) = (undef, undef, undef);	2810	($path, $x, $y) = (undef, undef, undef);
2639	}	2811	}
2640	}	2812	}
2641		2813
2642	my $map = eval {	2814	my $map = eval {
2643	my $map = defined $path ? cf::map::find $path : undef;	2815	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2644		2816
2645	if ($map) {	2817	if ($map) {
2646	$map = $map->customise_for ($self);	2818	$map = $map->customise_for ($self);
2647	$map = $check->($map) if $check && $map;	2819	$map = $check->($map, $x, $y, $self) if $check && $map;
2648	} else {	2820	} else {
2649	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);	2821	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2650	}	2822	}
2651		2823
2652	$map	2824	$map
…		…
2660	if ($gen == $self->{_goto_generation}) {	2832	if ($gen == $self->{_goto_generation}) {
2661	delete $self->{_goto_generation};	2833	delete $self->{_goto_generation};
2662	$self->leave_link ($map, $x, $y);	2834	$self->leave_link ($map, $x, $y);
2663	}	2835	}
2664		2836
2665	$done->() if $done;	2837	$done->($self) if $done;
2666	})->prio (1);	2838	})->prio (1);
2667	}	2839	}
2668		2840
2669	=item $player_object->enter_exit ($exit_object)	2841	=item $player_object->enter_exit ($exit_object)
2670		2842
…		…
2738	$Coro::current->{desc} = "enter_exit";	2910	$Coro::current->{desc} = "enter_exit";
2739		2911
2740	unless (eval {	2912	unless (eval {
2741	$self->deactivate_recursive; # just to be sure	2913	$self->deactivate_recursive; # just to be sure
2742		2914
2743	# random map handling
2744	{
2745	my $guard = cf::lock_acquire "exit_prepare:$exit";
2746
2747	prepare_random_map $exit
2748	if $exit->slaying eq "/!";
2749	}
2750
2751	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2915	my $map = cf::map::normalise $exit->slaying, $exit->map;
2752	my $x = $exit->stats->hp;	2916	my $x = $exit->stats->hp;
2753	my $y = $exit->stats->sp;	2917	my $y = $exit->stats->sp;
		2918
		2919	# special map handling
		2920	my $slaying = $exit->slaying;
		2921
		2922	# special map handling
		2923	if ($slaying eq "/!") {
		2924	my $guard = cf::lock_acquire "exit_prepare:$exit";
		2925
		2926	prepare_random_map $exit
		2927	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		2928
		2929	$map = $exit->slaying;
		2930
		2931	} elsif ($slaying eq '!up') {
		2932	$map = $exit->map->tile_path (cf::TILE_UP);
		2933	$x = $exit->x;
		2934	$y = $exit->y;
		2935
		2936	} elsif ($slaying eq '!down') {
		2937	$map = $exit->map->tile_path (cf::TILE_DOWN);
		2938	$x = $exit->x;
		2939	$y = $exit->y;
		2940	}
2754		2941
2755	$self->goto ($map, $x, $y);	2942	$self->goto ($map, $x, $y);
2756		2943
2757	# if exit is damned, update players death & WoR home-position	2944	# if exit is damned, update players death & WoR home-position
2758	$self->contr->savebed ($map, $x, $y)	2945	$self->contr->savebed ($map, $x, $y)
…		…
2763	$self->message ("Something went wrong deep within the deliantra server. "	2950	$self->message ("Something went wrong deep within the deliantra server. "
2764	. "I'll try to bring you back to the map you were before. "	2951	. "I'll try to bring you back to the map you were before. "
2765	. "Please report this to the dungeon master!",	2952	. "Please report this to the dungeon master!",
2766	cf::NDI_UNIQUE | cf::NDI_RED);	2953	cf::NDI_UNIQUE | cf::NDI_RED);
2767		2954
2768	warn "ERROR in enter_exit: $@";	2955	error "ERROR in enter_exit: $@";
2769	$self->leave_link;	2956	$self->leave_link;
2770	}	2957	}
2771	})->prio (1);	2958	})->prio (1);
2772	}	2959	}
2773		2960
…		…
3000	=cut	3187	=cut
3001		3188
3002	sub cf::client::ext_reply($$@) {	3189	sub cf::client::ext_reply($$@) {
3003	my ($self, $id, @msg) = @_;	3190	my ($self, $id, @msg) = @_;
3004		3191
3005	if ($self->extcmd == 2) {	3192	return unless $self->extcmd == 2;
		3193
3006	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));	3194	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3007	} elsif ($self->extcmd == 1) {
3008	#TODO: version 1, remove
3009	unshift @msg, msgtype => "reply", msgid => $id;
3010	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3011	}
3012	}	3195	}
3013		3196
3014	=item $success = $client->query ($flags, "text", \&cb)	3197	=item $success = $client->query ($flags, "text", \&cb)
3015		3198
3016	Queues a query to the client, calling the given callback with	3199	Queues a query to the client, calling the given callback with
…		…
3071	my ($ns, $buf) = @_;	3254	my ($ns, $buf) = @_;
3072		3255
3073	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3256	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3074		3257
3075	if (ref $msg) {	3258	if (ref $msg) {
3076	my ($type, $reply, @payload) =	3259	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3077	"ARRAY" eq ref $msg
3078	? @$msg
3079	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3080		3260
3081	my @reply;	3261	my @reply;
3082		3262
3083	if (my $cb = $EXTICMD{$type}) {	3263	if (my $cb = $EXTICMD{$type}) {
3084	@reply = $cb->($ns, @payload);	3264	@reply = $cb->($ns, @payload);
…		…
3086		3266
3087	$ns->ext_reply ($reply, @reply)	3267	$ns->ext_reply ($reply, @reply)
3088	if $reply;	3268	if $reply;
3089		3269
3090	} else {	3270	} else {
3091	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3271	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3092	}	3272	}
3093		3273
3094	cf::override;	3274	cf::override;
3095	},	3275	},
3096	);	3276	);
…		…
3116		3296
3117	$coro	3297	$coro
3118	}	3298	}
3119		3299
3120	cf::client->attach (	3300	cf::client->attach (
3121	on_destroy => sub {	3301	on_client_destroy => sub {
3122	my ($ns) = @_;	3302	my ($ns) = @_;
3123		3303
3124	$_->cancel for values %{ (delete $ns->{_coro}) || {} };	3304	$_->cancel for values %{ (delete $ns->{_coro}) || {} };
3125	},	3305	},
3126	);	3306	);
…		…
3142	our $safe_hole = new Safe::Hole;	3322	our $safe_hole = new Safe::Hole;
3143		3323
3144	$SIG{FPE} = 'IGNORE';	3324	$SIG{FPE} = 'IGNORE';
3145		3325
3146	$safe->permit_only (Opcode::opset qw(	3326	$safe->permit_only (Opcode::opset qw(
3147	:base_core :base_mem :base_orig :base_math	3327	:base_core :base_mem :base_orig :base_math :base_loop
3148	grepstart grepwhile mapstart mapwhile	3328	grepstart grepwhile mapstart mapwhile
3149	sort time	3329	sort time
3150	));	3330	));
3151		3331
3152	# here we export the classes and methods available to script code	3332	# here we export the classes and methods available to script code
…		…
3177	decrease split destroy change_exp value msg lore send_msg)],	3357	decrease split destroy change_exp value msg lore send_msg)],
3178	["cf::object::player" => qw(player)],	3358	["cf::object::player" => qw(player)],
3179	["cf::player" => qw(peaceful send_msg)],	3359	["cf::player" => qw(peaceful send_msg)],
3180	["cf::map" => qw(trigger)],	3360	["cf::map" => qw(trigger)],
3181	) {	3361	) {
3182	no strict 'refs';
3183	my ($pkg, @funs) = @$_;	3362	my ($pkg, @funs) = @$_;
3184	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3363	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3185	for @funs;	3364	for @funs;
3186	}	3365	}
3187		3366
…		…
3204	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3383	$qcode =~ s/"/‟/g; # not allowed in #line filenames
3205	$qcode =~ s/\n/\\n/g;	3384	$qcode =~ s/\n/\\n/g;
3206		3385
3207	%vars = (_dummy => 0) unless %vars;	3386	%vars = (_dummy => 0) unless %vars;
3208		3387
		3388	my @res;
3209	local $_;	3389	local $_;
3210	local @safe::cf::_safe_eval_args = values %vars;
3211		3390
3212	my $eval =	3391	my $eval =
3213	"do {\n"	3392	"do {\n"
3214	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"	3393	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3215	. "#line 0 \"{$qcode}\"\n"	3394	. "#line 0 \"{$qcode}\"\n"
3216	. $code	3395	. $code
3217	. "\n}"	3396	. "\n}"
3218	;	3397	;
3219		3398
		3399	if ($CFG{safe_eval}) {
3220	sub_generation_inc;	3400	sub_generation_inc;
		3401	local @safe::cf::_safe_eval_args = values %vars;
3221	my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);	3402	@res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3222	sub_generation_inc;	3403	sub_generation_inc;
		3404	} else {
		3405	local @cf::_safe_eval_args = values %vars;
		3406	@res = wantarray ? eval eval : scalar eval $eval;
		3407	}
3223		3408
3224	if ($@) {	3409	if ($@) {
3225	warn "$@";	3410	warn "$@",
3226	warn "while executing safe code '$code'\n";	3411	"while executing safe code '$code'\n",
3227	warn "with arguments " . (join " ", %vars) . "\n";	3412	"with arguments " . (join " ", %vars) . "\n";
3228	}	3413	}
3229		3414
3230	wantarray ? @res : $res[0]	3415	wantarray ? @res : $res[0]
3231	}	3416	}
3232		3417
…		…
3246	=cut	3431	=cut
3247		3432
3248	sub register_script_function {	3433	sub register_script_function {
3249	my ($fun, $cb) = @_;	3434	my ($fun, $cb) = @_;
3250		3435
3251	no strict 'refs';	3436	$fun = "safe::$fun" if $CFG{safe_eval};
3252	*{"safe::$fun"} = $safe_hole->wrap ($cb);	3437	*$fun = $safe_hole->wrap ($cb);
3253	}	3438	}
3254		3439
3255	=back	3440	=back
3256		3441
3257	=cut	3442	=cut
…		…
3266	# for this (global event?)	3451	# for this (global event?)
3267	%ext::player_env::MUSIC_FACE_CACHE = ();	3452	%ext::player_env::MUSIC_FACE_CACHE = ();
3268		3453
3269	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3454	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3270		3455
3271	warn "loading facedata from $path\n";	3456	trace "loading facedata from $path\n";
3272		3457
3273	my $facedata;	3458	my $facedata = decode_storable load_file $path;
3274	0 < aio_load $path, $facedata
3275	or die "$path: $!";
3276
3277	$facedata = Coro::Storable::thaw $facedata;
3278		3459
3279	$facedata->{version} == 2	3460	$facedata->{version} == 2
3280	or cf::cleanup "$path: version mismatch, cannot proceed.";	3461	or cf::cleanup "$path: version mismatch, cannot proceed.";
3281		3462
3282	# patch in the exptable	3463	# patch in the exptable
		3464	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3283	$facedata->{resource}{"res/exp_table"} = {	3465	$facedata->{resource}{"res/exp_table"} = {
3284	type => FT_RSRC,	3466	type => FT_RSRC,
3285	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),	3467	data => $exp_table,
		3468	hash => (Digest::MD5::md5 $exp_table),
3286	};	3469	};
3287	cf::cede_to_tick;	3470	cf::cede_to_tick;
3288		3471
3289	{	3472	{
3290	my $faces = $facedata->{faceinfo};	3473	my $faces = $facedata->{faceinfo};
…		…
3292	while (my ($face, $info) = each %$faces) {	3475	while (my ($face, $info) = each %$faces) {
3293	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3476	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3294		3477
3295	cf::face::set_visibility $idx, $info->{visibility};	3478	cf::face::set_visibility $idx, $info->{visibility};
3296	cf::face::set_magicmap $idx, $info->{magicmap};	3479	cf::face::set_magicmap $idx, $info->{magicmap};
3297	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};	3480	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3298	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};	3481	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
		3482	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3299		3483
3300	cf::cede_to_tick;	3484	cf::cede_to_tick;
3301	}	3485	}
3302		3486
3303	while (my ($face, $info) = each %$faces) {	3487	while (my ($face, $info) = each %$faces) {
…		…
3308		3492
3309	if (my $smooth = cf::face::find $info->{smooth}) {	3493	if (my $smooth = cf::face::find $info->{smooth}) {
3310	cf::face::set_smooth $idx, $smooth;	3494	cf::face::set_smooth $idx, $smooth;
3311	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3495	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3312	} else {	3496	} else {
3313	warn "smooth face '$info->{smooth}' not found for face '$face'";	3497	error "smooth face '$info->{smooth}' not found for face '$face'";
3314	}	3498	}
3315		3499
3316	cf::cede_to_tick;	3500	cf::cede_to_tick;
3317	}	3501	}
3318	}	3502	}
…		…
3327		3511
3328	cf::anim::invalidate_all; # d'oh	3512	cf::anim::invalidate_all; # d'oh
3329	}	3513	}
3330		3514
3331	{	3515	{
3332	# TODO: for gcfclient pleasure, we should give resources
3333	# that gcfclient doesn't grok a >10000 face index.
3334	my $res = $facedata->{resource};	3516	my $res = $facedata->{resource};
3335		3517
3336	while (my ($name, $info) = each %$res) {	3518	while (my ($name, $info) = each %$res) {
3337	if (defined $info->{type}) {	3519	if (defined (my $type = $info->{type})) {
		3520	# TODO: different hash - must free and use new index, or cache ixface data queue
3338	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3521	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3339	my $data;
3340		3522
3341	if ($info->{type} & 1) {	3523	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3342	# prepend meta info
3343
3344	my $meta = $enc->encode ({
3345	name => $name,
3346	%{ $info->{meta} || {} },
3347	});
3348
3349	$data = pack "(w/a*)*", $meta, $info->{data};
3350	} else {
3351	$data = $info->{data};
3352	}
3353
3354	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3355	cf::face::set_type $idx, $info->{type};	3524	cf::face::set_type $idx, $type;
		3525	cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3356	} else {	3526	} else {
3357	$RESOURCE{$name} = $info;	3527	# $RESOURCE{$name} = $info; # unused
3358	}	3528	}
3359		3529
3360	cf::cede_to_tick;	3530	cf::cede_to_tick;
3361	}	3531	}
3362	}	3532	}
3363		3533
3364	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3534	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3365		3535
3366	1	3536	1
3367	}	3537	}
3368
3369	cf::global->attach (on_resource_update => sub {
3370	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3371	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3372
3373	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3374	my $sound = $soundconf->{compat}[$_]
3375	or next;
3376
3377	my $face = cf::face::find "sound/$sound->[1]";
3378	cf::sound::set $sound->[0] => $face;
3379	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3380	}
3381
3382	while (my ($k, $v) = each %{$soundconf->{event}}) {
3383	my $face = cf::face::find "sound/$v";
3384	cf::sound::set $k => $face;
3385	}
3386	}
3387	});
3388		3538
3389	register_exticmd fx_want => sub {	3539	register_exticmd fx_want => sub {
3390	my ($ns, $want) = @_;	3540	my ($ns, $want) = @_;
3391		3541
3392	while (my ($k, $v) = each %$want) {	3542	while (my ($k, $v) = each %$want) {
…		…
3431	sub reload_treasures {	3581	sub reload_treasures {
3432	load_resource_file "$DATADIR/treasures"	3582	load_resource_file "$DATADIR/treasures"
3433	or die "unable to load treasurelists\n";	3583	or die "unable to load treasurelists\n";
3434	}	3584	}
3435		3585
		3586	sub reload_sound {
		3587	trace "loading sound config from $DATADIR/sound\n";
		3588
		3589	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
		3590
		3591	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3592	my $sound = $soundconf->{compat}[$_]
		3593	or next;
		3594
		3595	my $face = cf::face::find "sound/$sound->[1]";
		3596	cf::sound::set $sound->[0] => $face;
		3597	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3598	}
		3599
		3600	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3601	my $face = cf::face::find "sound/$v";
		3602	cf::sound::set $k => $face;
		3603	}
		3604	}
		3605
3436	sub reload_resources {	3606	sub reload_resources {
3437	warn "reloading resource files...\n";	3607	trace "reloading resource files...\n";
3438		3608
		3609	reload_exp_table;
		3610	reload_materials;
3439	reload_facedata;	3611	reload_facedata;
		3612	reload_sound;
3440	reload_archetypes;	3613	reload_archetypes;
3441	reload_regions;	3614	reload_regions;
3442	reload_treasures;	3615	reload_treasures;
3443		3616
3444	warn "finished reloading resource files\n";	3617	trace "finished reloading resource files\n";
3445	}	3618	}
3446		3619
3447	sub reload_config {	3620	sub reload_config {
3448	warn "reloading config file...\n";	3621	trace "reloading config file...\n";
3449		3622
3450	open my $fh, "<:utf8", "$CONFDIR/config"	3623	my $config = load_file "$CONFDIR/config";
3451	or return;	3624	utf8::decode $config;
		3625	*CFG = decode_yaml $config;
3452		3626
3453	local $/;
3454	*CFG = YAML::XS::Load scalar <$fh>;
3455
3456	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3627	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3457		3628
3458	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3629	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3459	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3630	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3460		3631
3461	if (exists $CFG{mlockall}) {	3632	if (exists $CFG{mlockall}) {
…		…
3463	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3634	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3464	and die "WARNING: m(un)lockall failed: $!\n";	3635	and die "WARNING: m(un)lockall failed: $!\n";
3465	};	3636	};
3466	warn $@ if $@;	3637	warn $@ if $@;
3467	}	3638	}
3468
3469	warn "finished reloading resource files\n";
3470	}	3639	}
3471		3640
3472	sub pidfile() {	3641	sub pidfile() {
3473	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3642	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3474	or die "$PIDFILE: $!";	3643	or die "$PIDFILE: $!";
…		…
3487	seek $fh, 0, 0;	3656	seek $fh, 0, 0;
3488	print $fh $$;	3657	print $fh $$;
3489	}	3658	}
3490		3659
3491	sub main_loop {	3660	sub main_loop {
3492	warn "EV::loop starting\n";	3661	trace "EV::loop starting\n";
3493	if (1) {	3662	if (1) {
3494	EV::loop;	3663	EV::loop;
3495	}	3664	}
3496	warn "EV::loop returned\n";	3665	trace "EV::loop returned\n";
3497	goto &main_loop unless $REALLY_UNLOOP;	3666	goto &main_loop unless $REALLY_UNLOOP;
3498	}	3667	}
3499		3668
3500	sub main {	3669	sub main {
3501	cf::init_globals; # initialise logging	3670	cf::init_globals; # initialise logging
3502		3671
3503	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3672	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3504	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3673	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3505	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3674	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3506	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3675	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3507
3508	cf::init_experience;
3509	cf::init_anim;
3510	cf::init_attackmess;
3511	cf::init_dynamic;
3512		3676
3513	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3677	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3514		3678
3515	# we must not ever block the main coroutine	3679	# we must not ever block the main coroutine
3516	local $Coro::idle = sub {	3680	local $Coro::idle = sub {
…		…
3522	};	3686	};
3523		3687
3524	evthread_start IO::AIO::poll_fileno;	3688	evthread_start IO::AIO::poll_fileno;
3525		3689
3526	cf::sync_job {	3690	cf::sync_job {
		3691	cf::incloader::init ();
		3692
		3693	cf::init_anim;
		3694	cf::init_attackmess;
		3695	cf::init_dynamic;
		3696
		3697	cf::load_settings;
		3698
3527	reload_resources;	3699	reload_resources;
3528	reload_config;	3700	reload_config;
3529	db_init;	3701	db_init;
3530		3702
3531	cf::load_settings;
3532	cf::load_materials;
3533	cf::init_uuid;	3703	cf::init_uuid;
3534	cf::init_signals;	3704	cf::init_signals;
3535	cf::init_commands;
3536	cf::init_skills;	3705	cf::init_skills;
3537		3706
3538	cf::init_beforeplay;	3707	cf::init_beforeplay;
3539		3708
3540	atomic;	3709	atomic;
…		…
3545		3714
3546	# no (long-running) fork's whatsoever before this point(!)	3715	# no (long-running) fork's whatsoever before this point(!)
3547	use POSIX ();	3716	use POSIX ();
3548	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3717	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3549		3718
3550	(pop @POST_INIT)->(0) while @POST_INIT;	3719	cf::_post_init 0;
3551	};	3720	};
3552		3721
		3722	cf::object::thawer::errors_are_fatal 0;
		3723	info "parse errors in files are no longer fatal from this point on.\n";
		3724
		3725	AE::postpone {
		3726	undef &main; # free gobs of memory :)
		3727	};
		3728
3553	main_loop;	3729	goto &main_loop;
3554	}	3730	}
3555		3731
3556	#############################################################################	3732	#############################################################################
3557	# initialisation and cleanup	3733	# initialisation and cleanup
3558		3734
3559	# install some emergency cleanup handlers	3735	# install some emergency cleanup handlers
3560	BEGIN {	3736	BEGIN {
3561	our %SIGWATCHER = ();	3737	our %SIGWATCHER = ();
3562	for my $signal (qw(INT HUP TERM)) {	3738	for my $signal (qw(INT HUP TERM)) {
3563	$SIGWATCHER{$signal} = EV::signal $signal, sub {	3739	$SIGWATCHER{$signal} = AE::signal $signal, sub {
3564	cf::cleanup "SIG$signal";	3740	cf::cleanup "SIG$signal";
3565	};	3741	};
3566	}	3742	}
3567	}	3743	}
3568		3744
3569	sub write_runtime_sync {	3745	sub write_runtime_sync {
		3746	my $t0 = AE::time;
		3747
3570	# first touch the runtime file to show we are still running:	3748	# first touch the runtime file to show we are still running:
3571	# the fsync below can take a very very long time.	3749	# the fsync below can take a very very long time.
3572		3750
3573	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;	3751	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3574		3752
3575	my $guard = cf::lock_acquire "write_runtime";	3753	my $guard = cf::lock_acquire "write_runtime";
3576		3754
3577	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644	3755	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3578	or return;	3756	or return;
3579		3757
3580	my $value = $cf::RUNTIME + 90 + 10;	3758	my $value = $cf::RUNTIME + 90 + 10;
3581	# 10 is the runtime save interval, for a monotonic clock	3759	# 10 is the runtime save interval, for a monotonic clock
3582	# 60 allows for the watchdog to kill the server.	3760	# 60 allows for the watchdog to kill the server.
…		…
3595	or return;	3773	or return;
3596		3774
3597	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3775	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3598	and return;	3776	and return;
3599		3777
3600	warn "runtime file written.\n";	3778	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3601		3779
3602	1	3780	1
3603	}	3781	}
3604		3782
3605	our $uuid_lock;	3783	our $uuid_lock;
…		…
3617	or return;	3795	or return;
3618		3796
3619	my $value = uuid_seq uuid_cur;	3797	my $value = uuid_seq uuid_cur;
3620		3798
3621	unless ($value) {	3799	unless ($value) {
3622	warn "cowardly refusing to write zero uuid value!\n";	3800	info "cowardly refusing to write zero uuid value!\n";
3623	return;	3801	return;
3624	}	3802	}
3625		3803
3626	my $value = uuid_str $value + $uuid_skip;	3804	my $value = uuid_str $value + $uuid_skip;
3627	$uuid_skip = 0;	3805	$uuid_skip = 0;
…		…
3637	or return;	3815	or return;
3638		3816
3639	aio_rename "$uuid~", $uuid	3817	aio_rename "$uuid~", $uuid
3640	and return;	3818	and return;
3641		3819
3642	warn "uuid file written ($value).\n";	3820	trace "uuid file written ($value).\n";
3643		3821
3644	1	3822	1
3645		3823
3646	}	3824	}
3647		3825
…		…
3653	}	3831	}
3654		3832
3655	sub emergency_save() {	3833	sub emergency_save() {
3656	my $freeze_guard = cf::freeze_mainloop;	3834	my $freeze_guard = cf::freeze_mainloop;
3657		3835
3658	warn "emergency_perl_save: enter\n";	3836	info "emergency_perl_save: enter\n";
		3837
		3838	# this is a trade-off: we want to be very quick here, so
		3839	# save all maps without fsync, and later call a global sync
		3840	# (which in turn might be very very slow)
		3841	local $USE_FSYNC = 0;
3659		3842
3660	cf::sync_job {	3843	cf::sync_job {
3661	# this is a trade-off: we want to be very quick here, so	3844	cf::write_runtime_sync; # external watchdog should not bark
3662	# save all maps without fsync, and later call a global sync
3663	# (which in turn might be very very slow)
3664	local $USE_FSYNC = 0;
3665		3845
3666	# use a peculiar iteration method to avoid tripping on perl	3846	# use a peculiar iteration method to avoid tripping on perl
3667	# refcount bugs in for. also avoids problems with players	3847	# refcount bugs in for. also avoids problems with players
3668	# and maps saved/destroyed asynchronously.	3848	# and maps saved/destroyed asynchronously.
3669	warn "emergency_perl_save: begin player save\n";	3849	info "emergency_perl_save: begin player save\n";
3670	for my $login (keys %cf::PLAYER) {	3850	for my $login (keys %cf::PLAYER) {
3671	my $pl = $cf::PLAYER{$login} or next;	3851	my $pl = $cf::PLAYER{$login} or next;
3672	$pl->valid or next;	3852	$pl->valid or next;
3673	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3853	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3674	$pl->save;	3854	$pl->save;
3675	}	3855	}
3676	warn "emergency_perl_save: end player save\n";	3856	info "emergency_perl_save: end player save\n";
3677		3857
		3858	cf::write_runtime_sync; # external watchdog should not bark
		3859
3678	warn "emergency_perl_save: begin map save\n";	3860	info "emergency_perl_save: begin map save\n";
3679	for my $path (keys %cf::MAP) {	3861	for my $path (keys %cf::MAP) {
3680	my $map = $cf::MAP{$path} or next;	3862	my $map = $cf::MAP{$path} or next;
3681	$map->valid or next;	3863	$map->valid or next;
3682	$map->save;	3864	$map->save;
3683	}	3865	}
3684	warn "emergency_perl_save: end map save\n";	3866	info "emergency_perl_save: end map save\n";
3685		3867
		3868	cf::write_runtime_sync; # external watchdog should not bark
		3869
3686	warn "emergency_perl_save: begin database checkpoint\n";	3870	info "emergency_perl_save: begin database checkpoint\n";
3687	BDB::db_env_txn_checkpoint $DB_ENV;	3871	BDB::db_env_txn_checkpoint $DB_ENV;
3688	warn "emergency_perl_save: end database checkpoint\n";	3872	info "emergency_perl_save: end database checkpoint\n";
3689		3873
3690	warn "emergency_perl_save: begin write uuid\n";	3874	info "emergency_perl_save: begin write uuid\n";
3691	write_uuid_sync 1;	3875	write_uuid_sync 1;
3692	warn "emergency_perl_save: end write uuid\n";	3876	info "emergency_perl_save: end write uuid\n";
		3877
		3878	cf::write_runtime_sync; # external watchdog should not bark
		3879
		3880	trace "emergency_perl_save: syncing database to disk";
		3881	BDB::db_env_txn_checkpoint $DB_ENV;
		3882
		3883	info "emergency_perl_save: starting sync\n";
		3884	IO::AIO::aio_sync sub {
		3885	info "emergency_perl_save: finished sync\n";
		3886	};
		3887
		3888	cf::write_runtime_sync; # external watchdog should not bark
		3889
		3890	trace "emergency_perl_save: flushing outstanding aio requests";
		3891	while (IO::AIO::nreqs || BDB::nreqs) {
		3892	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
		3893	}
		3894
		3895	cf::write_runtime_sync; # external watchdog should not bark
3693	};	3896	};
3694		3897
3695	warn "emergency_perl_save: starting sync()\n";
3696	IO::AIO::aio_sync sub {
3697	warn "emergency_perl_save: finished sync()\n";
3698	};
3699
3700	warn "emergency_perl_save: leave\n";	3898	info "emergency_perl_save: leave\n";
3701	}	3899	}
3702		3900
3703	sub post_cleanup {	3901	sub post_cleanup {
3704	my ($make_core) = @_;	3902	my ($make_core) = @_;
3705		3903
		3904	IO::AIO::flush;
		3905
3706	warn Carp::longmess "post_cleanup backtrace"	3906	error Carp::longmess "post_cleanup backtrace"
3707	if $make_core;	3907	if $make_core;
3708		3908
3709	my $fh = pidfile;	3909	my $fh = pidfile;
3710	unlink $PIDFILE if <$fh> == $$;	3910	unlink $PIDFILE if <$fh> == $$;
3711	}	3911	}
…		…
3731	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	3931	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3732	for my $name (keys %$leaf_symtab) {	3932	for my $name (keys %$leaf_symtab) {
3733	_gv_clear *{"$pkg$name"};	3933	_gv_clear *{"$pkg$name"};
3734	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	3934	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3735	}	3935	}
3736	warn "cleared package $pkg\n";#d#
3737	}	3936	}
3738		3937
3739	sub do_reload_perl() {	3938	sub do_reload_perl() {
3740	# can/must only be called in main	3939	# can/must only be called in main
3741	if ($Coro::current != $Coro::main) {	3940	unless (in_main) {
3742	warn "can only reload from main coroutine";	3941	error "can only reload from main coroutine";
3743	return;	3942	return;
3744	}	3943	}
3745		3944
3746	return if $RELOAD++;	3945	return if $RELOAD++;
3747		3946
3748	my $t1 = EV::time;	3947	my $t1 = AE::time;
3749		3948
3750	while ($RELOAD) {	3949	while ($RELOAD) {
3751	warn "reloading...";	3950	cf::get_slot 0.1, -1, "reload_perl";
		3951	info "perl_reload: reloading...";
3752		3952
3753	warn "entering sync_job";	3953	trace "perl_reload: entering sync_job";
3754		3954
3755	cf::sync_job {	3955	cf::sync_job {
3756	cf::write_runtime_sync; # external watchdog should not bark
3757	cf::emergency_save;	3956	#cf::emergency_save;
3758	cf::write_runtime_sync; # external watchdog should not bark
3759		3957
3760	warn "syncing database to disk";
3761	BDB::db_env_txn_checkpoint $DB_ENV;
3762
3763	# if anything goes wrong in here, we should simply crash as we already saved
3764
3765	warn "flushing outstanding aio requests";
3766	while (IO::AIO::nreqs || BDB::nreqs) {
3767	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3768	}
3769
3770	warn "cancelling all extension coros";	3958	trace "perl_reload: cancelling all extension coros";
3771	$_->cancel for values %EXT_CORO;	3959	$_->cancel for values %EXT_CORO;
3772	%EXT_CORO = ();	3960	%EXT_CORO = ();
3773		3961
3774	warn "removing commands";	3962	trace "perl_reload: removing commands";
3775	%COMMAND = ();	3963	%COMMAND = ();
3776		3964
3777	warn "removing ext/exti commands";	3965	trace "perl_reload: removing ext/exti commands";
3778	%EXTCMD = ();	3966	%EXTCMD = ();
3779	%EXTICMD = ();	3967	%EXTICMD = ();
3780		3968
3781	warn "unloading/nuking all extensions";	3969	trace "perl_reload: unloading/nuking all extensions";
3782	for my $pkg (@EXTS) {	3970	for my $pkg (@EXTS) {
3783	warn "... unloading $pkg";	3971	trace "... unloading $pkg";
3784		3972
3785	if (my $cb = $pkg->can ("unload")) {	3973	if (my $cb = $pkg->can ("unload")) {
3786	eval {	3974	eval {
3787	$cb->($pkg);	3975	$cb->($pkg);
3788	1	3976	1
3789	} or warn "$pkg unloaded, but with errors: $@";	3977	} or error "$pkg unloaded, but with errors: $@";
3790	}	3978	}
3791		3979
3792	warn "... clearing $pkg";	3980	trace "... clearing $pkg";
3793	clear_package $pkg;	3981	clear_package $pkg;
3794	}	3982	}
3795		3983
3796	warn "unloading all perl modules loaded from $LIBDIR";	3984	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3797	while (my ($k, $v) = each %INC) {	3985	while (my ($k, $v) = each %INC) {
3798	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	3986	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3799		3987
3800	warn "... unloading $k";	3988	trace "... unloading $k";
3801	delete $INC{$k};	3989	delete $INC{$k};
3802		3990
3803	$k =~ s/\.pm$//;	3991	$k =~ s/\.pm$//;
3804	$k =~ s/\//::/g;	3992	$k =~ s/\//::/g;
3805		3993
…		…
3808	}	3996	}
3809		3997
3810	clear_package $k;	3998	clear_package $k;
3811	}	3999	}
3812		4000
3813	warn "getting rid of safe::, as good as possible";	4001	trace "perl_reload: getting rid of safe::, as good as possible";
3814	clear_package "safe::$_"	4002	clear_package "safe::$_"
3815	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4003	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3816		4004
3817	warn "unloading cf.pm \"a bit\"";	4005	trace "perl_reload: unloading cf.pm \"a bit\"";
3818	delete $INC{"cf.pm"};	4006	delete $INC{"cf.pm"};
3819	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4007	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3820		4008
3821	# don't, removes xs symbols, too,	4009	# don't, removes xs symbols, too,
3822	# and global variables created in xs	4010	# and global variables created in xs
3823	#clear_package __PACKAGE__;	4011	#clear_package __PACKAGE__;
3824		4012
3825	warn "unload completed, starting to reload now";	4013	info "perl_reload: unload completed, starting to reload now";
3826		4014
3827	warn "reloading cf.pm";	4015	trace "perl_reload: reloading cf.pm";
3828	require cf;	4016	require cf;
3829	cf::_connect_to_perl_1;	4017	cf::_connect_to_perl_1;
3830		4018
3831	warn "loading config and database again";	4019	trace "perl_reload: loading config and database again";
3832	cf::reload_config;	4020	cf::reload_config;
3833		4021
3834	warn "loading extensions";	4022	trace "perl_reload: loading extensions";
3835	cf::load_extensions;	4023	cf::load_extensions;
3836		4024
3837	if ($REATTACH_ON_RELOAD) {	4025	if ($REATTACH_ON_RELOAD) {
3838	warn "reattaching attachments to objects/players";	4026	trace "perl_reload: reattaching attachments to objects/players";
3839	_global_reattach; # objects, sockets	4027	_global_reattach; # objects, sockets
3840	warn "reattaching attachments to maps";	4028	trace "perl_reload: reattaching attachments to maps";
3841	reattach $_ for values %MAP;	4029	reattach $_ for values %MAP;
3842	warn "reattaching attachments to players";	4030	trace "perl_reload: reattaching attachments to players";
3843	reattach $_ for values %PLAYER;	4031	reattach $_ for values %PLAYER;
3844	}	4032	}
3845		4033
3846	warn "running post_init jobs";	4034	cf::_post_init 1;
3847	(pop @POST_INIT)->(1) while @POST_INIT;
3848		4035
3849	warn "leaving sync_job";	4036	trace "perl_reload: leaving sync_job";
3850		4037
3851	1	4038	1
3852	} or do {	4039	} or do {
3853	warn $@;	4040	error $@;
3854	cf::cleanup "error while reloading, exiting.";	4041	cf::cleanup "perl_reload: error, exiting.";
3855	};	4042	};
3856		4043
3857	warn "reloaded";
3858	--$RELOAD;	4044	--$RELOAD;
3859	}	4045	}
3860		4046
3861	$t1 = EV::time - $t1;	4047	$t1 = AE::time - $t1;
3862	warn "reload completed in ${t1}s\n";	4048	info "perl_reload: completed in ${t1}s\n";
3863	};	4049	};
3864		4050
3865	our $RELOAD_WATCHER; # used only during reload	4051	our $RELOAD_WATCHER; # used only during reload
3866		4052
3867	sub reload_perl() {	4053	sub reload_perl() {
…		…
3869	# coro crashes during coro_state_free->destroy here.	4055	# coro crashes during coro_state_free->destroy here.
3870		4056
3871	$RELOAD_WATCHER ||= cf::async {	4057	$RELOAD_WATCHER ||= cf::async {
3872	Coro::AIO::aio_wait cache_extensions;	4058	Coro::AIO::aio_wait cache_extensions;
3873		4059
3874	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {	4060	$RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3875	do_reload_perl;	4061	do_reload_perl;
3876	undef $RELOAD_WATCHER;	4062	undef $RELOAD_WATCHER;
3877	};	4063	};
3878	};	4064	};
3879	}	4065	}
…		…
3888	reload_perl;	4074	reload_perl;
3889	};	4075	};
3890	}	4076	}
3891	};	4077	};
3892		4078
3893	unshift @INC, $LIBDIR;	4079	#############################################################################
3894		4080
3895	my $bug_warning = 0;	4081	my $bug_warning = 0;
3896		4082
3897	our @WAIT_FOR_TICK;
3898	our @WAIT_FOR_TICK_BEGIN;
3899
3900	sub wait_for_tick {	4083	sub wait_for_tick() {
3901	return if tick_inhibit || $Coro::current == $Coro::main;	4084	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3902		4085
3903	my $signal = new Coro::Signal;	4086	$WAIT_FOR_TICK->wait;
3904	push @WAIT_FOR_TICK, $signal;
3905	$signal->wait;
3906	}	4087	}
3907		4088
3908	sub wait_for_tick_begin {	4089	sub wait_for_tick_begin() {
3909	return if tick_inhibit || $Coro::current == $Coro::main;	4090	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3910		4091
3911	my $signal = new Coro::Signal;	4092	my $signal = new Coro::Signal;
3912	push @WAIT_FOR_TICK_BEGIN, $signal;	4093	push @WAIT_FOR_TICK_BEGIN, $signal;
3913	$signal->wait;	4094	$signal->wait;
3914	}	4095	}
…		…
3918	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4099	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3919	unless ++$bug_warning > 10;	4100	unless ++$bug_warning > 10;
3920	return;	4101	return;
3921	}	4102	}
3922		4103
3923	cf::server_tick; # one server iteration	4104	cf::one_tick; # one server iteration
		4105
		4106	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3924		4107
3925	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4108	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3926	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4109	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3927	Coro::async_pool {	4110	Coro::async_pool {
3928	$Coro::current->{desc} = "runtime saver";	4111	$Coro::current->{desc} = "runtime saver";
3929	write_runtime_sync	4112	write_runtime_sync
3930	or warn "ERROR: unable to write runtime file: $!";	4113	or error "ERROR: unable to write runtime file: $!";
3931	};	4114	};
3932	}	4115	}
3933		4116
3934	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4117	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3935	$sig->send;	4118	$sig->send;
3936	}	4119	}
3937	while (my $sig = shift @WAIT_FOR_TICK) {	4120	$WAIT_FOR_TICK->broadcast;
3938	$sig->send;
3939	}
3940		4121
3941	$LOAD = ($NOW - $TICK_START) / $TICK;	4122	$LOAD = ($NOW - $TICK_START) / $TICK;
3942	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4123	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3943		4124
3944	if (0) {	4125	if (0) {
3945	if ($NEXT_TICK) {	4126	if ($NEXT_TICK) {
3946	my $jitter = $TICK_START - $NEXT_TICK;	4127	my $jitter = $TICK_START - $NEXT_TICK;
3947	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4128	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
3948	warn "jitter $JITTER\n";#d#	4129	debug "jitter $JITTER\n";#d#
3949	}	4130	}
3950	}	4131	}
3951	}	4132	}
3952		4133
3953	{	4134	{
3954	# configure BDB	4135	# configure BDB
3955		4136
3956	BDB::min_parallel 8;	4137	BDB::min_parallel 16;
3957	BDB::max_poll_reqs $TICK * 0.1;	4138	BDB::max_poll_reqs $TICK * 0.1;
3958	$AnyEvent::BDB::WATCHER->priority (1);	4139	#$AnyEvent::BDB::WATCHER->priority (1);
3959		4140
3960	unless ($DB_ENV) {	4141	unless ($DB_ENV) {
3961	$DB_ENV = BDB::db_env_create;	4142	$DB_ENV = BDB::db_env_create;
3962	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4143	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3963	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4144	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
3998	IO::AIO::min_parallel 8;	4179	IO::AIO::min_parallel 8;
3999	IO::AIO::max_poll_time $TICK * 0.1;	4180	IO::AIO::max_poll_time $TICK * 0.1;
4000	undef $AnyEvent::AIO::WATCHER;	4181	undef $AnyEvent::AIO::WATCHER;
4001	}	4182	}
4002		4183
4003	my $_log_backtrace;	4184	our $_log_backtrace;
		4185	our $_log_backtrace_last;
4004		4186
4005	sub _log_backtrace {	4187	sub _log_backtrace {
4006	my ($msg, @addr) = @_;	4188	my ($msg, @addr) = @_;
4007		4189
4008	$msg =~ s/\n//;	4190	$msg =~ s/\n$//;
4009		4191
		4192	if ($_log_backtrace_last eq $msg) {
		4193	LOG llevInfo, "[ABT] $msg\n";
		4194	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4010	# limit the # of concurrent backtraces	4195	# limit the # of concurrent backtraces
4011	if ($_log_backtrace < 2) {	4196	} elsif ($_log_backtrace < 2) {
		4197	$_log_backtrace_last = $msg;
4012	++$_log_backtrace;	4198	++$_log_backtrace;
4013	my $perl_bt = Carp::longmess $msg;	4199	my $perl_bt = Carp::longmess $msg;
4014	async {	4200	async {
4015	$Coro::current->{desc} = "abt $msg";	4201	$Coro::current->{desc} = "abt $msg";
4016		4202
…		…
4036	LOG llevInfo, "[ABT] $_\n" for @bt;	4222	LOG llevInfo, "[ABT] $_\n" for @bt;
4037	--$_log_backtrace;	4223	--$_log_backtrace;
4038	};	4224	};
4039	} else {	4225	} else {
4040	LOG llevInfo, "[ABT] $msg\n";	4226	LOG llevInfo, "[ABT] $msg\n";
4041	LOG llevInfo, "[ABT] [suppressed]\n";	4227	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4042	}	4228	}
4043	}	4229	}
4044		4230
4045	# load additional modules	4231	# load additional modules
4046	require "cf/$_.pm" for @EXTRA_MODULES;	4232	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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