Changeset aa67e26

Timestamp:

04/08/06 13:46:28 (16 years ago)

Author:

Perry Lorier <perry@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

5da3315

Parents:

67a14d4

Message:

Fix namespace issues with fifo.c

File:

• lib/fifo.c (modified) (14 diffs)

lib/fifo.c

@@ -56 +56 @@
 
 
-enum which_t { IN, OUT, ACK };
+enum which_t { FIFO_PTR_IN, FIFO_PTR_OUT, FIFO_PTR_ACK };
 
 struct tracefifo_t {
@@ -89 +89 @@
         }
 
-        fifo->datamap[IN] = 0;
-        fifo->datamap[OUT] = 0;
-        fifo->datamap[ACK] = 0;
+        fifo->datamap[FIFO_PTR_IN] = 0;
+        fifo->datamap[FIFO_PTR_OUT] = 0;
+        fifo->datamap[FIFO_PTR_ACK] = 0;
         return fifo;
 }
@@ -104 +104 @@
 static void increment_pointer(struct tracefifo_t *fifo, enum which_t which, int amount) {
         assert(fifo);
-        assert(which == IN || which == OUT || which == ACK);
+        assert(which == FIFO_PTR_IN || which == FIFO_PTR_OUT || which == FIFO_PTR_ACK);
         assert(amount >= 0);
 
@@ -121 +121 @@
 static void set_pointer(struct tracefifo_t *fifo, enum which_t which, unsigned int location) {
         assert(fifo);
-        assert(which == IN || which == OUT || which == ACK);
+        assert(which == FIFO_PTR_IN || which == FIFO_PTR_OUT || which == FIFO_PTR_ACK);
 
         assert(location <= fifo->length);
@@ -130 +130 @@
 static size_t tracefifo_compare(struct tracefifo_t *fifo, enum which_t first, enum which_t second) {
         assert(fifo);
-        assert(first == IN || first == OUT || first == ACK);
-        assert(second == IN || second == OUT || second == ACK);
+        assert(first == FIFO_PTR_IN || first == FIFO_PTR_OUT || first == FIFO_PTR_ACK);
+        assert(second == FIFO_PTR_IN || second == FIFO_PTR_OUT || second == FIFO_PTR_ACK);
 
         if (fifo->datamap[first] == fifo->datamap[second]) {
@@ -145 +145 @@
 size_t tracefifo_free(struct tracefifo_t *fifo) {
         assert(fifo);
-        return (fifo->length - tracefifo_compare(fifo,IN,ACK));
+        return (fifo->length - tracefifo_compare(fifo,FIFO_PTR_IN,FIFO_PTR_ACK));
 } 
 
@@ -155 +155 @@
 size_t tracefifo_out_available(struct tracefifo_t *fifo) {
         assert(fifo);
-        return tracefifo_compare(fifo,IN,OUT);
+        return tracefifo_compare(fifo,FIFO_PTR_IN,FIFO_PTR_OUT);
 }
 
 size_t tracefifo_ack_available(struct tracefifo_t *fifo) {
         assert(fifo);
-        return tracefifo_compare(fifo,OUT,ACK);
+        return tracefifo_compare(fifo,FIFO_PTR_OUT,FIFO_PTR_ACK);
 }
 
@@ -168 +168 @@
         assert(state);
 
-        state->in = fifo->datamap[IN];
-        state->out = fifo->datamap[OUT];
-        state->ack = fifo->datamap[ACK];
+        state->in = fifo->datamap[FIFO_PTR_IN];
+        state->out = fifo->datamap[FIFO_PTR_OUT];
+        state->ack = fifo->datamap[FIFO_PTR_ACK];
         state->length = fifo->length;
-        state->used = tracefifo_compare(fifo,IN,ACK);
+        state->used = tracefifo_compare(fifo,FIFO_PTR_IN,FIFO_PTR_ACK);
 
 }
@@ -187 +187 @@
         if (desc)
                 scan += sprintf(scan,"%s\t",desc);
-        scan += sprintf(scan,"in:   %d \t",fifo->datamap[IN]);
-        scan += sprintf(scan,"sent: %d\t", fifo->datamap[OUT]);
-        scan += sprintf(scan,"ack:  %d\t", fifo->datamap[ACK]);
+        scan += sprintf(scan,"in:   %d \t",fifo->datamap[FIFO_PTR_IN]);
+        scan += sprintf(scan,"sent: %d\t", fifo->datamap[FIFO_PTR_OUT]);
+        scan += sprintf(scan,"ack:  %d\t", fifo->datamap[FIFO_PTR_ACK]);
         if (delta > 0)
                 scan += sprintf(scan,"delta: %d\t", delta);
-        scan += sprintf(scan,"Size: %d", tracefifo_compare(fifo,IN,ACK));
+        scan += sprintf(scan,"Size: %d", tracefifo_compare(fifo,FIFO_PTR_IN,FIFO_PTR_ACK));
         scan += sprintf(scan,"\n");
         return tracefifo_stat_buffer;
@@ -244 +244 @@
         lenleft = len;
         while (lenleft > 0) {
-                size = MIN((fifo->length - fifo->datamap[IN]), lenleft );
-                memcpy((char *)((ptrdiff_t)fifo->base + fifo->datamap[IN]), 
+                size = MIN((fifo->length - fifo->datamap[FIFO_PTR_IN]), lenleft );
+                memcpy((char *)((ptrdiff_t)fifo->base + fifo->datamap[FIFO_PTR_IN]), 
                                 buffer, 
                                 size);
-                increment_pointer(fifo,IN,size);
+                increment_pointer(fifo,FIFO_PTR_IN,size);
                 buffer = (char*)buffer+size;
                 lenleft -= size;
@@ -259 +259 @@
         assert(fifo);
         assert(buffer);
-        if (tracefifo_compare(fifo,IN,OUT) < len) {
-                return 0;
-        }
-        return tracefifo_read_generic(fifo,buffer,len,OUT,0);
+        if (tracefifo_compare(fifo,FIFO_PTR_IN,FIFO_PTR_OUT) < len) {
+                return 0;
+        }
+        return tracefifo_read_generic(fifo,buffer,len,FIFO_PTR_OUT,0);
 }
 
@@ -268 +268 @@
         assert(fifo);
         assert(buffer);
-        if (tracefifo_compare(fifo,OUT,ACK) < len) {
-                return 0;
-        }
-        return tracefifo_read_generic(fifo,buffer,len,ACK,0);
+        if (tracefifo_compare(fifo,FIFO_PTR_OUT,FIFO_PTR_ACK) < len) {
+                return 0;
+        }
+        return tracefifo_read_generic(fifo,buffer,len,FIFO_PTR_ACK,0);
 }
 
 int tracefifo_out_update(struct tracefifo_t *fifo, size_t len){
         assert(fifo);
-        if (tracefifo_compare(fifo,IN,OUT) < len) {
-                return 0;
-        }
-        increment_pointer(fifo,OUT,len);
+        if (tracefifo_compare(fifo,FIFO_PTR_IN,FIFO_PTR_OUT) < len) {
+                return 0;
+        }
+        increment_pointer(fifo,FIFO_PTR_OUT,len);
         return len;
 }
@@ -285 +285 @@
 int tracefifo_ack_update(struct tracefifo_t *fifo, size_t len){
         assert(fifo);
-        if (tracefifo_compare(fifo,OUT,ACK) < len) {
-                return 0;
-        }
-        increment_pointer(fifo,ACK,len);
+        if (tracefifo_compare(fifo,FIFO_PTR_OUT,FIFO_PTR_ACK) < len) {
+                return 0;
+        }
+        increment_pointer(fifo,FIFO_PTR_ACK,len);
         return len;
 }
@@ -299 +299 @@
          */
         assert(fifo);
-        fifo->datamap[OUT] = fifo->datamap[ACK];
-}
-
+        fifo->datamap[FIFO_PTR_OUT] = fifo->datamap[FIFO_PTR_ACK];
+}
+