--- deliantra/server/lib/cf.pm	2007/09/10 17:24:36	1.363
+++ deliantra/server/lib/cf.pm	2007/09/15 13:25:33	1.372
@@ -82,6 +82,7 @@
 our $USE_FSYNC = 1; # use fsync to write maps - default off
 
 our $BDB_POLL_WATCHER;
+our $BDB_DEADLOCK_WATCHER;
 our $BDB_CHECKPOINT_WATCHER;
 our $BDB_TRICKLE_WATCHER;
 our $DB_ENV;
@@ -1354,7 +1355,6 @@
          my $f = new_from_file cf::object::thawer path $login
             or return;
 
-         $f->next;
          my $pl = cf::player::load_pl $f
             or return;
          local $cf::PLAYER_LOADING{$login} = $pl;
@@ -2460,14 +2460,33 @@
    $self->enter_link;
 
    (async {
+      # *tag paths override both path and x|y
+      if ($path =~ /^\*(.*)$/) {
+         if (my @obs = grep $_->map, ext::map_tags::find $1) {
+            my $ob = $obs[rand @obs];
+
+            # see if we actually can go there
+            if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
+               $ob = $obs[rand @obs];
+            } else {
+               $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
+            }
+            # else put us there anyways for now #d#
+
+            ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
+         } else {
+            ($path, $x, $y) = (undef, undef, undef);
+         }
+      }
+
       my $map = eval {
-         my $map = cf::map::find $path;
+         my $map = defined $path ? cf::map::find $path : undef;
 
          if ($map) {
             $map = $map->customise_for ($self);
             $map = $check->($map) if $check && $map;
          } else {
-            $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
+            $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
          }
 
          $map
@@ -3447,8 +3466,6 @@
    $signal->wait;
 }
 
-      my $min = 1e6;#d#
-      my $avg = 10;
 $TICK_WATCHER = Event->timer (
    reentrant => 0,
    parked    => 1,
@@ -3466,29 +3483,6 @@
 
       cf::server_tick; # one server iteration
 
-      0 && sync_job {#d#
-         for(1..10)  {
-            my $t = Event::time;
-            my $map = my $map = new_from_path cf::map "/tmp/x.map"
-                     or die;
-
-            $map->width (50);
-            $map->height (50);
-            $map->alloc;
-            $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
-            my $t = Event::time - $t;
-
-            #next unless $t < 0.0013;#d#
-            if ($t < $min) {
-               $min = $t;
-            }
-            $avg = $avg * 0.99 + $t * 0.01;
-         }
-         warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
-         exit 0;
-         # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
-      };
-
       $RUNTIME   += $TICK;
       $NEXT_TICK += $TICK;
 
@@ -3500,9 +3494,6 @@
          };
       }
 
-#      my $AFTER = Event::time;
-#      warn $AFTER - $NOW;#d#
-
       if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
          $sig->send;
       }
@@ -3522,8 +3513,6 @@
       $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
 
       _post_tick;
-
-
    },
 );
 
@@ -3556,6 +3545,10 @@
 
    unless ($DB_ENV) {
       $DB_ENV = BDB::db_env_create;
+      $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
+                          | BDB::LOG_AUTOREMOVE, 1);
+      $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
+      $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
 
       cf::sync_job {
          eval {
@@ -3567,16 +3560,22 @@
                0666;
 
             cf::cleanup "db_env_open($BDBDIR): $!" if $!;
-
-            $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
-                                | BDB::LOG_AUTOREMOVE, 1);
-            $DB_ENV->set_lk_detect;
          };
 
          cf::cleanup "db_env_open(db): $@" if $@;
       };
    }
 
+   $BDB_DEADLOCK_WATCHER = Event->timer (
+      after     => 3,
+      interval  => 1,
+      hard      => 1,
+      prio      => 0,
+      data      => WF_AUTOCANCEL,
+      cb        => sub {
+         BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
+      },
+   );
    $BDB_CHECKPOINT_WATCHER = Event->timer (
       after     => 11,
       interval  => 60,