#include <errno.h>
#include <assert.h>
-#include "libustd.h"
+#include <ust/ustd.h>
+#include "lowlevel.h"
#include "usterr.h"
#include "ustcomm.h"
int retval;
int result;
- asprintf(&send_msg, "get_subbuffer %s", buf->name);
- result = ustcomm_send_request(&buf->conn, send_msg, &received_msg);
+ if (asprintf(&send_msg, "get_subbuffer %s", buf->name) < 0) {
+ ERR("get_subbuffer : asprintf failed (%s)",
+ buf->name);
+ retval = -1;
+ goto end;
+ }
+ result = ustcomm_send_request(buf->conn, send_msg, &received_msg);
if((result == -1 && (errno == ECONNRESET || errno == EPIPE)) || result == 0) {
DBG("app died while being traced");
retval = GET_SUBBUF_DIED;
int retval;
int result;
- asprintf(&send_msg, "put_subbuffer %s %ld", buf->name, buf->consumed_old);
- result = ustcomm_send_request(&buf->conn, send_msg, &received_msg);
+ if (asprintf(&send_msg, "put_subbuffer %s %ld", buf->name, buf->consumed_old) < 0) {
+ ERR("put_subbuffer : asprintf failed (%s %ld)",
+ buf->name, buf->consumed_old);
+ retval = -1;
+ goto end;
+ }
+ result = ustcomm_send_request(buf->conn, send_msg, &received_msg);
if(result < 0 && (errno == ECONNRESET || errno == EPIPE)) {
retval = PUT_SUBBUF_DIED;
goto end;
char *send_msg;
char *received_msg;
int result;
- char *tmp;
- int fd;
struct shmid_ds shmds;
- buf = (struct buffer_info *) malloc(sizeof(struct buffer_info));
+ buf = (struct buffer_info *) zmalloc(sizeof(struct buffer_info));
if(buf == NULL) {
ERR("add_buffer: insufficient memory");
return NULL;
}
+ buf->conn = malloc(sizeof(struct ustcomm_connection));
+ if(buf->conn == NULL) {
+ ERR("add_buffer: insufficient memory");
+ free(buf);
+ return NULL;
+ }
+
buf->name = bufname;
buf->pid = pid;
/* connect to app */
- result = ustcomm_connect_app(buf->pid, &buf->conn);
+ result = ustcomm_connect_app(buf->pid, buf->conn);
if(result) {
WARN("unable to connect to process, it probably died before we were able to connect");
return NULL;
}
/* get pidunique */
- asprintf(&send_msg, "get_pidunique");
- result = ustcomm_send_request(&buf->conn, send_msg, &received_msg);
+ if (asprintf(&send_msg, "get_pidunique") < 0) {
+ ERR("connect_buffer : asprintf failed (get_pidunique)");
+ return NULL;
+ }
+ result = ustcomm_send_request(buf->conn, send_msg, &received_msg);
free(send_msg);
if(result == -1) {
ERR("problem in ustcomm_send_request(get_pidunique)");
DBG("got pidunique %lld", buf->pidunique);
/* get shmid */
- asprintf(&send_msg, "get_shmid %s", buf->name);
- result = ustcomm_send_request(&buf->conn, send_msg, &received_msg);
+ if (asprintf(&send_msg, "get_shmid %s", buf->name) < 0) {
+ ERR("connect_buffer : asprintf failed (get_schmid %s)",
+ buf->name);
+ return NULL;
+ }
+ result = ustcomm_send_request(buf->conn, send_msg, &received_msg);
free(send_msg);
if(result == -1) {
ERR("problem in ustcomm_send_request(get_shmid)");
DBG("got shmids %d %d", buf->shmid, buf->bufstruct_shmid);
/* get n_subbufs */
- asprintf(&send_msg, "get_n_subbufs %s", buf->name);
- result = ustcomm_send_request(&buf->conn, send_msg, &received_msg);
+ if (asprintf(&send_msg, "get_n_subbufs %s", buf->name) < 0) {
+ ERR("connect_buffer : asprintf failed (get_n_subbufs %s)",
+ buf->name);
+ return NULL;
+ }
+ result = ustcomm_send_request(buf->conn, send_msg, &received_msg);
free(send_msg);
if(result == -1) {
ERR("problem in ustcomm_send_request(g_n_subbufs)");
DBG("got n_subbufs %d", buf->n_subbufs);
/* get subbuf size */
- asprintf(&send_msg, "get_subbuf_size %s", buf->name);
- result = ustcomm_send_request(&buf->conn, send_msg, &received_msg);
+ if (asprintf(&send_msg, "get_subbuf_size %s", buf->name) < 0) {
+ ERR("connect_buffer : asprintf failed (get_subbuf_size %s)",
+ buf->name);
+ return NULL;
+ }
+ result = ustcomm_send_request(buf->conn, send_msg, &received_msg);
free(send_msg);
if(result == -1) {
ERR("problem in ustcomm_send_request(get_subbuf_size)");
{
int result;
- result = ustcomm_close_app(&buf->conn);
+ result = ustcomm_close_app(buf->conn);
if(result == -1) {
WARN("problem calling ustcomm_close_app");
}
if(callbacks->on_close_buffer)
callbacks->on_close_buffer(callbacks, buf);
+ free(buf->conn);
free(buf);
}
DBG("beginning of start_consuming_buffer: args: pid %d bufname %s", pid, bufname);
- args = (struct consumer_thread_args *) malloc(sizeof(struct consumer_thread_args));
+ args = (struct consumer_thread_args *) zmalloc(sizeof(struct consumer_thread_args));
args->pid = pid;
args->bufname = strdup(bufname);
char *recvbuf;
/* check for requests on our public socket */
- result = ustcomm_ustd_recv_message(&instance->comm, &recvbuf, NULL, timeout);
+ result = ustcomm_ustd_recv_message(instance->comm, &recvbuf, NULL, timeout);
if(result == -1 && errno == EINTR) {
/* Caught signal */
}
void libustd_delete_instance(struct libustd_instance *instance)
{
if(instance->is_init)
- ustcomm_fini_ustd(&instance->comm);
+ ustcomm_fini_ustd(instance->comm);
pthread_mutex_destroy(&instance->mutex);
free(instance->sock_path);
+ free(instance->comm);
free(instance);
}
struct libustd_callbacks *callbacks, char *sock_path)
{
struct libustd_instance *instance =
- malloc(sizeof(struct libustd_instance));
+ zmalloc(sizeof(struct libustd_instance));
if(!instance)
return NULL;
+ instance->comm = malloc(sizeof(struct ustcomm_ustd));
+ if(!instance->comm) {
+ free(instance);
+ return NULL;
+ }
+
instance->callbacks = callbacks;
instance->quit_program = 0;
instance->is_init = 0;
int libustd_init_instance(struct libustd_instance *instance)
{
int result;
- result = ustcomm_init_ustd(&instance->comm, instance->sock_path);
+ result = ustcomm_init_ustd(instance->comm, instance->sock_path);
if(result == -1) {
ERR("failed to initialize socket");
return 1;