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.496 by root, Sun Nov 15 18:03:59 2009 UTC vs.
Revision 1.534 by root, Thu Apr 29 08:13:51 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.
…		…
106	our $RANDOMDIR = "$LOCALDIR/random";	106	our $RANDOMDIR = "$LOCALDIR/random";
107	our $BDBDIR = "$LOCALDIR/db";	107	our $BDBDIR = "$LOCALDIR/db";
108	our $PIDFILE = "$LOCALDIR/pid";	108	our $PIDFILE = "$LOCALDIR/pid";
109	our $RUNTIMEFILE = "$LOCALDIR/runtime";	109	our $RUNTIMEFILE = "$LOCALDIR/runtime";
110		110
111	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;
112		118
113	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	119	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
114	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	120	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
115	our $NEXT_TICK;	121	our $NEXT_TICK;
116	our $USE_FSYNC = 1; # use fsync to write maps - default on	122	our $USE_FSYNC = 1; # use fsync to write maps - default on
…		…
162		168
163	our $EMERGENCY_POSITION;	169	our $EMERGENCY_POSITION;
164		170
165	sub cf::map::normalise;	171	sub cf::map::normalise;
166		172
		173	sub in_main() {
		174	$Coro::current == $Coro::main
		175	}
		176
167	#############################################################################	177	#############################################################################
168		178
169	%REFLECT = ();	179	%REFLECT = ();
170	for (@REFLECT) {	180	for (@REFLECT) {
171	my $reflect = JSON::XS::decode_json $_;	181	my $reflect = JSON::XS::decode_json $_;
…		…
242		252
243	=back	253	=back
244		254
245	=cut	255	=cut
246		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
247	$Coro::State::WARNHOOK = sub {	263	$Coro::State::WARNHOOK = sub {
248	my $msg = join "", @_;	264	my $msg = join "", @_;
249		265
250	$msg .= "\n"	266	$msg .= "\n"
251	unless $msg =~ /\n$/;	267	unless $msg =~ /\n$/;
252		268
253	$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;
254		270
255	LOG llevError, $msg;	271	LOG llevWarn, $msg;
256	};	272	};
257		273
258	$Coro::State::DIEHOOK = sub {	274	$Coro::State::DIEHOOK = sub {
259	return unless $^S eq 0; # "eq", not "=="	275	return unless $^S eq 0; # "eq", not "=="
260		276
261	warn Carp::longmess $_[0];	277	error Carp::longmess $_[0];
262		278
263	if ($Coro::current == $Coro::main) {#d#	279	if (in_main) {#d#
264	warn "DIEHOOK called in main context, Coro bug?\n";#d#	280	error "DIEHOOK called in main context, Coro bug?\n";#d#
265	return;#d#	281	return;#d#
266	}#d#	282	}#d#
267		283
268	# kill coroutine otherwise	284	# kill coroutine otherwise
269	Coro::terminate	285	Coro::terminate
…		…
396	}	412	}
397		413
398	=item cf::periodic $interval, $cb	414	=item cf::periodic $interval, $cb
399		415
400	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
401	get spread over timer.	417	get spread over time.
402		418
403	=cut	419	=cut
404		420
405	sub periodic($$) {	421	sub periodic($$) {
406	my ($interval, $cb) = @_;	422	my ($interval, $cb) = @_;
…		…
423		439
424	=cut	440	=cut
425		441
426	our @SLOT_QUEUE;	442	our @SLOT_QUEUE;
427	our $SLOT_QUEUE;	443	our $SLOT_QUEUE;
		444	our $SLOT_DECAY = 0.9;
428		445
429	$SLOT_QUEUE->cancel if $SLOT_QUEUE;	446	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
430	$SLOT_QUEUE = Coro::async {	447	$SLOT_QUEUE = Coro::async {
431	$Coro::current->desc ("timeslot manager");	448	$Coro::current->desc ("timeslot manager");
432		449
433	my $signal = new Coro::Signal;	450	my $signal = new Coro::Signal;
		451	my $busy;
434		452
435	while () {	453	while () {
436	next_job:	454	next_job:
		455
437	my $avail = cf::till_tick;	456	my $avail = cf::till_tick;
438	if ($avail > 0.01) {	457
439	for (0 .. $#SLOT_QUEUE) {	458	for (0 .. $#SLOT_QUEUE) {
440	if ($SLOT_QUEUE[$_][0] < $avail) {	459	if ($SLOT_QUEUE[$_][0] <= $avail) {
		460	$busy = 0;
441	my $job = splice @SLOT_QUEUE, $_, 1, ();	461	my $job = splice @SLOT_QUEUE, $_, 1, ();
442	$job->[2]->send;	462	$job->[2]->send;
443	Coro::cede;	463	Coro::cede;
444	goto next_job;	464	goto next_job;
445	}	465	} else {
		466	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
446	}	467	}
447	}	468	}
448		469
449	if (@SLOT_QUEUE) {	470	if (@SLOT_QUEUE) {
450	# 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
451	push @cf::WAIT_FOR_TICK, $signal;	472	push @cf::WAIT_FOR_TICK, $signal;
452	$signal->wait;	473	$signal->wait;
453	} else {	474	} else {
		475	$busy = 0;
454	Coro::schedule;	476	Coro::schedule;
455	}	477	}
456	}	478	}
457	};	479	};
458		480
459	sub get_slot($;$$) {	481	sub get_slot($;$$) {
460	return if tick_inhibit || $Coro::current == $Coro::main;	482	return if tick_inhibit || $Coro::current == $Coro::main;
461		483
462	my ($time, $pri, $name) = @_;	484	my ($time, $pri, $name) = @_;
463		485
464	$time = $TICK * .6 if $time > $TICK * .6;	486	$time = clamp $time, 0.01, $TICK * .6;
		487
465	my $sig = new Coro::Signal;	488	my $sig = new Coro::Signal;
466		489
467	push @SLOT_QUEUE, [$time, $pri, $sig, $name];	490	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
468	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;	491	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
469	$SLOT_QUEUE->ready;	492	$SLOT_QUEUE->ready;
…		…
495	=cut	518	=cut
496		519
497	sub sync_job(&) {	520	sub sync_job(&) {
498	my ($job) = @_;	521	my ($job) = @_;
499		522
500	if ($Coro::current == $Coro::main) {	523	if (in_main) {
501	my $time = EV::time;	524	my $time = AE::time;
502		525
503	# this is the main coro, too bad, we have to block	526	# this is the main coro, too bad, we have to block
504	# till the operation succeeds, freezing the server :/	527	# till the operation succeeds, freezing the server :/
505		528
506	LOG llevError, Carp::longmess "sync job";#d#	529	#LOG llevError, Carp::longmess "sync job";#d#
507		530
508	my $freeze_guard = freeze_mainloop;	531	my $freeze_guard = freeze_mainloop;
509		532
510	my $busy = 1;	533	my $busy = 1;
511	my @res;	534	my @res;
512		535
513	(async {	536	(async {
514	$Coro::current->desc ("sync job coro");	537	$Coro::current->desc ("sync job coro");
515	@res = eval { $job->() };	538	@res = eval { $job->() };
516	warn $@ if $@;	539	error $@ if $@;
517	undef $busy;	540	undef $busy;
518	})->prio (Coro::PRIO_MAX);	541	})->prio (Coro::PRIO_MAX);
519		542
520	while ($busy) {	543	while ($busy) {
521	if (Coro::nready) {	544	if (Coro::nready) {
…		…
523	} else {	546	} else {
524	EV::loop EV::LOOP_ONESHOT;	547	EV::loop EV::LOOP_ONESHOT;
525	}	548	}
526	}	549	}
527		550
528	my $time = EV::time - $time;	551	my $time = AE::time - $time;
529		552
530	$TICK_START += $time; # do not account sync jobs to server load	553	$TICK_START += $time; # do not account sync jobs to server load
531		554
532	wantarray ? @res : $res[0]	555	wantarray ? @res : $res[0]
533	} else {	556	} else {
…		…
577	reset_signals;	600	reset_signals;
578	&$cb	601	&$cb
579	}, @args;	602	}, @args;
580		603
581	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	)
582	}	616	}
583		617
584	=item $coin = coin_from_name $name	618	=item $coin = coin_from_name $name
585		619
586	=cut	620	=cut
…		…
623	within each server.	657	within each server.
624		658
625	=cut	659	=cut
626		660
627	sub db_table($) {	661	sub db_table($) {
		662	cf::error "db_get called from main context"
		663	if $Coro::current == $Coro::main;
		664
628	my ($name) = @_;	665	my ($name) = @_;
629	my $db = BDB::db_create $DB_ENV;	666	my $db = BDB::db_create $DB_ENV;
630		667
631	eval {	668	eval {
632	$db->set_flags (BDB::CHKSUM);	669	$db->set_flags (BDB::CHKSUM);
…		…
642	}	679	}
643		680
644	our $DB;	681	our $DB;
645		682
646	sub db_init {	683	sub db_init {
647	cf::sync_job {
648	$DB ||= db_table "db";	684	$DB ||= db_table "db";
649	};
650	}	685	}
651		686
652	sub db_get($$) {	687	sub db_get($$) {
653	my $key = "$_[0]/$_[1]";	688	my $key = "$_[0]/$_[1]";
654		689
655	cf::sync_job {	690	cf::error "db_get called from main context"
		691	if $Coro::current == $Coro::main;
		692
656	BDB::db_get $DB, undef, $key, my $data;	693	BDB::db_get $DB, undef, $key, my $data;
657		694
658	$! ? ()	695	$! ? ()
659	: $data	696	: $data
660	}
661	}	697	}
662		698
663	sub db_put($$$) {	699	sub db_put($$$) {
664	BDB::dbreq_pri 4;	700	BDB::dbreq_pri 4;
665	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	701	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
721		757
722	my $t1 = Time::HiRes::time;	758	my $t1 = Time::HiRes::time;
723	my $data = $process->(\@data);	759	my $data = $process->(\@data);
724	my $t2 = Time::HiRes::time;	760	my $t2 = Time::HiRes::time;
725		761
726	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	762	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
727		763
728	db_put cache => "$id/data", $data;	764	db_put cache => "$id/data", $data;
729	db_put cache => "$id/md5" , $md5;	765	db_put cache => "$id/md5" , $md5;
730	db_put cache => "$id/meta", $meta;	766	db_put cache => "$id/meta", $meta;
731		767
…		…
741		777
742	=cut	778	=cut
743		779
744	sub datalog($@) {	780	sub datalog($@) {
745	my ($type, %kv) = @_;	781	my ($type, %kv) = @_;
746	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	782	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
747	}	783	}
748		784
749	=back	785	=back
750		786
751	=cut	787	=cut
…		…
946		982
947	} elsif (exists $cb_id{$type}) {	983	} elsif (exists $cb_id{$type}) {
948	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	984	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
949		985
950	} elsif (ref $type) {	986	} elsif (ref $type) {
951	warn "attaching objects not supported, ignoring.\n";	987	error "attaching objects not supported, ignoring.\n";
952		988
953	} else {	989	} else {
954	shift @arg;	990	shift @arg;
955	warn "attach argument '$type' not supported, ignoring.\n";	991	error "attach argument '$type' not supported, ignoring.\n";
956	}	992	}
957	}	993	}
958	}	994	}
959		995
960	sub _object_attach {	996	sub _object_attach {
…		…
970	_attach $registry, $klass, @attach;	1006	_attach $registry, $klass, @attach;
971	}	1007	}
972		1008
973	$obj->{$name} = \%arg;	1009	$obj->{$name} = \%arg;
974	} else {	1010	} else {
975	warn "object uses attachment '$name' which is not available, postponing.\n";	1011	info "object uses attachment '$name' which is not available, postponing.\n";
976	}	1012	}
977		1013
978	$obj->{_attachment}{$name} = undef;	1014	$obj->{_attachment}{$name} = undef;
979	}	1015	}
980		1016
…		…
1039		1075
1040	for (@$callbacks) {	1076	for (@$callbacks) {
1041	eval { &{$_->[1]} };	1077	eval { &{$_->[1]} };
1042		1078
1043	if ($@) {	1079	if ($@) {
1044	warn "$@";
1045	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1080	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1046	override;	1081	override;
1047	}	1082	}
1048		1083
1049	return 1 if $override;	1084	return 1 if $override;
1050	}	1085	}
…		…
1129	for (@$attach) {	1164	for (@$attach) {
1130	my ($klass, @attach) = @$_;	1165	my ($klass, @attach) = @$_;
1131	_attach $registry, $klass, @attach;	1166	_attach $registry, $klass, @attach;
1132	}	1167	}
1133	} else {	1168	} else {
1134	warn "object uses attachment '$name' that is not available, postponing.\n";	1169	info "object uses attachment '$name' that is not available, postponing.\n";
1135	}	1170	}
1136	}	1171	}
1137	}	1172	}
1138		1173
1139	cf::attachable->attach (	1174	cf::attachable->attach (
…		…
1166	my ($filename, $rdata, $objs) = @_;	1201	my ($filename, $rdata, $objs) = @_;
1167		1202
1168	sync_job {	1203	sync_job {
1169	if (length $$rdata) {	1204	if (length $$rdata) {
1170	utf8::decode (my $decname = $filename);	1205	utf8::decode (my $decname = $filename);
1171	warn sprintf "saving %s (%d,%d)\n",	1206	trace sprintf "saving %s (%d,%d)\n",
1172	$decname, length $$rdata, scalar @$objs;	1207	$decname, length $$rdata, scalar @$objs
		1208	if $VERBOSE_IO;
1173		1209
1174	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1210	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1175	aio_chmod $fh, SAVE_MODE;	1211	aio_chmod $fh, SAVE_MODE;
1176	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1212	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1177	if ($cf::USE_FSYNC) {	1213	if ($cf::USE_FSYNC) {
…		…
1199	aio_rename "$filename~", $filename;	1235	aio_rename "$filename~", $filename;
1200		1236
1201	$filename =~ s%/[^/]+$%%;	1237	$filename =~ s%/[^/]+$%%;
1202	aio_pathsync $filename if $cf::USE_FSYNC;	1238	aio_pathsync $filename if $cf::USE_FSYNC;
1203	} else {	1239	} else {
1204	warn "unable to save objects: $filename~: $!\n";	1240	error "unable to save objects: $filename~: $!\n";
1205	}	1241	}
1206	} else {	1242	} else {
1207	aio_unlink $filename;	1243	aio_unlink $filename;
1208	aio_unlink "$filename.pst";	1244	aio_unlink "$filename.pst";
1209	}	1245	}
…		…
1233	my $st = eval { Coro::Storable::thaw $av };	1269	my $st = eval { Coro::Storable::thaw $av };
1234	$av = $st->{objs};	1270	$av = $st->{objs};
1235	}	1271	}
1236		1272
1237	utf8::decode (my $decname = $filename);	1273	utf8::decode (my $decname = $filename);
1238	warn sprintf "loading %s (%d,%d)\n",	1274	trace sprintf "loading %s (%d,%d)\n",
1239	$decname, length $data, scalar @{$av || []};	1275	$decname, length $data, scalar @{$av || []}
		1276	if $VERBOSE_IO;
1240		1277
1241	($data, $av)	1278	($data, $av)
1242	}	1279	}
1243		1280
1244	=head2 COMMAND CALLBACKS	1281	=head2 COMMAND CALLBACKS
…		…
1303	}	1340	}
1304		1341
1305	use File::Glob ();	1342	use File::Glob ();
1306		1343
1307	cf::player->attach (	1344	cf::player->attach (
1308	on_command => sub {	1345	on_unknown_command => sub {
1309	my ($pl, $name, $params) = @_;	1346	my ($pl, $name, $params) = @_;
1310		1347
1311	my $cb = $COMMAND{$name}	1348	my $cb = $COMMAND{$name}
1312	or return;	1349	or return;
1313		1350
…		…
1336		1373
1337	$pl->ext_reply ($reply, @reply)	1374	$pl->ext_reply ($reply, @reply)
1338	if $reply;	1375	if $reply;
1339		1376
1340	} else {	1377	} else {
1341	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1378	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1342	}	1379	}
1343		1380
1344	cf::override;	1381	cf::override;
1345	},	1382	},
1346	);	1383	);
…		…
1357		1394
1358	$grp	1395	$grp
1359	}	1396	}
1360		1397
1361	sub load_extensions {	1398	sub load_extensions {
		1399	info "loading extensions...";
		1400
1362	cf::sync_job {	1401	cf::sync_job {
1363	my %todo;	1402	my %todo;
1364		1403
1365	for my $path (<$LIBDIR/*.ext>) {	1404	for my $path (<$LIBDIR/*.ext>) {
1366	next unless -r $path;	1405	next unless -r $path;
…		…
1392	. "\n};\n1";	1431	. "\n};\n1";
1393		1432
1394	$todo{$base} = \%ext;	1433	$todo{$base} = \%ext;
1395	}	1434	}
1396		1435
		1436	my $pass = 0;
1397	my %done;	1437	my %done;
1398	while (%todo) {	1438	while (%todo) {
1399	my $progress;	1439	my $progress;
1400		1440
		1441	++$pass;
		1442
		1443	ext:
1401	while (my ($k, $v) = each %todo) {	1444	while (my ($k, $v) = each %todo) {
1402	for (split /,\s*/, $v->{meta}{depends}) {	1445	for (split /,\s*/, $v->{meta}{depends}) {
1403	goto skip	1446	next ext
1404	unless exists $done{$_};	1447	unless exists $done{$_};
1405	}	1448	}
1406		1449
1407	warn "... loading '$k' into '$v->{pkg}'\n";	1450	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1408		1451
1409	unless (eval $v->{source}) {	1452	my $active = eval $v->{source};
		1453
		1454	if (length $@) {
1410	my $msg = $@ ? "$v->{path}: $@\n"	1455	error "$v->{path}: $@\n";
1411	: "$v->{base}: extension inactive.\n";
1412		1456
1413	if (exists $v->{meta}{mandatory}) {
1414	warn $msg;
1415	cf::cleanup "mandatory extension failed to load, exiting.";	1457	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1416	}	1458	if exists $v->{meta}{mandatory};
1417		1459
1418	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;
1419	}	1469	}
1420
1421	$done{$k} = delete $todo{$k};
1422	push @EXTS, $v->{pkg};
1423	$progress = 1;
1424	}	1470	}
1425		1471
1426	skip:	1472	unless ($progress) {
1427	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"	1473	warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1428	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	}
1429	}	1480	}
1430	};	1481	};
1431	}	1482	}
1432		1483
1433	#############################################################################	1484	#############################################################################
…		…
1517	$cf::PLAYER{$login} = $pl	1568	$cf::PLAYER{$login} = $pl
1518	}	1569	}
1519	}	1570	}
1520	}	1571	}
1521		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
1522	sub save($) {	1586	sub save($) {
1523	my ($pl) = @_;	1587	my ($pl) = @_;
1524		1588
1525	return if $pl->{deny_save};	1589	return if $pl->{deny_save};
1526		1590
…		…
1531		1595
1532	aio_mkdir playerdir $pl, 0770;	1596	aio_mkdir playerdir $pl, 0770;
1533	$pl->{last_save} = $cf::RUNTIME;	1597	$pl->{last_save} = $cf::RUNTIME;
1534		1598
1535	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];
1536		1603
1537	$pl->save_pl ($path);	1604	$pl->save_pl ($path);
1538	cf::cede_to_tick;	1605	cf::cede_to_tick;
1539	}	1606	}
1540		1607
…		…
1577	$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
1578		1645
1579	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1646	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1580	$pl->deactivate;	1647	$pl->deactivate;
1581	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;
1582	$pl->ob->check_score;
1583	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1649	$pl->invoke (cf::EVENT_PLAYER_QUIT);
1584	$pl->ns->destroy if $pl->ns;	1650	$pl->ns->destroy if $pl->ns;
1585		1651
1586	my $path = playerdir $pl;	1652	my $path = playerdir $pl;
1587	my $temp = "$path~$cf::RUNTIME~deleting~";	1653	my $temp = "$path~$cf::RUNTIME~deleting~";
…		…
1642	\@logins	1708	\@logins
1643	}	1709	}
1644		1710
1645	=item $player->maps	1711	=item $player->maps
1646		1712
		1713	=item cf::player::maps $login
		1714
1647	Returns an arrayref of map paths that are private for this	1715	Returns an arrayref of map paths that are private for this
1648	player. May block.	1716	player. May block.
1649		1717
1650	=cut	1718	=cut
1651		1719
…		…
1713	=cut	1781	=cut
1714		1782
1715	sub find_by_path($) {	1783	sub find_by_path($) {
1716	my ($path) = @_;	1784	my ($path) = @_;
1717		1785
		1786	$path =~ s/^~[^\/]*//; # skip ~login
		1787
1718	my ($match, $specificity);	1788	my ($match, $specificity);
1719		1789
1720	for my $region (list) {	1790	for my $region (list) {
1721	if ($region->{match} && $path =~ $region->{match}) {	1791	if ($region->{match} && $path =~ $region->{match}) {
1722	($match, $specificity) = ($region, $region->specificity)	1792	($match, $specificity) = ($region, $region->specificity)
…		…
1753	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
1754		1824
1755	# mit "rum" bekleckern, nicht	1825	# mit "rum" bekleckern, nicht
1756	$self->_create_random_map (	1826	$self->_create_random_map (
1757	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},	1827	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1758	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},	1828	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1759	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},	1829	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1760	$rmp->{exit_on_final_map},	1830	$rmp->{exit_on_final_map},
1761	$rmp->{xsize}, $rmp->{ysize},	1831	$rmp->{xsize}, $rmp->{ysize},
1762	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},	1832	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1763	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},	1833	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
…		…
1785		1855
1786	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	1856	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1787	}	1857	}
1788		1858
1789	# also paths starting with '/'	1859	# also paths starting with '/'
1790	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	1860	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1791		1861
1792	sub thawer_merge {	1862	sub thawer_merge {
1793	my ($self, $merge) = @_;	1863	my ($self, $merge) = @_;
1794		1864
1795	# we have to keep some variables in memory intact	1865	# we have to keep some variables in memory intact
…		…
2009		2079
2010	$cf::MAP{$path} = $map	2080	$cf::MAP{$path} = $map
2011	}	2081	}
2012	}	2082	}
2013		2083
2014	sub pre_load { }	2084	sub pre_load { }
2015	sub post_load { }	2085	#sub post_load { } # XS
2016		2086
2017	sub load {	2087	sub load {
2018	my ($self) = @_;	2088	my ($self) = @_;
2019		2089
2020	local $self->{deny_reset} = 1; # loading can take a long time	2090	local $self->{deny_reset} = 1; # loading can take a long time
…		…
2077	}	2147	}
2078		2148
2079	$self->post_load;	2149	$self->post_load;
2080	}	2150	}
2081		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
2082	sub customise_for {	2155	sub customise_for {
2083	my ($self, $ob) = @_;	2156	my ($self, $ob) = @_;
2084		2157
2085	return find "~" . $ob->name . "/" . $self->{path}	2158	return find "~" . $ob->name . "/" . $self->{path}
2086	if $self->per_player;	2159	if $self->per_player;
…		…
2102	or next;	2175	or next;
2103	$neigh = find $neigh, $map	2176	$neigh = find $neigh, $map
2104	or next;	2177	or next;
2105	$neigh->load;	2178	$neigh->load;
2106		2179
		2180	# now find the diagonal neighbours
2107	push @neigh,	2181	push @neigh,
2108	[$neigh->tile_path (($_ + 3) % 4), $neigh],	2182	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2109	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2183	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2110	}	2184	}
2111		2185
…		…
2118	}	2192	}
2119		2193
2120	sub find_sync {	2194	sub find_sync {
2121	my ($path, $origin) = @_;	2195	my ($path, $origin) = @_;
2122		2196
2123	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
2124	}	2201	}
2125		2202
2126	sub do_load_sync {	2203	sub do_load_sync {
2127	my ($map) = @_;	2204	my ($map) = @_;
2128		2205
2129	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2206	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2130	if $Coro::current == $Coro::main;	2207	if $Coro::current == $Coro::main;
2131		2208
2132	cf::sync_job { $map->load };	2209	$map->load;
2133	}	2210	}
2134		2211
2135	our %MAP_PREFETCH;	2212	our %MAP_PREFETCH;
2136	our $MAP_PREFETCHER = undef;	2213	our $MAP_PREFETCHER = undef;
2137		2214
…		…
2163	$MAP_PREFETCHER->prio (6);	2240	$MAP_PREFETCHER->prio (6);
2164		2241
2165	()	2242	()
2166	}	2243	}
2167		2244
		2245	# common code, used by both ->save and ->swapout
2168	sub save {	2246	sub _save {
2169	my ($self) = @_;	2247	my ($self) = @_;
2170
2171	my $lock = cf::lock_acquire "map_data:$self->{path}";
2172		2248
2173	$self->{last_save} = $cf::RUNTIME;	2249	$self->{last_save} = $cf::RUNTIME;
2174		2250
2175	return unless $self->dirty;	2251	return unless $self->dirty;
2176		2252
…		…
2196	} else {	2272	} else {
2197	$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);
2198	}	2274	}
2199	}	2275	}
2200		2276
		2277	sub save {
		2278	my ($self) = @_;
		2279
		2280	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2281
		2282	$self->_save;
		2283	}
		2284
2201	sub swap_out {	2285	sub swap_out {
2202	my ($self) = @_;	2286	my ($self) = @_;
2203		2287
2204	# save first because save cedes
2205	$self->save;
2206
2207	my $lock = cf::lock_acquire "map_data:$self->{path}";	2288	my $lock = cf::lock_acquire "map_data:$self->{path}";
2208		2289
2209	return if $self->players;
2210	return if $self->in_memory != cf::MAP_ACTIVE;	2290	return if $self->in_memory != cf::MAP_ACTIVE;
2211	return if $self->{deny_save};	2291	return if $self->{deny_save};
		2292	return if $self->players;
2212		2293
		2294	# first deactivate the map and "unlink" it from the core
		2295	$self->deactivate;
		2296	$_->clear_links_to ($self) for values %cf::MAP;
2213	$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};
2214		2344
2215	$self->deactivate;	2345	$self->deactivate;
2216	$_->clear_links_to ($self) for values %cf::MAP;	2346	$_->clear_links_to ($self) for values %cf::MAP;
2217	$self->clear;	2347	$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		2348
2263	$self->unlink_save;	2349	$self->unlink_save;
2264	$self->destroy;	2350	$self->destroy;
2265	}	2351	}
2266		2352
…		…
2274		2360
2275	delete $cf::MAP{$self->path};	2361	delete $cf::MAP{$self->path};
2276		2362
2277	$self->unlink_save;	2363	$self->unlink_save;
2278		2364
2279	bless $self, "cf::map";	2365	bless $self, "cf::map::wrap";
2280	delete $self->{deny_reset};	2366	delete $self->{deny_reset};
2281	$self->{deny_save} = 1;	2367	$self->{deny_save} = 1;
2282	$self->reset_timeout (1);	2368	$self->reset_timeout (1);
2283	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2369	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2284		2370
…		…
2514		2600
2515	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}>).
2516		2602
2517	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.
2518	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,
2519	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
2520	map.	2606	map.
2521		2607
2522	Will never block.	2608	Will never block.
2523		2609
2524	=item $player_object->leave_link ($map, $x, $y)	2610	=item $player_object->leave_link ($map, $x, $y)
…		…
2545	sub cf::object::player::enter_link {	2631	sub cf::object::player::enter_link {
2546	my ($self) = @_;	2632	my ($self) = @_;
2547		2633
2548	$self->deactivate_recursive;	2634	$self->deactivate_recursive;
2549		2635
		2636	++$self->{_link_recursion};
		2637
2550	return if UNIVERSAL::isa $self->map, "ext::map_link";	2638	return if UNIVERSAL::isa $self->map, "ext::map_link";
2551		2639
2552	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2640	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2553	if $self->map && $self->map->{path} ne "{link}";	2641	if $self->map && $self->map->{path} ne "{link}";
2554		2642
2555	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2643	$self->enter_map ($LINK_MAP || link_map, 3, 3);
2556	}	2644	}
2557		2645
2558	sub cf::object::player::leave_link {	2646	sub cf::object::player::leave_link {
2559	my ($self, $map, $x, $y) = @_;	2647	my ($self, $map, $x, $y) = @_;
2560		2648
…		…
2585	$map->load_neighbours;	2673	$map->load_neighbours;
2586		2674
2587	return unless $self->contr->active;	2675	return unless $self->contr->active;
2588		2676
2589	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2677	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2590	$self->enter_map ($map, $x, $y);	2678	if ($self->enter_map ($map, $x, $y)) {
2591		2679	# entering was successful
		2680	delete $self->{_link_recursion};
2592	# only activate afterwards, to support waiting in hooks	2681	# only activate afterwards, to support waiting in hooks
2593	$self->activate_recursive;	2682	$self->activate_recursive;
2594	}	2683	}
2595		2684
		2685	}
		2686
2596	=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)]])
2597		2688
2598	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
2599	her, loading and preparing them map, calling the provided $check callback	2690	her, loading and preparing them map, calling the provided $check callback
2600	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
2601	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
…		…
2608		2699
2609	our $GOTOGEN;	2700	our $GOTOGEN;
2610		2701
2611	sub cf::object::player::goto {	2702	sub cf::object::player::goto {
2612	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	}
2613		2710
2614	# 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
2615	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2712	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2616		2713
2617	$self->enter_link;	2714	$self->enter_link;
…		…
2641	my $map = eval {	2738	my $map = eval {
2642	my $map = defined $path ? cf::map::find $path : undef;	2739	my $map = defined $path ? cf::map::find $path : undef;
2643		2740
2644	if ($map) {	2741	if ($map) {
2645	$map = $map->customise_for ($self);	2742	$map = $map->customise_for ($self);
2646	$map = $check->($map) if $check && $map;	2743	$map = $check->($map, $x, $y, $self) if $check && $map;
2647	} else {	2744	} else {
2648	$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);
2649	}	2746	}
2650		2747
2651	$map	2748	$map
…		…
2659	if ($gen == $self->{_goto_generation}) {	2756	if ($gen == $self->{_goto_generation}) {
2660	delete $self->{_goto_generation};	2757	delete $self->{_goto_generation};
2661	$self->leave_link ($map, $x, $y);	2758	$self->leave_link ($map, $x, $y);
2662	}	2759	}
2663		2760
2664	$done->() if $done;	2761	$done->($self) if $done;
2665	})->prio (1);	2762	})->prio (1);
2666	}	2763	}
2667		2764
2668	=item $player_object->enter_exit ($exit_object)	2765	=item $player_object->enter_exit ($exit_object)
2669		2766
…		…
2762	$self->message ("Something went wrong deep within the deliantra server. "	2859	$self->message ("Something went wrong deep within the deliantra server. "
2763	. "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. "
2764	. "Please report this to the dungeon master!",	2861	. "Please report this to the dungeon master!",
2765	cf::NDI_UNIQUE | cf::NDI_RED);	2862	cf::NDI_UNIQUE | cf::NDI_RED);
2766		2863
2767	warn "ERROR in enter_exit: $@";	2864	error "ERROR in enter_exit: $@";
2768	$self->leave_link;	2865	$self->leave_link;
2769	}	2866	}
2770	})->prio (1);	2867	})->prio (1);
2771	}	2868	}
2772		2869
…		…
3085		3182
3086	$ns->ext_reply ($reply, @reply)	3183	$ns->ext_reply ($reply, @reply)
3087	if $reply;	3184	if $reply;
3088		3185
3089	} else {	3186	} else {
3090	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";
3091	}	3188	}
3092		3189
3093	cf::override;	3190	cf::override;
3094	},	3191	},
3095	);	3192	);
…		…
3115		3212
3116	$coro	3213	$coro
3117	}	3214	}
3118		3215
3119	cf::client->attach (	3216	cf::client->attach (
3120	on_destroy => sub {	3217	on_client_destroy => sub {
3121	my ($ns) = @_;	3218	my ($ns) = @_;
3122		3219
3123	$_->cancel for values %{ (delete $ns->{_coro}) || {} };	3220	$_->cancel for values %{ (delete $ns->{_coro}) || {} };
3124	},	3221	},
3125	);	3222	);
…		…
3141	our $safe_hole = new Safe::Hole;	3238	our $safe_hole = new Safe::Hole;
3142		3239
3143	$SIG{FPE} = 'IGNORE';	3240	$SIG{FPE} = 'IGNORE';
3144		3241
3145	$safe->permit_only (Opcode::opset qw(	3242	$safe->permit_only (Opcode::opset qw(
3146	:base_core :base_mem :base_orig :base_math	3243	:base_core :base_mem :base_orig :base_math :base_loop
3147	grepstart grepwhile mapstart mapwhile	3244	grepstart grepwhile mapstart mapwhile
3148	sort time	3245	sort time
3149	));	3246	));
3150		3247
3151	# here we export the classes and methods available to script code	3248	# here we export the classes and methods available to script code
…		…
3203	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3300	$qcode =~ s/"/‟/g; # not allowed in #line filenames
3204	$qcode =~ s/\n/\\n/g;	3301	$qcode =~ s/\n/\\n/g;
3205		3302
3206	%vars = (_dummy => 0) unless %vars;	3303	%vars = (_dummy => 0) unless %vars;
3207		3304
		3305	my @res;
3208	local $_;	3306	local $_;
3209	local @safe::cf::_safe_eval_args = values %vars;
3210		3307
3211	my $eval =	3308	my $eval =
3212	"do {\n"	3309	"do {\n"
3213	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"	3310	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3214	. "#line 0 \"{$qcode}\"\n"	3311	. "#line 0 \"{$qcode}\"\n"
3215	. $code	3312	. $code
3216	. "\n}"	3313	. "\n}"
3217	;	3314	;
3218		3315
		3316	if ($CFG{safe_eval}) {
3219	sub_generation_inc;	3317	sub_generation_inc;
		3318	local @safe::cf::_safe_eval_args = values %vars;
3220	my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);	3319	@res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3221	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	}
3222		3325
3223	if ($@) {	3326	if ($@) {
3224	warn "$@";	3327	warn "$@",
3225	warn "while executing safe code '$code'\n";	3328	"while executing safe code '$code'\n",
3226	warn "with arguments " . (join " ", %vars) . "\n";	3329	"with arguments " . (join " ", %vars) . "\n";
3227	}	3330	}
3228		3331
3229	wantarray ? @res : $res[0]	3332	wantarray ? @res : $res[0]
3230	}	3333	}
3231		3334
…		…
3245	=cut	3348	=cut
3246		3349
3247	sub register_script_function {	3350	sub register_script_function {
3248	my ($fun, $cb) = @_;	3351	my ($fun, $cb) = @_;
3249		3352
3250	no strict 'refs';	3353	$fun = "safe::$fun" if $CFG{safe_eval};
3251	*{"safe::$fun"} = $safe_hole->wrap ($cb);	3354	*$fun = $safe_hole->wrap ($cb);
3252	}	3355	}
3253		3356
3254	=back	3357	=back
3255		3358
3256	=cut	3359	=cut
…		…
3265	# for this (global event?)	3368	# for this (global event?)
3266	%ext::player_env::MUSIC_FACE_CACHE = ();	3369	%ext::player_env::MUSIC_FACE_CACHE = ();
3267		3370
3268	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3371	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3269		3372
3270	warn "loading facedata from $path\n";	3373	trace "loading facedata from $path\n";
3271		3374
3272	my $facedata;	3375	my $facedata;
3273	0 < aio_load $path, $facedata	3376	0 < aio_load $path, $facedata
3274	or die "$path: $!";	3377	or die "$path: $!";
3275		3378
…		…
3277		3380
3278	$facedata->{version} == 2	3381	$facedata->{version} == 2
3279	or cf::cleanup "$path: version mismatch, cannot proceed.";	3382	or cf::cleanup "$path: version mismatch, cannot proceed.";
3280		3383
3281	# 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]);
3282	$facedata->{resource}{"res/exp_table"} = {	3386	$facedata->{resource}{"res/exp_table"} = {
3283	type => FT_RSRC,	3387	type => FT_RSRC,
3284	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),
3285	};	3390	};
3286	cf::cede_to_tick;	3391	cf::cede_to_tick;
3287		3392
3288	{	3393	{
3289	my $faces = $facedata->{faceinfo};	3394	my $faces = $facedata->{faceinfo};
…		…
3307		3412
3308	if (my $smooth = cf::face::find $info->{smooth}) {	3413	if (my $smooth = cf::face::find $info->{smooth}) {
3309	cf::face::set_smooth $idx, $smooth;	3414	cf::face::set_smooth $idx, $smooth;
3310	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3415	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3311	} else {	3416	} else {
3312	warn "smooth face '$info->{smooth}' not found for face '$face'";	3417	error "smooth face '$info->{smooth}' not found for face '$face'";
3313	}	3418	}
3314		3419
3315	cf::cede_to_tick;	3420	cf::cede_to_tick;
3316	}	3421	}
3317	}	3422	}
…		…
3335	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3440	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3336		3441
3337	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};	3442	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3338	cf::face::set_type $idx, $info->{type};	3443	cf::face::set_type $idx, $info->{type};
3339	} else {	3444	} else {
3340	$RESOURCE{$name} = $info;	3445	$RESOURCE{$name} = $info; # unused
3341	}	3446	}
3342		3447
3343	cf::cede_to_tick;	3448	cf::cede_to_tick;
3344	}	3449	}
3345	}	3450	}
3346		3451
3347	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3452	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3348		3453
3349	1	3454	1
3350	}	3455	}
3351
3352	cf::global->attach (on_resource_update => sub {
3353	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3354	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3355
3356	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3357	my $sound = $soundconf->{compat}[$_]
3358	or next;
3359
3360	my $face = cf::face::find "sound/$sound->[1]";
3361	cf::sound::set $sound->[0] => $face;
3362	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3363	}
3364
3365	while (my ($k, $v) = each %{$soundconf->{event}}) {
3366	my $face = cf::face::find "sound/$v";
3367	cf::sound::set $k => $face;
3368	}
3369	}
3370	});
3371		3456
3372	register_exticmd fx_want => sub {	3457	register_exticmd fx_want => sub {
3373	my ($ns, $want) = @_;	3458	my ($ns, $want) = @_;
3374		3459
3375	while (my ($k, $v) = each %$want) {	3460	while (my ($k, $v) = each %$want) {
…		…
3414	sub reload_treasures {	3499	sub reload_treasures {
3415	load_resource_file "$DATADIR/treasures"	3500	load_resource_file "$DATADIR/treasures"
3416	or die "unable to load treasurelists\n";	3501	or die "unable to load treasurelists\n";
3417	}	3502	}
3418		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
3419	sub reload_resources {	3527	sub reload_resources {
3420	warn "reloading resource files...\n";	3528	trace "reloading resource files...\n";
3421		3529
3422	reload_facedata;	3530	reload_facedata;
		3531	reload_sound;
3423	reload_archetypes;	3532	reload_archetypes;
3424	reload_regions;	3533	reload_regions;
3425	reload_treasures;	3534	reload_treasures;
3426		3535
3427	warn "finished reloading resource files\n";	3536	trace "finished reloading resource files\n";
3428	}	3537	}
3429		3538
3430	sub reload_config {	3539	sub reload_config {
3431	warn "reloading config file...\n";	3540	trace "reloading config file...\n";
3432		3541
3433	open my $fh, "<:utf8", "$CONFDIR/config"	3542	open my $fh, "<:utf8", "$CONFDIR/config"
3434	or return;	3543	or return;
3435		3544
3436	local $/;	3545	local $/;
3437	*CFG = YAML::XS::Load scalar <$fh>;	3546	*CFG = YAML::XS::Load scalar <$fh>;
3438		3547
3439	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3548	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3440		3549
3441	$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};
3442	$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};
3443		3552
3444	if (exists $CFG{mlockall}) {	3553	if (exists $CFG{mlockall}) {
…		…
3447	and die "WARNING: m(un)lockall failed: $!\n";	3556	and die "WARNING: m(un)lockall failed: $!\n";
3448	};	3557	};
3449	warn $@ if $@;	3558	warn $@ if $@;
3450	}	3559	}
3451		3560
3452	warn "finished reloading resource files\n";	3561	trace "finished reloading resource files\n";
3453	}	3562	}
3454		3563
3455	sub pidfile() {	3564	sub pidfile() {
3456	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3565	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3457	or die "$PIDFILE: $!";	3566	or die "$PIDFILE: $!";
…		…
3470	seek $fh, 0, 0;	3579	seek $fh, 0, 0;
3471	print $fh $$;	3580	print $fh $$;
3472	}	3581	}
3473		3582
3474	sub main_loop {	3583	sub main_loop {
3475	warn "EV::loop starting\n";	3584	trace "EV::loop starting\n";
3476	if (1) {	3585	if (1) {
3477	EV::loop;	3586	EV::loop;
3478	}	3587	}
3479	warn "EV::loop returned\n";	3588	trace "EV::loop returned\n";
3480	goto &main_loop unless $REALLY_UNLOOP;	3589	goto &main_loop unless $REALLY_UNLOOP;
3481	}	3590	}
3482		3591
3483	sub main {	3592	sub main {
3484	cf::init_globals; # initialise logging	3593	cf::init_globals; # initialise logging
3485		3594
3486	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3595	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3487	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.";
3488	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3597	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3489	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3598	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3490
3491	cf::init_experience;
3492	cf::init_anim;
3493	cf::init_attackmess;
3494	cf::init_dynamic;
3495		3599
3496	$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
3497		3601
3498	# we must not ever block the main coroutine	3602	# we must not ever block the main coroutine
3499	local $Coro::idle = sub {	3603	local $Coro::idle = sub {
…		…
3505	};	3609	};
3506		3610
3507	evthread_start IO::AIO::poll_fileno;	3611	evthread_start IO::AIO::poll_fileno;
3508		3612
3509	cf::sync_job {	3613	cf::sync_job {
		3614	cf::init_experience;
		3615	cf::init_anim;
		3616	cf::init_attackmess;
		3617	cf::init_dynamic;
		3618
3510	cf::load_settings;	3619	cf::load_settings;
3511	cf::load_materials;	3620	cf::load_materials;
3512		3621
3513	reload_resources;	3622	reload_resources;
3514	reload_config;	3623	reload_config;
3515	db_init;	3624	db_init;
3516		3625
3517	cf::init_uuid;	3626	cf::init_uuid;
3518	cf::init_signals;	3627	cf::init_signals;
3519	cf::init_commands;
3520	cf::init_skills;	3628	cf::init_skills;
3521		3629
3522	cf::init_beforeplay;	3630	cf::init_beforeplay;
3523		3631
3524	atomic;	3632	atomic;
…		…
3531	use POSIX ();	3639	use POSIX ();
3532	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};
3533		3641
3534	(pop @POST_INIT)->(0) while @POST_INIT;	3642	(pop @POST_INIT)->(0) while @POST_INIT;
3535	};	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";
3536		3647
3537	main_loop;	3648	main_loop;
3538	}	3649	}
3539		3650
3540	#############################################################################	3651	#############################################################################
…		…
3542		3653
3543	# install some emergency cleanup handlers	3654	# install some emergency cleanup handlers
3544	BEGIN {	3655	BEGIN {
3545	our %SIGWATCHER = ();	3656	our %SIGWATCHER = ();
3546	for my $signal (qw(INT HUP TERM)) {	3657	for my $signal (qw(INT HUP TERM)) {
3547	$SIGWATCHER{$signal} = EV::signal $signal, sub {	3658	$SIGWATCHER{$signal} = AE::signal $signal, sub {
3548	cf::cleanup "SIG$signal";	3659	cf::cleanup "SIG$signal";
3549	};	3660	};
3550	}	3661	}
3551	}	3662	}
3552		3663
3553	sub write_runtime_sync {	3664	sub write_runtime_sync {
		3665	my $t0 = AE::time;
		3666
3554	# first touch the runtime file to show we are still running:	3667	# first touch the runtime file to show we are still running:
3555	# the fsync below can take a very very long time.	3668	# the fsync below can take a very very long time.
3556		3669
3557	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;	3670	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3558		3671
3559	my $guard = cf::lock_acquire "write_runtime";	3672	my $guard = cf::lock_acquire "write_runtime";
3560		3673
3561	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644	3674	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3562	or return;	3675	or return;
3563		3676
3564	my $value = $cf::RUNTIME + 90 + 10;	3677	my $value = $cf::RUNTIME + 90 + 10;
3565	# 10 is the runtime save interval, for a monotonic clock	3678	# 10 is the runtime save interval, for a monotonic clock
3566	# 60 allows for the watchdog to kill the server.	3679	# 60 allows for the watchdog to kill the server.
…		…
3579	or return;	3692	or return;
3580		3693
3581	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3694	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3582	and return;	3695	and return;
3583		3696
3584	warn "runtime file written.\n";	3697	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3585		3698
3586	1	3699	1
3587	}	3700	}
3588		3701
3589	our $uuid_lock;	3702	our $uuid_lock;
…		…
3601	or return;	3714	or return;
3602		3715
3603	my $value = uuid_seq uuid_cur;	3716	my $value = uuid_seq uuid_cur;
3604		3717
3605	unless ($value) {	3718	unless ($value) {
3606	warn "cowardly refusing to write zero uuid value!\n";	3719	info "cowardly refusing to write zero uuid value!\n";
3607	return;	3720	return;
3608	}	3721	}
3609		3722
3610	my $value = uuid_str $value + $uuid_skip;	3723	my $value = uuid_str $value + $uuid_skip;
3611	$uuid_skip = 0;	3724	$uuid_skip = 0;
…		…
3621	or return;	3734	or return;
3622		3735
3623	aio_rename "$uuid~", $uuid	3736	aio_rename "$uuid~", $uuid
3624	and return;	3737	and return;
3625		3738
3626	warn "uuid file written ($value).\n";	3739	trace "uuid file written ($value).\n";
3627		3740
3628	1	3741	1
3629		3742
3630	}	3743	}
3631		3744
…		…
3637	}	3750	}
3638		3751
3639	sub emergency_save() {	3752	sub emergency_save() {
3640	my $freeze_guard = cf::freeze_mainloop;	3753	my $freeze_guard = cf::freeze_mainloop;
3641		3754
3642	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;
3643		3761
3644	cf::sync_job {	3762	cf::sync_job {
3645	# this is a trade-off: we want to be very quick here, so
3646	# save all maps without fsync, and later call a global sync
3647	# (which in turn might be very very slow)
3648	local $USE_FSYNC = 0;
3649
3650	# use a peculiar iteration method to avoid tripping on perl	3763	# use a peculiar iteration method to avoid tripping on perl
3651	# refcount bugs in for. also avoids problems with players	3764	# refcount bugs in for. also avoids problems with players
3652	# and maps saved/destroyed asynchronously.	3765	# and maps saved/destroyed asynchronously.
3653	warn "emergency_perl_save: begin player save\n";	3766	info "emergency_perl_save: begin player save\n";
3654	for my $login (keys %cf::PLAYER) {	3767	for my $login (keys %cf::PLAYER) {
3655	my $pl = $cf::PLAYER{$login} or next;	3768	my $pl = $cf::PLAYER{$login} or next;
3656	$pl->valid or next;	3769	$pl->valid or next;
3657	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3770	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3658	$pl->save;	3771	$pl->save;
3659	}	3772	}
3660	warn "emergency_perl_save: end player save\n";	3773	info "emergency_perl_save: end player save\n";
3661		3774
3662	warn "emergency_perl_save: begin map save\n";	3775	info "emergency_perl_save: begin map save\n";
3663	for my $path (keys %cf::MAP) {	3776	for my $path (keys %cf::MAP) {
3664	my $map = $cf::MAP{$path} or next;	3777	my $map = $cf::MAP{$path} or next;
3665	$map->valid or next;	3778	$map->valid or next;
3666	$map->save;	3779	$map->save;
3667	}	3780	}
3668	warn "emergency_perl_save: end map save\n";	3781	info "emergency_perl_save: end map save\n";
3669		3782
3670	warn "emergency_perl_save: begin database checkpoint\n";	3783	info "emergency_perl_save: begin database checkpoint\n";
3671	BDB::db_env_txn_checkpoint $DB_ENV;	3784	BDB::db_env_txn_checkpoint $DB_ENV;
3672	warn "emergency_perl_save: end database checkpoint\n";	3785	info "emergency_perl_save: end database checkpoint\n";
3673		3786
3674	warn "emergency_perl_save: begin write uuid\n";	3787	info "emergency_perl_save: begin write uuid\n";
3675	write_uuid_sync 1;	3788	write_uuid_sync 1;
3676	warn "emergency_perl_save: end write uuid\n";	3789	info "emergency_perl_save: end write uuid\n";
3677	};	3790	};
3678		3791
3679	warn "emergency_perl_save: starting sync()\n";	3792	info "emergency_perl_save: starting sync()\n";
3680	IO::AIO::aio_sync sub {	3793	IO::AIO::aio_sync sub {
3681	warn "emergency_perl_save: finished sync()\n";	3794	info "emergency_perl_save: finished sync()\n";
3682	};	3795	};
3683		3796
3684	warn "emergency_perl_save: leave\n";	3797	info "emergency_perl_save: leave\n";
3685	}	3798	}
3686		3799
3687	sub post_cleanup {	3800	sub post_cleanup {
3688	my ($make_core) = @_;	3801	my ($make_core) = @_;
3689		3802
3690	warn Carp::longmess "post_cleanup backtrace"	3803	error Carp::longmess "post_cleanup backtrace"
3691	if $make_core;	3804	if $make_core;
3692		3805
3693	my $fh = pidfile;	3806	my $fh = pidfile;
3694	unlink $PIDFILE if <$fh> == $$;	3807	unlink $PIDFILE if <$fh> == $$;
3695	}	3808	}
…		…
3715	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	3828	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3716	for my $name (keys %$leaf_symtab) {	3829	for my $name (keys %$leaf_symtab) {
3717	_gv_clear *{"$pkg$name"};	3830	_gv_clear *{"$pkg$name"};
3718	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	3831	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3719	}	3832	}
3720	warn "cleared package $pkg\n";#d#
3721	}	3833	}
3722		3834
3723	sub do_reload_perl() {	3835	sub do_reload_perl() {
3724	# can/must only be called in main	3836	# can/must only be called in main
3725	if ($Coro::current != $Coro::main) {	3837	if (in_main) {
3726	warn "can only reload from main coroutine";	3838	error "can only reload from main coroutine";
3727	return;	3839	return;
3728	}	3840	}
3729		3841
3730	return if $RELOAD++;	3842	return if $RELOAD++;
3731		3843
3732	my $t1 = EV::time;	3844	my $t1 = AE::time;
3733		3845
3734	while ($RELOAD) {	3846	while ($RELOAD) {
3735	warn "reloading...";	3847	info "reloading...";
3736		3848
3737	warn "entering sync_job";	3849	trace "entering sync_job";
3738		3850
3739	cf::sync_job {	3851	cf::sync_job {
3740	cf::write_runtime_sync; # external watchdog should not bark	3852	cf::write_runtime_sync; # external watchdog should not bark
3741	cf::emergency_save;	3853	cf::emergency_save;
3742	cf::write_runtime_sync; # external watchdog should not bark	3854	cf::write_runtime_sync; # external watchdog should not bark
3743		3855
3744	warn "syncing database to disk";	3856	trace "syncing database to disk";
3745	BDB::db_env_txn_checkpoint $DB_ENV;	3857	BDB::db_env_txn_checkpoint $DB_ENV;
3746		3858
3747	# if anything goes wrong in here, we should simply crash as we already saved	3859	# if anything goes wrong in here, we should simply crash as we already saved
3748		3860
3749	warn "flushing outstanding aio requests";	3861	trace "flushing outstanding aio requests";
3750	while (IO::AIO::nreqs || BDB::nreqs) {	3862	while (IO::AIO::nreqs || BDB::nreqs) {
3751	Coro::EV::timer_once 0.01; # let the sync_job do it's thing	3863	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3752	}	3864	}
3753		3865
3754	warn "cancelling all extension coros";	3866	trace "cancelling all extension coros";
3755	$_->cancel for values %EXT_CORO;	3867	$_->cancel for values %EXT_CORO;
3756	%EXT_CORO = ();	3868	%EXT_CORO = ();
3757		3869
3758	warn "removing commands";	3870	trace "removing commands";
3759	%COMMAND = ();	3871	%COMMAND = ();
3760		3872
3761	warn "removing ext/exti commands";	3873	trace "removing ext/exti commands";
3762	%EXTCMD = ();	3874	%EXTCMD = ();
3763	%EXTICMD = ();	3875	%EXTICMD = ();
3764		3876
3765	warn "unloading/nuking all extensions";	3877	trace "unloading/nuking all extensions";
3766	for my $pkg (@EXTS) {	3878	for my $pkg (@EXTS) {
3767	warn "... unloading $pkg";	3879	trace "... unloading $pkg";
3768		3880
3769	if (my $cb = $pkg->can ("unload")) {	3881	if (my $cb = $pkg->can ("unload")) {
3770	eval {	3882	eval {
3771	$cb->($pkg);	3883	$cb->($pkg);
3772	1	3884	1
3773	} or warn "$pkg unloaded, but with errors: $@";	3885	} or error "$pkg unloaded, but with errors: $@";
3774	}	3886	}
3775		3887
3776	warn "... clearing $pkg";	3888	trace "... clearing $pkg";
3777	clear_package $pkg;	3889	clear_package $pkg;
3778	}	3890	}
3779		3891
3780	warn "unloading all perl modules loaded from $LIBDIR";	3892	trace "unloading all perl modules loaded from $LIBDIR";
3781	while (my ($k, $v) = each %INC) {	3893	while (my ($k, $v) = each %INC) {
3782	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	3894	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3783		3895
3784	warn "... unloading $k";	3896	trace "... unloading $k";
3785	delete $INC{$k};	3897	delete $INC{$k};
3786		3898
3787	$k =~ s/\.pm$//;	3899	$k =~ s/\.pm$//;
3788	$k =~ s/\//::/g;	3900	$k =~ s/\//::/g;
3789		3901
…		…
3792	}	3904	}
3793		3905
3794	clear_package $k;	3906	clear_package $k;
3795	}	3907	}
3796		3908
3797	warn "getting rid of safe::, as good as possible";	3909	trace "getting rid of safe::, as good as possible";
3798	clear_package "safe::$_"	3910	clear_package "safe::$_"
3799	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	3911	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3800		3912
3801	warn "unloading cf.pm \"a bit\"";	3913	trace "unloading cf.pm \"a bit\"";
3802	delete $INC{"cf.pm"};	3914	delete $INC{"cf.pm"};
3803	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	3915	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3804		3916
3805	# don't, removes xs symbols, too,	3917	# don't, removes xs symbols, too,
3806	# and global variables created in xs	3918	# and global variables created in xs
3807	#clear_package __PACKAGE__;	3919	#clear_package __PACKAGE__;
3808		3920
3809	warn "unload completed, starting to reload now";	3921	info "unload completed, starting to reload now";
3810		3922
3811	warn "reloading cf.pm";	3923	trace "reloading cf.pm";
3812	require cf;	3924	require cf;
3813	cf::_connect_to_perl_1;	3925	cf::_connect_to_perl_1;
3814		3926
3815	warn "loading config and database again";	3927	trace "loading config and database again";
3816	cf::reload_config;	3928	cf::reload_config;
3817		3929
3818	warn "loading extensions";	3930	trace "loading extensions";
3819	cf::load_extensions;	3931	cf::load_extensions;
3820		3932
3821	if ($REATTACH_ON_RELOAD) {	3933	if ($REATTACH_ON_RELOAD) {
3822	warn "reattaching attachments to objects/players";	3934	trace "reattaching attachments to objects/players";
3823	_global_reattach; # objects, sockets	3935	_global_reattach; # objects, sockets
3824	warn "reattaching attachments to maps";	3936	trace "reattaching attachments to maps";
3825	reattach $_ for values %MAP;	3937	reattach $_ for values %MAP;
3826	warn "reattaching attachments to players";	3938	trace "reattaching attachments to players";
3827	reattach $_ for values %PLAYER;	3939	reattach $_ for values %PLAYER;
3828	}	3940	}
3829		3941
3830	warn "running post_init jobs";	3942	trace "running post_init jobs";
3831	(pop @POST_INIT)->(1) while @POST_INIT;	3943	(pop @POST_INIT)->(1) while @POST_INIT;
3832		3944
3833	warn "leaving sync_job";	3945	trace "leaving sync_job";
3834		3946
3835	1	3947	1
3836	} or do {	3948	} or do {
3837	warn $@;	3949	error $@;
3838	cf::cleanup "error while reloading, exiting.";	3950	cf::cleanup "error while reloading, exiting.";
3839	};	3951	};
3840		3952
3841	warn "reloaded";	3953	info "reloaded";
3842	--$RELOAD;	3954	--$RELOAD;
3843	}	3955	}
3844		3956
3845	$t1 = EV::time - $t1;	3957	$t1 = AE::time - $t1;
3846	warn "reload completed in ${t1}s\n";	3958	info "reload completed in ${t1}s\n";
3847	};	3959	};
3848		3960
3849	our $RELOAD_WATCHER; # used only during reload	3961	our $RELOAD_WATCHER; # used only during reload
3850		3962
3851	sub reload_perl() {	3963	sub reload_perl() {
…		…
3853	# coro crashes during coro_state_free->destroy here.	3965	# coro crashes during coro_state_free->destroy here.
3854		3966
3855	$RELOAD_WATCHER ||= cf::async {	3967	$RELOAD_WATCHER ||= cf::async {
3856	Coro::AIO::aio_wait cache_extensions;	3968	Coro::AIO::aio_wait cache_extensions;
3857		3969
3858	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {	3970	$RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3859	do_reload_perl;	3971	do_reload_perl;
3860	undef $RELOAD_WATCHER;	3972	undef $RELOAD_WATCHER;
3861	};	3973	};
3862	};	3974	};
3863	}	3975	}
…		…
3880		3992
3881	our @WAIT_FOR_TICK;	3993	our @WAIT_FOR_TICK;
3882	our @WAIT_FOR_TICK_BEGIN;	3994	our @WAIT_FOR_TICK_BEGIN;
3883		3995
3884	sub wait_for_tick {	3996	sub wait_for_tick {
3885	return if tick_inhibit || $Coro::current == $Coro::main;	3997	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3886		3998
3887	my $signal = new Coro::Signal;	3999	my $signal = new Coro::Signal;
3888	push @WAIT_FOR_TICK, $signal;	4000	push @WAIT_FOR_TICK, $signal;
3889	$signal->wait;	4001	$signal->wait;
3890	}	4002	}
3891		4003
3892	sub wait_for_tick_begin {	4004	sub wait_for_tick_begin {
3893	return if tick_inhibit || $Coro::current == $Coro::main;	4005	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3894		4006
3895	my $signal = new Coro::Signal;	4007	my $signal = new Coro::Signal;
3896	push @WAIT_FOR_TICK_BEGIN, $signal;	4008	push @WAIT_FOR_TICK_BEGIN, $signal;
3897	$signal->wait;	4009	$signal->wait;
3898	}	4010	}
…		…
3904	return;	4016	return;
3905	}	4017	}
3906		4018
3907	cf::server_tick; # one server iteration	4019	cf::server_tick; # one server iteration
3908		4020
		4021	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
		4022
3909	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4023	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3910	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4024	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3911	Coro::async_pool {	4025	Coro::async_pool {
3912	$Coro::current->{desc} = "runtime saver";	4026	$Coro::current->{desc} = "runtime saver";
3913	write_runtime_sync	4027	write_runtime_sync
3914	or warn "ERROR: unable to write runtime file: $!";	4028	or error "ERROR: unable to write runtime file: $!";
3915	};	4029	};
3916	}	4030	}
3917		4031
3918	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4032	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3919	$sig->send;	4033	$sig->send;
…		…
3927		4041
3928	if (0) {	4042	if (0) {
3929	if ($NEXT_TICK) {	4043	if ($NEXT_TICK) {
3930	my $jitter = $TICK_START - $NEXT_TICK;	4044	my $jitter = $TICK_START - $NEXT_TICK;
3931	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4045	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
3932	warn "jitter $JITTER\n";#d#	4046	debug "jitter $JITTER\n";#d#
3933	}	4047	}
3934	}	4048	}
3935	}	4049	}
3936		4050
3937	{	4051	{
3938	# configure BDB	4052	# configure BDB
3939		4053
3940	BDB::min_parallel 8;	4054	BDB::min_parallel 16;
3941	BDB::max_poll_reqs $TICK * 0.1;	4055	BDB::max_poll_reqs $TICK * 0.1;
3942	$AnyEvent::BDB::WATCHER->priority (1);	4056	$AnyEvent::BDB::WATCHER->priority (1);
3943		4057
3944	unless ($DB_ENV) {	4058	unless ($DB_ENV) {
3945	$DB_ENV = BDB::db_env_create;	4059	$DB_ENV = BDB::db_env_create;

Diff Legend

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