Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/usermode/usermode Move the thunk_rfb_send_pending()...



details:   https://anonhg.NetBSD.org/src/rev/f92aa4b43d8d
branches:  trunk
changeset: 772368:f92aa4b43d8d
user:      reinoud <reinoud%NetBSD.org@localhost>
date:      Sat Dec 31 12:57:12 2011 +0000

description:
Move the thunk_rfb_send_pending() up to where it belonged. It could disconnect
AND event could be NULL while it still would need to send... i.e. the barrier
in vncfbcopyrows()

diffstat:

 sys/arch/usermode/usermode/thunk.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (35 lines):

diff -r ba87db187a7d -r f92aa4b43d8d sys/arch/usermode/usermode/thunk.c
--- a/sys/arch/usermode/usermode/thunk.c        Sat Dec 31 12:38:56 2011 +0000
+++ b/sys/arch/usermode/usermode/thunk.c        Sat Dec 31 12:57:12 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: thunk.c,v 1.69 2011/12/31 12:38:56 reinoud Exp $ */
+/* $NetBSD: thunk.c,v 1.70 2011/12/31 12:57:12 reinoud Exp $ */
 
 /*-
  * Copyright (c) 2011 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -28,7 +28,7 @@
 
 #include <sys/cdefs.h>
 #ifdef __NetBSD__
-__RCSID("$NetBSD: thunk.c,v 1.69 2011/12/31 12:38:56 reinoud Exp $");
+__RCSID("$NetBSD: thunk.c,v 1.70 2011/12/31 12:57:12 reinoud Exp $");
 #endif
 
 #include <sys/types.h>
@@ -1181,14 +1181,14 @@
                thunk_rfb_update(rfb, 0, 0, rfb->width, rfb->height);
        }
 
+       thunk_rfb_send_pending(rfb);
+
        if (rfb->clientfd == -1)
                return -1;
 
        if (event == NULL)
                return 0;
 
-       thunk_rfb_send_pending(rfb);
-
        if (rfb->schedule_bell) {
                uint8_t msg_type = 2;   /* bell */
                safe_send(rfb->clientfd, &msg_type, sizeof(msg_type));



Home | Main Index | Thread Index | Old Index