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

Merge pull request #60 from robertbaldyga/make-cleaner-async

Browse Source 
Make cleaner asynchronous
This commit is contained in:
Robert Bałdyga
2019-02-19 16:18:21 +01:00
committed by GitHub
parent 163392af0b 404b976109
commit 435cc6209a
12 changed files with 341 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/utils/utils_cleaner.c
View File

@@ -31,12 +31,6 @@
#define OCF_DEBUG_PARAM(cache, format, ...)
#endif
struct ocf_cleaner_sync {
env_completion cmpl;
int error;
};
/*
* Allocate cleaning request
*/
@@ -948,17 +942,6 @@ void ocf_cleaner_fire(struct ocf_cache *cache,
ocf_req_put(master);
}
static void ocf_cleaner_sync_end(void *private_data, int error)
{
struct ocf_cleaner_sync *sync = private_data;
OCF_DEBUG_TRACE(req->cache);
if (error)
sync->error = error;
env_completion_complete(&sync->cmpl);
}
static int _ocf_cleaner_do_flush_data_getter(struct ocf_cache *cache,
void *context, uint32_t item, ocf_cache_line_t *line)
{
@@ -972,34 +955,6 @@ static int _ocf_cleaner_do_flush_data_getter(struct ocf_cache *cache,
}
}
int ocf_cleaner_do_flush_data(struct ocf_cache *cache,
struct flush_data *flush, uint32_t count,
struct ocf_cleaner_attribs *attribs)
{
struct ocf_cleaner_sync sync;
env_completion_init(&sync.cmpl);
sync.error = 0;
attribs->cmpl_context = &sync;
attribs->cmpl_fn = ocf_cleaner_sync_end;
attribs->getter = _ocf_cleaner_do_flush_data_getter;
attribs->getter_context = flush;
attribs->count = count;
ocf_cleaner_fire(cache, attribs);
if (attribs->metadata_locked)
OCF_METADATA_UNLOCK_WR();
env_completion_wait(&sync.cmpl);
if (attribs->metadata_locked)
OCF_METADATA_LOCK_WR();
attribs->cmpl_context = NULL;
return sync.error;
}
int ocf_cleaner_do_flush_data_async(struct ocf_cache *cache,
struct flush_data *flush, uint32_t count,
struct ocf_cleaner_attribs *attribs)

16
src/utils/utils_cleaner.h
View File

@@ -27,8 +27,6 @@ typedef int (*ocf_cleaner_get_item)(struct ocf_cache *cache,
struct ocf_cleaner_attribs {
uint8_t cache_line_lock : 1; /*!< Clean under cache line lock */
uint8_t metadata_locked : 1; /*< true if caller holds metadata lock */
uint8_t do_sort : 1; /*!< Sort cache lines which will be cleaned */
uint32_t count; /*!< max number of cache lines to be cleaned */
@@ -87,20 +85,6 @@ struct flush_container {
void ocf_cleaner_fire(struct ocf_cache *cache,
const struct ocf_cleaner_attribs *attribs);
/**
* @brief Perform cleaning procedure for specified flush data synchronously.
* Only dirty cache lines will be cleaned.
*
* @param cache - Cache instance
* @param flush - flush data to be cleaned
* @param count - Count of cache lines to be cleaned
* @param attribs - Cleaning attributes
* @return - Cleaning result. 0 - no errors, non zero errors occurred
*/
int ocf_cleaner_do_flush_data(struct ocf_cache *cache,
struct flush_data *flush, uint32_t count,
struct ocf_cleaner_attribs *attribs);
/**
* @brief Perform cleaning procedure for specified flush data. Only dirty
* cache lines will be cleaned.