--- perl/trunk/Fuse.pm	2005/06/22 16:15:17	16
+++ perl/trunk/Fuse.pm	2005/12/27 14:49:31	20
@@ -5,6 +5,7 @@
 use warnings;
 use Errno;
 use Carp;
+use Config;
 
 require Exporter;
 require DynaLoader;
@@ -20,17 +21,14 @@
 # If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
 # will save memory.
 our %EXPORT_TAGS = (
-		    'all' => [ qw(FUSE_DEBUG XATTR_CREATE XATTR_REPLACE) ],
-		    'debug' => [ qw(FUSE_DEBUG) ],
+		    'all' => [ qw(XATTR_CREATE XATTR_REPLACE) ],
 		    'xattr' => [ qw(XATTR_CREATE XATTR_REPLACE) ]
 		    );
 
 our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
 
-our @EXPORT = qw(
-	FUSE_DEBUG
-);
-our $VERSION = '0.06';
+our @EXPORT = ();
+our $VERSION = '0.07_1';
 
 sub AUTOLOAD {
     # This AUTOLOAD is used to 'autoload' constants from the constant()
@@ -77,7 +75,9 @@
 bootstrap Fuse $VERSION;
 
 sub main {
-	my (@subs) = (0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+	my (@subs) = (undef,undef,undef,undef,undef,undef,undef,undef,undef,undef,
+	              undef,undef,undef,undef,undef,undef,undef,undef,undef,undef,
+	              undef,undef,undef,undef,undef);
 	my (@names) = qw(getattr readlink getdir mknod mkdir unlink rmdir symlink
 			 rename link chmod chown truncate utime open read write statfs
 			 flush release fsync setxattr getxattr listxattr removexattr);
@@ -85,25 +85,42 @@
 	my ($tmp) = 0;
 	my (%mapping) = map { $_ => $tmp++ } (@names);
 	my (%optmap) = map { $_ => 1 } (@validOpts);
-	my (%otherargs) = (debug=>0, mountpoint=>"", mountopts=>"");
+	my (%otherargs) = (debug=>0, threaded=>0, mountpoint=>"", mountopts=>"");
 	while(my $name = shift) {
 		my ($subref) = shift;
 		if(exists($otherargs{$name})) {
 			$otherargs{$name} = $subref;
 		} else {
 			croak "There is no function $name" unless exists($mapping{$name});
-			croak "Usage: Fuse::main(getattr => &my_getattr, ...)" unless $subref;
-			croak "Usage: Fuse::main(getattr => &my_getattr, ...)" unless ref($subref);
-			croak "Usage: Fuse::main(getattr => &my_getattr, ...)" unless ref($subref) eq "CODE";
+			croak "Usage: Fuse::main(getattr => \"main::my_getattr\", ...)" unless $subref;
 			$subs[$mapping{$name}] = $subref;
 		}
 	}
-        foreach my $opt ( split(/,/,$otherargs{mountopts}) ) {
-          if ( ! exists($optmap{$opt}) ) {
-            croak "Use of an invalid mountopt argument";
-          }
-        }
-	perl_fuse_main($otherargs{debug},$otherargs{mountpoint},$otherargs{mountopts},@subs);
+	foreach my $opt ( split(/,/,$otherargs{mountopts}) ) {
+		if ( ! exists($optmap{$opt}) ) {
+			croak "Use of an invalid mountopt argument";
+		}
+	}
+	if($otherargs{threaded}) {
+		# make sure threads are both available, and loaded.
+		if($Config{useithreads}) {
+			if(exists($threads::{VERSION})) {
+				if(exists($threads::shared::{VERSION})) {
+					# threads will work.
+				} else {
+					carp("Thread support requires you to use threads::shared.\nThreads are disabled.\n");
+					$otherargs{threaded} = 0;
+				}
+			} else {
+				carp("Thread support requires you to use threads and threads::shared.\nThreads are disabled.\n");
+				$otherargs{threaded} = 0;
+			}
+		} else {
+			carp("Thread support was not compiled into this build of perl.\nThreads are disabled.\n");
+			$otherargs{threaded} = 0;
+		}
+	}
+ 	perl_fuse_main($otherargs{debug},$otherargs{threaded},$otherargs{mountpoint},$otherargs{mountopts},@subs);
 }
 
 # Autoload methods go after =cut, and are processed by the autosplit program.
@@ -120,7 +137,7 @@
   use Fuse;
   my ($mountpoint) = "";
   $mountpoint = shift(@ARGV) if @ARGV;
-  Fuse::main(mountpoint=>$mountpoint, getattr=>\&my_getattr, getdir=>\&my_getdir, ...);
+  Fuse::main(mountpoint=>$mountpoint, getattr=>"main::my_getattr", getdir=>"main::my_getdir", ...);
 
 =head1 DESCRIPTION
 
@@ -129,9 +146,6 @@
 
 FUSE expects you to implement callbacks for the various functions.
 
-NOTE:  I have only tested the things implemented in example.pl!
-It should work, but some things may not.
-
 In the following definitions, "errno" can be 0 (for a success),
 -EINVAL, -ENOENT, -EONFIRE, any integer less than 1 really.
 
@@ -144,13 +158,10 @@
 
 =head2 EXPORTED SYMBOLS
 
-FUSE_DEBUG by default.
+None by default.
 
 You can request all exportable symbols by using the tag ":all".
 
-You can request all debug symbols by using the tag ":debug".
-This will export FUSE_DEBUG.
-
 You can request the extended attribute symbols by using the tag ":xattr".
 This will export XATTR_CREATE and XATTR_REPLACE.
 
@@ -197,23 +208,31 @@
 
 =back
 
-unthreaded => boolean
+threaded => boolean
 
 =over 1
 
-This turns FUSE multithreading off and on.  NOTE: This perlmodule does not
-currently work properly in multithreaded mode!  The author is unfortunately
-not familiar enough with perl-threads internals, and according to the
-documentation available at time of writing (2002-03-08), those internals are
-subject to changing anyway.  Note that singlethreaded mode also means that
-you will not have to worry about reentrancy, though you will have to worry
-about recursive lookups (since the kernel holds a global lock on your
-filesystem and blocks waiting for one callback to complete before calling
-another).
-
-I hope to add full multithreading functionality later, but for now, I
-recommend you leave this option at the default, 1 (which means
-unthreaded, no threads will be used and no reentrancy is needed).
+This turns FUSE multithreading on and off.  The default is 0, meaning your FUSE
+script will run in single-threaded mode.  Note that single-threaded mode also
+means that you will not have to worry about reentrancy, though you will have to
+worry about recursive lookups.  In single-threaded mode, FUSE holds a global
+lock on your filesystem, and will wait for one callback to return before
+calling another.  This can lead to deadlocks, if your script makes any attempt
+to access files or directories in the filesystem it is providing.  (This
+includes calling stat() on the mount-point, statfs() calls from the 'df'
+command, and so on and so forth.)  It is worth paying a little attention and
+being careful about this.
+
+Enabling multithreading will cause FUSE to make multiple simultaneous calls
+into the various callback functions of your perl script.  If you enable 
+threaded mode, you can enjoy all the parallel execution and interactive
+response benefits of threads, and you get to enjoy all the benefits of race
+conditions and locking bugs, too.  Please also ensure any other perl modules
+you're using are also thread-safe.
+
+(If enabled, this option will cause a warning if your perl interpreter was not
+built with USE_ITHREADS, or if you have failed to use threads or
+threads::shared.)
 
 =back