Changeset b135888

Timestamp:

07/02/18 18:23:32 (2 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

cachetimestamps, develop, master, ringdecrementfix, ringperformance

Children:

5864acd

Parents:

97d0351

Message:

Fix bad check for recvmmsg after switching to AC_CHECK_DECLS

Two problems:

1. recvmmsg requires an extra #include, which we have to add specifically.
2. HAVE_RECVMMSG is no longer the right macro to check; instead we needed HAVE_DECL_RECVMMSG

Files:

• configure.in (modified) (1 diff)
• lib/format_ndag.c (modified) (8 diffs)

configure.in

@@ -122 +122 @@
 
 # Fail if any of these functions are missing
-AC_CHECK_DECLS([socket, strdup, strlcpy, strcasecmp, strncasecmp, snprintf, vsnprintf, recvmmsg, strndup])
-
+AC_CHECK_DECLS([strdup, strlcpy, strcasecmp, strncasecmp, snprintf, vsnprintf, strndup])
+AC_CHECK_DECLS([socket, recvmmsg], [], [], [[#include <sys/socket.h>]])
 AC_CHECK_SIZEOF([long int])
 

lib/format_ndag.c

@@ -94 +94 @@
         int bufwaiting;
 
-#if HAVE_RECVMMSG
+#if HAVE_DECL_RECVMMSG
         struct mmsghdr mmsgbufs[RECV_BATCH_SIZE];
 #else
@@ -532 +532 @@
                 }
 
-#if HAVE_RECVMMSG
+#if HAVE_DECL_RECVMMSG
                 for (j = 0; j < RECV_BATCH_SIZE; j++) {
                         if (src.mmsgbufs[j].msg_hdr.msg_iov) {
@@ -749 +749 @@
         }
 
-#if HAVE_RECVMMSG
+#if HAVE_DECL_RECVMMSG
         for (i = 0; i < RECV_BATCH_SIZE; i++) {
                 ssock->mmsgbufs[i].msg_hdr.msg_iov = (struct iovec *)
@@ -834 +834 @@
         int i = 1;
 
-#if HAVE_RECVMMSG
+#if HAVE_DECL_RECVMMSG
         for (i = 0; i < required; i++) {
                 if (i >= RECV_BATCH_SIZE) {
@@ -937 +937 @@
         int toret = 0;
 
-#if HAVE_RECVMMSG
+#if HAVE_DECL_RECVMMSG
         int i;
 #endif
@@ -943 +943 @@
         avail = init_receivers(ssock, ssock->bufavail);
 
-#if HAVE_RECVMMSG
+#if HAVE_DECL_RECVMMSG
         ret = recvmmsg(ssock->sock, ssock->mmsgbufs, avail,
                         MSG_DONTWAIT, NULL);
@@ -985 +985 @@
         ssock->startidle = 0;
 
-#if HAVE_RECVMMSG
+#if HAVE_DECL_RECVMMSG
         for (i = 0; i < ret; i++) {
                 ndagstat = check_ndag_received(ssock, ssock->nextwriteind,
@@ -1034 +1034 @@
                 }
 
-#if HAVE_RECVMMSG
+#if HAVE_DECL_RECVMMSG
                 /* Plenty of full buffers, just use the packets in those */
                 if (rt->sources[i].bufavail < RECV_BATCH_SIZE / 2) {