pull/7644/head
Craig Tiller 9 years ago
parent 9dc01dd44d
commit 5beba2818e
  1. 6
      composer.json
  2. 6
      src/core/ext/transport/chttp2/transport/chttp2_transport.c
  3. 2
      src/core/lib/iomgr/workqueue_posix.c

@ -13,10 +13,8 @@
],
"require": {
"php": ">=5.5.0",
"datto/protobuf-php": "dev-master"
},
"require-dev": {
"google/auth": "v0.9"
"datto/protobuf-php": "dev-master",
"google/auth": "v0.7"
},
"autoload": {
"psr-4": {

@ -31,9 +31,6 @@
*
*/
// TODO(ctiller): schedule check_read_ops whenever something is added to that
// list
#include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
#include <math.h>
@ -1816,7 +1813,8 @@ static void reading_action_locked(grpc_exec_ctx *exec_ctx, void *tp,
grpc_chttp2_stream_map_move_into(&t->new_stream_map,
&t->parsing_stream_map);
grpc_chttp2_prepare_to_read(transport_global, transport_parsing);
grpc_exec_ctx_sched(exec_ctx, &t->parsing_action, error, NULL);
grpc_exec_ctx_sched(exec_ctx, &t->parsing_action, GRPC_ERROR_REF(error),
NULL);
} else {
post_reading_action_locked(exec_ctx, t, GRPC_ERROR_REF(error));
}

@ -90,6 +90,7 @@ void grpc_workqueue_ref(grpc_workqueue *workqueue, const char *file, int line,
}
#else
void grpc_workqueue_ref(grpc_workqueue *workqueue) {
if (workqueue == NULL) return;
gpr_ref(&workqueue->refs);
}
#endif
@ -106,6 +107,7 @@ void grpc_workqueue_unref(grpc_exec_ctx *exec_ctx, grpc_workqueue *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);
}

Loading…
Cancel
Save