puma 3.12.1 → 5.6.4

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of puma might be problematic. Click here for more details.

Files changed (96) hide show
  1. checksums.yaml +4 -4
  2. data/History.md +1553 -447
  3. data/LICENSE +23 -20
  4. data/README.md +175 -63
  5. data/bin/puma-wild +3 -9
  6. data/docs/architecture.md +59 -21
  7. data/docs/compile_options.md +21 -0
  8. data/docs/deployment.md +69 -58
  9. data/docs/fork_worker.md +33 -0
  10. data/docs/images/puma-connection-flow-no-reactor.png +0 -0
  11. data/docs/images/puma-connection-flow.png +0 -0
  12. data/docs/images/puma-general-arch.png +0 -0
  13. data/docs/jungle/README.md +9 -0
  14. data/{tools → docs}/jungle/rc.d/README.md +1 -1
  15. data/{tools → docs}/jungle/rc.d/puma +2 -2
  16. data/{tools → docs}/jungle/rc.d/puma.conf +0 -0
  17. data/docs/kubernetes.md +66 -0
  18. data/docs/nginx.md +1 -1
  19. data/docs/plugins.md +22 -12
  20. data/docs/rails_dev_mode.md +28 -0
  21. data/docs/restart.md +47 -22
  22. data/docs/signals.md +13 -11
  23. data/docs/stats.md +142 -0
  24. data/docs/systemd.md +95 -120
  25. data/ext/puma_http11/PumaHttp11Service.java +2 -2
  26. data/ext/puma_http11/ext_help.h +1 -1
  27. data/ext/puma_http11/extconf.rb +51 -1
  28. data/ext/puma_http11/http11_parser.c +105 -117
  29. data/ext/puma_http11/http11_parser.h +1 -1
  30. data/ext/puma_http11/http11_parser.java.rl +22 -38
  31. data/ext/puma_http11/http11_parser.rl +4 -2
  32. data/ext/puma_http11/http11_parser_common.rl +4 -4
  33. data/ext/puma_http11/mini_ssl.c +319 -96
  34. data/ext/puma_http11/no_ssl/PumaHttp11Service.java +15 -0
  35. data/ext/puma_http11/org/jruby/puma/Http11.java +108 -116
  36. data/ext/puma_http11/org/jruby/puma/Http11Parser.java +84 -99
  37. data/ext/puma_http11/org/jruby/puma/MiniSSL.java +120 -65
  38. data/ext/puma_http11/puma_http11.c +35 -51
  39. data/lib/puma/app/status.rb +68 -49
  40. data/lib/puma/binder.rb +234 -137
  41. data/lib/puma/cli.rb +28 -18
  42. data/lib/puma/client.rb +343 -230
  43. data/lib/puma/cluster/worker.rb +173 -0
  44. data/lib/puma/cluster/worker_handle.rb +94 -0
  45. data/lib/puma/cluster.rb +247 -232
  46. data/lib/puma/commonlogger.rb +2 -2
  47. data/lib/puma/configuration.rb +61 -51
  48. data/lib/puma/const.rb +42 -21
  49. data/lib/puma/control_cli.rb +109 -67
  50. data/lib/puma/detect.rb +29 -2
  51. data/lib/puma/dsl.rb +615 -123
  52. data/lib/puma/error_logger.rb +104 -0
  53. data/lib/puma/events.rb +55 -31
  54. data/lib/puma/io_buffer.rb +7 -5
  55. data/lib/puma/jruby_restart.rb +0 -58
  56. data/lib/puma/json_serialization.rb +96 -0
  57. data/lib/puma/launcher.rb +182 -69
  58. data/lib/puma/minissl/context_builder.rb +81 -0
  59. data/lib/puma/minissl.rb +161 -61
  60. data/lib/puma/null_io.rb +13 -1
  61. data/lib/puma/plugin/tmp_restart.rb +2 -0
  62. data/lib/puma/plugin.rb +7 -13
  63. data/lib/puma/queue_close.rb +26 -0
  64. data/lib/puma/rack/builder.rb +3 -5
  65. data/lib/puma/rack/urlmap.rb +2 -0
  66. data/lib/puma/rack_default.rb +2 -0
  67. data/lib/puma/reactor.rb +85 -316
  68. data/lib/puma/request.rb +472 -0
  69. data/lib/puma/runner.rb +48 -55
  70. data/lib/puma/server.rb +303 -695
  71. data/lib/puma/single.rb +11 -67
  72. data/lib/puma/state_file.rb +47 -8
  73. data/lib/puma/systemd.rb +46 -0
  74. data/lib/puma/thread_pool.rb +132 -82
  75. data/lib/puma/util.rb +21 -7
  76. data/lib/puma.rb +54 -0
  77. data/lib/rack/handler/puma.rb +5 -6
  78. data/tools/Dockerfile +16 -0
  79. data/tools/trickletest.rb +0 -1
  80. metadata +45 -29
  81. data/ext/puma_http11/io_buffer.c +0 -155
  82. data/lib/puma/accept_nonblock.rb +0 -23
  83. data/lib/puma/compat.rb +0 -14
  84. data/lib/puma/convenient.rb +0 -25
  85. data/lib/puma/daemon_ext.rb +0 -33
  86. data/lib/puma/delegation.rb +0 -13
  87. data/lib/puma/java_io_buffer.rb +0 -47
  88. data/lib/puma/rack/backports/uri/common_193.rb +0 -33
  89. data/lib/puma/tcp_logger.rb +0 -41
  90. data/tools/jungle/README.md +0 -19
  91. data/tools/jungle/init.d/README.md +0 -61
  92. data/tools/jungle/init.d/puma +0 -421
  93. data/tools/jungle/init.d/run-puma +0 -18
  94. data/tools/jungle/upstart/README.md +0 -61
  95. data/tools/jungle/upstart/puma-manager.conf +0 -31
  96. data/tools/jungle/upstart/puma.conf +0 -69
data/lib/puma/single.rb CHANGED
@@ -13,12 +13,11 @@ module Puma
13
13
  # gets created via the `start_server` method from the `Puma::Runner` class
14
14
  # that this inherits from.
15
15
  class Single < Runner
16
+ # @!attribute [r] stats
16
17
  def stats
17
- b = @server.backlog || 0
18
- r = @server.running || 0
19
- t = @server.pool_capacity || 0
20
- m = @server.max_threads || 0
21
- %Q!{ "backlog": #{b}, "running": #{r}, "pool_capacity": #{t}, "max_threads": #{m} }!
18
+ {
19
+ started_at: @started_at.utc.iso8601
20
+ }.merge(@server.stats)
22
21
  end
23
22
 
24
23
  def restart
@@ -26,7 +25,7 @@ module Puma
26
25
  end
27
26
 
28
27
  def stop
29
- @server.stop false
28
+ @server.stop(false) if @server
30
29
  end
31
30
 
32
31
  def halt
@@ -36,67 +35,13 @@ module Puma
36
35
  def stop_blocked
37
36
  log "- Gracefully stopping, waiting for requests to finish"
38
37
  @control.stop(true) if @control
39
- @server.stop(true)
40
- end
41
-
42
- def jruby_daemon?
43
- daemon? and Puma.jruby?
44
- end
45
-
46
- def jruby_daemon_start
47
- require 'puma/jruby_restart'
48
- JRubyRestart.daemon_start(@restart_dir, @launcher.restart_args)
38
+ @server.stop(true) if @server
49
39
  end
50
40
 
51
41
  def run
52
- already_daemon = false
53
-
54
- if jruby_daemon?
55
- require 'puma/jruby_restart'
56
-
57
- if JRubyRestart.daemon?
58
- # load and bind before redirecting IO so errors show up on stdout/stderr
59
- load_and_bind
60
- redirect_io
61
- end
62
-
63
- already_daemon = JRubyRestart.daemon_init
64
- end
65
-
66
42
  output_header "single"
67
43
 
68
- if jruby_daemon?
69
- if already_daemon
70
- JRubyRestart.perm_daemonize
71
- else
72
- pid = nil
73
-
74
- Signal.trap "SIGUSR2" do
75
- log "* Started new process #{pid} as daemon..."
76
-
77
- # Must use exit! so we don't unwind and run the ensures
78
- # that will be run by the new child (such as deleting the
79
- # pidfile)
80
- exit!(true)
81
- end
82
-
83
- Signal.trap "SIGCHLD" do
84
- log "! Error starting new process as daemon, exiting"
85
- exit 1
86
- end
87
-
88
- jruby_daemon_start
89
- sleep
90
- end
91
- else
92
- if daemon?
93
- log "* Daemonizing..."
94
- Process.daemon(true)
95
- redirect_io
96
- end
97
-
98
- load_and_bind
99
- end
44
+ load_and_bind
100
45
 
101
46
  Plugins.fire_background
102
47
 
@@ -105,16 +50,15 @@ module Puma
105
50
  start_control
106
51
 
107
52
  @server = server = start_server
53
+ server_thread = server.run
108
54
 
109
- unless daemon?
110
- log "Use Ctrl-C to stop"
111
- redirect_io
112
- end
55
+ log "Use Ctrl-C to stop"
56
+ redirect_io
113
57
 
114
58
  @launcher.events.fire_on_booted!
115
59
 
116
60
  begin
117
- server.run.join
61
+ server_thread.join
118
62
  rescue Interrupt
119
63
  # Swallow it
120
64
  end
@@ -1,24 +1,63 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'yaml'
4
-
5
3
  module Puma
4
+
5
+ # Puma::Launcher uses StateFile to write a yaml file for use with Puma::ControlCLI.
6
+ #
7
+ # In previous versions of Puma, YAML was used to read/write the state file.
8
+ # Since Puma is similar to Bundler/RubyGems in that it may load before one's app
9
+ # does, minimizing the dependencies that may be shared with the app is desired.
10
+ #
11
+ # At present, it only works with numeric and string values. It is still a valid
12
+ # yaml file, and the CI tests parse it with Psych.
13
+ #
6
14
  class StateFile
15
+
16
+ ALLOWED_FIELDS = %w!control_url control_auth_token pid running_from!
17
+
18
+ # @deprecated 6.0.0
19
+ FIELDS = ALLOWED_FIELDS
20
+
7
21
  def initialize
8
22
  @options = {}
9
23
  end
10
24
 
11
- def save(path)
12
- File.write path, YAML.dump(@options)
25
+ def save(path, permission = nil)
26
+ contents = "---\n".dup
27
+ @options.each do |k,v|
28
+ next unless ALLOWED_FIELDS.include? k
29
+ case v
30
+ when Numeric
31
+ contents << "#{k}: #{v}\n"
32
+ when String
33
+ next if v.strip.empty?
34
+ contents << (k == 'running_from' || v.to_s.include?(' ') ?
35
+ "#{k}: \"#{v}\"\n" : "#{k}: #{v}\n")
36
+ end
37
+ end
38
+ if permission
39
+ File.write path, contents, mode: 'wb:UTF-8'
40
+ else
41
+ File.write path, contents, mode: 'wb:UTF-8', perm: permission
42
+ end
13
43
  end
14
44
 
15
45
  def load(path)
16
- @options = YAML.load File.read(path)
46
+ File.read(path).lines.each do |line|
47
+ next if line.start_with? '#'
48
+ k,v = line.split ':', 2
49
+ next unless v && ALLOWED_FIELDS.include?(k)
50
+ v = v.strip
51
+ @options[k] =
52
+ case v
53
+ when /\A\d+\z/ then v.to_i
54
+ when /\A\d+\.\d+\z/ then v.to_f
55
+ else v.gsub(/\A"|"\z/, '')
56
+ end
57
+ end
17
58
  end
18
59
 
19
- FIELDS = %w!control_url control_auth_token pid!
20
-
21
- FIELDS.each do |f|
60
+ ALLOWED_FIELDS.each do |f|
22
61
  define_method f do
23
62
  @options[f]
24
63
  end
@@ -0,0 +1,46 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'sd_notify'
4
+
5
+ module Puma
6
+ class Systemd
7
+ def initialize(events)
8
+ @events = events
9
+ end
10
+
11
+ def hook_events
12
+ @events.on_booted { SdNotify.ready }
13
+ @events.on_stopped { SdNotify.stopping }
14
+ @events.on_restart { SdNotify.reloading }
15
+ end
16
+
17
+ def start_watchdog
18
+ return unless SdNotify.watchdog?
19
+
20
+ ping_f = watchdog_sleep_time
21
+
22
+ log "Pinging systemd watchdog every #{ping_f.round(1)} sec"
23
+ Thread.new do
24
+ loop do
25
+ sleep ping_f
26
+ SdNotify.watchdog
27
+ end
28
+ end
29
+ end
30
+
31
+ private
32
+
33
+ def watchdog_sleep_time
34
+ usec = Integer(ENV["WATCHDOG_USEC"])
35
+
36
+ sec_f = usec / 1_000_000.0
37
+ # "It is recommended that a daemon sends a keep-alive notification message
38
+ # to the service manager every half of the time returned here."
39
+ sec_f / 2
40
+ end
41
+
42
+ def log(str)
43
+ @events.log str
44
+ end
45
+ end
46
+ end
@@ -13,7 +13,7 @@ module Puma
13
13
  # a thread pool via the `Puma::ThreadPool#<<` operator where it is stored in a `@todo` array.
14
14
  #
15
15
  # Each thread in the pool has an internal loop where it pulls a request from the `@todo` array
16
- # and proceses it.
16
+ # and processes it.
17
17
  class ThreadPool
18
18
  class ForceShutdown < RuntimeError
19
19
  end
@@ -29,7 +29,7 @@ module Puma
29
29
  # The block passed is the work that will be performed in each
30
30
  # thread.
31
31
  #
32
- def initialize(min, max, *extra, &block)
32
+ def initialize(name, min, max, *extra, &block)
33
33
  @not_empty = ConditionVariable.new
34
34
  @not_full = ConditionVariable.new
35
35
  @mutex = Mutex.new
@@ -39,6 +39,7 @@ module Puma
39
39
  @spawned = 0
40
40
  @waiting = 0
41
41
 
42
+ @name = name
42
43
  @min = Integer(min)
43
44
  @max = Integer(max)
44
45
  @block = block
@@ -47,6 +48,7 @@ module Puma
47
48
  @shutdown = false
48
49
 
49
50
  @trim_requested = 0
51
+ @out_of_band_pending = false
50
52
 
51
53
  @workers = []
52
54
 
@@ -54,17 +56,23 @@ module Puma
54
56
  @reaper = nil
55
57
 
56
58
  @mutex.synchronize do
57
- @min.times { spawn_thread }
59
+ @min.times do
60
+ spawn_thread
61
+ @not_full.wait(@mutex)
62
+ end
58
63
  end
59
64
 
60
65
  @clean_thread_locals = false
66
+ @force_shutdown = false
67
+ @shutdown_mutex = Mutex.new
61
68
  end
62
69
 
63
70
  attr_reader :spawned, :trim_requested, :waiting
64
71
  attr_accessor :clean_thread_locals
72
+ attr_accessor :out_of_band_hook # @version 5.0.0
65
73
 
66
74
  def self.clean_thread_locals
67
- Thread.current.keys.each do |key| # rubocop: disable Performance/HashEachMethods
75
+ Thread.current.keys.each do |key| # rubocop: disable Style/HashEachMethods
68
76
  Thread.current[key] = nil unless key == :__recursive_key__
69
77
  end
70
78
  end
@@ -72,13 +80,20 @@ module Puma
72
80
  # How many objects have yet to be processed by the pool?
73
81
  #
74
82
  def backlog
75
- @mutex.synchronize { @todo.size }
83
+ with_mutex { @todo.size }
76
84
  end
77
85
 
86
+ # @!attribute [r] pool_capacity
78
87
  def pool_capacity
79
88
  waiting + (@max - spawned)
80
89
  end
81
90
 
91
+ # @!attribute [r] busy_threads
92
+ # @version 5.0.0
93
+ def busy_threads
94
+ with_mutex { @spawned - @waiting + @todo.size }
95
+ end
96
+
82
97
  # :nodoc:
83
98
  #
84
99
  # Must be called with @mutex held!
@@ -87,8 +102,7 @@ module Puma
87
102
  @spawned += 1
88
103
 
89
104
  th = Thread.new(@spawned) do |spawned|
90
- # Thread name is new in Ruby 2.3
91
- Thread.current.name = 'puma %03i' % spawned if Thread.current.respond_to?(:name=)
105
+ Puma.set_thread_name '%s tp %03i' % [@name, spawned]
92
106
  todo = @todo
93
107
  block = @block
94
108
  mutex = @mutex
@@ -100,48 +114,41 @@ module Puma
100
114
  while true
101
115
  work = nil
102
116
 
103
- continue = true
104
-
105
117
  mutex.synchronize do
106
118
  while todo.empty?
107
119
  if @trim_requested > 0
108
120
  @trim_requested -= 1
109
- continue = false
121
+ @spawned -= 1
122
+ @workers.delete th
110
123
  not_full.signal
111
- break
112
- end
113
-
114
- if @shutdown
115
- continue = false
116
- break
124
+ Thread.exit
117
125
  end
118
126
 
119
127
  @waiting += 1
128
+ if @out_of_band_pending && trigger_out_of_band_hook
129
+ @out_of_band_pending = false
130
+ end
120
131
  not_full.signal
121
- not_empty.wait mutex
122
- @waiting -= 1
132
+ begin
133
+ not_empty.wait mutex
134
+ ensure
135
+ @waiting -= 1
136
+ end
123
137
  end
124
138
 
125
- work = todo.shift if continue
139
+ work = todo.shift
126
140
  end
127
141
 
128
- break unless continue
129
-
130
142
  if @clean_thread_locals
131
143
  ThreadPool.clean_thread_locals
132
144
  end
133
145
 
134
146
  begin
135
- block.call(work, *extra)
147
+ @out_of_band_pending = true if block.call(work, *extra)
136
148
  rescue Exception => e
137
149
  STDERR.puts "Error reached top of thread-pool: #{e.message} (#{e.class})"
138
150
  end
139
151
  end
140
-
141
- mutex.synchronize do
142
- @spawned -= 1
143
- @workers.delete th
144
- end
145
152
  end
146
153
 
147
154
  @workers << th
@@ -151,9 +158,32 @@ module Puma
151
158
 
152
159
  private :spawn_thread
153
160
 
161
+ # @version 5.0.0
162
+ def trigger_out_of_band_hook
163
+ return false unless out_of_band_hook && out_of_band_hook.any?
164
+
165
+ # we execute on idle hook when all threads are free
166
+ return false unless @spawned == @waiting
167
+
168
+ out_of_band_hook.each(&:call)
169
+ true
170
+ rescue Exception => e
171
+ STDERR.puts "Exception calling out_of_band_hook: #{e.message} (#{e.class})"
172
+ true
173
+ end
174
+
175
+ private :trigger_out_of_band_hook
176
+
177
+ # @version 5.0.0
178
+ def with_mutex(&block)
179
+ @mutex.owned? ?
180
+ yield :
181
+ @mutex.synchronize(&block)
182
+ end
183
+
154
184
  # Add +work+ to the todo list for a Thread to pickup and process.
155
185
  def <<(work)
156
- @mutex.synchronize do
186
+ with_mutex do
157
187
  if @shutdown
158
188
  raise "Unable to add work while shutting down"
159
189
  end
@@ -190,12 +220,12 @@ module Puma
190
220
  # request, it might not be added to the `@todo` array right away.
191
221
  # For example if a slow client has only sent a header, but not a body
192
222
  # then the `@todo` array would stay the same size as the reactor works
193
- # to try to buffer the request. In tha scenario the next call to this
223
+ # to try to buffer the request. In that scenario the next call to this
194
224
  # method would not block and another request would be added into the reactor
195
- # by the server. This would continue until a fully bufferend request
225
+ # by the server. This would continue until a fully buffered request
196
226
  # makes it through the reactor and can then be processed by the thread pool.
197
227
  def wait_until_not_full
198
- @mutex.synchronize do
228
+ with_mutex do
199
229
  while true
200
230
  return if @shutdown
201
231
 
@@ -203,20 +233,42 @@ module Puma
203
233
  # is work queued that cannot be handled by waiting
204
234
  # threads, then accept more work until we would
205
235
  # spin up the max number of threads.
206
- return if @todo.size - @waiting < @max - @spawned
236
+ return if busy_threads < @max
207
237
 
208
238
  @not_full.wait @mutex
209
239
  end
210
240
  end
211
241
  end
212
242
 
213
- # If too many threads are in the pool, tell one to finish go ahead
243
+ # @version 5.0.0
244
+ def wait_for_less_busy_worker(delay_s)
245
+ return unless delay_s && delay_s > 0
246
+
247
+ # Ruby MRI does GVL, this can result
248
+ # in processing contention when multiple threads
249
+ # (requests) are running concurrently
250
+ return unless Puma.mri?
251
+
252
+ with_mutex do
253
+ return if @shutdown
254
+
255
+ # do not delay, if we are not busy
256
+ return unless busy_threads > 0
257
+
258
+ # this will be signaled once a request finishes,
259
+ # which can happen earlier than delay
260
+ @not_full.wait @mutex, delay_s
261
+ end
262
+ end
263
+
264
+ # If there are any free threads in the pool, tell one to go ahead
214
265
  # and exit. If +force+ is true, then a trim request is requested
215
266
  # even if all threads are being utilized.
216
267
  #
217
268
  def trim(force=false)
218
- @mutex.synchronize do
219
- if (force or @waiting > 0) and @spawned - @trim_requested > @min
269
+ with_mutex do
270
+ free = @waiting - @todo.size
271
+ if (force or free > 0) and @spawned - @trim_requested > @min
220
272
  @trim_requested += 1
221
273
  @not_empty.signal
222
274
  end
@@ -226,7 +278,7 @@ module Puma
226
278
  # If there are dead threads in the pool make them go away while decreasing
227
279
  # spawned counter so that new healthy threads could be created again.
228
280
  def reap
229
- @mutex.synchronize do
281
+ with_mutex do
230
282
  dead_workers = @workers.reject(&:alive?)
231
283
 
232
284
  dead_workers.each do |worker|
@@ -240,10 +292,12 @@ module Puma
240
292
  end
241
293
  end
242
294
 
243
- class AutoTrim
244
- def initialize(pool, timeout)
295
+ class Automaton
296
+ def initialize(pool, timeout, thread_name, message)
245
297
  @pool = pool
246
298
  @timeout = timeout
299
+ @thread_name = thread_name
300
+ @message = message
247
301
  @running = false
248
302
  end
249
303
 
@@ -251,8 +305,9 @@ module Puma
251
305
  @running = true
252
306
 
253
307
  @thread = Thread.new do
308
+ Puma.set_thread_name @thread_name
254
309
  while @running
255
- @pool.trim
310
+ @pool.public_send(@message)
256
311
  sleep @timeout
257
312
  end
258
313
  end
@@ -265,44 +320,37 @@ module Puma
265
320
  end
266
321
 
267
322
  def auto_trim!(timeout=30)
268
- @auto_trim = AutoTrim.new(self, timeout)
323
+ @auto_trim = Automaton.new(self, timeout, "#{@name} threadpool trimmer", :trim)
269
324
  @auto_trim.start!
270
325
  end
271
326
 
272
- class Reaper
273
- def initialize(pool, timeout)
274
- @pool = pool
275
- @timeout = timeout
276
- @running = false
277
- end
278
-
279
- def start!
280
- @running = true
281
-
282
- @thread = Thread.new do
283
- while @running
284
- @pool.reap
285
- sleep @timeout
286
- end
287
- end
288
- end
289
-
290
- def stop
291
- @running = false
292
- @thread.wakeup
293
- end
294
- end
295
-
296
327
  def auto_reap!(timeout=5)
297
- @reaper = Reaper.new(self, timeout)
328
+ @reaper = Automaton.new(self, timeout, "#{@name} threadpool reaper", :reap)
298
329
  @reaper.start!
299
330
  end
300
331
 
332
+ # Allows ThreadPool::ForceShutdown to be raised within the
333
+ # provided block if the thread is forced to shutdown during execution.
334
+ def with_force_shutdown
335
+ t = Thread.current
336
+ @shutdown_mutex.synchronize do
337
+ raise ForceShutdown if @force_shutdown
338
+ t[:with_force_shutdown] = true
339
+ end
340
+ yield
341
+ ensure
342
+ t[:with_force_shutdown] = false
343
+ end
344
+
301
345
  # Tell all threads in the pool to exit and wait for them to finish.
346
+ # Wait +timeout+ seconds then raise +ForceShutdown+ in remaining threads.
347
+ # Next, wait an extra +grace+ seconds then force-kill remaining threads.
348
+ # Finally, wait +kill_grace+ seconds for remaining threads to exit.
302
349
  #
303
350
  def shutdown(timeout=-1)
304
- threads = @mutex.synchronize do
351
+ threads = with_mutex do
305
352
  @shutdown = true
353
+ @trim_requested = @spawned
306
354
  @not_empty.broadcast
307
355
  @not_full.broadcast
308
356
 
@@ -316,27 +364,29 @@ module Puma
316
364
  # Wait for threads to finish without force shutdown.
317
365
  threads.each(&:join)
318
366
  else
319
- # Wait for threads to finish after n attempts (+timeout+).
320
- # If threads are still running, it will forcefully kill them.
321
- timeout.times do
322
- threads.delete_if do |t|
323
- t.join 1
324
- end
325
-
326
- if threads.empty?
327
- break
328
- else
329
- sleep 1
367
+ join = ->(inner_timeout) do
368
+ start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
369
+ threads.reject! do |t|
370
+ elapsed = Process.clock_gettime(Process::CLOCK_MONOTONIC) - start
371
+ t.join inner_timeout - elapsed
330
372
  end
331
373
  end
332
374
 
333
- threads.each do |t|
334
- t.raise ForceShutdown
335
- end
375
+ # Wait +timeout+ seconds for threads to finish.
376
+ join.call(timeout)
336
377
 
337
- threads.each do |t|
338
- t.join SHUTDOWN_GRACE_TIME
378
+ # If threads are still running, raise ForceShutdown and wait to finish.
379
+ @shutdown_mutex.synchronize do
380
+ @force_shutdown = true
381
+ threads.each do |t|
382
+ t.raise ForceShutdown if t[:with_force_shutdown]
383
+ end
339
384
  end
385
+ join.call(SHUTDOWN_GRACE_TIME)
386
+
387
+ # If threads are _still_ running, forcefully kill them and wait to finish.
388
+ threads.each(&:kill)
389
+ join.call(1)
340
390
  end
341
391
 
342
392
  @spawned = 0
data/lib/puma/util.rb CHANGED
@@ -1,11 +1,6 @@
1
1
  # frozen_string_literal: true
2
- major, minor, patch = RUBY_VERSION.split('.').map { |v| v.to_i }
3
2
 
4
- if major == 1 && minor == 9 && patch == 3 && RUBY_PATCHLEVEL < 125
5
- require 'puma/rack/backports/uri/common_193'
6
- else
7
- require 'uri/common'
8
- end
3
+ require 'uri/common'
9
4
 
10
5
  module Puma
11
6
  module Util
@@ -15,6 +10,13 @@ module Puma
15
10
  IO.pipe
16
11
  end
17
12
 
13
+ # An instance method on Thread has been provided to address https://bugs.ruby-lang.org/issues/13632,
14
+ # which currently effects some older versions of Ruby: 2.2.7 2.2.8 2.2.9 2.2.10 2.3.4 2.4.1
15
+ # Additional context: https://github.com/puma/puma/pull/1345
16
+ def purge_interrupt_queue
17
+ Thread.current.purge_interrupt_queue if Thread.current.respond_to? :purge_interrupt_queue
18
+ end
19
+
18
20
  # Unescapes a URI escaped string with +encoding+. +encoding+ will be the
19
21
  # target encoding of the string returned, and it defaults to UTF-8
20
22
  if defined?(::Encoding)
@@ -28,6 +30,17 @@ module Puma
28
30
  end
29
31
  module_function :unescape
30
32
 
33
+ # @version 5.0.0
34
+ def nakayoshi_gc(events)
35
+ events.log "! Promoting existing objects to old generation..."
36
+ 4.times { GC.start(full_mark: false) }
37
+ if GC.respond_to?(:compact)
38
+ events.log "! Compacting..."
39
+ GC.compact
40
+ end
41
+ events.log "! Friendly fork preparation complete."
42
+ end
43
+
31
44
  DEFAULT_SEP = /[&;] */n
32
45
 
33
46
  # Stolen from Mongrel, with some small modifications:
@@ -55,7 +68,7 @@ module Puma
55
68
  end
56
69
  end
57
70
 
58
- return params
71
+ params
59
72
  end
60
73
 
61
74
  # A case-insensitive Hash that preserves the original case of a
@@ -77,6 +90,7 @@ module Puma
77
90
  end
78
91
  end
79
92
 
93
+ # @!attribute [r] to_hash
80
94
  def to_hash
81
95
  hash = {}
82
96
  each { |k,v| hash[k] = v }