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.334 by root, Mon Aug 20 22:09:04 2007 UTC vs.
Revision 1.344 by root, Mon Aug 27 02:43:38 2007 UTC

… …
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util (); 24use Coro::Util ();
25 25
26use JSON::XS 1.4 (); 26use JSON::XS ();
27use BDB (); 27use BDB ();
28use Data::Dumper; 28use Data::Dumper;
29use Digest::MD5; 29use Digest::MD5;
30use Fcntl; 30use Fcntl;
31use YAML::Syck (); 31use YAML::Syck ();
… …
1149 my ($type, $reply, @payload) = 1149 my ($type, $reply, @payload) =
1150 "ARRAY" eq ref $msg 1150 "ARRAY" eq ref $msg
1151 ? @$msg 1151 ? @$msg
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153 1153
1154 my @reply;
1155
1154 if (my $cb = $EXTCMD{$type}) { 1156 if (my $cb = $EXTCMD{$type}) {
1155 my @reply = $cb->($pl, @payload); 1157 @reply = $cb->($pl, @payload);
1156
1157 $pl->ext_reply ($reply, @reply)
1158 if $reply;
1159 } 1158 }
1159
1160 $pl->ext_reply ($reply, @reply)
1161 if $reply;
1162
1160 } else { 1163 } else {
1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1164 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1162 } 1165 }
1163 1166
1164 cf::override; 1167 cf::override;
… …
1505=cut 1508=cut
1506 1509
1507sub ext_reply($$@) { 1510sub ext_reply($$@) {
1508 my ($self, $id, @msg) = @_; 1511 my ($self, $id, @msg) = @_;
1509 1512
1510 if ($self->ns->extcmd == 2) { 1513 $self->ns->ext_reply ($id, @msg)
1511 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1512 } elsif ($self->ns->extcmd == 1) {
1513 #TODO: version 1, remove
1514 unshift @msg, msgtype => "reply", msgid => $id;
1515 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1516 }
1517} 1514}
1518 1515
1519=item $player->ext_msg ($type, @msg) 1516=item $player->ext_msg ($type, @msg)
1520 1517
1521Sends an ext event to the client. 1518Sends an ext event to the client.
… …
1950} 1947}
1951 1948
1952sub do_load_sync { 1949sub do_load_sync {
1953 my ($map) = @_; 1950 my ($map) = @_;
1954 1951
1952 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1953 if $Coro::current == $Coro::main;
1954
1955 cf::sync_job { $map->load }; 1955 cf::sync_job { $map->load };
1956} 1956}
1957 1957
1958our %MAP_PREFETCH; 1958our %MAP_PREFETCH;
1959our $MAP_PREFETCHER = undef; 1959our $MAP_PREFETCHER = undef;
1960 1960
1961sub find_async { 1961sub find_async {
1962 my ($path, $origin) = @_; 1962 my ($path, $origin, $load) = @_;
1963 1963
1964 $path = normalise $path, $origin && $origin->{path}; 1964 $path = normalise $path, $origin && $origin->{path};
1965 1965
1966 if (my $map = $cf::MAP{$path}) { 1966 if (my $map = $cf::MAP{$path}) {
1967 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1967 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1968 } 1968 }
1969 1969
1970 undef $MAP_PREFETCH{$path}; 1970 $MAP_PREFETCH{$path} |= $load;
1971
1971 $MAP_PREFETCHER ||= cf::async { 1972 $MAP_PREFETCHER ||= cf::async {
1972 while (%MAP_PREFETCH) { 1973 while (%MAP_PREFETCH) {
1973 for my $path (keys %MAP_PREFETCH) { 1974 while (my ($k, $v) = each %MAP_PREFETCH) {
1974 if (my $map = find $path) { 1975 if (my $map = find $k) {
1975 $map->load; 1976 $map->load if $v;
1976 } 1977 }
1977 1978
1978 delete $MAP_PREFETCH{$path}; 1979 delete $MAP_PREFETCH{$k};
1979 } 1980 }
1980 } 1981 }
1981 undef $MAP_PREFETCHER; 1982 undef $MAP_PREFETCHER;
1982 }; 1983 };
1983 $MAP_PREFETCHER->prio (6); 1984 $MAP_PREFETCHER->prio (6);
… …
2557=cut 2558=cut
2558 2559
2559sub cf::client::ext_msg($$@) { 2560sub cf::client::ext_msg($$@) {
2560 my ($self, $type, @msg) = @_; 2561 my ($self, $type, @msg) = @_;
2561 2562
2562 my $extcmd = $self->extcmd;
2563
2564 if ($extcmd == 2) { 2563 if ($self->extcmd == 2) {
2565 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2564 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2566 } elsif ($extcmd == 1) { # TODO: remove 2565 } elsif ($self->extcmd == 1) { # TODO: remove
2567 push @msg, msgtype => "event_$type"; 2566 push @msg, msgtype => "event_$type";
2567 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2568 }
2569}
2570
2571=item $client->ext_reply ($msgid, @msg)
2572
2573Sends an ext reply to the client.
2574
2575=cut
2576
2577sub cf::client::ext_reply($$@) {
2578 my ($self, $id, @msg) = @_;
2579
2580 if ($self->extcmd == 2) {
2581 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2582 } elsif ($self->extcmd == 1) {
2583 #TODO: version 1, remove
2584 unshift @msg, msgtype => "reply", msgid => $id;
2568 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2585 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2569 } 2586 }
2570} 2587}
2571 2588
2572=item $success = $client->query ($flags, "text", \&cb) 2589=item $success = $client->query ($flags, "text", \&cb)
… …
2634 my ($type, $reply, @payload) = 2651 my ($type, $reply, @payload) =
2635 "ARRAY" eq ref $msg 2652 "ARRAY" eq ref $msg
2636 ? @$msg 2653 ? @$msg
2637 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2654 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2638 2655
2656 my @reply;
2657
2639 if (my $cb = $EXTICMD{$type}) { 2658 if (my $cb = $EXTICMD{$type}) {
2640 my @reply = $cb->($ns, @payload); 2659 @reply = $cb->($ns, @payload);
2641
2642 $ns->ext_reply ($reply, @reply)
2643 if $reply;
2644 } 2660 }
2661
2662 $ns->ext_reply ($reply, @reply)
2663 if $reply;
2664
2645 } else { 2665 } else {
2646 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2666 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2647 } 2667 }
2648 2668
2649 cf::override; 2669 cf::override;
… …
2710 2730
2711The following functions and methods are available within a safe environment: 2731The following functions and methods are available within a safe environment:
2712 2732
2713 cf::object 2733 cf::object
2714 contr pay_amount pay_player map x y force_find force_add 2734 contr pay_amount pay_player map x y force_find force_add
2715 insert remove name archname title slaying race 2735 insert remove name archname title slaying race decrease_ob_nr
2716 2736
2717 cf::object::player 2737 cf::object::player
2718 player 2738 player
2719 2739
2720 cf::player 2740 cf::player
… …
2725 2745
2726=cut 2746=cut
2727 2747
2728for ( 2748for (
2729 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2749 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2730 insert remove inv name archname title slaying race)], 2750 insert remove inv name archname title slaying race
2751 decrease_ob_nr)],
2731 ["cf::object::player" => qw(player)], 2752 ["cf::object::player" => qw(player)],
2732 ["cf::player" => qw(peaceful)], 2753 ["cf::player" => qw(peaceful)],
2733 ["cf::map" => qw(trigger)], 2754 ["cf::map" => qw(trigger)],
2734) { 2755) {
2735 no strict 'refs'; 2756 no strict 'refs';
… …
2811# the server's init and main functions 2832# the server's init and main functions
2812 2833
2813sub load_facedata($) { 2834sub load_facedata($) {
2814 my ($path) = @_; 2835 my ($path) = @_;
2815 2836
2816 my $enc = JSON::XS->new->utf8->canonical; 2837 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2817 2838
2818 warn "loading facedata from $path\n"; 2839 warn "loading facedata from $path\n";
2819 2840
2820 my $facedata; 2841 my $facedata;
2821 0 < aio_load $path, $facedata 2842 0 < aio_load $path, $facedata
… …
2825 2846
2826 $facedata->{version} == 2 2847 $facedata->{version} == 2
2827 or cf::cleanup "$path: version mismatch, cannot proceed."; 2848 or cf::cleanup "$path: version mismatch, cannot proceed.";
2828 2849
2829 # patch in the exptable 2850 # patch in the exptable
2830 cf::cede_to_tick;
2831 $facedata->{resource}{"res/exp_table"} = { 2851 $facedata->{resource}{"res/exp_table"} = {
2832 type => FT_RSRC, 2852 type => FT_RSRC,
2833 data => $enc->encode ([map cf::level_to_min_exp $_, 0 .. cf::settings->max_level]), 2853 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2834 }; 2854 };
2835 cf::cede_to_tick; 2855 cf::cede_to_tick;
2836 2856
2837 { 2857 {
2838 my $faces = $facedata->{faceinfo}; 2858 my $faces = $facedata->{faceinfo};
… …
2891 name => $name, 2911 name => $name,
2892 %{ $info->{meta} || {} }, 2912 %{ $info->{meta} || {} },
2893 }); 2913 });
2894 2914
2895 $data = pack "(w/a*)*", $meta, $info->{data}; 2915 $data = pack "(w/a*)*", $meta, $info->{data};
2916 } else {
2917 $data = $info->{data};
2896 } 2918 }
2897 2919
2898 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data; 2920 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2899 cf::face::set_type $idx, $info->{type}; 2921 cf::face::set_type $idx, $info->{type};
2900 2922

Diff Legend

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