From 5d58aee53a916d09d77b817de73c08b9ed7e81dd Mon Sep 17 00:00:00 2001 From: Rafael Roquetto Date: Thu, 28 Jul 2022 09:41:21 +1000 Subject: [PATCH] tracegen: add support for QSize Change-Id: I7228f5ebbcbd577a66a7a368fb4d64c4c7e55a25 Reviewed-by: Rafael Roquetto Reviewed-by: Shawn Rutledge --- src/tools/tracegen/etw.cpp | 4 ++++ src/tools/tracegen/lttng.cpp | 4 ++++ src/tools/tracegen/provider.cpp | 3 ++- src/tools/tracegen/provider.h | 1 + 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/tools/tracegen/etw.cpp b/src/tools/tracegen/etw.cpp index cdda3bf232..cf185c3fdd 100644 --- a/src/tools/tracegen/etw.cpp +++ b/src/tools/tracegen/etw.cpp @@ -41,6 +41,10 @@ static void writeEtwMacro(QTextStream &stream, const Tracepoint::Field &field) << "TraceLoggingValue(" << name << ".width(), \"width\"), " << "TraceLoggingValue(" << name << ".height(), \"height\")"; return; + case Tracepoint::Field::QtSize: + stream << "TraceLoggingValue(" << name << ".width(), \"width\"), " + << "TraceLoggingValue(" << name << ".height(), \"height\")"; + return; case Tracepoint::Field::Pointer: stream << "TraceLoggingPointer(" << name << ", \"" << name << "\")"; return; diff --git a/src/tools/tracegen/lttng.cpp b/src/tools/tracegen/lttng.cpp index 46168e3c5a..dd7d405e7a 100644 --- a/src/tools/tracegen/lttng.cpp +++ b/src/tools/tracegen/lttng.cpp @@ -61,6 +61,10 @@ static void writeCtfMacro(QTextStream &stream, const Tracepoint::Field &field) << "ctf_integer(int, width, " << name << ".width()) " << "ctf_integer(int, height, " << name << ".height()) "; return; + case Tracepoint::Field::QtSize: + stream << "ctf_integer(int, width, " << name << ".width()) " + << "ctf_integer(int, height, " << name << ".height()) "; + return; case Tracepoint::Field::Unknown: justified_worry("Cannot deduce CTF type for '%s %s'", qPrintable(paramType), qPrintable(name)); diff --git a/src/tools/tracegen/provider.cpp b/src/tools/tracegen/provider.cpp index 11322e951c..059a03ca8b 100644 --- a/src/tools/tracegen/provider.cpp +++ b/src/tools/tracegen/provider.cpp @@ -134,7 +134,8 @@ static Tracepoint::Field::BackendType backendType(QString rawType) { "QString", Tracepoint::Field::QtString }, { "QByteArray", Tracepoint::Field::QtByteArray }, { "QUrl", Tracepoint::Field::QtUrl }, - { "QRect", Tracepoint::Field::QtRect } + { "QRect", Tracepoint::Field::QtRect }, + { "QSize", Tracepoint::Field::QtSize } }; auto backendType = [](const QString &rawType) { diff --git a/src/tools/tracegen/provider.h b/src/tools/tracegen/provider.h index 28bbb75959..86749de502 100644 --- a/src/tools/tracegen/provider.h +++ b/src/tools/tracegen/provider.h @@ -32,6 +32,7 @@ struct Tracepoint QtByteArray, QtUrl, QtRect, + QtSize, Unknown };