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.486 by root, Thu Oct 15 21:56:50 2009 UTC vs.
Revision 1.539 by root, Tue May 4 22:49:21 2010 UTC

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

Diff Legend

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