Changeset 957a72a for lib/data-struct

Timestamp:

08/18/14 02:37:07 (8 years ago)

Author:

Richard Sanger <rsangerarj@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, 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:

5b4d121

Parents:

0862c20

Message:

Fix ocache to always try write/read back a full/empty local cache. This was causing it to never cache packets if running without a limited allocation number (i.e. malloc and free were always being used).

File:

• lib/data-struct/object_cache.c (modified) (2 diffs)

lib/data-struct/object_cache.c

@@ -271 +271 @@
                         lc->used = libtrace_ringbuffer_sread_bulk(rb, lc->cache, lc->total, min_nb_buffers - i);
                 else
-                        lc->used = 0;
+                        lc->used = libtrace_ringbuffer_sread_bulk(rb, lc->cache, lc->total, 0);
 
                 if (lc->used == lc->total)
@@ -367 +367 @@
 
                 // Make sure we still meet the minimum requirement
-                lc->used = lc->total - libtrace_ringbuffer_swrite_bulk(rb, lc->cache, lc->total, min_nb_buffers - i);
+                if (i < min_nb_buffers)
+                        lc->used = lc->total - libtrace_ringbuffer_swrite_bulk(rb, lc->cache, lc->total, min_nb_buffers - i);
+                else
+                        lc->used = lc->total - libtrace_ringbuffer_swrite_bulk(rb, lc->cache, lc->total, 0);
+
                 // Re originise fulls to the front
                 if (lc->used)