h2_full_test in debug passes

reviewable/pr8842/r1
Craig Tiller 8 years ago
parent f5b8ad8449
commit 50d6e7e79a
  1. 15
      src/core/lib/slice/slice_hash_table.c
  2. 2
      test/core/end2end/tests/request_with_flags.c
  3. 2
      test/core/end2end/tests/resource_quota_server.c

@ -40,18 +40,14 @@
#include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/slice/slice_internal.h"
#include "src/core/lib/transport/metadata.h" #include "src/core/lib/transport/metadata.h"
static grpc_slice_refcount terminal_slice_refcount = {NULL};
static const grpc_slice terminal_slice = {&terminal_slice_refcount,
.data.refcounted = {0, 0}};
struct grpc_slice_hash_table { struct grpc_slice_hash_table {
gpr_refcount refs; gpr_refcount refs;
size_t size; size_t size;
grpc_slice_hash_table_entry* entries; grpc_slice_hash_table_entry* entries;
}; };
static bool is_terminal(grpc_slice slice) { static bool is_empty(grpc_slice_hash_table_entry *entry) {
return slice.refcount == &terminal_slice_refcount; return entry->vtable == NULL;
} }
// Helper function for insert and get operations that performs quadratic // Helper function for insert and get operations that performs quadratic
@ -61,7 +57,7 @@ static size_t grpc_slice_hash_table_find_index(
size_t hash = grpc_slice_hash(key); size_t hash = grpc_slice_hash(key);
for (size_t i = 0; i < table->size; ++i) { for (size_t i = 0; i < table->size; ++i) {
const size_t idx = (hash + i * i) % table->size; const size_t idx = (hash + i * i) % table->size;
if (is_terminal(table->entries[idx].key)) { if (is_empty(&table->entries[idx])) {
return find_empty ? idx : table->size; return find_empty ? idx : table->size;
} }
if (grpc_slice_cmp(table->entries[idx].key, key) == 0) { if (grpc_slice_cmp(table->entries[idx].key, key) == 0) {
@ -95,9 +91,6 @@ grpc_slice_hash_table* grpc_slice_hash_table_create(
const size_t entry_size = sizeof(grpc_slice_hash_table_entry) * table->size; const size_t entry_size = sizeof(grpc_slice_hash_table_entry) * table->size;
table->entries = gpr_malloc(entry_size); table->entries = gpr_malloc(entry_size);
memset(table->entries, 0, entry_size); memset(table->entries, 0, entry_size);
for (size_t i = 0; i < num_entries; ++i) {
table->entries[i].key = terminal_slice;
}
for (size_t i = 0; i < num_entries; ++i) { for (size_t i = 0; i < num_entries; ++i) {
grpc_slice_hash_table_entry* entry = &entries[i]; grpc_slice_hash_table_entry* entry = &entries[i];
grpc_slice_hash_table_add(table, entry->key, entry->value, entry->vtable); grpc_slice_hash_table_add(table, entry->key, entry->value, entry->vtable);
@ -115,7 +108,7 @@ void grpc_slice_hash_table_unref(grpc_exec_ctx* exec_ctx,
if (table != NULL && gpr_unref(&table->refs)) { if (table != NULL && gpr_unref(&table->refs)) {
for (size_t i = 0; i < table->size; ++i) { for (size_t i = 0; i < table->size; ++i) {
grpc_slice_hash_table_entry* entry = &table->entries[i]; grpc_slice_hash_table_entry* entry = &table->entries[i];
if (!is_terminal(entry->key)) { if (!is_empty(entry)) {
grpc_slice_unref_internal(exec_ctx, entry->key); grpc_slice_unref_internal(exec_ctx, entry->key);
entry->vtable->destroy_value(exec_ctx, entry->value); entry->vtable->destroy_value(exec_ctx, entry->value);
} }

@ -167,9 +167,9 @@ static void test_invoke_request_with_flags(
if (expectation == GRPC_CALL_OK) { if (expectation == GRPC_CALL_OK) {
CQ_EXPECT_COMPLETION(cqv, tag(1), 1); CQ_EXPECT_COMPLETION(cqv, tag(1), 1);
cq_verify(cqv); cq_verify(cqv);
grpc_slice_unref(details);
} }
grpc_slice_unref(details);
grpc_metadata_array_destroy(&initial_metadata_recv); grpc_metadata_array_destroy(&initial_metadata_recv);
grpc_metadata_array_destroy(&trailing_metadata_recv); grpc_metadata_array_destroy(&trailing_metadata_recv);
grpc_metadata_array_destroy(&request_metadata_recv); grpc_metadata_array_destroy(&request_metadata_recv);

@ -149,7 +149,7 @@ void resource_quota_server(grpc_end2end_test_config config) {
grpc_call_details *call_details = grpc_call_details *call_details =
malloc(sizeof(grpc_call_details) * NUM_CALLS); malloc(sizeof(grpc_call_details) * NUM_CALLS);
grpc_status_code *status = malloc(sizeof(grpc_status_code) * NUM_CALLS); grpc_status_code *status = malloc(sizeof(grpc_status_code) * NUM_CALLS);
grpc_slice *details = malloc(sizeof(char *) * NUM_CALLS); grpc_slice *details = malloc(sizeof(grpc_slice) * NUM_CALLS);
grpc_byte_buffer **request_payload_recv = grpc_byte_buffer **request_payload_recv =
malloc(sizeof(grpc_byte_buffer *) * NUM_CALLS); malloc(sizeof(grpc_byte_buffer *) * NUM_CALLS);
int *was_cancelled = malloc(sizeof(int) * NUM_CALLS); int *was_cancelled = malloc(sizeof(int) * NUM_CALLS);

Loading…
Cancel
Save