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.501 by root, Sat Jan 16 23:27:21 2010 UTC vs.
Revision 1.548 by root, Mon May 10 21:40:22 2010 UTC

1	#	1	#
2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	#	3	#
4	# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	#	5	#
6	# Deliantra is free software: you can redistribute it and/or modify it under	6	# Deliantra is free software: you can redistribute it and/or modify it under
7	# the terms of the Affero GNU General Public License as published by the	7	# the terms of the Affero GNU General Public License as published by the
8	# Free Software Foundation, either version 3 of the License, or (at your	8	# Free Software Foundation, either version 3 of the License, or (at your
9	# option) any later version.	9	# option) any later version.
…		…
20	# The authors can be reached via e-mail to <support@deliantra.net>	20	# The authors can be reached via e-mail to <support@deliantra.net>
21	#	21	#
22		22
23	package cf;	23	package cf;
24		24
25	use 5.10.0;	25	use common::sense;
26	use utf8;
27	use strict qw(vars subs);
28		26
29	use Symbol;	27	use Symbol;
30	use List::Util;	28	use List::Util;
31	use Socket;	29	use Socket;
32	use EV;	30	use EV;
…		…
78	# strictly for debugging	76	# strictly for debugging
79	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };	77	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80		78
81	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	79	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82		80
		81	our @ORIG_INC;
		82
83	our %COMMAND = ();	83	our %COMMAND = ();
84	our %COMMAND_TIME = ();	84	our %COMMAND_TIME = ();
85		85
86	our @EXTS = (); # list of extension package names	86	our @EXTS = (); # list of extension package names
87	our %EXTCMD = ();	87	our %EXTCMD = ();
…		…
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
…		…
118	our $BDB_DEADLOCK_WATCHER;	124	our $BDB_DEADLOCK_WATCHER;
119	our $BDB_CHECKPOINT_WATCHER;	125	our $BDB_CHECKPOINT_WATCHER;
120	our $BDB_TRICKLE_WATCHER;	126	our $BDB_TRICKLE_WATCHER;
121	our $DB_ENV;	127	our $DB_ENV;
122		128
123	our @EXTRA_MODULES = qw(pod match mapscript);	129	our @EXTRA_MODULES = qw(pod match mapscript incloader);
124		130
125	our %CFG;	131	our %CFG;
126		132
127	our $UPTIME; $UPTIME ||= time;	133	our $UPTIME; $UPTIME ||= time;
128	our $RUNTIME;	134	our $RUNTIME;
…		…
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 $_;
…		…
223	from wherever your confdir points to.	233	from wherever your confdir points to.
224		234
225	=item cf::wait_for_tick, cf::wait_for_tick_begin	235	=item cf::wait_for_tick, cf::wait_for_tick_begin
226		236
227	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	237	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
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 thread
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.
		240
		241	=cut
		242
		243	sub wait_for_tick();
		244	sub wait_for_tick_begin();
230		245
231	=item @cf::INVOKE_RESULTS	246	=item @cf::INVOKE_RESULTS
232		247
233	This array contains the results of the last C<invoke ()> call. When	248	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	249	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
…		…
242		257
243	=back	258	=back
244		259
245	=cut	260	=cut
246		261
		262	sub error(@) { LOG llevError, join "", @_ }
		263	sub warn (@) { LOG llevWarn , join "", @_ }
		264	sub info (@) { LOG llevInfo , join "", @_ }
		265	sub debug(@) { LOG llevDebug, join "", @_ }
		266	sub trace(@) { LOG llevTrace, join "", @_ }
		267
247	$Coro::State::WARNHOOK = sub {	268	$Coro::State::WARNHOOK = sub {
248	my $msg = join "", @_;	269	my $msg = join "", @_;
249		270
250	$msg .= "\n"	271	$msg .= "\n"
251	unless $msg =~ /\n$/;	272	unless $msg =~ /\n$/;
252		273
253	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	274	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
254		275
255	LOG llevError, $msg;	276	LOG llevWarn, $msg;
256	};	277	};
257		278
258	$Coro::State::DIEHOOK = sub {	279	$Coro::State::DIEHOOK = sub {
259	return unless $^S eq 0; # "eq", not "=="	280	return unless $^S eq 0; # "eq", not "=="
260		281
261	warn Carp::longmess $_[0];	282	error Carp::longmess $_[0];
262		283
263	if ($Coro::current == $Coro::main) {#d#	284	if (in_main) {#d#
264	warn "DIEHOOK called in main context, Coro bug?\n";#d#	285	error "DIEHOOK called in main context, Coro bug?\n";#d#
265	return;#d#	286	return;#d#
266	}#d#	287	}#d#
267		288
268	# kill coroutine otherwise	289	# kill coroutine otherwise
269	Coro::terminate	290	Coro::terminate
…		…
336	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	357	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
337		358
338	sub encode_json($) { $json_coder->encode ($_[0]) }	359	sub encode_json($) { $json_coder->encode ($_[0]) }
339	sub decode_json($) { $json_coder->decode ($_[0]) }	360	sub decode_json($) { $json_coder->decode ($_[0]) }
340		361
		362	=item $ref = cf::yaml_load $scalar
		363
		364	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
		365
		366	=cut
		367
		368	sub fork_call(&@);
		369
		370	sub yaml_load($) {
		371	fork_call { YAML::XS::Load $_[0] } @_
		372	}
		373
341	=item cf::post_init { BLOCK }	374	=item cf::post_init { BLOCK }
342		375
343	Execute the given codeblock, I<after> all extensions have been (re-)loaded,	376	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344	but I<before> the server starts ticking again.	377	but I<before> the server starts ticking again.
345		378
346	The cdoeblock will have a single boolean argument to indicate whether this	379	The codeblock will have a single boolean argument to indicate whether this
347	is a reload or not.	380	is a reload or not.
348		381
349	=cut	382	=cut
350		383
351	sub post_init(&) {	384	sub post_init(&) {
…		…
396	}	429	}
397		430
398	=item cf::periodic $interval, $cb	431	=item cf::periodic $interval, $cb
399		432
400	Like EV::periodic, but randomly selects a starting point so that the actions	433	Like EV::periodic, but randomly selects a starting point so that the actions
401	get spread over timer.	434	get spread over time.
402		435
403	=cut	436	=cut
404		437
405	sub periodic($$) {	438	sub periodic($$) {
406	my ($interval, $cb) = @_;	439	my ($interval, $cb) = @_;
…		…
423		456
424	=cut	457	=cut
425		458
426	our @SLOT_QUEUE;	459	our @SLOT_QUEUE;
427	our $SLOT_QUEUE;	460	our $SLOT_QUEUE;
		461	our $SLOT_DECAY = 0.9;
428		462
429	$SLOT_QUEUE->cancel if $SLOT_QUEUE;	463	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
430	$SLOT_QUEUE = Coro::async {	464	$SLOT_QUEUE = Coro::async {
431	$Coro::current->desc ("timeslot manager");	465	$Coro::current->desc ("timeslot manager");
432		466
433	my $signal = new Coro::Signal;	467	my $signal = new Coro::Signal;
		468	my $busy;
434		469
435	while () {	470	while () {
436	next_job:	471	next_job:
		472
437	my $avail = cf::till_tick;	473	my $avail = cf::till_tick;
438	if ($avail > 0.01) {	474
439	for (0 .. $#SLOT_QUEUE) {	475	for (0 .. $#SLOT_QUEUE) {
440	if ($SLOT_QUEUE[$_][0] < $avail) {	476	if ($SLOT_QUEUE[$_][0] <= $avail) {
		477	$busy = 0;
441	my $job = splice @SLOT_QUEUE, $_, 1, ();	478	my $job = splice @SLOT_QUEUE, $_, 1, ();
442	$job->[2]->send;	479	$job->[2]->send;
443	Coro::cede;	480	Coro::cede;
444	goto next_job;	481	goto next_job;
445	}	482	} else {
		483	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
446	}	484	}
447	}	485	}
448		486
449	if (@SLOT_QUEUE) {	487	if (@SLOT_QUEUE) {
450	# we do not use wait_for_tick() as it returns immediately when tick is inactive	488	# we do not use wait_for_tick() as it returns immediately when tick is inactive
451	push @cf::WAIT_FOR_TICK, $signal;	489	push @cf::WAIT_FOR_TICK, $signal;
452	$signal->wait;	490	$signal->wait;
453	} else {	491	} else {
		492	$busy = 0;
454	Coro::schedule;	493	Coro::schedule;
455	}	494	}
456	}	495	}
457	};	496	};
458		497
459	sub get_slot($;$$) {	498	sub get_slot($;$$) {
460	return if tick_inhibit || $Coro::current == $Coro::main;	499	return if tick_inhibit || $Coro::current == $Coro::main;
461		500
462	my ($time, $pri, $name) = @_;	501	my ($time, $pri, $name) = @_;
463		502
464	$time = $TICK * .6 if $time > $TICK * .6;	503	$time = clamp $time, 0.01, $TICK * .6;
		504
465	my $sig = new Coro::Signal;	505	my $sig = new Coro::Signal;
466		506
467	push @SLOT_QUEUE, [$time, $pri, $sig, $name];	507	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
468	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;	508	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
469	$SLOT_QUEUE->ready;	509	$SLOT_QUEUE->ready;
…		…
495	=cut	535	=cut
496		536
497	sub sync_job(&) {	537	sub sync_job(&) {
498	my ($job) = @_;	538	my ($job) = @_;
499		539
500	if ($Coro::current == $Coro::main) {	540	if (in_main) {
501	my $time = EV::time;	541	my $time = AE::time;
502		542
503	# this is the main coro, too bad, we have to block	543	# this is the main coro, too bad, we have to block
504	# till the operation succeeds, freezing the server :/	544	# till the operation succeeds, freezing the server :/
505		545
506	LOG llevError, Carp::longmess "sync job";#d#	546	#LOG llevError, Carp::longmess "sync job";#d#
507		547
508	my $freeze_guard = freeze_mainloop;	548	my $freeze_guard = freeze_mainloop;
509		549
510	my $busy = 1;	550	my $busy = 1;
511	my @res;	551	my @res;
512		552
513	(async {	553	(async {
514	$Coro::current->desc ("sync job coro");	554	$Coro::current->desc ("sync job coro");
515	@res = eval { $job->() };	555	@res = eval { $job->() };
516	warn $@ if $@;	556	error $@ if $@;
517	undef $busy;	557	undef $busy;
518	})->prio (Coro::PRIO_MAX);	558	})->prio (Coro::PRIO_MAX);
519		559
520	while ($busy) {	560	while ($busy) {
521	if (Coro::nready) {	561	if (Coro::nready) {
…		…
523	} else {	563	} else {
524	EV::loop EV::LOOP_ONESHOT;	564	EV::loop EV::LOOP_ONESHOT;
525	}	565	}
526	}	566	}
527		567
528	my $time = EV::time - $time;	568	my $time = AE::time - $time;
529		569
530	$TICK_START += $time; # do not account sync jobs to server load	570	$TICK_START += $time; # do not account sync jobs to server load
531		571
532	wantarray ? @res : $res[0]	572	wantarray ? @res : $res[0]
533	} else {	573	} else {
…		…
555	$EXT_CORO{$coro+0} = $coro;	595	$EXT_CORO{$coro+0} = $coro;
556		596
557	$coro	597	$coro
558	}	598	}
559		599
560	=item fork_call { }, $args	600	=item fork_call { }, @args
561		601
562	Executes the given code block with the given arguments in a seperate	602	Executes the given code block with the given arguments in a seperate
563	process, returning the results. Everything must be serialisable with	603	process, returning the results. Everything must be serialisable with
564	Coro::Storable. May, of course, block. Note that the executed sub may	604	Coro::Storable. May, of course, block. Note that the executed sub may
565	never block itself or use any form of event handling.	605	never block itself or use any form of event handling.
566		606
567	=cut	607	=cut
568		608
		609	sub post_fork {
		610	reset_signals;
		611	}
		612
569	sub fork_call(&@) {	613	sub fork_call(&@) {
570	my ($cb, @args) = @_;	614	my ($cb, @args) = @_;
571		615
572	# we seemingly have to make a local copy of the whole thing,	616	# we seemingly have to make a local copy of the whole thing,
573	# otherwise perl prematurely frees the stuff :/	617	# otherwise perl prematurely frees the stuff :/
574	# TODO: investigate and fix (likely this will be rather laborious)	618	# TODO: investigate and fix (likely this will be rather laborious)
575		619
576	my @res = Coro::Util::fork_eval {	620	my @res = Coro::Util::fork_eval {
577	reset_signals;	621	cf::post_fork;
578	&$cb	622	&$cb
579	}, @args;	623	} @args;
580		624
581	wantarray ? @res : $res[-1]	625	wantarray ? @res : $res[-1]
		626	}
		627
		628	sub objinfo {
		629	(
		630	"counter value" => cf::object::object_count,
		631	"objects created" => cf::object::create_count,
		632	"objects destroyed" => cf::object::destroy_count,
		633	"freelist size" => cf::object::free_count,
		634	"allocated objects" => cf::object::objects_size,
		635	"active objects" => cf::object::actives_size,
		636	)
582	}	637	}
583		638
584	=item $coin = coin_from_name $name	639	=item $coin = coin_from_name $name
585		640
586	=cut	641	=cut
…		…
623	within each server.	678	within each server.
624		679
625	=cut	680	=cut
626		681
627	sub db_table($) {	682	sub db_table($) {
		683	cf::error "db_get called from main context"
		684	if $Coro::current == $Coro::main;
		685
628	my ($name) = @_;	686	my ($name) = @_;
629	my $db = BDB::db_create $DB_ENV;	687	my $db = BDB::db_create $DB_ENV;
630		688
631	eval {	689	eval {
632	$db->set_flags (BDB::CHKSUM);	690	$db->set_flags (BDB::CHKSUM);
…		…
642	}	700	}
643		701
644	our $DB;	702	our $DB;
645		703
646	sub db_init {	704	sub db_init {
647	cf::sync_job {
648	$DB ||= db_table "db";	705	$DB ||= db_table "db";
649	};
650	}	706	}
651		707
652	sub db_get($$) {	708	sub db_get($$) {
653	my $key = "$_[0]/$_[1]";	709	my $key = "$_[0]/$_[1]";
654		710
655	cf::sync_job {	711	cf::error "db_get called from main context"
		712	if $Coro::current == $Coro::main;
		713
656	BDB::db_get $DB, undef, $key, my $data;	714	BDB::db_get $DB, undef, $key, my $data;
657		715
658	$! ? ()	716	$! ? ()
659	: $data	717	: $data
660	}
661	}	718	}
662		719
663	sub db_put($$$) {	720	sub db_put($$$) {
664	BDB::dbreq_pri 4;	721	BDB::dbreq_pri 4;
665	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	722	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
721		778
722	my $t1 = Time::HiRes::time;	779	my $t1 = Time::HiRes::time;
723	my $data = $process->(\@data);	780	my $data = $process->(\@data);
724	my $t2 = Time::HiRes::time;	781	my $t2 = Time::HiRes::time;
725		782
726	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	783	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
727		784
728	db_put cache => "$id/data", $data;	785	db_put cache => "$id/data", $data;
729	db_put cache => "$id/md5" , $md5;	786	db_put cache => "$id/md5" , $md5;
730	db_put cache => "$id/meta", $meta;	787	db_put cache => "$id/meta", $meta;
731		788
…		…
741		798
742	=cut	799	=cut
743		800
744	sub datalog($@) {	801	sub datalog($@) {
745	my ($type, %kv) = @_;	802	my ($type, %kv) = @_;
746	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	803	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
747	}	804	}
748		805
749	=back	806	=back
750		807
751	=cut	808	=cut
…		…
946		1003
947	} elsif (exists $cb_id{$type}) {	1004	} elsif (exists $cb_id{$type}) {
948	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	1005	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
949		1006
950	} elsif (ref $type) {	1007	} elsif (ref $type) {
951	warn "attaching objects not supported, ignoring.\n";	1008	error "attaching objects not supported, ignoring.\n";
952		1009
953	} else {	1010	} else {
954	shift @arg;	1011	shift @arg;
955	warn "attach argument '$type' not supported, ignoring.\n";	1012	error "attach argument '$type' not supported, ignoring.\n";
956	}	1013	}
957	}	1014	}
958	}	1015	}
959		1016
960	sub _object_attach {	1017	sub _object_attach {
…		…
970	_attach $registry, $klass, @attach;	1027	_attach $registry, $klass, @attach;
971	}	1028	}
972		1029
973	$obj->{$name} = \%arg;	1030	$obj->{$name} = \%arg;
974	} else {	1031	} else {
975	warn "object uses attachment '$name' which is not available, postponing.\n";	1032	info "object uses attachment '$name' which is not available, postponing.\n";
976	}	1033	}
977		1034
978	$obj->{_attachment}{$name} = undef;	1035	$obj->{_attachment}{$name} = undef;
979	}	1036	}
980		1037
…		…
1039		1096
1040	for (@$callbacks) {	1097	for (@$callbacks) {
1041	eval { &{$_->[1]} };	1098	eval { &{$_->[1]} };
1042		1099
1043	if ($@) {	1100	if ($@) {
1044	warn "$@";
1045	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1101	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1046	override;	1102	override;
1047	}	1103	}
1048		1104
1049	return 1 if $override;	1105	return 1 if $override;
1050	}	1106	}
…		…
1129	for (@$attach) {	1185	for (@$attach) {
1130	my ($klass, @attach) = @$_;	1186	my ($klass, @attach) = @$_;
1131	_attach $registry, $klass, @attach;	1187	_attach $registry, $klass, @attach;
1132	}	1188	}
1133	} else {	1189	} else {
1134	warn "object uses attachment '$name' that is not available, postponing.\n";	1190	info "object uses attachment '$name' that is not available, postponing.\n";
1135	}	1191	}
1136	}	1192	}
1137	}	1193	}
1138		1194
1139	cf::attachable->attach (	1195	cf::attachable->attach (
…		…
1166	my ($filename, $rdata, $objs) = @_;	1222	my ($filename, $rdata, $objs) = @_;
1167		1223
1168	sync_job {	1224	sync_job {
1169	if (length $$rdata) {	1225	if (length $$rdata) {
1170	utf8::decode (my $decname = $filename);	1226	utf8::decode (my $decname = $filename);
1171	warn sprintf "saving %s (%d,%d)\n",	1227	trace sprintf "saving %s (%d,%d)\n",
1172	$decname, length $$rdata, scalar @$objs;	1228	$decname, length $$rdata, scalar @$objs
		1229	if $VERBOSE_IO;
1173		1230
1174	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1231	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1175	aio_chmod $fh, SAVE_MODE;	1232	aio_chmod $fh, SAVE_MODE;
1176	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1233	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1177	if ($cf::USE_FSYNC) {	1234	if ($cf::USE_FSYNC) {
…		…
1199	aio_rename "$filename~", $filename;	1256	aio_rename "$filename~", $filename;
1200		1257
1201	$filename =~ s%/[^/]+$%%;	1258	$filename =~ s%/[^/]+$%%;
1202	aio_pathsync $filename if $cf::USE_FSYNC;	1259	aio_pathsync $filename if $cf::USE_FSYNC;
1203	} else {	1260	} else {
1204	warn "unable to save objects: $filename~: $!\n";	1261	error "unable to save objects: $filename~: $!\n";
1205	}	1262	}
1206	} else {	1263	} else {
1207	aio_unlink $filename;	1264	aio_unlink $filename;
1208	aio_unlink "$filename.pst";	1265	aio_unlink "$filename.pst";
1209	}	1266	}
…		…
1233	my $st = eval { Coro::Storable::thaw $av };	1290	my $st = eval { Coro::Storable::thaw $av };
1234	$av = $st->{objs};	1291	$av = $st->{objs};
1235	}	1292	}
1236		1293
1237	utf8::decode (my $decname = $filename);	1294	utf8::decode (my $decname = $filename);
1238	warn sprintf "loading %s (%d,%d)\n",	1295	trace sprintf "loading %s (%d,%d)\n",
1239	$decname, length $data, scalar @{$av || []};	1296	$decname, length $data, scalar @{$av || []}
		1297	if $VERBOSE_IO;
1240		1298
1241	($data, $av)	1299	($data, $av)
1242	}	1300	}
1243		1301
1244	=head2 COMMAND CALLBACKS	1302	=head2 COMMAND CALLBACKS
…		…
1303	}	1361	}
1304		1362
1305	use File::Glob ();	1363	use File::Glob ();
1306		1364
1307	cf::player->attach (	1365	cf::player->attach (
1308	on_command => sub {	1366	on_unknown_command => sub {
1309	my ($pl, $name, $params) = @_;	1367	my ($pl, $name, $params) = @_;
1310		1368
1311	my $cb = $COMMAND{$name}	1369	my $cb = $COMMAND{$name}
1312	or return;	1370	or return;
1313		1371
…		…
1336		1394
1337	$pl->ext_reply ($reply, @reply)	1395	$pl->ext_reply ($reply, @reply)
1338	if $reply;	1396	if $reply;
1339		1397
1340	} else {	1398	} else {
1341	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1399	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1342	}	1400	}
1343		1401
1344	cf::override;	1402	cf::override;
1345	},	1403	},
1346	);	1404	);
…		…
1357		1415
1358	$grp	1416	$grp
1359	}	1417	}
1360		1418
1361	sub load_extensions {	1419	sub load_extensions {
		1420	info "loading extensions...";
		1421
1362	cf::sync_job {	1422	cf::sync_job {
1363	my %todo;	1423	my %todo;
1364		1424
1365	for my $path (<$LIBDIR/*.ext>) {	1425	for my $path (<$LIBDIR/*.ext>) {
1366	next unless -r $path;	1426	next unless -r $path;
…		…
1384		1444
1385	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1445	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1386	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1446	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1387		1447
1388	$ext{source} =	1448	$ext{source} =
1389	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1449	"package $pkg; use common::sense;\n"
1390	. "#line 1 \"$path\"\n{\n"	1450	. "#line 1 \"$path\"\n{\n"
1391	. $source	1451	. $source
1392	. "\n};\n1";	1452	. "\n};\n1";
1393		1453
1394	$todo{$base} = \%ext;	1454	$todo{$base} = \%ext;
1395	}	1455	}
1396		1456
		1457	my $pass = 0;
1397	my %done;	1458	my %done;
1398	while (%todo) {	1459	while (%todo) {
1399	my $progress;	1460	my $progress;
1400		1461
		1462	++$pass;
		1463
		1464	ext:
1401	while (my ($k, $v) = each %todo) {	1465	while (my ($k, $v) = each %todo) {
1402	for (split /,\s*/, $v->{meta}{depends}) {	1466	for (split /,\s*/, $v->{meta}{depends}) {
1403	goto skip	1467	next ext
1404	unless exists $done{$_};	1468	unless exists $done{$_};
1405	}	1469	}
1406		1470
1407	warn "... loading '$k' into '$v->{pkg}'\n";	1471	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1408		1472
1409	unless (eval $v->{source}) {	1473	my $active = eval $v->{source};
		1474
		1475	if (length $@) {
1410	my $msg = $@ ? "$v->{path}: $@\n"	1476	error "$v->{path}: $@\n";
1411	: "$v->{base}: extension inactive.\n";
1412		1477
1413	if (exists $v->{meta}{mandatory}) {
1414	warn $msg;
1415	cf::cleanup "mandatory extension failed to load, exiting.";	1478	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1416	}	1479	if exists $v->{meta}{mandatory};
1417		1480
1418	warn $msg;	1481	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
		1482	delete $todo{$k};
		1483	} else {
		1484	$done{$k} = delete $todo{$k};
		1485	push @EXTS, $v->{pkg};
		1486	$progress = 1;
		1487
		1488	info "$v->{base}: extension inactive.\n"
		1489	unless $active;
1419	}	1490	}
1420
1421	$done{$k} = delete $todo{$k};
1422	push @EXTS, $v->{pkg};
1423	$progress = 1;
1424	}	1491	}
1425		1492
1426	skip:	1493	unless ($progress) {
1427	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"	1494	warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1428	unless $progress;	1495
		1496	while (my ($k, $v) = each %todo) {
		1497	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
		1498	if exists $v->{meta}{mandatory};
		1499	}
		1500	}
1429	}	1501	}
1430	};	1502	};
1431	}	1503	}
1432		1504
1433	#############################################################################	1505	#############################################################################
…		…
1517	$cf::PLAYER{$login} = $pl	1589	$cf::PLAYER{$login} = $pl
1518	}	1590	}
1519	}	1591	}
1520	}	1592	}
1521		1593
		1594	cf::player->attach (
		1595	on_load => sub {
		1596	my ($pl, $path) = @_;
		1597
		1598	# restore slots saved in save, below
		1599	my $slots = delete $pl->{_slots};
		1600
		1601	$pl->ob->current_weapon ($slots->[0]);
		1602	$pl->combat_ob ($slots->[1]);
		1603	$pl->ranged_ob ($slots->[2]);
		1604	},
		1605	);
		1606
1522	sub save($) {	1607	sub save($) {
1523	my ($pl) = @_;	1608	my ($pl) = @_;
1524		1609
1525	return if $pl->{deny_save};	1610	return if $pl->{deny_save};
1526		1611
…		…
1531		1616
1532	aio_mkdir playerdir $pl, 0770;	1617	aio_mkdir playerdir $pl, 0770;
1533	$pl->{last_save} = $cf::RUNTIME;	1618	$pl->{last_save} = $cf::RUNTIME;
1534		1619
1535	cf::get_slot 0.01;	1620	cf::get_slot 0.01;
		1621
		1622	# save slots, to be restored later
		1623	local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1536		1624
1537	$pl->save_pl ($path);	1625	$pl->save_pl ($path);
1538	cf::cede_to_tick;	1626	cf::cede_to_tick;
1539	}	1627	}
1540		1628
…		…
1576	$pl->{deny_save} = 1;	1664	$pl->{deny_save} = 1;
1577	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1665	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1578		1666
1579	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1667	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1580	$pl->deactivate;	1668	$pl->deactivate;
		1669
1581	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1670	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1582	$pl->ob->check_score;	1671	ext::highscore::check ($pl->ob);
		1672
1583	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1673	$pl->invoke (cf::EVENT_PLAYER_QUIT);
1584	$pl->ns->destroy if $pl->ns;	1674	$pl->ns->destroy if $pl->ns;
1585		1675
1586	my $path = playerdir $pl;	1676	my $path = playerdir $pl;
1587	my $temp = "$path~$cf::RUNTIME~deleting~";	1677	my $temp = "$path~$cf::RUNTIME~deleting~";
…		…
1642	\@logins	1732	\@logins
1643	}	1733	}
1644		1734
1645	=item $player->maps	1735	=item $player->maps
1646		1736
		1737	=item cf::player::maps $login
		1738
1647	Returns an arrayref of map paths that are private for this	1739	Returns an arrayref of map paths that are private for this
1648	player. May block.	1740	player. May block.
1649		1741
1650	=cut	1742	=cut
1651		1743
…		…
1713	=cut	1805	=cut
1714		1806
1715	sub find_by_path($) {	1807	sub find_by_path($) {
1716	my ($path) = @_;	1808	my ($path) = @_;
1717		1809
		1810	$path =~ s/^~[^\/]*//; # skip ~login
		1811
1718	my ($match, $specificity);	1812	my ($match, $specificity);
1719		1813
1720	for my $region (list) {	1814	for my $region (list) {
1721	if ($region->{match} && $path =~ $region->{match}) {	1815	if ($region->{match} && $path =~ $region->{match}) {
1722	($match, $specificity) = ($region, $region->specificity)	1816	($match, $specificity) = ($region, $region->specificity)
…		…
1753	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	1847	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1754		1848
1755	# mit "rum" bekleckern, nicht	1849	# mit "rum" bekleckern, nicht
1756	$self->_create_random_map (	1850	$self->_create_random_map (
1757	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},	1851	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1758	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},	1852	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1759	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},	1853	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1760	$rmp->{exit_on_final_map},	1854	$rmp->{exit_on_final_map},
1761	$rmp->{xsize}, $rmp->{ysize},	1855	$rmp->{xsize}, $rmp->{ysize},
1762	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},	1856	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1763	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},	1857	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
…		…
1778		1872
1779	sub register {	1873	sub register {
1780	my (undef, $regex, $prio) = @_;	1874	my (undef, $regex, $prio) = @_;
1781	my $pkg = caller;	1875	my $pkg = caller;
1782		1876
1783	no strict;
1784	push @{"$pkg\::ISA"}, __PACKAGE__;	1877	push @{"$pkg\::ISA"}, __PACKAGE__;
1785		1878
1786	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	1879	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1787	}	1880	}
1788		1881
1789	# also paths starting with '/'	1882	# also paths starting with '/'
1790	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	1883	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1791		1884
1792	sub thawer_merge {	1885	sub thawer_merge {
1793	my ($self, $merge) = @_;	1886	my ($self, $merge) = @_;
1794		1887
1795	# we have to keep some variables in memory intact	1888	# we have to keep some variables in memory intact
…		…
1800	}	1893	}
1801		1894
1802	sub normalise {	1895	sub normalise {
1803	my ($path, $base) = @_;	1896	my ($path, $base) = @_;
1804		1897
1805	$path = "$path"; # make sure its a string	1898	$path = "$path"; # make sure it's a string
1806		1899
1807	$path =~ s/\.map$//;	1900	$path =~ s/\.map$//;
1808		1901
1809	# map plan:	1902	# map plan:
1810	#	1903	#
…		…
1849	$self->init; # pass $1 etc.	1942	$self->init; # pass $1 etc.
1850	return $self;	1943	return $self;
1851	}	1944	}
1852	}	1945	}
1853		1946
1854	Carp::cluck "unable to resolve path '$path' (base '$base').";	1947	Carp::cluck "unable to resolve path '$path' (base '$base')";
1855	()	1948	()
1856	}	1949	}
1857		1950
1858	sub init {	1951	sub init {
1859	my ($self) = @_;	1952	my ($self) = @_;
…		…
1981	}	2074	}
1982		2075
1983	sub find;	2076	sub find;
1984	sub find {	2077	sub find {
1985	my ($path, $origin) = @_;	2078	my ($path, $origin) = @_;
		2079
		2080	cf::cede_to_tick;
1986		2081
1987	$path = normalise $path, $origin && $origin->path;	2082	$path = normalise $path, $origin && $origin->path;
1988		2083
1989	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2084	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1990	my $guard2 = cf::lock_acquire "map_find:$path";	2085	my $guard2 = cf::lock_acquire "map_find:$path";
…		…
2077	}	2172	}
2078		2173
2079	$self->post_load;	2174	$self->post_load;
2080	}	2175	}
2081		2176
		2177	# customize the map for a given player, i.e.
		2178	# return the _real_ map. used by e.g. per-player
		2179	# maps to change the path to ~playername/mappath
2082	sub customise_for {	2180	sub customise_for {
2083	my ($self, $ob) = @_;	2181	my ($self, $ob) = @_;
2084		2182
2085	return find "~" . $ob->name . "/" . $self->{path}	2183	return find "~" . $ob->name . "/" . $self->{path}
2086	if $self->per_player;	2184	if $self->per_player;
…		…
2102	or next;	2200	or next;
2103	$neigh = find $neigh, $map	2201	$neigh = find $neigh, $map
2104	or next;	2202	or next;
2105	$neigh->load;	2203	$neigh->load;
2106		2204
		2205	# now find the diagonal neighbours
2107	push @neigh,	2206	push @neigh,
2108	[$neigh->tile_path (($_ + 3) % 4), $neigh],	2207	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2109	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2208	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2110	}	2209	}
2111		2210
…		…
2118	}	2217	}
2119		2218
2120	sub find_sync {	2219	sub find_sync {
2121	my ($path, $origin) = @_;	2220	my ($path, $origin) = @_;
2122		2221
2123	cf::sync_job { find $path, $origin }	2222	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
		2223	if $Coro::current == $Coro::main;
		2224
		2225	find $path, $origin
2124	}	2226	}
2125		2227
2126	sub do_load_sync {	2228	sub do_load_sync {
2127	my ($map) = @_;	2229	my ($map) = @_;
2128		2230
2129	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2231	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2130	if $Coro::current == $Coro::main;	2232	if $Coro::current == $Coro::main;
2131		2233
2132	cf::sync_job { $map->load };	2234	$map->load;
2133	}	2235	}
2134		2236
2135	our %MAP_PREFETCH;	2237	our %MAP_PREFETCH;
2136	our $MAP_PREFETCHER = undef;	2238	our $MAP_PREFETCHER = undef;
2137		2239
…		…
2163	$MAP_PREFETCHER->prio (6);	2265	$MAP_PREFETCHER->prio (6);
2164		2266
2165	()	2267	()
2166	}	2268	}
2167		2269
		2270	# common code, used by both ->save and ->swapout
2168	sub save {	2271	sub _save {
2169	my ($self) = @_;	2272	my ($self) = @_;
2170
2171	my $lock = cf::lock_acquire "map_data:$self->{path}";
2172		2273
2173	$self->{last_save} = $cf::RUNTIME;	2274	$self->{last_save} = $cf::RUNTIME;
2174		2275
2175	return unless $self->dirty;	2276	return unless $self->dirty;
2176		2277
…		…
2196	} else {	2297	} else {
2197	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);	2298	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2198	}	2299	}
2199	}	2300	}
2200		2301
		2302	sub save {
		2303	my ($self) = @_;
		2304
		2305	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2306
		2307	$self->_save;
		2308	}
		2309
2201	sub swap_out {	2310	sub swap_out {
2202	my ($self) = @_;	2311	my ($self) = @_;
2203		2312
2204	# save first because save cedes
2205	$self->save;
2206
2207	my $lock = cf::lock_acquire "map_data:$self->{path}";	2313	my $lock = cf::lock_acquire "map_data:$self->{path}";
2208		2314
2209	return if $self->players;
2210	return if $self->in_memory != cf::MAP_ACTIVE;	2315	return if $self->in_memory != cf::MAP_ACTIVE;
2211	return if $self->{deny_save};	2316	return if $self->{deny_save};
		2317	return if $self->players;
2212		2318
		2319	# first deactivate the map and "unlink" it from the core
		2320	$self->deactivate;
		2321	$_->clear_links_to ($self) for values %cf::MAP;
2213	$self->in_memory (cf::MAP_SWAPPED);	2322	$self->in_memory (cf::MAP_SWAPPED);
		2323
		2324	# then atomically save
		2325	$self->_save;
		2326
		2327	# then free the map
		2328	$self->clear;
		2329	}
		2330
		2331	sub reset_at {
		2332	my ($self) = @_;
		2333
		2334	# TODO: safety, remove and allow resettable per-player maps
		2335	return 1e99 if $self->{deny_reset};
		2336
		2337	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
		2338	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
		2339
		2340	$time + $to
		2341	}
		2342
		2343	sub should_reset {
		2344	my ($self) = @_;
		2345
		2346	$self->reset_at <= $cf::RUNTIME
		2347	}
		2348
		2349	sub reset {
		2350	my ($self) = @_;
		2351
		2352	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2353
		2354	return if $self->players;
		2355
		2356	cf::trace "resetting map ", $self->path, "\n";
		2357
		2358	$self->in_memory (cf::MAP_SWAPPED);
		2359
		2360	# need to save uniques path
		2361	unless ($self->{deny_save}) {
		2362	my $uniq = $self->uniq_path; utf8::encode $uniq;
		2363
		2364	$self->_save_objects ($uniq, cf::IO_UNIQUES)
		2365	if $uniq;
		2366	}
		2367
		2368	delete $cf::MAP{$self->path};
2214		2369
2215	$self->deactivate;	2370	$self->deactivate;
2216	$_->clear_links_to ($self) for values %cf::MAP;	2371	$_->clear_links_to ($self) for values %cf::MAP;
2217	$self->clear;	2372	$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		2373
2263	$self->unlink_save;	2374	$self->unlink_save;
2264	$self->destroy;	2375	$self->destroy;
2265	}	2376	}
2266		2377
…		…
2274		2385
2275	delete $cf::MAP{$self->path};	2386	delete $cf::MAP{$self->path};
2276		2387
2277	$self->unlink_save;	2388	$self->unlink_save;
2278		2389
2279	bless $self, "cf::map";	2390	bless $self, "cf::map::wrap";
2280	delete $self->{deny_reset};	2391	delete $self->{deny_reset};
2281	$self->{deny_save} = 1;	2392	$self->{deny_save} = 1;
2282	$self->reset_timeout (1);	2393	$self->reset_timeout (1);
2283	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2394	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2284		2395
…		…
2514		2625
2515	Freezes the player and moves him/her to a special map (C<{link}>).	2626	Freezes the player and moves him/her to a special map (C<{link}>).
2516		2627
2517	The player should be reasonably safe there for short amounts of time (e.g.	2628	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,	2629	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	2630	though, as the player cannot control the character while it is on the link
2520	map.	2631	map.
2521		2632
2522	Will never block.	2633	Will never block.
2523		2634
2524	=item $player_object->leave_link ($map, $x, $y)	2635	=item $player_object->leave_link ($map, $x, $y)
…		…
2545	sub cf::object::player::enter_link {	2656	sub cf::object::player::enter_link {
2546	my ($self) = @_;	2657	my ($self) = @_;
2547		2658
2548	$self->deactivate_recursive;	2659	$self->deactivate_recursive;
2549		2660
		2661	++$self->{_link_recursion};
		2662
2550	return if UNIVERSAL::isa $self->map, "ext::map_link";	2663	return if UNIVERSAL::isa $self->map, "ext::map_link";
2551		2664
2552	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2665	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2553	if $self->map && $self->map->{path} ne "{link}";	2666	if $self->map && $self->map->{path} ne "{link}";
2554		2667
2555	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2668	$self->enter_map ($LINK_MAP || link_map, 3, 3);
2556	}	2669	}
2557		2670
2558	sub cf::object::player::leave_link {	2671	sub cf::object::player::leave_link {
2559	my ($self, $map, $x, $y) = @_;	2672	my ($self, $map, $x, $y) = @_;
2560		2673
…		…
2585	$map->load_neighbours;	2698	$map->load_neighbours;
2586		2699
2587	return unless $self->contr->active;	2700	return unless $self->contr->active;
2588		2701
2589	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2702	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2590	$self->enter_map ($map, $x, $y);	2703	if ($self->enter_map ($map, $x, $y)) {
2591		2704	# entering was successful
		2705	delete $self->{_link_recursion};
2592	# only activate afterwards, to support waiting in hooks	2706	# only activate afterwards, to support waiting in hooks
2593	$self->activate_recursive;	2707	$self->activate_recursive;
2594	}	2708	}
2595		2709
		2710	}
		2711
2596	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2712	=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2597		2713
2598	Moves the player to the given map-path and coordinates by first freezing	2714	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	2715	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	2716	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	2717	the new (success) or old (failed) map position. In either case, $done will
…		…
2608		2724
2609	our $GOTOGEN;	2725	our $GOTOGEN;
2610		2726
2611	sub cf::object::player::goto {	2727	sub cf::object::player::goto {
2612	my ($self, $path, $x, $y, $check, $done) = @_;	2728	my ($self, $path, $x, $y, $check, $done) = @_;
		2729
		2730	if ($self->{_link_recursion} >= $MAX_LINKS) {
		2731	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
		2732	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
		2733	($path, $x, $y) = @$EMERGENCY_POSITION;
		2734	}
2613		2735
2614	# do generation counting so two concurrent goto's will be executed in-order	2736	# do generation counting so two concurrent goto's will be executed in-order
2615	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2737	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2616		2738
2617	$self->enter_link;	2739	$self->enter_link;
…		…
2641	my $map = eval {	2763	my $map = eval {
2642	my $map = defined $path ? cf::map::find $path : undef;	2764	my $map = defined $path ? cf::map::find $path : undef;
2643		2765
2644	if ($map) {	2766	if ($map) {
2645	$map = $map->customise_for ($self);	2767	$map = $map->customise_for ($self);
2646	$map = $check->($map) if $check && $map;	2768	$map = $check->($map, $x, $y, $self) if $check && $map;
2647	} else {	2769	} else {
2648	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);	2770	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2649	}	2771	}
2650		2772
2651	$map	2773	$map
…		…
2659	if ($gen == $self->{_goto_generation}) {	2781	if ($gen == $self->{_goto_generation}) {
2660	delete $self->{_goto_generation};	2782	delete $self->{_goto_generation};
2661	$self->leave_link ($map, $x, $y);	2783	$self->leave_link ($map, $x, $y);
2662	}	2784	}
2663		2785
2664	$done->() if $done;	2786	$done->($self) if $done;
2665	})->prio (1);	2787	})->prio (1);
2666	}	2788	}
2667		2789
2668	=item $player_object->enter_exit ($exit_object)	2790	=item $player_object->enter_exit ($exit_object)
2669		2791
…		…
2762	$self->message ("Something went wrong deep within the deliantra server. "	2884	$self->message ("Something went wrong deep within the deliantra server. "
2763	. "I'll try to bring you back to the map you were before. "	2885	. "I'll try to bring you back to the map you were before. "
2764	. "Please report this to the dungeon master!",	2886	. "Please report this to the dungeon master!",
2765	cf::NDI_UNIQUE | cf::NDI_RED);	2887	cf::NDI_UNIQUE | cf::NDI_RED);
2766		2888
2767	warn "ERROR in enter_exit: $@";	2889	error "ERROR in enter_exit: $@";
2768	$self->leave_link;	2890	$self->leave_link;
2769	}	2891	}
2770	})->prio (1);	2892	})->prio (1);
2771	}	2893	}
2772		2894
…		…
3085		3207
3086	$ns->ext_reply ($reply, @reply)	3208	$ns->ext_reply ($reply, @reply)
3087	if $reply;	3209	if $reply;
3088		3210
3089	} else {	3211	} else {
3090	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3212	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3091	}	3213	}
3092		3214
3093	cf::override;	3215	cf::override;
3094	},	3216	},
3095	);	3217	);
…		…
3115		3237
3116	$coro	3238	$coro
3117	}	3239	}
3118		3240
3119	cf::client->attach (	3241	cf::client->attach (
3120	on_destroy => sub {	3242	on_client_destroy => sub {
3121	my ($ns) = @_;	3243	my ($ns) = @_;
3122		3244
3123	$_->cancel for values %{ (delete $ns->{_coro}) || {} };	3245	$_->cancel for values %{ (delete $ns->{_coro}) || {} };
3124	},	3246	},
3125	);	3247	);
…		…
3176	decrease split destroy change_exp value msg lore send_msg)],	3298	decrease split destroy change_exp value msg lore send_msg)],
3177	["cf::object::player" => qw(player)],	3299	["cf::object::player" => qw(player)],
3178	["cf::player" => qw(peaceful send_msg)],	3300	["cf::player" => qw(peaceful send_msg)],
3179	["cf::map" => qw(trigger)],	3301	["cf::map" => qw(trigger)],
3180	) {	3302	) {
3181	no strict 'refs';
3182	my ($pkg, @funs) = @$_;	3303	my ($pkg, @funs) = @$_;
3183	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3304	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3184	for @funs;	3305	for @funs;
3185	}	3306	}
3186		3307
…		…
3225	local @cf::_safe_eval_args = values %vars;	3346	local @cf::_safe_eval_args = values %vars;
3226	@res = wantarray ? eval eval : scalar eval $eval;	3347	@res = wantarray ? eval eval : scalar eval $eval;
3227	}	3348	}
3228		3349
3229	if ($@) {	3350	if ($@) {
3230	warn "$@";	3351	warn "$@",
3231	warn "while executing safe code '$code'\n";	3352	"while executing safe code '$code'\n",
3232	warn "with arguments " . (join " ", %vars) . "\n";	3353	"with arguments " . (join " ", %vars) . "\n";
3233	}	3354	}
3234		3355
3235	wantarray ? @res : $res[0]	3356	wantarray ? @res : $res[0]
3236	}	3357	}
3237		3358
…		…
3271	# for this (global event?)	3392	# for this (global event?)
3272	%ext::player_env::MUSIC_FACE_CACHE = ();	3393	%ext::player_env::MUSIC_FACE_CACHE = ();
3273		3394
3274	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3395	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3275		3396
3276	warn "loading facedata from $path\n";	3397	trace "loading facedata from $path\n";
3277		3398
3278	my $facedata;
3279	0 < aio_load $path, $facedata	3399	0 < aio_load $path, my $facedata
3280	or die "$path: $!";	3400	or die "$path: $!";
3281		3401
3282	$facedata = Coro::Storable::thaw $facedata;	3402	$facedata = Coro::Storable::thaw $facedata;
3283		3403
3284	$facedata->{version} == 2	3404	$facedata->{version} == 2
…		…
3315		3435
3316	if (my $smooth = cf::face::find $info->{smooth}) {	3436	if (my $smooth = cf::face::find $info->{smooth}) {
3317	cf::face::set_smooth $idx, $smooth;	3437	cf::face::set_smooth $idx, $smooth;
3318	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3438	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3319	} else {	3439	} else {
3320	warn "smooth face '$info->{smooth}' not found for face '$face'";	3440	error "smooth face '$info->{smooth}' not found for face '$face'";
3321	}	3441	}
3322		3442
3323	cf::cede_to_tick;	3443	cf::cede_to_tick;
3324	}	3444	}
3325	}	3445	}
…		…
3343	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3463	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3344		3464
3345	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};	3465	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3346	cf::face::set_type $idx, $info->{type};	3466	cf::face::set_type $idx, $info->{type};
3347	} else {	3467	} else {
3348	$RESOURCE{$name} = $info;	3468	$RESOURCE{$name} = $info; # unused
3349	}	3469	}
3350		3470
3351	cf::cede_to_tick;	3471	cf::cede_to_tick;
3352	}	3472	}
3353	}	3473	}
3354		3474
3355	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3475	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3356		3476
3357	1	3477	1
3358	}	3478	}
3359
3360	cf::global->attach (on_resource_update => sub {
3361	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3362	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3363
3364	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3365	my $sound = $soundconf->{compat}[$_]
3366	or next;
3367
3368	my $face = cf::face::find "sound/$sound->[1]";
3369	cf::sound::set $sound->[0] => $face;
3370	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3371	}
3372
3373	while (my ($k, $v) = each %{$soundconf->{event}}) {
3374	my $face = cf::face::find "sound/$v";
3375	cf::sound::set $k => $face;
3376	}
3377	}
3378	});
3379		3479
3380	register_exticmd fx_want => sub {	3480	register_exticmd fx_want => sub {
3381	my ($ns, $want) = @_;	3481	my ($ns, $want) = @_;
3382		3482
3383	while (my ($k, $v) = each %$want) {	3483	while (my ($k, $v) = each %$want) {
…		…
3422	sub reload_treasures {	3522	sub reload_treasures {
3423	load_resource_file "$DATADIR/treasures"	3523	load_resource_file "$DATADIR/treasures"
3424	or die "unable to load treasurelists\n";	3524	or die "unable to load treasurelists\n";
3425	}	3525	}
3426		3526
		3527	sub reload_sound {
		3528	trace "loading sound config from $DATADIR/sound\n";
		3529
		3530	0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
		3531	or die "$DATADIR/sound $!";
		3532
		3533	my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
		3534
		3535	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3536	my $sound = $soundconf->{compat}[$_]
		3537	or next;
		3538
		3539	my $face = cf::face::find "sound/$sound->[1]";
		3540	cf::sound::set $sound->[0] => $face;
		3541	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3542	}
		3543
		3544	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3545	my $face = cf::face::find "sound/$v";
		3546	cf::sound::set $k => $face;
		3547	}
		3548	}
		3549
3427	sub reload_resources {	3550	sub reload_resources {
3428	warn "reloading resource files...\n";	3551	trace "reloading resource files...\n";
3429		3552
		3553	reload_exp_table;
		3554	reload_materials;
3430	reload_facedata;	3555	reload_facedata;
		3556	reload_sound;
3431	reload_archetypes;	3557	reload_archetypes;
3432	reload_regions;	3558	reload_regions;
3433	reload_treasures;	3559	reload_treasures;
3434		3560
3435	warn "finished reloading resource files\n";	3561	trace "finished reloading resource files\n";
3436	}	3562	}
3437		3563
3438	sub reload_config {	3564	sub reload_config {
3439	warn "reloading config file...\n";	3565	trace "reloading config file...\n";
3440		3566
3441	open my $fh, "<:utf8", "$CONFDIR/config"	3567	0 < aio_load "$CONFDIR/config", my $config
3442	or return;	3568	or die "$CONFDIR/config: $!";
3443		3569
3444	local $/;	3570	utf8::decode $config;
3445	*CFG = YAML::XS::Load scalar <$fh>;	3571	*CFG = yaml_load $config;
3446		3572
3447	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3573	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3448		3574
3449	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3575	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3450	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3576	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3451		3577
3452	if (exists $CFG{mlockall}) {	3578	if (exists $CFG{mlockall}) {
…		…
3454	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3580	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3455	and die "WARNING: m(un)lockall failed: $!\n";	3581	and die "WARNING: m(un)lockall failed: $!\n";
3456	};	3582	};
3457	warn $@ if $@;	3583	warn $@ if $@;
3458	}	3584	}
3459
3460	warn "finished reloading resource files\n";
3461	}	3585	}
3462		3586
3463	sub pidfile() {	3587	sub pidfile() {
3464	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3588	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3465	or die "$PIDFILE: $!";	3589	or die "$PIDFILE: $!";
…		…
3478	seek $fh, 0, 0;	3602	seek $fh, 0, 0;
3479	print $fh $$;	3603	print $fh $$;
3480	}	3604	}
3481		3605
3482	sub main_loop {	3606	sub main_loop {
3483	warn "EV::loop starting\n";	3607	trace "EV::loop starting\n";
3484	if (1) {	3608	if (1) {
3485	EV::loop;	3609	EV::loop;
3486	}	3610	}
3487	warn "EV::loop returned\n";	3611	trace "EV::loop returned\n";
3488	goto &main_loop unless $REALLY_UNLOOP;	3612	goto &main_loop unless $REALLY_UNLOOP;
3489	}	3613	}
3490		3614
3491	sub main {	3615	sub main {
3492	cf::init_globals; # initialise logging	3616	cf::init_globals; # initialise logging
3493		3617
3494	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3618	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3495	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3619	LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3496	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3620	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3497	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3621	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3498
3499	cf::init_experience;
3500	cf::init_anim;
3501	cf::init_attackmess;
3502	cf::init_dynamic;
3503		3622
3504	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3623	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3505		3624
3506	# we must not ever block the main coroutine	3625	# we must not ever block the main coroutine
3507	local $Coro::idle = sub {	3626	local $Coro::idle = sub {
…		…
3513	};	3632	};
3514		3633
3515	evthread_start IO::AIO::poll_fileno;	3634	evthread_start IO::AIO::poll_fileno;
3516		3635
3517	cf::sync_job {	3636	cf::sync_job {
		3637	cf::incloader::init ();
		3638
		3639	cf::init_anim;
		3640	cf::init_attackmess;
		3641	cf::init_dynamic;
		3642
3518	cf::load_settings;	3643	cf::load_settings;
3519	cf::load_materials;
3520		3644
3521	reload_resources;	3645	reload_resources;
3522	reload_config;	3646	reload_config;
3523	db_init;	3647	db_init;
3524		3648
3525	cf::init_uuid;	3649	cf::init_uuid;
3526	cf::init_signals;	3650	cf::init_signals;
3527	cf::init_commands;
3528	cf::init_skills;	3651	cf::init_skills;
3529		3652
3530	cf::init_beforeplay;	3653	cf::init_beforeplay;
3531		3654
3532	atomic;	3655	atomic;
…		…
3540	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3663	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3541		3664
3542	(pop @POST_INIT)->(0) while @POST_INIT;	3665	(pop @POST_INIT)->(0) while @POST_INIT;
3543	};	3666	};
3544		3667
		3668	cf::object::thawer::errors_are_fatal 0;
		3669	info "parse errors in files are no longer fatal from this point on.\n";
		3670
		3671	my $free_main; $free_main = EV::idle sub {
		3672	undef $free_main;
		3673	undef &main; # free gobs of memory :)
		3674	};
		3675
3545	main_loop;	3676	goto &main_loop;
3546	}	3677	}
3547		3678
3548	#############################################################################	3679	#############################################################################
3549	# initialisation and cleanup	3680	# initialisation and cleanup
3550		3681
3551	# install some emergency cleanup handlers	3682	# install some emergency cleanup handlers
3552	BEGIN {	3683	BEGIN {
3553	our %SIGWATCHER = ();	3684	our %SIGWATCHER = ();
3554	for my $signal (qw(INT HUP TERM)) {	3685	for my $signal (qw(INT HUP TERM)) {
3555	$SIGWATCHER{$signal} = EV::signal $signal, sub {	3686	$SIGWATCHER{$signal} = AE::signal $signal, sub {
3556	cf::cleanup "SIG$signal";	3687	cf::cleanup "SIG$signal";
3557	};	3688	};
3558	}	3689	}
3559	}	3690	}
3560		3691
3561	sub write_runtime_sync {	3692	sub write_runtime_sync {
		3693	my $t0 = AE::time;
		3694
3562	# first touch the runtime file to show we are still running:	3695	# first touch the runtime file to show we are still running:
3563	# the fsync below can take a very very long time.	3696	# the fsync below can take a very very long time.
3564		3697
3565	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;	3698	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3566		3699
3567	my $guard = cf::lock_acquire "write_runtime";	3700	my $guard = cf::lock_acquire "write_runtime";
3568		3701
3569	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644	3702	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3570	or return;	3703	or return;
3571		3704
3572	my $value = $cf::RUNTIME + 90 + 10;	3705	my $value = $cf::RUNTIME + 90 + 10;
3573	# 10 is the runtime save interval, for a monotonic clock	3706	# 10 is the runtime save interval, for a monotonic clock
3574	# 60 allows for the watchdog to kill the server.	3707	# 60 allows for the watchdog to kill the server.
…		…
3587	or return;	3720	or return;
3588		3721
3589	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3722	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3590	and return;	3723	and return;
3591		3724
3592	warn "runtime file written.\n";	3725	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3593		3726
3594	1	3727	1
3595	}	3728	}
3596		3729
3597	our $uuid_lock;	3730	our $uuid_lock;
…		…
3609	or return;	3742	or return;
3610		3743
3611	my $value = uuid_seq uuid_cur;	3744	my $value = uuid_seq uuid_cur;
3612		3745
3613	unless ($value) {	3746	unless ($value) {
3614	warn "cowardly refusing to write zero uuid value!\n";	3747	info "cowardly refusing to write zero uuid value!\n";
3615	return;	3748	return;
3616	}	3749	}
3617		3750
3618	my $value = uuid_str $value + $uuid_skip;	3751	my $value = uuid_str $value + $uuid_skip;
3619	$uuid_skip = 0;	3752	$uuid_skip = 0;
…		…
3629	or return;	3762	or return;
3630		3763
3631	aio_rename "$uuid~", $uuid	3764	aio_rename "$uuid~", $uuid
3632	and return;	3765	and return;
3633		3766
3634	warn "uuid file written ($value).\n";	3767	trace "uuid file written ($value).\n";
3635		3768
3636	1	3769	1
3637		3770
3638	}	3771	}
3639		3772
…		…
3645	}	3778	}
3646		3779
3647	sub emergency_save() {	3780	sub emergency_save() {
3648	my $freeze_guard = cf::freeze_mainloop;	3781	my $freeze_guard = cf::freeze_mainloop;
3649		3782
3650	warn "emergency_perl_save: enter\n";	3783	info "emergency_perl_save: enter\n";
		3784
		3785	# this is a trade-off: we want to be very quick here, so
		3786	# save all maps without fsync, and later call a global sync
		3787	# (which in turn might be very very slow)
		3788	local $USE_FSYNC = 0;
3651		3789
3652	cf::sync_job {	3790	cf::sync_job {
3653	# this is a trade-off: we want to be very quick here, so	3791	cf::write_runtime_sync; # external watchdog should not bark
3654	# save all maps without fsync, and later call a global sync
3655	# (which in turn might be very very slow)
3656	local $USE_FSYNC = 0;
3657		3792
3658	# use a peculiar iteration method to avoid tripping on perl	3793	# use a peculiar iteration method to avoid tripping on perl
3659	# refcount bugs in for. also avoids problems with players	3794	# refcount bugs in for. also avoids problems with players
3660	# and maps saved/destroyed asynchronously.	3795	# and maps saved/destroyed asynchronously.
3661	warn "emergency_perl_save: begin player save\n";	3796	info "emergency_perl_save: begin player save\n";
3662	for my $login (keys %cf::PLAYER) {	3797	for my $login (keys %cf::PLAYER) {
3663	my $pl = $cf::PLAYER{$login} or next;	3798	my $pl = $cf::PLAYER{$login} or next;
3664	$pl->valid or next;	3799	$pl->valid or next;
3665	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3800	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3666	$pl->save;	3801	$pl->save;
3667	}	3802	}
3668	warn "emergency_perl_save: end player save\n";	3803	info "emergency_perl_save: end player save\n";
3669		3804
		3805	cf::write_runtime_sync; # external watchdog should not bark
		3806
3670	warn "emergency_perl_save: begin map save\n";	3807	info "emergency_perl_save: begin map save\n";
3671	for my $path (keys %cf::MAP) {	3808	for my $path (keys %cf::MAP) {
3672	my $map = $cf::MAP{$path} or next;	3809	my $map = $cf::MAP{$path} or next;
3673	$map->valid or next;	3810	$map->valid or next;
3674	$map->save;	3811	$map->save;
3675	}	3812	}
3676	warn "emergency_perl_save: end map save\n";	3813	info "emergency_perl_save: end map save\n";
3677		3814
		3815	cf::write_runtime_sync; # external watchdog should not bark
		3816
3678	warn "emergency_perl_save: begin database checkpoint\n";	3817	info "emergency_perl_save: begin database checkpoint\n";
3679	BDB::db_env_txn_checkpoint $DB_ENV;	3818	BDB::db_env_txn_checkpoint $DB_ENV;
3680	warn "emergency_perl_save: end database checkpoint\n";	3819	info "emergency_perl_save: end database checkpoint\n";
3681		3820
3682	warn "emergency_perl_save: begin write uuid\n";	3821	info "emergency_perl_save: begin write uuid\n";
3683	write_uuid_sync 1;	3822	write_uuid_sync 1;
3684	warn "emergency_perl_save: end write uuid\n";	3823	info "emergency_perl_save: end write uuid\n";
		3824
		3825	cf::write_runtime_sync; # external watchdog should not bark
		3826
		3827	trace "emergency_perl_save: syncing database to disk";
		3828	BDB::db_env_txn_checkpoint $DB_ENV;
		3829
		3830	info "emergency_perl_save: starting sync\n";
		3831	IO::AIO::aio_sync sub {
		3832	info "emergency_perl_save: finished sync\n";
		3833	};
		3834
		3835	cf::write_runtime_sync; # external watchdog should not bark
		3836
		3837	trace "emergency_perl_save: flushing outstanding aio requests";
		3838	while (IO::AIO::nreqs || BDB::nreqs) {
		3839	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
		3840	}
		3841
		3842	cf::write_runtime_sync; # external watchdog should not bark
3685	};	3843	};
3686		3844
3687	warn "emergency_perl_save: starting sync()\n";
3688	IO::AIO::aio_sync sub {
3689	warn "emergency_perl_save: finished sync()\n";
3690	};
3691
3692	warn "emergency_perl_save: leave\n";	3845	info "emergency_perl_save: leave\n";
3693	}	3846	}
3694		3847
3695	sub post_cleanup {	3848	sub post_cleanup {
3696	my ($make_core) = @_;	3849	my ($make_core) = @_;
3697		3850
		3851	IO::AIO::flush;
		3852
3698	warn Carp::longmess "post_cleanup backtrace"	3853	error Carp::longmess "post_cleanup backtrace"
3699	if $make_core;	3854	if $make_core;
3700		3855
3701	my $fh = pidfile;	3856	my $fh = pidfile;
3702	unlink $PIDFILE if <$fh> == $$;	3857	unlink $PIDFILE if <$fh> == $$;
3703	}	3858	}
…		…
3723	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	3878	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3724	for my $name (keys %$leaf_symtab) {	3879	for my $name (keys %$leaf_symtab) {
3725	_gv_clear *{"$pkg$name"};	3880	_gv_clear *{"$pkg$name"};
3726	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	3881	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3727	}	3882	}
3728	warn "cleared package $pkg\n";#d#
3729	}	3883	}
3730		3884
3731	sub do_reload_perl() {	3885	sub do_reload_perl() {
3732	# can/must only be called in main	3886	# can/must only be called in main
3733	if ($Coro::current != $Coro::main) {	3887	unless (in_main) {
3734	warn "can only reload from main coroutine";	3888	error "can only reload from main coroutine";
3735	return;	3889	return;
3736	}	3890	}
3737		3891
3738	return if $RELOAD++;	3892	return if $RELOAD++;
3739		3893
3740	my $t1 = EV::time;	3894	my $t1 = AE::time;
3741		3895
3742	while ($RELOAD) {	3896	while ($RELOAD) {
		3897	cf::get_slot 0.1, -1, "reload_perl";
3743	warn "reloading...";	3898	info "reloading...";
3744		3899
3745	warn "entering sync_job";	3900	trace "entering sync_job";
3746		3901
3747	cf::sync_job {	3902	cf::sync_job {
3748	cf::write_runtime_sync; # external watchdog should not bark
3749	cf::emergency_save;	3903	#cf::emergency_save;
3750	cf::write_runtime_sync; # external watchdog should not bark
3751		3904
3752	warn "syncing database to disk";
3753	BDB::db_env_txn_checkpoint $DB_ENV;
3754
3755	# if anything goes wrong in here, we should simply crash as we already saved
3756
3757	warn "flushing outstanding aio requests";
3758	while (IO::AIO::nreqs || BDB::nreqs) {
3759	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3760	}
3761
3762	warn "cancelling all extension coros";	3905	trace "cancelling all extension coros";
3763	$_->cancel for values %EXT_CORO;	3906	$_->cancel for values %EXT_CORO;
3764	%EXT_CORO = ();	3907	%EXT_CORO = ();
3765		3908
3766	warn "removing commands";	3909	trace "removing commands";
3767	%COMMAND = ();	3910	%COMMAND = ();
3768		3911
3769	warn "removing ext/exti commands";	3912	trace "removing ext/exti commands";
3770	%EXTCMD = ();	3913	%EXTCMD = ();
3771	%EXTICMD = ();	3914	%EXTICMD = ();
3772		3915
3773	warn "unloading/nuking all extensions";	3916	trace "unloading/nuking all extensions";
3774	for my $pkg (@EXTS) {	3917	for my $pkg (@EXTS) {
3775	warn "... unloading $pkg";	3918	trace "... unloading $pkg";
3776		3919
3777	if (my $cb = $pkg->can ("unload")) {	3920	if (my $cb = $pkg->can ("unload")) {
3778	eval {	3921	eval {
3779	$cb->($pkg);	3922	$cb->($pkg);
3780	1	3923	1
3781	} or warn "$pkg unloaded, but with errors: $@";	3924	} or error "$pkg unloaded, but with errors: $@";
3782	}	3925	}
3783		3926
3784	warn "... clearing $pkg";	3927	trace "... clearing $pkg";
3785	clear_package $pkg;	3928	clear_package $pkg;
3786	}	3929	}
3787		3930
3788	warn "unloading all perl modules loaded from $LIBDIR";	3931	trace "unloading all perl modules loaded from $LIBDIR";
3789	while (my ($k, $v) = each %INC) {	3932	while (my ($k, $v) = each %INC) {
3790	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	3933	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3791		3934
3792	warn "... unloading $k";	3935	trace "... unloading $k";
3793	delete $INC{$k};	3936	delete $INC{$k};
3794		3937
3795	$k =~ s/\.pm$//;	3938	$k =~ s/\.pm$//;
3796	$k =~ s/\//::/g;	3939	$k =~ s/\//::/g;
3797		3940
…		…
3800	}	3943	}
3801		3944
3802	clear_package $k;	3945	clear_package $k;
3803	}	3946	}
3804		3947
3805	warn "getting rid of safe::, as good as possible";	3948	trace "getting rid of safe::, as good as possible";
3806	clear_package "safe::$_"	3949	clear_package "safe::$_"
3807	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	3950	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3808		3951
3809	warn "unloading cf.pm \"a bit\"";	3952	trace "unloading cf.pm \"a bit\"";
3810	delete $INC{"cf.pm"};	3953	delete $INC{"cf.pm"};
3811	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	3954	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3812		3955
3813	# don't, removes xs symbols, too,	3956	# don't, removes xs symbols, too,
3814	# and global variables created in xs	3957	# and global variables created in xs
3815	#clear_package __PACKAGE__;	3958	#clear_package __PACKAGE__;
3816		3959
3817	warn "unload completed, starting to reload now";	3960	info "unload completed, starting to reload now";
3818		3961
3819	warn "reloading cf.pm";	3962	trace "reloading cf.pm";
3820	require cf;	3963	require cf;
3821	cf::_connect_to_perl_1;	3964	cf::_connect_to_perl_1;
3822		3965
3823	warn "loading config and database again";	3966	trace "loading config and database again";
3824	cf::reload_config;	3967	cf::reload_config;
3825		3968
3826	warn "loading extensions";	3969	trace "loading extensions";
3827	cf::load_extensions;	3970	cf::load_extensions;
3828		3971
3829	if ($REATTACH_ON_RELOAD) {	3972	if ($REATTACH_ON_RELOAD) {
3830	warn "reattaching attachments to objects/players";	3973	trace "reattaching attachments to objects/players";
3831	_global_reattach; # objects, sockets	3974	_global_reattach; # objects, sockets
3832	warn "reattaching attachments to maps";	3975	trace "reattaching attachments to maps";
3833	reattach $_ for values %MAP;	3976	reattach $_ for values %MAP;
3834	warn "reattaching attachments to players";	3977	trace "reattaching attachments to players";
3835	reattach $_ for values %PLAYER;	3978	reattach $_ for values %PLAYER;
3836	}	3979	}
3837		3980
3838	warn "running post_init jobs";	3981	trace "running post_init jobs";
3839	(pop @POST_INIT)->(1) while @POST_INIT;	3982	(pop @POST_INIT)->(1) while @POST_INIT;
3840		3983
3841	warn "leaving sync_job";	3984	trace "leaving sync_job";
3842		3985
3843	1	3986	1
3844	} or do {	3987	} or do {
3845	warn $@;	3988	error $@;
3846	cf::cleanup "error while reloading, exiting.";	3989	cf::cleanup "error while reloading, exiting.";
3847	};	3990	};
3848		3991
3849	warn "reloaded";	3992	info "reloaded";
3850	--$RELOAD;	3993	--$RELOAD;
3851	}	3994	}
3852		3995
3853	$t1 = EV::time - $t1;	3996	$t1 = AE::time - $t1;
3854	warn "reload completed in ${t1}s\n";	3997	info "reload completed in ${t1}s\n";
3855	};	3998	};
3856		3999
3857	our $RELOAD_WATCHER; # used only during reload	4000	our $RELOAD_WATCHER; # used only during reload
3858		4001
3859	sub reload_perl() {	4002	sub reload_perl() {
…		…
3861	# coro crashes during coro_state_free->destroy here.	4004	# coro crashes during coro_state_free->destroy here.
3862		4005
3863	$RELOAD_WATCHER ||= cf::async {	4006	$RELOAD_WATCHER ||= cf::async {
3864	Coro::AIO::aio_wait cache_extensions;	4007	Coro::AIO::aio_wait cache_extensions;
3865		4008
3866	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {	4009	$RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3867	do_reload_perl;	4010	do_reload_perl;
3868	undef $RELOAD_WATCHER;	4011	undef $RELOAD_WATCHER;
3869	};	4012	};
3870	};	4013	};
3871	}	4014	}
…		…
3880	reload_perl;	4023	reload_perl;
3881	};	4024	};
3882	}	4025	}
3883	};	4026	};
3884		4027
3885	unshift @INC, $LIBDIR;	4028	#############################################################################
3886		4029
3887	my $bug_warning = 0;	4030	my $bug_warning = 0;
3888		4031
3889	our @WAIT_FOR_TICK;	4032	our @WAIT_FOR_TICK;
3890	our @WAIT_FOR_TICK_BEGIN;	4033	our @WAIT_FOR_TICK_BEGIN;
3891		4034
3892	sub wait_for_tick {	4035	sub wait_for_tick() {
3893	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4036	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3894		4037
3895	my $signal = new Coro::Signal;	4038	my $signal = new Coro::Signal;
3896	push @WAIT_FOR_TICK, $signal;	4039	push @WAIT_FOR_TICK, $signal;
3897	$signal->wait;	4040	$signal->wait;
3898	}	4041	}
3899		4042
3900	sub wait_for_tick_begin {	4043	sub wait_for_tick_begin() {
3901	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4044	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3902		4045
3903	my $signal = new Coro::Signal;	4046	my $signal = new Coro::Signal;
3904	push @WAIT_FOR_TICK_BEGIN, $signal;	4047	push @WAIT_FOR_TICK_BEGIN, $signal;
3905	$signal->wait;	4048	$signal->wait;
…		…
3912	return;	4055	return;
3913	}	4056	}
3914		4057
3915	cf::server_tick; # one server iteration	4058	cf::server_tick; # one server iteration
3916		4059
		4060	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
		4061
3917	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4062	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3918	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4063	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3919	Coro::async_pool {	4064	Coro::async_pool {
3920	$Coro::current->{desc} = "runtime saver";	4065	$Coro::current->{desc} = "runtime saver";
3921	write_runtime_sync	4066	write_runtime_sync
3922	or warn "ERROR: unable to write runtime file: $!";	4067	or error "ERROR: unable to write runtime file: $!";
3923	};	4068	};
3924	}	4069	}
3925		4070
3926	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4071	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3927	$sig->send;	4072	$sig->send;
…		…
3935		4080
3936	if (0) {	4081	if (0) {
3937	if ($NEXT_TICK) {	4082	if ($NEXT_TICK) {
3938	my $jitter = $TICK_START - $NEXT_TICK;	4083	my $jitter = $TICK_START - $NEXT_TICK;
3939	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4084	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
3940	warn "jitter $JITTER\n";#d#	4085	debug "jitter $JITTER\n";#d#
3941	}	4086	}
3942	}	4087	}
3943	}	4088	}
3944		4089
3945	{	4090	{
3946	# configure BDB	4091	# configure BDB
3947		4092
3948	BDB::min_parallel 8;	4093	BDB::min_parallel 16;
3949	BDB::max_poll_reqs $TICK * 0.1;	4094	BDB::max_poll_reqs $TICK * 0.1;
3950	$AnyEvent::BDB::WATCHER->priority (1);	4095	$AnyEvent::BDB::WATCHER->priority (1);
3951		4096
3952	unless ($DB_ENV) {	4097	unless ($DB_ENV) {
3953	$DB_ENV = BDB::db_env_create;	4098	$DB_ENV = BDB::db_env_create;

Diff Legend

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