winlin

move reload to kernel module

@@ -133,7 +133,7 @@ CORE_OBJS="${MODULE_OBJS[@]}" @@ -133,7 +133,7 @@ CORE_OBJS="${MODULE_OBJS[@]}"
133 MODULE_ID="KERNEL" 133 MODULE_ID="KERNEL"
134 MODULE_DEPENDS=("CORE") 134 MODULE_DEPENDS=("CORE")
135 ModuleLibIncs=(${SRS_OBJS}) 135 ModuleLibIncs=(${SRS_OBJS})
136 -MODULE_FILES=("srs_kernel_error" "srs_kernel_log") 136 +MODULE_FILES=("srs_kernel_error" "srs_kernel_log" "srs_kernel_reload")
137 MODULE_DIR="src/kernel" . auto/modules.sh 137 MODULE_DIR="src/kernel" . auto/modules.sh
138 KERNEL_OBJS="${MODULE_OBJS[@]}" 138 KERNEL_OBJS="${MODULE_OBJS[@]}"
139 # 139 #
@@ -147,7 +147,7 @@ MODULE_FILES=("srs_core_server" @@ -147,7 +147,7 @@ MODULE_FILES=("srs_core_server"
147 "srs_core_protocol" "srs_core_amf0" 147 "srs_core_protocol" "srs_core_amf0"
148 "srs_core_stream" "srs_core_source" "srs_core_codec" 148 "srs_core_stream" "srs_core_source" "srs_core_codec"
149 "srs_core_handshake" "srs_core_pithy_print" 149 "srs_core_handshake" "srs_core_pithy_print"
150 - "srs_core_config" "srs_core_refer" "srs_core_reload" 150 + "srs_core_config" "srs_core_refer"
151 "srs_core_hls" "srs_core_forward" "srs_core_encoder" 151 "srs_core_hls" "srs_core_forward" "srs_core_encoder"
152 "srs_core_http" "srs_core_thread" "srs_core_bandwidth" 152 "srs_core_http" "srs_core_thread" "srs_core_bandwidth"
153 "srs_core_st" "srs_core_log_context") 153 "srs_core_st" "srs_core_log_context")
@@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
32 32
33 #include <srs_core_st.hpp> 33 #include <srs_core_st.hpp>
34 #include <srs_core_conn.hpp> 34 #include <srs_core_conn.hpp>
35 -#include <srs_core_reload.hpp> 35 +#include <srs_kernel_reload.hpp>
36 36
37 class SrsRtmp; 37 class SrsRtmp;
38 class SrsRequest; 38 class SrsRequest;
@@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
32 #include <vector> 32 #include <vector>
33 #include <string> 33 #include <string>
34 34
35 -#include <srs_core_reload.hpp> 35 +#include <srs_kernel_reload.hpp>
36 36
37 // default vhost for rtmp 37 // default vhost for rtmp
38 #define RTMP_VHOST_DEFAULT "__defaultVhost__" 38 #define RTMP_VHOST_DEFAULT "__defaultVhost__"
@@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
28 28
29 #include <srs_kernel_log.hpp> 29 #include <srs_kernel_log.hpp>
30 #include <srs_core_config.hpp> 30 #include <srs_core_config.hpp>
31 -#include <srs_core_reload.hpp> 31 +#include <srs_kernel_reload.hpp>
32 #include <srs_kernel_error.hpp> 32 #include <srs_kernel_error.hpp>
33 33
34 #define SRS_STAGE_DEFAULT_INTERVAL_MS 1200 34 #define SRS_STAGE_DEFAULT_INTERVAL_MS 1200
@@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
33 #include <vector> 33 #include <vector>
34 34
35 #include <srs_core_st.hpp> 35 #include <srs_core_st.hpp>
36 -#include <srs_core_reload.hpp> 36 +#include <srs_kernel_reload.hpp>
37 #include <srs_core_thread.hpp> 37 #include <srs_core_thread.hpp>
38 38
39 class SrsServer; 39 class SrsServer;
@@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
35 #include <string> 35 #include <string>
36 36
37 #include <srs_core_st.hpp> 37 #include <srs_core_st.hpp>
38 -#include <srs_core_reload.hpp> 38 +#include <srs_kernel_reload.hpp>
39 39
40 class SrsSource; 40 class SrsSource;
41 class SrsCommonMessage; 41 class SrsCommonMessage;
@@ -21,7 +21,7 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN @@ -21,7 +21,7 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
21 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 21 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
22 */ 22 */
23 23
24 -#include <srs_core_reload.hpp> 24 +#include <srs_kernel_reload.hpp>
25 25
26 using namespace std; 26 using namespace std;
27 27
@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
25 #define SRS_CORE_RELOAD_HPP 25 #define SRS_CORE_RELOAD_HPP
26 26
27 /* 27 /*
28 -#include <srs_core_reload.hpp> 28 +#include <srs_kernel_reload.hpp>
29 */ 29 */
30 #include <srs_core.hpp> 30 #include <srs_core.hpp>
31 31
@@ -14,6 +14,8 @@ file @@ -14,6 +14,8 @@ file
14 ..\kernel\srs_kernel_error.cpp, 14 ..\kernel\srs_kernel_error.cpp,
15 ..\kernel\srs_kernel_log.hpp, 15 ..\kernel\srs_kernel_log.hpp,
16 ..\kernel\srs_kernel_log.cpp, 16 ..\kernel\srs_kernel_log.cpp,
  17 + ..\kernel\srs_kernel_reload.hpp,
  18 + ..\kernel\srs_kernel_reload.cpp,
17 app readonly separator, 19 app readonly separator,
18 ..\app\srs_core_amf0.hpp, 20 ..\app\srs_core_amf0.hpp,
19 ..\app\srs_core_amf0.cpp, 21 ..\app\srs_core_amf0.cpp,
@@ -47,8 +49,6 @@ file @@ -47,8 +49,6 @@ file
47 ..\app\srs_core_protocol.cpp, 49 ..\app\srs_core_protocol.cpp,
48 ..\app\srs_core_refer.hpp, 50 ..\app\srs_core_refer.hpp,
49 ..\app\srs_core_refer.cpp, 51 ..\app\srs_core_refer.cpp,
50 - ..\app\srs_core_reload.hpp,  
51 - ..\app\srs_core_reload.cpp,  
52 ..\app\srs_core_rtmp.hpp, 52 ..\app\srs_core_rtmp.hpp,
53 ..\app\srs_core_rtmp.cpp, 53 ..\app\srs_core_rtmp.cpp,
54 ..\app\srs_core_thread.hpp, 54 ..\app\srs_core_thread.hpp,