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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.532 by root, Thu Apr 29 07:32:34 2010 UTC vs.
Revision 1.540 by root, Tue May 4 23:32:29 2010 UTC

 # The authors can be reached via e-mail to <support@deliantra.net>
 #
 package cf;
-use 5.10.0;
+use common::sense;
-use utf8;
-use strict qw(vars subs);
 use Symbol;
 use List::Util;
 use Socket;
 use EV;
 # strictly for debugging
 $SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
 sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
+our @ORIG_INC;
 our %COMMAND      = ();
 our %COMMAND_TIME = ();
 our @EXTS         = (); # list of extension package names
 our %EXTCMD       = ();
 =cut
 sub sync_job(&) {
    my ($job) = @_;
-   if ($Coro::current == $Coro::main) {
+   if (in_main) {
       my $time = AE::time;
       # this is the main coro, too bad, we have to block
       # till the operation succeeds, freezing the server :/
-      LOG llevError, Carp::longmess "sync job";#d#
+      #LOG llevError, Carp::longmess "sync job";#d#
       my $freeze_guard = freeze_mainloop;
       my $busy = 1;
       my @res;
 within each server.
 =cut
 sub db_table($) {
+   cf::error "db_get called from main context"
+      if $Coro::current == $Coro::main;
    my ($name) = @_;
    my $db = BDB::db_create $DB_ENV;
    eval {
       $db->set_flags (BDB::CHKSUM);
 }
 our $DB;
 sub db_init {
-   cf::sync_job {
-      $DB ||= db_table "db";
+   $DB ||= db_table "db";
-   };
 }
 sub db_get($$) {
    my $key = "$_[0]/$_[1]";
-   cf::sync_job {
+   cf::error "db_get called from main context"
+      if $Coro::current == $Coro::main;
-      BDB::db_get $DB, undef, $key, my $data;
+   BDB::db_get $DB, undef, $key, my $data;
-      $! ? ()
+   $! ? ()
-         : $data
+      : $data
-   }
 }
 sub db_put($$$) {
    BDB::dbreq_pri 4;
    BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
          $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
             if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
          $ext{source} =
-            "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
+            "package $pkg; use common::sense;\n"
             . "#line 1 \"$path\"\n{\n"
             . $source
             . "\n};\n1";
          $todo{$base} = \%ext;
             my $active = eval $v->{source};
             if (length $@) {
                error "$v->{path}: $@\n";
+               undef $@; # work around perl 5.10.0 utf-8 caching bug
                cf::cleanup "mandatory extension '$k' failed to load, exiting."
                   if exists $v->{meta}{mandatory};
                warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
 sub register {
    my (undef, $regex, $prio) = @_;
    my $pkg = caller;
-   no strict;
    push @{"$pkg\::ISA"}, __PACKAGE__;
    $EXT_MAP{$pkg} = [$prio, qr<$regex>];
 }
 }
 sub find_sync {
    my ($path, $origin) = @_;
-   cf::sync_job { find $path, $origin }
+   return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
+      if $Coro::current == $Coro::main;
+   find $path, $origin
 }
 sub do_load_sync {
    my ($map) = @_;
-   cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
+   return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
       if $Coro::current == $Coro::main;
-   cf::sync_job { $map->load };
+   $map->load;
 }
 our %MAP_PREFETCH;
 our $MAP_PREFETCHER = undef;
                                decrease split destroy change_exp value msg lore send_msg)],
    ["cf::object::player" => qw(player)],
    ["cf::player"         => qw(peaceful send_msg)],
    ["cf::map"            => qw(trigger)],
 ) {
-   no strict 'refs';
    my ($pkg, @funs) = @$_;
    *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
       for @funs;
 }
 =cut
 #############################################################################
 # the server's init and main functions
+# async inc loader. yay.
+sub inc_loader {
+   my $mod = $_[1];
+   if (in_main && !tick_inhibit) {
+      Carp::cluck "ERROR: attempted synchronous perl module load ($mod)";
+   } else {
+      debug "loading perl module $mod\n";
+   }
+   # 1. find real file
+   for my $dir (@ORIG_INC) {
+      warn "$dir/$mod\n";#d#
+      ref $dir and next;
+      0 <= Coro::AIO::aio_load "$dir/$mod", my $data
+         or next;
+      $data = "#line 1 $dir/$mod\n$data";
+      open my $fh, "<", \$data or die;
+      return $fh;
+   }
+   ()
+}
+sub init_inc {
+   # save original @INC
+   @ORIG_INC = ($LIBDIR, @INC) unless @ORIG_INC;
+   # make sure we can do scalar-opens
+   open my $dummy, "<", \my $dummy2;
+   # execute some stuff so perl load's some of the core modules
+   /Ü/ =~ /ü/i;
+   eval { &Storable::nstore_fd };
+   @INC = (\&inc_loader, @ORIG_INC); # @ORIG_INC is needed for DynaLoader, AutoLoad etc.
+   debug "module loading will be asynchronous from this point on.";
+}
 sub load_facedata($) {
    my ($path) = @_;
    # HACK to clear player env face cache, we need some signal framework
    # for this (global event?)
 sub main {
    cf::init_globals; # initialise logging
    LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
-   LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
+   LOG llevInfo, "Copyright (C) 2005-2010 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
    };
    evthread_start IO::AIO::poll_fileno;
    cf::sync_job {
+      init_inc;
       cf::init_experience;
       cf::init_anim;
       cf::init_attackmess;
       cf::init_dynamic;
    };
    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;
+      undef &main; # free gobs of memory :)
+   };
-   main_loop;
+   goto &main_loop;
 }
 #############################################################################
 # initialisation and cleanup
 sub emergency_save() {
    my $freeze_guard = cf::freeze_mainloop;
    info "emergency_perl_save: enter\n";
+   # this is a trade-off: we want to be very quick here, so
+   # save all maps without fsync, and later call a global sync
+   # (which in turn might be very very slow)
+   local $USE_FSYNC = 0;
    cf::sync_job {
-      # this is a trade-off: we want to be very quick here, so
+      cf::write_runtime_sync; # external watchdog should not bark
-      # save all maps without fsync, and later call a global sync
-      # (which in turn might be very very slow)
-      local $USE_FSYNC = 0;
       # use a peculiar iteration method to avoid tripping on perl
       # refcount bugs in for. also avoids problems with players
       # and maps saved/destroyed asynchronously.
       info "emergency_perl_save: begin player save\n";
          delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
          $pl->save;
       }
       info "emergency_perl_save: end player save\n";
+      cf::write_runtime_sync; # external watchdog should not bark
       info "emergency_perl_save: begin map save\n";
       for my $path (keys %cf::MAP) {
          my $map = $cf::MAP{$path} or next;
          $map->valid or next;
          $map->save;
       }
       info "emergency_perl_save: end map save\n";
+      cf::write_runtime_sync; # external watchdog should not bark
       info "emergency_perl_save: begin database checkpoint\n";
       BDB::db_env_txn_checkpoint $DB_ENV;
       info "emergency_perl_save: end database checkpoint\n";
       info "emergency_perl_save: begin write uuid\n";
       write_uuid_sync 1;
       info "emergency_perl_save: end write uuid\n";
-   };
+      cf::write_runtime_sync; # external watchdog should not bark
+      trace "emergency_perl_save: syncing database to disk";
+      BDB::db_env_txn_checkpoint $DB_ENV;
-   info "emergency_perl_save: starting sync()\n";
+      info "emergency_perl_save: starting sync\n";
-   IO::AIO::aio_sync sub {
+      IO::AIO::aio_sync sub {
-      info "emergency_perl_save: finished sync()\n";
+         info "emergency_perl_save: finished sync\n";
+      };
+      cf::write_runtime_sync; # external watchdog should not bark
+      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
+      }
+      cf::write_runtime_sync; # external watchdog should not bark
    };
    info "emergency_perl_save: leave\n";
 }
 sub post_cleanup {
    my ($make_core) = @_;
+   IO::AIO::flush;
    error Carp::longmess "post_cleanup backtrace"
       if $make_core;
    my $fh = pidfile;
       info "reloading...";
       trace "entering sync_job";
       cf::sync_job {
-         cf::write_runtime_sync; # external watchdog should not bark
          cf::emergency_save;
-         cf::write_runtime_sync; # external watchdog should not bark
-         trace "syncing database to disk";
-         BDB::db_env_txn_checkpoint $DB_ENV;
-         # if anything goes wrong in here, we should simply crash as we already saved
-         trace "flushing outstanding aio requests";
-         while (IO::AIO::nreqs || BDB::nreqs) {
-            Coro::EV::timer_once 0.01; # let the sync_job do it's thing
-         }
          trace "cancelling all extension coros";
          $_->cancel for values %EXT_CORO;
          %EXT_CORO = ();
          reload_perl;
       };
    }
 };
-unshift @INC, $LIBDIR;
+#############################################################################
 my $bug_warning = 0;
 our @WAIT_FOR_TICK;
 our @WAIT_FOR_TICK_BEGIN;

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.532 by root, Thu Apr 29 07:32:34 2010 UTC vs. Revision 1.540 by root, Tue May 4 23:32:29 2010 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.532 by root, Thu Apr 29 07:32:34 2010 UTC vs.
Revision 1.540 by root, Tue May 4 23:32:29 2010 UTC