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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.373 by root, Sat Sep 15 15:58:06 2007 UTC vs.
Revision 1.398 by root, Wed Dec 5 11:08:34 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
…		…
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 \|\| {} });
…		…
1041	close $fh;	1094	close $fh;
1042		1095
1043	if (@$objs) {	1096	if (@$objs) {
1044	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) {
1045	chmod SAVE_MODE, $fh;	1098	chmod SAVE_MODE, $fh;
1046	my $data = Storable::nfreeze { version => 1, objs => $objs };	1099	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1047	aio_write $fh, 0, (length $data), $data, 0;	1100	aio_write $fh, 0, (length $data), $data, 0;
1048	aio_fsync $fh if $cf::USE_FSYNC;	1101	aio_fsync $fh if $cf::USE_FSYNC;
1049	close $fh;	1102	close $fh;
1050	aio_rename "$filename.pst~", "$filename.pst";	1103	aio_rename "$filename.pst~", "$filename.pst";
1051	}	1104	}
…		…
1082		1135
1083	unless (aio_stat "$filename.pst") {	1136	unless (aio_stat "$filename.pst") {
1084	(aio_load "$filename.pst", $av) >= 0	1137	(aio_load "$filename.pst", $av) >= 0
1085	or return;	1138	or return;
1086		1139
1087	$av = eval { (Storable::thaw $av)->{objs} };	1140	my $st = eval { Coro::Storable::thaw $av };
		1141	$av = $st->{objs};
1088	}	1142	}
1089		1143
1090	utf8::decode (my $decname = $filename);	1144	utf8::decode (my $decname = $filename);
1091	warn sprintf "loading %s (%d,%d)\n",	1145	warn sprintf "loading %s (%d,%d)\n",
1092	$decname, length $data, scalar @{$av \|\| []};	1146	$decname, length $data, scalar @{$av \|\| []};
…		…
1507		1561
1508	Expand crossfire pod fragments into protocol xml.	1562	Expand crossfire pod fragments into protocol xml.
1509		1563
1510	=cut	1564	=cut
1511		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
1512	sub expand_cfpod {	1577	sub expand_cfpod {
1513	((my $self), (local $_)) = @_;	1578	my ($self, $pod) = @_;
1514		1579
1515	# escape & and <	1580	my $xml;
1516	s/&/&/g;
1517	s/(?<![BIUGHT])</</g;
1518		1581
1519	# this is buggy, it needs to properly take care of nested <'s	1582	while () {
		1583	if ($pod =~ /\G( (?: [^BCGHITU]+ \| .(?!<) )+ )/xgcs) {
		1584	$group = $1;
1520		1585
1521	1 while	1586	$group =~ s/&/&/g;
1522	# replace B<>, I<>, U<> etc.	1587	$group =~ s/</</g;
1523	s/B<([^\>]*)>/<b>$1<\/b>/	1588
1524	\|\| s/I<([^\>]*)>/<i>$1<\/i>/	1589	$xml .= $group;
1525	\|\| s/U<([^\>]*)>/<u>$1<\/u>/	1590	} elsif ($pod =~ m%\G
1526	\|\| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/	1591	([BCGHITU])
1527	# replace G<male\|female> tags	1592	<
1528	\|\| s{G<([^>\|])\\|([^>])>}{	1593	(?:
1529	$self->gender ? $2 : $1	1594	([^<>]*) (?{ $group = $^N })
1530	}ge	1595	\| < $interior >
1531	# replace H<hint text>	1596	)
1532	\|\| s{H<([^\>]*)>}	1597	>
		1598	%gcsx
1533	{	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") {
1534	("<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>",
1535	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",	1618	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1536	"")	1619	"")
1537	[$self->{hintmode}]	1620	[$self->{hintmode}];
		1621	} else {
		1622	$xml .= "error processing '$code($data)' directive";
1538	}ge;	1623	}
		1624	} else {
		1625	if ($pod =~ /\G(.+)/) {
		1626	warn "parse error while expanding $pod (at $1)";
		1627	}
		1628	last;
		1629	}
		1630	}
1539		1631
		1632	for ($xml) {
1540	# create single paragraphs (very hackish)	1633	# create single paragraphs (very hackish)
1541	s/(?<=\S)\n(?=\w)/ /g;	1634	s/(?<=\S)\n(?=\w)/ /g;
1542		1635
1543	# compress some whitespace	1636	# compress some whitespace
1544	s/\s+\n/\n/g; # ws line-ends	1637	s/\s+\n/\n/g; # ws line-ends
1545	s/\n\n+/\n/g; # double lines	1638	s/\n\n+/\n/g; # double lines
1546	s/^\n+//; # beginning lines	1639	s/^\n+//; # beginning lines
1547	s/\n+$//; # ending lines	1640	s/\n+$//; # ending lines
		1641	}
1548		1642
1549	$_	1643	$xml
1550	}	1644	}
		1645
		1646	no re 'eval';
1551		1647
1552	sub hintmode {	1648	sub hintmode {
1553	$_[0]{hintmode} = $_[1] if @_ > 1;	1649	$_[0]{hintmode} = $_[1] if @_ > 1;
1554	$_[0]{hintmode}	1650	$_[0]{hintmode}
1555	}	1651	}
…		…
2036	}	2132	}
2037		2133
2038	$MAP_PREFETCH{$path} \|= $load;	2134	$MAP_PREFETCH{$path} \|= $load;
2039		2135
2040	$MAP_PREFETCHER \|\|= cf::async {	2136	$MAP_PREFETCHER \|\|= cf::async {
		2137	$Coro::current->{desc} = "map prefetcher";
		2138
2041	while (%MAP_PREFETCH) {	2139	while (%MAP_PREFETCH) {
2042	while (my ($k, $v) = each %MAP_PREFETCH) {	2140	while (my ($k, $v) = each %MAP_PREFETCH) {
2043	if (my $map = find $k) {	2141	if (my $map = find $k) {
2044	$map->load if $v;	2142	$map->load if $v;
2045	}	2143	}
…		…
2071	return if $self->{deny_save};	2169	return if $self->{deny_save};
2072		2170
2073	local $self->{last_access} = $self->last_access;#d#	2171	local $self->{last_access} = $self->last_access;#d#
2074		2172
2075	cf::async {	2173	cf::async {
		2174	$Coro::current->{desc} = "map player save";
2076	$_->contr->save for $self->players;	2175	$_->contr->save for $self->players;
2077	};	2176	};
2078		2177
2079	if ($uniq) {	2178	if ($uniq) {
2080	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);	2179	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);
…		…
2267	=cut	2366	=cut
2268		2367
2269	sub deref {	2368	sub deref {
2270	my ($ref) = @_;	2369	my ($ref) = @_;
2271		2370
2272	# temporary compatibility#TODO#remove
2273	$ref =~ s{^<}{player/<};
2274
2275	if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {	2371	if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2276	my ($uuid, $name) = ($1, $2);	2372	my ($uuid, $name) = ($1, $2);
2277	my $pl = $cf::PLAYER_LOADING{$name} \|\| cf::player::find $name	2373	my $pl = $cf::PLAYER_LOADING{$name} \|\| cf::player::find $name
2278	or return;	2374	or return;
2279	$pl->ob->uuid eq $uuid	2375	$pl->ob->uuid eq $uuid
2280	or return;	2376	or return;
…		…
2451	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2547	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2452		2548
2453	$self->enter_link;	2549	$self->enter_link;
2454		2550
2455	(async {	2551	(async {
		2552	$Coro::current->{desc} = "player::goto $path $x $y";
		2553
2456	# *tag paths override both path and x\|y	2554	# *tag paths override both path and x\|y
2457	if ($path =~ /^\(.)$/) {	2555	if ($path =~ /^\(.)$/) {
2458	if (my @obs = grep $_->map, ext::map_tags::find $1) {	2556	if (my @obs = grep $_->map, ext::map_tags::find $1) {
2459	my $ob = $obs[rand @obs];	2557	my $ob = $obs[rand @obs];
2460		2558
…		…
2540	$rmp->{origin_y} = $exit->y;	2638	$rmp->{origin_y} = $exit->y;
2541	}	2639	}
2542		2640
2543	$rmp->{random_seed} \|\|= $exit->random_seed;	2641	$rmp->{random_seed} \|\|= $exit->random_seed;
2544		2642
2545	my $data = cf::to_json $rmp;	2643	my $data = cf::encode_json $rmp;
2546	my $md5 = Digest::MD5::md5_hex $data;	2644	my $md5 = Digest::MD5::md5_hex $data;
2547	my $meta = "$RANDOMDIR/$md5.meta";	2645	my $meta = "$RANDOMDIR/$md5.meta";
2548		2646
2549	if (my $fh = aio_open "$meta~", O_WRONLY \| O_CREAT, 0666) {	2647	if (my $fh = aio_open "$meta~", O_WRONLY \| O_CREAT, 0666) {
2550	aio_write $fh, 0, (length $data), $data, 0;	2648	aio_write $fh, 0, (length $data), $data, 0;
…		…
2577	# if exit is damned, update players death & WoR home-position	2675	# if exit is damned, update players death & WoR home-position
2578	$self->contr->savebed ($slaying, $hp, $sp)	2676	$self->contr->savebed ($slaying, $hp, $sp)
2579	if $exit->flag (FLAG_DAMNED);	2677	if $exit->flag (FLAG_DAMNED);
2580		2678
2581	(async {	2679	(async {
		2680	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2681
2582	$self->deactivate_recursive; # just to be sure	2682	$self->deactivate_recursive; # just to be sure
2583	unless (eval {	2683	unless (eval {
2584	$self->goto ($slaying, $hp, $sp);	2684	$self->goto ($slaying, $hp, $sp);
2585		2685
2586	1;	2686	1;
…		…
2621	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
2622	the message unless the client supports the msg packet.	2722	the message unless the client supports the msg packet.
2623		2723
2624	=cut	2724	=cut
2625		2725
		2726	# non-persistent channels (usually the info channel)
2626	our %CHANNEL = (	2727	our %CHANNEL = (
2627	"c/identify" => {	2728	"c/identify" => {
2628	id => "identify",	2729	id => "infobox",
2629	title => "Identify",	2730	title => "Identify",
2630	reply => undef,	2731	reply => undef,
2631	tooltip => "Items recently identified",	2732	tooltip => "Items recently identified",
2632	},	2733	},
2633	"c/examine" => {	2734	"c/examine" => {
2634	id => "examine",	2735	id => "infobox",
2635	title => "Examine",	2736	title => "Examine",
2636	reply => undef,	2737	reply => undef,
2637	tooltip => "Signs and other items you examined",	2738	tooltip => "Signs and other items you examined",
2638	},	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	},
2639	);	2776	);
2640		2777
2641	sub cf::client::send_msg {	2778	sub cf::client::send_msg {
2642	my ($self, $channel, $msg, $color, @extra) = @_;	2779	my ($self, $channel, $msg, $color, @extra) = @_;
2643		2780
2644	$msg = $self->pl->expand_cfpod ($msg);	2781	$msg = $self->pl->expand_cfpod ($msg);
2645		2782
2646	$color &= cf::NDI_CLIENT_MASK; # just in case...	2783	$color &= cf::NDI_CLIENT_MASK; # just in case...
2647		2784
2648	# check predefined channels, for the benefit of C	2785	# check predefined channels, for the benefit of C
2649	$channel = $CHANNEL{$channel} if $CHANNEL{$channel};	2786	if ($CHANNEL{$channel}) {
		2787	$channel = $CHANNEL{$channel};
2650		2788
		2789	$self->ext_msg (channel_info => $channel)
		2790	if $self->can_msg;
		2791
		2792	$channel = $channel->{id};
		2793
2651	if (ref $channel) {	2794	} elsif (ref $channel) {
2652	# send meta info to client, if not yet sent	2795	# send meta info to client, if not yet sent
2653	unless (exists $self->{channel}{$channel->{id}}) {	2796	unless (exists $self->{channel}{$channel->{id}}) {
2654	$self->{channel}{$channel->{id}} = $channel;	2797	$self->{channel}{$channel->{id}} = $channel;
2655	$self->ext_msg (channel_info => $channel)	2798	$self->ext_msg (channel_info => $channel)
2656	if $self->can_msg;	2799	if $self->can_msg;
…		…
2873	=pod	3016	=pod
2874		3017
2875	The following functions and methods are available within a safe environment:	3018	The following functions and methods are available within a safe environment:
2876		3019
2877	cf::object	3020	cf::object
2878	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
2879	insert remove name archname title slaying race decrease_ob_nr	3022	insert remove name archname title slaying race decrease_ob_nr
2880		3023
2881	cf::object::player	3024	cf::object::player
2882	player	3025	player
2883		3026
…		…
2890	=cut	3033	=cut
2891		3034
2892	for (	3035	for (
2893	["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
2894	insert remove inv name archname title slaying race	3037	insert remove inv name archname title slaying race
2895	decrease_ob_nr)],	3038	decrease_ob_nr destroy)],
2896	["cf::object::player" => qw(player)],	3039	["cf::object::player" => qw(player)],
2897	["cf::player" => qw(peaceful)],	3040	["cf::player" => qw(peaceful)],
2898	["cf::map" => qw(trigger)],	3041	["cf::map" => qw(trigger)],
2899	) {	3042	) {
2900	no strict 'refs';	3043	no strict 'refs';
…		…
3175	sub main {	3318	sub main {
3176	# we must not ever block the main coroutine	3319	# we must not ever block the main coroutine
3177	local $Coro::idle = sub {	3320	local $Coro::idle = sub {
3178	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#
3179	(async {	3322	(async {
3180	Event::one_event;	3323	$Coro::current->{desc} = "IDLE BUG HANDLER";
		3324	EV::loop EV::LOOP_ONESHOT;
3181	})->prio (Coro::PRIO_MAX);	3325	})->prio (Coro::PRIO_MAX);
3182	};	3326	};
3183		3327
3184	reload_config;	3328	reload_config;
3185	db_init;	3329	db_init;
3186	load_extensions;	3330	load_extensions;
3187		3331
3188	$TICK_WATCHER->start;	3332	$TICK_WATCHER->start;
		3333	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3189	Event::loop;	3334	EV::loop;
3190	}	3335	}
3191		3336
3192	#############################################################################	3337	#############################################################################
3193	# initialisation and cleanup	3338	# initialisation and cleanup
3194		3339
3195	# install some emergency cleanup handlers	3340	# install some emergency cleanup handlers
3196	BEGIN {	3341	BEGIN {
		3342	our %SIGWATCHER = ();
3197	for my $signal (qw(INT HUP TERM)) {	3343	for my $signal (qw(INT HUP TERM)) {
3198	Event->signal (	3344	$SIGWATCHER{$signal} = EV::signal $signal, sub {
3199	reentrant => 0,
3200	data => WF_AUTOCANCEL,
3201	signal => $signal,
3202	prio => 0,
3203	cb => sub {
3204	cf::cleanup "SIG$signal";	3345	cf::cleanup "SIG$signal";
3205	},
3206	);	3346	};
3207	}	3347	}
3208	}	3348	}
3209		3349
3210	sub write_runtime {	3350	sub write_runtime {
3211	my $runtime = "$LOCALDIR/runtime";	3351	my $runtime = "$LOCALDIR/runtime";
…		…
3256	# and maps saved/destroyed asynchronously.	3396	# and maps saved/destroyed asynchronously.
3257	warn "begin emergency player save\n";	3397	warn "begin emergency player save\n";
3258	for my $login (keys %cf::PLAYER) {	3398	for my $login (keys %cf::PLAYER) {
3259	my $pl = $cf::PLAYER{$login} or next;	3399	my $pl = $cf::PLAYER{$login} or next;
3260	$pl->valid or next;	3400	$pl->valid or next;
		3401	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3261	$pl->save;	3402	$pl->save;
3262	}	3403	}
3263	warn "end emergency player save\n";	3404	warn "end emergency player save\n";
3264		3405
3265	warn "begin emergency map save\n";	3406	warn "begin emergency map save\n";
…		…
3304	warn "syncing database to disk";	3445	warn "syncing database to disk";
3305	BDB::db_env_txn_checkpoint $DB_ENV;	3446	BDB::db_env_txn_checkpoint $DB_ENV;
3306		3447
3307	# 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
3308		3449
3309	warn "cancelling all WF_AUTOCANCEL watchers";
3310	for (Event::all_watchers) {
3311	$_->cancel if $_->data & WF_AUTOCANCEL;
3312	}
3313
3314	warn "flushing outstanding aio requests";	3450	warn "flushing outstanding aio requests";
3315	for (;;) {	3451	for (;;) {
3316	BDB::flush;	3452	BDB::flush;
3317	IO::AIO::flush;	3453	IO::AIO::flush;
3318	Coro::cede;	3454	Coro::cede_notself;
3319	last unless IO::AIO::nreqs \|\| BDB::nreqs;	3455	last unless IO::AIO::nreqs \|\| BDB::nreqs;
3320	warn "iterate...";	3456	warn "iterate...";
3321	}	3457	}
3322		3458
3323	++$RELOAD;	3459	++$RELOAD;
…		…
3412		3548
3413	sub reload_perl() {	3549	sub reload_perl() {
3414	# doing reload synchronously and two reloads happen back-to-back,	3550	# doing reload synchronously and two reloads happen back-to-back,
3415	# coro crashes during coro_state_free->destroy here.	3551	# coro crashes during coro_state_free->destroy here.
3416		3552
3417	$RELOAD_WATCHER \|\|= Event->timer (	3553	$RELOAD_WATCHER \|\|= EV::timer 0, 0, sub {
3418	reentrant => 0,
3419	after => 0,
3420	data => WF_AUTOCANCEL,
3421	cb => sub {
3422	do_reload_perl;
3423	undef $RELOAD_WATCHER;	3554	undef $RELOAD_WATCHER;
3424	},	3555	do_reload_perl;
3425	);	3556	};
3426	}	3557	}
3427		3558
3428	register_command "reload" => sub {	3559	register_command "reload" => sub {
3429	my ($who, $arg) = @_;	3560	my ($who, $arg) = @_;
3430		3561
3431	if ($who->flag (FLAG_WIZ)) {	3562	if ($who->flag (FLAG_WIZ)) {
3432	$who->message ("reloading server.");	3563	$who->message ("reloading server.");
		3564	async {
		3565	$Coro::current->{desc} = "perl_reload";
3433	async { reload_perl };	3566	reload_perl;
		3567	};
3434	}	3568	}
3435	};	3569	};
3436		3570
3437	unshift @INC, $LIBDIR;	3571	unshift @INC, $LIBDIR;
3438		3572
…		…
3457	my $signal = new Coro::Signal;	3591	my $signal = new Coro::Signal;
3458	push @WAIT_FOR_TICK_BEGIN, $signal;	3592	push @WAIT_FOR_TICK_BEGIN, $signal;
3459	$signal->wait;	3593	$signal->wait;
3460	}	3594	}
3461		3595
3462	$TICK_WATCHER = Event->timer (	3596	$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3463	reentrant => 0,
3464	parked => 1,
3465	prio => 0,
3466	at => $NEXT_TICK \|\| $TICK,
3467	data => WF_AUTOCANCEL,
3468	cb => sub {
3469	if ($Coro::current != $Coro::main) {	3597	if ($Coro::current != $Coro::main) {
3470	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"
3471	unless ++$bug_warning > 10;	3599	unless ++$bug_warning > 10;
3472	return;	3600	return;
3473	}	3601	}
3474		3602
3475	$NOW = $tick_start = Event::time;	3603	$NOW = $tick_start = EV::now;
3476		3604
3477	cf::server_tick; # one server iteration	3605	cf::server_tick; # one server iteration
3478		3606
3479	$RUNTIME += $TICK;	3607	$RUNTIME += $TICK;
3480	$NEXT_TICK += $TICK;	3608	$NEXT_TICK += $TICK;
3481		3609
3482	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3610	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3483	$NEXT_RUNTIME_WRITE = $NOW + 10;	3611	$NEXT_RUNTIME_WRITE = $NOW + 10;
3484	Coro::async_pool {	3612	Coro::async_pool {
		3613	$Coro::current->{desc} = "runtime saver";
3485	write_runtime	3614	write_runtime
3486	or warn "ERROR: unable to write runtime file: $!";	3615	or warn "ERROR: unable to write runtime file: $!";
3487	};
3488	}	3616	};
		3617	}
3489		3618
3490	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3619	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3491	$sig->send;	3620	$sig->send;
3492	}	3621	}
3493	while (my $sig = shift @WAIT_FOR_TICK) {	3622	while (my $sig = shift @WAIT_FOR_TICK) {
3494	$sig->send;	3623	$sig->send;
3495	}	3624	}
3496		3625
3497	$NOW = Event::time;
3498
3499	# if we are delayed by four ticks or more, skip them all
3500	$NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3501
3502	$TICK_WATCHER->at ($NEXT_TICK);
3503	$TICK_WATCHER->start;
3504
3505	$LOAD = ($NOW - $tick_start) / $TICK;	3626	$LOAD = ($NOW - $tick_start) / $TICK;
3506	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3627	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3507		3628
3508	_post_tick;	3629	_post_tick;
3509	},	3630	};
3510	);	3631	$TICK_WATCHER->priority (EV::MAXPRI);
3511		3632
3512	{	3633	{
3513	BDB::min_parallel 8;	3634	BDB::min_parallel 8;
3514	BDB::max_poll_time $TICK * 0.1;	3635	BDB::max_poll_time $TICK * 0.1;
3515	$BDB_POLL_WATCHER = Event->io (	3636	$BDB_POLL_WATCHER = EV::io BDB::poll_fileno, EV::READ, \&BDB::poll_cb;
3516	reentrant => 0,
3517	fd => BDB::poll_fileno,
3518	poll => 'r',
3519	prio => 0,
3520	data => WF_AUTOCANCEL,
3521	cb => \&BDB::poll_cb,
3522	);
3523		3637
3524	BDB::set_sync_prepare {	3638	BDB::set_sync_prepare {
3525	my $status;	3639	my $status;
3526	my $current = $Coro::current;	3640	my $current = $Coro::current;
3527	(	3641	(
…		…
3557		3671
3558	cf::cleanup "db_env_open(db): $@" if $@;	3672	cf::cleanup "db_env_open(db): $@" if $@;
3559	};	3673	};
3560	}	3674	}
3561		3675
3562	$BDB_DEADLOCK_WATCHER = Event->timer (	3676	$BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3563	after => 3,
3564	interval => 1,
3565	hard => 1,
3566	prio => 0,
3567	data => WF_AUTOCANCEL,
3568	cb => sub {
3569	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 { };
3570	},
3571	);	3678	};
3572	$BDB_CHECKPOINT_WATCHER = Event->timer (	3679	$BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3573	after => 11,
3574	interval => 60,
3575	hard => 1,
3576	prio => 0,
3577	data => WF_AUTOCANCEL,
3578	cb => sub {
3579	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	3680	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3580	},
3581	);	3681	};
3582	$BDB_TRICKLE_WATCHER = Event->timer (	3682	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3583	after => 5,
3584	interval => 10,
3585	hard => 1,
3586	prio => 0,
3587	data => WF_AUTOCANCEL,
3588	cb => sub {
3589	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	3683	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3590	},
3591	);	3684	};
3592	}	3685	}
3593		3686
3594	{	3687	{
3595	IO::AIO::min_parallel 8;	3688	IO::AIO::min_parallel 8;
3596		3689
3597	undef $Coro::AIO::WATCHER;	3690	undef $Coro::AIO::WATCHER;
3598	IO::AIO::max_poll_time $TICK * 0.1;	3691	IO::AIO::max_poll_time $TICK * 0.1;
3599	$AIO_POLL_WATCHER = Event->io (	3692	$AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb;
3600	reentrant => 0,
3601	data => WF_AUTOCANCEL,
3602	fd => IO::AIO::poll_fileno,
3603	poll => 'r',
3604	prio => 6,
3605	cb => \&IO::AIO::poll_cb,
3606	);
3607	}	3693	}
3608		3694
3609	my $_log_backtrace;	3695	my $_log_backtrace;
3610		3696
3611	sub _log_backtrace {	3697	sub _log_backtrace {
…		…
3615		3701
3616	# limit the # of concurrent backtraces	3702	# limit the # of concurrent backtraces
3617	if ($_log_backtrace < 2) {	3703	if ($_log_backtrace < 2) {
3618	++$_log_backtrace;	3704	++$_log_backtrace;
3619	async {	3705	async {
		3706	$Coro::current->{desc} = "abt $msg";
		3707
3620	my @bt = fork_call {	3708	my @bt = fork_call {
3621	@addr = map { sprintf "%x", $_ } @addr;	3709	@addr = map { sprintf "%x", $_ } @addr;
3622	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3710	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3623	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 \|"
3624	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.373 by root, Sat Sep 15 15:58:06 2007 UTC vs. Revision 1.398 by root, Wed Dec 5 11:08:34 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.373 by root, Sat Sep 15 15:58:06 2007 UTC vs.
Revision 1.398 by root, Wed Dec 5 11:08:34 2007 UTC