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.331 by root, Mon Aug 13 13:10:01 2007 UTC vs.
Revision 1.345 by root, Tue Aug 28 19:30:11 2007 UTC

… …
10use Event; 10use Event;
11use Opcode; 11use Opcode;
12use Safe; 12use Safe;
13use Safe::Hole; 13use Safe::Hole;
14 14
15use Coro 3.61 (); 15use Coro 3.64 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util ();
24 25
25use JSON::XS 1.4 (); 26use JSON::XS ();
26use BDB (); 27use BDB ();
27use Data::Dumper; 28use Data::Dumper;
28use Digest::MD5; 29use Digest::MD5;
29use Fcntl; 30use Fcntl;
30use YAML::Syck (); 31use YAML::Syck ();
… …
472Coro::Storable. May, of course, block. Note that the executed sub may 473Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 474never block itself or use any form of Event handling.
474 475
475=cut 476=cut
476 477
477sub _store_scalar {
478 open my $fh, ">", \my $buf
479 or die "fork_call: cannot open fh-to-buf in child : $!";
480 Storable::store_fd $_[0], $fh;
481 close $fh;
482
483 $buf
484}
485
486sub fork_call(&@) { 478sub fork_call(&@) {
487 my ($cb, @args) = @_; 479 my ($cb, @args) = @_;
488 480
489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 481 # we seemingly have to make a local copy of the whole thing,
490# or die "socketpair: $!"; 482 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 483 # TODO: investigate and fix (liekly this will be rather laborious)
492 or die "pipe: $!";
493 484
494 if (my $pid = fork) { 485 my @res = Coro::Util::fork_eval {
495 close $fh2;
496
497 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
498 warn "pst<$res>" unless $res =~ /^pst/;
499 $res = Coro::Storable::thaw $res;
500
501 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
502
503 Carp::confess $$res unless "ARRAY" eq ref $res;
504
505 return wantarray ? @$res : $res->[-1];
506 } else {
507 reset_signals; 486 reset_signals;
508 local $SIG{__WARN__}; 487 &$cb
509 local $SIG{__DIE__}; 488 }, @args;
510 # just in case, this hack effectively disables event
511 # in the child. cleaner and slower would be canceling all watchers,
512 # but this works for the time being.
513 local $Coro::idle;
514 $Coro::current->prio (Coro::PRIO_MAX);
515 489
516 eval { 490 wantarray ? @res : $res[-1]
517 close $fh1;
518
519 my @res = eval { $cb->(@args) };
520
521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
522 close $fh2;
523 };
524
525 warn $@ if $@;
526 _exit 0;
527 }
528} 491}
529 492
530=item $value = cf::db_get $family => $key 493=item $value = cf::db_get $family => $key
531 494
532Returns a single value from the environment database. 495Returns a single value from the environment database.
… …
1186 my ($type, $reply, @payload) = 1149 my ($type, $reply, @payload) =
1187 "ARRAY" eq ref $msg 1150 "ARRAY" eq ref $msg
1188 ? @$msg 1151 ? @$msg
1189 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190 1153
1154 my @reply;
1155
1191 if (my $cb = $EXTCMD{$type}) { 1156 if (my $cb = $EXTCMD{$type}) {
1192 my @reply = $cb->($pl, @payload); 1157 @reply = $cb->($pl, @payload);
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196 } 1158 }
1159
1160 $pl->ext_reply ($reply, @reply)
1161 if $reply;
1162
1197 } else { 1163 } else {
1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1164 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199 } 1165 }
1200 1166
1201 cf::override; 1167 cf::override;
… …
1542=cut 1508=cut
1543 1509
1544sub ext_reply($$@) { 1510sub ext_reply($$@) {
1545 my ($self, $id, @msg) = @_; 1511 my ($self, $id, @msg) = @_;
1546 1512
1547 if ($self->ns->extcmd == 2) { 1513 $self->ns->ext_reply ($id, @msg)
1548 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1549 } elsif ($self->ns->extcmd == 1) {
1550 #TODO: version 1, remove
1551 unshift @msg, msgtype => "reply", msgid => $id;
1552 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1553 }
1554} 1514}
1555 1515
1556=item $player->ext_msg ($type, @msg) 1516=item $player->ext_msg ($type, @msg)
1557 1517
1558Sends an ext event to the client. 1518Sends an ext event to the client.
… …
1889 local $self->{deny_reset} = 1; # loading can take a long time 1849 local $self->{deny_reset} = 1; # loading can take a long time
1890 1850
1891 my $path = $self->{path}; 1851 my $path = $self->{path};
1892 1852
1893 { 1853 {
1854 my $guard1 = cf::lock_acquire "map_data:$path";
1894 my $guard = cf::lock_acquire "map_load:$path"; 1855 my $guard2 = cf::lock_acquire "map_load:$path";
1895 1856
1896 return if $self->in_memory != cf::MAP_SWAPPED; 1857 return if $self->in_memory != cf::MAP_SWAPPED;
1897 1858
1898 $self->in_memory (cf::MAP_LOADING); 1859 $self->in_memory (cf::MAP_LOADING);
1899 1860
… …
1953 1914
1954 $self 1915 $self
1955} 1916}
1956 1917
1957# 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
1958sub load_diag { 1919sub load_neighbours {
1959 my ($map) = @_; 1920 my ($map) = @_;
1960 1921
1961 my @diag; # diagonal neighbours 1922 my @neigh; # diagonal neighbours
1962 1923
1963 for (0 .. 3) { 1924 for (0 .. 3) {
1964 my $neigh = $map->tile_path ($_) 1925 my $neigh = $map->tile_path ($_)
1965 or next; 1926 or next;
1966 $neigh = find $neigh, $map 1927 $neigh = find $neigh, $map
1967 or next; 1928 or next;
1968 $neigh->load; 1929 $neigh->load;
1969 1930
1931 push @neigh,
1970 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1932 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1971 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1933 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1972 } 1934 }
1973 1935
1974 for (@diag) { 1936 for (grep defined $_->[0], @neigh) {
1937 my ($path, $origin) = @$_;
1975 my $neigh = find @$_ 1938 my $neigh = find $path, $origin
1976 or next; 1939 or next;
1977 $neigh->load; 1940 $neigh->load;
1978 } 1941 }
1979} 1942}
1980 1943
… …
1985} 1948}
1986 1949
1987sub do_load_sync { 1950sub do_load_sync {
1988 my ($map) = @_; 1951 my ($map) = @_;
1989 1952
1953 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1954 if $Coro::current == $Coro::main;
1955
1990 cf::sync_job { $map->load }; 1956 cf::sync_job { $map->load };
1991} 1957}
1992 1958
1993our %MAP_PREFETCH; 1959our %MAP_PREFETCH;
1994our $MAP_PREFETCHER = undef; 1960our $MAP_PREFETCHER = undef;
1995 1961
1996sub find_async { 1962sub find_async {
1997 my ($path, $origin) = @_; 1963 my ($path, $origin, $load) = @_;
1998 1964
1999 $path = normalise $path, $origin && $origin->{path}; 1965 $path = normalise $path, $origin && $origin->{path};
2000 1966
2001 if (my $map = $cf::MAP{$path}) { 1967 if (my $map = $cf::MAP{$path}) {
2002 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1968 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
2003 } 1969 }
2004 1970
2005 undef $MAP_PREFETCH{$path}; 1971 $MAP_PREFETCH{$path} |= $load;
1972
2006 $MAP_PREFETCHER ||= cf::async { 1973 $MAP_PREFETCHER ||= cf::async {
2007 while (%MAP_PREFETCH) { 1974 while (%MAP_PREFETCH) {
2008 for my $path (keys %MAP_PREFETCH) { 1975 while (my ($k, $v) = each %MAP_PREFETCH) {
2009 if (my $map = find $path) { 1976 if (my $map = find $k) {
2010 $map->load; 1977 $map->load if $v;
2011 } 1978 }
2012 1979
2013 delete $MAP_PREFETCH{$path}; 1980 delete $MAP_PREFETCH{$k};
2014 } 1981 }
2015 } 1982 }
2016 undef $MAP_PREFETCHER; 1983 undef $MAP_PREFETCHER;
2017 }; 1984 };
2018 $MAP_PREFETCHER->prio (6); 1985 $MAP_PREFETCHER->prio (6);
… …
2021} 1988}
2022 1989
2023sub save { 1990sub save {
2024 my ($self) = @_; 1991 my ($self) = @_;
2025 1992
2026 my $lock = cf::lock_acquire "map_data:" . $self->path; 1993 my $lock = cf::lock_acquire "map_data:$self->{path}";
2027 1994
2028 $self->{last_save} = $cf::RUNTIME; 1995 $self->{last_save} = $cf::RUNTIME;
2029 1996
2030 return unless $self->dirty; 1997 return unless $self->dirty;
2031 1998
… …
2054 my ($self) = @_; 2021 my ($self) = @_;
2055 2022
2056 # save first because save cedes 2023 # save first because save cedes
2057 $self->save; 2024 $self->save;
2058 2025
2059 my $lock = cf::lock_acquire "map_data:" . $self->path; 2026 my $lock = cf::lock_acquire "map_data:$self->{path}";
2060 2027
2061 return if $self->players; 2028 return if $self->players;
2062 return if $self->in_memory != cf::MAP_IN_MEMORY; 2029 return if $self->in_memory != cf::MAP_IN_MEMORY;
2063 return if $self->{deny_save}; 2030 return if $self->{deny_save};
2064 2031
… …
2349 # use -1 or undef as default coordinates, not 0, 0 2316 # use -1 or undef as default coordinates, not 0, 0
2350 ($x, $y) = ($map->enter_x, $map->enter_y) 2317 ($x, $y) = ($map->enter_x, $map->enter_y)
2351 if $x <=0 && $y <= 0; 2318 if $x <=0 && $y <= 0;
2352 2319
2353 $map->load; 2320 $map->load;
2354 $map->load_diag; 2321 $map->load_neighbours;
2355 2322
2356 return unless $self->contr->active; 2323 return unless $self->contr->active;
2357 $self->activate_recursive; 2324 $self->activate_recursive;
2358 2325
2359 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2326 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2592=cut 2559=cut
2593 2560
2594sub cf::client::ext_msg($$@) { 2561sub cf::client::ext_msg($$@) {
2595 my ($self, $type, @msg) = @_; 2562 my ($self, $type, @msg) = @_;
2596 2563
2597 my $extcmd = $self->extcmd;
2598
2599 if ($extcmd == 2) { 2564 if ($self->extcmd == 2) {
2600 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2565 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2601 } elsif ($extcmd == 1) { # TODO: remove 2566 } elsif ($self->extcmd == 1) { # TODO: remove
2602 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;
2603 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2586 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2604 } 2587 }
2605} 2588}
2606 2589
2607=item $success = $client->query ($flags, "text", \&cb) 2590=item $success = $client->query ($flags, "text", \&cb)
… …
2669 my ($type, $reply, @payload) = 2652 my ($type, $reply, @payload) =
2670 "ARRAY" eq ref $msg 2653 "ARRAY" eq ref $msg
2671 ? @$msg 2654 ? @$msg
2672 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2655 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2673 2656
2657 my @reply;
2658
2674 if (my $cb = $EXTICMD{$type}) { 2659 if (my $cb = $EXTICMD{$type}) {
2675 my @reply = $cb->($ns, @payload); 2660 @reply = $cb->($ns, @payload);
2676
2677 $ns->ext_reply ($reply, @reply)
2678 if $reply;
2679 } 2661 }
2662
2663 $ns->ext_reply ($reply, @reply)
2664 if $reply;
2665
2680 } else { 2666 } else {
2681 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";
2682 } 2668 }
2683 2669
2684 cf::override; 2670 cf::override;
… …
2745 2731
2746The following functions and methods are available within a safe environment: 2732The following functions and methods are available within a safe environment:
2747 2733
2748 cf::object 2734 cf::object
2749 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
2750 insert remove name archname title slaying race 2736 insert remove name archname title slaying race decrease_ob_nr
2751 2737
2752 cf::object::player 2738 cf::object::player
2753 player 2739 player
2754 2740
2755 cf::player 2741 cf::player
… …
2760 2746
2761=cut 2747=cut
2762 2748
2763for ( 2749for (
2764 ["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
2765 insert remove inv name archname title slaying race)], 2751 insert remove inv name archname title slaying race
2752 decrease_ob_nr)],
2766 ["cf::object::player" => qw(player)], 2753 ["cf::object::player" => qw(player)],
2767 ["cf::player" => qw(peaceful)], 2754 ["cf::player" => qw(peaceful)],
2768 ["cf::map" => qw(trigger)], 2755 ["cf::map" => qw(trigger)],
2769) { 2756) {
2770 no strict 'refs'; 2757 no strict 'refs';
… …
2846# the server's init and main functions 2833# the server's init and main functions
2847 2834
2848sub load_facedata($) { 2835sub load_facedata($) {
2849 my ($path) = @_; 2836 my ($path) = @_;
2850 2837
2838 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2839
2851 warn "loading facedata from $path\n"; 2840 warn "loading facedata from $path\n";
2852 2841
2853 my $facedata; 2842 my $facedata;
2854 0 < aio_load $path, $facedata 2843 0 < aio_load $path, $facedata
2855 or die "$path: $!"; 2844 or die "$path: $!";
2856 2845
2857 $facedata = Coro::Storable::thaw $facedata; 2846 $facedata = Coro::Storable::thaw $facedata;
2858 2847
2859 $facedata->{version} == 2 2848 $facedata->{version} == 2
2860 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;
2861 2857
2862 { 2858 {
2863 my $faces = $facedata->{faceinfo}; 2859 my $faces = $facedata->{faceinfo};
2864 2860
2865 while (my ($face, $info) = each %$faces) { 2861 while (my ($face, $info) = each %$faces) {
2866 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2862 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2867 cf::face::set_visibility $idx, $info->{visibility}; 2863 cf::face::set_visibility $idx, $info->{visibility};
2868 cf::face::set_magicmap $idx, $info->{magicmap}; 2864 cf::face::set_magicmap $idx, $info->{magicmap};
2869 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2865 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2870 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2866 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2871 2867
2872 cf::cede_to_tick; 2868 cf::cede_to_tick;
2873 } 2869 }
2874 2870
2875 while (my ($face, $info) = each %$faces) { 2871 while (my ($face, $info) = each %$faces) {
… …
2900 2896
2901 { 2897 {
2902 # TODO: for gcfclient pleasure, we should give resources 2898 # TODO: for gcfclient pleasure, we should give resources
2903 # that gcfclient doesn't grok a >10000 face index. 2899 # that gcfclient doesn't grok a >10000 face index.
2904 my $res = $facedata->{resource}; 2900 my $res = $facedata->{resource};
2905 my $enc = JSON::XS->new->utf8->canonical;
2906 2901
2907 my $soundconf = delete $res->{"res/sound.conf"}; 2902 my $soundconf = delete $res->{"res/sound.conf"};
2908 2903
2909 while (my ($name, $info) = each %$res) { 2904 while (my ($name, $info) = each %$res) {
2910 my $meta = $enc->encode ({
2911 name => $name,
2912 %{ $info->{meta} || {} },
2913 });
2914
2915 my $idx = (cf::face::find $name) || cf::face::alloc $name; 2905 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2906 my $data;
2916 2907
2917 if ($info->{type} & 1) { 2908 if ($info->{type} & 1) {
2918 # prepend meta info 2909 # prepend meta info
2919 2910
2911 my $meta = $enc->encode ({
2912 name => $name,
2913 %{ $info->{meta} || {} },
2914 });
2915
2920 my $data = pack "(w/a*)*", $meta, $info->{data}; 2916 $data = pack "(w/a*)*", $meta, $info->{data};
2921 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2922
2923 cf::face::set_data $idx, 0, $data, $chk;
2924 } else { 2917 } else {
2925 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 2918 $data = $info->{data};
2926 } 2919 }
2927 2920
2921 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2928 cf::face::set_type $idx, $info->{type}; 2922 cf::face::set_type $idx, $info->{type};
2929 2923
2930 cf::cede_to_tick; 2924 cf::cede_to_tick;
2931 } 2925 }
2932 2926
… …
3004 2998
3005sub init { 2999sub init {
3006 reload_resources; 3000 reload_resources;
3007} 3001}
3008 3002
3009sub cfg_load { 3003sub reload_config {
3010 open my $fh, "<:utf8", "$CONFDIR/config" 3004 open my $fh, "<:utf8", "$CONFDIR/config"
3011 or return; 3005 or return;
3012 3006
3013 local $/; 3007 local $/;
3014 *CFG = YAML::Syck::Load <$fh>; 3008 *CFG = YAML::Syck::Load <$fh>;
… …
3034 (async { 3028 (async {
3035 Event::one_event; 3029 Event::one_event;
3036 })->prio (Coro::PRIO_MAX); 3030 })->prio (Coro::PRIO_MAX);
3037 }; 3031 };
3038 3032
3039 cfg_load; 3033 reload_config;
3040 db_init; 3034 db_init;
3041 load_extensions; 3035 load_extensions;
3042 3036
3043 $TICK_WATCHER->start; 3037 $TICK_WATCHER->start;
3044 Event::loop; 3038 Event::loop;
… …
3237 warn "reloading cf.pm"; 3231 warn "reloading cf.pm";
3238 require cf; 3232 require cf;
3239 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3233 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3240 3234
3241 warn "loading config and database again"; 3235 warn "loading config and database again";
3242 cf::cfg_load; 3236 cf::reload_config;
3243 3237
3244 warn "loading extensions"; 3238 warn "loading extensions";
3245 cf::load_extensions; 3239 cf::load_extensions;
3246 3240
3247 warn "reattaching attachments to objects/players"; 3241 warn "reattaching attachments to objects/players";

Diff Legend

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