mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wfreerdp-server: fixed subsequent connection issue

Browse Source
This commit is contained in:
C-o-r-E 2012-08-24 19:39:30 -04:00
parent c6d2d4d6ec
commit 49e97852b4
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
server/Windows/wf_peer.c
View File

@ -56,8 +56,8 @@ static DWORD WINAPI wf_peer_mirror_monitor(LPVOID lpParam)
client = (freerdp_peer*) lpParam;
/* TODO: do not encode when no clients are connected */
while (1)
/* TODO: refactor this */
while (wf_info_has_subscribers(wfInfoSingleton))
{
beg = GetTickCount();
@ -79,6 +79,7 @@ static DWORD WINAPI wf_peer_mirror_monitor(LPVOID lpParam)
Sleep(rate - diff);
}
}
_tprintf(_T("monitor thread terminating...\n"));
wf_info_set_thread_count(wfInfoSingleton, wf_info_get_thread_count(wfInfoSingleton) - 1);
@ -98,13 +99,19 @@ void wf_rfx_encode(freerdp_peer* client)
wfPeerContext* wfp;
GETCHANGESBUF* buf;
SURFACE_BITS_COMMAND* cmd;
wfp = (wfPeerContext*) client->context;
dRes = WaitForSingleObject(wfInfoSingleton->encodeMutex, INFINITE);
switch (dRes)
{
case WAIT_ABANDONED:
printf("\n\nwf_rfx_encode: Got ownership of abandoned mutex... resuming...\n");
//no break
case WAIT_OBJECT_0:
wf_info_find_invalid_region(wfInfoSingleton);
@ -164,12 +171,6 @@ void wf_rfx_encode(freerdp_peer* client)
ReleaseMutex(wfInfoSingleton->encodeMutex);
break;
case WAIT_ABANDONED:
printf("\n\nwf_rfx_encode: Got ownership of abandoned mutex... releasing...\n", dRes);
ReleaseMutex(wfInfoSingleton->encodeMutex);
break;
default:
printf("\n\nwf_rfx_encode: Something else happened!!! dRes = %d\n", dRes);
break;
@ -257,6 +258,11 @@ void wf_peer_send_changes(rdpUpdate* update)
switch(dRes)
{
case WAIT_ABANDONED:
printf("\n\nwf_peer_send_changes: Got ownership of abandoned mutex... resuming...\n");
//no break;
case WAIT_OBJECT_0:
/* are there changes to send? */