passenger 3.0.21 → 3.9.1.beta
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.
- data/DEVELOPERS.TXT +4 -10
- data/NEWS +19 -27
- data/Rakefile +20 -19
- data/bin/passenger +3 -2
- data/bin/passenger-config +35 -5
- data/bin/passenger-install-apache2-module +12 -12
- data/bin/passenger-install-nginx-module +55 -38
- data/bin/passenger-memory-stats +3 -1
- data/bin/passenger-status +7 -35
- data/build/agents.rb +107 -21
- data/build/apache2.rb +11 -46
- data/build/basics.rb +61 -9
- data/build/common_library.rb +59 -142
- data/build/cxx_tests.rb +111 -110
- data/build/documentation.rb +33 -0
- data/build/misc.rb +30 -12
- data/build/nginx.rb +10 -39
- data/build/oxt_tests.rb +1 -0
- data/build/ruby_extension.rb +1 -5
- data/build/test_basics.rb +3 -2
- data/dev/copy_boost_headers.rb +2 -1
- data/doc/Architectural overview.html +49 -90
- data/doc/DebuggingAndStressTesting.txt.md +49 -0
- data/doc/Packaging.txt.md +254 -0
- data/doc/Security of user switching support.html +35 -66
- data/doc/Users guide Apache.html +588 -758
- data/doc/Users guide Apache.idmap.txt +253 -136
- data/doc/Users guide Apache.txt +154 -109
- data/doc/Users guide Nginx.html +544 -660
- data/doc/Users guide Nginx.idmap.txt +179 -91
- data/doc/Users guide Nginx.txt +192 -118
- data/doc/Users guide Standalone.html +65 -48
- data/doc/Users guide Standalone.idmap.txt +10 -2
- data/doc/Users guide Standalone.txt +4 -0
- data/doc/images/glyphicons-halflings-white.png +0 -0
- data/doc/images/glyphicons-halflings.png +0 -0
- data/doc/images/phusion_banner_small.png +0 -0
- data/doc/images/{smart-lv2.png → smart.png} +0 -0
- data/doc/images/{smart-lv2.svg → smart.svg} +0 -0
- data/doc/templates/bootstrap.min.css +397 -0
- data/doc/templates/markdown.html.erb +117 -0
- data/doc/users_guide_snippets/analysis_and_system_maintenance.txt +2 -1
- data/doc/users_guide_snippets/appendix_c_spawning_methods.txt +26 -48
- data/doc/users_guide_snippets/passenger_spawn_method.txt +18 -30
- data/doc/users_guide_snippets/support_information.txt +30 -0
- data/ext/apache2/Bucket.cpp +9 -26
- data/ext/apache2/Bucket.h +13 -10
- data/ext/apache2/Configuration.cpp +70 -58
- data/ext/apache2/Configuration.hpp +19 -47
- data/ext/apache2/DirectoryMapper.h +7 -7
- data/ext/apache2/Hooks.cpp +150 -313
- data/ext/boost/algorithm/string/detail/case_conv.hpp +4 -2
- data/ext/boost/algorithm/string/detail/find_format.hpp +20 -20
- data/ext/boost/algorithm/string/detail/find_format_all.hpp +23 -23
- data/ext/boost/algorithm/string/detail/find_format_store.hpp +2 -2
- data/ext/boost/algorithm/string/detail/formatter.hpp +25 -0
- data/ext/boost/algorithm/string/formatter.hpp +20 -3
- data/ext/boost/assert.hpp +85 -4
- data/ext/boost/bind/bind.hpp +1 -1
- data/ext/boost/concept/detail/backward_compatibility.hpp +1 -1
- data/ext/boost/concept_check.hpp +140 -64
- data/ext/boost/config.hpp +1 -1
- data/ext/boost/config/auto_link.hpp +8 -6
- data/ext/boost/config/compiler/borland.hpp +12 -2
- data/ext/boost/config/compiler/clang.hpp +89 -30
- data/ext/boost/config/compiler/codegear.hpp +3 -2
- data/ext/boost/config/compiler/common_edg.hpp +7 -5
- data/ext/boost/config/compiler/cray.hpp +61 -0
- data/ext/boost/config/compiler/digitalmars.hpp +9 -1
- data/ext/boost/config/compiler/gcc.hpp +33 -24
- data/ext/boost/config/compiler/gcc_xml.hpp +4 -0
- data/ext/boost/config/compiler/hp_acc.hpp +12 -1
- data/ext/boost/config/compiler/intel.hpp +78 -4
- data/ext/boost/config/compiler/metrowerks.hpp +4 -1
- data/ext/boost/config/compiler/mpw.hpp +4 -1
- data/ext/boost/config/compiler/nvcc.hpp +8 -66
- data/ext/boost/config/compiler/pathscale.hpp +80 -0
- data/ext/boost/config/compiler/pgi.hpp +5 -5
- data/ext/boost/config/compiler/sunpro_cc.hpp +4 -1
- data/ext/boost/config/compiler/vacpp.hpp +37 -13
- data/ext/boost/config/compiler/visualc.hpp +24 -11
- data/ext/boost/config/platform/bsd.hpp +1 -1
- data/ext/boost/config/platform/cray.hpp +18 -0
- data/ext/boost/config/platform/cygwin.hpp +10 -0
- data/ext/boost/config/platform/linux.hpp +5 -0
- data/ext/boost/config/platform/macos.hpp +5 -4
- data/ext/boost/config/platform/symbian.hpp +5 -2
- data/ext/boost/config/platform/vms.hpp +25 -0
- data/ext/boost/config/platform/win32.hpp +7 -1
- data/ext/boost/config/select_compiler_config.hpp +8 -25
- data/ext/boost/config/select_platform_config.hpp +8 -1
- data/ext/boost/config/select_stdlib_config.hpp +9 -1
- data/ext/boost/config/stdlib/dinkumware.hpp +6 -9
- data/ext/boost/config/stdlib/libcomo.hpp +1 -4
- data/ext/boost/config/stdlib/libcpp.hpp +36 -0
- data/ext/boost/config/stdlib/libstdcpp3.hpp +37 -11
- data/ext/boost/config/stdlib/modena.hpp +1 -4
- data/ext/boost/config/stdlib/msl.hpp +1 -4
- data/ext/boost/config/stdlib/roguewave.hpp +9 -6
- data/ext/boost/config/stdlib/sgi.hpp +12 -4
- data/ext/boost/config/stdlib/stlport.hpp +11 -4
- data/ext/boost/config/stdlib/vacpp.hpp +11 -4
- data/ext/boost/config/suffix.hpp +71 -6
- data/ext/boost/config/warning_disable.hpp +1 -1
- data/ext/boost/container/container_fwd.hpp +177 -0
- data/ext/boost/cstdint.hpp +17 -12
- data/ext/boost/current_function.hpp +2 -1
- data/ext/boost/date_time/c_time.hpp +17 -1
- data/ext/boost/date_time/compiler_config.hpp +13 -15
- data/ext/boost/date_time/date_formatting.hpp +7 -1
- data/ext/boost/date_time/filetime_functions.hpp +4 -4
- data/ext/boost/date_time/gregorian_calendar.ipp +2 -2
- data/ext/boost/date_time/strings_from_facet.hpp +3 -3
- data/ext/boost/date_time/time_facet.hpp +101 -101
- data/ext/boost/detail/endian.hpp +4 -2
- data/ext/boost/detail/fenv.hpp +74 -0
- data/ext/boost/detail/sp_typeinfo.hpp +6 -0
- data/ext/boost/exception/detail/clone_current_exception.hpp +47 -0
- data/ext/boost/exception/detail/exception_ptr.hpp +194 -122
- data/ext/boost/exception/detail/type_info.hpp +3 -3
- data/ext/boost/exception/diagnostic_information.hpp +37 -21
- data/ext/boost/exception/exception.hpp +21 -1
- data/ext/boost/exception/info.hpp +0 -1
- data/ext/boost/function.hpp +2 -2
- data/ext/boost/function/function_base.hpp +15 -9
- data/ext/boost/function/function_template.hpp +26 -48
- data/ext/boost/integer_fwd.hpp +0 -16
- data/ext/boost/integer_traits.hpp +2 -2
- data/ext/boost/iterator.hpp +1 -1
- data/ext/boost/iterator/iterator_adaptor.hpp +1 -7
- data/ext/boost/iterator/iterator_facade.hpp +13 -13
- data/ext/boost/iterator/transform_iterator.hpp +5 -20
- data/ext/boost/lexical_cast.hpp +1655 -673
- data/ext/boost/math/policies/policy.hpp +982 -0
- data/ext/boost/math/special_functions/detail/fp_traits.hpp +570 -0
- data/ext/boost/math/special_functions/detail/round_fwd.hpp +80 -0
- data/ext/boost/math/special_functions/fpclassify.hpp +533 -0
- data/ext/boost/math/special_functions/math_fwd.hpp +1070 -0
- data/ext/boost/math/special_functions/sign.hpp +145 -0
- data/ext/boost/math/tools/config.hpp +321 -0
- data/ext/boost/math/tools/promotion.hpp +150 -0
- data/ext/boost/math/tools/real_cast.hpp +29 -0
- data/ext/boost/math/tools/user.hpp +97 -0
- data/ext/boost/move/move.hpp +1222 -0
- data/ext/boost/mpl/O1_size.hpp +40 -0
- data/ext/boost/mpl/O1_size_fwd.hpp +24 -0
- data/ext/boost/mpl/advance.hpp +76 -0
- data/ext/boost/mpl/advance_fwd.hpp +28 -0
- data/ext/boost/mpl/at.hpp +52 -0
- data/ext/boost/mpl/at_fwd.hpp +24 -0
- data/ext/boost/mpl/aux_/O1_size_impl.hpp +87 -0
- data/ext/boost/mpl/aux_/advance_backward.hpp +128 -0
- data/ext/boost/mpl/aux_/advance_forward.hpp +127 -0
- data/ext/boost/mpl/aux_/arithmetic_op.hpp +92 -0
- data/ext/boost/mpl/aux_/at_impl.hpp +45 -0
- data/ext/boost/mpl/aux_/begin_end_impl.hpp +101 -0
- data/ext/boost/mpl/aux_/clear_impl.hpp +35 -0
- data/ext/boost/mpl/aux_/comparison_op.hpp +83 -0
- data/ext/boost/mpl/aux_/config/forwarding.hpp +27 -0
- data/ext/boost/mpl/aux_/config/typeof.hpp +38 -0
- data/ext/boost/mpl/aux_/contains_impl.hpp +61 -0
- data/ext/boost/mpl/aux_/find_if_pred.hpp +31 -0
- data/ext/boost/mpl/aux_/fold_impl.hpp +43 -0
- data/ext/boost/mpl/aux_/has_begin.hpp +23 -0
- data/ext/boost/mpl/aux_/has_size.hpp +23 -0
- data/ext/boost/mpl/aux_/has_tag.hpp +23 -0
- data/ext/boost/mpl/aux_/inserter_algorithm.hpp +159 -0
- data/ext/boost/mpl/aux_/is_msvc_eti_arg.hpp +64 -0
- data/ext/boost/mpl/aux_/iter_apply.hpp +47 -0
- data/ext/boost/mpl/aux_/iter_fold_if_impl.hpp +210 -0
- data/ext/boost/mpl/aux_/iter_fold_impl.hpp +42 -0
- data/ext/boost/mpl/aux_/lambda_spec.hpp +49 -0
- data/ext/boost/mpl/aux_/largest_int.hpp +63 -0
- data/ext/boost/mpl/aux_/msvc_eti_base.hpp +77 -0
- data/ext/boost/mpl/aux_/msvc_type.hpp +62 -0
- data/ext/boost/mpl/aux_/numeric_cast_utils.hpp +77 -0
- data/ext/boost/mpl/aux_/numeric_op.hpp +315 -0
- data/ext/boost/mpl/aux_/preprocessed/gcc/advance_backward.hpp +97 -0
- data/ext/boost/mpl/aux_/preprocessed/gcc/advance_forward.hpp +97 -0
- data/ext/boost/mpl/aux_/preprocessed/gcc/equal_to.hpp +94 -0
- data/ext/boost/mpl/aux_/preprocessed/gcc/fold_impl.hpp +180 -0
- data/ext/boost/mpl/aux_/preprocessed/gcc/greater.hpp +94 -0
- data/ext/boost/mpl/aux_/preprocessed/gcc/greater_equal.hpp +94 -0
- data/ext/boost/mpl/aux_/preprocessed/gcc/iter_fold_if_impl.hpp +133 -0
- data/ext/boost/mpl/aux_/preprocessed/gcc/iter_fold_impl.hpp +180 -0
- data/ext/boost/mpl/aux_/preprocessed/gcc/less.hpp +94 -0
- data/ext/boost/mpl/aux_/preprocessed/gcc/less_equal.hpp +94 -0
- data/ext/boost/mpl/aux_/preprocessed/gcc/list.hpp +323 -0
- data/ext/boost/mpl/aux_/preprocessed/gcc/minus.hpp +146 -0
- data/ext/boost/mpl/aux_/preprocessed/gcc/not_equal_to.hpp +94 -0
- data/ext/boost/mpl/aux_/preprocessed/gcc/plus.hpp +146 -0
- data/ext/boost/mpl/aux_/preprocessed/gcc/reverse_fold_impl.hpp +231 -0
- data/ext/boost/mpl/aux_/preprocessed/gcc/times.hpp +146 -0
- data/ext/boost/mpl/aux_/preprocessed/gcc/vector.hpp +323 -0
- data/ext/boost/mpl/aux_/preprocessor/default_params.hpp +67 -0
- data/ext/boost/mpl/aux_/push_back_impl.hpp +70 -0
- data/ext/boost/mpl/aux_/push_front_impl.hpp +71 -0
- data/ext/boost/mpl/aux_/reverse_fold_impl.hpp +44 -0
- data/ext/boost/mpl/aux_/size_impl.hpp +52 -0
- data/ext/boost/mpl/aux_/traits_lambda_spec.hpp +63 -0
- data/ext/boost/mpl/back_fwd.hpp +24 -0
- data/ext/boost/mpl/back_inserter.hpp +34 -0
- data/ext/boost/mpl/begin_end.hpp +57 -0
- data/ext/boost/mpl/begin_end_fwd.hpp +27 -0
- data/ext/boost/mpl/clear.hpp +39 -0
- data/ext/boost/mpl/clear_fwd.hpp +24 -0
- data/ext/boost/mpl/comparison.hpp +24 -0
- data/ext/boost/mpl/contains.hpp +41 -0
- data/ext/boost/mpl/contains_fwd.hpp +25 -0
- data/ext/boost/mpl/deref.hpp +41 -0
- data/ext/boost/mpl/distance.hpp +78 -0
- data/ext/boost/mpl/distance_fwd.hpp +28 -0
- data/ext/boost/mpl/empty_fwd.hpp +24 -0
- data/ext/boost/mpl/equal_to.hpp +21 -0
- data/ext/boost/mpl/find.hpp +38 -0
- data/ext/boost/mpl/find_if.hpp +50 -0
- data/ext/boost/mpl/fold.hpp +48 -0
- data/ext/boost/mpl/front_fwd.hpp +24 -0
- data/ext/boost/mpl/front_inserter.hpp +33 -0
- data/ext/boost/mpl/greater.hpp +21 -0
- data/ext/boost/mpl/greater_equal.hpp +21 -0
- data/ext/boost/mpl/inserter.hpp +32 -0
- data/ext/boost/mpl/iter_fold.hpp +49 -0
- data/ext/boost/mpl/iter_fold_if.hpp +117 -0
- data/ext/boost/mpl/iterator_range.hpp +42 -0
- data/ext/boost/mpl/iterator_tags.hpp +27 -0
- data/ext/boost/mpl/less.hpp +21 -0
- data/ext/boost/mpl/less_equal.hpp +21 -0
- data/ext/boost/mpl/limits/list.hpp +21 -0
- data/ext/boost/mpl/limits/vector.hpp +21 -0
- data/ext/boost/mpl/list.hpp +57 -0
- data/ext/boost/mpl/list/aux_/O1_size.hpp +33 -0
- data/ext/boost/mpl/list/aux_/begin_end.hpp +44 -0
- data/ext/boost/mpl/list/aux_/clear.hpp +34 -0
- data/ext/boost/mpl/list/aux_/empty.hpp +34 -0
- data/ext/boost/mpl/list/aux_/front.hpp +33 -0
- data/ext/boost/mpl/list/aux_/include_preprocessed.hpp +35 -0
- data/ext/boost/mpl/list/aux_/item.hpp +55 -0
- data/ext/boost/mpl/list/aux_/iterator.hpp +76 -0
- data/ext/boost/mpl/list/aux_/pop_front.hpp +34 -0
- data/ext/boost/mpl/list/aux_/preprocessed/plain/list10.hpp +149 -0
- data/ext/boost/mpl/list/aux_/preprocessed/plain/list20.hpp +169 -0
- data/ext/boost/mpl/list/aux_/push_back.hpp +36 -0
- data/ext/boost/mpl/list/aux_/push_front.hpp +39 -0
- data/ext/boost/mpl/list/aux_/size.hpp +33 -0
- data/ext/boost/mpl/list/aux_/tag.hpp +24 -0
- data/ext/boost/mpl/list/list0.hpp +42 -0
- data/ext/boost/mpl/list/list10.hpp +43 -0
- data/ext/boost/mpl/list/list20.hpp +43 -0
- data/ext/boost/mpl/long.hpp +22 -0
- data/ext/boost/mpl/long_fwd.hpp +27 -0
- data/ext/boost/mpl/minus.hpp +21 -0
- data/ext/boost/mpl/multiplies.hpp +53 -0
- data/ext/boost/mpl/negate.hpp +81 -0
- data/ext/boost/mpl/not_equal_to.hpp +21 -0
- data/ext/boost/mpl/numeric_cast.hpp +41 -0
- data/ext/boost/mpl/pair.hpp +70 -0
- data/ext/boost/mpl/plus.hpp +21 -0
- data/ext/boost/mpl/pop_back_fwd.hpp +24 -0
- data/ext/boost/mpl/pop_front_fwd.hpp +24 -0
- data/ext/boost/mpl/prior.hpp +19 -0
- data/ext/boost/mpl/push_back.hpp +53 -0
- data/ext/boost/mpl/push_back_fwd.hpp +24 -0
- data/ext/boost/mpl/push_front.hpp +52 -0
- data/ext/boost/mpl/push_front_fwd.hpp +24 -0
- data/ext/boost/mpl/remove_if.hpp +83 -0
- data/ext/boost/mpl/reverse_fold.hpp +50 -0
- data/ext/boost/mpl/same_as.hpp +55 -0
- data/ext/boost/mpl/sequence_tag.hpp +124 -0
- data/ext/boost/mpl/sequence_tag_fwd.hpp +26 -0
- data/ext/boost/mpl/size.hpp +42 -0
- data/ext/boost/mpl/size_fwd.hpp +24 -0
- data/ext/boost/mpl/tag.hpp +52 -0
- data/ext/boost/mpl/times.hpp +21 -0
- data/ext/boost/mpl/vector.hpp +57 -0
- data/ext/boost/mpl/vector/aux_/O1_size.hpp +56 -0
- data/ext/boost/mpl/vector/aux_/at.hpp +116 -0
- data/ext/boost/mpl/vector/aux_/back.hpp +59 -0
- data/ext/boost/mpl/vector/aux_/begin_end.hpp +49 -0
- data/ext/boost/mpl/vector/aux_/clear.hpp +55 -0
- data/ext/boost/mpl/vector/aux_/empty.hpp +68 -0
- data/ext/boost/mpl/vector/aux_/front.hpp +56 -0
- data/ext/boost/mpl/vector/aux_/include_preprocessed.hpp +55 -0
- data/ext/boost/mpl/vector/aux_/item.hpp +103 -0
- data/ext/boost/mpl/vector/aux_/iterator.hpp +130 -0
- data/ext/boost/mpl/vector/aux_/pop_back.hpp +40 -0
- data/ext/boost/mpl/vector/aux_/pop_front.hpp +40 -0
- data/ext/boost/mpl/vector/aux_/preprocessed/plain/vector10.hpp +829 -0
- data/ext/boost/mpl/vector/aux_/preprocessed/plain/vector20.hpp +1144 -0
- data/ext/boost/mpl/vector/aux_/preprocessed/typeof_based/vector10.hpp +139 -0
- data/ext/boost/mpl/vector/aux_/preprocessed/typeof_based/vector20.hpp +159 -0
- data/ext/boost/mpl/vector/aux_/push_back.hpp +40 -0
- data/ext/boost/mpl/vector/aux_/push_front.hpp +40 -0
- data/ext/boost/mpl/vector/aux_/size.hpp +49 -0
- data/ext/boost/mpl/vector/aux_/tag.hpp +32 -0
- data/ext/boost/mpl/vector/aux_/vector0.hpp +52 -0
- data/ext/boost/mpl/vector/vector0.hpp +34 -0
- data/ext/boost/mpl/vector/vector10.hpp +45 -0
- data/ext/boost/mpl/vector/vector20.hpp +45 -0
- data/ext/boost/none.hpp +1 -1
- data/ext/boost/numeric/conversion/bounds.hpp +24 -0
- data/ext/boost/numeric/conversion/cast.hpp +61 -0
- data/ext/boost/numeric/conversion/conversion_traits.hpp +39 -0
- data/ext/boost/numeric/conversion/converter.hpp +68 -0
- data/ext/boost/numeric/conversion/converter_policies.hpp +186 -0
- data/ext/boost/numeric/conversion/detail/bounds.hpp +58 -0
- data/ext/boost/numeric/conversion/detail/conversion_traits.hpp +97 -0
- data/ext/boost/numeric/conversion/detail/converter.hpp +602 -0
- data/ext/boost/numeric/conversion/detail/int_float_mixture.hpp +72 -0
- data/ext/boost/numeric/conversion/detail/is_subranged.hpp +234 -0
- data/ext/boost/numeric/conversion/detail/meta.hpp +120 -0
- data/ext/boost/numeric/conversion/detail/numeric_cast_traits.hpp +138 -0
- data/ext/boost/numeric/conversion/detail/preprocessed/numeric_cast_traits_common.hpp +1741 -0
- data/ext/boost/numeric/conversion/detail/preprocessed/numeric_cast_traits_long_long.hpp +347 -0
- data/ext/boost/numeric/conversion/detail/sign_mixture.hpp +72 -0
- data/ext/boost/numeric/conversion/detail/udt_builtin_mixture.hpp +69 -0
- data/ext/boost/numeric/conversion/int_float_mixture_enum.hpp +29 -0
- data/ext/boost/numeric/conversion/numeric_cast_traits.hpp +31 -0
- data/ext/boost/numeric/conversion/sign_mixture_enum.hpp +29 -0
- data/ext/boost/numeric/conversion/udt_builtin_mixture_enum.hpp +26 -0
- data/ext/boost/operators.hpp +3 -1
- data/ext/boost/optional/optional.hpp +146 -79
- data/ext/boost/optional/optional_fwd.hpp +8 -1
- data/ext/boost/preprocessor/cat.hpp +2 -2
- data/ext/boost/preprocessor/config/config.hpp +39 -4
- data/ext/boost/preprocessor/facilities/intercept.hpp +277 -0
- data/ext/boost/preprocessor/facilities/overload.hpp +25 -0
- data/ext/boost/preprocessor/iteration/detail/iter/forward1.hpp +3 -3
- data/ext/boost/preprocessor/iteration/iterate.hpp +3 -3
- data/ext/boost/preprocessor/punctuation/paren.hpp +23 -0
- data/ext/boost/preprocessor/repetition/enum_shifted_params.hpp +44 -0
- data/ext/boost/preprocessor/seq/cat.hpp +5 -4
- data/ext/boost/preprocessor/seq/size.hpp +0 -1
- data/ext/boost/preprocessor/tuple/eat.hpp +83 -34
- data/ext/boost/preprocessor/tuple/elem.hpp +161 -355
- data/ext/boost/preprocessor/tuple/rem.hpp +110 -48
- data/ext/boost/preprocessor/tuple/to_list.hpp +90 -36
- data/ext/boost/preprocessor/variadic/elem.hpp +94 -0
- data/ext/boost/preprocessor/variadic/size.hpp +30 -0
- data/ext/boost/range/begin.hpp +17 -6
- data/ext/boost/range/concepts.hpp +37 -2
- data/ext/boost/range/detail/safe_bool.hpp +72 -0
- data/ext/boost/range/end.hpp +14 -9
- data/ext/boost/range/iterator_range_core.hpp +120 -12
- data/ext/boost/range/size.hpp +21 -5
- data/ext/boost/smart_ptr/detail/shared_count.hpp +88 -0
- data/ext/boost/smart_ptr/detail/sp_counted_base.hpp +3 -0
- data/ext/boost/smart_ptr/detail/sp_counted_base_aix.hpp +142 -0
- data/ext/boost/smart_ptr/detail/sp_counted_base_gcc_mips.hpp +9 -0
- data/ext/boost/smart_ptr/detail/sp_counted_impl.hpp +10 -2
- data/ext/boost/smart_ptr/detail/sp_has_sync.hpp +5 -1
- data/ext/boost/smart_ptr/detail/spinlock.hpp +4 -1
- data/ext/boost/smart_ptr/detail/spinlock_gcc_arm.hpp +20 -3
- data/ext/boost/smart_ptr/detail/spinlock_pool.hpp +4 -0
- data/ext/boost/smart_ptr/make_shared.hpp +591 -22
- data/ext/boost/smart_ptr/shared_array.hpp +29 -1
- data/ext/boost/smart_ptr/shared_ptr.hpp +29 -13
- data/ext/boost/smart_ptr/weak_ptr.hpp +24 -12
- data/ext/boost/src/pthread/once.cpp +9 -7
- data/ext/boost/src/pthread/thread.cpp +32 -28
- data/ext/boost/src/pthread/timeconv.inl +4 -5
- data/ext/boost/src/tss_null.cpp +5 -1
- data/ext/boost/static_assert.hpp +8 -2
- data/ext/boost/thread/detail/config.hpp +19 -4
- data/ext/boost/thread/detail/move.hpp +11 -5
- data/ext/boost/thread/detail/thread.hpp +59 -43
- data/ext/boost/thread/exceptions.hpp +9 -9
- data/ext/boost/thread/future.hpp +150 -82
- data/ext/boost/thread/locks.hpp +101 -60
- data/ext/boost/thread/pthread/condition_variable.hpp +79 -32
- data/ext/boost/thread/pthread/condition_variable_fwd.hpp +12 -3
- data/ext/boost/thread/pthread/mutex.hpp +17 -14
- data/ext/boost/thread/pthread/once.hpp +3 -4
- data/ext/boost/thread/pthread/pthread_mutex_scoped_lock.hpp +12 -2
- data/ext/boost/thread/pthread/recursive_mutex.hpp +19 -19
- data/ext/boost/thread/pthread/shared_mutex.hpp +13 -13
- data/ext/boost/thread/pthread/thread_data.hpp +40 -12
- data/ext/boost/thread/thread_time.hpp +5 -0
- data/ext/boost/throw_exception.hpp +1 -1
- data/ext/boost/token_functions.hpp +34 -10
- data/ext/boost/type_traits/add_rvalue_reference.hpp +66 -0
- data/ext/boost/type_traits/alignment_of.hpp +1 -1
- data/ext/boost/type_traits/detail/bool_trait_def.hpp +26 -3
- data/ext/boost/type_traits/detail/bool_trait_undef.hpp +3 -2
- data/ext/boost/type_traits/detail/cv_traits_impl.hpp +1 -1
- data/ext/boost/type_traits/detail/size_t_trait_def.hpp +6 -4
- data/ext/boost/type_traits/detail/type_trait_def.hpp +8 -2
- data/ext/boost/type_traits/function_traits.hpp +1 -1
- data/ext/boost/type_traits/has_nothrow_constructor.hpp +53 -0
- data/ext/boost/type_traits/has_nothrow_copy.hpp +19 -5
- data/ext/boost/type_traits/has_trivial_constructor.hpp +51 -0
- data/ext/boost/type_traits/has_trivial_copy.hpp +20 -5
- data/ext/boost/type_traits/has_trivial_destructor.hpp +12 -5
- data/ext/boost/type_traits/intrinsics.hpp +119 -71
- data/ext/boost/type_traits/is_const.hpp +5 -5
- data/ext/boost/type_traits/is_convertible.hpp +14 -13
- data/ext/boost/type_traits/is_enum.hpp +1 -1
- data/ext/boost/type_traits/is_floating_point.hpp +27 -0
- data/ext/boost/type_traits/is_function.hpp +3 -3
- data/ext/boost/type_traits/is_fundamental.hpp +1 -1
- data/ext/boost/type_traits/is_member_function_pointer.hpp +2 -2
- data/ext/boost/type_traits/is_member_pointer.hpp +2 -2
- data/ext/boost/type_traits/is_pod.hpp +11 -3
- data/ext/boost/type_traits/is_pointer.hpp +2 -2
- data/ext/boost/type_traits/is_signed.hpp +8 -3
- data/ext/boost/type_traits/is_union.hpp +8 -0
- data/ext/boost/type_traits/is_unsigned.hpp +9 -4
- data/ext/boost/type_traits/is_volatile.hpp +5 -5
- data/ext/boost/type_traits/remove_cv.hpp +4 -3
- data/ext/boost/type_traits/remove_pointer.hpp +51 -2
- data/ext/boost/type_traits/remove_reference.hpp +2 -2
- data/ext/boost/type_traits/type_with_alignment.hpp +8 -2
- data/ext/boost/utility/declval.hpp +44 -0
- data/ext/boost/utility/detail/in_place_factory_prefix.hpp +36 -0
- data/ext/boost/utility/detail/in_place_factory_suffix.hpp +23 -0
- data/ext/boost/utility/detail/result_of_iterate.hpp +142 -0
- data/ext/boost/utility/in_place_factory.hpp +88 -0
- data/ext/boost/utility/result_of.hpp +103 -0
- data/ext/boost/utility/swap.hpp +55 -0
- data/ext/common/AnsiColorConstants.h +36 -0
- data/ext/common/ApplicationPool2/Common.h +87 -0
- data/ext/common/ApplicationPool2/ComponentInfo.h +53 -0
- data/ext/common/ApplicationPool2/Group.h +648 -0
- data/ext/common/ApplicationPool2/Implementation.cpp +580 -0
- data/ext/common/ApplicationPool2/Options.h +576 -0
- data/ext/common/ApplicationPool2/PipeWatcher.h +61 -0
- data/ext/common/ApplicationPool2/Pool.h +1181 -0
- data/ext/common/ApplicationPool2/Process.h +425 -0
- data/ext/common/ApplicationPool2/README.md +96 -0
- data/ext/common/ApplicationPool2/Session.h +158 -0
- data/ext/common/ApplicationPool2/Socket.h +246 -0
- data/ext/common/ApplicationPool2/Spawner.h +2212 -0
- data/ext/common/ApplicationPool2/SuperGroup.h +749 -0
- data/ext/common/BackgroundEventLoop.cpp +129 -0
- data/ext/common/BackgroundEventLoop.h +61 -0
- data/ext/common/Constants.h +3 -1
- data/ext/common/EventedBufferedInput.h +331 -0
- data/ext/common/EventedMessageServer.h +17 -34
- data/ext/common/EventedServer.h +2 -2
- data/ext/common/Exceptions.h +71 -19
- data/ext/common/FileDescriptor.h +8 -6
- data/ext/common/HttpConstants.h +167 -0
- data/ext/common/IniFile.h +24 -0
- data/ext/common/Logging.h +62 -849
- data/ext/common/MessageReadersWriters.h +19 -0
- data/ext/common/MessageServer.h +11 -14
- data/ext/common/MultiLibeio.cpp +198 -0
- data/ext/common/MultiLibeio.h +67 -0
- data/ext/common/ResourceLocator.h +24 -41
- data/ext/common/SafeLibev.h +186 -14
- data/ext/common/StaticString.h +23 -3
- data/ext/common/UnionStation.h +972 -0
- data/ext/common/Utils.cpp +168 -24
- data/ext/common/Utils.h +25 -3
- data/ext/common/Utils/CachedFileStat.hpp +4 -3
- data/ext/common/Utils/FileChangeChecker.h +2 -2
- data/ext/common/Utils/HashMap.h +50 -0
- data/ext/common/Utils/IOUtils.cpp +229 -68
- data/ext/common/Utils/IOUtils.h +134 -3
- data/ext/common/Utils/Lock.h +28 -0
- data/ext/common/Utils/MemoryBarrier.h +52 -0
- data/ext/common/Utils/PriorityQueue.h +54 -0
- data/ext/common/Utils/ProcessMetricsCollector.h +9 -11
- data/ext/common/Utils/ScopeGuard.h +50 -1
- data/ext/common/Utils/SmallVector.h +653 -0
- data/ext/common/Utils/StrIntUtils.cpp +26 -2
- data/ext/common/Utils/StrIntUtils.h +18 -2
- data/ext/common/Utils/StringMap.h +125 -8
- data/ext/common/Utils/Template.h +212 -0
- data/ext/common/Utils/fib.c +699 -0
- data/ext/common/Utils/fib.h +101 -0
- data/ext/common/Utils/fibpriv.h +67 -0
- data/ext/common/Utils/json-forwards.h +249 -0
- data/ext/common/Utils/json.h +1855 -0
- data/ext/common/Utils/jsoncpp.cpp +4230 -0
- data/ext/common/agents/Base.cpp +1126 -0
- data/ext/common/{AgentBase.h → agents/Base.h} +5 -1
- data/ext/common/agents/EnvPrinter.c +16 -0
- data/ext/common/agents/HelperAgent/AgentOptions.h +81 -0
- data/ext/common/{HelperAgent → agents/HelperAgent}/BacktracesServer.h +3 -2
- data/ext/common/agents/HelperAgent/FileBackedPipe.h +732 -0
- data/ext/common/agents/HelperAgent/Main.cpp +497 -0
- data/ext/common/agents/HelperAgent/RequestHandler.cpp +283 -0
- data/ext/common/agents/HelperAgent/RequestHandler.h +2139 -0
- data/ext/common/agents/HelperAgent/ScgiRequestParser.h +451 -0
- data/ext/common/{LoggingAgent → agents/LoggingAgent}/DataStoreId.h +1 -1
- data/ext/common/{LoggingAgent → agents/LoggingAgent}/FilterSupport.cpp +1 -1
- data/ext/common/{LoggingAgent → agents/LoggingAgent}/FilterSupport.h +0 -0
- data/ext/common/{LoggingAgent → agents/LoggingAgent}/LoggingServer.h +18 -16
- data/ext/common/{LoggingAgent → agents/LoggingAgent}/Main.cpp +15 -13
- data/ext/common/{LoggingAgent → agents/LoggingAgent}/RemoteSender.h +6 -6
- data/ext/common/agents/SpawnPreparer.cpp +127 -0
- data/ext/common/{Watchdog.cpp → agents/Watchdog/Main.cpp} +63 -25
- data/ext/libeio/Changes +72 -0
- data/ext/{google/COPYING → libeio/LICENSE} +17 -9
- data/ext/libeio/Makefile.am +15 -0
- data/ext/libeio/Makefile.in +694 -0
- data/ext/libeio/aclocal.m4 +9418 -0
- data/ext/libeio/autogen.sh +3 -0
- data/ext/libeio/config.guess +1501 -0
- data/ext/libeio/config.h.in +136 -0
- data/ext/libeio/config.sub +1705 -0
- data/ext/libeio/configure +14822 -0
- data/ext/libeio/configure.ac +22 -0
- data/ext/libeio/demo.c +194 -0
- data/ext/libeio/ecb.h +457 -0
- data/ext/libeio/eio.c +2816 -0
- data/ext/libeio/eio.h +411 -0
- data/ext/libeio/install-sh +520 -0
- data/ext/libeio/libeio.m4 +211 -0
- data/ext/libeio/ltmain.sh +9636 -0
- data/ext/libeio/missing +376 -0
- data/ext/libeio/xthread.h +166 -0
- data/ext/libev/Changes +125 -7
- data/ext/libev/Makefile.am +5 -3
- data/ext/libev/Makefile.in +209 -120
- data/ext/libev/aclocal.m4 +6027 -4619
- data/ext/libev/autogen.sh +1 -4
- data/ext/libev/config.h.in +11 -7
- data/ext/libev/configure +7312 -14993
- data/ext/libev/configure.ac +12 -5
- data/ext/libev/depcomp +630 -0
- data/ext/libev/ev++.h +48 -32
- data/ext/libev/ev.c +1173 -391
- data/ext/libev/ev.h +315 -181
- data/ext/libev/ev_epoll.c +66 -15
- data/ext/libev/ev_kqueue.c +20 -18
- data/ext/libev/ev_poll.c +27 -23
- data/ext/libev/ev_port.c +39 -19
- data/ext/libev/ev_select.c +23 -17
- data/ext/libev/ev_vars.h +25 -8
- data/ext/libev/ev_win32.c +6 -6
- data/ext/libev/ev_wrap.h +22 -2
- data/ext/libev/event.c +18 -17
- data/ext/libev/event.h +16 -4
- data/ext/libev/libev.m4 +10 -6
- data/ext/libev/ltmain.sh +7353 -5811
- data/ext/nginx/Configuration.c +74 -42
- data/ext/nginx/Configuration.h +3 -5
- data/ext/nginx/ContentHandler.c +26 -83
- data/ext/nginx/ContentHandler.h +1 -1
- data/ext/nginx/config +13 -9
- data/ext/nginx/ngx_http_passenger_module.c +3 -7
- data/ext/oxt/detail/backtrace_enabled.hpp +5 -102
- data/ext/oxt/detail/context.hpp +90 -0
- data/ext/oxt/detail/spin_lock_darwin.hpp +4 -0
- data/ext/oxt/detail/spin_lock_gcc_x86.hpp +4 -0
- data/ext/oxt/detail/spin_lock_pthreads.hpp +14 -0
- data/ext/oxt/detail/tracable_exception_enabled.hpp +2 -2
- data/ext/oxt/dynamic_thread_group.hpp +27 -1
- data/ext/oxt/implementation.cpp +415 -0
- data/ext/oxt/{thread.cpp → initialize.hpp} +13 -6
- data/ext/oxt/macros.hpp +32 -1
- data/ext/oxt/spin_lock.hpp +6 -11
- data/ext/oxt/system_calls.cpp +204 -16
- data/ext/oxt/system_calls.hpp +85 -45
- data/ext/oxt/thread.hpp +13 -117
- data/ext/ruby/passenger_native_support.c +82 -237
- data/helper-scripts/backtrace-sanitizer.rb +114 -0
- data/helper-scripts/classic-rails-loader.rb +135 -0
- data/helper-scripts/classic-rails-preloader.rb +161 -0
- data/helper-scripts/node-loader.js +314 -0
- data/helper-scripts/rack-loader.rb +104 -0
- data/helper-scripts/rack-preloader.rb +132 -0
- data/helper-scripts/wsgi-loader.py +231 -0
- data/helper-scripts/wsgi-preloader.py +1 -0
- data/lib/phusion_passenger.rb +159 -61
- data/lib/phusion_passenger/abstract_installer.rb +182 -87
- data/lib/phusion_passenger/admin_tools/server_instance.rb +25 -19
- data/lib/phusion_passenger/analytics_logger.rb +5 -4
- data/lib/phusion_passenger/classic_rails/{request_handler.rb → thread_handler_extension.rb} +4 -40
- data/lib/phusion_passenger/classic_rails_extensions/init.rb +5 -3
- data/lib/phusion_passenger/common_library.rb +441 -0
- data/lib/phusion_passenger/console_text_template.rb +4 -16
- data/lib/phusion_passenger/constants.rb +1 -8
- data/lib/phusion_passenger/debug_logging.rb +5 -2
- data/lib/phusion_passenger/dependencies.rb +51 -13
- data/lib/phusion_passenger/loader_shared_helpers.rb +318 -0
- data/lib/phusion_passenger/message_channel.rb +3 -47
- data/lib/phusion_passenger/message_client.rb +2 -2
- data/lib/phusion_passenger/native_support.rb +36 -15
- data/lib/phusion_passenger/packaging.rb +8 -11
- data/lib/phusion_passenger/platform_info.rb +25 -17
- data/lib/phusion_passenger/platform_info/apache.rb +10 -7
- data/lib/phusion_passenger/platform_info/binary_compatibility.rb +10 -30
- data/lib/phusion_passenger/platform_info/compiler.rb +93 -34
- data/lib/phusion_passenger/platform_info/ruby.rb +37 -97
- data/lib/phusion_passenger/preloader_shared_helpers.rb +121 -0
- data/lib/phusion_passenger/public_api.rb +1 -4
- data/lib/phusion_passenger/rack/{request_handler.rb → thread_handler_extension.rb} +14 -63
- data/lib/phusion_passenger/rails3_extensions/init.rb +9 -8
- data/lib/phusion_passenger/request_handler.rb +500 -0
- data/lib/phusion_passenger/request_handler/thread_handler.rb +360 -0
- data/lib/phusion_passenger/ruby_core_enhancements.rb +142 -0
- data/lib/phusion_passenger/standalone/command.rb +36 -15
- data/lib/phusion_passenger/standalone/package_runtime_command.rb +16 -8
- data/lib/phusion_passenger/standalone/runtime_installer.rb +169 -72
- data/lib/phusion_passenger/standalone/start_command.rb +44 -39
- data/lib/phusion_passenger/standalone/utils.rb +5 -5
- data/lib/phusion_passenger/utils.rb +35 -914
- data/lib/phusion_passenger/utils/ansi_colors.rb +59 -0
- data/lib/phusion_passenger/utils/file_system_watcher.rb +1 -1
- data/lib/phusion_passenger/utils/robust_interruption.rb +134 -0
- data/lib/phusion_passenger/utils/tee_input.rb +174 -0
- data/lib/phusion_passenger/utils/tmpio.rb +33 -0
- data/lib/phusion_passenger/utils/unseekable_socket.rb +6 -0
- data/resources/mime.types +5 -1
- data/{lib/phusion_passenger/templates → resources}/standalone_default_root/index.html +0 -0
- data/{lib/phusion_passenger → resources}/templates/apache2/apache_must_be_compiled_with_compatible_mpm.txt.erb +0 -0
- data/{lib/phusion_passenger → resources}/templates/apache2/config_snippets.txt.erb +0 -0
- data/{lib/phusion_passenger → resources}/templates/apache2/deployment_example.txt.erb +0 -0
- data/{lib/phusion_passenger → resources}/templates/apache2/no_write_permission_to_passenger_root.txt.erb +0 -0
- data/{lib/phusion_passenger → resources}/templates/apache2/possible_solutions_for_compilation_and_installation_problems.txt.erb +0 -0
- data/{lib/phusion_passenger → resources}/templates/apache2/run_installer_as_root.txt.erb +0 -0
- data/{lib/phusion_passenger → resources}/templates/apache2/welcome.txt.erb +0 -0
- data/{lib/phusion_passenger → resources}/templates/error_layout.css +6 -0
- data/resources/templates/error_layout.html.template +89 -0
- data/resources/templates/general_error.html.template +1 -0
- data/resources/templates/general_error_with_html.html.template +1 -0
- data/{lib/phusion_passenger → resources}/templates/nginx/ask_for_extra_configure_flags.txt.erb +0 -0
- data/{lib/phusion_passenger → resources}/templates/nginx/cannot_write_to_dir.txt.erb +0 -0
- data/{lib/phusion_passenger → resources}/templates/nginx/config_snippets.txt.erb +0 -0
- data/{lib/phusion_passenger → resources}/templates/nginx/config_snippets_inserted.txt.erb +0 -0
- data/{lib/phusion_passenger → resources}/templates/nginx/confirm_extra_configure_flags.txt.erb +0 -0
- data/{lib/phusion_passenger → resources}/templates/nginx/deployment_example.txt.erb +0 -0
- data/resources/templates/nginx/not_available_when_natively_packaged.txt.erb +8 -0
- data/{lib/phusion_passenger → resources}/templates/nginx/pcre_could_not_be_downloaded.txt.erb +0 -0
- data/{lib/phusion_passenger → resources}/templates/nginx/pcre_could_not_be_extracted.txt.erb +0 -0
- data/{lib/phusion_passenger → resources}/templates/nginx/possible_solutions_for_compilation_and_installation_problems.txt.erb +0 -0
- data/{lib/phusion_passenger → resources}/templates/nginx/possible_solutions_for_download_and_extraction_problems.txt.erb +0 -0
- data/{lib/phusion_passenger → resources}/templates/nginx/query_download_and_install.txt.erb +0 -0
- data/{lib/phusion_passenger → resources}/templates/nginx/run_installer_as_root.txt.erb +0 -0
- data/{lib/phusion_passenger → resources}/templates/nginx/welcome.txt.erb +0 -0
- data/{lib/phusion_passenger → resources}/templates/standalone/cannot_write_to_dir.txt.erb +0 -0
- data/{lib/phusion_passenger → resources}/templates/standalone/config.erb +26 -5
- data/{lib/phusion_passenger → resources}/templates/standalone/possible_solutions_for_download_and_extraction_problems.txt.erb +0 -0
- data/{lib/phusion_passenger → resources}/templates/standalone/run_installer_as_root.txt.erb +0 -0
- data/{lib/phusion_passenger → resources}/templates/standalone/welcome.txt.erb +0 -0
- data/resources/templates/undisclosed_error.html.template +25 -0
- data/test/config.json.example +42 -0
- data/test/cxx/ApplicationPool2/DirectSpawnerTest.cpp +86 -0
- data/test/cxx/ApplicationPool2/OptionsTest.cpp +44 -0
- data/test/cxx/ApplicationPool2/PoolTest.cpp +1234 -0
- data/test/cxx/ApplicationPool2/ProcessTest.cpp +131 -0
- data/test/cxx/ApplicationPool2/SmartSpawnerTest.cpp +229 -0
- data/test/cxx/ApplicationPool2/SpawnerTestCases.cpp +744 -0
- data/test/cxx/BufferedIOTest.cpp +7 -7
- data/test/cxx/CxxTestMain.cpp +65 -2
- data/test/cxx/FileBackedPipeTest.cpp +626 -0
- data/test/cxx/FileChangeCheckerTest.cpp +20 -18
- data/test/cxx/FilterSupportTest.cpp +5 -5
- data/test/cxx/IOUtilsTest.cpp +11 -4
- data/test/cxx/MessageReadersWritersTest.cpp +1 -1
- data/test/cxx/MessageServerTest.cpp +31 -30
- data/test/cxx/RequestHandlerTest.cpp +777 -0
- data/test/cxx/ScgiRequestParserTest.cpp +36 -16
- data/test/cxx/ServerInstanceDirTest.cpp +1 -1
- data/test/cxx/StringMapTest.cpp +61 -0
- data/test/cxx/TemplateTest.cpp +118 -0
- data/test/cxx/TestSupport.cpp +25 -68
- data/test/cxx/TestSupport.h +81 -41
- data/test/cxx/{LoggingTest.cpp → UnionStationTest.cpp} +79 -74
- data/test/cxx/UtilsTest.cpp +59 -5
- data/test/integration_tests/apache2_tests.rb +2 -2
- data/test/integration_tests/nginx_tests.rb +1 -1
- data/test/integration_tests/spec_helper.rb +7 -5
- data/test/oxt/oxt_test_main.cpp +2 -0
- data/test/oxt/syscall_interruption_test.cpp +1 -0
- data/test/ruby/classic_rails/loader_spec.rb +48 -0
- data/test/ruby/classic_rails/preloader_spec.rb +54 -0
- data/test/ruby/rack/loader_spec.rb +62 -0
- data/test/ruby/rack/preloader_spec.rb +74 -0
- data/test/ruby/{abstract_request_handler_spec.rb → request_handler_spec.rb} +31 -68
- data/test/ruby/shared/loader_spec.rb +241 -0
- data/test/ruby/shared/rails/analytics_logging_extensions_spec.rb +141 -182
- data/test/ruby/shared/ruby_loader_spec.rb +55 -0
- data/test/ruby/spec_helper.rb +8 -53
- data/test/ruby/utils/file_system_watcher_spec.rb +9 -1
- data/test/ruby/utils_spec.rb +10 -683
- data/test/stub/rack/config.ru +28 -3
- data/test/stub/rack/start.rb +47 -0
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/Rakefile +0 -0
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/app/controllers/application_controller.rb +0 -2
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/app/controllers/bar_controller_1.rb +0 -0
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/app/controllers/bar_controller_2.rb +0 -0
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/app/controllers/foo_controller.rb +0 -0
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/app/helpers/application_helper.rb +0 -0
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/config/boot.rb +0 -0
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/config/database.yml +3 -3
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/config/environment.rb +5 -2
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/config/environments/development.rb +0 -0
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/config/environments/production.rb +0 -0
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/config/environments/staging.rb +0 -0
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/config/initializers/inflections.rb +0 -0
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/config/initializers/mime_types.rb +0 -0
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/config/routes.rb +1 -0
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/script/about +0 -0
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/script/console +0 -0
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/script/dbconsole +0 -0
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/script/destroy +0 -0
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/script/generate +0 -0
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/script/performance/benchmarker +0 -0
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/script/performance/profiler +0 -0
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/script/performance/request +0 -0
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/script/plugin +0 -0
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/script/process/inspector +0 -0
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/script/process/reaper +0 -0
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/script/process/spawner +0 -0
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/script/runner +0 -0
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/script/server +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/Gemfile +0 -0
- data/test/stub/rails3.0/Gemfile.lock +80 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/Rakefile +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/app/controllers/application_controller.rb +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/app/helpers/application_helper.rb +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/app/views/layouts/application.html.erb +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/config.ru +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/config/application.rb +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/config/boot.rb +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/config/database.yml +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/config/environment.rb +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/config/environments/development.rb +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/config/environments/production.rb +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/config/environments/test.rb +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/config/initializers/backtrace_silencers.rb +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/config/initializers/inflections.rb +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/config/initializers/mime_types.rb +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/config/initializers/passenger.rb +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/config/initializers/secret_token.rb +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/config/initializers/session_store.rb +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/config/locales/en.yml +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/config/routes.rb +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/db/seeds.rb +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/doc/README_FOR_APP +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/public/404.html +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/public/422.html +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/public/500.html +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/public/favicon.ico +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/public/index.html +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/public/robots.txt +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/script/rails +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/test/performance/browsing_test.rb +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/test/test_helper.rb +0 -0
- data/test/stub/start_error.pl +24 -0
- data/test/stub/wsgi/passenger_wsgi.py +71 -3
- data/test/support/apache2_controller.rb +2 -2
- data/test/support/placebo-preloader.rb +88 -0
- data/test/support/test_helper.rb +1 -14
- data/test/tut/tut.h +11 -4
- metadata +590 -326
- data.tar.gz.asc +0 -12
- data/PACKAGING.TXT +0 -25
- data/build/config.rb +0 -46
- data/ext/apache2/HelperAgent.cpp +0 -364
- data/ext/boost/call_traits.hpp +0 -24
- data/ext/boost/detail/call_traits.hpp +0 -164
- data/ext/common/AbstractSpawnManager.h +0 -110
- data/ext/common/AgentBase.cpp +0 -432
- data/ext/common/ApplicationPool/Client.h +0 -788
- data/ext/common/ApplicationPool/Interface.h +0 -295
- data/ext/common/ApplicationPool/Pool.h +0 -1327
- data/ext/common/ApplicationPool/Server.h +0 -479
- data/ext/common/MessageChannel.h +0 -494
- data/ext/common/PoolOptions.h +0 -518
- data/ext/common/Process.h +0 -253
- data/ext/common/Session.h +0 -436
- data/ext/common/SpawnManager.h +0 -611
- data/ext/google/ChangeLog +0 -167
- data/ext/google/dense_hash_map +0 -310
- data/ext/google/dense_hash_set +0 -287
- data/ext/google/sparse_hash_map +0 -294
- data/ext/google/sparse_hash_set +0 -275
- data/ext/google/sparsehash/densehashtable.h +0 -1062
- data/ext/google/sparsehash/sparseconfig.h +0 -55
- data/ext/google/sparsehash/sparsehashtable.h +0 -1015
- data/ext/google/sparsetable +0 -1468
- data/ext/google/type_traits.h +0 -250
- data/ext/nginx/HelperAgent.cpp +0 -1355
- data/ext/nginx/ScgiRequestParser.h +0 -375
- data/ext/oxt/backtrace.cpp +0 -185
- data/ext/oxt/tracable_exception.cpp +0 -89
- data/helper-scripts/passenger-spawn-server +0 -106
- data/lib/phusion_passenger/abstract_request_handler.rb +0 -766
- data/lib/phusion_passenger/abstract_server.rb +0 -372
- data/lib/phusion_passenger/abstract_server_collection.rb +0 -335
- data/lib/phusion_passenger/app_process.rb +0 -174
- data/lib/phusion_passenger/classic_rails/application_spawner.rb +0 -344
- data/lib/phusion_passenger/classic_rails/framework_spawner.rb +0 -311
- data/lib/phusion_passenger/exceptions.rb +0 -103
- data/lib/phusion_passenger/html_template.rb +0 -107
- data/lib/phusion_passenger/rack/application_spawner.rb +0 -231
- data/lib/phusion_passenger/spawn_manager.rb +0 -359
- data/lib/phusion_passenger/templates/app_exited_during_initialization.html.erb +0 -38
- data/lib/phusion_passenger/templates/app_init_error.html.erb +0 -64
- data/lib/phusion_passenger/templates/database_error.html.erb +0 -66
- data/lib/phusion_passenger/templates/error_layout.html.erb +0 -39
- data/lib/phusion_passenger/templates/framework_init_error.html.erb +0 -39
- data/lib/phusion_passenger/templates/general_error.html.erb +0 -22
- data/lib/phusion_passenger/templates/load_error.html.erb +0 -46
- data/lib/phusion_passenger/templates/version_not_found.html.erb +0 -34
- data/lib/phusion_passenger/utils/rewindable_input.rb +0 -125
- data/lib/phusion_passenger/wsgi/application_spawner.rb +0 -108
- data/test/config.yml.example +0 -41
- data/test/cxx/ApplicationPool_PoolTest.cpp +0 -33
- data/test/cxx/ApplicationPool_PoolTestCases.cpp +0 -1029
- data/test/cxx/ApplicationPool_ServerTest.cpp +0 -308
- data/test/cxx/ApplicationPool_Server_PoolTest.cpp +0 -80
- data/test/cxx/MessageChannelTest.cpp +0 -557
- data/test/cxx/PoolOptionsTest.cpp +0 -116
- data/test/cxx/SpawnManagerTest.cpp +0 -161
- data/test/ruby/abstract_server_collection_spec.rb +0 -247
- data/test/ruby/abstract_server_spec.rb +0 -61
- data/test/ruby/app_process_spec.rb +0 -43
- data/test/ruby/classic_rails/application_spawner_spec.rb +0 -89
- data/test/ruby/classic_rails/framework_spawner_spec.rb +0 -92
- data/test/ruby/rack/application_spawner_spec.rb +0 -116
- data/test/ruby/shared/abstract_server_spec.rb +0 -23
- data/test/ruby/shared/spawners/classic_rails/framework_spawner_spec.rb +0 -38
- data/test/ruby/shared/spawners/classic_rails/lack_of_rails_gem_version_spec.rb +0 -19
- data/test/ruby/shared/spawners/classic_rails/spawner_spec.rb +0 -15
- data/test/ruby/shared/spawners/non_preloading_spawner_spec.rb +0 -27
- data/test/ruby/shared/spawners/preloading_spawner_spec.rb +0 -29
- data/test/ruby/shared/spawners/reload_all_spec.rb +0 -36
- data/test/ruby/shared/spawners/reload_single_spec.rb +0 -52
- data/test/ruby/shared/spawners/spawn_server_spec.rb +0 -28
- data/test/ruby/shared/spawners/spawner_spec.rb +0 -273
- data/test/ruby/shared/utils/pseudo_io_spec.rb +0 -60
- data/test/ruby/spawn_manager_spec.rb +0 -134
- data/test/ruby/wsgi/application_spawner_spec.rb +0 -50
- data/test/stub/message_channel.rb +0 -11
- data/test/stub/message_channel_2.rb +0 -12
- data/test/stub/message_channel_3.rb +0 -19
- data/test/stub/rails_apps/3.0/empty/Gemfile.lock +0 -73
- data/test/stub/spawn_server.rb +0 -22
- metadata.gz.asc +0 -12
@@ -1,295 +0,0 @@
|
|
1
|
-
/*
|
2
|
-
* Phusion Passenger - http://www.modrails.com/
|
3
|
-
* Copyright (c) 2010 Phusion
|
4
|
-
*
|
5
|
-
* "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
|
6
|
-
*
|
7
|
-
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
8
|
-
* of this software and associated documentation files (the "Software"), to deal
|
9
|
-
* in the Software without restriction, including without limitation the rights
|
10
|
-
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
11
|
-
* copies of the Software, and to permit persons to whom the Software is
|
12
|
-
* furnished to do so, subject to the following conditions:
|
13
|
-
*
|
14
|
-
* The above copyright notice and this permission notice shall be included in
|
15
|
-
* all copies or substantial portions of the Software.
|
16
|
-
*
|
17
|
-
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
18
|
-
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
19
|
-
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
20
|
-
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
21
|
-
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
22
|
-
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
23
|
-
* THE SOFTWARE.
|
24
|
-
*/
|
25
|
-
#ifndef _PASSENGER_APPLICATION_POOL_INTERFACE_H_
|
26
|
-
#define _PASSENGER_APPLICATION_POOL_INTERFACE_H_
|
27
|
-
|
28
|
-
#include <boost/shared_ptr.hpp>
|
29
|
-
#include <sys/types.h>
|
30
|
-
|
31
|
-
#include "../Session.h"
|
32
|
-
#include "../PoolOptions.h"
|
33
|
-
|
34
|
-
namespace Passenger {
|
35
|
-
namespace ApplicationPool {
|
36
|
-
|
37
|
-
using namespace std;
|
38
|
-
using namespace boost;
|
39
|
-
|
40
|
-
/**
|
41
|
-
* A persistent pool of Applications.
|
42
|
-
*
|
43
|
-
* Spawning application instances, especially Ruby on Rails ones, is a very expensive operation.
|
44
|
-
* Despite best efforts to make the operation less expensive (see SpawnManager),
|
45
|
-
* it remains expensive compared to the cost of processing an HTTP request/response.
|
46
|
-
* So, in order to solve this, some sort of caching/pooling mechanism will be required.
|
47
|
-
* ApplicationPool provides this.
|
48
|
-
*
|
49
|
-
* Normally, one would use SpawnManager to spawn a new RoR/Rack application instance,
|
50
|
-
* then use Application::connect() to create a new session with that application
|
51
|
-
* instance, and then use the returned Session object to send the request and
|
52
|
-
* to read the HTTP response. ApplicationPool replaces the first step with
|
53
|
-
* a call to Application::get(). For example:
|
54
|
-
* @code
|
55
|
-
* ApplicationPool pool = some_function_which_creates_an_application_pool();
|
56
|
-
*
|
57
|
-
* // Connect to the application and get the newly opened session.
|
58
|
-
* Application::SessionPtr session(pool->get("/home/webapps/foo"));
|
59
|
-
*
|
60
|
-
* // Send the request headers and request body data.
|
61
|
-
* session->sendHeaders(...);
|
62
|
-
* session->sendBodyBlock(...);
|
63
|
-
* // Done sending data, so we shutdown the writer stream.
|
64
|
-
* session->shutdownWriter();
|
65
|
-
*
|
66
|
-
* // Now read the HTTP response.
|
67
|
-
* string responseData = readAllDataFromSocket(session->getStream());
|
68
|
-
* // Done reading data, so we shutdown the reader stream.
|
69
|
-
* session->shutdownReader();
|
70
|
-
*
|
71
|
-
* // This session has now finished, so we close the session by resetting
|
72
|
-
* // the smart pointer to NULL (thereby destroying the Session object).
|
73
|
-
* session.reset();
|
74
|
-
*
|
75
|
-
* // We can connect to an Application multiple times. Just make sure
|
76
|
-
* // the previous session is closed.
|
77
|
-
* session = app->connect("/home/webapps/bar");
|
78
|
-
* @endcode
|
79
|
-
*
|
80
|
-
* Internally, ApplicationPool::get() will keep spawned applications instances in
|
81
|
-
* memory, and reuse them if possible. It will try to keep spawning to a minimum.
|
82
|
-
* Furthermore, if an application instance hasn't been used for a while, it
|
83
|
-
* will be automatically shutdown in order to save memory. Restart requests are
|
84
|
-
* honored: if an application has the file 'restart.txt' in its 'tmp' folder,
|
85
|
-
* then get() will shutdown existing instances of that application and spawn
|
86
|
-
* a new instance (this is useful when a new version of an application has been
|
87
|
-
* deployed). And finally, one can set a hard limit on the maximum number of
|
88
|
-
* applications instances that may be spawned (see ApplicationPool::setMax()).
|
89
|
-
*
|
90
|
-
* Note that ApplicationPool is just an interface (i.e. a pure virtual class).
|
91
|
-
* For concrete classes, see StandardApplicationPool and ApplicationPoolServer.
|
92
|
-
* The exact pooling algorithm depends on the implementation class.
|
93
|
-
*
|
94
|
-
* ApplicationPool is *not* guaranteed to be thread-safe. See the documentation
|
95
|
-
* for concrete implementations to find out whether that particular implementation
|
96
|
-
* is thread-safe.
|
97
|
-
*
|
98
|
-
* @ingroup Support
|
99
|
-
*/
|
100
|
-
class Interface {
|
101
|
-
public:
|
102
|
-
virtual ~Interface() {};
|
103
|
-
|
104
|
-
/**
|
105
|
-
* Checks whether this ApplicationPool object is still connected to the
|
106
|
-
* ApplicationPool server.
|
107
|
-
*
|
108
|
-
* If that's not the case, then one should reconnect to the ApplicationPool server.
|
109
|
-
*
|
110
|
-
* This method is only meaningful for instances of type ApplicationPoolServer::Client.
|
111
|
-
* The default implementation always returns true.
|
112
|
-
*/
|
113
|
-
virtual bool connected() const {
|
114
|
-
return true;
|
115
|
-
}
|
116
|
-
|
117
|
-
/**
|
118
|
-
* Open a new session with the application specified by <tt>PoolOptions.appRoot</tt>.
|
119
|
-
* See the class description for ApplicationPool, as well as Application::connect(),
|
120
|
-
* on how to use the returned session object.
|
121
|
-
*
|
122
|
-
* Internally, this method may either spawn a new application instance, or use
|
123
|
-
* an existing one.
|
124
|
-
*
|
125
|
-
* @param options An object containing information on which application to open
|
126
|
-
* a session with, as well as spawning details. Spawning details will be used
|
127
|
-
* if the pool decides that spawning a new application instance is necessary.
|
128
|
-
* See SpawnManager and PoolOptions for details.
|
129
|
-
* @return A session object.
|
130
|
-
* @throws SpawnException An attempt was made to spawn a new application instance, but that attempt failed.
|
131
|
-
* @throws BusyException The application pool is too busy right now, and cannot
|
132
|
-
* satisfy the request. One should either abort, or try again later.
|
133
|
-
* @throws SystemException Something else went wrong.
|
134
|
-
* @throws IOException Something else went wrong.
|
135
|
-
* @throws boost::thread_interrupted
|
136
|
-
* @throws Anything thrown by options.environmentVariables->getItems().
|
137
|
-
* @note Applications are uniquely identified with the application root
|
138
|
-
* string. So although <tt>appRoot</tt> does not have to be absolute, it
|
139
|
-
* should be. If one calls <tt>get("/home/foo")</tt> and
|
140
|
-
* <tt>get("/home/../home/foo")</tt>, then ApplicationPool will think
|
141
|
-
* they're 2 different applications, and thus will spawn 2 application instances.
|
142
|
-
*/
|
143
|
-
virtual SessionPtr get(const PoolOptions &options) = 0;
|
144
|
-
|
145
|
-
/**
|
146
|
-
* Convenience shortcut for calling get() with default spawn options.
|
147
|
-
*
|
148
|
-
* @throws SpawnException
|
149
|
-
* @throws IOException
|
150
|
-
* @throws SystemException
|
151
|
-
* @throws boost::thread_interrupted
|
152
|
-
* @throws Anything thrown by options.environmentVariables->getItems().
|
153
|
-
*/
|
154
|
-
virtual SessionPtr get(const string &appRoot) {
|
155
|
-
return get(PoolOptions(appRoot));
|
156
|
-
}
|
157
|
-
|
158
|
-
/**
|
159
|
-
* Detach the process with the given identifier from this pool.
|
160
|
-
*
|
161
|
-
* The identifier can be obtained from a session through the
|
162
|
-
* getPoolIdentifier() method.
|
163
|
-
*
|
164
|
-
* @param identifier The identifier.
|
165
|
-
* @returns Whether there was a process in the pool with the given identifier.
|
166
|
-
* @throws IOException
|
167
|
-
* @throws SystemException
|
168
|
-
* @throws boost::thread_interrupted
|
169
|
-
*/
|
170
|
-
virtual bool detach(const string &identifier) = 0;
|
171
|
-
|
172
|
-
/**
|
173
|
-
* Clear all application instances that are currently in the pool.
|
174
|
-
*
|
175
|
-
* This method is used by unit tests to verify that the implementation is correct,
|
176
|
-
* and thus should not be called directly.
|
177
|
-
*
|
178
|
-
* @throws IOException
|
179
|
-
* @throws SystemException
|
180
|
-
* @throws boost::thread_interrupted
|
181
|
-
*/
|
182
|
-
virtual void clear() = 0;
|
183
|
-
|
184
|
-
/**
|
185
|
-
* Set the maximum idle time for application instances. Application instances
|
186
|
-
* that haven't received any requests in <tt>seconds</tt> seconds will be shut
|
187
|
-
* down.
|
188
|
-
*
|
189
|
-
* A value of 0 means that the application instances will not idle timeout.
|
190
|
-
*
|
191
|
-
* @throws IOException
|
192
|
-
* @throws SystemException
|
193
|
-
* @throws boost::thread_interrupted
|
194
|
-
*/
|
195
|
-
virtual void setMaxIdleTime(unsigned int seconds) = 0;
|
196
|
-
|
197
|
-
/**
|
198
|
-
* Set a hard limit on the number of application instances that this ApplicationPool
|
199
|
-
* may spawn. The exact behavior depends on the used algorithm, and is not specified by
|
200
|
-
* these API docs.
|
201
|
-
*
|
202
|
-
* It is allowed to set a limit lower than the current number of spawned applications.
|
203
|
-
*
|
204
|
-
* @throws IOException
|
205
|
-
* @throws SystemException
|
206
|
-
* @throws boost::thread_interrupted
|
207
|
-
*/
|
208
|
-
virtual void setMax(unsigned int max) = 0;
|
209
|
-
|
210
|
-
/**
|
211
|
-
* Get the number of active applications in the pool.
|
212
|
-
*
|
213
|
-
* This method exposes an implementation detail of the underlying pooling algorithm.
|
214
|
-
* It is used by unit tests to verify that the implementation is correct,
|
215
|
-
* and thus should not be called directly.
|
216
|
-
*
|
217
|
-
* @throws IOException
|
218
|
-
* @throws SystemException
|
219
|
-
* @throws boost::thread_interrupted
|
220
|
-
*/
|
221
|
-
virtual unsigned int getActive() const = 0;
|
222
|
-
|
223
|
-
/**
|
224
|
-
* Get the number of active applications in the pool.
|
225
|
-
*
|
226
|
-
* This method exposes an implementation detail of the underlying pooling algorithm.
|
227
|
-
* It is used by unit tests to verify that the implementation is correct,
|
228
|
-
* and thus should not be called directly.
|
229
|
-
*
|
230
|
-
* @throws IOException
|
231
|
-
* @throws SystemException
|
232
|
-
* @throws boost::thread_interrupted
|
233
|
-
*/
|
234
|
-
virtual unsigned int getCount() const = 0;
|
235
|
-
|
236
|
-
/**
|
237
|
-
* Returns the number of clients waiting on the global queue.
|
238
|
-
*
|
239
|
-
* This method exposes an implementation detail of the underlying pooling algorithm.
|
240
|
-
* It is used by unit tests to verify that the implementation is correct,
|
241
|
-
* and thus should not be called directly.
|
242
|
-
*
|
243
|
-
* @throws IOException
|
244
|
-
* @throws SystemException
|
245
|
-
* @throws boost::thread_interrupted
|
246
|
-
*/
|
247
|
-
virtual unsigned int getGlobalQueueSize() const = 0;
|
248
|
-
|
249
|
-
/**
|
250
|
-
* Set a hard limit on the number of application instances that a single application
|
251
|
-
* may spawn in this ApplicationPool. The exact behavior depends on the used algorithm,
|
252
|
-
* and is not specified by these API docs.
|
253
|
-
*
|
254
|
-
* It is allowed to set a limit lower than the current number of spawned applications.
|
255
|
-
*
|
256
|
-
* @throws IOException
|
257
|
-
* @throws SystemException
|
258
|
-
* @throws boost::thread_interrupted
|
259
|
-
*/
|
260
|
-
virtual void setMaxPerApp(unsigned int max) = 0;
|
261
|
-
|
262
|
-
/**
|
263
|
-
* Get the process ID of the spawn server that is used.
|
264
|
-
*
|
265
|
-
* This method exposes an implementation detail. It is used by unit tests to verify
|
266
|
-
* that the implementation is correct, and thus should not be used directly.
|
267
|
-
*
|
268
|
-
* @throws IOException
|
269
|
-
* @throws SystemException
|
270
|
-
* @throws boost::thread_interrupted
|
271
|
-
*/
|
272
|
-
virtual pid_t getSpawnServerPid() const = 0;
|
273
|
-
|
274
|
-
/**
|
275
|
-
* Returns a human-readable description of the internal state
|
276
|
-
* of the application pool.
|
277
|
-
*/
|
278
|
-
virtual string inspect() const = 0;
|
279
|
-
|
280
|
-
/**
|
281
|
-
* Returns an XML description of the internal state of the
|
282
|
-
* application pool.
|
283
|
-
*
|
284
|
-
* @param includeSensitiveInformation Whether potentially sensitive
|
285
|
-
* information may be included in the result.
|
286
|
-
*/
|
287
|
-
virtual string toXml(bool includeSensitiveInformation = true) const = 0;
|
288
|
-
};
|
289
|
-
|
290
|
-
typedef shared_ptr<Interface> Ptr;
|
291
|
-
|
292
|
-
} // namespace ApplicationPool
|
293
|
-
} // namespace Passenger
|
294
|
-
|
295
|
-
#endif /* _PASSENGER_APPLICATION_POOL_INTERFACE_H_ */
|
@@ -1,1327 +0,0 @@
|
|
1
|
-
/*
|
2
|
-
* Phusion Passenger - http://www.modrails.com/
|
3
|
-
* Copyright (c) 2010 Phusion
|
4
|
-
*
|
5
|
-
* "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
|
6
|
-
*
|
7
|
-
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
8
|
-
* of this software and associated documentation files (the "Software"), to deal
|
9
|
-
* in the Software without restriction, including without limitation the rights
|
10
|
-
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
11
|
-
* copies of the Software, and to permit persons to whom the Software is
|
12
|
-
* furnished to do so, subject to the following conditions:
|
13
|
-
*
|
14
|
-
* The above copyright notice and this permission notice shall be included in
|
15
|
-
* all copies or substantial portions of the Software.
|
16
|
-
*
|
17
|
-
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
18
|
-
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
19
|
-
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
20
|
-
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
21
|
-
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
22
|
-
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
23
|
-
* THE SOFTWARE.
|
24
|
-
*/
|
25
|
-
#ifndef _PASSENGER_APPLICATION_POOL_POOL_H_
|
26
|
-
#define _PASSENGER_APPLICATION_POOL_POOL_H_
|
27
|
-
|
28
|
-
#include <boost/shared_ptr.hpp>
|
29
|
-
#include <boost/weak_ptr.hpp>
|
30
|
-
#include <boost/thread.hpp>
|
31
|
-
#include <boost/bind.hpp>
|
32
|
-
#include <boost/date_time/microsec_time_clock.hpp>
|
33
|
-
#include <boost/date_time/posix_time/posix_time.hpp>
|
34
|
-
|
35
|
-
#include <oxt/system_calls.hpp>
|
36
|
-
#include <oxt/backtrace.hpp>
|
37
|
-
#include <oxt/thread.hpp>
|
38
|
-
|
39
|
-
#include <string>
|
40
|
-
#include <sstream>
|
41
|
-
#include <map>
|
42
|
-
#include <list>
|
43
|
-
|
44
|
-
#include <sys/types.h>
|
45
|
-
#include <sys/stat.h>
|
46
|
-
#include <stdio.h>
|
47
|
-
#include <unistd.h>
|
48
|
-
#include <ctime>
|
49
|
-
#include <cerrno>
|
50
|
-
#include <cassert>
|
51
|
-
#ifdef TESTING_APPLICATION_POOL
|
52
|
-
#include <cstdlib>
|
53
|
-
#endif
|
54
|
-
|
55
|
-
#include "Interface.h"
|
56
|
-
#include "../Logging.h"
|
57
|
-
#include "../SpawnManager.h"
|
58
|
-
#include "../Constants.h"
|
59
|
-
#include "../Utils/SystemTime.h"
|
60
|
-
#include "../Utils/FileChangeChecker.h"
|
61
|
-
#include "../Utils/CachedFileStat.hpp"
|
62
|
-
#include "../Utils/ProcessMetricsCollector.h"
|
63
|
-
|
64
|
-
namespace Passenger {
|
65
|
-
namespace ApplicationPool {
|
66
|
-
|
67
|
-
using namespace std;
|
68
|
-
using namespace boost;
|
69
|
-
using namespace oxt;
|
70
|
-
|
71
|
-
// Forward declaration for ApplicationPool::Server.
|
72
|
-
class Server;
|
73
|
-
|
74
|
-
/****************************************************************
|
75
|
-
*
|
76
|
-
* See "doc/ApplicationPool algorithm.txt" for a more readable
|
77
|
-
* and detailed description of the algorithm implemented here.
|
78
|
-
*
|
79
|
-
****************************************************************/
|
80
|
-
|
81
|
-
/**
|
82
|
-
* A standard implementation of ApplicationPool::Interface for single-process environments.
|
83
|
-
*
|
84
|
-
* The environment may or may not be multithreaded - ApplicationPool::Pool is completely
|
85
|
-
* thread-safe. Apache with the threading MPM is an example of a multithreaded single-process
|
86
|
-
* environment.
|
87
|
-
*
|
88
|
-
* This class is unusable in multi-process environments such as Apache with the prefork MPM.
|
89
|
-
* The reasons are as follows:
|
90
|
-
* - ApplicationPool::Pool uses threads internally. Because threads disappear after a fork(),
|
91
|
-
* an ApplicationPool::Pool object will become unusable after a fork().
|
92
|
-
* - ApplicationPool::Pool stores its internal cache on the heap. Different processes
|
93
|
-
* cannot share their heaps, so they will not be able to access each others' pool cache.
|
94
|
-
* - ApplicationPool::Pool has a connection to the spawn server. If there are multiple
|
95
|
-
* processes, and they all use the spawn servers's connection at the same time without
|
96
|
-
* some sort of synchronization, then bad things will happen.
|
97
|
-
*
|
98
|
-
* (Of course, ApplicationPool::Pool <em>is</em> usable if each process creates its own
|
99
|
-
* ApplicationPool::Pool object, but that would defeat the point of having a shared pool.)
|
100
|
-
*
|
101
|
-
* For multi-process environments, one should use ApplicationPool::Server +
|
102
|
-
* ApplicationPool::Client instead.
|
103
|
-
*
|
104
|
-
* ApplicationPool::Pool is fully thread-safe.
|
105
|
-
*
|
106
|
-
* @ingroup Support
|
107
|
-
*/
|
108
|
-
class Pool: public ApplicationPool::Interface {
|
109
|
-
public:
|
110
|
-
static const int CLEANER_THREAD_STACK_SIZE = 1024 * 64;
|
111
|
-
static const int SPAWNER_THREAD_STACK_SIZE = 1024 * 64;
|
112
|
-
static const int ANALYTICS_COLLECTION_THREAD_STACK_SIZE = 1024 * 64;
|
113
|
-
static const unsigned int MAX_GET_ATTEMPTS = 10;
|
114
|
-
|
115
|
-
private:
|
116
|
-
struct Group;
|
117
|
-
struct ProcessInfo;
|
118
|
-
|
119
|
-
typedef shared_ptr<Group> GroupPtr;
|
120
|
-
typedef shared_ptr<ProcessInfo> ProcessInfoPtr;
|
121
|
-
typedef list<ProcessInfoPtr> ProcessInfoList;
|
122
|
-
typedef map<string, GroupPtr> GroupMap;
|
123
|
-
|
124
|
-
struct Group {
|
125
|
-
string name;
|
126
|
-
string appRoot;
|
127
|
-
ProcessInfoList processes;
|
128
|
-
unsigned int size;
|
129
|
-
bool detached;
|
130
|
-
unsigned long maxRequests;
|
131
|
-
unsigned long minProcesses;
|
132
|
-
bool spawning;
|
133
|
-
shared_ptr<oxt::thread> spawnerThread;
|
134
|
-
string environment;
|
135
|
-
bool analytics;
|
136
|
-
string unionStationKey;
|
137
|
-
|
138
|
-
/*****************/
|
139
|
-
/*****************/
|
140
|
-
|
141
|
-
Group() {
|
142
|
-
size = 0;
|
143
|
-
detached = false;
|
144
|
-
maxRequests = 0;
|
145
|
-
minProcesses = 0;
|
146
|
-
spawning = false;
|
147
|
-
analytics = false;
|
148
|
-
/*****************/
|
149
|
-
}
|
150
|
-
};
|
151
|
-
|
152
|
-
struct ProcessInfo {
|
153
|
-
ProcessPtr process;
|
154
|
-
string groupName;
|
155
|
-
unsigned long long startTime;
|
156
|
-
time_t lastUsed;
|
157
|
-
unsigned int sessions;
|
158
|
-
unsigned int processed;
|
159
|
-
ProcessInfoList::iterator iterator;
|
160
|
-
ProcessInfoList::iterator ia_iterator;
|
161
|
-
bool detached;
|
162
|
-
ProcessMetrics metrics;
|
163
|
-
|
164
|
-
/****************/
|
165
|
-
/****************/
|
166
|
-
|
167
|
-
ProcessInfo() {
|
168
|
-
startTime = SystemTime::getMsec();
|
169
|
-
lastUsed = 0;
|
170
|
-
sessions = 0;
|
171
|
-
processed = 0;
|
172
|
-
detached = false;
|
173
|
-
/*****************/
|
174
|
-
}
|
175
|
-
|
176
|
-
/**
|
177
|
-
* Returns the uptime of this process so far, as a string.
|
178
|
-
*/
|
179
|
-
string uptime() const {
|
180
|
-
unsigned long long seconds = (unsigned long long) time(NULL) - startTime / 1000;
|
181
|
-
stringstream result;
|
182
|
-
|
183
|
-
if (seconds >= 60) {
|
184
|
-
unsigned long long minutes = seconds / 60;
|
185
|
-
if (minutes >= 60) {
|
186
|
-
unsigned long long hours = minutes / 60;
|
187
|
-
minutes = minutes % 60;
|
188
|
-
result << hours << "h ";
|
189
|
-
}
|
190
|
-
|
191
|
-
seconds = seconds % 60;
|
192
|
-
result << minutes << "m ";
|
193
|
-
}
|
194
|
-
result << seconds << "s";
|
195
|
-
return result.str();
|
196
|
-
}
|
197
|
-
};
|
198
|
-
|
199
|
-
/**
|
200
|
-
* A data structure which contains data that's shared between an
|
201
|
-
* ApplicationPool::Pool and a SessionCloseCallback object.
|
202
|
-
* This is because the ApplicationPool::Pool's life time could be
|
203
|
-
* different from a SessionCloseCallback's.
|
204
|
-
*/
|
205
|
-
struct SharedData {
|
206
|
-
boost::timed_mutex lock;
|
207
|
-
condition_variable_any newAppGroupCreatable;
|
208
|
-
condition_variable_any globalQueuePositionBecameAvailable;
|
209
|
-
|
210
|
-
GroupMap groups;
|
211
|
-
unsigned int max;
|
212
|
-
unsigned int count;
|
213
|
-
unsigned int active;
|
214
|
-
unsigned int maxPerApp;
|
215
|
-
ProcessInfoList inactiveApps;
|
216
|
-
};
|
217
|
-
|
218
|
-
typedef shared_ptr<SharedData> SharedDataPtr;
|
219
|
-
|
220
|
-
/**
|
221
|
-
* Function object which will be called when a session has been closed.
|
222
|
-
*/
|
223
|
-
struct SessionCloseCallback {
|
224
|
-
SharedDataPtr data;
|
225
|
-
weak_ptr<ProcessInfo> processInfo;
|
226
|
-
|
227
|
-
SessionCloseCallback(const SharedDataPtr &data,
|
228
|
-
const weak_ptr<ProcessInfo> &processInfo) {
|
229
|
-
this->data = data;
|
230
|
-
this->processInfo = processInfo;
|
231
|
-
}
|
232
|
-
|
233
|
-
void operator()(const StandardSession *session) {
|
234
|
-
ProcessInfoPtr processInfo = this->processInfo.lock();
|
235
|
-
if (processInfo == NULL || processInfo->detached) {
|
236
|
-
return;
|
237
|
-
}
|
238
|
-
|
239
|
-
boost::timed_mutex::scoped_lock l(data->lock);
|
240
|
-
if (processInfo->detached) {
|
241
|
-
return;
|
242
|
-
}
|
243
|
-
|
244
|
-
GroupMap::iterator it;
|
245
|
-
it = data->groups.find(processInfo->groupName);
|
246
|
-
GroupPtr group = it->second;
|
247
|
-
ProcessInfoList *processes = &group->processes;
|
248
|
-
|
249
|
-
processInfo->processed++;
|
250
|
-
|
251
|
-
if (group->maxRequests > 0 && processInfo->processed >= group->maxRequests) {
|
252
|
-
P_DEBUG("MaxRequests for process " << processInfo->process->getPid() << " reached");
|
253
|
-
processInfo->detached = true;
|
254
|
-
processes->erase(processInfo->iterator);
|
255
|
-
group->size--;
|
256
|
-
if (processes->empty()) {
|
257
|
-
Pool::detachGroupWithoutLock(data, group);
|
258
|
-
}
|
259
|
-
mutateCount(data, data->count - 1);
|
260
|
-
if (processInfo->sessions == 0) {
|
261
|
-
data->inactiveApps.erase(processInfo->ia_iterator);
|
262
|
-
} else {
|
263
|
-
mutateActive(data, data->active - 1);
|
264
|
-
}
|
265
|
-
} else {
|
266
|
-
processInfo->lastUsed = time(NULL);
|
267
|
-
processInfo->sessions--;
|
268
|
-
if (processInfo->sessions == 0) {
|
269
|
-
processes->erase(processInfo->iterator);
|
270
|
-
processes->push_front(processInfo);
|
271
|
-
processInfo->iterator = processes->begin();
|
272
|
-
data->inactiveApps.push_back(processInfo);
|
273
|
-
processInfo->ia_iterator = data->inactiveApps.end();
|
274
|
-
processInfo->ia_iterator--;
|
275
|
-
mutateActive(data, data->active - 1);
|
276
|
-
}
|
277
|
-
}
|
278
|
-
}
|
279
|
-
};
|
280
|
-
|
281
|
-
AbstractSpawnManagerPtr spawnManager;
|
282
|
-
AnalyticsLoggerPtr analyticsLogger;
|
283
|
-
SharedDataPtr data;
|
284
|
-
oxt::thread *cleanerThread;
|
285
|
-
oxt::thread *analyticsCollectionThread;
|
286
|
-
bool destroying;
|
287
|
-
unsigned int maxIdleTime;
|
288
|
-
unsigned int waitingOnGlobalQueue;
|
289
|
-
condition_variable_any cleanerThreadSleeper;
|
290
|
-
CachedFileStat cstat;
|
291
|
-
FileChangeChecker fileChangeChecker;
|
292
|
-
ProcessMetricsCollector processMetricsCollector;
|
293
|
-
|
294
|
-
// Shortcuts for instance variables in SharedData. Saves typing in get()
|
295
|
-
// and other methods.
|
296
|
-
boost::timed_mutex &lock;
|
297
|
-
condition_variable_any &newAppGroupCreatable;
|
298
|
-
condition_variable_any &globalQueuePositionBecameAvailable;
|
299
|
-
GroupMap &groups;
|
300
|
-
unsigned int &max;
|
301
|
-
unsigned int &count;
|
302
|
-
unsigned int &active;
|
303
|
-
unsigned int &maxPerApp;
|
304
|
-
ProcessInfoList &inactiveApps;
|
305
|
-
|
306
|
-
/**
|
307
|
-
* Verify that all the invariants are correct.
|
308
|
-
*/
|
309
|
-
bool inline verifyState() {
|
310
|
-
#if PASSENGER_DEBUG
|
311
|
-
// Invariants for _groups_.
|
312
|
-
GroupMap::const_iterator it;
|
313
|
-
unsigned int totalSize = 0;
|
314
|
-
unsigned int expectedActive = 0;
|
315
|
-
|
316
|
-
for (it = groups.begin(); it != groups.end(); it++) {
|
317
|
-
const string &appRoot = it->first;
|
318
|
-
Group *group = it->second.get();
|
319
|
-
ProcessInfoList *processes = &group->processes;
|
320
|
-
|
321
|
-
// Invariants for Group.
|
322
|
-
|
323
|
-
P_ASSERT(group->size <= count, false,
|
324
|
-
"groups['" << appRoot << "'].size (" << group->size <<
|
325
|
-
") <= count (" << count << ")");
|
326
|
-
totalSize += group->size;
|
327
|
-
P_ASSERT(!processes->empty(), false,
|
328
|
-
"groups['" << appRoot << "'].processes is nonempty.");
|
329
|
-
P_ASSERT(!group->detached, false,
|
330
|
-
"groups['" << appRoot << "'].detached is true");
|
331
|
-
|
332
|
-
|
333
|
-
ProcessInfoList::const_iterator lit = processes->begin();
|
334
|
-
for (; lit != processes->end(); lit++) {
|
335
|
-
const ProcessInfoPtr &processInfo = *lit;
|
336
|
-
|
337
|
-
// Invariants for ProcessInfo.
|
338
|
-
P_ASSERT(processInfo->groupName == group->name, false,
|
339
|
-
"groups['" << appRoot << "'].processes[x].groupName "
|
340
|
-
"equals groups['" << appRoot << "'].name");
|
341
|
-
P_ASSERT(!processInfo->detached, false,
|
342
|
-
"groups['" << appRoot << "'].processes[x].detached is false");
|
343
|
-
if (processInfo->sessions > 0) {
|
344
|
-
expectedActive++;
|
345
|
-
}
|
346
|
-
}
|
347
|
-
|
348
|
-
ProcessInfoList::const_iterator prev_lit;
|
349
|
-
prev_lit = processes->begin();
|
350
|
-
lit = prev_lit;
|
351
|
-
lit++;
|
352
|
-
for (; lit != processes->end(); lit++) {
|
353
|
-
const ProcessInfoPtr &processInfo = *lit;
|
354
|
-
|
355
|
-
// Invariants for ProcessInfo that depend on the previous item.
|
356
|
-
if ((*prev_lit)->sessions > 0) {
|
357
|
-
P_ASSERT(processInfo->sessions > 0, false,
|
358
|
-
"groups['" << appRoot << "'].processes "
|
359
|
-
"is sorted from nonactive to active");
|
360
|
-
}
|
361
|
-
}
|
362
|
-
}
|
363
|
-
P_ASSERT(totalSize == count, false, "(sum of all d.size in groups) == count");
|
364
|
-
|
365
|
-
P_ASSERT(active == expectedActive, false,
|
366
|
-
"active (" << active << ") == " << expectedActive);
|
367
|
-
P_ASSERT(active <= count, false,
|
368
|
-
"active (" << active << ") < count (" << count << ")");
|
369
|
-
P_ASSERT(inactiveApps.size() == count - active, false,
|
370
|
-
"inactive_apps.size() == count - active");
|
371
|
-
#endif
|
372
|
-
return true;
|
373
|
-
}
|
374
|
-
|
375
|
-
string inspectWithoutLock() const {
|
376
|
-
stringstream result;
|
377
|
-
|
378
|
-
result << "----------- General information -----------" << endl;
|
379
|
-
result << "max = " << max << endl;
|
380
|
-
result << "count = " << count << endl;
|
381
|
-
result << "active = " << active << endl;
|
382
|
-
result << "inactive = " << inactiveApps.size() << endl;
|
383
|
-
result << "Waiting on global queue: " << waitingOnGlobalQueue << endl;
|
384
|
-
result << endl;
|
385
|
-
|
386
|
-
result << "----------- Groups -----------" << endl;
|
387
|
-
GroupMap::const_iterator it;
|
388
|
-
for (it = groups.begin(); it != groups.end(); it++) {
|
389
|
-
Group *group = it->second.get();
|
390
|
-
ProcessInfoList *processes = &group->processes;
|
391
|
-
ProcessInfoList::const_iterator lit;
|
392
|
-
|
393
|
-
result << it->first << ": " << endl;
|
394
|
-
for (lit = processes->begin(); lit != processes->end(); lit++) {
|
395
|
-
const ProcessInfo *processInfo = lit->get();
|
396
|
-
char buf[128];
|
397
|
-
|
398
|
-
snprintf(buf, sizeof(buf),
|
399
|
-
"PID: %-5lu Sessions: %-2u Processed: %-5u Uptime: %s",
|
400
|
-
(unsigned long) processInfo->process->getPid(),
|
401
|
-
processInfo->sessions,
|
402
|
-
processInfo->processed,
|
403
|
-
processInfo->uptime().c_str());
|
404
|
-
result << " " << buf << endl;
|
405
|
-
}
|
406
|
-
result << endl;
|
407
|
-
}
|
408
|
-
return result.str();
|
409
|
-
}
|
410
|
-
|
411
|
-
static void mutateActive(const SharedDataPtr &data, unsigned int value) {
|
412
|
-
if (value < data->active) {
|
413
|
-
data->newAppGroupCreatable.notify_all();
|
414
|
-
data->globalQueuePositionBecameAvailable.notify_all();
|
415
|
-
}
|
416
|
-
data->active = value;
|
417
|
-
}
|
418
|
-
|
419
|
-
static void mutateCount(const SharedDataPtr &data, unsigned int value) {
|
420
|
-
data->globalQueuePositionBecameAvailable.notify_all();
|
421
|
-
data->count = value;
|
422
|
-
}
|
423
|
-
|
424
|
-
static void mutateMax(const SharedDataPtr &data, unsigned int value) {
|
425
|
-
if (value > data->max) {
|
426
|
-
data->newAppGroupCreatable.notify_all();
|
427
|
-
data->globalQueuePositionBecameAvailable.notify_all();
|
428
|
-
}
|
429
|
-
data->max = value;
|
430
|
-
}
|
431
|
-
|
432
|
-
void mutateActive(unsigned int value) {
|
433
|
-
Pool::mutateActive(data, value);
|
434
|
-
}
|
435
|
-
|
436
|
-
void mutateCount(unsigned int value) {
|
437
|
-
Pool::mutateCount(data, value);
|
438
|
-
}
|
439
|
-
|
440
|
-
void mutateMax(unsigned int value) {
|
441
|
-
Pool::mutateMax(data, value);
|
442
|
-
}
|
443
|
-
|
444
|
-
/**
|
445
|
-
* Checks whether the given application group needs to be restarted.
|
446
|
-
*
|
447
|
-
* @throws TimeRetrievalException Something went wrong while retrieving the system time.
|
448
|
-
* @throws boost::thread_interrupted
|
449
|
-
*/
|
450
|
-
bool needsRestart(const string &appRoot, const PoolOptions &options) {
|
451
|
-
string restartDir;
|
452
|
-
if (options.restartDir.empty()) {
|
453
|
-
restartDir = appRoot + "/tmp";
|
454
|
-
} else if (options.restartDir[0] == '/') {
|
455
|
-
restartDir = options.restartDir;
|
456
|
-
} else {
|
457
|
-
restartDir = appRoot + "/" + options.restartDir;
|
458
|
-
}
|
459
|
-
|
460
|
-
string alwaysRestartFile = restartDir + "/always_restart.txt";
|
461
|
-
string restartFile = restartDir + "/restart.txt";
|
462
|
-
struct stat buf;
|
463
|
-
return cstat.stat(alwaysRestartFile, &buf, options.statThrottleRate) == 0 ||
|
464
|
-
fileChangeChecker.changed(restartFile, options.statThrottleRate);
|
465
|
-
}
|
466
|
-
|
467
|
-
bool spawningAllowed(const GroupPtr &group, const PoolOptions &options) const {
|
468
|
-
return ( count < max ) &&
|
469
|
-
( (maxPerApp == 0) || (group->size < maxPerApp) );
|
470
|
-
}
|
471
|
-
|
472
|
-
void dumpProcessInfoAsXml(const ProcessInfo *processInfo, bool includeSensitiveInformation,
|
473
|
-
stringstream &result) const
|
474
|
-
{
|
475
|
-
result << "<process>";
|
476
|
-
result << "<pid>" << processInfo->process->getPid() << "</pid>";
|
477
|
-
result << "<gupid>" << processInfo->process->getGupid() << "</gupid>";
|
478
|
-
result << "<sessions>" << processInfo->sessions << "</sessions>";
|
479
|
-
result << "<processed>" << processInfo->processed << "</processed>";
|
480
|
-
result << "<uptime>" << processInfo->uptime() << "</uptime>";
|
481
|
-
if (processInfo->metrics.isValid()) {
|
482
|
-
const ProcessMetrics &metrics = processInfo->metrics;
|
483
|
-
result << "<has_metrics>true</has_metrics>";
|
484
|
-
result << "<cpu>" << (int) metrics.cpu << "</cpu>";
|
485
|
-
result << "<rss>" << metrics.rss << "</rss>";
|
486
|
-
if (metrics.pss != -1) {
|
487
|
-
result << "<pss>" << metrics.pss << "</pss>";
|
488
|
-
}
|
489
|
-
if (metrics.privateDirty != -1) {
|
490
|
-
result << "<private_dirty>" << metrics.privateDirty << "</private_dirty>";
|
491
|
-
}
|
492
|
-
if (metrics.swap != -1) {
|
493
|
-
result << "<swap>" << metrics.swap << "</swap>";
|
494
|
-
}
|
495
|
-
result << "<real_memory>" << metrics.realMemory() << "</real_memory>";
|
496
|
-
result << "<vmsize>" << metrics.vmsize << "</vmsize>";
|
497
|
-
result << "<process_group_id>" << metrics.processGroupId << "</process_group_id>";
|
498
|
-
result << "<command>" << escapeForXml(metrics.command) << "</command>";
|
499
|
-
}
|
500
|
-
if (includeSensitiveInformation) {
|
501
|
-
const ProcessPtr &process = processInfo->process;
|
502
|
-
const Process::SocketInfoMap *serverSockets;
|
503
|
-
Process::SocketInfoMap::const_iterator sit;
|
504
|
-
|
505
|
-
result << "<connect_password>" << process->getConnectPassword() << "</connect_password>";
|
506
|
-
result << "<server_sockets>";
|
507
|
-
serverSockets = process->getServerSockets();
|
508
|
-
for (sit = serverSockets->begin(); sit != serverSockets->end(); sit++) {
|
509
|
-
const string &name = sit->first;
|
510
|
-
const Process::SocketInfo &info = sit->second;
|
511
|
-
result << "<server_socket>";
|
512
|
-
result << "<name>" << escapeForXml(name) << "</name>";
|
513
|
-
result << "<address>" << escapeForXml(info.address) << "</address>";
|
514
|
-
result << "<type>" << escapeForXml(info.type) << "</type>";
|
515
|
-
result << "</server_socket>";
|
516
|
-
}
|
517
|
-
result << "</server_sockets>";
|
518
|
-
}
|
519
|
-
result << "</process>";
|
520
|
-
}
|
521
|
-
|
522
|
-
static void detachGroupWithoutLock(const SharedDataPtr &data, const GroupPtr &group) {
|
523
|
-
TRACE_POINT();
|
524
|
-
assert(!group->detached);
|
525
|
-
|
526
|
-
ProcessInfoList *processes = &group->processes;
|
527
|
-
ProcessInfoList::iterator list_it;
|
528
|
-
|
529
|
-
for (list_it = processes->begin(); list_it != processes->end(); list_it++) {
|
530
|
-
ProcessInfoPtr processInfo = *list_it;
|
531
|
-
|
532
|
-
if (processInfo->sessions == 0) {
|
533
|
-
data->inactiveApps.erase(processInfo->ia_iterator);
|
534
|
-
} else {
|
535
|
-
mutateActive(data, data->active - 1);
|
536
|
-
}
|
537
|
-
list_it--;
|
538
|
-
processes->erase(processInfo->iterator);
|
539
|
-
processInfo->detached = true;
|
540
|
-
mutateCount(data, data->count - 1);
|
541
|
-
}
|
542
|
-
|
543
|
-
if (group->spawning) {
|
544
|
-
UPDATE_TRACE_POINT();
|
545
|
-
group->spawnerThread->interrupt_and_join();
|
546
|
-
group->spawnerThread.reset();
|
547
|
-
group->spawning = false;
|
548
|
-
}
|
549
|
-
|
550
|
-
group->detached = true;
|
551
|
-
data->groups.erase(group->name);
|
552
|
-
}
|
553
|
-
|
554
|
-
void detachGroupWithoutLock(const GroupPtr &group) {
|
555
|
-
Pool::detachGroupWithoutLock(data, group);
|
556
|
-
}
|
557
|
-
|
558
|
-
ProcessInfoPtr selectProcess(ProcessInfoList *processes, const PoolOptions &options,
|
559
|
-
unique_lock<boost::timed_mutex> &l,
|
560
|
-
this_thread::disable_interruption &di,
|
561
|
-
this_thread::disable_syscall_interruption &dsi)
|
562
|
-
{
|
563
|
-
if (options.useGlobalQueue) {
|
564
|
-
TRACE_POINT();
|
565
|
-
waitingOnGlobalQueue++;
|
566
|
-
this_thread::restore_interruption ri(di);
|
567
|
-
this_thread::restore_syscall_interruption rsi(dsi);
|
568
|
-
globalQueuePositionBecameAvailable.wait(l);
|
569
|
-
waitingOnGlobalQueue--;
|
570
|
-
return ProcessInfoPtr();
|
571
|
-
} else {
|
572
|
-
ProcessInfoList::iterator it = processes->begin();
|
573
|
-
ProcessInfoList::iterator end = processes->end();
|
574
|
-
ProcessInfoList::iterator smallest = processes->begin();
|
575
|
-
ProcessInfoPtr processInfo;
|
576
|
-
|
577
|
-
it++;
|
578
|
-
for (; it != end; it++) {
|
579
|
-
if ((*it)->sessions < (*smallest)->sessions) {
|
580
|
-
smallest = it;
|
581
|
-
}
|
582
|
-
}
|
583
|
-
processInfo = *smallest;
|
584
|
-
processes->erase(smallest);
|
585
|
-
processes->push_back(processInfo);
|
586
|
-
processInfo->iterator = processes->end();
|
587
|
-
processInfo->iterator--;
|
588
|
-
return processInfo;
|
589
|
-
}
|
590
|
-
}
|
591
|
-
|
592
|
-
void spawnInBackground(const GroupPtr &group, const PoolOptions &options) {
|
593
|
-
assert(!group->detached);
|
594
|
-
assert(!group->spawning);
|
595
|
-
group->spawning = true;
|
596
|
-
group->spawnerThread = ptr(new oxt::thread(
|
597
|
-
boost::bind(&Pool::spawnerThreadCallback, this, group, options.own()),
|
598
|
-
"ApplicationPool background spawner",
|
599
|
-
SPAWNER_THREAD_STACK_SIZE
|
600
|
-
));
|
601
|
-
}
|
602
|
-
|
603
|
-
void spawnerThreadCallback(GroupPtr group, PoolOptions options) {
|
604
|
-
TRACE_POINT();
|
605
|
-
|
606
|
-
while (true) {
|
607
|
-
ProcessPtr process;
|
608
|
-
|
609
|
-
try {
|
610
|
-
UPDATE_TRACE_POINT();
|
611
|
-
P_DEBUG("Background spawning a process for " << options.appRoot);
|
612
|
-
process = spawnManager->spawn(options);
|
613
|
-
} catch (const thread_interrupted &) {
|
614
|
-
UPDATE_TRACE_POINT();
|
615
|
-
interruptable_lock_guard<boost::timed_mutex> l(lock);
|
616
|
-
this_thread::disable_interruption di;
|
617
|
-
this_thread::disable_syscall_interruption dsi;
|
618
|
-
group->spawning = false;
|
619
|
-
group->spawnerThread.reset();
|
620
|
-
return;
|
621
|
-
} catch (const std::exception &e) {
|
622
|
-
UPDATE_TRACE_POINT();
|
623
|
-
P_DEBUG("Background spawning of " << options.appRoot <<
|
624
|
-
" failed; removing entire group." <<
|
625
|
-
" Error: " << e.what());
|
626
|
-
interruptable_lock_guard<boost::timed_mutex> l(lock);
|
627
|
-
this_thread::disable_interruption di;
|
628
|
-
this_thread::disable_syscall_interruption dsi;
|
629
|
-
if (!group->detached) {
|
630
|
-
group->spawning = false;
|
631
|
-
group->spawnerThread.reset();
|
632
|
-
detachGroupWithoutLock(group);
|
633
|
-
}
|
634
|
-
return;
|
635
|
-
}
|
636
|
-
|
637
|
-
UPDATE_TRACE_POINT();
|
638
|
-
interruptable_lock_guard<boost::timed_mutex> l(lock);
|
639
|
-
this_thread::disable_interruption di;
|
640
|
-
this_thread::disable_syscall_interruption dsi;
|
641
|
-
ProcessInfoPtr processInfo;
|
642
|
-
|
643
|
-
processInfo = ptr(new ProcessInfo());
|
644
|
-
processInfo->process = process;
|
645
|
-
processInfo->groupName = options.getAppGroupName();
|
646
|
-
|
647
|
-
group->processes.push_front(processInfo);
|
648
|
-
processInfo->iterator = group->processes.begin();
|
649
|
-
|
650
|
-
inactiveApps.push_back(processInfo);
|
651
|
-
processInfo->ia_iterator = inactiveApps.end();
|
652
|
-
processInfo->ia_iterator--;
|
653
|
-
|
654
|
-
group->size++;
|
655
|
-
mutateCount(count + 1);
|
656
|
-
|
657
|
-
P_ASSERT_WITH_VOID_RETURN(verifyState(),
|
658
|
-
"Background spawning: ApplicationPool state is valid:\n" <<
|
659
|
-
inspectWithoutLock());
|
660
|
-
|
661
|
-
if (group->size >= options.minProcesses
|
662
|
-
|| !spawningAllowed(group, options)) {
|
663
|
-
group->spawning = false;
|
664
|
-
group->spawnerThread.reset();
|
665
|
-
return;
|
666
|
-
}
|
667
|
-
}
|
668
|
-
}
|
669
|
-
|
670
|
-
bool detachWithoutLock(const string &detachKey) {
|
671
|
-
TRACE_POINT();
|
672
|
-
GroupMap::iterator group_it;
|
673
|
-
GroupMap::iterator group_it_end = groups.end();
|
674
|
-
|
675
|
-
for (group_it = groups.begin(); group_it != group_it_end; group_it++) {
|
676
|
-
GroupPtr group = group_it->second;
|
677
|
-
ProcessInfoList &processes = group->processes;
|
678
|
-
ProcessInfoList::iterator process_info_it = processes.begin();
|
679
|
-
ProcessInfoList::iterator process_info_it_end = processes.end();
|
680
|
-
|
681
|
-
for (; process_info_it != process_info_it_end; process_info_it++) {
|
682
|
-
ProcessInfoPtr processInfo = *process_info_it;
|
683
|
-
if (processInfo->process->getDetachKey() == detachKey) {
|
684
|
-
// Found a matching process.
|
685
|
-
P_DEBUG("Detaching process " << processInfo->process->getPid());
|
686
|
-
processInfo->detached = true;
|
687
|
-
processes.erase(processInfo->iterator);
|
688
|
-
group->size--;
|
689
|
-
if (processes.empty()) {
|
690
|
-
detachGroupWithoutLock(group);
|
691
|
-
}
|
692
|
-
if (processInfo->sessions == 0) {
|
693
|
-
inactiveApps.erase(processInfo->ia_iterator);
|
694
|
-
} else {
|
695
|
-
mutateActive(active - 1);
|
696
|
-
}
|
697
|
-
mutateCount(count - 1);
|
698
|
-
return true;
|
699
|
-
}
|
700
|
-
}
|
701
|
-
}
|
702
|
-
return false;
|
703
|
-
}
|
704
|
-
|
705
|
-
void cleanerThreadMainLoop() {
|
706
|
-
this_thread::disable_syscall_interruption dsi;
|
707
|
-
unique_lock<boost::timed_mutex> l(lock);
|
708
|
-
try {
|
709
|
-
while (!destroying && !this_thread::interruption_requested()) {
|
710
|
-
if (maxIdleTime == 0) {
|
711
|
-
cleanerThreadSleeper.wait(l);
|
712
|
-
if (destroying) {
|
713
|
-
// ApplicationPool::Pool is being destroyed.
|
714
|
-
break;
|
715
|
-
} else {
|
716
|
-
// maxIdleTime changed.
|
717
|
-
continue;
|
718
|
-
}
|
719
|
-
} else {
|
720
|
-
xtime xt;
|
721
|
-
xtime_get(&xt, TIME_UTC_);
|
722
|
-
xt.sec += maxIdleTime + 1;
|
723
|
-
if (cleanerThreadSleeper.timed_wait(l, xt)) {
|
724
|
-
// Condition was woken up.
|
725
|
-
if (destroying) {
|
726
|
-
// ApplicationPool::Pool is being destroyed.
|
727
|
-
break;
|
728
|
-
} else {
|
729
|
-
// maxIdleTime changed.
|
730
|
-
continue;
|
731
|
-
}
|
732
|
-
}
|
733
|
-
// Timeout: maxIdleTime + 1 seconds passed.
|
734
|
-
}
|
735
|
-
|
736
|
-
time_t now = syscalls::time(NULL);
|
737
|
-
ProcessInfoList::iterator it = inactiveApps.begin();
|
738
|
-
ProcessInfoList::iterator end_it = inactiveApps.end();
|
739
|
-
for (; it != end_it; it++) {
|
740
|
-
ProcessInfoPtr processInfo = *it;
|
741
|
-
|
742
|
-
if (now - processInfo->lastUsed > (time_t) maxIdleTime) {
|
743
|
-
ProcessPtr process = processInfo->process;
|
744
|
-
GroupPtr group = groups[processInfo->groupName];
|
745
|
-
|
746
|
-
if (group->size > group->minProcesses) {
|
747
|
-
ProcessInfoList *processes = &group->processes;
|
748
|
-
|
749
|
-
P_DEBUG("Cleaning idle process " << process->getAppRoot() <<
|
750
|
-
" (PID " << process->getPid() << ")");
|
751
|
-
P_TRACE(2, "Group size = " << group->size << ", "
|
752
|
-
"min processes = " << group->minProcesses);
|
753
|
-
processes->erase(processInfo->iterator);
|
754
|
-
processInfo->detached = true;
|
755
|
-
|
756
|
-
ProcessInfoList::iterator prev = it;
|
757
|
-
prev--;
|
758
|
-
inactiveApps.erase(it);
|
759
|
-
it = prev;
|
760
|
-
|
761
|
-
group->size--;
|
762
|
-
mutateCount(count - 1);
|
763
|
-
|
764
|
-
if (processes->empty()) {
|
765
|
-
detachGroupWithoutLock(group);
|
766
|
-
}
|
767
|
-
}
|
768
|
-
}
|
769
|
-
}
|
770
|
-
}
|
771
|
-
} catch (const std::exception &e) {
|
772
|
-
P_ERROR("Uncaught exception: " << e.what());
|
773
|
-
}
|
774
|
-
}
|
775
|
-
|
776
|
-
void analyticsCollectionThreadMainLoop() {
|
777
|
-
/* Invariant inside this thread:
|
778
|
-
* analyticsLogger != NULL
|
779
|
-
*/
|
780
|
-
TRACE_POINT();
|
781
|
-
try {
|
782
|
-
syscalls::sleep(3);
|
783
|
-
while (!this_thread::interruption_requested()) {
|
784
|
-
this_thread::disable_interruption di;
|
785
|
-
this_thread::disable_syscall_interruption dsi;
|
786
|
-
vector<pid_t> pids;
|
787
|
-
|
788
|
-
// Collect all the PIDs.
|
789
|
-
{
|
790
|
-
UPDATE_TRACE_POINT();
|
791
|
-
lock_guard<boost::timed_mutex> l(lock);
|
792
|
-
GroupMap::const_iterator group_it;
|
793
|
-
GroupMap::const_iterator group_it_end = groups.end();
|
794
|
-
|
795
|
-
UPDATE_TRACE_POINT();
|
796
|
-
pids.reserve(count);
|
797
|
-
for (group_it = groups.begin(); group_it != group_it_end; group_it++) {
|
798
|
-
const GroupPtr &group = group_it->second;
|
799
|
-
const ProcessInfoList &processes = group->processes;
|
800
|
-
ProcessInfoList::const_iterator process_info_it = processes.begin();
|
801
|
-
ProcessInfoList::const_iterator process_info_it_end = processes.end();
|
802
|
-
|
803
|
-
for (; process_info_it != process_info_it_end; process_info_it++) {
|
804
|
-
const ProcessInfoPtr &processInfo = *process_info_it;
|
805
|
-
pids.push_back(processInfo->process->getPid());
|
806
|
-
}
|
807
|
-
}
|
808
|
-
}
|
809
|
-
|
810
|
-
try {
|
811
|
-
// Now collect the process metrics and store them in the
|
812
|
-
// data structures, and log the state into the analytics logs.
|
813
|
-
UPDATE_TRACE_POINT();
|
814
|
-
ProcessMetricMap allMetrics =
|
815
|
-
processMetricsCollector.collect(pids);
|
816
|
-
|
817
|
-
UPDATE_TRACE_POINT();
|
818
|
-
lock_guard<boost::timed_mutex> l(lock);
|
819
|
-
GroupMap::iterator group_it;
|
820
|
-
GroupMap::iterator group_it_end = groups.end();
|
821
|
-
|
822
|
-
UPDATE_TRACE_POINT();
|
823
|
-
for (group_it = groups.begin(); group_it != group_it_end; group_it++) {
|
824
|
-
GroupPtr &group = group_it->second;
|
825
|
-
ProcessInfoList &processes = group->processes;
|
826
|
-
ProcessInfoList::iterator process_info_it = processes.begin();
|
827
|
-
ProcessInfoList::iterator process_info_it_end = processes.end();
|
828
|
-
AnalyticsLogPtr log;
|
829
|
-
stringstream xml;
|
830
|
-
|
831
|
-
if (group->analytics && analyticsLogger != NULL) {
|
832
|
-
ssize_t shared;
|
833
|
-
log = analyticsLogger->newTransaction(group->name,
|
834
|
-
"processes", group->unionStationKey);
|
835
|
-
xml << "Processes: <processes>";
|
836
|
-
xml << "<total_memory>" << allMetrics.totalMemory(shared) << "</total_memory>";
|
837
|
-
if (shared != -1) {
|
838
|
-
xml << "<total_shared_memory>" << shared << "</total_shared_memory>";
|
839
|
-
}
|
840
|
-
}
|
841
|
-
for (; process_info_it != process_info_it_end; process_info_it++) {
|
842
|
-
ProcessInfoPtr &processInfo = *process_info_it;
|
843
|
-
ProcessMetricMap::const_iterator metrics_it =
|
844
|
-
allMetrics.find(processInfo->process->getPid());
|
845
|
-
if (metrics_it != allMetrics.end()) {
|
846
|
-
processInfo->metrics = metrics_it->second;
|
847
|
-
}
|
848
|
-
if (log != NULL) {
|
849
|
-
dumpProcessInfoAsXml(processInfo.get(),
|
850
|
-
false, xml);
|
851
|
-
}
|
852
|
-
}
|
853
|
-
if (log != NULL) {
|
854
|
-
xml << "</processes>";
|
855
|
-
log->message(xml.str());
|
856
|
-
}
|
857
|
-
}
|
858
|
-
} catch (const ProcessMetricsCollector::ParseException &) {
|
859
|
-
P_WARN("Unable to collect process metrics: cannot parse 'ps' output.");
|
860
|
-
} catch (const thread_interrupted &) {
|
861
|
-
throw;
|
862
|
-
} catch (const std::exception &e) {
|
863
|
-
P_WARN("Error while collecting process metrics: " << e.what());
|
864
|
-
}
|
865
|
-
|
866
|
-
pids.resize(0);
|
867
|
-
|
868
|
-
// Sleep for about 4 seconds, aligned to seconds boundary
|
869
|
-
// for saving power on laptops.
|
870
|
-
UPDATE_TRACE_POINT();
|
871
|
-
unsigned long long currentTime = SystemTime::getUsec();
|
872
|
-
unsigned long long deadline =
|
873
|
-
roundUp<unsigned long long>(currentTime, 1000000) + 4000000;
|
874
|
-
syscalls::usleep(deadline - currentTime);
|
875
|
-
}
|
876
|
-
} catch (const thread_interrupted &) {
|
877
|
-
} catch (const std::exception &e) {
|
878
|
-
P_ERROR("Uncaught exception: " << e.what());
|
879
|
-
}
|
880
|
-
}
|
881
|
-
|
882
|
-
/**
|
883
|
-
* @throws boost::thread_interrupted
|
884
|
-
* @throws SpawnException
|
885
|
-
* @throws SystemException
|
886
|
-
* @throws TimeRetrievalException Something went wrong while retrieving the system time.
|
887
|
-
* @throws Anything thrown by options.environmentVariables->getItems().
|
888
|
-
*/
|
889
|
-
pair<ProcessInfoPtr, GroupPtr>
|
890
|
-
checkoutWithoutLock(unique_lock<boost::timed_mutex> &l, const PoolOptions &options) {
|
891
|
-
beginning_of_function:
|
892
|
-
|
893
|
-
TRACE_POINT();
|
894
|
-
this_thread::disable_interruption di;
|
895
|
-
this_thread::disable_syscall_interruption dsi;
|
896
|
-
const string &appRoot = options.appRoot;
|
897
|
-
const string appGroupName = options.getAppGroupName();
|
898
|
-
ProcessInfoPtr processInfo;
|
899
|
-
GroupPtr group;
|
900
|
-
ProcessInfoList *processes;
|
901
|
-
|
902
|
-
try {
|
903
|
-
GroupMap::iterator group_it = groups.find(appGroupName);
|
904
|
-
|
905
|
-
if (needsRestart(appRoot, options)) {
|
906
|
-
P_DEBUG("Restarting " << appGroupName);
|
907
|
-
spawnManager->reload(appGroupName);
|
908
|
-
if (group_it != groups.end()) {
|
909
|
-
detachGroupWithoutLock(group_it->second);
|
910
|
-
group_it = groups.end();
|
911
|
-
}
|
912
|
-
}
|
913
|
-
|
914
|
-
if (group_it != groups.end()) {
|
915
|
-
group = group_it->second;
|
916
|
-
processes = &group->processes;
|
917
|
-
|
918
|
-
if (processes->front()->sessions == 0) {
|
919
|
-
processInfo = processes->front();
|
920
|
-
processes->pop_front();
|
921
|
-
processes->push_back(processInfo);
|
922
|
-
processInfo->iterator = processes->end();
|
923
|
-
processInfo->iterator--;
|
924
|
-
inactiveApps.erase(processInfo->ia_iterator);
|
925
|
-
mutateActive(active + 1);
|
926
|
-
} else {
|
927
|
-
if (!group->spawning && spawningAllowed(group, options)) {
|
928
|
-
P_DEBUG("Spawning another process for " << appRoot <<
|
929
|
-
" in the background in order to handle the load");
|
930
|
-
spawnInBackground(group, options);
|
931
|
-
}
|
932
|
-
processInfo = selectProcess(processes, options, l, di, dsi);
|
933
|
-
if (processInfo == NULL) {
|
934
|
-
goto beginning_of_function;
|
935
|
-
}
|
936
|
-
}
|
937
|
-
} else {
|
938
|
-
P_DEBUG("Spawning a process for " << appRoot <<
|
939
|
-
" because there are none for this app group");
|
940
|
-
if (active >= max) {
|
941
|
-
UPDATE_TRACE_POINT();
|
942
|
-
this_thread::restore_interruption ri(di);
|
943
|
-
this_thread::restore_syscall_interruption rsi(dsi);
|
944
|
-
newAppGroupCreatable.wait(l);
|
945
|
-
goto beginning_of_function;
|
946
|
-
} else if (count >= max) {
|
947
|
-
processInfo = inactiveApps.front();
|
948
|
-
P_DEBUG("Killing process " << processInfo->process->getPid() <<
|
949
|
-
" because an extra slot is necessary for spawning");
|
950
|
-
inactiveApps.pop_front();
|
951
|
-
processInfo->detached = true;
|
952
|
-
group = groups[processInfo->groupName];
|
953
|
-
processes = &group->processes;
|
954
|
-
processes->erase(processInfo->iterator);
|
955
|
-
if (processes->empty()) {
|
956
|
-
detachGroupWithoutLock(group);
|
957
|
-
} else {
|
958
|
-
group->size--;
|
959
|
-
}
|
960
|
-
mutateCount(count - 1);
|
961
|
-
}
|
962
|
-
|
963
|
-
UPDATE_TRACE_POINT();
|
964
|
-
processInfo = ptr(new ProcessInfo());
|
965
|
-
{
|
966
|
-
this_thread::restore_interruption ri(di);
|
967
|
-
this_thread::restore_syscall_interruption rsi(dsi);
|
968
|
-
processInfo->process = spawnManager->spawn(options);
|
969
|
-
}
|
970
|
-
processInfo->groupName = appGroupName;
|
971
|
-
processInfo->sessions = 0;
|
972
|
-
group = ptr(new Group());
|
973
|
-
group->name = appGroupName;
|
974
|
-
group->appRoot = appRoot;
|
975
|
-
group->size = 1;
|
976
|
-
groups[appGroupName] = group;
|
977
|
-
processes = &group->processes;
|
978
|
-
processes->push_back(processInfo);
|
979
|
-
processInfo->iterator = processes->end();
|
980
|
-
processInfo->iterator--;
|
981
|
-
mutateCount(count + 1);
|
982
|
-
mutateActive(active + 1);
|
983
|
-
if (options.minProcesses > 1 && spawningAllowed(group, options)) {
|
984
|
-
spawnInBackground(group, options);
|
985
|
-
}
|
986
|
-
}
|
987
|
-
} catch (const SpawnException &e) {
|
988
|
-
string message("Cannot spawn application '");
|
989
|
-
message.append(appGroupName);
|
990
|
-
message.append("': ");
|
991
|
-
message.append(e.what());
|
992
|
-
if (e.hasErrorPage()) {
|
993
|
-
throw SpawnException(message, e.getErrorPage());
|
994
|
-
} else {
|
995
|
-
throw SpawnException(message);
|
996
|
-
}
|
997
|
-
} catch (const thread_interrupted &) {
|
998
|
-
throw;
|
999
|
-
} catch (const std::exception &e) {
|
1000
|
-
string message("Cannot spawn application '");
|
1001
|
-
message.append(appGroupName);
|
1002
|
-
message.append("': ");
|
1003
|
-
message.append(e.what());
|
1004
|
-
throw SpawnException(message);
|
1005
|
-
}
|
1006
|
-
|
1007
|
-
group->maxRequests = options.maxRequests;
|
1008
|
-
group->minProcesses = options.minProcesses;
|
1009
|
-
group->environment = options.environment;
|
1010
|
-
group->analytics = options.log != NULL;
|
1011
|
-
if (group->analytics) {
|
1012
|
-
group->unionStationKey = options.log->getUnionStationKey();
|
1013
|
-
}
|
1014
|
-
|
1015
|
-
processInfo->lastUsed = time(NULL);
|
1016
|
-
processInfo->sessions++;
|
1017
|
-
|
1018
|
-
return make_pair(processInfo, group);
|
1019
|
-
}
|
1020
|
-
|
1021
|
-
/** @throws boost::thread_resource_error */
|
1022
|
-
void initialize(const AnalyticsLoggerPtr &analyticsLogger)
|
1023
|
-
{
|
1024
|
-
destroying = false;
|
1025
|
-
max = DEFAULT_MAX_POOL_SIZE;
|
1026
|
-
count = 0;
|
1027
|
-
active = 0;
|
1028
|
-
waitingOnGlobalQueue = 0;
|
1029
|
-
maxPerApp = DEFAULT_MAX_INSTANCES_PER_APP;
|
1030
|
-
maxIdleTime = DEFAULT_POOL_IDLE_TIME;
|
1031
|
-
cleanerThread = new oxt::thread(
|
1032
|
-
bind(&Pool::cleanerThreadMainLoop, this),
|
1033
|
-
"ApplicationPool cleaner",
|
1034
|
-
CLEANER_THREAD_STACK_SIZE
|
1035
|
-
);
|
1036
|
-
|
1037
|
-
if (analyticsLogger != NULL) {
|
1038
|
-
this->analyticsLogger = analyticsLogger;
|
1039
|
-
analyticsCollectionThread = new oxt::thread(
|
1040
|
-
bind(&Pool::analyticsCollectionThreadMainLoop, this),
|
1041
|
-
"ApplicationPool analytics collector",
|
1042
|
-
ANALYTICS_COLLECTION_THREAD_STACK_SIZE
|
1043
|
-
);
|
1044
|
-
} else {
|
1045
|
-
analyticsCollectionThread = NULL;
|
1046
|
-
}
|
1047
|
-
}
|
1048
|
-
|
1049
|
-
public:
|
1050
|
-
/**
|
1051
|
-
* Create a new ApplicationPool::Pool object, and initialize it with a
|
1052
|
-
* SpawnManager. The arguments here are all passed to the SpawnManager
|
1053
|
-
* constructor.
|
1054
|
-
*
|
1055
|
-
* @throws SystemException An error occured while trying to setup the spawn server.
|
1056
|
-
* @throws IOException The specified log file could not be opened.
|
1057
|
-
* @throws boost::thread_resource_error Cannot spawn a new thread.
|
1058
|
-
*/
|
1059
|
-
Pool(const string &spawnServerCommand,
|
1060
|
-
const ServerInstanceDir::GenerationPtr &generation,
|
1061
|
-
const AccountsDatabasePtr &accountsDatabase = AccountsDatabasePtr(),
|
1062
|
-
const string &rubyCommand = "ruby",
|
1063
|
-
const AnalyticsLoggerPtr &analyticsLogger = AnalyticsLoggerPtr(),
|
1064
|
-
int logLevel = 0,
|
1065
|
-
const string &debugLogFile = ""
|
1066
|
-
) : data(new SharedData()),
|
1067
|
-
cstat(DEFAULT_MAX_POOL_SIZE),
|
1068
|
-
lock(data->lock),
|
1069
|
-
newAppGroupCreatable(data->newAppGroupCreatable),
|
1070
|
-
globalQueuePositionBecameAvailable(data->globalQueuePositionBecameAvailable),
|
1071
|
-
groups(data->groups),
|
1072
|
-
max(data->max),
|
1073
|
-
count(data->count),
|
1074
|
-
active(data->active),
|
1075
|
-
maxPerApp(data->maxPerApp),
|
1076
|
-
inactiveApps(data->inactiveApps)
|
1077
|
-
{
|
1078
|
-
TRACE_POINT();
|
1079
|
-
|
1080
|
-
this->spawnManager = ptr(new SpawnManager(spawnServerCommand, generation,
|
1081
|
-
accountsDatabase, rubyCommand, analyticsLogger, logLevel,
|
1082
|
-
debugLogFile));
|
1083
|
-
initialize(analyticsLogger);
|
1084
|
-
}
|
1085
|
-
|
1086
|
-
/**
|
1087
|
-
* Create a new ApplicationPool::Pool object and initialize it with
|
1088
|
-
* the given spawn manager.
|
1089
|
-
*
|
1090
|
-
* @throws boost::thread_resource_error Cannot spawn a new thread.
|
1091
|
-
*/
|
1092
|
-
Pool(AbstractSpawnManagerPtr spawnManager,
|
1093
|
-
const AnalyticsLoggerPtr &analyticsLogger = AnalyticsLoggerPtr()
|
1094
|
-
) : data(new SharedData()),
|
1095
|
-
cstat(DEFAULT_MAX_POOL_SIZE),
|
1096
|
-
lock(data->lock),
|
1097
|
-
newAppGroupCreatable(data->newAppGroupCreatable),
|
1098
|
-
globalQueuePositionBecameAvailable(data->globalQueuePositionBecameAvailable),
|
1099
|
-
groups(data->groups),
|
1100
|
-
max(data->max),
|
1101
|
-
count(data->count),
|
1102
|
-
active(data->active),
|
1103
|
-
maxPerApp(data->maxPerApp),
|
1104
|
-
inactiveApps(data->inactiveApps)
|
1105
|
-
{
|
1106
|
-
TRACE_POINT();
|
1107
|
-
this->spawnManager = spawnManager;
|
1108
|
-
initialize(analyticsLogger);
|
1109
|
-
}
|
1110
|
-
|
1111
|
-
virtual ~Pool() {
|
1112
|
-
TRACE_POINT();
|
1113
|
-
this_thread::disable_interruption di;
|
1114
|
-
{
|
1115
|
-
lock_guard<boost::timed_mutex> l(lock);
|
1116
|
-
destroying = true;
|
1117
|
-
cleanerThreadSleeper.notify_one();
|
1118
|
-
while (!groups.empty()) {
|
1119
|
-
detachGroupWithoutLock(groups.begin()->second);
|
1120
|
-
}
|
1121
|
-
}
|
1122
|
-
cleanerThread->join();
|
1123
|
-
delete cleanerThread;
|
1124
|
-
|
1125
|
-
if (analyticsCollectionThread != NULL) {
|
1126
|
-
analyticsCollectionThread->interrupt_and_join();
|
1127
|
-
delete analyticsCollectionThread;
|
1128
|
-
}
|
1129
|
-
}
|
1130
|
-
|
1131
|
-
virtual SessionPtr get(const string &appRoot) {
|
1132
|
-
return ApplicationPool::Interface::get(appRoot);
|
1133
|
-
}
|
1134
|
-
|
1135
|
-
virtual SessionPtr get(const PoolOptions &options) {
|
1136
|
-
TRACE_POINT();
|
1137
|
-
unsigned int attempt = 0;
|
1138
|
-
|
1139
|
-
while (true) {
|
1140
|
-
attempt++;
|
1141
|
-
|
1142
|
-
pair<ProcessInfoPtr, GroupPtr> p;
|
1143
|
-
{
|
1144
|
-
unique_lock<boost::timed_mutex> l(lock);
|
1145
|
-
p = checkoutWithoutLock(l, options);
|
1146
|
-
P_ASSERT(verifyState(), SessionPtr(),
|
1147
|
-
"get(): ApplicationPool state is valid:\n" << inspectWithoutLock());
|
1148
|
-
}
|
1149
|
-
ProcessInfoPtr &processInfo = p.first;
|
1150
|
-
|
1151
|
-
try {
|
1152
|
-
UPDATE_TRACE_POINT();
|
1153
|
-
SessionPtr session = processInfo->process->newSession(
|
1154
|
-
SessionCloseCallback(data, processInfo),
|
1155
|
-
options.initiateSession
|
1156
|
-
);
|
1157
|
-
return session;
|
1158
|
-
|
1159
|
-
} catch (SystemException &e) {
|
1160
|
-
P_TRACE(2, "Exception occurred while connecting to checked out "
|
1161
|
-
"process " << processInfo->process->getPid() << ": " <<
|
1162
|
-
e.what());
|
1163
|
-
{
|
1164
|
-
unique_lock<boost::timed_mutex> l(lock);
|
1165
|
-
detachWithoutLock(processInfo->process->getDetachKey());
|
1166
|
-
processInfo->sessions--;
|
1167
|
-
P_ASSERT(verifyState(), SessionPtr(),
|
1168
|
-
"get(): ApplicationPool state is valid:\n" << inspectWithoutLock());
|
1169
|
-
}
|
1170
|
-
if (e.code() == EMFILE || attempt == MAX_GET_ATTEMPTS) {
|
1171
|
-
/* A "too many open files" (EMFILE) error is probably unrecoverable,
|
1172
|
-
* so propagate that immediately.
|
1173
|
-
*/
|
1174
|
-
e.setBriefMessage("Cannot connect to an existing "
|
1175
|
-
"application instance for '" +
|
1176
|
-
options.appRoot +
|
1177
|
-
"'");
|
1178
|
-
throw;
|
1179
|
-
} // else retry
|
1180
|
-
|
1181
|
-
} catch (const thread_interrupted &) {
|
1182
|
-
throw;
|
1183
|
-
|
1184
|
-
} catch (std::exception &e) {
|
1185
|
-
P_TRACE(2, "Exception occurred while connecting to checked out "
|
1186
|
-
"process " << processInfo->process->getPid() << ": " <<
|
1187
|
-
e.what());
|
1188
|
-
{
|
1189
|
-
unique_lock<boost::timed_mutex> l(lock);
|
1190
|
-
detachWithoutLock(processInfo->process->getDetachKey());
|
1191
|
-
processInfo->sessions--;
|
1192
|
-
P_ASSERT(verifyState(), SessionPtr(),
|
1193
|
-
"get(): ApplicationPool state is valid:\n" << inspectWithoutLock());
|
1194
|
-
}
|
1195
|
-
if (attempt == MAX_GET_ATTEMPTS) {
|
1196
|
-
string message("Cannot connect to an existing "
|
1197
|
-
"application instance for '");
|
1198
|
-
message.append(options.appRoot);
|
1199
|
-
message.append("': ");
|
1200
|
-
message.append(e.what());
|
1201
|
-
throw IOException(message);
|
1202
|
-
} // else retry
|
1203
|
-
}
|
1204
|
-
}
|
1205
|
-
// Never reached; shut up compiler warning
|
1206
|
-
return SessionPtr();
|
1207
|
-
}
|
1208
|
-
|
1209
|
-
virtual bool detach(const string &detachKey) {
|
1210
|
-
TRACE_POINT();
|
1211
|
-
unique_lock<boost::timed_mutex> l(lock);
|
1212
|
-
return detachWithoutLock(detachKey);
|
1213
|
-
}
|
1214
|
-
|
1215
|
-
virtual void clear() {
|
1216
|
-
lock_guard<boost::timed_mutex> l(lock);
|
1217
|
-
P_DEBUG("Clearing pool");
|
1218
|
-
|
1219
|
-
while (!groups.empty()) {
|
1220
|
-
detachGroupWithoutLock(groups.begin()->second);
|
1221
|
-
}
|
1222
|
-
newAppGroupCreatable.notify_all();
|
1223
|
-
globalQueuePositionBecameAvailable.notify_all();
|
1224
|
-
|
1225
|
-
P_ASSERT_WITH_VOID_RETURN(groups.size() == 0,
|
1226
|
-
"groups.size() == 0\n" << inspectWithoutLock());
|
1227
|
-
P_ASSERT_WITH_VOID_RETURN(inactiveApps.size() == 0,
|
1228
|
-
"inactiveApps.size() == 0\n" << inspectWithoutLock());
|
1229
|
-
P_ASSERT_WITH_VOID_RETURN(count == 0,
|
1230
|
-
"count == 0\n" << inspectWithoutLock());
|
1231
|
-
P_ASSERT_WITH_VOID_RETURN(active == 0,
|
1232
|
-
"active == 0\n" << inspectWithoutLock());
|
1233
|
-
P_ASSERT_WITH_VOID_RETURN(verifyState(),
|
1234
|
-
"ApplicationPool state is valid:\n" << inspectWithoutLock());
|
1235
|
-
|
1236
|
-
// TODO: clear cstat and fileChangeChecker, and reload all spawner servers.
|
1237
|
-
}
|
1238
|
-
|
1239
|
-
virtual void setMaxIdleTime(unsigned int seconds) {
|
1240
|
-
lock_guard<boost::timed_mutex> l(lock);
|
1241
|
-
maxIdleTime = seconds;
|
1242
|
-
cleanerThreadSleeper.notify_one();
|
1243
|
-
}
|
1244
|
-
|
1245
|
-
virtual void setMax(unsigned int max) {
|
1246
|
-
lock_guard<boost::timed_mutex> l(lock);
|
1247
|
-
mutateMax(max);
|
1248
|
-
}
|
1249
|
-
|
1250
|
-
virtual unsigned int getActive() const {
|
1251
|
-
lock_guard<boost::timed_mutex> l(lock);
|
1252
|
-
return active;
|
1253
|
-
}
|
1254
|
-
|
1255
|
-
virtual unsigned int getCount() const {
|
1256
|
-
lock_guard<boost::timed_mutex> l(lock);
|
1257
|
-
return count;
|
1258
|
-
}
|
1259
|
-
|
1260
|
-
virtual unsigned int getGlobalQueueSize() const {
|
1261
|
-
lock_guard<boost::timed_mutex> l(lock);
|
1262
|
-
return waitingOnGlobalQueue;
|
1263
|
-
}
|
1264
|
-
|
1265
|
-
virtual void setMaxPerApp(unsigned int maxPerApp) {
|
1266
|
-
lock_guard<boost::timed_mutex> l(lock);
|
1267
|
-
this->maxPerApp = maxPerApp;
|
1268
|
-
newAppGroupCreatable.notify_all();
|
1269
|
-
globalQueuePositionBecameAvailable.notify_all();
|
1270
|
-
}
|
1271
|
-
|
1272
|
-
virtual pid_t getSpawnServerPid() const {
|
1273
|
-
return spawnManager->getServerPid();
|
1274
|
-
}
|
1275
|
-
|
1276
|
-
virtual string inspect() const {
|
1277
|
-
lock_guard<boost::timed_mutex> l(lock);
|
1278
|
-
return inspectWithoutLock();
|
1279
|
-
}
|
1280
|
-
|
1281
|
-
virtual string toXml(bool includeSensitiveInformation = true) const {
|
1282
|
-
lock_guard<boost::timed_mutex> l(lock);
|
1283
|
-
stringstream result;
|
1284
|
-
GroupMap::const_iterator it;
|
1285
|
-
|
1286
|
-
result << "<?xml version=\"1.0\" encoding=\"iso8859-1\" ?>\n";
|
1287
|
-
result << "<info>";
|
1288
|
-
|
1289
|
-
result << "<active>" << toString(active) << "</active>";
|
1290
|
-
result << "<count>" << toString(count) << "</count>";
|
1291
|
-
result << "<max>" << toString(max) << "</max>";
|
1292
|
-
result << "<global_queue_size>" << toString(waitingOnGlobalQueue) << "</global_queue_size>";
|
1293
|
-
|
1294
|
-
result << "<groups>";
|
1295
|
-
for (it = groups.begin(); it != groups.end(); it++) {
|
1296
|
-
Group *group = it->second.get();
|
1297
|
-
ProcessInfoList *processes = &group->processes;
|
1298
|
-
ProcessInfoList::const_iterator lit;
|
1299
|
-
|
1300
|
-
result << "<group>";
|
1301
|
-
result << "<app_root>" << escapeForXml(group->appRoot) << "</app_root>";
|
1302
|
-
result << "<name>" << escapeForXml(group->name) << "</name>";
|
1303
|
-
result << "<environment>" << escapeForXml(group->environment) << "</environment>";
|
1304
|
-
|
1305
|
-
result << "<processes>";
|
1306
|
-
for (lit = processes->begin(); lit != processes->end(); lit++) {
|
1307
|
-
ProcessInfo *processInfo = lit->get();
|
1308
|
-
dumpProcessInfoAsXml(processInfo, includeSensitiveInformation, result);
|
1309
|
-
}
|
1310
|
-
result << "</processes>";
|
1311
|
-
|
1312
|
-
result << "</group>";
|
1313
|
-
}
|
1314
|
-
result << "</groups>";
|
1315
|
-
|
1316
|
-
result << "</info>";
|
1317
|
-
return result.str();
|
1318
|
-
}
|
1319
|
-
};
|
1320
|
-
|
1321
|
-
typedef shared_ptr<Pool> PoolPtr;
|
1322
|
-
|
1323
|
-
} // namespace ApplicationPool
|
1324
|
-
} // namespace Passenger
|
1325
|
-
|
1326
|
-
#endif /* _PASSENGER_APPLICATION_POOL_POOL_H_ */
|
1327
|
-
|