public inbox for igt-dev@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
To: igt-dev@lists.freedesktop.org
Cc: Intel-gfx@lists.freedesktop.org,
	Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Subject: [igt-dev] [PATCH i-g-t 13/27] gem_wsim: Save some lines by changing to implicit NULL checking
Date: Mon, 20 May 2019 15:47:25 +0100	[thread overview]
Message-ID: <20190520144739.13111-14-tvrtko.ursulin@linux.intel.com> (raw)
In-Reply-To: <20190520144739.13111-1-tvrtko.ursulin@linux.intel.com>

From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

We can improve the parsing loop readability a bit more by avoiding some
line breaks caused by explicit NULL checks.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 benchmarks/gem_wsim.c | 39 +++++++++++++++------------------------
 1 file changed, 15 insertions(+), 24 deletions(-)

diff --git a/benchmarks/gem_wsim.c b/benchmarks/gem_wsim.c
index e5b12e37490e..baa389c3f0e7 100644
--- a/benchmarks/gem_wsim.c
+++ b/benchmarks/gem_wsim.c
@@ -391,7 +391,7 @@ parse_workload(struct w_arg *arg, unsigned int flags, struct workload *app_w)
 
 	igt_assert(desc);
 
-	while ((_token = strtok_r(tstart, ",", &tctx)) != NULL) {
+	while ((_token = strtok_r(tstart, ",", &tctx))) {
 		tstart = NULL;
 		token = strdup(_token);
 		igt_assert(token);
@@ -399,12 +399,11 @@ parse_workload(struct w_arg *arg, unsigned int flags, struct workload *app_w)
 		valid = 0;
 		memset(&step, 0, sizeof(step));
 
-		if ((field = strtok_r(fstart, ".", &fctx)) != NULL) {
+		if ((field = strtok_r(fstart, ".", &fctx))) {
 			fstart = NULL;
 
 			if (!strcmp(field, "d")) {
-				if ((field = strtok_r(fstart, ".", &fctx)) !=
-				    NULL) {
+				if ((field = strtok_r(fstart, ".", &fctx))) {
 					tmp = atoi(field);
 					check_arg(tmp <= 0,
 						  "Invalid delay at step %u!\n",
@@ -414,8 +413,7 @@ parse_workload(struct w_arg *arg, unsigned int flags, struct workload *app_w)
 					goto add_step;
 				}
 			} else if (!strcmp(field, "p")) {
-				if ((field = strtok_r(fstart, ".", &fctx)) !=
-				    NULL) {
+				if ((field = strtok_r(fstart, ".", &fctx))) {
 					tmp = atoi(field);
 					check_arg(tmp <= 0,
 						  "Invalid period at step %u!\n",
@@ -426,8 +424,7 @@ parse_workload(struct w_arg *arg, unsigned int flags, struct workload *app_w)
 				}
 			} else if (!strcmp(field, "P")) {
 				unsigned int nr = 0;
-				while ((field = strtok_r(fstart, ".", &fctx)) !=
-				    NULL) {
+				while ((field = strtok_r(fstart, ".", &fctx))) {
 					tmp = atoi(field);
 					check_arg(nr == 0 && tmp <= 0,
 						  "Invalid context at step %u!\n",
@@ -447,8 +444,7 @@ parse_workload(struct w_arg *arg, unsigned int flags, struct workload *app_w)
 				step.type = CTX_PRIORITY;
 				goto add_step;
 			} else if (!strcmp(field, "s")) {
-				if ((field = strtok_r(fstart, ".", &fctx)) !=
-				    NULL) {
+				if ((field = strtok_r(fstart, ".", &fctx))) {
 					tmp = atoi(field);
 					check_arg(tmp >= 0 ||
 						  ((int)nr_steps + tmp) < 0,
@@ -459,8 +455,7 @@ parse_workload(struct w_arg *arg, unsigned int flags, struct workload *app_w)
 					goto add_step;
 				}
 			} else if (!strcmp(field, "t")) {
-				if ((field = strtok_r(fstart, ".", &fctx)) !=
-				    NULL) {
+				if ((field = strtok_r(fstart, ".", &fctx))) {
 					tmp = atoi(field);
 					check_arg(tmp < 0,
 						  "Invalid throttle at step %u!\n",
@@ -470,8 +465,7 @@ parse_workload(struct w_arg *arg, unsigned int flags, struct workload *app_w)
 					goto add_step;
 				}
 			} else if (!strcmp(field, "q")) {
-				if ((field = strtok_r(fstart, ".", &fctx)) !=
-				    NULL) {
+				if ((field = strtok_r(fstart, ".", &fctx))) {
 					tmp = atoi(field);
 					check_arg(tmp < 0,
 						  "Invalid qd throttle at step %u!\n",
@@ -481,8 +475,7 @@ parse_workload(struct w_arg *arg, unsigned int flags, struct workload *app_w)
 					goto add_step;
 				}
 			} else if (!strcmp(field, "a")) {
-				if ((field = strtok_r(fstart, ".", &fctx)) !=
-				    NULL) {
+				if ((field = strtok_r(fstart, ".", &fctx))) {
 					tmp = atoi(field);
 					check_arg(tmp >= 0,
 						  "Invalid sw fence signal at step %u!\n",
@@ -496,8 +489,7 @@ parse_workload(struct w_arg *arg, unsigned int flags, struct workload *app_w)
 				goto add_step;
 			} else if (!strcmp(field, "M")) {
 				unsigned int nr = 0;
-				while ((field = strtok_r(fstart, ".", &fctx)) !=
-				    NULL) {
+				while ((field = strtok_r(fstart, ".", &fctx))) {
 					tmp = atoi(field);
 					check_arg(nr == 0 && tmp <= 0,
 						  "Invalid context at step %u!\n",
@@ -523,8 +515,7 @@ parse_workload(struct w_arg *arg, unsigned int flags, struct workload *app_w)
 				goto add_step;
 			} else if (!strcmp(field, "X")) {
 				unsigned int nr = 0;
-				while ((field = strtok_r(fstart, ".", &fctx)) !=
-				    NULL) {
+				while ((field = strtok_r(fstart, ".", &fctx))) {
 					tmp = atoi(field);
 					check_arg(nr == 0 && tmp <= 0,
 						  "Invalid context at step %u!\n",
@@ -564,7 +555,7 @@ parse_workload(struct w_arg *arg, unsigned int flags, struct workload *app_w)
 			valid++;
 		}
 
-		if ((field = strtok_r(fstart, ".", &fctx)) != NULL) {
+		if ((field = strtok_r(fstart, ".", &fctx))) {
 			fstart = NULL;
 
 			i = str_to_engine(field);
@@ -579,7 +570,7 @@ parse_workload(struct w_arg *arg, unsigned int flags, struct workload *app_w)
 				bcs_used = true;
 		}
 
-		if ((field = strtok_r(fstart, ".", &fctx)) != NULL) {
+		if ((field = strtok_r(fstart, ".", &fctx))) {
 			char *sep = NULL;
 			long int tmpl;
 
@@ -607,7 +598,7 @@ parse_workload(struct w_arg *arg, unsigned int flags, struct workload *app_w)
 			valid++;
 		}
 
-		if ((field = strtok_r(fstart, ".", &fctx)) != NULL) {
+		if ((field = strtok_r(fstart, ".", &fctx))) {
 			fstart = NULL;
 
 			tmp = parse_dependencies(nr_steps, &step, field);
@@ -617,7 +608,7 @@ parse_workload(struct w_arg *arg, unsigned int flags, struct workload *app_w)
 			valid++;
 		}
 
-		if ((field = strtok_r(fstart, ".", &fctx)) != NULL) {
+		if ((field = strtok_r(fstart, ".", &fctx))) {
 			fstart = NULL;
 
 			check_arg(strlen(field) != 1 ||
-- 
2.20.1

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

  parent reply	other threads:[~2019-05-20 14:47 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-20 14:47 [igt-dev] [PATCH i-g-t 00/27] Media scalability tooling Tvrtko Ursulin
2019-05-20 14:47 ` [igt-dev] [PATCH i-g-t 01/27] scripts/trace.pl: Fix after intel_engine_notify removal Tvrtko Ursulin
2019-05-20 14:47 ` [igt-dev] [PATCH i-g-t 02/27] trace.pl: Ignore signaling on non i915 fences Tvrtko Ursulin
2019-05-21  7:57   ` Chris Wilson
2019-05-21 13:22     ` Tvrtko Ursulin
2019-05-21 15:29       ` Chris Wilson
2019-05-20 14:47 ` [igt-dev] [PATCH i-g-t 03/27] headers: bump Tvrtko Ursulin
2019-05-20 14:47 ` [igt-dev] [PATCH i-g-t 04/27] trace.pl: Virtual engine support Tvrtko Ursulin
2019-05-20 14:47 ` [igt-dev] [PATCH i-g-t 05/27] trace.pl: Virtual engine preemption support Tvrtko Ursulin
2019-05-20 14:47 ` [Intel-gfx] [PATCH i-g-t 06/27] wsim/media-bench: i915 balancing Tvrtko Ursulin
2019-05-20 14:47 ` [igt-dev] [PATCH i-g-t 07/27] gem_wsim: Use IGT uapi headers Tvrtko Ursulin
2019-05-20 14:47 ` [igt-dev] [PATCH i-g-t 08/27] gem_wsim: Factor out common error handling Tvrtko Ursulin
2019-05-20 14:47 ` [igt-dev] [PATCH i-g-t 09/27] gem_wsim: More wsim_err Tvrtko Ursulin
2019-05-20 14:47 ` [igt-dev] [PATCH i-g-t 10/27] gem_wsim: Submit fence support Tvrtko Ursulin
2019-05-20 14:47 ` [igt-dev] [PATCH i-g-t 11/27] gem_wsim: Extract str to engine lookup Tvrtko Ursulin
2019-05-20 14:47 ` [igt-dev] [PATCH i-g-t 12/27] gem_wsim: Engine map support Tvrtko Ursulin
2019-05-21  8:14   ` Chris Wilson
2019-05-21  8:29     ` Tvrtko Ursulin
2019-05-20 14:47 ` Tvrtko Ursulin [this message]
2019-05-20 14:47 ` [igt-dev] [PATCH i-g-t 14/27] gem_wsim: Compact int command parsing with a macro Tvrtko Ursulin
2019-05-20 14:47 ` [igt-dev] [PATCH i-g-t 15/27] gem_wsim: Engine map load balance command Tvrtko Ursulin
2019-05-20 14:47 ` [igt-dev] [PATCH i-g-t 16/27] gem_wsim: Engine bond command Tvrtko Ursulin
2019-05-20 14:47 ` [Intel-gfx] [PATCH i-g-t 17/27] gem_wsim: Some more example workloads Tvrtko Ursulin
2019-05-20 14:47 ` [igt-dev] [PATCH i-g-t 18/27] gem_wsim: Infinite batch support Tvrtko Ursulin
2019-05-20 14:47 ` [Intel-gfx] [PATCH i-g-t 19/27] gem_wsim: Command line switch for specifying low slice count workloads Tvrtko Ursulin
2019-05-20 14:47 ` [igt-dev] [PATCH i-g-t 20/27] gem_wsim: Per context SSEU control Tvrtko Ursulin
2019-05-20 14:47 ` [igt-dev] [PATCH i-g-t 21/27] gem_wsim: Allow RCS virtual engine with " Tvrtko Ursulin
2019-05-20 14:47 ` [Intel-gfx] [PATCH i-g-t 22/27] tests/i915_query: Engine discovery tests Tvrtko Ursulin
2019-05-22  8:23   ` [igt-dev] " Andi Shyti
2019-05-20 14:47 ` [igt-dev] [PATCH i-g-t 23/27] gem_wsim: Consolidate engine assignments into helpers Tvrtko Ursulin
2019-05-20 14:47 ` [igt-dev] [PATCH i-g-t 24/27] gem_wsim: Discover engines Tvrtko Ursulin
2019-05-21 13:54   ` Andi Shyti
2019-05-20 14:47 ` [igt-dev] [PATCH i-g-t 25/27] gem_wsim: Support Icelake parts Tvrtko Ursulin
2019-05-20 14:47 ` [igt-dev] [PATCH i-g-t 26/27] gem_wsim: Fix prng usage Tvrtko Ursulin
2019-05-20 14:47 ` [igt-dev] [PATCH i-g-t 27/27] gem_wsim: Allow random seed control Tvrtko Ursulin
2019-05-21  9:22 ` [igt-dev] ✓ Fi.CI.BAT: success for Media scalability tooling (rev6) Patchwork
2019-05-21 13:10 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork

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=20190520144739.13111-14-tvrtko.ursulin@linux.intel.com \
    --to=tvrtko.ursulin@linux.intel.com \
    --cc=Intel-gfx@lists.freedesktop.org \
    --cc=igt-dev@lists.freedesktop.org \
    --cc=tvrtko.ursulin@intel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox