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.584 by root, Tue Oct 30 17:07:50 2012 UTC vs.
Revision 1.621 by root, Fri Nov 18 20:55:00 2016 UTC

… …
32use Safe; 32use Safe;
33use Safe::Hole; 33use Safe::Hole;
34use Storable (); 34use Storable ();
35use Carp (); 35use Carp ();
36 36
37use Guard (); 37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
40
38use Coro (); 41use Coro ();
39use Coro::State; 42use Coro::State;
40use Coro::Handle; 43use Coro::Handle;
41use Coro::EV; 44use Coro::EV;
42use Coro::AnyEvent; 45use Coro::AnyEvent;
… …
48use Coro::AIO; 51use Coro::AIO;
49use Coro::BDB 1.6; 52use Coro::BDB 1.6;
50use Coro::Storable; 53use Coro::Storable;
51use Coro::Util (); 54use Coro::Util ();
52 55
56use Guard ();
53use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
54use BDB (); 58use BDB ();
55use Data::Dumper; 59use Data::Dumper;
56use Fcntl; 60use Fcntl;
57use YAML::XS (); 61use YAML::XS ();
58use IO::AIO (); 62use IO::AIO ();
59use Time::HiRes;
60use Compress::LZF; 63use Compress::LZF;
61use Digest::MD5 (); 64use Digest::MD5 ();
62 65
63AnyEvent::detect; 66AnyEvent::detect;
64 67
… …
83our %COMMAND = (); 86our %COMMAND = ();
84our %COMMAND_TIME = (); 87our %COMMAND_TIME = ();
85 88
86our @EXTS = (); # list of extension package names 89our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 90our %EXTCMD = ();
91our %EXTACMD = ();
88our %EXTICMD = (); 92our %EXTICMD = ();
93our %EXTIACMD = ();
89our %EXT_CORO = (); # coroutines bound to extensions 94our %EXT_CORO = (); # coroutines bound to extensions
90our %EXT_MAP = (); # pluggable maps 95our %EXT_MAP = (); # pluggable maps
91 96
92our $RELOAD; # number of reloads so far, non-zero while in reload 97our $RELOAD; # number of reloads so far, non-zero while in reload
93our @EVENT; 98our @EVENT;
… …
220=item $cf::RUNTIME 225=item $cf::RUNTIME
221 226
222The time this server has run, starts at 0 and is increased by $cf::TICK on 227The time this server has run, starts at 0 and is increased by $cf::TICK on
223every server tick. 228every server tick.
224 229
225=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 230=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
226$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 231$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
227$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 232$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
228 233
229Various directories - "/etc", read-only install directory, perl-library 234Various directories - "/etc", read-only install directory, perl-library
230directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 235directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
231unique-items directory, player file directory, random maps directory and 236unique-items directory, player file directory, random maps directory and
232database environment. 237database environment.
… …
246Configuration for the server, loaded from C</etc/deliantra-server/config>, or 251Configuration for the server, loaded from C</etc/deliantra-server/config>, or
247from wherever your confdir points to. 252from wherever your confdir points to.
248 253
249=item cf::wait_for_tick, cf::wait_for_tick_begin 254=item cf::wait_for_tick, cf::wait_for_tick_begin
250 255
251These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 256These are functions that inhibit the current coroutine one tick.
252returns directly I<after> the tick processing (and consequently, can only wake one thread 257cf::wait_for_tick_begin only returns directly I<after> the tick
258processing (and consequently, can only wake one thread per tick), while
253per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 259cf::wait_for_tick wakes up all waiters after tick processing.
254 260
255Note that cf::Wait_for_tick will immediately return when the server is not 261Note that cf::wait_for_tick will immediately return when the server is not
256ticking, making it suitable for small pauses in threads that need to run 262ticking, making it suitable for small pauses in threads that need to run
257when the server is paused. If that is not applicable (i.e. you I<really> 263when the server is paused. If that is not applicable (i.e. you I<really>
258want to wait, use C<$cf::WAIT_FOR_TICK>). 264want to wait, use C<$cf::WAIT_FOR_TICK>).
259 265
260=item $cf::WAIT_FOR_TICK 266=item $cf::WAIT_FOR_TICK
… …
336)) { 342)) {
337 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 343 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
338} 344}
339 345
340$EV::DIED = sub { 346$EV::DIED = sub {
341 Carp::cluck "error in event callback: @_"; 347 warn "error in event callback: $@";
342}; 348};
343 349
344############################################################################# 350#############################################################################
345 351
346sub fork_call(&@); 352sub fork_call(&@);
… …
504 } 510 }
505} 511}
506 512
507=item cf::lock_wait $string 513=item cf::lock_wait $string
508 514
509Wait until the given lock is available. See cf::lock_acquire. 515Wait until the given lock is available. See cf::lock_acquire.
510 516
511=item my $lock = cf::lock_acquire $string 517=item my $lock = cf::lock_acquire $string
512 518
513Wait until the given lock is available and then acquires it and returns 519Wait until the given lock is available and then acquires it and returns
514a L<Guard> object. If the guard object gets destroyed (goes out of scope, 520a L<Guard> object. If the guard object gets destroyed (goes out of scope,
… …
567Allocate $time seconds of blocking CPU time at priority C<$priority> 573Allocate $time seconds of blocking CPU time at priority C<$priority>
568(default: 0): This call blocks and returns only when you have at least 574(default: 0): This call blocks and returns only when you have at least
569C<$time> seconds of cpu time till the next tick. The slot is only valid 575C<$time> seconds of cpu time till the next tick. The slot is only valid
570till the next cede. 576till the next cede.
571 577
572Background jobs should use a priority les than zero, interactive jobs 578Background jobs should use a priority less than zero, interactive jobs
573should use 100 or more. 579should use 100 or more.
574 580
575The optional C<$name> can be used to identify the job to run. It might be 581The optional C<$name> can be used to identify the job to run. It might be
576used for statistical purposes and should identify the same time-class. 582used for statistical purposes and should identify the same time-class.
577 583
… …
590 my $signal = new Coro::Signal; 596 my $signal = new Coro::Signal;
591 my $busy; 597 my $busy;
592 598
593 while () { 599 while () {
594 next_job: 600 next_job:
601
602 Coro::cede;
595 603
596 my $avail = cf::till_tick; 604 my $avail = cf::till_tick;
597 605
598 for (0 .. $#SLOT_QUEUE) { 606 for (0 .. $#SLOT_QUEUE) {
599 if ($SLOT_QUEUE[$_][0] <= $avail) { 607 if ($SLOT_QUEUE[$_][0] <= $avail) {
600 $busy = 0; 608 $busy = 0;
601 my $job = splice @SLOT_QUEUE, $_, 1, (); 609 my $job = splice @SLOT_QUEUE, $_, 1, ();
602 $job->[2]->send; 610 $job->[2]->send;
603 Coro::cede;
604 goto next_job; 611 goto next_job;
605 } else { 612 } else {
606 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY; 613 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
607 } 614 }
608 } 615 }
609 616
610 if (@SLOT_QUEUE) { 617 if (@SLOT_QUEUE) {
611 # we do not use wait_for_tick() as it returns immediately when tick is inactive 618 wait_for_tick;
612 $WAIT_FOR_TICK->wait;
613 } else { 619 } else {
614 $busy = 0; 620 $busy = 0;
615 Coro::schedule; 621 Coro::schedule;
616 } 622 }
617 } 623 }
… …
643BEGIN { *async = \&Coro::async_pool } 649BEGIN { *async = \&Coro::async_pool }
644 650
645=item cf::sync_job { BLOCK } 651=item cf::sync_job { BLOCK }
646 652
647The design of Deliantra requires that the main coroutine ($Coro::main) 653The design of Deliantra requires that the main coroutine ($Coro::main)
648is always able to handle events or runnable, as Deliantra is only 654is always able to handle events or is runnable, as Deliantra is only
649partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 655partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
650acceptable. 656acceptable.
651 657
652If it must be done, put the blocking parts into C<sync_job>. This will run 658If it must be done, put the blocking parts into C<sync_job>. This will run
653the given BLOCK in another coroutine while waiting for the result. The 659the given BLOCK in another coroutine while waiting for the result. The
… …
681 687
682 while ($busy) { 688 while ($busy) {
683 if (Coro::nready) { 689 if (Coro::nready) {
684 Coro::cede_notself; 690 Coro::cede_notself;
685 } else { 691 } else {
686 EV::loop EV::LOOP_ONESHOT; 692 EV::run EV::RUN_ONCE;
687 } 693 }
688 } 694 }
689 695
690 my $time = AE::time - $time; 696 my $time = AE::time - $time;
691 697
… …
732 reset_signals; 738 reset_signals;
733} 739}
734 740
735sub fork_call(&@) { 741sub fork_call(&@) {
736 my ($cb, @args) = @_; 742 my ($cb, @args) = @_;
737
738 # we seemingly have to make a local copy of the whole thing,
739 # otherwise perl prematurely frees the stuff :/
740 # TODO: investigate and fix (likely this will be rather laborious)
741 743
742 my @res = Coro::Util::fork_eval { 744 my @res = Coro::Util::fork_eval {
743 cf::post_fork; 745 cf::post_fork;
744 &$cb 746 &$cb
745 } @args; 747 } @args;
… …
895 897
896 return db_get cache => "$id/data"; 898 return db_get cache => "$id/data";
897 } 899 }
898 } 900 }
899 901
900 my $t1 = Time::HiRes::time; 902 my $t1 = EV::time;
901 my $data = $process->(\@data); 903 my $data = $process->(\@data);
902 my $t2 = Time::HiRes::time; 904 my $t2 = EV::time;
903 905
904 info "cache: '$id' processed in ", $t2 - $t1, "s\n"; 906 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
905 907
906 db_put cache => "$id/data", $data; 908 db_put cache => "$id/data", $data;
907 db_put cache => "$id/md5" , $md5; 909 db_put cache => "$id/md5" , $md5;
… …
1427=cut 1429=cut
1428 1430
1429############################################################################# 1431#############################################################################
1430# command handling &c 1432# command handling &c
1431 1433
1432=item cf::register_command $name => \&callback($ob,$args); 1434=item cf::register_command $name => \&callback($ob,$args)
1433 1435
1434Register a callback for execution when the client sends the user command 1436Register a callback for execution when the client sends the user command
1435$name. 1437$name.
1436 1438
1437=cut 1439=cut
… …
1443 #warn "registering command '$name/$time' to '$caller'"; 1445 #warn "registering command '$name/$time' to '$caller'";
1444 1446
1445 push @{ $COMMAND{$name} }, [$caller, $cb]; 1447 push @{ $COMMAND{$name} }, [$caller, $cb];
1446} 1448}
1447 1449
1448=item cf::register_extcmd $name => \&callback($pl,$packet); 1450=item cf::register_extcmd $name => \&callback($pl,@args)
1449 1451
1450Register a callback for execution when the client sends an (synchronous) 1452Register a callback for execution when the client sends an (synchronous)
1451extcmd packet. Ext commands will be processed in the order they are 1453extcmd packet. Ext commands will be processed in the order they are
1452received by the server, like other user commands. The first argument is 1454received by the server, like other user commands. The first argument is
1453the logged-in player. Ext commands can only be processed after a player 1455the logged-in player. Ext commands can only be processed after a player
1454has logged in successfully. 1456has logged in successfully.
1455 1457
1456If the callback returns something, it is sent back as if reply was being 1458The values will be sent back to the client.
1457called.
1458 1459
1460=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
1461
1462Same as C<cf::register_extcmd>, but instead of returning values, the
1463callback needs to clal the C<$reply> function.
1464
1459=item cf::register_exticmd $name => \&callback($ns,$packet); 1465=item cf::register_exticmd $name => \&callback($ns,@args)
1460 1466
1461Register a callback for execution when the client sends an (asynchronous) 1467Register a callback for execution when the client sends an (asynchronous)
1462exticmd packet. Exti commands are processed by the server as soon as they 1468exticmd packet. Exti commands are processed by the server as soon as they
1463are received, i.e. out of order w.r.t. other commands. The first argument 1469are received, i.e. out of order w.r.t. other commands. The first argument
1464is a client socket. Exti commands can be received anytime, even before 1470is a client socket. Exti commands can be received anytime, even before
1465log-in. 1471log-in.
1466 1472
1467If the callback returns something, it is sent back as if reply was being 1473The values will be sent back to the client.
1468called.
1469 1474
1470=cut 1475=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1471 1476
1477Same as C<cf::register_extcmd>, but instead of returning values, the
1478callback needs to clal the C<$reply> function.
1479
1480=cut
1481
1472sub register_extcmd { 1482sub register_extcmd($$) {
1473 my ($name, $cb) = @_; 1483 my ($name, $cb) = @_;
1474 1484
1475 $EXTCMD{$name} = $cb; 1485 $EXTCMD{$name} = $cb;
1476} 1486}
1477 1487
1478sub register_exticmd { 1488sub register_async_extcmd($$) {
1479 my ($name, $cb) = @_; 1489 my ($name, $cb) = @_;
1480 1490
1491 $EXTACMD{$name} = $cb;
1492}
1493
1494sub register_exticmd($$) {
1495 my ($name, $cb) = @_;
1496
1481 $EXTICMD{$name} = $cb; 1497 $EXTICMD{$name} = $cb;
1498}
1499
1500sub register_async_exticmd($$) {
1501 my ($name, $cb) = @_;
1502
1503 $EXTIACMD{$name} = $cb;
1482} 1504}
1483 1505
1484use File::Glob (); 1506use File::Glob ();
1485 1507
1486cf::player->attach ( 1508cf::player->attach (
… …
1502 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1524 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1503 1525
1504 if (ref $msg) { 1526 if (ref $msg) {
1505 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash 1527 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1506 1528
1507 my @reply;
1508
1509 if (my $cb = $EXTCMD{$type}) { 1529 if (my $cb = $EXTACMD{$type}) {
1530 $cb->(
1531 $pl,
1532 sub {
1533 $pl->ext_msg ("reply-$reply", @_)
1534 if $reply;
1535 },
1536 @payload
1537 );
1538 } else {
1539 my @reply;
1540
1541 if (my $cb = $EXTCMD{$type}) {
1510 @reply = $cb->($pl, @payload); 1542 @reply = $cb->($pl, @payload);
1543 }
1544
1545 $pl->ext_msg ("reply-$reply", @reply)
1546 if $reply;
1511 } 1547 }
1512
1513 $pl->ext_reply ($reply, @reply)
1514 if $reply;
1515 1548
1516 } else { 1549 } else {
1517 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1550 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1518 } 1551 }
1519 1552
… …
1905} 1938}
1906 1939
1907=item $protocol_xml = $player->expand_cfpod ($cfpod) 1940=item $protocol_xml = $player->expand_cfpod ($cfpod)
1908 1941
1909Expand deliantra pod fragments into protocol xml. 1942Expand deliantra pod fragments into protocol xml.
1910
1911=item $player->ext_reply ($msgid, @msg)
1912
1913Sends an ext reply to the player.
1914
1915=cut
1916
1917sub ext_reply($$@) {
1918 my ($self, $id, @msg) = @_;
1919
1920 $self->ns->ext_reply ($id, @msg)
1921}
1922 1943
1923=item $player->ext_msg ($type, @msg) 1944=item $player->ext_msg ($type, @msg)
1924 1945
1925Sends an ext event to the client. 1946Sends an ext event to the client.
1926 1947
… …
2363 2384
2364 $MAP_PREFETCHER ||= cf::async { 2385 $MAP_PREFETCHER ||= cf::async {
2365 $Coro::current->{desc} = "map prefetcher"; 2386 $Coro::current->{desc} = "map prefetcher";
2366 2387
2367 while (%MAP_PREFETCH) { 2388 while (%MAP_PREFETCH) {
2368 while (my ($k, $v) = each %MAP_PREFETCH) { 2389 for my $k (keys %MAP_PREFETCH) {
2369 if (my $map = find $k) { 2390 if (my $map = find $k) {
2370 $map->load if $v; 2391 $map->load if $MAP_PREFETCH{$k};
2371 } 2392 }
2372 2393
2373 delete $MAP_PREFETCH{$k}; 2394 delete $MAP_PREFETCH{$k};
2374 } 2395 }
2375 } 2396 }
… …
2629 2650
2630Creates and returns a persistent reference to an object that can be stored as a string. 2651Creates and returns a persistent reference to an object that can be stored as a string.
2631 2652
2632=item $ob = cf::object::deref ($refstring) 2653=item $ob = cf::object::deref ($refstring)
2633 2654
2634returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2655returns the objetc referenced by refstring. may return undef when it cannot find the object,
2635even if the object actually exists. May block. 2656even if the object actually exists. May block.
2636 2657
2637=cut 2658=cut
2638 2659
2639sub deref { 2660sub deref {
… …
2721=item $player_object->may ("access") 2742=item $player_object->may ("access")
2722 2743
2723Returns wether the given player is authorized to access resource "access" 2744Returns wether the given player is authorized to access resource "access"
2724(e.g. "command_wizcast"). 2745(e.g. "command_wizcast").
2725 2746
2747This is implemented by checking a config setting of C<may_access> where
2748C<access> is replaced by the access string. The following alternatives are
2749possible (and are tested in order):
2750
2751=over 4
2752
2753=item * Player is DM
2754
2755The request will succeed.
2756
2757=item * may_access is an array reference
2758
2759If either the player nickname or UUID is in the array, the request will
2760succeed, otherwise it will fail.
2761
2762=item * may_access is a true value
2763
2764The request will succeed.
2765
2766=item * may_access is missing or false
2767
2768The request will fail.
2769
2770=back
2771
2726=cut 2772=cut
2727 2773
2728sub cf::object::player::may { 2774sub cf::object::player::may {
2729 my ($self, $access) = @_; 2775 my ($self, $access) = @_;
2730 2776
2731 $self->flag (cf::FLAG_WIZ) || 2777 $self->flag (cf::FLAG_WIZ) ||
2732 (ref $cf::CFG{"may_$access"} 2778 (ref $cf::CFG{"may_$access"}
2733 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 2779 ? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2734 : $cf::CFG{"may_$access"}) 2780 : $cf::CFG{"may_$access"})
2735} 2781}
2736 2782
2737=item $player_object->enter_link 2783=item $player_object->enter_link
2738 2784
… …
2741The player should be reasonably safe there for short amounts of time (e.g. 2787The player should be reasonably safe there for short amounts of time (e.g.
2742for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2788for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2743though, as the player cannot control the character while it is on the link 2789though, as the player cannot control the character while it is on the link
2744map. 2790map.
2745 2791
2746Will never block. 2792This method will never block, which is the whole reaosn for it's
2793existance: you can I<always> put a player onto the link map, which is the
2794only place to put objects that is guaranteed to exist.
2795
2796A typical usage pattern is to call C<enter_link> synchronously from the
2797server, then start a new thread, do your blocking stuff there and then
2798call C<leave_link> from that thread.
2747 2799
2748=item $player_object->leave_link ($map, $x, $y) 2800=item $player_object->leave_link ($map, $x, $y)
2749 2801
2750Moves the player out of the special C<{link}> map onto the specified 2802Moves the player out of the special C<{link}> map onto the specified
2751map. If the map is not valid (or omitted), the player will be moved back 2803map. If the map is not valid (or omitted), the player will be moved back
… …
3021 3073
3022=head3 cf::client 3074=head3 cf::client
3023 3075
3024=over 4 3076=over 4
3025 3077
3026=item $client->send_drawinfo ($text, $flags)
3027
3028Sends a drawinfo packet to the client. Circumvents output buffering so
3029should not be used under normal circumstances.
3030
3031=cut
3032
3033sub cf::client::send_drawinfo {
3034 my ($self, $text, $flags) = @_;
3035
3036 utf8::encode $text;
3037 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
3038}
3039
3040=item $client->send_big_packet ($pkt) 3078=item $client->send_big_packet ($pkt)
3041 3079
3042Like C<send_packet>, but tries to compress large packets, and fragments 3080Like C<send_packet>, but tries to compress large packets, and fragments
3043them as required. 3081them as required.
3044 3082
… …
3062 $self->send_packet ($pkt); 3100 $self->send_packet ($pkt);
3063} 3101}
3064 3102
3065=item $client->send_msg ($channel, $msg, $color, [extra...]) 3103=item $client->send_msg ($channel, $msg, $color, [extra...])
3066 3104
3067Send a drawinfo or msg packet to the client, formatting the msg for the 3105Send a msg packet to the client, formatting the msg for the client if
3068client if neccessary. C<$type> should be a string identifying the type of 3106necessary. C<$type> should be a string identifying the type of the
3069the message, with C<log> being the default. If C<$color> is negative, suppress 3107message, with C<log> being the default. If C<$color> is negative, suppress
3070the message unless the client supports the msg packet. 3108the message unless the client supports the msg packet.
3071 3109
3072=cut 3110=cut
3073 3111
3074# non-persistent channels (usually the info channel) 3112# non-persistent channels (usually the info channel)
… …
3179 id => "death", 3217 id => "death",
3180 title => "Death", 3218 title => "Death",
3181 reply => undef, 3219 reply => undef,
3182 tooltip => "Reason for and more info about your most recent death", 3220 tooltip => "Reason for and more info about your most recent death",
3183 }, 3221 },
3222 "c/fatal" => {
3223 id => "fatal",
3224 title => "Fatal Error",
3225 reply => undef,
3226 tooltip => "Reason for the server disconnect",
3227 },
3184 "c/say" => $SAY_CHANNEL, 3228 "c/say" => $SAY_CHANNEL,
3185 "c/chat" => $CHAT_CHANNEL, 3229 "c/chat" => $CHAT_CHANNEL,
3186); 3230);
3187 3231
3188sub cf::client::send_msg { 3232sub cf::client::send_msg {
… …
3231=cut 3275=cut
3232 3276
3233sub cf::client::ext_msg($$@) { 3277sub cf::client::ext_msg($$@) {
3234 my ($self, $type, @msg) = @_; 3278 my ($self, $type, @msg) = @_;
3235 3279
3236 if ($self->extcmd == 2) {
3237 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3280 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3238 } elsif ($self->extcmd == 1) { # TODO: remove
3239 push @msg, msgtype => "event_$type";
3240 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3241 }
3242}
3243
3244=item $client->ext_reply ($msgid, @msg)
3245
3246Sends an ext reply to the client.
3247
3248=cut
3249
3250sub cf::client::ext_reply($$@) {
3251 my ($self, $id, @msg) = @_;
3252
3253 return unless $self->extcmd == 2;
3254
3255 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3256} 3281}
3257 3282
3258=item $success = $client->query ($flags, "text", \&cb) 3283=item $success = $client->query ($flags, "text", \&cb)
3259 3284
3260Queues a query to the client, calling the given callback with 3285Queues a query to the client, calling the given callback with
… …
3280 3305
3281 $self->send_packet ($self->{query_queue}[0][0]) 3306 $self->send_packet ($self->{query_queue}[0][0])
3282 if @{ $self->{query_queue} } == 1; 3307 if @{ $self->{query_queue} } == 1;
3283 3308
3284 1 3309 1
3310}
3311
3312=item $client->update_command_faces
3313
3314=cut
3315
3316our %COMMAND_FACE;
3317
3318sub cf::client::update_command_faces {
3319 my ($self) = @_;
3320
3321 my @faces = grep $_,
3322 $COMMAND_FACE{preferred},
3323 $COMMAND_FACE{standard},
3324 $COMMAND_FACE{skill},
3325 $self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
3326 $COMMAND_FACE{emote},
3327 ;
3328
3329 $self->send_face ($_)
3330 for @faces;
3331 $self->flush_fx;
3332
3333 $self->ext_msg (command_list => @faces);
3334}
3335
3336=item cf::client::set_command_face $type, $commands
3337
3338=cut
3339
3340sub cf::client::set_command_face {
3341 my ($type, $list) = @_;
3342
3343 my $idx = &cf::face::set ( #d# ugly forward reference
3344 "command_list/$type" => cf::FT_RSRC,
3345 JSON::XS->new->utf8->encode ([ sort @$list ])
3346 );
3347
3348 $COMMAND_FACE{$type} = $idx;
3285} 3349}
3286 3350
3287cf::client->attach ( 3351cf::client->attach (
3288 on_connect => sub { 3352 on_connect => sub {
3289 my ($ns) = @_; 3353 my ($ns) = @_;
… …
3317 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3381 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3318 3382
3319 if (ref $msg) { 3383 if (ref $msg) {
3320 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash 3384 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3321 3385
3322 my @reply;
3323
3324 if (my $cb = $EXTICMD{$type}) { 3386 if (my $cb = $EXTIACMD{$type}) {
3387 $cb->(
3388 $ns,
3389 sub {
3390 $ns->ext_msg ("reply-$reply", @_)
3391 if $reply;
3392 },
3393 @payload
3394 );
3395 } else {
3396 my @reply;
3397
3398 if (my $cb = $EXTICMD{$type}) {
3325 @reply = $cb->($ns, @payload); 3399 @reply = $cb->($ns, @payload);
3400 }
3401
3402 $ns->ext_msg ("reply-$reply", @reply)
3403 if $reply;
3326 } 3404 }
3327
3328 $ns->ext_reply ($reply, @reply)
3329 if $reply;
3330
3331 } else { 3405 } else {
3332 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3406 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3333 } 3407 }
3334 3408
3335 cf::override; 3409 cf::override;
… …
3503=cut 3577=cut
3504 3578
3505############################################################################# 3579#############################################################################
3506# the server's init and main functions 3580# the server's init and main functions
3507 3581
3508our %FACEHASH; # hash => idx, #d# HACK for http server 3582{
3583 package cf::face;
3584
3585 our %HASH; # hash => idx
3586 our @DATA; # dynamically-created facedata, only faceste 0 used
3587 our @FOFS; # file offset, if > 0
3588 our @SIZE; # size of face, in octets
3589 our @META; # meta hash of face, if any
3590 our $DATAFH; # facedata filehandle
3591
3592 # internal api, not finalised
3593 sub set {
3594 my ($name, $type, $data) = @_;
3595
3596 my $idx = cf::face::find $name;
3597
3598 if ($idx) {
3599 delete $HASH{cf::face::get_csum $idx};
3600 } else {
3601 $idx = cf::face::alloc $name;
3602 }
3603
3604 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3605
3606 cf::face::set_type $idx, $type;
3607 cf::face::set_csum $idx, 0, $hash;
3608
3609 # we need to destroy the SV itself, not just modify it, as a running ix
3610 # might hold a reference to it: "delete" achieves that.
3611 delete $FOFS[0][$idx];
3612 delete $DATA[0][$idx];
3613 $DATA[0][$idx] = $data;
3614 $SIZE[0][$idx] = length $data;
3615 delete $META[$idx];
3616 $HASH{$hash} = $idx;#d#
3617
3618 $idx
3619 }
3620
3621 sub _get_data($$$) {
3622 my ($idx, $set, $cb) = @_;
3623
3624 if (defined $DATA[$set][$idx]) {
3625 $cb->($DATA[$set][$idx]);
3626 } elsif (my $fofs = $FOFS[$set][$idx]) {
3627 my $size = $SIZE[$set][$idx];
3628 my $buf;
3629 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3630 if ($_[0] == $size) {
3631 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3632 $cb->($buf);
3633 } else {
3634 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3635 }
3636 };
3637 } else {
3638 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3639 }
3640 }
3641
3642 # rather ineffient
3643 sub cf::face::get_data($;$) {
3644 my ($idx, $set) = @_;
3645
3646 _get_data $idx, $set, Coro::rouse_cb;
3647 Coro::rouse_wait
3648 }
3649
3650 sub cf::face::ix {
3651 my ($ns, $set, $idx, $pri) = @_;
3652
3653 _get_data $idx, $set, sub {
3654 $ns->ix_send ($idx, $pri, $_[0]);
3655 };
3656 }
3657}
3509 3658
3510sub load_facedata($) { 3659sub load_facedata($) {
3511 my ($path) = @_; 3660 my ($path) = @_;
3512 3661
3513 # HACK to clear player env face cache, we need some signal framework
3514 # for this (global event?)
3515 %ext::player_env::MUSIC_FACE_CACHE = ();
3516
3517 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3662 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3518 3663
3519 trace "loading facedata from $path\n"; 3664 trace "loading facedata from $path\n";
3520 3665
3521 my $facedata = decode_storable load_file $path; 3666 my $facedata = decode_storable load_file "$path/faceinfo";
3522 3667
3523 $facedata->{version} == 2 3668 $facedata->{version} == 2
3524 or cf::cleanup "$path: version mismatch, cannot proceed."; 3669 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3525 3670
3526 # patch in the exptable 3671 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3527 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]); 3672 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3528 $facedata->{resource}{"res/exp_table"} = { 3673
3529 type => FT_RSRC, 3674 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3530 data => $exp_table, 3675
3531 hash => (Digest::MD5::md5 $exp_table), 3676 # BEGIN ATOMIC
3532 }; 3677 # from here on, everything must be atomic - no thread switch allowed
3533 cf::cede_to_tick; 3678 my $t1 = EV::time;
3534 3679
3535 { 3680 {
3536 my $faces = $facedata->{faceinfo}; 3681 my $faces = $facedata->{faceinfo};
3537 3682
3538 while (my ($face, $info) = each %$faces) { 3683 for my $face (sort keys %$faces) {
3684 my $info = $faces->{$face};
3539 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3685 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3540 3686
3541 cf::face::set_visibility $idx, $info->{visibility}; 3687 cf::face::set_visibility $idx, $info->{visibility};
3542 cf::face::set_magicmap $idx, $info->{magicmap}; 3688 cf::face::set_magicmap $idx, $info->{magicmap};
3543 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3689 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3544 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3690 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3545 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ; 3691 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3546 $FACEHASH{$info->{hash64}} = $idx;#d# 3692 $cf::face::HASH{$info->{hash64}} = $idx;
3547 3693 delete $cf::face::META[$idx];
3548 cf::cede_to_tick;
3549 } 3694 }
3550 3695
3551 while (my ($face, $info) = each %$faces) { 3696 while (my ($face, $info) = each %$faces) {
3552 next unless $info->{smooth}; 3697 next unless $info->{smooth};
3553 3698
… …
3558 cf::face::set_smooth $idx, $smooth; 3703 cf::face::set_smooth $idx, $smooth;
3559 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3704 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3560 } else { 3705 } else {
3561 error "smooth face '$info->{smooth}' not found for face '$face'"; 3706 error "smooth face '$info->{smooth}' not found for face '$face'";
3562 } 3707 }
3563
3564 cf::cede_to_tick;
3565 } 3708 }
3566 } 3709 }
3567 3710
3568 { 3711 {
3569 my $anims = $facedata->{animinfo}; 3712 my $anims = $facedata->{animinfo};
3570 3713
3571 while (my ($anim, $info) = each %$anims) { 3714 while (my ($anim, $info) = each %$anims) {
3572 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3715 cf::anim::set $anim, $info->{frames}, $info->{facings};
3573 cf::cede_to_tick;
3574 } 3716 }
3575 3717
3576 cf::anim::invalidate_all; # d'oh 3718 cf::anim::invalidate_all; # d'oh
3577 } 3719 }
3578 3720
… …
3582 while (my ($name, $info) = each %$res) { 3724 while (my ($name, $info) = each %$res) {
3583 if (defined (my $type = $info->{type})) { 3725 if (defined (my $type = $info->{type})) {
3584 # TODO: different hash - must free and use new index, or cache ixface data queue 3726 # TODO: different hash - must free and use new index, or cache ixface data queue
3585 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3727 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3586 3728
3587 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3588 cf::face::set_type $idx, $type; 3729 cf::face::set_type $idx, $type;
3730 cf::face::set_csum $idx, 0, $info->{hash};
3731 $cf::face::SIZE[0][$idx] = $info->{size};
3732 $cf::face::FOFS[0][$idx] = $info->{fofs};
3589 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already 3733 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3590 $FACEHASH{$info->{hash}} = $idx;#d# 3734 $cf::face::HASH{$info->{hash}} = $idx;
3591 } else { 3735 } else {
3592# $RESOURCE{$name} = $info; # unused 3736# $RESOURCE{$name} = $info; # unused
3593 } 3737 }
3594
3595 cf::cede_to_tick;
3596 } 3738 }
3597 } 3739 }
3740
3741 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3742
3743 # HACK to clear player env face cache, we need some signal framework
3744 # for this (global event?)
3745 %ext::player_env::MUSIC_FACE_CACHE = ();
3746
3747 # END ATOMIC
3748
3749 cf::debug "facedata atomic update time ", EV::time - $t1;
3598 3750
3599 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3751 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3752
3753 aio_close $fh if $fh; # close old facedata
3600 3754
3601 1 3755 1
3602} 3756}
3603 3757
3604register_exticmd fx_want => sub { 3758register_exticmd fx_want => sub {
… …
3615 my $status = load_resource_file_ $_[0]; 3769 my $status = load_resource_file_ $_[0];
3616 get_slot 0.1, 100; 3770 get_slot 0.1, 100;
3617 cf::arch::commit_load; 3771 cf::arch::commit_load;
3618 3772
3619 $status 3773 $status
3774}
3775
3776sub reload_exp_table {
3777 _reload_exp_table;
3778
3779 cf::face::set
3780 "res/exp_table" => FT_RSRC,
3781 JSON::XS->new->utf8->canonical->encode (
3782 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3783 );
3784}
3785
3786sub reload_materials {
3787 _reload_materials;
3620} 3788}
3621 3789
3622sub reload_regions { 3790sub reload_regions {
3623 # HACK to clear player env face cache, we need some signal framework 3791 # HACK to clear player env face cache, we need some signal framework
3624 # for this (global event?) 3792 # for this (global event?)
… …
3632 if exists $_->{match}; 3800 if exists $_->{match};
3633 } 3801 }
3634} 3802}
3635 3803
3636sub reload_facedata { 3804sub reload_facedata {
3637 load_facedata "$DATADIR/facedata" 3805 load_facedata $DATADIR
3638 or die "unable to load facedata\n"; 3806 or die "unable to load facedata\n";
3639} 3807}
3640 3808
3641sub reload_archetypes { 3809sub reload_archetypes {
3642 load_resource_file "$DATADIR/archetypes" 3810 load_resource_file "$DATADIR/archetypes"
3643 or die "unable to load archetypes\n"; 3811 or die "unable to load archetypes\n";
3812
3813 cf::face::set
3814 "res/skill_info" => FT_RSRC,
3815 JSON::XS->new->utf8->canonical->encode (
3816 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3817 );
3818
3819 cf::face::set
3820 "res/spell_paths" => FT_RSRC,
3821 JSON::XS->new->utf8->canonical->encode (
3822 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3823 );
3824
3825 # command completion
3826 my @commands;
3827
3828 for (0..cf::arch::skillvec_size - 1) {
3829 my $skill = cf::arch::skillvec $_;
3830 my $name = $skill->name;
3831 my $flags = cf::skill_flags $skill->subtype;
3832
3833 push @commands, "ready_skill $name" if $flags & (SF_COMBAT | SF_RANGED | SF_GRACE);
3834 push @commands, "use_skill $name" if $flags & (SF_USE | SF_AUTARK | SF_GRACE);
3835 }
3836
3837 cf::client::set_command_face skill => \@commands;
3644} 3838}
3645 3839
3646sub reload_treasures { 3840sub reload_treasures {
3647 load_resource_file "$DATADIR/treasures" 3841 load_resource_file "$DATADIR/treasures"
3648 or die "unable to load treasurelists\n"; 3842 or die "unable to load treasurelists\n";
… …
3669} 3863}
3670 3864
3671sub reload_resources { 3865sub reload_resources {
3672 trace "reloading resource files...\n"; 3866 trace "reloading resource files...\n";
3673 3867
3674 reload_exp_table;
3675 reload_materials; 3868 reload_materials;
3676 reload_facedata; 3869 reload_facedata;
3870 reload_exp_table;
3677 reload_sound; 3871 reload_sound;
3678 reload_archetypes; 3872 reload_archetypes;
3679 reload_regions; 3873 reload_regions;
3680 reload_treasures; 3874 reload_treasures;
3681 3875
… …
3721 seek $fh, 0, 0; 3915 seek $fh, 0, 0;
3722 print $fh $$; 3916 print $fh $$;
3723} 3917}
3724 3918
3725sub main_loop { 3919sub main_loop {
3726 trace "EV::loop starting\n"; 3920 trace "EV::run starting\n";
3727 if (1) { 3921 if (1) {
3728 EV::loop; 3922 EV::run;
3729 } 3923 }
3730 trace "EV::loop returned\n"; 3924 trace "EV::run returned\n";
3731 goto &main_loop unless $REALLY_UNLOOP; 3925 goto &main_loop unless $REALLY_UNLOOP;
3732} 3926}
3733 3927
3734sub main { 3928sub main {
3735 cf::init_globals; # initialise logging 3929 cf::init_globals; # initialise logging
… …
3740 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3934 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3741 3935
3742 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3936 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3743 3937
3744 # we must not ever block the main coroutine 3938 # we must not ever block the main coroutine
3745 local $Coro::idle = sub { 3939 $Coro::idle = sub {
3746 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3940 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3747 (async { 3941 (async {
3748 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3942 $Coro::current->{desc} = "IDLE BUG HANDLER";
3749 EV::loop EV::LOOP_ONESHOT; 3943 EV::run EV::RUN_ONCE;
3750 })->prio (Coro::PRIO_MAX); 3944 })->prio (Coro::PRIO_MAX);
3751 }; 3945 };
3752 3946
3753 evthread_start IO::AIO::poll_fileno; 3947 evthread_start IO::AIO::poll_fileno;
3754 3948
3755 cf::sync_job { 3949 cf::sync_job {
3756 cf::incloader::init (); 3950 cf::incloader::init ();
3951
3952 db_init;
3757 3953
3758 cf::init_anim; 3954 cf::init_anim;
3759 cf::init_attackmess; 3955 cf::init_attackmess;
3760 cf::init_dynamic; 3956 cf::init_dynamic;
3761 3957
3762 cf::load_settings; 3958 cf::load_settings;
3763 3959
3764 reload_resources; 3960 reload_resources;
3765 reload_config; 3961 reload_config;
3766 db_init;
3767 3962
3768 cf::init_uuid; 3963 cf::init_uuid;
3769 cf::init_signals; 3964 cf::init_signals;
3770 cf::init_skills; 3965 cf::init_skills;
3771 3966
… …
4196 } 4391 }
4197} 4392}
4198 4393
4199{ 4394{
4200 # configure BDB 4395 # configure BDB
4396 info "initialising database";
4201 4397
4202 BDB::min_parallel 16; 4398 BDB::min_parallel 16;
4203 BDB::max_poll_reqs $TICK * 0.1; 4399 BDB::max_poll_reqs $TICK * 0.1;
4204 #$AnyEvent::BDB::WATCHER->priority (1); 4400 #$AnyEvent::BDB::WATCHER->priority (1);
4205 4401
… …
4234 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4430 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4235 }; 4431 };
4236 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4432 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4237 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4433 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4238 }; 4434 };
4435
4436 info "database initialised";
4239} 4437}
4240 4438
4241{ 4439{
4242 # configure IO::AIO 4440 # configure IO::AIO
4243 4441
4442 info "initialising aio";
4244 IO::AIO::min_parallel 8; 4443 IO::AIO::min_parallel 8;
4245 IO::AIO::max_poll_time $TICK * 0.1; 4444 IO::AIO::max_poll_time $TICK * 0.1;
4246 undef $AnyEvent::AIO::WATCHER; 4445 undef $AnyEvent::AIO::WATCHER;
4446 info "aio initialised";
4247} 4447}
4248 4448
4249our $_log_backtrace; 4449our $_log_backtrace;
4250our $_log_backtrace_last; 4450our $_log_backtrace_last;
4251 4451

Diff Legend

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