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.338 by root, Tue Aug 21 01:07:47 2007 UTC vs.
Revision 1.350 by root, Sat Sep 1 08:03:45 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";
… …
1322 1325
1323 aio_mkdir playerdir $pl, 0770; 1326 aio_mkdir playerdir $pl, 0770;
1324 $pl->{last_save} = $cf::RUNTIME; 1327 $pl->{last_save} = $cf::RUNTIME;
1325 1328
1326 $pl->save_pl ($path); 1329 $pl->save_pl ($path);
1327 Coro::cede; 1330 cf::cede_to_tick;
1328} 1331}
1329 1332
1330sub new($) { 1333sub new($) {
1331 my ($login) = @_; 1334 my ($login) = @_;
1332 1335
… …
1849 local $self->{deny_reset} = 1; # loading can take a long time 1852 local $self->{deny_reset} = 1; # loading can take a long time
1850 1853
1851 my $path = $self->{path}; 1854 my $path = $self->{path};
1852 1855
1853 { 1856 {
1857 my $guard1 = cf::lock_acquire "map_data:$path";
1854 my $guard = cf::lock_acquire "map_load:$path"; 1858 my $guard2 = cf::lock_acquire "map_load:$path";
1855 1859
1856 return if $self->in_memory != cf::MAP_SWAPPED; 1860 return if $self->in_memory != cf::MAP_SWAPPED;
1857 1861
1858 $self->in_memory (cf::MAP_LOADING); 1862 $self->in_memory (cf::MAP_LOADING);
1859 1863
1860 $self->alloc; 1864 $self->alloc;
1861 1865
1862 $self->pre_load; 1866 $self->pre_load;
1863 Coro::cede; 1867 cf::cede_to_tick;
1864 1868
1865 $self->_load_objects ($self->{load_path}, 1) 1869 $self->_load_objects ($self->{load_path}, 1)
1866 or return; 1870 or return;
1867 1871
1868 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1872 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1874 $self->clear_unique_items; 1878 $self->clear_unique_items;
1875 $self->_load_objects ($uniq, 0); 1879 $self->_load_objects ($uniq, 0);
1876 } 1880 }
1877 } 1881 }
1878 1882
1879 Coro::cede; 1883 cf::cede_to_tick;
1880 # now do the right thing for maps 1884 # now do the right thing for maps
1881 $self->link_multipart_objects; 1885 $self->link_multipart_objects;
1882 $self->difficulty ($self->estimate_difficulty) 1886 $self->difficulty ($self->estimate_difficulty)
1883 unless $self->difficulty; 1887 unless $self->difficulty;
1884 Coro::cede; 1888 cf::cede_to_tick;
1885 1889
1886 unless ($self->{deny_activate}) { 1890 unless ($self->{deny_activate}) {
1887 $self->decay_objects; 1891 $self->decay_objects;
1888 $self->fix_auto_apply; 1892 $self->fix_auto_apply;
1889 $self->update_buttons; 1893 $self->update_buttons;
1890 Coro::cede; 1894 cf::cede_to_tick;
1891 $self->set_darkness_map; 1895 $self->set_darkness_map;
1892 Coro::cede; 1896 cf::cede_to_tick;
1893 $self->activate; 1897 $self->activate;
1894 } 1898 }
1895 1899
1896 $self->{last_save} = $cf::RUNTIME; 1900 $self->{last_save} = $cf::RUNTIME;
1897 $self->last_access ($cf::RUNTIME); 1901 $self->last_access ($cf::RUNTIME);
… …
1947} 1951}
1948 1952
1949sub do_load_sync { 1953sub do_load_sync {
1950 my ($map) = @_; 1954 my ($map) = @_;
1951 1955
1956 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1957 if $Coro::current == $Coro::main;
1958
1952 cf::sync_job { $map->load }; 1959 cf::sync_job { $map->load };
1953} 1960}
1954 1961
1955our %MAP_PREFETCH; 1962our %MAP_PREFETCH;
1956our $MAP_PREFETCHER = undef; 1963our $MAP_PREFETCHER = undef;
1957 1964
1958sub find_async { 1965sub find_async {
1959 my ($path, $origin) = @_; 1966 my ($path, $origin, $load) = @_;
1960 1967
1961 $path = normalise $path, $origin && $origin->{path}; 1968 $path = normalise $path, $origin && $origin->{path};
1962 1969
1963 if (my $map = $cf::MAP{$path}) { 1970 if (my $map = $cf::MAP{$path}) {
1964 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1971 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1965 } 1972 }
1966 1973
1967 undef $MAP_PREFETCH{$path}; 1974 $MAP_PREFETCH{$path} |= $load;
1975
1968 $MAP_PREFETCHER ||= cf::async { 1976 $MAP_PREFETCHER ||= cf::async {
1969 while (%MAP_PREFETCH) { 1977 while (%MAP_PREFETCH) {
1970 for my $path (keys %MAP_PREFETCH) { 1978 while (my ($k, $v) = each %MAP_PREFETCH) {
1971 if (my $map = find $path) { 1979 if (my $map = find $k) {
1972 $map->load; 1980 $map->load if $v;
1973 } 1981 }
1974 1982
1975 delete $MAP_PREFETCH{$path}; 1983 delete $MAP_PREFETCH{$k};
1976 } 1984 }
1977 } 1985 }
1978 undef $MAP_PREFETCHER; 1986 undef $MAP_PREFETCHER;
1979 }; 1987 };
1980 $MAP_PREFETCHER->prio (6); 1988 $MAP_PREFETCHER->prio (6);
… …
1983} 1991}
1984 1992
1985sub save { 1993sub save {
1986 my ($self) = @_; 1994 my ($self) = @_;
1987 1995
1988 my $lock = cf::lock_acquire "map_data:" . $self->path; 1996 my $lock = cf::lock_acquire "map_data:$self->{path}";
1989 1997
1990 $self->{last_save} = $cf::RUNTIME; 1998 $self->{last_save} = $cf::RUNTIME;
1991 1999
1992 return unless $self->dirty; 2000 return unless $self->dirty;
1993 2001
… …
2016 my ($self) = @_; 2024 my ($self) = @_;
2017 2025
2018 # save first because save cedes 2026 # save first because save cedes
2019 $self->save; 2027 $self->save;
2020 2028
2021 my $lock = cf::lock_acquire "map_data:" . $self->path; 2029 my $lock = cf::lock_acquire "map_data:$self->{path}";
2022 2030
2023 return if $self->players; 2031 return if $self->players;
2024 return if $self->in_memory != cf::MAP_IN_MEMORY; 2032 return if $self->in_memory != cf::MAP_IN_MEMORY;
2025 return if $self->{deny_save}; 2033 return if $self->{deny_save};
2026 2034
… …
2078my $nuke_counter = "aaaa"; 2086my $nuke_counter = "aaaa";
2079 2087
2080sub nuke { 2088sub nuke {
2081 my ($self) = @_; 2089 my ($self) = @_;
2082 2090
2091 {
2092 my $lock = cf::lock_acquire "map_data:$self->{path}";
2093
2083 delete $cf::MAP{$self->path}; 2094 delete $cf::MAP{$self->path};
2084 2095
2085 $self->unlink_save;
2086
2087 bless $self, "cf::map"; 2096 bless $self, "cf::map";
2088 delete $self->{deny_reset}; 2097 delete $self->{deny_reset};
2089 $self->{deny_save} = 1; 2098 $self->{deny_save} = 1;
2090 $self->reset_timeout (1); 2099 $self->reset_timeout (1);
2091 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2100 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2092 2101
2102 $self->unlink_save;
2103
2093 $cf::MAP{$self->path} = $self; 2104 $cf::MAP{$self->path} = $self;
2105 }
2094 2106
2095 $self->reset; # polite request, might not happen 2107 $self->reset; # polite request, might not happen
2096} 2108}
2097 2109
2098=item $maps = cf::map::tmp_maps 2110=item $maps = cf::map::tmp_maps
… …
2492the 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
2493the message unless the client supports the msg packet. 2505the message unless the client supports the msg packet.
2494 2506
2495=cut 2507=cut
2496 2508
2509our %CHANNEL = (
2510 "c/identify" => {
2511 id => "identify",
2512 title => "Identify",
2513 reply => undef,
2514 tooltip => "Items recently identified",
2515 },
2516);
2517
2497sub cf::client::send_msg { 2518sub cf::client::send_msg {
2498 my ($self, $channel, $msg, $color, @extra) = @_; 2519 my ($self, $channel, $msg, $color, @extra) = @_;
2499 2520
2500 $msg = $self->pl->expand_cfpod ($msg); 2521 $msg = $self->pl->expand_cfpod ($msg);
2501 2522
2502 $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};
2503 2527
2504 if (ref $channel) { 2528 if (ref $channel) {
2505 # send meta info to client, if not yet sent 2529 # send meta info to client, if not yet sent
2506 unless (exists $self->{channel}{$channel->{id}}) { 2530 unless (exists $self->{channel}{$channel->{id}}) {
2507 $self->{channel}{$channel->{id}} = $channel; 2531 $self->{channel}{$channel->{id}} = $channel;
… …
2554=cut 2578=cut
2555 2579
2556sub cf::client::ext_msg($$@) { 2580sub cf::client::ext_msg($$@) {
2557 my ($self, $type, @msg) = @_; 2581 my ($self, $type, @msg) = @_;
2558 2582
2559 my $extcmd = $self->extcmd;
2560
2561 if ($extcmd == 2) { 2583 if ($self->extcmd == 2) {
2562 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2584 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2563 } elsif ($extcmd == 1) { # TODO: remove 2585 } elsif ($self->extcmd == 1) { # TODO: remove
2564 push @msg, msgtype => "event_$type"; 2586 push @msg, msgtype => "event_$type";
2565 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2587 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2566 } 2588 }
2567} 2589}
2568 2590
… …
2575sub cf::client::ext_reply($$@) { 2597sub cf::client::ext_reply($$@) {
2576 my ($self, $id, @msg) = @_; 2598 my ($self, $id, @msg) = @_;
2577 2599
2578 if ($self->extcmd == 2) { 2600 if ($self->extcmd == 2) {
2579 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 2601 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2580 } elsif ($self->ns->extcmd == 1) { 2602 } elsif ($self->extcmd == 1) {
2581 #TODO: version 1, remove 2603 #TODO: version 1, remove
2582 unshift @msg, msgtype => "reply", msgid => $id; 2604 unshift @msg, msgtype => "reply", msgid => $id;
2583 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2605 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2584 } 2606 }
2585} 2607}
… …
2728 2750
2729The following functions and methods are available within a safe environment: 2751The following functions and methods are available within a safe environment:
2730 2752
2731 cf::object 2753 cf::object
2732 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
2733 insert remove name archname title slaying race 2755 insert remove name archname title slaying race decrease_ob_nr
2734 2756
2735 cf::object::player 2757 cf::object::player
2736 player 2758 player
2737 2759
2738 cf::player 2760 cf::player
… …
2743 2765
2744=cut 2766=cut
2745 2767
2746for ( 2768for (
2747 ["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
2748 insert remove inv name archname title slaying race)], 2770 insert remove inv name archname title slaying race
2771 decrease_ob_nr)],
2749 ["cf::object::player" => qw(player)], 2772 ["cf::object::player" => qw(player)],
2750 ["cf::player" => qw(peaceful)], 2773 ["cf::player" => qw(peaceful)],
2751 ["cf::map" => qw(trigger)], 2774 ["cf::map" => qw(trigger)],
2752) { 2775) {
2753 no strict 'refs'; 2776 no strict 'refs';
… …
2829# the server's init and main functions 2852# the server's init and main functions
2830 2853
2831sub load_facedata($) { 2854sub load_facedata($) {
2832 my ($path) = @_; 2855 my ($path) = @_;
2833 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
2834 my $enc = JSON::XS->new->utf8->canonical; 2861 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2835 2862
2836 warn "loading facedata from $path\n"; 2863 warn "loading facedata from $path\n";
2837 2864
2838 my $facedata; 2865 my $facedata;
2839 0 < aio_load $path, $facedata 2866 0 < aio_load $path, $facedata
… …
2949 $ns->fx_want ($k, $v); 2976 $ns->fx_want ($k, $v);
2950 } 2977 }
2951}; 2978};
2952 2979
2953sub 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
2954 load_resource_file "$MAPDIR/regions" 2985 load_resource_file "$MAPDIR/regions"
2955 or die "unable to load regions file\n"; 2986 or die "unable to load regions file\n";
2956 2987
2957 for (cf::region::list) { 2988 for (cf::region::list) {
2958 $_->{match} = qr/$_->{match}/ 2989 $_->{match} = qr/$_->{match}/
… …
2994 3025
2995sub init { 3026sub init {
2996 reload_resources; 3027 reload_resources;
2997} 3028}
2998 3029
2999sub cfg_load { 3030sub reload_config {
3000 open my $fh, "<:utf8", "$CONFDIR/config" 3031 open my $fh, "<:utf8", "$CONFDIR/config"
3001 or return; 3032 or return;
3002 3033
3003 local $/; 3034 local $/;
3004 *CFG = YAML::Syck::Load <$fh>; 3035 *CFG = YAML::Syck::Load <$fh>;
… …
3024 (async { 3055 (async {
3025 Event::one_event; 3056 Event::one_event;
3026 })->prio (Coro::PRIO_MAX); 3057 })->prio (Coro::PRIO_MAX);
3027 }; 3058 };
3028 3059
3029 cfg_load; 3060 reload_config;
3030 db_init; 3061 db_init;
3031 load_extensions; 3062 load_extensions;
3032 3063
3033 $TICK_WATCHER->start; 3064 $TICK_WATCHER->start;
3034 Event::loop; 3065 Event::loop;
… …
3227 warn "reloading cf.pm"; 3258 warn "reloading cf.pm";
3228 require cf; 3259 require cf;
3229 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3260 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3230 3261
3231 warn "loading config and database again"; 3262 warn "loading config and database again";
3232 cf::cfg_load; 3263 cf::reload_config;
3233 3264
3234 warn "loading extensions"; 3265 warn "loading extensions";
3235 cf::load_extensions; 3266 cf::load_extensions;
3236 3267
3237 warn "reattaching attachments to objects/players"; 3268 warn "reattaching attachments to objects/players";

Diff Legend

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