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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.376 by root, Mon Oct 1 00:44:44 2007 UTC vs.
Revision 1.386 by root, Mon Oct 15 17:50:27 2007 UTC

 use strict;
 use Symbol;
 use List::Util;
 use Socket;
-use Storable;
 use Event;
 use Opcode;
 use Safe;
 use Safe::Hole;
+use Storable ();
-use Coro 3.64 ();
+use Coro 4.1 ();
 use Coro::State;
 use Coro::Handle;
 use Coro::Event;
 use Coro::Timer;
 use Coro::Signal;
 use BDB ();
 use Data::Dumper;
 use Digest::MD5;
 use Fcntl;
 use YAML::Syck ();
-use IO::AIO 2.32 ();
+use IO::AIO 2.51 ();
 use Time::HiRes;
 use Compress::LZF;
 use Digest::MD5 ();
 # configure various modules to our taste
             }
          }
       }
       if (@SLOT_QUEUE) {
-         # we do not use wait_For_tick() as it returns immediately when tick is inactive
+         # we do not use wait_for_tick() as it returns immediately when tick is inactive
          push @cf::WAIT_FOR_TICK, $signal;
          $signal->wait;
       } else {
          Coro::schedule;
       }
       my $time = Event::time;
       # this is the main coro, too bad, we have to block
       # till the operation succeeds, freezing the server :/
+      LOG llevError, Carp::longmess "sync job";#d#
       # TODO: use suspend/resume instead
       # (but this is cancel-safe)
       my $freeze_guard = freeze_mainloop;
       my $busy = 1;
 =cut
 #############################################################################
 # 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;
+   ++$SLOW_MERGES;#d#
-   my $fob1 = Storable::freeze $ob1;
-   my $fob2 = Storable::freeze $ob2;
-   $fob1 eq $fob2
+   # we do the slow way here
+   return _object_equal $ob1, $ob2
 }
 sub reattach {
    # basically do the same as instantiate, without calling instantiate
    my ($obj) = @_;
             close $fh;
             if (@$objs) {
                if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
                   chmod SAVE_MODE, $fh;
-                  my $data = Storable::nfreeze { version => 1, objs => $objs };
+                  my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs };
                   aio_write $fh, 0, (length $data), $data, 0;
                   aio_fsync $fh if $cf::USE_FSYNC;
                   close $fh;
                   aio_rename "$filename.pst~", "$filename.pst";
                }
    unless (aio_stat "$filename.pst") {
       (aio_load "$filename.pst", $av) >= 0
          or return;
-      $av = eval { (Storable::thaw $av)->{objs} };
+      my $st = eval { Coro::Storable::thaw $av }
+            || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
+      $av = $st->{objs};
    }
    utf8::decode (my $decname = $filename);
    warn sprintf "loading %s (%d,%d)\n",
       $decname, length $data, scalar @{$av || []};
 =cut
 sub deref {
    my ($ref) = @_;
-   # temporary compatibility#TODO#remove
-   $ref =~ s{^<}{player/<};
-   if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
+   if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
       my ($uuid, $name) = ($1, $2);
       my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
          or return;
       $pl->ob->uuid eq $uuid
          or return;
 =pod
 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
      player
 =cut
 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)],
 ) {
    no strict 'refs';
       # and maps saved/destroyed asynchronously.
       warn "begin emergency player save\n";
       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";
       warn "begin emergency map save\n";

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.376 by root, Mon Oct 1 00:44:44 2007 UTC vs. Revision 1.386 by root, Mon Oct 15 17:50:27 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.376 by root, Mon Oct 1 00:44:44 2007 UTC vs.
Revision 1.386 by root, Mon Oct 15 17:50:27 2007 UTC