wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1171994: Store an instance of |RilWorker| for each RIL connection, r=htsai

Browse Source
This commit is contained in:
Thomas Zimmermann 2015-07-14 16:57:00 +02:00
parent b4e0ba4ded
commit e811c4a9ce
2 changed files with 64 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
ipc/ril/Ril.cpp
View File

@ -15,7 +15,6 @@
#include "mozilla/dom/workers/Workers.h"
#include "mozilla/ipc/StreamSocket.h"
#include "mozilla/ipc/StreamSocketConsumer.h"
#include "nsTArray.h"
#include "nsThreadUtils.h" // For NS_IsMainThread.
#include "RilConnector.h"
@ -312,27 +311,29 @@ RilConsumer::OnDisconnect(int aIndex)
// RilWorker
//
nsTArray<nsAutoPtr<RilWorker>> RilWorker::sRilWorkers;
nsresult
RilWorker::Register(unsigned int aClientId,
WorkerCrossThreadDispatcher* aDispatcher)
{
MOZ_ASSERT(NS_IsMainThread());
sRilConsumers.EnsureLengthAtLeast(aClientId + 1);
sRilWorkers.EnsureLengthAtLeast(aClientId + 1);
if (sRilConsumers[aClientId]) {
NS_WARNING("RilConsumer already registered");
if (sRilWorkers[aClientId]) {
NS_WARNING("RilWorkers already registered");
return NS_ERROR_FAILURE;
}
nsRefPtr<ConnectWorkerToRIL> connection = new ConnectWorkerToRIL();
if (!aDispatcher->PostTask(connection)) {
NS_WARNING("Failed to connect worker to ril");
return NS_ERROR_UNEXPECTED;
// Now that we're set up, connect ourselves to the RIL thread.
sRilWorkers[aClientId] = new RilWorker(aDispatcher);
nsresult rv = sRilWorkers[aClientId]->RegisterConsumer(aClientId);
if (NS_FAILED(rv)) {
return rv;
}
// Now that we're set up, connect ourselves to the RIL thread.
sRilConsumers[aClientId] = new RilConsumer(aClientId, aDispatcher);
return NS_OK;
}
@ -341,17 +342,49 @@ RilWorker::Shutdown()
{
MOZ_ASSERT(NS_IsMainThread());
for (unsigned long i = 0; i < sRilConsumers.Length(); i++) {
nsAutoPtr<RilConsumer> instance(sRilConsumers[i]);
if (!instance) {
for (size_t i = 0; i < sRilWorkers.Length(); ++i) {
if (!sRilWorkers[i]) {
continue;
}
instance->mShutdown = true;
instance->Close();
instance = nullptr;
sRilWorkers[i]->UnregisterConsumer(i);
sRilWorkers[i] = nullptr;
}
}
RilWorker::RilWorker(WorkerCrossThreadDispatcher* aDispatcher)
: mDispatcher(aDispatcher)
{
MOZ_ASSERT(mDispatcher);
}
nsresult
RilWorker::RegisterConsumer(unsigned int aClientId)
{
nsRefPtr<ConnectWorkerToRIL> connection = new ConnectWorkerToRIL();
if (!mDispatcher->PostTask(connection)) {
NS_WARNING("Failed to connect worker to ril");
return NS_ERROR_UNEXPECTED;
}
sRilConsumers.EnsureLengthAtLeast(aClientId + 1);
MOZ_ASSERT(!sRilConsumers[aClientId]);
sRilConsumers[aClientId] = new RilConsumer(aClientId, mDispatcher);
return NS_OK;
}
void
RilWorker::UnregisterConsumer(unsigned int aClientId)
{
MOZ_ASSERT(aClientId < sRilConsumers.Length());
MOZ_ASSERT(sRilConsumers[aClientId]);
sRilConsumers[aClientId]->mShutdown = true;
sRilConsumers[aClientId]->Close();
sRilConsumers[aClientId] = nullptr;
}
} // namespace ipc
} // namespace mozilla

14
ipc/ril/Ril.h
View File

@ -7,7 +7,9 @@
#ifndef mozilla_ipc_Ril_h
#define mozilla_ipc_Ril_h 1
#include "nsAutoPtr.h"
#include "nsError.h"
#include "nsTArray.h"
namespace mozilla {
@ -21,6 +23,8 @@ class WorkerCrossThreadDispatcher;
namespace ipc {
class RilConsumer;
class RilWorker final
{
public:
@ -29,6 +33,16 @@ public:
mozilla::dom::workers::WorkerCrossThreadDispatcher* aDispatcher);
static void Shutdown();
private:
RilWorker(mozilla::dom::workers::WorkerCrossThreadDispatcher* aDispatcher);
nsresult RegisterConsumer(unsigned int aClientId);
void UnregisterConsumer(unsigned int aClientId);
static nsTArray<nsAutoPtr<RilWorker>> sRilWorkers;
nsRefPtr<mozilla::dom::workers::WorkerCrossThreadDispatcher> mDispatcher;
};
} // namespace ipc