Signed-off-by: Angus Salkeld <asalkeld(a)redhat.com>
---
include/qb/qbipcc.h | 16 ++--
include/qb/qbipcs.h | 56 +++++++-------
lib/ipcc.c | 92 ++++++++++++-----------
lib/ipcs.c | 205 +++++++++++++++++++++++++--------------------------
4 files changed, 184 insertions(+), 185 deletions(-)
diff --git a/include/qb/qbipcc.h b/include/qb/qbipcc.h
index 517a23b..4ccc626 100644
--- a/include/qb/qbipcc.h
+++ b/include/qb/qbipcc.h
@@ -36,37 +36,37 @@ extern "C" {
int32_t
qb_ipcc_service_connect(const char *socket_name,
- unsigned int service,
+ uint32_t service,
size_t request_size,
size_t respnse__size,
size_t dispatch_size, qb_hdb_handle_t * handle);
int32_t qb_ipcc_service_disconnect(qb_hdb_handle_t handle);
-int32_t qb_ipcc_fd_get(qb_hdb_handle_t handle, int *fd);
+int32_t qb_ipcc_fd_get(qb_hdb_handle_t handle, int32_t * fd);
-int32_t qb_ipcc_dispatch_get(qb_hdb_handle_t handle, void **buf, int timeout);
+int32_t qb_ipcc_dispatch_get(qb_hdb_handle_t handle, void **buf,
+ int32_t timeout);
int32_t qb_ipcc_dispatch_put(qb_hdb_handle_t handle);
int32_t
qb_ipcc_dispatch_flow_control_get(qb_hdb_handle_t handle,
- unsigned int *flow_control_state);
+ uint32_t * flow_control_state);
int32_t
qb_ipcc_msg_send(qb_hdb_handle_t handle,
- const struct iovec *iov, unsigned int iov_len);
+ const struct iovec *iov, uint32_t iov_len);
int32_t
qb_ipcc_msg_send_reply_receive(qb_hdb_handle_t handle,
const struct iovec *iov,
- unsigned int iov_len,
- void *res_msg, size_t res_len);
+ uint32_t iov_len, void *res_msg, size_t res_len);
int32_t
qb_ipcc_msg_send_reply_receive_in_buf_get(qb_hdb_handle_t handle,
const struct iovec *iov,
- unsigned int iov_len, void **res_msg);
+ uint32_t iov_len, void **res_msg);
int32_t qb_ipcc_msg_send_reply_receive_in_buf_put(qb_hdb_handle_t handle);
diff --git a/include/qb/qbipcs.h b/include/qb/qbipcs.h
index 8292076..ed6f5c0 100644
--- a/include/qb/qbipcs.h
+++ b/include/qb/qbipcs.h
@@ -33,36 +33,36 @@ extern "C" {
struct iovec;
-typedef int (*qb_ipcs_init_fn_lvalue) (void *conn);
-typedef int (*qb_ipcs_exit_fn_lvalue) (void *conn);
+typedef int32_t(*qb_ipcs_init_fn_lvalue) (void *conn);
+typedef int32_t(*qb_ipcs_exit_fn_lvalue) (void *conn);
typedef void (*qb_ipcs_handler_fn_lvalue) (void *conn, const void *msg);
struct qb_ipcs_init_state {
const char *socket_name;
- int sched_policy;
+ int32_t sched_policy;
const struct sched_param *sched_param;
void *(*malloc) (size_t size);
void (*free) (void *ptr);
- int (*service_available) (unsigned int service);
- int (*private_data_size_get) (unsigned int service);
- int (*security_valid) (int uid, int gid);
+ int32_t(*service_available) (uint32_t service);
+ int32_t(*private_data_size_get) (uint32_t service);
+ int32_t(*security_valid) (int32_t uid, int32_t gid);
void (*serialize_lock) (void);
void (*serialize_unlock) (void);
- int (*sending_allowed) (unsigned int service, unsigned int id,
- const void *msg,
- void *sending_allowed_private_data);
+ int32_t(*sending_allowed) (uint32_t service, uint32_t id,
+ const void *msg,
+ void *sending_allowed_private_data);
void (*sending_allowed_release) (void *sending_allowed_private_data);
- void (*poll_accept_add) (int fd);
- void (*poll_dispatch_add) (int fd, void *context);
- void (*poll_dispatch_modify) (int fd, int events);
- void (*poll_dispatch_destroy) (int fd, void *context);
+ void (*poll_accept_add) (int32_t fd);
+ void (*poll_dispatch_add) (int32_t fd, void *context);
+ void (*poll_dispatch_modify) (int32_t fd, int32_t events);
+ void (*poll_dispatch_destroy) (int32_t fd, void *context);
void (*fatal_error) (const char *error_msg);
- qb_ipcs_init_fn_lvalue(*init_fn_get) (unsigned int service);
- qb_ipcs_exit_fn_lvalue(*exit_fn_get) (unsigned int service);
- qb_ipcs_handler_fn_lvalue(*handler_fn_get) (unsigned int service,
- unsigned int id);
- qb_hdb_handle_t(*stats_create_connection) (const char *name, pid_t pid,
- int fd);
+ qb_ipcs_init_fn_lvalue(*init_fn_get) (uint32_t service);
+ qb_ipcs_exit_fn_lvalue(*exit_fn_get) (uint32_t service);
+ qb_ipcs_handler_fn_lvalue(*handler_fn_get) (uint32_t service,
+ uint32_t id);
+ qb_hdb_handle_t(*stats_create_connection) (const char *name, pid_t pid,
+ int32_t fd);
void (*stats_destroy_connection) (qb_hdb_handle_t handle);
void (*stats_update_value) (qb_hdb_handle_t handle,
const char *name, const void *value,
@@ -77,15 +77,15 @@ void qb_ipcs_ipc_init(struct qb_ipcs_init_state *init_state);
void *qb_ipcs_private_data_get(void *conn);
-int qb_ipcs_response_send(void *conn, const void *msg, size_t mlen);
+int32_t qb_ipcs_response_send(void *conn, const void *msg, size_t mlen);
-int qb_ipcs_response_iov_send(void *conn,
- const struct iovec *iov, unsigned int iov_len);
+int32_t qb_ipcs_response_iov_send(void *conn,
+ const struct iovec *iov, uint32_t iov_len);
-int qb_ipcs_dispatch_send(void *conn, const void *msg, size_t mlen);
+int32_t qb_ipcs_dispatch_send(void *conn, const void *msg, size_t mlen);
-int qb_ipcs_dispatch_iov_send(void *conn,
- const struct iovec *iov, unsigned int iov_len);
+int32_t qb_ipcs_dispatch_iov_send(void *conn,
+ const struct iovec *iov, uint32_t iov_len);
void qb_ipcs_refcount_inc(void *conn);
@@ -93,11 +93,11 @@ void qb_ipcs_refcount_dec(void *conn);
void qb_ipcs_ipc_exit(void);
-int qb_ipcs_ipc_service_exit(unsigned int service);
+int32_t qb_ipcs_ipc_service_exit(uint32_t service);
-int qb_ipcs_handler_accept(int fd, int revent, void *context);
+int32_t qb_ipcs_handler_accept(int32_t fd, int32_t revent, void *context);
-int qb_ipcs_handler_dispatch(int fd, int revent, void *context);
+int32_t qb_ipcs_handler_dispatch(int32_t fd, int32_t revent, void *context);
/* *INDENT-OFF* */
#ifdef __cplusplus
diff --git a/lib/ipcc.c b/lib/ipcc.c
index 259f4be..e35f570 100644
--- a/lib/ipcc.c
+++ b/lib/ipcc.c
@@ -43,13 +43,13 @@
#define IPC_SEMWAIT_TIMEOUT 2
struct ipc_instance {
- int fd;
+ int32_t fd;
#if _POSIX_THREAD_PROCESS_SHARED < 1
- int semid;
+ int32_t semid;
#endif
- int flow_control_state;
+ int32_t flow_control_state;
struct control_buffer *control_buffer;
- qb_ringbuffer_t * request_rb;
+ qb_ringbuffer_t *request_rb;
char *response_buffer;
char *dispatch_buffer;
size_t control_size;
@@ -71,9 +71,9 @@ DECLARE_HDB_DATABASE(ipc_hdb, ipc_hdb_destructor);
#endif
#ifdef SO_NOSIGPIPE
-static void socket_nosigpipe(int s)
+static void socket_nosigpipe(int32_t s)
{
- int on = 1;
+ int32_t on = 1;
setsockopt(s, SOL_SOCKET, SO_NOSIGPIPE, (void *)&on, sizeof(on));
}
#endif
@@ -82,14 +82,14 @@ static void socket_nosigpipe(int s)
#define MSG_NOSIGNAL 0
#endif
-static int32_t socket_send(int s, void *msg, size_t len)
+static int32_t socket_send(int32_t s, void *msg, size_t len)
{
int32_t res = 0;
- int result;
+ int32_t result;
struct msghdr msg_send;
struct iovec iov_send;
char *rbuf = msg;
- int processed = 0;
+ int32_t processed = 0;
msg_send.msg_iov = &iov_send;
msg_send.msg_iovlen = 1;
@@ -135,14 +135,14 @@ res_exit:
return (res);
}
-static int32_t socket_recv(int s, void *msg, size_t len)
+static int32_t socket_recv(int32_t s, void *msg, size_t len)
{
int32_t res = 0;
- int result;
+ int32_t result;
struct msghdr msg_recv;
struct iovec iov_recv;
char *rbuf = msg;
- int processed = 0;
+ int32_t processed = 0;
msg_recv.msg_iov = &iov_recv;
msg_recv.msg_iovlen = 1;
@@ -195,11 +195,11 @@ res_exit:
}
#if _POSIX_THREAD_PROCESS_SHARED < 1
-static int priv_change_send(struct ipc_instance *ipc_instance)
+static int32_t priv_change_send(struct ipc_instance *ipc_instance)
{
char buf_req;
mar_req_priv_change req_priv_change;
- unsigned int res;
+ int32_t res;
req_priv_change.euid = geteuid();
/*
@@ -228,21 +228,21 @@ static int priv_change_send(struct ipc_instance *ipc_instance)
#if defined(_SEM_SEMUN_UNDEFINED)
union semun {
- int val;
+ int32_t val;
struct semid_ds *buf;
- unsigned short int *array;
+ unsigned short int32_t *array;
struct seminfo *__buf;
};
#endif
#endif
-static int
+static int32_t
circular_memory_map(char *path, const char *file, void **buf, size_t bytes)
{
- int fd;
+ int32_t fd;
void *addr_orig;
void *addr;
- int res;
+ int32_t res;
sprintf(path, "/dev/shm/%s", file);
@@ -301,7 +301,7 @@ circular_memory_map(char *path, const char *file, void **buf, size_t
bytes)
static void memory_unmap(void *addr, size_t bytes)
{
- int res;
+ int32_t res;
res = munmap(addr, bytes);
}
@@ -321,12 +321,13 @@ void ipc_hdb_destructor(void *context)
(ipc_instance->dispatch_size) << 1);
}
-static int memory_map(char *path, const char *file, void **buf, size_t bytes)
+static int32_t memory_map(char *path, const char *file, void **buf,
+ size_t bytes)
{
- int fd;
+ int32_t fd;
void *addr_orig;
void *addr;
- int res;
+ int32_t res;
sprintf(path, "/dev/shm/%s", file);
@@ -374,7 +375,7 @@ static int memory_map(char *path, const char *file, void **buf, size_t
bytes)
static int32_t
msg_send(struct ipc_instance *ipc_instance,
- const struct iovec *iov, unsigned int iov_len)
+ const struct iovec *iov, uint32_t iov_len)
{
int32_t i;
size_t size = 0;
@@ -399,7 +400,7 @@ msg_send(struct ipc_instance *ipc_instance,
return qb_rb_chunk_commit(ipc_instance->request_rb, size);
}
-static int32_t ipc_sem_wait(struct ipc_instance *ipc_instance, int sem_num)
+static int32_t ipc_sem_wait(struct ipc_instance *ipc_instance, int32_t sem_num)
{
#if _POSIX_THREAD_PROCESS_SHARED < 1
struct sembuf sop;
@@ -408,7 +409,7 @@ static int32_t ipc_sem_wait(struct ipc_instance *ipc_instance, int
sem_num)
struct pollfd pfd;
sem_t *sem = NULL;
#endif
- int res;
+ int32_t res;
#if _POSIX_THREAD_PROCESS_SHARED > 0
switch (sem_num) {
@@ -511,12 +512,12 @@ reply_receive_in_buf(struct ipc_instance *ipc_instance, void
**res_msg)
*/
int32_t
qb_ipcc_service_connect(const char *socket_name,
- unsigned int service,
+ uint32_t service,
size_t request_size,
size_t response_size,
size_t dispatch_size, qb_hdb_handle_t * handle)
{
- int request_fd;
+ int32_t request_fd;
struct sockaddr_un address;
int32_t res;
struct ipc_instance *ipc_instance;
@@ -524,7 +525,7 @@ qb_ipcc_service_connect(const char *socket_name,
key_t semkey = 0;
union semun semun;
#endif
- int sys_res;
+ int32_t sys_res;
mar_req_setup_t req_setup;
mar_res_setup_t res_setup;
char control_map_path[128];
@@ -585,8 +586,9 @@ qb_ipcc_service_connect(const char *socket_name,
/* RB request */
ipc_instance->request_rb = qb_rb_open("request_ringbuffer-XXXXXX",
- request_size,
- QB_RB_FLAG_CREATE|QB_RB_FLAG_SHARED_PROCESS);
+ request_size,
+ QB_RB_FLAG_CREATE |
+ QB_RB_FLAG_SHARED_PROCESS);
if (ipc_instance->request_rb == NULL) {
res = EBADE;
goto error_request_buffer;
@@ -735,7 +737,7 @@ int32_t qb_ipcc_service_disconnect(qb_hdb_handle_t handle)
int32_t
qb_ipcc_dispatch_flow_control_get(qb_hdb_handle_t handle,
- unsigned int *flow_control_state)
+ uint32_t * flow_control_state)
{
struct ipc_instance *ipc_instance;
int32_t res;
@@ -751,7 +753,7 @@ qb_ipcc_dispatch_flow_control_get(qb_hdb_handle_t handle,
return (res);
}
-int32_t qb_ipcc_fd_get(qb_hdb_handle_t handle, int *fd)
+int32_t qb_ipcc_fd_get(qb_hdb_handle_t handle, int32_t * fd)
{
struct ipc_instance *ipc_instance;
int32_t res;
@@ -767,13 +769,14 @@ int32_t qb_ipcc_fd_get(qb_hdb_handle_t handle, int *fd)
return (res);
}
-int32_t qb_ipcc_dispatch_get(qb_hdb_handle_t handle, void **data, int timeout)
+int32_t qb_ipcc_dispatch_get(qb_hdb_handle_t handle, void **data,
+ int32_t timeout)
{
struct pollfd ufds;
- int poll_events;
+ int32_t poll_events;
char buf;
struct ipc_instance *ipc_instance;
- int res;
+ int32_t res;
char buf_two = 1;
char *data_addr;
int32_t error = 0;
@@ -864,7 +867,7 @@ int32_t qb_ipcc_dispatch_put(qb_hdb_handle_t handle)
struct ipc_instance *ipc_instance;
int32_t res;
char *addr;
- unsigned int read_idx;
+ uint32_t read_idx;
res =
qb_hdb_handle_get_always(&ipc_hdb, handle, (void **)&ipc_instance);
@@ -896,7 +899,7 @@ error_exit:
int32_t
qb_ipcc_msg_send(qb_hdb_handle_t handle,
- const struct iovec * iov, unsigned int iov_len)
+ const struct iovec * iov, uint32_t iov_len)
{
int32_t res;
struct ipc_instance *ipc_instance;
@@ -919,8 +922,7 @@ qb_ipcc_msg_send(qb_hdb_handle_t handle,
int32_t
qb_ipcc_msg_send_reply_receive(qb_hdb_handle_t handle,
const struct iovec * iov,
- unsigned int iov_len,
- void *res_msg, size_t res_len)
+ uint32_t iov_len, void *res_msg, size_t res_len)
{
int32_t res;
struct ipc_instance *ipc_instance;
@@ -949,9 +951,9 @@ error_exit:
int32_t
qb_ipcc_msg_send_reply_receive_in_buf_get(qb_hdb_handle_t handle,
const struct iovec * iov,
- unsigned int iov_len, void **res_msg)
+ uint32_t iov_len, void **res_msg)
{
- unsigned int res;
+ int32_t res;
struct ipc_instance *ipc_instance;
res = qb_hdb_handle_get(&ipc_hdb, handle, (void **)&ipc_instance);
@@ -976,7 +978,7 @@ error_exit:
int32_t qb_ipcc_msg_send_reply_receive_in_buf_put(qb_hdb_handle_t handle)
{
- unsigned int res;
+ int32_t res;
struct ipc_instance *ipc_instance;
res = qb_hdb_handle_get(&ipc_hdb, handle, (void **)&ipc_instance);
@@ -996,7 +998,7 @@ qb_ipcc_zcb_alloc(qb_hdb_handle_t handle,
struct ipc_instance *ipc_instance;
void *buf = NULL;
char path[128];
- unsigned int res;
+ int32_t res;
mar_req_qb_ipcc_zc_alloc_t req_qb_ipcc_zc_alloc;
qb_ipc_response_header_t res_qb_ipcs_zc_alloc;
size_t map_size;
@@ -1039,7 +1041,7 @@ int32_t qb_ipcc_zcb_free(qb_hdb_handle_t handle, void *buffer)
mar_req_qb_ipcc_zc_free_t req_qb_ipcc_zc_free;
qb_ipc_response_header_t res_qb_ipcs_zc_free;
struct iovec iovec;
- unsigned int res;
+ int32_t res;
struct qb_ipcs_zc_header *header =
(struct qb_ipcs_zc_header *)((char *)buffer -
sizeof(struct qb_ipcs_zc_header));
diff --git a/lib/ipcs.c b/lib/ipcs.c
index 8f9cf8f..296d668 100644
--- a/lib/ipcs.c
+++ b/lib/ipcs.c
@@ -76,9 +76,9 @@ struct zcb_mapped {
#if _POSIX_THREAD_PROCESS_SHARED < 1
#if defined(_SEM_SEMUN_UNDEFINED)
union semun {
- int val;
+ int32_t val;
struct semid_ds *buf;
- unsigned short int *array;
+ unsigned short int32_t *array;
struct seminfo *__buf;
};
#endif
@@ -94,21 +94,21 @@ enum conn_state {
};
struct conn_info {
- int fd;
+ int32_t fd;
pthread_t thread;
pid_t client_pid;
pthread_attr_t thread_attr;
- unsigned int service;
+ uint32_t service;
enum conn_state state;
- int notify_flow_control_enabled;
- int flow_control_state;
- int refcount;
+ int32_t notify_flow_control_enabled;
+ int32_t flow_control_state;
+ int32_t refcount;
qb_hdb_handle_t stats_handle;
#if _POSIX_THREAD_PROCESS_SHARED < 1
key_t semkey;
- int semid;
+ int32_t semid;
#endif
- unsigned int pending_semops;
+ uint32_t pending_semops;
pthread_mutex_t mutex;
struct control_buffer *control_buffer;
qb_ringbuffer_t *request_rb;
@@ -122,24 +122,25 @@ struct conn_info {
void *private_data;
struct qb_list_head list;
char setup_msg[sizeof(mar_req_setup_t)];
- unsigned int setup_bytes_read;
+ uint32_t setup_bytes_read;
struct qb_list_head zcb_mapped_qb_list_head;
char *sending_allowed_private_data[64];
};
-static int shared_mem_dispatch_bytes_left(const struct conn_info *conn_info);
+static int32_t shared_mem_dispatch_bytes_left(const struct conn_info
+ *conn_info);
static void outq_flush(struct conn_info *conn_info);
-static int priv_change(struct conn_info *conn_info);
+static int32_t priv_change(struct conn_info *conn_info);
static void ipc_disconnect(struct conn_info *conn_info);
-static void msg_send(void *conn, const struct iovec *iov, unsigned int iov_len,
- int locked);
+static void msg_send(void *conn, const struct iovec *iov, uint32_t iov_len,
+ int32_t locked);
static qb_hdb_handle_t dummy_stats_create_connection(const char *name,
- pid_t pid, int fd)
+ pid_t pid, int32_t fd)
{
return (0ULL);
}
@@ -167,12 +168,12 @@ static void sem_post_exit_thread(struct conn_info *conn_info)
qb_rb_chunk_write(conn_info->request_rb, conn_info, 4);
}
-static int memory_map(const char *path, size_t bytes, void **buf)
+static int32_t memory_map(const char *path, size_t bytes, void **buf)
{
- int fd;
+ int32_t fd;
void *addr_orig;
void *addr;
- int res;
+ int32_t res;
fd = open(path, O_RDWR, 0600);
@@ -215,12 +216,12 @@ static int memory_map(const char *path, size_t bytes, void **buf)
return (0);
}
-static int circular_memory_map(const char *path, size_t bytes, void **buf)
+static int32_t circular_memory_map(const char *path, size_t bytes, void **buf)
{
- int fd;
+ int32_t fd;
void *addr_orig;
void *addr;
- int res;
+ int32_t res;
fd = open(path, O_RDWR, 0600);
@@ -273,18 +274,18 @@ static int circular_memory_map(const char *path, size_t bytes, void
**buf)
return (0);
}
-static inline int circular_memory_unmap(void *buf, size_t bytes)
+static inline int32_t circular_memory_unmap(void *buf, size_t bytes)
{
- int res;
+ int32_t res;
res = munmap(buf, bytes << 1);
return (res);
}
-static inline int zcb_free(struct zcb_mapped *zcb_mapped)
+static inline int32_t zcb_free(struct zcb_mapped *zcb_mapped)
{
- unsigned int res;
+ uint32_t res;
res = munmap(zcb_mapped->addr, zcb_mapped->size);
qb_list_del(&zcb_mapped->list);
@@ -292,11 +293,11 @@ static inline int zcb_free(struct zcb_mapped *zcb_mapped)
return (res);
}
-static inline int zcb_by_addr_free(struct conn_info *conn_info, void *addr)
+static inline int32_t zcb_by_addr_free(struct conn_info *conn_info, void *addr)
{
struct qb_list_head *list;
struct zcb_mapped *zcb_mapped;
- unsigned int res = 0;
+ uint32_t res = 0;
for (list = conn_info->zcb_mapped_qb_list_head.next;
list != &conn_info->zcb_mapped_qb_list_head; list = list->next) {
@@ -312,7 +313,7 @@ static inline int zcb_by_addr_free(struct conn_info *conn_info, void
*addr)
return (res);
}
-static inline int zcb_all_free(struct conn_info *conn_info)
+static inline int32_t zcb_all_free(struct conn_info *conn_info)
{
struct qb_list_head *list;
struct zcb_mapped *zcb_mapped;
@@ -329,11 +330,12 @@ static inline int zcb_all_free(struct conn_info *conn_info)
return (0);
}
-static inline int zcb_alloc(struct conn_info *conn_info,
- const char *path_to_file, size_t size, void **addr)
+static inline int32_t zcb_alloc(struct conn_info *conn_info,
+ const char *path_to_file,
+ size_t size, void **addr)
{
struct zcb_mapped *zcb_mapped;
- unsigned int res;
+ uint32_t res;
zcb_mapped = malloc(sizeof(struct zcb_mapped));
if (zcb_mapped == NULL) {
@@ -354,10 +356,10 @@ static inline int zcb_alloc(struct conn_info *conn_info,
return (0);
}
-static int ipc_thread_active(void *conn)
+static int32_t ipc_thread_active(void *conn)
{
struct conn_info *conn_info = (struct conn_info *)conn;
- int retval = 0;
+ int32_t retval = 0;
pthread_mutex_lock(&conn_info->mutex);
if (conn_info->state == CONN_STATE_THREAD_ACTIVE) {
@@ -367,10 +369,10 @@ static int ipc_thread_active(void *conn)
return (retval);
}
-static int ipc_thread_exiting(void *conn)
+static int32_t ipc_thread_exiting(void *conn)
{
struct conn_info *conn_info = (struct conn_info *)conn;
- int retval = 1;
+ int32_t retval = 1;
pthread_mutex_lock(&conn_info->mutex);
if (conn_info->state == CONN_STATE_THREAD_INACTIVE) {
@@ -385,9 +387,9 @@ static int ipc_thread_exiting(void *conn)
/*
* returns 0 if should be called again, -1 if finished
*/
-static inline int conn_info_destroy(struct conn_info *conn_info)
+static inline int32_t conn_info_destroy(struct conn_info *conn_info)
{
- unsigned int res;
+ uint32_t res;
void *retval;
qb_list_del(&conn_info->list);
@@ -491,9 +493,8 @@ static void *serveraddr2void(uint64_t server_addr)
};
static void zerocopy_operations_process(struct conn_info *conn_info,
- qb_ipc_request_header_t **
- header_out,
- unsigned int *new_message)
+ qb_ipc_request_header_t **
+ header_out, uint32_t * new_message)
{
qb_ipc_request_header_t *header;
@@ -504,7 +505,7 @@ static void zerocopy_operations_process(struct conn_info *conn_info,
qb_ipc_response_header_t res_header;
void *addr = NULL;
struct qb_ipcs_zc_header *zc_header;
- unsigned int res;
+ uint32_t res;
res = zcb_alloc(conn_info, hdr->path_to_file, hdr->map_size,
&addr);
@@ -554,6 +555,7 @@ static void *pthread_ipc_consumer(void *conn)
int32_t send_ok;
uint32_t new_message;
ssize_t size;
+ void *pri_data = NULL;
#if defined(HAVE_PTHREAD_SETSCHEDPARAM) && defined(HAVE_SCHED_GET_PRIORITY_MAX)
if (api->sched_policy != 0) {
@@ -564,10 +566,10 @@ static void *pthread_ipc_consumer(void *conn)
#endif
for (;;) {
- size = qb_rb_chunk_peek(conn_info->request_rb, (void**)&header, 2000);
+ size = qb_rb_chunk_peek(conn_info->request_rb,
+ (void **)&header, 2000);
if (ipc_thread_active(conn_info) == 0) {
- qb_util_log(LOG_DEBUG,"thread not active");
qb_ipcs_refcount_dec(conn_info);
pthread_exit(0);
}
@@ -588,18 +590,16 @@ static void *pthread_ipc_consumer(void *conn)
qb_ipcs_refcount_inc(conn);
+ pri_data = conn_info->sending_allowed_private_data;
send_ok = api->sending_allowed(conn_info->service,
- header->id,
- header,
- conn_info->sending_allowed_private_data);
+ header->id, header, pri_data);
/*
* This happens when the message contains some kind of invalid
* parameter, such as an invalid size
*/
if (send_ok == -1) {
- response_header.size =
- sizeof(qb_ipc_response_header_t);
+ response_header.size = sizeof(qb_ipc_response_header_t);
response_header.id = 0;
response_header.error = EINVAL;
qb_ipcs_response_send(conn_info,
@@ -620,8 +620,7 @@ static void *pthread_ipc_consumer(void *conn)
*/
api->stats_increment_value(conn_info->stats_handle,
"sem_retry_count");
- response_header.size =
- sizeof(qb_ipc_response_header_t);
+ response_header.size = sizeof(qb_ipc_response_header_t);
response_header.id = 0;
response_header.error = EAGAIN;
qb_ipcs_response_send(conn_info,
@@ -630,18 +629,17 @@ static void *pthread_ipc_consumer(void *conn)
qb_rb_chunk_reclaim(conn_info->request_rb);
}
- api->
- sending_allowed_release
+ api->sending_allowed_release
(conn_info->sending_allowed_private_data);
qb_ipcs_refcount_dec(conn);
}
pthread_exit(0);
}
-static int req_setup_send(struct conn_info *conn_info, int error)
+static int32_t req_setup_send(struct conn_info *conn_info, int32_t error)
{
mar_res_setup_t res_setup;
- unsigned int res;
+ uint32_t res;
memset(&res_setup, 0, sizeof(res_setup));
res_setup.error = error;
@@ -662,18 +660,18 @@ retry_send:
return (0);
}
-static int req_setup_recv(struct conn_info *conn_info)
+static int32_t req_setup_recv(struct conn_info *conn_info)
{
- int res;
+ int32_t res;
struct msghdr msg_recv;
struct iovec iov_recv;
- int authenticated = 0;
+ int32_t authenticated = 0;
#ifdef QB_LINUX
struct cmsghdr *cmsg;
char cmsg_cred[CMSG_SPACE(sizeof(struct ucred))];
- int off = 0;
- int on = 1;
+ int32_t off = 0;
+ int32_t on = 1;
struct ucred *cred;
#endif
@@ -814,7 +812,7 @@ static void ipc_disconnect(struct conn_info *conn_info)
sem_post_exit_thread(conn_info);
}
-static int conn_info_create(int fd)
+static int32_t conn_info_create(int32_t fd)
{
struct conn_info *conn_info;
@@ -851,9 +849,9 @@ static int conn_info_create(int fd)
*/
extern void qb_ipcs_ipc_init(struct qb_ipcs_init_state *init_state)
{
- int server_fd;
+ int32_t server_fd;
struct sockaddr_un un_addr;
- int res;
+ int32_t res;
api = init_state;
api->stats_create_connection = dummy_stats_create_connection;
@@ -938,7 +936,7 @@ void qb_ipcs_ipc_exit(void)
{
struct qb_list_head *list;
struct conn_info *conn_info;
- unsigned int res;
+ uint32_t res;
for (list = conn_info_qb_list_head.next;
list != &conn_info_qb_list_head; list = list->next) {
@@ -970,7 +968,7 @@ void qb_ipcs_ipc_exit(void)
}
}
-int qb_ipcs_ipc_service_exit(unsigned int service)
+int32_t qb_ipcs_ipc_service_exit(uint32_t service)
{
struct qb_list_head *list, *list_next;
struct conn_info *conn_info;
@@ -1025,13 +1023,13 @@ void *qb_ipcs_private_data_get(void *conn)
return (conn_info->private_data);
}
-int qb_ipcs_response_send(void *conn, const void *msg, size_t mlen)
+int32_t qb_ipcs_response_send(void *conn, const void *msg, size_t mlen)
{
struct conn_info *conn_info = (struct conn_info *)conn;
#if _POSIX_THREAD_PROCESS_SHARED < 1
struct sembuf sop;
#endif
- int res;
+ int32_t res;
memcpy(conn_info->response_buffer, msg, mlen);
@@ -1059,16 +1057,16 @@ retry_semop:
return (0);
}
-int qb_ipcs_response_iov_send(void *conn, const struct iovec *iov,
- unsigned int iov_len)
+int32_t qb_ipcs_response_iov_send(void *conn, const struct iovec * iov,
+ uint32_t iov_len)
{
struct conn_info *conn_info = (struct conn_info *)conn;
#if _POSIX_THREAD_PROCESS_SHARED < 1
struct sembuf sop;
#endif
- int res;
- int write_idx = 0;
- int i;
+ int32_t res;
+ int32_t write_idx = 0;
+ int32_t i;
for (i = 0; i < iov_len; i++) {
memcpy(&conn_info->response_buffer[write_idx],
@@ -1100,11 +1098,11 @@ retry_semop:
return (0);
}
-static int shared_mem_dispatch_bytes_left(const struct conn_info *conn_info)
+static int32_t shared_mem_dispatch_bytes_left(const struct conn_info *conn_info)
{
- unsigned int n_read;
- unsigned int n_write;
- unsigned int bytes_left;
+ uint32_t n_read;
+ uint32_t n_write;
+ uint32_t bytes_left;
n_read = conn_info->control_buffer->read;
n_write = conn_info->control_buffer->write;
@@ -1121,10 +1119,9 @@ static int shared_mem_dispatch_bytes_left(const struct conn_info
*conn_info)
return (bytes_left);
}
-static void memcpy_dwrap(struct conn_info *conn_info, void *msg,
- unsigned int len)
+static void memcpy_dwrap(struct conn_info *conn_info, void *msg, uint32_t len)
{
- unsigned int write_idx;
+ uint32_t write_idx;
write_idx = conn_info->control_buffer->write;
@@ -1136,9 +1133,9 @@ static void memcpy_dwrap(struct conn_info *conn_info, void *msg,
/**
* simulate the behaviour in qb_ipcc.c
*/
-static int flow_control_event_send(struct conn_info *conn_info, char event)
+static int32_t flow_control_event_send(struct conn_info *conn_info, char event)
{
- int new_fc = 0;
+ int32_t new_fc = 0;
if (event == MESSAGE_RES_OUTQ_NOT_EMPTY ||
event == MESSAGE_RES_ENABLE_FLOWCONTROL) {
@@ -1166,15 +1163,15 @@ static int flow_control_event_send(struct conn_info *conn_info,
char event)
return send(conn_info->fd, &event, 1, MSG_NOSIGNAL);
}
-static void msg_send(void *conn, const struct iovec *iov, unsigned int iov_len,
- int locked)
+static void msg_send(void *conn, const struct iovec *iov, uint32_t iov_len,
+ int32_t locked)
{
struct conn_info *conn_info = (struct conn_info *)conn;
#if _POSIX_THREAD_PROCESS_SHARED < 1
struct sembuf sop;
#endif
- int res;
- int i;
+ int32_t res;
+ int32_t i;
for (i = 0; i < iov_len; i++) {
memcpy_dwrap(conn_info, iov[i].iov_base, iov[i].iov_len);
@@ -1225,9 +1222,9 @@ static void outq_flush(struct conn_info *conn_info)
{
struct qb_list_head *list, *list_next;
struct outq_item *outq_item;
- unsigned int bytes_left;
+ uint32_t bytes_left;
struct iovec iov;
- int res;
+ int32_t res;
pthread_mutex_lock(&conn_info->mutex);
if (qb_list_empty(&conn_info->outq_head)) {
@@ -1259,14 +1256,14 @@ static void outq_flush(struct conn_info *conn_info)
pthread_mutex_unlock(&conn_info->mutex);
}
-static int priv_change(struct conn_info *conn_info)
+static int32_t priv_change(struct conn_info *conn_info)
{
mar_req_priv_change req_priv_change;
- unsigned int res;
+ uint32_t res;
#if _POSIX_THREAD_PROCESS_SHARED < 1
union semun semun;
struct semid_ds ipc_set;
- int i;
+ int32_t i;
#endif
retry_recv:
@@ -1311,12 +1308,12 @@ retry_recv:
}
static void msg_send_or_queue(void *conn, const struct iovec *iov,
- unsigned int iov_len)
+ uint32_t iov_len)
{
struct conn_info *conn_info = (struct conn_info *)conn;
- unsigned int bytes_left;
- unsigned int bytes_msg = 0;
- int i;
+ uint32_t bytes_left;
+ uint32_t bytes_msg = 0;
+ int32_t i;
struct outq_item *outq_item;
char *write_buf = 0;
@@ -1384,7 +1381,7 @@ void qb_ipcs_refcount_dec(void *conn)
pthread_mutex_unlock(&conn_info->mutex);
}
-int qb_ipcs_dispatch_send(void *conn, const void *msg, size_t mlen)
+int32_t qb_ipcs_dispatch_send(void *conn, const void *msg, size_t mlen)
{
struct iovec iov;
@@ -1395,22 +1392,22 @@ int qb_ipcs_dispatch_send(void *conn, const void *msg, size_t
mlen)
return (0);
}
-int qb_ipcs_dispatch_iov_send(void *conn, const struct iovec *iov,
- unsigned int iov_len)
+int32_t qb_ipcs_dispatch_iov_send(void *conn, const struct iovec * iov,
+ uint32_t iov_len)
{
msg_send_or_queue(conn, iov, iov_len);
return (0);
}
-int qb_ipcs_handler_accept(int fd, int revent, void *data)
+int32_t qb_ipcs_handler_accept(int32_t fd, int32_t revent, void *data)
{
socklen_t addrlen;
struct sockaddr_un un_addr;
- int new_fd;
+ int32_t new_fd;
#ifdef QB_LINUX
- int on = 1;
+ int32_t on = 1;
#endif
- int res;
+ int32_t res;
addrlen = sizeof(struct sockaddr_un);
@@ -1524,11 +1521,11 @@ static void qb_ipcs_init_conn_stats(struct conn_info *conn)
&conn->service, sizeof(conn->service));
}
-int qb_ipcs_handler_dispatch(int fd, int revent, void *context)
+int32_t qb_ipcs_handler_dispatch(int32_t fd, int32_t revent, void *context)
{
mar_req_setup_t *req_setup;
struct conn_info *conn_info = (struct conn_info *)context;
- int res;
+ int32_t res;
char buf;
if (ipc_thread_exiting(conn_info)) {
@@ -1581,8 +1578,8 @@ int qb_ipcs_handler_dispatch(int fd, int revent, void *context)
conn_info->control_size = req_setup->control_size;
conn_info->request_rb = qb_rb_open(req_setup->request_file,
- req_setup->request_size,
- QB_RB_FLAG_SHARED_PROCESS);
+ req_setup->request_size,
+ QB_RB_FLAG_SHARED_PROCESS);
conn_info->request_size = req_setup->request_size;
res = memory_map(req_setup->response_file,
--
1.6.6.1