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.337 by root, Tue Aug 21 00:54:01 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
… …
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;
2083
2084 bless $self, "cf::map"; 2096 bless $self, "cf::map";
2085 delete $self->{deny_reset}; 2097 delete $self->{deny_reset};
2086 $self->{deny_save} = 1; 2098 $self->{deny_save} = 1;
2087 $self->reset_timeout (1); 2099 $self->reset_timeout (1);
2088 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2100 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2089 2101
2102 $self->unlink_save;
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
… …
2551=cut 2566=cut
2552 2567
2553sub cf::client::ext_msg($$@) { 2568sub cf::client::ext_msg($$@) {
2554 my ($self, $type, @msg) = @_; 2569 my ($self, $type, @msg) = @_;
2555 2570
2556 my $extcmd = $self->extcmd;
2557
2558 if ($extcmd == 2) { 2571 if ($self->extcmd == 2) {
2559 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2572 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2560 } elsif ($extcmd == 1) { # TODO: remove 2573 } elsif ($self->extcmd == 1) { # TODO: remove
2561 push @msg, msgtype => "event_$type"; 2574 push @msg, msgtype => "event_$type";
2562 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2575 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2563 } 2576 }
2564} 2577}
2565 2578
… …
2572sub cf::client::ext_reply($$@) { 2585sub cf::client::ext_reply($$@) {
2573 my ($self, $id, @msg) = @_; 2586 my ($self, $id, @msg) = @_;
2574 2587
2575 if ($self->extcmd == 2) { 2588 if ($self->extcmd == 2) {
2576 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 2589 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2577 } elsif ($self->ns->extcmd == 1) { 2590 } elsif ($self->extcmd == 1) {
2578 #TODO: version 1, remove 2591 #TODO: version 1, remove
2579 unshift @msg, msgtype => "reply", msgid => $id; 2592 unshift @msg, msgtype => "reply", msgid => $id;
2580 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2593 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2581 } 2594 }
2582} 2595}
… …
2646 my ($type, $reply, @payload) = 2659 my ($type, $reply, @payload) =
2647 "ARRAY" eq ref $msg 2660 "ARRAY" eq ref $msg
2648 ? @$msg 2661 ? @$msg
2649 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2662 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2650 2663
2664 my @reply;
2665
2651 if (my $cb = $EXTICMD{$type}) { 2666 if (my $cb = $EXTICMD{$type}) {
2652 my @reply = $cb->($ns, @payload); 2667 @reply = $cb->($ns, @payload);
2653
2654 $ns->ext_reply ($reply, @reply)
2655 if $reply;
2656 } 2668 }
2669
2670 $ns->ext_reply ($reply, @reply)
2671 if $reply;
2672
2657 } else { 2673 } else {
2658 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";
2659 } 2675 }
2660 2676
2661 cf::override; 2677 cf::override;
… …
2722 2738
2723The following functions and methods are available within a safe environment: 2739The following functions and methods are available within a safe environment:
2724 2740
2725 cf::object 2741 cf::object
2726 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
2727 insert remove name archname title slaying race 2743 insert remove name archname title slaying race decrease_ob_nr
2728 2744
2729 cf::object::player 2745 cf::object::player
2730 player 2746 player
2731 2747
2732 cf::player 2748 cf::player
… …
2737 2753
2738=cut 2754=cut
2739 2755
2740for ( 2756for (
2741 ["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
2742 insert remove inv name archname title slaying race)], 2758 insert remove inv name archname title slaying race
2759 decrease_ob_nr)],
2743 ["cf::object::player" => qw(player)], 2760 ["cf::object::player" => qw(player)],
2744 ["cf::player" => qw(peaceful)], 2761 ["cf::player" => qw(peaceful)],
2745 ["cf::map" => qw(trigger)], 2762 ["cf::map" => qw(trigger)],
2746) { 2763) {
2747 no strict 'refs'; 2764 no strict 'refs';
… …
2823# the server's init and main functions 2840# the server's init and main functions
2824 2841
2825sub load_facedata($) { 2842sub load_facedata($) {
2826 my ($path) = @_; 2843 my ($path) = @_;
2827 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
2828 my $enc = JSON::XS->new->utf8->canonical; 2849 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2829 2850
2830 warn "loading facedata from $path\n"; 2851 warn "loading facedata from $path\n";
2831 2852
2832 my $facedata; 2853 my $facedata;
2833 0 < aio_load $path, $facedata 2854 0 < aio_load $path, $facedata
… …
2943 $ns->fx_want ($k, $v); 2964 $ns->fx_want ($k, $v);
2944 } 2965 }
2945}; 2966};
2946 2967
2947sub 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
2948 load_resource_file "$MAPDIR/regions" 2973 load_resource_file "$MAPDIR/regions"
2949 or die "unable to load regions file\n"; 2974 or die "unable to load regions file\n";
2950 2975
2951 for (cf::region::list) { 2976 for (cf::region::list) {
2952 $_->{match} = qr/$_->{match}/ 2977 $_->{match} = qr/$_->{match}/
… …
2988 3013
2989sub init { 3014sub init {
2990 reload_resources; 3015 reload_resources;
2991} 3016}
2992 3017
2993sub cfg_load { 3018sub reload_config {
2994 open my $fh, "<:utf8", "$CONFDIR/config" 3019 open my $fh, "<:utf8", "$CONFDIR/config"
2995 or return; 3020 or return;
2996 3021
2997 local $/; 3022 local $/;
2998 *CFG = YAML::Syck::Load <$fh>; 3023 *CFG = YAML::Syck::Load <$fh>;
… …
3018 (async { 3043 (async {
3019 Event::one_event; 3044 Event::one_event;
3020 })->prio (Coro::PRIO_MAX); 3045 })->prio (Coro::PRIO_MAX);
3021 }; 3046 };
3022 3047
3023 cfg_load; 3048 reload_config;
3024 db_init; 3049 db_init;
3025 load_extensions; 3050 load_extensions;
3026 3051
3027 $TICK_WATCHER->start; 3052 $TICK_WATCHER->start;
3028 Event::loop; 3053 Event::loop;
… …
3221 warn "reloading cf.pm"; 3246 warn "reloading cf.pm";
3222 require cf; 3247 require cf;
3223 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3248 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3224 3249
3225 warn "loading config and database again"; 3250 warn "loading config and database again";
3226 cf::cfg_load; 3251 cf::reload_config;
3227 3252
3228 warn "loading extensions"; 3253 warn "loading extensions";
3229 cf::load_extensions; 3254 cf::load_extensions;
3230 3255
3231 warn "reattaching attachments to objects/players"; 3256 warn "reattaching attachments to objects/players";

Diff Legend

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