haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Profile can live in core

This commit is contained in:
Marek Roszko 2023-09-07 07:22:10 -04:00
parent 3e6f7ab3e5
commit 7505fd0f37
40 changed files with 49 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3d-viewer/3d_canvas/create_layer_items.cpp
View File

@ -51,7 +51,7 @@
#include <wx/log.h> #include <wx/log.h>
#ifdef PRINT_STATISTICS_3D_VIEWER #ifdef PRINT_STATISTICS_3D_VIEWER
#include <profile.h> #include <core/profile.h>
#endif #endif

2
3d-viewer/3d_canvas/eda_3d_canvas.cpp
View File

@ -36,7 +36,7 @@
#include <board.h> #include <board.h>
#include <reporter.h> #include <reporter.h>
#include <gl_context_mgr.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 <bitmaps.h>
#include <macros.h> #include <macros.h>
#include <menus_helpers.h> #include <menus_helpers.h>

2
3d-viewer/3d_rendering/opengl/create_scene.cpp
View File

@ -30,7 +30,7 @@
#include "convert_basic_shapes_to_polygon.h" #include "convert_basic_shapes_to_polygon.h"
#include <trigo.h> #include <trigo.h>
#include <project.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 <fp_lib_table.h>
#include <eda_3d_viewer_frame.h> #include <eda_3d_viewer_frame.h>

2
3d-viewer/3d_rendering/raytracing/create_scene.cpp
View File

@ -44,7 +44,7 @@
#include <eda_3d_viewer_frame.h> #include <eda_3d_viewer_frame.h>
#include <base_units.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 * Perform an interpolation step to easy control the transparency based on the

2
3d-viewer/3d_rendering/raytracing/render_3d_raytrace.cpp
View File

@ -35,7 +35,7 @@
#include "3d_fastmath.h" #include "3d_fastmath.h"
#include "3d_math.h" #include "3d_math.h"
#include "../common_ogl/ogl_utils.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> #include <wx/log.h>

1
common/CMakeLists.txt
View File

@ -353,7 +353,6 @@ set( COMMON_SRCS
footprint_info.cpp footprint_info.cpp
gbr_metadata.cpp gbr_metadata.cpp
gestfich.cpp gestfich.cpp
getrunningmicrosecs.cpp
gr_basic.cpp gr_basic.cpp
grid_tricks.cpp grid_tricks.cpp
hotkey_store.cpp hotkey_store.cpp

2
common/database/database_connection.cpp
View File

@ -44,7 +44,7 @@
#include <database/database_connection.h> #include <database/database_connection.h>
#include <database/database_cache.h> #include <database/database_cache.h>
#include <profile.h> #include <core/profile.h>
const char* const traceDatabase = "KICAD_DATABASE"; const char* const traceDatabase = "KICAD_DATABASE";

2
common/draw_panel_gal.cpp
View File

@ -51,7 +51,7 @@
#include <kiplatform/ui.h> #include <kiplatform/ui.h>
#include <profile.h> #include <core/profile.h>
#include <pgm_base.h> #include <pgm_base.h>

2
common/gal/opengl/cached_container.cpp
View File

@ -46,7 +46,7 @@
#ifdef KICAD_GAL_PROFILE #ifdef KICAD_GAL_PROFILE
#include <wx/log.h> #include <wx/log.h>
#include <profile.h> #include <core/profile.h>
#endif /* KICAD_GAL_PROFILE */ #endif /* KICAD_GAL_PROFILE */
using namespace KIGFX; using namespace KIGFX;

2
common/gal/opengl/cached_container_gpu.cpp
View File

@ -34,7 +34,7 @@
#include <list> #include <list>
#include <profile.h> #include <core/profile.h>
#include <trace_helpers.h> #include <trace_helpers.h>
using namespace KIGFX; using namespace KIGFX;

2
common/gal/opengl/cached_container_ram.cpp
View File

@ -36,7 +36,7 @@
#include <wx/log.h> #include <wx/log.h>
#ifdef KICAD_GAL_PROFILE #ifdef KICAD_GAL_PROFILE
#include <profile.h> #include <core/profile.h>
#endif /* KICAD_GAL_PROFILE */ #endif /* KICAD_GAL_PROFILE */
using namespace KIGFX; using namespace KIGFX;

4
common/gal/opengl/gpu_manager.cpp
View File

@ -32,14 +32,14 @@
#include <gal/opengl/utils.h> #include <gal/opengl/utils.h>
#include <gal/opengl/vertex_item.h> #include <gal/opengl/vertex_item.h>
#include <profile.h> #include <core/profile.h>
#include <typeinfo> #include <typeinfo>
#include <confirm.h> #include <confirm.h>
#include <trace_helpers.h> #include <trace_helpers.h>
#ifdef KICAD_GAL_PROFILE #ifdef KICAD_GAL_PROFILE
#include <profile.h> #include <core/profile.h>
#include <wx/log.h> #include <wx/log.h>
#endif /* KICAD_GAL_PROFILE */ #endif /* KICAD_GAL_PROFILE */

2
common/gal/opengl/opengl_gal.cpp
View File

@ -50,7 +50,7 @@
#include <geometry/geometry_utils.h> #include <geometry/geometry_utils.h>
#include <core/thread_pool.h> #include <core/thread_pool.h>
#include <profile.h> #include <core/profile.h>
#include <trace_helpers.h> #include <trace_helpers.h>
#include <gl_utils.h> #include <gl_utils.h>

2
common/view/view.cpp
View File

@ -40,7 +40,7 @@
#include <gal/graphics_abstraction_layer.h> #include <gal/graphics_abstraction_layer.h>
#include <gal/painter.h> #include <gal/painter.h>
#include <profile.h> #include <core/profile.h>
#ifdef KICAD_GAL_PROFILE #ifdef KICAD_GAL_PROFILE
#include <wx/log.h> #include <wx/log.h>

2
common/view/wx_view_controls.cpp
View File

@ -27,7 +27,7 @@
*/ */
#include <pgm_base.h> #include <pgm_base.h>
#include <profile.h> #include <core/profile.h>
#include <view/view.h> #include <view/view.h>
#include <view/wx_view_controls.h> #include <view/wx_view_controls.h>
#include <view/zoom_controller.h> #include <view/zoom_controller.h>

2
eeschema/connection_graph.cpp
View File

@ -24,7 +24,7 @@
#include <future> #include <future>
#include <vector> #include <vector>
#include <unordered_map> #include <unordered_map>
#include <profile.h> #include <core/profile.h>
#include <common.h> #include <common.h>
#include <core/kicad_algo.h> #include <core/kicad_algo.h>
#include <erc.h> #include <erc.h>

2
eeschema/files-io.cpp
View File

@ -36,7 +36,7 @@
#include <kiplatform/app.h> #include <kiplatform/app.h>
#include <lockfile.h> #include <lockfile.h>
#include <pgm_base.h> #include <pgm_base.h>
#include <profile.h> #include <core/profile.h>
#include <project/project_file.h> #include <project/project_file.h>
#include <project_rescue.h> #include <project_rescue.h>
#include <dialog_HTML_reporter_base.h> #include <dialog_HTML_reporter_base.h>

2
eeschema/sch_edit_frame.cpp
View File

@ -44,7 +44,7 @@
#include <symbol_edit_frame.h> #include <symbol_edit_frame.h>
#include <symbol_viewer_frame.h> #include <symbol_viewer_frame.h>
#include <pgm_base.h> #include <pgm_base.h>
#include <profile.h> #include <core/profile.h>
#include <project/project_file.h> #include <project/project_file.h>
#include <project/net_settings.h> #include <project/net_settings.h>
#include <python_scripting.h> #include <python_scripting.h>

2
eeschema/sch_screen.cpp
View File

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

2
eeschema/symbol_library_manager.cpp
View File

@ -30,7 +30,7 @@
#include <env_paths.h> #include <env_paths.h>
#include <pgm_base.h> #include <pgm_base.h>
#include <kiway.h> #include <kiway.h>
#include <profile.h> #include <core/profile.h>
#include <wx_filename.h> #include <wx_filename.h>
#include <sch_io_mgr.h> #include <sch_io_mgr.h>
#include <sch_plugins/legacy/sch_legacy_plugin.h> #include <sch_plugins/legacy/sch_legacy_plugin.h>

3
libs/core/CMakeLists.txt
View File

@ -8,6 +8,7 @@ endif()
add_library( core STATIC add_library( core STATIC
base64.cpp base64.cpp
observable.cpp observable.cpp
profile.cpp
thread_pool.cpp thread_pool.cpp
version_compare.cpp version_compare.cpp
wx_stl_compat.cpp wx_stl_compat.cpp
@ -20,4 +21,6 @@ target_link_libraries( core PUBLIC
target_include_directories( core PUBLIC target_include_directories( core PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/include
$<TARGET_PROPERTY:thread-pool,INTERFACE_INCLUDE_DIRECTORIES> $<TARGET_PROPERTY:thread-pool,INTERFACE_INCLUDE_DIRECTORIES>
PRIVATE
${CMAKE_BINARY_DIR} # to get config.h
) )

0
include/profile.h → libs/core/include/core/profile.h
View File

21
common/getrunningmicrosecs.cpp → libs/core/profile.cpp
View File

@ -1,4 +1,3 @@
/* /*
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
@ -25,42 +24,41 @@
#include <config.h> #include <config.h>
#include <common.h>
#if defined(_WIN32) #if defined( _WIN32 )
#define WIN32_LEAN_AND_MEAN 1 #define WIN32_LEAN_AND_MEAN 1
#include <windows.h> #include <windows.h>
unsigned GetRunningMicroSecs() unsigned GetRunningMicroSecs()
{ {
FILETIME now; FILETIME now;
GetSystemTimeAsFileTime( &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; t /= 10;
return unsigned( t ); return unsigned( t );
} }
#elif defined(HAVE_CLOCK_GETTIME) #elif defined( HAVE_CLOCK_GETTIME )
#include <ctime> #include <ctime>
unsigned GetRunningMicroSecs() unsigned GetRunningMicroSecs()
{ {
struct timespec now; struct timespec now;
clock_gettime( CLOCK_MONOTONIC, &now ); clock_gettime( CLOCK_MONOTONIC, &now );
unsigned usecs = ((unsigned)now.tv_nsec)/1000 + ((unsigned)now.tv_sec) * 1000000; unsigned usecs = ( (unsigned) now.tv_nsec ) / 1000 + ( (unsigned) now.tv_sec ) * 1000000;
// unsigned msecs = (now.tv_nsec / (1000*1000)) + now.tv_sec * 1000; // unsigned msecs = (now.tv_nsec / (1000*1000)) + now.tv_sec * 1000;
return usecs; return usecs;
} }
#elif defined(HAVE_GETTIMEOFDAY_FUNC) #elif defined( HAVE_GETTIMEOFDAY_FUNC )
#include <sys/time.h> #include <sys/time.h>
unsigned GetRunningMicroSecs() unsigned GetRunningMicroSecs()
@ -69,8 +67,7 @@ unsigned GetRunningMicroSecs()
gettimeofday( &tv, 0 ); gettimeofday( &tv, 0 );
return (tv.tv_sec * 1000000) + tv.tv_usec; return ( tv.tv_sec * 1000000 ) + tv.tv_usec;
} }
#endif #endif

2
pcb_calculator/resistor_substitution_utils.cpp
View File

@ -33,7 +33,7 @@
//#define BENCHMARK //#define BENCHMARK
#ifdef BENCHMARK #ifdef BENCHMARK
#include <profile.h> #include <core/profile.h>
#endif #endif

2
pcbnew/connectivity/connectivity_algo.cpp
View File

@ -39,7 +39,7 @@
#include <wx/log.h> #include <wx/log.h>
#ifdef PROFILE #ifdef PROFILE
#include <profile.h> #include <core/profile.h>
#endif #endif

2
pcbnew/connectivity/connectivity_data.cpp
View File

@ -24,7 +24,7 @@
*/ */
#ifdef PROFILE #ifdef PROFILE
#include <profile.h> #include <core/profile.h>
#endif #endif
#include <algorithm> #include <algorithm>

2
pcbnew/exporters/step/exporter_step.cpp
View File

@ -47,7 +47,7 @@
#include <wx/crt.h> #include <wx/crt.h>
#include <wx/log.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 #define OCC_VERSION_MIN 0x070500

2
pcbnew/pcb_edit_frame.cpp
View File

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

2
pcbnew/plugins/altium/altium_pcb.cpp
View File

@ -34,7 +34,7 @@
#include <pcb_shape.h> #include <pcb_shape.h>
#include <pcb_text.h> #include <pcb_text.h>
#include <pcb_track.h> #include <pcb_track.h>
#include <profile.h> #include <core/profile.h>
#include <string_utils.h> #include <string_utils.h>
#include <zone.h> #include <zone.h>

2
pcbnew/ratsnest/ratsnest_data.cpp
View File

@ -31,7 +31,7 @@
*/ */
#ifdef PROFILE #ifdef PROFILE
#include <profile.h> #include <core/profile.h>
#endif #endif
#include <ratsnest/ratsnest_data.h> #include <ratsnest/ratsnest_data.h>

2
pcbnew/tools/pcb_selection_tool.cpp
View File

@ -67,7 +67,7 @@ using namespace std::placeholders;
#include <wx/event.h> #include <wx/event.h>
#include <wx/timer.h> #include <wx/timer.h>
#include <wx/log.h> #include <wx/log.h>
#include <profile.h> #include <core/profile.h>
#include <math/vector2wx.h> #include <math/vector2wx.h>

2
pcbnew/tools/zone_filler_tool.cpp
View File

@ -44,7 +44,7 @@
#include "zone_filler_tool.h" #include "zone_filler_tool.h"
#include "zone_filler.h" #include "zone_filler.h"
#include "teardrop/teardrop.h" #include "teardrop/teardrop.h"
#include <profile.h> #include <core/profile.h>
ZONE_FILLER_TOOL::ZONE_FILLER_TOOL() : ZONE_FILLER_TOOL::ZONE_FILLER_TOOL() :
PCB_TOOL_BASE( "pcbnew.ZoneFiller" ), PCB_TOOL_BASE( "pcbnew.ZoneFiller" ),

2
qa/qa_utils/pcb_test_frame.cpp
View File

@ -26,7 +26,7 @@
#include <wx/popupwin.h> #include <wx/popupwin.h>
#include <wx/cmdline.h> #include <wx/cmdline.h>
#include <profile.h> #include <core/profile.h>
#include <pgm_base.h> #include <pgm_base.h>
#include <settings/settings_manager.h> #include <settings/settings_manager.h>

2
qa/tools/common_tools/tools/sexpr_parser/sexpr_parse.cpp
View File

@ -32,7 +32,7 @@
#include <qa_utils/utility_registry.h> #include <qa_utils/utility_registry.h>
#include <common.h> #include <common.h>
#include <profile.h> #include <core/profile.h>
#include <wx/cmdline.h> #include <wx/cmdline.h>

2
qa/tools/drc_proto/drc_proto.cpp
View File

@ -24,7 +24,7 @@
#include <string> #include <string>
#include <common.h> #include <common.h>
#include <profile.h> #include <core/profile.h>
#include <wx/cmdline.h> #include <wx/cmdline.h>

2
qa/tools/drc_proto/drc_proto_test.cpp
View File

@ -24,7 +24,7 @@
#include <string> #include <string>
#include <common.h> #include <common.h>
#include <profile.h> #include <core/profile.h>
#include <wx/cmdline.h> #include <wx/cmdline.h>
#include <wx/init.h> #include <wx/init.h>

2
qa/tools/libeval_compiler/libeval_compiler_test.cpp
View File

@ -11,7 +11,7 @@
#include <unordered_set> #include <unordered_set>
#include <profile.h> #include <core/profile.h>
bool testEvalExpr( const std::string expr, LIBEVAL::VALUE expectedResult, bool expectError = false, bool testEvalExpr( const std::string expr, LIBEVAL::VALUE expectedResult, bool expectError = false,
BOARD_ITEM* itemA = nullptr, BOARD_ITEM* itemB = nullptr ) BOARD_ITEM* itemA = nullptr, BOARD_ITEM* itemB = nullptr )

2
qa/tools/pcbnew_tools/tools/pcb_parser/pcb_parser_tool.cpp
View File

@ -26,7 +26,7 @@
#include <cstdio> #include <cstdio>
#include <string> #include <string>
#include <common.h> #include <common.h>
#include <profile.h> #include <core/profile.h>
#include <wx/cmdline.h> #include <wx/cmdline.h>
#include <wx/msgout.h> #include <wx/msgout.h>

2
qa/tools/pcbnew_tools/tools/polygon_triangulation/polygon_triangulation.cpp
View File

@ -34,7 +34,7 @@
#include <board.h> #include <board.h>
#include <core/ignore.h> #include <core/ignore.h>
#include <zone.h> #include <zone.h>
#include <profile.h> #include <core/profile.h>
#include <atomic> #include <atomic>
#include <thread> #include <thread>

2
qa/tools/pns/pns_log_viewer_frame.cpp
View File

@ -29,7 +29,7 @@
#include <confirm.h> #include <confirm.h>
#include <wx/clipbrd.h> #include <wx/clipbrd.h>
#include <pgm_base.h> #include <pgm_base.h>
#include <profile.h> #include <core/profile.h>
#include <reporter.h> #include <reporter.h>
#include <trace_helpers.h> #include <trace_helpers.h>
#include <view/view_overlay.h> #include <view/view_overlay.h>