Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add directive 'mruby_eval_every_time' #22

Merged
merged 3 commits into from
Mar 14, 2013
Merged

add directive 'mruby_eval_every_time' #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fc95398
add directive 'eval_every_time'
cubicdaiya Mar 9, 2013
d45b09b
set 'eval_every_time' on in default & order of arguments is reverse
cubicdaiya Mar 13, 2013
76c2986
rename directive & change default behavior
cubicdaiya Mar 13, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions ngx_http_mruby_core.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ ngx_int_t ngx_mrb_run(ngx_http_request_t *r, ngx_mrb_state_t *state)
ngx_mrb_push_request(r);
mrb_run(state->mrb, mrb_proc_new(state->mrb, state->mrb->irep[state->n]), mrb_nil_value());
if (state->mrb->exc) {
if (state->file != NGX_CONF_UNSET_PTR) {
ngx_mrb_raise_file_error(state->mrb, mrb_obj_value(state->mrb->exc), r, state->file);
if (state->code_type == NGX_MRB_CODE_TYPE_FILE) {
ngx_mrb_raise_file_error(state->mrb, mrb_obj_value(state->mrb->exc), r, state->code.file);
} else {
ngx_mrb_raise_error(state->mrb, mrb_obj_value(state->mrb->exc), r);
}
Expand Down
11 changes: 10 additions & 1 deletion ngx_http_mruby_core.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,20 @@
#include <ngx_http.h>
#include <mruby.h>

typedef enum code_type_t {
NGX_MRB_CODE_TYPE_FILE,
NGX_MRB_CODE_TYPE_STRING
} code_type_t;

typedef struct ngx_mrb_state_t {
mrb_state *mrb;
char *file;
int n;
int ai;
union code {
char *file;
char *string;
} code;
code_type_t code_type;
} ngx_mrb_state_t;

void ngx_mrb_core_init(mrb_state *mrb, struct RClass *class);
Expand Down
5 changes: 3 additions & 2 deletions ngx_http_mruby_init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ ngx_int_t ngx_mrb_init_file(char *code_file_path, size_t len, ngx_mrb_state_t *s
state->mrb = mrb;
state->n = mrb_generate_code(mrb, p);

ngx_cpystrn((u_char *)state->file, (u_char *)code_file_path, len + 1);
ngx_cpystrn((u_char *)state->code.file, (u_char *)code_file_path, len + 1);
state->code_type = NGX_MRB_CODE_TYPE_FILE;
mrb_pool_close(p->pool);
fclose(mrb_file);

Expand All @@ -53,8 +54,8 @@ ngx_int_t ngx_mrb_init_string(char *code, ngx_mrb_state_t *state)
p = mrb_parse_string(mrb, code, NULL);
state->mrb = mrb;
state->n = mrb_generate_code(mrb, p);
state->file = NGX_CONF_UNSET_PTR;

state->code_type = NGX_MRB_CODE_TYPE_STRING;
mrb_pool_close(p->pool);

return NGX_OK;
Expand Down
78 changes: 76 additions & 2 deletions ngx_http_mruby_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,18 @@
prev_state = conf_state; \
}

#define NGX_MRUBY_STATE_REINIT_IF_NOT_CACHED(cached, state, reinit) \
do { \
if (!cached) { \
if (state == NGX_CONF_UNSET_PTR) { \
return NGX_DECLINED; \
} \
if (reinit(state) == NGX_ERROR) { \
return NGX_ERROR; \
} \
} \
} while(0)

// set conf
static void *ngx_http_mruby_create_loc_conf(ngx_conf_t *cf);
static char *ngx_http_mruby_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child);
Expand Down Expand Up @@ -90,6 +102,7 @@ static char *ngx_http_mruby_log_inline(ngx_conf_t *cf, ngx_command_t *cmd, void

// set init function
static ngx_int_t ngx_http_mruby_init(ngx_conf_t *cf);
static ngx_int_t ngx_http_mruby_state_reinit_from_file(ngx_mrb_state_t *state);
static ngx_int_t ngx_http_mruby_handler_init(ngx_http_core_main_conf_t *cmcf);

static ngx_mrb_state_t *ngx_http_mruby_mrb_state_from_file(ngx_pool_t *pool, ngx_str_t *value);
Expand All @@ -108,9 +121,17 @@ typedef struct ngx_http_mruby_loc_conf_t {
ngx_mrb_state_t *access_inline_state;
ngx_mrb_state_t *content_inline_state;
ngx_mrb_state_t *log_inline_state;
ngx_flag_t cached;
} ngx_http_mruby_loc_conf_t;

static ngx_command_t ngx_http_mruby_commands[] = {
{ ngx_string("mruby_cache"),
NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
ngx_conf_set_flag_slot,
NGX_HTTP_LOC_CONF_OFFSET,
offsetof(ngx_http_mruby_loc_conf_t, cached),
NULL },

{ ngx_string("mruby_post_read_handler"),
NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
ngx_http_mruby_post_read_phase,
Expand Down Expand Up @@ -252,6 +273,8 @@ static void *ngx_http_mruby_create_loc_conf(ngx_conf_t *cf)
conf->content_inline_state = NGX_CONF_UNSET_PTR;
conf->log_inline_state = NGX_CONF_UNSET_PTR;

conf->cached = NGX_CONF_UNSET;

return conf;
}

Expand All @@ -274,42 +297,74 @@ static char *ngx_http_mruby_merge_loc_conf(ngx_conf_t *cf, void *parent, void *c
NGX_MRUBY_MERGE_STATE(prev->content_inline_state, conf->content_inline_state);
NGX_MRUBY_MERGE_STATE(prev->log_inline_state, conf->log_inline_state);

ngx_conf_merge_value(conf->cached, prev->cached, 0);

return NGX_CONF_OK;
}

static ngx_int_t ngx_http_mruby_post_read_handler(ngx_http_request_t *r)
{
ngx_http_mruby_loc_conf_t *clcf = ngx_http_get_module_loc_conf(r, ngx_http_mruby_module);
NGX_MRUBY_STATE_REINIT_IF_NOT_CACHED(
clcf->cached,
clcf->post_read_state,
ngx_http_mruby_state_reinit_from_file
);
return ngx_mrb_run(r, clcf->post_read_state);
}

static ngx_int_t ngx_http_mruby_server_rewrite_handler(ngx_http_request_t *r)
{
ngx_http_mruby_loc_conf_t *clcf = ngx_http_get_module_loc_conf(r, ngx_http_mruby_module);
NGX_MRUBY_STATE_REINIT_IF_NOT_CACHED(
clcf->cached,
clcf->server_rewrite_state,
ngx_http_mruby_state_reinit_from_file
);
return ngx_mrb_run(r, clcf->server_rewrite_state);
}

static ngx_int_t ngx_http_mruby_rewrite_handler(ngx_http_request_t *r)
{
ngx_http_mruby_loc_conf_t *clcf = ngx_http_get_module_loc_conf(r, ngx_http_mruby_module);
NGX_MRUBY_STATE_REINIT_IF_NOT_CACHED(
clcf->cached,
clcf->rewrite_state,
ngx_http_mruby_state_reinit_from_file
);
return ngx_mrb_run(r, clcf->rewrite_state);
}

static ngx_int_t ngx_http_mruby_access_handler(ngx_http_request_t *r)
{
ngx_http_mruby_loc_conf_t *clcf = ngx_http_get_module_loc_conf(r, ngx_http_mruby_module);
NGX_MRUBY_STATE_REINIT_IF_NOT_CACHED(
clcf->cached,
clcf->access_state,
ngx_http_mruby_state_reinit_from_file
);
return ngx_mrb_run(r, clcf->access_state);
}

static ngx_int_t ngx_http_mruby_content_handler(ngx_http_request_t *r)
{
ngx_http_mruby_loc_conf_t *clcf = ngx_http_get_module_loc_conf(r, ngx_http_mruby_module);
NGX_MRUBY_STATE_REINIT_IF_NOT_CACHED(
clcf->cached,
clcf->handler_state,
ngx_http_mruby_state_reinit_from_file
);
return ngx_mrb_run(r, clcf->handler_state);
}

static ngx_int_t ngx_http_mruby_log_handler(ngx_http_request_t *r)
{
ngx_http_mruby_loc_conf_t *clcf = ngx_http_get_module_loc_conf(r, ngx_http_mruby_module);
NGX_MRUBY_STATE_REINIT_IF_NOT_CACHED(
clcf->cached,
clcf->log_handler_state,
ngx_http_mruby_state_reinit_from_file
);
return ngx_mrb_run(r, clcf->log_handler_state);
}

Expand Down Expand Up @@ -558,8 +613,8 @@ static ngx_mrb_state_t *ngx_http_mruby_mrb_state_from_file(ngx_pool_t *pool, ngx
}

len = ngx_strlen((char *)code_file_path->data);
state->file = ngx_pcalloc(pool, len + 1);
if (state->file == NULL) {
state->code.file = ngx_pcalloc(pool, len + 1);
if (state->code.file == NULL) {
return NGX_CONF_UNSET_PTR;
}

Expand All @@ -572,11 +627,19 @@ static ngx_mrb_state_t *ngx_http_mruby_mrb_state_from_file(ngx_pool_t *pool, ngx
static ngx_mrb_state_t *ngx_http_mruby_mrb_state_from_string(ngx_pool_t *pool, ngx_str_t *code)
{
ngx_mrb_state_t *state;
size_t len;

state = ngx_pcalloc(pool, sizeof(*state));
if (state == NULL) {
return NGX_CONF_UNSET_PTR;
}

len = ngx_strlen(code->data);
state->code.string = ngx_pcalloc(pool, len + 1);
if (state->code.string == NULL) {
return NGX_CONF_UNSET_PTR;
}
ngx_cpystrn((u_char *)state->code.string, code->data, len + 1);
if (ngx_mrb_init_string((char *)code->data, state) != NGX_OK) {
return NGX_CONF_UNSET_PTR;
}
Expand All @@ -598,6 +661,17 @@ static ngx_int_t ngx_http_mruby_init(ngx_conf_t *cf)
return NGX_OK;
}

static ngx_int_t ngx_http_mruby_state_reinit_from_file(ngx_mrb_state_t *state)
{
if (state == NGX_CONF_UNSET_PTR) {
return NGX_ERROR;
}
if (ngx_mrb_init_file(state->code.file, ngx_strlen(state->code.file), state) != NGX_OK) {
return NGX_ERROR;
}
return NGX_OK;
}

static ngx_int_t ngx_http_mruby_handler_init(ngx_http_core_main_conf_t *cmcf)
{
ngx_int_t i;
Expand Down