Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gazebo 9 profiler - take 2 #2813

Merged
merged 18 commits into from
Aug 11, 2020
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
tweaks
Signed-off-by: Louise Poubel <louise@openrobotics.org>
chapulina committed Aug 4, 2020

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit ab093abc964259a061bb1260ba944e3fd2d07835
5 changes: 0 additions & 5 deletions gazebo/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -51,10 +51,6 @@ add_dependencies(gazebo_sensors gazebo_rendering)

gz_add_executable(gzserver server_main.cc)

if (${ENABLE_PROFILER})
set(GZ_PROFILE_LIBS ${IGNITION-COMMON_LIBRARIES})
endif()

target_link_libraries(gzserver
libgazebo
gazebo_common
@@ -68,7 +64,6 @@ target_link_libraries(gzserver
${freeimage_LIBRARIES}
${TBB_LIBRARIES}
${ogre_libraries}
${GZ_PROFILE_LIBS}
)

if (UNIX)
22 changes: 7 additions & 15 deletions gazebo/common/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -217,33 +217,27 @@ endif()

# Do not install profiler headers.
if(ENABLE_PROFILER)
set(
sources ${sources}
set (sources ${sources}
Profiler.cc
)

set(
headers ${headers}
Profiler.hh
)

set(
Remotery_SRC
set (remotery_sources
./Remotery/lib/Remotery.c
./Remotery/lib/Remotery.h
RemoteryProfilerImpl.cc
)

if(APPLE)
set(
Remotery_SRC
${Remotery_SRC}
if (APPLE)
set (remotery_sources ${remotery_sources}
./Remotery/lib/RemoteryMetal.mm
)
find_library(FOUNDATION Foundation
HINTS /System/Library/Frameworks
)
endif()

list(APPEND sources ${remotery_sources})

set(RMT_ENABLED 1)
set(RMT_USE_TINYCRT 0)
set(RMT_USE_CUDA 0)
@@ -265,8 +259,6 @@ if(ENABLE_PROFILER)

configure_file(RemoteryConfig.h.in ${CMAKE_CURRENT_BINARY_DIR}/RemoteryConfig.h)

list(APPEND sources ${Remotery_SRC} RemoteryProfilerImpl.cc)

endif()

gz_build_tests(${gtest_sources} EXTRA_LIBS gazebo_common ${tinyxml_LIBRARIES})
3 changes: 1 addition & 2 deletions gazebo/common/Event.hh
Original file line number Diff line number Diff line change
@@ -27,9 +27,8 @@
#include "gazebo/gazebo_config.h"
#include "gazebo/common/Time.hh"
#include "gazebo/common/CommonTypes.hh"
#include "gazebo/util/system.hh"

#include "gazebo/common/Profiler.hh"
#include "gazebo/util/system.hh"

namespace gazebo
{
3 changes: 1 addition & 2 deletions gazebo/common/Profiler.cc
Original file line number Diff line number Diff line change
@@ -15,8 +15,7 @@
*
*/

#include "gazebo/common/Profiler.hh"

#include "Profiler.hh"
#include "ProfilerImpl.hh"
#include "RemoteryProfilerImpl.hh"

6 changes: 3 additions & 3 deletions gazebo/common/Profiler.hh
Original file line number Diff line number Diff line change
@@ -26,9 +26,9 @@
#include <memory>
#include <string>

#include <gazebo/common/SingletonT.hh>
#include <gazebo/common/Remotery/lib/Remotery.h>
#include <gazebo/util/system.hh>
#include "gazebo/common/SingletonT.hh"
#include "gazebo/common/Remotery/lib/Remotery.h"
#include "gazebo/util/system.hh"

/// \brief Explicit instantiation for typed SingletonT.
GZ_SINGLETON_DECLARE(GZ_COMMON_VISIBLE, gazebo, common, Profiler)
5 changes: 0 additions & 5 deletions gazebo/physics/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -158,18 +158,13 @@ target_compile_definitions(gazebo_physics
PRIVATE BUILDING_DLL_GZ_PHYSICS
)

if (${ENABLE_PROFILER})
set(GZ_PROFILE_LIBS ${IGNITION-COMMON_LIBRARIES})
endif()

target_link_libraries(gazebo_physics
gazebo_common
gazebo_util
gazebo_ode
gazebo_opcode
${Boost_LIBRARIES}
${IGNITION-TRANSPORT_LIBRARIES}
${GZ_PROFILE_LIBS}
)

# Link in Bullet support if present
81 changes: 0 additions & 81 deletions gazebo/profiler/CMakeLists.txt

This file was deleted.

5 changes: 0 additions & 5 deletions gazebo/rendering/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -219,10 +219,6 @@ target_compile_definitions(gazebo_rendering
PRIVATE BUILDING_DLL_GZ_RENDERING
)

if (${ENABLE_PROFILER})
set(GZ_PROFILE_LIBS ${IGNITION-COMMON_LIBRARIES})
endif()

target_link_libraries(gazebo_rendering
gazebo_common
gazebo_msgs
@@ -232,7 +228,6 @@ target_link_libraries(gazebo_rendering
${tinyxml_LIBRARIES}
${IGNITION-TRANSPORT_LIBRARIES}
${IGNITION-MSGS_LIBRARIES}
${GZ_PROFILE_LIBS}
)

if (HAVE_OCULUS)
2 changes: 1 addition & 1 deletion gazebo/sensors/AltimeterSensor.cc
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@
*/
#include <boost/algorithm/string.hpp>

#include <gazebo/common/Profiler.hh>
#include "gazebo/common/Profiler.hh"

#include "gazebo/common/common.hh"
#include "gazebo/physics/physics.hh"
2 changes: 1 addition & 1 deletion gazebo/sensors/ContactSensor.cc
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@
#include <boost/algorithm/string.hpp>
#include <sstream>

#include <gazebo/common/Profiler.hh>
#include "gazebo/common/Profiler.hh"

#include "gazebo/common/Exception.hh"

2 changes: 1 addition & 1 deletion gazebo/sensors/ForceTorqueSensor.cc
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@
*/
#include <boost/algorithm/string.hpp>

#include <gazebo/common/Profiler.hh>
#include "gazebo/common/Profiler.hh"

#include "gazebo/physics/World.hh"
#include "gazebo/physics/PhysicsEngine.hh"
2 changes: 1 addition & 1 deletion gazebo/sensors/GpsSensor.cc
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@
*/
#include <boost/algorithm/string.hpp>

#include <gazebo/common/Profiler.hh>
#include "gazebo/common/Profiler.hh"

#include "gazebo/sensors/SensorFactory.hh"

2 changes: 1 addition & 1 deletion gazebo/sensors/GpuRaySensor.cc
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
*
*/
#include <boost/algorithm/string.hpp>
#include <gazebo/common/Profiler.hh>
#include "gazebo/common/Profiler.hh"
#include <functional>
#include <ignition/math.hh>
#include <ignition/math/Helpers.hh>
2 changes: 1 addition & 1 deletion gazebo/sensors/ImuSensor.cc
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
*
*/
#include <boost/algorithm/string.hpp>
#include <gazebo/common/Profiler.hh>
#include "gazebo/common/Profiler.hh"
#include <ignition/math/Rand.hh>

#include "gazebo/transport/Node.hh"
2 changes: 1 addition & 1 deletion gazebo/sensors/LogicalCameraSensor.cc
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
*
*/
#include <boost/algorithm/string.hpp>
#include <gazebo/common/Profiler.hh>
#include "gazebo/common/Profiler.hh"
#include "gazebo/transport/transport.hh"
#include "gazebo/msgs/msgs.hh"
#include "gazebo/physics/World.hh"
2 changes: 1 addition & 1 deletion gazebo/sensors/MagnetometerSensor.cc
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
*
*/
#include <boost/algorithm/string.hpp>
#include <gazebo/common/Profiler.hh>
#include "gazebo/common/Profiler.hh"
#include <ignition/math/Pose3.hh>

#include "gazebo/transport/Node.hh"
2 changes: 1 addition & 1 deletion gazebo/sensors/MultiCameraSensor.cc
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@
*/
#include <boost/algorithm/string.hpp>
#include <functional>
#include <gazebo/common/Profiler.hh>
#include "gazebo/common/Profiler.hh"
#include <ignition/math/Pose3.hh>

#include "gazebo/common/Exception.hh"
2 changes: 1 addition & 1 deletion gazebo/sensors/RFIDSensor.cc
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
#include <gazebo/common/Profiler.hh>
#include "gazebo/common/Profiler.hh"

#include "gazebo/msgs/msgs.hh"
#include "gazebo/transport/transport.hh"
2 changes: 1 addition & 1 deletion gazebo/sensors/RaySensor.cc
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@
*/
#include <boost/algorithm/string.hpp>

#include <gazebo/common/Profiler.hh>
#include "gazebo/common/Profiler.hh"

#include "gazebo/physics/World.hh"
#include "gazebo/physics/MultiRayShape.hh"
2 changes: 1 addition & 1 deletion gazebo/sensors/SonarSensor.cc
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@
*/
#include <boost/algorithm/string.hpp>

#include <gazebo/common/Profiler.hh>
#include "gazebo/common/Profiler.hh"
#include <ignition/math/Vector3.hh>

#include "gazebo/physics/World.hh"
2 changes: 1 addition & 1 deletion gazebo/sensors/WideAngleCameraSensor.cc
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@

#include <boost/algorithm/string.hpp>

#include <gazebo/common/Profiler.hh>
#include "gazebo/common/Profiler.hh"

#include "gazebo/common/Events.hh"
#include "gazebo/common/Exception.hh"
2 changes: 1 addition & 1 deletion gazebo/sensors/WirelessReceiver.cc
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
#include <gazebo/common/Profiler.hh>
#include "gazebo/common/Profiler.hh"
#include <ignition/math/Pose3.hh>

#include "gazebo/msgs/msgs.hh"
2 changes: 1 addition & 1 deletion plugins/ActorPlugin.cc
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@
#include <functional>

#include <ignition/math.hh>
#include <gazebo/common/Profiler.hh>
#include "gazebo/common/Profiler.hh"
#include "gazebo/physics/physics.hh"
#include "plugins/ActorPlugin.hh"

2 changes: 1 addition & 1 deletion plugins/ActuatorPlugin.cc
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@

#include <functional>

#include <gazebo/common/Profiler.hh>
#include "gazebo/common/Profiler.hh"

#include "ActuatorPlugin.hh"

2 changes: 1 addition & 1 deletion plugins/ArduCopterPlugin.cc
Original file line number Diff line number Diff line change
@@ -40,7 +40,7 @@ typedef SSIZE_T ssize_t;
#include <string>
#include <vector>
#include <sdf/sdf.hh>
#include <gazebo/common/Profiler.hh>
#include "gazebo/common/Profiler.hh"
#include <ignition/math/Filter.hh>
#include <gazebo/common/Assert.hh>
#include <gazebo/common/Plugin.hh>
2 changes: 1 addition & 1 deletion plugins/CartDemoPlugin.cc
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@

#include <functional>

#include <gazebo/common/Profiler.hh>
#include "gazebo/common/Profiler.hh"

#include "gazebo/physics/physics.hh"
#include "gazebo/transport/transport.hh"
2 changes: 1 addition & 1 deletion plugins/CessnaPlugin.cc
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@
#include <functional>
#include <string>
#include <sdf/sdf.hh>
#include <gazebo/common/Profiler.hh>
#include "gazebo/common/Profiler.hh"
#include <gazebo/common/Assert.hh>
#include <gazebo/common/Plugin.hh>
#include <gazebo/msgs/msgs.hh>
Loading