projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rdkafka is called librdkafka
[collectd.git]
/
src
/
turbostat.c
diff --git
a/src/turbostat.c
b/src/turbostat.c
index
14ce29f
..
bd5d86c
100644
(file)
--- a/
src/turbostat.c
+++ b/
src/turbostat.c
@@
-457,7
+457,7
@@
delta_core(struct core_data *delta, const struct core_data *new, const struct co
*/
static inline int __attribute__((warn_unused_result))
delta_thread(struct thread_data *delta, const struct thread_data *new, const struct thread_data *old,
*/
static inline int __attribute__((warn_unused_result))
delta_thread(struct thread_data *delta, const struct thread_data *new, const struct thread_data *old,
- const struct core_data *c
ore_
delta)
+ const struct core_data *cdelta)
{
delta->tsc = new->tsc - old->tsc;
{
delta->tsc = new->tsc - old->tsc;
@@
-491,12
+491,12
@@
delta_thread(struct thread_data *delta, const struct thread_data *new, const str
* it is possible for mperf's non-halted cycles + idle states
* to exceed TSC's all cycles: show c1 = 0% in that case.
*/
* it is possible for mperf's non-halted cycles + idle states
* to exceed TSC's all cycles: show c1 = 0% in that case.
*/
- if ((delta->mperf + c
ore_delta->c3 + core_delta->c6 + core_
delta->c7) > delta->tsc)
+ if ((delta->mperf + c
delta->c3 + cdelta->c6 + c
delta->c7) > delta->tsc)
delta->c1 = 0;
else {
/* normal case, derive c1 */
delta->c1 = 0;
else {
/* normal case, derive c1 */
- delta->c1 = delta->tsc - delta->mperf - c
ore_
delta->c3
- - c
ore_delta->c6 - core_
delta->c7;
+ delta->c1 = delta->tsc - delta->mperf - cdelta->c3
+ - c
delta->c6 - c
delta->c7;
}
if (delta->mperf == 0) {
}
if (delta->mperf == 0) {
@@
-805,7
+805,7
@@
guess:
* Identify the functionality of the CPU
*/
static int __attribute__((warn_unused_result))
* Identify the functionality of the CPU
*/
static int __attribute__((warn_unused_result))
-probe_cpu()
+probe_cpu(
void
)
{
unsigned int eax, ebx, ecx, edx, max_level;
unsigned int fms, family, model;
{
unsigned int eax, ebx, ecx, edx, max_level;
unsigned int fms, family, model;
@@
-1147,7
+1147,7
@@
allocate_cpu_set(cpu_set_t ** set, size_t * size) {
* Build a local representation of the cpu distribution
*/
static int __attribute__((warn_unused_result))
* Build a local representation of the cpu distribution
*/
static int __attribute__((warn_unused_result))
-topology_probe()
+topology_probe(
void
)
{
unsigned int i;
int ret;
{
unsigned int i;
int ret;
@@
-1342,7
+1342,7
@@
free_all_buffers(void)
CPU_FREE(cpu_present_set);
cpu_present_set = NULL;
CPU_FREE(cpu_present_set);
cpu_present_set = NULL;
- cpu_present_set = 0;
+ cpu_present_set
size
= 0;
CPU_FREE(cpu_affinity_set);
cpu_affinity_set = NULL;
CPU_FREE(cpu_affinity_set);
cpu_affinity_set = NULL;