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.522 by root, Sat Apr 17 02:22:14 2010 UTC vs.
Revision 1.577 by root, Tue Jan 3 11:25:33 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;
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
…		…
188		197
189	=over 4	198	=over 4
190		199
191	=item $cf::UPTIME	200	=item $cf::UPTIME
192		201
193	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.
194		218
195	=item $cf::RUNTIME	219	=item $cf::RUNTIME
196		220
197	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
198	every server tick.	222	every server tick.
…		…
204	Various directories - "/etc", read-only install directory, perl-library	228	Various directories - "/etc", read-only install directory, perl-library
205	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	229	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
206	unique-items directory, player file directory, random maps directory and	230	unique-items directory, player file directory, random maps directory and
207	database environment.	231	database environment.
208		232
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	233	=item $cf::LOADAVG
218		234
219	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
220	(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
221	objects per tick. Healthy values are < 0.5.	237	objects per tick. Healthy values are < 0.5.
…		…
230	from wherever your confdir points to.	246	from wherever your confdir points to.
231		247
232	=item cf::wait_for_tick, cf::wait_for_tick_begin	248	=item cf::wait_for_tick, cf::wait_for_tick_begin
233		249
234	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
235	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
236	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();
237		270
238	=item @cf::INVOKE_RESULTS	271	=item @cf::INVOKE_RESULTS
239		272
240	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
241	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
…		…
249		282
250	=back	283	=back
251		284
252	=cut	285	=cut
253		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
254	$Coro::State::WARNHOOK = sub {	293	$Coro::State::WARNHOOK = sub {
255	my $msg = join "", @_;	294	my $msg = join "", @_;
256		295
257	$msg .= "\n"	296	$msg .= "\n"
258	unless $msg =~ /\n$/;	297	unless $msg =~ /\n$/;
259		298
260	$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;
261		300
262	LOG llevError, $msg;	301	LOG llevWarn, $msg;
263	};	302	};
264		303
265	$Coro::State::DIEHOOK = sub {	304	$Coro::State::DIEHOOK = sub {
266	return unless $^S eq 0; # "eq", not "=="	305	return unless $^S eq 0; # "eq", not "=="
267		306
268	warn Carp::longmess $_[0];	307	error Carp::longmess $_[0];
269		308
270	if (in_main) {#d#	309	if (in_main) {#d#
271	warn "DIEHOOK called in main context, Coro bug?\n";#d#	310	error "DIEHOOK called in main context, Coro bug?\n";#d#
272	return;#d#	311	return;#d#
273	}#d#	312	}#d#
274		313
275	# kill coroutine otherwise	314	# kill coroutine otherwise
276	Coro::terminate	315	Coro::terminate
…		…
298	}	337	}
299		338
300	$EV::DIED = sub {	339	$EV::DIED = sub {
301	Carp::cluck "error in event callback: @_";	340	Carp::cluck "error in event callback: @_";
302	};	341	};
		342
		343	#############################################################################
		344
		345	sub fork_call(&@);
		346	sub get_slot($;$$);
303		347
304	#############################################################################	348	#############################################################################
305		349
306	=head2 UTILITY FUNCTIONS	350	=head2 UTILITY FUNCTIONS
307		351
…		…
328	$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;
329	$d	373	$d
330	} || "[unable to dump $_[0]: '$@']";	374	} || "[unable to dump $_[0]: '$@']";
331	}	375	}
332		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
333	=item $ref = cf::decode_json $json	391	=item $ref = cf::decode_json $json
334		392
335	Converts a JSON string into the corresponding perl data structure.	393	Converts a JSON string into the corresponding perl data structure.
336		394
337	=item $json = cf::encode_json $ref	395	=item $json = cf::encode_json $ref
…		…
343	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
344		402
345	sub encode_json($) { $json_coder->encode ($_[0]) }	403	sub encode_json($) { $json_coder->encode ($_[0]) }
346	sub decode_json($) { $json_coder->decode ($_[0]) }	404	sub decode_json($) { $json_coder->decode ($_[0]) }
347		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
348	=item cf::post_init { BLOCK }	437	=item cf::post_init { BLOCK }
349		438
350	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,
351	but I<before> the server starts ticking again.	440	but I<before> the server starts ticking again.
352		441
353	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
354	is a reload or not.	443	is a reload or not.
355		444
356	=cut	445	=cut
357		446
358	sub post_init(&) {	447	sub post_init(&) {
359	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	}
360	}	466	}
361		467
362	=item cf::lock_wait $string	468	=item cf::lock_wait $string
363		469
364	Wait until the given lock is available. See cf::lock_acquire.	470	Wait until the given lock is available. See cf::lock_acquire.
…		…
417	EV::periodic $start, $interval, 0, $cb	523	EV::periodic $start, $interval, 0, $cb
418	}	524	}
419		525
420	=item cf::get_slot $time[, $priority[, $name]]	526	=item cf::get_slot $time[, $priority[, $name]]
421		527
422	Allocate $time seconds of blocking CPU time at priority C<$priority>:	528	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	529	(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.	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.
425		535
426	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
427	used for statistical purposes and should identify the same time-class.	537	used for statistical purposes and should identify the same time-class.
428		538
429	Useful for short background jobs.	539	Useful for short background jobs.
…		…
458	}	568	}
459	}	569	}
460		570
461	if (@SLOT_QUEUE) {	571	if (@SLOT_QUEUE) {
462	# 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
463	push @cf::WAIT_FOR_TICK, $signal;	573	$WAIT_FOR_TICK->wait;
464	$signal->wait;
465	} else {	574	} else {
466	$busy = 0;	575	$busy = 0;
467	Coro::schedule;	576	Coro::schedule;
468	}	577	}
469	}	578	}
…		…
509	=cut	618	=cut
510		619
511	sub sync_job(&) {	620	sub sync_job(&) {
512	my ($job) = @_;	621	my ($job) = @_;
513		622
514	if ($Coro::current == $Coro::main) {	623	if (in_main) {
515	my $time = AE::time;	624	my $time = AE::time;
516		625
517	# this is the main coro, too bad, we have to block	626	# this is the main coro, too bad, we have to block
518	# till the operation succeeds, freezing the server :/	627	# till the operation succeeds, freezing the server :/
519		628
520	LOG llevError, Carp::longmess "sync job";#d#	629	#LOG llevError, Carp::longmess "sync job";#d#
521		630
522	my $freeze_guard = freeze_mainloop;	631	my $freeze_guard = freeze_mainloop;
523		632
524	my $busy = 1;	633	my $busy = 1;
525	my @res;	634	my @res;
526		635
527	(async {	636	(async {
528	$Coro::current->desc ("sync job coro");	637	$Coro::current->desc ("sync job coro");
529	@res = eval { $job->() };	638	@res = eval { $job->() };
530	warn $@ if $@;	639	error $@ if $@;
531	undef $busy;	640	undef $busy;
532	})->prio (Coro::PRIO_MAX);	641	})->prio (Coro::PRIO_MAX);
533		642
534	while ($busy) {	643	while ($busy) {
535	if (Coro::nready) {	644	if (Coro::nready) {
…		…
569	$EXT_CORO{$coro+0} = $coro;	678	$EXT_CORO{$coro+0} = $coro;
570		679
571	$coro	680	$coro
572	}	681	}
573		682
574	=item fork_call { }, $args	683	=item fork_call { }, @args
575		684
576	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
577	process, returning the results. Everything must be serialisable with	686	process, returning the results. Everything must be serialisable with
578	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
579	never block itself or use any form of event handling.	688	never block itself or use any form of event handling.
580		689
581	=cut	690	=cut
582		691
		692	sub post_fork {
		693	reset_signals;
		694	}
		695
583	sub fork_call(&@) {	696	sub fork_call(&@) {
584	my ($cb, @args) = @_;	697	my ($cb, @args) = @_;
585		698
586	# 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,
587	# otherwise perl prematurely frees the stuff :/	700	# otherwise perl prematurely frees the stuff :/
588	# TODO: investigate and fix (likely this will be rather laborious)	701	# TODO: investigate and fix (likely this will be rather laborious)
589		702
590	my @res = Coro::Util::fork_eval {	703	my @res = Coro::Util::fork_eval {
591	reset_signals;	704	cf::post_fork;
592	&$cb	705	&$cb
593	}, @args;	706	} @args;
594		707
595	wantarray ? @res : $res[-1]	708	wantarray ? @res : $res[-1]
596	}	709	}
597		710
598	sub objinfo {	711	sub objinfo {
…		…
648	within each server.	761	within each server.
649		762
650	=cut	763	=cut
651		764
652	sub db_table($) {	765	sub db_table($) {
		766	cf::error "db_get called from main context"
		767	if $Coro::current == $Coro::main;
		768
653	my ($name) = @_;	769	my ($name) = @_;
654	my $db = BDB::db_create $DB_ENV;	770	my $db = BDB::db_create $DB_ENV;
655		771
656	eval {	772	eval {
657	$db->set_flags (BDB::CHKSUM);	773	$db->set_flags (BDB::CHKSUM);
…		…
667	}	783	}
668		784
669	our $DB;	785	our $DB;
670		786
671	sub db_init {	787	sub db_init {
672	cf::sync_job {
673	$DB ||= db_table "db";	788	$DB ||= db_table "db";
674	};
675	}	789	}
676		790
677	sub db_get($$) {	791	sub db_get($$) {
678	my $key = "$_[0]/$_[1]";	792	my $key = "$_[0]/$_[1]";
679		793
680	cf::sync_job {	794	cf::error "db_get called from main context"
		795	if $Coro::current == $Coro::main;
		796
681	BDB::db_get $DB, undef, $key, my $data;	797	BDB::db_get $DB, undef, $key, my $data;
682		798
683	$! ? ()	799	$! ? ()
684	: $data	800	: $data
685	}
686	}	801	}
687		802
688	sub db_put($$$) {	803	sub db_put($$$) {
689	BDB::dbreq_pri 4;	804	BDB::dbreq_pri 4;
690	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	805	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
718		833
719	my @data;	834	my @data;
720	my $md5;	835	my $md5;
721		836
722	for (0 .. $#$src) {	837	for (0 .. $#$src) {
723	0 <= aio_load $src->[$_], $data[$_]	838	$data[$_] = load_file $src->[$_];
724	or Carp::croak "$src->[$_]: $!";
725	}	839	}
726		840
727	# if processing is expensive, check	841	# if processing is expensive, check
728	# checksum first	842	# checksum first
729	if (1) {	843	if (1) {
…		…
746		860
747	my $t1 = Time::HiRes::time;	861	my $t1 = Time::HiRes::time;
748	my $data = $process->(\@data);	862	my $data = $process->(\@data);
749	my $t2 = Time::HiRes::time;	863	my $t2 = Time::HiRes::time;
750		864
751	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	865	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
752		866
753	db_put cache => "$id/data", $data;	867	db_put cache => "$id/data", $data;
754	db_put cache => "$id/md5" , $md5;	868	db_put cache => "$id/md5" , $md5;
755	db_put cache => "$id/meta", $meta;	869	db_put cache => "$id/meta", $meta;
756		870
…		…
766		880
767	=cut	881	=cut
768		882
769	sub datalog($@) {	883	sub datalog($@) {
770	my ($type, %kv) = @_;	884	my ($type, %kv) = @_;
771	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	885	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
772	}	886	}
773		887
774	=back	888	=back
775		889
776	=cut	890	=cut
…		…
971		1085
972	} elsif (exists $cb_id{$type}) {	1086	} elsif (exists $cb_id{$type}) {
973	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	1087	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
974		1088
975	} elsif (ref $type) {	1089	} elsif (ref $type) {
976	warn "attaching objects not supported, ignoring.\n";	1090	error "attaching objects not supported, ignoring.\n";
977		1091
978	} else {	1092	} else {
979	shift @arg;	1093	shift @arg;
980	warn "attach argument '$type' not supported, ignoring.\n";	1094	error "attach argument '$type' not supported, ignoring.\n";
981	}	1095	}
982	}	1096	}
983	}	1097	}
984		1098
985	sub _object_attach {	1099	sub _object_attach {
…		…
995	_attach $registry, $klass, @attach;	1109	_attach $registry, $klass, @attach;
996	}	1110	}
997		1111
998	$obj->{$name} = \%arg;	1112	$obj->{$name} = \%arg;
999	} else {	1113	} else {
1000	warn "object uses attachment '$name' which is not available, postponing.\n";	1114	info "object uses attachment '$name' which is not available, postponing.\n";
1001	}	1115	}
1002		1116
1003	$obj->{_attachment}{$name} = undef;	1117	$obj->{_attachment}{$name} = undef;
1004	}	1118	}
1005		1119
…		…
1064		1178
1065	for (@$callbacks) {	1179	for (@$callbacks) {
1066	eval { &{$_->[1]} };	1180	eval { &{$_->[1]} };
1067		1181
1068	if ($@) {	1182	if ($@) {
1069	warn "$@";
1070	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1183	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1071	override;	1184	override;
1072	}	1185	}
1073		1186
1074	return 1 if $override;	1187	return 1 if $override;
1075	}	1188	}
…		…
1154	for (@$attach) {	1267	for (@$attach) {
1155	my ($klass, @attach) = @$_;	1268	my ($klass, @attach) = @$_;
1156	_attach $registry, $klass, @attach;	1269	_attach $registry, $klass, @attach;
1157	}	1270	}
1158	} else {	1271	} else {
1159	warn "object uses attachment '$name' that is not available, postponing.\n";	1272	info "object uses attachment '$name' that is not available, postponing.\n";
1160	}	1273	}
1161	}	1274	}
1162	}	1275	}
1163		1276
1164	cf::attachable->attach (	1277	cf::attachable->attach (
…		…
1191	my ($filename, $rdata, $objs) = @_;	1304	my ($filename, $rdata, $objs) = @_;
1192		1305
1193	sync_job {	1306	sync_job {
1194	if (length $$rdata) {	1307	if (length $$rdata) {
1195	utf8::decode (my $decname = $filename);	1308	utf8::decode (my $decname = $filename);
1196	warn sprintf "saving %s (%d,%d)\n",	1309	trace sprintf "saving %s (%d,%d)\n",
1197	$decname, length $$rdata, scalar @$objs;	1310	$decname, length $$rdata, scalar @$objs
		1311	if $VERBOSE_IO;
1198		1312
1199	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1313	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1200	aio_chmod $fh, SAVE_MODE;	1314	aio_chmod $fh, SAVE_MODE;
1201	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1315	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1202	if ($cf::USE_FSYNC) {	1316	if ($cf::USE_FSYNC) {
…		…
1224	aio_rename "$filename~", $filename;	1338	aio_rename "$filename~", $filename;
1225		1339
1226	$filename =~ s%/[^/]+$%%;	1340	$filename =~ s%/[^/]+$%%;
1227	aio_pathsync $filename if $cf::USE_FSYNC;	1341	aio_pathsync $filename if $cf::USE_FSYNC;
1228	} else {	1342	} else {
1229	warn "unable to save objects: $filename~: $!\n";	1343	error "unable to save objects: $filename~: $!\n";
1230	}	1344	}
1231	} else {	1345	} else {
1232	aio_unlink $filename;	1346	aio_unlink $filename;
1233	aio_unlink "$filename.pst";	1347	aio_unlink "$filename.pst";
1234	}	1348	}
…		…
1258	my $st = eval { Coro::Storable::thaw $av };	1372	my $st = eval { Coro::Storable::thaw $av };
1259	$av = $st->{objs};	1373	$av = $st->{objs};
1260	}	1374	}
1261		1375
1262	utf8::decode (my $decname = $filename);	1376	utf8::decode (my $decname = $filename);
1263	warn sprintf "loading %s (%d,%d)\n",	1377	trace sprintf "loading %s (%d,%d)\n",
1264	$decname, length $data, scalar @{$av || []};	1378	$decname, length $data, scalar @{$av || []}
		1379	if $VERBOSE_IO;
1265		1380
1266	($data, $av)	1381	($data, $av)
1267	}	1382	}
1268		1383
1269	=head2 COMMAND CALLBACKS	1384	=head2 COMMAND CALLBACKS
…		…
1346	my ($pl, $buf) = @_;	1461	my ($pl, $buf) = @_;
1347		1462
1348	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1463	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1349		1464
1350	if (ref $msg) {	1465	if (ref $msg) {
1351	my ($type, $reply, @payload) =	1466	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		1467
1356	my @reply;	1468	my @reply;
1357		1469
1358	if (my $cb = $EXTCMD{$type}) {	1470	if (my $cb = $EXTCMD{$type}) {
1359	@reply = $cb->($pl, @payload);	1471	@reply = $cb->($pl, @payload);
…		…
1361		1473
1362	$pl->ext_reply ($reply, @reply)	1474	$pl->ext_reply ($reply, @reply)
1363	if $reply;	1475	if $reply;
1364		1476
1365	} else {	1477	} else {
1366	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1478	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1367	}	1479	}
1368		1480
1369	cf::override;	1481	cf::override;
1370	},	1482	},
1371	);	1483	);
…		…
1382		1494
1383	$grp	1495	$grp
1384	}	1496	}
1385		1497
1386	sub load_extensions {	1498	sub load_extensions {
		1499	info "loading extensions...";
		1500
1387	cf::sync_job {	1501	cf::sync_job {
1388	my %todo;	1502	my %todo;
1389		1503
1390	for my $path (<$LIBDIR/*.ext>) {	1504	for my $path (<$LIBDIR/*.ext>) {
1391	next unless -r $path;	1505	next unless -r $path;
…		…
1409		1523
1410	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1524	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1411	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1525	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1412		1526
1413	$ext{source} =	1527	$ext{source} =
1414	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1528	"package $pkg; use common::sense;\n"
1415	. "#line 1 \"$path\"\n{\n"	1529	. "#line 1 \"$path\"\n{\n"
1416	. $source	1530	. $source
1417	. "\n};\n1";	1531	. "\n};\n1";
1418		1532
1419	$todo{$base} = \%ext;	1533	$todo{$base} = \%ext;
…		…
1431	for (split /,\s*/, $v->{meta}{depends}) {	1545	for (split /,\s*/, $v->{meta}{depends}) {
1432	next ext	1546	next ext
1433	unless exists $done{$_};	1547	unless exists $done{$_};
1434	}	1548	}
1435		1549
1436	warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1550	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1437		1551
1438	my $active = eval $v->{source};	1552	my $active = eval $v->{source};
1439		1553
1440	if (length $@) {	1554	if (length $@) {
1441	warn "$v->{path}: $@\n";	1555	error "$v->{path}: $@\n";
1442		1556
1443	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1557	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1444	if exists $v->{meta}{mandatory};	1558	if exists $v->{meta}{mandatory};
1445		1559
1446	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";	1560	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
…		…
1448	} else {	1562	} else {
1449	$done{$k} = delete $todo{$k};	1563	$done{$k} = delete $todo{$k};
1450	push @EXTS, $v->{pkg};	1564	push @EXTS, $v->{pkg};
1451	$progress = 1;	1565	$progress = 1;
1452		1566
1453	warn "$v->{base}: extension inactive.\n"	1567	info "$v->{base}: extension inactive.\n"
1454	unless $active;	1568	unless $active;
1455	}	1569	}
1456	}	1570	}
1457		1571
1458	unless ($progress) {	1572	unless ($progress) {
…		…
1460		1574
1461	while (my ($k, $v) = each %todo) {	1575	while (my ($k, $v) = each %todo) {
1462	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1576	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1463	if exists $v->{meta}{mandatory};	1577	if exists $v->{meta}{mandatory};
1464	}	1578	}
		1579
		1580	last;
1465	}	1581	}
1466	}	1582	}
1467	};	1583	};
1468	}	1584	}
1469		1585
…		…
1627	my $name = $pl->ob->name;	1743	my $name = $pl->ob->name;
1628		1744
1629	$pl->{deny_save} = 1;	1745	$pl->{deny_save} = 1;
1630	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1746	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1631		1747
1632	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1748	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1633	$pl->deactivate;	1749	$pl->deactivate;
		1750
1634	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1751	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1635	$pl->ob->check_score;
1636	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1752	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1753	ext::highscore::check ($pl->ob);
		1754
1637	$pl->ns->destroy if $pl->ns;	1755	$pl->ns->destroy if $pl->ns;
1638		1756
1639	my $path = playerdir $pl;	1757	my $path = playerdir $pl;
1640	my $temp = "$path~$cf::RUNTIME~deleting~";	1758	my $temp = "$path~$cf::RUNTIME~deleting~";
1641	aio_rename $path, $temp;	1759	aio_rename $path, $temp;
…		…
1695	\@logins	1813	\@logins
1696	}	1814	}
1697		1815
1698	=item $player->maps	1816	=item $player->maps
1699		1817
		1818	=item cf::player::maps $login
		1819
1700	Returns an arrayref of map paths that are private for this	1820	Returns an arrayref of map paths that are private for this
1701	player. May block.	1821	player. May block.
1702		1822
1703	=cut	1823	=cut
1704		1824
…		…
1766	=cut	1886	=cut
1767		1887
1768	sub find_by_path($) {	1888	sub find_by_path($) {
1769	my ($path) = @_;	1889	my ($path) = @_;
1770		1890
		1891	$path =~ s/^~[^\/]*//; # skip ~login
		1892
1771	my ($match, $specificity);	1893	my ($match, $specificity);
1772		1894
1773	for my $region (list) {	1895	for my $region (list) {
1774	if ($region->{match} && $path =~ $region->{match}) {	1896	if ($region->{match} && $path =~ $region->{match}) {
1775	($match, $specificity) = ($region, $region->specificity)	1897	($match, $specificity) = ($region, $region->specificity)
…		…
1803	sub generate_random_map {	1925	sub generate_random_map {
1804	my ($self, $rmp) = @_;	1926	my ($self, $rmp) = @_;
1805		1927
1806	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	1928	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1807		1929
1808	# mit "rum" bekleckern, nicht
1809	$self->_create_random_map (	1930	$self->_create_random_map ($rmp);
1810	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1811	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1812	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1813	$rmp->{exit_on_final_map},
1814	$rmp->{xsize}, $rmp->{ysize},
1815	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1816	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1817	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1818	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1819	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1820	(cf::region::find $rmp->{region}), $rmp->{custom}
1821	)
1822	}	1931	}
1823		1932
1824	=item cf::map->register ($regex, $prio)	1933	=item cf::map->register ($regex, $prio)
1825		1934
1826	Register a handler for the map path matching the given regex at the	1935	Register a handler for the map path matching the given regex at the
…		…
1831		1940
1832	sub register {	1941	sub register {
1833	my (undef, $regex, $prio) = @_;	1942	my (undef, $regex, $prio) = @_;
1834	my $pkg = caller;	1943	my $pkg = caller;
1835		1944
1836	no strict;
1837	push @{"$pkg\::ISA"}, __PACKAGE__;	1945	push @{"$pkg\::ISA"}, __PACKAGE__;
1838		1946
1839	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	1947	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1840	}	1948	}
1841		1949
1842	# also paths starting with '/'	1950	# also paths starting with '/'
1843	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	1951	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1844		1952
1845	sub thawer_merge {	1953	sub thawer_merge {
1846	my ($self, $merge) = @_;	1954	my ($self, $merge) = @_;
1847		1955
1848	# we have to keep some variables in memory intact	1956	# we have to keep some variables in memory intact
…		…
1853	}	1961	}
1854		1962
1855	sub normalise {	1963	sub normalise {
1856	my ($path, $base) = @_;	1964	my ($path, $base) = @_;
1857		1965
1858	$path = "$path"; # make sure its a string	1966	$path = "$path"; # make sure it's a string
1859		1967
1860	$path =~ s/\.map$//;	1968	$path =~ s/\.map$//;
1861		1969
1862	# map plan:	1970	# map plan:
1863	#	1971	#
…		…
1878	$base =~ s{[^/]+/?$}{};	1986	$base =~ s{[^/]+/?$}{};
1879	$path = "$base/$path";	1987	$path = "$base/$path";
1880	}	1988	}
1881		1989
1882	for ($path) {	1990	for ($path) {
1883	redo if s{//}{/};
1884	redo if s{/\.?/}{/};	1991	redo if s{/\.?/}{/};
1885	redo if s{/[^/]+/\.\./}{/};	1992	redo if s{/[^/]+/\.\./}{/};
1886	}	1993	}
1887		1994
1888	$path	1995	$path
…		…
1902	$self->init; # pass $1 etc.	2009	$self->init; # pass $1 etc.
1903	return $self;	2010	return $self;
1904	}	2011	}
1905	}	2012	}
1906		2013
1907	Carp::cluck "unable to resolve path '$path' (base '$base').";	2014	Carp::cluck "unable to resolve path '$path' (base '$base')";
1908	()	2015	()
1909	}	2016	}
1910		2017
		2018	# may re-bless or do other evil things
1911	sub init {	2019	sub init {
1912	my ($self) = @_;	2020	my ($self) = @_;
1913		2021
1914	$self	2022	$self
1915	}	2023	}
…		…
1980	$self->{load_path} = $path;	2088	$self->{load_path} = $path;
1981		2089
1982	1	2090	1
1983	}	2091	}
1984		2092
		2093	# used to laod the header of an original map
1985	sub load_header_orig {	2094	sub load_header_orig {
1986	my ($self) = @_;	2095	my ($self) = @_;
1987		2096
1988	$self->load_header_from ($self->load_path)	2097	$self->load_header_from ($self->load_path)
1989	}	2098	}
1990		2099
		2100	# used to laod the header of an instantiated map
1991	sub load_header_temp {	2101	sub load_header_temp {
1992	my ($self) = @_;	2102	my ($self) = @_;
1993		2103
1994	$self->load_header_from ($self->save_path)	2104	$self->load_header_from ($self->save_path)
1995	}	2105	}
1996		2106
		2107	# called after loading the header from an instantiated map
1997	sub prepare_temp {	2108	sub prepare_temp {
1998	my ($self) = @_;	2109	my ($self) = @_;
1999		2110
2000	$self->last_access ((delete $self->{last_access})	2111	$self->last_access ((delete $self->{last_access})
2001	|| $cf::RUNTIME); #d#	2112	|| $cf::RUNTIME); #d#
2002	# safety	2113	# safety
2003	$self->{instantiate_time} = $cf::RUNTIME	2114	$self->{instantiate_time} = $cf::RUNTIME
2004	if $self->{instantiate_time} > $cf::RUNTIME;	2115	if $self->{instantiate_time} > $cf::RUNTIME;
2005	}	2116	}
2006		2117
		2118	# called after loading the header from an original map
2007	sub prepare_orig {	2119	sub prepare_orig {
2008	my ($self) = @_;	2120	my ($self) = @_;
2009		2121
2010	$self->{load_original} = 1;	2122	$self->{load_original} = 1;
2011	$self->{instantiate_time} = $cf::RUNTIME;	2123	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2035		2147
2036	sub find;	2148	sub find;
2037	sub find {	2149	sub find {
2038	my ($path, $origin) = @_;	2150	my ($path, $origin) = @_;
2039		2151
		2152	cf::cede_to_tick;
		2153
2040	$path = normalise $path, $origin && $origin->path;	2154	$path = normalise $path, $origin;
2041		2155
2042	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2156	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2043	my $guard2 = cf::lock_acquire "map_find:$path";	2157	my $guard2 = cf::lock_acquire "map_find:$path";
2044		2158
2045	$cf::MAP{$path} || do {	2159	$cf::MAP{$path} || do {
…		…
2076		2190
2077	{	2191	{
2078	my $guard = cf::lock_acquire "map_data:$path";	2192	my $guard = cf::lock_acquire "map_data:$path";
2079		2193
2080	return unless $self->valid;	2194	return unless $self->valid;
2081	return unless $self->in_memory == cf::MAP_SWAPPED;	2195	return unless $self->state == cf::MAP_SWAPPED;
2082
2083	$self->in_memory (cf::MAP_LOADING);
2084		2196
2085	$self->alloc;	2197	$self->alloc;
2086		2198
2087	$self->pre_load;	2199	$self->pre_load;
2088	cf::cede_to_tick;	2200	cf::cede_to_tick;
2089		2201
		2202	if (exists $self->{load_path}) {
2090	my $f = new_from_file cf::object::thawer $self->{load_path};	2203	my $f = new_from_file cf::object::thawer $self->{load_path};
2091	$f->skip_block;	2204	$f->skip_block;
2092	$self->_load_objects ($f)	2205	$self->_load_objects ($f)
2093	or return;	2206	or return;
2094		2207
2095	$self->post_load_original	2208	$self->post_load_original
2096	if delete $self->{load_original};	2209	if delete $self->{load_original};
2097		2210
2098	if (my $uniq = $self->uniq_path) {	2211	if (my $uniq = $self->uniq_path) {
2099	utf8::encode $uniq;	2212	utf8::encode $uniq;
2100	unless (aio_stat $uniq) {	2213	unless (aio_stat $uniq) {
2101	if (my $f = new_from_file cf::object::thawer $uniq) {	2214	if (my $f = new_from_file cf::object::thawer $uniq) {
2102	$self->clear_unique_items;	2215	$self->clear_unique_items;
2103	$self->_load_objects ($f);	2216	$self->_load_objects ($f);
2104	$f->resolve_delayed_derefs;	2217	$f->resolve_delayed_derefs;
		2218	}
2105	}	2219	}
2106	}	2220	}
2107	}
2108		2221
2109	$f->resolve_delayed_derefs;	2222	$f->resolve_delayed_derefs;
		2223	} else {
		2224	$self->post_load_original
		2225	if delete $self->{load_original};
		2226	}
		2227
		2228	$self->state (cf::MAP_INACTIVE);
2110		2229
2111	cf::cede_to_tick;	2230	cf::cede_to_tick;
2112	# now do the right thing for maps	2231	# now do the right thing for maps
2113	$self->link_multipart_objects;	2232	$self->link_multipart_objects;
2114	$self->difficulty ($self->estimate_difficulty)	2233	$self->difficulty ($self->estimate_difficulty)
…		…
2118	unless ($self->{deny_activate}) {	2237	unless ($self->{deny_activate}) {
2119	$self->decay_objects;	2238	$self->decay_objects;
2120	$self->fix_auto_apply;	2239	$self->fix_auto_apply;
2121	$self->update_buttons;	2240	$self->update_buttons;
2122	cf::cede_to_tick;	2241	cf::cede_to_tick;
2123	$self->activate;	2242	#$self->activate; # no longer activate maps automatically
2124	}	2243	}
2125		2244
2126	$self->{last_save} = $cf::RUNTIME;	2245	$self->{last_save} = $cf::RUNTIME;
2127	$self->last_access ($cf::RUNTIME);	2246	$self->last_access ($cf::RUNTIME);
2128
2129	$self->in_memory (cf::MAP_ACTIVE);
2130	}	2247	}
2131		2248
2132	$self->post_load;	2249	$self->post_load;
		2250
		2251	1
2133	}	2252	}
2134		2253
2135	# customize the map for a given player, i.e.	2254	# customize the map for a given player, i.e.
2136	# return the _real_ map. used by e.g. per-player	2255	# return the _real_ map. used by e.g. per-player
2137	# maps to change the path to ~playername/mappath	2256	# maps to change the path to ~playername/mappath
…		…
2145	# if $self->per_party;	2264	# if $self->per_party;
2146		2265
2147	$self	2266	$self
2148	}	2267	}
2149		2268
2150	# find and load all maps in the 3x3 area around a map
2151	sub load_neighbours {
2152	my ($map) = @_;
2153
2154	my @neigh; # diagonal neighbours
2155
2156	for (0 .. 3) {
2157	my $neigh = $map->tile_path ($_)
2158	or next;
2159	$neigh = find $neigh, $map
2160	or next;
2161	$neigh->load;
2162
2163	push @neigh,
2164	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2165	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2166	}
2167
2168	for (grep defined $_->[0], @neigh) {
2169	my ($path, $origin) = @$_;
2170	my $neigh = find $path, $origin
2171	or next;
2172	$neigh->load;
2173	}
2174	}
2175
2176	sub find_sync {	2269	sub find_sync {
2177	my ($path, $origin) = @_;	2270	my ($path, $origin) = @_;
2178		2271
2179	cf::sync_job { find $path, $origin }	2272	# it's a bug to call this from the main context
		2273	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
		2274	if $Coro::current == $Coro::main;
		2275
		2276	find $path, $origin
2180	}	2277	}
2181		2278
2182	sub do_load_sync {	2279	sub do_load_sync {
2183	my ($map) = @_;	2280	my ($map) = @_;
2184		2281
		2282	# it's a bug to call this from the main context
2185	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2283	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2186	if $Coro::current == $Coro::main;	2284	if $Coro::current == $Coro::main;
2187		2285
2188	cf::sync_job { $map->load };	2286	$map->load;
2189	}	2287	}
2190		2288
2191	our %MAP_PREFETCH;	2289	our %MAP_PREFETCH;
2192	our $MAP_PREFETCHER = undef;	2290	our $MAP_PREFETCHER = undef;
2193		2291
2194	sub find_async {	2292	sub find_async {
2195	my ($path, $origin, $load) = @_;	2293	my ($path, $origin, $load) = @_;
2196		2294
2197	$path = normalise $path, $origin && $origin->{path};	2295	$path = normalise $path, $origin;
2198		2296
2199	if (my $map = $cf::MAP{$path}) {	2297	if (my $map = $cf::MAP{$path}) {
2200	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2298	return $map if !$load || $map->linkable;
2201	}	2299	}
2202		2300
2203	$MAP_PREFETCH{$path} |= $load;	2301	$MAP_PREFETCH{$path} |= $load;
2204		2302
2205	$MAP_PREFETCHER ||= cf::async {	2303	$MAP_PREFETCHER ||= cf::async {
…		…
2264	sub swap_out {	2362	sub swap_out {
2265	my ($self) = @_;	2363	my ($self) = @_;
2266		2364
2267	my $lock = cf::lock_acquire "map_data:$self->{path}";	2365	my $lock = cf::lock_acquire "map_data:$self->{path}";
2268		2366
2269	return if $self->in_memory != cf::MAP_ACTIVE;	2367	return if !$self->linkable;
2270	return if $self->{deny_save};	2368	return if $self->{deny_save};
2271	return if $self->players;	2369	return if $self->players;
2272		2370
2273	# first deactivate the map and "unlink" it from the core	2371	# first deactivate the map and "unlink" it from the core
2274	$self->deactivate;	2372	$self->deactivate;
2275	$_->clear_links_to ($self) for values %cf::MAP;	2373	$_->clear_links_to ($self) for values %cf::MAP;
2276	$self->in_memory (cf::MAP_SWAPPED);	2374	$self->state (cf::MAP_SWAPPED);
2277		2375
2278	# then atomically save	2376	# then atomically save
2279	$self->_save;	2377	$self->_save;
2280		2378
2281	# then free the map	2379	# then free the map
…		…
2305		2403
2306	my $lock = cf::lock_acquire "map_data:$self->{path}";	2404	my $lock = cf::lock_acquire "map_data:$self->{path}";
2307		2405
2308	return if $self->players;	2406	return if $self->players;
2309		2407
2310	warn "resetting map ", $self->path, "\n";	2408	cf::trace "resetting map ", $self->path, "\n";
2311		2409
2312	$self->in_memory (cf::MAP_SWAPPED);	2410	$self->state (cf::MAP_SWAPPED);
2313		2411
2314	# need to save uniques path	2412	# need to save uniques path
2315	unless ($self->{deny_save}) {	2413	unless ($self->{deny_save}) {
2316	my $uniq = $self->uniq_path; utf8::encode $uniq;	2414	my $uniq = $self->uniq_path; utf8::encode $uniq;
2317		2415
…		…
2339		2437
2340	delete $cf::MAP{$self->path};	2438	delete $cf::MAP{$self->path};
2341		2439
2342	$self->unlink_save;	2440	$self->unlink_save;
2343		2441
2344	bless $self, "cf::map";	2442	bless $self, "cf::map::wrap";
2345	delete $self->{deny_reset};	2443	delete $self->{deny_reset};
2346	$self->{deny_save} = 1;	2444	$self->{deny_save} = 1;
2347	$self->reset_timeout (1);	2445	$self->reset_timeout (1);
2348	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2446	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2349		2447
…		…
2579		2677
2580	Freezes the player and moves him/her to a special map (C<{link}>).	2678	Freezes the player and moves him/her to a special map (C<{link}>).
2581		2679
2582	The player should be reasonably safe there for short amounts of time (e.g.	2680	The player should be reasonably safe there for short amounts of time (e.g.
2583	for loading a map). You I<MUST> call C<leave_link> as soon as possible,	2681	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2584	though, as the palyer cannot control the character while it is on the link	2682	though, as the player cannot control the character while it is on the link
2585	map.	2683	map.
2586		2684
2587	Will never block.	2685	Will never block.
2588		2686
2589	=item $player_object->leave_link ($map, $x, $y)	2687	=item $player_object->leave_link ($map, $x, $y)
…		…
2610	sub cf::object::player::enter_link {	2708	sub cf::object::player::enter_link {
2611	my ($self) = @_;	2709	my ($self) = @_;
2612		2710
2613	$self->deactivate_recursive;	2711	$self->deactivate_recursive;
2614		2712
		2713	++$self->{_link_recursion};
		2714
2615	return if UNIVERSAL::isa $self->map, "ext::map_link";	2715	return if UNIVERSAL::isa $self->map, "ext::map_link";
2616		2716
2617	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2717	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2618	if $self->map && $self->map->{path} ne "{link}";	2718	if $self->map && $self->map->{path} ne "{link}";
2619		2719
…		…
2645	# use -1 or undef as default coordinates, not 0, 0	2745	# use -1 or undef as default coordinates, not 0, 0
2646	($x, $y) = ($map->enter_x, $map->enter_y)	2746	($x, $y) = ($map->enter_x, $map->enter_y)
2647	if $x <= 0 && $y <= 0;	2747	if $x <= 0 && $y <= 0;
2648		2748
2649	$map->load;	2749	$map->load;
2650	$map->load_neighbours;
2651		2750
2652	return unless $self->contr->active;	2751	return unless $self->contr->active;
2653		2752
2654	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2753	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2655	$self->enter_map ($map, $x, $y);	2754	if ($self->enter_map ($map, $x, $y)) {
2656		2755	# entering was successful
		2756	delete $self->{_link_recursion};
2657	# only activate afterwards, to support waiting in hooks	2757	# only activate afterwards, to support waiting in hooks
2658	$self->activate_recursive;	2758	$self->activate_recursive;
2659	}	2759	}
2660		2760
		2761	}
		2762
2661	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2763	=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2662		2764
2663	Moves the player to the given map-path and coordinates by first freezing	2765	Moves the player to the given map-path and coordinates by first freezing
2664	her, loading and preparing them map, calling the provided $check callback	2766	her, loading and preparing them map, calling the provided $check callback
2665	that has to return the map if sucecssful, and then unfreezes the player on	2767	that has to return the map if sucecssful, and then unfreezes the player on
2666	the new (success) or old (failed) map position. In either case, $done will	2768	the new (success) or old (failed) map position. In either case, $done will
…		…
2673		2775
2674	our $GOTOGEN;	2776	our $GOTOGEN;
2675		2777
2676	sub cf::object::player::goto {	2778	sub cf::object::player::goto {
2677	my ($self, $path, $x, $y, $check, $done) = @_;	2779	my ($self, $path, $x, $y, $check, $done) = @_;
		2780
		2781	if ($self->{_link_recursion} >= $MAX_LINKS) {
		2782	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
		2783	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
		2784	($path, $x, $y) = @$EMERGENCY_POSITION;
		2785	}
2678		2786
2679	# do generation counting so two concurrent goto's will be executed in-order	2787	# do generation counting so two concurrent goto's will be executed in-order
2680	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2788	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2681		2789
2682	$self->enter_link;	2790	$self->enter_link;
…		…
2702	($path, $x, $y) = (undef, undef, undef);	2810	($path, $x, $y) = (undef, undef, undef);
2703	}	2811	}
2704	}	2812	}
2705		2813
2706	my $map = eval {	2814	my $map = eval {
2707	my $map = defined $path ? cf::map::find $path : undef;	2815	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2708		2816
2709	if ($map) {	2817	if ($map) {
2710	$map = $map->customise_for ($self);	2818	$map = $map->customise_for ($self);
2711	$map = $check->($map) if $check && $map;	2819	$map = $check->($map, $x, $y, $self) if $check && $map;
2712	} else {	2820	} else {
2713	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);	2821	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2714	}	2822	}
2715		2823
2716	$map	2824	$map
…		…
2724	if ($gen == $self->{_goto_generation}) {	2832	if ($gen == $self->{_goto_generation}) {
2725	delete $self->{_goto_generation};	2833	delete $self->{_goto_generation};
2726	$self->leave_link ($map, $x, $y);	2834	$self->leave_link ($map, $x, $y);
2727	}	2835	}
2728		2836
2729	$done->() if $done;	2837	$done->($self) if $done;
2730	})->prio (1);	2838	})->prio (1);
2731	}	2839	}
2732		2840
2733	=item $player_object->enter_exit ($exit_object)	2841	=item $player_object->enter_exit ($exit_object)
2734		2842
…		…
2802	$Coro::current->{desc} = "enter_exit";	2910	$Coro::current->{desc} = "enter_exit";
2803		2911
2804	unless (eval {	2912	unless (eval {
2805	$self->deactivate_recursive; # just to be sure	2913	$self->deactivate_recursive; # just to be sure
2806		2914
2807	# random map handling
2808	{
2809	my $guard = cf::lock_acquire "exit_prepare:$exit";
2810
2811	prepare_random_map $exit
2812	if $exit->slaying eq "/!";
2813	}
2814
2815	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2915	my $map = cf::map::normalise $exit->slaying, $exit->map;
2816	my $x = $exit->stats->hp;	2916	my $x = $exit->stats->hp;
2817	my $y = $exit->stats->sp;	2917	my $y = $exit->stats->sp;
		2918
		2919	# special map handling
		2920	my $slaying = $exit->slaying;
		2921
		2922	# special map handling
		2923	if ($slaying eq "/!") {
		2924	my $guard = cf::lock_acquire "exit_prepare:$exit";
		2925
		2926	prepare_random_map $exit
		2927	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		2928
		2929	$map = $exit->slaying;
		2930
		2931	} elsif ($slaying eq '!up') {
		2932	$map = $exit->map->tile_path (cf::TILE_UP);
		2933	$x = $exit->x;
		2934	$y = $exit->y;
		2935
		2936	} elsif ($slaying eq '!down') {
		2937	$map = $exit->map->tile_path (cf::TILE_DOWN);
		2938	$x = $exit->x;
		2939	$y = $exit->y;
		2940	}
2818		2941
2819	$self->goto ($map, $x, $y);	2942	$self->goto ($map, $x, $y);
2820		2943
2821	# if exit is damned, update players death & WoR home-position	2944	# if exit is damned, update players death & WoR home-position
2822	$self->contr->savebed ($map, $x, $y)	2945	$self->contr->savebed ($map, $x, $y)
…		…
2827	$self->message ("Something went wrong deep within the deliantra server. "	2950	$self->message ("Something went wrong deep within the deliantra server. "
2828	. "I'll try to bring you back to the map you were before. "	2951	. "I'll try to bring you back to the map you were before. "
2829	. "Please report this to the dungeon master!",	2952	. "Please report this to the dungeon master!",
2830	cf::NDI_UNIQUE | cf::NDI_RED);	2953	cf::NDI_UNIQUE | cf::NDI_RED);
2831		2954
2832	warn "ERROR in enter_exit: $@";	2955	error "ERROR in enter_exit: $@";
2833	$self->leave_link;	2956	$self->leave_link;
2834	}	2957	}
2835	})->prio (1);	2958	})->prio (1);
2836	}	2959	}
2837		2960
…		…
3064	=cut	3187	=cut
3065		3188
3066	sub cf::client::ext_reply($$@) {	3189	sub cf::client::ext_reply($$@) {
3067	my ($self, $id, @msg) = @_;	3190	my ($self, $id, @msg) = @_;
3068		3191
3069	if ($self->extcmd == 2) {	3192	return unless $self->extcmd == 2;
		3193
3070	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));	3194	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3071	} elsif ($self->extcmd == 1) {
3072	#TODO: version 1, remove
3073	unshift @msg, msgtype => "reply", msgid => $id;
3074	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3075	}
3076	}	3195	}
3077		3196
3078	=item $success = $client->query ($flags, "text", \&cb)	3197	=item $success = $client->query ($flags, "text", \&cb)
3079		3198
3080	Queues a query to the client, calling the given callback with	3199	Queues a query to the client, calling the given callback with
…		…
3135	my ($ns, $buf) = @_;	3254	my ($ns, $buf) = @_;
3136		3255
3137	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3256	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3138		3257
3139	if (ref $msg) {	3258	if (ref $msg) {
3140	my ($type, $reply, @payload) =	3259	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3141	"ARRAY" eq ref $msg
3142	? @$msg
3143	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3144		3260
3145	my @reply;	3261	my @reply;
3146		3262
3147	if (my $cb = $EXTICMD{$type}) {	3263	if (my $cb = $EXTICMD{$type}) {
3148	@reply = $cb->($ns, @payload);	3264	@reply = $cb->($ns, @payload);
…		…
3150		3266
3151	$ns->ext_reply ($reply, @reply)	3267	$ns->ext_reply ($reply, @reply)
3152	if $reply;	3268	if $reply;
3153		3269
3154	} else {	3270	} else {
3155	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3271	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3156	}	3272	}
3157		3273
3158	cf::override;	3274	cf::override;
3159	},	3275	},
3160	);	3276	);
…		…
3241	decrease split destroy change_exp value msg lore send_msg)],	3357	decrease split destroy change_exp value msg lore send_msg)],
3242	["cf::object::player" => qw(player)],	3358	["cf::object::player" => qw(player)],
3243	["cf::player" => qw(peaceful send_msg)],	3359	["cf::player" => qw(peaceful send_msg)],
3244	["cf::map" => qw(trigger)],	3360	["cf::map" => qw(trigger)],
3245	) {	3361	) {
3246	no strict 'refs';
3247	my ($pkg, @funs) = @$_;	3362	my ($pkg, @funs) = @$_;
3248	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3363	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3249	for @funs;	3364	for @funs;
3250	}	3365	}
3251		3366
…		…
3290	local @cf::_safe_eval_args = values %vars;	3405	local @cf::_safe_eval_args = values %vars;
3291	@res = wantarray ? eval eval : scalar eval $eval;	3406	@res = wantarray ? eval eval : scalar eval $eval;
3292	}	3407	}
3293		3408
3294	if ($@) {	3409	if ($@) {
3295	warn "$@";	3410	warn "$@",
3296	warn "while executing safe code '$code'\n";	3411	"while executing safe code '$code'\n",
3297	warn "with arguments " . (join " ", %vars) . "\n";	3412	"with arguments " . (join " ", %vars) . "\n";
3298	}	3413	}
3299		3414
3300	wantarray ? @res : $res[0]	3415	wantarray ? @res : $res[0]
3301	}	3416	}
3302		3417
…		…
3336	# for this (global event?)	3451	# for this (global event?)
3337	%ext::player_env::MUSIC_FACE_CACHE = ();	3452	%ext::player_env::MUSIC_FACE_CACHE = ();
3338		3453
3339	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3454	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3340		3455
3341	warn "loading facedata from $path\n";	3456	trace "loading facedata from $path\n";
3342		3457
3343	my $facedata;	3458	my $facedata = decode_storable load_file $path;
3344	0 < aio_load $path, $facedata
3345	or die "$path: $!";
3346
3347	$facedata = Coro::Storable::thaw $facedata;
3348		3459
3349	$facedata->{version} == 2	3460	$facedata->{version} == 2
3350	or cf::cleanup "$path: version mismatch, cannot proceed.";	3461	or cf::cleanup "$path: version mismatch, cannot proceed.";
3351		3462
3352	# patch in the exptable	3463	# patch in the exptable
…		…
3366		3477
3367	cf::face::set_visibility $idx, $info->{visibility};	3478	cf::face::set_visibility $idx, $info->{visibility};
3368	cf::face::set_magicmap $idx, $info->{magicmap};	3479	cf::face::set_magicmap $idx, $info->{magicmap};
3369	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3480	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3370	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3481	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
		3482	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3371		3483
3372	cf::cede_to_tick;	3484	cf::cede_to_tick;
3373	}	3485	}
3374		3486
3375	while (my ($face, $info) = each %$faces) {	3487	while (my ($face, $info) = each %$faces) {
…		…
3380		3492
3381	if (my $smooth = cf::face::find $info->{smooth}) {	3493	if (my $smooth = cf::face::find $info->{smooth}) {
3382	cf::face::set_smooth $idx, $smooth;	3494	cf::face::set_smooth $idx, $smooth;
3383	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3495	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3384	} else {	3496	} else {
3385	warn "smooth face '$info->{smooth}' not found for face '$face'";	3497	error "smooth face '$info->{smooth}' not found for face '$face'";
3386	}	3498	}
3387		3499
3388	cf::cede_to_tick;	3500	cf::cede_to_tick;
3389	}	3501	}
3390	}	3502	}
…		…
3408	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3520	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3409		3521
3410	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};	3522	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3411	cf::face::set_type $idx, $info->{type};	3523	cf::face::set_type $idx, $info->{type};
3412	} else {	3524	} else {
3413	$RESOURCE{$name} = $info;	3525	$RESOURCE{$name} = $info; # unused
3414	}	3526	}
3415		3527
3416	cf::cede_to_tick;	3528	cf::cede_to_tick;
3417	}	3529	}
3418	}	3530	}
3419		3531
3420	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3532	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3421		3533
3422	1	3534	1
3423	}	3535	}
3424
3425	cf::global->attach (on_resource_update => sub {
3426	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3427	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3428
3429	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3430	my $sound = $soundconf->{compat}[$_]
3431	or next;
3432
3433	my $face = cf::face::find "sound/$sound->[1]";
3434	cf::sound::set $sound->[0] => $face;
3435	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3436	}
3437
3438	while (my ($k, $v) = each %{$soundconf->{event}}) {
3439	my $face = cf::face::find "sound/$v";
3440	cf::sound::set $k => $face;
3441	}
3442	}
3443	});
3444		3536
3445	register_exticmd fx_want => sub {	3537	register_exticmd fx_want => sub {
3446	my ($ns, $want) = @_;	3538	my ($ns, $want) = @_;
3447		3539
3448	while (my ($k, $v) = each %$want) {	3540	while (my ($k, $v) = each %$want) {
…		…
3487	sub reload_treasures {	3579	sub reload_treasures {
3488	load_resource_file "$DATADIR/treasures"	3580	load_resource_file "$DATADIR/treasures"
3489	or die "unable to load treasurelists\n";	3581	or die "unable to load treasurelists\n";
3490	}	3582	}
3491		3583
		3584	sub reload_sound {
		3585	trace "loading sound config from $DATADIR/sound\n";
		3586
		3587	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
		3588
		3589	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3590	my $sound = $soundconf->{compat}[$_]
		3591	or next;
		3592
		3593	my $face = cf::face::find "sound/$sound->[1]";
		3594	cf::sound::set $sound->[0] => $face;
		3595	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3596	}
		3597
		3598	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3599	my $face = cf::face::find "sound/$v";
		3600	cf::sound::set $k => $face;
		3601	}
		3602	}
		3603
3492	sub reload_resources {	3604	sub reload_resources {
3493	warn "reloading resource files...\n";	3605	trace "reloading resource files...\n";
3494		3606
		3607	reload_exp_table;
		3608	reload_materials;
3495	reload_facedata;	3609	reload_facedata;
		3610	reload_sound;
3496	reload_archetypes;	3611	reload_archetypes;
3497	reload_regions;	3612	reload_regions;
3498	reload_treasures;	3613	reload_treasures;
3499		3614
3500	warn "finished reloading resource files\n";	3615	trace "finished reloading resource files\n";
3501	}	3616	}
3502		3617
3503	sub reload_config {	3618	sub reload_config {
3504	warn "reloading config file...\n";	3619	trace "reloading config file...\n";
3505		3620
3506	open my $fh, "<:utf8", "$CONFDIR/config"	3621	my $config = load_file "$CONFDIR/config";
3507	or return;	3622	utf8::decode $config;
		3623	*CFG = decode_yaml $config;
3508		3624
3509	local $/;
3510	*CFG = YAML::XS::Load scalar <$fh>;
3511
3512	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3625	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3513		3626
3514	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3627	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3515	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3628	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3516		3629
3517	if (exists $CFG{mlockall}) {	3630	if (exists $CFG{mlockall}) {
…		…
3519	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3632	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3520	and die "WARNING: m(un)lockall failed: $!\n";	3633	and die "WARNING: m(un)lockall failed: $!\n";
3521	};	3634	};
3522	warn $@ if $@;	3635	warn $@ if $@;
3523	}	3636	}
3524
3525	warn "finished reloading resource files\n";
3526	}	3637	}
3527		3638
3528	sub pidfile() {	3639	sub pidfile() {
3529	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3640	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3530	or die "$PIDFILE: $!";	3641	or die "$PIDFILE: $!";
…		…
3543	seek $fh, 0, 0;	3654	seek $fh, 0, 0;
3544	print $fh $$;	3655	print $fh $$;
3545	}	3656	}
3546		3657
3547	sub main_loop {	3658	sub main_loop {
3548	warn "EV::loop starting\n";	3659	trace "EV::loop starting\n";
3549	if (1) {	3660	if (1) {
3550	EV::loop;	3661	EV::loop;
3551	}	3662	}
3552	warn "EV::loop returned\n";	3663	trace "EV::loop returned\n";
3553	goto &main_loop unless $REALLY_UNLOOP;	3664	goto &main_loop unless $REALLY_UNLOOP;
3554	}	3665	}
3555		3666
3556	sub main {	3667	sub main {
3557	cf::init_globals; # initialise logging	3668	cf::init_globals; # initialise logging
3558		3669
3559	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3670	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3560	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3671	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3561	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3672	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3562	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3673	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3563		3674
3564	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3675	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3565		3676
…		…
3573	};	3684	};
3574		3685
3575	evthread_start IO::AIO::poll_fileno;	3686	evthread_start IO::AIO::poll_fileno;
3576		3687
3577	cf::sync_job {	3688	cf::sync_job {
3578	cf::init_experience;	3689	cf::incloader::init ();
		3690
3579	cf::init_anim;	3691	cf::init_anim;
3580	cf::init_attackmess;	3692	cf::init_attackmess;
3581	cf::init_dynamic;	3693	cf::init_dynamic;
3582		3694
3583	cf::load_settings;	3695	cf::load_settings;
3584	cf::load_materials;
3585		3696
3586	reload_resources;	3697	reload_resources;
3587	reload_config;	3698	reload_config;
3588	db_init;	3699	db_init;
3589		3700
…		…
3601		3712
3602	# no (long-running) fork's whatsoever before this point(!)	3713	# no (long-running) fork's whatsoever before this point(!)
3603	use POSIX ();	3714	use POSIX ();
3604	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3715	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3605		3716
3606	(pop @POST_INIT)->(0) while @POST_INIT;	3717	cf::_post_init 0;
3607	};	3718	};
3608		3719
3609	cf::object::thawer::errors_are_fatal 0;	3720	cf::object::thawer::errors_are_fatal 0;
3610	warn "parse errors in files are no longer fatal from this point on.\n";	3721	info "parse errors in files are no longer fatal from this point on.\n";
3611		3722
		3723	AE::postpone {
		3724	undef &main; # free gobs of memory :)
		3725	};
		3726
3612	main_loop;	3727	goto &main_loop;
3613	}	3728	}
3614		3729
3615	#############################################################################	3730	#############################################################################
3616	# initialisation and cleanup	3731	# initialisation and cleanup
3617		3732
…		…
3656	or return;	3771	or return;
3657		3772
3658	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3773	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3659	and return;	3774	and return;
3660		3775
3661	warn sprintf "runtime file written (%gs).\n", AE::time - $t0;	3776	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3662		3777
3663	1	3778	1
3664	}	3779	}
3665		3780
3666	our $uuid_lock;	3781	our $uuid_lock;
…		…
3678	or return;	3793	or return;
3679		3794
3680	my $value = uuid_seq uuid_cur;	3795	my $value = uuid_seq uuid_cur;
3681		3796
3682	unless ($value) {	3797	unless ($value) {
3683	warn "cowardly refusing to write zero uuid value!\n";	3798	info "cowardly refusing to write zero uuid value!\n";
3684	return;	3799	return;
3685	}	3800	}
3686		3801
3687	my $value = uuid_str $value + $uuid_skip;	3802	my $value = uuid_str $value + $uuid_skip;
3688	$uuid_skip = 0;	3803	$uuid_skip = 0;
…		…
3698	or return;	3813	or return;
3699		3814
3700	aio_rename "$uuid~", $uuid	3815	aio_rename "$uuid~", $uuid
3701	and return;	3816	and return;
3702		3817
3703	warn "uuid file written ($value).\n";	3818	trace "uuid file written ($value).\n";
3704		3819
3705	1	3820	1
3706		3821
3707	}	3822	}
3708		3823
…		…
3714	}	3829	}
3715		3830
3716	sub emergency_save() {	3831	sub emergency_save() {
3717	my $freeze_guard = cf::freeze_mainloop;	3832	my $freeze_guard = cf::freeze_mainloop;
3718		3833
3719	warn "emergency_perl_save: enter\n";	3834	info "emergency_perl_save: enter\n";
		3835
		3836	# this is a trade-off: we want to be very quick here, so
		3837	# save all maps without fsync, and later call a global sync
		3838	# (which in turn might be very very slow)
		3839	local $USE_FSYNC = 0;
3720		3840
3721	cf::sync_job {	3841	cf::sync_job {
3722	# this is a trade-off: we want to be very quick here, so	3842	cf::write_runtime_sync; # external watchdog should not bark
3723	# save all maps without fsync, and later call a global sync
3724	# (which in turn might be very very slow)
3725	local $USE_FSYNC = 0;
3726		3843
3727	# use a peculiar iteration method to avoid tripping on perl	3844	# use a peculiar iteration method to avoid tripping on perl
3728	# refcount bugs in for. also avoids problems with players	3845	# refcount bugs in for. also avoids problems with players
3729	# and maps saved/destroyed asynchronously.	3846	# and maps saved/destroyed asynchronously.
3730	warn "emergency_perl_save: begin player save\n";	3847	info "emergency_perl_save: begin player save\n";
3731	for my $login (keys %cf::PLAYER) {	3848	for my $login (keys %cf::PLAYER) {
3732	my $pl = $cf::PLAYER{$login} or next;	3849	my $pl = $cf::PLAYER{$login} or next;
3733	$pl->valid or next;	3850	$pl->valid or next;
3734	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3851	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3735	$pl->save;	3852	$pl->save;
3736	}	3853	}
3737	warn "emergency_perl_save: end player save\n";	3854	info "emergency_perl_save: end player save\n";
3738		3855
		3856	cf::write_runtime_sync; # external watchdog should not bark
		3857
3739	warn "emergency_perl_save: begin map save\n";	3858	info "emergency_perl_save: begin map save\n";
3740	for my $path (keys %cf::MAP) {	3859	for my $path (keys %cf::MAP) {
3741	my $map = $cf::MAP{$path} or next;	3860	my $map = $cf::MAP{$path} or next;
3742	$map->valid or next;	3861	$map->valid or next;
3743	$map->save;	3862	$map->save;
3744	}	3863	}
3745	warn "emergency_perl_save: end map save\n";	3864	info "emergency_perl_save: end map save\n";
3746		3865
		3866	cf::write_runtime_sync; # external watchdog should not bark
		3867
3747	warn "emergency_perl_save: begin database checkpoint\n";	3868	info "emergency_perl_save: begin database checkpoint\n";
3748	BDB::db_env_txn_checkpoint $DB_ENV;	3869	BDB::db_env_txn_checkpoint $DB_ENV;
3749	warn "emergency_perl_save: end database checkpoint\n";	3870	info "emergency_perl_save: end database checkpoint\n";
3750		3871
3751	warn "emergency_perl_save: begin write uuid\n";	3872	info "emergency_perl_save: begin write uuid\n";
3752	write_uuid_sync 1;	3873	write_uuid_sync 1;
3753	warn "emergency_perl_save: end write uuid\n";	3874	info "emergency_perl_save: end write uuid\n";
		3875
		3876	cf::write_runtime_sync; # external watchdog should not bark
		3877
		3878	trace "emergency_perl_save: syncing database to disk";
		3879	BDB::db_env_txn_checkpoint $DB_ENV;
		3880
		3881	info "emergency_perl_save: starting sync\n";
		3882	IO::AIO::aio_sync sub {
		3883	info "emergency_perl_save: finished sync\n";
		3884	};
		3885
		3886	cf::write_runtime_sync; # external watchdog should not bark
		3887
		3888	trace "emergency_perl_save: flushing outstanding aio requests";
		3889	while (IO::AIO::nreqs || BDB::nreqs) {
		3890	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
		3891	}
		3892
		3893	cf::write_runtime_sync; # external watchdog should not bark
3754	};	3894	};
3755		3895
3756	warn "emergency_perl_save: starting sync()\n";
3757	IO::AIO::aio_sync sub {
3758	warn "emergency_perl_save: finished sync()\n";
3759	};
3760
3761	warn "emergency_perl_save: leave\n";	3896	info "emergency_perl_save: leave\n";
3762	}	3897	}
3763		3898
3764	sub post_cleanup {	3899	sub post_cleanup {
3765	my ($make_core) = @_;	3900	my ($make_core) = @_;
3766		3901
		3902	IO::AIO::flush;
		3903
3767	warn Carp::longmess "post_cleanup backtrace"	3904	error Carp::longmess "post_cleanup backtrace"
3768	if $make_core;	3905	if $make_core;
3769		3906
3770	my $fh = pidfile;	3907	my $fh = pidfile;
3771	unlink $PIDFILE if <$fh> == $$;	3908	unlink $PIDFILE if <$fh> == $$;
3772	}	3909	}
…		…
3796	}	3933	}
3797	}	3934	}
3798		3935
3799	sub do_reload_perl() {	3936	sub do_reload_perl() {
3800	# can/must only be called in main	3937	# can/must only be called in main
3801	if (in_main) {	3938	unless (in_main) {
3802	warn "can only reload from main coroutine";	3939	error "can only reload from main coroutine";
3803	return;	3940	return;
3804	}	3941	}
3805		3942
3806	return if $RELOAD++;	3943	return if $RELOAD++;
3807		3944
3808	my $t1 = AE::time;	3945	my $t1 = AE::time;
3809		3946
3810	while ($RELOAD) {	3947	while ($RELOAD) {
3811	warn "reloading...";	3948	cf::get_slot 0.1, -1, "reload_perl";
		3949	info "perl_reload: reloading...";
3812		3950
3813	warn "entering sync_job";	3951	trace "perl_reload: entering sync_job";
3814		3952
3815	cf::sync_job {	3953	cf::sync_job {
3816	cf::write_runtime_sync; # external watchdog should not bark
3817	cf::emergency_save;	3954	#cf::emergency_save;
3818	cf::write_runtime_sync; # external watchdog should not bark
3819		3955
3820	warn "syncing database to disk";
3821	BDB::db_env_txn_checkpoint $DB_ENV;
3822
3823	# if anything goes wrong in here, we should simply crash as we already saved
3824
3825	warn "flushing outstanding aio requests";
3826	while (IO::AIO::nreqs || BDB::nreqs) {
3827	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3828	}
3829
3830	warn "cancelling all extension coros";	3956	trace "perl_reload: cancelling all extension coros";
3831	$_->cancel for values %EXT_CORO;	3957	$_->cancel for values %EXT_CORO;
3832	%EXT_CORO = ();	3958	%EXT_CORO = ();
3833		3959
3834	warn "removing commands";	3960	trace "perl_reload: removing commands";
3835	%COMMAND = ();	3961	%COMMAND = ();
3836		3962
3837	warn "removing ext/exti commands";	3963	trace "perl_reload: removing ext/exti commands";
3838	%EXTCMD = ();	3964	%EXTCMD = ();
3839	%EXTICMD = ();	3965	%EXTICMD = ();
3840		3966
3841	warn "unloading/nuking all extensions";	3967	trace "perl_reload: unloading/nuking all extensions";
3842	for my $pkg (@EXTS) {	3968	for my $pkg (@EXTS) {
3843	warn "... unloading $pkg";	3969	trace "... unloading $pkg";
3844		3970
3845	if (my $cb = $pkg->can ("unload")) {	3971	if (my $cb = $pkg->can ("unload")) {
3846	eval {	3972	eval {
3847	$cb->($pkg);	3973	$cb->($pkg);
3848	1	3974	1
3849	} or warn "$pkg unloaded, but with errors: $@";	3975	} or error "$pkg unloaded, but with errors: $@";
3850	}	3976	}
3851		3977
3852	warn "... clearing $pkg";	3978	trace "... clearing $pkg";
3853	clear_package $pkg;	3979	clear_package $pkg;
3854	}	3980	}
3855		3981
3856	warn "unloading all perl modules loaded from $LIBDIR";	3982	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3857	while (my ($k, $v) = each %INC) {	3983	while (my ($k, $v) = each %INC) {
3858	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	3984	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3859		3985
3860	warn "... unloading $k";	3986	trace "... unloading $k";
3861	delete $INC{$k};	3987	delete $INC{$k};
3862		3988
3863	$k =~ s/\.pm$//;	3989	$k =~ s/\.pm$//;
3864	$k =~ s/\//::/g;	3990	$k =~ s/\//::/g;
3865		3991
…		…
3868	}	3994	}
3869		3995
3870	clear_package $k;	3996	clear_package $k;
3871	}	3997	}
3872		3998
3873	warn "getting rid of safe::, as good as possible";	3999	trace "perl_reload: getting rid of safe::, as good as possible";
3874	clear_package "safe::$_"	4000	clear_package "safe::$_"
3875	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4001	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3876		4002
3877	warn "unloading cf.pm \"a bit\"";	4003	trace "perl_reload: unloading cf.pm \"a bit\"";
3878	delete $INC{"cf.pm"};	4004	delete $INC{"cf.pm"};
3879	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4005	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3880		4006
3881	# don't, removes xs symbols, too,	4007	# don't, removes xs symbols, too,
3882	# and global variables created in xs	4008	# and global variables created in xs
3883	#clear_package __PACKAGE__;	4009	#clear_package __PACKAGE__;
3884		4010
3885	warn "unload completed, starting to reload now";	4011	info "perl_reload: unload completed, starting to reload now";
3886		4012
3887	warn "reloading cf.pm";	4013	trace "perl_reload: reloading cf.pm";
3888	require cf;	4014	require cf;
3889	cf::_connect_to_perl_1;	4015	cf::_connect_to_perl_1;
3890		4016
3891	warn "loading config and database again";	4017	trace "perl_reload: loading config and database again";
3892	cf::reload_config;	4018	cf::reload_config;
3893		4019
3894	warn "loading extensions";	4020	trace "perl_reload: loading extensions";
3895	cf::load_extensions;	4021	cf::load_extensions;
3896		4022
3897	if ($REATTACH_ON_RELOAD) {	4023	if ($REATTACH_ON_RELOAD) {
3898	warn "reattaching attachments to objects/players";	4024	trace "perl_reload: reattaching attachments to objects/players";
3899	_global_reattach; # objects, sockets	4025	_global_reattach; # objects, sockets
3900	warn "reattaching attachments to maps";	4026	trace "perl_reload: reattaching attachments to maps";
3901	reattach $_ for values %MAP;	4027	reattach $_ for values %MAP;
3902	warn "reattaching attachments to players";	4028	trace "perl_reload: reattaching attachments to players";
3903	reattach $_ for values %PLAYER;	4029	reattach $_ for values %PLAYER;
3904	}	4030	}
3905		4031
3906	warn "running post_init jobs";	4032	cf::_post_init 1;
3907	(pop @POST_INIT)->(1) while @POST_INIT;
3908		4033
3909	warn "leaving sync_job";	4034	trace "perl_reload: leaving sync_job";
3910		4035
3911	1	4036	1
3912	} or do {	4037	} or do {
3913	warn $@;	4038	error $@;
3914	cf::cleanup "error while reloading, exiting.";	4039	cf::cleanup "perl_reload: error, exiting.";
3915	};	4040	};
3916		4041
3917	warn "reloaded";
3918	--$RELOAD;	4042	--$RELOAD;
3919	}	4043	}
3920		4044
3921	$t1 = AE::time - $t1;	4045	$t1 = AE::time - $t1;
3922	warn "reload completed in ${t1}s\n";	4046	info "perl_reload: completed in ${t1}s\n";
3923	};	4047	};
3924		4048
3925	our $RELOAD_WATCHER; # used only during reload	4049	our $RELOAD_WATCHER; # used only during reload
3926		4050
3927	sub reload_perl() {	4051	sub reload_perl() {
…		…
3948	reload_perl;	4072	reload_perl;
3949	};	4073	};
3950	}	4074	}
3951	};	4075	};
3952		4076
3953	unshift @INC, $LIBDIR;	4077	#############################################################################
3954		4078
3955	my $bug_warning = 0;	4079	my $bug_warning = 0;
3956		4080
3957	our @WAIT_FOR_TICK;
3958	our @WAIT_FOR_TICK_BEGIN;
3959
3960	sub wait_for_tick {	4081	sub wait_for_tick() {
3961	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4082	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3962		4083
3963	my $signal = new Coro::Signal;	4084	$WAIT_FOR_TICK->wait;
3964	push @WAIT_FOR_TICK, $signal;
3965	$signal->wait;
3966	}	4085	}
3967		4086
3968	sub wait_for_tick_begin {	4087	sub wait_for_tick_begin() {
3969	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4088	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3970		4089
3971	my $signal = new Coro::Signal;	4090	my $signal = new Coro::Signal;
3972	push @WAIT_FOR_TICK_BEGIN, $signal;	4091	push @WAIT_FOR_TICK_BEGIN, $signal;
3973	$signal->wait;	4092	$signal->wait;
3974	}	4093	}
…		…
3978	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4097	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3979	unless ++$bug_warning > 10;	4098	unless ++$bug_warning > 10;
3980	return;	4099	return;
3981	}	4100	}
3982		4101
3983	cf::server_tick; # one server iteration	4102	cf::one_tick; # one server iteration
3984		4103
3985	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#	4104	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3986		4105
3987	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4106	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3988	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4107	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3989	Coro::async_pool {	4108	Coro::async_pool {
3990	$Coro::current->{desc} = "runtime saver";	4109	$Coro::current->{desc} = "runtime saver";
3991	write_runtime_sync	4110	write_runtime_sync
3992	or warn "ERROR: unable to write runtime file: $!";	4111	or error "ERROR: unable to write runtime file: $!";
3993	};	4112	};
3994	}	4113	}
3995		4114
3996	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4115	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3997	$sig->send;	4116	$sig->send;
3998	}	4117	}
3999	while (my $sig = shift @WAIT_FOR_TICK) {	4118	$WAIT_FOR_TICK->broadcast;
4000	$sig->send;
4001	}
4002		4119
4003	$LOAD = ($NOW - $TICK_START) / $TICK;	4120	$LOAD = ($NOW - $TICK_START) / $TICK;
4004	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4121	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4005		4122
4006	if (0) {	4123	if (0) {
4007	if ($NEXT_TICK) {	4124	if ($NEXT_TICK) {
4008	my $jitter = $TICK_START - $NEXT_TICK;	4125	my $jitter = $TICK_START - $NEXT_TICK;
4009	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4126	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
4010	warn "jitter $JITTER\n";#d#	4127	debug "jitter $JITTER\n";#d#
4011	}	4128	}
4012	}	4129	}
4013	}	4130	}
4014		4131
4015	{	4132	{
4016	# configure BDB	4133	# configure BDB
4017		4134
4018	BDB::min_parallel 16;	4135	BDB::min_parallel 16;
4019	BDB::max_poll_reqs $TICK * 0.1;	4136	BDB::max_poll_reqs $TICK * 0.1;
4020	$AnyEvent::BDB::WATCHER->priority (1);	4137	#$AnyEvent::BDB::WATCHER->priority (1);
4021		4138
4022	unless ($DB_ENV) {	4139	unless ($DB_ENV) {
4023	$DB_ENV = BDB::db_env_create;	4140	$DB_ENV = BDB::db_env_create;
4024	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4141	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4025	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4142	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
4060	IO::AIO::min_parallel 8;	4177	IO::AIO::min_parallel 8;
4061	IO::AIO::max_poll_time $TICK * 0.1;	4178	IO::AIO::max_poll_time $TICK * 0.1;
4062	undef $AnyEvent::AIO::WATCHER;	4179	undef $AnyEvent::AIO::WATCHER;
4063	}	4180	}
4064		4181
4065	my $_log_backtrace;	4182	our $_log_backtrace;
		4183	our $_log_backtrace_last;
4066		4184
4067	sub _log_backtrace {	4185	sub _log_backtrace {
4068	my ($msg, @addr) = @_;	4186	my ($msg, @addr) = @_;
4069		4187
4070	$msg =~ s/\n//;	4188	$msg =~ s/\n$//;
4071		4189
		4190	if ($_log_backtrace_last eq $msg) {
		4191	LOG llevInfo, "[ABT] $msg\n";
		4192	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4072	# limit the # of concurrent backtraces	4193	# limit the # of concurrent backtraces
4073	if ($_log_backtrace < 2) {	4194	} elsif ($_log_backtrace < 2) {
		4195	$_log_backtrace_last = $msg;
4074	++$_log_backtrace;	4196	++$_log_backtrace;
4075	my $perl_bt = Carp::longmess $msg;	4197	my $perl_bt = Carp::longmess $msg;
4076	async {	4198	async {
4077	$Coro::current->{desc} = "abt $msg";	4199	$Coro::current->{desc} = "abt $msg";
4078		4200
…		…
4098	LOG llevInfo, "[ABT] $_\n" for @bt;	4220	LOG llevInfo, "[ABT] $_\n" for @bt;
4099	--$_log_backtrace;	4221	--$_log_backtrace;
4100	};	4222	};
4101	} else {	4223	} else {
4102	LOG llevInfo, "[ABT] $msg\n";	4224	LOG llevInfo, "[ABT] $msg\n";
4103	LOG llevInfo, "[ABT] [suppressed]\n";	4225	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4104	}	4226	}
4105	}	4227	}
4106		4228
4107	# load additional modules	4229	# load additional modules
4108	require "cf/$_.pm" for @EXTRA_MODULES;	4230	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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