Merge master

reviewable/pr13058/r1
Yash Tibrewal 7 years ago
commit b1ee138ce6
  1. 28
      build.yaml
  2. 16
      doc/connectivity-semantics-and-api.md
  3. 9
      src/core/ext/filters/client_channel/backup_poller.cc
  4. 4
      src/core/ext/filters/client_channel/uri_parser.cc
  5. 31
      src/core/ext/transport/chttp2/transport/chttp2_transport.cc
  6. 12
      src/core/ext/transport/chttp2/transport/internal.h
  7. 6
      src/core/ext/transport/chttp2/transport/parsing.cc
  8. 37
      src/core/lib/iomgr/ev_epoll1_linux.cc
  9. 36
      src/core/lib/iomgr/ev_epollex_linux.cc
  10. 38
      src/core/lib/iomgr/ev_epollsig_linux.cc
  11. 1
      src/core/lib/iomgr/ev_poll_posix.cc
  12. 4
      src/core/lib/iomgr/ev_posix.cc
  13. 127
      src/core/lib/iomgr/lockfree_event.cc
  14. 42
      src/core/lib/iomgr/lockfree_event.h
  15. 20
      src/core/lib/iomgr/pollset_uv.cc
  16. 10
      test/core/end2end/data/client_certs.cc
  17. 4
      test/core/end2end/data/server1_cert.cc
  18. 4
      test/core/end2end/data/server1_key.cc
  19. 4
      test/core/end2end/data/test_root_cert.cc
  20. 2
      test/core/support/cpu_test.cc
  21. 88
      tools/dockerfile/grpc_artifact_linux_x64/Dockerfile
  22. 73
      tools/dockerfile/grpc_artifact_linux_x86/Dockerfile
  23. 56
      tools/run_tests/generated/tests.json

@ -3475,8 +3475,6 @@ targets:
- grpc_unsecure
- gpr_test_util
- gpr
args:
- --benchmark_min_time=0
benchmark: true
defaults: benchmark
platforms:
@ -3498,8 +3496,6 @@ targets:
- grpc_unsecure
- gpr_test_util
- gpr
args:
- --benchmark_min_time=0
benchmark: true
defaults: benchmark
platforms:
@ -3521,8 +3517,6 @@ targets:
- grpc_unsecure
- gpr_test_util
- gpr
args:
- --benchmark_min_time=0
benchmark: true
defaults: benchmark
platforms:
@ -3544,8 +3538,6 @@ targets:
- grpc_unsecure
- gpr_test_util
- gpr
args:
- --benchmark_min_time=0
benchmark: true
defaults: benchmark
platforms:
@ -3566,8 +3558,6 @@ targets:
- grpc_unsecure
- gpr_test_util
- gpr
args:
- --benchmark_min_time=0
benchmark: true
defaults: benchmark
platforms:
@ -3588,8 +3578,6 @@ targets:
- grpc_unsecure
- gpr_test_util
- gpr
args:
- --benchmark_min_time=0
benchmark: true
defaults: benchmark
platforms:
@ -3610,8 +3598,6 @@ targets:
- grpc_unsecure
- gpr_test_util
- gpr
args:
- --benchmark_min_time=4
benchmark: true
defaults: benchmark
platforms:
@ -3632,8 +3618,6 @@ targets:
- grpc_unsecure
- gpr_test_util
- gpr
args:
- --benchmark_min_time=0
benchmark: true
defaults: benchmark
platforms:
@ -3657,8 +3641,6 @@ targets:
- grpc_unsecure
- gpr_test_util
- gpr
args:
- --benchmark_min_time=0
benchmark: true
defaults: benchmark
excluded_poll_engines:
@ -3685,8 +3667,6 @@ targets:
- grpc_unsecure
- gpr_test_util
- gpr
args:
- --benchmark_min_time=0
benchmark: true
defaults: benchmark
excluded_poll_engines:
@ -3712,8 +3692,6 @@ targets:
- gpr_test_util
- gpr
- grpc++_test_config
args:
- --benchmark_min_time=0
benchmark: true
defaults: benchmark
exclude_configs:
@ -3742,8 +3720,6 @@ targets:
- grpc_unsecure
- gpr_test_util
- gpr
args:
- --benchmark_min_time=0
benchmark: true
defaults: benchmark
excluded_poll_engines:
@ -3768,8 +3744,6 @@ targets:
- grpc_unsecure
- gpr_test_util
- gpr
args:
- --benchmark_min_time=0
benchmark: true
defaults: benchmark
platforms:
@ -3791,8 +3765,6 @@ targets:
- grpc_unsecure
- gpr_test_util
- gpr
args:
- --benchmark_min_time=0
benchmark: true
defaults: benchmark
platforms:

@ -115,8 +115,14 @@ Channel State API
-----------------
All gRPC libraries will expose a channel-level API method to poll the current
state of a channel. In C++, this method is called GetCurrentState and returns
an enum for one of the five legal states.
state of a channel. In C++, this method is called GetState and returns an enum
for one of the five legal states. It also accepts a boolean `try_to_connect` to
transition to CONNECTING if the channel is currently IDLE. The boolean should
act as if an RPC occurred, so it should also reset IDLE_TIMEOUT.
```cpp
grpc_connectivity_state GetState(bool try_to_connect);
```
All libraries should also expose an API that enables the application (user of
the gRPC API) to be notified when the channel state changes. Since state
@ -127,11 +133,11 @@ the user to poll the channel for the current state.
The synchronous version of this API is:
```cpp
bool WaitForStateChange(gpr_timespec deadline, ChannelState source_state);
bool WaitForStateChange(grpc_connectivity_state source_state, gpr_timespec deadline);
```
which returns true when the state changes to something other than the
source_state and false if the deadline expires. Asynchronous and futures based
which returns `true` when the state is something other than the
`source_state` and `false` if the deadline expires. Asynchronous- and futures-based
APIs should have a corresponding method that allows the application to be
notified when the state of a channel changes.

@ -140,9 +140,16 @@ void grpc_client_channel_start_backup_polling(
grpc_exec_ctx_now() + g_poll_interval_ms,
&g_poller->run_poller_closure);
}
gpr_ref(&g_poller->refs);
/* Get a reference to g_poller->pollset before releasing g_poller_mu to make
* TSAN happy. Otherwise, reading from g_poller (i.e g_poller->pollset) after
* releasing the lock and setting g_poller to NULL in g_poller_unref() is
* being flagged as a data-race by TSAN */
grpc_pollset* pollset = g_poller->pollset;
gpr_mu_unlock(&g_poller_mu);
grpc_pollset_set_add_pollset(interested_parties, g_poller->pollset);
grpc_pollset_set_add_pollset(interested_parties, pollset);
}
void grpc_client_channel_stop_backup_polling(

@ -59,7 +59,9 @@ static grpc_uri* bad_uri(const char* uri_text, size_t pos, const char* section,
static char* decode_and_copy_component(const char* src, size_t begin,
size_t end) {
grpc_slice component =
grpc_slice_from_copied_buffer(src + begin, end - begin);
(begin == NOT_SET || end == NOT_SET)
? grpc_empty_slice()
: grpc_slice_from_copied_buffer(src + begin, end - begin);
grpc_slice decoded_component =
grpc_permissive_percent_decode_slice(component);
char* out = grpc_dump_slice(decoded_component, GPR_DUMP_ASCII);

@ -177,6 +177,8 @@ static void destruct_transport(grpc_chttp2_transport* t) {
GPR_ASSERT(t->lists[i].tail == NULL);
}
GRPC_ERROR_UNREF(t->goaway_error);
GPR_ASSERT(grpc_chttp2_stream_map_size(&t->stream_map) == 0);
grpc_chttp2_stream_map_destroy(&t->stream_map);
@ -289,6 +291,7 @@ static void init_transport(grpc_chttp2_transport* t,
keepalive_watchdog_fired_locked, t,
grpc_combiner_scheduler(t->combiner));
t->goaway_error = GRPC_ERROR_NONE;
grpc_chttp2_goaway_parser_init(&t->goaway_parser);
grpc_chttp2_hpack_parser_init(&t->hpack_parser);
@ -1059,7 +1062,16 @@ void grpc_chttp2_add_incoming_goaway(grpc_chttp2_transport* t,
grpc_slice goaway_text) {
// GRPC_CHTTP2_IF_TRACING(
// gpr_log(GPR_DEBUG, "got goaway [%d]: %s", goaway_error, msg));
t->seen_goaway = 1;
// Discard the error from a previous goaway frame (if any)
if (t->goaway_error != GRPC_ERROR_NONE) {
GRPC_ERROR_UNREF(t->goaway_error);
}
t->goaway_error = grpc_error_set_str(
grpc_error_set_int(
GRPC_ERROR_CREATE_FROM_STATIC_STRING("GOAWAY received"),
GRPC_ERROR_INT_HTTP2_ERROR, (intptr_t)goaway_error),
GRPC_ERROR_STR_RAW_BYTES, goaway_text);
/* When a client receives a GOAWAY with error code ENHANCE_YOUR_CALM and debug
* data equal to "too_many_pings", it should log the occurrence at a log level
@ -1080,14 +1092,8 @@ void grpc_chttp2_add_incoming_goaway(grpc_chttp2_transport* t,
/* lie: use transient failure from the transport to indicate goaway has been
* received */
connectivity_state_set(
t, GRPC_CHANNEL_TRANSIENT_FAILURE,
grpc_error_set_str(
grpc_error_set_int(
GRPC_ERROR_CREATE_FROM_STATIC_STRING("GOAWAY received"),
GRPC_ERROR_INT_HTTP2_ERROR, (intptr_t)goaway_error),
GRPC_ERROR_STR_RAW_BYTES, goaway_text),
"got_goaway");
connectivity_state_set(t, GRPC_CHANNEL_TRANSIENT_FAILURE,
GRPC_ERROR_REF(t->goaway_error), "got_goaway");
}
static void maybe_start_some_streams(grpc_chttp2_transport* t) {
@ -1976,7 +1982,6 @@ void grpc_chttp2_fake_status(grpc_chttp2_transport* t, grpc_chttp2_stream* s,
grpc_status_code status;
grpc_slice slice;
grpc_error_get_status(error, s->deadline, &status, &slice, NULL);
if (status != GRPC_STATUS_OK) {
s->seen_error = true;
}
@ -2427,6 +2432,12 @@ static void read_action_locked(void* tp, grpc_error* error) {
"Transport closed", &t->closed_with_error, 1);
}
if (error != GRPC_ERROR_NONE) {
/* If a goaway frame was received, this might be the reason why the read
* failed. Add this info to the error */
if (t->goaway_error != GRPC_ERROR_NONE) {
error = grpc_error_add_child(error, GRPC_ERROR_REF(t->goaway_error));
}
close_transport_locked(t, GRPC_ERROR_REF(error));
t->endpoint_reading = 0;
} else if (t->closed_with_error == GRPC_ERROR_NONE) {

@ -306,9 +306,10 @@ struct grpc_chttp2_transport {
*/
uint32_t write_buffer_size;
/** have we seen a goaway */
bool seen_goaway;
/** have we sent a goaway */
/** Set to a grpc_error object if a goaway frame is received. By default, set
* to GRPC_ERROR_NONE */
grpc_error* goaway_error;
grpc_chttp2_sent_goaway_state sent_goaway_state;
/** are the local settings dirty and need to be sent? */
@ -375,11 +376,6 @@ struct grpc_chttp2_transport {
grpc_error* (*parser)(void* parser_user_data, grpc_chttp2_transport* t,
grpc_chttp2_stream* s, grpc_slice slice, int is_last);
/* goaway data */
grpc_status_code goaway_error;
uint32_t goaway_last_stream_index;
grpc_slice goaway_text;
grpc_chttp2_write_cb* write_cb_pool;
/* bdp estimator */

@ -569,7 +569,11 @@ static grpc_error* init_header_frame_parser(grpc_chttp2_transport* t,
GRPC_CHTTP2_IF_TRACING(gpr_log(
GPR_ERROR, "ignoring new grpc_chttp2_stream creation on client"));
}
return init_skip_frame_parser(t, 1);
grpc_error* err = init_skip_frame_parser(t, 1);
if (t->incoming_frame_flags & GRPC_CHTTP2_FLAG_HAS_PRIORITY) {
grpc_chttp2_hpack_parser_set_has_priority(&t->hpack_parser);
}
return err;
} else if (t->last_new_stream_id >= t->incoming_stream_id) {
GRPC_CHTTP2_IF_TRACING(gpr_log(
GPR_ERROR,

@ -18,6 +18,8 @@
#include "src/core/lib/iomgr/port.h"
#include <grpc/support/log.h>
/* This polling engine is only relevant on linux kernels supporting epoll() */
#ifdef GRPC_LINUX_EPOLL
#include "src/core/lib/iomgr/ev_epoll1_linux.h"
@ -34,7 +36,6 @@
#include <grpc/support/alloc.h>
#include <grpc/support/cpu.h>
#include <grpc/support/log.h>
#include <grpc/support/string_util.h>
#include <grpc/support/tls.h>
#include <grpc/support/useful.h>
@ -46,6 +47,7 @@
#include "src/core/lib/iomgr/lockfree_event.h"
#include "src/core/lib/iomgr/wakeup_fd_posix.h"
#include "src/core/lib/profiling/timers.h"
#include "src/core/lib/support/manual_constructor.h"
#include "src/core/lib/support/string.h"
static grpc_wakeup_fd global_wakeup_fd;
@ -111,8 +113,8 @@ static void epoll_set_shutdown() {
struct grpc_fd {
int fd;
gpr_atm read_closure;
gpr_atm write_closure;
grpc_core::ManualConstructor<grpc_core::LockfreeEvent> read_closure;
grpc_core::ManualConstructor<grpc_core::LockfreeEvent> write_closure;
struct grpc_fd* freelist_next;
@ -264,8 +266,8 @@ static grpc_fd* fd_create(int fd, const char* name) {
}
new_fd->fd = fd;
grpc_lfev_init(&new_fd->read_closure);
grpc_lfev_init(&new_fd->write_closure);
new_fd->read_closure.Init();
new_fd->write_closure.Init();
gpr_atm_no_barrier_store(&new_fd->read_notifier_pollset, (gpr_atm)NULL);
new_fd->freelist_next = NULL;
@ -297,11 +299,11 @@ static int fd_wrapped_fd(grpc_fd* fd) { return fd->fd; }
* shutdown() syscall on that fd) */
static void fd_shutdown_internal(grpc_fd* fd, grpc_error* why,
bool releasing_fd) {
if (grpc_lfev_set_shutdown(&fd->read_closure, GRPC_ERROR_REF(why))) {
if (fd->read_closure->SetShutdown(GRPC_ERROR_REF(why))) {
if (!releasing_fd) {
shutdown(fd->fd, SHUT_RDWR);
}
grpc_lfev_set_shutdown(&fd->write_closure, GRPC_ERROR_REF(why));
fd->write_closure->SetShutdown(GRPC_ERROR_REF(why));
}
GRPC_ERROR_UNREF(why);
}
@ -316,7 +318,7 @@ static void fd_orphan(grpc_fd* fd, grpc_closure* on_done, int* release_fd,
grpc_error* error = GRPC_ERROR_NONE;
bool is_release_fd = (release_fd != NULL);
if (!grpc_lfev_is_shutdown(&fd->read_closure)) {
if (!fd->read_closure->IsShutdown()) {
fd_shutdown_internal(fd, GRPC_ERROR_CREATE_FROM_COPIED_STRING(reason),
is_release_fd);
}
@ -332,8 +334,8 @@ static void fd_orphan(grpc_fd* fd, grpc_closure* on_done, int* release_fd,
GRPC_CLOSURE_SCHED(on_done, GRPC_ERROR_REF(error));
grpc_iomgr_unregister_object(&fd->iomgr_object);
grpc_lfev_destroy(&fd->read_closure);
grpc_lfev_destroy(&fd->write_closure);
fd->read_closure.Destroy();
fd->write_closure.Destroy();
gpr_mu_lock(&fd_freelist_mu);
fd->freelist_next = fd_freelist;
@ -347,26 +349,24 @@ static grpc_pollset* fd_get_read_notifier_pollset(grpc_fd* fd) {
}
static bool fd_is_shutdown(grpc_fd* fd) {
return grpc_lfev_is_shutdown(&fd->read_closure);
return fd->read_closure->IsShutdown();
}
static void fd_notify_on_read(grpc_fd* fd, grpc_closure* closure) {
grpc_lfev_notify_on(&fd->read_closure, closure, "read");
fd->read_closure->NotifyOn(closure);
}
static void fd_notify_on_write(grpc_fd* fd, grpc_closure* closure) {
grpc_lfev_notify_on(&fd->write_closure, closure, "write");
fd->write_closure->NotifyOn(closure);
}
static void fd_become_readable(grpc_fd* fd, grpc_pollset* notifier) {
grpc_lfev_set_ready(&fd->read_closure, "read");
fd->read_closure->SetReady();
/* Use release store to match with acquire load in fd_get_read_notifier */
gpr_atm_rel_store(&fd->read_notifier_pollset, (gpr_atm)notifier);
}
static void fd_become_writable(grpc_fd* fd) {
grpc_lfev_set_ready(&fd->write_closure, "write");
}
static void fd_become_writable(grpc_fd* fd) { fd->write_closure->SetReady(); }
/*******************************************************************************
* Pollset Definitions
@ -1205,6 +1205,7 @@ static const grpc_event_engine_vtable vtable = {
* support is available */
const grpc_event_engine_vtable* grpc_init_epoll1_linux(bool explicit_request) {
if (!grpc_has_wakeup_fd()) {
gpr_log(GPR_ERROR, "Skipping epoll1 because of no wakeup fd.");
return NULL;
}
@ -1229,6 +1230,8 @@ const grpc_event_engine_vtable* grpc_init_epoll1_linux(bool explicit_request) {
/* If GRPC_LINUX_EPOLL is not defined, it means epoll is not available. Return
* NULL */
const grpc_event_engine_vtable* grpc_init_epoll1_linux(bool explicit_request) {
gpr_log(GPR_ERROR,
"Skipping epoll1 becuase GRPC_LINUX_EPOLL is not defined.");
return NULL;
}
#endif /* defined(GRPC_POSIX_SOCKET) */

@ -18,6 +18,8 @@
#include "src/core/lib/iomgr/port.h"
#include <grpc/support/log.h>
/* This polling engine is only relevant on linux kernels supporting epoll() */
#ifdef GRPC_LINUX_EPOLL
@ -34,7 +36,6 @@
#include <unistd.h>
#include <grpc/support/alloc.h>
#include <grpc/support/log.h>
#include <grpc/support/string_util.h>
#include <grpc/support/tls.h>
#include <grpc/support/useful.h>
@ -48,6 +49,7 @@
#include "src/core/lib/iomgr/timer.h"
#include "src/core/lib/iomgr/wakeup_fd_posix.h"
#include "src/core/lib/profiling/timers.h"
#include "src/core/lib/support/manual_constructor.h"
#include "src/core/lib/support/spinlock.h"
// debug aid: create workers on the heap (allows asan to spot
@ -153,8 +155,8 @@ struct grpc_fd {
gpr_mu pollable_mu;
pollable* pollable_obj;
gpr_atm read_closure;
gpr_atm write_closure;
grpc_core::ManualConstructor<grpc_core::LockfreeEvent> read_closure;
grpc_core::ManualConstructor<grpc_core::LockfreeEvent> write_closure;
struct grpc_fd* freelist_next;
grpc_closure* on_done_closure;
@ -285,8 +287,8 @@ static void fd_destroy(void* arg, grpc_error* error) {
fd->freelist_next = fd_freelist;
fd_freelist = fd;
grpc_lfev_destroy(&fd->read_closure);
grpc_lfev_destroy(&fd->write_closure);
fd->read_closure.Destroy();
fd->write_closure.Destroy();
gpr_mu_unlock(&fd_freelist_mu);
}
@ -345,8 +347,8 @@ static grpc_fd* fd_create(int fd, const char* name) {
new_fd->pollable_obj = NULL;
gpr_atm_rel_store(&new_fd->refst, (gpr_atm)1);
new_fd->fd = fd;
grpc_lfev_init(&new_fd->read_closure);
grpc_lfev_init(&new_fd->write_closure);
new_fd->read_closure.Init();
new_fd->write_closure.Init();
gpr_atm_no_barrier_store(&new_fd->read_notifier_pollset, (gpr_atm)NULL);
new_fd->freelist_next = NULL;
@ -407,24 +409,24 @@ static grpc_pollset* fd_get_read_notifier_pollset(grpc_fd* fd) {
}
static bool fd_is_shutdown(grpc_fd* fd) {
return grpc_lfev_is_shutdown(&fd->read_closure);
return fd->read_closure->IsShutdown();
}
/* Might be called multiple times */
static void fd_shutdown(grpc_fd* fd, grpc_error* why) {
if (grpc_lfev_set_shutdown(&fd->read_closure, GRPC_ERROR_REF(why))) {
if (fd->read_closure->SetShutdown(GRPC_ERROR_REF(why))) {
shutdown(fd->fd, SHUT_RDWR);
grpc_lfev_set_shutdown(&fd->write_closure, GRPC_ERROR_REF(why));
fd->write_closure->SetShutdown(GRPC_ERROR_REF(why));
}
GRPC_ERROR_UNREF(why);
}
static void fd_notify_on_read(grpc_fd* fd, grpc_closure* closure) {
grpc_lfev_notify_on(&fd->read_closure, closure, "read");
fd->read_closure->NotifyOn(closure);
}
static void fd_notify_on_write(grpc_fd* fd, grpc_closure* closure) {
grpc_lfev_notify_on(&fd->write_closure, closure, "write");
fd->write_closure->NotifyOn(closure);
}
/*******************************************************************************
@ -690,7 +692,7 @@ static int poll_deadline_to_millis_timeout(grpc_millis millis) {
}
static void fd_become_readable(grpc_fd* fd, grpc_pollset* notifier) {
grpc_lfev_set_ready(&fd->read_closure, "read");
fd->read_closure->SetReady();
/* Note, it is possible that fd_become_readable might be called twice with
different 'notifier's when an fd becomes readable and it is in two epoll
@ -701,9 +703,7 @@ static void fd_become_readable(grpc_fd* fd, grpc_pollset* notifier) {
gpr_atm_rel_store(&fd->read_notifier_pollset, (gpr_atm)notifier);
}
static void fd_become_writable(grpc_fd* fd) {
grpc_lfev_set_ready(&fd->write_closure, "write");
}
static void fd_become_writable(grpc_fd* fd) { fd->write_closure->SetReady(); }
static grpc_error* fd_get_or_become_pollable(grpc_fd* fd, pollable** p) {
gpr_mu_lock(&fd->pollable_mu);
@ -1422,10 +1422,12 @@ const grpc_event_engine_vtable* grpc_init_epollex_linux(
}
if (!grpc_has_wakeup_fd()) {
gpr_log(GPR_ERROR, "Skipping epollex because of no wakeup fd.");
return NULL;
}
if (!grpc_is_epollexclusive_available()) {
gpr_log(GPR_INFO, "Skipping epollex because it is not supported.");
return NULL;
}
@ -1451,6 +1453,8 @@ const grpc_event_engine_vtable* grpc_init_epollex_linux(
* NULL */
const grpc_event_engine_vtable* grpc_init_epollex_linux(
bool explicitly_requested) {
gpr_log(GPR_ERROR,
"Skipping epollex becuase GRPC_LINUX_EPOLL is not defined.");
return NULL;
}
#endif /* defined(GRPC_POSIX_SOCKET) */

@ -19,6 +19,7 @@
#include "src/core/lib/iomgr/port.h"
#include <grpc/grpc_posix.h>
#include <grpc/support/log.h>
/* This polling engine is only relevant on linux kernels supporting epoll() */
#ifdef GRPC_LINUX_EPOLL
@ -37,7 +38,6 @@
#include <unistd.h>
#include <grpc/support/alloc.h>
#include <grpc/support/log.h>
#include <grpc/support/string_util.h>
#include <grpc/support/tls.h>
#include <grpc/support/useful.h>
@ -50,6 +50,7 @@
#include "src/core/lib/iomgr/timer.h"
#include "src/core/lib/iomgr/wakeup_fd_posix.h"
#include "src/core/lib/profiling/timers.h"
#include "src/core/lib/support/manual_constructor.h"
#define GRPC_POLLSET_KICK_BROADCAST ((grpc_pollset_worker*)1)
@ -127,8 +128,8 @@ struct grpc_fd {
valid */
bool orphaned;
gpr_atm read_closure;
gpr_atm write_closure;
grpc_core::ManualConstructor<grpc_core::LockfreeEvent> read_closure;
grpc_core::ManualConstructor<grpc_core::LockfreeEvent> write_closure;
struct grpc_fd* freelist_next;
grpc_closure* on_done_closure;
@ -764,8 +765,8 @@ static void unref_by(grpc_fd* fd, int n) {
fd_freelist = fd;
grpc_iomgr_unregister_object(&fd->iomgr_object);
grpc_lfev_destroy(&fd->read_closure);
grpc_lfev_destroy(&fd->write_closure);
fd->read_closure.Destroy();
fd->write_closure.Destroy();
gpr_mu_unlock(&fd_freelist_mu);
} else {
@ -830,8 +831,8 @@ static grpc_fd* fd_create(int fd, const char* name) {
gpr_atm_rel_store(&new_fd->refst, (gpr_atm)1);
new_fd->fd = fd;
new_fd->orphaned = false;
grpc_lfev_init(&new_fd->read_closure);
grpc_lfev_init(&new_fd->write_closure);
new_fd->read_closure.Init();
new_fd->write_closure.Init();
gpr_atm_no_barrier_store(&new_fd->read_notifier_pollset, (gpr_atm)NULL);
new_fd->freelist_next = NULL;
@ -920,24 +921,24 @@ static grpc_pollset* fd_get_read_notifier_pollset(grpc_fd* fd) {
}
static bool fd_is_shutdown(grpc_fd* fd) {
return grpc_lfev_is_shutdown(&fd->read_closure);
return fd->read_closure->IsShutdown();
}
/* Might be called multiple times */
static void fd_shutdown(grpc_fd* fd, grpc_error* why) {
if (grpc_lfev_set_shutdown(&fd->read_closure, GRPC_ERROR_REF(why))) {
if (fd->read_closure->SetShutdown(GRPC_ERROR_REF(why))) {
shutdown(fd->fd, SHUT_RDWR);
grpc_lfev_set_shutdown(&fd->write_closure, GRPC_ERROR_REF(why));
fd->write_closure->SetShutdown(GRPC_ERROR_REF(why));
}
GRPC_ERROR_UNREF(why);
}
static void fd_notify_on_read(grpc_fd* fd, grpc_closure* closure) {
grpc_lfev_notify_on(&fd->read_closure, closure, "read");
fd->read_closure->NotifyOn(closure);
}
static void fd_notify_on_write(grpc_fd* fd, grpc_closure* closure) {
grpc_lfev_notify_on(&fd->write_closure, closure, "write");
fd->write_closure->NotifyOn(closure);
}
/*******************************************************************************
@ -1099,7 +1100,7 @@ static int poll_deadline_to_millis_timeout(grpc_millis millis) {
}
static void fd_become_readable(grpc_fd* fd, grpc_pollset* notifier) {
grpc_lfev_set_ready(&fd->read_closure, "read");
fd->read_closure->SetReady();
/* Note, it is possible that fd_become_readable might be called twice with
different 'notifier's when an fd becomes readable and it is in two epoll
@ -1110,9 +1111,7 @@ static void fd_become_readable(grpc_fd* fd, grpc_pollset* notifier) {
gpr_atm_rel_store(&fd->read_notifier_pollset, (gpr_atm)notifier);
}
static void fd_become_writable(grpc_fd* fd) {
grpc_lfev_set_ready(&fd->write_closure, "write");
}
static void fd_become_writable(grpc_fd* fd) { fd->write_closure->SetReady(); }
static void pollset_release_polling_island(grpc_pollset* ps,
const char* reason) {
@ -1686,14 +1685,17 @@ const grpc_event_engine_vtable* grpc_init_epollsig_linux(
bool explicit_request) {
/* If use of signals is disabled, we cannot use epoll engine*/
if (is_grpc_wakeup_signal_initialized && grpc_wakeup_signal < 0) {
gpr_log(GPR_ERROR, "Skipping epollsig because use of signals is disabled.");
return NULL;
}
if (!grpc_has_wakeup_fd()) {
gpr_log(GPR_ERROR, "Skipping epollsig because of no wakeup fd.");
return NULL;
}
if (!is_epoll_available()) {
gpr_log(GPR_ERROR, "Skipping epollsig because epoll is unavailable.");
return NULL;
}
@ -1701,6 +1703,8 @@ const grpc_event_engine_vtable* grpc_init_epollsig_linux(
if (explicit_request) {
grpc_use_signal(SIGRTMIN + 6);
} else {
gpr_log(GPR_ERROR,
"Skipping epollsig because uninitialized wakeup signal.");
return NULL;
}
}
@ -1726,6 +1730,8 @@ const grpc_event_engine_vtable* grpc_init_epollsig_linux(
* NULL */
const grpc_event_engine_vtable* grpc_init_epollsig_linux(
bool explicit_request) {
gpr_log(GPR_ERROR,
"Skipping epollsig becuase GRPC_LINUX_EPOLL is not defined.");
return NULL;
}
#endif /* defined(GRPC_POSIX_SOCKET) */

@ -1689,6 +1689,7 @@ static const grpc_event_engine_vtable vtable = {
const grpc_event_engine_vtable* grpc_init_poll_posix(bool explicit_request) {
if (!grpc_has_wakeup_fd()) {
gpr_log(GPR_ERROR, "Skipping poll because of no wakeup fd.");
return NULL;
}
if (!GRPC_LOG_IF_ERROR("pollset_global_init", pollset_global_init())) {

@ -172,12 +172,12 @@ void grpc_event_engine_init(void) {
gpr_free(strings[i]);
}
gpr_free(strings);
gpr_free(s);
if (g_event_engine == NULL) {
gpr_log(GPR_ERROR, "No event engine could be initialized");
gpr_log(GPR_ERROR, "No event engine could be initialized from %s", s);
abort();
}
gpr_free(s);
}
void grpc_event_engine_shutdown(void) {

@ -26,92 +26,96 @@ extern grpc_tracer_flag grpc_polling_trace;
/* 'state' holds the to call when the fd is readable or writable respectively.
It can contain one of the following values:
CLOSURE_READY : The fd has an I/O event of interest but there is no
kClosureReady : The fd has an I/O event of interest but there is no
closure yet to execute
CLOSURE_NOT_READY : The fd has no I/O event of interest
kClosureNotReady : The fd has no I/O event of interest
closure ptr : The closure to be executed when the fd has an I/O
event of interest
shutdown_error | FD_SHUTDOWN_BIT :
'shutdown_error' field ORed with FD_SHUTDOWN_BIT.
shutdown_error | kShutdownBit :
'shutdown_error' field ORed with kShutdownBit.
This indicates that the fd is shutdown. Since all
memory allocations are word-aligned, the lower two
bits of the shutdown_error pointer are always 0. So
it is safe to OR these with FD_SHUTDOWN_BIT
it is safe to OR these with kShutdownBit
Valid state transitions:
<closure ptr> <-----3------ CLOSURE_NOT_READY ----1----> CLOSURE_READY
<closure ptr> <-----3------ kClosureNotReady -----1-------> kClosureReady
| | ^ | ^ | |
| | | | | | |
| +--------------4----------+ 6 +---------2---------------+ |
| | |
| v |
+-----5-------> [shutdown_error | FD_SHUTDOWN_BIT] <----7---------+
+-----5-------> [shutdown_error | kShutdownBit] <-------7---------+
For 1, 4 : See grpc_lfev_set_ready() function
For 2, 3 : See grpc_lfev_notify_on() function
For 5,6,7: See grpc_lfev_set_shutdown() function */
For 1, 4 : See SetReady() function
For 2, 3 : See NotifyOn() function
For 5,6,7: See SetShutdown() function */
#define CLOSURE_NOT_READY ((gpr_atm)0)
#define CLOSURE_READY ((gpr_atm)2)
namespace grpc_core {
#define FD_SHUTDOWN_BIT ((gpr_atm)1)
LockfreeEvent::LockfreeEvent() {
/* Perform an atomic store to start the state machine.
void grpc_lfev_init(gpr_atm* state) {
gpr_atm_no_barrier_store(state, CLOSURE_NOT_READY);
Note carefully that LockfreeEvent *MAY* be used whilst in a destroyed
state, while a file descriptor is on a freelist. In such a state it may
be SetReady'd, and so we need to perform an atomic operation here to
ensure no races */
gpr_atm_no_barrier_store(&state_, kClosureNotReady);
}
void grpc_lfev_destroy(gpr_atm* state) {
gpr_atm curr = gpr_atm_no_barrier_load(state);
if (curr & FD_SHUTDOWN_BIT) {
GRPC_ERROR_UNREF((grpc_error*)(curr & ~FD_SHUTDOWN_BIT));
} else {
GPR_ASSERT(curr == CLOSURE_NOT_READY || curr == CLOSURE_READY);
}
}
bool grpc_lfev_is_shutdown(gpr_atm* state) {
gpr_atm curr = gpr_atm_no_barrier_load(state);
return (curr & FD_SHUTDOWN_BIT) != 0;
LockfreeEvent::~LockfreeEvent() {
gpr_atm curr;
do {
curr = gpr_atm_no_barrier_load(&state_);
if (curr & kShutdownBit) {
GRPC_ERROR_UNREF((grpc_error*)(curr & ~kShutdownBit));
} else {
GPR_ASSERT(curr == kClosureNotReady || curr == kClosureReady);
}
/* we CAS in a shutdown, no error value here. If this event is interacted
with post-deletion (see the note in the constructor) we want the bit
pattern to prevent error retention in a deleted object */
} while (!gpr_atm_no_barrier_cas(&state_, curr,
kShutdownBit /* shutdown, no error */));
}
void grpc_lfev_notify_on(gpr_atm* state, grpc_closure* closure,
const char* variable) {
void LockfreeEvent::NotifyOn(grpc_closure* closure) {
while (true) {
gpr_atm curr = gpr_atm_no_barrier_load(state);
gpr_atm curr = gpr_atm_no_barrier_load(&state_);
if (GRPC_TRACER_ON(grpc_polling_trace)) {
gpr_log(GPR_ERROR, "lfev_notify_on[%s]: %p curr=%p closure=%p", variable,
state, (void*)curr, closure);
gpr_log(GPR_ERROR, "LockfreeEvent::NotifyOn: %p curr=%p closure=%p", this,
(void*)curr, closure);
}
switch (curr) {
case CLOSURE_NOT_READY: {
/* CLOSURE_NOT_READY -> <closure>.
case kClosureNotReady: {
/* kClosureNotReady -> <closure>.
We're guaranteed by API that there's an acquire barrier before here,
so there's no need to double-dip and this can be a release-only.
The release itself pairs with the acquire half of a set_ready full
barrier. */
if (gpr_atm_rel_cas(state, CLOSURE_NOT_READY, (gpr_atm)closure)) {
if (gpr_atm_rel_cas(&state_, kClosureNotReady, (gpr_atm)closure)) {
return; /* Successful. Return */
}
break; /* retry */
}
case CLOSURE_READY: {
/* Change the state to CLOSURE_NOT_READY. Schedule the closure if
case kClosureReady: {
/* Change the state to kClosureNotReady. Schedule the closure if
successful. If not, the state most likely transitioned to shutdown.
We should retry.
This can be a no-barrier cas since the state is being transitioned to
CLOSURE_NOT_READY; set_ready and set_shutdown do not schedule any
kClosureNotReady; set_ready and set_shutdown do not schedule any
closure when transitioning out of CLOSURE_NO_READY state (i.e there
is no other code that needs to 'happen-after' this) */
if (gpr_atm_no_barrier_cas(state, CLOSURE_READY, CLOSURE_NOT_READY)) {
if (gpr_atm_no_barrier_cas(&state_, kClosureReady, kClosureNotReady)) {
GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_NONE);
return; /* Successful. Return */
}
@ -123,8 +127,8 @@ void grpc_lfev_notify_on(gpr_atm* state, grpc_closure* closure,
/* 'curr' is either a closure or the fd is shutdown(in which case 'curr'
contains a pointer to the shutdown-error). If the fd is shutdown,
schedule the closure with the shutdown error */
if ((curr & FD_SHUTDOWN_BIT) > 0) {
grpc_error* shutdown_err = (grpc_error*)(curr & ~FD_SHUTDOWN_BIT);
if ((curr & kShutdownBit) > 0) {
grpc_error* shutdown_err = (grpc_error*)(curr & ~kShutdownBit);
GRPC_CLOSURE_SCHED(closure,
GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING(
"FD Shutdown", &shutdown_err, 1));
@ -133,7 +137,8 @@ void grpc_lfev_notify_on(gpr_atm* state, grpc_closure* closure,
/* There is already a closure!. This indicates a bug in the code */
gpr_log(GPR_ERROR,
"notify_on called with a previous callback still pending");
"LockfreeEvent::NotifyOn: notify_on called with a previous "
"callback still pending");
abort();
}
}
@ -142,21 +147,21 @@ void grpc_lfev_notify_on(gpr_atm* state, grpc_closure* closure,
GPR_UNREACHABLE_CODE(return );
}
bool grpc_lfev_set_shutdown(gpr_atm* state, grpc_error* shutdown_err) {
gpr_atm new_state = (gpr_atm)shutdown_err | FD_SHUTDOWN_BIT;
bool LockfreeEvent::SetShutdown(grpc_error* shutdown_err) {
gpr_atm new_state = (gpr_atm)shutdown_err | kShutdownBit;
while (true) {
gpr_atm curr = gpr_atm_no_barrier_load(state);
gpr_atm curr = gpr_atm_no_barrier_load(&state_);
if (GRPC_TRACER_ON(grpc_polling_trace)) {
gpr_log(GPR_ERROR, "lfev_set_shutdown: %p curr=%p err=%s", state,
(void*)curr, grpc_error_string(shutdown_err));
gpr_log(GPR_ERROR, "LockfreeEvent::SetShutdown: %p curr=%p err=%s",
&state_, (void*)curr, grpc_error_string(shutdown_err));
}
switch (curr) {
case CLOSURE_READY:
case CLOSURE_NOT_READY:
case kClosureReady:
case kClosureNotReady:
/* Need a full barrier here so that the initial load in notify_on
doesn't need a barrier */
if (gpr_atm_full_cas(state, curr, new_state)) {
if (gpr_atm_full_cas(&state_, curr, new_state)) {
return true; /* early out */
}
break; /* retry */
@ -165,7 +170,7 @@ bool grpc_lfev_set_shutdown(gpr_atm* state, grpc_error* shutdown_err) {
/* 'curr' is either a closure or the fd is already shutdown */
/* If fd is already shutdown, we are done */
if ((curr & FD_SHUTDOWN_BIT) > 0) {
if ((curr & kShutdownBit) > 0) {
GRPC_ERROR_UNREF(shutdown_err);
return false;
}
@ -175,7 +180,7 @@ bool grpc_lfev_set_shutdown(gpr_atm* state, grpc_error* shutdown_err) {
Needs an acquire to pair with setting the closure (and get a
happens-after on that edge), and a release to pair with anything
loading the shutdown state. */
if (gpr_atm_full_cas(state, curr, new_state)) {
if (gpr_atm_full_cas(&state_, curr, new_state)) {
GRPC_CLOSURE_SCHED((grpc_closure*)curr,
GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING(
"FD Shutdown", &shutdown_err, 1));
@ -192,25 +197,25 @@ bool grpc_lfev_set_shutdown(gpr_atm* state, grpc_error* shutdown_err) {
GPR_UNREACHABLE_CODE(return false);
}
void grpc_lfev_set_ready(gpr_atm* state, const char* variable) {
void LockfreeEvent::SetReady() {
while (true) {
gpr_atm curr = gpr_atm_no_barrier_load(state);
gpr_atm curr = gpr_atm_no_barrier_load(&state_);
if (GRPC_TRACER_ON(grpc_polling_trace)) {
gpr_log(GPR_ERROR, "lfev_set_ready[%s]: %p curr=%p", variable, state,
gpr_log(GPR_ERROR, "LockfreeEvent::SetReady: %p curr=%p", &state_,
(void*)curr);
}
switch (curr) {
case CLOSURE_READY: {
case kClosureReady: {
/* Already ready. We are done here */
return;
}
case CLOSURE_NOT_READY: {
case kClosureNotReady: {
/* No barrier required as we're transitioning to a state that does not
involve a closure */
if (gpr_atm_no_barrier_cas(state, CLOSURE_NOT_READY, CLOSURE_READY)) {
if (gpr_atm_no_barrier_cas(&state_, kClosureNotReady, kClosureReady)) {
return; /* early out */
}
break; /* retry */
@ -218,14 +223,14 @@ void grpc_lfev_set_ready(gpr_atm* state, const char* variable) {
default: {
/* 'curr' is either a closure or the fd is shutdown */
if ((curr & FD_SHUTDOWN_BIT) > 0) {
if ((curr & kShutdownBit) > 0) {
/* The fd is shutdown. Do nothing */
return;
}
/* Full cas: acquire pairs with this cas' release in the event of a
spurious set_ready; release pairs with this or the acquire in
notify_on (or set_shutdown) */
else if (gpr_atm_full_cas(state, curr, CLOSURE_NOT_READY)) {
else if (gpr_atm_full_cas(&state_, curr, kClosureNotReady)) {
GRPC_CLOSURE_SCHED((grpc_closure*)curr, GRPC_ERROR_NONE);
return;
}
@ -237,3 +242,5 @@ void grpc_lfev_set_ready(gpr_atm* state, const char* variable) {
}
}
}
} // namespace grpc_core

@ -25,22 +25,30 @@
#include "src/core/lib/iomgr/exec_ctx.h"
#ifdef __cplusplus
extern "C" {
#endif
void grpc_lfev_init(gpr_atm* state);
void grpc_lfev_destroy(gpr_atm* state);
bool grpc_lfev_is_shutdown(gpr_atm* state);
void grpc_lfev_notify_on(gpr_atm* state, grpc_closure* closure,
const char* variable);
/* Returns true on first successful shutdown */
bool grpc_lfev_set_shutdown(gpr_atm* state, grpc_error* shutdown_err);
void grpc_lfev_set_ready(gpr_atm* state, const char* variable);
#ifdef __cplusplus
}
#endif
namespace grpc_core {
class LockfreeEvent {
public:
LockfreeEvent();
~LockfreeEvent();
LockfreeEvent(const LockfreeEvent&) = delete;
LockfreeEvent& operator=(const LockfreeEvent&) = delete;
bool IsShutdown() const {
return (gpr_atm_no_barrier_load(&state_) & kShutdownBit) != 0;
}
void NotifyOn(grpc_closure* closure);
bool SetShutdown(grpc_error* error);
void SetReady();
private:
enum State { kClosureNotReady = 0, kClosureReady = 2, kShutdownBit = 1 };
gpr_atm state_;
};
} // namespace grpc_core
#endif /* GRPC_CORE_LIB_IOMGR_LOCKFREE_EVENT_H */

@ -40,7 +40,7 @@ grpc_tracer_flag grpc_trace_fd_refcount =
#endif
struct grpc_pollset {
uv_timer_t timer;
uv_timer_t* timer;
int shutting_down;
};
@ -78,12 +78,16 @@ void grpc_pollset_global_shutdown(void) {
static void timer_run_cb(uv_timer_t* timer) {}
static void timer_close_cb(uv_handle_t* handle) { handle->data = (void*)1; }
static void timer_close_cb(uv_handle_t* handle) {
handle->data = (void*)1;
gpr_free(handle);
}
void grpc_pollset_init(grpc_pollset* pollset, gpr_mu** mu) {
GRPC_UV_ASSERT_SAME_THREAD();
*mu = &grpc_polling_mu;
uv_timer_init(uv_default_loop(), &pollset->timer);
pollset->timer = (uv_timer_t*)gpr_malloc(sizeof(uv_timer_t));
uv_timer_init(uv_default_loop(), pollset->timer);
pollset->shutting_down = 0;
}
@ -103,11 +107,11 @@ void grpc_pollset_shutdown(grpc_pollset* pollset, grpc_closure* closure) {
void grpc_pollset_destroy(grpc_pollset* pollset) {
GRPC_UV_ASSERT_SAME_THREAD();
uv_close((uv_handle_t*)&pollset->timer, timer_close_cb);
uv_close((uv_handle_t*)pollset->timer, timer_close_cb);
// timer.data is a boolean indicating that the timer has finished closing
pollset->timer.data = (void*)0;
pollset->timer->data = (void*)0;
if (grpc_pollset_work_run_loop) {
while (!pollset->timer.data) {
while (!pollset->timer->data) {
uv_run(uv_default_loop(), UV_RUN_NOWAIT);
}
}
@ -129,11 +133,11 @@ grpc_error* grpc_pollset_work(grpc_pollset* pollset,
/* We special-case timeout=0 so that we don't bother with the timer when
the loop won't block anyway */
if (timeout > 0) {
uv_timer_start(&pollset->timer, timer_run_cb, timeout, 0);
uv_timer_start(pollset->timer, timer_run_cb, timeout, 0);
/* Run until there is some I/O activity or the timer triggers. It doesn't
matter which happens */
uv_run(uv_default_loop(), UV_RUN_ONCE);
uv_timer_stop(&pollset->timer);
uv_timer_stop(pollset->timer);
} else {
uv_run(uv_default_loop(), UV_RUN_NOWAIT);
}

@ -16,9 +16,7 @@
*
*/
#include "test/core/end2end/data/ssl_test_data.h"
const char test_self_signed_client_cert[] = {
extern "C" const char test_self_signed_client_cert[] = {
0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x42, 0x45, 0x47, 0x49, 0x4e, 0x20, 0x43,
0x45, 0x52, 0x54, 0x49, 0x46, 0x49, 0x43, 0x41, 0x54, 0x45, 0x2d, 0x2d,
0x2d, 0x2d, 0x2d, 0x0a, 0x4d, 0x49, 0x49, 0x43, 0x6f, 0x44, 0x43, 0x43,
@ -102,7 +100,7 @@ const char test_self_signed_client_cert[] = {
0x49, 0x46, 0x49, 0x43, 0x41, 0x54, 0x45, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
0x0a, 0x00};
const char test_self_signed_client_key[] = {
extern "C" const char test_self_signed_client_key[] = {
0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x42, 0x45, 0x47, 0x49, 0x4e, 0x20, 0x50,
0x52, 0x49, 0x56, 0x41, 0x54, 0x45, 0x20, 0x4b, 0x45, 0x59, 0x2d, 0x2d,
0x2d, 0x2d, 0x2d, 0x0a, 0x4d, 0x49, 0x49, 0x43, 0x64, 0x77, 0x49, 0x42,
@ -181,7 +179,7 @@ const char test_self_signed_client_key[] = {
0x52, 0x49, 0x56, 0x41, 0x54, 0x45, 0x20, 0x4b, 0x45, 0x59, 0x2d, 0x2d,
0x2d, 0x2d, 0x2d, 0x0a, 0x00};
const char test_signed_client_cert[] = {
extern "C" const char test_signed_client_cert[] = {
0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x42, 0x45, 0x47, 0x49, 0x4e, 0x20, 0x43,
0x45, 0x52, 0x54, 0x49, 0x46, 0x49, 0x43, 0x41, 0x54, 0x45, 0x2d, 0x2d,
0x2d, 0x2d, 0x2d, 0x0a, 0x4d, 0x49, 0x49, 0x43, 0x48, 0x7a, 0x43, 0x43,
@ -250,7 +248,7 @@ const char test_signed_client_cert[] = {
0x20, 0x43, 0x45, 0x52, 0x54, 0x49, 0x46, 0x49, 0x43, 0x41, 0x54, 0x45,
0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x00};
const char test_signed_client_key[] = {
extern "C" const char test_signed_client_key[] = {
0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x42, 0x45, 0x47, 0x49, 0x4e, 0x20, 0x50,
0x52, 0x49, 0x56, 0x41, 0x54, 0x45, 0x20, 0x4b, 0x45, 0x59, 0x2d, 0x2d,
0x2d, 0x2d, 0x2d, 0x0a, 0x4d, 0x49, 0x49, 0x43, 0x65, 0x51, 0x49, 0x42,

@ -16,9 +16,7 @@
*
*/
#include "test/core/end2end/data/ssl_test_data.h"
const char test_server1_cert[] = {
extern "C" const char test_server1_cert[] = {
0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x42, 0x45, 0x47, 0x49, 0x4e, 0x20, 0x43,
0x45, 0x52, 0x54, 0x49, 0x46, 0x49, 0x43, 0x41, 0x54, 0x45, 0x2d, 0x2d,
0x2d, 0x2d, 0x2d, 0x0a, 0x4d, 0x49, 0x49, 0x43, 0x6e, 0x44, 0x43, 0x43,

@ -16,9 +16,7 @@
*
*/
#include "test/core/end2end/data/ssl_test_data.h"
const char test_server1_key[] = {
extern "C" const char test_server1_key[] = {
0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x42, 0x45, 0x47, 0x49, 0x4e, 0x20, 0x52,
0x53, 0x41, 0x20, 0x50, 0x52, 0x49, 0x56, 0x41, 0x54, 0x45, 0x20, 0x4b,
0x45, 0x59, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x4d, 0x49, 0x49, 0x43,

@ -16,9 +16,7 @@
*
*/
#include "test/core/end2end/data/ssl_test_data.h"
const char test_root_cert[] = {
extern "C" const char test_root_cert[] = {
0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x42, 0x45, 0x47, 0x49, 0x4e, 0x20, 0x43,
0x45, 0x52, 0x54, 0x49, 0x46, 0x49, 0x43, 0x41, 0x54, 0x45, 0x2d, 0x2d,
0x2d, 0x2d, 0x2d, 0x0a, 0x4d, 0x49, 0x49, 0x43, 0x49, 0x7a, 0x43, 0x43,

@ -68,7 +68,7 @@ static void worker_thread(void* arg) {
unsigned i, j;
/* Avoid repetitive division calculations */
int64_t max_i = 1000 / grpc_test_slowdown_factor();
int64_t max_j = 1000000 / grpc_test_slowdown_factor();
int64_t max_j = 1000 / grpc_test_slowdown_factor();
for (i = 0; i < max_i; i++) {
/* run for a bit - just calculate something random. */
for (j = 0; j < max_j; j++) {

@ -0,0 +1,88 @@
# Copyright 2016 gRPC authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# Docker file for building gRPC artifacts.
FROM debian:jessie
RUN apt-get update && apt-get install debian-keyring && apt-key update
# Install Git and basic packages.
RUN apt-get update && apt-key update && apt-get install -y \
autoconf \
autotools-dev \
build-essential \
bzip2 \
clang \
curl \
gcc \
gcc-multilib \
git \
golang \
libc6 \
libc6-dbg \
libc6-dev \
libgtest-dev \
libtool \
make \
perl \
strace \
python-dev \
python-setuptools \
python-yaml \
telnet \
unzip \
wget \
zip && apt-get clean
# Install Node dependencies
RUN touch .profile
RUN curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.25.4/install.sh | bash
RUN /bin/bash -l -c "nvm install 8 && npm install -g node-pre-gyp"
##################
# Ruby dependencies
# Install rvm
RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
RUN \curl -sSL https://get.rvm.io | bash -s stable
# Install Ruby 2.1
RUN /bin/bash -l -c "rvm install ruby-2.1"
RUN /bin/bash -l -c "rvm use --default ruby-2.1"
RUN /bin/bash -l -c "echo 'gem: --no-ri --no-rdoc' > ~/.gemrc"
RUN /bin/bash -l -c "echo 'export PATH=/usr/local/rvm/bin:$PATH' >> ~/.bashrc"
RUN /bin/bash -l -c "echo 'rvm --default use ruby-2.1' >> ~/.bashrc"
RUN /bin/bash -l -c "gem install bundler --no-ri --no-rdoc"
##################
# PHP dependencies
RUN apt-get update && apt-get install -y \
php5 php5-dev php-pear phpunit
##################
# Install cross compiler for ARM
RUN echo 'deb http://emdebian.org/tools/debian/ jessie main' | tee -a /etc/apt/sources.list.d/crosstools.list && \
curl http://emdebian.org/tools/debian/emdebian-toolchain-archive.key | apt-key add -
RUN dpkg --add-architecture armhf && apt-get update && apt-get install -y crossbuild-essential-armhf
RUN mkdir /var/local/jenkins
# Define the default command.
CMD ["bash"]

@ -0,0 +1,73 @@
# Copyright 2016 gRPC authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# Docker file for building gRPC artifacts.
FROM 32bit/debian:jessie
RUN apt-get update && apt-get install debian-keyring && apt-key update
# Install Git and basic packages.
RUN apt-get update && apt-key update && apt-get install -y \
autoconf \
autotools-dev \
build-essential \
bzip2 \
clang \
curl \
gcc \
gcc-multilib \
git \
golang \
libc6 \
libc6-dbg \
libc6-dev \
libgtest-dev \
libtool \
make \
perl \
strace \
python-dev \
python-setuptools \
python-yaml \
telnet \
unzip \
wget \
zip && apt-get clean
# Install Node dependencies
RUN touch .profile
RUN curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.25.4/install.sh | bash
RUN /bin/bash -l -c "nvm install 8 && npm install -g node-pre-gyp"
##################
# Ruby dependencies
# Install rvm
RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
RUN \curl -sSL https://get.rvm.io | bash -s stable
# Install Ruby 2.1
RUN /bin/bash -l -c "rvm install ruby-2.1"
RUN /bin/bash -l -c "rvm use --default ruby-2.1"
RUN /bin/bash -l -c "echo 'gem: --no-ri --no-rdoc' > ~/.gemrc"
RUN /bin/bash -l -c "echo 'export PATH=/usr/local/rvm/bin:$PATH' >> ~/.bashrc"
RUN /bin/bash -l -c "echo 'rvm --default use ruby-2.1' >> ~/.bashrc"
RUN /bin/bash -l -c "gem install bundler --no-ri --no-rdoc"
RUN mkdir /var/local/jenkins
# Define the default command.
CMD ["bash"]

@ -2964,9 +2964,7 @@
"uses_polling": false
},
{
"args": [
"--benchmark_min_time=0"
],
"args": [],
"benchmark": true,
"ci_platforms": [
"linux",
@ -2988,9 +2986,7 @@
"uses_polling": false
},
{
"args": [
"--benchmark_min_time=0"
],
"args": [],
"benchmark": true,
"ci_platforms": [
"linux",
@ -3012,9 +3008,7 @@
"uses_polling": false
},
{
"args": [
"--benchmark_min_time=0"
],
"args": [],
"benchmark": true,
"ci_platforms": [
"linux",
@ -3036,9 +3030,7 @@
"uses_polling": false
},
{
"args": [
"--benchmark_min_time=0"
],
"args": [],
"benchmark": true,
"ci_platforms": [
"linux",
@ -3060,9 +3052,7 @@
"uses_polling": true
},
{
"args": [
"--benchmark_min_time=0"
],
"args": [],
"benchmark": true,
"ci_platforms": [
"linux",
@ -3084,9 +3074,7 @@
"uses_polling": true
},
{
"args": [
"--benchmark_min_time=0"
],
"args": [],
"benchmark": true,
"ci_platforms": [
"linux",
@ -3108,9 +3096,7 @@
"uses_polling": true
},
{
"args": [
"--benchmark_min_time=4"
],
"args": [],
"benchmark": true,
"ci_platforms": [
"linux",
@ -3132,9 +3118,7 @@
"uses_polling": true
},
{
"args": [
"--benchmark_min_time=0"
],
"args": [],
"benchmark": true,
"ci_platforms": [
"linux",
@ -3156,9 +3140,7 @@
"uses_polling": false
},
{
"args": [
"--benchmark_min_time=0"
],
"args": [],
"benchmark": true,
"ci_platforms": [
"linux",
@ -3185,9 +3167,7 @@
"uses_polling": true
},
{
"args": [
"--benchmark_min_time=0"
],
"args": [],
"benchmark": true,
"ci_platforms": [
"linux",
@ -3214,9 +3194,7 @@
"uses_polling": true
},
{
"args": [
"--benchmark_min_time=0"
],
"args": [],
"benchmark": true,
"ci_platforms": [
"linux",
@ -3245,9 +3223,7 @@
"uses_polling": true
},
{
"args": [
"--benchmark_min_time=0"
],
"args": [],
"benchmark": true,
"ci_platforms": [
"linux",
@ -3274,9 +3250,7 @@
"uses_polling": true
},
{
"args": [
"--benchmark_min_time=0"
],
"args": [],
"benchmark": true,
"ci_platforms": [
"linux",
@ -3298,9 +3272,7 @@
"uses_polling": false
},
{
"args": [
"--benchmark_min_time=0"
],
"args": [],
"benchmark": true,
"ci_platforms": [
"linux",

Loading…
Cancel
Save