[svn-r22625] HDFFV-8111: h5diff compare file to itself - removed path shortcut

1 files changed, 45 insertions, 0 deletions

diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c
index 604a825..1e7f88b 100644
--- a/tools/lib/h5diff_array.c
+++ b/tools/lib/h5diff_array.c
@@ -230,6 +230,7 @@ hsize_t diff_array( void *_mem1,
     mcomp_t       members;
     H5T_class_t   type_class;
 
+    h5difftrace("diff_array start\n");
     /* get the size. */
     size = H5Tget_size( m_type );
     type_class = H5Tget_class(m_type);
@@ -344,6 +345,7 @@ hsize_t diff_array( void *_mem1,
         } /* i */
         close_member_types(&members);
     } /* switch */
+    h5difftrace("diff_array finish\n");
 
     return nfound;
 }
@@ -423,6 +425,7 @@ hsize_t diff_datum(void       *_mem1,
     double        per;
     int           both_zero;
 
+    h5difftrace("diff_datum start\n");
     type_size = H5Tget_size( m_type );
     type_class = H5Tget_class(m_type);
 
@@ -2537,6 +2540,7 @@ hsize_t diff_datum(void       *_mem1,
     break; /* H5T_FLOAT class */
 
  } /* switch */
+    h5difftrace("diff_datum finish\n");
 
  return nfound;
 }
@@ -2822,6 +2826,7 @@ hsize_t character_compare(unsigned char *mem1,
 
     HDmemcpy(&temp1_uchar, mem1, sizeof(unsigned char));
     HDmemcpy(&temp2_uchar, mem2, sizeof(unsigned char));
+    h5difftrace("character_compare start\n");
 
     if (temp1_uchar != temp2_uchar)
     {
@@ -2836,6 +2841,7 @@ hsize_t character_compare(unsigned char *mem1,
         }
         nfound++;
     }
+    h5difftrace("character_compare finish\n");
 
     return nfound;
 }
@@ -2872,6 +2878,7 @@ hsize_t character_compare_opt(unsigned char *mem1,
     HDmemcpy(&temp1_uchar, mem1, sizeof(unsigned char));
     HDmemcpy(&temp2_uchar, mem2, sizeof(unsigned char));
 
+    h5difftrace("character_compare_opt start\n");
     /* -d and !-p */
 
     if (options->d && !options->p)
@@ -2927,6 +2934,7 @@ hsize_t character_compare_opt(unsigned char *mem1,
         }
         nfound++;
     }
+    h5difftrace("character_compare_opt finish\n");
 
     return nfound;
 
@@ -2965,6 +2973,7 @@ hsize_t diff_float(unsigned char *mem1,
     int         isnan1=0;
     int         isnan2=0;
 
+    h5difftrace("diff_float start\n");
 
  /*-------------------------------------------------------------------------
   * -d and !-p
@@ -3202,6 +3211,7 @@ hsize_t diff_float(unsigned char *mem1,
 
 
     }
+    h5difftrace("diff_float finish\n");
 
     return nfound;
 }
@@ -3239,6 +3249,7 @@ hsize_t diff_double(unsigned char *mem1,
     int         isnan1=0;
     int         isnan2=0;
 
+    h5difftrace("diff_double start\n");
  /*-------------------------------------------------------------------------
   * -d and !-p
   *-------------------------------------------------------------------------
@@ -3479,6 +3490,7 @@ hsize_t diff_double(unsigned char *mem1,
 
 
     }
+    h5difftrace("diff_double finish\n");
 
     return nfound;
 }
@@ -3521,6 +3533,7 @@ hsize_t diff_ldouble(unsigned char *mem1,
     int         isnan1=0;
     int         isnan2=0;
 
+    h5difftrace("diff_ldouble start\n");
 
  /*-------------------------------------------------------------------------
   * -d and !-p
@@ -3762,6 +3775,7 @@ hsize_t diff_ldouble(unsigned char *mem1,
 
 
     }
+    h5difftrace("diff_ldouble finish\n");
 
     return nfound;
 }
@@ -3802,6 +3816,7 @@ hsize_t diff_schar(unsigned char *mem1,
  double      per;
  int         both_zero;
 
+ h5difftrace("diff_schar start\n");
 
  /* -d and !-p */
  if (options->d && !options->p)
@@ -3943,6 +3958,7 @@ hsize_t diff_schar(unsigned char *mem1,
      } /* nelmts */
 
  }
+ h5difftrace("diff_schar finish\n");
 
  return nfound;
 }
@@ -3979,6 +3995,7 @@ hsize_t diff_uchar(unsigned char *mem1,
  double        per;
  int           both_zero;
 
+ h5difftrace("diff_uchar start\n");
 
  /* -d and !-p */
  if (options->d && !options->p)
@@ -4121,6 +4138,7 @@ hsize_t diff_uchar(unsigned char *mem1,
      } /* nelmts */
 
  }
+ h5difftrace("diff_uchar finish\n");
 
  return nfound;
 }
@@ -4155,6 +4173,7 @@ hsize_t diff_short(unsigned char *mem1,
  double        per;
  int           both_zero;
 
+ h5difftrace("diff_short start\n");
  /* -d and !-p */
  if (options->d && !options->p)
  {
@@ -4298,6 +4317,7 @@ hsize_t diff_short(unsigned char *mem1,
      } /* nelmts */
 
  }
+ h5difftrace("diff_short finish\n");
 
  return nfound;
 }
@@ -4333,6 +4353,7 @@ hsize_t diff_ushort(unsigned char *mem1,
  double         per;
  int            both_zero;
 
+ h5difftrace("diff_ushort start\n");
  /* -d and !-p */
  if (options->d && !options->p)
  {
@@ -4476,6 +4497,7 @@ hsize_t diff_ushort(unsigned char *mem1,
      } /* nelmts */
 
  }
+ h5difftrace("diff_ushort finish\n");
 
  return nfound;
 }
@@ -4512,6 +4534,7 @@ hsize_t diff_int(unsigned char *mem1,
  double        per;
  int           both_zero;
 
+ h5difftrace("diff_int start\n");
  /* -d and !-p */
  if (options->d && !options->p)
  {
@@ -4655,6 +4678,7 @@ hsize_t diff_int(unsigned char *mem1,
      } /* nelmts */
 
  }
+ h5difftrace("diff_int finish\n");
 
  return nfound;
 }
@@ -4691,6 +4715,7 @@ hsize_t diff_uint(unsigned char *mem1,
  double         per;
  int            both_zero;
 
+ h5difftrace("diff_uint start\n");
  /* -d and !-p */
  if (options->d && !options->p)
  {
@@ -4832,6 +4857,7 @@ hsize_t diff_uint(unsigned char *mem1,
      } /* nelmts */
 
  }
+ h5difftrace("diff_uint finish\n");
 
  return nfound;
 }
@@ -4868,6 +4894,7 @@ hsize_t diff_long(unsigned char *mem1,
  double        per;
  int           both_zero;
 
+ h5difftrace("diff_long start\n");
  /* -d and !-p */
  if (options->d && !options->p)
  {
@@ -5014,6 +5041,7 @@ hsize_t diff_long(unsigned char *mem1,
      } /* nelmts */
 
  }
+ h5difftrace("diff_long finish\n");
 
  return nfound;
 }
@@ -5051,6 +5079,7 @@ hsize_t diff_ulong(unsigned char *mem1,
  double         per;
  int            both_zero;
 
+ h5difftrace("diff_ulong start\n");
 
  /* -d and !-p */
  if (options->d && !options->p)
@@ -5198,6 +5227,7 @@ hsize_t diff_ulong(unsigned char *mem1,
      } /* nelmts */
 
  }
+ h5difftrace("diff_ulong finish\n");
 
  return nfound;
 }
@@ -5234,6 +5264,7 @@ hsize_t diff_llong(unsigned char *mem1,
  double        per;
  int           both_zero;
 
+ h5difftrace("diff_llong start\n");
  /* -d and !-p */
  if (options->d && !options->p)
  {
@@ -5371,6 +5402,7 @@ hsize_t diff_llong(unsigned char *mem1,
      } /* nelmts */
 
  }
+ h5difftrace("diff_llong finish\n");
 
  return nfound;
 }
@@ -5408,6 +5440,7 @@ hsize_t diff_ullong(unsigned char *mem1,
  double              per;
  int                 both_zero;
 
+ h5difftrace("diff_ullong start\n");
  /* -d and !-p */
  if (options->d && !options->p)
  {
@@ -5549,6 +5582,7 @@ hsize_t diff_ullong(unsigned char *mem1,
      } /* nelmts */
 
  }
+ h5difftrace("diff_ullong finish\n");
 
  return nfound;
 }
@@ -5575,6 +5609,7 @@ int ull2float(unsigned long long ull_value, float *f_value)
  size_t         src_size;
  size_t         dst_size;
 
+ h5difftrace("ull2float start\n");
  if((dxpl_id = H5Pcreate(H5P_DATASET_XFER))<0)
   return -1;
 
@@ -5592,6 +5627,7 @@ int ull2float(unsigned long long ull_value, float *f_value)
 
  if(buf)
      HDfree(buf);
+ h5difftrace("ull2float finish\n");
 
  return 0;
 
@@ -5601,6 +5637,7 @@ error:
  } H5E_END_TRY;
  if(buf)
      HDfree(buf);
+ h5difftrace("ull2float errored\n");
 
  return -1;
 }
@@ -5620,6 +5657,7 @@ error:
 static
 hbool_t equal_double(double value, double expected, diff_opt_t *options)
 {
+    h5difftrace("equal_double start\n");
     if ( options->do_nans )
     {
 
@@ -5656,6 +5694,7 @@ hbool_t equal_double(double value, double expected, diff_opt_t *options)
         if ( ABS( (value-expected) ) < DBL_EPSILON)
             return TRUE;
     }
+    h5difftrace("equal_double finish\n");
 
     return FALSE;
 }
@@ -5673,6 +5712,7 @@ hbool_t equal_double(double value, double expected, diff_opt_t *options)
 static
 hbool_t equal_ldouble(long double value, long double expected, diff_opt_t *options)
 {
+    h5difftrace("equal_ldouble start\n");
     if ( options->do_nans )
     {
 
@@ -5709,6 +5749,7 @@ hbool_t equal_ldouble(long double value, long double expected, diff_opt_t *optio
         if ( ABS( (value-expected) ) < DBL_EPSILON)
             return TRUE;
     }
+    h5difftrace("equal_ldouble finish\n");
 
     return FALSE;
 }
@@ -5730,6 +5771,7 @@ hbool_t equal_ldouble(long double value, long double expected, diff_opt_t *optio
 static
 hbool_t equal_float(float value, float expected, diff_opt_t *options)
 {
+    h5difftrace("equal_float start\n");
     if ( options->do_nans )
     {
 
@@ -5766,6 +5808,7 @@ hbool_t equal_float(float value, float expected, diff_opt_t *options)
         if ( ABS( (value-expected) ) < FLT_EPSILON)
             return TRUE;
     }
+    h5difftrace("equal_float finish\n");
 
     return FALSE;
 
@@ -5795,6 +5838,7 @@ my_isnan(dtype_t type, void *val)
     int retval = 0;
     char s[256];
 
+    h5difftrace("my_isnan start\n");
     if (FLT_FLOAT==type)
     {
         float x;
@@ -5893,6 +5937,7 @@ my_isnan(dtype_t type, void *val)
         }
     }
 #endif /*H5_VMS*/
+    h5difftrace("my_isnan finish\n");
 
     return retval;
 }