From patchwork Tue Jan 5 15:54:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yordan Karadzhov X-Patchwork-Id: 11999645 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 D4822C433DB for ; Tue, 5 Jan 2021 15:55:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A16E422BEF for ; Tue, 5 Jan 2021 15:55:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726151AbhAEPzs (ORCPT ); Tue, 5 Jan 2021 10:55:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41840 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725838AbhAEPzs (ORCPT ); Tue, 5 Jan 2021 10:55:48 -0500 Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [IPv6:2a00:1450:4864:20::52e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 88BBBC061793 for ; Tue, 5 Jan 2021 07:55:07 -0800 (PST) Received: by mail-ed1-x52e.google.com with SMTP id u19so663964edx.2 for ; Tue, 05 Jan 2021 07:55:07 -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=IHaPZ/qiEW3SYewlPRXrjIxIYrH5KJu/4mgTm5/ZJWA=; b=diuTCpDngfavCIiBGCWTKUB6Tw8HNxBvg0HWQJn9FK/Oyh8At5x+Nm6Ub3dVIcsK8Z xWblQHQobYUMPiQsU32lG5sX+sznT/WIb1opp40qM+A4A+msITK5yUczDBUnXA4sBLud Dn9D7TSw5uGKU2aC/3DsNxTmaGRBPzl1D7Zfh9dtBrnWgBl7AEk718+GicR6wBJDjKbw owL5vOIgJkEO+9eTvp5Jff6urX43Xti7CztHnd+Lhfmbd6BIDQ3YiXCMW2P6SEIjkL3y a4EA6qx3E/9p0gAohF/nCkZ5FPEnVNPDJDIchalghSqqrB6WquvACdFBsEmeeMWJGq8c SRSg== 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=IHaPZ/qiEW3SYewlPRXrjIxIYrH5KJu/4mgTm5/ZJWA=; b=WJT2xNAB6sqfljN3BiWB0gnz+y+0XVRYhjSG5ZHi8/5/7FJxN/GZFWjCH97gEwsWhD RvSieOPgaHZsQ6aoEzE81ytuA34M9lJIZULKQoD04FE4RToXfp+G0spQTS4EGUX1A2HO g56Po/B2zynRAckmgRLDy/EQHAZg6s9nv/0d6Lg/OSKZy7Yd+8FX2gcHLxcImHphMF0K vvsd0ErWn9jpfmfqS0LVVTRUjhm8DyFLa7MZ4Dkhrx81CPB4pAGSSirXYA46JFCksnvE PxuYKYpADc+KxHxLpg48ri3i248TCfz+X5rsLsYpmxIyOzjRjqgAh1PsW7dDhkKqjBVD uOsQ== X-Gm-Message-State: AOAM531U+ptgVzxcv/V3I2GrpuBsiO5+TLfOSHMPyQurvdjOYV5yjTIS cia1d4rHHBwVlfeo/cmRLHdJSAguJpRHhQ== X-Google-Smtp-Source: ABdhPJx/uPmYPR43Kac3QyJqcS4GNeGOoJM6lJVj8t98xeftEvKlutc31M9FbRmfdHF/RFj38LVP8A== X-Received: by 2002:a50:f392:: with SMTP id g18mr392341edm.306.1609862106188; Tue, 05 Jan 2021 07:55:06 -0800 (PST) Received: from localhost.localdomain ([95.87.199.238]) by smtp.gmail.com with ESMTPSA id t12sm45367882edy.49.2021.01.05.07.55.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Jan 2021 07:55:05 -0800 (PST) From: "Yordan Karadzhov (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org, "Yordan Karadzhov (VMware)" Subject: [PATCH 1/5] kernel-shark: Start using libtracecmd Date: Tue, 5 Jan 2021 17:54:49 +0200 Message-Id: <20210105155453.41228-2-y.karadz@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210105155453.41228-1-y.karadz@gmail.com> References: <20210105155453.41228-1-y.karadz@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org libtracecmd is now a stand-alone libraries, similar to libtraceevent and libtracefs. Start building and linking KernelShark against this independent library. Signed-off-by: Yordan Karadzhov (VMware) --- CMakeLists.txt | 4 +- build/FindTraceCmd.cmake | 101 ++++++++++++++++++++++--------------- build/FindTraceEvent.cmake | 1 - build/FindTraceFS.cmake | 1 - src/CMakeLists.txt | 2 +- src/libkshark-tepdata.c | 18 +++---- 6 files changed, 72 insertions(+), 55 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 303e47e..59bbe72 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,11 +21,11 @@ if (NOT _LIBDIR) set(_LIBDIR "${_INSTALL_PREFIX}/lib") endif (NOT _LIBDIR) -include(${KS_DIR}/build/FindTraceCmd.cmake) - set(CMAKE_MODULE_PATH "${KS_DIR}/build") find_package(TraceEvent REQUIRED) find_package(TraceFS REQUIRED) +find_package(TraceCmd REQUIRED) + find_package(JSONC REQUIRED) find_package(Doxygen) diff --git a/build/FindTraceCmd.cmake b/build/FindTraceCmd.cmake index 5df2789..23eefed 100644 --- a/build/FindTraceCmd.cmake +++ b/build/FindTraceCmd.cmake @@ -1,59 +1,78 @@ -# Find traceevent and trace-cmd -# This module finds an installed trace-cmd package. -# -# It sets the following variables: -# TRACEEVENT_LIBRARY, traceevent the library. -# TRACEEVENT_FOUND, If false, do not try to use traceevent. -# -# TRACECMD_INCLUDE_DIR, where to find trace-cmd header. -# TRACEFS_INCLUDE_DIR, where to find tracefs header. -# TRACEFS_LIBRARY, the tracefs library. -# TRACECMD_LIBRARY, the trace-cmd library. -# TRACECMD_FOUND, If false, do not try to use trace-cmd. +# SPDX-License-Identifier: LGPL-2.1 -# MESSAGE(" Looking for trace-cmd ...") +#[=======================================================================[.rst: +FindTraceCmd +------- -# First search in the user provided paths. -if (CMAKE_BUILD_TYPE MATCHES Debug) +Finds the tracecmd library. - find_program(TRACECMD_EXECUTABLE NAMES trace-cmd - PATHS $ENV{TRACE_CMD}/tracecmd/ - NO_DEFAULT_PATH) +Imported Targets +^^^^^^^^^^^^^^^^ -endif (CMAKE_BUILD_TYPE MATCHES Debug) +This module defines the :prop_tgt:`IMPORTED` targets: -if (NOT TRACECMD_EXECUTABLE) +``trace::cmd`` + Defined if the system has libtracecmd. - set(TRACECMD_EXECUTABLE "${_INSTALL_PREFIX}/bin/trace-cmd") +Result Variables +^^^^^^^^^^^^^^^^ -endif (NOT TRACECMD_EXECUTABLE) +``TraceCmd_FOUND`` + True if the system has the libtracecmd library. +``TraceCmd_VERSION`` + The version of the libtracecmd library which was found. +``TraceCmd_INCLUDE_DIRS`` + Include directories needed to use libtracecmd. +``TraceCmd_LIBRARIES`` + Libraries needed to link to libtracecmd. -find_path(TRACECMD_INCLUDE_DIR NAMES trace-cmd/trace-cmd.h - PATHS $ENV{TRACE_CMD}/include/ - NO_DEFAULT_PATH) +Cache Variables +^^^^^^^^^^^^^^^ -find_library(TRACECMD_LIBRARY NAMES trace-cmd/libtracecmd.a - PATHS $ENV{TRACE_CMD}/lib/ - NO_DEFAULT_PATH) +``TraceCmd_INCLUDE_DIR`` + The directory containing ``trace-cmd.h``. +``TraceCmd_LIBRARY`` + The path to the tracecmd library. -# If not found, search in the default system paths. Note that if the previous -# search was successful "find_path" will do nothing this time. -find_program(TRACECMD_EXECUTABLE NAMES trace-cmd) -find_path(TRACECMD_INCLUDE_DIR NAMES trace-cmd/trace-cmd.h) -find_library(TRACECMD_LIBRARY NAMES trace-cmd/libtracecmd.so) +#]=======================================================================] -IF (TRACECMD_INCLUDE_DIR AND TRACECMD_LIBRARY) +find_package(PkgConfig QUIET) +pkg_check_modules(PC_TraceCmd QUIET libtracecmd) - SET(TRACECMD_FOUND TRUE) +set(TraceCmd_VERSION ${PC_TraceCmd_VERSION}) +set(TraceCmd_DEFINITIONS ${PC_TraceCmd_CFLAGS_OTHER}) -ENDIF (TRACECMD_INCLUDE_DIR AND TRACECMD_LIBRARY) +find_path(TraceCmd_INCLUDE_DIR NAMES trace-cmd/trace-cmd.h + HINTS ${PC_TraceCmd_INCLUDE_DIRS} + ${PC_TraceCmd_INCLUDEDIR}) -IF (TRACECMD_FOUND) +find_library(TraceCmd_LIBRARY NAMES tracecmd libtracecmd + HINTS ${PC_TraceCmd_LIBDIR} + ${PC_TraceCmdLIBRARY_DIRS}) - MESSAGE(STATUS "Found trace-cmd: ${TRACECMD_LIBRARY}") +mark_as_advanced(TraceCmd_INCLUDE_DIR TraceCmd_LIBRARY) -ELSE (TRACECMD_FOUND) +include(FindPackageHandleStandardArgs) - MESSAGE(FATAL_ERROR "\nCould not find trace-cmd!\n") +find_package_handle_standard_args(TraceCmd DEFAULT_MSG + TraceCmd_LIBRARY TraceCmd_INCLUDE_DIR) -ENDIF (TRACECMD_FOUND) +if(TraceCmd_FOUND) + + set(TraceCmd_LIBRARIES ${TraceCmd_LIBRARY}) + set(TraceCmd_INCLUDE_DIRS ${TraceCmd_INCLUDE_DIR}) + + if(NOT TARGET trace::cmd) + add_library(trace::cmd UNKNOWN IMPORTED) + + set_target_properties(trace::cmd + PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${TraceCmd_INCLUDE_DIRS}" + INTERFACE_COMPILE_DEFINITIONS "${TraceCmd_DEFINITIONS}" + IMPORTED_LINK_INTERFACE_LANGUAGES "C" + IMPORTED_LOCATION "${TraceCmd_LIBRARIES}") + endif() + +endif() + +find_program(TRACECMD_EXECUTABLE NAMES trace-cmd) diff --git a/build/FindTraceEvent.cmake b/build/FindTraceEvent.cmake index 8525697..f3feca9 100644 --- a/build/FindTraceEvent.cmake +++ b/build/FindTraceEvent.cmake @@ -1,4 +1,3 @@ - #[=======================================================================[.rst: FindTraceevent ------- diff --git a/build/FindTraceFS.cmake b/build/FindTraceFS.cmake index 982a61d..2a5f7bd 100644 --- a/build/FindTraceFS.cmake +++ b/build/FindTraceFS.cmake @@ -1,4 +1,3 @@ - #[=======================================================================[.rst: FindTraceFS ------- diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 285f88a..b393468 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -9,7 +9,7 @@ add_library(kshark SHARED libkshark.c libkshark-configio.c libkshark-collection.c) -target_link_libraries(kshark ${TRACECMD_LIBRARY} +target_link_libraries(kshark trace::cmd trace::fs trace::event jsonc::jsonc diff --git a/src/libkshark-tepdata.c b/src/libkshark-tepdata.c index a82f5c5..724cff2 100644 --- a/src/libkshark-tepdata.c +++ b/src/libkshark-tepdata.c @@ -277,7 +277,7 @@ static void free_rec_list(struct rec_list **rec_list, int n_cpus, temp_rec = rec_list[cpu]; rec_list[cpu] = temp_rec->next; if (type == REC_RECORD) - free_record(temp_rec->rec); + tracecmd_free_record(temp_rec->rec); free(temp_rec); } } @@ -379,7 +379,7 @@ static ssize_t get_records(struct kshark_context *kshark_ctx, tep_filter_match(adv_filter, rec) != FILTER_MATCH) unset_event_filter_flag(kshark_ctx, entry); - free_record(rec); + tracecmd_free_record(rec); break; } /* REC_ENTRY */ } @@ -571,7 +571,7 @@ static ssize_t tepdata_load_matrix(struct kshark_data_stream *stream, * * @param kshark_ctx: Input location for the session context pointer. * @param sd: Data stream identifier. - * @param data_rows: Output location for the trace data. Use free_record() + * @param data_rows: Output location for the trace data. Use tracecmd_free_record() * to free the elements of the outputted array. * * @returns The size of the outputted data in the case of success, or a @@ -657,7 +657,7 @@ static const int tepdata_get_event_id(struct kshark_data_stream *stream, if (record) event_id = tep_data_type(kshark_get_tep(stream), record); - free_record(record); + tracecmd_free_record(record); pthread_mutex_unlock(&stream->input_mutex); } @@ -749,7 +749,7 @@ static const int tepdata_get_pid(struct kshark_data_stream *stream, if (record) pid = tep_data_pid(kshark_get_tep(stream), record); - free_record(record); + tracecmd_free_record(record); pthread_mutex_unlock(&stream->input_mutex); } @@ -798,7 +798,7 @@ static char *tepdata_get_latency(struct kshark_data_stream *stream, tep_print_event(kshark_get_tep(stream), &seq, record, "%s", TEP_PRINT_LATENCY); - free_record(record); + tracecmd_free_record(record); pthread_mutex_unlock(&stream->input_mutex); @@ -869,7 +869,7 @@ static char *tepdata_get_info(struct kshark_data_stream *stream, if (event) info = get_info_str(stream, record, event); - free_record(record); + tracecmd_free_record(record); pthread_mutex_unlock(&stream->input_mutex); @@ -1178,7 +1178,7 @@ int tepdata_read_event_field(struct kshark_data_stream *stream, ret = tep_read_number_field(evt_field, record->data, (unsigned long long *) val); - free_record(record); + tracecmd_free_record(record); return ret; } @@ -1308,7 +1308,7 @@ static int kshark_tep_stream_init(struct kshark_data_stream *stream, goto fail; tep_handle->input = input; - tep_handle->tep = tracecmd_get_pevent(tep_handle->input); + tep_handle->tep = tracecmd_get_tep(tep_handle->input); if (!tep_handle->tep) goto fail; From patchwork Tue Jan 5 15:54:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yordan Karadzhov X-Patchwork-Id: 11999647 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 D2F72C433E6 for ; Tue, 5 Jan 2021 15:55:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A6EE622BEF for ; Tue, 5 Jan 2021 15:55:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726711AbhAEPzt (ORCPT ); Tue, 5 Jan 2021 10:55:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41846 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725838AbhAEPzt (ORCPT ); Tue, 5 Jan 2021 10:55:49 -0500 Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8FF5AC061795 for ; Tue, 5 Jan 2021 07:55:08 -0800 (PST) Received: by mail-ej1-x62d.google.com with SMTP id jx16so398431ejb.10 for ; Tue, 05 Jan 2021 07:55:08 -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=E6i4k+fmu5D1EA86UitaEBftZMpwJQPBgH1+4VUiYCk=; b=oERo5bP6NBark/fv2nj6cp15/XdvldyBmkLlyCSRPJpQ8iCwRU20BPSGT7KBpV/q2Z HNGVpvZLFfpSCl0gb+k3RnsrcTlSHpUrFCjhTY4e51geIDvAD71WdhHRyHL52HeJHkyP 96uhFllURIwl+SycZYiq1Fq2Irpex0EpyZGe30H9KUBRLHgWNNCJvmfEmySDJ//H6bPe YxkYJfh8FVs4g2w2HMr5Wsvq8Jnc8ZRvO7PV1tsXAL4B8AFTqp+a40xQ2U0DMVuGf+iQ 8A5XIstkBVOl9YvYPyRmLWCOgOX7hH0lSbWti3x5/aKqpwIdiupODsDFEq+RHS7F56ET sPcA== 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=E6i4k+fmu5D1EA86UitaEBftZMpwJQPBgH1+4VUiYCk=; b=FmdyAr+b+iKA7oZ62nbnD1MviSjTxroOsIy0eRQKgi1R4Yq6B+A9H+0/OiiU5S9Yp+ QGREM52wYOCOCfx8YBct3fhX0p7M1o9PMeXCp1IjSrJ8cdR5XuihkOqLMqd2d+XQrRDF YC8canuuXW/59peRtNPBNN2Tr6C2/xvFYd3iDjBK7uBTm99EQwtOmWJrfUwu/OHhgWk6 YKEjqZFNHNIb/4uupjY7zH1L0hIkmH3zH/UEONrC5uS2IZQlQj46yemiR+UYOMXlPjhi shfq2z0fprjMgG9G0NIh5ZpS8SYtXFNJt1U9iVQbtEYcc5g9ns9iPa/Eh61MaxSRnaXs +SIA== X-Gm-Message-State: AOAM5303v5yFGqmLLXxEtDHrlWp+GSk1i/ui6lc4d+o08+qjgWCssqFm PhQS+7WPSqxk3NlI3F646p4qFuXerQpwZw== X-Google-Smtp-Source: ABdhPJw8oaD2tUln1o/eG9LZiNY1ybXvswDjjhoemuulXAMi9O5/hhl3zY1dhEGS/Zt80qE7Xj/ktQ== X-Received: by 2002:a17:906:1955:: with SMTP id b21mr70813415eje.236.1609862107353; Tue, 05 Jan 2021 07:55:07 -0800 (PST) Received: from localhost.localdomain ([95.87.199.238]) by smtp.gmail.com with ESMTPSA id t12sm45367882edy.49.2021.01.05.07.55.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Jan 2021 07:55:06 -0800 (PST) From: "Yordan Karadzhov (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org, "Yordan Karadzhov (VMware)" Subject: [PATCH 2/5] kernel-shark: Add missing SPDX license identifiers Date: Tue, 5 Jan 2021 17:54:50 +0200 Message-Id: <20210105155453.41228-3-y.karadz@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210105155453.41228-1-y.karadz@gmail.com> References: <20210105155453.41228-1-y.karadz@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org Signed-off-by: Yordan Karadzhov (VMware) --- build/FindTraceEvent.cmake | 2 ++ build/FindTraceFS.cmake | 2 ++ 2 files changed, 4 insertions(+) diff --git a/build/FindTraceEvent.cmake b/build/FindTraceEvent.cmake index f3feca9..ae391b6 100644 --- a/build/FindTraceEvent.cmake +++ b/build/FindTraceEvent.cmake @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-2.1 + #[=======================================================================[.rst: FindTraceevent ------- diff --git a/build/FindTraceFS.cmake b/build/FindTraceFS.cmake index 2a5f7bd..82fa012 100644 --- a/build/FindTraceFS.cmake +++ b/build/FindTraceFS.cmake @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-2.1 + #[=======================================================================[.rst: FindTraceFS ------- From patchwork Tue Jan 5 15:54:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yordan Karadzhov X-Patchwork-Id: 11999649 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 BEEE6C433DB for ; Tue, 5 Jan 2021 15:55:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 99E5222C7C for ; Tue, 5 Jan 2021 15:55:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726789AbhAEPzu (ORCPT ); Tue, 5 Jan 2021 10:55:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41850 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725838AbhAEPzu (ORCPT ); Tue, 5 Jan 2021 10:55:50 -0500 Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 93D1CC061796 for ; Tue, 5 Jan 2021 07:55:09 -0800 (PST) Received: by mail-ed1-x534.google.com with SMTP id h16so609024edt.7 for ; Tue, 05 Jan 2021 07:55:09 -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=k9VlewqD6Kum8oxQTseU3WP7mcm9thefyxkzRj4BMQs=; b=PtboCqwYKFfxvUZeHKXH1ViTk+VbKhF+jL/fE7lUaDezg6C4KqT9Ae3zIoWFccL4mi uny9T/nh+WL8tjDUwE4ElnDVp2f7hNnIkEUZuhp/8zYfigmpXiIy2nGps/FXVllOZhm1 qz6TiyrFdE6BY70mc/Adr1ONuew223Iz16PGzO2cHMWpOuqO/SfpAYbXHL13+j3yOmS8 TZXSx1PA3BJTbhoRcP3lzWMNerAUo2RE9/6sjcgzr4ZJM0DNDZ0eD6NHpdOundsWFcNP TNXtYyBkOh5fXG/2ratHUbBBZFEGxOtZQNwd+S3RGEJmGLgLghkHZYprJWnw0rfsim38 qGSw== 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=k9VlewqD6Kum8oxQTseU3WP7mcm9thefyxkzRj4BMQs=; b=HD/I55Gd+2nKoW2uR0wbiMgFWdCyOCKF0cNdAkJaM7PLsKOrwc6JCufEj/yyDwH74o XJ3K6mbPyrZB0nUONZWpCdE2IqCYBevMzNI2j5Gu/Yv9jOJTEqxCZRjB6AVqsloAFs1Z F9sPyEiNW/flnUpf+hBq2DuyCBzfiruAxYhR7Y1AWp3cS8b4IEjACpiKJKF0LGpP68/a 4LkKU975kBkSjAQfWbqP1n2wWoY2tH4c5xcBWSj1JAicG+eotrERHh7e4MUCv12n5i8h usfLfLumtGtynIwnMwPcDCZKzKL0dlmPiYow7H9GtYMzdQhoOTXKPH3evNvrJpbEkwrt 2HRQ== X-Gm-Message-State: AOAM531btzgTgMquhh1w292p3z++c84fJlhH14Hpcpsg1NSFDAViInFy PZk+la51VCcDm/F3DKdgWK4= X-Google-Smtp-Source: ABdhPJx6akOVQCBm6TAB78GNHn2h+BpjV1VZEQTX8JFEahPTK5NNYaTzwaQ3kR20yYbLAOVpbUP1QQ== X-Received: by 2002:a05:6402:1c90:: with SMTP id cy16mr375531edb.73.1609862108357; Tue, 05 Jan 2021 07:55:08 -0800 (PST) Received: from localhost.localdomain ([95.87.199.238]) by smtp.gmail.com with ESMTPSA id t12sm45367882edy.49.2021.01.05.07.55.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Jan 2021 07:55:07 -0800 (PST) From: "Yordan Karadzhov (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org, "Yordan Karadzhov (VMware)" Subject: [PATCH 3/5] kernel-shark: Change default libraries install location Date: Tue, 5 Jan 2021 17:54:51 +0200 Message-Id: <20210105155453.41228-4-y.karadz@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210105155453.41228-1-y.karadz@gmail.com> References: <20210105155453.41228-1-y.karadz@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org The default installation path for the KernelShark libraries changes from /usr/local/lib/kernelshark/ to /usr/local/lib64 (or /usr/local/lib on 32 but systems). This is done in order to be consistent with the install locations of libtraceevent, libtracefs and libtracecmd. Signed-off-by: Yordan Karadzhov (VMware) --- CMakeLists.txt | 28 ++++++++++++++++++++++------ src/CMakeLists.txt | 6 +++--- 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 59bbe72..543d7da 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,13 +13,28 @@ message("\n project: Kernel Shark: (version: ${KS_VERSION_STRING})\n") set(KS_DIR ${CMAKE_SOURCE_DIR}) -if (NOT _INSTALL_PREFIX) +execute_process(COMMAND bash "-c" "echo __LP64__ | ${CMAKE_C_COMPILER} -E -x c - | tail -n 1" + OUTPUT_VARIABLE __LP64__) + +if (NOT _INSTALL_PREFIX AND NOT _LIBDIR) + set(_INSTALL_PREFIX "/usr/local") -endif (NOT _INSTALL_PREFIX) -if (NOT _LIBDIR) - set(_LIBDIR "${_INSTALL_PREFIX}/lib") -endif (NOT _LIBDIR) + if (__LP64__ MATCHES 1) + set(_LIBDIR "/usr/local/lib64") + else (__LP64__ MATCHES 1) + set(_LIBDIR "/usr/local/lib") + endif (__LP64__ MATCHES 1) + +elseif (NOT _INSTALL_PREFIX) + + set(_INSTALL_PREFIX "/usr/local") + +elseif (NOT _LIBDIR) + + set(_LIBDIR "${_INSTALL_PREFIX}/lib") + +endif () set(CMAKE_MODULE_PATH "${KS_DIR}/build") find_package(TraceEvent REQUIRED) @@ -71,7 +86,8 @@ set(KS_ICON_FIN KS_icon_fin.svg) set(KS_LOGO KS_logo_symbol.svg) set(KS_LOGO_LABEL KS_logo_horizontal.svg) -set(CMAKE_INSTALL_RPATH "${_LIBDIR}/${KS_APP_NAME}/") +set(CMAKE_INSTALL_RPATH "${_LIBDIR}") +set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) if (CMAKE_BUILD_TYPE MATCHES Package) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b393468..fe3a3eb 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -17,7 +17,7 @@ target_link_libraries(kshark trace::cmd set_target_properties(kshark PROPERTIES SUFFIX ".so.${KS_VERSION_STRING}") -install(TARGETS kshark LIBRARY DESTINATION ${_LIBDIR}/${KS_APP_NAME}) +install(TARGETS kshark LIBRARY DESTINATION ${_LIBDIR}) if (OPENGL_FOUND) @@ -31,7 +31,7 @@ if (OPENGL_FOUND) set_target_properties(kshark-plot PROPERTIES SUFFIX ".so.${KS_VERSION_STRING}") - install(TARGETS kshark-plot LIBRARY DESTINATION ${_LIBDIR}/${KS_APP_NAME}) + install(TARGETS kshark-plot LIBRARY DESTINATION ${_LIBDIR}) endif (OPENGL_FOUND) @@ -84,7 +84,7 @@ if (Qt5Widgets_FOUND AND Qt5Network_FOUND) install(TARGETS ${KS_APP_NAME} kshark-record kshark-gui RUNTIME DESTINATION ${_INSTALL_PREFIX}/bin/ - LIBRARY DESTINATION ${_LIBDIR}/${KS_APP_NAME}/) + LIBRARY DESTINATION ${_LIBDIR}) install(FILES "${KS_DIR}/${KS_APP_NAME}.desktop" DESTINATION ${_INSTALL_PREFIX}/share/applications/) From patchwork Tue Jan 5 15:54:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yordan Karadzhov X-Patchwork-Id: 11999651 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 11933C433E6 for ; Tue, 5 Jan 2021 15:55:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D5D0F22BF5 for ; Tue, 5 Jan 2021 15:55:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726827AbhAEPzv (ORCPT ); Tue, 5 Jan 2021 10:55:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41856 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725838AbhAEPzv (ORCPT ); Tue, 5 Jan 2021 10:55:51 -0500 Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CD556C061798 for ; Tue, 5 Jan 2021 07:55:10 -0800 (PST) Received: by mail-ej1-x62e.google.com with SMTP id b9so555063ejy.0 for ; Tue, 05 Jan 2021 07:55:10 -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=h8maH0/7C6vhTfpgbPu1SQ5CGs+hRtNyW9R3dPCIHu4=; b=GjY7YxfTWy8dg80R+sblTnoESX/YTehwRO7Gc0PN4BcjJHVK9c+MP6N2Plo8yTGlS9 YiAWGqK5M8HBEp9xtC4BLhrhl8MmAOb0gmiB+gA9zV+RNxoX0BOTsdUeqLLLLChjoxWM o5lC4CdHLTmJNFCkw+27au82fGnJzze5sy9uZT1MMkpcP/fIzUhMxvoscp31o3Yk2Kxv +YA8tBegH8WtxtDZDRKW3W/uRvcj6PAbDU/JS3pE7QRn6lSCKshLRI76c+OwUpdauew9 lml50XH9+oOPtbelHqzTGZW89GuvhDLAenQe1eiHHWaYYthqZXqTkqp8It0MkOIZ4JUl f8jw== 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=h8maH0/7C6vhTfpgbPu1SQ5CGs+hRtNyW9R3dPCIHu4=; b=H03BC20ciIcT9a+o4GokaEs6muGYDFy/+/RbY20dYkPzgHdkbK9VC4SIJDtMOBYV2x c3xDrzM07fHALG7GQjxzBw7ctxTOzfM0IlscSBohytuXMloK6p0HVFGXvaaBK4rSsd22 oLViwggKr1u2Up8XmLjsOJqMwzBZQSGNGbBxezvzEmnA/jrNR1YhUtMqHJ379p2hwFtw 5vDbO+OWRVGZjTeNHId+lv9cEZX6LnyzMmXIuT3QJ5J0uMnn5faTodj240rmRikDYtxZ BJmFxsOxZJZOUZ7yt8AOCWrBDh/m+0pUYihdWh7uXQq+HWL1VfBp+btyjZ9zTTskOLs+ J7iA== X-Gm-Message-State: AOAM531AudP05HhjzfJEMrMhp1tYXS1QZV1gm45VUdMn5aNySkjALZTI 8FgCkqhwt9mDLtPpc+UUmS0= X-Google-Smtp-Source: ABdhPJwBBOU6IU7uNcAI9FQoOHFzC2Z6U4bPduND1NbyI92yVLGHf6Ajl1kTZrAXHvJt8cZzUj24jg== X-Received: by 2002:a17:906:7b8d:: with SMTP id s13mr70550570ejo.479.1609862109575; Tue, 05 Jan 2021 07:55:09 -0800 (PST) Received: from localhost.localdomain ([95.87.199.238]) by smtp.gmail.com with ESMTPSA id t12sm45367882edy.49.2021.01.05.07.55.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Jan 2021 07:55:09 -0800 (PST) From: "Yordan Karadzhov (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org, "Yordan Karadzhov (VMware)" Subject: [PATCH 4/5] kernel-shark: Split the installation in two components Date: Tue, 5 Jan 2021 17:54:52 +0200 Message-Id: <20210105155453.41228-5-y.karadz@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210105155453.41228-1-y.karadz@gmail.com> References: <20210105155453.41228-1-y.karadz@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org The user can choose to install only the KernelShark GUI via "install_gui.sh". It is also possible to install the library headers and this can be done via "install_libkshark-devel.sh". The changes implemented in this patch are inspired by the talk "Deep CMake For Library Authors" presented at CppCon 2019 by Craig Scott. https://crascit.com/2019/10/16/cppcon-2019-deep-cmake-for-library-authors/ Signed-off-by: Yordan Karadzhov (VMware) --- CMakeLists.txt | 2 +- build/cmake_uninstall.sh | 23 ++++++++++---- build/install_gui.sh | 1 + build/install_libkshark-devel.sh | 1 + src/CMakeLists.txt | 53 ++++++++++++++++++++++++++------ src/plugins/CMakeLists.txt | 3 +- 6 files changed, 65 insertions(+), 18 deletions(-) create mode 100755 build/install_gui.sh create mode 100755 build/install_libkshark-devel.sh diff --git a/CMakeLists.txt b/CMakeLists.txt index 543d7da..9abacd0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -86,7 +86,7 @@ set(KS_ICON_FIN KS_icon_fin.svg) set(KS_LOGO KS_logo_symbol.svg) set(KS_LOGO_LABEL KS_logo_horizontal.svg) -set(CMAKE_INSTALL_RPATH "${_LIBDIR}") +set(CMAKE_INSTALL_RPATH "${_LIBDIR}" "$ORIGIN") set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) if (CMAKE_BUILD_TYPE MATCHES Package) diff --git a/build/cmake_uninstall.sh b/build/cmake_uninstall.sh index ae9eab5..0d93a8d 100755 --- a/build/cmake_uninstall.sh +++ b/build/cmake_uninstall.sh @@ -4,14 +4,25 @@ CYAN='\e[36m' PURPLE='\e[35m' NC='\e[0m' # No Color +uninstall () { + NAME=$1 + NAME=${NAME##*_} + NAME=${NAME%.*} + NAME=${NAME/manifest/the project} + if [ -e $1 ] + then + echo -e "${CYAN}Uninstall " $NAME"...${NC}" + xargs rm -v < $1 + rm -f $1 + fi +} + if [[ $EUID -ne 0 ]]; then echo -e "${PURPLE}Permission denied${NC}" 1>&2 exit 100 fi -if [ -e install_manifest.txt ] -then - echo -e "${CYAN}Uninstall the project...${NC}" - xargs rm -v < install_manifest.txt - rm -f install_manifest.txt -fi +for manifest in "$search_dir"${PWD}/install_manifest* +do + uninstall $manifest +done diff --git a/build/install_gui.sh b/build/install_gui.sh new file mode 100755 index 0000000..1583fb9 --- /dev/null +++ b/build/install_gui.sh @@ -0,0 +1 @@ +sudo cmake -DCOMPONENT=kernelshark -P cmake_install.cmake diff --git a/build/install_libkshark-devel.sh b/build/install_libkshark-devel.sh new file mode 100755 index 0000000..a7e420d --- /dev/null +++ b/build/install_libkshark-devel.sh @@ -0,0 +1 @@ +sudo cmake -DCOMPONENT=libkshark-devel -P cmake_install.cmake diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fe3a3eb..e35b436 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,5 +1,7 @@ message("\n src ...") +set(KS_INCLUDS_DESTINATION "${_INSTALL_PREFIX}/include/${KS_APP_NAME}") + message(STATUS "libkshark") add_library(kshark SHARED libkshark.c libkshark-hash.c @@ -15,9 +17,25 @@ target_link_libraries(kshark trace::cmd jsonc::jsonc ${CMAKE_DL_LIBS}) -set_target_properties(kshark PROPERTIES SUFFIX ".so.${KS_VERSION_STRING}") +set_target_properties(kshark PROPERTIES + SOVERSION ${KS_VERSION_MAJOR} + VERSION ${KS_VERSION_STRING}) + + +install(TARGETS kshark + LIBRARY DESTINATION ${_LIBDIR} + COMPONENT kernelshark + NAMELINK_COMPONENT libkshark-devel + INCLUDES DESTINATION ${_INSTALL_PREFIX}/include/${KS_APP_NAME} + COMPONENT libkshark-devel + ARCHIVE DESTINATION ${_LIBDIR} + COMPONENT libkshark-devel) -install(TARGETS kshark LIBRARY DESTINATION ${_LIBDIR}) +install(FILES "${KS_DIR}/src/libkshark.h" + "${KS_DIR}/src/libkshark-model.h" + "${KS_DIR}/src/libkshark-plugin.h" + DESTINATION ${KS_INCLUDS_DESTINATION} + COMPONENT libkshark-devel) if (OPENGL_FOUND) @@ -29,9 +47,18 @@ if (OPENGL_FOUND) ${GLUT_LIBRARY} ${OPENGL_LIBRARIES}) - set_target_properties(kshark-plot PROPERTIES SUFFIX ".so.${KS_VERSION_STRING}") + set_target_properties(kshark-plot PROPERTIES + SOVERSION ${KS_VERSION_MAJOR} + VERSION ${KS_VERSION_STRING}) - install(TARGETS kshark-plot LIBRARY DESTINATION ${_LIBDIR}) + install(TARGETS kshark-plot + LIBRARY DESTINATION ${_LIBDIR} + COMPONENT kernelshark + NAMELINK_COMPONENT libkshark-devel + INCLUDES DESTINATION ${_INSTALL_PREFIX}/include/${KS_APP_NAME} + COMPONENT libkshark-devel + ARCHIVE DESTINATION ${_LIBDIR} + COMPONENT libkshark-devel) endif (OPENGL_FOUND) @@ -83,21 +110,27 @@ if (Qt5Widgets_FOUND AND Qt5Network_FOUND) target_link_libraries(kshark-record kshark-gui) install(TARGETS ${KS_APP_NAME} kshark-record kshark-gui - RUNTIME DESTINATION ${_INSTALL_PREFIX}/bin/ - LIBRARY DESTINATION ${_LIBDIR}) + RUNTIME DESTINATION ${_INSTALL_PREFIX}/bin/ + COMPONENT kernelshark + LIBRARY DESTINATION ${_LIBDIR} + COMPONENT kernelshark) install(FILES "${KS_DIR}/${KS_APP_NAME}.desktop" - DESTINATION ${_INSTALL_PREFIX}/share/applications/) + DESTINATION ${_INSTALL_PREFIX}/share/applications/ + COMPONENT kernelshark) install(FILES "${KS_DIR}/icons/${KS_ICON}" "${KS_DIR}/icons/${KS_ICON_FIN}" - DESTINATION ${_INSTALL_PREFIX}/share/icons/${KS_APP_NAME}) + DESTINATION ${_INSTALL_PREFIX}/share/icons/${KS_APP_NAME} + COMPONENT kernelshark) install(FILES "${KS_DIR}/org.freedesktop.kshark-record.policy" - DESTINATION /usr/share/polkit-1/actions/) + DESTINATION /usr/share/polkit-1/actions/ + COMPONENT kernelshark) install(PROGRAMS "${KS_DIR}/bin/kshark-su-record" - DESTINATION ${_INSTALL_PREFIX}/bin/) + DESTINATION ${_INSTALL_PREFIX}/bin/ + COMPONENT kernelshark) endif (Qt5Widgets_FOUND AND Qt5Network_FOUND) diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt index 6c77179..2da73f8 100644 --- a/src/plugins/CMakeLists.txt +++ b/src/plugins/CMakeLists.txt @@ -28,6 +28,7 @@ BUILD_PLUGIN(NAME missed_events list(APPEND PLUGIN_LIST "missed_events default") # This plugin will be loaded by default install(TARGETS sched_events missed_events - LIBRARY DESTINATION ${KS_PLUGIN_INSTALL_PREFIX}) + LIBRARY DESTINATION ${KS_PLUGIN_INSTALL_PREFIX} + COMPONENT kernelshark) set(PLUGINS ${PLUGIN_LIST} PARENT_SCOPE) From patchwork Tue Jan 5 15:54:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yordan Karadzhov X-Patchwork-Id: 11999653 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=-20.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,MENTIONS_GIT_HOSTING,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 E4AEBC433E0 for ; Tue, 5 Jan 2021 15:56:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B0EE922BEF for ; Tue, 5 Jan 2021 15:56:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727019AbhAEP41 (ORCPT ); Tue, 5 Jan 2021 10:56:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41950 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726957AbhAEP41 (ORCPT ); Tue, 5 Jan 2021 10:56:27 -0500 Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [IPv6:2a00:1450:4864:20::535]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C43F1C06179A for ; Tue, 5 Jan 2021 07:55:11 -0800 (PST) Received: by mail-ed1-x535.google.com with SMTP id g24so582812edw.9 for ; Tue, 05 Jan 2021 07:55:11 -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=jteLhQXLksTHm2X5jDt5shRzW2X0JBe0d1/fcljCUhg=; b=L6VGahOGoZUvrDA5RSujzAtqyXcC46P4lJVjBp2FgTXD80K39b8PiombhJ5aSVwgC9 N4z4fkJ60kFHj5V1K0OVgEg+Sj2NcKfgOAMh22HQlqt2RiW6gKXZgc7NlmzTetVfrij1 wv6pArOdaUYzgzlmm+C0UQ6vPD/hLTGko7pp6E74IBmpgm3jiCjDjtXgnYRRb+CUF9Ta lIo/D/NwbZZ9WqYSGOyqUyGADGCsT6TL3Gl4nVZiru3x5rNxGTEIJHj2s8hOQnSTMxJ0 BvSKGTFtCRbs9Yad+Svk0TpWerPg7CPbxBCtdC/u3GrhfeC2AhSMHng1QsBmKHg+xFfz JmBg== 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=jteLhQXLksTHm2X5jDt5shRzW2X0JBe0d1/fcljCUhg=; b=dLahC5zSyDRTD1iPIZ7c+Od+g2bwLekDRCDizQcxPX85Q362R5Yi4eDQHOEkpU9rhQ hm1xoeKWlNaX0xF5Sozt785dcqhJTk5FQqsTt6xoXfk87DPEhRsqqYSco42zKWktQ8JY lLhoDoyM8hYwlNAdsU6fv/Md6ST7+thnN/UBSyF/afoEDc6oWcTrYUz3qgZQY7+W9Tkh M+gd+D5WyC+WQ7ibhP90BnCrfT/8yJyNSNXcfwtWg+YxlRuGoy/1wTGOfdqFVAXKEJvN /W/cbw7FvDPWbexoo7nOZ+Ftm24FTtzaMJbnJOEQ0imxwKaso39foGYCBNA57ShA1kLx 76Fw== X-Gm-Message-State: AOAM533FHAxHgTTRbK+jhk/BAXSydevbLQWW1h96BicLwtaF4CaPSf34 kecbINDff16PMpg2zd6UIcM= X-Google-Smtp-Source: ABdhPJx288m5Y7ZOJzyVHVbPw7aVTj/24kABaBrO+T+Vz6YMZB6Hy1bpDPy4ODGXEo+FwqiAoJtifA== X-Received: by 2002:a50:bf4a:: with SMTP id g10mr346694edk.201.1609862110616; Tue, 05 Jan 2021 07:55:10 -0800 (PST) Received: from localhost.localdomain ([95.87.199.238]) by smtp.gmail.com with ESMTPSA id t12sm45367882edy.49.2021.01.05.07.55.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Jan 2021 07:55:10 -0800 (PST) From: "Yordan Karadzhov (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org, "Yordan Karadzhov (VMware)" Subject: [PATCH 5/5] kernel-shark: Fix "github Actions" workflow Date: Tue, 5 Jan 2021 17:54:53 +0200 Message-Id: <20210105155453.41228-6-y.karadz@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210105155453.41228-1-y.karadz@gmail.com> References: <20210105155453.41228-1-y.karadz@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org Fix the part of the script that installs the third party libraries. Signed-off-by: Yordan Karadzhov (VMware) --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e818f46..a35f003 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,6 +16,7 @@ jobs: - name: Install Dependencies shell: bash run: | + sudo apt-get update sudo apt-get install build-essential git cmake libjson-c-dev -y sudo apt-get install freeglut3-dev libxmu-dev libxi-dev -y sudo apt-get install qtbase5-dev libboost-all-dev -y @@ -32,6 +33,7 @@ jobs: git clone git://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git cd trace-cmd make + sudo make install sudo make install_libs - name: Create Build Environment # Some projects don't allow in-source building, so create a separate build directory