… | |
… | |
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 (); |
… | |
… | |
1948 | |
1948 | |
1949 | sub do_load_sync { |
1949 | sub do_load_sync { |
1950 | my ($map) = @_; |
1950 | my ($map) = @_; |
1951 | |
1951 | |
1952 | cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" |
1952 | cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" |
1953 | if $Coro::current != $Coro::main; |
1953 | if $Coro::current == $Coro::main; |
1954 | |
1954 | |
1955 | cf::sync_job { $map->load }; |
1955 | cf::sync_job { $map->load }; |
1956 | } |
1956 | } |
1957 | |
1957 | |
1958 | our %MAP_PREFETCH; |
1958 | our %MAP_PREFETCH; |
… | |
… | |
1962 | my ($path, $origin, $load) = @_; |
1962 | my ($path, $origin, $load) = @_; |
1963 | |
1963 | |
1964 | $path = normalise $path, $origin && $origin->{path}; |
1964 | $path = normalise $path, $origin && $origin->{path}; |
1965 | |
1965 | |
1966 | if (my $map = $cf::MAP{$path}) { |
1966 | if (my $map = $cf::MAP{$path}) { |
1967 | return $map if $map->in_memory == cf::MAP_IN_MEMORY; |
1967 | return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; |
1968 | } |
1968 | } |
1969 | |
1969 | |
1970 | $MAP_PREFETCH{$path} |= $load; |
1970 | $MAP_PREFETCH{$path} |= $load; |
1971 | |
1971 | |
1972 | $MAP_PREFETCHER ||= cf::async { |
1972 | $MAP_PREFETCHER ||= cf::async { |
… | |
… | |
2558 | =cut |
2558 | =cut |
2559 | |
2559 | |
2560 | sub cf::client::ext_msg($$@) { |
2560 | sub cf::client::ext_msg($$@) { |
2561 | my ($self, $type, @msg) = @_; |
2561 | my ($self, $type, @msg) = @_; |
2562 | |
2562 | |
2563 | my $extcmd = $self->extcmd; |
|
|
2564 | |
|
|
2565 | if ($extcmd == 2) { |
2563 | if ($self->extcmd == 2) { |
2566 | $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); |
2564 | $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); |
2567 | } elsif ($extcmd == 1) { # TODO: remove |
2565 | } elsif ($self->extcmd == 1) { # TODO: remove |
2568 | push @msg, msgtype => "event_$type"; |
2566 | push @msg, msgtype => "event_$type"; |
2569 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
2567 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
2570 | } |
2568 | } |
2571 | } |
2569 | } |
2572 | |
2570 | |
… | |
… | |
2579 | sub cf::client::ext_reply($$@) { |
2577 | sub cf::client::ext_reply($$@) { |
2580 | my ($self, $id, @msg) = @_; |
2578 | my ($self, $id, @msg) = @_; |
2581 | |
2579 | |
2582 | if ($self->extcmd == 2) { |
2580 | if ($self->extcmd == 2) { |
2583 | $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); |
2581 | $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); |
2584 | } elsif ($self->ns->extcmd == 1) { |
2582 | } elsif ($self->extcmd == 1) { |
2585 | #TODO: version 1, remove |
2583 | #TODO: version 1, remove |
2586 | unshift @msg, msgtype => "reply", msgid => $id; |
2584 | unshift @msg, msgtype => "reply", msgid => $id; |
2587 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
2585 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
2588 | } |
2586 | } |
2589 | } |
2587 | } |
… | |
… | |
2732 | |
2730 | |
2733 | The following functions and methods are available within a safe environment: |
2731 | The following functions and methods are available within a safe environment: |
2734 | |
2732 | |
2735 | cf::object |
2733 | cf::object |
2736 | contr pay_amount pay_player map x y force_find force_add |
2734 | contr pay_amount pay_player map x y force_find force_add |
2737 | insert remove name archname title slaying race |
2735 | insert remove name archname title slaying race decrease_ob_nr |
2738 | |
2736 | |
2739 | cf::object::player |
2737 | cf::object::player |
2740 | player |
2738 | player |
2741 | |
2739 | |
2742 | cf::player |
2740 | cf::player |
… | |
… | |
2747 | |
2745 | |
2748 | =cut |
2746 | =cut |
2749 | |
2747 | |
2750 | for ( |
2748 | for ( |
2751 | ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y |
2749 | ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y |
2752 | insert remove inv name archname title slaying race)], |
2750 | insert remove inv name archname title slaying race |
|
|
2751 | decrease_ob_nr)], |
2753 | ["cf::object::player" => qw(player)], |
2752 | ["cf::object::player" => qw(player)], |
2754 | ["cf::player" => qw(peaceful)], |
2753 | ["cf::player" => qw(peaceful)], |
2755 | ["cf::map" => qw(trigger)], |
2754 | ["cf::map" => qw(trigger)], |
2756 | ) { |
2755 | ) { |
2757 | no strict 'refs'; |
2756 | no strict 'refs'; |
… | |
… | |
2833 | # the server's init and main functions |
2832 | # the server's init and main functions |
2834 | |
2833 | |
2835 | sub load_facedata($) { |
2834 | sub load_facedata($) { |
2836 | my ($path) = @_; |
2835 | my ($path) = @_; |
2837 | |
2836 | |
2838 | my $enc = JSON::XS->new->utf8->canonical; |
2837 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
2839 | |
2838 | |
2840 | warn "loading facedata from $path\n"; |
2839 | warn "loading facedata from $path\n"; |
2841 | |
2840 | |
2842 | my $facedata; |
2841 | my $facedata; |
2843 | 0 < aio_load $path, $facedata |
2842 | 0 < aio_load $path, $facedata |