X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2Fllverfs.c;h=a32954fb58b8a3ffc020de1ba869180dbc8564ce;hb=5c4f99955fff2044e155269faaeec5db916d51e8;hp=8200826bc2c109d8286f75b43f490455b0a3e693;hpb=1ba7eb520d6f50908985b45cb1aecad83bdf9c63;p=fs%2Flustre-release.git diff --git a/lustre/utils/llverfs.c b/lustre/utils/llverfs.c index 8200826..a32954f 100644 --- a/lustre/utils/llverfs.c +++ b/lustre/utils/llverfs.c @@ -15,11 +15,7 @@ * * You should have received a copy of the GNU General Public License * version 2 along with this program; If not, see - * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * http://www.gnu.org/licenses/gpl-2.0.html * * GPL HEADER END */ @@ -27,7 +23,7 @@ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2011, Whamcloud, Inc. + * Copyright (c) 2011, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -96,6 +92,31 @@ #ifdef HAVE_EXT2FS_EXT2FS_H # include # include +#else +# ifndef EXT2_TOPDIR_FL +# define EXT2_TOPDIR_FL 0x00020000 /* Top of directory tree */ +# endif +static int fsetflags(const char *path, unsigned int flag) +{ + char cmd[PATH_MAX + 128]; + int rc; + + if (flag != EXT2_TOPDIR_FL) { + rc = EOPNOTSUPP; + goto out; + } + + snprintf(cmd, sizeof(cmd), "chattr +T %s", path); + + rc = system(cmd); + if (rc > 0) { + rc = WEXITSTATUS(rc); +out: + errno = rc; + } + + return rc; +} #endif #define ONE_MB (1024 * 1024) @@ -124,22 +145,20 @@ const int dirmode = S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH; static int isatty_flag; static int perms = S_IRWXU | S_IRGRP | S_IROTH; -static struct option const longopts[] = -{ - { "chunksize", required_argument, 0, 'c' }, - { "help", no_argument, 0, 'h' }, - { "offset", required_argument, 0, 'o' }, - { "long", no_argument, 0, 'l' }, - { "full", no_argument, 0, 'l' }, - { "partial", required_argument, 0, 'p' }, - { "quiet", required_argument, 0, 'q' }, - { "read", no_argument, 0, 'r' }, - { "filesize", no_argument, 0, 's' }, - { "timestamp", required_argument, 0, 't' }, - { "verbose", no_argument, 0, 'v' }, - { "write", no_argument, 0, 'w' }, - { 0, 0, 0, 0} -}; +static struct option const long_opts[] = { + { .val = 'c', .name = "chunksize", .has_arg = required_argument }, + { .val = 'h', .name = "help", .has_arg = no_argument }, + { .val = 'l', .name = "long", .has_arg = no_argument }, + { .val = 'l', .name = "full", .has_arg = no_argument }, + { .val = 'o', .name = "offset", .has_arg = required_argument }, + { .val = 'p', .name = "partial", .has_arg = required_argument }, + { .val = 'q', .name = "quiet", .has_arg = required_argument }, + { .val = 'r', .name = "read", .has_arg = no_argument }, + { .val = 's', .name = "filesize", .has_arg = no_argument }, + { .val = 't', .name = "timestamp", .has_arg = required_argument }, + { .val = 'v', .name = "verbose", .has_arg = no_argument }, + { .val = 'w', .name = "write", .has_arg = no_argument }, + { .name = NULL } }; /* * Usages: displays help information, whenever user supply --help option in @@ -288,8 +307,8 @@ int write_chunks(int fd, unsigned long long offset,unsigned long long write_end, offset += stride) { int ret; - if (lseek64(fd, offset, SEEK_SET) == -1) { - fprintf(stderr, "\n%s: lseek64(%s+%llu) failed: %s\n", + if (stride != chunksize && lseek64(fd, offset, SEEK_SET) < 0) { + fprintf(stderr, "\n%s: lseek66(%s+%llu) failed: %s\n", progname, file, offset, strerror(errno)); return -errno; } @@ -328,7 +347,7 @@ int read_chunks(int fd, unsigned long long offset, unsigned long long read_end, offset += stride) { ssize_t nread; - if (lseek64(fd, offset, SEEK_SET) == -1) { + if (stride != chunksize && lseek64(fd, offset, SEEK_SET) < 0) { fprintf(stderr, "\n%s: lseek64(%s+%llu) failed: %s\n", progname, file, offset, strerror(errno)); return 1; @@ -396,7 +415,7 @@ int read_chunks(int fd, unsigned long long offset, unsigned long long read_end, */ char *new_file(char *tempfile, char *cur_dir, int file_num) { - sprintf(tempfile, "%s/file%03d", cur_dir, file_num); + snprintf(tempfile, PATH_MAX, "%s/file%03d", cur_dir, file_num); return tempfile; } @@ -405,7 +424,7 @@ char *new_file(char *tempfile, char *cur_dir, int file_num) */ char *new_dir(char *tempdir, int dir_num) { - sprintf(tempdir, "%s/dir%05d", testdir, dir_num); + snprintf(tempdir, PATH_MAX, "%s/llverfs_dir%05d", testdir, dir_num); return tempdir; } @@ -457,12 +476,9 @@ void show_rate(char *op, char *filename, const struct timeval *start_time, static char last_op; struct timeval curr_time; double curr_delta, overall_delta, curr_rate, overall_rate; - double total_time, remain_time; + double remain_time; int remain_hours, remain_minutes, remain_seconds; - if (last_time.tv_sec == 0) - last_time = *start_time; - if (last_op != op[0]) { last_bytes = 0; last_time = *start_time; @@ -484,8 +500,7 @@ void show_rate(char *op, char *filename, const struct timeval *start_time, last_time = curr_time; return; } - total_time = total_bytes / curr_rate; - remain_time = total_time - overall_delta; + remain_time = (total_bytes - curr_bytes) / curr_rate; remain_hours = remain_time / 3600; remain_minutes = (remain_time - remain_hours * 3600) / 60; @@ -496,8 +511,8 @@ void show_rate(char *op, char *filename, const struct timeval *start_time, if (isatty_flag) printf("\r"); - printf("%s filename: %s, current %5g MB/s, overall %5g MB/s, " - "est %u:%u:%u left", op, filename, + printf("%s: %s, current: %5g MB/s, overall: %5g MB/s, " + "ETA: %u:%02u:%02u", op, filename, curr_rate / ONE_MB, overall_rate / ONE_MB, remain_hours, remain_minutes, remain_seconds); @@ -505,10 +520,10 @@ void show_rate(char *op, char *filename, const struct timeval *start_time, fflush(stdout); else printf("\n"); - } - last_time = curr_time; - last_bytes = curr_bytes; + last_time = curr_time; + last_bytes = curr_bytes; + } } /* @@ -529,12 +544,11 @@ static int dir_write(char *chunk_buf, size_t chunksize, unsigned long long curr_bytes = 0; int rc = 0; -#ifdef HAVE_EXT2FS_EXT2FS_H if (!full && fsetflags(testdir, EXT2_TOPDIR_FL)) fprintf(stderr, "\n%s: can't set TOPDIR_FL on %s: %s (ignoring)", progname, testdir, strerror(errno)); -#endif + countfile = fopen(filecount, "w"); if (countfile == NULL) { fprintf(stderr, "\n%s: creating %s failed :%s\n", @@ -567,9 +581,6 @@ static int dir_write(char *chunk_buf, size_t chunksize, int fd, ret; if (file_num >= files_in_dir) { - if (dir_num == num_dirs - 1) - break; - file_num = 0; if (mkdir(new_dir(tempdir, dir_num), dirmode) < 0) { if (errno == ENOSPC) @@ -625,13 +636,10 @@ static int dir_write(char *chunk_buf, size_t chunksize, } } - if (verbose) { - verbose++; - show_rate("write", tempfile, &start_time, - total_bytes, curr_bytes); - printf("\nwrite complete\n"); - verbose--; - } + verbose += 2; + show_rate("write_done", tempfile, &start_time, total_bytes, curr_bytes); + printf("\n"); + verbose -= 2; out: fclose(countfile); @@ -672,9 +680,6 @@ static int dir_read(char *chunk_buf, size_t chunksize, int fd, ret; if (file_num == 0) { - if (dir_num == num_dirs - 1) - break; - new_dir(tempdir, dir_num); dir_num++; } @@ -710,13 +715,11 @@ static int dir_read(char *chunk_buf, size_t chunksize, if (++file_num >= files_in_dir) file_num = 0; } - if (verbose > 1){ - verbose++; - show_rate("read", tempfile, &start_time, - total_bytes, curr_bytes); - printf("\nread complete\n"); - verbose--; - } + verbose += 2; + show_rate("read_done", tempfile, &start_time, total_bytes, curr_bytes); + printf("\n"); + verbose -= 2; + return 0; } @@ -732,7 +735,7 @@ int main(int argc, char **argv) progname = strrchr(argv[0], '/') ? strrchr(argv[0], '/') + 1 : argv[0]; while ((c = getopt_long(argc, argv, "c:hlo:pqrs:t:vw", - longopts, NULL)) != -1) { + long_opts, NULL)) != -1) { switch (c) { case 'c': chunksize = strtoul(optarg, NULL, 0) * ONE_MB; @@ -806,9 +809,9 @@ int main(int argc, char **argv) FILE *fp = NULL; ext2_filsys fs; - if ((fp = setmntent("/etc/mtab", "r")) == NULL){ - fprintf(stderr, "%s: fail to open /etc/mtab in read" - "mode :%s\n", progname, strerror(errno)); + if ((fp = setmntent("/etc/mtab", "r")) == NULL) { + fprintf(stderr, "%s: fail to open /etc/mtab in read mode :%s\n", + progname, strerror(errno)); goto guess; } @@ -849,9 +852,19 @@ int main(int argc, char **argv) if (0) { /* ugh */ struct statfs64 statbuf; guess: + /* + * Most extN filesystems are formatted with 128MB/group + * (32k bitmap = 4KB blocksize * 8 bits/block) * 4KB, + * so this is a relatively safe default (somewhat more + * or less doesn't make a huge difference for testing). + * + * We want to create one directory per group, together + * with the "TOPDIR" feature, so that the directories + * are spread across the whole block device. + */ if (statfs64(testdir, &statbuf) == 0) { - num_dirs = (long long)statbuf.f_blocks * - statbuf.f_bsize / (128ULL << 20); + num_dirs = 1 + (long long)statbuf.f_blocks * + statbuf.f_bsize / (128ULL * ONE_MB); if (verbose) printf("dirs: %u, fs blocks: %llu\n", num_dirs, @@ -869,7 +882,8 @@ guess: fprintf(stderr, "Memory allocation failed for chunk_buf\n"); return 4; } - sprintf(filecount, "%s/%s.filecount", testdir, progname); + snprintf(filecount, sizeof(filecount), "%s/%s.filecount", + testdir, progname); if (writeoption) { (void)mkdir(testdir, dirmode);