Merge pull request #6 from dreamer-coding/main

Update Threads API

Author: dreamer-coding

README.md

@@ -29,7 +29,6 @@
 To get started, ensure you have the following installed:
 
 - **Meson Build System**: If you don’t have Meson `1.8.0` or newer installed, follow the installation instructions on the official [Meson website](https://mesonbuild.com/Getting-meson.html).
-- **Conan Package Manager**: If you prefer using Conan, ensure it is installed by following the instructions on the official [Conan website](https://docs.conan.io/en/latest/installation.html).
 
 ### Adding Dependency
 

code/logic/cond.c

@@ -49,19 +49,21 @@ int fossil_threads_cond_init(fossil_threads_cond_t *c) {
 
 #if defined(_WIN32)
     CONDITION_VARIABLE *cv = (CONDITION_VARIABLE*)malloc(sizeof(CONDITION_VARIABLE));
-    if (!cv) return FOSSIL_THREADS_COND_EINTERNAL;
+    if (!cv) return FOSSIL_THREADS_COND_ENOMEM;
     InitializeConditionVariable(cv);
     c->handle = cv;
 #else
     pthread_cond_t *pc = (pthread_cond_t*)malloc(sizeof(pthread_cond_t));
-    if (!pc) return FOSSIL_THREADS_COND_EINTERNAL;
+    if (!pc) return FOSSIL_THREADS_COND_ENOMEM;
     if (pthread_cond_init(pc, NULL) != 0) {
         free(pc);
         return FOSSIL_THREADS_COND_EINTERNAL;
     }
     c->handle = pc;
 #endif
     c->valid = 1;
+    c->is_broadcast = 0;
+    c->waiters = 0;
     return FOSSIL_THREADS_COND_OK;
 }
 
@@ -86,19 +88,32 @@ void fossil_threads_cond_dispose(fossil_threads_cond_t *c) {
 int fossil_threads_cond_wait(fossil_threads_cond_t *c, fossil_threads_mutex_t *m) {
     if (!c || !m || !c->valid || !m->valid) return FOSSIL_THREADS_COND_EINVAL;
 
+    c->waiters++;
 #if defined(_WIN32)
     if (!SleepConditionVariableCS(
         (CONDITION_VARIABLE*)c->handle,
         (CRITICAL_SECTION*)m->handle,
         INFINITE))
     {
+        c->waiters--;
         return FOSSIL_THREADS_COND_EINTERNAL;
     }
+    c->waiters--;
     return FOSSIL_THREADS_COND_OK;
 #else
     int rc = pthread_cond_wait((pthread_cond_t*)c->handle,
                                (pthread_mutex_t*)m->handle);
-    return rc == 0 ? FOSSIL_THREADS_COND_OK : rc;
+    c->waiters--;
+    if (rc == 0) return FOSSIL_THREADS_COND_OK;
+    if (rc == EINVAL) return FOSSIL_THREADS_COND_EINVAL;
+    if (rc == EAGAIN) return FOSSIL_THREADS_COND_EAGAIN;
+    if (rc == ENOMEM) return FOSSIL_THREADS_COND_ENOMEM;
+    if (rc == EPERM)  return FOSSIL_THREADS_COND_EPERM;
+    if (rc == EBUSY)  return FOSSIL_THREADS_COND_EBUSY;
+    if (rc == EDEADLK) return FOSSIL_THREADS_COND_EDEADLK;
+    if (rc == ENOENT) return FOSSIL_THREADS_COND_ENOENT;
+    if (rc == ENOSYS) return FOSSIL_THREADS_COND_ENOSYS;
+    return FOSSIL_THREADS_COND_EINTERNAL;
 #endif
 }
 
@@ -107,12 +122,14 @@ int fossil_threads_cond_timedwait(fossil_threads_cond_t *c,
                                   unsigned int ms) {
     if (!c || !m || !c->valid || !m->valid) return FOSSIL_THREADS_COND_EINVAL;
 
+    c->waiters++;
 #if defined(_WIN32)
     BOOL ok = SleepConditionVariableCS(
         (CONDITION_VARIABLE*)c->handle,
         (CRITICAL_SECTION*)m->handle,
         ms
     );
+    c->waiters--;
     if (ok) return FOSSIL_THREADS_COND_OK;
     if (GetLastError() == ERROR_TIMEOUT) return FOSSIL_THREADS_COND_ETIMEDOUT;
     return FOSSIL_THREADS_COND_EINTERNAL;
@@ -130,30 +147,77 @@ int fossil_threads_cond_timedwait(fossil_threads_cond_t *c,
     int rc = pthread_cond_timedwait((pthread_cond_t*)c->handle,
                                     (pthread_mutex_t*)m->handle,
                                     &ts);
+    c->waiters--;
     if (rc == 0) return FOSSIL_THREADS_COND_OK;
     if (rc == ETIMEDOUT) return FOSSIL_THREADS_COND_ETIMEDOUT;
-    return rc;
+    if (rc == EINVAL) return FOSSIL_THREADS_COND_EINVAL;
+    if (rc == EAGAIN) return FOSSIL_THREADS_COND_EAGAIN;
+    if (rc == ENOMEM) return FOSSIL_THREADS_COND_ENOMEM;
+    if (rc == EPERM)  return FOSSIL_THREADS_COND_EPERM;
+    if (rc == EBUSY)  return FOSSIL_THREADS_COND_EBUSY;
+    if (rc == EDEADLK) return FOSSIL_THREADS_COND_EDEADLK;
+    if (rc == ENOENT) return FOSSIL_THREADS_COND_ENOENT;
+    if (rc == ENOSYS) return FOSSIL_THREADS_COND_ENOSYS;
+    return FOSSIL_THREADS_COND_EINTERNAL;
 #endif
 }
 
 int fossil_threads_cond_signal(fossil_threads_cond_t *c) {
     if (!c || !c->valid) return FOSSIL_THREADS_COND_EINVAL;
 
+    c->is_broadcast = 0;
 #if defined(_WIN32)
     WakeConditionVariable((CONDITION_VARIABLE*)c->handle);
     return FOSSIL_THREADS_COND_OK;
 #else
-    return pthread_cond_signal((pthread_cond_t*)c->handle);
+    int rc = pthread_cond_signal((pthread_cond_t*)c->handle);
+    if (rc == 0) return FOSSIL_THREADS_COND_OK;
+    if (rc == EINVAL) return FOSSIL_THREADS_COND_EINVAL;
+    if (rc == ENOMEM) return FOSSIL_THREADS_COND_ENOMEM;
+    if (rc == EBUSY) return FOSSIL_THREADS_COND_EBUSY;
+    if (rc == EPERM) return FOSSIL_THREADS_COND_EPERM;
+    if (rc == EDEADLK) return FOSSIL_THREADS_COND_EDEADLK;
+    if (rc == ENOENT) return FOSSIL_THREADS_COND_ENOENT;
+    if (rc == EAGAIN) return FOSSIL_THREADS_COND_EAGAIN;
+    if (rc == ENOSYS) return FOSSIL_THREADS_COND_ENOSYS;
+    return FOSSIL_THREADS_COND_EINTERNAL;
 #endif
 }
 
 int fossil_threads_cond_broadcast(fossil_threads_cond_t *c) {
     if (!c || !c->valid) return FOSSIL_THREADS_COND_EINVAL;
 
+    c->is_broadcast = 1;
 #if defined(_WIN32)
     WakeAllConditionVariable((CONDITION_VARIABLE*)c->handle);
     return FOSSIL_THREADS_COND_OK;
 #else
-    return pthread_cond_broadcast((pthread_cond_t*)c->handle);
+    int rc = pthread_cond_broadcast((pthread_cond_t*)c->handle);
+    if (rc == 0) return FOSSIL_THREADS_COND_OK;
+    if (rc == EINVAL) return FOSSIL_THREADS_COND_EINVAL;
+    if (rc == ENOMEM) return FOSSIL_THREADS_COND_ENOMEM;
+    if (rc == EBUSY) return FOSSIL_THREADS_COND_EBUSY;
+    if (rc == EPERM) return FOSSIL_THREADS_COND_EPERM;
+    if (rc == EDEADLK) return FOSSIL_THREADS_COND_EDEADLK;
+    if (rc == ENOENT) return FOSSIL_THREADS_COND_ENOENT;
+    if (rc == EAGAIN) return FOSSIL_THREADS_COND_EAGAIN;
+    if (rc == ENOSYS) return FOSSIL_THREADS_COND_ENOSYS;
+    return FOSSIL_THREADS_COND_EINTERNAL;
 #endif
 }
+
+int fossil_threads_cond_is_valid(const fossil_threads_cond_t *c) {
+    if (!c) return 0;
+    return c->valid ? 1 : 0;
+}
+
+int fossil_threads_cond_waiter_count(const fossil_threads_cond_t *c) {
+    if (!c || !c->valid) return -1;
+    return c->waiters;
+}
+
+int fossil_threads_cond_reset(fossil_threads_cond_t *c) {
+    if (!c) return FOSSIL_THREADS_COND_EINVAL;
+    fossil_threads_cond_dispose(c);
+    return fossil_threads_cond_init(c);
+}

code/logic/fossil/threads/cond.h

@@ -43,8 +43,10 @@ extern "C"
 /* ---------- Types ---------- */
 
 typedef struct fossil_threads_cond {
-    void *handle;  /* CONDITION_VARIABLE* on Win, pthread_cond_t* on POSIX */
+    void *handle;      /* CONDITION_VARIABLE* on Win, pthread_cond_t* on POSIX */
     int   valid;
+    int   is_broadcast; /* 1 if last signal was broadcast, 0 otherwise */
+    int   waiters;      /* Number of threads currently waiting */
 } fossil_threads_cond_t;
 
 /* ---------- Lifecycle ---------- */
@@ -130,12 +132,47 @@ FOSSIL_THREADS_API int fossil_threads_cond_signal(fossil_threads_cond_t *c);
  */
 FOSSIL_THREADS_API int fossil_threads_cond_broadcast(fossil_threads_cond_t *c);
 
+/**
+ * @brief Check if the condition variable is valid.
+ *
+ * Returns nonzero if the condition variable is initialized and valid, zero otherwise.
+ *
+ * @param c Pointer to the condition variable.
+ * @return 1 if valid, 0 if not.
+ */
+FOSSIL_THREADS_API int fossil_threads_cond_is_valid(const fossil_threads_cond_t *c);
+
+/**
+ * @brief Get the number of threads currently waiting on the condition variable.
+ *
+ * @param c Pointer to the condition variable.
+ * @return Number of waiting threads, or negative value on error.
+ */
+FOSSIL_THREADS_API int fossil_threads_cond_waiter_count(const fossil_threads_cond_t *c);
+
+/**
+ * @brief Reset the condition variable to its initial state.
+ *
+ * This function disposes and re-initializes the condition variable.
+ *
+ * @param c Pointer to the condition variable.
+ * @return FOSSIL_THREADS_COND_OK on success, or error code on failure.
+ */
+FOSSIL_THREADS_API int fossil_threads_cond_reset(fossil_threads_cond_t *c);
+
 /* Error codes */
 enum {
-    FOSSIL_THREADS_COND_OK        = 0,
-    FOSSIL_THREADS_COND_EINVAL    = 22,
-    FOSSIL_THREADS_COND_ETIMEDOUT = 110,
-    FOSSIL_THREADS_COND_EINTERNAL = 199
+    FOSSIL_THREADS_COND_OK         = 0,
+    FOSSIL_THREADS_COND_EINVAL     = 22,   /* Invalid argument */
+    FOSSIL_THREADS_COND_ETIMEDOUT  = 110,  /* Timeout occurred */
+    FOSSIL_THREADS_COND_EINTERNAL  = 199,  /* Internal error */
+    FOSSIL_THREADS_COND_ENOMEM     = 12,   /* Out of memory */
+    FOSSIL_THREADS_COND_EBUSY      = 16,   /* Resource busy */
+    FOSSIL_THREADS_COND_EPERM      = 1,    /* Operation not permitted */
+    FOSSIL_THREADS_COND_EDEADLK    = 35,   /* Deadlock detected */
+    FOSSIL_THREADS_COND_ENOENT     = 2,    /* No such file or directory (resource) */
+    FOSSIL_THREADS_COND_EAGAIN     = 11,   /* Try again (resource temporarily unavailable) */
+    FOSSIL_THREADS_COND_ENOSYS     = 38    /* Function not implemented */
 };
 
 #ifdef __cplusplus
@@ -247,6 +284,35 @@ namespace threads {
          */
         fossil_threads_cond_t* native_handle() { return &cond_; }
 
+        /**
+         * @brief Checks if the condition variable is valid.
+         *
+         * @return true if valid, false otherwise.
+         */
+        bool is_valid() const {
+            return fossil_threads_cond_is_valid(&cond_) != 0;
+        }
+
+        /**
+         * @brief Returns the number of threads currently waiting on the condition variable.
+         *
+         * @return Number of waiting threads, or negative value on error.
+         */
+        int waiter_count() const {
+            return fossil_threads_cond_waiter_count(&cond_);
+        }
+
+        /**
+         * @brief Resets the condition variable to its initial state.
+         *
+         * Disposes and re-initializes the condition variable.
+         *
+         * @return FOSSIL_THREADS_COND_OK on success, or error code on failure.
+         */
+        int reset() {
+            return fossil_threads_cond_reset(&cond_);
+        }
+
     private:
         fossil_threads_cond_t cond_; /**< The underlying condition variable structure. */
     };

code/logic/fossil/threads/framework.h

@@ -27,7 +27,6 @@
 
 #include "thread.h"
 #include "mutex.h"
-#include "ghost.h"
 #include "cond.h"
 
 #endif /* FOSSIL_THREADS_FRAMEWORK_H */