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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.384 by root, Fri Oct 12 18:17:16 2007 UTC vs.
Revision 1.387 by root, Mon Oct 15 23:49:10 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 4.1 ();
 use Coro::State;
 use Coro::Handle;
 use Coro::Event;
       my $time = Event::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)
       my $freeze_guard = freeze_mainloop;
          warn $@ if $@;
          undef $busy;
       })->prio (Coro::PRIO_MAX);
       while ($busy) {
+         if (Coro::nready) {
+            Coro::cede_notself;
+         } else {
-         Coro::cede or Event::one_event;
+            Event::one_event;
+         }
       }
       $time = Event::time - $time;
       LOG llevError | logBacktrace, Carp::longmess "long sync job"
 =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) = @_;
       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...";
       }
       ++$RELOAD;

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.384 by root, Fri Oct 12 18:17:16 2007 UTC vs. Revision 1.387 by root, Mon Oct 15 23:49:10 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.384 by root, Fri Oct 12 18:17:16 2007 UTC vs.
Revision 1.387 by root, Mon Oct 15 23:49:10 2007 UTC