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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.589 by root, Sun Nov 4 01:01:13 2012 UTC vs.
Revision 1.622 by root, Wed Nov 23 06:05:33 2016 UTC

…		…
57	use JSON::XS 2.01 ();	57	use JSON::XS 2.01 ();
58	use BDB ();	58	use BDB ();
59	use Data::Dumper;	59	use Data::Dumper;
60	use Fcntl;	60	use Fcntl;
61	use YAML::XS ();	61	use YAML::XS ();
		62	use CBOR::XS ();
62	use IO::AIO ();	63	use IO::AIO ();
63	use Time::HiRes;
64	use Compress::LZF;	64	use Compress::LZF;
65	use Digest::MD5 ();	65	use Digest::MD5 ();
66		66
67	AnyEvent::detect;	67	AnyEvent::detect;
68		68
…		…
87	our %COMMAND = ();	87	our %COMMAND = ();
88	our %COMMAND_TIME = ();	88	our %COMMAND_TIME = ();
89		89
90	our @EXTS = (); # list of extension package names	90	our @EXTS = (); # list of extension package names
91	our %EXTCMD = ();	91	our %EXTCMD = ();
		92	our %EXTACMD = ();
92	our %EXTICMD = ();	93	our %EXTICMD = ();
		94	our %EXTIACMD = ();
93	our %EXT_CORO = (); # coroutines bound to extensions	95	our %EXT_CORO = (); # coroutines bound to extensions
94	our %EXT_MAP = (); # pluggable maps	96	our %EXT_MAP = (); # pluggable maps
95		97
96	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
97	our @EVENT;	99	our @EVENT;
…		…
224	=item $cf::RUNTIME	226	=item $cf::RUNTIME
225		227
226	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
227	every server tick.	229	every server tick.
228		230
229	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR	231	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
230	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR	232	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
231	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR	233	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
232		234
233	Various directories - "/etc", read-only install directory, perl-library	235	Various directories - "/etc", read-only install directory, perl-library
234	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	236	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
235	unique-items directory, player file directory, random maps directory and	237	unique-items directory, player file directory, random maps directory and
236	database environment.	238	database environment.
…		…
250	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
251	from wherever your confdir points to.	253	from wherever your confdir points to.
252		254
253	=item cf::wait_for_tick, cf::wait_for_tick_begin	255	=item cf::wait_for_tick, cf::wait_for_tick_begin
254		256
255	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.
256	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
257	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.
258		261
259	Note that cf::Wait_for_tick will immediately return when the server is not	262	Note that cf::wait_for_tick will immediately return when the server is not
260	ticking, making it suitable for small pauses in threads that need to run	263	ticking, making it suitable for small pauses in threads that need to run
261	when the server is paused. If that is not applicable (i.e. you I<really>	264	when the server is paused. If that is not applicable (i.e. you I<really>
262	want to wait, use C<$cf::WAIT_FOR_TICK>).	265	want to wait, use C<$cf::WAIT_FOR_TICK>).
263		266
264	=item $cf::WAIT_FOR_TICK	267	=item $cf::WAIT_FOR_TICK
…		…
462		465
463	sub decode_yaml($) {	466	sub decode_yaml($) {
464	fork_call { YAML::XS::Load $_[0] } @_	467	fork_call { YAML::XS::Load $_[0] } @_
465	}	468	}
466		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]
		482	}
		483
467	=item $scalar = cf::unlzf $scalar	484	=item $scalar = cf::unlzf $scalar
468		485
469	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
470	blocks.	487	blocks.
471		488
…		…
508	}	525	}
509	}	526	}
510		527
511	=item cf::lock_wait $string	528	=item cf::lock_wait $string
512		529
513	Wait until the given lock is available. See cf::lock_acquire.	530	Wait until the given lock is available. See cf::lock_acquire.
514		531
515	=item my $lock = cf::lock_acquire $string	532	=item my $lock = cf::lock_acquire $string
516		533
517	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
518	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,
…		…
571	Allocate $time seconds of blocking CPU time at priority C<$priority>	588	Allocate $time seconds of blocking CPU time at priority C<$priority>
572	(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
573	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
574	till the next cede.	591	till the next cede.
575		592
576	Background jobs should use a priority les than zero, interactive jobs	593	Background jobs should use a priority less than zero, interactive jobs
577	should use 100 or more.	594	should use 100 or more.
578		595
579	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
580	used for statistical purposes and should identify the same time-class.	597	used for statistical purposes and should identify the same time-class.
581		598
…		…
594	my $signal = new Coro::Signal;	611	my $signal = new Coro::Signal;
595	my $busy;	612	my $busy;
596		613
597	while () {	614	while () {
598	next_job:	615	next_job:
		616
		617	Coro::cede;
599		618
600	my $avail = cf::till_tick;	619	my $avail = cf::till_tick;
601		620
602	for (0 .. $#SLOT_QUEUE) {	621	for (0 .. $#SLOT_QUEUE) {
603	if ($SLOT_QUEUE[$_][0] <= $avail) {	622	if ($SLOT_QUEUE[$_][0] <= $avail) {
604	$busy = 0;	623	$busy = 0;
605	my $job = splice @SLOT_QUEUE, $_, 1, ();	624	my $job = splice @SLOT_QUEUE, $_, 1, ();
606	$job->[2]->send;	625	$job->[2]->send;
607	Coro::cede;
608	goto next_job;	626	goto next_job;
609	} else {	627	} else {
610	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;	628	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
611	}	629	}
612	}	630	}
613		631
614	if (@SLOT_QUEUE) {	632	if (@SLOT_QUEUE) {
615	# we do not use wait_for_tick() as it returns immediately when tick is inactive	633	wait_for_tick;
616	$WAIT_FOR_TICK->wait;
617	} else {	634	} else {
618	$busy = 0;	635	$busy = 0;
619	Coro::schedule;	636	Coro::schedule;
620	}	637	}
621	}	638	}
…		…
647	BEGIN { *async = \&Coro::async_pool }	664	BEGIN { *async = \&Coro::async_pool }
648		665
649	=item cf::sync_job { BLOCK }	666	=item cf::sync_job { BLOCK }
650		667
651	The design of Deliantra requires that the main coroutine ($Coro::main)	668	The design of Deliantra requires that the main coroutine ($Coro::main)
652	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
653	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
654	acceptable.	671	acceptable.
655		672
656	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
657	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
…		…
685		702
686	while ($busy) {	703	while ($busy) {
687	if (Coro::nready) {	704	if (Coro::nready) {
688	Coro::cede_notself;	705	Coro::cede_notself;
689	} else {	706	} else {
690	EV::loop EV::LOOP_ONESHOT;	707	EV::run EV::RUN_ONCE;
691	}	708	}
692	}	709	}
693		710
694	my $time = AE::time - $time;	711	my $time = AE::time - $time;
695		712
…		…
736	reset_signals;	753	reset_signals;
737	}	754	}
738		755
739	sub fork_call(&@) {	756	sub fork_call(&@) {
740	my ($cb, @args) = @_;	757	my ($cb, @args) = @_;
741
742	# we seemingly have to make a local copy of the whole thing,
743	# otherwise perl prematurely frees the stuff :/
744	# TODO: investigate and fix (likely this will be rather laborious)
745		758
746	my @res = Coro::Util::fork_eval {	759	my @res = Coro::Util::fork_eval {
747	cf::post_fork;	760	cf::post_fork;
748	&$cb	761	&$cb
749	} @args;	762	} @args;
…		…
899		912
900	return db_get cache => "$id/data";	913	return db_get cache => "$id/data";
901	}	914	}
902	}	915	}
903		916
904	my $t1 = Time::HiRes::time;	917	my $t1 = EV::time;
905	my $data = $process->(\@data);	918	my $data = $process->(\@data);
906	my $t2 = Time::HiRes::time;	919	my $t2 = EV::time;
907		920
908	info "cache: '$id' processed in ", $t2 - $t1, "s\n";	921	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
909		922
910	db_put cache => "$id/data", $data;	923	db_put cache => "$id/data", $data;
911	db_put cache => "$id/md5" , $md5;	924	db_put cache => "$id/md5" , $md5;
…		…
1431	=cut	1444	=cut
1432		1445
1433	#############################################################################	1446	#############################################################################
1434	# command handling &c	1447	# command handling &c
1435		1448
1436	=item cf::register_command $name => \&callback($ob,$args);	1449	=item cf::register_command $name => \&callback($ob,$args)
1437		1450
1438	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
1439	$name.	1452	$name.
1440		1453
1441	=cut	1454	=cut
…		…
1447	#warn "registering command '$name/$time' to '$caller'";	1460	#warn "registering command '$name/$time' to '$caller'";
1448		1461
1449	push @{ $COMMAND{$name} }, [$caller, $cb];	1462	push @{ $COMMAND{$name} }, [$caller, $cb];
1450	}	1463	}
1451		1464
1452	=item cf::register_extcmd $name => \&callback($pl,$packet);	1465	=item cf::register_extcmd $name => \&callback($pl,@args)
1453		1466
1454	Register a callback for execution when the client sends an (synchronous)	1467	Register a callback for execution when the client sends an (synchronous)
1455	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
1456	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
1457	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
1458	has logged in successfully.	1471	has logged in successfully.
1459		1472
1460	If the callback returns something, it is sent back as if reply was being	1473	The values will be sent back to the client.
1461	called.
1462		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
1463	=item cf::register_exticmd $name => \&callback($ns,$packet);	1480	=item cf::register_exticmd $name => \&callback($ns,@args)
1464		1481
1465	Register a callback for execution when the client sends an (asynchronous)	1482	Register a callback for execution when the client sends an (asynchronous)
1466	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
1467	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
1468	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
1469	log-in.	1486	log-in.
1470		1487
1471	If the callback returns something, it is sent back as if reply was being	1488	The values will be sent back to the client.
1472	called.
1473		1489
1474	=cut	1490	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1475		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
1476	sub register_extcmd {	1497	sub register_extcmd($$) {
1477	my ($name, $cb) = @_;	1498	my ($name, $cb) = @_;
1478		1499
1479	$EXTCMD{$name} = $cb;	1500	$EXTCMD{$name} = $cb;
1480	}	1501	}
1481		1502
1482	sub register_exticmd {	1503	sub register_async_extcmd($$) {
1483	my ($name, $cb) = @_;	1504	my ($name, $cb) = @_;
1484		1505
		1506	$EXTACMD{$name} = $cb;
		1507	}
		1508
		1509	sub register_exticmd($$) {
		1510	my ($name, $cb) = @_;
		1511
1485	$EXTICMD{$name} = $cb;	1512	$EXTICMD{$name} = $cb;
		1513	}
		1514
		1515	sub register_async_exticmd($$) {
		1516	my ($name, $cb) = @_;
		1517
		1518	$EXTIACMD{$name} = $cb;
1486	}	1519	}
1487		1520
1488	use File::Glob ();	1521	use File::Glob ();
1489		1522
1490	cf::player->attach (	1523	cf::player->attach (
…		…
1506	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1539	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1507		1540
1508	if (ref $msg) {	1541	if (ref $msg) {
1509	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash	1542	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1510		1543
1511	my @reply;
1512
1513	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}) {
1514	@reply = $cb->($pl, @payload);	1557	@reply = $cb->($pl, @payload);
		1558	}
		1559
		1560	$pl->ext_msg ("reply-$reply", @reply)
		1561	if $reply;
1515	}	1562	}
1516
1517	$pl->ext_reply ($reply, @reply)
1518	if $reply;
1519		1563
1520	} else {	1564	} else {
1521	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1565	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1522	}	1566	}
1523		1567
…		…
1909	}	1953	}
1910		1954
1911	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1955	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1912		1956
1913	Expand deliantra pod fragments into protocol xml.	1957	Expand deliantra pod fragments into protocol xml.
1914
1915	=item $player->ext_reply ($msgid, @msg)
1916
1917	Sends an ext reply to the player.
1918
1919	=cut
1920
1921	sub ext_reply($$@) {
1922	my ($self, $id, @msg) = @_;
1923
1924	$self->ns->ext_reply ($id, @msg)
1925	}
1926		1958
1927	=item $player->ext_msg ($type, @msg)	1959	=item $player->ext_msg ($type, @msg)
1928		1960
1929	Sends an ext event to the client.	1961	Sends an ext event to the client.
1930		1962
…		…
2367		2399
2368	$MAP_PREFETCHER \|\|= cf::async {	2400	$MAP_PREFETCHER \|\|= cf::async {
2369	$Coro::current->{desc} = "map prefetcher";	2401	$Coro::current->{desc} = "map prefetcher";
2370		2402
2371	while (%MAP_PREFETCH) {	2403	while (%MAP_PREFETCH) {
2372	while (my ($k, $v) = each %MAP_PREFETCH) {	2404	for my $k (keys %MAP_PREFETCH) {
2373	if (my $map = find $k) {	2405	if (my $map = find $k) {
2374	$map->load if $v;	2406	$map->load if $MAP_PREFETCH{$k};
2375	}	2407	}
2376		2408
2377	delete $MAP_PREFETCH{$k};	2409	delete $MAP_PREFETCH{$k};
2378	}	2410	}
2379	}	2411	}
…		…
2633		2665
2634	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.
2635		2667
2636	=item $ob = cf::object::deref ($refstring)	2668	=item $ob = cf::object::deref ($refstring)
2637		2669
2638	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,
2639	even if the object actually exists. May block.	2671	even if the object actually exists. May block.
2640		2672
2641	=cut	2673	=cut
2642		2674
2643	sub deref {	2675	sub deref {
…		…
2725	=item $player_object->may ("access")	2757	=item $player_object->may ("access")
2726		2758
2727	Returns wether the given player is authorized to access resource "access"	2759	Returns wether the given player is authorized to access resource "access"
2728	(e.g. "command_wizcast").	2760	(e.g. "command_wizcast").
2729		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
2730	=cut	2787	=cut
2731		2788
2732	sub cf::object::player::may {	2789	sub cf::object::player::may {
2733	my ($self, $access) = @_;	2790	my ($self, $access) = @_;
2734		2791
2735	$self->flag (cf::FLAG_WIZ) \|\|	2792	$self->flag (cf::FLAG_WIZ) \|\|
2736	(ref $cf::CFG{"may_$access"}	2793	(ref $cf::CFG{"may_$access"}
2737	? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}	2794	? scalar grep $self->name eq $_ \|\| $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2738	: $cf::CFG{"may_$access"})	2795	: $cf::CFG{"may_$access"})
2739	}	2796	}
2740		2797
2741	=item $player_object->enter_link	2798	=item $player_object->enter_link
2742		2799
…		…
2745	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.
2746	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,
2747	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
2748	map.	2805	map.
2749		2806
2750	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.
2751		2814
2752	=item $player_object->leave_link ($map, $x, $y)	2815	=item $player_object->leave_link ($map, $x, $y)
2753		2816
2754	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
2755	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
…		…
3025		3088
3026	=head3 cf::client	3089	=head3 cf::client
3027		3090
3028	=over 4	3091	=over 4
3029		3092
3030	=item $client->send_drawinfo ($text, $flags)
3031
3032	Sends a drawinfo packet to the client. Circumvents output buffering so
3033	should not be used under normal circumstances.
3034
3035	=cut
3036
3037	sub cf::client::send_drawinfo {
3038	my ($self, $text, $flags) = @_;
3039
3040	utf8::encode $text;
3041	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);
3042	}
3043
3044	=item $client->send_big_packet ($pkt)	3093	=item $client->send_big_packet ($pkt)
3045		3094
3046	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
3047	them as required.	3096	them as required.
3048		3097
…		…
3066	$self->send_packet ($pkt);	3115	$self->send_packet ($pkt);
3067	}	3116	}
3068		3117
3069	=item $client->send_msg ($channel, $msg, $color, [extra...])	3118	=item $client->send_msg ($channel, $msg, $color, [extra...])
3070		3119
3071	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
3072	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
3073	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
3074	the message unless the client supports the msg packet.	3123	the message unless the client supports the msg packet.
3075		3124
3076	=cut	3125	=cut
3077		3126
3078	# non-persistent channels (usually the info channel)	3127	# non-persistent channels (usually the info channel)
…		…
3183	id => "death",	3232	id => "death",
3184	title => "Death",	3233	title => "Death",
3185	reply => undef,	3234	reply => undef,
3186	tooltip => "Reason for and more info about your most recent death",	3235	tooltip => "Reason for and more info about your most recent death",
3187	},	3236	},
		3237	"c/fatal" => {
		3238	id => "fatal",
		3239	title => "Fatal Error",
		3240	reply => undef,
		3241	tooltip => "Reason for the server disconnect",
		3242	},
3188	"c/say" => $SAY_CHANNEL,	3243	"c/say" => $SAY_CHANNEL,
3189	"c/chat" => $CHAT_CHANNEL,	3244	"c/chat" => $CHAT_CHANNEL,
3190	);	3245	);
3191		3246
3192	sub cf::client::send_msg {	3247	sub cf::client::send_msg {
…		…
3235	=cut	3290	=cut
3236		3291
3237	sub cf::client::ext_msg($$@) {	3292	sub cf::client::ext_msg($$@) {
3238	my ($self, $type, @msg) = @_;	3293	my ($self, $type, @msg) = @_;
3239		3294
3240	if ($self->extcmd == 2) {
3241	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3295	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3242	} elsif ($self->extcmd == 1) { # TODO: remove
3243	push @msg, msgtype => "event_$type";
3244	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3245	}
3246	}
3247
3248	=item $client->ext_reply ($msgid, @msg)
3249
3250	Sends an ext reply to the client.
3251
3252	=cut
3253
3254	sub cf::client::ext_reply($$@) {
3255	my ($self, $id, @msg) = @_;
3256
3257	return unless $self->extcmd == 2;
3258
3259	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3260	}	3296	}
3261		3297
3262	=item $success = $client->query ($flags, "text", \&cb)	3298	=item $success = $client->query ($flags, "text", \&cb)
3263		3299
3264	Queues a query to the client, calling the given callback with	3300	Queues a query to the client, calling the given callback with
…		…
3284		3320
3285	$self->send_packet ($self->{query_queue}[0][0])	3321	$self->send_packet ($self->{query_queue}[0][0])
3286	if @{ $self->{query_queue} } == 1;	3322	if @{ $self->{query_queue} } == 1;
3287		3323
3288	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;
3289	}	3364	}
3290		3365
3291	cf::client->attach (	3366	cf::client->attach (
3292	on_connect => sub {	3367	on_connect => sub {
3293	my ($ns) = @_;	3368	my ($ns) = @_;
…		…
3321	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3396	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3322		3397
3323	if (ref $msg) {	3398	if (ref $msg) {
3324	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash	3399	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3325		3400
3326	my @reply;
3327
3328	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}) {
3329	@reply = $cb->($ns, @payload);	3414	@reply = $cb->($ns, @payload);
		3415	}
		3416
		3417	$ns->ext_msg ("reply-$reply", @reply)
		3418	if $reply;
3330	}	3419	}
3331
3332	$ns->ext_reply ($reply, @reply)
3333	if $reply;
3334
3335	} else {	3420	} else {
3336	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";
3337	}	3422	}
3338		3423
3339	cf::override;	3424	cf::override;
…		…
3507	=cut	3592	=cut
3508		3593
3509	#############################################################################	3594	#############################################################################
3510	# the server's init and main functions	3595	# the server's init and main functions
3511		3596
3512	our %FACEHASH; # hash => idx, #d# HACK for http server	3597	{
		3598	package cf::face;
3513		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
3514	# internal api, not fianlised	3607	# internal api, not finalised
3515	sub add_face {	3608	sub set {
3516	my ($name, $type, $data) = @_;	3609	my ($name, $type, $data) = @_;
3517		3610
3518	my $idx = cf::face::find $name;	3611	my $idx = cf::face::find $name;
3519		3612
3520	if ($idx) {	3613	if ($idx) {
3521	delete $FACEHASH{cf::face::get_chksum $idx};	3614	delete $HASH{cf::face::get_csum $idx};
3522	} else {	3615	} else {
3523	$idx = cf::face::alloc $name;	3616	$idx = cf::face::alloc $name;
3524	}	3617	}
3525		3618
3526	my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;	3619	my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3527		3620
3528	cf::face::set_type $idx, $type;	3621	cf::face::set_type $idx, $type;
3529	cf::face::set_data $idx, 0, $data, $hash;	3622	cf::face::set_csum $idx, 0, $hash;
3530	cf::face::set_meta $idx, $type & 1 ? undef : undef;	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];
3531	$FACEHASH{$hash} = $idx;#d#	3631	$HASH{$hash} = $idx;#d#
3532		3632
3533	$idx	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	}
3534	}	3672	}
3535		3673
3536	sub load_facedata($) {	3674	sub load_facedata($) {
3537	my ($path) = @_;	3675	my ($path) = @_;
3538		3676
3539	# HACK to clear player env face cache, we need some signal framework
3540	# for this (global event?)
3541	%ext::player_env::MUSIC_FACE_CACHE = ();
3542
3543	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3677	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3544		3678
3545	trace "loading facedata from $path\n";	3679	trace "loading facedata from $path\n";
3546		3680
3547	my $facedata = decode_storable load_file $path;	3681	my $facedata = decode_storable load_file "$path/faceinfo";
3548		3682
3549	$facedata->{version} == 2	3683	$facedata->{version} == 2
3550	or cf::cleanup "$path: version mismatch, cannot proceed.";	3684	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3551		3685
3552	cf::cede_to_tick;	3686	my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
		3687	or cf::cleanup "$path/facedata: $!, cannot proceed.";
		3688
		3689	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
		3690
		3691	# BEGIN ATOMIC
		3692	# from here on, everything must be atomic - no thread switch allowed
		3693	my $t1 = EV::time;
3553		3694
3554	{	3695	{
3555	my $faces = $facedata->{faceinfo};	3696	my $faces = $facedata->{faceinfo};
3556		3697
3557	for my $face (sort keys %$faces) {	3698	for my $face (sort keys %$faces) {
3558	my $info = $faces->{$face};	3699	my $info = $faces->{$face};
3559	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3700	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
3560		3701
3561	cf::face::set_visibility $idx, $info->{visibility};	3702	cf::face::set_visibility $idx, $info->{visibility};
3562	cf::face::set_magicmap $idx, $info->{magicmap};	3703	cf::face::set_magicmap $idx, $info->{magicmap};
3563	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};
3564	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};
3565	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};
3566	$FACEHASH{$info->{hash64}} = $idx;#d#	3707	$cf::face::HASH{$info->{hash64}} = $idx;
3567		3708	delete $cf::face::META[$idx];
3568	cf::cede_to_tick;
3569	}	3709	}
3570		3710
3571	while (my ($face, $info) = each %$faces) {	3711	while (my ($face, $info) = each %$faces) {
3572	next unless $info->{smooth};	3712	next unless $info->{smooth};
3573		3713
…		…
3578	cf::face::set_smooth $idx, $smooth;	3718	cf::face::set_smooth $idx, $smooth;
3579	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3719	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3580	} else {	3720	} else {
3581	error "smooth face '$info->{smooth}' not found for face '$face'";	3721	error "smooth face '$info->{smooth}' not found for face '$face'";
3582	}	3722	}
3583
3584	cf::cede_to_tick;
3585	}	3723	}
3586	}	3724	}
3587		3725
3588	{	3726	{
3589	my $anims = $facedata->{animinfo};	3727	my $anims = $facedata->{animinfo};
3590		3728
3591	while (my ($anim, $info) = each %$anims) {	3729	while (my ($anim, $info) = each %$anims) {
3592	cf::anim::set $anim, $info->{frames}, $info->{facings};	3730	cf::anim::set $anim, $info->{frames}, $info->{facings};
3593	cf::cede_to_tick;
3594	}	3731	}
3595		3732
3596	cf::anim::invalidate_all; # d'oh	3733	cf::anim::invalidate_all; # d'oh
3597	}	3734	}
3598		3735
…		…
3603	if (defined (my $type = $info->{type})) {	3740	if (defined (my $type = $info->{type})) {
3604	# TODO: different hash - must free and use new index, or cache ixface data queue	3741	# TODO: different hash - must free and use new index, or cache ixface data queue
3605	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;	3742	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
3606		3743
3607	cf::face::set_type $idx, $type;	3744	cf::face::set_type $idx, $type;
3608	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};	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};
3609	cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already	3748	$cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3610	$FACEHASH{$info->{hash}} = $idx;#d#	3749	$cf::face::HASH{$info->{hash}} = $idx;
3611	} else {	3750	} else {
3612	# $RESOURCE{$name} = $info; # unused	3751	# $RESOURCE{$name} = $info; # unused
3613	}	3752	}
3614
3615	cf::cede_to_tick;
3616	}	3753	}
3617	}	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;
3618		3765
3619	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
3620		3769
3621	1	3770	1
3622	}	3771	}
3623		3772
3624	register_exticmd fx_want => sub {	3773	register_exticmd fx_want => sub {
…		…
3640	}	3789	}
3641		3790
3642	sub reload_exp_table {	3791	sub reload_exp_table {
3643	_reload_exp_table;	3792	_reload_exp_table;
3644		3793
		3794	cf::face::set
3645	add_face "res/exp_table" => FT_RSRC,	3795	"res/exp_table" => FT_RSRC,
3646	JSON::XS->new->utf8->canonical->encode (	3796	JSON::XS->new->utf8->canonical->encode (
3647	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]	3797	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3648	);	3798	);
3649	}	3799	}
3650		3800
3651	sub reload_materials {	3801	sub reload_materials {
3652	_reload_materials;	3802	_reload_materials;
3653	}	3803	}
…		…
3665	if exists $_->{match};	3815	if exists $_->{match};
3666	}	3816	}
3667	}	3817	}
3668		3818
3669	sub reload_facedata {	3819	sub reload_facedata {
3670	load_facedata "$DATADIR/facedata"	3820	load_facedata $DATADIR
3671	or die "unable to load facedata\n";	3821	or die "unable to load facedata\n";
3672	}	3822	}
3673		3823
3674	sub reload_archetypes {	3824	sub reload_archetypes {
3675	load_resource_file "$DATADIR/archetypes"	3825	load_resource_file "$DATADIR/archetypes"
3676	or die "unable to load archetypes\n";	3826	or die "unable to load archetypes\n";
3677		3827
		3828	cf::face::set
3678	add_face "res/skill_info" => FT_RSRC,	3829	"res/skill_info" => FT_RSRC,
3679	JSON::XS->new->utf8->canonical->encode (	3830	JSON::XS->new->utf8->canonical->encode (
3680	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]	3831	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3681	);	3832	);
		3833
		3834	cf::face::set
3682	add_face "res/spell_paths" => FT_RSRC,	3835	"res/spell_paths" => FT_RSRC,
3683	JSON::XS->new->utf8->canonical->encode (	3836	JSON::XS->new->utf8->canonical->encode (
3684	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]	3837	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3685	);	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;
3686	}	3853	}
3687		3854
3688	sub reload_treasures {	3855	sub reload_treasures {
3689	load_resource_file "$DATADIR/treasures"	3856	load_resource_file "$DATADIR/treasures"
3690	or die "unable to load treasurelists\n";	3857	or die "unable to load treasurelists\n";
…		…
3763	seek $fh, 0, 0;	3930	seek $fh, 0, 0;
3764	print $fh $$;	3931	print $fh $$;
3765	}	3932	}
3766		3933
3767	sub main_loop {	3934	sub main_loop {
3768	trace "EV::loop starting\n";	3935	trace "EV::run starting\n";
3769	if (1) {	3936	if (1) {
3770	EV::loop;	3937	EV::run;
3771	}	3938	}
3772	trace "EV::loop returned\n";	3939	trace "EV::run returned\n";
3773	goto &main_loop unless $REALLY_UNLOOP;	3940	goto &main_loop unless $REALLY_UNLOOP;
3774	}	3941	}
3775		3942
3776	sub main {	3943	sub main {
3777	cf::init_globals; # initialise logging	3944	cf::init_globals; # initialise logging
…		…
3786	# we must not ever block the main coroutine	3953	# we must not ever block the main coroutine
3787	$Coro::idle = sub {	3954	$Coro::idle = sub {
3788	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#
3789	(async {	3956	(async {
3790	$Coro::current->{desc} = "IDLE BUG HANDLER";	3957	$Coro::current->{desc} = "IDLE BUG HANDLER";
3791	EV::loop EV::LOOP_ONESHOT;	3958	EV::run EV::RUN_ONCE;
3792	})->prio (Coro::PRIO_MAX);	3959	})->prio (Coro::PRIO_MAX);
3793	};	3960	};
3794		3961
3795	evthread_start IO::AIO::poll_fileno;	3962	evthread_start IO::AIO::poll_fileno;
3796		3963
3797	cf::sync_job {	3964	cf::sync_job {
3798	cf::incloader::init ();	3965	cf::incloader::init ();
		3966
		3967	db_init;
3799		3968
3800	cf::init_anim;	3969	cf::init_anim;
3801	cf::init_attackmess;	3970	cf::init_attackmess;
3802	cf::init_dynamic;	3971	cf::init_dynamic;
3803		3972
3804	cf::load_settings;	3973	cf::load_settings;
3805		3974
3806	reload_resources;	3975	reload_resources;
3807	reload_config;	3976	reload_config;
3808	db_init;
3809		3977
3810	cf::init_uuid;	3978	cf::init_uuid;
3811	cf::init_signals;	3979	cf::init_signals;
3812	cf::init_skills;	3980	cf::init_skills;
3813		3981
…		…
4238	}	4406	}
4239	}	4407	}
4240		4408
4241	{	4409	{
4242	# configure BDB	4410	# configure BDB
		4411	info "initialising database";
4243		4412
4244	BDB::min_parallel 16;	4413	BDB::min_parallel 16;
4245	BDB::max_poll_reqs $TICK * 0.1;	4414	BDB::max_poll_reqs $TICK * 0.1;
4246	#$AnyEvent::BDB::WATCHER->priority (1);	4415	#$AnyEvent::BDB::WATCHER->priority (1);
4247		4416
…		…
4276	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4445	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4277	};	4446	};
4278	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4447	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4279	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4448	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4280	};	4449	};
		4450
		4451	info "database initialised";
4281	}	4452	}
4282		4453
4283	{	4454	{
4284	# configure IO::AIO	4455	# configure IO::AIO
4285		4456
		4457	info "initialising aio";
4286	IO::AIO::min_parallel 8;	4458	IO::AIO::min_parallel 8;
4287	IO::AIO::max_poll_time $TICK * 0.1;	4459	IO::AIO::max_poll_time $TICK * 0.1;
4288	undef $AnyEvent::AIO::WATCHER;	4460	undef $AnyEvent::AIO::WATCHER;
		4461	info "aio initialised";
4289	}	4462	}
4290		4463
4291	our $_log_backtrace;	4464	our $_log_backtrace;
4292	our $_log_backtrace_last;	4465	our $_log_backtrace_last;
4293		4466

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.589 by root, Sun Nov 4 01:01:13 2012 UTC vs. Revision 1.622 by root, Wed Nov 23 06:05:33 2016 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.589 by root, Sun Nov 4 01:01:13 2012 UTC vs.
Revision 1.622 by root, Wed Nov 23 06:05:33 2016 UTC