corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out changeset ddb118aa2648 (bug 1046109)

Browse Source
This commit is contained in:
Carsten "Tomcat" Book
2014-07-31 10:14:34 +02:00
parent 3f78c883e1
commit 7cfa6f7937
2 changed files with 28 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
ipc/unixsocket/UnixSocket.cpp
View File

@@ -196,7 +196,26 @@ private:
T* mInstance;
};
class OnSocketEventRunnable : public SocketIORunnable<UnixSocketImpl>
class UnixSocketImplRunnable : public nsRunnable
{
public:
UnixSocketImpl* GetImpl() const
{
return mImpl;
}
protected:
UnixSocketImplRunnable(UnixSocketImpl* aImpl)
: mImpl(aImpl)
{
MOZ_ASSERT(aImpl);
}
virtual ~UnixSocketImplRunnable()
{ }
private:
UnixSocketImpl* mImpl;
};
class OnSocketEventRunnable : public UnixSocketImplRunnable
{
public:
enum SocketEvent {
@@ -206,7 +225,7 @@ public:
};
OnSocketEventRunnable(UnixSocketImpl* aImpl, SocketEvent e)
: SocketIORunnable<UnixSocketImpl>(aImpl)
: UnixSocketImplRunnable(aImpl)
, mEvent(e)
{
MOZ_ASSERT(!NS_IsMainThread());
@@ -216,7 +235,7 @@ public:
{
MOZ_ASSERT(NS_IsMainThread());
UnixSocketImpl* impl = GetIO();
UnixSocketImpl* impl = GetImpl();
if (impl->IsShutdownOnMainThread()) {
NS_WARNING("CloseSocket has already been called!");
@@ -237,11 +256,11 @@ private:
SocketEvent mEvent;
};
class SocketReceiveRunnable : public SocketIORunnable<UnixSocketImpl>
class SocketReceiveRunnable : public UnixSocketImplRunnable
{
public:
SocketReceiveRunnable(UnixSocketImpl* aImpl, UnixSocketRawData* aData)
: SocketIORunnable<UnixSocketImpl>(aImpl)
: UnixSocketImplRunnable(aImpl)
, mRawData(aData)
{
MOZ_ASSERT(aData);
@@ -251,7 +270,7 @@ public:
{
MOZ_ASSERT(NS_IsMainThread());
UnixSocketImpl* impl = GetIO();
UnixSocketImpl* impl = GetImpl();
if (impl->IsShutdownOnMainThread()) {
NS_WARNING("mConsumer is null, aborting receive!");
@@ -268,18 +287,18 @@ private:
nsAutoPtr<UnixSocketRawData> mRawData;
};
class RequestClosingSocketRunnable : public SocketIORunnable<UnixSocketImpl>
class RequestClosingSocketRunnable : public UnixSocketImplRunnable
{
public:
RequestClosingSocketRunnable(UnixSocketImpl* aImpl)
: SocketIORunnable<UnixSocketImpl>(aImpl)
: UnixSocketImplRunnable(aImpl)
{ }
NS_IMETHOD Run() MOZ_OVERRIDE
{
MOZ_ASSERT(NS_IsMainThread());
UnixSocketImpl* impl = GetIO();
UnixSocketImpl* impl = GetImpl();
if (impl->IsShutdownOnMainThread()) {
NS_WARNING("CloseSocket has already been called!");
// Since we've already explicitly closed and the close happened before