| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/browser/service_worker/embedded_worker_instance.h" | 5 #include "content/browser/service_worker/embedded_worker_instance.h" |
| 6 | 6 |
| 7 #include "content/browser/service_worker/embedded_worker_registry.h" | 7 #include "content/browser/service_worker/embedded_worker_registry.h" |
| 8 #include "content/common/service_worker/embedded_worker_messages.h" | 8 #include "content/common/service_worker/embedded_worker_messages.h" |
| 9 #include "ipc/ipc_message.h" | 9 #include "ipc/ipc_message.h" |
| 10 #include "url/gurl.h" | 10 #include "url/gurl.h" |
| (...skipping 26 matching lines...) Expand all Loading... |
| 37 ServiceWorkerStatusCode EmbeddedWorkerInstance::Stop() { | 37 ServiceWorkerStatusCode EmbeddedWorkerInstance::Stop() { |
| 38 DCHECK(status_ == STARTING || status_ == RUNNING); | 38 DCHECK(status_ == STARTING || status_ == RUNNING); |
| 39 ServiceWorkerStatusCode status = | 39 ServiceWorkerStatusCode status = |
| 40 registry_->StopWorker(process_id_, embedded_worker_id_); | 40 registry_->StopWorker(process_id_, embedded_worker_id_); |
| 41 if (status == SERVICE_WORKER_OK) | 41 if (status == SERVICE_WORKER_OK) |
| 42 status_ = STOPPING; | 42 status_ = STOPPING; |
| 43 return status; | 43 return status; |
| 44 } | 44 } |
| 45 | 45 |
| 46 ServiceWorkerStatusCode EmbeddedWorkerInstance::SendMessage( | 46 ServiceWorkerStatusCode EmbeddedWorkerInstance::SendMessage( |
| 47 int request_id, |
| 47 const IPC::Message& message) { | 48 const IPC::Message& message) { |
| 48 DCHECK(status_ == RUNNING); | 49 DCHECK(status_ == RUNNING); |
| 49 return registry_->Send(process_id_, | 50 return registry_->Send(process_id_, |
| 50 new EmbeddedWorkerContextMsg_SendMessageToWorker( | 51 new EmbeddedWorkerContextMsg_SendMessageToWorker( |
| 51 thread_id_, embedded_worker_id_, message)); | 52 thread_id_, embedded_worker_id_, |
| 53 request_id, message)); |
| 52 } | 54 } |
| 53 | 55 |
| 54 void EmbeddedWorkerInstance::AddProcessReference(int process_id) { | 56 void EmbeddedWorkerInstance::AddProcessReference(int process_id) { |
| 55 ProcessRefMap::iterator found = process_refs_.find(process_id); | 57 ProcessRefMap::iterator found = process_refs_.find(process_id); |
| 56 if (found == process_refs_.end()) | 58 if (found == process_refs_.end()) |
| 57 found = process_refs_.insert(std::make_pair(process_id, 0)).first; | 59 found = process_refs_.insert(std::make_pair(process_id, 0)).first; |
| 58 ++found->second; | 60 ++found->second; |
| 59 } | 61 } |
| 60 | 62 |
| 61 void EmbeddedWorkerInstance::ReleaseProcessReference(int process_id) { | 63 void EmbeddedWorkerInstance::ReleaseProcessReference(int process_id) { |
| (...skipping 26 matching lines...) Expand all Loading... |
| 88 FOR_EACH_OBSERVER(Observer, observer_list_, OnStarted()); | 90 FOR_EACH_OBSERVER(Observer, observer_list_, OnStarted()); |
| 89 } | 91 } |
| 90 | 92 |
| 91 void EmbeddedWorkerInstance::OnStopped() { | 93 void EmbeddedWorkerInstance::OnStopped() { |
| 92 status_ = STOPPED; | 94 status_ = STOPPED; |
| 93 process_id_ = -1; | 95 process_id_ = -1; |
| 94 thread_id_ = -1; | 96 thread_id_ = -1; |
| 95 FOR_EACH_OBSERVER(Observer, observer_list_, OnStopped()); | 97 FOR_EACH_OBSERVER(Observer, observer_list_, OnStopped()); |
| 96 } | 98 } |
| 97 | 99 |
| 98 void EmbeddedWorkerInstance::OnMessageReceived(const IPC::Message& message) { | 100 void EmbeddedWorkerInstance::OnMessageReceived(int request_id, |
| 99 FOR_EACH_OBSERVER(Observer, observer_list_, OnMessageReceived(message)); | 101 const IPC::Message& message) { |
| 102 FOR_EACH_OBSERVER(Observer, observer_list_, |
| 103 OnMessageReceived(request_id, message)); |
| 100 } | 104 } |
| 101 | 105 |
| 102 void EmbeddedWorkerInstance::AddObserver(Observer* observer) { | 106 void EmbeddedWorkerInstance::AddObserver(Observer* observer) { |
| 103 observer_list_.AddObserver(observer); | 107 observer_list_.AddObserver(observer); |
| 104 } | 108 } |
| 105 | 109 |
| 106 void EmbeddedWorkerInstance::RemoveObserver(Observer* observer) { | 110 void EmbeddedWorkerInstance::RemoveObserver(Observer* observer) { |
| 107 observer_list_.RemoveObserver(observer); | 111 observer_list_.RemoveObserver(observer); |
| 108 } | 112 } |
| 109 | 113 |
| 110 bool EmbeddedWorkerInstance::ChooseProcess() { | 114 bool EmbeddedWorkerInstance::ChooseProcess() { |
| 111 DCHECK_EQ(-1, process_id_); | 115 DCHECK_EQ(-1, process_id_); |
| 112 // Naive implementation; chooses a process which has the biggest number of | 116 // Naive implementation; chooses a process which has the biggest number of |
| 113 // associated providers (so that hopefully likely live longer). | 117 // associated providers (so that hopefully likely live longer). |
| 114 ProcessRefMap::iterator max_ref_iter = process_refs_.end(); | 118 ProcessRefMap::iterator max_ref_iter = process_refs_.end(); |
| 115 for (ProcessRefMap::iterator iter = process_refs_.begin(); | 119 for (ProcessRefMap::iterator iter = process_refs_.begin(); |
| 116 iter != process_refs_.end(); ++iter) { | 120 iter != process_refs_.end(); ++iter) { |
| 117 if (max_ref_iter == process_refs_.end() || | 121 if (max_ref_iter == process_refs_.end() || |
| 118 max_ref_iter->second < iter->second) | 122 max_ref_iter->second < iter->second) |
| 119 max_ref_iter = iter; | 123 max_ref_iter = iter; |
| 120 } | 124 } |
| 121 if (max_ref_iter == process_refs_.end()) | 125 if (max_ref_iter == process_refs_.end()) |
| 122 return false; | 126 return false; |
| 123 process_id_ = max_ref_iter->first; | 127 process_id_ = max_ref_iter->first; |
| 124 return true; | 128 return true; |
| 125 } | 129 } |
| 126 | 130 |
| 127 } // namespace content | 131 } // namespace content |
| OLD | NEW |