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.585 by root, Tue Oct 30 20:18:00 2012 UTC vs.
Revision 1.590 by root, Sun Nov 4 02:20:11 2012 UTC

… …
32use Safe; 32use Safe;
33use Safe::Hole; 33use Safe::Hole;
34use Storable (); 34use Storable ();
35use Carp (); 35use Carp ();
36 36
37use Guard (); 37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
40
38use Coro (); 41use Coro ();
39use Coro::State; 42use Coro::State;
40use Coro::Handle; 43use Coro::Handle;
41use Coro::EV; 44use Coro::EV;
42use Coro::AnyEvent; 45use Coro::AnyEvent;
… …
48use Coro::AIO; 51use Coro::AIO;
49use Coro::BDB 1.6; 52use Coro::BDB 1.6;
50use Coro::Storable; 53use Coro::Storable;
51use Coro::Util (); 54use Coro::Util ();
52 55
56use Guard ();
53use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
54use BDB (); 58use BDB ();
55use Data::Dumper; 59use Data::Dumper;
56use Fcntl; 60use Fcntl;
57use YAML::XS (); 61use YAML::XS ();
… …
336)) { 340)) {
337 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 341 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
338} 342}
339 343
340$EV::DIED = sub { 344$EV::DIED = sub {
341 Carp::cluck "error in event callback: @_"; 345 warn "error in event callback: $@";
342}; 346};
343 347
344############################################################################# 348#############################################################################
345 349
346sub fork_call(&@); 350sub fork_call(&@);
… …
3231=cut 3235=cut
3232 3236
3233sub cf::client::ext_msg($$@) { 3237sub cf::client::ext_msg($$@) {
3234 my ($self, $type, @msg) = @_; 3238 my ($self, $type, @msg) = @_;
3235 3239
3236 if ($self->extcmd == 2) {
3237 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3240 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3238 } elsif ($self->extcmd == 1) { # TODO: remove
3239 push @msg, msgtype => "event_$type";
3240 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3241 }
3242} 3241}
3243 3242
3244=item $client->ext_reply ($msgid, @msg) 3243=item $client->ext_reply ($msgid, @msg)
3245 3244
3246Sends an ext reply to the client. 3245Sends an ext reply to the client.
3247 3246
3248=cut 3247=cut
3249 3248
3250sub cf::client::ext_reply($$@) { 3249sub cf::client::ext_reply($$@) {
3251 my ($self, $id, @msg) = @_; 3250 my ($self, $id, @msg) = @_;
3252
3253 return unless $self->extcmd == 2;
3254 3251
3255 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3252 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3256} 3253}
3257 3254
3258=item $success = $client->query ($flags, "text", \&cb) 3255=item $success = $client->query ($flags, "text", \&cb)
… …
3505############################################################################# 3502#############################################################################
3506# the server's init and main functions 3503# the server's init and main functions
3507 3504
3508our %FACEHASH; # hash => idx, #d# HACK for http server 3505our %FACEHASH; # hash => idx, #d# HACK for http server
3509 3506
3507# internal api, not fianlised
3508sub add_face {
3509 my ($name, $type, $data) = @_;
3510
3511 my $idx = cf::face::find $name;
3512
3513 if ($idx) {
3514 delete $FACEHASH{cf::face::get_chksum $idx};
3515 } else {
3516 $idx = cf::face::alloc $name;
3517 }
3518
3519 my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
3520
3521 cf::face::set_type $idx, $type;
3522 cf::face::set_data $idx, 0, $data, $hash;
3523 cf::face::set_meta $idx, $type & 1 ? undef : undef;
3524 $FACEHASH{$hash} = $idx;#d#
3525
3526 $idx
3527}
3528
3510sub load_facedata($) { 3529sub load_facedata($) {
3511 my ($path) = @_; 3530 my ($path) = @_;
3512 3531
3513 # HACK to clear player env face cache, we need some signal framework 3532 # HACK to clear player env face cache, we need some signal framework
3514 # for this (global event?) 3533 # for this (global event?)
… …
3521 my $facedata = decode_storable load_file $path; 3540 my $facedata = decode_storable load_file $path;
3522 3541
3523 $facedata->{version} == 2 3542 $facedata->{version} == 2
3524 or cf::cleanup "$path: version mismatch, cannot proceed."; 3543 or cf::cleanup "$path: version mismatch, cannot proceed.";
3525 3544
3526 # patch in the exptable
3527 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3528 $facedata->{resource}{"res/exp_table"} = {
3529 type => FT_RSRC,
3530 data => $exp_table,
3531 hash => (Digest::MD5::md5 $exp_table),
3532 };
3533 cf::cede_to_tick; 3545 cf::cede_to_tick;
3534 3546
3535 { 3547 {
3536 my $faces = $facedata->{faceinfo}; 3548 my $faces = $facedata->{faceinfo};
3537 3549
… …
3583 while (my ($name, $info) = each %$res) { 3595 while (my ($name, $info) = each %$res) {
3584 if (defined (my $type = $info->{type})) { 3596 if (defined (my $type = $info->{type})) {
3585 # TODO: different hash - must free and use new index, or cache ixface data queue 3597 # TODO: different hash - must free and use new index, or cache ixface data queue
3586 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3598 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3587 3599
3600 cf::face::set_type $idx, $type;
3588 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3601 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3589 cf::face::set_type $idx, $type;
3590 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already 3602 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3591 $FACEHASH{$info->{hash}} = $idx;#d# 3603 $FACEHASH{$info->{hash}} = $idx;#d#
3592 } else { 3604 } else {
3593# $RESOURCE{$name} = $info; # unused 3605# $RESOURCE{$name} = $info; # unused
3594 } 3606 }
… …
3618 cf::arch::commit_load; 3630 cf::arch::commit_load;
3619 3631
3620 $status 3632 $status
3621} 3633}
3622 3634
3635sub reload_exp_table {
3636 _reload_exp_table;
3637
3638 add_face "res/exp_table" => FT_RSRC,
3639 JSON::XS->new->utf8->canonical->encode (
3640 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3641 );
3642}
3643
3644sub reload_materials {
3645 _reload_materials;
3646}
3647
3623sub reload_regions { 3648sub reload_regions {
3624 # HACK to clear player env face cache, we need some signal framework 3649 # HACK to clear player env face cache, we need some signal framework
3625 # for this (global event?) 3650 # for this (global event?)
3626 %ext::player_env::MUSIC_FACE_CACHE = (); 3651 %ext::player_env::MUSIC_FACE_CACHE = ();
3627 3652
… …
3640} 3665}
3641 3666
3642sub reload_archetypes { 3667sub reload_archetypes {
3643 load_resource_file "$DATADIR/archetypes" 3668 load_resource_file "$DATADIR/archetypes"
3644 or die "unable to load archetypes\n"; 3669 or die "unable to load archetypes\n";
3670
3671 add_face "res/skill_info" => FT_RSRC,
3672 JSON::XS->new->utf8->canonical->encode (
3673 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3674 );
3675 add_face "res/spell_paths" => FT_RSRC,
3676 JSON::XS->new->utf8->canonical->encode (
3677 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3678 );
3645} 3679}
3646 3680
3647sub reload_treasures { 3681sub reload_treasures {
3648 load_resource_file "$DATADIR/treasures" 3682 load_resource_file "$DATADIR/treasures"
3649 or die "unable to load treasurelists\n"; 3683 or die "unable to load treasurelists\n";
… …
3670} 3704}
3671 3705
3672sub reload_resources { 3706sub reload_resources {
3673 trace "reloading resource files...\n"; 3707 trace "reloading resource files...\n";
3674 3708
3675 reload_exp_table;
3676 reload_materials; 3709 reload_materials;
3677 reload_facedata; 3710 reload_facedata;
3711 reload_exp_table;
3678 reload_sound; 3712 reload_sound;
3679 reload_archetypes; 3713 reload_archetypes;
3680 reload_regions; 3714 reload_regions;
3681 reload_treasures; 3715 reload_treasures;
3682 3716
… …
3741 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3775 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3742 3776
3743 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3777 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3744 3778
3745 # we must not ever block the main coroutine 3779 # we must not ever block the main coroutine
3746 local $Coro::idle = sub { 3780 $Coro::idle = sub {
3747 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3781 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3748 (async { 3782 (async {
3749 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3783 $Coro::current->{desc} = "IDLE BUG HANDLER";
3750 EV::loop EV::LOOP_ONESHOT; 3784 EV::loop EV::LOOP_ONESHOT;
3751 })->prio (Coro::PRIO_MAX); 3785 })->prio (Coro::PRIO_MAX);

Diff Legend

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