admin/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Add spinlock primitives

Browse Source 
Signed-off-by: Ronnie Sahlberg <ronniesahlberg@gmail.com>
This commit is contained in:
Ronnie Sahlberg
2025-04-20 15:19:10 +10:00
parent 3fc5d2996b
commit 4593746363
3 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
include/iscsi-multithreading.h
View File

@@ -123,9 +123,27 @@ static inline int iscsi_mt_mutex_unlock(libiscsi_mutex_t *mutex)
return pthread_mutex_unlock(mutex); return pthread_mutex_unlock(mutex);
} }
typedef pthread_spinlock_t libiscsi_spinlock_t;
static inline int iscsi_mt_spin_init(libiscsi_spinlock_t *spinlock, int shared)
{
return pthread_spin_init(spinlock, shared);
}
static inline int iscsi_mt_spin_destroy(libiscsi_spinlock_t *spinlock)
{
return pthread_spin_destroy(spinlock);
}
static inline int iscsi_mt_spin_lock(libiscsi_spinlock_t *spinlock)
{
return pthread_spin_lock(spinlock);
}
static inline int iscsi_mt_spin_unlock(libiscsi_spinlock_t *spinlock)
{
return pthread_spin_unlock(spinlock);
}
#elif defined(WIN32) #elif defined(WIN32)
typedef HANDLE libiscsi_mutex_t; typedef HANDLE libiscsi_mutex_t;
static inline int iscsi_mt_mutex_init(libiscsi_mutex_t* mutex) static inline int iscsi_mt_mutex_init(libiscsi_mutex_t* mutex)
{ {
*mutex = CreateSemaphoreA(NULL, 1, 1, NULL); *mutex = CreateSemaphoreA(NULL, 1, 1, NULL);
return 0; return 0;
@@ -156,6 +174,11 @@ typedef const int libiscsi_mutex_t;
#define iscsi_mt_mutex_destroy(x) ; #define iscsi_mt_mutex_destroy(x) ;
#define iscsi_mt_mutex_lock(x) ; #define iscsi_mt_mutex_lock(x) ;
#define iscsi_mt_mutex_unlock(x) ; #define iscsi_mt_mutex_unlock(x) ;
typedef const int libiscsi_spinlock_t;
#define iscsi_mt_spin_init(x) ;
#define iscsi_mt_spin_destroy(x) ;
#define iscsi_mt_spin_lock(x) ;
#define iscsi_mt_spin_unlock(x) ;
#endif /* mutex */ #endif /* mutex */

1
include/iscsi-private.h
View File

@@ -213,6 +213,7 @@ struct iscsi_context {
#ifdef HAVE_MULTITHREADING #ifdef HAVE_MULTITHREADING
int multithreading_enabled; int multithreading_enabled;
libiscsi_spinlock_t iscsi_lock;
libiscsi_mutex_t iscsi_mutex; libiscsi_mutex_t iscsi_mutex;
libiscsi_thread_t service_thread; libiscsi_thread_t service_thread;
int poll_timeout; int poll_timeout;

2
lib/init.c
View File

@@ -215,6 +215,7 @@ iscsi_create_context(const char *initiator_name)
memset(iscsi, 0, sizeof(struct iscsi_context)); memset(iscsi, 0, sizeof(struct iscsi_context));
iscsi_mt_spin_init(&iscsi->iscsi_lock, PTHREAD_PROCESS_PRIVATE);
iscsi_mt_mutex_init(&iscsi->iscsi_mutex); iscsi_mt_mutex_init(&iscsi->iscsi_mutex);
iscsi->poll_timeout = 100; iscsi->poll_timeout = 100;
@@ -433,6 +434,7 @@ iscsi_destroy_context(struct iscsi_context *iscsi)
iscsi_destroy_context(iscsi->old_iscsi); iscsi_destroy_context(iscsi->old_iscsi);
} }
iscsi_mt_spin_destroy(&iscsi->iscsi_lock);
iscsi_mt_mutex_destroy(&iscsi->iscsi_mutex); iscsi_mt_mutex_destroy(&iscsi->iscsi_mutex);
memset(iscsi, 0, sizeof(struct iscsi_context)); memset(iscsi, 0, sizeof(struct iscsi_context));