ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ioat: No longer abstract away pthread calls

Browse Source 
pthreads are widely supported and are available on any
platform we currently foresee porting to. Use that API
instead of attempting to abstract it away to simplify
the code.

Change-Id: I28123d427ea8da07c6329b0233f0702f2d85c2a0
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Ben Walker 2016-08-08 09:59:45 -07:00
parent 69c7ff06dc
commit 1f75a72781
3 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/ioat/ioat.c
View File

@ -34,13 +34,15 @@
#include "ioat_internal.h" #include "ioat_internal.h"
#include "ioat_pci.h" #include "ioat_pci.h"
#include <pthread.h>
struct ioat_driver { struct ioat_driver {
ioat_mutex_t lock; pthread_mutex_t lock;
TAILQ_HEAD(, spdk_ioat_chan) attached_chans; TAILQ_HEAD(, spdk_ioat_chan) attached_chans;
}; };
static struct ioat_driver g_ioat_driver = { static struct ioat_driver g_ioat_driver = {
.lock = IOAT_MUTEX_INITIALIZER, .lock = PTHREAD_MUTEX_INITIALIZER,
.attached_chans = TAILQ_HEAD_INITIALIZER(g_ioat_driver.attached_chans), .attached_chans = TAILQ_HEAD_INITIALIZER(g_ioat_driver.attached_chans),
}; };
@ -532,7 +534,7 @@ spdk_ioat_probe(void *cb_ctx, spdk_ioat_probe_cb probe_cb, spdk_ioat_attach_cb a
int rc; int rc;
struct ioat_enum_ctx enum_ctx; struct ioat_enum_ctx enum_ctx;
ioat_mutex_lock(&g_ioat_driver.lock); pthread_mutex_lock(&g_ioat_driver.lock);
enum_ctx.probe_cb = probe_cb; enum_ctx.probe_cb = probe_cb;
enum_ctx.attach_cb = attach_cb; enum_ctx.attach_cb = attach_cb;
@ -540,7 +542,7 @@ spdk_ioat_probe(void *cb_ctx, spdk_ioat_probe_cb probe_cb, spdk_ioat_attach_cb a
rc = ioat_pci_enumerate(ioat_enum_cb, &enum_ctx); rc = ioat_pci_enumerate(ioat_enum_cb, &enum_ctx);
ioat_mutex_unlock(&g_ioat_driver.lock); pthread_mutex_unlock(&g_ioat_driver.lock);
return rc; return rc;
} }
@ -553,9 +555,9 @@ spdk_ioat_detach(struct spdk_ioat_chan *ioat)
/* ioat should be in the free list (not registered to a thread) /* ioat should be in the free list (not registered to a thread)
* when calling ioat_detach(). * when calling ioat_detach().
*/ */
ioat_mutex_lock(&driver->lock); pthread_mutex_lock(&driver->lock);
TAILQ_REMOVE(&driver->attached_chans, ioat, tailq); TAILQ_REMOVE(&driver->attached_chans, ioat, tailq);
ioat_mutex_unlock(&driver->lock); pthread_mutex_unlock(&driver->lock);
ioat_channel_destruct(ioat); ioat_channel_destruct(ioat);
free(ioat); free(ioat);

6
lib/ioat/ioat_impl.h
View File

@ -301,10 +301,4 @@ ioat_pci_enumerate(int (*enum_cb)(void *enum_ctx, struct spdk_pci_device *pci_de
#endif /* !SPDK_CONFIG_PCIACCESS */ #endif /* !SPDK_CONFIG_PCIACCESS */
typedef pthread_mutex_t ioat_mutex_t;
#define ioat_mutex_lock pthread_mutex_lock
#define ioat_mutex_unlock pthread_mutex_unlock
#define IOAT_MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER
#endif /* __IOAT_IMPL_H__ */ #endif /* __IOAT_IMPL_H__ */

6
test/lib/ioat/unit/ioat_impl.h
View File

@ -50,10 +50,4 @@ ioat_pcicfg_unmap_bar(void *devhandle, uint32_t bar, void *addr)
return 0; return 0;
} }
typedef pthread_mutex_t ioat_mutex_t;
#define ioat_mutex_lock pthread_mutex_lock
#define ioat_mutex_unlock pthread_mutex_unlock
#define IOAT_MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER
#endif /* __IOAT_IMPL_H__ */ #endif /* __IOAT_IMPL_H__ */