[ViewVC] Diff of: cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.576 by root, Tue Jan 3 02:08:49 2012 UTC vs.
Revision 1.587 by root, Wed Oct 31 19:09:47 2012 UTC

 #
 # This file is part of Deliantra, the Roguelike Realtime MMORPG.
 #
-# Copyright (©) 2006,2007,2008,2009,2010,2011 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>
 #
 package cf;
 use Safe;
 use Safe::Hole;
 use Storable ();
 use Carp ();
-use Guard ();
+use AnyEvent ();
+use AnyEvent::IO ();
+use AnyEvent::DNS ();
 use Coro ();
 use Coro::State;
 use Coro::Handle;
 use Coro::EV;
 use Coro::AnyEvent;
 use Coro::AIO;
 use Coro::BDB 1.6;
 use Coro::Storable;
 use Coro::Util ();
+use Guard ();
 use JSON::XS 2.01 ();
 use BDB ();
 use Data::Dumper;
 use Fcntl;
 use YAML::XS ();
 our $RANDOMDIR   = "$LOCALDIR/random";
 our $BDBDIR      = "$LOCALDIR/db";
 our $PIDFILE     = "$LOCALDIR/pid";
 our $RUNTIMEFILE = "$LOCALDIR/runtime";
-our %RESOURCE; # unused
+#our %RESOURCE; # unused
 our $OUTPUT_RATE_MIN =    3000;
 our $OUTPUT_RATE_MAX = 1000000;
 our $MAX_LINKS       = 32; # how many chained exits to follow
 our $DB_ENV;
 our @EXTRA_MODULES = qw(pod match mapscript incloader);
 our %CFG;
+our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
 our $UPTIME; $UPTIME ||= time;
 our $RUNTIME     = 0;
 our $SERVER_TICK = 0;
 our $NOW;
 )) {
    @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
 }
 $EV::DIED = sub {
-   Carp::cluck "error in event callback: @_";
+   warn "error in event callback: $@";
 };
 #############################################################################
 sub fork_call(&@);
       $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
       $d
    } || "[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.
 =cut
 sub load_file($) {
    0 <= aio_load $_[0], my $data
       or Carp::croak "$_[0]: $!";
    $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.
    };
    $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;
       for my $path (<$LIBDIR/*.ext>) {
                   unless exists $done{$_};
             }
             trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
+            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 $v->{source};
+            my $active = eval $source;
             if (length $@) {
                error "$v->{path}: $@\n";
                cf::cleanup "mandatory extension '$k' failed to load, exiting."
 =cut
 #############################################################################
 # the server's init and main functions
+our %FACEHASH; # hash => idx, #d# HACK for http server
 sub load_facedata($) {
    my ($path) = @_;
    # HACK to clear player env face cache, we need some signal framework
    # for this (global event?)
    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};
          cf::face::set_magicmap   $idx, $info->{magicmap};
          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;
       }
       while (my ($face, $info) = each %$faces) {
    {
       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;
       }
    }
 sub main {
    cf::init_globals; # initialise logging
    LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
-   LOG llevInfo, "Copyright (C) 2005-2011 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.";
    $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";
          EV::loop EV::LOOP_ONESHOT;
       })->prio (Coro::PRIO_MAX);

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.576 by root, Tue Jan 3 02:08:49 2012 UTC vs. Revision 1.587 by root, Wed Oct 31 19:09:47 2012 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.576 by root, Tue Jan 3 02:08:49 2012 UTC vs.
Revision 1.587 by root, Wed Oct 31 19:09:47 2012 UTC