Fix read_next_line()

Author: danpoe

buildspec.yml

@@ -8,7 +8,7 @@ phases:
       - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys BA9EF27F
       - add-apt-repository ppa:openjdk-r/ppa -y
       - apt-get update -y
-      - apt-get install -y g++-5 flex bison make git libwww-perl patch ccache libc6-dev-i386 jq
+      - apt-get install -y g++-5 flex bison make git libwww-perl patch ccache libc6-dev-i386 jq gdb
       - apt-get install -y openjdk-8-jdk
       - update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 1
       - update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-5 1

src/memory-analyzer/gdb_api.cpp

@@ -25,6 +25,8 @@ Author: Malte Mues <[email protected]>
 
 #include <util/string_utils.h>
 
+#include <unistd.h>
+
 /// Create a gdb_apit object
 ///
 /// \param binary the binary to run with gdb
@@ -90,6 +92,8 @@ void gdb_apit::create_gdb_process()
   }
   else
   {
+    usleep(1000000);
+
     // parent process
     gdb_state = gdb_statet::CREATED; std::cout << "GDB Here 20" << std::endl;
 
@@ -102,6 +106,29 @@ void gdb_apit::create_gdb_process()
     // get stream for writing to gdb
     output_stream = fdopen(pipe_input[1], "w"); std::cout << "GDB Here 24" << std::endl;
 
+    usleep(1000000);
+
+    //const int r = system("cat gdb.txt");
+    //CHECK_RETURN(r == 0);
+
+#if 0
+    std::cout << "Getting lines" << std::endl;
+    std::ifstream is("gdb.txt");
+
+    int count = 0;
+
+    while(!is.eof())
+    {
+      std::string tmp;
+      getline(is, tmp);
+      std::cout << "Line: " << tmp << std::endl;
+      count++;
+
+      if(count > 100)
+        break;
+    }
+#endif
+
     CHECK_RETURN(most_recent_line_has_tag(R"(~"done)")); std::cout << "GDB Here 25" << std::endl;
 
     if(log)
@@ -149,6 +176,8 @@ void gdb_apit::write_to_gdb(const std::string &command)
     command_log.push_back(command); std::cout << "GDB Here 40" << std::endl;
   }
 
+  std::cout << "Command: " << command << std::endl;
+
   if(fputs(line.c_str(), output_stream) == EOF)
   {
     throw gdb_interaction_exceptiont("could not write a command to gdb"); std::cout << "GDB Here 41" << std::endl;
@@ -183,12 +212,14 @@ std::string gdb_apit::read_next_line()
       }
 
       INVARIANT(feof(input_stream), ""); std::cout << "GDB Here 49" << std::endl;
-      INVARIANT(result.back() != '\n', ""); std::cout << "GDB Here 50" << std::endl;
+      INVARIANT(result.empty() || result.back() != '\n', ""); std::cout << "GDB Here 50" << std::endl;
 
       return result; std::cout << "GDB Here 51" << std::endl;
     }
 
     result += std::string(buf); std::cout << "GDB Here 52" << std::endl;
+    INVARIANT(!result.empty(), "");
+
   } while(result.back() != '\n'); std::cout << "GDB Here 53" << std::endl;
 
   return result; std::cout << "GDB Here 54" << std::endl;
@@ -203,6 +234,9 @@ std::string gdb_apit::read_most_recent_line()
   {
     output = line; std::cout << "GDB Here 57" << std::endl;
     line = read_next_line(); std::cout << "GDB Here 58" << std::endl;
+    std::cout << "Line: " << line << std::endl;
+    std::cout << "End line" << std::endl;
+    CHECK_RETURN(!line.empty());
   } while(line != "(gdb) \n"); std::cout << "GDB Here 59" << std::endl;
 
   return output; std::cout << "GDB Here 60" << std::endl;

unit/memory-analyzer/gdb_api.cpp

@@ -34,7 +34,7 @@ void compile_test_file()
 
 class gdb_api_testt : public gdb_apit
 {
-  explicit gdb_api_testt(const char *binary) : gdb_apit(binary)
+  explicit gdb_api_testt(const char *binary) : gdb_apit(binary, true)
   {
   }