feature: updated the subsys templates to support the new ngx_meta_lua_module.

Author: thibaultcha

src/http/ngx_http_lua_headerfilterby.c

@@ -19,7 +19,6 @@
 #include "ngx_http_lua_string.h"
 #include "ngx_http_lua_misc.h"
 #include "ngx_http_lua_consts.h"
-#include "ngx_http_lua_shdict.h"
 
 
 static ngx_http_output_header_filter_pt ngx_http_next_header_filter;

src/http/ngx_http_lua_setby.c

@@ -19,7 +19,6 @@
 #include "ngx_http_lua_string.h"
 #include "ngx_http_lua_misc.h"
 #include "ngx_http_lua_consts.h"
-#include "ngx_http_lua_shdict.h"
 #include "ngx_http_lua_util.h"
 
 

src/subsys/api/ngx_subsys_lua_api.h.tt2

@@ -57,15 +57,6 @@ lua_State *ngx_[% subsys %]_lua_get_global_state(ngx_conf_t *cf);
 ngx_int_t ngx_[% subsys %]_lua_add_package_preload(ngx_conf_t *cf,
     const char *package, lua_CFunction func);
 
-ngx_int_t ngx_[% subsys %]_lua_shared_dict_get(ngx_shm_zone_t *shm_zone,
-    u_char *key_data, size_t key_len, ngx_[% subsys %]_lua_value_t *value);
-
-ngx_shm_zone_t *ngx_[% subsys %]_lua_find_zone(u_char *name_data,
-    size_t name_len);
-
-ngx_shm_zone_t *ngx_[% subsys %]_lua_shared_memory_add(ngx_conf_t *cf,
-    ngx_str_t *name, size_t size, void *tag);
-
 
 #endif /* _NGX_[% SUBSYS %]_LUA_API_H_INCLUDED_ */
 

src/subsys/ddebug.h.tt2

@@ -12,7 +12,6 @@
 
 #include "ngx_[% subsys %]_lua_common.h"
 #include "api/ngx_[% subsys %]_lua_api.h"
-#include "ngx_[% subsys %]_lua_shdict.h"
 #include "ngx_[% subsys %]_lua_util.h"
 
 
@@ -34,10 +33,6 @@ ngx_[% subsys %]_lua_get_request(lua_State *L)
 }
 
 
-static ngx_int_t ngx_[% subsys %]_lua_shared_memory_init(ngx_shm_zone_t *shm_zone,
-    void *data);
-
-
 ngx_int_t
 ngx_[% subsys %]_lua_add_package_preload(ngx_conf_t *cf, const char *package,
     lua_CFunction func)
@@ -84,135 +79,4 @@ ngx_[% subsys %]_lua_add_package_preload(ngx_conf_t *cf, const char *package,
 }
 
 
-ngx_shm_zone_t *
-ngx_[% subsys %]_lua_shared_memory_add(ngx_conf_t *cf, ngx_str_t *name,
-    size_t size, void *tag)
-{
-    ngx_[% subsys %]_lua_main_conf_t     *lmcf;
-    ngx_[% subsys %]_lua_shm_zone_ctx_t  *ctx;
-
-    ngx_shm_zone_t              **zp;
-    ngx_shm_zone_t               *zone;
-    ngx_int_t                     n;
-
-    lmcf = ngx_[% subsys %]_conf_get_module_main_conf(cf, ngx_[% subsys %]_lua_module);
-    if (lmcf == NULL) {
-        return NULL;
-    }
-
-    if (lmcf->shm_zones == NULL) {
-        lmcf->shm_zones = ngx_palloc(cf->pool, sizeof(ngx_array_t));
-        if (lmcf->shm_zones == NULL) {
-            return NULL;
-        }
-
-        if (ngx_array_init(lmcf->shm_zones, cf->pool, 2,
-                           sizeof(ngx_shm_zone_t *))
-            != NGX_OK)
-        {
-            return NULL;
-        }
-    }
-
-    zone = ngx_shared_memory_add(cf, name, (size_t) size, tag);
-    if (zone == NULL) {
-        return NULL;
-    }
-
-    if (zone->data) {
-        ctx = (ngx_[% subsys %]_lua_shm_zone_ctx_t *) zone->data;
-        return &ctx->zone;
-    }
-
-    n = sizeof(ngx_[% subsys %]_lua_shm_zone_ctx_t);
-
-    ctx = ngx_pcalloc(cf->pool, n);
-    if (ctx == NULL) {
-        return NULL;
-    }
-
-    ctx->lmcf = lmcf;
-    ctx->log = &cf->cycle->new_log;
-    ctx->cycle = cf->cycle;
-
-    ngx_memcpy(&ctx->zone, zone, sizeof(ngx_shm_zone_t));
-
-    zp = ngx_array_push(lmcf->shm_zones);
-    if (zp == NULL) {
-        return NULL;
-    }
-
-    *zp = zone;
-
-    /* set zone init */
-    zone->init = ngx_[% subsys %]_lua_shared_memory_init;
-    zone->data = ctx;
-
-    lmcf->requires_shm = 1;
-
-    return &ctx->zone;
-}
-
-
-static ngx_int_t
-ngx_[% subsys %]_lua_shared_memory_init(ngx_shm_zone_t *shm_zone, void *data)
-{
-    ngx_[% subsys %]_lua_shm_zone_ctx_t *octx = data;
-    ngx_[% subsys %]_lua_main_conf_t    *lmcf;
-    ngx_[% subsys %]_lua_shm_zone_ctx_t *ctx;
-
-    ngx_shm_zone_t              *ozone;
-    void                        *odata;
-    ngx_int_t                    rc;
-    volatile ngx_cycle_t        *saved_cycle;
-    ngx_shm_zone_t              *zone;
-
-    ctx = (ngx_[% subsys %]_lua_shm_zone_ctx_t *) shm_zone->data;
-    zone = &ctx->zone;
-
-    odata = NULL;
-    if (octx) {
-        ozone = &octx->zone;
-        odata = ozone->data;
-    }
-
-    zone->shm = shm_zone->shm;
-#if defined(nginx_version) && nginx_version >= 1009000
-    zone->noreuse = shm_zone->noreuse;
-#endif
-
-    if (zone->init(zone, odata) != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    dd("get lmcf");
-
-    lmcf = ctx->lmcf;
-    if (lmcf == NULL) {
-        return NGX_ERROR;
-    }
-
-    dd("lmcf->lua: %p", lmcf->lua);
-
-    lmcf->shm_zones_inited++;
-
-    if (lmcf->shm_zones_inited == lmcf->shm_zones->nelts
-        && lmcf->init_handler && !ngx_test_config)
-    {
-        saved_cycle = ngx_cycle;
-        ngx_cycle = ctx->cycle;
-
-        rc = lmcf->init_handler(ctx->log, lmcf, lmcf->lua);
-
-        ngx_cycle = saved_cycle;
-
-        if (rc != NGX_OK) {
-            /* an error happened */
-            return NGX_ERROR;
-        }
-    }
-
-    return NGX_OK;
-}
-
 /* vi:set ft=c ts=4 sw=4 et fdm=marker: */

src/subsys/ngx_subsys_lua_api.c.tt2

@@ -24,6 +24,9 @@
 #include <lauxlib.h>
 
 
+#include "ngx_meta_lua_api.h"
+
+
 [% IF stream_subsys %]
 #include "ngx_stream_lua_request.h"
 [% END %]
@@ -52,6 +55,11 @@
 #endif
 
 
+#if !defined(ngx_meta_lua_version) || ngx_meta_lua_version < 00001
+#   error ngx_meta_lua_module 0.0.1 or above is required
+#endif
+
+
 [% IF http_subsys %]
 #if defined(NDK) && NDK
 #include <ndk.h>
@@ -204,8 +212,6 @@ typedef struct ngx_[% subsys %]_lua_balancer_peer_data_s
 typedef struct ngx_[% subsys %]_lua_sema_mm_s  ngx_[% subsys %]_lua_sema_mm_t;
 
 
-typedef ngx_int_t (*ngx_[% subsys %]_lua_main_conf_handler_pt)(ngx_log_t *log,
-    ngx_[% subsys %]_lua_main_conf_t *lmcf, lua_State *L);
 typedef ngx_int_t (*ngx_[% subsys %]_lua_srv_conf_handler_pt)(
     [% req_type %] *r, ngx_[% subsys %]_lua_srv_conf_t *lscf, lua_State *L);
 
@@ -245,10 +251,6 @@ struct ngx_[% subsys %]_lua_main_conf_s {
 
 #endif
 
-    ngx_array_t         *shm_zones;  /* of ngx_shm_zone_t* */
-
-    ngx_array_t         *shdict_zones; /* shm zones of "shdict" */
-
     ngx_array_t         *preload_hooks; /* of ngx_[% subsys %]_lua_preload_hook_t */
 
 [% IF http_subsys %]
@@ -259,10 +261,10 @@ struct ngx_[% subsys %]_lua_main_conf_s {
     ngx_flag_t           postponed_to_preread_phase_end;
 [% END %]
 
-    ngx_[% subsys %]_lua_main_conf_handler_pt    init_handler;
+    ngx_meta_lua_main_conf_handler_pt            init_handler;
     ngx_str_t                                    init_src;
 
-    ngx_[% subsys %]_lua_main_conf_handler_pt    init_worker_handler;
+    ngx_meta_lua_main_conf_handler_pt            init_worker_handler;
     ngx_str_t                                    init_worker_src;
 
     ngx_[% subsys %]_lua_balancer_peer_data_t    *balancer_peer_data;
@@ -295,8 +297,6 @@ struct ngx_[% subsys %]_lua_main_conf_s {
                      */
 
 [% END %]
-    ngx_uint_t                      shm_zones_inited;
-
     ngx_[% subsys %]_lua_sema_mm_t         *sema_mm;
 
     ngx_uint_t           malloc_trim_cycle;  /* a cycle is defined as the number
@@ -327,7 +327,6 @@ struct ngx_[% subsys %]_lua_main_conf_s {
 [% END %]
 
     unsigned             requires_log:1;
-    unsigned             requires_shm:1;
     unsigned             requires_capture_log:1;
 };