|
@@ -420,10 +420,10 @@ void log_csv_error(int len, int err)
|
|
|
}
|
|
|
|
|
|
int format_output(struct loopback_test *t,
|
|
|
- struct loopback_results *r,
|
|
|
- const char *dev_name,
|
|
|
- char *buf, int buf_len,
|
|
|
- struct tm *tm)
|
|
|
+ struct loopback_results *r,
|
|
|
+ const char *dev_name,
|
|
|
+ char *buf, int buf_len,
|
|
|
+ struct tm *tm)
|
|
|
{
|
|
|
int len = 0;
|
|
|
|
|
@@ -535,7 +535,7 @@ static int log_results(struct loopback_test *t)
|
|
|
*/
|
|
|
if (t->file_output && !t->porcelain) {
|
|
|
snprintf(file_name, sizeof(file_name), "%s_%d_%d.csv",
|
|
|
- t->test_name, t->size, t->iteration_max);
|
|
|
+ t->test_name, t->size, t->iteration_max);
|
|
|
|
|
|
fd = open(file_name, O_WRONLY | O_CREAT | O_APPEND, 0644);
|
|
|
if (fd < 0) {
|
|
@@ -549,8 +549,8 @@ static int log_results(struct loopback_test *t)
|
|
|
continue;
|
|
|
|
|
|
len = format_output(t, &t->devices[i].results,
|
|
|
- t->devices[i].name,
|
|
|
- data, sizeof(data), &tm);
|
|
|
+ t->devices[i].name,
|
|
|
+ data, sizeof(data), &tm);
|
|
|
if (t->file_output && !t->porcelain) {
|
|
|
ret = write(fd, data, len);
|
|
|
if (ret == -1)
|
|
@@ -562,7 +562,7 @@ static int log_results(struct loopback_test *t)
|
|
|
|
|
|
if (t->aggregate_output) {
|
|
|
len = format_output(t, &t->aggregate_results, "aggregate",
|
|
|
- data, sizeof(data), &tm);
|
|
|
+ data, sizeof(data), &tm);
|
|
|
if (t->file_output && !t->porcelain) {
|
|
|
ret = write(fd, data, len);
|
|
|
if (ret == -1)
|
|
@@ -623,14 +623,13 @@ int find_loopback_devices(struct loopback_test *t)
|
|
|
snprintf(d->name, MAX_STR_LEN, "gb_loopback%u", dev_id);
|
|
|
|
|
|
snprintf(d->sysfs_entry, MAX_SYSFS_PATH, "%s%s/",
|
|
|
- t->sysfs_prefix, d->name);
|
|
|
+ t->sysfs_prefix, d->name);
|
|
|
|
|
|
snprintf(d->debugfs_entry, MAX_SYSFS_PATH, "%sraw_latency_%s",
|
|
|
- t->debugfs_prefix, d->name);
|
|
|
+ t->debugfs_prefix, d->name);
|
|
|
|
|
|
if (t->debug)
|
|
|
- printf("add %s %s\n", d->sysfs_entry,
|
|
|
- d->debugfs_entry);
|
|
|
+ printf("add %s %s\n", d->sysfs_entry, d->debugfs_entry);
|
|
|
}
|
|
|
|
|
|
ret = 0;
|
|
@@ -803,16 +802,14 @@ static void prepare_devices(struct loopback_test *t)
|
|
|
t->iteration_max);
|
|
|
|
|
|
if (t->use_async) {
|
|
|
+ write_sysfs_val(t->devices[i].sysfs_entry, "async", 1);
|
|
|
write_sysfs_val(t->devices[i].sysfs_entry,
|
|
|
- "async", 1);
|
|
|
+ "timeout", t->async_timeout);
|
|
|
write_sysfs_val(t->devices[i].sysfs_entry,
|
|
|
- "timeout", t->async_timeout);
|
|
|
- write_sysfs_val(t->devices[i].sysfs_entry,
|
|
|
- "outstanding_operations_max",
|
|
|
- t->async_outstanding_operations);
|
|
|
+ "outstanding_operations_max",
|
|
|
+ t->async_outstanding_operations);
|
|
|
} else
|
|
|
- write_sysfs_val(t->devices[i].sysfs_entry,
|
|
|
- "async", 0);
|
|
|
+ write_sysfs_val(t->devices[i].sysfs_entry, "async", 0);
|
|
|
}
|
|
|
}
|
|
|
|