projects
/
ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
jhash: add cast
[ust.git]
/
libustcomm
/
ustcomm.c
diff --git
a/libustcomm/ustcomm.c
b/libustcomm/ustcomm.c
index 8324f21decad53d79a8659657bb2d000e90c914b..155dfd0087c53aaba52fa866f87f9eca7a1c457d 100644
(file)
--- a/
libustcomm/ustcomm.c
+++ b/
libustcomm/ustcomm.c
@@
-247,9
+247,13
@@
static int recv_message_fd(int fd, char **recv_buf, int *recv_buf_size, int *rec
*recv_buf_size = 0;
return 0;
}
*recv_buf_size = 0;
return 0;
}
- /* real error */
- PERROR("recv");
- return -1;
+ else if(errno == EINTR) {
+ return -1;
+ }
+ else {
+ PERROR("recv");
+ return -1;
+ }
}
if(result == 0) {
return 0;
}
if(result == 0) {
return 0;
@@
-348,15
+352,18
@@
int ustcomm_recv_message(struct ustcomm_server *server, char **msg, struct ustco
idx++;
}
idx++;
}
- while((result = poll(fds, n_fds, timeout)) == -1 && errno == EINTR)
- /* nothing */;
- if(result == -1) {
+ result = poll(fds, n_fds, timeout);
+ if(result == -1 && errno == EINTR) {
+ /* That's ok. ustd receives signals to notify it must shutdown. */
+ retval = -1;
+ goto free_conn_table_return;
+ }
+ else if(result == -1) {
PERROR("poll");
retval = -1;
goto free_conn_table_return;
}
PERROR("poll");
retval = -1;
goto free_conn_table_return;
}
-
- if(result == 0) {
+ else if(result == 0) {
retval = 0;
goto free_conn_table_return;
}
retval = 0;
goto free_conn_table_return;
}
@@
-927,7
+934,7
@@
int free_ustcomm_client_poll(void *data)
return 0;
}
return 0;
}
-void ustcomm_mp_add_app_clients(struct mpentries *ent, struct ustcomm_app *app, int (*cb)(
struct ustcomm_connection *conn, char *msg
))
+void ustcomm_mp_add_app_clients(struct mpentries *ent, struct ustcomm_app *app, int (*cb)(
char *recvbuf, struct ustcomm_source *src
))
{
struct ustcomm_connection *conn;
{
struct ustcomm_connection *conn;
This page took
0.023562 seconds
and
4
git commands to generate.