drone log evaluation

drone-notebook.ipynb

+{
+ "cells": [
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "# X-Lap in Action"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "%matplotlib inline"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "## Data Retrieval"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "from xlap.parse import evaluate, parse_config\n",
+    "config = parse_config(\"drone/xlap.yml\")\n",
+    "data_files = {\n",
+    "    \"sender\": \"drone/sender.csv\",\n",
+    "    \"receiver\": \"drone/receiver.csv\"\n",
+    "}\n",
+    "df_1 = evaluate(data_files[\"sender\"], data_files[\"receiver\"], config=config, kind=0)\n",
+    "df_1.name = \"\"\n",
+    "dfs = [df_1]"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "## Individual Packet Traces"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "from xlap.analyse.trace import traces\n",
+    "traces(df_1, config, global_xaxis=True)"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "## Trace Jitter Analysis"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "scrolled": false
+   },
+   "outputs": [],
+   "source": [
+    "from xlap.analyse.jitter import trace_jitter\n",
+    "trace_jitter(df_1, config)"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "## Latency Distributions"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "from xlap.analyse.cdf import multi_cdf\n",
+    "from xlap.analyse.util import colors\n",
+    "import copy\n",
+    "cfg = copy.deepcopy(config)\n",
+    "\n",
+    "multi_cdf(dfs, cfg, colors=colors)"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "## Correlation with E2E Latency"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "from xlap.analyse.correlation import multi_correlation\n",
+    "multi_correlation(dfs, config, colors=colors, figsize=(3.0,2.0), cols=4)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.8.1"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 4
+}

drone/xlap.yml

+threads:
+cycle_reference:
+time_reference:
+    sender:
+        Start: PrrtSendRequest
+        Stop: PrrtReceiveResponse
+    receiver:
+        Start: PrrtReceiveRequest
+        Stop: PrrtSendResponse
+    transport: # optional
+        Start: PrrtSendRequest
+        Stop: PrrtReceiveRequest
+    total: # optional
+        Start: PrrtSendRequest
+        Stop: PrrtReceiveResponse
+stamps:
+    PrrtSendRequest:
+        Source: sender
+        Type: time
+
+    PrrtReceiveRequest:
+        Source: receiver
+        Type: time
+    UartSendRequest:
+        Source: receiver
+        Type: time
+    UartReceiveResponse:
+        Source: receiver
+        Type: time
+    PrrtSendResponse:
+        Source: receiver
+        Type: time
+
+    PrrtReceiveResponse:
+        Source: sender
+        Type: time
+
+durations:
+    Processing2:
+        Start: UartReceiveResponse
+        Stop: PrrtSendResponse
+        Source: receiver
+    Uart:
+        Start: UartSendRequest
+        Stop: UartReceiveResponse
+        Source: receiver
+    Processing1:
+        Start: PrrtReceiveRequest
+        Stop: UartSendRequest
+        Source: receiver
+    RoundTripTransport:
+        Start: PrrtSendResponse
+        Stop: PrrtReceiveResponse
+        Source: sender
+
+packet_types:
+    Data: 0
+    Redundancy: 1

xlap/analyse/trace.py

@@ -26,7 +26,11 @@ def _create_line(config):
 
     def _creator(duration_name):
         if duration_name == "EndToEnd":
-            return [tr["sender"]["Start"] + "_T", tr["receiver"]["Stop"] + "_T", colors["EndToEnd"], linestyles["EndToEnd"], "EndToEnd"]
+            try:
+                return [tr["total"]["Start"] + "_T", tr["total"]["Stop"] + "_T", colors["EndToEnd"], linestyles["EndToEnd"], "EndToEnd"]
+            except KeyError:
+                return [tr["sender"]["Start"] + "_T", tr["receiver"]["Stop"] + "_T", colors["EndToEnd"], linestyles["EndToEnd"], "EndToEnd"]
+
         elif duration_name == "Sender":
             return [tr["sender"]["Start"] + "_T", tr["sender"]["Stop"] + "_T", colors["sender"], linestyles["sender"], "Sender"]
         elif duration_name == "Receiver":

xlap/parse.py

@@ -27,9 +27,9 @@ def _evaluate_file(file_name, stamps, kind, measured_column, sender=False):
 
     # Drop columns of opposing side.
     if sender:
-        df.drop(_extract_stamps_by_src_and_kind(stamps, "receiver"), axis=1, inplace=True)
+        df.drop(_extract_stamps_by_src_and_kind(stamps, "receiver"), axis=1, inplace=True, errors='ignore')
     else:
-        df.drop(_extract_stamps_by_src_and_kind(stamps, "sender"), axis=1, inplace=True)
+        df.drop(_extract_stamps_by_src_and_kind(stamps, "sender"), axis=1, inplace=True, errors='ignore')
 
     # Drop rows with value 0 (as they have probably not been written out).
     res = df[df[measured_column + "_T"] != 0]
@@ -97,21 +97,28 @@ def evaluate(sender_file, receiver_file, config, kind=0):
     cr = config["cycle_reference"]
 
     # Determine Channel Duration
-    df["Transport_D"] = df[tr["receiver"]["Start"] + "_T"] - df[tr["sender"]["Stop"] + "_T"]
+    try:
+        df["Transport_D"] = df[tr["transport"]["Stop"] + "_T"] - df[tr["transport"]["Start"] + "_T"]
+    except KeyError:
+        df["Transport_D"] = df[tr["receiver"]["Start"] + "_T"] - df[tr["sender"]["Stop"] + "_T"]
 
     # Correlate Receiver Timestamps with Sender Timestamps (subtracting Channel Duration)
     for s in _stamp_name_by_src_and_type(stamps, "receiver", kind=["time"]):
         df[s + "_T"] -= df["Transport_D"]
 
-    for src in config["threads"]:
-        _generate_thread_durations(df, cr, src, stamps)
+    if config["threads"]:
+        for src in config["threads"]:
+            _generate_thread_durations(df, cr, src, stamps)
 
     _generate_durations(df, config)
 
     df["Sender_D"] = df[tr["sender"]["Stop"] + "_T"] - df[tr["sender"]["Start"] + "_T"]
     df["Receiver_D"] = df[tr["receiver"]["Stop"] + "_T"] - df[tr["receiver"]["Start"] + "_T"]
-    df["EndToEnd_D"] = df[tr["receiver"]["Stop"] + "_T"] - df[tr["sender"]["Start"] + "_T"]
-
+    try:
+        df["EndToEnd_D"] = df[tr["total"]["Stop"] + "_T"] - df[tr["total"]["Start"] + "_T"]
+    except KeyError:
+        df["EndToEnd_D"] = df[tr["receiver"]["Stop"] + "_T"] - df[tr["sender"]["Start"] + "_T"]
+    
     return df