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.532 by root, Thu Apr 29 07:32:34 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.
…		…
32	use EV;	32	use EV;
33	use Opcode;	33	use Opcode;
34	use Safe;	34	use Safe;
35	use Safe::Hole;	35	use Safe::Hole;
36	use Storable ();	36	use Storable ();
		37	use Carp ();
37		38
38	use Guard ();	39	use Guard ();
39	use Coro ();	40	use Coro ();
40	use Coro::State;	41	use Coro::State;
41	use Coro::Handle;	42	use Coro::Handle;
…		…
52	use Coro::Util ();	53	use Coro::Util ();
53		54
54	use JSON::XS 2.01 ();	55	use JSON::XS 2.01 ();
55	use BDB ();	56	use BDB ();
56	use Data::Dumper;	57	use Data::Dumper;
57	use Digest::MD5;
58	use Fcntl;	58	use Fcntl;
59	use YAML::XS ();	59	use YAML::XS ();
60	use IO::AIO ();	60	use IO::AIO ();
61	use Time::HiRes;	61	use Time::HiRes;
62	use Compress::LZF;	62	use Compress::LZF;
…		…
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 $_;
…		…
228	returns directly I<after> the tick processing (and consequently, can only wake one process	238	returns directly I<after> the tick processing (and consequently, can only wake one process
229	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	239	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
230		240
231	=item @cf::INVOKE_RESULTS	241	=item @cf::INVOKE_RESULTS
232		242
233	This array contains the results of the last C<invoke ()> call. When	243	This array contains the results of the last C<invoke ()> call. When
234	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of	244	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
235	that call.	245	that call.
236		246
237	=item %cf::REFLECT	247	=item %cf::REFLECT
238		248
…		…
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
…		…
289	)) {	305	)) {
290	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	306	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
291	}	307	}
292		308
293	$EV::DIED = sub {	309	$EV::DIED = sub {
294	warn "error in event callback: @_";	310	Carp::cluck "error in event callback: @_";
295	};	311	};
296		312
297	#############################################################################	313	#############################################################################
298		314
299	=head2 UTILITY FUNCTIONS	315	=head2 UTILITY FUNCTIONS
…		…
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;
…		…
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 ($Coro::current == $Coro::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#
…		…
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
…		…
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;
…		…
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";
1412		1454
1413	if (exists $v->{meta}{mandatory}) {
1414	warn $msg;
1415	cf::cleanup "mandatory extension failed to load, exiting.";	1455	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1416	}	1456	if exists $v->{meta}{mandatory};
1417		1457
1418	warn $msg;	1458	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
		1459	delete $todo{$k};
		1460	} else {
		1461	$done{$k} = delete $todo{$k};
		1462	push @EXTS, $v->{pkg};
		1463	$progress = 1;
		1464
		1465	info "$v->{base}: extension inactive.\n"
		1466	unless $active;
1419	}	1467	}
1420
1421	$done{$k} = delete $todo{$k};
1422	push @EXTS, $v->{pkg};
1423	$progress = 1;
1424	}	1468	}
1425		1469
1426	skip:	1470	unless ($progress) {
1427	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"	1471	warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1428	unless $progress;	1472
		1473	while (my ($k, $v) = each %todo) {
		1474	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
		1475	if exists $v->{meta}{mandatory};
		1476	}
		1477	}
1429	}	1478	}
1430	};	1479	};
1431	}	1480	}
1432		1481
1433	#############################################################################	1482	#############################################################################
…		…
1517	$cf::PLAYER{$login} = $pl	1566	$cf::PLAYER{$login} = $pl
1518	}	1567	}
1519	}	1568	}
1520	}	1569	}
1521		1570
		1571	cf::player->attach (
		1572	on_load => sub {
		1573	my ($pl, $path) = @_;
		1574
		1575	# restore slots saved in save, below
		1576	my $slots = delete $pl->{_slots};
		1577
		1578	$pl->ob->current_weapon ($slots->[0]);
		1579	$pl->combat_ob ($slots->[1]);
		1580	$pl->ranged_ob ($slots->[2]);
		1581	},
		1582	);
		1583
1522	sub save($) {	1584	sub save($) {
1523	my ($pl) = @_;	1585	my ($pl) = @_;
1524		1586
1525	return if $pl->{deny_save};	1587	return if $pl->{deny_save};
1526		1588
…		…
1531		1593
1532	aio_mkdir playerdir $pl, 0770;	1594	aio_mkdir playerdir $pl, 0770;
1533	$pl->{last_save} = $cf::RUNTIME;	1595	$pl->{last_save} = $cf::RUNTIME;
1534		1596
1535	cf::get_slot 0.01;	1597	cf::get_slot 0.01;
		1598
		1599	# save slots, to be restored later
		1600	local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1536		1601
1537	$pl->save_pl ($path);	1602	$pl->save_pl ($path);
1538	cf::cede_to_tick;	1603	cf::cede_to_tick;
1539	}	1604	}
1540		1605
…		…
1577	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1642	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1578		1643
1579	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1644	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1580	$pl->deactivate;	1645	$pl->deactivate;
1581	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1646	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1582	$pl->ob->check_score;
1583	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1647	$pl->invoke (cf::EVENT_PLAYER_QUIT);
1584	$pl->ns->destroy if $pl->ns;	1648	$pl->ns->destroy if $pl->ns;
1585		1649
1586	my $path = playerdir $pl;	1650	my $path = playerdir $pl;
1587	my $temp = "$path~$cf::RUNTIME~deleting~";	1651	my $temp = "$path~$cf::RUNTIME~deleting~";
…		…
1642	\@logins	1706	\@logins
1643	}	1707	}
1644		1708
1645	=item $player->maps	1709	=item $player->maps
1646		1710
		1711	=item cf::player::maps $login
		1712
1647	Returns an arrayref of map paths that are private for this	1713	Returns an arrayref of map paths that are private for this
1648	player. May block.	1714	player. May block.
1649		1715
1650	=cut	1716	=cut
1651		1717
…		…
1713	=cut	1779	=cut
1714		1780
1715	sub find_by_path($) {	1781	sub find_by_path($) {
1716	my ($path) = @_;	1782	my ($path) = @_;
1717		1783
		1784	$path =~ s/^~[^\/]*//; # skip ~login
		1785
1718	my ($match, $specificity);	1786	my ($match, $specificity);
1719		1787
1720	for my $region (list) {	1788	for my $region (list) {
1721	if ($region->{match} && $path =~ $region->{match}) {	1789	if ($region->{match} && $path =~ $region->{match}) {
1722	($match, $specificity) = ($region, $region->specificity)	1790	($match, $specificity) = ($region, $region->specificity)
…		…
1753	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	1821	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1754		1822
1755	# mit "rum" bekleckern, nicht	1823	# mit "rum" bekleckern, nicht
1756	$self->_create_random_map (	1824	$self->_create_random_map (
1757	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},	1825	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1758	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},	1826	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1759	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},	1827	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1760	$rmp->{exit_on_final_map},	1828	$rmp->{exit_on_final_map},
1761	$rmp->{xsize}, $rmp->{ysize},	1829	$rmp->{xsize}, $rmp->{ysize},
1762	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},	1830	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1763	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},	1831	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
…		…
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
…		…
2163	$MAP_PREFETCHER->prio (6);	2235	$MAP_PREFETCHER->prio (6);
2164		2236
2165	()	2237	()
2166	}	2238	}
2167		2239
		2240	# common code, used by both ->save and ->swapout
2168	sub save {	2241	sub _save {
2169	my ($self) = @_;	2242	my ($self) = @_;
2170
2171	my $lock = cf::lock_acquire "map_data:$self->{path}";
2172		2243
2173	$self->{last_save} = $cf::RUNTIME;	2244	$self->{last_save} = $cf::RUNTIME;
2174		2245
2175	return unless $self->dirty;	2246	return unless $self->dirty;
2176		2247
…		…
2196	} else {	2267	} else {
2197	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);	2268	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2198	}	2269	}
2199	}	2270	}
2200		2271
		2272	sub save {
		2273	my ($self) = @_;
		2274
		2275	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2276
		2277	$self->_save;
		2278	}
		2279
2201	sub swap_out {	2280	sub swap_out {
2202	my ($self) = @_;	2281	my ($self) = @_;
2203		2282
2204	# save first because save cedes
2205	$self->save;
2206
2207	my $lock = cf::lock_acquire "map_data:$self->{path}";	2283	my $lock = cf::lock_acquire "map_data:$self->{path}";
2208		2284
2209	return if $self->players;
2210	return if $self->in_memory != cf::MAP_ACTIVE;	2285	return if $self->in_memory != cf::MAP_ACTIVE;
2211	return if $self->{deny_save};	2286	return if $self->{deny_save};
		2287	return if $self->players;
2212		2288
		2289	# first deactivate the map and "unlink" it from the core
		2290	$self->deactivate;
		2291	$_->clear_links_to ($self) for values %cf::MAP;
2213	$self->in_memory (cf::MAP_SWAPPED);	2292	$self->in_memory (cf::MAP_SWAPPED);
		2293
		2294	# then atomically save
		2295	$self->_save;
		2296
		2297	# then free the map
		2298	$self->clear;
		2299	}
		2300
		2301	sub reset_at {
		2302	my ($self) = @_;
		2303
		2304	# TODO: safety, remove and allow resettable per-player maps
		2305	return 1e99 if $self->{deny_reset};
		2306
		2307	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
		2308	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
		2309
		2310	$time + $to
		2311	}
		2312
		2313	sub should_reset {
		2314	my ($self) = @_;
		2315
		2316	$self->reset_at <= $cf::RUNTIME
		2317	}
		2318
		2319	sub reset {
		2320	my ($self) = @_;
		2321
		2322	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2323
		2324	return if $self->players;
		2325
		2326	cf::trace "resetting map ", $self->path, "\n";
		2327
		2328	$self->in_memory (cf::MAP_SWAPPED);
		2329
		2330	# need to save uniques path
		2331	unless ($self->{deny_save}) {
		2332	my $uniq = $self->uniq_path; utf8::encode $uniq;
		2333
		2334	$self->_save_objects ($uniq, cf::IO_UNIQUES)
		2335	if $uniq;
		2336	}
		2337
		2338	delete $cf::MAP{$self->path};
2214		2339
2215	$self->deactivate;	2340	$self->deactivate;
2216	$_->clear_links_to ($self) for values %cf::MAP;	2341	$_->clear_links_to ($self) for values %cf::MAP;
2217	$self->clear;	2342	$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		2343
2263	$self->unlink_save;	2344	$self->unlink_save;
2264	$self->destroy;	2345	$self->destroy;
2265	}	2346	}
2266		2347
…		…
2274		2355
2275	delete $cf::MAP{$self->path};	2356	delete $cf::MAP{$self->path};
2276		2357
2277	$self->unlink_save;	2358	$self->unlink_save;
2278		2359
2279	bless $self, "cf::map";	2360	bless $self, "cf::map::wrap";
2280	delete $self->{deny_reset};	2361	delete $self->{deny_reset};
2281	$self->{deny_save} = 1;	2362	$self->{deny_save} = 1;
2282	$self->reset_timeout (1);	2363	$self->reset_timeout (1);
2283	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2364	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2284		2365
…		…
2341	: normalise $_	2422	: normalise $_
2342	} @{ aio_readdir $UNIQUEDIR or [] }	2423	} @{ aio_readdir $UNIQUEDIR or [] }
2343	]	2424	]
2344	}	2425	}
2345		2426
		2427	=item cf::map::static_maps
		2428
		2429	Returns an arrayref if paths of all static maps (all preinstalled F<.map>
		2430	file in the shared directory excluding F</styles> and F</editor>). May
		2431	block.
		2432
		2433	=cut
		2434
		2435	sub static_maps() {
		2436	my @dirs = "";
		2437	my @maps;
		2438
		2439	while (@dirs) {
		2440	my $dir = shift @dirs;
		2441
		2442	next if $dir eq "/styles" || $dir eq "/editor";
		2443
		2444	my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
		2445	or return;
		2446
		2447	for (@$files) {
		2448	s/\.map$// or next;
		2449	utf8::decode $_;
		2450	push @maps, "$dir/$_";
		2451	}
		2452
		2453	push @dirs, map "$dir/$_", @$dirs;
		2454	}
		2455
		2456	\@maps
		2457	}
		2458
2346	=back	2459	=back
2347		2460
2348	=head3 cf::object	2461	=head3 cf::object
2349		2462
2350	=cut	2463	=cut
…		…
2482		2595
2483	Freezes the player and moves him/her to a special map (C<{link}>).	2596	Freezes the player and moves him/her to a special map (C<{link}>).
2484		2597
2485	The player should be reasonably safe there for short amounts of time (e.g.	2598	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,	2599	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	2600	though, as the player cannot control the character while it is on the link
2488	map.	2601	map.
2489		2602
2490	Will never block.	2603	Will never block.
2491		2604
2492	=item $player_object->leave_link ($map, $x, $y)	2605	=item $player_object->leave_link ($map, $x, $y)
…		…
2513	sub cf::object::player::enter_link {	2626	sub cf::object::player::enter_link {
2514	my ($self) = @_;	2627	my ($self) = @_;
2515		2628
2516	$self->deactivate_recursive;	2629	$self->deactivate_recursive;
2517		2630
		2631	++$self->{_link_recursion};
		2632
2518	return if UNIVERSAL::isa $self->map, "ext::map_link";	2633	return if UNIVERSAL::isa $self->map, "ext::map_link";
2519		2634
2520	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2635	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2521	if $self->map && $self->map->{path} ne "{link}";	2636	if $self->map && $self->map->{path} ne "{link}";
2522		2637
2523	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2638	$self->enter_map ($LINK_MAP || link_map, 3, 3);
2524	}	2639	}
2525		2640
2526	sub cf::object::player::leave_link {	2641	sub cf::object::player::leave_link {
2527	my ($self, $map, $x, $y) = @_;	2642	my ($self, $map, $x, $y) = @_;
2528		2643
…		…
2545	($x, $y) = (-1, -1)	2660	($x, $y) = (-1, -1)
2546	unless (defined $x) && (defined $y);	2661	unless (defined $x) && (defined $y);
2547		2662
2548	# use -1 or undef as default coordinates, not 0, 0	2663	# use -1 or undef as default coordinates, not 0, 0
2549	($x, $y) = ($map->enter_x, $map->enter_y)	2664	($x, $y) = ($map->enter_x, $map->enter_y)
2550	if $x <=0 && $y <= 0;	2665	if $x <= 0 && $y <= 0;
2551		2666
2552	$map->load;	2667	$map->load;
2553	$map->load_neighbours;	2668	$map->load_neighbours;
2554		2669
2555	return unless $self->contr->active;	2670	return unless $self->contr->active;
2556		2671
2557	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2672	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2558	$self->enter_map ($map, $x, $y);	2673	if ($self->enter_map ($map, $x, $y)) {
2559		2674	# entering was successful
		2675	delete $self->{_link_recursion};
2560	# only activate afterwards, to support waiting in hooks	2676	# only activate afterwards, to support waiting in hooks
2561	$self->activate_recursive;	2677	$self->activate_recursive;
2562	}	2678	}
2563		2679
		2680	}
		2681
2564	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2682	=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2565		2683
2566	Moves the player to the given map-path and coordinates by first freezing	2684	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	2685	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	2686	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	2687	the new (success) or old (failed) map position. In either case, $done will
…		…
2576		2694
2577	our $GOTOGEN;	2695	our $GOTOGEN;
2578		2696
2579	sub cf::object::player::goto {	2697	sub cf::object::player::goto {
2580	my ($self, $path, $x, $y, $check, $done) = @_;	2698	my ($self, $path, $x, $y, $check, $done) = @_;
		2699
		2700	if ($self->{_link_recursion} >= $MAX_LINKS) {
		2701	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
		2702	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
		2703	($path, $x, $y) = @$EMERGENCY_POSITION;
		2704	}
2581		2705
2582	# do generation counting so two concurrent goto's will be executed in-order	2706	# do generation counting so two concurrent goto's will be executed in-order
2583	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2707	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2584		2708
2585	$self->enter_link;	2709	$self->enter_link;
…		…
2609	my $map = eval {	2733	my $map = eval {
2610	my $map = defined $path ? cf::map::find $path : undef;	2734	my $map = defined $path ? cf::map::find $path : undef;
2611		2735
2612	if ($map) {	2736	if ($map) {
2613	$map = $map->customise_for ($self);	2737	$map = $map->customise_for ($self);
2614	$map = $check->($map) if $check && $map;	2738	$map = $check->($map, $x, $y, $self) if $check && $map;
2615	} else {	2739	} else {
2616	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);	2740	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2617	}	2741	}
2618		2742
2619	$map	2743	$map
…		…
2627	if ($gen == $self->{_goto_generation}) {	2751	if ($gen == $self->{_goto_generation}) {
2628	delete $self->{_goto_generation};	2752	delete $self->{_goto_generation};
2629	$self->leave_link ($map, $x, $y);	2753	$self->leave_link ($map, $x, $y);
2630	}	2754	}
2631		2755
2632	$done->() if $done;	2756	$done->($self) if $done;
2633	})->prio (1);	2757	})->prio (1);
2634	}	2758	}
2635		2759
2636	=item $player_object->enter_exit ($exit_object)	2760	=item $player_object->enter_exit ($exit_object)
2637		2761
…		…
2730	$self->message ("Something went wrong deep within the deliantra server. "	2854	$self->message ("Something went wrong deep within the deliantra server. "
2731	. "I'll try to bring you back to the map you were before. "	2855	. "I'll try to bring you back to the map you were before. "
2732	. "Please report this to the dungeon master!",	2856	. "Please report this to the dungeon master!",
2733	cf::NDI_UNIQUE | cf::NDI_RED);	2857	cf::NDI_UNIQUE | cf::NDI_RED);
2734		2858
2735	warn "ERROR in enter_exit: $@";	2859	error "ERROR in enter_exit: $@";
2736	$self->leave_link;	2860	$self->leave_link;
2737	}	2861	}
2738	})->prio (1);	2862	})->prio (1);
2739	}	2863	}
2740		2864
…		…
2752	sub cf::client::send_drawinfo {	2876	sub cf::client::send_drawinfo {
2753	my ($self, $text, $flags) = @_;	2877	my ($self, $text, $flags) = @_;
2754		2878
2755	utf8::encode $text;	2879	utf8::encode $text;
2756	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2880	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
		2881	}
		2882
		2883	=item $client->send_big_packet ($pkt)
		2884
		2885	Like C<send_packet>, but tries to compress large packets, and fragments
		2886	them as required.
		2887
		2888	=cut
		2889
		2890	our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
		2891
		2892	sub cf::client::send_big_packet {
		2893	my ($self, $pkt) = @_;
		2894
		2895	# try lzf for large packets
		2896	$pkt = "lzf " . Compress::LZF::compress $pkt
		2897	if 1024 <= length $pkt and $self->{can_lzf};
		2898
		2899	# split very large packets
		2900	if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
		2901	$self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
		2902	$pkt = "frag";
		2903	}
		2904
		2905	$self->send_packet ($pkt);
2757	}	2906	}
2758		2907
2759	=item $client->send_msg ($channel, $msg, $color, [extra...])	2908	=item $client->send_msg ($channel, $msg, $color, [extra...])
2760		2909
2761	Send a drawinfo or msg packet to the client, formatting the msg for the	2910	Send a drawinfo or msg packet to the client, formatting the msg for the
…		…
2782	"c/examine" => {	2931	"c/examine" => {
2783	id => "infobox",	2932	id => "infobox",
2784	title => "Examine",	2933	title => "Examine",
2785	reply => undef,	2934	reply => undef,
2786	tooltip => "Signs and other items you examined",	2935	tooltip => "Signs and other items you examined",
		2936	},
		2937	"c/shopinfo" => {
		2938	id => "infobox",
		2939	title => "Shop Info",
		2940	reply => undef,
		2941	tooltip => "What your bargaining skill tells you about the shop",
2787	},	2942	},
2788	"c/book" => {	2943	"c/book" => {
2789	id => "infobox",	2944	id => "infobox",
2790	title => "Book",	2945	title => "Book",
2791	reply => undef,	2946	reply => undef,
…		…
2907	my $pkt = "msg "	3062	my $pkt = "msg "
2908	. $self->{json_coder}->encode (	3063	. $self->{json_coder}->encode (
2909	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]	3064	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2910	);	3065	);
2911		3066
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);	3067	$self->send_big_packet ($pkt);
2923	}	3068	}
2924		3069
2925	=item $client->ext_msg ($type, @msg)	3070	=item $client->ext_msg ($type, @msg)
2926		3071
2927	Sends an ext event to the client.	3072	Sends an ext event to the client.
…		…
2930		3075
2931	sub cf::client::ext_msg($$@) {	3076	sub cf::client::ext_msg($$@) {
2932	my ($self, $type, @msg) = @_;	3077	my ($self, $type, @msg) = @_;
2933		3078
2934	if ($self->extcmd == 2) {	3079	if ($self->extcmd == 2) {
2935	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3080	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2936	} elsif ($self->extcmd == 1) { # TODO: remove	3081	} elsif ($self->extcmd == 1) { # TODO: remove
2937	push @msg, msgtype => "event_$type";	3082	push @msg, msgtype => "event_$type";
2938	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3083	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2939	}	3084	}
2940	}	3085	}
2941		3086
2942	=item $client->ext_reply ($msgid, @msg)	3087	=item $client->ext_reply ($msgid, @msg)
2943		3088
…		…
2947		3092
2948	sub cf::client::ext_reply($$@) {	3093	sub cf::client::ext_reply($$@) {
2949	my ($self, $id, @msg) = @_;	3094	my ($self, $id, @msg) = @_;
2950		3095
2951	if ($self->extcmd == 2) {	3096	if ($self->extcmd == 2) {
2952	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));	3097	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2953	} elsif ($self->extcmd == 1) {	3098	} elsif ($self->extcmd == 1) {
2954	#TODO: version 1, remove	3099	#TODO: version 1, remove
2955	unshift @msg, msgtype => "reply", msgid => $id;	3100	unshift @msg, msgtype => "reply", msgid => $id;
2956	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3101	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2957	}	3102	}
2958	}	3103	}
2959		3104
2960	=item $success = $client->query ($flags, "text", \&cb)	3105	=item $success = $client->query ($flags, "text", \&cb)
2961		3106
…		…
3032		3177
3033	$ns->ext_reply ($reply, @reply)	3178	$ns->ext_reply ($reply, @reply)
3034	if $reply;	3179	if $reply;
3035		3180
3036	} else {	3181	} else {
3037	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3182	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3038	}	3183	}
3039		3184
3040	cf::override;	3185	cf::override;
3041	},	3186	},
3042	);	3187	);
…		…
3062		3207
3063	$coro	3208	$coro
3064	}	3209	}
3065		3210
3066	cf::client->attach (	3211	cf::client->attach (
3067	on_destroy => sub {	3212	on_client_destroy => sub {
3068	my ($ns) = @_;	3213	my ($ns) = @_;
3069		3214
3070	$_->cancel for values %{ (delete $ns->{_coro}) || {} };	3215	$_->cancel for values %{ (delete $ns->{_coro}) || {} };
3071	},	3216	},
3072	);	3217	);
…		…
3088	our $safe_hole = new Safe::Hole;	3233	our $safe_hole = new Safe::Hole;
3089		3234
3090	$SIG{FPE} = 'IGNORE';	3235	$SIG{FPE} = 'IGNORE';
3091		3236
3092	$safe->permit_only (Opcode::opset qw(	3237	$safe->permit_only (Opcode::opset qw(
3093	:base_core :base_mem :base_orig :base_math	3238	:base_core :base_mem :base_orig :base_math :base_loop
3094	grepstart grepwhile mapstart mapwhile	3239	grepstart grepwhile mapstart mapwhile
3095	sort time	3240	sort time
3096	));	3241	));
3097		3242
3098	# here we export the classes and methods available to script code	3243	# here we export the classes and methods available to script code
…		…
3150	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3295	$qcode =~ s/"/‟/g; # not allowed in #line filenames
3151	$qcode =~ s/\n/\\n/g;	3296	$qcode =~ s/\n/\\n/g;
3152		3297
3153	%vars = (_dummy => 0) unless %vars;	3298	%vars = (_dummy => 0) unless %vars;
3154		3299
		3300	my @res;
3155	local $_;	3301	local $_;
3156	local @safe::cf::_safe_eval_args = values %vars;
3157		3302
3158	my $eval =	3303	my $eval =
3159	"do {\n"	3304	"do {\n"
3160	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"	3305	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3161	. "#line 0 \"{$qcode}\"\n"	3306	. "#line 0 \"{$qcode}\"\n"
3162	. $code	3307	. $code
3163	. "\n}"	3308	. "\n}"
3164	;	3309	;
3165		3310
		3311	if ($CFG{safe_eval}) {
3166	sub_generation_inc;	3312	sub_generation_inc;
		3313	local @safe::cf::_safe_eval_args = values %vars;
3167	my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);	3314	@res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3168	sub_generation_inc;	3315	sub_generation_inc;
		3316	} else {
		3317	local @cf::_safe_eval_args = values %vars;
		3318	@res = wantarray ? eval eval : scalar eval $eval;
		3319	}
3169		3320
3170	if ($@) {	3321	if ($@) {
3171	warn "$@";	3322	warn "$@",
3172	warn "while executing safe code '$code'\n";	3323	"while executing safe code '$code'\n",
3173	warn "with arguments " . (join " ", %vars) . "\n";	3324	"with arguments " . (join " ", %vars) . "\n";
3174	}	3325	}
3175		3326
3176	wantarray ? @res : $res[0]	3327	wantarray ? @res : $res[0]
3177	}	3328	}
3178		3329
…		…
3192	=cut	3343	=cut
3193		3344
3194	sub register_script_function {	3345	sub register_script_function {
3195	my ($fun, $cb) = @_;	3346	my ($fun, $cb) = @_;
3196		3347
3197	no strict 'refs';	3348	$fun = "safe::$fun" if $CFG{safe_eval};
3198	*{"safe::$fun"} = $safe_hole->wrap ($cb);	3349	*$fun = $safe_hole->wrap ($cb);
3199	}	3350	}
3200		3351
3201	=back	3352	=back
3202		3353
3203	=cut	3354	=cut
…		…
3212	# for this (global event?)	3363	# for this (global event?)
3213	%ext::player_env::MUSIC_FACE_CACHE = ();	3364	%ext::player_env::MUSIC_FACE_CACHE = ();
3214		3365
3215	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3366	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3216		3367
3217	warn "loading facedata from $path\n";	3368	trace "loading facedata from $path\n";
3218		3369
3219	my $facedata;	3370	my $facedata;
3220	0 < aio_load $path, $facedata	3371	0 < aio_load $path, $facedata
3221	or die "$path: $!";	3372	or die "$path: $!";
3222		3373
…		…
3224		3375
3225	$facedata->{version} == 2	3376	$facedata->{version} == 2
3226	or cf::cleanup "$path: version mismatch, cannot proceed.";	3377	or cf::cleanup "$path: version mismatch, cannot proceed.";
3227		3378
3228	# patch in the exptable	3379	# patch in the exptable
		3380	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3229	$facedata->{resource}{"res/exp_table"} = {	3381	$facedata->{resource}{"res/exp_table"} = {
3230	type => FT_RSRC,	3382	type => FT_RSRC,
3231	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),	3383	data => $exp_table,
		3384	hash => (Digest::MD5::md5 $exp_table),
3232	};	3385	};
3233	cf::cede_to_tick;	3386	cf::cede_to_tick;
3234		3387
3235	{	3388	{
3236	my $faces = $facedata->{faceinfo};	3389	my $faces = $facedata->{faceinfo};
…		…
3238	while (my ($face, $info) = each %$faces) {	3391	while (my ($face, $info) = each %$faces) {
3239	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3392	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3240		3393
3241	cf::face::set_visibility $idx, $info->{visibility};	3394	cf::face::set_visibility $idx, $info->{visibility};
3242	cf::face::set_magicmap $idx, $info->{magicmap};	3395	cf::face::set_magicmap $idx, $info->{magicmap};
3243	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};	3396	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3244	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};	3397	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3245		3398
3246	cf::cede_to_tick;	3399	cf::cede_to_tick;
3247	}	3400	}
3248		3401
3249	while (my ($face, $info) = each %$faces) {	3402	while (my ($face, $info) = each %$faces) {
…		…
3254		3407
3255	if (my $smooth = cf::face::find $info->{smooth}) {	3408	if (my $smooth = cf::face::find $info->{smooth}) {
3256	cf::face::set_smooth $idx, $smooth;	3409	cf::face::set_smooth $idx, $smooth;
3257	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3410	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3258	} else {	3411	} else {
3259	warn "smooth face '$info->{smooth}' not found for face '$face'";	3412	error "smooth face '$info->{smooth}' not found for face '$face'";
3260	}	3413	}
3261		3414
3262	cf::cede_to_tick;	3415	cf::cede_to_tick;
3263	}	3416	}
3264	}	3417	}
…		…
3273		3426
3274	cf::anim::invalidate_all; # d'oh	3427	cf::anim::invalidate_all; # d'oh
3275	}	3428	}
3276		3429
3277	{	3430	{
3278	# TODO: for gcfclient pleasure, we should give resources
3279	# that gcfclient doesn't grok a >10000 face index.
3280	my $res = $facedata->{resource};	3431	my $res = $facedata->{resource};
3281		3432
3282	while (my ($name, $info) = each %$res) {	3433	while (my ($name, $info) = each %$res) {
3283	if (defined $info->{type}) {	3434	if (defined $info->{type}) {
3284	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3435	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3285	my $data;
3286		3436
3287	if ($info->{type} & 1) {	3437	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};	3438	cf::face::set_type $idx, $info->{type};
3302	} else {	3439	} else {
3303	$RESOURCE{$name} = $info;	3440	$RESOURCE{$name} = $info; # unused
3304	}	3441	}
3305		3442
3306	cf::cede_to_tick;	3443	cf::cede_to_tick;
3307	}	3444	}
3308	}	3445	}
3309		3446
3310	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3447	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3311		3448
3312	1	3449	1
3313	}	3450	}
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		3451
3335	register_exticmd fx_want => sub {	3452	register_exticmd fx_want => sub {
3336	my ($ns, $want) = @_;	3453	my ($ns, $want) = @_;
3337		3454
3338	while (my ($k, $v) = each %$want) {	3455	while (my ($k, $v) = each %$want) {
…		…
3377	sub reload_treasures {	3494	sub reload_treasures {
3378	load_resource_file "$DATADIR/treasures"	3495	load_resource_file "$DATADIR/treasures"
3379	or die "unable to load treasurelists\n";	3496	or die "unable to load treasurelists\n";
3380	}	3497	}
3381		3498
		3499	sub reload_sound {
		3500	trace "loading sound config from $DATADIR/sound\n";
		3501
		3502	0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
		3503	or die "$DATADIR/sound $!";
		3504
		3505	my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
		3506
		3507	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3508	my $sound = $soundconf->{compat}[$_]
		3509	or next;
		3510
		3511	my $face = cf::face::find "sound/$sound->[1]";
		3512	cf::sound::set $sound->[0] => $face;
		3513	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3514	}
		3515
		3516	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3517	my $face = cf::face::find "sound/$v";
		3518	cf::sound::set $k => $face;
		3519	}
		3520	}
		3521
3382	sub reload_resources {	3522	sub reload_resources {
3383	warn "reloading resource files...\n";	3523	trace "reloading resource files...\n";
3384		3524
3385	reload_facedata;	3525	reload_facedata;
		3526	reload_sound;
3386	reload_archetypes;	3527	reload_archetypes;
3387	reload_regions;	3528	reload_regions;
3388	reload_treasures;	3529	reload_treasures;
3389		3530
3390	warn "finished reloading resource files\n";	3531	trace "finished reloading resource files\n";
3391	}	3532	}
3392		3533
3393	sub reload_config {	3534	sub reload_config {
3394	warn "reloading config file...\n";	3535	trace "reloading config file...\n";
3395		3536
3396	open my $fh, "<:utf8", "$CONFDIR/config"	3537	open my $fh, "<:utf8", "$CONFDIR/config"
3397	or return;	3538	or return;
3398		3539
3399	local $/;	3540	local $/;
3400	*CFG = YAML::XS::Load scalar <$fh>;	3541	*CFG = YAML::XS::Load scalar <$fh>;
3401		3542
3402	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3543	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3403		3544
3404	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3545	$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};	3546	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3406		3547
3407	if (exists $CFG{mlockall}) {	3548	if (exists $CFG{mlockall}) {
…		…
3410	and die "WARNING: m(un)lockall failed: $!\n";	3551	and die "WARNING: m(un)lockall failed: $!\n";
3411	};	3552	};
3412	warn $@ if $@;	3553	warn $@ if $@;
3413	}	3554	}
3414		3555
3415	warn "finished reloading resource files\n";	3556	trace "finished reloading resource files\n";
3416	}	3557	}
3417		3558
3418	sub pidfile() {	3559	sub pidfile() {
3419	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3560	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3420	or die "$PIDFILE: $!";	3561	or die "$PIDFILE: $!";
…		…
3433	seek $fh, 0, 0;	3574	seek $fh, 0, 0;
3434	print $fh $$;	3575	print $fh $$;
3435	}	3576	}
3436		3577
3437	sub main_loop {	3578	sub main_loop {
3438	warn "EV::loop starting\n";	3579	trace "EV::loop starting\n";
3439	if (1) {	3580	if (1) {
3440	EV::loop;	3581	EV::loop;
3441	}	3582	}
3442	warn "EV::loop returned\n";	3583	trace "EV::loop returned\n";
3443	goto &main_loop unless $REALLY_UNLOOP;	3584	goto &main_loop unless $REALLY_UNLOOP;
3444	}	3585	}
3445		3586
3446	sub main {	3587	sub main {
3447	cf::init_globals; # initialise logging	3588	cf::init_globals; # initialise logging
3448		3589
3449	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3590	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3450	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3591	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3451	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3592	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3452	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3593	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		3594
3459	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3595	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3460		3596
3461	# we must not ever block the main coroutine	3597	# we must not ever block the main coroutine
3462	local $Coro::idle = sub {	3598	local $Coro::idle = sub {
…		…
3468	};	3604	};
3469		3605
3470	evthread_start IO::AIO::poll_fileno;	3606	evthread_start IO::AIO::poll_fileno;
3471		3607
3472	cf::sync_job {	3608	cf::sync_job {
		3609	cf::init_experience;
		3610	cf::init_anim;
		3611	cf::init_attackmess;
		3612	cf::init_dynamic;
		3613
		3614	cf::load_settings;
		3615	cf::load_materials;
		3616
3473	reload_resources;	3617	reload_resources;
3474	reload_config;	3618	reload_config;
3475	db_init;	3619	db_init;
3476		3620
3477	cf::load_settings;
3478	cf::load_materials;
3479	cf::init_uuid;	3621	cf::init_uuid;
3480	cf::init_signals;	3622	cf::init_signals;
3481	cf::init_commands;
3482	cf::init_skills;	3623	cf::init_skills;
3483		3624
3484	cf::init_beforeplay;	3625	cf::init_beforeplay;
3485		3626
3486	atomic;	3627	atomic;
…		…
3493	use POSIX ();	3634	use POSIX ();
3494	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3635	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3495		3636
3496	(pop @POST_INIT)->(0) while @POST_INIT;	3637	(pop @POST_INIT)->(0) while @POST_INIT;
3497	};	3638	};
		3639
		3640	cf::object::thawer::errors_are_fatal 0;
		3641	info "parse errors in files are no longer fatal from this point on.\n";
3498		3642
3499	main_loop;	3643	main_loop;
3500	}	3644	}
3501		3645
3502	#############################################################################	3646	#############################################################################
…		…
3504		3648
3505	# install some emergency cleanup handlers	3649	# install some emergency cleanup handlers
3506	BEGIN {	3650	BEGIN {
3507	our %SIGWATCHER = ();	3651	our %SIGWATCHER = ();
3508	for my $signal (qw(INT HUP TERM)) {	3652	for my $signal (qw(INT HUP TERM)) {
3509	$SIGWATCHER{$signal} = EV::signal $signal, sub {	3653	$SIGWATCHER{$signal} = AE::signal $signal, sub {
3510	cf::cleanup "SIG$signal";	3654	cf::cleanup "SIG$signal";
3511	};	3655	};
3512	}	3656	}
3513	}	3657	}
3514		3658
3515	sub write_runtime_sync {	3659	sub write_runtime_sync {
		3660	my $t0 = AE::time;
		3661
3516	# first touch the runtime file to show we are still running:	3662	# first touch the runtime file to show we are still running:
3517	# the fsync below can take a very very long time.	3663	# the fsync below can take a very very long time.
3518		3664
3519	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;	3665	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3520		3666
3521	my $guard = cf::lock_acquire "write_runtime";	3667	my $guard = cf::lock_acquire "write_runtime";
3522		3668
3523	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644	3669	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3524	or return;	3670	or return;
3525		3671
3526	my $value = $cf::RUNTIME + 90 + 10;	3672	my $value = $cf::RUNTIME + 90 + 10;
3527	# 10 is the runtime save interval, for a monotonic clock	3673	# 10 is the runtime save interval, for a monotonic clock
3528	# 60 allows for the watchdog to kill the server.	3674	# 60 allows for the watchdog to kill the server.
…		…
3541	or return;	3687	or return;
3542		3688
3543	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3689	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3544	and return;	3690	and return;
3545		3691
3546	warn "runtime file written.\n";	3692	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3547		3693
3548	1	3694	1
3549	}	3695	}
3550		3696
3551	our $uuid_lock;	3697	our $uuid_lock;
…		…
3563	or return;	3709	or return;
3564		3710
3565	my $value = uuid_seq uuid_cur;	3711	my $value = uuid_seq uuid_cur;
3566		3712
3567	unless ($value) {	3713	unless ($value) {
3568	warn "cowardly refusing to write zero uuid value!\n";	3714	info "cowardly refusing to write zero uuid value!\n";
3569	return;	3715	return;
3570	}	3716	}
3571		3717
3572	my $value = uuid_str $value + $uuid_skip;	3718	my $value = uuid_str $value + $uuid_skip;
3573	$uuid_skip = 0;	3719	$uuid_skip = 0;
…		…
3583	or return;	3729	or return;
3584		3730
3585	aio_rename "$uuid~", $uuid	3731	aio_rename "$uuid~", $uuid
3586	and return;	3732	and return;
3587		3733
3588	warn "uuid file written ($value).\n";	3734	trace "uuid file written ($value).\n";
3589		3735
3590	1	3736	1
3591		3737
3592	}	3738	}
3593		3739
…		…
3599	}	3745	}
3600		3746
3601	sub emergency_save() {	3747	sub emergency_save() {
3602	my $freeze_guard = cf::freeze_mainloop;	3748	my $freeze_guard = cf::freeze_mainloop;
3603		3749
3604	warn "emergency_perl_save: enter\n";	3750	info "emergency_perl_save: enter\n";
3605		3751
3606	cf::sync_job {	3752	cf::sync_job {
3607	# this is a trade-off: we want to be very quick here, so	3753	# this is a trade-off: we want to be very quick here, so
3608	# save all maps without fsync, and later call a global sync	3754	# save all maps without fsync, and later call a global sync
3609	# (which in turn might be very very slow)	3755	# (which in turn might be very very slow)
3610	local $USE_FSYNC = 0;	3756	local $USE_FSYNC = 0;
3611		3757
3612	# use a peculiar iteration method to avoid tripping on perl	3758	# use a peculiar iteration method to avoid tripping on perl
3613	# refcount bugs in for. also avoids problems with players	3759	# refcount bugs in for. also avoids problems with players
3614	# and maps saved/destroyed asynchronously.	3760	# and maps saved/destroyed asynchronously.
3615	warn "emergency_perl_save: begin player save\n";	3761	info "emergency_perl_save: begin player save\n";
3616	for my $login (keys %cf::PLAYER) {	3762	for my $login (keys %cf::PLAYER) {
3617	my $pl = $cf::PLAYER{$login} or next;	3763	my $pl = $cf::PLAYER{$login} or next;
3618	$pl->valid or next;	3764	$pl->valid or next;
3619	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3765	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3620	$pl->save;	3766	$pl->save;
3621	}	3767	}
3622	warn "emergency_perl_save: end player save\n";	3768	info "emergency_perl_save: end player save\n";
3623		3769
3624	warn "emergency_perl_save: begin map save\n";	3770	info "emergency_perl_save: begin map save\n";
3625	for my $path (keys %cf::MAP) {	3771	for my $path (keys %cf::MAP) {
3626	my $map = $cf::MAP{$path} or next;	3772	my $map = $cf::MAP{$path} or next;
3627	$map->valid or next;	3773	$map->valid or next;
3628	$map->save;	3774	$map->save;
3629	}	3775	}
3630	warn "emergency_perl_save: end map save\n";	3776	info "emergency_perl_save: end map save\n";
3631		3777
3632	warn "emergency_perl_save: begin database checkpoint\n";	3778	info "emergency_perl_save: begin database checkpoint\n";
3633	BDB::db_env_txn_checkpoint $DB_ENV;	3779	BDB::db_env_txn_checkpoint $DB_ENV;
3634	warn "emergency_perl_save: end database checkpoint\n";	3780	info "emergency_perl_save: end database checkpoint\n";
3635		3781
3636	warn "emergency_perl_save: begin write uuid\n";	3782	info "emergency_perl_save: begin write uuid\n";
3637	write_uuid_sync 1;	3783	write_uuid_sync 1;
3638	warn "emergency_perl_save: end write uuid\n";	3784	info "emergency_perl_save: end write uuid\n";
3639	};	3785	};
3640		3786
3641	warn "emergency_perl_save: starting sync()\n";	3787	info "emergency_perl_save: starting sync()\n";
3642	IO::AIO::aio_sync sub {	3788	IO::AIO::aio_sync sub {
3643	warn "emergency_perl_save: finished sync()\n";	3789	info "emergency_perl_save: finished sync()\n";
3644	};	3790	};
3645		3791
3646	warn "emergency_perl_save: leave\n";	3792	info "emergency_perl_save: leave\n";
3647	}	3793	}
3648		3794
3649	sub post_cleanup {	3795	sub post_cleanup {
3650	my ($make_core) = @_;	3796	my ($make_core) = @_;
3651		3797
3652	warn Carp::longmess "post_cleanup backtrace"	3798	error Carp::longmess "post_cleanup backtrace"
3653	if $make_core;	3799	if $make_core;
3654		3800
3655	my $fh = pidfile;	3801	my $fh = pidfile;
3656	unlink $PIDFILE if <$fh> == $$;	3802	unlink $PIDFILE if <$fh> == $$;
3657	}	3803	}
…		…
3677	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	3823	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3678	for my $name (keys %$leaf_symtab) {	3824	for my $name (keys %$leaf_symtab) {
3679	_gv_clear *{"$pkg$name"};	3825	_gv_clear *{"$pkg$name"};
3680	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	3826	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3681	}	3827	}
3682	warn "cleared package $pkg\n";#d#
3683	}	3828	}
3684		3829
3685	sub do_reload_perl() {	3830	sub do_reload_perl() {
3686	# can/must only be called in main	3831	# can/must only be called in main
3687	if ($Coro::current != $Coro::main) {	3832	if (in_main) {
3688	warn "can only reload from main coroutine";	3833	error "can only reload from main coroutine";
3689	return;	3834	return;
3690	}	3835	}
3691		3836
3692	return if $RELOAD++;	3837	return if $RELOAD++;
3693		3838
3694	my $t1 = EV::time;	3839	my $t1 = AE::time;
3695		3840
3696	while ($RELOAD) {	3841	while ($RELOAD) {
3697	warn "reloading...";	3842	info "reloading...";
3698		3843
3699	warn "entering sync_job";	3844	trace "entering sync_job";
3700		3845
3701	cf::sync_job {	3846	cf::sync_job {
3702	cf::write_runtime_sync; # external watchdog should not bark	3847	cf::write_runtime_sync; # external watchdog should not bark
3703	cf::emergency_save;	3848	cf::emergency_save;
3704	cf::write_runtime_sync; # external watchdog should not bark	3849	cf::write_runtime_sync; # external watchdog should not bark
3705		3850
3706	warn "syncing database to disk";	3851	trace "syncing database to disk";
3707	BDB::db_env_txn_checkpoint $DB_ENV;	3852	BDB::db_env_txn_checkpoint $DB_ENV;
3708		3853
3709	# if anything goes wrong in here, we should simply crash as we already saved	3854	# if anything goes wrong in here, we should simply crash as we already saved
3710		3855
3711	warn "flushing outstanding aio requests";	3856	trace "flushing outstanding aio requests";
3712	while (IO::AIO::nreqs || BDB::nreqs) {	3857	while (IO::AIO::nreqs || BDB::nreqs) {
3713	Coro::EV::timer_once 0.01; # let the sync_job do it's thing	3858	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3714	}	3859	}
3715		3860
3716	warn "cancelling all extension coros";	3861	trace "cancelling all extension coros";
3717	$_->cancel for values %EXT_CORO;	3862	$_->cancel for values %EXT_CORO;
3718	%EXT_CORO = ();	3863	%EXT_CORO = ();
3719		3864
3720	warn "removing commands";	3865	trace "removing commands";
3721	%COMMAND = ();	3866	%COMMAND = ();
3722		3867
3723	warn "removing ext/exti commands";	3868	trace "removing ext/exti commands";
3724	%EXTCMD = ();	3869	%EXTCMD = ();
3725	%EXTICMD = ();	3870	%EXTICMD = ();
3726		3871
3727	warn "unloading/nuking all extensions";	3872	trace "unloading/nuking all extensions";
3728	for my $pkg (@EXTS) {	3873	for my $pkg (@EXTS) {
3729	warn "... unloading $pkg";	3874	trace "... unloading $pkg";
3730		3875
3731	if (my $cb = $pkg->can ("unload")) {	3876	if (my $cb = $pkg->can ("unload")) {
3732	eval {	3877	eval {
3733	$cb->($pkg);	3878	$cb->($pkg);
3734	1	3879	1
3735	} or warn "$pkg unloaded, but with errors: $@";	3880	} or error "$pkg unloaded, but with errors: $@";
3736	}	3881	}
3737		3882
3738	warn "... clearing $pkg";	3883	trace "... clearing $pkg";
3739	clear_package $pkg;	3884	clear_package $pkg;
3740	}	3885	}
3741		3886
3742	warn "unloading all perl modules loaded from $LIBDIR";	3887	trace "unloading all perl modules loaded from $LIBDIR";
3743	while (my ($k, $v) = each %INC) {	3888	while (my ($k, $v) = each %INC) {
3744	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	3889	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3745		3890
3746	warn "... unloading $k";	3891	trace "... unloading $k";
3747	delete $INC{$k};	3892	delete $INC{$k};
3748		3893
3749	$k =~ s/\.pm$//;	3894	$k =~ s/\.pm$//;
3750	$k =~ s/\//::/g;	3895	$k =~ s/\//::/g;
3751		3896
…		…
3754	}	3899	}
3755		3900
3756	clear_package $k;	3901	clear_package $k;
3757	}	3902	}
3758		3903
3759	warn "getting rid of safe::, as good as possible";	3904	trace "getting rid of safe::, as good as possible";
3760	clear_package "safe::$_"	3905	clear_package "safe::$_"
3761	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	3906	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3762		3907
3763	warn "unloading cf.pm \"a bit\"";	3908	trace "unloading cf.pm \"a bit\"";
3764	delete $INC{"cf.pm"};	3909	delete $INC{"cf.pm"};
3765	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	3910	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3766		3911
3767	# don't, removes xs symbols, too,	3912	# don't, removes xs symbols, too,
3768	# and global variables created in xs	3913	# and global variables created in xs
3769	#clear_package __PACKAGE__;	3914	#clear_package __PACKAGE__;
3770		3915
3771	warn "unload completed, starting to reload now";	3916	info "unload completed, starting to reload now";
3772		3917
3773	warn "reloading cf.pm";	3918	trace "reloading cf.pm";
3774	require cf;	3919	require cf;
3775	cf::_connect_to_perl_1;	3920	cf::_connect_to_perl_1;
3776		3921
3777	warn "loading config and database again";	3922	trace "loading config and database again";
3778	cf::reload_config;	3923	cf::reload_config;
3779		3924
3780	warn "loading extensions";	3925	trace "loading extensions";
3781	cf::load_extensions;	3926	cf::load_extensions;
3782		3927
3783	if ($REATTACH_ON_RELOAD) {	3928	if ($REATTACH_ON_RELOAD) {
3784	warn "reattaching attachments to objects/players";	3929	trace "reattaching attachments to objects/players";
3785	_global_reattach; # objects, sockets	3930	_global_reattach; # objects, sockets
3786	warn "reattaching attachments to maps";	3931	trace "reattaching attachments to maps";
3787	reattach $_ for values %MAP;	3932	reattach $_ for values %MAP;
3788	warn "reattaching attachments to players";	3933	trace "reattaching attachments to players";
3789	reattach $_ for values %PLAYER;	3934	reattach $_ for values %PLAYER;
3790	}	3935	}
3791		3936
3792	warn "running post_init jobs";	3937	trace "running post_init jobs";
3793	(pop @POST_INIT)->(1) while @POST_INIT;	3938	(pop @POST_INIT)->(1) while @POST_INIT;
3794		3939
3795	warn "leaving sync_job";	3940	trace "leaving sync_job";
3796		3941
3797	1	3942	1
3798	} or do {	3943	} or do {
3799	warn $@;	3944	error $@;
3800	cf::cleanup "error while reloading, exiting.";	3945	cf::cleanup "error while reloading, exiting.";
3801	};	3946	};
3802		3947
3803	warn "reloaded";	3948	info "reloaded";
3804	--$RELOAD;	3949	--$RELOAD;
3805	}	3950	}
3806		3951
3807	$t1 = EV::time - $t1;	3952	$t1 = AE::time - $t1;
3808	warn "reload completed in ${t1}s\n";	3953	info "reload completed in ${t1}s\n";
3809	};	3954	};
3810		3955
3811	our $RELOAD_WATCHER; # used only during reload	3956	our $RELOAD_WATCHER; # used only during reload
3812		3957
3813	sub reload_perl() {	3958	sub reload_perl() {
…		…
3815	# coro crashes during coro_state_free->destroy here.	3960	# coro crashes during coro_state_free->destroy here.
3816		3961
3817	$RELOAD_WATCHER ||= cf::async {	3962	$RELOAD_WATCHER ||= cf::async {
3818	Coro::AIO::aio_wait cache_extensions;	3963	Coro::AIO::aio_wait cache_extensions;
3819		3964
3820	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {	3965	$RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3821	do_reload_perl;	3966	do_reload_perl;
3822	undef $RELOAD_WATCHER;	3967	undef $RELOAD_WATCHER;
3823	};	3968	};
3824	};	3969	};
3825	}	3970	}
…		…
3842		3987
3843	our @WAIT_FOR_TICK;	3988	our @WAIT_FOR_TICK;
3844	our @WAIT_FOR_TICK_BEGIN;	3989	our @WAIT_FOR_TICK_BEGIN;
3845		3990
3846	sub wait_for_tick {	3991	sub wait_for_tick {
3847	return if tick_inhibit || $Coro::current == $Coro::main;	3992	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3848		3993
3849	my $signal = new Coro::Signal;	3994	my $signal = new Coro::Signal;
3850	push @WAIT_FOR_TICK, $signal;	3995	push @WAIT_FOR_TICK, $signal;
3851	$signal->wait;	3996	$signal->wait;
3852	}	3997	}
3853		3998
3854	sub wait_for_tick_begin {	3999	sub wait_for_tick_begin {
3855	return if tick_inhibit || $Coro::current == $Coro::main;	4000	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3856		4001
3857	my $signal = new Coro::Signal;	4002	my $signal = new Coro::Signal;
3858	push @WAIT_FOR_TICK_BEGIN, $signal;	4003	push @WAIT_FOR_TICK_BEGIN, $signal;
3859	$signal->wait;	4004	$signal->wait;
3860	}	4005	}
…		…
3866	return;	4011	return;
3867	}	4012	}
3868		4013
3869	cf::server_tick; # one server iteration	4014	cf::server_tick; # one server iteration
3870		4015
		4016	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
		4017
3871	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4018	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3872	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4019	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3873	Coro::async_pool {	4020	Coro::async_pool {
3874	$Coro::current->{desc} = "runtime saver";	4021	$Coro::current->{desc} = "runtime saver";
3875	write_runtime_sync	4022	write_runtime_sync
3876	or warn "ERROR: unable to write runtime file: $!";	4023	or error "ERROR: unable to write runtime file: $!";
3877	};	4024	};
3878	}	4025	}
3879		4026
3880	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4027	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3881	$sig->send;	4028	$sig->send;
…		…
3889		4036
3890	if (0) {	4037	if (0) {
3891	if ($NEXT_TICK) {	4038	if ($NEXT_TICK) {
3892	my $jitter = $TICK_START - $NEXT_TICK;	4039	my $jitter = $TICK_START - $NEXT_TICK;
3893	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4040	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
3894	warn "jitter $JITTER\n";#d#	4041	debug "jitter $JITTER\n";#d#
3895	}	4042	}
3896	}	4043	}
3897	}	4044	}
3898		4045
3899	{	4046	{
3900	# configure BDB	4047	# configure BDB
3901		4048
3902	BDB::min_parallel 8;	4049	BDB::min_parallel 16;
3903	BDB::max_poll_reqs $TICK * 0.1;	4050	BDB::max_poll_reqs $TICK * 0.1;
3904	$AnyEvent::BDB::WATCHER->priority (1);	4051	$AnyEvent::BDB::WATCHER->priority (1);
3905		4052
3906	unless ($DB_ENV) {	4053	unless ($DB_ENV) {
3907	$DB_ENV = BDB::db_env_create;	4054	$DB_ENV = BDB::db_env_create;

Diff Legend

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