Made testserver communicate to parent process with JSON

net/test/test_server_posix.cc

Index: net/test/test_server_posix.cc
diff --git a/net/test/test_server_posix.cc b/net/test/test_server_posix.cc
index 9c0210b7d28429901ffec57384e7e3f6a7fc3c95..58a897bd12483cb549a2fbd2d30a59f87026d169 100644
--- a/net/test/test_server_posix.cc
+++ b/net/test/test_server_posix.cc
@@ -97,22 +97,21 @@ bool TestServer::LaunchPython(const FilePath& testserver_path) {
   return true;
 }
 
-bool TestServer::WaitToStart() {
-  uint16 port;
-  uint8* buffer = reinterpret_cast<uint8*>(&port);
+namespace {

[Paweł Hajdan Jr., 2010/11/18 10:35:12]

nit: Move the anonymous namespace to the beginning of the file.

[cbentzel, 2010/11/18 12:34:30]

This isn't in the style guide - is this just an agreed-upon convention for
Chrome. I actually prefer placing this closer to where it is used [there are
also multiple anonymous namespaces in this file]

http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml#Namespaces

[akalin, 2010/11/18 22:38:34]

Done.

[akalin, 2010/11/18 22:38:34]

I'm fine with either way.  I've gotten pushback from my multiple anonymous
namespaces before, but I don't care too much about it.

On 2010/11/18 12:34:30, cbentzel wrote:

+
+bool ReadData(base::TimeDelta* remaining_time,

[Paweł Hajdan Jr., 2010/11/18 10:35:12]

nit: This function should have a comment.

[akalin, 2010/11/18 22:38:34]

Done.

+              int fd, ssize_t bytes_max, uint8* buffer) {
   ssize_t bytes_read = 0;
-  ssize_t bytes_max = sizeof(port);
-  base::TimeDelta remaining_time = base::TimeDelta::FromMilliseconds(
-      TestTimeouts::action_max_timeout_ms());
   base::Time previous_time = base::Time::Now();
   while (bytes_read < bytes_max) {
     struct pollfd poll_fds[1];
 
-    poll_fds[0].fd = child_fd_;
+    poll_fds[0].fd = fd;
     poll_fds[0].events = POLLIN | POLLPRI;
     poll_fds[0].revents = 0;
 
-    int rv = HANDLE_EINTR(poll(poll_fds, 1, remaining_time.InMilliseconds()));
+    int rv = HANDLE_EINTR(poll(poll_fds, 1,
+                               remaining_time->InMilliseconds()));
     if (rv != 1) {
       LOG(ERROR) << "Failed to poll for the child file descriptor.";
       return false;
@@ -121,21 +120,36 @@ bool TestServer::WaitToStart() {
     base::Time current_time = base::Time::Now();
     base::TimeDelta elapsed_time_cycle = current_time - previous_time;
     DCHECK(elapsed_time_cycle.InMilliseconds() >= 0);
-    remaining_time -= elapsed_time_cycle;
+    *remaining_time -= elapsed_time_cycle;
     previous_time = current_time;
 
-    ssize_t num_bytes = HANDLE_EINTR(read(child_fd_, buffer + bytes_read,
+    ssize_t num_bytes = HANDLE_EINTR(read(fd, buffer + bytes_read,
                                           bytes_max - bytes_read));
     if (num_bytes <= 0)
-      break;
+      return false;
     bytes_read += num_bytes;
   }
+  return true;
+}
+
+}  // namespace
+
+bool TestServer::WaitToStart() {
+  file_util::ScopedFD child_fd_closer(child_fd_closer_.release());
+
+  base::TimeDelta remaining_time = base::TimeDelta::FromMilliseconds(
+      TestTimeouts::action_max_timeout_ms());
+  uint32 server_data_len = 0;
+  if (!ReadData(&remaining_time, child_fd_, sizeof(server_data_len),
+                reinterpret_cast<uint8*>(&server_data_len)))
+    return false;
+  std::string server_data(server_data_len, '\0');
+  if (!ReadData(&remaining_time, child_fd_, server_data_len,
+                reinterpret_cast<uint8*>(&server_data[0])))
+    return false;
 
-  // We don't need the FD anymore.
-  child_fd_closer_.reset(NULL);
-  if (bytes_read < bytes_max)
+  if (!ParseServerData(server_data))

[Paweł Hajdan Jr., 2010/11/18 10:35:12]

nit: Just return ParseServerData(...).

[akalin, 2010/11/18 22:38:34]

Done.

     return false;
-  host_port_pair_.set_port(port);
   return true;
 }