From 5bb84bc84b1d1f978dd93aa02acef9936e79abc0 Mon Sep 17 00:00:00 2001 From: Robert Watson Date: Mon, 31 Oct 2005 15:41:29 +0000 Subject: Normalize a significant number of kernel malloc type names: - Prefer '_' to ' ', as it results in more easily parsed results in memory monitoring tools such as vmstat. - Remove punctuation that is incompatible with using memory type names as file names, such as '/' characters. - Disambiguate some collisions by adding subsystem prefixes to some memory types. - Generally prefer lower case to upper case. - If the same type is defined in multiple architecture directories, attempt to use the same name in additional cases. Not all instances were caught in this change, so more work is required to finish this conversion. Similar changes are required for UMA zone names. --- sys/netgraph/atm/uni/ng_uni.c | 4 ++-- sys/netgraph/netflow/netflow.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'sys/netgraph') diff --git a/sys/netgraph/atm/uni/ng_uni.c b/sys/netgraph/atm/uni/ng_uni.c index 4cf6353323787..92b4ef71c6862 100644 --- a/sys/netgraph/atm/uni/ng_uni.c +++ b/sys/netgraph/atm/uni/ng_uni.c @@ -60,8 +60,8 @@ __FBSDID("$FreeBSD$"); #include #include -MALLOC_DEFINE(M_NG_UNI, "netgraph_uni", "netgraph uni node"); -MALLOC_DEFINE(M_UNI, "netgraph uni", "uni protocol data"); +MALLOC_DEFINE(M_NG_UNI, "netgraph_uni_node", "netgraph uni node"); +MALLOC_DEFINE(M_UNI, "netgraph_uni_data", "uni protocol data"); MODULE_DEPEND(ng_uni, ngatmbase, 1, 1, 1); diff --git a/sys/netgraph/netflow/netflow.c b/sys/netgraph/netflow/netflow.c index 1eba26a3de9c7..327a5c6ab3653 100644 --- a/sys/netgraph/netflow/netflow.c +++ b/sys/netgraph/netflow/netflow.c @@ -96,7 +96,7 @@ static const char rcs_id[] = ((t) << 3)) /* 8 */ MALLOC_DECLARE(M_NETFLOW_HASH); -MALLOC_DEFINE(M_NETFLOW_HASH, "NetFlow hash", "NetFlow hash"); +MALLOC_DEFINE(M_NETFLOW_HASH, "netflow_hash", "NetFlow hash"); static int export_add(item_p, struct flow_entry *); static int export_send(priv_p, item_p); -- cgit v1.3