Skip to content
Snippets Groups Projects
Commit 49c644ca authored by Craig Tiller's avatar Craig Tiller
Browse files

Fix bugs, make it easier to find them

parent 4e41e360
No related branches found
No related tags found
No related merge requests found
...@@ -1587,7 +1587,7 @@ void grpc_chttp2_mark_stream_closed( ...@@ -1587,7 +1587,7 @@ void grpc_chttp2_mark_stream_closed(
stream_global->read_closed_error = GRPC_ERROR_REF(error); stream_global->read_closed_error = GRPC_ERROR_REF(error);
stream_global->read_closed = true; stream_global->read_closed = true;
stream_global->published_metadata[0] = true; stream_global->published_metadata[0] = true;
stream_global->published_metadata[0] = true; stream_global->published_metadata[1] = true;
decrement_active_streams_locked(exec_ctx, transport_global, stream_global); decrement_active_streams_locked(exec_ctx, transport_global, stream_global);
} }
if (close_writes && !stream_global->write_closed) { if (close_writes && !stream_global->write_closed) {
......
...@@ -359,6 +359,8 @@ static void dump_pending_tags(grpc_completion_queue *cc) { ...@@ -359,6 +359,8 @@ static void dump_pending_tags(grpc_completion_queue *cc) {
gpr_log(GPR_DEBUG, "%s", out); gpr_log(GPR_DEBUG, "%s", out);
gpr_free(out); gpr_free(out);
} }
#else
static void dump_pending_tags(grpc_completion_queue *cc) {}
#endif #endif
grpc_event grpc_completion_queue_next(grpc_completion_queue *cc, grpc_event grpc_completion_queue_next(grpc_completion_queue *cc,
...@@ -380,9 +382,7 @@ grpc_event grpc_completion_queue_next(grpc_completion_queue *cc, ...@@ -380,9 +382,7 @@ grpc_event grpc_completion_queue_next(grpc_completion_queue *cc,
reserved)); reserved));
GPR_ASSERT(!reserved); GPR_ASSERT(!reserved);
#ifndef NDEBUG
dump_pending_tags(cc); dump_pending_tags(cc);
#endif
deadline = gpr_convert_clock_type(deadline, GPR_CLOCK_MONOTONIC); deadline = gpr_convert_clock_type(deadline, GPR_CLOCK_MONOTONIC);
...@@ -427,6 +427,7 @@ grpc_event grpc_completion_queue_next(grpc_completion_queue *cc, ...@@ -427,6 +427,7 @@ grpc_event grpc_completion_queue_next(grpc_completion_queue *cc,
gpr_mu_unlock(cc->mu); gpr_mu_unlock(cc->mu);
memset(&ret, 0, sizeof(ret)); memset(&ret, 0, sizeof(ret));
ret.type = GRPC_QUEUE_TIMEOUT; ret.type = GRPC_QUEUE_TIMEOUT;
dump_pending_tags(cc);
break; break;
} }
first_loop = 0; first_loop = 0;
...@@ -452,6 +453,7 @@ grpc_event grpc_completion_queue_next(grpc_completion_queue *cc, ...@@ -452,6 +453,7 @@ grpc_event grpc_completion_queue_next(grpc_completion_queue *cc,
GRPC_ERROR_UNREF(err); GRPC_ERROR_UNREF(err);
memset(&ret, 0, sizeof(ret)); memset(&ret, 0, sizeof(ret));
ret.type = GRPC_QUEUE_TIMEOUT; ret.type = GRPC_QUEUE_TIMEOUT;
dump_pending_tags(cc);
break; break;
} }
} }
...@@ -537,9 +539,7 @@ grpc_event grpc_completion_queue_pluck(grpc_completion_queue *cc, void *tag, ...@@ -537,9 +539,7 @@ grpc_event grpc_completion_queue_pluck(grpc_completion_queue *cc, void *tag,
} }
GPR_ASSERT(!reserved); GPR_ASSERT(!reserved);
#ifndef NDEBUG
dump_pending_tags(cc); dump_pending_tags(cc);
#endif
deadline = gpr_convert_clock_type(deadline, GPR_CLOCK_MONOTONIC); deadline = gpr_convert_clock_type(deadline, GPR_CLOCK_MONOTONIC);
...@@ -592,6 +592,7 @@ grpc_event grpc_completion_queue_pluck(grpc_completion_queue *cc, void *tag, ...@@ -592,6 +592,7 @@ grpc_event grpc_completion_queue_pluck(grpc_completion_queue *cc, void *tag,
memset(&ret, 0, sizeof(ret)); memset(&ret, 0, sizeof(ret));
/* TODO(ctiller): should we use a different result here */ /* TODO(ctiller): should we use a different result here */
ret.type = GRPC_QUEUE_TIMEOUT; ret.type = GRPC_QUEUE_TIMEOUT;
dump_pending_tags(cc);
break; break;
} }
now = gpr_now(GPR_CLOCK_MONOTONIC); now = gpr_now(GPR_CLOCK_MONOTONIC);
...@@ -600,6 +601,7 @@ grpc_event grpc_completion_queue_pluck(grpc_completion_queue *cc, void *tag, ...@@ -600,6 +601,7 @@ grpc_event grpc_completion_queue_pluck(grpc_completion_queue *cc, void *tag,
gpr_mu_unlock(cc->mu); gpr_mu_unlock(cc->mu);
memset(&ret, 0, sizeof(ret)); memset(&ret, 0, sizeof(ret));
ret.type = GRPC_QUEUE_TIMEOUT; ret.type = GRPC_QUEUE_TIMEOUT;
dump_pending_tags(cc);
break; break;
} }
first_loop = 0; first_loop = 0;
...@@ -625,6 +627,7 @@ grpc_event grpc_completion_queue_pluck(grpc_completion_queue *cc, void *tag, ...@@ -625,6 +627,7 @@ grpc_event grpc_completion_queue_pluck(grpc_completion_queue *cc, void *tag,
GRPC_ERROR_UNREF(err); GRPC_ERROR_UNREF(err);
memset(&ret, 0, sizeof(ret)); memset(&ret, 0, sizeof(ret));
ret.type = GRPC_QUEUE_TIMEOUT; ret.type = GRPC_QUEUE_TIMEOUT;
dump_pending_tags(cc);
break; break;
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment