Merge pull request #1 from SPRESENSE/release-v2.0.0

Merge release-v2.0.0 into new-master for v2.0.0 release

Author: Shunichi-K

Application.mk

@@ -71,6 +71,7 @@ ifneq ($(BUILD_MODULE),y)
 endif
 
 ROOTDEPPATH += --dep-path .
+ROOTDEPPATH += $(DEPPATH)
 
 VPATH += :.
 
@@ -203,11 +204,11 @@ else
 context::
 endif
 
-.depend: Makefile $(SRCS)
+.depend: Makefile $(SRCS) $(DEPCONFIG)
 ifeq ($(filter %$(CXXEXT),$(SRCS)),)
-	$(Q) $(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(filter-out Makefile,$^) >Make.dep
+	$(Q) $(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 else
-	$(Q) $(MKDEP) $(ROOTDEPPATH) "$(CXX)" -- $(CXXFLAGS) -- $(filter-out Makefile,$^) >Make.dep
+	$(Q) $(MKDEP) $(ROOTDEPPATH) "$(CXX)" -- $(CXXFLAGS) -- $(SRCS) >Make.dep
 endif
 	$(Q) touch $@
 

examples/tcpblaster/Kconfig

@@ -17,7 +17,14 @@ config EXAMPLES_TCPBLASTER_SENDSIZE
 	int "Payload size"
 	default 4096
 	---help---
-		This setting determines size of each test packet sent to the server.
+		This setting determines size of each TCP send that is sent to the server.
+
+config EXAMPLES_TCPBLASTER_GROUPSIZE
+	int "Group size"
+	default 50
+	---help---
+		This setting determines how many TCP sends are sent to the server before printing statistics
+		and starting again.
 
 config EXAMPLES_TCPBLASTER_PROGNAME1
 	string "Target1 program name"
@@ -459,7 +466,7 @@ config EXAMPLES_TCPBLASTER_SERVERIPv6ADDR_1
 	---help---
 		IP address of the server.  If the target is the server, then
 		EXAMPLES_TCPBLASTER_SERVERIP should be the same as
-		EXAMPLES_TCPBLASTER_IPADDR (default).  If the target is the cleint,
+		EXAMPLES_TCPBLASTER_IPADDR (default).  If the target is the client,
 		then the default value of EXAMPLES_TCPBLASTER_SERVERIP is set to the
 		host PC IP address (possibly the gateway address,
 		EXAMPLES_TCPBLASTER_DRIPADDR?).

examples/tcpblaster/Makefile

@@ -85,16 +85,16 @@ ifneq ($(CONFIG_EXAMPLES_TCPBLASTER_LOOPBACK),y)
 
   HOSTCFLAGS += -DTCPBLASTER_HOST=1
   ifeq ($(CONFIG_EXAMPLES_TCPBLASTER_SERVER),y)
-    HOSTCFLAGS += -DCONFIG_EXAMPLES_TCPBLASTER_SERVER=1 -DCONFIG_EXAMPLES_TCPBLASTER_SERVERIP="$(CONFIG_EXAMPLES_TCPBLASTER_SERVERIP)"
+    HOSTCFLAGS += -DCONFIG_EXAMPLES_TCPBLASTER_SERVER=1 -DCONFIG_EXAMPLES_TCPBLASTER_SERVERIP=$(CONFIG_EXAMPLES_TCPBLASTER_SERVERIP)
   endif
 
-  HOST_SRCS = tcpblaster_host.c
+  HOST_SRCS = tcpblaster_host.c tcpblaster_cmdline.c
   ifeq ($(CONFIG_EXAMPLES_TCPBLASTER_SERVER),y)
     HOST_SRCS += tcpblaster_client.c
-    HOST_BIN = tcpclient$(EXEEXT)
+    HOST_BIN = tcpclient$(HOSTEXEEXT)
   else
     HOST_SRCS += tcpblaster_server.c
-    HOST_BIN = tcpserver$(EXEEXT)
+    HOST_BIN = tcpserver$(HOSTEXEEXT)
   endif
 
   HOSTOBJEXT ?= hobj

examples/tcpblaster/README.txt

@@ -0,0 +1,40 @@
+tcpblaster Performance Test Example
+===================================
+
+To set up, do `make menuconfig` and select the Apps > Examples > tcpblaster. By default, nuttx will the be the client
+which sends data; and the host computer (Linux, macOS, or Windows) will be the server.
+
+Set up networking so the nuttx computer can ping the host, and the host can ping nuttx. Now you are ready to run the
+test.
+
+On host:
+
+    $ ./tcpserver
+    Binding to IPv4 Address: 00000000
+    server: Accepting connections on port 5471
+
+On nuttx:
+
+    nsh> tcpclient
+    Connecting to IPv4 Address: 0100000a
+    client: Connected
+    [2014-07-31 00:16:15.000] 0: Sent 200 4096-byte buffers:    800.0 KB (avg   4.0 KB) in   0.18 seconds ( 4444.4 KB/second)
+
+Now on the host you should see something like:
+
+    $ ./tcpserver
+    Binding to IPv4 Address: 00000000
+    server: Accepting connections on port 5471
+    server: Connection accepted -- receiving
+    [2020-02-22 16:17:07.000] 0: Received 200 buffers:   502.9 KB (buffer average size:   2.5 KB) in   0.12 seconds ( 4194.8 KB/second)
+    [2020-02-22 16:17:07.000] 1: Received 200 buffers:   393.1 KB (buffer average size:   2.0 KB) in   0.09 seconds ( 4299.4 KB/second)
+
+
+This will tell you the link speed in KB/sec – kilobytes per second. If you want kilobits, multiply by 8.
+
+You can use the `make menuconfig` to reverse the setup, and have nuttx be the server, and the host be the client. If you
+do that, start the server first (nuttx), then start the client (host).
+
+
+
+

examples/tcpblaster/tcpblaster.h

@@ -52,13 +52,21 @@
  ****************************************************************************/
 
 #ifdef TCPBLASTER_HOST
-   /* HTONS/L macros are unique to uIP */
+/* HTONS/L macros are unique to NuttX */
 
-#  define HTONS(a)       htons(a)
-#  define HTONL(a)       htonl(a)
+#  undef HTONS
+#  undef HTONL
+#  define HTONS(ns) htons(ns)
+#  define HTONL(nl) htonl(nl)
 
-   /* Have SO_LINGER */
+#  undef NTOHS
+#  undef NTOHL
+#  define NTOHS(hs) ntohs(hs)
+#  define NTOHL(hl) ntohl(hl)
 
+/* Have SO_LINGER */
+
+#  define FAR
 #  define TCPBLASTER_HAVE_SOLINGER 1
 
 #else
@@ -87,14 +95,20 @@
 #  define SENDSIZE 4096
 #endif
 
+#ifdef CONFIG_EXAMPLES_TCPBLASTER_GROUPSIZE
+#  define GROUPSIZE CONFIG_EXAMPLES_TCPBLASTER_GROUPSIZE
+#else
+#  define GROUPSIZE 50
+#endif
+
 /****************************************************************************
  * Public Data
  ****************************************************************************/
 
 #ifdef CONFIG_EXAMPLES_TCPBLASTER_IPv6
-uint16_t g_tcpblasterserver_ipv6[8];
+extern uint16_t g_tcpblasterserver_ipv6[8];
 #else
-uint32_t g_tcpblasterserver_ipv4;
+extern uint32_t g_tcpblasterserver_ipv4;
 #endif
 
 /****************************************************************************

examples/tcpblaster/tcpblaster_client.c

@@ -67,19 +67,23 @@ void tcpblaster_client(void)
 #endif
   struct timespec start;
   socklen_t addrlen;
-  char *outbuf;
+  FAR char *outbuf;
   unsigned long sendtotal;
   unsigned long totallost;
+  int groupcount;
   int sendcount;
   int partials;
   int sockfd;
   int nbytessent;
   int ch;
   int i;
+  char timebuff[100];
+
+  setbuf(stdout, NULL);
 
   /* Allocate buffers */
 
-  outbuf = (char*)malloc(SENDSIZE);
+  outbuf = (FAR char *)malloc(SENDSIZE);
   if (!outbuf)
     {
       printf("client: failed to allocate buffers\n");
@@ -98,26 +102,30 @@ void tcpblaster_client(void)
   /* Set up the server address */
 
 #ifdef CONFIG_EXAMPLES_TCPBLASTER_IPv6
-  server.sin6_family            = AF_INET6;
-  server.sin6_port              = HTONS(CONFIG_EXAMPLES_TCPBLASTER_SERVER_PORTNO);
-  memcpy(server.sin6_addr.s6_addr16, g_tcpblasterserver_ipv6, 8 * sizeof(uint16_t));
-  addrlen                       = sizeof(struct sockaddr_in6);
-
-  printf("Connecting to IPv6 Address: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
-         g_tcpblasterserver_ipv6[0], g_tcpblasterserver_ipv6[1], g_tcpblasterserver_ipv6[2], g_tcpblasterserver_ipv6[3],
-         g_tcpblasterserver_ipv6[4], g_tcpblasterserver_ipv6[5], g_tcpblasterserver_ipv6[6], g_tcpblasterserver_ipv6[7]);
+  server.sin6_family     = AF_INET6;
+  server.sin6_port       = HTONS(CONFIG_EXAMPLES_TCPBLASTER_SERVER_PORTNO);
+  memcpy(server.sin6_addr.s6_addr, g_tcpblasterserver_ipv6, 16);
+  addrlen                = sizeof(struct sockaddr_in6);
+
+  printf("Connecting to IPv6 Address: "
+         "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
+         g_tcpblasterserver_ipv6[0], g_tcpblasterserver_ipv6[1],
+         g_tcpblasterserver_ipv6[2], g_tcpblasterserver_ipv6[3],
+         g_tcpblasterserver_ipv6[4], g_tcpblasterserver_ipv6[5],
+         g_tcpblasterserver_ipv6[6], g_tcpblasterserver_ipv6[7]);
 #else
-  server.sin_family             = AF_INET;
-  server.sin_port               = HTONS(CONFIG_EXAMPLES_TCPBLASTER_SERVER_PORTNO);
-  server.sin_addr.s_addr        = (in_addr_t)g_tcpblasterserver_ipv4;
-  addrlen                       = sizeof(struct sockaddr_in);
+  server.sin_family      = AF_INET;
+  server.sin_port        = HTONS(CONFIG_EXAMPLES_TCPBLASTER_SERVER_PORTNO);
+  server.sin_addr.s_addr = (in_addr_t)g_tcpblasterserver_ipv4;
+  addrlen                = sizeof(struct sockaddr_in);
 
-  printf("Connecting to IPv4 Address: %08lx\n", (unsigned long)g_tcpblasterserver_ipv4);
+  printf("Connecting to IPv4 Address: %08lx\n",
+         (unsigned long)g_tcpblasterserver_ipv4);
 #endif
 
   /* Connect the socket to the server */
 
-  if (connect( sockfd, (struct sockaddr*)&server, addrlen) < 0)
+  if (connect(sockfd, (FAR struct sockaddr *)&server, addrlen) < 0)
     {
       printf("client: connect failure: %d\n", errno);
       goto errout_with_socket;
@@ -139,12 +147,13 @@ void tcpblaster_client(void)
 
   /* Then send messages forever */
 
+  groupcount = 0;
   sendcount = 0;
   sendtotal = 0;
   partials  = 0;
   totallost = 0;
 
-  (void)clock_gettime(CLOCK_REALTIME, &start);
+  clock_gettime(CLOCK_REALTIME, &start);
 
   for (; ; )
     {
@@ -197,14 +206,14 @@ void tcpblaster_client(void)
 
       sendtotal += nbytessent;
 
-      if (++sendcount >= 50)
+      if (++sendcount >= GROUPSIZE)
         {
           struct timespec elapsed;
           struct timespec curr;
           float fkbrecvd;
           float felapsed;
 
-          (void)clock_gettime(CLOCK_REALTIME, &curr);
+          clock_gettime(CLOCK_REALTIME, &curr);
 
           elapsed.tv_sec  = curr.tv_sec - start.tv_sec;
           if (curr.tv_nsec >= start.tv_nsec)
@@ -218,10 +227,15 @@ void tcpblaster_client(void)
               elapsed.tv_nsec = curr.tv_nsec + borrow;
             }
 
-          fkbrecvd  = (float)sendtotal / 1024.0;
-          felapsed = (float)elapsed.tv_sec + (float)elapsed.tv_nsec / 1000000000.0;
-          printf("Sent %d buffers:  %7.1f Kb (avg %5.1f Kb) in %6.2f Sec (%7.1f Kb/Sec)\n",
-                  sendcount, fkbrecvd, fkbrecvd/sendcount, felapsed, fkbrecvd/felapsed);
+          strftime(timebuff, 100,
+                   "%Y-%m-%d %H:%M:%S.000", localtime(&curr.tv_sec));
+
+          fkbrecvd = sendtotal / 1024.0f;
+          felapsed = elapsed.tv_sec + elapsed.tv_nsec / 1000000000.0f;
+          printf("[%s] %d: Sent %d %d-byte buffers: %7.1fKB "
+                 "(avg %5.1f KB) in %6.2f seconds (%7.1f KB/second)\n",
+                 timebuff, groupcount, sendcount, SENDSIZE, fkbrecvd,
+                 fkbrecvd / sendcount, felapsed, fkbrecvd / felapsed);
 
           if (partials > 0)
             {
@@ -236,9 +250,10 @@ void tcpblaster_client(void)
           sendtotal  = 0;
           partials   = 0;
           totallost  = 0;
+          groupcount++;
 
-          (void)clock_gettime(CLOCK_REALTIME, &start);
-       }
+          clock_gettime(CLOCK_REALTIME, &start);
+        }
     }
 
   free(outbuf);

examples/tcpblaster/tcpblaster_cmdline.c

@@ -51,37 +51,10 @@
 
 #ifdef CONFIG_EXAMPLES_TCPBLASTER_IPv6
 
-uint16_t g_tcpblasterserver_ipv6[8] =
-{
-#if defined(CONFIG_EXAMPLES_TCPBLASTER_LOOPBACK) && defined(NET_LOOPBACK)
-  0        /* Use the loopback address */
-  0
-  0
-  0
-  0
-  0
-  0
-  HTONS(1);
-#else
-  HTONS(CONFIG_EXAMPLES_TCPBLASTER_SERVERIPv6ADDR_1),
-  HTONS(CONFIG_EXAMPLES_TCPBLASTER_SERVERIPv6ADDR_2),
-  HTONS(CONFIG_EXAMPLES_TCPBLASTER_SERVERIPv6ADDR_3),
-  HTONS(CONFIG_EXAMPLES_TCPBLASTER_SERVERIPv6ADDR_4),
-  HTONS(CONFIG_EXAMPLES_TCPBLASTER_SERVERIPv6ADDR_5),
-  HTONS(CONFIG_EXAMPLES_TCPBLASTER_SERVERIPv6ADDR_6),
-  HTONS(CONFIG_EXAMPLES_TCPBLASTER_SERVERIPv6ADDR_7),
-  HTONS(CONFIG_EXAMPLES_TCPBLASTER_SERVERIPv6ADDR_8)
-#endif
-};
+uint16_t g_tcpblasterserver_ipv6[8];
 
 #else
-
-#if defined(CONFIG_EXAMPLES_TCPBLASTER_LOOPBACK) && defined(NET_LOOPBACK)
-uint32_t g_tcpblasterserver_ipv4 = HTONL(0x7f000001);
-#else
-uint32_t g_tcpblasterserver_ipv4 = HTONL(CONFIG_EXAMPLES_TCPBLASTER_SERVERIP);
-#endif
-
+uint32_t g_tcpblasterserver_ipv4;
 #endif
 
 /****************************************************************************
@@ -108,8 +81,47 @@ static void show_usage(FAR const char *progname)
 
 void tcpblaster_cmdline(int argc, char **argv)
 {
+  /* Init the default IP address. */
+
+#ifdef CONFIG_EXAMPLES_TCPBLASTER_IPv6
+#  if defined(CONFIG_EXAMPLES_TCPBLASTER_LOOPBACK) && \
+      defined(CONFIG_NET_LOOPBACK)
+  g_tcpblasterserver_ipv6[0] = 0;
+  g_tcpblasterserver_ipv6[1] = 0;
+  g_tcpblasterserver_ipv6[2] = 0;
+  g_tcpblasterserver_ipv6[3] = 0;
+  g_tcpblasterserver_ipv6[4] = 0;
+  g_tcpblasterserver_ipv6[5] = 0;
+  g_tcpblasterserver_ipv6[6] = 0;
+  g_tcpblasterserver_ipv6[7] = HTONS(1);
+#  else
+  g_tcpblasterserver_ipv6[0] =
+    HTONS(CONFIG_EXAMPLES_TCPBLASTER_SERVERIPv6ADDR_1);
+  g_tcpblasterserver_ipv6[1] =
+    HTONS(CONFIG_EXAMPLES_TCPBLASTER_SERVERIPv6ADDR_2);
+  g_tcpblasterserver_ipv6[2] =
+    HTONS(CONFIG_EXAMPLES_TCPBLASTER_SERVERIPv6ADDR_3);
+  g_tcpblasterserver_ipv6[3] =
+    HTONS(CONFIG_EXAMPLES_TCPBLASTER_SERVERIPv6ADDR_4);
+  g_tcpblasterserver_ipv6[4] =
+    HTONS(CONFIG_EXAMPLES_TCPBLASTER_SERVERIPv6ADDR_5);
+  g_tcpblasterserver_ipv6[5] =
+    HTONS(CONFIG_EXAMPLES_TCPBLASTER_SERVERIPv6ADDR_6);
+  g_tcpblasterserver_ipv6[6] =
+    HTONS(CONFIG_EXAMPLES_TCPBLASTER_SERVERIPv6ADDR_7);
+  g_tcpblasterserver_ipv6[7] =
+    HTONS(CONFIG_EXAMPLES_TCPBLASTER_SERVERIPv6ADDR_8);
+#  endif
+#else
+#  if defined(CONFIG_EXAMPLES_TCPBLASTER_LOOPBACK) && defined(CONFIG_NET_LOOPBACK)
+  g_tcpblasterserver_ipv4 = HTONL(0x7f000001);
+#  else
+  g_tcpblasterserver_ipv4 = HTONL(CONFIG_EXAMPLES_TCPBLASTER_SERVERIP);
+#  endif
+#endif
+
   /* Currently only a single command line option is supported:  The server
-   * IP address.
+   * IP address. Used to override default.
    */
 
   if (argc == 2)

examples/tcpblaster/tcpblaster_host.c

@@ -54,6 +54,10 @@
 
 int main(int argc, char **argv, char **envp)
 {
+  /* Parse any command line options */
+
+  tcpblaster_cmdline(argc, argv);
+
 #ifdef CONFIG_EXAMPLES_TCPBLASTER_SERVER
   tcpblaster_client();
 #else