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.609 by root, Tue Nov 20 14:30:22 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_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 = @_;
3290} 3309}
3291 3310
3292cf::client->attach ( 3311cf::client->attach (
3293 on_connect => sub { 3312 on_connect => sub {
3294 my ($ns) = @_; 3313 my ($ns) = @_;
… …
3518=cut 3537=cut
3519 3538
3520############################################################################# 3539#############################################################################
3521# the server's init and main functions 3540# the server's init and main functions
3522 3541
3523our %FACEHASH; # hash => idx, #d# HACK for http server 3542{
3543 package cf::face;
3524 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
3525# internal api, not fianlised 3552 # internal api, not finalised
3526sub set_face { 3553 sub set {
3527 my ($name, $type, $data) = @_; 3554 my ($name, $type, $data) = @_;
3528 3555
3529 my $idx = cf::face::find $name; 3556 my $idx = cf::face::find $name;
3530 3557
3531 if ($idx) { 3558 if ($idx) {
3532 delete $FACEHASH{cf::face::get_chksum $idx}; 3559 delete $HASH{cf::face::get_csum $idx};
3533 } else { 3560 } else {
3534 $idx = cf::face::alloc $name; 3561 $idx = cf::face::alloc $name;
3535 } 3562 }
3536 3563
3537 my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data; 3564 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3538 3565
3539 cf::face::set_type $idx, $type; 3566 cf::face::set_type $idx, $type;
3540 cf::face::set_data $idx, 0, $data, $hash; 3567 cf::face::set_csum $idx, 0, $hash;
3541 cf::face::set_meta $idx, $type & 1 ? undef : undef; 3568
3569 # we need to destroy the SV itself, not just modify it, as a running ix
3570 # might hold a reference to it: "delete" achieves that.
3571 delete $FOFS[0][$idx];
3572 delete $DATA[0][$idx];
3573 $DATA[0][$idx] = $data;
3574 $SIZE[0][$idx] = length $data;
3575 delete $META[$idx];
3542 $FACEHASH{$hash} = $idx;#d# 3576 $HASH{$hash} = $idx;#d#
3543 3577
3544 $idx 3578 $idx
3579 }
3580
3581 sub _get_data($$$) {
3582 my ($idx, $set, $cb) = @_;
3583
3584 if (defined $DATA[$set][$idx]) {
3585 $cb->($DATA[$set][$idx]);
3586 } elsif (my $fofs = $FOFS[$set][$idx]) {
3587 my $size = $SIZE[$set][$idx];
3588 my $buf;
3589 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3590 if ($_[0] == $size) {
3591 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3592 $cb->($buf);
3593 } else {
3594 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3595 }
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]);
3615 };
3616 }
3545} 3617}
3546 3618
3547sub load_facedata($) { 3619sub load_facedata($) {
3548 my ($path) = @_; 3620 my ($path) = @_;
3549 3621
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; 3622 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3555 3623
3556 trace "loading facedata from $path\n"; 3624 trace "loading facedata from $path\n";
3557 3625
3558 my $facedata = decode_storable load_file $path; 3626 my $facedata = decode_storable load_file "$path/faceinfo";
3559 3627
3560 $facedata->{version} == 2 3628 $facedata->{version} == 2
3561 or cf::cleanup "$path: version mismatch, cannot proceed."; 3629 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3562 3630
3563 cf::cede_to_tick; 3631 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3632 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3633
3634 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3635
3636 # BEGIN ATOMIC
3637 # from here on, everything must be atomic - no thread switch allowed
3638 my $t1 = EV::time;
3564 3639
3565 { 3640 {
3566 my $faces = delete $facedata->{faceinfo}; 3641 my $faces = $facedata->{faceinfo};
3567 3642
3568 for my $face (sort keys %$faces) { 3643 for my $face (sort keys %$faces) {
3569 my $info = $faces->{$face}; 3644 my $info = $faces->{$face};
3570 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3645 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3571 3646
3572 cf::face::set_visibility $idx, $info->{visibility}; 3647 cf::face::set_visibility $idx, $info->{visibility};
3573 cf::face::set_magicmap $idx, $info->{magicmap}; 3648 cf::face::set_magicmap $idx, $info->{magicmap};
3574 cf::face::set_data $idx, 0, $info->{data32}, $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};
3575 cf::face::set_data $idx, 1, $info->{data64}, $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};
3576 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ; 3651 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3577 $FACEHASH{$info->{hash64}} = $idx;#d# 3652 $cf::face::HASH{$info->{hash64}} = $idx;
3578 3653 delete $cf::face::META[$idx];
3579 cf::cede_to_tick;
3580 } 3654 }
3581 3655
3582 while (my ($face, $info) = each %$faces) { 3656 while (my ($face, $info) = each %$faces) {
3583 next unless $info->{smooth}; 3657 next unless $info->{smooth};
3584 3658
… …
3589 cf::face::set_smooth $idx, $smooth; 3663 cf::face::set_smooth $idx, $smooth;
3590 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3664 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3591 } else { 3665 } else {
3592 error "smooth face '$info->{smooth}' not found for face '$face'"; 3666 error "smooth face '$info->{smooth}' not found for face '$face'";
3593 } 3667 }
3594
3595 cf::cede_to_tick;
3596 } 3668 }
3597 } 3669 }
3598 3670
3599 { 3671 {
3600 my $anims = delete $facedata->{animinfo}; 3672 my $anims = $facedata->{animinfo};
3601 3673
3602 while (my ($anim, $info) = each %$anims) { 3674 while (my ($anim, $info) = each %$anims) {
3603 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3675 cf::anim::set $anim, $info->{frames}, $info->{facings};
3604 cf::cede_to_tick;
3605 } 3676 }
3606 3677
3607 cf::anim::invalidate_all; # d'oh 3678 cf::anim::invalidate_all; # d'oh
3608 } 3679 }
3609 3680
3610 { 3681 {
3611 my $res = delete $facedata->{resource}; 3682 my $res = $facedata->{resource};
3612 3683
3613 while (my ($name, $info) = each %$res) { 3684 while (my ($name, $info) = each %$res) {
3614 if (defined (my $type = $info->{type})) { 3685 if (defined (my $type = $info->{type})) {
3615 # 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
3616 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3687 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3617 3688
3618 cf::face::set_type $idx, $type; 3689 cf::face::set_type $idx, $type;
3619 cf::face::set_data $idx, 0, $info->{data}, $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};
3620 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
3621 $FACEHASH{$info->{hash}} = $idx;#d# 3694 $cf::face::HASH{$info->{hash}} = $idx;
3622 } else { 3695 } else {
3623# $RESOURCE{$name} = $info; # unused 3696# $RESOURCE{$name} = $info; # unused
3624 } 3697 }
3625
3626 cf::cede_to_tick;
3627 } 3698 }
3628 } 3699 }
3700
3701 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3702
3703 # HACK to clear player env face cache, we need some signal framework
3704 # for this (global event?)
3705 %ext::player_env::MUSIC_FACE_CACHE = ();
3706
3707 # END ATOMIC
3708
3709 cf::debug "facedata atomic update time ", EV::time - $t1;
3629 3710
3630 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3711 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3712
3713 aio_close $fh if $fh; # close old facedata
3631 3714
3632 1 3715 1
3633} 3716}
3634 3717
3635register_exticmd fx_want => sub { 3718register_exticmd fx_want => sub {
… …
3651} 3734}
3652 3735
3653sub reload_exp_table { 3736sub reload_exp_table {
3654 _reload_exp_table; 3737 _reload_exp_table;
3655 3738
3739 cf::face::set
3656 set_face "res/exp_table" => FT_RSRC, 3740 "res/exp_table" => FT_RSRC,
3657 JSON::XS->new->utf8->canonical->encode ( 3741 JSON::XS->new->utf8->canonical->encode (
3658 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level] 3742 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3659 ); 3743 );
3660} 3744}
3661 3745
3662sub reload_materials { 3746sub reload_materials {
3663 _reload_materials; 3747 _reload_materials;
3664} 3748}
… …
3676 if exists $_->{match}; 3760 if exists $_->{match};
3677 } 3761 }
3678} 3762}
3679 3763
3680sub reload_facedata { 3764sub reload_facedata {
3681 load_facedata "$DATADIR/facedata" 3765 load_facedata $DATADIR
3682 or die "unable to load facedata\n"; 3766 or die "unable to load facedata\n";
3683} 3767}
3684 3768
3685sub reload_archetypes { 3769sub reload_archetypes {
3686 load_resource_file "$DATADIR/archetypes" 3770 load_resource_file "$DATADIR/archetypes"
3687 or die "unable to load archetypes\n"; 3771 or die "unable to load archetypes\n";
3688 3772
3773 cf::face::set
3689 set_face "res/skill_info" => FT_RSRC, 3774 "res/skill_info" => FT_RSRC,
3690 JSON::XS->new->utf8->canonical->encode ( 3775 JSON::XS->new->utf8->canonical->encode (
3691 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1] 3776 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3692 ); 3777 );
3778
3779 cf::face::set
3693 set_face "res/spell_paths" => FT_RSRC, 3780 "res/spell_paths" => FT_RSRC,
3694 JSON::XS->new->utf8->canonical->encode ( 3781 JSON::XS->new->utf8->canonical->encode (
3695 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1] 3782 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3696 ); 3783 );
3697} 3784}
3698 3785
3699sub reload_treasures { 3786sub reload_treasures {
3700 load_resource_file "$DATADIR/treasures" 3787 load_resource_file "$DATADIR/treasures"
3701 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