*
* 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
*/
#ifdef HAVE_EXT2FS_EXT2FS_H
# include <e2p/e2p.h>
# include <ext2fs/ext2fs.h>
+#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)
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
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;
}
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;
*/
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;
}
*/
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;
}
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;
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;
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);
fflush(stdout);
else
printf("\n");
- }
- last_time = curr_time;
- last_bytes = curr_bytes;
+ last_time = curr_time;
+ last_bytes = curr_bytes;
+ }
}
/*
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",
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)
}
}
- 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);
int fd, ret;
if (file_num == 0) {
- if (dir_num == num_dirs - 1)
- break;
-
new_dir(tempdir, dir_num);
dir_num++;
}
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;
}
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;
FILE *fp = NULL;
ext2_filsys fs;
- if ((fp = setmntent("/etc/mtab", "r")) == NULL){
+ 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;
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,
git://git.whamcloud.com / fs / lustre-release.git / blobdiff