github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

Rewritten ServerStatMan::load() using nothrow version of parseInt

pull/28/head
Tatsuhiro Tsujikawa 2012-09-27 00:07:15 +09:00
parent 8f2030da09
commit f75402739b
1 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/ServerStatMan.cc
View File

@ -196,31 +196,40 @@ bool ServerStatMan::load(const std::string& filename)
continue; continue;
} }
SharedHandle<ServerStat> sstat(new ServerStat(m[S_HOST], m[S_PROTOCOL])); SharedHandle<ServerStat> sstat(new ServerStat(m[S_HOST], m[S_PROTOCOL]));
try {
const std::string& dlSpeed = m[S_DL_SPEED]; uint32_t uintval;
sstat->setDownloadSpeed(util::parseUInt(dlSpeed)); if(!util::parseUIntNoThrow(uintval, m[S_DL_SPEED])) {
// Old serverstat file doesn't contains SC_AVG_SPEED
if(!m[S_SC_AVG_SPEED].empty()) {
const std::string& s = m[S_SC_AVG_SPEED];
sstat->setSingleConnectionAvgSpeed(util::parseUInt(s));
}
// Old serverstat file doesn't contains MC_AVG_SPEED
if(!m[S_MC_AVG_SPEED].empty()) {
const std::string& s = m[S_MC_AVG_SPEED];
sstat->setMultiConnectionAvgSpeed(util::parseUInt(s));
}
// Old serverstat file doesn't contains COUNTER_SPEED
if(!m[S_COUNTER].empty()) {
const std::string& s = m[S_COUNTER];
sstat->setCounter(util::parseUInt(s));
}
const std::string& lastUpdated = m[S_LAST_UPDATED];
sstat->setLastUpdated(Time(util::parseInt(lastUpdated)));
sstat->setStatus(m[S_STATUS]);
add(sstat);
} catch(RecoverableException& e) {
continue; continue;
} }
sstat->setDownloadSpeed(uintval);
// Old serverstat file doesn't contains SC_AVG_SPEED
if(!m[S_SC_AVG_SPEED].empty()) {
if(!util::parseUIntNoThrow(uintval, m[S_SC_AVG_SPEED])) {
continue;
}
sstat->setSingleConnectionAvgSpeed(uintval);
}
// Old serverstat file doesn't contains MC_AVG_SPEED
if(!m[S_MC_AVG_SPEED].empty()) {
if(!util::parseUIntNoThrow(uintval, m[S_MC_AVG_SPEED])) {
continue;
}
sstat->setMultiConnectionAvgSpeed(uintval);
}
// Old serverstat file doesn't contains COUNTER_SPEED
if(!m[S_COUNTER].empty()) {
if(!util::parseUIntNoThrow(uintval, m[S_COUNTER])) {
continue;
}
sstat->setCounter(uintval);
}
int32_t intval;
if(!util::parseIntNoThrow(intval, m[S_LAST_UPDATED])) {
continue;
}
sstat->setLastUpdated(Time(intval));
sstat->setStatus(m[S_STATUS]);
add(sstat);
} }
A2_LOG_NOTICE(fmt(MSG_SERVER_STAT_LOADED, filename.c_str())); A2_LOG_NOTICE(fmt(MSG_SERVER_STAT_LOADED, filename.c_str()));
return true; return true;