aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xexamples/example.py2
-rw-r--r--rumba/model.py9
2 files changed, 6 insertions, 5 deletions
diff --git a/examples/example.py b/examples/example.py
index 7fe130d..a3fe5ec 100755
--- a/examples/example.py
+++ b/examples/example.py
@@ -44,7 +44,7 @@ print(exp)
try:
exp.swap_in()
exp.bootstrap_prototype()
- c1 = ClientBinary("rinaperf", options = "-t perf -s 1000 -c 10000")
+ c1 = Client("rinaperf", options ="-t perf -s 1000 -c 10000")
s1 = Server("rinaperf", arrival_rate=2, mean_duration=5, options = "-l", nodes = [a], clients = [c1])
sb = StoryBoard(exp, 3600, servers = [s1])
sb.start()
diff --git a/rumba/model.py b/rumba/model.py
index 36ac5c3..285d937 100644
--- a/rumba/model.py
+++ b/rumba/model.py
@@ -155,7 +155,7 @@ class SSHConfig:
#
class Node:
def __init__(self, name, difs=None, dif_registrations=None,
- registrations=None, bindings=None, end_user=False):
+ registrations=None, bindings=None, client=False):
self.name = name
if difs is None:
difs = list()
@@ -173,7 +173,7 @@ class Node:
self.bindings = bindings
self.ssh_config = SSHConfig(name)
self.ipcps = []
- self.end_user = end_user
+ self.client = client
self._validate()
@@ -575,7 +575,7 @@ class Experiment:
# @ap: Application Process binary
# @options: Options to pass to the binary
#
-class ClientBinary(object):
+class Client(object):
def __init__(self, ap, options=None):
self.ap = ap
self.options = options
@@ -592,7 +592,7 @@ class ClientBinary(object):
# @start_time: The time at which this process is started.
# @options: Options to pass to the binary
#
-class ClientProcess(ClientBinary):
+class ClientProcess(Client):
def __init__(self, ap, node, duration, start_time, options=None):
super(ClientProcess, self).__init__(ap, options=options)
self.node = node
@@ -618,6 +618,7 @@ class ClientProcess(ClientBinary):
#
# @ap: Application Process binary
# @arrival_rate: Average requests/s to be received by this server
+# @mean_duration: Average duration of a client connection (in seconds)
# @options: Options to pass to the binary
# @max_clients: Maximum number of clients to serve
# @clients: Client binaries that will use this server