Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

code style only: wrap after open parenthesis if not in one line #88

Merged
merged 1 commit into from
Feb 4, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 27 additions & 23 deletions rttest/src/rttest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -64,26 +64,23 @@ class rttest_sample_buffer
fprintf(stderr, "Failed to allocate latency samples buffer\n");
exit(-1);
}
memset(this->latency_samples, 0,
new_buffer_size * sizeof(int64_t));
memset(this->latency_samples, 0, new_buffer_size * sizeof(int64_t));

this->major_pagefaults = static_cast<size_t *>(
std::malloc(new_buffer_size * sizeof(size_t)));
if (!this->major_pagefaults) {
fprintf(stderr, "Failed to allocate major pagefaults buffer\n");
exit(-1);
}
memset(this->major_pagefaults, 0,
new_buffer_size * sizeof(size_t));
memset(this->major_pagefaults, 0, new_buffer_size * sizeof(size_t));

this->minor_pagefaults = static_cast<size_t *>(
std::malloc(new_buffer_size * sizeof(size_t)));
if (!this->minor_pagefaults) {
fprintf(stderr, "Failed to allocate minor pagefaults buffer\n");
exit(-1);
}
memset(this->minor_pagefaults, 0,
new_buffer_size * sizeof(size_t));
memset(this->minor_pagefaults, 0, new_buffer_size * sizeof(size_t));
} else {
if (this->latency_samples) {
free(this->latency_samples);
Expand Down Expand Up @@ -325,7 +322,8 @@ int Rttest::read_args(int argc, char ** argv)
} else if (input == "rr") {
sched_policy = SCHED_RR;
} else {
fprintf(stderr, "Invalid option entered for scheduling policy: %s\n",
fprintf(
stderr, "Invalid option entered for scheduling policy: %s\n",
input.c_str());
fprintf(stderr, "Valid options are: fifo, rr\n");
exit(-1);
Expand Down Expand Up @@ -480,8 +478,9 @@ int rttest_init(
}
thread_rttest_instance = &rttest_instance_map[thread_id];
}
return thread_rttest_instance->init(iterations, update_period,
sched_policy, sched_priority, stack_size, filename);
return thread_rttest_instance->init(
iterations, update_period, sched_policy, sched_priority, stack_size,
filename);
}

int Rttest::get_next_rusage(size_t i)
Expand Down Expand Up @@ -546,8 +545,8 @@ int rttest_spin_once(

int Rttest::spin(void *(*user_function)(void *), void * args)
{
return rttest_spin_period(user_function, args, &this->params.update_period,
this->params.iterations);
return rttest_spin_period(
user_function, args, &this->params.update_period, this->params.iterations);
}

int Rttest::spin_period(
Expand Down Expand Up @@ -798,31 +797,36 @@ int Rttest::calculate_statistics(struct rttest_results * output)
}

std::vector<int64_t> latency_dataset;
latency_dataset.assign(this->sample_buffer.latency_samples,
latency_dataset.assign(
this->sample_buffer.latency_samples,
this->sample_buffer.latency_samples + this->sample_buffer.buffer_size);

output->min_latency = *std::min_element(latency_dataset.begin(),
latency_dataset.end());
output->max_latency = *std::max_element(latency_dataset.begin(),
latency_dataset.end());
output->mean_latency = std::accumulate(latency_dataset.begin(),
latency_dataset.end(), 0.0) / latency_dataset.size();
output->min_latency = *std::min_element(
latency_dataset.begin(), latency_dataset.end());
output->max_latency = *std::max_element(
latency_dataset.begin(), latency_dataset.end());
output->mean_latency = std::accumulate(
latency_dataset.begin(),
latency_dataset.end(), 0.0) / latency_dataset.size();

// Calculate standard deviation and try to avoid overflow
std::vector<int64_t> latency_diff(latency_dataset.size());
std::transform(latency_dataset.begin(), latency_dataset.end(), latency_diff.begin(),
std::transform(
latency_dataset.begin(), latency_dataset.end(), latency_diff.begin(),
std::bind2nd(std::minus<int>(), output->mean_latency));
int64_t sq_sum = std::inner_product(latency_diff.begin(), latency_diff.end(),
latency_diff.begin(), 0);
int64_t sq_sum = std::inner_product(
latency_diff.begin(), latency_diff.end(), latency_diff.begin(), 0);
output->latency_stddev = std::sqrt(sq_sum / latency_dataset.size());

std::vector<size_t> min_pagefaults;
min_pagefaults.assign(this->sample_buffer.minor_pagefaults,
min_pagefaults.assign(
this->sample_buffer.minor_pagefaults,
this->sample_buffer.minor_pagefaults + this->sample_buffer.buffer_size);
output->minor_pagefaults = std::accumulate(min_pagefaults.begin(), min_pagefaults.end(), 0);

std::vector<size_t> maj_pagefaults;
maj_pagefaults.assign(this->sample_buffer.major_pagefaults,
maj_pagefaults.assign(
this->sample_buffer.major_pagefaults,
this->sample_buffer.major_pagefaults + this->sample_buffer.buffer_size);
output->major_pagefaults = std::accumulate(maj_pagefaults.begin(), maj_pagefaults.end(), 0);
return 0;
Expand Down
5 changes: 3 additions & 2 deletions rttest/test/test_api.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,9 @@ TEST(TestApi, init) {
update_period.tv_nsec = 456;
size_t stack_size = 100;

EXPECT_EQ(0,
rttest_init(4321, update_period, SCHED_FIFO, 42, stack_size, const_cast<char *>("foo.txt")));
EXPECT_EQ(
0, rttest_init(
4321, update_period, SCHED_FIFO, 42, stack_size, const_cast<char *>("foo.txt")));
struct rttest_params params;
EXPECT_EQ(0, rttest_get_params(&params));

Expand Down
10 changes: 6 additions & 4 deletions tlsf_cpp/test/test_tlsf.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,9 @@ bool check_stacktrace(const char ** tokens, size_t num_tokens, size_t max_frames
if (status == 0) {
funcname = ret; // use possibly realloc()-ed string
for (size_t j = 0; j < num_tokens; ++j) {
if (strstr(symbollist[i],
tokens[j]) != nullptr || strstr(funcname, tokens[j]) != nullptr)
if (
strstr(symbollist[i], tokens[j]) != nullptr ||
strstr(funcname, tokens[j]) != nullptr)
{
match = true;
break;
Expand All @@ -173,8 +174,9 @@ bool check_stacktrace(const char ** tokens, size_t num_tokens, size_t max_frames
// demangling failed. Output function name as a C function with
// no arguments.
for (size_t j = 0; j < num_tokens; j++) {
if (strstr(symbollist[i],
tokens[j]) != nullptr || strstr(begin_name, tokens[j]) != nullptr)
if (
strstr(symbollist[i], tokens[j]) != nullptr ||
strstr(begin_name, tokens[j]) != nullptr)
{
match = true;
break;
Expand Down