Skip to content

Commit

Permalink
Do not assume that std::int64_t is long int
Browse files Browse the repository at this point in the history
Use PRId64 macro to printf-format an int64_t value.

This fixes

storage/perfschema/unittest/pfs-t.cc:2667:8: error: format specifies type 'long' but the argument has type 'int64_t' (aka 'long long') [-Werror,-Wformat]
 2666 |     ok(cpu_stat.m_delay_start == delay_start, "delay start %ld",
      |                                                            ~~~
      |                                                            %lld
 2667 |        cpu_stat.m_delay_start);
      |        ^~~~~~~~~~~~~~~~~~~~~~
storage/perfschema/unittest/pfs-t.cc:2669:8: error: format specifies type 'long' but the argument has type 'int64_t' (aka 'long long') [-Werror,-Wformat]
 2668 |     ok(cpu_stat.m_delay_total_ns == delay_total, "delay total %ld",
      |                                                               ~~~
      |                                                               %lld
 2669 |        cpu_stat.m_delay_total_ns);
      |        ^~~~~~~~~~~~~~~~~~~~~~~~~
storage/perfschema/unittest/pfs-t.cc:2671:8: error: format specifies type 'long' but the argument has type 'int64_t' (aka 'long long') [-Werror,-Wformat]
 2670 |     ok(cpu_stat.m_cpu_start == quantum_start, "cpu start %ld",
      |                                                          ~~~
      |                                                          %lld
 2671 |        cpu_stat.m_cpu_start);
      |        ^~~~~~~~~~~~~~~~~~~~
storage/perfschema/unittest/pfs-t.cc:2673:8: error: format specifies type 'long' but the argument has type 'int64_t' (aka 'long long') [-Werror,-Wformat]
 2672 |     ok(cpu_stat.m_cpu_total_ns == cpu_total, "cpu total %ld",
      |                                                         ~~~
      |                                                         %lld
 2673 |        cpu_stat.m_cpu_total_ns);
      |        ^~~~~~~~~~~~~~~~~~~~~~~

Squash with b4f911b
  • Loading branch information
laurynas-biveinis committed Sep 17, 2024
1 parent 9607fd3 commit 5947757
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions storage/perfschema/unittest/pfs-t.cc
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@

#include "storage/perfschema/unittest/pfs_unit_test_conf.h"

#include <cstdint>

#include <memory.h>
#include <mysql/psi/psi_file.h>
#include <string.h>
Expand Down Expand Up @@ -2663,13 +2665,13 @@ struct Cpu_stats_test {

Cpu_stats_test(PFS_cpu_sched_stat &stat) : cpu_stat(stat) {}
void validate_cpu_stats() {
ok(cpu_stat.m_delay_start == delay_start, "delay start %ld",
ok(cpu_stat.m_delay_start == delay_start, "delay start %" PRId64,
cpu_stat.m_delay_start);
ok(cpu_stat.m_delay_total_ns == delay_total, "delay total %ld",
ok(cpu_stat.m_delay_total_ns == delay_total, "delay total %" PRId64,
cpu_stat.m_delay_total_ns);
ok(cpu_stat.m_cpu_start == quantum_start, "cpu start %ld",
ok(cpu_stat.m_cpu_start == quantum_start, "cpu start %" PRId64,
cpu_stat.m_cpu_start);
ok(cpu_stat.m_cpu_total_ns == cpu_total, "cpu total %ld",
ok(cpu_stat.m_cpu_total_ns == cpu_total, "cpu total %" PRId64,
cpu_stat.m_cpu_total_ns);
}
};
Expand Down

0 comments on commit 5947757

Please sign in to comment.