From patchwork Mon Jan 4 17:47:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yordan Karadzhov X-Patchwork-Id: 11997183 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4FBB0C433E0 for ; Mon, 4 Jan 2021 17:49:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 24858206B2 for ; Mon, 4 Jan 2021 17:49:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726896AbhADRt2 (ORCPT ); Mon, 4 Jan 2021 12:49:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34358 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726626AbhADRt2 (ORCPT ); Mon, 4 Jan 2021 12:49:28 -0500 Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 07808C06138A for ; Mon, 4 Jan 2021 09:48:14 -0800 (PST) Received: by mail-ed1-x52c.google.com with SMTP id r5so28194096eda.12 for ; Mon, 04 Jan 2021 09:48:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qLHvOgsMCInonzbV5NA4to3a6X6Gs34yYw2Zrmjhe8M=; b=CeMpJ10KgFcoA2AK+7nCSCA1fmPeHjOhVyn7b5uB0uui1O+2ByFWh5KF01jcMmEH5T M8GL7piSNC89jP036HPKMh0UbQj7x4iBe1OAA+eLTO3sSFOI9+yBtRx1GkD1eVlL5KNY 9q7gUzel2SEpcTEfhv12vJcIQDeRoa2GyK2yA6tovszX5p8f5EONzY1abysDUTp67qkd dwB8m71iqH/z4H97ijCoBC3sqYNco3MG4D56Uyfp6Pqzl2yiST+6SMD1KdZSyeh1FTek RvVnTanBDTuaCVFNvYECwRTEs/om672BLc2GUWNlPSeWx6fBcfFWQ28q5OrgYR8uMb90 cIvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qLHvOgsMCInonzbV5NA4to3a6X6Gs34yYw2Zrmjhe8M=; b=JOOZ9Db1L/lNFQYYEHgfrGLYFufPcnQYOkT5fD/LNKV/s0btWGui6f+RZiEazOuaV7 vhVQLq5AY16pAOZWJHdSqo8+/9kQAdbe8Qd7RXsnPbdoCCjGmhPfIyPqk39O4o0P4OtC pN9Sw+Cw142t/g1k2NEHEwKjU9eWCW3rvf0s5B83OI3JBtInBNJgAeBO4oSLoVmIMRMw yxx6AZJKsKRMhnrDLbG9JOrYst/NdttbhS9/Vf603y2DWTk1XBRrjV9elVFexZqZL73a H1wggOLTE0hWPTfMDA8HYQeo4fN2Tr9V+KSEg0FhtGXydZI6f0YQ9kMrg9WKewDiMeNU pabw== X-Gm-Message-State: AOAM533rzksrtaI9755eHO6CwDXOVPT4ZRJ2eo0MvzMujSWLBGMKItkw Py0OFnD959MiQ0PXb+KYERg= X-Google-Smtp-Source: ABdhPJyS4T2ug2rMJpZKfge/5dYJ+qq+U66VyKZtK5G/RsYXN4XhMSBqnkZLrkbwpG0zas7QBQaFDw== X-Received: by 2002:a05:6402:139a:: with SMTP id b26mr72374032edv.47.1609782492762; Mon, 04 Jan 2021 09:48:12 -0800 (PST) Received: from localhost.localdomain ([95.87.199.238]) by smtp.gmail.com with ESMTPSA id l14sm44107750edq.35.2021.01.04.09.48.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Jan 2021 09:48:12 -0800 (PST) From: "Yordan Karadzhov (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org, "Yordan Karadzhov (VMware)" Subject: [PATCH v8 35/44] kernel-shark: Integrate streams with KsPlotTools Date: Mon, 4 Jan 2021 19:47:15 +0200 Message-Id: <20210104174724.70404-36-y.karadz@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210104174724.70404-1-y.karadz@gmail.com> References: <20210104174724.70404-1-y.karadz@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org The C++ ploting toolls are adapted in order to be able to work with the new version of the C API. Now we can handle multiple Data streams. Signed-off-by: Yordan Karadzhov (VMware) --- src/CMakeLists.txt | 4 +- src/KsPlotTools.cpp | 94 ++++++++++++++++++++++++++++++++------------- src/KsPlotTools.hpp | 4 +- 3 files changed, 71 insertions(+), 31 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fe440db..9646cbb 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -41,8 +41,8 @@ install(FILES "${KS_DIR}/src/libkshark.h" if (OPENGL_FOUND) message(STATUS "libkshark-plot") - add_library(kshark-plot SHARED libkshark-plot.c) -# KsPlotTools.cpp) + add_library(kshark-plot SHARED libkshark-plot.c + KsPlotTools.cpp) target_link_libraries(kshark-plot kshark ${GLUT_LIBRARY} diff --git a/src/KsPlotTools.cpp b/src/KsPlotTools.cpp index fe3008e..113a6c0 100644 --- a/src/KsPlotTools.cpp +++ b/src/KsPlotTools.cpp @@ -10,16 +10,13 @@ */ // C +#include #include // C++ #include #include -// OpenGL -#include -#include - // KernelShark #include "KsPlotTools.hpp" @@ -109,29 +106,45 @@ void Color::setRainbowColor(int n) ColorTable getTaskColorTable() { struct kshark_context *kshark_ctx(nullptr); + int nTasks(0), pid, *pids, i(0), *streamIds; + std::vector tempPids; ColorTable colors; - int nTasks, pid, *pids, i(0); if (!kshark_instance(&kshark_ctx)) return colors; - nTasks = kshark_get_task_pids(kshark_ctx, &pids); - if (!nTasks) + streamIds = kshark_all_streams(kshark_ctx); + for (int j = 0; j < kshark_ctx->n_streams; ++j) { + nTasks = kshark_get_task_pids(kshark_ctx, streamIds[j], &pids); + tempPids.insert(tempPids.end(), pids, pids + nTasks); + free(pids); + } + + free(streamIds); + + if (!tempPids.size()) return colors; - std::vector temp_pids(pids, pids + nTasks); - std::sort(temp_pids.begin(), temp_pids.end()); + std::sort(tempPids.begin(), tempPids.end()); - free(pids); + /* Erase duplicates. */ + tempPids.erase(unique(tempPids.begin(), tempPids.end()), + tempPids.end()); - if (temp_pids[i] == 0) { - /* The "Idle" process (pid = 0) will be plotted in black. */ + /* Erase negative (error codes). */ + auto isNegative = [](int i) {return i < 0;}; + auto it = remove_if(tempPids.begin(), tempPids.end(), isNegative); + tempPids.erase(it, tempPids.end()); + + nTasks = tempPids.size(); + if (tempPids[i] == 0) { + /* Pid <= 0 will be plotted in black. */ colors[i++] = {}; } for (; i < nTasks; ++i) { - pid = temp_pids[i]; - colors[pid].setRainbowColor(i - 1); + pid = tempPids[i]; + colors[pid].setRainbowColor(i); } return colors; @@ -145,16 +158,26 @@ ColorTable getTaskColorTable() */ ColorTable getCPUColorTable() { - struct kshark_context *kshark_ctx(nullptr); + kshark_context *kshark_ctx(nullptr); + int nCPUs, nCPUMax(0), *streamIds; + kshark_data_stream *stream; ColorTable colors; - int nCPUs; if (!kshark_instance(&kshark_ctx)) return colors; - nCPUs = tep_get_cpus(kshark_ctx->pevent); - for (int i = 0; i < nCPUs; ++i) - colors[i].setRainbowColor(i); + streamIds = kshark_all_streams(kshark_ctx); + for (int i = 0; i < kshark_ctx->n_streams; ++i) { + stream = kshark_get_data_stream(kshark_ctx, streamIds[i]); + nCPUs = stream->n_cpus; + if (nCPUMax < nCPUs) + nCPUMax = nCPUs; + } + + free(streamIds); + + for (int i = 0; i < nCPUMax; ++i) + colors[i].setRainbowColor(i + 8); return colors; } @@ -788,9 +811,10 @@ void Graph::setBin(int bin, int pidF, int pidB, const Color &col, uint8_t m) /** * @brief Process a CPU Graph. * + * @param sd: Data stream identifier. * @param cpu: The CPU core. */ -void Graph::fillCPUGraph(int cpu) +void Graph::fillCPUGraph(int sd, int cpu) { struct kshark_entry *eFront; int pidFront(0), pidBack(0); @@ -804,6 +828,7 @@ void Graph::fillCPUGraph(int cpu) eFront = nullptr; pidFront = ksmodel_get_pid_front(_histoPtr, bin, + sd, cpu, true, _collectionPtr, @@ -813,6 +838,7 @@ void Graph::fillCPUGraph(int cpu) eFront = _histoPtr->data[index]; pidBack = ksmodel_get_pid_back(_histoPtr, bin, + sd, cpu, true, _collectionPtr, @@ -820,10 +846,11 @@ void Graph::fillCPUGraph(int cpu) pidBackNoFilter = ksmodel_get_pid_back(_histoPtr, bin, - cpu, - false, - _collectionPtr, - nullptr); + sd, + cpu, + false, + _collectionPtr, + nullptr); if (pidBack != pidBackNoFilter) pidBack = KS_FILTERED_BIN; @@ -832,6 +859,7 @@ void Graph::fillCPUGraph(int cpu) if (eFront) { if (!(eFront->visible & KS_EVENT_VIEW_FILTER_MASK) && ksmodel_cpu_visible_event_exist(_histoPtr, bin, + sd, cpu, _collectionPtr, &index)) { @@ -874,6 +902,7 @@ void Graph::fillCPUGraph(int cpu) */ pidBackNoFilter = ksmodel_get_pid_back(_histoPtr, LOWER_OVERFLOW_BIN, + sd, cpu, false, _collectionPtr, @@ -882,6 +911,7 @@ void Graph::fillCPUGraph(int cpu) /* Now get the Pid back, applying filters. */ pidBack = ksmodel_get_pid_back(_histoPtr, LOWER_OVERFLOW_BIN, + sd, cpu, true, _collectionPtr, @@ -916,9 +946,10 @@ void Graph::fillCPUGraph(int cpu) /** * @brief Process a Task Graph. * + * @param sd: Data stream identifier. * @param pid: The Process Id of the Task. */ -void Graph::fillTaskGraph(int pid) +void Graph::fillTaskGraph(int sd, int pid) { int cpuFront, cpuBack(0), pidFront(0), pidBack(0), lastCpu(-1), bin(0); struct kshark_entry *eFront; @@ -972,6 +1003,7 @@ void Graph::fillTaskGraph(int pid) */ int cpuPid = ksmodel_get_pid_back(_histoPtr, bin, + sd, lastCpu, false, nullptr, // No collection @@ -998,6 +1030,7 @@ void Graph::fillTaskGraph(int pid) eFront = nullptr; /* Get the CPU used by this task. */ cpuFront = ksmodel_get_cpu_front(_histoPtr, bin, + sd, pid, false, _collectionPtr, @@ -1006,6 +1039,7 @@ void Graph::fillTaskGraph(int pid) eFront = _histoPtr->data[index]; cpuBack = ksmodel_get_cpu_back(_histoPtr, bin, + sd, pid, false, _collectionPtr, @@ -1020,6 +1054,7 @@ void Graph::fillTaskGraph(int pid) */ pidFront = ksmodel_get_pid_front(_histoPtr, bin, + sd, cpuFront, false, _collectionPtr, @@ -1027,6 +1062,7 @@ void Graph::fillTaskGraph(int pid) pidBack = ksmodel_get_pid_back(_histoPtr, bin, + sd, cpuBack, false, _collectionPtr, @@ -1037,6 +1073,7 @@ void Graph::fillTaskGraph(int pid) if (!(eFront->visible & KS_EVENT_VIEW_FILTER_MASK) && ksmodel_task_visible_event_exist(_histoPtr, bin, + sd, pid, _collectionPtr, &index)) { @@ -1062,8 +1099,9 @@ void Graph::fillTaskGraph(int pid) * No data from this Task in the very first bin. Use the Lower * Overflow Bin to retrieve the CPU used by the task (if any). */ - cpuFront = ksmodel_get_cpu_back(_histoPtr, LOWER_OVERFLOW_BIN, pid, - false, _collectionPtr, nullptr); + cpuFront = ksmodel_get_cpu_back(_histoPtr, LOWER_OVERFLOW_BIN, + sd, pid, + false, _collectionPtr, nullptr); if (cpuFront >= 0) { /* * The Lower Overflow Bin contains data from this Task. @@ -1075,6 +1113,7 @@ void Graph::fillTaskGraph(int pid) pidCpu0 = ksmodel_get_pid_back(_histoPtr, 0, + sd, cpuFront, false, _collectionPtr, @@ -1082,6 +1121,7 @@ void Graph::fillTaskGraph(int pid) pidCpuLOB = ksmodel_get_pid_back(_histoPtr, LOWER_OVERFLOW_BIN, + sd, cpuFront, false, _collectionPtr, diff --git a/src/KsPlotTools.hpp b/src/KsPlotTools.hpp index ee447f1..6e66373 100644 --- a/src/KsPlotTools.hpp +++ b/src/KsPlotTools.hpp @@ -432,9 +432,9 @@ public: /** @brief Set the Hash table of Task's colors. */ void setBinColorTablePtr(KsPlot::ColorTable *ct) {_binColors = ct;} - void fillCPUGraph(int cpu); + void fillCPUGraph(int sd, int cpu); - void fillTaskGraph(int pid); + void fillTaskGraph(int sd, int pid); void draw(float s = 1);