Skip to content

GitLab

T
tangled
Commit 5b84f1fc authored by Findit's avatar Findit
Browse files
Options

Revert "Add a tool to render new QUIC trace format using gnuplot" 

This reverts commit 78aa0578.

Reason for revert:

Findit (https://goo.gl/kROfz5) identified CL at revision 558371 as the
culprit for failures in the build cycles as shown on:
https://findit-for-me.appspot.com/waterfall/culprit?key=ag9zfmZpbmRpdC1mb3ItbWVyRAsSDVdmU3VzcGVjdGVkQ0wiMWNocm9taXVtLzc4YWEwNTc4ZTA2Y2MyODgzNDNkMzk1Mzk3MzZhYzdjMzJhMTJlNTUM

Sample Failed Build: https://ci.chromium.org/buildbot/chromium/Linux%20x64/64263

Sample Failed Step: compile

Original change's description:
> Add a tool to render new QUIC trace format using gnuplot
> 
> Merge internal change: 195841296
> Merge internal change: 195910638
> 
> R=rch@chromium.org
> 
> Change-Id: Id9681a3360ced19d329b68e161ff897e17ef43e7
> Reviewed-on: https://chromium-review.googlesource.com/1055756
> Reviewed-by: Ryan Hamilton <rch@chromium.org>
> Commit-Queue: Victor Vasiliev <vasilvv@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#558371}

Change-Id: I533684421c474ebb17bfcc1cd7aabbc5aa7d4bd0
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/1057528
Cr-Commit-Position: refs/heads/master@{#558377}
parent 88d6260b
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 213 deletions
net/BUILD.gn
View file @ 5b84f1fc
...@@ -3443,18 +3443,6 @@ if (!is_ios) { ...@@ -3443,18 +3443,6 @@ if (!is_ios) {
"//build/win:default_exe_manifest", "//build/win:default_exe_manifest",
] ]
} }
executable("quic_trace_to_time_sequence_gnuplot") {
sources = [
"tools/quic/trace/quic_trace_to_time_sequence_gnuplot.cc",
]
deps = [
":net",
":simple_quic_tools",
"//base",
"//build/config:exe_and_shlib_deps",
"//build/win:default_exe_manifest",
]
}
} }
# This section can be updated from globbing rules using: # This section can be updated from globbing rules using:
......
net/tools/quic/trace/quic_trace_to_time_sequence_gnuplot.cc deleted 100644 → 0
View file @ 88d6260b
// Copyright (c) 2018 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// Helper script to generate time sequence plot using gnuplot.
// Accepts the trace on stdin, and outputs the gnuplot-consumable time series
// file into stdout.
#include <iostream>
#include <streambuf>
#include <string>
#include <unordered_map>
#include <unordered_set>
#include "base/command_line.h"
#include "net/quic/core/proto/quic_trace.pb.h"
std::string FLAGS_sequence = "";
bool FLAGS_filter_old_acks = true;
namespace quic_trace {
namespace {
// Calculates the amount of actual data in the packet.
size_t FrameDataInSentPacket(const Event& packet) {
if (packet.event_type() != PACKET_SENT) {
return 0;
}
size_t sent_in_packet = 0;
for (const Frame& frame : packet.frames()) {
if (frame.frame_type() != STREAM || !frame.has_stream_frame_info()) {
continue;
}
sent_in_packet += frame.stream_frame_info().length();
}
return sent_in_packet;
}
struct SentPacket {
// Offset of the stream data sent in the frame with respect to the beginning
// of the connection.
size_t offset;
// Size of frame data in the packet.
size_t size;
};
// Map of the sent packets, keyed by packet number.
using SentPacketMap = std::unordered_map<uint64_t, SentPacket>;
void PrintSentPacket(const SentPacketMap& packet_map,
uint64_t packet_number,
uint64_t time) {
auto original_packet_it = packet_map.find(packet_number);
if (original_packet_it == packet_map.end()) {
return;
}
const SentPacket& original_packet = original_packet_it->second;
std::cout << time << " " << original_packet.offset << std::endl;
std::cout << time << " " << (original_packet.offset + original_packet.size)
<< std::endl;
std::cout << std::endl;
}
void PrintTimeSequence(std::istream* trace_source) {
Trace trace;
std::string trace_raw((std::istreambuf_iterator<char>(std::cin)),
std::istreambuf_iterator<char>());
trace.ParseFromString(trace_raw);
size_t total_sent = 0;
SentPacketMap packet_map;
std::unordered_set<uint64_t> already_acknowledged;
// In a single pass, compute |packet_map| and output the requested sequence.
for (const Event& event : trace.events()) {
// Track all sent packets and their offsets in the plot.
size_t sent_in_packet = FrameDataInSentPacket(event);
if (sent_in_packet != 0) {
packet_map.emplace(event.packet_number(),
SentPacket{total_sent, sent_in_packet});
}
total_sent += sent_in_packet;
// Output sent packets.
if (sent_in_packet != 0 && FLAGS_sequence == "send") {
std::cout << event.time_us() << " " << (total_sent - sent_in_packet)
<< std::endl;
std::cout << event.time_us() << " " << total_sent << std::endl;
std::cout << std::endl;
}
// Output loss events.
if (event.event_type() == PACKET_LOST && FLAGS_sequence == "loss") {
PrintSentPacket(packet_map, event.packet_number(), event.time_us());
}
// Output acks.
if (event.event_type() == PACKET_RECEIVED) {
for (const Frame& frame : event.frames()) {
if (frame.frame_type() == ACK && FLAGS_sequence == "ack") {
for (const AckBlock& block : frame.ack_info().acked_packets()) {
for (uint64_t packet = block.first_packet();
packet <= block.last_packet(); packet++) {
if (FLAGS_filter_old_acks) {
if (already_acknowledged.count(packet) > 0) {
continue;
}
already_acknowledged.insert(packet);
}
PrintSentPacket(packet_map, packet, event.time_us());
}
}
}
}
}
}
}
} // namespace
} // namespace quic_trace
int main(int argc, char* argv[]) {
base::CommandLine::Init(argc, argv);
base::CommandLine* line = base::CommandLine::ForCurrentProcess();
if (line->HasSwitch("sequence")) {
FLAGS_sequence = line->GetSwitchValueASCII("sequence");
}
if (line->HasSwitch("nofilter_old_acks")) {
FLAGS_filter_old_acks = false;
}
if (FLAGS_sequence != "send" && FLAGS_sequence != "ack" &&
FLAGS_sequence != "loss") {
std::cerr << "The --type parameter has to be set to either 'send', 'ack' "
"or 'loss'."
<< std::endl;
return 1;
}
quic_trace::PrintTimeSequence(&std::cin);
return 0;
}
net/tools/quic/trace/time_sequence_gnuplot.sh deleted 100755 → 0
View file @ 88d6260b
#!/bin/bash
# Copyright (c) 2018 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
#
# Render a trace using gnuplot into a png file.
#
if [ -z "$1" ]; then
echo "Usage: time_sequence_gnuplot.sh path/to/trace output.png"
exit 1
fi
if [ ! -f "$1" ]; then
echo "File $1 does not exist or is not a file"
exit 1
fi
if [ -z "$2" ]; then
echo "Output file not specified"
exit 1
fi
if [ ! -x "$QUIC_TRACE_CONV_BIN" ]; then
SCRIPT_SOURCE_DIR="$(dirname "${BASH_SOURCE[0]}")"
QUIC_TRACE_CONV_BIN="$SCRIPT_SOURCE_DIR/../../../../out/Default/quic_trace_to_time_sequence_gnuplot"
fi
if [ ! -x "$QUIC_TRACE_CONV_BIN" ]; then
echo "Cannot find conversion tool binary"
exit 1
fi
TMPDIR="$(mktemp -d)"
for event_type in send ack loss; do
"$QUIC_TRACE_CONV_BIN" --sequence=$event_type < "$1" > "$TMPDIR/$event_type.txt"
done
if [ -z "$GNUPLOT_SIZE" ]; then
GNUPLOT_SIZE="7680,4320"
fi
if [ -z "$GNUPLOT_TERMINAL" ]; then
GNUPLOT_TERMINAL="png size $GNUPLOT_SIZE"
fi
gnuplot <<EOF
set terminal $GNUPLOT_TERMINAL
set output "$2"
plot \
"$TMPDIR/send.txt" with lines lt rgb "blue" title "Sent", \
"$TMPDIR/ack.txt" with lines lt rgb "green" title "Ack", \
"$TMPDIR/loss.txt" with lines lt rgb "red" title "Loss"
EOF
rm -rf "$TMPDIR"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment