… | |
… | |
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 IO::AIO (); |
62 | use IO::AIO (); |
63 | use Time::HiRes; |
|
|
64 | use Compress::LZF; |
63 | use Compress::LZF; |
65 | use Digest::MD5 (); |
64 | use Digest::MD5 (); |
66 | |
65 | |
67 | AnyEvent::detect; |
66 | AnyEvent::detect; |
68 | |
67 | |
… | |
… | |
252 | Configuration for the server, loaded from C</etc/deliantra-server/config>, or |
251 | Configuration for the server, loaded from C</etc/deliantra-server/config>, or |
253 | from wherever your confdir points to. |
252 | from wherever your confdir points to. |
254 | |
253 | |
255 | =item cf::wait_for_tick, cf::wait_for_tick_begin |
254 | =item cf::wait_for_tick, cf::wait_for_tick_begin |
256 | |
255 | |
257 | These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only |
256 | These are functions that inhibit the current coroutine one tick. |
258 | returns directly I<after> the tick processing (and consequently, can only wake one thread |
257 | cf::wait_for_tick_begin only returns directly I<after> the tick |
|
|
258 | processing (and consequently, can only wake one thread per tick), while |
259 | per tick), while cf::wait_for_tick wakes up all waiters after tick processing. |
259 | cf::wait_for_tick wakes up all waiters after tick processing. |
260 | |
260 | |
261 | Note that cf::Wait_for_tick will immediately return when the server is not |
261 | Note that cf::wait_for_tick will immediately return when the server is not |
262 | ticking, making it suitable for small pauses in threads that need to run |
262 | ticking, making it suitable for small pauses in threads that need to run |
263 | when the server is paused. If that is not applicable (i.e. you I<really> |
263 | when the server is paused. If that is not applicable (i.e. you I<really> |
264 | want to wait, use C<$cf::WAIT_FOR_TICK>). |
264 | want to wait, use C<$cf::WAIT_FOR_TICK>). |
265 | |
265 | |
266 | =item $cf::WAIT_FOR_TICK |
266 | =item $cf::WAIT_FOR_TICK |
… | |
… | |
573 | Allocate $time seconds of blocking CPU time at priority C<$priority> |
573 | Allocate $time seconds of blocking CPU time at priority C<$priority> |
574 | (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 |
575 | C<$time> seconds of cpu time till the next tick. The slot is only valid |
575 | C<$time> seconds of cpu time till the next tick. The slot is only valid |
576 | till the next cede. |
576 | till the next cede. |
577 | |
577 | |
578 | Background jobs should use a priority les than zero, interactive jobs |
578 | Background jobs should use a priority less than zero, interactive jobs |
579 | should use 100 or more. |
579 | should use 100 or more. |
580 | |
580 | |
581 | The optional C<$name> can be used to identify the job to run. It might be |
581 | The optional C<$name> can be used to identify the job to run. It might be |
582 | used for statistical purposes and should identify the same time-class. |
582 | used for statistical purposes and should identify the same time-class. |
583 | |
583 | |
… | |
… | |
596 | my $signal = new Coro::Signal; |
596 | my $signal = new Coro::Signal; |
597 | my $busy; |
597 | my $busy; |
598 | |
598 | |
599 | while () { |
599 | while () { |
600 | next_job: |
600 | next_job: |
|
|
601 | |
|
|
602 | Coro::cede; |
601 | |
603 | |
602 | my $avail = cf::till_tick; |
604 | my $avail = cf::till_tick; |
603 | |
605 | |
604 | for (0 .. $#SLOT_QUEUE) { |
606 | for (0 .. $#SLOT_QUEUE) { |
605 | if ($SLOT_QUEUE[$_][0] <= $avail) { |
607 | if ($SLOT_QUEUE[$_][0] <= $avail) { |
606 | $busy = 0; |
608 | $busy = 0; |
607 | my $job = splice @SLOT_QUEUE, $_, 1, (); |
609 | my $job = splice @SLOT_QUEUE, $_, 1, (); |
608 | $job->[2]->send; |
610 | $job->[2]->send; |
609 | Coro::cede; |
|
|
610 | goto next_job; |
611 | goto next_job; |
611 | } else { |
612 | } else { |
612 | $SLOT_QUEUE[$_][0] *= $SLOT_DECAY; |
613 | $SLOT_QUEUE[$_][0] *= $SLOT_DECAY; |
613 | } |
614 | } |
614 | } |
615 | } |
615 | |
616 | |
616 | if (@SLOT_QUEUE) { |
617 | if (@SLOT_QUEUE) { |
617 | # we do not use wait_for_tick() as it returns immediately when tick is inactive |
618 | wait_for_tick; |
618 | $WAIT_FOR_TICK->wait; |
|
|
619 | } else { |
619 | } else { |
620 | $busy = 0; |
620 | $busy = 0; |
621 | Coro::schedule; |
621 | Coro::schedule; |
622 | } |
622 | } |
623 | } |
623 | } |
… | |
… | |
687 | |
687 | |
688 | while ($busy) { |
688 | while ($busy) { |
689 | if (Coro::nready) { |
689 | if (Coro::nready) { |
690 | Coro::cede_notself; |
690 | Coro::cede_notself; |
691 | } else { |
691 | } else { |
692 | EV::loop EV::LOOP_ONESHOT; |
692 | EV::run EV::RUN_ONCE; |
693 | } |
693 | } |
694 | } |
694 | } |
695 | |
695 | |
696 | my $time = AE::time - $time; |
696 | my $time = AE::time - $time; |
697 | |
697 | |
… | |
… | |
738 | reset_signals; |
738 | reset_signals; |
739 | } |
739 | } |
740 | |
740 | |
741 | sub fork_call(&@) { |
741 | sub fork_call(&@) { |
742 | my ($cb, @args) = @_; |
742 | my ($cb, @args) = @_; |
743 | |
|
|
744 | # we seemingly have to make a local copy of the whole thing, |
|
|
745 | # otherwise perl prematurely frees the stuff :/ |
|
|
746 | # TODO: investigate and fix (likely this will be rather laborious) |
|
|
747 | |
743 | |
748 | my @res = Coro::Util::fork_eval { |
744 | my @res = Coro::Util::fork_eval { |
749 | cf::post_fork; |
745 | cf::post_fork; |
750 | &$cb |
746 | &$cb |
751 | } @args; |
747 | } @args; |
… | |
… | |
901 | |
897 | |
902 | return db_get cache => "$id/data"; |
898 | return db_get cache => "$id/data"; |
903 | } |
899 | } |
904 | } |
900 | } |
905 | |
901 | |
906 | my $t1 = Time::HiRes::time; |
902 | my $t1 = EV::time; |
907 | my $data = $process->(\@data); |
903 | my $data = $process->(\@data); |
908 | my $t2 = Time::HiRes::time; |
904 | my $t2 = EV::time; |
909 | |
905 | |
910 | info "cache: '$id' processed in ", $t2 - $t1, "s\n"; |
906 | info "cache: '$id' processed in ", $t2 - $t1, "s\n"; |
911 | |
907 | |
912 | db_put cache => "$id/data", $data; |
908 | db_put cache => "$id/data", $data; |
913 | db_put cache => "$id/md5" , $md5; |
909 | db_put cache => "$id/md5" , $md5; |
… | |
… | |
2388 | |
2384 | |
2389 | $MAP_PREFETCHER ||= cf::async { |
2385 | $MAP_PREFETCHER ||= cf::async { |
2390 | $Coro::current->{desc} = "map prefetcher"; |
2386 | $Coro::current->{desc} = "map prefetcher"; |
2391 | |
2387 | |
2392 | while (%MAP_PREFETCH) { |
2388 | while (%MAP_PREFETCH) { |
2393 | while (my ($k, $v) = each %MAP_PREFETCH) { |
2389 | for my $k (keys %MAP_PREFETCH) { |
2394 | if (my $map = find $k) { |
2390 | if (my $map = find $k) { |
2395 | $map->load if $v; |
2391 | $map->load if $v; |
2396 | } |
2392 | } |
2397 | |
2393 | |
2398 | delete $MAP_PREFETCH{$k}; |
2394 | delete $MAP_PREFETCH{$k}; |
… | |
… | |
2654 | |
2650 | |
2655 | Creates and returns a persistent reference to an object that can be stored as a string. |
2651 | Creates and returns a persistent reference to an object that can be stored as a string. |
2656 | |
2652 | |
2657 | =item $ob = cf::object::deref ($refstring) |
2653 | =item $ob = cf::object::deref ($refstring) |
2658 | |
2654 | |
2659 | returns the objetc referenced by refstring. may return undef when it cnanot find the object, |
2655 | returns the objetc referenced by refstring. may return undef when it cannot find the object, |
2660 | even if the object actually exists. May block. |
2656 | even if the object actually exists. May block. |
2661 | |
2657 | |
2662 | =cut |
2658 | =cut |
2663 | |
2659 | |
2664 | sub deref { |
2660 | sub deref { |
… | |
… | |
2746 | =item $player_object->may ("access") |
2742 | =item $player_object->may ("access") |
2747 | |
2743 | |
2748 | Returns wether the given player is authorized to access resource "access" |
2744 | Returns wether the given player is authorized to access resource "access" |
2749 | (e.g. "command_wizcast"). |
2745 | (e.g. "command_wizcast"). |
2750 | |
2746 | |
|
|
2747 | This is implemented by checking a config setting of C<may_access> where |
|
|
2748 | C<access> is replaced by the access string. The following alternatives are |
|
|
2749 | possible (and are tested in order): |
|
|
2750 | |
|
|
2751 | =over 4 |
|
|
2752 | |
|
|
2753 | =item * Player is DM |
|
|
2754 | |
|
|
2755 | The request will succeed. |
|
|
2756 | |
|
|
2757 | =item * may_access is an array reference |
|
|
2758 | |
|
|
2759 | If either the player nickname or UUID is in the array, the request will |
|
|
2760 | succeed, otherwise it will fail. |
|
|
2761 | |
|
|
2762 | =item * may_access is a true value |
|
|
2763 | |
|
|
2764 | The request will succeed. |
|
|
2765 | |
|
|
2766 | =item * may_access is missing or false |
|
|
2767 | |
|
|
2768 | The request will fail. |
|
|
2769 | |
|
|
2770 | =back |
|
|
2771 | |
2751 | =cut |
2772 | =cut |
2752 | |
2773 | |
2753 | sub cf::object::player::may { |
2774 | sub cf::object::player::may { |
2754 | my ($self, $access) = @_; |
2775 | my ($self, $access) = @_; |
2755 | |
2776 | |
2756 | $self->flag (cf::FLAG_WIZ) || |
2777 | $self->flag (cf::FLAG_WIZ) || |
2757 | (ref $cf::CFG{"may_$access"} |
2778 | (ref $cf::CFG{"may_$access"} |
2758 | ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} |
2779 | ? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}} |
2759 | : $cf::CFG{"may_$access"}) |
2780 | : $cf::CFG{"may_$access"}) |
2760 | } |
2781 | } |
2761 | |
2782 | |
2762 | =item $player_object->enter_link |
2783 | =item $player_object->enter_link |
2763 | |
2784 | |
… | |
… | |
2766 | The player should be reasonably safe there for short amounts of time (e.g. |
2787 | The player should be reasonably safe there for short amounts of time (e.g. |
2767 | for loading a map). You I<MUST> call C<leave_link> as soon as possible, |
2788 | for loading a map). You I<MUST> call C<leave_link> as soon as possible, |
2768 | though, as the player cannot control the character while it is on the link |
2789 | though, as the player cannot control the character while it is on the link |
2769 | map. |
2790 | map. |
2770 | |
2791 | |
2771 | Will never block. |
2792 | This method will never block, which is the whole reaosn for it's |
|
|
2793 | existance: you can I<always> put a player onto the link map, which is the |
|
|
2794 | only place to put objects that is guaranteed to exist. |
|
|
2795 | |
|
|
2796 | A typical usage pattern is to call C<enter_link> synchronously from the |
|
|
2797 | server, then start a new thread, do your blocking stuff there and then |
|
|
2798 | call C<leave_link> from that thread. |
2772 | |
2799 | |
2773 | =item $player_object->leave_link ($map, $x, $y) |
2800 | =item $player_object->leave_link ($map, $x, $y) |
2774 | |
2801 | |
2775 | Moves the player out of the special C<{link}> map onto the specified |
2802 | Moves the player out of the special C<{link}> map onto the specified |
2776 | map. If the map is not valid (or omitted), the player will be moved back |
2803 | map. If the map is not valid (or omitted), the player will be moved back |
… | |
… | |
3046 | |
3073 | |
3047 | =head3 cf::client |
3074 | =head3 cf::client |
3048 | |
3075 | |
3049 | =over 4 |
3076 | =over 4 |
3050 | |
3077 | |
3051 | =item $client->send_drawinfo ($text, $flags) |
|
|
3052 | |
|
|
3053 | Sends a drawinfo packet to the client. Circumvents output buffering so |
|
|
3054 | should not be used under normal circumstances. |
|
|
3055 | |
|
|
3056 | =cut |
|
|
3057 | |
|
|
3058 | sub cf::client::send_drawinfo { |
|
|
3059 | my ($self, $text, $flags) = @_; |
|
|
3060 | |
|
|
3061 | utf8::encode $text; |
|
|
3062 | $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); |
|
|
3063 | } |
|
|
3064 | |
|
|
3065 | =item $client->send_big_packet ($pkt) |
3078 | =item $client->send_big_packet ($pkt) |
3066 | |
3079 | |
3067 | Like C<send_packet>, but tries to compress large packets, and fragments |
3080 | Like C<send_packet>, but tries to compress large packets, and fragments |
3068 | them as required. |
3081 | them as required. |
3069 | |
3082 | |
… | |
… | |
3087 | $self->send_packet ($pkt); |
3100 | $self->send_packet ($pkt); |
3088 | } |
3101 | } |
3089 | |
3102 | |
3090 | =item $client->send_msg ($channel, $msg, $color, [extra...]) |
3103 | =item $client->send_msg ($channel, $msg, $color, [extra...]) |
3091 | |
3104 | |
3092 | Send a drawinfo or msg packet to the client, formatting the msg for the |
3105 | Send a msg packet to the client, formatting the msg for the client if |
3093 | client if neccessary. C<$type> should be a string identifying the type of |
3106 | necessary. C<$type> should be a string identifying the type of the |
3094 | the message, with C<log> being the default. If C<$color> is negative, suppress |
3107 | message, with C<log> being the default. If C<$color> is negative, suppress |
3095 | the message unless the client supports the msg packet. |
3108 | the message unless the client supports the msg packet. |
3096 | |
3109 | |
3097 | =cut |
3110 | =cut |
3098 | |
3111 | |
3099 | # non-persistent channels (usually the info channel) |
3112 | # non-persistent channels (usually the info channel) |
… | |
… | |
3204 | id => "death", |
3217 | id => "death", |
3205 | title => "Death", |
3218 | title => "Death", |
3206 | reply => undef, |
3219 | reply => undef, |
3207 | tooltip => "Reason for and more info about your most recent death", |
3220 | tooltip => "Reason for and more info about your most recent death", |
3208 | }, |
3221 | }, |
|
|
3222 | "c/fatal" => { |
|
|
3223 | id => "fatal", |
|
|
3224 | title => "Fatal Error", |
|
|
3225 | reply => undef, |
|
|
3226 | tooltip => "Reason for the server disconnect", |
|
|
3227 | }, |
3209 | "c/say" => $SAY_CHANNEL, |
3228 | "c/say" => $SAY_CHANNEL, |
3210 | "c/chat" => $CHAT_CHANNEL, |
3229 | "c/chat" => $CHAT_CHANNEL, |
3211 | ); |
3230 | ); |
3212 | |
3231 | |
3213 | sub cf::client::send_msg { |
3232 | sub cf::client::send_msg { |
… | |
… | |
3286 | |
3305 | |
3287 | $self->send_packet ($self->{query_queue}[0][0]) |
3306 | $self->send_packet ($self->{query_queue}[0][0]) |
3288 | if @{ $self->{query_queue} } == 1; |
3307 | if @{ $self->{query_queue} } == 1; |
3289 | |
3308 | |
3290 | 1 |
3309 | 1 |
|
|
3310 | } |
|
|
3311 | |
|
|
3312 | =item $client->update_command_faces |
|
|
3313 | |
|
|
3314 | =cut |
|
|
3315 | |
|
|
3316 | our %COMMAND_FACE; |
|
|
3317 | |
|
|
3318 | sub 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 | |
|
|
3340 | sub 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; |
3291 | } |
3349 | } |
3292 | |
3350 | |
3293 | cf::client->attach ( |
3351 | cf::client->attach ( |
3294 | on_connect => sub { |
3352 | on_connect => sub { |
3295 | my ($ns) = @_; |
3353 | my ($ns) = @_; |
… | |
… | |
3519 | =cut |
3577 | =cut |
3520 | |
3578 | |
3521 | ############################################################################# |
3579 | ############################################################################# |
3522 | # the server's init and main functions |
3580 | # the server's init and main functions |
3523 | |
3581 | |
3524 | our %FACEHASH; # hash => idx, #d# HACK for http server |
3582 | { |
|
|
3583 | package cf::face; |
3525 | |
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 | |
3526 | # internal api, not fianlised |
3592 | # internal api, not finalised |
3527 | sub set_face { |
3593 | sub set { |
3528 | my ($name, $type, $data) = @_; |
3594 | my ($name, $type, $data) = @_; |
3529 | |
3595 | |
3530 | my $idx = cf::face::find $name; |
3596 | my $idx = cf::face::find $name; |
3531 | |
3597 | |
3532 | if ($idx) { |
3598 | if ($idx) { |
3533 | delete $FACEHASH{cf::face::get_chksum $idx}; |
3599 | delete $HASH{cf::face::get_csum $idx}; |
3534 | } else { |
3600 | } else { |
3535 | $idx = cf::face::alloc $name; |
3601 | $idx = cf::face::alloc $name; |
3536 | } |
3602 | } |
3537 | |
3603 | |
3538 | my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data; |
3604 | my $hash = cf::face::mangle_csum Digest::MD5::md5 $data; |
3539 | |
3605 | |
3540 | cf::face::set_type $idx, $type; |
3606 | cf::face::set_type $idx, $type; |
3541 | cf::face::set_data $idx, 0, $data, $hash; |
3607 | cf::face::set_csum $idx, 0, $hash; |
3542 | cf::face::set_meta $idx, $type & 1 ? undef : undef; |
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]; |
3543 | $FACEHASH{$hash} = $idx;#d# |
3616 | $HASH{$hash} = $idx;#d# |
3544 | |
3617 | |
3545 | $idx |
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 | } |
3546 | } |
3657 | } |
3547 | |
3658 | |
3548 | sub load_facedata($) { |
3659 | sub load_facedata($) { |
3549 | my ($path) = @_; |
3660 | my ($path) = @_; |
3550 | |
3661 | |
3551 | # HACK to clear player env face cache, we need some signal framework |
|
|
3552 | # for this (global event?) |
|
|
3553 | %ext::player_env::MUSIC_FACE_CACHE = (); |
|
|
3554 | |
|
|
3555 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
3662 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
3556 | |
3663 | |
3557 | trace "loading facedata from $path\n"; |
3664 | trace "loading facedata from $path\n"; |
3558 | |
3665 | |
3559 | my $facedata = decode_storable load_file $path; |
3666 | my $facedata = decode_storable load_file "$path/faceinfo"; |
3560 | |
3667 | |
3561 | $facedata->{version} == 2 |
3668 | $facedata->{version} == 2 |
3562 | or cf::cleanup "$path: version mismatch, cannot proceed."; |
3669 | or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed."; |
3563 | |
3670 | |
3564 | cf::cede_to_tick; |
3671 | my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0 |
|
|
3672 | or cf::cleanup "$path/facedata: $!, cannot proceed."; |
|
|
3673 | |
|
|
3674 | get_slot 1, -100, "load_facedata"; # make sure we get a very big slot |
|
|
3675 | |
|
|
3676 | # BEGIN ATOMIC |
|
|
3677 | # from here on, everything must be atomic - no thread switch allowed |
|
|
3678 | my $t1 = EV::time; |
3565 | |
3679 | |
3566 | { |
3680 | { |
3567 | my $faces = $facedata->{faceinfo}; |
3681 | my $faces = $facedata->{faceinfo}; |
3568 | |
3682 | |
3569 | for my $face (sort keys %$faces) { |
3683 | for my $face (sort keys %$faces) { |
3570 | my $info = $faces->{$face}; |
3684 | my $info = $faces->{$face}; |
3571 | my $idx = (cf::face::find $face) || cf::face::alloc $face; |
3685 | my $idx = (cf::face::find $face) || cf::face::alloc $face; |
3572 | |
3686 | |
3573 | cf::face::set_visibility $idx, $info->{visibility}; |
3687 | cf::face::set_visibility $idx, $info->{visibility}; |
3574 | cf::face::set_magicmap $idx, $info->{magicmap}; |
3688 | cf::face::set_magicmap $idx, $info->{magicmap}; |
3575 | 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}; |
3576 | 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}; |
3577 | 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}; |
3578 | $FACEHASH{$info->{hash64}} = $idx;#d# |
3692 | $cf::face::HASH{$info->{hash64}} = $idx; |
3579 | |
3693 | delete $cf::face::META[$idx]; |
3580 | cf::cede_to_tick; |
|
|
3581 | } |
3694 | } |
3582 | |
3695 | |
3583 | while (my ($face, $info) = each %$faces) { |
3696 | while (my ($face, $info) = each %$faces) { |
3584 | next unless $info->{smooth}; |
3697 | next unless $info->{smooth}; |
3585 | |
3698 | |
… | |
… | |
3590 | cf::face::set_smooth $idx, $smooth; |
3703 | cf::face::set_smooth $idx, $smooth; |
3591 | cf::face::set_smoothlevel $idx, $info->{smoothlevel}; |
3704 | cf::face::set_smoothlevel $idx, $info->{smoothlevel}; |
3592 | } else { |
3705 | } else { |
3593 | error "smooth face '$info->{smooth}' not found for face '$face'"; |
3706 | error "smooth face '$info->{smooth}' not found for face '$face'"; |
3594 | } |
3707 | } |
3595 | |
|
|
3596 | cf::cede_to_tick; |
|
|
3597 | } |
3708 | } |
3598 | } |
3709 | } |
3599 | |
3710 | |
3600 | { |
3711 | { |
3601 | my $anims = $facedata->{animinfo}; |
3712 | my $anims = $facedata->{animinfo}; |
3602 | |
3713 | |
3603 | while (my ($anim, $info) = each %$anims) { |
3714 | while (my ($anim, $info) = each %$anims) { |
3604 | cf::anim::set $anim, $info->{frames}, $info->{facings}; |
3715 | cf::anim::set $anim, $info->{frames}, $info->{facings}; |
3605 | cf::cede_to_tick; |
|
|
3606 | } |
3716 | } |
3607 | |
3717 | |
3608 | cf::anim::invalidate_all; # d'oh |
3718 | cf::anim::invalidate_all; # d'oh |
3609 | } |
3719 | } |
3610 | |
3720 | |
… | |
… | |
3615 | if (defined (my $type = $info->{type})) { |
3725 | if (defined (my $type = $info->{type})) { |
3616 | # 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 |
3617 | my $idx = (cf::face::find $name) || cf::face::alloc $name; |
3727 | my $idx = (cf::face::find $name) || cf::face::alloc $name; |
3618 | |
3728 | |
3619 | cf::face::set_type $idx, $type; |
3729 | cf::face::set_type $idx, $type; |
3620 | cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; |
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}; |
3621 | 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 |
3622 | $FACEHASH{$info->{hash}} = $idx;#d# |
3734 | $cf::face::HASH{$info->{hash}} = $idx; |
3623 | } else { |
3735 | } else { |
3624 | # $RESOURCE{$name} = $info; # unused |
3736 | # $RESOURCE{$name} = $info; # unused |
3625 | } |
3737 | } |
3626 | |
|
|
3627 | cf::cede_to_tick; |
|
|
3628 | } |
3738 | } |
3629 | } |
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; |
3630 | |
3750 | |
3631 | 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 |
3632 | |
3754 | |
3633 | 1 |
3755 | 1 |
3634 | } |
3756 | } |
3635 | |
3757 | |
3636 | register_exticmd fx_want => sub { |
3758 | register_exticmd fx_want => sub { |
… | |
… | |
3652 | } |
3774 | } |
3653 | |
3775 | |
3654 | sub reload_exp_table { |
3776 | sub reload_exp_table { |
3655 | _reload_exp_table; |
3777 | _reload_exp_table; |
3656 | |
3778 | |
|
|
3779 | cf::face::set |
3657 | set_face "res/exp_table" => FT_RSRC, |
3780 | "res/exp_table" => FT_RSRC, |
3658 | JSON::XS->new->utf8->canonical->encode ( |
3781 | JSON::XS->new->utf8->canonical->encode ( |
3659 | [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level] |
3782 | [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level] |
3660 | ); |
3783 | ); |
3661 | } |
3784 | } |
3662 | |
3785 | |
3663 | sub reload_materials { |
3786 | sub reload_materials { |
3664 | _reload_materials; |
3787 | _reload_materials; |
3665 | } |
3788 | } |
… | |
… | |
3677 | if exists $_->{match}; |
3800 | if exists $_->{match}; |
3678 | } |
3801 | } |
3679 | } |
3802 | } |
3680 | |
3803 | |
3681 | sub reload_facedata { |
3804 | sub reload_facedata { |
3682 | load_facedata "$DATADIR/facedata" |
3805 | load_facedata $DATADIR |
3683 | or die "unable to load facedata\n"; |
3806 | or die "unable to load facedata\n"; |
3684 | } |
3807 | } |
3685 | |
3808 | |
3686 | sub reload_archetypes { |
3809 | sub reload_archetypes { |
3687 | load_resource_file "$DATADIR/archetypes" |
3810 | load_resource_file "$DATADIR/archetypes" |
3688 | or die "unable to load archetypes\n"; |
3811 | or die "unable to load archetypes\n"; |
3689 | |
3812 | |
|
|
3813 | cf::face::set |
3690 | set_face "res/skill_info" => FT_RSRC, |
3814 | "res/skill_info" => FT_RSRC, |
3691 | JSON::XS->new->utf8->canonical->encode ( |
3815 | JSON::XS->new->utf8->canonical->encode ( |
3692 | [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1] |
3816 | [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1] |
3693 | ); |
3817 | ); |
|
|
3818 | |
|
|
3819 | cf::face::set |
3694 | set_face "res/spell_paths" => FT_RSRC, |
3820 | "res/spell_paths" => FT_RSRC, |
3695 | JSON::XS->new->utf8->canonical->encode ( |
3821 | JSON::XS->new->utf8->canonical->encode ( |
3696 | [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1] |
3822 | [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1] |
3697 | ); |
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; |
3698 | } |
3838 | } |
3699 | |
3839 | |
3700 | sub reload_treasures { |
3840 | sub reload_treasures { |
3701 | load_resource_file "$DATADIR/treasures" |
3841 | load_resource_file "$DATADIR/treasures" |
3702 | or die "unable to load treasurelists\n"; |
3842 | or die "unable to load treasurelists\n"; |
… | |
… | |
3775 | seek $fh, 0, 0; |
3915 | seek $fh, 0, 0; |
3776 | print $fh $$; |
3916 | print $fh $$; |
3777 | } |
3917 | } |
3778 | |
3918 | |
3779 | sub main_loop { |
3919 | sub main_loop { |
3780 | trace "EV::loop starting\n"; |
3920 | trace "EV::run starting\n"; |
3781 | if (1) { |
3921 | if (1) { |
3782 | EV::loop; |
3922 | EV::run; |
3783 | } |
3923 | } |
3784 | trace "EV::loop returned\n"; |
3924 | trace "EV::run returned\n"; |
3785 | goto &main_loop unless $REALLY_UNLOOP; |
3925 | goto &main_loop unless $REALLY_UNLOOP; |
3786 | } |
3926 | } |
3787 | |
3927 | |
3788 | sub main { |
3928 | sub main { |
3789 | cf::init_globals; # initialise logging |
3929 | cf::init_globals; # initialise logging |
… | |
… | |
3798 | # we must not ever block the main coroutine |
3938 | # we must not ever block the main coroutine |
3799 | $Coro::idle = sub { |
3939 | $Coro::idle = sub { |
3800 | 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# |
3801 | (async { |
3941 | (async { |
3802 | $Coro::current->{desc} = "IDLE BUG HANDLER"; |
3942 | $Coro::current->{desc} = "IDLE BUG HANDLER"; |
3803 | EV::loop EV::LOOP_ONESHOT; |
3943 | EV::run EV::RUN_ONCE; |
3804 | })->prio (Coro::PRIO_MAX); |
3944 | })->prio (Coro::PRIO_MAX); |
3805 | }; |
3945 | }; |
3806 | |
3946 | |
3807 | evthread_start IO::AIO::poll_fileno; |
3947 | evthread_start IO::AIO::poll_fileno; |
3808 | |
3948 | |