Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[dv/dpi] tcp_server_create changes #25646

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[dv/dpi] tcp_server_create changes #25646

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
555e1d9
[dv/dpi] tcp_server error out on port conflict
kwalker27 Nov 27, 2024
6b0a9e3
[dv/dpi] tcp_server synchronous socket create
kwalker27 Nov 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 16 additions & 14 deletions hw/dv/dpi/common/tcp_server/tcp_server.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,26 +311,16 @@ static void ctx_free(struct tcp_server_ctx *ctx) {
}

/**
* Thread function to create a new server instance
* Thread function to process server events
*
* @param ctx_void context object
* @return Always returns NULL
*/
static void *server_create(void *ctx_void) {
static void *server_process(void *ctx_void) {
// Cast to a server struct
struct tcp_server_ctx *ctx = (struct tcp_server_ctx *)ctx_void;
struct timeval timeout;

// Start the server
int rv = start(ctx);
if (rv != 0) {
fprintf(stderr, "%s: Unable to create TCP server on port %d\n",
ctx->display_name, ctx->listen_port);
goto err_cleanup_return;
}

// Initialise fd_set

// Start waiting for connection / data
char xfer_data;
while (ctx->socket_run) {
Expand All @@ -352,7 +342,7 @@ static void *server_create(void *ctx_void) {
timeout.tv_usec = 50;

// Wait for socket activity or timeout
rv = select(mfd + 1, &read_fds, NULL, NULL, &timeout);
int rv = select(mfd + 1, &read_fds, NULL, NULL, &timeout);

if (rv < 0) {
if (errno == EINTR) {
Expand Down Expand Up @@ -416,7 +406,19 @@ struct tcp_server_ctx *tcp_server_create(const char *display_name,
ctx->display_name = strdup(display_name);
assert(ctx->display_name);

if (pthread_create(&ctx->sock_thread, NULL, server_create, (void *)ctx) !=
// Open the listening socket synchronously
int rv = start(ctx);
if (rv != 0) {
fprintf(stderr, "%s: Unable to create TCP server on port %d\n",
ctx->display_name, ctx->listen_port);
// Failing to create the listening socket is treated as a fatal
// error. If the creation of this socket is not important, it
// should not even be attempted.
assert(false);
}

// Start a thread to accept connections and transfer data
if (pthread_create(&ctx->sock_thread, NULL, server_process, (void *)ctx) !=
0) {
fprintf(stderr, "%s: Unable to create TCP socket thread\n",
ctx->display_name);
Expand Down
Loading