X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Ftest_brw.c;h=27a56485dda92f2fa76704a509f5594dc9765013;hb=f3a8c0f936fc748f1e86931464b2876e7ba5bb58;hp=54126a0fbe44f336b9917dc09db76d249db6fde1;hpb=4ac711352b1f85a0d945308c961731ecf9fa8862;p=fs%2Flustre-release.git diff --git a/lustre/tests/test_brw.c b/lustre/tests/test_brw.c index 54126a0..27a5648 100644 --- a/lustre/tests/test_brw.c +++ b/lustre/tests/test_brw.c @@ -1,10 +1,41 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: +/* + * GPL HEADER START + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 only, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License version 2 for more details (a copy is included + * in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU General Public License + * version 2 along with this program; If not, see + * http://www.gnu.org/licenses/gpl-2.0.html + * + * GPL HEADER END + */ +/* + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + * + * Copyright (c) 2014, Intel Corporation. + */ +/* + * This file is part of Lustre, http://www.lustre.org/ + * Lustre is a trademark of Sun Microsystems, Inc. */ /* for O_DIRECT */ -#define _GNU_SOURCE +#ifndef _GNU_SOURCE +#define _GNU_SOURCE +#endif +#include #include #include #include @@ -14,27 +45,16 @@ #include #include #include - -#define CERROR(fmt, arg...) fprintf(stderr, fmt, ## arg) -#ifndef __u64 -#define __u64 long long -#define cpu_to_le64(v) (v) -#define le64_to_cpu(v) (v) -#endif - -#ifndef LPU64 -#define LPU64 "%Lu" -#define LPX64 "%#Lx" -#endif +#include #define READ 1 #define WRITE 2 -#define LPDS sizeof(__u64) -int block_debug_setup(void *addr, int len, __u64 off, __u64 id) +#define LPDS sizeof(uint64_t) +int block_debug_setup(void *addr, int len, uint64_t off, uint64_t id) { - off = cpu_to_le64(off); - id = cpu_to_le64(id); + off = htole64(off); + id = htole64(id); memcpy(addr, (char *)&off, LPDS); memcpy(addr + LPDS, (char *)&id, LPDS); @@ -45,33 +65,33 @@ int block_debug_setup(void *addr, int len, __u64 off, __u64 id) return 0; } -int block_debug_check(char *who, void *addr, int size, __u64 off, __u64 id) +int block_debug_check(char *who, void *addr, int size, uint64_t off, uint64_t id) { - __u64 ne_off; + uint64_t ne_off; int err = 0; - ne_off = le64_to_cpu(off); - id = le64_to_cpu(id); + ne_off = le64toh(off); + id = le64toh(id); if (memcmp(addr, (char *)&ne_off, LPDS)) { - CERROR("%s: for offset "LPU64" off: "LPX64" != "LPX64"\n", - who, off, *(__u64 *)addr, ne_off); + fprintf(stderr, "%s: for offset %"PRIu64" off: %"PRIx64" != %"PRIx64"\n", + who, off, *(uint64_t *)addr, ne_off); err = -EINVAL; } if (memcmp(addr + LPDS, (char *)&id, LPDS)) { - CERROR("%s: for offset "LPU64" id: "LPX64" != "LPX64"\n", - who, off, *(__u64 *)(addr + LPDS), id); + fprintf(stderr, "%s: for offset %"PRIu64" id: %"PRIx64" != %"PRIx64"\n", + who, off, *(uint64_t *)(addr + LPDS), id); err = -EINVAL; } addr += size - LPDS - LPDS; if (memcmp(addr, (char *)&ne_off, LPDS)) { - CERROR("%s: for offset "LPU64" end off: "LPX64" != "LPX64"\n", - who, off, *(__u64 *)addr, ne_off); + fprintf(stderr, "%s: for offset %"PRIu64" end off: %"PRIx64" != %"PRIx64"\n", + who, off, *(uint64_t *)addr, ne_off); err = -EINVAL; } if (memcmp(addr + LPDS, (char *)&id, LPDS)) { - CERROR("%s: for offset "LPU64" end id: "LPX64" != "LPX64"\n", - who, off, *(__u64 *)(addr + LPDS), id); + fprintf(stderr, "%s: for offset %"PRIu64" end id: %"PRIx64" != %"PRIx64"\n", + who, off, *(uint64_t *)(addr + LPDS), id); err = -EINVAL; } @@ -91,9 +111,9 @@ int main(int argc, char **argv) { int fd; char *buf; - long long count, last, offset; + long long count, last; long pg_vec, len; - long long objid; + uint64_t objid, offset; struct stat st; int flags = 0; int cmd = 0; @@ -118,13 +138,26 @@ int main(int argc, char **argv) flags = O_RDWR | O_CREAT; } if (strchr(argv[3], 'd')) { +#ifdef O_DIRECT flags |= O_DIRECT; +#else + fprintf(stderr, + "%s: O_DIRECT not supported in this build\n", + argv[0]); + exit(1); +#endif } if (!cmd) usage(argv[0]); } else { cmd = READ | WRITE; - flags = O_RDWR | O_CREAT | O_DIRECT; + flags = O_RDWR | O_CREAT; +#ifdef O_DIRECT + flags |= O_DIRECT; +#else + fprintf(stderr, "%s: warning: not setting O_DIRECT\n", + argv[0]); +#endif } if (argc >= 5) { @@ -149,8 +182,13 @@ int main(int argc, char **argv) objid = 3; } - printf("%s: %s on %s(objid "LPX64") for "LPU64"x%ld pages \n", - argv[0], flags & O_DIRECT ? "directio" : "i/o", + printf("%s: %s on %s(objid %"PRIx64") for %llux%ld pages \n", + argv[0], +#ifdef O_DIRECT + flags & O_DIRECT ? "directio" : "i/o", +#else + "i/o", +#endif argv[1], objid, count, pg_vec); fd = open(argv[1], flags | O_LARGEFILE); @@ -178,10 +216,10 @@ int main(int argc, char **argv) } for (offset = 0; offset < last && cmd & WRITE; offset += len) { - int i; + unsigned int i; for (i = 0; i < len; i += st.st_blksize) - block_debug_setup(buf + i, st.st_blksize, + block_debug_setup(buf + i, st.st_blksize, offset + i, objid); rc = write(fd, buf, len);