francesco/myclib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: drop pthreads on hashmap and queue

Browse Source
This commit is contained in:
Francesco
2025-09-04 23:04:00 +02:00
parent 3297890967
commit 24f6ed0f84
4 changed files with 114 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
queue/myqueue.c
View File

@@ -1,11 +1,10 @@
#include "myqueue.h"
#include <pthread.h>
#include <stdlib.h>
#include <string.h>
mcl_queue *mcl_queue_init(size_t queue_size, size_t elem_size) {
mcl_queue *queue = malloc(sizeof(mcl_queue));
mcl_queue_s *mcl_queue_init(size_t queue_size, size_t elem_size) {
mcl_queue_s *queue = malloc(sizeof(mcl_queue_s));
if (queue == NULL) {
return NULL;
}
@@ -17,8 +16,8 @@ mcl_queue *mcl_queue_init(size_t queue_size, size_t elem_size) {
return NULL;
}
int ret = pthread_mutex_init(&queue->lock, NULL);
if (ret != 0) {
int ret = mtx_init(&queue->lock, NULL);
if (ret != thrd_success) {
free(queue->buffer);
free(queue);
@@ -34,15 +33,15 @@ mcl_queue *mcl_queue_init(size_t queue_size, size_t elem_size) {
return queue;
}
int mcl_queue_push(mcl_queue *queue, const void *elem) {
int ret = pthread_mutex_lock(&queue->lock);
if (ret != 0) {
int mcl_queue_push(mcl_queue_s *queue, const void *elem) {
int ret = mtx_lock(&queue->lock);
if (ret != thrd_success) {
return -1;
}
if (queue->size == queue->capacity) {
/* Queue full */
pthread_mutex_unlock(&queue->lock);
mtx_unlock(&queue->lock);
return -1;
}
@@ -54,20 +53,20 @@ int mcl_queue_push(mcl_queue *queue, const void *elem) {
queue->size++;
queue->rear = (queue->rear + 1) % queue->capacity;
pthread_mutex_unlock(&queue->lock);
mtx_unlock(&queue->lock);
return 0;
}
int mcl_queue_pop(mcl_queue *queue, void *out_elem) {
int ret = pthread_mutex_lock(&queue->lock);
if (ret != 0) {
int mcl_queue_pop(mcl_queue_s *queue, void *out_elem) {
int ret = mtx_lock(&queue->lock);
if (ret != thrd_success) {
return -1;
}
if (queue->size == 0) {
/* Queue empty */
pthread_mutex_unlock(&queue->lock);
mtx_unlock(&queue->lock);
return -1;
}
@@ -78,19 +77,19 @@ int mcl_queue_pop(mcl_queue *queue, void *out_elem) {
queue->front = (queue->front + 1) % queue->capacity;
queue->size--;
pthread_mutex_unlock(&queue->lock);
mtx_unlock(&queue->lock);
return 0;
}
int mcl_queue_get_front(mcl_queue *queue, void *out) {
int ret = pthread_mutex_lock(&queue->lock);
if (ret != 0) {
int mcl_queue_get_front(mcl_queue_s *queue, void *out) {
int ret = mtx_lock(&queue->lock);
if (ret != thrd_success) {
return -1;
}
if (queue->size == 0) {
pthread_mutex_unlock(&queue->lock);
mtx_unlock(&queue->lock);
return -1;
}
@@ -98,19 +97,19 @@ int mcl_queue_get_front(mcl_queue *queue, void *out) {
void *front = (void *)queue->buffer + (queue->front * queue->elem_size);
memcpy(out, front, queue->elem_size);
pthread_mutex_unlock(&queue->lock);
mtx_unlock(&queue->lock);
return 0;
}
int mcl_queue_get_rear(mcl_queue *queue, void *out) {
int ret = pthread_mutex_lock(&queue->lock);
if (ret != 0) {
int mcl_queue_get_rear(mcl_queue_s *queue, void *out) {
int ret = mtx_lock(&queue->lock);
if (ret != thrd_success) {
return -1;
}
if (queue->size == 0) {
pthread_mutex_unlock(&queue->lock);
mtx_unlock(&queue->lock);
return -1;
}
@@ -125,17 +124,17 @@ int mcl_queue_get_rear(mcl_queue *queue, void *out) {
void *rear = (void *)queue->buffer + (rear_index * queue->elem_size);
memcpy(out, rear, queue->elem_size);
pthread_mutex_unlock(&queue->lock);
mtx_unlock(&queue->lock);
return 0;
}
void mcl_queue_free(mcl_queue *queue) {
void mcl_queue_free(mcl_queue_s *queue) {
if (queue == NULL) {
return;
}
pthread_mutex_destroy(&queue->lock);
mtx_destroy(&queue->lock);
free(queue->buffer);
free(queue);

32
queue/myqueue.h
View File

@@ -1,21 +1,21 @@
#ifndef MYCLIB_QUEUE_H
#define MYCLIB_QUEUE_H
#include <pthread.h>
#include <stddef.h>
#include <threads.h>
/**
* @brief A simple circular queue (ring buffer).
*/
typedef struct mcl_queue_t {
size_t front; /**< Index of the next element to read. */
size_t rear; /**< Index where the next element will be written. */
size_t size; /**< Current number of elements in the queue. */
size_t capacity; /**< Maximum number of elements the queue can hold. */
size_t elem_size; /**< Size in bytes of each element. */
void *buffer; /**< Memory buffer that holds the elements. */
pthread_mutex_t lock; /**< Mutex to protect concurrent access. */
} mcl_queue;
typedef struct mcl_queue {
size_t front; /**< Index of the next element to read. */
size_t rear; /**< Index where the next element will be written. */
size_t size; /**< Current number of elements in the queue. */
size_t capacity; /**< Maximum number of elements the queue can hold. */
size_t elem_size; /**< Size in bytes of each element. */
void *buffer; /**< Memory buffer that holds the elements. */
mtx_t lock; /**< Mutex to protect concurrent access. */
} mcl_queue_s;
/**
* @brief Create and initialize a new queue.
@@ -24,7 +24,7 @@ typedef struct mcl_queue_t {
* @param elem_size Size in bytes of each element.
* @return Pointer to the new queue, or NULL on failure.
*/
mcl_queue *mcl_queue_init(size_t queue_size, size_t elem_size);
mcl_queue_s *mcl_queue_init(size_t queue_size, size_t elem_size);
/**
* @brief Add an element to the queue.
@@ -33,7 +33,7 @@ mcl_queue *mcl_queue_init(size_t queue_size, size_t elem_size);
* @param elem Pointer to the data to add.
* @return 0 on success, -1 if the queue is full or on error.
*/
int mcl_queue_push(mcl_queue *queue, const void *elem);
int mcl_queue_push(mcl_queue_s *queue, const void *elem);
/**
* @brief Remove an element from the queue.
@@ -42,7 +42,7 @@ int mcl_queue_push(mcl_queue *queue, const void *elem);
* @param out_elem Pointer to memory where the removed element will be copied.
* @return 0 on success, -1 if the queue is empty or on error.
*/
int mcl_queue_pop(mcl_queue *queue, void *out_elem);
int mcl_queue_pop(mcl_queue_s *queue, void *out_elem);
/**
* @brief Copy the front element without removing it.
@@ -51,7 +51,7 @@ int mcl_queue_pop(mcl_queue *queue, void *out_elem);
* @param out Pointer to memory where the element will be copied.
* @return 0 on success, -1 if the queue is empty or on error.
*/
int mcl_queue_get_front(mcl_queue *queue, void *out);
int mcl_queue_get_front(mcl_queue_s *queue, void *out);
/**
* @brief Copy the last element without removing it.
@@ -60,13 +60,13 @@ int mcl_queue_get_front(mcl_queue *queue, void *out);
* @param out Pointer to memory where the element will be copied.
* @return 0 on success, -1 if the queue is empty or on error.
*/
int mcl_queue_get_rear(mcl_queue *queue, void *out);
int mcl_queue_get_rear(mcl_queue_s *queue, void *out);
/**
* @brief Free all resources used by the queue.
*
* @param queue Pointer to the queue to free.
*/
void mcl_queue_free(mcl_queue *queue);
void mcl_queue_free(mcl_queue_s *queue);
#endif // MYCLIB_QUEUE_H