Removed operation pattern size, which was a leftover from the time before patterns.

Author: agayev

sadc.test

@@ -7,26 +7,26 @@
 ################################################################################
 
 # Before any writes, reads should go to unmapped.
-r _ 0 1,r _ 1 1,r _ 2 1,r _ 3 1,r _ 4 1,r _ 5 1,r _ 6 1,r _ 7 1,r _ 8 1,r _ 9 1,r _ 10 1,r _ 11 1:r 0 1,r 1 1,r 2 1,r 3 1,r 4 1,r 5 1,r 6 1,r 7 1,r 8 1,r 9 1,r 10 1,r 11 1
+r _ 0,r _ 1,r _ 2,r _ 3,r _ 4,r _ 5,r _ 6,r _ 7,r _ 8,r _ 9,r _ 10,r _ 11:r 0 1,r 1 1,r 2 1,r 3 1,r 4 1,r 5 1,r 6 1,r 7 1,r 8 1,r 9 1,r 10 1,r 11 1
 
 # Read all of blocks in a single read operation.
-r ____________ 0 12:r 0 12
+r ____________ 0:r 0 12
 
 # Write as much as possible without causing GC, one block at a time.  Also
 # verify the contents.
-w a 0 1,w b 1 1,w c 2 1,w d 3 1,w e 4 1,w f 5 1,r a 0 1,r b 1 1,r c 2 1,r d 3 1,r e 4 1,r f 5 1:w 12 1,w 13 1,w 14 1,w 15 1,w 16 1,w 17 1,r 12 1,r 13 1,r 14 1,r 15 1,r 16 1,r 17 1
+w a 0,w b 1,w c 2,w d 3,w e 4,w f 5,r a 0,r b 1,r c 2,r d 3,r e 4,r f 5:w 12 1,w 13 1,w 14 1,w 15 1,w 16 1,w 17 1,r 12 1,r 13 1,r 14 1,r 15 1,r 16 1,r 17 1
 
 # Write as much as possible without causing GC, in as big chunks as possible.
 # Also verify the contents.
-w aaa 0 3,w bbb 3 3,r aaa 0 3,r bbb 3 3:w 12 3,w 15 3,r 12 3,r 15 3
+w aaa 0,w bbb 3,r aaa 0,r bbb 3:w 12 3,w 15 3,r 12 3,r 15 3
 
 # Write as much as possible without causing GC, one block at a time, for
 # non-contiguous bands.  Also verify the contents.
-w a 3 1,w b 4 1,w c 5 1,w d 6 1,w e 7 1,w f 8 1,r a 3 1,r b 4 1,r c 5 1,r d 6 1,r e 7 1,r f 8 1:w 15 1,w 16 1,w 17 1,w 12 1,w 13 1,w 14 1,r 15 1,r 16 1,r 17 1,r 12 1,r 13 1,r 14 1
+w a 3,w b 4,w c 5,w d 6,w e 7,w f 8,r a 3,r b 4,r c 5,r d 6,r e 7,r f 8:w 15 1,w 16 1,w 17 1,w 12 1,w 13 1,w 14 1,r 15 1,r 16 1,r 17 1,r 12 1,r 13 1,r 14 1
 
 # # Write as much as possible without causing GC, in as big chunks as possible,
 # # for non-contiguous bands.  Also verify the contents.
-w aaa 3 3,w bbb 6 3,r aaa 3 3,r bbb 6 3:w 15 3,w 12 3,r 15 3,r 12 3
+w aaa 3,w bbb 6,r aaa 3,r bbb 6:w 15 3,w 12 3,r 15 3,r 12 3
 
 ################################################################################
 #
@@ -37,60 +37,60 @@ w aaa 3 3,w bbb 6 3,r aaa 3 3,r bbb 6 3:w 15 3,w 12 3,r 15 3,r 12 3
 ################################################################################
 
 # Write to the beginning of the band and read all of the band, one block.
-w a 0 1,r a__ 0 3:w 12 1,r 12 1,r 1 2
+w a 0,r a__ 0:w 12 1,r 12 1,r 1 2
 
 # Write to the beginning of the band and read all of the band, two blocks.
-w ab 0 2,r ab_ 0 3:w 12 2,r 12 2,r 2 1
+w ab 0,r ab_ 0:w 12 2,r 12 2,r 2 1
 
 # Write to the end of the band and read all of the band, one block.
-w a 2 1,r __a 0 3:w 12 1,r 0 2,r 12 1
+w a 2,r __a 0:w 12 1,r 0 2,r 12 1
 
 # Write to the end of the band and read all of the band, two blocks.
-w ab 1 2,r _ab 0 3:w 12 2,r 0 1,r 12 2
+w ab 1,r _ab 0:w 12 2,r 0 1,r 12 2
 
 # Write a single block to the middle of the band and read all of the band.
-w a 1 1,r _a_ 0 3:w 12 1,r 0 1,r 12 1,r 2 1
+w a 1,r _a_ 0:w 12 1,r 0 1,r 12 1,r 2 1
 
 # Write to the beginning of every band and read all disk.
-w a 0 1,w b 3 1,w c 6 1,w d 9 1,r a__b__c__d__ 0 12:w 12 1,w 15 1,w 13 1,w 16 1,r 12 1,r 1 2,r 15 1,r 4 2,r 13 1,r 7 2,r 16 1,r 10 2
+w a 0,w b 3,w c 6,w d 9,r a__b__c__d__ 0:w 12 1,w 15 1,w 13 1,w 16 1,r 12 1,r 1 2,r 15 1,r 4 2,r 13 1,r 7 2,r 16 1,r 10 2
 
 # Write to the middle of every band and read all disk.
-w a 1 1,w b 4 1,w c 7 1,w d 10 1,r _a__b__c__d_ 0 12:w 12 1,w 15 1,w 13 1,w 16 1,r 0 1,r 12 1,r 2 2,r 15 1,r 5 2,r 13 1,r 8 2,r 16 1,r 11 1
+w a 1,w b 4,w c 7,w d 10,r _a__b__c__d_ 0:w 12 1,w 15 1,w 13 1,w 16 1,r 0 1,r 12 1,r 2 2,r 15 1,r 5 2,r 13 1,r 8 2,r 16 1,r 11 1
 
 # Write to the end of every band and read all disk.
-w a 2 1,w b 5 1,w c 8 1,w d 11 1,r __a__b__c__d 0 12:w 12 1,w 15 1,w 13 1,w 16 1,r 0 2,r 12 1,r 3 2,r 15 1,r 6 2,r 13 1,r 9 2,r 16 1
+w a 2,w b 5,w c 8,w d 11,r __a__b__c__d 0:w 12 1,w 15 1,w 13 1,w 16 1,r 0 2,r 12 1,r 3 2,r 15 1,r 6 2,r 13 1,r 9 2,r 16 1
 
 # Write from left to right diagonal to first 3 bands, read all disk.
-w a 0 1,w b 4 1,w c 8 1,r a___b___c___ 0 12:w 12 1,w 15 1,w 13 1,r 12 1,r 1 3,r 15 1,r 5 3,r 13 1,r 9 3
+w a 0,w b 4,w c 8,r a___b___c___ 0:w 12 1,w 15 1,w 13 1,r 12 1,r 1 3,r 15 1,r 5 3,r 13 1,r 9 3
 
 # Write from left to right diagonal to second 3 bands, read all disk.
-w a 3 1,w b 7 1,w c 11 1,r ___a___b___c 0 12:w 15 1,w 12 1,w 16 1,r 0 3,r 15 1,r 4 3,r 12 1,r 8 3,r 16 1
+w a 3,w b 7,w c 11,r ___a___b___c 0:w 15 1,w 12 1,w 16 1,r 0 3,r 15 1,r 4 3,r 12 1,r 8 3,r 16 1
 
 # Write from right to left diagonal to first 3 bands, read all disk.
-w a 2 1,w b 4 1,w c 6 1,r __a_b_c_____ 0 12:w 12 1,w 15 1,w 13 1,r 0 2,r 12 1,r 3 1,r 15 1,r 5 1,r 13 1,r 7 5
+w a 2,w b 4,w c 6,r __a_b_c_____ 0:w 12 1,w 15 1,w 13 1,r 0 2,r 12 1,r 3 1,r 15 1,r 5 1,r 13 1,r 7 5
 
 # Write from right to left diagonal to second 3 bands, read all disk.
-w a 5 1,w b 7 1,w c 9 1,r _____a_b_c__ 0 12:w 15 1,w 12 1,w 16 1,r 0 5,r 15 1,r 6 1,r 12 1,r 8 1,r 16 1,r 10 2
+w a 5,w b 7,w c 9,r _____a_b_c__ 0:w 15 1,w 12 1,w 16 1,r 0 5,r 15 1,r 6 1,r 12 1,r 8 1,r 16 1,r 10 2
 
 # Fill every band in isolation and read all disk.
-w abc 0 3,r abc_________ 0 12:w 12 3,r 12 3,r 3 9
-w abc 3 3,r ___abc______ 0 12:w 15 3,r 0 3,r 15 3,r 6 6
-w abc 6 3,r ______abc___ 0 12:w 12 3,r 0 6,r 12 3,r 9 3
-w abc 9 3,r _________abc 0 12:w 15 3,r 0 9,r 15 3
+w abc 0,r abc_________ 0:w 12 3,r 12 3,r 3 9
+w abc 3,r ___abc______ 0:w 15 3,r 0 3,r 15 3,r 6 6
+w abc 6,r ______abc___ 0:w 12 3,r 0 6,r 12 3,r 9 3
+w abc 9,r _________abc 0:w 15 3,r 0 9,r 15 3
 
 # Fill every two bands without causing GC and read all disk.
-w abc 0 3,w def 3 3,r abcdef______ 0 12:w 12 3,w 15 3,r 12 6,r 6 6
-w def 3 3,w abc 0 3,r abcdef______ 0 12:w 15 3,w 12 3,r 12 6,r 6 6
-w abc 0 3,w def 9 3,r abc______def 0 12:w 12 3,w 15 3,r 12 3,r 3 6,r 15 3
-w def 9 3,w abc 0 3,r abc______def 0 12:w 15 3,w 12 3,r 12 3,r 3 6,r 15 3
-w abc 3 3,w def 6 3,r ___abcdef___ 0 12:w 15 3,w 12 3,r 0 3,r 15 3,r 12 3,r 9 3
-w def 6 3,w abc 3 3,r ___abcdef___ 0 12:w 12 3,w 15 3,r 0 3,r 15 3,r 12 3,r 9 3
-w abc 6 3,w def 9 3,r ______abcdef 0 12:w 12 3,w 15 3,r 0 6,r 12 6
-w def 9 3,w abc 6 3,r ______abcdef 0 12:w 15 3,w 12 3,r 0 6,r 12 6
+w abc 0,w def 3,r abcdef______ 0:w 12 3,w 15 3,r 12 6,r 6 6
+w def 3,w abc 0,r abcdef______ 0:w 15 3,w 12 3,r 12 6,r 6 6
+w abc 0,w def 9,r abc______def 0:w 12 3,w 15 3,r 12 3,r 3 6,r 15 3
+w def 9,w abc 0,r abc______def 0:w 15 3,w 12 3,r 12 3,r 3 6,r 15 3
+w abc 3,w def 6,r ___abcdef___ 0:w 15 3,w 12 3,r 0 3,r 15 3,r 12 3,r 9 3
+w def 6,w abc 3,r ___abcdef___ 0:w 12 3,w 15 3,r 0 3,r 15 3,r 12 3,r 9 3
+w abc 6,w def 9,r ______abcdef 0:w 12 3,w 15 3,r 0 6,r 12 6
+w def 9,w abc 6,r ______abcdef 0:w 15 3,w 12 3,r 0 6,r 12 6
 
 # Write cross-band, read back.
-w abc 1 3,r abc 1 3:w 12 2,w 15 1,r 12 2,r 15 1
-w abc 2 3,r abc 2 3:w 12 1,w 15 2,r 12 1,r 15 2
+w abc 1,r abc 1:w 12 2,w 15 1,r 12 2,r 15 1
+w abc 2,r abc 2:w 12 1,w 15 2,r 12 1,r 15 2
 
 ################################################################################
 #
@@ -101,21 +101,21 @@ w abc 2 3,r abc 2 3:w 12 1,w 15 2,r 12 1,r 15 2
 
 # Simplest GC test.  Fill each band one block at a time and do another block
 # write at the first block of the band.
-w a 0 1,w b 1 1,w c 2 1,w d 0 1,r dbc_ 0 4:w 12 1,w 13 1,w 14 1,r 0 1,r 1 1,r 2 1,r 12 1,r 13 1,r 14 1,w 0 1,w 1 1,w 2 1,w 12 1,r 12 1,r 1 3
-w a 3 1,w b 4 1,w c 5 1,w d 3 1,r ___dbc_ 0 7:w 15 1,w 16 1,w 17 1,r 3 1,r 4 1,r 5 1,r 15 1,r 16 1,r 17 1,w 3 1,w 4 1,w 5 1,w 15 1,r 0 3,r 15 1,r 4 3
-w a 6 1,w b 7 1,w c 8 1,w d 6 1,r ______dbc_ 0 10:w 12 1,w 13 1,w 14 1,r 6 1,r 7 1,r 8 1,r 12 1,r 13 1,r 14 1,w 6 1,w 7 1,w 8 1,w 12 1,r 0 6,r 12 1,r 7 3
-w a 9 1,w b 10 1,w c 11 1,w d 9 1,r _________dbc 0 12:w 15 1,w 16 1,w 17 1,r 9 1,r 10 1,r 11 1,r 15 1,r 16 1,r 17 1,w 9 1,w 10 1,w 11 1,w 15 1,r 0 9,r 15 1,r 10 2
+w a 0,w b 1,w c 2,w d 0,r dbc_ 0:w 12 1,w 13 1,w 14 1,r 0 1,r 1 1,r 2 1,r 12 1,r 13 1,r 14 1,w 0 1,w 1 1,w 2 1,w 12 1,r 12 1,r 1 3
+w a 3,w b 4,w c 5,w d 3,r ___dbc_ 0:w 15 1,w 16 1,w 17 1,r 3 1,r 4 1,r 5 1,r 15 1,r 16 1,r 17 1,w 3 1,w 4 1,w 5 1,w 15 1,r 0 3,r 15 1,r 4 3
+w a 6,w b 7,w c 8,w d 6,r ______dbc_ 0:w 12 1,w 13 1,w 14 1,r 6 1,r 7 1,r 8 1,r 12 1,r 13 1,r 14 1,w 6 1,w 7 1,w 8 1,w 12 1,r 0 6,r 12 1,r 7 3
+w a 9,w b 10,w c 11,w d 9,r _________dbc 0:w 15 1,w 16 1,w 17 1,r 9 1,r 10 1,r 11 1,r 15 1,r 16 1,r 17 1,w 9 1,w 10 1,w 11 1,w 15 1,r 0 9,r 15 1,r 10 2
 
 # Same as above, but fill the band at once.
-w abc 0 3,w d 0 1,r dbc_ 0 4:w 12 3,r 0 1,r 1 1,r 2 1,r 12 1,r 13 1,r 14 1,w 0 1,w 1 1,w 2 1,w 12 1,r 12 1,r 1 3
-w abc 3 3,w d 3 1,r ___dbc_ 0 7:w 15 3,r 3 1,r 4 1,r 5 1,r 15 1,r 16 1,r 17 1,w 3 1,w 4 1,w 5 1,w 15 1,r 0 3,r 15 1,r 4 3
-w abc 6 3,w d 6 1,r ______dbc_ 0 10:w 12 3,r 6 1,r 7 1,r 8 1,r 12 1,r 13 1,r 14 1,w 6 1,w 7 1,w 8 1,w 12 1,r 0 6,r 12 1,r 7 3
-w abc 9 3,w d 9 1,r _________dbc 0 12:w 15 3,r 9 1,r 10 1,r 11 1,r 15 1,r 16 1,r 17 1,w 9 1,w 10 1,w 11 1,w 15 1,r 0 9,r 15 1,r 10 2
+w abc 0,w d 0,r dbc_ 0:w 12 3,r 0 1,r 1 1,r 2 1,r 12 1,r 13 1,r 14 1,w 0 1,w 1 1,w 2 1,w 12 1,r 12 1,r 1 3
+w abc 3,w d 3,r ___dbc_ 0:w 15 3,r 3 1,r 4 1,r 5 1,r 15 1,r 16 1,r 17 1,w 3 1,w 4 1,w 5 1,w 15 1,r 0 3,r 15 1,r 4 3
+w abc 6,w d 6,r ______dbc_ 0:w 12 3,r 6 1,r 7 1,r 8 1,r 12 1,r 13 1,r 14 1,w 6 1,w 7 1,w 8 1,w 12 1,r 0 6,r 12 1,r 7 3
+w abc 9,w d 9,r _________dbc 0:w 15 3,r 9 1,r 10 1,r 11 1,r 15 1,r 16 1,r 17 1,w 9 1,w 10 1,w 11 1,w 15 1,r 0 9,r 15 1,r 10 2
 
 # Fill each band at once, then write to another band that shares the cache band
 # and read all disk.
-w abc 0 3,w d 6 1,r abc___d_ 0 8:w 12 3,r 0 1,r 1 1,r 2 1,r 12 1,r 13 1,r 14 1,w 0 1,w 1 1,w 2 1,w 12 1,r 0 6,r 12 1,r 7 1
-w abc 3 3,w d 9 1,r ___abc___d__ 0 12:w 15 3,r 3 1,r 4 1,r 5 1,r 15 1,r 16 1,r 17 1,w 3 1,w 4 1,w 5 1,w 15 1,r 0 9,r 15 1,r 10 2
+w abc 0,w d 6,r abc___d_ 0:w 12 3,r 0 1,r 1 1,r 2 1,r 12 1,r 13 1,r 14 1,w 0 1,w 1 1,w 2 1,w 12 1,r 0 6,r 12 1,r 7 1
+w abc 3,w d 9,r ___abc___d__ 0:w 15 3,r 3 1,r 4 1,r 5 1,r 15 1,r 16 1,r 17 1,w 3 1,w 4 1,w 5 1,w 15 1,r 0 9,r 15 1,r 10 2
 
 ################################################################################
 #
@@ -126,9 +126,9 @@ w abc 3 3,w d 9 1,r ___abc___d__ 0 12:w 15 3,r 3 1,r 4 1,r 5 1,r 15 1,r 16 1,r 1
 
 # Write enough to two bands sharing the cache band to cause GC and then read the
 # whole disk.
-w b 8 1,w a 1 1,w c 6 1,w x 0 1,r xa____c_b___ 0 12:w 12 1,w 13 1,w 14 1,r 0 1,r 1 1,r 2 1,r 13 1,w 0 1,w 1 1,w 2 1,r 6 1,r 7 1,r 8 1,r 14 1,r 12 1,w 6 1,w 7 1,w 8 1,w 12 1,r 12 1,r 1 11
-w x 10 1,w ab 3 2,w z 9 1,r ___ab____zx_ 0 12:w 15 1,w 16 2,r 3 1,r 4 1,r 5 1,r 16 1,r 17 1,w 3 1,w 4 1,w 5 1,r 9 1,r 10 1,r 11 1,r 15 1,w 9 1,w 10 1,w 11 1,w 15 1,r 0 9,r 15 1,r 10 2
+w b 8,w a 1,w c 6,w x 0,r xa____c_b___ 0:w 12 1,w 13 1,w 14 1,r 0 1,r 1 1,r 2 1,r 13 1,w 0 1,w 1 1,w 2 1,r 6 1,r 7 1,r 8 1,r 14 1,r 12 1,w 6 1,w 7 1,w 8 1,w 12 1,r 12 1,r 1 11
+w x 10,w ab 3,w z 9,r ___ab____zx_ 0:w 15 1,w 16 2,r 3 1,r 4 1,r 5 1,r 16 1,r 17 1,w 3 1,w 4 1,w 5 1,r 9 1,r 10 1,r 11 1,r 15 1,w 9 1,w 10 1,w 11 1,w 15 1,r 0 9,r 15 1,r 10 2
 
 # Write to two bands sharing the cache band, then do another band-crossing write
 # that will cause RMW of two bands and a write to another band.
-w a 4 1,w dx 9 2,w fo 5 2,r ____afo__dx_ 0 12:w 15 1,w 16 2,r 3 1,r 4 1,r 5 1,r 15 1,w 3 1,w 4 1,w 5 1,r 9 1,r 10 1,r 11 1,r 16 1,r 17 1,w 9 1,w 10 1,w 11 1,w 15 1,w 12 1,r 0 5,r 15 1,r 12 1,r 7 5
+w a 4,w dx 9,w fo 5,r ____afo__dx_ 0:w 15 1,w 16 2,r 3 1,r 4 1,r 5 1,r 15 1,w 3 1,w 4 1,w 5 1,r 9 1,r 10 1,r 11 1,r 16 1,r 17 1,w 9 1,w 10 1,w 11 1,w 15 1,w 12 1,r 0 5,r 15 1,r 12 1,r 7 5

test.go

@@ -123,7 +123,8 @@ func tearDown() {
 }
 
 // Allocates aligned blocks for direct I/O.
-func alignedBlocks(count int, pattern string) []byte {
+func alignedBlocks(pattern string) []byte {
+	count := len(pattern)
 	b := make([]byte, pageSize+blockSize*count)
 	a := int(uintptr(unsafe.Pointer(&b[0])) & (pageSize - 1))
 
@@ -141,9 +142,10 @@ func alignedBlocks(count int, pattern string) []byte {
 	return b
 }
 
-// Writes |count| number of blocks filled with |c|, starting at |blockNo|.
-func writeBlocks(f *os.File, blockNo, count int, pattern string) string {
-	b := alignedBlocks(count, pattern)
+// Writes |len(pattern)| number of blocks filled with |pattern[i]|, starting at
+// |blockNo|.
+func writeBlocks(f *os.File, blockNo int, pattern string) string {
+	b := alignedBlocks(pattern)
 
 	offset := int64(blockNo * blockSize)
 	if _, err := f.WriteAt(b, offset); err != nil {
@@ -152,10 +154,11 @@ func writeBlocks(f *os.File, blockNo, count int, pattern string) string {
 	return ""
 }
 
-// Reads |count| number of blocks starting at |blockNo| and verifies that the
-// read blocks' contents match the |pattern|.
-func readBlocks(f *os.File, blockNo, count int, pattern string) string {
-	b := alignedBlocks(count, strings.Repeat("!", count))
+// Reads |len(pattern)| number of blocks starting at |blockNo| and verifies that
+// the read blocks' contents match the |pattern|.
+func readBlocks(f *os.File, blockNo int, pattern string) string {
+	count := len(pattern)
+	b := alignedBlocks(strings.Repeat("!", count))
 
 	offset := int64(blockNo * blockSize)
 	if _, err := f.ReadAt(b, offset); err != nil {
@@ -196,7 +199,7 @@ func doResetDisk() {
 	}
 	defer f.Close()
 
-	b := alignedBlocks(1, "\x00")
+	b := alignedBlocks("\x00")
 	for i := 0; i < diskSize/blockSize; i++ {
 		if _, err := f.Write(b); err != nil {
 			panicf("Failed to write to %s: %v", blockDevice, err)
@@ -206,7 +209,7 @@ func doResetDisk() {
 
 // Verifies syntax of the tests.
 func verify(tests []string) {
-	var userCmdRegexp = regexp.MustCompile(`^[wr]\s[a-z_]+\s\d+\s\d+$`)
+	var userCmdRegexp = regexp.MustCompile(`^[wr]\s[a-z_]+\s\d+$`)
 	var btEventRegexp = regexp.MustCompile(`^[wr]\s\d+\s\d+$`)
 
 	fmt.Println("Verifying syntax of tests...")
@@ -218,11 +221,6 @@ func verify(tests []string) {
 			if !userCmdRegexp.MatchString(c) {
 				panicf("Bad user command %d: %s", i, c)
 			}
-			f := strings.Fields(c)
-			n, _ := strconv.Atoi(f[3])
-			if len(f[1]) != n {
-				panicf("Bad user command %d: %s", i, c)
-			}
 		}
 		for _, e := range strings.Split(btEvents, ",") {
 			if !btEventRegexp.MatchString(e) {
@@ -237,13 +235,12 @@ func doUserCmd(f *os.File, cmd string) string {
 	fs := strings.Fields(cmd)
 	operation, pattern := fs[0], fs[1]
 	offset, _ := strconv.Atoi(fs[2])
-	count, _ := strconv.Atoi(fs[3])
 
 	var s string
 	if operation == "w" {
-		s = writeBlocks(f, offset, count, pattern)
+		s = writeBlocks(f, offset, pattern)
 	} else {
-		s = readBlocks(f, offset, count, pattern)
+		s = readBlocks(f, offset, pattern)
 	}
 	if s != "" {
 		s += " [" + cmd + "]"