mirror of https://github.com/grpc/grpc.git
Craig Tiller
8 years ago
parent
84ea341aa3
commit
d8a3c048e2
33 changed files with 345 additions and 428 deletions
@ -1,230 +0,0 @@ |
||||
/*
|
||||
* |
||||
* Copyright 2015, 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/port_platform.h> |
||||
|
||||
#ifdef GPR_POSIX_SOCKET |
||||
|
||||
#include "src/core/lib/iomgr/workqueue.h" |
||||
|
||||
#include <stdio.h> |
||||
|
||||
#include <grpc/support/alloc.h> |
||||
#include <grpc/support/log.h> |
||||
#include <grpc/support/useful.h> |
||||
|
||||
#include "src/core/lib/iomgr/ev_posix.h" |
||||
#include "src/core/lib/profiling/timers.h" |
||||
|
||||
static void on_readable(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error); |
||||
|
||||
grpc_error *grpc_workqueue_create(grpc_exec_ctx *exec_ctx, |
||||
grpc_workqueue **workqueue) { |
||||
char name[32]; |
||||
*workqueue = gpr_malloc(sizeof(grpc_workqueue)); |
||||
gpr_ref_init(&(*workqueue)->refs, 1); |
||||
gpr_atm_no_barrier_store(&(*workqueue)->state, 1); |
||||
grpc_error *err = grpc_wakeup_fd_init(&(*workqueue)->wakeup_fd); |
||||
if (err != GRPC_ERROR_NONE) { |
||||
gpr_free(*workqueue); |
||||
return err; |
||||
} |
||||
sprintf(name, "workqueue:%p", (void *)(*workqueue)); |
||||
(*workqueue)->wakeup_read_fd = grpc_fd_create( |
||||
GRPC_WAKEUP_FD_GET_READ_FD(&(*workqueue)->wakeup_fd), name); |
||||
gpr_mpscq_init(&(*workqueue)->queue); |
||||
grpc_closure_init(&(*workqueue)->read_closure, on_readable, *workqueue); |
||||
grpc_fd_notify_on_read(exec_ctx, (*workqueue)->wakeup_read_fd, |
||||
&(*workqueue)->read_closure); |
||||
return GRPC_ERROR_NONE; |
||||
} |
||||
|
||||
static void workqueue_destroy(grpc_exec_ctx *exec_ctx, |
||||
grpc_workqueue *workqueue) { |
||||
grpc_fd_shutdown(exec_ctx, workqueue->wakeup_read_fd); |
||||
} |
||||
|
||||
static void workqueue_orphan(grpc_exec_ctx *exec_ctx, |
||||
grpc_workqueue *workqueue) { |
||||
gpr_atm last = gpr_atm_full_fetch_add(&workqueue->state, -1); |
||||
if (last == 1) { |
||||
workqueue_destroy(exec_ctx, workqueue); |
||||
} |
||||
} |
||||
|
||||
#ifdef GRPC_WORKQUEUE_REFCOUNT_DEBUG |
||||
grpc_workqueue *grpc_workqueue_ref(grpc_workqueue *workqueue, const char *file, |
||||
int line, const char *reason) { |
||||
if (workqueue == NULL) return NULL; |
||||
gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, "WORKQUEUE:%p ref %d -> %d %s", |
||||
workqueue, (int)workqueue->refs.count, (int)workqueue->refs.count + 1, |
||||
reason); |
||||
gpr_ref(&workqueue->refs); |
||||
return workqueue; |
||||
} |
||||
#else |
||||
grpc_workqueue *grpc_workqueue_ref(grpc_workqueue *workqueue) { |
||||
if (workqueue != NULL) { |
||||
gpr_ref(&workqueue->refs); |
||||
} |
||||
return workqueue; |
||||
} |
||||
#endif |
||||
|
||||
#ifdef GRPC_WORKQUEUE_REFCOUNT_DEBUG |
||||
void grpc_workqueue_unref(grpc_exec_ctx *exec_ctx, grpc_workqueue *workqueue, |
||||
const char *file, int line, const char *reason) { |
||||
if (workqueue == NULL) return; |
||||
gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, "WORKQUEUE:%p unref %d -> %d %s", |
||||
workqueue, (int)workqueue->refs.count, (int)workqueue->refs.count - 1, |
||||
reason); |
||||
if (gpr_unref(&workqueue->refs)) { |
||||
workqueue_orphan(exec_ctx, workqueue); |
||||
} |
||||
} |
||||
#else |
||||
void grpc_workqueue_unref(grpc_exec_ctx *exec_ctx, grpc_workqueue *workqueue) { |
||||
if (workqueue == NULL) return; |
||||
if (gpr_unref(&workqueue->refs)) { |
||||
workqueue_orphan(exec_ctx, workqueue); |
||||
} |
||||
} |
||||
#endif |
||||
|
||||
static void drain(grpc_exec_ctx *exec_ctx, grpc_workqueue *workqueue) { |
||||
abort(); |
||||
} |
||||
|
||||
static void wakeup(grpc_exec_ctx *exec_ctx, grpc_workqueue *workqueue) { |
||||
GPR_TIMER_MARK("workqueue.wakeup", 0); |
||||
grpc_error *err = grpc_wakeup_fd_wakeup(&workqueue->wakeup_fd); |
||||
if (!GRPC_LOG_IF_ERROR("wakeupfd_wakeup", err)) { |
||||
drain(exec_ctx, workqueue); |
||||
} |
||||
} |
||||
|
||||
static void on_readable(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { |
||||
GPR_TIMER_BEGIN("workqueue.on_readable", 0); |
||||
|
||||
grpc_workqueue *workqueue = arg; |
||||
|
||||
if (error != GRPC_ERROR_NONE) { |
||||
/* HACK: let wakeup_fd code know that we stole the fd */ |
||||
workqueue->wakeup_fd.read_fd = 0; |
||||
grpc_wakeup_fd_destroy(&workqueue->wakeup_fd); |
||||
grpc_fd_orphan(exec_ctx, workqueue->wakeup_read_fd, NULL, NULL, "destroy"); |
||||
GPR_ASSERT(gpr_atm_no_barrier_load(&workqueue->state) == 0); |
||||
gpr_free(workqueue); |
||||
} else { |
||||
gpr_mpscq_node *n = NULL; |
||||
for (int i = 0; i < 100; i++) { |
||||
n = gpr_mpscq_pop(&workqueue->queue); |
||||
if (n != NULL) { |
||||
grpc_closure *c = (grpc_closure *)n; |
||||
grpc_closure_run(exec_ctx, c, c->error_data.error); |
||||
grpc_exec_ctx_flush(exec_ctx); |
||||
gpr_atm last = gpr_atm_full_fetch_add(&workqueue->state, -2); |
||||
switch (last) { |
||||
default: |
||||
// there's more to do, keep going
|
||||
goto keep_going; |
||||
case 3: // had one count, one unorphaned --> done, unorphaned
|
||||
goto switch_to_idle; |
||||
case 2: // had one count, one orphaned --> done, orphaned
|
||||
goto destroy; |
||||
case 1: |
||||
case 0: |
||||
// these values are illegal - representing an already done or
|
||||
// deleted workqueue
|
||||
GPR_UNREACHABLE_CODE(break); |
||||
} |
||||
} |
||||
} |
||||
/* fall through to wakeup_next -- we tried a bunch of times to pull a node
|
||||
* but failed */ |
||||
wakeup_next: |
||||
error = grpc_wakeup_fd_consume_wakeup(&workqueue->wakeup_fd); |
||||
if (error != GRPC_ERROR_NONE) { |
||||
/* recurse to get error handling */ |
||||
on_readable(exec_ctx, arg, error); |
||||
} else { |
||||
grpc_fd_notify_on_read(exec_ctx, workqueue->wakeup_read_fd, |
||||
&workqueue->read_closure); |
||||
wakeup(exec_ctx, workqueue); |
||||
} |
||||
return; |
||||
|
||||
keep_going: |
||||
if (grpc_exec_ctx_ready_to_finish(exec_ctx)) { |
||||
goto wakeup_next; |
||||
} else { |
||||
/* recurse to continue */ |
||||
on_readable(exec_ctx, arg, GRPC_ERROR_NONE); |
||||
} |
||||
return; |
||||
|
||||
switch_to_idle: |
||||
error = grpc_wakeup_fd_consume_wakeup(&workqueue->wakeup_fd); |
||||
if (error != GRPC_ERROR_NONE) { |
||||
/* recurse to get error handling */ |
||||
on_readable(exec_ctx, arg, error); |
||||
} else { |
||||
grpc_fd_notify_on_read(exec_ctx, workqueue->wakeup_read_fd, |
||||
&workqueue->read_closure); |
||||
} |
||||
return; |
||||
|
||||
destroy: |
||||
workqueue_destroy(exec_ctx, workqueue); |
||||
return; |
||||
} |
||||
|
||||
GPR_TIMER_END("workqueue.on_readable", 0); |
||||
} |
||||
|
||||
void grpc_workqueue_enqueue(grpc_exec_ctx *exec_ctx, grpc_workqueue *workqueue, |
||||
grpc_closure *closure, grpc_error *error) { |
||||
GPR_TIMER_BEGIN("workqueue.enqueue", 0); |
||||
GRPC_WORKQUEUE_REF(workqueue, "enqueue"); |
||||
gpr_atm last = gpr_atm_full_fetch_add(&workqueue->state, 2); |
||||
GPR_ASSERT(last & 1); |
||||
closure->error_data.error = error; |
||||
gpr_mpscq_push(&workqueue->queue, &closure->next_data.atm_next); |
||||
if (last == 1) { |
||||
wakeup(exec_ctx, workqueue); |
||||
} |
||||
GRPC_WORKQUEUE_UNREF(exec_ctx, workqueue, "enqueue"); |
||||
GPR_TIMER_END("workqueue.enqueue", 0); |
||||
} |
||||
|
||||
#endif /* GPR_POSIX_SOCKET */ |
||||
@ -1,61 +0,0 @@ |
||||
/*
|
||||
* |
||||
* Copyright 2015, 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. |
||||
* |
||||
*/ |
||||
|
||||
#ifndef GRPC_CORE_LIB_IOMGR_WORKQUEUE_POSIX_H |
||||
#define GRPC_CORE_LIB_IOMGR_WORKQUEUE_POSIX_H |
||||
|
||||
#include "src/core/lib/iomgr/wakeup_fd_posix.h" |
||||
#include "src/core/lib/support/mpscq.h" |
||||
|
||||
struct grpc_fd; |
||||
|
||||
struct grpc_workqueue { |
||||
gpr_refcount refs; |
||||
gpr_mpscq queue; |
||||
// state is:
|
||||
// lower bit - zero if orphaned
|
||||
// other bits - number of items enqueued
|
||||
gpr_atm state; |
||||
|
||||
grpc_wakeup_fd wakeup_fd; |
||||
struct grpc_fd *wakeup_read_fd; |
||||
|
||||
grpc_closure read_closure; |
||||
}; |
||||
|
||||
/** Create a work queue. Returns an error if creation fails. If creation
|
||||
succeeds, sets *workqueue to point to it. */ |
||||
grpc_error *grpc_workqueue_create(grpc_exec_ctx *exec_ctx, |
||||
grpc_workqueue **workqueue); |
||||
|
||||
#endif /* GRPC_CORE_LIB_IOMGR_WORKQUEUE_POSIX_H */ |
||||
@ -0,0 +1,97 @@ |
||||
#!/bin/bash |
||||
# 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. |
||||
|
||||
# format argument via |
||||
# $ echo '{...}' | python -mjson.tool |
||||
read -r -d '' SCENARIOS_JSON_ARG <<'EOF' |
||||
{ |
||||
"scenarios": [ |
||||
{ |
||||
"benchmark_seconds": 60, |
||||
"warmup_seconds": 5, |
||||
"client_config": { |
||||
"client_channels": 100, |
||||
"client_type": "ASYNC_CLIENT", |
||||
"histogram_params": { |
||||
"max_possible": 60000000000.0, |
||||
"resolution": 0.01 |
||||
}, |
||||
"load_params": { |
||||
"closed_loop": {} |
||||
}, |
||||
"outstanding_rpcs_per_channel": 100, |
||||
"payload_config": { |
||||
"simple_params": { |
||||
"req_size": 0, |
||||
"resp_size": 0 |
||||
} |
||||
}, |
||||
"rpc_type": "UNARY", |
||||
"security_params": null |
||||
}, |
||||
"name": "name_goes_here", |
||||
"num_clients": 1, |
||||
"num_servers": 1, |
||||
"server_config": { |
||||
"security_params": null, |
||||
"server_type": "ASYNC_SERVER" |
||||
}, |
||||
"spawn_local_worker_count": -2 |
||||
} |
||||
] |
||||
} |
||||
|
||||
EOF |
||||
|
||||
set -ex |
||||
|
||||
cd $(dirname $0)/../../.. |
||||
|
||||
CPUS=`python -c 'import multiprocessing; print multiprocessing.cpu_count()'` |
||||
|
||||
# try to use pypy for generating reports |
||||
# each trace dumps 7-8gig of text to disk, and processing this into a report is |
||||
# heavyweight - so any speed boost is worthwhile |
||||
# TODO(ctiller): consider rewriting report generation in C++ for performance |
||||
if which pypy >/dev/null; then |
||||
PYTHON=pypy |
||||
else |
||||
PYTHON=python2.7 |
||||
fi |
||||
|
||||
export config=mutrace |
||||
|
||||
make CONFIG=$config -j$CPUS qps_json_driver |
||||
|
||||
bins/$config/qps_json_driver --scenarios_json="$SCENARIOS_JSON_ARG" |
||||
|
||||
#sudo perf record -F 997 -g bins/$config/qps_json_driver --scenarios_json="$SCENARIOS_JSON_ARG" |
||||
#sudo perf report |
||||
|
||||
Loading…
Reference in new issue