refactor

Author: SwayamInSync

quaddtype/meson.build

@@ -175,6 +175,8 @@ srcs = [
     'numpy_quaddtype/src/umath/matmul.h',
     'numpy_quaddtype/src/umath/matmul.cpp',
     'numpy_quaddtype/src/constants.hpp',
+    'numpy_quaddtype/src/lock.h',
+    'numpy_quaddtype/src/lock.c',
 ]
 
 py.install_sources(

quaddtype/numpy_quaddtype/src/lock.c

@@ -0,0 +1,17 @@
+#include "lock.h"
+
+#if PY_VERSION_HEX < 0x30d00b3
+PyThread_type_lock sleef_lock = NULL;
+#else
+PyMutex sleef_lock = {0};
+#endif
+
+void init_sleef_locks(void)
+{
+#if PY_VERSION_HEX < 0x30d00b3
+    sleef_lock = PyThread_allocate_lock();
+    if (!sleef_lock) {
+        PyErr_NoMemory();
+    }
+#endif
+}

quaddtype/numpy_quaddtype/src/lock.h

@@ -0,0 +1,18 @@
+#ifndef _QUADDTYPE_LOCK_H
+#define _QUADDTYPE_LOCK_H
+
+#include <Python.h>
+
+#if PY_VERSION_HEX < 0x30d00b3
+extern PyThread_type_lock sleef_lock;
+#define LOCK_SLEEF PyThread_acquire_lock(sleef_lock, WAIT_LOCK)
+#define UNLOCK_SLEEF PyThread_release_lock(sleef_lock)
+#else
+extern PyMutex sleef_lock;
+#define LOCK_SLEEF PyMutex_Lock(&sleef_lock)
+#define UNLOCK_SLEEF PyMutex_Unlock(&sleef_lock)
+#endif
+
+void init_sleef_locks(void);
+
+#endif // _QUADDTYPE_LOCK_H

quaddtype/numpy_quaddtype/src/quaddtype_main.c

@@ -12,6 +12,7 @@
 #include "numpy/dtype_api.h"
 #include "numpy/ufuncobject.h"
 
+#include "lock.h"
 #include "scalar.h"
 #include "dtype.h"
 #include "umath/umath.h"
@@ -96,6 +97,8 @@ PyInit__quaddtype_main(void)
     PyUnstable_Module_SetGIL(m, Py_MOD_GIL_NOT_USED);
 #endif
 
+    init_sleef_locks();
+
     if (init_quadprecision_scalar() < 0)
         goto error;
 

quaddtype/numpy_quaddtype/src/scalar.c

@@ -15,25 +15,14 @@
 #include "scalar_ops.h"
 #include "dragon4.h"
 #include "dtype.h"
+#include "lock.h"
 
 // For IEEE 754 binary128 (quad precision), we need 36 decimal digits 
 // to guarantee round-trip conversion (string -> parse -> equals original value)
 // Formula: ceil(1 + MANT_DIG * log10(2)) = ceil(1 + 113 * 0.30103) = 36
 // src: https://en.wikipedia.org/wiki/Quadruple-precision_floating-point_format
 #define SLEEF_QUAD_DECIMAL_DIG 36
 
-#if PY_VERSION_HEX < 0x30d00b3
-static PyThread_type_lock sleef_lock;
-#define LOCK_SLEEF PyThread_acquire_lock(sleef_lock, WAIT_LOCK)
-#define UNLOCK_SLEEF PyThread_release_lock(sleef_lock)
-#else
-static PyMutex sleef_lock = {0};
-#define LOCK_SLEEF PyMutex_Lock(&sleef_lock)
-#define UNLOCK_SLEEF PyMutex_Unlock(&sleef_lock)
-#endif
-
-
-
 
 QuadPrecisionObject *
 QuadPrecision_raw_new(QuadBackendType backend)
@@ -655,13 +644,6 @@ PyTypeObject QuadPrecision_Type = {
 int
 init_quadprecision_scalar(void)
 {
-#if PY_VERSION_HEX < 0x30d00b3
-    sleef_lock = PyThread_allocate_lock();
-    if (sleef_lock == NULL) {
-        PyErr_NoMemory();
-        return -1;
-    }
-#endif
     QuadPrecision_Type.tp_base = &PyFloatingArrType_Type;
     return PyType_Ready(&QuadPrecision_Type);
 }