Compare commits

...

4 Commits

Author SHA1 Message Date
Stefan Bühler ad66680e62 [core] put HEDLEY_NO_RETURN at front of declaration 2 months ago
Stefan Bühler ff500e9c8b [core] use IPPROTO_TCP instead of SOL_TCP for TCP_FASTOPEN (#3071) 2 months ago
Stefan Bühler b006006131 [core] support workers.cpu_affinity on FreeBSD (#3071) 2 months ago
Stefan Bühler a5c2238277 [core] check cpu index in cpu_affinity handling 2 months ago
  1. 2
      include/lighttpd/server.h
  2. 4
      include/lighttpd/settings.h
  3. 2
      include/lighttpd/utils.h
  4. 4
      src/angel/angel_plugin_core.c
  5. 2
      src/main/angel_fake.c
  6. 90
      src/main/plugin_core.c

2
include/lighttpd/server.h

@ -63,7 +63,7 @@ struct liServer {
liWorker *main_worker;
guint worker_count;
GArray *workers;
#ifdef LIGHTY_OS_LINUX
#if defined(LIGHTY_OS_LINUX) || defined(LIGHTY_OS_FREEBSD)
liValue *workers_cpu_affinity;
#endif
GArray *ts_formats; /** array of (GString*), add with li_server_ts_format_add() */

4
include/lighttpd/settings.h

@ -99,6 +99,10 @@
# include <sched.h>
#endif
#if defined(LIGHTY_OS_FREEBSD)
# include <sys/cpuset.h>
#endif
/* on linux 2.4.x you get either sendfile or LFS */
#if defined(LIGHTY_OS_LINUX) && defined(HAVE_SYS_SENDFILE_H) && defined(HAVE_SENDFILE) && (defined(_LARGEFILE_SOURCE) || defined(HAVE_SENDFILE64)) && defined(HAVE_WRITEV) && !defined(HAVE_SENDFILE_BROKEN)
# define USE_LINUX_SENDFILE

2
include/lighttpd/utils.h

@ -10,7 +10,7 @@ typedef enum {
} liCounterType;
/* log message, print backtrace, and abort() (use LI_FATAL(msg) to call it) */
LI_API void li_fatal(const char *filename, unsigned int line, const char *function, const char *msg) HEDLEY_NO_RETURN;
LI_API HEDLEY_NO_RETURN void li_fatal(const char *filename, unsigned int line, const char *function, const char *msg);
/* if libunwind is available this prints a backtrace to STDERR */
LI_API void li_print_backtrace_stderr(void);
/* LI_FORCE_ASSERT is *always* active - in debug and release builds */

4
src/angel/angel_plugin_core.c

@ -628,7 +628,7 @@ static int do_listen(liServer *srv, liSocketAddress *addr, GString *str) {
}
#ifdef TCP_FASTOPEN
v = 1000;
setsockopt(s, SOL_TCP, TCP_FASTOPEN, &v, sizeof(v));
setsockopt(s, IPPROTO_TCP, TCP_FASTOPEN, &v, sizeof(v));
#endif
if (-1 == listen(s, 1000)) {
close(s);
@ -668,7 +668,7 @@ static int do_listen(liServer *srv, liSocketAddress *addr, GString *str) {
}
#ifdef TCP_FASTOPEN
v = 1000;
setsockopt(s, SOL_TCP, TCP_FASTOPEN, &v, sizeof(v));
setsockopt(s, IPPROTO_TCP, TCP_FASTOPEN, &v, sizeof(v));
#endif
if (-1 == listen(s, 1000)) {
close(s);

2
src/main/angel_fake.c

@ -76,7 +76,7 @@ int li_angel_fake_listen(liServer *srv, GString *str) {
}
#ifdef TCP_FASTOPEN
v = 1000;
setsockopt(s, SOL_TCP, TCP_FASTOPEN, &v, sizeof(v));
setsockopt(s, IPPROTO_TCP, TCP_FASTOPEN, &v, sizeof(v));
#endif
if (-1 == listen(s, 1000)) {
ERROR(srv, "Couldn't listen on '%s': %s", tmpstr->str, g_strerror(errno));

90
src/main/plugin_core.c

@ -1205,7 +1205,7 @@ static gboolean core_workers(liServer *srv, liPlugin* p, liValue *val, gpointer
}
static gboolean core_workers_cpu_affinity(liServer *srv, liPlugin* p, liValue *val, gpointer userdata) {
#if defined(LIGHTY_OS_LINUX)
#if defined(LIGHTY_OS_LINUX) || defined(LIGHTY_OS_FREEBSD)
UNUSED(p); UNUSED(userdata);
if (LI_VALUE_LIST != li_value_type(val)) {
@ -1232,7 +1232,7 @@ static gboolean core_workers_cpu_affinity(liServer *srv, liPlugin* p, liValue *v
return TRUE;
#else
UNUSED(p); UNUSED(val); UNUSED(userdata);
ERROR(srv, "%s", "workers.cpu_affinity is only available on Linux systems");
ERROR(srv, "%s", "workers.cpu_affinity is only available on Linux and FreeBSD systems");
return FALSE;
#endif
}
@ -2160,47 +2160,81 @@ static const liPluginAngel angelcbs[] = {
};
#include <sys/types.h>
static void plugin_core_prepare_worker(liServer *srv, liPlugin *p, liWorker *wrk) {
UNUSED(p);
#if defined(LIGHTY_OS_LINUX) || defined(LIGHTY_OS_FREEBSD)
/* settings CPU affinity is only supported on linux and FreeBSD */
#if defined(LIGHTY_OS_LINUX)
/* sched_setaffinity is only available on linux */
{
cpu_set_t mask;
liValue *v = srv->workers_cpu_affinity;
typedef cpu_set_t li_cpu_set_t;
#elif defined(LIGHTY_OS_FREEBSD)
typedef cpuset_t li_cpu_set_t;
#endif
if (NULL == v) return;
static gboolean pin_cpu(liServer *srv, liWorker *wrk, li_cpu_set_t *cpu_set, gint64 ndx) {
size_t cpu_ndx;
if (wrk->ndx >= li_value_list_len(v)) {
WARNING(srv, "worker #%u has no entry in workers.cpu_affinity", wrk->ndx+1);
return;
}
if (ndx < 0 || ((guint64)ndx) > CPU_SETSIZE) {
ERROR(srv, "invalid cpu affinity index for worker #%u: %"G_GINT64_FORMAT, wrk->ndx+1, ndx);
return FALSE;
}
cpu_ndx = (size_t) ndx;
CPU_SET(cpu_ndx, cpu_set);
return TRUE;
}
CPU_ZERO(&mask);
static void plugin_core_prepare_worker_cpu_affinity(liServer *srv, liWorker *wrk) {
li_cpu_set_t mask;
liValue *v = srv->workers_cpu_affinity;
v = li_value_list_at(v, wrk->ndx);
if (LI_VALUE_NUMBER == li_value_type(v)) {
CPU_SET(v->data.number, &mask);
DEBUG(srv, "binding worker #%u to cpu %u", wrk->ndx+1, (guint)v->data.number);
} else {
g_string_truncate(wrk->tmp_str, 0);
if (NULL == v) return;
LI_VALUE_FOREACH(entry, v)
CPU_SET(entry->data.number, &mask);
g_string_append_printf(wrk->tmp_str, _entry_i ? ",%u":"%u", (guint)entry->data.number);
LI_VALUE_END_FOREACH()
if (wrk->ndx >= li_value_list_len(v)) {
WARNING(srv, "worker #%u has no entry in workers.cpu_affinity", wrk->ndx+1);
return;
}
DEBUG(srv, "binding worker #%u to cpus %s", wrk->ndx+1, wrk->tmp_str->str);
}
CPU_ZERO(&mask);
if (0 != sched_setaffinity(0, sizeof(mask), &mask)) {
ERROR(srv, "couldn't set cpu affinity mask for worker #%u: %s", wrk->ndx, g_strerror(errno));
v = li_value_list_at(v, wrk->ndx);
if (LI_VALUE_NUMBER == li_value_type(v)) {
if (!pin_cpu(srv, wrk, &mask, v->data.number)) {
return; /* pin_cpu already printed error */
}
DEBUG(srv, "binding worker #%u to cpu %u", wrk->ndx+1, (guint)v->data.number);
} else {
g_string_truncate(wrk->tmp_str, 0);
LI_VALUE_FOREACH(entry, v)
if (!pin_cpu(srv, wrk, &mask, entry->data.number)) {
return; /* pin_cpu already printed error */
}
g_string_append_printf(wrk->tmp_str, _entry_i ? ",%u":"%u", (guint)entry->data.number);
LI_VALUE_END_FOREACH()
DEBUG(srv, "binding worker #%u to cpus %s", wrk->ndx+1, wrk->tmp_str->str);
}
#if defined(LIGHTY_OS_LINUX)
if (0 != sched_setaffinity(0, sizeof(mask), &mask)) {
ERROR(srv, "couldn't set cpu affinity mask for worker #%u: %s", wrk->ndx+1, g_strerror(errno));
}
#elif defined(LIGHTY_OS_FREEBSD)
if (0 != cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_TID, -1, sizeof(mask), &mask)) {
ERROR(srv, "couldn't set cpu affinity mask for worker #%u: %s", wrk->ndx+1, g_strerror(errno));
}
#endif
}
#else
static void plugin_core_prepare_worker_cpu_affinity(liServer *srv, liWorker *wrk) {
UNUSED(srv);
UNUSED(wrk);
}
#endif
static void plugin_core_prepare_worker(liServer *srv, liPlugin *p, liWorker *wrk) {
UNUSED(p);
plugin_core_prepare_worker_cpu_affinity(srv, wrk);
}
void li_plugin_core_init(liServer *srv, liPlugin *p, gpointer userdata) {

Loading…
Cancel
Save