--- deliantra/server/lib/cf.pm	2010/05/04 22:49:21	1.539
+++ deliantra/server/lib/cf.pm	2011/04/30 05:41:17	1.565
@@ -1,7 +1,7 @@
 #
 # This file is part of Deliantra, the Roguelike Realtime MMORPG.
 # 
-# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+# Copyright (©) 2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
 # 
 # Deliantra is free software: you can redistribute it and/or modify it under
 # the terms of the Affero GNU General Public License as published by the
@@ -78,6 +78,8 @@
 
 sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
 
+our @ORIG_INC;
+
 our %COMMAND      = ();
 our %COMMAND_TIME = ();
 
@@ -93,10 +95,12 @@
 our %REFLECT; # set by us
 
 our $CONFDIR     = confdir;
+
 our $DATADIR     = datadir;
 our $LIBDIR      = "$DATADIR/ext";
 our $PODDIR      = "$DATADIR/pod";
 our $MAPDIR      = "$DATADIR/" . mapdir;
+
 our $LOCALDIR    = localdir;
 our $TMPDIR      = "$LOCALDIR/" . tmpdir;
 our $UNIQUEDIR   = "$LOCALDIR/" . uniquedir;
@@ -124,7 +128,7 @@
 our $BDB_TRICKLE_WATCHER;
 our $DB_ENV;
 
-our @EXTRA_MODULES = qw(pod match mapscript);
+our @EXTRA_MODULES = qw(pod match mapscript incloader);
 
 our %CFG;
 
@@ -233,9 +237,14 @@
 =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
@@ -310,6 +319,11 @@
 
 #############################################################################
 
+sub fork_call(&@);
+sub get_slot($;$$);
+
+#############################################################################
+
 =head2 UTILITY FUNCTIONS
 
 =over 4
@@ -337,6 +351,20 @@
    } || "[unable to dump $_[0]: '$@']";
 }
 
+=item $scalar = load_file $path
+
+Loads the given file from path and returns its contents. Croaks on error
+and can block.
+
+=cut
+
+sub load_file($) {
+   0 <= aio_load $_[0], my $data
+      or Carp::croak "$_[0]: $!";
+
+   $data
+}
+
 =item $ref = cf::decode_json $json
 
 Converts a JSON string into the corresponding perl data structure.
@@ -352,12 +380,43 @@
 sub encode_json($) { $json_coder->encode ($_[0]) }
 sub decode_json($) { $json_coder->decode ($_[0]) }
 
+=item $ref = cf::decode_storable $scalar
+
+Same as Coro::Storable::thaw, so blocks.
+
+=cut
+
+BEGIN { *decode_storable = \&Coro::Storable::thaw }
+
+=item $ref = cf::decode_yaml $scalar
+
+Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
+
+=cut
+
+sub decode_yaml($) {
+   fork_call { YAML::XS::Load $_[0] } @_
+}
+
+=item $scalar = cf::unlzf $scalar
+
+Same as Compress::LZF::compress, but takes server ticks into account, so
+blocks.
+
+=cut
+
+sub unlzf($) {
+   # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
+   cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
+   Compress::LZF::decompress $_[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
@@ -366,6 +425,23 @@
    push @POST_INIT, shift;
 }
 
+sub _post_init {
+   trace "running post_init jobs";
+
+   # run them in parallel...
+
+   my @join;
+
+   while () {
+      push @join, map &Coro::async ($_, 0), @POST_INIT;
+      @POST_INIT = ();
+
+      @join or last;
+
+      (pop @join)->join;
+   }
+}
+
 =item cf::lock_wait $string
 
 Wait until the given lock is available. See cf::lock_acquire. 
@@ -426,9 +502,13 @@
 
 =item cf::get_slot $time[, $priority[, $name]]
 
-Allocate $time seconds of blocking CPU time at priority C<$priority>:
-This call blocks and returns only when you have at least C<$time> seconds
-of cpu time till the next tick. The slot is only valid till the next cede.
+Allocate $time seconds of blocking CPU time at priority C<$priority>
+(default: 0):  This call blocks and returns only when you have at least
+C<$time> seconds of cpu time till the next tick. The slot is only valid
+till the next cede.
+
+Background jobs should use a priority les than zero, interactive jobs
+should use 100 or more.
 
 The optional C<$name> can be used to identify the job to run. It might be
 used for statistical purposes and should identify the same time-class.
@@ -578,7 +658,7 @@
    $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
@@ -587,6 +667,10 @@
 
 =cut
 
+sub post_fork {
+   reset_signals;
+}
+
 sub fork_call(&@) {
    my ($cb, @args) = @_;
 
@@ -595,9 +679,9 @@
    # 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]
 }
@@ -729,8 +813,7 @@
       my $md5;
 
       for (0 .. $#$src) {
-         0 <= aio_load $src->[$_], $data[$_]
-            or Carp::croak "$src->[$_]: $!";
+         $data[$_] = load_file $src->[$_];
       }
 
       # if processing is expensive, check
@@ -1451,7 +1534,6 @@
 
             if (length $@) {
                error "$v->{path}: $@\n";
-               undef $@; # work around perl 5.10.0 utf-8 caching bug
 
                cf::cleanup "mandatory extension '$k' failed to load, exiting."
                   if exists $v->{meta}{mandatory};
@@ -1475,6 +1557,8 @@
                cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
                   if exists $v->{meta}{mandatory};
             }
+
+            last;
          }
       }
    };
@@ -1642,10 +1726,13 @@
    $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;
@@ -1821,20 +1908,7 @@
 
    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->{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},
-      $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
-      $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
-      $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
-      (cf::region::find $rmp->{region}), $rmp->{custom}
-   )
+   $self->_create_random_map ($rmp);
 }
 
 =item cf::map->register ($regex, $prio)
@@ -1870,7 +1944,7 @@
 sub normalise {
    my ($path, $base) = @_;
 
-   $path = "$path"; # make sure its a string
+   $path = "$path"; # make sure it's a string
 
    $path =~ s/\.map$//;
 
@@ -1882,6 +1956,7 @@
    # ?random/... random maps
    # /...        normal maps
    # ~user/...   per-player map of a specific user
+   # !up !down   for quad maps, or other maps with up/down layers
 
    $path =~ s/$PATH_SEP/\//go;
 
@@ -1892,10 +1967,23 @@
 
       $base =~ s{[^/]+/?$}{};
       $path = "$base/$path";
+
+   } elsif ($path eq '!up') {
+      $base && ref $base
+         or Carp::carp "normalise called with relative tile path and no base: '$path'";
+
+      my $uppth = $base->tile_path (cf::TILE_UP);
+      $path = $uppth if $uppth;
+
+   } elsif ($path eq '!down') {
+      $base && ref $base
+         or Carp::carp "normalise called with relative tile path and no base: '$path'";
+
+      my $dpth = $base->tile_path (cf::TILE_DOWN);
+      $path = $dpth if $dpth;
    }
 
    for ($path) {
-      redo if s{//}{/};
       redo if s{/\.?/}{/};
       redo if s{/[^/]+/\.\./}{/};
    }
@@ -1919,10 +2007,11 @@
       }
    }
 
-   Carp::cluck "unable to resolve path '$path' (base '$base').";
+   Carp::cluck "unable to resolve path '$path' (base '$base')";
    ()
 }
 
+# may re-bless or do other evil things
 sub init {
    my ($self) = @_;
 
@@ -2052,7 +2141,9 @@
 sub find {
    my ($path, $origin) = @_;
 
-   $path = normalise $path, $origin && $origin->path;
+   cf::cede_to_tick;
+
+   $path = normalise $path, $origin;
 
    my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
    my $guard2 = cf::lock_acquire "map_find:$path";
@@ -2102,26 +2193,28 @@
       $self->pre_load;
       cf::cede_to_tick;
 
-      my $f = new_from_file cf::object::thawer $self->{load_path};
-      $f->skip_block;
-      $self->_load_objects ($f)
-         or return;
+      if (exists $self->{load_path}) {
+         my $f = new_from_file cf::object::thawer $self->{load_path};
+         $f->skip_block;
+         $self->_load_objects ($f)
+            or return;
 
-      $self->post_load_original
-         if delete $self->{load_original};
+         $self->post_load_original
+            if delete $self->{load_original};
 
-      if (my $uniq = $self->uniq_path) {
-         utf8::encode $uniq;
-         unless (aio_stat $uniq) {
-            if (my $f = new_from_file cf::object::thawer $uniq) {
-               $self->clear_unique_items;
-               $self->_load_objects ($f);
-               $f->resolve_delayed_derefs;
+         if (my $uniq = $self->uniq_path) {
+            utf8::encode $uniq;
+            unless (aio_stat $uniq) {
+               if (my $f = new_from_file cf::object::thawer $uniq) {
+                  $self->clear_unique_items;
+                  $self->_load_objects ($f);
+                  $f->resolve_delayed_derefs;
+               }
             }
          }
-      }
 
-      $f->resolve_delayed_derefs;
+         $f->resolve_delayed_derefs;
+      }
 
       cf::cede_to_tick;
       # now do the right thing for maps
@@ -2145,6 +2238,8 @@
    }
 
    $self->post_load;
+
+   1
 }
 
 # customize the map for a given player, i.e.
@@ -2213,7 +2308,7 @@
 sub find_async {
    my ($path, $origin, $load) = @_;
 
-   $path = normalise $path, $origin && $origin->{path};
+   $path = normalise $path, $origin;
 
    if (my $map = $cf::MAP{$path}) {
       return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
@@ -2734,7 +2829,7 @@
       }
 
       my $map = eval {
-         my $map = defined $path ? cf::map::find $path : undef;
+         my $map = defined $path ? cf::map::find $path, $self->map : undef;
 
          if ($map) {
             $map = $map->customise_for ($self);
@@ -2842,7 +2937,7 @@
                if $exit->slaying eq "/!";
          }
 
-         my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
+         my $map = cf::map::normalise $exit->slaying, $exit->map;
          my $x   = $exit->stats->hp;
          my $y   = $exit->stats->sp;
 
@@ -3369,11 +3464,7 @@
 
    trace "loading facedata from $path\n";
 
-   my $facedata;
-   0 < aio_load $path, $facedata
-      or die "$path: $!";
-
-   $facedata = Coro::Storable::thaw $facedata;
+   my $facedata = decode_storable load_file $path;
 
    $facedata->{version} == 2
       or cf::cleanup "$path: version mismatch, cannot proceed.";
@@ -3397,6 +3488,7 @@
          cf::face::set_magicmap   $idx, $info->{magicmap};
          cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
          cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
+         cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
 
          cf::cede_to_tick;
       }
@@ -3501,10 +3593,7 @@
 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);
+   my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
 
    for (0 .. SOUND_CAST_SPELL_0 - 1) {
       my $sound = $soundconf->{compat}[$_]
@@ -3524,6 +3613,8 @@
 sub reload_resources {
    trace "reloading resource files...\n";
 
+   reload_exp_table;
+   reload_materials;
    reload_facedata;
    reload_sound;
    reload_archetypes;
@@ -3536,11 +3627,9 @@
 sub reload_config {
    trace "reloading config file...\n";
 
-   open my $fh, "<:utf8", "$CONFDIR/config"
-      or return;
-
-   local $/;
-   *CFG = YAML::XS::Load scalar <$fh>;
+   my $config = load_file "$CONFDIR/config";
+   utf8::decode $config;
+   *CFG = decode_yaml $config;
 
    $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
 
@@ -3554,8 +3643,6 @@
       };
       warn $@ if $@;
    }
-
-   trace "finished reloading resource files\n";
 }
 
 sub pidfile() {
@@ -3590,7 +3677,7 @@
    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-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
    LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
    LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
 
@@ -3608,13 +3695,13 @@
    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;
@@ -3636,13 +3723,18 @@
       use POSIX ();
       POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
 
-      (pop @POST_INIT)->(0) while @POST_INIT;
+      cf::_post_init 0;
    };
 
    cf::object::thawer::errors_are_fatal 0;
    info "parse errors in files are no longer fatal from this point on.\n";
 
-   main_loop;
+   my $free_main; $free_main = EV::idle sub {
+      undef $free_main;
+      undef &main; # free gobs of memory :)
+   };
+
+   goto &main_loop;
 }
 
 #############################################################################
@@ -3853,7 +3945,7 @@
 
 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;
    }
@@ -3863,25 +3955,26 @@
    my $t1 = AE::time;
 
    while ($RELOAD) {
-      info "reloading...";
+      cf::get_slot 0.1, -1, "reload_perl";
+      info "perl_reload: reloading...";
 
-      trace "entering sync_job";
+      trace "perl_reload: entering sync_job";
 
       cf::sync_job {
-         cf::emergency_save;
+         #cf::emergency_save;
 
-         trace "cancelling all extension coros";
+         trace "perl_reload: cancelling all extension coros";
          $_->cancel for values %EXT_CORO;
          %EXT_CORO = ();
 
-         trace "removing commands";
+         trace "perl_reload: removing commands";
          %COMMAND = ();
 
-         trace "removing ext/exti commands";
+         trace "perl_reload: removing ext/exti commands";
          %EXTCMD  = ();
          %EXTICMD = ();
 
-         trace "unloading/nuking all extensions";
+         trace "perl_reload: unloading/nuking all extensions";
          for my $pkg (@EXTS) {
             trace "... unloading $pkg";
 
@@ -3896,7 +3989,7 @@
             clear_package $pkg;
          }
 
-         trace "unloading all perl modules loaded from $LIBDIR";
+         trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
          while (my ($k, $v) = each %INC) {
             next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
 
@@ -3913,11 +4006,11 @@
             clear_package $k;
          }
 
-         trace "getting rid of safe::, as good as possible";
+         trace "perl_reload: 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);
 
-         trace "unloading cf.pm \"a bit\"";
+         trace "perl_reload: unloading cf.pm \"a bit\"";
          delete $INC{"cf.pm"};
          delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
 
@@ -3925,44 +4018,42 @@
          # and global variables created in xs
          #clear_package __PACKAGE__;
 
-         info "unload completed, starting to reload now";
+         info "perl_reload: unload completed, starting to reload now";
 
-         trace "reloading cf.pm";
+         trace "perl_reload: reloading cf.pm";
          require cf;
          cf::_connect_to_perl_1;
 
-         trace "loading config and database again";
+         trace "perl_reload: loading config and database again";
          cf::reload_config;
 
-         trace "loading extensions";
+         trace "perl_reload: loading extensions";
          cf::load_extensions;
 
          if ($REATTACH_ON_RELOAD) {
-            trace "reattaching attachments to objects/players";
+            trace "perl_reload: reattaching attachments to objects/players";
             _global_reattach; # objects, sockets
-            trace "reattaching attachments to maps";
+            trace "perl_reload: reattaching attachments to maps";
             reattach $_ for values %MAP;
-            trace "reattaching attachments to players";
+            trace "perl_reload: reattaching attachments to players";
             reattach $_ for values %PLAYER;
          }
 
-         trace "running post_init jobs";
-         (pop @POST_INIT)->(1) while @POST_INIT;
+         cf::_post_init 1;
 
-         trace "leaving sync_job";
+         trace "perl_reload: leaving sync_job";
 
          1
       } or do {
          error $@;
-         cf::cleanup "error while reloading, exiting.";
+         cf::cleanup "perl_reload: error, exiting.";
       };
 
-      info "reloaded";
       --$RELOAD;
    }
 
    $t1 = AE::time - $t1;
-   info "reload completed in ${t1}s\n";
+   info "perl_reload: completed in ${t1}s\n";
 };
 
 our $RELOAD_WATCHER; # used only during reload
@@ -3993,14 +4084,14 @@
    }
 };
 
-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;
@@ -4008,7 +4099,7 @@
    $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;
@@ -4105,15 +4196,20 @@
    undef $AnyEvent::AIO::WATCHER;
 }
 
-my $_log_backtrace;
+our $_log_backtrace;
+our $_log_backtrace_last;
 
 sub _log_backtrace {
    my ($msg, @addr) = @_;
 
-   $msg =~ s/\n//;
+   $msg =~ s/\n$//;
 
+   if ($_log_backtrace_last eq $msg) {
+      LOG llevInfo, "[ABT] $msg\n";
+      LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
    # limit the # of concurrent backtraces
-   if ($_log_backtrace < 2) {
+   } elsif ($_log_backtrace < 2) {
+      $_log_backtrace_last = $msg;
       ++$_log_backtrace;
       my $perl_bt = Carp::longmess $msg;
       async {
@@ -4143,7 +4239,7 @@
       };
    } else {
       LOG llevInfo, "[ABT] $msg\n";
-      LOG llevInfo, "[ABT] [suppressed]\n";
+      LOG llevInfo, "[ABT] [overload, suppressed]\n";
    }
 }