Changeset f7f7015
- Timestamp:
- 11/22/16 11:26:41 (5 years ago)
- Branches:
- 4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, master, ndag_format, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes
- Children:
- 571e2f9
- Parents:
- 78fe0d2 (diff), d0a067f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent. - Location:
- lib
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
lib/format_pcap.c
r1d780e4 r631fdbc 765 765 } 766 766 767 stat->received_valid = 1; 768 stat->received = pcapstats.ps_recv; 767 769 stat->dropped_valid = 1; 768 770 stat->dropped = pcapstats.ps_drop; -
lib/libtrace.h.in
ra984307 r0cdd231 1662 1662 1663 1663 /** 1664 * Clear all fields of given statistic. 1665 * This api doesn't verify the magic field unlike other stat apis. 1666 * 1667 * @param s The statistic structure to clear 1668 */ 1669 DLLEXPORT 1670 void trace_clear_statistics(libtrace_stat_t *s); 1671 1672 /** 1664 1673 * Performs the operation c=a-b accounting for valid fields. 1665 1674 * c is allowed to be a or b. -
lib/linktypes.c
ree6e802 r4b64a045 212 212 case LIBTRACE_ARPHRD_PPP: return TRACE_TYPE_NONE; 213 213 case LIBTRACE_ARPHRD_LOOPBACK: return TRACE_TYPE_ETH; 214 case LIBTRACE_ARPHRD_SIT: return TRACE_TYPE_ETH; 214 215 case LIBTRACE_ARPHRD_NONE: return TRACE_TYPE_NONE; 215 216 } -
lib/trace.c
r903f64d r0cdd231 2214 2214 } 2215 2215 2216 void trace_clear_statistics(libtrace_stat_t *s) { 2217 memset(s, 0, sizeof(libtrace_stat_t)); 2218 s->magic = LIBTRACE_STAT_MAGIC; 2219 } 2220 2216 2221 void trace_subtract_statistics(const libtrace_stat_t *a, const libtrace_stat_t *b, 2217 2222 libtrace_stat_t *c) {
Note: See TracChangeset
for help on using the changeset viewer.