[svn-r25932] HDFFV-8902: merge the source code of h5perf and h5perf_serial, stage 1.

tools/perform/sio_timer.h:
tools/perform/pio_timer.c:
tools/perform/io_timer.h:
tools/perform/io_timer.c:
    Renamed pio_timer.[ch] as io_timer.[ch];
    merged content of sio_timer.[ch] into io_timer.[ch] so that both h5perf and h5perf_serial
    call the combined io_timer.[ch].
    Moved the debug printing code segment in set_time() in [sp]io_timer.c to as debug_start_stop_time() in [sp]io_perf.c where it belongs.
    Screened out set_timer_type() and get_timer_type() which were not used by any code.

tools/perform/Makefile.am:
tools/perform/Makefile.in:
tools/perform/CMakeLists.txt
    Adjusted to use io_timer.c for both h5perf and h5perf_serial.

tools/perform/pio_perf.c:
tools/perform/sio_perf.c:
tools/perform/pio_perf.h:
tools/perform/sio_perf.h:
    Renamed [sp]io_time_destory() to same io_time_destroy();
    Moved the debug printing code segment in set_time() in [sp]io_timer.c to as debug_start_stop_time() in [sp]io_perf.c where it belongs.

tools/perform/pio_engine.c:
tools/perform/sio_engine.c:
    Removed #include io_timer.h since it was already #include by [sp]io_perf.h.

MANIFEST:
    Updated the merge of [sp]io_timer.[ch] into io_timer.[ch].

Tested: h5committest and jam in extra.

1 files changed, 0 insertions, 82 deletions

diff --git a/tools/perform/pio_timer.h b/tools/perform/pio_timer.h
deleted file mode 100644
index a5ee6d7..0000000
--- a/tools/perform/pio_timer.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of HDF5.  The full HDF5 copyright notice, including     *
- * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef PIO_TIMER__
-#define PIO_TIMER__
-
-#include "hdf5.h"
-
-#if defined(H5_TIME_WITH_SYS_TIME)
-#   include <sys/time.h>
-#   include <time.h>
-#elif defined(H5_HAVE_SYS_TIME_H)
-#   include <sys/time.h>
-#else
-#   include <time.h>
-#endif
-
-/* The different types of timers we can have */
-typedef enum timer_type_ {
-    HDF5_FILE_OPENCLOSE,
-    HDF5_DATASET_CREATE,
-    HDF5_MPI_WRITE,
-    HDF5_MPI_READ,
-    HDF5_FILE_READ_OPEN,
-    HDF5_FILE_READ_CLOSE,
-    HDF5_FILE_WRITE_OPEN,
-    HDF5_FILE_WRITE_CLOSE,
-    HDF5_FINE_WRITE_FIXED_DIMS,
-    HDF5_FINE_READ_FIXED_DIMS,
-    HDF5_GROSS_WRITE_FIXED_DIMS,
-    HDF5_GROSS_READ_FIXED_DIMS,
-    HDF5_RAW_WRITE_FIXED_DIMS,
-    HDF5_RAW_READ_FIXED_DIMS,
-    NUM_TIMERS
-} timer_type;
-
-typedef enum clock_type_ {
-    MPI_TIMER = 0,  /* Use MPI timer to measure time        */
-    SYS_TIMER = 1   /* Use system clock to measure time     */
-} clock_type;
-
-/* Miscellaneous identifiers */
-enum {
-    TSTART,          /* Start a specified timer              */
-    TSTOP            /* Stop a specified timer               */
-};
-
-/* The performance time structure */
-typedef struct pio_time_ {
-    clock_type type;
-    double total_time[NUM_TIMERS];
-    double mpi_timer[NUM_TIMERS];
-    struct timeval sys_timer[NUM_TIMERS];
-} pio_time;
-
-/* External function declarations */
-#ifdef __cplusplus
-extern "C" {
-#endif  /* __cplusplus */
-extern pio_time    *pio_time_new(clock_type t);
-extern void         pio_time_destroy(pio_time *pt);
-extern void         set_timer_type(pio_time *pt, clock_type type);
-extern clock_type   get_timer_type(pio_time *pt);
-extern pio_time    *set_time(pio_time *pt, timer_type t, int start_stop);
-extern double       get_time(pio_time *pt, timer_type t);
-#ifdef __cplusplus
-}
-#endif  /* __cplusplus */
-
-#endif  /* PIO_TIMER__ */