From b6ab009b99dfbce190a2236a65571a33bff9393c Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Thu, 18 May 2023 11:01:13 -0400 Subject: [PATCH 1/4] lib: Fix overlapping memory type Make a unique memory type so we are not overlapping another one. Signed-off-by: Donald Sharp --- lib/grammar_sandbox.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/grammar_sandbox.c b/lib/grammar_sandbox.c index fc7ebebbe5..24833e08ec 100644 --- a/lib/grammar_sandbox.c +++ b/lib/grammar_sandbox.c @@ -19,7 +19,7 @@ #define GRAMMAR_STR "CLI grammar sandbox\n" -DEFINE_MTYPE_STATIC(LIB, CMD_TOKENS, "Command desc"); +DEFINE_MTYPE_STATIC(LIB, CMD_DESCRIPTIONS, "Command desc"); /** headers **/ void grammar_sandbox_init(void); @@ -53,7 +53,7 @@ DEFUN (grammar_test, // create cmd_element for parser struct cmd_element *cmd = - XCALLOC(MTYPE_CMD_TOKENS, sizeof(struct cmd_element)); + XCALLOC(MTYPE_CMD_DESCRIPTIONS, sizeof(struct cmd_element)); cmd->string = command; cmd->doc = "0\n1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n"; @@ -207,11 +207,11 @@ DEFUN (grammar_test_doc, // create cmd_element with docstring struct cmd_element *cmd = - XCALLOC(MTYPE_CMD_TOKENS, sizeof(struct cmd_element)); + XCALLOC(MTYPE_CMD_DESCRIPTIONS, sizeof(struct cmd_element)); cmd->string = XSTRDUP( - MTYPE_CMD_TOKENS, + MTYPE_CMD_DESCRIPTIONS, "test docstring (1-255) end VARIABLE [OPTION|set lol] . VARARG"); - cmd->doc = XSTRDUP(MTYPE_CMD_TOKENS, + cmd->doc = XSTRDUP(MTYPE_CMD_DESCRIPTIONS, "Test stuff\n" "docstring thing\n" "first example\n" From a01f3107097b518415ae753aa974223c1d9773d4 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Thu, 18 May 2023 11:02:40 -0400 Subject: [PATCH 2/4] zebra: Make memory description string smaller to fit in vty space Signed-off-by: Donald Sharp --- zebra/zebra_ptm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zebra/zebra_ptm.c b/zebra/zebra_ptm.c index fc3f0c96a7..a678e71734 100644 --- a/zebra/zebra_ptm.c +++ b/zebra/zebra_ptm.c @@ -1185,7 +1185,7 @@ struct ptm_process { TAILQ_HEAD(ppqueue, ptm_process) ppqueue; DEFINE_MTYPE_STATIC(ZEBRA, ZEBRA_PTM_BFD_PROCESS, - "PTM BFD process registration table."); + "PTM BFD process reg table"); /* * Prototypes. From df6eb0bd7be1be55c4b8dbb0153891d011c4e228 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Thu, 18 May 2023 11:15:38 -0400 Subject: [PATCH 3/4] lib, mgmtd: Use short memory names so they fit within vty output Signed-off-by: Donald Sharp --- lib/mgmt_be_client.c | 5 ++--- mgmtd/mgmt_memory.c | 28 ++++++++++++---------------- 2 files changed, 14 insertions(+), 19 deletions(-) diff --git a/lib/mgmt_be_client.c b/lib/mgmt_be_client.c index 9427f7cf3d..f74cf6ba09 100644 --- a/lib/mgmt_be_client.c +++ b/lib/mgmt_be_client.c @@ -26,9 +26,8 @@ #define MGMTD_DBG_BE_CLIENT_CHECK() \ DEBUG_MODE_CHECK(&mgmt_dbg_be_client, DEBUG_MODE_ALL) -DEFINE_MTYPE_STATIC(LIB, MGMTD_BE_BATCH, - "MGMTD backend transaction batch data"); -DEFINE_MTYPE_STATIC(LIB, MGMTD_BE_TXN, "MGMTD backend transaction data"); +DEFINE_MTYPE_STATIC(LIB, MGMTD_BE_BATCH, "backend transaction batch data"); +DEFINE_MTYPE_STATIC(LIB, MGMTD_BE_TXN, "backend transaction data"); enum mgmt_be_txn_event { MGMTD_BE_TXN_PROC_SETCFG = 1, diff --git a/mgmtd/mgmt_memory.c b/mgmtd/mgmt_memory.c index 2858bc7e45..920ab9363c 100644 --- a/mgmtd/mgmt_memory.c +++ b/mgmtd/mgmt_memory.c @@ -18,19 +18,15 @@ */ DEFINE_MGROUP(MGMTD, "mgmt"); -DEFINE_MTYPE(MGMTD, MGMTD, "MGMTD instance"); -DEFINE_MTYPE(MGMTD, MGMTD_BE_ADPATER, "MGMTD backend adapter"); -DEFINE_MTYPE(MGMTD, MGMTD_FE_ADPATER, "MGMTD Frontend adapter"); -DEFINE_MTYPE(MGMTD, MGMTD_FE_SESSION, "MGMTD Frontend Client Session"); -DEFINE_MTYPE(MGMTD, MGMTD_TXN, "MGMTD Transaction"); -DEFINE_MTYPE(MGMTD, MGMTD_TXN_REQ, "MGMTD Transaction Requests"); -DEFINE_MTYPE(MGMTD, MGMTD_TXN_SETCFG_REQ, - "MGMTD Transaction Set-Config Requests"); -DEFINE_MTYPE(MGMTD, MGMTD_TXN_COMMCFG_REQ, - "MGMTD Transaction Commit-Config Requests"); -DEFINE_MTYPE(MGMTD, MGMTD_TXN_GETDATA_REQ, - "MGMTD Transaction Get-Data Requests"); -DEFINE_MTYPE(MGMTD, MGMTD_TXN_GETDATA_REPLY, - "MGMTD Transaction Get-Data Replies"); -DEFINE_MTYPE(MGMTD, MGMTD_TXN_CFG_BATCH, "MGMTD Transaction Gonfig Batches"); -DEFINE_MTYPE(MGMTD, MGMTD_CMT_INFO, "MGMTD commit info for tracking commits"); +DEFINE_MTYPE(MGMTD, MGMTD, "instance"); +DEFINE_MTYPE(MGMTD, MGMTD_BE_ADPATER, "backend adapter"); +DEFINE_MTYPE(MGMTD, MGMTD_FE_ADPATER, "Frontend adapter"); +DEFINE_MTYPE(MGMTD, MGMTD_FE_SESSION, "Frontend Client Session"); +DEFINE_MTYPE(MGMTD, MGMTD_TXN, "Trnsction"); +DEFINE_MTYPE(MGMTD, MGMTD_TXN_REQ, "Trnsction Requests"); +DEFINE_MTYPE(MGMTD, MGMTD_TXN_SETCFG_REQ, "Trnsction Set-Config Requests"); +DEFINE_MTYPE(MGMTD, MGMTD_TXN_COMMCFG_REQ, "Trnsction Commit-Config Requests"); +DEFINE_MTYPE(MGMTD, MGMTD_TXN_GETDATA_REQ, "Trnsction Get-Data Requests"); +DEFINE_MTYPE(MGMTD, MGMTD_TXN_GETDATA_REPLY, "Trnsction Get-Data Replies"); +DEFINE_MTYPE(MGMTD, MGMTD_TXN_CFG_BATCH, "Trnsction Gonfig Batches"); +DEFINE_MTYPE(MGMTD, MGMTD_CMT_INFO, "info for tracking commits"); From 425739089250760bc474cfa918692c1edbeb500a Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Thu, 18 May 2023 11:15:58 -0400 Subject: [PATCH 4/4] bfdd: Use shorter memory names so that they fit in vty output Signed-off-by: Donald Sharp --- bfdd/bfdd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bfdd/bfdd.c b/bfdd/bfdd.c index 5fbe2f48f6..95066b97ce 100644 --- a/bfdd/bfdd.c +++ b/bfdd/bfdd.c @@ -28,8 +28,8 @@ * FRR related code. */ DEFINE_MGROUP(BFDD, "Bidirectional Forwarding Detection Daemon"); -DEFINE_MTYPE(BFDD, BFDD_CONTROL, "long-lived control socket memory"); -DEFINE_MTYPE(BFDD, BFDD_NOTIFICATION, "short-lived control notification data"); +DEFINE_MTYPE(BFDD, BFDD_CONTROL, "control socket memory"); +DEFINE_MTYPE(BFDD, BFDD_NOTIFICATION, "control notification data"); /* Master of threads. */ struct event_loop *master;