From: "Yordan Karadzhov (VMware)" <y.karadz@gmail.com>
To: rostedt@goodmis.org
Cc: linux-trace-devel@vger.kernel.org, tz.stoyanov@gmail.com,
"Yordan Karadzhov (VMware)" <y.karadz@gmail.com>
Subject: [PATCH v3 2/5] libtracefs: Modify the arguments of tracefs_option_is_set()
Date: Thu, 8 Apr 2021 17:00:21 +0300 [thread overview]
Message-ID: <20210408140024.13093-3-y.karadz@gmail.com> (raw)
In-Reply-To: <20210408140024.13093-1-y.karadz@gmail.com>
This function is supposed to take as argument a mask returned by
"tracefs_options_get_supported()" or "tracefs_options_get_enabled()",
hence this argument must be a pointer.
Signed-off-by: Yordan Karadzhov (VMware) <y.karadz@gmail.com>
---
include/tracefs.h | 4 ++--
src/tracefs-tools.c | 5 +++--
utest/tracefs-utest.c | 12 ++++++------
3 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/include/tracefs.h b/include/tracefs.h
index d3db8b5..95016c8 100644
--- a/include/tracefs.h
+++ b/include/tracefs.h
@@ -136,8 +136,8 @@ struct tracefs_options_mask {
};
void tracefs_option_set(struct tracefs_options_mask *options, enum tracefs_option_id id);
void tracefs_option_clear(struct tracefs_options_mask *options, enum tracefs_option_id id);
-bool tracefs_option_is_set(struct tracefs_options_mask options, enum tracefs_option_id id);
-
+bool tracefs_option_is_set(struct tracefs_options_mask *options,
+ enum tracefs_option_id id);
struct tracefs_options_mask *tracefs_options_get_supported(struct tracefs_instance *instance);
bool tracefs_option_is_supported(struct tracefs_instance *instance, enum tracefs_option_id id);
struct tracefs_options_mask *tracefs_options_get_enabled(struct tracefs_instance *instance);
diff --git a/src/tracefs-tools.c b/src/tracefs-tools.c
index f409def..25c0cea 100644
--- a/src/tracefs-tools.c
+++ b/src/tracefs-tools.c
@@ -370,10 +370,11 @@ bool tracefs_option_is_enabled(struct tracefs_instance *instance, enum tracefs_o
* Returns true if an option with given id is set in the bitmask,
* false if it is not set.
*/
-bool tracefs_option_is_set(struct tracefs_options_mask options, enum tracefs_option_id id)
+bool tracefs_option_is_set(struct tracefs_options_mask *options,
+ enum tracefs_option_id id)
{
if (id > TRACEFS_OPTION_INVALID)
- return options.mask & (1ULL << (id - 1));
+ return options->mask & (1ULL << (id - 1));
return false;
}
diff --git a/utest/tracefs-utest.c b/utest/tracefs-utest.c
index ed2693b..9cb2a09 100644
--- a/utest/tracefs-utest.c
+++ b/utest/tracefs-utest.c
@@ -547,7 +547,7 @@ static bool check_options_mask_empty(struct tracefs_options_mask *mask)
int i;
for (i = 1; i < TRACEFS_OPTION_MAX; i++) {
- if (tracefs_option_is_set(*mask, i))
+ if (tracefs_option_is_set(mask, i))
return false;
}
return true;
@@ -580,9 +580,9 @@ static void test_instance_tracing_options(struct tracefs_instance *instance)
CU_TEST(strcmp(name, "unknown"));
snprintf(file, PATH_MAX, "options/%s", name);
- if (tracefs_option_is_set(*all, i)) {
+ if (tracefs_option_is_set(all, i)) {
tracefs_option_clear(all, i);
- CU_TEST(!tracefs_option_is_set(*all, i));
+ CU_TEST(!tracefs_option_is_set(all, i));
CU_TEST(check_option(instance, i, true, -1));
CU_TEST(tracefs_option_is_supported(instance, i));
} else {
@@ -590,9 +590,9 @@ static void test_instance_tracing_options(struct tracefs_instance *instance)
CU_TEST(!tracefs_option_is_supported(instance, i));
}
- if (tracefs_option_is_set(*enabled, i)) {
+ if (tracefs_option_is_set(enabled, i)) {
tracefs_option_clear(enabled, i);
- CU_TEST(!tracefs_option_is_set(*enabled, i));
+ CU_TEST(!tracefs_option_is_set(enabled, i));
CU_TEST(check_option(instance, i, true, 1));
CU_TEST(tracefs_option_is_supported(instance, i));
CU_TEST(tracefs_option_is_enabled(instance, i));
@@ -600,7 +600,7 @@ static void test_instance_tracing_options(struct tracefs_instance *instance)
CU_TEST(check_option(instance, i, true, 0));
CU_TEST(tracefs_option_enable(instance, i) == 0);
CU_TEST(check_option(instance, i, true, 1));
- } else if (tracefs_option_is_set(*all_copy, i)) {
+ } else if (tracefs_option_is_set(all_copy, i)) {
CU_TEST(check_option(instance, i, true, 0));
CU_TEST(tracefs_option_is_supported(instance, i));
CU_TEST(!tracefs_option_is_enabled(instance, i));
--
2.27.0
next prev parent reply other threads:[~2021-04-08 14:00 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-08 14:00 [PATCH v3 0/5] Refactor the APIs for tracing options Yordan Karadzhov (VMware)
2021-04-08 14:00 ` [PATCH v3 1/5] libtracefs: Fix issues with tracefs_option_id() Yordan Karadzhov (VMware)
2021-04-08 14:00 ` Yordan Karadzhov (VMware) [this message]
2021-04-08 14:00 ` [PATCH v3 3/5] libtracefs: Encapsulate "struct tracefs_options_mask" Yordan Karadzhov (VMware)
2021-04-08 14:00 ` [PATCH v3 4/5] libtracefs: Option's bit masks to be owned by the instance Yordan Karadzhov (VMware)
2021-04-09 4:36 ` Tzvetomir Stoyanov
2021-04-08 14:00 ` [PATCH v3 5/5] libtracefs: Rename tracefs_option_is_set() Yordan Karadzhov (VMware)
2021-04-09 4:39 ` [PATCH v3 0/5] Refactor the APIs for tracing options Tzvetomir Stoyanov
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=20210408140024.13093-3-y.karadz@gmail.com \
--to=y.karadz@gmail.com \
--cc=linux-trace-devel@vger.kernel.org \
--cc=rostedt@goodmis.org \
--cc=tz.stoyanov@gmail.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.