iotests/257: add Pattern class

Just kidding, this is easier to manage with a full class instead of a
namedtuple.

Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-id: 20190716000117.25219-2-jsnow@redhat.com
Signed-off-by: John Snow <jsnow@redhat.com>
This commit is contained in:
John Snow 2019-07-29 16:35:54 -04:00
parent 3f7b2fa8cd
commit b0a32bef7b
1 changed files with 32 additions and 26 deletions

View File

@ -19,7 +19,6 @@
# #
# owner=jsnow@redhat.com # owner=jsnow@redhat.com
from collections import namedtuple
import math import math
import os import os
@ -29,10 +28,18 @@ from iotests import log, qemu_img
SIZE = 64 * 1024 * 1024 SIZE = 64 * 1024 * 1024
GRANULARITY = 64 * 1024 GRANULARITY = 64 * 1024
Pattern = namedtuple('Pattern', ['byte', 'offset', 'size'])
def mkpattern(byte, offset, size=GRANULARITY): class Pattern:
"""Constructor for Pattern() with default size""" def __init__(self, byte, offset, size=GRANULARITY):
return Pattern(byte, offset, size) self.byte = byte
self.offset = offset
self.size = size
def bits(self, granularity):
lower = self.offset // granularity
upper = (self.offset + self.size - 1) // granularity
return set(range(lower, upper + 1))
class PatternGroup: class PatternGroup:
"""Grouping of Pattern objects. Initialize with an iterable of Patterns.""" """Grouping of Pattern objects. Initialize with an iterable of Patterns."""
@ -43,40 +50,39 @@ class PatternGroup:
"""Calculate the unique bits dirtied by this pattern grouping""" """Calculate the unique bits dirtied by this pattern grouping"""
res = set() res = set()
for pattern in self.patterns: for pattern in self.patterns:
lower = pattern.offset // granularity res |= pattern.bits(granularity)
upper = (pattern.offset + pattern.size - 1) // granularity
res = res | set(range(lower, upper + 1))
return res return res
GROUPS = [ GROUPS = [
PatternGroup([ PatternGroup([
# Batch 0: 4 clusters # Batch 0: 4 clusters
mkpattern('0x49', 0x0000000), Pattern('0x49', 0x0000000),
mkpattern('0x6c', 0x0100000), # 1M Pattern('0x6c', 0x0100000), # 1M
mkpattern('0x6f', 0x2000000), # 32M Pattern('0x6f', 0x2000000), # 32M
mkpattern('0x76', 0x3ff0000)]), # 64M - 64K Pattern('0x76', 0x3ff0000)]), # 64M - 64K
PatternGroup([ PatternGroup([
# Batch 1: 6 clusters (3 new) # Batch 1: 6 clusters (3 new)
mkpattern('0x65', 0x0000000), # Full overwrite Pattern('0x65', 0x0000000), # Full overwrite
mkpattern('0x77', 0x00f8000), # Partial-left (1M-32K) Pattern('0x77', 0x00f8000), # Partial-left (1M-32K)
mkpattern('0x72', 0x2008000), # Partial-right (32M+32K) Pattern('0x72', 0x2008000), # Partial-right (32M+32K)
mkpattern('0x69', 0x3fe0000)]), # Adjacent-left (64M - 128K) Pattern('0x69', 0x3fe0000)]), # Adjacent-left (64M - 128K)
PatternGroup([ PatternGroup([
# Batch 2: 7 clusters (3 new) # Batch 2: 7 clusters (3 new)
mkpattern('0x74', 0x0010000), # Adjacent-right Pattern('0x74', 0x0010000), # Adjacent-right
mkpattern('0x69', 0x00e8000), # Partial-left (1M-96K) Pattern('0x69', 0x00e8000), # Partial-left (1M-96K)
mkpattern('0x6e', 0x2018000), # Partial-right (32M+96K) Pattern('0x6e', 0x2018000), # Partial-right (32M+96K)
mkpattern('0x67', 0x3fe0000, Pattern('0x67', 0x3fe0000,
2*GRANULARITY)]), # Overwrite [(64M-128K)-64M) 2*GRANULARITY)]), # Overwrite [(64M-128K)-64M)
PatternGroup([ PatternGroup([
# Batch 3: 8 clusters (5 new) # Batch 3: 8 clusters (5 new)
# Carefully chosen such that nothing re-dirties the one cluster # Carefully chosen such that nothing re-dirties the one cluster
# that copies out successfully before failure in Group #1. # that copies out successfully before failure in Group #1.
mkpattern('0xaa', 0x0010000, Pattern('0xaa', 0x0010000,
3*GRANULARITY), # Overwrite and 2x Adjacent-right 3*GRANULARITY), # Overwrite and 2x Adjacent-right
mkpattern('0xbb', 0x00d8000), # Partial-left (1M-160K) Pattern('0xbb', 0x00d8000), # Partial-left (1M-160K)
mkpattern('0xcc', 0x2028000), # Partial-right (32M+160K) Pattern('0xcc', 0x2028000), # Partial-right (32M+160K)
mkpattern('0xdd', 0x3fc0000)]), # New; leaving a gap to the right Pattern('0xdd', 0x3fc0000)]), # New; leaving a gap to the right
] ]
class Drive: class Drive: