occheung
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

pc_rpc: namespace cleanup

This commit is contained in:
Sebastien Bourdeauducq 2015-01-05 16:10:16 +08:00
parent f9dd5682ee
commit 7354117af2
1 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
artiq/management/pc_rpc.py
View File

@ -17,7 +17,7 @@ import asyncio
import traceback import traceback
from artiq.management import pyon from artiq.management import pyon
from artiq.management.tools import AsyncioServer from artiq.management.tools import AsyncioServer as _AsyncioServer
class RemoteError(Exception): class RemoteError(Exception):
@ -70,30 +70,35 @@ class Client:
""" """
def __init__(self, host, port, target_name): def __init__(self, host, port, target_name):
self._socket = socket.create_connection((host, port)) self.__socket = socket.create_connection((host, port))
self._socket.sendall(_init_string)
server_identification = self._recv() try:
self._target_names = server_identification["targets"] self.__socket.sendall(_init_string)
self._id_parameters = server_identification["parameters"]
if target_name is not None: server_identification = self.__recv()
self.select_rpc_target(target_name) self.__target_names = server_identification["targets"]
self.__id_parameters = server_identification["parameters"]
if target_name is not None:
self.select_rpc_target(target_name)
except:
self.__socket.close()
raise
def select_rpc_target(self, target_name): def select_rpc_target(self, target_name):
"""Selects a RPC target by name. This function should be called """Selects a RPC target by name. This function should be called
exactly once if the object was created with ``target_name=None``. exactly once if the object was created with ``target_name=None``.
""" """
if target_name not in self._target_names: if target_name not in self.__target_names:
raise IncompatibleServer raise IncompatibleServer
self._socket.sendall((target_name + "\n").encode()) self.__socket.sendall((target_name + "\n").encode())
def get_rpc_id(self): def get_rpc_id(self):
"""Returns a tuple (target_names, id_parameters) containing the """Returns a tuple (target_names, id_parameters) containing the
identification information of the server. identification information of the server.
""" """
return (self._target_names, self._id_parameters) return (self.__target_names, self.__id_parameters)
def close_rpc(self): def close_rpc(self):
"""Closes the connection to the RPC server. """Closes the connection to the RPC server.
@ -101,28 +106,26 @@ class Client:
No further method calls should be done after this method is called. No further method calls should be done after this method is called.
""" """
self._socket.close() self.__socket.close()
def _send(self, obj): def __send(self, obj):
line = pyon.encode(obj) + "\n" line = pyon.encode(obj) + "\n"
self._socket.sendall(line.encode()) self.__socket.sendall(line.encode())
def _recv(self): def __recv(self):
buf = self._socket.recv(4096).decode() buf = self.__socket.recv(4096).decode()
while "\n" not in buf: while "\n" not in buf:
more = self._socket.recv(4096) more = self.__socket.recv(4096)
if not more: if not more:
break break
buf += more.decode() buf += more.decode()
obj = pyon.decode(buf) return pyon.decode(buf)
return obj def __do_rpc(self, name, args, kwargs):
def _do_rpc(self, name, args, kwargs):
obj = {"action": "call", "name": name, "args": args, "kwargs": kwargs} obj = {"action": "call", "name": name, "args": args, "kwargs": kwargs}
self._send(obj) self.__send(obj)
obj = self._recv() obj = self.__recv()
if obj["status"] == "ok": if obj["status"] == "ok":
return obj["ret"] return obj["ret"]
elif obj["status"] == "failed": elif obj["status"] == "failed":
@ -132,7 +135,7 @@ class Client:
def __getattr__(self, name): def __getattr__(self, name):
def proxy(*args, **kwargs): def proxy(*args, **kwargs):
return self._do_rpc(name, args, kwargs) return self.__do_rpc(name, args, kwargs)
return proxy return proxy
@ -232,7 +235,7 @@ class AsyncioClient:
return proxy return proxy
class Server(AsyncioServer): class Server(_AsyncioServer):
"""This class creates a TCP server that handles requests coming from """This class creates a TCP server that handles requests coming from
``Client`` objects. ``Client`` objects.
@ -250,7 +253,7 @@ class Server(AsyncioServer):
""" """
def __init__(self, targets, id_parameters=None): def __init__(self, targets, id_parameters=None):
AsyncioServer.__init__(self) _AsyncioServer.__init__(self)
self.targets = targets self.targets = targets
self.id_parameters = id_parameters self.id_parameters = id_parameters