--- deliantra/server/lib/cf.pm	2009/01/01 18:35:48	1.464
+++ deliantra/server/lib/cf.pm	2009/07/16 21:42:56	1.474
@@ -23,7 +23,7 @@
 
 use 5.10.0;
 use utf8;
-use strict "vars", "subs";
+use strict qw(vars subs);
 
 use Symbol;
 use List::Util;
@@ -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      = ();
@@ -107,13 +110,15 @@
 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 off
+our $USE_FSYNC = 1; # use fsync to write maps - default on
 
 our $BDB_DEADLOCK_WATCHER;
 our $BDB_CHECKPOINT_WATCHER;
 our $BDB_TRICKLE_WATCHER;
 our $DB_ENV;
 
+our @EXTRA_MODULES = qw(pod mapscript);
+
 our %CFG;
 
 our $UPTIME; $UPTIME ||= time;
@@ -134,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;
@@ -146,6 +152,8 @@
    $RUNTIME = <$fh> + 0.;
 }
 
+eval "sub TICK() { $TICK } 1" or die;
+
 mkdir $_
    for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
 
@@ -1149,7 +1157,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) {
@@ -1157,7 +1168,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";
                }
@@ -1318,7 +1332,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;
       }
@@ -2386,7 +2400,7 @@
    id      => "say",
    title   => "Map",
    reply   => "say ",
-   tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
+   tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
 };
 
 our $CHAT_CHANNEL = {
@@ -2771,12 +2785,42 @@
       reply   => undef,
       tooltip => "Shows which body parts you posess and are available",
    },
+   "c/statistics" => {
+      id      => "infobox",
+      title   => "Statistics",
+      reply   => undef,
+      tooltip => "Shows your primary statistics",
+   },
    "c/skills" => {
       id      => "infobox",
       title   => "Skills",
       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",
+      reply   => undef,
+      tooltip => "Shows your resistances",
+   },
+   "c/pets" => {
+      id      => "infobox",
+      title   => "Pets",
+      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",
@@ -3036,6 +3080,7 @@
   cf::object
      contr pay_amount pay_player map x y force_find force_add destroy
      insert remove name archname title slaying race decrease split
+     value
 
   cf::object::player
      player
@@ -3051,9 +3096,9 @@
 for (
    ["cf::object"         => qw(contr pay_amount pay_player map force_find force_add x y
                                insert remove inv nrof name archname title slaying race
-                               decrease split destroy change_exp)],
+                               decrease split destroy change_exp value msg lore send_msg)],
    ["cf::object::player" => qw(player)],
-   ["cf::player"         => qw(peaceful)],
+   ["cf::player"         => qw(peaceful send_msg)],
    ["cf::map"            => qw(trigger)],
 ) {
    no strict 'refs';
@@ -3081,6 +3126,8 @@
    $qcode =~ s/"/‟/g; # not allowed in #line filenames
    $qcode =~ s/\n/\\n/g;
 
+   %vars = (_dummy => 0) unless %vars;
+
    local $_;
    local @safe::cf::_safe_eval_args = values %vars;
 
@@ -3359,6 +3406,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
 
@@ -3411,7 +3467,7 @@
       (pop @POST_INIT)->(0) while @POST_INIT;
    };
 
-   EV::loop;
+   main_loop;
 }
 
 #############################################################################
@@ -3677,7 +3733,7 @@
 
          warn "unloading cf.pm \"a bit\"";
          delete $INC{"cf.pm"};
-         delete $INC{"cf/pod.pm"};
+         delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
 
          # don't, removes xs symbols, too,
          # and global variables created in xs
@@ -3904,7 +3960,7 @@
 }
 
 # load additional modules
-use cf::pod;
+require "cf/$_.pm" for @EXTRA_MODULES;
 
 END { cf::emergency_save }