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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.379 by root, Thu Oct 4 23:59:07 2007 UTC vs.
Revision 1.411 by root, Fri Feb 1 15:54:07 2008 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 1.86;
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.32 ();
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::BDB;
23	use Coro::Storable;	24	use Coro::Storable;
24	use Coro::Util ();	25	use Coro::Util ();
25		26
26	use JSON::XS ();	27	use JSON::XS 2.01 ();
27	use BDB ();	28	use BDB ();
28	use Data::Dumper;	29	use Data::Dumper;
29	use Digest::MD5;	30	use Digest::MD5;
30	use Fcntl;	31	use Fcntl;
31	use YAML::Syck ();	32	use YAML ();
32	use IO::AIO 2.32 ();	33	use IO::AIO 2.51 ();
33	use Time::HiRes;	34	use Time::HiRes;
34	use Compress::LZF;	35	use Compress::LZF;
35	use Digest::MD5 ();	36	use Digest::MD5 ();
36		37
37	# configure various modules to our taste	38	# configure various modules to our taste
38	#	39	#
39	$Storable::canonical = 1; # reduce rsync transfers	40	$Storable::canonical = 1; # reduce rsync transfers
40	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator	41	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	42	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
45	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46	$YAML::Syck::ImplicitUnicode = 1;
47		43
48	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority	44	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49		45
50	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	46	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51		47
…		…
70	our $TMPDIR = "$LOCALDIR/" . tmpdir;	66	our $TMPDIR = "$LOCALDIR/" . tmpdir;
71	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	67	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	68	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73	our $RANDOMDIR = "$LOCALDIR/random";	69	our $RANDOMDIR = "$LOCALDIR/random";
74	our $BDBDIR = "$LOCALDIR/db";	70	our $BDBDIR = "$LOCALDIR/db";
		71	our %RESOURCE;
75		72
76	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	73	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77	our $TICK_WATCHER;	74	our $TICK_WATCHER;
78	our $AIO_POLL_WATCHER;	75	our $AIO_POLL_WATCHER;
79	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	76	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80	our $NEXT_TICK;	77	our $NEXT_TICK;
81	our $NOW;
82	our $USE_FSYNC = 1; # use fsync to write maps - default off	78	our $USE_FSYNC = 1; # use fsync to write maps - default off
83		79
84	our $BDB_POLL_WATCHER;	80	our $BDB_POLL_WATCHER;
85	our $BDB_DEADLOCK_WATCHER;	81	our $BDB_DEADLOCK_WATCHER;
86	our $BDB_CHECKPOINT_WATCHER;	82	our $BDB_CHECKPOINT_WATCHER;
…		…
89		85
90	our %CFG;	86	our %CFG;
91		87
92	our $UPTIME; $UPTIME \|\|= time;	88	our $UPTIME; $UPTIME \|\|= time;
93	our $RUNTIME;	89	our $RUNTIME;
		90	our $NOW;
94		91
95	our (%PLAYER, %PLAYER_LOADING); # all users	92	our (%PLAYER, %PLAYER_LOADING); # all users
96	our (%MAP, %MAP_LOADING ); # all maps	93	our (%MAP, %MAP_LOADING ); # all maps
97	our $LINK_MAP; # the special {link} map, which is always available	94	our $LINK_MAP; # the special {link} map, which is always available
98		95
…		…
162		159
163	The raw value load value from the last tick.	160	The raw value load value from the last tick.
164		161
165	=item %cf::CFG	162	=item %cf::CFG
166		163
167	Configuration for the server, loaded from C</etc/crossfire/config>, or	164	Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168	from wherever your confdir points to.	165	from wherever your confdir points to.
169		166
170	=item cf::wait_for_tick, cf::wait_for_tick_begin	167	=item cf::wait_for_tick, cf::wait_for_tick_begin
171		168
172	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	169	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
…		…
193	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	190	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194		191
195	LOG llevError, $msg;	192	LOG llevError, $msg;
196	};	193	};
197	}	194	}
		195
		196	$Coro::State::DIEHOOK = sub {
		197	return unless $^S eq 0; # "eq", not "=="
		198
		199	if ($Coro::current == $Coro::main) {#d#
		200	warn "DIEHOOK called in main context, Coro bug?\n";#d#
		201	return;#d#
		202	}#d#
		203
		204	# kill coroutine otherwise
		205	warn Carp::longmess $_[0];
		206	Coro::terminate
		207	};
		208
		209	$SIG{__DIE__} = sub { }; #d#?
198		210
199	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	211	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	212	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	213	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	214	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
…		…
215	)) {	227	)) {
216	no strict 'refs';	228	no strict 'refs';
217	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	229	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218	}	230	}
219		231
220	$Event::DIED = sub {	232	$EV::DIED = sub {
221	warn "error in event callback: @_";	233	warn "error in event callback: @_";
222	};	234	};
223		235
224	#############################################################################	236	#############################################################################
225		237
…		…
248	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	260	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249	$d	261	$d
250	} \|\| "[unable to dump $_[0]: '$@']";	262	} \|\| "[unable to dump $_[0]: '$@']";
251	}	263	}
252		264
253	=item $ref = cf::from_json $json	265	=item $ref = cf::decode_json $json
254		266
255	Converts a JSON string into the corresponding perl data structure.	267	Converts a JSON string into the corresponding perl data structure.
256		268
257	=item $json = cf::to_json $ref	269	=item $json = cf::encode_json $ref
258		270
259	Converts a perl data structure into its JSON representation.	271	Converts a perl data structure into its JSON representation.
260		272
261	=cut	273	=cut
262		274
263	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	275	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264		276
265	sub to_json ($) { $json_coder->encode ($_[0]) }	277	sub encode_json($) { $json_coder->encode ($_[0]) }
266	sub from_json ($) { $json_coder->decode ($_[0]) }	278	sub decode_json($) { $json_coder->decode ($_[0]) }
267		279
268	=item cf::lock_wait $string	280	=item cf::lock_wait $string
269		281
270	Wait until the given lock is available. See cf::lock_acquire.	282	Wait until the given lock is available. See cf::lock_acquire.
271		283
…		…
334	my $guard = Coro::guard {	346	my $guard = Coro::guard {
335	$TICK_WATCHER->start;	347	$TICK_WATCHER->start;
336	};	348	};
337	$TICK_WATCHER->stop;	349	$TICK_WATCHER->stop;
338	$guard	350	$guard
		351	}
		352
		353	=item cf::periodic $interval, $cb
		354
		355	Like EV::periodic, but randomly selects a starting point so that the actions
		356	get spread over timer.
		357
		358	=cut
		359
		360	sub periodic($$) {
		361	my ($interval, $cb) = @_;
		362
		363	my $start = rand List::Util::min 180, $interval;
		364
		365	EV::periodic $start, $interval, 0, $cb
339	}	366	}
340		367
341	=item cf::get_slot $time[, $priority[, $name]]	368	=item cf::get_slot $time[, $priority[, $name]]
342		369
343	Allocate $time seconds of blocking CPU time at priority C<$priority>:	370	Allocate $time seconds of blocking CPU time at priority C<$priority>:
…		…
373	}	400	}
374	}	401	}
375	}	402	}
376		403
377	if (@SLOT_QUEUE) {	404	if (@SLOT_QUEUE) {
378	# we do not use wait_For_tick() as it returns immediately when tick is inactive	405	# we do not use wait_for_tick() as it returns immediately when tick is inactive
379	push @cf::WAIT_FOR_TICK, $signal;	406	push @cf::WAIT_FOR_TICK, $signal;
380	$signal->wait;	407	$signal->wait;
381	} else {	408	} else {
382	Coro::schedule;	409	Coro::schedule;
383	}	410	}
…		…
406		433
407	BEGIN { *async = \&Coro::async_pool }	434	BEGIN { *async = \&Coro::async_pool }
408		435
409	=item cf::sync_job { BLOCK }	436	=item cf::sync_job { BLOCK }
410		437
411	The design of Crossfire TRT requires that the main coroutine ($Coro::main)	438	The design of Deliantra requires that the main coroutine ($Coro::main)
412	is always able to handle events or runnable, as Crossfire TRT is only	439	is always able to handle events or runnable, as Deliantra is only
413	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not	440	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414	acceptable.	441	acceptable.
415		442
416	If it must be done, put the blocking parts into C<sync_job>. This will run	443	If it must be done, put the blocking parts into C<sync_job>. This will run
417	the given BLOCK in another coroutine while waiting for the result. The	444	the given BLOCK in another coroutine while waiting for the result. The
…		…
422		449
423	sub sync_job(&) {	450	sub sync_job(&) {
424	my ($job) = @_;	451	my ($job) = @_;
425		452
426	if ($Coro::current == $Coro::main) {	453	if ($Coro::current == $Coro::main) {
427	my $time = Event::time;	454	my $time = EV::time;
428		455
429	# this is the main coro, too bad, we have to block	456	# this is the main coro, too bad, we have to block
430	# till the operation succeeds, freezing the server :/	457	# till the operation succeeds, freezing the server :/
431		458
432	LOG llevError \| logBacktrace, Carp::longmess "sync job";#d#	459	LOG llevError, Carp::longmess "sync job";#d#
433		460
434	# TODO: use suspend/resume instead	461	# TODO: use suspend/resume instead
435	# (but this is cancel-safe)	462	# (but this is cancel-safe)
436	my $freeze_guard = freeze_mainloop;	463	my $freeze_guard = freeze_mainloop;
437		464
…		…
444	warn $@ if $@;	471	warn $@ if $@;
445	undef $busy;	472	undef $busy;
446	})->prio (Coro::PRIO_MAX);	473	})->prio (Coro::PRIO_MAX);
447		474
448	while ($busy) {	475	while ($busy) {
449	Coro::cede or Event::one_event;	476	if (Coro::nready) {
		477	Coro::cede_notself;
		478	} else {
		479	EV::loop EV::LOOP_ONESHOT;
450	}	480	}
		481	}
451		482
452	$time = Event::time - $time;	483	$time = EV::time - $time;
453		484
454	LOG llevError \| logBacktrace, Carp::longmess "long sync job"	485	LOG llevError \| logBacktrace, Carp::longmess "long sync job"
455	if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;	486	if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
456		487
457	$tick_start += $time; # do not account sync jobs to server load	488	$tick_start += $time; # do not account sync jobs to server load
…		…
487	=item fork_call { }, $args	518	=item fork_call { }, $args
488		519
489	Executes the given code block with the given arguments in a seperate	520	Executes the given code block with the given arguments in a seperate
490	process, returning the results. Everything must be serialisable with	521	process, returning the results. Everything must be serialisable with
491	Coro::Storable. May, of course, block. Note that the executed sub may	522	Coro::Storable. May, of course, block. Note that the executed sub may
492	never block itself or use any form of Event handling.	523	never block itself or use any form of event handling.
493		524
494	=cut	525	=cut
495		526
496	sub fork_call(&@) {	527	sub fork_call(&@) {
497	my ($cb, @args) = @_;	528	my ($cb, @args) = @_;
…		…
658	attach callbacks/event handlers (a collection of which is called an "attachment")	689	attach callbacks/event handlers (a collection of which is called an "attachment")
659	to it. All such attachable objects support the following methods.	690	to it. All such attachable objects support the following methods.
660		691
661	In the following description, CLASS can be any of C<global>, C<object>	692	In the following description, CLASS can be any of C<global>, C<object>
662	C<player>, C<client> or C<map> (i.e. the attachable objects in	693	C<player>, C<client> or C<map> (i.e. the attachable objects in
663	Crossfire TRT).	694	Deliantra).
664		695
665	=over 4	696	=over 4
666		697
667	=item $attachable->attach ($attachment, key => $value...)	698	=item $attachable->attach ($attachment, key => $value...)
668		699
…		…
950	}	981	}
951		982
952	0	983	0
953	}	984	}
954		985
955	=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...)	986	=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
956		987
957	=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)	988	=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
958		989
959	Generate an object-specific event with the given arguments.	990	Generate an object-specific event with the given arguments.
960		991
…		…
966		997
967	=cut	998	=cut
968		999
969	#############################################################################	1000	#############################################################################
970	# object support	1001	# object support
971	#
972		1002
		1003	sub _object_equal($$);
		1004	sub _object_equal($$) {
		1005	my ($a, $b) = @_;
		1006
		1007	return 0 unless (ref $a) eq (ref $b);
		1008
		1009	if ("HASH" eq ref $a) {
		1010	my @ka = keys %$a;
		1011	my @kb = keys %$b;
		1012
		1013	return 0 if @ka != @kb;
		1014
		1015	for (0 .. $#ka) {
		1016	return 0 unless $ka[$_] eq $kb[$_];
		1017	return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
		1018	}
		1019
		1020	} elsif ("ARRAY" eq ref $a) {
		1021
		1022	return 0 if @$a != @$b;
		1023
		1024	for (0 .. $#$a) {
		1025	return 0 unless _object_equal $a->[$_], $b->[$_];
		1026	}
		1027
		1028	} elsif ($a ne $b) {
		1029	return 0;
		1030	}
		1031
		1032	1
		1033	}
		1034
		1035	our $SLOW_MERGES;#d#
973	sub _can_merge {	1036	sub _can_merge {
974	my ($ob1, $ob2) = @_;	1037	my ($ob1, $ob2) = @_;
975		1038
976	local $Storable::canonical = 1;	1039	++$SLOW_MERGES;#d#
977	my $fob1 = Storable::freeze $ob1;
978	my $fob2 = Storable::freeze $ob2;
979		1040
980	$fob1 eq $fob2	1041	# we do the slow way here
		1042	return _object_equal $ob1, $ob2
981	}	1043	}
982		1044
983	sub reattach {	1045	sub reattach {
984	# basically do the same as instantiate, without calling instantiate	1046	# basically do the same as instantiate, without calling instantiate
985	my ($obj) = @_;	1047	my ($obj) = @_;
…		…
1007	cf::attachable->attach (	1069	cf::attachable->attach (
1008	prio => -1000000,	1070	prio => -1000000,
1009	on_instantiate => sub {	1071	on_instantiate => sub {
1010	my ($obj, $data) = @_;	1072	my ($obj, $data) = @_;
1011		1073
1012	$data = from_json $data;	1074	$data = decode_json $data;
1013		1075
1014	for (@$data) {	1076	for (@$data) {
1015	my ($name, $args) = @$_;	1077	my ($name, $args) = @$_;
1016		1078
1017	$obj->attach ($name, %{$args \|\| {} });	1079	$obj->attach ($name, %{$args \|\| {} });
…		…
1046	close $fh;	1108	close $fh;
1047		1109
1048	if (@$objs) {	1110	if (@$objs) {
1049	if (my $fh = aio_open "$filename.pst~", O_WRONLY \| O_CREAT, 0600) {	1111	if (my $fh = aio_open "$filename.pst~", O_WRONLY \| O_CREAT, 0600) {
1050	chmod SAVE_MODE, $fh;	1112	chmod SAVE_MODE, $fh;
1051	my $data = Storable::nfreeze { version => 1, objs => $objs };	1113	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1052	aio_write $fh, 0, (length $data), $data, 0;	1114	aio_write $fh, 0, (length $data), $data, 0;
1053	aio_fsync $fh if $cf::USE_FSYNC;	1115	aio_fsync $fh if $cf::USE_FSYNC;
1054	close $fh;	1116	close $fh;
1055	aio_rename "$filename.pst~", "$filename.pst";	1117	aio_rename "$filename.pst~", "$filename.pst";
1056	}	1118	}
…		…
1087		1149
1088	unless (aio_stat "$filename.pst") {	1150	unless (aio_stat "$filename.pst") {
1089	(aio_load "$filename.pst", $av) >= 0	1151	(aio_load "$filename.pst", $av) >= 0
1090	or return;	1152	or return;
1091		1153
1092	$av = eval { (Storable::thaw $av)->{objs} };	1154	my $st = eval { Coro::Storable::thaw $av };
		1155	$av = $st->{objs};
1093	}	1156	}
1094		1157
1095	utf8::decode (my $decname = $filename);	1158	utf8::decode (my $decname = $filename);
1096	warn sprintf "loading %s (%d,%d)\n",	1159	warn sprintf "loading %s (%d,%d)\n",
1097	$decname, length $data, scalar @{$av \|\| []};	1160	$decname, length $data, scalar @{$av \|\| []};
…		…
1253	my $msg = $@ ? "$v->{path}: $@\n"	1316	my $msg = $@ ? "$v->{path}: $@\n"
1254	: "$v->{base}: extension inactive.\n";	1317	: "$v->{base}: extension inactive.\n";
1255		1318
1256	if (exists $v->{meta}{mandatory}) {	1319	if (exists $v->{meta}{mandatory}) {
1257	warn $msg;	1320	warn $msg;
1258	warn "mandatory extension failed to load, exiting.\n";	1321	cf::cleanup "mandatory extension failed to load, exiting.";
1259	exit 1;
1260	}	1322	}
1261		1323
1262	warn $msg;	1324	warn $msg;
1263	}	1325	}
1264		1326
…		…
1512		1574
1513	Expand crossfire pod fragments into protocol xml.	1575	Expand crossfire pod fragments into protocol xml.
1514		1576
1515	=cut	1577	=cut
1516		1578
		1579	use re 'eval';
		1580
		1581	my $group;
		1582	my $interior; $interior = qr{
		1583	# match a pod interior sequence sans C<< >>
		1584	(?:
		1585	\ (.*?)\ (?{ $group = $^N })
		1586	\| < (??{$interior}) >
		1587	)
		1588	}x;
		1589
1517	sub expand_cfpod {	1590	sub expand_cfpod {
1518	((my $self), (local $_)) = @_;	1591	my ($self, $pod) = @_;
1519		1592
1520	# escape & and <	1593	my $xml;
1521	s/&/&/g;
1522	s/(?<![BIUGHT])</</g;
1523		1594
1524	# this is buggy, it needs to properly take care of nested <'s	1595	while () {
		1596	if ($pod =~ /\G( (?: [^BCGHITU]+ \| .(?!<) )+ )/xgcs) {
		1597	$group = $1;
1525		1598
1526	1 while	1599	$group =~ s/&/&/g;
1527	# replace B<>, I<>, U<> etc.	1600	$group =~ s/</</g;
1528	s/B<([^\>]*)>/<b>$1<\/b>/	1601
1529	\|\| s/I<([^\>]*)>/<i>$1<\/i>/	1602	$xml .= $group;
1530	\|\| s/U<([^\>]*)>/<u>$1<\/u>/	1603	} elsif ($pod =~ m%\G
1531	\|\| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/	1604	([BCGHITU])
1532	# replace G<male\|female> tags	1605	<
1533	\|\| s{G<([^>\|])\\|([^>])>}{	1606	(?:
1534	$self->gender ? $2 : $1	1607	([^<>]*) (?{ $group = $^N })
1535	}ge	1608	\| < $interior >
1536	# replace H<hint text>	1609	)
1537	\|\| s{H<([^\>]*)>}	1610	>
		1611	%gcsx
1538	{	1612	) {
		1613	my ($code, $data) = ($1, $group);
		1614
		1615	if ($code eq "B") {
		1616	$xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
		1617	} elsif ($code eq "I") {
		1618	$xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
		1619	} elsif ($code eq "U") {
		1620	$xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
		1621	} elsif ($code eq "C") {
		1622	$xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
		1623	} elsif ($code eq "T") {
		1624	$xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
		1625	} elsif ($code eq "G") {
		1626	my ($male, $female) = split /\\|/, $data;
		1627	$data = $self->gender ? $female : $male;
		1628	$xml .= expand_cfpod ($self, $data);
		1629	} elsif ($code eq "H") {
1539	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",	1630	$xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1540	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",	1631	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1541	"")	1632	"")
1542	[$self->{hintmode}]	1633	[$self->{hintmode}];
		1634	} else {
		1635	$xml .= "error processing '$code($data)' directive";
1543	}ge;	1636	}
		1637	} else {
		1638	if ($pod =~ /\G(.+)/) {
		1639	warn "parse error while expanding $pod (at $1)";
		1640	}
		1641	last;
		1642	}
		1643	}
1544		1644
		1645	for ($xml) {
1545	# create single paragraphs (very hackish)	1646	# create single paragraphs (very hackish)
1546	s/(?<=\S)\n(?=\w)/ /g;	1647	s/(?<=\S)\n(?=\w)/ /g;
1547		1648
1548	# compress some whitespace	1649	# compress some whitespace
1549	s/\s+\n/\n/g; # ws line-ends	1650	s/\s+\n/\n/g; # ws line-ends
1550	s/\n\n+/\n/g; # double lines	1651	s/\n\n+/\n/g; # double lines
1551	s/^\n+//; # beginning lines	1652	s/^\n+//; # beginning lines
1552	s/\n+$//; # ending lines	1653	s/\n+$//; # ending lines
		1654	}
1553		1655
1554	$_	1656	$xml
1555	}	1657	}
		1658
		1659	no re 'eval';
1556		1660
1557	sub hintmode {	1661	sub hintmode {
1558	$_[0]{hintmode} = $_[1] if @_ > 1;	1662	$_[0]{hintmode} = $_[1] if @_ > 1;
1559	$_[0]{hintmode}	1663	$_[0]{hintmode}
1560	}	1664	}
…		…
2547	$rmp->{origin_y} = $exit->y;	2651	$rmp->{origin_y} = $exit->y;
2548	}	2652	}
2549		2653
2550	$rmp->{random_seed} \|\|= $exit->random_seed;	2654	$rmp->{random_seed} \|\|= $exit->random_seed;
2551		2655
2552	my $data = cf::to_json $rmp;	2656	my $data = cf::encode_json $rmp;
2553	my $md5 = Digest::MD5::md5_hex $data;	2657	my $md5 = Digest::MD5::md5_hex $data;
2554	my $meta = "$RANDOMDIR/$md5.meta";	2658	my $meta = "$RANDOMDIR/$md5.meta";
2555		2659
2556	if (my $fh = aio_open "$meta~", O_WRONLY \| O_CREAT, 0666) {	2660	if (my $fh = aio_open "$meta~", O_WRONLY \| O_CREAT, 0666) {
2557	aio_write $fh, 0, (length $data), $data, 0;	2661	aio_write $fh, 0, (length $data), $data, 0;
…		…
2630	the message, with C<log> being the default. If C<$color> is negative, suppress	2734	the message, with C<log> being the default. If C<$color> is negative, suppress
2631	the message unless the client supports the msg packet.	2735	the message unless the client supports the msg packet.
2632		2736
2633	=cut	2737	=cut
2634		2738
		2739	# non-persistent channels (usually the info channel)
2635	our %CHANNEL = (	2740	our %CHANNEL = (
2636	"c/identify" => {	2741	"c/identify" => {
2637	id => "infobox",	2742	id => "infobox",
2638	title => "Identify",	2743	title => "Identify",
2639	reply => undef,	2744	reply => undef,
…		…
2643	id => "infobox",	2748	id => "infobox",
2644	title => "Examine",	2749	title => "Examine",
2645	reply => undef,	2750	reply => undef,
2646	tooltip => "Signs and other items you examined",	2751	tooltip => "Signs and other items you examined",
2647	},	2752	},
		2753	"c/book" => {
		2754	id => "infobox",
		2755	title => "Book",
		2756	reply => undef,
		2757	tooltip => "The contents of a note or book",
		2758	},
2648	"c/lookat" => {	2759	"c/lookat" => {
2649	id => "infobox",	2760	id => "infobox",
2650	title => "Look",	2761	title => "Look",
2651	reply => undef,	2762	reply => undef,
2652	tooltip => "What you saw there",	2763	tooltip => "What you saw there",
		2764	},
		2765	"c/who" => {
		2766	id => "infobox",
		2767	title => "Players",
		2768	reply => undef,
		2769	tooltip => "Shows players who are currently online",
		2770	},
		2771	"c/body" => {
		2772	id => "infobox",
		2773	title => "Body Parts",
		2774	reply => undef,
		2775	tooltip => "Shows which body parts you posess and are available",
		2776	},
		2777	"c/uptime" => {
		2778	id => "infobox",
		2779	title => "Uptime",
		2780	reply => undef,
		2781	tooltip => "How long the server has been running since last restart",
		2782	},
		2783	"c/mapinfo" => {
		2784	id => "infobox",
		2785	title => "Map Info",
		2786	reply => undef,
		2787	tooltip => "Information related to the maps",
2653	},	2788	},
2654	);	2789	);
2655		2790
2656	sub cf::client::send_msg {	2791	sub cf::client::send_msg {
2657	my ($self, $channel, $msg, $color, @extra) = @_;	2792	my ($self, $channel, $msg, $color, @extra) = @_;
…		…
2894	=pod	3029	=pod
2895		3030
2896	The following functions and methods are available within a safe environment:	3031	The following functions and methods are available within a safe environment:
2897		3032
2898	cf::object	3033	cf::object
2899	contr pay_amount pay_player map x y force_find force_add	3034	contr pay_amount pay_player map x y force_find force_add destroy
2900	insert remove name archname title slaying race decrease_ob_nr	3035	insert remove name archname title slaying race decrease_ob_nr
2901		3036
2902	cf::object::player	3037	cf::object::player
2903	player	3038	player
2904		3039
…		…
2911	=cut	3046	=cut
2912		3047
2913	for (	3048	for (
2914	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	3049	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2915	insert remove inv name archname title slaying race	3050	insert remove inv name archname title slaying race
2916	decrease_ob_nr)],	3051	decrease_ob_nr destroy)],
2917	["cf::object::player" => qw(player)],	3052	["cf::object::player" => qw(player)],
2918	["cf::player" => qw(peaceful)],	3053	["cf::player" => qw(peaceful)],
2919	["cf::map" => qw(trigger)],	3054	["cf::map" => qw(trigger)],
2920	) {	3055	) {
2921	no strict 'refs';	3056	no strict 'refs';
…		…
3026	{	3161	{
3027	my $faces = $facedata->{faceinfo};	3162	my $faces = $facedata->{faceinfo};
3028		3163
3029	while (my ($face, $info) = each %$faces) {	3164	while (my ($face, $info) = each %$faces) {
3030	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3165	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
		3166
3031	cf::face::set_visibility $idx, $info->{visibility};	3167	cf::face::set_visibility $idx, $info->{visibility};
3032	cf::face::set_magicmap $idx, $info->{magicmap};	3168	cf::face::set_magicmap $idx, $info->{magicmap};
3033	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};	3169	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3034	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};	3170	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3035		3171
3036	cf::cede_to_tick;	3172	cf::cede_to_tick;
3037	}	3173	}
3038		3174
3039	while (my ($face, $info) = each %$faces) {	3175	while (my ($face, $info) = each %$faces) {
3040	next unless $info->{smooth};	3176	next unless $info->{smooth};
		3177
3041	my $idx = cf::face::find $face	3178	my $idx = cf::face::find $face
3042	or next;	3179	or next;
		3180
3043	if (my $smooth = cf::face::find $info->{smooth}) {	3181	if (my $smooth = cf::face::find $info->{smooth}) {
3044	cf::face::set_smooth $idx, $smooth;	3182	cf::face::set_smooth $idx, $smooth;
3045	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3183	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3046	} else {	3184	} else {
3047	warn "smooth face '$info->{smooth}' not found for face '$face'";	3185	warn "smooth face '$info->{smooth}' not found for face '$face'";
…		…
3065	{	3203	{
3066	# TODO: for gcfclient pleasure, we should give resources	3204	# TODO: for gcfclient pleasure, we should give resources
3067	# that gcfclient doesn't grok a >10000 face index.	3205	# that gcfclient doesn't grok a >10000 face index.
3068	my $res = $facedata->{resource};	3206	my $res = $facedata->{resource};
3069		3207
3070	my $soundconf = delete $res->{"res/sound.conf"};
3071
3072	while (my ($name, $info) = each %$res) {	3208	while (my ($name, $info) = each %$res) {
		3209	if (defined $info->{type}) {
3073	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;	3210	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
3074	my $data;	3211	my $data;
3075		3212
3076	if ($info->{type} & 1) {	3213	if ($info->{type} & 1) {
3077	# prepend meta info	3214	# prepend meta info
3078		3215
3079	my $meta = $enc->encode ({	3216	my $meta = $enc->encode ({
3080	name => $name,	3217	name => $name,
3081	%{ $info->{meta} \|\| {} },	3218	%{ $info->{meta} \|\| {} },
3082	});	3219	});
3083		3220
3084	$data = pack "(w/a)", $meta, $info->{data};	3221	$data = pack "(w/a)", $meta, $info->{data};
		3222	} else {
		3223	$data = $info->{data};
		3224	}
		3225
		3226	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3227	cf::face::set_type $idx, $info->{type};
3085	} else {	3228	} else {
3086	$data = $info->{data};	3229	$RESOURCE{$name} = $info;
3087	}	3230	}
3088		3231
3089	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3090	cf::face::set_type $idx, $info->{type};
3091
3092	cf::cede_to_tick;	3232	cf::cede_to_tick;
3093	}	3233	}
3094
3095	if ($soundconf) {
3096	$soundconf = $enc->decode (delete $soundconf->{data});
3097
3098	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3099	my $sound = $soundconf->{compat}[$_]
3100	or next;
3101
3102	my $face = cf::face::find "sound/$sound->[1]";
3103	cf::sound::set $sound->[0] => $face;
3104	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3105	}
3106
3107	while (my ($k, $v) = each %{$soundconf->{event}}) {
3108	my $face = cf::face::find "sound/$v";
3109	cf::sound::set $k => $face;
3110	}
3111	}
3112	}	3234	}
		3235
		3236	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3113		3237
3114	1	3238	1
3115	}	3239	}
		3240
		3241	cf::global->attach (on_resource_update => sub {
		3242	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
		3243	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
		3244
		3245	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3246	my $sound = $soundconf->{compat}[$_]
		3247	or next;
		3248
		3249	my $face = cf::face::find "sound/$sound->[1]";
		3250	cf::sound::set $sound->[0] => $face;
		3251	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3252	}
		3253
		3254	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3255	my $face = cf::face::find "sound/$v";
		3256	cf::sound::set $k => $face;
		3257	}
		3258	}
		3259	});
3116		3260
3117	register_exticmd fx_want => sub {	3261	register_exticmd fx_want => sub {
3118	my ($ns, $want) = @_;	3262	my ($ns, $want) = @_;
3119		3263
3120	while (my ($k, $v) = each %$want) {	3264	while (my ($k, $v) = each %$want) {
…		…
3175	sub reload_config {	3319	sub reload_config {
3176	open my $fh, "<:utf8", "$CONFDIR/config"	3320	open my $fh, "<:utf8", "$CONFDIR/config"
3177	or return;	3321	or return;
3178		3322
3179	local $/;	3323	local $/;
3180	*CFG = YAML::Syck::Load <$fh>;	3324	*CFG = YAML::Load <$fh>;
3181		3325
3182	$EMERGENCY_POSITION = $CFG{emergency_position} \|\| ["/world/world_105_115", 5, 37];	3326	$EMERGENCY_POSITION = $CFG{emergency_position} \|\| ["/world/world_105_115", 5, 37];
3183		3327
3184	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3328	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3185	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3329	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
3197	# we must not ever block the main coroutine	3341	# we must not ever block the main coroutine
3198	local $Coro::idle = sub {	3342	local $Coro::idle = sub {
3199	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3343	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3200	(async {	3344	(async {
3201	$Coro::current->{desc} = "IDLE BUG HANDLER";	3345	$Coro::current->{desc} = "IDLE BUG HANDLER";
3202	Event::one_event;	3346	EV::loop EV::LOOP_ONESHOT;
3203	})->prio (Coro::PRIO_MAX);	3347	})->prio (Coro::PRIO_MAX);
3204	};	3348	};
3205		3349
3206	reload_config;	3350	reload_config;
3207	db_init;	3351	db_init;
3208	load_extensions;	3352	load_extensions;
3209		3353
3210	$TICK_WATCHER->start;	3354	$TICK_WATCHER->start;
		3355	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3211	Event::loop;	3356	EV::loop;
3212	}	3357	}
3213		3358
3214	#############################################################################	3359	#############################################################################
3215	# initialisation and cleanup	3360	# initialisation and cleanup
3216		3361
3217	# install some emergency cleanup handlers	3362	# install some emergency cleanup handlers
3218	BEGIN {	3363	BEGIN {
		3364	our %SIGWATCHER = ();
3219	for my $signal (qw(INT HUP TERM)) {	3365	for my $signal (qw(INT HUP TERM)) {
3220	Event->signal (	3366	$SIGWATCHER{$signal} = EV::signal $signal, sub {
3221	reentrant => 0,
3222	data => WF_AUTOCANCEL,
3223	signal => $signal,
3224	prio => 0,
3225	cb => sub {
3226	cf::cleanup "SIG$signal";	3367	cf::cleanup "SIG$signal";
3227	},
3228	);	3368	};
3229	}	3369	}
3230	}	3370	}
3231		3371
3232	sub write_runtime {	3372	sub write_runtime {
3233	my $runtime = "$LOCALDIR/runtime";	3373	my $runtime = "$LOCALDIR/runtime";
…		…
3278	# and maps saved/destroyed asynchronously.	3418	# and maps saved/destroyed asynchronously.
3279	warn "begin emergency player save\n";	3419	warn "begin emergency player save\n";
3280	for my $login (keys %cf::PLAYER) {	3420	for my $login (keys %cf::PLAYER) {
3281	my $pl = $cf::PLAYER{$login} or next;	3421	my $pl = $cf::PLAYER{$login} or next;
3282	$pl->valid or next;	3422	$pl->valid or next;
		3423	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3283	$pl->save;	3424	$pl->save;
3284	}	3425	}
3285	warn "end emergency player save\n";	3426	warn "end emergency player save\n";
3286		3427
3287	warn "begin emergency map save\n";	3428	warn "begin emergency map save\n";
…		…
3326	warn "syncing database to disk";	3467	warn "syncing database to disk";
3327	BDB::db_env_txn_checkpoint $DB_ENV;	3468	BDB::db_env_txn_checkpoint $DB_ENV;
3328		3469
3329	# if anything goes wrong in here, we should simply crash as we already saved	3470	# if anything goes wrong in here, we should simply crash as we already saved
3330		3471
3331	warn "cancelling all WF_AUTOCANCEL watchers";
3332	for (Event::all_watchers) {
3333	$_->cancel if $_->data & WF_AUTOCANCEL;
3334	}
3335
3336	warn "flushing outstanding aio requests";	3472	warn "flushing outstanding aio requests";
3337	for (;;) {	3473	for (;;) {
3338	BDB::flush;	3474	BDB::flush;
3339	IO::AIO::flush;	3475	IO::AIO::flush;
3340	Coro::cede;	3476	Coro::cede_notself;
3341	last unless IO::AIO::nreqs \|\| BDB::nreqs;	3477	last unless IO::AIO::nreqs \|\| BDB::nreqs;
3342	warn "iterate...";	3478	warn "iterate...";
3343	}	3479	}
3344		3480
3345	++$RELOAD;	3481	++$RELOAD;
…		…
3421	warn "leaving sync_job";	3557	warn "leaving sync_job";
3422		3558
3423	1	3559	1
3424	} or do {	3560	} or do {
3425	warn $@;	3561	warn $@;
3426	warn "error while reloading, exiting.";	3562	cf::cleanup "error while reloading, exiting.";
3427	exit 1;
3428	};	3563	};
3429		3564
3430	warn "reloaded";	3565	warn "reloaded";
3431	};	3566	};
3432		3567
…		…
3434		3569
3435	sub reload_perl() {	3570	sub reload_perl() {
3436	# doing reload synchronously and two reloads happen back-to-back,	3571	# doing reload synchronously and two reloads happen back-to-back,
3437	# coro crashes during coro_state_free->destroy here.	3572	# coro crashes during coro_state_free->destroy here.
3438		3573
3439	$RELOAD_WATCHER \|\|= Event->timer (	3574	$RELOAD_WATCHER \|\|= EV::timer 0, 0, sub {
3440	reentrant => 0,
3441	after => 0,
3442	data => WF_AUTOCANCEL,
3443	cb => sub {
3444	do_reload_perl;	3575	do_reload_perl;
3445	undef $RELOAD_WATCHER;	3576	undef $RELOAD_WATCHER;
3446	},
3447	);	3577	};
3448	}	3578	}
3449		3579
3450	register_command "reload" => sub {	3580	register_command "reload" => sub {
3451	my ($who, $arg) = @_;	3581	my ($who, $arg) = @_;
3452		3582
…		…
3482	my $signal = new Coro::Signal;	3612	my $signal = new Coro::Signal;
3483	push @WAIT_FOR_TICK_BEGIN, $signal;	3613	push @WAIT_FOR_TICK_BEGIN, $signal;
3484	$signal->wait;	3614	$signal->wait;
3485	}	3615	}
3486		3616
3487	$TICK_WATCHER = Event->timer (	3617	$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3488	reentrant => 0,
3489	parked => 1,
3490	prio => 0,
3491	at => $NEXT_TICK \|\| $TICK,
3492	data => WF_AUTOCANCEL,
3493	cb => sub {
3494	if ($Coro::current != $Coro::main) {	3618	if ($Coro::current != $Coro::main) {
3495	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	3619	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3496	unless ++$bug_warning > 10;	3620	unless ++$bug_warning > 10;
3497	return;	3621	return;
3498	}	3622	}
3499		3623
3500	$NOW = $tick_start = Event::time;	3624	$NOW = $tick_start = EV::now;
3501		3625
3502	cf::server_tick; # one server iteration	3626	cf::server_tick; # one server iteration
3503		3627
3504	$RUNTIME += $TICK;	3628	$RUNTIME += $TICK;
3505	$NEXT_TICK += $TICK;	3629	$NEXT_TICK = $_[0]->at;
3506		3630
3507	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3631	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3508	$NEXT_RUNTIME_WRITE = $NOW + 10;	3632	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3509	Coro::async_pool {	3633	Coro::async_pool {
3510	$Coro::current->{desc} = "runtime saver";	3634	$Coro::current->{desc} = "runtime saver";
3511	write_runtime	3635	write_runtime
3512	or warn "ERROR: unable to write runtime file: $!";	3636	or warn "ERROR: unable to write runtime file: $!";
3513	};
3514	}	3637	};
		3638	}
3515		3639
3516	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3640	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3517	$sig->send;	3641	$sig->send;
3518	}	3642	}
3519	while (my $sig = shift @WAIT_FOR_TICK) {	3643	while (my $sig = shift @WAIT_FOR_TICK) {
3520	$sig->send;	3644	$sig->send;
3521	}	3645	}
3522		3646
3523	$NOW = Event::time;
3524
3525	# if we are delayed by four ticks or more, skip them all
3526	$NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3527
3528	$TICK_WATCHER->at ($NEXT_TICK);
3529	$TICK_WATCHER->start;
3530
3531	$LOAD = ($NOW - $tick_start) / $TICK;	3647	$LOAD = ($NOW - $tick_start) / $TICK;
3532	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3648	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3533		3649
3534	_post_tick;	3650	_post_tick;
3535	},	3651	};
3536	);	3652	$TICK_WATCHER->priority (EV::MAXPRI);
3537		3653
3538	{	3654	{
		3655	# configure BDB
		3656
3539	BDB::min_parallel 8;	3657	BDB::min_parallel 8;
3540	BDB::max_poll_time $TICK * 0.1;	3658	BDB::max_poll_reqs $TICK * 0.1;
3541	$BDB_POLL_WATCHER = Event->io (	3659	$Coro::BDB::WATCHER->priority (1);
3542	reentrant => 0,
3543	fd => BDB::poll_fileno,
3544	poll => 'r',
3545	prio => 0,
3546	data => WF_AUTOCANCEL,
3547	cb => \&BDB::poll_cb,
3548	);
3549
3550	BDB::set_sync_prepare {
3551	my $status;
3552	my $current = $Coro::current;
3553	(
3554	sub {
3555	$status = $!;
3556	$current->ready; undef $current;
3557	},
3558	sub {
3559	Coro::schedule while defined $current;
3560	$! = $status;
3561	},
3562	)
3563	};
3564		3660
3565	unless ($DB_ENV) {	3661	unless ($DB_ENV) {
3566	$DB_ENV = BDB::db_env_create;	3662	$DB_ENV = BDB::db_env_create;
3567	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC	3663	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC
3568	\| BDB::LOG_AUTOREMOVE, 1);	3664	\| BDB::LOG_AUTOREMOVE, 1);
…		…
3583		3679
3584	cf::cleanup "db_env_open(db): $@" if $@;	3680	cf::cleanup "db_env_open(db): $@" if $@;
3585	};	3681	};
3586	}	3682	}
3587		3683
3588	$BDB_DEADLOCK_WATCHER = Event->timer (	3684	$BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3589	after => 3,
3590	interval => 1,
3591	hard => 1,
3592	prio => 0,
3593	data => WF_AUTOCANCEL,
3594	cb => sub {
3595	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };	3685	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3596	},
3597	);	3686	};
3598	$BDB_CHECKPOINT_WATCHER = Event->timer (	3687	$BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3599	after => 11,
3600	interval => 60,
3601	hard => 1,
3602	prio => 0,
3603	data => WF_AUTOCANCEL,
3604	cb => sub {
3605	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	3688	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3606	},
3607	);	3689	};
3608	$BDB_TRICKLE_WATCHER = Event->timer (	3690	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3609	after => 5,
3610	interval => 10,
3611	hard => 1,
3612	prio => 0,
3613	data => WF_AUTOCANCEL,
3614	cb => sub {
3615	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	3691	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3616	},
3617	);	3692	};
3618	}	3693	}
3619		3694
3620	{	3695	{
		3696	# configure IO::AIO
		3697
3621	IO::AIO::min_parallel 8;	3698	IO::AIO::min_parallel 8;
3622
3623	undef $Coro::AIO::WATCHER;
3624	IO::AIO::max_poll_time $TICK * 0.1;	3699	IO::AIO::max_poll_time $TICK * 0.1;
3625	$AIO_POLL_WATCHER = Event->io (	3700	$Coro::AIO::WATCHER->priority (1);
3626	reentrant => 0,
3627	data => WF_AUTOCANCEL,
3628	fd => IO::AIO::poll_fileno,
3629	poll => 'r',
3630	prio => 0,
3631	cb => \&IO::AIO::poll_cb,
3632	);
3633	}	3701	}
3634		3702
3635	my $_log_backtrace;	3703	my $_log_backtrace;
3636		3704
3637	sub _log_backtrace {	3705	sub _log_backtrace {

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.379 by root, Thu Oct 4 23:59:07 2007 UTC vs. Revision 1.411 by root, Fri Feb 1 15:54:07 2008 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.379 by root, Thu Oct 4 23:59:07 2007 UTC vs.
Revision 1.411 by root, Fri Feb 1 15:54:07 2008 UTC