[perl-xml-cvs] CVS: xml-simple Simple.pm,1.5,1.6

[Grant M. <gr...@us...>]

Update of /cvsroot/perl-xml/xml-simple
In directory usw-pr-cvs1:/tmp/cvs-serv1344

Modified Files:
	Simple.pm 
Log Message:
- removed 5005threads locking code for ithreads compatibility

Index: Simple.pm
===================================================================
RCS file: /cvsroot/perl-xml/xml-simple/Simple.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Simple.pm	13 Oct 2002 01:11:04 -0000	1.5
+++ Simple.pm	13 Oct 2002 01:13:19 -0000	1.6
@@ -55,7 +55,6 @@
                        memcopy  => [ \&MemCopySave,  \&MemCopyRestore  ]
 		     );
 
-my $DefaultValues  = 1;       # Used for locking only
 my @KnownOptIn     = qw(keyattr keeproot forcecontent contentkey noattr
                         searchpath forcearray cache suppressempty parseropts
 			nsexpand datahandler DataHandler);
@@ -72,7 +71,7 @@
 
 
 ##############################################################################
-# Globals for use by caching routines (access protected by locks)
+# Globals for use by caching routines
 #
 
 my %MemShareCache  = ();
@@ -80,17 +79,6 @@
 
 
 ##############################################################################
-# Dummy 'lock' routine for non-threaded versions of Perl
-#
-
-BEGIN {
-  if($] < 5.005) {
-    eval "sub lock {}";
-  }
-}
-
-
-##############################################################################
 # Constructor for optional object interface.
 #
 
@@ -170,7 +158,6 @@
     $filename = $self->find_xml_file($string, @{$self->{opt}->{searchpath}});
 
     if($self->{opt}->{cache}) {
-      lock(%CacheScheme);
       foreach $scheme (@{$self->{opt}->{cache}}) {
 	croak "Unsupported caching scheme: $scheme"
 	  unless($CacheScheme{$scheme});
@@ -374,7 +361,6 @@
 sub MemShareSave {
   my($data, $filename) = @_;
 
-  lock(%MemShareCache);
   $MemShareCache{$filename} = [time(), $data];
 }
 
@@ -388,7 +374,6 @@
 sub MemShareRestore {
   my($filename) = @_;
   
-  lock(%MemShareCache);
   return unless($MemShareCache{$filename});
   return unless($MemShareCache{$filename}->[0] > (stat($filename))[9]);
 
@@ -407,7 +392,6 @@
 sub MemCopySave {
   my($data, $filename) = @_;
 
-  lock(%MemCopyCache);
   unless($INC{'Storable.pm'}) {
     require Storable;           # We didn't need it until now
   }
@@ -426,7 +410,6 @@
 sub MemCopyRestore {
   my($filename) = @_;
   
-  lock(%MemCopyCache);
   return unless($MemCopyCache{$filename});
   return unless($MemCopyCache{$filename}->[0] > (stat($filename))[9]);
 
@@ -558,8 +541,6 @@
   my $self = shift;
   my $dirn = shift;
 
-
-  lock($DefaultValues);
 
   # Determine valid options based on context