Updated cyclic buffer code.

diff --git a/ulut/ul_cbuff.h b/ulut/ul_cbuff.h
index d846a25acb0557f1a0cbb0347083ef85cd272fc1..bc54c0c05cfc5e020cfee93dcb21bb5600781618 100644 (file)
--- a/ulut/ul_cbuff.h
+++ b/ulut/ul_cbuff.h
@@ -99,8 +99,9 @@ void ul_cbuff_mark_ready(ul_cbuff_msg_head_t *msg);
 int ul_cbuff_is_ready(const ul_cbuff_msg_head_t *msg);
 int ul_cbuff_head_alloc(ul_cbuff_t *buff, ul_cbuff_put_info_t *put_info, unsigned int size, unsigned int flags);
 int ul_cbuff_head_put(ul_cbuff_t *buff, ul_cbuff_put_info_t *put_info);
-ul_cbuff_loc_t ul_cbuff_head_loc(ul_cbuff_t *buff, ul_cbuff_msg_head_t *msg_head);
-ul_cbuff_loc_t ul_cbuff_next_loc(ul_cbuff_t *buff, ul_cbuff_msg_head_t *msg_head);
+ul_cbuff_loc_t ul_cbuff_head_loc(const ul_cbuff_t *buff, const ul_cbuff_msg_head_t *msg_head);
+ul_cbuff_loc_t ul_cbuff_next_loc(const ul_cbuff_t *buff, const ul_cbuff_msg_head_t *msg_head);
+int ul_cbuff_msg_head2data(const ul_cbuff_t *buff, ul_cbuff_data_info_t *data, const ul_cbuff_msg_head_t *msg_head);
 int ul_cbuff_tail_attach(ul_cbuff_t *buff, ul_cbuff_tail_info_t *tail_info, int mode);
 int ul_cbuff_tail_incontact(ul_cbuff_t *buff, ul_cbuff_tail_info_t *tail_info);
 int ul_cbuff_tail_test(ul_cbuff_t *buff, ul_cbuff_tail_info_t *tail_info);
@@ -199,13 +200,13 @@ ul_cbuff_head_put(ul_cbuff_t *buff, ul_cbuff_put_info_t *put_info)
 }
 
 ul_cbuff_inline ul_cbuff_loc_t
-ul_cbuff_head_loc(ul_cbuff_t *buff, ul_cbuff_msg_head_t *msg_head)
+ul_cbuff_head_loc(const ul_cbuff_t *buff, const ul_cbuff_msg_head_t *msg_head)
 {
   return (unsigned char*)msg_head-buff->buff_start;
 }
 
 ul_cbuff_inline ul_cbuff_loc_t
-ul_cbuff_next_loc(ul_cbuff_t *buff, ul_cbuff_msg_head_t *msg_head)
+ul_cbuff_next_loc(const ul_cbuff_t *buff, const ul_cbuff_msg_head_t *msg_head)
 {
   ul_cbuff_loc_t loc;
   unsigned int size;
@@ -221,6 +222,36 @@ ul_cbuff_next_loc(ul_cbuff_t *buff, ul_cbuff_msg_head_t *msg_head)
   return loc;
 }
 
+ul_cbuff_inline int
+ul_cbuff_msg_head2data(const ul_cbuff_t *buff, ul_cbuff_data_info_t *data, const ul_cbuff_msg_head_t *msg_head)
+{
+  ul_cbuff_loc_t res_size;
+  unsigned int length;
+  ul_cbuff_loc_t msg_loc=(unsigned char *)msg_head-buff->buff_start;
+
+  res_size=buff->state->buff_size-msg_loc;
+  length=msg_head->length;
+
+  if(res_size > ul_cbuff_msg_head_size){
+    data->ptr=(unsigned char*)msg_head+ul_cbuff_msg_head_size;
+    if(res_size-ul_cbuff_msg_head_size >= length){
+      data->cont_len=length;
+      data->wrap_ptr=NULL;
+      data->wrap_len=0;
+    }else{
+      data->cont_len=res_size-ul_cbuff_msg_head_size;
+      data->wrap_ptr=buff->buff_start;
+      data->wrap_len=length-(res_size-ul_cbuff_msg_head_size);
+    }
+  } else {
+    data->ptr=buff->buff_start;
+    data->cont_len=length;
+    data->wrap_ptr=NULL;
+    data->wrap_len=0;
+  }
+  return msg_head->flags;
+}
+
 ul_cbuff_inline int
 ul_cbuff_tail_attach(ul_cbuff_t *buff, ul_cbuff_tail_info_t *tail_info, int mode)
 {
@@ -273,8 +304,6 @@ ul_cbuff_tail_incontact(ul_cbuff_t *buff, ul_cbuff_tail_info_t *tail_info)
 ul_cbuff_inline int
 ul_cbuff_tail_test(ul_cbuff_t *buff, ul_cbuff_tail_info_t *tail_info)
 {
-  ul_cbuff_loc_t res_size;
-  unsigned int length;
   ul_cbuff_msg_head_t *msg_head=tail_info->msg_head;
 
   if(!msg_head)
@@ -283,27 +312,7 @@ ul_cbuff_tail_test(ul_cbuff_t *buff, ul_cbuff_tail_info_t *tail_info)
   if(!ul_cbuff_is_ready(msg_head))
     return 0;
 
-  res_size=buff->state->buff_size-((unsigned char*)msg_head-buff->buff_start);
-  length=msg_head->length;
-
-  if(res_size > ul_cbuff_msg_head_size){
-    tail_info->data.ptr=(unsigned char*)msg_head+ul_cbuff_msg_head_size;
-    if(res_size-ul_cbuff_msg_head_size >= length){
-      tail_info->data.cont_len=length;
-      tail_info->data.wrap_ptr=NULL;
-      tail_info->data.wrap_len=0;
-    }else{
-      tail_info->data.cont_len=res_size-ul_cbuff_msg_head_size;
-      tail_info->data.wrap_ptr=buff->buff_start;
-      tail_info->data.wrap_len=length-(res_size-ul_cbuff_msg_head_size);
-    }
-  } else {
-    tail_info->data.ptr=buff->buff_start;
-    tail_info->data.cont_len=length;
-    tail_info->data.wrap_ptr=NULL;
-    tail_info->data.wrap_len=0;
-  }
-  return msg_head->flags;
+  return ul_cbuff_msg_head2data(buff, &tail_info->data, msg_head);
 }
 
 ul_cbuff_inline int