--- deliantra/server/lib/cf.pm	2012/01/04 03:22:28	1.579
+++ deliantra/server/lib/cf.pm	2012/11/04 02:20:11	1.590
@@ -1,22 +1,22 @@
 #
 # This file is part of Deliantra, the Roguelike Realtime MMORPG.
-# 
+#
 # 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>
 #
 
@@ -34,7 +34,10 @@
 use Storable ();
 use Carp ();
 
-use Guard ();
+use AnyEvent ();
+use AnyEvent::IO ();
+use AnyEvent::DNS ();
+
 use Coro ();
 use Coro::State;
 use Coro::Handle;
@@ -50,6 +53,7 @@
 use Coro::Storable;
 use Coro::Util ();
 
+use Guard ();
 use JSON::XS 2.01 ();
 use BDB ();
 use Data::Dumper;
@@ -131,6 +135,7 @@
 our @EXTRA_MODULES = qw(pod match mapscript incloader);
 
 our %CFG;
+our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
 
 our $UPTIME; $UPTIME ||= time;
 our $RUNTIME     = 0;
@@ -337,7 +342,7 @@
 }
 
 $EV::DIED = sub {
-   Carp::cluck "error in event callback: @_";
+   warn "error in event callback: $@";
 };
 
 #############################################################################
@@ -374,7 +379,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.
@@ -388,6 +393,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.
@@ -1495,9 +1538,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;
 
@@ -1549,7 +1605,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";
@@ -3172,12 +3237,7 @@
 sub cf::client::ext_msg($$@) {
    my ($self, $type, @msg) = @_;
 
-   if ($self->extcmd == 2) {
-      $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
-   } elsif ($self->extcmd == 1) { # TODO: remove
-      push @msg, msgtype => "event_$type";
-      $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
-   }
+   $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
 }
 
 =item $client->ext_reply ($msgid, @msg)
@@ -3189,8 +3249,6 @@
 sub cf::client::ext_reply($$@) {
    my ($self, $id, @msg) = @_;
 
-   return unless $self->extcmd == 2;
-
    $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
 }
 
@@ -3444,6 +3502,30 @@
 #############################################################################
 # the server's init and main functions
 
+our %FACEHASH; # hash => idx, #d# HACK for http server
+
+# internal api, not fianlised
+sub add_face {
+   my ($name, $type, $data) = @_;
+
+   my $idx = cf::face::find $name;
+
+   if ($idx) {
+      delete $FACEHASH{cf::face::get_chksum $idx};
+   } else {
+      $idx = cf::face::alloc $name;
+   }
+
+   my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
+
+   cf::face::set_type $idx, $type;
+   cf::face::set_data $idx, 0, $data, $hash;
+   cf::face::set_meta $idx, $type & 1 ? undef : undef;
+   $FACEHASH{$hash} = $idx;#d#
+
+   $idx
+}
+
 sub load_facedata($) {
    my ($path) = @_;
 
@@ -3460,19 +3542,13 @@
    $facedata->{version} == 2
       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 => $exp_table,
-      hash => (Digest::MD5::md5 $exp_table),
-   };
    cf::cede_to_tick;
 
    {
       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};
@@ -3480,6 +3556,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;
       }
@@ -3520,9 +3597,10 @@
             # 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, $type;
-            cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # any keys left are stashed into meta unless prepended
+            cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
+            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
          }
@@ -3554,6 +3632,19 @@
    $status
 }
 
+sub reload_exp_table {
+   _reload_exp_table;
+
+   add_face "res/exp_table" => FT_RSRC,
+            JSON::XS->new->utf8->canonical->encode (
+               [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
+            );
+}
+
+sub reload_materials {
+   _reload_materials;
+}
+
 sub reload_regions {
    # HACK to clear player env face cache, we need some signal framework
    # for this (global event?)
@@ -3576,6 +3667,15 @@
 sub reload_archetypes {
    load_resource_file "$DATADIR/archetypes"
       or die "unable to load archetypes\n";
+
+   add_face "res/skill_info" => FT_RSRC,
+            JSON::XS->new->utf8->canonical->encode (
+               [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
+            );
+   add_face "res/spell_paths" => FT_RSRC,
+            JSON::XS->new->utf8->canonical->encode (
+               [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
+            );
 }
 
 sub reload_treasures {
@@ -3606,9 +3706,9 @@
 sub reload_resources {
    trace "reloading resource files...\n";
 
-   reload_exp_table;
    reload_materials;
    reload_facedata;
+   reload_exp_table;
    reload_sound;
    reload_archetypes;
    reload_regions;
@@ -3677,7 +3777,7 @@
    $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
 
    # we must not ever block the main coroutine
-   local $Coro::idle = sub {
+   $Coro::idle = sub {
       Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
       (async {
          $Coro::current->{desc} = "IDLE BUG HANDLER";