blkparse: split off the timestamp correction code in to a separate function

[blktrace.git] / btt / trace_queue.c

diff --git a/btt/trace_queue.c b/btt/trace_queue.c
index f882ad2ee0a4d48ca5ab23b1ad6393b70bc4f1c8..8edcd90b6283a35acbe148abd61009b0b59e4c9e 100644 (file)
--- a/btt/trace_queue.c
+++ b/btt/trace_queue.c
@@ -23,19 +23,29 @@
 static void handle_queue(struct io *q_iop)
 {
        seeki_add(q_iop->dip->q2q_handle, q_iop);
-       update_lq(&last_q, &all_avgs.q2q, q_iop->t.time);
        update_qregion(&all_regions, q_iop->t.time);
        dip_update_q(q_iop->dip, q_iop);
        pip_update_q(q_iop);
-       if (!remapper_dev(q_iop->t.device))
+       if (remapper_dev(q_iop->t.device))
+               update_lq(&last_q, &all_avgs.q2q_dm, q_iop->t.time);
+       else {
                update_q_histo(q_iop->t.bytes);
+               update_lq(&last_q, &all_avgs.q2q, q_iop->t.time);
+       }
 
-       q_iop->i_time = q_iop->gm_time = q_iop->d_time = (__u64)-1;
-       q_iop->is_getrq = -1;
+       q_iop->i_time = q_iop->g_time = q_iop->c_time = q_iop->m_time =
+                                               q_iop->d_time = (__u64)-1;
+       q_iop->dip->n_qs++;
+
+       q_iop->dip->t_act_q += q_iop->dip->n_act_q;
+       q_iop->dip->n_act_q++;
 }
 
 void trace_queue(struct io *q_iop)
 {
+       if (q_iop->t.bytes == 0)
+               return;
+
        if (io_setup(q_iop, IOP_Q))
                handle_queue(q_iop);
        else