passenger 4.0.20 → 4.0.21
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of passenger might be problematic. Click here for more details.
- checksums.yaml +8 -8
- checksums.yaml.gz.asc +7 -7
- data.tar.gz.asc +7 -7
- data/.gitignore +1 -0
- data/.travis.yml +1 -1
- data/NEWS +15 -0
- data/README.md +5 -3
- data/Rakefile +1 -0
- data/bin/passenger-config +1 -5
- data/bin/passenger-install-apache2-module +53 -5
- data/bin/passenger-install-nginx-module +19 -6
- data/bin/passenger-memory-stats +3 -3
- data/build/agents.rb +11 -8
- data/build/apache2.rb +9 -5
- data/build/basics.rb +15 -21
- data/build/common_library.rb +16 -6
- data/build/cplusplus_support.rb +5 -5
- data/build/cxx_tests.rb +3 -3
- data/build/documentation.rb +1 -1
- data/build/misc.rb +4 -37
- data/build/node_tests.rb +29 -0
- data/build/oxt_tests.rb +1 -1
- data/build/packaging.rb +29 -10
- data/build/preprocessor.rb +2 -1
- data/build/test_basics.rb +15 -6
- data/debian.template/locations.ini.template +1 -0
- data/debian.template/passenger.install.template +1 -0
- data/dev/copy_boost_headers.rb +7 -3
- data/dev/run_travis.sh +32 -16
- data/doc/Users guide Apache.idmap.txt +22 -34
- data/doc/Users guide Apache.txt +20 -234
- data/doc/Users guide Nginx.idmap.txt +84 -66
- data/doc/Users guide Nginx.txt +50 -1
- data/doc/Users guide Standalone.idmap.txt +74 -0
- data/doc/Users guide Standalone.txt +22 -9
- data/doc/Users guide.txt +51 -0
- data/doc/users_guide_snippets/environment_variables.txt +0 -3
- data/doc/users_guide_snippets/installation.txt +337 -380
- data/doc/users_guide_snippets/installation/run_installer.txt +58 -0
- data/doc/users_guide_snippets/installation/verify_running_epilogue.txt +6 -0
- data/doc/users_guide_snippets/support_information.txt +2 -9
- data/doc/users_guide_snippets/troubleshooting/default.txt +112 -0
- data/doc/users_guide_snippets/troubleshooting/rails.txt +56 -0
- data/doc/users_guide_snippets/where_to_get_support.txt +9 -0
- data/ext/apache2/Bucket.h +1 -1
- data/ext/apache2/Configuration.hpp +0 -44
- data/ext/apache2/CreateDirConfig.cpp +1 -1
- data/ext/apache2/CreateDirConfig.cpp.erb +1 -1
- data/ext/apache2/Hooks.cpp +28 -21
- data/ext/apache2/MergeDirConfig.cpp +1 -0
- data/ext/apache2/MergeDirConfig.cpp.erb +1 -1
- data/ext/apache2/SetHeaders.cpp +73 -0
- data/ext/apache2/SetHeaders.cpp.erb +88 -0
- data/ext/boost/algorithm/string/detail/find_format.hpp +5 -5
- data/ext/boost/algorithm/string/detail/find_format_all.hpp +5 -5
- data/ext/boost/algorithm/string/detail/finder.hpp +1 -1
- data/ext/boost/algorithm/string/formatter.hpp +2 -2
- data/ext/boost/assert.hpp +6 -1
- data/ext/boost/atomic.hpp +18 -0
- data/ext/boost/atomic/atomic.hpp +241 -0
- data/ext/boost/atomic/detail/base.hpp +585 -0
- data/ext/boost/atomic/detail/cas32strong.hpp +885 -0
- data/ext/boost/atomic/detail/cas32weak.hpp +947 -0
- data/ext/boost/atomic/detail/cas64strong.hpp +443 -0
- data/ext/boost/atomic/detail/config.hpp +54 -0
- data/ext/boost/atomic/detail/gcc-alpha.hpp +368 -0
- data/ext/boost/atomic/detail/gcc-armv6plus.hpp +252 -0
- data/ext/boost/atomic/detail/gcc-cas.hpp +157 -0
- data/ext/boost/atomic/detail/gcc-ppc.hpp +2850 -0
- data/ext/boost/atomic/detail/gcc-sparcv9.hpp +1259 -0
- data/ext/boost/atomic/detail/gcc-x86.hpp +1766 -0
- data/ext/boost/atomic/detail/generic-cas.hpp +206 -0
- data/ext/boost/atomic/detail/interlocked.hpp +200 -0
- data/ext/boost/atomic/detail/linux-arm.hpp +189 -0
- data/ext/boost/atomic/detail/lockpool.hpp +97 -0
- data/ext/boost/atomic/detail/platform.hpp +62 -0
- data/ext/boost/atomic/detail/type-classification.hpp +45 -0
- data/ext/boost/chrono/config.hpp +8 -3
- data/ext/boost/chrono/duration.hpp +9 -10
- data/ext/boost/chrono/system_clocks.hpp +1 -1
- data/ext/boost/chrono/time_point.hpp +4 -3
- data/ext/boost/config/auto_link.hpp +53 -52
- data/ext/boost/config/compiler/borland.hpp +1 -0
- data/ext/boost/config/compiler/clang.hpp +24 -1
- data/ext/boost/config/compiler/codegear.hpp +1 -0
- data/ext/boost/config/compiler/common_edg.hpp +1 -0
- data/ext/boost/config/compiler/cray.hpp +1 -0
- data/ext/boost/config/compiler/digitalmars.hpp +1 -0
- data/ext/boost/config/compiler/gcc.hpp +29 -3
- data/ext/boost/config/compiler/gcc_xml.hpp +2 -1
- data/ext/boost/config/compiler/hp_acc.hpp +1 -0
- data/ext/boost/config/compiler/intel.hpp +1 -1
- data/ext/boost/config/compiler/metrowerks.hpp +1 -0
- data/ext/boost/config/compiler/mpw.hpp +1 -0
- data/ext/boost/config/compiler/pathscale.hpp +1 -0
- data/ext/boost/config/compiler/pgi.hpp +1 -0
- data/ext/boost/config/compiler/sunpro_cc.hpp +1 -0
- data/ext/boost/config/compiler/vacpp.hpp +3 -2
- data/ext/boost/config/compiler/visualc.hpp +25 -11
- data/ext/boost/config/platform/vxworks.hpp +353 -15
- data/ext/boost/config/select_compiler_config.hpp +4 -4
- data/ext/boost/config/stdlib/dinkumware.hpp +10 -3
- data/ext/boost/config/stdlib/libstdcpp3.hpp +2 -1
- data/ext/boost/config/suffix.hpp +45 -19
- data/ext/boost/date_time/format_date_parser.hpp +1 -11
- data/ext/boost/date_time/strings_from_facet.hpp +5 -3
- data/ext/boost/detail/atomic_redef_macros.hpp +19 -0
- data/ext/boost/detail/atomic_undef_macros.hpp +39 -0
- data/ext/boost/detail/endian.hpp +52 -4
- data/ext/boost/detail/scoped_enum_emulation.hpp +10 -10
- data/ext/boost/detail/select_type.hpp +36 -0
- data/ext/boost/exception/current_exception_cast.hpp +1 -1
- data/ext/boost/exception/detail/error_info_impl.hpp +3 -5
- data/ext/boost/exception/detail/exception_ptr.hpp +3 -3
- data/ext/boost/exception/detail/is_output_streamable.hpp +1 -1
- data/ext/boost/exception/detail/object_hex_dump.hpp +1 -1
- data/ext/boost/exception/detail/type_info.hpp +1 -1
- data/ext/boost/exception/diagnostic_information.hpp +15 -14
- data/ext/boost/exception/exception.hpp +1 -1
- data/ext/boost/exception/get_error_info.hpp +1 -1
- data/ext/boost/exception/info.hpp +12 -13
- data/ext/boost/exception/to_string.hpp +6 -1
- data/ext/boost/exception/to_string_stub.hpp +9 -1
- data/ext/boost/foreach.hpp +5 -5
- data/ext/boost/function/function_template.hpp +6 -6
- data/ext/boost/functional/hash/detail/float_functions.hpp +90 -0
- data/ext/boost/functional/hash/detail/hash_float.hpp +11 -2
- data/ext/boost/functional/hash/extensions.hpp +14 -2
- data/ext/boost/functional/hash/hash.hpp +26 -5
- data/ext/boost/get_pointer.hpp +17 -2
- data/ext/boost/integer_traits.hpp +1 -1
- data/ext/boost/lexical_cast.hpp +615 -395
- data/ext/boost/libs/atomic/lockpool.cpp +24 -0
- data/ext/boost/libs/system/src/error_code.cpp +25 -18
- data/ext/boost/libs/thread/src/future.cpp +7 -5
- data/ext/boost/libs/thread/src/pthread/once.cpp +9 -3
- data/ext/boost/libs/thread/src/pthread/once_atomic.cpp +90 -0
- data/ext/boost/libs/thread/src/pthread/thread.cpp +129 -95
- data/ext/boost/libs/thread/src/pthread/timeconv.inl +20 -1
- data/ext/boost/limits.hpp +1 -1
- data/ext/boost/math/policies/policy.hpp +10 -0
- data/ext/boost/math/special_functions/detail/round_fwd.hpp +17 -4
- data/ext/boost/math/special_functions/fpclassify.hpp +114 -45
- data/ext/boost/math/special_functions/math_fwd.hpp +195 -83
- data/ext/boost/math/special_functions/sign.hpp +13 -8
- data/ext/boost/math/tools/config.hpp +38 -16
- data/ext/boost/move/algorithm.hpp +275 -0
- data/ext/boost/move/core.hpp +332 -0
- data/ext/boost/move/detail/config_begin.hpp +23 -0
- data/ext/boost/move/detail/config_end.hpp +20 -0
- data/ext/boost/move/detail/meta_utils.hpp +158 -0
- data/ext/boost/move/iterator.hpp +298 -0
- data/ext/boost/move/move.hpp +10 -1256
- data/ext/boost/move/traits.hpp +142 -0
- data/ext/boost/move/utility.hpp +194 -0
- data/ext/boost/mpl/assert.hpp +72 -4
- data/ext/boost/noncopyable.hpp +15 -3
- data/ext/boost/pointer_to_other.hpp +55 -0
- data/ext/boost/range/concepts.hpp +4 -4
- data/ext/boost/range/detail/extract_optional_type.hpp +1 -1
- data/ext/boost/range/empty.hpp +1 -1
- data/ext/boost/range/iterator_range_core.hpp +4 -1
- data/ext/boost/range/iterator_range_io.hpp +2 -2
- data/ext/boost/ratio/config.hpp +6 -0
- data/ext/boost/ratio/detail/overflow_helpers.hpp +2 -2
- data/ext/boost/smart_ptr/allocate_shared_array.hpp +250 -0
- data/ext/boost/smart_ptr/detail/allocate_array_helper.hpp +169 -0
- data/ext/boost/smart_ptr/detail/array_deleter.hpp +124 -0
- data/ext/boost/smart_ptr/detail/array_traits.hpp +53 -0
- data/ext/boost/smart_ptr/detail/array_utility.hpp +178 -0
- data/ext/boost/smart_ptr/detail/make_array_helper.hpp +157 -0
- data/ext/boost/smart_ptr/detail/operator_bool.hpp +16 -9
- data/ext/boost/smart_ptr/detail/shared_count.hpp +78 -7
- data/ext/boost/smart_ptr/detail/sp_convertible.hpp +15 -0
- data/ext/boost/smart_ptr/detail/sp_counted_base.hpp +12 -6
- data/ext/boost/smart_ptr/detail/sp_counted_base_acc_ia64.hpp +1 -0
- data/ext/boost/smart_ptr/detail/sp_counted_base_aix.hpp +1 -0
- data/ext/boost/smart_ptr/detail/sp_counted_base_cw_ppc.hpp +1 -0
- data/ext/boost/smart_ptr/detail/sp_counted_base_cw_x86.hpp +1 -0
- data/ext/boost/smart_ptr/detail/sp_counted_base_gcc_ia64.hpp +1 -0
- data/ext/boost/smart_ptr/detail/sp_counted_base_gcc_mips.hpp +1 -0
- data/ext/boost/smart_ptr/detail/sp_counted_base_gcc_ppc.hpp +1 -0
- data/ext/boost/smart_ptr/detail/sp_counted_base_gcc_sparc.hpp +1 -0
- data/ext/boost/smart_ptr/detail/sp_counted_base_gcc_x86.hpp +1 -0
- data/ext/boost/smart_ptr/detail/sp_counted_base_nt.hpp +1 -0
- data/ext/boost/smart_ptr/detail/sp_counted_base_pt.hpp +1 -0
- data/ext/boost/smart_ptr/detail/sp_counted_base_snc_ps3.hpp +162 -0
- data/ext/boost/smart_ptr/detail/sp_counted_base_solaris.hpp +1 -0
- data/ext/boost/smart_ptr/detail/sp_counted_base_spin.hpp +1 -0
- data/ext/boost/smart_ptr/detail/sp_counted_base_sync.hpp +1 -0
- data/ext/boost/smart_ptr/detail/sp_counted_base_vacpp_ppc.hpp +1 -0
- data/ext/boost/smart_ptr/detail/sp_counted_impl.hpp +15 -0
- data/ext/boost/smart_ptr/detail/sp_forward.hpp +39 -0
- data/ext/boost/smart_ptr/detail/sp_has_sync.hpp +19 -3
- data/ext/boost/smart_ptr/detail/sp_if_array.hpp +31 -0
- data/ext/boost/smart_ptr/detail/sp_nullptr_t.hpp +45 -0
- data/ext/boost/smart_ptr/detail/spinlock_gcc_arm.hpp +5 -12
- data/ext/boost/smart_ptr/enable_shared_from_this.hpp +4 -4
- data/ext/boost/smart_ptr/make_shared.hpp +5 -1060
- data/ext/boost/smart_ptr/make_shared_array.hpp +247 -0
- data/ext/boost/smart_ptr/make_shared_object.hpp +1128 -0
- data/ext/boost/smart_ptr/scoped_array.hpp +32 -7
- data/ext/boost/smart_ptr/scoped_ptr.hpp +31 -5
- data/ext/boost/smart_ptr/shared_array.hpp +135 -20
- data/ext/boost/smart_ptr/shared_ptr.hpp +444 -126
- data/ext/boost/smart_ptr/weak_ptr.hpp +39 -28
- data/ext/boost/static_assert.hpp +74 -17
- data/ext/boost/system/error_code.hpp +76 -68
- data/ext/boost/system/system_error.hpp +5 -1
- data/ext/boost/thread/barrier.hpp +6 -2
- data/ext/boost/thread/completion_latch.hpp +233 -0
- data/ext/boost/thread/condition.hpp +6 -1
- data/ext/boost/thread/detail/async_func.hpp +571 -0
- data/ext/boost/thread/detail/config.hpp +248 -40
- data/ext/boost/thread/detail/counter.hpp +93 -0
- data/ext/boost/thread/detail/delete.hpp +12 -0
- data/ext/boost/thread/detail/invoke.hpp +1351 -0
- data/ext/boost/thread/detail/is_convertible.hpp +48 -0
- data/ext/boost/thread/detail/lockable_wrapper.hpp +45 -0
- data/ext/boost/thread/detail/log.hpp +83 -0
- data/ext/boost/thread/detail/make_tuple_indices.hpp +224 -0
- data/ext/boost/thread/detail/move.hpp +32 -16
- data/ext/boost/thread/detail/thread.hpp +236 -41
- data/ext/boost/thread/detail/thread_group.hpp +55 -9
- data/ext/boost/thread/detail/thread_interruption.hpp +4 -1
- data/ext/boost/thread/exceptions.hpp +2 -0
- data/ext/boost/thread/externally_locked.hpp +351 -0
- data/ext/boost/thread/externally_locked_stream.hpp +170 -0
- data/ext/boost/thread/future.hpp +2517 -455
- data/ext/boost/thread/future_error_code.hpp +61 -0
- data/ext/boost/thread/is_locked_by_this_thread.hpp +39 -0
- data/ext/boost/thread/latch.hpp +142 -0
- data/ext/boost/thread/lock_algorithms.hpp +468 -0
- data/ext/boost/thread/lock_concepts.hpp +197 -0
- data/ext/boost/thread/lock_factories.hpp +78 -0
- data/ext/boost/thread/lock_guard.hpp +88 -0
- data/ext/boost/thread/lock_options.hpp +31 -0
- data/ext/boost/thread/lock_traits.hpp +45 -0
- data/ext/boost/thread/lock_types.hpp +1226 -0
- data/ext/boost/thread/lockable_adapter.hpp +226 -0
- data/ext/boost/thread/lockable_concepts.hpp +157 -0
- data/ext/boost/thread/lockable_traits.hpp +207 -0
- data/ext/boost/thread/locks.hpp +5 -1816
- data/ext/boost/thread/mutex.hpp +33 -1
- data/ext/boost/thread/null_mutex.hpp +243 -0
- data/ext/boost/thread/once.hpp +10 -1
- data/ext/boost/thread/poly_lockable.hpp +68 -0
- data/ext/boost/thread/poly_lockable_adapter.hpp +89 -0
- data/ext/boost/thread/poly_shared_lockable.hpp +135 -0
- data/ext/boost/thread/poly_shared_lockable_adapter.hpp +170 -0
- data/ext/boost/thread/pthread/condition_variable.hpp +74 -26
- data/ext/boost/thread/pthread/condition_variable_fwd.hpp +54 -27
- data/ext/boost/thread/pthread/mutex.hpp +101 -38
- data/ext/boost/thread/pthread/once.hpp +459 -44
- data/ext/boost/thread/pthread/once_atomic.hpp +313 -0
- data/ext/boost/thread/pthread/recursive_mutex.hpp +19 -10
- data/ext/boost/thread/pthread/shared_mutex.hpp +226 -61
- data/ext/boost/thread/pthread/shared_mutex_assert.hpp +724 -0
- data/ext/boost/thread/pthread/thread_data.hpp +53 -50
- data/ext/boost/thread/pthread/timespec.hpp +96 -12
- data/ext/boost/thread/recursive_mutex.hpp +44 -1
- data/ext/boost/thread/reverse_lock.hpp +3 -2
- data/ext/boost/thread/scoped_thread.hpp +285 -0
- data/ext/boost/thread/shared_lock_guard.hpp +2 -1
- data/ext/boost/thread/shared_mutex.hpp +23 -0
- data/ext/boost/thread/strict_lock.hpp +235 -0
- data/ext/boost/thread/sync_bounded_queue.hpp +594 -0
- data/ext/boost/thread/sync_queue.hpp +516 -0
- data/ext/boost/thread/synchronized_value.hpp +1001 -0
- data/ext/boost/thread/testable_mutex.hpp +148 -0
- data/ext/boost/thread/thread.hpp +1 -13
- data/ext/boost/thread/thread_functors.hpp +57 -0
- data/ext/boost/thread/thread_guard.hpp +46 -0
- data/ext/boost/thread/thread_only.hpp +29 -0
- data/ext/boost/thread/v2/shared_mutex.hpp +1062 -0
- data/ext/boost/thread/v2/thread.hpp +37 -10
- data/ext/boost/thread/xtime.hpp +2 -1
- data/ext/boost/token_functions.hpp +16 -16
- data/ext/boost/type_traits/add_lvalue_reference.hpp +26 -0
- data/ext/boost/type_traits/add_reference.hpp +1 -1
- data/ext/boost/type_traits/add_rvalue_reference.hpp +4 -4
- data/ext/boost/type_traits/aligned_storage.hpp +13 -0
- data/ext/boost/type_traits/common_type.hpp +11 -12
- data/ext/boost/type_traits/config.hpp +1 -1
- data/ext/boost/type_traits/detail/common_type_imp.hpp +1 -1
- data/ext/boost/type_traits/detail/has_binary_operator.hpp +1 -1
- data/ext/boost/type_traits/detail/is_function_ptr_tester.hpp +1 -1
- data/ext/boost/type_traits/has_left_shift.hpp +49 -0
- data/ext/boost/type_traits/has_right_shift.hpp +49 -0
- data/ext/boost/type_traits/has_trivial_move_assign.hpp +57 -0
- data/ext/boost/type_traits/has_trivial_move_constructor.hpp +57 -0
- data/ext/boost/type_traits/intrinsics.hpp +18 -2
- data/ext/boost/type_traits/is_abstract.hpp +1 -1
- data/ext/boost/type_traits/is_array.hpp +1 -1
- data/ext/boost/type_traits/is_const.hpp +1 -1
- data/ext/boost/type_traits/is_convertible.hpp +78 -17
- data/ext/boost/type_traits/is_function.hpp +6 -1
- data/ext/boost/type_traits/is_integral.hpp +6 -1
- data/ext/boost/type_traits/is_nothrow_move_assignable.hpp +84 -0
- data/ext/boost/type_traits/is_nothrow_move_constructible.hpp +84 -0
- data/ext/boost/type_traits/is_pod.hpp +3 -1
- data/ext/boost/type_traits/is_rvalue_reference.hpp +1 -1
- data/ext/boost/type_traits/is_volatile.hpp +1 -1
- data/ext/boost/type_traits/make_signed.hpp +153 -0
- data/ext/boost/type_traits/make_unsigned.hpp +16 -0
- data/ext/boost/type_traits/remove_const.hpp +1 -1
- data/ext/boost/type_traits/remove_cv.hpp +1 -1
- data/ext/boost/type_traits/remove_reference.hpp +1 -1
- data/ext/boost/type_traits/remove_volatile.hpp +1 -1
- data/ext/boost/unordered/detail/allocate.hpp +1120 -0
- data/ext/boost/unordered/detail/buckets.hpp +876 -0
- data/ext/boost/unordered/detail/equivalent.hpp +680 -0
- data/ext/boost/unordered/detail/extract_key.hpp +183 -0
- data/ext/boost/unordered/detail/fwd.hpp +23 -0
- data/ext/boost/unordered/detail/table.hpp +861 -0
- data/ext/boost/unordered/detail/unique.hpp +622 -0
- data/ext/boost/unordered/detail/util.hpp +260 -0
- data/ext/boost/unordered/unordered_map.hpp +1652 -0
- data/ext/boost/unordered/unordered_map_fwd.hpp +65 -0
- data/ext/boost/unordered/unordered_set.hpp +1549 -0
- data/ext/boost/unordered/unordered_set_fwd.hpp +63 -0
- data/ext/boost/unordered_map.hpp +18 -0
- data/ext/boost/unordered_set.hpp +18 -0
- data/ext/boost/utility/addressof.hpp +2 -2
- data/ext/boost/utility/result_of.hpp +8 -1
- data/ext/boost/version.hpp +2 -2
- data/ext/common/Account.h +1 -1
- data/ext/common/AccountsDatabase.h +1 -1
- data/ext/common/AgentsStarter.cpp +3 -1
- data/ext/common/AgentsStarter.h +2 -2
- data/ext/common/ApplicationPool2/AppTypes.cpp +24 -6
- data/ext/common/ApplicationPool2/AppTypes.h +17 -8
- data/ext/common/ApplicationPool2/Common.h +12 -12
- data/ext/common/ApplicationPool2/DirectSpawner.h +2 -2
- data/ext/common/ApplicationPool2/DummySpawner.h +3 -3
- data/ext/common/ApplicationPool2/Group.h +6 -6
- data/ext/common/ApplicationPool2/Implementation.cpp +19 -19
- data/ext/common/ApplicationPool2/PipeWatcher.h +5 -5
- data/ext/common/ApplicationPool2/Pool.h +21 -21
- data/ext/common/ApplicationPool2/Process.h +6 -6
- data/ext/common/ApplicationPool2/Session.h +1 -1
- data/ext/common/ApplicationPool2/SmartSpawner.h +24 -12
- data/ext/common/ApplicationPool2/Socket.h +2 -2
- data/ext/common/ApplicationPool2/Spawner.h +64 -14
- data/ext/common/ApplicationPool2/SpawnerFactory.h +7 -7
- data/ext/common/ApplicationPool2/SuperGroup.h +5 -5
- data/ext/common/BackgroundEventLoop.cpp +4 -4
- data/ext/common/BackgroundEventLoop.h +1 -1
- data/ext/common/Constants.h +13 -1
- data/ext/common/EventedBufferedInput.h +8 -8
- data/ext/common/Exceptions.cpp +71 -0
- data/ext/common/Exceptions.h +60 -7
- data/ext/common/FileDescriptor.h +4 -4
- data/ext/common/MessageClient.h +1 -1
- data/ext/common/MessageServer.h +5 -5
- data/ext/common/MultiLibeio.cpp +3 -3
- data/ext/common/MultiLibeio.h +2 -2
- data/ext/common/RandomGenerator.h +11 -11
- data/ext/common/ResourceLocator.h +8 -1
- data/ext/common/SafeLibev.h +12 -12
- data/ext/common/ServerInstanceDir.h +11 -3
- data/ext/common/UnionStation.h +10 -10
- data/ext/common/Utils.cpp +11 -13
- data/ext/common/Utils.h +9 -9
- data/ext/common/Utils/BlockingQueue.h +10 -10
- data/ext/common/Utils/BufferedIO.h +1 -1
- data/ext/common/Utils/CachedFileStat.hpp +2 -2
- data/ext/common/Utils/FileChangeChecker.h +1 -1
- data/ext/common/Utils/HashMap.h +13 -4
- data/ext/common/Utils/IOUtils.cpp +33 -10
- data/ext/common/Utils/IniFile.h +3 -3
- data/ext/common/Utils/Lock.h +2 -2
- data/ext/common/Utils/MessagePassing.h +10 -10
- data/ext/common/Utils/ProcessMetricsCollector.h +24 -6
- data/ext/common/Utils/ScopeGuard.h +5 -5
- data/ext/common/Utils/jsoncpp.cpp +2 -0
- data/ext/common/agents/HelperAgent/FileBackedPipe.h +26 -26
- data/ext/common/agents/HelperAgent/Main.cpp +18 -18
- data/ext/common/agents/HelperAgent/RequestHandler.cpp +4 -4
- data/ext/common/agents/HelperAgent/RequestHandler.h +30 -21
- data/ext/common/agents/LoggingAgent/AdminController.h +1 -1
- data/ext/common/agents/LoggingAgent/FilterSupport.h +13 -11
- data/ext/common/agents/LoggingAgent/LoggingServer.h +11 -11
- data/ext/common/agents/LoggingAgent/Main.cpp +9 -9
- data/ext/common/agents/LoggingAgent/RemoteSender.h +3 -3
- data/ext/common/agents/SpawnPreparer.cpp +1 -0
- data/ext/common/agents/Watchdog/AgentWatcher.cpp +8 -7
- data/ext/common/agents/Watchdog/Main.cpp +81 -73
- data/ext/common/agents/Watchdog/ServerInstanceDirToucher.cpp +1 -1
- data/ext/libev/Changes +57 -0
- data/ext/libev/LICENSE +2 -1
- data/ext/libev/Makefile.in +110 -50
- data/ext/libev/README +8 -8
- data/ext/libev/aclocal.m4 +1503 -861
- data/ext/libev/config.guess +290 -304
- data/ext/libev/config.sub +77 -198
- data/ext/libev/configure +1735 -890
- data/ext/libev/configure.ac +3 -2
- data/ext/libev/ev++.h +6 -6
- data/ext/libev/ev.c +541 -214
- data/ext/libev/ev.h +106 -100
- data/ext/libev/ev_epoll.c +1 -1
- data/ext/libev/ev_kqueue.c +20 -4
- data/ext/libev/ev_vars.h +15 -16
- data/ext/libev/ev_win32.c +12 -2
- data/ext/libev/ev_wrap.h +162 -160
- data/ext/libev/event.c +29 -6
- data/ext/libev/event.h +9 -2
- data/ext/libev/ltmain.sh +2632 -1384
- data/ext/nginx/ConfigurationCommands.c +1 -1
- data/ext/nginx/ConfigurationCommands.c.erb +3 -1
- data/ext/nginx/ContentHandler.c +25 -2
- data/ext/nginx/CreateLocationConfig.c +1 -0
- data/ext/nginx/CreateLocationConfig.c.erb +1 -1
- data/ext/nginx/MergeLocationConfig.c +1 -0
- data/ext/nginx/MergeLocationConfig.c.erb +1 -1
- data/ext/nginx/config +12 -0
- data/ext/oxt/dynamic_thread_group.hpp +7 -4
- data/ext/oxt/system_calls.cpp +5 -1
- data/ext/oxt/system_calls.hpp +3 -0
- data/helper-scripts/node-loader.js +117 -249
- data/lib/phusion_passenger.rb +27 -5
- data/lib/phusion_passenger/abstract_installer.rb +104 -9
- data/lib/phusion_passenger/admin_tools/memory_stats.rb +10 -9
- data/lib/phusion_passenger/apache2/config_options.rb +6 -3
- data/lib/phusion_passenger/common_library.rb +7 -1
- data/lib/phusion_passenger/constants.rb +6 -0
- data/lib/phusion_passenger/loader_shared_helpers.rb +7 -4
- data/lib/phusion_passenger/nginx/config_options.rb +2 -1
- data/lib/phusion_passenger/packaging.rb +3 -0
- data/lib/phusion_passenger/platform_info/apache.rb +43 -6
- data/lib/phusion_passenger/platform_info/apache_detector.rb +15 -5
- data/lib/phusion_passenger/platform_info/compiler.rb +167 -32
- data/lib/phusion_passenger/platform_info/cxx_portability.rb +133 -77
- data/lib/phusion_passenger/platform_info/depcheck.rb +17 -7
- data/lib/phusion_passenger/platform_info/depcheck_specs/apache2.rb +3 -3
- data/lib/phusion_passenger/platform_info/depcheck_specs/compiler_toolchain.rb +4 -4
- data/lib/phusion_passenger/platform_info/depcheck_specs/ruby.rb +5 -6
- data/lib/phusion_passenger/platform_info/linux.rb +2 -1
- data/lib/phusion_passenger/platform_info/operating_system.rb +1 -1
- data/lib/phusion_passenger/platform_info/ruby.rb +18 -3
- data/lib/phusion_passenger/standalone/runtime_installer.rb +6 -2
- data/lib/phusion_passenger/standalone/start_command.rb +8 -2
- data/lib/phusion_passenger/utils/ansi_colors.rb +9 -0
- data/lib/phusion_passenger/utils/hosts_file_parser.rb +4 -2
- data/node_lib/phusion_passenger/httplib_emulation.js +141 -0
- data/node_lib/phusion_passenger/line_reader.js +154 -0
- data/node_lib/phusion_passenger/request_handler.js +65 -0
- data/node_lib/phusion_passenger/session_protocol_parser.js +113 -0
- data/resources/templates/apache2/deployment_example.txt.erb +2 -1
- data/resources/templates/apache2/installing_against_a_different_apache.txt.erb +14 -0
- data/resources/templates/apache2/multiple_apache_installations_detected.txt.erb +15 -0
- data/resources/templates/apache2/possible_solutions_for_compilation_and_installation_problems.txt.erb +4 -5
- data/resources/templates/general_error_with_html.html.template +1 -1
- data/resources/templates/installer_common/gem_install_permission_problems.txt.erb +17 -0
- data/resources/templates/installer_common/low_amount_of_memory_warning.txt.erb +6 -4
- data/resources/templates/installer_common/world_inaccessible_directories.txt.erb +16 -0
- data/resources/templates/nginx/deployment_example.txt.erb +2 -1
- data/resources/templates/nginx/possible_solutions_for_compilation_and_installation_problems.txt.erb +4 -5
- data/resources/templates/standalone/config.erb +1 -0
- data/test/cxx/ApplicationPool2/DirectSpawnerTest.cpp +3 -3
- data/test/cxx/ApplicationPool2/PoolTest.cpp +4 -4
- data/test/cxx/ApplicationPool2/ProcessTest.cpp +5 -5
- data/test/cxx/ApplicationPool2/SmartSpawnerTest.cpp +5 -5
- data/test/cxx/ApplicationPool2/SpawnerTestCases.cpp +1 -1
- data/test/cxx/EventedBufferedInputTest.cpp +6 -6
- data/test/cxx/FileBackedPipeTest.cpp +1 -1
- data/test/cxx/MessagePassingTest.cpp +1 -1
- data/test/cxx/MessageServerTest.cpp +4 -4
- data/test/cxx/RequestHandlerTest.cpp +7 -7
- data/test/cxx/UnionStationTest.cpp +2 -2
- data/test/node/line_reader_spec.js +338 -0
- data/test/node/spec_helper.js +27 -0
- data/test/ruby/standalone/runtime_installer_spec.rb +2 -1
- metadata +131 -22
- metadata.gz.asc +7 -7
- data/ext/boost/functional/hash/detail/container_fwd_0x.hpp +0 -29
- data/ext/boost/lambda/core.hpp +0 -79
- data/ext/boost/lambda/detail/actions.hpp +0 -174
- data/ext/boost/lambda/detail/arity_code.hpp +0 -110
- data/ext/boost/lambda/detail/function_adaptors.hpp +0 -789
- data/ext/boost/lambda/detail/is_instance_of.hpp +0 -104
- data/ext/boost/lambda/detail/lambda_config.hpp +0 -48
- data/ext/boost/lambda/detail/lambda_functor_base.hpp +0 -615
- data/ext/boost/lambda/detail/lambda_functors.hpp +0 -324
- data/ext/boost/lambda/detail/lambda_fwd.hpp +0 -74
- data/ext/boost/lambda/detail/lambda_traits.hpp +0 -578
- data/ext/boost/lambda/detail/member_ptr.hpp +0 -737
- data/ext/boost/lambda/detail/operator_actions.hpp +0 -139
- data/ext/boost/lambda/detail/operator_lambda_func_base.hpp +0 -271
- data/ext/boost/lambda/detail/operator_return_type_traits.hpp +0 -917
- data/ext/boost/lambda/detail/operators.hpp +0 -370
- data/ext/boost/lambda/detail/ret.hpp +0 -325
- data/ext/boost/lambda/detail/return_type_traits.hpp +0 -282
- data/ext/boost/lambda/detail/select_functions.hpp +0 -74
- data/ext/boost/lambda/lambda.hpp +0 -34
@@ -0,0 +1,368 @@
|
|
1
|
+
#ifndef BOOST_ATOMIC_DETAIL_GCC_ALPHA_HPP
|
2
|
+
#define BOOST_ATOMIC_DETAIL_GCC_ALPHA_HPP
|
3
|
+
|
4
|
+
// Copyright (c) 2009 Helge Bahmann
|
5
|
+
// Copyright (c) 2013 Tim Blechmann
|
6
|
+
//
|
7
|
+
// Distributed under the Boost Software License, Version 1.0.
|
8
|
+
// See accompanying file LICENSE_1_0.txt or copy at
|
9
|
+
// http://www.boost.org/LICENSE_1_0.txt)
|
10
|
+
|
11
|
+
#include <boost/atomic/detail/config.hpp>
|
12
|
+
#include <boost/atomic/detail/base.hpp>
|
13
|
+
#include <boost/atomic/detail/builder.hpp>
|
14
|
+
|
15
|
+
#ifdef BOOST_ATOMIC_HAS_PRAGMA_ONCE
|
16
|
+
#pragma once
|
17
|
+
#endif
|
18
|
+
|
19
|
+
/*
|
20
|
+
Refer to http://h71000.www7.hp.com/doc/82final/5601/5601pro_004.html
|
21
|
+
(HP OpenVMS systems documentation) and the alpha reference manual.
|
22
|
+
*/
|
23
|
+
|
24
|
+
/*
|
25
|
+
NB: The most natural thing would be to write the increment/decrement
|
26
|
+
operators along the following lines:
|
27
|
+
|
28
|
+
__asm__ __volatile__(
|
29
|
+
"1: ldl_l %0,%1 \n"
|
30
|
+
"addl %0,1,%0 \n"
|
31
|
+
"stl_c %0,%1 \n"
|
32
|
+
"beq %0,1b\n"
|
33
|
+
: "=&b" (tmp)
|
34
|
+
: "m" (value)
|
35
|
+
: "cc"
|
36
|
+
);
|
37
|
+
|
38
|
+
However according to the comments on the HP website and matching
|
39
|
+
comments in the Linux kernel sources this defies branch prediction,
|
40
|
+
as the cpu assumes that backward branches are always taken; so
|
41
|
+
instead copy the trick from the Linux kernel, introduce a forward
|
42
|
+
branch and back again.
|
43
|
+
|
44
|
+
I have, however, had a hard time measuring the difference between
|
45
|
+
the two versions in microbenchmarks -- I am leaving it in nevertheless
|
46
|
+
as it apparently does not hurt either.
|
47
|
+
*/
|
48
|
+
|
49
|
+
namespace boost {
|
50
|
+
namespace atomics {
|
51
|
+
namespace detail {
|
52
|
+
|
53
|
+
inline void fence_before(memory_order order)
|
54
|
+
{
|
55
|
+
switch(order) {
|
56
|
+
case memory_order_consume:
|
57
|
+
case memory_order_release:
|
58
|
+
case memory_order_acq_rel:
|
59
|
+
case memory_order_seq_cst:
|
60
|
+
__asm__ __volatile__ ("mb" ::: "memory");
|
61
|
+
default:;
|
62
|
+
}
|
63
|
+
}
|
64
|
+
|
65
|
+
inline void fence_after(memory_order order)
|
66
|
+
{
|
67
|
+
switch(order) {
|
68
|
+
case memory_order_acquire:
|
69
|
+
case memory_order_acq_rel:
|
70
|
+
case memory_order_seq_cst:
|
71
|
+
__asm__ __volatile__ ("mb" ::: "memory");
|
72
|
+
default:;
|
73
|
+
}
|
74
|
+
}
|
75
|
+
|
76
|
+
template<>
|
77
|
+
inline void platform_atomic_thread_fence(memory_order order)
|
78
|
+
{
|
79
|
+
switch(order) {
|
80
|
+
case memory_order_acquire:
|
81
|
+
case memory_order_consume:
|
82
|
+
case memory_order_release:
|
83
|
+
case memory_order_acq_rel:
|
84
|
+
case memory_order_seq_cst:
|
85
|
+
__asm__ __volatile__ ("mb" ::: "memory");
|
86
|
+
default:;
|
87
|
+
}
|
88
|
+
}
|
89
|
+
|
90
|
+
template<typename T>
|
91
|
+
class atomic_alpha_32
|
92
|
+
{
|
93
|
+
public:
|
94
|
+
typedef T integral_type;
|
95
|
+
BOOST_CONSTEXPR atomic_alpha_32(T v) BOOST_NOEXCEPT: i(v) {}
|
96
|
+
atomic_alpha_32() {}
|
97
|
+
T load(memory_order order=memory_order_seq_cst) const volatile BOOST_NOEXCEPT
|
98
|
+
{
|
99
|
+
T v=*reinterpret_cast<volatile const int *>(&i);
|
100
|
+
fence_after(order);
|
101
|
+
return v;
|
102
|
+
}
|
103
|
+
void store(T v, memory_order order=memory_order_seq_cst) volatile BOOST_NOEXCEPT
|
104
|
+
{
|
105
|
+
fence_before(order);
|
106
|
+
*reinterpret_cast<volatile int *>(&i)=(int)v;
|
107
|
+
}
|
108
|
+
bool compare_exchange_weak(
|
109
|
+
T &expected,
|
110
|
+
T desired,
|
111
|
+
memory_order success_order,
|
112
|
+
memory_order failure_order) volatile BOOST_NOEXCEPT
|
113
|
+
{
|
114
|
+
fence_before(success_order);
|
115
|
+
int current, success;
|
116
|
+
__asm__ __volatile__(
|
117
|
+
"1: ldl_l %2, %4\n"
|
118
|
+
"cmpeq %2, %0, %3\n"
|
119
|
+
"mov %2, %0\n"
|
120
|
+
"beq %3, 3f\n"
|
121
|
+
"stl_c %1, %4\n"
|
122
|
+
"2:\n"
|
123
|
+
|
124
|
+
".subsection 2\n"
|
125
|
+
"3: mov %3, %1\n"
|
126
|
+
"br 2b\n"
|
127
|
+
".previous\n"
|
128
|
+
|
129
|
+
: "+&r" (expected), "+&r" (desired), "=&r"(current), "=&r"(success)
|
130
|
+
: "m" (i)
|
131
|
+
:
|
132
|
+
);
|
133
|
+
if (desired) fence_after(success_order);
|
134
|
+
else fence_after(failure_order);
|
135
|
+
return desired;
|
136
|
+
}
|
137
|
+
|
138
|
+
bool is_lock_free(void) const volatile BOOST_NOEXCEPT {return true;}
|
139
|
+
protected:
|
140
|
+
inline T fetch_add_var(T c, memory_order order) volatile BOOST_NOEXCEPT
|
141
|
+
{
|
142
|
+
fence_before(order);
|
143
|
+
T original, modified;
|
144
|
+
__asm__ __volatile__(
|
145
|
+
"1: ldl_l %0, %2\n"
|
146
|
+
"addl %0, %3, %1\n"
|
147
|
+
"stl_c %1, %2\n"
|
148
|
+
"beq %1, 2f\n"
|
149
|
+
|
150
|
+
".subsection 2\n"
|
151
|
+
"2: br 1b\n"
|
152
|
+
".previous\n"
|
153
|
+
|
154
|
+
: "=&r" (original), "=&r" (modified)
|
155
|
+
: "m" (i), "r" (c)
|
156
|
+
:
|
157
|
+
);
|
158
|
+
fence_after(order);
|
159
|
+
return original;
|
160
|
+
}
|
161
|
+
inline T fetch_inc(memory_order order) volatile BOOST_NOEXCEPT
|
162
|
+
{
|
163
|
+
fence_before(order);
|
164
|
+
int original, modified;
|
165
|
+
__asm__ __volatile__(
|
166
|
+
"1: ldl_l %0, %2\n"
|
167
|
+
"addl %0, 1, %1\n"
|
168
|
+
"stl_c %1, %2\n"
|
169
|
+
"beq %1, 2f\n"
|
170
|
+
|
171
|
+
".subsection 2\n"
|
172
|
+
"2: br 1b\n"
|
173
|
+
".previous\n"
|
174
|
+
|
175
|
+
: "=&r" (original), "=&r" (modified)
|
176
|
+
: "m" (i)
|
177
|
+
:
|
178
|
+
);
|
179
|
+
fence_after(order);
|
180
|
+
return original;
|
181
|
+
}
|
182
|
+
inline T fetch_dec(memory_order order) volatile BOOST_NOEXCEPT
|
183
|
+
{
|
184
|
+
fence_before(order);
|
185
|
+
int original, modified;
|
186
|
+
__asm__ __volatile__(
|
187
|
+
"1: ldl_l %0, %2\n"
|
188
|
+
"subl %0, 1, %1\n"
|
189
|
+
"stl_c %1, %2\n"
|
190
|
+
"beq %1, 2f\n"
|
191
|
+
|
192
|
+
".subsection 2\n"
|
193
|
+
"2: br 1b\n"
|
194
|
+
".previous\n"
|
195
|
+
|
196
|
+
: "=&r" (original), "=&r" (modified)
|
197
|
+
: "m" (i)
|
198
|
+
:
|
199
|
+
);
|
200
|
+
fence_after(order);
|
201
|
+
return original;
|
202
|
+
}
|
203
|
+
private:
|
204
|
+
T i;
|
205
|
+
};
|
206
|
+
|
207
|
+
template<typename T>
|
208
|
+
class atomic_alpha_64
|
209
|
+
{
|
210
|
+
public:
|
211
|
+
typedef T integral_type;
|
212
|
+
BOOST_CONSTEXPR atomic_alpha_64(T v) BOOST_NOEXCEPT: i(v) {}
|
213
|
+
atomic_alpha_64() {}
|
214
|
+
T load(memory_order order=memory_order_seq_cst) const volatile
|
215
|
+
{
|
216
|
+
T v=*reinterpret_cast<volatile const T *>(&i);
|
217
|
+
fence_after(order);
|
218
|
+
return v;
|
219
|
+
}
|
220
|
+
void store(T v, memory_order order=memory_order_seq_cst) volatile BOOST_NOEXCEPT
|
221
|
+
{
|
222
|
+
fence_before(order);
|
223
|
+
*reinterpret_cast<volatile T *>(&i)=v;
|
224
|
+
}
|
225
|
+
bool compare_exchange_weak(
|
226
|
+
T &expected,
|
227
|
+
T desired,
|
228
|
+
memory_order success_order,
|
229
|
+
memory_order failure_order) volatile BOOST_NOEXCEPT
|
230
|
+
{
|
231
|
+
fence_before(success_order);
|
232
|
+
int current, success;
|
233
|
+
__asm__ __volatile__(
|
234
|
+
"1: ldq_l %2, %4\n"
|
235
|
+
"cmpeq %2, %0, %3\n"
|
236
|
+
"mov %2, %0\n"
|
237
|
+
"beq %3, 3f\n"
|
238
|
+
"stq_c %1, %4\n"
|
239
|
+
"2:\n"
|
240
|
+
|
241
|
+
".subsection 2\n"
|
242
|
+
"3: mov %3, %1\n"
|
243
|
+
"br 2b\n"
|
244
|
+
".previous\n"
|
245
|
+
|
246
|
+
: "+&r" (expected), "+&r" (desired), "=&r"(current), "=&r"(success)
|
247
|
+
: "m" (i)
|
248
|
+
:
|
249
|
+
);
|
250
|
+
if (desired) fence_after(success_order);
|
251
|
+
else fence_after(failure_order);
|
252
|
+
return desired;
|
253
|
+
}
|
254
|
+
|
255
|
+
bool is_lock_free(void) const volatile BOOST_NOEXCEPT {return true;}
|
256
|
+
protected:
|
257
|
+
inline T fetch_add_var(T c, memory_order order) volatile BOOST_NOEXCEPT
|
258
|
+
{
|
259
|
+
fence_before(order);
|
260
|
+
T original, modified;
|
261
|
+
__asm__ __volatile__(
|
262
|
+
"1: ldq_l %0, %2\n"
|
263
|
+
"addq %0, %3, %1\n"
|
264
|
+
"stq_c %1, %2\n"
|
265
|
+
"beq %1, 2f\n"
|
266
|
+
|
267
|
+
".subsection 2\n"
|
268
|
+
"2: br 1b\n"
|
269
|
+
".previous\n"
|
270
|
+
|
271
|
+
: "=&r" (original), "=&r" (modified)
|
272
|
+
: "m" (i), "r" (c)
|
273
|
+
:
|
274
|
+
);
|
275
|
+
fence_after(order);
|
276
|
+
return original;
|
277
|
+
}
|
278
|
+
inline T fetch_inc(memory_order order) volatile BOOST_NOEXCEPT
|
279
|
+
{
|
280
|
+
fence_before(order);
|
281
|
+
T original, modified;
|
282
|
+
__asm__ __volatile__(
|
283
|
+
"1: ldq_l %0, %2\n"
|
284
|
+
"addq %0, 1, %1\n"
|
285
|
+
"stq_c %1, %2\n"
|
286
|
+
"beq %1, 2f\n"
|
287
|
+
|
288
|
+
".subsection 2\n"
|
289
|
+
"2: br 1b\n"
|
290
|
+
".previous\n"
|
291
|
+
|
292
|
+
: "=&r" (original), "=&r" (modified)
|
293
|
+
: "m" (i)
|
294
|
+
:
|
295
|
+
);
|
296
|
+
fence_after(order);
|
297
|
+
return original;
|
298
|
+
}
|
299
|
+
inline T fetch_dec(memory_order order) volatile BOOST_NOEXCEPT
|
300
|
+
{
|
301
|
+
fence_before(order);
|
302
|
+
T original, modified;
|
303
|
+
__asm__ __volatile__(
|
304
|
+
"1: ldq_l %0, %2\n"
|
305
|
+
"subq %0, 1, %1\n"
|
306
|
+
"stq_c %1, %2\n"
|
307
|
+
"beq %1, 2f\n"
|
308
|
+
|
309
|
+
".subsection 2\n"
|
310
|
+
"2: br 1b\n"
|
311
|
+
".previous\n"
|
312
|
+
|
313
|
+
: "=&r" (original), "=&r" (modified)
|
314
|
+
: "m" (i)
|
315
|
+
:
|
316
|
+
);
|
317
|
+
fence_after(order);
|
318
|
+
return original;
|
319
|
+
}
|
320
|
+
private:
|
321
|
+
T i;
|
322
|
+
};
|
323
|
+
|
324
|
+
template<typename T>
|
325
|
+
class platform_atomic_integral<T, 4> :
|
326
|
+
public build_atomic_from_typical<build_exchange<atomic_alpha_32<T> > >
|
327
|
+
{
|
328
|
+
public:
|
329
|
+
typedef build_atomic_from_typical<build_exchange<atomic_alpha_32<T> > > super;
|
330
|
+
BOOST_CONSTEXPR platform_atomic_integral(T v) BOOST_NOEXCEPT: super(v) {}
|
331
|
+
platform_atomic_integral(void) {}
|
332
|
+
};
|
333
|
+
|
334
|
+
template<typename T>
|
335
|
+
class platform_atomic_integral<T, 8> :
|
336
|
+
public build_atomic_from_typical<build_exchange<atomic_alpha_64<T> > >
|
337
|
+
{
|
338
|
+
public:
|
339
|
+
typedef build_atomic_from_typical<build_exchange<atomic_alpha_64<T> > > super;
|
340
|
+
BOOST_CONSTEXPR platform_atomic_integral(T v) BOOST_NOEXCEPT: super(v) {}
|
341
|
+
platform_atomic_integral(void) {}
|
342
|
+
};
|
343
|
+
|
344
|
+
template<typename T>
|
345
|
+
class platform_atomic_integral<T, 1> :
|
346
|
+
public build_atomic_from_larger_type<atomic_alpha_32<uint32_t>, T>
|
347
|
+
{
|
348
|
+
public:
|
349
|
+
typedef build_atomic_from_larger_type<atomic_alpha_32<uint32_t>, T> super;
|
350
|
+
BOOST_CONSTEXPR platform_atomic_integral(T v) BOOST_NOEXCEPT: super(v) {}
|
351
|
+
platform_atomic_integral(void) {}
|
352
|
+
};
|
353
|
+
|
354
|
+
template<typename T>
|
355
|
+
class platform_atomic_integral<T, 2> :
|
356
|
+
public build_atomic_from_larger_type<atomic_alpha_32<uint32_t>, T>
|
357
|
+
{
|
358
|
+
public:
|
359
|
+
typedef build_atomic_from_larger_type<atomic_alpha_32<uint32_t>, T> super;
|
360
|
+
BOOST_CONSTEXPR platform_atomic_integral(T v) BOOST_NOEXCEPT: super(v) {}
|
361
|
+
platform_atomic_integral(void) {}
|
362
|
+
};
|
363
|
+
|
364
|
+
}
|
365
|
+
}
|
366
|
+
}
|
367
|
+
|
368
|
+
#endif
|
@@ -0,0 +1,252 @@
|
|
1
|
+
#ifndef BOOST_ATOMIC_DETAIL_GCC_ARMV6PLUS_HPP
|
2
|
+
#define BOOST_ATOMIC_DETAIL_GCC_ARMV6PLUS_HPP
|
3
|
+
|
4
|
+
// Distributed under the Boost Software License, Version 1.0.
|
5
|
+
// See accompanying file LICENSE_1_0.txt or copy at
|
6
|
+
// http://www.boost.org/LICENSE_1_0.txt)
|
7
|
+
//
|
8
|
+
// Copyright (c) 2009 Helge Bahmann
|
9
|
+
// Copyright (c) 2009 Phil Endecott
|
10
|
+
// Copyright (c) 2013 Tim Blechmann
|
11
|
+
// ARM Code by Phil Endecott, based on other architectures.
|
12
|
+
|
13
|
+
#include <cstddef>
|
14
|
+
#include <boost/cstdint.hpp>
|
15
|
+
#include <boost/atomic/detail/config.hpp>
|
16
|
+
|
17
|
+
#ifdef BOOST_ATOMIC_HAS_PRAGMA_ONCE
|
18
|
+
#pragma once
|
19
|
+
#endif
|
20
|
+
|
21
|
+
// From the ARM Architecture Reference Manual for architecture v6:
|
22
|
+
//
|
23
|
+
// LDREX{<cond>} <Rd>, [<Rn>]
|
24
|
+
// <Rd> Specifies the destination register for the memory word addressed by <Rd>
|
25
|
+
// <Rn> Specifies the register containing the address.
|
26
|
+
//
|
27
|
+
// STREX{<cond>} <Rd>, <Rm>, [<Rn>]
|
28
|
+
// <Rd> Specifies the destination register for the returned status value.
|
29
|
+
// 0 if the operation updates memory
|
30
|
+
// 1 if the operation fails to update memory
|
31
|
+
// <Rm> Specifies the register containing the word to be stored to memory.
|
32
|
+
// <Rn> Specifies the register containing the address.
|
33
|
+
// Rd must not be the same register as Rm or Rn.
|
34
|
+
//
|
35
|
+
// ARM v7 is like ARM v6 plus:
|
36
|
+
// There are half-word and byte versions of the LDREX and STREX instructions,
|
37
|
+
// LDREXH, LDREXB, STREXH and STREXB.
|
38
|
+
// There are also double-word versions, LDREXD and STREXD.
|
39
|
+
// (Actually it looks like these are available from version 6k onwards.)
|
40
|
+
// FIXME these are not yet used; should be mostly a matter of copy-and-paste.
|
41
|
+
// I think you can supply an immediate offset to the address.
|
42
|
+
//
|
43
|
+
// A memory barrier is effected using a "co-processor 15" instruction,
|
44
|
+
// though a separate assembler mnemonic is available for it in v7.
|
45
|
+
|
46
|
+
namespace boost {
|
47
|
+
namespace atomics {
|
48
|
+
namespace detail {
|
49
|
+
|
50
|
+
// "Thumb 1" is a subset of the ARM instruction set that uses a 16-bit encoding. It
|
51
|
+
// doesn't include all instructions and in particular it doesn't include the co-processor
|
52
|
+
// instruction used for the memory barrier or the load-locked/store-conditional
|
53
|
+
// instructions. So, if we're compiling in "Thumb 1" mode, we need to wrap all of our
|
54
|
+
// asm blocks with code to temporarily change to ARM mode.
|
55
|
+
//
|
56
|
+
// You can only change between ARM and Thumb modes when branching using the bx instruction.
|
57
|
+
// bx takes an address specified in a register. The least significant bit of the address
|
58
|
+
// indicates the mode, so 1 is added to indicate that the destination code is Thumb.
|
59
|
+
// A temporary register is needed for the address and is passed as an argument to these
|
60
|
+
// macros. It must be one of the "low" registers accessible to Thumb code, specified
|
61
|
+
// using the "l" attribute in the asm statement.
|
62
|
+
//
|
63
|
+
// Architecture v7 introduces "Thumb 2", which does include (almost?) all of the ARM
|
64
|
+
// instruction set. So in v7 we don't need to change to ARM mode; we can write "universal
|
65
|
+
// assembler" which will assemble to Thumb 2 or ARM code as appropriate. The only thing
|
66
|
+
// we need to do to make this "universal" assembler mode work is to insert "IT" instructions
|
67
|
+
// to annotate the conditional instructions. These are ignored in other modes (e.g. v6),
|
68
|
+
// so they can always be present.
|
69
|
+
|
70
|
+
#if defined(__thumb__) && !defined(__ARM_ARCH_7A__)
|
71
|
+
// FIXME also other v7 variants.
|
72
|
+
#define BOOST_ATOMIC_ARM_ASM_START(TMPREG) "adr " #TMPREG ", 1f\n" "bx " #TMPREG "\n" ".arm\n" ".align 4\n" "1: "
|
73
|
+
#define BOOST_ATOMIC_ARM_ASM_END(TMPREG) "adr " #TMPREG ", 1f + 1\n" "bx " #TMPREG "\n" ".thumb\n" ".align 2\n" "1: "
|
74
|
+
|
75
|
+
#else
|
76
|
+
// The tmpreg is wasted in this case, which is non-optimal.
|
77
|
+
#define BOOST_ATOMIC_ARM_ASM_START(TMPREG)
|
78
|
+
#define BOOST_ATOMIC_ARM_ASM_END(TMPREG)
|
79
|
+
#endif
|
80
|
+
|
81
|
+
#if defined(__ARM_ARCH_7A__)
|
82
|
+
// FIXME ditto.
|
83
|
+
#define BOOST_ATOMIC_ARM_DMB "dmb\n"
|
84
|
+
#else
|
85
|
+
#define BOOST_ATOMIC_ARM_DMB "mcr\tp15, 0, r0, c7, c10, 5\n"
|
86
|
+
#endif
|
87
|
+
|
88
|
+
inline void
|
89
|
+
arm_barrier(void)
|
90
|
+
{
|
91
|
+
int brtmp;
|
92
|
+
__asm__ __volatile__ (
|
93
|
+
BOOST_ATOMIC_ARM_ASM_START(%0)
|
94
|
+
BOOST_ATOMIC_ARM_DMB
|
95
|
+
BOOST_ATOMIC_ARM_ASM_END(%0)
|
96
|
+
: "=&l" (brtmp) :: "memory"
|
97
|
+
);
|
98
|
+
}
|
99
|
+
|
100
|
+
inline void
|
101
|
+
platform_fence_before(memory_order order)
|
102
|
+
{
|
103
|
+
switch(order) {
|
104
|
+
case memory_order_release:
|
105
|
+
case memory_order_acq_rel:
|
106
|
+
case memory_order_seq_cst:
|
107
|
+
arm_barrier();
|
108
|
+
case memory_order_consume:
|
109
|
+
default:;
|
110
|
+
}
|
111
|
+
}
|
112
|
+
|
113
|
+
inline void
|
114
|
+
platform_fence_after(memory_order order)
|
115
|
+
{
|
116
|
+
switch(order) {
|
117
|
+
case memory_order_acquire:
|
118
|
+
case memory_order_acq_rel:
|
119
|
+
case memory_order_seq_cst:
|
120
|
+
arm_barrier();
|
121
|
+
default:;
|
122
|
+
}
|
123
|
+
}
|
124
|
+
|
125
|
+
inline void
|
126
|
+
platform_fence_before_store(memory_order order)
|
127
|
+
{
|
128
|
+
platform_fence_before(order);
|
129
|
+
}
|
130
|
+
|
131
|
+
inline void
|
132
|
+
platform_fence_after_store(memory_order order)
|
133
|
+
{
|
134
|
+
if (order == memory_order_seq_cst)
|
135
|
+
arm_barrier();
|
136
|
+
}
|
137
|
+
|
138
|
+
inline void
|
139
|
+
platform_fence_after_load(memory_order order)
|
140
|
+
{
|
141
|
+
platform_fence_after(order);
|
142
|
+
}
|
143
|
+
|
144
|
+
template<typename T>
|
145
|
+
inline bool
|
146
|
+
platform_cmpxchg32(T & expected, T desired, volatile T * ptr)
|
147
|
+
{
|
148
|
+
int success;
|
149
|
+
int tmp;
|
150
|
+
__asm__ (
|
151
|
+
BOOST_ATOMIC_ARM_ASM_START(%2)
|
152
|
+
"mov %1, #0\n" // success = 0
|
153
|
+
"ldrex %0, %3\n" // expected' = *(&i)
|
154
|
+
"teq %0, %4\n" // flags = expected'==expected
|
155
|
+
"ittt eq\n"
|
156
|
+
"strexeq %2, %5, %3\n" // if (flags.equal) *(&i) = desired, tmp = !OK
|
157
|
+
"teqeq %2, #0\n" // if (flags.equal) flags = tmp==0
|
158
|
+
"moveq %1, #1\n" // if (flags.equal) success = 1
|
159
|
+
BOOST_ATOMIC_ARM_ASM_END(%2)
|
160
|
+
: "=&r" (expected), // %0
|
161
|
+
"=&r" (success), // %1
|
162
|
+
"=&l" (tmp), // %2
|
163
|
+
"+Q" (*ptr) // %3
|
164
|
+
: "r" (expected), // %4
|
165
|
+
"r" (desired) // %5
|
166
|
+
: "cc"
|
167
|
+
);
|
168
|
+
return success;
|
169
|
+
}
|
170
|
+
|
171
|
+
}
|
172
|
+
}
|
173
|
+
|
174
|
+
#define BOOST_ATOMIC_THREAD_FENCE 2
|
175
|
+
inline void
|
176
|
+
atomic_thread_fence(memory_order order)
|
177
|
+
{
|
178
|
+
switch(order) {
|
179
|
+
case memory_order_acquire:
|
180
|
+
case memory_order_release:
|
181
|
+
case memory_order_acq_rel:
|
182
|
+
case memory_order_seq_cst:
|
183
|
+
atomics::detail::arm_barrier();
|
184
|
+
default:;
|
185
|
+
}
|
186
|
+
}
|
187
|
+
|
188
|
+
#define BOOST_ATOMIC_SIGNAL_FENCE 2
|
189
|
+
inline void
|
190
|
+
atomic_signal_fence(memory_order)
|
191
|
+
{
|
192
|
+
__asm__ __volatile__ ("" ::: "memory");
|
193
|
+
}
|
194
|
+
|
195
|
+
class atomic_flag
|
196
|
+
{
|
197
|
+
private:
|
198
|
+
atomic_flag(const atomic_flag &) /* = delete */ ;
|
199
|
+
atomic_flag & operator=(const atomic_flag &) /* = delete */ ;
|
200
|
+
uint32_t v_;
|
201
|
+
public:
|
202
|
+
BOOST_CONSTEXPR atomic_flag(void) BOOST_NOEXCEPT : v_(0) {}
|
203
|
+
|
204
|
+
void
|
205
|
+
clear(memory_order order = memory_order_seq_cst) volatile BOOST_NOEXCEPT
|
206
|
+
{
|
207
|
+
atomics::detail::platform_fence_before_store(order);
|
208
|
+
const_cast<volatile uint32_t &>(v_) = 0;
|
209
|
+
atomics::detail::platform_fence_after_store(order);
|
210
|
+
}
|
211
|
+
|
212
|
+
bool
|
213
|
+
test_and_set(memory_order order = memory_order_seq_cst) volatile BOOST_NOEXCEPT
|
214
|
+
{
|
215
|
+
atomics::detail::platform_fence_before(order);
|
216
|
+
uint32_t expected = v_;
|
217
|
+
do {
|
218
|
+
if (expected == 1)
|
219
|
+
break;
|
220
|
+
} while (!atomics::detail::platform_cmpxchg32(expected, (uint32_t)1, &v_));
|
221
|
+
atomics::detail::platform_fence_after(order);
|
222
|
+
return expected;
|
223
|
+
}
|
224
|
+
};
|
225
|
+
#define BOOST_ATOMIC_FLAG_LOCK_FREE 2
|
226
|
+
|
227
|
+
}
|
228
|
+
|
229
|
+
#undef BOOST_ATOMIC_ARM_ASM_START
|
230
|
+
#undef BOOST_ATOMIC_ARM_ASM_END
|
231
|
+
|
232
|
+
#include <boost/atomic/detail/base.hpp>
|
233
|
+
|
234
|
+
#if !defined(BOOST_ATOMIC_FORCE_FALLBACK)
|
235
|
+
|
236
|
+
#define BOOST_ATOMIC_CHAR_LOCK_FREE 2
|
237
|
+
#define BOOST_ATOMIC_CHAR16_T_LOCK_FREE 2
|
238
|
+
#define BOOST_ATOMIC_CHAR32_T_LOCK_FREE 2
|
239
|
+
#define BOOST_ATOMIC_WCHAR_T_LOCK_FREE 2
|
240
|
+
#define BOOST_ATOMIC_SHORT_LOCK_FREE 2
|
241
|
+
#define BOOST_ATOMIC_INT_LOCK_FREE 2
|
242
|
+
#define BOOST_ATOMIC_LONG_LOCK_FREE 2
|
243
|
+
#define BOOST_ATOMIC_LLONG_LOCK_FREE 0
|
244
|
+
#define BOOST_ATOMIC_POINTER_LOCK_FREE 2
|
245
|
+
#define BOOST_ATOMIC_BOOL_LOCK_FREE 2
|
246
|
+
|
247
|
+
#include <boost/atomic/detail/cas32weak.hpp>
|
248
|
+
|
249
|
+
#endif /* !defined(BOOST_ATOMIC_FORCE_FALLBACK) */
|
250
|
+
|
251
|
+
#endif
|
252
|
+
|