From: Sunil Kumar Kori <sk...@marvell.com>
Trace library exposes --trace-dir EAL parameter to configure
directory where traces will be generated.
Signed-off-by: Sunil Kumar Kori <sk...@marvell.com>
---
doc/guides/linux_gsg/eal_args.include.rst | 11 ++++
lib/librte_eal/common/eal_common_options.c | 15 ++++++
.../common/eal_common_trace_utils.c | 54 +++++++++++++++++++
lib/librte_eal/common/eal_options.h | 2 +
lib/librte_eal/common/eal_trace.h | 1 +
5 files changed, 83 insertions(+)
diff --git a/doc/guides/linux_gsg/eal_args.include.rst
b/doc/guides/linux_gsg/eal_args.include.rst
index 94289d1e2..8c72363b4 100644
--- a/doc/guides/linux_gsg/eal_args.include.rst
+++ b/doc/guides/linux_gsg/eal_args.include.rst
@@ -155,6 +155,17 @@ Debugging options
Can be specified multiple times up to 32 times.
+* ``--trace-dir=<directory path>``
+
+ Specify trace directory for trace output. For example:
+
+ Configuring ``/tmp/`` as a trace output directory::
+
+ --trace-dir=/tmp
+
+ By default, trace output will created at ``home`` directory and parameter
+ must be specified once only.
+
Other options
~~~~~~~~~~~~~
diff --git a/lib/librte_eal/common/eal_common_options.c
b/lib/librte_eal/common/eal_common_options.c
index 0d6576a12..d71f89be2 100644
--- a/lib/librte_eal/common/eal_common_options.c
+++ b/lib/librte_eal/common/eal_common_options.c
@@ -69,6 +69,7 @@ eal_long_options[] = {
{OPT_LCORES, 1, NULL, OPT_LCORES_NUM },
{OPT_LOG_LEVEL, 1, NULL, OPT_LOG_LEVEL_NUM },
{OPT_TRACE_LEVEL, 1, NULL, OPT_TRACE_LEVEL_NUM },
+ {OPT_TRACE_DIR, 1, NULL, OPT_TRACE_DIR_NUM },
{OPT_MASTER_LCORE, 1, NULL, OPT_MASTER_LCORE_NUM },
{OPT_MBUF_POOL_OPS_NAME, 1, NULL, OPT_MBUF_POOL_OPS_NAME_NUM},
{OPT_NO_HPET, 0, NULL, OPT_NO_HPET_NUM },
@@ -1430,6 +1431,15 @@ eal_parse_common_option(int opt, const char *optarg,
break;
}
+ case OPT_TRACE_DIR_NUM: {
+ if (eal_trace_dir_args_save(optarg) < 0) {
+ RTE_LOG(ERR, EAL, "invalid parameters for --"
+ OPT_TRACE_DIR "\n");
+ return -1;
+ }
+ break;
+ }
+
case OPT_LCORES_NUM:
if (eal_parse_lcores(optarg) < 0) {
RTE_LOG(ERR, EAL, "invalid parameter for --"
@@ -1710,6 +1720,11 @@ eal_common_usage(void)
" Set trace level specific to component\n"
" Default, there is no trace level enabled\n"
" User must specify this option if required\n"
+ " --"OPT_TRACE_DIR"=<directory path>\n"
+ " Specify trace directory for trace output.\n"
+ " By default, trace output will created at\n"
+ " HOME directory and parameter must be\n"
+ " specified once only\n"
" -v Display version information on startup\n"
" -h, --help This help\n"
" --"OPT_IN_MEMORY" Operate entirely in memory. This will\n"
diff --git a/lib/librte_eal/common/eal_common_trace_utils.c
b/lib/librte_eal/common/eal_common_trace_utils.c
index 1f47faed4..3c85152c7 100644
--- a/lib/librte_eal/common/eal_common_trace_utils.c
+++ b/lib/librte_eal/common/eal_common_trace_utils.c
@@ -118,6 +118,22 @@ trace_session_name_generate(char *trace_dir)
return -rte_errno;
}
+static int
+trace_dir_update(const char *str)
+{
+ struct trace *trace = trace_obj_get();
+ int rc, remaining;
+
+ remaining = sizeof(trace->dir) - trace->dir_offset;
+ rc = rte_strscpy(&trace->dir[0] + trace->dir_offset, str, remaining);
+ if (rc < 0)
+ goto fail;
+
+ trace->dir_offset += rc;
+fail:
+ return rc;
+}
+
int
eal_trace_level_args_save(const char *optarg)
{
@@ -222,6 +238,37 @@ trace_level_args_apply(const char *arg)
return -1;
}
+int
+eal_trace_dir_args_save(char const *optarg)
+{
+ struct trace *trace = trace_obj_get();
+ uint32_t size = sizeof(trace->dir);
+ char *dir_path = NULL;
+ int rc;
+
+ if (optarg == NULL) {
+ trace_err("no optarg is passed\n");
+ return -EINVAL;
+ }
+
+ if (strlen(optarg) >= size) {
+ trace_err("input string is too big\n");
+ return -ENAMETOOLONG;
+ }
+
+ dir_path = (char *)calloc(1, size);
+ if (dir_path == NULL) {
+ trace_err("fail to allocate memory\n");
+ return -ENOMEM;
+ }
+
+ sprintf(dir_path, "%s/", optarg);
+ rc = trace_dir_update(dir_path);
+
+ free(dir_path);
+ return rc;
+}
+
int
trace_epoch_time_save(void)
{
@@ -292,6 +339,10 @@ trace_mkdir(void)
return rc;
}
+ rc = trace_dir_update(dir_path);
+ free(dir_path);
+ if (rc < 0)
+ return rc;
}
/* Create the path if it t exist, no "mkdir -p" available here */
@@ -303,6 +354,9 @@ trace_mkdir(void)
}
rc = trace_session_name_generate(session);
+ if (rc < 0)
+ return rc;
+ rc = trace_dir_update(session);
if (rc < 0)
return rc;
diff --git a/lib/librte_eal/common/eal_options.h
b/lib/librte_eal/common/eal_options.h
index c274a30cc..8c8283165 100644
--- a/lib/librte_eal/common/eal_options.h
+++ b/lib/librte_eal/common/eal_options.h
@@ -35,6 +35,8 @@ enum {
OPT_LOG_LEVEL_NUM,
#define OPT_TRACE_LEVEL "trace-level"
OPT_TRACE_LEVEL_NUM,
+#define OPT_TRACE_DIR "trace-dir"
+ OPT_TRACE_DIR_NUM,
#define OPT_MASTER_LCORE "master-lcore"
OPT_MASTER_LCORE_NUM,
#define OPT_MBUF_POOL_OPS_NAME "mbuf-pool-ops-name"
diff --git a/lib/librte_eal/common/eal_trace.h
b/lib/librte_eal/common/eal_trace.h
index acdc8ecab..9ff172cc0 100644
--- a/lib/librte_eal/common/eal_trace.h
+++ b/lib/librte_eal/common/eal_trace.h
@@ -114,5 +114,6 @@ int eal_trace_init(void);
void eal_trace_fini(void);
int eal_trace_level_args_save(const char *optarg);
void eal_trace_level_args_free(void);
+int eal_trace_dir_args_save(const char *optarg);
#endif /* __EAL_TRACE_H */
--
2.25.1
