ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.338 by root, Tue Aug 21 01:07:47 2007 UTC vs.
Revision 1.343 by root, Mon Aug 27 01:13:48 2007 UTC

… …
1947} 1947}
1948 1948
1949sub do_load_sync { 1949sub do_load_sync {
1950 my ($map) = @_; 1950 my ($map) = @_;
1951 1951
1952 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1953 if $Coro::current == $Coro::main;
1954
1952 cf::sync_job { $map->load }; 1955 cf::sync_job { $map->load };
1953} 1956}
1954 1957
1955our %MAP_PREFETCH; 1958our %MAP_PREFETCH;
1956our $MAP_PREFETCHER = undef; 1959our $MAP_PREFETCHER = undef;
1957 1960
1958sub find_async { 1961sub find_async {
1959 my ($path, $origin) = @_; 1962 my ($path, $origin, $load) = @_;
1960 1963
1961 $path = normalise $path, $origin && $origin->{path}; 1964 $path = normalise $path, $origin && $origin->{path};
1962 1965
1963 if (my $map = $cf::MAP{$path}) { 1966 if (my $map = $cf::MAP{$path}) {
1964 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1967 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1965 } 1968 }
1966 1969
1967 undef $MAP_PREFETCH{$path}; 1970 $MAP_PREFETCH{$path} |= $load;
1971
1968 $MAP_PREFETCHER ||= cf::async { 1972 $MAP_PREFETCHER ||= cf::async {
1969 while (%MAP_PREFETCH) { 1973 while (%MAP_PREFETCH) {
1970 for my $path (keys %MAP_PREFETCH) { 1974 while (my ($k, $v) = each %MAP_PREFETCH) {
1971 if (my $map = find $path) { 1975 if (my $map = find $k) {
1972 $map->load; 1976 $map->load if $v;
1973 } 1977 }
1974 1978
1975 delete $MAP_PREFETCH{$path}; 1979 delete $MAP_PREFETCH{$k};
1976 } 1980 }
1977 } 1981 }
1978 undef $MAP_PREFETCHER; 1982 undef $MAP_PREFETCHER;
1979 }; 1983 };
1980 $MAP_PREFETCHER->prio (6); 1984 $MAP_PREFETCHER->prio (6);
… …
2554=cut 2558=cut
2555 2559
2556sub cf::client::ext_msg($$@) { 2560sub cf::client::ext_msg($$@) {
2557 my ($self, $type, @msg) = @_; 2561 my ($self, $type, @msg) = @_;
2558 2562
2559 my $extcmd = $self->extcmd;
2560
2561 if ($extcmd == 2) { 2563 if ($self->extcmd == 2) {
2562 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2564 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2563 } elsif ($extcmd == 1) { # TODO: remove 2565 } elsif ($self->extcmd == 1) { # TODO: remove
2564 push @msg, msgtype => "event_$type"; 2566 push @msg, msgtype => "event_$type";
2565 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2567 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2566 } 2568 }
2567} 2569}
2568 2570
… …
2575sub cf::client::ext_reply($$@) { 2577sub cf::client::ext_reply($$@) {
2576 my ($self, $id, @msg) = @_; 2578 my ($self, $id, @msg) = @_;
2577 2579
2578 if ($self->extcmd == 2) { 2580 if ($self->extcmd == 2) {
2579 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 2581 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2580 } elsif ($self->ns->extcmd == 1) { 2582 } elsif ($self->extcmd == 1) {
2581 #TODO: version 1, remove 2583 #TODO: version 1, remove
2582 unshift @msg, msgtype => "reply", msgid => $id; 2584 unshift @msg, msgtype => "reply", msgid => $id;
2583 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2585 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2584 } 2586 }
2585} 2587}
… …
2728 2730
2729The following functions and methods are available within a safe environment: 2731The following functions and methods are available within a safe environment:
2730 2732
2731 cf::object 2733 cf::object
2732 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
2733 insert remove name archname title slaying race 2735 insert remove name archname title slaying race decrease_ob_nr
2734 2736
2735 cf::object::player 2737 cf::object::player
2736 player 2738 player
2737 2739
2738 cf::player 2740 cf::player
… …
2743 2745
2744=cut 2746=cut
2745 2747
2746for ( 2748for (
2747 ["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
2748 insert remove inv name archname title slaying race)], 2750 insert remove inv name archname title slaying race
2751 decrease_ob_nr)],
2749 ["cf::object::player" => qw(player)], 2752 ["cf::object::player" => qw(player)],
2750 ["cf::player" => qw(peaceful)], 2753 ["cf::player" => qw(peaceful)],
2751 ["cf::map" => qw(trigger)], 2754 ["cf::map" => qw(trigger)],
2752) { 2755) {
2753 no strict 'refs'; 2756 no strict 'refs';

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines