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.516 by root, Thu Apr 15 06:05:52 2010 UTC vs.
Revision 1.573 by root, Sun May 8 12:40:42 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,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	# Copyright (©) 2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	#	5	#
6	# Deliantra is free software: you can redistribute it and/or modify it under	6	# Deliantra is free software: you can redistribute it and/or modify it under
7	# the terms of the Affero GNU General Public License as published by the	7	# the terms of the Affero GNU General Public License as published by the
8	# Free Software Foundation, either version 3 of the License, or (at your	8	# Free Software Foundation, either version 3 of the License, or (at your
9	# option) any later version.	9	# option) any later version.
…		…
20	# The authors can be reached via e-mail to <support@deliantra.net>	20	# The authors can be reached via e-mail to <support@deliantra.net>
21	#	21	#
22		22
23	package cf;	23	package cf;
24		24
25	use 5.10.0;	25	use common::sense;
26	use utf8;
27	use strict qw(vars subs);
28		26
29	use Symbol;	27	use Symbol;
30	use List::Util;	28	use List::Util;
31	use Socket;	29	use Socket;
32	use EV;	30	use EV;
…		…
78	# strictly for debugging	76	# strictly for debugging
79	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };	77	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80		78
81	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	79	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82		80
		81	our @ORIG_INC;
		82
83	our %COMMAND = ();	83	our %COMMAND = ();
84	our %COMMAND_TIME = ();	84	our %COMMAND_TIME = ();
85		85
86	our @EXTS = (); # list of extension package names	86	our @EXTS = (); # list of extension package names
87	our %EXTCMD = ();	87	our %EXTCMD = ();
…		…
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
112		114
113	our $OUTPUT_RATE_MIN = 4000;	115	our $OUTPUT_RATE_MIN = 3000;
114	our $OUTPUT_RATE_MAX = 100000;	116	our $OUTPUT_RATE_MAX = 1000000;
		117
		118	our $MAX_LINKS = 32; # how many chained exits to follow
		119	our $VERBOSE_IO = 1;
115		120
116	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	121	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
117	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	122	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
118	our $NEXT_TICK;	123	our $NEXT_TICK;
119	our $USE_FSYNC = 1; # use fsync to write maps - default on	124	our $USE_FSYNC = 1; # use fsync to write maps - default on
…		…
121	our $BDB_DEADLOCK_WATCHER;	126	our $BDB_DEADLOCK_WATCHER;
122	our $BDB_CHECKPOINT_WATCHER;	127	our $BDB_CHECKPOINT_WATCHER;
123	our $BDB_TRICKLE_WATCHER;	128	our $BDB_TRICKLE_WATCHER;
124	our $DB_ENV;	129	our $DB_ENV;
125		130
126	our @EXTRA_MODULES = qw(pod match mapscript);	131	our @EXTRA_MODULES = qw(pod match mapscript incloader);
127		132
128	our %CFG;	133	our %CFG;
129		134
130	our $UPTIME; $UPTIME ||= time;	135	our $UPTIME; $UPTIME ||= time;
131	our $RUNTIME;	136	our $RUNTIME = 0;
		137	our $SERVER_TICK = 0;
132	our $NOW;	138	our $NOW;
133		139
134	our (%PLAYER, %PLAYER_LOADING); # all users	140	our (%PLAYER, %PLAYER_LOADING); # all users
135	our (%MAP, %MAP_LOADING ); # all maps	141	our (%MAP, %MAP_LOADING ); # all maps
136	our $LINK_MAP; # the special {link} map, which is always available	142	our $LINK_MAP; # the special {link} map, which is always available
…		…
145		151
146	our @POST_INIT;	152	our @POST_INIT;
147		153
148	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)	154	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
149	our $REALLY_UNLOOP; # never set to true, please :)	155	our $REALLY_UNLOOP; # never set to true, please :)
		156
		157	our $WAIT_FOR_TICK = new Coro::Signal;
		158	our @WAIT_FOR_TICK_BEGIN;
150		159
151	binmode STDOUT;	160	binmode STDOUT;
152	binmode STDERR;	161	binmode STDERR;
153		162
154	# read virtual server time, if available	163	# read virtual server time, if available
…		…
165		174
166	our $EMERGENCY_POSITION;	175	our $EMERGENCY_POSITION;
167		176
168	sub cf::map::normalise;	177	sub cf::map::normalise;
169		178
		179	sub in_main() {
		180	$Coro::current == $Coro::main
		181	}
		182
170	#############################################################################	183	#############################################################################
171		184
172	%REFLECT = ();	185	%REFLECT = ();
173	for (@REFLECT) {	186	for (@REFLECT) {
174	my $reflect = JSON::XS::decode_json $_;	187	my $reflect = JSON::XS::decode_json $_;
…		…
184		197
185	=over 4	198	=over 4
186		199
187	=item $cf::UPTIME	200	=item $cf::UPTIME
188		201
189	The timestamp of the server start (so not actually an uptime).	202	The timestamp of the server start (so not actually an "uptime").
		203
		204	=item $cf::SERVER_TICK
		205
		206	An unsigned integer that starts at zero when the server is started and is
		207	incremented on every tick.
		208
		209	=item $cf::NOW
		210
		211	The (real) time of the last (current) server tick - updated before and
		212	after tick processing, so this is useful only as a rough "what time is it
		213	now" estimate.
		214
		215	=item $cf::TICK
		216
		217	The interval between each server tick, in seconds.
190		218
191	=item $cf::RUNTIME	219	=item $cf::RUNTIME
192		220
193	The time this server has run, starts at 0 and is increased by $cf::TICK on	221	The time this server has run, starts at 0 and is increased by $cf::TICK on
194	every server tick.	222	every server tick.
…		…
200	Various directories - "/etc", read-only install directory, perl-library	228	Various directories - "/etc", read-only install directory, perl-library
201	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	229	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
202	unique-items directory, player file directory, random maps directory and	230	unique-items directory, player file directory, random maps directory and
203	database environment.	231	database environment.
204		232
205	=item $cf::NOW
206
207	The time of the last (current) server tick.
208
209	=item $cf::TICK
210
211	The interval between server ticks, in seconds.
212
213	=item $cf::LOADAVG	233	=item $cf::LOADAVG
214		234
215	The current CPU load on the server (alpha-smoothed), as a value between 0	235	The current CPU load on the server (alpha-smoothed), as a value between 0
216	(none) and 1 (overloaded), indicating how much time is spent on processing	236	(none) and 1 (overloaded), indicating how much time is spent on processing
217	objects per tick. Healthy values are < 0.5.	237	objects per tick. Healthy values are < 0.5.
…		…
226	from wherever your confdir points to.	246	from wherever your confdir points to.
227		247
228	=item cf::wait_for_tick, cf::wait_for_tick_begin	248	=item cf::wait_for_tick, cf::wait_for_tick_begin
229		249
230	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	250	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
231	returns directly I<after> the tick processing (and consequently, can only wake one process	251	returns directly I<after> the tick processing (and consequently, can only wake one thread
232	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	252	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
		253
		254	Note that cf::Wait_for_tick will immediately return when the server is not
		255	ticking, making it suitable for small pauses in threads that need to run
		256	when the server is paused. If that is not applicable (i.e. you I<really>
		257	want to wait, use C<$cf::WAIT_FOR_TICK>).
		258
		259	=item $cf::WAIT_FOR_TICK
		260
		261	Note that C<cf::wait_for_tick> is probably the correct thing to use. This
		262	variable contains a L<Coro::Signal> that is broadcats after every server
		263	tick. Calling C<< ->wait >> on it will suspend the caller until after the
		264	next server tick.
		265
		266	=cut
		267
		268	sub wait_for_tick();
		269	sub wait_for_tick_begin();
233		270
234	=item @cf::INVOKE_RESULTS	271	=item @cf::INVOKE_RESULTS
235		272
236	This array contains the results of the last C<invoke ()> call. When	273	This array contains the results of the last C<invoke ()> call. When
237	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of	274	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
…		…
245		282
246	=back	283	=back
247		284
248	=cut	285	=cut
249		286
		287	sub error(@) { LOG llevError, join "", @_ }
		288	sub warn (@) { LOG llevWarn , join "", @_ }
		289	sub info (@) { LOG llevInfo , join "", @_ }
		290	sub debug(@) { LOG llevDebug, join "", @_ }
		291	sub trace(@) { LOG llevTrace, join "", @_ }
		292
250	$Coro::State::WARNHOOK = sub {	293	$Coro::State::WARNHOOK = sub {
251	my $msg = join "", @_;	294	my $msg = join "", @_;
252		295
253	$msg .= "\n"	296	$msg .= "\n"
254	unless $msg =~ /\n$/;	297	unless $msg =~ /\n$/;
255		298
256	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	299	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
257		300
258	LOG llevError, $msg;	301	LOG llevWarn, $msg;
259	};	302	};
260		303
261	$Coro::State::DIEHOOK = sub {	304	$Coro::State::DIEHOOK = sub {
262	return unless $^S eq 0; # "eq", not "=="	305	return unless $^S eq 0; # "eq", not "=="
263		306
264	warn Carp::longmess $_[0];	307	error Carp::longmess $_[0];
265		308
266	if ($Coro::current == $Coro::main) {#d#	309	if (in_main) {#d#
267	warn "DIEHOOK called in main context, Coro bug?\n";#d#	310	error "DIEHOOK called in main context, Coro bug?\n";#d#
268	return;#d#	311	return;#d#
269	}#d#	312	}#d#
270		313
271	# kill coroutine otherwise	314	# kill coroutine otherwise
272	Coro::terminate	315	Coro::terminate
…		…
294	}	337	}
295		338
296	$EV::DIED = sub {	339	$EV::DIED = sub {
297	Carp::cluck "error in event callback: @_";	340	Carp::cluck "error in event callback: @_";
298	};	341	};
		342
		343	#############################################################################
		344
		345	sub fork_call(&@);
		346	sub get_slot($;$$);
299		347
300	#############################################################################	348	#############################################################################
301		349
302	=head2 UTILITY FUNCTIONS	350	=head2 UTILITY FUNCTIONS
303		351
…		…
324	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	372	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
325	$d	373	$d
326	} || "[unable to dump $_[0]: '$@']";	374	} || "[unable to dump $_[0]: '$@']";
327	}	375	}
328		376
		377	=item $scalar = load_file $path
		378
		379	Loads the given file from path and returns its contents. Croaks on error
		380	and can block.
		381
		382	=cut
		383
		384	sub load_file($) {
		385	0 <= aio_load $_[0], my $data
		386	or Carp::croak "$_[0]: $!";
		387
		388	$data
		389	}
		390
329	=item $ref = cf::decode_json $json	391	=item $ref = cf::decode_json $json
330		392
331	Converts a JSON string into the corresponding perl data structure.	393	Converts a JSON string into the corresponding perl data structure.
332		394
333	=item $json = cf::encode_json $ref	395	=item $json = cf::encode_json $ref
…		…
339	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	401	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
340		402
341	sub encode_json($) { $json_coder->encode ($_[0]) }	403	sub encode_json($) { $json_coder->encode ($_[0]) }
342	sub decode_json($) { $json_coder->decode ($_[0]) }	404	sub decode_json($) { $json_coder->decode ($_[0]) }
343		405
		406	=item $ref = cf::decode_storable $scalar
		407
		408	Same as Coro::Storable::thaw, so blocks.
		409
		410	=cut
		411
		412	BEGIN { *decode_storable = \&Coro::Storable::thaw }
		413
		414	=item $ref = cf::decode_yaml $scalar
		415
		416	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
		417
		418	=cut
		419
		420	sub decode_yaml($) {
		421	fork_call { YAML::XS::Load $_[0] } @_
		422	}
		423
		424	=item $scalar = cf::unlzf $scalar
		425
		426	Same as Compress::LZF::compress, but takes server ticks into account, so
		427	blocks.
		428
		429	=cut
		430
		431	sub unlzf($) {
		432	# we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
		433	cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
		434	Compress::LZF::decompress $_[0]
		435	}
		436
344	=item cf::post_init { BLOCK }	437	=item cf::post_init { BLOCK }
345		438
346	Execute the given codeblock, I<after> all extensions have been (re-)loaded,	439	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
347	but I<before> the server starts ticking again.	440	but I<before> the server starts ticking again.
348		441
349	The cdoeblock will have a single boolean argument to indicate whether this	442	The codeblock will have a single boolean argument to indicate whether this
350	is a reload or not.	443	is a reload or not.
351		444
352	=cut	445	=cut
353		446
354	sub post_init(&) {	447	sub post_init(&) {
355	push @POST_INIT, shift;	448	push @POST_INIT, shift;
		449	}
		450
		451	sub _post_init {
		452	trace "running post_init jobs";
		453
		454	# run them in parallel...
		455
		456	my @join;
		457
		458	while () {
		459	push @join, map &Coro::async ($_, 0), @POST_INIT;
		460	@POST_INIT = ();
		461
		462	@join or last;
		463
		464	(pop @join)->join;
		465	}
356	}	466	}
357		467
358	=item cf::lock_wait $string	468	=item cf::lock_wait $string
359		469
360	Wait until the given lock is available. See cf::lock_acquire.	470	Wait until the given lock is available. See cf::lock_acquire.
…		…
413	EV::periodic $start, $interval, 0, $cb	523	EV::periodic $start, $interval, 0, $cb
414	}	524	}
415		525
416	=item cf::get_slot $time[, $priority[, $name]]	526	=item cf::get_slot $time[, $priority[, $name]]
417		527
418	Allocate $time seconds of blocking CPU time at priority C<$priority>:	528	Allocate $time seconds of blocking CPU time at priority C<$priority>
419	This call blocks and returns only when you have at least C<$time> seconds	529	(default: 0): This call blocks and returns only when you have at least
420	of cpu time till the next tick. The slot is only valid till the next cede.	530	C<$time> seconds of cpu time till the next tick. The slot is only valid
		531	till the next cede.
		532
		533	Background jobs should use a priority les than zero, interactive jobs
		534	should use 100 or more.
421		535
422	The optional C<$name> can be used to identify the job to run. It might be	536	The optional C<$name> can be used to identify the job to run. It might be
423	used for statistical purposes and should identify the same time-class.	537	used for statistical purposes and should identify the same time-class.
424		538
425	Useful for short background jobs.	539	Useful for short background jobs.
…		…
454	}	568	}
455	}	569	}
456		570
457	if (@SLOT_QUEUE) {	571	if (@SLOT_QUEUE) {
458	# we do not use wait_for_tick() as it returns immediately when tick is inactive	572	# we do not use wait_for_tick() as it returns immediately when tick is inactive
459	push @cf::WAIT_FOR_TICK, $signal;	573	$WAIT_FOR_TICK->wait;
460	$signal->wait;
461	} else {	574	} else {
462	$busy = 0;	575	$busy = 0;
463	Coro::schedule;	576	Coro::schedule;
464	}	577	}
465	}	578	}
…		…
505	=cut	618	=cut
506		619
507	sub sync_job(&) {	620	sub sync_job(&) {
508	my ($job) = @_;	621	my ($job) = @_;
509		622
510	if ($Coro::current == $Coro::main) {	623	if (in_main) {
511	my $time = AE::time;	624	my $time = AE::time;
512		625
513	# this is the main coro, too bad, we have to block	626	# this is the main coro, too bad, we have to block
514	# till the operation succeeds, freezing the server :/	627	# till the operation succeeds, freezing the server :/
515		628
516	LOG llevError, Carp::longmess "sync job";#d#	629	#LOG llevError, Carp::longmess "sync job";#d#
517		630
518	my $freeze_guard = freeze_mainloop;	631	my $freeze_guard = freeze_mainloop;
519		632
520	my $busy = 1;	633	my $busy = 1;
521	my @res;	634	my @res;
522		635
523	(async {	636	(async {
524	$Coro::current->desc ("sync job coro");	637	$Coro::current->desc ("sync job coro");
525	@res = eval { $job->() };	638	@res = eval { $job->() };
526	warn $@ if $@;	639	error $@ if $@;
527	undef $busy;	640	undef $busy;
528	})->prio (Coro::PRIO_MAX);	641	})->prio (Coro::PRIO_MAX);
529		642
530	while ($busy) {	643	while ($busy) {
531	if (Coro::nready) {	644	if (Coro::nready) {
…		…
565	$EXT_CORO{$coro+0} = $coro;	678	$EXT_CORO{$coro+0} = $coro;
566		679
567	$coro	680	$coro
568	}	681	}
569		682
570	=item fork_call { }, $args	683	=item fork_call { }, @args
571		684
572	Executes the given code block with the given arguments in a seperate	685	Executes the given code block with the given arguments in a seperate
573	process, returning the results. Everything must be serialisable with	686	process, returning the results. Everything must be serialisable with
574	Coro::Storable. May, of course, block. Note that the executed sub may	687	Coro::Storable. May, of course, block. Note that the executed sub may
575	never block itself or use any form of event handling.	688	never block itself or use any form of event handling.
576		689
577	=cut	690	=cut
578		691
		692	sub post_fork {
		693	reset_signals;
		694	}
		695
579	sub fork_call(&@) {	696	sub fork_call(&@) {
580	my ($cb, @args) = @_;	697	my ($cb, @args) = @_;
581		698
582	# we seemingly have to make a local copy of the whole thing,	699	# we seemingly have to make a local copy of the whole thing,
583	# otherwise perl prematurely frees the stuff :/	700	# otherwise perl prematurely frees the stuff :/
584	# TODO: investigate and fix (likely this will be rather laborious)	701	# TODO: investigate and fix (likely this will be rather laborious)
585		702
586	my @res = Coro::Util::fork_eval {	703	my @res = Coro::Util::fork_eval {
587	reset_signals;	704	cf::post_fork;
588	&$cb	705	&$cb
589	}, @args;	706	} @args;
590		707
591	wantarray ? @res : $res[-1]	708	wantarray ? @res : $res[-1]
592	}	709	}
593		710
594	sub objinfo {	711	sub objinfo {
…		…
644	within each server.	761	within each server.
645		762
646	=cut	763	=cut
647		764
648	sub db_table($) {	765	sub db_table($) {
		766	cf::error "db_get called from main context"
		767	if $Coro::current == $Coro::main;
		768
649	my ($name) = @_;	769	my ($name) = @_;
650	my $db = BDB::db_create $DB_ENV;	770	my $db = BDB::db_create $DB_ENV;
651		771
652	eval {	772	eval {
653	$db->set_flags (BDB::CHKSUM);	773	$db->set_flags (BDB::CHKSUM);
…		…
663	}	783	}
664		784
665	our $DB;	785	our $DB;
666		786
667	sub db_init {	787	sub db_init {
668	cf::sync_job {
669	$DB ||= db_table "db";	788	$DB ||= db_table "db";
670	};
671	}	789	}
672		790
673	sub db_get($$) {	791	sub db_get($$) {
674	my $key = "$_[0]/$_[1]";	792	my $key = "$_[0]/$_[1]";
675		793
676	cf::sync_job {	794	cf::error "db_get called from main context"
		795	if $Coro::current == $Coro::main;
		796
677	BDB::db_get $DB, undef, $key, my $data;	797	BDB::db_get $DB, undef, $key, my $data;
678		798
679	$! ? ()	799	$! ? ()
680	: $data	800	: $data
681	}
682	}	801	}
683		802
684	sub db_put($$$) {	803	sub db_put($$$) {
685	BDB::dbreq_pri 4;	804	BDB::dbreq_pri 4;
686	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	805	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
714		833
715	my @data;	834	my @data;
716	my $md5;	835	my $md5;
717		836
718	for (0 .. $#$src) {	837	for (0 .. $#$src) {
719	0 <= aio_load $src->[$_], $data[$_]	838	$data[$_] = load_file $src->[$_];
720	or Carp::croak "$src->[$_]: $!";
721	}	839	}
722		840
723	# if processing is expensive, check	841	# if processing is expensive, check
724	# checksum first	842	# checksum first
725	if (1) {	843	if (1) {
…		…
742		860
743	my $t1 = Time::HiRes::time;	861	my $t1 = Time::HiRes::time;
744	my $data = $process->(\@data);	862	my $data = $process->(\@data);
745	my $t2 = Time::HiRes::time;	863	my $t2 = Time::HiRes::time;
746		864
747	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	865	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
748		866
749	db_put cache => "$id/data", $data;	867	db_put cache => "$id/data", $data;
750	db_put cache => "$id/md5" , $md5;	868	db_put cache => "$id/md5" , $md5;
751	db_put cache => "$id/meta", $meta;	869	db_put cache => "$id/meta", $meta;
752		870
…		…
762		880
763	=cut	881	=cut
764		882
765	sub datalog($@) {	883	sub datalog($@) {
766	my ($type, %kv) = @_;	884	my ($type, %kv) = @_;
767	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	885	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
768	}	886	}
769		887
770	=back	888	=back
771		889
772	=cut	890	=cut
…		…
967		1085
968	} elsif (exists $cb_id{$type}) {	1086	} elsif (exists $cb_id{$type}) {
969	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	1087	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
970		1088
971	} elsif (ref $type) {	1089	} elsif (ref $type) {
972	warn "attaching objects not supported, ignoring.\n";	1090	error "attaching objects not supported, ignoring.\n";
973		1091
974	} else {	1092	} else {
975	shift @arg;	1093	shift @arg;
976	warn "attach argument '$type' not supported, ignoring.\n";	1094	error "attach argument '$type' not supported, ignoring.\n";
977	}	1095	}
978	}	1096	}
979	}	1097	}
980		1098
981	sub _object_attach {	1099	sub _object_attach {
…		…
991	_attach $registry, $klass, @attach;	1109	_attach $registry, $klass, @attach;
992	}	1110	}
993		1111
994	$obj->{$name} = \%arg;	1112	$obj->{$name} = \%arg;
995	} else {	1113	} else {
996	warn "object uses attachment '$name' which is not available, postponing.\n";	1114	info "object uses attachment '$name' which is not available, postponing.\n";
997	}	1115	}
998		1116
999	$obj->{_attachment}{$name} = undef;	1117	$obj->{_attachment}{$name} = undef;
1000	}	1118	}
1001		1119
…		…
1060		1178
1061	for (@$callbacks) {	1179	for (@$callbacks) {
1062	eval { &{$_->[1]} };	1180	eval { &{$_->[1]} };
1063		1181
1064	if ($@) {	1182	if ($@) {
1065	warn "$@";
1066	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1183	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1067	override;	1184	override;
1068	}	1185	}
1069		1186
1070	return 1 if $override;	1187	return 1 if $override;
1071	}	1188	}
…		…
1150	for (@$attach) {	1267	for (@$attach) {
1151	my ($klass, @attach) = @$_;	1268	my ($klass, @attach) = @$_;
1152	_attach $registry, $klass, @attach;	1269	_attach $registry, $klass, @attach;
1153	}	1270	}
1154	} else {	1271	} else {
1155	warn "object uses attachment '$name' that is not available, postponing.\n";	1272	info "object uses attachment '$name' that is not available, postponing.\n";
1156	}	1273	}
1157	}	1274	}
1158	}	1275	}
1159		1276
1160	cf::attachable->attach (	1277	cf::attachable->attach (
…		…
1187	my ($filename, $rdata, $objs) = @_;	1304	my ($filename, $rdata, $objs) = @_;
1188		1305
1189	sync_job {	1306	sync_job {
1190	if (length $$rdata) {	1307	if (length $$rdata) {
1191	utf8::decode (my $decname = $filename);	1308	utf8::decode (my $decname = $filename);
1192	warn sprintf "saving %s (%d,%d)\n",	1309	trace sprintf "saving %s (%d,%d)\n",
1193	$decname, length $$rdata, scalar @$objs;	1310	$decname, length $$rdata, scalar @$objs
		1311	if $VERBOSE_IO;
1194		1312
1195	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1313	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1196	aio_chmod $fh, SAVE_MODE;	1314	aio_chmod $fh, SAVE_MODE;
1197	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1315	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1198	if ($cf::USE_FSYNC) {	1316	if ($cf::USE_FSYNC) {
…		…
1220	aio_rename "$filename~", $filename;	1338	aio_rename "$filename~", $filename;
1221		1339
1222	$filename =~ s%/[^/]+$%%;	1340	$filename =~ s%/[^/]+$%%;
1223	aio_pathsync $filename if $cf::USE_FSYNC;	1341	aio_pathsync $filename if $cf::USE_FSYNC;
1224	} else {	1342	} else {
1225	warn "unable to save objects: $filename~: $!\n";	1343	error "unable to save objects: $filename~: $!\n";
1226	}	1344	}
1227	} else {	1345	} else {
1228	aio_unlink $filename;	1346	aio_unlink $filename;
1229	aio_unlink "$filename.pst";	1347	aio_unlink "$filename.pst";
1230	}	1348	}
…		…
1254	my $st = eval { Coro::Storable::thaw $av };	1372	my $st = eval { Coro::Storable::thaw $av };
1255	$av = $st->{objs};	1373	$av = $st->{objs};
1256	}	1374	}
1257		1375
1258	utf8::decode (my $decname = $filename);	1376	utf8::decode (my $decname = $filename);
1259	warn sprintf "loading %s (%d,%d)\n",	1377	trace sprintf "loading %s (%d,%d)\n",
1260	$decname, length $data, scalar @{$av || []};	1378	$decname, length $data, scalar @{$av || []}
		1379	if $VERBOSE_IO;
1261		1380
1262	($data, $av)	1381	($data, $av)
1263	}	1382	}
1264		1383
1265	=head2 COMMAND CALLBACKS	1384	=head2 COMMAND CALLBACKS
…		…
1357		1476
1358	$pl->ext_reply ($reply, @reply)	1477	$pl->ext_reply ($reply, @reply)
1359	if $reply;	1478	if $reply;
1360		1479
1361	} else {	1480	} else {
1362	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1481	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1363	}	1482	}
1364		1483
1365	cf::override;	1484	cf::override;
1366	},	1485	},
1367	);	1486	);
…		…
1378		1497
1379	$grp	1498	$grp
1380	}	1499	}
1381		1500
1382	sub load_extensions {	1501	sub load_extensions {
		1502	info "loading extensions...";
		1503
1383	cf::sync_job {	1504	cf::sync_job {
1384	my %todo;	1505	my %todo;
1385		1506
1386	for my $path (<$LIBDIR/*.ext>) {	1507	for my $path (<$LIBDIR/*.ext>) {
1387	next unless -r $path;	1508	next unless -r $path;
…		…
1405		1526
1406	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1527	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1407	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1528	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1408		1529
1409	$ext{source} =	1530	$ext{source} =
1410	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1531	"package $pkg; use common::sense;\n"
1411	. "#line 1 \"$path\"\n{\n"	1532	. "#line 1 \"$path\"\n{\n"
1412	. $source	1533	. $source
1413	. "\n};\n1";	1534	. "\n};\n1";
1414		1535
1415	$todo{$base} = \%ext;	1536	$todo{$base} = \%ext;
…		…
1427	for (split /,\s*/, $v->{meta}{depends}) {	1548	for (split /,\s*/, $v->{meta}{depends}) {
1428	next ext	1549	next ext
1429	unless exists $done{$_};	1550	unless exists $done{$_};
1430	}	1551	}
1431		1552
1432	warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1553	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1433		1554
1434	my $active = eval $v->{source};	1555	my $active = eval $v->{source};
1435		1556
1436	if (length $@) {	1557	if (length $@) {
1437	warn "$v->{path}: $@\n";	1558	error "$v->{path}: $@\n";
1438		1559
1439	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1560	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1440	if exists $v->{meta}{mandatory};	1561	if exists $v->{meta}{mandatory};
		1562
		1563	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
		1564	delete $todo{$k};
1441	} else {	1565	} else {
1442	$done{$k} = delete $todo{$k};	1566	$done{$k} = delete $todo{$k};
1443	push @EXTS, $v->{pkg};	1567	push @EXTS, $v->{pkg};
1444	$progress = 1;	1568	$progress = 1;
1445		1569
1446	warn "$v->{base}: extension inactive.\n"	1570	info "$v->{base}: extension inactive.\n"
1447	unless $active;	1571	unless $active;
1448	}	1572	}
1449	}	1573	}
1450		1574
1451	unless ($progress) {	1575	unless ($progress) {
…		…
1453		1577
1454	while (my ($k, $v) = each %todo) {	1578	while (my ($k, $v) = each %todo) {
1455	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1579	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1456	if exists $v->{meta}{mandatory};	1580	if exists $v->{meta}{mandatory};
1457	}	1581	}
		1582
		1583	last;
1458	}	1584	}
1459	}	1585	}
1460	};	1586	};
1461	}	1587	}
1462		1588
…		…
1620	my $name = $pl->ob->name;	1746	my $name = $pl->ob->name;
1621		1747
1622	$pl->{deny_save} = 1;	1748	$pl->{deny_save} = 1;
1623	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1749	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1624		1750
1625	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1751	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1626	$pl->deactivate;	1752	$pl->deactivate;
		1753
1627	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1754	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1628	$pl->ob->check_score;
1629	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1755	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1756	ext::highscore::check ($pl->ob);
		1757
1630	$pl->ns->destroy if $pl->ns;	1758	$pl->ns->destroy if $pl->ns;
1631		1759
1632	my $path = playerdir $pl;	1760	my $path = playerdir $pl;
1633	my $temp = "$path~$cf::RUNTIME~deleting~";	1761	my $temp = "$path~$cf::RUNTIME~deleting~";
1634	aio_rename $path, $temp;	1762	aio_rename $path, $temp;
…		…
1688	\@logins	1816	\@logins
1689	}	1817	}
1690		1818
1691	=item $player->maps	1819	=item $player->maps
1692		1820
		1821	=item cf::player::maps $login
		1822
1693	Returns an arrayref of map paths that are private for this	1823	Returns an arrayref of map paths that are private for this
1694	player. May block.	1824	player. May block.
1695		1825
1696	=cut	1826	=cut
1697		1827
…		…
1759	=cut	1889	=cut
1760		1890
1761	sub find_by_path($) {	1891	sub find_by_path($) {
1762	my ($path) = @_;	1892	my ($path) = @_;
1763		1893
		1894	$path =~ s/^~[^\/]*//; # skip ~login
		1895
1764	my ($match, $specificity);	1896	my ($match, $specificity);
1765		1897
1766	for my $region (list) {	1898	for my $region (list) {
1767	if ($region->{match} && $path =~ $region->{match}) {	1899	if ($region->{match} && $path =~ $region->{match}) {
1768	($match, $specificity) = ($region, $region->specificity)	1900	($match, $specificity) = ($region, $region->specificity)
…		…
1796	sub generate_random_map {	1928	sub generate_random_map {
1797	my ($self, $rmp) = @_;	1929	my ($self, $rmp) = @_;
1798		1930
1799	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	1931	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1800		1932
1801	# mit "rum" bekleckern, nicht
1802	$self->_create_random_map (	1933	$self->_create_random_map ($rmp);
1803	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1804	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1805	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1806	$rmp->{exit_on_final_map},
1807	$rmp->{xsize}, $rmp->{ysize},
1808	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1809	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1810	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1811	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1812	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1813	(cf::region::find $rmp->{region}), $rmp->{custom}
1814	)
1815	}	1934	}
1816		1935
1817	=item cf::map->register ($regex, $prio)	1936	=item cf::map->register ($regex, $prio)
1818		1937
1819	Register a handler for the map path matching the given regex at the	1938	Register a handler for the map path matching the given regex at the
…		…
1824		1943
1825	sub register {	1944	sub register {
1826	my (undef, $regex, $prio) = @_;	1945	my (undef, $regex, $prio) = @_;
1827	my $pkg = caller;	1946	my $pkg = caller;
1828		1947
1829	no strict;
1830	push @{"$pkg\::ISA"}, __PACKAGE__;	1948	push @{"$pkg\::ISA"}, __PACKAGE__;
1831		1949
1832	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	1950	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1833	}	1951	}
1834		1952
1835	# also paths starting with '/'	1953	# also paths starting with '/'
1836	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	1954	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1837		1955
1838	sub thawer_merge {	1956	sub thawer_merge {
1839	my ($self, $merge) = @_;	1957	my ($self, $merge) = @_;
1840		1958
1841	# we have to keep some variables in memory intact	1959	# we have to keep some variables in memory intact
…		…
1846	}	1964	}
1847		1965
1848	sub normalise {	1966	sub normalise {
1849	my ($path, $base) = @_;	1967	my ($path, $base) = @_;
1850		1968
1851	$path = "$path"; # make sure its a string	1969	$path = "$path"; # make sure it's a string
1852		1970
1853	$path =~ s/\.map$//;	1971	$path =~ s/\.map$//;
1854		1972
1855	# map plan:	1973	# map plan:
1856	#	1974	#
…		…
1871	$base =~ s{[^/]+/?$}{};	1989	$base =~ s{[^/]+/?$}{};
1872	$path = "$base/$path";	1990	$path = "$base/$path";
1873	}	1991	}
1874		1992
1875	for ($path) {	1993	for ($path) {
1876	redo if s{//}{/};
1877	redo if s{/\.?/}{/};	1994	redo if s{/\.?/}{/};
1878	redo if s{/[^/]+/\.\./}{/};	1995	redo if s{/[^/]+/\.\./}{/};
1879	}	1996	}
1880		1997
1881	$path	1998	$path
…		…
1895	$self->init; # pass $1 etc.	2012	$self->init; # pass $1 etc.
1896	return $self;	2013	return $self;
1897	}	2014	}
1898	}	2015	}
1899		2016
1900	Carp::cluck "unable to resolve path '$path' (base '$base').";	2017	Carp::cluck "unable to resolve path '$path' (base '$base')";
1901	()	2018	()
1902	}	2019	}
1903		2020
		2021	# may re-bless or do other evil things
1904	sub init {	2022	sub init {
1905	my ($self) = @_;	2023	my ($self) = @_;
1906		2024
1907	$self	2025	$self
1908	}	2026	}
…		…
1973	$self->{load_path} = $path;	2091	$self->{load_path} = $path;
1974		2092
1975	1	2093	1
1976	}	2094	}
1977		2095
		2096	# used to laod the header of an original map
1978	sub load_header_orig {	2097	sub load_header_orig {
1979	my ($self) = @_;	2098	my ($self) = @_;
1980		2099
1981	$self->load_header_from ($self->load_path)	2100	$self->load_header_from ($self->load_path)
1982	}	2101	}
1983		2102
		2103	# used to laod the header of an instantiated map
1984	sub load_header_temp {	2104	sub load_header_temp {
1985	my ($self) = @_;	2105	my ($self) = @_;
1986		2106
1987	$self->load_header_from ($self->save_path)	2107	$self->load_header_from ($self->save_path)
1988	}	2108	}
1989		2109
		2110	# called after loading the header from an instantiated map
1990	sub prepare_temp {	2111	sub prepare_temp {
1991	my ($self) = @_;	2112	my ($self) = @_;
1992		2113
1993	$self->last_access ((delete $self->{last_access})	2114	$self->last_access ((delete $self->{last_access})
1994	|| $cf::RUNTIME); #d#	2115	|| $cf::RUNTIME); #d#
1995	# safety	2116	# safety
1996	$self->{instantiate_time} = $cf::RUNTIME	2117	$self->{instantiate_time} = $cf::RUNTIME
1997	if $self->{instantiate_time} > $cf::RUNTIME;	2118	if $self->{instantiate_time} > $cf::RUNTIME;
1998	}	2119	}
1999		2120
		2121	# called after loading the header from an original map
2000	sub prepare_orig {	2122	sub prepare_orig {
2001	my ($self) = @_;	2123	my ($self) = @_;
2002		2124
2003	$self->{load_original} = 1;	2125	$self->{load_original} = 1;
2004	$self->{instantiate_time} = $cf::RUNTIME;	2126	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2028		2150
2029	sub find;	2151	sub find;
2030	sub find {	2152	sub find {
2031	my ($path, $origin) = @_;	2153	my ($path, $origin) = @_;
2032		2154
		2155	cf::cede_to_tick;
		2156
2033	$path = normalise $path, $origin && $origin->path;	2157	$path = normalise $path, $origin;
2034		2158
2035	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2159	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2036	my $guard2 = cf::lock_acquire "map_find:$path";	2160	my $guard2 = cf::lock_acquire "map_find:$path";
2037		2161
2038	$cf::MAP{$path} || do {	2162	$cf::MAP{$path} || do {
…		…
2069		2193
2070	{	2194	{
2071	my $guard = cf::lock_acquire "map_data:$path";	2195	my $guard = cf::lock_acquire "map_data:$path";
2072		2196
2073	return unless $self->valid;	2197	return unless $self->valid;
2074	return unless $self->in_memory == cf::MAP_SWAPPED;	2198	return unless $self->state == cf::MAP_SWAPPED;
2075
2076	$self->in_memory (cf::MAP_LOADING);
2077		2199
2078	$self->alloc;	2200	$self->alloc;
2079		2201
2080	$self->pre_load;	2202	$self->pre_load;
2081	cf::cede_to_tick;	2203	cf::cede_to_tick;
2082		2204
		2205	if (exists $self->{load_path}) {
2083	my $f = new_from_file cf::object::thawer $self->{load_path};	2206	my $f = new_from_file cf::object::thawer $self->{load_path};
2084	$f->skip_block;	2207	$f->skip_block;
2085	$self->_load_objects ($f)	2208	$self->_load_objects ($f)
2086	or return;	2209	or return;
2087		2210
2088	$self->post_load_original	2211	$self->post_load_original
2089	if delete $self->{load_original};	2212	if delete $self->{load_original};
2090		2213
2091	if (my $uniq = $self->uniq_path) {	2214	if (my $uniq = $self->uniq_path) {
2092	utf8::encode $uniq;	2215	utf8::encode $uniq;
2093	unless (aio_stat $uniq) {	2216	unless (aio_stat $uniq) {
2094	if (my $f = new_from_file cf::object::thawer $uniq) {	2217	if (my $f = new_from_file cf::object::thawer $uniq) {
2095	$self->clear_unique_items;	2218	$self->clear_unique_items;
2096	$self->_load_objects ($f);	2219	$self->_load_objects ($f);
2097	$f->resolve_delayed_derefs;	2220	$f->resolve_delayed_derefs;
		2221	}
2098	}	2222	}
2099	}	2223	}
2100	}
2101		2224
2102	$f->resolve_delayed_derefs;	2225	$f->resolve_delayed_derefs;
		2226	} else {
		2227	$self->post_load_original
		2228	if delete $self->{load_original};
		2229	}
		2230
		2231	$self->state (cf::MAP_INACTIVE);
2103		2232
2104	cf::cede_to_tick;	2233	cf::cede_to_tick;
2105	# now do the right thing for maps	2234	# now do the right thing for maps
2106	$self->link_multipart_objects;	2235	$self->link_multipart_objects;
2107	$self->difficulty ($self->estimate_difficulty)	2236	$self->difficulty ($self->estimate_difficulty)
…		…
2111	unless ($self->{deny_activate}) {	2240	unless ($self->{deny_activate}) {
2112	$self->decay_objects;	2241	$self->decay_objects;
2113	$self->fix_auto_apply;	2242	$self->fix_auto_apply;
2114	$self->update_buttons;	2243	$self->update_buttons;
2115	cf::cede_to_tick;	2244	cf::cede_to_tick;
2116	$self->activate;	2245	#$self->activate; # no longer activate maps automatically
2117	}	2246	}
2118		2247
2119	$self->{last_save} = $cf::RUNTIME;	2248	$self->{last_save} = $cf::RUNTIME;
2120	$self->last_access ($cf::RUNTIME);	2249	$self->last_access ($cf::RUNTIME);
2121
2122	$self->in_memory (cf::MAP_ACTIVE);
2123	}	2250	}
2124		2251
2125	$self->post_load;	2252	$self->post_load;
		2253
		2254	1
2126	}	2255	}
2127		2256
2128	# customize the map for a given player, i.e.	2257	# customize the map for a given player, i.e.
2129	# return the _real_ map. used by e.g. per-player	2258	# return the _real_ map. used by e.g. per-player
2130	# maps to change the path to ~playername/mappath	2259	# maps to change the path to ~playername/mappath
…		…
2151	or next;	2280	or next;
2152	$neigh = find $neigh, $map	2281	$neigh = find $neigh, $map
2153	or next;	2282	or next;
2154	$neigh->load;	2283	$neigh->load;
2155		2284
		2285	# now find the diagonal neighbours
2156	push @neigh,	2286	push @neigh,
2157	[$neigh->tile_path (($_ + 3) % 4), $neigh],	2287	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2158	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2288	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2159	}	2289	}
2160		2290
…		…
2167	}	2297	}
2168		2298
2169	sub find_sync {	2299	sub find_sync {
2170	my ($path, $origin) = @_;	2300	my ($path, $origin) = @_;
2171		2301
2172	cf::sync_job { find $path, $origin }	2302	# it's a bug to call this from the main context
		2303	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
		2304	if $Coro::current == $Coro::main;
		2305
		2306	find $path, $origin
2173	}	2307	}
2174		2308
2175	sub do_load_sync {	2309	sub do_load_sync {
2176	my ($map) = @_;	2310	my ($map) = @_;
2177		2311
		2312	# it's a bug to call this from the main context
2178	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2313	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2179	if $Coro::current == $Coro::main;	2314	if $Coro::current == $Coro::main;
2180		2315
2181	cf::sync_job { $map->load };	2316	$map->load;
2182	}	2317	}
2183		2318
2184	our %MAP_PREFETCH;	2319	our %MAP_PREFETCH;
2185	our $MAP_PREFETCHER = undef;	2320	our $MAP_PREFETCHER = undef;
2186		2321
2187	sub find_async {	2322	sub find_async {
2188	my ($path, $origin, $load) = @_;	2323	my ($path, $origin, $load) = @_;
2189		2324
2190	$path = normalise $path, $origin && $origin->{path};	2325	$path = normalise $path, $origin;
2191		2326
2192	if (my $map = $cf::MAP{$path}) {	2327	if (my $map = $cf::MAP{$path}) {
2193	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2328	return $map if !$load || $map->linkable;
2194	}	2329	}
2195		2330
2196	$MAP_PREFETCH{$path} |= $load;	2331	$MAP_PREFETCH{$path} |= $load;
2197		2332
2198	$MAP_PREFETCHER ||= cf::async {	2333	$MAP_PREFETCHER ||= cf::async {
…		…
2212	$MAP_PREFETCHER->prio (6);	2347	$MAP_PREFETCHER->prio (6);
2213		2348
2214	()	2349	()
2215	}	2350	}
2216		2351
		2352	# common code, used by both ->save and ->swapout
2217	sub save {	2353	sub _save {
2218	my ($self) = @_;	2354	my ($self) = @_;
2219
2220	my $lock = cf::lock_acquire "map_data:$self->{path}";
2221		2355
2222	$self->{last_save} = $cf::RUNTIME;	2356	$self->{last_save} = $cf::RUNTIME;
2223		2357
2224	return unless $self->dirty;	2358	return unless $self->dirty;
2225		2359
…		…
2245	} else {	2379	} else {
2246	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);	2380	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2247	}	2381	}
2248	}	2382	}
2249		2383
		2384	sub save {
		2385	my ($self) = @_;
		2386
		2387	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2388
		2389	$self->_save;
		2390	}
		2391
2250	sub swap_out {	2392	sub swap_out {
2251	my ($self) = @_;	2393	my ($self) = @_;
2252		2394
2253	# save first because save cedes
2254	$self->save;
2255
2256	my $lock = cf::lock_acquire "map_data:$self->{path}";	2395	my $lock = cf::lock_acquire "map_data:$self->{path}";
2257		2396
		2397	return if !$self->linkable;
		2398	return if $self->{deny_save};
2258	return if $self->players;	2399	return if $self->players;
2259	return if $self->in_memory != cf::MAP_ACTIVE;	2400
		2401	# first deactivate the map and "unlink" it from the core
		2402	$self->deactivate;
		2403	$_->clear_links_to ($self) for values %cf::MAP;
		2404	$self->state (cf::MAP_SWAPPED);
		2405
		2406	# then atomically save
		2407	$self->_save;
		2408
		2409	# then free the map
		2410	$self->clear;
		2411	}
		2412
		2413	sub reset_at {
		2414	my ($self) = @_;
		2415
		2416	# TODO: safety, remove and allow resettable per-player maps
2260	return if $self->{deny_save};	2417	return 1e99 if $self->{deny_reset};
2261		2418
		2419	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
		2420	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
		2421
		2422	$time + $to
		2423	}
		2424
		2425	sub should_reset {
		2426	my ($self) = @_;
		2427
		2428	$self->reset_at <= $cf::RUNTIME
		2429	}
		2430
		2431	sub reset {
		2432	my ($self) = @_;
		2433
		2434	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2435
		2436	return if $self->players;
		2437
		2438	cf::trace "resetting map ", $self->path, "\n";
		2439
2262	$self->in_memory (cf::MAP_SWAPPED);	2440	$self->state (cf::MAP_SWAPPED);
		2441
		2442	# need to save uniques path
		2443	unless ($self->{deny_save}) {
		2444	my $uniq = $self->uniq_path; utf8::encode $uniq;
		2445
		2446	$self->_save_objects ($uniq, cf::IO_UNIQUES)
		2447	if $uniq;
		2448	}
		2449
		2450	delete $cf::MAP{$self->path};
2263		2451
2264	$self->deactivate;	2452	$self->deactivate;
2265	$_->clear_links_to ($self) for values %cf::MAP;	2453	$_->clear_links_to ($self) for values %cf::MAP;
2266	$self->clear;	2454	$self->clear;
2267	}
2268
2269	sub reset_at {
2270	my ($self) = @_;
2271
2272	# TODO: safety, remove and allow resettable per-player maps
2273	return 1e99 if $self->{deny_reset};
2274
2275	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2276	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2277
2278	$time + $to
2279	}
2280
2281	sub should_reset {
2282	my ($self) = @_;
2283
2284	$self->reset_at <= $cf::RUNTIME
2285	}
2286
2287	sub reset {
2288	my ($self) = @_;
2289
2290	my $lock = cf::lock_acquire "map_data:$self->{path}";
2291
2292	return if $self->players;
2293
2294	warn "resetting map ", $self->path, "\n";
2295
2296	$self->in_memory (cf::MAP_SWAPPED);
2297
2298	# need to save uniques path
2299	unless ($self->{deny_save}) {
2300	my $uniq = $self->uniq_path; utf8::encode $uniq;
2301
2302	$self->_save_objects ($uniq, cf::IO_UNIQUES)
2303	if $uniq;
2304	}
2305
2306	delete $cf::MAP{$self->path};
2307
2308	$self->deactivate;
2309	$_->clear_links_to ($self) for values %cf::MAP;
2310	$self->clear;
2311		2455
2312	$self->unlink_save;	2456	$self->unlink_save;
2313	$self->destroy;	2457	$self->destroy;
2314	}	2458	}
2315		2459
…		…
2323		2467
2324	delete $cf::MAP{$self->path};	2468	delete $cf::MAP{$self->path};
2325		2469
2326	$self->unlink_save;	2470	$self->unlink_save;
2327		2471
2328	bless $self, "cf::map";	2472	bless $self, "cf::map::wrap";
2329	delete $self->{deny_reset};	2473	delete $self->{deny_reset};
2330	$self->{deny_save} = 1;	2474	$self->{deny_save} = 1;
2331	$self->reset_timeout (1);	2475	$self->reset_timeout (1);
2332	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2476	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2333		2477
…		…
2563		2707
2564	Freezes the player and moves him/her to a special map (C<{link}>).	2708	Freezes the player and moves him/her to a special map (C<{link}>).
2565		2709
2566	The player should be reasonably safe there for short amounts of time (e.g.	2710	The player should be reasonably safe there for short amounts of time (e.g.
2567	for loading a map). You I<MUST> call C<leave_link> as soon as possible,	2711	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2568	though, as the palyer cannot control the character while it is on the link	2712	though, as the player cannot control the character while it is on the link
2569	map.	2713	map.
2570		2714
2571	Will never block.	2715	Will never block.
2572		2716
2573	=item $player_object->leave_link ($map, $x, $y)	2717	=item $player_object->leave_link ($map, $x, $y)
…		…
2594	sub cf::object::player::enter_link {	2738	sub cf::object::player::enter_link {
2595	my ($self) = @_;	2739	my ($self) = @_;
2596		2740
2597	$self->deactivate_recursive;	2741	$self->deactivate_recursive;
2598		2742
		2743	++$self->{_link_recursion};
		2744
2599	return if UNIVERSAL::isa $self->map, "ext::map_link";	2745	return if UNIVERSAL::isa $self->map, "ext::map_link";
2600		2746
2601	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2747	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2602	if $self->map && $self->map->{path} ne "{link}";	2748	if $self->map && $self->map->{path} ne "{link}";
2603		2749
2604	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2750	$self->enter_map ($LINK_MAP || link_map, 3, 3);
2605	}	2751	}
2606		2752
2607	sub cf::object::player::leave_link {	2753	sub cf::object::player::leave_link {
2608	my ($self, $map, $x, $y) = @_;	2754	my ($self, $map, $x, $y) = @_;
2609		2755
…		…
2634	$map->load_neighbours;	2780	$map->load_neighbours;
2635		2781
2636	return unless $self->contr->active;	2782	return unless $self->contr->active;
2637		2783
2638	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2784	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2639	$self->enter_map ($map, $x, $y);	2785	if ($self->enter_map ($map, $x, $y)) {
2640		2786	# entering was successful
		2787	delete $self->{_link_recursion};
2641	# only activate afterwards, to support waiting in hooks	2788	# only activate afterwards, to support waiting in hooks
2642	$self->activate_recursive;	2789	$self->activate_recursive;
2643	}	2790	}
2644		2791
		2792	}
		2793
2645	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2794	=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2646		2795
2647	Moves the player to the given map-path and coordinates by first freezing	2796	Moves the player to the given map-path and coordinates by first freezing
2648	her, loading and preparing them map, calling the provided $check callback	2797	her, loading and preparing them map, calling the provided $check callback
2649	that has to return the map if sucecssful, and then unfreezes the player on	2798	that has to return the map if sucecssful, and then unfreezes the player on
2650	the new (success) or old (failed) map position. In either case, $done will	2799	the new (success) or old (failed) map position. In either case, $done will
…		…
2657		2806
2658	our $GOTOGEN;	2807	our $GOTOGEN;
2659		2808
2660	sub cf::object::player::goto {	2809	sub cf::object::player::goto {
2661	my ($self, $path, $x, $y, $check, $done) = @_;	2810	my ($self, $path, $x, $y, $check, $done) = @_;
		2811
		2812	if ($self->{_link_recursion} >= $MAX_LINKS) {
		2813	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
		2814	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
		2815	($path, $x, $y) = @$EMERGENCY_POSITION;
		2816	}
2662		2817
2663	# do generation counting so two concurrent goto's will be executed in-order	2818	# do generation counting so two concurrent goto's will be executed in-order
2664	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2819	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2665		2820
2666	$self->enter_link;	2821	$self->enter_link;
…		…
2686	($path, $x, $y) = (undef, undef, undef);	2841	($path, $x, $y) = (undef, undef, undef);
2687	}	2842	}
2688	}	2843	}
2689		2844
2690	my $map = eval {	2845	my $map = eval {
2691	my $map = defined $path ? cf::map::find $path : undef;	2846	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2692		2847
2693	if ($map) {	2848	if ($map) {
2694	$map = $map->customise_for ($self);	2849	$map = $map->customise_for ($self);
2695	$map = $check->($map) if $check && $map;	2850	$map = $check->($map, $x, $y, $self) if $check && $map;
2696	} else {	2851	} else {
2697	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);	2852	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2698	}	2853	}
2699		2854
2700	$map	2855	$map
…		…
2708	if ($gen == $self->{_goto_generation}) {	2863	if ($gen == $self->{_goto_generation}) {
2709	delete $self->{_goto_generation};	2864	delete $self->{_goto_generation};
2710	$self->leave_link ($map, $x, $y);	2865	$self->leave_link ($map, $x, $y);
2711	}	2866	}
2712		2867
2713	$done->() if $done;	2868	$done->($self) if $done;
2714	})->prio (1);	2869	})->prio (1);
2715	}	2870	}
2716		2871
2717	=item $player_object->enter_exit ($exit_object)	2872	=item $player_object->enter_exit ($exit_object)
2718		2873
…		…
2786	$Coro::current->{desc} = "enter_exit";	2941	$Coro::current->{desc} = "enter_exit";
2787		2942
2788	unless (eval {	2943	unless (eval {
2789	$self->deactivate_recursive; # just to be sure	2944	$self->deactivate_recursive; # just to be sure
2790		2945
2791	# random map handling
2792	{
2793	my $guard = cf::lock_acquire "exit_prepare:$exit";
2794
2795	prepare_random_map $exit
2796	if $exit->slaying eq "/!";
2797	}
2798
2799	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2946	my $map = cf::map::normalise $exit->slaying, $exit->map;
2800	my $x = $exit->stats->hp;	2947	my $x = $exit->stats->hp;
2801	my $y = $exit->stats->sp;	2948	my $y = $exit->stats->sp;
		2949
		2950	# special map handling
		2951	my $slaying = $exit->slaying;
		2952
		2953	# special map handling
		2954	if ($slaying eq "/!") {
		2955	my $guard = cf::lock_acquire "exit_prepare:$exit";
		2956
		2957	prepare_random_map $exit
		2958	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		2959
		2960	$map = $exit->slaying;
		2961
		2962	} elsif ($slaying eq '!up') {
		2963	$map = $exit->map->tile_path (cf::TILE_UP);
		2964	$x = $exit->x;
		2965	$y = $exit->y;
		2966
		2967	} elsif ($slaying eq '!down') {
		2968	$map = $exit->map->tile_path (cf::TILE_DOWN);
		2969	$x = $exit->x;
		2970	$y = $exit->y;
		2971	}
2802		2972
2803	$self->goto ($map, $x, $y);	2973	$self->goto ($map, $x, $y);
2804		2974
2805	# if exit is damned, update players death & WoR home-position	2975	# if exit is damned, update players death & WoR home-position
2806	$self->contr->savebed ($map, $x, $y)	2976	$self->contr->savebed ($map, $x, $y)
…		…
2811	$self->message ("Something went wrong deep within the deliantra server. "	2981	$self->message ("Something went wrong deep within the deliantra server. "
2812	. "I'll try to bring you back to the map you were before. "	2982	. "I'll try to bring you back to the map you were before. "
2813	. "Please report this to the dungeon master!",	2983	. "Please report this to the dungeon master!",
2814	cf::NDI_UNIQUE | cf::NDI_RED);	2984	cf::NDI_UNIQUE | cf::NDI_RED);
2815		2985
2816	warn "ERROR in enter_exit: $@";	2986	error "ERROR in enter_exit: $@";
2817	$self->leave_link;	2987	$self->leave_link;
2818	}	2988	}
2819	})->prio (1);	2989	})->prio (1);
2820	}	2990	}
2821		2991
…		…
3134		3304
3135	$ns->ext_reply ($reply, @reply)	3305	$ns->ext_reply ($reply, @reply)
3136	if $reply;	3306	if $reply;
3137		3307
3138	} else {	3308	} else {
3139	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3309	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3140	}	3310	}
3141		3311
3142	cf::override;	3312	cf::override;
3143	},	3313	},
3144	);	3314	);
…		…
3225	decrease split destroy change_exp value msg lore send_msg)],	3395	decrease split destroy change_exp value msg lore send_msg)],
3226	["cf::object::player" => qw(player)],	3396	["cf::object::player" => qw(player)],
3227	["cf::player" => qw(peaceful send_msg)],	3397	["cf::player" => qw(peaceful send_msg)],
3228	["cf::map" => qw(trigger)],	3398	["cf::map" => qw(trigger)],
3229	) {	3399	) {
3230	no strict 'refs';
3231	my ($pkg, @funs) = @$_;	3400	my ($pkg, @funs) = @$_;
3232	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3401	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3233	for @funs;	3402	for @funs;
3234	}	3403	}
3235		3404
…		…
3274	local @cf::_safe_eval_args = values %vars;	3443	local @cf::_safe_eval_args = values %vars;
3275	@res = wantarray ? eval eval : scalar eval $eval;	3444	@res = wantarray ? eval eval : scalar eval $eval;
3276	}	3445	}
3277		3446
3278	if ($@) {	3447	if ($@) {
3279	warn "$@";	3448	warn "$@",
3280	warn "while executing safe code '$code'\n";	3449	"while executing safe code '$code'\n",
3281	warn "with arguments " . (join " ", %vars) . "\n";	3450	"with arguments " . (join " ", %vars) . "\n";
3282	}	3451	}
3283		3452
3284	wantarray ? @res : $res[0]	3453	wantarray ? @res : $res[0]
3285	}	3454	}
3286		3455
…		…
3320	# for this (global event?)	3489	# for this (global event?)
3321	%ext::player_env::MUSIC_FACE_CACHE = ();	3490	%ext::player_env::MUSIC_FACE_CACHE = ();
3322		3491
3323	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3492	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3324		3493
3325	warn "loading facedata from $path\n";	3494	trace "loading facedata from $path\n";
3326		3495
3327	my $facedata;	3496	my $facedata = decode_storable load_file $path;
3328	0 < aio_load $path, $facedata
3329	or die "$path: $!";
3330
3331	$facedata = Coro::Storable::thaw $facedata;
3332		3497
3333	$facedata->{version} == 2	3498	$facedata->{version} == 2
3334	or cf::cleanup "$path: version mismatch, cannot proceed.";	3499	or cf::cleanup "$path: version mismatch, cannot proceed.";
3335		3500
3336	# patch in the exptable	3501	# patch in the exptable
…		…
3350		3515
3351	cf::face::set_visibility $idx, $info->{visibility};	3516	cf::face::set_visibility $idx, $info->{visibility};
3352	cf::face::set_magicmap $idx, $info->{magicmap};	3517	cf::face::set_magicmap $idx, $info->{magicmap};
3353	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3518	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3354	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3519	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
		3520	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3355		3521
3356	cf::cede_to_tick;	3522	cf::cede_to_tick;
3357	}	3523	}
3358		3524
3359	while (my ($face, $info) = each %$faces) {	3525	while (my ($face, $info) = each %$faces) {
…		…
3364		3530
3365	if (my $smooth = cf::face::find $info->{smooth}) {	3531	if (my $smooth = cf::face::find $info->{smooth}) {
3366	cf::face::set_smooth $idx, $smooth;	3532	cf::face::set_smooth $idx, $smooth;
3367	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3533	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3368	} else {	3534	} else {
3369	warn "smooth face '$info->{smooth}' not found for face '$face'";	3535	error "smooth face '$info->{smooth}' not found for face '$face'";
3370	}	3536	}
3371		3537
3372	cf::cede_to_tick;	3538	cf::cede_to_tick;
3373	}	3539	}
3374	}	3540	}
…		…
3392	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3558	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3393		3559
3394	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};	3560	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3395	cf::face::set_type $idx, $info->{type};	3561	cf::face::set_type $idx, $info->{type};
3396	} else {	3562	} else {
3397	$RESOURCE{$name} = $info;	3563	$RESOURCE{$name} = $info; # unused
3398	}	3564	}
3399		3565
3400	cf::cede_to_tick;	3566	cf::cede_to_tick;
3401	}	3567	}
3402	}	3568	}
3403		3569
3404	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3570	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3405		3571
3406	1	3572	1
3407	}	3573	}
3408
3409	cf::global->attach (on_resource_update => sub {
3410	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3411	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3412
3413	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3414	my $sound = $soundconf->{compat}[$_]
3415	or next;
3416
3417	my $face = cf::face::find "sound/$sound->[1]";
3418	cf::sound::set $sound->[0] => $face;
3419	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3420	}
3421
3422	while (my ($k, $v) = each %{$soundconf->{event}}) {
3423	my $face = cf::face::find "sound/$v";
3424	cf::sound::set $k => $face;
3425	}
3426	}
3427	});
3428		3574
3429	register_exticmd fx_want => sub {	3575	register_exticmd fx_want => sub {
3430	my ($ns, $want) = @_;	3576	my ($ns, $want) = @_;
3431		3577
3432	while (my ($k, $v) = each %$want) {	3578	while (my ($k, $v) = each %$want) {
…		…
3471	sub reload_treasures {	3617	sub reload_treasures {
3472	load_resource_file "$DATADIR/treasures"	3618	load_resource_file "$DATADIR/treasures"
3473	or die "unable to load treasurelists\n";	3619	or die "unable to load treasurelists\n";
3474	}	3620	}
3475		3621
		3622	sub reload_sound {
		3623	trace "loading sound config from $DATADIR/sound\n";
		3624
		3625	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
		3626
		3627	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3628	my $sound = $soundconf->{compat}[$_]
		3629	or next;
		3630
		3631	my $face = cf::face::find "sound/$sound->[1]";
		3632	cf::sound::set $sound->[0] => $face;
		3633	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3634	}
		3635
		3636	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3637	my $face = cf::face::find "sound/$v";
		3638	cf::sound::set $k => $face;
		3639	}
		3640	}
		3641
3476	sub reload_resources {	3642	sub reload_resources {
3477	warn "reloading resource files...\n";	3643	trace "reloading resource files...\n";
3478		3644
		3645	reload_exp_table;
		3646	reload_materials;
3479	reload_facedata;	3647	reload_facedata;
		3648	reload_sound;
3480	reload_archetypes;	3649	reload_archetypes;
3481	reload_regions;	3650	reload_regions;
3482	reload_treasures;	3651	reload_treasures;
3483		3652
3484	warn "finished reloading resource files\n";	3653	trace "finished reloading resource files\n";
3485	}	3654	}
3486		3655
3487	sub reload_config {	3656	sub reload_config {
3488	warn "reloading config file...\n";	3657	trace "reloading config file...\n";
3489		3658
3490	open my $fh, "<:utf8", "$CONFDIR/config"	3659	my $config = load_file "$CONFDIR/config";
3491	or return;	3660	utf8::decode $config;
		3661	*CFG = decode_yaml $config;
3492		3662
3493	local $/;
3494	*CFG = YAML::XS::Load scalar <$fh>;
3495
3496	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3663	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3497		3664
3498	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3665	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3499	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3666	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3500		3667
3501	if (exists $CFG{mlockall}) {	3668	if (exists $CFG{mlockall}) {
…		…
3503	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3670	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3504	and die "WARNING: m(un)lockall failed: $!\n";	3671	and die "WARNING: m(un)lockall failed: $!\n";
3505	};	3672	};
3506	warn $@ if $@;	3673	warn $@ if $@;
3507	}	3674	}
3508
3509	warn "finished reloading resource files\n";
3510	}	3675	}
3511		3676
3512	sub pidfile() {	3677	sub pidfile() {
3513	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3678	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3514	or die "$PIDFILE: $!";	3679	or die "$PIDFILE: $!";
…		…
3527	seek $fh, 0, 0;	3692	seek $fh, 0, 0;
3528	print $fh $$;	3693	print $fh $$;
3529	}	3694	}
3530		3695
3531	sub main_loop {	3696	sub main_loop {
3532	warn "EV::loop starting\n";	3697	trace "EV::loop starting\n";
3533	if (1) {	3698	if (1) {
3534	EV::loop;	3699	EV::loop;
3535	}	3700	}
3536	warn "EV::loop returned\n";	3701	trace "EV::loop returned\n";
3537	goto &main_loop unless $REALLY_UNLOOP;	3702	goto &main_loop unless $REALLY_UNLOOP;
3538	}	3703	}
3539		3704
3540	sub main {	3705	sub main {
3541	cf::init_globals; # initialise logging	3706	cf::init_globals; # initialise logging
3542		3707
3543	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3708	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3544	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3709	LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3545	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3710	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3546	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3711	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3547		3712
3548	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3713	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3549		3714
…		…
3557	};	3722	};
3558		3723
3559	evthread_start IO::AIO::poll_fileno;	3724	evthread_start IO::AIO::poll_fileno;
3560		3725
3561	cf::sync_job {	3726	cf::sync_job {
3562	cf::init_experience;	3727	cf::incloader::init ();
		3728
3563	cf::init_anim;	3729	cf::init_anim;
3564	cf::init_attackmess;	3730	cf::init_attackmess;
3565	cf::init_dynamic;	3731	cf::init_dynamic;
3566		3732
3567	cf::load_settings;	3733	cf::load_settings;
3568	cf::load_materials;
3569		3734
3570	reload_resources;	3735	reload_resources;
3571	reload_config;	3736	reload_config;
3572	db_init;	3737	db_init;
3573		3738
…		…
3585		3750
3586	# no (long-running) fork's whatsoever before this point(!)	3751	# no (long-running) fork's whatsoever before this point(!)
3587	use POSIX ();	3752	use POSIX ();
3588	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3753	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3589		3754
3590	(pop @POST_INIT)->(0) while @POST_INIT;	3755	cf::_post_init 0;
3591	};	3756	};
3592		3757
3593	cf::object::thawer::errors_are_fatal 0;	3758	cf::object::thawer::errors_are_fatal 0;
		3759	info "parse errors in files are no longer fatal from this point on.\n";
3594		3760
		3761	my $free_main; $free_main = EV::idle sub {
		3762	undef $free_main;
		3763	undef &main; # free gobs of memory :)
		3764	};
		3765
3595	main_loop;	3766	goto &main_loop;
3596	}	3767	}
3597		3768
3598	#############################################################################	3769	#############################################################################
3599	# initialisation and cleanup	3770	# initialisation and cleanup
3600		3771
…		…
3639	or return;	3810	or return;
3640		3811
3641	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3812	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3642	and return;	3813	and return;
3643		3814
3644	warn sprintf "runtime file written (%gs).\n", AE::time - $t0;	3815	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3645		3816
3646	1	3817	1
3647	}	3818	}
3648		3819
3649	our $uuid_lock;	3820	our $uuid_lock;
…		…
3661	or return;	3832	or return;
3662		3833
3663	my $value = uuid_seq uuid_cur;	3834	my $value = uuid_seq uuid_cur;
3664		3835
3665	unless ($value) {	3836	unless ($value) {
3666	warn "cowardly refusing to write zero uuid value!\n";	3837	info "cowardly refusing to write zero uuid value!\n";
3667	return;	3838	return;
3668	}	3839	}
3669		3840
3670	my $value = uuid_str $value + $uuid_skip;	3841	my $value = uuid_str $value + $uuid_skip;
3671	$uuid_skip = 0;	3842	$uuid_skip = 0;
…		…
3681	or return;	3852	or return;
3682		3853
3683	aio_rename "$uuid~", $uuid	3854	aio_rename "$uuid~", $uuid
3684	and return;	3855	and return;
3685		3856
3686	warn "uuid file written ($value).\n";	3857	trace "uuid file written ($value).\n";
3687		3858
3688	1	3859	1
3689		3860
3690	}	3861	}
3691		3862
…		…
3697	}	3868	}
3698		3869
3699	sub emergency_save() {	3870	sub emergency_save() {
3700	my $freeze_guard = cf::freeze_mainloop;	3871	my $freeze_guard = cf::freeze_mainloop;
3701		3872
3702	warn "emergency_perl_save: enter\n";	3873	info "emergency_perl_save: enter\n";
		3874
		3875	# this is a trade-off: we want to be very quick here, so
		3876	# save all maps without fsync, and later call a global sync
		3877	# (which in turn might be very very slow)
		3878	local $USE_FSYNC = 0;
3703		3879
3704	cf::sync_job {	3880	cf::sync_job {
3705	# this is a trade-off: we want to be very quick here, so	3881	cf::write_runtime_sync; # external watchdog should not bark
3706	# save all maps without fsync, and later call a global sync
3707	# (which in turn might be very very slow)
3708	local $USE_FSYNC = 0;
3709		3882
3710	# use a peculiar iteration method to avoid tripping on perl	3883	# use a peculiar iteration method to avoid tripping on perl
3711	# refcount bugs in for. also avoids problems with players	3884	# refcount bugs in for. also avoids problems with players
3712	# and maps saved/destroyed asynchronously.	3885	# and maps saved/destroyed asynchronously.
3713	warn "emergency_perl_save: begin player save\n";	3886	info "emergency_perl_save: begin player save\n";
3714	for my $login (keys %cf::PLAYER) {	3887	for my $login (keys %cf::PLAYER) {
3715	my $pl = $cf::PLAYER{$login} or next;	3888	my $pl = $cf::PLAYER{$login} or next;
3716	$pl->valid or next;	3889	$pl->valid or next;
3717	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3890	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3718	$pl->save;	3891	$pl->save;
3719	}	3892	}
3720	warn "emergency_perl_save: end player save\n";	3893	info "emergency_perl_save: end player save\n";
3721		3894
		3895	cf::write_runtime_sync; # external watchdog should not bark
		3896
3722	warn "emergency_perl_save: begin map save\n";	3897	info "emergency_perl_save: begin map save\n";
3723	for my $path (keys %cf::MAP) {	3898	for my $path (keys %cf::MAP) {
3724	my $map = $cf::MAP{$path} or next;	3899	my $map = $cf::MAP{$path} or next;
3725	$map->valid or next;	3900	$map->valid or next;
3726	$map->save;	3901	$map->save;
3727	}	3902	}
3728	warn "emergency_perl_save: end map save\n";	3903	info "emergency_perl_save: end map save\n";
3729		3904
		3905	cf::write_runtime_sync; # external watchdog should not bark
		3906
3730	warn "emergency_perl_save: begin database checkpoint\n";	3907	info "emergency_perl_save: begin database checkpoint\n";
3731	BDB::db_env_txn_checkpoint $DB_ENV;	3908	BDB::db_env_txn_checkpoint $DB_ENV;
3732	warn "emergency_perl_save: end database checkpoint\n";	3909	info "emergency_perl_save: end database checkpoint\n";
3733		3910
3734	warn "emergency_perl_save: begin write uuid\n";	3911	info "emergency_perl_save: begin write uuid\n";
3735	write_uuid_sync 1;	3912	write_uuid_sync 1;
3736	warn "emergency_perl_save: end write uuid\n";	3913	info "emergency_perl_save: end write uuid\n";
		3914
		3915	cf::write_runtime_sync; # external watchdog should not bark
		3916
		3917	trace "emergency_perl_save: syncing database to disk";
		3918	BDB::db_env_txn_checkpoint $DB_ENV;
		3919
		3920	info "emergency_perl_save: starting sync\n";
		3921	IO::AIO::aio_sync sub {
		3922	info "emergency_perl_save: finished sync\n";
		3923	};
		3924
		3925	cf::write_runtime_sync; # external watchdog should not bark
		3926
		3927	trace "emergency_perl_save: flushing outstanding aio requests";
		3928	while (IO::AIO::nreqs || BDB::nreqs) {
		3929	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
		3930	}
		3931
		3932	cf::write_runtime_sync; # external watchdog should not bark
3737	};	3933	};
3738		3934
3739	warn "emergency_perl_save: starting sync()\n";
3740	IO::AIO::aio_sync sub {
3741	warn "emergency_perl_save: finished sync()\n";
3742	};
3743
3744	warn "emergency_perl_save: leave\n";	3935	info "emergency_perl_save: leave\n";
3745	}	3936	}
3746		3937
3747	sub post_cleanup {	3938	sub post_cleanup {
3748	my ($make_core) = @_;	3939	my ($make_core) = @_;
3749		3940
		3941	IO::AIO::flush;
		3942
3750	warn Carp::longmess "post_cleanup backtrace"	3943	error Carp::longmess "post_cleanup backtrace"
3751	if $make_core;	3944	if $make_core;
3752		3945
3753	my $fh = pidfile;	3946	my $fh = pidfile;
3754	unlink $PIDFILE if <$fh> == $$;	3947	unlink $PIDFILE if <$fh> == $$;
3755	}	3948	}
…		…
3775	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	3968	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3776	for my $name (keys %$leaf_symtab) {	3969	for my $name (keys %$leaf_symtab) {
3777	_gv_clear *{"$pkg$name"};	3970	_gv_clear *{"$pkg$name"};
3778	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	3971	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3779	}	3972	}
3780	warn "cleared package $pkg\n";#d#
3781	}	3973	}
3782		3974
3783	sub do_reload_perl() {	3975	sub do_reload_perl() {
3784	# can/must only be called in main	3976	# can/must only be called in main
3785	if ($Coro::current != $Coro::main) {	3977	unless (in_main) {
3786	warn "can only reload from main coroutine";	3978	error "can only reload from main coroutine";
3787	return;	3979	return;
3788	}	3980	}
3789		3981
3790	return if $RELOAD++;	3982	return if $RELOAD++;
3791		3983
3792	my $t1 = AE::time;	3984	my $t1 = AE::time;
3793		3985
3794	while ($RELOAD) {	3986	while ($RELOAD) {
3795	warn "reloading...";	3987	cf::get_slot 0.1, -1, "reload_perl";
		3988	info "perl_reload: reloading...";
3796		3989
3797	warn "entering sync_job";	3990	trace "perl_reload: entering sync_job";
3798		3991
3799	cf::sync_job {	3992	cf::sync_job {
3800	cf::write_runtime_sync; # external watchdog should not bark
3801	cf::emergency_save;	3993	#cf::emergency_save;
3802	cf::write_runtime_sync; # external watchdog should not bark
3803		3994
3804	warn "syncing database to disk";
3805	BDB::db_env_txn_checkpoint $DB_ENV;
3806
3807	# if anything goes wrong in here, we should simply crash as we already saved
3808
3809	warn "flushing outstanding aio requests";
3810	while (IO::AIO::nreqs || BDB::nreqs) {
3811	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3812	}
3813
3814	warn "cancelling all extension coros";	3995	trace "perl_reload: cancelling all extension coros";
3815	$_->cancel for values %EXT_CORO;	3996	$_->cancel for values %EXT_CORO;
3816	%EXT_CORO = ();	3997	%EXT_CORO = ();
3817		3998
3818	warn "removing commands";	3999	trace "perl_reload: removing commands";
3819	%COMMAND = ();	4000	%COMMAND = ();
3820		4001
3821	warn "removing ext/exti commands";	4002	trace "perl_reload: removing ext/exti commands";
3822	%EXTCMD = ();	4003	%EXTCMD = ();
3823	%EXTICMD = ();	4004	%EXTICMD = ();
3824		4005
3825	warn "unloading/nuking all extensions";	4006	trace "perl_reload: unloading/nuking all extensions";
3826	for my $pkg (@EXTS) {	4007	for my $pkg (@EXTS) {
3827	warn "... unloading $pkg";	4008	trace "... unloading $pkg";
3828		4009
3829	if (my $cb = $pkg->can ("unload")) {	4010	if (my $cb = $pkg->can ("unload")) {
3830	eval {	4011	eval {
3831	$cb->($pkg);	4012	$cb->($pkg);
3832	1	4013	1
3833	} or warn "$pkg unloaded, but with errors: $@";	4014	} or error "$pkg unloaded, but with errors: $@";
3834	}	4015	}
3835		4016
3836	warn "... clearing $pkg";	4017	trace "... clearing $pkg";
3837	clear_package $pkg;	4018	clear_package $pkg;
3838	}	4019	}
3839		4020
3840	warn "unloading all perl modules loaded from $LIBDIR";	4021	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3841	while (my ($k, $v) = each %INC) {	4022	while (my ($k, $v) = each %INC) {
3842	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4023	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3843		4024
3844	warn "... unloading $k";	4025	trace "... unloading $k";
3845	delete $INC{$k};	4026	delete $INC{$k};
3846		4027
3847	$k =~ s/\.pm$//;	4028	$k =~ s/\.pm$//;
3848	$k =~ s/\//::/g;	4029	$k =~ s/\//::/g;
3849		4030
…		…
3852	}	4033	}
3853		4034
3854	clear_package $k;	4035	clear_package $k;
3855	}	4036	}
3856		4037
3857	warn "getting rid of safe::, as good as possible";	4038	trace "perl_reload: getting rid of safe::, as good as possible";
3858	clear_package "safe::$_"	4039	clear_package "safe::$_"
3859	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4040	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3860		4041
3861	warn "unloading cf.pm \"a bit\"";	4042	trace "perl_reload: unloading cf.pm \"a bit\"";
3862	delete $INC{"cf.pm"};	4043	delete $INC{"cf.pm"};
3863	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4044	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3864		4045
3865	# don't, removes xs symbols, too,	4046	# don't, removes xs symbols, too,
3866	# and global variables created in xs	4047	# and global variables created in xs
3867	#clear_package __PACKAGE__;	4048	#clear_package __PACKAGE__;
3868		4049
3869	warn "unload completed, starting to reload now";	4050	info "perl_reload: unload completed, starting to reload now";
3870		4051
3871	warn "reloading cf.pm";	4052	trace "perl_reload: reloading cf.pm";
3872	require cf;	4053	require cf;
3873	cf::_connect_to_perl_1;	4054	cf::_connect_to_perl_1;
3874		4055
3875	warn "loading config and database again";	4056	trace "perl_reload: loading config and database again";
3876	cf::reload_config;	4057	cf::reload_config;
3877		4058
3878	warn "loading extensions";	4059	trace "perl_reload: loading extensions";
3879	cf::load_extensions;	4060	cf::load_extensions;
3880		4061
3881	if ($REATTACH_ON_RELOAD) {	4062	if ($REATTACH_ON_RELOAD) {
3882	warn "reattaching attachments to objects/players";	4063	trace "perl_reload: reattaching attachments to objects/players";
3883	_global_reattach; # objects, sockets	4064	_global_reattach; # objects, sockets
3884	warn "reattaching attachments to maps";	4065	trace "perl_reload: reattaching attachments to maps";
3885	reattach $_ for values %MAP;	4066	reattach $_ for values %MAP;
3886	warn "reattaching attachments to players";	4067	trace "perl_reload: reattaching attachments to players";
3887	reattach $_ for values %PLAYER;	4068	reattach $_ for values %PLAYER;
3888	}	4069	}
3889		4070
3890	warn "running post_init jobs";	4071	cf::_post_init 1;
3891	(pop @POST_INIT)->(1) while @POST_INIT;
3892		4072
3893	warn "leaving sync_job";	4073	trace "perl_reload: leaving sync_job";
3894		4074
3895	1	4075	1
3896	} or do {	4076	} or do {
3897	warn $@;	4077	error $@;
3898	cf::cleanup "error while reloading, exiting.";	4078	cf::cleanup "perl_reload: error, exiting.";
3899	};	4079	};
3900		4080
3901	warn "reloaded";
3902	--$RELOAD;	4081	--$RELOAD;
3903	}	4082	}
3904		4083
3905	$t1 = AE::time - $t1;	4084	$t1 = AE::time - $t1;
3906	warn "reload completed in ${t1}s\n";	4085	info "perl_reload: completed in ${t1}s\n";
3907	};	4086	};
3908		4087
3909	our $RELOAD_WATCHER; # used only during reload	4088	our $RELOAD_WATCHER; # used only during reload
3910		4089
3911	sub reload_perl() {	4090	sub reload_perl() {
…		…
3932	reload_perl;	4111	reload_perl;
3933	};	4112	};
3934	}	4113	}
3935	};	4114	};
3936		4115
3937	unshift @INC, $LIBDIR;	4116	#############################################################################
3938		4117
3939	my $bug_warning = 0;	4118	my $bug_warning = 0;
3940		4119
3941	our @WAIT_FOR_TICK;
3942	our @WAIT_FOR_TICK_BEGIN;
3943
3944	sub wait_for_tick {	4120	sub wait_for_tick() {
3945	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4121	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3946		4122
3947	my $signal = new Coro::Signal;	4123	$WAIT_FOR_TICK->wait;
3948	push @WAIT_FOR_TICK, $signal;
3949	$signal->wait;
3950	}	4124	}
3951		4125
3952	sub wait_for_tick_begin {	4126	sub wait_for_tick_begin() {
3953	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4127	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3954		4128
3955	my $signal = new Coro::Signal;	4129	my $signal = new Coro::Signal;
3956	push @WAIT_FOR_TICK_BEGIN, $signal;	4130	push @WAIT_FOR_TICK_BEGIN, $signal;
3957	$signal->wait;	4131	$signal->wait;
3958	}	4132	}
…		…
3962	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4136	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3963	unless ++$bug_warning > 10;	4137	unless ++$bug_warning > 10;
3964	return;	4138	return;
3965	}	4139	}
3966		4140
3967	cf::server_tick; # one server iteration	4141	cf::one_tick; # one server iteration
3968		4142
3969	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#	4143	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3970		4144
3971	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4145	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3972	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4146	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3973	Coro::async_pool {	4147	Coro::async_pool {
3974	$Coro::current->{desc} = "runtime saver";	4148	$Coro::current->{desc} = "runtime saver";
3975	write_runtime_sync	4149	write_runtime_sync
3976	or warn "ERROR: unable to write runtime file: $!";	4150	or error "ERROR: unable to write runtime file: $!";
3977	};	4151	};
3978	}	4152	}
3979		4153
3980	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4154	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3981	$sig->send;	4155	$sig->send;
3982	}	4156	}
3983	while (my $sig = shift @WAIT_FOR_TICK) {	4157	$WAIT_FOR_TICK->broadcast;
3984	$sig->send;
3985	}
3986		4158
3987	$LOAD = ($NOW - $TICK_START) / $TICK;	4159	$LOAD = ($NOW - $TICK_START) / $TICK;
3988	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4160	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3989		4161
3990	if (0) {	4162	if (0) {
3991	if ($NEXT_TICK) {	4163	if ($NEXT_TICK) {
3992	my $jitter = $TICK_START - $NEXT_TICK;	4164	my $jitter = $TICK_START - $NEXT_TICK;
3993	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4165	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
3994	warn "jitter $JITTER\n";#d#	4166	debug "jitter $JITTER\n";#d#
3995	}	4167	}
3996	}	4168	}
3997	}	4169	}
3998		4170
3999	{	4171	{
…		…
4044	IO::AIO::min_parallel 8;	4216	IO::AIO::min_parallel 8;
4045	IO::AIO::max_poll_time $TICK * 0.1;	4217	IO::AIO::max_poll_time $TICK * 0.1;
4046	undef $AnyEvent::AIO::WATCHER;	4218	undef $AnyEvent::AIO::WATCHER;
4047	}	4219	}
4048		4220
4049	my $_log_backtrace;	4221	our $_log_backtrace;
		4222	our $_log_backtrace_last;
4050		4223
4051	sub _log_backtrace {	4224	sub _log_backtrace {
4052	my ($msg, @addr) = @_;	4225	my ($msg, @addr) = @_;
4053		4226
4054	$msg =~ s/\n//;	4227	$msg =~ s/\n$//;
4055		4228
		4229	if ($_log_backtrace_last eq $msg) {
		4230	LOG llevInfo, "[ABT] $msg\n";
		4231	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4056	# limit the # of concurrent backtraces	4232	# limit the # of concurrent backtraces
4057	if ($_log_backtrace < 2) {	4233	} elsif ($_log_backtrace < 2) {
		4234	$_log_backtrace_last = $msg;
4058	++$_log_backtrace;	4235	++$_log_backtrace;
4059	my $perl_bt = Carp::longmess $msg;	4236	my $perl_bt = Carp::longmess $msg;
4060	async {	4237	async {
4061	$Coro::current->{desc} = "abt $msg";	4238	$Coro::current->{desc} = "abt $msg";
4062		4239
…		…
4082	LOG llevInfo, "[ABT] $_\n" for @bt;	4259	LOG llevInfo, "[ABT] $_\n" for @bt;
4083	--$_log_backtrace;	4260	--$_log_backtrace;
4084	};	4261	};
4085	} else {	4262	} else {
4086	LOG llevInfo, "[ABT] $msg\n";	4263	LOG llevInfo, "[ABT] $msg\n";
4087	LOG llevInfo, "[ABT] [suppressed]\n";	4264	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4088	}	4265	}
4089	}	4266	}
4090		4267
4091	# load additional modules	4268	# load additional modules
4092	require "cf/$_.pm" for @EXTRA_MODULES;	4269	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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