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.600 by root, Sun Nov 11 04:31:57 2012 UTC vs.
Revision 1.609 by root, Tue Nov 20 14:30:22 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
… …
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_FACES; # [normal commands, emotes, dm commands]
3286
3287sub cf::client::update_command_faces {
3288 my ($self) = @_;
3289
3290 my @faces = (
3291 $COMMAND_FACES[0],
3292 $COMMAND_FACES[1],
3293 $self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACES[2] : ()
3294 );
3295
3296 $self->send_face ($_)
3297 for @faces;
3298 $self->flush_fx;
3299
3300 $self->ext_msg (command_list => @faces);
3301}
3302
3303=item cf::client::set_command_faces $normal_commands, $emotes, $dm_commands
3304
3305=cut
3306
3307sub cf::client::set_command_faces {
3308 @COMMAND_FACES = @_;
3291} 3309}
3292 3310
3293cf::client->attach ( 3311cf::client->attach (
3294 on_connect => sub { 3312 on_connect => sub {
3295 my ($ns) = @_; 3313 my ($ns) = @_;
… …
3519=cut 3537=cut
3520 3538
3521############################################################################# 3539#############################################################################
3522# the server's init and main functions 3540# the server's init and main functions
3523 3541
3524our %FACEHASH; # hash => idx, #d# HACK for http server 3542{
3525our @FACEDATA; # dynamically-created facedata 3543 package cf::face;
3526 3544
3545 our %HASH; # hash => idx
3546 our @DATA; # dynamically-created facedata, only faceste 0 used
3547 our @FOFS; # file offset, if > 0
3548 our @SIZE; # size of face, in octets
3549 our @META; # meta hash of face, if any
3550 our $DATAFH; # facedata filehandle
3551
3527# internal api, not fianlised 3552 # internal api, not finalised
3528sub set_face { 3553 sub set {
3529 my ($name, $type, $data) = @_; 3554 my ($name, $type, $data) = @_;
3530 3555
3531 my $idx = cf::face::find $name; 3556 my $idx = cf::face::find $name;
3532 3557
3533 if ($idx) { 3558 if ($idx) {
3534 delete $FACEHASH{cf::face::get_chksum $idx}; 3559 delete $HASH{cf::face::get_csum $idx};
3535 } else { 3560 } else {
3536 $idx = cf::face::alloc $name; 3561 $idx = cf::face::alloc $name;
3537 } 3562 }
3538 3563
3539 my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data; 3564 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3540 3565
3541 cf::face::set_type $idx, $type; 3566 cf::face::set_type $idx, $type;
3542 cf::face::set_data $idx, 0, (length $data), 0, $hash; 3567 cf::face::set_csum $idx, 0, $hash;
3543 cf::face::set_meta $idx, $type & 1 ? undef : undef;
3544 3568
3545 # we need to destroy the SV itself, not just overwrite, 3569 # 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. 3570 # might hold a reference to it: "delete" achieves that.
3547 # delete achieves that. 3571 delete $FOFS[0][$idx];
3572 delete $DATA[0][$idx];
3573 $DATA[0][$idx] = $data;
3574 $SIZE[0][$idx] = length $data;
3548 delete $FACEDATA[$idx]; 3575 delete $META[$idx];
3549 $FACEDATA[$idx] = $data;
3550 $FACEHASH{$hash} = $idx;#d# 3576 $HASH{$hash} = $idx;#d#
3551 3577
3552 $idx 3578 $idx
3553} 3579 }
3554 3580
3555our $FACEDATA; # facedata filehandle
3556
3557sub _face_get_data($$$$) { 3581 sub _get_data($$$) {
3558 my ($idx, $size, $fofs, $cb) = @_; 3582 my ($idx, $set, $cb) = @_;
3559 3583
3560 if (defined $FACEDATA[$idx]) { 3584 if (defined $DATA[$set][$idx]) {
3561 $cb->($FACEDATA[$idx]); 3585 $cb->($DATA[$set][$idx]);
3562 } elsif ($fofs) { 3586 } elsif (my $fofs = $FOFS[$set][$idx]) {
3587 my $size = $SIZE[$set][$idx];
3563 my $buf; 3588 my $buf;
3564 IO::AIO::aio_read $FACEDATA, $fofs, $size, $buf, 0, sub { 3589 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3565 if ($_[0] == $size) { 3590 if ($_[0] == $size) {
3566 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d# 3591 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3567 $cb->($buf); 3592 $cb->($buf);
3568 } else { 3593 } else {
3569 cf::error "INTERNAL ERROR: unable to read facedata for face $idx ($size, $fofs), ignoring request."; 3594 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3595 }
3570 } 3596 };
3597 } else {
3598 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3599 }
3600 }
3601
3602 # rather ineffient
3603 sub cf::face::get_data($;$) {
3604 my ($idx, $set) = @_;
3605
3606 _get_data $idx, $set, Coro::rouse_cb;
3607 Coro::rouse_wait
3608 }
3609
3610 sub cf::face::ix {
3611 my ($ns, $set, $idx, $pri) = @_;
3612
3613 _get_data $idx, $set, sub {
3614 $ns->ix_send ($idx, $pri, $_[0]);
3571 }; 3615 };
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 }; 3616 }
3594} 3617}
3595 3618
3596sub load_facedata($) { 3619sub load_facedata($) {
3597 my ($path) = @_; 3620 my ($path) = @_;
3598 3621
… …
3604 3627
3605 $facedata->{version} == 2 3628 $facedata->{version} == 2
3606 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed."; 3629 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3607 3630
3608 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0 3631 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3609 or cf::cleanup "$path/facedata: $!, cnanot proceed."; 3632 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3610 3633
3611 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot 3634 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3612 3635
3613 # BEGIN ATOMIC 3636 # BEGIN ATOMIC
3614 # from here on, everything must be atomic - no thread switch allowed 3637 # from here on, everything must be atomic - no thread switch allowed
… …
3621 my $info = $faces->{$face}; 3644 my $info = $faces->{$face};
3622 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3645 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3623 3646
3624 cf::face::set_visibility $idx, $info->{visibility}; 3647 cf::face::set_visibility $idx, $info->{visibility};
3625 cf::face::set_magicmap $idx, $info->{magicmap}; 3648 cf::face::set_magicmap $idx, $info->{magicmap};
3626 cf::face::set_data $idx, 0, $info->{size32}, $info->{fofs32}, $info->{hash32}; 3649 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}; 3650 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}; # glyphs no longer downloadable via ix 3651 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3629 $FACEHASH{$info->{hash64}} = $idx;#d# 3652 $cf::face::HASH{$info->{hash64}} = $idx;
3653 delete $cf::face::META[$idx];
3630 } 3654 }
3631 3655
3632 while (my ($face, $info) = each %$faces) { 3656 while (my ($face, $info) = each %$faces) {
3633 next unless $info->{smooth}; 3657 next unless $info->{smooth};
3634 3658
… …
3661 if (defined (my $type = $info->{type})) { 3685 if (defined (my $type = $info->{type})) {
3662 # TODO: different hash - must free and use new index, or cache ixface data queue 3686 # 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; 3687 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3664 3688
3665 cf::face::set_type $idx, $type; 3689 cf::face::set_type $idx, $type;
3666 cf::face::set_data $idx, 0, $info->{size}, $info->{fofs}, $info->{hash}; 3690 cf::face::set_csum $idx, 0, $info->{hash};
3691 $cf::face::SIZE[0][$idx] = $info->{size};
3692 $cf::face::FOFS[0][$idx] = $info->{fofs};
3667 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already 3693 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3668 $FACEHASH{$info->{hash}} = $idx;#d# 3694 $cf::face::HASH{$info->{hash}} = $idx;
3669 } else { 3695 } else {
3670# $RESOURCE{$name} = $info; # unused 3696# $RESOURCE{$name} = $info; # unused
3671 } 3697 }
3672 } 3698 }
3673 } 3699 }
3674 3700
3675 ($fh, $FACEDATA) = ($FACEDATA, $fh); 3701 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3676 3702
3677 # HACK to clear player env face cache, we need some signal framework 3703 # HACK to clear player env face cache, we need some signal framework
3678 # for this (global event?) 3704 # for this (global event?)
3679 %ext::player_env::MUSIC_FACE_CACHE = (); 3705 %ext::player_env::MUSIC_FACE_CACHE = ();
3680 3706
… …
3708} 3734}
3709 3735
3710sub reload_exp_table { 3736sub reload_exp_table {
3711 _reload_exp_table; 3737 _reload_exp_table;
3712 3738
3739 cf::face::set
3713 set_face "res/exp_table" => FT_RSRC, 3740 "res/exp_table" => FT_RSRC,
3714 JSON::XS->new->utf8->canonical->encode ( 3741 JSON::XS->new->utf8->canonical->encode (
3715 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level] 3742 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3716 ); 3743 );
3717} 3744}
3718 3745
3719sub reload_materials { 3746sub reload_materials {
3720 _reload_materials; 3747 _reload_materials;
3721} 3748}
… …
3741 3768
3742sub reload_archetypes { 3769sub reload_archetypes {
3743 load_resource_file "$DATADIR/archetypes" 3770 load_resource_file "$DATADIR/archetypes"
3744 or die "unable to load archetypes\n"; 3771 or die "unable to load archetypes\n";
3745 3772
3773 cf::face::set
3746 set_face "res/skill_info" => FT_RSRC, 3774 "res/skill_info" => FT_RSRC,
3747 JSON::XS->new->utf8->canonical->encode ( 3775 JSON::XS->new->utf8->canonical->encode (
3748 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1] 3776 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3749 ); 3777 );
3778
3779 cf::face::set
3750 set_face "res/spell_paths" => FT_RSRC, 3780 "res/spell_paths" => FT_RSRC,
3751 JSON::XS->new->utf8->canonical->encode ( 3781 JSON::XS->new->utf8->canonical->encode (
3752 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1] 3782 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3753 ); 3783 );
3754} 3784}
3755 3785
3756sub reload_treasures { 3786sub reload_treasures {
3757 load_resource_file "$DATADIR/treasures" 3787 load_resource_file "$DATADIR/treasures"
3758 or die "unable to load treasurelists\n"; 3788 or die "unable to load treasurelists\n";

Diff Legend

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