[dev] refactor the calling order of modules (developing).

Author: winshining

Diff for: config

@@ -47,7 +47,6 @@ RTMP_DEPS="                                                     \
                 $ngx_addon_dir/ngx_rtmp_record_module.h         \
                 $ngx_addon_dir/ngx_rtmp_gop_cache_module.h      \
                 $ngx_addon_dir/ngx_rtmp_relay_module.h          \
-                $ngx_addon_dir/ngx_rtmp_exec_module.h           \
                 $ngx_addon_dir/ngx_rtmp_streams.h               \
                 $ngx_addon_dir/ngx_rtmp_bitop.h                 \
                 $ngx_addon_dir/ngx_rtmp_proxy_protocol.h        \

Diff for: ngx_http_flv_live_module.c

@@ -7,8 +7,6 @@
 #include <ngx_core.h>
 #include <ngx_http.h>
 #include "ngx_http_flv_live_module.h"
-#include "ngx_rtmp_relay_module.h"
-#include "ngx_rtmp_exec_module.h"
 #include "ngx_rtmp_bandwidth.h"
 
 
@@ -198,7 +196,6 @@ static void ngx_http_flv_live_free_request(ngx_rtmp_session_t *s);
 
 
 static void ngx_http_flv_live_play_handler(ngx_event_t *ev);
-static void ngx_http_flv_live_exec_pull_handler(ngx_event_t *ev);
 static void ngx_http_flv_live_read_handler(ngx_event_t *rev);
 static void ngx_http_flv_live_write_handler(ngx_event_t *wev);
 
@@ -1074,13 +1071,9 @@ ngx_http_flv_live_join(ngx_rtmp_session_t *s, u_char *name,
         unsigned int publisher)
 {
     ngx_rtmp_live_ctx_t            *ctx;
-    ngx_http_flv_live_ctx_t        *hctx;
-    ngx_http_request_t             *r;
     ngx_rtmp_live_stream_t        **stream;
     ngx_rtmp_live_app_conf_t       *lacf;
 
-    ngx_rtmp_relay_app_conf_t      *racf;
-    ngx_rtmp_exec_app_conf_t       *eacf;
     ngx_flag_t                      create;
 
     /* only for subscribers */
@@ -1114,26 +1107,6 @@ ngx_http_flv_live_join(ngx_rtmp_session_t *s, u_char *name,
     ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
             "flv live: join '%s'", name);
 
-    racf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_relay_module);
-    eacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_exec_module);
-    if (racf && racf->pulls.nelts) {
-        create = 1;
-    }
-
-    if (!create && eacf && eacf->conf[NGX_RTMP_EXEC_PULL].nelts > 0) {
-        create = 1;
-
-        r = s->data;
-        hctx = ngx_http_get_module_ctx(r, ngx_http_flv_live_module);
-
-        ngx_memzero(&hctx->play, sizeof(ngx_event_t));
-        hctx->play.handler = ngx_http_flv_live_exec_pull_handler;
-        hctx->play.log = s->connection->log;
-        hctx->play.data = s->connection;
-
-        ngx_add_timer(&hctx->play, s->timeout);
-    }
-
     stream = ngx_rtmp_live_get_stream(s, name,
                         lacf->idle_streams || s->wait_notify_play || create);
 
@@ -1579,33 +1552,6 @@ ngx_http_flv_live_play_handler(ngx_event_t *ev)
 }
 
 
-void
-ngx_http_flv_live_exec_pull_handler(ngx_event_t *ev)
-{
-    ngx_connection_t           *c;
-    ngx_http_request_t         *r;
-    ngx_rtmp_session_t         *s;
-    ngx_http_flv_live_ctx_t    *ctx;
-
-    c = ev->data;
-    if (c->destroyed) {
-        return;
-    }
-
-    r = c->data;
-    ctx = ngx_http_get_module_ctx(r, ngx_http_flv_live_module);
-    s = ctx->s;
-
-    if (ev->timer_set) {
-        ngx_del_timer(ev);
-    }
-
-    if (!ctx->header_sent) {
-        ngx_rtmp_finalize_session(s);
-    }
-}
-
-
 void
 ngx_http_flv_live_read_handler(ngx_event_t *rev)
 {

Diff for: ngx_rtmp_exec_module.c

@@ -9,7 +9,6 @@
 #include "ngx_rtmp_cmd_module.h"
 #include "ngx_rtmp_record_module.h"
 #include "ngx_rtmp_eval.h"
-#include "ngx_rtmp_exec_module.h"
 #include <stdlib.h>
 
 #ifdef NGX_LINUX
@@ -48,6 +47,22 @@ static char *ngx_rtmp_exec_kill_signal(ngx_conf_t *cf, ngx_command_t *cmd,
 #define NGX_RTMP_EXEC_PLAYING           0x02
 
 
+enum {
+    NGX_RTMP_EXEC_PUSH,
+    NGX_RTMP_EXEC_PULL,
+
+    NGX_RTMP_EXEC_PUBLISH,
+    NGX_RTMP_EXEC_PUBLISH_DONE,
+    NGX_RTMP_EXEC_PLAY,
+    NGX_RTMP_EXEC_PLAY_DONE,
+    NGX_RTMP_EXEC_RECORD_DONE,
+
+    NGX_RTMP_EXEC_MAX,
+
+    NGX_RTMP_EXEC_STATIC
+};
+
+
 typedef struct {
     ngx_str_t                           id;
     ngx_uint_t                          type;
@@ -84,6 +99,29 @@ typedef struct {
 } ngx_rtmp_exec_main_conf_t;
 
 
+typedef struct ngx_rtmp_exec_pull_ctx_s  ngx_rtmp_exec_pull_ctx_t;
+
+struct ngx_rtmp_exec_pull_ctx_s {
+    ngx_pool_t                         *pool;
+    ngx_uint_t                          counter;
+    ngx_str_t                           name;
+    ngx_str_t                           app;
+    ngx_array_t                         pull_exec;   /* ngx_rtmp_exec_t */
+    ngx_rtmp_exec_pull_ctx_t           *next;
+};
+
+
+typedef struct {
+    ngx_int_t                           active;
+    ngx_array_t                         conf[NGX_RTMP_EXEC_MAX];
+                                                     /* ngx_rtmp_exec_conf_t */
+    ngx_flag_t                          respawn;
+    ngx_flag_t                          options;
+    ngx_uint_t                          nbuckets;
+    ngx_rtmp_exec_pull_ctx_t          **pull;
+} ngx_rtmp_exec_app_conf_t;
+
+
 typedef struct {
     ngx_uint_t                          flags;
     ngx_str_t                           path;     /* /tmp/rec/myfile-123.flv */