Code review changes.

include/grpc++/server_builder.h

@@ -90,7 +90,7 @@ class ServerBuilder {
     return *this;
   }
 
-  /// For backward compatibility.
+  /// \deprecated For backward compatibility.
   ServerBuilder& SetMaxMessageSize(int max_message_size) {
     return SetMaxReceiveMessageSize(max_message_size);
   }

include/grpc/impl/codegen/grpc_types.h

@@ -128,7 +128,7 @@ typedef struct {
 #define GRPC_ARG_MAX_CONCURRENT_STREAMS "grpc.max_concurrent_streams"
 /** Maximum message length that the channel can receive. Int valued, bytes. */
 #define GRPC_ARG_MAX_RECEIVE_MESSAGE_LENGTH "grpc.max_receive_message_length"
-/** Backward compatibility. */
+/** \deprecated For backward compatibility. */
 #define GRPC_ARG_MAX_MESSAGE_LENGTH GRPC_ARG_MAX_RECEIVE_MESSAGE_LENGTH
 /** Maximum message length that the channel can send. Int valued, bytes. */
 #define GRPC_ARG_MAX_SEND_MESSAGE_LENGTH "grpc.max_send_message_length"

src/core/lib/channel/channel_args.h

@@ -89,12 +89,12 @@ uint32_t grpc_channel_args_compression_algorithm_get_states(
 int grpc_channel_args_compare(const grpc_channel_args *a,
                               const grpc_channel_args *b);
 
-/** Returns the value of \a arg, subject to the contraints in \a options. */
 typedef struct grpc_integer_options {
   int default_value;  // Return this if value is outside of expected bounds.
   int min_value;
   int max_value;
 } grpc_integer_options;
+/** Returns the value of \a arg, subject to the contraints in \a options. */
 int grpc_channel_arg_get_integer(grpc_arg *arg, grpc_integer_options options);
 
 #endif /* GRPC_CORE_LIB_CHANNEL_CHANNEL_ARGS_H */

src/core/lib/channel/message_size_filter.c

@@ -70,17 +70,15 @@ static void recv_message_ready(grpc_exec_ctx* exec_ctx, void* user_data,
       (*calld->recv_message)->length > chand->max_recv_size) {
     char* message_string;
     gpr_asprintf(&message_string,
-                 "Received message larger than max (%lu vs. %lu)",
+                 "Received message larger than max (%u vs. %zu)",
-                 (unsigned long)(*calld->recv_message)->length,
+                 (*calld->recv_message)->length, chand->max_recv_size);
-                 (unsigned long)chand->max_recv_size);
     gpr_slice message = gpr_slice_from_copied_string(message_string);
     gpr_free(message_string);
     grpc_call_element_send_cancel_with_message(
         exec_ctx, elem, GRPC_STATUS_INVALID_ARGUMENT, &message);
   }
   // Invoke the next callback.
-  calld->next_recv_message_ready->cb(
+  grpc_exec_ctx_sched(exec_ctx, calld->next_recv_message_ready, error, NULL);
-      exec_ctx, calld->next_recv_message_ready->cb_arg, error);
 }
 
 // Start transport op.
@@ -93,9 +91,8 @@ static void start_transport_stream_op(grpc_exec_ctx* exec_ctx,
   if (op->send_message != NULL &&
       op->send_message->length > chand->max_send_size) {
     char* message_string;
-    gpr_asprintf(&message_string, "Sent message larger than max (%lu vs. %lu)",
+    gpr_asprintf(&message_string, "Sent message larger than max (%u vs. %zu)",
-                 (unsigned long)op->send_message->length,
+                 op->send_message->length, chand->max_send_size);
-                 (unsigned long)chand->max_send_size);
     gpr_slice message = gpr_slice_from_copied_string(message_string);
     gpr_free(message_string);
     grpc_call_element_send_cancel_with_message(

src/cpp/server/server_builder.cc

@@ -162,10 +162,10 @@ std::unique_ptr<Server> ServerBuilder::BuildAndStart() {
     }
     (*plugin)->UpdateChannelArguments(&args);
   }
-  if (max_receive_message_size_ > 0) {
+  if (max_receive_message_size_ >= 0) {
     args.SetInt(GRPC_ARG_MAX_RECEIVE_MESSAGE_LENGTH, max_receive_message_size_);
   }
-  if (max_send_message_size_ > 0) {
+  if (max_send_message_size_ >= 0) {
     args.SetInt(GRPC_ARG_MAX_SEND_MESSAGE_LENGTH, max_send_message_size_);
   }
   args.SetInt(GRPC_COMPRESSION_CHANNEL_ENABLED_ALGORITHMS_BITSET,

test/core/end2end/tests/max_message_length.c

@@ -105,7 +105,7 @@ static void test_max_message_length(grpc_end2end_test_config config,
   grpc_end2end_test_fixture f;
   grpc_arg channel_arg;
   grpc_channel_args channel_args;
-  grpc_call *c;
+  grpc_call *c = NULL;
   grpc_call *s = NULL;
   cq_verifier *cqv;
   grpc_op ops[6];