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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.236 by root, Thu Apr 12 14:18:05 2007 UTC vs.
Revision 1.245 by root, Tue Apr 17 10:06:33 2007 UTC

 use Event;
 use Opcode;
 use Safe;
 use Safe::Hole;
-use Coro 3.52 ();
+use Coro 3.61 ();
 use Coro::State;
 use Coro::Event;
 use Coro::Timer;
 use Coro::Signal;
 use Coro::Semaphore;
 use Coro::AIO;
+use Coro::Storable;
 use BDB ();
 use Data::Dumper;
 use Digest::MD5;
 use Fcntl;
 use Time::HiRes;
 use Compress::LZF;
 # configure various modules to our taste
 #
+$Storable::canonical = 1; # reduce rsync transfers
 Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
 Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
 $Event::Eval = 1; # no idea why this is required, but it is
 our $RELOAD; # number of reloads so far
 our @EVENT;
 our $LIBDIR = datadir . "/ext";
-our $TICK = MAX_TIME * 1e-6;
+our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
 our $TICK_WATCHER;
 our $AIO_POLL_WATCHER;
 our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
 our $NEXT_TICK;
 our $NOW;
 our %MAP;    # all maps
 our $LINK_MAP; # the special {link} map, which is always available
 our $RANDOM_MAPS = cf::localdir . "/random";
 our $BDB_ENV_DIR = cf::localdir . "/db";
-our $WAIT_FOR_TICK;     $WAIT_FOR_TICK     ||= new Coro::Signal;
-our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
 # used to convert map paths into valid unix filenames by replacing / by ∕
 our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
 binmode STDOUT;
 binmode STDERR;
 =item %cf::CFG
 Configuration for the server, loaded from C</etc/crossfire/config>, or
 from wherever your confdir points to.
-=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE
+=item cf::wait_for_tick, cf::wait_for_tick_begin
-These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)
+These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
-or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick
+returns directly I<after> the tick processing (and consequently, can only wake one process
-processing has been done. Call C<< ->wait >> on them to maximise the
+per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
-window of cpu time available, or simply to synchronise to the server tick.
 =back
 =cut
    my ($self, $type, %msg) = @_;
    $self->ns->ext_event ($type, %msg);
 }
-package cf;
+=head3 cf::region
+=over 4
+=cut
+package cf::region;
+=item cf::region::find_by_path $path
+Tries to decuce the probable region for a map knowing only its path.
+=cut
+sub find_by_path($) {
+   my ($path) = @_;
+   my ($match, $specificity);
+   for my $region (list) {
+      if ($region->match && $path =~ $region->match) {
+         ($match, $specificity) = ($region, $region->specificity)
+            if $region->specificity > $specificity;
+      }
+   }
+   $match
+}
 =back
 =head3 cf::map
 =over 4
       $self->load_header_orig
          or return;
       $self->prepare_orig;
    }
+   $self->default_region (cf::region::find_by_path $self->{path})
+      unless $self->default_region;
    1
 }
 sub find;
 sub find {
    $self->in_memory (cf::MAP_LOADING);
    $self->alloc;
    $self->pre_load;
+   Coro::cede;
    $self->_load_objects ($self->{load_path}, 1)
       or return;
    $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
          $self->_load_objects ($uniq, 0);
       }
    }
    Coro::cede;
    # now do the right thing for maps
    $self->link_multipart_objects;
+   Coro::cede;
    unless ($self->{deny_activate}) {
       $self->decay_objects;
       $self->fix_auto_apply;
       $self->update_buttons;
       $self->set_darkness_map;
       $self->difficulty ($self->estimate_difficulty)
          unless $self->difficulty;
       Coro::cede;
       $self->activate;
+      Coro::cede;
    }
    $self->post_load;
+   Coro::cede;
    $self->in_memory (cf::MAP_IN_MEMORY);
 }
 sub customise_for {
    my $facedata;
    0 < aio_load $path, $facedata
       or die "$path: $!";
-   Coro::cede;
-   $facedata = Storable::thaw $facedata;
+   $facedata = Coro::Storable::thaw $facedata;
-   Coro::cede;
    $facedata->{version} == 2
       or cf::cleanup "$path: version mismatch, cannot proceed.";
    {
    }
    1
 }
+sub load_archetypes {
+   load_archetype_file sprintf "%s/archetypes", cf::datadir; # remove when stable
+   load_archetype_file sprintf "%s/archetypes", cf::datadir
+}
+sub load_treasures {
+   load_treasure_file sprintf "%s/treasures", cf::datadir
+}
 sub reload_resources {
+   warn "reloading resource files...\n";
    load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
-      or die "unable to load regions file\n";#d#
+      or die "unable to load regions file\n";
    load_facedata
-      or die "unable to load facedata\n";#d#
+      or die "unable to load facedata\n";
+   load_archetypes
+      or die "unable to load archetypes\n";
+   load_treasures
+      or die "unable to load treasurelists\n";
+   warn "finished reloading resource files\n";
 }
 sub init {
    reload_resources;
 }
 unshift @INC, $LIBDIR;
 my $bug_warning = 0;
+our @WAIT_FOR_TICK;
+our @WAIT_FOR_TICK_BEGIN;
+sub wait_for_tick {
+   return unless $TICK_WATCHER->is_active;
+   return if $Coro::current == $Coro::main;
+   my $signal = new Coro::Signal;
+   push @WAIT_FOR_TICK, $signal;
+   $signal->wait;
+}
+sub wait_for_tick_begin {
+   return unless $TICK_WATCHER->is_active;
+   return if $Coro::current == $Coro::main;
+   my $signal = new Coro::Signal;
+   push @WAIT_FOR_TICK_BEGIN, $signal;
+   $signal->wait;
+}
 $TICK_WATCHER = Event->timer (
    reentrant => 0,
    parked    => 1,
    prio      => 0,
    at        => $NEXT_TICK || $TICK,
       }
       $NOW = Event::time;
       cf::server_tick; # one server iteration
       $RUNTIME   += $TICK;
       $NEXT_TICK += $TICK;
       if ($NOW >= $NEXT_RUNTIME_WRITE) {
          $NEXT_RUNTIME_WRITE = $NOW + 10;
             write_runtime
                or warn "ERROR: unable to write runtime file: $!";
          };
       }
-      $WAIT_FOR_TICK->broadcast;
-      $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
 #      my $AFTER = Event::time;
 #      warn $AFTER - $NOW;#d#
       # if we are delayed by four ticks or more, skip them all
       $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
       $TICK_WATCHER->at ($NEXT_TICK);
       $TICK_WATCHER->start;
+      if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
+         $sig->send;
+      }
+      while (my $sig = shift @WAIT_FOR_TICK) {
+         $sig->send;
+      }
+      _post_tick;
    },
 );
 {
    BDB::max_poll_time $TICK * 0.1;

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.236 by root, Thu Apr 12 14:18:05 2007 UTC vs. Revision 1.245 by root, Tue Apr 17 10:06:33 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.236 by root, Thu Apr 12 14:18:05 2007 UTC vs.
Revision 1.245 by root, Tue Apr 17 10:06:33 2007 UTC