[Spice-commits] server/red-record-qxl.c server/red-record-qxl.h server/red-worker.c

[Frediano Ziglio]

 server/red-record-qxl.c |    7 ++++---
 server/red-record-qxl.h |    4 ++--
 server/red-worker.c     |   14 +++++++-------
 3 files changed, 13 insertions(+), 12 deletions(-)

New commits:
commit 79c0426194c8fd50a485795762313e945d01522a
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Fri Nov 4 12:50:36 2016 +0000

    replay: Remove time argument from recording functions
    
    Time is always the the current real time so avoid to compute
    it for every call but move to red-record-qxl.c.
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Jonathon Jongsma <jjongsma at redhat.com>

diff --git a/server/red-record-qxl.c b/server/red-record-qxl.c
index 8af2c9c..14a68a7 100644
--- a/server/red-record-qxl.c
+++ b/server/red-record-qxl.c
@@ -803,8 +803,9 @@ void red_record_primary_surface_create(RedRecord *record,
         line_0);
 }
 
-void red_record_event(RedRecord *record, int what, uint32_t type, red_time_t ts)
+void red_record_event(RedRecord *record, int what, uint32_t type)
 {
+    red_time_t ts = spice_get_monotonic_time_ns();
     // TODO: record the size of the packet in the header. This would make
     // navigating it much faster (well, I can add an index while I'm at it..)
     // and make it trivial to get a histogram from a file.
@@ -814,11 +815,11 @@ void red_record_event(RedRecord *record, int what, uint32_t type, red_time_t ts)
 }
 
 void red_record_qxl_command(RedRecord *record, RedMemSlotInfo *slots,
-                            QXLCommandExt ext_cmd, red_time_t ts)
+                            QXLCommandExt ext_cmd)
 {
     FILE *fd = record->fd;
 
-    red_record_event(record, 0, ext_cmd.cmd.type, ts);
+    red_record_event(record, 0, ext_cmd.cmd.type);
 
     switch (ext_cmd.cmd.type) {
     case QXL_CMD_DRAW:
diff --git a/server/red-record-qxl.h b/server/red-record-qxl.h
index 7332afe..0685393 100644
--- a/server/red-record-qxl.h
+++ b/server/red-record-qxl.h
@@ -39,9 +39,9 @@ void red_record_primary_surface_create(RedRecord *record,
                                        QXLDevSurfaceCreate *surface,
                                        uint8_t *line_0);
 
-void red_record_event(RedRecord *record, int what, uint32_t type, red_time_t ts);
+void red_record_event(RedRecord *record, int what, uint32_t type);
 
 void red_record_qxl_command(RedRecord *record, RedMemSlotInfo *slots,
-                            QXLCommandExt ext_cmd, red_time_t ts);
+                            QXLCommandExt ext_cmd);
 
 #endif
diff --git a/server/red-worker.c b/server/red-worker.c
index 60c1ae9..f8c135f 100644
--- a/server/red-worker.c
+++ b/server/red-worker.c
@@ -127,9 +127,9 @@ static int red_process_cursor(RedWorker *worker, int *ring_is_empty)
             return n;
         }
 
-        if (worker->record)
-            red_record_qxl_command(worker->record, &worker->mem_slots, ext_cmd,
-                                   spice_get_monotonic_time_ns());
+        if (worker->record) {
+            red_record_qxl_command(worker->record, &worker->mem_slots, ext_cmd);
+        }
 
         worker->cursor_poll_tries = 0;
         switch (ext_cmd.cmd.type) {
@@ -190,9 +190,9 @@ static int red_process_display(RedWorker *worker, int *ring_is_empty)
             return n;
         }
 
-        if (worker->record)
-            red_record_qxl_command(worker->record, &worker->mem_slots, ext_cmd,
-                                   spice_get_monotonic_time_ns());
+        if (worker->record) {
+            red_record_qxl_command(worker->record, &worker->mem_slots, ext_cmd);
+        }
 
         stat_inc_counter(reds, worker->command_counter, 1);
         worker->display_poll_tries = 0;
@@ -1032,7 +1032,7 @@ static void worker_dispatcher_record(void *opaque, uint32_t message_type, void *
 {
     RedWorker *worker = opaque;
 
-    red_record_event(worker->record, 1, message_type, spice_get_monotonic_time_ns());
+    red_record_event(worker->record, 1, message_type);
 }
 
 static void register_callbacks(Dispatcher *dispatcher)