#include <vcl/vppcom.h>
#include <vcl/sock_test_common.h>
+#define vtfail(_fn, _rv) \
+{ \
+ errno = -_rv; \
+ perror ("ERROR when calling " _fn); \
+ fprintf (stderr, "\nERROR: " _fn " failed (errno = %d)!\n", -_rv); \
+ exit (1); \
+}
+
+#define vterr(_fn, _rv) \
+{ \
+ errno = -_rv; \
+ fprintf (stderr, "\nERROR: " _fn " failed (errno = %d)!\n", -_rv); \
+}
+
+#define vtwrn(_fmt, _args...) \
+ fprintf (stderr, "\nERROR: " _fmt "\n", ##_args) \
+
+#define vtinf(_fmt, _args...) \
+ fprintf (stdout, "vt<w%u>: " _fmt "\n", __wrk_index, ##_args)
+
+#define vt_atomic_add(_ptr, _val) \
+ __atomic_fetch_add (_ptr, _val, __ATOMIC_RELEASE)
+
static inline int
vcl_test_read (int fd, uint8_t *buf, uint32_t nbytes,
sock_test_stats_t *stats)
if (rx_bytes < 0)
{
- errno_val = errno;
- perror ("ERROR in sock_test_read()");
- fprintf (stderr, "SOCK_TEST: ERROR: socket read "
- "failed (errno = %d)!\n", errno_val);
- errno = errno_val;
+ vterr ("vppcom_session_read()", -errno);
+ }
+ else if (stats)
+ stats->rx_bytes += rx_bytes;
+
+ return (rx_bytes);
+}
+
+static inline int
+vcl_test_read_ds (int fd, vppcom_data_segments_t ds, sock_test_stats_t *stats)
+{
+ int rx_bytes, errno_val;
+
+ do
+ {
+ if (stats)
+ stats->rx_xacts++;
+ rx_bytes = vppcom_session_read_segments (fd, ds);
+
+ if (rx_bytes < 0)
+ {
+ errno = -rx_bytes;
+ rx_bytes = -1;
+ }
+ if (stats)
+ {
+ if ((rx_bytes == 0) ||
+ ((rx_bytes < 0) && ((errno == EAGAIN) || (errno == EWOULDBLOCK))))
+ stats->rx_eagain++;
+ }
+ }
+ while ((rx_bytes == 0) ||
+ ((rx_bytes < 0) && ((errno == EAGAIN) || (errno == EWOULDBLOCK))));
+
+ if (rx_bytes < 0)
+ {
+ vterr ("vppcom_session_read()", -errno);
}
else if (stats)
stats->rx_bytes += rx_bytes;
nbytes_left = nbytes_left - rv;
if (stats)
stats->tx_incomp++;
- if (verbose)
- {
- printf ("SOCK_TEST: WARNING: bytes written (%d) "
- "!= bytes to write (%d)!\n", tx_bytes, nbytes);
- }
}
} while (tx_bytes != nbytes);