vitalif
/
mdtest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use autoconf to check for lustre

master
Christopher J. Morrone 2011-11-09 14:14:14 -08:00
parent 29457fac9f
commit 3b250633cc
3 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
configure.ac
View File

@ -33,6 +33,19 @@ AC_SEARCH_LIBS([sqrt], [m], [],
# Check for system capabilities
AC_SYS_LARGEFILE
# Check for lustre availability
AC_ARG_WITH([lustre],
[AS_HELP_STRING([--with-lustre],
[support configurable Lustre striping values @<:@default=check@:>@])],
[], [with_lustre=check])
AS_IF([test "x$with_lustre" != xno], [
AC_CHECK_HEADERS([lustre/lustre_user.h], [], [
if test "x$with_lustre" != xcheck; then
AC_MSG_FAILURE([--with-lustre was given, <lustre/lustre_user.h> not found])
fi
])
])
# POSIX IO support
AC_ARG_WITH([posix],
[AS_HELP_STRING([--with-posix],

14
src/aiori-POSIX.c
View File

@ -21,9 +21,9 @@
#include <stdio.h> /* only for fprintf() */
#include <stdlib.h>
#include <sys/stat.h>
#ifdef _MANUALLY_SET_LUSTRE_STRIPING
#ifdef HAVE_LUSTRE_LUSTRE_USER_H
# include <lustre/lustre_user.h>
#endif /* _MANUALLY_SET_LUSTRE_STRIPING */
#endif /* HAVE_LUSTRE_LUSTRE_USER_H */
#ifndef open64 /* necessary for TRU64 -- */
# define open64 open /* unlikely, but may pose */
@ -100,7 +100,7 @@ IOR_Create_POSIX(char * testFileName,
fd_oflag |= O_DIRECT;
}
#ifndef _MANUALLY_SET_LUSTRE_STRIPING
#ifndef HAVE_LUSTRE_LUSTRE_USER_H
/* If the lustre striping parameters are not the defaults */
if (param->lustre_stripe_count != 0
|| param->lustre_stripe_size != 0
@ -111,7 +111,7 @@ IOR_Create_POSIX(char * testFileName,
fd_oflag |= O_CREAT | O_RDWR;
*fd = open64(testFileName, fd_oflag, 0664);
if (*fd < 0) ERR("cannot open file");
#else /* _MANUALLY_SET_LUSTRE_STRIPING */
#else /* HAVE_LUSTRE_LUSTRE_USER_H */
/* If the lustre striping parameters are not the defaults */
if (param->lustre_stripe_count != 0
|| param->lustre_stripe_size != 0
@ -164,7 +164,7 @@ IOR_Create_POSIX(char * testFileName,
if (ioctl(*fd, LL_IOC_SETFLAGS, &lustre_ioctl_flags) == -1)
ERR("cannot set ioctl");
}
#endif /* not _MANUALLY_SET_LUSTRE_STRIPING */
#endif /* not HAVE_LUSTRE_LUSTRE_USER_H */
return((void *)fd);
} /* IOR_Create_POSIX() */
@ -203,7 +203,7 @@ IOR_Open_POSIX(char * testFileName,
*fd = open64(testFileName, fd_oflag);
if (*fd < 0) ERR("cannot open file");
#ifdef _MANUALLY_SET_LUSTRE_STRIPING
#ifdef HAVE_LUSTRE_LUSTRE_USER_H
if (param->lustre_ignore_locks) {
int lustre_ioctl_flags = LL_FILE_IGNORE_LOCK;
if (verbose >= VERBOSE_1) {
@ -212,7 +212,7 @@ IOR_Open_POSIX(char * testFileName,
if (ioctl(*fd, LL_IOC_SETFLAGS, &lustre_ioctl_flags) == -1)
ERR("cannot set ioctl");
}
#endif /* _MANUALLY_SET_LUSTRE_STRIPING */
#endif /* HAVE_LUSTRE_LUSTRE_USER_H */
return((void *)fd);
} /* IOR_Open_POSIX() */

4
src/ior.c
View File

@ -1534,7 +1534,7 @@ ShowSetup(IOR_param_t * test)
HumanReadable(test->blockSize, BASE_TWO));
fprintf(stdout, "\taggregate filesize = %s\n",
HumanReadable(aggFileSizeForBW, BASE_TWO));
#ifdef _MANUALLY_SET_LUSTRE_STRIPING
#ifdef HAVE_LUSTRE_LUSTRE_USER_H
fprintf(stdout, "\tLustre stripe size = %s\n",
((test->lustre_stripe_size == 0) ? "Use default" :
HumanReadable(test->lustre_stripe_size, BASE_TWO)));
@ -1544,7 +1544,7 @@ ShowSetup(IOR_param_t * test)
fprintf(stdout, "\t stripe count = %d\n",
test->lustre_stripe_count);
}
#endif /* _MANUALLY_SET_LUSTRE_STRIPING */
#endif /* HAVE_LUSTRE_LUSTRE_USER_H */
if (test->deadlineForStonewalling > 0) {
fprintf(stdout, "\tUsing stonewalling = %d second(s)\n",
test->deadlineForStonewalling);