Skip to content

Commit 862a176

Browse files
committed
[CTL] Add CTL functionality (by handle access)
This commit introduces the control and introspection mechanism that can be accessed using pointer to supported pool or provider.
1 parent d319917 commit 862a176

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

src/memory_pool.c

+4
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ static int CTL_SUBTREE_HANDLER(by_handle_pool)(void *ctx,
3737
umf_ctl_node_t CTL_NODE(pool)[] = {CTL_LEAF_SUBTREE2(by_handle, by_handle_pool),
3838
CTL_NODE_END};
3939

40+
<<<<<<< HEAD
4041
static umf_result_t umfDefaultCtlPoolHandle(void *hPool, int operationType,
4142
const char *name, void *arg,
4243
umf_ctl_query_type_t queryType) {
@@ -48,6 +49,9 @@ static umf_result_t umfDefaultCtlPoolHandle(void *hPool, int operationType,
4849
return UMF_RESULT_ERROR_NOT_SUPPORTED;
4950
}
5051

52+
||||||| parent of 2e0f9e8 ([CTL] Add CTL functionality (by handle access))
53+
=======
54+
>>>>>>> 2e0f9e8 ([CTL] Add CTL functionality (by handle access))
5155
static umf_result_t umfPoolCreateInternal(const umf_memory_pool_ops_t *ops,
5256
umf_memory_provider_handle_t provider,
5357
void *params,

0 commit comments

Comments
 (0)