Merge remote-tracking branch 'secondlife/release/maint-c' into maint-c

1 files changed, 37 insertions, 0 deletions

diff --git a/indra/newview/scripts/lua/require/ErrorQueue.lua b/indra/newview/scripts/lua/require/ErrorQueue.lua
new file mode 100644
index 0000000000..e6e9a5ef48
--- /dev/null
+++ b/indra/newview/scripts/lua/require/ErrorQueue.lua
@@ -0,0 +1,37 @@
+-- ErrorQueue isa WaitQueue with the added feature that a producer can push an
+-- error through the queue. Once that error is dequeued, every consumer will
+-- raise that error.
+
+local WaitQueue = require('WaitQueue')
+local function dbg(...) end
+-- local dbg = require('printf')
+local util = require('util')
+
+local ErrorQueue = WaitQueue()
+
+util.classctor(ErrorQueue)
+
+function ErrorQueue:Error(message)
+    -- Setting Error() is a marker, like closing the queue. Once we reach the
+    -- error, every subsequent Dequeue() call will raise the same error.
+    dbg('Setting self._closed to %q', message)
+    self._closed = message
+    self:_wake_waiters()
+end
+
+function ErrorQueue:Dequeue()
+    local value = WaitQueue.Dequeue(self)
+    dbg('ErrorQueue:Dequeue: base Dequeue() got %s', value)
+    if value ~= nil then
+        -- queue not yet closed, show caller
+        return value
+    end
+    if self._closed == true then
+        -- WaitQueue:close() sets true: queue has only been closed, tell caller
+        return nil
+    end
+    -- self._closed is a message set by Error()
+    error(self._closed)
+end
+
+return ErrorQueue