}
struct ustcomm_sock * ustcomm_init_sock(int fd, int epoll_fd,
- struct list_head *list)
+ struct cds_list_head *list)
{
struct epoll_event ev;
struct ustcomm_sock *sock;
sock->epoll_fd = epoll_fd;
if (list) {
- list_add(&sock->list, list);
+ cds_list_add(&sock->list, list);
} else {
- INIT_LIST_HEAD(&sock->list);
+ CDS_INIT_LIST_HEAD(&sock->list);
}
return sock;
void ustcomm_del_sock(struct ustcomm_sock *sock, int keep_in_epoll)
{
- list_del(&sock->list);
+ cds_list_del(&sock->list);
if (!keep_in_epoll) {
if (epoll_ctl(sock->epoll_fd, EPOLL_CTL_DEL, sock->fd, NULL) == -1) {
PERROR("epoll_ctl: failed to delete socket");
if (peek_header.size && data) {
if (peek_header.size < 0 ||
peek_header.size > USTCOMM_DATA_SIZE) {
- ERR("big peek header! %d", peek_header.size);
+ ERR("big peek header! %ld", peek_header.size);
return 0;
}
return data_field + (long)ptr;
}
-int ustcomm_pack_trace_info(struct ustcomm_header *header,
- struct ustcomm_trace_info *trace_inf,
- const char *trace)
+int ustcomm_pack_single_field(struct ustcomm_header *header,
+ struct ustcomm_single_field *single_field,
+ const char *string)
{
int offset = 0;
- trace_inf->trace = ustcomm_print_data(trace_inf->data,
- sizeof(trace_inf->data),
- &offset,
- trace);
+ single_field->field = ustcomm_print_data(single_field->data,
+ sizeof(single_field->data),
+ &offset,
+ string);
- if (trace_inf->trace == USTCOMM_POISON_PTR) {
+ if (single_field->field == USTCOMM_POISON_PTR) {
return -ENOMEM;
}
- header->size = COMPUTE_MSG_SIZE(trace_inf, offset);
+ header->size = COMPUTE_MSG_SIZE(single_field, offset);
return 0;
}
-
-int ustcomm_unpack_trace_info(struct ustcomm_trace_info *trace_inf)
+int ustcomm_unpack_single_field(struct ustcomm_single_field *single_field)
{
- trace_inf->trace = ustcomm_restore_ptr(trace_inf->trace,
- trace_inf->data,
- sizeof(trace_inf->data));
- if (!trace_inf->trace) {
+ single_field->field = ustcomm_restore_ptr(single_field->field,
+ single_field->data,
+ sizeof(single_field->data));
+ if (!single_field->field) {
return -EINVAL;
}
return 0;
}
-int ustcomm_pack_sock_path(struct ustcomm_header *header,
- struct ustcomm_sock_path *sock_path_inf,
- const char *socket_path)
-{
- int offset = 0;
-
- sock_path_inf->sock_path =
- ustcomm_print_data(sock_path_inf->data,
- sizeof(sock_path_inf->data),
- &offset,
- socket_path);
-
- if (sock_path_inf->sock_path == USTCOMM_POISON_PTR) {
- return -ENOMEM;
- }
-
- header->size = COMPUTE_MSG_SIZE(sock_path_inf, offset);
-
- return 0;
-}
-
-int ustcomm_unpack_sock_path(struct ustcomm_sock_path *sock_path_inf)
-{
- sock_path_inf->sock_path =
- ustcomm_restore_ptr(sock_path_inf->sock_path,
- sock_path_inf->data,
- sizeof(sock_path_inf->data));
- if (!sock_path_inf->sock_path) {
- return -EINVAL;
- }
-
- return 0;
-}
-