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.

Sign up for GitHub

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

testing/sd_*: Restrict function and variable scope to current file. #2201

Merged
merged 2 commits into from
May 8, 2024
Merged

testing/sd_*: Restrict function and variable scope to current file. #2201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3e8fdd
testing/sd_bench: Restrict variable and function scope to file only.
g2gps Nov 17, 2023
69a602b
testing/sd_stress: Restrict variable and function scope to file only.
g2gps Nov 17, 2023
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
56 changes: 29 additions & 27 deletions testing/sd_bench/sd_bench_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,22 +80,22 @@ typedef struct sdb_config
static const char *BENCHMARK_FILE =
CONFIG_TESTING_SD_BENCH_DEVICE "/sd_bench";

const size_t max_block = 65536;
const size_t min_block = 1;
const size_t default_block = 512;
static const size_t max_block = 65536;
static const size_t min_block = 1;
static const size_t default_block = 512;

const size_t max_runs = 10000;
const size_t min_runs = 1;
const size_t default_runs = 5;
static const size_t max_runs = 10000;
static const size_t min_runs = 1;
static const size_t default_runs = 5;

const size_t max_duration = 60000;
const size_t min_duration = 1;
const size_t default_duration = 2000;
static const size_t max_duration = 60000;
static const size_t min_duration = 1;
static const size_t default_duration = 2000;

const bool default_keep_test = false;
const bool default_fsync = false;
const bool default_verify = true;
const bool default_aligned = false;
static const bool default_keep_test = false;
static const bool default_fsync = false;
static const bool default_verify = true;
static const bool default_aligned = false;

/****************************************************************************
* Private Function Prototypes
Expand All @@ -107,53 +107,53 @@ static int read_test(int fd, sdb_config_t *cfg, uint8_t *block,
int block_size);

static uint64_t time_fsync_us(int fd);
struct timespec get_abs_time(void);
uint64_t get_elapsed_time_us(const struct timespec *start);
uint64_t time_fsync_us(int fd);
float ts_to_kb(uint64_t bytes, uint64_t elapsed);
float block_count_to_mb(size_t blocks, size_t block_size);
static struct timespec get_abs_time(void);
static uint64_t get_elapsed_time_us(const struct timespec *start);
static uint64_t time_fsync_us(int fd);
static float ts_to_kb(uint64_t bytes, uint64_t elapsed);
static float block_count_to_mb(size_t blocks, size_t block_size);
static const char *print_bool(const bool value);
static void usage(void);

/****************************************************************************
* Private Functions
****************************************************************************/

struct timespec get_abs_time(void)
static struct timespec get_abs_time(void)
{
struct timespec ts;
clock_gettime(CLOCK_MONOTONIC, &ts);
return ts;
}

uint64_t get_time_delta_us(const struct timespec *start,
const struct timespec *end)
static uint64_t get_time_delta_us(const struct timespec *start,
const struct timespec *end)
{
uint64_t elapsed;
elapsed = (((uint64_t)end->tv_sec * NSEC_PER_SEC) + end->tv_nsec);
elapsed -= (((uint64_t)start->tv_sec * NSEC_PER_SEC) + start->tv_nsec);
return elapsed / 1000.;
}

uint64_t get_elapsed_time_us(const struct timespec *start)
static uint64_t get_elapsed_time_us(const struct timespec *start)
{
struct timespec now = get_abs_time();
return get_time_delta_us(start, &now);
}

uint64_t time_fsync_us(int fd)
static uint64_t time_fsync_us(int fd)
{
struct timespec start = get_abs_time();
fsync(fd);
return get_elapsed_time_us(&start);
}

float ts_to_kb(uint64_t bytes, uint64_t elapsed)
static float ts_to_kb(uint64_t bytes, uint64_t elapsed)
{
return (bytes / 1024.) / (elapsed / 1e6);
}

float block_count_to_mb(size_t blocks, size_t block_size)
static float block_count_to_mb(size_t blocks, size_t block_size)
{
return blocks * block_size / (float)(1024 * 1024);
}
Expand All @@ -163,7 +163,8 @@ static const char *print_bool(const bool value)
return value ? "true" : "false";
}

void write_test(int fd, sdb_config_t *cfg, uint8_t *block, int block_size)
static void write_test(int fd, sdb_config_t *cfg, uint8_t *block,
int block_size)
{
struct timespec start;
struct timespec write_start;
Expand Down Expand Up @@ -242,7 +243,8 @@ void write_test(int fd, sdb_config_t *cfg, uint8_t *block, int block_size)
block_count_to_mb(total_blocks, block_size));
}

int read_test(int fd, sdb_config_t *cfg, uint8_t *block, int block_size)
static int read_test(int fd, sdb_config_t *cfg, uint8_t *block,
int block_size)
{
uint8_t *read_block;
uint64_t total_elapsed;
Expand Down
26 changes: 13 additions & 13 deletions testing/sd_stress/sd_stress_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,17 +65,17 @@ static const char *TEMPDIR = CONFIG_TESTING_SD_STRESS_DEVICE"/stress";
static const char *TEMPDIR2 = CONFIG_TESTING_SD_STRESS_DEVICE"/moved";
static const char *TEMPFILE = "tmp";

const size_t max_runs = 10000;
const size_t min_runs = 1;
const size_t default_runs = 32;
static const size_t max_runs = 10000;
static const size_t min_runs = 1;
static const size_t default_runs = 32;

const size_t max_bytes = 10000;
const size_t min_bytes = 1;
const size_t default_bytes = 4096;
static const size_t max_bytes = 10000;
static const size_t min_bytes = 1;
static const size_t default_bytes = 4096;

const size_t max_files = 999;
const size_t min_files = 1;
const size_t default_files = 64;
static const size_t max_files = 999;
static const size_t min_files = 1;
static const size_t default_files = 64;

/****************************************************************************
* Private Functions
Expand Down Expand Up @@ -272,23 +272,23 @@ static bool rename_dir(const char *old_dir, const char *new_dir)
return true;
}

struct timespec get_abs_time(void)
static struct timespec get_abs_time(void)
{
struct timespec ts;
clock_gettime(CLOCK_MONOTONIC, &ts);
return ts;
}

uint64_t get_time_delta(const struct timespec *start,
const struct timespec *end)
static uint64_t get_time_delta(const struct timespec *start,
const struct timespec *end)
{
uint64_t elapsed;
elapsed = (((uint64_t)end->tv_sec * NSEC_PER_SEC) + end->tv_nsec);
elapsed -= (((uint64_t)start->tv_sec * NSEC_PER_SEC) + start->tv_nsec);
return elapsed / 1000;
}

float get_elapsed_time_ms(const struct timespec *start)
static float get_elapsed_time_ms(const struct timespec *start)
{
struct timespec now = get_abs_time();
return get_time_delta(start, &now) / (float)USEC_PER_MSEC;
Expand Down
Loading