Fix bad ref counting on async close failures

mattjala · Jul 10, 2024 · df601a9 · df601a9
1 parent 96acf6c
commit df601a9
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 14 deletions.
diff --git a/src/H5A.c b/src/H5A.c
@@ -2244,8 +2244,9 @@ H5Aclose_async(const char *app_file, const char *app_func, unsigned app_line, hi
             HGOTO_ERROR(H5E_ATTR, H5E_CANTINSERT, FAIL, "can't insert token into event set");
 
 done:
-    if (connector && H5VL_conn_dec_rc(connector) < 0)
-        HDONE_ERROR(H5E_ATTR, H5E_CANTDEC, FAIL, "can't decrement ref count on connector");
+    if (connector && (H5ES_NONE != es_id))
+        if (H5VL_conn_dec_rc(connector) < 0)
+            HDONE_ERROR(H5E_ATTR, H5E_CANTDEC, FAIL, "can't decrement ref count on connector");
 
     FUNC_LEAVE_API(ret_value)
 } /* H5Aclose_async() */

diff --git a/src/H5D.c b/src/H5D.c
@@ -531,8 +531,9 @@ H5Dclose_async(const char *app_file, const char *app_func, unsigned app_line, hi
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINSERT, FAIL, "can't insert token into event set");
 
 done:
-    if (connector && H5VL_conn_dec_rc(connector) < 0)
-        HDONE_ERROR(H5E_DATASET, H5E_CANTDEC, FAIL, "can't decrement ref count on connector");
+    if (connector && (H5ES_NONE != es_id))
+        if (H5VL_conn_dec_rc(connector) < 0)
+            HDONE_ERROR(H5E_DATASET, H5E_CANTDEC, FAIL, "can't decrement ref count on connector");
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5Dclose_async() */

diff --git a/src/H5F.c b/src/H5F.c
@@ -1104,8 +1104,9 @@ H5Fclose_async(const char *app_file, const char *app_func, unsigned app_line, hi
             HGOTO_ERROR(H5E_FILE, H5E_CANTINSERT, FAIL, "can't insert token into event set");
 
 done:
-    if (connector && H5VL_conn_dec_rc(connector) < 0)
-        HDONE_ERROR(H5E_FILE, H5E_CANTDEC, FAIL, "can't decrement ref count on connector");
+    if (connector && (H5ES_NONE != es_id))
+        if (H5VL_conn_dec_rc(connector) < 0)
+            HDONE_ERROR(H5E_FILE, H5E_CANTDEC, FAIL, "can't decrement ref count on connector");
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5Fclose_async() */

diff --git a/src/H5G.c b/src/H5G.c
@@ -935,8 +935,9 @@ H5Gclose_async(const char *app_file, const char *app_func, unsigned app_line, hi
             HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, FAIL, "can't insert token into event set");
 
 done:
-    if (connector && H5VL_conn_dec_rc(connector) < 0)
-        HDONE_ERROR(H5E_SYM, H5E_CANTDEC, FAIL, "can't decrement ref count on connector");
+    if (connector && (H5ES_NONE != es_id))
+        if (H5VL_conn_dec_rc(connector) < 0)
+            HDONE_ERROR(H5E_SYM, H5E_CANTDEC, FAIL, "can't decrement ref count on connector");
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5Gclose_async() */

diff --git a/src/H5M.c b/src/H5M.c
@@ -663,8 +663,9 @@ H5Mclose_async(const char *app_file, const char *app_func, unsigned app_line, hi
             HGOTO_ERROR(H5E_MAP, H5E_CANTINSERT, FAIL, "can't insert token into event set");
 
 done:
-    if (connector && H5VL_conn_dec_rc(connector) < 0)
-        HDONE_ERROR(H5E_MAP, H5E_CANTDEC, FAIL, "can't decrement ref count on connector");
+    if (connector && (H5ES_NONE != es_id))
+        if (H5VL_conn_dec_rc(connector) < 0)
+            HDONE_ERROR(H5E_MAP, H5E_CANTDEC, FAIL, "can't decrement ref count on connector");
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5Mclose_async() */

diff --git a/src/H5O.c b/src/H5O.c
@@ -1967,8 +1967,9 @@ H5Oclose_async(const char *app_file, const char *app_func, unsigned app_line, hi
             HGOTO_ERROR(H5E_OHDR, H5E_CANTINSERT, FAIL, "can't insert token into event set");
 
 done:
-    if (connector && H5VL_conn_dec_rc(connector) < 0)
-        HDONE_ERROR(H5E_OHDR, H5E_CANTDEC, FAIL, "can't decrement ref count on connector");
+    if (connector && (H5ES_NONE != es_id))
+        if (H5VL_conn_dec_rc(connector) < 0)
+            HDONE_ERROR(H5E_OHDR, H5E_CANTDEC, FAIL, "can't decrement ref count on connector");
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5Oclose_async() */

diff --git a/src/H5T.c b/src/H5T.c
@@ -2127,8 +2127,9 @@ H5Tclose_async(const char *app_file, const char *app_func, unsigned app_line, hi
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINSERT, FAIL, "can't insert token into event set");
 
 done:
-    if (connector && H5VL_conn_dec_rc(connector) < 0)
-        HDONE_ERROR(H5E_DATATYPE, H5E_CANTDEC, FAIL, "can't decrement ref count on connector");
+    if (connector && (H5ES_NONE != es_id))
+        if (H5VL_conn_dec_rc(connector) < 0)
+            HDONE_ERROR(H5E_DATATYPE, H5E_CANTDEC, FAIL, "can't decrement ref count on connector");
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5Tclose_async() */