Good afternoon Mike,
Please find below the required changes that allow to properly integrate the opencsd library with the perf tools build mechanism. In that scheme the headers and library objects are installed along side other system header and libraries and from there automatically detected by the perf tools build engine.
That way we don't have to specify the CSTRACE_PATH and it also paves the way for proper packaging for distributions.
The first patch looks mean but it just moves header files around. The other two patches are trivial. I have tested this on Linux but not on Windows.
Thanks, Mathieu
Mathieu Poirier (3): opencsd: Creating user API include directory opencsd: Changing library names to be more intuitive opencsd: Adding "install" target
HOWTO.md | 2 +- decoder/build/linux/makefile | 19 ++++++++++++++++++- decoder/build/win-vs2015/opencsd.props | 6 +++--- decoder/docs/build_libs.md | 18 +++++++++--------- decoder/include/c_api/ocsd_c_api_cust_impl.h | 4 ++-- decoder/include/common/comp_attach_pt_t.h | 2 +- decoder/include/common/ocsd_code_follower.h | 4 ++-- decoder/include/common/ocsd_dcd_mngr.h | 2 +- decoder/include/common/ocsd_dcd_mngr_i.h | 4 ++-- decoder/include/common/ocsd_error.h | 2 +- decoder/include/common/ocsd_lib_dcd_register.h | 2 +- decoder/include/common/ocsd_pe_context.h | 2 +- decoder/include/common/trc_core_arch_map.h | 2 +- decoder/include/common/trc_frame_deformatter.h | 4 ++-- decoder/include/common/trc_gen_elem.h | 2 +- decoder/include/common/trc_ret_stack.h | 2 +- decoder/include/etmv3/etmv3_decoder.h | 2 +- decoder/include/etmv3/trc_cmp_cfg_etmv3.h | 2 +- decoder/include/etmv3/trc_dcd_mngr_etmv3.h | 2 +- decoder/include/etmv3/trc_pkt_elem_etmv3.h | 2 +- decoder/include/etmv3/trc_pkt_proc_etmv3.h | 2 +- decoder/include/etmv4/etmv4_decoder.h | 2 +- decoder/include/etmv4/trc_cmp_cfg_etmv4.h | 2 +- decoder/include/etmv4/trc_dcd_mngr_etmv4i.h | 2 +- decoder/include/etmv4/trc_pkt_elem_etmv4d.h | 2 +- decoder/include/etmv4/trc_pkt_elem_etmv4i.h | 2 +- decoder/include/etmv4/trc_pkt_proc_etmv4.h | 2 +- decoder/include/i_dec/trc_i_decode.h | 2 +- decoder/include/i_dec/trc_idec_arminst.h | 2 +- decoder/include/interfaces/trc_data_raw_in_i.h | 2 +- decoder/include/interfaces/trc_data_rawframe_in_i.h | 2 +- decoder/include/interfaces/trc_error_log_i.h | 2 +- decoder/include/interfaces/trc_indexer_src_i.h | 2 +- decoder/include/mem_acc/trc_mem_acc_base.h | 2 +- decoder/include/mem_acc/trc_mem_acc_cb_if.h | 2 +- decoder/include/mem_acc/trc_mem_acc_file.h | 2 +- decoder/include/mem_acc/trc_mem_acc_mapper.h | 2 +- decoder/include/opencsd.h | 6 +++--- .../include/{ => opencsd}/c_api/ocsd_c_api_custom.h | 0 .../include/{ => opencsd}/c_api/ocsd_c_api_types.h | 14 +++++++------- decoder/include/{ => opencsd}/c_api/opencsd_c_api.h | 0 .../include/{ => opencsd}/etmv3/trc_pkt_types_etmv3.h | 2 +- .../include/{ => opencsd}/etmv4/trc_pkt_types_etmv4.h | 2 +- decoder/include/{ => opencsd}/ocsd_if_types.h | 0 decoder/include/{ => opencsd}/ptm/trc_pkt_types_ptm.h | 2 +- decoder/include/{ => opencsd}/stm/trc_pkt_types_stm.h | 2 +- decoder/include/{ => opencsd}/trc_gen_elem_types.h | 0 decoder/include/{ => opencsd}/trc_pkt_types.h | 0 decoder/include/ptm/ptm_decoder.h | 2 +- decoder/include/ptm/trc_cmp_cfg_ptm.h | 2 +- decoder/include/ptm/trc_dcd_mngr_ptm.h | 2 +- decoder/include/ptm/trc_pkt_elem_ptm.h | 2 +- decoder/include/ptm/trc_pkt_proc_ptm.h | 2 +- decoder/include/stm/stm_decoder.h | 2 +- decoder/include/stm/trc_cmp_cfg_stm.h | 2 +- decoder/include/stm/trc_dcd_mngr_stm.h | 2 +- decoder/include/stm/trc_pkt_elem_stm.h | 2 +- decoder/include/stm/trc_pkt_proc_stm.h | 2 +- decoder/source/c_api/ocsd_c_api.cpp | 2 +- decoder/source/c_api/ocsd_c_api_custom_obj.cpp | 2 +- decoder/source/c_api/ocsd_c_api_custom_obj.h | 2 +- decoder/source/c_api/ocsd_c_api_obj.h | 2 +- decoder/source/etmv4/trc_etmv4_stack_elem.h | 2 +- decoder/source/i_dec/trc_i_decode.cpp | 2 +- decoder/source/trc_frame_deformatter_impl.h | 2 +- .../c_api_echo_test/ext_dcd_echo_test.c | 4 ++-- .../c_api_echo_test/ext_dcd_echo_test.h | 2 +- .../c_api_echo_test/ext_dcd_echo_test_fact.h | 2 +- decoder/tests/source/c_api_pkt_print_test.c | 2 +- 69 files changed, 104 insertions(+), 87 deletions(-) rename decoder/include/{ => opencsd}/c_api/ocsd_c_api_custom.h (100%) rename decoder/include/{ => opencsd}/c_api/ocsd_c_api_types.h (94%) rename decoder/include/{ => opencsd}/c_api/opencsd_c_api.h (100%) rename decoder/include/{ => opencsd}/etmv3/trc_pkt_types_etmv3.h (99%) rename decoder/include/{ => opencsd}/etmv4/trc_pkt_types_etmv4.h (99%) rename decoder/include/{ => opencsd}/ocsd_if_types.h (100%) rename decoder/include/{ => opencsd}/ptm/trc_pkt_types_ptm.h (99%) rename decoder/include/{ => opencsd}/stm/trc_pkt_types_stm.h (99%) rename decoder/include/{ => opencsd}/trc_gen_elem_types.h (100%) rename decoder/include/{ => opencsd}/trc_pkt_types.h (100%)
Some of the header file need to be exposed to client programs so that they can be compile against them. As such moving the header file needed to compile the current perf tools to an "opencsd" directory under include/ and adjust other files to reflect the change.
With this change user programs can now be compiled without having to specify the -I option. The other advantage is that the library can be packaged for installation on a system.
Signed-off-by: Mathieu Poirier mathieu.poirier@linaro.org --- decoder/include/c_api/ocsd_c_api_cust_impl.h | 4 ++-- decoder/include/common/comp_attach_pt_t.h | 2 +- decoder/include/common/ocsd_code_follower.h | 4 ++-- decoder/include/common/ocsd_dcd_mngr.h | 2 +- decoder/include/common/ocsd_dcd_mngr_i.h | 4 ++-- decoder/include/common/ocsd_error.h | 2 +- decoder/include/common/ocsd_lib_dcd_register.h | 2 +- decoder/include/common/ocsd_pe_context.h | 2 +- decoder/include/common/trc_core_arch_map.h | 2 +- decoder/include/common/trc_frame_deformatter.h | 4 ++-- decoder/include/common/trc_gen_elem.h | 2 +- decoder/include/common/trc_ret_stack.h | 2 +- decoder/include/etmv3/etmv3_decoder.h | 2 +- decoder/include/etmv3/trc_cmp_cfg_etmv3.h | 2 +- decoder/include/etmv3/trc_dcd_mngr_etmv3.h | 2 +- decoder/include/etmv3/trc_pkt_elem_etmv3.h | 2 +- decoder/include/etmv3/trc_pkt_proc_etmv3.h | 2 +- decoder/include/etmv4/etmv4_decoder.h | 2 +- decoder/include/etmv4/trc_cmp_cfg_etmv4.h | 2 +- decoder/include/etmv4/trc_dcd_mngr_etmv4i.h | 2 +- decoder/include/etmv4/trc_pkt_elem_etmv4d.h | 2 +- decoder/include/etmv4/trc_pkt_elem_etmv4i.h | 2 +- decoder/include/etmv4/trc_pkt_proc_etmv4.h | 2 +- decoder/include/i_dec/trc_i_decode.h | 2 +- decoder/include/i_dec/trc_idec_arminst.h | 2 +- decoder/include/interfaces/trc_data_raw_in_i.h | 2 +- decoder/include/interfaces/trc_data_rawframe_in_i.h | 2 +- decoder/include/interfaces/trc_error_log_i.h | 2 +- decoder/include/interfaces/trc_indexer_src_i.h | 2 +- decoder/include/mem_acc/trc_mem_acc_base.h | 2 +- decoder/include/mem_acc/trc_mem_acc_cb_if.h | 2 +- decoder/include/mem_acc/trc_mem_acc_file.h | 2 +- decoder/include/mem_acc/trc_mem_acc_mapper.h | 2 +- decoder/include/opencsd.h | 6 +++--- decoder/include/{ => opencsd}/c_api/ocsd_c_api_custom.h | 0 decoder/include/{ => opencsd}/c_api/ocsd_c_api_types.h | 14 +++++++------- decoder/include/{ => opencsd}/c_api/opencsd_c_api.h | 0 decoder/include/{ => opencsd}/etmv3/trc_pkt_types_etmv3.h | 2 +- decoder/include/{ => opencsd}/etmv4/trc_pkt_types_etmv4.h | 2 +- decoder/include/{ => opencsd}/ocsd_if_types.h | 0 decoder/include/{ => opencsd}/ptm/trc_pkt_types_ptm.h | 2 +- decoder/include/{ => opencsd}/stm/trc_pkt_types_stm.h | 2 +- decoder/include/{ => opencsd}/trc_gen_elem_types.h | 0 decoder/include/{ => opencsd}/trc_pkt_types.h | 0 decoder/include/ptm/ptm_decoder.h | 2 +- decoder/include/ptm/trc_cmp_cfg_ptm.h | 2 +- decoder/include/ptm/trc_dcd_mngr_ptm.h | 2 +- decoder/include/ptm/trc_pkt_elem_ptm.h | 2 +- decoder/include/ptm/trc_pkt_proc_ptm.h | 2 +- decoder/include/stm/stm_decoder.h | 2 +- decoder/include/stm/trc_cmp_cfg_stm.h | 2 +- decoder/include/stm/trc_dcd_mngr_stm.h | 2 +- decoder/include/stm/trc_pkt_elem_stm.h | 2 +- decoder/include/stm/trc_pkt_proc_stm.h | 2 +- decoder/source/c_api/ocsd_c_api.cpp | 2 +- decoder/source/c_api/ocsd_c_api_custom_obj.cpp | 2 +- decoder/source/c_api/ocsd_c_api_custom_obj.h | 2 +- decoder/source/c_api/ocsd_c_api_obj.h | 2 +- decoder/source/etmv4/trc_etmv4_stack_elem.h | 2 +- decoder/source/i_dec/trc_i_decode.cpp | 2 +- decoder/source/trc_frame_deformatter_impl.h | 2 +- .../ext_dcd_test_eg/c_api_echo_test/ext_dcd_echo_test.c | 4 ++-- .../ext_dcd_test_eg/c_api_echo_test/ext_dcd_echo_test.h | 2 +- .../c_api_echo_test/ext_dcd_echo_test_fact.h | 2 +- decoder/tests/source/c_api_pkt_print_test.c | 2 +- 65 files changed, 73 insertions(+), 73 deletions(-) rename decoder/include/{ => opencsd}/c_api/ocsd_c_api_custom.h (100%) rename decoder/include/{ => opencsd}/c_api/ocsd_c_api_types.h (94%) rename decoder/include/{ => opencsd}/c_api/opencsd_c_api.h (100%) rename decoder/include/{ => opencsd}/etmv3/trc_pkt_types_etmv3.h (99%) rename decoder/include/{ => opencsd}/etmv4/trc_pkt_types_etmv4.h (99%) rename decoder/include/{ => opencsd}/ocsd_if_types.h (100%) rename decoder/include/{ => opencsd}/ptm/trc_pkt_types_ptm.h (99%) rename decoder/include/{ => opencsd}/stm/trc_pkt_types_stm.h (99%) rename decoder/include/{ => opencsd}/trc_gen_elem_types.h (100%) rename decoder/include/{ => opencsd}/trc_pkt_types.h (100%)
diff --git a/decoder/include/c_api/ocsd_c_api_cust_impl.h b/decoder/include/c_api/ocsd_c_api_cust_impl.h index 214e8af08961..245ce162752e 100644 --- a/decoder/include/c_api/ocsd_c_api_cust_impl.h +++ b/decoder/include/c_api/ocsd_c_api_cust_impl.h @@ -34,8 +34,8 @@ #ifndef ARM_OCSD_C_API_CUST_IMPL_H_INCLUDED #define ARM_OCSD_C_API_CUST_IMPL_H_INCLUDED
-#include "c_api/ocsd_c_api_types.h" -#include "c_api/ocsd_c_api_custom.h" +#include "opencsd/c_api/ocsd_c_api_types.h" +#include "opencsd/c_api/ocsd_c_api_custom.h"
/** @addtogroup ocsd_ext_dcd @{*/ diff --git a/decoder/include/common/comp_attach_pt_t.h b/decoder/include/common/comp_attach_pt_t.h index 1d56240bd5b5..71f4c84caa2f 100644 --- a/decoder/include/common/comp_attach_pt_t.h +++ b/decoder/include/common/comp_attach_pt_t.h @@ -36,7 +36,7 @@ #define ARM_COMP_ATTACH_PT_T_H_INCLUDED
#include <vector> -#include "ocsd_if_types.h" +#include "opencsd/ocsd_if_types.h"
/** @defgroup ocsd_infrastructure OpenCSD Library : Library Component Infrastructure
diff --git a/decoder/include/common/ocsd_code_follower.h b/decoder/include/common/ocsd_code_follower.h index 7063266704d4..0e8691034a68 100644 --- a/decoder/include/common/ocsd_code_follower.h +++ b/decoder/include/common/ocsd_code_follower.h @@ -35,8 +35,8 @@ #ifndef ARM_OCSD_CODE_FOLLOWER_H_INCLUDED #define ARM_OCSD_CODE_FOLLOWER_H_INCLUDED
-#include "ocsd_if_types.h" -#include "trc_pkt_types.h" +#include "opencsd/ocsd_if_types.h" +#include "opencsd/trc_pkt_types.h" #include "comp_attach_pt_t.h" #include "interfaces/trc_tgt_mem_access_i.h" #include "interfaces/trc_instr_decode_i.h" diff --git a/decoder/include/common/ocsd_dcd_mngr.h b/decoder/include/common/ocsd_dcd_mngr.h index b3a7ebd0f868..ba7d8a89c46f 100644 --- a/decoder/include/common/ocsd_dcd_mngr.h +++ b/decoder/include/common/ocsd_dcd_mngr.h @@ -35,7 +35,7 @@ #ifndef ARM_OCSD_DCD_MNGR_H_INCLUDED #define ARM_OCSD_DCD_MNGR_H_INCLUDED
-#include "ocsd_if_types.h" +#include "opencsd/ocsd_if_types.h" #include "common/ocsd_dcd_mngr_i.h" #include "common/ocsd_lib_dcd_register.h" #include "common/trc_pkt_decode_base.h" diff --git a/decoder/include/common/ocsd_dcd_mngr_i.h b/decoder/include/common/ocsd_dcd_mngr_i.h index f6adb06b213d..94ffbd2107fa 100644 --- a/decoder/include/common/ocsd_dcd_mngr_i.h +++ b/decoder/include/common/ocsd_dcd_mngr_i.h @@ -35,7 +35,7 @@ #ifndef ARM_OCSD_DCD_MNGR_I_H_INCLUDED #define ARM_OCSD_DCD_MNGR_I_H_INCLUDED
-#include "ocsd_if_types.h" +#include "opencsd/ocsd_if_types.h" #include "common/trc_cs_config.h" #include "common/trc_component.h"
@@ -95,4 +95,4 @@ public:
#endif // ARM_OCSD_DCD_MNGR_I_H_INCLUDED
-/* End of File ocsd_dcd_mngr.h */ \ No newline at end of file +/* End of File ocsd_dcd_mngr.h */ diff --git a/decoder/include/common/ocsd_error.h b/decoder/include/common/ocsd_error.h index b3c63648592c..e547f4878033 100644 --- a/decoder/include/common/ocsd_error.h +++ b/decoder/include/common/ocsd_error.h @@ -36,7 +36,7 @@ #ifndef ARM_OCSD_ERROR_H_INCLUDED #define ARM_OCSD_ERROR_H_INCLUDED
-#include "ocsd_if_types.h" +#include "opencsd/ocsd_if_types.h" #include <string> /** @ingroup ocsd_infrastructure @{*/ diff --git a/decoder/include/common/ocsd_lib_dcd_register.h b/decoder/include/common/ocsd_lib_dcd_register.h index efb2d21fac72..6ba4cf82240a 100644 --- a/decoder/include/common/ocsd_lib_dcd_register.h +++ b/decoder/include/common/ocsd_lib_dcd_register.h @@ -38,7 +38,7 @@
#include <map>
-#include "ocsd_if_types.h" +#include "opencsd/ocsd_if_types.h" #include "common/ocsd_dcd_mngr_i.h"
/*! diff --git a/decoder/include/common/ocsd_pe_context.h b/decoder/include/common/ocsd_pe_context.h index 1ad4676c2bec..797881cf6985 100644 --- a/decoder/include/common/ocsd_pe_context.h +++ b/decoder/include/common/ocsd_pe_context.h @@ -34,7 +34,7 @@ #ifndef ARM_OCSD_PE_CONTEXT_H_INCLUDED #define ARM_OCSD_PE_CONTEXT_H_INCLUDED
-#include "ocsd_if_types.h" +#include "opencsd/ocsd_if_types.h"
/*! @class OcsdPeContext * @brief Handler for the ocsd_pe_context structure. diff --git a/decoder/include/common/trc_core_arch_map.h b/decoder/include/common/trc_core_arch_map.h index 0904b07fbd0b..5a24149180fc 100644 --- a/decoder/include/common/trc_core_arch_map.h +++ b/decoder/include/common/trc_core_arch_map.h @@ -37,7 +37,7 @@
#include <map> #include <string> -#include "ocsd_if_types.h" +#include "opencsd/ocsd_if_types.h"
class CoreArchProfileMap { diff --git a/decoder/include/common/trc_frame_deformatter.h b/decoder/include/common/trc_frame_deformatter.h index c874c82f5d71..dc9488c5124d 100644 --- a/decoder/include/common/trc_frame_deformatter.h +++ b/decoder/include/common/trc_frame_deformatter.h @@ -34,7 +34,7 @@ #ifndef ARM_TRC_FRAME_DEFORMATTER_H_INCLUDED #define ARM_TRC_FRAME_DEFORMATTER_H_INCLUDED
-#include "ocsd_if_types.h" +#include "opencsd/ocsd_if_types.h"
#include "interfaces/trc_data_raw_in_i.h" #include "comp_attach_pt_t.h" @@ -94,4 +94,4 @@ private:
#endif // ARM_TRC_FRAME_DEFORMATTER_H_INCLUDED
-/* End of File trc_frame_deformatter.h */ \ No newline at end of file +/* End of File trc_frame_deformatter.h */ diff --git a/decoder/include/common/trc_gen_elem.h b/decoder/include/common/trc_gen_elem.h index 2f4182b5544e..00081b556904 100644 --- a/decoder/include/common/trc_gen_elem.h +++ b/decoder/include/common/trc_gen_elem.h @@ -34,7 +34,7 @@ #ifndef ARM_TRC_GEN_ELEM_H_INCLUDED #define ARM_TRC_GEN_ELEM_H_INCLUDED
-#include "trc_gen_elem_types.h" +#include "opencsd/trc_gen_elem_types.h" #include "trc_printable_elem.h" #include "ocsd_pe_context.h"
diff --git a/decoder/include/common/trc_ret_stack.h b/decoder/include/common/trc_ret_stack.h index 6a96d28937e1..a7f53d1cbaeb 100644 --- a/decoder/include/common/trc_ret_stack.h +++ b/decoder/include/common/trc_ret_stack.h @@ -35,7 +35,7 @@ #ifndef ARM_TRC_RET_STACK_H_INCLUDED #define ARM_TRC_RET_STACK_H_INCLUDED
-#include "ocsd_if_types.h" +#include "opencsd/ocsd_if_types.h"
// uncomment below for return stack logging // #define TRC_RET_STACK_DEBUG diff --git a/decoder/include/etmv3/etmv3_decoder.h b/decoder/include/etmv3/etmv3_decoder.h index 48c9fc730844..a39d8dd056b2 100644 --- a/decoder/include/etmv3/etmv3_decoder.h +++ b/decoder/include/etmv3/etmv3_decoder.h @@ -39,7 +39,7 @@ #include "etmv3/trc_cmp_cfg_etmv3.h" #include "etmv3/trc_pkt_elem_etmv3.h" #include "etmv3/trc_pkt_proc_etmv3.h" -#include "etmv3/trc_pkt_types_etmv3.h" +#include "opencsd/etmv3/trc_pkt_types_etmv3.h" #include "etmv3/trc_pkt_decode_etmv3.h"
#endif // ARM_ETMV3_DECODER_H_INCLUDED diff --git a/decoder/include/etmv3/trc_cmp_cfg_etmv3.h b/decoder/include/etmv3/trc_cmp_cfg_etmv3.h index 509de204a4e6..1fc0a8860fc1 100644 --- a/decoder/include/etmv3/trc_cmp_cfg_etmv3.h +++ b/decoder/include/etmv3/trc_cmp_cfg_etmv3.h @@ -36,7 +36,7 @@ #ifndef ARM_TRC_CMP_CFG_ETMV3_H_INCLUDED #define ARM_TRC_CMP_CFG_ETMV3_H_INCLUDED
-#include "trc_pkt_types_etmv3.h" +#include "opencsd/etmv3/trc_pkt_types_etmv3.h" #include "common/trc_cs_config.h"
diff --git a/decoder/include/etmv3/trc_dcd_mngr_etmv3.h b/decoder/include/etmv3/trc_dcd_mngr_etmv3.h index c3a96ffcb5ee..143dd06c900b 100644 --- a/decoder/include/etmv3/trc_dcd_mngr_etmv3.h +++ b/decoder/include/etmv3/trc_dcd_mngr_etmv3.h @@ -38,7 +38,7 @@ #include "trc_pkt_decode_etmv3.h" #include "trc_pkt_proc_etmv3.h" #include "trc_cmp_cfg_etmv3.h" -#include "trc_pkt_types_etmv3.h" +#include "opencsd/etmv3/trc_pkt_types_etmv3.h"
class DecoderMngrEtmV3 : public DecodeMngrFullDcd< EtmV3TrcPacket, ocsd_etmv3_pkt_type, diff --git a/decoder/include/etmv3/trc_pkt_elem_etmv3.h b/decoder/include/etmv3/trc_pkt_elem_etmv3.h index a874ea30c861..a94b452f2fd4 100644 --- a/decoder/include/etmv3/trc_pkt_elem_etmv3.h +++ b/decoder/include/etmv3/trc_pkt_elem_etmv3.h @@ -36,7 +36,7 @@ #ifndef ARM_TRC_PKT_ELEM_ETMV3_H_INCLUDED #define ARM_TRC_PKT_ELEM_ETMV3_H_INCLUDED
-#include "trc_pkt_types_etmv3.h" +#include "opencsd/etmv3/trc_pkt_types_etmv3.h" #include "common/trc_printable_elem.h" #include "common/trc_pkt_elem_base.h"
diff --git a/decoder/include/etmv3/trc_pkt_proc_etmv3.h b/decoder/include/etmv3/trc_pkt_proc_etmv3.h index 5a7f959df4aa..48021cd0cd4b 100644 --- a/decoder/include/etmv3/trc_pkt_proc_etmv3.h +++ b/decoder/include/etmv3/trc_pkt_proc_etmv3.h @@ -36,7 +36,7 @@ #ifndef ARM_TRC_PKT_PROC_ETMV3_H_INCLUDED #define ARM_TRC_PKT_PROC_ETMV3_H_INCLUDED
-#include "trc_pkt_types_etmv3.h" +#include "opencsd/etmv3/trc_pkt_types_etmv3.h" #include "common/trc_pkt_proc_base.h"
class EtmV3PktProcImpl; diff --git a/decoder/include/etmv4/etmv4_decoder.h b/decoder/include/etmv4/etmv4_decoder.h index 05bdd44d683e..f9e3d884f204 100644 --- a/decoder/include/etmv4/etmv4_decoder.h +++ b/decoder/include/etmv4/etmv4_decoder.h @@ -40,7 +40,7 @@ #include "trc_pkt_elem_etmv4i.h" #include "trc_pkt_elem_etmv4d.h" #include "trc_pkt_proc_etmv4.h" -#include "trc_pkt_types_etmv4.h" +#include "opencsd/etmv4/trc_pkt_types_etmv4.h" #include "trc_pkt_decode_etmv4i.h"
#endif // ARM_ETMV4_DECODER_H_INCLUDED diff --git a/decoder/include/etmv4/trc_cmp_cfg_etmv4.h b/decoder/include/etmv4/trc_cmp_cfg_etmv4.h index a3f883540a30..8c597888ff43 100644 --- a/decoder/include/etmv4/trc_cmp_cfg_etmv4.h +++ b/decoder/include/etmv4/trc_cmp_cfg_etmv4.h @@ -36,7 +36,7 @@ #ifndef ARM_TRC_CMP_CFG_ETMV4_H_INCLUDED #define ARM_TRC_CMP_CFG_ETMV4_H_INCLUDED
-#include "trc_pkt_types_etmv4.h" +#include "opencsd/etmv4/trc_pkt_types_etmv4.h" #include "common/trc_cs_config.h"
diff --git a/decoder/include/etmv4/trc_dcd_mngr_etmv4i.h b/decoder/include/etmv4/trc_dcd_mngr_etmv4i.h index a5b25404fcf3..a40939729037 100644 --- a/decoder/include/etmv4/trc_dcd_mngr_etmv4i.h +++ b/decoder/include/etmv4/trc_dcd_mngr_etmv4i.h @@ -12,7 +12,7 @@ #include "trc_pkt_decode_etmv4i.h" #include "trc_pkt_proc_etmv4.h" #include "trc_cmp_cfg_etmv4.h" -#include "trc_pkt_types_etmv4.h" +#include "opencsd/etmv4/trc_pkt_types_etmv4.h"
class DecoderMngrEtmV4I : public DecodeMngrFullDcd< EtmV4ITrcPacket, ocsd_etmv4_i_pkt_type, diff --git a/decoder/include/etmv4/trc_pkt_elem_etmv4d.h b/decoder/include/etmv4/trc_pkt_elem_etmv4d.h index bb6a0029c0c0..5b0a358ee56b 100644 --- a/decoder/include/etmv4/trc_pkt_elem_etmv4d.h +++ b/decoder/include/etmv4/trc_pkt_elem_etmv4d.h @@ -35,7 +35,7 @@ #ifndef ARM_TRC_PKT_ELEM_ETMV4D_H_INCLUDED #define ARM_TRC_PKT_ELEM_ETMV4D_H_INCLUDED
-#include "trc_pkt_types_etmv4.h" +#include "opencsd/etmv4/trc_pkt_types_etmv4.h" #include "common/trc_printable_elem.h" #include "common/trc_pkt_elem_base.h"
diff --git a/decoder/include/etmv4/trc_pkt_elem_etmv4i.h b/decoder/include/etmv4/trc_pkt_elem_etmv4i.h index e0343c76260c..5f6c6f39fbc0 100644 --- a/decoder/include/etmv4/trc_pkt_elem_etmv4i.h +++ b/decoder/include/etmv4/trc_pkt_elem_etmv4i.h @@ -36,7 +36,7 @@ #ifndef ARM_TRC_PKT_ELEM_ETMV4I_H_INCLUDED #define ARM_TRC_PKT_ELEM_ETMV4I_H_INCLUDED
-#include "trc_pkt_types_etmv4.h" +#include "opencsd/etmv4/trc_pkt_types_etmv4.h" #include "common/trc_printable_elem.h" #include "common/trc_pkt_elem_base.h"
diff --git a/decoder/include/etmv4/trc_pkt_proc_etmv4.h b/decoder/include/etmv4/trc_pkt_proc_etmv4.h index 0d9ccea2be54..b8f288a399d1 100644 --- a/decoder/include/etmv4/trc_pkt_proc_etmv4.h +++ b/decoder/include/etmv4/trc_pkt_proc_etmv4.h @@ -36,7 +36,7 @@ #define ARM_TRC_PKT_PROC_ETMV4_H_INCLUDED
-#include "trc_pkt_types_etmv4.h" +#include "opencsd/etmv4/trc_pkt_types_etmv4.h" #include "common/trc_pkt_proc_base.h"
class EtmV4IPktProcImpl; /**< ETMv4 I channel packet processor */ diff --git a/decoder/include/i_dec/trc_i_decode.h b/decoder/include/i_dec/trc_i_decode.h index 0956a2ac2b85..ac31a79ded63 100644 --- a/decoder/include/i_dec/trc_i_decode.h +++ b/decoder/include/i_dec/trc_i_decode.h @@ -35,7 +35,7 @@ #define ARM_TRC_I_DECODE_H_INCLUDED
#include "interfaces/trc_instr_decode_i.h" -#include "ocsd_if_types.h" +#include "opencsd/ocsd_if_types.h"
class TrcIDecode : public IInstrDecode { diff --git a/decoder/include/i_dec/trc_idec_arminst.h b/decoder/include/i_dec/trc_idec_arminst.h index 6ce7080bee26..b15984948d29 100644 --- a/decoder/include/i_dec/trc_idec_arminst.h +++ b/decoder/include/i_dec/trc_idec_arminst.h @@ -39,7 +39,7 @@ #define __STDC_CONSTANT_MACROS 1 #endif
-#include "ocsd_if_types.h" +#include "opencsd/ocsd_if_types.h" #include <cstdint>
/* diff --git a/decoder/include/interfaces/trc_data_raw_in_i.h b/decoder/include/interfaces/trc_data_raw_in_i.h index ac3d0b7f9c4f..bf020d706df8 100644 --- a/decoder/include/interfaces/trc_data_raw_in_i.h +++ b/decoder/include/interfaces/trc_data_raw_in_i.h @@ -35,7 +35,7 @@ #ifndef ARM_TRCDATA_RAW_IN_I_H_INCLUDED #define ARM_TRCDATA_RAW_IN_I_H_INCLUDED
-#include "ocsd_if_types.h" +#include "opencsd/ocsd_if_types.h"
/** @class ITrcDataIn * diff --git a/decoder/include/interfaces/trc_data_rawframe_in_i.h b/decoder/include/interfaces/trc_data_rawframe_in_i.h index 240dc9d31d6c..9fc35319b86e 100644 --- a/decoder/include/interfaces/trc_data_rawframe_in_i.h +++ b/decoder/include/interfaces/trc_data_rawframe_in_i.h @@ -36,7 +36,7 @@ #ifndef ARM_TRCDATA_RAWFRAME_IN_I_H_INCLUDED #define ARM_TRCDATA_RAWFRAME_IN_I_H_INCLUDED
-#include "ocsd_if_types.h" +#include "opencsd/ocsd_if_types.h"
/*! * @class ITrcRawFrameIn diff --git a/decoder/include/interfaces/trc_error_log_i.h b/decoder/include/interfaces/trc_error_log_i.h index 2e64ac28116d..2fc796f72457 100644 --- a/decoder/include/interfaces/trc_error_log_i.h +++ b/decoder/include/interfaces/trc_error_log_i.h @@ -36,7 +36,7 @@ #ifndef ARM_TRC_ERROR_LOG_I_H_INCLUDED #define ARM_TRC_ERROR_LOG_I_H_INCLUDED
-#include "ocsd_if_types.h" +#include "opencsd/ocsd_if_types.h" #include <string>
class ocsdError; diff --git a/decoder/include/interfaces/trc_indexer_src_i.h b/decoder/include/interfaces/trc_indexer_src_i.h index 413c2a4c731a..078efa515253 100644 --- a/decoder/include/interfaces/trc_indexer_src_i.h +++ b/decoder/include/interfaces/trc_indexer_src_i.h @@ -38,7 +38,7 @@ #define ARM_TRC_INDEXER_SRC_I_H_INCLUDED
#include <vector> -#include "ocsd_if_types.h" +#include "opencsd/ocsd_if_types.h"
/*! * @class ITrcSrcIndexCreator diff --git a/decoder/include/mem_acc/trc_mem_acc_base.h b/decoder/include/mem_acc/trc_mem_acc_base.h index a82933d73bfc..71b6a816edad 100644 --- a/decoder/include/mem_acc/trc_mem_acc_base.h +++ b/decoder/include/mem_acc/trc_mem_acc_base.h @@ -35,7 +35,7 @@ #ifndef ARM_TRC_MEM_ACC_BASE_H_INCLUDED #define ARM_TRC_MEM_ACC_BASE_H_INCLUDED
-#include "ocsd_if_types.h" +#include "opencsd/ocsd_if_types.h" #include <string>
/*! diff --git a/decoder/include/mem_acc/trc_mem_acc_cb_if.h b/decoder/include/mem_acc/trc_mem_acc_cb_if.h index 5621b7c1ee46..54dc1848c45e 100644 --- a/decoder/include/mem_acc/trc_mem_acc_cb_if.h +++ b/decoder/include/mem_acc/trc_mem_acc_cb_if.h @@ -35,7 +35,7 @@ #ifndef ARM_TRC_MEM_ACC_CB_IF_H_INCLUDED #define ARM_TRC_MEM_ACC_CB_IF_H_INCLUDED
-#include "ocsd_if_types.h" +#include "opencsd/ocsd_if_types.h"
/*! * @class TrcMemAccCBIF diff --git a/decoder/include/mem_acc/trc_mem_acc_file.h b/decoder/include/mem_acc/trc_mem_acc_file.h index 47ed15dab647..7f8d5462cbf5 100644 --- a/decoder/include/mem_acc/trc_mem_acc_file.h +++ b/decoder/include/mem_acc/trc_mem_acc_file.h @@ -40,7 +40,7 @@ #include <fstream> #include <list>
-#include "ocsd_if_types.h" +#include "opencsd/ocsd_if_types.h" #include "mem_acc/trc_mem_acc_base.h"
// an add-on region to a file - allows setting of a region at a none-zero offset for a file. diff --git a/decoder/include/mem_acc/trc_mem_acc_mapper.h b/decoder/include/mem_acc/trc_mem_acc_mapper.h index 36db5edce871..07d044ead81c 100644 --- a/decoder/include/mem_acc/trc_mem_acc_mapper.h +++ b/decoder/include/mem_acc/trc_mem_acc_mapper.h @@ -37,7 +37,7 @@
#include <vector>
-#include "ocsd_if_types.h" +#include "opencsd/ocsd_if_types.h" #include "interfaces/trc_tgt_mem_access_i.h" #include "interfaces/trc_error_log_i.h" #include "mem_acc/trc_mem_acc_base.h" diff --git a/decoder/include/opencsd.h b/decoder/include/opencsd.h index fa8a45aef30a..316c5389f16c 100644 --- a/decoder/include/opencsd.h +++ b/decoder/include/opencsd.h @@ -36,9 +36,9 @@ #define ARM_OPENCSD_H_INCLUDED
/** C interface types */ -#include "ocsd_if_types.h" -#include "trc_pkt_types.h" -#include "trc_gen_elem_types.h" +#include "opencsd/ocsd_if_types.h" +#include "opencsd/trc_pkt_types.h" +#include "opencsd/trc_gen_elem_types.h"
/* C++ abstract interfaces */ #include "interfaces/trc_data_raw_in_i.h" diff --git a/decoder/include/c_api/ocsd_c_api_custom.h b/decoder/include/opencsd/c_api/ocsd_c_api_custom.h similarity index 100% rename from decoder/include/c_api/ocsd_c_api_custom.h rename to decoder/include/opencsd/c_api/ocsd_c_api_custom.h diff --git a/decoder/include/c_api/ocsd_c_api_types.h b/decoder/include/opencsd/c_api/ocsd_c_api_types.h similarity index 94% rename from decoder/include/c_api/ocsd_c_api_types.h rename to decoder/include/opencsd/c_api/ocsd_c_api_types.h index 8354d006ce64..7eeb9ceccb68 100644 --- a/decoder/include/c_api/ocsd_c_api_types.h +++ b/decoder/include/opencsd/c_api/ocsd_c_api_types.h @@ -36,15 +36,15 @@ #define ARM_OCSD_C_API_TYPES_H_INCLUDED
/* select the library types that are C compatible - the interface data types */ -#include "ocsd_if_types.h" -#include "trc_gen_elem_types.h" -#include "trc_pkt_types.h" +#include <opencsd/ocsd_if_types.h> +#include <opencsd/trc_gen_elem_types.h> +#include <opencsd/trc_pkt_types.h>
/* pull in the protocol decoder types. */ -#include "etmv3/trc_pkt_types_etmv3.h" -#include "etmv4/trc_pkt_types_etmv4.h" -#include "ptm/trc_pkt_types_ptm.h" -#include "stm/trc_pkt_types_stm.h" +#include <opencsd/etmv3/trc_pkt_types_etmv3.h> +#include <opencsd/etmv4/trc_pkt_types_etmv4.h> +#include <opencsd/ptm/trc_pkt_types_ptm.h> +#include <opencsd/stm/trc_pkt_types_stm.h>
/** @ingroup lib_c_api @{*/ diff --git a/decoder/include/c_api/opencsd_c_api.h b/decoder/include/opencsd/c_api/opencsd_c_api.h similarity index 100% rename from decoder/include/c_api/opencsd_c_api.h rename to decoder/include/opencsd/c_api/opencsd_c_api.h diff --git a/decoder/include/etmv3/trc_pkt_types_etmv3.h b/decoder/include/opencsd/etmv3/trc_pkt_types_etmv3.h similarity index 99% rename from decoder/include/etmv3/trc_pkt_types_etmv3.h rename to decoder/include/opencsd/etmv3/trc_pkt_types_etmv3.h index 0be9d98d276f..43362d74b3f6 100644 --- a/decoder/include/etmv3/trc_pkt_types_etmv3.h +++ b/decoder/include/opencsd/etmv3/trc_pkt_types_etmv3.h @@ -35,7 +35,7 @@ #ifndef ARM_TRC_ETM3_PKT_TYPES_ETMV3_H_INCLUDED #define ARM_TRC_ETM3_PKT_TYPES_ETMV3_H_INCLUDED
-#include "trc_pkt_types.h" +#include <opencsd/trc_pkt_types.h>
/** @addtogroup trc_pkts @{*/ diff --git a/decoder/include/etmv4/trc_pkt_types_etmv4.h b/decoder/include/opencsd/etmv4/trc_pkt_types_etmv4.h similarity index 99% rename from decoder/include/etmv4/trc_pkt_types_etmv4.h rename to decoder/include/opencsd/etmv4/trc_pkt_types_etmv4.h index 7f017370bb25..32ded97c7033 100644 --- a/decoder/include/etmv4/trc_pkt_types_etmv4.h +++ b/decoder/include/opencsd/etmv4/trc_pkt_types_etmv4.h @@ -36,7 +36,7 @@ #ifndef ARM_TRC_PKT_TYPES_ETMV4_H_INCLUDED #define ARM_TRC_PKT_TYPES_ETMV4_H_INCLUDED
-#include "trc_pkt_types.h" +#include <opencsd/trc_pkt_types.h>
/** @addtogroup trc_pkts @{*/ diff --git a/decoder/include/ocsd_if_types.h b/decoder/include/opencsd/ocsd_if_types.h similarity index 100% rename from decoder/include/ocsd_if_types.h rename to decoder/include/opencsd/ocsd_if_types.h diff --git a/decoder/include/ptm/trc_pkt_types_ptm.h b/decoder/include/opencsd/ptm/trc_pkt_types_ptm.h similarity index 99% rename from decoder/include/ptm/trc_pkt_types_ptm.h rename to decoder/include/opencsd/ptm/trc_pkt_types_ptm.h index e0ba1b808020..cbd8a0de8706 100644 --- a/decoder/include/ptm/trc_pkt_types_ptm.h +++ b/decoder/include/opencsd/ptm/trc_pkt_types_ptm.h @@ -35,7 +35,7 @@ #ifndef ARM_TRC_PKT_PTM_TYPES_H_INCLUDED #define ARM_TRC_PKT_PTM_TYPES_H_INCLUDED
-#include "trc_pkt_types.h" +#include <opencsd/trc_pkt_types.h>
/** @addtogroup trc_pkts @{*/ diff --git a/decoder/include/stm/trc_pkt_types_stm.h b/decoder/include/opencsd/stm/trc_pkt_types_stm.h similarity index 99% rename from decoder/include/stm/trc_pkt_types_stm.h rename to decoder/include/opencsd/stm/trc_pkt_types_stm.h index 0192b5ca6270..61dba59db70c 100644 --- a/decoder/include/stm/trc_pkt_types_stm.h +++ b/decoder/include/opencsd/stm/trc_pkt_types_stm.h @@ -34,7 +34,7 @@ #ifndef ARM_TRC_PKT_TYPES_STM_H_INCLUDED #define ARM_TRC_PKT_TYPES_STM_H_INCLUDED
-#include "trc_pkt_types.h" +#include <opencsd/trc_pkt_types.h>
/** @addtogroup trc_pkts @{*/ diff --git a/decoder/include/trc_gen_elem_types.h b/decoder/include/opencsd/trc_gen_elem_types.h similarity index 100% rename from decoder/include/trc_gen_elem_types.h rename to decoder/include/opencsd/trc_gen_elem_types.h diff --git a/decoder/include/trc_pkt_types.h b/decoder/include/opencsd/trc_pkt_types.h similarity index 100% rename from decoder/include/trc_pkt_types.h rename to decoder/include/opencsd/trc_pkt_types.h diff --git a/decoder/include/ptm/ptm_decoder.h b/decoder/include/ptm/ptm_decoder.h index 80086d2ea54f..373b595f19fd 100644 --- a/decoder/include/ptm/ptm_decoder.h +++ b/decoder/include/ptm/ptm_decoder.h @@ -38,7 +38,7 @@ #include "trc_cmp_cfg_ptm.h" #include "trc_pkt_elem_ptm.h" #include "trc_pkt_proc_ptm.h" -#include "trc_pkt_types_ptm.h" +#include "opencsd/ptm/trc_pkt_types_ptm.h" #include "trc_pkt_decode_ptm.h"
#endif // ARM_PTM_DECODER_H_INCLUDED diff --git a/decoder/include/ptm/trc_cmp_cfg_ptm.h b/decoder/include/ptm/trc_cmp_cfg_ptm.h index e086aae8e446..d7c5ccaad91a 100644 --- a/decoder/include/ptm/trc_cmp_cfg_ptm.h +++ b/decoder/include/ptm/trc_cmp_cfg_ptm.h @@ -36,7 +36,7 @@ #ifndef ARM_TRC_CMP_CFG_PTM_H_INCLUDED #define ARM_TRC_CMP_CFG_PTM_H_INCLUDED
-#include "trc_pkt_types_ptm.h" +#include "opencsd/ptm/trc_pkt_types_ptm.h" #include "common/trc_cs_config.h"
/** @defgroup ocsd_protocol_cfg OpenCSD Library : Trace Source Protocol Configuration. diff --git a/decoder/include/ptm/trc_dcd_mngr_ptm.h b/decoder/include/ptm/trc_dcd_mngr_ptm.h index 0defb0d2a590..8bb9dee072d2 100644 --- a/decoder/include/ptm/trc_dcd_mngr_ptm.h +++ b/decoder/include/ptm/trc_dcd_mngr_ptm.h @@ -38,7 +38,7 @@ #include "trc_pkt_decode_ptm.h" #include "trc_pkt_proc_ptm.h" #include "trc_cmp_cfg_ptm.h" -#include "trc_pkt_types_ptm.h" +#include "opencsd/ptm/trc_pkt_types_ptm.h"
class DecoderMngrPtm : public DecodeMngrFullDcd< PtmTrcPacket, ocsd_ptm_pkt_type, diff --git a/decoder/include/ptm/trc_pkt_elem_ptm.h b/decoder/include/ptm/trc_pkt_elem_ptm.h index 266bd2b692a0..0c14e1ea87f9 100644 --- a/decoder/include/ptm/trc_pkt_elem_ptm.h +++ b/decoder/include/ptm/trc_pkt_elem_ptm.h @@ -37,7 +37,7 @@ #ifndef ARM_TRC_PKT_ELEM_PTM_H_INCLUDED #define ARM_TRC_PKT_ELEM_PTM_H_INCLUDED
-#include "trc_pkt_types_ptm.h" +#include "opencsd/ptm/trc_pkt_types_ptm.h" #include "common/trc_printable_elem.h" #include "common/trc_pkt_elem_base.h"
diff --git a/decoder/include/ptm/trc_pkt_proc_ptm.h b/decoder/include/ptm/trc_pkt_proc_ptm.h index 87e933a3225d..850d6de8c128 100644 --- a/decoder/include/ptm/trc_pkt_proc_ptm.h +++ b/decoder/include/ptm/trc_pkt_proc_ptm.h @@ -36,7 +36,7 @@ #ifndef ARM_TRC_PKT_PROC_PTM_H_INCLUDED #define ARM_TRC_PKT_PROC_PTM_H_INCLUDED
-#include "trc_pkt_types_ptm.h" +#include "opencsd/ptm/trc_pkt_types_ptm.h" #include "common/trc_pkt_proc_base.h" #include "trc_pkt_elem_ptm.h" #include "trc_cmp_cfg_ptm.h" diff --git a/decoder/include/stm/stm_decoder.h b/decoder/include/stm/stm_decoder.h index 1367cad5d159..ae6a8d52c502 100644 --- a/decoder/include/stm/stm_decoder.h +++ b/decoder/include/stm/stm_decoder.h @@ -35,7 +35,7 @@ #ifndef ARM_STM_DECODER_H_INCLUDED #define ARM_STM_DECODER_H_INCLUDED
-#include "trc_pkt_types_stm.h" +#include "opencsd/stm/trc_pkt_types_stm.h" #include "trc_pkt_elem_stm.h" #include "trc_pkt_proc_stm.h"
diff --git a/decoder/include/stm/trc_cmp_cfg_stm.h b/decoder/include/stm/trc_cmp_cfg_stm.h index 41003ece3d91..c107a928d043 100644 --- a/decoder/include/stm/trc_cmp_cfg_stm.h +++ b/decoder/include/stm/trc_cmp_cfg_stm.h @@ -35,7 +35,7 @@ #ifndef ARM_TRC_CMP_CFG_STM_H_INCLUDED #define ARM_TRC_CMP_CFG_STM_H_INCLUDED
-#include "trc_pkt_types_stm.h" +#include "opencsd/stm/trc_pkt_types_stm.h" #include "common/trc_cs_config.h"
/** @addtogroup ocsd_protocol_cfg diff --git a/decoder/include/stm/trc_dcd_mngr_stm.h b/decoder/include/stm/trc_dcd_mngr_stm.h index 33632c6d65a7..dee24abb1aeb 100644 --- a/decoder/include/stm/trc_dcd_mngr_stm.h +++ b/decoder/include/stm/trc_dcd_mngr_stm.h @@ -38,7 +38,7 @@ #include "trc_pkt_decode_stm.h" #include "trc_pkt_proc_stm.h" #include "trc_cmp_cfg_stm.h" -#include "trc_pkt_types_stm.h" +#include "opencsd/stm/trc_pkt_types_stm.h"
class DecoderMngrStm : public DecodeMngrFullDcd< StmTrcPacket, ocsd_stm_pkt_type, diff --git a/decoder/include/stm/trc_pkt_elem_stm.h b/decoder/include/stm/trc_pkt_elem_stm.h index 738e4522a9c2..f8cdb7df2be4 100644 --- a/decoder/include/stm/trc_pkt_elem_stm.h +++ b/decoder/include/stm/trc_pkt_elem_stm.h @@ -35,7 +35,7 @@ #ifndef ARM_TRC_PKT_ELEM_STM_H_INCLUDED #define ARM_TRC_PKT_ELEM_STM_H_INCLUDED
-#include "trc_pkt_types_stm.h" +#include "opencsd/stm/trc_pkt_types_stm.h" #include "common/trc_printable_elem.h" #include "common/trc_pkt_elem_base.h"
diff --git a/decoder/include/stm/trc_pkt_proc_stm.h b/decoder/include/stm/trc_pkt_proc_stm.h index 909ac0cb0566..ab9b307634d4 100644 --- a/decoder/include/stm/trc_pkt_proc_stm.h +++ b/decoder/include/stm/trc_pkt_proc_stm.h @@ -37,7 +37,7 @@
#include <vector>
-#include "trc_pkt_types_stm.h" +#include "opencsd/stm/trc_pkt_types_stm.h" #include "common/trc_pkt_proc_base.h" #include "trc_pkt_elem_stm.h" #include "trc_cmp_cfg_stm.h" diff --git a/decoder/source/c_api/ocsd_c_api.cpp b/decoder/source/c_api/ocsd_c_api.cpp index b866db89c173..1a2a74f899bc 100644 --- a/decoder/source/c_api/ocsd_c_api.cpp +++ b/decoder/source/c_api/ocsd_c_api.cpp @@ -38,7 +38,7 @@ #include "opencsd.h"
/* C-API and wrapper objects */ -#include "c_api/opencsd_c_api.h" +#include "opencsd/c_api/opencsd_c_api.h" #include "ocsd_c_api_obj.h"
/** MSVC2010 unwanted export workaround */ diff --git a/decoder/source/c_api/ocsd_c_api_custom_obj.cpp b/decoder/source/c_api/ocsd_c_api_custom_obj.cpp index 70330e2238fd..dbd0bd107698 100644 --- a/decoder/source/c_api/ocsd_c_api_custom_obj.cpp +++ b/decoder/source/c_api/ocsd_c_api_custom_obj.cpp @@ -35,7 +35,7 @@ /* pull in the C++ decode library */ #include "opencsd.h"
-#include "c_api/opencsd_c_api.h" +#include "opencsd/c_api/opencsd_c_api.h" #include "ocsd_c_api_custom_obj.h" #include "common/ocsd_lib_dcd_register.h"
diff --git a/decoder/source/c_api/ocsd_c_api_custom_obj.h b/decoder/source/c_api/ocsd_c_api_custom_obj.h index 25b212c11d40..d4845bdf709d 100644 --- a/decoder/source/c_api/ocsd_c_api_custom_obj.h +++ b/decoder/source/c_api/ocsd_c_api_custom_obj.h @@ -36,7 +36,7 @@ #ifndef ARM_OCSD_C_API_CUSTOM_OBJ_H_INCLUDED #define ARM_OCSD_C_API_CUSTOM_OBJ_H_INCLUDED
-#include "c_api/ocsd_c_api_custom.h" +#include "opencsd/c_api/ocsd_c_api_custom.h" #include "common/ocsd_dcd_mngr_i.h"
/***** Decoder manager interface ******************************/ diff --git a/decoder/source/c_api/ocsd_c_api_obj.h b/decoder/source/c_api/ocsd_c_api_obj.h index 42e8a7d113ac..0476ac67177c 100644 --- a/decoder/source/c_api/ocsd_c_api_obj.h +++ b/decoder/source/c_api/ocsd_c_api_obj.h @@ -8,7 +8,7 @@ #ifndef ARM_OCSD_C_API_OBJ_H_INCLUDED #define ARM_OCSD_C_API_OBJ_H_INCLUDED
-#include "c_api/ocsd_c_api_types.h" +#include "opencsd/c_api/ocsd_c_api_types.h" #include "interfaces/trc_gen_elem_in_i.h" #include "common/ocsd_msg_logger.h"
diff --git a/decoder/source/etmv4/trc_etmv4_stack_elem.h b/decoder/source/etmv4/trc_etmv4_stack_elem.h index 5335ba8ded23..f3c6bb4908e9 100644 --- a/decoder/source/etmv4/trc_etmv4_stack_elem.h +++ b/decoder/source/etmv4/trc_etmv4_stack_elem.h @@ -33,7 +33,7 @@ #ifndef ARM_TRC_ETMV4_STACK_ELEM_H_INCLUDED #define ARM_TRC_ETMV4_STACK_ELEM_H_INCLUDED
-#include "etmv4/trc_pkt_types_etmv4.h" +#include "opencsd/etmv4/trc_pkt_types_etmv4.h"
/* ETMv4 I trace stack elements Speculation requires that we stack certain elements till they are committed or diff --git a/decoder/source/i_dec/trc_i_decode.cpp b/decoder/source/i_dec/trc_i_decode.cpp index 5c9d915b021d..47b4867e6c5c 100644 --- a/decoder/source/i_dec/trc_i_decode.cpp +++ b/decoder/source/i_dec/trc_i_decode.cpp @@ -32,7 +32,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
-#include "ocsd_if_types.h" +#include "opencsd/ocsd_if_types.h" #include "i_dec/trc_i_decode.h" #include "i_dec/trc_idec_arminst.h"
diff --git a/decoder/source/trc_frame_deformatter_impl.h b/decoder/source/trc_frame_deformatter_impl.h index 488bfad1bb9d..e1fc17ab259f 100644 --- a/decoder/source/trc_frame_deformatter_impl.h +++ b/decoder/source/trc_frame_deformatter_impl.h @@ -35,7 +35,7 @@ #ifndef ARM_TRC_FRAME_DECODER_IMPL_H_INCLUDED #define ARM_TRC_FRAME_DECODER_IMPL_H_INCLUDED
-#include "ocsd_if_types.h" +#include "opencsd/ocsd_if_types.h" #include "common/comp_attach_pt_t.h" #include "interfaces/trc_data_raw_in_i.h" #include "interfaces/trc_data_rawframe_in_i.h" diff --git a/decoder/tests/ext_dcd_test_eg/c_api_echo_test/ext_dcd_echo_test.c b/decoder/tests/ext_dcd_test_eg/c_api_echo_test/ext_dcd_echo_test.c index 3eac0e83157b..cd5855ad4f3a 100644 --- a/decoder/tests/ext_dcd_test_eg/c_api_echo_test/ext_dcd_echo_test.c +++ b/decoder/tests/ext_dcd_test_eg/c_api_echo_test/ext_dcd_echo_test.c @@ -36,8 +36,8 @@ #include <stdlib.h> #include <string.h>
-#include "c_api/opencsd_c_api.h" -#include "c_api/ocsd_c_api_types.h" +#include "opencsd/c_api/opencsd_c_api.h" +#include "opencsd/c_api/ocsd_c_api_types.h" #include "c_api/ocsd_c_api_cust_impl.h"
#include "ext_dcd_echo_test_fact.h" diff --git a/decoder/tests/ext_dcd_test_eg/c_api_echo_test/ext_dcd_echo_test.h b/decoder/tests/ext_dcd_test_eg/c_api_echo_test/ext_dcd_echo_test.h index 974b1cfc9e6e..b2fdb23e8083 100644 --- a/decoder/tests/ext_dcd_test_eg/c_api_echo_test/ext_dcd_echo_test.h +++ b/decoder/tests/ext_dcd_test_eg/c_api_echo_test/ext_dcd_echo_test.h @@ -35,7 +35,7 @@ #define ARM_EXT_DCD_ECHO_TEST_H_INCLUDED
#include <inttypes.h> -#include "c_api/ocsd_c_api_custom.h" +#include "opencsd/c_api/ocsd_c_api_custom.h"
/* Echo test decoder designed to test the external decoder C - API infrastructure. diff --git a/decoder/tests/ext_dcd_test_eg/c_api_echo_test/ext_dcd_echo_test_fact.h b/decoder/tests/ext_dcd_test_eg/c_api_echo_test/ext_dcd_echo_test_fact.h index c4cc6988915b..ef382f0baa21 100644 --- a/decoder/tests/ext_dcd_test_eg/c_api_echo_test/ext_dcd_echo_test_fact.h +++ b/decoder/tests/ext_dcd_test_eg/c_api_echo_test/ext_dcd_echo_test_fact.h @@ -39,7 +39,7 @@ back with a simple "protocol" decoded - not based on real protocol. */
-#include "c_api/ocsd_c_api_custom.h" +#include "opencsd/c_api/ocsd_c_api_custom.h"
/* return an initialised structure with the factory functions */ extern ocsd_extern_dcd_fact_t *ext_echo_get_dcd_fact(); diff --git a/decoder/tests/source/c_api_pkt_print_test.c b/decoder/tests/source/c_api_pkt_print_test.c index 1390b62c3411..34f7ed59a13e 100644 --- a/decoder/tests/source/c_api_pkt_print_test.c +++ b/decoder/tests/source/c_api_pkt_print_test.c @@ -53,7 +53,7 @@ #include <stdlib.h>
/* include the C-API library header */ -#include "c_api/opencsd_c_api.h" +#include "opencsd/c_api/opencsd_c_api.h"
/* include the test external decoder factory and decoder types headers - separate from the main library includes by definition as external decoder.
The name of the libraries found under /lib/ and /usr/lib are, for the most part, self descriptive. It is desirable to do the same for the opencsd library, hence changing the name to something automatically recognisable.
Signed-off-by: Mathieu Poirier mathieu.poirier@linaro.org --- HOWTO.md | 2 +- decoder/build/linux/makefile | 2 +- decoder/build/win-vs2015/opencsd.props | 6 +++--- decoder/docs/build_libs.md | 18 +++++++++--------- 4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/HOWTO.md b/HOWTO.md index dd4fe2057548..1ebc2c8796b2 100644 --- a/HOWTO.md +++ b/HOWTO.md @@ -271,7 +271,7 @@ the host's (which has nothing to do with the target) architecture: ...
linaro@t430:~/linaro/coresight/my-opencsd/decoder/build/linux$ ls ../../lib/linux64/dbg/ - libcstraced.a libcstraced_c_api.a libcstraced_c_api.so libcstraced.so + libopencsd.a libopencsd_c_api.a libopencsd_c_api.so libopencsd.so
Off Target Perf Tools Compilation diff --git a/decoder/build/linux/makefile b/decoder/build/linux/makefile index c9724bbfb371..47ac4f52b49d 100644 --- a/decoder/build/linux/makefile +++ b/decoder/build/linux/makefile @@ -40,7 +40,7 @@ export OCSD_ROOT endif
# library names -LIB_BASE_NAME=cstraced +LIB_BASE_NAME=opencsd export LIB_BASE_NAME LIB_CAPI_NAME=$(LIB_BASE_NAME)_c_api export LIB_CAPI_NAME diff --git a/decoder/build/win-vs2015/opencsd.props b/decoder/build/win-vs2015/opencsd.props index 3b33ee9c3590..6c8c7b339f77 100644 --- a/decoder/build/win-vs2015/opencsd.props +++ b/decoder/build/win-vs2015/opencsd.props @@ -2,8 +2,8 @@ <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ImportGroup Label="PropertySheets" /> <PropertyGroup Label="UserMacros"> - <LIB_BASE_NAME>cstraced</LIB_BASE_NAME> - <LIB_CAPI_NAME>cstraced_c_api</LIB_CAPI_NAME> + <LIB_BASE_NAME>opencsd</LIB_BASE_NAME> + <LIB_CAPI_NAME>opencsd_c_api</LIB_CAPI_NAME> </PropertyGroup> <PropertyGroup /> <ItemDefinitionGroup /> @@ -17,4 +17,4 @@ <EnvironmentVariable>true</EnvironmentVariable> </BuildMacro> </ItemGroup> -</Project> \ No newline at end of file +</Project> diff --git a/decoder/docs/build_libs.md b/decoder/docs/build_libs.md index b7c8536ca5f0..6d23917ec73c 100644 --- a/decoder/docs/build_libs.md +++ b/decoder/docs/build_libs.md @@ -32,16 +32,16 @@ Libraries are delivered to the `./lib/linux<bitsize>/<dbg\rel>` directories. e.g. `./lib/linux64/rel` will contain the linux 64 bit release libraries.
The following libraries are built:- -- `libcstraced.so` : shared library containing the main C++ based decoder library -- `libcstraced_c_api.so` : shared library containing the C-API wrapper library. Dependent on `libcstraced.so` -- `libcstraced.a` : static library containing the main C++ based decoder library. -- `libcstraced_c_api.a` : static library containing the C-API wrapper library. +- `libopencsd.so` : shared library containing the main C++ based decoder library +- `libopencsd_c_api.so` : shared library containing the C-API wrapper library. Dependent on `libopencsd.so` +- `libopencsd.a` : static library containing the main C++ based decoder library. +- `libopencsd_c_api.a` : static library containing the C-API wrapper library.
Test programs are delivered to the `./tests/bin/linux<bitsize>/<dgb\rel>` directories.
The test programs are built to used the .so versions of the libraries. -- `trc_pkt_lister` - dependent on `libcstraced.so`. -- `simple_pkt_print_c_api` - dependent on `libcstraced_c_api.so` & hence `libcstraced.so`. +- `trc_pkt_lister` - dependent on `libopencsd.so`. +- `simple_pkt_print_c_api` - dependent on `libopencsd_c_api.so` & hence `libopencsd.so`.
The test program build for `trc_pkt_lister` also builds an auxiliary library used by this program for test purposes only. This is the `libsnapshot_parser.a` library, delivered to the `./tests/lib/linux<bitsize>/<dgb\rel>` directories. @@ -65,9 +65,9 @@ _Note_: Currently there is no Windows DLL version of the main C++ library. This the project is nearer completion with further decode protocols, and the classes requiring export are established..
Libraries built are:- -- `libcstraced.lib` : static main C++ decoder library. -- `cstraced_c_api.dll` : C-API DLL library. Statically linked against `libcstraced.lib` at .DLL build time. -- `libcstraced_c_api.lib` : C-API static library. +- `libopencsd.lib` : static main C++ decoder library. +- `opencsd_c_api.dll` : C-API DLL library. Statically linked against `libopencsd.lib` at .DLL build time. +- `libopencsd_c_api.lib` : C-API static library.
There is also a project file to build an auxiliary library used `trc_pkt_lister` for test purposes only. This is the `snapshot_parser_lib.lib` library, delivered to the `./tests/lib/win<bitsize>/<dgb\rel>` directories.
That way header and library files can end up in the right place on the file system, and perf tools compiled without having to specify any environment variable.
Signed-off-by: Mathieu Poirier mathieu.poirier@linaro.org --- decoder/build/linux/makefile | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
diff --git a/decoder/build/linux/makefile b/decoder/build/linux/makefile index 47ac4f52b49d..f84542a4e93f 100644 --- a/decoder/build/linux/makefile +++ b/decoder/build/linux/makefile @@ -61,11 +61,18 @@ export OCSD_SOURCE=$(OCSD_ROOT)/source
export OCSD_TESTS=$(OCSD_ROOT)/tests
+UAPI_INCLUDE=$(OCSD_INCLUDE)/$(LIB_BASE_NAME) + # tools export MASTER_CC=$(CROSS_COMPILE)gcc export MASTER_CPP=$(CROSS_COMPILE)g++ export MASTER_LINKER=$(CROSS_COMPILE)g++ export MASTER_LIB=$(CROSS_COMPILE)ar +INSTALL=install + +# installation directory +INSTALL_LIB_DIR=/usr/lib/ +INSTALL_INCLUDE_DIR=/usr/include/
# compile flags MASTER_CC_FLAGS := -c -Wall -DLINUX @@ -125,6 +132,11 @@ all: libs tests
libs: $(LIB_BASE_NAME)_lib $(LIB_CAPI_NAME)_lib
+install: libs + $(INSTALL) --mode=644 $(LIB_TARGET_DIR)/lib$(LIB_BASE_NAME).so $(INSTALL_LIB_DIR)/ + $(INSTALL) --mode=644 $(LIB_TARGET_DIR)/lib$(LIB_CAPI_NAME).so $(INSTALL_LIB_DIR)/ + cp -dR $(UAPI_INCLUDE) $(INSTALL_INCLUDE_DIR)/ + ################################ # build OpenCSD trace decode library # @@ -177,3 +189,8 @@ clean_tests: cd $(OCSD_ROOT)/tests/build/linux/snapshot_parser_lib && make clean cd $(OCSD_ROOT)/tests/build/linux/trc_pkt_lister && make clean cd $(OCSD_ROOT)/tests/build/linux/c_api_pkt_print_test && make clean + +clean_install: + rm -f $(INSTALL_LIB_DIR)/lib$(LIB_BASE_NAME).so + rm -f $(INSTALL_LIB_DIR)/lib$(LIB_CAPI_NAME).so + rm -rf $(INSTALL_INCLUDE_DIR)/$(LIB_BASE_NAME)
Hi Mathieu,
A couple of things...
1) This patchset doesn't apply to master - I think you must be using version 0.7.4 or earlier. The updates to produce 0.7.5 move a header file from the source area into include where it really belonged - plus some significant makefile changes and bugfixes. I can hack the patch to make it work, and will postfix the missing update, along with the large number of windows project file changes that are likely to be needed.
2) We changed the name of the library _to_ libcstraced so that it was more intuitive. This name describes what it does - and is identifiable to someone who may not be aware of the project that it is trace related. 'opencsd' describes the project, not the purpose. Perhaps worth discussion in the meeting Wednesday.
3) Include changes - no problem in principle with making the include paths linux installation friendly. However the general idea is that all the etm4 includes are collected in include\etmv4 - your changes leave some in include\etmv4, others in include\opencsd\etmv4 - do we really need two etmv4 include directories? (and ptm / etmv3 stm etc). This increases the maintenance burden and confuses matters if adding new header files. Is there a specific reason I have missed that only certain files are moved?
Regards
Mike
On 8 December 2017 at 23:58, Mathieu Poirier mathieu.poirier@linaro.org wrote:
Good afternoon Mike,
Please find below the required changes that allow to properly integrate the opencsd library with the perf tools build mechanism. In that scheme the headers and library objects are installed along side other system header and libraries and from there automatically detected by the perf tools build engine.
That way we don't have to specify the CSTRACE_PATH and it also paves the way for proper packaging for distributions.
The first patch looks mean but it just moves header files around. The other two patches are trivial. I have tested this on Linux but not on Windows.
Thanks, Mathieu
Mathieu Poirier (3): opencsd: Creating user API include directory opencsd: Changing library names to be more intuitive opencsd: Adding "install" target
HOWTO.md | 2 +- decoder/build/linux/makefile | 19 ++++++++++++++++++- decoder/build/win-vs2015/opencsd.props | 6 +++--- decoder/docs/build_libs.md | 18 +++++++++--------- decoder/include/c_api/ocsd_c_api_cust_impl.h | 4 ++-- decoder/include/common/comp_attach_pt_t.h | 2 +- decoder/include/common/ocsd_code_follower.h | 4 ++-- decoder/include/common/ocsd_dcd_mngr.h | 2 +- decoder/include/common/ocsd_dcd_mngr_i.h | 4 ++-- decoder/include/common/ocsd_error.h | 2 +- decoder/include/common/ocsd_lib_dcd_register.h | 2 +- decoder/include/common/ocsd_pe_context.h | 2 +- decoder/include/common/trc_core_arch_map.h | 2 +- decoder/include/common/trc_frame_deformatter.h | 4 ++-- decoder/include/common/trc_gen_elem.h | 2 +- decoder/include/common/trc_ret_stack.h | 2 +- decoder/include/etmv3/etmv3_decoder.h | 2 +- decoder/include/etmv3/trc_cmp_cfg_etmv3.h | 2 +- decoder/include/etmv3/trc_dcd_mngr_etmv3.h | 2 +- decoder/include/etmv3/trc_pkt_elem_etmv3.h | 2 +- decoder/include/etmv3/trc_pkt_proc_etmv3.h | 2 +- decoder/include/etmv4/etmv4_decoder.h | 2 +- decoder/include/etmv4/trc_cmp_cfg_etmv4.h | 2 +- decoder/include/etmv4/trc_dcd_mngr_etmv4i.h | 2 +- decoder/include/etmv4/trc_pkt_elem_etmv4d.h | 2 +- decoder/include/etmv4/trc_pkt_elem_etmv4i.h | 2 +- decoder/include/etmv4/trc_pkt_proc_etmv4.h | 2 +- decoder/include/i_dec/trc_i_decode.h | 2 +- decoder/include/i_dec/trc_idec_arminst.h | 2 +- decoder/include/interfaces/trc_data_raw_in_i.h | 2 +- decoder/include/interfaces/trc_data_rawframe_in_i.h | 2 +- decoder/include/interfaces/trc_error_log_i.h | 2 +- decoder/include/interfaces/trc_indexer_src_i.h | 2 +- decoder/include/mem_acc/trc_mem_acc_base.h | 2 +- decoder/include/mem_acc/trc_mem_acc_cb_if.h | 2 +- decoder/include/mem_acc/trc_mem_acc_file.h | 2 +- decoder/include/mem_acc/trc_mem_acc_mapper.h | 2 +- decoder/include/opencsd.h | 6 +++--- .../include/{ => opencsd}/c_api/ocsd_c_api_custom.h | 0 .../include/{ => opencsd}/c_api/ocsd_c_api_types.h | 14 +++++++------- decoder/include/{ => opencsd}/c_api/opencsd_c_api.h | 0 .../include/{ => opencsd}/etmv3/trc_pkt_types_etmv3.h | 2 +- .../include/{ => opencsd}/etmv4/trc_pkt_types_etmv4.h | 2 +- decoder/include/{ => opencsd}/ocsd_if_types.h | 0 decoder/include/{ => opencsd}/ptm/trc_pkt_types_ptm.h | 2 +- decoder/include/{ => opencsd}/stm/trc_pkt_types_stm.h | 2 +- decoder/include/{ => opencsd}/trc_gen_elem_types.h | 0 decoder/include/{ => opencsd}/trc_pkt_types.h | 0 decoder/include/ptm/ptm_decoder.h | 2 +- decoder/include/ptm/trc_cmp_cfg_ptm.h | 2 +- decoder/include/ptm/trc_dcd_mngr_ptm.h | 2 +- decoder/include/ptm/trc_pkt_elem_ptm.h | 2 +- decoder/include/ptm/trc_pkt_proc_ptm.h | 2 +- decoder/include/stm/stm_decoder.h | 2 +- decoder/include/stm/trc_cmp_cfg_stm.h | 2 +- decoder/include/stm/trc_dcd_mngr_stm.h | 2 +- decoder/include/stm/trc_pkt_elem_stm.h | 2 +- decoder/include/stm/trc_pkt_proc_stm.h | 2 +- decoder/source/c_api/ocsd_c_api.cpp | 2 +- decoder/source/c_api/ocsd_c_api_custom_obj.cpp | 2 +- decoder/source/c_api/ocsd_c_api_custom_obj.h | 2 +- decoder/source/c_api/ocsd_c_api_obj.h | 2 +- decoder/source/etmv4/trc_etmv4_stack_elem.h | 2 +- decoder/source/i_dec/trc_i_decode.cpp | 2 +- decoder/source/trc_frame_deformatter_impl.h | 2 +- .../c_api_echo_test/ext_dcd_echo_test.c | 4 ++-- .../c_api_echo_test/ext_dcd_echo_test.h | 2 +- .../c_api_echo_test/ext_dcd_echo_test_fact.h | 2 +- decoder/tests/source/c_api_pkt_print_test.c | 2 +- 69 files changed, 104 insertions(+), 87 deletions(-) rename decoder/include/{ => opencsd}/c_api/ocsd_c_api_custom.h (100%) rename decoder/include/{ => opencsd}/c_api/ocsd_c_api_types.h (94%) rename decoder/include/{ => opencsd}/c_api/opencsd_c_api.h (100%) rename decoder/include/{ => opencsd}/etmv3/trc_pkt_types_etmv3.h (99%) rename decoder/include/{ => opencsd}/etmv4/trc_pkt_types_etmv4.h (99%) rename decoder/include/{ => opencsd}/ocsd_if_types.h (100%) rename decoder/include/{ => opencsd}/ptm/trc_pkt_types_ptm.h (99%) rename decoder/include/{ => opencsd}/stm/trc_pkt_types_stm.h (99%) rename decoder/include/{ => opencsd}/trc_gen_elem_types.h (100%) rename decoder/include/{ => opencsd}/trc_pkt_types.h (100%)
-- 2.7.4
CoreSight mailing list CoreSight@lists.linaro.org https://lists.linaro.org/mailman/listinfo/coresight
On 11 December 2017 at 08:08, Mike Leach mike.leach@linaro.org wrote:
Hi Mathieu,
A couple of things...
- This patchset doesn't apply to master - I think you must be using
version 0.7.4 or earlier. The updates to produce 0.7.5 move a header file from the source area into include where it really belonged - plus some significant makefile changes and bugfixes. I can hack the patch to make it work, and will postfix the missing update, along with the large number of windows project file changes that are likely to be needed.
Don't waste time on this, I'll rebase and send another revision.
- We changed the name of the library _to_ libcstraced so that it was
more intuitive. This name describes what it does - and is identifiable to someone who may not be aware of the project that it is trace related. 'opencsd' describes the project, not the purpose. Perhaps worth discussion in the meeting Wednesday.
To me libopencsd is more intuitive than libcstraced (note that I can't remember what the original name was) and libraries that bare the same name as their project is also common - libperf, libpython, libc are some examples. Yes, let's discuss it on Wednesday - we need to get it right because when it's out there won't be a way to change it. I also invite people to chime in on the topic.
- Include changes - no problem in principle with making the include
paths linux installation friendly. However the general idea is that all the etm4 includes are collected in include\etmv4 - your changes leave some in include\etmv4, others in include\opencsd\etmv4 - do we really need two etmv4 include directories? (and ptm / etmv3 stm etc). This increases the maintenance burden and confuses matters if adding new header files. Is there a specific reason I have missed that only certain files are moved?
The idea was to reduce the amount of file exposed to user space and minimise the changes on the original code base. I have no problem moving the etmv3/etmv4/ptm/stm directories under the new opencsd/ directory.
I'll work on a V2 today - thanks for the review, Mathieu
Regards
Mike
On 8 December 2017 at 23:58, Mathieu Poirier mathieu.poirier@linaro.org wrote:
Good afternoon Mike,
Please find below the required changes that allow to properly integrate the opencsd library with the perf tools build mechanism. In that scheme the headers and library objects are installed along side other system header and libraries and from there automatically detected by the perf tools build engine.
That way we don't have to specify the CSTRACE_PATH and it also paves the way for proper packaging for distributions.
The first patch looks mean but it just moves header files around. The other two patches are trivial. I have tested this on Linux but not on Windows.
Thanks, Mathieu
Mathieu Poirier (3): opencsd: Creating user API include directory opencsd: Changing library names to be more intuitive opencsd: Adding "install" target
HOWTO.md | 2 +- decoder/build/linux/makefile | 19 ++++++++++++++++++- decoder/build/win-vs2015/opencsd.props | 6 +++--- decoder/docs/build_libs.md | 18 +++++++++--------- decoder/include/c_api/ocsd_c_api_cust_impl.h | 4 ++-- decoder/include/common/comp_attach_pt_t.h | 2 +- decoder/include/common/ocsd_code_follower.h | 4 ++-- decoder/include/common/ocsd_dcd_mngr.h | 2 +- decoder/include/common/ocsd_dcd_mngr_i.h | 4 ++-- decoder/include/common/ocsd_error.h | 2 +- decoder/include/common/ocsd_lib_dcd_register.h | 2 +- decoder/include/common/ocsd_pe_context.h | 2 +- decoder/include/common/trc_core_arch_map.h | 2 +- decoder/include/common/trc_frame_deformatter.h | 4 ++-- decoder/include/common/trc_gen_elem.h | 2 +- decoder/include/common/trc_ret_stack.h | 2 +- decoder/include/etmv3/etmv3_decoder.h | 2 +- decoder/include/etmv3/trc_cmp_cfg_etmv3.h | 2 +- decoder/include/etmv3/trc_dcd_mngr_etmv3.h | 2 +- decoder/include/etmv3/trc_pkt_elem_etmv3.h | 2 +- decoder/include/etmv3/trc_pkt_proc_etmv3.h | 2 +- decoder/include/etmv4/etmv4_decoder.h | 2 +- decoder/include/etmv4/trc_cmp_cfg_etmv4.h | 2 +- decoder/include/etmv4/trc_dcd_mngr_etmv4i.h | 2 +- decoder/include/etmv4/trc_pkt_elem_etmv4d.h | 2 +- decoder/include/etmv4/trc_pkt_elem_etmv4i.h | 2 +- decoder/include/etmv4/trc_pkt_proc_etmv4.h | 2 +- decoder/include/i_dec/trc_i_decode.h | 2 +- decoder/include/i_dec/trc_idec_arminst.h | 2 +- decoder/include/interfaces/trc_data_raw_in_i.h | 2 +- decoder/include/interfaces/trc_data_rawframe_in_i.h | 2 +- decoder/include/interfaces/trc_error_log_i.h | 2 +- decoder/include/interfaces/trc_indexer_src_i.h | 2 +- decoder/include/mem_acc/trc_mem_acc_base.h | 2 +- decoder/include/mem_acc/trc_mem_acc_cb_if.h | 2 +- decoder/include/mem_acc/trc_mem_acc_file.h | 2 +- decoder/include/mem_acc/trc_mem_acc_mapper.h | 2 +- decoder/include/opencsd.h | 6 +++--- .../include/{ => opencsd}/c_api/ocsd_c_api_custom.h | 0 .../include/{ => opencsd}/c_api/ocsd_c_api_types.h | 14 +++++++------- decoder/include/{ => opencsd}/c_api/opencsd_c_api.h | 0 .../include/{ => opencsd}/etmv3/trc_pkt_types_etmv3.h | 2 +- .../include/{ => opencsd}/etmv4/trc_pkt_types_etmv4.h | 2 +- decoder/include/{ => opencsd}/ocsd_if_types.h | 0 decoder/include/{ => opencsd}/ptm/trc_pkt_types_ptm.h | 2 +- decoder/include/{ => opencsd}/stm/trc_pkt_types_stm.h | 2 +- decoder/include/{ => opencsd}/trc_gen_elem_types.h | 0 decoder/include/{ => opencsd}/trc_pkt_types.h | 0 decoder/include/ptm/ptm_decoder.h | 2 +- decoder/include/ptm/trc_cmp_cfg_ptm.h | 2 +- decoder/include/ptm/trc_dcd_mngr_ptm.h | 2 +- decoder/include/ptm/trc_pkt_elem_ptm.h | 2 +- decoder/include/ptm/trc_pkt_proc_ptm.h | 2 +- decoder/include/stm/stm_decoder.h | 2 +- decoder/include/stm/trc_cmp_cfg_stm.h | 2 +- decoder/include/stm/trc_dcd_mngr_stm.h | 2 +- decoder/include/stm/trc_pkt_elem_stm.h | 2 +- decoder/include/stm/trc_pkt_proc_stm.h | 2 +- decoder/source/c_api/ocsd_c_api.cpp | 2 +- decoder/source/c_api/ocsd_c_api_custom_obj.cpp | 2 +- decoder/source/c_api/ocsd_c_api_custom_obj.h | 2 +- decoder/source/c_api/ocsd_c_api_obj.h | 2 +- decoder/source/etmv4/trc_etmv4_stack_elem.h | 2 +- decoder/source/i_dec/trc_i_decode.cpp | 2 +- decoder/source/trc_frame_deformatter_impl.h | 2 +- .../c_api_echo_test/ext_dcd_echo_test.c | 4 ++-- .../c_api_echo_test/ext_dcd_echo_test.h | 2 +- .../c_api_echo_test/ext_dcd_echo_test_fact.h | 2 +- decoder/tests/source/c_api_pkt_print_test.c | 2 +- 69 files changed, 104 insertions(+), 87 deletions(-) rename decoder/include/{ => opencsd}/c_api/ocsd_c_api_custom.h (100%) rename decoder/include/{ => opencsd}/c_api/ocsd_c_api_types.h (94%) rename decoder/include/{ => opencsd}/c_api/opencsd_c_api.h (100%) rename decoder/include/{ => opencsd}/etmv3/trc_pkt_types_etmv3.h (99%) rename decoder/include/{ => opencsd}/etmv4/trc_pkt_types_etmv4.h (99%) rename decoder/include/{ => opencsd}/ocsd_if_types.h (100%) rename decoder/include/{ => opencsd}/ptm/trc_pkt_types_ptm.h (99%) rename decoder/include/{ => opencsd}/stm/trc_pkt_types_stm.h (99%) rename decoder/include/{ => opencsd}/trc_gen_elem_types.h (100%) rename decoder/include/{ => opencsd}/trc_pkt_types.h (100%)
-- 2.7.4
CoreSight mailing list CoreSight@lists.linaro.org https://lists.linaro.org/mailman/listinfo/coresight
-- Mike Leach Principal Engineer, ARM Ltd. Blackburn Design Centre. UK
-
Mathieu Poirier -
Mike Leach