[ViewVC] Diff of: cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.517 by root, Thu Apr 15 06:07:51 2010 UTC vs.
Revision 1.518 by root, Fri Apr 16 02:21:26 2010 UTC

    $MAP_PREFETCHER->prio (6);
    ()
 }
+# common code, used by both ->save and ->swapout
-sub save {
+sub _save {
    my ($self) = @_;
-   my $lock = cf::lock_acquire "map_data:$self->{path}";
    $self->{last_save} = $cf::RUNTIME;
    return unless $self->dirty;
    } else {
       $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
    }
 }
+sub save {
+   my ($self) = @_;
+   my $lock = cf::lock_acquire "map_data:$self->{path}";
+   $self->_save;
+}
 sub swap_out {
    my ($self) = @_;
-   # save first because save cedes
-   $self->save;
    my $lock = cf::lock_acquire "map_data:$self->{path}";
-   return if $self->players;
    return if $self->in_memory != cf::MAP_ACTIVE;
    return if $self->{deny_save};
+   return if $self->players;
-   $self->in_memory (cf::MAP_SWAPPED);
+   # first deactivate the map and "unlink" it from the core
    $self->deactivate;
    $_->clear_links_to ($self) for values %cf::MAP;
+   $self->in_memory (cf::MAP_SWAPPED);
+   # then atomically save
+   $self->_save;
+   # then free the map
    $self->clear;
 }
 sub reset_at {
    my ($self) = @_;

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