mirror/libserialport
mirror/libserialport
1
0
Fork 0
mirror of git://sigrok.org/libserialport synced 2023-08-10 21:13:24 +03:00
Code Issues Projects Releases Wiki Activity

windows: Use an adaptively sized buffer for nonblocking writes.

Browse Source
This commit is contained in:
Martin Ling 2017-07-03 21:43:38 +01:00 committed by Uwe Hermann
parent 6bd6a8b520
commit 39df7833f7
2 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libserialport_internal.h
View File

@ -107,7 +107,8 @@ struct sp_port {
OVERLAPPED read_ovl; OVERLAPPED read_ovl;
OVERLAPPED wait_ovl; OVERLAPPED wait_ovl;
DWORD events; DWORD events;
BYTE pending_byte; BYTE *write_buf;
DWORD write_buf_size;
BOOL writing; BOOL writing;
BOOL wait_running; BOOL wait_running;
#else #else

47
serialport.c
View File

@ -104,6 +104,8 @@ SP_API enum sp_return sp_get_port_by_name(const char *portname, struct sp_port *
#ifdef _WIN32 #ifdef _WIN32
port->usb_path = NULL; port->usb_path = NULL;
port->hdl = INVALID_HANDLE_VALUE; port->hdl = INVALID_HANDLE_VALUE;
port->write_buf = NULL;
port->write_buf_size = 0;
#else #else
port->fd = -1; port->fd = -1;
#endif #endif
@ -310,6 +312,8 @@ SP_API void sp_free_port(struct sp_port *port)
#ifdef _WIN32 #ifdef _WIN32
if (port->usb_path) if (port->usb_path)
free(port->usb_path); free(port->usb_path);
if (port->write_buf)
free(port->write_buf);
#endif #endif
free(port); free(port);
@ -643,6 +647,10 @@ SP_API enum sp_return sp_close(struct sp_port *port)
CLOSE_OVERLAPPED(write_ovl); CLOSE_OVERLAPPED(write_ovl);
CLOSE_OVERLAPPED(wait_ovl); CLOSE_OVERLAPPED(wait_ovl);
if (port->write_buf) {
free(port->write_buf);
port->write_buf = NULL;
}
#else #else
/* Returns 0 upon success, -1 upon failure. */ /* Returns 0 upon success, -1 upon failure. */
if (close(port->fd) == -1) if (close(port->fd) == -1)
@ -892,8 +900,7 @@ SP_API enum sp_return sp_nonblocking_write(struct sp_port *port,
RETURN_INT(0); RETURN_INT(0);
#ifdef _WIN32 #ifdef _WIN32
DWORD written = 0; DWORD buf_bytes;
BYTE *ptr = (BYTE *) buf;
/* Check whether previous write is complete. */ /* Check whether previous write is complete. */
if (port->writing) { if (port->writing) {
@ -914,40 +921,26 @@ SP_API enum sp_return sp_nonblocking_write(struct sp_port *port,
RETURN_FAIL("SetCommTimeouts() failed"); RETURN_FAIL("SetCommTimeouts() failed");
} }
/* /* Copy data to our write buffer. */
* Keep writing data until the OS has to actually start an async IO buf_bytes = min(port->write_buf_size, count);
* for it. At that point we know the buffer is full. memcpy(port->write_buf, buf, buf_bytes);
*/
while (written < count) {
/* Copy first byte of user buffer. */
port->pending_byte = *ptr++;
/* Start asynchronous write. */ /* Start asynchronous write. */
if (WriteFile(port->hdl, &port->pending_byte, 1, NULL, &port->write_ovl) == 0) { if (WriteFile(port->hdl, port->write_buf, buf_bytes, NULL, &port->write_ovl) == 0) {
if (GetLastError() == ERROR_IO_PENDING) { if (GetLastError() == ERROR_IO_PENDING) {
if (HasOverlappedIoCompleted(&port->write_ovl)) { if ((port->writing = !HasOverlappedIoCompleted(&port->write_ovl)))
DEBUG("Asynchronous write completed immediately"); DEBUG("Asynchronous write completed immediately");
port->writing = 0; else
written++;
continue;
} else {
DEBUG("Asynchronous write running"); DEBUG("Asynchronous write running");
port->writing = 1;
RETURN_INT(++written);
}
} else { } else {
/* Actual failure of some kind. */ /* Actual failure of some kind. */
RETURN_FAIL("WriteFile() failed"); RETURN_FAIL("WriteFile() failed");
} }
} else {
DEBUG("Single byte written immediately");
written++;
}
} }
DEBUG("All bytes written immediately"); DEBUG("All bytes written immediately");
RETURN_INT(written); RETURN_INT(buf_bytes);
#else #else
/* Returns the number of bytes written, or -1 upon failure. */ /* Returns the number of bytes written, or -1 upon failure. */
ssize_t written = write(port->fd, buf, count); ssize_t written = write(port->fd, buf, count);
@ -1894,6 +1887,14 @@ static enum sp_return set_config(struct sp_port *port, struct port_data *data,
if (i == NUM_STD_BAUDRATES) if (i == NUM_STD_BAUDRATES)
data->dcb.BaudRate = config->baudrate; data->dcb.BaudRate = config->baudrate;
/* Allocate write buffer for 50ms of data at baud rate. */
port->write_buf_size = max(config->baudrate / (8 * 20), 1);
port->write_buf = realloc(port->write_buf,
port->write_buf_size);
if (!port->write_buf)
RETURN_ERROR(SP_ERR_MEM, "Allocating write buffer failed");
} }
if (config->bits >= 0) if (config->bits >= 0)