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

Diff Legend

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