--- deliantra/server/lib/cf.pm	2009/03/02 22:25:19	1.469
+++ deliantra/server/lib/cf.pm	2009/09/17 01:57:31	1.478
@@ -74,6 +74,9 @@
 Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
 Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
 
+# strictly for debugging
+$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
+
 sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
 
 our %COMMAND      = ();
@@ -136,7 +139,8 @@
 
 our @POST_INIT;
 
-our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
+our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
+our $REALLY_UNLOOP;      # never set to true, please :)
 
 binmode STDOUT;
 binmode STDERR;
@@ -220,34 +224,31 @@
 
 =cut
 
-BEGIN {
-   *CORE::GLOBAL::warn = sub {
-      my $msg = join "", @_;
+$Coro::State::WARNHOOK = sub {
+   my $msg = join "", @_;
 
-      $msg .= "\n"
-         unless $msg =~ /\n$/;
+   $msg .= "\n"
+      unless $msg =~ /\n$/;
 
-      $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
+   $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
 
-      LOG llevError, $msg;
-   };
-}
+   LOG llevError, $msg;
+};
 
 $Coro::State::DIEHOOK = sub {
    return unless $^S eq 0; # "eq", not "=="
 
+   warn Carp::longmess $_[0];
+
    if ($Coro::current == $Coro::main) {#d#
       warn "DIEHOOK called in main context, Coro bug?\n";#d#
       return;#d#
    }#d#
 
    # kill coroutine otherwise
-   warn Carp::longmess $_[0];
    Coro::terminate
 };
 
-$SIG{__DIE__} = sub { }; #d#?
-
 @safe::cf::global::ISA         = @cf::global::ISA         = 'cf::attachable';
 @safe::cf::object::ISA         = @cf::object::ISA         = 'cf::attachable';
 @safe::cf::player::ISA         = @cf::player::ISA         = 'cf::attachable';
@@ -1153,7 +1154,10 @@
          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_fsync $fh if $cf::USE_FSYNC;
+            if ($cf::USE_FSYNC) {
+               aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
+               aio_fsync $fh;
+            }
             aio_close $fh;
 
             if (@$objs) {
@@ -1161,7 +1165,10 @@
                   aio_chmod $fh, SAVE_MODE;
                   my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
                   aio_write $fh, 0, (length $data), $data, 0;
-                  aio_fsync $fh if $cf::USE_FSYNC;
+                  if ($cf::USE_FSYNC) {
+                     aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
+                     aio_fsync $fh;
+                  }
                   aio_close $fh;
                   aio_rename "$filename.pst~", "$filename.pst";
                }
@@ -1322,7 +1329,7 @@
 sub cache_extensions {
    my $grp = IO::AIO::aio_group;
 
-   add $grp IO::AIO::aio_readdir $LIBDIR, sub {
+   add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
       for (grep /\.ext$/, @{$_[0]}) {
          add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
       }
@@ -2215,7 +2222,7 @@
 
    return if $self->players;
 
-   warn "resetting map ", $self->path;
+   warn "resetting map ", $self->path, "\n";
 
    $self->in_memory (cf::MAP_SWAPPED);
 
@@ -2526,11 +2533,12 @@
    $map->load_neighbours;
 
    return unless $self->contr->active;
-   $self->flag (cf::FLAG_DEBUG, 0);#d# temp
-   $self->activate_recursive;
 
    local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
    $self->enter_map ($map, $x, $y);
+
+   # only activate afterwards, to support waiting in hooks
+   $self->activate_recursive;
 }
 
 =item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
@@ -2787,6 +2795,12 @@
       reply   => undef,
       tooltip => "Shows your experience per skill and item power",
    },
+   "c/shopitems" => {
+      id      => "infobox",
+      title   => "Shop Items",
+      reply   => undef,
+      tooltip => "Shows the items currently for sale in this shop",
+   },
    "c/resistances" => {
       id      => "infobox",
       title   => "Resistances",
@@ -2799,6 +2813,12 @@
       reply   => undef,
       tooltip => "Shows information abotu your pets/a specific pet",
    },
+   "c/perceiveself" => {
+      id      => "infobox",
+      title   => "Perceive Self",
+      reply   => undef,
+      tooltip => "You gained detailed knowledge about yourself",
+   },
    "c/uptime" => {
       id      => "infobox",
       title   => "Uptime",
@@ -3384,6 +3404,15 @@
    print $fh $$;
 }
 
+sub main_loop {
+   warn "EV::loop starting\n";
+   if (1) {
+      EV::loop;
+   }
+   warn "EV::loop returned\n";
+   goto &main_loop unless $REALLY_UNLOOP;
+}
+
 sub main {
    cf::init_globals; # initialise logging
 
@@ -3431,12 +3460,13 @@
       utime time, time, $RUNTIMEFILE;
 
       # no (long-running) fork's whatsoever before this point(!)
+      use POSIX ();
       POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
 
       (pop @POST_INIT)->(0) while @POST_INIT;
    };
 
-   EV::loop;
+   main_loop;
 }
 
 #############################################################################