--- deliantra/server/lib/cf.pm	2007/10/08 13:58:07	1.380
+++ deliantra/server/lib/cf.pm	2007/11/14 08:09:46	1.396
@@ -6,16 +6,16 @@
 use Symbol;
 use List::Util;
 use Socket;
-use Storable;
-use Event;
+use EV;
 use Opcode;
 use Safe;
 use Safe::Hole;
+use Storable ();
 
 use Coro 4.1 ();
 use Coro::State;
 use Coro::Handle;
-use Coro::Event;
+use Coro::EV;
 use Coro::Timer;
 use Coro::Signal;
 use Coro::Semaphore;
@@ -40,8 +40,6 @@
 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
-
 # work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
 $YAML::Syck::ImplicitUnicode = 1;
 
@@ -164,7 +162,7 @@
 
 =item %cf::CFG
 
-Configuration for the server, loaded from C</etc/crossfire/config>, or
+Configuration for the server, loaded from C</etc/deliantra-server/config>, or
 from wherever your confdir points to.
 
 =item cf::wait_for_tick, cf::wait_for_tick_begin
@@ -217,7 +215,7 @@
    @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
 }
 
-$Event::DIED = sub {
+$EV::DIED = sub {
    warn "error in event callback: @_";
 };
 
@@ -338,6 +336,21 @@
    $guard
 }
 
+=item cf::periodic $interval, $cb
+
+Like EV::periodic, but randomly selects a starting point so that the actions
+get spread over timer.
+
+=cut
+
+sub periodic($$) {
+   my ($interval, $cb) = @_;
+
+   my $start = rand List::Util::min 180, $interval;
+
+   EV::periodic $start, $interval, 0, $cb
+}
+
 =item cf::get_slot $time[, $priority[, $name]]
 
 Allocate $time seconds of blocking CPU time at priority C<$priority>:
@@ -408,8 +421,8 @@
 
 =item cf::sync_job { BLOCK }
 
-The design of Crossfire TRT requires that the main coroutine ($Coro::main)
-is always able to handle events or runnable, as Crossfire TRT is only
+The design of Deliantra requires that the main coroutine ($Coro::main)
+is always able to handle events or runnable, as Deliantra is only
 partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
 acceptable.
 
@@ -424,12 +437,12 @@
    my ($job) = @_;
 
    if ($Coro::current == $Coro::main) {
-      my $time = Event::time;
+      my $time = EV::time;
 
       # this is the main coro, too bad, we have to block
       # till the operation succeeds, freezing the server :/
       
-      LOG llevError | logBacktrace, Carp::longmess "sync job";#d#
+      LOG llevError, Carp::longmess "sync job";#d#
 
       # TODO: use suspend/resume instead
       # (but this is cancel-safe)
@@ -446,10 +459,14 @@
       })->prio (Coro::PRIO_MAX);
 
       while ($busy) {
-         Coro::cede or Event::one_event;
+         if (Coro::nready) {
+            Coro::cede_notself;
+         } else {
+            EV::loop EV::LOOP_ONESHOT;
+         }
       }
 
-      $time = Event::time - $time;
+      $time = EV::time - $time;
 
       LOG llevError | logBacktrace, Carp::longmess "long sync job"
          if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
@@ -489,7 +506,7 @@
 Executes the given code block with the given arguments in a seperate
 process, returning the results. Everything must be serialisable with
 Coro::Storable. May, of course, block. Note that the executed sub may
-never block itself or use any form of Event handling.
+never block itself or use any form of event handling.
 
 =cut
 
@@ -660,7 +677,7 @@
 
 In the following description, CLASS can be any of C<global>, C<object>
 C<player>, C<client> or C<map> (i.e. the attachable objects in
-Crossfire TRT).
+Deliantra).
 
 =over 4
 
@@ -968,16 +985,47 @@
 
 #############################################################################
 # object support
-#
 
+sub _object_equal($$);
+sub _object_equal($$) {
+   my ($a, $b) = @_;
+
+   return 0 unless (ref $a) eq (ref $b);
+
+   if ("HASH" eq ref $a) {
+      my @ka = keys %$a;
+      my @kb = keys %$b;
+
+      return 0 if @ka != @kb;
+
+      for (0 .. $#ka) {
+         return 0 unless $ka[$_] eq $kb[$_];
+         return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
+      }
+
+   } elsif ("ARRAY" eq ref $a) {
+
+      return 0 if @$a != @$b;
+
+      for (0 .. $#$a) {
+         return 0 unless _object_equal $a->[$_], $b->[$_];
+      }
+
+   } elsif ($a ne $b) {
+      return 0;
+   }
+
+   1
+}
+
+our $SLOW_MERGES;#d#
 sub _can_merge {
    my ($ob1, $ob2) = @_;
 
-   local $Storable::canonical = 1;
-   my $fob1 = Storable::freeze $ob1;
-   my $fob2 = Storable::freeze $ob2;
+   ++$SLOW_MERGES;#d#
 
-   $fob1 eq $fob2
+   # we do the slow way here
+   return _object_equal $ob1, $ob2
 }
 
 sub reattach {
@@ -1089,8 +1137,7 @@
       (aio_load "$filename.pst", $av) >= 0
          or return;
 
-      my $st = eval { Coro::Storable::thaw $av }
-            || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
+      my $st = eval { Coro::Storable::thaw $av };
       $av = $st->{objs};
    }
 
@@ -1516,46 +1563,88 @@
 
 =cut
 
+use re 'eval';
+
+my $group;
+my $interior; $interior = qr{
+   # match a pod interior sequence sans C<< >>
+   (?:
+      \ (.*?)\  (?{ $group = $^N })
+      | < (??{$interior}) >
+   )
+}x;
+
 sub expand_cfpod {
-   ((my $self), (local $_)) = @_;
+   my ($self, $pod) = @_;
 
-   # escape & and <
-   s/&/&amp;/g;
-   s/(?<![BIUGHT])</&lt;/g;
-
-   # this is buggy, it needs to properly take care of nested <'s
-
-   1 while
-      # replace B<>, I<>, U<> etc.
-      s/B<([^\>]*)>/<b>$1<\/b>/
-      || s/I<([^\>]*)>/<i>$1<\/i>/
-      || s/U<([^\>]*)>/<u>$1<\/u>/
-      || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
-      # replace G<male|female> tags
-      || s{G<([^>|]*)\|([^>]*)>}{
-         $self->gender ? $2 : $1
-      }ge
-      # replace H<hint text>
-      || s{H<([^\>]*)>}
-          {
-             ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
-              "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
-              "")
-                [$self->{hintmode}]
-          }ge;
-
-   # create single paragraphs (very hackish)
-   s/(?<=\S)\n(?=\w)/ /g;
-
-   # compress some whitespace
-   s/\s+\n/\n/g; # ws line-ends
-   s/\n\n+/\n/g; # double lines
-   s/^\n+//;     # beginning lines
-   s/\n+$//;     # ending lines
+   my $xml;
 
-   $_
+   while () {
+      if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
+         $group = $1;
+
+         $group =~ s/&/&amp;/g;
+         $group =~ s/</&lt;/g;
+
+         $xml .= $group;
+      } elsif ($pod =~ m%\G
+                  ([BCGHITU])
+                  <
+                     (?:
+                        ([^<>]*) (?{ $group = $^N })
+                        | < $interior >
+                     )
+                  >
+               %gcsx
+      ) {
+         my ($code, $data) = ($1, $group);
+
+         if ($code eq "B") {
+            $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
+         } elsif ($code eq "I") {
+            $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
+         } elsif ($code eq "U") {
+            $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
+         } elsif ($code eq "C") {
+            $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
+         } elsif ($code eq "T") {
+            $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
+         } elsif ($code eq "G") {
+            my ($male, $female) = split /\|/, $data;
+            $data =  $self->gender ? $female : $male;
+            $xml .= expand_cfpod ($self, $data);
+         } elsif ($code eq "H") {
+             $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
+                      "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
+                      "")
+                        [$self->{hintmode}];
+         } else {
+            $xml .= "error processing '$code($data)' directive";
+         }
+      } else {
+         if ($pod =~ /\G(.+)/) {
+            warn "parse error while expanding $pod (at $1)";
+         }
+         last;
+      }
+   }
+
+   for ($xml) {
+      # create single paragraphs (very hackish)
+      s/(?<=\S)\n(?=\w)/ /g;
+
+      # compress some whitespace
+      s/\s+\n/\n/g; # ws line-ends
+      s/\n\n+/\n/g; # double lines
+      s/^\n+//;     # beginning lines
+      s/\n+$//;     # ending lines
+   }
+
+   $xml
 }
 
+no re 'eval';
+
 sub hintmode {
    $_[0]{hintmode} = $_[1] if @_ > 1;
    $_[0]{hintmode}
@@ -2634,6 +2723,7 @@
 
 =cut
 
+# non-persistent channels (usually the info channel)
 our %CHANNEL = (
    "c/identify" => {
       id      => "infobox",
@@ -2647,12 +2737,42 @@
       reply   => undef,
       tooltip => "Signs and other items you examined",
    },
+   "c/book" => {
+      id      => "infobox",
+      title   => "Book",
+      reply   => undef,
+      tooltip => "The contents of a note or book",
+   },
    "c/lookat" => {
       id      => "infobox",
       title   => "Look",
       reply   => undef,
       tooltip => "What you saw there",
    },
+   "c/who" => {
+      id      => "infobox",
+      title   => "Players",
+      reply   => undef,
+      tooltip => "Shows players who are currently online",
+   },
+   "c/body" => {
+      id      => "infobox",
+      title   => "Body Parts",
+      reply   => undef,
+      tooltip => "Shows which body parts you posess and are available",
+   },
+   "c/uptime" => {
+      id      => "infobox",
+      title   => "Uptime",
+      reply   => undef,
+      tooltip => "How long the server has been running since last restart",
+   },
+   "c/mapinfo" => {
+      id      => "infobox",
+      title   => "Map Info",
+      reply   => undef,
+      tooltip => "Information related to the maps",
+   },
 );
 
 sub cf::client::send_msg {
@@ -2898,7 +3018,7 @@
 The following functions and methods are available within a safe environment:
 
   cf::object
-     contr pay_amount pay_player map x y force_find force_add
+     contr pay_amount pay_player map x y force_find force_add destroy
      insert remove name archname title slaying race decrease_ob_nr
 
   cf::object::player
@@ -2915,7 +3035,7 @@
 for (
    ["cf::object"         => qw(contr pay_amount pay_player map force_find force_add x y
                                insert remove inv name archname title slaying race
-                               decrease_ob_nr)],
+                               decrease_ob_nr destroy)],
    ["cf::object::player" => qw(player)],
    ["cf::player"         => qw(peaceful)],
    ["cf::map"            => qw(trigger)],
@@ -3201,7 +3321,7 @@
       Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
       (async {
          $Coro::current->{desc} = "IDLE BUG HANDLER";
-         Event::one_event;
+         EV::loop EV::LOOP_ONESHOT;
       })->prio (Coro::PRIO_MAX);
    };
 
@@ -3210,7 +3330,7 @@
    load_extensions;
 
    $TICK_WATCHER->start;
-   Event::loop;
+   EV::loop;
 }
 
 #############################################################################
@@ -3218,16 +3338,11 @@
 
 # install some emergency cleanup handlers
 BEGIN {
+   our %SIGWATCHER = ();
    for my $signal (qw(INT HUP TERM)) {
-      Event->signal (
-         reentrant => 0,
-         data      => WF_AUTOCANCEL,
-         signal    => $signal,
-         prio      => 0,
-         cb        => sub {
-            cf::cleanup "SIG$signal";
-         },
-      );
+      $SIGWATCHER{$signal} = EV::signal $signal, sub {
+         cf::cleanup "SIG$signal";
+      };
    }
 }
 
@@ -3282,6 +3397,7 @@
       for my $login (keys %cf::PLAYER) {
          my $pl = $cf::PLAYER{$login} or next;
          $pl->valid or next;
+         delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
          $pl->save;
       }
       warn "end emergency player save\n";
@@ -3330,16 +3446,11 @@
 
       # if anything goes wrong in here, we should simply crash as we already saved
 
-      warn "cancelling all WF_AUTOCANCEL watchers";
-      for (Event::all_watchers) {
-         $_->cancel if $_->data & WF_AUTOCANCEL;
-      }
-
       warn "flushing outstanding aio requests";
       for (;;) {
          BDB::flush;
          IO::AIO::flush;
-         Coro::cede;
+         Coro::cede_notself;
          last unless IO::AIO::nreqs || BDB::nreqs;
          warn "iterate...";
       }
@@ -3438,15 +3549,10 @@
    # doing reload synchronously and two reloads happen back-to-back,
    # coro crashes during coro_state_free->destroy here.
 
-   $RELOAD_WATCHER ||= Event->timer (
-      reentrant => 0,
-      after     => 0,
-      data      => WF_AUTOCANCEL,
-      cb => sub {
-         do_reload_perl;
-         undef $RELOAD_WATCHER;
-      },
-   );
+   $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
+      undef $RELOAD_WATCHER;
+      do_reload_perl;
+   };
 }
 
 register_command "reload" => sub {
@@ -3486,68 +3592,47 @@
    $signal->wait;
 }
 
-$TICK_WATCHER = Event->timer (
-   reentrant => 0,
-   parked    => 1,
-   prio      => 0,
-   at        => $NEXT_TICK || $TICK,
-   data      => WF_AUTOCANCEL,
-   cb        => sub {
-      if ($Coro::current != $Coro::main) {
-         Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
-            unless ++$bug_warning > 10;
-         return;
-      }
-
-      $NOW = $tick_start = Event::time;
-
-      cf::server_tick; # one server iteration
-
-      $RUNTIME   += $TICK;
-      $NEXT_TICK += $TICK;
-
-      if ($NOW >= $NEXT_RUNTIME_WRITE) {
-         $NEXT_RUNTIME_WRITE = $NOW + 10;
-         Coro::async_pool {
-            $Coro::current->{desc} = "runtime saver";
-            write_runtime
-               or warn "ERROR: unable to write runtime file: $!";
-         };
-      }
+$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
+   if ($Coro::current != $Coro::main) {
+      Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
+         unless ++$bug_warning > 10;
+      return;
+   }
 
-      if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
-         $sig->send;
-      }
-      while (my $sig = shift @WAIT_FOR_TICK) {
-         $sig->send;
-      }
+   $NOW = $tick_start = EV::now;
 
-      $NOW = Event::time;
+   cf::server_tick; # one server iteration
 
-      # if we are delayed by four ticks or more, skip them all
-      $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
+   $RUNTIME   += $TICK;
+   $NEXT_TICK += $TICK;
 
-      $TICK_WATCHER->at ($NEXT_TICK);
-      $TICK_WATCHER->start;
+   if ($NOW >= $NEXT_RUNTIME_WRITE) {
+      $NEXT_RUNTIME_WRITE = $NOW + 10;
+      Coro::async_pool {
+         $Coro::current->{desc} = "runtime saver";
+         write_runtime
+            or warn "ERROR: unable to write runtime file: $!";
+      };
+   }
 
-      $LOAD = ($NOW - $tick_start) / $TICK;
-      $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
+   if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
+      $sig->send;
+   }
+   while (my $sig = shift @WAIT_FOR_TICK) {
+      $sig->send;
+   }
 
-      _post_tick;
-   },
-);
+   $LOAD = ($NOW - $tick_start) / $TICK;
+   $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
+
+   _post_tick;
+};
+$TICK_WATCHER->priority (EV::MAXPRI);
 
 {
    BDB::min_parallel 8;
    BDB::max_poll_time $TICK * 0.1;
-   $BDB_POLL_WATCHER = Event->io (
-      reentrant => 0,
-      fd        => BDB::poll_fileno,
-      poll      => 'r',
-      prio      => 0,
-      data      => WF_AUTOCANCEL,
-      cb        => \&BDB::poll_cb,
-   );
+   $BDB_POLL_WATCHER = EV::io BDB::poll_fileno, EV::READ, \&BDB::poll_cb;
 
    BDB::set_sync_prepare {
       my $status;
@@ -3587,36 +3672,15 @@
       };
    }
 
-   $BDB_DEADLOCK_WATCHER = Event->timer (
-      after     => 3,
-      interval  => 1,
-      hard      => 1,
-      prio      => 0,
-      data      => WF_AUTOCANCEL,
-      cb        => sub {
-         BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
-      },
-   );
-   $BDB_CHECKPOINT_WATCHER = Event->timer (
-      after     => 11,
-      interval  => 60,
-      hard      => 1,
-      prio      => 0,
-      data      => WF_AUTOCANCEL,
-      cb        => sub {
-         BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
-      },
-   );
-   $BDB_TRICKLE_WATCHER = Event->timer (
-      after     => 5,
-      interval  => 10,
-      hard      => 1,
-      prio      => 0,
-      data      => WF_AUTOCANCEL,
-      cb        => sub {
-         BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
-      },
-   );
+   $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
+      BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
+   };
+   $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
+      BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
+   };
+   $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
+      BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
+   };
 }
 
 {
@@ -3624,14 +3688,7 @@
 
    undef $Coro::AIO::WATCHER;
    IO::AIO::max_poll_time $TICK * 0.1;
-   $AIO_POLL_WATCHER = Event->io (
-      reentrant => 0,
-      data      => WF_AUTOCANCEL,
-      fd        => IO::AIO::poll_fileno,
-      poll      => 'r',
-      prio      => 0,
-      cb        => \&IO::AIO::poll_cb,
-   );
+   $AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb;
 }
 
 my $_log_backtrace;