Simplify Resource::Locks with direct return of booleans

okurz · okurz · commit b295d477ee36 · 2024-03-14T10:13:10.000+01:00
diff --git a/lib/OpenQA/Resource/Locks.pm b/lib/OpenQA/Resource/Locks.pm
@@ -121,16 +121,12 @@ sub barrier_wait ($name = undef, $jobid = undef, $where = undef, $check_dead_job
         }
     }
 
-    if (grep { $_ eq $jobid } @jobs) {
-        return 1 if @jobs == $barrier->count;
-        return 0;
-    }
+    return @jobs == $barrier->count if grep { $_ eq $jobid } @jobs;
 
     push @jobs, $jobid;
     $barrier->update({locked_by => join(',', @jobs)});
 
-    return 1 if @jobs == $barrier->count;
-    return 0;
+    return @jobs == $barrier->count;
 }
 
 sub barrier_destroy ($name = undef, $jobid = undef, $where = undef) {

Original file line number	Diff line number	Diff line change
`@@ -121,16 +121,12 @@ sub barrier_wait ($name = undef, $jobid = undef, $where = undef, $check_dead_job`
`121`	`121`	`}`
`122`	`122`	`}`
`123`	`123`
`124`		`- if (grep { $_ eq $jobid } @jobs) {`
`125`		`- return 1 if @jobs == $barrier->count;`
`126`		`- return 0;`
`127`		`- }`
	`124`	`+ return @jobs == $barrier->count if grep { $_ eq $jobid } @jobs;`
`128`	`125`
`129`	`126`	`push @jobs, $jobid;`
`130`	`127`	`$barrier->update({locked_by => join(',', @jobs)});`
`131`	`128`
`132`		`- return 1 if @jobs == $barrier->count;`
`133`		`- return 0;`
	`129`	`+ return @jobs == $barrier->count;`
`134`	`130`	`}`
`135`	`131`
`136`	`132`	`sub barrier_destroy ($name = undef, $jobid = undef, $where = undef) {`