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
@@ -1,6 +1,6 @@
|
|
1
1
|
// Copyright (C) 2001-2003
|
2
2
|
// William E. Kempf
|
3
|
-
// Copyright (C) 2011-
|
3
|
+
// Copyright (C) 2011-2013 Vicente J. Botet Escriba
|
4
4
|
//
|
5
5
|
// Distributed under the Boost Software License, Version 1.0. (See accompanying
|
6
6
|
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
@@ -8,111 +8,193 @@
|
|
8
8
|
#ifndef BOOST_THREAD_CONFIG_WEK01032003_HPP
|
9
9
|
#define BOOST_THREAD_CONFIG_WEK01032003_HPP
|
10
10
|
|
11
|
-
// Force SIG_ATOMIC_MAX to be defined
|
12
|
-
//#ifndef __STDC_LIMIT_MACROS
|
13
|
-
//#define __STDC_LIMIT_MACROS
|
14
|
-
//#endif
|
15
|
-
|
16
11
|
#include <boost/config.hpp>
|
17
12
|
#include <boost/detail/workaround.hpp>
|
13
|
+
#include <boost/thread/detail/platform.hpp>
|
14
|
+
|
15
|
+
//#define BOOST_THREAD_DONT_PROVIDE_INTERRUPTIONS
|
16
|
+
// ATTRIBUTE_MAY_ALIAS
|
17
|
+
|
18
|
+
#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) > 302 \
|
19
|
+
&& !defined(__INTEL_COMPILER)
|
20
|
+
|
21
|
+
// GCC since 3.3 has may_alias attribute that helps to alleviate optimizer issues with
|
22
|
+
// regard to violation of the strict aliasing rules.
|
18
23
|
|
19
|
-
#
|
20
|
-
#
|
24
|
+
#define BOOST_THREAD_DETAIL_USE_ATTRIBUTE_MAY_ALIAS
|
25
|
+
#define BOOST_THREAD_ATTRIBUTE_MAY_ALIAS __attribute__((__may_alias__))
|
21
26
|
#else
|
22
|
-
#
|
27
|
+
#define BOOST_THREAD_ATTRIBUTE_MAY_ALIAS
|
28
|
+
#endif
|
29
|
+
|
30
|
+
|
31
|
+
#if defined BOOST_THREAD_THROW_IF_PRECONDITION_NOT_SATISFIED
|
32
|
+
#define BOOST_THREAD_ASSERT_PRECONDITION(EXPR, EX) \
|
33
|
+
if (EXPR) {} else boost::throw_exception(EX)
|
34
|
+
#define BOOST_THREAD_VERIFY_PRECONDITION(EXPR, EX) \
|
35
|
+
if (EXPR) {} else boost::throw_exception(EX)
|
36
|
+
#define BOOST_THREAD_THROW_ELSE_RETURN(EX, RET) \
|
37
|
+
boost::throw_exception(EX)
|
38
|
+
#else
|
39
|
+
#define BOOST_THREAD_ASSERT_PRECONDITION(EXPR, EX)
|
40
|
+
#define BOOST_THREAD_VERIFY_PRECONDITION(EXPR, EX) \
|
41
|
+
(void)(EXPR)
|
42
|
+
#define BOOST_THREAD_THROW_ELSE_RETURN(EX, RET) \
|
43
|
+
return (RET)
|
23
44
|
#endif
|
24
45
|
|
25
46
|
// This compiler doesn't support Boost.Chrono
|
26
|
-
#if defined __IBMCPP__ && (__IBMCPP__ < 1100)
|
47
|
+
#if defined __IBMCPP__ && (__IBMCPP__ < 1100) \
|
48
|
+
&& ! defined BOOST_THREAD_DONT_USE_CHRONO
|
27
49
|
#define BOOST_THREAD_DONT_USE_CHRONO
|
50
|
+
#if ! defined BOOST_THREAD_USES_DATETIME
|
51
|
+
#define BOOST_THREAD_USES_DATETIME
|
52
|
+
#endif
|
28
53
|
#endif
|
29
54
|
|
30
55
|
// This compiler doesn't support Boost.Move
|
31
|
-
#if BOOST_WORKAROUND(__SUNPRO_CC, < 0x5100)
|
56
|
+
#if BOOST_WORKAROUND(__SUNPRO_CC, < 0x5100) \
|
57
|
+
&& ! defined BOOST_THREAD_DONT_USE_MOVE
|
32
58
|
#define BOOST_THREAD_DONT_USE_MOVE
|
33
59
|
#endif
|
34
60
|
|
35
61
|
// This compiler doesn't support Boost.Container Allocators files
|
36
|
-
#if defined __SUNPRO_CC
|
62
|
+
#if defined __SUNPRO_CC \
|
63
|
+
&& ! defined BOOST_THREAD_DONT_PROVIDE_FUTURE_CTOR_ALLOCATORS
|
37
64
|
#define BOOST_THREAD_DONT_PROVIDE_FUTURE_CTOR_ALLOCATORS
|
38
65
|
#endif
|
39
66
|
|
40
|
-
#if defined _WIN32_WCE && _WIN32_WCE==0x501
|
67
|
+
#if defined _WIN32_WCE && _WIN32_WCE==0x501 \
|
68
|
+
&& ! defined BOOST_THREAD_DONT_PROVIDE_FUTURE_CTOR_ALLOCATORS
|
41
69
|
#define BOOST_THREAD_DONT_PROVIDE_FUTURE_CTOR_ALLOCATORS
|
42
70
|
#endif
|
43
71
|
|
44
|
-
|
72
|
+
|
73
|
+
#if defined BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX || defined BOOST_NO_CXX11_HDR_INITIALIZER_LIST
|
74
|
+
#define BOOST_THREAD_NO_CXX11_HDR_INITIALIZER_LIST
|
75
|
+
#define BOOST_THREAD_NO_MAKE_LOCK_GUARD
|
76
|
+
#define BOOST_THREAD_NO_MAKE_STRICT_LOCK
|
77
|
+
#define BOOST_THREAD_NO_MAKE_NESTED_STRICT_LOCK
|
78
|
+
#endif
|
79
|
+
|
80
|
+
#if defined(BOOST_NO_CXX11_HDR_TUPLE) || defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
|
81
|
+
#define BOOST_THREAD_NO_MAKE_UNIQUE_LOCKS
|
82
|
+
#define BOOST_THREAD_NO_SYNCHRONIZE
|
83
|
+
#elif defined _MSC_VER && _MSC_VER <= 1600
|
84
|
+
// C++ features supported by VC++ 10 (aka 2010)
|
85
|
+
#define BOOST_THREAD_NO_MAKE_UNIQUE_LOCKS
|
86
|
+
#define BOOST_THREAD_NO_SYNCHRONIZE
|
87
|
+
#endif
|
88
|
+
|
89
|
+
/// BASIC_THREAD_ID
|
90
|
+
#if ! defined BOOST_THREAD_DONT_PROVIDE_BASIC_THREAD_ID \
|
91
|
+
&& ! defined BOOST_THREAD_PROVIDES_BASIC_THREAD_ID
|
45
92
|
#define BOOST_THREAD_PROVIDES_BASIC_THREAD_ID
|
46
93
|
#endif
|
47
94
|
|
48
|
-
|
95
|
+
/// RVALUE_REFERENCES_DONT_MATCH_FUNTION_PTR
|
96
|
+
//#if defined BOOST_NO_CXX11_RVALUE_REFERENCES || defined BOOST_MSVC
|
97
|
+
#define BOOST_THREAD_RVALUE_REFERENCES_DONT_MATCH_FUNTION_PTR
|
98
|
+
//#endif
|
99
|
+
|
100
|
+
// Default version
|
49
101
|
#if !defined BOOST_THREAD_VERSION
|
50
102
|
#define BOOST_THREAD_VERSION 2
|
51
103
|
#else
|
52
|
-
#if BOOST_THREAD_VERSION!=2 && BOOST_THREAD_VERSION!=3
|
53
|
-
#error "BOOST_THREAD_VERSION must be 2 or
|
104
|
+
#if BOOST_THREAD_VERSION!=2 && BOOST_THREAD_VERSION!=3 && BOOST_THREAD_VERSION!=4
|
105
|
+
#error "BOOST_THREAD_VERSION must be 2, 3 or 4"
|
54
106
|
#endif
|
55
107
|
#endif
|
56
108
|
|
109
|
+
// CHRONO
|
57
110
|
// Uses Boost.Chrono by default if not stated the opposite defining BOOST_THREAD_DONT_USE_CHRONO
|
58
|
-
#if ! defined BOOST_THREAD_DONT_USE_CHRONO
|
111
|
+
#if ! defined BOOST_THREAD_DONT_USE_CHRONO \
|
112
|
+
&& ! defined BOOST_THREAD_USES_CHRONO
|
59
113
|
#define BOOST_THREAD_USES_CHRONO
|
60
114
|
#endif
|
61
115
|
|
62
|
-
|
63
|
-
|
64
|
-
#define
|
65
|
-
|
66
|
-
#define BOOST_THREAD_EXPLICIT_LOCK_CONVERSION
|
116
|
+
#if ! defined BOOST_THREAD_DONT_USE_ATOMIC \
|
117
|
+
&& ! defined BOOST_THREAD_USES_ATOMIC
|
118
|
+
#define BOOST_THREAD_USES_ATOMIC
|
119
|
+
//#define BOOST_THREAD_DONT_USE_ATOMIC
|
67
120
|
#endif
|
68
121
|
|
69
|
-
|
122
|
+
#if defined BOOST_THREAD_USES_ATOMIC
|
123
|
+
// Andrey Semashev
|
124
|
+
#define BOOST_THREAD_ONCE_ATOMIC
|
125
|
+
#else
|
126
|
+
//#elif ! defined BOOST_NO_CXX11_THREAD_LOCAL && ! defined BOOST_NO_THREAD_LOCAL && ! defined BOOST_THREAD_NO_UINT32_PSEUDO_ATOMIC
|
127
|
+
// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2444.html#Appendix
|
128
|
+
#define BOOST_THREAD_ONCE_FAST_EPOCH
|
129
|
+
#endif
|
70
130
|
#if BOOST_THREAD_VERSION==2
|
71
|
-
|
72
|
-
|
131
|
+
|
132
|
+
// PROVIDE_PROMISE_LAZY
|
133
|
+
#if ! defined BOOST_THREAD_DONT_PROVIDE_PROMISE_LAZY \
|
134
|
+
&& ! defined BOOST_THREAD_PROVIDES_PROMISE_LAZY
|
135
|
+
#define BOOST_THREAD_PROVIDES_PROMISE_LAZY
|
73
136
|
#endif
|
74
|
-
|
75
|
-
|
137
|
+
|
138
|
+
// PROVIDE_THREAD_EQ
|
139
|
+
#if ! defined BOOST_THREAD_DONT_PROVIDE_THREAD_EQ \
|
140
|
+
&& ! defined BOOST_THREAD_PROVIDES_THREAD_EQ
|
141
|
+
#define BOOST_THREAD_PROVIDES_THREAD_EQ
|
76
142
|
#endif
|
143
|
+
|
77
144
|
#endif
|
78
145
|
|
79
|
-
#if BOOST_THREAD_VERSION
|
146
|
+
#if BOOST_THREAD_VERSION>=3
|
147
|
+
|
148
|
+
// ONCE_CXX11
|
149
|
+
// fixme BOOST_THREAD_PROVIDES_ONCE_CXX11 doesn't works when thread.cpp is compiled BOOST_THREAD_VERSION 3
|
80
150
|
#if ! defined BOOST_THREAD_DONT_PROVIDE_ONCE_CXX11 \
|
81
151
|
&& ! defined BOOST_THREAD_PROVIDES_ONCE_CXX11
|
82
|
-
#define
|
152
|
+
#define BOOST_THREAD_DONT_PROVIDE_ONCE_CXX11
|
83
153
|
#endif
|
154
|
+
|
155
|
+
// THREAD_DESTRUCTOR_CALLS_TERMINATE_IF_JOINABLE
|
84
156
|
#if ! defined BOOST_THREAD_DONT_PROVIDE_THREAD_DESTRUCTOR_CALLS_TERMINATE_IF_JOINABLE \
|
85
157
|
&& ! defined BOOST_THREAD_PROVIDES_THREAD_DESTRUCTOR_CALLS_TERMINATE_IF_JOINABLE
|
86
158
|
#define BOOST_THREAD_PROVIDES_THREAD_DESTRUCTOR_CALLS_TERMINATE_IF_JOINABLE
|
87
159
|
#endif
|
160
|
+
|
161
|
+
// THREAD_MOVE_ASSIGN_CALLS_TERMINATE_IF_JOINABLE
|
88
162
|
#if ! defined BOOST_THREAD_DONT_PROVIDE_THREAD_MOVE_ASSIGN_CALLS_TERMINATE_IF_JOINABLE \
|
89
163
|
&& ! defined BOOST_THREAD_PROVIDES_THREAD_MOVE_ASSIGN_CALLS_TERMINATE_IF_JOINABLE
|
90
164
|
#define BOOST_THREAD_PROVIDES_THREAD_MOVE_ASSIGN_CALLS_TERMINATE_IF_JOINABLE
|
91
165
|
#endif
|
166
|
+
|
167
|
+
// PROVIDE_FUTURE
|
92
168
|
#if ! defined BOOST_THREAD_DONT_PROVIDE_FUTURE \
|
93
169
|
&& ! defined BOOST_THREAD_PROVIDES_FUTURE
|
94
170
|
#define BOOST_THREAD_PROVIDES_FUTURE
|
95
171
|
#endif
|
172
|
+
|
173
|
+
// FUTURE_CTOR_ALLOCATORS
|
96
174
|
#if ! defined BOOST_THREAD_DONT_PROVIDE_FUTURE_CTOR_ALLOCATORS \
|
97
175
|
&& ! defined BOOST_THREAD_PROVIDES_FUTURE_CTOR_ALLOCATORS
|
98
176
|
#define BOOST_THREAD_PROVIDES_FUTURE_CTOR_ALLOCATORS
|
99
177
|
#endif
|
178
|
+
|
179
|
+
// SHARED_MUTEX_UPWARDS_CONVERSIONS
|
100
180
|
#if ! defined BOOST_THREAD_DONT_PROVIDE_SHARED_MUTEX_UPWARDS_CONVERSIONS \
|
101
181
|
&& ! defined BOOST_THREAD_PROVIDES_SHARED_MUTEX_UPWARDS_CONVERSIONS
|
102
182
|
#define BOOST_THREAD_PROVIDES_SHARED_MUTEX_UPWARDS_CONVERSIONS
|
103
183
|
#endif
|
184
|
+
|
185
|
+
// PROVIDE_EXPLICIT_LOCK_CONVERSION
|
104
186
|
#if ! defined BOOST_THREAD_DONT_PROVIDE_EXPLICIT_LOCK_CONVERSION \
|
105
187
|
&& ! defined BOOST_THREAD_PROVIDES_EXPLICIT_LOCK_CONVERSION
|
106
188
|
#define BOOST_THREAD_PROVIDES_EXPLICIT_LOCK_CONVERSION
|
107
189
|
#endif
|
190
|
+
|
191
|
+
// GENERIC_SHARED_MUTEX_ON_WIN
|
108
192
|
#if ! defined BOOST_THREAD_DONT_PROVIDE_GENERIC_SHARED_MUTEX_ON_WIN \
|
109
193
|
&& ! defined BOOST_THREAD_PROVIDES_GENERIC_SHARED_MUTEX_ON_WIN
|
110
194
|
#define BOOST_THREAD_PROVIDES_GENERIC_SHARED_MUTEX_ON_WIN
|
111
195
|
#endif
|
112
|
-
|
113
|
-
|
114
|
-
#define BOOST_THREAD_DONT_PROVIDE_DEPRECATED_FEATURES_SINCE_V3_0_0
|
115
|
-
#endif
|
196
|
+
|
197
|
+
// USE_MOVE
|
116
198
|
#if ! defined BOOST_THREAD_DONT_USE_MOVE \
|
117
199
|
&& ! defined BOOST_THREAD_USES_MOVE
|
118
200
|
#define BOOST_THREAD_USES_MOVE
|
@@ -120,17 +202,135 @@
|
|
120
202
|
|
121
203
|
#endif
|
122
204
|
|
205
|
+
// deprecated since version 4
|
206
|
+
#if BOOST_THREAD_VERSION < 4
|
207
|
+
|
208
|
+
// NESTED_LOCKS
|
209
|
+
#if ! defined BOOST_THREAD_PROVIDES_NESTED_LOCKS \
|
210
|
+
&& ! defined BOOST_THREAD_DONT_PROVIDE_NESTED_LOCKS
|
211
|
+
#define BOOST_THREAD_PROVIDES_NESTED_LOCKS
|
212
|
+
#endif
|
213
|
+
|
214
|
+
// CONDITION
|
215
|
+
#if ! defined BOOST_THREAD_PROVIDES_CONDITION \
|
216
|
+
&& ! defined BOOST_THREAD_DONT_PROVIDE_CONDITION
|
217
|
+
#define BOOST_THREAD_PROVIDES_CONDITION
|
218
|
+
#endif
|
219
|
+
|
220
|
+
// USE_DATETIME
|
221
|
+
#if ! defined BOOST_THREAD_DONT_USE_DATETIME \
|
222
|
+
&& ! defined BOOST_THREAD_USES_DATETIME
|
223
|
+
#define BOOST_THREAD_USES_DATETIME
|
224
|
+
#endif
|
225
|
+
#endif
|
226
|
+
|
227
|
+
#if BOOST_THREAD_VERSION>=4
|
228
|
+
|
229
|
+
// SIGNATURE_PACKAGED_TASK
|
230
|
+
#if ! defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK \
|
231
|
+
&& ! defined BOOST_THREAD_DONT_PROVIDE_SIGNATURE_PACKAGED_TASK
|
232
|
+
#define BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK
|
233
|
+
#endif
|
234
|
+
|
235
|
+
// VARIADIC_THREAD
|
236
|
+
#if ! defined BOOST_THREAD_PROVIDES_VARIADIC_THREAD \
|
237
|
+
&& ! defined BOOST_THREAD_DONT_PROVIDE_VARIADIC_THREAD
|
238
|
+
|
239
|
+
#if ! defined(BOOST_NO_SFINAE_EXPR) && \
|
240
|
+
! defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && \
|
241
|
+
! defined(BOOST_NO_CXX11_DECLTYPE) && \
|
242
|
+
! defined(BOOST_NO_CXX11_DECLTYPE_N3276) && \
|
243
|
+
! defined(BOOST_NO_CXX11_AUTO) && \
|
244
|
+
! defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && \
|
245
|
+
! defined(BOOST_NO_CXX11_HDR_TUPLE)
|
246
|
+
|
247
|
+
#define BOOST_THREAD_PROVIDES_VARIADIC_THREAD
|
248
|
+
#endif
|
249
|
+
#endif
|
250
|
+
|
251
|
+
|
252
|
+
// MAKE_READY_AT_THREAD_EXIT
|
253
|
+
#if ! defined BOOST_THREAD_PROVIDES_MAKE_READY_AT_THREAD_EXIT \
|
254
|
+
&& ! defined BOOST_THREAD_DONT_PROVIDE_MAKE_READY_AT_THREAD_EXIT
|
255
|
+
|
256
|
+
//#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
|
257
|
+
#define BOOST_THREAD_PROVIDES_MAKE_READY_AT_THREAD_EXIT
|
258
|
+
//#endif
|
259
|
+
#endif
|
260
|
+
|
261
|
+
// FUTURE_CONTINUATION
|
262
|
+
#if ! defined BOOST_THREAD_PROVIDES_FUTURE_CONTINUATION \
|
263
|
+
&& ! defined BOOST_THREAD_DONT_PROVIDE_FUTURE_CONTINUATION
|
264
|
+
#define BOOST_THREAD_PROVIDES_FUTURE_CONTINUATION
|
265
|
+
#endif
|
266
|
+
|
267
|
+
// FUTURE_INVALID_AFTER_GET
|
268
|
+
#if ! defined BOOST_THREAD_PROVIDES_FUTURE_INVALID_AFTER_GET \
|
269
|
+
&& ! defined BOOST_THREAD_DONT_PROVIDE_FUTURE_INVALID_AFTER_GET
|
270
|
+
#define BOOST_THREAD_PROVIDES_FUTURE_INVALID_AFTER_GET
|
271
|
+
#endif
|
272
|
+
|
273
|
+
// NESTED_LOCKS
|
274
|
+
#if ! defined BOOST_THREAD_PROVIDES_NESTED_LOCKS \
|
275
|
+
&& ! defined BOOST_THREAD_DONT_PROVIDE_NESTED_LOCKS
|
276
|
+
#define BOOST_THREAD_DONT_PROVIDE_NESTED_LOCKS
|
277
|
+
#endif
|
278
|
+
|
279
|
+
// CONDITION
|
280
|
+
#if ! defined BOOST_THREAD_PROVIDES_CONDITION \
|
281
|
+
&& ! defined BOOST_THREAD_DONT_PROVIDE_CONDITION
|
282
|
+
#define BOOST_THREAD_DONT_PROVIDE_CONDITION
|
283
|
+
#endif
|
284
|
+
|
285
|
+
#endif // BOOST_THREAD_VERSION>=4
|
286
|
+
|
287
|
+
// INTERRUPTIONS
|
288
|
+
#if ! defined BOOST_THREAD_PROVIDES_INTERRUPTIONS \
|
289
|
+
&& ! defined BOOST_THREAD_DONT_PROVIDE_INTERRUPTIONS
|
290
|
+
#define BOOST_THREAD_PROVIDES_INTERRUPTIONS
|
291
|
+
#endif
|
292
|
+
|
293
|
+
// CORRELATIONS
|
294
|
+
|
295
|
+
// EXPLICIT_LOCK_CONVERSION.
|
296
|
+
#if defined BOOST_THREAD_PROVIDES_EXPLICIT_LOCK_CONVERSION
|
297
|
+
#define BOOST_THREAD_EXPLICIT_LOCK_CONVERSION explicit
|
298
|
+
#else
|
299
|
+
#define BOOST_THREAD_EXPLICIT_LOCK_CONVERSION
|
300
|
+
#endif
|
301
|
+
|
123
302
|
// BOOST_THREAD_PROVIDES_GENERIC_SHARED_MUTEX_ON_WIN is defined if BOOST_THREAD_PROVIDES_SHARED_MUTEX_UPWARDS_CONVERSIONS
|
124
303
|
#if defined BOOST_THREAD_PROVIDES_SHARED_MUTEX_UPWARDS_CONVERSIONS \
|
125
304
|
&& ! defined BOOST_THREAD_PROVIDES_GENERIC_SHARED_MUTEX_ON_WIN
|
126
305
|
#define BOOST_THREAD_PROVIDES_GENERIC_SHARED_MUTEX_ON_WIN
|
127
306
|
#endif
|
128
307
|
|
129
|
-
//
|
308
|
+
// For C++11 call_once interface the compiler MUST support constexpr.
|
309
|
+
// Otherwise once_flag would be initialized during dynamic initialization stage, which is not thread-safe.
|
310
|
+
#if defined(BOOST_THREAD_PROVIDES_ONCE_CXX11)
|
311
|
+
#if defined(BOOST_NO_CXX11_CONSTEXPR)
|
312
|
+
#undef BOOST_THREAD_PROVIDES_ONCE_CXX11
|
313
|
+
#endif
|
314
|
+
#endif
|
315
|
+
|
316
|
+
#if defined(BOOST_THREAD_PLATFORM_WIN32) && defined BOOST_THREAD_DONT_USE_DATETIME
|
317
|
+
#undef BOOST_THREAD_DONT_USE_DATETIME
|
318
|
+
#define BOOST_THREAD_USES_DATETIME
|
319
|
+
#endif
|
320
|
+
|
321
|
+
#if defined(BOOST_THREAD_PLATFORM_WIN32) && defined BOOST_THREAD_DONT_USE_CHRONO
|
322
|
+
#undef BOOST_THREAD_DONT_USE_CHRONO
|
323
|
+
#define BOOST_THREAD_USES_CHRONO
|
324
|
+
#endif
|
325
|
+
|
326
|
+
// BOOST_THREAD_PROVIDES_DEPRECATED_FEATURES_SINCE_V3_0_0 defined by default up to Boost 1.55
|
130
327
|
// BOOST_THREAD_DONT_PROVIDE_DEPRECATED_FEATURES_SINCE_V3_0_0 defined by default up to Boost 1.55
|
131
|
-
#if
|
132
|
-
|
133
|
-
#
|
328
|
+
#if defined BOOST_THREAD_PROVIDES_DEPRECATED_FEATURES_SINCE_V3_0_0
|
329
|
+
|
330
|
+
#if ! defined BOOST_THREAD_PROVIDES_THREAD_EQ
|
331
|
+
#define BOOST_THREAD_PROVIDES_THREAD_EQ
|
332
|
+
#endif
|
333
|
+
|
134
334
|
#endif
|
135
335
|
|
136
336
|
#if BOOST_WORKAROUND(__BORLANDC__, < 0x600)
|
@@ -142,6 +342,13 @@
|
|
142
342
|
|
143
343
|
#include <boost/thread/detail/platform.hpp>
|
144
344
|
|
345
|
+
#if defined(BOOST_THREAD_PLATFORM_WIN32)
|
346
|
+
#else
|
347
|
+
# if defined(BOOST_HAS_PTHREAD_DELAY_NP) || defined(BOOST_HAS_NANOSLEEP)
|
348
|
+
# define BOOST_THREAD_SLEEP_FOR_IS_STEADY
|
349
|
+
# endif
|
350
|
+
#endif
|
351
|
+
|
145
352
|
// provided for backwards compatibility, since this
|
146
353
|
// macro was used for several releases by mistake.
|
147
354
|
#if defined(BOOST_THREAD_DYN_DLL) && ! defined BOOST_THREAD_DYN_LINK
|
@@ -160,8 +367,9 @@
|
|
160
367
|
#elif defined(BOOST_THREAD_USE_LIB) //Use lib
|
161
368
|
#else //Use default
|
162
369
|
# if defined(BOOST_THREAD_PLATFORM_WIN32)
|
163
|
-
# if defined(BOOST_MSVC) || defined(BOOST_INTEL_WIN)
|
164
|
-
|
370
|
+
# if defined(BOOST_MSVC) || defined(BOOST_INTEL_WIN) \
|
371
|
+
|| defined(__MINGW32__) || defined(MINGW32) || defined(BOOST_MINGW32)
|
372
|
+
//For compilers supporting auto-tss cleanup
|
165
373
|
//with Boost.Threads lib, use Boost.Threads lib
|
166
374
|
# define BOOST_THREAD_USE_LIB
|
167
375
|
# else
|
@@ -0,0 +1,93 @@
|
|
1
|
+
// Distributed under the Boost Software License, Version 1.0. (See
|
2
|
+
// accompanying file LICENSE_1_0.txt or copy at
|
3
|
+
// http://www.boost.org/LICENSE_1_0.txt)
|
4
|
+
// (C) Copyright 2013 Vicente J. Botet Escriba
|
5
|
+
|
6
|
+
#ifndef BOOST_THREAD_COUNTER_HPP
|
7
|
+
#define BOOST_THREAD_COUNTER_HPP
|
8
|
+
|
9
|
+
#include <boost/thread/detail/config.hpp>
|
10
|
+
#include <boost/thread/detail/delete.hpp>
|
11
|
+
|
12
|
+
//#include <boost/thread/mutex.hpp>
|
13
|
+
//#include <boost/thread/lock_types.hpp>
|
14
|
+
#include <boost/thread/condition_variable.hpp>
|
15
|
+
#include <boost/chrono/duration.hpp>
|
16
|
+
#include <boost/chrono/time_point.hpp>
|
17
|
+
#include <boost/assert.hpp>
|
18
|
+
|
19
|
+
#include <boost/config/abi_prefix.hpp>
|
20
|
+
|
21
|
+
namespace boost
|
22
|
+
{
|
23
|
+
namespace detail {
|
24
|
+
struct counter
|
25
|
+
{
|
26
|
+
condition_variable cond_;
|
27
|
+
std::size_t value_;
|
28
|
+
|
29
|
+
counter(std::size_t value)
|
30
|
+
: value_(value)
|
31
|
+
{
|
32
|
+
|
33
|
+
}
|
34
|
+
counter& operator=(counter const& rhs)
|
35
|
+
{
|
36
|
+
value_ = rhs.value_;
|
37
|
+
return *this;
|
38
|
+
}
|
39
|
+
counter& operator=(std::size_t value)
|
40
|
+
{
|
41
|
+
value_ = value;
|
42
|
+
return *this;
|
43
|
+
}
|
44
|
+
|
45
|
+
operator std::size_t() const
|
46
|
+
{
|
47
|
+
return value_;
|
48
|
+
}
|
49
|
+
operator std::size_t&()
|
50
|
+
{
|
51
|
+
return value_;
|
52
|
+
}
|
53
|
+
|
54
|
+
void inc_and_notify_all()
|
55
|
+
{
|
56
|
+
++value_;
|
57
|
+
cond_.notify_all();
|
58
|
+
}
|
59
|
+
|
60
|
+
void dec_and_notify_all()
|
61
|
+
{
|
62
|
+
--value_;
|
63
|
+
cond_.notify_all();
|
64
|
+
}
|
65
|
+
void assign_and_notify_all(counter const& rhs)
|
66
|
+
{
|
67
|
+
value_ = rhs.value_;
|
68
|
+
cond_.notify_all();
|
69
|
+
}
|
70
|
+
void assign_and_notify_all(std::size_t value)
|
71
|
+
{
|
72
|
+
value_ = value;
|
73
|
+
cond_.notify_all();
|
74
|
+
}
|
75
|
+
};
|
76
|
+
struct counter_is_not_zero
|
77
|
+
{
|
78
|
+
counter_is_not_zero(const counter& count) : count_(count) {}
|
79
|
+
bool operator()() const { return count_ != 0; }
|
80
|
+
const counter& count_;
|
81
|
+
};
|
82
|
+
struct counter_is_zero
|
83
|
+
{
|
84
|
+
counter_is_zero(const counter& count) : count_(count) {}
|
85
|
+
bool operator()() const { return count_ == 0; }
|
86
|
+
const counter& count_;
|
87
|
+
};
|
88
|
+
}
|
89
|
+
} // namespace boost
|
90
|
+
|
91
|
+
#include <boost/config/abi_suffix.hpp>
|
92
|
+
|
93
|
+
#endif
|