From 2cc0bdedcfe3ce46e4d63964c5aa19175bf05589 Mon Sep 17 00:00:00 2001
From: Corey Zumar <czumar@berkeley.edu>
Date: Mon, 26 Jun 2017 22:45:27 -0700
Subject: [PATCH 1/2] Fix RPC edge case

---
 containers/python/rpc.py           |  7 ++++---
 src/libclipper/src/rpc_service.cpp | 20 ++++++++++----------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/containers/python/rpc.py b/containers/python/rpc.py
index df7e8f3b5..9a8d83195 100644
--- a/containers/python/rpc.py
+++ b/containers/python/rpc.py
@@ -302,7 +302,7 @@ def run(self):
 
                         t4 = datetime.now()
 
-                        response.send(socket)
+                        response.send(socket, self.event_history)
 
                         print("recv: %f us, parse: %f us, handle: %f us" %
                               ((t2 - t1).microseconds, (t3 - t2).microseconds,
@@ -313,7 +313,7 @@ def run(self):
                     else:
                         feedback_request = FeedbackRequest(msg_id_bytes, [])
                         response = self.handle_feedback_request(received_msg)
-                        response.send(socket)
+                        response.send(socket, self.event_history)
                         print("recv: %f us" % ((t2 - t1).microseconds))
 
                 sys.stdout.flush()
@@ -394,13 +394,14 @@ def add_output(self, output):
                      self.string_content_end_position + output_len] = output
         self.string_content_end_position += output_len
 
-    def send(self, socket):
+    def send(self, socket, event_history):
         socket.send("", flags=zmq.SNDMORE)
         socket.send(
             struct.pack("<I", MESSAGE_TYPE_CONTAINER_CONTENT),
             flags=zmq.SNDMORE)
         socket.send(self.msg_id, flags=zmq.SNDMORE)
         socket.send(self.output_buffer[0:self.string_content_end_position])
+        event_history.insert(EVENT_HISTORY_SENT_CONTAINER_CONTENT);
 
     def expand_buffer_if_necessary(self, size):
         if len(self.output_buffer) < size:
diff --git a/src/libclipper/src/rpc_service.cpp b/src/libclipper/src/rpc_service.cpp
index 58fdb3885..6add7e50e 100644
--- a/src/libclipper/src/rpc_service.cpp
+++ b/src/libclipper/src/rpc_service.cpp
@@ -271,17 +271,17 @@ void RPCService::receive_message(
         zmq_connection_id += 1;
       }
     } break;
-    case MessageType::ContainerContent:
+    case MessageType::ContainerContent: {
+      // This message is a response to a container query
+      message_t msg_id;
+      message_t msg_content;
+      socket.recv(&msg_id, 0);
+      socket.recv(&msg_content, 0);
       if (!new_connection) {
-        // This message is a response to a container query
-        message_t msg_id;
-        message_t msg_content;
-        socket.recv(&msg_id, 0);
-        socket.recv(&msg_content, 0);
         int id = static_cast<int *>(msg_id.data())[0];
         vector<uint8_t> content(
-            (uint8_t *)msg_content.data(),
-            (uint8_t *)msg_content.data() + msg_content.size());
+            (uint8_t *) msg_content.data(),
+            (uint8_t *) msg_content.data() + msg_content.size());
         RPCResponse response(id, content);
 
         auto container_info_entry =
@@ -289,7 +289,7 @@ void RPCService::receive_message(
         if (container_info_entry == connections_containers_map.end()) {
           throw std::runtime_error(
               "Failed to find container that was previously registered via "
-              "RPC");
+                  "RPC");
         }
         std::pair<VersionedModelId, int> container_info =
             container_info_entry->second;
@@ -303,7 +303,7 @@ void RPCService::receive_message(
 
         response_queue_->push(response);
       }
-      break;
+    } break;
     case MessageType::Heartbeat:
       send_heartbeat_response(socket, connection_id, new_connection);
       break;

From 028fb5952ad24fe801e31b047ef93f8b58fa4efd Mon Sep 17 00:00:00 2001
From: Corey Zumar <czumar@berkeley.edu>
Date: Mon, 26 Jun 2017 22:49:12 -0700
Subject: [PATCH 2/2] Format code

---
 containers/python/rpc.py           | 2 +-
 src/libclipper/src/rpc_service.cpp | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/containers/python/rpc.py b/containers/python/rpc.py
index 9a8d83195..63ab71e5d 100644
--- a/containers/python/rpc.py
+++ b/containers/python/rpc.py
@@ -401,7 +401,7 @@ def send(self, socket, event_history):
             flags=zmq.SNDMORE)
         socket.send(self.msg_id, flags=zmq.SNDMORE)
         socket.send(self.output_buffer[0:self.string_content_end_position])
-        event_history.insert(EVENT_HISTORY_SENT_CONTAINER_CONTENT);
+        event_history.insert(EVENT_HISTORY_SENT_CONTAINER_CONTENT)
 
     def expand_buffer_if_necessary(self, size):
         if len(self.output_buffer) < size:
diff --git a/src/libclipper/src/rpc_service.cpp b/src/libclipper/src/rpc_service.cpp
index 6add7e50e..df72bd40b 100644
--- a/src/libclipper/src/rpc_service.cpp
+++ b/src/libclipper/src/rpc_service.cpp
@@ -280,8 +280,8 @@ void RPCService::receive_message(
       if (!new_connection) {
         int id = static_cast<int *>(msg_id.data())[0];
         vector<uint8_t> content(
-            (uint8_t *) msg_content.data(),
-            (uint8_t *) msg_content.data() + msg_content.size());
+            (uint8_t *)msg_content.data(),
+            (uint8_t *)msg_content.data() + msg_content.size());
         RPCResponse response(id, content);
 
         auto container_info_entry =
@@ -289,7 +289,7 @@ void RPCService::receive_message(
         if (container_info_entry == connections_containers_map.end()) {
           throw std::runtime_error(
               "Failed to find container that was previously registered via "
-                  "RPC");
+              "RPC");
         }
         std::pair<VersionedModelId, int> container_info =
             container_info_entry->second;