(Hopefully this works better than my last patch attempt - Jens: the other patches got put on the back burner for some work-related stuff, I'll get to those in the New Year.)

Alan
Fix problem where empty input files cause premature parsing of files.

From: Alan D. Brunelle <[EMAIL PROTECTED]>

Had a problem where CPU 0 opened a file with 0 traces, and that caused the
run to end before processing other trace files.
---

 blkparse.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/blkparse.c b/blkparse.c
index bded2f8..0d2ea12 100644
--- a/blkparse.c
+++ b/blkparse.c
@@ -2249,8 +2249,10 @@ static int setup_file(struct per_dev_inf
 
        snprintf(pci->fname + len, sizeof(pci->fname)-1-len,
                 "%s.blktrace.%d", pdi->name, pci->cpu);
-       if (stat(pci->fname, &st) < 0 || !st.st_size)
+       if (stat(pci->fname, &st) < 0)
                return 0;
+       if (!st.st_size)
+               return 1;
 
        pci->fd = open(pci->fname, O_RDONLY);
        if (pci->fd < 0) {

Reply via email to