Merge branch 'one-read' of github.com:ctiller/grpc into one-read

Conflicts:
	src/core/iomgr/tcp_posix.c
	src/core/profiling/basic_timers.c

3 files changed, 5 insertions, 10 deletions

diff --git a/src/core/iomgr/tcp_posix.c b/src/core/iomgr/tcp_posix.c
index ccd7833aa4..6b21bcf6a9 100644
--- a/src/core/iomgr/tcp_posix.c
+++ b/src/core/iomgr/tcp_posix.c
@@ -375,7 +375,7 @@ static void grpc_tcp_continue_read(grpc_tcp *tcp) {
         slice_state_destroy(&read_state);
         grpc_tcp_unref(tcp);
       } else {
-        /* Spurious read event, consume it here */
+        /* We've consumed the edge, request a new one */
         slice_state_destroy(&read_state);
         grpc_fd_notify_on_read(tcp->em_fd, &tcp->read_closure);
       }
diff --git a/src/core/profiling/basic_timers.c b/src/core/profiling/basic_timers.c
index b36f4d3902..d89bba7b87 100644
--- a/src/core/profiling/basic_timers.c
+++ b/src/core/profiling/basic_timers.c
@@ -89,13 +89,8 @@ static void log_report_locked(grpc_timers_log* log) {
     grpc_timer_entry* entry = &(log->log[i]);
     fprintf(fp, "GRPC_LAT_PROF ");
     grpc_precise_clock_print(&entry->tm, fp);
-<<<<<<< HEAD:src/core/profiling/timers.c
-    fprintf(fp, " %p %s %p %s %d\n", (void*)(gpr_intptr)entry->thd, entry->tag, entry->id, entry->file,
-            entry->line);
-=======
     fprintf(fp, " %p %d %p %s %d\n", (void*)(gpr_intptr)entry->thd, entry->tag,
             entry->id, entry->file, entry->line);
->>>>>>> 5ae895a5d06fad59a89ce6e8923b1145dea663bd:src/core/profiling/basic_timers.c
   }
 
   /* Now clear out the log */
diff --git a/src/core/transport/chttp2_transport.c b/src/core/transport/chttp2_transport.c
index 5807c62f53..97e6bae4bb 100644
--- a/src/core/transport/chttp2_transport.c
+++ b/src/core/transport/chttp2_transport.c
@@ -916,8 +916,8 @@ static int prepare_write(transport *t) {
     window_delta = grpc_chttp2_preencode(
         s->outgoing_sopb->ops, &s->outgoing_sopb->nops,
         GPR_MIN(t->outgoing_window, s->outgoing_window), &s->writing_sopb);
-    FLOWCTL_TRACE(t, t, outgoing, 0, -window_delta);
-    FLOWCTL_TRACE(t, s, outgoing, s->id, -window_delta);
+    FLOWCTL_TRACE(t, t, outgoing, 0, -(gpr_int64)window_delta);
+    FLOWCTL_TRACE(t, s, outgoing, s->id, -(gpr_int64)window_delta);
     t->outgoing_window -= window_delta;
     s->outgoing_window -= window_delta;
 
@@ -1283,8 +1283,8 @@ static grpc_chttp2_parse_error update_incoming_window(transport *t, stream *s) {
     return GRPC_CHTTP2_CONNECTION_ERROR;
   }
 
-  FLOWCTL_TRACE(t, t, incoming, 0, -t->incoming_frame_size);
-  FLOWCTL_TRACE(t, s, incoming, s->id, -t->incoming_frame_size);
+  FLOWCTL_TRACE(t, t, incoming, 0, -(gpr_int64)t->incoming_frame_size);
+  FLOWCTL_TRACE(t, s, incoming, s->id, -(gpr_int64)t->incoming_frame_size);
   t->incoming_window -= t->incoming_frame_size;
   s->incoming_window -= t->incoming_frame_size;