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.608 by root, Sun Nov 18 09:53:57 2012 UTC vs.
Revision 1.620 by root, Tue Aug 11 02:13:26 2015 UTC

… …
597 my $busy; 597 my $busy;
598 598
599 while () { 599 while () {
600 next_job: 600 next_job:
601 601
602 Coro::cede;
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
… …
2384 2384
2385 $MAP_PREFETCHER ||= cf::async { 2385 $MAP_PREFETCHER ||= cf::async {
2386 $Coro::current->{desc} = "map prefetcher"; 2386 $Coro::current->{desc} = "map prefetcher";
2387 2387
2388 while (%MAP_PREFETCH) { 2388 while (%MAP_PREFETCH) {
2389 while (my ($k, $v) = each %MAP_PREFETCH) { 2389 for my $k (keys %MAP_PREFETCH) {
2390 if (my $map = find $k) { 2390 if (my $map = find $k) {
2391 $map->load if $v; 2391 $map->load if $MAP_PREFETCH{$k};
2392 } 2392 }
2393 2393
2394 delete $MAP_PREFETCH{$k}; 2394 delete $MAP_PREFETCH{$k};
2395 } 2395 }
2396 } 2396 }
… …
2742=item $player_object->may ("access") 2742=item $player_object->may ("access")
2743 2743
2744Returns wether the given player is authorized to access resource "access" 2744Returns wether the given player is authorized to access resource "access"
2745(e.g. "command_wizcast"). 2745(e.g. "command_wizcast").
2746 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
2747=cut 2772=cut
2748 2773
2749sub cf::object::player::may { 2774sub cf::object::player::may {
2750 my ($self, $access) = @_; 2775 my ($self, $access) = @_;
2751 2776
2752 $self->flag (cf::FLAG_WIZ) || 2777 $self->flag (cf::FLAG_WIZ) ||
2753 (ref $cf::CFG{"may_$access"} 2778 (ref $cf::CFG{"may_$access"}
2754 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 2779 ? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2755 : $cf::CFG{"may_$access"}) 2780 : $cf::CFG{"may_$access"})
2756} 2781}
2757 2782
2758=item $player_object->enter_link 2783=item $player_object->enter_link
2759 2784
… …
2762The 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.
2763for 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,
2764though, 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
2765map. 2790map.
2766 2791
2767Will 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.
2768 2799
2769=item $player_object->leave_link ($map, $x, $y) 2800=item $player_object->leave_link ($map, $x, $y)
2770 2801
2771Moves 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
2772map. 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
… …
3276 if @{ $self->{query_queue} } == 1; 3307 if @{ $self->{query_queue} } == 1;
3277 3308
3278 1 3309 1
3279} 3310}
3280 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;
3349}
3350
3281cf::client->attach ( 3351cf::client->attach (
3282 on_connect => sub { 3352 on_connect => sub {
3283 my ($ns) = @_; 3353 my ($ns) = @_;
3284 3354
3285 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed; 3355 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
… …
3749 cf::face::set 3819 cf::face::set
3750 "res/spell_paths" => FT_RSRC, 3820 "res/spell_paths" => FT_RSRC,
3751 JSON::XS->new->utf8->canonical->encode ( 3821 JSON::XS->new->utf8->canonical->encode (
3752 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1] 3822 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3753 ); 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;
3754} 3838}
3755 3839
3756sub reload_treasures { 3840sub reload_treasures {
3757 load_resource_file "$DATADIR/treasures" 3841 load_resource_file "$DATADIR/treasures"
3758 or die "unable to load treasurelists\n"; 3842 or die "unable to load treasurelists\n";
… …
3831 seek $fh, 0, 0; 3915 seek $fh, 0, 0;
3832 print $fh $$; 3916 print $fh $$;
3833} 3917}
3834 3918
3835sub main_loop { 3919sub main_loop {
3836 trace "EV::loop starting\n"; 3920 trace "EV::run starting\n";
3837 if (1) { 3921 if (1) {
3838 EV::loop; 3922 EV::run;
3839 } 3923 }
3840 trace "EV::loop returned\n"; 3924 trace "EV::run returned\n";
3841 goto &main_loop unless $REALLY_UNLOOP; 3925 goto &main_loop unless $REALLY_UNLOOP;
3842} 3926}
3843 3927
3844sub main { 3928sub main {
3845 cf::init_globals; # initialise logging 3929 cf::init_globals; # initialise logging
… …
3854 # we must not ever block the main coroutine 3938 # we must not ever block the main coroutine
3855 $Coro::idle = sub { 3939 $Coro::idle = sub {
3856 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#
3857 (async { 3941 (async {
3858 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3942 $Coro::current->{desc} = "IDLE BUG HANDLER";
3859 EV::loop EV::LOOP_ONESHOT; 3943 EV::run EV::RUN_ONCE;
3860 })->prio (Coro::PRIO_MAX); 3944 })->prio (Coro::PRIO_MAX);
3861 }; 3945 };
3862 3946
3863 evthread_start IO::AIO::poll_fileno; 3947 evthread_start IO::AIO::poll_fileno;
3864 3948

Diff Legend

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