Skip to content

Z
ZIO
Commit 34adc3c3 authored by Alessandro Rubini's avatar Alessandro Rubini Committed by Federico Vaga
Browse files
Options

tools/zio-dump: add sniff mode 

Add "-s", so the dumper knows the file argument is a sequence
of control structures, with no data intermixed.
Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
Acked-by: 's avatarFederico Vaga <federico.vaga@gmail.com>
parent 87ce2046
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 5 deletions
tools/zio-dump.c
View file @ 34adc3c3
...@@ -147,7 +147,10 @@ void read_channel(int cfd, int dfd, FILE *log) ...@@ -147,7 +147,10 @@ void read_channel(int cfd, int dfd, FILE *log)
print_attributes(&ctrl); print_attributes(&ctrl);
/* FIXME: some control information not being printed yet */ /* FIXME: some control information not being printed yet */
if (dfd < 0) {
/* No data (i.e., we are sniffing control-only) */
return;
}
if (cfd != dfd) { if (cfd != dfd) {
/* different files, we expect _only_ this data */ /* different files, we expect _only_ this data */
i = read(dfd, buf, sizeof(buf)); i = read(dfd, buf, sizeof(buf));
...@@ -203,7 +206,9 @@ void help(char *name) ...@@ -203,7 +206,9 @@ void help(char *name)
fprintf(stderr, fprintf(stderr,
" -a dump attributes too\n" " -a dump attributes too\n"
" -A dump all attributes\n" " -A dump all attributes\n"
" -c control-only or combined (ctrl+data)\n" " -c 1 control only or combined (ctrl+data)\n"
" -s sniff-device (array of controls)\n"
" -m print memory address (for mmap)\n"
" -n <number> stop after that many blocks\n"); " -n <number> stop after that many blocks\n");
exit(1); exit(1);
} }
...@@ -217,12 +222,12 @@ int main(int argc, char **argv) ...@@ -217,12 +222,12 @@ int main(int argc, char **argv)
int *dfd; /* data file descriptors */ int *dfd; /* data file descriptors */
fd_set control_set, ready_set; fd_set control_set, ready_set;
int c, i, j, maxfd, ndev; int c, i, j, maxfd, ndev;
int combined = 0; int combined = 0, sniff = 0;
unsigned long nblocks = -1; /* forever by default */ unsigned long nblocks = -1; /* forever by default */
prgname = argv[0]; prgname = argv[0];
while ((c = getopt (argc, argv, "aAcmn:")) != -1) { while ((c = getopt (argc, argv, "aAcsmn:")) != -1) {
switch(c) { switch(c) {
case 'a': case 'a':
opt_print_attr = 1; opt_print_attr = 1;
...@@ -233,6 +238,10 @@ int main(int argc, char **argv) ...@@ -233,6 +238,10 @@ int main(int argc, char **argv)
case 'c': case 'c':
combined = 1; combined = 1;
break; break;
case 's':
combined = 1; /* sniff is a special combined case */
sniff = 1;
break;
case 'm': case 'm':
opt_print_memaddr = 1; opt_print_memaddr = 1;
break; break;
...@@ -331,8 +340,12 @@ int main(int argc, char **argv) ...@@ -331,8 +340,12 @@ int main(int argc, char **argv)
strerror(errno)); strerror(errno));
exit(1); exit(1);
} }
if (sniff)
dfd[0] = -1;
else
dfd[0] = cfd[0];
while (nblocks) { while (nblocks) {
read_channel(cfd[0], cfd[0], f); read_channel(cfd[0], dfd[0], f);
if (nblocks > 0) if (nblocks > 0)
nblocks--; nblocks--;
} }
......
Markdown is supported
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