Merge pull request #68 from LLNL/bugfix/weiss27/sidre-attributes

Fixes some sidre memory leaks

src/axom/sidre/core/AttrValues.cpp

@@ -289,7 +289,13 @@ AttrValues::AttrValues() :
  *************************************************************************
  */
 AttrValues::~AttrValues()
-{}
+{
+  if(m_values != nullptr)
+  {
+    delete m_values;
+    m_values = nullptr;
+  }
+}
 
 } /* end namespace sidre */
 } /* end namespace axom */

src/axom/sidre/core/AttrValues.hpp

@@ -240,7 +240,7 @@ class AttrValues
 
   ///////////////////////////////////////////////////////////////////
   //
-  typedef std::vector< Node > Values;
+  using Values = std::vector< Node >;
   ///////////////////////////////////////////////////////////////////
 
   /// Attributes values.

src/axom/sidre/core/DataStore.cpp

@@ -127,6 +127,7 @@ DataStore::~DataStore()
   // clean up Groups and Views before we destroy Buffers
   delete m_RootGroup;
   destroyAllBuffers();
+  destroyAllAttributes();
   delete m_attribute_coll;
 
   if ( m_need_to_finalize_slic )

src/axom/sidre/core/Group.cpp

@@ -9,7 +9,7 @@
 #include "conduit_relay.hpp"
 
 #ifdef AXOM_USE_HDF5
-#include "conduit_relay_hdf5.hpp"
+#include "conduit_relay_io_hdf5.hpp"
 #endif
 
 // Other axom component headers

src/axom/sidre/examples/sidre_createdatastore.cpp

@@ -17,7 +17,7 @@
  *
  * create_datastore           -- Builds a DataStore containing various Groups,
  *                               Views, Buffers, and Attributes
- *                               
+ *
  * create_tiny_datastore      -- Builds a DataStore that holds a small 3D mesh
  *                               conforming to the conduit mesh blueprint
  *
@@ -30,13 +30,13 @@
  * generate_blueprint         -- Generates a blueprint index and writes data
  *                               to file using Sidre DataStore and Group calls
  *
- * generate_blueprint_to_path -- Similar to above, but uses path arguments to 
+ * generate_blueprint_to_path -- Similar to above, but uses path arguments to
  *                               find data deeper in Sidre hierarchy
  *
  * generate_spio_blueprint    -- Uses SPIO/IOManager calls to write data to
  *                               file and generate blueprint index
- * 
- * generate_blueprint_to_path -- Similar to above, but uses path arguments to 
+ *
+ * generate_blueprint_to_path -- Similar to above, but uses path arguments to
  *                               find data deeper in Sidre hierarchy
  */
 

src/axom/sidre/spio/IOManager.cpp

@@ -19,7 +19,7 @@
 #include "conduit_relay.hpp"
 
 #ifdef AXOM_USE_HDF5
-#include "conduit_relay_hdf5.hpp"
+#include "conduit_relay_io_hdf5.hpp"
 #include "hdf5.h"
 #endif
 
@@ -1092,7 +1092,8 @@ void IOManager::writeBlueprintIndexToRootFile(DataStore* datastore,
 
   //The final name in mesh_path will be used as the name of the
   //blueprint index.
-  conduit::utils::rsplit_string(mesh_path, delimiter, blueprint_name, path_to_mesh);
+  conduit::utils::rsplit_string(mesh_path, delimiter, 
+                                blueprint_name, path_to_mesh);
 
   std::string bp_index("blueprint_index/" + blueprint_name);
 

src/axom/sidre/spio/IOManager.hpp

@@ -202,7 +202,7 @@ class IOManager
    *
    * If write() is called using the Group located at "/hierarchy/domain_data",
    * then only the Groups and Views descending from that Group are written
-   * to the file.  To call this method, we would choose the full path in 
+   * to the file.  To call this method, we would choose the full path in
    * the DataStore "hierarchy/domain_data/domain/blueprint_mesh" for
    * domain_path.  For the mesh_path argument, we choose only the path that
    * exists in the file:  "domain/blueprint_mesh".

src/axom/sidre/tests/sidre_attribute.cpp

@@ -651,6 +651,8 @@ TEST(sidre_attribute, loop_attributes)
   }
 
   // XXX - now delete attribute and check again
+
+  delete ds;
 }
 
 //------------------------------------------------------------------------------

src/axom/sidre/tests/sidre_group.cpp

@@ -80,6 +80,8 @@ TEST(sidre_group,get_name)
 
   Group* group2 = root->getGroup("foo");
   EXPECT_TRUE(group2 == nullptr);
+
+  delete ds;
 }
 
 //------------------------------------------------------------------------------
@@ -112,6 +114,8 @@ TEST(sidre_group,get_path_name)
   EXPECT_EQ(group->getName(), std::string("c") );
   EXPECT_EQ(group->getPath(), std::string("test/a/b") );
   EXPECT_EQ(group->getPathName(), std::string("test/a/b/c") );
+
+  delete ds;
 }
 
 //------------------------------------------------------------------------------
@@ -183,7 +187,6 @@ TEST(sidre_group,group_with_path)
   EXPECT_EQ(group_testa->getGroup("testb")->getNumGroups(), testbnumgroups);
 
   delete ds;
-
 }
 
 //------------------------------------------------------------------------------
@@ -1224,6 +1227,7 @@ TEST(sidre_group,save_restore_api)
 
   EXPECT_TRUE( load1->isEquivalentTo( load2) );
 
+  delete ds_new;
 }
 
 //------------------------------------------------------------------------------
@@ -1316,6 +1320,7 @@ TEST(sidre_group,rename_group)
   EXPECT_EQ(root, root->getParent());
   EXPECT_EQ("newroot", root->getName());
 
+  delete ds;
 }
 
 //------------------------------------------------------------------------------
@@ -1676,7 +1681,16 @@ TEST(sidre_group,save_restore_other)
   root1->createView("empty_described", INT_ID, ndata);
   root1->createView("empty_shape", INT_ID, 2, shape1);
 
-  root1->createViewAndAllocate("buffer_shape", INT_ID, 2, shape1);
+  auto* view = root1->createViewAndAllocate("buffer_shape", INT_ID, 2, shape1);
+
+  // fill the data
+  {
+    int* data = view->getData();
+    for(int i=0 ; i< ndata * 2 ; ++i)
+    {
+      data[i] = i;
+    }
+  }
 
   for (int i = 0 ; i < nprotocols ; ++i)
   {

src/axom/sidre/tests/sidre_view.cpp

@@ -212,6 +212,8 @@ TEST(sidre_view,get_path_name)
   EXPECT_EQ(std::string("v3"), v3->getPathName());
 
   EXPECT_EQ(1, v4->getIndex());
+
+  delete ds;
 }
 
 //------------------------------------------------------------------------------
@@ -570,11 +572,19 @@ TEST(sidre_view,save_empty_view_non_empty_buffer)
   DataStore ds;
   Group* root = ds.getRoot();
 
-  Buffer* buf = ds.createBuffer(INT_ID, 10)->allocate();   // allocate non-empty
-                                                           // buffer
+  // allocate non-empty buffer
+  const int SZ = 10;
+  Buffer* buf = ds.createBuffer(INT_ID, SZ)->allocate();
+
+  // attach zero-sized array to it
+  root->createView("a")->attachBuffer(buf)->apply(0);
 
-  root->createView("a")->attachBuffer(buf)->apply(0);  // attach zero-sized
-                                                       // array to it
+  // fill the buffer
+  int* data = buf->getData();
+  for(int i=0 ; i< SZ ; ++i)
+  {
+    data[i] = i;
+  }
 
   root->save("empty_view_non_empty_buffer.sidre.json", "sidre_json"); // ok
 #ifdef AXOM_USE_HDF5
@@ -1611,6 +1621,7 @@ TEST(sidre_view,rename_view)
   EXPECT_FALSE( success );
   EXPECT_TRUE( v3->getName() == "v_c" );
 
+  delete ds;
 }
 
 //------------------------------------------------------------------------------

src/axom/sidre/tests/spio/spio_parallel.cpp

@@ -24,7 +24,7 @@
 #include "conduit_relay.hpp"
 
 #ifdef AXOM_USE_HDF5
-#include "conduit_relay_hdf5.hpp"
+#include "conduit_relay_io_hdf5.hpp"
 #endif
 
 #include "axom/sidre/core/sidre.hpp"