Changeset 4632

Timestamp:

Jul 27, 2005, 3:38:26 PM (21 years ago)

Author:

jhoblitt

Message:

remove commented auto-lock code

File:

• trunk/Nebulous/lib/Nebulous/Client.pm (modified) (8 diffs)

trunk/Nebulous/lib/Nebulous/Client.pm

@@ -1 +1 @@
 # Copyright (c) 2004  Joshua Hoblitt
 #
-# $Id: Client.pm,v 1.15 2005-06-30 02:35:06 jhoblitt Exp $
+# $Id: Client.pm,v 1.16 2005-07-28 01:38:26 jhoblitt Exp $
 
 package Nebulous::Client;
@@ -126 +126 @@
     $log->debug( "server allocated $uri" );
 
-#    unless( $self->lock( $key, "write"  )) {
-#        $log->debug( "can not lock object" );
-#        $log->debug( "leaving" );
-#
-#        return undef;
-#    }
-
     my $fh;
     eval {
@@ -195 +188 @@
     close( $new_fh ) or $log->logdie( "can not close $key" );
 
-#    unless ($self->unlock( $key, "write" )) {
-#        $log->debug( "can not lock object" );
-#        $log->debug( "leaving" );
-#
-#        return undef;
-#    }
-
     $log->debug( "leaving" );
 
@@ -234 +220 @@
     }
 
-    # make sure nobody is reading while we are deleting
-#    unless ($self->lock( $key, "write" )) {
-#        $log->debug( "can not lock object" );
-#        $log->debug( "leaving" );
-#
-#        return undef;
-#    }
-
     my $uri = $self->delete_instance( $locations->[0] );
-
-#    unless ($self->unlock( $key, "write" )) {
-#        $log->debug( "can not lock object" );
-#        $log->debug( "leaving" );
-#
-#        return undef;
-#    }
 
     $log->debug( "leaving" );
@@ -466 +437 @@
 
     if ( $type eq 'write' ) {
-#        unless ($self->lock( $key, $type )) {
-#            $log->debug( "can not lock object" );
-#            $log->debug( "leaving" );
-#
-#            return undef;
-#        }
-
         eval {
             $fh = _get_filehandle( $path, '+<' );
@@ -478 +442 @@
         $log->logdie( $@ ) if $@;
     } elsif ( $type eq 'read' ) {
-#            unless ($self->lock( $key, $type )) {
-#            $log->debug( "can not lock object" );
-#            $log->debug( "leaving" );
-#
-#            return undef;
-#        }
-
         eval {
             $fh = _get_filehandle( $path, '<' );
@@ -507 +464 @@
     $log->debug( "entered - @_" );
 
-#    unless ($self->lock( $key, "write" )) {
-#        $log->debug( "can not lock object" );
-#        $log->debug( "leaving" );
-#
-#        return undef;
-#    }
-
     my $locations = $self->find_instances( $key );
 
     return undef unless $locations;
         
+    # a lock is implicitly removed when the last storage object is deleted
     foreach my $uri ( @$locations ) {
         $self->delete_instance( $uri ) or return undef;
     }
-
-    # lock is implicitly removed when the last storage object is deleted
 
     $log->debug( "leaving" );
@@ -563 +512 @@
     close( $fh ) or $log->logdie->( "can not close $key" );
     close( $new_fh ) or $log->logdie->( "can not close $new_key" );
-
-#    unless ($self->unlock( $key, "read" )) {
-#        $log->debug( "can not lock object" );
-#        $log->debug( "leaving" );
-#
-#        return undef;
-#    }
-#
-#    unless ($self->unlock( $new_key, "write" )) {
-#        $log->debug( "can not lock object" );
-#        $log->debug( "leaving" );
-#
-#        return undef;
-#    }
 
     $log->debug( "leaving" );