passenger 2.2.15 → 3.0.0.pre1

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.

Files changed (1338) hide show
  1. data/DEVELOPERS.TXT +21 -12
  2. data/LICENSE +1 -1
  3. data/NEWS +8 -1
  4. data/PACKAGING.TXT +25 -0
  5. data/Rakefile +28 -891
  6. data/bin/passenger +32 -0
  7. data/bin/passenger-config +5 -5
  8. data/bin/passenger-install-apache2-module +37 -24
  9. data/bin/passenger-install-nginx-module +48 -46
  10. data/bin/passenger-make-enterprisey +8 -9
  11. data/bin/passenger-memory-stats +20 -150
  12. data/bin/passenger-status +130 -44
  13. data/bin/passenger-stress-test +5 -4
  14. data/build/agents.rb +73 -0
  15. data/build/apache2.rb +165 -0
  16. data/build/basics.rb +81 -0
  17. data/build/common_library.rb +198 -0
  18. data/build/config.rb +35 -0
  19. data/{misc/rake/cplusplus.rb → build/cplusplus_support.rb} +1 -1
  20. data/build/cxx_tests.rb +205 -0
  21. data/build/documentation.rb +77 -0
  22. data/{misc/rake → build}/gempackagetask.rb +1 -1
  23. data/build/integration_tests.rb +57 -0
  24. data/build/misc.rb +146 -0
  25. data/build/nginx.rb +64 -0
  26. data/build/oxt_tests.rb +52 -0
  27. data/{misc/rake → build}/packagetask.rb +0 -0
  28. data/build/packaging.rb +189 -0
  29. data/{misc/rake/extensions.rb → build/rake_extensions.rb} +1 -1
  30. data/{misc/rake → build}/rdoctask.rb +0 -0
  31. data/build/ruby_extension.rb +46 -0
  32. data/build/ruby_tests.rb +42 -0
  33. data/build/test_basics.rb +31 -0
  34. data/doc/ApplicationPool algorithm.txt +447 -234
  35. data/doc/Architectural overview.html +47 -56
  36. data/doc/Doxyfile +1 -1
  37. data/doc/Security of user switching support.html +46 -57
  38. data/doc/Users guide Apache.html +1033 -306
  39. data/doc/Users guide Apache.txt +419 -99
  40. data/doc/Users guide Nginx.html +1252 -253
  41. data/doc/Users guide Nginx.txt +711 -87
  42. data/doc/Users guide Standalone.html +603 -0
  43. data/doc/Users guide Standalone.txt +40 -0
  44. data/doc/cxxapi/AbstractSpawnManager_8h_source.html +141 -0
  45. data/doc/cxxapi/Account_8h_source.html +206 -0
  46. data/doc/cxxapi/AccountsDatabase_8h_source.html +161 -0
  47. data/doc/cxxapi/AgentBase_8h_source.html +70 -0
  48. data/doc/cxxapi/AgentsStarter_8h_source.html +112 -0
  49. data/doc/cxxapi/BCrypt_8h_source.html +104 -0
  50. data/doc/cxxapi/Blowfish_8h_source.html +134 -0
  51. data/doc/cxxapi/Bucket_8h_source.html +4 -3
  52. data/doc/cxxapi/Constants_8h_source.html +79 -0
  53. data/doc/cxxapi/ContentHandler_8h_source.html +95 -0
  54. data/doc/cxxapi/DirectoryMapper_8h_source.html +9 -8
  55. data/doc/cxxapi/EventedClient_8h_source.html +629 -0
  56. data/doc/cxxapi/EventedMessageServer_8h_source.html +358 -0
  57. data/doc/cxxapi/EventedServer_8h_source.html +326 -0
  58. data/doc/cxxapi/Exceptions_8h_source.html +366 -0
  59. data/doc/cxxapi/FileDescriptor_8h_source.html +260 -0
  60. data/doc/cxxapi/Hooks_8h_source.html +2 -1
  61. data/doc/cxxapi/HttpStatusExtractor_8h_source.html +382 -0
  62. data/doc/cxxapi/Logging_8h_source.html +726 -0
  63. data/doc/cxxapi/MessageChannel_8h_source.html +852 -0
  64. data/doc/cxxapi/MessageClient_8h_source.html +328 -0
  65. data/doc/cxxapi/MessageReadersWriters_8h_source.html +539 -0
  66. data/doc/cxxapi/MessageServer_8h_source.html +606 -0
  67. data/doc/cxxapi/PoolOptions_8h_source.html +548 -0
  68. data/doc/cxxapi/Process_8h_source.html +286 -0
  69. data/doc/cxxapi/RandomGenerator_8h_source.html +191 -0
  70. data/doc/cxxapi/ResourceLocator_8h_source.html +115 -0
  71. data/doc/cxxapi/ScgiRequestParser_8h_source.html +406 -0
  72. data/doc/cxxapi/ServerInstanceDir_8h_source.html +374 -0
  73. data/doc/cxxapi/Session_8h_source.html +501 -0
  74. data/doc/cxxapi/SpawnManager_8h_source.html +647 -0
  75. data/doc/cxxapi/StaticContentHandler_8h_source.html +68 -0
  76. data/doc/cxxapi/StaticString_8h_source.html +254 -0
  77. data/doc/cxxapi/StringListCreator_8h_source.html +114 -0
  78. data/doc/cxxapi/Utils_8h_source.html +442 -0
  79. data/doc/cxxapi/annotated.html +46 -0
  80. data/doc/cxxapi/apache2_2Configuration_8h_source.html +82 -0
  81. data/doc/cxxapi/classAgentWatcher-members.html +30 -26
  82. data/doc/cxxapi/classAgentWatcher.html +168 -194
  83. data/doc/cxxapi/classClient-members.html +14 -11
  84. data/doc/cxxapi/classClient.html +35 -35
  85. data/doc/cxxapi/classHooks-members.html +2 -0
  86. data/doc/cxxapi/classHooks.html +2 -0
  87. data/doc/cxxapi/classPassenger_1_1AbstractSpawnManager-members.html +16 -13
  88. data/doc/cxxapi/classPassenger_1_1AbstractSpawnManager.html +78 -82
  89. data/doc/cxxapi/classPassenger_1_1ArgumentException-members.html +12 -9
  90. data/doc/cxxapi/classPassenger_1_1ArgumentException.html +26 -22
  91. data/doc/cxxapi/classPassenger_1_1ArrayMessage-members.html +37 -0
  92. data/doc/cxxapi/classPassenger_1_1ArrayMessage.html +113 -0
  93. data/doc/cxxapi/classPassenger_1_1BufferedUpload-members.html +14 -11
  94. data/doc/cxxapi/classPassenger_1_1BufferedUpload.html +41 -42
  95. data/doc/cxxapi/classPassenger_1_1BusyException-members.html +12 -9
  96. data/doc/cxxapi/classPassenger_1_1BusyException.html +24 -20
  97. data/doc/cxxapi/classPassenger_1_1ConfigurationException-members.html +12 -9
  98. data/doc/cxxapi/classPassenger_1_1ConfigurationException.html +23 -19
  99. data/doc/cxxapi/classPassenger_1_1DirectoryMapper-members.html +2 -0
  100. data/doc/cxxapi/classPassenger_1_1DirectoryMapper.html +8 -6
  101. data/doc/cxxapi/classPassenger_1_1EOFException-members.html +12 -9
  102. data/doc/cxxapi/classPassenger_1_1EOFException.html +27 -23
  103. data/doc/cxxapi/classPassenger_1_1EventFd-members.html +12 -9
  104. data/doc/cxxapi/classPassenger_1_1EventFd.html +24 -21
  105. data/doc/cxxapi/classPassenger_1_1EventedClient-members.html +54 -0
  106. data/doc/cxxapi/classPassenger_1_1EventedClient.html +436 -0
  107. data/doc/cxxapi/classPassenger_1_1EventedMessageServer-members.html +37 -0
  108. data/doc/cxxapi/classPassenger_1_1EventedMessageServer.html +59 -0
  109. data/doc/cxxapi/classPassenger_1_1EventedMessageServer__inherit__graph.map +3 -0
  110. data/doc/cxxapi/classPassenger_1_1EventedMessageServer__inherit__graph.md5 +1 -0
  111. data/doc/cxxapi/classPassenger_1_1EventedMessageServer__inherit__graph.png +0 -0
  112. data/doc/cxxapi/classPassenger_1_1EventedServer-members.html +37 -0
  113. data/doc/cxxapi/classPassenger_1_1EventedServer.html +93 -0
  114. data/doc/cxxapi/classPassenger_1_1EventedServer__inherit__graph.map +3 -0
  115. data/doc/cxxapi/classPassenger_1_1EventedServer__inherit__graph.md5 +1 -0
  116. data/doc/cxxapi/classPassenger_1_1EventedServer__inherit__graph.png +0 -0
  117. data/doc/cxxapi/classPassenger_1_1FileDescriptor-members.html +16 -13
  118. data/doc/cxxapi/classPassenger_1_1FileDescriptor.html +63 -70
  119. data/doc/cxxapi/classPassenger_1_1FileNotFoundException-members.html +12 -9
  120. data/doc/cxxapi/classPassenger_1_1FileNotFoundException.html +26 -22
  121. data/doc/cxxapi/classPassenger_1_1FileSystemException-members.html +17 -14
  122. data/doc/cxxapi/classPassenger_1_1FileSystemException.html +32 -30
  123. data/doc/cxxapi/classPassenger_1_1HttpStatusExtractor-members.html +15 -12
  124. data/doc/cxxapi/classPassenger_1_1HttpStatusExtractor.html +59 -59
  125. data/doc/cxxapi/classPassenger_1_1IOException-members.html +12 -9
  126. data/doc/cxxapi/classPassenger_1_1IOException.html +27 -23
  127. data/doc/cxxapi/classPassenger_1_1MessageChannel-members.html +36 -33
  128. data/doc/cxxapi/classPassenger_1_1MessageChannel.html +326 -344
  129. data/doc/cxxapi/classPassenger_1_1MessageServer-members.html +25 -22
  130. data/doc/cxxapi/classPassenger_1_1MessageServer.html +160 -191
  131. data/doc/cxxapi/classPassenger_1_1MessageServer_1_1ClientContext-members.html +12 -9
  132. data/doc/cxxapi/classPassenger_1_1MessageServer_1_1ClientContext.html +29 -27
  133. data/doc/cxxapi/classPassenger_1_1MessageServer_1_1ClientContext__inherit__graph.map +3 -1
  134. data/doc/cxxapi/classPassenger_1_1MessageServer_1_1ClientContext__inherit__graph.md5 +1 -1
  135. data/doc/cxxapi/classPassenger_1_1MessageServer_1_1ClientContext__inherit__graph.png +0 -0
  136. data/doc/cxxapi/classPassenger_1_1MessageServer_1_1CommonClientContext-members.html +17 -14
  137. data/doc/cxxapi/classPassenger_1_1MessageServer_1_1CommonClientContext.html +69 -79
  138. data/doc/cxxapi/classPassenger_1_1MessageServer_1_1CommonClientContext__inherit__graph.map +3 -1
  139. data/doc/cxxapi/classPassenger_1_1MessageServer_1_1CommonClientContext__inherit__graph.md5 +1 -1
  140. data/doc/cxxapi/classPassenger_1_1MessageServer_1_1CommonClientContext__inherit__graph.png +0 -0
  141. data/doc/cxxapi/classPassenger_1_1MessageServer_1_1Handler-members.html +15 -12
  142. data/doc/cxxapi/classPassenger_1_1MessageServer_1_1Handler.html +60 -63
  143. data/doc/cxxapi/classPassenger_1_1Process-members.html +20 -17
  144. data/doc/cxxapi/classPassenger_1_1Process.html +88 -95
  145. data/doc/cxxapi/classPassenger_1_1RandomGenerator-members.html +13 -10
  146. data/doc/cxxapi/classPassenger_1_1RandomGenerator.html +36 -35
  147. data/doc/cxxapi/classPassenger_1_1RuntimeException-members.html +12 -9
  148. data/doc/cxxapi/classPassenger_1_1RuntimeException.html +24 -20
  149. data/doc/cxxapi/classPassenger_1_1ScalarMessage-members.html +37 -0
  150. data/doc/cxxapi/classPassenger_1_1ScalarMessage.html +76 -0
  151. data/doc/cxxapi/classPassenger_1_1ScgiRequestParser-members.html +26 -23
  152. data/doc/cxxapi/classPassenger_1_1ScgiRequestParser.html +121 -138
  153. data/doc/cxxapi/classPassenger_1_1SecurityException-members.html +12 -9
  154. data/doc/cxxapi/classPassenger_1_1SecurityException.html +26 -22
  155. data/doc/cxxapi/classPassenger_1_1Session-members.html +29 -26
  156. data/doc/cxxapi/classPassenger_1_1Session.html +219 -240
  157. data/doc/cxxapi/classPassenger_1_1SpawnException-members.html +14 -11
  158. data/doc/cxxapi/classPassenger_1_1SpawnException.html +36 -37
  159. data/doc/cxxapi/classPassenger_1_1SpawnManager-members.html +18 -15
  160. data/doc/cxxapi/classPassenger_1_1SpawnManager.html +115 -110
  161. data/doc/cxxapi/classPassenger_1_1StandardSession-members.html +30 -27
  162. data/doc/cxxapi/classPassenger_1_1StandardSession.html +163 -184
  163. data/doc/cxxapi/classPassenger_1_1StaticString-members.html +12 -9
  164. data/doc/cxxapi/classPassenger_1_1StaticString.html +27 -25
  165. data/doc/cxxapi/classPassenger_1_1SystemException-members.html +16 -13
  166. data/doc/cxxapi/classPassenger_1_1SystemException.html +65 -67
  167. data/doc/cxxapi/classPassenger_1_1TimeRetrievalException-members.html +16 -13
  168. data/doc/cxxapi/classPassenger_1_1TimeRetrievalException.html +27 -23
  169. data/doc/cxxapi/classPassenger_1_1TimeoutException-members.html +12 -9
  170. data/doc/cxxapi/classPassenger_1_1TimeoutException.html +24 -20
  171. data/doc/cxxapi/classPassenger_1_1Uint16Message-members.html +36 -0
  172. data/doc/cxxapi/classPassenger_1_1Uint16Message.html +51 -0
  173. data/doc/cxxapi/classPassenger_1_1Uint32Message-members.html +36 -0
  174. data/doc/cxxapi/classPassenger_1_1Uint32Message.html +51 -0
  175. data/doc/cxxapi/classServer-members.html +12 -9
  176. data/doc/cxxapi/classServer.html +23 -20
  177. data/doc/cxxapi/classServerInstanceDirToucher-members.html +12 -9
  178. data/doc/cxxapi/classServerInstanceDirToucher.html +21 -17
  179. data/doc/cxxapi/classes.html +18 -4
  180. data/doc/cxxapi/definitions_8h_source.html +1 -0
  181. data/doc/cxxapi/files.html +36 -1
  182. data/doc/cxxapi/functions.html +53 -21
  183. data/doc/cxxapi/functions_0x62.html +82 -0
  184. data/doc/cxxapi/functions_0x63.html +99 -0
  185. data/doc/cxxapi/functions_0x64.html +95 -0
  186. data/doc/cxxapi/functions_0x65.html +88 -0
  187. data/doc/cxxapi/functions_0x66.html +100 -0
  188. data/doc/cxxapi/functions_0x67.html +170 -0
  189. data/doc/cxxapi/functions_0x68.html +88 -0
  190. data/doc/cxxapi/functions_0x69.html +93 -0
  191. data/doc/cxxapi/functions_0x6b.html +80 -0
  192. data/doc/cxxapi/functions_0x6c.html +88 -0
  193. data/doc/cxxapi/functions_0x6d.html +88 -0
  194. data/doc/cxxapi/functions_0x6e.html +86 -0
  195. data/doc/cxxapi/functions_0x6f.html +94 -0
  196. data/doc/cxxapi/functions_0x70.html +94 -0
  197. data/doc/cxxapi/functions_0x72.html +110 -0
  198. data/doc/cxxapi/functions_0x73.html +171 -0
  199. data/doc/cxxapi/functions_0x74.html +85 -0
  200. data/doc/cxxapi/functions_0x75.html +85 -0
  201. data/doc/cxxapi/functions_0x77.html +92 -0
  202. data/doc/cxxapi/functions_0x7e.html +79 -0
  203. data/doc/cxxapi/functions_enum.html +14 -12
  204. data/doc/cxxapi/functions_eval.html +22 -16
  205. data/doc/cxxapi/functions_func.html +460 -1
  206. data/doc/cxxapi/functions_vars.html +163 -63
  207. data/doc/cxxapi/graph_legend.html +1 -0
  208. data/doc/cxxapi/graph_legend.png +0 -0
  209. data/doc/cxxapi/group__Core.html +2 -2
  210. data/doc/cxxapi/group__Core.map +1 -2
  211. data/doc/cxxapi/group__Core.png +0 -0
  212. data/doc/cxxapi/group__Exceptions.html +32 -40
  213. data/doc/cxxapi/group__Hooks.html +2 -1
  214. data/doc/cxxapi/group__Hooks.map +1 -1
  215. data/doc/cxxapi/group__Hooks.png +0 -0
  216. data/doc/cxxapi/group__Support.html +509 -0
  217. data/doc/cxxapi/hierarchy.html +66 -62
  218. data/doc/cxxapi/inherit__graph__10.map +3 -1
  219. data/doc/cxxapi/inherit__graph__10.md5 +1 -1
  220. data/doc/cxxapi/inherit__graph__10.png +0 -0
  221. data/doc/cxxapi/inherit__graph__11.map +4 -1
  222. data/doc/cxxapi/inherit__graph__11.md5 +1 -1
  223. data/doc/cxxapi/inherit__graph__11.png +0 -0
  224. data/doc/cxxapi/inherit__graph__12.map +3 -1
  225. data/doc/cxxapi/inherit__graph__12.md5 +1 -1
  226. data/doc/cxxapi/inherit__graph__12.png +0 -0
  227. data/doc/cxxapi/inherit__graph__13.map +3 -1
  228. data/doc/cxxapi/inherit__graph__13.md5 +1 -1
  229. data/doc/cxxapi/inherit__graph__13.png +0 -0
  230. data/doc/cxxapi/inherit__graph__14.map +3 -1
  231. data/doc/cxxapi/inherit__graph__14.md5 +1 -1
  232. data/doc/cxxapi/inherit__graph__14.png +0 -0
  233. data/doc/cxxapi/inherit__graph__15.map +5 -1
  234. data/doc/cxxapi/inherit__graph__15.md5 +1 -1
  235. data/doc/cxxapi/inherit__graph__15.png +0 -0
  236. data/doc/cxxapi/inherit__graph__16.map +3 -3
  237. data/doc/cxxapi/inherit__graph__16.md5 +1 -1
  238. data/doc/cxxapi/inherit__graph__16.png +0 -0
  239. data/doc/cxxapi/inherit__graph__17.map +3 -1
  240. data/doc/cxxapi/inherit__graph__17.md5 +1 -1
  241. data/doc/cxxapi/inherit__graph__17.png +0 -0
  242. data/doc/cxxapi/inherit__graph__18.map +4 -1
  243. data/doc/cxxapi/inherit__graph__18.md5 +1 -1
  244. data/doc/cxxapi/inherit__graph__18.png +0 -0
  245. data/doc/cxxapi/inherit__graph__19.map +3 -1
  246. data/doc/cxxapi/inherit__graph__19.md5 +1 -1
  247. data/doc/cxxapi/inherit__graph__19.png +0 -0
  248. data/doc/cxxapi/inherit__graph__20.map +3 -2
  249. data/doc/cxxapi/inherit__graph__20.md5 +1 -1
  250. data/doc/cxxapi/inherit__graph__20.png +0 -0
  251. data/doc/cxxapi/inherit__graph__21.map +3 -1
  252. data/doc/cxxapi/inherit__graph__21.md5 +1 -1
  253. data/doc/cxxapi/inherit__graph__21.png +0 -0
  254. data/doc/cxxapi/inherit__graph__22.map +3 -1
  255. data/doc/cxxapi/inherit__graph__22.md5 +1 -1
  256. data/doc/cxxapi/inherit__graph__22.png +0 -0
  257. data/doc/cxxapi/inherit__graph__23.map +3 -1
  258. data/doc/cxxapi/inherit__graph__23.md5 +1 -1
  259. data/doc/cxxapi/inherit__graph__23.png +0 -0
  260. data/doc/cxxapi/inherit__graph__24.map +3 -1
  261. data/doc/cxxapi/inherit__graph__24.md5 +1 -1
  262. data/doc/cxxapi/inherit__graph__24.png +0 -0
  263. data/doc/cxxapi/inherit__graph__25.map +3 -1
  264. data/doc/cxxapi/inherit__graph__25.md5 +1 -1
  265. data/doc/cxxapi/inherit__graph__25.png +0 -0
  266. data/doc/cxxapi/inherit__graph__26.map +3 -1
  267. data/doc/cxxapi/inherit__graph__26.md5 +1 -1
  268. data/doc/cxxapi/inherit__graph__26.png +0 -0
  269. data/doc/cxxapi/inherit__graph__27.map +3 -1
  270. data/doc/cxxapi/inherit__graph__27.md5 +1 -1
  271. data/doc/cxxapi/inherit__graph__27.png +0 -0
  272. data/doc/cxxapi/inherit__graph__28.map +4 -1
  273. data/doc/cxxapi/inherit__graph__28.md5 +1 -1
  274. data/doc/cxxapi/inherit__graph__28.png +0 -0
  275. data/doc/cxxapi/inherit__graph__29.map +3 -1
  276. data/doc/cxxapi/inherit__graph__29.md5 +1 -1
  277. data/doc/cxxapi/inherit__graph__29.png +0 -0
  278. data/doc/cxxapi/inherit__graph__30.map +3 -2
  279. data/doc/cxxapi/inherit__graph__30.md5 +1 -1
  280. data/doc/cxxapi/inherit__graph__30.png +0 -0
  281. data/doc/cxxapi/inherit__graph__31.map +3 -1
  282. data/doc/cxxapi/inherit__graph__31.md5 +1 -1
  283. data/doc/cxxapi/inherit__graph__31.png +0 -0
  284. data/doc/cxxapi/inherit__graph__32.map +5 -1
  285. data/doc/cxxapi/inherit__graph__32.md5 +1 -1
  286. data/doc/cxxapi/inherit__graph__32.png +0 -0
  287. data/doc/cxxapi/inherit__graph__33.map +3 -1
  288. data/doc/cxxapi/inherit__graph__33.md5 +1 -1
  289. data/doc/cxxapi/inherit__graph__33.png +0 -0
  290. data/doc/cxxapi/inherit__graph__34.map +3 -3
  291. data/doc/cxxapi/inherit__graph__34.md5 +1 -1
  292. data/doc/cxxapi/inherit__graph__34.png +0 -0
  293. data/doc/cxxapi/inherit__graph__35.map +3 -1
  294. data/doc/cxxapi/inherit__graph__35.md5 +1 -1
  295. data/doc/cxxapi/inherit__graph__35.png +0 -0
  296. data/doc/cxxapi/inherit__graph__36.map +3 -1
  297. data/doc/cxxapi/inherit__graph__36.md5 +1 -1
  298. data/doc/cxxapi/inherit__graph__36.png +0 -0
  299. data/doc/cxxapi/inherit__graph__37.map +3 -1
  300. data/doc/cxxapi/inherit__graph__37.md5 +1 -1
  301. data/doc/cxxapi/inherit__graph__37.png +0 -0
  302. data/doc/cxxapi/inherit__graph__4.map +3 -1
  303. data/doc/cxxapi/inherit__graph__4.md5 +1 -1
  304. data/doc/cxxapi/inherit__graph__4.png +0 -0
  305. data/doc/cxxapi/inherit__graph__5.map +3 -1
  306. data/doc/cxxapi/inherit__graph__5.md5 +1 -1
  307. data/doc/cxxapi/inherit__graph__5.png +0 -0
  308. data/doc/cxxapi/inherit__graph__6.map +3 -1
  309. data/doc/cxxapi/inherit__graph__6.md5 +1 -1
  310. data/doc/cxxapi/inherit__graph__6.png +0 -0
  311. data/doc/cxxapi/inherit__graph__7.map +3 -1
  312. data/doc/cxxapi/inherit__graph__7.md5 +1 -1
  313. data/doc/cxxapi/inherit__graph__7.png +0 -0
  314. data/doc/cxxapi/inherit__graph__8.map +3 -1
  315. data/doc/cxxapi/inherit__graph__8.md5 +1 -1
  316. data/doc/cxxapi/inherit__graph__8.png +0 -0
  317. data/doc/cxxapi/inherit__graph__9.map +3 -1
  318. data/doc/cxxapi/inherit__graph__9.md5 +1 -1
  319. data/doc/cxxapi/inherit__graph__9.png +0 -0
  320. data/doc/cxxapi/inherits.html +123 -126
  321. data/doc/cxxapi/main.html +1 -0
  322. data/doc/cxxapi/modules.html +2 -1
  323. data/doc/cxxapi/namespacePassenger.html +263 -492
  324. data/doc/cxxapi/namespacemembers.html +68 -96
  325. data/doc/cxxapi/namespacemembers_enum.html +14 -12
  326. data/doc/cxxapi/namespacemembers_eval.html +20 -15
  327. data/doc/cxxapi/namespacemembers_func.html +52 -88
  328. data/doc/cxxapi/namespacemembers_type.html +18 -14
  329. data/doc/cxxapi/namespaces.html +12 -9
  330. data/doc/cxxapi/nginx_2Configuration_8h_source.html +125 -0
  331. data/doc/cxxapi/ngx__http__passenger__module_8h_source.html +94 -0
  332. data/doc/cxxapi/structPassenger_1_1MessageServer_1_1DisconnectEventBroadcastGuard-members.html +12 -9
  333. data/doc/cxxapi/structPassenger_1_1MessageServer_1_1DisconnectEventBroadcastGuard.html +24 -22
  334. data/doc/cxxapi/structPassenger_1_1PoolOptions-members.html +43 -38
  335. data/doc/cxxapi/structPassenger_1_1PoolOptions.html +275 -325
  336. data/doc/cxxapi/structPassenger_1_1StaticString_1_1Hash-members.html +12 -9
  337. data/doc/cxxapi/structPassenger_1_1StaticString_1_1Hash.html +24 -22
  338. data/doc/cxxapi/tree.html +152 -7
  339. data/doc/users_guide_snippets/{analysis_and_system_maintenance_tools.txt → analysis_and_system_maintenance.txt} +58 -1
  340. data/doc/users_guide_snippets/appendix_c_spawning_methods.txt +1 -2
  341. data/doc/users_guide_snippets/global_queueing_explained.txt +1 -5
  342. data/doc/users_guide_snippets/{rails_spawn_method.txt → passenger_spawn_method.txt} +9 -8
  343. data/doc/users_guide_snippets/tips.txt +12 -6
  344. data/doc/users_guide_snippets/under_the_hood/page_caching_support.txt +22 -0
  345. data/ext/apache2/Bucket.cpp +4 -4
  346. data/ext/apache2/Bucket.h +3 -3
  347. data/ext/apache2/Configuration.cpp +278 -381
  348. data/ext/apache2/Configuration.h +3 -357
  349. data/ext/apache2/Configuration.hpp +461 -0
  350. data/ext/apache2/DirectoryMapper.h +3 -3
  351. data/ext/apache2/HelperAgent.cpp +359 -0
  352. data/ext/apache2/Hooks.cpp +339 -226
  353. data/ext/apache2/Hooks.h +1 -1
  354. data/ext/apache2/mod_passenger.c +10 -4
  355. data/ext/boost/algorithm/string/case_conv.hpp +4 -4
  356. data/ext/boost/algorithm/string/concept.hpp +2 -2
  357. data/ext/boost/algorithm/string/detail/case_conv.hpp +18 -9
  358. data/ext/boost/algorithm/string/detail/find_format.hpp +44 -43
  359. data/ext/boost/algorithm/string/detail/find_format_all.hpp +56 -56
  360. data/ext/boost/algorithm/string/detail/find_format_store.hpp +7 -0
  361. data/ext/boost/algorithm/string/detail/finder.hpp +14 -14
  362. data/ext/boost/algorithm/string/detail/formatter.hpp +2 -2
  363. data/ext/boost/algorithm/string/detail/replace_storage.hpp +3 -3
  364. data/ext/boost/algorithm/string/detail/sequence.hpp +3 -3
  365. data/ext/boost/algorithm/string/erase.hpp +98 -98
  366. data/ext/boost/algorithm/string/find_format.hpp +56 -38
  367. data/ext/boost/algorithm/string/finder.hpp +6 -6
  368. data/ext/boost/algorithm/string/formatter.hpp +1 -1
  369. data/ext/boost/algorithm/string/replace.hpp +99 -99
  370. data/ext/boost/bind.hpp +5 -1670
  371. data/ext/boost/bind/bind.hpp +1751 -0
  372. data/ext/boost/bind/bind_mf2_cc.hpp +228 -0
  373. data/ext/boost/bind/mem_fn.hpp +389 -0
  374. data/ext/boost/bind/mem_fn_template.hpp +54 -27
  375. data/ext/boost/bind/placeholders.hpp +3 -2
  376. data/ext/boost/concept_check.hpp +10 -0
  377. data/ext/boost/config/abi/msvc_prefix.hpp +15 -1
  378. data/ext/boost/config/abi_prefix.hpp +1 -1
  379. data/ext/boost/config/abi_suffix.hpp +3 -2
  380. data/ext/boost/config/auto_link.hpp +6 -1
  381. data/ext/boost/config/compiler/borland.hpp +75 -17
  382. data/ext/boost/config/compiler/codegear.hpp +163 -0
  383. data/ext/boost/config/compiler/common_edg.hpp +35 -0
  384. data/ext/boost/config/compiler/digitalmars.hpp +26 -0
  385. data/ext/boost/config/compiler/gcc.hpp +69 -14
  386. data/ext/boost/config/compiler/hp_acc.hpp +32 -0
  387. data/ext/boost/config/compiler/intel.hpp +13 -2
  388. data/ext/boost/config/compiler/kai.hpp +0 -2
  389. data/ext/boost/config/compiler/metrowerks.hpp +29 -1
  390. data/ext/boost/config/compiler/mpw.hpp +30 -0
  391. data/ext/boost/config/compiler/pgi.hpp +37 -0
  392. data/ext/boost/config/compiler/sgi_mipspro.hpp +1 -0
  393. data/ext/boost/config/compiler/sunpro_cc.hpp +39 -7
  394. data/ext/boost/config/compiler/vacpp.hpp +31 -3
  395. data/ext/boost/config/compiler/visualc.hpp +72 -5
  396. data/ext/boost/config/no_tr1/cmath.hpp +28 -0
  397. data/ext/boost/config/platform/bsd.hpp +16 -3
  398. data/ext/boost/config/platform/hpux.hpp +3 -0
  399. data/ext/boost/config/platform/macos.hpp +8 -0
  400. data/ext/boost/config/platform/solaris.hpp +7 -0
  401. data/ext/boost/config/platform/vxworks.hpp +31 -0
  402. data/ext/boost/config/select_compiler_config.hpp +4 -0
  403. data/ext/boost/config/select_platform_config.hpp +6 -2
  404. data/ext/boost/config/select_stdlib_config.hpp +17 -8
  405. data/ext/boost/config/stdlib/dinkumware.hpp +34 -2
  406. data/ext/boost/config/stdlib/libcomo.hpp +25 -0
  407. data/ext/boost/config/stdlib/libstdcpp3.hpp +56 -2
  408. data/ext/boost/config/stdlib/modena.hpp +25 -0
  409. data/ext/boost/config/stdlib/msl.hpp +24 -0
  410. data/ext/boost/config/stdlib/roguewave.hpp +26 -0
  411. data/ext/boost/config/stdlib/sgi.hpp +25 -0
  412. data/ext/boost/config/stdlib/stlport.hpp +36 -1
  413. data/ext/boost/config/stdlib/vacpp.hpp +25 -0
  414. data/ext/boost/config/suffix.hpp +67 -32
  415. data/ext/boost/config/warning_disable.hpp +47 -0
  416. data/ext/boost/cstdint.hpp +62 -36
  417. data/ext/boost/date_time/c_time.hpp +28 -12
  418. data/ext/boost/date_time/compiler_config.hpp +27 -5
  419. data/ext/boost/date_time/constrained_value.hpp +36 -13
  420. data/ext/boost/date_time/date.hpp +44 -33
  421. data/ext/boost/date_time/date_duration.hpp +13 -14
  422. data/ext/boost/date_time/date_facet.hpp +215 -226
  423. data/ext/boost/date_time/date_generator_formatter.hpp +22 -20
  424. data/ext/boost/date_time/date_generator_parser.hpp +52 -51
  425. data/ext/boost/date_time/date_generators.hpp +16 -16
  426. data/ext/boost/date_time/date_parsing.hpp +115 -98
  427. data/ext/boost/date_time/filetime_functions.hpp +133 -41
  428. data/ext/boost/date_time/format_date_parser.hpp +22 -10
  429. data/ext/boost/date_time/gregorian/conversion.hpp +32 -39
  430. data/ext/boost/date_time/gregorian/greg_calendar.hpp +15 -14
  431. data/ext/boost/date_time/gregorian/greg_date.hpp +19 -18
  432. data/ext/boost/date_time/gregorian/greg_duration.hpp +106 -10
  433. data/ext/boost/date_time/gregorian/greg_duration_types.hpp +16 -7
  434. data/ext/boost/date_time/gregorian/greg_weekday.hpp +2 -2
  435. data/ext/boost/date_time/gregorian/gregorian_io.hpp +11 -4
  436. data/ext/boost/date_time/gregorian_calendar.hpp +8 -8
  437. data/ext/boost/date_time/gregorian_calendar.ipp +30 -30
  438. data/ext/boost/date_time/int_adapter.hpp +4 -2
  439. data/ext/boost/date_time/microsec_time_clock.hpp +39 -117
  440. data/ext/boost/date_time/period_parser.hpp +17 -15
  441. data/ext/boost/date_time/posix_time/conversion.hpp +28 -29
  442. data/ext/boost/date_time/posix_time/posix_time_config.hpp +19 -19
  443. data/ext/boost/date_time/posix_time/posix_time_io.hpp +31 -38
  444. data/ext/boost/date_time/posix_time/time_formatters.hpp +32 -32
  445. data/ext/boost/date_time/string_parse_tree.hpp +46 -46
  446. data/ext/boost/date_time/strings_from_facet.hpp +7 -5
  447. data/ext/boost/date_time/time.hpp +7 -6
  448. data/ext/boost/date_time/time_defs.hpp +12 -2
  449. data/ext/boost/date_time/time_duration.hpp +27 -26
  450. data/ext/boost/date_time/time_facet.hpp +386 -321
  451. data/ext/boost/date_time/time_formatting_streams.hpp +8 -5
  452. data/ext/boost/date_time/time_resolution_traits.hpp +29 -25
  453. data/ext/boost/date_time/time_system_split.hpp +7 -13
  454. data/ext/boost/date_time/wrapping_int.hpp +21 -15
  455. data/ext/boost/detail/call_traits.hpp +1 -1
  456. data/ext/boost/detail/endian.hpp +4 -4
  457. data/ext/boost/detail/no_exceptions_support.hpp +87 -0
  458. data/ext/boost/detail/sp_typeinfo.hpp +50 -4
  459. data/ext/boost/detail/workaround.hpp +63 -3
  460. data/ext/boost/enable_shared_from_this.hpp +4 -59
  461. data/ext/boost/exception/current_exception_cast.hpp +43 -0
  462. data/ext/boost/exception/detail/attribute_noreturn.hpp +17 -0
  463. data/ext/boost/exception/detail/error_info_impl.hpp +75 -0
  464. data/ext/boost/exception/detail/exception_ptr.hpp +490 -0
  465. data/ext/boost/exception/detail/is_output_streamable.hpp +47 -0
  466. data/ext/boost/exception/detail/object_hex_dump.hpp +50 -0
  467. data/ext/boost/exception/detail/type_info.hpp +79 -0
  468. data/ext/boost/exception/diagnostic_information.hpp +182 -0
  469. data/ext/boost/exception/exception.hpp +422 -0
  470. data/ext/boost/exception/get_error_info.hpp +130 -0
  471. data/ext/boost/exception/info.hpp +167 -0
  472. data/ext/boost/exception/to_string.hpp +83 -0
  473. data/ext/boost/exception/to_string_stub.hpp +109 -0
  474. data/ext/boost/exception_ptr.hpp +11 -0
  475. data/ext/boost/function/detail/prologue.hpp +2 -1
  476. data/ext/boost/function/function_base.hpp +270 -128
  477. data/ext/boost/function/function_fwd.hpp +70 -0
  478. data/ext/boost/function/function_template.hpp +319 -130
  479. data/ext/boost/get_pointer.hpp +5 -1
  480. data/ext/boost/integer.hpp +253 -0
  481. data/ext/boost/integer_fwd.hpp +174 -0
  482. data/ext/boost/integer_traits.hpp +26 -1
  483. data/ext/boost/io/ios_state.hpp +8 -0
  484. data/ext/boost/iterator/detail/config_def.hpp +4 -2
  485. data/ext/boost/iterator/iterator_adaptor.hpp +7 -2
  486. data/ext/boost/iterator/iterator_facade.hpp +1 -2
  487. data/ext/boost/lexical_cast.hpp +113 -105
  488. data/ext/boost/limits.hpp +1 -1
  489. data/ext/boost/mem_fn.hpp +5 -370
  490. data/ext/boost/memory_order.hpp +53 -0
  491. data/ext/boost/mpl/always.hpp +3 -3
  492. data/ext/boost/mpl/and.hpp +3 -3
  493. data/ext/boost/mpl/apply.hpp +3 -3
  494. data/ext/boost/mpl/apply_fwd.hpp +3 -3
  495. data/ext/boost/mpl/apply_wrap.hpp +37 -6
  496. data/ext/boost/mpl/arg.hpp +3 -3
  497. data/ext/boost/mpl/arg_fwd.hpp +3 -3
  498. data/ext/boost/mpl/assert.hpp +6 -6
  499. data/ext/boost/mpl/aux_/adl_barrier.hpp +3 -3
  500. data/ext/boost/mpl/aux_/arg_typedef.hpp +3 -3
  501. data/ext/boost/mpl/aux_/arity.hpp +3 -3
  502. data/ext/boost/mpl/aux_/arity_spec.hpp +3 -3
  503. data/ext/boost/mpl/aux_/common_name_wknd.hpp +3 -3
  504. data/ext/boost/mpl/aux_/config/adl.hpp +4 -4
  505. data/ext/boost/mpl/aux_/config/arrays.hpp +4 -4
  506. data/ext/boost/mpl/aux_/config/bcc.hpp +28 -0
  507. data/ext/boost/mpl/aux_/config/bind.hpp +4 -4
  508. data/ext/boost/mpl/aux_/config/compiler.hpp +8 -6
  509. data/ext/boost/mpl/aux_/config/ctps.hpp +3 -3
  510. data/ext/boost/mpl/aux_/config/dtp.hpp +5 -5
  511. data/ext/boost/mpl/aux_/config/eti.hpp +3 -3
  512. data/ext/boost/mpl/aux_/config/gcc.hpp +3 -3
  513. data/ext/boost/mpl/aux_/config/has_apply.hpp +3 -3
  514. data/ext/boost/mpl/aux_/config/has_xxx.hpp +3 -3
  515. data/ext/boost/mpl/aux_/config/integral.hpp +4 -4
  516. data/ext/boost/mpl/aux_/config/intel.hpp +3 -3
  517. data/ext/boost/mpl/aux_/config/lambda.hpp +3 -3
  518. data/ext/boost/mpl/aux_/config/msvc.hpp +3 -3
  519. data/ext/boost/mpl/aux_/config/msvc_typename.hpp +3 -3
  520. data/ext/boost/mpl/aux_/config/nttp.hpp +3 -3
  521. data/ext/boost/mpl/aux_/config/overload_resolution.hpp +3 -3
  522. data/ext/boost/mpl/aux_/config/pp_counter.hpp +3 -3
  523. data/ext/boost/mpl/aux_/config/preprocessor.hpp +4 -4
  524. data/ext/boost/mpl/aux_/config/static_constant.hpp +3 -3
  525. data/ext/boost/mpl/aux_/config/ttp.hpp +4 -4
  526. data/ext/boost/mpl/aux_/config/use_preprocessed.hpp +3 -3
  527. data/ext/boost/mpl/aux_/config/workaround.hpp +3 -3
  528. data/ext/boost/mpl/aux_/full_lambda.hpp +3 -3
  529. data/ext/boost/mpl/aux_/has_apply.hpp +3 -3
  530. data/ext/boost/mpl/aux_/has_type.hpp +3 -3
  531. data/ext/boost/mpl/aux_/include_preprocessed.hpp +3 -3
  532. data/ext/boost/mpl/aux_/integral_wrapper.hpp +3 -3
  533. data/ext/boost/mpl/aux_/lambda_arity_param.hpp +3 -3
  534. data/ext/boost/mpl/aux_/lambda_support.hpp +4 -4
  535. data/ext/boost/mpl/aux_/msvc_never_true.hpp +3 -3
  536. data/ext/boost/mpl/aux_/na.hpp +3 -3
  537. data/ext/boost/mpl/aux_/na_assert.hpp +3 -3
  538. data/ext/boost/mpl/aux_/na_fwd.hpp +3 -3
  539. data/ext/boost/mpl/aux_/na_spec.hpp +3 -3
  540. data/ext/boost/mpl/aux_/nested_type_wknd.hpp +3 -3
  541. data/ext/boost/mpl/aux_/nttp_decl.hpp +3 -3
  542. data/ext/boost/mpl/aux_/preprocessor/def_params_tail.hpp +3 -3
  543. data/ext/boost/mpl/aux_/preprocessor/enum.hpp +3 -3
  544. data/ext/boost/mpl/aux_/preprocessor/filter_params.hpp +3 -3
  545. data/ext/boost/mpl/aux_/preprocessor/params.hpp +3 -3
  546. data/ext/boost/mpl/aux_/preprocessor/sub.hpp +3 -3
  547. data/ext/boost/mpl/aux_/static_cast.hpp +3 -3
  548. data/ext/boost/mpl/aux_/template_arity.hpp +3 -3
  549. data/ext/boost/mpl/aux_/template_arity_fwd.hpp +3 -3
  550. data/ext/boost/mpl/aux_/type_wrapper.hpp +3 -3
  551. data/ext/boost/mpl/aux_/value_wknd.hpp +3 -3
  552. data/ext/boost/mpl/aux_/yes_no.hpp +3 -3
  553. data/ext/boost/mpl/bind.hpp +3 -3
  554. data/ext/boost/mpl/bind_fwd.hpp +3 -3
  555. data/ext/boost/mpl/bool.hpp +3 -3
  556. data/ext/boost/mpl/bool_fwd.hpp +3 -3
  557. data/ext/boost/mpl/eval_if.hpp +3 -3
  558. data/ext/boost/mpl/has_xxx.hpp +10 -8
  559. data/ext/boost/mpl/identity.hpp +3 -3
  560. data/ext/boost/mpl/if.hpp +3 -3
  561. data/ext/boost/mpl/int.hpp +3 -3
  562. data/ext/boost/mpl/int_fwd.hpp +3 -3
  563. data/ext/boost/mpl/integral_c.hpp +3 -3
  564. data/ext/boost/mpl/integral_c_fwd.hpp +3 -3
  565. data/ext/boost/mpl/integral_c_tag.hpp +3 -3
  566. data/ext/boost/mpl/lambda.hpp +3 -3
  567. data/ext/boost/mpl/lambda_fwd.hpp +3 -3
  568. data/ext/boost/mpl/limits/arity.hpp +3 -3
  569. data/ext/boost/mpl/logical.hpp +3 -3
  570. data/ext/boost/mpl/next.hpp +3 -3
  571. data/ext/boost/mpl/next_prior.hpp +3 -3
  572. data/ext/boost/mpl/not.hpp +3 -3
  573. data/ext/boost/mpl/or.hpp +3 -3
  574. data/ext/boost/mpl/placeholders.hpp +3 -3
  575. data/ext/boost/mpl/protect.hpp +3 -3
  576. data/ext/boost/mpl/quote.hpp +18 -7
  577. data/ext/boost/mpl/size_t.hpp +3 -3
  578. data/ext/boost/mpl/size_t_fwd.hpp +3 -3
  579. data/ext/boost/mpl/void.hpp +3 -3
  580. data/ext/boost/mpl/void_fwd.hpp +3 -3
  581. data/ext/boost/non_type.hpp +27 -27
  582. data/ext/boost/operators.hpp +51 -18
  583. data/ext/boost/preprocessor/arithmetic/detail/div_base.hpp +61 -0
  584. data/ext/boost/preprocessor/arithmetic/mod.hpp +39 -0
  585. data/ext/boost/preprocessor/comparison/less_equal.hpp +39 -0
  586. data/ext/boost/preprocessor/control/deduce_d.hpp +22 -0
  587. data/ext/boost/preprocessor/logical/not.hpp +30 -0
  588. data/ext/boost/preprocessor/seq/cat.hpp +48 -0
  589. data/ext/boost/preprocessor/seq/fold_left.hpp +1070 -0
  590. data/ext/boost/preprocessor/seq/transform.hpp +48 -0
  591. data/ext/boost/range/as_literal.hpp +10 -14
  592. data/ext/boost/range/begin.hpp +4 -4
  593. data/ext/boost/range/detail/implementation_help.hpp +4 -0
  594. data/ext/boost/range/end.hpp +4 -4
  595. data/ext/boost/range/iterator_range.hpp +31 -15
  596. data/ext/boost/ref.hpp +12 -1
  597. data/ext/boost/scoped_array.hpp +16 -0
  598. data/ext/boost/scoped_ptr.hpp +16 -0
  599. data/ext/boost/shared_ptr.hpp +2 -602
  600. data/ext/boost/{detail → smart_ptr}/bad_weak_ptr.hpp +4 -4
  601. data/ext/boost/{detail → smart_ptr/detail}/atomic_count.hpp +14 -19
  602. data/ext/boost/{detail → smart_ptr/detail}/atomic_count_gcc.hpp +13 -9
  603. data/ext/boost/{detail → smart_ptr/detail}/atomic_count_gcc_x86.hpp +5 -12
  604. data/ext/boost/{detail → smart_ptr/detail}/atomic_count_pthreads.hpp +5 -5
  605. data/ext/boost/{detail → smart_ptr/detail}/atomic_count_solaris.hpp +3 -3
  606. data/ext/boost/{detail → smart_ptr/detail}/atomic_count_sync.hpp +9 -5
  607. data/ext/boost/{detail → smart_ptr/detail}/atomic_count_win32.hpp +3 -3
  608. data/ext/boost/smart_ptr/detail/operator_bool.hpp +56 -0
  609. data/ext/boost/{detail → smart_ptr/detail}/shared_count.hpp +86 -17
  610. data/ext/boost/smart_ptr/detail/sp_convertible.hpp +76 -0
  611. data/ext/boost/smart_ptr/detail/sp_counted_base.hpp +70 -0
  612. data/ext/boost/{detail → smart_ptr/detail}/sp_counted_base_acc_ia64.hpp +4 -4
  613. data/ext/boost/{detail → smart_ptr/detail}/sp_counted_base_cw_ppc.hpp +4 -4
  614. data/ext/boost/{detail → smart_ptr/detail}/sp_counted_base_cw_x86.hpp +4 -4
  615. data/ext/boost/{detail → smart_ptr/detail}/sp_counted_base_gcc_ia64.hpp +4 -4
  616. data/ext/boost/smart_ptr/detail/sp_counted_base_gcc_mips.hpp +172 -0
  617. data/ext/boost/{detail → smart_ptr/detail}/sp_counted_base_gcc_ppc.hpp +4 -4
  618. data/ext/boost/{detail → smart_ptr/detail}/sp_counted_base_gcc_sparc.hpp +7 -7
  619. data/ext/boost/{detail → smart_ptr/detail}/sp_counted_base_gcc_x86.hpp +4 -4
  620. data/ext/boost/{detail → smart_ptr/detail}/sp_counted_base_nt.hpp +4 -4
  621. data/ext/boost/{detail → smart_ptr/detail}/sp_counted_base_pt.hpp +4 -4
  622. data/ext/boost/{detail → smart_ptr/detail}/sp_counted_base_solaris.hpp +4 -4
  623. data/ext/boost/smart_ptr/detail/sp_counted_base_spin.hpp +131 -0
  624. data/ext/boost/{detail → smart_ptr/detail}/sp_counted_base_sync.hpp +8 -4
  625. data/ext/boost/{detail → smart_ptr/detail}/sp_counted_base_w32.hpp +4 -4
  626. data/ext/boost/{detail → smart_ptr/detail}/sp_counted_impl.hpp +5 -5
  627. data/ext/boost/smart_ptr/detail/sp_has_sync.hpp +49 -0
  628. data/ext/boost/smart_ptr/detail/spinlock.hpp +53 -0
  629. data/ext/boost/smart_ptr/detail/spinlock_gcc_arm.hpp +85 -0
  630. data/ext/boost/smart_ptr/detail/spinlock_nt.hpp +89 -0
  631. data/ext/boost/smart_ptr/detail/spinlock_pool.hpp +87 -0
  632. data/ext/boost/smart_ptr/detail/spinlock_pt.hpp +79 -0
  633. data/ext/boost/smart_ptr/detail/spinlock_sync.hpp +87 -0
  634. data/ext/boost/smart_ptr/detail/yield_k.hpp +149 -0
  635. data/ext/boost/smart_ptr/enable_shared_from_this.hpp +79 -0
  636. data/ext/boost/smart_ptr/scoped_array.hpp +107 -0
  637. data/ext/boost/smart_ptr/scoped_ptr.hpp +131 -0
  638. data/ext/boost/smart_ptr/shared_ptr.hpp +701 -0
  639. data/ext/boost/smart_ptr/weak_ptr.hpp +230 -0
  640. data/ext/boost/src/pthread/thread.cpp +115 -203
  641. data/ext/boost/src/tss_null.cpp +1 -1
  642. data/ext/boost/static_assert.hpp +14 -4
  643. data/ext/boost/thread.hpp +7 -2
  644. data/ext/boost/thread/barrier.hpp +63 -0
  645. data/ext/boost/thread/detail/force_cast.hpp +39 -0
  646. data/ext/boost/thread/detail/move.hpp +29 -2
  647. data/ext/boost/thread/detail/platform.hpp +3 -3
  648. data/ext/boost/thread/detail/singleton.hpp +59 -0
  649. data/ext/boost/thread/detail/thread.hpp +496 -0
  650. data/ext/boost/thread/detail/thread_group.hpp +105 -0
  651. data/ext/boost/thread/detail/thread_heap_alloc.hpp +23 -0
  652. data/ext/boost/thread/detail/thread_interruption.hpp +35 -0
  653. data/ext/boost/thread/detail/tss_hooks.hpp +82 -0
  654. data/ext/boost/thread/exceptions.hpp +174 -60
  655. data/ext/boost/thread/future.hpp +1364 -0
  656. data/ext/boost/thread/locks.hpp +899 -32
  657. data/ext/boost/thread/once.hpp +4 -0
  658. data/ext/boost/thread/pthread/condition_variable.hpp +16 -21
  659. data/ext/boost/thread/pthread/condition_variable_fwd.hpp +37 -3
  660. data/ext/boost/thread/pthread/mutex.hpp +20 -7
  661. data/ext/boost/thread/pthread/once.hpp +7 -2
  662. data/ext/boost/thread/pthread/pthread_mutex_scoped_lock.hpp +5 -1
  663. data/ext/boost/thread/pthread/recursive_mutex.hpp +22 -5
  664. data/ext/boost/thread/pthread/shared_mutex.hpp +303 -0
  665. data/ext/boost/thread/pthread/thread_data.hpp +37 -10
  666. data/ext/boost/thread/pthread/thread_heap_alloc.hpp +242 -0
  667. data/ext/boost/thread/pthread/timespec.hpp +11 -3
  668. data/ext/boost/thread/shared_mutex.hpp +21 -0
  669. data/ext/boost/thread/thread.hpp +8 -3
  670. data/ext/boost/thread/thread_time.hpp +4 -0
  671. data/ext/boost/thread/tss.hpp +106 -13
  672. data/ext/boost/thread/xtime.hpp +6 -2
  673. data/ext/boost/throw_exception.hpp +36 -7
  674. data/ext/boost/token_functions.hpp +1 -1
  675. data/ext/boost/tokenizer.hpp +1 -1
  676. data/ext/boost/type_traits/add_pointer.hpp +1 -1
  677. data/ext/boost/type_traits/add_volatile.hpp +47 -0
  678. data/ext/boost/type_traits/alignment_of.hpp +29 -1
  679. data/ext/boost/type_traits/config.hpp +1 -1
  680. data/ext/boost/type_traits/conversion_traits.hpp +1 -1
  681. data/ext/boost/type_traits/has_trivial_destructor.hpp +42 -0
  682. data/ext/boost/type_traits/intrinsics.hpp +88 -1
  683. data/ext/boost/type_traits/is_abstract.hpp +14 -5
  684. data/ext/boost/type_traits/is_arithmetic.hpp +8 -0
  685. data/ext/boost/type_traits/is_array.hpp +3 -2
  686. data/ext/boost/type_traits/is_base_and_derived.hpp +254 -0
  687. data/ext/boost/type_traits/is_base_of.hpp +51 -0
  688. data/ext/boost/type_traits/is_class.hpp +12 -0
  689. data/ext/boost/type_traits/is_const.hpp +6 -2
  690. data/ext/boost/type_traits/is_convertible.hpp +14 -2
  691. data/ext/boost/type_traits/is_enum.hpp +10 -1
  692. data/ext/boost/type_traits/is_function.hpp +11 -3
  693. data/ext/boost/type_traits/is_fundamental.hpp +45 -0
  694. data/ext/boost/type_traits/is_integral.hpp +5 -0
  695. data/ext/boost/type_traits/is_member_function_pointer.hpp +5 -3
  696. data/ext/boost/type_traits/is_member_pointer.hpp +4 -2
  697. data/ext/boost/type_traits/is_pointer.hpp +3 -1
  698. data/ext/boost/type_traits/is_reference.hpp +4 -2
  699. data/ext/boost/type_traits/is_signed.hpp +135 -0
  700. data/ext/boost/type_traits/is_unsigned.hpp +130 -0
  701. data/ext/boost/type_traits/is_void.hpp +5 -0
  702. data/ext/boost/type_traits/is_volatile.hpp +4 -2
  703. data/ext/boost/type_traits/make_unsigned.hpp +137 -0
  704. data/ext/boost/type_traits/remove_reference.hpp +1 -1
  705. data/ext/boost/type_traits/type_with_alignment.hpp +106 -1
  706. data/ext/boost/utility.hpp +2 -1
  707. data/ext/boost/utility/addressof.hpp +61 -17
  708. data/ext/boost/utility/binary.hpp +708 -0
  709. data/ext/boost/utility/enable_if.hpp +2 -2
  710. data/ext/boost/weak_ptr.hpp +4 -174
  711. data/ext/common/AbstractSpawnManager.h +110 -0
  712. data/ext/common/Account.h +175 -0
  713. data/ext/common/AccountsDatabase.cpp +81 -0
  714. data/ext/common/AccountsDatabase.h +130 -0
  715. data/ext/common/AgentBase.cpp +323 -0
  716. data/ext/common/{Version.h → AgentBase.h} +14 -6
  717. data/ext/common/AgentsStarter.cpp +154 -0
  718. data/ext/common/AgentsStarter.h +81 -0
  719. data/ext/common/AgentsStarter.hpp +619 -0
  720. data/ext/common/ApplicationPool/Client.h +796 -0
  721. data/ext/common/{ApplicationPool.h → ApplicationPool/Interface.h} +108 -18
  722. data/ext/common/ApplicationPool/Pool.h +1315 -0
  723. data/ext/common/ApplicationPool/Server.h +475 -0
  724. data/ext/common/BCrypt.cpp +343 -0
  725. data/ext/common/BCrypt.h +73 -0
  726. data/ext/common/Blowfish.c +685 -0
  727. data/ext/common/Blowfish.h +103 -0
  728. data/ext/common/Constants.h +48 -0
  729. data/ext/common/EventedClient.h +598 -0
  730. data/ext/common/EventedMessageServer.h +327 -0
  731. data/ext/common/EventedServer.h +295 -0
  732. data/ext/common/Exceptions.h +78 -1
  733. data/ext/common/FileDescriptor.h +229 -0
  734. data/ext/common/HelperAgent/BacktracesServer.h +59 -0
  735. data/ext/common/Logging.cpp +8 -9
  736. data/ext/common/Logging.h +593 -21
  737. data/ext/common/LoggingAgent/ChangeNotifier.h +63 -0
  738. data/ext/common/LoggingAgent/DataStoreId.h +177 -0
  739. data/ext/common/LoggingAgent/LoggingServer.h +1343 -0
  740. data/ext/common/LoggingAgent/Main.cpp +278 -0
  741. data/ext/common/LoggingAgent/RemoteSender.h +457 -0
  742. data/ext/common/MessageChannel.h +196 -34
  743. data/ext/common/MessageClient.h +297 -0
  744. data/ext/common/MessageReadersWriters.h +508 -0
  745. data/ext/common/MessageServer.h +575 -0
  746. data/ext/common/PoolOptions.h +279 -117
  747. data/ext/common/Process.h +255 -0
  748. data/ext/common/RandomGenerator.h +160 -0
  749. data/ext/common/ResourceLocator.h +84 -0
  750. data/ext/common/ServerInstanceDir.h +343 -0
  751. data/ext/common/Session.h +470 -0
  752. data/ext/common/SpawnManager.h +256 -201
  753. data/ext/common/StaticString.h +79 -4
  754. data/ext/common/StringListCreator.h +2 -2
  755. data/ext/common/Utils.cpp +385 -397
  756. data/ext/common/Utils.h +79 -165
  757. data/ext/common/{Base64.cpp → Utils/Base64.cpp} +0 -0
  758. data/ext/common/{Base64.h → Utils/Base64.h} +27 -1
  759. data/ext/common/Utils/BlockingQueue.h +136 -0
  760. data/ext/common/Utils/BlockingScalar.h +50 -0
  761. data/ext/common/{CachedFileStat.cpp → Utils/CachedFileStat.cpp} +1 -1
  762. data/ext/common/{CachedFileStat.h → Utils/CachedFileStat.h} +1 -1
  763. data/ext/common/{CachedFileStat.hpp → Utils/CachedFileStat.hpp} +1 -1
  764. data/ext/common/{FileChangeChecker.h → Utils/FileChangeChecker.h} +1 -1
  765. data/ext/common/Utils/FileHandleGuard.h +81 -0
  766. data/ext/common/Utils/IOUtils.cpp +754 -0
  767. data/ext/common/Utils/IOUtils.h +253 -0
  768. data/ext/common/Utils/MD5.cpp +406 -0
  769. data/ext/common/Utils/MD5.h +98 -0
  770. data/ext/common/Utils/MemZeroGuard.h +103 -0
  771. data/ext/common/Utils/ProcessMetricsCollector.h +462 -0
  772. data/ext/common/Utils/ScopeGuard.h +72 -0
  773. data/ext/common/Utils/StrIntUtils.cpp +329 -0
  774. data/ext/common/Utils/StrIntUtils.h +228 -0
  775. data/ext/common/{SystemTime.cpp → Utils/SystemTime.cpp} +5 -1
  776. data/ext/common/Utils/SystemTime.h +201 -0
  777. data/ext/common/{Timer.h → Utils/Timer.h} +58 -18
  778. data/ext/common/Utils/VariantMap.h +363 -0
  779. data/ext/common/Utils/foo.cpp +10 -0
  780. data/ext/common/Watchdog.cpp +1034 -0
  781. data/ext/google/COPYING +28 -0
  782. data/ext/google/ChangeLog +167 -0
  783. data/ext/google/dense_hash_map +310 -0
  784. data/ext/google/dense_hash_set +287 -0
  785. data/ext/google/sparse_hash_map +294 -0
  786. data/ext/google/sparse_hash_set +275 -0
  787. data/ext/google/sparsehash/densehashtable.h +1062 -0
  788. data/ext/google/sparsehash/sparseconfig.h +55 -0
  789. data/ext/google/sparsehash/sparsehashtable.h +1015 -0
  790. data/ext/google/sparsetable +1468 -0
  791. data/ext/google/type_traits.h +250 -0
  792. data/ext/libev/Changes +302 -0
  793. data/ext/libev/LICENSE +36 -0
  794. data/ext/libev/Makefile.am +18 -0
  795. data/ext/libev/Makefile.in +685 -0
  796. data/ext/libev/README +58 -0
  797. data/ext/libev/aclocal.m4 +7549 -0
  798. data/ext/libev/autogen.sh +6 -0
  799. data/ext/libev/config.guess +1526 -0
  800. data/ext/libev/config.h +122 -0
  801. data/ext/libev/config.h.in +121 -0
  802. data/ext/libev/config.sub +1658 -0
  803. data/ext/libev/configure +22156 -0
  804. data/ext/libev/configure.ac +18 -0
  805. data/ext/libev/ev++.h +800 -0
  806. data/ext/libev/ev.c +3694 -0
  807. data/ext/libev/ev.h +705 -0
  808. data/ext/libev/ev_epoll.c +228 -0
  809. data/ext/libev/ev_kqueue.c +196 -0
  810. data/ext/libev/ev_poll.c +144 -0
  811. data/ext/libev/ev_port.c +165 -0
  812. data/ext/libev/ev_select.c +308 -0
  813. data/ext/libev/ev_vars.h +187 -0
  814. data/ext/libev/ev_win32.c +153 -0
  815. data/ext/libev/ev_wrap.h +178 -0
  816. data/ext/libev/event.c +401 -0
  817. data/ext/libev/event.h +158 -0
  818. data/ext/libev/install-sh +294 -0
  819. data/ext/libev/libev.m4 +38 -0
  820. data/ext/libev/ltmain.sh +6871 -0
  821. data/ext/libev/missing +336 -0
  822. data/ext/libev/mkinstalldirs +111 -0
  823. data/ext/nginx/Configuration.c +532 -182
  824. data/ext/nginx/Configuration.h +33 -10
  825. data/ext/nginx/ContentHandler.c +188 -53
  826. data/ext/nginx/ContentHandler.h +1 -1
  827. data/ext/nginx/{HelperServer.cpp → HelperAgent.cpp} +433 -299
  828. data/ext/nginx/HttpStatusExtractor.h +1 -1
  829. data/ext/nginx/ScgiRequestParser.h +68 -11
  830. data/ext/nginx/StaticContentHandler.c +4 -1
  831. data/ext/nginx/StaticContentHandler.h +1 -1
  832. data/ext/nginx/config +5 -5
  833. data/ext/nginx/ngx_http_passenger_module.c +315 -469
  834. data/ext/nginx/ngx_http_passenger_module.h +8 -17
  835. data/ext/oxt/backtrace.cpp +49 -41
  836. data/ext/oxt/backtrace.hpp +1 -1
  837. data/ext/oxt/detail/backtrace_disabled.hpp +1 -1
  838. data/ext/oxt/detail/backtrace_enabled.hpp +16 -15
  839. data/ext/oxt/detail/spin_lock_darwin.hpp +69 -0
  840. data/ext/oxt/detail/spin_lock_gcc_x86.hpp +3 -4
  841. data/ext/oxt/detail/spin_lock_portable.hpp +1 -1
  842. data/ext/oxt/detail/spin_lock_pthreads.hpp +1 -1
  843. data/ext/oxt/detail/tracable_exception_disabled.hpp +1 -1
  844. data/ext/oxt/detail/tracable_exception_enabled.hpp +1 -1
  845. data/ext/oxt/dynamic_thread_group.hpp +195 -0
  846. data/ext/oxt/macros.hpp +1 -1
  847. data/ext/oxt/spin_lock.hpp +4 -2
  848. data/ext/oxt/system_calls.cpp +129 -13
  849. data/ext/oxt/system_calls.hpp +16 -2
  850. data/ext/oxt/thread.cpp +1 -1
  851. data/ext/oxt/thread.hpp +49 -14
  852. data/ext/oxt/tracable_exception.cpp +5 -5
  853. data/ext/oxt/tracable_exception.hpp +1 -1
  854. data/ext/phusion_passenger/extconf.rb +7 -2
  855. data/ext/phusion_passenger/native_support.c +733 -33
  856. data/{bin → helper-scripts}/passenger-spawn-server +50 -12
  857. data/helper-scripts/prespawn +63 -0
  858. data/lib/phusion_passenger.rb +113 -0
  859. data/lib/phusion_passenger/abstract_installer.rb +50 -12
  860. data/lib/phusion_passenger/abstract_request_handler.rb +432 -171
  861. data/lib/phusion_passenger/abstract_server.rb +125 -122
  862. data/lib/phusion_passenger/abstract_server_collection.rb +51 -22
  863. data/lib/phusion_passenger/admin_tools.rb +1 -1
  864. data/lib/phusion_passenger/admin_tools/memory_stats.rb +299 -0
  865. data/lib/phusion_passenger/admin_tools/server_instance.rb +334 -0
  866. data/lib/phusion_passenger/analytics_logger.rb +342 -0
  867. data/lib/phusion_passenger/{application.rb → app_process.rb} +73 -24
  868. data/lib/phusion_passenger/classic_rails/application_spawner.rb +344 -0
  869. data/lib/phusion_passenger/{railz → classic_rails}/cgi_fixed.rb +2 -2
  870. data/lib/phusion_passenger/{railz → classic_rails}/framework_spawner.rb +75 -98
  871. data/lib/phusion_passenger/{railz → classic_rails}/request_handler.rb +8 -6
  872. data/lib/phusion_passenger/classic_rails_extensions/analytics_logging/ac_base_extension.rb +65 -0
  873. data/lib/phusion_passenger/classic_rails_extensions/analytics_logging/ac_benchmarking_extension.rb +48 -0
  874. data/lib/phusion_passenger/classic_rails_extensions/analytics_logging/ac_rescue_extension.rb +59 -0
  875. data/lib/phusion_passenger/classic_rails_extensions/analytics_logging/ar_abstract_adapter_extension.rb +54 -0
  876. data/lib/phusion_passenger/classic_rails_extensions/analytics_logging/as_cache_extension.rb +130 -0
  877. data/lib/phusion_passenger/classic_rails_extensions/analytics_logging/av_benchmark_helper_extension.rb +47 -0
  878. data/lib/phusion_passenger/classic_rails_extensions/init.rb +123 -0
  879. data/lib/phusion_passenger/console_text_template.rb +1 -1
  880. data/lib/phusion_passenger/constants.rb +9 -5
  881. data/lib/phusion_passenger/debug_logging.rb +104 -0
  882. data/lib/phusion_passenger/dependencies.rb +187 -4
  883. data/lib/phusion_passenger/exceptions.rb +4 -4
  884. data/lib/phusion_passenger/html_template.rb +6 -8
  885. data/lib/phusion_passenger/message_channel.rb +137 -21
  886. data/lib/phusion_passenger/message_client.rb +173 -0
  887. data/lib/phusion_passenger/native_support.rb +108 -0
  888. data/lib/phusion_passenger/packaging.rb +82 -13
  889. data/lib/phusion_passenger/platform_info.rb +84 -475
  890. data/lib/phusion_passenger/platform_info/apache.rb +329 -0
  891. data/lib/phusion_passenger/platform_info/binary_compatibility.rb +187 -0
  892. data/lib/phusion_passenger/platform_info/compiler.rb +154 -0
  893. data/lib/phusion_passenger/{events.rb → platform_info/curl.rb} +26 -23
  894. data/lib/phusion_passenger/platform_info/documentation_tools.rb +35 -0
  895. data/lib/phusion_passenger/platform_info/linux.rb +77 -0
  896. data/lib/phusion_passenger/platform_info/operating_system.rb +51 -0
  897. data/lib/phusion_passenger/platform_info/ruby.rb +198 -0
  898. data/lib/phusion_passenger/platform_info/zlib.rb +38 -0
  899. data/lib/phusion_passenger/plugin.rb +96 -0
  900. data/lib/phusion_passenger/public_api.rb +112 -0
  901. data/lib/phusion_passenger/rack/application_spawner.rb +146 -71
  902. data/lib/phusion_passenger/rack/request_handler.rb +36 -13
  903. data/lib/phusion_passenger/rails3_extensions/init.rb +204 -0
  904. data/lib/phusion_passenger/simple_benchmarking.rb +1 -1
  905. data/lib/phusion_passenger/spawn_manager.rb +137 -141
  906. data/lib/phusion_passenger/standalone/app_finder.rb +153 -0
  907. data/lib/phusion_passenger/standalone/command.rb +237 -0
  908. data/lib/phusion_passenger/standalone/config_file.rb +119 -0
  909. data/lib/phusion_passenger/standalone/help_command.rb +57 -0
  910. data/lib/phusion_passenger/standalone/main.rb +101 -0
  911. data/lib/phusion_passenger/standalone/package_runtime_command.rb +92 -0
  912. data/lib/phusion_passenger/standalone/runtime_installer.rb +466 -0
  913. data/lib/phusion_passenger/standalone/start_command.rb +510 -0
  914. data/lib/phusion_passenger/standalone/status_command.rb +62 -0
  915. data/lib/phusion_passenger/standalone/stop_command.rb +74 -0
  916. data/lib/phusion_passenger/standalone/utils.rb +42 -0
  917. data/lib/phusion_passenger/standalone/version_command.rb +42 -0
  918. data/lib/phusion_passenger/templates/framework_init_error.html.erb +1 -1
  919. data/lib/phusion_passenger/templates/standalone/cannot_write_to_dir.txt.erb +11 -0
  920. data/lib/phusion_passenger/templates/standalone/config.erb +69 -0
  921. data/lib/phusion_passenger/templates/standalone/possible_solutions_for_download_and_extraction_problems.txt.erb +17 -0
  922. data/lib/phusion_passenger/templates/standalone/run_installer_as_root.txt.erb +8 -0
  923. data/lib/phusion_passenger/templates/standalone/welcome.txt.erb +8 -0
  924. data/lib/phusion_passenger/templates/standalone_default_root/index.html +1 -0
  925. data/lib/phusion_passenger/templates/version_not_found.html.erb +2 -2
  926. data/lib/phusion_passenger/utils.rb +476 -125
  927. data/lib/phusion_passenger/utils/file_system_watcher.rb +186 -0
  928. data/lib/phusion_passenger/utils/hosts_file_parser.rb +130 -0
  929. data/lib/phusion_passenger/utils/tmpdir.rb +70 -0
  930. data/lib/phusion_passenger/utils/unseekable_socket.rb +196 -0
  931. data/lib/phusion_passenger/wsgi/application_spawner.rb +24 -20
  932. data/lib/phusion_passenger/wsgi/request_handler.py +1 -1
  933. data/misc/copy_boost_headers.rb +36 -9
  934. data/misc/find_owner_pipe_leaks.rb +1 -1
  935. data/misc/render_error_pages.rb +1 -1
  936. data/misc/union_station_gateway.crt +32 -0
  937. data/test/config.yml.example +24 -13
  938. data/test/cxx/ApplicationPool_PoolTest.cpp +33 -0
  939. data/test/cxx/ApplicationPool_PoolTestCases.cpp +1029 -0
  940. data/test/cxx/ApplicationPool_ServerTest.cpp +308 -0
  941. data/test/cxx/ApplicationPool_Server_PoolTest.cpp +80 -0
  942. data/test/{Base64Test.cpp → cxx/Base64Test.cpp} +4 -2
  943. data/test/{CachedFileStatTest.cpp → cxx/CachedFileStatTest.cpp} +3 -3
  944. data/test/{CxxTestMain.cpp → cxx/CxxTestMain.cpp} +6 -27
  945. data/test/cxx/EventedClientTest.cpp +386 -0
  946. data/test/{FileChangeCheckerTest.cpp → cxx/FileChangeCheckerTest.cpp} +3 -5
  947. data/test/cxx/FileDescriptorTest.cpp +69 -0
  948. data/test/{HttpStatusExtractorTest.cpp → cxx/HttpStatusExtractorTest.cpp} +1 -1
  949. data/test/cxx/IOUtilsTest.cpp +398 -0
  950. data/test/cxx/LoggingTest.cpp +914 -0
  951. data/test/cxx/MessageChannelTest.cpp +672 -0
  952. data/test/cxx/MessageReadersWritersTest.cpp +574 -0
  953. data/test/cxx/MessageServerTest.cpp +383 -0
  954. data/test/{PoolOptionsTest.cpp → cxx/PoolOptionsTest.cpp} +2 -3
  955. data/test/{ScgiRequestParserTest.cpp → cxx/ScgiRequestParserTest.cpp} +53 -1
  956. data/test/cxx/ServerInstanceDirTest.cpp +186 -0
  957. data/test/cxx/SpawnManagerTest.cpp +161 -0
  958. data/test/cxx/StaticStringTest.cpp +86 -0
  959. data/test/{SystemTimeTest.cpp → cxx/SystemTimeTest.cpp} +2 -2
  960. data/test/cxx/TestSupport.cpp +166 -0
  961. data/test/cxx/TestSupport.h +254 -0
  962. data/test/cxx/UtilsTest.cpp +521 -0
  963. data/test/cxx/VariantMapTest.cpp +179 -0
  964. data/test/integration_tests/apache2_tests.rb +198 -127
  965. data/test/integration_tests/cgi_environment_spec.rb +26 -0
  966. data/test/integration_tests/mycook_spec.rb +2 -28
  967. data/test/integration_tests/nginx_tests.rb +125 -16
  968. data/test/integration_tests/spec_helper.rb +19 -0
  969. data/test/oxt/backtrace_test.cpp +19 -59
  970. data/test/oxt/counter.hpp +55 -0
  971. data/test/oxt/dynamic_thread_group_test.cpp +131 -0
  972. data/test/oxt/oxt_test_main.cpp +2 -2
  973. data/test/oxt/spin_lock_test.cpp +59 -0
  974. data/test/oxt/syscall_interruption_test.cpp +1 -1
  975. data/test/ruby/abstract_request_handler_spec.rb +346 -25
  976. data/test/ruby/abstract_server_collection_spec.rb +4 -3
  977. data/test/ruby/abstract_server_spec.rb +37 -27
  978. data/test/ruby/admin_tools_spec.rb +362 -0
  979. data/test/ruby/analytics_logger_spec.rb +253 -0
  980. data/test/ruby/{application_spec.rb → app_process_spec.rb} +14 -14
  981. data/test/ruby/classic_rails/application_spawner_spec.rb +89 -0
  982. data/test/ruby/classic_rails/framework_spawner_spec.rb +92 -0
  983. data/test/ruby/debug_logging_spec.rb +141 -0
  984. data/test/ruby/message_channel_spec.rb +51 -25
  985. data/test/ruby/rack/application_spawner_spec.rb +99 -82
  986. data/test/ruby/shared/abstract_server_spec.rb +23 -0
  987. data/test/ruby/shared/rails/analytics_logging_extensions_spec.rb +375 -0
  988. data/test/ruby/shared/spawners/classic_rails/framework_spawner_spec.rb +38 -0
  989. data/test/ruby/shared/spawners/classic_rails/lack_of_rails_gem_version_spec.rb +19 -0
  990. data/test/ruby/shared/spawners/classic_rails/spawner_spec.rb +15 -0
  991. data/test/ruby/shared/spawners/non_preloading_spawner_spec.rb +27 -0
  992. data/test/ruby/shared/spawners/preloading_spawner_spec.rb +29 -0
  993. data/test/ruby/shared/spawners/reload_all_spec.rb +36 -0
  994. data/test/ruby/shared/spawners/reload_single_spec.rb +52 -0
  995. data/test/ruby/shared/spawners/spawn_server_spec.rb +28 -0
  996. data/test/ruby/shared/spawners/spawner_spec.rb +273 -0
  997. data/test/ruby/shared/utils/pseudo_io_spec.rb +60 -0
  998. data/test/ruby/spawn_manager_spec.rb +104 -175
  999. data/test/ruby/spec_helper.rb +104 -0
  1000. data/test/ruby/utils/file_system_watcher_spec.rb +221 -0
  1001. data/test/ruby/utils/hosts_file_parser.rb +258 -0
  1002. data/test/ruby/utils/unseekable_socket_spec.rb +66 -0
  1003. data/test/ruby/utils_spec.rb +410 -59
  1004. data/test/ruby/wsgi/application_spawner_spec.rb +16 -20
  1005. data/test/stub/apache2/httpd.conf.erb +11 -6
  1006. data/test/stub/message_channel.rb +3 -1
  1007. data/test/stub/message_channel_2.rb +3 -1
  1008. data/test/stub/message_channel_3.rb +5 -3
  1009. data/test/stub/nginx/nginx.conf.erb +3 -2
  1010. data/test/stub/rails_apps/1.2/empty/Rakefile +10 -0
  1011. data/test/stub/rails_apps/1.2/empty/app/controllers/application.rb +7 -0
  1012. data/test/stub/rails_apps/{foobar → 1.2/empty}/app/helpers/application_helper.rb +0 -0
  1013. data/test/stub/rails_apps/{mycook → 1.2/empty}/config/boot.rb +3 -3
  1014. data/test/stub/rails_apps/1.2/empty/config/database.yml +31 -0
  1015. data/test/stub/rails_apps/1.2/empty/config/environment.rb +66 -0
  1016. data/test/stub/rails_apps/1.2/empty/config/environments/development.rb +21 -0
  1017. data/test/stub/rails_apps/{foobar → 1.2/empty}/config/environments/production.rb +0 -0
  1018. data/test/stub/rails_apps/1.2/empty/config/environments/staging.rb +18 -0
  1019. data/test/stub/rails_apps/1.2/empty/config/environments/test.rb +19 -0
  1020. data/test/stub/rails_apps/1.2/empty/config/routes.rb +23 -0
  1021. data/test/stub/rails_apps/1.2/empty/doc/README_FOR_APP +2 -0
  1022. data/test/stub/rails_apps/{mycook → 1.2/empty}/public/404.html +0 -0
  1023. data/test/stub/rails_apps/1.2/empty/public/500.html +30 -0
  1024. data/test/stub/rails_apps/1.2/empty/public/dispatch.cgi +10 -0
  1025. data/test/stub/rails_apps/1.2/empty/public/dispatch.fcgi +24 -0
  1026. data/test/stub/rails_apps/1.2/empty/public/dispatch.rb +10 -0
  1027. data/test/stub/rails_apps/{mycook → 1.2/empty}/public/favicon.ico +0 -0
  1028. data/test/stub/rails_apps/{mycook → 1.2/empty}/public/images/rails.png +0 -0
  1029. data/test/stub/rails_apps/1.2/empty/public/robots.txt +1 -0
  1030. data/test/stub/rails_apps/1.2/empty/script/about +3 -0
  1031. data/test/stub/rails_apps/1.2/empty/script/breakpointer +3 -0
  1032. data/test/stub/rails_apps/1.2/empty/script/console +3 -0
  1033. data/test/stub/rails_apps/1.2/empty/script/destroy +3 -0
  1034. data/test/stub/rails_apps/1.2/empty/script/generate +3 -0
  1035. data/test/stub/rails_apps/1.2/empty/script/performance/benchmarker +3 -0
  1036. data/test/stub/rails_apps/1.2/empty/script/performance/profiler +3 -0
  1037. data/test/stub/rails_apps/1.2/empty/script/plugin +3 -0
  1038. data/test/stub/rails_apps/1.2/empty/script/process/inspector +3 -0
  1039. data/test/stub/rails_apps/1.2/empty/script/process/reaper +3 -0
  1040. data/test/stub/rails_apps/1.2/empty/script/process/spawner +3 -0
  1041. data/test/stub/rails_apps/1.2/empty/script/runner +3 -0
  1042. data/test/stub/rails_apps/1.2/empty/script/server +3 -0
  1043. data/test/stub/rails_apps/1.2/empty/test/test_helper.rb +28 -0
  1044. data/test/stub/rails_apps/2.0/empty/Rakefile +10 -0
  1045. data/test/stub/rails_apps/2.0/empty/app/controllers/application.rb +10 -0
  1046. data/test/stub/rails_apps/{mycook → 2.0/empty}/app/helpers/application_helper.rb +0 -0
  1047. data/test/stub/rails_apps/{foobar → 2.0/empty}/config/boot.rb +3 -3
  1048. data/test/stub/rails_apps/2.0/empty/config/database.yml +31 -0
  1049. data/test/stub/rails_apps/2.0/empty/config/environment.rb +59 -0
  1050. data/test/stub/rails_apps/{mycook → 2.0/empty}/config/environments/development.rb +1 -1
  1051. data/test/stub/rails_apps/2.0/empty/config/environments/production.rb +18 -0
  1052. data/test/stub/rails_apps/2.0/empty/config/environments/staging.rb +18 -0
  1053. data/test/stub/rails_apps/2.0/empty/config/environments/test.rb +22 -0
  1054. data/test/stub/rails_apps/{foobar → 2.0/empty}/config/initializers/inflections.rb +0 -0
  1055. data/test/stub/rails_apps/{foobar → 2.0/empty}/config/initializers/mime_types.rb +0 -0
  1056. data/test/stub/rails_apps/{foobar → 2.0/empty}/config/routes.rb +0 -0
  1057. data/test/stub/rails_apps/2.0/empty/doc/README_FOR_APP +2 -0
  1058. data/test/stub/rails_apps/2.0/empty/public/404.html +30 -0
  1059. data/test/stub/rails_apps/{mycook → 2.0/empty}/public/422.html +0 -0
  1060. data/test/stub/rails_apps/{mycook → 2.0/empty}/public/500.html +0 -0
  1061. data/test/stub/rails_apps/2.0/empty/public/dispatch.cgi +10 -0
  1062. data/test/stub/rails_apps/2.0/empty/public/dispatch.fcgi +24 -0
  1063. data/test/stub/rails_apps/2.0/empty/public/dispatch.rb +10 -0
  1064. data/test/stub/rails_apps/2.0/empty/public/favicon.ico +0 -0
  1065. data/test/stub/rails_apps/2.0/empty/public/images/rails.png +0 -0
  1066. data/test/stub/rails_apps/{mycook → 2.0/empty}/public/robots.txt +0 -0
  1067. data/test/stub/rails_apps/2.0/empty/script/about +3 -0
  1068. data/test/stub/rails_apps/2.0/empty/script/console +3 -0
  1069. data/test/stub/rails_apps/2.0/empty/script/destroy +3 -0
  1070. data/test/stub/rails_apps/2.0/empty/script/generate +3 -0
  1071. data/test/stub/rails_apps/2.0/empty/script/performance/benchmarker +3 -0
  1072. data/test/stub/rails_apps/2.0/empty/script/performance/profiler +3 -0
  1073. data/test/stub/rails_apps/2.0/empty/script/performance/request +3 -0
  1074. data/test/stub/rails_apps/2.0/empty/script/plugin +3 -0
  1075. data/test/stub/rails_apps/2.0/empty/script/process/inspector +3 -0
  1076. data/test/stub/rails_apps/2.0/empty/script/process/reaper +3 -0
  1077. data/test/stub/rails_apps/2.0/empty/script/process/spawner +3 -0
  1078. data/test/stub/rails_apps/2.0/empty/script/runner +3 -0
  1079. data/test/stub/rails_apps/2.0/empty/script/server +3 -0
  1080. data/test/stub/rails_apps/2.0/empty/test/test_helper.rb +38 -0
  1081. data/test/stub/rails_apps/2.2/empty/Rakefile +10 -0
  1082. data/test/stub/rails_apps/2.2/empty/app/controllers/application.rb +15 -0
  1083. data/test/stub/rails_apps/2.2/empty/app/helpers/application_helper.rb +3 -0
  1084. data/test/stub/rails_apps/2.2/empty/config/boot.rb +109 -0
  1085. data/test/stub/rails_apps/2.2/empty/config/database.yml +31 -0
  1086. data/test/stub/rails_apps/2.2/empty/config/environment.rb +75 -0
  1087. data/test/stub/rails_apps/{foobar → 2.2/empty}/config/environments/development.rb +0 -0
  1088. data/test/stub/rails_apps/2.2/empty/config/environments/production.rb +24 -0
  1089. data/test/stub/rails_apps/2.2/empty/config/environments/staging.rb +24 -0
  1090. data/test/stub/rails_apps/2.2/empty/config/environments/test.rb +22 -0
  1091. data/test/stub/rails_apps/2.2/empty/config/initializers/inflections.rb +10 -0
  1092. data/test/stub/rails_apps/{mycook → 2.2/empty}/config/initializers/mime_types.rb +0 -0
  1093. data/test/stub/rails_apps/2.2/empty/config/initializers/new_rails_defaults.rb +17 -0
  1094. data/test/stub/rails_apps/2.2/empty/config/locales/en.yml +5 -0
  1095. data/test/stub/rails_apps/2.2/empty/config/routes.rb +43 -0
  1096. data/test/stub/rails_apps/2.2/empty/doc/README_FOR_APP +5 -0
  1097. data/test/stub/rails_apps/2.2/empty/public/404.html +30 -0
  1098. data/test/stub/rails_apps/2.2/empty/public/422.html +30 -0
  1099. data/test/stub/rails_apps/2.2/empty/public/500.html +33 -0
  1100. data/test/stub/rails_apps/2.2/empty/public/dispatch.cgi +10 -0
  1101. data/test/stub/rails_apps/2.2/empty/public/dispatch.fcgi +24 -0
  1102. data/test/stub/rails_apps/2.2/empty/public/dispatch.rb +10 -0
  1103. data/test/stub/rails_apps/2.2/empty/public/favicon.ico +0 -0
  1104. data/test/stub/rails_apps/2.2/empty/public/images/rails.png +0 -0
  1105. data/test/stub/rails_apps/2.2/empty/public/robots.txt +5 -0
  1106. data/test/stub/rails_apps/2.2/empty/script/about +4 -0
  1107. data/test/stub/rails_apps/2.2/empty/script/console +3 -0
  1108. data/test/stub/rails_apps/2.2/empty/script/dbconsole +3 -0
  1109. data/test/stub/rails_apps/2.2/empty/script/destroy +3 -0
  1110. data/test/stub/rails_apps/2.2/empty/script/generate +3 -0
  1111. data/test/stub/rails_apps/2.2/empty/script/performance/benchmarker +3 -0
  1112. data/test/stub/rails_apps/2.2/empty/script/performance/profiler +3 -0
  1113. data/test/stub/rails_apps/2.2/empty/script/performance/request +3 -0
  1114. data/test/stub/rails_apps/2.2/empty/script/plugin +3 -0
  1115. data/test/stub/rails_apps/2.2/empty/script/process/inspector +3 -0
  1116. data/test/stub/rails_apps/2.2/empty/script/process/reaper +3 -0
  1117. data/test/stub/rails_apps/2.2/empty/script/process/spawner +3 -0
  1118. data/test/stub/rails_apps/2.2/empty/script/runner +3 -0
  1119. data/test/stub/rails_apps/2.2/empty/script/server +3 -0
  1120. data/test/stub/rails_apps/2.2/empty/test/performance/browsing_test.rb +9 -0
  1121. data/test/stub/rails_apps/2.2/empty/test/test_helper.rb +38 -0
  1122. data/test/stub/rails_apps/2.3/empty/Rakefile +10 -0
  1123. data/test/stub/rails_apps/2.3/empty/app/controllers/application_controller.rb +10 -0
  1124. data/test/stub/rails_apps/2.3/empty/app/helpers/application_helper.rb +3 -0
  1125. data/test/stub/rails_apps/2.3/empty/config/boot.rb +110 -0
  1126. data/test/stub/rails_apps/2.3/empty/config/database.yml +31 -0
  1127. data/test/stub/rails_apps/2.3/empty/config/environment.rb +41 -0
  1128. data/test/stub/rails_apps/2.3/empty/config/environments/development.rb +17 -0
  1129. data/test/stub/rails_apps/2.3/empty/config/environments/production.rb +28 -0
  1130. data/test/stub/rails_apps/2.3/empty/config/environments/staging.rb +28 -0
  1131. data/test/stub/rails_apps/2.3/empty/config/environments/test.rb +28 -0
  1132. data/test/stub/rails_apps/2.3/empty/config/initializers/backtrace_silencers.rb +7 -0
  1133. data/test/stub/rails_apps/2.3/empty/config/initializers/inflections.rb +10 -0
  1134. data/test/stub/rails_apps/2.3/empty/config/initializers/mime_types.rb +5 -0
  1135. data/test/stub/rails_apps/2.3/empty/config/initializers/new_rails_defaults.rb +21 -0
  1136. data/test/stub/rails_apps/2.3/empty/config/initializers/session_store.rb +15 -0
  1137. data/test/stub/rails_apps/2.3/empty/config/locales/en.yml +5 -0
  1138. data/test/stub/rails_apps/2.3/empty/config/routes.rb +43 -0
  1139. data/test/stub/rails_apps/2.3/empty/db/seeds.rb +7 -0
  1140. data/test/stub/rails_apps/2.3/empty/doc/README_FOR_APP +2 -0
  1141. data/test/stub/rails_apps/2.3/empty/public/404.html +30 -0
  1142. data/test/stub/rails_apps/2.3/empty/public/422.html +30 -0
  1143. data/test/stub/rails_apps/2.3/empty/public/500.html +30 -0
  1144. data/test/stub/rails_apps/2.3/empty/public/favicon.ico +0 -0
  1145. data/test/stub/rails_apps/2.3/empty/public/images/rails.png +0 -0
  1146. data/test/stub/rails_apps/2.3/empty/public/robots.txt +5 -0
  1147. data/test/stub/rails_apps/2.3/empty/script/about +4 -0
  1148. data/test/stub/rails_apps/2.3/empty/script/console +3 -0
  1149. data/test/stub/rails_apps/2.3/empty/script/dbconsole +3 -0
  1150. data/test/stub/rails_apps/2.3/empty/script/destroy +3 -0
  1151. data/test/stub/rails_apps/2.3/empty/script/generate +3 -0
  1152. data/test/stub/rails_apps/2.3/empty/script/performance/benchmarker +3 -0
  1153. data/test/stub/rails_apps/2.3/empty/script/performance/profiler +3 -0
  1154. data/test/stub/rails_apps/2.3/empty/script/plugin +3 -0
  1155. data/test/stub/rails_apps/2.3/empty/script/runner +3 -0
  1156. data/test/stub/rails_apps/2.3/empty/script/server +3 -0
  1157. data/test/stub/rails_apps/2.3/empty/test/performance/browsing_test.rb +9 -0
  1158. data/test/stub/rails_apps/2.3/empty/test/test_helper.rb +38 -0
  1159. data/test/stub/rails_apps/2.3/foobar/Rakefile +10 -0
  1160. data/test/stub/rails_apps/{foobar/app/controllers/application.rb → 2.3/foobar/app/controllers/application_controller.rb} +0 -0
  1161. data/test/stub/rails_apps/{foobar → 2.3/foobar}/app/controllers/bar_controller_1.rb +0 -0
  1162. data/test/stub/rails_apps/{foobar → 2.3/foobar}/app/controllers/bar_controller_2.rb +0 -0
  1163. data/test/stub/rails_apps/{foobar → 2.3/foobar}/app/controllers/foo_controller.rb +0 -0
  1164. data/test/stub/rails_apps/2.3/foobar/app/helpers/application_helper.rb +3 -0
  1165. data/test/stub/rails_apps/2.3/foobar/config/boot.rb +110 -0
  1166. data/test/stub/rails_apps/{foobar → 2.3/foobar}/config/database.yml +0 -0
  1167. data/test/stub/rails_apps/{foobar → 2.3/foobar}/config/environment.rb +1 -1
  1168. data/test/stub/rails_apps/2.3/foobar/config/environments/development.rb +17 -0
  1169. data/test/stub/rails_apps/2.3/foobar/config/environments/production.rb +18 -0
  1170. data/test/stub/rails_apps/2.3/foobar/config/environments/staging.rb +18 -0
  1171. data/test/stub/rails_apps/{mycook → 2.3/foobar}/config/initializers/inflections.rb +0 -0
  1172. data/test/stub/rails_apps/2.3/foobar/config/initializers/mime_types.rb +5 -0
  1173. data/test/stub/rails_apps/2.3/foobar/config/routes.rb +35 -0
  1174. data/test/stub/rails_apps/2.3/foobar/script/about +3 -0
  1175. data/test/stub/rails_apps/2.3/foobar/script/console +3 -0
  1176. data/test/stub/rails_apps/2.3/foobar/script/dbconsole +3 -0
  1177. data/test/stub/rails_apps/2.3/foobar/script/destroy +3 -0
  1178. data/test/stub/rails_apps/2.3/foobar/script/generate +3 -0
  1179. data/test/stub/rails_apps/2.3/foobar/script/performance/benchmarker +3 -0
  1180. data/test/stub/rails_apps/2.3/foobar/script/performance/profiler +3 -0
  1181. data/test/stub/rails_apps/2.3/foobar/script/performance/request +3 -0
  1182. data/test/stub/rails_apps/2.3/foobar/script/plugin +3 -0
  1183. data/test/stub/rails_apps/2.3/foobar/script/process/inspector +3 -0
  1184. data/test/stub/rails_apps/2.3/foobar/script/process/reaper +3 -0
  1185. data/test/stub/rails_apps/2.3/foobar/script/process/spawner +3 -0
  1186. data/test/stub/rails_apps/2.3/foobar/script/runner +3 -0
  1187. data/test/stub/rails_apps/2.3/foobar/script/server +3 -0
  1188. data/test/stub/rails_apps/2.3/mycook/Rakefile +10 -0
  1189. data/test/stub/rails_apps/{mycook/app/controllers/application.rb → 2.3/mycook/app/controllers/application_controller.rb} +0 -0
  1190. data/test/stub/rails_apps/{mycook → 2.3/mycook}/app/controllers/recipes_controller.rb +0 -0
  1191. data/test/stub/rails_apps/{mycook → 2.3/mycook}/app/controllers/uploads_controller.rb +0 -0
  1192. data/test/stub/rails_apps/{mycook → 2.3/mycook}/app/controllers/welcome_controller.rb +0 -0
  1193. data/test/stub/rails_apps/2.3/mycook/app/helpers/application_helper.rb +3 -0
  1194. data/test/stub/rails_apps/{mycook → 2.3/mycook}/app/views/layouts/default.rhtml +0 -0
  1195. data/test/stub/rails_apps/{mycook → 2.3/mycook}/app/views/recipes/create.rhtml +0 -0
  1196. data/test/stub/rails_apps/{mycook → 2.3/mycook}/app/views/recipes/index.rhtml +0 -0
  1197. data/test/stub/rails_apps/{mycook → 2.3/mycook}/app/views/recipes/new.rhtml +0 -0
  1198. data/test/stub/rails_apps/{mycook → 2.3/mycook}/app/views/uploads/index.rhtml +0 -0
  1199. data/test/stub/rails_apps/{mycook → 2.3/mycook}/app/views/uploads/new.html.erb +0 -0
  1200. data/test/stub/rails_apps/{mycook → 2.3/mycook}/app/views/welcome/cached.rhtml +0 -0
  1201. data/test/stub/rails_apps/{mycook → 2.3/mycook}/app/views/welcome/index.rhtml +0 -0
  1202. data/test/stub/rails_apps/2.3/mycook/config/boot.rb +110 -0
  1203. data/test/stub/rails_apps/{mycook → 2.3/mycook}/config/database.yml +0 -0
  1204. data/test/stub/rails_apps/{mycook → 2.3/mycook}/config/environment.rb +1 -1
  1205. data/test/stub/rails_apps/2.3/mycook/config/environments/development.rb +18 -0
  1206. data/test/stub/rails_apps/{mycook → 2.3/mycook}/config/environments/production.rb +0 -0
  1207. data/test/stub/rails_apps/2.3/mycook/config/initializers/inflections.rb +10 -0
  1208. data/test/stub/rails_apps/2.3/mycook/config/initializers/mime_types.rb +5 -0
  1209. data/test/stub/rails_apps/{mycook → 2.3/mycook}/config/routes.rb +0 -0
  1210. data/test/stub/rails_apps/{mycook → 2.3/mycook}/log/useless.txt +0 -0
  1211. data/test/stub/rails_apps/2.3/mycook/public/404.html +30 -0
  1212. data/test/stub/rails_apps/2.3/mycook/public/422.html +30 -0
  1213. data/test/stub/rails_apps/2.3/mycook/public/500.html +30 -0
  1214. data/test/stub/rails_apps/{mycook → 2.3/mycook}/public/dispatch.cgi +0 -0
  1215. data/test/stub/rails_apps/{mycook → 2.3/mycook}/public/dispatch.fcgi +0 -0
  1216. data/test/stub/rails_apps/{mycook → 2.3/mycook}/public/dispatch.rb +1 -1
  1217. data/test/stub/rails_apps/2.3/mycook/public/favicon.ico +0 -0
  1218. data/test/stub/rails_apps/{mycook → 2.3/mycook}/public/images/angrywizard.gif +0 -0
  1219. data/test/stub/rails_apps/{mycook → 2.3/mycook}/public/images/cookbook.gif +0 -0
  1220. data/test/stub/rails_apps/{mycook → 2.3/mycook}/public/images/header.png +0 -0
  1221. data/test/stub/rails_apps/2.3/mycook/public/images/rails.png +0 -0
  1222. data/test/stub/rails_apps/{mycook → 2.3/mycook}/public/javascripts/application.js +0 -0
  1223. data/test/stub/rails_apps/{mycook → 2.3/mycook}/public/javascripts/controls.js +73 -73
  1224. data/test/stub/rails_apps/{mycook → 2.3/mycook}/public/javascripts/dragdrop.js +166 -165
  1225. data/test/stub/rails_apps/{mycook → 2.3/mycook}/public/javascripts/effects.js +174 -166
  1226. data/test/stub/rails_apps/{mycook → 2.3/mycook}/public/javascripts/prototype.js +362 -267
  1227. data/test/stub/rails_apps/2.3/mycook/public/robots.txt +5 -0
  1228. data/test/stub/rails_apps/{mycook → 2.3/mycook}/public/uploads.html +0 -0
  1229. data/test/stub/rails_apps/{mycook → 2.3/mycook}/public/welcome/cached.html +0 -0
  1230. data/test/stub/rails_apps/2.3/mycook/script/about +3 -0
  1231. data/test/stub/rails_apps/2.3/mycook/script/console +3 -0
  1232. data/test/stub/rails_apps/2.3/mycook/script/dbconsole +3 -0
  1233. data/test/stub/rails_apps/2.3/mycook/script/destroy +3 -0
  1234. data/test/stub/rails_apps/2.3/mycook/script/generate +3 -0
  1235. data/test/stub/rails_apps/2.3/mycook/script/performance/benchmarker +3 -0
  1236. data/test/stub/rails_apps/2.3/mycook/script/performance/profiler +3 -0
  1237. data/test/stub/rails_apps/2.3/mycook/script/performance/request +3 -0
  1238. data/test/stub/rails_apps/2.3/mycook/script/plugin +3 -0
  1239. data/test/stub/rails_apps/2.3/mycook/script/process/inspector +3 -0
  1240. data/test/stub/rails_apps/2.3/mycook/script/process/reaper +3 -0
  1241. data/test/stub/rails_apps/2.3/mycook/script/process/spawner +3 -0
  1242. data/test/stub/rails_apps/2.3/mycook/script/runner +3 -0
  1243. data/test/stub/rails_apps/2.3/mycook/script/server +3 -0
  1244. data/test/stub/rails_apps/{mycook → 2.3/mycook}/sites/some.site/public/uploads.html +0 -0
  1245. data/test/stub/rails_apps/{mycook → 2.3/mycook}/sites/some.site/public/welcome/cached.html +0 -0
  1246. data/test/stub/rails_apps/{mycook → 2.3/mycook}/tmp/cache/useless.txt +0 -0
  1247. data/test/stub/rails_apps/{mycook → 2.3/mycook}/tmp/pids/useless.txt +0 -0
  1248. data/test/stub/rails_apps/{mycook → 2.3/mycook}/tmp/sessions/useless.txt +0 -0
  1249. data/test/stub/rails_apps/{mycook → 2.3/mycook}/tmp/sockets/useless.txt +0 -0
  1250. data/test/stub/rails_apps/3.0/empty/Gemfile +22 -0
  1251. data/test/stub/rails_apps/3.0/empty/Rakefile +10 -0
  1252. data/test/stub/rails_apps/3.0/empty/app/controllers/application_controller.rb +4 -0
  1253. data/test/stub/rails_apps/3.0/empty/app/helpers/application_helper.rb +2 -0
  1254. data/test/stub/rails_apps/3.0/empty/app/views/layouts/application.html.erb +14 -0
  1255. data/test/stub/rails_apps/3.0/empty/config.ru +4 -0
  1256. data/test/stub/rails_apps/3.0/empty/config/application.rb +48 -0
  1257. data/test/stub/rails_apps/3.0/empty/config/boot.rb +13 -0
  1258. data/test/stub/rails_apps/3.0/empty/config/database.yml +22 -0
  1259. data/test/stub/rails_apps/3.0/empty/config/environment.rb +5 -0
  1260. data/test/stub/rails_apps/3.0/empty/config/environments/development.rb +19 -0
  1261. data/test/stub/rails_apps/3.0/empty/config/environments/production.rb +48 -0
  1262. data/test/stub/rails_apps/3.0/empty/config/environments/test.rb +32 -0
  1263. data/test/stub/rails_apps/3.0/empty/config/initializers/backtrace_silencers.rb +7 -0
  1264. data/test/stub/rails_apps/3.0/empty/config/initializers/inflections.rb +10 -0
  1265. data/test/stub/rails_apps/3.0/empty/config/initializers/mime_types.rb +5 -0
  1266. data/test/stub/rails_apps/3.0/empty/config/initializers/passenger.rb +1 -0
  1267. data/test/stub/rails_apps/3.0/empty/config/initializers/secret_token.rb +7 -0
  1268. data/test/stub/rails_apps/3.0/empty/config/initializers/session_store.rb +8 -0
  1269. data/test/stub/rails_apps/3.0/empty/config/locales/en.yml +5 -0
  1270. data/test/stub/rails_apps/3.0/empty/config/routes.rb +58 -0
  1271. data/test/stub/rails_apps/3.0/empty/db/seeds.rb +7 -0
  1272. data/test/stub/rails_apps/3.0/empty/doc/README_FOR_APP +2 -0
  1273. data/test/stub/rails_apps/3.0/empty/log/development.log +3 -0
  1274. data/test/stub/rails_apps/3.0/empty/public/404.html +26 -0
  1275. data/test/stub/rails_apps/3.0/empty/public/422.html +26 -0
  1276. data/test/stub/rails_apps/3.0/empty/public/500.html +26 -0
  1277. data/test/stub/rails_apps/3.0/empty/public/favicon.ico +0 -0
  1278. data/test/stub/rails_apps/3.0/empty/public/index.html +279 -0
  1279. data/test/stub/rails_apps/3.0/empty/public/robots.txt +5 -0
  1280. data/test/stub/rails_apps/3.0/empty/script/rails +9 -0
  1281. data/test/stub/rails_apps/3.0/empty/test/performance/browsing_test.rb +9 -0
  1282. data/test/stub/rails_apps/3.0/empty/test/test_helper.rb +13 -0
  1283. data/test/stub/spawn_server.rb +4 -2
  1284. data/test/stub/vendor_rails/minimal/actionpack/lib/action_controller.rb +3 -0
  1285. data/test/stub/vendor_rails/minimal/railties/lib/initializer.rb +7 -2
  1286. data/test/support/apache2_controller.rb +10 -2
  1287. data/test/support/nginx_controller.rb +3 -2
  1288. data/test/support/test_helper.rb +282 -46
  1289. data/test/{support → tut}/tut.h +6 -0
  1290. data/test/{support → tut}/tut_reporter.h +0 -0
  1291. metadata +824 -266
  1292. data/benchmark/ApplicationPool.cpp +0 -52
  1293. data/benchmark/accept_vs_socketpair_vs_named_pipes.rb +0 -126
  1294. data/benchmark/dispatcher.rb +0 -42
  1295. data/benchmark/overhead_of_password_checking.rb +0 -81
  1296. data/benchmark/socket_connections_vs_persistent_pipe.rb +0 -99
  1297. data/benchmark/unix_sockets_vs_pipes.rb +0 -83
  1298. data/ext/boost/LICENSE.TXT +0 -23
  1299. data/ext/boost/VERSION.TXT +0 -1
  1300. data/ext/boost/detail/sp_counted_base.hpp +0 -81
  1301. data/ext/boost/src/pthread/exceptions.cpp +0 -146
  1302. data/ext/boost/src/win32/exceptions.cpp +0 -124
  1303. data/ext/boost/src/win32/thread.cpp +0 -629
  1304. data/ext/boost/src/win32/timeconv.inl +0 -130
  1305. data/ext/boost/src/win32/tss_dll.cpp +0 -72
  1306. data/ext/boost/src/win32/tss_pe.cpp +0 -269
  1307. data/ext/boost/thread/pthread/thread.hpp +0 -339
  1308. data/ext/boost/thread/pthread/tss.hpp +0 -103
  1309. data/ext/common/Application.h +0 -511
  1310. data/ext/common/ApplicationPoolServer.h +0 -794
  1311. data/ext/common/ApplicationPoolServerExecutable.cpp +0 -743
  1312. data/ext/common/ApplicationPoolStatusReporter.h +0 -336
  1313. data/ext/common/DummySpawnManager.h +0 -108
  1314. data/ext/common/StandardApplicationPool.h +0 -821
  1315. data/ext/common/SystemTime.h +0 -88
  1316. data/lib/phusion_passenger/admin_tools/control_process.rb +0 -150
  1317. data/lib/phusion_passenger/railz/application_spawner.rb +0 -463
  1318. data/lib/phusion_passenger/templates/invalid_app_root.html.erb +0 -9
  1319. data/test/ApplicationPoolServerTest.cpp +0 -114
  1320. data/test/ApplicationPoolServer_ApplicationPoolTest.cpp +0 -33
  1321. data/test/ApplicationPoolTest.cpp +0 -599
  1322. data/test/MessageChannelTest.cpp +0 -320
  1323. data/test/SpawnManagerTest.cpp +0 -64
  1324. data/test/StandardApplicationPoolTest.cpp +0 -27
  1325. data/test/StaticStringTest.cpp +0 -51
  1326. data/test/UtilsTest.cpp +0 -257
  1327. data/test/ruby/rails/application_spawner_spec.rb +0 -159
  1328. data/test/ruby/rails/framework_spawner_spec.rb +0 -133
  1329. data/test/ruby/rails/minimal_spawner_spec.rb +0 -93
  1330. data/test/ruby/rails/spawner_error_handling_spec.rb +0 -107
  1331. data/test/ruby/rails/spawner_privilege_lowering_spec.rb +0 -97
  1332. data/test/ruby/spawn_server_spec.rb +0 -26
  1333. data/test/stub/MessageServer.dSYM/Contents/Info.plist +0 -25
  1334. data/test/stub/MessageServer.dSYM/Contents/Resources/DWARF/MessageServer +0 -0
  1335. data/test/support/Support.cpp +0 -84
  1336. data/test/support/Support.h +0 -118
  1337. data/test/support/config.rb +0 -38
  1338. data/test/support/run_rspec_tests.rb +0 -10
@@ -1,6 +1,6 @@
1
1
  /*
2
2
  * Phusion Passenger - http://www.modrails.com/
3
- * Copyright (c) 2008, 2009 Phusion
3
+ * Copyright (c) 2010 Phusion
4
4
  *
5
5
  * "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
6
6
  *
@@ -22,16 +22,17 @@
22
22
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
23
23
  * THE SOFTWARE.
24
24
  */
25
- #ifndef _PASSENGER_APPLICATION_POOL_H_
26
- #define _PASSENGER_APPLICATION_POOL_H_
25
+ #ifndef _PASSENGER_APPLICATION_POOL_INTERFACE_H_
26
+ #define _PASSENGER_APPLICATION_POOL_INTERFACE_H_
27
27
 
28
28
  #include <boost/shared_ptr.hpp>
29
29
  #include <sys/types.h>
30
30
 
31
- #include "Application.h"
32
- #include "PoolOptions.h"
31
+ #include "../Session.h"
32
+ #include "../PoolOptions.h"
33
33
 
34
34
  namespace Passenger {
35
+ namespace ApplicationPool {
35
36
 
36
37
  using namespace std;
37
38
  using namespace boost;
@@ -73,11 +74,11 @@ using namespace boost;
73
74
  *
74
75
  * // We can connect to an Application multiple times. Just make sure
75
76
  * // the previous session is closed.
76
- * session = app->connect("/home/webapps/bar")
77
+ * session = app->connect("/home/webapps/bar");
77
78
  * @endcode
78
79
  *
79
80
  * Internally, ApplicationPool::get() will keep spawned applications instances in
80
- * memory, and reuse them if possible. It wil* @throw l try to keep spawning to a minimum.
81
+ * memory, and reuse them if possible. It will try to keep spawning to a minimum.
81
82
  * Furthermore, if an application instance hasn't been used for a while, it
82
83
  * will be automatically shutdown in order to save memory. Restart requests are
83
84
  * honored: if an application has the file 'restart.txt' in its 'tmp' folder,
@@ -90,11 +91,15 @@ using namespace boost;
90
91
  * For concrete classes, see StandardApplicationPool and ApplicationPoolServer.
91
92
  * The exact pooling algorithm depends on the implementation class.
92
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
+ *
93
98
  * @ingroup Support
94
99
  */
95
- class ApplicationPool {
100
+ class Interface {
96
101
  public:
97
- virtual ~ApplicationPool() {};
102
+ virtual ~Interface() {};
98
103
 
99
104
  /**
100
105
  * Checks whether this ApplicationPool object is still connected to the
@@ -122,11 +127,12 @@ public:
122
127
  * if the pool decides that spawning a new application instance is necessary.
123
128
  * See SpawnManager and PoolOptions for details.
124
129
  * @return A session object.
125
- * @throw SpawnException An attempt was made to spawn a new application instance, but that attempt failed.
126
- * @throw BusyException The application pool is too busy right now, and cannot
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
127
132
  * satisfy the request. One should either abort, or try again later.
128
- * @throw IOException Something else went wrong.
129
- * @throw boost::thread_interrupted
133
+ * @throws SystemException Something else went wrong.
134
+ * @throws IOException Something else went wrong.
135
+ * @throws boost::thread_interrupted
130
136
  * @throws Anything thrown by options.environmentVariables->getItems().
131
137
  * @note Applications are uniquely identified with the application root
132
138
  * string. So although <tt>appRoot</tt> does not have to be absolute, it
@@ -134,23 +140,58 @@ public:
134
140
  * <tt>get("/home/../home/foo")</tt>, then ApplicationPool will think
135
141
  * they're 2 different applications, and thus will spawn 2 application instances.
136
142
  */
137
- virtual Application::SessionPtr get(const PoolOptions &options) = 0;
143
+ virtual SessionPtr get(const PoolOptions &options) = 0;
138
144
 
139
145
  /**
140
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().
141
153
  */
142
- virtual Application::SessionPtr get(const string &appRoot) {
154
+ virtual SessionPtr get(const string &appRoot) {
143
155
  return get(PoolOptions(appRoot));
144
156
  }
145
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
+
146
172
  /**
147
173
  * Clear all application instances that are currently in the pool.
148
174
  *
149
175
  * This method is used by unit tests to verify that the implementation is correct,
150
176
  * and thus should not be called directly.
177
+ *
178
+ * @throws IOException
179
+ * @throws SystemException
180
+ * @throws boost::thread_interrupted
151
181
  */
152
182
  virtual void clear() = 0;
153
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
+ */
154
195
  virtual void setMaxIdleTime(unsigned int seconds) = 0;
155
196
 
156
197
  /**
@@ -159,6 +200,10 @@ public:
159
200
  * these API docs.
160
201
  *
161
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
162
207
  */
163
208
  virtual void setMax(unsigned int max) = 0;
164
209
 
@@ -168,6 +213,10 @@ public:
168
213
  * This method exposes an implementation detail of the underlying pooling algorithm.
169
214
  * It is used by unit tests to verify that the implementation is correct,
170
215
  * and thus should not be called directly.
216
+ *
217
+ * @throws IOException
218
+ * @throws SystemException
219
+ * @throws boost::thread_interrupted
171
220
  */
172
221
  virtual unsigned int getActive() const = 0;
173
222
 
@@ -177,15 +226,36 @@ public:
177
226
  * This method exposes an implementation detail of the underlying pooling algorithm.
178
227
  * It is used by unit tests to verify that the implementation is correct,
179
228
  * and thus should not be called directly.
229
+ *
230
+ * @throws IOException
231
+ * @throws SystemException
232
+ * @throws boost::thread_interrupted
180
233
  */
181
234
  virtual unsigned int getCount() const = 0;
182
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
+
183
249
  /**
184
250
  * Set a hard limit on the number of application instances that a single application
185
251
  * may spawn in this ApplicationPool. The exact behavior depends on the used algorithm,
186
252
  * and is not specified by these API docs.
187
253
  *
188
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
189
259
  */
190
260
  virtual void setMaxPerApp(unsigned int max) = 0;
191
261
 
@@ -194,12 +264,32 @@ public:
194
264
  *
195
265
  * This method exposes an implementation detail. It is used by unit tests to verify
196
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
197
271
  */
198
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;
199
288
  };
200
289
 
201
- typedef shared_ptr<ApplicationPool> ApplicationPoolPtr;
290
+ typedef shared_ptr<Interface> Ptr;
202
291
 
203
- }; // namespace Passenger
292
+ } // namespace ApplicationPool
293
+ } // namespace Passenger
204
294
 
205
- #endif /* _PASSENGER_APPLICATION_POOL_H_ */
295
+ #endif /* _PASSENGER_APPLICATION_POOL_INTERFACE_H_ */
@@ -0,0 +1,1315 @@
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.realMemory != 0) {
487
+ result << "<real_memory>" << metrics.realMemory << "</real_memory>";
488
+ }
489
+ result << "<vmsize>" << metrics.vmsize << "</vmsize>";
490
+ result << "<process_group_id>" << metrics.processGroupId << "</process_group_id>";
491
+ result << "<command>" << escapeForXml(metrics.command) << "</command>";
492
+ }
493
+ if (includeSensitiveInformation) {
494
+ const ProcessPtr &process = processInfo->process;
495
+ const Process::SocketInfoMap *serverSockets;
496
+ Process::SocketInfoMap::const_iterator sit;
497
+
498
+ result << "<connect_password>" << process->getConnectPassword() << "</connect_password>";
499
+ result << "<server_sockets>";
500
+ serverSockets = process->getServerSockets();
501
+ for (sit = serverSockets->begin(); sit != serverSockets->end(); sit++) {
502
+ const string &name = sit->first;
503
+ const Process::SocketInfo &info = sit->second;
504
+ result << "<server_socket>";
505
+ result << "<name>" << escapeForXml(name) << "</name>";
506
+ result << "<address>" << escapeForXml(info.address) << "</address>";
507
+ result << "<type>" << escapeForXml(info.type) << "</type>";
508
+ result << "</server_socket>";
509
+ }
510
+ result << "</server_sockets>";
511
+ }
512
+ result << "</process>";
513
+ }
514
+
515
+ static void detachGroupWithoutLock(const SharedDataPtr &data, const GroupPtr &group) {
516
+ TRACE_POINT();
517
+ assert(!group->detached);
518
+
519
+ ProcessInfoList *processes = &group->processes;
520
+ ProcessInfoList::iterator list_it;
521
+
522
+ for (list_it = processes->begin(); list_it != processes->end(); list_it++) {
523
+ ProcessInfoPtr processInfo = *list_it;
524
+
525
+ if (processInfo->sessions == 0) {
526
+ data->inactiveApps.erase(processInfo->ia_iterator);
527
+ } else {
528
+ mutateActive(data, data->active - 1);
529
+ }
530
+ list_it--;
531
+ processes->erase(processInfo->iterator);
532
+ processInfo->detached = true;
533
+ mutateCount(data, data->count - 1);
534
+ }
535
+
536
+ if (group->spawning) {
537
+ UPDATE_TRACE_POINT();
538
+ group->spawnerThread->interrupt_and_join();
539
+ group->spawnerThread.reset();
540
+ group->spawning = false;
541
+ }
542
+
543
+ group->detached = true;
544
+ data->groups.erase(group->name);
545
+ }
546
+
547
+ void detachGroupWithoutLock(const GroupPtr &group) {
548
+ Pool::detachGroupWithoutLock(data, group);
549
+ }
550
+
551
+ ProcessInfoPtr selectProcess(ProcessInfoList *processes, const PoolOptions &options,
552
+ unique_lock<boost::timed_mutex> &l,
553
+ this_thread::disable_interruption &di,
554
+ this_thread::disable_syscall_interruption &dsi)
555
+ {
556
+ if (options.useGlobalQueue) {
557
+ TRACE_POINT();
558
+ waitingOnGlobalQueue++;
559
+ this_thread::restore_interruption ri(di);
560
+ this_thread::restore_syscall_interruption rsi(dsi);
561
+ globalQueuePositionBecameAvailable.wait(l);
562
+ waitingOnGlobalQueue--;
563
+ return ProcessInfoPtr();
564
+ } else {
565
+ ProcessInfoList::iterator it = processes->begin();
566
+ ProcessInfoList::iterator end = processes->end();
567
+ ProcessInfoList::iterator smallest = processes->begin();
568
+ ProcessInfoPtr processInfo;
569
+
570
+ it++;
571
+ for (; it != end; it++) {
572
+ if ((*it)->sessions < (*smallest)->sessions) {
573
+ smallest = it;
574
+ }
575
+ }
576
+ processInfo = *smallest;
577
+ processes->erase(smallest);
578
+ processes->push_back(processInfo);
579
+ processInfo->iterator = processes->end();
580
+ processInfo->iterator--;
581
+ return processInfo;
582
+ }
583
+ }
584
+
585
+ void spawnInBackground(const GroupPtr &group, const PoolOptions &options) {
586
+ assert(!group->detached);
587
+ assert(!group->spawning);
588
+ group->spawning = true;
589
+ group->spawnerThread = ptr(new oxt::thread(
590
+ boost::bind(&Pool::spawnerThreadCallback, this, group, options.own()),
591
+ "ApplicationPool background spawner",
592
+ SPAWNER_THREAD_STACK_SIZE
593
+ ));
594
+ }
595
+
596
+ void spawnerThreadCallback(GroupPtr group, PoolOptions options) {
597
+ TRACE_POINT();
598
+
599
+ while (true) {
600
+ ProcessPtr process;
601
+
602
+ try {
603
+ UPDATE_TRACE_POINT();
604
+ P_DEBUG("Background spawning a process for " << options.appRoot);
605
+ process = spawnManager->spawn(options);
606
+ } catch (const thread_interrupted &) {
607
+ UPDATE_TRACE_POINT();
608
+ interruptable_lock_guard<boost::timed_mutex> l(lock);
609
+ this_thread::disable_interruption di;
610
+ this_thread::disable_syscall_interruption dsi;
611
+ group->spawning = false;
612
+ group->spawnerThread.reset();
613
+ return;
614
+ } catch (const std::exception &e) {
615
+ UPDATE_TRACE_POINT();
616
+ P_DEBUG("Background spawning of " << options.appRoot <<
617
+ " failed; removing entire group." <<
618
+ " Error: " << e.what());
619
+ interruptable_lock_guard<boost::timed_mutex> l(lock);
620
+ this_thread::disable_interruption di;
621
+ this_thread::disable_syscall_interruption dsi;
622
+ if (!group->detached) {
623
+ group->spawning = false;
624
+ group->spawnerThread.reset();
625
+ detachGroupWithoutLock(group);
626
+ }
627
+ return;
628
+ }
629
+
630
+ UPDATE_TRACE_POINT();
631
+ interruptable_lock_guard<boost::timed_mutex> l(lock);
632
+ this_thread::disable_interruption di;
633
+ this_thread::disable_syscall_interruption dsi;
634
+ ProcessInfoPtr processInfo;
635
+
636
+ processInfo = ptr(new ProcessInfo());
637
+ processInfo->process = process;
638
+ processInfo->groupName = options.getAppGroupName();
639
+
640
+ group->processes.push_front(processInfo);
641
+ processInfo->iterator = group->processes.begin();
642
+
643
+ inactiveApps.push_back(processInfo);
644
+ processInfo->ia_iterator = inactiveApps.end();
645
+ processInfo->ia_iterator--;
646
+
647
+ group->size++;
648
+ mutateCount(count + 1);
649
+
650
+ P_ASSERT_WITH_VOID_RETURN(verifyState(),
651
+ "Background spawning: ApplicationPool state is valid:\n" <<
652
+ inspectWithoutLock());
653
+
654
+ if (group->size >= options.minProcesses
655
+ || !spawningAllowed(group, options)) {
656
+ group->spawning = false;
657
+ group->spawnerThread.reset();
658
+ return;
659
+ }
660
+ }
661
+ }
662
+
663
+ bool detachWithoutLock(const string &detachKey) {
664
+ TRACE_POINT();
665
+ GroupMap::iterator group_it;
666
+ GroupMap::iterator group_it_end = groups.end();
667
+
668
+ for (group_it = groups.begin(); group_it != group_it_end; group_it++) {
669
+ GroupPtr group = group_it->second;
670
+ ProcessInfoList &processes = group->processes;
671
+ ProcessInfoList::iterator process_info_it = processes.begin();
672
+ ProcessInfoList::iterator process_info_it_end = processes.end();
673
+
674
+ for (; process_info_it != process_info_it_end; process_info_it++) {
675
+ ProcessInfoPtr processInfo = *process_info_it;
676
+ if (processInfo->process->getDetachKey() == detachKey) {
677
+ // Found a matching process.
678
+ P_DEBUG("Detaching process " << processInfo->process->getPid());
679
+ processInfo->detached = true;
680
+ processes.erase(processInfo->iterator);
681
+ group->size--;
682
+ if (processes.empty()) {
683
+ detachGroupWithoutLock(group);
684
+ }
685
+ if (processInfo->sessions == 0) {
686
+ inactiveApps.erase(processInfo->ia_iterator);
687
+ } else {
688
+ mutateActive(active - 1);
689
+ }
690
+ mutateCount(count - 1);
691
+ return true;
692
+ }
693
+ }
694
+ }
695
+ return false;
696
+ }
697
+
698
+ void cleanerThreadMainLoop() {
699
+ this_thread::disable_syscall_interruption dsi;
700
+ unique_lock<boost::timed_mutex> l(lock);
701
+ try {
702
+ while (!destroying && !this_thread::interruption_requested()) {
703
+ if (maxIdleTime == 0) {
704
+ cleanerThreadSleeper.wait(l);
705
+ if (destroying) {
706
+ // ApplicationPool::Pool is being destroyed.
707
+ break;
708
+ } else {
709
+ // maxIdleTime changed.
710
+ continue;
711
+ }
712
+ } else {
713
+ xtime xt;
714
+ xtime_get(&xt, TIME_UTC);
715
+ xt.sec += maxIdleTime + 1;
716
+ if (cleanerThreadSleeper.timed_wait(l, xt)) {
717
+ // Condition was woken up.
718
+ if (destroying) {
719
+ // ApplicationPool::Pool is being destroyed.
720
+ break;
721
+ } else {
722
+ // maxIdleTime changed.
723
+ continue;
724
+ }
725
+ }
726
+ // Timeout: maxIdleTime + 1 seconds passed.
727
+ }
728
+
729
+ time_t now = syscalls::time(NULL);
730
+ ProcessInfoList::iterator it = inactiveApps.begin();
731
+ ProcessInfoList::iterator end_it = inactiveApps.end();
732
+ for (; it != end_it; it++) {
733
+ ProcessInfoPtr processInfo = *it;
734
+
735
+ if (now - processInfo->lastUsed > (time_t) maxIdleTime) {
736
+ ProcessPtr process = processInfo->process;
737
+ GroupPtr group = groups[processInfo->groupName];
738
+
739
+ if (group->size > group->minProcesses) {
740
+ ProcessInfoList *processes = &group->processes;
741
+
742
+ P_DEBUG("Cleaning idle process " << process->getAppRoot() <<
743
+ " (PID " << process->getPid() << ")");
744
+ P_TRACE(2, "Group size = " << group->size << ", "
745
+ "min processes = " << group->minProcesses);
746
+ processes->erase(processInfo->iterator);
747
+ processInfo->detached = true;
748
+
749
+ ProcessInfoList::iterator prev = it;
750
+ prev--;
751
+ inactiveApps.erase(it);
752
+ it = prev;
753
+
754
+ group->size--;
755
+ mutateCount(count - 1);
756
+
757
+ if (processes->empty()) {
758
+ detachGroupWithoutLock(group);
759
+ }
760
+ }
761
+ }
762
+ }
763
+ }
764
+ } catch (const std::exception &e) {
765
+ P_ERROR("Uncaught exception: " << e.what());
766
+ }
767
+ }
768
+
769
+ void analyticsCollectionThreadMainLoop() {
770
+ /* Invariant inside this thread:
771
+ * analyticsLogger != NULL
772
+ */
773
+ TRACE_POINT();
774
+ try {
775
+ syscalls::sleep(3);
776
+ while (!this_thread::interruption_requested()) {
777
+ this_thread::disable_interruption di;
778
+ this_thread::disable_syscall_interruption dsi;
779
+ vector<pid_t> pids;
780
+
781
+ // Collect all the PIDs.
782
+ {
783
+ UPDATE_TRACE_POINT();
784
+ lock_guard<boost::timed_mutex> l(lock);
785
+ GroupMap::const_iterator group_it;
786
+ GroupMap::const_iterator group_it_end = groups.end();
787
+
788
+ UPDATE_TRACE_POINT();
789
+ pids.reserve(count);
790
+ for (group_it = groups.begin(); group_it != group_it_end; group_it++) {
791
+ const GroupPtr &group = group_it->second;
792
+ const ProcessInfoList &processes = group->processes;
793
+ ProcessInfoList::const_iterator process_info_it = processes.begin();
794
+ ProcessInfoList::const_iterator process_info_it_end = processes.end();
795
+
796
+ for (; process_info_it != process_info_it_end; process_info_it++) {
797
+ const ProcessInfoPtr &processInfo = *process_info_it;
798
+ pids.push_back(processInfo->process->getPid());
799
+ }
800
+ }
801
+ }
802
+
803
+ try {
804
+ // Now collect the process metrics and store them in the
805
+ // data structures, and log the state into the analytics logs.
806
+ UPDATE_TRACE_POINT();
807
+ ProcessMetricsCollector::Map allMetrics =
808
+ processMetricsCollector.collect(pids);
809
+
810
+ UPDATE_TRACE_POINT();
811
+ lock_guard<boost::timed_mutex> l(lock);
812
+ GroupMap::iterator group_it;
813
+ GroupMap::iterator group_it_end = groups.end();
814
+
815
+ UPDATE_TRACE_POINT();
816
+ for (group_it = groups.begin(); group_it != group_it_end; group_it++) {
817
+ GroupPtr &group = group_it->second;
818
+ ProcessInfoList &processes = group->processes;
819
+ ProcessInfoList::iterator process_info_it = processes.begin();
820
+ ProcessInfoList::iterator process_info_it_end = processes.end();
821
+ AnalyticsLogPtr log;
822
+ stringstream xml;
823
+
824
+ if (group->analytics && analyticsLogger != NULL) {
825
+ log = analyticsLogger->newTransaction(group->name,
826
+ "processes", group->unionStationKey);
827
+ xml << "Processes: <processes>";
828
+ }
829
+ for (; process_info_it != process_info_it_end; process_info_it++) {
830
+ ProcessInfoPtr &processInfo = *process_info_it;
831
+ ProcessMetricsCollector::Map::const_iterator metrics_it =
832
+ allMetrics.find(processInfo->process->getPid());
833
+ if (metrics_it != allMetrics.end()) {
834
+ processInfo->metrics = metrics_it->second;
835
+ }
836
+ if (log != NULL) {
837
+ dumpProcessInfoAsXml(processInfo.get(),
838
+ false, xml);
839
+ }
840
+ }
841
+ if (log != NULL) {
842
+ xml << "</processes>";
843
+ log->message(xml.str());
844
+ }
845
+ }
846
+ } catch (const ProcessMetricsCollector::ParseException &) {
847
+ P_WARN("Unable to collect process metrics: cannot parse 'ps' output.");
848
+ } catch (const thread_interrupted &) {
849
+ throw;
850
+ } catch (const std::exception &e) {
851
+ P_WARN("Error while collecting process metrics: " << e.what());
852
+ }
853
+
854
+ pids.resize(0);
855
+
856
+ // Sleep for about 4 seconds, aligned to seconds boundary
857
+ // for saving power on laptops.
858
+ UPDATE_TRACE_POINT();
859
+ unsigned long long currentTime = SystemTime::getUsec();
860
+ unsigned long long deadline =
861
+ roundUp<unsigned long long>(currentTime, 1000000) + 4000000;
862
+ syscalls::usleep(deadline - currentTime);
863
+ }
864
+ } catch (const thread_interrupted &) {
865
+ } catch (const std::exception &e) {
866
+ P_ERROR("Uncaught exception: " << e.what());
867
+ }
868
+ }
869
+
870
+ /**
871
+ * @throws boost::thread_interrupted
872
+ * @throws SpawnException
873
+ * @throws SystemException
874
+ * @throws TimeRetrievalException Something went wrong while retrieving the system time.
875
+ * @throws Anything thrown by options.environmentVariables->getItems().
876
+ */
877
+ pair<ProcessInfoPtr, GroupPtr>
878
+ checkoutWithoutLock(unique_lock<boost::timed_mutex> &l, const PoolOptions &options) {
879
+ beginning_of_function:
880
+
881
+ TRACE_POINT();
882
+ this_thread::disable_interruption di;
883
+ this_thread::disable_syscall_interruption dsi;
884
+ const string &appRoot = options.appRoot;
885
+ const string appGroupName = options.getAppGroupName();
886
+ ProcessInfoPtr processInfo;
887
+ GroupPtr group;
888
+ ProcessInfoList *processes;
889
+
890
+ try {
891
+ GroupMap::iterator group_it = groups.find(appGroupName);
892
+
893
+ if (needsRestart(appRoot, options)) {
894
+ P_DEBUG("Restarting " << appGroupName);
895
+ spawnManager->reload(appGroupName);
896
+ if (group_it != groups.end()) {
897
+ detachGroupWithoutLock(group_it->second);
898
+ group_it = groups.end();
899
+ }
900
+ }
901
+
902
+ if (group_it != groups.end()) {
903
+ group = group_it->second;
904
+ processes = &group->processes;
905
+
906
+ if (processes->front()->sessions == 0) {
907
+ processInfo = processes->front();
908
+ processes->pop_front();
909
+ processes->push_back(processInfo);
910
+ processInfo->iterator = processes->end();
911
+ processInfo->iterator--;
912
+ inactiveApps.erase(processInfo->ia_iterator);
913
+ mutateActive(active + 1);
914
+ } else {
915
+ if (!group->spawning && spawningAllowed(group, options)) {
916
+ P_DEBUG("Spawning another process for " << appRoot <<
917
+ " in the background in order to handle the load");
918
+ spawnInBackground(group, options);
919
+ }
920
+ processInfo = selectProcess(processes, options, l, di, dsi);
921
+ if (processInfo == NULL) {
922
+ goto beginning_of_function;
923
+ }
924
+ }
925
+ } else {
926
+ P_DEBUG("Spawning a process for " << appRoot <<
927
+ " because there are none for this app group");
928
+ if (active >= max) {
929
+ UPDATE_TRACE_POINT();
930
+ this_thread::restore_interruption ri(di);
931
+ this_thread::restore_syscall_interruption rsi(dsi);
932
+ newAppGroupCreatable.wait(l);
933
+ goto beginning_of_function;
934
+ } else if (count == max) {
935
+ processInfo = inactiveApps.front();
936
+ P_DEBUG("Killing process " << processInfo->process->getPid() <<
937
+ " because an extra slot is necessary for spawning");
938
+ inactiveApps.pop_front();
939
+ processInfo->detached = true;
940
+ group = groups[processInfo->groupName];
941
+ processes = &group->processes;
942
+ processes->erase(processInfo->iterator);
943
+ if (processes->empty()) {
944
+ detachGroupWithoutLock(group);
945
+ } else {
946
+ group->size--;
947
+ }
948
+ mutateCount(count - 1);
949
+ }
950
+
951
+ UPDATE_TRACE_POINT();
952
+ processInfo = ptr(new ProcessInfo());
953
+ {
954
+ this_thread::restore_interruption ri(di);
955
+ this_thread::restore_syscall_interruption rsi(dsi);
956
+ processInfo->process = spawnManager->spawn(options);
957
+ }
958
+ processInfo->groupName = appGroupName;
959
+ processInfo->sessions = 0;
960
+ group = ptr(new Group());
961
+ group->name = appGroupName;
962
+ group->appRoot = appRoot;
963
+ group->size = 1;
964
+ groups[appGroupName] = group;
965
+ processes = &group->processes;
966
+ processes->push_back(processInfo);
967
+ processInfo->iterator = processes->end();
968
+ processInfo->iterator--;
969
+ mutateCount(count + 1);
970
+ mutateActive(active + 1);
971
+ if (options.minProcesses > 1 && spawningAllowed(group, options)) {
972
+ spawnInBackground(group, options);
973
+ }
974
+ }
975
+ } catch (const SpawnException &e) {
976
+ string message("Cannot spawn application '");
977
+ message.append(appGroupName);
978
+ message.append("': ");
979
+ message.append(e.what());
980
+ if (e.hasErrorPage()) {
981
+ throw SpawnException(message, e.getErrorPage());
982
+ } else {
983
+ throw SpawnException(message);
984
+ }
985
+ } catch (const thread_interrupted &) {
986
+ throw;
987
+ } catch (const std::exception &e) {
988
+ string message("Cannot spawn application '");
989
+ message.append(appGroupName);
990
+ message.append("': ");
991
+ message.append(e.what());
992
+ throw SpawnException(message);
993
+ }
994
+
995
+ group->maxRequests = options.maxRequests;
996
+ group->minProcesses = options.minProcesses;
997
+ group->environment = options.environment;
998
+ group->analytics = options.log != NULL;
999
+ if (group->analytics) {
1000
+ group->unionStationKey = options.log->getUnionStationKey();
1001
+ }
1002
+
1003
+ processInfo->lastUsed = time(NULL);
1004
+ processInfo->sessions++;
1005
+
1006
+ return make_pair(processInfo, group);
1007
+ }
1008
+
1009
+ /** @throws boost::thread_resource_error */
1010
+ void initialize(const AnalyticsLoggerPtr &analyticsLogger)
1011
+ {
1012
+ destroying = false;
1013
+ max = DEFAULT_MAX_POOL_SIZE;
1014
+ count = 0;
1015
+ active = 0;
1016
+ waitingOnGlobalQueue = 0;
1017
+ maxPerApp = DEFAULT_MAX_INSTANCES_PER_APP;
1018
+ maxIdleTime = DEFAULT_POOL_IDLE_TIME;
1019
+ cleanerThread = new oxt::thread(
1020
+ bind(&Pool::cleanerThreadMainLoop, this),
1021
+ "ApplicationPool cleaner",
1022
+ CLEANER_THREAD_STACK_SIZE
1023
+ );
1024
+
1025
+ if (analyticsLogger != NULL) {
1026
+ this->analyticsLogger = analyticsLogger;
1027
+ analyticsCollectionThread = new oxt::thread(
1028
+ bind(&Pool::analyticsCollectionThreadMainLoop, this),
1029
+ "ApplicationPool analytics collector",
1030
+ ANALYTICS_COLLECTION_THREAD_STACK_SIZE
1031
+ );
1032
+ } else {
1033
+ analyticsCollectionThread = NULL;
1034
+ }
1035
+ }
1036
+
1037
+ public:
1038
+ /**
1039
+ * Create a new ApplicationPool::Pool object, and initialize it with a
1040
+ * SpawnManager. The arguments here are all passed to the SpawnManager
1041
+ * constructor.
1042
+ *
1043
+ * @throws SystemException An error occured while trying to setup the spawn server.
1044
+ * @throws IOException The specified log file could not be opened.
1045
+ * @throws boost::thread_resource_error Cannot spawn a new thread.
1046
+ */
1047
+ Pool(const string &spawnServerCommand,
1048
+ const ServerInstanceDir::GenerationPtr &generation,
1049
+ const AccountsDatabasePtr &accountsDatabase = AccountsDatabasePtr(),
1050
+ const string &rubyCommand = "ruby",
1051
+ const AnalyticsLoggerPtr &analyticsLogger = AnalyticsLoggerPtr(),
1052
+ int logLevel = 0,
1053
+ const string &debugLogFile = ""
1054
+ ) : data(new SharedData()),
1055
+ cstat(DEFAULT_MAX_POOL_SIZE),
1056
+ lock(data->lock),
1057
+ newAppGroupCreatable(data->newAppGroupCreatable),
1058
+ globalQueuePositionBecameAvailable(data->globalQueuePositionBecameAvailable),
1059
+ groups(data->groups),
1060
+ max(data->max),
1061
+ count(data->count),
1062
+ active(data->active),
1063
+ maxPerApp(data->maxPerApp),
1064
+ inactiveApps(data->inactiveApps)
1065
+ {
1066
+ TRACE_POINT();
1067
+
1068
+ this->spawnManager = ptr(new SpawnManager(spawnServerCommand, generation,
1069
+ accountsDatabase, rubyCommand, analyticsLogger, logLevel,
1070
+ debugLogFile));
1071
+ initialize(analyticsLogger);
1072
+ }
1073
+
1074
+ /**
1075
+ * Create a new ApplicationPool::Pool object and initialize it with
1076
+ * the given spawn manager.
1077
+ *
1078
+ * @throws boost::thread_resource_error Cannot spawn a new thread.
1079
+ */
1080
+ Pool(AbstractSpawnManagerPtr spawnManager,
1081
+ const AnalyticsLoggerPtr &analyticsLogger = AnalyticsLoggerPtr()
1082
+ ) : data(new SharedData()),
1083
+ cstat(DEFAULT_MAX_POOL_SIZE),
1084
+ lock(data->lock),
1085
+ newAppGroupCreatable(data->newAppGroupCreatable),
1086
+ globalQueuePositionBecameAvailable(data->globalQueuePositionBecameAvailable),
1087
+ groups(data->groups),
1088
+ max(data->max),
1089
+ count(data->count),
1090
+ active(data->active),
1091
+ maxPerApp(data->maxPerApp),
1092
+ inactiveApps(data->inactiveApps)
1093
+ {
1094
+ TRACE_POINT();
1095
+ this->spawnManager = spawnManager;
1096
+ initialize(analyticsLogger);
1097
+ }
1098
+
1099
+ virtual ~Pool() {
1100
+ TRACE_POINT();
1101
+ this_thread::disable_interruption di;
1102
+ {
1103
+ lock_guard<boost::timed_mutex> l(lock);
1104
+ destroying = true;
1105
+ cleanerThreadSleeper.notify_one();
1106
+ while (!groups.empty()) {
1107
+ detachGroupWithoutLock(groups.begin()->second);
1108
+ }
1109
+ }
1110
+ cleanerThread->join();
1111
+ delete cleanerThread;
1112
+
1113
+ if (analyticsCollectionThread != NULL) {
1114
+ analyticsCollectionThread->interrupt_and_join();
1115
+ delete analyticsCollectionThread;
1116
+ }
1117
+ }
1118
+
1119
+ virtual SessionPtr get(const string &appRoot) {
1120
+ return ApplicationPool::Interface::get(appRoot);
1121
+ }
1122
+
1123
+ virtual SessionPtr get(const PoolOptions &options) {
1124
+ TRACE_POINT();
1125
+ unsigned int attempt = 0;
1126
+
1127
+ while (true) {
1128
+ attempt++;
1129
+
1130
+ pair<ProcessInfoPtr, GroupPtr> p;
1131
+ {
1132
+ unique_lock<boost::timed_mutex> l(lock);
1133
+ p = checkoutWithoutLock(l, options);
1134
+ P_ASSERT(verifyState(), SessionPtr(),
1135
+ "get(): ApplicationPool state is valid:\n" << inspectWithoutLock());
1136
+ }
1137
+ ProcessInfoPtr &processInfo = p.first;
1138
+
1139
+ try {
1140
+ UPDATE_TRACE_POINT();
1141
+ SessionPtr session = processInfo->process->newSession(
1142
+ SessionCloseCallback(data, processInfo),
1143
+ options.initiateSession
1144
+ );
1145
+ return session;
1146
+
1147
+ } catch (SystemException &e) {
1148
+ P_TRACE(2, "Exception occurred while connecting to checked out "
1149
+ "process " << processInfo->process->getPid() << ": " <<
1150
+ e.what());
1151
+ {
1152
+ unique_lock<boost::timed_mutex> l(lock);
1153
+ detachWithoutLock(processInfo->process->getDetachKey());
1154
+ processInfo->sessions--;
1155
+ P_ASSERT(verifyState(), SessionPtr(),
1156
+ "get(): ApplicationPool state is valid:\n" << inspectWithoutLock());
1157
+ }
1158
+ if (e.code() == EMFILE || attempt == MAX_GET_ATTEMPTS) {
1159
+ /* A "too many open files" (EMFILE) error is probably unrecoverable,
1160
+ * so propagate that immediately.
1161
+ */
1162
+ e.setBriefMessage("Cannot connect to an existing "
1163
+ "application instance for '" +
1164
+ options.appRoot +
1165
+ "'");
1166
+ throw;
1167
+ } // else retry
1168
+
1169
+ } catch (const thread_interrupted &) {
1170
+ throw;
1171
+
1172
+ } catch (std::exception &e) {
1173
+ P_TRACE(2, "Exception occurred while connecting to checked out "
1174
+ "process " << processInfo->process->getPid() << ": " <<
1175
+ e.what());
1176
+ {
1177
+ unique_lock<boost::timed_mutex> l(lock);
1178
+ detachWithoutLock(processInfo->process->getDetachKey());
1179
+ processInfo->sessions--;
1180
+ P_ASSERT(verifyState(), SessionPtr(),
1181
+ "get(): ApplicationPool state is valid:\n" << inspectWithoutLock());
1182
+ }
1183
+ if (attempt == MAX_GET_ATTEMPTS) {
1184
+ string message("Cannot connect to an existing "
1185
+ "application instance for '");
1186
+ message.append(options.appRoot);
1187
+ message.append("': ");
1188
+ message.append(e.what());
1189
+ throw IOException(message);
1190
+ } // else retry
1191
+ }
1192
+ }
1193
+ // Never reached; shut up compiler warning
1194
+ return SessionPtr();
1195
+ }
1196
+
1197
+ virtual bool detach(const string &detachKey) {
1198
+ TRACE_POINT();
1199
+ unique_lock<boost::timed_mutex> l(lock);
1200
+ return detachWithoutLock(detachKey);
1201
+ }
1202
+
1203
+ virtual void clear() {
1204
+ lock_guard<boost::timed_mutex> l(lock);
1205
+ P_DEBUG("Clearing pool");
1206
+
1207
+ while (!groups.empty()) {
1208
+ detachGroupWithoutLock(groups.begin()->second);
1209
+ }
1210
+ newAppGroupCreatable.notify_all();
1211
+ globalQueuePositionBecameAvailable.notify_all();
1212
+
1213
+ P_ASSERT_WITH_VOID_RETURN(groups.size() == 0,
1214
+ "groups.size() == 0\n" << inspectWithoutLock());
1215
+ P_ASSERT_WITH_VOID_RETURN(inactiveApps.size() == 0,
1216
+ "inactiveApps.size() == 0\n" << inspectWithoutLock());
1217
+ P_ASSERT_WITH_VOID_RETURN(count == 0,
1218
+ "count == 0\n" << inspectWithoutLock());
1219
+ P_ASSERT_WITH_VOID_RETURN(active == 0,
1220
+ "active == 0\n" << inspectWithoutLock());
1221
+ P_ASSERT_WITH_VOID_RETURN(verifyState(),
1222
+ "ApplicationPool state is valid:\n" << inspectWithoutLock());
1223
+
1224
+ // TODO: clear cstat and fileChangeChecker, and reload all spawner servers.
1225
+ }
1226
+
1227
+ virtual void setMaxIdleTime(unsigned int seconds) {
1228
+ lock_guard<boost::timed_mutex> l(lock);
1229
+ maxIdleTime = seconds;
1230
+ cleanerThreadSleeper.notify_one();
1231
+ }
1232
+
1233
+ virtual void setMax(unsigned int max) {
1234
+ lock_guard<boost::timed_mutex> l(lock);
1235
+ mutateMax(max);
1236
+ }
1237
+
1238
+ virtual unsigned int getActive() const {
1239
+ lock_guard<boost::timed_mutex> l(lock);
1240
+ return active;
1241
+ }
1242
+
1243
+ virtual unsigned int getCount() const {
1244
+ lock_guard<boost::timed_mutex> l(lock);
1245
+ return count;
1246
+ }
1247
+
1248
+ virtual unsigned int getGlobalQueueSize() const {
1249
+ lock_guard<boost::timed_mutex> l(lock);
1250
+ return waitingOnGlobalQueue;
1251
+ }
1252
+
1253
+ virtual void setMaxPerApp(unsigned int maxPerApp) {
1254
+ lock_guard<boost::timed_mutex> l(lock);
1255
+ this->maxPerApp = maxPerApp;
1256
+ newAppGroupCreatable.notify_all();
1257
+ globalQueuePositionBecameAvailable.notify_all();
1258
+ }
1259
+
1260
+ virtual pid_t getSpawnServerPid() const {
1261
+ return spawnManager->getServerPid();
1262
+ }
1263
+
1264
+ virtual string inspect() const {
1265
+ lock_guard<boost::timed_mutex> l(lock);
1266
+ return inspectWithoutLock();
1267
+ }
1268
+
1269
+ virtual string toXml(bool includeSensitiveInformation = true) const {
1270
+ lock_guard<boost::timed_mutex> l(lock);
1271
+ stringstream result;
1272
+ GroupMap::const_iterator it;
1273
+
1274
+ result << "<?xml version=\"1.0\" encoding=\"iso8859-1\" ?>\n";
1275
+ result << "<info>";
1276
+
1277
+ result << "<active>" << toString(active) << "</active>";
1278
+ result << "<count>" << toString(count) << "</count>";
1279
+ result << "<max>" << toString(max) << "</max>";
1280
+ result << "<global_queue_size>" << toString(waitingOnGlobalQueue) << "</global_queue_size>";
1281
+
1282
+ result << "<groups>";
1283
+ for (it = groups.begin(); it != groups.end(); it++) {
1284
+ Group *group = it->second.get();
1285
+ ProcessInfoList *processes = &group->processes;
1286
+ ProcessInfoList::const_iterator lit;
1287
+
1288
+ result << "<group>";
1289
+ result << "<app_root>" << escapeForXml(group->appRoot) << "</app_root>";
1290
+ result << "<name>" << escapeForXml(group->name) << "</name>";
1291
+ result << "<environment>" << escapeForXml(group->environment) << "</environment>";
1292
+
1293
+ result << "<processes>";
1294
+ for (lit = processes->begin(); lit != processes->end(); lit++) {
1295
+ ProcessInfo *processInfo = lit->get();
1296
+ dumpProcessInfoAsXml(processInfo, includeSensitiveInformation, result);
1297
+ }
1298
+ result << "</processes>";
1299
+
1300
+ result << "</group>";
1301
+ }
1302
+ result << "</groups>";
1303
+
1304
+ result << "</info>";
1305
+ return result.str();
1306
+ }
1307
+ };
1308
+
1309
+ typedef shared_ptr<Pool> PoolPtr;
1310
+
1311
+ } // namespace ApplicationPool
1312
+ } // namespace Passenger
1313
+
1314
+ #endif /* _PASSENGER_APPLICATION_POOL_POOL_H_ */
1315
+