Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 06:11:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 564086, part i: Add an (IPDL-private) interface for getting the underlying AsyncChannel from a top-level actor. r=bsmedberg

Browse Source
This commit is contained in:
Chris Jones 2011-06-03 13:33:55 -05:00
parent 561e04d6d7
commit 8499bc3fba
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ipc/glue/ProtocolUtils.h
View File

@ -63,6 +63,7 @@ enum {
namespace mozilla {
namespace ipc {
class AsyncChannel;
// Used to pass references to protocol actors across the wire.
// Actors created on the parent-side have a positive ID, and actors
@ -117,8 +118,9 @@ public:
virtual bool IsTrackingSharedMemory(Shmem::SharedMemory*) = 0;
virtual bool DestroySharedMemory(Shmem&) = 0;
// XXX odd duck, acknowledged
// XXX odd ducks, acknowledged
virtual ProcessHandle OtherProcess() const = 0;
virtual AsyncChannel* GetIPCChannel() = 0;
};

11
ipc/ipdl/ipdl/lower.py
View File

@ -1060,6 +1060,9 @@ class Protocol(ipdl.ast.Protocol):
def otherProcessMethod(self):
return ExprVar('OtherProcess')
def getChannelMethod(self):
return ExprVar('GetIPCChannel')
def processingErrorVar(self):
assert self.decl.type.isToplevel()
return ExprVar('ProcessingError')
@ -2266,6 +2269,7 @@ class _GenerateProtocolActorCode(ipdl.ast.Visitor):
Typedef(Type(self.protocol.channelName()), 'Channel'),
Typedef(Type(self.protocol.fqListenerName()), 'ChannelListener'),
Typedef(Type('base::ProcessHandle'), 'ProcessHandle'),
Typedef(Type('mozilla::ipc::AsyncChannel'), 'AsyncChannel'),
Typedef(Type('mozilla::ipc::SharedMemory'), 'SharedMemory'),
Typedef(Type('mozilla::ipc::Trigger'), 'Trigger')
]
@ -3194,6 +3198,10 @@ class _GenerateProtocolActorCode(ipdl.ast.Visitor):
ret=Type('ProcessHandle'),
const=1,
virtual=1))
getchannel = MethodDefn(MethodDecl(
p.getChannelMethod().name,
ret=Type('AsyncChannel', ptr=1),
virtual=1))
if p.decl.type.isToplevel():
tmpvar = ExprVar('tmp')
@ -3376,6 +3384,7 @@ class _GenerateProtocolActorCode(ipdl.ast.Visitor):
CaseLabel('SHMEM_DESTROYED_MESSAGE_TYPE'), abort)
otherprocess.addstmt(StmtReturn(p.otherProcessVar()))
getchannel.addstmt(StmtReturn(ExprAddrOf(p.channelVar())))
else:
# delegate registration to manager
register.addstmt(StmtReturn(ExprCall(
@ -3409,6 +3418,7 @@ class _GenerateProtocolActorCode(ipdl.ast.Visitor):
otherprocess.addstmt(StmtReturn(ExprCall(
ExprSelect(p.managerVar(), '->',
p.otherProcessMethod().name))))
getchannel.addstmt(StmtReturn(p.channelVar()))
# all protocols share the "same" RemoveManagee() implementation
pvar = ExprVar('aProtocolId')
@ -3461,6 +3471,7 @@ class _GenerateProtocolActorCode(ipdl.ast.Visitor):
istracking,
destroyshmem,
otherprocess,
getchannel,
Whitespace.NL ]
def makeShmemIface(self):