From dec7b1884a555c941110526cc6cb9dfa08fd51b9 Mon Sep 17 00:00:00 2001 From: Olivier Matz Date: Tue, 24 Apr 2018 16:46:47 +0200 Subject: [PATCH] use sizeof to avoid double use of a length define Only a cosmetic change: the *_LEN defines are already used when defining the buffer. Using sizeof() ensures that the length stays consistent, even if the definition is modified. Signed-off-by: Olivier Matz Reviewed-by: Anatoly Burakov --- examples/tep_termination/main.c | 2 +- examples/vhost/main.c | 2 +- lib/librte_eal/bsdapp/eal/eal.c | 4 ++-- lib/librte_eal/bsdapp/eal/eal_thread.c | 2 +- lib/librte_eal/common/eal_common_proc.c | 4 ++-- lib/librte_eal/linuxapp/eal/eal.c | 4 ++-- lib/librte_eal/linuxapp/eal/eal_interrupts.c | 2 +- lib/librte_eal/linuxapp/eal/eal_thread.c | 2 +- lib/librte_eal/linuxapp/eal/eal_timer.c | 2 +- lib/librte_vhost/socket.c | 4 ++-- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/examples/tep_termination/main.c b/examples/tep_termination/main.c index 8543a98030..52b95025cf 100644 --- a/examples/tep_termination/main.c +++ b/examples/tep_termination/main.c @@ -1208,7 +1208,7 @@ main(int argc, char *argv[]) ret = pthread_create(&tid, NULL, (void *)print_stats, NULL); if (ret != 0) rte_exit(EXIT_FAILURE, "Cannot create print-stats thread\n"); - snprintf(thread_name, RTE_MAX_THREAD_NAME_LEN, "print-stats"); + snprintf(thread_name, sizeof(thread_name), "print-stats"); ret = rte_thread_setname(tid, thread_name); if (ret != 0) RTE_LOG(DEBUG, VHOST_CONFIG, "Cannot set print-stats name\n"); diff --git a/examples/vhost/main.c b/examples/vhost/main.c index 84e0d6366d..e33a0f3c97 100644 --- a/examples/vhost/main.c +++ b/examples/vhost/main.c @@ -1499,7 +1499,7 @@ main(int argc, char *argv[]) "Cannot create print-stats thread\n"); /* Set thread_name for aid in debugging. */ - snprintf(thread_name, RTE_MAX_THREAD_NAME_LEN, "print-stats"); + snprintf(thread_name, sizeof(thread_name), "print-stats"); ret = rte_thread_setname(tid, thread_name); if (ret != 0) RTE_LOG(DEBUG, VHOST_CONFIG, diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c index d315cdef85..10d8dc03f0 100644 --- a/lib/librte_eal/bsdapp/eal/eal.c +++ b/lib/librte_eal/bsdapp/eal/eal.c @@ -657,7 +657,7 @@ rte_eal_init(int argc, char **argv) eal_thread_init_master(rte_config.master_lcore); - ret = eal_thread_dump_affinity(cpuset, RTE_CPU_AFFINITY_STR_LEN); + ret = eal_thread_dump_affinity(cpuset, sizeof(cpuset)); RTE_LOG(DEBUG, EAL, "Master lcore %u is ready (tid=%p;cpuset=[%s%s])\n", rte_config.master_lcore, thread_id, cpuset, @@ -683,7 +683,7 @@ rte_eal_init(int argc, char **argv) rte_panic("Cannot create thread\n"); /* Set thread_name for aid in debugging. */ - snprintf(thread_name, RTE_MAX_THREAD_NAME_LEN, + snprintf(thread_name, sizeof(thread_name), "lcore-slave-%d", i); rte_thread_setname(lcore_config[i].thread_id, thread_name); } diff --git a/lib/librte_eal/bsdapp/eal/eal_thread.c b/lib/librte_eal/bsdapp/eal/eal_thread.c index d602daf810..309b587266 100644 --- a/lib/librte_eal/bsdapp/eal/eal_thread.c +++ b/lib/librte_eal/bsdapp/eal/eal_thread.c @@ -119,7 +119,7 @@ eal_thread_loop(__attribute__((unused)) void *arg) if (eal_thread_set_affinity() < 0) rte_panic("cannot set affinity\n"); - ret = eal_thread_dump_affinity(cpuset, RTE_CPU_AFFINITY_STR_LEN); + ret = eal_thread_dump_affinity(cpuset, sizeof(cpuset)); RTE_LOG(DEBUG, EAL, "lcore %u is ready (tid=%p;cpuset=[%s%s])\n", lcore_id, thread_id, cpuset, ret == 0 ? "" : "..."); diff --git a/lib/librte_eal/common/eal_common_proc.c b/lib/librte_eal/common/eal_common_proc.c index 9136fb0a3b..c450c848f4 100644 --- a/lib/librte_eal/common/eal_common_proc.c +++ b/lib/librte_eal/common/eal_common_proc.c @@ -682,11 +682,11 @@ rte_mp_channel_init(void) } /* try best to set thread name */ - strlcpy(thread_name, "rte_mp_handle", RTE_MAX_THREAD_NAME_LEN); + strlcpy(thread_name, "rte_mp_handle", sizeof(thread_name)); rte_thread_setname(mp_handle_tid, thread_name); /* try best to set thread name */ - strlcpy(thread_name, "rte_mp_async_handle", RTE_MAX_THREAD_NAME_LEN); + strlcpy(thread_name, "rte_mp_async_handle", sizeof(thread_name)); rte_thread_setname(async_reply_handle_tid, thread_name); /* unlock the directory */ diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c index 5b23bf0e08..200e879d24 100644 --- a/lib/librte_eal/linuxapp/eal/eal.c +++ b/lib/librte_eal/linuxapp/eal/eal.c @@ -895,7 +895,7 @@ rte_eal_init(int argc, char **argv) eal_thread_init_master(rte_config.master_lcore); - ret = eal_thread_dump_affinity(cpuset, RTE_CPU_AFFINITY_STR_LEN); + ret = eal_thread_dump_affinity(cpuset, sizeof(cpuset)); RTE_LOG(DEBUG, EAL, "Master lcore %u is ready (tid=%x;cpuset=[%s%s])\n", rte_config.master_lcore, (int)thread_id, cpuset, @@ -926,7 +926,7 @@ rte_eal_init(int argc, char **argv) rte_panic("Cannot create thread\n"); /* Set thread_name for aid in debugging. */ - snprintf(thread_name, RTE_MAX_THREAD_NAME_LEN, + snprintf(thread_name, sizeof(thread_name), "lcore-slave-%d", i); ret = rte_thread_setname(lcore_config[i].thread_id, thread_name); diff --git a/lib/librte_eal/linuxapp/eal/eal_interrupts.c b/lib/librte_eal/linuxapp/eal/eal_interrupts.c index 58e93281ae..b5bcfc59af 100644 --- a/lib/librte_eal/linuxapp/eal/eal_interrupts.c +++ b/lib/librte_eal/linuxapp/eal/eal_interrupts.c @@ -877,7 +877,7 @@ rte_eal_intr_init(void) "Failed to create thread for interrupt handling\n"); } else { /* Set thread_name for aid in debugging. */ - snprintf(thread_name, RTE_MAX_THREAD_NAME_LEN, + snprintf(thread_name, sizeof(thread_name), "eal-intr-thread"); ret_1 = rte_thread_setname(intr_thread, thread_name); if (ret_1 != 0) diff --git a/lib/librte_eal/linuxapp/eal/eal_thread.c b/lib/librte_eal/linuxapp/eal/eal_thread.c index 08e150b774..f652ff9884 100644 --- a/lib/librte_eal/linuxapp/eal/eal_thread.c +++ b/lib/librte_eal/linuxapp/eal/eal_thread.c @@ -119,7 +119,7 @@ eal_thread_loop(__attribute__((unused)) void *arg) if (eal_thread_set_affinity() < 0) rte_panic("cannot set affinity\n"); - ret = eal_thread_dump_affinity(cpuset, RTE_CPU_AFFINITY_STR_LEN); + ret = eal_thread_dump_affinity(cpuset, sizeof(cpuset)); RTE_LOG(DEBUG, EAL, "lcore %u is ready (tid=%x;cpuset=[%s%s])\n", lcore_id, (int)thread_id, cpuset, ret == 0 ? "" : "..."); diff --git a/lib/librte_eal/linuxapp/eal/eal_timer.c b/lib/librte_eal/linuxapp/eal/eal_timer.c index 161322f230..098e22a650 100644 --- a/lib/librte_eal/linuxapp/eal/eal_timer.c +++ b/lib/librte_eal/linuxapp/eal/eal_timer.c @@ -189,7 +189,7 @@ rte_eal_hpet_init(int make_default) /* * Set thread_name for aid in debugging. */ - snprintf(thread_name, RTE_MAX_THREAD_NAME_LEN, "hpet-msb-inc"); + snprintf(thread_name, sizeof(thread_name), "hpet-msb-inc"); ret = rte_thread_setname(msb_inc_thread_id, thread_name); if (ret != 0) RTE_LOG(DEBUG, EAL, diff --git a/lib/librte_vhost/socket.c b/lib/librte_vhost/socket.c index 636fc25c63..6eec427e46 100644 --- a/lib/librte_vhost/socket.c +++ b/lib/librte_vhost/socket.c @@ -485,7 +485,7 @@ vhost_user_reconnect_init(void) "failed to destroy reconnect mutex"); } } else { - snprintf(thread_name, RTE_MAX_THREAD_NAME_LEN, + snprintf(thread_name, sizeof(thread_name), "vhost-reconn"); if (rte_thread_setname(reconn_tid, thread_name)) { @@ -1029,7 +1029,7 @@ rte_vhost_driver_start(const char *path) fdset_pipe_uninit(&vhost_user.fdset); return -1; } else { - snprintf(thread_name, RTE_MAX_THREAD_NAME_LEN, + snprintf(thread_name, sizeof(thread_name), "vhost-events"); if (rte_thread_setname(fdset_tid, thread_name)) { -- 2.20.1