[svn-r19330] Description:

	Bring r19109:19328 from trunk to revise_chunks branch.

Tested on:
        FreeBSD/32 6.3 (duty) in debug mode
        FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
                w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x,
                w/C++ & FORTRAN, in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                w/szip filter, w/threadsafe, in production mode
        Linux/PPC 2.6 (heiwa) w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                in production mode
        Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in debug mode
        Mac OS X/32 10.6.4 (amazon) in debug mode
        Mac OS X/32 10.6.4 (amazon) w/C++ & FORTRAN, w/threadsafe,
                in production mode
        Mac OS X/32 10.6.4 (amazon) w/parallel, in debug mode

1 files changed, 131 insertions, 62 deletions

diff --git a/tools/lib/h5tools_utils.c b/tools/lib/h5tools_utils.c
index 04d375d..a0fca8b 100644
--- a/tools/lib/h5tools_utils.c
+++ b/tools/lib/h5tools_utils.c
@@ -42,6 +42,12 @@ const char *opt_arg;        /*flag argument (or value)               */
 static int  h5tools_d_status = 0;
 static const char  *h5tools_progname = "h5tools";
 
+/* ``parallel_print'' variables */
+unsigned char  g_Parallel = 0;  /*0 for serial, 1 for parallel */
+char     outBuff[OUTBUFF_SIZE];
+int      outBuffOffset;
+FILE*    overflow_file = NULL;
+
 /* local functions */
 static void init_table(table_t **tbl);
 #ifdef H5DUMP_DEBUG
@@ -49,6 +55,72 @@ static void dump_table(char* tablename, table_t *table);
 #endif  /* H5DUMP_DEBUG */
 static void add_obj(table_t *table, haddr_t objno, const char *objname, hbool_t recorded);
 
+/*-------------------------------------------------------------------------
+ * Function: parallel_print
+ *
+ * Purpose: wrapper for printf for use in parallel mode.
+ *
+ * Programmer: Leon Arber
+ *
+ * Date: December 1, 2004
+ *
+ *-------------------------------------------------------------------------
+ */
+void parallel_print(const char* format, ...)
+{
+ int  bytes_written;
+ va_list ap;
+
+ va_start(ap, format);
+
+ if(!g_Parallel)
+  vprintf(format, ap);
+ else
+ {
+
+  if(overflow_file == NULL) /*no overflow has occurred yet */
+  {
+#if 0
+   printf("calling HDvsnprintf: OUTBUFF_SIZE=%ld, outBuffOffset=%ld, ", (long)OUTBUFF_SIZE, (long)outBuffOffset);
+#endif
+   bytes_written = HDvsnprintf(outBuff+outBuffOffset, OUTBUFF_SIZE-outBuffOffset, format, ap);
+#if 0
+   printf("bytes_written=%ld\n", (long)bytes_written);
+#endif
+   va_end(ap);
+   va_start(ap, format);
+
+#if 0
+   printf("Result: bytes_written=%ld, OUTBUFF_SIZE-outBuffOffset=%ld\n", (long)bytes_written, (long)OUTBUFF_SIZE-outBuffOffset);
+#endif
+
+   if ((bytes_written < 0) ||
+#ifdef H5_VSNPRINTF_WORKS
+    (bytes_written >= (OUTBUFF_SIZE-outBuffOffset))
+#else
+    ((bytes_written+1) == (OUTBUFF_SIZE-outBuffOffset))
+#endif
+    )
+   {
+    /* Terminate the outbuff at the end of the previous output */
+    outBuff[outBuffOffset] = '\0';
+
+    overflow_file = HDtmpfile();
+    if(overflow_file == NULL)
+     fprintf(stderr, "warning: could not create overflow file.  Output may be truncated.\n");
+    else
+     bytes_written = HDvfprintf(overflow_file, format, ap);
+   }
+   else
+    outBuffOffset += bytes_written;
+  }
+  else
+   bytes_written = HDvfprintf(overflow_file, format, ap);
+
+ }
+ va_end(ap);
+}
+
 
 /*-------------------------------------------------------------------------
  * Function:    error_msg
@@ -338,11 +410,11 @@ print_version(const char *progname)
 static void
 init_table(table_t **tbl)
 {
-    table_t *table = HDmalloc(sizeof(table_t));
+    table_t *table = (table_t *)HDmalloc(sizeof(table_t));
 
     table->size = 20;
     table->nobjs = 0;
-    table->objs = HDmalloc(table->size * sizeof(obj_t));
+    table->objs = (obj_t *)HDmalloc(table->size * sizeof(obj_t));
 
     *tbl = table;
 }
@@ -591,7 +663,7 @@ add_obj(table_t *table, haddr_t objno, const char *objname, hbool_t record)
     /* See if we need to make table larger */
     if(table->nobjs == table->size) {
         table->size *= 2;
-        table->objs = HDrealloc(table->objs, table->size * sizeof(table->objs[0]));
+        table->objs = (struct obj_t *)HDrealloc(table->objs, table->size * sizeof(table->objs[0]));
     } /* end if */
 
     /* Increment number of objects in table */
@@ -653,112 +725,109 @@ tmpfile(void)
  *
  * Date: Feb 8, 2010
  *-------------------------------------------------------------------------*/
-int H5tools_get_link_info(hid_t file_id, const char * linkpath, h5tool_link_info_t *link_info)
+int
+H5tools_get_link_info(hid_t file_id, const char * linkpath, h5tool_link_info_t *link_info,
+    hbool_t get_obj_type)
 {
-    int ret = -1; /* init to fail */
     htri_t l_ret;
     H5O_info_t trg_oinfo;
-    hid_t fapl;
+    hid_t fapl = H5P_DEFAULT;
     hid_t lapl = H5P_DEFAULT;
+    int ret = -1; /* init to fail */
 
     /* init */
     link_info->trg_type = H5O_TYPE_UNKNOWN;
 
     /* check if link itself exist */
-    if((H5Lexists(file_id, linkpath, H5P_DEFAULT) <= 0)) 
-    {
-        if(link_info->opt.msg_mode==1)
+    if(H5Lexists(file_id, linkpath, H5P_DEFAULT) <= 0) {
+        if(link_info->opt.msg_mode == 1)
             parallel_print("Warning: link <%s> doesn't exist \n",linkpath);
         goto out;
-    }
+    } /* end if */
 
     /* get info from link */
-    if(H5Lget_info(file_id, linkpath, &(link_info->linfo), H5P_DEFAULT) < 0)
-    {
-        if(link_info->opt.msg_mode==1)
+    if(H5Lget_info(file_id, linkpath, &(link_info->linfo), H5P_DEFAULT) < 0) {
+        if(link_info->opt.msg_mode == 1)
             parallel_print("Warning: unable to get link info from <%s>\n",linkpath);
         goto out;
-    }
+    } /* end if */
 
     /* given path is hard link (object) */
-    if (link_info->linfo.type == H5L_TYPE_HARD)
-    {
+    if(link_info->linfo.type == H5L_TYPE_HARD) {
         ret = 2;
         goto out;
-    }
+    } /* end if */
 
     /* trg_path must be freed out of this function when finished using */
     link_info->trg_path = (char*)HDcalloc(link_info->linfo.u.val_size, sizeof(char));
     HDassert(link_info->trg_path);
 
     /* get link value */
-    if(H5Lget_val(file_id, linkpath, link_info->trg_path, link_info->linfo.u.val_size, H5P_DEFAULT) < 0)
-    {
-        if(link_info->opt.msg_mode==1)
+    if(H5Lget_val(file_id, linkpath, (void *)link_info->trg_path, link_info->linfo.u.val_size, H5P_DEFAULT) < 0) {
+        if(link_info->opt.msg_mode == 1)
             parallel_print("Warning: unable to get link value from <%s>\n",linkpath);
         goto out;
-    }
+    } /* end if */
 
     /*-----------------------------------------------------
      * if link type is external link use different lapl to 
      * follow object in other file
      */
-    if (link_info->linfo.type == H5L_TYPE_EXTERNAL)
-    {
+    if(link_info->linfo.type == H5L_TYPE_EXTERNAL) {
         fapl = H5Pcreate(H5P_FILE_ACCESS);
         H5Pset_fapl_sec2(fapl);
         lapl = H5Pcreate(H5P_LINK_ACCESS);
         H5Pset_elink_fapl(lapl, fapl);
-    }
+    } /* end if */
 
-    /*--------------------------------------------------------------
-     * if link's target object exist, get type
-     */
-     /* check if target object exist */
-    l_ret = H5Oexists_by_name(file_id, linkpath, lapl);
-    
-    /* detect dangling link */
-    if(l_ret == FALSE) 
-    {
+    /* Check for retrieving object info */
+    if(get_obj_type) {
+        /*--------------------------------------------------------------
+         * if link's target object exist, get type
+         */
+         /* check if target object exist */
+        l_ret = H5Oexists_by_name(file_id, linkpath, lapl);
+        
+        /* detect dangling link */
+        if(l_ret == FALSE) {
             ret = 0;
             goto out;
-    }
-    /* function failed */
-    else if (l_ret < 0)
-    {
-        goto out;    
-    }
-
-    /* get target object info */
-    if(H5Oget_info_by_name(file_id, linkpath, &trg_oinfo, lapl) < 0) 
-    {
-        if(link_info->opt.msg_mode==1)
-            parallel_print("Warning: unable to get object information for <%s>\n", linkpath);
-        goto out;
-    }
+        } /* end if */
+        /* function failed */
+        else if(l_ret < 0)
+            goto out;    
+
+        /* get target object info */
+        if(H5Oget_info_by_name(file_id, linkpath, &trg_oinfo, lapl) < 0) {
+            if(link_info->opt.msg_mode == 1)
+                parallel_print("Warning: unable to get object information for <%s>\n", linkpath);
+            goto out;
+        } /* end if */
 
-    /* check unknown type */
-    if (trg_oinfo.type < H5O_TYPE_GROUP || trg_oinfo.type >=H5O_TYPE_NTYPES)
-    {
-        if(link_info->opt.msg_mode==1)
-            parallel_print("Warning: target object of <%s> is unknown type\n", linkpath);
-        goto out;
-    } 
+        /* check unknown type */
+        if(trg_oinfo.type < H5O_TYPE_GROUP || trg_oinfo.type >=H5O_TYPE_NTYPES) {
+            if(link_info->opt.msg_mode == 1)
+                parallel_print("Warning: target object of <%s> is unknown type\n", linkpath);
+            goto out;
+        }  /* end if */
 
-    /* set target obj type to return */
-    link_info->trg_type = trg_oinfo.type;
+        /* set target obj type to return */
+        link_info->trg_type = trg_oinfo.type;
+    } /* end if */
+    else
+        link_info->trg_type = H5O_TYPE_UNKNOWN;
 
     /* succeed */
     ret = 1;
+
 out:
-    if (link_info->linfo.type == H5L_TYPE_EXTERNAL)
-    {
+    if(fapl != H5P_DEFAULT)
         H5Pclose(fapl);
+    if(lapl != H5P_DEFAULT)
         H5Pclose(lapl);
-    }
 
     return ret;
-}
+} /* end H5tools_get_link_info() */
 
 /*-------------------------------------------------------------------------
  * Audience:    Public
@@ -778,12 +847,12 @@ void h5tools_setstatus(int D_status)
     h5tools_d_status = D_status;
 }
 
-const char*h5tools_getprogname()
+const char*h5tools_getprogname(void)
 {
    return h5tools_progname;
 }
 
-int h5tools_getstatus()
+int h5tools_getstatus(void)
 {
    return h5tools_d_status;
 }