extract kernel module, depends on core and provides kernel service(no stream)
正在显示
28 个修改的文件
包含
44 行增加
和
35 行删除
| @@ -121,7 +121,7 @@ fi | @@ -121,7 +121,7 @@ fi | ||
| 121 | ##################################################################################### | 121 | ##################################################################################### |
| 122 | # Modules, compile each module, then link to binary | 122 | # Modules, compile each module, then link to binary |
| 123 | # | 123 | # |
| 124 | -#Core Module | 124 | +#Core, depends only on system apis. |
| 125 | MODULE_ID="CORE" | 125 | MODULE_ID="CORE" |
| 126 | MODULE_DEPENDS=() | 126 | MODULE_DEPENDS=() |
| 127 | ModuleLibIncs=(${SRS_OBJS}) | 127 | ModuleLibIncs=(${SRS_OBJS}) |
| @@ -129,12 +129,20 @@ MODULE_FILES=("srs_core" "srs_core_autofree") | @@ -129,12 +129,20 @@ MODULE_FILES=("srs_core" "srs_core_autofree") | ||
| 129 | MODULE_DIR="src/core" . auto/modules.sh | 129 | MODULE_DIR="src/core" . auto/modules.sh |
| 130 | CORE_OBJS="${MODULE_OBJS[@]}" | 130 | CORE_OBJS="${MODULE_OBJS[@]}" |
| 131 | # | 131 | # |
| 132 | +#Kernel, depends on core, provides error/log/config, nothing about stream information. | ||
| 133 | +MODULE_ID="KERNEL" | ||
| 134 | +MODULE_DEPENDS=("CORE") | ||
| 135 | +ModuleLibIncs=(${SRS_OBJS}) | ||
| 136 | +MODULE_FILES=("srs_kernel_error") | ||
| 137 | +MODULE_DIR="src/kernel" . auto/modules.sh | ||
| 138 | +KERNEL_OBJS="${MODULE_OBJS[@]}" | ||
| 139 | +# | ||
| 132 | #App Module | 140 | #App Module |
| 133 | MODULE_ID="APP" | 141 | MODULE_ID="APP" |
| 134 | -MODULE_DEPENDS=("CORE") | 142 | +MODULE_DEPENDS=("CORE" "KERNEL") |
| 135 | ModuleLibIncs=(${LibSTRoot} ${LibHttpParserRoot} ${LibSSLRoot} ${SRS_OBJS}) | 143 | ModuleLibIncs=(${LibSTRoot} ${LibHttpParserRoot} ${LibSSLRoot} ${SRS_OBJS}) |
| 136 | MODULE_FILES=("srs_core_log" "srs_core_server" | 144 | MODULE_FILES=("srs_core_log" "srs_core_server" |
| 137 | - "srs_core_error" "srs_core_conn" "srs_core_client" | 145 | + "srs_core_conn" "srs_core_client" |
| 138 | "srs_core_rtmp" "srs_core_socket" "srs_core_buffer" | 146 | "srs_core_rtmp" "srs_core_socket" "srs_core_buffer" |
| 139 | "srs_core_protocol" "srs_core_amf0" | 147 | "srs_core_protocol" "srs_core_amf0" |
| 140 | "srs_core_stream" "srs_core_source" "srs_core_codec" | 148 | "srs_core_stream" "srs_core_source" "srs_core_codec" |
| @@ -148,7 +156,7 @@ APP_OBJS="${MODULE_OBJS[@]}" | @@ -148,7 +156,7 @@ APP_OBJS="${MODULE_OBJS[@]}" | ||
| 148 | # | 156 | # |
| 149 | #Main Module | 157 | #Main Module |
| 150 | MODULE_ID="MAIN" | 158 | MODULE_ID="MAIN" |
| 151 | -MODULE_DEPENDS=("CORE" "APP") | 159 | +MODULE_DEPENDS=("CORE" "KERNEL" "APP") |
| 152 | ModuleLibIncs=(${LibSTRoot} ${SRS_OBJS}) | 160 | ModuleLibIncs=(${LibSTRoot} ${SRS_OBJS}) |
| 153 | MODULE_FILES=("srs_main_server" "srs_main_bandcheck") | 161 | MODULE_FILES=("srs_main_server" "srs_main_bandcheck") |
| 154 | MODULE_DIR="src/main" . auto/modules.sh | 162 | MODULE_DIR="src/main" . auto/modules.sh |
| @@ -164,7 +172,7 @@ MAIN_ENTRANCES=("srs_main_server" "srs_main_bandcheck") | @@ -164,7 +172,7 @@ MAIN_ENTRANCES=("srs_main_server" "srs_main_bandcheck") | ||
| 164 | # all depends libraries | 172 | # all depends libraries |
| 165 | ModuleLibFiles=(${LibSTfile} ${LibHttpParserfile} ${LibSSLfile}) | 173 | ModuleLibFiles=(${LibSTfile} ${LibHttpParserfile} ${LibSSLfile}) |
| 166 | # all depends objects | 174 | # all depends objects |
| 167 | -MODULE_OBJS="${CORE_OBJS[@]} ${APP_OBJS[@]} ${MAIN_OBJS[@]}" | 175 | +MODULE_OBJS="${CORE_OBJS[@]} ${KERNEL_OBJS[@]} ${APP_OBJS[@]} ${MAIN_OBJS[@]}" |
| 168 | LINK_OPTIONS="-ldl" | 176 | LINK_OPTIONS="-ldl" |
| 169 | # | 177 | # |
| 170 | # srs: | 178 | # srs: |
| @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 26 | #include <utility> | 26 | #include <utility> |
| 27 | 27 | ||
| 28 | #include <srs_core_log.hpp> | 28 | #include <srs_core_log.hpp> |
| 29 | -#include <srs_core_error.hpp> | 29 | +#include <srs_kernel_error.hpp> |
| 30 | #include <srs_core_stream.hpp> | 30 | #include <srs_core_stream.hpp> |
| 31 | 31 | ||
| 32 | // AMF0 marker | 32 | // AMF0 marker |
| @@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 29 | using namespace std; | 29 | using namespace std; |
| 30 | 30 | ||
| 31 | #include <srs_core_rtmp.hpp> | 31 | #include <srs_core_rtmp.hpp> |
| 32 | -#include <srs_core_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_core_config.hpp> |
| @@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 23 | 23 | ||
| 24 | #include <srs_core_buffer.hpp> | 24 | #include <srs_core_buffer.hpp> |
| 25 | 25 | ||
| 26 | -#include <srs_core_error.hpp> | 26 | +#include <srs_kernel_error.hpp> |
| 27 | #include <srs_core_socket.hpp> | 27 | #include <srs_core_socket.hpp> |
| 28 | #include <srs_core_log.hpp> | 28 | #include <srs_core_log.hpp> |
| 29 | 29 |
| @@ -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 | using namespace std; | 29 | using namespace std; |
| 30 | 30 | ||
| 31 | -#include <srs_core_error.hpp> | 31 | +#include <srs_kernel_error.hpp> |
| 32 | #include <srs_core_log.hpp> | 32 | #include <srs_core_log.hpp> |
| 33 | #include <srs_core_rtmp.hpp> | 33 | #include <srs_core_rtmp.hpp> |
| 34 | #include <srs_core_protocol.hpp> | 34 | #include <srs_core_protocol.hpp> |
| @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 26 | #include <string.h> | 26 | #include <string.h> |
| 27 | #include <stdlib.h> | 27 | #include <stdlib.h> |
| 28 | 28 | ||
| 29 | -#include <srs_core_error.hpp> | 29 | +#include <srs_kernel_error.hpp> |
| 30 | #include <srs_core_stream.hpp> | 30 | #include <srs_core_stream.hpp> |
| 31 | #include <srs_core_log.hpp> | 31 | #include <srs_core_log.hpp> |
| 32 | #include <srs_core_autofree.hpp> | 32 | #include <srs_core_autofree.hpp> |
| @@ -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 <algorithm> | 37 | #include <algorithm> |
| 38 | using namespace std; | 38 | using namespace std; |
| 39 | 39 | ||
| 40 | -#include <srs_core_error.hpp> | 40 | +#include <srs_kernel_error.hpp> |
| 41 | #include <srs_core_log.hpp> | 41 | #include <srs_core_log.hpp> |
| 42 | #include <srs_core_autofree.hpp> | 42 | #include <srs_core_autofree.hpp> |
| 43 | 43 |
| @@ -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_core_conn.hpp> | 24 | #include <srs_core_conn.hpp> |
| 25 | 25 | ||
| 26 | #include <srs_core_log.hpp> | 26 | #include <srs_core_log.hpp> |
| 27 | -#include <srs_core_error.hpp> | 27 | +#include <srs_kernel_error.hpp> |
| 28 | #include <srs_core_server.hpp> | 28 | #include <srs_core_server.hpp> |
| 29 | 29 | ||
| 30 | SrsConnection::SrsConnection(SrsServer* srs_server, st_netfd_t client_stfd) | 30 | SrsConnection::SrsConnection(SrsServer* srs_server, st_netfd_t client_stfd) |
| @@ -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 <algorithm> | 33 | #include <algorithm> |
| 34 | 34 | ||
| 35 | -#include <srs_core_error.hpp> | 35 | +#include <srs_kernel_error.hpp> |
| 36 | #include <srs_core_log.hpp> | 36 | #include <srs_core_log.hpp> |
| 37 | #include <srs_core_config.hpp> | 37 | #include <srs_core_config.hpp> |
| 38 | #include <srs_core_rtmp.hpp> | 38 | #include <srs_core_rtmp.hpp> |
| @@ -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 | #include <netinet/in.h> | 28 | #include <netinet/in.h> |
| 29 | #include <arpa/inet.h> | 29 | #include <arpa/inet.h> |
| 30 | 30 | ||
| 31 | -#include <srs_core_error.hpp> | 31 | +#include <srs_kernel_error.hpp> |
| 32 | #include <srs_core_rtmp.hpp> | 32 | #include <srs_core_rtmp.hpp> |
| 33 | #include <srs_core_log.hpp> | 33 | #include <srs_core_log.hpp> |
| 34 | #include <srs_core_protocol.hpp> | 34 | #include <srs_core_protocol.hpp> |
| @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 26 | #include <time.h> | 26 | #include <time.h> |
| 27 | #include <stdlib.h> | 27 | #include <stdlib.h> |
| 28 | 28 | ||
| 29 | -#include <srs_core_error.hpp> | 29 | +#include <srs_kernel_error.hpp> |
| 30 | #include <srs_core_log.hpp> | 30 | #include <srs_core_log.hpp> |
| 31 | #include <srs_core_autofree.hpp> | 31 | #include <srs_core_autofree.hpp> |
| 32 | #include <srs_core_socket.hpp> | 32 | #include <srs_core_socket.hpp> |
| @@ -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 | 33 | ||
| 34 | #include <algorithm> | 34 | #include <algorithm> |
| 35 | 35 | ||
| 36 | -#include <srs_core_error.hpp> | 36 | +#include <srs_kernel_error.hpp> |
| 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> |
| @@ -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 <netinet/in.h> | 32 | #include <netinet/in.h> |
| 33 | #include <arpa/inet.h> | 33 | #include <arpa/inet.h> |
| 34 | 34 | ||
| 35 | -#include <srs_core_error.hpp> | 35 | +#include <srs_kernel_error.hpp> |
| 36 | #include <srs_core_rtmp.hpp> | 36 | #include <srs_core_rtmp.hpp> |
| 37 | #include <srs_core_log.hpp> | 37 | #include <srs_core_log.hpp> |
| 38 | #include <srs_core_socket.hpp> | 38 | #include <srs_core_socket.hpp> |
| @@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 29 | #include <srs_core_log.hpp> | 29 | #include <srs_core_log.hpp> |
| 30 | #include <srs_core_config.hpp> | 30 | #include <srs_core_config.hpp> |
| 31 | #include <srs_core_reload.hpp> | 31 | #include <srs_core_reload.hpp> |
| 32 | -#include <srs_core_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 |
| 35 | 35 |
| @@ -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_core_log.hpp> | 26 | #include <srs_core_log.hpp> |
| 27 | #include <srs_core_amf0.hpp> | 27 | #include <srs_core_amf0.hpp> |
| 28 | -#include <srs_core_error.hpp> | 28 | +#include <srs_kernel_error.hpp> |
| 29 | #include <srs_core_socket.hpp> | 29 | #include <srs_core_socket.hpp> |
| 30 | #include <srs_core_buffer.hpp> | 30 | #include <srs_core_buffer.hpp> |
| 31 | #include <srs_core_stream.hpp> | 31 | #include <srs_core_stream.hpp> |
| @@ -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 | 35 | ||
| 36 | #include <srs_core_st.hpp> | 36 | #include <srs_core_st.hpp> |
| 37 | #include <srs_core_log.hpp> | 37 | #include <srs_core_log.hpp> |
| 38 | -#include <srs_core_error.hpp> | 38 | +#include <srs_kernel_error.hpp> |
| 39 | 39 | ||
| 40 | // the following is the timeout for rtmp protocol, | 40 | // the following is the timeout for rtmp protocol, |
| 41 | // to avoid death connection. | 41 | // to avoid death connection. |
| @@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 23 | 23 | ||
| 24 | #include <srs_core_refer.hpp> | 24 | #include <srs_core_refer.hpp> |
| 25 | 25 | ||
| 26 | -#include <srs_core_error.hpp> | 26 | +#include <srs_kernel_error.hpp> |
| 27 | #include <srs_core_log.hpp> | 27 | #include <srs_core_log.hpp> |
| 28 | #include <srs_core_config.hpp> | 28 | #include <srs_core_config.hpp> |
| 29 | 29 |
| @@ -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 | using namespace std; | 26 | using namespace std; |
| 27 | 27 | ||
| 28 | -#include <srs_core_error.hpp> | 28 | +#include <srs_kernel_error.hpp> |
| 29 | 29 | ||
| 30 | ISrsReloadHandler::ISrsReloadHandler() | 30 | ISrsReloadHandler::ISrsReloadHandler() |
| 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_core_rtmp.hpp> | 24 | #include <srs_core_rtmp.hpp> |
| 25 | 25 | ||
| 26 | #include <srs_core_log.hpp> | 26 | #include <srs_core_log.hpp> |
| 27 | -#include <srs_core_error.hpp> | 27 | +#include <srs_kernel_error.hpp> |
| 28 | #include <srs_core_socket.hpp> | 28 | #include <srs_core_socket.hpp> |
| 29 | #include <srs_core_protocol.hpp> | 29 | #include <srs_core_protocol.hpp> |
| 30 | #include <srs_core_autofree.hpp> | 30 | #include <srs_core_autofree.hpp> |
| @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 31 | #include <algorithm> | 31 | #include <algorithm> |
| 32 | 32 | ||
| 33 | #include <srs_core_log.hpp> | 33 | #include <srs_core_log.hpp> |
| 34 | -#include <srs_core_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_core_config.hpp> |
| 37 | 37 |
| @@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 23 | 23 | ||
| 24 | #include <srs_core_socket.hpp> | 24 | #include <srs_core_socket.hpp> |
| 25 | 25 | ||
| 26 | -#include <srs_core_error.hpp> | 26 | +#include <srs_kernel_error.hpp> |
| 27 | 27 | ||
| 28 | SrsSocket::SrsSocket(st_netfd_t client_stfd) | 28 | SrsSocket::SrsSocket(st_netfd_t client_stfd) |
| 29 | { | 29 | { |
| @@ -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_core_stream.hpp> | 24 | #include <srs_core_stream.hpp> |
| 25 | 25 | ||
| 26 | #include <srs_core_log.hpp> | 26 | #include <srs_core_log.hpp> |
| 27 | -#include <srs_core_error.hpp> | 27 | +#include <srs_kernel_error.hpp> |
| 28 | 28 | ||
| 29 | SrsStream::SrsStream() | 29 | SrsStream::SrsStream() |
| 30 | { | 30 | { |
| @@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 23 | 23 | ||
| 24 | #include <srs_core_thread.hpp> | 24 | #include <srs_core_thread.hpp> |
| 25 | 25 | ||
| 26 | -#include <srs_core_error.hpp> | 26 | +#include <srs_kernel_error.hpp> |
| 27 | #include <srs_core_log.hpp> | 27 | #include <srs_core_log.hpp> |
| 28 | 28 | ||
| 29 | ISrsThreadHandler::ISrsThreadHandler() | 29 | ISrsThreadHandler::ISrsThreadHandler() |
| @@ -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_error.hpp> | 24 | +#include <srs_kernel_error.hpp> |
| 25 | 25 | ||
| 26 | bool srs_is_system_control_error(int error_code) | 26 | bool srs_is_system_control_error(int error_code) |
| 27 | { | 27 | { |
| @@ -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_ERROR_HPP | ||
| 25 | -#define SRS_CORE_ERROR_HPP | 24 | +#ifndef SRS_KERNEL_ERROR_HPP |
| 25 | +#define SRS_KERNEL_ERROR_HPP | ||
| 26 | 26 | ||
| 27 | /* | 27 | /* |
| 28 | -#include <srs_core_error.hpp> | 28 | +#include <srs_kernel_error.hpp> |
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | #include <srs_core.hpp> | 31 | #include <srs_core.hpp> |
| @@ -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 | 30 | ||
| 31 | #include <srs_core_rtmp.hpp> | 31 | #include <srs_core_rtmp.hpp> |
| 32 | #include <srs_core_protocol.hpp> | 32 | #include <srs_core_protocol.hpp> |
| 33 | -#include <srs_core_error.hpp> | 33 | +#include <srs_kernel_error.hpp> |
| 34 | #include <srs_core_amf0.hpp> | 34 | #include <srs_core_amf0.hpp> |
| 35 | #include <srs_core_autofree.hpp> | 35 | #include <srs_core_autofree.hpp> |
| 36 | #include <srs_core_stream.hpp> | 36 | #include <srs_core_stream.hpp> |
| @@ -22,7 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -22,7 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <srs_core_log.hpp> | 24 | #include <srs_core_log.hpp> |
| 25 | -#include <srs_core_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_core_config.hpp> |
| 28 | 28 |
| @@ -9,6 +9,9 @@ file | @@ -9,6 +9,9 @@ file | ||
| 9 | ..\core\srs_core.cpp, | 9 | ..\core\srs_core.cpp, |
| 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, | ||
| 13 | + ..\kernel\srs_kernel_error.hpp, | ||
| 14 | + ..\kernel\srs_kernel_error.cpp, | ||
| 12 | app readonly separator, | 15 | app readonly separator, |
| 13 | ..\app\srs_core_amf0.hpp, | 16 | ..\app\srs_core_amf0.hpp, |
| 14 | ..\app\srs_core_amf0.cpp, | 17 | ..\app\srs_core_amf0.cpp, |
| @@ -26,8 +29,6 @@ file | @@ -26,8 +29,6 @@ file | ||
| 26 | ..\app\srs_core_conn.cpp, | 29 | ..\app\srs_core_conn.cpp, |
| 27 | ..\app\srs_core_encoder.hpp, | 30 | ..\app\srs_core_encoder.hpp, |
| 28 | ..\app\srs_core_encoder.cpp, | 31 | ..\app\srs_core_encoder.cpp, |
| 29 | - ..\app\srs_core_error.hpp, | ||
| 30 | - ..\app\srs_core_error.cpp, | ||
| 31 | ..\app\srs_core_forward.hpp, | 32 | ..\app\srs_core_forward.hpp, |
| 32 | ..\app\srs_core_forward.cpp, | 33 | ..\app\srs_core_forward.cpp, |
| 33 | ..\app\srs_core_handshake.hpp, | 34 | ..\app\srs_core_handshake.hpp, |
-
请 注册 或 登录 后发表评论