Changeset 05b65ae for lib

Timestamp:

11/08/17 12:02:07 (3 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

cachetimestamps, develop, dpdk-ndag, etsilive, master, ndag_format, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance

Children:

0317e3c

Parents:

e68325b

Message:

Tweaked inline functions in format_ndag.c

Some functions had their inline status removed, as they were
probably doing too much work to be worth inlining.

Removed read_required() function and just put the checks in the
function that used to call it.

Changed readable_data() to take a streamsock_t *, rather than a
streamsock_t -- the overhead of needlessly copying the structure
was noticeable.

File:

• lib/format_ndag.c (modified) (9 diffs)

lib/format_ndag.c

@@ -104 +104 @@
 }
 
-static inline uint8_t check_ndag_header(char *msgbuf, uint32_t msgsize) {
+static uint8_t check_ndag_header(char *msgbuf, uint32_t msgsize) {
         ndag_common_t *header = (ndag_common_t *)msgbuf;
 
@@ -258 +258 @@
 }
 
-static inline void new_group_alert(libtrace_t *libtrace, uint16_t threadid,
+static void new_group_alert(libtrace_t *libtrace, uint16_t threadid,
                 uint16_t portnum, uint16_t monid) {
 
@@ -430 +430 @@
 }
 
-static inline int ndag_start_threads(libtrace_t *libtrace, uint32_t maxthreads)
+static int ndag_start_threads(libtrace_t *libtrace, uint32_t maxthreads)
 {
         int ret;
@@ -685 +685 @@
 }
 
-static inline int readable_data(streamsock_t ssock) {
-
-        if (ssock.sock == -1) {
+static inline int readable_data(streamsock_t *ssock) {
+
+        if (ssock->sock == -1) {
                 return 0;
         }
-        if (ssock.savedsize[ssock.nextreadind] == 0) {
+        if (ssock->savedsize[ssock->nextreadind] == 0) {
                 return 0;
         }
-        if (ssock.nextread - ssock.saved[ssock.nextreadind] >=
-                        ssock.savedsize[ssock.nextreadind]) {
+        if (ssock->nextread - ssock->saved[ssock->nextreadind] >=
+                        ssock->savedsize[ssock->nextreadind]) {
                 return 0;
         }
@@ -701 +701 @@
 
 }
-
-static inline int read_required(streamsock_t ssock) {
-        if (ssock.sock == -1)
-                return 0;
-        if (ssock.savedsize[ssock.nextwriteind] == 0)
-                return 1;
-        //if (ssock.nextread - ssock.saved >= ssock.savedsize)
-        //        return 1;
-        return 0;
-}
-
 
 static int receive_from_sockets(recvstream_t *rt) {
@@ -726 +715 @@
                 ndag_encap_t *encaphdr;
 
-                if (!read_required(rt->sources[i])) {
-                        if (rt->sources[i].sock != -1) {
-                                readybufs ++;
-                        }
+                if (rt->sources[i].sock == -1) {
+                        continue;
+                } else if (rt->sources[i].savedsize[rt->sources[i].nextwriteind] != 0) {
+                        readybufs ++;
                         continue;
                 }
@@ -743 +732 @@
                          * count as 'ready' if at least one buffer is full */
                         if (errno == EAGAIN || errno == EWOULDBLOCK) {
-                                if (readable_data(rt->sources[i])) {
+                                if (readable_data(&(rt->sources[i]))) {
                                         readybufs ++;
                                 }
@@ -812 +801 @@
                 }
 
-                readybufs += 1;
+                readybufs ++;
         }
 
@@ -885 +874 @@
 
         for (i = 0; i < rt->sourcecount; i ++) {
-                if (!readable_data(rt->sources[i])) {
+                if (!readable_data(&(rt->sources[i]))) {
                         continue;
                 }