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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.417 by root, Fri Apr 11 14:09:57 2008 UTC vs.
Revision 1.423 by root, Sun Apr 20 00:44:13 2008 UTC

       }
    }
 };
 sub get_slot($;$$) {
+   return if tick_inhibit || $Coro::current == $Coro::main;
    my ($time, $pri, $name) = @_;
    $time = $TICK * .6 if $time > $TICK * .6;
    my $sig = new Coro::Signal;
    return if $pl->{deny_save};
    aio_mkdir playerdir $pl, 0770;
    $pl->{last_save} = $cf::RUNTIME;
+   cf::get_slot 0.01;
    $pl->save_pl ($path);
    cf::cede_to_tick;
 }
 our $MAX_RESET     = 3600;
 our $DEFAULT_RESET = 3000;
 sub generate_random_map {
    my ($self, $rmp) = @_;
+   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->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
 # the temporary/swap location
 sub save_path {
    my ($self) = @_;
-   (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
+   (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
    "$TMPDIR/$path.map"
 }
 # the unique path, undef == no special unique path
 sub uniq_path {
    my ($self) = @_;
-   (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
+   (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
    "$UNIQUEDIR/$path"
 }
 # and all this just because we cannot iterate over
 # all maps in C++...
       }
       $self->{last_save} = $cf::RUNTIME;
       $self->last_access ($cf::RUNTIME);
-      $self->in_memory (cf::MAP_IN_MEMORY);
+      $self->in_memory (cf::MAP_ACTIVE);
    }
    $self->post_load;
 }
    my ($path, $origin, $load) = @_;
    $path = normalise $path, $origin && $origin->{path};
    if (my $map = $cf::MAP{$path}) {
-      return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
+      return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
    }
    $MAP_PREFETCH{$path} |= $load;
    $MAP_PREFETCHER ||= cf::async {
    cf::async {
       $Coro::current->{desc} = "map player save";
       $_->contr->save for $self->players;
    };
+   cf::get_slot 0.02;
    if ($uniq) {
       $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
       $self->_save_objects ($uniq, cf::IO_UNIQUES);
    } else {
       $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
    $self->save;
    my $lock = cf::lock_acquire "map_data:$self->{path}";
    return if $self->players;
-   return if $self->in_memory != cf::MAP_IN_MEMORY;
+   return if $self->in_memory != cf::MAP_ACTIVE;
    return if $self->{deny_save};
    $self->in_memory (cf::MAP_SWAPPED);
    $self->deactivate;
 sub unique_maps() {
    [
       map {
          utf8::decode $_;
-         /\.map$/
+         s/\.map$//; # TODO future compatibility hack
+         /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
+            ? ()
-            ? normalise $_
+            : normalise $_
-            : ()
       } @{ aio_readdir $UNIQUEDIR or [] }
    ]
 }
 =back
 =over 4
 =item $ob->inv_recursive
-Returns the inventory of the object _and_ their inventories, recursively.
+Returns the inventory of the object I<and> their inventories, recursively,
+but I<not> the object itself.
 =cut
 sub inv_recursive_;
 sub inv_recursive_ {
    inv_recursive_ inv $_[0]
 }
 =item $ref = $ob->ref
-creates and returns a persistent reference to an objetc that can be stored as a string.
+Creates and returns a persistent reference to an object that can be stored as a string.
 =item $ob = cf::object::deref ($refstring)
 returns the objetc referenced by refstring. may return undef when it cnanot find the object,
 even if the object actually exists. May block.
       $rmp->{origin_y}   = $exit->y;
    }
    $rmp->{random_seed} ||= $exit->random_seed;
-   my $data = cf::encode_json $rmp;
+   my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
    my $md5 = Digest::MD5::md5_hex $data;
    my $meta = "$RANDOMDIR/$md5.meta";
    if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
       aio_write $fh, 0, (length $data), $data, 0;
    while (my ($k, $v) = each %$want) {
       $ns->fx_want ($k, $v);
    }
 };
+sub load_resource_file($) {
+   my $status = load_resource_file_ $_[0];
+   get_slot 0.1, 100;
+   cf::arch::commit_load;
+   $status
+}
 sub reload_regions {
    # HACK to clear player env face cache, we need some signal framework
    # for this (global event?)
    %ext::player_env::MUSIC_FACE_CACHE = ();
 }
 sub reload_archetypes {
    load_resource_file "$DATADIR/archetypes"
       or die "unable to load archetypes\n";
-   #d# NEED to laod twice to resolve forward references
-   # this really needs to be done in an extra post-pass
-   # (which needs to be synchronous, so solve it differently)
-   load_resource_file "$DATADIR/archetypes"
-      or die "unable to load archetypes\n";
 }
 sub reload_treasures {
    load_resource_file "$DATADIR/treasures"
       or die "unable to load treasurelists\n";
 }
 sub reload_resources {
    warn "reloading resource files...\n";
+   reload_facedata;
+   reload_archetypes;
    reload_regions;
-   reload_facedata;
-   #reload_archetypes;#d#
-   reload_archetypes;
    reload_treasures;
    warn "finished reloading resource files\n";
 }
 sub init {
+   my $guard = freeze_mainloop;
    reload_resources;
 }
 sub reload_config {
    open my $fh, "<:utf8", "$CONFDIR/config"
          $Coro::current->{desc} = "IDLE BUG HANDLER";
          EV::loop EV::LOOP_ONESHOT;
       })->prio (Coro::PRIO_MAX);
    };
+   {
+      my $guard = freeze_mainloop;
-   reload_config;
+      reload_config;
-   db_init;
+      db_init;
-   load_extensions;
+      load_extensions;
-   $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
+      $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
-   evthread_start IO::AIO::poll_fileno;
+      evthread_start IO::AIO::poll_fileno;
+   }
    EV::loop;
 }
 #############################################################################
 # initialisation and cleanup
 our @WAIT_FOR_TICK;
 our @WAIT_FOR_TICK_BEGIN;
 sub wait_for_tick {
-   return if tick_inhibit;
-   return if $Coro::current == $Coro::main;
+   return if tick_inhibit || $Coro::current == $Coro::main;
    my $signal = new Coro::Signal;
    push @WAIT_FOR_TICK, $signal;
    $signal->wait;
 }
 sub wait_for_tick_begin {
-   return if tick_inhibit;
-   return if $Coro::current == $Coro::main;
+   return 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.417 by root, Fri Apr 11 14:09:57 2008 UTC vs. Revision 1.423 by root, Sun Apr 20 00:44:13 2008 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.417 by root, Fri Apr 11 14:09:57 2008 UTC vs.
Revision 1.423 by root, Sun Apr 20 00:44:13 2008 UTC