Remove last DBMUTEX_FORCE

Author: rogerbinns

src/connection.c

@@ -755,22 +755,17 @@ Connection_init(PyObject *self_, PyObject *args, PyObject *kwargs)
   /* clean up db since it is useless - no need for user to call close */
   assert(PyErr_Occurred());
   res = -1;
-  DBMUTEX_FORCE(self->dbmutex);
-  Connection_close_internal(self, 2);
-  assert(PyErr_Occurred());
 
 finally:
   Py_XDECREF(iterator);
   Py_XDECREF(hook);
   if (res == 0)
-  {
     res = apsw_connection_add(self);
-    if (res)
-    {
-      DBMUTEX_FORCE(self->dbmutex);
-      Connection_close_internal(self, 2);
-    }
-  }
+
+  /* proactively cleanup if possible */
+  if (res != 0 && sqlite3_mutex_try(self->dbmutex) == SQLITE_OK)
+    Connection_close_internal(self, 2);
+
   assert((PyErr_Occurred() && res != 0) || (res == 0 && !PyErr_Occurred()));
   return res;
 }

src/util.c

@@ -47,28 +47,6 @@
     }                                                                                                                  \
   } while (0)
 
-/* use this when we have to get the dbmutex - eg in dealloc functions
-   - where we busy wait releasing gil until dbmutex is acquired.
-
-  a different thread could be running a sqlite3_step with the GIL
-  released and holding the mutex.  when it finishes it will want
-  the GIL so it can copy error messages etc, but we are holding the
-  GIL.  only after it has copied data into python will it then
-  release the db mutex.
-
-   if the fork checker is in use and this object was allocated in one
-   process and then freed in the next, it will busy loop forever
-   on SQLITE_MISUSE and spamming the unraisable exception hook with
-   forking violation */
-#define DBMUTEX_FORCE(mutex)                                                                                           \
-  do                                                                                                                   \
-  {                                                                                                                    \
-    while (sqlite3_mutex_try(mutex) != SQLITE_OK)                                                                      \
-    {                                                                                                                  \
-      Py_BEGIN_ALLOW_THREADS Py_END_ALLOW_THREADS;                                                                     \
-    }                                                                                                                  \
-  } while (0)
-
 #define DBMUTEX_RETRY_2(conn1, conn2, func)                                                                            \
   do                                                                                                                   \
   {                                                                                                                    \