X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_ringbuffer.c;h=af2428015ac5fe78d4a21f2275976d25da495e12;hb=5f0b4f8c5f9f53cea37dde072b37d09ba316487d;hp=bbde62882984374ec678bb3da318541f17664a06;hpb=ed814ce69c64a1f24670f21950f3da646f7921df;p=palacios.git

diff --git a/palacios/src/palacios/vmm_ringbuffer.c b/palacios/src/palacios/vmm_ringbuffer.c
index bbde628..af24280 100644
--- a/palacios/src/palacios/vmm_ringbuffer.c
+++ b/palacios/src/palacios/vmm_ringbuffer.c
@@ -21,178 +21,197 @@
 #include <palacios/vmm.h>
 
 
-void v3_init_ringbuf(struct v3_ringbuf * ring, uint_t size) {
-  ring->buf = V3_Malloc(size);
-  ring->size = size;
+
+
+void NO_INST v3_init_ringbuf(struct v3_ringbuf * ring, uint_t size) {
+    ring->buf = V3_Malloc(size);
+    ring->size = size;
   
-  ring->start = 0;
-  ring->end = 0;
-  ring->current_len = 0;
+    ring->start = 0;
+    ring->end = 0;
+    ring->current_len = 0;
 }
 
-
+NO_INST 
 struct v3_ringbuf * v3_create_ringbuf(uint_t size) {
-  struct v3_ringbuf * ring = (struct v3_ringbuf *)V3_Malloc(sizeof(struct v3_ringbuf));
+    struct v3_ringbuf * ring = (struct v3_ringbuf *)V3_Malloc(sizeof(struct v3_ringbuf));
 
-  v3_init_ringbuf(ring, size);
+    v3_init_ringbuf(ring, size);
 
-  return ring;
+    return ring;
 }
 
+NO_INST 
 void v3_free_ringbuf(struct v3_ringbuf * ring) {
-  V3_Free(ring->buf);
-  V3_Free(ring);
+    V3_Free(ring->buf);
+    V3_Free(ring);
 }
 
 
-
-
-
+NO_INST 
 static inline uchar_t * get_read_ptr(struct v3_ringbuf * ring) {
-  return (uchar_t *)(ring->buf + ring->start);
+    return (uchar_t *)(ring->buf + ring->start);
 }
 
+NO_INST 
 static inline uchar_t * get_write_ptr(struct v3_ringbuf * ring) {
-  return (uchar_t *)(ring->buf + ring->end);
+    return (uchar_t *)(ring->buf + ring->end);
 }
 
-
+NO_INST 
 static inline int get_read_section_size(struct v3_ringbuf * ring) {
-  return ring->size - ring->start;
+    return ring->size - ring->start;
 }
 
+NO_INST 
 static inline int get_write_section_size(struct v3_ringbuf * ring) {
-  return ring->size - ring->end;
+    return ring->size - ring->end;
 }
 
+NO_INST 
 static inline int is_read_loop(struct v3_ringbuf * ring, uint_t len) {
-  if ((ring->start >= ring->end) && (ring->current_len > 0)) {
-    // end is past the end of the buffer
-    if (get_read_section_size(ring) < len) {
-      return 1;
+    if ((ring->start >= ring->end) && (ring->current_len > 0)) {
+	// end is past the end of the buffer
+	if (get_read_section_size(ring) < len) {
+	    return 1;
+	}
     }
-  }
-  return 0;
+    return 0;
 }
 
-
+NO_INST 
 static inline int is_write_loop(struct v3_ringbuf * ring, uint_t len) {
-  if ((ring->end >= ring->start) && (ring->current_len < ring->size)) {
-    // end is past the end of the buffer
-    if (get_write_section_size(ring) < len) {
-      return 1;
+    if ((ring->end >= ring->start) && (ring->current_len < ring->size)) {
+	// end is past the end of the buffer
+	if (get_write_section_size(ring) < len) {
+	    return 1;
+	}
     }
-  }
-  return 0;
+    return 0;
 }
 
+NO_INST 
+int v3_ringbuf_avail_space(struct v3_ringbuf * ring) {
+    return ring->size - ring->current_len;
+}
 
+NO_INST 
 int v3_ringbuf_data_len(struct v3_ringbuf * ring) {
-  return ring->current_len;
+    return ring->current_len;
 }
 
+NO_INST 
 int v3_ringbuf_capacity(struct v3_ringbuf * ring) {
-  return ring->size;
+    return ring->size;
 }
 
+NO_INST 
 int v3_ringbuf_read(struct v3_ringbuf * ring, uchar_t * dst, uint_t len) {
-  int read_len = 0;
-  int ring_data_len = ring->current_len;
+    int read_len = 0;
+    int ring_data_len = ring->current_len;
 
-  read_len = (len > ring_data_len) ? ring_data_len : len;
+    read_len = (len > ring_data_len) ? ring_data_len : len;
 
-  if (is_read_loop(ring, read_len)) {
-    int section_len = get_read_section_size(ring);
+    if (is_read_loop(ring, read_len)) {
+	int section_len = get_read_section_size(ring);
 
-    memcpy(dst, get_read_ptr(ring), section_len);
-    memcpy(dst + section_len, ring->buf, read_len - section_len);
+	memcpy(dst, get_read_ptr(ring), section_len);
+	memcpy(dst + section_len, ring->buf, read_len - section_len);
     
-    ring->start = read_len - section_len;
-  } else {
-    memcpy(dst, get_read_ptr(ring), read_len);
+	ring->start = read_len - section_len;
+    } else {
+	memcpy(dst, get_read_ptr(ring), read_len);
     
-    ring->start += read_len;
-  }
+	ring->start += read_len;
+    }
 
-  ring->current_len -= read_len;
+    ring->current_len -= read_len;
 
-  return read_len;
+    return read_len;
 }
 
 
-
-
+NO_INST 
 int v3_ringbuf_peek(struct v3_ringbuf * ring, uchar_t * dst, uint_t len) {
-  int read_len = 0;
-  int ring_data_len = ring->current_len;
+    int read_len = 0;
+    int ring_data_len = ring->current_len;
 
-  read_len = (len > ring_data_len) ? ring_data_len : len;
+    read_len = (len > ring_data_len) ? ring_data_len : len;
 
-  if (is_read_loop(ring, read_len)) {
-    int section_len = get_read_section_size(ring);
+    if (is_read_loop(ring, read_len)) {
+	int section_len = get_read_section_size(ring);
 
-    memcpy(dst, get_read_ptr(ring), section_len);
-    memcpy(dst + section_len, ring->buf, read_len - section_len);
-  } else {
-    memcpy(dst, get_read_ptr(ring), read_len);
-  }
+	memcpy(dst, get_read_ptr(ring), section_len);
+	memcpy(dst + section_len, ring->buf, read_len - section_len);
+    } else {
+	memcpy(dst, get_read_ptr(ring), read_len);
+    }
 
-  return read_len;
+    return read_len;
 }
 
 
+NO_INST 
 int v3_ringbuf_delete(struct v3_ringbuf * ring, uint_t len) {
-  int del_len = 0;
-  int ring_data_len = ring->current_len;
+    int del_len = 0;
+    int ring_data_len = ring->current_len;
 
-  del_len = (len > ring_data_len) ? ring_data_len : len;
+    del_len = (len > ring_data_len) ? ring_data_len : len;
 
-  if (is_read_loop(ring, del_len)) {
-    int section_len = get_read_section_size(ring);
-    ring->start = del_len - section_len;
-  } else {
-    ring->start += del_len;
-  }
+    if (is_read_loop(ring, del_len)) {
+	int section_len = get_read_section_size(ring);
+	ring->start = del_len - section_len;
+    } else {
+	ring->start += del_len;
+    }
 
-  ring->current_len -= del_len;
-  return del_len;
+    ring->current_len -= del_len;
+    return del_len;
 }
 
 
+NO_INST 
 int v3_ringbuf_write(struct v3_ringbuf * ring, uchar_t * src, uint_t len) {
-  int write_len = 0;
-  int ring_avail_space = ring->size - ring->current_len;
+    int write_len = 0;
+    int ring_avail_space = ring->size - ring->current_len;
   
-  write_len = (len > ring_avail_space) ? ring_avail_space : len;
+    write_len = (len > ring_avail_space) ? ring_avail_space : len;
 
 
-  if (is_write_loop(ring, write_len)) {
-    int section_len = get_write_section_size(ring);
+    if (is_write_loop(ring, write_len)) {
+	int section_len = get_write_section_size(ring);
+
+	//  PrintDebug("Write loop: write_ptr=%p, src=%p, sec_len=%d\n", 
+	//	       (void *)get_write_ptr(ring),(void*)src, section_len);
     
-    memcpy(get_write_ptr(ring), src, section_len);
-    ring->end = 0;
+	memcpy(get_write_ptr(ring), src, section_len);
+	ring->end = 0;
 
-    memcpy(get_write_ptr(ring), src + section_len, write_len - section_len);
+	memcpy(get_write_ptr(ring), src + section_len, write_len - section_len);
 
-    ring->end += write_len - section_len;
-  } else {
-    memcpy(get_write_ptr(ring), src, write_len);
+	ring->end += write_len - section_len;
+    } else {
+	//    PrintDebug("Writing: write_ptr=%p, src=%p, write_len=%d\n", 
+	//	       (void *)get_write_ptr(ring),(void*)src, write_len);
 
-    ring->end += write_len;
-  }
+	memcpy(get_write_ptr(ring), src, write_len);
 
-  ring->current_len += write_len;
+	ring->end += write_len;
+    }
 
-  return write_len;
+    ring->current_len += write_len;
+
+    return write_len;
 }
 
 
+NO_INST 
 void v3_print_ringbuf(struct v3_ringbuf * ring) {
-  int ctr = 0;
+    int ctr = 0;
   
-  for (ctr = 0; ctr < ring->current_len; ctr++) {
-    int index = (ctr + ring->start) % ring->size;
+    for (ctr = 0; ctr < ring->current_len; ctr++) {
+	int index = (ctr + ring->start) % ring->size;
 
-    PrintDebug("Entry %d (index=%d): %c\n", ctr, index, ring->buf[index]);
-  }
+	PrintDebug("Entry %d (index=%d): %c\n", ctr, index, ring->buf[index]);
+    }
 }