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.356 by root, Tue Sep 4 05:43:21 2007 UTC vs.
Revision 1.357 by root, Tue Sep 4 08:42:58 2007 UTC

1876 local $self->{deny_reset} = 1; # loading can take a long time 1876 local $self->{deny_reset} = 1; # loading can take a long time
1877 1877
1878 my $path = $self->{path}; 1878 my $path = $self->{path};
1879 1879
1880 { 1880 {
1881 my $guard1 = cf::lock_acquire "map_data:$path"; 1881 my $guard = cf::lock_acquire "map_data:$path";
1882 my $guard2 = cf::lock_acquire "map_load:$path";
1883 1882
1883 return unless $self->valid;
1884 return if $self->in_memory != cf::MAP_SWAPPED; 1884 return if $self->in_memory != cf::MAP_SWAPPED;
1885 1885
1886 $self->in_memory (cf::MAP_LOADING); 1886 $self->in_memory (cf::MAP_LOADING);
1887 1887
1888 $self->alloc; 1888 $self->alloc;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines