1717#include " compositor_report.h"
1818#include < mir/logging/logger.h>
1919
20+ #include < format>
21+
2022using namespace mir ::time;
2123namespace ml = mir::logging;
2224namespace mrl = mir::report::logging;
@@ -43,9 +45,8 @@ mrl::CompositorReport::TimePoint mrl::CompositorReport::now() const
4345
4446void mrl::CompositorReport::added_display (int width, int height, int x, int y, SubCompositorId id)
4547{
46- char msg[128 ];
47- snprintf (msg, sizeof msg, " Added display %p: %dx%d %+d%+d" ,
48- id, width, height, x, y);
48+ auto const msg = std::format (" Added display {}: {}x{} {:+d}{:+d}" ,
49+ static_cast <const void *>(id), width, height, x, y);
4950 logger->log (ml::Severity::informational, msg, component);
5051}
5152
@@ -101,13 +102,13 @@ void mrl::CompositorReport::Instance::log(ml::Logger& logger, SubCompositorId id
101102 long avg_latency_usec = dn ? dl / dn : 0 ;
102103 long dt_msec = dt / 1000L ;
103104
104- char msg[ 128 ];
105- snprintf (msg, sizeof msg, " Display %p averaged %ld.%03ld FPS, "
106- " %ld.%03ld ms/frame, "
107- " latency %ld.%03ld ms, "
108- " %ld frames over %ld.%03ld sec, "
109- " %ld% % bypassed" ,
110- id ,
105+ auto const msg = std::format (
106+ " Display {} averaged {}.{:03d} FPS, "
107+ " {}.{:03d} ms/frame, "
108+ " latency {}.{:03d} ms, "
109+ " {} frames over {}.{:03d} sec, "
110+ " {} % bypassed" ,
111+ static_cast < const void *>(id) ,
111112 frames_per_1000sec / 1000 ,
112113 frames_per_1000sec % 1000 ,
113114 avg_render_time_usec / 1000 ,
@@ -156,9 +157,8 @@ void mrl::CompositorReport::finished_frame(SubCompositorId id)
156157
157158 if (inst.bypassed != inst.prev_bypassed || inst.nframes == 1 )
158159 {
159- char msg[128 ];
160- snprintf (msg, sizeof msg, " Display %p bypass %s" ,
161- id, inst.bypassed ? " ON" : " OFF" );
160+ auto const msg = std::format (" Display {} bypass {}" ,
161+ static_cast <const void *>(id), inst.bypassed ? " ON" : " OFF" );
162162 logger->log (ml::Severity::informational, msg, component);
163163 }
164164 inst.prev_bypassed = inst.bypassed ;
0 commit comments