mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
a13d595ddb
There are multiple defects in NetworkWorker and the related parts since the C++ rewrite. 1) NetworkService holds a reference to NetworkWorker and never releases it. It has to wait until the cycle collector comes up to resolve their ownership loop and free NetworkWorker manually. However 2) nsINetworkWorker::shutdown is never called, and that leaves everything living till the end, inclusive of that gNetdConsumer in Netd.cpp. 3) when GC comes to free NetworkWorker, it calls its parent destructor ~NetConsumer(), which in turn calls ~RefCounted<NetdConsumer>(). Having a valid gNetdConsumer in Netd.cpp follows its refCnt is not zero and this triggers an assertion in ~RefCounted<NetdConsumer>(). So, some obvious treatments here. A) NetworkService should call nsINetworkWorker::shutdown upon receiving a shutdown observer event and release the reference to NetworkWorker. B) NetworkWorker should never be double ref-counted. Move NetdConsumer implementation into a separated class.
77 lines
1.9 KiB
C++
77 lines
1.9 KiB
C++
/* -*- Mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 40 -*- */
|
|
/* vim: set ts=2 et sw=2 tw=40: */
|
|
/* Copyright 2012 Mozilla Foundation and Mozilla contributors
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#ifndef mozilla_dom_system_b2g_systemworkermanager_h__
|
|
#define mozilla_dom_system_b2g_systemworkermanager_h__
|
|
|
|
#include "nsIInterfaceRequestor.h"
|
|
#include "nsISystemWorkerManager.h"
|
|
#include "nsIObserver.h"
|
|
#include "nsAutoPtr.h"
|
|
#include "nsCOMPtr.h"
|
|
#include "nsXULAppAPI.h" // For XRE_GetProcessType
|
|
|
|
class nsIWorkerHolder;
|
|
|
|
namespace mozilla {
|
|
|
|
namespace ipc {
|
|
class KeyStore;
|
|
}
|
|
|
|
namespace dom {
|
|
namespace gonk {
|
|
|
|
class SystemWorkerManager : public nsIObserver,
|
|
public nsIInterfaceRequestor,
|
|
public nsISystemWorkerManager
|
|
{
|
|
public:
|
|
NS_DECL_ISUPPORTS
|
|
NS_DECL_NSIOBSERVER
|
|
NS_DECL_NSIINTERFACEREQUESTOR
|
|
NS_DECL_NSISYSTEMWORKERMANAGER
|
|
|
|
nsresult Init();
|
|
void Shutdown();
|
|
|
|
static already_AddRefed<SystemWorkerManager>
|
|
FactoryCreate();
|
|
|
|
static nsIInterfaceRequestor*
|
|
GetInterfaceRequestor();
|
|
|
|
private:
|
|
SystemWorkerManager();
|
|
~SystemWorkerManager();
|
|
|
|
nsresult InitWifi(JSContext *cx);
|
|
nsresult InitKeyStore(JSContext *cx);
|
|
|
|
nsCOMPtr<nsIWorkerHolder> mWifiWorker;
|
|
|
|
nsRefPtr<ipc::KeyStore> mKeyStore;
|
|
|
|
bool mShutdown;
|
|
};
|
|
|
|
}
|
|
}
|
|
}
|
|
|
|
#endif // mozilla_dom_system_b2g_systemworkermanager_h__
|