[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.385 by root, Fri Oct 12 19:13:26 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;
 #
 sub _can_merge {
    my ($ob1, $ob2) = @_;
+   return 1;#d#
+   #todo#d# kill yourself and do some recursive checking manually without storable
+   sync_job {
+      my $guard = Coro::Storable::guard;
-   local $Storable::canonical = 1;
+      local $Storable::canonical = 1;
-   my $fob1 = Storable::freeze $ob1;
+      my $fob1 = Storable::freeze $ob1;
-   my $fob2 = Storable::freeze $ob2;
+      my $fob2 = Storable::freeze $ob2;
-   $fob1 eq $fob2
+      $fob1 eq $fob2
+   }
 }
 sub reattach {
    # basically do the same as instantiate, without calling instantiate
    my ($obj) = @_;

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