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.336 by root, Tue Aug 21 00:31:18 2007 UTC vs.
Revision 1.351 by root, Sun Sep 2 00:57: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 ();
… …
272Wait until the given lock is available and then acquires it and returns 272Wait until the given lock is available and then acquires it and returns
273a Coro::guard object. If the guard object gets destroyed (goes out of scope, 273a Coro::guard object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
275returned. 275returned.
276 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
277Lock names should begin with a unique identifier (for example, cf::map::find 280Lock names should begin with a unique identifier (for example, cf::map::find
278uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
279 282
280=item $locked = cf::lock_active $string 283=item $locked = cf::lock_active $string
281 284
… …
575 if (1) { 578 if (1) {
576 $md5 = 579 $md5 =
577 join "\x00", 580 join "\x00",
578 $processversion, 581 $processversion,
579 map { 582 map {
580 Coro::cede; 583 cf::cede_to_tick;
581 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 584 ($src->[$_], Digest::MD5::md5_hex $data[$_])
582 } 0.. $#$src; 585 } 0.. $#$src;
583 586
584 587
585 my $dbmd5 = db_get cache => "$id/md5"; 588 my $dbmd5 = db_get cache => "$id/md5";
… …
1149 my ($type, $reply, @payload) = 1152 my ($type, $reply, @payload) =
1150 "ARRAY" eq ref $msg 1153 "ARRAY" eq ref $msg
1151 ? @$msg 1154 ? @$msg
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1155 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153 1156
1157 my @reply;
1158
1154 if (my $cb = $EXTCMD{$type}) { 1159 if (my $cb = $EXTCMD{$type}) {
1155 my @reply = $cb->($pl, @payload); 1160 @reply = $cb->($pl, @payload);
1156
1157 $pl->ext_reply ($reply, @reply)
1158 if $reply;
1159 } 1161 }
1162
1163 $pl->ext_reply ($reply, @reply)
1164 if $reply;
1165
1160 } else { 1166 } else {
1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1167 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1162 } 1168 }
1163 1169
1164 cf::override; 1170 cf::override;
… …
1319 1325
1320 aio_mkdir playerdir $pl, 0770; 1326 aio_mkdir playerdir $pl, 0770;
1321 $pl->{last_save} = $cf::RUNTIME; 1327 $pl->{last_save} = $cf::RUNTIME;
1322 1328
1323 $pl->save_pl ($path); 1329 $pl->save_pl ($path);
1324 Coro::cede; 1330 cf::cede_to_tick;
1325} 1331}
1326 1332
1327sub new($) { 1333sub new($) {
1328 my ($login) = @_; 1334 my ($login) = @_;
1329 1335
… …
1846 local $self->{deny_reset} = 1; # loading can take a long time 1852 local $self->{deny_reset} = 1; # loading can take a long time
1847 1853
1848 my $path = $self->{path}; 1854 my $path = $self->{path};
1849 1855
1850 { 1856 {
1857 my $guard1 = cf::lock_acquire "map_data:$path";
1851 my $guard = cf::lock_acquire "map_load:$path"; 1858 my $guard2 = cf::lock_acquire "map_load:$path";
1852 1859
1853 return if $self->in_memory != cf::MAP_SWAPPED; 1860 return if $self->in_memory != cf::MAP_SWAPPED;
1854 1861
1855 $self->in_memory (cf::MAP_LOADING); 1862 $self->in_memory (cf::MAP_LOADING);
1856 1863
1857 $self->alloc; 1864 $self->alloc;
1858 1865
1859 $self->pre_load; 1866 $self->pre_load;
1860 Coro::cede; 1867 cf::cede_to_tick;
1861 1868
1862 $self->_load_objects ($self->{load_path}, 1) 1869 $self->_load_objects ($self->{load_path}, 1)
1863 or return; 1870 or return;
1864 1871
1865 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1872 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1871 $self->clear_unique_items; 1878 $self->clear_unique_items;
1872 $self->_load_objects ($uniq, 0); 1879 $self->_load_objects ($uniq, 0);
1873 } 1880 }
1874 } 1881 }
1875 1882
1876 Coro::cede; 1883 cf::cede_to_tick;
1877 # now do the right thing for maps 1884 # now do the right thing for maps
1878 $self->link_multipart_objects; 1885 $self->link_multipart_objects;
1879 $self->difficulty ($self->estimate_difficulty) 1886 $self->difficulty ($self->estimate_difficulty)
1880 unless $self->difficulty; 1887 unless $self->difficulty;
1881 Coro::cede; 1888 cf::cede_to_tick;
1882 1889
1883 unless ($self->{deny_activate}) { 1890 unless ($self->{deny_activate}) {
1884 $self->decay_objects; 1891 $self->decay_objects;
1885 $self->fix_auto_apply; 1892 $self->fix_auto_apply;
1886 $self->update_buttons; 1893 $self->update_buttons;
1887 Coro::cede; 1894 cf::cede_to_tick;
1888 $self->set_darkness_map; 1895 $self->set_darkness_map;
1889 Coro::cede; 1896 cf::cede_to_tick;
1890 $self->activate; 1897 $self->activate;
1891 } 1898 }
1892 1899
1893 $self->{last_save} = $cf::RUNTIME; 1900 $self->{last_save} = $cf::RUNTIME;
1894 $self->last_access ($cf::RUNTIME); 1901 $self->last_access ($cf::RUNTIME);
… …
1944} 1951}
1945 1952
1946sub do_load_sync { 1953sub do_load_sync {
1947 my ($map) = @_; 1954 my ($map) = @_;
1948 1955
1956 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1957 if $Coro::current == $Coro::main;
1958
1949 cf::sync_job { $map->load }; 1959 cf::sync_job { $map->load };
1950} 1960}
1951 1961
1952our %MAP_PREFETCH; 1962our %MAP_PREFETCH;
1953our $MAP_PREFETCHER = undef; 1963our $MAP_PREFETCHER = undef;
1954 1964
1955sub find_async { 1965sub find_async {
1956 my ($path, $origin) = @_; 1966 my ($path, $origin, $load) = @_;
1957 1967
1958 $path = normalise $path, $origin && $origin->{path}; 1968 $path = normalise $path, $origin && $origin->{path};
1959 1969
1960 if (my $map = $cf::MAP{$path}) { 1970 if (my $map = $cf::MAP{$path}) {
1961 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1971 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1962 } 1972 }
1963 1973
1964 undef $MAP_PREFETCH{$path}; 1974 $MAP_PREFETCH{$path} |= $load;
1975
1965 $MAP_PREFETCHER ||= cf::async { 1976 $MAP_PREFETCHER ||= cf::async {
1966 while (%MAP_PREFETCH) { 1977 while (%MAP_PREFETCH) {
1967 for my $path (keys %MAP_PREFETCH) { 1978 while (my ($k, $v) = each %MAP_PREFETCH) {
1968 if (my $map = find $path) { 1979 if (my $map = find $k) {
1969 $map->load; 1980 $map->load if $v;
1970 } 1981 }
1971 1982
1972 delete $MAP_PREFETCH{$path}; 1983 delete $MAP_PREFETCH{$k};
1973 } 1984 }
1974 } 1985 }
1975 undef $MAP_PREFETCHER; 1986 undef $MAP_PREFETCHER;
1976 }; 1987 };
1977 $MAP_PREFETCHER->prio (6); 1988 $MAP_PREFETCHER->prio (6);
… …
1980} 1991}
1981 1992
1982sub save { 1993sub save {
1983 my ($self) = @_; 1994 my ($self) = @_;
1984 1995
1985 my $lock = cf::lock_acquire "map_data:" . $self->path; 1996 my $lock = cf::lock_acquire "map_data:$self->{path}";
1986 1997
1987 $self->{last_save} = $cf::RUNTIME; 1998 $self->{last_save} = $cf::RUNTIME;
1988 1999
1989 return unless $self->dirty; 2000 return unless $self->dirty;
1990 2001
… …
2013 my ($self) = @_; 2024 my ($self) = @_;
2014 2025
2015 # save first because save cedes 2026 # save first because save cedes
2016 $self->save; 2027 $self->save;
2017 2028
2018 my $lock = cf::lock_acquire "map_data:" . $self->path; 2029 my $lock = cf::lock_acquire "map_data:$self->{path}";
2019 2030
2020 return if $self->players; 2031 return if $self->players;
2021 return if $self->in_memory != cf::MAP_IN_MEMORY; 2032 return if $self->in_memory != cf::MAP_IN_MEMORY;
2022 return if $self->{deny_save}; 2033 return if $self->{deny_save};
2023 2034
… …
2075my $nuke_counter = "aaaa"; 2086my $nuke_counter = "aaaa";
2076 2087
2077sub nuke { 2088sub nuke {
2078 my ($self) = @_; 2089 my ($self) = @_;
2079 2090
2091 {
2092 my $lock = cf::lock_acquire "map_data:$self->{path}";
2093
2080 delete $cf::MAP{$self->path}; 2094 delete $cf::MAP{$self->path};
2081 2095
2082 $self->unlink_save; 2096 $self->unlink_save;
2083 2097
2084 bless $self, "cf::map"; 2098 bless $self, "cf::map";
2085 delete $self->{deny_reset}; 2099 delete $self->{deny_reset};
2086 $self->{deny_save} = 1; 2100 $self->{deny_save} = 1;
2087 $self->reset_timeout (1); 2101 $self->reset_timeout (1);
2088 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2102 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2089 2103
2090 $cf::MAP{$self->path} = $self; 2104 $cf::MAP{$self->path} = $self;
2105 }
2091 2106
2092 $self->reset; # polite request, might not happen 2107 $self->reset; # polite request, might not happen
2093} 2108}
2094 2109
2095=item $maps = cf::map::tmp_maps 2110=item $maps = cf::map::tmp_maps
… …
2489the message, with C<log> being the default. If C<$color> is negative, suppress 2504the message, with C<log> being the default. If C<$color> is negative, suppress
2490the message unless the client supports the msg packet. 2505the message unless the client supports the msg packet.
2491 2506
2492=cut 2507=cut
2493 2508
2509our %CHANNEL = (
2510 "c/identify" => {
2511 id => "identify",
2512 title => "Identify",
2513 reply => undef,
2514 tooltip => "Items recently identified",
2515 },
2516);
2517
2494sub cf::client::send_msg { 2518sub cf::client::send_msg {
2495 my ($self, $channel, $msg, $color, @extra) = @_; 2519 my ($self, $channel, $msg, $color, @extra) = @_;
2496 2520
2497 $msg = $self->pl->expand_cfpod ($msg); 2521 $msg = $self->pl->expand_cfpod ($msg);
2498 2522
2499 $color &= cf::NDI_CLIENT_MASK; # just in case... 2523 $color &= cf::NDI_CLIENT_MASK; # just in case...
2524
2525 # check predefined channels, for the benefit of C
2526 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2500 2527
2501 if (ref $channel) { 2528 if (ref $channel) {
2502 # send meta info to client, if not yet sent 2529 # send meta info to client, if not yet sent
2503 unless (exists $self->{channel}{$channel->{id}}) { 2530 unless (exists $self->{channel}{$channel->{id}}) {
2504 $self->{channel}{$channel->{id}} = $channel; 2531 $self->{channel}{$channel->{id}} = $channel;
… …
2551=cut 2578=cut
2552 2579
2553sub cf::client::ext_msg($$@) { 2580sub cf::client::ext_msg($$@) {
2554 my ($self, $type, @msg) = @_; 2581 my ($self, $type, @msg) = @_;
2555 2582
2556 my $extcmd = $self->extcmd;
2557
2558 if ($extcmd == 2) { 2583 if ($self->extcmd == 2) {
2559 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2584 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2560 } elsif ($extcmd == 1) { # TODO: remove 2585 } elsif ($self->extcmd == 1) { # TODO: remove
2561 push @msg, msgtype => "event_$type"; 2586 push @msg, msgtype => "event_$type";
2562 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2587 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2563 } 2588 }
2564} 2589}
2565 2590
… …
2572sub cf::client::ext_reply($$@) { 2597sub cf::client::ext_reply($$@) {
2573 my ($self, $id, @msg) = @_; 2598 my ($self, $id, @msg) = @_;
2574 2599
2575 if ($self->extcmd == 2) { 2600 if ($self->extcmd == 2) {
2576 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 2601 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2577 } elsif ($self->ns->extcmd == 1) { 2602 } elsif ($self->extcmd == 1) {
2578 #TODO: version 1, remove 2603 #TODO: version 1, remove
2579 unshift @msg, msgtype => "reply", msgid => $id; 2604 unshift @msg, msgtype => "reply", msgid => $id;
2580 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2605 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2581 } 2606 }
2582} 2607}
… …
2646 my ($type, $reply, @payload) = 2671 my ($type, $reply, @payload) =
2647 "ARRAY" eq ref $msg 2672 "ARRAY" eq ref $msg
2648 ? @$msg 2673 ? @$msg
2649 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2674 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2650 2675
2676 my @reply;
2677
2651 if (my $cb = $EXTICMD{$type}) { 2678 if (my $cb = $EXTICMD{$type}) {
2652 my @reply = $cb->($ns, @payload); 2679 @reply = $cb->($ns, @payload);
2653
2654 $ns->ext_reply ($reply, @reply)
2655 if $reply;
2656 } 2680 }
2681
2682 $ns->ext_reply ($reply, @reply)
2683 if $reply;
2684
2657 } else { 2685 } else {
2658 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2686 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2659 } 2687 }
2660 2688
2661 cf::override; 2689 cf::override;
… …
2722 2750
2723The following functions and methods are available within a safe environment: 2751The following functions and methods are available within a safe environment:
2724 2752
2725 cf::object 2753 cf::object
2726 contr pay_amount pay_player map x y force_find force_add 2754 contr pay_amount pay_player map x y force_find force_add
2727 insert remove name archname title slaying race 2755 insert remove name archname title slaying race decrease_ob_nr
2728 2756
2729 cf::object::player 2757 cf::object::player
2730 player 2758 player
2731 2759
2732 cf::player 2760 cf::player
… …
2737 2765
2738=cut 2766=cut
2739 2767
2740for ( 2768for (
2741 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2769 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2742 insert remove inv name archname title slaying race)], 2770 insert remove inv name archname title slaying race
2771 decrease_ob_nr)],
2743 ["cf::object::player" => qw(player)], 2772 ["cf::object::player" => qw(player)],
2744 ["cf::player" => qw(peaceful)], 2773 ["cf::player" => qw(peaceful)],
2745 ["cf::map" => qw(trigger)], 2774 ["cf::map" => qw(trigger)],
2746) { 2775) {
2747 no strict 'refs'; 2776 no strict 'refs';
… …
2823# the server's init and main functions 2852# the server's init and main functions
2824 2853
2825sub load_facedata($) { 2854sub load_facedata($) {
2826 my ($path) = @_; 2855 my ($path) = @_;
2827 2856
2857 # HACK to clear player env face cache, we need some signal framework
2858 # for this (global event?)
2859 %ext::player_env::MUSIC_FACE_CACHE = ();
2860
2828 my $enc = JSON::XS->new->utf8->canonical; 2861 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2829 2862
2830 warn "loading facedata from $path\n"; 2863 warn "loading facedata from $path\n";
2831 2864
2832 my $facedata; 2865 my $facedata;
2833 0 < aio_load $path, $facedata 2866 0 < aio_load $path, $facedata
… …
2839 or cf::cleanup "$path: version mismatch, cannot proceed."; 2872 or cf::cleanup "$path: version mismatch, cannot proceed.";
2840 2873
2841 # patch in the exptable 2874 # patch in the exptable
2842 $facedata->{resource}{"res/exp_table"} = { 2875 $facedata->{resource}{"res/exp_table"} = {
2843 type => FT_RSRC, 2876 type => FT_RSRC,
2844 data => $enc->encode ([map cf::level_to_min_exp $_, 0 .. cf::settings->max_level]), 2877 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2845 }; 2878 };
2846 cf::cede_to_tick; 2879 cf::cede_to_tick;
2847 2880
2848 { 2881 {
2849 my $faces = $facedata->{faceinfo}; 2882 my $faces = $facedata->{faceinfo};
… …
2902 name => $name, 2935 name => $name,
2903 %{ $info->{meta} || {} }, 2936 %{ $info->{meta} || {} },
2904 }); 2937 });
2905 2938
2906 $data = pack "(w/a*)*", $meta, $info->{data}; 2939 $data = pack "(w/a*)*", $meta, $info->{data};
2940 } else {
2941 $data = $info->{data};
2907 } 2942 }
2908 2943
2909 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data; 2944 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2910 cf::face::set_type $idx, $info->{type}; 2945 cf::face::set_type $idx, $info->{type};
2911 2946
… …
2941 $ns->fx_want ($k, $v); 2976 $ns->fx_want ($k, $v);
2942 } 2977 }
2943}; 2978};
2944 2979
2945sub reload_regions { 2980sub reload_regions {
2981 # HACK to clear player env face cache, we need some signal framework
2982 # for this (global event?)
2983 %ext::player_env::MUSIC_FACE_CACHE = ();
2984
2946 load_resource_file "$MAPDIR/regions" 2985 load_resource_file "$MAPDIR/regions"
2947 or die "unable to load regions file\n"; 2986 or die "unable to load regions file\n";
2948 2987
2949 for (cf::region::list) { 2988 for (cf::region::list) {
2950 $_->{match} = qr/$_->{match}/ 2989 $_->{match} = qr/$_->{match}/
… …
2986 3025
2987sub init { 3026sub init {
2988 reload_resources; 3027 reload_resources;
2989} 3028}
2990 3029
2991sub cfg_load { 3030sub reload_config {
2992 open my $fh, "<:utf8", "$CONFDIR/config" 3031 open my $fh, "<:utf8", "$CONFDIR/config"
2993 or return; 3032 or return;
2994 3033
2995 local $/; 3034 local $/;
2996 *CFG = YAML::Syck::Load <$fh>; 3035 *CFG = YAML::Syck::Load <$fh>;
… …
3016 (async { 3055 (async {
3017 Event::one_event; 3056 Event::one_event;
3018 })->prio (Coro::PRIO_MAX); 3057 })->prio (Coro::PRIO_MAX);
3019 }; 3058 };
3020 3059
3021 cfg_load; 3060 reload_config;
3022 db_init; 3061 db_init;
3023 load_extensions; 3062 load_extensions;
3024 3063
3025 $TICK_WATCHER->start; 3064 $TICK_WATCHER->start;
3026 Event::loop; 3065 Event::loop;
… …
3219 warn "reloading cf.pm"; 3258 warn "reloading cf.pm";
3220 require cf; 3259 require cf;
3221 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3260 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3222 3261
3223 warn "loading config and database again"; 3262 warn "loading config and database again";
3224 cf::cfg_load; 3263 cf::reload_config;
3225 3264
3226 warn "loading extensions"; 3265 warn "loading extensions";
3227 cf::load_extensions; 3266 cf::load_extensions;
3228 3267
3229 warn "reattaching attachments to objects/players"; 3268 warn "reattaching attachments to objects/players";

Diff Legend

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