Add functions to clear error messages (#1190)

* Add `hypre_error_handler_clear_messages`
* Add missing fcloses. This was caught with valgrind
* Check all kinds of leaks with valgrind
* Add `HYPRE_ClearErrorMessages`

src/test/ij.c

@@ -9398,6 +9398,10 @@ main( hypre_int argc,
       }
    }
 
+   /* Free the memory buffer allocated for storing error messages when using mode 1 for printing errors
+      Note: This call is redundant since the cleanup is already handled in HYPRE_Finalize. */
+   HYPRE_ClearErrorMessages();
+
    /* Finalize Hypre */
    HYPRE_Finalize();
 

src/test/maxwell_unscaled.c

@@ -272,6 +272,8 @@ ReadData( char         *filename,
          /* read the next input line */
          sdata_line = fgets((sdata + sdata_size), maxline, file);
       }
+
+      fclose(file);
    }
 
    /* broadcast the data size */

src/test/runtest.sh

@@ -522,7 +522,7 @@ do
          ;;
       -valgrind)
          shift
-         Valgrind="valgrind -q --suppressions=`pwd`/runtest.valgrind --leak-check=yes --track-origins=yes"
+         Valgrind="valgrind -q --suppressions=`pwd`/runtest.valgrind --track-origins=yes --leak-check=full --show-leak-kinds=all"
          ;;
       -cudamemcheck)
          shift

src/test/sstruct.c

@@ -460,6 +460,9 @@ ReadData( char         *filename,
          /* read the next input line */
          sdata_line = fgets((sdata + sdata_size), maxline, file);
       }
+
+      /* Close file handle */
+      fclose(file);
    }
    /* broadcast the data size */
    hypre_MPI_Bcast(&sdata_size, 1, HYPRE_MPI_INT, 0, hypre_MPI_COMM_WORLD);
@@ -3969,6 +3972,7 @@ main( hypre_int argc,
                }
             }
          }
+         fclose(file);
 
          /* re-initializes x to 0 */
          hypre_SStructAxpy(-1.0, b, x);

src/utilities/HYPRE_utilities.h

@@ -232,6 +232,9 @@ HYPRE_Int HYPRE_GetErrorMessages(char **buffer, HYPRE_Int *bufsz);
 /* Print the error messages and clear them in hypre */
 HYPRE_Int HYPRE_PrintErrorMessages(MPI_Comm comm);
 
+/* Clear the error messages in hypre and free any related memory allocated */
+HYPRE_Int HYPRE_ClearErrorMessages(void);
+
 /* Print GPU information */
 HYPRE_Int HYPRE_PrintDeviceInfo(void);
 

src/utilities/_hypre_utilities.h

@@ -672,6 +672,7 @@ extern hypre_Error hypre__global_error;
  *--------------------------------------------------------------------------*/
 
 void hypre_error_handler(const char *filename, HYPRE_Int line, HYPRE_Int ierr, const char *msg);
+void hypre_error_handler_clear_messages(void);
 void hypre_error_code_save(void);
 void hypre_error_code_restore(void);
 

src/utilities/error.c

@@ -89,6 +89,22 @@ hypre_error_handler(const char *filename, HYPRE_Int line, HYPRE_Int ierr, const
    hypre__global_error = err;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_error_handler_clear_messages
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_error_handler_clear_messages(void)
+{
+   hypre_Error  err = hypre__global_error;
+
+   hypre_TFree(err.memory, HYPRE_MEMORY_HOST);
+   err.mem_sz = 0;
+   err.msg_sz = 0;
+
+   hypre__global_error = err;
+}
+
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
@@ -252,11 +268,9 @@ HYPRE_GetErrorMessages(char **buffer, HYPRE_Int *bufsz)
    *buffer = hypre_CTAlloc(char, *bufsz, HYPRE_MEMORY_HOST);
    hypre_TMemcpy(*buffer, err.memory, char, *bufsz, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
 
-   hypre_TFree(err.memory, HYPRE_MEMORY_HOST);
-   err.mem_sz = 0;
-   err.msg_sz = 0;
+   /* Clear error messages */
+   hypre_error_handler_clear_messages();
 
-   hypre__global_error = err;
    return hypre_error_flag;
 }
 
@@ -267,21 +281,29 @@ HYPRE_GetErrorMessages(char **buffer, HYPRE_Int *bufsz)
 HYPRE_Int
 HYPRE_PrintErrorMessages(MPI_Comm comm)
 {
-   hypre_Error err = hypre__global_error;
-
-   HYPRE_Int myid;
-   char *msg;
+   hypre_Error  err = hypre__global_error;
+   HYPRE_Int    myid;
+   char        *msg;
 
    hypre_MPI_Comm_rank(comm, &myid);
    for (msg = err.memory; msg < (err.memory + err.msg_sz); msg += strlen(msg) + 1)
    {
       hypre_fprintf(stderr, "%d: %s", myid, msg);
    }
 
-   hypre_TFree(err.memory, HYPRE_MEMORY_HOST);
-   err.mem_sz = 0;
-   err.msg_sz = 0;
+   /* Clear error messages */
+   hypre_error_handler_clear_messages();
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_ClearErrorMessages(void)
+{
+   hypre_error_handler_clear_messages();
 
-   hypre__global_error = err;
    return hypre_error_flag;
 }

src/utilities/error.h

@@ -35,6 +35,7 @@ extern hypre_Error hypre__global_error;
  *--------------------------------------------------------------------------*/
 
 void hypre_error_handler(const char *filename, HYPRE_Int line, HYPRE_Int ierr, const char *msg);
+void hypre_error_handler_clear_messages(void);
 void hypre_error_code_save(void);
 void hypre_error_code_restore(void);
 

src/utilities/general.c

@@ -73,6 +73,9 @@ hypre_HandleDestroy(hypre_Handle *hypre_handle_)
    hypre_HandleDeviceData(hypre_handle_) = NULL;
 #endif
 
+   /* Deallocate error messages in error handler */
+   hypre_error_handler_clear_messages();
+
    /* Note: Directly using free since this variable was allocated with calloc */
    free((void*) hypre_handle_);