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.349 by root, Fri Aug 31 04:10:43 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
… …
1505=cut 1511=cut
1506 1512
1507sub ext_reply($$@) { 1513sub ext_reply($$@) {
1508 my ($self, $id, @msg) = @_; 1514 my ($self, $id, @msg) = @_;
1509 1515
1510 if ($self->ns->extcmd == 2) { 1516 $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} 1517}
1518 1518
1519=item $player->ext_msg ($type, @msg) 1519=item $player->ext_msg ($type, @msg)
1520 1520
1521Sends an ext event to the client. 1521Sends an ext event to the client.
… …
1852 local $self->{deny_reset} = 1; # loading can take a long time 1852 local $self->{deny_reset} = 1; # loading can take a long time
1853 1853
1854 my $path = $self->{path}; 1854 my $path = $self->{path};
1855 1855
1856 { 1856 {
1857 my $guard1 = cf::lock_acquire "map_data:$path";
1857 my $guard = cf::lock_acquire "map_load:$path"; 1858 my $guard2 = cf::lock_acquire "map_load:$path";
1858 1859
1859 return if $self->in_memory != cf::MAP_SWAPPED; 1860 return if $self->in_memory != cf::MAP_SWAPPED;
1860 1861
1861 $self->in_memory (cf::MAP_LOADING); 1862 $self->in_memory (cf::MAP_LOADING);
1862 1863
1863 $self->alloc; 1864 $self->alloc;
1864 1865
1865 $self->pre_load; 1866 $self->pre_load;
1866 Coro::cede; 1867 cf::cede_to_tick;
1867 1868
1868 $self->_load_objects ($self->{load_path}, 1) 1869 $self->_load_objects ($self->{load_path}, 1)
1869 or return; 1870 or return;
1870 1871
1871 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1872 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1877 $self->clear_unique_items; 1878 $self->clear_unique_items;
1878 $self->_load_objects ($uniq, 0); 1879 $self->_load_objects ($uniq, 0);
1879 } 1880 }
1880 } 1881 }
1881 1882
1882 Coro::cede; 1883 cf::cede_to_tick;
1883 # now do the right thing for maps 1884 # now do the right thing for maps
1884 $self->link_multipart_objects; 1885 $self->link_multipart_objects;
1885 $self->difficulty ($self->estimate_difficulty) 1886 $self->difficulty ($self->estimate_difficulty)
1886 unless $self->difficulty; 1887 unless $self->difficulty;
1887 Coro::cede; 1888 cf::cede_to_tick;
1888 1889
1889 unless ($self->{deny_activate}) { 1890 unless ($self->{deny_activate}) {
1890 $self->decay_objects; 1891 $self->decay_objects;
1891 $self->fix_auto_apply; 1892 $self->fix_auto_apply;
1892 $self->update_buttons; 1893 $self->update_buttons;
1893 Coro::cede; 1894 cf::cede_to_tick;
1894 $self->set_darkness_map; 1895 $self->set_darkness_map;
1895 Coro::cede; 1896 cf::cede_to_tick;
1896 $self->activate; 1897 $self->activate;
1897 } 1898 }
1898 1899
1899 $self->{last_save} = $cf::RUNTIME; 1900 $self->{last_save} = $cf::RUNTIME;
1900 $self->last_access ($cf::RUNTIME); 1901 $self->last_access ($cf::RUNTIME);
… …
1950} 1951}
1951 1952
1952sub do_load_sync { 1953sub do_load_sync {
1953 my ($map) = @_; 1954 my ($map) = @_;
1954 1955
1956 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1957 if $Coro::current == $Coro::main;
1958
1955 cf::sync_job { $map->load }; 1959 cf::sync_job { $map->load };
1956} 1960}
1957 1961
1958our %MAP_PREFETCH; 1962our %MAP_PREFETCH;
1959our $MAP_PREFETCHER = undef; 1963our $MAP_PREFETCHER = undef;
1960 1964
1961sub find_async { 1965sub find_async {
1962 my ($path, $origin) = @_; 1966 my ($path, $origin, $load) = @_;
1963 1967
1964 $path = normalise $path, $origin && $origin->{path}; 1968 $path = normalise $path, $origin && $origin->{path};
1965 1969
1966 if (my $map = $cf::MAP{$path}) { 1970 if (my $map = $cf::MAP{$path}) {
1967 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1971 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1968 } 1972 }
1969 1973
1970 undef $MAP_PREFETCH{$path}; 1974 $MAP_PREFETCH{$path} |= $load;
1975
1971 $MAP_PREFETCHER ||= cf::async { 1976 $MAP_PREFETCHER ||= cf::async {
1972 while (%MAP_PREFETCH) { 1977 while (%MAP_PREFETCH) {
1973 for my $path (keys %MAP_PREFETCH) { 1978 while (my ($k, $v) = each %MAP_PREFETCH) {
1974 if (my $map = find $path) { 1979 if (my $map = find $k) {
1975 $map->load; 1980 $map->load if $v;
1976 } 1981 }
1977 1982
1978 delete $MAP_PREFETCH{$path}; 1983 delete $MAP_PREFETCH{$k};
1979 } 1984 }
1980 } 1985 }
1981 undef $MAP_PREFETCHER; 1986 undef $MAP_PREFETCHER;
1982 }; 1987 };
1983 $MAP_PREFETCHER->prio (6); 1988 $MAP_PREFETCHER->prio (6);
… …
1986} 1991}
1987 1992
1988sub save { 1993sub save {
1989 my ($self) = @_; 1994 my ($self) = @_;
1990 1995
1991 my $lock = cf::lock_acquire "map_data:" . $self->path; 1996 my $lock = cf::lock_acquire "map_data:$self->{path}";
1992 1997
1993 $self->{last_save} = $cf::RUNTIME; 1998 $self->{last_save} = $cf::RUNTIME;
1994 1999
1995 return unless $self->dirty; 2000 return unless $self->dirty;
1996 2001
… …
2019 my ($self) = @_; 2024 my ($self) = @_;
2020 2025
2021 # save first because save cedes 2026 # save first because save cedes
2022 $self->save; 2027 $self->save;
2023 2028
2024 my $lock = cf::lock_acquire "map_data:" . $self->path; 2029 my $lock = cf::lock_acquire "map_data:$self->{path}";
2025 2030
2026 return if $self->players; 2031 return if $self->players;
2027 return if $self->in_memory != cf::MAP_IN_MEMORY; 2032 return if $self->in_memory != cf::MAP_IN_MEMORY;
2028 return if $self->{deny_save}; 2033 return if $self->{deny_save};
2029 2034
… …
2081my $nuke_counter = "aaaa"; 2086my $nuke_counter = "aaaa";
2082 2087
2083sub nuke { 2088sub nuke {
2084 my ($self) = @_; 2089 my ($self) = @_;
2085 2090
2091 {
2092 my $lock = cf::lock_acquire "map_data:$self->{path}";
2093
2086 delete $cf::MAP{$self->path}; 2094 delete $cf::MAP{$self->path};
2087 2095
2088 $self->unlink_save;
2089
2090 bless $self, "cf::map"; 2096 bless $self, "cf::map";
2091 delete $self->{deny_reset}; 2097 delete $self->{deny_reset};
2092 $self->{deny_save} = 1; 2098 $self->{deny_save} = 1;
2093 $self->reset_timeout (1); 2099 $self->reset_timeout (1);
2094 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2100 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2095 2101
2102 $self->unlink_save;
2103
2096 $cf::MAP{$self->path} = $self; 2104 $cf::MAP{$self->path} = $self;
2105 }
2097 2106
2098 $self->reset; # polite request, might not happen 2107 $self->reset; # polite request, might not happen
2099} 2108}
2100 2109
2101=item $maps = cf::map::tmp_maps 2110=item $maps = cf::map::tmp_maps
… …
2557=cut 2566=cut
2558 2567
2559sub cf::client::ext_msg($$@) { 2568sub cf::client::ext_msg($$@) {
2560 my ($self, $type, @msg) = @_; 2569 my ($self, $type, @msg) = @_;
2561 2570
2562 my $extcmd = $self->extcmd;
2563
2564 if ($extcmd == 2) { 2571 if ($self->extcmd == 2) {
2565 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2572 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2566 } elsif ($extcmd == 1) { # TODO: remove 2573 } elsif ($self->extcmd == 1) { # TODO: remove
2567 push @msg, msgtype => "event_$type"; 2574 push @msg, msgtype => "event_$type";
2575 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2576 }
2577}
2578
2579=item $client->ext_reply ($msgid, @msg)
2580
2581Sends an ext reply to the client.
2582
2583=cut
2584
2585sub cf::client::ext_reply($$@) {
2586 my ($self, $id, @msg) = @_;
2587
2588 if ($self->extcmd == 2) {
2589 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2590 } elsif ($self->extcmd == 1) {
2591 #TODO: version 1, remove
2592 unshift @msg, msgtype => "reply", msgid => $id;
2568 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2593 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2569 } 2594 }
2570} 2595}
2571 2596
2572=item $success = $client->query ($flags, "text", \&cb) 2597=item $success = $client->query ($flags, "text", \&cb)
… …
2634 my ($type, $reply, @payload) = 2659 my ($type, $reply, @payload) =
2635 "ARRAY" eq ref $msg 2660 "ARRAY" eq ref $msg
2636 ? @$msg 2661 ? @$msg
2637 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2662 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2638 2663
2664 my @reply;
2665
2639 if (my $cb = $EXTICMD{$type}) { 2666 if (my $cb = $EXTICMD{$type}) {
2640 my @reply = $cb->($ns, @payload); 2667 @reply = $cb->($ns, @payload);
2641
2642 $ns->ext_reply ($reply, @reply)
2643 if $reply;
2644 } 2668 }
2669
2670 $ns->ext_reply ($reply, @reply)
2671 if $reply;
2672
2645 } else { 2673 } else {
2646 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2674 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2647 } 2675 }
2648 2676
2649 cf::override; 2677 cf::override;
… …
2710 2738
2711The following functions and methods are available within a safe environment: 2739The following functions and methods are available within a safe environment:
2712 2740
2713 cf::object 2741 cf::object
2714 contr pay_amount pay_player map x y force_find force_add 2742 contr pay_amount pay_player map x y force_find force_add
2715 insert remove name archname title slaying race 2743 insert remove name archname title slaying race decrease_ob_nr
2716 2744
2717 cf::object::player 2745 cf::object::player
2718 player 2746 player
2719 2747
2720 cf::player 2748 cf::player
… …
2725 2753
2726=cut 2754=cut
2727 2755
2728for ( 2756for (
2729 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2757 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2730 insert remove inv name archname title slaying race)], 2758 insert remove inv name archname title slaying race
2759 decrease_ob_nr)],
2731 ["cf::object::player" => qw(player)], 2760 ["cf::object::player" => qw(player)],
2732 ["cf::player" => qw(peaceful)], 2761 ["cf::player" => qw(peaceful)],
2733 ["cf::map" => qw(trigger)], 2762 ["cf::map" => qw(trigger)],
2734) { 2763) {
2735 no strict 'refs'; 2764 no strict 'refs';
… …
2811# the server's init and main functions 2840# the server's init and main functions
2812 2841
2813sub load_facedata($) { 2842sub load_facedata($) {
2814 my ($path) = @_; 2843 my ($path) = @_;
2815 2844
2845 # HACK to clear player env face cache, we need some signal framework
2846 # for this (global event?)
2847 %ext::player_env::MUSIC_FACE_CACHE = ();
2848
2816 my $enc = JSON::XS->new->utf8->canonical; 2849 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2817 2850
2818 warn "loading facedata from $path\n"; 2851 warn "loading facedata from $path\n";
2819 2852
2820 my $facedata; 2853 my $facedata;
2821 0 < aio_load $path, $facedata 2854 0 < aio_load $path, $facedata
… …
2825 2858
2826 $facedata->{version} == 2 2859 $facedata->{version} == 2
2827 or cf::cleanup "$path: version mismatch, cannot proceed."; 2860 or cf::cleanup "$path: version mismatch, cannot proceed.";
2828 2861
2829 # patch in the exptable 2862 # patch in the exptable
2830 cf::cede_to_tick;
2831 $facedata->{resource}{"res/exp_table"} = { 2863 $facedata->{resource}{"res/exp_table"} = {
2832 type => FT_RSRC, 2864 type => FT_RSRC,
2833 data => $enc->encode ([map cf::level_to_min_exp $_, 0 .. cf::settings->max_level]), 2865 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2834 }; 2866 };
2835 cf::cede_to_tick; 2867 cf::cede_to_tick;
2836 2868
2837 { 2869 {
2838 my $faces = $facedata->{faceinfo}; 2870 my $faces = $facedata->{faceinfo};
… …
2891 name => $name, 2923 name => $name,
2892 %{ $info->{meta} || {} }, 2924 %{ $info->{meta} || {} },
2893 }); 2925 });
2894 2926
2895 $data = pack "(w/a*)*", $meta, $info->{data}; 2927 $data = pack "(w/a*)*", $meta, $info->{data};
2928 } else {
2929 $data = $info->{data};
2896 } 2930 }
2897 2931
2898 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data; 2932 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2899 cf::face::set_type $idx, $info->{type}; 2933 cf::face::set_type $idx, $info->{type};
2900 2934
… …
2930 $ns->fx_want ($k, $v); 2964 $ns->fx_want ($k, $v);
2931 } 2965 }
2932}; 2966};
2933 2967
2934sub reload_regions { 2968sub reload_regions {
2969 # HACK to clear player env face cache, we need some signal framework
2970 # for this (global event?)
2971 %ext::player_env::MUSIC_FACE_CACHE = ();
2972
2935 load_resource_file "$MAPDIR/regions" 2973 load_resource_file "$MAPDIR/regions"
2936 or die "unable to load regions file\n"; 2974 or die "unable to load regions file\n";
2937 2975
2938 for (cf::region::list) { 2976 for (cf::region::list) {
2939 $_->{match} = qr/$_->{match}/ 2977 $_->{match} = qr/$_->{match}/
… …
2975 3013
2976sub init { 3014sub init {
2977 reload_resources; 3015 reload_resources;
2978} 3016}
2979 3017
2980sub cfg_load { 3018sub reload_config {
2981 open my $fh, "<:utf8", "$CONFDIR/config" 3019 open my $fh, "<:utf8", "$CONFDIR/config"
2982 or return; 3020 or return;
2983 3021
2984 local $/; 3022 local $/;
2985 *CFG = YAML::Syck::Load <$fh>; 3023 *CFG = YAML::Syck::Load <$fh>;
… …
3005 (async { 3043 (async {
3006 Event::one_event; 3044 Event::one_event;
3007 })->prio (Coro::PRIO_MAX); 3045 })->prio (Coro::PRIO_MAX);
3008 }; 3046 };
3009 3047
3010 cfg_load; 3048 reload_config;
3011 db_init; 3049 db_init;
3012 load_extensions; 3050 load_extensions;
3013 3051
3014 $TICK_WATCHER->start; 3052 $TICK_WATCHER->start;
3015 Event::loop; 3053 Event::loop;
… …
3208 warn "reloading cf.pm"; 3246 warn "reloading cf.pm";
3209 require cf; 3247 require cf;
3210 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3248 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3211 3249
3212 warn "loading config and database again"; 3250 warn "loading config and database again";
3213 cf::cfg_load; 3251 cf::reload_config;
3214 3252
3215 warn "loading extensions"; 3253 warn "loading extensions";
3216 cf::load_extensions; 3254 cf::load_extensions;
3217 3255
3218 warn "reattaching attachments to objects/players"; 3256 warn "reattaching attachments to objects/players";

Diff Legend

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