From b4866778a61ac44c3bf80030e236d2924d0a9a3a Mon Sep 17 00:00:00 2001 From: Dana Robinson Date: Thu, 17 Feb 2022 10:56:42 -0800 Subject: Updated VFD SWMR's Akadio license --- COPYING | 8 ++++++++ COPYING_AKADIO | 45 +++++++++++++++++++++++++++++++++++++++++ MANIFEST | 1 + examples/credel.c | 13 ++++++++++++ examples/gaussians.c | 13 ++++++++++++ examples/h5_dtransform.c | 1 - examples/nbcompat.c | 13 ++++++++++++ examples/nbcompat.h | 13 ++++++++++++ src/H5FDvfd_swmr.c | 1 + src/H5FDvfd_swmr.h | 1 + src/H5FDvfd_swmr_instr.c | 1 + src/H5FDvfd_swmr_private.h | 1 + src/H5Fvfd_swmr.c | 1 + src/H5MV.c | 2 +- src/H5MVmodule.h | 16 +++++++++------ src/H5MVpkg.h | 17 +++++++++------- src/H5MVprivate.h | 5 +++-- src/H5MVsection.c | 12 ++++++----- src/H5retry_private.h | 1 + test/stubs.c | 2 +- test/supervise.subr | 15 ++++++++++++-- test/testvfdswmr.sh.in | 7 +++---- test/vfd_swmr.c | 1 + test/vfd_swmr_addrem_writer.c | 1 + test/vfd_swmr_attrdset_writer.c | 24 +++++++++++----------- test/vfd_swmr_bigset_writer.c | 1 + test/vfd_swmr_check_compat.c | 2 +- test/vfd_swmr_common.c | 1 + test/vfd_swmr_common.h | 1 + test/vfd_swmr_dsetchks_writer.c | 24 +++++++++++----------- test/vfd_swmr_dsetops_writer.c | 24 +++++++++++----------- test/vfd_swmr_generator.c | 1 + test/vfd_swmr_gfail_writer.c | 1 + test/vfd_swmr_gperf_writer.c | 1 + test/vfd_swmr_group_writer.c | 1 + test/vfd_swmr_indep_rw_writer.c | 24 +++++++++++----------- test/vfd_swmr_reader.c | 1 + test/vfd_swmr_remove_reader.c | 1 + test/vfd_swmr_remove_writer.c | 1 + test/vfd_swmr_sparse_reader.c | 1 + test/vfd_swmr_sparse_writer.c | 1 + test/vfd_swmr_vlstr_reader.c | 1 + test/vfd_swmr_vlstr_writer.c | 1 + test/vfd_swmr_writer.c | 1 + test/vfd_swmr_zoo_writer.c | 1 + 45 files changed, 227 insertions(+), 78 deletions(-) create mode 100644 COPYING_AKADIO diff --git a/COPYING b/COPYING index 9d32232..6230db2 100644 --- a/COPYING +++ b/COPYING @@ -46,6 +46,14 @@ works thereof, in binary and source code form. ----------------------------------------------------------------------------- ----------------------------------------------------------------------------- +Limited portions of HDF5 were developed by Akadio, Inc. Akadio's Copyright +Notice and Licensing Terms can be found here: COPYING_AKADIO file in this +directory or at +http://support.hdfgroup.org/ftp/HDF5/releases/COPYING_AKADIO. + +----------------------------------------------------------------------------- +----------------------------------------------------------------------------- + Limited portions of HDF5 were developed by Lawrence Berkeley National Laboratory (LBNL). LBNL's Copyright Notice and Licensing Terms can be found here: COPYING_LBNL_HDF5 file in this directory or at diff --git a/COPYING_AKADIO b/COPYING_AKADIO new file mode 100644 index 0000000..e0d58e3 --- /dev/null +++ b/COPYING_AKADIO @@ -0,0 +1,45 @@ +Copyright Notice and License Terms for +VFD SWMR (Virtual File Driver Single Writer/Multiple Reader) +----------------------------------------------------------------------------- +VFD SWMR (Virtual File Driver Single Writer/Multiple Reader) +Copyright © 2019, Akadio, Inc. + +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted for any purpose (including commercial purposes) +provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, + this list of conditions, and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions, and the following disclaimer in the + documentation and/or materials provided with the distribution. + +3. Neither the name of Akadio nor the name of any Contributor may be used + to endorse or promote products derived from this software without + specific prior written permission from Akadio, Inc. + +DISCLAIMER: +THIS SOFTWARE IS PROVIDED BY AKADIO, INC. AND THE CONTRIBUTORS "AS IS" WITH +NO WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED. IN NO EVENT SHALL +AKADIO, INC. OR THE CONTRIBUTORS BE LIABLE FOR ANY DAMAGES SUFFERED BY THE +USERS ARISING OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. + +You are under no obligation whatsoever to provide any bug fixes, patches, or +upgrades to the features, functionality or performance of the source code +("Enhancements") to anyone; however, if you choose to make your Enhancements +available either publicly, or directly to Akadio, Inc., without imposing a +separate written license agreement for such Enhancements, then you hereby +grant the following license: a non-exclusive, royalty-free perpetual license +to install, use, modify, prepare derivative works, incorporate into other +computer software, distribute, and sublicense such enhancements or derivative +works thereof, in binary and source code form. + +----------------------------------------------------------------------------- +This work was sponsored by the U.S. Department of Energy under Award Number +DE-SC0018504. +----------------------------------------------------------------------------- + diff --git a/MANIFEST b/MANIFEST index 29109c1..c3a0091 100644 --- a/MANIFEST +++ b/MANIFEST @@ -25,6 +25,7 @@ ./.h5chkright.ini _DO_NOT_DISTRIBUTE_ ./ACKNOWLEDGMENTS ./COPYING +./COPYING_AKADIO ./COPYING_LBNL_HDF5 ./MANIFEST ./Makefile.dist diff --git a/examples/credel.c b/examples/credel.c index 4591d94..b90e70c 100644 --- a/examples/credel.c +++ b/examples/credel.c @@ -1,3 +1,16 @@ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * Copyright by The HDF Group. * + * Copyright by Akadio, Inc. * + * 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 COPYING file, which can be found at the root of the source code * + * distribution tree, or in https://www.hdfgroup.org/licenses. * + * If you do not have access to either file, you may request a copy from * + * help@hdfgroup.org. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + #include #include #include diff --git a/examples/gaussians.c b/examples/gaussians.c index 413bc03..515fac3 100644 --- a/examples/gaussians.c +++ b/examples/gaussians.c @@ -1,3 +1,16 @@ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * Copyright by The HDF Group. * + * Copyright by Akadio, Inc. * + * 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 COPYING file, which can be found at the root of the source code * + * distribution tree, or in https://www.hdfgroup.org/licenses. * + * If you do not have access to either file, you may request a copy from * + * help@hdfgroup.org. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + #include #include #include diff --git a/examples/h5_dtransform.c b/examples/h5_dtransform.c index a364ec1..acabd1e 100644 --- a/examples/h5_dtransform.c +++ b/examples/h5_dtransform.c @@ -1,6 +1,5 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 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 * diff --git a/examples/nbcompat.c b/examples/nbcompat.c index aa67623..cfa0dcd 100644 --- a/examples/nbcompat.c +++ b/examples/nbcompat.c @@ -1,3 +1,16 @@ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * Copyright by The HDF Group. * + * Copyright by Akadio, Inc. * + * 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 COPYING file, which can be found at the root of the source code * + * distribution tree, or in https://www.hdfgroup.org/licenses. * + * If you do not have access to either file, you may request a copy from * + * help@hdfgroup.org. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + #include "nbcompat.h" size_t diff --git a/examples/nbcompat.h b/examples/nbcompat.h index c528ca4..ff4f677 100644 --- a/examples/nbcompat.h +++ b/examples/nbcompat.h @@ -1,3 +1,16 @@ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * Copyright by The HDF Group. * + * Copyright by Akadio, Inc. * + * 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 COPYING file, which can be found at the root of the source code * + * distribution tree, or in https://www.hdfgroup.org/licenses. * + * If you do not have access to either file, you may request a copy from * + * help@hdfgroup.org. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + #ifndef NB_COMPAT_H #define NB_COMPAT_H diff --git a/src/H5FDvfd_swmr.c b/src/H5FDvfd_swmr.c index 73d8df4..3517517 100644 --- a/src/H5FDvfd_swmr.c +++ b/src/H5FDvfd_swmr.c @@ -1,5 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Copyright by The HDF Group. * + * Copyright by Akadio, Inc. * * All rights reserved. * * * * This file is part of HDF5. The full HDF5 copyright notice, including * diff --git a/src/H5FDvfd_swmr.h b/src/H5FDvfd_swmr.h index 096d5fb..dd1b452 100644 --- a/src/H5FDvfd_swmr.h +++ b/src/H5FDvfd_swmr.h @@ -1,5 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Copyright by The HDF Group. * + * Copyright by Akadio, Inc. * * All rights reserved. * * * * This file is part of HDF5. The full HDF5 copyright notice, including * diff --git a/src/H5FDvfd_swmr_instr.c b/src/H5FDvfd_swmr_instr.c index 6f309d2..53d6161 100644 --- a/src/H5FDvfd_swmr_instr.c +++ b/src/H5FDvfd_swmr_instr.c @@ -1,5 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Copyright by The HDF Group. * + * Copyright by Akadio, Inc. * * All rights reserved. * * * * This file is part of HDF5. The full HDF5 copyright notice, including * diff --git a/src/H5FDvfd_swmr_private.h b/src/H5FDvfd_swmr_private.h index 12fd2e2..5b6d300 100644 --- a/src/H5FDvfd_swmr_private.h +++ b/src/H5FDvfd_swmr_private.h @@ -1,5 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Copyright by The HDF Group. * + * Copyright by Akadio, Inc. * * All rights reserved. * * * * This file is part of HDF5. The full HDF5 copyright notice, including * diff --git a/src/H5Fvfd_swmr.c b/src/H5Fvfd_swmr.c index 372ae19..8e29f06 100644 --- a/src/H5Fvfd_swmr.c +++ b/src/H5Fvfd_swmr.c @@ -1,5 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Copyright by The HDF Group. * + * Copyright by Akadio, Inc. * * All rights reserved. * * * * This file is part of HDF5. The full HDF5 copyright notice, including * diff --git a/src/H5MV.c b/src/H5MV.c index 1246f4b..9139480 100644 --- a/src/H5MV.c +++ b/src/H5MV.c @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Copyright by The HDF Group. * - * Copyright by the Board of Trustees of the University of Illinois. * + * Copyright by Akadio, Inc. * * All rights reserved. * * * * This file is part of HDF5. The full HDF5 copyright notice, including * diff --git a/src/H5MVmodule.h b/src/H5MVmodule.h index fdfe036..d8862ee 100644 --- a/src/H5MVmodule.h +++ b/src/H5MVmodule.h @@ -1,5 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Copyright by The HDF Group. * + * Copyright by Akadio, Inc. * * All rights reserved. * * * * This file is part of HDF5. The full HDF5 copyright notice, including * @@ -10,14 +11,17 @@ * help@hdfgroup.org. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -/* - * Programmer: Quincey Koziol - * Saturday, September 12, 2015 +/*------------------------------------------------------------------------- * - * Purpose: This file contains declarations which define macros for the - * H5MV package. Including this header means that the source file - * is part of the H5MV package. + * Created: H5MVmodule.h + * + * Purpose: This file contains declarations which define macros for + * the H5MV package. Including this header means that the + * source file is part of the H5MV package. + * + *------------------------------------------------------------------------- */ + #ifndef _H5MVmodule_H #define _H5MVmodule_H diff --git a/src/H5MVpkg.h b/src/H5MVpkg.h index 2d564e6..bd75595 100644 --- a/src/H5MVpkg.h +++ b/src/H5MVpkg.h @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Copyright by The HDF Group. * - * Copyright by the Board of Trustees of the University of Illinois. * + * Copyright by Akadio, Inc. * * All rights reserved. * * * * This file is part of HDF5. The full HDF5 copyright notice, including * @@ -11,14 +11,17 @@ * help@hdfgroup.org. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -/* - * Programmer: Quincey Koziol - * Tuesday, January 8, 2008 +/*------------------------------------------------------------------------- * - * Purpose: This file contains declarations which are visible only within - * the H5MV package. Source files outside the H5MV package should - * include H5MVprivate.h instead. + * Created: H5MVpkg.h + * + * Purpose: This file contains declarations which are visible only + * within the H5MV package. Source files outside the + * H5MV package should include H5MVprivate.h instead. + * + *------------------------------------------------------------------------- */ + #if !(defined H5MV_FRIEND || defined H5MV_MODULE) #error "Do not include this file outside the H5MV package!" #endif diff --git a/src/H5MVprivate.h b/src/H5MVprivate.h index edd4765..2332ad3 100644 --- a/src/H5MVprivate.h +++ b/src/H5MVprivate.h @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Copyright by The HDF Group. * - * Copyright by the Board of Trustees of the University of Illinois. * + * Copyright by Akadio, Inc. * * All rights reserved. * * * * This file is part of HDF5. The full HDF5 copyright notice, including * @@ -15,10 +15,11 @@ * * Created: H5MVprivate.h * - * Purpose: Private header file for file memory management. + * Purpose: Private header file for VFD SWMR free space mangement * *------------------------------------------------------------------------- */ + #ifndef _H5MVprivate_H #define _H5MVprivate_H diff --git a/src/H5MVsection.c b/src/H5MVsection.c index 8f80619..dc57e2f 100644 --- a/src/H5MVsection.c +++ b/src/H5MVsection.c @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Copyright by The HDF Group. * - * Copyright by the Board of Trustees of the University of Illinois. * + * Copyright by Akadio, Inc. * * All rights reserved. * * * * This file is part of HDF5. The full HDF5 copyright notice, including * @@ -11,12 +11,14 @@ * help@hdfgroup.org. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -/* - * Programmer: Quincey Koziol - * Tuesday, January 8, 2008 +/*------------------------------------------------------------------------- * - * Purpose: Free space section callbacks for file. + * Created: H5MVsection.c * + * Purpose: Free-space section callbacks for VFD SWMR's metadata + * file + * + *------------------------------------------------------------------------- */ /****************/ diff --git a/src/H5retry_private.h b/src/H5retry_private.h index 4b26009..d4ef99f 100644 --- a/src/H5retry_private.h +++ b/src/H5retry_private.h @@ -1,5 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Copyright by The HDF Group. * + * Copyright by Akadio, Inc. * * All rights reserved. * * * * This file is part of HDF5. The full HDF5 copyright notice, including * diff --git a/test/stubs.c b/test/stubs.c index 33ac027..e508b14 100644 --- a/test/stubs.c +++ b/test/stubs.c @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Copyright by The HDF Group. * - * Copyright by the Board of Trustees of the University of Illinois. * + * Copyright by Akadio, Inc. * * All rights reserved. * * * * This file is part of HDF5. The full HDF5 copyright notice, including * diff --git a/test/supervise.subr b/test/supervise.subr index d2b0395..40472d3 100644 --- a/test/supervise.subr +++ b/test/supervise.subr @@ -1,6 +1,17 @@ -#!/bin/sh - +#!/us/bin/env bash +# +# Copyright by The HDF Group. +# Copyright by Akadio, Inc. # +# This file is part of HDF5. The full HDF5 copyright notice, including +# terms governing use, modification, and redistribution, is contained in +# the COPYING file, which can be found at the root of the source code +# distribution tree, or in https://www.hdfgroup.org/licenses. +# If you do not have access to either file, you may request a copy from +# help@hdfgroup.org. +# +# Tests for the vfd swmr feature. + # catch_out_err_and_rc outbase command [arguments] # # Run `command` with any `arguments` provided. Redirect `command`'s diff --git a/test/testvfdswmr.sh.in b/test/testvfdswmr.sh.in index 7ab324e..b47516f 100644 --- a/test/testvfdswmr.sh.in +++ b/test/testvfdswmr.sh.in @@ -1,18 +1,17 @@ #!/us/bin/env bash # # Copyright by The HDF Group. -# Copyright by the Board of Trustees of the University of Illinois. -# All rights reserved. +# Copyright by Akadio, Inc. # # This file is part of HDF5. The full HDF5 copyright notice, including # terms governing use, modification, and redistribution, is contained in # the COPYING file, which can be found at the root of the source code -# distribution tree, or in https://www.hdfgroup.org/releases. +# distribution tree, or in https://www.hdfgroup.org/licenses. # If you do not have access to either file, you may request a copy from # help@hdfgroup.org. # # Tests for the vfd swmr feature. -# + ############################################################################### # VFD SWMR concurrent tests which are modified from existing swmr concurrent tests. # This is copied and modified from testswmr.sh.in diff --git a/test/vfd_swmr.c b/test/vfd_swmr.c index 630b25d..902ce7f 100644 --- a/test/vfd_swmr.c +++ b/test/vfd_swmr.c @@ -1,5 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Copyright by The HDF Group. * + * Copyright by Akadio, Inc. * * All rights reserved. * * * * This file is part of HDF5. The full HDF5 copyright notice, including * diff --git a/test/vfd_swmr_addrem_writer.c b/test/vfd_swmr_addrem_writer.c index ddf3f9c..4cfdeb2 100644 --- a/test/vfd_swmr_addrem_writer.c +++ b/test/vfd_swmr_addrem_writer.c @@ -1,5 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Copyright by The HDF Group. * + * Copyright by Akadio, Inc. * * All rights reserved. * * * * This file is part of HDF5. The full HDF5 copyright notice, including * diff --git a/test/vfd_swmr_attrdset_writer.c b/test/vfd_swmr_attrdset_writer.c index a722f44..1037108 100644 --- a/test/vfd_swmr_attrdset_writer.c +++ b/test/vfd_swmr_attrdset_writer.c @@ -1,15 +1,15 @@ -/* - * 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 COPYING file, which can be found at the root of the source code - * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases. - * If you do not have access to either file, you may request a copy from - * help@hdfgroup.org. - */ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * Copyright by The HDF Group. * + * Copyright by Akadio, Inc. * + * 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 COPYING file, which can be found at the root of the source code * + * distribution tree, or in https://www.hdfgroup.org/licenses. * + * If you do not have access to either file, you may request a copy from * + * help@hdfgroup.org. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* * Purpose: To test attribute handling for different dataset types. diff --git a/test/vfd_swmr_bigset_writer.c b/test/vfd_swmr_bigset_writer.c index 9b33ee8..79a571e 100644 --- a/test/vfd_swmr_bigset_writer.c +++ b/test/vfd_swmr_bigset_writer.c @@ -1,5 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Copyright by The HDF Group. * + * Copyright by Akadio, Inc. * * All rights reserved. * * * * This file is part of HDF5. The full HDF5 copyright notice, including * diff --git a/test/vfd_swmr_check_compat.c b/test/vfd_swmr_check_compat.c index dec88c5..edf37a2 100644 --- a/test/vfd_swmr_check_compat.c +++ b/test/vfd_swmr_check_compat.c @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Copyright by The HDF Group. * - * Copyright by the Board of Trustees of the University of Illinois. * + * Copyright by Akadio, Inc. * * All rights reserved. * * * * This file is part of HDF5. The full HDF5 copyright notice, including * diff --git a/test/vfd_swmr_common.c b/test/vfd_swmr_common.c index 9b711dd..99db307 100644 --- a/test/vfd_swmr_common.c +++ b/test/vfd_swmr_common.c @@ -1,5 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Copyright by The HDF Group. * + * Copyright by Akadio, Inc. * * All rights reserved. * * * * This file is part of HDF5. The full HDF5 copyright notice, including * diff --git a/test/vfd_swmr_common.h b/test/vfd_swmr_common.h index b842fe7..9f99c6e 100644 --- a/test/vfd_swmr_common.h +++ b/test/vfd_swmr_common.h @@ -1,5 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Copyright by The HDF Group. * + * Copyright by Akadio, Inc. * * All rights reserved. * * * * This file is part of HDF5. The full HDF5 copyright notice, including * diff --git a/test/vfd_swmr_dsetchks_writer.c b/test/vfd_swmr_dsetchks_writer.c index c09c825..f2bd29b 100644 --- a/test/vfd_swmr_dsetchks_writer.c +++ b/test/vfd_swmr_dsetchks_writer.c @@ -1,15 +1,15 @@ -/* - * 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 COPYING file, which can be found at the root of the source code - * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases. - * If you do not have access to either file, you may request a copy from - * help@hdfgroup.org. - */ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * Copyright by The HDF Group. * + * Copyright by Akadio, Inc. * + * 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 COPYING file, which can be found at the root of the source code * + * distribution tree, or in https://www.hdfgroup.org/licenses. * + * If you do not have access to either file, you may request a copy from * + * help@hdfgroup.org. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* * Purpose: To test chunk operations for chunked dataset specifically: diff --git a/test/vfd_swmr_dsetops_writer.c b/test/vfd_swmr_dsetops_writer.c index 16de130..d7ef255 100644 --- a/test/vfd_swmr_dsetops_writer.c +++ b/test/vfd_swmr_dsetops_writer.c @@ -1,15 +1,15 @@ -/* - * 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 COPYING file, which can be found at the root of the source code - * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases. - * If you do not have access to either file, you may request a copy from - * help@hdfgroup.org. - */ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * Copyright by The HDF Group. * + * Copyright by Akadio, Inc. * + * 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 COPYING file, which can be found at the root of the source code * + * distribution tree, or in https://www.hdfgroup.org/licenses. * + * If you do not have access to either file, you may request a copy from * + * help@hdfgroup.org. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* * Purpose: To test writing operations for different dataset types. diff --git a/test/vfd_swmr_generator.c b/test/vfd_swmr_generator.c index 1c549ca..e11d92f 100644 --- a/test/vfd_swmr_generator.c +++ b/test/vfd_swmr_generator.c @@ -1,5 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Copyright by The HDF Group. * + * Copyright by Akadio, Inc. * * All rights reserved. * * * * This file is part of HDF5. The full HDF5 copyright notice, including * diff --git a/test/vfd_swmr_gfail_writer.c b/test/vfd_swmr_gfail_writer.c index aef39a0..84a9e80 100644 --- a/test/vfd_swmr_gfail_writer.c +++ b/test/vfd_swmr_gfail_writer.c @@ -1,5 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Copyright by The HDF Group. * + * Copyright by Akadio, Inc. * * All rights reserved. * * * * This file is part of HDF5. The full HDF5 copyright notice, including * diff --git a/test/vfd_swmr_gperf_writer.c b/test/vfd_swmr_gperf_writer.c index 1ca4483..8632bf8 100644 --- a/test/vfd_swmr_gperf_writer.c +++ b/test/vfd_swmr_gperf_writer.c @@ -1,5 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Copyright by The HDF Group. * + * Copyright by Akadio, Inc. * * All rights reserved. * * * * This file is part of HDF5. The full HDF5 copyright notice, including * diff --git a/test/vfd_swmr_group_writer.c b/test/vfd_swmr_group_writer.c index eb7bb0e..3dea01d 100644 --- a/test/vfd_swmr_group_writer.c +++ b/test/vfd_swmr_group_writer.c @@ -1,5 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Copyright by The HDF Group. * + * Copyright by Akadio, Inc. * * All rights reserved. * * * * This file is part of HDF5. The full HDF5 copyright notice, including * diff --git a/test/vfd_swmr_indep_rw_writer.c b/test/vfd_swmr_indep_rw_writer.c index f452e89..75da581 100644 --- a/test/vfd_swmr_indep_rw_writer.c +++ b/test/vfd_swmr_indep_rw_writer.c @@ -1,15 +1,15 @@ -/* - * 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 COPYING file, which can be found at the root of the source code - * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases. - * If you do not have access to either file, you may request a copy from - * help@hdfgroup.org. - */ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * Copyright by The HDF Group. * + * Copyright by Akadio, Inc. * + * 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 COPYING file, which can be found at the root of the source code * + * distribution tree, or in https://www.hdfgroup.org/licenses. * + * If you do not have access to either file, you may request a copy from * + * help@hdfgroup.org. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* This program checks independence of writer and reader for VFD SWMR. * A writer can also be a reader of another writer. A reader can also be a diff --git a/test/vfd_swmr_reader.c b/test/vfd_swmr_reader.c index d6a87dd..c04182c 100644 --- a/test/vfd_swmr_reader.c +++ b/test/vfd_swmr_reader.c @@ -1,5 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Copyright by The HDF Group. * + * Copyright by Akadio, Inc. * * All rights reserved. * * * * This file is part of HDF5. The full HDF5 copyright notice, including * diff --git a/test/vfd_swmr_remove_reader.c b/test/vfd_swmr_remove_reader.c index bc00756..ed2de5f 100644 --- a/test/vfd_swmr_remove_reader.c +++ b/test/vfd_swmr_remove_reader.c @@ -1,5 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Copyright by The HDF Group. * + * Copyright by Akadio, Inc. * * All rights reserved. * * * * This file is part of HDF5. The full HDF5 copyright notice, including * diff --git a/test/vfd_swmr_remove_writer.c b/test/vfd_swmr_remove_writer.c index 6b0c13f..a35d303 100644 --- a/test/vfd_swmr_remove_writer.c +++ b/test/vfd_swmr_remove_writer.c @@ -1,5 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Copyright by The HDF Group. * + * Copyright by Akadio, Inc. * * All rights reserved. * * * * This file is part of HDF5. The full HDF5 copyright notice, including * diff --git a/test/vfd_swmr_sparse_reader.c b/test/vfd_swmr_sparse_reader.c index 6a7ba2f..d0a03a8 100644 --- a/test/vfd_swmr_sparse_reader.c +++ b/test/vfd_swmr_sparse_reader.c @@ -1,5 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Copyright by The HDF Group. * + * Copyright by Akadio, Inc. * * All rights reserved. * * * * This file is part of HDF5. The full HDF5 copyright notice, including * diff --git a/test/vfd_swmr_sparse_writer.c b/test/vfd_swmr_sparse_writer.c index f78bf8b..2b976d3 100644 --- a/test/vfd_swmr_sparse_writer.c +++ b/test/vfd_swmr_sparse_writer.c @@ -1,5 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Copyright by The HDF Group. * + * Copyright by Akadio, Inc. * * All rights reserved. * * * * This file is part of HDF5. The full HDF5 copyright notice, including * diff --git a/test/vfd_swmr_vlstr_reader.c b/test/vfd_swmr_vlstr_reader.c index 2554207..4107bfc 100644 --- a/test/vfd_swmr_vlstr_reader.c +++ b/test/vfd_swmr_vlstr_reader.c @@ -1,5 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Copyright by The HDF Group. * + * Copyright by Akadio, Inc. * * All rights reserved. * * * * This file is part of HDF5. The full HDF5 copyright notice, including * diff --git a/test/vfd_swmr_vlstr_writer.c b/test/vfd_swmr_vlstr_writer.c index e3905e8..8fc3f95 100644 --- a/test/vfd_swmr_vlstr_writer.c +++ b/test/vfd_swmr_vlstr_writer.c @@ -1,5 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Copyright by The HDF Group. * + * Copyright by Akadio, Inc. * * All rights reserved. * * * * This file is part of HDF5. The full HDF5 copyright notice, including * diff --git a/test/vfd_swmr_writer.c b/test/vfd_swmr_writer.c index a630532..db0c90b 100644 --- a/test/vfd_swmr_writer.c +++ b/test/vfd_swmr_writer.c @@ -1,5 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Copyright by The HDF Group. * + * Copyright by Akadio, Inc. * * All rights reserved. * * * * This file is part of HDF5. The full HDF5 copyright notice, including * diff --git a/test/vfd_swmr_zoo_writer.c b/test/vfd_swmr_zoo_writer.c index d40f2d9..97c4db3 100644 --- a/test/vfd_swmr_zoo_writer.c +++ b/test/vfd_swmr_zoo_writer.c @@ -1,5 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Copyright by The HDF Group. * + * Copyright by Akadio, Inc. * * All rights reserved. * * * * This file is part of HDF5. The full HDF5 copyright notice, including * -- cgit v0.12 From c9a363fdd9f23a2075e057cb2d611dc1ca395cfb Mon Sep 17 00:00:00 2001 From: Dana Robinson Date: Thu, 17 Feb 2022 11:19:28 -0800 Subject: Updated the submodule to point to the correct commit so the tests pass --- utils/vfd_swmr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/vfd_swmr b/utils/vfd_swmr index 92d7a39..121da96 160000 --- a/utils/vfd_swmr +++ b/utils/vfd_swmr @@ -1 +1 @@ -Subproject commit 92d7a39b975f1450308b810a1d668e8abdbcbad1 +Subproject commit 121da9672cebea43dca05c89adaae5d05ba56e4c -- cgit v0.12