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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.536 by root, Thu Apr 29 08:26:38 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
          $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>];
 }
                                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 post_cleanup {
    my ($make_core) = @_;
    IO::AIO::flush;
-   IO::AIO::flush;
    error Carp::longmess "post_cleanup backtrace"
       if $make_core;
    my $fh = pidfile;
    unlink $PIDFILE if <$fh> == $$;
          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.536 by root, Thu Apr 29 08:26:38 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.536 by root, Thu Apr 29 08:26:38 2010 UTC vs.
Revision 1.540 by root, Tue May 4 23:32:29 2010 UTC