mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-02-11 16:01:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r23118] HDFFV-2686 Remove the ptExampleVL.c example from the source code

Browse Source 
FIX: Removed files and adjusted other files accordingly.

Tested: jam (gnu)
This commit is contained in:
Scot Breitenfeld 2012-12-22 14:33:27 -05:00
parent 07df6630f1
commit 16c2af26b6
11 changed files with 9 additions and 269 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MANIFEST
View File

@ -2152,7 +2152,6 @@
./hl/examples/image8.txt
./hl/examples/pal_rgb.h
./hl/examples/ptExampleFL.c
./hl/examples/ptExampleVL.c
./hl/examples/run-hl-ex.sh
./hl/examples/run-hlc-ex.sh.in
./hl/src/COPYING
@ -2265,7 +2264,6 @@
./hl/c++/examples/Makefile.am
./hl/c++/examples/Makefile.in
./hl/c++/examples/ptExampleFL.cpp
./hl/c++/examples/ptExampleVL.cpp
./hl/c++/examples/run-hlc++-ex.sh.in
./hl/c++/src/H5PacketTable.h
./hl/c++/src/H5PacketTable.cpp

11
hl/c++/examples/CMakeLists.txt
View File

@ -20,17 +20,6 @@ TARGET_LINK_LIBRARIES (
)
SET_TARGET_PROPERTIES (ptExampleFL PROPERTIES FOLDER examples/hl/cpp)
ADD_EXECUTABLE (ptExampleVL ${HDF5_HL_CPP_EXAMPLES_SOURCE_DIR}/ptExampleVL.cpp)
TARGET_NAMING (ptExampleVL ${LIB_TYPE})
TARGET_LINK_LIBRARIES (
ptExampleVL
${HDF5_HL_CPP_LIB_TARGET}
${HDF5_HL_LIB_TARGET}
${HDF5_LIB_TARGET}
)
SET_TARGET_PROPERTIES (ptExampleVL PROPERTIES FOLDER examples/hl/cpp)
IF (BUILD_TESTING)
ADD_TEST (NAME cpp_hl_ex_ptExampleFL COMMAND $<TARGET_FILE:ptExampleFL>)
ADD_TEST (NAME cpp_hl_ex_ptExampleVL COMMAND $<TARGET_FILE:ptExampleVL>)
ENDIF (BUILD_TESTING)

5
hl/c++/examples/Makefile.am
View File

@ -23,10 +23,10 @@ include $(top_srcdir)/config/commence.am
# These are the programs that 'make all' or 'make prog' will build and
# which 'make check' will run. List them in the order they should be run.
EXAMPLE_PROG=ptExampleFL ptExampleVL
EXAMPLE_PROG=ptExampleFL
# These are the example files to be installed
INSTALL_FILES=ptExampleFL.cpp ptExampleVL.cpp
INSTALL_FILES=ptExampleFL.cpp
INSTALL_SCRIPT_FILES = run-hlc++-ex.sh
# Tell conclude.am that these are C++ tests.
@ -45,7 +45,6 @@ $(EXTRA_PROG): $(H5CPP)
# will try to build them with the normal C++ compiler, not h5c++. This is
# an inelegant way of solving the problem, unfortunately.
ptExampleFL: ptExampleFL.cpp
ptExampleVL: ptExampleVL.cpp
include $(top_srcdir)/config/examples.am
include $(top_srcdir)/config/conclude.am

5
hl/c++/examples/Makefile.in
View File

@ -390,10 +390,10 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5
# These are the programs that 'make all' or 'make prog' will build and
# which 'make check' will run. List them in the order they should be run.
EXAMPLE_PROG = ptExampleFL ptExampleVL
EXAMPLE_PROG = ptExampleFL
# These are the example files to be installed
INSTALL_FILES = ptExampleFL.cpp ptExampleVL.cpp
INSTALL_FILES = ptExampleFL.cpp
INSTALL_SCRIPT_FILES = run-hlc++-ex.sh
# Tell conclude.am that these are C++ tests.
@ -651,7 +651,6 @@ $(EXTRA_PROG): $(H5CPP)
# will try to build them with the normal C++ compiler, not h5c++. This is
# an inelegant way of solving the problem, unfortunately.
ptExampleFL: ptExampleFL.cpp
ptExampleVL: ptExampleVL.cpp
# How to create EXAMPLEDIR if it doesn't already exist
$(EXAMPLEDIR):

112
hl/c++/examples/ptExampleVL.cpp
View File

@ -1,112 +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. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#include "H5PacketTable.h"
/*-------------------------------------------------------------------------
* Packet Table Variable-Length Example
*
* Example program that creates a packet table and performs
* writes and reads.
*
*-------------------------------------------------------------------------
*/
int main(void)
{
#ifdef VLPT_REMOVED
herr_t err; /* Return value from function calls */
hid_t fileID; /* HDF5 identifier for file */
hsize_t count; /* Number of records in table */
int x; /* Loop variable */
/* This example has two different sizes of "record": longs and shorts */
long longBuffer[5];
short shortBuffer[5];
/* Buffer of hvl_t structs to read back records */
hvl_t readBuffer[5];
/* Initialize buffers */
for(x=0; x<5; x++)
{
longBuffer[x] = -x;
shortBuffer[x] = x;
}
/* Create a new HDF5 file */
fileID = H5Fcreate("PTcppexampleVL.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
if(fileID <0)
fprintf(stderr, "Couldn't create file.\n");
/* Create a variable-length packet table. */
VL_PacketTable ptable(fileID, "/examplePacketTable", 1);
if(! ptable.IsValid())
fprintf(stderr, "Unable to create packet table.");
/* Append five packets to the packet table. */
/* In C++, there is no need to package data into hvl_t structs. */
err = ptable.AppendPacket( &(longBuffer[0]), sizeof(long));
if(err < 0)
fprintf(stderr, "Error adding record.");
err = ptable.AppendPacket( &(shortBuffer[1]), sizeof(short));
if(err < 0)
fprintf(stderr, "Error adding record.");
err = ptable.AppendPacket( &(longBuffer[2]), sizeof(long));
if(err < 0)
fprintf(stderr, "Error adding record.");
err = ptable.AppendPacket( &(longBuffer[3]), sizeof(long));
if(err < 0)
fprintf(stderr, "Error adding record.");
err = ptable.AppendPacket( &(shortBuffer[4]), sizeof(short));
if(err < 0)
fprintf(stderr, "Error adding record.");
/* Get the number of packets in the packet table. This should be five. */
count = ptable.GetPacketCount(err);
if(err < 0)
fprintf(stderr, "Error getting packet count.");
printf("Number of packets in packet table after five appends: %d\n", count);
/* Initialize packet table's "current record" */
ptable.ResetIndex();
/* Iterate through packets, read each one back */
for(x=0; x<5; x++)
{
err = ptable.GetNextPacket( &(readBuffer[x]) );
if(err < 0)
fprintf(stderr, "Error reading record.");
printf("Packet %d's length is %d.\n", x, readBuffer[x].len);
if(readBuffer[x].len == sizeof(long))
printf("Packet %d's value is %d.\n", x, *((long *) readBuffer[x].p) );
else
printf("Packet %d's value is %d.\n", x, *((short *) readBuffer[x].p) );
}
/* The packet table will close automatically when its object goes */
/* out of scope. */
err = H5Fclose(fileID);
if( err < 0 )
fprintf(stderr, "Failed to close file.\n");
#endif /* VLPT_REMOVED */
return 0;
}

4
hl/c++/examples/run-hlc++-ex.sh.in
View File

@ -64,9 +64,7 @@ RunTest()
if [ $? -eq 0 ]
then
if (RunTest ptExampleFL &&\
rm ptExampleFL &&\
RunTest ptExampleVL &&\
rm ptExampleVL); then
rm ptExampleFL); then
EXIT_VALUE=${EXIT_SUCCESS}
else
EXIT_VALUE=${EXIT_FAILURE}

1
hl/examples/CMakeLists.txt
View File

@ -23,7 +23,6 @@ SET (examples
ex_lite2
ex_lite3
ptExampleFL
ptExampleVL
ex_image1
ex_image2
ex_table_01

5
hl/examples/Makefile.am
View File

@ -34,7 +34,7 @@ EXAMPLETOPDIR=${DESTDIR}$(exec_prefix)/share/hdf5_examples/hl
# Don't tell automake about them, because if it knew they were programs,
# it would try to compile them instead of using the h5cc script.
# Use the boilerplate in config/examples.am instead.
EXAMPLE_PROG = ex_lite1 ex_lite2 ex_lite3 ptExampleFL ptExampleVL \
EXAMPLE_PROG = ex_lite1 ex_lite2 ex_lite3 ptExampleFL \
ex_image1 ex_image2 \
ex_table_01 ex_table_02 ex_table_03 ex_table_04 \
ex_table_05 ex_table_06 ex_table_07 ex_table_08 \
@ -43,7 +43,7 @@ EXAMPLE_PROG = ex_lite1 ex_lite2 ex_lite3 ptExampleFL ptExampleVL \
# Install files
# List all file that should be installed in examples directory
INSTALL_FILES = ex_lite1.c ex_lite2.c ex_lite3.c ptExampleFL.c ptExampleVL.c \
INSTALL_FILES = ex_lite1.c ex_lite2.c ex_lite3.c ptExampleFL.c \
ex_image1.c ex_image2.c \
ex_table_01.c ex_table_02.c ex_table_03.c ex_table_04.c \
ex_table_05.c ex_table_06.c ex_table_07.c ex_table_08.c \
@ -75,7 +75,6 @@ ex_lite1: $(srcdir)/ex_lite1.c
ex_lite2: $(srcdir)/ex_lite2.c
ex_lite3: $(srcdir)/ex_lite3.c
ptExampleFL: $(srcdir)/ptExampleFL.c
ptExampleVL: $(srcdir)/ptExampleVL.c
ex_image1: $(srcdir)/ex_image1.c
ex_image2: $(srcdir)/ex_image2.c
ex_table01: $(srcdir)/ex_table01.c

5
hl/examples/Makefile.in
View File

@ -398,7 +398,7 @@ EXAMPLETOPDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples/hl
# Don't tell automake about them, because if it knew they were programs,
# it would try to compile them instead of using the h5cc script.
# Use the boilerplate in config/examples.am instead.
EXAMPLE_PROG = ex_lite1 ex_lite2 ex_lite3 ptExampleFL ptExampleVL \
EXAMPLE_PROG = ex_lite1 ex_lite2 ex_lite3 ptExampleFL \
ex_image1 ex_image2 \
ex_table_01 ex_table_02 ex_table_03 ex_table_04 \
ex_table_05 ex_table_06 ex_table_07 ex_table_08 \
@ -408,7 +408,7 @@ EXAMPLE_PROG = ex_lite1 ex_lite2 ex_lite3 ptExampleFL ptExampleVL \
# Install files
# List all file that should be installed in examples directory
INSTALL_FILES = ex_lite1.c ex_lite2.c ex_lite3.c ptExampleFL.c ptExampleVL.c \
INSTALL_FILES = ex_lite1.c ex_lite2.c ex_lite3.c ptExampleFL.c \
ex_image1.c ex_image2.c \
ex_table_01.c ex_table_02.c ex_table_03.c ex_table_04.c \
ex_table_05.c ex_table_06.c ex_table_07.c ex_table_08.c \
@ -677,7 +677,6 @@ ex_lite1: $(srcdir)/ex_lite1.c
ex_lite2: $(srcdir)/ex_lite2.c
ex_lite3: $(srcdir)/ex_lite3.c
ptExampleFL: $(srcdir)/ptExampleFL.c
ptExampleVL: $(srcdir)/ptExampleVL.c
ex_image1: $(srcdir)/ex_image1.c
ex_image2: $(srcdir)/ex_image2.c
ex_table01: $(srcdir)/ex_table01.c

126
hl/examples/ptExampleVL.c
View File

@ -1,126 +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. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#include "hdf5.h"
#include "hdf5_hl.h"
#include <stdlib.h>
/*-------------------------------------------------------------------------
* Packet Table Variable-Length Example
*
* Example program that creates a variable-length packet table and performs
* writes and reads.
*
*-------------------------------------------------------------------------
*/
int main(void)
{
#ifdef VLPT_REMOVED
hid_t fid; /* File identifier */
hid_t ptable; /* Packet table identifier */
herr_t err; /* Function return status */
hsize_t count; /* Number of records in the table */
int x; /* Loop variable */
/* Buffers to hold data */
hvl_t writeBuffer[5];
hvl_t readBuffer[5];
/* This example has two different sizes of "record": longs and shorts */
long longBuffer[5];
short shortBuffer[5];
/* Initialize buffers */
for(x=0; x<5; x++)
{
longBuffer[x] = -x;
shortBuffer[x] = x;
}
/* Fill the write buffer with a mix of longs and shorts */
/* We need to supply the length of each record and a pointer to */
/* the beginning of each record. */
writeBuffer[0].len = sizeof(long);
writeBuffer[0].p = &(longBuffer[0]);
writeBuffer[1].len = sizeof(short);
writeBuffer[1].p = &(shortBuffer[1]);
writeBuffer[2].len = sizeof(long);
writeBuffer[2].p = &(longBuffer[2]);
writeBuffer[3].len = sizeof(long);
writeBuffer[3].p = &(longBuffer[3]);
writeBuffer[4].len = sizeof(short);
writeBuffer[4].p = &(shortBuffer[4]);
/* Create a file using default properties */
fid=H5Fcreate("packet_table_VLexample.h5",H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT);
/* Create a variable-length packet table within the file */
ptable = H5PTcreate_vl(fid, "Packet Test Dataset", (hsize_t)1);
if(ptable == H5I_INVALID_HID)
goto out;
/* Write the entire buffer to the packet table */
err = H5PTappend(ptable, (hsize_t)5, writeBuffer );
if(err < 0)
goto out;
/* Get the number of packets in the packet table. This should be five. */
err = H5PTget_num_packets(ptable, &count);
if(err < 0)
goto out;
printf("Number of packets in packet table after five appends: %d\n", count);
/* Read all five packets back */
err = H5PTread_packets(ptable, (hsize_t)0, (hsize_t)5, readBuffer );
if(err < 0)
goto out;
for(x=0; x<5; x++)
{
printf("Packet %d's length is %d\n", x, readBuffer[x].len);
if(readBuffer[x].len == sizeof(long))
printf("Packet %d's value is %d\n", x, *( (long *) readBuffer[x].p) );
else
printf("Packet %d's value is %d\n", x, *( (short *) readBuffer[x].p) );
}
/* Before we close the packet table, we must free the memory that */
/* the pointers in readBuffer point to. */
err = H5PTfree_vlen_readbuff(ptable, (hsize_t)5, readBuffer);
if(err < 0)
goto out;
/* Close the packet table */
err = H5PTclose(ptable);
if(err < 0)
goto out;
/* Close the file */
H5Fclose(fid);
#endif /* VLPT_REMOVED */
return 0;
#ifdef VLPT_REMOVED
out: /* An error has occurred. Clean up and exit. */
fprintf(stderr, "An error has occurred!\n");
H5PTclose(ptable);
H5Fclose(fid);
return -1;
#endif /* VLPT_REMOVED */
}

2
hl/examples/run-hlc-ex.sh.in
View File

@ -76,8 +76,6 @@ then
rm ex_lite3 &&\
RunTest ptExampleFL &&\
rm ptExampleFL &&\
RunTest ptExampleVL &&\
rm ptExampleVL &&\
RunTest ex_image1 &&\
rm ex_image1 &&\
RunTest ex_image2 &&\