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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.562 by root, Sat Apr 23 04:46:26 2011 UTC vs.
Revision 1.623 by root, Wed Aug 30 14:18:51 2017 UTC

…		…
1	#	1	#
2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	#	3	#
4	# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	#	5	#
6	# Deliantra is free software: you can redistribute it and/or modify it under	6	# Deliantra is free software: you can redistribute it and/or modify it under
7	# the terms of the Affero GNU General Public License as published by the	7	# the terms of the Affero GNU General Public License as published by the
8	# Free Software Foundation, either version 3 of the License, or (at your	8	# Free Software Foundation, either version 3 of the License, or (at your
9	# option) any later version.	9	# option) any later version.
10	#	10	#
11	# This program is distributed in the hope that it will be useful,	11	# This program is distributed in the hope that it will be useful,
12	# but WITHOUT ANY WARRANTY; without even the implied warranty of	12	# but WITHOUT ANY WARRANTY; without even the implied warranty of
13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14	# GNU General Public License for more details.	14	# GNU General Public License for more details.
15	#	15	#
16	# You should have received a copy of the Affero GNU General Public License	16	# You should have received a copy of the Affero GNU General Public License
17	# and the GNU General Public License along with this program. If not, see	17	# and the GNU General Public License along with this program. If not, see
18	# <http://www.gnu.org/licenses/>.	18	# <http://www.gnu.org/licenses/>.
19	#	19	#
20	# The authors can be reached via e-mail to <support@deliantra.net>	20	# The authors can be reached via e-mail to <support@deliantra.net>
21	#	21	#
22		22
23	package cf;	23	package cf;
24		24
32	use Safe;	32	use Safe;
33	use Safe::Hole;	33	use Safe::Hole;
34	use Storable ();	34	use Storable ();
35	use Carp ();	35	use Carp ();
36		36
37	use Guard ();	37	use AnyEvent ();
		38	use AnyEvent::IO ();
		39	use AnyEvent::DNS ();
		40
38	use Coro ();	41	use Coro ();
39	use Coro::State;	42	use Coro::State;
40	use Coro::Handle;	43	use Coro::Handle;
41	use Coro::EV;	44	use Coro::EV;
42	use Coro::AnyEvent;	45	use Coro::AnyEvent;
…		…
48	use Coro::AIO;	51	use Coro::AIO;
49	use Coro::BDB 1.6;	52	use Coro::BDB 1.6;
50	use Coro::Storable;	53	use Coro::Storable;
51	use Coro::Util ();	54	use Coro::Util ();
52		55
		56	use Guard ();
53	use JSON::XS 2.01 ();	57	use JSON::XS 2.01 ();
54	use BDB ();	58	use BDB ();
55	use Data::Dumper;	59	use Data::Dumper;
56	use Fcntl;	60	use Fcntl;
57	use YAML::XS ();	61	use YAML::XS ();
		62	use CBOR::XS ();
58	use IO::AIO ();	63	use IO::AIO ();
59	use Time::HiRes;
60	use Compress::LZF;	64	use Compress::LZF;
61	use Digest::MD5 ();	65	use Digest::MD5 ();
62		66
63	AnyEvent::detect;	67	AnyEvent::detect;
64		68
…		…
83	our %COMMAND = ();	87	our %COMMAND = ();
84	our %COMMAND_TIME = ();	88	our %COMMAND_TIME = ();
85		89
86	our @EXTS = (); # list of extension package names	90	our @EXTS = (); # list of extension package names
87	our %EXTCMD = ();	91	our %EXTCMD = ();
		92	our %EXTACMD = ();
88	our %EXTICMD = ();	93	our %EXTICMD = ();
		94	our %EXTIACMD = ();
89	our %EXT_CORO = (); # coroutines bound to extensions	95	our %EXT_CORO = (); # coroutines bound to extensions
90	our %EXT_MAP = (); # pluggable maps	96	our %EXT_MAP = (); # pluggable maps
91		97
92	our $RELOAD; # number of reloads so far, non-zero while in reload	98	our $RELOAD; # number of reloads so far, non-zero while in reload
93	our @EVENT;	99	our @EVENT;
…		…
108	our $RANDOMDIR = "$LOCALDIR/random";	114	our $RANDOMDIR = "$LOCALDIR/random";
109	our $BDBDIR = "$LOCALDIR/db";	115	our $BDBDIR = "$LOCALDIR/db";
110	our $PIDFILE = "$LOCALDIR/pid";	116	our $PIDFILE = "$LOCALDIR/pid";
111	our $RUNTIMEFILE = "$LOCALDIR/runtime";	117	our $RUNTIMEFILE = "$LOCALDIR/runtime";
112		118
113	our %RESOURCE; # unused	119	#our %RESOURCE; # unused
114		120
115	our $OUTPUT_RATE_MIN = 3000;	121	our $OUTPUT_RATE_MIN = 3000;
116	our $OUTPUT_RATE_MAX = 1000000;	122	our $OUTPUT_RATE_MAX = 1000000;
117		123
118	our $MAX_LINKS = 32; # how many chained exits to follow	124	our $MAX_LINKS = 32; # how many chained exits to follow
…		…
129	our $DB_ENV;	135	our $DB_ENV;
130		136
131	our @EXTRA_MODULES = qw(pod match mapscript incloader);	137	our @EXTRA_MODULES = qw(pod match mapscript incloader);
132		138
133	our %CFG;	139	our %CFG;
		140	our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
134		141
135	our $UPTIME; $UPTIME \|\|= time;	142	our $UPTIME; $UPTIME \|\|= time;
136	our $RUNTIME;	143	our $RUNTIME = 0;
		144	our $SERVER_TICK = 0;
137	our $NOW;	145	our $NOW;
138		146
139	our (%PLAYER, %PLAYER_LOADING); # all users	147	our (%PLAYER, %PLAYER_LOADING); # all users
140	our (%MAP, %MAP_LOADING ); # all maps	148	our (%MAP, %MAP_LOADING ); # all maps
141	our $LINK_MAP; # the special {link} map, which is always available	149	our $LINK_MAP; # the special {link} map, which is always available
…		…
150		158
151	our @POST_INIT;	159	our @POST_INIT;
152		160
153	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)	161	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
154	our $REALLY_UNLOOP; # never set to true, please :)	162	our $REALLY_UNLOOP; # never set to true, please :)
		163
		164	our $WAIT_FOR_TICK = new Coro::Signal;
		165	our @WAIT_FOR_TICK_BEGIN;
155		166
156	binmode STDOUT;	167	binmode STDOUT;
157	binmode STDERR;	168	binmode STDERR;
158		169
159	# read virtual server time, if available	170	# read virtual server time, if available
…		…
193		204
194	=over 4	205	=over 4
195		206
196	=item $cf::UPTIME	207	=item $cf::UPTIME
197		208
198	The timestamp of the server start (so not actually an uptime).	209	The timestamp of the server start (so not actually an "uptime").
		210
		211	=item $cf::SERVER_TICK
		212
		213	An unsigned integer that starts at zero when the server is started and is
		214	incremented on every tick.
		215
		216	=item $cf::NOW
		217
		218	The (real) time of the last (current) server tick - updated before and
		219	after tick processing, so this is useful only as a rough "what time is it
		220	now" estimate.
		221
		222	=item $cf::TICK
		223
		224	The interval between each server tick, in seconds.
199		225
200	=item $cf::RUNTIME	226	=item $cf::RUNTIME
201		227
202	The time this server has run, starts at 0 and is increased by $cf::TICK on	228	The time this server has run, starts at 0 and is increased by $cf::TICK on
203	every server tick.	229	every server tick.
204		230
205	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR	231	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
206	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR	232	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
207	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR	233	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
208		234
209	Various directories - "/etc", read-only install directory, perl-library	235	Various directories - "/etc", read-only install directory, perl-library
210	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	236	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
211	unique-items directory, player file directory, random maps directory and	237	unique-items directory, player file directory, random maps directory and
212	database environment.	238	database environment.
213		239
214	=item $cf::NOW
215
216	The time of the last (current) server tick.
217
218	=item $cf::TICK
219
220	The interval between server ticks, in seconds.
221
222	=item $cf::LOADAVG	240	=item $cf::LOADAVG
223		241
224	The current CPU load on the server (alpha-smoothed), as a value between 0	242	The current CPU load on the server (alpha-smoothed), as a value between 0
225	(none) and 1 (overloaded), indicating how much time is spent on processing	243	(none) and 1 (overloaded), indicating how much time is spent on processing
226	objects per tick. Healthy values are < 0.5.	244	objects per tick. Healthy values are < 0.5.
…		…
234	Configuration for the server, loaded from C</etc/deliantra-server/config>, or	252	Configuration for the server, loaded from C</etc/deliantra-server/config>, or
235	from wherever your confdir points to.	253	from wherever your confdir points to.
236		254
237	=item cf::wait_for_tick, cf::wait_for_tick_begin	255	=item cf::wait_for_tick, cf::wait_for_tick_begin
238		256
239	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	257	These are functions that inhibit the current coroutine one tick.
240	returns directly I<after> the tick processing (and consequently, can only wake one thread	258	cf::wait_for_tick_begin only returns directly I<after> the tick
		259	processing (and consequently, can only wake one thread per tick), while
241	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	260	cf::wait_for_tick wakes up all waiters after tick processing.
		261
		262	Note that cf::wait_for_tick will immediately return when the server is not
		263	ticking, making it suitable for small pauses in threads that need to run
		264	when the server is paused. If that is not applicable (i.e. you I<really>
		265	want to wait, use C<$cf::WAIT_FOR_TICK>).
		266
		267	=item $cf::WAIT_FOR_TICK
		268
		269	Note that C<cf::wait_for_tick> is probably the correct thing to use. This
		270	variable contains a L<Coro::Signal> that is broadcats after every server
		271	tick. Calling C<< ->wait >> on it will suspend the caller until after the
		272	next server tick.
242		273
243	=cut	274	=cut
244		275
245	sub wait_for_tick();	276	sub wait_for_tick();
246	sub wait_for_tick_begin();	277	sub wait_for_tick_begin();
…		…
312	)) {	343	)) {
313	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	344	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
314	}	345	}
315		346
316	$EV::DIED = sub {	347	$EV::DIED = sub {
317	Carp::cluck "error in event callback: @_";	348	warn "error in event callback: $@";
318	};	349	};
319		350
320	#############################################################################	351	#############################################################################
321		352
322	sub fork_call(&@);	353	sub fork_call(&@);
…		…
349	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	380	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
350	$d	381	$d
351	} \|\| "[unable to dump $_[0]: '$@']";	382	} \|\| "[unable to dump $_[0]: '$@']";
352	}	383	}
353		384
354	=item $scalar = load_file $path	385	=item $scalar = cf::load_file $path
355		386
356	Loads the given file from path and returns its contents. Croaks on error	387	Loads the given file from path and returns its contents. Croaks on error
357	and can block.	388	and can block.
358		389
359	=cut	390	=cut
…		…
363	or Carp::croak "$_[0]: $!";	394	or Carp::croak "$_[0]: $!";
364		395
365	$data	396	$data
366	}	397	}
367		398
		399	=item $success = cf::replace_file $path, $data, $sync
		400
		401	Atomically replaces the file at the given $path with new $data, and
		402	optionally $sync the data to disk before replacing the file.
		403
		404	=cut
		405
		406	sub replace_file($$;$) {
		407	my ($path, $data, $sync) = @_;
		408
		409	my $lock = cf::lock_acquire ("replace_file:$path");
		410
		411	my $fh = aio_open "$path~", Fcntl::O_WRONLY \| Fcntl::O_CREAT \| Fcntl::O_TRUNC, 0644
		412	or return;
		413
		414	$data = $data->() if ref $data;
		415
		416	length $data == aio_write $fh, 0, (length $data), $data, 0
		417	or return;
		418
		419	!$sync
		420	or !aio_fsync $fh
		421	or return;
		422
		423	aio_close $fh
		424	and return;
		425
		426	aio_rename "$path~", $path
		427	and return;
		428
		429	if ($sync) {
		430	$path =~ s%/[^/]*$%%;
		431	aio_pathsync $path;
		432	}
		433
		434	1
		435	}
		436
368	=item $ref = cf::decode_json $json	437	=item $ref = cf::decode_json $json
369		438
370	Converts a JSON string into the corresponding perl data structure.	439	Converts a JSON string into the corresponding perl data structure.
371		440
372	=item $json = cf::encode_json $ref	441	=item $json = cf::encode_json $ref
…		…
394		463
395	=cut	464	=cut
396		465
397	sub decode_yaml($) {	466	sub decode_yaml($) {
398	fork_call { YAML::XS::Load $_[0] } @_	467	fork_call { YAML::XS::Load $_[0] } @_
		468	}
		469
		470	=item $scalar = cf::decode_cbor $scalar
		471
		472	Same as CBOR::XS::decode_cbor, but takes server ticks into account, so
		473	blocks. For small amounts of data, C<CBOR::XS::decode_cbor> is the better
		474	alternative.
		475
		476	=cut
		477
		478	sub decode_cbor($) {
		479	# we assume 10mb/s minimum decoding speed (on a ~2ghz machine)
		480	cf::get_slot +(length $_[0]) / 10_000_000, 0, "decode_cbor";
		481	CBOR::XS::decode_cbor $_[0]
399	}	482	}
400		483
401	=item $scalar = cf::unlzf $scalar	484	=item $scalar = cf::unlzf $scalar
402		485
403	Same as Compress::LZF::compress, but takes server ticks into account, so	486	Same as Compress::LZF::compress, but takes server ticks into account, so
…		…
442	}	525	}
443	}	526	}
444		527
445	=item cf::lock_wait $string	528	=item cf::lock_wait $string
446		529
447	Wait until the given lock is available. See cf::lock_acquire.	530	Wait until the given lock is available. See cf::lock_acquire.
448		531
449	=item my $lock = cf::lock_acquire $string	532	=item my $lock = cf::lock_acquire $string
450		533
451	Wait until the given lock is available and then acquires it and returns	534	Wait until the given lock is available and then acquires it and returns
452	a L<Guard> object. If the guard object gets destroyed (goes out of scope,	535	a L<Guard> object. If the guard object gets destroyed (goes out of scope,
…		…
505	Allocate $time seconds of blocking CPU time at priority C<$priority>	588	Allocate $time seconds of blocking CPU time at priority C<$priority>
506	(default: 0): This call blocks and returns only when you have at least	589	(default: 0): This call blocks and returns only when you have at least
507	C<$time> seconds of cpu time till the next tick. The slot is only valid	590	C<$time> seconds of cpu time till the next tick. The slot is only valid
508	till the next cede.	591	till the next cede.
509		592
510	Background jobs should use a priority les than zero, interactive jobs	593	Background jobs should use a priority less than zero, interactive jobs
511	should use 100 or more.	594	should use 100 or more.
512		595
513	The optional C<$name> can be used to identify the job to run. It might be	596	The optional C<$name> can be used to identify the job to run. It might be
514	used for statistical purposes and should identify the same time-class.	597	used for statistical purposes and should identify the same time-class.
515		598
…		…
528	my $signal = new Coro::Signal;	611	my $signal = new Coro::Signal;
529	my $busy;	612	my $busy;
530		613
531	while () {	614	while () {
532	next_job:	615	next_job:
		616
		617	Coro::cede;
533		618
534	my $avail = cf::till_tick;	619	my $avail = cf::till_tick;
535		620
536	for (0 .. $#SLOT_QUEUE) {	621	for (0 .. $#SLOT_QUEUE) {
537	if ($SLOT_QUEUE[$_][0] <= $avail) {	622	if ($SLOT_QUEUE[$_][0] <= $avail) {
538	$busy = 0;	623	$busy = 0;
539	my $job = splice @SLOT_QUEUE, $_, 1, ();	624	my $job = splice @SLOT_QUEUE, $_, 1, ();
540	$job->[2]->send;	625	$job->[2]->send;
541	Coro::cede;
542	goto next_job;	626	goto next_job;
543	} else {	627	} else {
544	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;	628	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
545	}	629	}
546	}	630	}
547		631
548	if (@SLOT_QUEUE) {	632	if (@SLOT_QUEUE) {
549	# we do not use wait_for_tick() as it returns immediately when tick is inactive	633	wait_for_tick;
550	push @cf::WAIT_FOR_TICK, $signal;
551	$signal->wait;
552	} else {	634	} else {
553	$busy = 0;	635	$busy = 0;
554	Coro::schedule;	636	Coro::schedule;
555	}	637	}
556	}	638	}
…		…
582	BEGIN { *async = \&Coro::async_pool }	664	BEGIN { *async = \&Coro::async_pool }
583		665
584	=item cf::sync_job { BLOCK }	666	=item cf::sync_job { BLOCK }
585		667
586	The design of Deliantra requires that the main coroutine ($Coro::main)	668	The design of Deliantra requires that the main coroutine ($Coro::main)
587	is always able to handle events or runnable, as Deliantra is only	669	is always able to handle events or is runnable, as Deliantra is only
588	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not	670	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
589	acceptable.	671	acceptable.
590		672
591	If it must be done, put the blocking parts into C<sync_job>. This will run	673	If it must be done, put the blocking parts into C<sync_job>. This will run
592	the given BLOCK in another coroutine while waiting for the result. The	674	the given BLOCK in another coroutine while waiting for the result. The
…		…
620		702
621	while ($busy) {	703	while ($busy) {
622	if (Coro::nready) {	704	if (Coro::nready) {
623	Coro::cede_notself;	705	Coro::cede_notself;
624	} else {	706	} else {
625	EV::loop EV::LOOP_ONESHOT;	707	EV::run EV::RUN_ONCE;
626	}	708	}
627	}	709	}
628		710
629	my $time = AE::time - $time;	711	my $time = AE::time - $time;
630		712
…		…
671	reset_signals;	753	reset_signals;
672	}	754	}
673		755
674	sub fork_call(&@) {	756	sub fork_call(&@) {
675	my ($cb, @args) = @_;	757	my ($cb, @args) = @_;
676
677	# we seemingly have to make a local copy of the whole thing,
678	# otherwise perl prematurely frees the stuff :/
679	# TODO: investigate and fix (likely this will be rather laborious)
680		758
681	my @res = Coro::Util::fork_eval {	759	my @res = Coro::Util::fork_eval {
682	cf::post_fork;	760	cf::post_fork;
683	&$cb	761	&$cb
684	} @args;	762	} @args;
…		…
834		912
835	return db_get cache => "$id/data";	913	return db_get cache => "$id/data";
836	}	914	}
837	}	915	}
838		916
839	my $t1 = Time::HiRes::time;	917	my $t1 = EV::time;
840	my $data = $process->(\@data);	918	my $data = $process->(\@data);
841	my $t2 = Time::HiRes::time;	919	my $t2 = EV::time;
842		920
843	info "cache: '$id' processed in ", $t2 - $t1, "s\n";	921	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
844		922
845	db_put cache => "$id/data", $data;	923	db_put cache => "$id/data", $data;
846	db_put cache => "$id/md5" , $md5;	924	db_put cache => "$id/md5" , $md5;
…		…
1366	=cut	1444	=cut
1367		1445
1368	#############################################################################	1446	#############################################################################
1369	# command handling &c	1447	# command handling &c
1370		1448
1371	=item cf::register_command $name => \&callback($ob,$args);	1449	=item cf::register_command $name => \&callback($ob,$args)
1372		1450
1373	Register a callback for execution when the client sends the user command	1451	Register a callback for execution when the client sends the user command
1374	$name.	1452	$name.
1375		1453
1376	=cut	1454	=cut
…		…
1382	#warn "registering command '$name/$time' to '$caller'";	1460	#warn "registering command '$name/$time' to '$caller'";
1383		1461
1384	push @{ $COMMAND{$name} }, [$caller, $cb];	1462	push @{ $COMMAND{$name} }, [$caller, $cb];
1385	}	1463	}
1386		1464
1387	=item cf::register_extcmd $name => \&callback($pl,$packet);	1465	=item cf::register_extcmd $name => \&callback($pl,@args)
1388		1466
1389	Register a callback for execution when the client sends an (synchronous)	1467	Register a callback for execution when the client sends an (synchronous)
1390	extcmd packet. Ext commands will be processed in the order they are	1468	extcmd packet. Ext commands will be processed in the order they are
1391	received by the server, like other user commands. The first argument is	1469	received by the server, like other user commands. The first argument is
1392	the logged-in player. Ext commands can only be processed after a player	1470	the logged-in player. Ext commands can only be processed after a player
1393	has logged in successfully.	1471	has logged in successfully.
1394		1472
1395	If the callback returns something, it is sent back as if reply was being	1473	The values will be sent back to the client.
1396	called.
1397		1474
		1475	=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
		1476
		1477	Same as C<cf::register_extcmd>, but instead of returning values, the
		1478	callback needs to clal the C<$reply> function.
		1479
1398	=item cf::register_exticmd $name => \&callback($ns,$packet);	1480	=item cf::register_exticmd $name => \&callback($ns,@args)
1399		1481
1400	Register a callback for execution when the client sends an (asynchronous)	1482	Register a callback for execution when the client sends an (asynchronous)
1401	exticmd packet. Exti commands are processed by the server as soon as they	1483	exticmd packet. Exti commands are processed by the server as soon as they
1402	are received, i.e. out of order w.r.t. other commands. The first argument	1484	are received, i.e. out of order w.r.t. other commands. The first argument
1403	is a client socket. Exti commands can be received anytime, even before	1485	is a client socket. Exti commands can be received anytime, even before
1404	log-in.	1486	log-in.
1405		1487
1406	If the callback returns something, it is sent back as if reply was being	1488	The values will be sent back to the client.
1407	called.
1408		1489
1409	=cut	1490	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1410		1491
		1492	Same as C<cf::register_extcmd>, but instead of returning values, the
		1493	callback needs to clal the C<$reply> function.
		1494
		1495	=cut
		1496
1411	sub register_extcmd {	1497	sub register_extcmd($$) {
1412	my ($name, $cb) = @_;	1498	my ($name, $cb) = @_;
1413		1499
1414	$EXTCMD{$name} = $cb;	1500	$EXTCMD{$name} = $cb;
1415	}	1501	}
1416		1502
1417	sub register_exticmd {	1503	sub register_async_extcmd($$) {
1418	my ($name, $cb) = @_;	1504	my ($name, $cb) = @_;
1419		1505
		1506	$EXTACMD{$name} = $cb;
		1507	}
		1508
		1509	sub register_exticmd($$) {
		1510	my ($name, $cb) = @_;
		1511
1420	$EXTICMD{$name} = $cb;	1512	$EXTICMD{$name} = $cb;
		1513	}
		1514
		1515	sub register_async_exticmd($$) {
		1516	my ($name, $cb) = @_;
		1517
		1518	$EXTIACMD{$name} = $cb;
1421	}	1519	}
1422		1520
1423	use File::Glob ();	1521	use File::Glob ();
1424		1522
1425	cf::player->attach (	1523	cf::player->attach (
…		…
1439	my ($pl, $buf) = @_;	1537	my ($pl, $buf) = @_;
1440		1538
1441	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1539	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1442		1540
1443	if (ref $msg) {	1541	if (ref $msg) {
1444	my ($type, $reply, @payload) =	1542	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1445	"ARRAY" eq ref $msg
1446	? @$msg
1447	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1448		1543
1449	my @reply;
1450
1451	if (my $cb = $EXTCMD{$type}) {	1544	if (my $cb = $EXTACMD{$type}) {
		1545	$cb->(
		1546	$pl,
		1547	sub {
		1548	$pl->ext_msg ("reply-$reply", @_)
		1549	if $reply;
		1550	},
		1551	@payload
		1552	);
		1553	} else {
		1554	my @reply;
		1555
		1556	if (my $cb = $EXTCMD{$type}) {
1452	@reply = $cb->($pl, @payload);	1557	@reply = $cb->($pl, @payload);
		1558	}
		1559
		1560	$pl->ext_msg ("reply-$reply", @reply)
		1561	if $reply;
1453	}	1562	}
1454
1455	$pl->ext_reply ($reply, @reply)
1456	if $reply;
1457		1563
1458	} else {	1564	} else {
1459	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1565	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1460	}	1566	}
1461		1567
…		…
1474	};	1580	};
1475		1581
1476	$grp	1582	$grp
1477	}	1583	}
1478		1584
		1585	sub _ext_cfg_reg($$$$) {
		1586	my ($rvar, $varname, $cfgname, $default) = @_;
		1587
		1588	$cfgname = lc $varname
		1589	unless length $cfgname;
		1590
		1591	$EXT_CFG{$cfgname} = [$rvar, $default];
		1592
		1593	$$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
		1594	}
		1595
1479	sub load_extensions {	1596	sub load_extensions {
1480	info "loading extensions...";	1597	info "loading extensions...";
		1598
		1599	%EXT_CFG = ();
1481		1600
1482	cf::sync_job {	1601	cf::sync_job {
1483	my %todo;	1602	my %todo;
1484		1603
1485	for my $path (<$LIBDIR/*.ext>) {	1604	for my $path (<$LIBDIR/*.ext>) {
…		…
1528	unless exists $done{$_};	1647	unless exists $done{$_};
1529	}	1648	}
1530		1649
1531	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1650	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1532		1651
		1652	my $source = $v->{source};
		1653
		1654	# support "CONF varname :confname = default" pseudo-statements
		1655	$source =~ s{
		1656	^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
		1657	}{
		1658	"our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
		1659	}gmxe;
		1660
1533	my $active = eval $v->{source};	1661	my $active = eval $source;
1534		1662
1535	if (length $@) {	1663	if (length $@) {
1536	error "$v->{path}: $@\n";	1664	error "$v->{path}: $@\n";
1537		1665
1538	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1666	cf::cleanup "mandatory extension '$k' failed to load, exiting."
…		…
1825	}	1953	}
1826		1954
1827	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1955	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1828		1956
1829	Expand deliantra pod fragments into protocol xml.	1957	Expand deliantra pod fragments into protocol xml.
1830
1831	=item $player->ext_reply ($msgid, @msg)
1832
1833	Sends an ext reply to the player.
1834
1835	=cut
1836
1837	sub ext_reply($$@) {
1838	my ($self, $id, @msg) = @_;
1839
1840	$self->ns->ext_reply ($id, @msg)
1841	}
1842		1958
1843	=item $player->ext_msg ($type, @msg)	1959	=item $player->ext_msg ($type, @msg)
1844		1960
1845	Sends an ext event to the client.	1961	Sends an ext event to the client.
1846		1962
…		…
2069	$self->{load_path} = $path;	2185	$self->{load_path} = $path;
2070		2186
2071	1	2187	1
2072	}	2188	}
2073		2189
		2190	# used to laod the header of an original map
2074	sub load_header_orig {	2191	sub load_header_orig {
2075	my ($self) = @_;	2192	my ($self) = @_;
2076		2193
2077	$self->load_header_from ($self->load_path)	2194	$self->load_header_from ($self->load_path)
2078	}	2195	}
2079		2196
		2197	# used to laod the header of an instantiated map
2080	sub load_header_temp {	2198	sub load_header_temp {
2081	my ($self) = @_;	2199	my ($self) = @_;
2082		2200
2083	$self->load_header_from ($self->save_path)	2201	$self->load_header_from ($self->save_path)
2084	}	2202	}
2085		2203
		2204	# called after loading the header from an instantiated map
2086	sub prepare_temp {	2205	sub prepare_temp {
2087	my ($self) = @_;	2206	my ($self) = @_;
2088		2207
2089	$self->last_access ((delete $self->{last_access})	2208	$self->last_access ((delete $self->{last_access})
2090	\|\| $cf::RUNTIME); #d#	2209	\|\| $cf::RUNTIME); #d#
2091	# safety	2210	# safety
2092	$self->{instantiate_time} = $cf::RUNTIME	2211	$self->{instantiate_time} = $cf::RUNTIME
2093	if $self->{instantiate_time} > $cf::RUNTIME;	2212	if $self->{instantiate_time} > $cf::RUNTIME;
2094	}	2213	}
2095		2214
		2215	# called after loading the header from an original map
2096	sub prepare_orig {	2216	sub prepare_orig {
2097	my ($self) = @_;	2217	my ($self) = @_;
2098		2218
2099	$self->{load_original} = 1;	2219	$self->{load_original} = 1;
2100	$self->{instantiate_time} = $cf::RUNTIME;	2220	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2126	sub find {	2246	sub find {
2127	my ($path, $origin) = @_;	2247	my ($path, $origin) = @_;
2128		2248
2129	cf::cede_to_tick;	2249	cf::cede_to_tick;
2130		2250
2131	$path = normalise $path, $origin && $origin->path;	2251	$path = normalise $path, $origin;
2132		2252
2133	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2253	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2134	my $guard2 = cf::lock_acquire "map_find:$path";	2254	my $guard2 = cf::lock_acquire "map_find:$path";
2135		2255
2136	$cf::MAP{$path} \|\| do {	2256	$cf::MAP{$path} \|\| do {
…		…
2167		2287
2168	{	2288	{
2169	my $guard = cf::lock_acquire "map_data:$path";	2289	my $guard = cf::lock_acquire "map_data:$path";
2170		2290
2171	return unless $self->valid;	2291	return unless $self->valid;
2172	return unless $self->in_memory == cf::MAP_SWAPPED;	2292	return unless $self->state == cf::MAP_SWAPPED;
2173
2174	$self->in_memory (cf::MAP_LOADING);
2175		2293
2176	$self->alloc;	2294	$self->alloc;
2177		2295
2178	$self->pre_load;	2296	$self->pre_load;
2179	cf::cede_to_tick;	2297	cf::cede_to_tick;
…		…
2197	}	2315	}
2198	}	2316	}
2199	}	2317	}
2200		2318
2201	$f->resolve_delayed_derefs;	2319	$f->resolve_delayed_derefs;
		2320	} else {
		2321	$self->post_load_original
		2322	if delete $self->{load_original};
2202	}	2323	}
		2324
		2325	$self->state (cf::MAP_INACTIVE);
2203		2326
2204	cf::cede_to_tick;	2327	cf::cede_to_tick;
2205	# now do the right thing for maps	2328	# now do the right thing for maps
2206	$self->link_multipart_objects;	2329	$self->link_multipart_objects;
2207	$self->difficulty ($self->estimate_difficulty)	2330	$self->difficulty ($self->estimate_difficulty)
…		…
2211	unless ($self->{deny_activate}) {	2334	unless ($self->{deny_activate}) {
2212	$self->decay_objects;	2335	$self->decay_objects;
2213	$self->fix_auto_apply;	2336	$self->fix_auto_apply;
2214	$self->update_buttons;	2337	$self->update_buttons;
2215	cf::cede_to_tick;	2338	cf::cede_to_tick;
2216	$self->activate;	2339	#$self->activate; # no longer activate maps automatically
2217	}	2340	}
2218		2341
2219	$self->{last_save} = $cf::RUNTIME;	2342	$self->{last_save} = $cf::RUNTIME;
2220	$self->last_access ($cf::RUNTIME);	2343	$self->last_access ($cf::RUNTIME);
2221
2222	$self->in_memory (cf::MAP_ACTIVE);
2223	}	2344	}
2224		2345
2225	$self->post_load;	2346	$self->post_load;
2226		2347
2227	1	2348	1
…		…
2240	# if $self->per_party;	2361	# if $self->per_party;
2241		2362
2242	$self	2363	$self
2243	}	2364	}
2244		2365
2245	# find and load all maps in the 3x3 area around a map
2246	sub load_neighbours {
2247	my ($map) = @_;
2248
2249	my @neigh; # diagonal neighbours
2250
2251	for (0 .. 3) {
2252	my $neigh = $map->tile_path ($_)
2253	or next;
2254	$neigh = find $neigh, $map
2255	or next;
2256	$neigh->load;
2257
2258	# now find the diagonal neighbours
2259	push @neigh,
2260	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2261	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2262	}
2263
2264	for (grep defined $_->[0], @neigh) {
2265	my ($path, $origin) = @$_;
2266	my $neigh = find $path, $origin
2267	or next;
2268	$neigh->load;
2269	}
2270	}
2271
2272	sub find_sync {	2366	sub find_sync {
2273	my ($path, $origin) = @_;	2367	my ($path, $origin) = @_;
2274		2368
		2369	# it's a bug to call this from the main context
2275	return cf::LOG cf::llevError \| cf::logBacktrace, "do_find_sync"	2370	return cf::LOG cf::llevError \| cf::logBacktrace, "do_find_sync"
2276	if $Coro::current == $Coro::main;	2371	if $Coro::current == $Coro::main;
2277		2372
2278	find $path, $origin	2373	find $path, $origin
2279	}	2374	}
2280		2375
2281	sub do_load_sync {	2376	sub do_load_sync {
2282	my ($map) = @_;	2377	my ($map) = @_;
2283		2378
		2379	# it's a bug to call this from the main context
2284	return cf::LOG cf::llevError \| cf::logBacktrace, "do_load_sync"	2380	return cf::LOG cf::llevError \| cf::logBacktrace, "do_load_sync"
2285	if $Coro::current == $Coro::main;	2381	if $Coro::current == $Coro::main;
2286		2382
2287	$map->load;	2383	$map->load;
2288	}	2384	}
…		…
2291	our $MAP_PREFETCHER = undef;	2387	our $MAP_PREFETCHER = undef;
2292		2388
2293	sub find_async {	2389	sub find_async {
2294	my ($path, $origin, $load) = @_;	2390	my ($path, $origin, $load) = @_;
2295		2391
2296	$path = normalise $path, $origin && $origin->{path};	2392	$path = normalise $path, $origin;
2297		2393
2298	if (my $map = $cf::MAP{$path}) {	2394	if (my $map = $cf::MAP{$path}) {
2299	return $map if !$load \|\| $map->in_memory == cf::MAP_ACTIVE;	2395	return $map if !$load \|\| $map->linkable;
2300	}	2396	}
2301		2397
2302	$MAP_PREFETCH{$path} \|= $load;	2398	$MAP_PREFETCH{$path} \|= $load;
2303		2399
2304	$MAP_PREFETCHER \|\|= cf::async {	2400	$MAP_PREFETCHER \|\|= cf::async {
2305	$Coro::current->{desc} = "map prefetcher";	2401	$Coro::current->{desc} = "map prefetcher";
2306		2402
2307	while (%MAP_PREFETCH) {	2403	while (%MAP_PREFETCH) {
2308	while (my ($k, $v) = each %MAP_PREFETCH) {	2404	for my $k (keys %MAP_PREFETCH) {
2309	if (my $map = find $k) {	2405	if (my $map = find $k) {
2310	$map->load if $v;	2406	$map->load if $MAP_PREFETCH{$k};
2311	}	2407	}
2312		2408
2313	delete $MAP_PREFETCH{$k};	2409	delete $MAP_PREFETCH{$k};
2314	}	2410	}
2315	}	2411	}
…		…
2363	sub swap_out {	2459	sub swap_out {
2364	my ($self) = @_;	2460	my ($self) = @_;
2365		2461
2366	my $lock = cf::lock_acquire "map_data:$self->{path}";	2462	my $lock = cf::lock_acquire "map_data:$self->{path}";
2367		2463
2368	return if $self->in_memory != cf::MAP_ACTIVE;	2464	return if !$self->linkable;
2369	return if $self->{deny_save};	2465	return if $self->{deny_save};
2370	return if $self->players;	2466	return if $self->players;
2371		2467
2372	# first deactivate the map and "unlink" it from the core	2468	# first deactivate the map and "unlink" it from the core
2373	$self->deactivate;	2469	$self->deactivate;
2374	$_->clear_links_to ($self) for values %cf::MAP;	2470	$_->clear_links_to ($self) for values %cf::MAP;
2375	$self->in_memory (cf::MAP_SWAPPED);	2471	$self->state (cf::MAP_SWAPPED);
2376		2472
2377	# then atomically save	2473	# then atomically save
2378	$self->_save;	2474	$self->_save;
2379		2475
2380	# then free the map	2476	# then free the map
…		…
2406		2502
2407	return if $self->players;	2503	return if $self->players;
2408		2504
2409	cf::trace "resetting map ", $self->path, "\n";	2505	cf::trace "resetting map ", $self->path, "\n";
2410		2506
2411	$self->in_memory (cf::MAP_SWAPPED);	2507	$self->state (cf::MAP_SWAPPED);
2412		2508
2413	# need to save uniques path	2509	# need to save uniques path
2414	unless ($self->{deny_save}) {	2510	unless ($self->{deny_save}) {
2415	my $uniq = $self->uniq_path; utf8::encode $uniq;	2511	my $uniq = $self->uniq_path; utf8::encode $uniq;
2416		2512
…		…
2569		2665
2570	Creates and returns a persistent reference to an object that can be stored as a string.	2666	Creates and returns a persistent reference to an object that can be stored as a string.
2571		2667
2572	=item $ob = cf::object::deref ($refstring)	2668	=item $ob = cf::object::deref ($refstring)
2573		2669
2574	returns the objetc referenced by refstring. may return undef when it cnanot find the object,	2670	returns the objetc referenced by refstring. may return undef when it cannot find the object,
2575	even if the object actually exists. May block.	2671	even if the object actually exists. May block.
2576		2672
2577	=cut	2673	=cut
2578		2674
2579	sub deref {	2675	sub deref {
…		…
2661	=item $player_object->may ("access")	2757	=item $player_object->may ("access")
2662		2758
2663	Returns wether the given player is authorized to access resource "access"	2759	Returns wether the given player is authorized to access resource "access"
2664	(e.g. "command_wizcast").	2760	(e.g. "command_wizcast").
2665		2761
		2762	This is implemented by checking a config setting of C<may_access> where
		2763	C<access> is replaced by the access string. The following alternatives are
		2764	possible (and are tested in order):
		2765
		2766	=over 4
		2767
		2768	=item * Player is DM
		2769
		2770	The request will succeed.
		2771
		2772	=item * may_access is an array reference
		2773
		2774	If either the player nickname or UUID is in the array, the request will
		2775	succeed, otherwise it will fail.
		2776
		2777	=item * may_access is a true value
		2778
		2779	The request will succeed.
		2780
		2781	=item * may_access is missing or false
		2782
		2783	The request will fail.
		2784
		2785	=back
		2786
2666	=cut	2787	=cut
2667		2788
2668	sub cf::object::player::may {	2789	sub cf::object::player::may {
2669	my ($self, $access) = @_;	2790	my ($self, $access) = @_;
2670		2791
2671	$self->flag (cf::FLAG_WIZ) \|\|	2792	$self->flag (cf::FLAG_WIZ) \|\|
2672	(ref $cf::CFG{"may_$access"}	2793	(ref $cf::CFG{"may_$access"}
2673	? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}	2794	? scalar grep $self->name eq $_ \|\| $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2674	: $cf::CFG{"may_$access"})	2795	: $cf::CFG{"may_$access"})
2675	}	2796	}
2676		2797
2677	=item $player_object->enter_link	2798	=item $player_object->enter_link
2678		2799
…		…
2681	The player should be reasonably safe there for short amounts of time (e.g.	2802	The player should be reasonably safe there for short amounts of time (e.g.
2682	for loading a map). You I<MUST> call C<leave_link> as soon as possible,	2803	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2683	though, as the player cannot control the character while it is on the link	2804	though, as the player cannot control the character while it is on the link
2684	map.	2805	map.
2685		2806
2686	Will never block.	2807	This method will never block, which is the whole reaosn for it's
		2808	existance: you can I<always> put a player onto the link map, which is the
		2809	only place to put objects that is guaranteed to exist.
		2810
		2811	A typical usage pattern is to call C<enter_link> synchronously from the
		2812	server, then start a new thread, do your blocking stuff there and then
		2813	call C<leave_link> from that thread.
2687		2814
2688	=item $player_object->leave_link ($map, $x, $y)	2815	=item $player_object->leave_link ($map, $x, $y)
2689		2816
2690	Moves the player out of the special C<{link}> map onto the specified	2817	Moves the player out of the special C<{link}> map onto the specified
2691	map. If the map is not valid (or omitted), the player will be moved back	2818	map. If the map is not valid (or omitted), the player will be moved back
…		…
2746	# use -1 or undef as default coordinates, not 0, 0	2873	# use -1 or undef as default coordinates, not 0, 0
2747	($x, $y) = ($map->enter_x, $map->enter_y)	2874	($x, $y) = ($map->enter_x, $map->enter_y)
2748	if $x <= 0 && $y <= 0;	2875	if $x <= 0 && $y <= 0;
2749		2876
2750	$map->load;	2877	$map->load;
2751	$map->load_neighbours;
2752		2878
2753	return unless $self->contr->active;	2879	return unless $self->contr->active;
2754		2880
2755	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2881	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2756	if ($self->enter_map ($map, $x, $y)) {	2882	if ($self->enter_map ($map, $x, $y)) {
…		…
2812	($path, $x, $y) = (undef, undef, undef);	2938	($path, $x, $y) = (undef, undef, undef);
2813	}	2939	}
2814	}	2940	}
2815		2941
2816	my $map = eval {	2942	my $map = eval {
2817	my $map = defined $path ? cf::map::find $path : undef;	2943	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2818		2944
2819	if ($map) {	2945	if ($map) {
2820	$map = $map->customise_for ($self);	2946	$map = $map->customise_for ($self);
2821	$map = $check->($map, $x, $y, $self) if $check && $map;	2947	$map = $check->($map, $x, $y, $self) if $check && $map;
2822	} else {	2948	} else {
…		…
2912	$Coro::current->{desc} = "enter_exit";	3038	$Coro::current->{desc} = "enter_exit";
2913		3039
2914	unless (eval {	3040	unless (eval {
2915	$self->deactivate_recursive; # just to be sure	3041	$self->deactivate_recursive; # just to be sure
2916		3042
2917	# random map handling
2918	{
2919	my $guard = cf::lock_acquire "exit_prepare:$exit";
2920
2921	prepare_random_map $exit
2922	if $exit->slaying eq "/!";
2923	}
2924
2925	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	3043	my $map = cf::map::normalise $exit->slaying, $exit->map;
2926	my $x = $exit->stats->hp;	3044	my $x = $exit->stats->hp;
2927	my $y = $exit->stats->sp;	3045	my $y = $exit->stats->sp;
		3046
		3047	# special map handling
		3048	my $slaying = $exit->slaying;
		3049
		3050	# special map handling
		3051	if ($slaying eq "/!") {
		3052	my $guard = cf::lock_acquire "exit_prepare:$exit";
		3053
		3054	prepare_random_map $exit
		3055	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		3056
		3057	$map = $exit->slaying;
		3058
		3059	} elsif ($slaying eq '!up') {
		3060	$map = $exit->map->tile_path (cf::TILE_UP);
		3061	$x = $exit->x;
		3062	$y = $exit->y;
		3063
		3064	} elsif ($slaying eq '!down') {
		3065	$map = $exit->map->tile_path (cf::TILE_DOWN);
		3066	$x = $exit->x;
		3067	$y = $exit->y;
		3068	}
2928		3069
2929	$self->goto ($map, $x, $y);	3070	$self->goto ($map, $x, $y);
2930		3071
2931	# if exit is damned, update players death & WoR home-position	3072	# if exit is damned, update players death & WoR home-position
2932	$self->contr->savebed ($map, $x, $y)	3073	$self->contr->savebed ($map, $x, $y)
…		…
2947		3088
2948	=head3 cf::client	3089	=head3 cf::client
2949		3090
2950	=over 4	3091	=over 4
2951		3092
2952	=item $client->send_drawinfo ($text, $flags)
2953
2954	Sends a drawinfo packet to the client. Circumvents output buffering so
2955	should not be used under normal circumstances.
2956
2957	=cut
2958
2959	sub cf::client::send_drawinfo {
2960	my ($self, $text, $flags) = @_;
2961
2962	utf8::encode $text;
2963	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);
2964	}
2965
2966	=item $client->send_big_packet ($pkt)	3093	=item $client->send_big_packet ($pkt)
2967		3094
2968	Like C<send_packet>, but tries to compress large packets, and fragments	3095	Like C<send_packet>, but tries to compress large packets, and fragments
2969	them as required.	3096	them as required.
2970		3097
…		…
2988	$self->send_packet ($pkt);	3115	$self->send_packet ($pkt);
2989	}	3116	}
2990		3117
2991	=item $client->send_msg ($channel, $msg, $color, [extra...])	3118	=item $client->send_msg ($channel, $msg, $color, [extra...])
2992		3119
2993	Send a drawinfo or msg packet to the client, formatting the msg for the	3120	Send a msg packet to the client, formatting the msg for the client if
2994	client if neccessary. C<$type> should be a string identifying the type of	3121	necessary. C<$type> should be a string identifying the type of the
2995	the message, with C<log> being the default. If C<$color> is negative, suppress	3122	message, with C<log> being the default. If C<$color> is negative, suppress
2996	the message unless the client supports the msg packet.	3123	the message unless the client supports the msg packet.
2997		3124
2998	=cut	3125	=cut
2999		3126
3000	# non-persistent channels (usually the info channel)	3127	# non-persistent channels (usually the info channel)
…		…
3043	},	3170	},
3044	"c/body" => {	3171	"c/body" => {
3045	id => "infobox",	3172	id => "infobox",
3046	title => "Body Parts",	3173	title => "Body Parts",
3047	reply => undef,	3174	reply => undef,
3048	tooltip => "Shows which body parts you posess and are available",	3175	tooltip => "Shows which body parts you possess and are available",
3049	},	3176	},
3050	"c/statistics" => {	3177	"c/statistics" => {
3051	id => "infobox",	3178	id => "infobox",
3052	title => "Statistics",	3179	title => "Statistics",
3053	reply => undef,	3180	reply => undef,
…		…
3105	id => "death",	3232	id => "death",
3106	title => "Death",	3233	title => "Death",
3107	reply => undef,	3234	reply => undef,
3108	tooltip => "Reason for and more info about your most recent death",	3235	tooltip => "Reason for and more info about your most recent death",
3109	},	3236	},
		3237	"c/fatal" => {
		3238	id => "fatal",
		3239	title => "Fatal Error",
		3240	reply => undef,
		3241	tooltip => "Reason for the server disconnect",
		3242	},
3110	"c/say" => $SAY_CHANNEL,	3243	"c/say" => $SAY_CHANNEL,
3111	"c/chat" => $CHAT_CHANNEL,	3244	"c/chat" => $CHAT_CHANNEL,
3112	);	3245	);
3113		3246
3114	sub cf::client::send_msg {	3247	sub cf::client::send_msg {
…		…
3157	=cut	3290	=cut
3158		3291
3159	sub cf::client::ext_msg($$@) {	3292	sub cf::client::ext_msg($$@) {
3160	my ($self, $type, @msg) = @_;	3293	my ($self, $type, @msg) = @_;
3161		3294
3162	if ($self->extcmd == 2) {
3163	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3295	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3164	} elsif ($self->extcmd == 1) { # TODO: remove
3165	push @msg, msgtype => "event_$type";
3166	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3167	}
3168	}
3169
3170	=item $client->ext_reply ($msgid, @msg)
3171
3172	Sends an ext reply to the client.
3173
3174	=cut
3175
3176	sub cf::client::ext_reply($$@) {
3177	my ($self, $id, @msg) = @_;
3178
3179	if ($self->extcmd == 2) {
3180	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3181	} elsif ($self->extcmd == 1) {
3182	#TODO: version 1, remove
3183	unshift @msg, msgtype => "reply", msgid => $id;
3184	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3185	}
3186	}	3296	}
3187		3297
3188	=item $success = $client->query ($flags, "text", \&cb)	3298	=item $success = $client->query ($flags, "text", \&cb)
3189		3299
3190	Queues a query to the client, calling the given callback with	3300	Queues a query to the client, calling the given callback with
…		…
3210		3320
3211	$self->send_packet ($self->{query_queue}[0][0])	3321	$self->send_packet ($self->{query_queue}[0][0])
3212	if @{ $self->{query_queue} } == 1;	3322	if @{ $self->{query_queue} } == 1;
3213		3323
3214	1	3324	1
		3325	}
		3326
		3327	=item $client->update_command_faces
		3328
		3329	=cut
		3330
		3331	our %COMMAND_FACE;
		3332
		3333	sub cf::client::update_command_faces {
		3334	my ($self) = @_;
		3335
		3336	my @faces = grep $_,
		3337	$COMMAND_FACE{preferred},
		3338	$COMMAND_FACE{standard},
		3339	$COMMAND_FACE{skill},
		3340	$self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
		3341	$COMMAND_FACE{emote},
		3342	;
		3343
		3344	$self->send_face ($_)
		3345	for @faces;
		3346	$self->flush_fx;
		3347
		3348	$self->ext_msg (command_list => @faces);
		3349	}
		3350
		3351	=item cf::client::set_command_face $type, $commands
		3352
		3353	=cut
		3354
		3355	sub cf::client::set_command_face {
		3356	my ($type, $list) = @_;
		3357
		3358	my $idx = &cf::face::set ( #d# ugly forward reference
		3359	"command_list/$type" => cf::FT_RSRC,
		3360	JSON::XS->new->utf8->encode ([ sort @$list ])
		3361	);
		3362
		3363	$COMMAND_FACE{$type} = $idx;
3215	}	3364	}
3216		3365
3217	cf::client->attach (	3366	cf::client->attach (
3218	on_connect => sub {	3367	on_connect => sub {
3219	my ($ns) = @_;	3368	my ($ns) = @_;
…		…
3245	my ($ns, $buf) = @_;	3394	my ($ns, $buf) = @_;
3246		3395
3247	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3396	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3248		3397
3249	if (ref $msg) {	3398	if (ref $msg) {
3250	my ($type, $reply, @payload) =	3399	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3251	"ARRAY" eq ref $msg
3252	? @$msg
3253	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3254		3400
3255	my @reply;
3256
3257	if (my $cb = $EXTICMD{$type}) {	3401	if (my $cb = $EXTIACMD{$type}) {
		3402	$cb->(
		3403	$ns,
		3404	sub {
		3405	$ns->ext_msg ("reply-$reply", @_)
		3406	if $reply;
		3407	},
		3408	@payload
		3409	);
		3410	} else {
		3411	my @reply;
		3412
		3413	if (my $cb = $EXTICMD{$type}) {
3258	@reply = $cb->($ns, @payload);	3414	@reply = $cb->($ns, @payload);
		3415	}
		3416
		3417	$ns->ext_msg ("reply-$reply", @reply)
		3418	if $reply;
3259	}	3419	}
3260
3261	$ns->ext_reply ($reply, @reply)
3262	if $reply;
3263
3264	} else {	3420	} else {
3265	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3421	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3266	}	3422	}
3267		3423
3268	cf::override;	3424	cf::override;
…		…
3436	=cut	3592	=cut
3437		3593
3438	#############################################################################	3594	#############################################################################
3439	# the server's init and main functions	3595	# the server's init and main functions
3440		3596
		3597	{
		3598	package cf::face;
		3599
		3600	our %HASH; # hash => idx
		3601	our @DATA; # dynamically-created facedata, only faceste 0 used
		3602	our @FOFS; # file offset, if > 0
		3603	our @SIZE; # size of face, in octets
		3604	our @META; # meta hash of face, if any
		3605	our $DATAFH; # facedata filehandle
		3606
		3607	# internal api, not finalised
		3608	sub set {
		3609	my ($name, $type, $data) = @_;
		3610
		3611	my $idx = cf::face::find $name;
		3612
		3613	if ($idx) {
		3614	delete $HASH{cf::face::get_csum $idx};
		3615	} else {
		3616	$idx = cf::face::alloc $name;
		3617	}
		3618
		3619	my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
		3620
		3621	cf::face::set_type $idx, $type;
		3622	cf::face::set_csum $idx, 0, $hash;
		3623
		3624	# we need to destroy the SV itself, not just modify it, as a running ix
		3625	# might hold a reference to it: "delete" achieves that.
		3626	delete $FOFS[0][$idx];
		3627	delete $DATA[0][$idx];
		3628	$DATA[0][$idx] = $data;
		3629	$SIZE[0][$idx] = length $data;
		3630	delete $META[$idx];
		3631	$HASH{$hash} = $idx;#d#
		3632
		3633	$idx
		3634	}
		3635
		3636	sub _get_data($$$) {
		3637	my ($idx, $set, $cb) = @_;
		3638
		3639	if (defined $DATA[$set][$idx]) {
		3640	$cb->($DATA[$set][$idx]);
		3641	} elsif (my $fofs = $FOFS[$set][$idx]) {
		3642	my $size = $SIZE[$set][$idx];
		3643	my $buf;
		3644	IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
		3645	if ($_[0] == $size) {
		3646	#cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
		3647	$cb->($buf);
		3648	} else {
		3649	cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
		3650	}
		3651	};
		3652	} else {
		3653	cf::error "requested facedata for unknown face $idx#$set, ignoring.";
		3654	}
		3655	}
		3656
		3657	# rather ineffient
		3658	sub cf::face::get_data($;$) {
		3659	my ($idx, $set) = @_;
		3660
		3661	_get_data $idx, $set, Coro::rouse_cb;
		3662	Coro::rouse_wait
		3663	}
		3664
		3665	sub cf::face::ix {
		3666	my ($ns, $set, $idx, $pri) = @_;
		3667
		3668	_get_data $idx, $set, sub {
		3669	$ns->ix_send ($idx, $pri, $_[0]);
		3670	};
		3671	}
		3672	}
		3673
3441	sub load_facedata($) {	3674	sub load_facedata($) {
3442	my ($path) = @_;	3675	my ($path) = @_;
3443		3676
3444	# HACK to clear player env face cache, we need some signal framework
3445	# for this (global event?)
3446	%ext::player_env::MUSIC_FACE_CACHE = ();
3447
3448	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3677	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3449		3678
3450	trace "loading facedata from $path\n";	3679	trace "loading facedata from $path\n";
3451		3680
3452	my $facedata = decode_storable load_file $path;	3681	my $facedata = decode_storable load_file "$path/faceinfo";
3453		3682
3454	$facedata->{version} == 2	3683	$facedata->{version} == 2
3455	or cf::cleanup "$path: version mismatch, cannot proceed.";	3684	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3456		3685
3457	# patch in the exptable	3686	my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3458	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);	3687	or cf::cleanup "$path/facedata: $!, cannot proceed.";
3459	$facedata->{resource}{"res/exp_table"} = {	3688
3460	type => FT_RSRC,	3689	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3461	data => $exp_table,	3690
3462	hash => (Digest::MD5::md5 $exp_table),	3691	# BEGIN ATOMIC
3463	};	3692	# from here on, everything must be atomic - no thread switch allowed
3464	cf::cede_to_tick;	3693	my $t1 = EV::time;
3465		3694
3466	{	3695	{
3467	my $faces = $facedata->{faceinfo};	3696	my $faces = $facedata->{faceinfo};
3468		3697
3469	while (my ($face, $info) = each %$faces) {	3698	for my $face (sort keys %$faces) {
		3699	my $info = $faces->{$face};
3470	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3700	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
3471		3701
3472	cf::face::set_visibility $idx, $info->{visibility};	3702	cf::face::set_visibility $idx, $info->{visibility};
3473	cf::face::set_magicmap $idx, $info->{magicmap};	3703	cf::face::set_magicmap $idx, $info->{magicmap};
3474	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3704	cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3475	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3705	cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3476	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;	3706	cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3477		3707	$cf::face::HASH{$info->{hash64}} = $idx;
3478	cf::cede_to_tick;	3708	delete $cf::face::META[$idx];
3479	}	3709	}
3480		3710
3481	while (my ($face, $info) = each %$faces) {	3711	while (my ($face, $info) = each %$faces) {
3482	next unless $info->{smooth};	3712	next unless $info->{smooth};
3483		3713
…		…
3488	cf::face::set_smooth $idx, $smooth;	3718	cf::face::set_smooth $idx, $smooth;
3489	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3719	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3490	} else {	3720	} else {
3491	error "smooth face '$info->{smooth}' not found for face '$face'";	3721	error "smooth face '$info->{smooth}' not found for face '$face'";
3492	}	3722	}
3493
3494	cf::cede_to_tick;
3495	}	3723	}
3496	}	3724	}
3497		3725
3498	{	3726	{
3499	my $anims = $facedata->{animinfo};	3727	my $anims = $facedata->{animinfo};
3500		3728
3501	while (my ($anim, $info) = each %$anims) {	3729	while (my ($anim, $info) = each %$anims) {
3502	cf::anim::set $anim, $info->{frames}, $info->{facings};	3730	cf::anim::set $anim, $info->{frames}, $info->{facings};
3503	cf::cede_to_tick;
3504	}	3731	}
3505		3732
3506	cf::anim::invalidate_all; # d'oh	3733	cf::anim::invalidate_all; # d'oh
3507	}	3734	}
3508		3735
3509	{	3736	{
3510	my $res = $facedata->{resource};	3737	my $res = $facedata->{resource};
3511		3738
3512	while (my ($name, $info) = each %$res) {	3739	while (my ($name, $info) = each %$res) {
3513	if (defined $info->{type}) {	3740	if (defined (my $type = $info->{type})) {
		3741	# TODO: different hash - must free and use new index, or cache ixface data queue
3514	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;	3742	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
3515		3743
3516	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3517	cf::face::set_type $idx, $info->{type};	3744	cf::face::set_type $idx, $type;
		3745	cf::face::set_csum $idx, 0, $info->{hash};
		3746	$cf::face::SIZE[0][$idx] = $info->{size};
		3747	$cf::face::FOFS[0][$idx] = $info->{fofs};
		3748	$cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3749	$cf::face::HASH{$info->{hash}} = $idx;
3518	} else {	3750	} else {
3519	$RESOURCE{$name} = $info; # unused	3751	# $RESOURCE{$name} = $info; # unused
3520	}	3752	}
3521
3522	cf::cede_to_tick;
3523	}	3753	}
3524	}	3754	}
		3755
		3756	($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
		3757
		3758	# HACK to clear player env face cache, we need some signal framework
		3759	# for this (global event?)
		3760	%ext::player_env::MUSIC_FACE_CACHE = ();
		3761
		3762	# END ATOMIC
		3763
		3764	cf::debug "facedata atomic update time ", EV::time - $t1;
3525		3765
3526	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3766	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
		3767
		3768	aio_close $fh if $fh; # close old facedata
3527		3769
3528	1	3770	1
3529	}	3771	}
3530		3772
3531	register_exticmd fx_want => sub {	3773	register_exticmd fx_want => sub {
…		…
3542	my $status = load_resource_file_ $_[0];	3784	my $status = load_resource_file_ $_[0];
3543	get_slot 0.1, 100;	3785	get_slot 0.1, 100;
3544	cf::arch::commit_load;	3786	cf::arch::commit_load;
3545		3787
3546	$status	3788	$status
		3789	}
		3790
		3791	sub reload_exp_table {
		3792	_reload_exp_table;
		3793
		3794	cf::face::set
		3795	"res/exp_table" => FT_RSRC,
		3796	JSON::XS->new->utf8->canonical->encode (
		3797	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3798	);
		3799	}
		3800
		3801	sub reload_materials {
		3802	_reload_materials;
3547	}	3803	}
3548		3804
3549	sub reload_regions {	3805	sub reload_regions {
3550	# HACK to clear player env face cache, we need some signal framework	3806	# HACK to clear player env face cache, we need some signal framework
3551	# for this (global event?)	3807	# for this (global event?)
…		…
3559	if exists $_->{match};	3815	if exists $_->{match};
3560	}	3816	}
3561	}	3817	}
3562		3818
3563	sub reload_facedata {	3819	sub reload_facedata {
3564	load_facedata "$DATADIR/facedata"	3820	load_facedata $DATADIR
3565	or die "unable to load facedata\n";	3821	or die "unable to load facedata\n";
3566	}	3822	}
3567		3823
3568	sub reload_archetypes {	3824	sub reload_archetypes {
3569	load_resource_file "$DATADIR/archetypes"	3825	load_resource_file "$DATADIR/archetypes"
3570	or die "unable to load archetypes\n";	3826	or die "unable to load archetypes\n";
		3827
		3828	cf::face::set
		3829	"res/skill_info" => FT_RSRC,
		3830	JSON::XS->new->utf8->canonical->encode (
		3831	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3832	);
		3833
		3834	cf::face::set
		3835	"res/spell_paths" => FT_RSRC,
		3836	JSON::XS->new->utf8->canonical->encode (
		3837	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3838	);
		3839
		3840	# command completion
		3841	my @commands;
		3842
		3843	for (0..cf::arch::skillvec_size - 1) {
		3844	my $skill = cf::arch::skillvec $_;
		3845	my $name = $skill->name;
		3846	my $flags = cf::skill_flags $skill->subtype;
		3847
		3848	push @commands, "ready_skill $name" if $flags & (SF_COMBAT \| SF_RANGED \| SF_GRACE);
		3849	push @commands, "use_skill $name" if $flags & (SF_USE \| SF_AUTARK \| SF_GRACE);
		3850	}
		3851
		3852	cf::client::set_command_face skill => \@commands;
3571	}	3853	}
3572		3854
3573	sub reload_treasures {	3855	sub reload_treasures {
3574	load_resource_file "$DATADIR/treasures"	3856	load_resource_file "$DATADIR/treasures"
3575	or die "unable to load treasurelists\n";	3857	or die "unable to load treasurelists\n";
…		…
3596	}	3878	}
3597		3879
3598	sub reload_resources {	3880	sub reload_resources {
3599	trace "reloading resource files...\n";	3881	trace "reloading resource files...\n";
3600		3882
3601	reload_exp_table;
3602	reload_materials;	3883	reload_materials;
3603	reload_facedata;	3884	reload_facedata;
		3885	reload_exp_table;
3604	reload_sound;	3886	reload_sound;
3605	reload_archetypes;	3887	reload_archetypes;
3606	reload_regions;	3888	reload_regions;
3607	reload_treasures;	3889	reload_treasures;
3608		3890
…		…
3648	seek $fh, 0, 0;	3930	seek $fh, 0, 0;
3649	print $fh $$;	3931	print $fh $$;
3650	}	3932	}
3651		3933
3652	sub main_loop {	3934	sub main_loop {
3653	trace "EV::loop starting\n";	3935	trace "EV::run starting\n";
3654	if (1) {	3936	if (1) {
3655	EV::loop;	3937	EV::run;
3656	}	3938	}
3657	trace "EV::loop returned\n";	3939	trace "EV::run returned\n";
3658	goto &main_loop unless $REALLY_UNLOOP;	3940	goto &main_loop unless $REALLY_UNLOOP;
3659	}	3941	}
3660		3942
3661	sub main {	3943	sub main {
3662	cf::init_globals; # initialise logging	3944	cf::init_globals; # initialise logging
3663		3945
3664	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3946	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3665	LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3947	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3666	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3948	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3667	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3949	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3668		3950
3669	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3951	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3670		3952
3671	# we must not ever block the main coroutine	3953	# we must not ever block the main coroutine
3672	local $Coro::idle = sub {	3954	$Coro::idle = sub {
3673	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3955	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3674	(async {	3956	(async {
3675	$Coro::current->{desc} = "IDLE BUG HANDLER";	3957	$Coro::current->{desc} = "IDLE BUG HANDLER";
3676	EV::loop EV::LOOP_ONESHOT;	3958	EV::run EV::RUN_ONCE;
3677	})->prio (Coro::PRIO_MAX);	3959	})->prio (Coro::PRIO_MAX);
3678	};	3960	};
3679		3961
3680	evthread_start IO::AIO::poll_fileno;	3962	evthread_start IO::AIO::poll_fileno;
3681		3963
3682	cf::sync_job {	3964	cf::sync_job {
3683	cf::incloader::init ();	3965	cf::incloader::init ();
		3966
		3967	db_init;
3684		3968
3685	cf::init_anim;	3969	cf::init_anim;
3686	cf::init_attackmess;	3970	cf::init_attackmess;
3687	cf::init_dynamic;	3971	cf::init_dynamic;
3688		3972
3689	cf::load_settings;	3973	cf::load_settings;
3690		3974
3691	reload_resources;	3975	reload_resources;
3692	reload_config;	3976	reload_config;
3693	db_init;
3694		3977
3695	cf::init_uuid;	3978	cf::init_uuid;
3696	cf::init_signals;	3979	cf::init_signals;
3697	cf::init_skills;	3980	cf::init_skills;
3698		3981
…		…
3712	};	3995	};
3713		3996
3714	cf::object::thawer::errors_are_fatal 0;	3997	cf::object::thawer::errors_are_fatal 0;
3715	info "parse errors in files are no longer fatal from this point on.\n";	3998	info "parse errors in files are no longer fatal from this point on.\n";
3716		3999
3717	my $free_main; $free_main = EV::idle sub {	4000	AE::postpone {
3718	undef $free_main;
3719	undef &main; # free gobs of memory :)	4001	undef &main; # free gobs of memory :)
3720	};	4002	};
3721		4003
3722	goto &main_loop;	4004	goto &main_loop;
3723	}	4005	}
…		…
3880		4162
3881	cf::write_runtime_sync; # external watchdog should not bark	4163	cf::write_runtime_sync; # external watchdog should not bark
3882		4164
3883	trace "emergency_perl_save: flushing outstanding aio requests";	4165	trace "emergency_perl_save: flushing outstanding aio requests";
3884	while (IO::AIO::nreqs \|\| BDB::nreqs) {	4166	while (IO::AIO::nreqs \|\| BDB::nreqs) {
3885	Coro::EV::timer_once 0.01; # let the sync_job do it's thing	4167	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3886	}	4168	}
3887		4169
3888	cf::write_runtime_sync; # external watchdog should not bark	4170	cf::write_runtime_sync; # external watchdog should not bark
3889	};	4171	};
3890		4172
…		…
4071		4353
4072	#############################################################################	4354	#############################################################################
4073		4355
4074	my $bug_warning = 0;	4356	my $bug_warning = 0;
4075		4357
4076	our @WAIT_FOR_TICK;
4077	our @WAIT_FOR_TICK_BEGIN;
4078
4079	sub wait_for_tick() {	4358	sub wait_for_tick() {
4080	return Coro::cede if tick_inhibit \|\| $Coro::current == $Coro::main;	4359	return Coro::AnyEvent::poll if tick_inhibit \|\| $Coro::current == $Coro::main;
4081		4360
4082	my $signal = new Coro::Signal;	4361	$WAIT_FOR_TICK->wait;
4083	push @WAIT_FOR_TICK, $signal;
4084	$signal->wait;
4085	}	4362	}
4086		4363
4087	sub wait_for_tick_begin() {	4364	sub wait_for_tick_begin() {
4088	return Coro::cede if tick_inhibit \|\| $Coro::current == $Coro::main;	4365	return Coro::AnyEvent::poll if tick_inhibit \|\| $Coro::current == $Coro::main;
4089		4366
4090	my $signal = new Coro::Signal;	4367	my $signal = new Coro::Signal;
4091	push @WAIT_FOR_TICK_BEGIN, $signal;	4368	push @WAIT_FOR_TICK_BEGIN, $signal;
4092	$signal->wait;	4369	$signal->wait;
4093	}	4370	}
…		…
4097	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4374	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4098	unless ++$bug_warning > 10;	4375	unless ++$bug_warning > 10;
4099	return;	4376	return;
4100	}	4377	}
4101		4378
4102	cf::server_tick; # one server iteration	4379	cf::one_tick; # one server iteration
4103		4380
4104	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#	4381	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4105		4382
4106	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4383	if ($NOW >= $NEXT_RUNTIME_WRITE) {
4107	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4384	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
…		…
4113	}	4390	}
4114		4391
4115	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4392	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4116	$sig->send;	4393	$sig->send;
4117	}	4394	}
4118	while (my $sig = shift @WAIT_FOR_TICK) {	4395	$WAIT_FOR_TICK->broadcast;
4119	$sig->send;
4120	}
4121		4396
4122	$LOAD = ($NOW - $TICK_START) / $TICK;	4397	$LOAD = ($NOW - $TICK_START) / $TICK;
4123	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4398	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4124		4399
4125	if (0) {	4400	if (0) {
…		…
4131	}	4406	}
4132	}	4407	}
4133		4408
4134	{	4409	{
4135	# configure BDB	4410	# configure BDB
		4411	info "initialising database";
4136		4412
4137	BDB::min_parallel 16;	4413	BDB::min_parallel 16;
4138	BDB::max_poll_reqs $TICK * 0.1;	4414	BDB::max_poll_reqs $TICK * 0.1;
4139	$AnyEvent::BDB::WATCHER->priority (1);	4415	#$AnyEvent::BDB::WATCHER->priority (1);
4140		4416
4141	unless ($DB_ENV) {	4417	unless ($DB_ENV) {
4142	$DB_ENV = BDB::db_env_create;	4418	$DB_ENV = BDB::db_env_create;
4143	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT);	4419	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT);
4144	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4420	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
4169	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4445	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4170	};	4446	};
4171	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4447	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4172	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4448	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4173	};	4449	};
		4450
		4451	info "database initialised";
4174	}	4452	}
4175		4453
4176	{	4454	{
4177	# configure IO::AIO	4455	# configure IO::AIO
4178		4456
		4457	info "initialising aio";
4179	IO::AIO::min_parallel 8;	4458	IO::AIO::min_parallel 8;
4180	IO::AIO::max_poll_time $TICK * 0.1;	4459	IO::AIO::max_poll_time $TICK * 0.1;
4181	undef $AnyEvent::AIO::WATCHER;	4460	undef $AnyEvent::AIO::WATCHER;
		4461	info "aio initialised";
4182	}	4462	}
4183		4463
4184	our $_log_backtrace;	4464	our $_log_backtrace;
4185	our $_log_backtrace_last;	4465	our $_log_backtrace_last;
4186		4466

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.562 by root, Sat Apr 23 04:46:26 2011 UTC vs. Revision 1.623 by root, Wed Aug 30 14:18:51 2017 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.562 by root, Sat Apr 23 04:46:26 2011 UTC vs.
Revision 1.623 by root, Wed Aug 30 14:18:51 2017 UTC