all good! missing end2end test for new lr filter

6 files changed, 141 insertions, 92 deletions

diff --git a/src/core/ext/load_reporting/load_reporting.c b/src/core/ext/load_reporting/load_reporting.c
new file mode 100644
index 0000000000..9081ffce15
--- /dev/null
+++ b/src/core/ext/load_reporting/load_reporting.c
@@ -0,0 +1,101 @@
+/*
+ *
+ * Copyright 2016, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include <limits.h>
+#include <string.h>
+
+#include <grpc/support/alloc.h>
+#include <grpc/support/sync.h>
+
+#include "src/core/ext/load_reporting/load_reporting.h"
+#include "src/core/ext/load_reporting/load_reporting_filter.h"
+#include "src/core/lib/channel/channel_stack_builder.h"
+#include "src/core/lib/surface/channel_init.h"
+
+struct grpc_load_reporting_data {
+  grpc_load_reporting_fn fn;
+  void *data;
+};
+
+grpc_load_reporting_data *grpc_load_reporting_create(grpc_load_reporting_fn fn,
+                                                     void *data) {
+  grpc_load_reporting_data *lrd = gpr_malloc(sizeof(grpc_load_reporting_data));
+  lrd->fn = fn;
+  lrd->data = data;
+  return lrd;
+}
+
+void grpc_load_reporting_destroy(grpc_load_reporting_data *lrd) {
+  gpr_free(lrd);
+}
+
+void grpc_load_reporting_call(grpc_load_reporting_data *lrd,
+    const grpc_call_stats *stats) {
+  if (lrd->fn != NULL) {
+    lrd->fn(lrd->data, stats);
+  }
+}
+
+static bool is_load_reporting_enabled(const grpc_channel_args *a) {
+  if (a == NULL) return false;
+  for (size_t i = 0; i < a->num_args; i++) {
+    if (0 == strcmp(a->args[i].key, GRPC_ARG_ENABLE_LOAD_REPORTING)) {
+      return a->args[i].value.pointer.p != NULL;
+    }
+  }
+  return false;
+}
+
+static bool maybe_add_load_reporting_filter(grpc_channel_stack_builder *builder,
+                                            void *arg) {
+  const grpc_channel_args *args =
+      grpc_channel_stack_builder_get_channel_arguments(builder);
+  if (is_load_reporting_enabled(args)) {
+    return grpc_channel_stack_builder_prepend_filter(
+        builder, (const grpc_channel_filter *)arg, NULL, NULL);
+  }
+  return true;
+}
+
+/* Plugin registration */
+
+void grpc_load_reporting_plugin_init(void) {
+  grpc_channel_init_register_stage(GRPC_CLIENT_CHANNEL, INT_MAX,
+                                   maybe_add_load_reporting_filter,
+                                   (void *)&grpc_load_reporting_filter);
+  grpc_channel_init_register_stage(GRPC_SERVER_CHANNEL, INT_MAX,
+                                   maybe_add_load_reporting_filter,
+                                   (void *)&grpc_load_reporting_filter);
+}
+
+void grpc_load_reporting_plugin_shutdown() {}
diff --git a/src/core/lib/load_reporting/load_reporting.h b/src/core/ext/load_reporting/load_reporting.h
index afc9090d0c..fcf555da85 100644
--- a/src/core/lib/load_reporting/load_reporting.h
+++ b/src/core/ext/load_reporting/load_reporting.h
@@ -31,35 +31,34 @@
  *
  */
 
-#ifndef GRPC_CORE_LIB_LOAD_REPORTING_LOAD_REPORTING_H
-#define GRPC_CORE_LIB_LOAD_REPORTING_LOAD_REPORTING_H
+#ifndef GRPC_CORE_EXT_LOAD_REPORTING_LOAD_REPORTING_H
+#define GRPC_CORE_EXT_LOAD_REPORTING_LOAD_REPORTING_H
 
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/surface/call.h"
 
+typedef struct grpc_load_reporting_data grpc_load_reporting_data;
+
 /** Custom function to be called by the load reporting filter.
  *
  * The \a data pointer is the same as the one passed to \a
  * grpc_load_reporting_init. \a stats are the final per-call statistics gathered
  * by the gRPC runtime. */
-typedef void (*load_reporting_fn)(void *data, const grpc_call_stats *stats);
+typedef void (*grpc_load_reporting_fn)(void *data,
+                                       const grpc_call_stats *stats);
 
 /** Register \a fn as the function to be invoked by the load reporting filter,
  * passing \a data as its namesake argument. To be called only from a plugin
  * init function. */
-void grpc_load_reporting_init(load_reporting_fn fn, void *data);
+grpc_load_reporting_data *grpc_load_reporting_create(grpc_load_reporting_fn fn,
+                                                     void *data);
 
-/** Takes care of freeing the memory allocated for \a data (see \a
- * grpc_load_reporting_init), if any. To be called only from a plugin destroy
- * function. */
-void grpc_load_reporting_destroy();
+// XXX
+void grpc_load_reporting_destroy(grpc_load_reporting_data *lrd);
 
 /** Invoke the function registered by \a grpc_load_reporting_init, passing it \a
  * stats as one of the arguments (see \a load_reporting_fn). */
-void grpc_load_reporting_call(const grpc_call_stats *stats);
-
-/** Returns the custom load reporting data, as registered in \a
- * grpc_load_reporting_init. */
-void *grpc_load_reporting_data();
+void grpc_load_reporting_call(grpc_load_reporting_data *lrd,
+                              const grpc_call_stats *stats);
 
-#endif /* GRPC_CORE_LIB_LOAD_REPORTING_LOAD_REPORTING_H */
+#endif /* GRPC_CORE_EXT_LOAD_REPORTING_LOAD_REPORTING_H */
diff --git a/src/core/ext/load_reporting/load_reporting_filter.c b/src/core/ext/load_reporting/load_reporting_filter.c
index fc62a4dd0a..31d38251b9 100644
--- a/src/core/ext/load_reporting/load_reporting_filter.c
+++ b/src/core/ext/load_reporting/load_reporting_filter.c
@@ -31,15 +31,16 @@
  *
  */
 
+#include <string.h>
 #include <grpc/support/log.h>
 
+#include "src/core/ext/load_reporting/load_reporting.h"
 #include "src/core/ext/load_reporting/load_reporting_filter.h"
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/load_reporting/load_reporting.h"
 #include "src/core/lib/profiling/timers.h"
 
 typedef struct call_data { void *dummy; } call_data;
-typedef struct channel_data { void *dummy; } channel_data;
+typedef struct channel_data { grpc_load_reporting_data *lrd; } channel_data;
 
 /* Constructor for call_data */
 static void init_call_elem(grpc_exec_ctx *exec_ctx, grpc_call_element *elem,
@@ -48,8 +49,9 @@ static void init_call_elem(grpc_exec_ctx *exec_ctx, grpc_call_element *elem,
 /* Destructor for call_data */
 static void destroy_call_elem(grpc_exec_ctx *exec_ctx, grpc_call_element *elem,
                               const grpc_call_stats *stats) {
+  channel_data *chand = elem->channel_data;
   GPR_TIMER_BEGIN("load_reporting_filter", 0);
-  grpc_load_reporting_call(stats);
+  grpc_load_reporting_call(chand->lrd, stats);
   GPR_TIMER_END("load_reporting_filter", 0);
 }
 
@@ -58,11 +60,26 @@ static void init_channel_elem(grpc_exec_ctx *exec_ctx,
                               grpc_channel_element *elem,
                               grpc_channel_element_args *args) {
   GPR_ASSERT(!args->is_last);
+
+  channel_data *chand = elem->channel_data;
+  memset(chand, 0, sizeof(channel_data));
+
+  for (size_t i = 0; i < args->channel_args->num_args; i++) {
+    if (0 == strcmp(args->channel_args->args[i].key, GRPC_ARG_ENABLE_LOAD_REPORTING)) {
+      chand->lrd = args->channel_args->args[i].value.pointer.p;
+      GPR_ASSERT(chand->lrd != NULL);
+    }
+  }
+  GPR_ASSERT(chand->lrd != NULL); /* arg actually found */
+
 }
 
 /* Destructor for channel data */
 static void destroy_channel_elem(grpc_exec_ctx *exec_ctx,
-                                 grpc_channel_element *elem) {}
+                                 grpc_channel_element *elem) {
+  channel_data *chand = elem->channel_data;
+  grpc_load_reporting_destroy(chand->lrd);
+}
 
 const grpc_channel_filter grpc_load_reporting_filter = {
     grpc_call_next_op,
diff --git a/src/core/lib/load_reporting/load_reporting.c b/src/core/lib/load_reporting/load_reporting.c
deleted file mode 100644
index dbb1ba5c63..0000000000
--- a/src/core/lib/load_reporting/load_reporting.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- *
- * Copyright 2016, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/sync.h>
-
-#include "src/core/lib/load_reporting/load_reporting.h"
-
-typedef struct load_reporting {
-  gpr_mu mu;
-  load_reporting_fn fn;
-  void *data;
-} load_reporting;
-
-static load_reporting g_load_reporting;
-
-void grpc_load_reporting_init(load_reporting_fn fn, void *data) {
-  gpr_mu_init(&g_load_reporting.mu);
-  g_load_reporting.fn = fn;
-  g_load_reporting.data = data;
-}
-
-void grpc_load_reporting_destroy() {
-  gpr_free(g_load_reporting.data);
-  g_load_reporting.data = NULL;
-  gpr_mu_destroy(&g_load_reporting.mu);
-}
-
-void grpc_load_reporting_call(const grpc_call_stats *stats) {
-  if (g_load_reporting.fn != NULL) {
-    gpr_mu_lock(&g_load_reporting.mu);
-    g_load_reporting.fn(g_load_reporting.data, stats);
-    gpr_mu_unlock(&g_load_reporting.mu);
-  }
-}
-
-void *grpc_load_reporting_data() {
-  gpr_mu_lock(&g_load_reporting.mu);
-  void *data = g_load_reporting.data;
-  gpr_mu_unlock(&g_load_reporting.mu);
-  return data;
-}
diff --git a/src/core/plugin_registry/grpc_plugin_registry.c b/src/core/plugin_registry/grpc_plugin_registry.c
index 822aa6d8b7..905cd59e23 100644
--- a/src/core/plugin_registry/grpc_plugin_registry.c
+++ b/src/core/plugin_registry/grpc_plugin_registry.c
@@ -45,6 +45,8 @@ extern void grpc_resolver_dns_native_init(void);
 extern void grpc_resolver_dns_native_shutdown(void);
 extern void grpc_resolver_sockaddr_init(void);
 extern void grpc_resolver_sockaddr_shutdown(void);
+extern void grpc_load_reporting_plugin_init(void);
+extern void grpc_load_reporting_plugin_shutdown(void);
 extern void census_grpc_plugin_init(void);
 extern void census_grpc_plugin_shutdown(void);
 
@@ -61,6 +63,8 @@ void grpc_register_built_in_plugins(void) {
                        grpc_resolver_dns_native_shutdown);
   grpc_register_plugin(grpc_resolver_sockaddr_init,
                        grpc_resolver_sockaddr_shutdown);
+  grpc_register_plugin(grpc_load_reporting_plugin_init,
+                       grpc_load_reporting_plugin_shutdown);
   grpc_register_plugin(census_grpc_plugin_init,
                        census_grpc_plugin_shutdown);
 }
diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py
index 3f7f96501a..385211b339 100644
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@@ -75,7 +75,6 @@ CORE_SOURCE_FILES = [
   'src/core/lib/support/tmpfile_win32.c',
   'src/core/lib/support/wrap_memcpy.c',
   'src/core/lib/surface/init.c',
-  'src/core/ext/load_reporting/load_reporting_filter.c',
   'src/core/lib/channel/channel_args.c',
   'src/core/lib/channel/channel_stack.c',
   'src/core/lib/channel/channel_stack_builder.c',
@@ -132,7 +131,6 @@ CORE_SOURCE_FILES = [
   'src/core/lib/json/json_reader.c',
   'src/core/lib/json/json_string.c',
   'src/core/lib/json/json_writer.c',
-  'src/core/lib/load_reporting/load_reporting.c',
   'src/core/lib/surface/alarm.c',
   'src/core/lib/surface/api_trace.c',
   'src/core/lib/surface/byte_buffer.c',
@@ -231,6 +229,8 @@ CORE_SOURCE_FILES = [
   'src/core/ext/lb_policy/round_robin/round_robin.c',
   'src/core/ext/resolver/dns/native/dns_resolver.c',
   'src/core/ext/resolver/sockaddr/sockaddr_resolver.c',
+  'src/core/ext/load_reporting/load_reporting.c',
+  'src/core/ext/load_reporting/load_reporting_filter.c',
   'src/core/ext/census/context.c',
   'src/core/ext/census/grpc_context.c',
   'src/core/ext/census/grpc_filter.c',