… | |
… | |
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; |
… | |
… | |
1944 | } |
1947 | } |
1945 | |
1948 | |
1946 | sub do_load_sync { |
1949 | sub do_load_sync { |
1947 | my ($map) = @_; |
1950 | my ($map) = @_; |
1948 | |
1951 | |
|
|
1952 | cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" |
|
|
1953 | if $Coro::current != $Coro::main; |
|
|
1954 | |
1949 | cf::sync_job { $map->load }; |
1955 | cf::sync_job { $map->load }; |
1950 | } |
1956 | } |
1951 | |
1957 | |
1952 | our %MAP_PREFETCH; |
1958 | our %MAP_PREFETCH; |
1953 | our $MAP_PREFETCHER = undef; |
1959 | our $MAP_PREFETCHER = undef; |
1954 | |
1960 | |
1955 | sub find_async { |
1961 | sub find_async { |
1956 | my ($path, $origin) = @_; |
1962 | my ($path, $origin, $load) = @_; |
1957 | |
1963 | |
1958 | $path = normalise $path, $origin && $origin->{path}; |
1964 | $path = normalise $path, $origin && $origin->{path}; |
1959 | |
1965 | |
1960 | if (my $map = $cf::MAP{$path}) { |
1966 | if (my $map = $cf::MAP{$path}) { |
1961 | return $map if $map->in_memory == cf::MAP_IN_MEMORY; |
1967 | return $map if $map->in_memory == cf::MAP_IN_MEMORY; |
1962 | } |
1968 | } |
1963 | |
1969 | |
1964 | undef $MAP_PREFETCH{$path}; |
1970 | $MAP_PREFETCH{$path} |= $load; |
|
|
1971 | |
1965 | $MAP_PREFETCHER ||= cf::async { |
1972 | $MAP_PREFETCHER ||= cf::async { |
1966 | while (%MAP_PREFETCH) { |
1973 | while (%MAP_PREFETCH) { |
1967 | for my $path (keys %MAP_PREFETCH) { |
1974 | while (my ($k, $v) = each %MAP_PREFETCH) { |
1968 | if (my $map = find $path) { |
1975 | if (my $map = find $k) { |
1969 | $map->load; |
1976 | $map->load if $v; |
1970 | } |
1977 | } |
1971 | |
1978 | |
1972 | delete $MAP_PREFETCH{$path}; |
1979 | delete $MAP_PREFETCH{$k}; |
1973 | } |
1980 | } |
1974 | } |
1981 | } |
1975 | undef $MAP_PREFETCHER; |
1982 | undef $MAP_PREFETCHER; |
1976 | }; |
1983 | }; |
1977 | $MAP_PREFETCHER->prio (6); |
1984 | $MAP_PREFETCHER->prio (6); |
… | |
… | |
2646 | my ($type, $reply, @payload) = |
2653 | my ($type, $reply, @payload) = |
2647 | "ARRAY" eq ref $msg |
2654 | "ARRAY" eq ref $msg |
2648 | ? @$msg |
2655 | ? @$msg |
2649 | : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove |
2656 | : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove |
2650 | |
2657 | |
|
|
2658 | my @reply; |
|
|
2659 | |
2651 | if (my $cb = $EXTICMD{$type}) { |
2660 | if (my $cb = $EXTICMD{$type}) { |
2652 | my @reply = $cb->($ns, @payload); |
2661 | @reply = $cb->($ns, @payload); |
2653 | |
|
|
2654 | $ns->ext_reply ($reply, @reply) |
|
|
2655 | if $reply; |
|
|
2656 | } |
2662 | } |
|
|
2663 | |
|
|
2664 | $ns->ext_reply ($reply, @reply) |
|
|
2665 | if $reply; |
|
|
2666 | |
2657 | } else { |
2667 | } else { |
2658 | warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; |
2668 | warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; |
2659 | } |
2669 | } |
2660 | |
2670 | |
2661 | cf::override; |
2671 | cf::override; |