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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.537 by root, Sun May 2 19:16:16 2010 UTC vs.
Revision 1.549 by root, Tue May 11 13:19:59 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       = ();
 our $BDB_DEADLOCK_WATCHER;
 our $BDB_CHECKPOINT_WATCHER;
 our $BDB_TRICKLE_WATCHER;
 our $DB_ENV;
-our @EXTRA_MODULES = qw(pod match mapscript);
+our @EXTRA_MODULES = qw(pod match mapscript incloader);
 our %CFG;
 our $UPTIME; $UPTIME ||= time;
 our $RUNTIME;
 from wherever your confdir points to.
 =item cf::wait_for_tick, cf::wait_for_tick_begin
 These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
-returns directly I<after> the tick processing (and consequently, can only wake one process
+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.
+=cut
+sub wait_for_tick();
+sub wait_for_tick_begin();
 =item @cf::INVOKE_RESULTS
 This array contains the results of the last C<invoke ()> call. When
 C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
 our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
 sub encode_json($) { $json_coder->encode ($_[0]) }
 sub decode_json($) { $json_coder->decode ($_[0]) }
+=item $ref = cf::yaml_load $scalar
+Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
+=cut
+sub fork_call(&@);
+sub yaml_load($) {
+   fork_call { YAML::XS::Load $_[0] } @_
+}
 =item cf::post_init { BLOCK }
 Execute the given codeblock, I<after> all extensions have been (re-)loaded,
 but I<before> the server starts ticking again.
-The cdoeblock will have a single boolean argument to indicate whether this
+The codeblock will have a single boolean argument to indicate whether this
 is a reload or not.
 =cut
 sub post_init(&) {
    $EXT_CORO{$coro+0} = $coro;
    $coro
 }
-=item fork_call { }, $args
+=item fork_call { }, @args
 Executes the given code block with the given arguments in a seperate
 process, returning the results. Everything must be serialisable with
 Coro::Storable. May, of course, block. Note that the executed sub may
 never block itself or use any form of event handling.
 =cut
+sub post_fork {
+   reset_signals;
+}
 sub fork_call(&@) {
    my ($cb, @args) = @_;
    # we seemingly have to make a local copy of the whole thing,
    # otherwise perl prematurely frees the stuff :/
    # TODO: investigate and fix (likely this will be rather laborious)
    my @res = Coro::Util::fork_eval {
-      reset_signals;
+      cf::post_fork;
       &$cb
-   }, @args;
+   } @args;
    wantarray ? @res : $res[-1]
 }
 sub objinfo {
          $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 $name = $pl->ob->name;
    $pl->{deny_save} = 1;
    $pl->password ("*"); # this should lock out the player until we have nuked the dir
-   $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
+   $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
    $pl->deactivate;
    my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
-   $pl->invoke (cf::EVENT_PLAYER_QUIT);
+   $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
+   ext::highscore::check ($pl->ob);
    $pl->ns->destroy if $pl->ns;
    my $path = playerdir $pl;
    my $temp = "$path~$cf::RUNTIME~deleting~";
    aio_rename $path, $temp;
 sub register {
    my (undef, $regex, $prio) = @_;
    my $pkg = caller;
-   no strict;
    push @{"$pkg\::ISA"}, __PACKAGE__;
    $EXT_MAP{$pkg} = [$prio, qr<$regex>];
 }
 }
 sub normalise {
    my ($path, $base) = @_;
-   $path = "$path"; # make sure its a string
+   $path = "$path"; # make sure it's a string
    $path =~ s/\.map$//;
    # map plan:
    #
          $self->init; # pass $1 etc.
          return $self;
       }
    }
-   Carp::cluck "unable to resolve path '$path' (base '$base').";
+   Carp::cluck "unable to resolve path '$path' (base '$base')";
    ()
 }
 sub init {
    my ($self) = @_;
 }
 sub find;
 sub find {
    my ($path, $origin) = @_;
+   cf::cede_to_tick;
    $path = normalise $path, $origin && $origin->path;
    my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
    my $guard2 = cf::lock_acquire "map_find:$path";
                                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;
 }
    my $enc = JSON::XS->new->utf8->canonical->relaxed;
    trace "loading facedata from $path\n";
-   my $facedata;
-   0 < aio_load $path, $facedata
+   0 < aio_load $path, my $facedata
       or die "$path: $!";
    $facedata = Coro::Storable::thaw $facedata;
    $facedata->{version} == 2
 }
 sub reload_resources {
    trace "reloading resource files...\n";
+   reload_exp_table;
+   reload_materials;
    reload_facedata;
    reload_sound;
    reload_archetypes;
    reload_regions;
    reload_treasures;
 }
 sub reload_config {
    trace "reloading config file...\n";
-   open my $fh, "<:utf8", "$CONFDIR/config"
+   0 < aio_load "$CONFDIR/config", my $config
-      or return;
+      or die "$CONFDIR/config: $!";
-   local $/;
+   utf8::decode $config;
-   *CFG = YAML::XS::Load scalar <$fh>;
+   *CFG = yaml_load $config;
    $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
    $cf::map::MAX_RESET     = $CFG{map_max_reset}     if exists $CFG{map_max_reset};
    $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
          $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
             and die "WARNING: m(un)lockall failed: $!\n";
       };
       warn $@ if $@;
    }
-   trace "finished reloading resource files\n";
 }
 sub pidfile() {
    sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
       or die "$PIDFILE: $!";
 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 {
-      cf::init_experience;
+      cf::incloader::init ();
       cf::init_anim;
       cf::init_attackmess;
       cf::init_dynamic;
       cf::load_settings;
-      cf::load_materials;
       reload_resources;
       reload_config;
       db_init;
    };
    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 do_reload_perl() {
    # can/must only be called in main
-   if (in_main) {
+   unless (in_main) {
       error "can only reload from main coroutine";
       return;
    }
    return if $RELOAD++;
    my $t1 = AE::time;
    while ($RELOAD) {
+      cf::get_slot 0.1, -1, "reload_perl";
       info "reloading...";
       trace "entering sync_job";
       cf::sync_job {
-         cf::emergency_save;
+         #cf::emergency_save;
          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;
-sub wait_for_tick {
+sub wait_for_tick() {
    return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
    my $signal = new Coro::Signal;
    push @WAIT_FOR_TICK, $signal;
    $signal->wait;
 }
-sub wait_for_tick_begin {
+sub wait_for_tick_begin() {
    return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
    my $signal = new Coro::Signal;
    push @WAIT_FOR_TICK_BEGIN, $signal;
    $signal->wait;

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.537 by root, Sun May 2 19:16:16 2010 UTC vs. Revision 1.549 by root, Tue May 11 13:19:59 2010 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.537 by root, Sun May 2 19:16:16 2010 UTC vs.
Revision 1.549 by root, Tue May 11 13:19:59 2010 UTC