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

pyocf: Update after removing struct ocf_io

Browse Source 
Signed-off-by: Robert Baldyga <robert.baldyga@huawei.com>
Signed-off-by: Michal Mielewczyk <michal.mielewczyk@huawei.com>
This commit is contained in:
Robert Baldyga 2023-12-22 00:28:37 +01:00 committed by Michal Mielewczyk
parent 6392ccecef
commit 9b7f476470
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/functional/pyocf/c/wrappers/ocf_io_wrappers.c
View File

@ -1,39 +1,40 @@
/* /*
* Copyright(c) 2012-2022 Intel Corporation * Copyright(c) 2012-2022 Intel Corporation
* Copyright(c) 2024 Huawei Technologies
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
#include "ocf/ocf_io.h" #include "ocf/ocf_io.h"
#include "ocf/ocf_core.h" #include "ocf/ocf_core.h"
void ocf_io_set_cmpl_wrapper(struct ocf_io *io, void *context, void ocf_io_set_cmpl_wrapper(ocf_io_t io, void *context,
void *context2, ocf_end_io_t fn) void *context2, ocf_end_io_t fn)
{ {
ocf_io_set_cmpl(io, context, context2, fn); ocf_io_set_cmpl(io, context, context2, fn);
} }
void ocf_io_set_start_wrapper(struct ocf_io *io, ocf_start_io_t fn) void ocf_io_set_start_wrapper(ocf_io_t io, ocf_start_io_t fn)
{ {
ocf_io_set_start(io, fn); ocf_io_set_start(io, fn);
} }
void ocf_io_set_handle_wrapper(struct ocf_io *io, ocf_handle_io_t fn) void ocf_io_set_handle_wrapper(ocf_io_t io, ocf_handle_io_t fn)
{ {
ocf_io_set_handle(io, fn); ocf_io_set_handle(io, fn);
} }
void ocf_core_submit_io_wrapper(struct ocf_io *io) void ocf_core_submit_io_wrapper(ocf_io_t io)
{ {
ocf_core_submit_io(io); ocf_core_submit_io(io);
} }
void ocf_core_submit_flush_wrapper(struct ocf_io *io) void ocf_core_submit_flush_wrapper(ocf_io_t io)
{ {
ocf_core_submit_flush(io); ocf_core_submit_flush(io);
} }
void ocf_core_submit_discard_wrapper(struct ocf_io *io) void ocf_core_submit_discard_wrapper(ocf_io_t io)
{ {
ocf_core_submit_discard(io); ocf_core_submit_discard(io);
} }

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

@ -39,7 +39,7 @@ class IoOps(Structure):
class Io(Structure): class Io(Structure):
START = CFUNCTYPE(None, c_void_p) START = CFUNCTYPE(None, c_void_p)
HANDLE = CFUNCTYPE(None, c_void_p, c_void_p) HANDLE = CFUNCTYPE(None, c_void_p, c_void_p)
END = CFUNCTYPE(None, c_void_p, c_int) END = CFUNCTYPE(None, c_void_p, c_void_p, c_void_p, c_int)
_instances_ = {} _instances_ = {}
_fields_ = [ _fields_ = [
@ -86,8 +86,8 @@ class Io(Structure):
@staticmethod @staticmethod
@END @END
def c_end(io, err): def c_end(io, priv1, priv2, err):
Io.get_instance(io).end(err) Io.get_instance(io).end(priv1, priv2, err)
@staticmethod @staticmethod
@START @START
@ -99,7 +99,7 @@ class Io(Structure):
def c_handle(io, opaque): def c_handle(io, opaque):
Io.get_instance(io).handle(opaque) Io.get_instance(io).handle(opaque)
def end(self, err): def end(self, priv1, priv2, err):
try: try:
self.callback(err) self.callback(err)
except: # noqa E722 except: # noqa E722