Skip to content

Commit de9fa7f

Browse files
committed
make providerCreateExt func common
1 parent 6f02c80 commit de9fa7f

File tree

6 files changed

+21
-85
lines changed

6 files changed

+21
-85
lines changed

test/common/provider.hpp

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,27 @@
1818
#include "test_helpers.h"
1919
#include "utils/cpp_helpers.hpp"
2020

21+
typedef void *(*pfnProviderParamsCreate)();
22+
typedef umf_result_t (*pfnProviderParamsDestroy)(void *);
23+
24+
using providerCreateExtParams =
25+
std::tuple<const umf_memory_provider_ops_t *, void *>;
26+
27+
28+
void providerCreateExt(providerCreateExtParams params,
29+
umf_test::provider_unique_handle_t *handle) {
30+
umf_memory_provider_handle_t hProvider = nullptr;
31+
auto [provider_ops, provider_params] = params;
32+
33+
auto ret =
34+
umfMemoryProviderCreate(provider_ops, provider_params, &hProvider);
35+
ASSERT_EQ(ret, UMF_RESULT_SUCCESS);
36+
ASSERT_NE(hProvider, nullptr);
37+
38+
*handle = umf_test::provider_unique_handle_t(hProvider,
39+
&umfMemoryProviderDestroy);
40+
}
41+
2142
namespace umf_test {
2243

2344
umf_memory_provider_handle_t

test/provider_devdax_memory.cpp

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -43,23 +43,6 @@ static int compare_native_error_str(const char *message, int error) {
4343
return strncmp(message, error_str, len);
4444
}
4545

46-
using providerCreateExtParams =
47-
std::tuple<const umf_memory_provider_ops_t *, void *>;
48-
49-
static void providerCreateExt(providerCreateExtParams params,
50-
umf_test::provider_unique_handle_t *handle) {
51-
umf_memory_provider_handle_t hProvider = nullptr;
52-
auto [provider_ops, provider_params] = params;
53-
54-
auto ret =
55-
umfMemoryProviderCreate(provider_ops, provider_params, &hProvider);
56-
ASSERT_EQ(ret, UMF_RESULT_SUCCESS);
57-
ASSERT_NE(hProvider, nullptr);
58-
59-
*handle = umf_test::provider_unique_handle_t(hProvider,
60-
&umfMemoryProviderDestroy);
61-
}
62-
6346
struct umfProviderTest
6447
: umf_test::test,
6548
::testing::WithParamInterface<providerCreateExtParams> {

test/provider_file_memory.cpp

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -39,23 +39,6 @@ static int compare_native_error_str(const char *message, int error) {
3939
return strncmp(message, error_str, len);
4040
}
4141

42-
using providerCreateExtParams =
43-
std::tuple<const umf_memory_provider_ops_t *, void *>;
44-
45-
static void providerCreateExt(providerCreateExtParams params,
46-
umf_test::provider_unique_handle_t *handle) {
47-
umf_memory_provider_handle_t hProvider = nullptr;
48-
auto [provider_ops, provider_params] = params;
49-
50-
auto ret =
51-
umfMemoryProviderCreate(provider_ops, provider_params, &hProvider);
52-
ASSERT_EQ(ret, UMF_RESULT_SUCCESS);
53-
ASSERT_NE(hProvider, nullptr);
54-
55-
*handle = umf_test::provider_unique_handle_t(hProvider,
56-
&umfMemoryProviderDestroy);
57-
}
58-
5942
struct FileProviderParamsDefault
6043
: umf_test::test,
6144
::testing::WithParamInterface<providerCreateExtParams> {

test/provider_fixed_memory.cpp

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -38,23 +38,6 @@ static int compare_native_error_str(const char *message, int error) {
3838
return strncmp(message, error_str, len);
3939
}
4040

41-
using providerCreateExtParams =
42-
std::tuple<const umf_memory_provider_ops_t *, void *>;
43-
44-
static void providerCreateExt(providerCreateExtParams params,
45-
umf_test::provider_unique_handle_t *handle) {
46-
umf_memory_provider_handle_t hProvider = nullptr;
47-
auto [provider_ops, provider_params] = params;
48-
49-
auto ret =
50-
umfMemoryProviderCreate(provider_ops, provider_params, &hProvider);
51-
ASSERT_EQ(ret, UMF_RESULT_SUCCESS);
52-
ASSERT_NE(hProvider, nullptr);
53-
54-
*handle = umf_test::provider_unique_handle_t(hProvider,
55-
&umfMemoryProviderDestroy);
56-
}
57-
5841
struct FixedProviderTest
5942
: umf_test::test,
6043
::testing::WithParamInterface<providerCreateExtParams> {

test/provider_os_memory.cpp

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -44,23 +44,6 @@ static int compare_native_error_str(const char *message, int error) {
4444
return strncmp(message, error_str, len);
4545
}
4646

47-
using providerCreateExtParams =
48-
std::tuple<const umf_memory_provider_ops_t *, void *>;
49-
50-
static void providerCreateExt(providerCreateExtParams params,
51-
umf_test::provider_unique_handle_t *handle) {
52-
umf_memory_provider_handle_t hProvider = nullptr;
53-
auto [provider_ops, provider_params] = params;
54-
55-
auto ret =
56-
umfMemoryProviderCreate(provider_ops, provider_params, &hProvider);
57-
ASSERT_EQ(ret, UMF_RESULT_SUCCESS);
58-
ASSERT_NE(hProvider, nullptr);
59-
60-
*handle = umf_test::provider_unique_handle_t(hProvider,
61-
&umfMemoryProviderDestroy);
62-
}
63-
6447
struct umfProviderTest
6548
: umf_test::test,
6649
::testing::WithParamInterface<providerCreateExtParams> {

test/provider_tracking.cpp

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,6 @@ using umf_test::test;
1919
#define FIXED_BUFFER_SIZE (512 * utils_get_page_size())
2020
#define INVALID_PTR ((void *)0x01)
2121

22-
using providerCreateExtParams =
23-
std::tuple<const umf_memory_provider_ops_t *, void *>;
24-
25-
static void providerCreateExt(providerCreateExtParams params,
26-
umf_test::provider_unique_handle_t *handle) {
27-
umf_memory_provider_handle_t hProvider = nullptr;
28-
auto [provider_ops, provider_params] = params;
29-
30-
auto ret =
31-
umfMemoryProviderCreate(provider_ops, provider_params, &hProvider);
32-
ASSERT_EQ(ret, UMF_RESULT_SUCCESS);
33-
ASSERT_NE(hProvider, nullptr);
34-
35-
*handle = umf_test::provider_unique_handle_t(hProvider,
36-
&umfMemoryProviderDestroy);
37-
}
38-
3922
struct TrackingProviderTest
4023
: umf_test::test,
4124
::testing::WithParamInterface<providerCreateExtParams> {

0 commit comments

Comments
 (0)