Skip to content

Commit d9466b8

Browse files
lplewalplewa
committed
remove tests for changing pool name thru ctl
1 parent ec00077 commit d9466b8

File tree

2 files changed

+0
-253
lines changed

2 files changed

+0
-253
lines changed

‎test/ctl/ctl_api.cpp‎

Lines changed: 0 additions & 184 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,8 @@
99

1010
#include <atomic>
1111
#include <cstring>
12-
#include <exception>
13-
#include <functional> // For std::ref
14-
#include <stdexcept>
1512
#include <string>
1613
#include <thread>
17-
#include <type_traits>
1814
#include <vector>
1915

2016
#include <umf.h>
@@ -23,8 +19,6 @@
2319
#include <umf/memory_pool.h>
2420
#include <umf/memory_provider.h>
2521
#include <umf/pools/pool_disjoint.h>
26-
#include <umf/pools/pool_scalable.h>
27-
#include <umf/providers/provider_fixed_memory.h>
2822
#include <umf/providers/provider_os_memory.h>
2923

3024
#include "../common/base.hpp"
@@ -56,124 +50,6 @@ TEST_F(test, ctl_by_handle_os_provider) {
5650
umfMemoryProviderDestroy(hProvider);
5751
}
5852

59-
class Pool {
60-
public:
61-
Pool() : provider(NULL), pool(NULL) {}
62-
63-
int instantiatePool(const umf_memory_pool_ops_t *pool_ops,
64-
const void *pool_params,
65-
umf_pool_create_flags_t flags = 0) {
66-
freeResources();
67-
provider = create_memory_provider();
68-
if (provider == NULL) {
69-
return -1; // Provider not supported
70-
}
71-
int ret = umfPoolCreate(pool_ops, provider, pool_params, flags, &pool);
72-
if (ret != UMF_RESULT_SUCCESS) {
73-
umfMemoryProviderDestroy(provider);
74-
provider = NULL;
75-
return -2; // Failed to create memory pool
76-
}
77-
return 0; // Success
78-
}
79-
80-
// Template specialization for different types of reference value
81-
template <typename T> T getReferenceValue() {
82-
if constexpr (std::is_arithmetic_v<T>) {
83-
return 0xBAD;
84-
} else if constexpr (std::is_same_v<T, std::string>) {
85-
return "0xBAD";
86-
}
87-
}
88-
89-
template <typename T>
90-
void validateQuery(umf_result_t (*ctlApiFunction)(const char *name,
91-
void *arg, size_t, ...),
92-
const char *name, T expectedValue,
93-
umf_result_t expected) {
94-
T value = getReferenceValue<T>();
95-
umf_result_t ret;
96-
char ret_buf[256] = {0};
97-
if constexpr (std::is_same_v<T, std::string>) {
98-
strncpy(ret_buf, value.c_str(), sizeof(ret_buf) - 1);
99-
ret_buf[sizeof(ret_buf) - 1] = '\0'; // Ensure null-termination
100-
ret = ctlApiFunction(name, (void *)ret_buf, sizeof(ret_buf), pool);
101-
} else if constexpr (std::is_arithmetic_v<T>) {
102-
std::string value_str = std::to_string(value);
103-
strncpy(ret_buf, value_str.c_str(), sizeof(ret_buf) - 1);
104-
ret_buf[sizeof(ret_buf) - 1] = '\0'; // Ensure null-termination
105-
ret = ctlApiFunction(name, (void *)ret_buf, sizeof(ret_buf), pool);
106-
} else {
107-
ret = ctlApiFunction(name, &value, sizeof(value), pool);
108-
}
109-
110-
ASSERT_EQ(ret, expected);
111-
if (ret == UMF_RESULT_SUCCESS) {
112-
ASSERT_EQ(ret_buf, expectedValue);
113-
}
114-
}
115-
116-
template <typename T>
117-
void executeQuery(umf_result_t (*ctlApiFunction)(const char *name,
118-
void *arg, size_t, ...),
119-
const char *name, T value) {
120-
size_t value_len;
121-
if constexpr (std::is_arithmetic_v<T>) {
122-
value_len = sizeof(value);
123-
} else if constexpr (std::is_same_v<T, std::string>) {
124-
value_len = strlen(value.c_str());
125-
} else if constexpr (std::is_same_v<T, const char *>) {
126-
value_len = strlen(value);
127-
} else {
128-
throw std::runtime_error("Unsupported type for value");
129-
}
130-
umf_result_t ret = ctlApiFunction(name, (void *)value, value_len);
131-
ASSERT_EQ(ret, UMF_RESULT_SUCCESS);
132-
}
133-
134-
void freeResources() {
135-
if (pool) {
136-
umfPoolDestroy(pool);
137-
pool = NULL;
138-
}
139-
if (provider) {
140-
umfMemoryProviderDestroy(provider);
141-
provider = NULL;
142-
}
143-
if (data) {
144-
free(data);
145-
data = nullptr;
146-
}
147-
}
148-
149-
umf_memory_provider_handle_t provider;
150-
umf_memory_pool_handle_t pool;
151-
void *data = nullptr;
152-
153-
private:
154-
// Create a memory provider
155-
umf_memory_provider_handle_t create_memory_provider() {
156-
const umf_memory_provider_ops_t *provider_ops =
157-
umfFixedMemoryProviderOps();
158-
umf_fixed_memory_provider_params_handle_t params = NULL;
159-
160-
data = malloc(1024 * 1024);
161-
int ret =
162-
umfFixedMemoryProviderParamsCreate(data, 1024 * 1024, &params);
163-
if (ret != UMF_RESULT_SUCCESS) {
164-
return 0;
165-
}
166-
167-
ret = umfMemoryProviderCreate(provider_ops, params, &provider);
168-
umfFixedMemoryProviderParamsDestroy(params);
169-
if (ret != UMF_RESULT_SUCCESS) {
170-
return 0;
171-
}
172-
173-
return provider;
174-
}
175-
};
176-
17753
class CtlTest : public ::testing::Test {
17854
public:
17955
CtlTest() {}
@@ -296,66 +172,6 @@ TEST_F(CtlTest, ctlDefaultPoolOverwrite) {
296172
});
297173
}
298174

299-
TEST_F(CtlTest, DISABLED_ctlNameValidation) {
300-
std::string name = "umf.pool.default.disjoint.name";
301-
std::string value = "new_disjoint_pool_name";
302-
umf_disjoint_pool_params_handle_t params = NULL;
303-
304-
Pool p;
305-
try {
306-
p.executeQuery(umfCtlSet, name.c_str(), value.c_str());
307-
umf_result_t res = umfDisjointPoolParamsCreate(&params);
308-
ASSERT_EQ(res, UMF_RESULT_SUCCESS);
309-
310-
auto ret = p.instantiatePool(umfDisjointPoolOps(), params);
311-
ASSERT_EQ(ret, 0);
312-
313-
p.validateQuery(umfCtlGet, "umf.pool.by_handle.{}.disjoint.name",
314-
std::move(value), UMF_RESULT_SUCCESS);
315-
} catch (...) {
316-
GTEST_FAIL() << "Unknown exception!";
317-
}
318-
umfDisjointPoolParamsDestroy(params);
319-
p.freeResources();
320-
}
321-
322-
TEST_F(CtlTest, DISABLED_ctlSizeValidation) {
323-
std::string name = "umf.pool.default.disjoint.name";
324-
std::string value = "1234567890";
325-
umf_disjoint_pool_params_handle_t params = NULL;
326-
327-
Pool p;
328-
try {
329-
p.executeQuery(umfCtlSet, name.c_str(), value.c_str());
330-
umf_result_t res = umfDisjointPoolParamsCreate(&params);
331-
ASSERT_EQ(res, UMF_RESULT_SUCCESS);
332-
333-
auto ret = p.instantiatePool(umfDisjointPoolOps(), params);
334-
ASSERT_EQ(ret, 0);
335-
336-
char output[100] = {0};
337-
umfCtlGet("umf.pool.default.disjoint.name", output, sizeof(output));
338-
ASSERT_EQ(std::string(output), value);
339-
340-
memset(output, 0, sizeof(output));
341-
umfCtlGet("umf.pool.default.disjoint.name", output, value.size() / 2);
342-
auto half_value = value.substr(0, value.size() / 2);
343-
ASSERT_EQ(half_value, std::string(output));
344-
} catch (...) {
345-
GTEST_FAIL() << "Unknown exception!";
346-
}
347-
umfDisjointPoolParamsDestroy(params);
348-
p.freeResources();
349-
}
350-
351-
TEST_F(CtlTest, DISABLED_ctlExecInvalidSize) {
352-
std::string name = "umf.pool.default.disjoint.name";
353-
ASSERT_EQ(umfCtlSet(name.c_str(), (void *)"test_value", 0),
354-
UMF_RESULT_ERROR_INVALID_ARGUMENT);
355-
ASSERT_EQ(umfCtlSet(name.c_str(), NULL, 10),
356-
UMF_RESULT_ERROR_INVALID_ARGUMENT);
357-
}
358-
359175
TEST_F(CtlTest, ctlDefaultMultithreadedProvider) {
360176
umf_test::run_in_fork([] {
361177
std::vector<std::thread> threads;

‎test/pools/disjoint_pool_ctl.cpp‎

Lines changed: 0 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
#include <umf/pools/pool_disjoint.h>
1212
#include <umf/providers/provider_os_memory.h>
1313

14-
#include <cstdio>
15-
#include <fstream>
1614
#include <memory>
1715
#include <vector>
1816

@@ -95,73 +93,6 @@ class ProviderWrapper {
9593
void *m_params;
9694
};
9795

98-
TEST_F(test, DISABLED_disjointCtlName) {
99-
umf_os_memory_provider_params_handle_t os_memory_provider_params = nullptr;
100-
if (UMF_RESULT_ERROR_NOT_SUPPORTED ==
101-
umfOsMemoryProviderParamsCreate(&os_memory_provider_params)) {
102-
GTEST_SKIP() << "OS memory provider is not supported!";
103-
}
104-
105-
ProviderWrapper providerWrapper(umfOsMemoryProviderOps(),
106-
os_memory_provider_params);
107-
if (providerWrapper.get() == NULL) {
108-
GTEST_SKIP() << "OS memory provider is not supported!";
109-
}
110-
111-
// Set default name
112-
const char *val = "disjoint_new_name";
113-
ASSERT_SUCCESS(
114-
umfCtlSet("umf.pool.default.disjoint.name", (void *)val, strlen(val)));
115-
116-
umf_disjoint_pool_params_handle_t params = nullptr;
117-
ASSERT_SUCCESS(umfDisjointPoolParamsCreate(&params));
118-
PoolWrapper poolWrapper(providerWrapper.get(), umfDisjointPoolOps(),
119-
params);
120-
121-
// Check that the default name is correctly set
122-
const char *name = NULL;
123-
ASSERT_SUCCESS(umfPoolGetName(poolWrapper.get(), &name));
124-
ASSERT_STREQ(name, val);
125-
126-
// Clean up
127-
ASSERT_SUCCESS(umfDisjointPoolParamsDestroy(params));
128-
ASSERT_SUCCESS(umfOsMemoryProviderParamsDestroy(os_memory_provider_params));
129-
}
130-
131-
TEST_F(test, DISABLED_disjointCtlChangeNameTwice) {
132-
umf_os_memory_provider_params_handle_t os_memory_provider_params = nullptr;
133-
if (UMF_RESULT_ERROR_NOT_SUPPORTED ==
134-
umfOsMemoryProviderParamsCreate(&os_memory_provider_params)) {
135-
GTEST_SKIP() << "OS memory provider is not supported!";
136-
}
137-
ProviderWrapper providerWrapper(umfOsMemoryProviderOps(),
138-
os_memory_provider_params);
139-
if (providerWrapper.get() == NULL) {
140-
GTEST_SKIP() << "OS memory provider is not supported!";
141-
}
142-
// Set default name
143-
const char *val = "disjoint_new_name";
144-
const char *val2 = "another_name";
145-
ASSERT_SUCCESS(
146-
umfCtlSet("umf.pool.default.disjoint.name", (void *)val, strlen(val)));
147-
ASSERT_SUCCESS(umfCtlSet("umf.pool.default.disjoint.name", (void *)val2,
148-
strlen(val2)));
149-
150-
umf_disjoint_pool_params_handle_t params = nullptr;
151-
ASSERT_SUCCESS(umfDisjointPoolParamsCreate(&params));
152-
PoolWrapper poolWrapper(providerWrapper.get(), umfDisjointPoolOps(),
153-
params);
154-
155-
// Check that the default name is correctly set
156-
const char *name = NULL;
157-
ASSERT_SUCCESS(umfPoolGetName(poolWrapper.get(), &name));
158-
ASSERT_STREQ(name, val2);
159-
160-
// Clean up
161-
ASSERT_SUCCESS(umfDisjointPoolParamsDestroy(params));
162-
ASSERT_SUCCESS(umfOsMemoryProviderParamsDestroy(os_memory_provider_params));
163-
}
164-
16596
TEST_F(test, disjointCtlUsedMemory) {
16697
umf_os_memory_provider_params_handle_t os_memory_provider_params = nullptr;
16798
if (UMF_RESULT_ERROR_NOT_SUPPORTED ==

0 commit comments

Comments
 (0)