From 2c384af157b2a96404ebce894bb4c0bd8a9f4266 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Fri, 26 Oct 2018 10:15:43 -0400 Subject: [PATCH] SPARK-1800: Add Hedge Traces --- src/data_files/files/perf_trace/index.html | 16 +- src/data_files/files/perf_trace/main.js | 219 ++++++++++++++------- 2 files changed, 164 insertions(+), 71 deletions(-) diff --git a/src/data_files/files/perf_trace/index.html b/src/data_files/files/perf_trace/index.html index 1367cca36..3e0e930c8 100644 --- a/src/data_files/files/perf_trace/index.html +++ b/src/data_files/files/perf_trace/index.html @@ -1,14 +1,14 @@ - BTS Spark Socket To Socket Requote Times + BTS Spark Socket To Socket Requote and Hedge Times @@ -47,7 +57,7 @@
-

Socket To Socket Requote Times

+

Socket To Socket Latencies

diff --git a/src/data_files/files/perf_trace/main.js b/src/data_files/files/perf_trace/main.js index e22374aa7..87b292c29 100644 --- a/src/data_files/files/perf_trace/main.js +++ b/src/data_files/files/perf_trace/main.js @@ -2,7 +2,9 @@ $( document ).ready(function (){ let urlParams = new URLSearchParams(window.location.search); num_rows = urlParams.get('r'); let show_rows = urlParams.get('showrows'); + let rows_of = urlParams.get('rowsof'); + //let trace_data_url = "./perf_trace_data"; let trace_data_url = "/perf_trace_data"; if(num_rows != null) { trace_data_url += "/" + num_rows; @@ -15,14 +17,29 @@ $( document ).ready(function (){ error: ajax_err, crossDomain: true }).done(function(result) { + if(show_rows != null) { - list_rows(show_rows, result); + if(rows_of === "quot") { + list_rows(show_rows, rows_of, result.requotes); + } + else { + list_rows(show_rows, rows_of, result.hedges); + } + } else { - if(result.length > 0){ - let summary_info = "

Host: " + result[0].host + "

"; + if(result.requotes.length > 0){ + let summary_info = "

Host: " + result.requotes[0].host + "


"; $("#output").html(summary_info); - $(result).each(display_session); + $(result.requotes).each(function (index, quot_val){ + $(result.hedges).each( function(index, hed_val){ + if(quot_val.session_name === hed_val.session_name) + { + display_session(quot_val, hed_val); + return false; + } + }); + }); } } @@ -30,29 +47,30 @@ $( document ).ready(function (){ }); -function list_rows(show_rows, data) { +function list_rows(show_rows, rows_of, data) { $.each(data, function(index, value){ if(value.session_name === show_rows){ let summary_info = ""; - summary_info += "" + - "" + - "" + - "" + - "" + - ""; + + summary_info += "" + $.each(value.rows[0], function(key, unval){ + if(key !== "trace_time" && key !== "total") + { + summary_info +=""; + } + }); + summary_info += ""; $.each(value.rows, function(key, val) { summary_info += ""; - console.log(val); - - summary_info += "" + - "" + - "" + - "" + - "" + - ""; - - + summary_info += ""; + $.each(value.rows[0], function(key, uval){ + if(key !== "trace_time" && key !== "total") + { + summary_info += ""; + } + }); + summary_info += ""; summary_info += ""; }); summary_info += "
Trace TimeOrder KeyMDSpreaderFixTotal
Trace Time" + format_title(key) + "Total
" + val.trace_time + "" + val.order_key + "" + val.md + "" + val.spreader + "" + val.fix + "" + val.total + "" + val.trace_time + "" + uval + "" + val.total + "
"; @@ -77,7 +95,26 @@ function ajax_err (jqXHR, textStatus,errorThrown) { function first_upper (str) { let ret_str = str[0].toUpperCase() + str.substring(1, str.length); - return ret_str + return ret_str; +} + +function format_title (str) +{ + let ret_str = ""; + + for(let i=0; i < str.length; i++) { + if(i === 0 || str[i-1] === "_") { + ret_str += str[i].toUpperCase(); + } + else if(str[i] === "_") { + ret_str += " "; + } + else { + ret_str += str[i]; + } + } + + return ret_str; } function generate_histogram(id, data) @@ -95,70 +132,116 @@ function generate_histogram(id, data) Plotly.newPlot(id, plot_data); } -function display_session (index, value) { - //console.log(value); - let session_info = "