initial refactor commit.

Author: dndx

DEV_NOTES.md

@@ -0,0 +1,32 @@
+**DO NOT EDIT THIS REPO DIRECTLY, CODE ARE AUTOMATICALLY GENERATED FROM TEMPLATES**
+
+# Install
+
+There are some quirks when compiling the refactored stream module.
+
+You will need NGINX 1.13.x for it to work as we targeted the refactor toward
+that version only. The [1.13.x branch](https://github.com/openresty/openresty/tree/1.13.x)
+of OpenResty should serve this well.
+
+You need to turn off FFI when compiling (for the time being) as not all FFI functions got
+their respective guard.
+
+Here is what I use for compiling:
+
+```shell
+./configure --prefix=/home/datong/openresty-stream-build \
+            --with-stream --with-stream_ssl_module
+            --add-module=/home/datong/orinc/stream-lua-nginx-module
+            -j4 --with-cc-opt='-DNGX_LUA_NO_FFI_API' --with-debug
+```
+
+# Status
+The project can run simple "Hello, World" without any problem or Valgrind warnings.
+
+I have also tested timer and variable support and they appears to work as well.
+
+The only feature that has not been ported is the cosocket API due to it's
+complexity. This does makes the module somewhat useless as input from user can not be read by
+Lua programs right now. I will spend some time to sort this out shortly.
+
+I will spend some time debugging and get the test suite running next.

config

@@ -302,19 +302,19 @@ fi
 ngx_addon_name=ngx_stream_lua_module
 STREAM_MODULES="$STREAM_MODULES ngx_stream_lua_module"
 NGX_ADDON_SRCS="$NGX_ADDON_SRCS \
+                $ngx_addon_dir/src/ngx_stream_lua_api.c \
+                $ngx_addon_dir/src/ngx_stream_lua_request.c \
                 $ngx_addon_dir/src/ngx_stream_lua_module.c \
                 $ngx_addon_dir/src/ngx_stream_lua_directive.c \
                 $ngx_addon_dir/src/ngx_stream_lua_lex.c \
                 $ngx_addon_dir/src/ngx_stream_lua_contentby.c \
                 $ngx_addon_dir/src/ngx_stream_lua_util.c \
                 $ngx_addon_dir/src/ngx_stream_lua_cache.c \
                 $ngx_addon_dir/src/ngx_stream_lua_clfactory.c \
-                $ngx_addon_dir/src/ngx_stream_lua_socket_tcp.c \
                 $ngx_addon_dir/src/ngx_stream_lua_exception.c \
                 $ngx_addon_dir/src/ngx_stream_lua_pcrefix.c \
                 $ngx_addon_dir/src/ngx_stream_lua_uthread.c \
                 $ngx_addon_dir/src/ngx_stream_lua_coroutine.c \
-                $ngx_addon_dir/src/ngx_stream_lua_semaphore.c \
                 $ngx_addon_dir/src/ngx_stream_lua_output.c \
                 $ngx_addon_dir/src/ngx_stream_lua_consts.c \
                 $ngx_addon_dir/src/ngx_stream_lua_log.c \
@@ -328,29 +328,27 @@ NGX_ADDON_SRCS="$NGX_ADDON_SRCS \
                 $ngx_addon_dir/src/ngx_stream_lua_script.c \
                 $ngx_addon_dir/src/ngx_stream_lua_shdict.c \
                 $ngx_addon_dir/src/ngx_stream_lua_variable.c \
-                $ngx_addon_dir/src/ngx_stream_lua_socket_udp.c \
                 $ngx_addon_dir/src/ngx_stream_lua_timer.c \
                 $ngx_addon_dir/src/ngx_stream_lua_config.c \
                 $ngx_addon_dir/src/ngx_stream_lua_worker.c \
                 $ngx_addon_dir/src/ngx_stream_lua_misc.c \
                 $ngx_addon_dir/src/ngx_stream_lua_initby.c \
-                $ngx_addon_dir/src/ngx_stream_lua_args.c \
                 $ngx_addon_dir/src/ngx_stream_lua_initworkerby.c \
                 "
 
 NGX_ADDON_DEPS="$NGX_ADDON_DEPS \
                 $ngx_addon_dir/src/ddebug.h \
+                $ngx_addon_dir/src/api/ngx_stream_lua_api.h \
+                $ngx_addon_dir/src/ngx_stream_lua_request.h \
                 $ngx_addon_dir/src/ngx_stream_lua_common.h \
                 $ngx_addon_dir/src/ngx_stream_lua_lex.h \
                 $ngx_addon_dir/src/ngx_stream_lua_contentby.h \
                 $ngx_addon_dir/src/ngx_stream_lua_util.h \
                 $ngx_addon_dir/src/ngx_stream_lua_cache.h \
                 $ngx_addon_dir/src/ngx_stream_lua_clfactory.h \
-                $ngx_addon_dir/src/ngx_stream_lua_socket_tcp.h \
                 $ngx_addon_dir/src/ngx_stream_lua_pcrefix.h \
                 $ngx_addon_dir/src/ngx_stream_lua_uthread.h \
                 $ngx_addon_dir/src/ngx_stream_lua_coroutine.h \
-                $ngx_addon_dir/src/ngx_stream_lua_semaphore.h \
                 $ngx_addon_dir/src/ngx_stream_lua_output.h \
                 $ngx_addon_dir/src/ngx_stream_lua_consts.h \
                 $ngx_addon_dir/src/ngx_stream_lua_log.h \
@@ -364,14 +362,12 @@ NGX_ADDON_DEPS="$NGX_ADDON_DEPS \
                 $ngx_addon_dir/src/ngx_stream_lua_script.h \
                 $ngx_addon_dir/src/ngx_stream_lua_shdict.h \
                 $ngx_addon_dir/src/ngx_stream_lua_variable.h \
-                $ngx_addon_dir/src/ngx_stream_lua_socket_udp.h \
                 $ngx_addon_dir/src/ngx_stream_lua_timer.h \
                 $ngx_addon_dir/src/ngx_stream_lua_config.h \
                 $ngx_addon_dir/src/api/ngx_stream_lua_api.h \
                 $ngx_addon_dir/src/ngx_stream_lua_worker.h \
                 $ngx_addon_dir/src/ngx_stream_lua_misc.h \
                 $ngx_addon_dir/src/ngx_stream_lua_initby.h \
-                $ngx_addon_dir/src/ngx_stream_lua_args.h \
                 $ngx_addon_dir/src/ngx_stream_lua_initworkerby.h \
                 "
 

src/api/ngx_stream_lua_api.h

@@ -10,7 +10,7 @@
 
 #include <nginx.h>
 #include <ngx_core.h>
-#include <ngx_stream.h>
+#include <ngx_http.h>
 
 #include <lua.h>
 #include <stdint.h>
@@ -19,7 +19,7 @@
 /* Public API for other Nginx modules */
 
 
-#define ngx_stream_lua_version  10001
+#define ngx_stream_lua_version  10009
 
 
 typedef struct {
@@ -36,12 +36,20 @@ typedef struct {
 
 lua_State *ngx_stream_lua_get_global_state(ngx_conf_t *cf);
 
-ngx_stream_session_t *ngx_stream_lua_get_session(lua_State *L);
+ngx_stream_lua_request_t *ngx_stream_lua_get_request(lua_State *L);
 
-ngx_int_t ngx_stream_lua_add_package_preload(ngx_conf_t *cf,
-    const char *package, lua_CFunction func);
+ngx_int_t ngx_stream_lua_add_package_preload(ngx_conf_t *cf, const char *package,
+    lua_CFunction func);
+
+ngx_int_t ngx_stream_lua_shared_dict_get(ngx_shm_zone_t *shm_zone,
+    u_char *key_data, size_t key_len, ngx_stream_lua_value_t *value);
 
 ngx_shm_zone_t *ngx_stream_lua_find_zone(u_char *name_data, size_t name_len);
 
+ngx_shm_zone_t *ngx_stream_lua_shared_memory_add(ngx_conf_t *cf, ngx_str_t *name,
+    size_t size, void *tag);
+
 
 #endif /* _NGX_STREAM_LUA_API_H_INCLUDED_ */
+
+/* vi:set ft=c ts=4 sw=4 et fdm=marker: */

src/ddebug.h

@@ -4,50 +4,82 @@
  */
 
 
-#ifndef DDEBUG_H
-#define DDEBUG_H
+#ifndef _DDEBUG_H_INCLUDED_
+#define _DDEBUG_H_INCLUDED_
 
 
 #include <ngx_config.h>
+#include <nginx.h>
 #include <ngx_core.h>
 
 
 #if defined(DDEBUG) && (DDEBUG)
 
 #   if (NGX_HAVE_VARIADIC_MACROS)
 
-#       define dd(...) fprintf(stderr, "stream lua *** %s: ", __func__); \
+#       define dd(...) fprintf(stderr, "lua *** %s: ", __func__); \
             fprintf(stderr, __VA_ARGS__); \
             fprintf(stderr, " at %s line %d.\n", __FILE__, __LINE__)
 
 #   else
 
 #include <stdarg.h>
 #include <stdio.h>
+
 #include <stdarg.h>
 
 static ngx_inline void
-dd(const char * fmt, ...)
-{
+dd(const char *fmt, ...) {
 }
 
 #    endif
 
 #else
 
 #   if (NGX_HAVE_VARIADIC_MACROS)
+
 #       define dd(...)
+
 #   else
 
 #include <stdarg.h>
 
 static ngx_inline void
-dd(const char * fmt, ...)
-{
+dd(const char *fmt, ...) {
 }
 
 #   endif
 
 #endif
 
-#endif  /* DDEBUG_H */
+#if defined(DDEBUG) && (DDEBUG)
+
+#define dd_check_read_event_handler(r)   \
+    dd("r->read_event_handler = %s", \
+        r->read_event_handler == ngx_http_block_reading ? \
+            "ngx_http_block_reading" : \
+        r->read_event_handler == ngx_http_test_reading ? \
+            "ngx_http_test_reading" : \
+        r->read_event_handler == ngx_http_request_empty_handler ? \
+            "ngx_http_request_empty_handler" : "UNKNOWN")
+
+#define dd_check_write_event_handler(r)   \
+    dd("r->write_event_handler = %s", \
+        r->write_event_handler == ngx_http_handler ? \
+            "ngx_http_handler" : \
+        r->write_event_handler == ngx_http_core_run_phases ? \
+            "ngx_http_core_run_phases" : \
+        r->write_event_handler == ngx_http_request_empty_handler ? \
+            "ngx_http_request_empty_handler" : "UNKNOWN")
+
+#else
+
+#define dd_check_read_event_handler(r)
+#define dd_check_write_event_handler(r)
+
+#endif
+
+
+#endif /* _DDEBUG_H_INCLUDED_ */
+
+/* vi:set ft=c ts=4 sw=4 et fdm=marker: */