|
|
|
#include "first.h"
|
|
|
|
|
|
|
|
#include "base.h"
|
|
|
|
#include "log.h"
|
|
|
|
#include "buffer.h"
|
|
|
|
#include "http_chunk.h"
|
|
|
|
#include "http_etag.h"
|
|
|
|
#include "http_header.h"
|
|
|
|
#include "response.h" /* http_response_send_1xx() */
|
|
|
|
|
|
|
|
#include "plugin.h"
|
|
|
|
|
|
|
|
#include "mod_magnet_cache.h"
|
|
|
|
#include "sock_addr.h"
|
|
|
|
#include "stat_cache.h"
|
|
|
|
#include "status_counter.h"
|
|
|
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <setjmp.h>
|
|
|
|
|
|
|
|
#include <lua.h>
|
|
|
|
#include <lauxlib.h>
|
|
|
|
|
|
|
|
#define LUA_RIDX_LIGHTTPD_REQUEST "lighty.request"
|
|
|
|
|
|
|
|
#define MAGNET_RESTART_REQUEST 99
|
|
|
|
|
|
|
|
/* plugin config for all request/connections */
|
|
|
|
|
|
|
|
static jmp_buf exceptionjmp;
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
script * const *url_raw;
|
|
|
|
script * const *physical_path;
|
|
|
|
script * const *response_start;
|
|
|
|
int stage;
|
|
|
|
} plugin_config;
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
PLUGIN_DATA;
|
|
|
|
plugin_config defaults;
|
|
|
|
plugin_config conf;
|
|
|
|
|
|
|
|
script_cache cache;
|
|
|
|
} plugin_data;
|
|
|
|
|
|
|
|
INIT_FUNC(mod_magnet_init) {
|
|
|
|
return calloc(1, sizeof(plugin_data));
|
|
|
|
}
|
|
|
|
|
|
|
|
FREE_FUNC(mod_magnet_free) {
|
|
|
|
plugin_data * const p = p_d;
|
|
|
|
script_cache_free_data(&p->cache);
|
|
|
|
if (NULL == p->cvlist) return;
|
|
|
|
/* (init i to 0 if global context; to 1 to skip empty global context) */
|
|
|
|
for (int i = !p->cvlist[0].v.u2[1], used = p->nconfig; i < used; ++i) {
|
|
|
|
config_plugin_value_t *cpv = p->cvlist + p->cvlist[i].v.u2[0];
|
|
|
|
for (; -1 != cpv->k_id; ++cpv) {
|
|
|
|
if (cpv->vtype != T_CONFIG_LOCAL || NULL == cpv->v.v) continue;
|
|
|
|
switch (cpv->k_id) {
|
|
|
|
case 0: /* magnet.attract-raw-url-to */
|
|
|
|
case 1: /* magnet.attract-physical-path-to */
|
|
|
|
case 2: /* magnet.attract-response-start-to */
|
|
|
|
free(cpv->v.v);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void mod_magnet_merge_config_cpv(plugin_config * const pconf, const config_plugin_value_t * const cpv) {
|
|
|
|
if (cpv->vtype != T_CONFIG_LOCAL)
|
|
|
|
return;
|
|
|
|
switch (cpv->k_id) { /* index into static config_plugin_keys_t cpk[] */
|
|
|
|
case 0: /* magnet.attract-raw-url-to */
|
|
|
|
pconf->url_raw = cpv->v.v;
|
|
|
|
break;
|
|
|
|
case 1: /* magnet.attract-physical-path-to */
|
|
|
|
pconf->physical_path = cpv->v.v;
|
|
|
|
break;
|
|
|
|
case 2: /* magnet.attract-response-start-to */
|
|
|
|
pconf->response_start = cpv->v.v;
|
|
|
|
break;
|
|
|
|
default:/* should not happen */
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void mod_magnet_merge_config(plugin_config * const pconf, const config_plugin_value_t *cpv) {
|
|
|
|
do {
|
|
|
|
mod_magnet_merge_config_cpv(pconf, cpv);
|
|
|
|
} while ((++cpv)->k_id != -1);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void mod_magnet_patch_config(request_st * const r, plugin_data * const p) {
|
|
|
|
p->conf = p->defaults; /* copy small struct instead of memcpy() */
|
|
|
|
/*memcpy(&p->conf, &p->defaults, sizeof(plugin_config));*/
|
|
|
|
for (int i = 1, used = p->nconfig; i < used; ++i) {
|
|
|
|
if (config_check_cond(r, (uint32_t)p->cvlist[i].k_id))
|
|
|
|
mod_magnet_merge_config(&p->conf, p->cvlist + p->cvlist[i].v.u2[0]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
SETDEFAULTS_FUNC(mod_magnet_set_defaults) {
|
|
|
|
static const config_plugin_keys_t cpk[] = {
|
|
|
|
{ CONST_STR_LEN("magnet.attract-raw-url-to"),
|
|
|
|
T_CONFIG_ARRAY_VLIST,
|
|
|
|
T_CONFIG_SCOPE_CONNECTION }
|
|
|
|
,{ CONST_STR_LEN("magnet.attract-physical-path-to"),
|
|
|
|
T_CONFIG_ARRAY_VLIST,
|
|
|
|
T_CONFIG_SCOPE_CONNECTION }
|
|
|
|
,{ CONST_STR_LEN("magnet.attract-response-start-to"),
|
|
|
|
T_CONFIG_ARRAY_VLIST,
|
|
|
|
T_CONFIG_SCOPE_CONNECTION }
|
|
|
|
,{ NULL, 0,
|
|
|
|
T_CONFIG_UNSET,
|
|
|
|
T_CONFIG_SCOPE_UNSET }
|
|
|
|
};
|
|
|
|
|
|
|
|
plugin_data * const p = p_d;
|
|
|
|
if (!config_plugin_values_init(srv, p, cpk, "mod_magnet"))
|
|
|
|
return HANDLER_ERROR;
|
|
|
|
|
|
|
|
/* process and validate config directives
|
|
|
|
* (init i to 0 if global context; to 1 to skip empty global context) */
|
|
|
|
for (int i = !p->cvlist[0].v.u2[1]; i < p->nconfig; ++i) {
|
|
|
|
config_plugin_value_t *cpv = p->cvlist + p->cvlist[i].v.u2[0];
|
|
|
|
for (; -1 != cpv->k_id; ++cpv) {
|
|
|
|
switch (cpv->k_id) {
|
|
|
|
case 0: /* magnet.attract-raw-url-to */
|
|
|
|
case 1: /* magnet.attract-physical-path-to */
|
|
|
|
case 2: /* magnet.attract-response-start-to */
|
|
|
|
if (0 == cpv->v.a->used) {
|
|
|
|
cpv->v.v = NULL;
|
|
|
|
cpv->vtype = T_CONFIG_LOCAL;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
script ** const a =
|
|
|
|
malloc(sizeof(script *)*(cpv->v.a->used+1));
|
|
|
|
force_assert(a);
|
|
|
|
for (uint32_t j = 0; j < cpv->v.a->used; ++j) {
|
|
|
|
data_string *ds = (data_string *)cpv->v.a->data[j];
|
|
|
|
if (buffer_is_blank(&ds->value)) {
|
|
|
|
log_error(srv->errh, __FILE__, __LINE__,
|
|
|
|
"unexpected (blank) value for %s; "
|
|
|
|
"expected list of \"scriptpath\"", cpk[cpv->k_id].k);
|
|
|
|
free(a);
|
|
|
|
return HANDLER_ERROR;
|
|
|
|
}
|
|
|
|
a[j] = script_cache_get_script(&p->cache, &ds->value);
|
|
|
|
}
|
|
|
|
a[cpv->v.a->used] = NULL;
|
|
|
|
cpv->v.v = a;
|
|
|
|
cpv->vtype = T_CONFIG_LOCAL;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:/* should not happen */
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* initialize p->defaults from global config context */
|
|
|
|
if (p->nconfig > 0 && p->cvlist->v.u2[1]) {
|
|
|
|
const config_plugin_value_t *cpv = p->cvlist + p->cvlist->v.u2[0];
|
|
|
|
if (-1 != cpv->k_id)
|
|
|
|
mod_magnet_merge_config(&p->defaults, cpv);
|
|
|
|
}
|
|
|
|
|
|
|
|
return HANDLER_GO_ON;
|
|
|
|
}
|
|
|
|
|
|
|
|
#if !defined(LUA_VERSION_NUM) || LUA_VERSION_NUM < 502
|
|
|
|
/* lua5.1 backward compat definition */
|
|
|
|
static void lua_pushglobaltable(lua_State *L) { /* (-0, +1, -) */
|
|
|
|
lua_pushvalue(L, LUA_GLOBALSINDEX);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
static void magnet_setfenv_mainfn(lua_State *L, int funcIndex) { /* (-1, 0, -) */
|
|
|
|
#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM >= 502
|
|
|
|
/* set "_ENV" upvalue, which should be the first upvalue of a "main" lua
|
|
|
|
* function if it uses any global names
|
|
|
|
*/
|
|
|
|
|
|
|
|
const char* first_upvalue_name = lua_getupvalue(L, funcIndex, 1);
|
|
|
|
if (NULL == first_upvalue_name) return; /* doesn't have any upvalues */
|
|
|
|
lua_pop(L, 1); /* only need the name of the upvalue, not the value */
|
|
|
|
|
|
|
|
if (0 != strcmp(first_upvalue_name, "_ENV")) return;
|
|
|
|
|
|
|
|
if (NULL == lua_setupvalue(L, funcIndex, 1)) {
|
|
|
|
/* pop value if lua_setupvalue didn't set the (not existing) upvalue */
|
|
|
|
lua_pop(L, 1);
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
lua_setfenv(L, funcIndex);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
#if !defined(LUA_VERSION_NUM) || LUA_VERSION_NUM < 502
|
|
|
|
/* lua 5.2 already supports __pairs */
|
|
|
|
|
|
|
|
/* See http://lua-users.org/wiki/GeneralizedPairsAndIpairs for implementation details.
|
|
|
|
* Override the default pairs() function to allow us to use a __pairs metakey
|
|
|
|
*/
|
|
|
|
static int magnet_pairs(lua_State *L) {
|
|
|
|
luaL_checkany(L, 1); /* "self" */
|
|
|
|
|
|
|
|
if (luaL_getmetafield(L, 1, "__pairs")) {
|
|
|
|
/* call __pairs(self) */
|
|
|
|
lua_pushvalue(L, 1);
|
|
|
|
lua_call(L, 1, 3);
|
|
|
|
} else {
|
|
|
|
/* call <original-pairs-method>(self) */
|
|
|
|
lua_pushvalue(L, lua_upvalueindex(1));
|
|
|
|
lua_pushvalue(L, 1);
|
|
|
|
lua_call(L, 1, 3);
|
|
|
|
}
|
|
|
|
return 3;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
static void magnet_push_buffer(lua_State *L, const buffer *b) {
|
[multiple] reduce redundant NULL buffer checks
This commit is a large set of code changes and results in removal of
hundreds, perhaps thousands, of CPU instructions, a portion of which
are on hot code paths.
Most (buffer *) used by lighttpd are not NULL, especially since buffers
were inlined into numerous larger structs such as request_st and chunk.
In the small number of instances where that is not the case, a NULL
check is often performed earlier in a function where that buffer is
later used with a buffer_* func. In the handful of cases that remained,
a NULL check was added, e.g. with r->http_host and r->conf.server_tag.
- check for empty strings at config time and set value to NULL if blank
string will be ignored at runtime; at runtime, simple pointer check
for NULL can be used to check for a value that has been set and is not
blank ("")
- use buffer_is_blank() instead of buffer_string_is_empty(),
and use buffer_is_unset() instead of buffer_is_empty(),
where buffer is known not to be NULL so that NULL check can be skipped
- use buffer_clen() instead of buffer_string_length() when buffer is
known not to be NULL (to avoid NULL check at runtime)
- use buffer_truncate() instead of buffer_string_set_length() to
truncate string, and use buffer_extend() to extend
Examples where buffer known not to be NULL:
- cpv->v.b from config_plugin_values_init is not NULL if T_CONFIG_BOOL
(though we might set it to NULL if buffer_is_blank(cpv->v.b))
- address of buffer is arg (&foo)
(compiler optimizer detects this in most, but not all, cases)
- buffer is checked for NULL earlier in func
- buffer is accessed in same scope without a NULL check (e.g. b->ptr)
internal behavior change:
callers must not pass a NULL buffer to some funcs.
- buffer_init_buffer() requires non-null args
- buffer_copy_buffer() requires non-null args
- buffer_append_string_buffer() requires non-null args
- buffer_string_space() requires non-null arg
1 year ago
|
|
|
if (b && !buffer_is_unset(b))
|
|
|
|
lua_pushlstring(L, BUF_PTR_LEN(b));
|
|
|
|
else
|
|
|
|
lua_pushnil(L);
|
|
|
|
}
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
static int magnet_array_get_element(lua_State *L, const array *a) {
|
|
|
|
/* __index: param 1 is the (empty) table the value was not found in */
|
|
|
|
size_t klen;
|
|
|
|
const char * const k = luaL_checklstring(L, 2, &klen);
|
|
|
|
const data_string * const ds = (const data_string *)
|
|
|
|
array_get_element_klen(a, k, klen);
|
|
|
|
magnet_push_buffer(L, NULL != ds ? &ds->value : NULL);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* Define a function that will iterate over an array* (in upval 1) using current position (upval 2) */
|
|
|
|
static int magnet_array_next(lua_State *L) {
|
|
|
|
data_unset *du;
|
|
|
|
data_string *ds;
|
|
|
|
data_integer *di;
|
|
|
|
|
|
|
|
size_t pos = lua_tointeger(L, lua_upvalueindex(1));
|
|
|
|
array *a = lua_touserdata(L, lua_upvalueindex(2));
|
|
|
|
|
|
|
|
lua_settop(L, 0);
|
|
|
|
|
|
|
|
if (pos >= a->used) return 0;
|
|
|
|
if (NULL != (du = a->data[pos])) {
|
[multiple] reduce redundant NULL buffer checks
This commit is a large set of code changes and results in removal of
hundreds, perhaps thousands, of CPU instructions, a portion of which
are on hot code paths.
Most (buffer *) used by lighttpd are not NULL, especially since buffers
were inlined into numerous larger structs such as request_st and chunk.
In the small number of instances where that is not the case, a NULL
check is often performed earlier in a function where that buffer is
later used with a buffer_* func. In the handful of cases that remained,
a NULL check was added, e.g. with r->http_host and r->conf.server_tag.
- check for empty strings at config time and set value to NULL if blank
string will be ignored at runtime; at runtime, simple pointer check
for NULL can be used to check for a value that has been set and is not
blank ("")
- use buffer_is_blank() instead of buffer_string_is_empty(),
and use buffer_is_unset() instead of buffer_is_empty(),
where buffer is known not to be NULL so that NULL check can be skipped
- use buffer_clen() instead of buffer_string_length() when buffer is
known not to be NULL (to avoid NULL check at runtime)
- use buffer_truncate() instead of buffer_string_set_length() to
truncate string, and use buffer_extend() to extend
Examples where buffer known not to be NULL:
- cpv->v.b from config_plugin_values_init is not NULL if T_CONFIG_BOOL
(though we might set it to NULL if buffer_is_blank(cpv->v.b))
- address of buffer is arg (&foo)
(compiler optimizer detects this in most, but not all, cases)
- buffer is checked for NULL earlier in func
- buffer is accessed in same scope without a NULL check (e.g. b->ptr)
internal behavior change:
callers must not pass a NULL buffer to some funcs.
- buffer_init_buffer() requires non-null args
- buffer_copy_buffer() requires non-null args
- buffer_append_string_buffer() requires non-null args
- buffer_string_space() requires non-null arg
1 year ago
|
|
|
lua_pushlstring(L, BUF_PTR_LEN(&du->key));
|
|
|
|
switch (du->type) {
|
|
|
|
case TYPE_STRING:
|
|
|
|
ds = (data_string *)du;
|
|
|
|
magnet_push_buffer(L, &ds->value);
|
|
|
|
break;
|
|
|
|
case TYPE_INTEGER:
|
|
|
|
di = (data_integer *)du;
|
|
|
|
lua_pushinteger(L, di->value);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
lua_pushnil(L);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Update our positional upval to reflect our new current position */
|
|
|
|
pos++;
|
|
|
|
lua_pushinteger(L, pos);
|
|
|
|
lua_replace(L, lua_upvalueindex(1));
|
|
|
|
|
|
|
|
/* Returning 2 items on the stack (key, value) */
|
|
|
|
return 2;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Create the closure necessary to iterate over the array *a with the above function */
|
|
|
|
static int magnet_array_pairs(lua_State *L, array *a) {
|
|
|
|
lua_pushinteger(L, 0); /* Push our current pos (the start) into upval 1 */
|
|
|
|
lua_pushlightuserdata(L, a); /* Push our array *a into upval 2 */
|
|
|
|
lua_pushcclosure(L, magnet_array_next, 2); /* Push our new closure with 2 upvals */
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static request_st * magnet_get_request(lua_State *L) {
|
|
|
|
lua_getfield(L, LUA_REGISTRYINDEX, LUA_RIDX_LIGHTTPD_REQUEST);
|
|
|
|
request_st * const r = lua_touserdata(L, -1);
|
|
|
|
lua_pop(L, 1);
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
const char *ptr;
|
|
|
|
size_t len;
|
|
|
|
} const_buffer;
|
|
|
|
|
|
|
|
static const_buffer magnet_checkconstbuffer(lua_State *L, int idx) {
|
|
|
|
const_buffer cb;
|
|
|
|
cb.ptr = luaL_checklstring(L, idx, &cb.len);
|
|
|
|
return cb;
|
|
|
|
}
|
|
|
|
|
[multiple] reduce redundant NULL buffer checks
This commit is a large set of code changes and results in removal of
hundreds, perhaps thousands, of CPU instructions, a portion of which
are on hot code paths.
Most (buffer *) used by lighttpd are not NULL, especially since buffers
were inlined into numerous larger structs such as request_st and chunk.
In the small number of instances where that is not the case, a NULL
check is often performed earlier in a function where that buffer is
later used with a buffer_* func. In the handful of cases that remained,
a NULL check was added, e.g. with r->http_host and r->conf.server_tag.
- check for empty strings at config time and set value to NULL if blank
string will be ignored at runtime; at runtime, simple pointer check
for NULL can be used to check for a value that has been set and is not
blank ("")
- use buffer_is_blank() instead of buffer_string_is_empty(),
and use buffer_is_unset() instead of buffer_is_empty(),
where buffer is known not to be NULL so that NULL check can be skipped
- use buffer_clen() instead of buffer_string_length() when buffer is
known not to be NULL (to avoid NULL check at runtime)
- use buffer_truncate() instead of buffer_string_set_length() to
truncate string, and use buffer_extend() to extend
Examples where buffer known not to be NULL:
- cpv->v.b from config_plugin_values_init is not NULL if T_CONFIG_BOOL
(though we might set it to NULL if buffer_is_blank(cpv->v.b))
- address of buffer is arg (&foo)
(compiler optimizer detects this in most, but not all, cases)
- buffer is checked for NULL earlier in func
- buffer is accessed in same scope without a NULL check (e.g. b->ptr)
internal behavior change:
callers must not pass a NULL buffer to some funcs.
- buffer_init_buffer() requires non-null args
- buffer_copy_buffer() requires non-null args
- buffer_append_string_buffer() requires non-null args
- buffer_string_space() requires non-null arg
1 year ago
|
|
|
static const buffer* magnet_checkbuffer(lua_State *L, int idx, buffer *b) {
|
|
|
|
const_buffer cb = magnet_checkconstbuffer(L, idx);
|
[multiple] reduce redundant NULL buffer checks
This commit is a large set of code changes and results in removal of
hundreds, perhaps thousands, of CPU instructions, a portion of which
are on hot code paths.
Most (buffer *) used by lighttpd are not NULL, especially since buffers
were inlined into numerous larger structs such as request_st and chunk.
In the small number of instances where that is not the case, a NULL
check is often performed earlier in a function where that buffer is
later used with a buffer_* func. In the handful of cases that remained,
a NULL check was added, e.g. with r->http_host and r->conf.server_tag.
- check for empty strings at config time and set value to NULL if blank
string will be ignored at runtime; at runtime, simple pointer check
for NULL can be used to check for a value that has been set and is not
blank ("")
- use buffer_is_blank() instead of buffer_string_is_empty(),
and use buffer_is_unset() instead of buffer_is_empty(),
where buffer is known not to be NULL so that NULL check can be skipped
- use buffer_clen() instead of buffer_string_length() when buffer is
known not to be NULL (to avoid NULL check at runtime)
- use buffer_truncate() instead of buffer_string_set_length() to
truncate string, and use buffer_extend() to extend
Examples where buffer known not to be NULL:
- cpv->v.b from config_plugin_values_init is not NULL if T_CONFIG_BOOL
(though we might set it to NULL if buffer_is_blank(cpv->v.b))
- address of buffer is arg (&foo)
(compiler optimizer detects this in most, but not all, cases)
- buffer is checked for NULL earlier in func
- buffer is accessed in same scope without a NULL check (e.g. b->ptr)
internal behavior change:
callers must not pass a NULL buffer to some funcs.
- buffer_init_buffer() requires non-null args
- buffer_copy_buffer() requires non-null args
- buffer_append_string_buffer() requires non-null args
- buffer_string_space() requires non-null arg
1 year ago
|
|
|
/* assign result into (buffer *), and return (const buffer *)
|
|
|
|
* (note: caller must not free result) */
|
|
|
|
*(const char **)&b->ptr = cb.ptr;
|
|
|
|
b->used = cb.len+1;
|
|
|
|
b->size = 0;
|
|
|
|
return b;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int magnet_print(lua_State *L) {
|
|
|
|
const_buffer cb = magnet_checkconstbuffer(L, 1);
|
|
|
|
request_st * const r = magnet_get_request(L);
|
|
|
|
log_error(r->conf.errh, __FILE__, __LINE__, "(lua-print) %s", cb.ptr);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int magnet_stat(lua_State *L) {
|
[multiple] reduce redundant NULL buffer checks
This commit is a large set of code changes and results in removal of
hundreds, perhaps thousands, of CPU instructions, a portion of which
are on hot code paths.
Most (buffer *) used by lighttpd are not NULL, especially since buffers
were inlined into numerous larger structs such as request_st and chunk.
In the small number of instances where that is not the case, a NULL
check is often performed earlier in a function where that buffer is
later used with a buffer_* func. In the handful of cases that remained,
a NULL check was added, e.g. with r->http_host and r->conf.server_tag.
- check for empty strings at config time and set value to NULL if blank
string will be ignored at runtime; at runtime, simple pointer check
for NULL can be used to check for a value that has been set and is not
blank ("")
- use buffer_is_blank() instead of buffer_string_is_empty(),
and use buffer_is_unset() instead of buffer_is_empty(),
where buffer is known not to be NULL so that NULL check can be skipped
- use buffer_clen() instead of buffer_string_length() when buffer is
known not to be NULL (to avoid NULL check at runtime)
- use buffer_truncate() instead of buffer_string_set_length() to
truncate string, and use buffer_extend() to extend
Examples where buffer known not to be NULL:
- cpv->v.b from config_plugin_values_init is not NULL if T_CONFIG_BOOL
(though we might set it to NULL if buffer_is_blank(cpv->v.b))
- address of buffer is arg (&foo)
(compiler optimizer detects this in most, but not all, cases)
- buffer is checked for NULL earlier in func
- buffer is accessed in same scope without a NULL check (e.g. b->ptr)
internal behavior change:
callers must not pass a NULL buffer to some funcs.
- buffer_init_buffer() requires non-null args
- buffer_copy_buffer() requires non-null args
- buffer_append_string_buffer() requires non-null args
- buffer_string_space() requires non-null arg
1 year ago
|
|
|
buffer stor; /*(note: do not free magnet_checkbuffer() result)*/
|
|
|
|
const buffer * const sb = magnet_checkbuffer(L, 1, &stor);
|
|
|
|
stat_cache_entry * const sce = (!buffer_is_blank(sb))
|
|
|
|
? stat_cache_get_entry(sb)
|
|
|
|
: NULL;
|
|
|
|
if (NULL == sce) {
|
|
|
|
lua_pushnil(L);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
lua_newtable(L); // return value
|
|
|
|
|
|
|
|
lua_pushboolean(L, S_ISREG(sce->st.st_mode));
|
|
|
|
lua_setfield(L, -2, "is_file");
|
|
|
|
|
|
|
|
lua_pushboolean(L, S_ISDIR(sce->st.st_mode));
|
|
|
|
lua_setfield(L, -2, "is_dir");
|
|
|
|
|
|
|
|
lua_pushboolean(L, S_ISCHR(sce->st.st_mode));
|
|
|
|
lua_setfield(L, -2, "is_char");
|
|
|
|
|
|
|
|
lua_pushboolean(L, S_ISBLK(sce->st.st_mode));
|
|
|
|
lua_setfield(L, -2, "is_block");
|
|
|
|
|
|
|
|
lua_pushboolean(L, S_ISSOCK(sce->st.st_mode));
|
|
|
|
lua_setfield(L, -2, "is_socket");
|
|
|
|
|
|
|
|
lua_pushboolean(L, S_ISLNK(sce->st.st_mode));
|
|
|
|
lua_setfield(L, -2, "is_link");
|
|
|
|
|
|
|
|
lua_pushboolean(L, S_ISFIFO(sce->st.st_mode));
|
|
|
|
lua_setfield(L, -2, "is_fifo");
|
|
|
|
|
|
|
|
lua_pushinteger(L, sce->st.st_mtime);
|
|
|
|
lua_setfield(L, -2, "st_mtime");
|
|
|
|
|
|
|
|
lua_pushinteger(L, sce->st.st_ctime);
|
|
|
|
lua_setfield(L, -2, "st_ctime");
|
|
|
|
|
|
|
|
lua_pushinteger(L, sce->st.st_atime);
|
|
|
|
lua_setfield(L, -2, "st_atime");
|
|
|
|
|
|
|
|
lua_pushinteger(L, sce->st.st_uid);
|
|
|
|
lua_setfield(L, -2, "st_uid");
|
|
|
|
|
|
|
|
lua_pushinteger(L, sce->st.st_gid);
|
|
|
|
lua_setfield(L, -2, "st_gid");
|
|
|
|
|
|
|
|
lua_pushinteger(L, sce->st.st_size);
|
|
|
|
lua_setfield(L, -2, "st_size");
|
|
|
|
|
|
|
|
lua_pushinteger(L, sce->st.st_ino);
|
|
|
|
lua_setfield(L, -2, "st_ino");
|
|
|
|
|
|
|
|
request_st * const r = magnet_get_request(L);
|
|
|
|
const buffer *etag = stat_cache_etag_get(sce, r->conf.etag_flags);
|
[multiple] reduce redundant NULL buffer checks
This commit is a large set of code changes and results in removal of
hundreds, perhaps thousands, of CPU instructions, a portion of which
are on hot code paths.
Most (buffer *) used by lighttpd are not NULL, especially since buffers
were inlined into numerous larger structs such as request_st and chunk.
In the small number of instances where that is not the case, a NULL
check is often performed earlier in a function where that buffer is
later used with a buffer_* func. In the handful of cases that remained,
a NULL check was added, e.g. with r->http_host and r->conf.server_tag.
- check for empty strings at config time and set value to NULL if blank
string will be ignored at runtime; at runtime, simple pointer check
for NULL can be used to check for a value that has been set and is not
blank ("")
- use buffer_is_blank() instead of buffer_string_is_empty(),
and use buffer_is_unset() instead of buffer_is_empty(),
where buffer is known not to be NULL so that NULL check can be skipped
- use buffer_clen() instead of buffer_string_length() when buffer is
known not to be NULL (to avoid NULL check at runtime)
- use buffer_truncate() instead of buffer_string_set_length() to
truncate string, and use buffer_extend() to extend
Examples where buffer known not to be NULL:
- cpv->v.b from config_plugin_values_init is not NULL if T_CONFIG_BOOL
(though we might set it to NULL if buffer_is_blank(cpv->v.b))
- address of buffer is arg (&foo)
(compiler optimizer detects this in most, but not all, cases)
- buffer is checked for NULL earlier in func
- buffer is accessed in same scope without a NULL check (e.g. b->ptr)
internal behavior change:
callers must not pass a NULL buffer to some funcs.
- buffer_init_buffer() requires non-null args
- buffer_copy_buffer() requires non-null args
- buffer_append_string_buffer() requires non-null args
- buffer_string_space() requires non-null arg
1 year ago
|
|
|
if (etag && !buffer_is_blank(etag)) {
|
|
|
|
lua_pushlstring(L, BUF_PTR_LEN(etag));
|
|
|
|
} else {
|
|
|
|
lua_pushnil(L);
|
|
|
|
}
|
|
|
|
lua_setfield(L, -2, "etag");
|
|
|
|
|
|
|
|
const buffer *content_type = stat_cache_content_type_get(sce, r);
|
[multiple] reduce redundant NULL buffer checks
This commit is a large set of code changes and results in removal of
hundreds, perhaps thousands, of CPU instructions, a portion of which
are on hot code paths.
Most (buffer *) used by lighttpd are not NULL, especially since buffers
were inlined into numerous larger structs such as request_st and chunk.
In the small number of instances where that is not the case, a NULL
check is often performed earlier in a function where that buffer is
later used with a buffer_* func. In the handful of cases that remained,
a NULL check was added, e.g. with r->http_host and r->conf.server_tag.
- check for empty strings at config time and set value to NULL if blank
string will be ignored at runtime; at runtime, simple pointer check
for NULL can be used to check for a value that has been set and is not
blank ("")
- use buffer_is_blank() instead of buffer_string_is_empty(),
and use buffer_is_unset() instead of buffer_is_empty(),
where buffer is known not to be NULL so that NULL check can be skipped
- use buffer_clen() instead of buffer_string_length() when buffer is
known not to be NULL (to avoid NULL check at runtime)
- use buffer_truncate() instead of buffer_string_set_length() to
truncate string, and use buffer_extend() to extend
Examples where buffer known not to be NULL:
- cpv->v.b from config_plugin_values_init is not NULL if T_CONFIG_BOOL
(though we might set it to NULL if buffer_is_blank(cpv->v.b))
- address of buffer is arg (&foo)
(compiler optimizer detects this in most, but not all, cases)
- buffer is checked for NULL earlier in func
- buffer is accessed in same scope without a NULL check (e.g. b->ptr)
internal behavior change:
callers must not pass a NULL buffer to some funcs.
- buffer_init_buffer() requires non-null args
- buffer_copy_buffer() requires non-null args
- buffer_append_string_buffer() requires non-null args
- buffer_string_space() requires non-null arg
1 year ago
|
|
|
if (content_type && !buffer_is_blank(content_type)) {
|
|
|
|
lua_pushlstring(L, BUF_PTR_LEN(content_type));
|
|
|
|
} else {
|
|
|
|
lua_pushnil(L);
|
|
|
|
}
|
|
|
|
lua_setfield(L, -2, "content-type");
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int magnet_atpanic(lua_State *L) {
|
|
|
|
request_st * const r = magnet_get_request(L);
|
|
|
|
log_error(r->conf.errh, __FILE__, __LINE__, "(lua-atpanic) %s",
|
|
|
|
lua_isstring(L, 1) ? lua_tostring(L, 1) : "");
|
|
|
|
longjmp(exceptionjmp, 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int magnet_reqhdr_get(lua_State *L) {
|
|
|
|
/* __index: param 1 is the (empty) table the value was not found in */
|
|
|
|
size_t klen;
|
|
|
|
const char * const k = luaL_checklstring(L, 2, &klen);
|
|
|
|
request_st * const r = magnet_get_request(L);
|
|
|
|
const int id = http_header_hkey_get(k, (uint32_t)klen);
|
|
|
|
const buffer * const vb = http_header_request_get(r, id, k, klen);
|
|
|
|
magnet_push_buffer(L, NULL != vb ? vb : NULL);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int magnet_reqhdr_pairs(lua_State *L) {
|
|
|
|
request_st * const r = magnet_get_request(L);
|
|
|
|
return magnet_array_pairs(L, &r->rqst_headers);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int magnet_status_get(lua_State *L) {
|
|
|
|
/* __index: param 1 is the (empty) table the value was not found in */
|
|
|
|
const_buffer key = magnet_checkconstbuffer(L, 2);
|
|
|
|
int *i = status_counter_get_counter(key.ptr, key.len);
|
|
|
|
lua_pushinteger(L, (lua_Integer)*i);
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int magnet_status_set(lua_State *L) {
|
|
|
|
/* __newindex: param 1 is the (empty) table the value is supposed to be set in */
|
|
|
|
const_buffer key = magnet_checkconstbuffer(L, 2);
|
|
|
|
int counter = (int) luaL_checkinteger(L, 3);
|
|
|
|
|
|
|
|
status_counter_set(key.ptr, key.len, counter);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int magnet_status_pairs(lua_State *L) {
|
|
|
|
return magnet_array_pairs(L, &plugin_stats);
|
|
|
|
}
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
const char *name;
|
|
|
|
enum {
|
|
|
|
MAGNET_ENV_UNSET,
|
|
|
|
|
|
|
|
MAGNET_ENV_PHYSICAL_PATH,
|
|
|
|
MAGNET_ENV_PHYSICAL_REL_PATH,
|
|
|
|
MAGNET_ENV_PHYSICAL_DOC_ROOT,
|
|
|
|
MAGNET_ENV_PHYSICAL_BASEDIR,
|
|
|
|
|
|
|
|
MAGNET_ENV_URI_PATH,
|
|
|
|
MAGNET_ENV_URI_PATH_RAW,
|
|
|
|
MAGNET_ENV_URI_SCHEME,
|
|
|
|
MAGNET_ENV_URI_AUTHORITY,
|
|
|
|
MAGNET_ENV_URI_QUERY,
|
|
|
|
|
|
|
|
MAGNET_ENV_REQUEST_METHOD,
|
|
|
|
MAGNET_ENV_REQUEST_URI,
|
|
|
|
MAGNET_ENV_REQUEST_ORIG_URI,
|
|
|
|
MAGNET_ENV_REQUEST_PATH_INFO,
|
|
|
|
MAGNET_ENV_REQUEST_REMOTE_IP,
|
|
|
|
MAGNET_ENV_REQUEST_SERVER_ADDR,
|
|
|
|
MAGNET_ENV_REQUEST_PROTOCOL,
|
|
|
|
|
|
|
|
MAGNET_ENV_RESPONSE_HTTP_STATUS,
|
|
|
|
MAGNET_ENV_RESPONSE_BODY_LENGTH,
|
|
|
|
MAGNET_ENV_RESPONSE_BODY
|
|
|
|
} type;
|
|
|
|
} magnet_env_t;
|
|
|
|
|
|
|
|
static const magnet_env_t magnet_env[] = {
|
|
|
|
{ "physical.path", MAGNET_ENV_PHYSICAL_PATH },
|
|
|
|
{ "physical.rel-path", MAGNET_ENV_PHYSICAL_REL_PATH },
|
|
|
|
{ "physical.doc-root", MAGNET_ENV_PHYSICAL_DOC_ROOT },
|
|
|
|
{ "physical.basedir", MAGNET_ENV_PHYSICAL_BASEDIR },
|
|
|
|
|
|
|
|
{ "uri.path", MAGNET_ENV_URI_PATH },
|
|
|
|
{ "uri.path-raw", MAGNET_ENV_URI_PATH_RAW },
|
|
|
|
{ "uri.scheme", MAGNET_ENV_URI_SCHEME },
|
|
|
|
{ "uri.authority", MAGNET_ENV_URI_AUTHORITY },
|
|
|
|
{ "uri.query", MAGNET_ENV_URI_QUERY },
|
|
|
|
|
|
|
|
{ "request.method", MAGNET_ENV_REQUEST_METHOD },
|
|
|
|
{ "request.uri", MAGNET_ENV_REQUEST_URI },
|
|
|
|
{ "request.orig-uri", MAGNET_ENV_REQUEST_ORIG_URI },
|
|
|
|
{ "request.path-info", MAGNET_ENV_REQUEST_PATH_INFO },
|
|
|
|
{ "request.remote-ip", MAGNET_ENV_REQUEST_REMOTE_IP },
|
|
|
|
{ "request.remote-addr", MAGNET_ENV_REQUEST_REMOTE_IP },
|
|
|
|
{ "request.server-addr", MAGNET_ENV_REQUEST_SERVER_ADDR },
|
|
|
|
{ "request.protocol", MAGNET_ENV_REQUEST_PROTOCOL },
|
|
|
|
|
|
|
|
{ "response.http-status", MAGNET_ENV_RESPONSE_HTTP_STATUS },
|
|
|
|
{ "response.body-length", MAGNET_ENV_RESPONSE_BODY_LENGTH },
|
|
|
|
{ "response.body", MAGNET_ENV_RESPONSE_BODY },
|
|
|
|
|
|
|
|
{ NULL, MAGNET_ENV_UNSET }
|
|
|
|
};
|
|
|
|
|
|
|
|
static buffer *magnet_env_get_buffer_by_id(request_st * const r, int id) {
|
|
|
|
buffer *dest = NULL;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* map all internal variables to lua
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
switch (id) {
|
|
|
|
case MAGNET_ENV_PHYSICAL_PATH: dest = &r->physical.path; break;
|
|
|
|
case MAGNET_ENV_PHYSICAL_REL_PATH: dest = &r->physical.rel_path; break;
|
|
|
|
case MAGNET_ENV_PHYSICAL_DOC_ROOT: dest = &r->physical.doc_root; break;
|
|
|
|
case MAGNET_ENV_PHYSICAL_BASEDIR: dest = &r->physical.basedir; break;
|
|
|
|
|
|
|
|
case MAGNET_ENV_URI_PATH: dest = &r->uri.path; break;
|
|
|
|
case MAGNET_ENV_URI_PATH_RAW:
|
|
|
|
{
|
|
|
|
dest = r->tmp_buf;
|
|
|
|
buffer_clear(dest);
|
[multiple] reduce redundant NULL buffer checks
This commit is a large set of code changes and results in removal of
hundreds, perhaps thousands, of CPU instructions, a portion of which
are on hot code paths.
Most (buffer *) used by lighttpd are not NULL, especially since buffers
were inlined into numerous larger structs such as request_st and chunk.
In the small number of instances where that is not the case, a NULL
check is often performed earlier in a function where that buffer is
later used with a buffer_* func. In the handful of cases that remained,
a NULL check was added, e.g. with r->http_host and r->conf.server_tag.
- check for empty strings at config time and set value to NULL if blank
string will be ignored at runtime; at runtime, simple pointer check
for NULL can be used to check for a value that has been set and is not
blank ("")
- use buffer_is_blank() instead of buffer_string_is_empty(),
and use buffer_is_unset() instead of buffer_is_empty(),
where buffer is known not to be NULL so that NULL check can be skipped
- use buffer_clen() instead of buffer_string_length() when buffer is
known not to be NULL (to avoid NULL check at runtime)
- use buffer_truncate() instead of buffer_string_set_length() to
truncate string, and use buffer_extend() to extend
Examples where buffer known not to be NULL:
- cpv->v.b from config_plugin_values_init is not NULL if T_CONFIG_BOOL
(though we might set it to NULL if buffer_is_blank(cpv->v.b))
- address of buffer is arg (&foo)
(compiler optimizer detects this in most, but not all, cases)
- buffer is checked for NULL earlier in func
- buffer is accessed in same scope without a NULL check (e.g. b->ptr)
internal behavior change:
callers must not pass a NULL buffer to some funcs.
- buffer_init_buffer() requires non-null args
- buffer_copy_buffer() requires non-null args
- buffer_append_string_buffer() requires non-null args
- buffer_string_space() requires non-null arg
1 year ago
|
|
|
uint32_t len = buffer_clen(&r->target);
|
|
|
|
char *qmark = memchr(r->target.ptr, '?', len);
|
|
|
|
buffer_copy_string_len(dest, r->target.ptr, qmark ? (uint32_t)(qmark - r->target.ptr) : len);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case MAGNET_ENV_URI_SCHEME: dest = &r->uri.scheme; break;
|
|
|
|
case MAGNET_ENV_URI_AUTHORITY: dest = &r->uri.authority; break;
|
|
|
|
case MAGNET_ENV_URI_QUERY: dest = &r->uri.query; break;
|
|
|
|
|
|
|
|
case MAGNET_ENV_REQUEST_METHOD:
|
|
|
|
dest = r->tmp_buf;
|
|
|
|
buffer_clear(dest);
|
|
|
|
http_method_append(dest, r->http_method);
|
|
|
|
break;
|
|
|
|
case MAGNET_ENV_REQUEST_URI: dest = &r->target; break;
|
|
|
|
case MAGNET_ENV_REQUEST_ORIG_URI: dest = &r->target_orig; break;
|
|
|
|
case MAGNET_ENV_REQUEST_PATH_INFO: dest = &r->pathinfo; break;
|
|
|
|
case MAGNET_ENV_REQUEST_REMOTE_IP: dest = r->con->dst_addr_buf; break;
|
|
|
|
case MAGNET_ENV_REQUEST_SERVER_ADDR: /* local IP without port */
|
|
|
|
{
|
|
|
|
const server_socket * const srv_socket = r->con->srv_socket;
|
|
|
|
dest = r->tmp_buf;
|
|
|
|
buffer_clear(dest);
|
|
|
|
switch (sock_addr_get_family(&srv_socket->addr)) {
|
|
|
|
case AF_INET:
|
|
|
|
case AF_INET6:
|
|
|
|
if (sock_addr_is_addr_wildcard(&srv_socket->addr)) {
|
|
|
|
sock_addr addrbuf;
|
|
|
|
socklen_t addrlen = sizeof(addrbuf);
|
|
|
|
const int fd = r->con->fd;
|
|
|
|
if (0 == getsockname(fd,(struct sockaddr *)&addrbuf,&addrlen)) {
|
|
|
|
char buf[INET6_ADDRSTRLEN + 1];
|
|
|
|
const char *s = sock_addr_inet_ntop(&addrbuf, buf, sizeof(buf));
|
|
|
|
if (NULL != s)
|
|
|
|
buffer_copy_string_len(dest, s, strlen(s));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
buffer_copy_string_len(dest, srv_socket->srv_token->ptr,
|
|
|
|
srv_socket->srv_token_colon);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case MAGNET_ENV_REQUEST_PROTOCOL:
|
|
|
|
dest = r->tmp_buf;
|
|
|
|
buffer_clear(dest);
|
|
|
|
http_version_append(dest, r->http_version);
|
|
|
|
break;
|
|
|
|
case MAGNET_ENV_RESPONSE_HTTP_STATUS:
|
|
|
|
dest = r->tmp_buf;
|
|
|
|
buffer_clear(dest);
|
|
|
|
buffer_append_int(dest, r->http_status);
|
|
|
|
break;
|
|
|
|
case MAGNET_ENV_RESPONSE_BODY_LENGTH:
|
|
|
|
dest = r->tmp_buf;
|
|
|
|
buffer_clear(dest);
|
|
|
|
if (!r->resp_body_finished)
|
|
|
|
break;
|
|
|
|
buffer_append_int(dest, chunkqueue_length(&r->write_queue));
|
|
|
|
break;
|
|
|
|
case MAGNET_ENV_RESPONSE_BODY:
|
|
|
|
if (!r->resp_body_finished)
|
|
|
|
break;
|
|
|
|
else {
|
|
|
|
chunkqueue * const cq = &r->write_queue;
|
|
|
|
off_t len = chunkqueue_length(cq);
|
|
|
|
if (0 == len) {
|
|
|
|
dest = r->tmp_buf;
|
|
|
|
buffer_copy_string_len(dest, CONST_STR_LEN(""));
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
dest = chunkqueue_read_squash(cq, r->conf.errh);
|
|
|
|
if (NULL == dest) {
|
|
|
|
dest = r->tmp_buf;
|
|
|
|
buffer_clear(dest);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case MAGNET_ENV_UNSET: break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return dest;
|
|