X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=libustcomm%2Fustcomm.c;h=9b1d83a9a4d86bde829f45830b404872a7fe8e1c;hb=28c1bb4003ca120888a1d61d5ec71eac426ae490;hp=bbdbd7ee643a7b4c887aced587f9e001a34ac8b5;hpb=d89b81916428a3e7e5dfe1612e87218502a40a3b;p=ust.git

diff --git a/libustcomm/ustcomm.c b/libustcomm/ustcomm.c
index bbdbd7e..9b1d83a 100644
--- a/libustcomm/ustcomm.c
+++ b/libustcomm/ustcomm.c
@@ -113,7 +113,7 @@ static struct sockaddr_un * create_sock_addr(const char *name,
 }
 
 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;
@@ -136,9 +136,9 @@ struct ustcomm_sock * ustcomm_init_sock(int fd, int epoll_fd,
 
 	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;
@@ -146,7 +146,7 @@ struct ustcomm_sock * ustcomm_init_sock(int fd, int epoll_fd,
 
 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");
@@ -621,33 +621,32 @@ char * ustcomm_restore_ptr(char *ptr, char *data_field, int data_field_size)
 	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;
 	}
 
@@ -825,37 +824,3 @@ int ustcomm_unpack_marker_info(struct ustcomm_marker_info *marker_inf)
 	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;
-}
-