ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.580 by root, Wed Jan 4 03:22:48 2012 UTC vs.
Revision 1.624 by root, Sat Nov 17 23:40:02 2018 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 (©) 2018 Marc Alexander Lehmann / the Deliantra team
4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 5# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 6#
6# Deliantra is free software: you can redistribute it and/or modify it under 7# 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 8# 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 9# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version. 10# option) any later version.
10# 11#
11# This program is distributed in the hope that it will be useful, 12# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 13# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 15# GNU General Public License for more details.
15# 16#
16# You should have received a copy of the Affero GNU General Public License 17# 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 18# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>. 19# <http://www.gnu.org/licenses/>.
19# 20#
20# The authors can be reached via e-mail to <support@deliantra.net> 21# The authors can be reached via e-mail to <support@deliantra.net>
21# 22#
22 23
23package cf; 24package cf;
24 25
32use Safe; 33use Safe;
33use Safe::Hole; 34use Safe::Hole;
34use Storable (); 35use Storable ();
35use Carp (); 36use Carp ();
36 37
37use Guard (); 38use AnyEvent ();
39use AnyEvent::IO ();
40use AnyEvent::DNS ();
41
38use Coro (); 42use Coro ();
39use Coro::State; 43use Coro::State;
40use Coro::Handle; 44use Coro::Handle;
41use Coro::EV; 45use Coro::EV;
42use Coro::AnyEvent; 46use Coro::AnyEvent;
48use Coro::AIO; 52use Coro::AIO;
49use Coro::BDB 1.6; 53use Coro::BDB 1.6;
50use Coro::Storable; 54use Coro::Storable;
51use Coro::Util (); 55use Coro::Util ();
52 56
57use Guard ();
53use JSON::XS 2.01 (); 58use JSON::XS 2.01 ();
54use BDB (); 59use BDB ();
55use Data::Dumper; 60use Data::Dumper;
56use Fcntl; 61use Fcntl;
57use YAML::XS (); 62use YAML::XS ();
63use CBOR::XS ();
58use IO::AIO (); 64use IO::AIO ();
59use Time::HiRes;
60use Compress::LZF; 65use Compress::LZF;
61use Digest::MD5 (); 66use Digest::MD5 ();
62 67
63AnyEvent::detect; 68AnyEvent::detect;
64 69
83our %COMMAND = (); 88our %COMMAND = ();
84our %COMMAND_TIME = (); 89our %COMMAND_TIME = ();
85 90
86our @EXTS = (); # list of extension package names 91our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 92our %EXTCMD = ();
93our %EXTACMD = ();
88our %EXTICMD = (); 94our %EXTICMD = ();
95our %EXTIACMD = ();
89our %EXT_CORO = (); # coroutines bound to extensions 96our %EXT_CORO = (); # coroutines bound to extensions
90our %EXT_MAP = (); # pluggable maps 97our %EXT_MAP = (); # pluggable maps
91 98
92our $RELOAD; # number of reloads so far, non-zero while in reload 99our $RELOAD; # number of reloads so far, non-zero while in reload
93our @EVENT; 100our @EVENT;
129our $DB_ENV; 136our $DB_ENV;
130 137
131our @EXTRA_MODULES = qw(pod match mapscript incloader); 138our @EXTRA_MODULES = qw(pod match mapscript incloader);
132 139
133our %CFG; 140our %CFG;
141our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
134 142
135our $UPTIME; $UPTIME ||= time; 143our $UPTIME; $UPTIME ||= time;
136our $RUNTIME = 0; 144our $RUNTIME = 0;
137our $SERVER_TICK = 0; 145our $SERVER_TICK = 0;
138our $NOW; 146our $NOW;
219=item $cf::RUNTIME 227=item $cf::RUNTIME
220 228
221The time this server has run, starts at 0 and is increased by $cf::TICK on 229The time this server has run, starts at 0 and is increased by $cf::TICK on
222every server tick. 230every server tick.
223 231
224=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 232=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
225$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 233$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
226$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 234$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
227 235
228Various directories - "/etc", read-only install directory, perl-library 236Various directories - "/etc", read-only install directory, perl-library
229directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 237directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
230unique-items directory, player file directory, random maps directory and 238unique-items directory, player file directory, random maps directory and
231database environment. 239database environment.
245Configuration for the server, loaded from C</etc/deliantra-server/config>, or 253Configuration for the server, loaded from C</etc/deliantra-server/config>, or
246from wherever your confdir points to. 254from wherever your confdir points to.
247 255
248=item cf::wait_for_tick, cf::wait_for_tick_begin 256=item cf::wait_for_tick, cf::wait_for_tick_begin
249 257
250These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 258These are functions that inhibit the current coroutine one tick.
251returns directly I<after> the tick processing (and consequently, can only wake one thread 259cf::wait_for_tick_begin only returns directly I<after> the tick
260processing (and consequently, can only wake one thread per tick), while
252per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 261cf::wait_for_tick wakes up all waiters after tick processing.
253 262
254Note that cf::Wait_for_tick will immediately return when the server is not 263Note that cf::wait_for_tick will immediately return when the server is not
255ticking, making it suitable for small pauses in threads that need to run 264ticking, making it suitable for small pauses in threads that need to run
256when the server is paused. If that is not applicable (i.e. you I<really> 265when the server is paused. If that is not applicable (i.e. you I<really>
257want to wait, use C<$cf::WAIT_FOR_TICK>). 266want to wait, use C<$cf::WAIT_FOR_TICK>).
258 267
259=item $cf::WAIT_FOR_TICK 268=item $cf::WAIT_FOR_TICK
335)) { 344)) {
336 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 345 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
337} 346}
338 347
339$EV::DIED = sub { 348$EV::DIED = sub {
340 Carp::cluck "error in event callback: @_"; 349 warn "error in event callback: $@";
341}; 350};
342 351
343############################################################################# 352#############################################################################
344 353
345sub fork_call(&@); 354sub fork_call(&@);
372 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 381 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
373 $d 382 $d
374 } || "[unable to dump $_[0]: '$@']"; 383 } || "[unable to dump $_[0]: '$@']";
375} 384}
376 385
377=item $scalar = load_file $path 386=item $scalar = cf::load_file $path
378 387
379Loads the given file from path and returns its contents. Croaks on error 388Loads the given file from path and returns its contents. Croaks on error
380and can block. 389and can block.
381 390
382=cut 391=cut
386 or Carp::croak "$_[0]: $!"; 395 or Carp::croak "$_[0]: $!";
387 396
388 $data 397 $data
389} 398}
390 399
400=item $success = cf::replace_file $path, $data, $sync
401
402Atomically replaces the file at the given $path with new $data, and
403optionally $sync the data to disk before replacing the file.
404
405=cut
406
407sub replace_file($$;$) {
408 my ($path, $data, $sync) = @_;
409
410 my $lock = cf::lock_acquire ("replace_file:$path");
411
412 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
413 or return;
414
415 $data = $data->() if ref $data;
416
417 length $data == aio_write $fh, 0, (length $data), $data, 0
418 or return;
419
420 !$sync
421 or !aio_fsync $fh
422 or return;
423
424 aio_close $fh
425 and return;
426
427 aio_rename "$path~", $path
428 and return;
429
430 if ($sync) {
431 $path =~ s%/[^/]*$%%;
432 aio_pathsync $path;
433 }
434
435 1
436}
437
391=item $ref = cf::decode_json $json 438=item $ref = cf::decode_json $json
392 439
393Converts a JSON string into the corresponding perl data structure. 440Converts a JSON string into the corresponding perl data structure.
394 441
395=item $json = cf::encode_json $ref 442=item $json = cf::encode_json $ref
417 464
418=cut 465=cut
419 466
420sub decode_yaml($) { 467sub decode_yaml($) {
421 fork_call { YAML::XS::Load $_[0] } @_ 468 fork_call { YAML::XS::Load $_[0] } @_
469}
470
471=item $scalar = cf::decode_cbor $scalar
472
473Same as CBOR::XS::decode_cbor, but takes server ticks into account, so
474blocks. For small amounts of data, C<CBOR::XS::decode_cbor> is the better
475alternative.
476
477=cut
478
479sub decode_cbor($) {
480 # we assume 10mb/s minimum decoding speed (on a ~2ghz machine)
481 cf::get_slot +(length $_[0]) / 10_000_000, 0, "decode_cbor";
482 CBOR::XS::decode_cbor $_[0]
422} 483}
423 484
424=item $scalar = cf::unlzf $scalar 485=item $scalar = cf::unlzf $scalar
425 486
426Same as Compress::LZF::compress, but takes server ticks into account, so 487Same as Compress::LZF::compress, but takes server ticks into account, so
465 } 526 }
466} 527}
467 528
468=item cf::lock_wait $string 529=item cf::lock_wait $string
469 530
470Wait until the given lock is available. See cf::lock_acquire. 531Wait until the given lock is available. See cf::lock_acquire.
471 532
472=item my $lock = cf::lock_acquire $string 533=item my $lock = cf::lock_acquire $string
473 534
474Wait until the given lock is available and then acquires it and returns 535Wait until the given lock is available and then acquires it and returns
475a L<Guard> object. If the guard object gets destroyed (goes out of scope, 536a L<Guard> object. If the guard object gets destroyed (goes out of scope,
528Allocate $time seconds of blocking CPU time at priority C<$priority> 589Allocate $time seconds of blocking CPU time at priority C<$priority>
529(default: 0): This call blocks and returns only when you have at least 590(default: 0): This call blocks and returns only when you have at least
530C<$time> seconds of cpu time till the next tick. The slot is only valid 591C<$time> seconds of cpu time till the next tick. The slot is only valid
531till the next cede. 592till the next cede.
532 593
533Background jobs should use a priority les than zero, interactive jobs 594Background jobs should use a priority less than zero, interactive jobs
534should use 100 or more. 595should use 100 or more.
535 596
536The optional C<$name> can be used to identify the job to run. It might be 597The optional C<$name> can be used to identify the job to run. It might be
537used for statistical purposes and should identify the same time-class. 598used for statistical purposes and should identify the same time-class.
538 599
551 my $signal = new Coro::Signal; 612 my $signal = new Coro::Signal;
552 my $busy; 613 my $busy;
553 614
554 while () { 615 while () {
555 next_job: 616 next_job:
617
618 Coro::cede;
556 619
557 my $avail = cf::till_tick; 620 my $avail = cf::till_tick;
558 621
559 for (0 .. $#SLOT_QUEUE) { 622 for (0 .. $#SLOT_QUEUE) {
560 if ($SLOT_QUEUE[$_][0] <= $avail) { 623 if ($SLOT_QUEUE[$_][0] <= $avail) {
561 $busy = 0; 624 $busy = 0;
562 my $job = splice @SLOT_QUEUE, $_, 1, (); 625 my $job = splice @SLOT_QUEUE, $_, 1, ();
563 $job->[2]->send; 626 $job->[2]->send;
564 Coro::cede;
565 goto next_job; 627 goto next_job;
566 } else { 628 } else {
567 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY; 629 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
568 } 630 }
569 } 631 }
570 632
571 if (@SLOT_QUEUE) { 633 if (@SLOT_QUEUE) {
572 # we do not use wait_for_tick() as it returns immediately when tick is inactive 634 wait_for_tick;
573 $WAIT_FOR_TICK->wait;
574 } else { 635 } else {
575 $busy = 0; 636 $busy = 0;
576 Coro::schedule; 637 Coro::schedule;
577 } 638 }
578 } 639 }
604BEGIN { *async = \&Coro::async_pool } 665BEGIN { *async = \&Coro::async_pool }
605 666
606=item cf::sync_job { BLOCK } 667=item cf::sync_job { BLOCK }
607 668
608The design of Deliantra requires that the main coroutine ($Coro::main) 669The design of Deliantra requires that the main coroutine ($Coro::main)
609is always able to handle events or runnable, as Deliantra is only 670is always able to handle events or is runnable, as Deliantra is only
610partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 671partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
611acceptable. 672acceptable.
612 673
613If it must be done, put the blocking parts into C<sync_job>. This will run 674If it must be done, put the blocking parts into C<sync_job>. This will run
614the given BLOCK in another coroutine while waiting for the result. The 675the given BLOCK in another coroutine while waiting for the result. The
642 703
643 while ($busy) { 704 while ($busy) {
644 if (Coro::nready) { 705 if (Coro::nready) {
645 Coro::cede_notself; 706 Coro::cede_notself;
646 } else { 707 } else {
647 EV::loop EV::LOOP_ONESHOT; 708 EV::run EV::RUN_ONCE;
648 } 709 }
649 } 710 }
650 711
651 my $time = AE::time - $time; 712 my $time = AE::time - $time;
652 713
693 reset_signals; 754 reset_signals;
694} 755}
695 756
696sub fork_call(&@) { 757sub fork_call(&@) {
697 my ($cb, @args) = @_; 758 my ($cb, @args) = @_;
698
699 # we seemingly have to make a local copy of the whole thing,
700 # otherwise perl prematurely frees the stuff :/
701 # TODO: investigate and fix (likely this will be rather laborious)
702 759
703 my @res = Coro::Util::fork_eval { 760 my @res = Coro::Util::fork_eval {
704 cf::post_fork; 761 cf::post_fork;
705 &$cb 762 &$cb
706 } @args; 763 } @args;
856 913
857 return db_get cache => "$id/data"; 914 return db_get cache => "$id/data";
858 } 915 }
859 } 916 }
860 917
861 my $t1 = Time::HiRes::time; 918 my $t1 = EV::time;
862 my $data = $process->(\@data); 919 my $data = $process->(\@data);
863 my $t2 = Time::HiRes::time; 920 my $t2 = EV::time;
864 921
865 info "cache: '$id' processed in ", $t2 - $t1, "s\n"; 922 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
866 923
867 db_put cache => "$id/data", $data; 924 db_put cache => "$id/data", $data;
868 db_put cache => "$id/md5" , $md5; 925 db_put cache => "$id/md5" , $md5;
1388=cut 1445=cut
1389 1446
1390############################################################################# 1447#############################################################################
1391# command handling &c 1448# command handling &c
1392 1449
1393=item cf::register_command $name => \&callback($ob,$args); 1450=item cf::register_command $name => \&callback($ob,$args)
1394 1451
1395Register a callback for execution when the client sends the user command 1452Register a callback for execution when the client sends the user command
1396$name. 1453$name.
1397 1454
1398=cut 1455=cut
1404 #warn "registering command '$name/$time' to '$caller'"; 1461 #warn "registering command '$name/$time' to '$caller'";
1405 1462
1406 push @{ $COMMAND{$name} }, [$caller, $cb]; 1463 push @{ $COMMAND{$name} }, [$caller, $cb];
1407} 1464}
1408 1465
1409=item cf::register_extcmd $name => \&callback($pl,$packet); 1466=item cf::register_extcmd $name => \&callback($pl,@args)
1410 1467
1411Register a callback for execution when the client sends an (synchronous) 1468Register a callback for execution when the client sends an (synchronous)
1412extcmd packet. Ext commands will be processed in the order they are 1469extcmd packet. Ext commands will be processed in the order they are
1413received by the server, like other user commands. The first argument is 1470received by the server, like other user commands. The first argument is
1414the logged-in player. Ext commands can only be processed after a player 1471the logged-in player. Ext commands can only be processed after a player
1415has logged in successfully. 1472has logged in successfully.
1416 1473
1417If the callback returns something, it is sent back as if reply was being 1474The values will be sent back to the client.
1418called.
1419 1475
1476=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
1477
1478Same as C<cf::register_extcmd>, but instead of returning values, the
1479callback needs to clal the C<$reply> function.
1480
1420=item cf::register_exticmd $name => \&callback($ns,$packet); 1481=item cf::register_exticmd $name => \&callback($ns,@args)
1421 1482
1422Register a callback for execution when the client sends an (asynchronous) 1483Register a callback for execution when the client sends an (asynchronous)
1423exticmd packet. Exti commands are processed by the server as soon as they 1484exticmd packet. Exti commands are processed by the server as soon as they
1424are received, i.e. out of order w.r.t. other commands. The first argument 1485are received, i.e. out of order w.r.t. other commands. The first argument
1425is a client socket. Exti commands can be received anytime, even before 1486is a client socket. Exti commands can be received anytime, even before
1426log-in. 1487log-in.
1427 1488
1428If the callback returns something, it is sent back as if reply was being 1489The values will be sent back to the client.
1429called.
1430 1490
1431=cut 1491=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1432 1492
1493Same as C<cf::register_extcmd>, but instead of returning values, the
1494callback needs to clal the C<$reply> function.
1495
1496=cut
1497
1433sub register_extcmd { 1498sub register_extcmd($$) {
1434 my ($name, $cb) = @_; 1499 my ($name, $cb) = @_;
1435 1500
1436 $EXTCMD{$name} = $cb; 1501 $EXTCMD{$name} = $cb;
1437} 1502}
1438 1503
1439sub register_exticmd { 1504sub register_async_extcmd($$) {
1440 my ($name, $cb) = @_; 1505 my ($name, $cb) = @_;
1441 1506
1507 $EXTACMD{$name} = $cb;
1508}
1509
1510sub register_exticmd($$) {
1511 my ($name, $cb) = @_;
1512
1442 $EXTICMD{$name} = $cb; 1513 $EXTICMD{$name} = $cb;
1514}
1515
1516sub register_async_exticmd($$) {
1517 my ($name, $cb) = @_;
1518
1519 $EXTIACMD{$name} = $cb;
1443} 1520}
1444 1521
1445use File::Glob (); 1522use File::Glob ();
1446 1523
1447cf::player->attach ( 1524cf::player->attach (
1463 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1540 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1464 1541
1465 if (ref $msg) { 1542 if (ref $msg) {
1466 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash 1543 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1467 1544
1468 my @reply;
1469
1470 if (my $cb = $EXTCMD{$type}) { 1545 if (my $cb = $EXTACMD{$type}) {
1546 $cb->(
1547 $pl,
1548 sub {
1549 $pl->ext_msg ("reply-$reply", @_)
1550 if $reply;
1551 },
1552 @payload
1553 );
1554 } else {
1555 my @reply;
1556
1557 if (my $cb = $EXTCMD{$type}) {
1471 @reply = $cb->($pl, @payload); 1558 @reply = $cb->($pl, @payload);
1559 }
1560
1561 $pl->ext_msg ("reply-$reply", @reply)
1562 if $reply;
1472 } 1563 }
1473
1474 $pl->ext_reply ($reply, @reply)
1475 if $reply;
1476 1564
1477 } else { 1565 } else {
1478 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1566 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1479 } 1567 }
1480 1568
1493 }; 1581 };
1494 1582
1495 $grp 1583 $grp
1496} 1584}
1497 1585
1586sub _ext_cfg_reg($$$$) {
1587 my ($rvar, $varname, $cfgname, $default) = @_;
1588
1589 $cfgname = lc $varname
1590 unless length $cfgname;
1591
1592 $EXT_CFG{$cfgname} = [$rvar, $default];
1593
1594 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1595}
1596
1498sub load_extensions { 1597sub load_extensions {
1499 info "loading extensions..."; 1598 info "loading extensions...";
1599
1600 %EXT_CFG = ();
1500 1601
1501 cf::sync_job { 1602 cf::sync_job {
1502 my %todo; 1603 my %todo;
1503 1604
1504 for my $path (<$LIBDIR/*.ext>) { 1605 for my $path (<$LIBDIR/*.ext>) {
1547 unless exists $done{$_}; 1648 unless exists $done{$_};
1548 } 1649 }
1549 1650
1550 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1651 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1551 1652
1653 my $source = $v->{source};
1654
1655 # support "CONF varname :confname = default" pseudo-statements
1656 $source =~ s{
1657 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1658 }{
1659 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1660 }gmxe;
1661
1552 my $active = eval $v->{source}; 1662 my $active = eval $source;
1553 1663
1554 if (length $@) { 1664 if (length $@) {
1555 error "$v->{path}: $@\n"; 1665 error "$v->{path}: $@\n";
1556 1666
1557 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1667 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1844} 1954}
1845 1955
1846=item $protocol_xml = $player->expand_cfpod ($cfpod) 1956=item $protocol_xml = $player->expand_cfpod ($cfpod)
1847 1957
1848Expand deliantra pod fragments into protocol xml. 1958Expand deliantra pod fragments into protocol xml.
1849
1850=item $player->ext_reply ($msgid, @msg)
1851
1852Sends an ext reply to the player.
1853
1854=cut
1855
1856sub ext_reply($$@) {
1857 my ($self, $id, @msg) = @_;
1858
1859 $self->ns->ext_reply ($id, @msg)
1860}
1861 1959
1862=item $player->ext_msg ($type, @msg) 1960=item $player->ext_msg ($type, @msg)
1863 1961
1864Sends an ext event to the client. 1962Sends an ext event to the client.
1865 1963
2302 2400
2303 $MAP_PREFETCHER ||= cf::async { 2401 $MAP_PREFETCHER ||= cf::async {
2304 $Coro::current->{desc} = "map prefetcher"; 2402 $Coro::current->{desc} = "map prefetcher";
2305 2403
2306 while (%MAP_PREFETCH) { 2404 while (%MAP_PREFETCH) {
2307 while (my ($k, $v) = each %MAP_PREFETCH) { 2405 for my $k (keys %MAP_PREFETCH) {
2308 if (my $map = find $k) { 2406 if (my $map = find $k) {
2309 $map->load if $v; 2407 $map->load if $MAP_PREFETCH{$k};
2310 } 2408 }
2311 2409
2312 delete $MAP_PREFETCH{$k}; 2410 delete $MAP_PREFETCH{$k};
2313 } 2411 }
2314 } 2412 }
2568 2666
2569Creates and returns a persistent reference to an object that can be stored as a string. 2667Creates and returns a persistent reference to an object that can be stored as a string.
2570 2668
2571=item $ob = cf::object::deref ($refstring) 2669=item $ob = cf::object::deref ($refstring)
2572 2670
2573returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2671returns the objetc referenced by refstring. may return undef when it cannot find the object,
2574even if the object actually exists. May block. 2672even if the object actually exists. May block.
2575 2673
2576=cut 2674=cut
2577 2675
2578sub deref { 2676sub deref {
2660=item $player_object->may ("access") 2758=item $player_object->may ("access")
2661 2759
2662Returns wether the given player is authorized to access resource "access" 2760Returns wether the given player is authorized to access resource "access"
2663(e.g. "command_wizcast"). 2761(e.g. "command_wizcast").
2664 2762
2763This is implemented by checking a config setting of C<may_access> where
2764C<access> is replaced by the access string. The following alternatives are
2765possible (and are tested in order):
2766
2767=over 4
2768
2769=item * Player is DM
2770
2771The request will succeed.
2772
2773=item * may_access is an array reference
2774
2775If either the player nickname or UUID is in the array, the request will
2776succeed, otherwise it will fail.
2777
2778=item * may_access is a true value
2779
2780The request will succeed.
2781
2782=item * may_access is missing or false
2783
2784The request will fail.
2785
2786=back
2787
2665=cut 2788=cut
2666 2789
2667sub cf::object::player::may { 2790sub cf::object::player::may {
2668 my ($self, $access) = @_; 2791 my ($self, $access) = @_;
2669 2792
2670 $self->flag (cf::FLAG_WIZ) || 2793 $self->flag (cf::FLAG_WIZ) ||
2671 (ref $cf::CFG{"may_$access"} 2794 (ref $cf::CFG{"may_$access"}
2672 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 2795 ? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2673 : $cf::CFG{"may_$access"}) 2796 : $cf::CFG{"may_$access"})
2674} 2797}
2675 2798
2676=item $player_object->enter_link 2799=item $player_object->enter_link
2677 2800
2680The player should be reasonably safe there for short amounts of time (e.g. 2803The player should be reasonably safe there for short amounts of time (e.g.
2681for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2804for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2682though, as the player cannot control the character while it is on the link 2805though, as the player cannot control the character while it is on the link
2683map. 2806map.
2684 2807
2685Will never block. 2808This method will never block, which is the whole reaosn for it's
2809existance: you can I<always> put a player onto the link map, which is the
2810only place to put objects that is guaranteed to exist.
2811
2812A typical usage pattern is to call C<enter_link> synchronously from the
2813server, then start a new thread, do your blocking stuff there and then
2814call C<leave_link> from that thread.
2686 2815
2687=item $player_object->leave_link ($map, $x, $y) 2816=item $player_object->leave_link ($map, $x, $y)
2688 2817
2689Moves the player out of the special C<{link}> map onto the specified 2818Moves the player out of the special C<{link}> map onto the specified
2690map. If the map is not valid (or omitted), the player will be moved back 2819map. If the map is not valid (or omitted), the player will be moved back
2960 3089
2961=head3 cf::client 3090=head3 cf::client
2962 3091
2963=over 4 3092=over 4
2964 3093
2965=item $client->send_drawinfo ($text, $flags)
2966
2967Sends a drawinfo packet to the client. Circumvents output buffering so
2968should not be used under normal circumstances.
2969
2970=cut
2971
2972sub cf::client::send_drawinfo {
2973 my ($self, $text, $flags) = @_;
2974
2975 utf8::encode $text;
2976 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2977}
2978
2979=item $client->send_big_packet ($pkt) 3094=item $client->send_big_packet ($pkt)
2980 3095
2981Like C<send_packet>, but tries to compress large packets, and fragments 3096Like C<send_packet>, but tries to compress large packets, and fragments
2982them as required. 3097them as required.
2983 3098
3001 $self->send_packet ($pkt); 3116 $self->send_packet ($pkt);
3002} 3117}
3003 3118
3004=item $client->send_msg ($channel, $msg, $color, [extra...]) 3119=item $client->send_msg ($channel, $msg, $color, [extra...])
3005 3120
3006Send a drawinfo or msg packet to the client, formatting the msg for the 3121Send a msg packet to the client, formatting the msg for the client if
3007client if neccessary. C<$type> should be a string identifying the type of 3122necessary. C<$type> should be a string identifying the type of the
3008the message, with C<log> being the default. If C<$color> is negative, suppress 3123message, with C<log> being the default. If C<$color> is negative, suppress
3009the message unless the client supports the msg packet. 3124the message unless the client supports the msg packet.
3010 3125
3011=cut 3126=cut
3012 3127
3013# non-persistent channels (usually the info channel) 3128# non-persistent channels (usually the info channel)
3056 }, 3171 },
3057 "c/body" => { 3172 "c/body" => {
3058 id => "infobox", 3173 id => "infobox",
3059 title => "Body Parts", 3174 title => "Body Parts",
3060 reply => undef, 3175 reply => undef,
3061 tooltip => "Shows which body parts you posess and are available", 3176 tooltip => "Shows which body parts you possess and are available",
3062 }, 3177 },
3063 "c/statistics" => { 3178 "c/statistics" => {
3064 id => "infobox", 3179 id => "infobox",
3065 title => "Statistics", 3180 title => "Statistics",
3066 reply => undef, 3181 reply => undef,
3118 id => "death", 3233 id => "death",
3119 title => "Death", 3234 title => "Death",
3120 reply => undef, 3235 reply => undef,
3121 tooltip => "Reason for and more info about your most recent death", 3236 tooltip => "Reason for and more info about your most recent death",
3122 }, 3237 },
3238 "c/fatal" => {
3239 id => "fatal",
3240 title => "Fatal Error",
3241 reply => undef,
3242 tooltip => "Reason for the server disconnect",
3243 },
3123 "c/say" => $SAY_CHANNEL, 3244 "c/say" => $SAY_CHANNEL,
3124 "c/chat" => $CHAT_CHANNEL, 3245 "c/chat" => $CHAT_CHANNEL,
3125); 3246);
3126 3247
3127sub cf::client::send_msg { 3248sub cf::client::send_msg {
3170=cut 3291=cut
3171 3292
3172sub cf::client::ext_msg($$@) { 3293sub cf::client::ext_msg($$@) {
3173 my ($self, $type, @msg) = @_; 3294 my ($self, $type, @msg) = @_;
3174 3295
3175 if ($self->extcmd == 2) {
3176 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3296 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3177 } elsif ($self->extcmd == 1) { # TODO: remove
3178 push @msg, msgtype => "event_$type";
3179 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3180 }
3181}
3182
3183=item $client->ext_reply ($msgid, @msg)
3184
3185Sends an ext reply to the client.
3186
3187=cut
3188
3189sub cf::client::ext_reply($$@) {
3190 my ($self, $id, @msg) = @_;
3191
3192 return unless $self->extcmd == 2;
3193
3194 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3195} 3297}
3196 3298
3197=item $success = $client->query ($flags, "text", \&cb) 3299=item $success = $client->query ($flags, "text", \&cb)
3198 3300
3199Queues a query to the client, calling the given callback with 3301Queues a query to the client, calling the given callback with
3219 3321
3220 $self->send_packet ($self->{query_queue}[0][0]) 3322 $self->send_packet ($self->{query_queue}[0][0])
3221 if @{ $self->{query_queue} } == 1; 3323 if @{ $self->{query_queue} } == 1;
3222 3324
3223 1 3325 1
3326}
3327
3328=item $client->update_command_faces
3329
3330=cut
3331
3332our %COMMAND_FACE;
3333
3334sub cf::client::update_command_faces {
3335 my ($self) = @_;
3336
3337 my @faces = grep $_,
3338 $COMMAND_FACE{preferred},
3339 $COMMAND_FACE{standard},
3340 $COMMAND_FACE{skill},
3341 $self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
3342 $COMMAND_FACE{emote},
3343 ;
3344
3345 $self->send_face ($_)
3346 for @faces;
3347 $self->flush_fx;
3348
3349 $self->ext_msg (command_list => @faces);
3350}
3351
3352=item cf::client::set_command_face $type, $commands
3353
3354=cut
3355
3356sub cf::client::set_command_face {
3357 my ($type, $list) = @_;
3358
3359 my $idx = &cf::face::set ( #d# ugly forward reference
3360 "command_list/$type" => cf::FT_RSRC,
3361 JSON::XS->new->utf8->encode ([ sort @$list ])
3362 );
3363
3364 $COMMAND_FACE{$type} = $idx;
3224} 3365}
3225 3366
3226cf::client->attach ( 3367cf::client->attach (
3227 on_connect => sub { 3368 on_connect => sub {
3228 my ($ns) = @_; 3369 my ($ns) = @_;
3256 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3397 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3257 3398
3258 if (ref $msg) { 3399 if (ref $msg) {
3259 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash 3400 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3260 3401
3261 my @reply;
3262
3263 if (my $cb = $EXTICMD{$type}) { 3402 if (my $cb = $EXTIACMD{$type}) {
3403 $cb->(
3404 $ns,
3405 sub {
3406 $ns->ext_msg ("reply-$reply", @_)
3407 if $reply;
3408 },
3409 @payload
3410 );
3411 } else {
3412 my @reply;
3413
3414 if (my $cb = $EXTICMD{$type}) {
3264 @reply = $cb->($ns, @payload); 3415 @reply = $cb->($ns, @payload);
3416 }
3417
3418 $ns->ext_msg ("reply-$reply", @reply)
3419 if $reply;
3265 } 3420 }
3266
3267 $ns->ext_reply ($reply, @reply)
3268 if $reply;
3269
3270 } else { 3421 } else {
3271 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3422 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3272 } 3423 }
3273 3424
3274 cf::override; 3425 cf::override;
3442=cut 3593=cut
3443 3594
3444############################################################################# 3595#############################################################################
3445# the server's init and main functions 3596# the server's init and main functions
3446 3597
3598{
3599 package cf::face;
3600
3601 our %HASH; # hash => idx
3602 our @DATA; # dynamically-created facedata, only faceste 0 used
3603 our @FOFS; # file offset, if > 0
3604 our @SIZE; # size of face, in octets
3605 our @META; # meta hash of face, if any
3606 our $DATAFH; # facedata filehandle
3607
3608 # internal api, not finalised
3609 sub set {
3610 my ($name, $type, $data) = @_;
3611
3612 my $idx = cf::face::find $name;
3613
3614 if ($idx) {
3615 delete $HASH{cf::face::get_csum $idx};
3616 } else {
3617 $idx = cf::face::alloc $name;
3618 }
3619
3620 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3621
3622 cf::face::set_type $idx, $type;
3623 cf::face::set_csum $idx, 0, $hash;
3624
3625 # we need to destroy the SV itself, not just modify it, as a running ix
3626 # might hold a reference to it: "delete" achieves that.
3627 delete $FOFS[0][$idx];
3628 delete $DATA[0][$idx];
3629 $DATA[0][$idx] = $data;
3630 $SIZE[0][$idx] = length $data;
3631 delete $META[$idx];
3632 $HASH{$hash} = $idx;#d#
3633
3634 $idx
3635 }
3636
3637 sub _get_data($$$) {
3638 my ($idx, $set, $cb) = @_;
3639
3640 if (defined $DATA[$set][$idx]) {
3641 $cb->($DATA[$set][$idx]);
3642 } elsif (my $fofs = $FOFS[$set][$idx]) {
3643 my $size = $SIZE[$set][$idx];
3644 my $buf;
3645 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3646 if ($_[0] == $size) {
3647 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3648 $cb->($buf);
3649 } else {
3650 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3651 }
3652 };
3653 } else {
3654 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3655 }
3656 }
3657
3658 # rather ineffient
3659 sub cf::face::get_data($;$) {
3660 my ($idx, $set) = @_;
3661
3662 _get_data $idx, $set, Coro::rouse_cb;
3663 Coro::rouse_wait
3664 }
3665
3666 sub cf::face::ix {
3667 my ($ns, $set, $idx, $pri) = @_;
3668
3669 _get_data $idx, $set, sub {
3670 $ns->ix_send ($idx, $pri, $_[0]);
3671 };
3672 }
3673}
3674
3447sub load_facedata($) { 3675sub load_facedata($) {
3448 my ($path) = @_; 3676 my ($path) = @_;
3449 3677
3450 # HACK to clear player env face cache, we need some signal framework
3451 # for this (global event?)
3452 %ext::player_env::MUSIC_FACE_CACHE = ();
3453
3454 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3678 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3455 3679
3456 trace "loading facedata from $path\n"; 3680 trace "loading facedata from $path\n";
3457 3681
3458 my $facedata = decode_storable load_file $path; 3682 my $facedata = decode_storable load_file "$path/faceinfo";
3459 3683
3460 $facedata->{version} == 2 3684 $facedata->{version} == 2
3461 or cf::cleanup "$path: version mismatch, cannot proceed."; 3685 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3462 3686
3463 # patch in the exptable 3687 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3464 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]); 3688 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3465 $facedata->{resource}{"res/exp_table"} = { 3689
3466 type => FT_RSRC, 3690 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3467 data => $exp_table, 3691
3468 hash => (Digest::MD5::md5 $exp_table), 3692 # BEGIN ATOMIC
3469 }; 3693 # from here on, everything must be atomic - no thread switch allowed
3470 cf::cede_to_tick; 3694 my $t1 = EV::time;
3471 3695
3472 { 3696 {
3473 my $faces = $facedata->{faceinfo}; 3697 my $faces = $facedata->{faceinfo};
3474 3698
3475 while (my ($face, $info) = each %$faces) { 3699 for my $face (sort keys %$faces) {
3700 my $info = $faces->{$face};
3476 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3701 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3477 3702
3478 cf::face::set_visibility $idx, $info->{visibility}; 3703 cf::face::set_visibility $idx, $info->{visibility};
3479 cf::face::set_magicmap $idx, $info->{magicmap}; 3704 cf::face::set_magicmap $idx, $info->{magicmap};
3480 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3705 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3481 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3706 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3482 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ; 3707 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3483 3708 $cf::face::HASH{$info->{hash64}} = $idx;
3484 cf::cede_to_tick; 3709 delete $cf::face::META[$idx];
3485 } 3710 }
3486 3711
3487 while (my ($face, $info) = each %$faces) { 3712 while (my ($face, $info) = each %$faces) {
3488 next unless $info->{smooth}; 3713 next unless $info->{smooth};
3489 3714
3494 cf::face::set_smooth $idx, $smooth; 3719 cf::face::set_smooth $idx, $smooth;
3495 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3720 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3496 } else { 3721 } else {
3497 error "smooth face '$info->{smooth}' not found for face '$face'"; 3722 error "smooth face '$info->{smooth}' not found for face '$face'";
3498 } 3723 }
3499
3500 cf::cede_to_tick;
3501 } 3724 }
3502 } 3725 }
3503 3726
3504 { 3727 {
3505 my $anims = $facedata->{animinfo}; 3728 my $anims = $facedata->{animinfo};
3506 3729
3507 while (my ($anim, $info) = each %$anims) { 3730 while (my ($anim, $info) = each %$anims) {
3508 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3731 cf::anim::set $anim, $info->{frames}, $info->{facings};
3509 cf::cede_to_tick;
3510 } 3732 }
3511 3733
3512 cf::anim::invalidate_all; # d'oh 3734 cf::anim::invalidate_all; # d'oh
3513 } 3735 }
3514 3736
3518 while (my ($name, $info) = each %$res) { 3740 while (my ($name, $info) = each %$res) {
3519 if (defined (my $type = $info->{type})) { 3741 if (defined (my $type = $info->{type})) {
3520 # TODO: different hash - must free and use new index, or cache ixface data queue 3742 # TODO: different hash - must free and use new index, or cache ixface data queue
3521 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3743 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3522 3744
3523 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3524 cf::face::set_type $idx, $type; 3745 cf::face::set_type $idx, $type;
3746 cf::face::set_csum $idx, 0, $info->{hash};
3747 $cf::face::SIZE[0][$idx] = $info->{size};
3748 $cf::face::FOFS[0][$idx] = $info->{fofs};
3525 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already 3749 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3750 $cf::face::HASH{$info->{hash}} = $idx;
3526 } else { 3751 } else {
3527# $RESOURCE{$name} = $info; # unused 3752# $RESOURCE{$name} = $info; # unused
3528 } 3753 }
3529
3530 cf::cede_to_tick;
3531 } 3754 }
3532 } 3755 }
3756
3757 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3758
3759 # HACK to clear player env face cache, we need some signal framework
3760 # for this (global event?)
3761 %ext::player_env::MUSIC_FACE_CACHE = ();
3762
3763 # END ATOMIC
3764
3765 cf::debug "facedata atomic update time ", EV::time - $t1;
3533 3766
3534 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3767 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3768
3769 aio_close $fh if $fh; # close old facedata
3535 3770
3536 1 3771 1
3537} 3772}
3538 3773
3539register_exticmd fx_want => sub { 3774register_exticmd fx_want => sub {
3550 my $status = load_resource_file_ $_[0]; 3785 my $status = load_resource_file_ $_[0];
3551 get_slot 0.1, 100; 3786 get_slot 0.1, 100;
3552 cf::arch::commit_load; 3787 cf::arch::commit_load;
3553 3788
3554 $status 3789 $status
3790}
3791
3792sub reload_exp_table {
3793 _reload_exp_table;
3794
3795 cf::face::set
3796 "res/exp_table" => FT_RSRC,
3797 JSON::XS->new->utf8->canonical->encode (
3798 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3799 );
3800}
3801
3802sub reload_materials {
3803 _reload_materials;
3555} 3804}
3556 3805
3557sub reload_regions { 3806sub reload_regions {
3558 # HACK to clear player env face cache, we need some signal framework 3807 # HACK to clear player env face cache, we need some signal framework
3559 # for this (global event?) 3808 # for this (global event?)
3567 if exists $_->{match}; 3816 if exists $_->{match};
3568 } 3817 }
3569} 3818}
3570 3819
3571sub reload_facedata { 3820sub reload_facedata {
3572 load_facedata "$DATADIR/facedata" 3821 load_facedata $DATADIR
3573 or die "unable to load facedata\n"; 3822 or die "unable to load facedata\n";
3574} 3823}
3575 3824
3576sub reload_archetypes { 3825sub reload_archetypes {
3577 load_resource_file "$DATADIR/archetypes" 3826 load_resource_file "$DATADIR/archetypes"
3578 or die "unable to load archetypes\n"; 3827 or die "unable to load archetypes\n";
3828
3829 cf::face::set
3830 "res/skill_info" => FT_RSRC,
3831 JSON::XS->new->utf8->canonical->encode (
3832 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3833 );
3834
3835 cf::face::set
3836 "res/spell_paths" => FT_RSRC,
3837 JSON::XS->new->utf8->canonical->encode (
3838 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3839 );
3840
3841 # command completion
3842 my @commands;
3843
3844 for (0..cf::arch::skillvec_size - 1) {
3845 my $skill = cf::arch::skillvec $_;
3846 my $name = $skill->name;
3847 my $flags = cf::skill_flags $skill->subtype;
3848
3849 push @commands, "ready_skill $name" if $flags & (SF_COMBAT | SF_RANGED | SF_GRACE);
3850 push @commands, "use_skill $name" if $flags & (SF_USE | SF_AUTARK | SF_GRACE);
3851 }
3852
3853 cf::client::set_command_face skill => \@commands;
3579} 3854}
3580 3855
3581sub reload_treasures { 3856sub reload_treasures {
3582 load_resource_file "$DATADIR/treasures" 3857 load_resource_file "$DATADIR/treasures"
3583 or die "unable to load treasurelists\n"; 3858 or die "unable to load treasurelists\n";
3604} 3879}
3605 3880
3606sub reload_resources { 3881sub reload_resources {
3607 trace "reloading resource files...\n"; 3882 trace "reloading resource files...\n";
3608 3883
3609 reload_exp_table;
3610 reload_materials; 3884 reload_materials;
3611 reload_facedata; 3885 reload_facedata;
3886 reload_exp_table;
3612 reload_sound; 3887 reload_sound;
3613 reload_archetypes; 3888 reload_archetypes;
3614 reload_regions; 3889 reload_regions;
3615 reload_treasures; 3890 reload_treasures;
3616 3891
3656 seek $fh, 0, 0; 3931 seek $fh, 0, 0;
3657 print $fh $$; 3932 print $fh $$;
3658} 3933}
3659 3934
3660sub main_loop { 3935sub main_loop {
3661 trace "EV::loop starting\n"; 3936 trace "EV::run starting\n";
3662 if (1) { 3937 if (1) {
3663 EV::loop; 3938 EV::run;
3664 } 3939 }
3665 trace "EV::loop returned\n"; 3940 trace "EV::run returned\n";
3666 goto &main_loop unless $REALLY_UNLOOP; 3941 goto &main_loop unless $REALLY_UNLOOP;
3667} 3942}
3668 3943
3669sub main { 3944sub main {
3670 cf::init_globals; # initialise logging 3945 cf::init_globals; # initialise logging
3671 3946
3672 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3947 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3948 LOG llevInfo, "Copyright (C) 2017-2018 Marc Alexander Lehmann / the Deliantra team.";
3673 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3949 LOG llevInfo, "Copyright (C) 2005-2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3674 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3950 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3675 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3951 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3676 3952
3677 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3953 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3678 3954
3679 # we must not ever block the main coroutine 3955 # we must not ever block the main coroutine
3680 local $Coro::idle = sub { 3956 $Coro::idle = sub {
3681 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3957 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3682 (async { 3958 (async {
3683 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3959 $Coro::current->{desc} = "IDLE BUG HANDLER";
3684 EV::loop EV::LOOP_ONESHOT; 3960 EV::run EV::RUN_ONCE;
3685 })->prio (Coro::PRIO_MAX); 3961 })->prio (Coro::PRIO_MAX);
3686 }; 3962 };
3687 3963
3688 evthread_start IO::AIO::poll_fileno; 3964 evthread_start IO::AIO::poll_fileno;
3689 3965
3690 cf::sync_job { 3966 cf::sync_job {
3691 cf::incloader::init (); 3967 cf::incloader::init ();
3968
3969 db_init;
3692 3970
3693 cf::init_anim; 3971 cf::init_anim;
3694 cf::init_attackmess; 3972 cf::init_attackmess;
3695 cf::init_dynamic; 3973 cf::init_dynamic;
3696 3974
3697 cf::load_settings; 3975 cf::load_settings;
3698 3976
3699 reload_resources; 3977 reload_resources;
3700 reload_config; 3978 reload_config;
3701 db_init;
3702 3979
3703 cf::init_uuid; 3980 cf::init_uuid;
3704 cf::init_signals; 3981 cf::init_signals;
3705 cf::init_skills; 3982 cf::init_skills;
3706 3983
4131 } 4408 }
4132} 4409}
4133 4410
4134{ 4411{
4135 # configure BDB 4412 # configure BDB
4413 info "initialising database";
4136 4414
4137 BDB::min_parallel 16; 4415 BDB::min_parallel 16;
4138 BDB::max_poll_reqs $TICK * 0.1; 4416 BDB::max_poll_reqs $TICK * 0.1;
4139 #$AnyEvent::BDB::WATCHER->priority (1); 4417 #$AnyEvent::BDB::WATCHER->priority (1);
4140 4418
4169 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4447 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4170 }; 4448 };
4171 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4449 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4172 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4450 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4173 }; 4451 };
4452
4453 info "database initialised";
4174} 4454}
4175 4455
4176{ 4456{
4177 # configure IO::AIO 4457 # configure IO::AIO
4178 4458
4459 info "initialising aio";
4179 IO::AIO::min_parallel 8; 4460 IO::AIO::min_parallel 8;
4180 IO::AIO::max_poll_time $TICK * 0.1; 4461 IO::AIO::max_poll_time $TICK * 0.1;
4181 undef $AnyEvent::AIO::WATCHER; 4462 undef $AnyEvent::AIO::WATCHER;
4463 info "aio initialised";
4182} 4464}
4183 4465
4184our $_log_backtrace; 4466our $_log_backtrace;
4185our $_log_backtrace_last; 4467our $_log_backtrace_last;
4186 4468

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines