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.599 by root, Sun Nov 11 04:29:11 2012 UTC vs.
Revision 1.613 by root, Mon Nov 26 13:12:16 2012 UTC

… …
573Allocate $time seconds of blocking CPU time at priority C<$priority> 573Allocate $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
575C<$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
576till the next cede. 576till the next cede.
577 577
578Background jobs should use a priority les than zero, interactive jobs 578Background jobs should use a priority less than zero, interactive jobs
579should use 100 or more. 579should use 100 or more.
580 580
581The 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
582used for statistical purposes and should identify the same time-class. 582used 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 }
… …
738 reset_signals; 738 reset_signals;
739} 739}
740 740
741sub fork_call(&@) { 741sub 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;
… …
2654 2650
2655Creates 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.
2656 2652
2657=item $ob = cf::object::deref ($refstring) 2653=item $ob = cf::object::deref ($refstring)
2658 2654
2659returns 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,
2660even if the object actually exists. May block. 2656even if the object actually exists. May block.
2661 2657
2662=cut 2658=cut
2663 2659
2664sub deref { 2660sub deref {
… …
3046 3042
3047=head3 cf::client 3043=head3 cf::client
3048 3044
3049=over 4 3045=over 4
3050 3046
3051=item $client->send_drawinfo ($text, $flags)
3052
3053Sends a drawinfo packet to the client. Circumvents output buffering so
3054should not be used under normal circumstances.
3055
3056=cut
3057
3058sub 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) 3047=item $client->send_big_packet ($pkt)
3066 3048
3067Like C<send_packet>, but tries to compress large packets, and fragments 3049Like C<send_packet>, but tries to compress large packets, and fragments
3068them as required. 3050them as required.
3069 3051
… …
3087 $self->send_packet ($pkt); 3069 $self->send_packet ($pkt);
3088} 3070}
3089 3071
3090=item $client->send_msg ($channel, $msg, $color, [extra...]) 3072=item $client->send_msg ($channel, $msg, $color, [extra...])
3091 3073
3092Send a drawinfo or msg packet to the client, formatting the msg for the 3074Send a msg packet to the client, formatting the msg for the client if
3093client if neccessary. C<$type> should be a string identifying the type of 3075necessary. C<$type> should be a string identifying the type of the
3094the message, with C<log> being the default. If C<$color> is negative, suppress 3076message, with C<log> being the default. If C<$color> is negative, suppress
3095the message unless the client supports the msg packet. 3077the message unless the client supports the msg packet.
3096 3078
3097=cut 3079=cut
3098 3080
3099# non-persistent channels (usually the info channel) 3081# non-persistent channels (usually the info channel)
… …
3204 id => "death", 3186 id => "death",
3205 title => "Death", 3187 title => "Death",
3206 reply => undef, 3188 reply => undef,
3207 tooltip => "Reason for and more info about your most recent death", 3189 tooltip => "Reason for and more info about your most recent death",
3208 }, 3190 },
3191 "c/fatal" => {
3192 id => "fatal",
3193 title => "Fatal Error",
3194 reply => undef,
3195 tooltip => "Reason for the server disconnect",
3196 },
3209 "c/say" => $SAY_CHANNEL, 3197 "c/say" => $SAY_CHANNEL,
3210 "c/chat" => $CHAT_CHANNEL, 3198 "c/chat" => $CHAT_CHANNEL,
3211); 3199);
3212 3200
3213sub cf::client::send_msg { 3201sub cf::client::send_msg {
… …
3286 3274
3287 $self->send_packet ($self->{query_queue}[0][0]) 3275 $self->send_packet ($self->{query_queue}[0][0])
3288 if @{ $self->{query_queue} } == 1; 3276 if @{ $self->{query_queue} } == 1;
3289 3277
3290 1 3278 1
3279}
3280
3281=item $client->update_command_faces
3282
3283=cut
3284
3285our %COMMAND_FACE;
3286
3287sub cf::client::update_command_faces {
3288 my ($self) = @_;
3289
3290 my @faces = grep $_,
3291 $COMMAND_FACE{preferred},
3292 $COMMAND_FACE{standard},
3293 $COMMAND_FACE{skill},
3294 $self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
3295 $COMMAND_FACE{emote},
3296 ;
3297
3298 $self->send_face ($_)
3299 for @faces;
3300 $self->flush_fx;
3301
3302 $self->ext_msg (command_list => @faces);
3303}
3304
3305=item cf::client::set_command_face $type, $commands
3306
3307=cut
3308
3309sub cf::client::set_command_face {
3310 my ($type, $list) = @_;
3311
3312 my $idx = &cf::face::set ( #d# ugly forward reference
3313 "command_list/$type" => cf::FT_RSRC,
3314 JSON::XS->new->utf8->encode ([ sort @$list ])
3315 );
3316
3317 $COMMAND_FACE{$type} = $idx;
3291} 3318}
3292 3319
3293cf::client->attach ( 3320cf::client->attach (
3294 on_connect => sub { 3321 on_connect => sub {
3295 my ($ns) = @_; 3322 my ($ns) = @_;
… …
3519=cut 3546=cut
3520 3547
3521############################################################################# 3548#############################################################################
3522# the server's init and main functions 3549# the server's init and main functions
3523 3550
3524our %FACEHASH; # hash => idx, #d# HACK for http server 3551{
3525our @FACEDATA; # dynamically-created facedata 3552 package cf::face;
3526 3553
3554 our %HASH; # hash => idx
3555 our @DATA; # dynamically-created facedata, only faceste 0 used
3556 our @FOFS; # file offset, if > 0
3557 our @SIZE; # size of face, in octets
3558 our @META; # meta hash of face, if any
3559 our $DATAFH; # facedata filehandle
3560
3527# internal api, not fianlised 3561 # internal api, not finalised
3528sub set_face { 3562 sub set {
3529 my ($name, $type, $data) = @_; 3563 my ($name, $type, $data) = @_;
3530 3564
3531 my $idx = cf::face::find $name; 3565 my $idx = cf::face::find $name;
3532 3566
3533 if ($idx) { 3567 if ($idx) {
3534 delete $FACEHASH{cf::face::get_chksum $idx}; 3568 delete $HASH{cf::face::get_csum $idx};
3535 } else { 3569 } else {
3536 $idx = cf::face::alloc $name; 3570 $idx = cf::face::alloc $name;
3537 } 3571 }
3538 3572
3539 my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data; 3573 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3540 3574
3541 cf::face::set_type $idx, $type; 3575 cf::face::set_type $idx, $type;
3542 cf::face::set_data $idx, 0, (length $data), 0, $hash; 3576 cf::face::set_csum $idx, 0, $hash;
3543 cf::face::set_meta $idx, $type & 1 ? undef : undef;
3544 3577
3545 # we need to destroy the SV itself, not just overwrite, 3578 # we need to destroy the SV itself, not just modify it, as a running ix
3546 # as a running ix might hold a reference to it. 3579 # might hold a reference to it: "delete" achieves that.
3547 # delete achieves that. 3580 delete $FOFS[0][$idx];
3581 delete $DATA[0][$idx];
3582 $DATA[0][$idx] = $data;
3583 $SIZE[0][$idx] = length $data;
3548 delete $FACEDATA[$idx]; 3584 delete $META[$idx];
3549 $FACEDATA[$idx] = $data;
3550 $FACEHASH{$hash} = $idx;#d# 3585 $HASH{$hash} = $idx;#d#
3551 3586
3552 $idx 3587 $idx
3553} 3588 }
3554 3589
3555our $FACEDATA; # facedata filehandle
3556
3557sub _face_get_data($$$$) { 3590 sub _get_data($$$) {
3558 my ($idx, $size, $fofs, $cb) = @_; 3591 my ($idx, $set, $cb) = @_;
3559 3592
3560 if (defined $FACEDATA[$idx]) { 3593 if (defined $DATA[$set][$idx]) {
3561 $cb->($FACEDATA[$idx]); 3594 $cb->($DATA[$set][$idx]);
3562 } elsif ($fofs) { 3595 } elsif (my $fofs = $FOFS[$set][$idx]) {
3596 my $size = $SIZE[$set][$idx];
3563 my $buf; 3597 my $buf;
3564 IO::AIO::aio_read $FACEDATA, $fofs, $size, $buf, 0, sub { 3598 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3565 if ($_[0] == $size) { 3599 if ($_[0] == $size) {
3566 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d# 3600 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3567 $cb->($buf); 3601 $cb->($buf);
3568 } else { 3602 } else {
3569 cf::error "INTERNAL ERROR: unable to read facedata for face $idx ($size, $fofs), ignoring request."; 3603 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3604 }
3570 } 3605 };
3606 } else {
3607 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3608 }
3609 }
3610
3611 # rather ineffient
3612 sub cf::face::get_data($;$) {
3613 my ($idx, $set) = @_;
3614
3615 _get_data $idx, $set, Coro::rouse_cb;
3616 Coro::rouse_wait
3617 }
3618
3619 sub cf::face::ix {
3620 my ($ns, $set, $idx, $pri) = @_;
3621
3622 _get_data $idx, $set, sub {
3623 $ns->ix_send ($idx, $pri, $_[0]);
3571 }; 3624 };
3572 } else {
3573 cf::error "requested facedata for unknown face $idx ($size, $fofs), ignoring.";
3574 }
3575}
3576
3577# rather ineffient
3578sub cf::face::get_data($;$) {
3579 my ($idx, $faceset) = @_;
3580
3581 my $size = cf::face::get_size $idx, $faceset;
3582 my $fofs = cf::face::get_fofs $idx, $faceset;
3583
3584 _face_get_data $idx, $size, $fofs, Coro::rouse_cb;
3585 Coro::rouse_wait
3586}
3587
3588sub cf::face::ix {
3589 my ($ns, $idx, $pri, $size, $fofs) = @_;
3590
3591 _face_get_data $idx, $size, $fofs, sub {
3592 $ns->ix_send ($idx, $pri, $_[0]);
3593 }; 3625 }
3594} 3626}
3595 3627
3596sub load_facedata($) { 3628sub load_facedata($) {
3597 my ($path) = @_; 3629 my ($path) = @_;
3598 3630
… …
3604 3636
3605 $facedata->{version} == 2 3637 $facedata->{version} == 2
3606 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed."; 3638 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3607 3639
3608 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0 3640 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3609 or cf::cleanup "$path/facedata: $!, cnanot proceed."; 3641 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3610 3642
3611 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot 3643 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3612 3644
3613 # BEGIN ATOMIC 3645 # BEGIN ATOMIC
3614 # from here on, everything must be atomic - no thread switch allowed 3646 # from here on, everything must be atomic - no thread switch allowed
… …
3621 my $info = $faces->{$face}; 3653 my $info = $faces->{$face};
3622 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3654 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3623 3655
3624 cf::face::set_visibility $idx, $info->{visibility}; 3656 cf::face::set_visibility $idx, $info->{visibility};
3625 cf::face::set_magicmap $idx, $info->{magicmap}; 3657 cf::face::set_magicmap $idx, $info->{magicmap};
3626 cf::face::set_data $idx, 0, $info->{size32}, $info->{fofs32}, $info->{hash32}; 3658 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3627 cf::face::set_data $idx, 1, $info->{size64}, $info->{fofs64}, $info->{hash64}; 3659 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3628 #cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ; 3660 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3629 $FACEHASH{$info->{hash64}} = $idx;#d# 3661 $cf::face::HASH{$info->{hash64}} = $idx;
3662 delete $cf::face::META[$idx];
3630 } 3663 }
3631 3664
3632 while (my ($face, $info) = each %$faces) { 3665 while (my ($face, $info) = each %$faces) {
3633 next unless $info->{smooth}; 3666 next unless $info->{smooth};
3634 3667
… …
3661 if (defined (my $type = $info->{type})) { 3694 if (defined (my $type = $info->{type})) {
3662 # TODO: different hash - must free and use new index, or cache ixface data queue 3695 # TODO: different hash - must free and use new index, or cache ixface data queue
3663 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3696 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3664 3697
3665 cf::face::set_type $idx, $type; 3698 cf::face::set_type $idx, $type;
3666 cf::face::set_data $idx, 0, $info->{size}, $info->{fofs}, $info->{hash}; 3699 cf::face::set_csum $idx, 0, $info->{hash};
3700 $cf::face::SIZE[0][$idx] = $info->{size};
3701 $cf::face::FOFS[0][$idx] = $info->{fofs};
3667 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already 3702 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3668 $FACEHASH{$info->{hash}} = $idx;#d# 3703 $cf::face::HASH{$info->{hash}} = $idx;
3669 } else { 3704 } else {
3670# $RESOURCE{$name} = $info; # unused 3705# $RESOURCE{$name} = $info; # unused
3671 } 3706 }
3672 } 3707 }
3673 } 3708 }
3674 3709
3675 ($fh, $FACEDATA) = ($FACEDATA, $fh); 3710 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3676 3711
3677 # HACK to clear player env face cache, we need some signal framework 3712 # HACK to clear player env face cache, we need some signal framework
3678 # for this (global event?) 3713 # for this (global event?)
3679 %ext::player_env::MUSIC_FACE_CACHE = (); 3714 %ext::player_env::MUSIC_FACE_CACHE = ();
3680 3715
… …
3708} 3743}
3709 3744
3710sub reload_exp_table { 3745sub reload_exp_table {
3711 _reload_exp_table; 3746 _reload_exp_table;
3712 3747
3748 cf::face::set
3713 set_face "res/exp_table" => FT_RSRC, 3749 "res/exp_table" => FT_RSRC,
3714 JSON::XS->new->utf8->canonical->encode ( 3750 JSON::XS->new->utf8->canonical->encode (
3715 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level] 3751 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3716 ); 3752 );
3717} 3753}
3718 3754
3719sub reload_materials { 3755sub reload_materials {
3720 _reload_materials; 3756 _reload_materials;
3721} 3757}
… …
3741 3777
3742sub reload_archetypes { 3778sub reload_archetypes {
3743 load_resource_file "$DATADIR/archetypes" 3779 load_resource_file "$DATADIR/archetypes"
3744 or die "unable to load archetypes\n"; 3780 or die "unable to load archetypes\n";
3745 3781
3782 cf::face::set
3746 set_face "res/skill_info" => FT_RSRC, 3783 "res/skill_info" => FT_RSRC,
3747 JSON::XS->new->utf8->canonical->encode ( 3784 JSON::XS->new->utf8->canonical->encode (
3748 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1] 3785 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3749 ); 3786 );
3787
3788 cf::face::set
3750 set_face "res/spell_paths" => FT_RSRC, 3789 "res/spell_paths" => FT_RSRC,
3751 JSON::XS->new->utf8->canonical->encode ( 3790 JSON::XS->new->utf8->canonical->encode (
3752 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1] 3791 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3753 ); 3792 );
3793
3794 # command completion
3795 my @commands;
3796
3797 for (0..cf::arch::skillvec_size - 1) {
3798 my $skill = cf::arch::skillvec $_;
3799 my $name = $skill->name;
3800 my $flags = cf::skill_flags $skill->subtype;
3801
3802 push @commands, "ready_skill $name" if $flags & (SF_COMBAT | SF_RANGED | SF_GRACE);
3803 push @commands, "use_skill $name" if $flags & (SF_USE | SF_AUTARK | SF_GRACE);
3804 }
3805
3806 cf::client::set_command_face skill => \@commands;
3754} 3807}
3755 3808
3756sub reload_treasures { 3809sub reload_treasures {
3757 load_resource_file "$DATADIR/treasures" 3810 load_resource_file "$DATADIR/treasures"
3758 or die "unable to load treasurelists\n"; 3811 or die "unable to load treasurelists\n";

Diff Legend

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