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

Merge pull request #241 from mmichal10/cache-name-in-array

Browse Source 
Store name for newly initialized cache in array instead of passing pointer.
This commit is contained in:
Michal Rakowski 2019-08-20 09:39:44 +02:00 committed by GitHub
commit 43e8905456
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inc/ocf_mngt.h
View File

@ -235,7 +235,7 @@ struct ocf_mngt_cache_config {
/** /**
* @brief Cache name * @brief Cache name
*/ */
const char *name; char name[OCF_CACHE_NAME_SIZE];
/** /**
* @brief Cache mode * @brief Cache mode

2
src/mngt/ocf_mngt_cache.c
View File

@ -1582,7 +1582,7 @@ err_pipeline:
static int _ocf_mngt_cache_validate_cfg(struct ocf_mngt_cache_config *cfg) static int _ocf_mngt_cache_validate_cfg(struct ocf_mngt_cache_config *cfg)
{ {
if (!cfg->name) if (!strnlen(cfg->name, OCF_CACHE_NAME_SIZE))
return -OCF_ERR_INVAL; return -OCF_ERR_INVAL;
if (!ocf_cache_mode_is_valid(cfg->cache_mode)) if (!ocf_cache_mode_is_valid(cfg->cache_mode))

8
tests/functional/pyocf/types/cache.py
View File

@ -8,6 +8,7 @@ from ctypes import (
c_uint32, c_uint32,
c_uint16, c_uint16,
c_int, c_int,
c_char,
c_char_p, c_char_p,
c_void_p, c_void_p,
c_bool, c_bool,
@ -41,8 +42,9 @@ class Backfill(Structure):
class CacheConfig(Structure): class CacheConfig(Structure):
MAX_CACHE_NAME_SIZE = 32
_fields_ = [ _fields_ = [
("_name", c_char_p), ("_name", c_char * MAX_CACHE_NAME_SIZE),
("_cache_mode", c_uint32), ("_cache_mode", c_uint32),
("_eviction_policy", c_uint32), ("_eviction_policy", c_uint32),
("_promotion_policy", c_uint32), ("_promotion_policy", c_uint32),
@ -152,7 +154,7 @@ class Cache:
self.cache_line_size = cache_line_size self.cache_line_size = cache_line_size
self.cfg = CacheConfig( self.cfg = CacheConfig(
_name=cast(create_string_buffer(name.encode("ascii")), c_char_p), _name=name.encode("ascii"),
_cache_mode=cache_mode, _cache_mode=cache_mode,
_eviction_policy=eviction_policy, _eviction_policy=eviction_policy,
_promotion_policy=promotion_policy, _promotion_policy=promotion_policy,
@ -307,7 +309,7 @@ class Cache:
raise OcfError("Loading cache device failed", c.results["error"]) raise OcfError("Loading cache device failed", c.results["error"])
@classmethod @classmethod
def load_from_device(cls, device, name=""): def load_from_device(cls, device, name="cache"):
c = cls(name=name, owner=device.owner) c = cls(name=name, owner=device.owner)
c.start_cache() c.start_cache()