Profile can live in core

2023-09-07 07:22:10 -04:00 · 2023-09-07 07:22:10 -04:00 · 7505fd0f37
parent 3e6f7ab3e5
commit 7505fd0f37
40 changed files with 49 additions and 50 deletions
--- a/3d-viewer/3d_canvas/create_layer_items.cpp
+++ b/3d-viewer/3d_canvas/create_layer_items.cpp
@ -51,7 +51,7 @@
 #include <wx/log.h>

 #ifdef PRINT_STATISTICS_3D_VIEWER
-#include <profile.h>
+#include <core/profile.h>
 #endif


--- a/3d-viewer/3d_canvas/eda_3d_canvas.cpp
+++ b/3d-viewer/3d_canvas/eda_3d_canvas.cpp
@ -36,7 +36,7 @@
 #include <board.h>
 #include <reporter.h>
 #include <gl_context_mgr.h>
-#include <profile.h>        // To use GetRunningMicroSecs or another profiling utility
+#include <core/profile.h>        // To use GetRunningMicroSecs or another profiling utility
 #include <bitmaps.h>
 #include <macros.h>
 #include <menus_helpers.h>
--- a/3d-viewer/3d_rendering/opengl/create_scene.cpp
+++ b/3d-viewer/3d_rendering/opengl/create_scene.cpp
@ -30,7 +30,7 @@
 #include "convert_basic_shapes_to_polygon.h"
 #include <trigo.h>
 #include <project.h>
-#include <profile.h>        // To use GetRunningMicroSecs or another profiling utility
+#include <core/profile.h>        // To use GetRunningMicroSecs or another profiling utility
 #include <fp_lib_table.h>
 #include <eda_3d_viewer_frame.h>

--- a/3d-viewer/3d_rendering/raytracing/create_scene.cpp
+++ b/3d-viewer/3d_rendering/raytracing/create_scene.cpp
@ -44,7 +44,7 @@
 #include <eda_3d_viewer_frame.h>

 #include <base_units.h>
-#include <profile.h>        // To use GetRunningMicroSecs or another profiling utility
+#include <core/profile.h>        // To use GetRunningMicroSecs or another profiling utility

 /**
 * Perform an interpolation step to easy control the transparency based on the
--- a/3d-viewer/3d_rendering/raytracing/render_3d_raytrace.cpp
+++ b/3d-viewer/3d_rendering/raytracing/render_3d_raytrace.cpp
@ -35,7 +35,7 @@
 #include "3d_fastmath.h"
 #include "3d_math.h"
 #include "../common_ogl/ogl_utils.h"
-#include <profile.h>        // To use GetRunningMicroSecs or another profiling utility
+#include <core/profile.h>        // To use GetRunningMicroSecs or another profiling utility
 #include <wx/log.h>


--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@ -353,7 +353,6 @@ set( COMMON_SRCS
    footprint_info.cpp
    gbr_metadata.cpp
    gestfich.cpp
-    getrunningmicrosecs.cpp
    gr_basic.cpp
    grid_tricks.cpp
    hotkey_store.cpp
--- a/common/database/database_connection.cpp
+++ b/common/database/database_connection.cpp
@ -44,7 +44,7 @@

 #include <database/database_connection.h>
 #include <database/database_cache.h>
-#include <profile.h>
+#include <core/profile.h>


 const char* const traceDatabase = "KICAD_DATABASE";
--- a/common/draw_panel_gal.cpp
+++ b/common/draw_panel_gal.cpp
@ -51,7 +51,7 @@

 #include <kiplatform/ui.h>

-#include <profile.h>
+#include <core/profile.h>

 #include <pgm_base.h>

--- a/common/gal/opengl/cached_container.cpp
+++ b/common/gal/opengl/cached_container.cpp
@ -46,7 +46,7 @@

 #ifdef KICAD_GAL_PROFILE
 #include <wx/log.h>
-#include <profile.h>
+#include <core/profile.h>
 #endif /* KICAD_GAL_PROFILE */

 using namespace KIGFX;
--- a/common/gal/opengl/cached_container_gpu.cpp
+++ b/common/gal/opengl/cached_container_gpu.cpp
@ -34,7 +34,7 @@

 #include <list>

-#include <profile.h>
+#include <core/profile.h>
 #include <trace_helpers.h>

 using namespace KIGFX;
--- a/common/gal/opengl/cached_container_ram.cpp
+++ b/common/gal/opengl/cached_container_ram.cpp
@ -36,7 +36,7 @@

 #include <wx/log.h>
 #ifdef KICAD_GAL_PROFILE
-#include <profile.h>
+#include <core/profile.h>
 #endif /* KICAD_GAL_PROFILE */

 using namespace KIGFX;
--- a/common/gal/opengl/gpu_manager.cpp
+++ b/common/gal/opengl/gpu_manager.cpp
@ -32,14 +32,14 @@
 #include <gal/opengl/utils.h>
 #include <gal/opengl/vertex_item.h>

-#include <profile.h>
+#include <core/profile.h>

 #include <typeinfo>
 #include <confirm.h>
 #include <trace_helpers.h>

 #ifdef KICAD_GAL_PROFILE
-#include <profile.h>
+#include <core/profile.h>
 #include <wx/log.h>
 #endif /* KICAD_GAL_PROFILE */

--- a/common/gal/opengl/opengl_gal.cpp
+++ b/common/gal/opengl/opengl_gal.cpp
@ -50,7 +50,7 @@
 #include <geometry/geometry_utils.h>
 #include <core/thread_pool.h>

-#include <profile.h>
+#include <core/profile.h>
 #include <trace_helpers.h>

 #include <gl_utils.h>
--- a/common/view/view.cpp
+++ b/common/view/view.cpp
@ -40,7 +40,7 @@
 #include <gal/graphics_abstraction_layer.h>
 #include <gal/painter.h>

-#include <profile.h>
+#include <core/profile.h>

 #ifdef KICAD_GAL_PROFILE
 #include <wx/log.h>
--- a/common/view/wx_view_controls.cpp
+++ b/common/view/wx_view_controls.cpp
@ -27,7 +27,7 @@
 */

 #include <pgm_base.h>
-#include <profile.h>
+#include <core/profile.h>
 #include <view/view.h>
 #include <view/wx_view_controls.h>
 #include <view/zoom_controller.h>
--- a/eeschema/connection_graph.cpp
+++ b/eeschema/connection_graph.cpp
@ -24,7 +24,7 @@
 #include <future>
 #include <vector>
 #include <unordered_map>
-#include <profile.h>
+#include <core/profile.h>
 #include <common.h>
 #include <core/kicad_algo.h>
 #include <erc.h>
--- a/eeschema/files-io.cpp
+++ b/eeschema/files-io.cpp
@ -36,7 +36,7 @@
 #include <kiplatform/app.h>
 #include <lockfile.h>
 #include <pgm_base.h>
-#include <profile.h>
+#include <core/profile.h>
 #include <project/project_file.h>
 #include <project_rescue.h>
 #include <dialog_HTML_reporter_base.h>
--- a/eeschema/sch_edit_frame.cpp
+++ b/eeschema/sch_edit_frame.cpp
@ -44,7 +44,7 @@
 #include <symbol_edit_frame.h>
 #include <symbol_viewer_frame.h>
 #include <pgm_base.h>
-#include <profile.h>
+#include <core/profile.h>
 #include <project/project_file.h>
 #include <project/net_settings.h>
 #include <python_scripting.h>
--- a/eeschema/sch_screen.cpp
+++ b/eeschema/sch_screen.cpp
@ -58,7 +58,7 @@
 #include <algorithm>

 // TODO(JE) Debugging only
-#include <profile.h>
+#include <core/profile.h>
 #include "sch_bus_entry.h"
 #include "sim/sim_model_ideal.h"

--- a/eeschema/symbol_library_manager.cpp
+++ b/eeschema/symbol_library_manager.cpp
@ -30,7 +30,7 @@
 #include <env_paths.h>
 #include <pgm_base.h>
 #include <kiway.h>
-#include <profile.h>
+#include <core/profile.h>
 #include <wx_filename.h>
 #include <sch_io_mgr.h>
 #include <sch_plugins/legacy/sch_legacy_plugin.h>
--- a/libs/core/CMakeLists.txt
+++ b/libs/core/CMakeLists.txt
@ -8,6 +8,7 @@ endif()
 add_library( core STATIC
    base64.cpp
    observable.cpp
+    profile.cpp
    thread_pool.cpp
    version_compare.cpp
    wx_stl_compat.cpp
@ -20,4 +21,6 @@ target_link_libraries( core PUBLIC
 target_include_directories( core PUBLIC
    ${CMAKE_CURRENT_SOURCE_DIR}/include
    $<TARGET_PROPERTY:thread-pool,INTERFACE_INCLUDE_DIRECTORIES>
+    PRIVATE
+    ${CMAKE_BINARY_DIR} # to get config.h
 )
--- a/libs/core/include/core/profile.h
+++ b/libs/core/include/core/profile.h
--- a/common/getrunningmicrosecs.cpp
+++ b/common/getrunningmicrosecs.cpp
@ -1,4 +1,3 @@
-
 /*
 * This program source code file is part of KiCad, a free EDA CAD application.
 *
@ -25,42 +24,41 @@


 #include <config.h>
-#include <common.h>

-#if defined(_WIN32)
+#if defined( _WIN32 )

 #define WIN32_LEAN_AND_MEAN 1
 #include <windows.h>

 unsigned GetRunningMicroSecs()
 {
-    FILETIME    now;
+    FILETIME now;

    GetSystemTimeAsFileTime( &now );
-    unsigned long long t = (UINT64(now.dwHighDateTime) << 32) + now.dwLowDateTime;
+    unsigned long long t = ( UINT64( now.dwHighDateTime ) << 32 ) + now.dwLowDateTime;
    t /= 10;

    return unsigned( t );
 }

-#elif defined(HAVE_CLOCK_GETTIME)
+#elif defined( HAVE_CLOCK_GETTIME )

 #include <ctime>

 unsigned GetRunningMicroSecs()
 {
-    struct timespec	now;
+    struct timespec now;

    clock_gettime( CLOCK_MONOTONIC, &now );

-    unsigned usecs = ((unsigned)now.tv_nsec)/1000 + ((unsigned)now.tv_sec) * 1000000;
-//    unsigned msecs = (now.tv_nsec / (1000*1000)) + now.tv_sec * 1000;
+    unsigned usecs = ( (unsigned) now.tv_nsec ) / 1000 + ( (unsigned) now.tv_sec ) * 1000000;
+    //    unsigned msecs = (now.tv_nsec / (1000*1000)) + now.tv_sec * 1000;

    return usecs;
 }


-#elif defined(HAVE_GETTIMEOFDAY_FUNC)
+#elif defined( HAVE_GETTIMEOFDAY_FUNC )

 #include <sys/time.h>
 unsigned GetRunningMicroSecs()
@ -69,8 +67,7 @@ unsigned GetRunningMicroSecs()

    gettimeofday( &tv, 0 );

-    return (tv.tv_sec * 1000000) + tv.tv_usec;
+    return ( tv.tv_sec * 1000000 ) + tv.tv_usec;
 }

 #endif
-
--- a/pcb_calculator/resistor_substitution_utils.cpp
+++ b/pcb_calculator/resistor_substitution_utils.cpp
@ -33,7 +33,7 @@
 //#define BENCHMARK

 #ifdef BENCHMARK
-#include <profile.h>
+#include <core/profile.h>
 #endif


--- a/pcbnew/connectivity/connectivity_algo.cpp
+++ b/pcbnew/connectivity/connectivity_algo.cpp
@ -39,7 +39,7 @@
 #include <wx/log.h>

 #ifdef PROFILE
-#include <profile.h>
+#include <core/profile.h>
 #endif


--- a/pcbnew/connectivity/connectivity_data.cpp
+++ b/pcbnew/connectivity/connectivity_data.cpp
@ -24,7 +24,7 @@
 */

 #ifdef PROFILE
-#include <profile.h>
+#include <core/profile.h>
 #endif

 #include <algorithm>
--- a/pcbnew/exporters/step/exporter_step.cpp
+++ b/pcbnew/exporters/step/exporter_step.cpp
@ -47,7 +47,7 @@

 #include <wx/crt.h>
 #include <wx/log.h>
-#include <profile.h>        // To use GetRunningMicroSecs or another profiling utility
+#include <core/profile.h>        // To use GetRunningMicroSecs or another profiling utility

 #define OCC_VERSION_MIN 0x070500

--- a/pcbnew/pcb_edit_frame.cpp
+++ b/pcbnew/pcb_edit_frame.cpp
@ -103,7 +103,7 @@
 #include <widgets/pcb_properties_panel.h>
 #include <widgets/wx_aui_utils.h>
 #include <kiplatform/app.h>
-#include <profile.h>
+#include <core/profile.h>
 #include <view/wx_view_controls.h>
 #include <footprint_viewer_frame.h>

--- a/pcbnew/plugins/altium/altium_pcb.cpp
+++ b/pcbnew/plugins/altium/altium_pcb.cpp
@ -34,7 +34,7 @@
 #include <pcb_shape.h>
 #include <pcb_text.h>
 #include <pcb_track.h>
-#include <profile.h>
+#include <core/profile.h>
 #include <string_utils.h>
 #include <zone.h>

--- a/pcbnew/ratsnest/ratsnest_data.cpp
+++ b/pcbnew/ratsnest/ratsnest_data.cpp
@ -31,7 +31,7 @@
 */

 #ifdef PROFILE
-#include <profile.h>
+#include <core/profile.h>
 #endif

 #include <ratsnest/ratsnest_data.h>
--- a/pcbnew/tools/pcb_selection_tool.cpp
+++ b/pcbnew/tools/pcb_selection_tool.cpp
@ -67,7 +67,7 @@ using namespace std::placeholders;
 #include <wx/event.h>
 #include <wx/timer.h>
 #include <wx/log.h>
-#include <profile.h>
+#include <core/profile.h>
 #include <math/vector2wx.h>


--- a/pcbnew/tools/zone_filler_tool.cpp
+++ b/pcbnew/tools/zone_filler_tool.cpp
@ -44,7 +44,7 @@
 #include "zone_filler_tool.h"
 #include "zone_filler.h"
 #include "teardrop/teardrop.h"
-#include <profile.h>
+#include <core/profile.h>

 ZONE_FILLER_TOOL::ZONE_FILLER_TOOL() :
    PCB_TOOL_BASE( "pcbnew.ZoneFiller" ),
--- a/qa/qa_utils/pcb_test_frame.cpp
+++ b/qa/qa_utils/pcb_test_frame.cpp
@ -26,7 +26,7 @@

 #include <wx/popupwin.h>
 #include <wx/cmdline.h>
-#include <profile.h>
+#include <core/profile.h>

 #include <pgm_base.h>
 #include <settings/settings_manager.h>
--- a/qa/tools/common_tools/tools/sexpr_parser/sexpr_parse.cpp
+++ b/qa/tools/common_tools/tools/sexpr_parser/sexpr_parse.cpp
@ -32,7 +32,7 @@
 #include <qa_utils/utility_registry.h>

 #include <common.h>
-#include <profile.h>
+#include <core/profile.h>

 #include <wx/cmdline.h>

--- a/qa/tools/drc_proto/drc_proto.cpp
+++ b/qa/tools/drc_proto/drc_proto.cpp
@ -24,7 +24,7 @@
 #include <string>

 #include <common.h>
-#include <profile.h>
+#include <core/profile.h>

 #include <wx/cmdline.h>

--- a/qa/tools/drc_proto/drc_proto_test.cpp
+++ b/qa/tools/drc_proto/drc_proto_test.cpp
@ -24,7 +24,7 @@
 #include <string>

 #include <common.h>
-#include <profile.h>
+#include <core/profile.h>

 #include <wx/cmdline.h>
 #include <wx/init.h>
--- a/qa/tools/libeval_compiler/libeval_compiler_test.cpp
+++ b/qa/tools/libeval_compiler/libeval_compiler_test.cpp
@ -11,7 +11,7 @@

 #include <unordered_set>

-#include <profile.h>
+#include <core/profile.h>

 bool testEvalExpr( const std::string expr, LIBEVAL::VALUE expectedResult, bool expectError = false,
                   BOARD_ITEM* itemA = nullptr, BOARD_ITEM* itemB = nullptr )
--- a/qa/tools/pcbnew_tools/tools/pcb_parser/pcb_parser_tool.cpp
+++ b/qa/tools/pcbnew_tools/tools/pcb_parser/pcb_parser_tool.cpp
@ -26,7 +26,7 @@
 #include <cstdio>
 #include <string>
 #include <common.h>
-#include <profile.h>
+#include <core/profile.h>

 #include <wx/cmdline.h>
 #include <wx/msgout.h>
--- a/qa/tools/pcbnew_tools/tools/polygon_triangulation/polygon_triangulation.cpp
+++ b/qa/tools/pcbnew_tools/tools/polygon_triangulation/polygon_triangulation.cpp
@ -34,7 +34,7 @@
 #include <board.h>
 #include <core/ignore.h>
 #include <zone.h>
-#include <profile.h>
+#include <core/profile.h>

 #include <atomic>
 #include <thread>
--- a/qa/tools/pns/pns_log_viewer_frame.cpp
+++ b/qa/tools/pns/pns_log_viewer_frame.cpp
@ -29,7 +29,7 @@
 #include <confirm.h>
 #include <wx/clipbrd.h>
 #include <pgm_base.h>
-#include <profile.h>
+#include <core/profile.h>
 #include <reporter.h>
 #include <trace_helpers.h>
 #include <view/view_overlay.h>