Skip to content

Commit 06cf8ce

Browse files
sjp38akpm00
sjp38
authored and
akpm00
committed
selftests/damon/_damon_sysfs: use 'is' instead of '==' for 'None'
_damon_sysfs.py is using '==' or '!=' for 'None'. Since 'None' is a singleton, using 'is' or 'is not' is more efficient. Use the more efficient one. Link: https://lkml.kernel.org/r/20240503180318.72798-5-sj@kernel.org Signed-off-by: SeongJae Park <sj@kernel.org> Cc: Jonathan Corbet <corbet@lwn.net> Cc: Shuah Khan <shuah@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent e799fda commit 06cf8ce

1 file changed

Lines changed: 40 additions & 40 deletions

File tree

‎tools/testing/selftests/damon/_damon_sysfs.py‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ def __init__(self, size=None, nr_accesses=None, age=None):
4545
self.nr_accesses = nr_accesses
4646
self.age = age
4747

48-
if self.size == None:
48+
if self.size is None:
4949
self.size = [0, 2**64 - 1]
50-
if self.nr_accesses == None:
50+
if self.nr_accesses is None:
5151
self.nr_accesses = [0, 2**64 - 1]
52-
if self.age == None:
52+
if self.age is None:
5353
self.age = [0, 2**64 - 1]
5454

5555
def sysfs_dir(self):
@@ -58,27 +58,27 @@ def sysfs_dir(self):
5858
def stage(self):
5959
err = write_file(
6060
os.path.join(self.sysfs_dir(), 'sz', 'min'), self.size[0])
61-
if err != None:
61+
if err is not None:
6262
return err
6363
err = write_file(
6464
os.path.join(self.sysfs_dir(), 'sz', 'max'), self.size[1])
65-
if err != None:
65+
if err is not None:
6666
return err
6767
err = write_file(os.path.join(self.sysfs_dir(), 'nr_accesses', 'min'),
6868
self.nr_accesses[0])
69-
if err != None:
69+
if err is not None:
7070
return err
7171
err = write_file(os.path.join(self.sysfs_dir(), 'nr_accesses', 'max'),
7272
self.nr_accesses[1])
73-
if err != None:
73+
if err is not None:
7474
return err
7575
err = write_file(
7676
os.path.join(self.sysfs_dir(), 'age', 'min'), self.age[0])
77-
if err != None:
77+
if err is not None:
7878
return err
7979
err = write_file(
8080
os.path.join(self.sysfs_dir(), 'age', 'max'), self.age[1])
81-
if err != None:
81+
if err is not None:
8282
return err
8383

8484
qgoal_metric_user_input = 'user_input'
@@ -137,14 +137,14 @@ def sysfs_dir(self):
137137

138138
def stage(self):
139139
err = write_file(os.path.join(self.sysfs_dir(), 'bytes'), self.sz)
140-
if err != None:
140+
if err is not None:
141141
return err
142142
err = write_file(os.path.join(self.sysfs_dir(), 'ms'), self.ms)
143-
if err != None:
143+
if err is not None:
144144
return err
145145
err = write_file(os.path.join(self.sysfs_dir(), 'reset_interval_ms'),
146146
self.reset_interval_ms)
147-
if err != None:
147+
if err is not None:
148148
return err
149149

150150
nr_goals_file = os.path.join(self.sysfs_dir(), 'goals', 'nr_goals')
@@ -201,30 +201,30 @@ def sysfs_dir(self):
201201

202202
def stage(self):
203203
err = write_file(os.path.join(self.sysfs_dir(), 'action'), self.action)
204-
if err != None:
204+
if err is not None:
205205
return err
206206
err = self.access_pattern.stage()
207-
if err != None:
207+
if err is not None:
208208
return err
209209
err = write_file(os.path.join(self.sysfs_dir(), 'apply_interval_us'),
210210
'%d' % self.apply_interval_us)
211-
if err != None:
211+
if err is not None:
212212
return err
213213

214214
err = self.quota.stage()
215-
if err != None:
215+
if err is not None:
216216
return err
217217

218218
# disable watermarks
219219
err = write_file(
220220
os.path.join(self.sysfs_dir(), 'watermarks', 'metric'), 'none')
221-
if err != None:
221+
if err is not None:
222222
return err
223223

224224
# disable filters
225225
err = write_file(
226226
os.path.join(self.sysfs_dir(), 'filters', 'nr_filters'), '0')
227-
if err != None:
227+
if err is not None:
228228
return err
229229

230230
class DamonTarget:
@@ -243,7 +243,7 @@ def sysfs_dir(self):
243243
def stage(self):
244244
err = write_file(
245245
os.path.join(self.sysfs_dir(), 'regions', 'nr_regions'), '0')
246-
if err != None:
246+
if err is not None:
247247
return err
248248
return write_file(
249249
os.path.join(self.sysfs_dir(), 'pid_target'), self.pid)
@@ -275,27 +275,27 @@ def nr_regions_range_sysfs_dir(self):
275275
def stage(self):
276276
err = write_file(os.path.join(self.interval_sysfs_dir(), 'sample_us'),
277277
self.sample_us)
278-
if err != None:
278+
if err is not None:
279279
return err
280280
err = write_file(os.path.join(self.interval_sysfs_dir(), 'aggr_us'),
281281
self.aggr_us)
282-
if err != None:
282+
if err is not None:
283283
return err
284284
err = write_file(os.path.join(self.interval_sysfs_dir(), 'update_us'),
285285
self.update_us)
286-
if err != None:
286+
if err is not None:
287287
return err
288288

289289
err = write_file(
290290
os.path.join(self.nr_regions_range_sysfs_dir(), 'min'),
291291
self.min_nr_regions)
292-
if err != None:
292+
if err is not None:
293293
return err
294294

295295
err = write_file(
296296
os.path.join(self.nr_regions_range_sysfs_dir(), 'max'),
297297
self.max_nr_regions)
298-
if err != None:
298+
if err is not None:
299299
return err
300300

301301
class DamonCtx:
@@ -329,24 +329,24 @@ def sysfs_dir(self):
329329
def stage(self):
330330
err = write_file(
331331
os.path.join(self.sysfs_dir(), 'operations'), self.ops)
332-
if err != None:
332+
if err is not None:
333333
return err
334334
err = self.monitoring_attrs.stage()
335-
if err != None:
335+
if err is not None:
336336
return err
337337

338338
nr_targets_file = os.path.join(
339339
self.sysfs_dir(), 'targets', 'nr_targets')
340340
content, err = read_file(nr_targets_file)
341-
if err != None:
341+
if err is not None:
342342
return err
343343
if int(content) != len(self.targets):
344344
err = write_file(nr_targets_file, '%d' % len(self.targets))
345-
if err != None:
345+
if err is not None:
346346
return err
347347
for target in self.targets:
348348
err = target.stage()
349-
if err != None:
349+
if err is not None:
350350
return err
351351

352352
nr_schemes_file = os.path.join(
@@ -356,11 +356,11 @@ def stage(self):
356356
return err
357357
if int(content) != len(self.schemes):
358358
err = write_file(nr_schemes_file, '%d' % len(self.schemes))
359-
if err != None:
359+
if err is not None:
360360
return err
361361
for scheme in self.schemes:
362362
err = scheme.stage()
363-
if err != None:
363+
if err is not None:
364364
return err
365365
return None
366366

@@ -384,37 +384,37 @@ def start(self):
384384
nr_contexts_file = os.path.join(self.sysfs_dir(),
385385
'contexts', 'nr_contexts')
386386
content, err = read_file(nr_contexts_file)
387-
if err != None:
387+
if err is not None:
388388
return err
389389
if int(content) != len(self.contexts):
390390
err = write_file(nr_contexts_file, '%d' % len(self.contexts))
391-
if err != None:
391+
if err is not None:
392392
return err
393393

394394
for context in self.contexts:
395395
err = context.stage()
396-
if err != None:
396+
if err is not None:
397397
return err
398398
err = write_file(os.path.join(self.sysfs_dir(), 'state'), 'on')
399399
return err
400400

401401
def update_schemes_tried_bytes(self):
402402
err = write_file(os.path.join(self.sysfs_dir(), 'state'),
403403
'update_schemes_tried_bytes')
404-
if err != None:
404+
if err is not None:
405405
return err
406406
for context in self.contexts:
407407
for scheme in context.schemes:
408408
content, err = read_file(os.path.join(scheme.sysfs_dir(),
409409
'tried_regions', 'total_bytes'))
410-
if err != None:
410+
if err is not None:
411411
return err
412412
scheme.tried_bytes = int(content)
413413

414414
def update_schemes_stats(self):
415415
err = write_file(os.path.join(self.sysfs_dir(), 'state'),
416416
'update_schemes_stats')
417-
if err != None:
417+
if err is not None:
418418
return err
419419
for context in self.contexts:
420420
for scheme in context.schemes:
@@ -423,7 +423,7 @@ def update_schemes_stats(self):
423423
'sz_applied', 'qt_exceeds']:
424424
content, err = read_file(
425425
os.path.join(scheme.sysfs_dir(), 'stats', stat))
426-
if err != None:
426+
if err is not None:
427427
return err
428428
stat_values.append(int(content))
429429
scheme.stats = DamosStats(*stat_values)
@@ -471,10 +471,10 @@ def sysfs_dir(self):
471471
def start(self):
472472
err = write_file(os.path.join(self.sysfs_dir(), 'nr_kdamonds'),
473473
'%s' % len(self.kdamonds))
474-
if err != None:
474+
if err is not None:
475475
return err
476476
for kdamond in self.kdamonds:
477477
err = kdamond.start()
478-
if err != None:
478+
if err is not None:
479479
return err
480480
return None

0 commit comments

Comments
 (0)