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,206 @@
|
|
1
|
+
#ifndef BOOST_ATOMIC_DETAIL_GENERIC_CAS_HPP
|
2
|
+
#define BOOST_ATOMIC_DETAIL_GENERIC_CAS_HPP
|
3
|
+
|
4
|
+
// Copyright (c) 2009 Helge Bahmann
|
5
|
+
//
|
6
|
+
// Distributed under the Boost Software License, Version 1.0.
|
7
|
+
// See accompanying file LICENSE_1_0.txt or copy at
|
8
|
+
// http://www.boost.org/LICENSE_1_0.txt)
|
9
|
+
|
10
|
+
#include <cstddef>
|
11
|
+
#include <boost/cstdint.hpp>
|
12
|
+
#include <boost/memory_order.hpp>
|
13
|
+
#include <boost/atomic/detail/config.hpp>
|
14
|
+
#include <boost/atomic/detail/base.hpp>
|
15
|
+
#include <boost/atomic/detail/builder.hpp>
|
16
|
+
|
17
|
+
#ifdef BOOST_ATOMIC_HAS_PRAGMA_ONCE
|
18
|
+
#pragma once
|
19
|
+
#endif
|
20
|
+
|
21
|
+
/* fallback implementation for various compilation targets;
|
22
|
+
this is *not* efficient, particularly because all operations
|
23
|
+
are fully fenced (full memory barriers before and after
|
24
|
+
each operation) */
|
25
|
+
|
26
|
+
#if defined(__GNUC__)
|
27
|
+
namespace boost { namespace atomics { namespace detail {
|
28
|
+
inline int32_t
|
29
|
+
fenced_compare_exchange_strong_32(volatile int32_t *ptr, int32_t expected, int32_t desired)
|
30
|
+
{
|
31
|
+
return __sync_val_compare_and_swap_4(ptr, expected, desired);
|
32
|
+
}
|
33
|
+
#define BOOST_ATOMIC_HAVE_CAS32 1
|
34
|
+
|
35
|
+
#if defined(__amd64__) || defined(__i686__)
|
36
|
+
inline int64_t
|
37
|
+
fenced_compare_exchange_strong_64(int64_t *ptr, int64_t expected, int64_t desired)
|
38
|
+
{
|
39
|
+
return __sync_val_compare_and_swap_8(ptr, expected, desired);
|
40
|
+
}
|
41
|
+
#define BOOST_ATOMIC_HAVE_CAS64 1
|
42
|
+
#endif
|
43
|
+
}}}
|
44
|
+
|
45
|
+
#elif defined(__ICL) || defined(_MSC_VER)
|
46
|
+
|
47
|
+
#if defined(_MSC_VER)
|
48
|
+
#include <Windows.h>
|
49
|
+
#include <intrin.h>
|
50
|
+
#endif
|
51
|
+
|
52
|
+
namespace boost { namespace atomics { namespace detail {
|
53
|
+
inline int32_t
|
54
|
+
fenced_compare_exchange_strong(int32_t *ptr, int32_t expected, int32_t desired)
|
55
|
+
{
|
56
|
+
return _InterlockedCompareExchange(reinterpret_cast<volatile long*>(ptr), desired, expected);
|
57
|
+
}
|
58
|
+
#define BOOST_ATOMIC_HAVE_CAS32 1
|
59
|
+
#if defined(_WIN64)
|
60
|
+
inline int64_t
|
61
|
+
fenced_compare_exchange_strong(int64_t *ptr, int64_t expected, int64_t desired)
|
62
|
+
{
|
63
|
+
return _InterlockedCompareExchange64(ptr, desired, expected);
|
64
|
+
}
|
65
|
+
#define BOOST_ATOMIC_HAVE_CAS64 1
|
66
|
+
#endif
|
67
|
+
}}}
|
68
|
+
|
69
|
+
#elif (defined(__ICC) || defined(__ECC))
|
70
|
+
namespace boost { namespace atomics { namespace detail {
|
71
|
+
inline int32_t
|
72
|
+
fenced_compare_exchange_strong_32(int32_t *ptr, int32_t expected, int32_t desired)
|
73
|
+
{
|
74
|
+
return _InterlockedCompareExchange((void*)ptr, desired, expected);
|
75
|
+
}
|
76
|
+
#define BOOST_ATOMIC_HAVE_CAS32 1
|
77
|
+
#if defined(__x86_64)
|
78
|
+
inline int64_t
|
79
|
+
fenced_compare_exchange_strong(int64_t *ptr, int64_t expected, int64_t desired)
|
80
|
+
{
|
81
|
+
return cas64<int>(ptr, expected, desired);
|
82
|
+
}
|
83
|
+
#define BOOST_ATOMIC_HAVE_CAS64 1
|
84
|
+
#elif defined(__ECC) //IA-64 version
|
85
|
+
inline int64_t
|
86
|
+
fenced_compare_exchange_strong(int64_t *ptr, int64_t expected, int64_t desired)
|
87
|
+
{
|
88
|
+
return _InterlockedCompareExchange64((void*)ptr, desired, expected);
|
89
|
+
}
|
90
|
+
#define BOOST_ATOMIC_HAVE_CAS64 1
|
91
|
+
#endif
|
92
|
+
}}}
|
93
|
+
|
94
|
+
#elif (defined(__SUNPRO_CC) && defined(__sparc))
|
95
|
+
#include <sys/atomic.h>
|
96
|
+
namespace boost { namespace atomics { namespace detail {
|
97
|
+
inline int32_t
|
98
|
+
fenced_compare_exchange_strong_32(int32_t *ptr, int32_t expected, int32_t desired)
|
99
|
+
{
|
100
|
+
return atomic_cas_32((volatile unsigned int*)ptr, expected, desired);
|
101
|
+
}
|
102
|
+
#define BOOST_ATOMIC_HAVE_CAS32 1
|
103
|
+
|
104
|
+
/* FIXME: check for 64 bit mode */
|
105
|
+
inline int64_t
|
106
|
+
fenced_compare_exchange_strong_64(int64_t *ptr, int64_t expected, int64_t desired)
|
107
|
+
{
|
108
|
+
return atomic_cas_64((volatile unsigned long long*)ptr, expected, desired);
|
109
|
+
}
|
110
|
+
#define BOOST_ATOMIC_HAVE_CAS64 1
|
111
|
+
}}}
|
112
|
+
#endif
|
113
|
+
|
114
|
+
|
115
|
+
namespace boost {
|
116
|
+
namespace atomics {
|
117
|
+
namespace detail {
|
118
|
+
|
119
|
+
#ifdef BOOST_ATOMIC_HAVE_CAS32
|
120
|
+
template<typename T>
|
121
|
+
class atomic_generic_cas32
|
122
|
+
{
|
123
|
+
private:
|
124
|
+
typedef atomic_generic_cas32 this_type;
|
125
|
+
public:
|
126
|
+
explicit atomic_generic_cas32(T v) : i((int32_t)v) {}
|
127
|
+
atomic_generic_cas32() {}
|
128
|
+
T load(memory_order order=memory_order_seq_cst) const volatile
|
129
|
+
{
|
130
|
+
T expected=(T)i;
|
131
|
+
do { } while(!const_cast<this_type *>(this)->compare_exchange_weak(expected, expected, order, memory_order_relaxed));
|
132
|
+
return expected;
|
133
|
+
}
|
134
|
+
void store(T v, memory_order order=memory_order_seq_cst) volatile
|
135
|
+
{
|
136
|
+
exchange(v);
|
137
|
+
}
|
138
|
+
bool compare_exchange_strong(
|
139
|
+
T &expected,
|
140
|
+
T desired,
|
141
|
+
memory_order success_order,
|
142
|
+
memory_order failure_order) volatile
|
143
|
+
{
|
144
|
+
T found;
|
145
|
+
found=(T)fenced_compare_exchange_strong_32(&i, (int32_t)expected, (int32_t)desired);
|
146
|
+
bool success=(found==expected);
|
147
|
+
expected=found;
|
148
|
+
return success;
|
149
|
+
}
|
150
|
+
bool compare_exchange_weak(
|
151
|
+
T &expected,
|
152
|
+
T desired,
|
153
|
+
memory_order success_order,
|
154
|
+
memory_order failure_order) volatile
|
155
|
+
{
|
156
|
+
return compare_exchange_strong(expected, desired, success_order, failure_order);
|
157
|
+
}
|
158
|
+
T exchange(T r, memory_order order=memory_order_seq_cst) volatile
|
159
|
+
{
|
160
|
+
T expected=(T)i;
|
161
|
+
do { } while(!compare_exchange_weak(expected, r, order, memory_order_relaxed));
|
162
|
+
return expected;
|
163
|
+
}
|
164
|
+
|
165
|
+
bool is_lock_free(void) const volatile {return true;}
|
166
|
+
typedef T integral_type;
|
167
|
+
private:
|
168
|
+
mutable int32_t i;
|
169
|
+
};
|
170
|
+
|
171
|
+
template<typename T>
|
172
|
+
class platform_atomic_integral<T, 4> :
|
173
|
+
public build_atomic_from_exchange<atomic_generic_cas32<T> >
|
174
|
+
{
|
175
|
+
public:
|
176
|
+
typedef build_atomic_from_exchange<atomic_generic_cas32<T> > super;
|
177
|
+
explicit platform_atomic_integral(T v) : super(v) {}
|
178
|
+
platform_atomic_integral(void) {}
|
179
|
+
};
|
180
|
+
|
181
|
+
template<typename T>
|
182
|
+
class platform_atomic_integral<T, 1> :
|
183
|
+
public build_atomic_from_larger_type<atomic_generic_cas32<int32_t>, T>
|
184
|
+
{
|
185
|
+
public:
|
186
|
+
typedef build_atomic_from_larger_type<atomic_generic_cas32<int32_t>, T> super;
|
187
|
+
|
188
|
+
explicit platform_atomic_integral(T v) : super(v) {}
|
189
|
+
platform_atomic_integral(void) {}
|
190
|
+
};
|
191
|
+
|
192
|
+
template<typename T>
|
193
|
+
class platform_atomic_integral<T, 2> :
|
194
|
+
public build_atomic_from_larger_type<atomic_generic_cas32<int32_t>, T>
|
195
|
+
{
|
196
|
+
public:
|
197
|
+
typedef build_atomic_from_larger_type<atomic_generic_cas32<int32_t>, T> super;
|
198
|
+
|
199
|
+
explicit platform_atomic_integral(T v) : super(v) {}
|
200
|
+
platform_atomic_integral(void) {}
|
201
|
+
};
|
202
|
+
#endif
|
203
|
+
|
204
|
+
} } }
|
205
|
+
|
206
|
+
#endif
|
@@ -0,0 +1,200 @@
|
|
1
|
+
#ifndef BOOST_ATOMIC_DETAIL_INTERLOCKED_HPP
|
2
|
+
#define BOOST_ATOMIC_DETAIL_INTERLOCKED_HPP
|
3
|
+
|
4
|
+
// Copyright (c) 2009 Helge Bahmann
|
5
|
+
// Copyright (c) 2012, 2013 Andrey Semashev
|
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
|
+
|
13
|
+
#ifdef BOOST_ATOMIC_HAS_PRAGMA_ONCE
|
14
|
+
#pragma once
|
15
|
+
#endif
|
16
|
+
|
17
|
+
#if defined(_WIN32_WCE) || (defined(_MSC_VER) && _MSC_VER < 1400)
|
18
|
+
|
19
|
+
#include <boost/detail/interlocked.hpp>
|
20
|
+
|
21
|
+
#define BOOST_ATOMIC_INTERLOCKED_COMPARE_EXCHANGE(dest, exchange, compare) BOOST_INTERLOCKED_COMPARE_EXCHANGE((long*)(dest), exchange, compare)
|
22
|
+
#define BOOST_ATOMIC_INTERLOCKED_EXCHANGE(dest, newval) BOOST_INTERLOCKED_EXCHANGE((long*)(dest), newval)
|
23
|
+
#define BOOST_ATOMIC_INTERLOCKED_EXCHANGE_ADD(dest, addend) BOOST_INTERLOCKED_EXCHANGE_ADD((long*)(dest), addend)
|
24
|
+
#define BOOST_ATOMIC_INTERLOCKED_COMPARE_EXCHANGE_POINTER(dest, exchange, compare) BOOST_INTERLOCKED_COMPARE_EXCHANGE_POINTER(dest, exchange, compare)
|
25
|
+
#define BOOST_ATOMIC_INTERLOCKED_EXCHANGE_POINTER(dest, newval) BOOST_INTERLOCKED_EXCHANGE_POINTER(dest, newval)
|
26
|
+
#define BOOST_ATOMIC_INTERLOCKED_EXCHANGE_ADD_POINTER(dest, byte_offset) ((void*)BOOST_INTERLOCKED_EXCHANGE_ADD((long*)(dest), byte_offset))
|
27
|
+
|
28
|
+
#elif defined(_MSC_VER) && _MSC_VER >= 1400
|
29
|
+
|
30
|
+
#include <intrin.h>
|
31
|
+
|
32
|
+
#pragma intrinsic(_InterlockedCompareExchange)
|
33
|
+
#pragma intrinsic(_InterlockedExchangeAdd)
|
34
|
+
#pragma intrinsic(_InterlockedExchange)
|
35
|
+
#pragma intrinsic(_InterlockedAnd)
|
36
|
+
#pragma intrinsic(_InterlockedOr)
|
37
|
+
#pragma intrinsic(_InterlockedXor)
|
38
|
+
|
39
|
+
#define BOOST_ATOMIC_INTERLOCKED_COMPARE_EXCHANGE(dest, exchange, compare) _InterlockedCompareExchange((long*)(dest), (long)(exchange), (long)(compare))
|
40
|
+
#define BOOST_ATOMIC_INTERLOCKED_EXCHANGE_ADD(dest, addend) _InterlockedExchangeAdd((long*)(dest), (long)(addend))
|
41
|
+
#define BOOST_ATOMIC_INTERLOCKED_EXCHANGE(dest, newval) _InterlockedExchange((long*)(dest), (long)(newval))
|
42
|
+
#define BOOST_ATOMIC_INTERLOCKED_AND(dest, arg) _InterlockedAnd((long*)(dest), (long)(arg))
|
43
|
+
#define BOOST_ATOMIC_INTERLOCKED_OR(dest, arg) _InterlockedOr((long*)(dest), (long)(arg))
|
44
|
+
#define BOOST_ATOMIC_INTERLOCKED_XOR(dest, arg) _InterlockedXor((long*)(dest), (long)(arg))
|
45
|
+
|
46
|
+
#if _MSC_VER >= 1600
|
47
|
+
|
48
|
+
// MSVC 2010 and later provide intrinsics for 8 and 16 bit integers.
|
49
|
+
// Note that for each bit count these macros must be either all defined or all not defined.
|
50
|
+
// Otherwise atomic<> operations will be implemented inconsistently.
|
51
|
+
|
52
|
+
#pragma intrinsic(_InterlockedCompareExchange8)
|
53
|
+
#pragma intrinsic(_InterlockedExchangeAdd8)
|
54
|
+
#pragma intrinsic(_InterlockedExchange8)
|
55
|
+
#pragma intrinsic(_InterlockedAnd8)
|
56
|
+
#pragma intrinsic(_InterlockedOr8)
|
57
|
+
#pragma intrinsic(_InterlockedXor8)
|
58
|
+
|
59
|
+
#define BOOST_ATOMIC_INTERLOCKED_COMPARE_EXCHANGE8(dest, exchange, compare) _InterlockedCompareExchange8((char*)(dest), (char)(exchange), (char)(compare))
|
60
|
+
#define BOOST_ATOMIC_INTERLOCKED_EXCHANGE_ADD8(dest, addend) _InterlockedExchangeAdd8((char*)(dest), (char)(addend))
|
61
|
+
#define BOOST_ATOMIC_INTERLOCKED_EXCHANGE8(dest, newval) _InterlockedExchange8((char*)(dest), (char)(newval))
|
62
|
+
#define BOOST_ATOMIC_INTERLOCKED_AND8(dest, arg) _InterlockedAnd8((char*)(dest), (char)(arg))
|
63
|
+
#define BOOST_ATOMIC_INTERLOCKED_OR8(dest, arg) _InterlockedOr8((char*)(dest), (char)(arg))
|
64
|
+
#define BOOST_ATOMIC_INTERLOCKED_XOR8(dest, arg) _InterlockedXor8((char*)(dest), (char)(arg))
|
65
|
+
|
66
|
+
#pragma intrinsic(_InterlockedCompareExchange16)
|
67
|
+
#pragma intrinsic(_InterlockedExchangeAdd16)
|
68
|
+
#pragma intrinsic(_InterlockedExchange16)
|
69
|
+
#pragma intrinsic(_InterlockedAnd16)
|
70
|
+
#pragma intrinsic(_InterlockedOr16)
|
71
|
+
#pragma intrinsic(_InterlockedXor16)
|
72
|
+
|
73
|
+
#define BOOST_ATOMIC_INTERLOCKED_COMPARE_EXCHANGE16(dest, exchange, compare) _InterlockedCompareExchange16((short*)(dest), (short)(exchange), (short)(compare))
|
74
|
+
#define BOOST_ATOMIC_INTERLOCKED_EXCHANGE_ADD16(dest, addend) _InterlockedExchangeAdd16((short*)(dest), (short)(addend))
|
75
|
+
#define BOOST_ATOMIC_INTERLOCKED_EXCHANGE16(dest, newval) _InterlockedExchange16((short*)(dest), (short)(newval))
|
76
|
+
#define BOOST_ATOMIC_INTERLOCKED_AND16(dest, arg) _InterlockedAnd16((short*)(dest), (short)(arg))
|
77
|
+
#define BOOST_ATOMIC_INTERLOCKED_OR16(dest, arg) _InterlockedOr16((short*)(dest), (short)(arg))
|
78
|
+
#define BOOST_ATOMIC_INTERLOCKED_XOR16(dest, arg) _InterlockedXor16((short*)(dest), (short)(arg))
|
79
|
+
|
80
|
+
#endif // _MSC_VER >= 1600
|
81
|
+
|
82
|
+
#if defined(_M_AMD64) || defined(_M_IA64)
|
83
|
+
|
84
|
+
#pragma intrinsic(_InterlockedCompareExchange64)
|
85
|
+
#pragma intrinsic(_InterlockedExchangeAdd64)
|
86
|
+
#pragma intrinsic(_InterlockedExchange64)
|
87
|
+
#pragma intrinsic(_InterlockedAnd64)
|
88
|
+
#pragma intrinsic(_InterlockedOr64)
|
89
|
+
#pragma intrinsic(_InterlockedXor64)
|
90
|
+
|
91
|
+
#define BOOST_ATOMIC_INTERLOCKED_COMPARE_EXCHANGE64(dest, exchange, compare) _InterlockedCompareExchange64((__int64*)(dest), (__int64)(exchange), (__int64)(compare))
|
92
|
+
#define BOOST_ATOMIC_INTERLOCKED_EXCHANGE_ADD64(dest, addend) _InterlockedExchangeAdd64((__int64*)(dest), (__int64)(addend))
|
93
|
+
#define BOOST_ATOMIC_INTERLOCKED_EXCHANGE64(dest, newval) _InterlockedExchange64((__int64*)(dest), (__int64)(newval))
|
94
|
+
#define BOOST_ATOMIC_INTERLOCKED_AND64(dest, arg) _InterlockedAnd64((__int64*)(dest), (__int64)(arg))
|
95
|
+
#define BOOST_ATOMIC_INTERLOCKED_OR64(dest, arg) _InterlockedOr64((__int64*)(dest), (__int64)(arg))
|
96
|
+
#define BOOST_ATOMIC_INTERLOCKED_XOR64(dest, arg) _InterlockedXor64((__int64*)(dest), (__int64)(arg))
|
97
|
+
|
98
|
+
#pragma intrinsic(_InterlockedCompareExchangePointer)
|
99
|
+
#pragma intrinsic(_InterlockedExchangePointer)
|
100
|
+
|
101
|
+
#define BOOST_ATOMIC_INTERLOCKED_COMPARE_EXCHANGE_POINTER(dest, exchange, compare) _InterlockedCompareExchangePointer((void**)(dest), (void*)(exchange), (void*)(compare))
|
102
|
+
#define BOOST_ATOMIC_INTERLOCKED_EXCHANGE_POINTER(dest, newval) _InterlockedExchangePointer((void**)(dest), (void*)(newval))
|
103
|
+
#define BOOST_ATOMIC_INTERLOCKED_EXCHANGE_ADD_POINTER(dest, byte_offset) ((void*)BOOST_ATOMIC_INTERLOCKED_EXCHANGE_ADD64((long*)(dest), byte_offset))
|
104
|
+
|
105
|
+
#else // defined(_M_AMD64) || defined(_M_IA64)
|
106
|
+
|
107
|
+
#define BOOST_ATOMIC_INTERLOCKED_COMPARE_EXCHANGE_POINTER(dest, exchange, compare) ((void*)_InterlockedCompareExchange((long*)(dest), (long)(exchange), (long)(compare)))
|
108
|
+
#define BOOST_ATOMIC_INTERLOCKED_EXCHANGE_POINTER(dest, newval) ((void*)_InterlockedExchange((long*)(dest), (long)(newval)))
|
109
|
+
#define BOOST_ATOMIC_INTERLOCKED_EXCHANGE_ADD_POINTER(dest, byte_offset) ((void*)BOOST_ATOMIC_INTERLOCKED_EXCHANGE_ADD((long*)(dest), byte_offset))
|
110
|
+
|
111
|
+
#endif // defined(_M_AMD64) || defined(_M_IA64)
|
112
|
+
|
113
|
+
#else // defined(_MSC_VER) && _MSC_VER >= 1400
|
114
|
+
|
115
|
+
#if defined(BOOST_USE_WINDOWS_H)
|
116
|
+
|
117
|
+
#include <windows.h>
|
118
|
+
|
119
|
+
#define BOOST_ATOMIC_INTERLOCKED_COMPARE_EXCHANGE(dest, exchange, compare) InterlockedCompareExchange((long*)(dest), (long)(exchange), (long)(compare))
|
120
|
+
#define BOOST_ATOMIC_INTERLOCKED_EXCHANGE(dest, newval) InterlockedExchange((long*)(dest), (long)(newval))
|
121
|
+
#define BOOST_ATOMIC_INTERLOCKED_EXCHANGE_ADD(dest, addend) InterlockedExchangeAdd((long*)(dest), (long)(addend))
|
122
|
+
|
123
|
+
#if defined(_WIN64)
|
124
|
+
|
125
|
+
#define BOOST_ATOMIC_INTERLOCKED_COMPARE_EXCHANGE64(dest, exchange, compare) InterlockedCompareExchange64((__int64*)(dest), (__int64)(exchange), (__int64)(compare))
|
126
|
+
#define BOOST_ATOMIC_INTERLOCKED_EXCHANGE64(dest, newval) InterlockedExchange64((__int64*)(dest), (__int64)(newval))
|
127
|
+
#define BOOST_ATOMIC_INTERLOCKED_EXCHANGE_ADD64(dest, addend) InterlockedExchangeAdd64((__int64*)(dest), (__int64)(addend))
|
128
|
+
|
129
|
+
#define BOOST_ATOMIC_INTERLOCKED_COMPARE_EXCHANGE_POINTER(dest, exchange, compare) InterlockedCompareExchangePointer((void**)(dest), (void*)(exchange), (void*)(compare))
|
130
|
+
#define BOOST_ATOMIC_INTERLOCKED_EXCHANGE_POINTER(dest, newval) InterlockedExchangePointer((void**)(dest), (void*)(newval))
|
131
|
+
#define BOOST_ATOMIC_INTERLOCKED_EXCHANGE_ADD_POINTER(dest, byte_offset) ((void*)BOOST_ATOMIC_INTERLOCKED_EXCHANGE_ADD64(dest, byte_offset))
|
132
|
+
|
133
|
+
#else // defined(_WIN64)
|
134
|
+
|
135
|
+
#define BOOST_ATOMIC_INTERLOCKED_COMPARE_EXCHANGE_POINTER(dest, exchange, compare) ((void*)BOOST_ATOMIC_INTERLOCKED_COMPARE_EXCHANGE(dest, exchange, compare))
|
136
|
+
#define BOOST_ATOMIC_INTERLOCKED_EXCHANGE_POINTER(dest, newval) ((void*)BOOST_ATOMIC_INTERLOCKED_EXCHANGE(dest, newval))
|
137
|
+
#define BOOST_ATOMIC_INTERLOCKED_EXCHANGE_ADD_POINTER(dest, byte_offset) ((void*)BOOST_ATOMIC_INTERLOCKED_EXCHANGE_ADD(dest, byte_offset))
|
138
|
+
|
139
|
+
#endif // defined(_WIN64)
|
140
|
+
|
141
|
+
#else // defined(BOOST_USE_WINDOWS_H)
|
142
|
+
|
143
|
+
#if defined(__MINGW64__)
|
144
|
+
#define BOOST_ATOMIC_INTERLOCKED_IMPORT
|
145
|
+
#else
|
146
|
+
#define BOOST_ATOMIC_INTERLOCKED_IMPORT __declspec(dllimport)
|
147
|
+
#endif
|
148
|
+
|
149
|
+
namespace boost {
|
150
|
+
namespace atomics {
|
151
|
+
namespace detail {
|
152
|
+
|
153
|
+
extern "C" {
|
154
|
+
|
155
|
+
BOOST_ATOMIC_INTERLOCKED_IMPORT long __stdcall InterlockedCompareExchange(long volatile*, long, long);
|
156
|
+
BOOST_ATOMIC_INTERLOCKED_IMPORT long __stdcall InterlockedExchange(long volatile*, long);
|
157
|
+
BOOST_ATOMIC_INTERLOCKED_IMPORT long __stdcall InterlockedExchangeAdd(long volatile*, long);
|
158
|
+
|
159
|
+
#define BOOST_ATOMIC_INTERLOCKED_COMPARE_EXCHANGE(dest, exchange, compare) boost::atomics::detail::InterlockedCompareExchange((long*)(dest), (long)(exchange), (long)(compare))
|
160
|
+
#define BOOST_ATOMIC_INTERLOCKED_EXCHANGE(dest, newval) boost::atomics::detail::InterlockedExchange((long*)(dest), (long)(newval))
|
161
|
+
#define BOOST_ATOMIC_INTERLOCKED_EXCHANGE_ADD(dest, addend) boost::atomics::detail::InterlockedExchangeAdd((long*)(dest), (long)(addend))
|
162
|
+
|
163
|
+
#if defined(_WIN64)
|
164
|
+
|
165
|
+
BOOST_ATOMIC_INTERLOCKED_IMPORT __int64 __stdcall InterlockedCompareExchange64(__int64 volatile*, __int64, __int64);
|
166
|
+
BOOST_ATOMIC_INTERLOCKED_IMPORT __int64 __stdcall InterlockedExchange64(__int64 volatile*, __int64);
|
167
|
+
BOOST_ATOMIC_INTERLOCKED_IMPORT __int64 __stdcall InterlockedExchangeAdd64(__int64 volatile*, __int64);
|
168
|
+
|
169
|
+
BOOST_ATOMIC_INTERLOCKED_IMPORT void* __stdcall InterlockedCompareExchangePointer(void* volatile *, void*, void*);
|
170
|
+
BOOST_ATOMIC_INTERLOCKED_IMPORT void* __stdcall InterlockedExchangePointer(void* volatile *, void*);
|
171
|
+
|
172
|
+
#define BOOST_ATOMIC_INTERLOCKED_COMPARE_EXCHANGE64(dest, exchange, compare) boost::atomics::detail::InterlockedCompareExchange64((__int64*)(dest), (__int64)(exchange), (__int64)(compare))
|
173
|
+
#define BOOST_ATOMIC_INTERLOCKED_EXCHANGE64(dest, newval) boost::atomics::detail::InterlockedExchange64((__int64*)(dest), (__int64)(newval))
|
174
|
+
#define BOOST_ATOMIC_INTERLOCKED_EXCHANGE_ADD64(dest, addend) boost::atomics::detail::InterlockedExchangeAdd64((__int64*)(dest), (__int64)(addend))
|
175
|
+
|
176
|
+
#define BOOST_ATOMIC_INTERLOCKED_COMPARE_EXCHANGE_POINTER(dest, exchange, compare) boost::atomics::detail::InterlockedCompareExchangePointer((void**)(dest), (void*)(exchange), (void*)(compare))
|
177
|
+
#define BOOST_ATOMIC_INTERLOCKED_EXCHANGE_POINTER(dest, newval) boost::atomics::detail::InterlockedExchangePointer((void**)(dest), (void*)(newval))
|
178
|
+
#define BOOST_ATOMIC_INTERLOCKED_EXCHANGE_ADD_POINTER(dest, byte_offset) ((void*)BOOST_ATOMIC_INTERLOCKED_EXCHANGE_ADD64(dest, byte_offset))
|
179
|
+
|
180
|
+
#else // defined(_WIN64)
|
181
|
+
|
182
|
+
#define BOOST_ATOMIC_INTERLOCKED_COMPARE_EXCHANGE_POINTER(dest, exchange, compare) ((void*)BOOST_ATOMIC_INTERLOCKED_COMPARE_EXCHANGE(dest, exchange, compare))
|
183
|
+
#define BOOST_ATOMIC_INTERLOCKED_EXCHANGE_POINTER(dest, newval) ((void*)BOOST_ATOMIC_INTERLOCKED_EXCHANGE(dest, newval))
|
184
|
+
#define BOOST_ATOMIC_INTERLOCKED_EXCHANGE_ADD_POINTER(dest, byte_offset) ((void*)BOOST_ATOMIC_INTERLOCKED_EXCHANGE_ADD(dest, byte_offset))
|
185
|
+
|
186
|
+
#endif // defined(_WIN64)
|
187
|
+
|
188
|
+
} // extern "C"
|
189
|
+
|
190
|
+
} // namespace detail
|
191
|
+
} // namespace atomics
|
192
|
+
} // namespace boost
|
193
|
+
|
194
|
+
#undef BOOST_ATOMIC_INTERLOCKED_IMPORT
|
195
|
+
|
196
|
+
#endif // defined(BOOST_USE_WINDOWS_H)
|
197
|
+
|
198
|
+
#endif // defined(_MSC_VER)
|
199
|
+
|
200
|
+
#endif
|
@@ -0,0 +1,189 @@
|
|
1
|
+
#ifndef BOOST_ATOMIC_DETAIL_LINUX_ARM_HPP
|
2
|
+
#define BOOST_ATOMIC_DETAIL_LINUX_ARM_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, 2011 Helge Bahmann
|
9
|
+
// Copyright (c) 2009 Phil Endecott
|
10
|
+
// Copyright (c) 2013 Tim Blechmann
|
11
|
+
// Linux-specific code by Phil Endecott
|
12
|
+
|
13
|
+
// Different ARM processors have different atomic instructions. In particular,
|
14
|
+
// architecture versions before v6 (which are still in widespread use, e.g. the
|
15
|
+
// Intel/Marvell XScale chips like the one in the NSLU2) have only atomic swap.
|
16
|
+
// On Linux the kernel provides some support that lets us abstract away from
|
17
|
+
// these differences: it provides emulated CAS and barrier functions at special
|
18
|
+
// addresses that are guaranteed not to be interrupted by the kernel. Using
|
19
|
+
// this facility is slightly slower than inline assembler would be, but much
|
20
|
+
// faster than a system call.
|
21
|
+
//
|
22
|
+
// While this emulated CAS is "strong" in the sense that it does not fail
|
23
|
+
// "spuriously" (i.e.: it never fails to perform the exchange when the value
|
24
|
+
// found equals the value expected), it does not return the found value on
|
25
|
+
// failure. To satisfy the atomic API, compare_exchange_{weak|strong} must
|
26
|
+
// return the found value on failure, and we have to manually load this value
|
27
|
+
// after the emulated CAS reports failure. This in turn introduces a race
|
28
|
+
// between the CAS failing (due to the "wrong" value being found) and subsequently
|
29
|
+
// loading (which might turn up the "right" value). From an application's
|
30
|
+
// point of view this looks like "spurious failure", and therefore the
|
31
|
+
// emulated CAS is only good enough to provide compare_exchange_weak
|
32
|
+
// semantics.
|
33
|
+
|
34
|
+
#include <cstddef>
|
35
|
+
#include <boost/cstdint.hpp>
|
36
|
+
#include <boost/memory_order.hpp>
|
37
|
+
#include <boost/atomic/detail/config.hpp>
|
38
|
+
|
39
|
+
#ifdef BOOST_ATOMIC_HAS_PRAGMA_ONCE
|
40
|
+
#pragma once
|
41
|
+
#endif
|
42
|
+
|
43
|
+
namespace boost {
|
44
|
+
namespace atomics {
|
45
|
+
namespace detail {
|
46
|
+
|
47
|
+
inline void
|
48
|
+
arm_barrier(void)
|
49
|
+
{
|
50
|
+
void (*kernel_dmb)(void) = (void (*)(void)) 0xffff0fa0;
|
51
|
+
kernel_dmb();
|
52
|
+
}
|
53
|
+
|
54
|
+
inline void
|
55
|
+
platform_fence_before(memory_order order)
|
56
|
+
{
|
57
|
+
switch(order) {
|
58
|
+
case memory_order_release:
|
59
|
+
case memory_order_acq_rel:
|
60
|
+
case memory_order_seq_cst:
|
61
|
+
arm_barrier();
|
62
|
+
case memory_order_consume:
|
63
|
+
default:;
|
64
|
+
}
|
65
|
+
}
|
66
|
+
|
67
|
+
inline void
|
68
|
+
platform_fence_after(memory_order order)
|
69
|
+
{
|
70
|
+
switch(order) {
|
71
|
+
case memory_order_acquire:
|
72
|
+
case memory_order_acq_rel:
|
73
|
+
case memory_order_seq_cst:
|
74
|
+
arm_barrier();
|
75
|
+
default:;
|
76
|
+
}
|
77
|
+
}
|
78
|
+
|
79
|
+
inline void
|
80
|
+
platform_fence_before_store(memory_order order)
|
81
|
+
{
|
82
|
+
platform_fence_before(order);
|
83
|
+
}
|
84
|
+
|
85
|
+
inline void
|
86
|
+
platform_fence_after_store(memory_order order)
|
87
|
+
{
|
88
|
+
if (order == memory_order_seq_cst)
|
89
|
+
arm_barrier();
|
90
|
+
}
|
91
|
+
|
92
|
+
inline void
|
93
|
+
platform_fence_after_load(memory_order order)
|
94
|
+
{
|
95
|
+
platform_fence_after(order);
|
96
|
+
}
|
97
|
+
|
98
|
+
template<typename T>
|
99
|
+
inline bool
|
100
|
+
platform_cmpxchg32(T & expected, T desired, volatile T * ptr)
|
101
|
+
{
|
102
|
+
typedef T (*kernel_cmpxchg32_t)(T oldval, T newval, volatile T * ptr);
|
103
|
+
|
104
|
+
if (((kernel_cmpxchg32_t) 0xffff0fc0)(expected, desired, ptr) == 0) {
|
105
|
+
return true;
|
106
|
+
} else {
|
107
|
+
expected = *ptr;
|
108
|
+
return false;
|
109
|
+
}
|
110
|
+
}
|
111
|
+
|
112
|
+
}
|
113
|
+
}
|
114
|
+
|
115
|
+
#define BOOST_ATOMIC_THREAD_FENCE 2
|
116
|
+
inline void
|
117
|
+
atomic_thread_fence(memory_order order)
|
118
|
+
{
|
119
|
+
switch(order) {
|
120
|
+
case memory_order_acquire:
|
121
|
+
case memory_order_release:
|
122
|
+
case memory_order_acq_rel:
|
123
|
+
case memory_order_seq_cst:
|
124
|
+
atomics::detail::arm_barrier();
|
125
|
+
default:;
|
126
|
+
}
|
127
|
+
}
|
128
|
+
|
129
|
+
#define BOOST_ATOMIC_SIGNAL_FENCE 2
|
130
|
+
inline void
|
131
|
+
atomic_signal_fence(memory_order)
|
132
|
+
{
|
133
|
+
__asm__ __volatile__ ("" ::: "memory");
|
134
|
+
}
|
135
|
+
|
136
|
+
class atomic_flag
|
137
|
+
{
|
138
|
+
private:
|
139
|
+
atomic_flag(const atomic_flag &) /* = delete */ ;
|
140
|
+
atomic_flag & operator=(const atomic_flag &) /* = delete */ ;
|
141
|
+
uint32_t v_;
|
142
|
+
public:
|
143
|
+
BOOST_CONSTEXPR atomic_flag(void) BOOST_NOEXCEPT : v_(0) {}
|
144
|
+
|
145
|
+
void
|
146
|
+
clear(memory_order order = memory_order_seq_cst) volatile BOOST_NOEXCEPT
|
147
|
+
{
|
148
|
+
atomics::detail::platform_fence_before_store(order);
|
149
|
+
const_cast<volatile uint32_t &>(v_) = 0;
|
150
|
+
atomics::detail::platform_fence_after_store(order);
|
151
|
+
}
|
152
|
+
|
153
|
+
bool
|
154
|
+
test_and_set(memory_order order = memory_order_seq_cst) volatile BOOST_NOEXCEPT
|
155
|
+
{
|
156
|
+
atomics::detail::platform_fence_before(order);
|
157
|
+
uint32_t expected = v_;
|
158
|
+
do {
|
159
|
+
if (expected == 1)
|
160
|
+
break;
|
161
|
+
} while (!atomics::detail::platform_cmpxchg32(expected, (uint32_t)1, &v_));
|
162
|
+
atomics::detail::platform_fence_after(order);
|
163
|
+
return expected;
|
164
|
+
}
|
165
|
+
};
|
166
|
+
#define BOOST_ATOMIC_FLAG_LOCK_FREE 2
|
167
|
+
|
168
|
+
}
|
169
|
+
|
170
|
+
#include <boost/atomic/detail/base.hpp>
|
171
|
+
|
172
|
+
#if !defined(BOOST_ATOMIC_FORCE_FALLBACK)
|
173
|
+
|
174
|
+
#define BOOST_ATOMIC_CHAR_LOCK_FREE 2
|
175
|
+
#define BOOST_ATOMIC_CHAR16_T_LOCK_FREE 2
|
176
|
+
#define BOOST_ATOMIC_CHAR32_T_LOCK_FREE 2
|
177
|
+
#define BOOST_ATOMIC_WCHAR_T_LOCK_FREE 2
|
178
|
+
#define BOOST_ATOMIC_SHORT_LOCK_FREE 2
|
179
|
+
#define BOOST_ATOMIC_INT_LOCK_FREE 2
|
180
|
+
#define BOOST_ATOMIC_LONG_LOCK_FREE 2
|
181
|
+
#define BOOST_ATOMIC_LLONG_LOCK_FREE 0
|
182
|
+
#define BOOST_ATOMIC_POINTER_LOCK_FREE 2
|
183
|
+
#define BOOST_ATOMIC_BOOL_LOCK_FREE 2
|
184
|
+
|
185
|
+
#include <boost/atomic/detail/cas32weak.hpp>
|
186
|
+
|
187
|
+
#endif /* !defined(BOOST_ATOMIC_FORCE_FALLBACK) */
|
188
|
+
|
189
|
+
#endif
|