… | |
… | |
21 | use Coro::Semaphore; |
21 | use Coro::Semaphore; |
22 | use Coro::AIO; |
22 | use Coro::AIO; |
23 | use Coro::Storable; |
23 | use Coro::Storable; |
24 | use Coro::Util (); |
24 | use Coro::Util (); |
25 | |
25 | |
26 | use JSON::XS 1.4 (); |
26 | use JSON::XS (); |
27 | use BDB (); |
27 | use BDB (); |
28 | use Data::Dumper; |
28 | use Data::Dumper; |
29 | use Digest::MD5; |
29 | use Digest::MD5; |
30 | use Fcntl; |
30 | use Fcntl; |
31 | use YAML::Syck (); |
31 | use YAML::Syck (); |
… | |
… | |
272 | Wait until the given lock is available and then acquires it and returns |
272 | Wait until the given lock is available and then acquires it and returns |
273 | a Coro::guard object. If the guard object gets destroyed (goes out of scope, |
273 | a Coro::guard object. If the guard object gets destroyed (goes out of scope, |
274 | for example when the coroutine gets canceled), the lock is automatically |
274 | for example when the coroutine gets canceled), the lock is automatically |
275 | returned. |
275 | returned. |
276 | |
276 | |
|
|
277 | Locks are *not* recursive, locking from the same coro twice results in a |
|
|
278 | deadlocked coro. |
|
|
279 | |
277 | Lock names should begin with a unique identifier (for example, cf::map::find |
280 | Lock names should begin with a unique identifier (for example, cf::map::find |
278 | uses map_find and cf::map::load uses map_load). |
281 | uses 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 | |
1330 | sub new($) { |
1333 | sub 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 | |
1949 | sub do_load_sync { |
1953 | sub 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 | |
1955 | our %MAP_PREFETCH; |
1962 | our %MAP_PREFETCH; |
1956 | our $MAP_PREFETCHER = undef; |
1963 | our $MAP_PREFETCHER = undef; |
1957 | |
1964 | |
1958 | sub find_async { |
1965 | sub 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 | |
1985 | sub save { |
1993 | sub 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 | |
… | |
… | |
2554 | =cut |
2562 | =cut |
2555 | |
2563 | |
2556 | sub cf::client::ext_msg($$@) { |
2564 | sub cf::client::ext_msg($$@) { |
2557 | my ($self, $type, @msg) = @_; |
2565 | my ($self, $type, @msg) = @_; |
2558 | |
2566 | |
2559 | my $extcmd = $self->extcmd; |
|
|
2560 | |
|
|
2561 | if ($extcmd == 2) { |
2567 | if ($self->extcmd == 2) { |
2562 | $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); |
2568 | $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); |
2563 | } elsif ($extcmd == 1) { # TODO: remove |
2569 | } elsif ($self->extcmd == 1) { # TODO: remove |
2564 | push @msg, msgtype => "event_$type"; |
2570 | push @msg, msgtype => "event_$type"; |
2565 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
2571 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
2566 | } |
2572 | } |
2567 | } |
2573 | } |
2568 | |
2574 | |
… | |
… | |
2575 | sub cf::client::ext_reply($$@) { |
2581 | sub cf::client::ext_reply($$@) { |
2576 | my ($self, $id, @msg) = @_; |
2582 | my ($self, $id, @msg) = @_; |
2577 | |
2583 | |
2578 | if ($self->extcmd == 2) { |
2584 | if ($self->extcmd == 2) { |
2579 | $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); |
2585 | $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); |
2580 | } elsif ($self->ns->extcmd == 1) { |
2586 | } elsif ($self->extcmd == 1) { |
2581 | #TODO: version 1, remove |
2587 | #TODO: version 1, remove |
2582 | unshift @msg, msgtype => "reply", msgid => $id; |
2588 | unshift @msg, msgtype => "reply", msgid => $id; |
2583 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
2589 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
2584 | } |
2590 | } |
2585 | } |
2591 | } |
… | |
… | |
2728 | |
2734 | |
2729 | The following functions and methods are available within a safe environment: |
2735 | The following functions and methods are available within a safe environment: |
2730 | |
2736 | |
2731 | cf::object |
2737 | cf::object |
2732 | contr pay_amount pay_player map x y force_find force_add |
2738 | contr pay_amount pay_player map x y force_find force_add |
2733 | insert remove name archname title slaying race |
2739 | insert remove name archname title slaying race decrease_ob_nr |
2734 | |
2740 | |
2735 | cf::object::player |
2741 | cf::object::player |
2736 | player |
2742 | player |
2737 | |
2743 | |
2738 | cf::player |
2744 | cf::player |
… | |
… | |
2743 | |
2749 | |
2744 | =cut |
2750 | =cut |
2745 | |
2751 | |
2746 | for ( |
2752 | for ( |
2747 | ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y |
2753 | ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y |
2748 | insert remove inv name archname title slaying race)], |
2754 | insert remove inv name archname title slaying race |
|
|
2755 | decrease_ob_nr)], |
2749 | ["cf::object::player" => qw(player)], |
2756 | ["cf::object::player" => qw(player)], |
2750 | ["cf::player" => qw(peaceful)], |
2757 | ["cf::player" => qw(peaceful)], |
2751 | ["cf::map" => qw(trigger)], |
2758 | ["cf::map" => qw(trigger)], |
2752 | ) { |
2759 | ) { |
2753 | no strict 'refs'; |
2760 | no strict 'refs'; |
… | |
… | |
2829 | # the server's init and main functions |
2836 | # the server's init and main functions |
2830 | |
2837 | |
2831 | sub load_facedata($) { |
2838 | sub load_facedata($) { |
2832 | my ($path) = @_; |
2839 | my ($path) = @_; |
2833 | |
2840 | |
|
|
2841 | # HACK to clear player env face cache, we need some signal framework |
|
|
2842 | # for this (global event?) |
|
|
2843 | %ext::player_env::MUSIC_FACE_CACHE = (); |
|
|
2844 | |
2834 | my $enc = JSON::XS->new->utf8->canonical; |
2845 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
2835 | |
2846 | |
2836 | warn "loading facedata from $path\n"; |
2847 | warn "loading facedata from $path\n"; |
2837 | |
2848 | |
2838 | my $facedata; |
2849 | my $facedata; |
2839 | 0 < aio_load $path, $facedata |
2850 | 0 < aio_load $path, $facedata |
… | |
… | |
2949 | $ns->fx_want ($k, $v); |
2960 | $ns->fx_want ($k, $v); |
2950 | } |
2961 | } |
2951 | }; |
2962 | }; |
2952 | |
2963 | |
2953 | sub reload_regions { |
2964 | sub reload_regions { |
|
|
2965 | # HACK to clear player env face cache, we need some signal framework |
|
|
2966 | # for this (global event?) |
|
|
2967 | %ext::player_env::MUSIC_FACE_CACHE = (); |
|
|
2968 | |
2954 | load_resource_file "$MAPDIR/regions" |
2969 | load_resource_file "$MAPDIR/regions" |
2955 | or die "unable to load regions file\n"; |
2970 | or die "unable to load regions file\n"; |
2956 | |
2971 | |
2957 | for (cf::region::list) { |
2972 | for (cf::region::list) { |
2958 | $_->{match} = qr/$_->{match}/ |
2973 | $_->{match} = qr/$_->{match}/ |
… | |
… | |
2994 | |
3009 | |
2995 | sub init { |
3010 | sub init { |
2996 | reload_resources; |
3011 | reload_resources; |
2997 | } |
3012 | } |
2998 | |
3013 | |
2999 | sub cfg_load { |
3014 | sub reload_config { |
3000 | open my $fh, "<:utf8", "$CONFDIR/config" |
3015 | open my $fh, "<:utf8", "$CONFDIR/config" |
3001 | or return; |
3016 | or return; |
3002 | |
3017 | |
3003 | local $/; |
3018 | local $/; |
3004 | *CFG = YAML::Syck::Load <$fh>; |
3019 | *CFG = YAML::Syck::Load <$fh>; |
… | |
… | |
3024 | (async { |
3039 | (async { |
3025 | Event::one_event; |
3040 | Event::one_event; |
3026 | })->prio (Coro::PRIO_MAX); |
3041 | })->prio (Coro::PRIO_MAX); |
3027 | }; |
3042 | }; |
3028 | |
3043 | |
3029 | cfg_load; |
3044 | reload_config; |
3030 | db_init; |
3045 | db_init; |
3031 | load_extensions; |
3046 | load_extensions; |
3032 | |
3047 | |
3033 | $TICK_WATCHER->start; |
3048 | $TICK_WATCHER->start; |
3034 | Event::loop; |
3049 | Event::loop; |
… | |
… | |
3227 | warn "reloading cf.pm"; |
3242 | warn "reloading cf.pm"; |
3228 | require cf; |
3243 | require cf; |
3229 | cf::_connect_to_perl; # nominally unnecessary, but cannot hurt |
3244 | cf::_connect_to_perl; # nominally unnecessary, but cannot hurt |
3230 | |
3245 | |
3231 | warn "loading config and database again"; |
3246 | warn "loading config and database again"; |
3232 | cf::cfg_load; |
3247 | cf::reload_config; |
3233 | |
3248 | |
3234 | warn "loading extensions"; |
3249 | warn "loading extensions"; |
3235 | cf::load_extensions; |
3250 | cf::load_extensions; |
3236 | |
3251 | |
3237 | warn "reattaching attachments to objects/players"; |
3252 | warn "reattaching attachments to objects/players"; |