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.526 by root, Wed Apr 21 05:48:35 2010 UTC vs.
Revision 1.582 by root, Fri Feb 3 03:01:45 2012 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,2012 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;
		134	our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
129		135
130	our $UPTIME; $UPTIME ||= time;	136	our $UPTIME; $UPTIME ||= time;
131	our $RUNTIME;	137	our $RUNTIME = 0;
		138	our $SERVER_TICK = 0;
132	our $NOW;	139	our $NOW;
133		140
134	our (%PLAYER, %PLAYER_LOADING); # all users	141	our (%PLAYER, %PLAYER_LOADING); # all users
135	our (%MAP, %MAP_LOADING ); # all maps	142	our (%MAP, %MAP_LOADING ); # all maps
136	our $LINK_MAP; # the special {link} map, which is always available	143	our $LINK_MAP; # the special {link} map, which is always available
…		…
145		152
146	our @POST_INIT;	153	our @POST_INIT;
147		154
148	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)	155	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
149	our $REALLY_UNLOOP; # never set to true, please :)	156	our $REALLY_UNLOOP; # never set to true, please :)
		157
		158	our $WAIT_FOR_TICK = new Coro::Signal;
		159	our @WAIT_FOR_TICK_BEGIN;
150		160
151	binmode STDOUT;	161	binmode STDOUT;
152	binmode STDERR;	162	binmode STDERR;
153		163
154	# read virtual server time, if available	164	# read virtual server time, if available
…		…
188		198
189	=over 4	199	=over 4
190		200
191	=item $cf::UPTIME	201	=item $cf::UPTIME
192		202
193	The timestamp of the server start (so not actually an uptime).	203	The timestamp of the server start (so not actually an "uptime").
		204
		205	=item $cf::SERVER_TICK
		206
		207	An unsigned integer that starts at zero when the server is started and is
		208	incremented on every tick.
		209
		210	=item $cf::NOW
		211
		212	The (real) time of the last (current) server tick - updated before and
		213	after tick processing, so this is useful only as a rough "what time is it
		214	now" estimate.
		215
		216	=item $cf::TICK
		217
		218	The interval between each server tick, in seconds.
194		219
195	=item $cf::RUNTIME	220	=item $cf::RUNTIME
196		221
197	The time this server has run, starts at 0 and is increased by $cf::TICK on	222	The time this server has run, starts at 0 and is increased by $cf::TICK on
198	every server tick.	223	every server tick.
…		…
204	Various directories - "/etc", read-only install directory, perl-library	229	Various directories - "/etc", read-only install directory, perl-library
205	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	230	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
206	unique-items directory, player file directory, random maps directory and	231	unique-items directory, player file directory, random maps directory and
207	database environment.	232	database environment.
208		233
209	=item $cf::NOW
210
211	The time of the last (current) server tick.
212
213	=item $cf::TICK
214
215	The interval between server ticks, in seconds.
216
217	=item $cf::LOADAVG	234	=item $cf::LOADAVG
218		235
219	The current CPU load on the server (alpha-smoothed), as a value between 0	236	The current CPU load on the server (alpha-smoothed), as a value between 0
220	(none) and 1 (overloaded), indicating how much time is spent on processing	237	(none) and 1 (overloaded), indicating how much time is spent on processing
221	objects per tick. Healthy values are < 0.5.	238	objects per tick. Healthy values are < 0.5.
…		…
230	from wherever your confdir points to.	247	from wherever your confdir points to.
231		248
232	=item cf::wait_for_tick, cf::wait_for_tick_begin	249	=item cf::wait_for_tick, cf::wait_for_tick_begin
233		250
234	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	251	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
235	returns directly I<after> the tick processing (and consequently, can only wake one process	252	returns directly I<after> the tick processing (and consequently, can only wake one thread
236	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	253	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
		254
		255	Note that cf::Wait_for_tick will immediately return when the server is not
		256	ticking, making it suitable for small pauses in threads that need to run
		257	when the server is paused. If that is not applicable (i.e. you I<really>
		258	want to wait, use C<$cf::WAIT_FOR_TICK>).
		259
		260	=item $cf::WAIT_FOR_TICK
		261
		262	Note that C<cf::wait_for_tick> is probably the correct thing to use. This
		263	variable contains a L<Coro::Signal> that is broadcats after every server
		264	tick. Calling C<< ->wait >> on it will suspend the caller until after the
		265	next server tick.
		266
		267	=cut
		268
		269	sub wait_for_tick();
		270	sub wait_for_tick_begin();
237		271
238	=item @cf::INVOKE_RESULTS	272	=item @cf::INVOKE_RESULTS
239		273
240	This array contains the results of the last C<invoke ()> call. When	274	This array contains the results of the last C<invoke ()> call. When
241	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of	275	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
…		…
249		283
250	=back	284	=back
251		285
252	=cut	286	=cut
253		287
		288	sub error(@) { LOG llevError, join "", @_ }
		289	sub warn (@) { LOG llevWarn , join "", @_ }
		290	sub info (@) { LOG llevInfo , join "", @_ }
		291	sub debug(@) { LOG llevDebug, join "", @_ }
		292	sub trace(@) { LOG llevTrace, join "", @_ }
		293
254	$Coro::State::WARNHOOK = sub {	294	$Coro::State::WARNHOOK = sub {
255	my $msg = join "", @_;	295	my $msg = join "", @_;
256		296
257	$msg .= "\n"	297	$msg .= "\n"
258	unless $msg =~ /\n$/;	298	unless $msg =~ /\n$/;
259		299
260	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	300	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
261		301
262	LOG llevError, $msg;	302	LOG llevWarn, $msg;
263	};	303	};
264		304
265	$Coro::State::DIEHOOK = sub {	305	$Coro::State::DIEHOOK = sub {
266	return unless $^S eq 0; # "eq", not "=="	306	return unless $^S eq 0; # "eq", not "=="
267		307
268	warn Carp::longmess $_[0];	308	error Carp::longmess $_[0];
269		309
270	if (in_main) {#d#	310	if (in_main) {#d#
271	warn "DIEHOOK called in main context, Coro bug?\n";#d#	311	error "DIEHOOK called in main context, Coro bug?\n";#d#
272	return;#d#	312	return;#d#
273	}#d#	313	}#d#
274		314
275	# kill coroutine otherwise	315	# kill coroutine otherwise
276	Coro::terminate	316	Coro::terminate
…		…
298	}	338	}
299		339
300	$EV::DIED = sub {	340	$EV::DIED = sub {
301	Carp::cluck "error in event callback: @_";	341	Carp::cluck "error in event callback: @_";
302	};	342	};
		343
		344	#############################################################################
		345
		346	sub fork_call(&@);
		347	sub get_slot($;$$);
303		348
304	#############################################################################	349	#############################################################################
305		350
306	=head2 UTILITY FUNCTIONS	351	=head2 UTILITY FUNCTIONS
307		352
…		…
328	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	373	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
329	$d	374	$d
330	} || "[unable to dump $_[0]: '$@']";	375	} || "[unable to dump $_[0]: '$@']";
331	}	376	}
332		377
		378	=item $scalar = cf::load_file $path
		379
		380	Loads the given file from path and returns its contents. Croaks on error
		381	and can block.
		382
		383	=cut
		384
		385	sub load_file($) {
		386	0 <= aio_load $_[0], my $data
		387	or Carp::croak "$_[0]: $!";
		388
		389	$data
		390	}
		391
		392	=item $success = cf::replace_file $path, $data, $sync
		393
		394	Atomically replaces the file at the given $path with new $data, and
		395	optionally $sync the data to disk before replacing the file.
		396
		397	=cut
		398
		399	sub replace_file($$;$) {
		400	my ($path, $data, $sync) = @_;
		401
		402	my $lock = cf::lock_acquire ("replace_file:$path");
		403
		404	my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
		405	or return;
		406
		407	$data = $data->() if ref $data;
		408
		409	length $data == aio_write $fh, 0, (length $data), $data, 0
		410	or return;
		411
		412	!$sync
		413	or !aio_fsync $fh
		414	or return;
		415
		416	aio_close $fh
		417	and return;
		418
		419	aio_rename "$path~", $path
		420	and return;
		421
		422	if ($sync) {
		423	$path =~ s%/[^/]*$%%;
		424	aio_pathsync $path;
		425	}
		426
		427	1
		428	}
		429
333	=item $ref = cf::decode_json $json	430	=item $ref = cf::decode_json $json
334		431
335	Converts a JSON string into the corresponding perl data structure.	432	Converts a JSON string into the corresponding perl data structure.
336		433
337	=item $json = cf::encode_json $ref	434	=item $json = cf::encode_json $ref
…		…
343	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	440	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
344		441
345	sub encode_json($) { $json_coder->encode ($_[0]) }	442	sub encode_json($) { $json_coder->encode ($_[0]) }
346	sub decode_json($) { $json_coder->decode ($_[0]) }	443	sub decode_json($) { $json_coder->decode ($_[0]) }
347		444
		445	=item $ref = cf::decode_storable $scalar
		446
		447	Same as Coro::Storable::thaw, so blocks.
		448
		449	=cut
		450
		451	BEGIN { *decode_storable = \&Coro::Storable::thaw }
		452
		453	=item $ref = cf::decode_yaml $scalar
		454
		455	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
		456
		457	=cut
		458
		459	sub decode_yaml($) {
		460	fork_call { YAML::XS::Load $_[0] } @_
		461	}
		462
		463	=item $scalar = cf::unlzf $scalar
		464
		465	Same as Compress::LZF::compress, but takes server ticks into account, so
		466	blocks.
		467
		468	=cut
		469
		470	sub unlzf($) {
		471	# we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
		472	cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
		473	Compress::LZF::decompress $_[0]
		474	}
		475
348	=item cf::post_init { BLOCK }	476	=item cf::post_init { BLOCK }
349		477
350	Execute the given codeblock, I<after> all extensions have been (re-)loaded,	478	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
351	but I<before> the server starts ticking again.	479	but I<before> the server starts ticking again.
352		480
353	The cdoeblock will have a single boolean argument to indicate whether this	481	The codeblock will have a single boolean argument to indicate whether this
354	is a reload or not.	482	is a reload or not.
355		483
356	=cut	484	=cut
357		485
358	sub post_init(&) {	486	sub post_init(&) {
359	push @POST_INIT, shift;	487	push @POST_INIT, shift;
		488	}
		489
		490	sub _post_init {
		491	trace "running post_init jobs";
		492
		493	# run them in parallel...
		494
		495	my @join;
		496
		497	while () {
		498	push @join, map &Coro::async ($_, 0), @POST_INIT;
		499	@POST_INIT = ();
		500
		501	@join or last;
		502
		503	(pop @join)->join;
		504	}
360	}	505	}
361		506
362	=item cf::lock_wait $string	507	=item cf::lock_wait $string
363		508
364	Wait until the given lock is available. See cf::lock_acquire.	509	Wait until the given lock is available. See cf::lock_acquire.
…		…
417	EV::periodic $start, $interval, 0, $cb	562	EV::periodic $start, $interval, 0, $cb
418	}	563	}
419		564
420	=item cf::get_slot $time[, $priority[, $name]]	565	=item cf::get_slot $time[, $priority[, $name]]
421		566
422	Allocate $time seconds of blocking CPU time at priority C<$priority>:	567	Allocate $time seconds of blocking CPU time at priority C<$priority>
423	This call blocks and returns only when you have at least C<$time> seconds	568	(default: 0): This call blocks and returns only when you have at least
424	of cpu time till the next tick. The slot is only valid till the next cede.	569	C<$time> seconds of cpu time till the next tick. The slot is only valid
		570	till the next cede.
		571
		572	Background jobs should use a priority les than zero, interactive jobs
		573	should use 100 or more.
425		574
426	The optional C<$name> can be used to identify the job to run. It might be	575	The optional C<$name> can be used to identify the job to run. It might be
427	used for statistical purposes and should identify the same time-class.	576	used for statistical purposes and should identify the same time-class.
428		577
429	Useful for short background jobs.	578	Useful for short background jobs.
…		…
458	}	607	}
459	}	608	}
460		609
461	if (@SLOT_QUEUE) {	610	if (@SLOT_QUEUE) {
462	# we do not use wait_for_tick() as it returns immediately when tick is inactive	611	# we do not use wait_for_tick() as it returns immediately when tick is inactive
463	push @cf::WAIT_FOR_TICK, $signal;	612	$WAIT_FOR_TICK->wait;
464	$signal->wait;
465	} else {	613	} else {
466	$busy = 0;	614	$busy = 0;
467	Coro::schedule;	615	Coro::schedule;
468	}	616	}
469	}	617	}
…		…
509	=cut	657	=cut
510		658
511	sub sync_job(&) {	659	sub sync_job(&) {
512	my ($job) = @_;	660	my ($job) = @_;
513		661
514	if ($Coro::current == $Coro::main) {	662	if (in_main) {
515	my $time = AE::time;	663	my $time = AE::time;
516		664
517	# this is the main coro, too bad, we have to block	665	# this is the main coro, too bad, we have to block
518	# till the operation succeeds, freezing the server :/	666	# till the operation succeeds, freezing the server :/
519		667
520	LOG llevError, Carp::longmess "sync job";#d#	668	#LOG llevError, Carp::longmess "sync job";#d#
521		669
522	my $freeze_guard = freeze_mainloop;	670	my $freeze_guard = freeze_mainloop;
523		671
524	my $busy = 1;	672	my $busy = 1;
525	my @res;	673	my @res;
526		674
527	(async {	675	(async {
528	$Coro::current->desc ("sync job coro");	676	$Coro::current->desc ("sync job coro");
529	@res = eval { $job->() };	677	@res = eval { $job->() };
530	warn $@ if $@;	678	error $@ if $@;
531	undef $busy;	679	undef $busy;
532	})->prio (Coro::PRIO_MAX);	680	})->prio (Coro::PRIO_MAX);
533		681
534	while ($busy) {	682	while ($busy) {
535	if (Coro::nready) {	683	if (Coro::nready) {
…		…
569	$EXT_CORO{$coro+0} = $coro;	717	$EXT_CORO{$coro+0} = $coro;
570		718
571	$coro	719	$coro
572	}	720	}
573		721
574	=item fork_call { }, $args	722	=item fork_call { }, @args
575		723
576	Executes the given code block with the given arguments in a seperate	724	Executes the given code block with the given arguments in a seperate
577	process, returning the results. Everything must be serialisable with	725	process, returning the results. Everything must be serialisable with
578	Coro::Storable. May, of course, block. Note that the executed sub may	726	Coro::Storable. May, of course, block. Note that the executed sub may
579	never block itself or use any form of event handling.	727	never block itself or use any form of event handling.
580		728
581	=cut	729	=cut
582		730
		731	sub post_fork {
		732	reset_signals;
		733	}
		734
583	sub fork_call(&@) {	735	sub fork_call(&@) {
584	my ($cb, @args) = @_;	736	my ($cb, @args) = @_;
585		737
586	# we seemingly have to make a local copy of the whole thing,	738	# we seemingly have to make a local copy of the whole thing,
587	# otherwise perl prematurely frees the stuff :/	739	# otherwise perl prematurely frees the stuff :/
588	# TODO: investigate and fix (likely this will be rather laborious)	740	# TODO: investigate and fix (likely this will be rather laborious)
589		741
590	my @res = Coro::Util::fork_eval {	742	my @res = Coro::Util::fork_eval {
591	reset_signals;	743	cf::post_fork;
592	&$cb	744	&$cb
593	}, @args;	745	} @args;
594		746
595	wantarray ? @res : $res[-1]	747	wantarray ? @res : $res[-1]
596	}	748	}
597		749
598	sub objinfo {	750	sub objinfo {
…		…
648	within each server.	800	within each server.
649		801
650	=cut	802	=cut
651		803
652	sub db_table($) {	804	sub db_table($) {
		805	cf::error "db_get called from main context"
		806	if $Coro::current == $Coro::main;
		807
653	my ($name) = @_;	808	my ($name) = @_;
654	my $db = BDB::db_create $DB_ENV;	809	my $db = BDB::db_create $DB_ENV;
655		810
656	eval {	811	eval {
657	$db->set_flags (BDB::CHKSUM);	812	$db->set_flags (BDB::CHKSUM);
…		…
667	}	822	}
668		823
669	our $DB;	824	our $DB;
670		825
671	sub db_init {	826	sub db_init {
672	cf::sync_job {
673	$DB ||= db_table "db";	827	$DB ||= db_table "db";
674	};
675	}	828	}
676		829
677	sub db_get($$) {	830	sub db_get($$) {
678	my $key = "$_[0]/$_[1]";	831	my $key = "$_[0]/$_[1]";
679		832
680	cf::sync_job {	833	cf::error "db_get called from main context"
		834	if $Coro::current == $Coro::main;
		835
681	BDB::db_get $DB, undef, $key, my $data;	836	BDB::db_get $DB, undef, $key, my $data;
682		837
683	$! ? ()	838	$! ? ()
684	: $data	839	: $data
685	}
686	}	840	}
687		841
688	sub db_put($$$) {	842	sub db_put($$$) {
689	BDB::dbreq_pri 4;	843	BDB::dbreq_pri 4;
690	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	844	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
718		872
719	my @data;	873	my @data;
720	my $md5;	874	my $md5;
721		875
722	for (0 .. $#$src) {	876	for (0 .. $#$src) {
723	0 <= aio_load $src->[$_], $data[$_]	877	$data[$_] = load_file $src->[$_];
724	or Carp::croak "$src->[$_]: $!";
725	}	878	}
726		879
727	# if processing is expensive, check	880	# if processing is expensive, check
728	# checksum first	881	# checksum first
729	if (1) {	882	if (1) {
…		…
746		899
747	my $t1 = Time::HiRes::time;	900	my $t1 = Time::HiRes::time;
748	my $data = $process->(\@data);	901	my $data = $process->(\@data);
749	my $t2 = Time::HiRes::time;	902	my $t2 = Time::HiRes::time;
750		903
751	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	904	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
752		905
753	db_put cache => "$id/data", $data;	906	db_put cache => "$id/data", $data;
754	db_put cache => "$id/md5" , $md5;	907	db_put cache => "$id/md5" , $md5;
755	db_put cache => "$id/meta", $meta;	908	db_put cache => "$id/meta", $meta;
756		909
…		…
766		919
767	=cut	920	=cut
768		921
769	sub datalog($@) {	922	sub datalog($@) {
770	my ($type, %kv) = @_;	923	my ($type, %kv) = @_;
771	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	924	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
772	}	925	}
773		926
774	=back	927	=back
775		928
776	=cut	929	=cut
…		…
971		1124
972	} elsif (exists $cb_id{$type}) {	1125	} elsif (exists $cb_id{$type}) {
973	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	1126	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
974		1127
975	} elsif (ref $type) {	1128	} elsif (ref $type) {
976	warn "attaching objects not supported, ignoring.\n";	1129	error "attaching objects not supported, ignoring.\n";
977		1130
978	} else {	1131	} else {
979	shift @arg;	1132	shift @arg;
980	warn "attach argument '$type' not supported, ignoring.\n";	1133	error "attach argument '$type' not supported, ignoring.\n";
981	}	1134	}
982	}	1135	}
983	}	1136	}
984		1137
985	sub _object_attach {	1138	sub _object_attach {
…		…
995	_attach $registry, $klass, @attach;	1148	_attach $registry, $klass, @attach;
996	}	1149	}
997		1150
998	$obj->{$name} = \%arg;	1151	$obj->{$name} = \%arg;
999	} else {	1152	} else {
1000	warn "object uses attachment '$name' which is not available, postponing.\n";	1153	info "object uses attachment '$name' which is not available, postponing.\n";
1001	}	1154	}
1002		1155
1003	$obj->{_attachment}{$name} = undef;	1156	$obj->{_attachment}{$name} = undef;
1004	}	1157	}
1005		1158
…		…
1064		1217
1065	for (@$callbacks) {	1218	for (@$callbacks) {
1066	eval { &{$_->[1]} };	1219	eval { &{$_->[1]} };
1067		1220
1068	if ($@) {	1221	if ($@) {
1069	warn "$@";
1070	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1222	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1071	override;	1223	override;
1072	}	1224	}
1073		1225
1074	return 1 if $override;	1226	return 1 if $override;
1075	}	1227	}
…		…
1154	for (@$attach) {	1306	for (@$attach) {
1155	my ($klass, @attach) = @$_;	1307	my ($klass, @attach) = @$_;
1156	_attach $registry, $klass, @attach;	1308	_attach $registry, $klass, @attach;
1157	}	1309	}
1158	} else {	1310	} else {
1159	warn "object uses attachment '$name' that is not available, postponing.\n";	1311	info "object uses attachment '$name' that is not available, postponing.\n";
1160	}	1312	}
1161	}	1313	}
1162	}	1314	}
1163		1315
1164	cf::attachable->attach (	1316	cf::attachable->attach (
…		…
1191	my ($filename, $rdata, $objs) = @_;	1343	my ($filename, $rdata, $objs) = @_;
1192		1344
1193	sync_job {	1345	sync_job {
1194	if (length $$rdata) {	1346	if (length $$rdata) {
1195	utf8::decode (my $decname = $filename);	1347	utf8::decode (my $decname = $filename);
1196	warn sprintf "saving %s (%d,%d)\n",	1348	trace sprintf "saving %s (%d,%d)\n",
1197	$decname, length $$rdata, scalar @$objs;	1349	$decname, length $$rdata, scalar @$objs
		1350	if $VERBOSE_IO;
1198		1351
1199	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1352	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1200	aio_chmod $fh, SAVE_MODE;	1353	aio_chmod $fh, SAVE_MODE;
1201	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1354	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1202	if ($cf::USE_FSYNC) {	1355	if ($cf::USE_FSYNC) {
…		…
1224	aio_rename "$filename~", $filename;	1377	aio_rename "$filename~", $filename;
1225		1378
1226	$filename =~ s%/[^/]+$%%;	1379	$filename =~ s%/[^/]+$%%;
1227	aio_pathsync $filename if $cf::USE_FSYNC;	1380	aio_pathsync $filename if $cf::USE_FSYNC;
1228	} else {	1381	} else {
1229	warn "unable to save objects: $filename~: $!\n";	1382	error "unable to save objects: $filename~: $!\n";
1230	}	1383	}
1231	} else {	1384	} else {
1232	aio_unlink $filename;	1385	aio_unlink $filename;
1233	aio_unlink "$filename.pst";	1386	aio_unlink "$filename.pst";
1234	}	1387	}
…		…
1258	my $st = eval { Coro::Storable::thaw $av };	1411	my $st = eval { Coro::Storable::thaw $av };
1259	$av = $st->{objs};	1412	$av = $st->{objs};
1260	}	1413	}
1261		1414
1262	utf8::decode (my $decname = $filename);	1415	utf8::decode (my $decname = $filename);
1263	warn sprintf "loading %s (%d,%d)\n",	1416	trace sprintf "loading %s (%d,%d)\n",
1264	$decname, length $data, scalar @{$av || []};	1417	$decname, length $data, scalar @{$av || []}
		1418	if $VERBOSE_IO;
1265		1419
1266	($data, $av)	1420	($data, $av)
1267	}	1421	}
1268		1422
1269	=head2 COMMAND CALLBACKS	1423	=head2 COMMAND CALLBACKS
…		…
1346	my ($pl, $buf) = @_;	1500	my ($pl, $buf) = @_;
1347		1501
1348	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1502	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1349		1503
1350	if (ref $msg) {	1504	if (ref $msg) {
1351	my ($type, $reply, @payload) =	1505	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1352	"ARRAY" eq ref $msg
1353	? @$msg
1354	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1355		1506
1356	my @reply;	1507	my @reply;
1357		1508
1358	if (my $cb = $EXTCMD{$type}) {	1509	if (my $cb = $EXTCMD{$type}) {
1359	@reply = $cb->($pl, @payload);	1510	@reply = $cb->($pl, @payload);
…		…
1361		1512
1362	$pl->ext_reply ($reply, @reply)	1513	$pl->ext_reply ($reply, @reply)
1363	if $reply;	1514	if $reply;
1364		1515
1365	} else {	1516	} else {
1366	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1517	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1367	}	1518	}
1368		1519
1369	cf::override;	1520	cf::override;
1370	},	1521	},
1371	);	1522	);
…		…
1381	};	1532	};
1382		1533
1383	$grp	1534	$grp
1384	}	1535	}
1385		1536
		1537	sub _ext_cfg_reg($$$$) {
		1538	my ($rvar, $varname, $cfgname, $default) = @_;
		1539
		1540	$cfgname = lc $varname
		1541	unless length $cfgname;
		1542
		1543	$EXT_CFG{$cfgname} = [$rvar, $default];
		1544
		1545	$$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
		1546	}
		1547
1386	sub load_extensions {	1548	sub load_extensions {
		1549	info "loading extensions...";
		1550
		1551	%EXT_CFG = ();
		1552
1387	cf::sync_job {	1553	cf::sync_job {
1388	my %todo;	1554	my %todo;
1389		1555
1390	for my $path (<$LIBDIR/*.ext>) {	1556	for my $path (<$LIBDIR/*.ext>) {
1391	next unless -r $path;	1557	next unless -r $path;
…		…
1409		1575
1410	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1576	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1411	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1577	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1412		1578
1413	$ext{source} =	1579	$ext{source} =
1414	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1580	"package $pkg; use common::sense;\n"
1415	. "#line 1 \"$path\"\n{\n"	1581	. "#line 1 \"$path\"\n{\n"
1416	. $source	1582	. $source
1417	. "\n};\n1";	1583	. "\n};\n1";
1418		1584
1419	$todo{$base} = \%ext;	1585	$todo{$base} = \%ext;
…		…
1431	for (split /,\s*/, $v->{meta}{depends}) {	1597	for (split /,\s*/, $v->{meta}{depends}) {
1432	next ext	1598	next ext
1433	unless exists $done{$_};	1599	unless exists $done{$_};
1434	}	1600	}
1435		1601
1436	warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1602	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1437		1603
		1604	my $source = $v->{source};
		1605
		1606	# support "CONF varname :confname = default" pseudo-statements
		1607	$source =~ s{
		1608	^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
		1609	}{
		1610	"our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
		1611	}gmxe;
		1612
1438	my $active = eval $v->{source};	1613	my $active = eval $source;
1439		1614
1440	if (length $@) {	1615	if (length $@) {
1441	warn "$v->{path}: $@\n";	1616	error "$v->{path}: $@\n";
1442		1617
1443	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1618	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1444	if exists $v->{meta}{mandatory};	1619	if exists $v->{meta}{mandatory};
1445		1620
1446	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";	1621	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
…		…
1448	} else {	1623	} else {
1449	$done{$k} = delete $todo{$k};	1624	$done{$k} = delete $todo{$k};
1450	push @EXTS, $v->{pkg};	1625	push @EXTS, $v->{pkg};
1451	$progress = 1;	1626	$progress = 1;
1452		1627
1453	warn "$v->{base}: extension inactive.\n"	1628	info "$v->{base}: extension inactive.\n"
1454	unless $active;	1629	unless $active;
1455	}	1630	}
1456	}	1631	}
1457		1632
1458	unless ($progress) {	1633	unless ($progress) {
…		…
1460		1635
1461	while (my ($k, $v) = each %todo) {	1636	while (my ($k, $v) = each %todo) {
1462	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1637	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1463	if exists $v->{meta}{mandatory};	1638	if exists $v->{meta}{mandatory};
1464	}	1639	}
		1640
		1641	last;
1465	}	1642	}
1466	}	1643	}
1467	};	1644	};
1468	}	1645	}
1469		1646
…		…
1627	my $name = $pl->ob->name;	1804	my $name = $pl->ob->name;
1628		1805
1629	$pl->{deny_save} = 1;	1806	$pl->{deny_save} = 1;
1630	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1807	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1631		1808
1632	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1809	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1633	$pl->deactivate;	1810	$pl->deactivate;
		1811
1634	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1812	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1635	$pl->ob->check_score;
1636	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1813	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1814	ext::highscore::check ($pl->ob);
		1815
1637	$pl->ns->destroy if $pl->ns;	1816	$pl->ns->destroy if $pl->ns;
1638		1817
1639	my $path = playerdir $pl;	1818	my $path = playerdir $pl;
1640	my $temp = "$path~$cf::RUNTIME~deleting~";	1819	my $temp = "$path~$cf::RUNTIME~deleting~";
1641	aio_rename $path, $temp;	1820	aio_rename $path, $temp;
…		…
1807	sub generate_random_map {	1986	sub generate_random_map {
1808	my ($self, $rmp) = @_;	1987	my ($self, $rmp) = @_;
1809		1988
1810	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	1989	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1811		1990
1812	# mit "rum" bekleckern, nicht
1813	$self->_create_random_map (	1991	$self->_create_random_map ($rmp);
1814	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1815	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1816	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1817	$rmp->{exit_on_final_map},
1818	$rmp->{xsize}, $rmp->{ysize},
1819	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1820	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1821	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1822	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1823	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1824	(cf::region::find $rmp->{region}), $rmp->{custom}
1825	)
1826	}	1992	}
1827		1993
1828	=item cf::map->register ($regex, $prio)	1994	=item cf::map->register ($regex, $prio)
1829		1995
1830	Register a handler for the map path matching the given regex at the	1996	Register a handler for the map path matching the given regex at the
…		…
1835		2001
1836	sub register {	2002	sub register {
1837	my (undef, $regex, $prio) = @_;	2003	my (undef, $regex, $prio) = @_;
1838	my $pkg = caller;	2004	my $pkg = caller;
1839		2005
1840	no strict;
1841	push @{"$pkg\::ISA"}, __PACKAGE__;	2006	push @{"$pkg\::ISA"}, __PACKAGE__;
1842		2007
1843	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	2008	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1844	}	2009	}
1845		2010
…		…
1857	}	2022	}
1858		2023
1859	sub normalise {	2024	sub normalise {
1860	my ($path, $base) = @_;	2025	my ($path, $base) = @_;
1861		2026
1862	$path = "$path"; # make sure its a string	2027	$path = "$path"; # make sure it's a string
1863		2028
1864	$path =~ s/\.map$//;	2029	$path =~ s/\.map$//;
1865		2030
1866	# map plan:	2031	# map plan:
1867	#	2032	#
…		…
1882	$base =~ s{[^/]+/?$}{};	2047	$base =~ s{[^/]+/?$}{};
1883	$path = "$base/$path";	2048	$path = "$base/$path";
1884	}	2049	}
1885		2050
1886	for ($path) {	2051	for ($path) {
1887	redo if s{//}{/};
1888	redo if s{/\.?/}{/};	2052	redo if s{/\.?/}{/};
1889	redo if s{/[^/]+/\.\./}{/};	2053	redo if s{/[^/]+/\.\./}{/};
1890	}	2054	}
1891		2055
1892	$path	2056	$path
…		…
1906	$self->init; # pass $1 etc.	2070	$self->init; # pass $1 etc.
1907	return $self;	2071	return $self;
1908	}	2072	}
1909	}	2073	}
1910		2074
1911	Carp::cluck "unable to resolve path '$path' (base '$base').";	2075	Carp::cluck "unable to resolve path '$path' (base '$base')";
1912	()	2076	()
1913	}	2077	}
1914		2078
		2079	# may re-bless or do other evil things
1915	sub init {	2080	sub init {
1916	my ($self) = @_;	2081	my ($self) = @_;
1917		2082
1918	$self	2083	$self
1919	}	2084	}
…		…
1984	$self->{load_path} = $path;	2149	$self->{load_path} = $path;
1985		2150
1986	1	2151	1
1987	}	2152	}
1988		2153
		2154	# used to laod the header of an original map
1989	sub load_header_orig {	2155	sub load_header_orig {
1990	my ($self) = @_;	2156	my ($self) = @_;
1991		2157
1992	$self->load_header_from ($self->load_path)	2158	$self->load_header_from ($self->load_path)
1993	}	2159	}
1994		2160
		2161	# used to laod the header of an instantiated map
1995	sub load_header_temp {	2162	sub load_header_temp {
1996	my ($self) = @_;	2163	my ($self) = @_;
1997		2164
1998	$self->load_header_from ($self->save_path)	2165	$self->load_header_from ($self->save_path)
1999	}	2166	}
2000		2167
		2168	# called after loading the header from an instantiated map
2001	sub prepare_temp {	2169	sub prepare_temp {
2002	my ($self) = @_;	2170	my ($self) = @_;
2003		2171
2004	$self->last_access ((delete $self->{last_access})	2172	$self->last_access ((delete $self->{last_access})
2005	|| $cf::RUNTIME); #d#	2173	|| $cf::RUNTIME); #d#
2006	# safety	2174	# safety
2007	$self->{instantiate_time} = $cf::RUNTIME	2175	$self->{instantiate_time} = $cf::RUNTIME
2008	if $self->{instantiate_time} > $cf::RUNTIME;	2176	if $self->{instantiate_time} > $cf::RUNTIME;
2009	}	2177	}
2010		2178
		2179	# called after loading the header from an original map
2011	sub prepare_orig {	2180	sub prepare_orig {
2012	my ($self) = @_;	2181	my ($self) = @_;
2013		2182
2014	$self->{load_original} = 1;	2183	$self->{load_original} = 1;
2015	$self->{instantiate_time} = $cf::RUNTIME;	2184	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2039		2208
2040	sub find;	2209	sub find;
2041	sub find {	2210	sub find {
2042	my ($path, $origin) = @_;	2211	my ($path, $origin) = @_;
2043		2212
		2213	cf::cede_to_tick;
		2214
2044	$path = normalise $path, $origin && $origin->path;	2215	$path = normalise $path, $origin;
2045		2216
2046	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2217	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2047	my $guard2 = cf::lock_acquire "map_find:$path";	2218	my $guard2 = cf::lock_acquire "map_find:$path";
2048		2219
2049	$cf::MAP{$path} || do {	2220	$cf::MAP{$path} || do {
…		…
2080		2251
2081	{	2252	{
2082	my $guard = cf::lock_acquire "map_data:$path";	2253	my $guard = cf::lock_acquire "map_data:$path";
2083		2254
2084	return unless $self->valid;	2255	return unless $self->valid;
2085	return unless $self->in_memory == cf::MAP_SWAPPED;	2256	return unless $self->state == cf::MAP_SWAPPED;
2086
2087	$self->in_memory (cf::MAP_LOADING);
2088		2257
2089	$self->alloc;	2258	$self->alloc;
2090		2259
2091	$self->pre_load;	2260	$self->pre_load;
2092	cf::cede_to_tick;	2261	cf::cede_to_tick;
2093		2262
		2263	if (exists $self->{load_path}) {
2094	my $f = new_from_file cf::object::thawer $self->{load_path};	2264	my $f = new_from_file cf::object::thawer $self->{load_path};
2095	$f->skip_block;	2265	$f->skip_block;
2096	$self->_load_objects ($f)	2266	$self->_load_objects ($f)
2097	or return;	2267	or return;
2098		2268
2099	$self->post_load_original	2269	$self->post_load_original
2100	if delete $self->{load_original};	2270	if delete $self->{load_original};
2101		2271
2102	if (my $uniq = $self->uniq_path) {	2272	if (my $uniq = $self->uniq_path) {
2103	utf8::encode $uniq;	2273	utf8::encode $uniq;
2104	unless (aio_stat $uniq) {	2274	unless (aio_stat $uniq) {
2105	if (my $f = new_from_file cf::object::thawer $uniq) {	2275	if (my $f = new_from_file cf::object::thawer $uniq) {
2106	$self->clear_unique_items;	2276	$self->clear_unique_items;
2107	$self->_load_objects ($f);	2277	$self->_load_objects ($f);
2108	$f->resolve_delayed_derefs;	2278	$f->resolve_delayed_derefs;
		2279	}
2109	}	2280	}
2110	}	2281	}
2111	}
2112		2282
2113	$f->resolve_delayed_derefs;	2283	$f->resolve_delayed_derefs;
		2284	} else {
		2285	$self->post_load_original
		2286	if delete $self->{load_original};
		2287	}
		2288
		2289	$self->state (cf::MAP_INACTIVE);
2114		2290
2115	cf::cede_to_tick;	2291	cf::cede_to_tick;
2116	# now do the right thing for maps	2292	# now do the right thing for maps
2117	$self->link_multipart_objects;	2293	$self->link_multipart_objects;
2118	$self->difficulty ($self->estimate_difficulty)	2294	$self->difficulty ($self->estimate_difficulty)
…		…
2122	unless ($self->{deny_activate}) {	2298	unless ($self->{deny_activate}) {
2123	$self->decay_objects;	2299	$self->decay_objects;
2124	$self->fix_auto_apply;	2300	$self->fix_auto_apply;
2125	$self->update_buttons;	2301	$self->update_buttons;
2126	cf::cede_to_tick;	2302	cf::cede_to_tick;
2127	$self->activate;	2303	#$self->activate; # no longer activate maps automatically
2128	}	2304	}
2129		2305
2130	$self->{last_save} = $cf::RUNTIME;	2306	$self->{last_save} = $cf::RUNTIME;
2131	$self->last_access ($cf::RUNTIME);	2307	$self->last_access ($cf::RUNTIME);
2132
2133	$self->in_memory (cf::MAP_ACTIVE);
2134	}	2308	}
2135		2309
2136	$self->post_load;	2310	$self->post_load;
		2311
		2312	1
2137	}	2313	}
2138		2314
2139	# customize the map for a given player, i.e.	2315	# customize the map for a given player, i.e.
2140	# return the _real_ map. used by e.g. per-player	2316	# return the _real_ map. used by e.g. per-player
2141	# maps to change the path to ~playername/mappath	2317	# maps to change the path to ~playername/mappath
…		…
2149	# if $self->per_party;	2325	# if $self->per_party;
2150		2326
2151	$self	2327	$self
2152	}	2328	}
2153		2329
2154	# find and load all maps in the 3x3 area around a map
2155	sub load_neighbours {
2156	my ($map) = @_;
2157
2158	my @neigh; # diagonal neighbours
2159
2160	for (0 .. 3) {
2161	my $neigh = $map->tile_path ($_)
2162	or next;
2163	$neigh = find $neigh, $map
2164	or next;
2165	$neigh->load;
2166
2167	push @neigh,
2168	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2169	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2170	}
2171
2172	for (grep defined $_->[0], @neigh) {
2173	my ($path, $origin) = @$_;
2174	my $neigh = find $path, $origin
2175	or next;
2176	$neigh->load;
2177	}
2178	}
2179
2180	sub find_sync {	2330	sub find_sync {
2181	my ($path, $origin) = @_;	2331	my ($path, $origin) = @_;
2182		2332
2183	cf::sync_job { find $path, $origin }	2333	# it's a bug to call this from the main context
		2334	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
		2335	if $Coro::current == $Coro::main;
		2336
		2337	find $path, $origin
2184	}	2338	}
2185		2339
2186	sub do_load_sync {	2340	sub do_load_sync {
2187	my ($map) = @_;	2341	my ($map) = @_;
2188		2342
		2343	# it's a bug to call this from the main context
2189	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2344	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2190	if $Coro::current == $Coro::main;	2345	if $Coro::current == $Coro::main;
2191		2346
2192	cf::sync_job { $map->load };	2347	$map->load;
2193	}	2348	}
2194		2349
2195	our %MAP_PREFETCH;	2350	our %MAP_PREFETCH;
2196	our $MAP_PREFETCHER = undef;	2351	our $MAP_PREFETCHER = undef;
2197		2352
2198	sub find_async {	2353	sub find_async {
2199	my ($path, $origin, $load) = @_;	2354	my ($path, $origin, $load) = @_;
2200		2355
2201	$path = normalise $path, $origin && $origin->{path};	2356	$path = normalise $path, $origin;
2202		2357
2203	if (my $map = $cf::MAP{$path}) {	2358	if (my $map = $cf::MAP{$path}) {
2204	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2359	return $map if !$load || $map->linkable;
2205	}	2360	}
2206		2361
2207	$MAP_PREFETCH{$path} |= $load;	2362	$MAP_PREFETCH{$path} |= $load;
2208		2363
2209	$MAP_PREFETCHER ||= cf::async {	2364	$MAP_PREFETCHER ||= cf::async {
…		…
2268	sub swap_out {	2423	sub swap_out {
2269	my ($self) = @_;	2424	my ($self) = @_;
2270		2425
2271	my $lock = cf::lock_acquire "map_data:$self->{path}";	2426	my $lock = cf::lock_acquire "map_data:$self->{path}";
2272		2427
2273	return if $self->in_memory != cf::MAP_ACTIVE;	2428	return if !$self->linkable;
2274	return if $self->{deny_save};	2429	return if $self->{deny_save};
2275	return if $self->players;	2430	return if $self->players;
2276		2431
2277	# first deactivate the map and "unlink" it from the core	2432	# first deactivate the map and "unlink" it from the core
2278	$self->deactivate;	2433	$self->deactivate;
2279	$_->clear_links_to ($self) for values %cf::MAP;	2434	$_->clear_links_to ($self) for values %cf::MAP;
2280	$self->in_memory (cf::MAP_SWAPPED);	2435	$self->state (cf::MAP_SWAPPED);
2281		2436
2282	# then atomically save	2437	# then atomically save
2283	$self->_save;	2438	$self->_save;
2284		2439
2285	# then free the map	2440	# then free the map
…		…
2309		2464
2310	my $lock = cf::lock_acquire "map_data:$self->{path}";	2465	my $lock = cf::lock_acquire "map_data:$self->{path}";
2311		2466
2312	return if $self->players;	2467	return if $self->players;
2313		2468
2314	warn "resetting map ", $self->path, "\n";	2469	cf::trace "resetting map ", $self->path, "\n";
2315		2470
2316	$self->in_memory (cf::MAP_SWAPPED);	2471	$self->state (cf::MAP_SWAPPED);
2317		2472
2318	# need to save uniques path	2473	# need to save uniques path
2319	unless ($self->{deny_save}) {	2474	unless ($self->{deny_save}) {
2320	my $uniq = $self->uniq_path; utf8::encode $uniq;	2475	my $uniq = $self->uniq_path; utf8::encode $uniq;
2321		2476
…		…
2583		2738
2584	Freezes the player and moves him/her to a special map (C<{link}>).	2739	Freezes the player and moves him/her to a special map (C<{link}>).
2585		2740
2586	The player should be reasonably safe there for short amounts of time (e.g.	2741	The player should be reasonably safe there for short amounts of time (e.g.
2587	for loading a map). You I<MUST> call C<leave_link> as soon as possible,	2742	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2588	though, as the palyer cannot control the character while it is on the link	2743	though, as the player cannot control the character while it is on the link
2589	map.	2744	map.
2590		2745
2591	Will never block.	2746	Will never block.
2592		2747
2593	=item $player_object->leave_link ($map, $x, $y)	2748	=item $player_object->leave_link ($map, $x, $y)
…		…
2614	sub cf::object::player::enter_link {	2769	sub cf::object::player::enter_link {
2615	my ($self) = @_;	2770	my ($self) = @_;
2616		2771
2617	$self->deactivate_recursive;	2772	$self->deactivate_recursive;
2618		2773
		2774	++$self->{_link_recursion};
		2775
2619	return if UNIVERSAL::isa $self->map, "ext::map_link";	2776	return if UNIVERSAL::isa $self->map, "ext::map_link";
2620		2777
2621	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2778	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2622	if $self->map && $self->map->{path} ne "{link}";	2779	if $self->map && $self->map->{path} ne "{link}";
2623		2780
…		…
2649	# use -1 or undef as default coordinates, not 0, 0	2806	# use -1 or undef as default coordinates, not 0, 0
2650	($x, $y) = ($map->enter_x, $map->enter_y)	2807	($x, $y) = ($map->enter_x, $map->enter_y)
2651	if $x <= 0 && $y <= 0;	2808	if $x <= 0 && $y <= 0;
2652		2809
2653	$map->load;	2810	$map->load;
2654	$map->load_neighbours;
2655		2811
2656	return unless $self->contr->active;	2812	return unless $self->contr->active;
2657		2813
2658	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2814	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2659	$self->enter_map ($map, $x, $y);	2815	if ($self->enter_map ($map, $x, $y)) {
2660		2816	# entering was successful
		2817	delete $self->{_link_recursion};
2661	# only activate afterwards, to support waiting in hooks	2818	# only activate afterwards, to support waiting in hooks
2662	$self->activate_recursive;	2819	$self->activate_recursive;
2663	# unless exists $self->{_link_pos}; # maybe we re in-flight again	2820	}
2664	}
2665		2821
		2822	}
		2823
2666	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2824	=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2667		2825
2668	Moves the player to the given map-path and coordinates by first freezing	2826	Moves the player to the given map-path and coordinates by first freezing
2669	her, loading and preparing them map, calling the provided $check callback	2827	her, loading and preparing them map, calling the provided $check callback
2670	that has to return the map if sucecssful, and then unfreezes the player on	2828	that has to return the map if sucecssful, and then unfreezes the player on
2671	the new (success) or old (failed) map position. In either case, $done will	2829	the new (success) or old (failed) map position. In either case, $done will
…		…
2678		2836
2679	our $GOTOGEN;	2837	our $GOTOGEN;
2680		2838
2681	sub cf::object::player::goto {	2839	sub cf::object::player::goto {
2682	my ($self, $path, $x, $y, $check, $done) = @_;	2840	my ($self, $path, $x, $y, $check, $done) = @_;
		2841
		2842	if ($self->{_link_recursion} >= $MAX_LINKS) {
		2843	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
		2844	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
		2845	($path, $x, $y) = @$EMERGENCY_POSITION;
		2846	}
2683		2847
2684	# do generation counting so two concurrent goto's will be executed in-order	2848	# do generation counting so two concurrent goto's will be executed in-order
2685	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2849	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2686		2850
2687	$self->enter_link;	2851	$self->enter_link;
…		…
2707	($path, $x, $y) = (undef, undef, undef);	2871	($path, $x, $y) = (undef, undef, undef);
2708	}	2872	}
2709	}	2873	}
2710		2874
2711	my $map = eval {	2875	my $map = eval {
2712	my $map = defined $path ? cf::map::find $path : undef;	2876	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2713		2877
2714	if ($map) {	2878	if ($map) {
2715	$map = $map->customise_for ($self);	2879	$map = $map->customise_for ($self);
2716	$map = $check->($map) if $check && $map;	2880	$map = $check->($map, $x, $y, $self) if $check && $map;
2717	} else {	2881	} else {
2718	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);	2882	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2719	}	2883	}
2720		2884
2721	$map	2885	$map
…		…
2729	if ($gen == $self->{_goto_generation}) {	2893	if ($gen == $self->{_goto_generation}) {
2730	delete $self->{_goto_generation};	2894	delete $self->{_goto_generation};
2731	$self->leave_link ($map, $x, $y);	2895	$self->leave_link ($map, $x, $y);
2732	}	2896	}
2733		2897
2734	$done->() if $done;	2898	$done->($self) if $done;
2735	})->prio (1);	2899	})->prio (1);
2736	}	2900	}
2737		2901
2738	=item $player_object->enter_exit ($exit_object)	2902	=item $player_object->enter_exit ($exit_object)
2739		2903
…		…
2807	$Coro::current->{desc} = "enter_exit";	2971	$Coro::current->{desc} = "enter_exit";
2808		2972
2809	unless (eval {	2973	unless (eval {
2810	$self->deactivate_recursive; # just to be sure	2974	$self->deactivate_recursive; # just to be sure
2811		2975
2812	# random map handling
2813	{
2814	my $guard = cf::lock_acquire "exit_prepare:$exit";
2815
2816	prepare_random_map $exit
2817	if $exit->slaying eq "/!";
2818	}
2819
2820	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2976	my $map = cf::map::normalise $exit->slaying, $exit->map;
2821	my $x = $exit->stats->hp;	2977	my $x = $exit->stats->hp;
2822	my $y = $exit->stats->sp;	2978	my $y = $exit->stats->sp;
		2979
		2980	# special map handling
		2981	my $slaying = $exit->slaying;
		2982
		2983	# special map handling
		2984	if ($slaying eq "/!") {
		2985	my $guard = cf::lock_acquire "exit_prepare:$exit";
		2986
		2987	prepare_random_map $exit
		2988	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		2989
		2990	$map = $exit->slaying;
		2991
		2992	} elsif ($slaying eq '!up') {
		2993	$map = $exit->map->tile_path (cf::TILE_UP);
		2994	$x = $exit->x;
		2995	$y = $exit->y;
		2996
		2997	} elsif ($slaying eq '!down') {
		2998	$map = $exit->map->tile_path (cf::TILE_DOWN);
		2999	$x = $exit->x;
		3000	$y = $exit->y;
		3001	}
2823		3002
2824	$self->goto ($map, $x, $y);	3003	$self->goto ($map, $x, $y);
2825		3004
2826	# if exit is damned, update players death & WoR home-position	3005	# if exit is damned, update players death & WoR home-position
2827	$self->contr->savebed ($map, $x, $y)	3006	$self->contr->savebed ($map, $x, $y)
…		…
2832	$self->message ("Something went wrong deep within the deliantra server. "	3011	$self->message ("Something went wrong deep within the deliantra server. "
2833	. "I'll try to bring you back to the map you were before. "	3012	. "I'll try to bring you back to the map you were before. "
2834	. "Please report this to the dungeon master!",	3013	. "Please report this to the dungeon master!",
2835	cf::NDI_UNIQUE | cf::NDI_RED);	3014	cf::NDI_UNIQUE | cf::NDI_RED);
2836		3015
2837	warn "ERROR in enter_exit: $@";	3016	error "ERROR in enter_exit: $@";
2838	$self->leave_link;	3017	$self->leave_link;
2839	}	3018	}
2840	})->prio (1);	3019	})->prio (1);
2841	}	3020	}
2842		3021
…		…
3069	=cut	3248	=cut
3070		3249
3071	sub cf::client::ext_reply($$@) {	3250	sub cf::client::ext_reply($$@) {
3072	my ($self, $id, @msg) = @_;	3251	my ($self, $id, @msg) = @_;
3073		3252
3074	if ($self->extcmd == 2) {	3253	return unless $self->extcmd == 2;
		3254
3075	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));	3255	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3076	} elsif ($self->extcmd == 1) {
3077	#TODO: version 1, remove
3078	unshift @msg, msgtype => "reply", msgid => $id;
3079	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3080	}
3081	}	3256	}
3082		3257
3083	=item $success = $client->query ($flags, "text", \&cb)	3258	=item $success = $client->query ($flags, "text", \&cb)
3084		3259
3085	Queues a query to the client, calling the given callback with	3260	Queues a query to the client, calling the given callback with
…		…
3140	my ($ns, $buf) = @_;	3315	my ($ns, $buf) = @_;
3141		3316
3142	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3317	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3143		3318
3144	if (ref $msg) {	3319	if (ref $msg) {
3145	my ($type, $reply, @payload) =	3320	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3146	"ARRAY" eq ref $msg
3147	? @$msg
3148	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3149		3321
3150	my @reply;	3322	my @reply;
3151		3323
3152	if (my $cb = $EXTICMD{$type}) {	3324	if (my $cb = $EXTICMD{$type}) {
3153	@reply = $cb->($ns, @payload);	3325	@reply = $cb->($ns, @payload);
…		…
3155		3327
3156	$ns->ext_reply ($reply, @reply)	3328	$ns->ext_reply ($reply, @reply)
3157	if $reply;	3329	if $reply;
3158		3330
3159	} else {	3331	} else {
3160	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3332	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3161	}	3333	}
3162		3334
3163	cf::override;	3335	cf::override;
3164	},	3336	},
3165	);	3337	);
…		…
3246	decrease split destroy change_exp value msg lore send_msg)],	3418	decrease split destroy change_exp value msg lore send_msg)],
3247	["cf::object::player" => qw(player)],	3419	["cf::object::player" => qw(player)],
3248	["cf::player" => qw(peaceful send_msg)],	3420	["cf::player" => qw(peaceful send_msg)],
3249	["cf::map" => qw(trigger)],	3421	["cf::map" => qw(trigger)],
3250	) {	3422	) {
3251	no strict 'refs';
3252	my ($pkg, @funs) = @$_;	3423	my ($pkg, @funs) = @$_;
3253	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3424	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3254	for @funs;	3425	for @funs;
3255	}	3426	}
3256		3427
…		…
3295	local @cf::_safe_eval_args = values %vars;	3466	local @cf::_safe_eval_args = values %vars;
3296	@res = wantarray ? eval eval : scalar eval $eval;	3467	@res = wantarray ? eval eval : scalar eval $eval;
3297	}	3468	}
3298		3469
3299	if ($@) {	3470	if ($@) {
3300	warn "$@";	3471	warn "$@",
3301	warn "while executing safe code '$code'\n";	3472	"while executing safe code '$code'\n",
3302	warn "with arguments " . (join " ", %vars) . "\n";	3473	"with arguments " . (join " ", %vars) . "\n";
3303	}	3474	}
3304		3475
3305	wantarray ? @res : $res[0]	3476	wantarray ? @res : $res[0]
3306	}	3477	}
3307		3478
…		…
3341	# for this (global event?)	3512	# for this (global event?)
3342	%ext::player_env::MUSIC_FACE_CACHE = ();	3513	%ext::player_env::MUSIC_FACE_CACHE = ();
3343		3514
3344	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3515	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3345		3516
3346	warn "loading facedata from $path\n";	3517	trace "loading facedata from $path\n";
3347		3518
3348	my $facedata;	3519	my $facedata = decode_storable load_file $path;
3349	0 < aio_load $path, $facedata
3350	or die "$path: $!";
3351
3352	$facedata = Coro::Storable::thaw $facedata;
3353		3520
3354	$facedata->{version} == 2	3521	$facedata->{version} == 2
3355	or cf::cleanup "$path: version mismatch, cannot proceed.";	3522	or cf::cleanup "$path: version mismatch, cannot proceed.";
3356		3523
3357	# patch in the exptable	3524	# patch in the exptable
…		…
3371		3538
3372	cf::face::set_visibility $idx, $info->{visibility};	3539	cf::face::set_visibility $idx, $info->{visibility};
3373	cf::face::set_magicmap $idx, $info->{magicmap};	3540	cf::face::set_magicmap $idx, $info->{magicmap};
3374	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3541	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3375	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3542	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
		3543	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3376		3544
3377	cf::cede_to_tick;	3545	cf::cede_to_tick;
3378	}	3546	}
3379		3547
3380	while (my ($face, $info) = each %$faces) {	3548	while (my ($face, $info) = each %$faces) {
…		…
3385		3553
3386	if (my $smooth = cf::face::find $info->{smooth}) {	3554	if (my $smooth = cf::face::find $info->{smooth}) {
3387	cf::face::set_smooth $idx, $smooth;	3555	cf::face::set_smooth $idx, $smooth;
3388	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3556	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3389	} else {	3557	} else {
3390	warn "smooth face '$info->{smooth}' not found for face '$face'";	3558	error "smooth face '$info->{smooth}' not found for face '$face'";
3391	}	3559	}
3392		3560
3393	cf::cede_to_tick;	3561	cf::cede_to_tick;
3394	}	3562	}
3395	}	3563	}
…		…
3407		3575
3408	{	3576	{
3409	my $res = $facedata->{resource};	3577	my $res = $facedata->{resource};
3410		3578
3411	while (my ($name, $info) = each %$res) {	3579	while (my ($name, $info) = each %$res) {
3412	if (defined $info->{type}) {	3580	if (defined (my $type = $info->{type})) {
		3581	# TODO: different hash - must free and use new index, or cache ixface data queue
3413	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3582	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3414		3583
3415	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};	3584	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3416	cf::face::set_type $idx, $info->{type};	3585	cf::face::set_type $idx, $type;
		3586	cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3417	} else {	3587	} else {
3418	$RESOURCE{$name} = $info;	3588	# $RESOURCE{$name} = $info; # unused
3419	}	3589	}
3420		3590
3421	cf::cede_to_tick;	3591	cf::cede_to_tick;
3422	}	3592	}
3423	}	3593	}
3424		3594
3425	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3595	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3426		3596
3427	1	3597	1
3428	}	3598	}
3429
3430	cf::global->attach (on_resource_update => sub {
3431	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3432	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3433
3434	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3435	my $sound = $soundconf->{compat}[$_]
3436	or next;
3437
3438	my $face = cf::face::find "sound/$sound->[1]";
3439	cf::sound::set $sound->[0] => $face;
3440	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3441	}
3442
3443	while (my ($k, $v) = each %{$soundconf->{event}}) {
3444	my $face = cf::face::find "sound/$v";
3445	cf::sound::set $k => $face;
3446	}
3447	}
3448	});
3449		3599
3450	register_exticmd fx_want => sub {	3600	register_exticmd fx_want => sub {
3451	my ($ns, $want) = @_;	3601	my ($ns, $want) = @_;
3452		3602
3453	while (my ($k, $v) = each %$want) {	3603	while (my ($k, $v) = each %$want) {
…		…
3492	sub reload_treasures {	3642	sub reload_treasures {
3493	load_resource_file "$DATADIR/treasures"	3643	load_resource_file "$DATADIR/treasures"
3494	or die "unable to load treasurelists\n";	3644	or die "unable to load treasurelists\n";
3495	}	3645	}
3496		3646
		3647	sub reload_sound {
		3648	trace "loading sound config from $DATADIR/sound\n";
		3649
		3650	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
		3651
		3652	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3653	my $sound = $soundconf->{compat}[$_]
		3654	or next;
		3655
		3656	my $face = cf::face::find "sound/$sound->[1]";
		3657	cf::sound::set $sound->[0] => $face;
		3658	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3659	}
		3660
		3661	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3662	my $face = cf::face::find "sound/$v";
		3663	cf::sound::set $k => $face;
		3664	}
		3665	}
		3666
3497	sub reload_resources {	3667	sub reload_resources {
3498	warn "reloading resource files...\n";	3668	trace "reloading resource files...\n";
3499		3669
		3670	reload_exp_table;
		3671	reload_materials;
3500	reload_facedata;	3672	reload_facedata;
		3673	reload_sound;
3501	reload_archetypes;	3674	reload_archetypes;
3502	reload_regions;	3675	reload_regions;
3503	reload_treasures;	3676	reload_treasures;
3504		3677
3505	warn "finished reloading resource files\n";	3678	trace "finished reloading resource files\n";
3506	}	3679	}
3507		3680
3508	sub reload_config {	3681	sub reload_config {
3509	warn "reloading config file...\n";	3682	trace "reloading config file...\n";
3510		3683
3511	open my $fh, "<:utf8", "$CONFDIR/config"	3684	my $config = load_file "$CONFDIR/config";
3512	or return;	3685	utf8::decode $config;
		3686	*CFG = decode_yaml $config;
3513		3687
3514	local $/;
3515	*CFG = YAML::XS::Load scalar <$fh>;
3516
3517	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3688	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3518		3689
3519	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3690	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3520	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3691	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3521		3692
3522	if (exists $CFG{mlockall}) {	3693	if (exists $CFG{mlockall}) {
…		…
3524	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3695	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3525	and die "WARNING: m(un)lockall failed: $!\n";	3696	and die "WARNING: m(un)lockall failed: $!\n";
3526	};	3697	};
3527	warn $@ if $@;	3698	warn $@ if $@;
3528	}	3699	}
3529
3530	warn "finished reloading resource files\n";
3531	}	3700	}
3532		3701
3533	sub pidfile() {	3702	sub pidfile() {
3534	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3703	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3535	or die "$PIDFILE: $!";	3704	or die "$PIDFILE: $!";
…		…
3548	seek $fh, 0, 0;	3717	seek $fh, 0, 0;
3549	print $fh $$;	3718	print $fh $$;
3550	}	3719	}
3551		3720
3552	sub main_loop {	3721	sub main_loop {
3553	warn "EV::loop starting\n";	3722	trace "EV::loop starting\n";
3554	if (1) {	3723	if (1) {
3555	EV::loop;	3724	EV::loop;
3556	}	3725	}
3557	warn "EV::loop returned\n";	3726	trace "EV::loop returned\n";
3558	goto &main_loop unless $REALLY_UNLOOP;	3727	goto &main_loop unless $REALLY_UNLOOP;
3559	}	3728	}
3560		3729
3561	sub main {	3730	sub main {
3562	cf::init_globals; # initialise logging	3731	cf::init_globals; # initialise logging
3563		3732
3564	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3733	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3565	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3734	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3566	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3735	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3567	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3736	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3568		3737
3569	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3738	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3570		3739
…		…
3578	};	3747	};
3579		3748
3580	evthread_start IO::AIO::poll_fileno;	3749	evthread_start IO::AIO::poll_fileno;
3581		3750
3582	cf::sync_job {	3751	cf::sync_job {
3583	cf::init_experience;	3752	cf::incloader::init ();
		3753
3584	cf::init_anim;	3754	cf::init_anim;
3585	cf::init_attackmess;	3755	cf::init_attackmess;
3586	cf::init_dynamic;	3756	cf::init_dynamic;
3587		3757
3588	cf::load_settings;	3758	cf::load_settings;
3589	cf::load_materials;
3590		3759
3591	reload_resources;	3760	reload_resources;
3592	reload_config;	3761	reload_config;
3593	db_init;	3762	db_init;
3594		3763
…		…
3606		3775
3607	# no (long-running) fork's whatsoever before this point(!)	3776	# no (long-running) fork's whatsoever before this point(!)
3608	use POSIX ();	3777	use POSIX ();
3609	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3778	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3610		3779
3611	(pop @POST_INIT)->(0) while @POST_INIT;	3780	cf::_post_init 0;
3612	};	3781	};
3613		3782
3614	cf::object::thawer::errors_are_fatal 0;	3783	cf::object::thawer::errors_are_fatal 0;
3615	warn "parse errors in files are no longer fatal from this point on.\n";	3784	info "parse errors in files are no longer fatal from this point on.\n";
3616		3785
		3786	AE::postpone {
		3787	undef &main; # free gobs of memory :)
		3788	};
		3789
3617	main_loop;	3790	goto &main_loop;
3618	}	3791	}
3619		3792
3620	#############################################################################	3793	#############################################################################
3621	# initialisation and cleanup	3794	# initialisation and cleanup
3622		3795
…		…
3661	or return;	3834	or return;
3662		3835
3663	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3836	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3664	and return;	3837	and return;
3665		3838
3666	warn sprintf "runtime file written (%gs).\n", AE::time - $t0;	3839	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3667		3840
3668	1	3841	1
3669	}	3842	}
3670		3843
3671	our $uuid_lock;	3844	our $uuid_lock;
…		…
3683	or return;	3856	or return;
3684		3857
3685	my $value = uuid_seq uuid_cur;	3858	my $value = uuid_seq uuid_cur;
3686		3859
3687	unless ($value) {	3860	unless ($value) {
3688	warn "cowardly refusing to write zero uuid value!\n";	3861	info "cowardly refusing to write zero uuid value!\n";
3689	return;	3862	return;
3690	}	3863	}
3691		3864
3692	my $value = uuid_str $value + $uuid_skip;	3865	my $value = uuid_str $value + $uuid_skip;
3693	$uuid_skip = 0;	3866	$uuid_skip = 0;
…		…
3703	or return;	3876	or return;
3704		3877
3705	aio_rename "$uuid~", $uuid	3878	aio_rename "$uuid~", $uuid
3706	and return;	3879	and return;
3707		3880
3708	warn "uuid file written ($value).\n";	3881	trace "uuid file written ($value).\n";
3709		3882
3710	1	3883	1
3711		3884
3712	}	3885	}
3713		3886
…		…
3719	}	3892	}
3720		3893
3721	sub emergency_save() {	3894	sub emergency_save() {
3722	my $freeze_guard = cf::freeze_mainloop;	3895	my $freeze_guard = cf::freeze_mainloop;
3723		3896
3724	warn "emergency_perl_save: enter\n";	3897	info "emergency_perl_save: enter\n";
		3898
		3899	# this is a trade-off: we want to be very quick here, so
		3900	# save all maps without fsync, and later call a global sync
		3901	# (which in turn might be very very slow)
		3902	local $USE_FSYNC = 0;
3725		3903
3726	cf::sync_job {	3904	cf::sync_job {
3727	# this is a trade-off: we want to be very quick here, so	3905	cf::write_runtime_sync; # external watchdog should not bark
3728	# save all maps without fsync, and later call a global sync
3729	# (which in turn might be very very slow)
3730	local $USE_FSYNC = 0;
3731		3906
3732	# use a peculiar iteration method to avoid tripping on perl	3907	# use a peculiar iteration method to avoid tripping on perl
3733	# refcount bugs in for. also avoids problems with players	3908	# refcount bugs in for. also avoids problems with players
3734	# and maps saved/destroyed asynchronously.	3909	# and maps saved/destroyed asynchronously.
3735	warn "emergency_perl_save: begin player save\n";	3910	info "emergency_perl_save: begin player save\n";
3736	for my $login (keys %cf::PLAYER) {	3911	for my $login (keys %cf::PLAYER) {
3737	my $pl = $cf::PLAYER{$login} or next;	3912	my $pl = $cf::PLAYER{$login} or next;
3738	$pl->valid or next;	3913	$pl->valid or next;
3739	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3914	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3740	$pl->save;	3915	$pl->save;
3741	}	3916	}
3742	warn "emergency_perl_save: end player save\n";	3917	info "emergency_perl_save: end player save\n";
3743		3918
		3919	cf::write_runtime_sync; # external watchdog should not bark
		3920
3744	warn "emergency_perl_save: begin map save\n";	3921	info "emergency_perl_save: begin map save\n";
3745	for my $path (keys %cf::MAP) {	3922	for my $path (keys %cf::MAP) {
3746	my $map = $cf::MAP{$path} or next;	3923	my $map = $cf::MAP{$path} or next;
3747	$map->valid or next;	3924	$map->valid or next;
3748	$map->save;	3925	$map->save;
3749	}	3926	}
3750	warn "emergency_perl_save: end map save\n";	3927	info "emergency_perl_save: end map save\n";
3751		3928
		3929	cf::write_runtime_sync; # external watchdog should not bark
		3930
3752	warn "emergency_perl_save: begin database checkpoint\n";	3931	info "emergency_perl_save: begin database checkpoint\n";
3753	BDB::db_env_txn_checkpoint $DB_ENV;	3932	BDB::db_env_txn_checkpoint $DB_ENV;
3754	warn "emergency_perl_save: end database checkpoint\n";	3933	info "emergency_perl_save: end database checkpoint\n";
3755		3934
3756	warn "emergency_perl_save: begin write uuid\n";	3935	info "emergency_perl_save: begin write uuid\n";
3757	write_uuid_sync 1;	3936	write_uuid_sync 1;
3758	warn "emergency_perl_save: end write uuid\n";	3937	info "emergency_perl_save: end write uuid\n";
		3938
		3939	cf::write_runtime_sync; # external watchdog should not bark
		3940
		3941	trace "emergency_perl_save: syncing database to disk";
		3942	BDB::db_env_txn_checkpoint $DB_ENV;
		3943
		3944	info "emergency_perl_save: starting sync\n";
		3945	IO::AIO::aio_sync sub {
		3946	info "emergency_perl_save: finished sync\n";
		3947	};
		3948
		3949	cf::write_runtime_sync; # external watchdog should not bark
		3950
		3951	trace "emergency_perl_save: flushing outstanding aio requests";
		3952	while (IO::AIO::nreqs || BDB::nreqs) {
		3953	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
		3954	}
		3955
		3956	cf::write_runtime_sync; # external watchdog should not bark
3759	};	3957	};
3760		3958
3761	warn "emergency_perl_save: starting sync()\n";
3762	IO::AIO::aio_sync sub {
3763	warn "emergency_perl_save: finished sync()\n";
3764	};
3765
3766	warn "emergency_perl_save: leave\n";	3959	info "emergency_perl_save: leave\n";
3767	}	3960	}
3768		3961
3769	sub post_cleanup {	3962	sub post_cleanup {
3770	my ($make_core) = @_;	3963	my ($make_core) = @_;
3771		3964
		3965	IO::AIO::flush;
		3966
3772	warn Carp::longmess "post_cleanup backtrace"	3967	error Carp::longmess "post_cleanup backtrace"
3773	if $make_core;	3968	if $make_core;
3774		3969
3775	my $fh = pidfile;	3970	my $fh = pidfile;
3776	unlink $PIDFILE if <$fh> == $$;	3971	unlink $PIDFILE if <$fh> == $$;
3777	}	3972	}
…		…
3801	}	3996	}
3802	}	3997	}
3803		3998
3804	sub do_reload_perl() {	3999	sub do_reload_perl() {
3805	# can/must only be called in main	4000	# can/must only be called in main
3806	if (in_main) {	4001	unless (in_main) {
3807	warn "can only reload from main coroutine";	4002	error "can only reload from main coroutine";
3808	return;	4003	return;
3809	}	4004	}
3810		4005
3811	return if $RELOAD++;	4006	return if $RELOAD++;
3812		4007
3813	my $t1 = AE::time;	4008	my $t1 = AE::time;
3814		4009
3815	while ($RELOAD) {	4010	while ($RELOAD) {
3816	warn "reloading...";	4011	cf::get_slot 0.1, -1, "reload_perl";
		4012	info "perl_reload: reloading...";
3817		4013
3818	warn "entering sync_job";	4014	trace "perl_reload: entering sync_job";
3819		4015
3820	cf::sync_job {	4016	cf::sync_job {
3821	cf::write_runtime_sync; # external watchdog should not bark
3822	cf::emergency_save;	4017	#cf::emergency_save;
3823	cf::write_runtime_sync; # external watchdog should not bark
3824		4018
3825	warn "syncing database to disk";
3826	BDB::db_env_txn_checkpoint $DB_ENV;
3827
3828	# if anything goes wrong in here, we should simply crash as we already saved
3829
3830	warn "flushing outstanding aio requests";
3831	while (IO::AIO::nreqs || BDB::nreqs) {
3832	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3833	}
3834
3835	warn "cancelling all extension coros";	4019	trace "perl_reload: cancelling all extension coros";
3836	$_->cancel for values %EXT_CORO;	4020	$_->cancel for values %EXT_CORO;
3837	%EXT_CORO = ();	4021	%EXT_CORO = ();
3838		4022
3839	warn "removing commands";	4023	trace "perl_reload: removing commands";
3840	%COMMAND = ();	4024	%COMMAND = ();
3841		4025
3842	warn "removing ext/exti commands";	4026	trace "perl_reload: removing ext/exti commands";
3843	%EXTCMD = ();	4027	%EXTCMD = ();
3844	%EXTICMD = ();	4028	%EXTICMD = ();
3845		4029
3846	warn "unloading/nuking all extensions";	4030	trace "perl_reload: unloading/nuking all extensions";
3847	for my $pkg (@EXTS) {	4031	for my $pkg (@EXTS) {
3848	warn "... unloading $pkg";	4032	trace "... unloading $pkg";
3849		4033
3850	if (my $cb = $pkg->can ("unload")) {	4034	if (my $cb = $pkg->can ("unload")) {
3851	eval {	4035	eval {
3852	$cb->($pkg);	4036	$cb->($pkg);
3853	1	4037	1
3854	} or warn "$pkg unloaded, but with errors: $@";	4038	} or error "$pkg unloaded, but with errors: $@";
3855	}	4039	}
3856		4040
3857	warn "... clearing $pkg";	4041	trace "... clearing $pkg";
3858	clear_package $pkg;	4042	clear_package $pkg;
3859	}	4043	}
3860		4044
3861	warn "unloading all perl modules loaded from $LIBDIR";	4045	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3862	while (my ($k, $v) = each %INC) {	4046	while (my ($k, $v) = each %INC) {
3863	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4047	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3864		4048
3865	warn "... unloading $k";	4049	trace "... unloading $k";
3866	delete $INC{$k};	4050	delete $INC{$k};
3867		4051
3868	$k =~ s/\.pm$//;	4052	$k =~ s/\.pm$//;
3869	$k =~ s/\//::/g;	4053	$k =~ s/\//::/g;
3870		4054
…		…
3873	}	4057	}
3874		4058
3875	clear_package $k;	4059	clear_package $k;
3876	}	4060	}
3877		4061
3878	warn "getting rid of safe::, as good as possible";	4062	trace "perl_reload: getting rid of safe::, as good as possible";
3879	clear_package "safe::$_"	4063	clear_package "safe::$_"
3880	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4064	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3881		4065
3882	warn "unloading cf.pm \"a bit\"";	4066	trace "perl_reload: unloading cf.pm \"a bit\"";
3883	delete $INC{"cf.pm"};	4067	delete $INC{"cf.pm"};
3884	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4068	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3885		4069
3886	# don't, removes xs symbols, too,	4070	# don't, removes xs symbols, too,
3887	# and global variables created in xs	4071	# and global variables created in xs
3888	#clear_package __PACKAGE__;	4072	#clear_package __PACKAGE__;
3889		4073
3890	warn "unload completed, starting to reload now";	4074	info "perl_reload: unload completed, starting to reload now";
3891		4075
3892	warn "reloading cf.pm";	4076	trace "perl_reload: reloading cf.pm";
3893	require cf;	4077	require cf;
3894	cf::_connect_to_perl_1;	4078	cf::_connect_to_perl_1;
3895		4079
3896	warn "loading config and database again";	4080	trace "perl_reload: loading config and database again";
3897	cf::reload_config;	4081	cf::reload_config;
3898		4082
3899	warn "loading extensions";	4083	trace "perl_reload: loading extensions";
3900	cf::load_extensions;	4084	cf::load_extensions;
3901		4085
3902	if ($REATTACH_ON_RELOAD) {	4086	if ($REATTACH_ON_RELOAD) {
3903	warn "reattaching attachments to objects/players";	4087	trace "perl_reload: reattaching attachments to objects/players";
3904	_global_reattach; # objects, sockets	4088	_global_reattach; # objects, sockets
3905	warn "reattaching attachments to maps";	4089	trace "perl_reload: reattaching attachments to maps";
3906	reattach $_ for values %MAP;	4090	reattach $_ for values %MAP;
3907	warn "reattaching attachments to players";	4091	trace "perl_reload: reattaching attachments to players";
3908	reattach $_ for values %PLAYER;	4092	reattach $_ for values %PLAYER;
3909	}	4093	}
3910		4094
3911	warn "running post_init jobs";	4095	cf::_post_init 1;
3912	(pop @POST_INIT)->(1) while @POST_INIT;
3913		4096
3914	warn "leaving sync_job";	4097	trace "perl_reload: leaving sync_job";
3915		4098
3916	1	4099	1
3917	} or do {	4100	} or do {
3918	warn $@;	4101	error $@;
3919	cf::cleanup "error while reloading, exiting.";	4102	cf::cleanup "perl_reload: error, exiting.";
3920	};	4103	};
3921		4104
3922	warn "reloaded";
3923	--$RELOAD;	4105	--$RELOAD;
3924	}	4106	}
3925		4107
3926	$t1 = AE::time - $t1;	4108	$t1 = AE::time - $t1;
3927	warn "reload completed in ${t1}s\n";	4109	info "perl_reload: completed in ${t1}s\n";
3928	};	4110	};
3929		4111
3930	our $RELOAD_WATCHER; # used only during reload	4112	our $RELOAD_WATCHER; # used only during reload
3931		4113
3932	sub reload_perl() {	4114	sub reload_perl() {
…		…
3953	reload_perl;	4135	reload_perl;
3954	};	4136	};
3955	}	4137	}
3956	};	4138	};
3957		4139
3958	unshift @INC, $LIBDIR;	4140	#############################################################################
3959		4141
3960	my $bug_warning = 0;	4142	my $bug_warning = 0;
3961		4143
3962	our @WAIT_FOR_TICK;
3963	our @WAIT_FOR_TICK_BEGIN;
3964
3965	sub wait_for_tick {	4144	sub wait_for_tick() {
3966	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4145	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3967		4146
3968	my $signal = new Coro::Signal;	4147	$WAIT_FOR_TICK->wait;
3969	push @WAIT_FOR_TICK, $signal;
3970	$signal->wait;
3971	}	4148	}
3972		4149
3973	sub wait_for_tick_begin {	4150	sub wait_for_tick_begin() {
3974	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4151	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3975		4152
3976	my $signal = new Coro::Signal;	4153	my $signal = new Coro::Signal;
3977	push @WAIT_FOR_TICK_BEGIN, $signal;	4154	push @WAIT_FOR_TICK_BEGIN, $signal;
3978	$signal->wait;	4155	$signal->wait;
3979	}	4156	}
…		…
3983	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4160	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3984	unless ++$bug_warning > 10;	4161	unless ++$bug_warning > 10;
3985	return;	4162	return;
3986	}	4163	}
3987		4164
3988	cf::server_tick; # one server iteration	4165	cf::one_tick; # one server iteration
3989		4166
3990	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#	4167	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3991		4168
3992	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4169	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3993	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4170	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3994	Coro::async_pool {	4171	Coro::async_pool {
3995	$Coro::current->{desc} = "runtime saver";	4172	$Coro::current->{desc} = "runtime saver";
3996	write_runtime_sync	4173	write_runtime_sync
3997	or warn "ERROR: unable to write runtime file: $!";	4174	or error "ERROR: unable to write runtime file: $!";
3998	};	4175	};
3999	}	4176	}
4000		4177
4001	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4178	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4002	$sig->send;	4179	$sig->send;
4003	}	4180	}
4004	while (my $sig = shift @WAIT_FOR_TICK) {	4181	$WAIT_FOR_TICK->broadcast;
4005	$sig->send;
4006	}
4007		4182
4008	$LOAD = ($NOW - $TICK_START) / $TICK;	4183	$LOAD = ($NOW - $TICK_START) / $TICK;
4009	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4184	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4010		4185
4011	if (0) {	4186	if (0) {
4012	if ($NEXT_TICK) {	4187	if ($NEXT_TICK) {
4013	my $jitter = $TICK_START - $NEXT_TICK;	4188	my $jitter = $TICK_START - $NEXT_TICK;
4014	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4189	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
4015	warn "jitter $JITTER\n";#d#	4190	debug "jitter $JITTER\n";#d#
4016	}	4191	}
4017	}	4192	}
4018	}	4193	}
4019		4194
4020	{	4195	{
4021	# configure BDB	4196	# configure BDB
4022		4197
4023	BDB::min_parallel 16;	4198	BDB::min_parallel 16;
4024	BDB::max_poll_reqs $TICK * 0.1;	4199	BDB::max_poll_reqs $TICK * 0.1;
4025	$AnyEvent::BDB::WATCHER->priority (1);	4200	#$AnyEvent::BDB::WATCHER->priority (1);
4026		4201
4027	unless ($DB_ENV) {	4202	unless ($DB_ENV) {
4028	$DB_ENV = BDB::db_env_create;	4203	$DB_ENV = BDB::db_env_create;
4029	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4204	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4030	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4205	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
4065	IO::AIO::min_parallel 8;	4240	IO::AIO::min_parallel 8;
4066	IO::AIO::max_poll_time $TICK * 0.1;	4241	IO::AIO::max_poll_time $TICK * 0.1;
4067	undef $AnyEvent::AIO::WATCHER;	4242	undef $AnyEvent::AIO::WATCHER;
4068	}	4243	}
4069		4244
4070	my $_log_backtrace;	4245	our $_log_backtrace;
		4246	our $_log_backtrace_last;
4071		4247
4072	sub _log_backtrace {	4248	sub _log_backtrace {
4073	my ($msg, @addr) = @_;	4249	my ($msg, @addr) = @_;
4074		4250
4075	$msg =~ s/\n//;	4251	$msg =~ s/\n$//;
4076		4252
		4253	if ($_log_backtrace_last eq $msg) {
		4254	LOG llevInfo, "[ABT] $msg\n";
		4255	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4077	# limit the # of concurrent backtraces	4256	# limit the # of concurrent backtraces
4078	if ($_log_backtrace < 2) {	4257	} elsif ($_log_backtrace < 2) {
		4258	$_log_backtrace_last = $msg;
4079	++$_log_backtrace;	4259	++$_log_backtrace;
4080	my $perl_bt = Carp::longmess $msg;	4260	my $perl_bt = Carp::longmess $msg;
4081	async {	4261	async {
4082	$Coro::current->{desc} = "abt $msg";	4262	$Coro::current->{desc} = "abt $msg";
4083		4263
…		…
4103	LOG llevInfo, "[ABT] $_\n" for @bt;	4283	LOG llevInfo, "[ABT] $_\n" for @bt;
4104	--$_log_backtrace;	4284	--$_log_backtrace;
4105	};	4285	};
4106	} else {	4286	} else {
4107	LOG llevInfo, "[ABT] $msg\n";	4287	LOG llevInfo, "[ABT] $msg\n";
4108	LOG llevInfo, "[ABT] [suppressed]\n";	4288	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4109	}	4289	}
4110	}	4290	}
4111		4291
4112	# load additional modules	4292	# load additional modules
4113	require "cf/$_.pm" for @EXTRA_MODULES;	4293	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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