--- deliantra/server/lib/cf.pm	2010/01/10 17:43:46	1.499
+++ deliantra/server/lib/cf.pm	2010/02/03 20:48:22	1.506
@@ -1,7 +1,7 @@
 #
 # This file is part of Deliantra, the Roguelike Realtime MMORPG.
 # 
-# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
 # 
 # Deliantra is free software: you can redistribute it and/or modify it under
 # the terms of the Affero GNU General Public License as published by the
@@ -425,24 +425,29 @@
 
 our @SLOT_QUEUE;
 our $SLOT_QUEUE;
+our $SLOT_DECAY = 0.9;
 
 $SLOT_QUEUE->cancel if $SLOT_QUEUE;
 $SLOT_QUEUE = Coro::async {
    $Coro::current->desc ("timeslot manager");
 
    my $signal = new Coro::Signal;
+   my $busy;
 
    while () {
       next_job:
+
       my $avail = cf::till_tick;
-      if ($avail > 0.01) {
-         for (0 .. $#SLOT_QUEUE) {
-            if ($SLOT_QUEUE[$_][0] < $avail) {
-               my $job = splice @SLOT_QUEUE, $_, 1, ();
-               $job->[2]->send;
-               Coro::cede;
-               goto next_job;
-            }
+
+      for (0 .. $#SLOT_QUEUE) {
+         if ($SLOT_QUEUE[$_][0] <= $avail) {
+            $busy = 0;
+            my $job = splice @SLOT_QUEUE, $_, 1, ();
+            $job->[2]->send;
+            Coro::cede;
+            goto next_job;
+         } else {
+            $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
          }
       }
 
@@ -451,6 +456,7 @@
          push @cf::WAIT_FOR_TICK, $signal;
          $signal->wait;
       } else {
+         $busy = 0;
          Coro::schedule;
       }
    }
@@ -461,7 +467,8 @@
 
    my ($time, $pri, $name) = @_;
 
-   $time = $TICK * .6 if $time > $TICK * .6;
+   $time = clamp $time, 0.01, $TICK * .6;
+
    my $sig = new Coro::Signal;
 
    push @SLOT_QUEUE, [$time, $pri, $sig, $name];
@@ -1394,38 +1401,47 @@
          $todo{$base} = \%ext;
       }
 
+      my $pass = 0;
       my %done;
       while (%todo) {
          my $progress;
 
+         ++$pass;
+
+         ext:
          while (my ($k, $v) = each %todo) {
             for (split /,\s*/, $v->{meta}{depends}) {
-               goto skip
+               next ext
                   unless exists $done{$_};
             }
 
-            warn "... loading '$k' into '$v->{pkg}'\n";
+            warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
 
-            unless (eval $v->{source}) {
-               my $msg = $@ ? "$v->{path}: $@\n"
-                            : "$v->{base}: extension inactive.\n";
-
-               if (exists $v->{meta}{mandatory}) {
-                  warn $msg;
-                  cf::cleanup "mandatory extension failed to load, exiting.";
-               }
-               
-               warn $msg;
-            }
+            my $active = eval $v->{source};
+
+            if (length $@) {
+               warn "$v->{path}: $@\n";
 
-            $done{$k} = delete $todo{$k};
-            push @EXTS, $v->{pkg};
-            $progress = 1;
+               cf::cleanup "mandatory extension '$k' failed to load, exiting."
+                  if exists $v->{meta}{mandatory};
+            } else {
+               $done{$k} = delete $todo{$k};
+               push @EXTS, $v->{pkg};
+               $progress = 1;
+
+               warn "$v->{base}: extension inactive.\n"
+                  unless $active;
+            }
          }
 
-         skip:
-         die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
-            unless $progress;
+         unless ($progress) {
+            warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
+
+            while (my ($k, $v) = each %todo) {
+               cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
+                  if exists $v->{meta}{mandatory};
+            }
+         }
       }
    };
 }
@@ -2011,8 +2027,8 @@
    }
 }
 
-sub pre_load  { }
-sub post_load { }
+sub pre_load { }
+#sub post_load { } # XS
 
 sub load {
    my ($self) = @_;
@@ -3253,8 +3269,8 @@
 sub register_script_function {
    my ($fun, $cb) = @_;
 
-   no strict 'refs';
-   *{"safe::$fun"} = $safe_hole->wrap ($cb);
+   $fun = "safe::$fun" if $CFG{safe_eval};
+   *$fun = $safe_hole->wrap ($cb);
 }
 
 =back
@@ -3285,9 +3301,11 @@
       or cf::cleanup "$path: version mismatch, cannot proceed.";
 
    # patch in the exptable
+   my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
    $facedata->{resource}{"res/exp_table"} = {
       type => FT_RSRC,
-      data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
+      data => $exp_table,
+      hash => (Digest::MD5::md5 $exp_table),
    };
    cf::cede_to_tick;
 
@@ -3557,6 +3575,8 @@
 }
 
 sub write_runtime_sync {
+   my $t0 = EV::time;
+
    # first touch the runtime file to show we are still running:
    # the fsync below can take a very very long time.
 
@@ -3564,7 +3584,7 @@
 
    my $guard = cf::lock_acquire "write_runtime";
 
-   my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
+   my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
       or return;
 
    my $value = $cf::RUNTIME + 90 + 10;
@@ -3587,7 +3607,7 @@
    aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
       and return;
 
-   warn "runtime file written.\n";
+   warn sprintf "runtime file written (%gs).\n", EV::time - $t0;
 
    1
 }
@@ -3912,6 +3932,8 @@
 
    cf::server_tick; # one server iteration
 
+   #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#
+
    if ($NOW >= $NEXT_RUNTIME_WRITE) {
       $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
       Coro::async_pool {
@@ -3943,7 +3965,7 @@
 {
    # configure BDB
 
-   BDB::min_parallel 8;
+   BDB::min_parallel 16;
    BDB::max_poll_reqs $TICK * 0.1;
    $AnyEvent::BDB::WATCHER->priority (1);