VCL: improve debug output

[vpp.git] / src / vcl / vcom.c

diff --git a/src/vcl/vcom.c b/src/vcl/vcom.c
index ed52bfa..24b8f29 100644 (file)
--- a/src/vcl/vcom.c
+++ b/src/vcl/vcom.c
@@ -98,7 +98,7 @@ static int is_vcom_init;
  * RETURN: 0 on success -1 on failure
  * */
 static inline int
-vcom_init ()
+vcom_init (void)
 {
   pid_t pid = getpid ();
 
@@ -196,12 +196,10 @@ close (int __fd)
   if (is_vcom_socket_fd (__fd) || is_vcom_epfd (__fd))
     {
       if (VCOM_DEBUG > 0)
-       vcom_socket_main_show ();
+       fprintf (stderr, "[%d] close: fd %d\n", pid, __fd);
       rv = vcom_close (__fd);
       if (VCOM_DEBUG > 0)
-       fprintf (stderr, "[%d] close: " "'%04d'='%04d'\n", pid, rv, __fd);
-      if (VCOM_DEBUG > 0)
-       vcom_socket_main_show ();
+       fprintf (stderr, "[%d] close: vcom_close() returned %d\n", pid, rv);
       if (rv != 0)
        {
          errno = -rv;
@@ -1953,6 +1951,12 @@ vcom_connect (int __fd, __CONST_SOCKADDR_ARG __addr, socklen_t __len)
     case AF_INET:
     case AF_INET6:
       rv = vcom_socket_connect (__fd, __addr, __len);
+      if (!rv)
+       {
+         errno = -rv;
+         return -1;
+
+       }
       break;
 
     default:
@@ -1979,7 +1983,7 @@ connect (int __fd, __CONST_SOCKADDR_ARG __addr, socklen_t __len)
                 "'%04d'='%04d', '%p', '%04d'\n",
                 pid, (unsigned long) tid, (unsigned long) tid,
                 rv, __fd, __addr, __len);
-      if (rv != 0)
+      if (!rv)
        {
          errno = -rv;
          return -1;
@@ -2070,6 +2074,46 @@ send (int __fd, const void *__buf, size_t __n, int __flags)
   return libc_send (__fd, __buf, __n, __flags);
 }
 
+ssize_t
+sendfile (int __out_fd, int __in_fd, off_t * __offset, size_t __len)
+{
+  ssize_t size;
+
+  if (VCOM_DEBUG > 2)
+    clib_warning ("[%d] __out_fd %d, __in_fd %d, __offset %p, __len %ld",
+                 getpid (), __out_fd, __in_fd, __offset, __len);
+
+  if (is_vcom_socket_fd (__out_fd))
+    {
+      /* TBD: refactor this check to be part of is_vcom_socket_fd() */
+      if (vcom_init () != 0)
+       return -1;
+
+      size = vcom_socket_sendfile (__out_fd, __in_fd, __offset, __len);
+      if (VCOM_DEBUG > 2)
+       clib_warning ("[%d] vcom_socket_sendfile (out_fd %d, in_fd %d, "
+                     "offset %p (%ld), len %lu) returned %ld",
+                     getpid (), __out_fd, __in_fd, __offset,
+                     __offset ? *__offset : -1, __len, size);
+      if (size < 0)
+       {
+         errno = -size;
+         return -1;
+       }
+      return size;
+    }
+  if (VCOM_DEBUG > 2)
+    clib_warning ("[%d] calling libc_sendfile!", getpid ());
+  return libc_sendfile (__out_fd, __in_fd, __offset, __len);
+}
+
+ssize_t
+sendfile64 (int __out_fd, int __in_fd, off_t * __offset, size_t __len)
+{
+  return sendfile (__out_fd, __in_fd, __offset, __len);
+}
+
+
 /*
  * Read N bytes into BUF from socket FD.
  * Returns the number read or -1 for errors.
@@ -2829,7 +2873,7 @@ epoll_wait (int __epfd, struct epoll_event *__events,
 
   rv =
     vcom_socket_epoll_pwait (__epfd, __events, __maxevents, __timeout, NULL);
-  if (VCOM_DEBUG > 1)
+  if (VCOM_DEBUG > 2)
     fprintf (stderr,
             "[%d] epoll_wait: "
             "'%04d'='%04d', '%p', "