Skip to content

Shared dict state file #915

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

Merged
xeioex merged 6 commits into from
May 22, 2025
Merged

Shared dict state file #915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
579e2ed
Tests: removed leftover engine checks.
xeioex May 20, 2025
e3b4bc5
Modules: separating different init worker components.
xeioex May 15, 2025
9497083
Modules: introduced NGX_CHB_CTX_INIT().
xeioex May 15, 2025
887820f
Modules: replaced njs_str_t with ngx_str_t in the shared dictionary.
xeioex May 16, 2025
fb41601
Modules: engine independent method to add entries to a shared dict.
xeioex May 16, 2025
75371c1
Modules: added state file for the shared dictionary.
xeioex May 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 31 additions & 11 deletions nginx/ngx_http_js_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7684,21 +7684,12 @@ ngx_http_js_init(ngx_conf_t *cf)


static ngx_int_t
ngx_http_js_init_worker(ngx_cycle_t *cycle)
ngx_http_js_init_worker_periodics(ngx_js_main_conf_t *jmcf)
{
ngx_uint_t i;
ngx_js_periodic_t *periodics;
ngx_js_main_conf_t *jmcf;

if ((ngx_process != NGX_PROCESS_WORKER)
&& ngx_process != NGX_PROCESS_SINGLE)
{
return NGX_OK;
}

jmcf = ngx_http_cycle_get_module_main_conf(cycle, ngx_http_js_module);

if (jmcf == NULL || jmcf->periodics == NULL) {
if (jmcf->periodics == NULL) {
return NGX_OK;
}

Expand Down Expand Up @@ -7726,6 +7717,35 @@ ngx_http_js_init_worker(ngx_cycle_t *cycle)
}


static ngx_int_t
ngx_http_js_init_worker(ngx_cycle_t *cycle)
{
ngx_js_main_conf_t *jmcf;

if ((ngx_process != NGX_PROCESS_WORKER)
&& ngx_process != NGX_PROCESS_SINGLE)
{
return NGX_OK;
}

jmcf = ngx_http_cycle_get_module_main_conf(cycle, ngx_http_js_module);

if (jmcf == NULL) {
return NGX_OK;
}

if (ngx_http_js_init_worker_periodics(jmcf) != NGX_OK) {
return NGX_ERROR;
}

if (ngx_js_dict_init_worker(jmcf) != NGX_OK) {
return NGX_ERROR;
}

return NGX_OK;
}


static char *
ngx_http_js_periodic(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
{
Expand Down
8 changes: 6 additions & 2 deletions nginx/ngx_js.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
#include <njs.h>
#include <njs_rbtree.h>
#include <njs_arr.h>
#include "ngx_js_fetch.h"
#include "ngx_js_shared_dict.h"

#if (NJS_HAVE_QUICKJS)
#include <qjs.h>
Expand Down Expand Up @@ -317,6 +315,9 @@ ngx_int_t ngx_js_exception(njs_vm_t *vm, ngx_str_t *s);
ngx_engine_t *ngx_njs_clone(ngx_js_ctx_t *ctx, ngx_js_loc_conf_t *cf,
void *external);

#define NGX_CHB_CTX_INIT(chain, pool) \
njs_chb_init(chain, pool, (njs_chb_alloc_t) ngx_palloc, NULL)

#if (NJS_HAVE_QUICKJS)

typedef struct ngx_qjs_event_s ngx_qjs_event_t;
Expand Down Expand Up @@ -437,4 +438,7 @@ extern njs_module_t njs_xml_module;
extern njs_module_t njs_zlib_module;


#include "ngx_js_fetch.h"
#include "ngx_js_shared_dict.h"

#endif /* _NGX_JS_H_INCLUDED_ */
Loading