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.595 by root, Fri Nov 9 16:27:55 2012 UTC vs.
Revision 1.609 by root, Tue Nov 20 14:30:22 2012 UTC

… …
58use BDB (); 58use BDB ();
59use Data::Dumper; 59use Data::Dumper;
60use Fcntl; 60use Fcntl;
61use YAML::XS (); 61use YAML::XS ();
62use IO::AIO (); 62use IO::AIO ();
63use Time::HiRes;
64use Compress::LZF; 63use Compress::LZF;
65use Digest::MD5 (); 64use Digest::MD5 ();
66 65
67AnyEvent::detect; 66AnyEvent::detect;
68 67
… …
252Configuration for the server, loaded from C</etc/deliantra-server/config>, or 251Configuration for the server, loaded from C</etc/deliantra-server/config>, or
253from wherever your confdir points to. 252from wherever your confdir points to.
254 253
255=item cf::wait_for_tick, cf::wait_for_tick_begin 254=item cf::wait_for_tick, cf::wait_for_tick_begin
256 255
257These 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.
258returns 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
259per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 259cf::wait_for_tick wakes up all waiters after tick processing.
260 260
261Note 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
262ticking, 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
263when 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>
264want to wait, use C<$cf::WAIT_FOR_TICK>). 264want to wait, use C<$cf::WAIT_FOR_TICK>).
265 265
266=item $cf::WAIT_FOR_TICK 266=item $cf::WAIT_FOR_TICK
… …
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;
… …
901 897
902 return db_get cache => "$id/data"; 898 return db_get cache => "$id/data";
903 } 899 }
904 } 900 }
905 901
906 my $t1 = Time::HiRes::time; 902 my $t1 = EV::time;
907 my $data = $process->(\@data); 903 my $data = $process->(\@data);
908 my $t2 = Time::HiRes::time; 904 my $t2 = EV::time;
909 905
910 info "cache: '$id' processed in ", $t2 - $t1, "s\n"; 906 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
911 907
912 db_put cache => "$id/data", $data; 908 db_put cache => "$id/data", $data;
913 db_put cache => "$id/md5" , $md5; 909 db_put cache => "$id/md5" , $md5;
… …
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{
3543 package cf::face;
3525 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
3526# internal api, not fianlised 3552 # internal api, not finalised
3527sub add_face { 3553 sub set {
3528 my ($name, $type, $data) = @_; 3554 my ($name, $type, $data) = @_;
3529 3555
3530 my $idx = cf::face::find $name; 3556 my $idx = cf::face::find $name;
3531 3557
3532 if ($idx) { 3558 if ($idx) {
3533 delete $FACEHASH{cf::face::get_chksum $idx}; 3559 delete $HASH{cf::face::get_csum $idx};
3534 } else { 3560 } else {
3535 $idx = cf::face::alloc $name; 3561 $idx = cf::face::alloc $name;
3536 } 3562 }
3537 3563
3538 my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data; 3564 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3539 3565
3540 cf::face::set_type $idx, $type; 3566 cf::face::set_type $idx, $type;
3541 cf::face::set_data $idx, 0, $data, $hash; 3567 cf::face::set_csum $idx, 0, $hash;
3542 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];
3543 $FACEHASH{$hash} = $idx;#d# 3576 $HASH{$hash} = $idx;#d#
3544 3577
3545 $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 }
3546} 3617}
3547 3618
3548sub load_facedata($) { 3619sub load_facedata($) {
3549 my ($path) = @_; 3620 my ($path) = @_;
3550 3621
3551 # HACK to clear player env face cache, we need some signal framework
3552 # for this (global event?)
3553 %ext::player_env::MUSIC_FACE_CACHE = ();
3554
3555 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3622 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3556 3623
3557 trace "loading facedata from $path\n"; 3624 trace "loading facedata from $path\n";
3558 3625
3559 my $facedata = decode_storable load_file $path; 3626 my $facedata = decode_storable load_file "$path/faceinfo";
3560 3627
3561 $facedata->{version} == 2 3628 $facedata->{version} == 2
3562 or cf::cleanup "$path: version mismatch, cannot proceed."; 3629 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3563 3630
3564 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;
3565 3639
3566 { 3640 {
3567 my $faces = $facedata->{faceinfo}; 3641 my $faces = $facedata->{faceinfo};
3568 3642
3569 for my $face (sort keys %$faces) { 3643 for my $face (sort keys %$faces) {
3570 my $info = $faces->{$face}; 3644 my $info = $faces->{$face};
3571 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3645 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3572 3646
3573 cf::face::set_visibility $idx, $info->{visibility}; 3647 cf::face::set_visibility $idx, $info->{visibility};
3574 cf::face::set_magicmap $idx, $info->{magicmap}; 3648 cf::face::set_magicmap $idx, $info->{magicmap};
3575 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};
3576 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};
3577 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};
3578 $FACEHASH{$info->{hash64}} = $idx;#d# 3652 $cf::face::HASH{$info->{hash64}} = $idx;
3579 3653 delete $cf::face::META[$idx];
3580 cf::cede_to_tick;
3581 } 3654 }
3582 3655
3583 while (my ($face, $info) = each %$faces) { 3656 while (my ($face, $info) = each %$faces) {
3584 next unless $info->{smooth}; 3657 next unless $info->{smooth};
3585 3658
… …
3590 cf::face::set_smooth $idx, $smooth; 3663 cf::face::set_smooth $idx, $smooth;
3591 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3664 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3592 } else { 3665 } else {
3593 error "smooth face '$info->{smooth}' not found for face '$face'"; 3666 error "smooth face '$info->{smooth}' not found for face '$face'";
3594 } 3667 }
3595
3596 cf::cede_to_tick;
3597 } 3668 }
3598 } 3669 }
3599 3670
3600 { 3671 {
3601 my $anims = $facedata->{animinfo}; 3672 my $anims = $facedata->{animinfo};
3602 3673
3603 while (my ($anim, $info) = each %$anims) { 3674 while (my ($anim, $info) = each %$anims) {
3604 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3675 cf::anim::set $anim, $info->{frames}, $info->{facings};
3605 cf::cede_to_tick;
3606 } 3676 }
3607 3677
3608 cf::anim::invalidate_all; # d'oh 3678 cf::anim::invalidate_all; # d'oh
3609 } 3679 }
3610 3680
… …
3615 if (defined (my $type = $info->{type})) { 3685 if (defined (my $type = $info->{type})) {
3616 # 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
3617 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3687 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3618 3688
3619 cf::face::set_type $idx, $type; 3689 cf::face::set_type $idx, $type;
3620 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};
3621 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
3622 $FACEHASH{$info->{hash}} = $idx;#d# 3694 $cf::face::HASH{$info->{hash}} = $idx;
3623 } else { 3695 } else {
3624# $RESOURCE{$name} = $info; # unused 3696# $RESOURCE{$name} = $info; # unused
3625 } 3697 }
3626
3627 cf::cede_to_tick;
3628 } 3698 }
3629 } 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;
3630 3710
3631 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
3632 3714
3633 1 3715 1
3634} 3716}
3635 3717
3636register_exticmd fx_want => sub { 3718register_exticmd fx_want => sub {
… …
3652} 3734}
3653 3735
3654sub reload_exp_table { 3736sub reload_exp_table {
3655 _reload_exp_table; 3737 _reload_exp_table;
3656 3738
3739 cf::face::set
3657 add_face "res/exp_table" => FT_RSRC, 3740 "res/exp_table" => FT_RSRC,
3658 JSON::XS->new->utf8->canonical->encode ( 3741 JSON::XS->new->utf8->canonical->encode (
3659 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level] 3742 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3660 ); 3743 );
3661} 3744}
3662 3745
3663sub reload_materials { 3746sub reload_materials {
3664 _reload_materials; 3747 _reload_materials;
3665} 3748}
… …
3677 if exists $_->{match}; 3760 if exists $_->{match};
3678 } 3761 }
3679} 3762}
3680 3763
3681sub reload_facedata { 3764sub reload_facedata {
3682 load_facedata "$DATADIR/facedata" 3765 load_facedata $DATADIR
3683 or die "unable to load facedata\n"; 3766 or die "unable to load facedata\n";
3684} 3767}
3685 3768
3686sub reload_archetypes { 3769sub reload_archetypes {
3687 load_resource_file "$DATADIR/archetypes" 3770 load_resource_file "$DATADIR/archetypes"
3688 or die "unable to load archetypes\n"; 3771 or die "unable to load archetypes\n";
3689 3772
3773 cf::face::set
3690 add_face "res/skill_info" => FT_RSRC, 3774 "res/skill_info" => FT_RSRC,
3691 JSON::XS->new->utf8->canonical->encode ( 3775 JSON::XS->new->utf8->canonical->encode (
3692 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1] 3776 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3693 ); 3777 );
3778
3779 cf::face::set
3694 add_face "res/spell_paths" => FT_RSRC, 3780 "res/spell_paths" => FT_RSRC,
3695 JSON::XS->new->utf8->canonical->encode ( 3781 JSON::XS->new->utf8->canonical->encode (
3696 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1] 3782 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3697 ); 3783 );
3698} 3784}
3699 3785
3700sub reload_treasures { 3786sub reload_treasures {
3701 load_resource_file "$DATADIR/treasures" 3787 load_resource_file "$DATADIR/treasures"
3702 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