Changeset 04bf7c5 for lib/libtrace_int.h


Ignore:
Timestamp:
01/20/15 09:44:16 (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:
75e088f, fed9152
Parents:
b73407f
Message:

Remove unused sliding window code.
Refactored pstart and added some proper error handling.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • lib/libtrace_int.h

    rd7fd648 r04bf7c5  
    292292        int perpkt_thread_states[THREAD_STATE_MAX];
    293293
    294         /** For the sliding window hasher implementation */
    295         pthread_rwlock_t window_lock;
    296294        /** Set to indicate a perpkt's queue is full as such the writing perpkt cannot proceed */
    297295        bool perpkt_queue_full;
     
    315313        int perpkt_thread_count;
    316314        libtrace_thread_t * perpkt_threads; // All our perpkt threads
    317         libtrace_slidingwindow_t sliding_window;
    318         sem_t sem;
    319315        // Used to keep track of the first packet seen on each thread
    320316        struct first_packets first_packets;
     
    881877        struct libtrace_info_t info;
    882878
    883         /** Starts or unpauses an input trace in parallel mode - note that
     879        /**
     880         * Starts or unpauses an input trace in parallel mode - note that
    884881         * this function is often the one that opens the file or device for
    885882         * reading.
    886883         *
    887884         * @param libtrace      The input trace to be started or unpaused
    888          * @return If successful the number of threads started, 0 indicates
    889          *                 no threads started and this should be done automatically.
    890          *                 Otherwise in event of an error -1 is returned.
     885         * @return 0 upon success.
     886         *         Otherwise in event of an error -1 is returned.
    891887         *
    892888         */
Note: See TracChangeset for help on using the changeset viewer.