From aeef09178c954ee910caa6df29199eb0accb7ede Mon Sep 17 00:00:00 2001 From: "nick.j.sanders" Date: Mon, 7 Jan 2013 20:07:28 +0000 Subject: [PATCH] Add better ARM/Android support, support a wider variety of configure options. --- Android.mk | 32 +++ MODULE_LICENSE_APACHE2 | 0 NOTICE | 190 +++++++++++++++++ configure | 324 +++++++++++++++++------------ configure.ac | 73 ++----- src/os.cc | 60 ++++++ src/os.h | 10 + src/sat.cc | 15 +- src/sattypes.h | 13 +- src/stressapptest_config.h.in | 24 ++- src/stressapptest_config_android.h | 243 ++++++++++++++++++++++ src/worker.cc | 84 ++++++-- src/worker.h | 8 + 13 files changed, 868 insertions(+), 208 deletions(-) create mode 100644 Android.mk create mode 100644 MODULE_LICENSE_APACHE2 create mode 100644 NOTICE create mode 100644 src/stressapptest_config_android.h diff --git a/Android.mk b/Android.mk new file mode 100644 index 0000000..5b0680b --- /dev/null +++ b/Android.mk @@ -0,0 +1,32 @@ +LOCAL_PATH := $(call my-dir) + +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := \ + src/main.cc \ + src/adler32memcpy.cc \ + src/disk_blocks.cc \ + src/error_diag.cc \ + src/finelock_queue.cc \ + src/logger.cc \ + src/os.cc \ + src/os_factory.cc \ + src/pattern.cc \ + src/queue.cc \ + src/sat.cc \ + src/sat_factory.cc \ + src/worker.cc +LOCAL_MODULE:= stressapptest +LOCAL_MODULE_TAGS := optional + +LOCAL_CFLAGS := -DHAVE_CONFIG_H -DANDROID -DNDEBUG -UDEBUG -DCHECKOPTS + +LOCAL_C_INCLUDES := \ + bionic \ + external/stlport/stlport + +LOCAL_CPP_EXTENSION := .cc + +LOCAL_SHARED_LIBRARIES := libc libstlport + +include $(BUILD_EXECUTABLE) diff --git a/MODULE_LICENSE_APACHE2 b/MODULE_LICENSE_APACHE2 new file mode 100644 index 0000000..e69de29 diff --git a/NOTICE b/NOTICE new file mode 100644 index 0000000..c5b1efa --- /dev/null +++ b/NOTICE @@ -0,0 +1,190 @@ + + Copyright (c) 2005-2008, The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + diff --git a/configure b/configure index 42df1a2..3f27d49 100755 --- a/configure +++ b/configure @@ -4958,6 +4958,7 @@ $as_echo "#define STDC_HEADERS 1" >>confdefs.h fi +# Skip malloc.h to prevent redefinition of HAVE_MALLOC_H on some platforms # On IRIX 5.3, sys/types and inttypes.h are conflicting. for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ inttypes.h stdint.h unistd.h @@ -4976,7 +4977,7 @@ fi done -for ac_header in arpa/inet.h fcntl.h malloc.h netdb.h stdint.h stdlib.h string.h sys/ioctl.h sys/socket.h sys/time.h unistd.h +for ac_header in arpa/inet.h fcntl.h netdb.h stdint.h stdlib.h string.h sys/ioctl.h sys/socket.h sys/time.h unistd.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" @@ -5003,15 +5004,66 @@ if test "x$ac_cv_header_pthread_h" = x""yes; then : #define HAVE_PTHREAD_H 1 _ACEOF -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "Missing pthread.h. -See \`config.log' for more details." "$LINENO" 5; } fi done +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_create" >&5 +$as_echo_n "checking for library containing pthread_create... " >&6; } +if test "${ac_cv_search_pthread_create+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char pthread_create (); +int +main () +{ +return pthread_create (); + ; + return 0; +} +_ACEOF +for ac_lib in '' pthread; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_pthread_create=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if test "${ac_cv_search_pthread_create+set}" = set; then : + break +fi +done +if test "${ac_cv_search_pthread_create+set}" = set; then : + +else + ac_cv_search_pthread_create=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_pthread_create" >&5 +$as_echo "$ac_cv_search_pthread_create" >&6; } +ac_res=$ac_cv_search_pthread_create +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +fi + for ac_header in libaio.h do : ac_fn_c_check_header_mongrel "$LINENO" "libaio.h" "ac_cv_header_libaio_h" "$ac_includes_default" @@ -5020,15 +5072,66 @@ if test "x$ac_cv_header_libaio_h" = x""yes; then : #define HAVE_LIBAIO_H 1 _ACEOF -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "Missing libaio.h. -See \`config.log' for more details." "$LINENO" 5; } fi done +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing io_setup" >&5 +$as_echo_n "checking for library containing io_setup... " >&6; } +if test "${ac_cv_search_io_setup+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char io_setup (); +int +main () +{ +return io_setup (); + ; + return 0; +} +_ACEOF +for ac_lib in '' aio; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_io_setup=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if test "${ac_cv_search_io_setup+set}" = set; then : + break +fi +done +if test "${ac_cv_search_io_setup+set}" = set; then : + +else + ac_cv_search_io_setup=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_io_setup" >&5 +$as_echo "$ac_cv_search_io_setup" >&6; } +ac_res=$ac_cv_search_io_setup +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +fi + for ac_header in sys/shm.h do : ac_fn_c_check_header_mongrel "$LINENO" "sys/shm.h" "ac_cv_header_sys_shm_h" "$ac_includes_default" @@ -5037,15 +5140,66 @@ if test "x$ac_cv_header_sys_shm_h" = x""yes; then : #define HAVE_SYS_SHM_H 1 _ACEOF -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "Missing sys/shm.h from librt. -See \`config.log' for more details." "$LINENO" 5; } fi done +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing shm_open" >&5 +$as_echo_n "checking for library containing shm_open... " >&6; } +if test "${ac_cv_search_shm_open+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char shm_open (); +int +main () +{ +return shm_open (); + ; + return 0; +} +_ACEOF +for ac_lib in '' rt; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_shm_open=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if test "${ac_cv_search_shm_open+set}" = set; then : + break +fi +done +if test "${ac_cv_search_shm_open+set}" = set; then : + +else + ac_cv_search_shm_open=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_shm_open" >&5 +$as_echo "$ac_cv_search_shm_open" >&6; } +ac_res=$ac_cv_search_shm_open +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +fi + # Checks for typedefs, structures, and compiler characteristics. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5 @@ -5337,6 +5491,17 @@ _ACEOF ;; esac +ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" +if test "x$ac_cv_type_size_t" = x""yes; then : + +else + +cat >>confdefs.h <<_ACEOF +#define size_t unsigned int +_ACEOF + +fi + ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default" if test "x$ac_cv_type_ssize_t" = x""yes; then : @@ -5431,118 +5596,6 @@ fi -# These are the libraries stressapptest requires to build. -# We'll check that they work, and fail otherwise. -# In the future we may provide for testing alternate -# arguments, but that's not necessary now. -LIBS="$LIBS -lrt -pthread -laio" - -# Checking for pthreads -pthread_arg="not_available" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if pthreads is supported" >&5 -$as_echo_n "checking if pthreads is supported... " >&6; } - -pthread_header="#include" -pthread_body="pthread_create(0,0,0,0)" -# Check if compile with no extra argument -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$pthread_header -int -main () -{ -$pthread_body - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - pthread_arg="" -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -if test x"$pthread_arg" = x"not_available"; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "Cannot find a proper pthread library -See \`config.log' for more details." "$LINENO" 5; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -fi - -# Checking for libaio -libaio_arg="not_available" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libaio is supported" >&5 -$as_echo_n "checking if libaio is supported... " >&6; } - -libaio_header="#include" -libaio_body="io_submit(0,0,0)" -# Check if compile with no extra argument -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$libaio_header -int -main () -{ -$libaio_body - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - libaio_arg="" -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -if test x"$libaio_arg" = x"not_available"; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "Cannot find libaio library, please install libaio-dev -See \`config.log' for more details." "$LINENO" 5; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -fi - -# Checking for librt -librt_arg="not_available" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if librt is supported" >&5 -$as_echo_n "checking if librt is supported... " >&6; } - -librt_header="#include" -librt_body="shm_open(0, 0, 0)" -# Check if compile with no extra argument -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$librt_header -int -main () -{ -$librt_body - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - librt_arg="" -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -if test x"$librt_arg" = x"not_available"; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "Cannot find librt library -See \`config.log' for more details." "$LINENO" 5; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -fi - - # Checks for library functions. { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether closedir returns void" >&5 $as_echo_n "checking whether closedir returns void... " >&6; } @@ -5848,7 +5901,20 @@ fi done -for ac_func in gettimeofday memset select socket strtol strtoull +for ac_func in ftruncate gettimeofday memset munmap select socket strtol strtoull +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +eval as_val=\$$as_ac_var + if test "x$as_val" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + +for ac_func in mmap64 posix_memalign rand_r sched_getaffinity do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" diff --git a/configure.ac b/configure.ac index 5e82b9d..80649a7 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.61) -AC_INIT(stressapptest, 1.0.4_autoconf, opensource@google.com) +AC_INIT([stressapptest], [1.0.5_autoconf], [opensource@google.com]) AC_ARG_WITH(static, [ --with-static enable static linking]) @@ -103,10 +103,14 @@ CXXFLAGS="$CXXFLAGS -O3 -funroll-all-loops -funroll-loops -DNDEBUG" # Checks for header files. AC_HEADER_DIRENT AC_HEADER_STDC -AC_CHECK_HEADERS([arpa/inet.h fcntl.h malloc.h netdb.h stdint.h stdlib.h string.h sys/ioctl.h sys/socket.h sys/time.h unistd.h], [], [AC_MSG_FAILURE([Missing some header files.])]) -AC_CHECK_HEADERS([pthread.h], [], [AC_MSG_FAILURE([Missing pthread.h.])]) -AC_CHECK_HEADERS([libaio.h], [], [AC_MSG_FAILURE([Missing libaio.h.])]) -AC_CHECK_HEADERS([sys/shm.h], [], [AC_MSG_FAILURE([Missing sys/shm.h from librt.])]) +# Skip malloc.h to prevent redefinition of HAVE_MALLOC_H on some platforms +AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h stdint.h stdlib.h string.h sys/ioctl.h sys/socket.h sys/time.h unistd.h], [], [AC_MSG_FAILURE([Missing some header files.])]) +AC_CHECK_HEADERS([pthread.h]) +AC_SEARCH_LIBS([pthread_create], [pthread]) +AC_CHECK_HEADERS([libaio.h]) +AC_SEARCH_LIBS([io_setup], [aio]) +AC_CHECK_HEADERS([sys/shm.h]) +AC_SEARCH_LIBS([shm_open], [rt]) # Checks for typedefs, structures, and compiler characteristics. AC_HEADER_STDBOOL @@ -114,67 +118,13 @@ AC_C_CONST AC_C_INLINE AC_TYPE_PID_T AC_C_RESTRICT +AC_TYPE_SIZE_T AC_TYPE_SSIZE_T AC_HEADER_TIME AC_TYPE_UINT16_T AC_C_VOLATILE -# These are the libraries stressapptest requires to build. -# We'll check that they work, and fail otherwise. -# In the future we may provide for testing alternate -# arguments, but that's not necessary now. -LIBS="$LIBS -lrt -pthread -laio" - -# Checking for pthreads -pthread_arg="not_available" -AC_MSG_CHECKING([if pthreads is supported]) - -pthread_header="#include" -pthread_body="pthread_create(0,0,0,0)" -# Check if compile with no extra argument -AC_LINK_IFELSE([AC_LANG_PROGRAM($pthread_header, $pthread_body)], -pthread_arg="") - -if test x"$pthread_arg" = x"not_available"; then - AC_MSG_FAILURE([Cannot find a proper pthread library]) -else - AC_MSG_RESULT([yes]) -fi - -# Checking for libaio -libaio_arg="not_available" -AC_MSG_CHECKING([if libaio is supported]) - -libaio_header="#include" -libaio_body="io_submit(0,0,0)" -# Check if compile with no extra argument -AC_LINK_IFELSE([AC_LANG_PROGRAM($libaio_header, $libaio_body)], -libaio_arg="") - -if test x"$libaio_arg" = x"not_available"; then - AC_MSG_FAILURE([Cannot find libaio library, please install libaio-dev]) -else - AC_MSG_RESULT([yes]) -fi - -# Checking for librt -librt_arg="not_available" -AC_MSG_CHECKING([if librt is supported]) - -librt_header="#include" -librt_body="shm_open(0, 0, 0)" -# Check if compile with no extra argument -AC_LINK_IFELSE([AC_LANG_PROGRAM($librt_header, $librt_body)], -librt_arg="") - -if test x"$librt_arg" = x"not_available"; then - AC_MSG_FAILURE([Cannot find librt library]) -else - AC_MSG_RESULT([yes]) -fi - - # Checks for library functions. AC_FUNC_CLOSEDIR_VOID AC_PROG_GCC_TRADITIONAL @@ -182,7 +132,8 @@ AC_FUNC_SELECT_ARGTYPES AC_TYPE_SIGNAL AC_FUNC_STRERROR_R AC_FUNC_VPRINTF -AC_CHECK_FUNCS([gettimeofday memset select socket strtol strtoull]) +AC_CHECK_FUNCS([ftruncate gettimeofday memset munmap select socket strtol strtoull]) +AC_CHECK_FUNCS([mmap64 posix_memalign rand_r sched_getaffinity]) AC_CONFIG_FILES([Makefile src/Makefile]) AC_OUTPUT diff --git a/src/os.cc b/src/os.cc index 1340d6b..8032cfc 100644 --- a/src/os.cc +++ b/src/os.cc @@ -32,7 +32,9 @@ #include #include #include +#ifdef HAVE_SYS_SHM_H #include +#endif #include #ifndef SHM_HUGETLB @@ -75,6 +77,8 @@ OsLayer::OsLayer() { has_clflush_ = false; has_sse2_ = false; + + use_flush_page_cache_ = false; } // OsLayer cleanup. @@ -167,6 +171,46 @@ void OsLayer::GetFeatures() { } +// Enable FlushPageCache to be functional instead of a NOP. +void OsLayer::ActivateFlushPageCache(void) { + logprintf(9, "Log: page cache will be flushed as needed\n"); + use_flush_page_cache_ = true; +} + +// Flush the page cache to ensure reads come from the disk. +bool OsLayer::FlushPageCache(void) { + if (!use_flush_page_cache_) + return true; + + // First, ask the kernel to write the cache to the disk. + sync(); + + // Second, ask the kernel to empty the cache by writing "1" to + // "/proc/sys/vm/drop_caches". + static const char *drop_caches_file = "/proc/sys/vm/drop_caches"; + int dcfile = open(drop_caches_file, O_WRONLY); + if (dcfile < 0) { + int err = errno; + string errtxt = ErrorString(err); + logprintf(3, "Log: failed to open %s - err %d (%s)\n", + drop_caches_file, err, errtxt.c_str()); + return false; + } + + ssize_t bytes_written = write(dcfile, "1", 1); + close(dcfile); + + if (bytes_written != 1) { + int err = errno; + string errtxt = ErrorString(err); + logprintf(3, "Log: failed to write %s - err %d (%s)\n", + drop_caches_file, err, errtxt.c_str()); + return false; + } + return true; +} + + // We need to flush the cacheline here. void OsLayer::Flush(void *vaddr) { // Use the generic flush. This function is just so we can override @@ -396,6 +440,7 @@ bool OsLayer::AllocateTestMem(int64 length, uint64 paddr_base) { logprintf(3, "Log: Prefer plain malloc memory allocation.\n"); } +#ifdef HAVE_SYS_SHM_H // Allocate hugepage mapped memory. if (prefer_hugepages) { do { // Allow break statement. @@ -495,6 +540,7 @@ bool OsLayer::AllocateTestMem(int64 length, uint64 paddr_base) { } while (0); shm_unlink("/stressapptest"); } +#endif // HAVE_SYS_SHM_H if (!use_hugepages_ && !use_posix_shm_) { // Use memalign to ensure that blocks are aligned enough for disk direct IO. @@ -524,8 +570,10 @@ bool OsLayer::AllocateTestMem(int64 length, uint64 paddr_base) { void OsLayer::FreeTestMem() { if (testmem_) { if (use_hugepages_) { +#ifdef HAVE_SYS_SHM_H shmdt(testmem_); shmctl(shmid_, IPC_RMID, NULL); +#endif } else if (use_posix_shm_) { if (!dynamic_mapped_shmem_) { munmap(testmem_, testmemsize_); @@ -546,9 +594,15 @@ void *OsLayer::PrepareTestMem(uint64 offset, uint64 length) { if (dynamic_mapped_shmem_) { // TODO(nsanders): Check if we can support MAP_NONBLOCK, // and evaluate performance hit from not using it. +#ifdef HAVE_MMAP64 void * mapping = mmap64(NULL, length, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_NORESERVE | MAP_LOCKED | MAP_POPULATE, shmid_, offset); +#else + void * mapping = mmap(NULL, length, PROT_READ | PROT_WRITE, + MAP_SHARED | MAP_NORESERVE | MAP_LOCKED | MAP_POPULATE, + shmid_, offset); +#endif if (mapping == MAP_FAILED) { string errtxt = ErrorString(errno); logprintf(0, "Process Error: PrepareTestMem mmap64(%llx, %llx) failed. " @@ -750,9 +804,15 @@ bool OsLayer::CpuStressWorkload() { // Initialize array with random numbers. for (int i = 0; i < 100; i++) { +#ifdef HAVE_RAND_R float_arr[i] = rand_r(&seed); if (rand_r(&seed) % 2) float_arr[i] *= -1.0; +#else + float_arr[i] = rand(); + if (rand() % 2) + float_arr[i] *= -1.0; +#endif } // Calculate moving average. diff --git a/src/os.h b/src/os.h index 28c8a2a..b043b61 100644 --- a/src/os.h +++ b/src/os.h @@ -101,6 +101,15 @@ class OsLayer { // This will output a machine readable line regarding the error. virtual bool ErrorReport(const char *part, const char *symptom, int count); + // Flushes page cache. Used to circumvent the page cache when doing disk + // I/O. This will be a NOP until ActivateFlushPageCache() is called, which + // is typically done when opening a file with O_DIRECT fails. + // Returns false on error, true on success or NOP. + // Subclasses may implement this in machine specific ways.. + virtual bool FlushPageCache(void); + // Enable FlushPageCache() to actually do the flush instead of being a NOP. + virtual void ActivateFlushPageCache(void); + // Flushes cacheline. Used to distinguish read or write errors. // Subclasses may implement this in machine specific ways.. // Takes a pointer, and flushed the cacheline containing that pointer. @@ -260,6 +269,7 @@ class OsLayer { int address_mode_; // Are we running 32 or 64 bit? bool has_sse2_; // Do we have sse2 instructions? bool has_clflush_; // Do we have clflush instructions? + bool use_flush_page_cache_; // Do we need to flush the page cache? time_t time_initialized_; // Start time of test. diff --git a/src/sat.cc b/src/sat.cc index bed62b7..ede951d 100644 --- a/src/sat.cc +++ b/src/sat.cc @@ -77,7 +77,14 @@ bool Sat::InitializeLogfile() { // Open logfile. if (use_logfile_) { logfile_ = open(logfilename_, - O_WRONLY | O_CREAT | O_DSYNC, +#if defined(O_DSYNC) + O_DSYNC | +#elif defined(O_SYNC) + O_SYNC | +#elif defined(O_FSYNC) + O_FSYNC | +#endif + O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); if (logfile_ < 0) { printf("Fatal Error: cannot open file %s for logging\n", @@ -1271,9 +1278,15 @@ void Sat::InitializeThreads() { // Allocate all the nums once so that we get a single chunk // of contiguous memory. int *num; +#ifdef HAVE_POSIX_MEMALIGN int err_result = posix_memalign( reinterpret_cast(&num), kCacheLineSize, sizeof(*num) * num_cpus * cc_cacheline_count_); +#else + num = reinterpret_cast(memalign(kCacheLineSize, + sizeof(*num) * num_cpus * cc_cacheline_count_)); + int err_result = (num == 0); +#endif sat_assert(err_result == 0); int cline; diff --git a/src/sattypes.h b/src/sattypes.h index 96bf13b..c9341d0 100644 --- a/src/sattypes.h +++ b/src/sattypes.h @@ -26,9 +26,13 @@ #include #ifdef HAVE_CONFIG_H // Built using autoconf +#ifdef __ANDROID__ +#include "stressapptest_config_android.h" +#else #include "stressapptest_config.h" -using namespace std; using namespace __gnu_cxx; +#endif +using namespace std; typedef signed long long int64; typedef signed int int32; @@ -172,7 +176,14 @@ inline bool sat_sleep(time_t seconds) { // error_num: an errno error code inline string ErrorString(int error_num) { char buf[256]; +#ifdef STRERROR_R_CHAR_P return string(strerror_r(error_num, buf, sizeof buf)); +#else + if (strerror_r(error_num, buf, sizeof buf)) + return "unknown failure"; + else + return string(buf); +#endif } // Define handy constants here diff --git a/src/stressapptest_config.h.in b/src/stressapptest_config.h.in index 6ae6e5a..97f306e 100644 --- a/src/stressapptest_config.h.in +++ b/src/stressapptest_config.h.in @@ -20,6 +20,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_FCNTL_H +/* Define to 1 if you have the `ftruncate' function. */ +#undef HAVE_FTRUNCATE + /* Define to 1 if you have the `gettimeofday' function. */ #undef HAVE_GETTIMEOFDAY @@ -29,24 +32,36 @@ /* Define to 1 if you have the header file. */ #undef HAVE_LIBAIO_H -/* Define to 1 if you have the header file. */ -#undef HAVE_MALLOC_H - /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H /* Define to 1 if you have the `memset' function. */ #undef HAVE_MEMSET +/* Define to 1 if you have the `mmap64' function. */ +#undef HAVE_MMAP64 + +/* Define to 1 if you have the `munmap' function. */ +#undef HAVE_MUNMAP + /* Define to 1 if you have the header file, and it defines `DIR'. */ #undef HAVE_NDIR_H /* Define to 1 if you have the header file. */ #undef HAVE_NETDB_H +/* Define to 1 if you have the `posix_memalign' function. */ +#undef HAVE_POSIX_MEMALIGN + /* Define to 1 if you have the header file. */ #undef HAVE_PTHREAD_H +/* Define to 1 if you have the `rand_r' function. */ +#undef HAVE_RAND_R + +/* Define to 1 if you have the `sched_getaffinity' function. */ +#undef HAVE_SCHED_GETAFFINITY + /* Define to 1 if you have the `select' function. */ #undef HAVE_SELECT @@ -210,6 +225,9 @@ # define __restrict__ #endif +/* Define to `unsigned int' if does not define. */ +#undef size_t + /* Define to `int' if does not define. */ #undef ssize_t diff --git a/src/stressapptest_config_android.h b/src/stressapptest_config_android.h new file mode 100644 index 0000000..83a4866 --- /dev/null +++ b/src/stressapptest_config_android.h @@ -0,0 +1,243 @@ +/* src/stressapptest_config.h. Generated from stressapptest_config.h.in by configure. */ +/* src/stressapptest_config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if the `closedir' function returns void instead of `int'. */ +#define CLOSEDIR_VOID 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_ARPA_INET_H 1 + +/* Define to 1 if you have the declaration of `strerror_r', and to 0 if you + don't. */ +#define HAVE_DECL_STRERROR_R 1 + +/* Define to 1 if you have the header file, and it defines `DIR'. + */ +#define HAVE_DIRENT_H 1 + +/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ +/* #undef HAVE_DOPRNT */ + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the `ftruncate' function. */ +#define HAVE_FTRUNCATE 1 + +/* Define to 1 if you have the `gettimeofday' function. */ +#define HAVE_GETTIMEOFDAY 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_LIBAIO_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the `memset' function. */ +#define HAVE_MEMSET 1 + +/* Define to 1 if you have the `mmap64' function. */ +/* #undef HAVE_MMAP64 */ + +/* Define to 1 if you have the `munmap' function. */ +#define HAVE_MUNMAP 1 + +/* Define to 1 if you have the header file, and it defines `DIR'. */ +/* #undef HAVE_NDIR_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_NETDB_H 1 + +/* Define to 1 if you have the `posix_memalign' function. */ +/* #undef HAVE_POSIX_MEMALIGN */ + +/* Define to 1 if you have the header file. */ +#define HAVE_PTHREAD_H 1 + +/* Define to 1 if you have the `rand_r' function. */ +/* #undef HAVE_RAND_R */ + +/* Define to 1 if you have the `sched_getaffinity' function. */ +#define HAVE_SCHED_GETAFFINITY 1 + +/* Define to 1 if you have the `select' function. */ +#define HAVE_SELECT 1 + +/* Define to 1 if you have the `socket' function. */ +#define HAVE_SOCKET 1 + +/* Define to 1 if stdbool.h conforms to C99. */ +/* #undef HAVE_STDBOOL_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the `strerror_r' function. */ +#define HAVE_STRERROR_R 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the `strtol' function. */ +#define HAVE_STRTOL 1 + +/* Define to 1 if you have the `strtoull' function. */ +#define HAVE_STRTOULL 1 + +/* Define to 1 if you have the header file, and it defines `DIR'. + */ +/* #undef HAVE_SYS_DIR_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_IOCTL_H 1 + +/* Define to 1 if you have the header file, and it defines `DIR'. + */ +/* #undef HAVE_SYS_NDIR_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_SELECT_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_SHM_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_SOCKET_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if you have the `vprintf' function. */ +#define HAVE_VPRINTF 1 + +/* Define to 1 if the system has the type `_Bool'. */ +#define HAVE__BOOL 1 + +/* Name of package */ +#define PACKAGE "stressapptest" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "opensource@google.com" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "stressapptest" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "stressapptest 1.0.4_autoconf" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "stressapptest" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "1.0.4_autoconf" + +/* Define as the return type of signal handlers (`int' or `void'). */ +#define RETSIGTYPE void + +/* Define to the type of arg 1 for `select'. */ +#define SELECT_TYPE_ARG1 int + +/* Define to the type of args 2, 3 and 4 for `select'. */ +#define SELECT_TYPE_ARG234 (fd_set *) + +/* Define to the type of arg 5 for `select'. */ +#define SELECT_TYPE_ARG5 (struct timeval *) + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Define to 1 if strerror_r returns char *. */ +/* #undef STRERROR_R_CHAR_P */ + +/* Defined if the target CPU is armv7a */ +#define STRESSAPPTEST_CPU_ARMV7A /**/ + +/* Defined if the target CPU is i686 */ +/* #undef STRESSAPPTEST_CPU_I686 */ + +/* Defined if the target CPU is PowerPC */ +/* #undef STRESSAPPTEST_CPU_PPC */ + +/* Defined if the target CPU is x86_64 */ +/* #undef STRESSAPPTEST_CPU_X86_64 */ + +/* Defined if the target OS is BSD based */ +/* #undef STRESSAPPTEST_OS_BSD */ + +/* Defined if the target OS is OSX */ +/* #undef STRESSAPPTEST_OS_DARWIN */ + +/* Defined if the target OS is Linux */ +#define STRESSAPPTEST_OS_LINUX /**/ + +/* Timestamp when ./configure was executed */ +#ifndef STRESSAPPTEST_TIMESTAMP +#define STRESSAPPTEST_TIMESTAMP "Android version" +#endif + +/* Define to 1 if you can safely include both and . */ +#define TIME_WITH_SYS_TIME 1 + +/* Version number of package */ +#define VERSION "1.0.4_autoconf" + +/* Define to empty if `const' does not conform to ANSI C. */ +/* #undef const */ + +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +/* #undef inline */ +#endif + +/* Define to `int' if does not define. */ +/* #undef pid_t */ + +/* Define to the equivalent of the C99 'restrict' keyword, or to + nothing if this is not supported. Do not define if restrict is + supported directly. */ +#define restrict __restrict +/* Work around a bug in Sun C++: it does not support _Restrict or + __restrict__, even though the corresponding Sun C compiler ends up with + "#define restrict _Restrict" or "#define restrict __restrict__" in the + previous line. Perhaps some future version of Sun C++ will work with + restrict; if so, hopefully it defines __RESTRICT like Sun C does. */ +#if defined __SUNPRO_CC && !defined __RESTRICT +# define _Restrict +# define __restrict__ +#endif + +/* Define to `unsigned int' if does not define. */ +/* #undef size_t */ + +/* Define to `int' if does not define. */ +/* #undef ssize_t */ + +/* Define to the type of an unsigned integer type of width exactly 16 bits if + such a type exists and the standard includes do not define it. */ +/* #undef uint16_t */ + +/* Define to empty if the keyword `volatile' does not work. Warning: valid + code using `volatile' can become incorrect without. Disable with care. */ +/* #undef volatile */ diff --git a/src/worker.cc b/src/worker.cc index 2fab28e..dcf4dcb 100644 --- a/src/worker.cc +++ b/src/worker.cc @@ -44,7 +44,9 @@ #include #include // For asynchronous I/O +#ifdef HAVE_LIBAIO_H #include +#endif #include @@ -75,11 +77,6 @@ _syscall3(int, sched_setaffinity, pid_t, pid, unsigned int, len, cpu_set_t*, mask) #endif -// Linux aio syscalls. -#if !defined(__NR_io_setup) -#error "No aio headers inculded, please install libaio." -#endif - namespace { // Get HW core ID from cpuid instruction. inline int apicid(void) { @@ -147,14 +144,18 @@ static void *ThreadSpawnerGeneric(void *ptr) { void WorkerStatus::Initialize() { sat_assert(0 == pthread_mutex_init(&num_workers_mutex_, NULL)); sat_assert(0 == pthread_rwlock_init(&status_rwlock_, NULL)); +#ifdef _POSIX_BARRIERS sat_assert(0 == pthread_barrier_init(&pause_barrier_, NULL, num_workers_ + 1)); +#endif } void WorkerStatus::Destroy() { sat_assert(0 == pthread_mutex_destroy(&num_workers_mutex_)); sat_assert(0 == pthread_rwlock_destroy(&status_rwlock_)); +#ifdef _POSIX_BARRIERS sat_assert(0 == pthread_barrier_destroy(&pause_barrier_)); +#endif } void WorkerStatus::PauseWorkers() { @@ -219,8 +220,10 @@ void WorkerStatus::RemoveSelf() { AcquireNumWorkersLock(); // Decrement num_workers_ and reinitialize pause_barrier_, which we know isn't // in use because (status != PAUSE). +#ifdef _POSIX_BARRIERS sat_assert(0 == pthread_barrier_destroy(&pause_barrier_)); sat_assert(0 == pthread_barrier_init(&pause_barrier_, NULL, num_workers_)); +#endif --num_workers_; ReleaseNumWorkersLock(); @@ -399,7 +402,11 @@ bool WorkerThread::Work() { // mask = 13 (1101b): cpu0, 2, 3 bool WorkerThread::AvailableCpus(cpu_set_t *cpuset) { CPU_ZERO(cpuset); +#ifdef HAVE_SCHED_GETAFFINITY return sched_getaffinity(getppid(), sizeof(*cpuset), cpuset) == 0; +#else + return 0; +#endif } @@ -409,7 +416,11 @@ bool WorkerThread::AvailableCpus(cpu_set_t *cpuset) { // mask = 13 (1101b): cpu0, 2, 3 bool WorkerThread::CurrentCpus(cpu_set_t *cpuset) { CPU_ZERO(cpuset); +#ifdef HAVE_SCHED_GETAFFINITY return sched_getaffinity(0, sizeof(*cpuset), cpuset) == 0; +#else + return 0; +#endif } @@ -436,7 +447,11 @@ bool WorkerThread::BindToCpus(const cpu_set_t *thread_mask) { cpuset_format(&process_mask).c_str()); return false; } +#ifdef HAVE_SCHED_GETAFFINITY return (sched_setaffinity(gettid(), sizeof(*thread_mask), thread_mask) == 0); +#else + return 0; +#endif } @@ -1585,15 +1600,21 @@ void FileThread::SetFile(const char *filename_init) { // Open the file for access. bool FileThread::OpenFile(int *pfile) { - int fd = open(filename_.c_str(), - O_RDWR | O_CREAT | O_SYNC | O_DIRECT, - 0644); + bool no_O_DIRECT = false; + int flags = O_RDWR | O_CREAT | O_SYNC; + int fd = open(filename_.c_str(), flags | O_DIRECT, 0644); + if (O_DIRECT != 0 && fd < 0 && errno == EINVAL) { + no_O_DIRECT = true; + fd = open(filename_.c_str(), flags, 0644); // Try without O_DIRECT + } if (fd < 0) { logprintf(0, "Process Error: Failed to create file %s!!\n", filename_.c_str()); pages_copied_ = 0; return false; } + if (no_O_DIRECT) + os_->ActivateFlushPageCache(); // Not using O_DIRECT fixed EINVAL *pfile = fd; return true; } @@ -1664,7 +1685,7 @@ bool FileThread::WritePages(int fd) { if (!result) return false; } - return true; + return os_->FlushPageCache(); // If O_DIRECT worked, this will be a NOP. } // Copy data from file into memory block. @@ -1791,7 +1812,12 @@ bool FileThread::PagePrepare() { // Init a local buffer if we need it. if (!page_io_) { +#ifdef HAVE_POSIX_MEMALIGN int result = posix_memalign(&local_page_, 512, sat_->page_length()); +#else + local_page_ = memalign(512, sat_->page_length()); + int result = (local_page_ == 0); +#endif if (result) { logprintf(0, "Process Error: disk thread posix_memalign " "returned %d (fail)\n", @@ -2358,7 +2384,12 @@ bool NetworkSlaveThread::Work() { int64 loops = 0; // Init a local buffer for storing data. void *local_page = NULL; +#ifdef HAVE_POSIX_MEMALIGN int result = posix_memalign(&local_page, 512, sat_->page_length()); +#else + local_page = memalign(512, sat_->page_length()); + int result = (local_page == 0); +#endif if (result) { logprintf(0, "Process Error: net slave posix_memalign " "returned %d (fail)\n", @@ -2459,7 +2490,11 @@ bool CpuCacheCoherencyThread::Work() { // Choose a datastructure in random and increment the appropriate // member in that according to the offset (which is the same as the // thread number. +#ifdef HAVE_RAND_R int r = rand_r(&seed); +#else + int r = rand(); +#endif r = cc_cacheline_count_ * (r / (RAND_MAX + 1.0)); // Increment the member of the randomely selected structure. (cc_cacheline_data_[r].num[cc_thread_num_])++; @@ -2521,7 +2556,9 @@ DiskThread::DiskThread(DiskBlockTable *block_table) { device_sectors_ = 0; non_destructive_ = 0; +#ifdef HAVE_LIBAIO_H aio_ctx_ = 0; +#endif block_table_ = block_table; update_block_table_ = 1; @@ -2660,14 +2697,20 @@ bool DiskThread::SetParameters(int read_block_size, // Open a device, return false on failure. bool DiskThread::OpenDevice(int *pfile) { - int fd = open(device_name_.c_str(), - O_RDWR | O_SYNC | O_DIRECT | O_LARGEFILE, - 0); + bool no_O_DIRECT = false; + int flags = O_RDWR | O_SYNC | O_LARGEFILE; + int fd = open(device_name_.c_str(), flags | O_DIRECT, 0); + if (O_DIRECT != 0 && fd < 0 && errno == EINVAL) { + no_O_DIRECT = true; + fd = open(device_name_.c_str(), flags, 0); // Try without O_DIRECT + } if (fd < 0) { logprintf(0, "Process Error: Failed to open device %s (thread %d)!!\n", device_name_.c_str(), thread_num_); return false; } + if (no_O_DIRECT) + os_->ActivateFlushPageCache(); *pfile = fd; return GetDiskSize(fd); @@ -2827,6 +2870,8 @@ bool DiskThread::DoWork(int fd) { in_flight_sectors_.push(block); } + if (!os_->FlushPageCache()) // If O_DIRECT worked, this will be a NOP. + return false; // Verify blocks on disk. logprintf(20, "Log: Read phase for disk %s (thread %d).\n", @@ -2849,6 +2894,7 @@ bool DiskThread::DoWork(int fd) { // Return false if the IO is not set up. bool DiskThread::AsyncDiskIO(IoOp op, int fd, void *buf, int64 size, int64 offset, int64 timeout) { +#ifdef HAVE_LIBAIO_H // Use the Linux native asynchronous I/O interface for reading/writing. // A read/write consists of three basic steps: // 1. create an io context. @@ -2957,6 +3003,9 @@ bool DiskThread::AsyncDiskIO(IoOp op, int fd, void *buf, int64 size, } return true; +#else // !HAVE_LIBAIO_H + return false; +#endif } // Write a block to disk. @@ -3104,9 +3153,14 @@ bool DiskThread::Work() { } // Allocate a block buffer aligned to 512 bytes since the kernel requires it - // when using direst IO. + // when using direct IO. +#ifdef HAVE_POSIX_MEMALIGN int memalign_result = posix_memalign(&block_buffer_, kBufferAlignment, sat_->page_length()); +#else + block_buffer_ = memalign(kBufferAlignment, sat_->page_length()); + int memalign_result = (block_buffer_ == 0); +#endif if (memalign_result) { CloseDevice(fd); logprintf(0, "Process Error: Unable to allocate memory for buffers " @@ -3116,6 +3170,7 @@ bool DiskThread::Work() { return false; } +#ifdef HAVE_LIBAIO_H if (io_setup(5, &aio_ctx_)) { CloseDevice(fd); logprintf(0, "Process Error: Unable to create aio context for disk %s" @@ -3124,12 +3179,15 @@ bool DiskThread::Work() { status_ = false; return false; } +#endif bool result = DoWork(fd); status_ = result; +#ifdef HAVE_LIBAIO_H io_destroy(aio_ctx_); +#endif CloseDevice(fd); logprintf(9, "Log: Completed %d (disk %s): disk thread status %d, " diff --git a/src/worker.h b/src/worker.h index 7aae5f2..0ec4c1d 100644 --- a/src/worker.h +++ b/src/worker.h @@ -26,7 +26,9 @@ #include #include +#ifdef HAVE_LIBAIO_H #include +#endif #include #include @@ -138,9 +140,11 @@ class WorkerStatus { enum Status { RUN, PAUSE, STOP }; void WaitOnPauseBarrier() { +#ifdef _POSIX_BARRIERS int error = pthread_barrier_wait(&pause_barrier_); if (error != PTHREAD_BARRIER_SERIAL_THREAD) sat_assert(error == 0); +#endif } void AcquireNumWorkersLock() { @@ -185,8 +189,10 @@ class WorkerStatus { pthread_rwlock_t status_rwlock_; Status status_; +#ifdef _POSIX_BARRIERS // Guaranteed to not be in use when (status_ != PAUSE). pthread_barrier_t pause_barrier_; +#endif DISALLOW_COPY_AND_ASSIGN(WorkerStatus); }; @@ -749,7 +755,9 @@ class DiskThread : public WorkerThread { // not verified. void *block_buffer_; // Pointer to aligned block buffer. +#ifdef HAVE_LIBAIO_H io_context_t aio_ctx_; // Asynchronous I/O context for Linux native AIO. +#endif DiskBlockTable *block_table_; // Disk Block Table, shared by all disk // threads that read / write at the same -- 2.30.2