projects
/
ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Privatize headers
[ust.git]
/
libustconsumer
/
libustconsumer.c
diff --git
a/libustconsumer/libustconsumer.c
b/libustconsumer/libustconsumer.c
index c5acffa030296eda5b775fed81e13ec8b7134b7d..c6dd20c355050c69c04ec8a5e97562f9d49c7056 100644
(file)
--- a/
libustconsumer/libustconsumer.c
+++ b/
libustconsumer/libustconsumer.c
@@
-146,7
+146,7
@@
void decrement_active_buffers(void *arg)
pthread_mutex_unlock(&instance->mutex);
}
pthread_mutex_unlock(&instance->mutex);
}
-static int get_pidunique(int sock,
s64
*pidunique)
+static int get_pidunique(int sock,
int64_t
*pidunique)
{
struct ustcomm_header _send_hdr, *send_hdr;
struct ustcomm_header _recv_hdr, *recv_hdr;
{
struct ustcomm_header _send_hdr, *send_hdr;
struct ustcomm_header _recv_hdr, *recv_hdr;
@@
-477,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)
@@
-541,6
+543,10
@@
void *consumer_thread(void *arg)
int result;
sigset_t sigset;
int result;
sigset_t sigset;
+ pthread_mutex_lock(&args->instance->mutex);
+ args->instance->active_threads++;
+ pthread_mutex_unlock(&args->instance->mutex);
+
if(args->instance->callbacks->on_new_thread)
args->instance->callbacks->on_new_thread(args->instance->callbacks);
if(args->instance->callbacks->on_new_thread)
args->instance->callbacks->on_new_thread(args->instance->callbacks);
@@
-582,6
+588,10
@@
void *consumer_thread(void *arg)
if(args->instance->callbacks->on_close_thread)
args->instance->callbacks->on_close_thread(args->instance->callbacks);
if(args->instance->callbacks->on_close_thread)
args->instance->callbacks->on_close_thread(args->instance->callbacks);
+ pthread_mutex_lock(&args->instance->mutex);
+ args->instance->active_threads--;
+ pthread_mutex_unlock(&args->instance->mutex);
+
free((void *)args->channel);
free(args);
return NULL;
free((void *)args->channel);
free(args);
return NULL;
@@
-733,7
+743,7
@@
int ustconsumer_start_instance(struct ustconsumer_instance *instance)
if (instance->quit_program) {
pthread_mutex_lock(&instance->mutex);
if (instance->quit_program) {
pthread_mutex_lock(&instance->mutex);
- if
(instance->active_buffer
s == 0) {
+ if
(instance->active_buffers == 0 && instance->active_thread
s == 0) {
pthread_mutex_unlock(&instance->mutex);
break;
}
pthread_mutex_unlock(&instance->mutex);
break;
}
@@
-783,8
+793,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;
}
@@
-794,13
+807,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);
This page took
0.026998 seconds
and
4
git commands to generate.