From: "Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com>
To: rostedt@goodmis.org
Cc: linux-trace-devel@vger.kernel.org
Subject: [PATCH v4 1/4] trace-cmd: Add new tracefs APIs for checking if a ftrace file / directory exists
Date: Tue, 25 Feb 2020 20:07:30 +0200 [thread overview]
Message-ID: <20200225180733.89344-2-tz.stoyanov@gmail.com> (raw)
In-Reply-To: <20200225180733.89344-1-tz.stoyanov@gmail.com>
Some ftrace files and directories are optional, depending on specific kernel configuration or version.
It is a good practice to check if the file / directory exist, before trying to access it. There are a lot of places in trace-cmd implementation with such checks.
The new libtracefs APIs can be used for this, they are ftarce instance aware:
bool tracefs_file_exist(struct tracefs_instance *instance, char *name);
bool tracefs_dir_exist(struct tracefs_instance *instance, char *name);
Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
---
include/tracefs/tracefs.h | 3 +++
lib/tracefs/tracefs-instance.c | 49 +++++++++++++++++++++++++++++++++-
2 files changed, 51 insertions(+), 1 deletion(-)
diff --git a/include/tracefs/tracefs.h b/include/tracefs/tracefs.h
index 85690b66..bc8bebcb 100644
--- a/include/tracefs/tracefs.h
+++ b/include/tracefs/tracefs.h
@@ -33,6 +33,9 @@ int tracefs_instance_file_write(struct tracefs_instance *instance,
char *tracefs_instance_file_read(struct tracefs_instance *instance,
char *file, int *psize);
+bool tracefs_file_exist(struct tracefs_instance *instance, char *name);
+bool tracefs_dir_exist(struct tracefs_instance *instance, char *name);
+
/* events */
void tracefs_list_free(char **list);
char **tracefs_event_systems(const char *tracing_dir);
diff --git a/lib/tracefs/tracefs-instance.c b/lib/tracefs/tracefs-instance.c
index b96ab61c..67123e7c 100644
--- a/lib/tracefs/tracefs-instance.c
+++ b/lib/tracefs/tracefs-instance.c
@@ -13,7 +13,7 @@
#include <errno.h>
#include <sys/stat.h>
#include <fcntl.h>
-
+#include <linux/limits.h>
#include "tracefs.h"
#include "tracefs-local.h"
@@ -247,3 +247,50 @@ char *tracefs_instance_file_read(struct tracefs_instance *instance,
return buf;
}
+
+static bool check_file_exist(struct tracefs_instance *instance,
+ char *name, bool dir)
+{
+ char file[PATH_MAX];
+ struct stat st;
+ char *path;
+ int ret;
+
+ path = tracefs_instance_get_dir(instance);
+ snprintf(file, PATH_MAX, "%s/%s", path, name);
+ tracefs_put_tracing_file(path);
+ ret = stat(file, &st);
+ if (ret < 0)
+ return false;
+
+ if (dir && !S_ISDIR(st.st_mode))
+ return false;
+ if (!dir && S_ISDIR(st.st_mode))
+ return false;
+
+ return true;
+}
+
+/**
+ * tracefs_file_exist - Check if a file with given name exists in given instance
+ * @instance: ftrace instance, can be NULL for the top instance
+ * @name: name of the file
+ *
+ * Returns true if the file exists, false otherwise
+ */
+bool tracefs_file_exist(struct tracefs_instance *instance, char *name)
+{
+ return check_file_exist(instance, name, false);
+}
+
+/**
+ * tracefs_dir_exist - Check if a directory with given name exists in given instance
+ * @instance: ftrace instance, can be NULL for the top instance
+ * @name: name of the directory
+ *
+ * Returns true if the directory exists, false otherwise
+ */
+bool tracefs_dir_exist(struct tracefs_instance *instance, char *name)
+{
+ return check_file_exist(instance, name, true);
+}
--
2.24.1
next prev parent reply other threads:[~2020-02-25 18:07 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-25 18:07 [PATCH v4 0/4] Extend coverage of "trace-cmd reset" command Tzvetomir Stoyanov (VMware)
2020-02-25 18:07 ` Tzvetomir Stoyanov (VMware) [this message]
2020-04-09 18:22 ` [PATCH v4 1/4] trace-cmd: Add new tracefs APIs for checking if a ftrace file / directory exists Steven Rostedt
2020-04-13 6:52 ` Tzvetomir Stoyanov
2020-02-25 18:07 ` [PATCH v4 2/4] trace-cmd: Unit tests for new libtracefs APIs Tzvetomir Stoyanov (VMware)
2020-02-25 18:07 ` [PATCH v4 3/4] trace-cmd: Clear synthetic events on reset subcommand Tzvetomir Stoyanov (VMware)
2020-02-25 18:07 ` [PATCH v4 4/4] trace-cmd: Clear error log " Tzvetomir Stoyanov (VMware)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200225180733.89344-2-tz.stoyanov@gmail.com \
--to=tz.stoyanov@gmail.com \
--cc=linux-trace-devel@vger.kernel.org \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).