X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lttng_ivc%2Futils%2Futils.py;h=3efc2b1f8cd5f06906fb57106f919f62491a64d3;hb=344128e3017b0a9bf2fd035492db98d1372d0027;hp=1660aba1383469d0f6d289aeab431dc87ceedea0;hpb=816f8cc1d499bc6230da6037cea51bc116d63f50;p=deliverable%2Flttng-ivc.git

diff --git a/lttng_ivc/utils/utils.py b/lttng_ivc/utils/utils.py
index 1660aba..3efc2b1 100644
--- a/lttng_ivc/utils/utils.py
+++ b/lttng_ivc/utils/utils.py
@@ -47,15 +47,56 @@ def __dummy_sigusr1_handler():
     pass
 
 
-def sessiond_spawn(runtime):
+def sessiond_spawn(runtime, opt_args=""):
     agent_port = find_free_port()
     previous_handler = signal.signal(signal.SIGUSR1, __dummy_sigusr1_handler)
-    sessiond = runtime.spawn_subprocess("lttng-sessiond -vvv -S --agent-tcp-port {}".format(agent_port))
+    cmd = "lttng-sessiond -vvv --verbose-consumer -S --agent-tcp-port {}".format(agent_port)
+    cmd = " ".join([cmd, opt_args])
+    sessiond = runtime.spawn_subprocess(cmd)
     signal.sigtimedwait({signal.SIGUSR1}, 60)
     previous_handler = signal.signal(signal.SIGUSR1, previous_handler)
     return sessiond
 
 
+def relayd_spawn(runtime, url="localhost"):
+    """
+    Return a tuple (relayd_uuid, ctrl_port, data_port, live_port)
+    """
+    ports = find_multiple_free_port(3)
+    data_port = ports.pop()
+    ctrl_port = ports.pop()
+    live_port = ports.pop()
+
+    base_cmd = "lttng-relayd -vvv"
+    data_string = "-D tcp://{}:{}".format(url, data_port)
+    ctrl_string = "-C tcp://{}:{}".format(url, ctrl_port)
+    live_string = "-L tcp://{}:{}".format(url, live_port)
+
+    cmd = " ".join([base_cmd, data_string, ctrl_string, live_string])
+    relayd = runtime.spawn_subprocess(cmd)
+
+    # Synchronization based on verbosity since no -S is available for
+    # lttng-relayd yet.
+    log_path = runtime.get_subprocess_stderr_path(relayd)
+
+    # TODO: Move to settings.
+    ready_cue = "Listener accepting live viewers connections"
+    # TODO: Move to settings.
+    timeout = 60
+    ready = False
+    for i in range(timeout):
+        if file_contains(log_path, ready_cue):
+            ready = True
+            break
+        time.sleep(1)
+
+    if not ready:
+        # Cleanup is performed by runtime
+        raise Exception("Relayd readyness timeout expired")
+
+    return (relayd, ctrl_port, data_port, live_port)
+
+
 def find_free_port():
     # There is no guarantee that the port will be free at runtime but should be
     # good enough
@@ -64,6 +105,20 @@ def find_free_port():
         return s.getsockname()[1]
 
 
+def find_multiple_free_port(number):
+    """
+    Return a list of supposedly free port
+    """
+    assert(number >= 0)
+    ports = []
+    while(len(ports) != number):
+        port = find_free_port()
+        if port in ports:
+            continue
+        ports.append(port)
+    return ports
+
+
 def file_contains(file_path, list_of_string):
     with open(file_path, 'r') as f:
         for line in f:
@@ -88,14 +143,11 @@ def find_file(root, name):
     """
     Returns the absolute path or None.
     """
-    print(root)
-    print(name)
     abs_path = None
     for base, dirs, files in os.walk(root):
         for tmp in files:
             if tmp.endswith(name):
                 abs_path = os.path.abspath(os.path.join(base, tmp))
-    print(abs_path)
     return abs_path