pceplib, pathd: Convert pceplib to use our ALLOC functions

Currently pceplib has this dual world where it tries to be able
to use different memory managers.  This is just wasteful extra coding
and let's just remove it.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>

Author: donaldsharp

doc/developer/pceplib.rst

@@ -370,27 +370,6 @@ PCEPlib PCC initialization and destruction functions:
 
 The ``pceplib_infra_config`` struct has the following fields:
 
-- **void *pceplib_infra_mt**
-    - FRR Memory type pointer for infra related memory management
-
-- **void *pceplib_messages_mt**
-    - FRR Memory type pointer for PCEP messages related memory management
-
-- **pceplib_malloc_func mfunc**
-    - FRR malloc function pointer
-
-- **pceplib_calloc_func cfunc**
-    - FRR calloc function pointer
-
-- **pceplib_realloc_func rfunc**
-    - FRR realloc function pointer
-
-- **pceplib_strdup_func sfunc**
-    - FRR strdup function pointer
-
-- **pceplib_free_func ffunc**
-    - FRR free function pointer
-
 - **void *external_infra_data**
     - FRR data used by FRR timers and sockets infrastructure
 

pathd/path_pcep_lib.c

@@ -15,9 +15,6 @@
 #include "pathd/path_pcep_lib.h"
 #include "pathd/path_pcep_debug.h"
 
-DEFINE_MTYPE_STATIC(PATHD, PCEPLIB_INFRA,    "PCEPlib Infrastructure");
-DEFINE_MTYPE_STATIC(PATHD, PCEPLIB_MESSAGES, "PCEPlib PCEP Messages");
-
 #define CLASS_TYPE(CLASS, TYPE) (((CLASS) << 16) | (TYPE))
 #define DEFAULT_LSAP_SETUP_PRIO 4
 #define DEFAULT_LSAP_HOLDING_PRIO 4
@@ -103,23 +100,15 @@ int pcep_lib_initialize(struct frr_pthread *fpt)
 
 	/* Its ok that this object goes out of scope, as it
 	 * wont be stored, and its values will be copied */
-	struct pceplib_infra_config infra = {
-		/* Memory infrastructure */
-		.pceplib_infra_mt = MTYPE_PCEPLIB_INFRA,
-		.pceplib_messages_mt = MTYPE_PCEPLIB_MESSAGES,
-		.malloc_func = (pceplib_malloc_func)qmalloc,
-		.calloc_func = (pceplib_calloc_func)qcalloc,
-		.realloc_func = (pceplib_realloc_func)qrealloc,
-		.strdup_func = (pceplib_strdup_func)qstrdup,
-		.free_func = (pceplib_free_func)qfree,
-		/* Timers infrastructure */
-		.external_infra_data = fpt,
-		.socket_read_func = pcep_lib_pceplib_socket_read_cb,
-		.socket_write_func = pcep_lib_pceplib_socket_write_cb,
-		/* PCEP events */
-		.pcep_event_func = pcep_lib_pceplib_event_cb,
-		/* PCEPlib pthread creation callback */
-		.pthread_create_func = pcep_lib_pthread_create_cb};
+	struct pceplib_infra_config infra = { /* Timers infrastructure */
+					      .external_infra_data = fpt,
+					      .socket_read_func = pcep_lib_pceplib_socket_read_cb,
+					      .socket_write_func = pcep_lib_pceplib_socket_write_cb,
+					      /* PCEP events */
+					      .pcep_event_func = pcep_lib_pceplib_event_cb,
+					      /* PCEPlib pthread creation callback */
+					      .pthread_create_func = pcep_lib_pthread_create_cb
+	};
 	if (!initialize_pcc_infra(&infra)) {
 		flog_err(EC_PATH_PCEP_PCC_INIT, "failed to initialize pceplib");
 		return 1;

pceplib/pcep.h

@@ -15,6 +15,8 @@
 #include "config.h"
 #endif
 
+#include "pcep_utils_memory.h"
+
 #ifdef __linux__
 
 #define ipv6_u __in6_u

pceplib/pcep_msg_messages.c

@@ -33,11 +33,9 @@ static struct pcep_message *
 pcep_msg_create_common_with_obj_list(enum pcep_message_types msg_type,
 				     double_linked_list *obj_list)
 {
-	struct pcep_message *message =
-		pceplib_malloc(PCEPLIB_MESSAGES, sizeof(struct pcep_message));
+	struct pcep_message *message = XMALLOC(MTYPE_PCEPLIB_MESSAGES, sizeof(struct pcep_message));
 	memset(message, 0, sizeof(struct pcep_message));
-	message->msg_header = pceplib_malloc(
-		PCEPLIB_MESSAGES, sizeof(struct pcep_message_header));
+	message->msg_header = XMALLOC(MTYPE_PCEPLIB_MESSAGES, sizeof(struct pcep_message_header));
 	memset(message->msg_header, 0, sizeof(struct pcep_message_header));
 	message->msg_header->type = msg_type;
 	message->msg_header->pcep_version = PCEP_MESSAGE_HEADER_VERSION;

pceplib/pcep_msg_messages_encoding.c

@@ -106,8 +106,7 @@ void pcep_encode_message(struct pcep_message *message,
 		net_order_length = htons(message_length);
 		memcpy(message_buffer + 2, &net_order_length,
 		       sizeof(net_order_length));
-		message->encoded_message =
-			pceplib_malloc(PCEPLIB_MESSAGES, message_length);
+		message->encoded_message = XMALLOC(MTYPE_PCEPLIB_MESSAGES, message_length);
 		memcpy(message->encoded_message, message_buffer,
 		       message_length);
 		message->encoded_message_length = message_length;
@@ -130,8 +129,7 @@ void pcep_encode_message(struct pcep_message *message,
 
 	net_order_length = htons(message_length);
 	memcpy(message_buffer + 2, &net_order_length, sizeof(net_order_length));
-	message->encoded_message =
-		pceplib_malloc(PCEPLIB_MESSAGES, message_length);
+	message->encoded_message = XMALLOC(MTYPE_PCEPLIB_MESSAGES, message_length);
 	memcpy(message->encoded_message, message_buffer, message_length);
 	message->encoded_message_length = message_length;
 }
@@ -296,16 +294,14 @@ struct pcep_message *pcep_decode_message(const uint8_t *msg_buf)
 		return NULL;
 	}
 
-	struct pcep_message *msg =
-		pceplib_calloc(PCEPLIB_MESSAGES, sizeof(struct pcep_message));
+	struct pcep_message *msg = XCALLOC(MTYPE_PCEPLIB_MESSAGES, sizeof(struct pcep_message));
 
-	msg->msg_header = pceplib_malloc(PCEPLIB_MESSAGES,
-					 sizeof(struct pcep_message_header));
+	msg->msg_header = XMALLOC(MTYPE_PCEPLIB_MESSAGES, sizeof(struct pcep_message_header));
 	msg->msg_header->pcep_version = msg_version;
 	msg->msg_header->type = msg_type;
 
 	msg->obj_list = dll_initialize();
-	msg->encoded_message = pceplib_malloc(PCEPLIB_MESSAGES, msg_length);
+	msg->encoded_message = XMALLOC(MTYPE_PCEPLIB_MESSAGES, msg_length);
 	memcpy(msg->encoded_message, msg_buf, msg_length);
 	msg->encoded_message_length = msg_length;
 
@@ -338,14 +334,14 @@ struct pcep_message *pcep_decode_message(const uint8_t *msg_buf)
 
 struct pcep_versioning *create_default_pcep_versioning(void)
 {
-	struct pcep_versioning *versioning =
-		pceplib_malloc(PCEPLIB_INFRA, sizeof(struct pcep_versioning));
+	struct pcep_versioning *versioning = XMALLOC(MTYPE_PCEPLIB_INFRA,
+						     sizeof(struct pcep_versioning));
 	memset(versioning, 0, sizeof(struct pcep_versioning));
 
 	return versioning;
 }
 
 void destroy_pcep_versioning(struct pcep_versioning *versioning)
 {
-	pceplib_free(PCEPLIB_INFRA, versioning);
+	XFREE(MTYPE_PCEPLIB_INFRA, versioning);
 }

pceplib/pcep_msg_objects.c

@@ -34,7 +34,7 @@ static struct pcep_object_header *pcep_obj_create_common_with_tlvs(
 	uint8_t obj_length, enum pcep_object_classes object_class,
 	enum pcep_object_types object_type, double_linked_list *tlv_list)
 {
-	uint8_t *buffer = pceplib_malloc(PCEPLIB_MESSAGES, obj_length);
+	uint8_t *buffer = XMALLOC(MTYPE_PCEPLIB_MESSAGES, obj_length);
 	memset(buffer, 0, obj_length);
 
 	/* The flag_p and flag_i flags will be set externally */
@@ -503,8 +503,7 @@ pcep_obj_create_ro_subobj_common(uint8_t subobj_size,
 				 enum pcep_ro_subobj_types ro_subobj_type,
 				 bool flag_subobj_loose_hop)
 {
-	struct pcep_object_ro_subobj *ro_subobj =
-		pceplib_malloc(PCEPLIB_MESSAGES, subobj_size);
+	struct pcep_object_ro_subobj *ro_subobj = XMALLOC(MTYPE_PCEPLIB_MESSAGES, subobj_size);
 	memset(ro_subobj, 0, subobj_size);
 	ro_subobj->flag_subobj_loose_hop = flag_subobj_loose_hop;
 	ro_subobj->ro_subobj_type = ro_subobj_type;
@@ -665,8 +664,7 @@ pcep_obj_create_ro_subobj_sr_ipv4_node(bool loose_hop, bool sid_absent,
 	 * doesn't have any restrictions about the type of memory used
 	 * externally for the IP. This memory will be freed with the object is
 	 * freed. */
-	struct in_addr *ipv4_node_id_copy =
-		pceplib_malloc(PCEPLIB_MESSAGES, sizeof(struct in_addr));
+	struct in_addr *ipv4_node_id_copy = XMALLOC(MTYPE_PCEPLIB_MESSAGES, sizeof(struct in_addr));
 	ipv4_node_id_copy->s_addr = ipv4_node_id->s_addr;
 	dll_append(obj->nai_list, ipv4_node_id_copy);
 
@@ -693,8 +691,8 @@ pcep_obj_create_ro_subobj_sr_ipv6_node(bool loose_hop, bool sid_absent,
 		obj->sid = sid;
 	}
 	obj->nai_list = dll_initialize();
-	struct in6_addr *ipv6_node_id_copy =
-		pceplib_malloc(PCEPLIB_MESSAGES, sizeof(struct in6_addr));
+	struct in6_addr *ipv6_node_id_copy = XMALLOC(MTYPE_PCEPLIB_MESSAGES,
+						     sizeof(struct in6_addr));
 	memcpy(ipv6_node_id_copy, ipv6_node_id, sizeof(struct in6_addr));
 	dll_append(obj->nai_list, ipv6_node_id_copy);
 
@@ -720,10 +718,8 @@ struct pcep_ro_subobj_sr *pcep_obj_create_ro_subobj_sr_ipv4_adj(
 		obj->sid = sid;
 	}
 	obj->nai_list = dll_initialize();
-	struct in_addr *local_ipv4_copy =
-		pceplib_malloc(PCEPLIB_MESSAGES, sizeof(struct in_addr));
-	struct in_addr *remote_ipv4_copy =
-		pceplib_malloc(PCEPLIB_MESSAGES, sizeof(struct in_addr));
+	struct in_addr *local_ipv4_copy = XMALLOC(MTYPE_PCEPLIB_MESSAGES, sizeof(struct in_addr));
+	struct in_addr *remote_ipv4_copy = XMALLOC(MTYPE_PCEPLIB_MESSAGES, sizeof(struct in_addr));
 	local_ipv4_copy->s_addr = local_ipv4->s_addr;
 	remote_ipv4_copy->s_addr = remote_ipv4->s_addr;
 	dll_append(obj->nai_list, local_ipv4_copy);
@@ -751,10 +747,9 @@ struct pcep_ro_subobj_sr *pcep_obj_create_ro_subobj_sr_ipv6_adj(
 		obj->sid = sid;
 	}
 	obj->nai_list = dll_initialize();
-	struct in6_addr *local_ipv6_copy =
-		pceplib_malloc(PCEPLIB_MESSAGES, sizeof(struct in6_addr));
-	struct in6_addr *remote_ipv6_copy =
-		pceplib_malloc(PCEPLIB_MESSAGES, sizeof(struct in6_addr));
+	struct in6_addr *local_ipv6_copy = XMALLOC(MTYPE_PCEPLIB_MESSAGES, sizeof(struct in6_addr));
+	struct in6_addr *remote_ipv6_copy = XMALLOC(MTYPE_PCEPLIB_MESSAGES,
+						    sizeof(struct in6_addr));
 	memcpy(local_ipv6_copy, local_ipv6, sizeof(struct in6_addr));
 	memcpy(remote_ipv6_copy, remote_ipv6, sizeof(struct in6_addr));
 	dll_append(obj->nai_list, local_ipv6_copy);
@@ -780,23 +775,19 @@ struct pcep_ro_subobj_sr *pcep_obj_create_ro_subobj_sr_unnumbered_ipv4_adj(
 	}
 
 	obj->nai_list = dll_initialize();
-	uint32_t *local_node_id_copy =
-		pceplib_malloc(PCEPLIB_MESSAGES, sizeof(uint32_t));
+	uint32_t *local_node_id_copy = XMALLOC(MTYPE_PCEPLIB_MESSAGES, sizeof(uint32_t));
 	*local_node_id_copy = local_node_id;
 	dll_append(obj->nai_list, local_node_id_copy);
 
-	uint32_t *local_if_id_copy =
-		pceplib_malloc(PCEPLIB_MESSAGES, sizeof(uint32_t));
+	uint32_t *local_if_id_copy = XMALLOC(MTYPE_PCEPLIB_MESSAGES, sizeof(uint32_t));
 	*local_if_id_copy = local_if_id;
 	dll_append(obj->nai_list, local_if_id_copy);
 
-	uint32_t *remote_node_id_copy =
-		pceplib_malloc(PCEPLIB_MESSAGES, sizeof(uint32_t));
+	uint32_t *remote_node_id_copy = XMALLOC(MTYPE_PCEPLIB_MESSAGES, sizeof(uint32_t));
 	*remote_node_id_copy = remote_node_id;
 	dll_append(obj->nai_list, remote_node_id_copy);
 
-	uint32_t *remote_if_id_copy =
-		pceplib_malloc(PCEPLIB_MESSAGES, sizeof(uint32_t));
+	uint32_t *remote_if_id_copy = XMALLOC(MTYPE_PCEPLIB_MESSAGES, sizeof(uint32_t));
 	*remote_if_id_copy = remote_if_id;
 	dll_append(obj->nai_list, remote_if_id_copy);
 
@@ -823,23 +814,20 @@ struct pcep_ro_subobj_sr *pcep_obj_create_ro_subobj_sr_linklocal_ipv6_adj(
 		obj->sid = sid;
 	}
 	obj->nai_list = dll_initialize();
-	struct in6_addr *local_ipv6_copy =
-		pceplib_malloc(PCEPLIB_MESSAGES, sizeof(struct in6_addr));
+	struct in6_addr *local_ipv6_copy = XMALLOC(MTYPE_PCEPLIB_MESSAGES, sizeof(struct in6_addr));
 	memcpy(local_ipv6_copy, local_ipv6, sizeof(struct in6_addr));
 	dll_append(obj->nai_list, local_ipv6_copy);
 
-	uint32_t *local_if_id_copy =
-		pceplib_malloc(PCEPLIB_MESSAGES, sizeof(uint32_t));
+	uint32_t *local_if_id_copy = XMALLOC(MTYPE_PCEPLIB_MESSAGES, sizeof(uint32_t));
 	*local_if_id_copy = local_if_id;
 	dll_append(obj->nai_list, local_if_id_copy);
 
-	struct in6_addr *remote_ipv6_copy =
-		pceplib_malloc(PCEPLIB_MESSAGES, sizeof(struct in6_addr));
+	struct in6_addr *remote_ipv6_copy = XMALLOC(MTYPE_PCEPLIB_MESSAGES,
+						    sizeof(struct in6_addr));
 	memcpy(remote_ipv6_copy, remote_ipv6, sizeof(struct in6_addr));
 	dll_append(obj->nai_list, remote_ipv6_copy);
 
-	uint32_t *remote_if_id_copy =
-		pceplib_malloc(PCEPLIB_MESSAGES, sizeof(uint32_t));
+	uint32_t *remote_if_id_copy = XMALLOC(MTYPE_PCEPLIB_MESSAGES, sizeof(uint32_t));
 	*remote_if_id_copy = remote_if_id;
 	dll_append(obj->nai_list, remote_if_id_copy);