… | |
… | |
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 (); |
… | |
… | |
575 | if (1) { |
575 | if (1) { |
576 | $md5 = |
576 | $md5 = |
577 | join "\x00", |
577 | join "\x00", |
578 | $processversion, |
578 | $processversion, |
579 | map { |
579 | map { |
580 | Coro::cede; |
580 | cf::cede_to_tick; |
581 | ($src->[$_], Digest::MD5::md5_hex $data[$_]) |
581 | ($src->[$_], Digest::MD5::md5_hex $data[$_]) |
582 | } 0.. $#$src; |
582 | } 0.. $#$src; |
583 | |
583 | |
584 | |
584 | |
585 | my $dbmd5 = db_get cache => "$id/md5"; |
585 | my $dbmd5 = db_get cache => "$id/md5"; |
… | |
… | |
1149 | my ($type, $reply, @payload) = |
1149 | my ($type, $reply, @payload) = |
1150 | "ARRAY" eq ref $msg |
1150 | "ARRAY" eq ref $msg |
1151 | ? @$msg |
1151 | ? @$msg |
1152 | : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove |
1152 | : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove |
1153 | |
1153 | |
|
|
1154 | my @reply; |
|
|
1155 | |
1154 | if (my $cb = $EXTCMD{$type}) { |
1156 | if (my $cb = $EXTCMD{$type}) { |
1155 | my @reply = $cb->($pl, @payload); |
1157 | @reply = $cb->($pl, @payload); |
1156 | |
|
|
1157 | $pl->ext_reply ($reply, @reply) |
|
|
1158 | if $reply; |
|
|
1159 | } |
1158 | } |
|
|
1159 | |
|
|
1160 | $pl->ext_reply ($reply, @reply) |
|
|
1161 | if $reply; |
|
|
1162 | |
1160 | } else { |
1163 | } else { |
1161 | warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; |
1164 | warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; |
1162 | } |
1165 | } |
1163 | |
1166 | |
1164 | cf::override; |
1167 | cf::override; |
… | |
… | |
1319 | |
1322 | |
1320 | aio_mkdir playerdir $pl, 0770; |
1323 | aio_mkdir playerdir $pl, 0770; |
1321 | $pl->{last_save} = $cf::RUNTIME; |
1324 | $pl->{last_save} = $cf::RUNTIME; |
1322 | |
1325 | |
1323 | $pl->save_pl ($path); |
1326 | $pl->save_pl ($path); |
1324 | Coro::cede; |
1327 | cf::cede_to_tick; |
1325 | } |
1328 | } |
1326 | |
1329 | |
1327 | sub new($) { |
1330 | sub new($) { |
1328 | my ($login) = @_; |
1331 | my ($login) = @_; |
1329 | |
1332 | |
… | |
… | |
1505 | =cut |
1508 | =cut |
1506 | |
1509 | |
1507 | sub ext_reply($$@) { |
1510 | sub ext_reply($$@) { |
1508 | my ($self, $id, @msg) = @_; |
1511 | my ($self, $id, @msg) = @_; |
1509 | |
1512 | |
1510 | if ($self->ns->extcmd == 2) { |
1513 | $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 | } |
1514 | } |
1518 | |
1515 | |
1519 | =item $player->ext_msg ($type, @msg) |
1516 | =item $player->ext_msg ($type, @msg) |
1520 | |
1517 | |
1521 | Sends an ext event to the client. |
1518 | Sends an ext event to the client. |
… | |
… | |
1852 | local $self->{deny_reset} = 1; # loading can take a long time |
1849 | local $self->{deny_reset} = 1; # loading can take a long time |
1853 | |
1850 | |
1854 | my $path = $self->{path}; |
1851 | my $path = $self->{path}; |
1855 | |
1852 | |
1856 | { |
1853 | { |
|
|
1854 | my $guard1 = cf::lock_acquire "map_data:$path"; |
1857 | my $guard = cf::lock_acquire "map_load:$path"; |
1855 | my $guard2 = cf::lock_acquire "map_load:$path"; |
1858 | |
1856 | |
1859 | return if $self->in_memory != cf::MAP_SWAPPED; |
1857 | return if $self->in_memory != cf::MAP_SWAPPED; |
1860 | |
1858 | |
1861 | $self->in_memory (cf::MAP_LOADING); |
1859 | $self->in_memory (cf::MAP_LOADING); |
1862 | |
1860 | |
1863 | $self->alloc; |
1861 | $self->alloc; |
1864 | |
1862 | |
1865 | $self->pre_load; |
1863 | $self->pre_load; |
1866 | Coro::cede; |
1864 | cf::cede_to_tick; |
1867 | |
1865 | |
1868 | $self->_load_objects ($self->{load_path}, 1) |
1866 | $self->_load_objects ($self->{load_path}, 1) |
1869 | or return; |
1867 | or return; |
1870 | |
1868 | |
1871 | $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) |
1869 | $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) |
… | |
… | |
1877 | $self->clear_unique_items; |
1875 | $self->clear_unique_items; |
1878 | $self->_load_objects ($uniq, 0); |
1876 | $self->_load_objects ($uniq, 0); |
1879 | } |
1877 | } |
1880 | } |
1878 | } |
1881 | |
1879 | |
1882 | Coro::cede; |
1880 | cf::cede_to_tick; |
1883 | # now do the right thing for maps |
1881 | # now do the right thing for maps |
1884 | $self->link_multipart_objects; |
1882 | $self->link_multipart_objects; |
1885 | $self->difficulty ($self->estimate_difficulty) |
1883 | $self->difficulty ($self->estimate_difficulty) |
1886 | unless $self->difficulty; |
1884 | unless $self->difficulty; |
1887 | Coro::cede; |
1885 | cf::cede_to_tick; |
1888 | |
1886 | |
1889 | unless ($self->{deny_activate}) { |
1887 | unless ($self->{deny_activate}) { |
1890 | $self->decay_objects; |
1888 | $self->decay_objects; |
1891 | $self->fix_auto_apply; |
1889 | $self->fix_auto_apply; |
1892 | $self->update_buttons; |
1890 | $self->update_buttons; |
1893 | Coro::cede; |
1891 | cf::cede_to_tick; |
1894 | $self->set_darkness_map; |
1892 | $self->set_darkness_map; |
1895 | Coro::cede; |
1893 | cf::cede_to_tick; |
1896 | $self->activate; |
1894 | $self->activate; |
1897 | } |
1895 | } |
1898 | |
1896 | |
1899 | $self->{last_save} = $cf::RUNTIME; |
1897 | $self->{last_save} = $cf::RUNTIME; |
1900 | $self->last_access ($cf::RUNTIME); |
1898 | $self->last_access ($cf::RUNTIME); |
… | |
… | |
1950 | } |
1948 | } |
1951 | |
1949 | |
1952 | sub do_load_sync { |
1950 | sub do_load_sync { |
1953 | my ($map) = @_; |
1951 | my ($map) = @_; |
1954 | |
1952 | |
|
|
1953 | cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" |
|
|
1954 | if $Coro::current == $Coro::main; |
|
|
1955 | |
1955 | cf::sync_job { $map->load }; |
1956 | cf::sync_job { $map->load }; |
1956 | } |
1957 | } |
1957 | |
1958 | |
1958 | our %MAP_PREFETCH; |
1959 | our %MAP_PREFETCH; |
1959 | our $MAP_PREFETCHER = undef; |
1960 | our $MAP_PREFETCHER = undef; |
1960 | |
1961 | |
1961 | sub find_async { |
1962 | sub find_async { |
1962 | my ($path, $origin) = @_; |
1963 | my ($path, $origin, $load) = @_; |
1963 | |
1964 | |
1964 | $path = normalise $path, $origin && $origin->{path}; |
1965 | $path = normalise $path, $origin && $origin->{path}; |
1965 | |
1966 | |
1966 | if (my $map = $cf::MAP{$path}) { |
1967 | if (my $map = $cf::MAP{$path}) { |
1967 | return $map if $map->in_memory == cf::MAP_IN_MEMORY; |
1968 | return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; |
1968 | } |
1969 | } |
1969 | |
1970 | |
1970 | undef $MAP_PREFETCH{$path}; |
1971 | $MAP_PREFETCH{$path} |= $load; |
|
|
1972 | |
1971 | $MAP_PREFETCHER ||= cf::async { |
1973 | $MAP_PREFETCHER ||= cf::async { |
1972 | while (%MAP_PREFETCH) { |
1974 | while (%MAP_PREFETCH) { |
1973 | for my $path (keys %MAP_PREFETCH) { |
1975 | while (my ($k, $v) = each %MAP_PREFETCH) { |
1974 | if (my $map = find $path) { |
1976 | if (my $map = find $k) { |
1975 | $map->load; |
1977 | $map->load if $v; |
1976 | } |
1978 | } |
1977 | |
1979 | |
1978 | delete $MAP_PREFETCH{$path}; |
1980 | delete $MAP_PREFETCH{$k}; |
1979 | } |
1981 | } |
1980 | } |
1982 | } |
1981 | undef $MAP_PREFETCHER; |
1983 | undef $MAP_PREFETCHER; |
1982 | }; |
1984 | }; |
1983 | $MAP_PREFETCHER->prio (6); |
1985 | $MAP_PREFETCHER->prio (6); |
… | |
… | |
1986 | } |
1988 | } |
1987 | |
1989 | |
1988 | sub save { |
1990 | sub save { |
1989 | my ($self) = @_; |
1991 | my ($self) = @_; |
1990 | |
1992 | |
1991 | my $lock = cf::lock_acquire "map_data:" . $self->path; |
1993 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
1992 | |
1994 | |
1993 | $self->{last_save} = $cf::RUNTIME; |
1995 | $self->{last_save} = $cf::RUNTIME; |
1994 | |
1996 | |
1995 | return unless $self->dirty; |
1997 | return unless $self->dirty; |
1996 | |
1998 | |
… | |
… | |
2019 | my ($self) = @_; |
2021 | my ($self) = @_; |
2020 | |
2022 | |
2021 | # save first because save cedes |
2023 | # save first because save cedes |
2022 | $self->save; |
2024 | $self->save; |
2023 | |
2025 | |
2024 | my $lock = cf::lock_acquire "map_data:" . $self->path; |
2026 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
2025 | |
2027 | |
2026 | return if $self->players; |
2028 | return if $self->players; |
2027 | return if $self->in_memory != cf::MAP_IN_MEMORY; |
2029 | return if $self->in_memory != cf::MAP_IN_MEMORY; |
2028 | return if $self->{deny_save}; |
2030 | return if $self->{deny_save}; |
2029 | |
2031 | |
… | |
… | |
2557 | =cut |
2559 | =cut |
2558 | |
2560 | |
2559 | sub cf::client::ext_msg($$@) { |
2561 | sub cf::client::ext_msg($$@) { |
2560 | my ($self, $type, @msg) = @_; |
2562 | my ($self, $type, @msg) = @_; |
2561 | |
2563 | |
2562 | my $extcmd = $self->extcmd; |
|
|
2563 | |
|
|
2564 | if ($extcmd == 2) { |
2564 | if ($self->extcmd == 2) { |
2565 | $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); |
2565 | $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); |
2566 | } elsif ($extcmd == 1) { # TODO: remove |
2566 | } elsif ($self->extcmd == 1) { # TODO: remove |
2567 | push @msg, msgtype => "event_$type"; |
2567 | push @msg, msgtype => "event_$type"; |
|
|
2568 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
|
|
2569 | } |
|
|
2570 | } |
|
|
2571 | |
|
|
2572 | =item $client->ext_reply ($msgid, @msg) |
|
|
2573 | |
|
|
2574 | Sends an ext reply to the client. |
|
|
2575 | |
|
|
2576 | =cut |
|
|
2577 | |
|
|
2578 | sub cf::client::ext_reply($$@) { |
|
|
2579 | my ($self, $id, @msg) = @_; |
|
|
2580 | |
|
|
2581 | if ($self->extcmd == 2) { |
|
|
2582 | $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); |
|
|
2583 | } elsif ($self->extcmd == 1) { |
|
|
2584 | #TODO: version 1, remove |
|
|
2585 | unshift @msg, msgtype => "reply", msgid => $id; |
2568 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
2586 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
2569 | } |
2587 | } |
2570 | } |
2588 | } |
2571 | |
2589 | |
2572 | =item $success = $client->query ($flags, "text", \&cb) |
2590 | =item $success = $client->query ($flags, "text", \&cb) |
… | |
… | |
2634 | my ($type, $reply, @payload) = |
2652 | my ($type, $reply, @payload) = |
2635 | "ARRAY" eq ref $msg |
2653 | "ARRAY" eq ref $msg |
2636 | ? @$msg |
2654 | ? @$msg |
2637 | : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove |
2655 | : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove |
2638 | |
2656 | |
|
|
2657 | my @reply; |
|
|
2658 | |
2639 | if (my $cb = $EXTICMD{$type}) { |
2659 | if (my $cb = $EXTICMD{$type}) { |
2640 | my @reply = $cb->($ns, @payload); |
2660 | @reply = $cb->($ns, @payload); |
2641 | |
|
|
2642 | $ns->ext_reply ($reply, @reply) |
|
|
2643 | if $reply; |
|
|
2644 | } |
2661 | } |
|
|
2662 | |
|
|
2663 | $ns->ext_reply ($reply, @reply) |
|
|
2664 | if $reply; |
|
|
2665 | |
2645 | } else { |
2666 | } else { |
2646 | warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; |
2667 | warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; |
2647 | } |
2668 | } |
2648 | |
2669 | |
2649 | cf::override; |
2670 | cf::override; |
… | |
… | |
2710 | |
2731 | |
2711 | The following functions and methods are available within a safe environment: |
2732 | The following functions and methods are available within a safe environment: |
2712 | |
2733 | |
2713 | cf::object |
2734 | cf::object |
2714 | contr pay_amount pay_player map x y force_find force_add |
2735 | contr pay_amount pay_player map x y force_find force_add |
2715 | insert remove name archname title slaying race |
2736 | insert remove name archname title slaying race decrease_ob_nr |
2716 | |
2737 | |
2717 | cf::object::player |
2738 | cf::object::player |
2718 | player |
2739 | player |
2719 | |
2740 | |
2720 | cf::player |
2741 | cf::player |
… | |
… | |
2725 | |
2746 | |
2726 | =cut |
2747 | =cut |
2727 | |
2748 | |
2728 | for ( |
2749 | for ( |
2729 | ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y |
2750 | ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y |
2730 | insert remove inv name archname title slaying race)], |
2751 | insert remove inv name archname title slaying race |
|
|
2752 | decrease_ob_nr)], |
2731 | ["cf::object::player" => qw(player)], |
2753 | ["cf::object::player" => qw(player)], |
2732 | ["cf::player" => qw(peaceful)], |
2754 | ["cf::player" => qw(peaceful)], |
2733 | ["cf::map" => qw(trigger)], |
2755 | ["cf::map" => qw(trigger)], |
2734 | ) { |
2756 | ) { |
2735 | no strict 'refs'; |
2757 | no strict 'refs'; |
… | |
… | |
2811 | # the server's init and main functions |
2833 | # the server's init and main functions |
2812 | |
2834 | |
2813 | sub load_facedata($) { |
2835 | sub load_facedata($) { |
2814 | my ($path) = @_; |
2836 | my ($path) = @_; |
2815 | |
2837 | |
2816 | my $enc = JSON::XS->new->utf8->canonical; |
2838 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
2817 | |
2839 | |
2818 | warn "loading facedata from $path\n"; |
2840 | warn "loading facedata from $path\n"; |
2819 | |
2841 | |
2820 | my $facedata; |
2842 | my $facedata; |
2821 | 0 < aio_load $path, $facedata |
2843 | 0 < aio_load $path, $facedata |
… | |
… | |
2825 | |
2847 | |
2826 | $facedata->{version} == 2 |
2848 | $facedata->{version} == 2 |
2827 | or cf::cleanup "$path: version mismatch, cannot proceed."; |
2849 | or cf::cleanup "$path: version mismatch, cannot proceed."; |
2828 | |
2850 | |
2829 | # patch in the exptable |
2851 | # patch in the exptable |
2830 | cf::cede_to_tick; |
|
|
2831 | $facedata->{resource}{"res/exp_table"} = { |
2852 | $facedata->{resource}{"res/exp_table"} = { |
2832 | type => FT_RSRC, |
2853 | type => FT_RSRC, |
2833 | data => $enc->encode ([map cf::level_to_min_exp $_, 0 .. cf::settings->max_level]), |
2854 | data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), |
2834 | }; |
2855 | }; |
2835 | cf::cede_to_tick; |
2856 | cf::cede_to_tick; |
2836 | |
2857 | |
2837 | { |
2858 | { |
2838 | my $faces = $facedata->{faceinfo}; |
2859 | my $faces = $facedata->{faceinfo}; |
… | |
… | |
2891 | name => $name, |
2912 | name => $name, |
2892 | %{ $info->{meta} || {} }, |
2913 | %{ $info->{meta} || {} }, |
2893 | }); |
2914 | }); |
2894 | |
2915 | |
2895 | $data = pack "(w/a*)*", $meta, $info->{data}; |
2916 | $data = pack "(w/a*)*", $meta, $info->{data}; |
|
|
2917 | } else { |
|
|
2918 | $data = $info->{data}; |
2896 | } |
2919 | } |
2897 | |
2920 | |
2898 | cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data; |
2921 | cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data; |
2899 | cf::face::set_type $idx, $info->{type}; |
2922 | cf::face::set_type $idx, $info->{type}; |
2900 | |
2923 | |
… | |
… | |
2975 | |
2998 | |
2976 | sub init { |
2999 | sub init { |
2977 | reload_resources; |
3000 | reload_resources; |
2978 | } |
3001 | } |
2979 | |
3002 | |
2980 | sub cfg_load { |
3003 | sub reload_config { |
2981 | open my $fh, "<:utf8", "$CONFDIR/config" |
3004 | open my $fh, "<:utf8", "$CONFDIR/config" |
2982 | or return; |
3005 | or return; |
2983 | |
3006 | |
2984 | local $/; |
3007 | local $/; |
2985 | *CFG = YAML::Syck::Load <$fh>; |
3008 | *CFG = YAML::Syck::Load <$fh>; |
… | |
… | |
3005 | (async { |
3028 | (async { |
3006 | Event::one_event; |
3029 | Event::one_event; |
3007 | })->prio (Coro::PRIO_MAX); |
3030 | })->prio (Coro::PRIO_MAX); |
3008 | }; |
3031 | }; |
3009 | |
3032 | |
3010 | cfg_load; |
3033 | reload_config; |
3011 | db_init; |
3034 | db_init; |
3012 | load_extensions; |
3035 | load_extensions; |
3013 | |
3036 | |
3014 | $TICK_WATCHER->start; |
3037 | $TICK_WATCHER->start; |
3015 | Event::loop; |
3038 | Event::loop; |
… | |
… | |
3208 | warn "reloading cf.pm"; |
3231 | warn "reloading cf.pm"; |
3209 | require cf; |
3232 | require cf; |
3210 | cf::_connect_to_perl; # nominally unnecessary, but cannot hurt |
3233 | cf::_connect_to_perl; # nominally unnecessary, but cannot hurt |
3211 | |
3234 | |
3212 | warn "loading config and database again"; |
3235 | warn "loading config and database again"; |
3213 | cf::cfg_load; |
3236 | cf::reload_config; |
3214 | |
3237 | |
3215 | warn "loading extensions"; |
3238 | warn "loading extensions"; |
3216 | cf::load_extensions; |
3239 | cf::load_extensions; |
3217 | |
3240 | |
3218 | warn "reattaching attachments to objects/players"; |
3241 | warn "reattaching attachments to objects/players"; |