projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Be a little more clever in finding child options
[fio.git]
/
fio.h
diff --git
a/fio.h
b/fio.h
index eb36d1cfd01a2e06a2305c96d76b460ee18c2d40..5f813009f26f414d81a263af6858b9ef02fd467a 100644
(file)
--- a/
fio.h
+++ b/
fio.h
@@
-12,16
+12,12
@@
#include <unistd.h>
#include <string.h>
#include <getopt.h>
#include <unistd.h>
#include <string.h>
#include <getopt.h>
+#include <inttypes.h>
#include "compiler/compiler.h"
#include "list.h"
#include "fifo.h"
#include "rbtree.h"
#include "compiler/compiler.h"
#include "list.h"
#include "fifo.h"
#include "rbtree.h"
-#include "md5.h"
-#include "crc64.h"
-#include "crc32.h"
-#include "crc16.h"
-#include "crc7.h"
#include "arch/arch.h"
#include "os/os.h"
#include "mutex.h"
#include "arch/arch.h"
#include "os/os.h"
#include "mutex.h"
@@
-199,23
+195,42
@@
enum {
VERIFY_CRC32, /* crc32 sum data blocks */
VERIFY_CRC16, /* crc16 sum data blocks */
VERIFY_CRC7, /* crc7 sum data blocks */
VERIFY_CRC32, /* crc32 sum data blocks */
VERIFY_CRC16, /* crc16 sum data blocks */
VERIFY_CRC7, /* crc7 sum data blocks */
+ VERIFY_SHA256, /* sha256 sum data blocks */
+ VERIFY_SHA512, /* sha512 sum data blocks */
VERIFY_NULL, /* pretend to verify */
};
/*
VERIFY_NULL, /* pretend to verify */
};
/*
- * A header structure associated with each checksummed data block
+ * A header structure associated with each checksummed data block. It is
+ * followed by a checksum specific header that contains the verification
+ * data.
*/
struct verify_header {
unsigned int fio_magic;
unsigned int len;
unsigned int verify_type;
*/
struct verify_header {
unsigned int fio_magic;
unsigned int len;
unsigned int verify_type;
- union {
- char md5_digest[MD5_HASH_WORDS * 4];
- unsigned long long crc64;
- unsigned long crc32;
- unsigned short crc16;
- unsigned char crc7;
- };
+};
+
+struct vhdr_md5 {
+ uint32_t md5_digest[16];
+};
+struct vhdr_sha512 {
+ uint8_t sha512[128];
+};
+struct vhdr_sha256 {
+ uint8_t sha256[128];
+};
+struct vhdr_crc64 {
+ uint64_t crc64;
+};
+struct vhdr_crc32 {
+ uint32_t crc32;
+};
+struct vhdr_crc16 {
+ uint16_t crc16;
+};
+struct vhdr_crc7 {
+ uint8_t crc7;
};
struct group_run_stats {
};
struct group_run_stats {
@@
-397,6
+412,8
@@
struct thread_options {
unsigned int verifysort;
unsigned int verify_interval;
unsigned int verify_offset;
unsigned int verifysort;
unsigned int verify_interval;
unsigned int verify_offset;
+ unsigned int verify_pattern;
+ unsigned int verify_pattern_bytes;
unsigned int use_thread;
unsigned int unlink;
unsigned int do_disk_util;
unsigned int use_thread;
unsigned int unlink;
unsigned int do_disk_util;