static struct option l_opts[] = {
{
.name = "input",
- .has_arg = 1,
+ .has_arg = required_argument,
.flag = NULL,
.val = 'i'
},
{
.name = "output",
- .has_arg = 1,
+ .has_arg = required_argument,
.flag = NULL,
.val = 'o'
},
{
.name = "batch",
- .has_arg = 1,
+ .has_arg = required_argument,
.flag = NULL,
.val = 'b'
},
{
.name = "per program stats",
- .has_arg = 0,
+ .has_arg = no_argument,
.flag = NULL,
.val = 's'
},
{
.name = "track ios",
- .has_arg = 0,
+ .has_arg = no_argument,
.flag = NULL,
.val = 't'
},
{
.name = "quiet",
- .has_arg = 0,
+ .has_arg = no_argument,
.flag = NULL,
.val = 'q'
},
{
.name = "stopwatch",
- .has_arg = 1,
+ .has_arg = required_argument,
.flag = NULL,
.val = 'w'
},
{
.name = "format",
- .has_arg = 1,
+ .has_arg = required_argument,
.flag = NULL,
.val = 'f'
},
{
.name = "format-spec",
- .has_arg = 1,
+ .has_arg = required_argument,
.flag = NULL,
.val = 'F'
},
- {
- .name = NULL,
- .has_arg = 0,
- .flag = NULL,
- .val = 0
- }
};
/*
pci->cpu = j;
snprintf(pci->fname, sizeof(pci->fname)-1,
- "%s_out.%d", pdi->name, j);
+ "%s.%d", pdi->name, j);
if (stat(pci->fname, &st) < 0)
break;
if (!st.st_size)
static struct option l_opts[] = {
{
.name = "dev",
- .has_arg = 1,
+ .has_arg = required_argument,
.flag = NULL,
.val = 'd'
},
{
.name = "act-mask",
- .has_arg = 1,
+ .has_arg = required_argument,
.flag = NULL,
.val = 'a'
},
{
.name = "set-mask",
- .has_arg = 1,
+ .has_arg = required_argument,
.flag = NULL,
.val = 'A'
},
{
.name = "relay",
- .has_arg = 1,
+ .has_arg = required_argument,
.flag = NULL,
.val = 'r'
},
{
.name = "output",
- .has_arg = 1,
+ .has_arg = required_argument,
.flag = NULL,
.val = 'o'
},
{
.name = "kill",
- .has_arg = 0,
+ .has_arg = no_argument,
.flag = NULL,
.val = 'k'
},
{
.name = "stopwatch",
- .has_arg = 1,
+ .has_arg = required_argument,
.flag = NULL,
.val = 'w'
},
- {
- .name = NULL,
- .has_arg = 0,
- .flag = NULL,
- .val = 0
- }
};
struct thread_information {
tip->fd_lock = &stdout_mutex;
} else {
if (output_name)
- sprintf(op, "%s_%s_out.%d", output_name,
- dip->buts_name, tip->cpu);
+ sprintf(op, "%s.%d", output_name, tip->cpu);
else
sprintf(op, "%s_out.%d",
dip->buts_name, tip->cpu);
struct device_information *dip;
struct thread_information *tip;
unsigned long long events_processed;
-
+
if (output_name && !strcmp(output_name, "-"))
return;