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.594 by root, Fri Nov 9 02:50:50 2012 UTC vs.
Revision 1.603 by root, Tue Nov 13 01:12:23 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 {
… …
3519=cut 3515=cut
3520 3516
3521############################################################################# 3517#############################################################################
3522# the server's init and main functions 3518# the server's init and main functions
3523 3519
3524our %FACEHASH; # hash => idx, #d# HACK for http server 3520{
3521 package cf::face;
3525 3522
3523 our %HASH; # hash => idx
3524 our @DATA; # dynamically-created facedata, only faceste 0 used
3525 our @FOFS; # file offset, if > 0
3526 our @SIZE; # size of face, in octets
3527 our @META; # meta hash of face, if any
3528 our $DATAFH; # facedata filehandle
3529
3526# internal api, not fianlised 3530 # internal api, not finalised
3527sub add_face { 3531 sub set {
3528 my ($name, $type, $data) = @_; 3532 my ($name, $type, $data) = @_;
3529 3533
3530 my $idx = cf::face::find $name; 3534 my $idx = cf::face::find $name;
3531 3535
3532 if ($idx) { 3536 if ($idx) {
3533 delete $FACEHASH{cf::face::get_chksum $idx}; 3537 delete $HASH{cf::face::get_chksum $idx};
3534 } else { 3538 } else {
3535 $idx = cf::face::alloc $name; 3539 $idx = cf::face::alloc $name;
3536 } 3540 }
3537 3541
3538 my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data; 3542 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3539 3543
3540 cf::face::set_type $idx, $type; 3544 cf::face::set_type $idx, $type;
3541 cf::face::set_data $idx, 0, $data, $hash; 3545 cf::face::set_csum $idx, 0, $hash;
3542 cf::face::set_meta $idx, $type & 1 ? undef : undef; 3546
3547 # we need to destroy the SV itself, not just modify it, as a running ix
3548 # might hold a reference to it: "delete" achieves that.
3549 delete $FOFS[0][$idx];
3550 delete $DATA[0][$idx];
3551 $DATA[0][$idx] = $data;
3552 $SIZE[0][$idx] = length $data;
3553 delete $META[$idx];
3543 $FACEHASH{$hash} = $idx;#d# 3554 $HASH{$hash} = $idx;#d#
3544 3555
3545 $idx 3556 $idx
3557 }
3558
3559 sub _get_data($$$) {
3560 my ($idx, $set, $cb) = @_;
3561
3562 if (defined $DATA[$set][$idx]) {
3563 $cb->($DATA[$set][$idx]);
3564 } elsif (my $fofs = $FOFS[$set][$idx]) {
3565 my $size = $SIZE[$set][$idx];
3566 my $buf;
3567 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3568 if ($_[0] == $size) {
3569 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3570 $cb->($buf);
3571 } else {
3572 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3573 }
3574 };
3575 } else {
3576 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3577 }
3578 }
3579
3580 # rather ineffient
3581 sub cf::face::get_data($;$) {
3582 my ($idx, $set) = @_;
3583
3584 _get_data $idx, $set, Coro::rouse_cb;
3585 Coro::rouse_wait
3586 }
3587
3588 sub cf::face::ix {
3589 my ($ns, $set, $idx, $pri) = @_;
3590
3591 _get_data $idx, $set, sub {
3592 $ns->ix_send ($idx, $pri, $_[0]);
3593 };
3594 }
3546} 3595}
3547 3596
3548sub load_facedata($) { 3597sub load_facedata($) {
3549 my ($path) = @_; 3598 my ($path) = @_;
3550 3599
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; 3600 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3556 3601
3557 trace "loading facedata from $path\n"; 3602 trace "loading facedata from $path\n";
3558 3603
3559 my $facedata = decode_storable load_file $path; 3604 my $facedata = decode_storable load_file "$path/faceinfo";
3560 3605
3561 $facedata->{version} == 2 3606 $facedata->{version} == 2
3562 or cf::cleanup "$path: version mismatch, cannot proceed."; 3607 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3563 3608
3564 cf::cede_to_tick; 3609 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3610 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3611
3612 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3613
3614 # BEGIN ATOMIC
3615 # from here on, everything must be atomic - no thread switch allowed
3616 my $t1 = EV::time;
3565 3617
3566 { 3618 {
3567 my $faces = $facedata->{faceinfo}; 3619 my $faces = $facedata->{faceinfo};
3568 3620
3569 for my $face (sort keys %$faces) { 3621 for my $face (sort keys %$faces) {
3570 my $info = $faces->{$face}; 3622 my $info = $faces->{$face};
3571 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3623 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3572 3624
3573 cf::face::set_visibility $idx, $info->{visibility}; 3625 cf::face::set_visibility $idx, $info->{visibility};
3574 cf::face::set_magicmap $idx, $info->{magicmap}; 3626 cf::face::set_magicmap $idx, $info->{magicmap};
3575 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3627 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}; 3628 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} ; 3629 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3578 $FACEHASH{$info->{hash64}} = $idx;#d# 3630 $cf::face::HASH{$info->{hash64}} = $idx;
3579 3631 delete $cf::face::META[$idx];
3580 cf::cede_to_tick;
3581 } 3632 }
3582 3633
3583 while (my ($face, $info) = each %$faces) { 3634 while (my ($face, $info) = each %$faces) {
3584 next unless $info->{smooth}; 3635 next unless $info->{smooth};
3585 3636
… …
3590 cf::face::set_smooth $idx, $smooth; 3641 cf::face::set_smooth $idx, $smooth;
3591 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3642 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3592 } else { 3643 } else {
3593 error "smooth face '$info->{smooth}' not found for face '$face'"; 3644 error "smooth face '$info->{smooth}' not found for face '$face'";
3594 } 3645 }
3595
3596 cf::cede_to_tick;
3597 } 3646 }
3598 } 3647 }
3599 3648
3600 { 3649 {
3601 my $anims = $facedata->{animinfo}; 3650 my $anims = $facedata->{animinfo};
3602 3651
3603 while (my ($anim, $info) = each %$anims) { 3652 while (my ($anim, $info) = each %$anims) {
3604 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3653 cf::anim::set $anim, $info->{frames}, $info->{facings};
3605 cf::cede_to_tick;
3606 } 3654 }
3607 3655
3608 cf::anim::invalidate_all; # d'oh 3656 cf::anim::invalidate_all; # d'oh
3609 } 3657 }
3610 3658
… …
3615 if (defined (my $type = $info->{type})) { 3663 if (defined (my $type = $info->{type})) {
3616 # TODO: different hash - must free and use new index, or cache ixface data queue 3664 # 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; 3665 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3618 3666
3619 cf::face::set_type $idx, $type; 3667 cf::face::set_type $idx, $type;
3620 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3668 cf::face::set_csum $idx, 0, $info->{hash};
3669 $cf::face::SIZE[0][$idx] = $info->{size};
3670 $cf::face::FOFS[0][$idx] = $info->{fofs};
3621 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already 3671 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3622 $FACEHASH{$info->{hash}} = $idx;#d# 3672 $cf::face::HASH{$info->{hash}} = $idx;
3623 } else { 3673 } else {
3624# $RESOURCE{$name} = $info; # unused 3674# $RESOURCE{$name} = $info; # unused
3625 } 3675 }
3626
3627 cf::cede_to_tick;
3628 } 3676 }
3629 } 3677 }
3678
3679 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3680
3681 # HACK to clear player env face cache, we need some signal framework
3682 # for this (global event?)
3683 %ext::player_env::MUSIC_FACE_CACHE = ();
3684
3685 # END ATOMIC
3686
3687 cf::debug "facedata atomic update time ", EV::time - $t1;
3630 3688
3631 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3689 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3690
3691 aio_close $fh if $fh; # close old facedata
3632 3692
3633 1 3693 1
3634} 3694}
3635 3695
3636register_exticmd fx_want => sub { 3696register_exticmd fx_want => sub {
… …
3652} 3712}
3653 3713
3654sub reload_exp_table { 3714sub reload_exp_table {
3655 _reload_exp_table; 3715 _reload_exp_table;
3656 3716
3717 cf::face::set
3657 add_face "res/exp_table" => FT_RSRC, 3718 "res/exp_table" => FT_RSRC,
3658 JSON::XS->new->utf8->canonical->encode ( 3719 JSON::XS->new->utf8->canonical->encode (
3659 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level] 3720 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3660 ); 3721 );
3661} 3722}
3662 3723
3663sub reload_materials { 3724sub reload_materials {
3664 _reload_materials; 3725 _reload_materials;
3665} 3726}
… …
3677 if exists $_->{match}; 3738 if exists $_->{match};
3678 } 3739 }
3679} 3740}
3680 3741
3681sub reload_facedata { 3742sub reload_facedata {
3682 load_facedata "$DATADIR/facedata" 3743 load_facedata $DATADIR
3683 or die "unable to load facedata\n"; 3744 or die "unable to load facedata\n";
3684} 3745}
3685 3746
3686sub reload_archetypes { 3747sub reload_archetypes {
3687 load_resource_file "$DATADIR/archetypes" 3748 load_resource_file "$DATADIR/archetypes"
3688 or die "unable to load archetypes\n"; 3749 or die "unable to load archetypes\n";
3689 3750
3751 cf::face::set
3690 add_face "res/skill_info" => FT_RSRC, 3752 "res/skill_info" => FT_RSRC,
3691 JSON::XS->new->utf8->canonical->encode ( 3753 JSON::XS->new->utf8->canonical->encode (
3692 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1] 3754 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3693 ); 3755 );
3756
3757 cf::face::set
3694 add_face "res/spell_paths" => FT_RSRC, 3758 "res/spell_paths" => FT_RSRC,
3695 JSON::XS->new->utf8->canonical->encode ( 3759 JSON::XS->new->utf8->canonical->encode (
3696 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1] 3760 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3697 ); 3761 );
3698} 3762}
3699 3763
3700sub reload_treasures { 3764sub reload_treasures {
3701 load_resource_file "$DATADIR/treasures" 3765 load_resource_file "$DATADIR/treasures"
3702 or die "unable to load treasurelists\n"; 3766 or die "unable to load treasurelists\n";
… …
3718 3782
3719 while (my ($k, $v) = each %{$soundconf->{event}}) { 3783 while (my ($k, $v) = each %{$soundconf->{event}}) {
3720 my $face = cf::face::find "sound/$v"; 3784 my $face = cf::face::find "sound/$v";
3721 cf::sound::set $k => $face; 3785 cf::sound::set $k => $face;
3722 } 3786 }
3723}
3724
3725#d# move docstuff to help or so
3726our %DOCSTRING;
3727
3728sub reload_pod {
3729 trace "loading pods $PODDIR\n";
3730
3731 %DOCSTRING = ();
3732 my @command_list;
3733
3734 for (
3735 [0, "command_help"],
3736 [1, "emote_help"],
3737 [2, "dmcommand_help"],
3738 ) {
3739 my ($type, $path) = @$_;
3740
3741 my $paragraphs = &cf::pod::load_pod ("$PODDIR/$path.pod")
3742 or die "unable to load $path";
3743
3744 my $level = 1e9;
3745 my $rpar;
3746
3747 for my $par (@$paragraphs) {
3748 if ($par->{type} eq "head2") {
3749 # this code taken almost verbatim from DC/Protocol.pm
3750
3751 if ($par->{markup} =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x) {
3752 my $cmd = $1;
3753 my @args = split /\|/, $2;
3754 @args = (".*") unless @args;
3755
3756 $_ = $_ eq ".*" ? "" : " $_"
3757 for @args;
3758
3759 my @variants = map "$cmd$_", sort { (length $a) <=> (length $b) } @args;
3760
3761 $rpar = \($DOCSTRING{"command/$cmd"} = &cf::pod::as_cfpod ([$par]));
3762
3763 push @command_list, [$type, \@variants];
3764 $level = $par->{level};
3765 } else {
3766 error "$par->{markup}: unparsable command heading";
3767 }
3768 } elsif ($par->{level} > $level) {
3769 $$rpar .= &cf::pod::as_cfpod ([$par]);
3770 }
3771
3772 cf::cede_to_tick;
3773 }
3774 }
3775
3776 @command_list = sort {
3777 $a->[0] <=> $b->[0]
3778 or $a->[1] cmp $b->[1]
3779 } @command_list;
3780
3781 cf::cede_to_tick;
3782
3783 add_face "res/command_list" => FT_RSRC,
3784 JSON::XS->new->utf8->encode (\@command_list);
3785} 3787}
3786 3788
3787sub reload_resources { 3789sub reload_resources {
3788 trace "reloading resource files...\n"; 3790 trace "reloading resource files...\n";
3789 3791
… …
3792 reload_exp_table; 3794 reload_exp_table;
3793 reload_sound; 3795 reload_sound;
3794 reload_archetypes; 3796 reload_archetypes;
3795 reload_regions; 3797 reload_regions;
3796 reload_treasures; 3798 reload_treasures;
3797 reload_pod;
3798 3799
3799 trace "finished reloading resource files\n"; 3800 trace "finished reloading resource files\n";
3800} 3801}
3801 3802
3802sub reload_config { 3803sub reload_config {

Diff Legend

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