Make FileReader's throttle controller a supplement.

Source/core/fileapi/FileReader.cpp

 /*
  * Copyright (C) 2010 Google Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 15 matching lines @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/fileapi/FileReader.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/dom/CrossThreadTask.h"
+#include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/events/ProgressEvent.h"
 #include "core/fileapi/File.h"
+#include "core/frame/LocalFrame.h"
+#include "core/workers/WorkerClients.h"
+#include "core/workers/WorkerGlobalScope.h"
 #include "platform/Logging.h"
+#include "platform/Supplementable.h"
 #include "wtf/ArrayBuffer.h"
 #include "wtf/CurrentTime.h"
 #include "wtf/Deque.h"
 #include "wtf/HashSet.h"
 #include "wtf/ThreadSpecific.h"
 #include "wtf/Threading.h"
 #include "wtf/text/CString.h"
 
 namespace WebCore {
 
@@ skipping 12 matching lines @@
 #endif
 
 } // namespace
 
 // Embedders like chromium limit the number of simultaneous requests to avoid
 // excessive IPC congestion. We limit this to 100 per thread to throttle the
 // requests (the value is arbitrarily chosen).
 static const size_t kMaxOutstandingRequestsPerThread = 100;
 static const double progressNotificationIntervalMS = 50;
 
-class FileReader::ThrottlingController {
+class FileReader::ThrottlingController FINAL : public NoBaseWillBeGarbageCollectedFinalized<FileReader::ThrottlingController>, public WillBeHeapSupplement<LocalFrame>, public WillBeHeapSupplement<WorkerClients> {
+    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(FileReader::ThrottlingController);
 public:
-    ThrottlingController() : m_maxRunningReaders(kMaxOutstandingRequestsPerThread) { }
+    static ThrottlingController* from(ExecutionContext* context)
+    {
+        if (context->isDocument()) {
+            Document* document = toDocument(context);
+            if (!document->frame())
+                return 0;
+
+            ThrottlingController* controller = static_cast<ThrottlingController*>(WillBeHeapSupplement<LocalFrame>::from(document->frame(), supplementName()));
+            if (controller)
+                return controller;
+
+            controller = new ThrottlingController();
+            WillBeHeapSupplement<LocalFrame>::provideTo(*document->frame(), supplementName(), adoptPtrWillBeNoop(controller));
+            return controller;
+        }
+        ASSERT(context->isWorkerGlobalScope());

[haraken, 2014/07/16 11:37:26]

Also add ASSERT(!isMainThread()).

[sof, 2014/07/16 11:46:19]

Done.

+        WorkerGlobalScope* workerGlobalScope = toWorkerGlobalScope(context);
+        ThrottlingController* controller = static_cast<ThrottlingController*>(WillBeHeapSupplement<WorkerClients>::from(workerGlobalScope->clients(), supplementName()));
+        if (controller)
+            return controller;
+
+        controller = new ThrottlingController();
+        WillBeHeapSupplement<WorkerClients>::provideTo(*workerGlobalScope->clients(), supplementName(), adoptPtrWillBeNoop(controller));
+        return controller;
+    }
+
     ~ThrottlingController() { }
 
     enum FinishReaderType { DoNotRunPendingReaders, RunPendingReaders };
 
     void pushReader(FileReader* reader)
     {
         if (m_pendingReaders.isEmpty()
             && m_runningReaders.size() < m_maxRunningReaders) {
             reader->executePendingRead();
             ASSERT(!m_runningReaders.contains(reader));
             m_runningReaders.add(reader);
             return;
         }
         m_pendingReaders.append(reader);
         executeReaders();
     }
 
     FinishReaderType removeReader(FileReader* reader)
     {
-        HashSet<FileReader*>::const_iterator hashIter = m_runningReaders.find(reader);
+        WillBeHeapHashSet<RawPtrWillBeMember<FileReader> >::const_iterator hashIter = m_runningReaders.find(reader);
         if (hashIter != m_runningReaders.end()) {
             m_runningReaders.remove(hashIter);
             return RunPendingReaders;
         }
-        Deque<FileReader*>::const_iterator dequeEnd = m_pendingReaders.end();
-        for (Deque<FileReader*>::const_iterator it = m_pendingReaders.begin(); it != dequeEnd; ++it) {
+        WillBeHeapDeque<RawPtrWillBeMember<FileReader> >::const_iterator dequeEnd = m_pendingReaders.end();
+        for (WillBeHeapDeque<RawPtrWillBeMember<FileReader> >::const_iterator it = m_pendingReaders.begin(); it != dequeEnd; ++it) {
             if (*it == reader) {
                 m_pendingReaders.remove(it);
                 break;
             }
         }
         return DoNotRunPendingReaders;
     }
 
     void finishReader(FileReader* reader, FinishReaderType nextStep)
     {
         if (nextStep == RunPendingReaders)
             executeReaders();
     }
 
+    void trace(Visitor* visitor)
+    {
+#if ENABLE(OILPAN)
+        visitor->trace(m_pendingReaders);
+#endif
+        visitor->trace(m_runningReaders);
+        WillBeHeapSupplement<LocalFrame>::trace(visitor);
+        WillBeHeapSupplement<WorkerClients>::trace(visitor);
+    }
+
 private:
+    ThrottlingController()
+        : m_maxRunningReaders(kMaxOutstandingRequestsPerThread)
+    {
+    }
+
     void executeReaders()
     {
         while (m_runningReaders.size() < m_maxRunningReaders) {
             if (m_pendingReaders.isEmpty())
                 return;
             FileReader* reader = m_pendingReaders.takeFirst();
             reader->executePendingRead();
             m_runningReaders.add(reader);
         }
     }
 
+    static const char* supplementName() { return "FileReaderThrottleController"; }

[haraken, 2014/07/16 11:37:26]

"FileReaderThrottlingController"

[sof, 2014/07/16 11:46:19]

Fixed.

+
     const size_t m_maxRunningReaders;
-    Deque<FileReader*> m_pendingReaders;
-    HashSet<FileReader*> m_runningReaders;
+    WillBeHeapDeque<RawPtrWillBeMember<FileReader> > m_pendingReaders;
+    WillBeHeapHashSet<RawPtrWillBeMember<FileReader> > m_runningReaders;
 };
 
 PassRefPtrWillBeRawPtr<FileReader> FileReader::create(ExecutionContext* context)
 {
     RefPtrWillBeRawPtr<FileReader> fileReader(adoptRefWillBeNoop(new FileReader(context)));
     fileReader->suspendIfNeeded();
     return fileReader.release();
 }
 
 FileReader::FileReader(ExecutionContext* context)
@@ skipping 239 matching lines @@
         dispatchEvent(ProgressEvent::create(type, false, 0, 0));
         return;
     }
 
     if (m_loader->totalBytes() >= 0)
         dispatchEvent(ProgressEvent::create(type, true, m_loader->bytesLoaded(), m_loader->totalBytes()));
     else
         dispatchEvent(ProgressEvent::create(type, false, m_loader->bytesLoaded(), 0));
 }
 
-ThreadSpecific<FileReader::ThrottlingController>& FileReader::throttlingController()
+FileReader::ThrottlingController* FileReader::throttlingController()
 {
-    AtomicallyInitializedStatic(ThreadSpecific<FileReader::ThrottlingController>*, controller = new ThreadSpecific<FileReader::ThrottlingController>);
-    return *controller;
+    return FileReader::ThrottlingController::from(executionContext());
 }
 
 PassRefPtr<ArrayBuffer> FileReader::arrayBufferResult() const
 {
     if (!m_loader || m_error)
         return nullptr;
     return m_loader->arrayBufferResult();
 }
 
 String FileReader::stringResult()
 {
     if (!m_loader || m_error)
         return String();
     return m_loader->stringResult();
 }
 
 void FileReader::trace(Visitor* visitor)
 {
     visitor->trace(m_error);
     EventTargetWithInlineData::trace(visitor);
 }
 
 } // namespace WebCore