Change function return status to std::atomic to avoid races and deadlock

dyninst · May 29, 2018 · 9f497d9 · 9f497d9
1 parent 5016030
commit 9f497d9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/parseAPI/h/CFG.h b/parseAPI/h/CFG.h
@@ -48,6 +48,7 @@
 #include <boost/thread/lockable_adapter.hpp>
 #include <boost/thread/recursive_mutex.hpp>
 #include <list>
+#include <atomic>
 
 namespace Dyninst {
 
@@ -463,7 +464,7 @@ class PARSER_EXPORT Function : public allocatable, public AnnotatableSparse, pub
     InstructionSource * _isrc;
 
     FuncSource _src;
-    FuncReturnStatus _rs;
+    std::atomic<FuncReturnStatus> _rs;
 
     std::string _name;
     Block * _entry;
@@ -507,8 +508,7 @@ class PARSER_EXPORT Function : public allocatable, public AnnotatableSparse, pub
     CodeObject * obj() const { return _obj; }
     FuncSource src() const { return _src; }
     FuncReturnStatus retstatus() const { 
-      boost::lock_guard<const Function> g(*this);
-      return _rs; 
+      return _rs.load(); 
     }
     Block * entry() const { return _entry; }
     bool parsed() const { return _parsed; }

diff --git a/parseAPI/src/Function.C b/parseAPI/src/Function.C
@@ -519,7 +519,7 @@ void Function::set_retstatus(FuncReturnStatus rs)
     } else if (rs == UNKNOWN) {
         _obj->cs()->incrementCounter(PARSE_UNKNOWN_COUNT);
     }
-    _rs = rs;
+    _rs.store(rs);
 }
 
 void