feature: enabled the FFI-based API for all 'ngx.worker.*' APIs in the stream subsystem.

Author: thibaultcha

lib/resty/core.lua

@@ -5,6 +5,7 @@ local subsystem = ngx.config.subsystem
 
 require "resty.core.ctx"
 require "resty.core.var"
+require "resty.core.worker"
 require "resty.core.regex"
 require "resty.core.shdict"
 require "resty.core.time"
@@ -18,7 +19,6 @@ require "resty.core.base64"
 if subsystem == 'http' then
     require "resty.core.request"
     require "resty.core.response"
-    require "resty.core.worker"
     require "resty.core.phase"
     require "resty.core.ndk"
 end

lib/resty/core/worker.lua

@@ -1,37 +1,64 @@
 -- Copyright (C) Yichun Zhang (agentzh)
 
 
-local ffi = require 'ffi'
+local ffi = require "ffi"
 local base = require "resty.core.base"
 
 
 local C = ffi.C
 local new_tab = base.new_tab
+local subsystem = ngx.config.subsystem
+
+
+local ngx_lua_ffi_worker_id
+local ngx_lua_ffi_worker_pid
+local ngx_lua_ffi_worker_count
+local ngx_lua_ffi_worker_exiting
 
 
 ngx.worker = new_tab(0, 4)
 
 
-ffi.cdef[[
-int ngx_http_lua_ffi_worker_pid(void);
-int ngx_http_lua_ffi_worker_exiting(void);
-int ngx_http_lua_ffi_worker_id(void);
-int ngx_http_lua_ffi_worker_count(void);
-]]
+if subsystem == "http" then
+    ffi.cdef[[
+    int ngx_http_lua_ffi_worker_id(void);
+    int ngx_http_lua_ffi_worker_pid(void);
+    int ngx_http_lua_ffi_worker_count(void);
+    int ngx_http_lua_ffi_worker_exiting(void);
+    ]]
+
+    ngx_lua_ffi_worker_id = C.ngx_http_lua_ffi_worker_id
+    ngx_lua_ffi_worker_pid = C.ngx_http_lua_ffi_worker_pid
+    ngx_lua_ffi_worker_count = C.ngx_http_lua_ffi_worker_count
+    ngx_lua_ffi_worker_exiting = C.ngx_http_lua_ffi_worker_exiting
+
+elseif subsystem == "stream" then
+    ffi.cdef[[
+    int ngx_stream_lua_ffi_worker_id(void);
+    int ngx_stream_lua_ffi_worker_pid(void);
+    int ngx_stream_lua_ffi_worker_count(void);
+    int ngx_stream_lua_ffi_worker_exiting(void);
+    ]]
+
+    ngx_lua_ffi_worker_id = C.ngx_stream_lua_ffi_worker_id
+    ngx_lua_ffi_worker_pid = C.ngx_stream_lua_ffi_worker_pid
+    ngx_lua_ffi_worker_count = C.ngx_stream_lua_ffi_worker_count
+    ngx_lua_ffi_worker_exiting = C.ngx_stream_lua_ffi_worker_exiting
+end
 
 
 function ngx.worker.exiting()
-    return C.ngx_http_lua_ffi_worker_exiting() ~= 0
+    return ngx_lua_ffi_worker_exiting() ~= 0
 end
 
 
 function ngx.worker.pid()
-    return C.ngx_http_lua_ffi_worker_pid()
+    return ngx_lua_ffi_worker_pid()
 end
 
 
 function ngx.worker.id()
-    local id = C.ngx_http_lua_ffi_worker_id()
+    local id = ngx_lua_ffi_worker_id()
     if id < 0 then
         return nil
     end
@@ -41,7 +68,7 @@ end
 
 
 function ngx.worker.count()
-    return C.ngx_http_lua_ffi_worker_count()
+    return ngx_lua_ffi_worker_count()
 end