commit 3fb6d911e938e5fb4e1be0a6494d181b3b6711a5
parent efbf50c0d22b0c27088d05b707773433371cc9c1
Author: Christian Grothoff <christian@grothoff.org>
Date: Sun, 23 Jun 2013 10:50:05 +0000
-benchmark for latency measurements and epoll demonstration
Diffstat:
3 files changed, 165 insertions(+), 3 deletions(-)
diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am
@@ -25,6 +25,7 @@ endif
# example programs
noinst_PROGRAMS = \
+ benchmark \
minimal_example \
dual_stack_example \
minimal_example_comet \
@@ -73,6 +74,11 @@ demo_LDADD = \
$(top_builddir)/src/microhttpd/libmicrohttpd.la \
-lmagic
+benchmark_SOURCES = \
+ benchmark.c
+benchmark_LDADD = \
+ $(top_builddir)/src/microhttpd/libmicrohttpd.la
+
dual_stack_example_SOURCES = \
dual_stack_example.c
dual_stack_example_LDADD = \
diff --git a/src/examples/benchmark.c b/src/examples/benchmark.c
@@ -0,0 +1,147 @@
+/*
+ This file is part of libmicrohttpd
+ (C) 2007, 2013 Christian Grothoff (and other contributing authors)
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+/**
+ * @file benchmark.c
+ * @brief minimal code to benchmark MHD GET performance
+ * @author Christian Grothoff
+ */
+
+#include "platform.h"
+#include <microhttpd.h>
+
+#define PAGE "<html><head><title>libmicrohttpd demo</title></head><body>libmicrohttpd demo</body></html>"
+
+
+#define SMALL (1024 * 128)
+
+/**
+ * Number of threads to run in the thread pool. Should (roughly) match
+ * the number of cores on your system.
+ */
+#define NUMBER_OF_THREADS 4
+
+static unsigned int small_deltas[SMALL];
+
+static struct MHD_Response *response;
+
+
+
+/**
+ * Signature of the callback used by MHD to notify the
+ * application about completed requests.
+ *
+ * @param cls client-defined closure
+ * @param connection connection handle
+ * @param con_cls value as set by the last call to
+ * the MHD_AccessHandlerCallback
+ * @param toe reason for request termination
+ * @see MHD_OPTION_NOTIFY_COMPLETED
+ */
+static void
+completed_callback (void *cls,
+ struct MHD_Connection *connection,
+ void **con_cls,
+ enum MHD_RequestTerminationCode toe)
+{
+ struct timeval *tv = *con_cls;
+ struct timeval tve;
+ uint64_t delta;
+
+ if (NULL == tv)
+ return;
+ gettimeofday (&tve, NULL);
+
+ delta = 0;
+ if (tve.tv_usec >= tv->tv_usec)
+ delta += (tve.tv_sec - tv->tv_sec) * 1000000LL
+ + (tve.tv_usec - tv->tv_usec);
+ else
+ delta += (tve.tv_sec - tv->tv_sec) * 1000000LL
+ - tv->tv_usec + tve.tv_usec;
+ if (delta < SMALL)
+ small_deltas[delta]++;
+ else
+ fprintf (stdout, "D: %llu 1\n", (unsigned long long) delta);
+ free (tv);
+}
+
+
+static void *
+uri_logger_cb (void *cls,
+ const char *uri)
+{
+ struct timeval *tv = malloc (sizeof (struct timeval));
+
+ if (NULL != tv)
+ gettimeofday (tv, NULL);
+ return tv;
+}
+
+
+static int
+ahc_echo (void *cls,
+ struct MHD_Connection *connection,
+ const char *url,
+ const char *method,
+ const char *version,
+ const char *upload_data, size_t *upload_data_size, void **ptr)
+{
+ if (0 != strcmp (method, "GET"))
+ return MHD_NO; /* unexpected method */
+ return MHD_queue_response (connection, MHD_HTTP_OK, response);
+}
+
+
+int
+main (int argc, char *const *argv)
+{
+ struct MHD_Daemon *d;
+ unsigned int i;
+
+ if (argc != 2)
+ {
+ printf ("%s PORT\n", argv[0]);
+ return 1;
+ }
+ response = MHD_create_response_from_buffer (strlen (PAGE),
+ (void *) PAGE,
+ MHD_RESPMEM_PERSISTENT);
+
+ d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY
+#if ! EPOLL_SUPPORT
+ | MHD_USE_EPOLL_LINUX_ONLY
+#endif
+ ,
+ atoi (argv[1]),
+ NULL, NULL, &ahc_echo, NULL,
+ MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 120,
+ MHD_OPTION_THREAD_POOL_SIZE, (unsigned int) NUMBER_OF_THREADS,
+ MHD_OPTION_URI_LOG_CALLBACK, &uri_logger_cb, NULL,
+ MHD_OPTION_NOTIFY_COMPLETED, &completed_callback, NULL,
+ MHD_OPTION_END);
+ if (d == NULL)
+ return 1;
+ (void) getc (stdin);
+ MHD_stop_daemon (d);
+ MHD_destroy_response (response);
+ for (i=0;i<SMALL;i++)
+ if (0 != small_deltas[i])
+ fprintf (stdout, "D: %d %u\n", i, small_deltas[i]);
+ return 0;
+}
diff --git a/src/examples/demo.c b/src/examples/demo.c
@@ -43,7 +43,7 @@
* Number of threads to run in the thread pool. Should (roughly) match
* the number of cores on your system.
*/
-#define NUMBER_OF_THREADS 8
+#define NUMBER_OF_THREADS 4
/**
* How many bytes of a file do we give to libmagic to determine the mime type?
@@ -362,6 +362,9 @@ update_directory ()
rdc.buf,
MHD_RESPMEM_MUST_FREE);
mark_as_html (response);
+ (void) MHD_add_response_header (response,
+ MHD_HTTP_HEADER_CONNECTION,
+ "close");
update_cached_response (response);
}
@@ -859,12 +862,18 @@ main (int argc, char *const *argv)
MHD_RESPMEM_PERSISTENT);
mark_as_html (internal_error_response);
update_directory ();
- d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY,
+ d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG
+#if EPOLL_SUPPORT
+ | MHD_USE_EPOLL_LINUX_ONLY
+#endif
+ ,
port,
NULL, NULL,
&generate_page, NULL,
- MHD_OPTION_CONNECTION_MEMORY_LIMIT, (size_t) (256 * 1024),
+ MHD_OPTION_CONNECTION_MEMORY_LIMIT, (size_t) (256 * 1024),
+#if PRODUCTION
MHD_OPTION_PER_IP_CONNECTION_LIMIT, (unsigned int) (64),
+#endif
MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) (120 /* seconds */),
MHD_OPTION_THREAD_POOL_SIZE, (unsigned int) NUMBER_OF_THREADS,
MHD_OPTION_NOTIFY_COMPLETED, &response_completed_callback, NULL,
