Ignore:
Timestamp:
02/19/15 13:05:59 (7 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:
694823f
Parents:
5ab626a
Message:

Move the ring sizes to the stream structures, it's possible rings could end up different sizes.
Other than that their are many operation related to reading packets which rely upon it and
it seems more natural to include this against the stream.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • lib/format_linux_common.h

    r5ab626a re4f27d1  
    216216        /* Flag indicating whether the statistics are current or not */
    217217        int stats_valid;
    218         /* The current ring buffer layout */
    219         struct tpacket_req req;
    220218        /* Used to determine buffer size for the ring buffer */
    221219        uint32_t max_order;
     
    257255        /* Offset within the mapped buffer */
    258256        int rxring_offset;
     257        /* The ring buffer layout */
     258        struct tpacket_req req;
    259259} ALIGN_STRUCT(CACHE_LINE_SIZE);
    260260
    261 #define ZERO_LINUX_STREAM {-1, MAP_FAILED, 0}
     261#define ZERO_LINUX_STREAM {-1, MAP_FAILED, 0, {0}}
    262262
    263263
Note: See TracChangeset for help on using the changeset viewer.