Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-04 23:03:27 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

VNC: Fix some obvious logic and coding errors found in early testing

Browse Source
This commit is contained in:
Gregory Nutt
2016-04-18 15:34:39 -06:00
parent 8f26e46c40
commit 5997373b55
5 changed files with 87 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
graphics/vnc/server/vnc_fbdev.c
+38 -13
View File
@@ -46,6 +46,7 @@
#include <debug.h>
#include <nuttx/kthread.h>
#include <nuttx/semaphore.h>
#include <nuttx/video/fb.h>
#include "vnc_server.h"
@@ -136,7 +137,7 @@ static struct vnc_fbinfo_s g_fbinfo[RFB_MAX_DISPLAYS];
* for the semaphores.
*/
sem_t g_fbsem[RFB_MAX_DISPLAYS];
struct fb_startup_s g_fbstartup[RFB_MAX_DISPLAYS];
/****************************************************************************
* Private Functions
@@ -398,6 +399,9 @@ static int up_setcursor(FAR struct fb_vtable_s *vtable,
static inline int vnc_wait_server(int display)
{
int errcode;
int result;
/* Check if there has been a session allocated yet. This is one of the
* first things that the VNC server will do with the kernel thread is
* started. But we might be here before the thread has gotten that far.
@@ -412,20 +416,38 @@ static inline int vnc_wait_server(int display)
while (g_vnc_sessions[display] == NULL ||
g_vnc_sessions[display]->state != VNCSERVER_RUNNING)
{
/* The server is not yet running. Wait for the server to post the FB
* semaphore. In certain error situations, the server may post the
* semaphore, then reset it to zero. There are are certainly race
* conditions here, but I think none that are fatal.
*/
{
/* The server is not yet running. Wait for the server to post the FB
* semaphore. In certain error situations, the server may post the
* semaphore, then reset it to zero. There are are certainly race
* conditions here, but I think none that are fatal.
*/
while (sem_wait(&g_fbsem[display]) < 0)
{
/* sem_wait() should fail only if it is interrupt by a signal. */
while (sem_wait(&g_fbstartup[display].fbsem) < 0)
{
errcode = get_errno();
DEBUGASSERT(get_errno() == EINTR);
}
}
/* sem_wait() should fail only if it is interrupt by a signal. */
DEBUGASSERT(errcode == EINTR);
if (errcode != EINTR)
{
DEBUGASSERT(errcode > 0);
return -errcode;
}
}
/* We were awakened. A result of -EBUSY means that the negotiation
* is not complete. Why would we be awakened in that case? Some
* counting semaphore screw-up?
*/
result = g_fbstartup[display].result;
if (result != -EBUSY)
{
return result;
}
}
return OK;
}
@@ -466,6 +488,9 @@ int up_fbinitialize(int display)
/* Check if the server is already running */
g_fbstartup[display].result = -EBUSY;
sem_reset(&g_fbstartup[display].fbsem, 0);
if (g_vnc_sessions[display] != NULL)
{
DEBUGASSERT(g_vnc_sessions[display]->state >= VNCSERVER_INITIALIZED);