[ViewVC] Diff of: cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.543 by root, Wed May 5 23:23:29 2010 UTC vs.
Revision 1.590 by root, Sun Nov 4 02:20:11 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.
10	#	10	#
11	# This program is distributed in the hope that it will be useful,	11	# This program is distributed in the hope that it will be useful,
12	# but WITHOUT ANY WARRANTY; without even the implied warranty of	12	# but WITHOUT ANY WARRANTY; without even the implied warranty of
13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14	# GNU General Public License for more details.	14	# GNU General Public License for more details.
15	#	15	#
16	# You should have received a copy of the Affero GNU General Public License	16	# You should have received a copy of the Affero GNU General Public License
17	# and the GNU General Public License along with this program. If not, see	17	# and the GNU General Public License along with this program. If not, see
18	# <http://www.gnu.org/licenses/>.	18	# <http://www.gnu.org/licenses/>.
19	#	19	#
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
32	use Safe;	32	use Safe;
33	use Safe::Hole;	33	use Safe::Hole;
34	use Storable ();	34	use Storable ();
35	use Carp ();	35	use Carp ();
36		36
37	use Guard ();	37	use AnyEvent ();
		38	use AnyEvent::IO ();
		39	use AnyEvent::DNS ();
		40
38	use Coro ();	41	use Coro ();
39	use Coro::State;	42	use Coro::State;
40	use Coro::Handle;	43	use Coro::Handle;
41	use Coro::EV;	44	use Coro::EV;
42	use Coro::AnyEvent;	45	use Coro::AnyEvent;
…		…
48	use Coro::AIO;	51	use Coro::AIO;
49	use Coro::BDB 1.6;	52	use Coro::BDB 1.6;
50	use Coro::Storable;	53	use Coro::Storable;
51	use Coro::Util ();	54	use Coro::Util ();
52		55
		56	use Guard ();
53	use JSON::XS 2.01 ();	57	use JSON::XS 2.01 ();
54	use BDB ();	58	use BDB ();
55	use Data::Dumper;	59	use Data::Dumper;
56	use Fcntl;	60	use Fcntl;
57	use YAML::XS ();	61	use YAML::XS ();
…		…
93	our @EVENT;	97	our @EVENT;
94	our @REFLECT; # set by XS	98	our @REFLECT; # set by XS
95	our %REFLECT; # set by us	99	our %REFLECT; # set by us
96		100
97	our $CONFDIR = confdir;	101	our $CONFDIR = confdir;
		102
98	our $DATADIR = datadir;	103	our $DATADIR = datadir;
99	our $LIBDIR = "$DATADIR/ext";	104	our $LIBDIR = "$DATADIR/ext";
100	our $PODDIR = "$DATADIR/pod";	105	our $PODDIR = "$DATADIR/pod";
101	our $MAPDIR = "$DATADIR/" . mapdir;	106	our $MAPDIR = "$DATADIR/" . mapdir;
		107
102	our $LOCALDIR = localdir;	108	our $LOCALDIR = localdir;
103	our $TMPDIR = "$LOCALDIR/" . tmpdir;	109	our $TMPDIR = "$LOCALDIR/" . tmpdir;
104	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	110	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	111	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106	our $RANDOMDIR = "$LOCALDIR/random";	112	our $RANDOMDIR = "$LOCALDIR/random";
107	our $BDBDIR = "$LOCALDIR/db";	113	our $BDBDIR = "$LOCALDIR/db";
108	our $PIDFILE = "$LOCALDIR/pid";	114	our $PIDFILE = "$LOCALDIR/pid";
109	our $RUNTIMEFILE = "$LOCALDIR/runtime";	115	our $RUNTIMEFILE = "$LOCALDIR/runtime";
110		116
111	our %RESOURCE; # unused	117	#our %RESOURCE; # unused
112		118
113	our $OUTPUT_RATE_MIN = 3000;	119	our $OUTPUT_RATE_MIN = 3000;
114	our $OUTPUT_RATE_MAX = 1000000;	120	our $OUTPUT_RATE_MAX = 1000000;
115		121
116	our $MAX_LINKS = 32; # how many chained exits to follow	122	our $MAX_LINKS = 32; # how many chained exits to follow
…		…
127	our $DB_ENV;	133	our $DB_ENV;
128		134
129	our @EXTRA_MODULES = qw(pod match mapscript incloader);	135	our @EXTRA_MODULES = qw(pod match mapscript incloader);
130		136
131	our %CFG;	137	our %CFG;
		138	our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
132		139
133	our $UPTIME; $UPTIME \|\|= time;	140	our $UPTIME; $UPTIME \|\|= time;
134	our $RUNTIME;	141	our $RUNTIME = 0;
		142	our $SERVER_TICK = 0;
135	our $NOW;	143	our $NOW;
136		144
137	our (%PLAYER, %PLAYER_LOADING); # all users	145	our (%PLAYER, %PLAYER_LOADING); # all users
138	our (%MAP, %MAP_LOADING ); # all maps	146	our (%MAP, %MAP_LOADING ); # all maps
139	our $LINK_MAP; # the special {link} map, which is always available	147	our $LINK_MAP; # the special {link} map, which is always available
…		…
148		156
149	our @POST_INIT;	157	our @POST_INIT;
150		158
151	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)	159	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152	our $REALLY_UNLOOP; # never set to true, please :)	160	our $REALLY_UNLOOP; # never set to true, please :)
		161
		162	our $WAIT_FOR_TICK = new Coro::Signal;
		163	our @WAIT_FOR_TICK_BEGIN;
153		164
154	binmode STDOUT;	165	binmode STDOUT;
155	binmode STDERR;	166	binmode STDERR;
156		167
157	# read virtual server time, if available	168	# read virtual server time, if available
…		…
191		202
192	=over 4	203	=over 4
193		204
194	=item $cf::UPTIME	205	=item $cf::UPTIME
195		206
196	The timestamp of the server start (so not actually an uptime).	207	The timestamp of the server start (so not actually an "uptime").
		208
		209	=item $cf::SERVER_TICK
		210
		211	An unsigned integer that starts at zero when the server is started and is
		212	incremented on every tick.
		213
		214	=item $cf::NOW
		215
		216	The (real) time of the last (current) server tick - updated before and
		217	after tick processing, so this is useful only as a rough "what time is it
		218	now" estimate.
		219
		220	=item $cf::TICK
		221
		222	The interval between each server tick, in seconds.
197		223
198	=item $cf::RUNTIME	224	=item $cf::RUNTIME
199		225
200	The time this server has run, starts at 0 and is increased by $cf::TICK on	226	The time this server has run, starts at 0 and is increased by $cf::TICK on
201	every server tick.	227	every server tick.
…		…
207	Various directories - "/etc", read-only install directory, perl-library	233	Various directories - "/etc", read-only install directory, perl-library
208	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	234	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
209	unique-items directory, player file directory, random maps directory and	235	unique-items directory, player file directory, random maps directory and
210	database environment.	236	database environment.
211		237
212	=item $cf::NOW
213
214	The time of the last (current) server tick.
215
216	=item $cf::TICK
217
218	The interval between server ticks, in seconds.
219
220	=item $cf::LOADAVG	238	=item $cf::LOADAVG
221		239
222	The current CPU load on the server (alpha-smoothed), as a value between 0	240	The current CPU load on the server (alpha-smoothed), as a value between 0
223	(none) and 1 (overloaded), indicating how much time is spent on processing	241	(none) and 1 (overloaded), indicating how much time is spent on processing
224	objects per tick. Healthy values are < 0.5.	242	objects per tick. Healthy values are < 0.5.
…		…
233	from wherever your confdir points to.	251	from wherever your confdir points to.
234		252
235	=item cf::wait_for_tick, cf::wait_for_tick_begin	253	=item cf::wait_for_tick, cf::wait_for_tick_begin
236		254
237	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	255	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
238	returns directly I<after> the tick processing (and consequently, can only wake one process	256	returns directly I<after> the tick processing (and consequently, can only wake one thread
239	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	257	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
		258
		259	Note that cf::Wait_for_tick will immediately return when the server is not
		260	ticking, making it suitable for small pauses in threads that need to run
		261	when the server is paused. If that is not applicable (i.e. you I<really>
		262	want to wait, use C<$cf::WAIT_FOR_TICK>).
		263
		264	=item $cf::WAIT_FOR_TICK
		265
		266	Note that C<cf::wait_for_tick> is probably the correct thing to use. This
		267	variable contains a L<Coro::Signal> that is broadcats after every server
		268	tick. Calling C<< ->wait >> on it will suspend the caller until after the
		269	next server tick.
		270
		271	=cut
		272
		273	sub wait_for_tick();
		274	sub wait_for_tick_begin();
240		275
241	=item @cf::INVOKE_RESULTS	276	=item @cf::INVOKE_RESULTS
242		277
243	This array contains the results of the last C<invoke ()> call. When	278	This array contains the results of the last C<invoke ()> call. When
244	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of	279	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
…		…
305	)) {	340	)) {
306	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	341	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
307	}	342	}
308		343
309	$EV::DIED = sub {	344	$EV::DIED = sub {
310	Carp::cluck "error in event callback: @_";	345	warn "error in event callback: $@";
311	};	346	};
		347
		348	#############################################################################
		349
		350	sub fork_call(&@);
		351	sub get_slot($;$$);
312		352
313	#############################################################################	353	#############################################################################
314		354
315	=head2 UTILITY FUNCTIONS	355	=head2 UTILITY FUNCTIONS
316		356
…		…
337	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	377	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
338	$d	378	$d
339	} \|\| "[unable to dump $_[0]: '$@']";	379	} \|\| "[unable to dump $_[0]: '$@']";
340	}	380	}
341		381
		382	=item $scalar = cf::load_file $path
		383
		384	Loads the given file from path and returns its contents. Croaks on error
		385	and can block.
		386
		387	=cut
		388
		389	sub load_file($) {
		390	0 <= aio_load $_[0], my $data
		391	or Carp::croak "$_[0]: $!";
		392
		393	$data
		394	}
		395
		396	=item $success = cf::replace_file $path, $data, $sync
		397
		398	Atomically replaces the file at the given $path with new $data, and
		399	optionally $sync the data to disk before replacing the file.
		400
		401	=cut
		402
		403	sub replace_file($$;$) {
		404	my ($path, $data, $sync) = @_;
		405
		406	my $lock = cf::lock_acquire ("replace_file:$path");
		407
		408	my $fh = aio_open "$path~", Fcntl::O_WRONLY \| Fcntl::O_CREAT \| Fcntl::O_TRUNC, 0644
		409	or return;
		410
		411	$data = $data->() if ref $data;
		412
		413	length $data == aio_write $fh, 0, (length $data), $data, 0
		414	or return;
		415
		416	!$sync
		417	or !aio_fsync $fh
		418	or return;
		419
		420	aio_close $fh
		421	and return;
		422
		423	aio_rename "$path~", $path
		424	and return;
		425
		426	if ($sync) {
		427	$path =~ s%/[^/]*$%%;
		428	aio_pathsync $path;
		429	}
		430
		431	1
		432	}
		433
342	=item $ref = cf::decode_json $json	434	=item $ref = cf::decode_json $json
343		435
344	Converts a JSON string into the corresponding perl data structure.	436	Converts a JSON string into the corresponding perl data structure.
345		437
346	=item $json = cf::encode_json $ref	438	=item $json = cf::encode_json $ref
…		…
352	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	444	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
353		445
354	sub encode_json($) { $json_coder->encode ($_[0]) }	446	sub encode_json($) { $json_coder->encode ($_[0]) }
355	sub decode_json($) { $json_coder->decode ($_[0]) }	447	sub decode_json($) { $json_coder->decode ($_[0]) }
356		448
		449	=item $ref = cf::decode_storable $scalar
		450
		451	Same as Coro::Storable::thaw, so blocks.
		452
		453	=cut
		454
		455	BEGIN { *decode_storable = \&Coro::Storable::thaw }
		456
		457	=item $ref = cf::decode_yaml $scalar
		458
		459	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
		460
		461	=cut
		462
		463	sub decode_yaml($) {
		464	fork_call { YAML::XS::Load $_[0] } @_
		465	}
		466
		467	=item $scalar = cf::unlzf $scalar
		468
		469	Same as Compress::LZF::compress, but takes server ticks into account, so
		470	blocks.
		471
		472	=cut
		473
		474	sub unlzf($) {
		475	# we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
		476	cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
		477	Compress::LZF::decompress $_[0]
		478	}
		479
357	=item cf::post_init { BLOCK }	480	=item cf::post_init { BLOCK }
358		481
359	Execute the given codeblock, I<after> all extensions have been (re-)loaded,	482	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
360	but I<before> the server starts ticking again.	483	but I<before> the server starts ticking again.
361		484
362	The cdoeblock will have a single boolean argument to indicate whether this	485	The codeblock will have a single boolean argument to indicate whether this
363	is a reload or not.	486	is a reload or not.
364		487
365	=cut	488	=cut
366		489
367	sub post_init(&) {	490	sub post_init(&) {
368	push @POST_INIT, shift;	491	push @POST_INIT, shift;
		492	}
		493
		494	sub _post_init {
		495	trace "running post_init jobs";
		496
		497	# run them in parallel...
		498
		499	my @join;
		500
		501	while () {
		502	push @join, map &Coro::async ($_, 0), @POST_INIT;
		503	@POST_INIT = ();
		504
		505	@join or last;
		506
		507	(pop @join)->join;
		508	}
369	}	509	}
370		510
371	=item cf::lock_wait $string	511	=item cf::lock_wait $string
372		512
373	Wait until the given lock is available. See cf::lock_acquire.	513	Wait until the given lock is available. See cf::lock_acquire.
…		…
426	EV::periodic $start, $interval, 0, $cb	566	EV::periodic $start, $interval, 0, $cb
427	}	567	}
428		568
429	=item cf::get_slot $time[, $priority[, $name]]	569	=item cf::get_slot $time[, $priority[, $name]]
430		570
431	Allocate $time seconds of blocking CPU time at priority C<$priority>:	571	Allocate $time seconds of blocking CPU time at priority C<$priority>
432	This call blocks and returns only when you have at least C<$time> seconds	572	(default: 0): This call blocks and returns only when you have at least
433	of cpu time till the next tick. The slot is only valid till the next cede.	573	C<$time> seconds of cpu time till the next tick. The slot is only valid
		574	till the next cede.
		575
		576	Background jobs should use a priority les than zero, interactive jobs
		577	should use 100 or more.
434		578
435	The optional C<$name> can be used to identify the job to run. It might be	579	The optional C<$name> can be used to identify the job to run. It might be
436	used for statistical purposes and should identify the same time-class.	580	used for statistical purposes and should identify the same time-class.
437		581
438	Useful for short background jobs.	582	Useful for short background jobs.
…		…
467	}	611	}
468	}	612	}
469		613
470	if (@SLOT_QUEUE) {	614	if (@SLOT_QUEUE) {
471	# we do not use wait_for_tick() as it returns immediately when tick is inactive	615	# we do not use wait_for_tick() as it returns immediately when tick is inactive
472	push @cf::WAIT_FOR_TICK, $signal;	616	$WAIT_FOR_TICK->wait;
473	$signal->wait;
474	} else {	617	} else {
475	$busy = 0;	618	$busy = 0;
476	Coro::schedule;	619	Coro::schedule;
477	}	620	}
478	}	621	}
…		…
578	$EXT_CORO{$coro+0} = $coro;	721	$EXT_CORO{$coro+0} = $coro;
579		722
580	$coro	723	$coro
581	}	724	}
582		725
583	=item fork_call { }, $args	726	=item fork_call { }, @args
584		727
585	Executes the given code block with the given arguments in a seperate	728	Executes the given code block with the given arguments in a seperate
586	process, returning the results. Everything must be serialisable with	729	process, returning the results. Everything must be serialisable with
587	Coro::Storable. May, of course, block. Note that the executed sub may	730	Coro::Storable. May, of course, block. Note that the executed sub may
588	never block itself or use any form of event handling.	731	never block itself or use any form of event handling.
589		732
590	=cut	733	=cut
591		734
		735	sub post_fork {
		736	reset_signals;
		737	}
		738
592	sub fork_call(&@) {	739	sub fork_call(&@) {
593	my ($cb, @args) = @_;	740	my ($cb, @args) = @_;
594		741
595	# we seemingly have to make a local copy of the whole thing,	742	# we seemingly have to make a local copy of the whole thing,
596	# otherwise perl prematurely frees the stuff :/	743	# otherwise perl prematurely frees the stuff :/
597	# TODO: investigate and fix (likely this will be rather laborious)	744	# TODO: investigate and fix (likely this will be rather laborious)
598		745
599	my @res = Coro::Util::fork_eval {	746	my @res = Coro::Util::fork_eval {
600	reset_signals;	747	cf::post_fork;
601	&$cb	748	&$cb
602	}, @args;	749	} @args;
603		750
604	wantarray ? @res : $res[-1]	751	wantarray ? @res : $res[-1]
605	}	752	}
606		753
607	sub objinfo {	754	sub objinfo {
…		…
729		876
730	my @data;	877	my @data;
731	my $md5;	878	my $md5;
732		879
733	for (0 .. $#$src) {	880	for (0 .. $#$src) {
734	0 <= aio_load $src->[$_], $data[$_]	881	$data[$_] = load_file $src->[$_];
735	or Carp::croak "$src->[$_]: $!";
736	}	882	}
737		883
738	# if processing is expensive, check	884	# if processing is expensive, check
739	# checksum first	885	# checksum first
740	if (1) {	886	if (1) {
…		…
1358	my ($pl, $buf) = @_;	1504	my ($pl, $buf) = @_;
1359		1505
1360	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1506	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1361		1507
1362	if (ref $msg) {	1508	if (ref $msg) {
1363	my ($type, $reply, @payload) =	1509	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1364	"ARRAY" eq ref $msg
1365	? @$msg
1366	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1367		1510
1368	my @reply;	1511	my @reply;
1369		1512
1370	if (my $cb = $EXTCMD{$type}) {	1513	if (my $cb = $EXTCMD{$type}) {
1371	@reply = $cb->($pl, @payload);	1514	@reply = $cb->($pl, @payload);
…		…
1393	};	1536	};
1394		1537
1395	$grp	1538	$grp
1396	}	1539	}
1397		1540
		1541	sub _ext_cfg_reg($$$$) {
		1542	my ($rvar, $varname, $cfgname, $default) = @_;
		1543
		1544	$cfgname = lc $varname
		1545	unless length $cfgname;
		1546
		1547	$EXT_CFG{$cfgname} = [$rvar, $default];
		1548
		1549	$$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
		1550	}
		1551
1398	sub load_extensions {	1552	sub load_extensions {
1399	info "loading extensions...";	1553	info "loading extensions...";
		1554
		1555	%EXT_CFG = ();
1400		1556
1401	cf::sync_job {	1557	cf::sync_job {
1402	my %todo;	1558	my %todo;
1403		1559
1404	for my $path (<$LIBDIR/*.ext>) {	1560	for my $path (<$LIBDIR/*.ext>) {
…		…
1447	unless exists $done{$_};	1603	unless exists $done{$_};
1448	}	1604	}
1449		1605
1450	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1606	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1451		1607
		1608	my $source = $v->{source};
		1609
		1610	# support "CONF varname :confname = default" pseudo-statements
		1611	$source =~ s{
		1612	^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
		1613	}{
		1614	"our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
		1615	}gmxe;
		1616
1452	my $active = eval $v->{source};	1617	my $active = eval $source;
1453		1618
1454	if (length $@) {	1619	if (length $@) {
1455	error "$v->{path}: $@\n";	1620	error "$v->{path}: $@\n";
1456		1621
1457	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1622	cf::cleanup "mandatory extension '$k' failed to load, exiting."
…		…
1474		1639
1475	while (my ($k, $v) = each %todo) {	1640	while (my ($k, $v) = each %todo) {
1476	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1641	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1477	if exists $v->{meta}{mandatory};	1642	if exists $v->{meta}{mandatory};
1478	}	1643	}
		1644
		1645	last;
1479	}	1646	}
1480	}	1647	}
1481	};	1648	};
1482	}	1649	}
1483		1650
…		…
1641	my $name = $pl->ob->name;	1808	my $name = $pl->ob->name;
1642		1809
1643	$pl->{deny_save} = 1;	1810	$pl->{deny_save} = 1;
1644	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1811	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1645		1812
1646	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1813	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1647	$pl->deactivate;	1814	$pl->deactivate;
		1815
1648	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1816	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1649	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1817	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1818	ext::highscore::check ($pl->ob);
		1819
1650	$pl->ns->destroy if $pl->ns;	1820	$pl->ns->destroy if $pl->ns;
1651		1821
1652	my $path = playerdir $pl;	1822	my $path = playerdir $pl;
1653	my $temp = "$path~$cf::RUNTIME~deleting~";	1823	my $temp = "$path~$cf::RUNTIME~deleting~";
1654	aio_rename $path, $temp;	1824	aio_rename $path, $temp;
…		…
1820	sub generate_random_map {	1990	sub generate_random_map {
1821	my ($self, $rmp) = @_;	1991	my ($self, $rmp) = @_;
1822		1992
1823	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	1993	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1824		1994
1825	# mit "rum" bekleckern, nicht
1826	$self->_create_random_map (	1995	$self->_create_random_map ($rmp);
1827	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1828	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1829	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1830	$rmp->{exit_on_final_map},
1831	$rmp->{xsize}, $rmp->{ysize},
1832	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1833	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1834	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1835	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1836	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1837	(cf::region::find $rmp->{region}), $rmp->{custom}
1838	)
1839	}	1996	}
1840		1997
1841	=item cf::map->register ($regex, $prio)	1998	=item cf::map->register ($regex, $prio)
1842		1999
1843	Register a handler for the map path matching the given regex at the	2000	Register a handler for the map path matching the given regex at the
…		…
1894	$base =~ s{[^/]+/?$}{};	2051	$base =~ s{[^/]+/?$}{};
1895	$path = "$base/$path";	2052	$path = "$base/$path";
1896	}	2053	}
1897		2054
1898	for ($path) {	2055	for ($path) {
1899	redo if s{//}{/};
1900	redo if s{/\.?/}{/};	2056	redo if s{/\.?/}{/};
1901	redo if s{/[^/]+/\.\./}{/};	2057	redo if s{/[^/]+/\.\./}{/};
1902	}	2058	}
1903		2059
1904	$path	2060	$path
…		…
1922		2078
1923	Carp::cluck "unable to resolve path '$path' (base '$base')";	2079	Carp::cluck "unable to resolve path '$path' (base '$base')";
1924	()	2080	()
1925	}	2081	}
1926		2082
		2083	# may re-bless or do other evil things
1927	sub init {	2084	sub init {
1928	my ($self) = @_;	2085	my ($self) = @_;
1929		2086
1930	$self	2087	$self
1931	}	2088	}
…		…
1996	$self->{load_path} = $path;	2153	$self->{load_path} = $path;
1997		2154
1998	1	2155	1
1999	}	2156	}
2000		2157
		2158	# used to laod the header of an original map
2001	sub load_header_orig {	2159	sub load_header_orig {
2002	my ($self) = @_;	2160	my ($self) = @_;
2003		2161
2004	$self->load_header_from ($self->load_path)	2162	$self->load_header_from ($self->load_path)
2005	}	2163	}
2006		2164
		2165	# used to laod the header of an instantiated map
2007	sub load_header_temp {	2166	sub load_header_temp {
2008	my ($self) = @_;	2167	my ($self) = @_;
2009		2168
2010	$self->load_header_from ($self->save_path)	2169	$self->load_header_from ($self->save_path)
2011	}	2170	}
2012		2171
		2172	# called after loading the header from an instantiated map
2013	sub prepare_temp {	2173	sub prepare_temp {
2014	my ($self) = @_;	2174	my ($self) = @_;
2015		2175
2016	$self->last_access ((delete $self->{last_access})	2176	$self->last_access ((delete $self->{last_access})
2017	\|\| $cf::RUNTIME); #d#	2177	\|\| $cf::RUNTIME); #d#
2018	# safety	2178	# safety
2019	$self->{instantiate_time} = $cf::RUNTIME	2179	$self->{instantiate_time} = $cf::RUNTIME
2020	if $self->{instantiate_time} > $cf::RUNTIME;	2180	if $self->{instantiate_time} > $cf::RUNTIME;
2021	}	2181	}
2022		2182
		2183	# called after loading the header from an original map
2023	sub prepare_orig {	2184	sub prepare_orig {
2024	my ($self) = @_;	2185	my ($self) = @_;
2025		2186
2026	$self->{load_original} = 1;	2187	$self->{load_original} = 1;
2027	$self->{instantiate_time} = $cf::RUNTIME;	2188	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2053	sub find {	2214	sub find {
2054	my ($path, $origin) = @_;	2215	my ($path, $origin) = @_;
2055		2216
2056	cf::cede_to_tick;	2217	cf::cede_to_tick;
2057		2218
2058	$path = normalise $path, $origin && $origin->path;	2219	$path = normalise $path, $origin;
2059		2220
2060	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2221	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2061	my $guard2 = cf::lock_acquire "map_find:$path";	2222	my $guard2 = cf::lock_acquire "map_find:$path";
2062		2223
2063	$cf::MAP{$path} \|\| do {	2224	$cf::MAP{$path} \|\| do {
…		…
2094		2255
2095	{	2256	{
2096	my $guard = cf::lock_acquire "map_data:$path";	2257	my $guard = cf::lock_acquire "map_data:$path";
2097		2258
2098	return unless $self->valid;	2259	return unless $self->valid;
2099	return unless $self->in_memory == cf::MAP_SWAPPED;	2260	return unless $self->state == cf::MAP_SWAPPED;
2100
2101	$self->in_memory (cf::MAP_LOADING);
2102		2261
2103	$self->alloc;	2262	$self->alloc;
2104		2263
2105	$self->pre_load;	2264	$self->pre_load;
2106	cf::cede_to_tick;	2265	cf::cede_to_tick;
2107		2266
		2267	if (exists $self->{load_path}) {
2108	my $f = new_from_file cf::object::thawer $self->{load_path};	2268	my $f = new_from_file cf::object::thawer $self->{load_path};
2109	$f->skip_block;	2269	$f->skip_block;
2110	$self->_load_objects ($f)	2270	$self->_load_objects ($f)
2111	or return;	2271	or return;
2112		2272
2113	$self->post_load_original	2273	$self->post_load_original
2114	if delete $self->{load_original};	2274	if delete $self->{load_original};
2115		2275
2116	if (my $uniq = $self->uniq_path) {	2276	if (my $uniq = $self->uniq_path) {
2117	utf8::encode $uniq;	2277	utf8::encode $uniq;
2118	unless (aio_stat $uniq) {	2278	unless (aio_stat $uniq) {
2119	if (my $f = new_from_file cf::object::thawer $uniq) {	2279	if (my $f = new_from_file cf::object::thawer $uniq) {
2120	$self->clear_unique_items;	2280	$self->clear_unique_items;
2121	$self->_load_objects ($f);	2281	$self->_load_objects ($f);
2122	$f->resolve_delayed_derefs;	2282	$f->resolve_delayed_derefs;
		2283	}
2123	}	2284	}
2124	}	2285	}
2125	}
2126		2286
2127	$f->resolve_delayed_derefs;	2287	$f->resolve_delayed_derefs;
		2288	} else {
		2289	$self->post_load_original
		2290	if delete $self->{load_original};
		2291	}
		2292
		2293	$self->state (cf::MAP_INACTIVE);
2128		2294
2129	cf::cede_to_tick;	2295	cf::cede_to_tick;
2130	# now do the right thing for maps	2296	# now do the right thing for maps
2131	$self->link_multipart_objects;	2297	$self->link_multipart_objects;
2132	$self->difficulty ($self->estimate_difficulty)	2298	$self->difficulty ($self->estimate_difficulty)
…		…
2136	unless ($self->{deny_activate}) {	2302	unless ($self->{deny_activate}) {
2137	$self->decay_objects;	2303	$self->decay_objects;
2138	$self->fix_auto_apply;	2304	$self->fix_auto_apply;
2139	$self->update_buttons;	2305	$self->update_buttons;
2140	cf::cede_to_tick;	2306	cf::cede_to_tick;
2141	$self->activate;	2307	#$self->activate; # no longer activate maps automatically
2142	}	2308	}
2143		2309
2144	$self->{last_save} = $cf::RUNTIME;	2310	$self->{last_save} = $cf::RUNTIME;
2145	$self->last_access ($cf::RUNTIME);	2311	$self->last_access ($cf::RUNTIME);
2146
2147	$self->in_memory (cf::MAP_ACTIVE);
2148	}	2312	}
2149		2313
2150	$self->post_load;	2314	$self->post_load;
		2315
		2316	1
2151	}	2317	}
2152		2318
2153	# customize the map for a given player, i.e.	2319	# customize the map for a given player, i.e.
2154	# return the _real_ map. used by e.g. per-player	2320	# return the _real_ map. used by e.g. per-player
2155	# maps to change the path to ~playername/mappath	2321	# maps to change the path to ~playername/mappath
…		…
2163	# if $self->per_party;	2329	# if $self->per_party;
2164		2330
2165	$self	2331	$self
2166	}	2332	}
2167		2333
2168	# find and load all maps in the 3x3 area around a map
2169	sub load_neighbours {
2170	my ($map) = @_;
2171
2172	my @neigh; # diagonal neighbours
2173
2174	for (0 .. 3) {
2175	my $neigh = $map->tile_path ($_)
2176	or next;
2177	$neigh = find $neigh, $map
2178	or next;
2179	$neigh->load;
2180
2181	# now find the diagonal neighbours
2182	push @neigh,
2183	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2184	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2185	}
2186
2187	for (grep defined $_->[0], @neigh) {
2188	my ($path, $origin) = @$_;
2189	my $neigh = find $path, $origin
2190	or next;
2191	$neigh->load;
2192	}
2193	}
2194
2195	sub find_sync {	2334	sub find_sync {
2196	my ($path, $origin) = @_;	2335	my ($path, $origin) = @_;
2197		2336
		2337	# it's a bug to call this from the main context
2198	return cf::LOG cf::llevError \| cf::logBacktrace, "do_find_sync"	2338	return cf::LOG cf::llevError \| cf::logBacktrace, "do_find_sync"
2199	if $Coro::current == $Coro::main;	2339	if $Coro::current == $Coro::main;
2200		2340
2201	find $path, $origin	2341	find $path, $origin
2202	}	2342	}
2203		2343
2204	sub do_load_sync {	2344	sub do_load_sync {
2205	my ($map) = @_;	2345	my ($map) = @_;
2206		2346
		2347	# it's a bug to call this from the main context
2207	return cf::LOG cf::llevError \| cf::logBacktrace, "do_load_sync"	2348	return cf::LOG cf::llevError \| cf::logBacktrace, "do_load_sync"
2208	if $Coro::current == $Coro::main;	2349	if $Coro::current == $Coro::main;
2209		2350
2210	$map->load;	2351	$map->load;
2211	}	2352	}
…		…
2214	our $MAP_PREFETCHER = undef;	2355	our $MAP_PREFETCHER = undef;
2215		2356
2216	sub find_async {	2357	sub find_async {
2217	my ($path, $origin, $load) = @_;	2358	my ($path, $origin, $load) = @_;
2218		2359
2219	$path = normalise $path, $origin && $origin->{path};	2360	$path = normalise $path, $origin;
2220		2361
2221	if (my $map = $cf::MAP{$path}) {	2362	if (my $map = $cf::MAP{$path}) {
2222	return $map if !$load \|\| $map->in_memory == cf::MAP_ACTIVE;	2363	return $map if !$load \|\| $map->linkable;
2223	}	2364	}
2224		2365
2225	$MAP_PREFETCH{$path} \|= $load;	2366	$MAP_PREFETCH{$path} \|= $load;
2226		2367
2227	$MAP_PREFETCHER \|\|= cf::async {	2368	$MAP_PREFETCHER \|\|= cf::async {
…		…
2286	sub swap_out {	2427	sub swap_out {
2287	my ($self) = @_;	2428	my ($self) = @_;
2288		2429
2289	my $lock = cf::lock_acquire "map_data:$self->{path}";	2430	my $lock = cf::lock_acquire "map_data:$self->{path}";
2290		2431
2291	return if $self->in_memory != cf::MAP_ACTIVE;	2432	return if !$self->linkable;
2292	return if $self->{deny_save};	2433	return if $self->{deny_save};
2293	return if $self->players;	2434	return if $self->players;
2294		2435
2295	# first deactivate the map and "unlink" it from the core	2436	# first deactivate the map and "unlink" it from the core
2296	$self->deactivate;	2437	$self->deactivate;
2297	$_->clear_links_to ($self) for values %cf::MAP;	2438	$_->clear_links_to ($self) for values %cf::MAP;
2298	$self->in_memory (cf::MAP_SWAPPED);	2439	$self->state (cf::MAP_SWAPPED);
2299		2440
2300	# then atomically save	2441	# then atomically save
2301	$self->_save;	2442	$self->_save;
2302		2443
2303	# then free the map	2444	# then free the map
…		…
2329		2470
2330	return if $self->players;	2471	return if $self->players;
2331		2472
2332	cf::trace "resetting map ", $self->path, "\n";	2473	cf::trace "resetting map ", $self->path, "\n";
2333		2474
2334	$self->in_memory (cf::MAP_SWAPPED);	2475	$self->state (cf::MAP_SWAPPED);
2335		2476
2336	# need to save uniques path	2477	# need to save uniques path
2337	unless ($self->{deny_save}) {	2478	unless ($self->{deny_save}) {
2338	my $uniq = $self->uniq_path; utf8::encode $uniq;	2479	my $uniq = $self->uniq_path; utf8::encode $uniq;
2339		2480
…		…
2669	# use -1 or undef as default coordinates, not 0, 0	2810	# use -1 or undef as default coordinates, not 0, 0
2670	($x, $y) = ($map->enter_x, $map->enter_y)	2811	($x, $y) = ($map->enter_x, $map->enter_y)
2671	if $x <= 0 && $y <= 0;	2812	if $x <= 0 && $y <= 0;
2672		2813
2673	$map->load;	2814	$map->load;
2674	$map->load_neighbours;
2675		2815
2676	return unless $self->contr->active;	2816	return unless $self->contr->active;
2677		2817
2678	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2818	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2679	if ($self->enter_map ($map, $x, $y)) {	2819	if ($self->enter_map ($map, $x, $y)) {
…		…
2735	($path, $x, $y) = (undef, undef, undef);	2875	($path, $x, $y) = (undef, undef, undef);
2736	}	2876	}
2737	}	2877	}
2738		2878
2739	my $map = eval {	2879	my $map = eval {
2740	my $map = defined $path ? cf::map::find $path : undef;	2880	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2741		2881
2742	if ($map) {	2882	if ($map) {
2743	$map = $map->customise_for ($self);	2883	$map = $map->customise_for ($self);
2744	$map = $check->($map, $x, $y, $self) if $check && $map;	2884	$map = $check->($map, $x, $y, $self) if $check && $map;
2745	} else {	2885	} else {
…		…
2835	$Coro::current->{desc} = "enter_exit";	2975	$Coro::current->{desc} = "enter_exit";
2836		2976
2837	unless (eval {	2977	unless (eval {
2838	$self->deactivate_recursive; # just to be sure	2978	$self->deactivate_recursive; # just to be sure
2839		2979
2840	# random map handling
2841	{
2842	my $guard = cf::lock_acquire "exit_prepare:$exit";
2843
2844	prepare_random_map $exit
2845	if $exit->slaying eq "/!";
2846	}
2847
2848	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2980	my $map = cf::map::normalise $exit->slaying, $exit->map;
2849	my $x = $exit->stats->hp;	2981	my $x = $exit->stats->hp;
2850	my $y = $exit->stats->sp;	2982	my $y = $exit->stats->sp;
		2983
		2984	# special map handling
		2985	my $slaying = $exit->slaying;
		2986
		2987	# special map handling
		2988	if ($slaying eq "/!") {
		2989	my $guard = cf::lock_acquire "exit_prepare:$exit";
		2990
		2991	prepare_random_map $exit
		2992	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		2993
		2994	$map = $exit->slaying;
		2995
		2996	} elsif ($slaying eq '!up') {
		2997	$map = $exit->map->tile_path (cf::TILE_UP);
		2998	$x = $exit->x;
		2999	$y = $exit->y;
		3000
		3001	} elsif ($slaying eq '!down') {
		3002	$map = $exit->map->tile_path (cf::TILE_DOWN);
		3003	$x = $exit->x;
		3004	$y = $exit->y;
		3005	}
2851		3006
2852	$self->goto ($map, $x, $y);	3007	$self->goto ($map, $x, $y);
2853		3008
2854	# if exit is damned, update players death & WoR home-position	3009	# if exit is damned, update players death & WoR home-position
2855	$self->contr->savebed ($map, $x, $y)	3010	$self->contr->savebed ($map, $x, $y)
…		…
3080	=cut	3235	=cut
3081		3236
3082	sub cf::client::ext_msg($$@) {	3237	sub cf::client::ext_msg($$@) {
3083	my ($self, $type, @msg) = @_;	3238	my ($self, $type, @msg) = @_;
3084		3239
3085	if ($self->extcmd == 2) {
3086	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3240	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3087	} elsif ($self->extcmd == 1) { # TODO: remove
3088	push @msg, msgtype => "event_$type";
3089	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3090	}
3091	}	3241	}
3092		3242
3093	=item $client->ext_reply ($msgid, @msg)	3243	=item $client->ext_reply ($msgid, @msg)
3094		3244
3095	Sends an ext reply to the client.	3245	Sends an ext reply to the client.
…		…
3097	=cut	3247	=cut
3098		3248
3099	sub cf::client::ext_reply($$@) {	3249	sub cf::client::ext_reply($$@) {
3100	my ($self, $id, @msg) = @_;	3250	my ($self, $id, @msg) = @_;
3101		3251
3102	if ($self->extcmd == 2) {
3103	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));	3252	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3104	} elsif ($self->extcmd == 1) {
3105	#TODO: version 1, remove
3106	unshift @msg, msgtype => "reply", msgid => $id;
3107	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3108	}
3109	}	3253	}
3110		3254
3111	=item $success = $client->query ($flags, "text", \&cb)	3255	=item $success = $client->query ($flags, "text", \&cb)
3112		3256
3113	Queues a query to the client, calling the given callback with	3257	Queues a query to the client, calling the given callback with
…		…
3168	my ($ns, $buf) = @_;	3312	my ($ns, $buf) = @_;
3169		3313
3170	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3314	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3171		3315
3172	if (ref $msg) {	3316	if (ref $msg) {
3173	my ($type, $reply, @payload) =	3317	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3174	"ARRAY" eq ref $msg
3175	? @$msg
3176	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3177		3318
3178	my @reply;	3319	my @reply;
3179		3320
3180	if (my $cb = $EXTICMD{$type}) {	3321	if (my $cb = $EXTICMD{$type}) {
3181	@reply = $cb->($ns, @payload);	3322	@reply = $cb->($ns, @payload);
…		…
3359	=cut	3500	=cut
3360		3501
3361	#############################################################################	3502	#############################################################################
3362	# the server's init and main functions	3503	# the server's init and main functions
3363		3504
		3505	our %FACEHASH; # hash => idx, #d# HACK for http server
		3506
		3507	# internal api, not fianlised
		3508	sub add_face {
		3509	my ($name, $type, $data) = @_;
		3510
		3511	my $idx = cf::face::find $name;
		3512
		3513	if ($idx) {
		3514	delete $FACEHASH{cf::face::get_chksum $idx};
		3515	} else {
		3516	$idx = cf::face::alloc $name;
		3517	}
		3518
		3519	my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
		3520
		3521	cf::face::set_type $idx, $type;
		3522	cf::face::set_data $idx, 0, $data, $hash;
		3523	cf::face::set_meta $idx, $type & 1 ? undef : undef;
		3524	$FACEHASH{$hash} = $idx;#d#
		3525
		3526	$idx
		3527	}
		3528
3364	sub load_facedata($) {	3529	sub load_facedata($) {
3365	my ($path) = @_;	3530	my ($path) = @_;
3366		3531
3367	# HACK to clear player env face cache, we need some signal framework	3532	# HACK to clear player env face cache, we need some signal framework
3368	# for this (global event?)	3533	# for this (global event?)
…		…
3370		3535
3371	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3536	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3372		3537
3373	trace "loading facedata from $path\n";	3538	trace "loading facedata from $path\n";
3374		3539
3375	my $facedata;	3540	my $facedata = decode_storable load_file $path;
3376	0 < aio_load $path, $facedata
3377	or die "$path: $!";
3378
3379	$facedata = Coro::Storable::thaw $facedata;
3380		3541
3381	$facedata->{version} == 2	3542	$facedata->{version} == 2
3382	or cf::cleanup "$path: version mismatch, cannot proceed.";	3543	or cf::cleanup "$path: version mismatch, cannot proceed.";
3383		3544
3384	# patch in the exptable
3385	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3386	$facedata->{resource}{"res/exp_table"} = {
3387	type => FT_RSRC,
3388	data => $exp_table,
3389	hash => (Digest::MD5::md5 $exp_table),
3390	};
3391	cf::cede_to_tick;	3545	cf::cede_to_tick;
3392		3546
3393	{	3547	{
3394	my $faces = $facedata->{faceinfo};	3548	my $faces = $facedata->{faceinfo};
3395		3549
3396	while (my ($face, $info) = each %$faces) {	3550	for my $face (sort keys %$faces) {
		3551	my $info = $faces->{$face};
3397	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3552	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
3398		3553
3399	cf::face::set_visibility $idx, $info->{visibility};	3554	cf::face::set_visibility $idx, $info->{visibility};
3400	cf::face::set_magicmap $idx, $info->{magicmap};	3555	cf::face::set_magicmap $idx, $info->{magicmap};
3401	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3556	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3402	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3557	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
		3558	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
		3559	$FACEHASH{$info->{hash64}} = $idx;#d#
3403		3560
3404	cf::cede_to_tick;	3561	cf::cede_to_tick;
3405	}	3562	}
3406		3563
3407	while (my ($face, $info) = each %$faces) {	3564	while (my ($face, $info) = each %$faces) {
…		…
3434		3591
3435	{	3592	{
3436	my $res = $facedata->{resource};	3593	my $res = $facedata->{resource};
3437		3594
3438	while (my ($name, $info) = each %$res) {	3595	while (my ($name, $info) = each %$res) {
3439	if (defined $info->{type}) {	3596	if (defined (my $type = $info->{type})) {
		3597	# TODO: different hash - must free and use new index, or cache ixface data queue
3440	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;	3598	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
3441		3599
		3600	cf::face::set_type $idx, $type;
3442	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};	3601	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3443	cf::face::set_type $idx, $info->{type};	3602	cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3603	$FACEHASH{$info->{hash}} = $idx;#d#
3444	} else {	3604	} else {
3445	$RESOURCE{$name} = $info; # unused	3605	# $RESOURCE{$name} = $info; # unused
3446	}	3606	}
3447		3607
3448	cf::cede_to_tick;	3608	cf::cede_to_tick;
3449	}	3609	}
3450	}	3610	}
…		…
3468	my $status = load_resource_file_ $_[0];	3628	my $status = load_resource_file_ $_[0];
3469	get_slot 0.1, 100;	3629	get_slot 0.1, 100;
3470	cf::arch::commit_load;	3630	cf::arch::commit_load;
3471		3631
3472	$status	3632	$status
		3633	}
		3634
		3635	sub reload_exp_table {
		3636	_reload_exp_table;
		3637
		3638	add_face "res/exp_table" => FT_RSRC,
		3639	JSON::XS->new->utf8->canonical->encode (
		3640	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3641	);
		3642	}
		3643
		3644	sub reload_materials {
		3645	_reload_materials;
3473	}	3646	}
3474		3647
3475	sub reload_regions {	3648	sub reload_regions {
3476	# HACK to clear player env face cache, we need some signal framework	3649	# HACK to clear player env face cache, we need some signal framework
3477	# for this (global event?)	3650	# for this (global event?)
…		…
3492	}	3665	}
3493		3666
3494	sub reload_archetypes {	3667	sub reload_archetypes {
3495	load_resource_file "$DATADIR/archetypes"	3668	load_resource_file "$DATADIR/archetypes"
3496	or die "unable to load archetypes\n";	3669	or die "unable to load archetypes\n";
		3670
		3671	add_face "res/skill_info" => FT_RSRC,
		3672	JSON::XS->new->utf8->canonical->encode (
		3673	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3674	);
		3675	add_face "res/spell_paths" => FT_RSRC,
		3676	JSON::XS->new->utf8->canonical->encode (
		3677	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3678	);
3497	}	3679	}
3498		3680
3499	sub reload_treasures {	3681	sub reload_treasures {
3500	load_resource_file "$DATADIR/treasures"	3682	load_resource_file "$DATADIR/treasures"
3501	or die "unable to load treasurelists\n";	3683	or die "unable to load treasurelists\n";
3502	}	3684	}
3503		3685
3504	sub reload_sound {	3686	sub reload_sound {
3505	trace "loading sound config from $DATADIR/sound\n";	3687	trace "loading sound config from $DATADIR/sound\n";
3506		3688
3507	0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3508	or die "$DATADIR/sound $!";
3509
3510	my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);	3689	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3511		3690
3512	for (0 .. SOUND_CAST_SPELL_0 - 1) {	3691	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3513	my $sound = $soundconf->{compat}[$_]	3692	my $sound = $soundconf->{compat}[$_]
3514	or next;	3693	or next;
3515		3694
…		…
3525	}	3704	}
3526		3705
3527	sub reload_resources {	3706	sub reload_resources {
3528	trace "reloading resource files...\n";	3707	trace "reloading resource files...\n";
3529		3708
		3709	reload_materials;
3530	reload_facedata;	3710	reload_facedata;
		3711	reload_exp_table;
3531	reload_sound;	3712	reload_sound;
3532	reload_archetypes;	3713	reload_archetypes;
3533	reload_regions;	3714	reload_regions;
3534	reload_treasures;	3715	reload_treasures;
3535		3716
…		…
3537	}	3718	}
3538		3719
3539	sub reload_config {	3720	sub reload_config {
3540	trace "reloading config file...\n";	3721	trace "reloading config file...\n";
3541		3722
3542	open my $fh, "<:utf8", "$CONFDIR/config"	3723	my $config = load_file "$CONFDIR/config";
3543	or return;	3724	utf8::decode $config;
3544		3725	*CFG = decode_yaml $config;
3545	local $/;
3546	*CFG = YAML::XS::Load scalar <$fh>;
3547		3726
3548	$EMERGENCY_POSITION = $CFG{emergency_position} \|\| ["/world/world_104_115", 49, 38];	3727	$EMERGENCY_POSITION = $CFG{emergency_position} \|\| ["/world/world_104_115", 49, 38];
3549		3728
3550	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3729	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3551	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3730	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
3555	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3734	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3556	and die "WARNING: m(un)lockall failed: $!\n";	3735	and die "WARNING: m(un)lockall failed: $!\n";
3557	};	3736	};
3558	warn $@ if $@;	3737	warn $@ if $@;
3559	}	3738	}
3560
3561	trace "finished reloading resource files\n";
3562	}	3739	}
3563		3740
3564	sub pidfile() {	3741	sub pidfile() {
3565	sysopen my $fh, $PIDFILE, O_RDWR \| O_CREAT	3742	sysopen my $fh, $PIDFILE, O_RDWR \| O_CREAT
3566	or die "$PIDFILE: $!";	3743	or die "$PIDFILE: $!";
…		…
3591		3768
3592	sub main {	3769	sub main {
3593	cf::init_globals; # initialise logging	3770	cf::init_globals; # initialise logging
3594		3771
3595	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3772	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3596	LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3773	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3597	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3774	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3598	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3775	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3599		3776
3600	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3777	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3601		3778
3602	# we must not ever block the main coroutine	3779	# we must not ever block the main coroutine
3603	local $Coro::idle = sub {	3780	$Coro::idle = sub {
3604	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3781	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3605	(async {	3782	(async {
3606	$Coro::current->{desc} = "IDLE BUG HANDLER";	3783	$Coro::current->{desc} = "IDLE BUG HANDLER";
3607	EV::loop EV::LOOP_ONESHOT;	3784	EV::loop EV::LOOP_ONESHOT;
3608	})->prio (Coro::PRIO_MAX);	3785	})->prio (Coro::PRIO_MAX);
…		…
3611	evthread_start IO::AIO::poll_fileno;	3788	evthread_start IO::AIO::poll_fileno;
3612		3789
3613	cf::sync_job {	3790	cf::sync_job {
3614	cf::incloader::init ();	3791	cf::incloader::init ();
3615		3792
3616	cf::init_experience;
3617	cf::init_anim;	3793	cf::init_anim;
3618	cf::init_attackmess;	3794	cf::init_attackmess;
3619	cf::init_dynamic;	3795	cf::init_dynamic;
3620		3796
3621	cf::load_settings;	3797	cf::load_settings;
3622	cf::load_materials;
3623		3798
3624	reload_resources;	3799	reload_resources;
3625	reload_config;	3800	reload_config;
3626	db_init;	3801	db_init;
3627		3802
…		…
3639		3814
3640	# no (long-running) fork's whatsoever before this point(!)	3815	# no (long-running) fork's whatsoever before this point(!)
3641	use POSIX ();	3816	use POSIX ();
3642	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3817	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3643		3818
3644	(pop @POST_INIT)->(0) while @POST_INIT;	3819	cf::_post_init 0;
3645	};	3820	};
3646		3821
3647	cf::object::thawer::errors_are_fatal 0;	3822	cf::object::thawer::errors_are_fatal 0;
3648	info "parse errors in files are no longer fatal from this point on.\n";	3823	info "parse errors in files are no longer fatal from this point on.\n";
3649		3824
3650	my $free_main; $free_main = EV::idle sub {	3825	AE::postpone {
3651	undef $free_main;
3652	undef &main; # free gobs of memory :)	3826	undef &main; # free gobs of memory :)
3653	};	3827	};
3654		3828
3655	goto &main_loop;	3829	goto &main_loop;
3656	}	3830	}
…		…
3813		3987
3814	cf::write_runtime_sync; # external watchdog should not bark	3988	cf::write_runtime_sync; # external watchdog should not bark
3815		3989
3816	trace "emergency_perl_save: flushing outstanding aio requests";	3990	trace "emergency_perl_save: flushing outstanding aio requests";
3817	while (IO::AIO::nreqs \|\| BDB::nreqs) {	3991	while (IO::AIO::nreqs \|\| BDB::nreqs) {
3818	Coro::EV::timer_once 0.01; # let the sync_job do it's thing	3992	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3819	}	3993	}
3820		3994
3821	cf::write_runtime_sync; # external watchdog should not bark	3995	cf::write_runtime_sync; # external watchdog should not bark
3822	};	3996	};
3823		3997
…		…
3872		4046
3873	my $t1 = AE::time;	4047	my $t1 = AE::time;
3874		4048
3875	while ($RELOAD) {	4049	while ($RELOAD) {
3876	cf::get_slot 0.1, -1, "reload_perl";	4050	cf::get_slot 0.1, -1, "reload_perl";
3877	info "reloading...";	4051	info "perl_reload: reloading...";
3878		4052
3879	trace "entering sync_job";	4053	trace "perl_reload: entering sync_job";
3880		4054
3881	cf::sync_job {	4055	cf::sync_job {
3882	#cf::emergency_save;	4056	#cf::emergency_save;
3883		4057
3884	trace "cancelling all extension coros";	4058	trace "perl_reload: cancelling all extension coros";
3885	$_->cancel for values %EXT_CORO;	4059	$_->cancel for values %EXT_CORO;
3886	%EXT_CORO = ();	4060	%EXT_CORO = ();
3887		4061
3888	trace "removing commands";	4062	trace "perl_reload: removing commands";
3889	%COMMAND = ();	4063	%COMMAND = ();
3890		4064
3891	trace "removing ext/exti commands";	4065	trace "perl_reload: removing ext/exti commands";
3892	%EXTCMD = ();	4066	%EXTCMD = ();
3893	%EXTICMD = ();	4067	%EXTICMD = ();
3894		4068
3895	trace "unloading/nuking all extensions";	4069	trace "perl_reload: unloading/nuking all extensions";
3896	for my $pkg (@EXTS) {	4070	for my $pkg (@EXTS) {
3897	trace "... unloading $pkg";	4071	trace "... unloading $pkg";
3898		4072
3899	if (my $cb = $pkg->can ("unload")) {	4073	if (my $cb = $pkg->can ("unload")) {
3900	eval {	4074	eval {
…		…
3905		4079
3906	trace "... clearing $pkg";	4080	trace "... clearing $pkg";
3907	clear_package $pkg;	4081	clear_package $pkg;
3908	}	4082	}
3909		4083
3910	trace "unloading all perl modules loaded from $LIBDIR";	4084	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3911	while (my ($k, $v) = each %INC) {	4085	while (my ($k, $v) = each %INC) {
3912	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4086	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3913		4087
3914	trace "... unloading $k";	4088	trace "... unloading $k";
3915	delete $INC{$k};	4089	delete $INC{$k};
…		…
3922	}	4096	}
3923		4097
3924	clear_package $k;	4098	clear_package $k;
3925	}	4099	}
3926		4100
3927	trace "getting rid of safe::, as good as possible";	4101	trace "perl_reload: getting rid of safe::, as good as possible";
3928	clear_package "safe::$_"	4102	clear_package "safe::$_"
3929	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4103	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3930		4104
3931	trace "unloading cf.pm \"a bit\"";	4105	trace "perl_reload: unloading cf.pm \"a bit\"";
3932	delete $INC{"cf.pm"};	4106	delete $INC{"cf.pm"};
3933	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4107	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3934		4108
3935	# don't, removes xs symbols, too,	4109	# don't, removes xs symbols, too,
3936	# and global variables created in xs	4110	# and global variables created in xs
3937	#clear_package __PACKAGE__;	4111	#clear_package __PACKAGE__;
3938		4112
3939	info "unload completed, starting to reload now";	4113	info "perl_reload: unload completed, starting to reload now";
3940		4114
3941	trace "reloading cf.pm";	4115	trace "perl_reload: reloading cf.pm";
3942	require cf;	4116	require cf;
3943	cf::_connect_to_perl_1;	4117	cf::_connect_to_perl_1;
3944		4118
3945	trace "loading config and database again";	4119	trace "perl_reload: loading config and database again";
3946	cf::reload_config;	4120	cf::reload_config;
3947		4121
3948	trace "loading extensions";	4122	trace "perl_reload: loading extensions";
3949	cf::load_extensions;	4123	cf::load_extensions;
3950		4124
3951	if ($REATTACH_ON_RELOAD) {	4125	if ($REATTACH_ON_RELOAD) {
3952	trace "reattaching attachments to objects/players";	4126	trace "perl_reload: reattaching attachments to objects/players";
3953	_global_reattach; # objects, sockets	4127	_global_reattach; # objects, sockets
3954	trace "reattaching attachments to maps";	4128	trace "perl_reload: reattaching attachments to maps";
3955	reattach $_ for values %MAP;	4129	reattach $_ for values %MAP;
3956	trace "reattaching attachments to players";	4130	trace "perl_reload: reattaching attachments to players";
3957	reattach $_ for values %PLAYER;	4131	reattach $_ for values %PLAYER;
3958	}	4132	}
3959		4133
3960	trace "running post_init jobs";	4134	cf::_post_init 1;
3961	(pop @POST_INIT)->(1) while @POST_INIT;
3962		4135
3963	trace "leaving sync_job";	4136	trace "perl_reload: leaving sync_job";
3964		4137
3965	1	4138	1
3966	} or do {	4139	} or do {
3967	error $@;	4140	error $@;
3968	cf::cleanup "error while reloading, exiting.";	4141	cf::cleanup "perl_reload: error, exiting.";
3969	};	4142	};
3970		4143
3971	info "reloaded";
3972	--$RELOAD;	4144	--$RELOAD;
3973	}	4145	}
3974		4146
3975	$t1 = AE::time - $t1;	4147	$t1 = AE::time - $t1;
3976	info "reload completed in ${t1}s\n";	4148	info "perl_reload: completed in ${t1}s\n";
3977	};	4149	};
3978		4150
3979	our $RELOAD_WATCHER; # used only during reload	4151	our $RELOAD_WATCHER; # used only during reload
3980		4152
3981	sub reload_perl() {	4153	sub reload_perl() {
…		…
4006		4178
4007	#############################################################################	4179	#############################################################################
4008		4180
4009	my $bug_warning = 0;	4181	my $bug_warning = 0;
4010		4182
4011	our @WAIT_FOR_TICK;
4012	our @WAIT_FOR_TICK_BEGIN;
4013
4014	sub wait_for_tick {	4183	sub wait_for_tick() {
4015	return Coro::cede if tick_inhibit \|\| $Coro::current == $Coro::main;	4184	return Coro::AnyEvent::poll if tick_inhibit \|\| $Coro::current == $Coro::main;
4016		4185
4017	my $signal = new Coro::Signal;	4186	$WAIT_FOR_TICK->wait;
4018	push @WAIT_FOR_TICK, $signal;
4019	$signal->wait;
4020	}	4187	}
4021		4188
4022	sub wait_for_tick_begin {	4189	sub wait_for_tick_begin() {
4023	return Coro::cede if tick_inhibit \|\| $Coro::current == $Coro::main;	4190	return Coro::AnyEvent::poll if tick_inhibit \|\| $Coro::current == $Coro::main;
4024		4191
4025	my $signal = new Coro::Signal;	4192	my $signal = new Coro::Signal;
4026	push @WAIT_FOR_TICK_BEGIN, $signal;	4193	push @WAIT_FOR_TICK_BEGIN, $signal;
4027	$signal->wait;	4194	$signal->wait;
4028	}	4195	}
…		…
4032	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4199	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4033	unless ++$bug_warning > 10;	4200	unless ++$bug_warning > 10;
4034	return;	4201	return;
4035	}	4202	}
4036		4203
4037	cf::server_tick; # one server iteration	4204	cf::one_tick; # one server iteration
4038		4205
4039	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#	4206	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4040		4207
4041	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4208	if ($NOW >= $NEXT_RUNTIME_WRITE) {
4042	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4209	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
…		…
4048	}	4215	}
4049		4216
4050	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4217	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4051	$sig->send;	4218	$sig->send;
4052	}	4219	}
4053	while (my $sig = shift @WAIT_FOR_TICK) {	4220	$WAIT_FOR_TICK->broadcast;
4054	$sig->send;
4055	}
4056		4221
4057	$LOAD = ($NOW - $TICK_START) / $TICK;	4222	$LOAD = ($NOW - $TICK_START) / $TICK;
4058	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4223	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4059		4224
4060	if (0) {	4225	if (0) {
…		…
4069	{	4234	{
4070	# configure BDB	4235	# configure BDB
4071		4236
4072	BDB::min_parallel 16;	4237	BDB::min_parallel 16;
4073	BDB::max_poll_reqs $TICK * 0.1;	4238	BDB::max_poll_reqs $TICK * 0.1;
4074	$AnyEvent::BDB::WATCHER->priority (1);	4239	#$AnyEvent::BDB::WATCHER->priority (1);
4075		4240
4076	unless ($DB_ENV) {	4241	unless ($DB_ENV) {
4077	$DB_ENV = BDB::db_env_create;	4242	$DB_ENV = BDB::db_env_create;
4078	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT);	4243	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT);
4079	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4244	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
4114	IO::AIO::min_parallel 8;	4279	IO::AIO::min_parallel 8;
4115	IO::AIO::max_poll_time $TICK * 0.1;	4280	IO::AIO::max_poll_time $TICK * 0.1;
4116	undef $AnyEvent::AIO::WATCHER;	4281	undef $AnyEvent::AIO::WATCHER;
4117	}	4282	}
4118		4283
4119	my $_log_backtrace;	4284	our $_log_backtrace;
		4285	our $_log_backtrace_last;
4120		4286
4121	sub _log_backtrace {	4287	sub _log_backtrace {
4122	my ($msg, @addr) = @_;	4288	my ($msg, @addr) = @_;
4123		4289
4124	$msg =~ s/\n//;	4290	$msg =~ s/\n$//;
4125		4291
		4292	if ($_log_backtrace_last eq $msg) {
		4293	LOG llevInfo, "[ABT] $msg\n";
		4294	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4126	# limit the # of concurrent backtraces	4295	# limit the # of concurrent backtraces
4127	if ($_log_backtrace < 2) {	4296	} elsif ($_log_backtrace < 2) {
		4297	$_log_backtrace_last = $msg;
4128	++$_log_backtrace;	4298	++$_log_backtrace;
4129	my $perl_bt = Carp::longmess $msg;	4299	my $perl_bt = Carp::longmess $msg;
4130	async {	4300	async {
4131	$Coro::current->{desc} = "abt $msg";	4301	$Coro::current->{desc} = "abt $msg";
4132		4302
…		…
4152	LOG llevInfo, "[ABT] $_\n" for @bt;	4322	LOG llevInfo, "[ABT] $_\n" for @bt;
4153	--$_log_backtrace;	4323	--$_log_backtrace;
4154	};	4324	};
4155	} else {	4325	} else {
4156	LOG llevInfo, "[ABT] $msg\n";	4326	LOG llevInfo, "[ABT] $msg\n";
4157	LOG llevInfo, "[ABT] [suppressed]\n";	4327	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4158	}	4328	}
4159	}	4329	}
4160		4330
4161	# load additional modules	4331	# load additional modules
4162	require "cf/$_.pm" for @EXTRA_MODULES;	4332	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.543 by root, Wed May 5 23:23:29 2010 UTC vs. Revision 1.590 by root, Sun Nov 4 02:20:11 2012 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.543 by root, Wed May 5 23:23:29 2010 UTC vs.
Revision 1.590 by root, Sun Nov 4 02:20:11 2012 UTC