projects
/
ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ust-consumerd: fix exit race crashes
[ust.git]
/
libustconsumer
/
libustconsumer.c
diff --git
a/libustconsumer/libustconsumer.c
b/libustconsumer/libustconsumer.c
index 25c84ce0c48d36b20ef6369e8f0a60d5a2508293..abf21d801ca1473fd8b1b3c1453636361fc0199a 100644
(file)
--- a/
libustconsumer/libustconsumer.c
+++ b/
libustconsumer/libustconsumer.c
@@
-34,7
+34,7
@@
#include <ust/ustconsumer.h>
#include "lowlevel.h"
#include <ust/ustconsumer.h>
#include "lowlevel.h"
-#include "usterr.h"
+#include "usterr
_signal_safe
.h"
#include "ustcomm.h"
#define GET_SUBBUF_OK 1
#include "ustcomm.h"
#define GET_SUBBUF_OK 1
@@
-353,6
+353,10
@@
struct buffer_info *connect_buffer(struct ustconsumer_instance *instance, pid_t
goto close_fifo;
}
goto close_fifo;
}
+ /* Set subbuffer's information */
+ buf->subbuf_size_order = get_count_order(buf->subbuf_size);
+ buf->alloc_size = buf->subbuf_size * buf->n_subbufs;
+
/* attach memory */
buf->mem = shmat(buf->shmid, NULL, 0);
if(buf->mem == (void *) 0) {
/* attach memory */
buf->mem = shmat(buf->shmid, NULL, 0);
if(buf->mem == (void *) 0) {
@@
-422,6
+426,11
@@
static void destroy_buffer(struct ustconsumer_callbacks *callbacks,
{
int result;
{
int result;
+ result = close(buf->pipe_fd);
+ if(result == -1) {
+ WARN("problem closing the pipe fd");
+ }
+
result = close(buf->app_sock);
if(result == -1) {
WARN("problem calling ustcomm_close_app");
result = close(buf->app_sock);
if(result == -1) {
WARN("problem calling ustcomm_close_app");
@@
-468,6
+477,8
@@
int consumer_loop(struct ustconsumer_instance *instance, struct buffer_info *buf
DBG("App died while being traced");
finish_consuming_dead_subbuffer(instance->callbacks, buf);
break;
DBG("App died while being traced");
finish_consuming_dead_subbuffer(instance->callbacks, buf);
break;
+ } else if (read_result == -1 && errno == EINTR) {
+ continue;
}
if(instance->callbacks->on_read_subbuffer)
}
if(instance->callbacks->on_read_subbuffer)
@@
-621,7
+632,7
@@
static void process_client_cmd(int sock, struct ustcomm_header *req_header,
char *recvbuf, struct ustconsumer_instance *instance)
{
int result;
char *recvbuf, struct ustconsumer_instance *instance)
{
int result;
- struct ustcomm_header _res_header;
+ struct ustcomm_header _res_header
= {0}
;
struct ustcomm_header *res_header = &_res_header;
struct ustcomm_buffer_info *buf_inf;
struct ustcomm_header *res_header = &_res_header;
struct ustcomm_buffer_info *buf_inf;
@@
-774,8
+785,11
@@
int ustconsumer_stop_instance(struct ustconsumer_instance *instance, int send_ms
struct sockaddr_un addr;
struct sockaddr_un addr;
+socket_again:
result = fd = socket(PF_UNIX, SOCK_STREAM, 0);
if(result == -1) {
result = fd = socket(PF_UNIX, SOCK_STREAM, 0);
if(result == -1) {
+ if (errno == EINTR)
+ goto socket_again;
PERROR("socket");
return 1;
}
PERROR("socket");
return 1;
}
@@
-785,13
+799,21
@@
int ustconsumer_stop_instance(struct ustconsumer_instance *instance, int send_ms
strncpy(addr.sun_path, instance->sock_path, UNIX_PATH_MAX);
addr.sun_path[UNIX_PATH_MAX-1] = '\0';
strncpy(addr.sun_path, instance->sock_path, UNIX_PATH_MAX);
addr.sun_path[UNIX_PATH_MAX-1] = '\0';
+connect_again:
result = connect(fd, (struct sockaddr *)&addr, sizeof(addr));
if(result == -1) {
result = connect(fd, (struct sockaddr *)&addr, sizeof(addr));
if(result == -1) {
+ if (errno == EINTR)
+ goto connect_again;
PERROR("connect");
}
PERROR("connect");
}
- while(bytes != sizeof(msg))
- bytes += send(fd, msg, sizeof(msg), 0);
+ while(bytes != sizeof(msg)) {
+ int inc = send(fd, msg, sizeof(msg), 0);
+ if (inc < 0 && errno != EINTR)
+ break;
+ else
+ bytes += inc;
+ }
close(fd);
close(fd);
@@
-837,7
+859,7
@@
static int init_ustconsumer_socket(struct ustconsumer_instance *instance)
int result;
/* Only check if socket dir exists if we are using the default directory */
int result;
/* Only check if socket dir exists if we are using the default directory */
- result = ensure_dir_exists(SOCK_DIR);
+ result = ensure_dir_exists(SOCK_DIR
, S_IRWXU | S_IRWXG | S_IRWXO
);
if (result == -1) {
ERR("Unable to create socket directory %s", SOCK_DIR);
return -1;
if (result == -1) {
ERR("Unable to create socket directory %s", SOCK_DIR);
return -1;
This page took
0.024316 seconds
and
4
git commands to generate.