cleaned up instrumentation implementation

[palacios.git] / palacios / src / palacios / vmm_ringbuffer.c

diff --git a/palacios/src/palacios/vmm_ringbuffer.c b/palacios/src/palacios/vmm_ringbuffer.c
index bbde628..5df142b 100644 (file)
--- a/palacios/src/palacios/vmm_ringbuffer.c
+++ b/palacios/src/palacios/vmm_ringbuffer.c
@@ -21,7 +21,9 @@
 #include <palacios/vmm.h>
 
 
-void v3_init_ringbuf(struct v3_ringbuf * ring, uint_t size) {
+
+
+void NO_INST v3_init_ringbuf(struct v3_ringbuf * ring, uint_t size) {
   ring->buf = V3_Malloc(size);
   ring->size = size;
   
@@ -30,7 +32,7 @@ void v3_init_ringbuf(struct v3_ringbuf * ring, uint_t size) {
   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));
 
@@ -39,32 +41,34 @@ struct v3_ringbuf * v3_create_ringbuf(uint_t size) {
   return ring;
 }
 
+NO_INST 
 void v3_free_ringbuf(struct v3_ringbuf * 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);
 }
 
+NO_INST 
 static inline uchar_t * get_write_ptr(struct v3_ringbuf * ring) {
   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;
 }
 
+NO_INST 
 static inline int get_write_section_size(struct v3_ringbuf * ring) {
   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
@@ -75,7 +79,7 @@ static inline int is_read_loop(struct v3_ringbuf * ring, uint_t len) {
   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
@@ -86,15 +90,22 @@ static inline int is_write_loop(struct v3_ringbuf * ring, uint_t len) {
   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;
 }
 
+ NO_INST 
 int v3_ringbuf_capacity(struct v3_ringbuf * ring) {
   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;
@@ -120,8 +131,7 @@ int v3_ringbuf_read(struct v3_ringbuf * ring, uchar_t * dst, uint_t 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;
@@ -141,6 +151,7 @@ int v3_ringbuf_peek(struct v3_ringbuf * ring, uchar_t * dst, uint_t 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;
@@ -159,6 +170,7 @@ int v3_ringbuf_delete(struct v3_ringbuf * ring, uint_t 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;
@@ -168,6 +180,9 @@ int v3_ringbuf_write(struct v3_ringbuf * ring, uchar_t * src, uint_t len) {
 
   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;
@@ -176,6 +191,9 @@ int v3_ringbuf_write(struct v3_ringbuf * ring, uchar_t * src, uint_t 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);
+
     memcpy(get_write_ptr(ring), src, write_len);
 
     ring->end += write_len;
@@ -187,6 +205,7 @@ int v3_ringbuf_write(struct v3_ringbuf * ring, uchar_t * src, uint_t len) {
 }
 
 
+NO_INST 
 void v3_print_ringbuf(struct v3_ringbuf * ring) {
   int ctr = 0;