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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.530 by root, Wed Apr 28 21:05:33 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
 =back
 =cut
+sub error(@) { LOG llevError, join "", @_ }
+sub warn (@) { LOG llevWarn , join "", @_ }
+sub info (@) { LOG llevInfo , join "", @_ }
+sub debug(@) { LOG llevDebug, join "", @_ }
+sub trace(@) { LOG llevTrace, join "", @_ }
 $Coro::State::WARNHOOK = sub {
    my $msg = join "", @_;
    $msg .= "\n"
       unless $msg =~ /\n$/;
    $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
-   LOG llevError, $msg;
+   LOG llevWarn, $msg;
 };
 $Coro::State::DIEHOOK = sub {
    return unless $^S eq 0; # "eq", not "=="
-   warn Carp::longmess $_[0];
+   error Carp::longmess $_[0];
    if (in_main) {#d#
-      warn "DIEHOOK called in main context, Coro bug?\n";#d#
+      error "DIEHOOK called in main context, Coro bug?\n";#d#
       return;#d#
    }#d#
    # kill coroutine otherwise
    Coro::terminate
 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(&) {
 =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;
       (async {
          $Coro::current->desc ("sync job coro");
          @res = eval { $job->() };
-         warn $@ if $@;
+         error $@ if $@;
          undef $busy;
       })->prio (Coro::PRIO_MAX);
       while ($busy) {
          if (Coro::nready) {
    $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 {
 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 { };
       my $t1 = Time::HiRes::time;
       my $data = $process->(\@data);
       my $t2 = Time::HiRes::time;
-      warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
+      info "cache: '$id' processed in ", $t2 - $t1, "s\n";
       db_put cache => "$id/data", $data;
       db_put cache => "$id/md5" , $md5;
       db_put cache => "$id/meta", $meta;
 =cut
 sub datalog($@) {
   my ($type, %kv) = @_;
-  warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
+  info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
 }
 =back
 =cut
       } elsif (exists $cb_id{$type}) {
          _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
       } elsif (ref $type) {
-         warn "attaching objects not supported, ignoring.\n";
+         error "attaching objects not supported, ignoring.\n";
       } else {
          shift @arg;
-         warn "attach argument '$type' not supported, ignoring.\n";
+         error "attach argument '$type' not supported, ignoring.\n";
       }
    }
 }
 sub _object_attach {
          _attach $registry, $klass, @attach;
       }
       $obj->{$name} = \%arg;
    } else {
-      warn "object uses attachment '$name' which is not available, postponing.\n";
+      info "object uses attachment '$name' which is not available, postponing.\n";
    }
    $obj->{_attachment}{$name} = undef;
 }
    for (@$callbacks) {
       eval { &{$_->[1]} };
       if ($@) {
-         warn "$@";
-         warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
+         error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
          override;
       }
       return 1 if $override;
    }
          for (@$attach) {
             my ($klass, @attach) = @$_;
             _attach $registry, $klass, @attach;
          }
       } else {
-         warn "object uses attachment '$name' that is not available, postponing.\n";
+         info "object uses attachment '$name' that is not available, postponing.\n";
       }
    }
 }
 cf::attachable->attach (
    my ($filename, $rdata, $objs) = @_;
    sync_job {
       if (length $$rdata) {
          utf8::decode (my $decname = $filename);
-         warn sprintf "saving %s (%d,%d)\n",
+         trace sprintf "saving %s (%d,%d)\n",
-                      $decname, length $$rdata, scalar @$objs
+                       $decname, length $$rdata, scalar @$objs
             if $VERBOSE_IO;
          if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
             aio_chmod $fh, SAVE_MODE;
             aio_write $fh, 0, (length $$rdata), $$rdata, 0;
             aio_rename "$filename~", $filename;
             $filename =~ s%/[^/]+$%%;
             aio_pathsync $filename if $cf::USE_FSYNC;
          } else {
-            warn "unable to save objects: $filename~: $!\n";
+            error "unable to save objects: $filename~: $!\n";
          }
       } else {
          aio_unlink $filename;
          aio_unlink "$filename.pst";
       }
       my $st = eval { Coro::Storable::thaw $av };
       $av = $st->{objs};
    }
    utf8::decode (my $decname = $filename);
-   warn sprintf "loading %s (%d,%d)\n",
+   trace sprintf "loading %s (%d,%d)\n",
-                $decname, length $data, scalar @{$av || []}
+                 $decname, length $data, scalar @{$av || []}
       if $VERBOSE_IO;
    ($data, $av)
 }
          $pl->ext_reply ($reply, @reply)
             if $reply;
       } else {
-         warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
+         error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
       }
       cf::override;
    },
 );
    $grp
 }
 sub load_extensions {
+   info "loading extensions...";
    cf::sync_job {
       my %todo;
       for my $path (<$LIBDIR/*.ext>) {
          next unless -r $path;
          $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;
             for (split /,\s*/, $v->{meta}{depends}) {
                next ext
                   unless exists $done{$_};
             }
-            warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
+            trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
             my $active = eval $v->{source};
             if (length $@) {
-               warn "$v->{path}: $@\n";
+               error "$v->{path}: $@\n";
                cf::cleanup "mandatory extension '$k' failed to load, exiting."
                   if exists $v->{meta}{mandatory};
                warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
             } else {
                $done{$k} = delete $todo{$k};
                push @EXTS, $v->{pkg};
                $progress = 1;
-               warn "$v->{base}: extension inactive.\n"
+               info "$v->{base}: extension inactive.\n"
                   unless $active;
             }
          }
          unless ($progress) {
    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";
 }
 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;
    my $lock = cf::lock_acquire "map_data:$self->{path}";
    return if $self->players;
-   warn "resetting map ", $self->path, "\n";
+   cf::trace "resetting map ", $self->path, "\n";
    $self->in_memory (cf::MAP_SWAPPED);
    # need to save uniques path
    unless ($self->{deny_save}) {
 sub cf::object::player::goto {
    my ($self, $path, $x, $y, $check, $done) = @_;
    if ($self->{_link_recursion} >= $MAX_LINKS) {
-      warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
+      error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
       $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
       ($path, $x, $y) = @$EMERGENCY_POSITION;
    }
    # do generation counting so two concurrent goto's will be executed in-order
          $self->message ("Something went wrong deep within the deliantra server. "
                        . "I'll try to bring you back to the map you were before. "
                        . "Please report this to the dungeon master!",
                          cf::NDI_UNIQUE | cf::NDI_RED);
-         warn "ERROR in enter_exit: $@";
+         error "ERROR in enter_exit: $@";
          $self->leave_link;
       }
    })->prio (1);
 }
          $ns->ext_reply ($reply, @reply)
             if $reply;
       } else {
-         warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
+         error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
       }
       cf::override;
    },
 );
                                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;
 }
       local @cf::_safe_eval_args = values %vars;
       @res = wantarray ? eval eval : scalar eval $eval;
    }
    if ($@) {
-      warn "$@";
+      warn "$@",
-      warn "while executing safe code '$code'\n";
+           "while executing safe code '$code'\n",
-      warn "with arguments " . (join " ", %vars) . "\n";
+           "with arguments " . (join " ", %vars) . "\n";
    }
    wantarray ? @res : $res[0]
 }
    # for this (global event?)
    %ext::player_env::MUSIC_FACE_CACHE = ();
    my $enc = JSON::XS->new->utf8->canonical->relaxed;
-   warn "loading facedata from $path\n";
+   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
          if (my $smooth = cf::face::find $info->{smooth}) {
             cf::face::set_smooth      $idx, $smooth;
             cf::face::set_smoothlevel $idx, $info->{smoothlevel};
          } else {
-            warn "smooth face '$info->{smooth}' not found for face '$face'";
+            error "smooth face '$info->{smooth}' not found for face '$face'";
          }
          cf::cede_to_tick;
       }
    }
    load_resource_file "$DATADIR/treasures"
       or die "unable to load treasurelists\n";
 }
 sub reload_sound {
+   trace "loading sound config from $DATADIR/sound\n";
    0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
       or die "$DATADIR/sound $!";
    my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
       cf::sound::set $k => $face;
    }
 }
 sub reload_resources {
-   warn "reloading resource files...\n";
+   trace "reloading resource files...\n";
+   reload_exp_table;
+   reload_materials;
    reload_facedata;
    reload_sound;
    reload_archetypes;
    reload_regions;
    reload_treasures;
-   warn "finished reloading resource files\n";
+   trace "finished reloading resource files\n";
 }
 sub reload_config {
-   warn "reloading config file...\n";
+   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 $@;
    }
-   warn "finished reloading resource files\n";
 }
 sub pidfile() {
    sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
       or die "$PIDFILE: $!";
    seek $fh, 0, 0;
    print $fh $$;
 }
 sub main_loop {
-   warn "EV::loop starting\n";
+   trace "EV::loop starting\n";
    if (1) {
       EV::loop;
    }
-   warn "EV::loop returned\n";
+   trace "EV::loop returned\n";
    goto &main_loop unless $REALLY_UNLOOP;
 }
 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;
       (pop @POST_INIT)->(0) while @POST_INIT;
    };
    cf::object::thawer::errors_are_fatal 0;
-   warn "parse errors in files are no longer fatal from this point on.\n";
+   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
       or return;
    aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
       and return;
-   warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
+   trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
    1
 }
 our $uuid_lock;
       or return;
    my $value = uuid_seq uuid_cur;
    unless ($value) {
-      warn "cowardly refusing to write zero uuid value!\n";
+      info "cowardly refusing to write zero uuid value!\n";
       return;
    }
    my $value = uuid_str $value + $uuid_skip;
    $uuid_skip = 0;
       or return;
    aio_rename "$uuid~", $uuid
       and return;
-   warn "uuid file written ($value).\n";
+   trace "uuid file written ($value).\n";
    1
 }
 }
 sub emergency_save() {
    my $freeze_guard = cf::freeze_mainloop;
-   warn "emergency_perl_save: enter\n";
+   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.
-      warn "emergency_perl_save: begin player save\n";
+      info "emergency_perl_save: begin player save\n";
       for my $login (keys %cf::PLAYER) {
          my $pl = $cf::PLAYER{$login} or next;
          $pl->valid or next;
          delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
          $pl->save;
       }
-      warn "emergency_perl_save: end player save\n";
+      info "emergency_perl_save: end player save\n";
+      cf::write_runtime_sync; # external watchdog should not bark
-      warn "emergency_perl_save: begin map save\n";
+      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;
       }
-      warn "emergency_perl_save: end map save\n";
+      info "emergency_perl_save: end map save\n";
+      cf::write_runtime_sync; # external watchdog should not bark
-      warn "emergency_perl_save: begin database checkpoint\n";
+      info "emergency_perl_save: begin database checkpoint\n";
       BDB::db_env_txn_checkpoint $DB_ENV;
-      warn "emergency_perl_save: end database checkpoint\n";
+      info "emergency_perl_save: end database checkpoint\n";
-      warn "emergency_perl_save: begin write uuid\n";
+      info "emergency_perl_save: begin write uuid\n";
       write_uuid_sync 1;
-      warn "emergency_perl_save: end write uuid\n";
+      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";
+      IO::AIO::aio_sync sub {
+         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
    };
-   warn "emergency_perl_save: starting sync()\n";
-   IO::AIO::aio_sync sub {
-      warn "emergency_perl_save: finished sync()\n";
-   };
-   warn "emergency_perl_save: leave\n";
+   info "emergency_perl_save: leave\n";
 }
 sub post_cleanup {
    my ($make_core) = @_;
+   IO::AIO::flush;
-   warn Carp::longmess "post_cleanup backtrace"
+   error Carp::longmess "post_cleanup backtrace"
       if $make_core;
    my $fh = pidfile;
    unlink $PIDFILE if <$fh> == $$;
 }
    }
 }
 sub do_reload_perl() {
    # can/must only be called in main
-   if (in_main) {
+   unless (in_main) {
-      warn "can only reload from main coroutine";
+      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";
-      warn "reloading...";
+      info "reloading...";
-      warn "entering sync_job";
+      trace "entering sync_job";
       cf::sync_job {
-         cf::write_runtime_sync; # external watchdog should not bark
-         cf::emergency_save;
+         #cf::emergency_save;
-         cf::write_runtime_sync; # external watchdog should not bark
-         warn "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
-         warn "flushing outstanding aio requests";
-         while (IO::AIO::nreqs || BDB::nreqs) {
-            Coro::EV::timer_once 0.01; # let the sync_job do it's thing
-         }
-         warn "cancelling all extension coros";
+         trace "cancelling all extension coros";
          $_->cancel for values %EXT_CORO;
          %EXT_CORO = ();
-         warn "removing commands";
+         trace "removing commands";
          %COMMAND = ();
-         warn "removing ext/exti commands";
+         trace "removing ext/exti commands";
          %EXTCMD  = ();
          %EXTICMD = ();
-         warn "unloading/nuking all extensions";
+         trace "unloading/nuking all extensions";
          for my $pkg (@EXTS) {
-            warn "... unloading $pkg";
+            trace "... unloading $pkg";
             if (my $cb = $pkg->can ("unload")) {
                eval {
                   $cb->($pkg);
                   1
-               } or warn "$pkg unloaded, but with errors: $@";
+               } or error "$pkg unloaded, but with errors: $@";
             }
-            warn "... clearing $pkg";
+            trace "... clearing $pkg";
             clear_package $pkg;
          }
-         warn "unloading all perl modules loaded from $LIBDIR";
+         trace "unloading all perl modules loaded from $LIBDIR";
          while (my ($k, $v) = each %INC) {
             next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
-            warn "... unloading $k";
+            trace "... unloading $k";
             delete $INC{$k};
             $k =~ s/\.pm$//;
             $k =~ s/\//::/g;
             }
             clear_package $k;
          }
-         warn "getting rid of safe::, as good as possible";
+         trace "getting rid of safe::, as good as possible";
          clear_package "safe::$_"
             for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
-         warn "unloading cf.pm \"a bit\"";
+         trace "unloading cf.pm \"a bit\"";
          delete $INC{"cf.pm"};
          delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
          # don't, removes xs symbols, too,
          # and global variables created in xs
          #clear_package __PACKAGE__;
-         warn "unload completed, starting to reload now";
+         info "unload completed, starting to reload now";
-         warn "reloading cf.pm";
+         trace "reloading cf.pm";
          require cf;
          cf::_connect_to_perl_1;
-         warn "loading config and database again";
+         trace "loading config and database again";
          cf::reload_config;
-         warn "loading extensions";
+         trace "loading extensions";
          cf::load_extensions;
          if ($REATTACH_ON_RELOAD) {
-            warn "reattaching attachments to objects/players";
+            trace "reattaching attachments to objects/players";
             _global_reattach; # objects, sockets
-            warn "reattaching attachments to maps";
+            trace "reattaching attachments to maps";
             reattach $_ for values %MAP;
-            warn "reattaching attachments to players";
+            trace "reattaching attachments to players";
             reattach $_ for values %PLAYER;
          }
-         warn "running post_init jobs";
+         trace "running post_init jobs";
          (pop @POST_INIT)->(1) while @POST_INIT;
-         warn "leaving sync_job";
+         trace "leaving sync_job";
          1
       } or do {
-         warn $@;
+         error $@;
          cf::cleanup "error while reloading, exiting.";
       };
-      warn "reloaded";
+      info "reloaded";
       --$RELOAD;
    }
    $t1 = AE::time - $t1;
-   warn "reload completed in ${t1}s\n";
+   info "reload completed in ${t1}s\n";
 };
 our $RELOAD_WATCHER; # used only during reload
 sub reload_perl() {
          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;
    if ($NOW >= $NEXT_RUNTIME_WRITE) {
       $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
       Coro::async_pool {
          $Coro::current->{desc} = "runtime saver";
          write_runtime_sync
-            or warn "ERROR: unable to write runtime file: $!";
+            or error "ERROR: unable to write runtime file: $!";
       };
    }
    if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
       $sig->send;
    if (0) {
       if ($NEXT_TICK) {
          my $jitter = $TICK_START - $NEXT_TICK;
          $JITTER = $JITTER * 0.75 + $jitter * 0.25;
-         warn "jitter $JITTER\n";#d#
+         debug "jitter $JITTER\n";#d#
       }
    }
 }
 {

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.530 by root, Wed Apr 28 21:05:33 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.530 by root, Wed Apr 28 21:05:33 2010 UTC vs.
Revision 1.549 by root, Tue May 11 13:19:59 2010 UTC