From: Yordan Karadzhov <ykaradzhov@vmware.com>
To: rostedt@goodmis.org
Cc: linux-trace-devel@vger.kernel.org, y.karadz@gmail.com,
Yordan Karadzhov <ykaradzhov@vmware.com>
Subject: [PATCH 2/5] kernel-shark: Use full paths for non-standard library headers
Date: Thu, 23 May 2019 18:18:09 +0300 [thread overview]
Message-ID: <20190523151812.31391-3-ykaradzhov@vmware.com> (raw)
In-Reply-To: <20190523151812.31391-1-ykaradzhov@vmware.com>
The all header files included in the public interfaces of the trace-cmd
and KernelShark libraries have to use full path when including other
non-standard library headers. This will be useful if someone wants to use
those public interfaces from there installation location.
You may need to clean Cmake's cache after aplaying this patch:
cd kernel-shark/build
./cmake_clean.sh
cmake ..
Signed-off-by: Yordan Karadzhov <ykaradzhov@vmware.com>
---
include/trace-cmd/trace-cmd.h | 2 +-
include/traceevent/event-parse.h | 2 +-
kernel-shark/CMakeLists.txt | 3 +-
kernel-shark/build/FindTraceCmd.cmake | 40 ++++++++++++---------------
kernel-shark/src/libkshark-plugin.h | 2 +-
kernel-shark/src/libkshark.h | 9 +++---
6 files changed, 26 insertions(+), 32 deletions(-)
diff --git a/include/trace-cmd/trace-cmd.h b/include/trace-cmd/trace-cmd.h
index ceb03f4..9320098 100644
--- a/include/trace-cmd/trace-cmd.h
+++ b/include/trace-cmd/trace-cmd.h
@@ -6,7 +6,7 @@
#ifndef _TRACE_CMD_H
#define _TRACE_CMD_H
-#include "event-parse.h"
+#include "traceevent/event-parse.h"
#define ARRAY_SIZE(_a) (sizeof(_a) / sizeof((_a)[0]))
#define __weak __attribute__((weak))
diff --git a/include/traceevent/event-parse.h b/include/traceevent/event-parse.h
index 5e0fd19..65cabd9 100644
--- a/include/traceevent/event-parse.h
+++ b/include/traceevent/event-parse.h
@@ -12,7 +12,7 @@
#include <regex.h>
#include <string.h>
-#include "trace-seq.h"
+#include "traceevent/trace-seq.h"
#ifndef __maybe_unused
#define __maybe_unused __attribute__((unused))
diff --git a/kernel-shark/CMakeLists.txt b/kernel-shark/CMakeLists.txt
index 52e4a29..145b058 100644
--- a/kernel-shark/CMakeLists.txt
+++ b/kernel-shark/CMakeLists.txt
@@ -56,8 +56,7 @@ SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
include_directories(${KS_DIR}/src/
${KS_DIR}/build/src/
${JSONC_INCLUDE_DIR}
- ${TRACECMD_INCLUDE_DIR}
- ${TRACEEVENT_INCLUDE_DIR})
+ ${TRACECMD_INCLUDE_DIR})
message("")
message(STATUS "C flags : " ${CMAKE_C_FLAGS})
diff --git a/kernel-shark/build/FindTraceCmd.cmake b/kernel-shark/build/FindTraceCmd.cmake
index b09a11b..21315e7 100644
--- a/kernel-shark/build/FindTraceCmd.cmake
+++ b/kernel-shark/build/FindTraceCmd.cmake
@@ -2,7 +2,6 @@
# This module finds an installed trace-cmd package.
#
# It sets the following variables:
-# TRACEEVENT_INCLUDE_DIR, where to find traceevent header.
# TRACEEVENT_LIBRARY_DIR , where to find the traceevent library.
# TRACEEVENT_LIBRARY, traceevent the library.
# TRACEEVENT_FOUND, If false, do not try to use traceevent.
@@ -20,26 +19,32 @@ find_path(TRACECMD_BIN_DIR NAMES trace-cmd
${CMAKE_SOURCE_DIR}/../tracecmd/
NO_DEFAULT_PATH)
-find_path(TRACECMD_INCLUDE_DIR NAMES trace-cmd.h
- PATHS $ENV{TRACE_CMD}/include/trace-cmd/
- ${CMAKE_SOURCE_DIR}/../include/trace-cmd/
+find_path(TRACECMD_INCLUDE_DIR NAMES trace-cmd/trace-cmd.h
+ PATHS $ENV{TRACE_CMD}/include/
+ ${CMAKE_SOURCE_DIR}/../include/
NO_DEFAULT_PATH)
-find_path(TRACECMD_LIBRARY_DIR NAMES libtracecmd.a
- PATHS $ENV{TRACE_CMD}/lib/trace-cmd/
- ${CMAKE_SOURCE_DIR}/../lib/trace-cmd/
+find_path(TRACECMD_LIBRARY_DIR NAMES trace-cmd/libtracecmd.a
+ PATHS $ENV{TRACE_CMD}/lib/
+ ${CMAKE_SOURCE_DIR}/../lib/
NO_DEFAULT_PATH)
+find_path(TRACEEVENT_LIBRARY_DIR NAMES traceevent/libtraceevent.a
+ PATHS $ENV{TRACE_CMD}/lib/
+ ${CMAKE_SOURCE_DIR}/../lib/
+ NO_DEFAULT_PATH)
+
# 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_path(TRACECMD_BIN_DIR NAMES trace-cmd)
-find_path(TRACECMD_INCLUDE_DIR NAMES trace-cmd.h)
-find_path(TRACECMD_LIBRARY_DIR NAMES libtracecmd.a)
+find_path(TRACECMD_INCLUDE_DIR NAMES trace-cmd/trace-cmd.h)
+find_library(TRACECMD_LIBRARY_DIR NAMES trace-cmd/libtracecmd.a)
+find_library(TRACEEVENT_LIBRARY_DIR NAMES traceevent/libtraceevent.a)
IF (TRACECMD_INCLUDE_DIR AND TRACECMD_LIBRARY_DIR)
SET(TRACECMD_FOUND TRUE)
- SET(TRACECMD_LIBRARY "${TRACECMD_LIBRARY_DIR}/libtracecmd.a")
+ SET(TRACECMD_LIBRARY "${TRACECMD_LIBRARY_DIR}/trace-cmd/libtracecmd.a")
ENDIF (TRACECMD_INCLUDE_DIR AND TRACECMD_LIBRARY_DIR)
@@ -53,21 +58,12 @@ ELSE (TRACECMD_FOUND)
ENDIF (TRACECMD_FOUND)
-
-find_path(TRACEEVENT_INCLUDE_DIR NAMES event-parse.h
- PATHS $ENV{TRACE_CMD}/include/traceevent/
- ${CMAKE_SOURCE_DIR}/../include/traceevent/)
-
-find_path(TRACEEVENT_LIBRARY_DIR NAMES libtraceevent.a
- PATHS $ENV{TRACE_CMD}/lib/traceevent/
- ${CMAKE_SOURCE_DIR}/../lib/traceevent/)
-
-IF (TRACEEVENT_INCLUDE_DIR AND TRACEEVENT_LIBRARY_DIR)
+IF (TRACEEVENT_LIBRARY_DIR)
SET(TRACEEVENT_FOUND TRUE)
- SET(TRACEEVENT_LIBRARY "${TRACEEVENT_LIBRARY_DIR}/libtraceevent.a")
+ SET(TRACEEVENT_LIBRARY "${TRACEEVENT_LIBRARY_DIR}/traceevent/libtraceevent.a")
-ENDIF (TRACEEVENT_INCLUDE_DIR AND TRACEEVENT_LIBRARY_DIR)
+ENDIF (TRACEEVENT_LIBRARY_DIR)
IF (TRACEEVENT_FOUND)
diff --git a/kernel-shark/src/libkshark-plugin.h b/kernel-shark/src/libkshark-plugin.h
index 0cb677a..b3cf1c6 100644
--- a/kernel-shark/src/libkshark-plugin.h
+++ b/kernel-shark/src/libkshark-plugin.h
@@ -17,7 +17,7 @@ extern "C" {
#endif // __cplusplus
// trace-cmd
-#include "event-parse.h"
+#include "traceevent/event-parse.h"
/* Quiet warnings over documenting simple structures */
//! @cond Doxygen_Suppress
diff --git a/kernel-shark/src/libkshark.h b/kernel-shark/src/libkshark.h
index 92ade41..e4349c3 100644
--- a/kernel-shark/src/libkshark.h
+++ b/kernel-shark/src/libkshark.h
@@ -18,17 +18,16 @@
#include <errno.h>
// Json-C
-#include <json.h>
+#include <json-c/json.h>
#ifdef __cplusplus
extern "C" {
#endif
// trace-cmd
-#include "trace-cmd.h"
-#include "trace-filter-hash.h"
-#include "event-parse.h"
-#include "trace-filter-hash.h"
+#include "trace-cmd/trace-cmd.h"
+#include "trace-cmd/trace-filter-hash.h"
+#include "traceevent/event-parse.h"
// KernelShark
#include "libkshark-plugin.h"
--
2.20.1
next prev parent reply other threads:[~2019-05-23 15:18 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-23 15:18 [PATCH 0/5] Nodifications needed by the NumPy interface Yordan Karadzhov
2019-05-23 15:18 ` [PATCH 1/5] kernel-shark: Add new dataloading method to be used by the NumPu interface Yordan Karadzhov
2019-05-29 17:36 ` Steven Rostedt
2019-05-30 14:25 ` Yordan Karadzhov (VMware)
2019-05-23 15:18 ` Yordan Karadzhov [this message]
2019-05-23 15:18 ` [PATCH 3/5] kernel-shark: Use the shared versions of the trace-cmd libraries Yordan Karadzhov
2019-05-23 15:18 ` [PATCH 4/5] trace-cmd: Install public interface headers Yordan Karadzhov
2019-05-23 15:18 ` [PATCH 5/5] kernel-shark: " Yordan Karadzhov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190523151812.31391-3-ykaradzhov@vmware.com \
--to=ykaradzhov@vmware.com \
--cc=linux-trace-devel@vger.kernel.org \
--cc=rostedt@goodmis.org \
--cc=y.karadz@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.