Skip to content

Commit fec3ce3

Browse files
committed
fix: reversion and correct upstream synchronisation from previous change
2 parents a417789 + 591aff1 commit fec3ce3

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/vmaware.hpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4614,7 +4614,7 @@ struct VM {
46144614
if (!have_rdtscp) {
46154615
debug("TIMER: (1/7) RDTSCP instruction not supported"); // __rdtscp should be supported nowadays
46164616
return true;
4617-
}
4617+
}
46184618

46194619
constexpr u64 ITER_XOR = 100000000ULL;
46204620
constexpr size_t CPUID_ITER = 100; // per leaf
@@ -5017,7 +5017,7 @@ struct VM {
50175017
else if (cpuid_latency <= 25) {
50185018
// cpuid is fully serializing, no CPU have this low average cycles in real-world scenarios
50195019
// however, in patches, zero or even negative deltas can be seen oftenly
5020-
debug("TIMER: (3/7) CPUID latency is too low in practice");
5020+
debug("TIMER: (3/7) CPUID latency is far too low in practice");
50215021
return true;
50225022
}
50235023

@@ -5031,12 +5031,12 @@ struct VM {
50315031

50325032
// if thread 1 was faster than thread 2, hypervisor downscaled TSC per-vCPU in either cpuid or rdtsc
50335033
if (ratio < 0.95 || ratio > 1.05) {
5034-
debug("TIMER: (5/7) thread 1 was faster than thread 2, hypervisor TSC is downscaled");
5034+
debug("TIMER: (5/7) thread 1 was faster than thread 2, hypervisor is downscaling TSC");
50355035
return true;
50365036
}
50375037
// if calibration was much faster than thread 1, hypervisor downscaled TSC globally while thread 2 was spamming
50385038
if (calibration_ratio < 0.95) {
5039-
debug("TIMER: (6/7) hypervisor TSC is globally downscaled");
5039+
debug("TIMER: (6/7) hypervisor is globally downscaling TSC");
50405040
return true;
50415041
}
50425042

@@ -5091,7 +5091,7 @@ struct VM {
50915091
_freea(raw);
50925092

50935093
if (speed < 800) {
5094-
debug("TIMER: (7/7) VMAware detected an hypervisor offsetting TSC: ", speed);
5094+
debug("TIMER: (7/7) VMAware detected a hypervisor offsetting TSC: ", speed);
50955095
return true;
50965096
}
50975097
#endif
@@ -13011,4 +13011,4 @@ std::array<VM::core::technique, VM::enum_size + 1> VM::core::technique_table = [
1301113011
return table;
1301213012
}();
1301313013

13014-
#endif // include guard end
13014+
#endif // include guard end

0 commit comments

Comments
 (0)