diff options
Diffstat (limited to 'src/cpu')
| -rw-r--r-- | src/cpu/abstract_cpu.cpp | 10 | ||||
| -rw-r--r-- | src/cpu/cpu.cpp | 14 | ||||
| -rw-r--r-- | src/cpu/cpu_linux.cpp | 10 | ||||
| -rw-r--r-- | src/cpu/cpudevice.cpp | 5 |
4 files changed, 20 insertions, 19 deletions
diff --git a/src/cpu/abstract_cpu.cpp b/src/cpu/abstract_cpu.cpp index 17acb71..cacb130 100644 --- a/src/cpu/abstract_cpu.cpp +++ b/src/cpu/abstract_cpu.cpp @@ -71,9 +71,9 @@ void abstract_cpu::account_freq(uint64_t freq, uint64_t duration) state->freq = freq; hz_to_human(freq, state->human_name); if (freq == 0) - strcpy(state->human_name, _("Idle")); + pt_strcpy(state->human_name, _("Idle")); if (is_turbo(freq, max_frequency, max_minus_one_frequency)) - sprintf(state->human_name, _("Turbo Mode")); + pt_strcpy(state->human_name, _("Turbo Mode")); state->after_count = 1; } @@ -205,8 +205,8 @@ void abstract_cpu::insert_cstate(const char *linux_name, const char *human_name, cstates.push_back(state); - strcpy(state->linux_name, linux_name); - strcpy(state->human_name, human_name); + pt_strcpy(state->linux_name, linux_name); + pt_strcpy(state->human_name, human_name); state->line_level = -1; @@ -337,7 +337,7 @@ void abstract_cpu::insert_pstate(uint64_t freq, const char *human_name, uint64_t pstates.push_back(state); state->freq = freq; - strcpy(state->human_name, human_name); + pt_strcpy(state->human_name, human_name); state->time_before = duration; diff --git a/src/cpu/cpu.cpp b/src/cpu/cpu.cpp index ee87c04..499b752 100644 --- a/src/cpu/cpu.cpp +++ b/src/cpu/cpu.cpp @@ -78,18 +78,18 @@ static class abstract_cpu * new_package(int package, int cpu, char * vendor, int ret->set_type("Package"); ret->childcount = 0; - sprintf(packagename, _("cpu package %i"), cpu); + snprintf(packagename, sizeof(packagename), _("cpu package %i"), cpu); cpudev = new class cpudevice(_("cpu package"), packagename, ret); all_devices.push_back(cpudev); - sprintf(packagename, _("package-%i"), cpu); + snprintf(packagename, sizeof(packagename), _("package-%i"), cpu); cpu_rapl_dev = new class cpu_rapl_device(cpudev, _("cpu rapl package"), packagename, ret); if (cpu_rapl_dev->device_present()) all_devices.push_back(cpu_rapl_dev); else delete cpu_rapl_dev; - sprintf(packagename, _("package-%i"), cpu); + snprintf(packagename, sizeof(packagename), _("package-%i"), cpu); dram_rapl_dev = new class dram_rapl_device(cpudev, _("dram rapl package"), packagename, ret); if (dram_rapl_dev->device_present()) all_devices.push_back(dram_rapl_dev); @@ -556,14 +556,14 @@ void report_display_cpu_cstates(void) if (strcmp(core_type, "Core") == 0 ) { core_data[idx2]=""; idx2+=1; - sprintf(tmp_num, __("Core %d"),_core->get_number()); + snprintf(tmp_num, sizeof(tmp_num), __("Core %d"), _core->get_number()); core_data[idx2]=string(tmp_num); idx2+=1; core_num+=1; } else { core_data[idx2]=""; idx2+=1; - sprintf(tmp_num,__("GPU %d"),_core->get_number()); + snprintf(tmp_num, sizeof(tmp_num), __("GPU %d"), _core->get_number()); core_data[idx2]=string(tmp_num); idx2+=1; } @@ -765,7 +765,7 @@ void report_display_cpu_pstates(void) if (line == LEVEL_HEADER) { core_data[idx2]=""; idx2+=1; - sprintf(tmp_num,__("Core %d"),_core->get_number()); + snprintf(tmp_num, sizeof(tmp_num), __("Core %d"), _core->get_number()); core_data[idx2]=string(tmp_num); idx2+=1; } else { @@ -786,7 +786,7 @@ void report_display_cpu_pstates(void) continue; if (line == LEVEL_HEADER) { - sprintf(tmp_num,__("CPU %d"),_cpu->get_number()); + snprintf(tmp_num, sizeof(tmp_num), __("CPU %d"), _cpu->get_number()); cpu_data[idx3] = string(tmp_num); idx3+=1; continue; diff --git a/src/cpu/cpu_linux.cpp b/src/cpu/cpu_linux.cpp index e19fba1..deaa12c 100644 --- a/src/cpu/cpu_linux.cpp +++ b/src/cpu/cpu_linux.cpp @@ -64,8 +64,8 @@ void cpu_linux::parse_cstates_start(void) if (strlen(entry->d_name) < 3) continue; - strcpy(linux_name, entry->d_name); - strcpy(human_name, linux_name); + pt_strcpy(linux_name, entry->d_name); + pt_strcpy(human_name, linux_name); snprintf(filename + len, 256 - len, "/%s/name", entry->d_name); @@ -76,7 +76,7 @@ void cpu_linux::parse_cstates_start(void) } if (strcmp(human_name, "C0")==0) - strcpy(human_name, _("C0 polling")); + pt_strcpy(human_name, _("C0 polling")); snprintf(filename + len, 256 - len, "/%s/usage", entry->d_name); file.open(filename, ios::in); @@ -164,8 +164,8 @@ void cpu_linux::parse_cstates_end(void) if (strlen(entry->d_name) < 3) continue; - strcpy(linux_name, entry->d_name); - strcpy(human_name, linux_name); + pt_strcpy(linux_name, entry->d_name); + pt_strcpy(human_name, linux_name); snprintf(filename + len, 256 - len, "/%s/usage", entry->d_name); diff --git a/src/cpu/cpudevice.cpp b/src/cpu/cpudevice.cpp index 371d8a8..4c7ca7b 100644 --- a/src/cpu/cpudevice.cpp +++ b/src/cpu/cpudevice.cpp @@ -26,13 +26,14 @@ #include <stdlib.h> #include <stdio.h> #include <string.h> +#include "../lib.h" #include "../parameters/parameters.h" cpudevice::cpudevice(const char *classname, const char *dev_name, class abstract_cpu *_cpu) { - strcpy(_class, classname); - strcpy(_cpuname, dev_name); + pt_strcpy(_class, classname); + pt_strcpy(_cpuname, dev_name); cpu = _cpu; wake_index = get_param_index("cpu-wakeups");; consumption_index = get_param_index("cpu-consumption");; |