Commitecef16c

Sokolov Yura

committed

cfs: speedup a bit verificatoin.

not really much speedup, though.

1 parent3daaa06 commitecef16cCopy full SHA for ecef16c

File tree

+14

-3

lines changed

+14

-3

lines changed

Lines changed: 14 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1161,23 +1161,34 @@ static bool cfs_gc_file(char* map_path, GC_CALL_KIND background)`
`1161`	`1161`
`1162`	`1162`	`if (cfs_gc_verify_file)`
`1163`	`1163`	`{`
	`1164`	`+off_tsoff=-1;`
`1164`	`1165`	`fd=open(file_bck_path,O_RDONLY\|PG_BINARY,0);`
`1165`	`1166`	`Assert(fd >=0);`
`1166`	`1167`
`1167`	`1168`	`for (i=0;i<n_pages;i++)`
`1168`	`1169`	`{`
`1169`		`-inode_tinode=newMap->inodes[i];`
	`1170`	`+inodes[i]=&newMap->inodes[i];`
	`1171`	`+}`
	`1172`	`+qsort(inodes,n_pages,sizeof(inode_t*),cfs_cmp_page_offs);`
	`1173`	`+`
	`1174`	`+for (i=0;i<n_pages;i++)`
	`1175`	`+{`
	`1176`	`+inode_tinode=*inodes[i];`
`1170`	`1177`	`intsize=CFS_INODE_SIZE(inode);`
`1171`	`1178`	`if (size!=0&&size<BLCKSZ)`
`1172`	`1179`	`{`
`1173`	`1180`	`charblock[BLCKSZ];`
`1174`	`1181`	`chardecomressedBlock[BLCKSZ];`
`1175`	`1182`	`off_tresPG_USED_FOR_ASSERTS_ONLY;`
`1176`	`1183`	`boolrcPG_USED_FOR_ASSERTS_ONLY;`
`1177`		`-res=lseek(fd,CFS_INODE_OFFS(inode),SEEK_SET);`
`1178`		`-Assert(res== (off_t)CFS_INODE_OFFS(inode));`
	`1184`	`+if (soff!=CFS_INODE_OFFS(inode))`
	`1185`	`+{`
	`1186`	`+soff=lseek(fd,CFS_INODE_OFFS(inode),SEEK_SET);`
	`1187`	`+Assert(soff== (off_t)CFS_INODE_OFFS(inode));`
	`1188`	`+}`
`1179`	`1189`	`rc=cfs_read_file(fd,block,size);`
`1180`	`1190`	`Assert(rc);`
	`1191`	`+soff+=size;`
`1181`	`1192`	`cfs_decrypt(file_bck_path,block, (off_t)i*BLCKSZ,size);`
`1182`	`1193`	`res=cfs_decompress(decomressedBlock,BLCKSZ,block,size);`
`1183`	`1194`

Comments

(0)