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.482 by root, Sun Oct 11 05:31:54 2009 UTC vs.
Revision 1.535 by root, Thu Apr 29 08:21:28 2010 UTC

1	#	1	#
2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	#	3	#
4	# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	#	5	#
6	# Deliantra is free software: you can redistribute it and/or modify	6	# Deliantra is free software: you can redistribute it and/or modify it under
7	# it under the terms of the GNU General Public License as published by	7	# the terms of the Affero GNU General Public License as published by the
8	# the Free Software Foundation, either version 3 of the License, or	8	# Free Software Foundation, either version 3 of the License, or (at your
9	# (at your option) any later version.	9	# option) any later version.
10	#	10	#
11	# This program is distributed in the hope that it will be useful,	11	# This program is distributed in the hope that it will be useful,
12	# but WITHOUT ANY WARRANTY; without even the implied warranty of	12	# but WITHOUT ANY WARRANTY; without even the implied warranty of
13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14	# GNU General Public License for more details.	14	# GNU General Public License for more details.
15	#	15	#
16	# You should have received a copy of the GNU General Public License	16	# You should have received a copy of the Affero GNU General Public License
17	# along with this program. If not, see <http://www.gnu.org/licenses/>.	17	# and the GNU General Public License along with this program. If not, see
		18	# <http://www.gnu.org/licenses/>.
18	#	19	#
19	# The authors can be reached via e-mail to <support@deliantra.net>	20	# The authors can be reached via e-mail to <support@deliantra.net>
20	#	21	#
21		22
22	package cf;	23	package cf;
23		24
24	use 5.10.0;	25	use 5.10.0;
25	use utf8;	26	use utf8;
…		…
31	use EV;	32	use EV;
32	use Opcode;	33	use Opcode;
33	use Safe;	34	use Safe;
34	use Safe::Hole;	35	use Safe::Hole;
35	use Storable ();	36	use Storable ();
		37	use Carp ();
36		38
37	use Guard ();	39	use Guard ();
38	use Coro ();	40	use Coro ();
39	use Coro::State;	41	use Coro::State;
40	use Coro::Handle;	42	use Coro::Handle;
…		…
51	use Coro::Util ();	53	use Coro::Util ();
52		54
53	use JSON::XS 2.01 ();	55	use JSON::XS 2.01 ();
54	use BDB ();	56	use BDB ();
55	use Data::Dumper;	57	use Data::Dumper;
56	use Digest::MD5;
57	use Fcntl;	58	use Fcntl;
58	use YAML ();	59	use YAML::XS ();
59	use IO::AIO ();	60	use IO::AIO ();
60	use Time::HiRes;	61	use Time::HiRes;
61	use Compress::LZF;	62	use Compress::LZF;
62	use Digest::MD5 ();	63	use Digest::MD5 ();
63		64
…		…
105	our $RANDOMDIR = "$LOCALDIR/random";	106	our $RANDOMDIR = "$LOCALDIR/random";
106	our $BDBDIR = "$LOCALDIR/db";	107	our $BDBDIR = "$LOCALDIR/db";
107	our $PIDFILE = "$LOCALDIR/pid";	108	our $PIDFILE = "$LOCALDIR/pid";
108	our $RUNTIMEFILE = "$LOCALDIR/runtime";	109	our $RUNTIMEFILE = "$LOCALDIR/runtime";
109		110
110	our %RESOURCE;	111	our %RESOURCE; # unused
		112
		113	our $OUTPUT_RATE_MIN = 3000;
		114	our $OUTPUT_RATE_MAX = 1000000;
		115
		116	our $MAX_LINKS = 32; # how many chained exits to follow
		117	our $VERBOSE_IO = 1;
111		118
112	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	119	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
113	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	120	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
114	our $NEXT_TICK;	121	our $NEXT_TICK;
115	our $USE_FSYNC = 1; # use fsync to write maps - default on	122	our $USE_FSYNC = 1; # use fsync to write maps - default on
…		…
161		168
162	our $EMERGENCY_POSITION;	169	our $EMERGENCY_POSITION;
163		170
164	sub cf::map::normalise;	171	sub cf::map::normalise;
165		172
		173	sub in_main() {
		174	$Coro::current == $Coro::main
		175	}
		176
166	#############################################################################	177	#############################################################################
167		178
168	%REFLECT = ();	179	%REFLECT = ();
169	for (@REFLECT) {	180	for (@REFLECT) {
170	my $reflect = JSON::XS::decode_json $_;	181	my $reflect = JSON::XS::decode_json $_;
…		…
227	returns directly I<after> the tick processing (and consequently, can only wake one process	238	returns directly I<after> the tick processing (and consequently, can only wake one process
228	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	239	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
229		240
230	=item @cf::INVOKE_RESULTS	241	=item @cf::INVOKE_RESULTS
231		242
232	This array contains the results of the last C<invoke ()> call. When	243	This array contains the results of the last C<invoke ()> call. When
233	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of	244	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
234	that call.	245	that call.
235		246
236	=item %cf::REFLECT	247	=item %cf::REFLECT
237		248
…		…
241		252
242	=back	253	=back
243		254
244	=cut	255	=cut
245		256
		257	sub error(@) { LOG llevError, join "", @_ }
		258	sub warn (@) { LOG llevWarn , join "", @_ }
		259	sub info (@) { LOG llevInfo , join "", @_ }
		260	sub debug(@) { LOG llevDebug, join "", @_ }
		261	sub trace(@) { LOG llevTrace, join "", @_ }
		262
246	$Coro::State::WARNHOOK = sub {	263	$Coro::State::WARNHOOK = sub {
247	my $msg = join "", @_;	264	my $msg = join "", @_;
248		265
249	$msg .= "\n"	266	$msg .= "\n"
250	unless $msg =~ /\n$/;	267	unless $msg =~ /\n$/;
251		268
252	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	269	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
253		270
254	LOG llevError, $msg;	271	LOG llevWarn, $msg;
255	};	272	};
256		273
257	$Coro::State::DIEHOOK = sub {	274	$Coro::State::DIEHOOK = sub {
258	return unless $^S eq 0; # "eq", not "=="	275	return unless $^S eq 0; # "eq", not "=="
259		276
260	warn Carp::longmess $_[0];	277	error Carp::longmess $_[0];
261		278
262	if ($Coro::current == $Coro::main) {#d#	279	if (in_main) {#d#
263	warn "DIEHOOK called in main context, Coro bug?\n";#d#	280	error "DIEHOOK called in main context, Coro bug?\n";#d#
264	return;#d#	281	return;#d#
265	}#d#	282	}#d#
266		283
267	# kill coroutine otherwise	284	# kill coroutine otherwise
268	Coro::terminate	285	Coro::terminate
…		…
288	)) {	305	)) {
289	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	306	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
290	}	307	}
291		308
292	$EV::DIED = sub {	309	$EV::DIED = sub {
293	warn "error in event callback: @_";	310	Carp::cluck "error in event callback: @_";
294	};	311	};
295		312
296	#############################################################################	313	#############################################################################
297		314
298	=head2 UTILITY FUNCTIONS	315	=head2 UTILITY FUNCTIONS
…		…
395	}	412	}
396		413
397	=item cf::periodic $interval, $cb	414	=item cf::periodic $interval, $cb
398		415
399	Like EV::periodic, but randomly selects a starting point so that the actions	416	Like EV::periodic, but randomly selects a starting point so that the actions
400	get spread over timer.	417	get spread over time.
401		418
402	=cut	419	=cut
403		420
404	sub periodic($$) {	421	sub periodic($$) {
405	my ($interval, $cb) = @_;	422	my ($interval, $cb) = @_;
…		…
422		439
423	=cut	440	=cut
424		441
425	our @SLOT_QUEUE;	442	our @SLOT_QUEUE;
426	our $SLOT_QUEUE;	443	our $SLOT_QUEUE;
		444	our $SLOT_DECAY = 0.9;
427		445
428	$SLOT_QUEUE->cancel if $SLOT_QUEUE;	446	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
429	$SLOT_QUEUE = Coro::async {	447	$SLOT_QUEUE = Coro::async {
430	$Coro::current->desc ("timeslot manager");	448	$Coro::current->desc ("timeslot manager");
431		449
432	my $signal = new Coro::Signal;	450	my $signal = new Coro::Signal;
		451	my $busy;
433		452
434	while () {	453	while () {
435	next_job:	454	next_job:
		455
436	my $avail = cf::till_tick;	456	my $avail = cf::till_tick;
437	if ($avail > 0.01) {	457
438	for (0 .. $#SLOT_QUEUE) {	458	for (0 .. $#SLOT_QUEUE) {
439	if ($SLOT_QUEUE[$_][0] < $avail) {	459	if ($SLOT_QUEUE[$_][0] <= $avail) {
		460	$busy = 0;
440	my $job = splice @SLOT_QUEUE, $_, 1, ();	461	my $job = splice @SLOT_QUEUE, $_, 1, ();
441	$job->[2]->send;	462	$job->[2]->send;
442	Coro::cede;	463	Coro::cede;
443	goto next_job;	464	goto next_job;
444	}	465	} else {
		466	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
445	}	467	}
446	}	468	}
447		469
448	if (@SLOT_QUEUE) {	470	if (@SLOT_QUEUE) {
449	# we do not use wait_for_tick() as it returns immediately when tick is inactive	471	# we do not use wait_for_tick() as it returns immediately when tick is inactive
450	push @cf::WAIT_FOR_TICK, $signal;	472	push @cf::WAIT_FOR_TICK, $signal;
451	$signal->wait;	473	$signal->wait;
452	} else {	474	} else {
		475	$busy = 0;
453	Coro::schedule;	476	Coro::schedule;
454	}	477	}
455	}	478	}
456	};	479	};
457		480
458	sub get_slot($;$$) {	481	sub get_slot($;$$) {
459	return if tick_inhibit || $Coro::current == $Coro::main;	482	return if tick_inhibit || $Coro::current == $Coro::main;
460		483
461	my ($time, $pri, $name) = @_;	484	my ($time, $pri, $name) = @_;
462		485
463	$time = $TICK * .6 if $time > $TICK * .6;	486	$time = clamp $time, 0.01, $TICK * .6;
		487
464	my $sig = new Coro::Signal;	488	my $sig = new Coro::Signal;
465		489
466	push @SLOT_QUEUE, [$time, $pri, $sig, $name];	490	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
467	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;	491	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
468	$SLOT_QUEUE->ready;	492	$SLOT_QUEUE->ready;
…		…
494	=cut	518	=cut
495		519
496	sub sync_job(&) {	520	sub sync_job(&) {
497	my ($job) = @_;	521	my ($job) = @_;
498		522
499	if ($Coro::current == $Coro::main) {	523	if (in_main) {
500	my $time = EV::time;	524	my $time = AE::time;
501		525
502	# this is the main coro, too bad, we have to block	526	# this is the main coro, too bad, we have to block
503	# till the operation succeeds, freezing the server :/	527	# till the operation succeeds, freezing the server :/
504		528
505	LOG llevError, Carp::longmess "sync job";#d#	529	#LOG llevError, Carp::longmess "sync job";#d#
506		530
507	my $freeze_guard = freeze_mainloop;	531	my $freeze_guard = freeze_mainloop;
508		532
509	my $busy = 1;	533	my $busy = 1;
510	my @res;	534	my @res;
511		535
512	(async {	536	(async {
513	$Coro::current->desc ("sync job coro");	537	$Coro::current->desc ("sync job coro");
514	@res = eval { $job->() };	538	@res = eval { $job->() };
515	warn $@ if $@;	539	error $@ if $@;
516	undef $busy;	540	undef $busy;
517	})->prio (Coro::PRIO_MAX);	541	})->prio (Coro::PRIO_MAX);
518		542
519	while ($busy) {	543	while ($busy) {
520	if (Coro::nready) {	544	if (Coro::nready) {
…		…
522	} else {	546	} else {
523	EV::loop EV::LOOP_ONESHOT;	547	EV::loop EV::LOOP_ONESHOT;
524	}	548	}
525	}	549	}
526		550
527	my $time = EV::time - $time;	551	my $time = AE::time - $time;
528		552
529	$TICK_START += $time; # do not account sync jobs to server load	553	$TICK_START += $time; # do not account sync jobs to server load
530		554
531	wantarray ? @res : $res[0]	555	wantarray ? @res : $res[0]
532	} else {	556	} else {
…		…
576	reset_signals;	600	reset_signals;
577	&$cb	601	&$cb
578	}, @args;	602	}, @args;
579		603
580	wantarray ? @res : $res[-1]	604	wantarray ? @res : $res[-1]
		605	}
		606
		607	sub objinfo {
		608	(
		609	"counter value" => cf::object::object_count,
		610	"objects created" => cf::object::create_count,
		611	"objects destroyed" => cf::object::destroy_count,
		612	"freelist size" => cf::object::free_count,
		613	"allocated objects" => cf::object::objects_size,
		614	"active objects" => cf::object::actives_size,
		615	)
581	}	616	}
582		617
583	=item $coin = coin_from_name $name	618	=item $coin = coin_from_name $name
584		619
585	=cut	620	=cut
…		…
622	within each server.	657	within each server.
623		658
624	=cut	659	=cut
625		660
626	sub db_table($) {	661	sub db_table($) {
		662	cf::error "db_get called from main context"
		663	if $Coro::current == $Coro::main;
		664
627	my ($name) = @_;	665	my ($name) = @_;
628	my $db = BDB::db_create $DB_ENV;	666	my $db = BDB::db_create $DB_ENV;
629		667
630	eval {	668	eval {
631	$db->set_flags (BDB::CHKSUM);	669	$db->set_flags (BDB::CHKSUM);
…		…
641	}	679	}
642		680
643	our $DB;	681	our $DB;
644		682
645	sub db_init {	683	sub db_init {
646	cf::sync_job {
647	$DB ||= db_table "db";	684	$DB ||= db_table "db";
648	};
649	}	685	}
650		686
651	sub db_get($$) {	687	sub db_get($$) {
652	my $key = "$_[0]/$_[1]";	688	my $key = "$_[0]/$_[1]";
653		689
654	cf::sync_job {	690	cf::error "db_get called from main context"
		691	if $Coro::current == $Coro::main;
		692
655	BDB::db_get $DB, undef, $key, my $data;	693	BDB::db_get $DB, undef, $key, my $data;
656		694
657	$! ? ()	695	$! ? ()
658	: $data	696	: $data
659	}
660	}	697	}
661		698
662	sub db_put($$$) {	699	sub db_put($$$) {
663	BDB::dbreq_pri 4;	700	BDB::dbreq_pri 4;
664	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	701	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
720		757
721	my $t1 = Time::HiRes::time;	758	my $t1 = Time::HiRes::time;
722	my $data = $process->(\@data);	759	my $data = $process->(\@data);
723	my $t2 = Time::HiRes::time;	760	my $t2 = Time::HiRes::time;
724		761
725	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	762	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
726		763
727	db_put cache => "$id/data", $data;	764	db_put cache => "$id/data", $data;
728	db_put cache => "$id/md5" , $md5;	765	db_put cache => "$id/md5" , $md5;
729	db_put cache => "$id/meta", $meta;	766	db_put cache => "$id/meta", $meta;
730		767
…		…
740		777
741	=cut	778	=cut
742		779
743	sub datalog($@) {	780	sub datalog($@) {
744	my ($type, %kv) = @_;	781	my ($type, %kv) = @_;
745	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	782	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
746	}	783	}
747		784
748	=back	785	=back
749		786
750	=cut	787	=cut
…		…
945		982
946	} elsif (exists $cb_id{$type}) {	983	} elsif (exists $cb_id{$type}) {
947	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	984	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
948		985
949	} elsif (ref $type) {	986	} elsif (ref $type) {
950	warn "attaching objects not supported, ignoring.\n";	987	error "attaching objects not supported, ignoring.\n";
951		988
952	} else {	989	} else {
953	shift @arg;	990	shift @arg;
954	warn "attach argument '$type' not supported, ignoring.\n";	991	error "attach argument '$type' not supported, ignoring.\n";
955	}	992	}
956	}	993	}
957	}	994	}
958		995
959	sub _object_attach {	996	sub _object_attach {
…		…
969	_attach $registry, $klass, @attach;	1006	_attach $registry, $klass, @attach;
970	}	1007	}
971		1008
972	$obj->{$name} = \%arg;	1009	$obj->{$name} = \%arg;
973	} else {	1010	} else {
974	warn "object uses attachment '$name' which is not available, postponing.\n";	1011	info "object uses attachment '$name' which is not available, postponing.\n";
975	}	1012	}
976		1013
977	$obj->{_attachment}{$name} = undef;	1014	$obj->{_attachment}{$name} = undef;
978	}	1015	}
979		1016
…		…
1038		1075
1039	for (@$callbacks) {	1076	for (@$callbacks) {
1040	eval { &{$_->[1]} };	1077	eval { &{$_->[1]} };
1041		1078
1042	if ($@) {	1079	if ($@) {
1043	warn "$@";
1044	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1080	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1045	override;	1081	override;
1046	}	1082	}
1047		1083
1048	return 1 if $override;	1084	return 1 if $override;
1049	}	1085	}
…		…
1128	for (@$attach) {	1164	for (@$attach) {
1129	my ($klass, @attach) = @$_;	1165	my ($klass, @attach) = @$_;
1130	_attach $registry, $klass, @attach;	1166	_attach $registry, $klass, @attach;
1131	}	1167	}
1132	} else {	1168	} else {
1133	warn "object uses attachment '$name' that is not available, postponing.\n";	1169	info "object uses attachment '$name' that is not available, postponing.\n";
1134	}	1170	}
1135	}	1171	}
1136	}	1172	}
1137		1173
1138	cf::attachable->attach (	1174	cf::attachable->attach (
…		…
1165	my ($filename, $rdata, $objs) = @_;	1201	my ($filename, $rdata, $objs) = @_;
1166		1202
1167	sync_job {	1203	sync_job {
1168	if (length $$rdata) {	1204	if (length $$rdata) {
1169	utf8::decode (my $decname = $filename);	1205	utf8::decode (my $decname = $filename);
1170	warn sprintf "saving %s (%d,%d)\n",	1206	trace sprintf "saving %s (%d,%d)\n",
1171	$decname, length $$rdata, scalar @$objs;	1207	$decname, length $$rdata, scalar @$objs
		1208	if $VERBOSE_IO;
1172		1209
1173	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1210	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1174	aio_chmod $fh, SAVE_MODE;	1211	aio_chmod $fh, SAVE_MODE;
1175	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1212	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1176	if ($cf::USE_FSYNC) {	1213	if ($cf::USE_FSYNC) {
…		…
1198	aio_rename "$filename~", $filename;	1235	aio_rename "$filename~", $filename;
1199		1236
1200	$filename =~ s%/[^/]+$%%;	1237	$filename =~ s%/[^/]+$%%;
1201	aio_pathsync $filename if $cf::USE_FSYNC;	1238	aio_pathsync $filename if $cf::USE_FSYNC;
1202	} else {	1239	} else {
1203	warn "unable to save objects: $filename~: $!\n";	1240	error "unable to save objects: $filename~: $!\n";
1204	}	1241	}
1205	} else {	1242	} else {
1206	aio_unlink $filename;	1243	aio_unlink $filename;
1207	aio_unlink "$filename.pst";	1244	aio_unlink "$filename.pst";
1208	}	1245	}
…		…
1232	my $st = eval { Coro::Storable::thaw $av };	1269	my $st = eval { Coro::Storable::thaw $av };
1233	$av = $st->{objs};	1270	$av = $st->{objs};
1234	}	1271	}
1235		1272
1236	utf8::decode (my $decname = $filename);	1273	utf8::decode (my $decname = $filename);
1237	warn sprintf "loading %s (%d,%d)\n",	1274	trace sprintf "loading %s (%d,%d)\n",
1238	$decname, length $data, scalar @{$av || []};	1275	$decname, length $data, scalar @{$av || []}
		1276	if $VERBOSE_IO;
1239		1277
1240	($data, $av)	1278	($data, $av)
1241	}	1279	}
1242		1280
1243	=head2 COMMAND CALLBACKS	1281	=head2 COMMAND CALLBACKS
…		…
1302	}	1340	}
1303		1341
1304	use File::Glob ();	1342	use File::Glob ();
1305		1343
1306	cf::player->attach (	1344	cf::player->attach (
1307	on_command => sub {	1345	on_unknown_command => sub {
1308	my ($pl, $name, $params) = @_;	1346	my ($pl, $name, $params) = @_;
1309		1347
1310	my $cb = $COMMAND{$name}	1348	my $cb = $COMMAND{$name}
1311	or return;	1349	or return;
1312		1350
…		…
1335		1373
1336	$pl->ext_reply ($reply, @reply)	1374	$pl->ext_reply ($reply, @reply)
1337	if $reply;	1375	if $reply;
1338		1376
1339	} else {	1377	} else {
1340	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1378	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1341	}	1379	}
1342		1380
1343	cf::override;	1381	cf::override;
1344	},	1382	},
1345	);	1383	);
…		…
1356		1394
1357	$grp	1395	$grp
1358	}	1396	}
1359		1397
1360	sub load_extensions {	1398	sub load_extensions {
		1399	info "loading extensions...";
		1400
1361	cf::sync_job {	1401	cf::sync_job {
1362	my %todo;	1402	my %todo;
1363		1403
1364	for my $path (<$LIBDIR/*.ext>) {	1404	for my $path (<$LIBDIR/*.ext>) {
1365	next unless -r $path;	1405	next unless -r $path;
…		…
1391	. "\n};\n1";	1431	. "\n};\n1";
1392		1432
1393	$todo{$base} = \%ext;	1433	$todo{$base} = \%ext;
1394	}	1434	}
1395		1435
		1436	my $pass = 0;
1396	my %done;	1437	my %done;
1397	while (%todo) {	1438	while (%todo) {
1398	my $progress;	1439	my $progress;
1399		1440
		1441	++$pass;
		1442
		1443	ext:
1400	while (my ($k, $v) = each %todo) {	1444	while (my ($k, $v) = each %todo) {
1401	for (split /,\s*/, $v->{meta}{depends}) {	1445	for (split /,\s*/, $v->{meta}{depends}) {
1402	goto skip	1446	next ext
1403	unless exists $done{$_};	1447	unless exists $done{$_};
1404	}	1448	}
1405		1449
1406	warn "... loading '$k' into '$v->{pkg}'\n";	1450	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1407		1451
1408	unless (eval $v->{source}) {	1452	my $active = eval $v->{source};
		1453
		1454	if (length $@) {
1409	my $msg = $@ ? "$v->{path}: $@\n"	1455	error "$v->{path}: $@\n";
1410	: "$v->{base}: extension inactive.\n";
1411		1456
1412	if (exists $v->{meta}{mandatory}) {
1413	warn $msg;
1414	cf::cleanup "mandatory extension failed to load, exiting.";	1457	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1415	}	1458	if exists $v->{meta}{mandatory};
1416		1459
1417	warn $msg;	1460	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
		1461	delete $todo{$k};
		1462	} else {
		1463	$done{$k} = delete $todo{$k};
		1464	push @EXTS, $v->{pkg};
		1465	$progress = 1;
		1466
		1467	info "$v->{base}: extension inactive.\n"
		1468	unless $active;
1418	}	1469	}
1419
1420	$done{$k} = delete $todo{$k};
1421	push @EXTS, $v->{pkg};
1422	$progress = 1;
1423	}	1470	}
1424		1471
1425	skip:	1472	unless ($progress) {
1426	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"	1473	warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1427	unless $progress;	1474
		1475	while (my ($k, $v) = each %todo) {
		1476	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
		1477	if exists $v->{meta}{mandatory};
		1478	}
		1479	}
1428	}	1480	}
1429	};	1481	};
1430	}	1482	}
1431		1483
1432	#############################################################################	1484	#############################################################################
…		…
1516	$cf::PLAYER{$login} = $pl	1568	$cf::PLAYER{$login} = $pl
1517	}	1569	}
1518	}	1570	}
1519	}	1571	}
1520		1572
		1573	cf::player->attach (
		1574	on_load => sub {
		1575	my ($pl, $path) = @_;
		1576
		1577	# restore slots saved in save, below
		1578	my $slots = delete $pl->{_slots};
		1579
		1580	$pl->ob->current_weapon ($slots->[0]);
		1581	$pl->combat_ob ($slots->[1]);
		1582	$pl->ranged_ob ($slots->[2]);
		1583	},
		1584	);
		1585
1521	sub save($) {	1586	sub save($) {
1522	my ($pl) = @_;	1587	my ($pl) = @_;
1523		1588
1524	return if $pl->{deny_save};	1589	return if $pl->{deny_save};
1525		1590
…		…
1530		1595
1531	aio_mkdir playerdir $pl, 0770;	1596	aio_mkdir playerdir $pl, 0770;
1532	$pl->{last_save} = $cf::RUNTIME;	1597	$pl->{last_save} = $cf::RUNTIME;
1533		1598
1534	cf::get_slot 0.01;	1599	cf::get_slot 0.01;
		1600
		1601	# save slots, to be restored later
		1602	local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1535		1603
1536	$pl->save_pl ($path);	1604	$pl->save_pl ($path);
1537	cf::cede_to_tick;	1605	cf::cede_to_tick;
1538	}	1606	}
1539		1607
…		…
1576	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1644	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1577		1645
1578	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1646	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1579	$pl->deactivate;	1647	$pl->deactivate;
1580	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1648	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1581	$pl->ob->check_score;
1582	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1649	$pl->invoke (cf::EVENT_PLAYER_QUIT);
1583	$pl->ns->destroy if $pl->ns;	1650	$pl->ns->destroy if $pl->ns;
1584		1651
1585	my $path = playerdir $pl;	1652	my $path = playerdir $pl;
1586	my $temp = "$path~$cf::RUNTIME~deleting~";	1653	my $temp = "$path~$cf::RUNTIME~deleting~";
…		…
1641	\@logins	1708	\@logins
1642	}	1709	}
1643		1710
1644	=item $player->maps	1711	=item $player->maps
1645		1712
		1713	=item cf::player::maps $login
		1714
1646	Returns an arrayref of map paths that are private for this	1715	Returns an arrayref of map paths that are private for this
1647	player. May block.	1716	player. May block.
1648		1717
1649	=cut	1718	=cut
1650		1719
…		…
1712	=cut	1781	=cut
1713		1782
1714	sub find_by_path($) {	1783	sub find_by_path($) {
1715	my ($path) = @_;	1784	my ($path) = @_;
1716		1785
		1786	$path =~ s/^~[^\/]*//; # skip ~login
		1787
1717	my ($match, $specificity);	1788	my ($match, $specificity);
1718		1789
1719	for my $region (list) {	1790	for my $region (list) {
1720	if ($region->{match} && $path =~ $region->{match}) {	1791	if ($region->{match} && $path =~ $region->{match}) {
1721	($match, $specificity) = ($region, $region->specificity)	1792	($match, $specificity) = ($region, $region->specificity)
…		…
1752	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	1823	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1753		1824
1754	# mit "rum" bekleckern, nicht	1825	# mit "rum" bekleckern, nicht
1755	$self->_create_random_map (	1826	$self->_create_random_map (
1756	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},	1827	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1757	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},	1828	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1758	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},	1829	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1759	$rmp->{exit_on_final_map},	1830	$rmp->{exit_on_final_map},
1760	$rmp->{xsize}, $rmp->{ysize},	1831	$rmp->{xsize}, $rmp->{ysize},
1761	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},	1832	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1762	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},	1833	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
…		…
1784		1855
1785	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	1856	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1786	}	1857	}
1787		1858
1788	# also paths starting with '/'	1859	# also paths starting with '/'
1789	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	1860	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1790		1861
1791	sub thawer_merge {	1862	sub thawer_merge {
1792	my ($self, $merge) = @_;	1863	my ($self, $merge) = @_;
1793		1864
1794	# we have to keep some variables in memory intact	1865	# we have to keep some variables in memory intact
…		…
2008		2079
2009	$cf::MAP{$path} = $map	2080	$cf::MAP{$path} = $map
2010	}	2081	}
2011	}	2082	}
2012		2083
2013	sub pre_load { }	2084	sub pre_load { }
2014	sub post_load { }	2085	#sub post_load { } # XS
2015		2086
2016	sub load {	2087	sub load {
2017	my ($self) = @_;	2088	my ($self) = @_;
2018		2089
2019	local $self->{deny_reset} = 1; # loading can take a long time	2090	local $self->{deny_reset} = 1; # loading can take a long time
…		…
2076	}	2147	}
2077		2148
2078	$self->post_load;	2149	$self->post_load;
2079	}	2150	}
2080		2151
		2152	# customize the map for a given player, i.e.
		2153	# return the _real_ map. used by e.g. per-player
		2154	# maps to change the path to ~playername/mappath
2081	sub customise_for {	2155	sub customise_for {
2082	my ($self, $ob) = @_;	2156	my ($self, $ob) = @_;
2083		2157
2084	return find "~" . $ob->name . "/" . $self->{path}	2158	return find "~" . $ob->name . "/" . $self->{path}
2085	if $self->per_player;	2159	if $self->per_player;
…		…
2101	or next;	2175	or next;
2102	$neigh = find $neigh, $map	2176	$neigh = find $neigh, $map
2103	or next;	2177	or next;
2104	$neigh->load;	2178	$neigh->load;
2105		2179
		2180	# now find the diagonal neighbours
2106	push @neigh,	2181	push @neigh,
2107	[$neigh->tile_path (($_ + 3) % 4), $neigh],	2182	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2108	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2183	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2109	}	2184	}
2110		2185
…		…
2117	}	2192	}
2118		2193
2119	sub find_sync {	2194	sub find_sync {
2120	my ($path, $origin) = @_;	2195	my ($path, $origin) = @_;
2121		2196
2122	cf::sync_job { find $path, $origin }	2197	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
		2198	if $Coro::current == $Coro::main;
		2199
		2200	find $path, $origin
2123	}	2201	}
2124		2202
2125	sub do_load_sync {	2203	sub do_load_sync {
2126	my ($map) = @_;	2204	my ($map) = @_;
2127		2205
2128	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2206	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2129	if $Coro::current == $Coro::main;	2207	if $Coro::current == $Coro::main;
2130		2208
2131	cf::sync_job { $map->load };	2209	$map->load;
2132	}	2210	}
2133		2211
2134	our %MAP_PREFETCH;	2212	our %MAP_PREFETCH;
2135	our $MAP_PREFETCHER = undef;	2213	our $MAP_PREFETCHER = undef;
2136		2214
…		…
2162	$MAP_PREFETCHER->prio (6);	2240	$MAP_PREFETCHER->prio (6);
2163		2241
2164	()	2242	()
2165	}	2243	}
2166		2244
		2245	# common code, used by both ->save and ->swapout
2167	sub save {	2246	sub _save {
2168	my ($self) = @_;	2247	my ($self) = @_;
2169
2170	my $lock = cf::lock_acquire "map_data:$self->{path}";
2171		2248
2172	$self->{last_save} = $cf::RUNTIME;	2249	$self->{last_save} = $cf::RUNTIME;
2173		2250
2174	return unless $self->dirty;	2251	return unless $self->dirty;
2175		2252
…		…
2195	} else {	2272	} else {
2196	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);	2273	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2197	}	2274	}
2198	}	2275	}
2199		2276
		2277	sub save {
		2278	my ($self) = @_;
		2279
		2280	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2281
		2282	$self->_save;
		2283	}
		2284
2200	sub swap_out {	2285	sub swap_out {
2201	my ($self) = @_;	2286	my ($self) = @_;
2202		2287
2203	# save first because save cedes
2204	$self->save;
2205
2206	my $lock = cf::lock_acquire "map_data:$self->{path}";	2288	my $lock = cf::lock_acquire "map_data:$self->{path}";
2207		2289
2208	return if $self->players;
2209	return if $self->in_memory != cf::MAP_ACTIVE;	2290	return if $self->in_memory != cf::MAP_ACTIVE;
2210	return if $self->{deny_save};	2291	return if $self->{deny_save};
		2292	return if $self->players;
2211		2293
		2294	# first deactivate the map and "unlink" it from the core
		2295	$self->deactivate;
		2296	$_->clear_links_to ($self) for values %cf::MAP;
2212	$self->in_memory (cf::MAP_SWAPPED);	2297	$self->in_memory (cf::MAP_SWAPPED);
		2298
		2299	# then atomically save
		2300	$self->_save;
		2301
		2302	# then free the map
		2303	$self->clear;
		2304	}
		2305
		2306	sub reset_at {
		2307	my ($self) = @_;
		2308
		2309	# TODO: safety, remove and allow resettable per-player maps
		2310	return 1e99 if $self->{deny_reset};
		2311
		2312	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
		2313	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
		2314
		2315	$time + $to
		2316	}
		2317
		2318	sub should_reset {
		2319	my ($self) = @_;
		2320
		2321	$self->reset_at <= $cf::RUNTIME
		2322	}
		2323
		2324	sub reset {
		2325	my ($self) = @_;
		2326
		2327	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2328
		2329	return if $self->players;
		2330
		2331	cf::trace "resetting map ", $self->path, "\n";
		2332
		2333	$self->in_memory (cf::MAP_SWAPPED);
		2334
		2335	# need to save uniques path
		2336	unless ($self->{deny_save}) {
		2337	my $uniq = $self->uniq_path; utf8::encode $uniq;
		2338
		2339	$self->_save_objects ($uniq, cf::IO_UNIQUES)
		2340	if $uniq;
		2341	}
		2342
		2343	delete $cf::MAP{$self->path};
2213		2344
2214	$self->deactivate;	2345	$self->deactivate;
2215	$_->clear_links_to ($self) for values %cf::MAP;	2346	$_->clear_links_to ($self) for values %cf::MAP;
2216	$self->clear;	2347	$self->clear;
2217	}
2218
2219	sub reset_at {
2220	my ($self) = @_;
2221
2222	# TODO: safety, remove and allow resettable per-player maps
2223	return 1e99 if $self->{deny_reset};
2224
2225	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2226	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2227
2228	$time + $to
2229	}
2230
2231	sub should_reset {
2232	my ($self) = @_;
2233
2234	$self->reset_at <= $cf::RUNTIME
2235	}
2236
2237	sub reset {
2238	my ($self) = @_;
2239
2240	my $lock = cf::lock_acquire "map_data:$self->{path}";
2241
2242	return if $self->players;
2243
2244	warn "resetting map ", $self->path, "\n";
2245
2246	$self->in_memory (cf::MAP_SWAPPED);
2247
2248	# need to save uniques path
2249	unless ($self->{deny_save}) {
2250	my $uniq = $self->uniq_path; utf8::encode $uniq;
2251
2252	$self->_save_objects ($uniq, cf::IO_UNIQUES)
2253	if $uniq;
2254	}
2255
2256	delete $cf::MAP{$self->path};
2257
2258	$self->deactivate;
2259	$_->clear_links_to ($self) for values %cf::MAP;
2260	$self->clear;
2261		2348
2262	$self->unlink_save;	2349	$self->unlink_save;
2263	$self->destroy;	2350	$self->destroy;
2264	}	2351	}
2265		2352
…		…
2273		2360
2274	delete $cf::MAP{$self->path};	2361	delete $cf::MAP{$self->path};
2275		2362
2276	$self->unlink_save;	2363	$self->unlink_save;
2277		2364
2278	bless $self, "cf::map";	2365	bless $self, "cf::map::wrap";
2279	delete $self->{deny_reset};	2366	delete $self->{deny_reset};
2280	$self->{deny_save} = 1;	2367	$self->{deny_save} = 1;
2281	$self->reset_timeout (1);	2368	$self->reset_timeout (1);
2282	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2369	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2283		2370
…		…
2340	: normalise $_	2427	: normalise $_
2341	} @{ aio_readdir $UNIQUEDIR or [] }	2428	} @{ aio_readdir $UNIQUEDIR or [] }
2342	]	2429	]
2343	}	2430	}
2344		2431
		2432	=item cf::map::static_maps
		2433
		2434	Returns an arrayref if paths of all static maps (all preinstalled F<.map>
		2435	file in the shared directory excluding F</styles> and F</editor>). May
		2436	block.
		2437
		2438	=cut
		2439
		2440	sub static_maps() {
		2441	my @dirs = "";
		2442	my @maps;
		2443
		2444	while (@dirs) {
		2445	my $dir = shift @dirs;
		2446
		2447	next if $dir eq "/styles" || $dir eq "/editor";
		2448
		2449	my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
		2450	or return;
		2451
		2452	for (@$files) {
		2453	s/\.map$// or next;
		2454	utf8::decode $_;
		2455	push @maps, "$dir/$_";
		2456	}
		2457
		2458	push @dirs, map "$dir/$_", @$dirs;
		2459	}
		2460
		2461	\@maps
		2462	}
		2463
2345	=back	2464	=back
2346		2465
2347	=head3 cf::object	2466	=head3 cf::object
2348		2467
2349	=cut	2468	=cut
…		…
2481		2600
2482	Freezes the player and moves him/her to a special map (C<{link}>).	2601	Freezes the player and moves him/her to a special map (C<{link}>).
2483		2602
2484	The player should be reasonably safe there for short amounts of time (e.g.	2603	The player should be reasonably safe there for short amounts of time (e.g.
2485	for loading a map). You I<MUST> call C<leave_link> as soon as possible,	2604	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2486	though, as the palyer cannot control the character while it is on the link	2605	though, as the player cannot control the character while it is on the link
2487	map.	2606	map.
2488		2607
2489	Will never block.	2608	Will never block.
2490		2609
2491	=item $player_object->leave_link ($map, $x, $y)	2610	=item $player_object->leave_link ($map, $x, $y)
…		…
2512	sub cf::object::player::enter_link {	2631	sub cf::object::player::enter_link {
2513	my ($self) = @_;	2632	my ($self) = @_;
2514		2633
2515	$self->deactivate_recursive;	2634	$self->deactivate_recursive;
2516		2635
		2636	++$self->{_link_recursion};
		2637
2517	return if UNIVERSAL::isa $self->map, "ext::map_link";	2638	return if UNIVERSAL::isa $self->map, "ext::map_link";
2518		2639
2519	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2640	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2520	if $self->map && $self->map->{path} ne "{link}";	2641	if $self->map && $self->map->{path} ne "{link}";
2521		2642
2522	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2643	$self->enter_map ($LINK_MAP || link_map, 3, 3);
2523	}	2644	}
2524		2645
2525	sub cf::object::player::leave_link {	2646	sub cf::object::player::leave_link {
2526	my ($self, $map, $x, $y) = @_;	2647	my ($self, $map, $x, $y) = @_;
2527		2648
…		…
2544	($x, $y) = (-1, -1)	2665	($x, $y) = (-1, -1)
2545	unless (defined $x) && (defined $y);	2666	unless (defined $x) && (defined $y);
2546		2667
2547	# use -1 or undef as default coordinates, not 0, 0	2668	# use -1 or undef as default coordinates, not 0, 0
2548	($x, $y) = ($map->enter_x, $map->enter_y)	2669	($x, $y) = ($map->enter_x, $map->enter_y)
2549	if $x <=0 && $y <= 0;	2670	if $x <= 0 && $y <= 0;
2550		2671
2551	$map->load;	2672	$map->load;
2552	$map->load_neighbours;	2673	$map->load_neighbours;
2553		2674
2554	return unless $self->contr->active;	2675	return unless $self->contr->active;
2555		2676
2556	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2677	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2557	$self->enter_map ($map, $x, $y);	2678	if ($self->enter_map ($map, $x, $y)) {
2558		2679	# entering was successful
		2680	delete $self->{_link_recursion};
2559	# only activate afterwards, to support waiting in hooks	2681	# only activate afterwards, to support waiting in hooks
2560	$self->activate_recursive;	2682	$self->activate_recursive;
2561	}	2683	}
2562		2684
		2685	}
		2686
2563	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2687	=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2564		2688
2565	Moves the player to the given map-path and coordinates by first freezing	2689	Moves the player to the given map-path and coordinates by first freezing
2566	her, loading and preparing them map, calling the provided $check callback	2690	her, loading and preparing them map, calling the provided $check callback
2567	that has to return the map if sucecssful, and then unfreezes the player on	2691	that has to return the map if sucecssful, and then unfreezes the player on
2568	the new (success) or old (failed) map position. In either case, $done will	2692	the new (success) or old (failed) map position. In either case, $done will
…		…
2575		2699
2576	our $GOTOGEN;	2700	our $GOTOGEN;
2577		2701
2578	sub cf::object::player::goto {	2702	sub cf::object::player::goto {
2579	my ($self, $path, $x, $y, $check, $done) = @_;	2703	my ($self, $path, $x, $y, $check, $done) = @_;
		2704
		2705	if ($self->{_link_recursion} >= $MAX_LINKS) {
		2706	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
		2707	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
		2708	($path, $x, $y) = @$EMERGENCY_POSITION;
		2709	}
2580		2710
2581	# do generation counting so two concurrent goto's will be executed in-order	2711	# do generation counting so two concurrent goto's will be executed in-order
2582	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2712	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2583		2713
2584	$self->enter_link;	2714	$self->enter_link;
…		…
2608	my $map = eval {	2738	my $map = eval {
2609	my $map = defined $path ? cf::map::find $path : undef;	2739	my $map = defined $path ? cf::map::find $path : undef;
2610		2740
2611	if ($map) {	2741	if ($map) {
2612	$map = $map->customise_for ($self);	2742	$map = $map->customise_for ($self);
2613	$map = $check->($map) if $check && $map;	2743	$map = $check->($map, $x, $y, $self) if $check && $map;
2614	} else {	2744	} else {
2615	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);	2745	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2616	}	2746	}
2617		2747
2618	$map	2748	$map
…		…
2626	if ($gen == $self->{_goto_generation}) {	2756	if ($gen == $self->{_goto_generation}) {
2627	delete $self->{_goto_generation};	2757	delete $self->{_goto_generation};
2628	$self->leave_link ($map, $x, $y);	2758	$self->leave_link ($map, $x, $y);
2629	}	2759	}
2630		2760
2631	$done->() if $done;	2761	$done->($self) if $done;
2632	})->prio (1);	2762	})->prio (1);
2633	}	2763	}
2634		2764
2635	=item $player_object->enter_exit ($exit_object)	2765	=item $player_object->enter_exit ($exit_object)
2636		2766
…		…
2729	$self->message ("Something went wrong deep within the deliantra server. "	2859	$self->message ("Something went wrong deep within the deliantra server. "
2730	. "I'll try to bring you back to the map you were before. "	2860	. "I'll try to bring you back to the map you were before. "
2731	. "Please report this to the dungeon master!",	2861	. "Please report this to the dungeon master!",
2732	cf::NDI_UNIQUE | cf::NDI_RED);	2862	cf::NDI_UNIQUE | cf::NDI_RED);
2733		2863
2734	warn "ERROR in enter_exit: $@";	2864	error "ERROR in enter_exit: $@";
2735	$self->leave_link;	2865	$self->leave_link;
2736	}	2866	}
2737	})->prio (1);	2867	})->prio (1);
2738	}	2868	}
2739		2869
…		…
2751	sub cf::client::send_drawinfo {	2881	sub cf::client::send_drawinfo {
2752	my ($self, $text, $flags) = @_;	2882	my ($self, $text, $flags) = @_;
2753		2883
2754	utf8::encode $text;	2884	utf8::encode $text;
2755	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2885	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
		2886	}
		2887
		2888	=item $client->send_big_packet ($pkt)
		2889
		2890	Like C<send_packet>, but tries to compress large packets, and fragments
		2891	them as required.
		2892
		2893	=cut
		2894
		2895	our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
		2896
		2897	sub cf::client::send_big_packet {
		2898	my ($self, $pkt) = @_;
		2899
		2900	# try lzf for large packets
		2901	$pkt = "lzf " . Compress::LZF::compress $pkt
		2902	if 1024 <= length $pkt and $self->{can_lzf};
		2903
		2904	# split very large packets
		2905	if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
		2906	$self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
		2907	$pkt = "frag";
		2908	}
		2909
		2910	$self->send_packet ($pkt);
2756	}	2911	}
2757		2912
2758	=item $client->send_msg ($channel, $msg, $color, [extra...])	2913	=item $client->send_msg ($channel, $msg, $color, [extra...])
2759		2914
2760	Send a drawinfo or msg packet to the client, formatting the msg for the	2915	Send a drawinfo or msg packet to the client, formatting the msg for the
…		…
2764		2919
2765	=cut	2920	=cut
2766		2921
2767	# non-persistent channels (usually the info channel)	2922	# non-persistent channels (usually the info channel)
2768	our %CHANNEL = (	2923	our %CHANNEL = (
		2924	"c/motd" => {
		2925	id => "infobox",
		2926	title => "MOTD",
		2927	reply => undef,
		2928	tooltip => "The message of the day",
		2929	},
2769	"c/identify" => {	2930	"c/identify" => {
2770	id => "infobox",	2931	id => "infobox",
2771	title => "Identify",	2932	title => "Identify",
2772	reply => undef,	2933	reply => undef,
2773	tooltip => "Items recently identified",	2934	tooltip => "Items recently identified",
…		…
2775	"c/examine" => {	2936	"c/examine" => {
2776	id => "infobox",	2937	id => "infobox",
2777	title => "Examine",	2938	title => "Examine",
2778	reply => undef,	2939	reply => undef,
2779	tooltip => "Signs and other items you examined",	2940	tooltip => "Signs and other items you examined",
		2941	},
		2942	"c/shopinfo" => {
		2943	id => "infobox",
		2944	title => "Shop Info",
		2945	reply => undef,
		2946	tooltip => "What your bargaining skill tells you about the shop",
2780	},	2947	},
2781	"c/book" => {	2948	"c/book" => {
2782	id => "infobox",	2949	id => "infobox",
2783	title => "Book",	2950	title => "Book",
2784	reply => undef,	2951	reply => undef,
…		…
2900	my $pkt = "msg "	3067	my $pkt = "msg "
2901	. $self->{json_coder}->encode (	3068	. $self->{json_coder}->encode (
2902	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]	3069	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2903	);	3070	);
2904		3071
2905	# try lzf for large packets
2906	$pkt = "lzf " . Compress::LZF::compress $pkt
2907	if 1024 <= length $pkt and $self->{can_lzf};
2908
2909	# split very large packets
2910	if (8192 < length $pkt and $self->{can_lzf}) {
2911	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2912	$pkt = "frag";
2913	}
2914
2915	$self->send_packet ($pkt);	3072	$self->send_big_packet ($pkt);
2916	}	3073	}
2917		3074
2918	=item $client->ext_msg ($type, @msg)	3075	=item $client->ext_msg ($type, @msg)
2919		3076
2920	Sends an ext event to the client.	3077	Sends an ext event to the client.
…		…
2923		3080
2924	sub cf::client::ext_msg($$@) {	3081	sub cf::client::ext_msg($$@) {
2925	my ($self, $type, @msg) = @_;	3082	my ($self, $type, @msg) = @_;
2926		3083
2927	if ($self->extcmd == 2) {	3084	if ($self->extcmd == 2) {
2928	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3085	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2929	} elsif ($self->extcmd == 1) { # TODO: remove	3086	} elsif ($self->extcmd == 1) { # TODO: remove
2930	push @msg, msgtype => "event_$type";	3087	push @msg, msgtype => "event_$type";
2931	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3088	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2932	}	3089	}
2933	}	3090	}
2934		3091
2935	=item $client->ext_reply ($msgid, @msg)	3092	=item $client->ext_reply ($msgid, @msg)
2936		3093
…		…
2940		3097
2941	sub cf::client::ext_reply($$@) {	3098	sub cf::client::ext_reply($$@) {
2942	my ($self, $id, @msg) = @_;	3099	my ($self, $id, @msg) = @_;
2943		3100
2944	if ($self->extcmd == 2) {	3101	if ($self->extcmd == 2) {
2945	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));	3102	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2946	} elsif ($self->extcmd == 1) {	3103	} elsif ($self->extcmd == 1) {
2947	#TODO: version 1, remove	3104	#TODO: version 1, remove
2948	unshift @msg, msgtype => "reply", msgid => $id;	3105	unshift @msg, msgtype => "reply", msgid => $id;
2949	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3106	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2950	}	3107	}
2951	}	3108	}
2952		3109
2953	=item $success = $client->query ($flags, "text", \&cb)	3110	=item $success = $client->query ($flags, "text", \&cb)
2954		3111
…		…
3025		3182
3026	$ns->ext_reply ($reply, @reply)	3183	$ns->ext_reply ($reply, @reply)
3027	if $reply;	3184	if $reply;
3028		3185
3029	} else {	3186	} else {
3030	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3187	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3031	}	3188	}
3032		3189
3033	cf::override;	3190	cf::override;
3034	},	3191	},
3035	);	3192	);
…		…
3055		3212
3056	$coro	3213	$coro
3057	}	3214	}
3058		3215
3059	cf::client->attach (	3216	cf::client->attach (
3060	on_destroy => sub {	3217	on_client_destroy => sub {
3061	my ($ns) = @_;	3218	my ($ns) = @_;
3062		3219
3063	$_->cancel for values %{ (delete $ns->{_coro}) || {} };	3220	$_->cancel for values %{ (delete $ns->{_coro}) || {} };
3064	},	3221	},
3065	);	3222	);
…		…
3081	our $safe_hole = new Safe::Hole;	3238	our $safe_hole = new Safe::Hole;
3082		3239
3083	$SIG{FPE} = 'IGNORE';	3240	$SIG{FPE} = 'IGNORE';
3084		3241
3085	$safe->permit_only (Opcode::opset qw(	3242	$safe->permit_only (Opcode::opset qw(
3086	:base_core :base_mem :base_orig :base_math	3243	:base_core :base_mem :base_orig :base_math :base_loop
3087	grepstart grepwhile mapstart mapwhile	3244	grepstart grepwhile mapstart mapwhile
3088	sort time	3245	sort time
3089	));	3246	));
3090		3247
3091	# here we export the classes and methods available to script code	3248	# here we export the classes and methods available to script code
…		…
3143	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3300	$qcode =~ s/"/‟/g; # not allowed in #line filenames
3144	$qcode =~ s/\n/\\n/g;	3301	$qcode =~ s/\n/\\n/g;
3145		3302
3146	%vars = (_dummy => 0) unless %vars;	3303	%vars = (_dummy => 0) unless %vars;
3147		3304
		3305	my @res;
3148	local $_;	3306	local $_;
3149	local @safe::cf::_safe_eval_args = values %vars;
3150		3307
3151	my $eval =	3308	my $eval =
3152	"do {\n"	3309	"do {\n"
3153	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"	3310	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3154	. "#line 0 \"{$qcode}\"\n"	3311	. "#line 0 \"{$qcode}\"\n"
3155	. $code	3312	. $code
3156	. "\n}"	3313	. "\n}"
3157	;	3314	;
3158		3315
		3316	if ($CFG{safe_eval}) {
3159	sub_generation_inc;	3317	sub_generation_inc;
		3318	local @safe::cf::_safe_eval_args = values %vars;
3160	my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);	3319	@res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3161	sub_generation_inc;	3320	sub_generation_inc;
		3321	} else {
		3322	local @cf::_safe_eval_args = values %vars;
		3323	@res = wantarray ? eval eval : scalar eval $eval;
		3324	}
3162		3325
3163	if ($@) {	3326	if ($@) {
3164	warn "$@";	3327	warn "$@",
3165	warn "while executing safe code '$code'\n";	3328	"while executing safe code '$code'\n",
3166	warn "with arguments " . (join " ", %vars) . "\n";	3329	"with arguments " . (join " ", %vars) . "\n";
3167	}	3330	}
3168		3331
3169	wantarray ? @res : $res[0]	3332	wantarray ? @res : $res[0]
3170	}	3333	}
3171		3334
…		…
3185	=cut	3348	=cut
3186		3349
3187	sub register_script_function {	3350	sub register_script_function {
3188	my ($fun, $cb) = @_;	3351	my ($fun, $cb) = @_;
3189		3352
3190	no strict 'refs';	3353	$fun = "safe::$fun" if $CFG{safe_eval};
3191	*{"safe::$fun"} = $safe_hole->wrap ($cb);	3354	*$fun = $safe_hole->wrap ($cb);
3192	}	3355	}
3193		3356
3194	=back	3357	=back
3195		3358
3196	=cut	3359	=cut
…		…
3205	# for this (global event?)	3368	# for this (global event?)
3206	%ext::player_env::MUSIC_FACE_CACHE = ();	3369	%ext::player_env::MUSIC_FACE_CACHE = ();
3207		3370
3208	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3371	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3209		3372
3210	warn "loading facedata from $path\n";	3373	trace "loading facedata from $path\n";
3211		3374
3212	my $facedata;	3375	my $facedata;
3213	0 < aio_load $path, $facedata	3376	0 < aio_load $path, $facedata
3214	or die "$path: $!";	3377	or die "$path: $!";
3215		3378
…		…
3217		3380
3218	$facedata->{version} == 2	3381	$facedata->{version} == 2
3219	or cf::cleanup "$path: version mismatch, cannot proceed.";	3382	or cf::cleanup "$path: version mismatch, cannot proceed.";
3220		3383
3221	# patch in the exptable	3384	# patch in the exptable
		3385	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3222	$facedata->{resource}{"res/exp_table"} = {	3386	$facedata->{resource}{"res/exp_table"} = {
3223	type => FT_RSRC,	3387	type => FT_RSRC,
3224	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),	3388	data => $exp_table,
		3389	hash => (Digest::MD5::md5 $exp_table),
3225	};	3390	};
3226	cf::cede_to_tick;	3391	cf::cede_to_tick;
3227		3392
3228	{	3393	{
3229	my $faces = $facedata->{faceinfo};	3394	my $faces = $facedata->{faceinfo};
…		…
3231	while (my ($face, $info) = each %$faces) {	3396	while (my ($face, $info) = each %$faces) {
3232	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3397	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3233		3398
3234	cf::face::set_visibility $idx, $info->{visibility};	3399	cf::face::set_visibility $idx, $info->{visibility};
3235	cf::face::set_magicmap $idx, $info->{magicmap};	3400	cf::face::set_magicmap $idx, $info->{magicmap};
3236	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};	3401	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3237	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};	3402	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3238		3403
3239	cf::cede_to_tick;	3404	cf::cede_to_tick;
3240	}	3405	}
3241		3406
3242	while (my ($face, $info) = each %$faces) {	3407	while (my ($face, $info) = each %$faces) {
…		…
3247		3412
3248	if (my $smooth = cf::face::find $info->{smooth}) {	3413	if (my $smooth = cf::face::find $info->{smooth}) {
3249	cf::face::set_smooth $idx, $smooth;	3414	cf::face::set_smooth $idx, $smooth;
3250	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3415	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3251	} else {	3416	} else {
3252	warn "smooth face '$info->{smooth}' not found for face '$face'";	3417	error "smooth face '$info->{smooth}' not found for face '$face'";
3253	}	3418	}
3254		3419
3255	cf::cede_to_tick;	3420	cf::cede_to_tick;
3256	}	3421	}
3257	}	3422	}
…		…
3266		3431
3267	cf::anim::invalidate_all; # d'oh	3432	cf::anim::invalidate_all; # d'oh
3268	}	3433	}
3269		3434
3270	{	3435	{
3271	# TODO: for gcfclient pleasure, we should give resources
3272	# that gcfclient doesn't grok a >10000 face index.
3273	my $res = $facedata->{resource};	3436	my $res = $facedata->{resource};
3274		3437
3275	while (my ($name, $info) = each %$res) {	3438	while (my ($name, $info) = each %$res) {
3276	if (defined $info->{type}) {	3439	if (defined $info->{type}) {
3277	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3440	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3278	my $data;
3279		3441
3280	if ($info->{type} & 1) {	3442	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3281	# prepend meta info
3282
3283	my $meta = $enc->encode ({
3284	name => $name,
3285	%{ $info->{meta} || {} },
3286	});
3287
3288	$data = pack "(w/a*)*", $meta, $info->{data};
3289	} else {
3290	$data = $info->{data};
3291	}
3292
3293	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3294	cf::face::set_type $idx, $info->{type};	3443	cf::face::set_type $idx, $info->{type};
3295	} else {	3444	} else {
3296	$RESOURCE{$name} = $info;	3445	$RESOURCE{$name} = $info; # unused
3297	}	3446	}
3298		3447
3299	cf::cede_to_tick;	3448	cf::cede_to_tick;
3300	}	3449	}
3301	}	3450	}
3302		3451
3303	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3452	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3304		3453
3305	1	3454	1
3306	}	3455	}
3307
3308	cf::global->attach (on_resource_update => sub {
3309	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3310	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3311
3312	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3313	my $sound = $soundconf->{compat}[$_]
3314	or next;
3315
3316	my $face = cf::face::find "sound/$sound->[1]";
3317	cf::sound::set $sound->[0] => $face;
3318	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3319	}
3320
3321	while (my ($k, $v) = each %{$soundconf->{event}}) {
3322	my $face = cf::face::find "sound/$v";
3323	cf::sound::set $k => $face;
3324	}
3325	}
3326	});
3327		3456
3328	register_exticmd fx_want => sub {	3457	register_exticmd fx_want => sub {
3329	my ($ns, $want) = @_;	3458	my ($ns, $want) = @_;
3330		3459
3331	while (my ($k, $v) = each %$want) {	3460	while (my ($k, $v) = each %$want) {
…		…
3370	sub reload_treasures {	3499	sub reload_treasures {
3371	load_resource_file "$DATADIR/treasures"	3500	load_resource_file "$DATADIR/treasures"
3372	or die "unable to load treasurelists\n";	3501	or die "unable to load treasurelists\n";
3373	}	3502	}
3374		3503
		3504	sub reload_sound {
		3505	trace "loading sound config from $DATADIR/sound\n";
		3506
		3507	0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
		3508	or die "$DATADIR/sound $!";
		3509
		3510	my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
		3511
		3512	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3513	my $sound = $soundconf->{compat}[$_]
		3514	or next;
		3515
		3516	my $face = cf::face::find "sound/$sound->[1]";
		3517	cf::sound::set $sound->[0] => $face;
		3518	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3519	}
		3520
		3521	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3522	my $face = cf::face::find "sound/$v";
		3523	cf::sound::set $k => $face;
		3524	}
		3525	}
		3526
3375	sub reload_resources {	3527	sub reload_resources {
3376	warn "reloading resource files...\n";	3528	trace "reloading resource files...\n";
3377		3529
3378	reload_facedata;	3530	reload_facedata;
		3531	reload_sound;
3379	reload_archetypes;	3532	reload_archetypes;
3380	reload_regions;	3533	reload_regions;
3381	reload_treasures;	3534	reload_treasures;
3382		3535
3383	warn "finished reloading resource files\n";	3536	trace "finished reloading resource files\n";
3384	}	3537	}
3385		3538
3386	sub reload_config {	3539	sub reload_config {
		3540	trace "reloading config file...\n";
		3541
3387	open my $fh, "<:utf8", "$CONFDIR/config"	3542	open my $fh, "<:utf8", "$CONFDIR/config"
3388	or return;	3543	or return;
3389		3544
3390	local $/;	3545	local $/;
3391	*CFG = YAML::Load <$fh>;	3546	*CFG = YAML::XS::Load scalar <$fh>;
3392		3547
3393	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3548	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3394		3549
3395	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3550	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3396	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3551	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3397		3552
3398	if (exists $CFG{mlockall}) {	3553	if (exists $CFG{mlockall}) {
…		…
3400	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3555	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3401	and die "WARNING: m(un)lockall failed: $!\n";	3556	and die "WARNING: m(un)lockall failed: $!\n";
3402	};	3557	};
3403	warn $@ if $@;	3558	warn $@ if $@;
3404	}	3559	}
		3560
		3561	trace "finished reloading resource files\n";
3405	}	3562	}
3406		3563
3407	sub pidfile() {	3564	sub pidfile() {
3408	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3565	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3409	or die "$PIDFILE: $!";	3566	or die "$PIDFILE: $!";
…		…
3422	seek $fh, 0, 0;	3579	seek $fh, 0, 0;
3423	print $fh $$;	3580	print $fh $$;
3424	}	3581	}
3425		3582
3426	sub main_loop {	3583	sub main_loop {
3427	warn "EV::loop starting\n";	3584	trace "EV::loop starting\n";
3428	if (1) {	3585	if (1) {
3429	EV::loop;	3586	EV::loop;
3430	}	3587	}
3431	warn "EV::loop returned\n";	3588	trace "EV::loop returned\n";
3432	goto &main_loop unless $REALLY_UNLOOP;	3589	goto &main_loop unless $REALLY_UNLOOP;
3433	}	3590	}
3434		3591
3435	sub main {	3592	sub main {
3436	cf::init_globals; # initialise logging	3593	cf::init_globals; # initialise logging
3437		3594
3438	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3595	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3439	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3596	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3440	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3597	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3441	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3598	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3442
3443	cf::init_experience;
3444	cf::init_anim;
3445	cf::init_attackmess;
3446	cf::init_dynamic;
3447		3599
3448	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3600	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3449		3601
3450	# we must not ever block the main coroutine	3602	# we must not ever block the main coroutine
3451	local $Coro::idle = sub {	3603	local $Coro::idle = sub {
…		…
3457	};	3609	};
3458		3610
3459	evthread_start IO::AIO::poll_fileno;	3611	evthread_start IO::AIO::poll_fileno;
3460		3612
3461	cf::sync_job {	3613	cf::sync_job {
		3614	cf::init_experience;
		3615	cf::init_anim;
		3616	cf::init_attackmess;
		3617	cf::init_dynamic;
		3618
		3619	cf::load_settings;
		3620	cf::load_materials;
		3621
3462	reload_resources;	3622	reload_resources;
3463	reload_config;	3623	reload_config;
3464	db_init;	3624	db_init;
3465		3625
3466	cf::load_settings;
3467	cf::load_materials;
3468	cf::init_uuid;	3626	cf::init_uuid;
3469	cf::init_signals;	3627	cf::init_signals;
3470	cf::init_commands;
3471	cf::init_skills;	3628	cf::init_skills;
3472		3629
3473	cf::init_beforeplay;	3630	cf::init_beforeplay;
3474		3631
3475	atomic;	3632	atomic;
…		…
3482	use POSIX ();	3639	use POSIX ();
3483	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3640	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3484		3641
3485	(pop @POST_INIT)->(0) while @POST_INIT;	3642	(pop @POST_INIT)->(0) while @POST_INIT;
3486	};	3643	};
		3644
		3645	cf::object::thawer::errors_are_fatal 0;
		3646	info "parse errors in files are no longer fatal from this point on.\n";
3487		3647
3488	main_loop;	3648	main_loop;
3489	}	3649	}
3490		3650
3491	#############################################################################	3651	#############################################################################
…		…
3493		3653
3494	# install some emergency cleanup handlers	3654	# install some emergency cleanup handlers
3495	BEGIN {	3655	BEGIN {
3496	our %SIGWATCHER = ();	3656	our %SIGWATCHER = ();
3497	for my $signal (qw(INT HUP TERM)) {	3657	for my $signal (qw(INT HUP TERM)) {
3498	$SIGWATCHER{$signal} = EV::signal $signal, sub {	3658	$SIGWATCHER{$signal} = AE::signal $signal, sub {
3499	cf::cleanup "SIG$signal";	3659	cf::cleanup "SIG$signal";
3500	};	3660	};
3501	}	3661	}
3502	}	3662	}
3503		3663
3504	sub write_runtime_sync {	3664	sub write_runtime_sync {
		3665	my $t0 = AE::time;
		3666
3505	# first touch the runtime file to show we are still running:	3667	# first touch the runtime file to show we are still running:
3506	# the fsync below can take a very very long time.	3668	# the fsync below can take a very very long time.
3507		3669
3508	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;	3670	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3509		3671
3510	my $guard = cf::lock_acquire "write_runtime";	3672	my $guard = cf::lock_acquire "write_runtime";
3511		3673
3512	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644	3674	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3513	or return;	3675	or return;
3514		3676
3515	my $value = $cf::RUNTIME + 90 + 10;	3677	my $value = $cf::RUNTIME + 90 + 10;
3516	# 10 is the runtime save interval, for a monotonic clock	3678	# 10 is the runtime save interval, for a monotonic clock
3517	# 60 allows for the watchdog to kill the server.	3679	# 60 allows for the watchdog to kill the server.
…		…
3530	or return;	3692	or return;
3531		3693
3532	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3694	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3533	and return;	3695	and return;
3534		3696
3535	warn "runtime file written.\n";	3697	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3536		3698
3537	1	3699	1
3538	}	3700	}
3539		3701
3540	our $uuid_lock;	3702	our $uuid_lock;
…		…
3552	or return;	3714	or return;
3553		3715
3554	my $value = uuid_seq uuid_cur;	3716	my $value = uuid_seq uuid_cur;
3555		3717
3556	unless ($value) {	3718	unless ($value) {
3557	warn "cowardly refusing to write zero uuid value!\n";	3719	info "cowardly refusing to write zero uuid value!\n";
3558	return;	3720	return;
3559	}	3721	}
3560		3722
3561	my $value = uuid_str $value + $uuid_skip;	3723	my $value = uuid_str $value + $uuid_skip;
3562	$uuid_skip = 0;	3724	$uuid_skip = 0;
…		…
3572	or return;	3734	or return;
3573		3735
3574	aio_rename "$uuid~", $uuid	3736	aio_rename "$uuid~", $uuid
3575	and return;	3737	and return;
3576		3738
3577	warn "uuid file written ($value).\n";	3739	trace "uuid file written ($value).\n";
3578		3740
3579	1	3741	1
3580		3742
3581	}	3743	}
3582		3744
…		…
3588	}	3750	}
3589		3751
3590	sub emergency_save() {	3752	sub emergency_save() {
3591	my $freeze_guard = cf::freeze_mainloop;	3753	my $freeze_guard = cf::freeze_mainloop;
3592		3754
3593	warn "emergency_perl_save: enter\n";	3755	info "emergency_perl_save: enter\n";
		3756
		3757	# this is a trade-off: we want to be very quick here, so
		3758	# save all maps without fsync, and later call a global sync
		3759	# (which in turn might be very very slow)
		3760	local $USE_FSYNC = 0;
3594		3761
3595	cf::sync_job {	3762	cf::sync_job {
3596	# this is a trade-off: we want to be very quick here, so	3763	cf::write_runtime_sync; # external watchdog should not bark
3597	# save all maps without fsync, and later call a global sync
3598	# (which in turn might be very very slow)
3599	local $USE_FSYNC = 0;
3600		3764
3601	# use a peculiar iteration method to avoid tripping on perl	3765	# use a peculiar iteration method to avoid tripping on perl
3602	# refcount bugs in for. also avoids problems with players	3766	# refcount bugs in for. also avoids problems with players
3603	# and maps saved/destroyed asynchronously.	3767	# and maps saved/destroyed asynchronously.
3604	warn "emergency_perl_save: begin player save\n";	3768	info "emergency_perl_save: begin player save\n";
3605	for my $login (keys %cf::PLAYER) {	3769	for my $login (keys %cf::PLAYER) {
3606	my $pl = $cf::PLAYER{$login} or next;	3770	my $pl = $cf::PLAYER{$login} or next;
3607	$pl->valid or next;	3771	$pl->valid or next;
3608	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3772	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3609	$pl->save;	3773	$pl->save;
3610	}	3774	}
3611	warn "emergency_perl_save: end player save\n";	3775	info "emergency_perl_save: end player save\n";
3612		3776
		3777	cf::write_runtime_sync; # external watchdog should not bark
		3778
3613	warn "emergency_perl_save: begin map save\n";	3779	info "emergency_perl_save: begin map save\n";
3614	for my $path (keys %cf::MAP) {	3780	for my $path (keys %cf::MAP) {
3615	my $map = $cf::MAP{$path} or next;	3781	my $map = $cf::MAP{$path} or next;
3616	$map->valid or next;	3782	$map->valid or next;
3617	$map->save;	3783	$map->save;
3618	}	3784	}
3619	warn "emergency_perl_save: end map save\n";	3785	info "emergency_perl_save: end map save\n";
3620		3786
		3787	cf::write_runtime_sync; # external watchdog should not bark
		3788
3621	warn "emergency_perl_save: begin database checkpoint\n";	3789	info "emergency_perl_save: begin database checkpoint\n";
3622	BDB::db_env_txn_checkpoint $DB_ENV;	3790	BDB::db_env_txn_checkpoint $DB_ENV;
3623	warn "emergency_perl_save: end database checkpoint\n";	3791	info "emergency_perl_save: end database checkpoint\n";
3624		3792
3625	warn "emergency_perl_save: begin write uuid\n";	3793	info "emergency_perl_save: begin write uuid\n";
3626	write_uuid_sync 1;	3794	write_uuid_sync 1;
3627	warn "emergency_perl_save: end write uuid\n";	3795	info "emergency_perl_save: end write uuid\n";
		3796
		3797	cf::write_runtime_sync; # external watchdog should not bark
		3798
		3799	trace "emergency_perl_save: syncing database to disk";
		3800	BDB::db_env_txn_checkpoint $DB_ENV;
		3801
		3802	info "emergency_perl_save: starting sync()\n";
		3803	IO::AIO::aio_sync sub {
		3804	info "emergency_perl_save: finished sync()\n";
		3805	};
		3806
		3807	cf::write_runtime_sync; # external watchdog should not bark
		3808
		3809	trace "emergency_perl_save: flushing outstanding aio requests";
		3810	while (IO::AIO::nreqs || BDB::nreqs) {
		3811	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
		3812	}
		3813
		3814	cf::write_runtime_sync; # external watchdog should not bark
3628	};	3815	};
3629		3816
3630	warn "emergency_perl_save: starting sync()\n";
3631	IO::AIO::aio_sync sub {
3632	warn "emergency_perl_save: finished sync()\n";
3633	};
3634
3635	warn "emergency_perl_save: leave\n";	3817	info "emergency_perl_save: leave\n";
3636	}	3818	}
3637		3819
3638	sub post_cleanup {	3820	sub post_cleanup {
3639	my ($make_core) = @_;	3821	my ($make_core) = @_;
3640		3822
		3823	IO::AIO::flush;
		3824
		3825	IO::AIO::flush;
		3826
3641	warn Carp::longmess "post_cleanup backtrace"	3827	error Carp::longmess "post_cleanup backtrace"
3642	if $make_core;	3828	if $make_core;
3643		3829
3644	my $fh = pidfile;	3830	my $fh = pidfile;
3645	unlink $PIDFILE if <$fh> == $$;	3831	unlink $PIDFILE if <$fh> == $$;
3646	}	3832	}
…		…
3666	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	3852	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3667	for my $name (keys %$leaf_symtab) {	3853	for my $name (keys %$leaf_symtab) {
3668	_gv_clear *{"$pkg$name"};	3854	_gv_clear *{"$pkg$name"};
3669	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	3855	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3670	}	3856	}
3671	warn "cleared package $pkg\n";#d#
3672	}	3857	}
3673		3858
3674	sub do_reload_perl() {	3859	sub do_reload_perl() {
3675	# can/must only be called in main	3860	# can/must only be called in main
3676	if ($Coro::current != $Coro::main) {	3861	if (in_main) {
3677	warn "can only reload from main coroutine";	3862	error "can only reload from main coroutine";
3678	return;	3863	return;
3679	}	3864	}
3680		3865
3681	return if $RELOAD++;	3866	return if $RELOAD++;
3682		3867
3683	my $t1 = EV::time;	3868	my $t1 = AE::time;
3684		3869
3685	while ($RELOAD) {	3870	while ($RELOAD) {
3686	warn "reloading...";	3871	info "reloading...";
3687		3872
3688	warn "entering sync_job";	3873	trace "entering sync_job";
3689		3874
3690	cf::sync_job {	3875	cf::sync_job {
3691	cf::write_runtime_sync; # external watchdog should not bark
3692	cf::emergency_save;	3876	cf::emergency_save;
3693	cf::write_runtime_sync; # external watchdog should not bark
3694		3877
3695	warn "syncing database to disk";
3696	BDB::db_env_txn_checkpoint $DB_ENV;
3697
3698	# if anything goes wrong in here, we should simply crash as we already saved
3699
3700	warn "flushing outstanding aio requests";
3701	while (IO::AIO::nreqs || BDB::nreqs) {
3702	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3703	}
3704
3705	warn "cancelling all extension coros";	3878	trace "cancelling all extension coros";
3706	$_->cancel for values %EXT_CORO;	3879	$_->cancel for values %EXT_CORO;
3707	%EXT_CORO = ();	3880	%EXT_CORO = ();
3708		3881
3709	warn "removing commands";	3882	trace "removing commands";
3710	%COMMAND = ();	3883	%COMMAND = ();
3711		3884
3712	warn "removing ext/exti commands";	3885	trace "removing ext/exti commands";
3713	%EXTCMD = ();	3886	%EXTCMD = ();
3714	%EXTICMD = ();	3887	%EXTICMD = ();
3715		3888
3716	warn "unloading/nuking all extensions";	3889	trace "unloading/nuking all extensions";
3717	for my $pkg (@EXTS) {	3890	for my $pkg (@EXTS) {
3718	warn "... unloading $pkg";	3891	trace "... unloading $pkg";
3719		3892
3720	if (my $cb = $pkg->can ("unload")) {	3893	if (my $cb = $pkg->can ("unload")) {
3721	eval {	3894	eval {
3722	$cb->($pkg);	3895	$cb->($pkg);
3723	1	3896	1
3724	} or warn "$pkg unloaded, but with errors: $@";	3897	} or error "$pkg unloaded, but with errors: $@";
3725	}	3898	}
3726		3899
3727	warn "... clearing $pkg";	3900	trace "... clearing $pkg";
3728	clear_package $pkg;	3901	clear_package $pkg;
3729	}	3902	}
3730		3903
3731	warn "unloading all perl modules loaded from $LIBDIR";	3904	trace "unloading all perl modules loaded from $LIBDIR";
3732	while (my ($k, $v) = each %INC) {	3905	while (my ($k, $v) = each %INC) {
3733	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	3906	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3734		3907
3735	warn "... unloading $k";	3908	trace "... unloading $k";
3736	delete $INC{$k};	3909	delete $INC{$k};
3737		3910
3738	$k =~ s/\.pm$//;	3911	$k =~ s/\.pm$//;
3739	$k =~ s/\//::/g;	3912	$k =~ s/\//::/g;
3740		3913
…		…
3743	}	3916	}
3744		3917
3745	clear_package $k;	3918	clear_package $k;
3746	}	3919	}
3747		3920
3748	warn "getting rid of safe::, as good as possible";	3921	trace "getting rid of safe::, as good as possible";
3749	clear_package "safe::$_"	3922	clear_package "safe::$_"
3750	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	3923	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3751		3924
3752	warn "unloading cf.pm \"a bit\"";	3925	trace "unloading cf.pm \"a bit\"";
3753	delete $INC{"cf.pm"};	3926	delete $INC{"cf.pm"};
3754	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	3927	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3755		3928
3756	# don't, removes xs symbols, too,	3929	# don't, removes xs symbols, too,
3757	# and global variables created in xs	3930	# and global variables created in xs
3758	#clear_package __PACKAGE__;	3931	#clear_package __PACKAGE__;
3759		3932
3760	warn "unload completed, starting to reload now";	3933	info "unload completed, starting to reload now";
3761		3934
3762	warn "reloading cf.pm";	3935	trace "reloading cf.pm";
3763	require cf;	3936	require cf;
3764	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3937	cf::_connect_to_perl_1;
3765		3938
3766	warn "loading config and database again";	3939	trace "loading config and database again";
3767	cf::reload_config;	3940	cf::reload_config;
3768		3941
3769	warn "loading extensions";	3942	trace "loading extensions";
3770	cf::load_extensions;	3943	cf::load_extensions;
3771		3944
3772	if ($REATTACH_ON_RELOAD) {	3945	if ($REATTACH_ON_RELOAD) {
3773	warn "reattaching attachments to objects/players";	3946	trace "reattaching attachments to objects/players";
3774	_global_reattach; # objects, sockets	3947	_global_reattach; # objects, sockets
3775	warn "reattaching attachments to maps";	3948	trace "reattaching attachments to maps";
3776	reattach $_ for values %MAP;	3949	reattach $_ for values %MAP;
3777	warn "reattaching attachments to players";	3950	trace "reattaching attachments to players";
3778	reattach $_ for values %PLAYER;	3951	reattach $_ for values %PLAYER;
3779	}	3952	}
3780		3953
3781	warn "running post_init jobs";	3954	trace "running post_init jobs";
3782	(pop @POST_INIT)->(1) while @POST_INIT;	3955	(pop @POST_INIT)->(1) while @POST_INIT;
3783		3956
3784	warn "leaving sync_job";	3957	trace "leaving sync_job";
3785		3958
3786	1	3959	1
3787	} or do {	3960	} or do {
3788	warn $@;	3961	error $@;
3789	cf::cleanup "error while reloading, exiting.";	3962	cf::cleanup "error while reloading, exiting.";
3790	};	3963	};
3791		3964
3792	warn "reloaded";	3965	info "reloaded";
3793	--$RELOAD;	3966	--$RELOAD;
3794	}	3967	}
3795		3968
3796	$t1 = EV::time - $t1;	3969	$t1 = AE::time - $t1;
3797	warn "reload completed in ${t1}s\n";	3970	info "reload completed in ${t1}s\n";
3798	};	3971	};
3799		3972
3800	our $RELOAD_WATCHER; # used only during reload	3973	our $RELOAD_WATCHER; # used only during reload
3801		3974
3802	sub reload_perl() {	3975	sub reload_perl() {
…		…
3804	# coro crashes during coro_state_free->destroy here.	3977	# coro crashes during coro_state_free->destroy here.
3805		3978
3806	$RELOAD_WATCHER ||= cf::async {	3979	$RELOAD_WATCHER ||= cf::async {
3807	Coro::AIO::aio_wait cache_extensions;	3980	Coro::AIO::aio_wait cache_extensions;
3808		3981
3809	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {	3982	$RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3810	do_reload_perl;	3983	do_reload_perl;
3811	undef $RELOAD_WATCHER;	3984	undef $RELOAD_WATCHER;
3812	};	3985	};
3813	};	3986	};
3814	}	3987	}
…		…
3831		4004
3832	our @WAIT_FOR_TICK;	4005	our @WAIT_FOR_TICK;
3833	our @WAIT_FOR_TICK_BEGIN;	4006	our @WAIT_FOR_TICK_BEGIN;
3834		4007
3835	sub wait_for_tick {	4008	sub wait_for_tick {
3836	return if tick_inhibit || $Coro::current == $Coro::main;	4009	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3837		4010
3838	my $signal = new Coro::Signal;	4011	my $signal = new Coro::Signal;
3839	push @WAIT_FOR_TICK, $signal;	4012	push @WAIT_FOR_TICK, $signal;
3840	$signal->wait;	4013	$signal->wait;
3841	}	4014	}
3842		4015
3843	sub wait_for_tick_begin {	4016	sub wait_for_tick_begin {
3844	return if tick_inhibit || $Coro::current == $Coro::main;	4017	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3845		4018
3846	my $signal = new Coro::Signal;	4019	my $signal = new Coro::Signal;
3847	push @WAIT_FOR_TICK_BEGIN, $signal;	4020	push @WAIT_FOR_TICK_BEGIN, $signal;
3848	$signal->wait;	4021	$signal->wait;
3849	}	4022	}
…		…
3855	return;	4028	return;
3856	}	4029	}
3857		4030
3858	cf::server_tick; # one server iteration	4031	cf::server_tick; # one server iteration
3859		4032
		4033	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
		4034
3860	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4035	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3861	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4036	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3862	Coro::async_pool {	4037	Coro::async_pool {
3863	$Coro::current->{desc} = "runtime saver";	4038	$Coro::current->{desc} = "runtime saver";
3864	write_runtime_sync	4039	write_runtime_sync
3865	or warn "ERROR: unable to write runtime file: $!";	4040	or error "ERROR: unable to write runtime file: $!";
3866	};	4041	};
3867	}	4042	}
3868		4043
3869	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4044	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3870	$sig->send;	4045	$sig->send;
…		…
3878		4053
3879	if (0) {	4054	if (0) {
3880	if ($NEXT_TICK) {	4055	if ($NEXT_TICK) {
3881	my $jitter = $TICK_START - $NEXT_TICK;	4056	my $jitter = $TICK_START - $NEXT_TICK;
3882	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4057	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
3883	warn "jitter $JITTER\n";#d#	4058	debug "jitter $JITTER\n";#d#
3884	}	4059	}
3885	}	4060	}
3886	}	4061	}
3887		4062
3888	{	4063	{
3889	# configure BDB	4064	# configure BDB
3890		4065
3891	BDB::min_parallel 8;	4066	BDB::min_parallel 16;
3892	BDB::max_poll_reqs $TICK * 0.1;	4067	BDB::max_poll_reqs $TICK * 0.1;
3893	$AnyEvent::BDB::WATCHER->priority (1);	4068	$AnyEvent::BDB::WATCHER->priority (1);
3894		4069
3895	unless ($DB_ENV) {	4070	unless ($DB_ENV) {
3896	$DB_ENV = BDB::db_env_create;	4071	$DB_ENV = BDB::db_env_create;
…		…
3977	}	4152	}
3978	}	4153	}
3979		4154
3980	# load additional modules	4155	# load additional modules
3981	require "cf/$_.pm" for @EXTRA_MODULES;	4156	require "cf/$_.pm" for @EXTRA_MODULES;
		4157	cf::_connect_to_perl_2;
3982		4158
3983	END { cf::emergency_save }	4159	END { cf::emergency_save }
3984		4160
3985	1	4161	1
3986		4162

Diff Legend

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