projects
/
ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
finish_consuming_dead_subbuffer: cleanup
[ust.git]
/
libustconsumer
/
libustconsumer.c
diff --git
a/libustconsumer/libustconsumer.c
b/libustconsumer/libustconsumer.c
index 739a22235198c2cc67668c029738c3baf41ac542..ef54fe807352bf5be8242b8bf0e205fe1aaa26c4 100644
(file)
--- a/
libustconsumer/libustconsumer.c
+++ b/
libustconsumer/libustconsumer.c
@@
-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) {
@@
-445,7
+449,8
@@
static void destroy_buffer(struct ustconsumer_callbacks *callbacks,
int consumer_loop(struct ustconsumer_instance *instance, struct buffer_info *buf)
{
int consumer_loop(struct ustconsumer_instance *instance, struct buffer_info *buf)
{
- int result, read_result;
+ int result = 0;
+ int read_result;
char read_buf;
pthread_cleanup_push(decrement_active_buffers, instance);
char read_buf;
pthread_cleanup_push(decrement_active_buffers, instance);
@@
-620,7
+625,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;
This page took
0.024433 seconds
and
4
git commands to generate.