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

Rename entry_idx to idx

Browse Source 
Signed-off-by: Adam Rutkowski <adam.j.rutkowski@intel.com>
This commit is contained in:
Adam Rutkowski 2021-04-05 19:59:56 -05:00 committed by Kozlowski Mateusz
parent 9d94c0b213
commit 3845da1de8
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/concurrency/ocf_cache_line_concurrency.c
View File

@ -37,7 +37,7 @@
struct __waiter { struct __waiter {
ocf_cache_line_t line; ocf_cache_line_t line;
uint32_t entry_idx; uint32_t idx;
struct ocf_request *req; struct ocf_request *req;
ocf_req_async_lock_cb cmpl; ocf_req_async_lock_cb cmpl;
struct list_head item; struct list_head item;
@ -458,7 +458,7 @@ static void _req_on_lock(struct ocf_cache_line_concurrency *c,
static inline bool __lock_cache_line_wr(struct ocf_cache_line_concurrency *c, static inline bool __lock_cache_line_wr(struct ocf_cache_line_concurrency *c,
struct ocf_cache_line_concurrency_lock_cbs *cbs, struct ocf_cache_line_concurrency_lock_cbs *cbs,
const ocf_cache_line_t line, ocf_req_async_lock_cb cmpl, const ocf_cache_line_t line, ocf_req_async_lock_cb cmpl,
void *req, uint32_t entry_idx) void *req, uint32_t idx)
{ {
struct __waiter *waiter; struct __waiter *waiter;
bool waiting = false; bool waiting = false;
@ -468,7 +468,7 @@ static inline bool __lock_cache_line_wr(struct ocf_cache_line_concurrency *c,
if (__try_lock_wr(c, line)) { if (__try_lock_wr(c, line)) {
/* lock was not owned by anyone */ /* lock was not owned by anyone */
cbs->line_mark_locked(req, entry_idx, OCF_WRITE, true); cbs->line_mark_locked(req, idx, OCF_WRITE, true);
_req_on_lock(c, req, cmpl); _req_on_lock(c, req, cmpl);
return true; return true;
} }
@ -488,7 +488,7 @@ static inline bool __lock_cache_line_wr(struct ocf_cache_line_concurrency *c,
/* Setup waiters filed */ /* Setup waiters filed */
waiter->line = line; waiter->line = line;
waiter->req = req; waiter->req = req;
waiter->entry_idx = entry_idx; waiter->idx = idx;
waiter->cmpl = cmpl; waiter->cmpl = cmpl;
waiter->rw = OCF_WRITE; waiter->rw = OCF_WRITE;
INIT_LIST_HEAD(&waiter->item); INIT_LIST_HEAD(&waiter->item);
@ -501,7 +501,7 @@ unlock:
__unlock_waiters_list(c, line, flags); __unlock_waiters_list(c, line, flags);
if (!waiting) { if (!waiting) {
cbs->line_mark_locked(req, entry_idx, OCF_WRITE, true); cbs->line_mark_locked(req, idx, OCF_WRITE, true);
_req_on_lock(c, req, cmpl); _req_on_lock(c, req, cmpl);
env_allocator_del(c->allocator, waiter); env_allocator_del(c->allocator, waiter);
} }
@ -516,7 +516,7 @@ unlock:
static inline bool __lock_cache_line_rd(struct ocf_cache_line_concurrency *c, static inline bool __lock_cache_line_rd(struct ocf_cache_line_concurrency *c,
struct ocf_cache_line_concurrency_lock_cbs *cbs, struct ocf_cache_line_concurrency_lock_cbs *cbs,
const ocf_cache_line_t line, ocf_req_async_lock_cb cmpl, const ocf_cache_line_t line, ocf_req_async_lock_cb cmpl,
void *req, uint32_t entry_idx) void *req, uint32_t idx)
{ {
struct __waiter *waiter; struct __waiter *waiter;
bool waiting = false; bool waiting = false;
@ -526,7 +526,7 @@ static inline bool __lock_cache_line_rd(struct ocf_cache_line_concurrency *c,
if( __try_lock_rd_idle(c, line)) { if( __try_lock_rd_idle(c, line)) {
/* lock was not owned by anyone */ /* lock was not owned by anyone */
cbs->line_mark_locked(req, entry_idx, OCF_READ, true); cbs->line_mark_locked(req, idx, OCF_READ, true);
_req_on_lock(c, req, cmpl); _req_on_lock(c, req, cmpl);
return true; return true;
} }
@ -551,7 +551,7 @@ static inline bool __lock_cache_line_rd(struct ocf_cache_line_concurrency *c,
/* Setup waiters field */ /* Setup waiters field */
waiter->line = line; waiter->line = line;
waiter->req = req; waiter->req = req;
waiter->entry_idx = entry_idx; waiter->idx = idx;
waiter->cmpl = cmpl; waiter->cmpl = cmpl;
waiter->rw = OCF_READ; waiter->rw = OCF_READ;
INIT_LIST_HEAD(&waiter->item); INIT_LIST_HEAD(&waiter->item);
@ -564,7 +564,7 @@ unlock:
__unlock_waiters_list(c, line, flags); __unlock_waiters_list(c, line, flags);
if (!waiting) { if (!waiting) {
cbs->line_mark_locked(req, entry_idx, OCF_READ, true); cbs->line_mark_locked(req, idx, OCF_READ, true);
_req_on_lock(c, req, cmpl); _req_on_lock(c, req, cmpl);
env_allocator_del(c->allocator, waiter); env_allocator_del(c->allocator, waiter);
} }
@ -622,7 +622,7 @@ static inline void __unlock_cache_line_rd_common(struct ocf_cache_line_concurren
exchanged = false; exchanged = false;
list_del(iter); list_del(iter);
cbs->line_mark_locked(waiter->req, waiter->entry_idx, cbs->line_mark_locked(waiter->req, waiter->idx,
waiter->rw, true); waiter->rw, true);
_req_on_lock(c, waiter->req, waiter->cmpl); _req_on_lock(c, waiter->req, waiter->cmpl);
@ -706,7 +706,7 @@ static inline void __unlock_cache_line_wr_common(struct ocf_cache_line_concurren
exchanged = false; exchanged = false;
list_del(iter); list_del(iter);
cbs->line_mark_locked(waiter->req, waiter->entry_idx, cbs->line_mark_locked(waiter->req, waiter->idx,
waiter->rw, true); waiter->rw, true);
_req_on_lock(c, waiter->req, waiter->cmpl); _req_on_lock(c, waiter->req, waiter->cmpl);