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.598 by root, Sun Nov 11 02:38:10 2012 UTC vs.
Revision 1.611 by root, Tue Nov 20 14:54:17 2012 UTC

… …
251Configuration for the server, loaded from C</etc/deliantra-server/config>, or 251Configuration for the server, loaded from C</etc/deliantra-server/config>, or
252from wherever your confdir points to. 252from wherever your confdir points to.
253 253
254=item cf::wait_for_tick, cf::wait_for_tick_begin 254=item cf::wait_for_tick, cf::wait_for_tick_begin
255 255
256These 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.
257returns 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
258per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 259cf::wait_for_tick wakes up all waiters after tick processing.
259 260
260Note 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
261ticking, 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
262when 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>
263want to wait, use C<$cf::WAIT_FOR_TICK>). 264want to wait, use C<$cf::WAIT_FOR_TICK>).
264 265
265=item $cf::WAIT_FOR_TICK 266=item $cf::WAIT_FOR_TICK
… …
572Allocate $time seconds of blocking CPU time at priority C<$priority> 573Allocate $time seconds of blocking CPU time at priority C<$priority>
573(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
574C<$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
575till the next cede. 576till the next cede.
576 577
577Background jobs should use a priority les than zero, interactive jobs 578Background jobs should use a priority less than zero, interactive jobs
578should use 100 or more. 579should use 100 or more.
579 580
580The 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
581used for statistical purposes and should identify the same time-class. 582used for statistical purposes and should identify the same time-class.
582 583
… …
737 reset_signals; 738 reset_signals;
738} 739}
739 740
740sub fork_call(&@) { 741sub fork_call(&@) {
741 my ($cb, @args) = @_; 742 my ($cb, @args) = @_;
742
743 # we seemingly have to make a local copy of the whole thing,
744 # otherwise perl prematurely frees the stuff :/
745 # TODO: investigate and fix (likely this will be rather laborious)
746 743
747 my @res = Coro::Util::fork_eval { 744 my @res = Coro::Util::fork_eval {
748 cf::post_fork; 745 cf::post_fork;
749 &$cb 746 &$cb
750 } @args; 747 } @args;
… …
2653 2650
2654Creates 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.
2655 2652
2656=item $ob = cf::object::deref ($refstring) 2653=item $ob = cf::object::deref ($refstring)
2657 2654
2658returns 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,
2659even if the object actually exists. May block. 2656even if the object actually exists. May block.
2660 2657
2661=cut 2658=cut
2662 2659
2663sub deref { 2660sub deref {
… …
3045 3042
3046=head3 cf::client 3043=head3 cf::client
3047 3044
3048=over 4 3045=over 4
3049 3046
3050=item $client->send_drawinfo ($text, $flags)
3051
3052Sends a drawinfo packet to the client. Circumvents output buffering so
3053should not be used under normal circumstances.
3054
3055=cut
3056
3057sub cf::client::send_drawinfo {
3058 my ($self, $text, $flags) = @_;
3059
3060 utf8::encode $text;
3061 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
3062}
3063
3064=item $client->send_big_packet ($pkt) 3047=item $client->send_big_packet ($pkt)
3065 3048
3066Like C<send_packet>, but tries to compress large packets, and fragments 3049Like C<send_packet>, but tries to compress large packets, and fragments
3067them as required. 3050them as required.
3068 3051
… …
3086 $self->send_packet ($pkt); 3069 $self->send_packet ($pkt);
3087} 3070}
3088 3071
3089=item $client->send_msg ($channel, $msg, $color, [extra...]) 3072=item $client->send_msg ($channel, $msg, $color, [extra...])
3090 3073
3091Send 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
3092client if neccessary. C<$type> should be a string identifying the type of 3075necessary. C<$type> should be a string identifying the type of the
3093the 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
3094the message unless the client supports the msg packet. 3077the message unless the client supports the msg packet.
3095 3078
3096=cut 3079=cut
3097 3080
3098# non-persistent channels (usually the info channel) 3081# non-persistent channels (usually the info channel)
… …
3203 id => "death", 3186 id => "death",
3204 title => "Death", 3187 title => "Death",
3205 reply => undef, 3188 reply => undef,
3206 tooltip => "Reason for and more info about your most recent death", 3189 tooltip => "Reason for and more info about your most recent death",
3207 }, 3190 },
3191 "c/fatal" => {
3192 id => "fatal",
3193 title => "Fatal Error",
3194 reply => undef,
3195 tooltip => "Reason for the server disconnect",
3196 },
3208 "c/say" => $SAY_CHANNEL, 3197 "c/say" => $SAY_CHANNEL,
3209 "c/chat" => $CHAT_CHANNEL, 3198 "c/chat" => $CHAT_CHANNEL,
3210); 3199);
3211 3200
3212sub cf::client::send_msg { 3201sub cf::client::send_msg {
… …
3285 3274
3286 $self->send_packet ($self->{query_queue}[0][0]) 3275 $self->send_packet ($self->{query_queue}[0][0])
3287 if @{ $self->{query_queue} } == 1; 3276 if @{ $self->{query_queue} } == 1;
3288 3277
3289 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{standard},
3292 $COMMAND_FACE{emote},
3293 $COMMAND_FACE{skill},
3294 $self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
3295 ;
3296
3297 $self->send_face ($_)
3298 for @faces;
3299 $self->flush_fx;
3300
3301 $self->ext_msg (command_list => @faces);
3302}
3303
3304=item cf::client::set_command_face $type, $commands
3305
3306=cut
3307
3308sub cf::client::set_command_face {
3309 my ($type, $list) = @_;
3310
3311 my $idx = &cf::face::set ( #d# ugly forward reference
3312 "command_list/$type" => cf::FT_RSRC,
3313 JSON::XS->new->utf8->encode ([ sort @$list ])
3314 );
3315
3316 $COMMAND_FACE{$type} = $idx;
3290} 3317}
3291 3318
3292cf::client->attach ( 3319cf::client->attach (
3293 on_connect => sub { 3320 on_connect => sub {
3294 my ($ns) = @_; 3321 my ($ns) = @_;
… …
3518=cut 3545=cut
3519 3546
3520############################################################################# 3547#############################################################################
3521# the server's init and main functions 3548# the server's init and main functions
3522 3549
3523our %FACEHASH; # hash => idx, #d# HACK for http server 3550{
3551 package cf::face;
3524 3552
3553 our %HASH; # hash => idx
3554 our @DATA; # dynamically-created facedata, only faceste 0 used
3555 our @FOFS; # file offset, if > 0
3556 our @SIZE; # size of face, in octets
3557 our @META; # meta hash of face, if any
3558 our $DATAFH; # facedata filehandle
3559
3525# internal api, not fianlised 3560 # internal api, not finalised
3526sub set_face { 3561 sub set {
3527 my ($name, $type, $data) = @_; 3562 my ($name, $type, $data) = @_;
3528 3563
3529 my $idx = cf::face::find $name; 3564 my $idx = cf::face::find $name;
3530 3565
3531 if ($idx) { 3566 if ($idx) {
3532 delete $FACEHASH{cf::face::get_chksum $idx}; 3567 delete $HASH{cf::face::get_csum $idx};
3533 } else { 3568 } else {
3534 $idx = cf::face::alloc $name; 3569 $idx = cf::face::alloc $name;
3535 } 3570 }
3536 3571
3537 my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data; 3572 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3538 3573
3539 cf::face::set_type $idx, $type; 3574 cf::face::set_type $idx, $type;
3540 cf::face::set_data $idx, 0, $data, $hash; 3575 cf::face::set_csum $idx, 0, $hash;
3541 cf::face::set_meta $idx, $type & 1 ? undef : undef; 3576
3577 # we need to destroy the SV itself, not just modify it, as a running ix
3578 # might hold a reference to it: "delete" achieves that.
3579 delete $FOFS[0][$idx];
3580 delete $DATA[0][$idx];
3581 $DATA[0][$idx] = $data;
3582 $SIZE[0][$idx] = length $data;
3583 delete $META[$idx];
3542 $FACEHASH{$hash} = $idx;#d# 3584 $HASH{$hash} = $idx;#d#
3543 3585
3544 $idx 3586 $idx
3587 }
3588
3589 sub _get_data($$$) {
3590 my ($idx, $set, $cb) = @_;
3591
3592 if (defined $DATA[$set][$idx]) {
3593 $cb->($DATA[$set][$idx]);
3594 } elsif (my $fofs = $FOFS[$set][$idx]) {
3595 my $size = $SIZE[$set][$idx];
3596 my $buf;
3597 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3598 if ($_[0] == $size) {
3599 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3600 $cb->($buf);
3601 } else {
3602 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3603 }
3604 };
3605 } else {
3606 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3607 }
3608 }
3609
3610 # rather ineffient
3611 sub cf::face::get_data($;$) {
3612 my ($idx, $set) = @_;
3613
3614 _get_data $idx, $set, Coro::rouse_cb;
3615 Coro::rouse_wait
3616 }
3617
3618 sub cf::face::ix {
3619 my ($ns, $set, $idx, $pri) = @_;
3620
3621 _get_data $idx, $set, sub {
3622 $ns->ix_send ($idx, $pri, $_[0]);
3623 };
3624 }
3545} 3625}
3546 3626
3547sub load_facedata($) { 3627sub load_facedata($) {
3548 my ($path) = @_; 3628 my ($path) = @_;
3549 3629
3550 # HACK to clear player env face cache, we need some signal framework
3551 # for this (global event?)
3552 %ext::player_env::MUSIC_FACE_CACHE = ();
3553
3554 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3630 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3555 3631
3556 trace "loading facedata from $path\n"; 3632 trace "loading facedata from $path\n";
3557 3633
3558 my $facedata = decode_storable load_file $path; 3634 my $facedata = decode_storable load_file "$path/faceinfo";
3559 3635
3560 $facedata->{version} == 2 3636 $facedata->{version} == 2
3561 or cf::cleanup "$path: version mismatch, cannot proceed."; 3637 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3562 3638
3563 cf::cede_to_tick; 3639 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3640 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3641
3642 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3643
3644 # BEGIN ATOMIC
3645 # from here on, everything must be atomic - no thread switch allowed
3646 my $t1 = EV::time;
3564 3647
3565 { 3648 {
3566 my $faces = delete $facedata->{faceinfo}; 3649 my $faces = $facedata->{faceinfo};
3567 3650
3568 for my $face (sort keys %$faces) { 3651 for my $face (sort keys %$faces) {
3569 my $info = $faces->{$face}; 3652 my $info = $faces->{$face};
3570 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3653 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3571 3654
3572 cf::face::set_visibility $idx, $info->{visibility}; 3655 cf::face::set_visibility $idx, $info->{visibility};
3573 cf::face::set_magicmap $idx, $info->{magicmap}; 3656 cf::face::set_magicmap $idx, $info->{magicmap};
3574 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3657 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3575 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3658 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3576 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ; 3659 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3577 $FACEHASH{$info->{hash64}} = $idx;#d# 3660 $cf::face::HASH{$info->{hash64}} = $idx;
3578 3661 delete $cf::face::META[$idx];
3579 cf::cede_to_tick;
3580 } 3662 }
3581 3663
3582 while (my ($face, $info) = each %$faces) { 3664 while (my ($face, $info) = each %$faces) {
3583 next unless $info->{smooth}; 3665 next unless $info->{smooth};
3584 3666
… …
3589 cf::face::set_smooth $idx, $smooth; 3671 cf::face::set_smooth $idx, $smooth;
3590 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3672 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3591 } else { 3673 } else {
3592 error "smooth face '$info->{smooth}' not found for face '$face'"; 3674 error "smooth face '$info->{smooth}' not found for face '$face'";
3593 } 3675 }
3594
3595 cf::cede_to_tick;
3596 } 3676 }
3597 } 3677 }
3598 3678
3599 { 3679 {
3600 my $anims = delete $facedata->{animinfo}; 3680 my $anims = $facedata->{animinfo};
3601 3681
3602 while (my ($anim, $info) = each %$anims) { 3682 while (my ($anim, $info) = each %$anims) {
3603 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3683 cf::anim::set $anim, $info->{frames}, $info->{facings};
3604 cf::cede_to_tick;
3605 } 3684 }
3606 3685
3607 cf::anim::invalidate_all; # d'oh 3686 cf::anim::invalidate_all; # d'oh
3608 } 3687 }
3609 3688
3610 { 3689 {
3611 my $res = delete $facedata->{resource}; 3690 my $res = $facedata->{resource};
3612 3691
3613 while (my ($name, $info) = each %$res) { 3692 while (my ($name, $info) = each %$res) {
3614 if (defined (my $type = $info->{type})) { 3693 if (defined (my $type = $info->{type})) {
3615 # TODO: different hash - must free and use new index, or cache ixface data queue 3694 # TODO: different hash - must free and use new index, or cache ixface data queue
3616 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3695 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3617 3696
3618 cf::face::set_type $idx, $type; 3697 cf::face::set_type $idx, $type;
3619 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3698 cf::face::set_csum $idx, 0, $info->{hash};
3699 $cf::face::SIZE[0][$idx] = $info->{size};
3700 $cf::face::FOFS[0][$idx] = $info->{fofs};
3620 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already 3701 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3621 $FACEHASH{$info->{hash}} = $idx;#d# 3702 $cf::face::HASH{$info->{hash}} = $idx;
3622 } else { 3703 } else {
3623# $RESOURCE{$name} = $info; # unused 3704# $RESOURCE{$name} = $info; # unused
3624 } 3705 }
3625
3626 cf::cede_to_tick;
3627 } 3706 }
3628 } 3707 }
3708
3709 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3710
3711 # HACK to clear player env face cache, we need some signal framework
3712 # for this (global event?)
3713 %ext::player_env::MUSIC_FACE_CACHE = ();
3714
3715 # END ATOMIC
3716
3717 cf::debug "facedata atomic update time ", EV::time - $t1;
3629 3718
3630 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3719 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3720
3721 aio_close $fh if $fh; # close old facedata
3631 3722
3632 1 3723 1
3633} 3724}
3634 3725
3635register_exticmd fx_want => sub { 3726register_exticmd fx_want => sub {
… …
3651} 3742}
3652 3743
3653sub reload_exp_table { 3744sub reload_exp_table {
3654 _reload_exp_table; 3745 _reload_exp_table;
3655 3746
3747 cf::face::set
3656 set_face "res/exp_table" => FT_RSRC, 3748 "res/exp_table" => FT_RSRC,
3657 JSON::XS->new->utf8->canonical->encode ( 3749 JSON::XS->new->utf8->canonical->encode (
3658 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level] 3750 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3659 ); 3751 );
3660} 3752}
3661 3753
3662sub reload_materials { 3754sub reload_materials {
3663 _reload_materials; 3755 _reload_materials;
3664} 3756}
… …
3676 if exists $_->{match}; 3768 if exists $_->{match};
3677 } 3769 }
3678} 3770}
3679 3771
3680sub reload_facedata { 3772sub reload_facedata {
3681 load_facedata "$DATADIR/facedata" 3773 load_facedata $DATADIR
3682 or die "unable to load facedata\n"; 3774 or die "unable to load facedata\n";
3683} 3775}
3684 3776
3685sub reload_archetypes { 3777sub reload_archetypes {
3686 load_resource_file "$DATADIR/archetypes" 3778 load_resource_file "$DATADIR/archetypes"
3687 or die "unable to load archetypes\n"; 3779 or die "unable to load archetypes\n";
3688 3780
3781 cf::face::set
3689 set_face "res/skill_info" => FT_RSRC, 3782 "res/skill_info" => FT_RSRC,
3690 JSON::XS->new->utf8->canonical->encode ( 3783 JSON::XS->new->utf8->canonical->encode (
3691 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1] 3784 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3692 ); 3785 );
3786
3787 cf::face::set
3693 set_face "res/spell_paths" => FT_RSRC, 3788 "res/spell_paths" => FT_RSRC,
3694 JSON::XS->new->utf8->canonical->encode ( 3789 JSON::XS->new->utf8->canonical->encode (
3695 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1] 3790 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3696 ); 3791 );
3792
3793 # command completion
3794 my @commands;
3795
3796 for (0..cf::arch::skillvec_size - 1) {
3797 my $skill = cf::arch::skillvec $_;
3798 my $name = $skill->name;
3799 my $flags = cf::skill_flags $skill->subtype;
3800
3801 push @commands, "ready_skill $name" if $flags & (SF_COMBAT | SF_RANGED | SF_GRACE);
3802 push @commands, "use_skill $name" if $flags & (SF_USE | SF_AUTARK | SF_GRACE);
3803 }
3804
3805 cf::client::set_command_face skill => \@commands;
3697} 3806}
3698 3807
3699sub reload_treasures { 3808sub reload_treasures {
3700 load_resource_file "$DATADIR/treasures" 3809 load_resource_file "$DATADIR/treasures"
3701 or die "unable to load treasurelists\n"; 3810 or die "unable to load treasurelists\n";

Diff Legend

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