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.487 by root, Fri Oct 16 01:56:41 2009 UTC vs.
Revision 1.558 by root, Tue Oct 5 22:35:30 2010 UTC

1	#	1	#
2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	#	3	#
4	# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	#	5	#
6	# Deliantra is free software: you can redistribute it and/or modify it under	6	# Deliantra is free software: you can redistribute it and/or modify it under
7	# the terms of the Affero GNU General Public License as published by the	7	# the terms of the Affero GNU General Public License as published by the
8	# Free Software Foundation, either version 3 of the License, or (at your	8	# Free Software Foundation, either version 3 of the License, or (at your
9	# option) any later version.	9	# option) any later version.
…		…
20	# The authors can be reached via e-mail to <support@deliantra.net>	20	# The authors can be reached via e-mail to <support@deliantra.net>
21	#	21	#
22		22
23	package cf;	23	package cf;
24		24
25	use 5.10.0;	25	use common::sense;
26	use utf8;
27	use strict qw(vars subs);
28		26
29	use Symbol;	27	use Symbol;
30	use List::Util;	28	use List::Util;
31	use Socket;	29	use Socket;
32	use EV;	30	use EV;
33	use Opcode;	31	use Opcode;
34	use Safe;	32	use Safe;
35	use Safe::Hole;	33	use Safe::Hole;
36	use Storable ();	34	use Storable ();
		35	use Carp ();
37		36
38	use Guard ();	37	use Guard ();
39	use Coro ();	38	use Coro ();
40	use Coro::State;	39	use Coro::State;
41	use Coro::Handle;	40	use Coro::Handle;
…		…
52	use Coro::Util ();	51	use Coro::Util ();
53		52
54	use JSON::XS 2.01 ();	53	use JSON::XS 2.01 ();
55	use BDB ();	54	use BDB ();
56	use Data::Dumper;	55	use Data::Dumper;
57	use Digest::MD5;
58	use Fcntl;	56	use Fcntl;
59	use YAML::XS ();	57	use YAML::XS ();
60	use IO::AIO ();	58	use IO::AIO ();
61	use Time::HiRes;	59	use Time::HiRes;
62	use Compress::LZF;	60	use Compress::LZF;
…		…
77		75
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
		80
		81	our @ORIG_INC;
82		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
…		…
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.
230		240
		241	=cut
		242
		243	sub wait_for_tick();
		244	sub wait_for_tick_begin();
		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
235	that call.	250	that call.
236		251
237	=item %cf::REFLECT	252	=item %cf::REFLECT
238		253
…		…
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
…		…
289	)) {	310	)) {
290	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	311	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
291	}	312	}
292		313
293	$EV::DIED = sub {	314	$EV::DIED = sub {
294	warn "error in event callback: @_";	315	Carp::cluck "error in event callback: @_";
295	};	316	};
296		317
297	#############################################################################	318	#############################################################################
298		319
299	=head2 UTILITY FUNCTIONS	320	=head2 UTILITY FUNCTIONS
…		…
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(&) {
352	push @POST_INIT, shift;	385	push @POST_INIT, shift;
		386	}
		387
		388	sub _post_init {
		389	trace "running post_init jobs";
		390
		391	# run them in parallel...
		392
		393	my @join;
		394
		395	while () {
		396	push @join, map &Coro::async ($_, 0), @POST_INIT;
		397	@POST_INIT = ();
		398
		399	@join or last;
		400
		401	(pop @join)->join;
		402	}
353	}	403	}
354		404
355	=item cf::lock_wait $string	405	=item cf::lock_wait $string
356		406
357	Wait until the given lock is available. See cf::lock_acquire.	407	Wait until the given lock is available. See cf::lock_acquire.
…		…
396	}	446	}
397		447
398	=item cf::periodic $interval, $cb	448	=item cf::periodic $interval, $cb
399		449
400	Like EV::periodic, but randomly selects a starting point so that the actions	450	Like EV::periodic, but randomly selects a starting point so that the actions
401	get spread over timer.	451	get spread over time.
402		452
403	=cut	453	=cut
404		454
405	sub periodic($$) {	455	sub periodic($$) {
406	my ($interval, $cb) = @_;	456	my ($interval, $cb) = @_;
…		…
423		473
424	=cut	474	=cut
425		475
426	our @SLOT_QUEUE;	476	our @SLOT_QUEUE;
427	our $SLOT_QUEUE;	477	our $SLOT_QUEUE;
		478	our $SLOT_DECAY = 0.9;
428		479
429	$SLOT_QUEUE->cancel if $SLOT_QUEUE;	480	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
430	$SLOT_QUEUE = Coro::async {	481	$SLOT_QUEUE = Coro::async {
431	$Coro::current->desc ("timeslot manager");	482	$Coro::current->desc ("timeslot manager");
432		483
433	my $signal = new Coro::Signal;	484	my $signal = new Coro::Signal;
		485	my $busy;
434		486
435	while () {	487	while () {
436	next_job:	488	next_job:
		489
437	my $avail = cf::till_tick;	490	my $avail = cf::till_tick;
438	if ($avail > 0.01) {	491
439	for (0 .. $#SLOT_QUEUE) {	492	for (0 .. $#SLOT_QUEUE) {
440	if ($SLOT_QUEUE[$_][0] < $avail) {	493	if ($SLOT_QUEUE[$_][0] <= $avail) {
		494	$busy = 0;
441	my $job = splice @SLOT_QUEUE, $_, 1, ();	495	my $job = splice @SLOT_QUEUE, $_, 1, ();
442	$job->[2]->send;	496	$job->[2]->send;
443	Coro::cede;	497	Coro::cede;
444	goto next_job;	498	goto next_job;
445	}	499	} else {
		500	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
446	}	501	}
447	}	502	}
448		503
449	if (@SLOT_QUEUE) {	504	if (@SLOT_QUEUE) {
450	# we do not use wait_for_tick() as it returns immediately when tick is inactive	505	# we do not use wait_for_tick() as it returns immediately when tick is inactive
451	push @cf::WAIT_FOR_TICK, $signal;	506	push @cf::WAIT_FOR_TICK, $signal;
452	$signal->wait;	507	$signal->wait;
453	} else {	508	} else {
		509	$busy = 0;
454	Coro::schedule;	510	Coro::schedule;
455	}	511	}
456	}	512	}
457	};	513	};
458		514
459	sub get_slot($;$$) {	515	sub get_slot($;$$) {
460	return if tick_inhibit || $Coro::current == $Coro::main;	516	return if tick_inhibit || $Coro::current == $Coro::main;
461		517
462	my ($time, $pri, $name) = @_;	518	my ($time, $pri, $name) = @_;
463		519
464	$time = $TICK * .6 if $time > $TICK * .6;	520	$time = clamp $time, 0.01, $TICK * .6;
		521
465	my $sig = new Coro::Signal;	522	my $sig = new Coro::Signal;
466		523
467	push @SLOT_QUEUE, [$time, $pri, $sig, $name];	524	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
468	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;	525	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
469	$SLOT_QUEUE->ready;	526	$SLOT_QUEUE->ready;
…		…
495	=cut	552	=cut
496		553
497	sub sync_job(&) {	554	sub sync_job(&) {
498	my ($job) = @_;	555	my ($job) = @_;
499		556
500	if ($Coro::current == $Coro::main) {	557	if (in_main) {
501	my $time = EV::time;	558	my $time = AE::time;
502		559
503	# this is the main coro, too bad, we have to block	560	# this is the main coro, too bad, we have to block
504	# till the operation succeeds, freezing the server :/	561	# till the operation succeeds, freezing the server :/
505		562
506	LOG llevError, Carp::longmess "sync job";#d#	563	#LOG llevError, Carp::longmess "sync job";#d#
507		564
508	my $freeze_guard = freeze_mainloop;	565	my $freeze_guard = freeze_mainloop;
509		566
510	my $busy = 1;	567	my $busy = 1;
511	my @res;	568	my @res;
512		569
513	(async {	570	(async {
514	$Coro::current->desc ("sync job coro");	571	$Coro::current->desc ("sync job coro");
515	@res = eval { $job->() };	572	@res = eval { $job->() };
516	warn $@ if $@;	573	error $@ if $@;
517	undef $busy;	574	undef $busy;
518	})->prio (Coro::PRIO_MAX);	575	})->prio (Coro::PRIO_MAX);
519		576
520	while ($busy) {	577	while ($busy) {
521	if (Coro::nready) {	578	if (Coro::nready) {
…		…
523	} else {	580	} else {
524	EV::loop EV::LOOP_ONESHOT;	581	EV::loop EV::LOOP_ONESHOT;
525	}	582	}
526	}	583	}
527		584
528	my $time = EV::time - $time;	585	my $time = AE::time - $time;
529		586
530	$TICK_START += $time; # do not account sync jobs to server load	587	$TICK_START += $time; # do not account sync jobs to server load
531		588
532	wantarray ? @res : $res[0]	589	wantarray ? @res : $res[0]
533	} else {	590	} else {
…		…
555	$EXT_CORO{$coro+0} = $coro;	612	$EXT_CORO{$coro+0} = $coro;
556		613
557	$coro	614	$coro
558	}	615	}
559		616
560	=item fork_call { }, $args	617	=item fork_call { }, @args
561		618
562	Executes the given code block with the given arguments in a seperate	619	Executes the given code block with the given arguments in a seperate
563	process, returning the results. Everything must be serialisable with	620	process, returning the results. Everything must be serialisable with
564	Coro::Storable. May, of course, block. Note that the executed sub may	621	Coro::Storable. May, of course, block. Note that the executed sub may
565	never block itself or use any form of event handling.	622	never block itself or use any form of event handling.
566		623
567	=cut	624	=cut
568		625
		626	sub post_fork {
		627	reset_signals;
		628	}
		629
569	sub fork_call(&@) {	630	sub fork_call(&@) {
570	my ($cb, @args) = @_;	631	my ($cb, @args) = @_;
571		632
572	# we seemingly have to make a local copy of the whole thing,	633	# we seemingly have to make a local copy of the whole thing,
573	# otherwise perl prematurely frees the stuff :/	634	# otherwise perl prematurely frees the stuff :/
574	# TODO: investigate and fix (likely this will be rather laborious)	635	# TODO: investigate and fix (likely this will be rather laborious)
575		636
576	my @res = Coro::Util::fork_eval {	637	my @res = Coro::Util::fork_eval {
577	reset_signals;	638	cf::post_fork;
578	&$cb	639	&$cb
579	}, @args;	640	} @args;
580		641
581	wantarray ? @res : $res[-1]	642	wantarray ? @res : $res[-1]
		643	}
		644
		645	sub objinfo {
		646	(
		647	"counter value" => cf::object::object_count,
		648	"objects created" => cf::object::create_count,
		649	"objects destroyed" => cf::object::destroy_count,
		650	"freelist size" => cf::object::free_count,
		651	"allocated objects" => cf::object::objects_size,
		652	"active objects" => cf::object::actives_size,
		653	)
582	}	654	}
583		655
584	=item $coin = coin_from_name $name	656	=item $coin = coin_from_name $name
585		657
586	=cut	658	=cut
…		…
623	within each server.	695	within each server.
624		696
625	=cut	697	=cut
626		698
627	sub db_table($) {	699	sub db_table($) {
		700	cf::error "db_get called from main context"
		701	if $Coro::current == $Coro::main;
		702
628	my ($name) = @_;	703	my ($name) = @_;
629	my $db = BDB::db_create $DB_ENV;	704	my $db = BDB::db_create $DB_ENV;
630		705
631	eval {	706	eval {
632	$db->set_flags (BDB::CHKSUM);	707	$db->set_flags (BDB::CHKSUM);
…		…
642	}	717	}
643		718
644	our $DB;	719	our $DB;
645		720
646	sub db_init {	721	sub db_init {
647	cf::sync_job {
648	$DB ||= db_table "db";	722	$DB ||= db_table "db";
649	};
650	}	723	}
651		724
652	sub db_get($$) {	725	sub db_get($$) {
653	my $key = "$_[0]/$_[1]";	726	my $key = "$_[0]/$_[1]";
654		727
655	cf::sync_job {	728	cf::error "db_get called from main context"
		729	if $Coro::current == $Coro::main;
		730
656	BDB::db_get $DB, undef, $key, my $data;	731	BDB::db_get $DB, undef, $key, my $data;
657		732
658	$! ? ()	733	$! ? ()
659	: $data	734	: $data
660	}
661	}	735	}
662		736
663	sub db_put($$$) {	737	sub db_put($$$) {
664	BDB::dbreq_pri 4;	738	BDB::dbreq_pri 4;
665	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	739	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
721		795
722	my $t1 = Time::HiRes::time;	796	my $t1 = Time::HiRes::time;
723	my $data = $process->(\@data);	797	my $data = $process->(\@data);
724	my $t2 = Time::HiRes::time;	798	my $t2 = Time::HiRes::time;
725		799
726	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	800	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
727		801
728	db_put cache => "$id/data", $data;	802	db_put cache => "$id/data", $data;
729	db_put cache => "$id/md5" , $md5;	803	db_put cache => "$id/md5" , $md5;
730	db_put cache => "$id/meta", $meta;	804	db_put cache => "$id/meta", $meta;
731		805
…		…
741		815
742	=cut	816	=cut
743		817
744	sub datalog($@) {	818	sub datalog($@) {
745	my ($type, %kv) = @_;	819	my ($type, %kv) = @_;
746	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	820	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
747	}	821	}
748		822
749	=back	823	=back
750		824
751	=cut	825	=cut
…		…
946		1020
947	} elsif (exists $cb_id{$type}) {	1021	} elsif (exists $cb_id{$type}) {
948	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	1022	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
949		1023
950	} elsif (ref $type) {	1024	} elsif (ref $type) {
951	warn "attaching objects not supported, ignoring.\n";	1025	error "attaching objects not supported, ignoring.\n";
952		1026
953	} else {	1027	} else {
954	shift @arg;	1028	shift @arg;
955	warn "attach argument '$type' not supported, ignoring.\n";	1029	error "attach argument '$type' not supported, ignoring.\n";
956	}	1030	}
957	}	1031	}
958	}	1032	}
959		1033
960	sub _object_attach {	1034	sub _object_attach {
…		…
970	_attach $registry, $klass, @attach;	1044	_attach $registry, $klass, @attach;
971	}	1045	}
972		1046
973	$obj->{$name} = \%arg;	1047	$obj->{$name} = \%arg;
974	} else {	1048	} else {
975	warn "object uses attachment '$name' which is not available, postponing.\n";	1049	info "object uses attachment '$name' which is not available, postponing.\n";
976	}	1050	}
977		1051
978	$obj->{_attachment}{$name} = undef;	1052	$obj->{_attachment}{$name} = undef;
979	}	1053	}
980		1054
…		…
1039		1113
1040	for (@$callbacks) {	1114	for (@$callbacks) {
1041	eval { &{$_->[1]} };	1115	eval { &{$_->[1]} };
1042		1116
1043	if ($@) {	1117	if ($@) {
1044	warn "$@";
1045	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1118	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1046	override;	1119	override;
1047	}	1120	}
1048		1121
1049	return 1 if $override;	1122	return 1 if $override;
1050	}	1123	}
…		…
1129	for (@$attach) {	1202	for (@$attach) {
1130	my ($klass, @attach) = @$_;	1203	my ($klass, @attach) = @$_;
1131	_attach $registry, $klass, @attach;	1204	_attach $registry, $klass, @attach;
1132	}	1205	}
1133	} else {	1206	} else {
1134	warn "object uses attachment '$name' that is not available, postponing.\n";	1207	info "object uses attachment '$name' that is not available, postponing.\n";
1135	}	1208	}
1136	}	1209	}
1137	}	1210	}
1138		1211
1139	cf::attachable->attach (	1212	cf::attachable->attach (
…		…
1166	my ($filename, $rdata, $objs) = @_;	1239	my ($filename, $rdata, $objs) = @_;
1167		1240
1168	sync_job {	1241	sync_job {
1169	if (length $$rdata) {	1242	if (length $$rdata) {
1170	utf8::decode (my $decname = $filename);	1243	utf8::decode (my $decname = $filename);
1171	warn sprintf "saving %s (%d,%d)\n",	1244	trace sprintf "saving %s (%d,%d)\n",
1172	$decname, length $$rdata, scalar @$objs;	1245	$decname, length $$rdata, scalar @$objs
		1246	if $VERBOSE_IO;
1173		1247
1174	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1248	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1175	aio_chmod $fh, SAVE_MODE;	1249	aio_chmod $fh, SAVE_MODE;
1176	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1250	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1177	if ($cf::USE_FSYNC) {	1251	if ($cf::USE_FSYNC) {
…		…
1199	aio_rename "$filename~", $filename;	1273	aio_rename "$filename~", $filename;
1200		1274
1201	$filename =~ s%/[^/]+$%%;	1275	$filename =~ s%/[^/]+$%%;
1202	aio_pathsync $filename if $cf::USE_FSYNC;	1276	aio_pathsync $filename if $cf::USE_FSYNC;
1203	} else {	1277	} else {
1204	warn "unable to save objects: $filename~: $!\n";	1278	error "unable to save objects: $filename~: $!\n";
1205	}	1279	}
1206	} else {	1280	} else {
1207	aio_unlink $filename;	1281	aio_unlink $filename;
1208	aio_unlink "$filename.pst";	1282	aio_unlink "$filename.pst";
1209	}	1283	}
…		…
1233	my $st = eval { Coro::Storable::thaw $av };	1307	my $st = eval { Coro::Storable::thaw $av };
1234	$av = $st->{objs};	1308	$av = $st->{objs};
1235	}	1309	}
1236		1310
1237	utf8::decode (my $decname = $filename);	1311	utf8::decode (my $decname = $filename);
1238	warn sprintf "loading %s (%d,%d)\n",	1312	trace sprintf "loading %s (%d,%d)\n",
1239	$decname, length $data, scalar @{$av || []};	1313	$decname, length $data, scalar @{$av || []}
		1314	if $VERBOSE_IO;
1240		1315
1241	($data, $av)	1316	($data, $av)
1242	}	1317	}
1243		1318
1244	=head2 COMMAND CALLBACKS	1319	=head2 COMMAND CALLBACKS
…		…
1303	}	1378	}
1304		1379
1305	use File::Glob ();	1380	use File::Glob ();
1306		1381
1307	cf::player->attach (	1382	cf::player->attach (
1308	on_command => sub {	1383	on_unknown_command => sub {
1309	my ($pl, $name, $params) = @_;	1384	my ($pl, $name, $params) = @_;
1310		1385
1311	my $cb = $COMMAND{$name}	1386	my $cb = $COMMAND{$name}
1312	or return;	1387	or return;
1313		1388
…		…
1336		1411
1337	$pl->ext_reply ($reply, @reply)	1412	$pl->ext_reply ($reply, @reply)
1338	if $reply;	1413	if $reply;
1339		1414
1340	} else {	1415	} else {
1341	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1416	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1342	}	1417	}
1343		1418
1344	cf::override;	1419	cf::override;
1345	},	1420	},
1346	);	1421	);
…		…
1357		1432
1358	$grp	1433	$grp
1359	}	1434	}
1360		1435
1361	sub load_extensions {	1436	sub load_extensions {
		1437	info "loading extensions...";
		1438
1362	cf::sync_job {	1439	cf::sync_job {
1363	my %todo;	1440	my %todo;
1364		1441
1365	for my $path (<$LIBDIR/*.ext>) {	1442	for my $path (<$LIBDIR/*.ext>) {
1366	next unless -r $path;	1443	next unless -r $path;
…		…
1384		1461
1385	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1462	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1386	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1463	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1387		1464
1388	$ext{source} =	1465	$ext{source} =
1389	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1466	"package $pkg; use common::sense;\n"
1390	. "#line 1 \"$path\"\n{\n"	1467	. "#line 1 \"$path\"\n{\n"
1391	. $source	1468	. $source
1392	. "\n};\n1";	1469	. "\n};\n1";
1393		1470
1394	$todo{$base} = \%ext;	1471	$todo{$base} = \%ext;
1395	}	1472	}
1396		1473
		1474	my $pass = 0;
1397	my %done;	1475	my %done;
1398	while (%todo) {	1476	while (%todo) {
1399	my $progress;	1477	my $progress;
1400		1478
		1479	++$pass;
		1480
		1481	ext:
1401	while (my ($k, $v) = each %todo) {	1482	while (my ($k, $v) = each %todo) {
1402	for (split /,\s*/, $v->{meta}{depends}) {	1483	for (split /,\s*/, $v->{meta}{depends}) {
1403	goto skip	1484	next ext
1404	unless exists $done{$_};	1485	unless exists $done{$_};
1405	}	1486	}
1406		1487
1407	warn "... loading '$k' into '$v->{pkg}'\n";	1488	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1408		1489
1409	unless (eval $v->{source}) {	1490	my $active = eval $v->{source};
		1491
		1492	if (length $@) {
1410	my $msg = $@ ? "$v->{path}: $@\n"	1493	error "$v->{path}: $@\n";
1411	: "$v->{base}: extension inactive.\n";
1412		1494
1413	if (exists $v->{meta}{mandatory}) {
1414	warn $msg;
1415	cf::cleanup "mandatory extension failed to load, exiting.";	1495	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1416	}	1496	if exists $v->{meta}{mandatory};
1417		1497
1418	warn $msg;	1498	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
		1499	delete $todo{$k};
		1500	} else {
		1501	$done{$k} = delete $todo{$k};
		1502	push @EXTS, $v->{pkg};
		1503	$progress = 1;
		1504
		1505	info "$v->{base}: extension inactive.\n"
		1506	unless $active;
1419	}	1507	}
1420
1421	$done{$k} = delete $todo{$k};
1422	push @EXTS, $v->{pkg};
1423	$progress = 1;
1424	}	1508	}
1425		1509
1426	skip:	1510	unless ($progress) {
1427	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"	1511	warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1428	unless $progress;	1512
		1513	while (my ($k, $v) = each %todo) {
		1514	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
		1515	if exists $v->{meta}{mandatory};
		1516	}
		1517	}
1429	}	1518	}
1430	};	1519	};
1431	}	1520	}
1432		1521
1433	#############################################################################	1522	#############################################################################
…		…
1517	$cf::PLAYER{$login} = $pl	1606	$cf::PLAYER{$login} = $pl
1518	}	1607	}
1519	}	1608	}
1520	}	1609	}
1521		1610
		1611	cf::player->attach (
		1612	on_load => sub {
		1613	my ($pl, $path) = @_;
		1614
		1615	# restore slots saved in save, below
		1616	my $slots = delete $pl->{_slots};
		1617
		1618	$pl->ob->current_weapon ($slots->[0]);
		1619	$pl->combat_ob ($slots->[1]);
		1620	$pl->ranged_ob ($slots->[2]);
		1621	},
		1622	);
		1623
1522	sub save($) {	1624	sub save($) {
1523	my ($pl) = @_;	1625	my ($pl) = @_;
1524		1626
1525	return if $pl->{deny_save};	1627	return if $pl->{deny_save};
1526		1628
…		…
1531		1633
1532	aio_mkdir playerdir $pl, 0770;	1634	aio_mkdir playerdir $pl, 0770;
1533	$pl->{last_save} = $cf::RUNTIME;	1635	$pl->{last_save} = $cf::RUNTIME;
1534		1636
1535	cf::get_slot 0.01;	1637	cf::get_slot 0.01;
		1638
		1639	# save slots, to be restored later
		1640	local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1536		1641
1537	$pl->save_pl ($path);	1642	$pl->save_pl ($path);
1538	cf::cede_to_tick;	1643	cf::cede_to_tick;
1539	}	1644	}
1540		1645
…		…
1574	my $name = $pl->ob->name;	1679	my $name = $pl->ob->name;
1575		1680
1576	$pl->{deny_save} = 1;	1681	$pl->{deny_save} = 1;
1577	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1682	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1578		1683
1579	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1684	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1580	$pl->deactivate;	1685	$pl->deactivate;
		1686
1581	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1687	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1582	$pl->ob->check_score;
1583	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1688	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1689	ext::highscore::check ($pl->ob);
		1690
1584	$pl->ns->destroy if $pl->ns;	1691	$pl->ns->destroy if $pl->ns;
1585		1692
1586	my $path = playerdir $pl;	1693	my $path = playerdir $pl;
1587	my $temp = "$path~$cf::RUNTIME~deleting~";	1694	my $temp = "$path~$cf::RUNTIME~deleting~";
1588	aio_rename $path, $temp;	1695	aio_rename $path, $temp;
…		…
1642	\@logins	1749	\@logins
1643	}	1750	}
1644		1751
1645	=item $player->maps	1752	=item $player->maps
1646		1753
		1754	=item cf::player::maps $login
		1755
1647	Returns an arrayref of map paths that are private for this	1756	Returns an arrayref of map paths that are private for this
1648	player. May block.	1757	player. May block.
1649		1758
1650	=cut	1759	=cut
1651		1760
…		…
1713	=cut	1822	=cut
1714		1823
1715	sub find_by_path($) {	1824	sub find_by_path($) {
1716	my ($path) = @_;	1825	my ($path) = @_;
1717		1826
		1827	$path =~ s/^~[^\/]*//; # skip ~login
		1828
1718	my ($match, $specificity);	1829	my ($match, $specificity);
1719		1830
1720	for my $region (list) {	1831	for my $region (list) {
1721	if ($region->{match} && $path =~ $region->{match}) {	1832	if ($region->{match} && $path =~ $region->{match}) {
1722	($match, $specificity) = ($region, $region->specificity)	1833	($match, $specificity) = ($region, $region->specificity)
…		…
1750	sub generate_random_map {	1861	sub generate_random_map {
1751	my ($self, $rmp) = @_;	1862	my ($self, $rmp) = @_;
1752		1863
1753	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	1864	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1754		1865
1755	# mit "rum" bekleckern, nicht
1756	$self->_create_random_map (	1866	$self->_create_random_map ($rmp);
1757	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1758	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1759	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1760	$rmp->{exit_on_final_map},
1761	$rmp->{xsize}, $rmp->{ysize},
1762	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1763	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1764	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1765	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1766	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1767	(cf::region::find $rmp->{region}), $rmp->{custom}
1768	)
1769	}	1867	}
1770		1868
1771	=item cf::map->register ($regex, $prio)	1869	=item cf::map->register ($regex, $prio)
1772		1870
1773	Register a handler for the map path matching the given regex at the	1871	Register a handler for the map path matching the given regex at the
…		…
1778		1876
1779	sub register {	1877	sub register {
1780	my (undef, $regex, $prio) = @_;	1878	my (undef, $regex, $prio) = @_;
1781	my $pkg = caller;	1879	my $pkg = caller;
1782		1880
1783	no strict;
1784	push @{"$pkg\::ISA"}, __PACKAGE__;	1881	push @{"$pkg\::ISA"}, __PACKAGE__;
1785		1882
1786	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	1883	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1787	}	1884	}
1788		1885
1789	# also paths starting with '/'	1886	# also paths starting with '/'
1790	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	1887	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1791		1888
1792	sub thawer_merge {	1889	sub thawer_merge {
1793	my ($self, $merge) = @_;	1890	my ($self, $merge) = @_;
1794		1891
1795	# we have to keep some variables in memory intact	1892	# we have to keep some variables in memory intact
…		…
1800	}	1897	}
1801		1898
1802	sub normalise {	1899	sub normalise {
1803	my ($path, $base) = @_;	1900	my ($path, $base) = @_;
1804		1901
1805	$path = "$path"; # make sure its a string	1902	$path = "$path"; # make sure it's a string
1806		1903
1807	$path =~ s/\.map$//;	1904	$path =~ s/\.map$//;
1808		1905
1809	# map plan:	1906	# map plan:
1810	#	1907	#
…		…
1825	$base =~ s{[^/]+/?$}{};	1922	$base =~ s{[^/]+/?$}{};
1826	$path = "$base/$path";	1923	$path = "$base/$path";
1827	}	1924	}
1828		1925
1829	for ($path) {	1926	for ($path) {
1830	redo if s{//}{/};
1831	redo if s{/\.?/}{/};	1927	redo if s{/\.?/}{/};
1832	redo if s{/[^/]+/\.\./}{/};	1928	redo if s{/[^/]+/\.\./}{/};
1833	}	1929	}
1834		1930
1835	$path	1931	$path
…		…
1849	$self->init; # pass $1 etc.	1945	$self->init; # pass $1 etc.
1850	return $self;	1946	return $self;
1851	}	1947	}
1852	}	1948	}
1853		1949
1854	Carp::cluck "unable to resolve path '$path' (base '$base').";	1950	Carp::cluck "unable to resolve path '$path' (base '$base')";
1855	()	1951	()
1856	}	1952	}
1857		1953
1858	sub init {	1954	sub init {
1859	my ($self) = @_;	1955	my ($self) = @_;
…		…
1981	}	2077	}
1982		2078
1983	sub find;	2079	sub find;
1984	sub find {	2080	sub find {
1985	my ($path, $origin) = @_;	2081	my ($path, $origin) = @_;
		2082
		2083	cf::cede_to_tick;
1986		2084
1987	$path = normalise $path, $origin && $origin->path;	2085	$path = normalise $path, $origin && $origin->path;
1988		2086
1989	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2087	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1990	my $guard2 = cf::lock_acquire "map_find:$path";	2088	my $guard2 = cf::lock_acquire "map_find:$path";
…		…
2009		2107
2010	$cf::MAP{$path} = $map	2108	$cf::MAP{$path} = $map
2011	}	2109	}
2012	}	2110	}
2013		2111
2014	sub pre_load { }	2112	sub pre_load { }
2015	sub post_load { }	2113	#sub post_load { } # XS
2016		2114
2017	sub load {	2115	sub load {
2018	my ($self) = @_;	2116	my ($self) = @_;
2019		2117
2020	local $self->{deny_reset} = 1; # loading can take a long time	2118	local $self->{deny_reset} = 1; # loading can take a long time
…		…
2075		2173
2076	$self->in_memory (cf::MAP_ACTIVE);	2174	$self->in_memory (cf::MAP_ACTIVE);
2077	}	2175	}
2078		2176
2079	$self->post_load;	2177	$self->post_load;
2080	}
2081		2178
		2179	1
		2180	}
		2181
		2182	# customize the map for a given player, i.e.
		2183	# return the _real_ map. used by e.g. per-player
		2184	# maps to change the path to ~playername/mappath
2082	sub customise_for {	2185	sub customise_for {
2083	my ($self, $ob) = @_;	2186	my ($self, $ob) = @_;
2084		2187
2085	return find "~" . $ob->name . "/" . $self->{path}	2188	return find "~" . $ob->name . "/" . $self->{path}
2086	if $self->per_player;	2189	if $self->per_player;
…		…
2102	or next;	2205	or next;
2103	$neigh = find $neigh, $map	2206	$neigh = find $neigh, $map
2104	or next;	2207	or next;
2105	$neigh->load;	2208	$neigh->load;
2106		2209
		2210	# now find the diagonal neighbours
2107	push @neigh,	2211	push @neigh,
2108	[$neigh->tile_path (($_ + 3) % 4), $neigh],	2212	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2109	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2213	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2110	}	2214	}
2111		2215
…		…
2118	}	2222	}
2119		2223
2120	sub find_sync {	2224	sub find_sync {
2121	my ($path, $origin) = @_;	2225	my ($path, $origin) = @_;
2122		2226
2123	cf::sync_job { find $path, $origin }	2227	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
		2228	if $Coro::current == $Coro::main;
		2229
		2230	find $path, $origin
2124	}	2231	}
2125		2232
2126	sub do_load_sync {	2233	sub do_load_sync {
2127	my ($map) = @_;	2234	my ($map) = @_;
2128		2235
2129	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2236	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2130	if $Coro::current == $Coro::main;	2237	if $Coro::current == $Coro::main;
2131		2238
2132	cf::sync_job { $map->load };	2239	$map->load;
2133	}	2240	}
2134		2241
2135	our %MAP_PREFETCH;	2242	our %MAP_PREFETCH;
2136	our $MAP_PREFETCHER = undef;	2243	our $MAP_PREFETCHER = undef;
2137		2244
…		…
2163	$MAP_PREFETCHER->prio (6);	2270	$MAP_PREFETCHER->prio (6);
2164		2271
2165	()	2272	()
2166	}	2273	}
2167		2274
		2275	# common code, used by both ->save and ->swapout
2168	sub save {	2276	sub _save {
2169	my ($self) = @_;	2277	my ($self) = @_;
2170
2171	my $lock = cf::lock_acquire "map_data:$self->{path}";
2172		2278
2173	$self->{last_save} = $cf::RUNTIME;	2279	$self->{last_save} = $cf::RUNTIME;
2174		2280
2175	return unless $self->dirty;	2281	return unless $self->dirty;
2176		2282
…		…
2196	} else {	2302	} else {
2197	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);	2303	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2198	}	2304	}
2199	}	2305	}
2200		2306
		2307	sub save {
		2308	my ($self) = @_;
		2309
		2310	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2311
		2312	$self->_save;
		2313	}
		2314
2201	sub swap_out {	2315	sub swap_out {
2202	my ($self) = @_;	2316	my ($self) = @_;
2203		2317
2204	# save first because save cedes
2205	$self->save;
2206
2207	my $lock = cf::lock_acquire "map_data:$self->{path}";	2318	my $lock = cf::lock_acquire "map_data:$self->{path}";
2208		2319
2209	return if $self->players;
2210	return if $self->in_memory != cf::MAP_ACTIVE;	2320	return if $self->in_memory != cf::MAP_ACTIVE;
2211	return if $self->{deny_save};	2321	return if $self->{deny_save};
		2322	return if $self->players;
2212		2323
		2324	# first deactivate the map and "unlink" it from the core
		2325	$self->deactivate;
		2326	$_->clear_links_to ($self) for values %cf::MAP;
2213	$self->in_memory (cf::MAP_SWAPPED);	2327	$self->in_memory (cf::MAP_SWAPPED);
		2328
		2329	# then atomically save
		2330	$self->_save;
		2331
		2332	# then free the map
		2333	$self->clear;
		2334	}
		2335
		2336	sub reset_at {
		2337	my ($self) = @_;
		2338
		2339	# TODO: safety, remove and allow resettable per-player maps
		2340	return 1e99 if $self->{deny_reset};
		2341
		2342	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
		2343	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
		2344
		2345	$time + $to
		2346	}
		2347
		2348	sub should_reset {
		2349	my ($self) = @_;
		2350
		2351	$self->reset_at <= $cf::RUNTIME
		2352	}
		2353
		2354	sub reset {
		2355	my ($self) = @_;
		2356
		2357	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2358
		2359	return if $self->players;
		2360
		2361	cf::trace "resetting map ", $self->path, "\n";
		2362
		2363	$self->in_memory (cf::MAP_SWAPPED);
		2364
		2365	# need to save uniques path
		2366	unless ($self->{deny_save}) {
		2367	my $uniq = $self->uniq_path; utf8::encode $uniq;
		2368
		2369	$self->_save_objects ($uniq, cf::IO_UNIQUES)
		2370	if $uniq;
		2371	}
		2372
		2373	delete $cf::MAP{$self->path};
2214		2374
2215	$self->deactivate;	2375	$self->deactivate;
2216	$_->clear_links_to ($self) for values %cf::MAP;	2376	$_->clear_links_to ($self) for values %cf::MAP;
2217	$self->clear;	2377	$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		2378
2263	$self->unlink_save;	2379	$self->unlink_save;
2264	$self->destroy;	2380	$self->destroy;
2265	}	2381	}
2266		2382
…		…
2274		2390
2275	delete $cf::MAP{$self->path};	2391	delete $cf::MAP{$self->path};
2276		2392
2277	$self->unlink_save;	2393	$self->unlink_save;
2278		2394
2279	bless $self, "cf::map";	2395	bless $self, "cf::map::wrap";
2280	delete $self->{deny_reset};	2396	delete $self->{deny_reset};
2281	$self->{deny_save} = 1;	2397	$self->{deny_save} = 1;
2282	$self->reset_timeout (1);	2398	$self->reset_timeout (1);
2283	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2399	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2284		2400
…		…
2341	: normalise $_	2457	: normalise $_
2342	} @{ aio_readdir $UNIQUEDIR or [] }	2458	} @{ aio_readdir $UNIQUEDIR or [] }
2343	]	2459	]
2344	}	2460	}
2345		2461
		2462	=item cf::map::static_maps
		2463
		2464	Returns an arrayref if paths of all static maps (all preinstalled F<.map>
		2465	file in the shared directory excluding F</styles> and F</editor>). May
		2466	block.
		2467
		2468	=cut
		2469
		2470	sub static_maps() {
		2471	my @dirs = "";
		2472	my @maps;
		2473
		2474	while (@dirs) {
		2475	my $dir = shift @dirs;
		2476
		2477	next if $dir eq "/styles" || $dir eq "/editor";
		2478
		2479	my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
		2480	or return;
		2481
		2482	for (@$files) {
		2483	s/\.map$// or next;
		2484	utf8::decode $_;
		2485	push @maps, "$dir/$_";
		2486	}
		2487
		2488	push @dirs, map "$dir/$_", @$dirs;
		2489	}
		2490
		2491	\@maps
		2492	}
		2493
2346	=back	2494	=back
2347		2495
2348	=head3 cf::object	2496	=head3 cf::object
2349		2497
2350	=cut	2498	=cut
…		…
2482		2630
2483	Freezes the player and moves him/her to a special map (C<{link}>).	2631	Freezes the player and moves him/her to a special map (C<{link}>).
2484		2632
2485	The player should be reasonably safe there for short amounts of time (e.g.	2633	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,	2634	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	2635	though, as the player cannot control the character while it is on the link
2488	map.	2636	map.
2489		2637
2490	Will never block.	2638	Will never block.
2491		2639
2492	=item $player_object->leave_link ($map, $x, $y)	2640	=item $player_object->leave_link ($map, $x, $y)
…		…
2513	sub cf::object::player::enter_link {	2661	sub cf::object::player::enter_link {
2514	my ($self) = @_;	2662	my ($self) = @_;
2515		2663
2516	$self->deactivate_recursive;	2664	$self->deactivate_recursive;
2517		2665
		2666	++$self->{_link_recursion};
		2667
2518	return if UNIVERSAL::isa $self->map, "ext::map_link";	2668	return if UNIVERSAL::isa $self->map, "ext::map_link";
2519		2669
2520	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2670	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2521	if $self->map && $self->map->{path} ne "{link}";	2671	if $self->map && $self->map->{path} ne "{link}";
2522		2672
2523	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2673	$self->enter_map ($LINK_MAP || link_map, 3, 3);
2524	}	2674	}
2525		2675
2526	sub cf::object::player::leave_link {	2676	sub cf::object::player::leave_link {
2527	my ($self, $map, $x, $y) = @_;	2677	my ($self, $map, $x, $y) = @_;
2528		2678
…		…
2545	($x, $y) = (-1, -1)	2695	($x, $y) = (-1, -1)
2546	unless (defined $x) && (defined $y);	2696	unless (defined $x) && (defined $y);
2547		2697
2548	# use -1 or undef as default coordinates, not 0, 0	2698	# use -1 or undef as default coordinates, not 0, 0
2549	($x, $y) = ($map->enter_x, $map->enter_y)	2699	($x, $y) = ($map->enter_x, $map->enter_y)
2550	if $x <=0 && $y <= 0;	2700	if $x <= 0 && $y <= 0;
2551		2701
2552	$map->load;	2702	$map->load;
2553	$map->load_neighbours;	2703	$map->load_neighbours;
2554		2704
2555	return unless $self->contr->active;	2705	return unless $self->contr->active;
2556		2706
2557	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2707	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2558	$self->enter_map ($map, $x, $y);	2708	if ($self->enter_map ($map, $x, $y)) {
2559		2709	# entering was successful
		2710	delete $self->{_link_recursion};
2560	# only activate afterwards, to support waiting in hooks	2711	# only activate afterwards, to support waiting in hooks
2561	$self->activate_recursive;	2712	$self->activate_recursive;
2562	}	2713	}
2563		2714
		2715	}
		2716
2564	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2717	=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2565		2718
2566	Moves the player to the given map-path and coordinates by first freezing	2719	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	2720	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	2721	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	2722	the new (success) or old (failed) map position. In either case, $done will
…		…
2576		2729
2577	our $GOTOGEN;	2730	our $GOTOGEN;
2578		2731
2579	sub cf::object::player::goto {	2732	sub cf::object::player::goto {
2580	my ($self, $path, $x, $y, $check, $done) = @_;	2733	my ($self, $path, $x, $y, $check, $done) = @_;
		2734
		2735	if ($self->{_link_recursion} >= $MAX_LINKS) {
		2736	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
		2737	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
		2738	($path, $x, $y) = @$EMERGENCY_POSITION;
		2739	}
2581		2740
2582	# do generation counting so two concurrent goto's will be executed in-order	2741	# do generation counting so two concurrent goto's will be executed in-order
2583	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2742	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2584		2743
2585	$self->enter_link;	2744	$self->enter_link;
…		…
2609	my $map = eval {	2768	my $map = eval {
2610	my $map = defined $path ? cf::map::find $path : undef;	2769	my $map = defined $path ? cf::map::find $path : undef;
2611		2770
2612	if ($map) {	2771	if ($map) {
2613	$map = $map->customise_for ($self);	2772	$map = $map->customise_for ($self);
2614	$map = $check->($map) if $check && $map;	2773	$map = $check->($map, $x, $y, $self) if $check && $map;
2615	} else {	2774	} else {
2616	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);	2775	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2617	}	2776	}
2618		2777
2619	$map	2778	$map
…		…
2627	if ($gen == $self->{_goto_generation}) {	2786	if ($gen == $self->{_goto_generation}) {
2628	delete $self->{_goto_generation};	2787	delete $self->{_goto_generation};
2629	$self->leave_link ($map, $x, $y);	2788	$self->leave_link ($map, $x, $y);
2630	}	2789	}
2631		2790
2632	$done->() if $done;	2791	$done->($self) if $done;
2633	})->prio (1);	2792	})->prio (1);
2634	}	2793	}
2635		2794
2636	=item $player_object->enter_exit ($exit_object)	2795	=item $player_object->enter_exit ($exit_object)
2637		2796
…		…
2730	$self->message ("Something went wrong deep within the deliantra server. "	2889	$self->message ("Something went wrong deep within the deliantra server. "
2731	. "I'll try to bring you back to the map you were before. "	2890	. "I'll try to bring you back to the map you were before. "
2732	. "Please report this to the dungeon master!",	2891	. "Please report this to the dungeon master!",
2733	cf::NDI_UNIQUE | cf::NDI_RED);	2892	cf::NDI_UNIQUE | cf::NDI_RED);
2734		2893
2735	warn "ERROR in enter_exit: $@";	2894	error "ERROR in enter_exit: $@";
2736	$self->leave_link;	2895	$self->leave_link;
2737	}	2896	}
2738	})->prio (1);	2897	})->prio (1);
2739	}	2898	}
2740		2899
…		…
2752	sub cf::client::send_drawinfo {	2911	sub cf::client::send_drawinfo {
2753	my ($self, $text, $flags) = @_;	2912	my ($self, $text, $flags) = @_;
2754		2913
2755	utf8::encode $text;	2914	utf8::encode $text;
2756	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2915	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
		2916	}
		2917
		2918	=item $client->send_big_packet ($pkt)
		2919
		2920	Like C<send_packet>, but tries to compress large packets, and fragments
		2921	them as required.
		2922
		2923	=cut
		2924
		2925	our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
		2926
		2927	sub cf::client::send_big_packet {
		2928	my ($self, $pkt) = @_;
		2929
		2930	# try lzf for large packets
		2931	$pkt = "lzf " . Compress::LZF::compress $pkt
		2932	if 1024 <= length $pkt and $self->{can_lzf};
		2933
		2934	# split very large packets
		2935	if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
		2936	$self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
		2937	$pkt = "frag";
		2938	}
		2939
		2940	$self->send_packet ($pkt);
2757	}	2941	}
2758		2942
2759	=item $client->send_msg ($channel, $msg, $color, [extra...])	2943	=item $client->send_msg ($channel, $msg, $color, [extra...])
2760		2944
2761	Send a drawinfo or msg packet to the client, formatting the msg for the	2945	Send a drawinfo or msg packet to the client, formatting the msg for the
…		…
2913	my $pkt = "msg "	3097	my $pkt = "msg "
2914	. $self->{json_coder}->encode (	3098	. $self->{json_coder}->encode (
2915	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]	3099	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2916	);	3100	);
2917		3101
2918	# try lzf for large packets
2919	$pkt = "lzf " . Compress::LZF::compress $pkt
2920	if 1024 <= length $pkt and $self->{can_lzf};
2921
2922	# split very large packets
2923	if (8192 < length $pkt and $self->{can_lzf}) {
2924	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2925	$pkt = "frag";
2926	}
2927
2928	$self->send_packet ($pkt);	3102	$self->send_big_packet ($pkt);
2929	}	3103	}
2930		3104
2931	=item $client->ext_msg ($type, @msg)	3105	=item $client->ext_msg ($type, @msg)
2932		3106
2933	Sends an ext event to the client.	3107	Sends an ext event to the client.
…		…
2936		3110
2937	sub cf::client::ext_msg($$@) {	3111	sub cf::client::ext_msg($$@) {
2938	my ($self, $type, @msg) = @_;	3112	my ($self, $type, @msg) = @_;
2939		3113
2940	if ($self->extcmd == 2) {	3114	if ($self->extcmd == 2) {
2941	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3115	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2942	} elsif ($self->extcmd == 1) { # TODO: remove	3116	} elsif ($self->extcmd == 1) { # TODO: remove
2943	push @msg, msgtype => "event_$type";	3117	push @msg, msgtype => "event_$type";
2944	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3118	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2945	}	3119	}
2946	}	3120	}
2947		3121
2948	=item $client->ext_reply ($msgid, @msg)	3122	=item $client->ext_reply ($msgid, @msg)
2949		3123
…		…
2953		3127
2954	sub cf::client::ext_reply($$@) {	3128	sub cf::client::ext_reply($$@) {
2955	my ($self, $id, @msg) = @_;	3129	my ($self, $id, @msg) = @_;
2956		3130
2957	if ($self->extcmd == 2) {	3131	if ($self->extcmd == 2) {
2958	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));	3132	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2959	} elsif ($self->extcmd == 1) {	3133	} elsif ($self->extcmd == 1) {
2960	#TODO: version 1, remove	3134	#TODO: version 1, remove
2961	unshift @msg, msgtype => "reply", msgid => $id;	3135	unshift @msg, msgtype => "reply", msgid => $id;
2962	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3136	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2963	}	3137	}
2964	}	3138	}
2965		3139
2966	=item $success = $client->query ($flags, "text", \&cb)	3140	=item $success = $client->query ($flags, "text", \&cb)
2967		3141
…		…
3038		3212
3039	$ns->ext_reply ($reply, @reply)	3213	$ns->ext_reply ($reply, @reply)
3040	if $reply;	3214	if $reply;
3041		3215
3042	} else {	3216	} else {
3043	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3217	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3044	}	3218	}
3045		3219
3046	cf::override;	3220	cf::override;
3047	},	3221	},
3048	);	3222	);
…		…
3068		3242
3069	$coro	3243	$coro
3070	}	3244	}
3071		3245
3072	cf::client->attach (	3246	cf::client->attach (
3073	on_destroy => sub {	3247	on_client_destroy => sub {
3074	my ($ns) = @_;	3248	my ($ns) = @_;
3075		3249
3076	$_->cancel for values %{ (delete $ns->{_coro}) || {} };	3250	$_->cancel for values %{ (delete $ns->{_coro}) || {} };
3077	},	3251	},
3078	);	3252	);
…		…
3094	our $safe_hole = new Safe::Hole;	3268	our $safe_hole = new Safe::Hole;
3095		3269
3096	$SIG{FPE} = 'IGNORE';	3270	$SIG{FPE} = 'IGNORE';
3097		3271
3098	$safe->permit_only (Opcode::opset qw(	3272	$safe->permit_only (Opcode::opset qw(
3099	:base_core :base_mem :base_orig :base_math	3273	:base_core :base_mem :base_orig :base_math :base_loop
3100	grepstart grepwhile mapstart mapwhile	3274	grepstart grepwhile mapstart mapwhile
3101	sort time	3275	sort time
3102	));	3276	));
3103		3277
3104	# here we export the classes and methods available to script code	3278	# here we export the classes and methods available to script code
…		…
3129	decrease split destroy change_exp value msg lore send_msg)],	3303	decrease split destroy change_exp value msg lore send_msg)],
3130	["cf::object::player" => qw(player)],	3304	["cf::object::player" => qw(player)],
3131	["cf::player" => qw(peaceful send_msg)],	3305	["cf::player" => qw(peaceful send_msg)],
3132	["cf::map" => qw(trigger)],	3306	["cf::map" => qw(trigger)],
3133	) {	3307	) {
3134	no strict 'refs';
3135	my ($pkg, @funs) = @$_;	3308	my ($pkg, @funs) = @$_;
3136	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3309	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3137	for @funs;	3310	for @funs;
3138	}	3311	}
3139		3312
…		…
3156	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3329	$qcode =~ s/"/‟/g; # not allowed in #line filenames
3157	$qcode =~ s/\n/\\n/g;	3330	$qcode =~ s/\n/\\n/g;
3158		3331
3159	%vars = (_dummy => 0) unless %vars;	3332	%vars = (_dummy => 0) unless %vars;
3160		3333
		3334	my @res;
3161	local $_;	3335	local $_;
3162	local @safe::cf::_safe_eval_args = values %vars;
3163		3336
3164	my $eval =	3337	my $eval =
3165	"do {\n"	3338	"do {\n"
3166	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"	3339	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3167	. "#line 0 \"{$qcode}\"\n"	3340	. "#line 0 \"{$qcode}\"\n"
3168	. $code	3341	. $code
3169	. "\n}"	3342	. "\n}"
3170	;	3343	;
3171		3344
		3345	if ($CFG{safe_eval}) {
3172	sub_generation_inc;	3346	sub_generation_inc;
		3347	local @safe::cf::_safe_eval_args = values %vars;
3173	my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);	3348	@res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3174	sub_generation_inc;	3349	sub_generation_inc;
		3350	} else {
		3351	local @cf::_safe_eval_args = values %vars;
		3352	@res = wantarray ? eval eval : scalar eval $eval;
		3353	}
3175		3354
3176	if ($@) {	3355	if ($@) {
3177	warn "$@";	3356	warn "$@",
3178	warn "while executing safe code '$code'\n";	3357	"while executing safe code '$code'\n",
3179	warn "with arguments " . (join " ", %vars) . "\n";	3358	"with arguments " . (join " ", %vars) . "\n";
3180	}	3359	}
3181		3360
3182	wantarray ? @res : $res[0]	3361	wantarray ? @res : $res[0]
3183	}	3362	}
3184		3363
…		…
3198	=cut	3377	=cut
3199		3378
3200	sub register_script_function {	3379	sub register_script_function {
3201	my ($fun, $cb) = @_;	3380	my ($fun, $cb) = @_;
3202		3381
3203	no strict 'refs';	3382	$fun = "safe::$fun" if $CFG{safe_eval};
3204	*{"safe::$fun"} = $safe_hole->wrap ($cb);	3383	*$fun = $safe_hole->wrap ($cb);
3205	}	3384	}
3206		3385
3207	=back	3386	=back
3208		3387
3209	=cut	3388	=cut
…		…
3218	# for this (global event?)	3397	# for this (global event?)
3219	%ext::player_env::MUSIC_FACE_CACHE = ();	3398	%ext::player_env::MUSIC_FACE_CACHE = ();
3220		3399
3221	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3400	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3222		3401
3223	warn "loading facedata from $path\n";	3402	trace "loading facedata from $path\n";
3224		3403
3225	my $facedata;
3226	0 < aio_load $path, $facedata	3404	0 < aio_load $path, my $facedata
3227	or die "$path: $!";	3405	or die "$path: $!";
3228		3406
3229	$facedata = Coro::Storable::thaw $facedata;	3407	$facedata = Coro::Storable::thaw $facedata;
3230		3408
3231	$facedata->{version} == 2	3409	$facedata->{version} == 2
3232	or cf::cleanup "$path: version mismatch, cannot proceed.";	3410	or cf::cleanup "$path: version mismatch, cannot proceed.";
3233		3411
3234	# patch in the exptable	3412	# patch in the exptable
		3413	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3235	$facedata->{resource}{"res/exp_table"} = {	3414	$facedata->{resource}{"res/exp_table"} = {
3236	type => FT_RSRC,	3415	type => FT_RSRC,
3237	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),	3416	data => $exp_table,
		3417	hash => (Digest::MD5::md5 $exp_table),
3238	};	3418	};
3239	cf::cede_to_tick;	3419	cf::cede_to_tick;
3240		3420
3241	{	3421	{
3242	my $faces = $facedata->{faceinfo};	3422	my $faces = $facedata->{faceinfo};
…		…
3244	while (my ($face, $info) = each %$faces) {	3424	while (my ($face, $info) = each %$faces) {
3245	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3425	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3246		3426
3247	cf::face::set_visibility $idx, $info->{visibility};	3427	cf::face::set_visibility $idx, $info->{visibility};
3248	cf::face::set_magicmap $idx, $info->{magicmap};	3428	cf::face::set_magicmap $idx, $info->{magicmap};
3249	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};	3429	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3250	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};	3430	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
		3431	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3251		3432
3252	cf::cede_to_tick;	3433	cf::cede_to_tick;
3253	}	3434	}
3254		3435
3255	while (my ($face, $info) = each %$faces) {	3436	while (my ($face, $info) = each %$faces) {
…		…
3260		3441
3261	if (my $smooth = cf::face::find $info->{smooth}) {	3442	if (my $smooth = cf::face::find $info->{smooth}) {
3262	cf::face::set_smooth $idx, $smooth;	3443	cf::face::set_smooth $idx, $smooth;
3263	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3444	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3264	} else {	3445	} else {
3265	warn "smooth face '$info->{smooth}' not found for face '$face'";	3446	error "smooth face '$info->{smooth}' not found for face '$face'";
3266	}	3447	}
3267		3448
3268	cf::cede_to_tick;	3449	cf::cede_to_tick;
3269	}	3450	}
3270	}	3451	}
…		…
3279		3460
3280	cf::anim::invalidate_all; # d'oh	3461	cf::anim::invalidate_all; # d'oh
3281	}	3462	}
3282		3463
3283	{	3464	{
3284	# TODO: for gcfclient pleasure, we should give resources
3285	# that gcfclient doesn't grok a >10000 face index.
3286	my $res = $facedata->{resource};	3465	my $res = $facedata->{resource};
3287		3466
3288	while (my ($name, $info) = each %$res) {	3467	while (my ($name, $info) = each %$res) {
3289	if (defined $info->{type}) {	3468	if (defined $info->{type}) {
3290	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3469	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3291	my $data;
3292		3470
3293	if ($info->{type} & 1) {	3471	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3294	# prepend meta info
3295
3296	my $meta = $enc->encode ({
3297	name => $name,
3298	%{ $info->{meta} || {} },
3299	});
3300
3301	$data = pack "(w/a*)*", $meta, $info->{data};
3302	} else {
3303	$data = $info->{data};
3304	}
3305
3306	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3307	cf::face::set_type $idx, $info->{type};	3472	cf::face::set_type $idx, $info->{type};
3308	} else {	3473	} else {
3309	$RESOURCE{$name} = $info;	3474	$RESOURCE{$name} = $info; # unused
3310	}	3475	}
3311		3476
3312	cf::cede_to_tick;	3477	cf::cede_to_tick;
3313	}	3478	}
3314	}	3479	}
3315		3480
3316	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3481	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3317		3482
3318	1	3483	1
3319	}	3484	}
3320
3321	cf::global->attach (on_resource_update => sub {
3322	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3323	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3324
3325	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3326	my $sound = $soundconf->{compat}[$_]
3327	or next;
3328
3329	my $face = cf::face::find "sound/$sound->[1]";
3330	cf::sound::set $sound->[0] => $face;
3331	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3332	}
3333
3334	while (my ($k, $v) = each %{$soundconf->{event}}) {
3335	my $face = cf::face::find "sound/$v";
3336	cf::sound::set $k => $face;
3337	}
3338	}
3339	});
3340		3485
3341	register_exticmd fx_want => sub {	3486	register_exticmd fx_want => sub {
3342	my ($ns, $want) = @_;	3487	my ($ns, $want) = @_;
3343		3488
3344	while (my ($k, $v) = each %$want) {	3489	while (my ($k, $v) = each %$want) {
…		…
3383	sub reload_treasures {	3528	sub reload_treasures {
3384	load_resource_file "$DATADIR/treasures"	3529	load_resource_file "$DATADIR/treasures"
3385	or die "unable to load treasurelists\n";	3530	or die "unable to load treasurelists\n";
3386	}	3531	}
3387		3532
		3533	sub reload_sound {
		3534	trace "loading sound config from $DATADIR/sound\n";
		3535
		3536	0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
		3537	or die "$DATADIR/sound $!";
		3538
		3539	my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
		3540
		3541	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3542	my $sound = $soundconf->{compat}[$_]
		3543	or next;
		3544
		3545	my $face = cf::face::find "sound/$sound->[1]";
		3546	cf::sound::set $sound->[0] => $face;
		3547	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3548	}
		3549
		3550	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3551	my $face = cf::face::find "sound/$v";
		3552	cf::sound::set $k => $face;
		3553	}
		3554	}
		3555
3388	sub reload_resources {	3556	sub reload_resources {
3389	warn "reloading resource files...\n";	3557	trace "reloading resource files...\n";
3390		3558
		3559	reload_exp_table;
		3560	reload_materials;
3391	reload_facedata;	3561	reload_facedata;
		3562	reload_sound;
3392	reload_archetypes;	3563	reload_archetypes;
3393	reload_regions;	3564	reload_regions;
3394	reload_treasures;	3565	reload_treasures;
3395		3566
3396	warn "finished reloading resource files\n";	3567	trace "finished reloading resource files\n";
3397	}	3568	}
3398		3569
3399	sub reload_config {	3570	sub reload_config {
3400	warn "reloading config file...\n";	3571	trace "reloading config file...\n";
3401		3572
3402	open my $fh, "<:utf8", "$CONFDIR/config"	3573	0 < aio_load "$CONFDIR/config", my $config
3403	or return;	3574	or die "$CONFDIR/config: $!";
3404		3575
3405	local $/;	3576	utf8::decode $config;
3406	*CFG = YAML::XS::Load scalar <$fh>;	3577	*CFG = yaml_load $config;
3407		3578
3408	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3579	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3409		3580
3410	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3581	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3411	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3582	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3412		3583
3413	if (exists $CFG{mlockall}) {	3584	if (exists $CFG{mlockall}) {
…		…
3415	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3586	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3416	and die "WARNING: m(un)lockall failed: $!\n";	3587	and die "WARNING: m(un)lockall failed: $!\n";
3417	};	3588	};
3418	warn $@ if $@;	3589	warn $@ if $@;
3419	}	3590	}
3420
3421	warn "finished reloading resource files\n";
3422	}	3591	}
3423		3592
3424	sub pidfile() {	3593	sub pidfile() {
3425	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3594	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3426	or die "$PIDFILE: $!";	3595	or die "$PIDFILE: $!";
…		…
3439	seek $fh, 0, 0;	3608	seek $fh, 0, 0;
3440	print $fh $$;	3609	print $fh $$;
3441	}	3610	}
3442		3611
3443	sub main_loop {	3612	sub main_loop {
3444	warn "EV::loop starting\n";	3613	trace "EV::loop starting\n";
3445	if (1) {	3614	if (1) {
3446	EV::loop;	3615	EV::loop;
3447	}	3616	}
3448	warn "EV::loop returned\n";	3617	trace "EV::loop returned\n";
3449	goto &main_loop unless $REALLY_UNLOOP;	3618	goto &main_loop unless $REALLY_UNLOOP;
3450	}	3619	}
3451		3620
3452	sub main {	3621	sub main {
3453	cf::init_globals; # initialise logging	3622	cf::init_globals; # initialise logging
3454		3623
3455	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3624	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3456	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3625	LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3457	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3626	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3458	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3627	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3459
3460	cf::init_experience;
3461	cf::init_anim;
3462	cf::init_attackmess;
3463	cf::init_dynamic;
3464		3628
3465	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3629	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3466		3630
3467	# we must not ever block the main coroutine	3631	# we must not ever block the main coroutine
3468	local $Coro::idle = sub {	3632	local $Coro::idle = sub {
…		…
3474	};	3638	};
3475		3639
3476	evthread_start IO::AIO::poll_fileno;	3640	evthread_start IO::AIO::poll_fileno;
3477		3641
3478	cf::sync_job {	3642	cf::sync_job {
		3643	cf::incloader::init ();
		3644
		3645	cf::init_anim;
		3646	cf::init_attackmess;
		3647	cf::init_dynamic;
		3648
		3649	cf::load_settings;
		3650
3479	reload_resources;	3651	reload_resources;
3480	reload_config;	3652	reload_config;
3481	db_init;	3653	db_init;
3482		3654
3483	cf::load_settings;
3484	cf::load_materials;
3485	cf::init_uuid;	3655	cf::init_uuid;
3486	cf::init_signals;	3656	cf::init_signals;
3487	cf::init_commands;
3488	cf::init_skills;	3657	cf::init_skills;
3489		3658
3490	cf::init_beforeplay;	3659	cf::init_beforeplay;
3491		3660
3492	atomic;	3661	atomic;
…		…
3497		3666
3498	# no (long-running) fork's whatsoever before this point(!)	3667	# no (long-running) fork's whatsoever before this point(!)
3499	use POSIX ();	3668	use POSIX ();
3500	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3669	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3501		3670
3502	(pop @POST_INIT)->(0) while @POST_INIT;	3671	cf::_post_init 0;
3503	};	3672	};
3504		3673
		3674	cf::object::thawer::errors_are_fatal 0;
		3675	info "parse errors in files are no longer fatal from this point on.\n";
		3676
		3677	my $free_main; $free_main = EV::idle sub {
		3678	undef $free_main;
		3679	undef &main; # free gobs of memory :)
		3680	};
		3681
3505	main_loop;	3682	goto &main_loop;
3506	}	3683	}
3507		3684
3508	#############################################################################	3685	#############################################################################
3509	# initialisation and cleanup	3686	# initialisation and cleanup
3510		3687
3511	# install some emergency cleanup handlers	3688	# install some emergency cleanup handlers
3512	BEGIN {	3689	BEGIN {
3513	our %SIGWATCHER = ();	3690	our %SIGWATCHER = ();
3514	for my $signal (qw(INT HUP TERM)) {	3691	for my $signal (qw(INT HUP TERM)) {
3515	$SIGWATCHER{$signal} = EV::signal $signal, sub {	3692	$SIGWATCHER{$signal} = AE::signal $signal, sub {
3516	cf::cleanup "SIG$signal";	3693	cf::cleanup "SIG$signal";
3517	};	3694	};
3518	}	3695	}
3519	}	3696	}
3520		3697
3521	sub write_runtime_sync {	3698	sub write_runtime_sync {
		3699	my $t0 = AE::time;
		3700
3522	# first touch the runtime file to show we are still running:	3701	# first touch the runtime file to show we are still running:
3523	# the fsync below can take a very very long time.	3702	# the fsync below can take a very very long time.
3524		3703
3525	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;	3704	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3526		3705
3527	my $guard = cf::lock_acquire "write_runtime";	3706	my $guard = cf::lock_acquire "write_runtime";
3528		3707
3529	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644	3708	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3530	or return;	3709	or return;
3531		3710
3532	my $value = $cf::RUNTIME + 90 + 10;	3711	my $value = $cf::RUNTIME + 90 + 10;
3533	# 10 is the runtime save interval, for a monotonic clock	3712	# 10 is the runtime save interval, for a monotonic clock
3534	# 60 allows for the watchdog to kill the server.	3713	# 60 allows for the watchdog to kill the server.
…		…
3547	or return;	3726	or return;
3548		3727
3549	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3728	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3550	and return;	3729	and return;
3551		3730
3552	warn "runtime file written.\n";	3731	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3553		3732
3554	1	3733	1
3555	}	3734	}
3556		3735
3557	our $uuid_lock;	3736	our $uuid_lock;
…		…
3569	or return;	3748	or return;
3570		3749
3571	my $value = uuid_seq uuid_cur;	3750	my $value = uuid_seq uuid_cur;
3572		3751
3573	unless ($value) {	3752	unless ($value) {
3574	warn "cowardly refusing to write zero uuid value!\n";	3753	info "cowardly refusing to write zero uuid value!\n";
3575	return;	3754	return;
3576	}	3755	}
3577		3756
3578	my $value = uuid_str $value + $uuid_skip;	3757	my $value = uuid_str $value + $uuid_skip;
3579	$uuid_skip = 0;	3758	$uuid_skip = 0;
…		…
3589	or return;	3768	or return;
3590		3769
3591	aio_rename "$uuid~", $uuid	3770	aio_rename "$uuid~", $uuid
3592	and return;	3771	and return;
3593		3772
3594	warn "uuid file written ($value).\n";	3773	trace "uuid file written ($value).\n";
3595		3774
3596	1	3775	1
3597		3776
3598	}	3777	}
3599		3778
…		…
3605	}	3784	}
3606		3785
3607	sub emergency_save() {	3786	sub emergency_save() {
3608	my $freeze_guard = cf::freeze_mainloop;	3787	my $freeze_guard = cf::freeze_mainloop;
3609		3788
3610	warn "emergency_perl_save: enter\n";	3789	info "emergency_perl_save: enter\n";
		3790
		3791	# this is a trade-off: we want to be very quick here, so
		3792	# save all maps without fsync, and later call a global sync
		3793	# (which in turn might be very very slow)
		3794	local $USE_FSYNC = 0;
3611		3795
3612	cf::sync_job {	3796	cf::sync_job {
3613	# this is a trade-off: we want to be very quick here, so	3797	cf::write_runtime_sync; # external watchdog should not bark
3614	# save all maps without fsync, and later call a global sync
3615	# (which in turn might be very very slow)
3616	local $USE_FSYNC = 0;
3617		3798
3618	# use a peculiar iteration method to avoid tripping on perl	3799	# use a peculiar iteration method to avoid tripping on perl
3619	# refcount bugs in for. also avoids problems with players	3800	# refcount bugs in for. also avoids problems with players
3620	# and maps saved/destroyed asynchronously.	3801	# and maps saved/destroyed asynchronously.
3621	warn "emergency_perl_save: begin player save\n";	3802	info "emergency_perl_save: begin player save\n";
3622	for my $login (keys %cf::PLAYER) {	3803	for my $login (keys %cf::PLAYER) {
3623	my $pl = $cf::PLAYER{$login} or next;	3804	my $pl = $cf::PLAYER{$login} or next;
3624	$pl->valid or next;	3805	$pl->valid or next;
3625	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3806	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3626	$pl->save;	3807	$pl->save;
3627	}	3808	}
3628	warn "emergency_perl_save: end player save\n";	3809	info "emergency_perl_save: end player save\n";
3629		3810
		3811	cf::write_runtime_sync; # external watchdog should not bark
		3812
3630	warn "emergency_perl_save: begin map save\n";	3813	info "emergency_perl_save: begin map save\n";
3631	for my $path (keys %cf::MAP) {	3814	for my $path (keys %cf::MAP) {
3632	my $map = $cf::MAP{$path} or next;	3815	my $map = $cf::MAP{$path} or next;
3633	$map->valid or next;	3816	$map->valid or next;
3634	$map->save;	3817	$map->save;
3635	}	3818	}
3636	warn "emergency_perl_save: end map save\n";	3819	info "emergency_perl_save: end map save\n";
3637		3820
		3821	cf::write_runtime_sync; # external watchdog should not bark
		3822
3638	warn "emergency_perl_save: begin database checkpoint\n";	3823	info "emergency_perl_save: begin database checkpoint\n";
3639	BDB::db_env_txn_checkpoint $DB_ENV;	3824	BDB::db_env_txn_checkpoint $DB_ENV;
3640	warn "emergency_perl_save: end database checkpoint\n";	3825	info "emergency_perl_save: end database checkpoint\n";
3641		3826
3642	warn "emergency_perl_save: begin write uuid\n";	3827	info "emergency_perl_save: begin write uuid\n";
3643	write_uuid_sync 1;	3828	write_uuid_sync 1;
3644	warn "emergency_perl_save: end write uuid\n";	3829	info "emergency_perl_save: end write uuid\n";
		3830
		3831	cf::write_runtime_sync; # external watchdog should not bark
		3832
		3833	trace "emergency_perl_save: syncing database to disk";
		3834	BDB::db_env_txn_checkpoint $DB_ENV;
		3835
		3836	info "emergency_perl_save: starting sync\n";
		3837	IO::AIO::aio_sync sub {
		3838	info "emergency_perl_save: finished sync\n";
		3839	};
		3840
		3841	cf::write_runtime_sync; # external watchdog should not bark
		3842
		3843	trace "emergency_perl_save: flushing outstanding aio requests";
		3844	while (IO::AIO::nreqs || BDB::nreqs) {
		3845	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
		3846	}
		3847
		3848	cf::write_runtime_sync; # external watchdog should not bark
3645	};	3849	};
3646		3850
3647	warn "emergency_perl_save: starting sync()\n";
3648	IO::AIO::aio_sync sub {
3649	warn "emergency_perl_save: finished sync()\n";
3650	};
3651
3652	warn "emergency_perl_save: leave\n";	3851	info "emergency_perl_save: leave\n";
3653	}	3852	}
3654		3853
3655	sub post_cleanup {	3854	sub post_cleanup {
3656	my ($make_core) = @_;	3855	my ($make_core) = @_;
3657		3856
		3857	IO::AIO::flush;
		3858
3658	warn Carp::longmess "post_cleanup backtrace"	3859	error Carp::longmess "post_cleanup backtrace"
3659	if $make_core;	3860	if $make_core;
3660		3861
3661	my $fh = pidfile;	3862	my $fh = pidfile;
3662	unlink $PIDFILE if <$fh> == $$;	3863	unlink $PIDFILE if <$fh> == $$;
3663	}	3864	}
…		…
3683	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	3884	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3684	for my $name (keys %$leaf_symtab) {	3885	for my $name (keys %$leaf_symtab) {
3685	_gv_clear *{"$pkg$name"};	3886	_gv_clear *{"$pkg$name"};
3686	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	3887	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3687	}	3888	}
3688	warn "cleared package $pkg\n";#d#
3689	}	3889	}
3690		3890
3691	sub do_reload_perl() {	3891	sub do_reload_perl() {
3692	# can/must only be called in main	3892	# can/must only be called in main
3693	if ($Coro::current != $Coro::main) {	3893	unless (in_main) {
3694	warn "can only reload from main coroutine";	3894	error "can only reload from main coroutine";
3695	return;	3895	return;
3696	}	3896	}
3697		3897
3698	return if $RELOAD++;	3898	return if $RELOAD++;
3699		3899
3700	my $t1 = EV::time;	3900	my $t1 = AE::time;
3701		3901
3702	while ($RELOAD) {	3902	while ($RELOAD) {
3703	warn "reloading...";	3903	cf::get_slot 0.1, -1, "reload_perl";
		3904	info "perl_reload: reloading...";
3704		3905
3705	warn "entering sync_job";	3906	trace "perl_reload: entering sync_job";
3706		3907
3707	cf::sync_job {	3908	cf::sync_job {
3708	cf::write_runtime_sync; # external watchdog should not bark
3709	cf::emergency_save;	3909	#cf::emergency_save;
3710	cf::write_runtime_sync; # external watchdog should not bark
3711		3910
3712	warn "syncing database to disk";
3713	BDB::db_env_txn_checkpoint $DB_ENV;
3714
3715	# if anything goes wrong in here, we should simply crash as we already saved
3716
3717	warn "flushing outstanding aio requests";
3718	while (IO::AIO::nreqs || BDB::nreqs) {
3719	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3720	}
3721
3722	warn "cancelling all extension coros";	3911	trace "perl_reload: cancelling all extension coros";
3723	$_->cancel for values %EXT_CORO;	3912	$_->cancel for values %EXT_CORO;
3724	%EXT_CORO = ();	3913	%EXT_CORO = ();
3725		3914
3726	warn "removing commands";	3915	trace "perl_reload: removing commands";
3727	%COMMAND = ();	3916	%COMMAND = ();
3728		3917
3729	warn "removing ext/exti commands";	3918	trace "perl_reload: removing ext/exti commands";
3730	%EXTCMD = ();	3919	%EXTCMD = ();
3731	%EXTICMD = ();	3920	%EXTICMD = ();
3732		3921
3733	warn "unloading/nuking all extensions";	3922	trace "perl_reload: unloading/nuking all extensions";
3734	for my $pkg (@EXTS) {	3923	for my $pkg (@EXTS) {
3735	warn "... unloading $pkg";	3924	trace "... unloading $pkg";
3736		3925
3737	if (my $cb = $pkg->can ("unload")) {	3926	if (my $cb = $pkg->can ("unload")) {
3738	eval {	3927	eval {
3739	$cb->($pkg);	3928	$cb->($pkg);
3740	1	3929	1
3741	} or warn "$pkg unloaded, but with errors: $@";	3930	} or error "$pkg unloaded, but with errors: $@";
3742	}	3931	}
3743		3932
3744	warn "... clearing $pkg";	3933	trace "... clearing $pkg";
3745	clear_package $pkg;	3934	clear_package $pkg;
3746	}	3935	}
3747		3936
3748	warn "unloading all perl modules loaded from $LIBDIR";	3937	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3749	while (my ($k, $v) = each %INC) {	3938	while (my ($k, $v) = each %INC) {
3750	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	3939	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3751		3940
3752	warn "... unloading $k";	3941	trace "... unloading $k";
3753	delete $INC{$k};	3942	delete $INC{$k};
3754		3943
3755	$k =~ s/\.pm$//;	3944	$k =~ s/\.pm$//;
3756	$k =~ s/\//::/g;	3945	$k =~ s/\//::/g;
3757		3946
…		…
3760	}	3949	}
3761		3950
3762	clear_package $k;	3951	clear_package $k;
3763	}	3952	}
3764		3953
3765	warn "getting rid of safe::, as good as possible";	3954	trace "perl_reload: getting rid of safe::, as good as possible";
3766	clear_package "safe::$_"	3955	clear_package "safe::$_"
3767	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	3956	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3768		3957
3769	warn "unloading cf.pm \"a bit\"";	3958	trace "perl_reload: unloading cf.pm \"a bit\"";
3770	delete $INC{"cf.pm"};	3959	delete $INC{"cf.pm"};
3771	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	3960	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3772		3961
3773	# don't, removes xs symbols, too,	3962	# don't, removes xs symbols, too,
3774	# and global variables created in xs	3963	# and global variables created in xs
3775	#clear_package __PACKAGE__;	3964	#clear_package __PACKAGE__;
3776		3965
3777	warn "unload completed, starting to reload now";	3966	info "perl_reload: unload completed, starting to reload now";
3778		3967
3779	warn "reloading cf.pm";	3968	trace "perl_reload: reloading cf.pm";
3780	require cf;	3969	require cf;
3781	cf::_connect_to_perl_1;	3970	cf::_connect_to_perl_1;
3782		3971
3783	warn "loading config and database again";	3972	trace "perl_reload: loading config and database again";
3784	cf::reload_config;	3973	cf::reload_config;
3785		3974
3786	warn "loading extensions";	3975	trace "perl_reload: loading extensions";
3787	cf::load_extensions;	3976	cf::load_extensions;
3788		3977
3789	if ($REATTACH_ON_RELOAD) {	3978	if ($REATTACH_ON_RELOAD) {
3790	warn "reattaching attachments to objects/players";	3979	trace "perl_reload: reattaching attachments to objects/players";
3791	_global_reattach; # objects, sockets	3980	_global_reattach; # objects, sockets
3792	warn "reattaching attachments to maps";	3981	trace "perl_reload: reattaching attachments to maps";
3793	reattach $_ for values %MAP;	3982	reattach $_ for values %MAP;
3794	warn "reattaching attachments to players";	3983	trace "perl_reload: reattaching attachments to players";
3795	reattach $_ for values %PLAYER;	3984	reattach $_ for values %PLAYER;
3796	}	3985	}
3797		3986
3798	warn "running post_init jobs";	3987	cf::_post_init 1;
3799	(pop @POST_INIT)->(1) while @POST_INIT;
3800		3988
3801	warn "leaving sync_job";	3989	trace "perl_reload: leaving sync_job";
3802		3990
3803	1	3991	1
3804	} or do {	3992	} or do {
3805	warn $@;	3993	error $@;
3806	cf::cleanup "error while reloading, exiting.";	3994	cf::cleanup "perl_reload: error, exiting.";
3807	};	3995	};
3808		3996
3809	warn "reloaded";
3810	--$RELOAD;	3997	--$RELOAD;
3811	}	3998	}
3812		3999
3813	$t1 = EV::time - $t1;	4000	$t1 = AE::time - $t1;
3814	warn "reload completed in ${t1}s\n";	4001	info "perl_reload: completed in ${t1}s\n";
3815	};	4002	};
3816		4003
3817	our $RELOAD_WATCHER; # used only during reload	4004	our $RELOAD_WATCHER; # used only during reload
3818		4005
3819	sub reload_perl() {	4006	sub reload_perl() {
…		…
3821	# coro crashes during coro_state_free->destroy here.	4008	# coro crashes during coro_state_free->destroy here.
3822		4009
3823	$RELOAD_WATCHER ||= cf::async {	4010	$RELOAD_WATCHER ||= cf::async {
3824	Coro::AIO::aio_wait cache_extensions;	4011	Coro::AIO::aio_wait cache_extensions;
3825		4012
3826	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {	4013	$RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3827	do_reload_perl;	4014	do_reload_perl;
3828	undef $RELOAD_WATCHER;	4015	undef $RELOAD_WATCHER;
3829	};	4016	};
3830	};	4017	};
3831	}	4018	}
…		…
3840	reload_perl;	4027	reload_perl;
3841	};	4028	};
3842	}	4029	}
3843	};	4030	};
3844		4031
3845	unshift @INC, $LIBDIR;	4032	#############################################################################
3846		4033
3847	my $bug_warning = 0;	4034	my $bug_warning = 0;
3848		4035
3849	our @WAIT_FOR_TICK;	4036	our @WAIT_FOR_TICK;
3850	our @WAIT_FOR_TICK_BEGIN;	4037	our @WAIT_FOR_TICK_BEGIN;
3851		4038
3852	sub wait_for_tick {	4039	sub wait_for_tick() {
3853	return if tick_inhibit || $Coro::current == $Coro::main;	4040	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3854		4041
3855	my $signal = new Coro::Signal;	4042	my $signal = new Coro::Signal;
3856	push @WAIT_FOR_TICK, $signal;	4043	push @WAIT_FOR_TICK, $signal;
3857	$signal->wait;	4044	$signal->wait;
3858	}	4045	}
3859		4046
3860	sub wait_for_tick_begin {	4047	sub wait_for_tick_begin() {
3861	return if tick_inhibit || $Coro::current == $Coro::main;	4048	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3862		4049
3863	my $signal = new Coro::Signal;	4050	my $signal = new Coro::Signal;
3864	push @WAIT_FOR_TICK_BEGIN, $signal;	4051	push @WAIT_FOR_TICK_BEGIN, $signal;
3865	$signal->wait;	4052	$signal->wait;
3866	}	4053	}
…		…
3872	return;	4059	return;
3873	}	4060	}
3874		4061
3875	cf::server_tick; # one server iteration	4062	cf::server_tick; # one server iteration
3876		4063
		4064	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
		4065
3877	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4066	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3878	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4067	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3879	Coro::async_pool {	4068	Coro::async_pool {
3880	$Coro::current->{desc} = "runtime saver";	4069	$Coro::current->{desc} = "runtime saver";
3881	write_runtime_sync	4070	write_runtime_sync
3882	or warn "ERROR: unable to write runtime file: $!";	4071	or error "ERROR: unable to write runtime file: $!";
3883	};	4072	};
3884	}	4073	}
3885		4074
3886	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4075	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3887	$sig->send;	4076	$sig->send;
…		…
3895		4084
3896	if (0) {	4085	if (0) {
3897	if ($NEXT_TICK) {	4086	if ($NEXT_TICK) {
3898	my $jitter = $TICK_START - $NEXT_TICK;	4087	my $jitter = $TICK_START - $NEXT_TICK;
3899	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4088	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
3900	warn "jitter $JITTER\n";#d#	4089	debug "jitter $JITTER\n";#d#
3901	}	4090	}
3902	}	4091	}
3903	}	4092	}
3904		4093
3905	{	4094	{
3906	# configure BDB	4095	# configure BDB
3907		4096
3908	BDB::min_parallel 8;	4097	BDB::min_parallel 16;
3909	BDB::max_poll_reqs $TICK * 0.1;	4098	BDB::max_poll_reqs $TICK * 0.1;
3910	$AnyEvent::BDB::WATCHER->priority (1);	4099	$AnyEvent::BDB::WATCHER->priority (1);
3911		4100
3912	unless ($DB_ENV) {	4101	unless ($DB_ENV) {
3913	$DB_ENV = BDB::db_env_create;	4102	$DB_ENV = BDB::db_env_create;
…		…
3950	IO::AIO::min_parallel 8;	4139	IO::AIO::min_parallel 8;
3951	IO::AIO::max_poll_time $TICK * 0.1;	4140	IO::AIO::max_poll_time $TICK * 0.1;
3952	undef $AnyEvent::AIO::WATCHER;	4141	undef $AnyEvent::AIO::WATCHER;
3953	}	4142	}
3954		4143
3955	my $_log_backtrace;	4144	our $_log_backtrace;
		4145	our $_log_backtrace_last;
3956		4146
3957	sub _log_backtrace {	4147	sub _log_backtrace {
3958	my ($msg, @addr) = @_;	4148	my ($msg, @addr) = @_;
3959		4149
3960	$msg =~ s/\n//;	4150	$msg =~ s/\n$//;
3961		4151
		4152	if ($_log_backtrace_last eq $msg) {
		4153	LOG llevInfo, "[ABT] $msg\n";
		4154	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3962	# limit the # of concurrent backtraces	4155	# limit the # of concurrent backtraces
3963	if ($_log_backtrace < 2) {	4156	} elsif ($_log_backtrace < 2) {
		4157	$_log_backtrace_last = $msg;
3964	++$_log_backtrace;	4158	++$_log_backtrace;
3965	my $perl_bt = Carp::longmess $msg;	4159	my $perl_bt = Carp::longmess $msg;
3966	async {	4160	async {
3967	$Coro::current->{desc} = "abt $msg";	4161	$Coro::current->{desc} = "abt $msg";
3968		4162
…		…
3988	LOG llevInfo, "[ABT] $_\n" for @bt;	4182	LOG llevInfo, "[ABT] $_\n" for @bt;
3989	--$_log_backtrace;	4183	--$_log_backtrace;
3990	};	4184	};
3991	} else {	4185	} else {
3992	LOG llevInfo, "[ABT] $msg\n";	4186	LOG llevInfo, "[ABT] $msg\n";
3993	LOG llevInfo, "[ABT] [suppressed]\n";	4187	LOG llevInfo, "[ABT] [overload, suppressed]\n";
3994	}	4188	}
3995	}	4189	}
3996		4190
3997	# load additional modules	4191	# load additional modules
3998	require "cf/$_.pm" for @EXTRA_MODULES;	4192	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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