Skip to content
Snippets Groups Projects
Commit c7d7be9f authored by Jan Tattermusch's avatar Jan Tattermusch Committed by GitHub
Browse files

Merge pull request #6958 from ctiller/cpuburn 

Reduce cost of some heavyweight tests
parents b6163dfb e2715df1
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
test/core/end2end/tests/hpack_size.c
+ 136
− 181
View file @ c7d7be9f
...@@ -49,187 +49,142 @@ ...@@ -49,187 +49,142 @@
static void *tag(intptr_t t) { return (void *)t; } static void *tag(intptr_t t) { return (void *)t; }
const char *hobbits[][2] = {{"Adaldrida", "Brandybuck"}, const char *hobbits[][2] = {
{"Adamanta", "Took"}, {"Adaldrida", "Brandybuck"}, {"Adamanta", "Took"},
{"Adalgrim", "Took"}, {"Adalgrim", "Took"}, {"Adelard", "Took"},
{"Adelard", "Took"}, {"Amaranth", "Brandybuck"}, {"Andwise", "Roper"},
{"Amaranth", "Brandybuck"}, {"Angelica", "Baggins"}, {"Asphodel", "Burrows"},
{"Andwise", "Roper"}, {"Balbo", "Baggins"}, {"Bandobras", "Took"},
{"Angelica", "Baggins"}, {"Belba", "Bolger"}, {"Bell", "Gamgee"},
{"Asphodel", "Burrows"}, {"Belladonna", "Baggins"}, {"Berylla", "Baggins"},
{"Balbo", "Baggins"}, {"Bilbo", "Baggins"}, {"Bilbo", "Gardner"},
{"Bandobras", "Took"}, {"Bill", "Butcher"}, {"Bingo", "Baggins"},
{"Belba", "Bolger"}, {"Bodo", "Proudfoot"}, {"Bowman", "Cotton"},
{"Bell", "Gamgee"}, {"Bungo", "Baggins"}, {"Camellia", "Sackville"},
{"Belladonna", "Baggins"}, {"Carl", "Cotton"}, {"Celandine", "Brandybuck"},
{"Berylla", "Baggins"}, {"Chica", "Baggins"}, {"Daddy", "Twofoot"},
{"Bilbo", "Baggins"}, {"Daisy", "Boffin"}, {"Diamond", "Took"},
{"Bilbo", "Gardner"}, {"Dinodas", "Brandybuck"}, {"Doderic", "Brandybuck"},
{"Bill", "Butcher"}, {"Dodinas", "Brandybuck"}, {"Donnamira", "Boffin"},
{"Bingo", "Baggins"}, {"Dora", "Baggins"}, {"Drogo", "Baggins"},
{"Bodo", "Proudfoot"}, {"Dudo", "Baggins"}, {"Eglantine", "Took"},
{"Bowman", "Cotton"}, {"Elanor", "Fairbairn"}, {"Elfstan", "Fairbairn"},
{"Bungo", "Baggins"}, {"Esmeralda", "Brandybuck"}, {"Estella", "Brandybuck"},
{"Camellia", "Sackville"}, {"Everard", "Took"}, {"Falco", "Chubb-Baggins"},
{"Carl", "Cotton"}, {"Faramir", "Took"}, {"Farmer", "Maggot"},
{"Celandine", "Brandybuck"}, {"Fastolph", "Bolger"}, {"Ferdibrand", "Took"},
{"Chica", "Baggins"}, {"Ferdinand", "Took"}, {"Ferumbras", "Took"},
{"Daddy", "Twofoot"}, {"Ferumbras", "Took"}, {"Filibert", "Bolger"},
{"Daisy", "Boffin"}, {"Firiel", "Fairbairn"}, {"Flambard", "Took"},
{"Diamond", "Took"}, {"Folco", "Boffin"}, {"Fortinbras", "Took"},
{"Dinodas", "Brandybuck"}, {"Fortinbras", "Took"}, {"Fosco", "Baggins"},
{"Doderic", "Brandybuck"}, {"Fredegar", "Bolger"}, {"Frodo", "Baggins"},
{"Dodinas", "Brandybuck"}, {"Frodo", "Gardner"}, {"Gerontius", "Took"},
{"Donnamira", "Boffin"}, {"Gilly", "Baggins"}, {"Goldilocks", "Took"},
{"Dora", "Baggins"}, {"Gorbadoc", "Brandybuck"}, {"Gorbulas", "Brandybuck"},
{"Drogo", "Baggins"}, {"Gorhendad", "Brandybuck"}, {"Gormadoc", "Brandybuck"},
{"Dudo", "Baggins"}, {"Griffo", "Boffin"}, {"Halfast", "Gamgee"},
{"Eglantine", "Took"}, {"Halfred", "Gamgee"}, {"Halfred", "Greenhand"},
{"Elanor", "Fairbairn"}, {"Hanna", "Brandybuck"}, {"Hamfast", "Gamgee"},
{"Elfstan", "Fairbairn"}, {"Hamfast", "Gardner"}, {"Hamson", "Gamgee"},
{"Esmeralda", "Brandybuck"}, {"Harding", "Gardner"}, {"Hilda", "Brandybuck"},
{"Estella", "Brandybuck"}, {"Hildibrand", "Took"}, {"Hildifons", "Took"},
{"Everard", "Took"}, {"Hildigard", "Took"}, {"Hildigrim", "Took"},
{"Falco", "Chubb-Baggins"}, {"Hob", "Gammidge"}, {"Hob", "Hayward"},
{"Faramir", "Took"}, {"Hobson", "Gamgee"}, {"Holfast", "Gardner"},
{"Farmer", "Maggot"}, {"Holman", "Cotton"}, {"Holman", "Greenhand"},
{"Fastolph", "Bolger"}, {"Hugo", "Boffin"}, {"Hugo", "Bracegirdle"},
{"Ferdibrand", "Took"}, {"Ilberic", "Brandybuck"}, {"Isembard", "Took"},
{"Ferdinand", "Took"}, {"Isembold", "Took"}, {"Isengar", "Took"},
{"Ferumbras", "Took"}, {"Isengrim", "Took"}, {"Isengrim", "Took"},
{"Ferumbras", "Took"}, {"Isumbras", "Took"}, {"Isumbras", "Took"},
{"Filibert", "Bolger"}, {"Jolly", "Cotton"},
{"Firiel", "Fairbairn"}, /*
{"Flambard", "Took"}, {"Lalia", "Took"},
{"Folco", "Boffin"}, {"Largo", "Baggins"},
{"Fortinbras", "Took"}, {"Laura", "Baggins"},
{"Fortinbras", "Took"}, {"Lily", "Goodbody"},
{"Fosco", "Baggins"}, {"Lily", "Cotton"},
{"Fredegar", "Bolger"}, {"Linda", "Proudfoot"},
{"Frodo", "Baggins"}, {"Lobelia", "Sackville-Baggins"},
{"Frodo", "Gardner"}, {"Longo", "Baggins"},
{"Gerontius", "Took"}, {"Lotho", "Sackville-Baggins"},
{"Gilly", "Baggins"}, {"Madoc", "Brandybuck"},
{"Goldilocks", "Took"}, {"Malva", "Brandybuck"},
{"Gorbadoc", "Brandybuck"}, {"Marigold", "Cotton"},
{"Gorbulas", "Brandybuck"}, {"Marmadas", "Brandybuck"},
{"Gorhendad", "Brandybuck"}, {"Marmadoc", "Brandybuck"},
{"Gormadoc", "Brandybuck"}, {"Marroc", "Brandybuck"},
{"Griffo", "Boffin"}, {"May", "Gamgee"},
{"Halfast", "Gamgee"}, {"Melilot", "Brandybuck"},
{"Halfred", "Gamgee"}, {"Menegilda", "Brandybuck"},
{"Halfred", "Greenhand"}, {"Mentha", "Brandybuck"},
{"Hanna", "Brandybuck"}, {"Meriadoc", "Brandybuck"},
{"Hamfast", "Gamgee"}, {"Merimac", "Brandybuck"},
{"Hamfast", "Gardner"}, {"Merimas", "Brandybuck"},
{"Hamson", "Gamgee"}, {"Merry", "Gardner"},
{"Harding", "Gardner"}, {"Milo", "Burrows"},
{"Hilda", "Brandybuck"}, {"Mimosa", "Baggins"},
{"Hildibrand", "Took"}, {"Minto", "Burrows"},
{"Hildifons", "Took"}, {"Mirabella", "Brandybuck"},
{"Hildigard", "Took"}, {"Moro", "Burrows"},
{"Hildigrim", "Took"}, {"Mosco", "Burrows"},
{"Hob", "Gammidge"}, {"Mungo", "Baggins"},
{"Hob", "Hayward"}, {"Myrtle", "Burrows"},
{"Hobson", "Gamgee"}, {"Odo", "Proudfoot"},
{"Holfast", "Gardner"}, {"Odovacar", "Bolger"},
{"Holman", "Cotton"}, {"Olo", "Proudfoot"},
{"Holman", "Greenhand"}, {"Orgulas", "Brandybuck"},
{"Hugo", "Boffin"}, {"Otho", "Sackville-Baggins"},
{"Hugo", "Bracegirdle"}, {"Paladin", "Took"},
{"Ilberic", "Brandybuck"}, {"Pansy", "Bolger"},
{"Isembard", "Took"}, {"Pearl", "Took"},
{"Isembold", "Took"}, {"Peony", "Burrows"},
{"Isengar", "Took"}, {"Peregrin", "Took"},
{"Isengrim", "Took"}, {"Pervinca", "Took"},
{"Isengrim", "Took"}, {"Pimpernel", "Took"},
{"Isumbras", "Took"}, {"Pippin", "Gardner"},
{"Isumbras", "Took"}, {"Polo", "Baggins"},
{"Jolly", "Cotton"}, {"Ponto", "Baggins"},
{"Lalia", "Took"}, {"Porto", "Baggins"},
{"Largo", "Baggins"}, {"Posco", "Baggins"},
{"Laura", "Baggins"}, {"Poppy", "Bolger"},
{"Lily", "Goodbody"}, {"Primrose", "Gardner"},
{"Lily", "Cotton"}, {"Primula", "Baggins"},
{"Linda", "Proudfoot"}, {"Prisca", "Bolger"},
{"Lobelia", "Sackville-Baggins"}, {"Reginard", "Took"},
{"Longo", "Baggins"}, {"Robin", "Smallburrow"},
{"Lotho", "Sackville-Baggins"}, {"Robin", "Gardner"},
{"Madoc", "Brandybuck"}, {"Rorimac", "Brandybuck"},
{"Malva", "Brandybuck"}, {"Rosa", "Took"},
{"Marigold", "Cotton"}, {"Rosamunda", "Bolger"},
{"Marmadas", "Brandybuck"}, {"Rose", "Gardner"},
{"Marmadoc", "Brandybuck"}, {"Ruby", "Baggins"},
{"Marroc", "Brandybuck"}, {"Ruby", "Gardner"},
{"May", "Gamgee"}, {"Rudigar", "Bolger"},
{"Melilot", "Brandybuck"}, {"Rufus", "Burrows"},
{"Menegilda", "Brandybuck"}, {"Sadoc", "Brandybuck"},
{"Mentha", "Brandybuck"}, {"Salvia", "Bolger"},
{"Meriadoc", "Brandybuck"}, {"Samwise", "Gamgee"},
{"Merimac", "Brandybuck"}, {"Sancho", "Proudfoot"},
{"Merimas", "Brandybuck"}, {"Saradas", "Brandybuck"},
{"Merry", "Gardner"}, {"Saradoc", "Brandybuck"},
{"Milo", "Burrows"}, {"Seredic", "Brandybuck"},
{"Mimosa", "Baggins"}, {"Sigismond", "Took"},
{"Minto", "Burrows"}, {"Smeagol", "Gollum"},
{"Mirabella", "Brandybuck"}, {"Tanta", "Baggins"},
{"Moro", "Burrows"}, {"Ted", "Sandyman"},
{"Mosco", "Burrows"}, {"Tobold", "Hornblower"},
{"Mungo", "Baggins"}, {"Togo", "Goodbody"},
{"Myrtle", "Burrows"}, {"Tolman", "Cotton"},
{"Odo", "Proudfoot"}, {"Tolman", "Gardner"},
{"Odovacar", "Bolger"}, {"Widow", "Rumble"},
{"Olo", "Proudfoot"}, {"Wilcome", "Cotton"},
{"Orgulas", "Brandybuck"}, {"Wilcome", "Cotton"},
{"Otho", "Sackville-Baggins"}, {"Wilibald", "Bolger"},
{"Paladin", "Took"}, {"Will", "Whitfoot"},
{"Pansy", "Bolger"}, {"Wiseman", "Gamwich"}*/
{"Pearl", "Took"}, };
{"Peony", "Burrows"},
{"Peregrin", "Took"},
{"Pervinca", "Took"},
{"Pimpernel", "Took"},
{"Pippin", "Gardner"},
{"Polo", "Baggins"},
{"Ponto", "Baggins"},
{"Porto", "Baggins"},
{"Posco", "Baggins"},
{"Poppy", "Bolger"},
{"Primrose", "Gardner"},
{"Primula", "Baggins"},
{"Prisca", "Bolger"},
{"Reginard", "Took"},
{"Robin", "Smallburrow"},
{"Robin", "Gardner"},
{"Rorimac", "Brandybuck"},
{"Rosa", "Took"},
{"Rosamunda", "Bolger"},
{"Rose", "Gardner"},
{"Ruby", "Baggins"},
{"Ruby", "Gardner"},
{"Rudigar", "Bolger"},
{"Rufus", "Burrows"},
{"Sadoc", "Brandybuck"},
{"Salvia", "Bolger"},
{"Samwise", "Gamgee"},
{"Sancho", "Proudfoot"},
{"Saradas", "Brandybuck"},
{"Saradoc", "Brandybuck"},
{"Seredic", "Brandybuck"},
{"Sigismond", "Took"},
{"Smeagol", "Gollum"},
{"Tanta", "Baggins"},
{"Ted", "Sandyman"},
{"Tobold", "Hornblower"},
{"Togo", "Goodbody"},
{"Tolman", "Cotton"},
{"Tolman", "Gardner"},
{"Widow", "Rumble"},
{"Wilcome", "Cotton"},
{"Wilcome", "Cotton"},
{"Wilibald", "Bolger"},
{"Will", "Whitfoot"},
{"Wiseman", "Gamwich"}};
const char *dragons[] = {"Ancalagon", "Glaurung", "Scatha", const char *dragons[] = {"Ancalagon", "Glaurung", "Scatha",
"Smaug the Magnificent"}; "Smaug the Magnificent"};
......
test/core/fling/client.c
+ 8
− 2
View file @ c7d7be9f
...@@ -177,12 +177,17 @@ int main(int argc, char **argv) { ...@@ -177,12 +177,17 @@ int main(int argc, char **argv) {
fake_argv[0] = argv[0]; fake_argv[0] = argv[0];
grpc_test_init(1, fake_argv); grpc_test_init(1, fake_argv);
int warmup_seconds = 1;
int benchmark_seconds = 5;
cl = gpr_cmdline_create("fling client"); cl = gpr_cmdline_create("fling client");
gpr_cmdline_add_int(cl, "payload_size", "Size of the payload to send", gpr_cmdline_add_int(cl, "payload_size", "Size of the payload to send",
&payload_size); &payload_size);
gpr_cmdline_add_string(cl, "target", "Target host:port", &target); gpr_cmdline_add_string(cl, "target", "Target host:port", &target);
gpr_cmdline_add_flag(cl, "secure", "Run with security?", &secure); gpr_cmdline_add_flag(cl, "secure", "Run with security?", &secure);
gpr_cmdline_add_string(cl, "scenario", "Scenario", &scenario_name); gpr_cmdline_add_string(cl, "scenario", "Scenario", &scenario_name);
gpr_cmdline_add_int(cl, "warmup", "Warmup seconds", &warmup_seconds);
gpr_cmdline_add_int(cl, "benchmark", "Benchmark seconds", &benchmark_seconds);
gpr_cmdline_parse(cl, argc, argv); gpr_cmdline_parse(cl, argc, argv);
gpr_cmdline_destroy(cl); gpr_cmdline_destroy(cl);
...@@ -206,8 +211,9 @@ int main(int argc, char **argv) { ...@@ -206,8 +211,9 @@ int main(int argc, char **argv) {
sc.init(); sc.init();
gpr_timespec end_warmup = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(3); gpr_timespec end_warmup = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(warmup_seconds);
gpr_timespec end_profiling = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(30); gpr_timespec end_profiling =
GRPC_TIMEOUT_SECONDS_TO_DEADLINE(warmup_seconds + benchmark_seconds);
while (gpr_time_cmp(gpr_now(end_warmup.clock_type), end_warmup) < 0) { while (gpr_time_cmp(gpr_now(end_warmup.clock_type), end_warmup) < 0) {
sc.do_one_step(); sc.do_one_step();
......
test/core/support/tls_test.c
+ 1
− 1
View file @ c7d7be9f
...@@ -50,7 +50,7 @@ static void thd_body(void *arg) { ...@@ -50,7 +50,7 @@ static void thd_body(void *arg) {
GPR_ASSERT(gpr_tls_get(&test_var) == 0); GPR_ASSERT(gpr_tls_get(&test_var) == 0);
for (i = 0; i < 10000000; i++) { for (i = 0; i < 100000; i++) {
gpr_tls_set(&test_var, i); gpr_tls_set(&test_var, i);
GPR_ASSERT(gpr_tls_get(&test_var) == i); GPR_ASSERT(gpr_tls_get(&test_var) == i);
} }
......
test/core/transport/chttp2/hpack_table_test.c
+ 1
− 1
View file @ c7d7be9f
...@@ -139,7 +139,7 @@ static void test_many_additions(void) { ...@@ -139,7 +139,7 @@ static void test_many_additions(void) {
grpc_chttp2_hptbl_init(&tbl); grpc_chttp2_hptbl_init(&tbl);
for (i = 0; i < 1000000; i++) { for (i = 0; i < 100000; i++) {
grpc_mdelem *elem; grpc_mdelem *elem;
gpr_asprintf(&key, "K:%d", i); gpr_asprintf(&key, "K:%d", i);
gpr_asprintf(&value, "VALUE:%d", i); gpr_asprintf(&value, "VALUE:%d", i);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment