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

serial: removed the Write thread (kept the read and main threads)

Browse Source 
serial: better closing
This commit is contained in:
Emmanuel Ledoux 2014-05-13 15:12:14 +02:00 committed by Emmanuel Ledoux
parent 7e36374a89
commit 7ec15d9683
1 changed files with 1 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
channels/serial/client/serial_main.c
View File

@ -69,9 +69,6 @@ struct _SERIAL_DEVICE
HANDLE ReadThread; HANDLE ReadThread;
wMessageQueue* ReadIrpQueue; wMessageQueue* ReadIrpQueue;
HANDLE WriteThread;
wMessageQueue* WriteIrpQueue;
}; };
static void serial_process_irp_create(SERIAL_DEVICE* serial, IRP* irp) static void serial_process_irp_create(SERIAL_DEVICE* serial, IRP* irp)
@ -499,37 +496,6 @@ static void* serial_read_thread_func(void* arg)
return NULL; return NULL;
} }
static void* serial_write_thread_func(void* arg)
{
IRP* irp;
wMessage message;
SERIAL_DEVICE* serial = (SERIAL_DEVICE*) arg;
while (1)
{
if (!MessageQueue_Wait(serial->WriteIrpQueue))
break;
if (!MessageQueue_Peek(serial->WriteIrpQueue, &message, TRUE))
break;
if (message.id == WMQ_QUIT)
break;
irp = (IRP*) message.wParam;
if (irp)
{
assert(irp->MajorFunction == IRP_MJ_WRITE);
serial_process_irp(serial, irp);
}
}
ExitThread(0);
return NULL;
}
static void* serial_thread_func(void* arg) static void* serial_thread_func(void* arg)
{ {
IRP* irp; IRP* irp;
@ -577,10 +543,6 @@ static void serial_irp_request(DEVICE* device, IRP* irp)
MessageQueue_Post(serial->ReadIrpQueue, NULL, 0, (void*) irp, NULL); MessageQueue_Post(serial->ReadIrpQueue, NULL, 0, (void*) irp, NULL);
break; break;
case IRP_MJ_WRITE:
MessageQueue_Post(serial->WriteIrpQueue, NULL, 0, (void*) irp, NULL);
break;
default: default:
MessageQueue_Post(serial->MainIrpQueue, NULL, 0, (void*) irp, NULL); MessageQueue_Post(serial->MainIrpQueue, NULL, 0, (void*) irp, NULL);
} }
@ -592,16 +554,10 @@ static void serial_free(DEVICE* device)
WLog_Print(serial->log, WLOG_DEBUG, "freeing"); WLog_Print(serial->log, WLOG_DEBUG, "freeing");
/* TMP: FIXME: also send a signal to interrupt I/O */
MessageQueue_PostQuit(serial->ReadIrpQueue, 0); MessageQueue_PostQuit(serial->ReadIrpQueue, 0);
WaitForSingleObject(serial->ReadThread, INFINITE); WaitForSingleObject(serial->ReadThread, 100 /* ms */); /* INFINITE might block on a read, FIXME: is a better signal possible? */
CloseHandle(serial->ReadThread); CloseHandle(serial->ReadThread);
MessageQueue_PostQuit(serial->WriteIrpQueue, 0);
WaitForSingleObject(serial->WriteThread, INFINITE);
CloseHandle(serial->WriteThread);
MessageQueue_PostQuit(serial->MainIrpQueue, 0); MessageQueue_PostQuit(serial->MainIrpQueue, 0);
WaitForSingleObject(serial->MainThread, INFINITE); WaitForSingleObject(serial->MainThread, INFINITE);
CloseHandle(serial->MainThread); CloseHandle(serial->MainThread);
@ -612,7 +568,6 @@ static void serial_free(DEVICE* device)
/* Clean up resources */ /* Clean up resources */
Stream_Free(serial->device.data, TRUE); Stream_Free(serial->device.data, TRUE);
MessageQueue_Free(serial->ReadIrpQueue); MessageQueue_Free(serial->ReadIrpQueue);
MessageQueue_Free(serial->WriteIrpQueue);
MessageQueue_Free(serial->MainIrpQueue); MessageQueue_Free(serial->MainIrpQueue);
free(serial); free(serial);
@ -666,7 +621,6 @@ int DeviceServiceEntry(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints)
Stream_Write_UINT8(serial->device.data, name[i] < 0 ? '_' : name[i]); Stream_Write_UINT8(serial->device.data, name[i] < 0 ? '_' : name[i]);
serial->ReadIrpQueue = MessageQueue_New(NULL); serial->ReadIrpQueue = MessageQueue_New(NULL);
serial->WriteIrpQueue = MessageQueue_New(NULL);
serial->MainIrpQueue = MessageQueue_New(NULL); serial->MainIrpQueue = MessageQueue_New(NULL);
WLog_Init(); WLog_Init();
@ -682,13 +636,6 @@ int DeviceServiceEntry(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints)
0, 0,
NULL); NULL);
serial->WriteThread = CreateThread(NULL,
0,
(LPTHREAD_START_ROUTINE) serial_write_thread_func,
(void*) serial,
0,
NULL);
serial->MainThread = CreateThread(NULL, serial->MainThread = CreateThread(NULL,
0, 0,
(LPTHREAD_START_ROUTINE) serial_thread_func, (LPTHREAD_START_ROUTINE) serial_thread_func,