diff options
Diffstat (limited to 'src/zabbix_agent/cpustat.c')
| -rw-r--r-- | src/zabbix_agent/cpustat.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/zabbix_agent/cpustat.c b/src/zabbix_agent/cpustat.c index 2bdc991ed6d..4f465d8021b 100644 --- a/src/zabbix_agent/cpustat.c +++ b/src/zabbix_agent/cpustat.c @@ -136,11 +136,11 @@ int init_cpu_collector(ZBX_CPUS_STAT_DATA *pcpus) #ifdef _WINDOWS cpe.szMachineName = NULL; - cpe.szObjectName = get_builtin_object_name(PCI_PROCESSOR_TIME); + cpe.szObjectName = zbx_get_builtin_object_name(PCI_PROCESSOR_TIME); cpe.szInstanceName = cpu; cpe.szParentInstance = NULL; cpe.dwInstanceIndex = (DWORD)-1; - cpe.szCounterName = get_builtin_counter_name(PCI_PROCESSOR_TIME); + cpe.szCounterName = zbx_get_builtin_counter_name(PCI_PROCESSOR_TIME); /* 64 logical CPUs (threads) is a hard limit for 32-bit Windows systems and some old 64-bit versions, */ /* such as Windows Vista. Systems with <= 64 threads will always have one processor group, which means */ @@ -190,8 +190,8 @@ int init_cpu_collector(ZBX_CPUS_STAT_DATA *pcpus) pcpus->count, cpu_groups); - cpe.szObjectName = get_builtin_object_name(PCI_INFORMATION_PROCESSOR_TIME); - cpe.szCounterName = get_builtin_counter_name(PCI_INFORMATION_PROCESSOR_TIME); + cpe.szObjectName = zbx_get_builtin_object_name(PCI_INFORMATION_PROCESSOR_TIME); + cpe.szCounterName = zbx_get_builtin_counter_name(PCI_INFORMATION_PROCESSOR_TIME); /* This doesn't seem to be well documented but it looks like Windows treats Processor Information */ /* object differently on NUMA-enabled systems. First index for the object may either mean logical */ @@ -232,9 +232,9 @@ int init_cpu_collector(ZBX_CPUS_STAT_DATA *pcpus) } } - cpe.szObjectName = get_builtin_object_name(PCI_PROCESSOR_QUEUE_LENGTH); + cpe.szObjectName = zbx_get_builtin_object_name(PCI_PROCESSOR_QUEUE_LENGTH); cpe.szInstanceName = NULL; - cpe.szCounterName = get_builtin_counter_name(PCI_PROCESSOR_QUEUE_LENGTH); + cpe.szCounterName = zbx_get_builtin_counter_name(PCI_PROCESSOR_QUEUE_LENGTH); if (ERROR_SUCCESS != zbx_PdhMakeCounterPath(__func__, &cpe, counterPath)) goto clean; |