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.332 by root, Sat Aug 18 17:33:53 2007 UTC vs.
Revision 1.345 by root, Tue Aug 28 19:30:11 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.
… …
1852 local $self->{deny_reset} = 1; # loading can take a long time 1849 local $self->{deny_reset} = 1; # loading can take a long time
1853 1850
1854 my $path = $self->{path}; 1851 my $path = $self->{path};
1855 1852
1856 { 1853 {
1854 my $guard1 = cf::lock_acquire "map_data:$path";
1857 my $guard = cf::lock_acquire "map_load:$path"; 1855 my $guard2 = cf::lock_acquire "map_load:$path";
1858 1856
1859 return if $self->in_memory != cf::MAP_SWAPPED; 1857 return if $self->in_memory != cf::MAP_SWAPPED;
1860 1858
1861 $self->in_memory (cf::MAP_LOADING); 1859 $self->in_memory (cf::MAP_LOADING);
1862 1860
… …
1916 1914
1917 $self 1915 $self
1918} 1916}
1919 1917
1920# find and load all maps in the 3x3 area around a map 1918# find and load all maps in the 3x3 area around a map
1921sub load_diag { 1919sub load_neighbours {
1922 my ($map) = @_; 1920 my ($map) = @_;
1923 1921
1924 my @diag; # diagonal neighbours 1922 my @neigh; # diagonal neighbours
1925 1923
1926 for (0 .. 3) { 1924 for (0 .. 3) {
1927 my $neigh = $map->tile_path ($_) 1925 my $neigh = $map->tile_path ($_)
1928 or next; 1926 or next;
1929 $neigh = find $neigh, $map 1927 $neigh = find $neigh, $map
1930 or next; 1928 or next;
1931 $neigh->load; 1929 $neigh->load;
1932 1930
1931 push @neigh,
1933 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1932 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1934 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1933 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1935 } 1934 }
1936 1935
1937 for (@diag) { 1936 for (grep defined $_->[0], @neigh) {
1937 my ($path, $origin) = @$_;
1938 my $neigh = find @$_ 1938 my $neigh = find $path, $origin
1939 or next; 1939 or next;
1940 $neigh->load; 1940 $neigh->load;
1941 } 1941 }
1942} 1942}
1943 1943
… …
1948} 1948}
1949 1949
1950sub do_load_sync { 1950sub do_load_sync {
1951 my ($map) = @_; 1951 my ($map) = @_;
1952 1952
1953 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1954 if $Coro::current == $Coro::main;
1955
1953 cf::sync_job { $map->load }; 1956 cf::sync_job { $map->load };
1954} 1957}
1955 1958
1956our %MAP_PREFETCH; 1959our %MAP_PREFETCH;
1957our $MAP_PREFETCHER = undef; 1960our $MAP_PREFETCHER = undef;
1958 1961
1959sub find_async { 1962sub find_async {
1960 my ($path, $origin) = @_; 1963 my ($path, $origin, $load) = @_;
1961 1964
1962 $path = normalise $path, $origin && $origin->{path}; 1965 $path = normalise $path, $origin && $origin->{path};
1963 1966
1964 if (my $map = $cf::MAP{$path}) { 1967 if (my $map = $cf::MAP{$path}) {
1965 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1968 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1966 } 1969 }
1967 1970
1968 undef $MAP_PREFETCH{$path}; 1971 $MAP_PREFETCH{$path} |= $load;
1972
1969 $MAP_PREFETCHER ||= cf::async { 1973 $MAP_PREFETCHER ||= cf::async {
1970 while (%MAP_PREFETCH) { 1974 while (%MAP_PREFETCH) {
1971 for my $path (keys %MAP_PREFETCH) { 1975 while (my ($k, $v) = each %MAP_PREFETCH) {
1972 if (my $map = find $path) { 1976 if (my $map = find $k) {
1973 $map->load; 1977 $map->load if $v;
1974 } 1978 }
1975 1979
1976 delete $MAP_PREFETCH{$path}; 1980 delete $MAP_PREFETCH{$k};
1977 } 1981 }
1978 } 1982 }
1979 undef $MAP_PREFETCHER; 1983 undef $MAP_PREFETCHER;
1980 }; 1984 };
1981 $MAP_PREFETCHER->prio (6); 1985 $MAP_PREFETCHER->prio (6);
… …
1984} 1988}
1985 1989
1986sub save { 1990sub save {
1987 my ($self) = @_; 1991 my ($self) = @_;
1988 1992
1989 my $lock = cf::lock_acquire "map_data:" . $self->path; 1993 my $lock = cf::lock_acquire "map_data:$self->{path}";
1990 1994
1991 $self->{last_save} = $cf::RUNTIME; 1995 $self->{last_save} = $cf::RUNTIME;
1992 1996
1993 return unless $self->dirty; 1997 return unless $self->dirty;
1994 1998
… …
2017 my ($self) = @_; 2021 my ($self) = @_;
2018 2022
2019 # save first because save cedes 2023 # save first because save cedes
2020 $self->save; 2024 $self->save;
2021 2025
2022 my $lock = cf::lock_acquire "map_data:" . $self->path; 2026 my $lock = cf::lock_acquire "map_data:$self->{path}";
2023 2027
2024 return if $self->players; 2028 return if $self->players;
2025 return if $self->in_memory != cf::MAP_IN_MEMORY; 2029 return if $self->in_memory != cf::MAP_IN_MEMORY;
2026 return if $self->{deny_save}; 2030 return if $self->{deny_save};
2027 2031
… …
2312 # use -1 or undef as default coordinates, not 0, 0 2316 # use -1 or undef as default coordinates, not 0, 0
2313 ($x, $y) = ($map->enter_x, $map->enter_y) 2317 ($x, $y) = ($map->enter_x, $map->enter_y)
2314 if $x <=0 && $y <= 0; 2318 if $x <=0 && $y <= 0;
2315 2319
2316 $map->load; 2320 $map->load;
2317 $map->load_diag; 2321 $map->load_neighbours;
2318 2322
2319 return unless $self->contr->active; 2323 return unless $self->contr->active;
2320 $self->activate_recursive; 2324 $self->activate_recursive;
2321 2325
2322 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2326 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2555=cut 2559=cut
2556 2560
2557sub cf::client::ext_msg($$@) { 2561sub cf::client::ext_msg($$@) {
2558 my ($self, $type, @msg) = @_; 2562 my ($self, $type, @msg) = @_;
2559 2563
2560 my $extcmd = $self->extcmd;
2561
2562 if ($extcmd == 2) { 2564 if ($self->extcmd == 2) {
2563 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2565 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2564 } elsif ($extcmd == 1) { # TODO: remove 2566 } elsif ($self->extcmd == 1) { # TODO: remove
2565 push @msg, msgtype => "event_$type"; 2567 push @msg, msgtype => "event_$type";
2568 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2569 }
2570}
2571
2572=item $client->ext_reply ($msgid, @msg)
2573
2574Sends an ext reply to the client.
2575
2576=cut
2577
2578sub cf::client::ext_reply($$@) {
2579 my ($self, $id, @msg) = @_;
2580
2581 if ($self->extcmd == 2) {
2582 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2583 } elsif ($self->extcmd == 1) {
2584 #TODO: version 1, remove
2585 unshift @msg, msgtype => "reply", msgid => $id;
2566 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2586 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2567 } 2587 }
2568} 2588}
2569 2589
2570=item $success = $client->query ($flags, "text", \&cb) 2590=item $success = $client->query ($flags, "text", \&cb)
… …
2632 my ($type, $reply, @payload) = 2652 my ($type, $reply, @payload) =
2633 "ARRAY" eq ref $msg 2653 "ARRAY" eq ref $msg
2634 ? @$msg 2654 ? @$msg
2635 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2655 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2636 2656
2657 my @reply;
2658
2637 if (my $cb = $EXTICMD{$type}) { 2659 if (my $cb = $EXTICMD{$type}) {
2638 my @reply = $cb->($ns, @payload); 2660 @reply = $cb->($ns, @payload);
2639
2640 $ns->ext_reply ($reply, @reply)
2641 if $reply;
2642 } 2661 }
2662
2663 $ns->ext_reply ($reply, @reply)
2664 if $reply;
2665
2643 } else { 2666 } else {
2644 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2667 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2645 } 2668 }
2646 2669
2647 cf::override; 2670 cf::override;
… …
2708 2731
2709The following functions and methods are available within a safe environment: 2732The following functions and methods are available within a safe environment:
2710 2733
2711 cf::object 2734 cf::object
2712 contr pay_amount pay_player map x y force_find force_add 2735 contr pay_amount pay_player map x y force_find force_add
2713 insert remove name archname title slaying race 2736 insert remove name archname title slaying race decrease_ob_nr
2714 2737
2715 cf::object::player 2738 cf::object::player
2716 player 2739 player
2717 2740
2718 cf::player 2741 cf::player
… …
2723 2746
2724=cut 2747=cut
2725 2748
2726for ( 2749for (
2727 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2750 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2728 insert remove inv name archname title slaying race)], 2751 insert remove inv name archname title slaying race
2752 decrease_ob_nr)],
2729 ["cf::object::player" => qw(player)], 2753 ["cf::object::player" => qw(player)],
2730 ["cf::player" => qw(peaceful)], 2754 ["cf::player" => qw(peaceful)],
2731 ["cf::map" => qw(trigger)], 2755 ["cf::map" => qw(trigger)],
2732) { 2756) {
2733 no strict 'refs'; 2757 no strict 'refs';
… …
2809# the server's init and main functions 2833# the server's init and main functions
2810 2834
2811sub load_facedata($) { 2835sub load_facedata($) {
2812 my ($path) = @_; 2836 my ($path) = @_;
2813 2837
2838 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2839
2814 warn "loading facedata from $path\n"; 2840 warn "loading facedata from $path\n";
2815 2841
2816 my $facedata; 2842 my $facedata;
2817 0 < aio_load $path, $facedata 2843 0 < aio_load $path, $facedata
2818 or die "$path: $!"; 2844 or die "$path: $!";
2819 2845
2820 $facedata = Coro::Storable::thaw $facedata; 2846 $facedata = Coro::Storable::thaw $facedata;
2821 2847
2822 $facedata->{version} == 2 2848 $facedata->{version} == 2
2823 or cf::cleanup "$path: version mismatch, cannot proceed."; 2849 or cf::cleanup "$path: version mismatch, cannot proceed.";
2850
2851 # patch in the exptable
2852 $facedata->{resource}{"res/exp_table"} = {
2853 type => FT_RSRC,
2854 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2855 };
2856 cf::cede_to_tick;
2824 2857
2825 { 2858 {
2826 my $faces = $facedata->{faceinfo}; 2859 my $faces = $facedata->{faceinfo};
2827 2860
2828 while (my ($face, $info) = each %$faces) { 2861 while (my ($face, $info) = each %$faces) {
2829 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2862 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2830 cf::face::set_visibility $idx, $info->{visibility}; 2863 cf::face::set_visibility $idx, $info->{visibility};
2831 cf::face::set_magicmap $idx, $info->{magicmap}; 2864 cf::face::set_magicmap $idx, $info->{magicmap};
2832 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2865 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2833 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2866 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2834 2867
2835 cf::cede_to_tick; 2868 cf::cede_to_tick;
2836 } 2869 }
2837 2870
2838 while (my ($face, $info) = each %$faces) { 2871 while (my ($face, $info) = each %$faces) {
… …
2863 2896
2864 { 2897 {
2865 # TODO: for gcfclient pleasure, we should give resources 2898 # TODO: for gcfclient pleasure, we should give resources
2866 # that gcfclient doesn't grok a >10000 face index. 2899 # that gcfclient doesn't grok a >10000 face index.
2867 my $res = $facedata->{resource}; 2900 my $res = $facedata->{resource};
2868 my $enc = JSON::XS->new->utf8->canonical;
2869 2901
2870 my $soundconf = delete $res->{"res/sound.conf"}; 2902 my $soundconf = delete $res->{"res/sound.conf"};
2871 2903
2872 while (my ($name, $info) = each %$res) { 2904 while (my ($name, $info) = each %$res) {
2873 my $meta = $enc->encode ({
2874 name => $name,
2875 %{ $info->{meta} || {} },
2876 });
2877
2878 my $idx = (cf::face::find $name) || cf::face::alloc $name; 2905 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2906 my $data;
2879 2907
2880 if ($info->{type} & 1) { 2908 if ($info->{type} & 1) {
2881 # prepend meta info 2909 # prepend meta info
2882 2910
2911 my $meta = $enc->encode ({
2912 name => $name,
2913 %{ $info->{meta} || {} },
2914 });
2915
2883 my $data = pack "(w/a*)*", $meta, $info->{data}; 2916 $data = pack "(w/a*)*", $meta, $info->{data};
2884 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2885
2886 cf::face::set_data $idx, 0, $data, $chk;
2887 } else { 2917 } else {
2888 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 2918 $data = $info->{data};
2889 } 2919 }
2890 2920
2921 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2891 cf::face::set_type $idx, $info->{type}; 2922 cf::face::set_type $idx, $info->{type};
2892 2923
2893 cf::cede_to_tick; 2924 cf::cede_to_tick;
2894 } 2925 }
2895 2926
… …
2967 2998
2968sub init { 2999sub init {
2969 reload_resources; 3000 reload_resources;
2970} 3001}
2971 3002
2972sub cfg_load { 3003sub reload_config {
2973 open my $fh, "<:utf8", "$CONFDIR/config" 3004 open my $fh, "<:utf8", "$CONFDIR/config"
2974 or return; 3005 or return;
2975 3006
2976 local $/; 3007 local $/;
2977 *CFG = YAML::Syck::Load <$fh>; 3008 *CFG = YAML::Syck::Load <$fh>;
… …
2997 (async { 3028 (async {
2998 Event::one_event; 3029 Event::one_event;
2999 })->prio (Coro::PRIO_MAX); 3030 })->prio (Coro::PRIO_MAX);
3000 }; 3031 };
3001 3032
3002 cfg_load; 3033 reload_config;
3003 db_init; 3034 db_init;
3004 load_extensions; 3035 load_extensions;
3005 3036
3006 $TICK_WATCHER->start; 3037 $TICK_WATCHER->start;
3007 Event::loop; 3038 Event::loop;
… …
3200 warn "reloading cf.pm"; 3231 warn "reloading cf.pm";
3201 require cf; 3232 require cf;
3202 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3233 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3203 3234
3204 warn "loading config and database again"; 3235 warn "loading config and database again";
3205 cf::cfg_load; 3236 cf::reload_config;
3206 3237
3207 warn "loading extensions"; 3238 warn "loading extensions";
3208 cf::load_extensions; 3239 cf::load_extensions;
3209 3240
3210 warn "reattaching attachments to objects/players"; 3241 warn "reattaching attachments to objects/players";

Diff Legend

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