--- deliantra/server/lib/cf.pm	2009/10/26 05:18:00	1.494
+++ deliantra/server/lib/cf.pm	2010/01/23 20:24:50	1.502
@@ -55,7 +55,6 @@
 use JSON::XS 2.01 ();
 use BDB ();
 use Data::Dumper;
-use Digest::MD5;
 use Fcntl;
 use YAML::XS ();
 use IO::AIO ();
@@ -426,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;
          }
       }
 
@@ -452,6 +456,7 @@
          push @cf::WAIT_FOR_TICK, $signal;
          $signal->wait;
       } else {
+         $busy = 0;
          Coro::schedule;
       }
    }
@@ -462,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];
@@ -2012,8 +2018,8 @@
    }
 }
 
-sub pre_load  { }
-sub post_load { }
+sub pre_load { }
+#sub post_load { } # XS
 
 sub load {
    my ($self) = @_;
@@ -3144,7 +3150,7 @@
 $SIG{FPE} = 'IGNORE';
 
 $safe->permit_only (Opcode::opset qw(
-   :base_core :base_mem :base_orig :base_math
+   :base_core :base_mem :base_orig :base_math :base_loop
    grepstart grepwhile mapstart mapwhile
    sort time
 ));
@@ -3206,8 +3212,8 @@
 
    %vars = (_dummy => 0) unless %vars;
 
+   my @res;
    local $_;
-   local @safe::cf::_safe_eval_args = values %vars;
 
    my $eval =
       "do {\n"
@@ -3217,9 +3223,15 @@
       . "\n}"
    ;
 
-   sub_generation_inc;
-   my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
-   sub_generation_inc;
+   if ($CFG{safe_eval}) {
+      sub_generation_inc;
+      local @safe::cf::_safe_eval_args = values %vars;
+      @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
+      sub_generation_inc;
+   } else {
+      local @cf::_safe_eval_args = values %vars;
+      @res = wantarray ? eval eval : scalar eval $eval;
+   }
 
    if ($@) {
       warn "$@";
@@ -3248,8 +3260,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
@@ -3280,9 +3292,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;
 
@@ -3294,8 +3308,8 @@
 
          cf::face::set_visibility $idx, $info->{visibility};
          cf::face::set_magicmap   $idx, $info->{magicmap};
-         cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
-         cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
+         cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
+         cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
 
          cf::cede_to_tick;
       }
@@ -3329,29 +3343,13 @@
    }
 
    {
-      # TODO: for gcfclient pleasure, we should give resources
-      # that gcfclient doesn't grok a >10000 face index.
       my $res = $facedata->{resource};
 
       while (my ($name, $info) = each %$res) {
          if (defined $info->{type}) {
             my $idx = (cf::face::find $name) || cf::face::alloc $name;
-            my $data;
-
-            if ($info->{type} & 1) {
-               # prepend meta info
 
-               my $meta = $enc->encode ({
-                  name => $name,
-                  %{ $info->{meta} || {} },
-               });
-
-               $data = pack "(w/a*)*", $meta, $info->{data};
-            } else {
-               $data = $info->{data};
-            }
-
-            cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
+            cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
             cf::face::set_type $idx, $info->{type};
          } else {
             $RESOURCE{$name} = $info;
@@ -3524,12 +3522,13 @@
    evthread_start IO::AIO::poll_fileno;
 
    cf::sync_job {
+      cf::load_settings;
+      cf::load_materials;
+
       reload_resources;
       reload_config;
       db_init;
 
-      cf::load_settings;
-      cf::load_materials;
       cf::init_uuid;
       cf::init_signals;
       cf::init_commands;
@@ -3898,7 +3897,7 @@
 our @WAIT_FOR_TICK_BEGIN;
 
 sub wait_for_tick {
-   return if tick_inhibit || $Coro::current == $Coro::main;
+   return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
 
    my $signal = new Coro::Signal;
    push @WAIT_FOR_TICK, $signal;
@@ -3906,7 +3905,7 @@
 }
 
 sub wait_for_tick_begin {
-   return if tick_inhibit || $Coro::current == $Coro::main;
+   return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
 
    my $signal = new Coro::Signal;
    push @WAIT_FOR_TICK_BEGIN, $signal;
@@ -3922,6 +3921,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 {