--- deliantra/server/lib/cf.pm	2011/04/22 02:03:12	1.560
+++ deliantra/server/lib/cf.pm	2012/10/31 15:02:02	1.586
@@ -1,22 +1,22 @@
 #
 # This file is part of Deliantra, the Roguelike Realtime MMORPG.
-# 
-# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
-# 
+#
+# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 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
 # Free Software Foundation, either version 3 of the License, or (at your
 # option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the Affero GNU General Public License
 # and the GNU General Public License along with this program. If not, see
 # <http://www.gnu.org/licenses/>.
-# 
+#
 # The authors can be reached via e-mail to <support@deliantra.net>
 #
 
@@ -110,7 +110,7 @@
 our $PIDFILE     = "$LOCALDIR/pid";
 our $RUNTIMEFILE = "$LOCALDIR/runtime";
 
-our %RESOURCE; # unused
+#our %RESOURCE; # unused
 
 our $OUTPUT_RATE_MIN =    3000;
 our $OUTPUT_RATE_MAX = 1000000;
@@ -131,9 +131,11 @@
 our @EXTRA_MODULES = qw(pod match mapscript incloader);
 
 our %CFG;
+our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
 
 our $UPTIME; $UPTIME ||= time;
-our $RUNTIME;
+our $RUNTIME     = 0;
+our $SERVER_TICK = 0;
 our $NOW;
 
 our (%PLAYER, %PLAYER_LOADING); # all users
@@ -153,6 +155,9 @@
 our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
 our $REALLY_UNLOOP;      # never set to true, please :)
 
+our $WAIT_FOR_TICK = new Coro::Signal;
+our @WAIT_FOR_TICK_BEGIN;
+
 binmode STDOUT;
 binmode STDERR;
 
@@ -195,7 +200,22 @@
 
 =item $cf::UPTIME
 
-The timestamp of the server start (so not actually an uptime).
+The timestamp of the server start (so not actually an "uptime").
+
+=item $cf::SERVER_TICK
+
+An unsigned integer that starts at zero when the server is started and is
+incremented on every tick.
+
+=item $cf::NOW
+
+The (real) time of the last (current) server tick - updated before and
+after tick processing, so this is useful only as a rough "what time is it
+now" estimate.
+
+=item $cf::TICK
+
+The interval between each server tick, in seconds.
 
 =item $cf::RUNTIME
 
@@ -211,14 +231,6 @@
 unique-items directory, player file directory, random maps directory and
 database environment.
 
-=item $cf::NOW
-
-The time of the last (current) server tick.
-
-=item $cf::TICK
-
-The interval between server ticks, in seconds.
-
 =item $cf::LOADAVG
 
 The current CPU load on the server (alpha-smoothed), as a value between 0
@@ -240,6 +252,18 @@
 returns directly I<after> the tick processing (and consequently, can only wake one thread
 per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
 
+Note that cf::Wait_for_tick will immediately return when the server is not
+ticking, making it suitable for small pauses in threads that need to run
+when the server is paused. If that is not applicable (i.e. you I<really>
+want to wait, use C<$cf::WAIT_FOR_TICK>).
+
+=item $cf::WAIT_FOR_TICK
+
+Note that C<cf::wait_for_tick> is probably the correct thing to use. This
+variable contains a L<Coro::Signal> that is broadcats after every server
+tick. Calling C<< ->wait >> on it will suspend the caller until after the
+next server tick.
+
 =cut
 
 sub wait_for_tick();
@@ -314,7 +338,7 @@
 }
 
 $EV::DIED = sub {
-   Carp::cluck "error in event callback: @_";
+   warn "error in event callback: $@";
 };
 
 #############################################################################
@@ -351,7 +375,7 @@
    } || "[unable to dump $_[0]: '$@']";
 }
 
-=item $scalar = load_file $path
+=item $scalar = cf::load_file $path
 
 Loads the given file from path and returns its contents. Croaks on error
 and can block.
@@ -365,6 +389,44 @@
    $data
 }
 
+=item $success = cf::replace_file $path, $data, $sync
+
+Atomically replaces the file at the given $path with new $data, and
+optionally $sync the data to disk before replacing the file.
+
+=cut
+
+sub replace_file($$;$) {
+   my ($path, $data, $sync) = @_;
+   
+   my $lock = cf::lock_acquire ("replace_file:$path");
+
+   my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
+      or return;
+
+   $data = $data->() if ref $data;
+
+   length $data == aio_write $fh, 0, (length $data), $data, 0
+      or return;
+
+   !$sync
+      or !aio_fsync $fh
+      or return;
+
+   aio_close $fh
+      and return;
+
+   aio_rename "$path~", $path
+      and return;
+
+   if ($sync) {
+      $path =~ s%/[^/]*$%%;
+      aio_pathsync $path;
+   }
+
+   1
+}
+
 =item $ref = cf::decode_json $json
 
 Converts a JSON string into the corresponding perl data structure.
@@ -547,8 +609,7 @@
 
       if (@SLOT_QUEUE) {
          # we do not use wait_for_tick() as it returns immediately when tick is inactive
-         push @cf::WAIT_FOR_TICK, $signal;
-         $signal->wait;
+         $WAIT_FOR_TICK->wait;
       } else {
          $busy = 0;
          Coro::schedule;
@@ -1441,10 +1502,7 @@
       my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
 
       if (ref $msg) {
-         my ($type, $reply, @payload) =
-            "ARRAY" eq ref $msg
-               ? @$msg
-               : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
+         my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
 
          my @reply;
 
@@ -1476,9 +1534,22 @@
    $grp
 }
 
+sub _ext_cfg_reg($$$$) {
+   my ($rvar, $varname, $cfgname, $default) = @_;
+
+   $cfgname = lc $varname
+      unless length $cfgname;
+
+   $EXT_CFG{$cfgname} = [$rvar, $default];
+
+   $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
+}
+
 sub load_extensions {
    info "loading extensions...";
 
+   %EXT_CFG = ();
+
    cf::sync_job {
       my %todo;
 
@@ -1530,7 +1601,16 @@
 
             trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
 
-            my $active = eval $v->{source};
+            my $source = $v->{source};
+
+            # support "CONF varname :confname = default" pseudo-statements
+            $source =~ s{
+               ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
+            }{
+               "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
+            }gmxe;
+
+            my $active = eval $source;
 
             if (length $@) {
                error "$v->{path}: $@\n";
@@ -1557,6 +1637,8 @@
                cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
                   if exists $v->{meta}{mandatory};
             }
+
+            last;
          }
       }
    };
@@ -1994,6 +2076,7 @@
    ()
 }
 
+# may re-bless or do other evil things
 sub init {
    my ($self) = @_;
 
@@ -2068,18 +2151,21 @@
    1
 }
 
+# used to laod the header of an original map
 sub load_header_orig {
    my ($self) = @_;
 
    $self->load_header_from ($self->load_path)
 }
 
+# used to laod the header of an instantiated map
 sub load_header_temp {
    my ($self) = @_;
 
    $self->load_header_from ($self->save_path)
 }
 
+# called after loading the header from an instantiated map
 sub prepare_temp {
    my ($self) = @_;
 
@@ -2090,6 +2176,7 @@
       if $self->{instantiate_time} > $cf::RUNTIME;
 }
 
+# called after loading the header from an original map
 sub prepare_orig {
    my ($self) = @_;
 
@@ -2125,7 +2212,7 @@
 
    cf::cede_to_tick;
 
-   $path = normalise $path, $origin && $origin->path;
+   $path = normalise $path, $origin;
 
    my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
    my $guard2 = cf::lock_acquire "map_find:$path";
@@ -2166,35 +2253,40 @@
       my $guard = cf::lock_acquire "map_data:$path";
 
       return unless $self->valid;
-      return unless $self->in_memory == cf::MAP_SWAPPED;
-
-      $self->in_memory (cf::MAP_LOADING);
+      return unless $self->state == cf::MAP_SWAPPED;
 
       $self->alloc;
 
       $self->pre_load;
       cf::cede_to_tick;
 
-      my $f = new_from_file cf::object::thawer $self->{load_path};
-      $f->skip_block;
-      $self->_load_objects ($f)
-         or return;
+      if (exists $self->{load_path}) {
+         my $f = new_from_file cf::object::thawer $self->{load_path};
+         $f->skip_block;
+         $self->_load_objects ($f)
+            or return;
 
-      $self->post_load_original
-         if delete $self->{load_original};
+         $self->post_load_original
+            if delete $self->{load_original};
 
-      if (my $uniq = $self->uniq_path) {
-         utf8::encode $uniq;
-         unless (aio_stat $uniq) {
-            if (my $f = new_from_file cf::object::thawer $uniq) {
-               $self->clear_unique_items;
-               $self->_load_objects ($f);
-               $f->resolve_delayed_derefs;
+         if (my $uniq = $self->uniq_path) {
+            utf8::encode $uniq;
+            unless (aio_stat $uniq) {
+               if (my $f = new_from_file cf::object::thawer $uniq) {
+                  $self->clear_unique_items;
+                  $self->_load_objects ($f);
+                  $f->resolve_delayed_derefs;
+               }
             }
          }
+
+         $f->resolve_delayed_derefs;
+      } else {
+         $self->post_load_original
+            if delete $self->{load_original};
       }
 
-      $f->resolve_delayed_derefs;
+      $self->state (cf::MAP_INACTIVE);
 
       cf::cede_to_tick;
       # now do the right thing for maps
@@ -2208,13 +2300,11 @@
          $self->fix_auto_apply;
          $self->update_buttons;
          cf::cede_to_tick;
-         $self->activate;
+         #$self->activate; # no longer activate maps automatically
       }
 
       $self->{last_save} = $cf::RUNTIME;
       $self->last_access ($cf::RUNTIME);
-
-      $self->in_memory (cf::MAP_ACTIVE);
    }
 
    $self->post_load;
@@ -2237,36 +2327,10 @@
    $self
 }
 
-# find and load all maps in the 3x3 area around a map
-sub load_neighbours {
-   my ($map) = @_;
-
-   my @neigh; # diagonal neighbours
-
-   for (0 .. 3) {
-      my $neigh = $map->tile_path ($_)
-         or next;
-      $neigh = find $neigh, $map
-         or next;
-      $neigh->load;
-
-      # now find the diagonal neighbours
-      push @neigh,
-         [$neigh->tile_path (($_ + 3) % 4), $neigh],
-         [$neigh->tile_path (($_ + 1) % 4), $neigh];
-   }
-
-   for (grep defined $_->[0], @neigh) {
-      my ($path, $origin) = @$_;
-      my $neigh = find $path, $origin
-         or next;
-      $neigh->load;
-   }
-}
-
 sub find_sync {
    my ($path, $origin) = @_;
 
+   # it's a bug to call this from the main context
    return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
       if $Coro::current == $Coro::main;
 
@@ -2276,6 +2340,7 @@
 sub do_load_sync {
    my ($map) = @_;
 
+   # it's a bug to call this from the main context
    return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
       if $Coro::current == $Coro::main;
 
@@ -2288,10 +2353,10 @@
 sub find_async {
    my ($path, $origin, $load) = @_;
 
-   $path = normalise $path, $origin && $origin->{path};
+   $path = normalise $path, $origin;
 
    if (my $map = $cf::MAP{$path}) {
-      return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
+      return $map if !$load || $map->linkable;
    }
 
    $MAP_PREFETCH{$path} |= $load;
@@ -2360,14 +2425,14 @@
 
    my $lock = cf::lock_acquire "map_data:$self->{path}";
 
-   return if $self->in_memory != cf::MAP_ACTIVE;
+   return if !$self->linkable;
    return if $self->{deny_save};
    return if $self->players;
 
    # first deactivate the map and "unlink" it from the core
    $self->deactivate;
    $_->clear_links_to ($self) for values %cf::MAP;
-   $self->in_memory (cf::MAP_SWAPPED);
+   $self->state (cf::MAP_SWAPPED);
 
    # then atomically save
    $self->_save;
@@ -2403,7 +2468,7 @@
 
    cf::trace "resetting map ", $self->path, "\n";
 
-   $self->in_memory (cf::MAP_SWAPPED);
+   $self->state (cf::MAP_SWAPPED);
 
    # need to save uniques path
    unless ($self->{deny_save}) {
@@ -2743,7 +2808,6 @@
       if $x <= 0 && $y <= 0;
 
    $map->load;
-   $map->load_neighbours;
 
    return unless $self->contr->active;
 
@@ -2809,7 +2873,7 @@
       }
 
       my $map = eval {
-         my $map = defined $path ? cf::map::find $path : undef;
+         my $map = defined $path ? cf::map::find $path, $self->map : undef;
 
          if ($map) {
             $map = $map->customise_for ($self);
@@ -2909,17 +2973,32 @@
       unless (eval {
          $self->deactivate_recursive; # just to be sure
 
-         # random map handling
-         {
+         my $map = cf::map::normalise $exit->slaying, $exit->map;
+         my $x   = $exit->stats->hp;
+         my $y   = $exit->stats->sp;
+
+         # special map handling
+         my $slaying = $exit->slaying;
+
+         # special map handling
+         if ($slaying eq "/!") {
             my $guard = cf::lock_acquire "exit_prepare:$exit";
 
             prepare_random_map $exit
-               if $exit->slaying eq "/!";
-         }
+               if $exit->slaying eq "/!"; # need to re-check after getting the lock
 
-         my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
-         my $x   = $exit->stats->hp;
-         my $y   = $exit->stats->sp;
+            $map = $exit->slaying;
+
+         } elsif ($slaying eq '!up') {
+            $map = $exit->map->tile_path (cf::TILE_UP);
+            $x = $exit->x;
+            $y = $exit->y;
+
+         } elsif ($slaying eq '!down') {
+            $map = $exit->map->tile_path (cf::TILE_DOWN);
+            $x = $exit->x;
+            $y = $exit->y;
+         }
 
          $self->goto ($map, $x, $y);
 
@@ -3171,13 +3250,9 @@
 sub cf::client::ext_reply($$@) {
    my ($self, $id, @msg) = @_;
 
-   if ($self->extcmd == 2) {
-      $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
-   } elsif ($self->extcmd == 1) {
-      #TODO: version 1, remove
-      unshift @msg, msgtype => "reply", msgid => $id;
-      $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
-   }
+   return unless $self->extcmd == 2;
+
+   $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
 }
 
 =item $success = $client->query ($flags, "text", \&cb)
@@ -3242,10 +3317,7 @@
       my $msg = eval { $ns->{json_coder}->decode ($buf) };
 
       if (ref $msg) {
-         my ($type, $reply, @payload) =
-            "ARRAY" eq ref $msg
-               ? @$msg
-               : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
+         my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
 
          my @reply;
 
@@ -3433,6 +3505,8 @@
 #############################################################################
 # the server's init and main functions
 
+our %FACEHASH; # hash => idx, #d# HACK for http server
+
 sub load_facedata($) {
    my ($path) = @_;
 
@@ -3461,7 +3535,8 @@
    {
       my $faces = $facedata->{faceinfo};
 
-      while (my ($face, $info) = each %$faces) {
+      for my $face (sort keys %$faces) {
+         my $info = $faces->{$face};
          my $idx = (cf::face::find $face) || cf::face::alloc $face;
 
          cf::face::set_visibility $idx, $info->{visibility};
@@ -3469,6 +3544,7 @@
          cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
          cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
          cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
+         $FACEHASH{$info->{hash64}} = $idx;#d#
 
          cf::cede_to_tick;
       }
@@ -3505,13 +3581,16 @@
       my $res = $facedata->{resource};
 
       while (my ($name, $info) = each %$res) {
-         if (defined $info->{type}) {
+         if (defined (my $type = $info->{type})) {
+            # TODO: different hash - must free and use new index, or cache ixface data queue
             my $idx = (cf::face::find $name) || cf::face::alloc $name;
 
             cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
-            cf::face::set_type $idx, $info->{type};
+            cf::face::set_type $idx, $type;
+            cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
+            $FACEHASH{$info->{hash}} = $idx;#d#
          } else {
-            $RESOURCE{$name} = $info; # unused
+#            $RESOURCE{$name} = $info; # unused
          }
 
          cf::cede_to_tick;
@@ -3657,7 +3736,7 @@
    cf::init_globals; # initialise logging
 
    LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
-   LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
+   LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
    LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
    LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
 
@@ -3709,8 +3788,7 @@
    cf::object::thawer::errors_are_fatal 0;
    info "parse errors in files are no longer fatal from this point on.\n";
 
-   my $free_main; $free_main = EV::idle sub {
-      undef $free_main;
+   AE::postpone {
       undef &main; # free gobs of memory :)
    };
 
@@ -3877,7 +3955,7 @@
 
       trace "emergency_perl_save: flushing outstanding aio requests";
       while (IO::AIO::nreqs || BDB::nreqs) {
-         Coro::EV::timer_once 0.01; # let the sync_job do it's thing
+         Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
       }
 
       cf::write_runtime_sync; # external watchdog should not bark
@@ -4068,19 +4146,14 @@
 
 my $bug_warning = 0;
 
-our @WAIT_FOR_TICK;
-our @WAIT_FOR_TICK_BEGIN;
-
 sub wait_for_tick() {
-   return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
+   return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
 
-   my $signal = new Coro::Signal;
-   push @WAIT_FOR_TICK, $signal;
-   $signal->wait;
+   $WAIT_FOR_TICK->wait;
 }
 
 sub wait_for_tick_begin() {
-   return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
+   return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
 
    my $signal = new Coro::Signal;
    push @WAIT_FOR_TICK_BEGIN, $signal;
@@ -4094,7 +4167,7 @@
       return;
    }
 
-   cf::server_tick; # one server iteration
+   cf::one_tick; # one server iteration
 
    #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
 
@@ -4110,9 +4183,7 @@
    if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
       $sig->send;
    }
-   while (my $sig = shift @WAIT_FOR_TICK) {
-      $sig->send;
-   }
+   $WAIT_FOR_TICK->broadcast;
 
    $LOAD = ($NOW - $TICK_START) / $TICK;
    $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
@@ -4131,7 +4202,7 @@
 
    BDB::min_parallel 16;
    BDB::max_poll_reqs $TICK * 0.1;
-   $AnyEvent::BDB::WATCHER->priority (1);
+   #$AnyEvent::BDB::WATCHER->priority (1);
 
    unless ($DB_ENV) {
       $DB_ENV = BDB::db_env_create;