tests: session in interrupt mode

[vpp.git] / src / vnet / pg / cli.c

diff --git a/src/vnet/pg/cli.c b/src/vnet/pg/cli.c
index a8451d7..ac22509 100644 (file)
--- a/src/vnet/pg/cli.c
+++ b/src/vnet/pg/cli.c
@@ -64,9 +64,9 @@ pg_enable_disable (u32 stream_index, int is_enable)
     {
       /* No stream specified: enable/disable all streams. */
       /* *INDENT-OFF* */
-        pool_foreach (s, pg->streams, ({
+        pool_foreach (s, pg->streams)  {
             pg_stream_enable_disable (pg, s, is_enable);
-        }));
+        }
        /* *INDENT-ON* */
     }
   else
@@ -86,14 +86,17 @@ pg_capture (pg_capture_args_t * a)
   if (a->is_enabled == 1)
     {
       struct stat sb;
-      if (stat ((char *) a->pcap_file_name, &sb) != -1)
-       return clib_error_return (0, "pcap file '%s' does not exist.",
+      if (stat (a->pcap_file_name, &sb) != -1)
+       return clib_error_return (0, "pcap file '%s' already exists.",
                                  a->pcap_file_name);
     }
 
   pi = pool_elt_at_index (pg->interfaces, a->dev_instance);
   vec_free (pi->pcap_file_name);
+  if ((pi->pcap_main.flags & PCAP_MAIN_INIT_DONE))
+    pcap_close (&pi->pcap_main);
   clib_memset (&pi->pcap_main, 0, sizeof (pi->pcap_main));
+  pi->pcap_main.file_descriptor = -1;
 
   if (a->is_enabled == 0)
     return 0;
@@ -242,9 +245,9 @@ show_streams (vlib_main_t * vm,
 
   vlib_cli_output (vm, "%U", format_pg_stream, 0, 0);
   /* *INDENT-OFF* */
-  pool_foreach (s, pg->streams, ({
+  pool_foreach (s, pg->streams)  {
       vlib_cli_output (vm, "%U", format_pg_stream, s, verbose);
-    }));
+    }
   /* *INDENT-ON* */
 
 done:
@@ -330,13 +333,30 @@ validate_stream (pg_stream_t * s)
   return 0;
 }
 
+const char *
+pg_interface_get_input_node (pg_interface_t *pi)
+{
+  switch (pi->mode)
+    {
+    case PG_MODE_ETHERNET:
+      return ("ethernet-input");
+    case PG_MODE_IP4:
+      return ("ip4-input");
+    case PG_MODE_IP6:
+      return ("ip6-input");
+    }
+
+  ASSERT (0);
+  return ("ethernet-input");
+}
+
 static clib_error_t *
 new_stream (vlib_main_t * vm,
            unformat_input_t * input, vlib_cli_command_t * cmd)
 {
   clib_error_t *error = 0;
   u8 *tmp = 0;
-  u32 hw_if_index;
+  u32 maxframe, hw_if_index;
   unformat_input_t sub_input = { 0 };
   int sub_input_given = 0;
   vnet_main_t *vnm = vnet_get_main ();
@@ -348,8 +368,10 @@ new_stream (vlib_main_t * vm,
   s.node_index = ~0;
   s.max_packet_bytes = s.min_packet_bytes = 64;
   s.buffer_bytes = vlib_buffer_get_default_data_size (vm);
-  s.if_id = 0;
+  s.if_id = ~0;
+  s.n_max_frame = VLIB_FRAME_SIZE;
   pcap_file_name = 0;
+
   while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
     {
       if (unformat (input, "name %v", &tmp))
@@ -371,10 +393,17 @@ new_stream (vlib_main_t * vm,
       else if (unformat (input, "source pg%u", &s.if_id))
        ;
 
+      else if (unformat (input, "buffer-flags %U",
+                        unformat_vnet_buffer_flags, &s.buffer_flags))
+       ;
+      else if (unformat (input, "buffer-offload-flags %U",
+                        unformat_vnet_buffer_offload_flags, &s.buffer_oflags))
+       ;
       else if (unformat (input, "node %U",
                         unformat_vlib_node, vm, &s.node_index))
        ;
-
+      else if (unformat (input, "maxframe %u", &maxframe))
+       s.n_max_frame = s.n_max_frame < maxframe ? s.n_max_frame : maxframe;
       else if (unformat (input, "worker %u", &s.worker_index))
        ;
 
@@ -415,8 +444,13 @@ new_stream (vlib_main_t * vm,
     {
       if (pcap_file_name != 0)
        {
-         vlib_node_t *n =
-           vlib_get_node_by_name (vm, (u8 *) "ethernet-input");
+         vlib_node_t *n;
+
+         if (s.if_id != ~0)
+           n = vlib_get_node_by_name (vm, (u8 *) pg_interface_get_input_node (
+                                            &pg->interfaces[s.if_id]));
+         else
+           n = vlib_get_node_by_name (vm, (u8 *) "ethernet-input");
          s.node_index = n->index;
        }
       else
@@ -485,7 +519,9 @@ VLIB_CLI_COMMAND (new_stream_cli, static) = {
   "interface STRING     interface for stream output \n"
   "node NODE-NAME       node for stream output\n"
   "data STRING          specifies packet data\n"
-  "pcap FILENAME        read packet data from pcap file\n",
+  "pcap FILENAME        read packet data from pcap file\n"
+  "rate PPS             rate to transfer packet data\n"
+  "maxframe NPKTS       maximum number of packets per frame\n",
 };
 /* *INDENT-ON* */
 
@@ -624,7 +660,7 @@ pg_capture_cmd_fn (vlib_main_t * vm,
   a->hw_if_index = hw_if_index;
   a->dev_instance = hi->dev_instance;
   a->is_enabled = !is_disable;
-  a->pcap_file_name = pcap_file_name;
+  a->pcap_file_name = (char *) pcap_file_name;
   a->count = count;
 
   error = pg_capture (a);
@@ -649,8 +685,9 @@ create_pg_if_cmd_fn (vlib_main_t * vm,
 {
   pg_main_t *pg = &pg_main;
   unformat_input_t _line_input, *line_input = &_line_input;
-  u32 if_id, gso_enabled = 0, gso_size = 0;
+  u32 if_id, gso_enabled = 0, gso_size = 0, coalesce_enabled = 0;
   clib_error_t *error = NULL;
+  pg_interface_mode_t mode = PG_MODE_ETHERNET;
 
   if (!unformat_user (input, unformat_line_input, line_input))
     return 0;
@@ -659,6 +696,8 @@ create_pg_if_cmd_fn (vlib_main_t * vm,
     {
       if (unformat (line_input, "interface pg%u", &if_id))
        ;
+      else if (unformat (line_input, "coalesce-enabled"))
+       coalesce_enabled = 1;
       else if (unformat (line_input, "gso-enabled"))
        {
          gso_enabled = 1;
@@ -670,6 +709,10 @@ create_pg_if_cmd_fn (vlib_main_t * vm,
              goto done;
            }
        }
+      else if (unformat (line_input, "mode ip4"))
+       mode = PG_MODE_IP4;
+      else if (unformat (line_input, "mode ip6"))
+       mode = PG_MODE_IP6;
       else
        {
          error = clib_error_create ("unknown input `%U'",
@@ -678,7 +721,8 @@ create_pg_if_cmd_fn (vlib_main_t * vm,
        }
     }
 
-  pg_interface_add_or_get (pg, if_id, gso_enabled, gso_size);
+  pg_interface_add_or_get (pg, if_id, gso_enabled, gso_size, coalesce_enabled,
+                          mode);
 
 done:
   unformat_free (line_input);
@@ -689,7 +733,9 @@ done:
 /* *INDENT-OFF* */
 VLIB_CLI_COMMAND (create_pg_if_cmd, static) = {
   .path = "create packet-generator",
-  .short_help = "create packet-generator interface <interface name> [gso-enabled gso-size <size>]",
+  .short_help = "create packet-generator interface <interface name>"
+               " [gso-enabled gso-size <size> [coalesce-enabled]]"
+               " [mode <ethernet | ip4 | ip6>]",
   .function = create_pg_if_cmd_fn,
 };
 /* *INDENT-ON* */