Skip to content

Commit

Permalink
Merge pull request #117 from SpencerL-Y/exception
Browse files Browse the repository at this point in the history 
update memtrack analysis
  • Loading branch information
@zhuyutian57
zhuyutian57 authored Nov 4, 2021
2 parents 6f97e80 + 3e6eed1 commit a72e26a
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 51 deletions.
5 changes: 2 additions & 3 deletions include/smack/sesl/verifier/MemSafeVerifier.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,8 @@ namespace smack
StatementList stmts;
SHExprPtr finalSH;
// check for memory tracked
bool isValidPtrInMain(std::string ptrName);
std::queue<std::string> getValidPtrInMain(ExecutionStatePtr state, CFGPtr cfg);
std::vector<std::string> getSuccessors(ExecutionStatePtr state, std::string u);
std::set<std::string> getRootVarsForMemtrackAnalysis(ExecutionStatePtr state, CFGPtr cfg);
std::vector<std::string> getSuccessorsForMemtrackAnalysis(ExecutionStatePtr state, std::string u);
bool checkMemTrack(ExecutionStatePtr state, CFGPtr cfg);
public:
MemSafeChecker(std::shared_ptr<TransToZ3> trans, StatementList& stmtList, SHExprPtr fsh);
Expand Down
10 changes: 5 additions & 5 deletions lib/smack/sesl/executor/ExecutionState.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ namespace smack{
assert(var != nullptr);
resultSet.insert(var->name());
}
std::cout << " xxxxxxxxxxxxxxxxxxx resultSet: " << std::endl;
for(std::string s : resultSet){
std::cout << s << " " ;
}
std::cout << std::endl;
// std::cout << " xxxxxxxxxxxxxxxxxxx resultSet: " << std::endl;
// for(std::string s : resultSet){
// std::cout << s << " " ;
// }
// std::cout << std::endl;
return resultSet;
}
}
63 changes: 20 additions & 43 deletions lib/smack/sesl/verifier/MemSafeVerifier.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,46 +167,23 @@ namespace smack {
this->trans->setSymbolicHeapHExpr(sh);
}

bool MemSafeChecker::isValidPtrInMain(std::string ptrName) {
int l, r = ptrName.length();
for(l = 1; ptrName[l - 1] != '_'; l++);
if(r - l < 5) return false;
std::string funcName = ptrName.substr(l, 4);
std::string reaptedTime = ptrName.substr(l + 4, r - l - 4);
// std::cout << funcName << ' ' << reaptedTime << std::endl;
if(funcName != "main") return false;
for(auto ch : reaptedTime)
if(ch < '0' || ch > '9')
return false;
// std::cout << ptrName << " is valid in main\n";
return true;
}

std::queue<std::string> MemSafeChecker::getValidPtrInMain(ExecutionStatePtr state, CFGPtr cfg) {
std::queue<std::string> Q;
std::map<std::string, bool> isGlobal;
for(auto gv : cfg->getConstDecls()) {
// std::cout << gv->getName() << std::endl;
isGlobal[gv->getName()] = true;
std::set<std::string> MemSafeChecker::getRootVarsForMemtrackAnalysis(ExecutionStatePtr state, CFGPtr cfg) {
std::set<std::string> rootVars;
for(auto rootVar : state->obtainMemtrackRootSet()) {
std::string blkName = state->getVarEquiv()->getBlkName(rootVar);
rootVars.insert(blkName);
}
for(auto spl : state->getSH()->getSpatialExpr()) {
if(spl->getId() != SpatialLiteral::Kind::SPT) continue;
// std::cout << spl << std::endl;
std::string blkName = spl->getBlkName();
std::string origName = state->getVarFactory()->getOrigVarName(blkName);
if(this->isValidPtrInMain(origName) || isGlobal[origName]) {
Q.push(blkName);
// std::cout << blkName << std::endl;
}
for(auto globalVar : cfg->getConstDecls()) {
std::string varName = globalVar->getName();
rootVars.insert(state->getVarEquiv()->getBlkName(varName + "_bb0"));
}
return Q;
return rootVars;
}

std::vector<std::string> MemSafeChecker::getSuccessors(ExecutionStatePtr state, std::string u) {
std::vector<std::string> MemSafeChecker::getSuccessorsForMemtrackAnalysis(ExecutionStatePtr state, std::string u) {
std::vector<std::string> successors;
int u_offset = state->getVarEquiv()->getOffset(u);
std::string u_blk = state->getVarEquiv()->getBlkName(u);
// std::cout << u << " " << u_blk << " " << u_offset << std::endl;
bool inRegion = false;
for(auto spl : state->getSH()->getSpatialExpr()) {
if(spl->getId() == SpatialLiteral::Kind::SPT &&
Expand All @@ -233,24 +210,20 @@ namespace smack {
std::queue<std::string> workList;
std::map<std::string, bool> hasVisited;
std::map<std::string, bool> tracked;
workList = this->getValidPtrInMain(state, cfg);
for(auto rootVar : this->getRootVarsForMemtrackAnalysis(state, cfg))
workList.push(rootVar);
while(!workList.empty()) {
std::string u = workList.front();
// std::cout << "\n=============================\n";
// std::cout << "src: " << u << std::endl;
workList.pop();
if(hasVisited[u]) continue;
hasVisited[u] = true;
if(state->getVarEquiv()->getOffset(u) == 0) {
// std::cout << u << " is tracked" << std::endl;
tracked[u] = true;
}
for(auto v : this->getSuccessors(state, u)) {
// std::cout << state->getVarEquiv()->getAllocName(v) << ' ';
for(auto v : this->getSuccessorsForMemtrackAnalysis(state, u)) {
if(hasVisited[v]) continue;
workList.push(v);
}
// std::cout << "\n=============================\n";
}
for(auto spl : state->getSH()->getSpatialExpr())
if(spl->getId() == SpatialLiteral::Kind::SPT &&
Expand Down Expand Up @@ -294,14 +267,18 @@ namespace smack {
}
}
}
std::string prp = SmackOptions::prp.getValue();
bool trackAll = checkMemTrack(state, mainGraph);
int errType;
std::set<std::string> memtrackRoots = state->obtainMemtrackRootSet();
if(!checkMemTrack(state, mainGraph)) {
if(!trackAll && prp.find("memsafety") != std::string::npos) {
DEBUG_WITH_COLOR(std::cout << "LEAK: Memtrack!!!" << std::endl;, color::red);
errType = MEMTRACK;
} else {
} else if(trackAll && prp.find("memcleanup") != std::string::npos){
DEBUG_WITH_COLOR(std::cout << "LEAK: Memcleanup!!!" << std::endl;, color::red);
errType = MEMCLEAN;
} else {
DEBUG_WITH_COLOR(std::cout << "LEAK: CHECKUNKNOWN!!!" << std::endl;, color::yellow);
errType = UNKNOWN;
}
return {false, errType};
// for(std::string unusedName : state->getVarFactory()->getUnusedNames()){
Expand Down

0 comments on commit a72e26a

Please sign in to comment.