--- deliantra/server/lib/cf.pm	2007/09/09 12:52:48	1.361
+++ deliantra/server/lib/cf.pm	2007/09/12 11:18:25	1.368
@@ -82,6 +82,8 @@
 our $USE_FSYNC = 1; # use fsync to write maps - default off
 
 our $BDB_POLL_WATCHER;
+our $BDB_CHECKPOINT_WATCHER;
+our $BDB_TRICKLE_WATCHER;
 our $DB_ENV;
 
 our %CFG;
@@ -189,7 +191,6 @@
 
       $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
 
-      utf8::encode $msg;
       LOG llevError, $msg;
    };
 }
@@ -510,25 +511,36 @@
 Stores the given C<$value> in the family. It can currently store binary
 data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
 
+=item $db = cf::db_table "name"
+
+Create and/or open a new database table. The string must not be "db" and must be unique
+within each server.
+
 =cut
 
-our $DB;
+sub db_table($) {
+   my ($name) = @_;
+   my $db = BDB::db_create $DB_ENV;
 
-sub db_init {
-   unless ($DB) {
-      $DB = BDB::db_create $DB_ENV;
+   eval {
+      $db->set_flags (BDB::CHKSUM);
 
-      cf::sync_job {
-         eval {
-            $DB->set_flags (BDB::CHKSUM);
+      utf8::encode $name;
+      BDB::db_open $db, undef, $name, undef, BDB::BTREE,
+                   BDB::CREATE | BDB::AUTO_COMMIT, 0666;
+      cf::cleanup "db_open(db): $!" if $!;
+   };
+   cf::cleanup "db_open(db): $@" if $@;
 
-            BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
-                         BDB::CREATE | BDB::AUTO_COMMIT, 0666;
-            cf::cleanup "db_open(db): $!" if $!;
-         };
-         cf::cleanup "db_open(db): $@" if $@;
-      };
-   }
+   $db
+}
+
+our $DB;
+
+sub db_init {
+   cf::sync_job {
+      $DB ||= db_table "db";
+   };
 }
 
 sub db_get($$) {
@@ -1019,8 +1031,9 @@
 
    sync_job {
       if (length $$rdata) {
+         utf8::decode (my $decname = $filename);
          warn sprintf "saving %s (%d,%d)\n",
-            $filename, length $$rdata, scalar @$objs;
+            $decname, length $$rdata, scalar @$objs;
 
          if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
             chmod SAVE_MODE, $fh;
@@ -1080,8 +1093,9 @@
       $av = eval { (Storable::thaw $av)->{objs} };
    }
 
-   warn sprintf "loading %s (%d)\n",
-      $filename, length $data, scalar @{$av || []};
+   utf8::decode (my $decname = $filename);
+   warn sprintf "loading %s (%d,%d)\n",
+      $decname, length $data, scalar @{$av || []};
 
    ($data, $av)
 }
@@ -2446,6 +2460,21 @@
    $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 put him there anyways for now #d#
+
+            ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
+         }
+      }
+
       my $map = eval {
          my $map = cf::map::find $path;
 
@@ -3433,8 +3462,9 @@
    $signal->wait;
 }
 
-      my $min = 1e6;#d#
-      my $avg = 10;
+our $stat_fh;
+sysopen $stat_fh, "/tmp/cfstats", Fcntl::O_APPEND | Fcntl::O_CREAT | Fcntl::O_WRONLY, 0600;#d#
+
 $TICK_WATCHER = Event->timer (
    reentrant => 0,
    parked    => 1,
@@ -3448,33 +3478,12 @@
          return;
       }
 
+      my @pl = cf::player::list; my $stats = sprintf "%.2f %d %d %d", $RUNTIME, (scalar @pl), cf::object::actives_size, cf::object::objects_size; #d#
+
       $NOW = $tick_start = Event::time;
 
       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;
 
@@ -3509,11 +3518,14 @@
 
       _post_tick;
 
-
+      # gather some statistics#d#
+      $stats .= sprintf " %d\n", 10000 * ($NOW - $tick_start);#d#
+      IO::AIO::aio_write $stat_fh, undef, undef, $stats, 0;#d#
    },
 );
 
 {
+   BDB::min_parallel 8;
    BDB::max_poll_time $TICK * 0.1;
    $BDB_POLL_WATCHER = Event->io (
       reentrant => 0,
@@ -3523,7 +3535,6 @@
       data      => WF_AUTOCANCEL,
       cb        => \&BDB::poll_cb,
    );
-   BDB::min_parallel 8;
 
    BDB::set_sync_prepare {
       my $status;
@@ -3554,13 +3565,35 @@
 
             cf::cleanup "db_env_open($BDBDIR): $!" if $!;
 
-            $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
+            $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_CHECKPOINT_WATCHER = Event->timer (
+      after     => 11,
+      interval  => 60,
+      hard      => 1,
+      prio      => 0,
+      data      => WF_AUTOCANCEL,
+      cb        => sub {
+         BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
+      },
+   );
+   $BDB_TRICKLE_WATCHER = Event->timer (
+      after     => 5,
+      interval  => 10,
+      hard      => 1,
+      prio      => 0,
+      data      => WF_AUTOCANCEL,
+      cb        => sub {
+         BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
+      },
+   );
 }
 
 {