apps: refactor uri and update build infra

Change-Id: Ifa9966a27586a1a65038d069cf4a1e6e21a72d45
Signed-off-by: Florin Coras <fcoras@cisco.com>

4 files changed, 0 insertions, 2864 deletions

diff --git a/src/uri/uri_socket_server.c b/src/uri/uri_socket_server.c
deleted file mode 100644
index 4f4c5f30803..00000000000
--- a/src/uri/uri_socket_server.c
+++ /dev/null
@@ -1,231 +0,0 @@
-/*
- * Copyright (c) 2017 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <vppinfra/format.h>
-#include <signal.h>
-#include <sys/ucontext.h>
-#include <sys/time.h>
-
-volatile int signal_received;
-
-static void
-unix_signal_handler (int signum, siginfo_t * si, ucontext_t * uc)
-{
-  signal_received = 1;
-}
-
-static void
-setup_signal_handler (void)
-{
-  uword i;
-  struct sigaction sa;
-
-  for (i = 1; i < 32; i++)
-    {
-      memset (&sa, 0, sizeof (sa));
-      sa.sa_sigaction = (void *) unix_signal_handler;
-      sa.sa_flags = SA_SIGINFO;
-
-      switch (i)
-	{
-	  /* these signals take the default action */
-	case SIGABRT:
-	case SIGKILL:
-	case SIGSTOP:
-	case SIGUSR1:
-	case SIGUSR2:
-	  continue;
-
-	  /* ignore SIGPIPE, SIGCHLD */
-	case SIGPIPE:
-	case SIGCHLD:
-	  sa.sa_sigaction = (void *) SIG_IGN;
-	  break;
-
-	  /* catch and handle all other signals */
-	default:
-	  break;
-	}
-
-      if (sigaction (i, &sa, 0) < 0)
-	clib_unix_warning ("sigaction %U", format_signal, i);
-    }
-}
-
-
-int
-main (int argc, char *argv[])
-{
-  int sockfd, portno, n, sent, accfd, reuse;
-  socklen_t client_addr_len;
-  struct sockaddr_in serv_addr;
-  struct sockaddr_in client;
-  struct hostent *server;
-  u8 *rx_buffer = 0, no_echo = 0;
-  struct timeval start, end;
-  long rcvd = 0;
-  double deltat;
-
-  if (argc > 1 && argc < 3)
-    {
-      fformat (stderr, "usage %s host port\n", argv[0]);
-      exit (0);
-    }
-
-  if (argc >= 4)
-    {
-      no_echo = atoi (argv[3]);
-      portno = atoi (argv[2]);
-      server = gethostbyname (argv[1]);
-      if (server == NULL)
-	{
-	  clib_unix_warning ("gethostbyname");
-	  exit (1);
-	}
-    }
-  else
-    {
-      /* Defaults */
-      portno = 1234;
-      server = gethostbyname ("6.0.1.1");
-      if (server == NULL)
-	{
-	  clib_unix_warning ("gethostbyname");
-	  exit (1);
-	}
-    }
-
-
-  setup_signal_handler ();
-
-  sockfd = socket (AF_INET, SOCK_STREAM, 0);
-  if (sockfd < 0)
-    {
-      clib_unix_error ("socket");
-      exit (1);
-    }
-
-  reuse = 1;
-  if (setsockopt (sockfd, SOL_SOCKET, SO_REUSEADDR, (const char *) &reuse,
-		  sizeof (reuse)) < 0)
-    {
-      clib_unix_error ("setsockopt(SO_REUSEADDR) failed");
-      exit (1);
-    }
-
-  bzero ((char *) &serv_addr, sizeof (serv_addr));
-  serv_addr.sin_family = AF_INET;
-  bcopy ((char *) server->h_addr,
-	 (char *) &serv_addr.sin_addr.s_addr, server->h_length);
-  serv_addr.sin_port = htons (portno);
-  if (bind (sockfd, (const void *) &serv_addr, sizeof (serv_addr)) < 0)
-    {
-      clib_unix_warning ("bind");
-      exit (1);
-    }
-
-  vec_validate (rx_buffer, 128 << 10);
-
-  if (listen (sockfd, 5 /* backlog */ ) < 0)
-    {
-      clib_unix_warning ("listen");
-      close (sockfd);
-      return 1;
-    }
-
-  while (1)
-    {
-      if (signal_received)
-	break;
-
-      client_addr_len = sizeof (struct sockaddr);
-      accfd = accept (sockfd, (struct sockaddr *) &client, &client_addr_len);
-      if (accfd < 0)
-	{
-	  clib_unix_warning ("accept");
-	  continue;
-	}
-      fformat (stderr, "Accepted connection from: %s : %d\n",
-	       inet_ntoa (client.sin_addr), client.sin_port);
-      gettimeofday (&start, NULL);
-
-      while (1)
-	{
-	  n = recv (accfd, rx_buffer, vec_len (rx_buffer), 0 /* flags */ );
-	  if (n == 0)
-	    {
-	      /* Graceful exit */
-	      close (accfd);
-	      gettimeofday (&end, NULL);
-	      deltat = (end.tv_sec - start.tv_sec);
-	      deltat += (end.tv_usec - start.tv_usec) / 1000000.0;
-	      clib_warning ("Finished in %.6f", deltat);
-	      clib_warning ("%.4f Gbit/second %s",
-			    (((f64) rcvd * 8.0) / deltat / 1e9),
-			    no_echo ? "half" : "full");
-	      rcvd = 0;
-	      break;
-	    }
-	  if (n < 0)
-	    {
-	      clib_unix_warning ("recv");
-	      close (accfd);
-	      break;
-	    }
-
-	  if (signal_received)
-	    break;
-
-	  rcvd += n;
-	  if (no_echo)
-	    continue;
-
-	  sent = send (accfd, rx_buffer, n, 0 /* flags */ );
-	  if (n < 0)
-	    {
-	      clib_unix_warning ("send");
-	      close (accfd);
-	      break;
-	    }
-
-	  if (sent != n)
-	    {
-	      clib_warning ("sent %d not %d", sent, n);
-	    }
-
-	  if (signal_received)
-	    break;
-	}
-    }
-
-  close (sockfd);
-
-  return 0;
-}
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/src/uri/uri_socket_test.c b/src/uri/uri_socket_test.c
deleted file mode 100644
index 4469b03d4c2..00000000000
--- a/src/uri/uri_socket_test.c
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * Copyright (c) 2017 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <vppinfra/format.h>
-#include <sys/time.h>
-
-int
-main (int argc, char *argv[])
-{
-  int sockfd, portno, n;
-  struct sockaddr_in serv_addr;
-  struct hostent *server;
-  u8 *rx_buffer = 0, *tx_buffer = 0, no_echo = 0, test_bytes = 0;
-  u32 offset;
-  long bytes = 1 << 20, to_send;
-  int i;
-  struct timeval start, end;
-  double deltat;
-
-  if (argc >= 3)
-    {
-      portno = atoi (argv[2]);
-      server = gethostbyname (argv[1]);
-      if (server == NULL)
-	{
-	  clib_unix_warning ("gethostbyname");
-	  exit (1);
-	}
-
-      argc -= 3;
-      argv += 3;
-
-      if (argc)
-	{
-	  bytes = ((long) atoi (argv[0])) << 20;
-	  argc--;
-	  argv++;
-	}
-      if (argc)
-	{
-	  no_echo = atoi (argv[0]);
-	  argc--;
-	  argv++;
-	}
-      if (argc)
-	{
-	  test_bytes = atoi (argv[0]);
-	  argc--;
-	  argv++;
-	}
-    }
-  else
-    {
-      portno = 1234;		// atoi(argv[2]);
-      server = gethostbyname ("6.0.1.1" /* argv[1] */ );
-      if (server == NULL)
-	{
-	  clib_unix_warning ("gethostbyname");
-	  exit (1);
-	}
-    }
-
-  to_send = bytes;
-  sockfd = socket (AF_INET, SOCK_STREAM, 0);
-  if (sockfd < 0)
-    {
-      clib_unix_error ("socket");
-      exit (1);
-    }
-
-  bzero ((char *) &serv_addr, sizeof (serv_addr));
-  serv_addr.sin_family = AF_INET;
-  bcopy ((char *) server->h_addr,
-	 (char *) &serv_addr.sin_addr.s_addr, server->h_length);
-  serv_addr.sin_port = htons (portno);
-  if (connect (sockfd, (const void *) &serv_addr, sizeof (serv_addr)) < 0)
-    {
-      clib_unix_warning ("connect");
-      exit (1);
-    }
-
-  vec_validate (rx_buffer, 128 << 10);
-  vec_validate (tx_buffer, 128 << 10);
-
-  for (i = 0; i < vec_len (tx_buffer); i++)
-    tx_buffer[i] = (i + 1) % 0xff;
-
-  /*
-   * Send one packet to warm up the RX pipeline
-   */
-  n = send (sockfd, tx_buffer, vec_len (tx_buffer), 0 /* flags */ );
-  if (n != vec_len (tx_buffer))
-    {
-      clib_unix_warning ("write");
-      exit (0);
-    }
-
-  gettimeofday (&start, NULL);
-  while (bytes > 0)
-    {
-      /*
-       * TX
-       */
-      n = send (sockfd, tx_buffer, vec_len (tx_buffer), 0 /* flags */ );
-      if (n != vec_len (tx_buffer))
-	{
-	  clib_unix_warning ("write");
-	  exit (0);
-	}
-      bytes -= n;
-
-      if (no_echo)
-	continue;
-
-      /*
-       * RX
-       */
-
-      offset = 0;
-      do
-	{
-	  n = recv (sockfd, rx_buffer + offset,
-		    vec_len (rx_buffer) - offset, 0 /* flags */ );
-	  if (n < 0)
-	    {
-	      clib_unix_warning ("read");
-	      exit (0);
-	    }
-	  offset += n;
-	}
-      while (offset < vec_len (rx_buffer));
-
-      if (test_bytes)
-	{
-	  for (i = 0; i < vec_len (rx_buffer); i++)
-	    {
-	      if (rx_buffer[i] != tx_buffer[i])
-		{
-		  clib_warning ("[%d] read 0x%x not 0x%x", rx_buffer[i],
-				tx_buffer[i]);
-		  exit (1);
-		}
-	    }
-	}
-    }
-  close (sockfd);
-  gettimeofday (&end, NULL);
-
-  deltat = (end.tv_sec - start.tv_sec);
-  deltat += (end.tv_usec - start.tv_usec) / 1000000.0;	// us to ms
-  clib_warning ("Finished in %.6f", deltat);
-  clib_warning ("%.4f Gbit/second %s", (((f64) to_send * 8.0) / deltat / 1e9),
-		no_echo ? "half" : "full");
-  return 0;
-}
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/src/uri/uri_tcp_test.c b/src/uri/uri_tcp_test.c
deleted file mode 100755
index 8bdcac3a88c..00000000000
--- a/src/uri/uri_tcp_test.c
+++ /dev/null
@@ -1,1280 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <stdio.h>
-#include <signal.h>
-#include <svm/svm_fifo_segment.h>
-#include <vlibmemory/api.h>
-#include <vpp/api/vpe_msg_enum.h>
-#include <vnet/session/application_interface.h>
-
-#define vl_typedefs		/* define message structures */
-#include <vpp/api/vpe_all_api_h.h>
-#undef vl_typedefs
-
-/* declare message handlers for each api */
-
-#define vl_endianfun		/* define message structures */
-#include <vpp/api/vpe_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...)
-#define vl_printfun
-#include <vpp/api/vpe_all_api_h.h>
-#undef vl_printfun
-
-typedef struct
-{
-  svm_fifo_t *server_rx_fifo;
-  svm_fifo_t *server_tx_fifo;
-
-  u64 vpp_session_handle;
-  u64 bytes_received;
-  f64 start;
-} session_t;
-
-typedef enum
-{
-  STATE_START,
-  STATE_ATTACHED,
-  STATE_READY,
-  STATE_DISCONNECTING,
-  STATE_FAILED
-} connection_state_t;
-
-typedef struct
-{
-  /* vpe input queue */
-  unix_shared_memory_queue_t *vl_input_queue;
-
-  /* API client handle */
-  u32 my_client_index;
-
-  /* The URI we're playing with */
-  u8 *uri;
-
-  /* Session pool */
-  session_t *sessions;
-
-  /* Hash table for disconnect processing */
-  uword *session_index_by_vpp_handles;
-
-  /* intermediate rx buffer */
-  u8 *rx_buf;
-
-  /* URI for slave's connect */
-  u8 *connect_uri;
-
-  u32 connected_session_index;
-
-  int i_am_master;
-
-  /* drop all packets */
-  int drop_packets;
-
-  /* Our event queue */
-  unix_shared_memory_queue_t *our_event_queue;
-
-  /* $$$ single thread only for the moment */
-  unix_shared_memory_queue_t *vpp_event_queue;
-
-  pid_t my_pid;
-
-  /* For deadman timers */
-  clib_time_t clib_time;
-
-  /* State of the connection, shared between msg RX thread and main thread */
-  volatile connection_state_t state;
-
-  /* Signal variables */
-  volatile int time_to_stop;
-  volatile int time_to_print_stats;
-
-  u32 configured_segment_size;
-
-  /* VNET_API_ERROR_FOO -> "Foo" hash table */
-  uword *error_string_by_error_number;
-
-  u8 *connect_test_data;
-  pthread_t client_rx_thread_handle;
-  u32 client_bytes_received;
-  u8 test_return_packets;
-  u64 bytes_to_send;
-
-  /* convenience */
-  svm_fifo_segment_main_t *segment_main;
-} uri_tcp_test_main_t;
-
-uri_tcp_test_main_t uri_tcp_test_main;
-
-#if CLIB_DEBUG > 0
-#define NITER 10000
-#else
-#define NITER 4000000
-#endif
-
-static u8 *
-format_api_error (u8 * s, va_list * args)
-{
-  uri_tcp_test_main_t *utm = &uri_tcp_test_main;
-  i32 error = va_arg (*args, u32);
-  uword *p;
-
-  p = hash_get (utm->error_string_by_error_number, -error);
-
-  if (p)
-    s = format (s, "%s", p[0]);
-  else
-    s = format (s, "%d", error);
-  return s;
-}
-
-static void
-init_error_string_table (uri_tcp_test_main_t * utm)
-{
-  utm->error_string_by_error_number = hash_create (0, sizeof (uword));
-
-#define _(n,v,s) hash_set (utm->error_string_by_error_number, -v, s);
-  foreach_vnet_api_error;
-#undef _
-
-  hash_set (utm->error_string_by_error_number, 99, "Misc");
-}
-
-int
-wait_for_state_change (uri_tcp_test_main_t * utm, connection_state_t state)
-{
-#if CLIB_DEBUG > 0
-#define TIMEOUT 600.0
-#else
-#define TIMEOUT 600.0
-#endif
-
-  f64 timeout = clib_time_now (&utm->clib_time) + TIMEOUT;
-
-  while (clib_time_now (&utm->clib_time) < timeout)
-    {
-      if (utm->state == state)
-	return 0;
-      if (utm->state == STATE_FAILED)
-	return -1;
-      if (utm->time_to_stop == 1)
-	return 0;
-    }
-  clib_warning ("timeout waiting for STATE_READY");
-  return -1;
-}
-
-void
-application_send_attach (uri_tcp_test_main_t * utm)
-{
-  vl_api_application_attach_t *bmp;
-  u32 fifo_size = 4 << 20;
-  bmp = vl_msg_api_alloc (sizeof (*bmp));
-  memset (bmp, 0, sizeof (*bmp));
-
-  bmp->_vl_msg_id = ntohs (VL_API_APPLICATION_ATTACH);
-  bmp->client_index = utm->my_client_index;
-  bmp->context = ntohl (0xfeedface);
-  bmp->options[APP_OPTIONS_FLAGS] =
-    APP_OPTIONS_FLAGS_ACCEPT_REDIRECT | APP_OPTIONS_FLAGS_ADD_SEGMENT;
-  bmp->options[APP_OPTIONS_PREALLOC_FIFO_PAIRS] = 16;
-  bmp->options[APP_OPTIONS_RX_FIFO_SIZE] = fifo_size;
-  bmp->options[APP_OPTIONS_TX_FIFO_SIZE] = fifo_size;
-  bmp->options[APP_OPTIONS_ADD_SEGMENT_SIZE] = 128 << 20;
-  bmp->options[APP_OPTIONS_SEGMENT_SIZE] = 256 << 20;
-  vl_msg_api_send_shmem (utm->vl_input_queue, (u8 *) & bmp);
-}
-
-int
-application_attach (uri_tcp_test_main_t * utm)
-{
-  application_send_attach (utm);
-  if (wait_for_state_change (utm, STATE_ATTACHED))
-    {
-      clib_warning ("timeout waiting for STATE_ATTACHED");
-      return -1;
-    }
-  return 0;
-}
-
-void
-application_detach (uri_tcp_test_main_t * utm)
-{
-  vl_api_application_detach_t *bmp;
-  bmp = vl_msg_api_alloc (sizeof (*bmp));
-  memset (bmp, 0, sizeof (*bmp));
-
-  bmp->_vl_msg_id = ntohs (VL_API_APPLICATION_DETACH);
-  bmp->client_index = utm->my_client_index;
-  bmp->context = ntohl (0xfeedface);
-  vl_msg_api_send_shmem (utm->vl_input_queue, (u8 *) & bmp);
-}
-
-static void
-vl_api_application_attach_reply_t_handler (vl_api_application_attach_reply_t *
-					   mp)
-{
-  uri_tcp_test_main_t *utm = &uri_tcp_test_main;
-  svm_fifo_segment_create_args_t _a, *a = &_a;
-  int rv;
-
-  if (mp->retval)
-    {
-      clib_warning ("attach failed: %U", format_api_error,
-		    clib_net_to_host_u32 (mp->retval));
-      utm->state = STATE_FAILED;
-      return;
-    }
-
-  if (mp->segment_name_length == 0)
-    {
-      clib_warning ("segment_name_length zero");
-      return;
-    }
-
-  memset (a, 0, sizeof (*a));
-  a->segment_name = (char *) mp->segment_name;
-  a->segment_size = mp->segment_size;
-
-  ASSERT (mp->app_event_queue_address);
-
-  /* Attach to the segment vpp created */
-  rv = svm_fifo_segment_attach (a);
-  if (rv)
-    {
-      clib_warning ("svm_fifo_segment_attach ('%s') failed",
-		    mp->segment_name);
-      return;
-    }
-
-  utm->our_event_queue =
-    uword_to_pointer (mp->app_event_queue_address,
-		      unix_shared_memory_queue_t *);
-  utm->state = STATE_ATTACHED;
-}
-
-static void
-vl_api_application_detach_reply_t_handler (vl_api_application_detach_reply_t *
-					   mp)
-{
-  if (mp->retval)
-    clib_warning ("detach returned with err: %d", mp->retval);
-}
-
-static void
-stop_signal (int signum)
-{
-  uri_tcp_test_main_t *um = &uri_tcp_test_main;
-
-  um->time_to_stop = 1;
-}
-
-static void
-stats_signal (int signum)
-{
-  uri_tcp_test_main_t *um = &uri_tcp_test_main;
-
-  um->time_to_print_stats = 1;
-}
-
-static clib_error_t *
-setup_signal_handlers (void)
-{
-  signal (SIGINT, stats_signal);
-  signal (SIGQUIT, stop_signal);
-  signal (SIGTERM, stop_signal);
-
-  return 0;
-}
-
-void
-vlib_cli_output (struct vlib_main_t *vm, char *fmt, ...)
-{
-  clib_warning ("BUG");
-}
-
-int
-connect_to_vpp (char *name)
-{
-  uri_tcp_test_main_t *utm = &uri_tcp_test_main;
-  api_main_t *am = &api_main;
-
-  if (vl_client_connect_to_vlib ("/vpe-api", name, 32) < 0)
-    return -1;
-
-  utm->vl_input_queue = am->shmem_hdr->vl_input_queue;
-  utm->my_client_index = am->my_client_index;
-
-  return 0;
-}
-
-static void
-vl_api_map_another_segment_t_handler (vl_api_map_another_segment_t * mp)
-{
-  svm_fifo_segment_create_args_t _a, *a = &_a;
-  int rv;
-
-  memset (a, 0, sizeof (*a));
-  a->segment_name = (char *) mp->segment_name;
-  a->segment_size = mp->segment_size;
-  /* Attach to the segment vpp created */
-  rv = svm_fifo_segment_attach (a);
-  if (rv)
-    {
-      clib_warning ("svm_fifo_segment_attach ('%s') failed",
-		    mp->segment_name);
-      return;
-    }
-  clib_warning ("Mapped new segment '%s' size %d", mp->segment_name,
-		mp->segment_size);
-}
-
-static void
-session_print_stats (uri_tcp_test_main_t * utm, session_t * session)
-{
-  f64 deltat;
-  u64 bytes;
-
-  deltat = clib_time_now (&utm->clib_time) - session->start;
-  bytes = utm->i_am_master ? session->bytes_received : utm->bytes_to_send;
-  fformat (stdout, "Finished in %.6f\n", deltat);
-  fformat (stdout, "%.4f Gbit/second\n", (bytes * 8.0) / deltat / 1e9);
-}
-
-static void
-vl_api_disconnect_session_t_handler (vl_api_disconnect_session_t * mp)
-{
-  uri_tcp_test_main_t *utm = &uri_tcp_test_main;
-  session_t *session = 0;
-  vl_api_disconnect_session_reply_t *rmp;
-  uword *p;
-  int rv = 0;
-
-  p = hash_get (utm->session_index_by_vpp_handles, mp->handle);
-
-  if (p)
-    {
-      session = pool_elt_at_index (utm->sessions, p[0]);
-      hash_unset (utm->session_index_by_vpp_handles, mp->handle);
-      pool_put (utm->sessions, session);
-    }
-  else
-    {
-      clib_warning ("couldn't find session key %llx", mp->handle);
-      rv = -11;
-    }
-
-//  utm->time_to_stop = 1;
-
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
-
-  rmp->_vl_msg_id = ntohs (VL_API_DISCONNECT_SESSION_REPLY);
-  rmp->retval = rv;
-  rmp->handle = mp->handle;
-  vl_msg_api_send_shmem (utm->vl_input_queue, (u8 *) & rmp);
-
-  if (session)
-    session_print_stats (utm, session);
-}
-
-static void
-vl_api_reset_session_t_handler (vl_api_reset_session_t * mp)
-{
-  uri_tcp_test_main_t *utm = &uri_tcp_test_main;
-  vl_api_reset_session_reply_t *rmp;
-  uword *p;
-  int rv = 0;
-
-  p = hash_get (utm->session_index_by_vpp_handles, mp->handle);
-
-  if (p)
-    {
-      clib_warning ("got reset");
-      /* Cleanup later */
-      utm->time_to_stop = 1;
-    }
-  else
-    {
-      clib_warning ("couldn't find session key %llx", mp->handle);
-      rv = -11;
-    }
-
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_RESET_SESSION_REPLY);
-  rmp->retval = rv;
-  rmp->handle = mp->handle;
-  vl_msg_api_send_shmem (utm->vl_input_queue, (u8 *) & rmp);
-}
-
-void
-client_handle_fifo_event_rx (uri_tcp_test_main_t * utm,
-			     session_fifo_event_t * e)
-{
-  svm_fifo_t *rx_fifo;
-  int n_read, bytes, i;
-
-  rx_fifo = e->fifo;
-
-  bytes = svm_fifo_max_dequeue (rx_fifo);
-  /* Allow enqueuing of new event */
-  svm_fifo_unset_event (rx_fifo);
-
-  /* Read the bytes */
-  do
-    {
-      n_read = svm_fifo_dequeue_nowait (rx_fifo,
-					clib_min (vec_len (utm->rx_buf),
-						  bytes), utm->rx_buf);
-      if (n_read > 0)
-	{
-	  bytes -= n_read;
-	  if (utm->test_return_packets)
-	    {
-	      for (i = 0; i < n_read; i++)
-		{
-		  if (utm->rx_buf[i]
-		      != ((utm->client_bytes_received + i) & 0xff))
-		    {
-		      clib_warning ("error at byte %lld, 0x%x not 0x%x",
-				    utm->client_bytes_received + i,
-				    utm->rx_buf[i],
-				    ((utm->client_bytes_received +
-				      i) & 0xff));
-		    }
-		}
-	    }
-	  utm->client_bytes_received += n_read;
-	}
-      else
-	{
-	  if (n_read == -2)
-	    {
-//            clib_warning ("weird!");
-	      break;
-	    }
-	}
-
-    }
-  while (bytes > 0);
-}
-
-void
-client_handle_event_queue (uri_tcp_test_main_t * utm)
-{
-  session_fifo_event_t _e, *e = &_e;;
-
-  unix_shared_memory_queue_sub (utm->our_event_queue, (u8 *) e,
-				0 /* nowait */ );
-  switch (e->event_type)
-    {
-    case FIFO_EVENT_APP_RX:
-      client_handle_fifo_event_rx (utm, e);
-      break;
-
-    case FIFO_EVENT_DISCONNECT:
-      return;
-
-    default:
-      clib_warning ("unknown event type %d", e->event_type);
-      break;
-    }
-}
-
-static void *
-client_rx_thread_fn (void *arg)
-{
-  session_fifo_event_t _e, *e = &_e;
-  uri_tcp_test_main_t *utm = &uri_tcp_test_main;
-
-  utm->client_bytes_received = 0;
-  while (1)
-    {
-      unix_shared_memory_queue_sub (utm->our_event_queue, (u8 *) e,
-				    0 /* nowait */ );
-      switch (e->event_type)
-	{
-	case FIFO_EVENT_APP_RX:
-	  client_handle_fifo_event_rx (utm, e);
-	  break;
-
-	case FIFO_EVENT_DISCONNECT:
-	  return 0;
-	default:
-	  clib_warning ("unknown event type %d", e->event_type);
-	  break;
-	}
-
-      if (PREDICT_FALSE (utm->time_to_stop == 1))
-	break;
-    }
-  pthread_exit (0);
-}
-
-
-static void
-vl_api_connect_session_reply_t_handler (vl_api_connect_session_reply_t * mp)
-{
-  uri_tcp_test_main_t *utm = &uri_tcp_test_main;
-  session_t *session;
-  u32 session_index;
-  svm_fifo_t *rx_fifo, *tx_fifo;
-  int rv;
-
-  if (mp->retval)
-    {
-      clib_warning ("connection failed with code: %U", format_api_error,
-		    clib_net_to_host_u32 (mp->retval));
-      utm->state = STATE_FAILED;
-      return;
-    }
-  else
-    {
-      clib_warning ("connected with local ip %U port %d", format_ip46_address,
-		    mp->lcl_ip, mp->is_ip4,
-		    clib_net_to_host_u16 (mp->lcl_port));
-    }
-
-  utm->vpp_event_queue =
-    uword_to_pointer (mp->vpp_event_queue_address,
-		      unix_shared_memory_queue_t *);
-
-  /*
-   * Setup session
-   */
-
-  pool_get (utm->sessions, session);
-  session_index = session - utm->sessions;
-
-  rx_fifo = uword_to_pointer (mp->server_rx_fifo, svm_fifo_t *);
-  rx_fifo->client_session_index = session_index;
-  tx_fifo = uword_to_pointer (mp->server_tx_fifo, svm_fifo_t *);
-  tx_fifo->client_session_index = session_index;
-
-  session->server_rx_fifo = rx_fifo;
-  session->server_tx_fifo = tx_fifo;
-  session->vpp_session_handle = mp->handle;
-  session->start = clib_time_now (&utm->clib_time);
-
-  /* Save handle */
-  utm->connected_session_index = session_index;
-  utm->state = STATE_READY;
-
-  /* Add it to lookup table */
-  hash_set (utm->session_index_by_vpp_handles, mp->handle, session_index);
-
-  /* Start RX thread */
-  rv = pthread_create (&utm->client_rx_thread_handle,
-		       NULL /*attr */ , client_rx_thread_fn, 0);
-  if (rv)
-    {
-      clib_warning ("pthread_create returned %d", rv);
-      rv = VNET_API_ERROR_SYSCALL_ERROR_1;
-    }
-}
-
-static void
-send_test_chunk (uri_tcp_test_main_t * utm, svm_fifo_t * tx_fifo, int mypid,
-		 u32 bytes)
-{
-  u8 *test_data = utm->connect_test_data;
-  u64 bytes_sent = 0;
-  int test_buf_offset = 0;
-  u32 bytes_to_snd;
-  u32 queue_max_chunk = 128 << 10, actual_write;
-  session_fifo_event_t evt;
-  int rv;
-
-  bytes_to_snd = (bytes == 0) ? vec_len (test_data) : bytes;
-  if (bytes_to_snd > vec_len (test_data))
-    bytes_to_snd = vec_len (test_data);
-
-  while (bytes_to_snd > 0 && !utm->time_to_stop)
-    {
-      actual_write = (bytes_to_snd > queue_max_chunk) ?
-	queue_max_chunk : bytes_to_snd;
-      rv = svm_fifo_enqueue_nowait (tx_fifo, actual_write,
-				    test_data + test_buf_offset);
-
-      if (rv > 0)
-	{
-	  bytes_to_snd -= rv;
-	  test_buf_offset += rv;
-	  bytes_sent += rv;
-
-	  if (svm_fifo_set_event (tx_fifo))
-	    {
-	      /* Fabricate TX event, send to vpp */
-	      evt.fifo = tx_fifo;
-	      evt.event_type = FIFO_EVENT_APP_TX;
-
-	      unix_shared_memory_queue_add (utm->vpp_event_queue,
-					    (u8 *) & evt,
-					    0 /* do wait for mutex */ );
-	    }
-	}
-    }
-}
-
-void
-client_send_data (uri_tcp_test_main_t * utm)
-{
-  u8 *test_data = utm->connect_test_data;
-  int mypid = getpid ();
-  session_t *session;
-  svm_fifo_t *tx_fifo;
-  u32 n_iterations, leftover;
-  int i;
-
-  session = pool_elt_at_index (utm->sessions, utm->connected_session_index);
-  tx_fifo = session->server_tx_fifo;
-
-  ASSERT (vec_len (test_data) > 0);
-
-  vec_validate (utm->rx_buf, vec_len (test_data) - 1);
-  n_iterations = utm->bytes_to_send / vec_len (test_data);
-
-  for (i = 0; i < n_iterations; i++)
-    {
-      send_test_chunk (utm, tx_fifo, mypid, 0);
-      if (utm->time_to_stop)
-	break;
-    }
-
-  leftover = utm->bytes_to_send % vec_len (test_data);
-  if (leftover)
-    send_test_chunk (utm, tx_fifo, mypid, leftover);
-
-  if (!utm->drop_packets)
-    {
-      f64 timeout = clib_time_now (&utm->clib_time) + 10;
-
-      /* Wait for the outstanding packets */
-      while (utm->client_bytes_received <
-	     vec_len (test_data) * n_iterations + leftover)
-	{
-	  if (clib_time_now (&utm->clib_time) > timeout)
-	    {
-	      clib_warning ("timed out waiting for the missing packets");
-	      break;
-	    }
-	}
-    }
-  utm->time_to_stop = 1;
-}
-
-void
-client_send_connect (uri_tcp_test_main_t * utm)
-{
-  vl_api_connect_uri_t *cmp;
-  cmp = vl_msg_api_alloc (sizeof (*cmp));
-  memset (cmp, 0, sizeof (*cmp));
-
-  cmp->_vl_msg_id = ntohs (VL_API_CONNECT_URI);
-  cmp->client_index = utm->my_client_index;
-  cmp->context = ntohl (0xfeedface);
-  memcpy (cmp->uri, utm->connect_uri, vec_len (utm->connect_uri));
-  vl_msg_api_send_shmem (utm->vl_input_queue, (u8 *) & cmp);
-}
-
-int
-client_connect (uri_tcp_test_main_t * utm)
-{
-  client_send_connect (utm);
-  if (wait_for_state_change (utm, STATE_READY))
-    {
-      clib_warning ("Connect failed");
-      return -1;
-    }
-  return 0;
-}
-
-void
-client_send_disconnect (uri_tcp_test_main_t * utm)
-{
-  session_t *connected_session;
-  vl_api_disconnect_session_t *dmp;
-  connected_session = pool_elt_at_index (utm->sessions,
-					 utm->connected_session_index);
-  dmp = vl_msg_api_alloc (sizeof (*dmp));
-  memset (dmp, 0, sizeof (*dmp));
-  dmp->_vl_msg_id = ntohs (VL_API_DISCONNECT_SESSION);
-  dmp->client_index = utm->my_client_index;
-  dmp->handle = connected_session->vpp_session_handle;
-  vl_msg_api_send_shmem (utm->vl_input_queue, (u8 *) & dmp);
-}
-
-int
-client_disconnect (uri_tcp_test_main_t * utm)
-{
-  client_send_disconnect (utm);
-  clib_warning ("Sent disconnect");
-  if (wait_for_state_change (utm, STATE_START))
-    {
-      clib_warning ("Disconnect failed");
-      return -1;
-    }
-  return 0;
-}
-
-static void
-client_test (uri_tcp_test_main_t * utm)
-{
-  int i;
-
-  if (application_attach (utm))
-    return;
-
-  if (client_connect (utm))
-    {
-      application_detach (utm);
-      return;
-    }
-
-  /* Init test data */
-  vec_validate (utm->connect_test_data, 128 * 1024 - 1);
-  for (i = 0; i < vec_len (utm->connect_test_data); i++)
-    utm->connect_test_data[i] = i & 0xff;
-
-  /* Start send */
-  client_send_data (utm);
-
-  /* Disconnect */
-  client_disconnect (utm);
-
-  application_detach (utm);
-}
-
-static void
-vl_api_bind_uri_reply_t_handler (vl_api_bind_uri_reply_t * mp)
-{
-  uri_tcp_test_main_t *utm = &uri_tcp_test_main;
-
-  if (mp->retval)
-    {
-      clib_warning ("bind failed: %U", format_api_error,
-		    clib_net_to_host_u32 (mp->retval));
-      utm->state = STATE_FAILED;
-      return;
-    }
-
-  utm->state = STATE_READY;
-}
-
-static void
-vl_api_unbind_uri_reply_t_handler (vl_api_unbind_uri_reply_t * mp)
-{
-  uri_tcp_test_main_t *utm = &uri_tcp_test_main;
-
-  if (mp->retval != 0)
-    clib_warning ("returned %d", ntohl (mp->retval));
-
-  utm->state = STATE_START;
-}
-
-u8 *
-format_ip4_address (u8 * s, va_list * args)
-{
-  u8 *a = va_arg (*args, u8 *);
-  return format (s, "%d.%d.%d.%d", a[0], a[1], a[2], a[3]);
-}
-
-u8 *
-format_ip6_address (u8 * s, va_list * args)
-{
-  ip6_address_t *a = va_arg (*args, ip6_address_t *);
-  u32 i, i_max_n_zero, max_n_zeros, i_first_zero, n_zeros, last_double_colon;
-
-  i_max_n_zero = ARRAY_LEN (a->as_u16);
-  max_n_zeros = 0;
-  i_first_zero = i_max_n_zero;
-  n_zeros = 0;
-  for (i = 0; i < ARRAY_LEN (a->as_u16); i++)
-    {
-      u32 is_zero = a->as_u16[i] == 0;
-      if (is_zero && i_first_zero >= ARRAY_LEN (a->as_u16))
-	{
-	  i_first_zero = i;
-	  n_zeros = 0;
-	}
-      n_zeros += is_zero;
-      if ((!is_zero && n_zeros > max_n_zeros)
-	  || (i + 1 >= ARRAY_LEN (a->as_u16) && n_zeros > max_n_zeros))
-	{
-	  i_max_n_zero = i_first_zero;
-	  max_n_zeros = n_zeros;
-	  i_first_zero = ARRAY_LEN (a->as_u16);
-	  n_zeros = 0;
-	}
-    }
-
-  last_double_colon = 0;
-  for (i = 0; i < ARRAY_LEN (a->as_u16); i++)
-    {
-      if (i == i_max_n_zero && max_n_zeros > 1)
-	{
-	  s = format (s, "::");
-	  i += max_n_zeros - 1;
-	  last_double_colon = 1;
-	}
-      else
-	{
-	  s = format (s, "%s%x",
-		      (last_double_colon || i == 0) ? "" : ":",
-		      clib_net_to_host_u16 (a->as_u16[i]));
-	  last_double_colon = 0;
-	}
-    }
-
-  return s;
-}
-
-/* Format an IP46 address. */
-u8 *
-format_ip46_address (u8 * s, va_list * args)
-{
-  ip46_address_t *ip46 = va_arg (*args, ip46_address_t *);
-  ip46_type_t type = va_arg (*args, ip46_type_t);
-  int is_ip4 = 1;
-
-  switch (type)
-    {
-    case IP46_TYPE_ANY:
-      is_ip4 = ip46_address_is_ip4 (ip46);
-      break;
-    case IP46_TYPE_IP4:
-      is_ip4 = 1;
-      break;
-    case IP46_TYPE_IP6:
-      is_ip4 = 0;
-      break;
-    }
-
-  return is_ip4 ?
-    format (s, "%U", format_ip4_address, &ip46->ip4) :
-    format (s, "%U", format_ip6_address, &ip46->ip6);
-}
-
-static void
-vl_api_accept_session_t_handler (vl_api_accept_session_t * mp)
-{
-  uri_tcp_test_main_t *utm = &uri_tcp_test_main;
-  vl_api_accept_session_reply_t *rmp;
-  svm_fifo_t *rx_fifo, *tx_fifo;
-  session_t *session;
-  static f64 start_time;
-  u32 session_index;
-  u8 *ip_str;
-
-  if (start_time == 0.0)
-    start_time = clib_time_now (&utm->clib_time);
-
-  ip_str = format (0, "%U", format_ip46_address, &mp->ip, mp->is_ip4);
-  clib_warning ("Accepted session from: %s:%d", ip_str,
-		clib_net_to_host_u16 (mp->port));
-  utm->vpp_event_queue =
-    uword_to_pointer (mp->vpp_event_queue_address,
-		      unix_shared_memory_queue_t *);
-
-  /* Allocate local session and set it up */
-  pool_get (utm->sessions, session);
-  session_index = session - utm->sessions;
-
-  rx_fifo = uword_to_pointer (mp->server_rx_fifo, svm_fifo_t *);
-  rx_fifo->client_session_index = session_index;
-  tx_fifo = uword_to_pointer (mp->server_tx_fifo, svm_fifo_t *);
-  tx_fifo->client_session_index = session_index;
-
-  session->server_rx_fifo = rx_fifo;
-  session->server_tx_fifo = tx_fifo;
-
-  /* Add it to lookup table */
-  hash_set (utm->session_index_by_vpp_handles, mp->handle, session_index);
-
-  utm->state = STATE_READY;
-
-  /* Stats printing */
-  if (pool_elts (utm->sessions) && (pool_elts (utm->sessions) % 20000) == 0)
-    {
-      f64 now = clib_time_now (&utm->clib_time);
-      fformat (stdout, "%d active sessions in %.2f seconds, %.2f/sec...\n",
-	       pool_elts (utm->sessions), now - start_time,
-	       (f64) pool_elts (utm->sessions) / (now - start_time));
-    }
-
-  /*
-   * Send accept reply to vpp
-   */
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_ACCEPT_SESSION_REPLY);
-  rmp->handle = mp->handle;
-  rmp->context = mp->context;
-  vl_msg_api_send_shmem (utm->vl_input_queue, (u8 *) & rmp);
-
-  session->bytes_received = 0;
-  session->start = clib_time_now (&utm->clib_time);
-}
-
-void
-server_handle_fifo_event_rx (uri_tcp_test_main_t * utm,
-			     session_fifo_event_t * e)
-{
-  svm_fifo_t *rx_fifo, *tx_fifo;
-  int n_read;
-  session_fifo_event_t evt;
-  unix_shared_memory_queue_t *q;
-  session_t *session;
-  int rv;
-  u32 max_dequeue, offset, max_transfer, rx_buf_len;
-
-  rx_buf_len = vec_len (utm->rx_buf);
-  rx_fifo = e->fifo;
-  session = &utm->sessions[rx_fifo->client_session_index];
-  tx_fifo = session->server_tx_fifo;
-
-  max_dequeue = svm_fifo_max_dequeue (rx_fifo);
-  /* Allow enqueuing of a new event */
-  svm_fifo_unset_event (rx_fifo);
-
-  if (PREDICT_FALSE (max_dequeue == 0))
-    {
-      return;
-    }
-
-  /* Read the max_dequeue */
-  do
-    {
-      max_transfer = clib_min (rx_buf_len, max_dequeue);
-      n_read = svm_fifo_dequeue_nowait (rx_fifo, max_transfer, utm->rx_buf);
-      if (n_read > 0)
-	{
-	  max_dequeue -= n_read;
-	  session->bytes_received += n_read;
-	}
-
-      /* Reflect if a non-drop session */
-      if (!utm->drop_packets && n_read > 0)
-	{
-	  offset = 0;
-	  do
-	    {
-	      rv = svm_fifo_enqueue_nowait (tx_fifo, n_read,
-					    &utm->rx_buf[offset]);
-	      if (rv > 0)
-		{
-		  n_read -= rv;
-		  offset += rv;
-		}
-	    }
-	  while ((rv <= 0 || n_read > 0) && !utm->time_to_stop);
-
-	  /* If event wasn't set, add one */
-	  if (svm_fifo_set_event (tx_fifo))
-	    {
-	      /* Fabricate TX event, send to vpp */
-	      evt.fifo = tx_fifo;
-	      evt.event_type = FIFO_EVENT_APP_TX;
-
-	      q = utm->vpp_event_queue;
-	      unix_shared_memory_queue_add (q, (u8 *) & evt,
-					    1 /* do wait for mutex */ );
-	    }
-	}
-    }
-  while ((n_read < 0 || max_dequeue > 0) && !utm->time_to_stop);
-}
-
-void
-server_handle_event_queue (uri_tcp_test_main_t * utm)
-{
-  session_fifo_event_t _e, *e = &_e;
-
-  while (1)
-    {
-      unix_shared_memory_queue_sub (utm->our_event_queue, (u8 *) e,
-				    0 /* nowait */ );
-      switch (e->event_type)
-	{
-	case FIFO_EVENT_APP_RX:
-	  server_handle_fifo_event_rx (utm, e);
-	  break;
-
-	case FIFO_EVENT_DISCONNECT:
-	  return;
-
-	default:
-	  clib_warning ("unknown event type %d", e->event_type);
-	  break;
-	}
-      if (PREDICT_FALSE (utm->time_to_stop == 1))
-	break;
-      if (PREDICT_FALSE (utm->time_to_print_stats == 1))
-	{
-	  utm->time_to_print_stats = 0;
-	  fformat (stdout, "%d connections\n", pool_elts (utm->sessions));
-	}
-    }
-}
-
-void
-server_send_listen (uri_tcp_test_main_t * utm)
-{
-  vl_api_bind_uri_t *bmp;
-  bmp = vl_msg_api_alloc (sizeof (*bmp));
-  memset (bmp, 0, sizeof (*bmp));
-
-  bmp->_vl_msg_id = ntohs (VL_API_BIND_URI);
-  bmp->client_index = utm->my_client_index;
-  bmp->context = ntohl (0xfeedface);
-  memcpy (bmp->uri, utm->uri, vec_len (utm->uri));
-  vl_msg_api_send_shmem (utm->vl_input_queue, (u8 *) & bmp);
-}
-
-int
-server_listen (uri_tcp_test_main_t * utm)
-{
-  server_send_listen (utm);
-  if (wait_for_state_change (utm, STATE_READY))
-    {
-      clib_warning ("timeout waiting for STATE_READY");
-      return -1;
-    }
-  return 0;
-}
-
-void
-server_send_unbind (uri_tcp_test_main_t * utm)
-{
-  vl_api_unbind_uri_t *ump;
-
-  ump = vl_msg_api_alloc (sizeof (*ump));
-  memset (ump, 0, sizeof (*ump));
-
-  ump->_vl_msg_id = ntohs (VL_API_UNBIND_URI);
-  ump->client_index = utm->my_client_index;
-  memcpy (ump->uri, utm->uri, vec_len (utm->uri));
-  vl_msg_api_send_shmem (utm->vl_input_queue, (u8 *) & ump);
-}
-
-int
-server_unbind (uri_tcp_test_main_t * utm)
-{
-  server_send_unbind (utm);
-  if (wait_for_state_change (utm, STATE_START))
-    {
-      clib_warning ("timeout waiting for STATE_START");
-      return -1;
-    }
-  return 0;
-}
-
-void
-server_test (uri_tcp_test_main_t * utm)
-{
-  if (application_attach (utm))
-    return;
-
-  /* Bind to uri */
-  if (server_listen (utm))
-    return;
-
-  /* Enter handle event loop */
-  server_handle_event_queue (utm);
-
-  /* Cleanup */
-  server_send_unbind (utm);
-
-  application_detach (utm);
-
-  fformat (stdout, "Test complete...\n");
-}
-
-static void
-vl_api_disconnect_session_reply_t_handler (vl_api_disconnect_session_reply_t *
-					   mp)
-{
-  uri_tcp_test_main_t *utm = &uri_tcp_test_main;
-  session_t *session;
-
-  if (mp->retval)
-    {
-      clib_warning ("vpp complained about disconnect: %d",
-		    ntohl (mp->retval));
-    }
-
-  utm->state = STATE_START;
-  session = pool_elt_at_index (utm->sessions, utm->connected_session_index);
-  if (session)
-    session_print_stats (utm, session);
-}
-
-#define foreach_uri_msg                                 \
-_(BIND_URI_REPLY, bind_uri_reply)                       \
-_(UNBIND_URI_REPLY, unbind_uri_reply)                   \
-_(ACCEPT_SESSION, accept_session)                       \
-_(CONNECT_SESSION_REPLY, connect_session_reply)         \
-_(DISCONNECT_SESSION, disconnect_session)               \
-_(DISCONNECT_SESSION_REPLY, disconnect_session_reply)   \
-_(RESET_SESSION, reset_session)                         \
-_(APPLICATION_ATTACH_REPLY, application_attach_reply)   \
-_(APPLICATION_DETACH_REPLY, application_detach_reply)	\
-_(MAP_ANOTHER_SEGMENT, map_another_segment)		\
-
-void
-uri_api_hookup (uri_tcp_test_main_t * utm)
-{
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
-                           vl_api_##n##_t_handler,              \
-                           vl_noop_handler,                     \
-                           vl_api_##n##_t_endian,               \
-                           vl_api_##n##_t_print,                \
-                           sizeof(vl_api_##n##_t), 1);
-  foreach_uri_msg;
-#undef _
-}
-
-int
-main (int argc, char **argv)
-{
-  uri_tcp_test_main_t *utm = &uri_tcp_test_main;
-  unformat_input_t _argv, *a = &_argv;
-  u8 *chroot_prefix;
-  u8 *heap, *uri = 0;
-  u8 *bind_uri = (u8 *) "tcp://0.0.0.0/1234";
-  u8 *connect_uri = (u8 *) "tcp://6.0.1.2/1234";
-  u64 bytes_to_send = 64 << 10, mbytes;
-  u32 tmp;
-  mheap_t *h;
-  session_t *session;
-  int i;
-  int i_am_master = 1, drop_packets = 0, test_return_packets = 0;
-
-  clib_mem_init (0, 256 << 20);
-
-  heap = clib_mem_get_per_cpu_heap ();
-  h = mheap_header (heap);
-
-  /* make the main heap thread-safe */
-  h->flags |= MHEAP_FLAG_THREAD_SAFE;
-
-  vec_validate (utm->rx_buf, 128 << 10);
-
-  utm->session_index_by_vpp_handles = hash_create (0, sizeof (uword));
-
-  utm->my_pid = getpid ();
-  utm->configured_segment_size = 1 << 20;
-
-  clib_time_init (&utm->clib_time);
-  init_error_string_table (utm);
-  svm_fifo_segment_init (0x200000000ULL, 20);
-  unformat_init_command_line (a, argv);
-
-  while (unformat_check_input (a) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (a, "chroot prefix %s", &chroot_prefix))
-	{
-	  vl_set_memory_root_path ((char *) chroot_prefix);
-	}
-      else if (unformat (a, "uri %s", &uri))
-	;
-      else if (unformat (a, "segment-size %dM", &tmp))
-	utm->configured_segment_size = tmp << 20;
-      else if (unformat (a, "segment-size %dG", &tmp))
-	utm->configured_segment_size = tmp << 30;
-      else if (unformat (a, "master"))
-	i_am_master = 1;
-      else if (unformat (a, "slave"))
-	i_am_master = 0;
-      else if (unformat (a, "drop"))
-	drop_packets = 1;
-      else if (unformat (a, "test"))
-	test_return_packets = 1;
-      else if (unformat (a, "mbytes %lld", &mbytes))
-	{
-	  bytes_to_send = mbytes << 20;
-	}
-      else if (unformat (a, "gbytes %lld", &mbytes))
-	{
-	  bytes_to_send = mbytes << 30;
-	}
-      else
-	{
-	  fformat (stderr, "%s: usage [master|slave]\n");
-	  exit (1);
-	}
-    }
-
-  if (uri)
-    {
-      utm->uri = format (0, "%s%c", uri, 0);
-      utm->connect_uri = format (0, "%s%c", uri, 0);
-    }
-  else
-    {
-      utm->uri = format (0, "%s%c", bind_uri, 0);
-      utm->connect_uri = format (0, "%s%c", connect_uri, 0);
-    }
-
-  utm->i_am_master = i_am_master;
-  utm->segment_main = &svm_fifo_segment_main;
-  utm->drop_packets = drop_packets;
-  utm->test_return_packets = test_return_packets;
-  utm->bytes_to_send = bytes_to_send;
-  utm->time_to_stop = 0;
-
-  setup_signal_handlers ();
-  uri_api_hookup (utm);
-
-  if (connect_to_vpp (i_am_master ? "uri_tcp_server" : "uri_tcp_client") < 0)
-    {
-      svm_region_exit ();
-      fformat (stderr, "Couldn't connect to vpe, exiting...\n");
-      exit (1);
-    }
-
-  if (i_am_master == 0)
-    {
-      client_test (utm);
-      vl_client_disconnect_from_vlib ();
-      exit (0);
-    }
-
-  /* $$$$ hack preallocation */
-  for (i = 0; i < 200000; i++)
-    {
-      pool_get (utm->sessions, session);
-      memset (session, 0, sizeof (*session));
-    }
-  for (i = 0; i < 200000; i++)
-    pool_put_index (utm->sessions, i);
-
-  server_test (utm);
-
-  vl_client_disconnect_from_vlib ();
-  exit (0);
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/src/uri/uri_udp_test.c b/src/uri/uri_udp_test.c
deleted file mode 100644
index ac9411835ec..00000000000
--- a/src/uri/uri_udp_test.c
+++ /dev/null
@@ -1,1172 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <stdio.h>
-#include <setjmp.h>
-#include <signal.h>
-#include <vppinfra/clib.h>
-#include <vppinfra/format.h>
-#include <vppinfra/error.h>
-#include <vppinfra/time.h>
-#include <vppinfra/macros.h>
-#include <vnet/vnet.h>
-#include <vlib/vlib.h>
-#include <vlib/unix/unix.h>
-#include <vlibapi/api.h>
-#include <vlibmemory/api.h>
-#include <vpp/api/vpe_msg_enum.h>
-#include <svm/svm_fifo_segment.h>
-#include <pthread.h>
-#include <vnet/session/application_interface.h>
-
-#define vl_typedefs		/* define message structures */
-#include <vpp/api/vpe_all_api_h.h>
-#undef vl_typedefs
-
-/* declare message handlers for each api */
-
-#define vl_endianfun		/* define message structures */
-#include <vpp/api/vpe_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...)
-#define vl_printfun
-#include <vpp/api/vpe_all_api_h.h>
-#undef vl_printfun
-
-typedef enum
-{
-  STATE_START,
-  STATE_BOUND,
-  STATE_READY,
-  STATE_FAILED,
-  STATE_DISCONNECTING,
-} connection_state_t;
-
-typedef struct
-{
-  svm_fifo_t *server_rx_fifo;
-  svm_fifo_t *server_tx_fifo;
-} session_t;
-
-typedef struct
-{
-  /* vpe input queue */
-  unix_shared_memory_queue_t *vl_input_queue;
-
-  /* API client handle */
-  u32 my_client_index;
-
-  /* The URI we're playing with */
-  u8 *uri;
-
-  /* Session pool */
-  session_t *sessions;
-
-  /* Hash table for disconnect processing */
-  uword *session_index_by_vpp_handles;
-
-  /* fifo segment */
-  svm_fifo_segment_private_t *seg;
-
-  /* intermediate rx buffer */
-  u8 *rx_buf;
-
-  /* URI for connect */
-  u8 *connect_uri;
-
-  int i_am_master;
-
-  /* Our event queue */
-  unix_shared_memory_queue_t *our_event_queue;
-
-  /* $$$ single thread only for the moment */
-  unix_shared_memory_queue_t *vpp_event_queue;
-
-  /* $$$$ hack: cut-through session index */
-  volatile u32 cut_through_session_index;
-  volatile u32 connected_session;
-
-  /* unique segment name counter */
-  u32 unique_segment_index;
-
-  pid_t my_pid;
-
-  /* pthread handle */
-  pthread_t cut_through_thread_handle;
-
-  /* For deadman timers */
-  clib_time_t clib_time;
-
-  /* State of the connection, shared between msg RX thread and main thread */
-  volatile connection_state_t state;
-
-  volatile int time_to_stop;
-  volatile int time_to_print_stats;
-
-  u32 configured_segment_size;
-
-  /* VNET_API_ERROR_FOO -> "Foo" hash table */
-  uword *error_string_by_error_number;
-
-  /* convenience */
-  svm_fifo_segment_main_t *segment_main;
-
-  u8 *connect_test_data;
-} uri_udp_test_main_t;
-
-#if CLIB_DEBUG > 0
-#define NITER 10000
-#else
-#define NITER 4000000
-#endif
-
-uri_udp_test_main_t uri_udp_test_main;
-
-static void
-stop_signal (int signum)
-{
-  uri_udp_test_main_t *um = &uri_udp_test_main;
-
-  um->time_to_stop = 1;
-}
-
-static void
-stats_signal (int signum)
-{
-  uri_udp_test_main_t *um = &uri_udp_test_main;
-
-  um->time_to_print_stats = 1;
-}
-
-static clib_error_t *
-setup_signal_handlers (void)
-{
-  signal (SIGINT, stats_signal);
-  signal (SIGQUIT, stop_signal);
-  signal (SIGTERM, stop_signal);
-
-  return 0;
-}
-
-void
-application_send_attach (uri_udp_test_main_t * utm)
-{
-  vl_api_application_attach_t *bmp;
-  u32 fifo_size = 1 << 20;
-  bmp = vl_msg_api_alloc (sizeof (*bmp));
-  memset (bmp, 0, sizeof (*bmp));
-
-  bmp->_vl_msg_id = ntohs (VL_API_APPLICATION_ATTACH);
-  bmp->client_index = utm->my_client_index;
-  bmp->context = ntohl (0xfeedface);
-  bmp->options[APP_OPTIONS_FLAGS] =
-    APP_OPTIONS_FLAGS_ACCEPT_REDIRECT | APP_OPTIONS_FLAGS_ADD_SEGMENT;
-  bmp->options[APP_OPTIONS_PREALLOC_FIFO_PAIRS] = 2;
-  bmp->options[APP_OPTIONS_RX_FIFO_SIZE] = fifo_size;
-  bmp->options[APP_OPTIONS_TX_FIFO_SIZE] = fifo_size;
-  bmp->options[APP_OPTIONS_ADD_SEGMENT_SIZE] = 128 << 20;
-  bmp->options[APP_OPTIONS_SEGMENT_SIZE] = 256 << 20;
-  bmp->options[APP_OPTIONS_EVT_QUEUE_SIZE] = 16768;
-  vl_msg_api_send_shmem (utm->vl_input_queue, (u8 *) & bmp);
-}
-
-void
-application_detach (uri_udp_test_main_t * utm)
-{
-  vl_api_application_detach_t *bmp;
-  bmp = vl_msg_api_alloc (sizeof (*bmp));
-  memset (bmp, 0, sizeof (*bmp));
-
-  bmp->_vl_msg_id = ntohs (VL_API_APPLICATION_DETACH);
-  bmp->client_index = utm->my_client_index;
-  bmp->context = ntohl (0xfeedface);
-  vl_msg_api_send_shmem (utm->vl_input_queue, (u8 *) & bmp);
-}
-
-static void
-vl_api_application_attach_reply_t_handler (vl_api_application_attach_reply_t *
-					   mp)
-{
-  uri_udp_test_main_t *utm = &uri_udp_test_main;
-  svm_fifo_segment_create_args_t _a, *a = &_a;
-  int rv;
-
-  if (mp->retval)
-    {
-      clib_warning ("attach failed: %d", mp->retval);
-      utm->state = STATE_FAILED;
-      return;
-    }
-
-  if (mp->segment_name_length == 0)
-    {
-      clib_warning ("segment_name_length zero");
-      return;
-    }
-
-  a->segment_name = (char *) mp->segment_name;
-  a->segment_size = mp->segment_size;
-
-  ASSERT (mp->app_event_queue_address);
-
-  /* Attach to the segment vpp created */
-  rv = svm_fifo_segment_attach (a);
-  if (rv)
-    {
-      clib_warning ("svm_fifo_segment_attach ('%s') failed",
-		    mp->segment_name);
-      return;
-    }
-
-  utm->our_event_queue =
-    uword_to_pointer (mp->app_event_queue_address,
-		      unix_shared_memory_queue_t *);
-}
-
-static void
-vl_api_application_detach_reply_t_handler (vl_api_application_detach_reply_t *
-					   mp)
-{
-  if (mp->retval)
-    clib_warning ("detach returned with err: %d", mp->retval);
-}
-
-u8 *
-format_api_error (u8 * s, va_list * args)
-{
-  uri_udp_test_main_t *utm = va_arg (*args, uri_udp_test_main_t *);
-  i32 error = va_arg (*args, u32);
-  uword *p;
-
-  p = hash_get (utm->error_string_by_error_number, -error);
-
-  if (p)
-    s = format (s, "%s", p[0]);
-  else
-    s = format (s, "%d", error);
-  return s;
-}
-
-int
-wait_for_state_change (uri_udp_test_main_t * utm, connection_state_t state)
-{
-#if CLIB_DEBUG > 0
-#define TIMEOUT 600.0
-#else
-#define TIMEOUT 600.0
-#endif
-
-  f64 timeout = clib_time_now (&utm->clib_time) + TIMEOUT;
-
-  while (clib_time_now (&utm->clib_time) < timeout)
-    {
-      if (utm->state == state)
-	return 0;
-    }
-  return -1;
-}
-
-u64 server_bytes_received, server_bytes_sent;
-
-static void *
-cut_through_thread_fn (void *arg)
-{
-  session_t *s;
-  svm_fifo_t *rx_fifo;
-  svm_fifo_t *tx_fifo;
-  u8 *my_copy_buffer = 0;
-  uri_udp_test_main_t *utm = &uri_udp_test_main;
-  i32 actual_transfer;
-  int rv;
-  u32 buffer_offset;
-
-  while (utm->cut_through_session_index == ~0)
-    ;
-
-  s = pool_elt_at_index (utm->sessions, utm->cut_through_session_index);
-
-  rx_fifo = s->server_rx_fifo;
-  tx_fifo = s->server_tx_fifo;
-
-  vec_validate (my_copy_buffer, 64 * 1024 - 1);
-
-  while (true)
-    {
-      /* We read from the tx fifo and write to the rx fifo */
-      do
-	{
-	  actual_transfer = svm_fifo_dequeue_nowait (tx_fifo,
-						     vec_len (my_copy_buffer),
-						     my_copy_buffer);
-	}
-      while (actual_transfer <= 0);
-
-      server_bytes_received += actual_transfer;
-
-      buffer_offset = 0;
-      while (actual_transfer > 0)
-	{
-	  rv = svm_fifo_enqueue_nowait (rx_fifo, actual_transfer,
-					my_copy_buffer + buffer_offset);
-	  if (rv > 0)
-	    {
-	      actual_transfer -= rv;
-	      buffer_offset += rv;
-	      server_bytes_sent += rv;
-	    }
-
-	}
-      if (PREDICT_FALSE (utm->time_to_stop))
-	break;
-    }
-
-  pthread_exit (0);
-}
-
-static void
-udp_client_connect (uri_udp_test_main_t * utm)
-{
-  vl_api_connect_uri_t *cmp;
-  cmp = vl_msg_api_alloc (sizeof (*cmp));
-  memset (cmp, 0, sizeof (*cmp));
-
-  cmp->_vl_msg_id = ntohs (VL_API_CONNECT_URI);
-  cmp->client_index = utm->my_client_index;
-  cmp->context = ntohl (0xfeedface);
-  memcpy (cmp->uri, utm->connect_uri, vec_len (utm->connect_uri));
-  vl_msg_api_send_shmem (utm->vl_input_queue, (u8 *) & cmp);
-}
-
-static void
-client_send_cut_through (uri_udp_test_main_t * utm, session_t * session)
-{
-  int i;
-  u8 *test_data = 0;
-  u64 bytes_received = 0, bytes_sent = 0;
-  i32 bytes_to_read;
-  int rv;
-  f64 before, after, delta, bytes_per_second;
-  svm_fifo_t *rx_fifo, *tx_fifo;
-  int buffer_offset, bytes_to_send = 0;
-
-  /*
-   * Prepare test data
-   */
-  vec_validate (test_data, 64 * 1024 - 1);
-  for (i = 0; i < vec_len (test_data); i++)
-    test_data[i] = i & 0xff;
-
-  rx_fifo = session->server_rx_fifo;
-  tx_fifo = session->server_tx_fifo;
-
-  before = clib_time_now (&utm->clib_time);
-
-  vec_validate (utm->rx_buf, vec_len (test_data) - 1);
-
-  for (i = 0; i < NITER; i++)
-    {
-      bytes_to_send = vec_len (test_data);
-      buffer_offset = 0;
-      while (bytes_to_send > 0)
-	{
-	  rv = svm_fifo_enqueue_nowait (tx_fifo, bytes_to_send,
-					test_data + buffer_offset);
-
-	  if (rv > 0)
-	    {
-	      bytes_to_send -= rv;
-	      buffer_offset += rv;
-	      bytes_sent += rv;
-	    }
-	}
-
-      bytes_to_read = svm_fifo_max_dequeue (rx_fifo);
-      bytes_to_read = vec_len (utm->rx_buf) > bytes_to_read ?
-	bytes_to_read : vec_len (utm->rx_buf);
-
-      buffer_offset = 0;
-      while (bytes_to_read > 0)
-	{
-	  rv = svm_fifo_dequeue_nowait (rx_fifo,
-					bytes_to_read,
-					utm->rx_buf + buffer_offset);
-	  if (rv > 0)
-	    {
-	      bytes_to_read -= rv;
-	      buffer_offset += rv;
-	      bytes_received += rv;
-	    }
-	}
-    }
-  while (bytes_received < bytes_sent)
-    {
-      rv =
-	svm_fifo_dequeue_nowait (rx_fifo, vec_len (utm->rx_buf), utm->rx_buf);
-      if (rv > 0)
-	{
-#if CLIB_DEBUG > 0
-	  int j;
-	  for (j = 0; j < rv; j++)
-	    {
-	      if (utm->rx_buf[j] != ((bytes_received + j) & 0xff))
-		{
-		  clib_warning ("error at byte %lld, 0x%x not 0x%x",
-				bytes_received + j,
-				utm->rx_buf[j],
-				((bytes_received + j) & 0xff));
-		}
-	    }
-#endif
-	  bytes_received += (u64) rv;
-	}
-    }
-
-  after = clib_time_now (&utm->clib_time);
-  delta = after - before;
-  bytes_per_second = 0.0;
-
-  if (delta > 0.0)
-    bytes_per_second = (f64) bytes_received / delta;
-
-  fformat (stdout,
-	   "Done: %lld recv bytes in %.2f seconds, %.2f bytes/sec...\n\n",
-	   bytes_received, delta, bytes_per_second);
-  fformat (stdout,
-	   "Done: %lld sent bytes in %.2f seconds, %.2f bytes/sec...\n\n",
-	   bytes_sent, delta, bytes_per_second);
-  fformat (stdout,
-	   "client -> server -> client round trip: %.2f Gbit/sec \n\n",
-	   (bytes_per_second * 8.0) / 1e9);
-}
-
-static void
-send_test_chunk (uri_udp_test_main_t * utm, svm_fifo_t * tx_fifo, int mypid,
-		 u32 bytes)
-{
-  u8 *test_data = utm->connect_test_data;
-  u64 bytes_sent = 0;
-  int test_buf_offset = 0;
-  u32 bytes_to_snd;
-  u32 queue_max_chunk = 128 << 10, actual_write;
-  session_fifo_event_t evt;
-  int rv;
-
-  bytes_to_snd = (bytes == 0) ? vec_len (test_data) : bytes;
-  if (bytes_to_snd > vec_len (test_data))
-    bytes_to_snd = vec_len (test_data);
-
-  while (bytes_to_snd > 0 && !utm->time_to_stop)
-    {
-      actual_write = (bytes_to_snd > queue_max_chunk) ?
-	queue_max_chunk : bytes_to_snd;
-      rv = svm_fifo_enqueue_nowait (tx_fifo, actual_write,
-				    test_data + test_buf_offset);
-
-      if (rv > 0)
-	{
-	  bytes_to_snd -= rv;
-	  test_buf_offset += rv;
-	  bytes_sent += rv;
-
-	  if (svm_fifo_set_event (tx_fifo))
-	    {
-	      /* Fabricate TX event, send to vpp */
-	      evt.fifo = tx_fifo;
-	      evt.event_type = FIFO_EVENT_APP_TX;
-
-	      unix_shared_memory_queue_add (utm->vpp_event_queue,
-					    (u8 *) & evt,
-					    0 /* do wait for mutex */ );
-	    }
-	}
-    }
-}
-
-static void
-recv_test_chunk (uri_udp_test_main_t * utm, session_t * session)
-{
-  svm_fifo_t *rx_fifo;
-  int buffer_offset, bytes_to_read = 0, rv;
-
-  rx_fifo = session->server_rx_fifo;
-  bytes_to_read = svm_fifo_max_dequeue (rx_fifo);
-  bytes_to_read =
-    vec_len (utm->rx_buf) > bytes_to_read ?
-    bytes_to_read : vec_len (utm->rx_buf);
-
-  buffer_offset = 0;
-  while (bytes_to_read > 0)
-    {
-      rv = svm_fifo_dequeue_nowait (rx_fifo, bytes_to_read,
-				    utm->rx_buf + buffer_offset);
-      if (rv > 0)
-	{
-	  bytes_to_read -= rv;
-	  buffer_offset += rv;
-	}
-    }
-}
-
-void
-client_send_data (uri_udp_test_main_t * utm)
-{
-  u8 *test_data;
-  int mypid = getpid ();
-  session_t *session;
-  svm_fifo_t *tx_fifo;
-  u32 n_iterations;
-  int i;
-
-  vec_validate (utm->connect_test_data, 64 * 1024 - 1);
-  for (i = 0; i < vec_len (utm->connect_test_data); i++)
-    utm->connect_test_data[i] = i & 0xff;
-
-  test_data = utm->connect_test_data;
-  session = pool_elt_at_index (utm->sessions, utm->connected_session);
-  tx_fifo = session->server_tx_fifo;
-
-  ASSERT (vec_len (test_data) > 0);
-
-  vec_validate (utm->rx_buf, vec_len (test_data) - 1);
-  n_iterations = NITER;
-
-  for (i = 0; i < n_iterations; i++)
-    {
-      send_test_chunk (utm, tx_fifo, mypid, 0);
-      recv_test_chunk (utm, session);
-      if (utm->time_to_stop)
-	break;
-    }
-
-  f64 timeout = clib_time_now (&utm->clib_time) + 5;
-  while (clib_time_now (&utm->clib_time) < timeout)
-    {
-      recv_test_chunk (utm, session);
-    }
-
-}
-
-static void
-client_test (uri_udp_test_main_t * utm)
-{
-  session_t *session;
-
-  application_send_attach (utm);
-  udp_client_connect (utm);
-
-  if (wait_for_state_change (utm, STATE_READY))
-    {
-      clib_warning ("timeout waiting for STATE_READY");
-      return;
-    }
-
-  if (utm->cut_through_session_index != ~0)
-    {
-      session = pool_elt_at_index (utm->sessions,
-				   utm->cut_through_session_index);
-      client_send_cut_through (utm, session);
-    }
-  else
-    {
-      session = pool_elt_at_index (utm->sessions, utm->connected_session);
-      client_send_data (utm);
-    }
-
-  application_detach (utm);
-}
-
-static void
-vl_api_bind_uri_reply_t_handler (vl_api_bind_uri_reply_t * mp)
-{
-  uri_udp_test_main_t *utm = &uri_udp_test_main;
-
-  if (mp->retval)
-    {
-      clib_warning ("bind failed: %d", mp->retval);
-      utm->state = STATE_FAILED;
-      return;
-    }
-
-  utm->state = STATE_BOUND;
-}
-
-static void
-vl_api_map_another_segment_t_handler (vl_api_map_another_segment_t * mp)
-{
-  svm_fifo_segment_create_args_t _a, *a = &_a;
-  int rv;
-
-  memset (a, 0, sizeof (*a));
-  a->segment_name = (char *) mp->segment_name;
-  a->segment_size = mp->segment_size;
-  /* Attach to the segment vpp created */
-  rv = svm_fifo_segment_attach (a);
-  if (rv)
-    {
-      clib_warning ("svm_fifo_segment_attach ('%s') failed",
-		    mp->segment_name);
-      return;
-    }
-  clib_warning ("Mapped new segment '%s' size %d", mp->segment_name,
-		mp->segment_size);
-}
-
-/**
- * Acting as server for redirected connect requests
- */
-static void
-vl_api_connect_uri_t_handler (vl_api_connect_uri_t * mp)
-{
-  u32 segment_index;
-  uri_udp_test_main_t *utm = &uri_udp_test_main;
-  svm_fifo_segment_main_t *sm = &svm_fifo_segment_main;
-  svm_fifo_segment_create_args_t _a, *a = &_a;
-  svm_fifo_segment_private_t *seg;
-  unix_shared_memory_queue_t *client_q;
-  vl_api_connect_session_reply_t *rmp;
-  session_t *session = 0;
-  int rv = 0;
-
-  /* Create the segment */
-  a->segment_name = (char *) format (0, "%d:segment%d%c", utm->my_pid,
-				     utm->unique_segment_index++, 0);
-  a->segment_size = utm->configured_segment_size;
-
-  rv = svm_fifo_segment_create (a);
-  if (rv)
-    {
-      clib_warning ("sm_fifo_segment_create ('%s') failed", a->segment_name);
-      rv = VNET_API_ERROR_URI_FIFO_CREATE_FAILED;
-      goto send_reply;
-    }
-
-  vec_add2 (utm->seg, seg, 1);
-
-  segment_index = vec_len (sm->segments) - 1;
-  memcpy (seg, sm->segments + segment_index, sizeof (utm->seg[0]));
-
-  pool_get (utm->sessions, session);
-
-  session->server_rx_fifo = svm_fifo_segment_alloc_fifo
-    (utm->seg, 128 * 1024, FIFO_SEGMENT_RX_FREELIST);
-  ASSERT (session->server_rx_fifo);
-
-  session->server_tx_fifo = svm_fifo_segment_alloc_fifo
-    (utm->seg, 128 * 1024, FIFO_SEGMENT_TX_FREELIST);
-  ASSERT (session->server_tx_fifo);
-
-  session->server_rx_fifo->master_session_index = session - utm->sessions;
-  session->server_tx_fifo->master_session_index = session - utm->sessions;
-  utm->cut_through_session_index = session - utm->sessions;
-
-  rv = pthread_create (&utm->cut_through_thread_handle,
-		       NULL /*attr */ , cut_through_thread_fn, 0);
-  if (rv)
-    {
-      clib_warning ("pthread_create returned %d", rv);
-      rv = VNET_API_ERROR_SYSCALL_ERROR_1;
-    }
-
-send_reply:
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
-
-  rmp->_vl_msg_id = ntohs (VL_API_CONNECT_SESSION_REPLY);
-  rmp->context = mp->context;
-  rmp->retval = ntohl (rv);
-  rmp->segment_name_length = vec_len (a->segment_name);
-  if (session)
-    {
-      rmp->server_rx_fifo = pointer_to_uword (session->server_rx_fifo);
-      rmp->server_tx_fifo = pointer_to_uword (session->server_tx_fifo);
-    }
-
-  memcpy (rmp->segment_name, a->segment_name, vec_len (a->segment_name));
-
-  vec_free (a->segment_name);
-
-  client_q =
-    uword_to_pointer (mp->client_queue_address, unix_shared_memory_queue_t *);
-  vl_msg_api_send_shmem (client_q, (u8 *) & rmp);
-}
-
-static void
-vl_api_unbind_uri_reply_t_handler (vl_api_unbind_uri_reply_t * mp)
-{
-  uri_udp_test_main_t *utm = &uri_udp_test_main;
-
-  if (mp->retval != 0)
-    clib_warning ("returned %d", ntohl (mp->retval));
-
-  utm->state = STATE_START;
-}
-
-static void
-vl_api_accept_session_t_handler (vl_api_accept_session_t * mp)
-{
-  uri_udp_test_main_t *utm = &uri_udp_test_main;
-  vl_api_accept_session_reply_t *rmp;
-  svm_fifo_t *rx_fifo, *tx_fifo;
-  session_t *session;
-  static f64 start_time;
-
-  if (start_time == 0.0)
-    start_time = clib_time_now (&utm->clib_time);
-
-  utm->vpp_event_queue =
-    uword_to_pointer (mp->vpp_event_queue_address,
-		      unix_shared_memory_queue_t *);
-
-  pool_get (utm->sessions, session);
-
-  rx_fifo = uword_to_pointer (mp->server_rx_fifo, svm_fifo_t *);
-  rx_fifo->client_session_index = session - utm->sessions;
-  tx_fifo = uword_to_pointer (mp->server_tx_fifo, svm_fifo_t *);
-  tx_fifo->client_session_index = session - utm->sessions;
-
-  session->server_rx_fifo = rx_fifo;
-  session->server_tx_fifo = tx_fifo;
-
-  hash_set (utm->session_index_by_vpp_handles, mp->handle,
-	    session - utm->sessions);
-
-  if (pool_elts (utm->sessions) && (pool_elts (utm->sessions) % 20000) == 0)
-    {
-      f64 now = clib_time_now (&utm->clib_time);
-      fformat (stdout, "%d active sessions in %.2f seconds, %.2f/sec...\n",
-	       pool_elts (utm->sessions), now - start_time,
-	       (f64) pool_elts (utm->sessions) / (now - start_time));
-    }
-
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_ACCEPT_SESSION_REPLY);
-  rmp->handle = mp->handle;
-  rmp->context = mp->context;
-  vl_msg_api_send_shmem (utm->vl_input_queue, (u8 *) & rmp);
-
-  CLIB_MEMORY_BARRIER ();
-  utm->state = STATE_READY;
-}
-
-static void
-vl_api_disconnect_session_t_handler (vl_api_disconnect_session_t * mp)
-{
-  uri_udp_test_main_t *utm = &uri_udp_test_main;
-  session_t *session;
-  vl_api_disconnect_session_reply_t *rmp;
-  uword *p;
-  int rv = 0;
-
-  p = hash_get (utm->session_index_by_vpp_handles, mp->handle);
-
-  if (p)
-    {
-      session = pool_elt_at_index (utm->sessions, p[0]);
-      hash_unset (utm->session_index_by_vpp_handles, mp->handle);
-      pool_put (utm->sessions, session);
-    }
-  else
-    {
-      clib_warning ("couldn't find session key %llx", mp->handle);
-      rv = -11;
-    }
-
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_DISCONNECT_SESSION_REPLY);
-  rmp->retval = rv;
-  rmp->handle = mp->handle;
-  vl_msg_api_send_shmem (utm->vl_input_queue, (u8 *) & rmp);
-}
-
-static void
-vl_api_connect_session_reply_t_handler (vl_api_connect_session_reply_t * mp)
-{
-  uri_udp_test_main_t *utm = &uri_udp_test_main;
-  session_t *session;
-
-  ASSERT (utm->i_am_master == 0);
-
-  if (mp->retval)
-    {
-      clib_warning ("failed connect");
-      return;
-    }
-
-  /* We've been redirected */
-  if (mp->segment_name_length > 0)
-    {
-      svm_fifo_segment_main_t *sm = &svm_fifo_segment_main;
-      svm_fifo_segment_create_args_t _a, *a = &_a;
-      u32 segment_index;
-      svm_fifo_segment_private_t *seg;
-      int rv;
-
-      memset (a, 0, sizeof (*a));
-      a->segment_name = (char *) mp->segment_name;
-
-      sleep (1);
-
-      rv = svm_fifo_segment_attach (a);
-      if (rv)
-	{
-	  clib_warning ("sm_fifo_segment_create ('%v') failed",
-			mp->segment_name);
-	  return;
-	}
-
-      segment_index = a->new_segment_indices[0];
-      vec_add2 (utm->seg, seg, 1);
-      memcpy (seg, sm->segments + segment_index, sizeof (*seg));
-      sleep (1);
-    }
-
-  pool_get (utm->sessions, session);
-  session->server_rx_fifo = uword_to_pointer (mp->server_rx_fifo,
-					      svm_fifo_t *);
-  ASSERT (session->server_rx_fifo);
-  session->server_tx_fifo = uword_to_pointer (mp->server_tx_fifo,
-					      svm_fifo_t *);
-  ASSERT (session->server_tx_fifo);
-
-  if (mp->segment_name_length > 0)
-    utm->cut_through_session_index = session - utm->sessions;
-  else
-    {
-      utm->connected_session = session - utm->sessions;
-      utm->vpp_event_queue = uword_to_pointer (mp->vpp_event_queue_address,
-					       unix_shared_memory_queue_t *);
-    }
-  utm->state = STATE_READY;
-}
-
-#define foreach_uri_msg                         	\
-_(BIND_URI_REPLY, bind_uri_reply)               	\
-_(CONNECT_URI, connect_uri)                     	\
-_(CONNECT_SESSION_REPLY, connect_session_reply)       	\
-_(UNBIND_URI_REPLY, unbind_uri_reply)           	\
-_(ACCEPT_SESSION, accept_session)			\
-_(DISCONNECT_SESSION, disconnect_session)		\
-_(MAP_ANOTHER_SEGMENT, map_another_segment)		\
-_(APPLICATION_ATTACH_REPLY, application_attach_reply)	\
-_(APPLICATION_DETACH_REPLY, application_detach_reply)	\
-
-void
-uri_api_hookup (uri_udp_test_main_t * utm)
-{
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
-                           vl_api_##n##_t_handler,              \
-                           vl_noop_handler,                     \
-                           vl_api_##n##_t_endian,               \
-                           vl_api_##n##_t_print,                \
-                           sizeof(vl_api_##n##_t), 1);
-  foreach_uri_msg;
-#undef _
-
-}
-
-int
-connect_to_vpp (char *name)
-{
-  uri_udp_test_main_t *utm = &uri_udp_test_main;
-  api_main_t *am = &api_main;
-
-  if (vl_client_connect_to_vlib ("/vpe-api", name, 32) < 0)
-    return -1;
-
-  utm->vl_input_queue = am->shmem_hdr->vl_input_queue;
-  utm->my_client_index = am->my_client_index;
-
-  return 0;
-}
-
-void
-vlib_cli_output (struct vlib_main_t *vm, char *fmt, ...)
-{
-  clib_warning ("BUG");
-}
-
-static void
-init_error_string_table (uri_udp_test_main_t * utm)
-{
-  utm->error_string_by_error_number = hash_create (0, sizeof (uword));
-
-#define _(n,v,s) hash_set (utm->error_string_by_error_number, -v, s);
-  foreach_vnet_api_error;
-#undef _
-
-  hash_set (utm->error_string_by_error_number, 99, "Misc");
-}
-
-void
-server_handle_fifo_event_rx (uri_udp_test_main_t * utm,
-			     session_fifo_event_t * e)
-{
-  svm_fifo_t *rx_fifo, *tx_fifo;
-  int nbytes;
-  session_fifo_event_t evt;
-  unix_shared_memory_queue_t *q;
-  int rv;
-
-  rx_fifo = e->fifo;
-  tx_fifo = utm->sessions[rx_fifo->client_session_index].server_tx_fifo;
-  svm_fifo_unset_event (rx_fifo);
-
-  do
-    {
-      nbytes = svm_fifo_dequeue_nowait (rx_fifo, vec_len (utm->rx_buf),
-					utm->rx_buf);
-    }
-  while (nbytes <= 0);
-  do
-    {
-      rv = svm_fifo_enqueue_nowait (tx_fifo, nbytes, utm->rx_buf);
-    }
-  while (rv == -2);
-
-  if (svm_fifo_set_event (tx_fifo))
-    {
-      /* Fabricate TX event, send to vpp */
-      evt.fifo = tx_fifo;
-      evt.event_type = FIFO_EVENT_APP_TX;
-      q = utm->vpp_event_queue;
-      unix_shared_memory_queue_add (q, (u8 *) & evt,
-				    0 /* do wait for mutex */ );
-    }
-}
-
-void
-server_handle_event_queue (uri_udp_test_main_t * utm)
-{
-  session_fifo_event_t _e, *e = &_e;
-
-  while (utm->state != STATE_READY)
-    sleep (5);
-
-  while (1)
-    {
-      unix_shared_memory_queue_sub (utm->our_event_queue, (u8 *) e,
-				    0 /* nowait */ );
-      switch (e->event_type)
-	{
-	case FIFO_EVENT_APP_RX:
-	  server_handle_fifo_event_rx (utm, e);
-	  break;
-
-	case FIFO_EVENT_DISCONNECT:
-	  return;
-
-	default:
-	  clib_warning ("unknown event type %d", e->event_type);
-	  break;
-	}
-      if (PREDICT_FALSE (utm->time_to_stop == 1))
-	return;
-      if (PREDICT_FALSE (utm->time_to_print_stats == 1))
-	{
-	  utm->time_to_print_stats = 0;
-	  fformat (stdout, "%d connections\n", pool_elts (utm->sessions));
-	}
-    }
-}
-
-static void
-server_unbind (uri_udp_test_main_t * utm)
-{
-  vl_api_unbind_uri_t *ump;
-
-  ump = vl_msg_api_alloc (sizeof (*ump));
-  memset (ump, 0, sizeof (*ump));
-
-  ump->_vl_msg_id = ntohs (VL_API_UNBIND_URI);
-  ump->client_index = utm->my_client_index;
-  memcpy (ump->uri, utm->uri, vec_len (utm->uri));
-  vl_msg_api_send_shmem (utm->vl_input_queue, (u8 *) & ump);
-}
-
-static void
-server_bind (uri_udp_test_main_t * utm)
-{
-  vl_api_bind_uri_t *bmp;
-
-  bmp = vl_msg_api_alloc (sizeof (*bmp));
-  memset (bmp, 0, sizeof (*bmp));
-
-  bmp->_vl_msg_id = ntohs (VL_API_BIND_URI);
-  bmp->client_index = utm->my_client_index;
-  bmp->context = ntohl (0xfeedface);
-  memcpy (bmp->uri, utm->uri, vec_len (utm->uri));
-  vl_msg_api_send_shmem (utm->vl_input_queue, (u8 *) & bmp);
-}
-
-void
-udp_server_test (uri_udp_test_main_t * utm)
-{
-
-  application_send_attach (utm);
-
-  /* Bind to uri */
-  server_bind (utm);
-
-  if (wait_for_state_change (utm, STATE_BOUND))
-    {
-      clib_warning ("timeout waiting for STATE_BOUND");
-      return;
-    }
-
-  server_handle_event_queue (utm);
-
-  /* Cleanup */
-  server_unbind (utm);
-
-  if (wait_for_state_change (utm, STATE_START))
-    {
-      clib_warning ("timeout waiting for STATE_START");
-      return;
-    }
-
-  application_detach (utm);
-
-  fformat (stdout, "Test complete...\n");
-}
-
-int
-main (int argc, char **argv)
-{
-  uri_udp_test_main_t *utm = &uri_udp_test_main;
-  unformat_input_t _argv, *a = &_argv;
-  u8 *chroot_prefix;
-  u8 *heap;
-  u8 *bind_name = (u8 *) "udp://0.0.0.0/1234";
-  u32 tmp;
-  mheap_t *h;
-  session_t *session;
-  int i;
-  int i_am_master = 1;
-
-  clib_mem_init (0, 256 << 20);
-
-  heap = clib_mem_get_per_cpu_heap ();
-  h = mheap_header (heap);
-
-  /* make the main heap thread-safe */
-  h->flags |= MHEAP_FLAG_THREAD_SAFE;
-
-  vec_validate (utm->rx_buf, 8192);
-
-  utm->session_index_by_vpp_handles = hash_create (0, sizeof (uword));
-
-  utm->my_pid = getpid ();
-  utm->configured_segment_size = 1 << 20;
-
-  clib_time_init (&utm->clib_time);
-  init_error_string_table (utm);
-  svm_fifo_segment_init (0x200000000ULL, 20);
-  unformat_init_command_line (a, argv);
-
-  while (unformat_check_input (a) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (a, "chroot prefix %s", &chroot_prefix))
-	{
-	  vl_set_memory_root_path ((char *) chroot_prefix);
-	}
-      else if (unformat (a, "uri %s", &bind_name))
-	;
-      else if (unformat (a, "segment-size %dM", &tmp))
-	utm->configured_segment_size = tmp << 20;
-      else if (unformat (a, "segment-size %dG", &tmp))
-	utm->configured_segment_size = tmp << 30;
-      else if (unformat (a, "master"))
-	i_am_master = 1;
-      else if (unformat (a, "slave"))
-	i_am_master = 0;
-      else
-	{
-	  fformat (stderr, "%s: usage [master|slave]\n");
-	  exit (1);
-	}
-    }
-
-  utm->cut_through_session_index = ~0;
-  utm->uri = format (0, "%s%c", bind_name, 0);
-  utm->i_am_master = i_am_master;
-  utm->segment_main = &svm_fifo_segment_main;
-
-  utm->connect_uri = format (0, "udp://6.0.1.2/1234%c", 0);
-
-  setup_signal_handlers ();
-
-  uri_api_hookup (utm);
-
-  if (connect_to_vpp (i_am_master ? "uri_udp_master" : "uri_udp_slave") < 0)
-    {
-      svm_region_exit ();
-      fformat (stderr, "Couldn't connect to vpe, exiting...\n");
-      exit (1);
-    }
-
-  if (i_am_master == 0)
-    {
-      client_test (utm);
-      exit (0);
-    }
-
-  /* $$$$ hack preallocation */
-  for (i = 0; i < 200000; i++)
-    {
-      pool_get (utm->sessions, session);
-      memset (session, 0, sizeof (*session));
-    }
-  for (i = 0; i < 200000; i++)
-    pool_put_index (utm->sessions, i);
-
-  udp_server_test (utm);
-
-  vl_client_disconnect_from_vlib ();
-  exit (0);
-}
-
-#undef vl_api_version
-#define vl_api_version(n,v) static u32 vpe_api_version = v;
-#include <vpp/api/vpe.api.h>
-#undef vl_api_version
-
-void
-vl_client_add_api_signatures (vl_api_memclnt_create_t * mp)
-{
-  /*
-   * Send the main API signature in slot 0. This bit of code must
-   * match the checks in ../vpe/api/api.c: vl_msg_api_version_check().
-   */
-  mp->api_versions[0] = clib_host_to_net_u32 (vpe_api_version);
-}
-
-u32
-vl (void *p)
-{
-  return vec_len (p);
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */