From 6d9e8c653527bf45df71a985ca052519f2a2944d Mon Sep 17 00:00:00 2001
From: ccooper <ccooper>
Date: Mon, 28 Jul 2003 19:24:06 +0000
Subject: [PATCH] - remove call to create.pl using old syntax left in a-m-d by
 accident - add SCRIPT_NAME to output of create.pl and rename.pl to improve
 readability when many threads are being run simultaneously, like say, in
 a-m-d - don't fail on create when files already exist in rename.pl, since
 that isn't the focus of this test

---
 lustre/tests/rename.pl | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/lustre/tests/rename.pl b/lustre/tests/rename.pl
index 4ea020f..ee9bb4d 100644
--- a/lustre/tests/rename.pl
+++ b/lustre/tests/rename.pl
@@ -12,11 +12,14 @@ use POSIX ":sys_wait_h";
 
 use vars qw(
             $MAX_THREADS
+	    $SCRIPT_NAME
             );
  
 # Don't try to run more than this many threads concurrently.
 $MAX_THREADS = 16;
 
+$SCRIPT_NAME = "rename.pl";
+
 # Initialize variables
 my $silent = 0;
 my $create_files = 1; # should we create files or not?
@@ -104,7 +107,7 @@ if ($create_files) {
 		unlink("$filepath") if (-e $filepath);
 	    }
 	    my $rc = rmdir $path;
-	    print "rmdir $path failed: $!\n" if !$rc;	    
+	    print "$SCRIPT_NAME - rmdir $path failed: $!\n" if !$rc;	    
 	}
     }
 }
@@ -137,6 +140,11 @@ sub usage () {
 sub create_file ($) {
     my ($path) = @_;;
     
+    if (-e $path) {
+	warn "$path already exists!\n";
+	return 1;
+    }
+
     if ($use_mcreate) {
         my $tmp = `./mcreate $path`;
 	if ($tmp =~ /.*error: (.*)\n/) {
@@ -174,18 +182,18 @@ sub fork_and_rename ($) {
 		  my $path_f1 = "${mountpt}${which}/${thread_num}.${d}/${f1}";
 		  my $path_f2 = "${mountpt}${which}/${thread_num}.${d}/${f2}";
 		  
-		  print "Thread $thread_num: [$$] $path_f1 $path_f2 ...\n" if !$silent;
+		  print "$SCRIPT_NAME - Thread $thread_num: [$$] $path_f1 $path_f2 ...\n" if !$silent;
 		  my $rc = rename $path_f1, $path_f2;
-		  print "Thread $thread_num: [$$] done: $rc\n" if !$silent;
+		  print "$SCRIPT_NAME - Thread $thread_num: [$$] done: $rc\n" if !$silent;
 	      }
 	      if (($current_iteration) % 100 == 0) {
-		  print STDERR "Thread $thread_num: " . $current_iteration . " operations [" . $$ . "]\n";
+		  print "$SCRIPT_NAME - Thread $thread_num: " . $current_iteration . " operations [" . $$ . "]\n";
 		  
 	      }
 	      $current_iteration++;
 	  }
 
-	  print "Thread $thread_num: Done.\n";
+	  print "$SCRIPT_NAME - Thread $thread_num: Done.\n";
 
 	  exit 0;
 
-- 
1.8.3.1