--- deliantra/server/lib/cf.pm	2007/01/04 00:53:54	1.131
+++ deliantra/server/lib/cf.pm	2007/01/04 17:28:49	1.134
@@ -51,7 +51,6 @@
 
 our %MAP; # all maps
 our $LINK_MAP; # the special {link} map
-our $FREEZE;
 our $RANDOM_MAPS = cf::localdir . "/random";
 our %EXT_CORO;
 
@@ -215,8 +214,8 @@
 for example when the coroutine gets canceled), the lock is automatically
 returned.
 
-Lock names should begin with a unique identifier (for example, find_map
-uses map_find and load_map uses map_load).
+Lock names should begin with a unique identifier (for example, cf::map::find
+uses map_find and cf::map::load uses map_load).
 
 =cut
 
@@ -262,6 +261,14 @@
    }
 }
 
+sub freeze_mainloop {
+   return unless $TICK_WATCHER->is_active;
+
+   my $guard = guard { $TICK_WATCHER->start };
+   $TICK_WATCHER->stop;
+   $guard
+}
+
 =item cf::sync_job { BLOCK }
 
 The design of crossfire+ requires that the main coro ($Coro::main) is
@@ -284,7 +291,7 @@
       
       # TODO: use suspend/resume instead
       # (but this is cancel-safe)
-      local $FREEZE = 1;
+      my $freeze_guard = freeze_mainloop;
 
       my $busy = 1;
       my @res;
@@ -1138,8 +1145,8 @@
 use Fcntl;
 use Coro::AIO;
 
-our $MAX_RESET     = 7200;
-our $DEFAULT_RESET = 3600;
+our $MAX_RESET     = 3600;
+our $DEFAULT_RESET = 3000;
 
 sub generate_random_map {
    my ($path, $rmp) = @_;
@@ -1187,11 +1194,11 @@
    $map
 }
 
-sub find_map;
-sub find_map {
+sub find;
+sub find {
    my ($path, $origin) = @_;
 
-   #warn "find_map<$path,$origin>\n";#d#
+   #warn "find<$path,$origin>\n";#d#
 
    $path = new cf::path $path, $origin && $origin->path;
    my $key = $path->as_string;
@@ -1204,7 +1211,11 @@
       # do it the slow way
       my $map = try_load_header $path->save_path;
 
+      Coro::cede;
+
       if ($map) {
+         $map->last_access ((delete $map->{last_access})
+                            || $cf::RUNTIME); #d#
          # safety
          $map->{instantiate_time} = $cf::RUNTIME
             if $map->{instantiate_time} > $cf::RUNTIME;
@@ -1219,6 +1230,7 @@
 
          $map->{load_original} = 1;
          $map->{instantiate_time} = $cf::RUNTIME;
+         $map->last_access ($cf::RUNTIME);
          $map->instantiate;
 
          # per-player maps become, after loading, normal maps
@@ -1228,12 +1240,13 @@
       $map->path ($key);
       $map->{path} = $path;
       $map->{last_save} = $cf::RUNTIME;
-      $map->last_access ($cf::RUNTIME);
+
+      Coro::cede;
 
       if ($map->should_reset) {
          $map->reset;
          undef $guard;
-         $map = find_map $path
+         $map = find $path
             or return;
       }
 
@@ -1266,6 +1279,8 @@
       }
    }
 
+   Coro::cede;
+
    # now do the right thing for maps
    $self->link_multipart_objects;
 
@@ -1282,20 +1297,21 @@
       $self->activate;
    }
 
+   Coro::cede;
+
    $self->in_memory (cf::MAP_IN_MEMORY);
 }
 
-sub load_map_sync {
+sub find_sync {
    my ($path, $origin) = @_;
 
-   #warn "load_map_sync<$path, $origin>\n";#d#
+   cf::sync_job { cf::map::find $path, $origin }
+}
+
+sub do_load_sync {
+   my ($map) = @_;
 
-   cf::sync_job {
-      my $map = cf::map::find_map $path, $origin
-         or return;
-      $map->load;
-      $map
-   }
+   cf::sync_job { $map->load };
 }
 
 sub save {
@@ -1312,6 +1328,8 @@
 
    return if $self->{deny_save};
 
+   local $self->{last_access} = $self->last_access;#d#
+
    if ($uniq) {
       $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
       $self->save_objects ($uniq, cf::IO_UNIQUES);
@@ -1405,14 +1423,14 @@
    my ($map, $ob) = @_;
 
    if ($map->per_player) {
-      return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path};
+      return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
    }
 
    $map
 }
 
 sub emergency_save {
-   local $cf::FREEZE = 1;
+   my $freeze_guard = cf::freeze_mainloop;
 
    warn "enter emergency map save\n";
 
@@ -1512,11 +1530,11 @@
    unless ($map) {
       # restore original map position
       ($map, $x, $y) = @{ $link_pos || [] };
-      $map = cf::map::find_map $map;
+      $map = cf::map::find $map;
 
       unless ($map) {
          ($map, $x, $y) = @$EMERGENCY_POSITION;
-         $map = cf::map::find_map $map
+         $map = cf::map::find $map
             or die "FATAL: cannot load emergency map\n";
       }
    }
@@ -1574,7 +1592,7 @@
    (cf::async {
       $path = new cf::path $path;
 
-      my $map = cf::map::find_map $path->as_string;
+      my $map = cf::map::find $path->as_string;
       $map = $map->customise_for ($self) if $map;
 
 #      warn "entering ", $map->path, " at ($x, $y)\n"
@@ -1644,6 +1662,7 @@
    $self->enter_link;
 
    (cf::async {
+      $self->deactivate_recursive; # just to be sure
       unless (eval {
          prepare_random_map $exit
             if $exit->slaying eq "/!";
@@ -2028,7 +2047,7 @@
 
    warn "reloading...";
 
-   local $FREEZE = 1;
+   my $guard = freeze_mainloop;
    cf::emergency_save;
 
    eval {
@@ -2174,11 +2193,8 @@
    at        => $NEXT_TICK || $TICK,
    data      => WF_AUTOCANCEL,
    cb        => sub {
-      unless ($FREEZE) {
-         cf::server_tick; # one server iteration
-         $RUNTIME += $TICK;
-      }
-
+      cf::server_tick; # one server iteration
+      $RUNTIME   += $TICK;
       $NEXT_TICK += $TICK;
 
       # if we are delayed by four ticks or more, skip them all