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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.371 by root, Thu Sep 13 16:16:01 2007 UTC vs.
Revision 1.399 by root, Sun Dec 16 02:50:33 2007 UTC

…		…
4	use strict;	4	use strict;
5		5
6	use Symbol;	6	use Symbol;
7	use List::Util;	7	use List::Util;
8	use Socket;	8	use Socket;
9	use Storable;	9	use EV;
10	use Event;
11	use Opcode;	10	use Opcode;
12	use Safe;	11	use Safe;
13	use Safe::Hole;	12	use Safe::Hole;
		13	use Storable ();
14		14
15	use Coro 3.64 ();	15	use Coro 4.1 ();
16	use Coro::State;	16	use Coro::State;
17	use Coro::Handle;	17	use Coro::Handle;
18	use Coro::Event;	18	use Coro::EV;
19	use Coro::Timer;	19	use Coro::Timer;
20	use Coro::Signal;	20	use Coro::Signal;
21	use Coro::Semaphore;	21	use Coro::Semaphore;
22	use Coro::AIO;	22	use Coro::AIO;
23	use Coro::Storable;	23	use Coro::Storable;
24	use Coro::Util ();	24	use Coro::Util ();
25		25
26	use JSON::XS ();	26	use JSON::XS 2.01 ();
27	use BDB ();	27	use BDB ();
28	use Data::Dumper;	28	use Data::Dumper;
29	use Digest::MD5;	29	use Digest::MD5;
30	use Fcntl;	30	use Fcntl;
31	use YAML::Syck ();	31	use YAML::Syck ();
32	use IO::AIO 2.32 ();	32	use IO::AIO 2.51 ();
33	use Time::HiRes;	33	use Time::HiRes;
34	use Compress::LZF;	34	use Compress::LZF;
35	use Digest::MD5 ();	35	use Digest::MD5 ();
36		36
37	# configure various modules to our taste	37	# configure various modules to our taste
38	#	38	#
39	$Storable::canonical = 1; # reduce rsync transfers	39	$Storable::canonical = 1; # reduce rsync transfers
40	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator	40	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
41	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later	41	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42
43	$Event::Eval = 1; # no idea why this is required, but it is
44		42
45	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?	43	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46	$YAML::Syck::ImplicitUnicode = 1;	44	$YAML::Syck::ImplicitUnicode = 1;
47		45
48	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority	46	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
…		…
76	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	74	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77	our $TICK_WATCHER;	75	our $TICK_WATCHER;
78	our $AIO_POLL_WATCHER;	76	our $AIO_POLL_WATCHER;
79	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	77	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80	our $NEXT_TICK;	78	our $NEXT_TICK;
81	our $NOW;
82	our $USE_FSYNC = 1; # use fsync to write maps - default off	79	our $USE_FSYNC = 1; # use fsync to write maps - default off
83		80
84	our $BDB_POLL_WATCHER;	81	our $BDB_POLL_WATCHER;
85	our $BDB_DEADLOCK_WATCHER;	82	our $BDB_DEADLOCK_WATCHER;
86	our $BDB_CHECKPOINT_WATCHER;	83	our $BDB_CHECKPOINT_WATCHER;
…		…
89		86
90	our %CFG;	87	our %CFG;
91		88
92	our $UPTIME; $UPTIME \|\|= time;	89	our $UPTIME; $UPTIME \|\|= time;
93	our $RUNTIME;	90	our $RUNTIME;
		91	our $NOW;
94		92
95	our (%PLAYER, %PLAYER_LOADING); # all users	93	our (%PLAYER, %PLAYER_LOADING); # all users
96	our (%MAP, %MAP_LOADING ); # all maps	94	our (%MAP, %MAP_LOADING ); # all maps
97	our $LINK_MAP; # the special {link} map, which is always available	95	our $LINK_MAP; # the special {link} map, which is always available
98		96
…		…
162		160
163	The raw value load value from the last tick.	161	The raw value load value from the last tick.
164		162
165	=item %cf::CFG	163	=item %cf::CFG
166		164
167	Configuration for the server, loaded from C</etc/crossfire/config>, or	165	Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168	from wherever your confdir points to.	166	from wherever your confdir points to.
169		167
170	=item cf::wait_for_tick, cf::wait_for_tick_begin	168	=item cf::wait_for_tick, cf::wait_for_tick_begin
171		169
172	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	170	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
…		…
215	)) {	213	)) {
216	no strict 'refs';	214	no strict 'refs';
217	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	215	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218	}	216	}
219		217
220	$Event::DIED = sub {	218	$EV::DIED = sub {
221	warn "error in event callback: @_";	219	warn "error in event callback: @_";
222	};	220	};
223		221
224	#############################################################################	222	#############################################################################
225		223
…		…
248	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	246	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249	$d	247	$d
250	} \|\| "[unable to dump $_[0]: '$@']";	248	} \|\| "[unable to dump $_[0]: '$@']";
251	}	249	}
252		250
253	=item $ref = cf::from_json $json	251	=item $ref = cf::decode_json $json
254		252
255	Converts a JSON string into the corresponding perl data structure.	253	Converts a JSON string into the corresponding perl data structure.
256		254
257	=item $json = cf::to_json $ref	255	=item $json = cf::encode_json $ref
258		256
259	Converts a perl data structure into its JSON representation.	257	Converts a perl data structure into its JSON representation.
260		258
261	=cut	259	=cut
262		260
263	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	261	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264		262
265	sub to_json ($) { $json_coder->encode ($_[0]) }	263	sub encode_json($) { $json_coder->encode ($_[0]) }
266	sub from_json ($) { $json_coder->decode ($_[0]) }	264	sub decode_json($) { $json_coder->decode ($_[0]) }
267		265
268	=item cf::lock_wait $string	266	=item cf::lock_wait $string
269		267
270	Wait until the given lock is available. See cf::lock_acquire.	268	Wait until the given lock is available. See cf::lock_acquire.
271		269
…		…
336	};	334	};
337	$TICK_WATCHER->stop;	335	$TICK_WATCHER->stop;
338	$guard	336	$guard
339	}	337	}
340		338
		339	=item cf::periodic $interval, $cb
		340
		341	Like EV::periodic, but randomly selects a starting point so that the actions
		342	get spread over timer.
		343
		344	=cut
		345
		346	sub periodic($$) {
		347	my ($interval, $cb) = @_;
		348
		349	my $start = rand List::Util::min 180, $interval;
		350
		351	EV::periodic $start, $interval, 0, $cb
		352	}
		353
341	=item cf::get_slot $time[, $priority[, $name]]	354	=item cf::get_slot $time[, $priority[, $name]]
342		355
343	Allocate $time seconds of blocking CPU time at priority C<$priority>:	356	Allocate $time seconds of blocking CPU time at priority C<$priority>:
344	This call blocks and returns only when you have at least C<$time> seconds	357	This call blocks and returns only when you have at least C<$time> seconds
345	of cpu time till the next tick. The slot is only valid till the next cede.	358	of cpu time till the next tick. The slot is only valid till the next cede.
…		…
354	our @SLOT_QUEUE;	367	our @SLOT_QUEUE;
355	our $SLOT_QUEUE;	368	our $SLOT_QUEUE;
356		369
357	$SLOT_QUEUE->cancel if $SLOT_QUEUE;	370	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358	$SLOT_QUEUE = Coro::async {	371	$SLOT_QUEUE = Coro::async {
		372	$Coro::current->desc ("timeslot manager");
		373
359	my $signal = new Coro::Signal;	374	my $signal = new Coro::Signal;
360		375
361	while () {	376	while () {
362	next_job:	377	next_job:
363	my $avail = cf::till_tick;	378	my $avail = cf::till_tick;
…		…
371	}	386	}
372	}	387	}
373	}	388	}
374		389
375	if (@SLOT_QUEUE) {	390	if (@SLOT_QUEUE) {
376	# we do not use wait_For_tick() as it returns immediately when tick is inactive	391	# we do not use wait_for_tick() as it returns immediately when tick is inactive
377	push @cf::WAIT_FOR_TICK, $signal;	392	push @cf::WAIT_FOR_TICK, $signal;
378	$signal->wait;	393	$signal->wait;
379	} else {	394	} else {
380	Coro::schedule;	395	Coro::schedule;
381	}	396	}
…		…
404		419
405	BEGIN { *async = \&Coro::async_pool }	420	BEGIN { *async = \&Coro::async_pool }
406		421
407	=item cf::sync_job { BLOCK }	422	=item cf::sync_job { BLOCK }
408		423
409	The design of Crossfire TRT requires that the main coroutine ($Coro::main)	424	The design of Deliantra requires that the main coroutine ($Coro::main)
410	is always able to handle events or runnable, as Crossfire TRT is only	425	is always able to handle events or runnable, as Deliantra is only
411	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not	426	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
412	acceptable.	427	acceptable.
413		428
414	If it must be done, put the blocking parts into C<sync_job>. This will run	429	If it must be done, put the blocking parts into C<sync_job>. This will run
415	the given BLOCK in another coroutine while waiting for the result. The	430	the given BLOCK in another coroutine while waiting for the result. The
…		…
420		435
421	sub sync_job(&) {	436	sub sync_job(&) {
422	my ($job) = @_;	437	my ($job) = @_;
423		438
424	if ($Coro::current == $Coro::main) {	439	if ($Coro::current == $Coro::main) {
425	my $time = Event::time;	440	my $time = EV::time;
426		441
427	# this is the main coro, too bad, we have to block	442	# this is the main coro, too bad, we have to block
428	# till the operation succeeds, freezing the server :/	443	# till the operation succeeds, freezing the server :/
429		444
		445	LOG llevError, Carp::longmess "sync job";#d#
		446
430	# TODO: use suspend/resume instead	447	# TODO: use suspend/resume instead
431	# (but this is cancel-safe)	448	# (but this is cancel-safe)
432	my $freeze_guard = freeze_mainloop;	449	my $freeze_guard = freeze_mainloop;
433		450
434	my $busy = 1;	451	my $busy = 1;
435	my @res;	452	my @res;
436		453
437	(async {	454	(async {
		455	$Coro::current->desc ("sync job coro");
438	@res = eval { $job->() };	456	@res = eval { $job->() };
439	warn $@ if $@;	457	warn $@ if $@;
440	undef $busy;	458	undef $busy;
441	})->prio (Coro::PRIO_MAX);	459	})->prio (Coro::PRIO_MAX);
442		460
443	while ($busy) {	461	while ($busy) {
444	Coro::cede or Event::one_event;	462	if (Coro::nready) {
		463	Coro::cede_notself;
		464	} else {
		465	EV::loop EV::LOOP_ONESHOT;
445	}	466	}
		467	}
446		468
447	$time = Event::time - $time;	469	$time = EV::time - $time;
448		470
449	LOG llevError \| logBacktrace, Carp::longmess "long sync job"	471	LOG llevError \| logBacktrace, Carp::longmess "long sync job"
450	if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;	472	if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
451		473
452	$tick_start += $time; # do not account sync jobs to server load	474	$tick_start += $time; # do not account sync jobs to server load
…		…
482	=item fork_call { }, $args	504	=item fork_call { }, $args
483		505
484	Executes the given code block with the given arguments in a seperate	506	Executes the given code block with the given arguments in a seperate
485	process, returning the results. Everything must be serialisable with	507	process, returning the results. Everything must be serialisable with
486	Coro::Storable. May, of course, block. Note that the executed sub may	508	Coro::Storable. May, of course, block. Note that the executed sub may
487	never block itself or use any form of Event handling.	509	never block itself or use any form of event handling.
488		510
489	=cut	511	=cut
490		512
491	sub fork_call(&@) {	513	sub fork_call(&@) {
492	my ($cb, @args) = @_;	514	my ($cb, @args) = @_;
…		…
653	attach callbacks/event handlers (a collection of which is called an "attachment")	675	attach callbacks/event handlers (a collection of which is called an "attachment")
654	to it. All such attachable objects support the following methods.	676	to it. All such attachable objects support the following methods.
655		677
656	In the following description, CLASS can be any of C<global>, C<object>	678	In the following description, CLASS can be any of C<global>, C<object>
657	C<player>, C<client> or C<map> (i.e. the attachable objects in	679	C<player>, C<client> or C<map> (i.e. the attachable objects in
658	Crossfire TRT).	680	Deliantra).
659		681
660	=over 4	682	=over 4
661		683
662	=item $attachable->attach ($attachment, key => $value...)	684	=item $attachable->attach ($attachment, key => $value...)
663		685
…		…
961		983
962	=cut	984	=cut
963		985
964	#############################################################################	986	#############################################################################
965	# object support	987	# object support
966	#
967		988
		989	sub _object_equal($$);
		990	sub _object_equal($$) {
		991	my ($a, $b) = @_;
		992
		993	return 0 unless (ref $a) eq (ref $b);
		994
		995	if ("HASH" eq ref $a) {
		996	my @ka = keys %$a;
		997	my @kb = keys %$b;
		998
		999	return 0 if @ka != @kb;
		1000
		1001	for (0 .. $#ka) {
		1002	return 0 unless $ka[$_] eq $kb[$_];
		1003	return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
		1004	}
		1005
		1006	} elsif ("ARRAY" eq ref $a) {
		1007
		1008	return 0 if @$a != @$b;
		1009
		1010	for (0 .. $#$a) {
		1011	return 0 unless _object_equal $a->[$_], $b->[$_];
		1012	}
		1013
		1014	} elsif ($a ne $b) {
		1015	return 0;
		1016	}
		1017
		1018	1
		1019	}
		1020
		1021	our $SLOW_MERGES;#d#
968	sub _can_merge {	1022	sub _can_merge {
969	my ($ob1, $ob2) = @_;	1023	my ($ob1, $ob2) = @_;
970		1024
971	local $Storable::canonical = 1;	1025	++$SLOW_MERGES;#d#
972	my $fob1 = Storable::freeze $ob1;
973	my $fob2 = Storable::freeze $ob2;
974		1026
975	$fob1 eq $fob2	1027	# we do the slow way here
		1028	return _object_equal $ob1, $ob2
976	}	1029	}
977		1030
978	sub reattach {	1031	sub reattach {
979	# basically do the same as instantiate, without calling instantiate	1032	# basically do the same as instantiate, without calling instantiate
980	my ($obj) = @_;	1033	my ($obj) = @_;
…		…
1002	cf::attachable->attach (	1055	cf::attachable->attach (
1003	prio => -1000000,	1056	prio => -1000000,
1004	on_instantiate => sub {	1057	on_instantiate => sub {
1005	my ($obj, $data) = @_;	1058	my ($obj, $data) = @_;
1006		1059
1007	$data = from_json $data;	1060	$data = decode_json $data;
1008		1061
1009	for (@$data) {	1062	for (@$data) {
1010	my ($name, $args) = @$_;	1063	my ($name, $args) = @$_;
1011		1064
1012	$obj->attach ($name, %{$args \|\| {} });	1065	$obj->attach ($name, %{$args \|\| {} });
…		…
1025	},	1078	},
1026	);	1079	);
1027		1080
1028	sub object_freezer_save {	1081	sub object_freezer_save {
1029	my ($filename, $rdata, $objs) = @_;	1082	my ($filename, $rdata, $objs) = @_;
1030
1031	my $guard = cf::lock_acquire "io";
1032		1083
1033	sync_job {	1084	sync_job {
1034	if (length $$rdata) {	1085	if (length $$rdata) {
1035	utf8::decode (my $decname = $filename);	1086	utf8::decode (my $decname = $filename);
1036	warn sprintf "saving %s (%d,%d)\n",	1087	warn sprintf "saving %s (%d,%d)\n",
…		…
1043	close $fh;	1094	close $fh;
1044		1095
1045	if (@$objs) {	1096	if (@$objs) {
1046	if (my $fh = aio_open "$filename.pst~", O_WRONLY \| O_CREAT, 0600) {	1097	if (my $fh = aio_open "$filename.pst~", O_WRONLY \| O_CREAT, 0600) {
1047	chmod SAVE_MODE, $fh;	1098	chmod SAVE_MODE, $fh;
1048	my $data = Storable::nfreeze { version => 1, objs => $objs };	1099	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1049	aio_write $fh, 0, (length $data), $data, 0;	1100	aio_write $fh, 0, (length $data), $data, 0;
1050	aio_fsync $fh if $cf::USE_FSYNC;	1101	aio_fsync $fh if $cf::USE_FSYNC;
1051	close $fh;	1102	close $fh;
1052	aio_rename "$filename.pst~", "$filename.pst";	1103	aio_rename "$filename.pst~", "$filename.pst";
1053	}	1104	}
…		…
1062	} else {	1113	} else {
1063	aio_unlink $filename;	1114	aio_unlink $filename;
1064	aio_unlink "$filename.pst";	1115	aio_unlink "$filename.pst";
1065	}	1116	}
1066	};	1117	};
1067
1068	undef $guard;
1069	}	1118	}
1070		1119
1071	sub object_freezer_as_string {	1120	sub object_freezer_as_string {
1072	my ($rdata, $objs) = @_;	1121	my ($rdata, $objs) = @_;
1073		1122
…		…
1078		1127
1079	sub object_thawer_load {	1128	sub object_thawer_load {
1080	my ($filename) = @_;	1129	my ($filename) = @_;
1081		1130
1082	my ($data, $av);	1131	my ($data, $av);
1083
1084	my $guard = cf::lock_acquire "io";
1085		1132
1086	(aio_load $filename, $data) >= 0	1133	(aio_load $filename, $data) >= 0
1087	or return;	1134	or return;
1088		1135
1089	unless (aio_stat "$filename.pst") {	1136	unless (aio_stat "$filename.pst") {
1090	(aio_load "$filename.pst", $av) >= 0	1137	(aio_load "$filename.pst", $av) >= 0
1091	or return;	1138	or return;
1092		1139
1093	undef $guard;
1094	$av = eval { (Storable::thaw $av)->{objs} };	1140	my $st = eval { Coro::Storable::thaw $av };
		1141	$av = $st->{objs};
1095	}	1142	}
1096		1143
1097	utf8::decode (my $decname = $filename);	1144	utf8::decode (my $decname = $filename);
1098	warn sprintf "loading %s (%d,%d)\n",	1145	warn sprintf "loading %s (%d,%d)\n",
1099	$decname, length $data, scalar @{$av \|\| []};	1146	$decname, length $data, scalar @{$av \|\| []};
…		…
1353	aio_unlink +(playerdir $login) . "/$login.pl";	1400	aio_unlink +(playerdir $login) . "/$login.pl";
1354		1401
1355	my $f = new_from_file cf::object::thawer path $login	1402	my $f = new_from_file cf::object::thawer path $login
1356	or return;	1403	or return;
1357		1404
1358	$f->next;
1359	my $pl = cf::player::load_pl $f	1405	my $pl = cf::player::load_pl $f
1360	or return;	1406	or return;
1361	local $cf::PLAYER_LOADING{$login} = $pl;	1407	local $cf::PLAYER_LOADING{$login} = $pl;
1362	$f->resolve_delayed_derefs;	1408	$f->resolve_delayed_derefs;
1363	$cf::PLAYER{$login} = $pl	1409	$cf::PLAYER{$login} = $pl
…		…
1515		1561
1516	Expand crossfire pod fragments into protocol xml.	1562	Expand crossfire pod fragments into protocol xml.
1517		1563
1518	=cut	1564	=cut
1519		1565
		1566	use re 'eval';
		1567
		1568	my $group;
		1569	my $interior; $interior = qr{
		1570	# match a pod interior sequence sans C<< >>
		1571	(?:
		1572	\ (.*?)\ (?{ $group = $^N })
		1573	\| < (??{$interior}) >
		1574	)
		1575	}x;
		1576
1520	sub expand_cfpod {	1577	sub expand_cfpod {
1521	((my $self), (local $_)) = @_;	1578	my ($self, $pod) = @_;
1522		1579
1523	# escape & and <	1580	my $xml;
1524	s/&/&/g;
1525	s/(?<![BIUGHT])</</g;
1526		1581
1527	# this is buggy, it needs to properly take care of nested <'s	1582	while () {
		1583	if ($pod =~ /\G( (?: [^BCGHITU]+ \| .(?!<) )+ )/xgcs) {
		1584	$group = $1;
1528		1585
1529	1 while	1586	$group =~ s/&/&/g;
1530	# replace B<>, I<>, U<> etc.	1587	$group =~ s/</</g;
1531	s/B<([^\>]*)>/<b>$1<\/b>/	1588
1532	\|\| s/I<([^\>]*)>/<i>$1<\/i>/	1589	$xml .= $group;
1533	\|\| s/U<([^\>]*)>/<u>$1<\/u>/	1590	} elsif ($pod =~ m%\G
1534	\|\| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/	1591	([BCGHITU])
1535	# replace G<male\|female> tags	1592	<
1536	\|\| s{G<([^>\|])\\|([^>])>}{	1593	(?:
1537	$self->gender ? $2 : $1	1594	([^<>]*) (?{ $group = $^N })
1538	}ge	1595	\| < $interior >
1539	# replace H<hint text>	1596	)
1540	\|\| s{H<([^\>]*)>}	1597	>
		1598	%gcsx
1541	{	1599	) {
		1600	my ($code, $data) = ($1, $group);
		1601
		1602	if ($code eq "B") {
		1603	$xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
		1604	} elsif ($code eq "I") {
		1605	$xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
		1606	} elsif ($code eq "U") {
		1607	$xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
		1608	} elsif ($code eq "C") {
		1609	$xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
		1610	} elsif ($code eq "T") {
		1611	$xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
		1612	} elsif ($code eq "G") {
		1613	my ($male, $female) = split /\\|/, $data;
		1614	$data = $self->gender ? $female : $male;
		1615	$xml .= expand_cfpod ($self, $data);
		1616	} elsif ($code eq "H") {
1542	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",	1617	$xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1543	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",	1618	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1544	"")	1619	"")
1545	[$self->{hintmode}]	1620	[$self->{hintmode}];
		1621	} else {
		1622	$xml .= "error processing '$code($data)' directive";
1546	}ge;	1623	}
		1624	} else {
		1625	if ($pod =~ /\G(.+)/) {
		1626	warn "parse error while expanding $pod (at $1)";
		1627	}
		1628	last;
		1629	}
		1630	}
1547		1631
		1632	for ($xml) {
1548	# create single paragraphs (very hackish)	1633	# create single paragraphs (very hackish)
1549	s/(?<=\S)\n(?=\w)/ /g;	1634	s/(?<=\S)\n(?=\w)/ /g;
1550		1635
1551	# compress some whitespace	1636	# compress some whitespace
1552	s/\s+\n/\n/g; # ws line-ends	1637	s/\s+\n/\n/g; # ws line-ends
1553	s/\n\n+/\n/g; # double lines	1638	s/\n\n+/\n/g; # double lines
1554	s/^\n+//; # beginning lines	1639	s/^\n+//; # beginning lines
1555	s/\n+$//; # ending lines	1640	s/\n+$//; # ending lines
		1641	}
1556		1642
1557	$_	1643	$xml
1558	}	1644	}
		1645
		1646	no re 'eval';
1559		1647
1560	sub hintmode {	1648	sub hintmode {
1561	$_[0]{hintmode} = $_[1] if @_ > 1;	1649	$_[0]{hintmode} = $_[1] if @_ > 1;
1562	$_[0]{hintmode}	1650	$_[0]{hintmode}
1563	}	1651	}
…		…
2044	}	2132	}
2045		2133
2046	$MAP_PREFETCH{$path} \|= $load;	2134	$MAP_PREFETCH{$path} \|= $load;
2047		2135
2048	$MAP_PREFETCHER \|\|= cf::async {	2136	$MAP_PREFETCHER \|\|= cf::async {
		2137	$Coro::current->{desc} = "map prefetcher";
		2138
2049	while (%MAP_PREFETCH) {	2139	while (%MAP_PREFETCH) {
2050	while (my ($k, $v) = each %MAP_PREFETCH) {	2140	while (my ($k, $v) = each %MAP_PREFETCH) {
2051	if (my $map = find $k) {	2141	if (my $map = find $k) {
2052	$map->load if $v;	2142	$map->load if $v;
2053	}	2143	}
…		…
2079	return if $self->{deny_save};	2169	return if $self->{deny_save};
2080		2170
2081	local $self->{last_access} = $self->last_access;#d#	2171	local $self->{last_access} = $self->last_access;#d#
2082		2172
2083	cf::async {	2173	cf::async {
		2174	$Coro::current->{desc} = "map player save";
2084	$_->contr->save for $self->players;	2175	$_->contr->save for $self->players;
2085	};	2176	};
2086		2177
2087	if ($uniq) {	2178	if ($uniq) {
2088	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);	2179	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);
…		…
2275	=cut	2366	=cut
2276		2367
2277	sub deref {	2368	sub deref {
2278	my ($ref) = @_;	2369	my ($ref) = @_;
2279		2370
2280	# temporary compatibility#TODO#remove
2281	$ref =~ s{^<}{player/<};
2282
2283	if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {	2371	if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2284	my ($uuid, $name) = ($1, $2);	2372	my ($uuid, $name) = ($1, $2);
2285	my $pl = $cf::PLAYER_LOADING{$name} \|\| cf::player::find $name	2373	my $pl = $cf::PLAYER_LOADING{$name} \|\| cf::player::find $name
2286	or return;	2374	or return;
2287	$pl->ob->uuid eq $uuid	2375	$pl->ob->uuid eq $uuid
2288	or return;	2376	or return;
…		…
2459	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2547	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2460		2548
2461	$self->enter_link;	2549	$self->enter_link;
2462		2550
2463	(async {	2551	(async {
		2552	$Coro::current->{desc} = "player::goto $path $x $y";
		2553
2464	# *tag paths override both path and x\|y	2554	# *tag paths override both path and x\|y
2465	if ($path =~ /^\(.)$/) {	2555	if ($path =~ /^\(.)$/) {
2466	if (my @obs = grep $_->map, ext::map_tags::find $1) {	2556	if (my @obs = grep $_->map, ext::map_tags::find $1) {
2467	my $ob = $obs[rand @obs];	2557	my $ob = $obs[rand @obs];
2468		2558
…		…
2548	$rmp->{origin_y} = $exit->y;	2638	$rmp->{origin_y} = $exit->y;
2549	}	2639	}
2550		2640
2551	$rmp->{random_seed} \|\|= $exit->random_seed;	2641	$rmp->{random_seed} \|\|= $exit->random_seed;
2552		2642
2553	my $data = cf::to_json $rmp;	2643	my $data = cf::encode_json $rmp;
2554	my $md5 = Digest::MD5::md5_hex $data;	2644	my $md5 = Digest::MD5::md5_hex $data;
2555	my $meta = "$RANDOMDIR/$md5.meta";	2645	my $meta = "$RANDOMDIR/$md5.meta";
2556		2646
2557	if (my $fh = aio_open "$meta~", O_WRONLY \| O_CREAT, 0666) {	2647	if (my $fh = aio_open "$meta~", O_WRONLY \| O_CREAT, 0666) {
2558	aio_write $fh, 0, (length $data), $data, 0;	2648	aio_write $fh, 0, (length $data), $data, 0;
…		…
2585	# if exit is damned, update players death & WoR home-position	2675	# if exit is damned, update players death & WoR home-position
2586	$self->contr->savebed ($slaying, $hp, $sp)	2676	$self->contr->savebed ($slaying, $hp, $sp)
2587	if $exit->flag (FLAG_DAMNED);	2677	if $exit->flag (FLAG_DAMNED);
2588		2678
2589	(async {	2679	(async {
		2680	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2681
2590	$self->deactivate_recursive; # just to be sure	2682	$self->deactivate_recursive; # just to be sure
2591	unless (eval {	2683	unless (eval {
2592	$self->goto ($slaying, $hp, $sp);	2684	$self->goto ($slaying, $hp, $sp);
2593		2685
2594	1;	2686	1;
…		…
2629	the message, with C<log> being the default. If C<$color> is negative, suppress	2721	the message, with C<log> being the default. If C<$color> is negative, suppress
2630	the message unless the client supports the msg packet.	2722	the message unless the client supports the msg packet.
2631		2723
2632	=cut	2724	=cut
2633		2725
		2726	# non-persistent channels (usually the info channel)
2634	our %CHANNEL = (	2727	our %CHANNEL = (
2635	"c/identify" => {	2728	"c/identify" => {
2636	id => "identify",	2729	id => "infobox",
2637	title => "Identify",	2730	title => "Identify",
2638	reply => undef,	2731	reply => undef,
2639	tooltip => "Items recently identified",	2732	tooltip => "Items recently identified",
2640	},	2733	},
2641	"c/examine" => {	2734	"c/examine" => {
2642	id => "examine",	2735	id => "infobox",
2643	title => "Examine",	2736	title => "Examine",
2644	reply => undef,	2737	reply => undef,
2645	tooltip => "Signs and other items you examined",	2738	tooltip => "Signs and other items you examined",
2646	},	2739	},
		2740	"c/book" => {
		2741	id => "infobox",
		2742	title => "Book",
		2743	reply => undef,
		2744	tooltip => "The contents of a note or book",
		2745	},
		2746	"c/lookat" => {
		2747	id => "infobox",
		2748	title => "Look",
		2749	reply => undef,
		2750	tooltip => "What you saw there",
		2751	},
		2752	"c/who" => {
		2753	id => "infobox",
		2754	title => "Players",
		2755	reply => undef,
		2756	tooltip => "Shows players who are currently online",
		2757	},
		2758	"c/body" => {
		2759	id => "infobox",
		2760	title => "Body Parts",
		2761	reply => undef,
		2762	tooltip => "Shows which body parts you posess and are available",
		2763	},
		2764	"c/uptime" => {
		2765	id => "infobox",
		2766	title => "Uptime",
		2767	reply => undef,
		2768	tooltip => "How long the server has been running since last restart",
		2769	},
		2770	"c/mapinfo" => {
		2771	id => "infobox",
		2772	title => "Map Info",
		2773	reply => undef,
		2774	tooltip => "Information related to the maps",
		2775	},
2647	);	2776	);
2648		2777
2649	sub cf::client::send_msg {	2778	sub cf::client::send_msg {
2650	my ($self, $channel, $msg, $color, @extra) = @_;	2779	my ($self, $channel, $msg, $color, @extra) = @_;
2651		2780
2652	$msg = $self->pl->expand_cfpod ($msg);	2781	$msg = $self->pl->expand_cfpod ($msg);
2653		2782
2654	$color &= cf::NDI_CLIENT_MASK; # just in case...	2783	$color &= cf::NDI_CLIENT_MASK; # just in case...
2655		2784
2656	# check predefined channels, for the benefit of C	2785	# check predefined channels, for the benefit of C
2657	$channel = $CHANNEL{$channel} if $CHANNEL{$channel};	2786	if ($CHANNEL{$channel}) {
		2787	$channel = $CHANNEL{$channel};
2658		2788
		2789	$self->ext_msg (channel_info => $channel)
		2790	if $self->can_msg;
		2791
		2792	$channel = $channel->{id};
		2793
2659	if (ref $channel) {	2794	} elsif (ref $channel) {
2660	# send meta info to client, if not yet sent	2795	# send meta info to client, if not yet sent
2661	unless (exists $self->{channel}{$channel->{id}}) {	2796	unless (exists $self->{channel}{$channel->{id}}) {
2662	$self->{channel}{$channel->{id}} = $channel;	2797	$self->{channel}{$channel->{id}} = $channel;
2663	$self->ext_msg (channel_info => $channel)	2798	$self->ext_msg (channel_info => $channel)
2664	if $self->can_msg;	2799	if $self->can_msg;
…		…
2881	=pod	3016	=pod
2882		3017
2883	The following functions and methods are available within a safe environment:	3018	The following functions and methods are available within a safe environment:
2884		3019
2885	cf::object	3020	cf::object
2886	contr pay_amount pay_player map x y force_find force_add	3021	contr pay_amount pay_player map x y force_find force_add destroy
2887	insert remove name archname title slaying race decrease_ob_nr	3022	insert remove name archname title slaying race decrease_ob_nr
2888		3023
2889	cf::object::player	3024	cf::object::player
2890	player	3025	player
2891		3026
…		…
2898	=cut	3033	=cut
2899		3034
2900	for (	3035	for (
2901	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	3036	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2902	insert remove inv name archname title slaying race	3037	insert remove inv name archname title slaying race
2903	decrease_ob_nr)],	3038	decrease_ob_nr destroy)],
2904	["cf::object::player" => qw(player)],	3039	["cf::object::player" => qw(player)],
2905	["cf::player" => qw(peaceful)],	3040	["cf::player" => qw(peaceful)],
2906	["cf::map" => qw(trigger)],	3041	["cf::map" => qw(trigger)],
2907	) {	3042	) {
2908	no strict 'refs';	3043	no strict 'refs';
…		…
3183	sub main {	3318	sub main {
3184	# we must not ever block the main coroutine	3319	# we must not ever block the main coroutine
3185	local $Coro::idle = sub {	3320	local $Coro::idle = sub {
3186	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3321	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3187	(async {	3322	(async {
3188	Event::one_event;	3323	$Coro::current->{desc} = "IDLE BUG HANDLER";
		3324	EV::loop EV::LOOP_ONESHOT;
3189	})->prio (Coro::PRIO_MAX);	3325	})->prio (Coro::PRIO_MAX);
3190	};	3326	};
3191		3327
3192	reload_config;	3328	reload_config;
3193	db_init;	3329	db_init;
3194	load_extensions;	3330	load_extensions;
3195		3331
3196	$TICK_WATCHER->start;	3332	$TICK_WATCHER->start;
		3333	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3197	Event::loop;	3334	EV::loop;
3198	}	3335	}
3199		3336
3200	#############################################################################	3337	#############################################################################
3201	# initialisation and cleanup	3338	# initialisation and cleanup
3202		3339
3203	# install some emergency cleanup handlers	3340	# install some emergency cleanup handlers
3204	BEGIN {	3341	BEGIN {
		3342	our %SIGWATCHER = ();
3205	for my $signal (qw(INT HUP TERM)) {	3343	for my $signal (qw(INT HUP TERM)) {
3206	Event->signal (	3344	$SIGWATCHER{$signal} = EV::signal $signal, sub {
3207	reentrant => 0,
3208	data => WF_AUTOCANCEL,
3209	signal => $signal,
3210	prio => 0,
3211	cb => sub {
3212	cf::cleanup "SIG$signal";	3345	cf::cleanup "SIG$signal";
3213	},
3214	);	3346	};
3215	}	3347	}
3216	}	3348	}
3217		3349
3218	sub write_runtime {	3350	sub write_runtime {
3219	my $runtime = "$LOCALDIR/runtime";	3351	my $runtime = "$LOCALDIR/runtime";
…		…
3264	# and maps saved/destroyed asynchronously.	3396	# and maps saved/destroyed asynchronously.
3265	warn "begin emergency player save\n";	3397	warn "begin emergency player save\n";
3266	for my $login (keys %cf::PLAYER) {	3398	for my $login (keys %cf::PLAYER) {
3267	my $pl = $cf::PLAYER{$login} or next;	3399	my $pl = $cf::PLAYER{$login} or next;
3268	$pl->valid or next;	3400	$pl->valid or next;
		3401	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3269	$pl->save;	3402	$pl->save;
3270	}	3403	}
3271	warn "end emergency player save\n";	3404	warn "end emergency player save\n";
3272		3405
3273	warn "begin emergency map save\n";	3406	warn "begin emergency map save\n";
…		…
3312	warn "syncing database to disk";	3445	warn "syncing database to disk";
3313	BDB::db_env_txn_checkpoint $DB_ENV;	3446	BDB::db_env_txn_checkpoint $DB_ENV;
3314		3447
3315	# if anything goes wrong in here, we should simply crash as we already saved	3448	# if anything goes wrong in here, we should simply crash as we already saved
3316		3449
3317	warn "cancelling all WF_AUTOCANCEL watchers";
3318	for (Event::all_watchers) {
3319	$_->cancel if $_->data & WF_AUTOCANCEL;
3320	}
3321
3322	warn "flushing outstanding aio requests";	3450	warn "flushing outstanding aio requests";
3323	for (;;) {	3451	for (;;) {
3324	BDB::flush;	3452	BDB::flush;
3325	IO::AIO::flush;	3453	IO::AIO::flush;
3326	Coro::cede;	3454	Coro::cede_notself;
3327	last unless IO::AIO::nreqs \|\| BDB::nreqs;	3455	last unless IO::AIO::nreqs \|\| BDB::nreqs;
3328	warn "iterate...";	3456	warn "iterate...";
3329	}	3457	}
3330		3458
3331	++$RELOAD;	3459	++$RELOAD;
…		…
3420		3548
3421	sub reload_perl() {	3549	sub reload_perl() {
3422	# doing reload synchronously and two reloads happen back-to-back,	3550	# doing reload synchronously and two reloads happen back-to-back,
3423	# coro crashes during coro_state_free->destroy here.	3551	# coro crashes during coro_state_free->destroy here.
3424		3552
3425	$RELOAD_WATCHER \|\|= Event->timer (	3553	$RELOAD_WATCHER \|\|= EV::timer 0, 0, sub {
3426	reentrant => 0,
3427	after => 0,
3428	data => WF_AUTOCANCEL,
3429	cb => sub {
3430	do_reload_perl;
3431	undef $RELOAD_WATCHER;	3554	undef $RELOAD_WATCHER;
3432	},	3555	do_reload_perl;
3433	);	3556	};
3434	}	3557	}
3435		3558
3436	register_command "reload" => sub {	3559	register_command "reload" => sub {
3437	my ($who, $arg) = @_;	3560	my ($who, $arg) = @_;
3438		3561
3439	if ($who->flag (FLAG_WIZ)) {	3562	if ($who->flag (FLAG_WIZ)) {
3440	$who->message ("reloading server.");	3563	$who->message ("reloading server.");
		3564	async {
		3565	$Coro::current->{desc} = "perl_reload";
3441	async { reload_perl };	3566	reload_perl;
		3567	};
3442	}	3568	}
3443	};	3569	};
3444		3570
3445	unshift @INC, $LIBDIR;	3571	unshift @INC, $LIBDIR;
3446		3572
…		…
3465	my $signal = new Coro::Signal;	3591	my $signal = new Coro::Signal;
3466	push @WAIT_FOR_TICK_BEGIN, $signal;	3592	push @WAIT_FOR_TICK_BEGIN, $signal;
3467	$signal->wait;	3593	$signal->wait;
3468	}	3594	}
3469		3595
3470	$TICK_WATCHER = Event->timer (	3596	$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3471	reentrant => 0,
3472	parked => 1,
3473	prio => 0,
3474	at => $NEXT_TICK \|\| $TICK,
3475	data => WF_AUTOCANCEL,
3476	cb => sub {
3477	if ($Coro::current != $Coro::main) {	3597	if ($Coro::current != $Coro::main) {
3478	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	3598	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3479	unless ++$bug_warning > 10;	3599	unless ++$bug_warning > 10;
3480	return;	3600	return;
3481	}	3601	}
3482		3602
3483	$NOW = $tick_start = Event::time;	3603	$NOW = $tick_start = EV::now;
3484		3604
3485	cf::server_tick; # one server iteration	3605	cf::server_tick; # one server iteration
3486		3606
3487	$RUNTIME += $TICK;	3607	$RUNTIME += $TICK;
3488	$NEXT_TICK += $TICK;	3608	$NEXT_TICK += $TICK;
3489		3609
3490	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3610	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3491	$NEXT_RUNTIME_WRITE = $NOW + 10;	3611	$NEXT_RUNTIME_WRITE = $NOW + 10;
3492	Coro::async_pool {	3612	Coro::async_pool {
		3613	$Coro::current->{desc} = "runtime saver";
3493	write_runtime	3614	write_runtime
3494	or warn "ERROR: unable to write runtime file: $!";	3615	or warn "ERROR: unable to write runtime file: $!";
3495	};
3496	}	3616	};
		3617	}
3497		3618
3498	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3619	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3499	$sig->send;	3620	$sig->send;
3500	}	3621	}
3501	while (my $sig = shift @WAIT_FOR_TICK) {	3622	while (my $sig = shift @WAIT_FOR_TICK) {
3502	$sig->send;	3623	$sig->send;
3503	}	3624	}
3504		3625
3505	$NOW = Event::time;
3506
3507	# if we are delayed by four ticks or more, skip them all
3508	$NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3509
3510	$TICK_WATCHER->at ($NEXT_TICK);
3511	$TICK_WATCHER->start;
3512
3513	$LOAD = ($NOW - $tick_start) / $TICK;	3626	$LOAD = ($NOW - $tick_start) / $TICK;
3514	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3627	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3515		3628
3516	_post_tick;	3629	_post_tick;
3517	},	3630	};
3518	);	3631	$TICK_WATCHER->priority (EV::MAXPRI);
3519		3632
3520	{	3633	{
3521	BDB::min_parallel 8;	3634	BDB::min_parallel 8;
3522	BDB::max_poll_time $TICK * 0.1;	3635	BDB::max_poll_time $TICK * 0.1;
3523	$BDB_POLL_WATCHER = Event->io (	3636	$BDB_POLL_WATCHER = EV::io BDB::poll_fileno, EV::READ, \&BDB::poll_cb;
3524	reentrant => 0,
3525	fd => BDB::poll_fileno,
3526	poll => 'r',
3527	prio => 0,
3528	data => WF_AUTOCANCEL,
3529	cb => \&BDB::poll_cb,
3530	);
3531		3637
3532	BDB::set_sync_prepare {	3638	BDB::set_sync_prepare {
3533	my $status;	3639	my $status;
3534	my $current = $Coro::current;	3640	my $current = $Coro::current;
3535	(	3641	(
…		…
3565		3671
3566	cf::cleanup "db_env_open(db): $@" if $@;	3672	cf::cleanup "db_env_open(db): $@" if $@;
3567	};	3673	};
3568	}	3674	}
3569		3675
3570	$BDB_DEADLOCK_WATCHER = Event->timer (	3676	$BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3571	after => 3,
3572	interval => 1,
3573	hard => 1,
3574	prio => 0,
3575	data => WF_AUTOCANCEL,
3576	cb => sub {
3577	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };	3677	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3578	},
3579	);	3678	};
3580	$BDB_CHECKPOINT_WATCHER = Event->timer (	3679	$BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3581	after => 11,
3582	interval => 60,
3583	hard => 1,
3584	prio => 0,
3585	data => WF_AUTOCANCEL,
3586	cb => sub {
3587	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	3680	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3588	},
3589	);	3681	};
3590	$BDB_TRICKLE_WATCHER = Event->timer (	3682	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3591	after => 5,
3592	interval => 10,
3593	hard => 1,
3594	prio => 0,
3595	data => WF_AUTOCANCEL,
3596	cb => sub {
3597	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	3683	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3598	},
3599	);	3684	};
3600	}	3685	}
3601		3686
3602	{	3687	{
3603	IO::AIO::min_parallel 8;	3688	IO::AIO::min_parallel 8;
3604		3689
3605	undef $Coro::AIO::WATCHER;	3690	undef $Coro::AIO::WATCHER;
3606	IO::AIO::max_poll_time $TICK * 0.1;	3691	IO::AIO::max_poll_time $TICK * 0.1;
3607	$AIO_POLL_WATCHER = Event->io (	3692	$AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb;
3608	reentrant => 0,
3609	data => WF_AUTOCANCEL,
3610	fd => IO::AIO::poll_fileno,
3611	poll => 'r',
3612	prio => 6,
3613	cb => \&IO::AIO::poll_cb,
3614	);
3615	}	3693	}
3616		3694
3617	my $_log_backtrace;	3695	my $_log_backtrace;
3618		3696
3619	sub _log_backtrace {	3697	sub _log_backtrace {
…		…
3623		3701
3624	# limit the # of concurrent backtraces	3702	# limit the # of concurrent backtraces
3625	if ($_log_backtrace < 2) {	3703	if ($_log_backtrace < 2) {
3626	++$_log_backtrace;	3704	++$_log_backtrace;
3627	async {	3705	async {
		3706	$Coro::current->{desc} = "abt $msg";
		3707
3628	my @bt = fork_call {	3708	my @bt = fork_call {
3629	@addr = map { sprintf "%x", $_ } @addr;	3709	@addr = map { sprintf "%x", $_ } @addr;
3630	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3710	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3631	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 \|"	3711	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 \|"
3632	or die "addr2line: $!";	3712	or die "addr2line: $!";

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.371 by root, Thu Sep 13 16:16:01 2007 UTC vs. Revision 1.399 by root, Sun Dec 16 02:50:33 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.371 by root, Thu Sep 13 16:16:01 2007 UTC vs.
Revision 1.399 by root, Sun Dec 16 02:50:33 2007 UTC