diff options
Diffstat (limited to 'python/src/tcf/services/remote/MemoryMapProxy.py')
| -rw-r--r-- | python/src/tcf/services/remote/MemoryMapProxy.py | 53 |
1 files changed, 34 insertions, 19 deletions
diff --git a/python/src/tcf/services/remote/MemoryMapProxy.py b/python/src/tcf/services/remote/MemoryMapProxy.py index 34aab1d5f..f21eaf0a4 100644 --- a/python/src/tcf/services/remote/MemoryMapProxy.py +++ b/python/src/tcf/services/remote/MemoryMapProxy.py @@ -1,5 +1,5 @@ -# ******************************************************************************* -# * Copyright (c) 2011 Wind River Systems, Inc. and others. +# ***************************************************************************** +# * Copyright (c) 2011, 2013 Wind River Systems, Inc. and others. # * All rights reserved. This program and the accompanying materials # * are made available under the terms of the Eclipse Public License v1.0 # * which accompanies this distribution, and is available at @@ -7,40 +7,49 @@ # * # * Contributors: # * Wind River Systems - initial API and implementation -# ******************************************************************************* +# ***************************************************************************** + +from .. import memorymap +from ... import channel +from ...channel.Command import Command -from tcf import channel -from tcf.services import memorymap -from tcf.channel.Command import Command class MemoryMapProxy(memorymap.MemoryMapService): def __init__(self, channel): self.channel = channel self.listeners = {} - def get(self, id, done): + def get(self, contextID, done): done = self._makeCallback(done) service = self + class GetCommand(Command): def __init__(self): - super(GetCommand, self).__init__(service.channel, service, "get", (id,)) + super(GetCommand, self).__init__(service.channel, service, + "get", (contextID,)) + def done(self, error, args): - map = None + memMap = None if not error: assert len(args) == 2 error = self.toError(args[0]) - if args[1]: map = _toMemoryMap(args[1]) - done.doneGet(self.token, error, map) + if args[1]: + memMap = _toMemoryMap(args[1]) + done.doneGet(self.token, error, memMap) return GetCommand().token - def set(self, id, map, done): - if isinstance(map, memorymap.MemoryRegion) or isinstance(map, dict): - map = (map,) + def set(self, contextID, memMap, done): + if isinstance(memMap, memorymap.MemoryRegion) or \ + isinstance(memMap, dict): + memMap = (memMap,) done = self._makeCallback(done) service = self + class SetCommand(Command): def __init__(self): - super(SetCommand, self).__init__(service.channel, service, "set", (id, map)) + super(SetCommand, self).__init__(service.channel, service, + "set", (contextID, memMap)) + def done(self, error, args): if not error: assert len(args) == 1 @@ -55,12 +64,15 @@ class MemoryMapProxy(memorymap.MemoryMapService): def removeListener(self, listener): l = self.listeners.pop(listener, None) - if l: self.channel.removeEventListener(self, l) + if l: + self.channel.removeEventListener(self, l) + class ChannelEventListener(channel.EventListener): def __init__(self, service, listener): self.service = service self.listener = listener + def event(self, name, data): try: args = channel.fromJSONSequence(data) @@ -68,15 +80,18 @@ class ChannelEventListener(channel.EventListener): assert len(args) == 1 self.listener.changed(args[0]) else: - raise IOError("MemoryMap service: unknown event: " + name); + raise IOError("MemoryMap service: unknown event: " + name) except Exception as x: self.service.channel.terminate(x) def _toMemoryMap(o): - if o is None: return None + if o is None: + return None return map(_toMemoryRegion, o) + def _toMemoryRegion(o): - if o is None: return None + if o is None: + return None return memorymap.MemoryRegion(o) |