summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--runtime/stpd/ChangeLog4
-rw-r--r--runtime/stpd/stp_merge.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/runtime/stpd/ChangeLog b/runtime/stpd/ChangeLog
index 2f403049..b32b8e1b 100644
--- a/runtime/stpd/ChangeLog
+++ b/runtime/stpd/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-18 Martin Hunt <hunt@redhat.com>
+
+ * stp_merge.c (main): Fix dropped count calculation.
+
2005-07-14 Tom Zanussi <zanussi@us.ibm.com>
* librelay.c (reader_thread): Add missing pthread_mutex_lock
diff --git a/runtime/stpd/stp_merge.c b/runtime/stpd/stp_merge.c
index 739e34cd..e9b449d2 100644
--- a/runtime/stpd/stp_merge.c
+++ b/runtime/stpd/stp_merge.c
@@ -99,9 +99,9 @@ int main (int argc, char *argv[])
fputc_unlocked (c, ofp);
}
if (min && ++count != min) {
- // fprintf(stderr, "got %ld. expected %ld\n", min, count);
+ //fprintf(stderr, "got %ld. expected %ld\n", min, count);
+ dropped += min - count ;
count = min;
- dropped++ ;
}
if (fread (buf, TIMESTAMP_SIZE, 1, fp[j]))