… | |
… | |
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"; |
… | |
… | |
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 | |
1327 | sub new($) { |
1333 | sub new($) { |
1328 | my ($login) = @_; |
1334 | my ($login) = @_; |
1329 | |
1335 | |
… | |
… | |
1505 | =cut |
1511 | =cut |
1506 | |
1512 | |
1507 | sub ext_reply($$@) { |
1513 | sub 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 | |
1521 | Sends an ext event to the client. |
1521 | Sends 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 | |
1952 | sub do_load_sync { |
1953 | sub 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 | |
1958 | our %MAP_PREFETCH; |
1962 | our %MAP_PREFETCH; |
1959 | our $MAP_PREFETCHER = undef; |
1963 | our $MAP_PREFETCHER = undef; |
1960 | |
1964 | |
1961 | sub find_async { |
1965 | sub 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 | |
1988 | sub save { |
1993 | sub 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 | |
… | |
… | |
2557 | =cut |
2562 | =cut |
2558 | |
2563 | |
2559 | sub cf::client::ext_msg($$@) { |
2564 | sub cf::client::ext_msg($$@) { |
2560 | my ($self, $type, @msg) = @_; |
2565 | my ($self, $type, @msg) = @_; |
2561 | |
2566 | |
2562 | my $extcmd = $self->extcmd; |
|
|
2563 | |
|
|
2564 | if ($extcmd == 2) { |
2567 | if ($self->extcmd == 2) { |
2565 | $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); |
2568 | $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); |
2566 | } elsif ($extcmd == 1) { # TODO: remove |
2569 | } elsif ($self->extcmd == 1) { # TODO: remove |
2567 | push @msg, msgtype => "event_$type"; |
2570 | push @msg, msgtype => "event_$type"; |
|
|
2571 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
|
|
2572 | } |
|
|
2573 | } |
|
|
2574 | |
|
|
2575 | =item $client->ext_reply ($msgid, @msg) |
|
|
2576 | |
|
|
2577 | Sends an ext reply to the client. |
|
|
2578 | |
|
|
2579 | =cut |
|
|
2580 | |
|
|
2581 | sub cf::client::ext_reply($$@) { |
|
|
2582 | my ($self, $id, @msg) = @_; |
|
|
2583 | |
|
|
2584 | if ($self->extcmd == 2) { |
|
|
2585 | $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); |
|
|
2586 | } elsif ($self->extcmd == 1) { |
|
|
2587 | #TODO: version 1, remove |
|
|
2588 | unshift @msg, msgtype => "reply", msgid => $id; |
2568 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
2589 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
2569 | } |
2590 | } |
2570 | } |
2591 | } |
2571 | |
2592 | |
2572 | =item $success = $client->query ($flags, "text", \&cb) |
2593 | =item $success = $client->query ($flags, "text", \&cb) |
… | |
… | |
2634 | my ($type, $reply, @payload) = |
2655 | my ($type, $reply, @payload) = |
2635 | "ARRAY" eq ref $msg |
2656 | "ARRAY" eq ref $msg |
2636 | ? @$msg |
2657 | ? @$msg |
2637 | : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove |
2658 | : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove |
2638 | |
2659 | |
|
|
2660 | my @reply; |
|
|
2661 | |
2639 | if (my $cb = $EXTICMD{$type}) { |
2662 | if (my $cb = $EXTICMD{$type}) { |
2640 | my @reply = $cb->($ns, @payload); |
2663 | @reply = $cb->($ns, @payload); |
2641 | |
|
|
2642 | $ns->ext_reply ($reply, @reply) |
|
|
2643 | if $reply; |
|
|
2644 | } |
2664 | } |
|
|
2665 | |
|
|
2666 | $ns->ext_reply ($reply, @reply) |
|
|
2667 | if $reply; |
|
|
2668 | |
2645 | } else { |
2669 | } else { |
2646 | warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; |
2670 | warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; |
2647 | } |
2671 | } |
2648 | |
2672 | |
2649 | cf::override; |
2673 | cf::override; |
… | |
… | |
2710 | |
2734 | |
2711 | The following functions and methods are available within a safe environment: |
2735 | The following functions and methods are available within a safe environment: |
2712 | |
2736 | |
2713 | cf::object |
2737 | cf::object |
2714 | 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 |
2715 | insert remove name archname title slaying race |
2739 | insert remove name archname title slaying race decrease_ob_nr |
2716 | |
2740 | |
2717 | cf::object::player |
2741 | cf::object::player |
2718 | player |
2742 | player |
2719 | |
2743 | |
2720 | cf::player |
2744 | cf::player |
… | |
… | |
2725 | |
2749 | |
2726 | =cut |
2750 | =cut |
2727 | |
2751 | |
2728 | for ( |
2752 | for ( |
2729 | ["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 |
2730 | insert remove inv name archname title slaying race)], |
2754 | insert remove inv name archname title slaying race |
|
|
2755 | decrease_ob_nr)], |
2731 | ["cf::object::player" => qw(player)], |
2756 | ["cf::object::player" => qw(player)], |
2732 | ["cf::player" => qw(peaceful)], |
2757 | ["cf::player" => qw(peaceful)], |
2733 | ["cf::map" => qw(trigger)], |
2758 | ["cf::map" => qw(trigger)], |
2734 | ) { |
2759 | ) { |
2735 | no strict 'refs'; |
2760 | no strict 'refs'; |
… | |
… | |
2811 | # the server's init and main functions |
2836 | # the server's init and main functions |
2812 | |
2837 | |
2813 | sub load_facedata($) { |
2838 | sub load_facedata($) { |
2814 | my ($path) = @_; |
2839 | my ($path) = @_; |
2815 | |
2840 | |
2816 | my $enc = JSON::XS->new->utf8->canonical; |
2841 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
2817 | |
2842 | |
2818 | warn "loading facedata from $path\n"; |
2843 | warn "loading facedata from $path\n"; |
2819 | |
2844 | |
2820 | my $facedata; |
2845 | my $facedata; |
2821 | 0 < aio_load $path, $facedata |
2846 | 0 < aio_load $path, $facedata |
… | |
… | |
2827 | or cf::cleanup "$path: version mismatch, cannot proceed."; |
2852 | or cf::cleanup "$path: version mismatch, cannot proceed."; |
2828 | |
2853 | |
2829 | # patch in the exptable |
2854 | # patch in the exptable |
2830 | $facedata->{resource}{"res/exp_table"} = { |
2855 | $facedata->{resource}{"res/exp_table"} = { |
2831 | type => FT_RSRC, |
2856 | type => FT_RSRC, |
2832 | data => $enc->encode ([map cf::level_to_min_exp $_, 0 .. cf::settings->max_level]), |
2857 | data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), |
2833 | }; |
2858 | }; |
2834 | cf::cede_to_tick; |
2859 | cf::cede_to_tick; |
2835 | |
2860 | |
2836 | { |
2861 | { |
2837 | my $faces = $facedata->{faceinfo}; |
2862 | my $faces = $facedata->{faceinfo}; |
… | |
… | |
2890 | name => $name, |
2915 | name => $name, |
2891 | %{ $info->{meta} || {} }, |
2916 | %{ $info->{meta} || {} }, |
2892 | }); |
2917 | }); |
2893 | |
2918 | |
2894 | $data = pack "(w/a*)*", $meta, $info->{data}; |
2919 | $data = pack "(w/a*)*", $meta, $info->{data}; |
|
|
2920 | } else { |
|
|
2921 | $data = $info->{data}; |
2895 | } |
2922 | } |
2896 | |
2923 | |
2897 | cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data; |
2924 | cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data; |
2898 | cf::face::set_type $idx, $info->{type}; |
2925 | cf::face::set_type $idx, $info->{type}; |
2899 | |
2926 | |
… | |
… | |
2974 | |
3001 | |
2975 | sub init { |
3002 | sub init { |
2976 | reload_resources; |
3003 | reload_resources; |
2977 | } |
3004 | } |
2978 | |
3005 | |
2979 | sub cfg_load { |
3006 | sub reload_config { |
2980 | open my $fh, "<:utf8", "$CONFDIR/config" |
3007 | open my $fh, "<:utf8", "$CONFDIR/config" |
2981 | or return; |
3008 | or return; |
2982 | |
3009 | |
2983 | local $/; |
3010 | local $/; |
2984 | *CFG = YAML::Syck::Load <$fh>; |
3011 | *CFG = YAML::Syck::Load <$fh>; |
… | |
… | |
3004 | (async { |
3031 | (async { |
3005 | Event::one_event; |
3032 | Event::one_event; |
3006 | })->prio (Coro::PRIO_MAX); |
3033 | })->prio (Coro::PRIO_MAX); |
3007 | }; |
3034 | }; |
3008 | |
3035 | |
3009 | cfg_load; |
3036 | reload_config; |
3010 | db_init; |
3037 | db_init; |
3011 | load_extensions; |
3038 | load_extensions; |
3012 | |
3039 | |
3013 | $TICK_WATCHER->start; |
3040 | $TICK_WATCHER->start; |
3014 | Event::loop; |
3041 | Event::loop; |
… | |
… | |
3207 | warn "reloading cf.pm"; |
3234 | warn "reloading cf.pm"; |
3208 | require cf; |
3235 | require cf; |
3209 | cf::_connect_to_perl; # nominally unnecessary, but cannot hurt |
3236 | cf::_connect_to_perl; # nominally unnecessary, but cannot hurt |
3210 | |
3237 | |
3211 | warn "loading config and database again"; |
3238 | warn "loading config and database again"; |
3212 | cf::cfg_load; |
3239 | cf::reload_config; |
3213 | |
3240 | |
3214 | warn "loading extensions"; |
3241 | warn "loading extensions"; |
3215 | cf::load_extensions; |
3242 | cf::load_extensions; |
3216 | |
3243 | |
3217 | warn "reattaching attachments to objects/players"; |
3244 | warn "reattaching attachments to objects/players"; |