Debug/parser pull request changes

Author: Ethane98

src/agent/agent.cc

@@ -48,7 +48,8 @@ FILE* g_debug_fp;
 FILE* g_error_fp;
 FILE* g_output_fp;
 bool debugTypeEnabled [numDebugTypes] = {getenv("SP_DEBUG_INJECTOR"), getenv("SP_DEBUG_COMMON"), getenv("SP_DEBUG_PATCHAPI"), getenv("SP_DEBUG_IPC"), getenv("SP_DEBUG_WORKER"), getenv("SP_DEBUG_SIGTRAP"), getenv("SP_DEBUG_AGENT"), true};
-
+bool sp_debug = getenv("SP_DEBUG");
+bool sp_fdebug = getenv("SP_FDEBUG");
 
 namespace sp {
 
@@ -69,7 +70,7 @@ namespace sp {
       core_limit.rlim_cur = RLIM_INFINITY;
       core_limit.rlim_max = RLIM_INFINITY;
       if (setrlimit(RLIMIT_CORE, &core_limit) < 0) {
-        sp_perror("RROR: failed to setup core dump ability\n");
+        sp_perror("ERROR: failed to setup core dump ability\n");
       }
     }
 

src/agent/parser.cc

@@ -789,27 +789,26 @@ SpParser::FindFunction(string name,
 // Find function by mangled name.
 FuncSet
 SpParser::FindFunctionByMangledName(string name) {
-
   sp_debug_agent("LOOKING FOR FUNC BY MANGLED NAME - looking for %s",
            name.c_str());
 
-  FuncSet* found_funcs = new FuncSet();  
+  FuncSet found_funcs; 
   if (name.length() == 0) {
-    return *found_funcs;
+    return found_funcs;
   }
 
   // A quick return, if this function is in the cache
   if (mangled_func_map_.find(name) != mangled_func_map_.end()) {
     sp_debug_agent("GOT FROM CACHE - %s",
              FUNC_CAST((*mangled_func_map_[name].begin()))->GetMangledName().c_str());
-    std::copy(mangled_func_map_[name].begin(), mangled_func_map_[name].end(), inserter(*found_funcs, found_funcs->begin()));
-    return *found_funcs;
+    std::copy(mangled_func_map_[name].begin(), mangled_func_map_[name].end(), inserter(found_funcs, found_funcs.begin()));
+    return found_funcs;
   }
 
   // A quick return, if this function is proved to be not found
   if (mangled_func_not_found_.find(name) != mangled_func_not_found_.end()) {
     sp_debug_agent("NOT FOUND - %s is proved to be not found", name.c_str());
-    return *found_funcs;
+    return found_funcs;
   }
 
   // Iterate through each object to look for this function
@@ -839,15 +838,15 @@ SpParser::FindFunctionByMangledName(string name) {
   if (func_set.size() == 0) {
     mangled_func_not_found_.insert(name);  
     sp_debug_agent("NO FOUND - %s", name.c_str());
-    return *found_funcs;
+    return found_funcs;
   }
 
   //std::copy(func_set.begin(), func_set.end(), inserter(mangled_func_map_[name], mangled_func_map_[name].begin()));
-  std::copy(func_set.begin(), func_set.end(), inserter(*found_funcs, found_funcs->begin()));
-  assert(found_funcs->size() > 0);
-  sp_debug_agent("FOUND - %lu instances of %s, first in object %s", found_funcs->size(), name.c_str(),
+  std::copy(func_set.begin(), func_set.end(), inserter(found_funcs, found_funcs.begin()));
+  assert(found_funcs.size() > 0);
+  sp_debug_agent("FOUND - %lu instances of %s, first in object %s", found_funcs.size(), name.c_str(),
          FUNC_CAST((*func_set.begin()))->GetObject()->name().c_str());
-  return *found_funcs;
+  return found_funcs;
 }
 
 // Find function by name.

src/common/common.h

@@ -51,6 +51,8 @@ extern FILE* g_output_fp;
 extern FILE* g_debug_fp;
 extern FILE* g_error_fp;
 
+extern bool sp_debug;
+extern bool sp_fdebug;
 const int numDebugTypes = 8;
 enum DebugType {injectorDebug, commonDebug, patchapiDebug, ipcDebug, workerDebug, sigtrapDebug, agentDebug, unknownDebugType};
 extern bool debugTypeEnabled [numDebugTypes];
@@ -96,20 +98,18 @@ extern bool debugTypeEnabled [numDebugTypes];
     debugType = unknownDebugType; \
   } \
   if (debugTypeEnabled[debugType]) { \
-    if (getenv("SP_DEBUG")) {   \
+    FILE* debug_fp; \
+    if (sp_fdebug) \
+        debug_fp = g_debug_fp; \
+    else \
+        debug_fp = stderr; \
+    if (sp_debug || sp_fdebug) {   \
         char* nodir = basename((char*)__FILE__);				 \
-        fprintf(stderr, "%s [%d]: ", nodir, __LINE__); \
-        fprintf(stderr, __VA_ARGS__); \
-        fprintf(stderr, "\n");  \
-        fflush(stderr); \
+        fprintf(debug_fp, "%s [%d]: ", nodir, __LINE__); \
+        fprintf(debug_fp, __VA_ARGS__); \
+        fprintf(debug_fp, "\n");  \
+        fflush(debug_fp); \
       } \
-    else if (getenv("SP_FDEBUG")) {               \
-        char* nodir = basename((char*)__FILE__);				 \
-        fprintf(g_debug_fp, "%s [%d]: ", nodir, __LINE__); \
-        fprintf(g_debug_fp, __VA_ARGS__); \
-        fprintf(g_debug_fp, "\n");  \
-        fflush(g_debug_fp); \
-    }\
   } \
 } while(0)
 

src/injector/injector_main.cc

@@ -11,7 +11,8 @@ FILE* g_debug_fp = stderr;
 FILE* g_error_fp = stderr;
 FILE* g_output_fp = stdout;
 bool debugTypeEnabled [numDebugTypes] = {getenv("SP_DEBUG_INJECTOR"), getenv("SP_DEBUG_COMMON"), getenv("SP_DEBUG_PATCHAPI"), getenv("SP_DEBUG_IPC"), getenv("SP_DEBUG_WORKER"), getenv("SP_DEBUG_SIGTRAP"), getenv("SP_DEBUG_AGENT"), true};
-
+bool sp_debug = getenv("SP_DEBUG");
+bool sp_fdebug = getenv("SP_FDEBUG");
 
 // Here we go!
 int main(int argc, char *argv[]) {