github/ocf
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Save alock callbacks during initialization

Browse Source 
Signed-off-by: Kozlowski Mateusz <mateusz.kozlowski@intel.com>
This commit is contained in:
Kozlowski Mateusz
2021-05-20 12:12:38 +02:00
parent f589341c9a
commit f49e9d2d6a
4 changed files with 101 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/concurrency/ocf_cache_line_concurrency.c
View File

@@ -66,10 +66,7 @@ bool ocf_cache_line_try_lock_rd(struct ocf_alock *alock,
void ocf_cache_line_unlock_rd(struct ocf_alock *alock, ocf_cache_line_t line)
{
struct ocf_alock_lock_cbs *cbs =
&ocf_cline_conc_cbs;
ocf_alock_unlock_one_rd(alock, cbs, line);
ocf_alock_unlock_one_rd(alock, line);
}
bool ocf_cache_line_try_lock_wr(struct ocf_alock *alock,
@@ -81,52 +78,34 @@ bool ocf_cache_line_try_lock_wr(struct ocf_alock *alock,
void ocf_cache_line_unlock_wr(struct ocf_alock *alock,
ocf_cache_line_t line)
{
struct ocf_alock_lock_cbs *cbs =
&ocf_cline_conc_cbs;
ocf_alock_unlock_one_wr(alock, cbs, line);
ocf_alock_unlock_one_wr(alock, line);
}
int ocf_req_async_lock_rd(struct ocf_alock *alock,
struct ocf_request *req, ocf_req_async_lock_cb cmpl)
{
struct ocf_alock_lock_cbs *cbs =
&ocf_cline_conc_cbs;
return ocf_alock_lock_rd(alock, cbs, req, cmpl);
return ocf_alock_lock_rd(alock, req, cmpl);
}
int ocf_req_async_lock_wr(struct ocf_alock *alock,
struct ocf_request *req, ocf_req_async_lock_cb cmpl)
{
struct ocf_alock_lock_cbs *cbs =
&ocf_cline_conc_cbs;
return ocf_alock_lock_wr(alock, cbs, req, cmpl);
return ocf_alock_lock_wr(alock, req, cmpl);
}
void ocf_req_unlock_rd(struct ocf_alock *alock, struct ocf_request *req)
{
struct ocf_alock_lock_cbs *cbs =
&ocf_cline_conc_cbs;
ocf_alock_unlock_rd(alock, cbs, req);
ocf_alock_unlock_rd(alock, req);
}
void ocf_req_unlock_wr(struct ocf_alock *alock, struct ocf_request *req)
{
struct ocf_alock_lock_cbs *cbs =
&ocf_cline_conc_cbs;
ocf_alock_unlock_wr(alock, cbs, req);
ocf_alock_unlock_wr(alock, req);
}
void ocf_req_unlock(struct ocf_alock *alock, struct ocf_request *req)
{
struct ocf_alock_lock_cbs *cbs =
&ocf_cline_conc_cbs;
ocf_alock_unlock(alock, cbs, req);
ocf_alock_unlock(alock, req);
}
bool ocf_cache_line_are_waiters(struct ocf_alock *alock,
@@ -165,7 +144,7 @@ int ocf_cache_line_concurrency_init(struct ocf_alock **self,
if (ret >= ALLOCATOR_NAME_MAX)
return -ENOSPC;
return ocf_alock_init(self, num_clines, name, cache);
return ocf_alock_init(self, num_clines, name, &ocf_cline_conc_cbs, cache);
}
void ocf_cache_line_concurrency_deinit(struct ocf_alock **self)

12
src/concurrency/ocf_mio_concurrency.c
View File

@@ -78,19 +78,13 @@ int ocf_mio_async_lock(struct ocf_alock *alock,
struct metadata_io_request *m_req,
ocf_req_async_lock_cb cmpl)
{
struct ocf_alock_lock_cbs *cbs =
&ocf_mio_conc_cbs;
return ocf_alock_lock_wr(alock, cbs, &m_req->req, cmpl);
return ocf_alock_lock_wr(alock, &m_req->req, cmpl);
}
void ocf_mio_async_unlock(struct ocf_alock *alock,
struct metadata_io_request *m_req)
{
struct ocf_alock_lock_cbs *cbs =
&ocf_mio_conc_cbs;
ocf_alock_unlock_wr(alock, cbs, &m_req->req);
ocf_alock_unlock_wr(alock, &m_req->req);
m_req->map = 0;
}
@@ -119,7 +113,7 @@ int ocf_mio_concurrency_init(struct ocf_alock **self,
if (!alock)
return -OCF_ERR_NO_MEM;
ret = ocf_alock_init_inplace(alock, num_pages, name, cache);
ret = ocf_alock_init_inplace(alock, num_pages, name, &ocf_mio_conc_cbs, cache);
if (ret)
return ret;