winlin

move config 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" "srs_kernel_reload") 136 +MODULE_FILES=("srs_kernel_error" "srs_kernel_log" "srs_kernel_reload" "srs_kernel_config")
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" 150 + "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 @@ using namespace std; @@ -32,7 +32,7 @@ using namespace std;
32 #include <srs_kernel_error.hpp> 32 #include <srs_kernel_error.hpp>
33 #include <srs_core_amf0.hpp> 33 #include <srs_core_amf0.hpp>
34 #include <srs_core_protocol.hpp> 34 #include <srs_core_protocol.hpp>
35 -#include <srs_core_config.hpp> 35 +#include <srs_kernel_config.hpp>
36 #include <srs_core_autofree.hpp> 36 #include <srs_core_autofree.hpp>
37 37
38 SrsBandwidth::SrsBandwidth() 38 SrsBandwidth::SrsBandwidth()
@@ -36,7 +36,7 @@ using namespace std; @@ -36,7 +36,7 @@ using namespace std;
36 #include <srs_core_source.hpp> 36 #include <srs_core_source.hpp>
37 #include <srs_core_server.hpp> 37 #include <srs_core_server.hpp>
38 #include <srs_core_pithy_print.hpp> 38 #include <srs_core_pithy_print.hpp>
39 -#include <srs_core_config.hpp> 39 +#include <srs_kernel_config.hpp>
40 #include <srs_core_refer.hpp> 40 #include <srs_core_refer.hpp>
41 #include <srs_core_hls.hpp> 41 #include <srs_core_hls.hpp>
42 #include <srs_core_http.hpp> 42 #include <srs_core_http.hpp>
@@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
34 34
35 #include <srs_kernel_error.hpp> 35 #include <srs_kernel_error.hpp>
36 #include <srs_kernel_log.hpp> 36 #include <srs_kernel_log.hpp>
37 -#include <srs_core_config.hpp> 37 +#include <srs_kernel_config.hpp>
38 #include <srs_core_rtmp.hpp> 38 #include <srs_core_rtmp.hpp>
39 #include <srs_core_pithy_print.hpp> 39 #include <srs_core_pithy_print.hpp>
40 #include <srs_core_protocol.hpp> 40 #include <srs_core_protocol.hpp>
@@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
34 #include <srs_core_protocol.hpp> 34 #include <srs_core_protocol.hpp>
35 #include <srs_core_pithy_print.hpp> 35 #include <srs_core_pithy_print.hpp>
36 #include <srs_core_rtmp.hpp> 36 #include <srs_core_rtmp.hpp>
37 -#include <srs_core_config.hpp> 37 +#include <srs_kernel_config.hpp>
38 #include <srs_core_source.hpp> 38 #include <srs_core_source.hpp>
39 #include <srs_core_autofree.hpp> 39 #include <srs_core_autofree.hpp>
40 40
@@ -37,7 +37,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -37,7 +37,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
37 #include <srs_core_codec.hpp> 37 #include <srs_core_codec.hpp>
38 #include <srs_core_amf0.hpp> 38 #include <srs_core_amf0.hpp>
39 #include <srs_core_protocol.hpp> 39 #include <srs_core_protocol.hpp>
40 -#include <srs_core_config.hpp> 40 +#include <srs_kernel_config.hpp>
41 #include <srs_core_source.hpp> 41 #include <srs_core_source.hpp>
42 #include <srs_core_autofree.hpp> 42 #include <srs_core_autofree.hpp>
43 #include <srs_core_rtmp.hpp> 43 #include <srs_core_rtmp.hpp>
@@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
27 #include <map> 27 #include <map>
28 28
29 #include <srs_kernel_log.hpp> 29 #include <srs_kernel_log.hpp>
30 -#include <srs_core_config.hpp> 30 +#include <srs_kernel_config.hpp>
31 #include <srs_kernel_reload.hpp> 31 #include <srs_kernel_reload.hpp>
32 #include <srs_kernel_error.hpp> 32 #include <srs_kernel_error.hpp>
33 33
@@ -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 25
26 #include <srs_kernel_error.hpp> 26 #include <srs_kernel_error.hpp>
27 #include <srs_kernel_log.hpp> 27 #include <srs_kernel_log.hpp>
28 -#include <srs_core_config.hpp> 28 +#include <srs_kernel_config.hpp>
29 29
30 int SrsRefer::check(std::string page_url, SrsConfDirective* refer) 30 int SrsRefer::check(std::string page_url, SrsConfDirective* refer)
31 { 31 {
@@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
30 #include <srs_core_autofree.hpp> 30 #include <srs_core_autofree.hpp>
31 #include <srs_core_amf0.hpp> 31 #include <srs_core_amf0.hpp>
32 #include <srs_core_handshake.hpp> 32 #include <srs_core_handshake.hpp>
33 -#include <srs_core_config.hpp> 33 +#include <srs_kernel_config.hpp>
34 34
35 using namespace std; 35 using namespace std;
36 36
@@ -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 <srs_kernel_log.hpp> 33 #include <srs_kernel_log.hpp>
34 #include <srs_kernel_error.hpp> 34 #include <srs_kernel_error.hpp>
35 #include <srs_core_client.hpp> 35 #include <srs_core_client.hpp>
36 -#include <srs_core_config.hpp> 36 +#include <srs_kernel_config.hpp>
37 37
38 #define SERVER_LISTEN_BACKLOG 512 38 #define SERVER_LISTEN_BACKLOG 512
39 #define SRS_TIME_RESOLUTION_MS 500 39 #define SRS_TIME_RESOLUTION_MS 500
@@ -33,7 +33,7 @@ using namespace std; @@ -33,7 +33,7 @@ using namespace std;
33 #include <srs_core_codec.hpp> 33 #include <srs_core_codec.hpp>
34 #include <srs_core_hls.hpp> 34 #include <srs_core_hls.hpp>
35 #include <srs_core_forward.hpp> 35 #include <srs_core_forward.hpp>
36 -#include <srs_core_config.hpp> 36 +#include <srs_kernel_config.hpp>
37 #include <srs_core_encoder.hpp> 37 #include <srs_core_encoder.hpp>
38 #include <srs_core_rtmp.hpp> 38 #include <srs_core_rtmp.hpp>
39 39
@@ -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_config.hpp> 24 +#include <srs_kernel_config.hpp>
25 25
26 #include <stdio.h> 26 #include <stdio.h>
27 #include <stdlib.h> 27 #include <stdlib.h>
@@ -21,11 +21,11 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN @@ -21,11 +21,11 @@ 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 -#ifndef SRS_CORE_CONIFG_HPP  
25 -#define SRS_CORE_CONIFG_HPP 24 +#ifndef SRS_KERNEL_CONIFG_HPP
  25 +#define SRS_KERNEL_CONIFG_HPP
26 26
27 /* 27 /*
28 -#include <srs_core_config.hpp> 28 +#include <srs_kernel_config.hpp>
29 */ 29 */
30 #include <srs_core.hpp> 30 #include <srs_core.hpp>
31 31
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
24 #include <srs_kernel_log.hpp> 24 #include <srs_kernel_log.hpp>
25 #include <srs_kernel_error.hpp> 25 #include <srs_kernel_error.hpp>
26 #include <srs_core_server.hpp> 26 #include <srs_core_server.hpp>
27 -#include <srs_core_config.hpp> 27 +#include <srs_kernel_config.hpp>
28 28
29 #include <stdlib.h> 29 #include <stdlib.h>
30 #include <signal.h> 30 #include <signal.h>
@@ -10,6 +10,8 @@ file @@ -10,6 +10,8 @@ file
10 ..\core\srs_core_autofree.hpp, 10 ..\core\srs_core_autofree.hpp,
11 ..\core\srs_core_autofree.cpp, 11 ..\core\srs_core_autofree.cpp,
12 kernel readonly separator, 12 kernel readonly separator,
  13 + ..\kernel\srs_kernel_config.hpp,
  14 + ..\kernel\srs_kernel_config.cpp,
13 ..\kernel\srs_kernel_error.hpp, 15 ..\kernel\srs_kernel_error.hpp,
14 ..\kernel\srs_kernel_error.cpp, 16 ..\kernel\srs_kernel_error.cpp,
15 ..\kernel\srs_kernel_log.hpp, 17 ..\kernel\srs_kernel_log.hpp,
@@ -27,8 +29,6 @@ file @@ -27,8 +29,6 @@ file
27 ..\app\srs_core_client.cpp, 29 ..\app\srs_core_client.cpp,
28 ..\app\srs_core_codec.hpp, 30 ..\app\srs_core_codec.hpp,
29 ..\app\srs_core_codec.cpp, 31 ..\app\srs_core_codec.cpp,
30 - ..\app\srs_core_config.hpp,  
31 - ..\app\srs_core_config.cpp,  
32 ..\app\srs_core_conn.hpp, 32 ..\app\srs_core_conn.hpp,
33 ..\app\srs_core_conn.cpp, 33 ..\app\srs_core_conn.cpp,
34 ..\app\srs_core_encoder.hpp, 34 ..\app\srs_core_encoder.hpp,