diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-04-08 16:00:07 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-04-08 16:00:07 +0000 |
commit | 7fe2412222a5198f9e169ce0effa8318320fe3ad (patch) | |
tree | a7ce485be0cac8f35324dc264f433104555c8424 /cras/src/server/cras_server.c | |
parent | 4f97d6740411fb53a4fb5f6e1af03e1f1b28c1ba (diff) | |
parent | 8d2c5b2edb9023b91d79709f2900ee1b643a3127 (diff) | |
download | adhd-android12-mainline-tzdata2-release.tar.gz |
Snap for 8426163 from 8d2c5b2edb9023b91d79709f2900ee1b643a3127 to mainline-tzdata2-releaseandroid-mainline-12.0.0_r112aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseaml_tz2_305400100
Change-Id: I127ce133361317d9ebfb8ef2a903afdd64a6feeb
Diffstat (limited to 'cras/src/server/cras_server.c')
-rw-r--r-- | cras/src/server/cras_server.c | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/cras/src/server/cras_server.c b/cras/src/server/cras_server.c index 5f2ce632..97c83dfd 100644 --- a/cras/src/server/cras_server.c +++ b/cras/src/server/cras_server.c @@ -79,18 +79,16 @@ struct attached_client { * to watch file descriptors. The client can then read or write the fd. * Members: * fd - The file descriptor passed to select. - * callback - The funciton to call when fd is ready. + * callack - The funciton to call when fd is ready. * callback_data - Pointer passed to the callback. * pollfd - Pointer to struct pollfd for this callback. - * events - The events to poll for. */ struct client_callback { int select_fd; - void (*callback)(void *data, int revents); + void (*callback)(void *); void *callback_data; struct pollfd *pollfd; int deleted; - int events; struct client_callback *prev, *next; }; @@ -279,8 +277,8 @@ error: /* Add a file descriptor to be passed to select in the main loop. This is * registered with system state so that it is called when any client asks to * have a callback triggered based on an fd being readable. */ -static int add_select_fd(int fd, void (*cb)(void *data, int events), - void *callback_data, int events, void *server_data) +static int add_select_fd(int fd, void (*cb)(void *data), void *callback_data, + void *server_data) { struct client_callback *new_cb; struct client_callback *client_cb; @@ -303,7 +301,6 @@ static int add_select_fd(int fd, void (*cb)(void *data, int events), new_cb->callback = cb; new_cb->callback_data = callback_data; new_cb->deleted = 0; - new_cb->events = events; new_cb->pollfd = NULL; DL_APPEND(serv->client_callbacks, new_cb); @@ -477,7 +474,7 @@ int cras_server_init() * Returns 0 on success and leaves the created fd and the address information * in server_socket. * When error occurs, the created fd will be closed and the file path will be - * unlinked and returns negative error code. + * unlinked. */ static int create_and_listen_server_socket(enum CRAS_CONNECTION_TYPE conn_type, struct server_socket *server_socket) @@ -511,7 +508,7 @@ static int create_and_listen_server_socket(enum CRAS_CONNECTION_TYPE conn_type, sizeof(struct sockaddr_un)); if (rc < 0) { syslog(LOG_ERR, "Bind to server socket failed."); - rc = -errno; + rc = errno; goto error; } @@ -522,7 +519,7 @@ static int create_and_listen_server_socket(enum CRAS_CONNECTION_TYPE conn_type, if (listen(socket_fd, 5) != 0) { syslog(LOG_ERR, "Listen on server socket failed."); - rc = -errno; + rc = errno; goto error; } @@ -644,7 +641,7 @@ int cras_server_run(unsigned int profile_disable_mask) if (client_cb->deleted) continue; pollfds[num_pollfds].fd = client_cb->select_fd; - pollfds[num_pollfds].events = client_cb->events; + pollfds[num_pollfds].events = POLLIN; client_cb->pollfd = &pollfds[num_pollfds]; num_pollfds++; } @@ -690,9 +687,8 @@ int cras_server_run(unsigned int profile_disable_mask) /* Check any client-registered fd/callback pairs. */ DL_FOREACH (server_instance.client_callbacks, client_cb) if (!client_cb->deleted && client_cb->pollfd && - (client_cb->pollfd->revents & client_cb->events)) - client_cb->callback(client_cb->callback_data, - client_cb->pollfd->revents); + (client_cb->pollfd->revents & POLLIN)) + client_cb->callback(client_cb->callback_data); cleanup_select_fds(&server_instance); @@ -717,4 +713,4 @@ void cras_server_send_to_all_clients(const struct cras_client_message *msg) DL_FOREACH (server_instance.clients_head, client) cras_rclient_send_message(client->client, msg, NULL, 0); -} +}
\ No newline at end of file |