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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.507 by root, Sat Mar 20 02:24:38 2010 UTC vs.
Revision 1.519 by root, Fri Apr 16 02:32:25 2010 UTC

 our $PIDFILE     = "$LOCALDIR/pid";
 our $RUNTIMEFILE = "$LOCALDIR/runtime";
 our %RESOURCE;
+our $OUTPUT_RATE_MIN =   4000;
+our $OUTPUT_RATE_MAX = 100000;
 our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
 our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
 our $NEXT_TICK;
 our $USE_FSYNC = 1; # use fsync to write maps - default on
 }
 =item cf::periodic $interval, $cb
 Like EV::periodic, but randomly selects a starting point so that the actions
-get spread over timer.
+get spread over time.
 =cut
 sub periodic($$) {
    my ($interval, $cb) = @_;
 sub sync_job(&) {
    my ($job) = @_;
    if ($Coro::current == $Coro::main) {
-      my $time = EV::time;
+      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#
          } else {
             EV::loop EV::LOOP_ONESHOT;
          }
       }
-      my $time = EV::time - $time;
+      my $time = AE::time - $time;
       $TICK_START += $time; # do not account sync jobs to server load
       wantarray ? @res : $res[0]
    } else {
       reset_signals;
       &$cb
    }, @args;
    wantarray ? @res : $res[-1]
+}
+sub objinfo {
+   (
+      "counter value"     => cf::object::object_count,
+      "objects created"   => cf::object::create_count,
+      "objects destroyed" => cf::object::destroy_count,
+      "freelist size"     => cf::object::free_count,
+      "allocated objects" => cf::object::objects_size,
+      "active objects"    => cf::object::actives_size,
+   )
 }
 =item $coin = coin_from_name $name
 =cut
 }
 use File::Glob ();
 cf::player->attach (
-   on_command => sub {
+   on_unknown_command => sub {
       my ($pl, $name, $params) = @_;
       my $cb = $COMMAND{$name}
          or return;
          $cf::PLAYER{$login} = $pl
       }
    }
 }
+cf::player->attach (
+   on_load => sub {
+      my ($pl, $path) = @_;
+      # restore slots saved in save, below
+      my $slots = delete $pl->{_slots};
+      $pl->ob->current_weapon ($slots->[0]);
+      $pl->combat_ob          ($slots->[1]);
+      $pl->ranged_ob          ($slots->[2]);
+   },
+);
 sub save($) {
    my ($pl) = @_;
    return if $pl->{deny_save};
    aio_mkdir playerdir $pl, 0770;
    $pl->{last_save} = $cf::RUNTIME;
    cf::get_slot 0.01;
+   # save slots, to be restored later
+   local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
    $pl->save_pl ($path);
    cf::cede_to_tick;
 }
    my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
    # mit "rum" bekleckern, nicht
    $self->_create_random_map (
       $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
-      $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
+      $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
       $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
       $rmp->{exit_on_final_map},
       $rmp->{xsize}, $rmp->{ysize},
       $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
       $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
    $MAP_PREFETCHER->prio (6);
    ()
 }
+# common code, used by both ->save and ->swapout
-sub save {
+sub _save {
    my ($self) = @_;
-   my $lock = cf::lock_acquire "map_data:$self->{path}";
    $self->{last_save} = $cf::RUNTIME;
    return unless $self->dirty;
    } else {
       $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
    }
 }
+sub save {
+   my ($self) = @_;
+   my $lock = cf::lock_acquire "map_data:$self->{path}";
+   $self->_save;
+}
 sub swap_out {
    my ($self) = @_;
-   # save first because save cedes
-   $self->save;
    my $lock = cf::lock_acquire "map_data:$self->{path}";
-   return if $self->players;
    return if $self->in_memory != cf::MAP_ACTIVE;
    return if $self->{deny_save};
+   return if $self->players;
-   $self->in_memory (cf::MAP_SWAPPED);
+   # first deactivate the map and "unlink" it from the core
    $self->deactivate;
    $_->clear_links_to ($self) for values %cf::MAP;
+   $self->in_memory (cf::MAP_SWAPPED);
+   # then atomically save
+   $self->_save;
+   # then free the map
    $self->clear;
 }
 sub reset_at {
    my ($self) = @_;
    return if UNIVERSAL::isa $self->map, "ext::map_link";
    $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
       if $self->map && $self->map->{path} ne "{link}";
-   $self->enter_map ($LINK_MAP || link_map, 10, 10);
+   $self->enter_map ($LINK_MAP || link_map, 3, 3);
 }
 sub cf::object::player::leave_link {
    my ($self, $map, $x, $y) = @_;
    $coro
 }
 cf::client->attach (
-   on_destroy => sub {
+   on_client_destroy => sub {
       my ($ns) = @_;
       $_->cancel for values %{ (delete $ns->{_coro}) || {} };
    },
 );
    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) 1994 Mark Wedel.";
    LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
-   cf::init_experience;
-   cf::init_anim;
-   cf::init_attackmess;
-   cf::init_dynamic;
    $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
    # we must not ever block the main coroutine
    local $Coro::idle = sub {
       Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
    };
    evthread_start IO::AIO::poll_fileno;
    cf::sync_job {
+      cf::init_experience;
+      cf::init_anim;
+      cf::init_attackmess;
+      cf::init_dynamic;
       cf::load_settings;
       cf::load_materials;
       reload_resources;
       reload_config;
       db_init;
       cf::init_uuid;
       cf::init_signals;
-      cf::init_commands;
       cf::init_skills;
       cf::init_beforeplay;
       atomic;
       use POSIX ();
       POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
       (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";
    main_loop;
 }
 #############################################################################
 # install some emergency cleanup handlers
 BEGIN {
    our %SIGWATCHER = ();
    for my $signal (qw(INT HUP TERM)) {
-      $SIGWATCHER{$signal} = EV::signal $signal, sub {
+      $SIGWATCHER{$signal} = AE::signal $signal, sub {
          cf::cleanup "SIG$signal";
       };
    }
 }
 sub write_runtime_sync {
-   my $t0 = EV::time;
+   my $t0 = AE::time;
    # first touch the runtime file to show we are still running:
    # the fsync below can take a very very long time.
    IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
       or return;
    aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
       and return;
-   warn sprintf "runtime file written (%gs).\n", EV::time - $t0;
+   warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
    1
 }
 our $uuid_lock;
       return;
    }
    return if $RELOAD++;
-   my $t1 = EV::time;
+   my $t1 = AE::time;
    while ($RELOAD) {
       warn "reloading...";
       warn "entering sync_job";
       warn "reloaded";
       --$RELOAD;
    }
-   $t1 = EV::time - $t1;
+   $t1 = AE::time - $t1;
    warn "reload completed in ${t1}s\n";
 };
 our $RELOAD_WATCHER; # used only during reload
    # coro crashes during coro_state_free->destroy here.
    $RELOAD_WATCHER ||= cf::async {
       Coro::AIO::aio_wait cache_extensions;
-      $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
+      $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
          do_reload_perl;
          undef $RELOAD_WATCHER;
       };
    };
 }
       return;
    }
    cf::server_tick; # one server iteration
-   #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#
+   #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
    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";

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.507 by root, Sat Mar 20 02:24:38 2010 UTC vs. Revision 1.519 by root, Fri Apr 16 02:32:25 2010 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.507 by root, Sat Mar 20 02:24:38 2010 UTC vs.
Revision 1.519 by root, Fri Apr 16 02:32:25 2010 UTC