diff options
Diffstat (limited to 'cmds/incident_helper/src/parsers/CpuInfoParser.cpp')
| -rw-r--r-- | cmds/incident_helper/src/parsers/CpuInfoParser.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/cmds/incident_helper/src/parsers/CpuInfoParser.cpp b/cmds/incident_helper/src/parsers/CpuInfoParser.cpp index d73de54d8c5d..b2b431c62866 100644 --- a/cmds/incident_helper/src/parsers/CpuInfoParser.cpp +++ b/cmds/incident_helper/src/parsers/CpuInfoParser.cpp @@ -54,11 +54,11 @@ CpuInfoParser::Parse(const int in, const int out) const bool nextToUsage = false; ProtoOutputStream proto; - Table table(CpuInfo::Task::_FIELD_NAMES, CpuInfo::Task::_FIELD_IDS, CpuInfo::Task::_FIELD_COUNT); - table.addEnumTypeMap("s", CpuInfo::Task::_ENUM_STATUS_NAMES, - CpuInfo::Task::_ENUM_STATUS_VALUES, CpuInfo::Task::_ENUM_STATUS_COUNT); - table.addEnumTypeMap("pcy", CpuInfo::Task::_ENUM_POLICY_NAMES, - CpuInfo::Task::_ENUM_POLICY_VALUES, CpuInfo::Task::_ENUM_POLICY_COUNT); + Table table(CpuInfoProto::Task::_FIELD_NAMES, CpuInfoProto::Task::_FIELD_IDS, CpuInfoProto::Task::_FIELD_COUNT); + table.addEnumTypeMap("s", CpuInfoProto::Task::_ENUM_STATUS_NAMES, + CpuInfoProto::Task::_ENUM_STATUS_VALUES, CpuInfoProto::Task::_ENUM_STATUS_COUNT); + table.addEnumTypeMap("pcy", CpuInfoProto::Task::_ENUM_POLICY_NAMES, + CpuInfoProto::Task::_ENUM_POLICY_VALUES, CpuInfoProto::Task::_ENUM_POLICY_COUNT); // parse line by line while (reader.readLine(&line)) { @@ -67,33 +67,33 @@ CpuInfoParser::Parse(const int in, const int out) const nline++; if (stripPrefix(&line, "Tasks:")) { - writeSuffixLine(&proto, CpuInfo::TASK_STATS, line, COMMA_DELIMITER, - CpuInfo::TaskStats::_FIELD_COUNT, - CpuInfo::TaskStats::_FIELD_NAMES, - CpuInfo::TaskStats::_FIELD_IDS); + writeSuffixLine(&proto, CpuInfoProto::TASK_STATS, line, COMMA_DELIMITER, + CpuInfoProto::TaskStats::_FIELD_COUNT, + CpuInfoProto::TaskStats::_FIELD_NAMES, + CpuInfoProto::TaskStats::_FIELD_IDS); continue; } if (stripPrefix(&line, "Mem:")) { - writeSuffixLine(&proto, CpuInfo::MEM, line, COMMA_DELIMITER, - CpuInfo::MemStats::_FIELD_COUNT, - CpuInfo::MemStats::_FIELD_NAMES, - CpuInfo::MemStats::_FIELD_IDS); + writeSuffixLine(&proto, CpuInfoProto::MEM, line, COMMA_DELIMITER, + CpuInfoProto::MemStats::_FIELD_COUNT, + CpuInfoProto::MemStats::_FIELD_NAMES, + CpuInfoProto::MemStats::_FIELD_IDS); continue; } if (stripPrefix(&line, "Swap:")) { - writeSuffixLine(&proto, CpuInfo::SWAP, line, COMMA_DELIMITER, - CpuInfo::MemStats::_FIELD_COUNT, - CpuInfo::MemStats::_FIELD_NAMES, - CpuInfo::MemStats::_FIELD_IDS); + writeSuffixLine(&proto, CpuInfoProto::SWAP, line, COMMA_DELIMITER, + CpuInfoProto::MemStats::_FIELD_COUNT, + CpuInfoProto::MemStats::_FIELD_NAMES, + CpuInfoProto::MemStats::_FIELD_IDS); nextToSwap = true; continue; } if (nextToSwap) { - writeSuffixLine(&proto, CpuInfo::CPU_USAGE, line, DEFAULT_WHITESPACE, - CpuInfo::CpuUsage::_FIELD_COUNT, - CpuInfo::CpuUsage::_FIELD_NAMES, - CpuInfo::CpuUsage::_FIELD_IDS); + writeSuffixLine(&proto, CpuInfoProto::CPU_USAGE, line, DEFAULT_WHITESPACE, + CpuInfoProto::CpuUsage::_FIELD_COUNT, + CpuInfoProto::CpuUsage::_FIELD_NAMES, + CpuInfoProto::CpuUsage::_FIELD_IDS); nextToUsage = true; nextToSwap = false; continue; @@ -138,7 +138,7 @@ CpuInfoParser::Parse(const int in, const int out) const continue; } - long long token = proto.start(CpuInfo::TASKS); + long long token = proto.start(CpuInfoProto::TASKS); for (int i=0; i<(int)record.size(); i++) { if (!table.insertField(&proto, header[i], record[i])) { fprintf(stderr, "[%s]Line %d fails to insert field %s with value %s\n", |