projects
/
ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Markers: API change: rename trace_mark() to ust_marker()
[ust.git]
/
libustconsumer
/
libustconsumer.c
diff --git
a/libustconsumer/libustconsumer.c
b/libustconsumer/libustconsumer.c
index 25c84ce0c48d36b20ef6369e8f0a60d5a2508293..c5acffa030296eda5b775fed81e13ec8b7134b7d 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");
@@
-621,7
+630,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;
@@
-837,7
+846,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.024961 seconds
and
4
git commands to generate.