proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-04-29 23:08:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #13556 from donaldsharp/token_to_desc

Browse Source 
memory desciprtion shortening
This commit is contained in:
Russ White 2023-05-23 08:21:51 -04:00 committed by GitHub
commit 7b7da41def
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bfdd/bfdd.c
View File

@ -28,8 +28,8 @@
* FRR related code. * FRR related code.
*/ */
DEFINE_MGROUP(BFDD, "Bidirectional Forwarding Detection Daemon"); DEFINE_MGROUP(BFDD, "Bidirectional Forwarding Detection Daemon");
DEFINE_MTYPE(BFDD, BFDD_CONTROL, "long-lived control socket memory"); DEFINE_MTYPE(BFDD, BFDD_CONTROL, "control socket memory");
DEFINE_MTYPE(BFDD, BFDD_NOTIFICATION, "short-lived control notification data"); DEFINE_MTYPE(BFDD, BFDD_NOTIFICATION, "control notification data");
/* Master of threads. */ /* Master of threads. */
struct event_loop *master; struct event_loop *master;

10
lib/grammar_sandbox.c
View File

@ -19,7 +19,7 @@
#define GRAMMAR_STR "CLI grammar sandbox\n" #define GRAMMAR_STR "CLI grammar sandbox\n"
DEFINE_MTYPE_STATIC(LIB, CMD_TOKENS, "Command desc"); DEFINE_MTYPE_STATIC(LIB, CMD_DESCRIPTIONS, "Command desc");
/** headers **/ /** headers **/
void grammar_sandbox_init(void); void grammar_sandbox_init(void);
@ -53,7 +53,7 @@ DEFUN (grammar_test,
// create cmd_element for parser // create cmd_element for parser
struct cmd_element *cmd = struct cmd_element *cmd =
XCALLOC(MTYPE_CMD_TOKENS, sizeof(struct cmd_element)); XCALLOC(MTYPE_CMD_DESCRIPTIONS, sizeof(struct cmd_element));
cmd->string = command; cmd->string = command;
cmd->doc = cmd->doc =
"0\n1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n"; "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 // create cmd_element with docstring
struct cmd_element *cmd = struct cmd_element *cmd =
XCALLOC(MTYPE_CMD_TOKENS, sizeof(struct cmd_element)); XCALLOC(MTYPE_CMD_DESCRIPTIONS, sizeof(struct cmd_element));
cmd->string = XSTRDUP( cmd->string = XSTRDUP(
MTYPE_CMD_TOKENS, MTYPE_CMD_DESCRIPTIONS,
"test docstring <example|selector follow> (1-255) end VARIABLE [OPTION|set lol] . VARARG"); "test docstring <example|selector follow> (1-255) end VARIABLE [OPTION|set lol] . VARARG");
cmd->doc = XSTRDUP(MTYPE_CMD_TOKENS, cmd->doc = XSTRDUP(MTYPE_CMD_DESCRIPTIONS,
"Test stuff\n" "Test stuff\n"
"docstring thing\n" "docstring thing\n"
"first example\n" "first example\n"

5
lib/mgmt_be_client.c
View File

@ -26,9 +26,8 @@
#define MGMTD_DBG_BE_CLIENT_CHECK() \ #define MGMTD_DBG_BE_CLIENT_CHECK() \
DEBUG_MODE_CHECK(&mgmt_dbg_be_client, DEBUG_MODE_ALL) DEBUG_MODE_CHECK(&mgmt_dbg_be_client, DEBUG_MODE_ALL)
DEFINE_MTYPE_STATIC(LIB, MGMTD_BE_BATCH, DEFINE_MTYPE_STATIC(LIB, MGMTD_BE_BATCH, "backend transaction batch data");
"MGMTD backend transaction batch data"); DEFINE_MTYPE_STATIC(LIB, MGMTD_BE_TXN, "backend transaction data");
DEFINE_MTYPE_STATIC(LIB, MGMTD_BE_TXN, "MGMTD backend transaction data");
enum mgmt_be_txn_event { enum mgmt_be_txn_event {
MGMTD_BE_TXN_PROC_SETCFG = 1, MGMTD_BE_TXN_PROC_SETCFG = 1,

28
mgmtd/mgmt_memory.c
View File

@ -18,19 +18,15 @@
*/ */
DEFINE_MGROUP(MGMTD, "mgmt"); DEFINE_MGROUP(MGMTD, "mgmt");
DEFINE_MTYPE(MGMTD, MGMTD, "MGMTD instance"); DEFINE_MTYPE(MGMTD, MGMTD, "instance");
DEFINE_MTYPE(MGMTD, MGMTD_BE_ADPATER, "MGMTD backend adapter"); DEFINE_MTYPE(MGMTD, MGMTD_BE_ADPATER, "backend adapter");
DEFINE_MTYPE(MGMTD, MGMTD_FE_ADPATER, "MGMTD Frontend adapter"); DEFINE_MTYPE(MGMTD, MGMTD_FE_ADPATER, "Frontend adapter");
DEFINE_MTYPE(MGMTD, MGMTD_FE_SESSION, "MGMTD Frontend Client Session"); DEFINE_MTYPE(MGMTD, MGMTD_FE_SESSION, "Frontend Client Session");
DEFINE_MTYPE(MGMTD, MGMTD_TXN, "MGMTD Transaction"); DEFINE_MTYPE(MGMTD, MGMTD_TXN, "Trnsction");
DEFINE_MTYPE(MGMTD, MGMTD_TXN_REQ, "MGMTD Transaction Requests"); DEFINE_MTYPE(MGMTD, MGMTD_TXN_REQ, "Trnsction Requests");
DEFINE_MTYPE(MGMTD, MGMTD_TXN_SETCFG_REQ, DEFINE_MTYPE(MGMTD, MGMTD_TXN_SETCFG_REQ, "Trnsction Set-Config Requests");
"MGMTD Transaction Set-Config Requests"); DEFINE_MTYPE(MGMTD, MGMTD_TXN_COMMCFG_REQ, "Trnsction Commit-Config Requests");
DEFINE_MTYPE(MGMTD, MGMTD_TXN_COMMCFG_REQ, DEFINE_MTYPE(MGMTD, MGMTD_TXN_GETDATA_REQ, "Trnsction Get-Data Requests");
"MGMTD Transaction Commit-Config Requests"); DEFINE_MTYPE(MGMTD, MGMTD_TXN_GETDATA_REPLY, "Trnsction Get-Data Replies");
DEFINE_MTYPE(MGMTD, MGMTD_TXN_GETDATA_REQ, DEFINE_MTYPE(MGMTD, MGMTD_TXN_CFG_BATCH, "Trnsction Gonfig Batches");
"MGMTD Transaction Get-Data Requests"); DEFINE_MTYPE(MGMTD, MGMTD_CMT_INFO, "info for tracking commits");
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");

2
zebra/zebra_ptm.c
View File

@ -1185,7 +1185,7 @@ struct ptm_process {
TAILQ_HEAD(ppqueue, ptm_process) ppqueue; TAILQ_HEAD(ppqueue, ptm_process) ppqueue;
DEFINE_MTYPE_STATIC(ZEBRA, ZEBRA_PTM_BFD_PROCESS, DEFINE_MTYPE_STATIC(ZEBRA, ZEBRA_PTM_BFD_PROCESS,
"PTM BFD process registration table."); "PTM BFD process reg table");
/* /*
* Prototypes. * Prototypes.