[dpdk-dev] eal: redefine logtype values
Checks
Commit Message
After the changes in commit c1b5fa94a46f
("eal: support dynamic log types"), logtype is not treated as a
bitmask, but a decimal value. Therefore, values have to be
converted.
Fixes: c1b5fa94a46f ("eal: support dynamic log types")
Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
---
lib/librte_eal/common/include/rte_log.h | 56 ++++++++++++++++-----------------
1 file changed, 28 insertions(+), 28 deletions(-)
Comments
2017-04-12 15:14, Pablo de Lara:
> After the changes in commit c1b5fa94a46f
> ("eal: support dynamic log types"), logtype is not treated as a
> bitmask, but a decimal value. Therefore, values have to be
> converted.
>
> Fixes: c1b5fa94a46f ("eal: support dynamic log types")
>
> Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
[...]
> /* SDK log type, keep sync'd with rte_log_init() */
[...]
> +#define RTE_LOGTYPE_EAL 0 /**< Log related to eal. */
> +#define RTE_LOGTYPE_MALLOC 1 /**< Log related to malloc. */
> +#define RTE_LOGTYPE_RING 2 /**< Log related to ring. */
> +#define RTE_LOGTYPE_MEMPOOL 3 /**< Log related to mempool. */
> +#define RTE_LOGTYPE_TIMER 4 /**< Log related to timers. */
> +#define RTE_LOGTYPE_PMD 5 /**< Log related to poll mode driver. */
> +#define RTE_LOGTYPE_HASH 6 /**< Log related to hash table. */
> +#define RTE_LOGTYPE_LPM 7 /**< Log related to LPM. */
> +#define RTE_LOGTYPE_KNI 8 /**< Log related to KNI. */
> +#define RTE_LOGTYPE_ACL 9 /**< Log related to ACL. */
> +#define RTE_LOGTYPE_POWER 10 /**< Log related to power. */
> +#define RTE_LOGTYPE_METER 11 /**< Log related to QoS meter. */
> +#define RTE_LOGTYPE_SCHED 12 /**< Log related to QoS port scheduler. */
> +#define RTE_LOGTYPE_PORT 13 /**< Log related to port. */
> +#define RTE_LOGTYPE_TABLE 14 /**< Log related to table. */
> +#define RTE_LOGTYPE_PIPELINE 15 /**< Log related to pipeline. */
> +#define RTE_LOGTYPE_MBUF 16 /**< Log related to mbuf. */
> +#define RTE_LOGTYPE_CRYPTODEV 17 /**< Log related to cryptodev. */
> +#define RTE_LOGTYPE_EFD 18 /**< Log related to EFD. */
> +#define RTE_LOGTYPE_EVENTDEV 19 /**< Log related to eventdev. */
I think you should use these values in rte_log_init,
instead of the hardcoded ones.
So the messages about keeping them sync'd could be removed :)
> -----Original Message-----
> From: Thomas Monjalon [mailto:thomas.monjalon@6wind.com]
> Sent: Wednesday, April 12, 2017 4:16 PM
> To: De Lara Guarch, Pablo
> Cc: dev@dpdk.org; olivier.matz@6wind.com
> Subject: Re: [dpdk-dev] [PATCH] eal: redefine logtype values
>
> 2017-04-12 15:14, Pablo de Lara:
> > After the changes in commit c1b5fa94a46f
> > ("eal: support dynamic log types"), logtype is not treated as a
> > bitmask, but a decimal value. Therefore, values have to be
> > converted.
> >
> > Fixes: c1b5fa94a46f ("eal: support dynamic log types")
> >
> > Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
> [...]
> > /* SDK log type, keep sync'd with rte_log_init() */
> [...]
> > +#define RTE_LOGTYPE_EAL 0 /**< Log related to eal. */
> > +#define RTE_LOGTYPE_MALLOC 1 /**< Log related to malloc. */
> > +#define RTE_LOGTYPE_RING 2 /**< Log related to ring. */
> > +#define RTE_LOGTYPE_MEMPOOL 3 /**< Log related to mempool. */
> > +#define RTE_LOGTYPE_TIMER 4 /**< Log related to timers. */
> > +#define RTE_LOGTYPE_PMD 5 /**< Log related to poll mode driver.
> */
> > +#define RTE_LOGTYPE_HASH 6 /**< Log related to hash table. */
> > +#define RTE_LOGTYPE_LPM 7 /**< Log related to LPM. */
> > +#define RTE_LOGTYPE_KNI 8 /**< Log related to KNI. */
> > +#define RTE_LOGTYPE_ACL 9 /**< Log related to ACL. */
> > +#define RTE_LOGTYPE_POWER 10 /**< Log related to power. */
> > +#define RTE_LOGTYPE_METER 11 /**< Log related to QoS meter. */
> > +#define RTE_LOGTYPE_SCHED 12 /**< Log related to QoS port
> scheduler. */
> > +#define RTE_LOGTYPE_PORT 13 /**< Log related to port. */
> > +#define RTE_LOGTYPE_TABLE 14 /**< Log related to table. */
> > +#define RTE_LOGTYPE_PIPELINE 15 /**< Log related to pipeline. */
> > +#define RTE_LOGTYPE_MBUF 16 /**< Log related to mbuf. */
> > +#define RTE_LOGTYPE_CRYPTODEV 17 /**< Log related to cryptodev. */
> > +#define RTE_LOGTYPE_EFD 18 /**< Log related to EFD. */
> > +#define RTE_LOGTYPE_EVENTDEV 19 /**< Log related to eventdev. */
>
> I think you should use these values in rte_log_init,
> instead of the hardcoded ones.
> So the messages about keeping them sync'd could be removed :)
Good idea, will send a v2 shortly.
@@ -67,36 +67,36 @@ struct rte_logs {
extern struct rte_logs rte_logs;
/* SDK log type, keep sync'd with rte_log_init() */
-#define RTE_LOGTYPE_EAL 0x00000001 /**< Log related to eal. */
-#define RTE_LOGTYPE_MALLOC 0x00000002 /**< Log related to malloc. */
-#define RTE_LOGTYPE_RING 0x00000004 /**< Log related to ring. */
-#define RTE_LOGTYPE_MEMPOOL 0x00000008 /**< Log related to mempool. */
-#define RTE_LOGTYPE_TIMER 0x00000010 /**< Log related to timers. */
-#define RTE_LOGTYPE_PMD 0x00000020 /**< Log related to poll mode driver. */
-#define RTE_LOGTYPE_HASH 0x00000040 /**< Log related to hash table. */
-#define RTE_LOGTYPE_LPM 0x00000080 /**< Log related to LPM. */
-#define RTE_LOGTYPE_KNI 0x00000100 /**< Log related to KNI. */
-#define RTE_LOGTYPE_ACL 0x00000200 /**< Log related to ACL. */
-#define RTE_LOGTYPE_POWER 0x00000400 /**< Log related to power. */
-#define RTE_LOGTYPE_METER 0x00000800 /**< Log related to QoS meter. */
-#define RTE_LOGTYPE_SCHED 0x00001000 /**< Log related to QoS port scheduler. */
-#define RTE_LOGTYPE_PORT 0x00002000 /**< Log related to port. */
-#define RTE_LOGTYPE_TABLE 0x00004000 /**< Log related to table. */
-#define RTE_LOGTYPE_PIPELINE 0x00008000 /**< Log related to pipeline. */
-#define RTE_LOGTYPE_MBUF 0x00010000 /**< Log related to mbuf. */
-#define RTE_LOGTYPE_CRYPTODEV 0x00020000 /**< Log related to cryptodev. */
-#define RTE_LOGTYPE_EFD 0x00040000 /**< Log related to EFD. */
-#define RTE_LOGTYPE_EVENTDEV 0x00080000 /**< Log related to eventdev. */
+#define RTE_LOGTYPE_EAL 0 /**< Log related to eal. */
+#define RTE_LOGTYPE_MALLOC 1 /**< Log related to malloc. */
+#define RTE_LOGTYPE_RING 2 /**< Log related to ring. */
+#define RTE_LOGTYPE_MEMPOOL 3 /**< Log related to mempool. */
+#define RTE_LOGTYPE_TIMER 4 /**< Log related to timers. */
+#define RTE_LOGTYPE_PMD 5 /**< Log related to poll mode driver. */
+#define RTE_LOGTYPE_HASH 6 /**< Log related to hash table. */
+#define RTE_LOGTYPE_LPM 7 /**< Log related to LPM. */
+#define RTE_LOGTYPE_KNI 8 /**< Log related to KNI. */
+#define RTE_LOGTYPE_ACL 9 /**< Log related to ACL. */
+#define RTE_LOGTYPE_POWER 10 /**< Log related to power. */
+#define RTE_LOGTYPE_METER 11 /**< Log related to QoS meter. */
+#define RTE_LOGTYPE_SCHED 12 /**< Log related to QoS port scheduler. */
+#define RTE_LOGTYPE_PORT 13 /**< Log related to port. */
+#define RTE_LOGTYPE_TABLE 14 /**< Log related to table. */
+#define RTE_LOGTYPE_PIPELINE 15 /**< Log related to pipeline. */
+#define RTE_LOGTYPE_MBUF 16 /**< Log related to mbuf. */
+#define RTE_LOGTYPE_CRYPTODEV 17 /**< Log related to cryptodev. */
+#define RTE_LOGTYPE_EFD 18 /**< Log related to EFD. */
+#define RTE_LOGTYPE_EVENTDEV 19 /**< Log related to eventdev. */
/* these log types can be used in an application */
-#define RTE_LOGTYPE_USER1 0x01000000 /**< User-defined log type 1. */
-#define RTE_LOGTYPE_USER2 0x02000000 /**< User-defined log type 2. */
-#define RTE_LOGTYPE_USER3 0x04000000 /**< User-defined log type 3. */
-#define RTE_LOGTYPE_USER4 0x08000000 /**< User-defined log type 4. */
-#define RTE_LOGTYPE_USER5 0x10000000 /**< User-defined log type 5. */
-#define RTE_LOGTYPE_USER6 0x20000000 /**< User-defined log type 6. */
-#define RTE_LOGTYPE_USER7 0x40000000 /**< User-defined log type 7. */
-#define RTE_LOGTYPE_USER8 0x80000000 /**< User-defined log type 8. */
+#define RTE_LOGTYPE_USER1 24 /**< User-defined log type 1. */
+#define RTE_LOGTYPE_USER2 25 /**< User-defined log type 2. */
+#define RTE_LOGTYPE_USER3 26 /**< User-defined log type 3. */
+#define RTE_LOGTYPE_USER4 27 /**< User-defined log type 4. */
+#define RTE_LOGTYPE_USER5 28 /**< User-defined log type 5. */
+#define RTE_LOGTYPE_USER6 29 /**< User-defined log type 6. */
+#define RTE_LOGTYPE_USER7 30 /**< User-defined log type 7. */
+#define RTE_LOGTYPE_USER8 31 /**< User-defined log type 8. */
/** First identifier for extended logs */
#define RTE_LOGTYPE_FIRST_EXT_ID 32