正在显示
3 个修改的文件
包含
15 行增加
和
6 行删除
| @@ -272,4 +272,13 @@ ok_msg "test \" ${item} \"" | @@ -272,4 +272,13 @@ ok_msg "test \" ${item} \"" | ||
| 272 | ret=$?; if [[ $ret -ne 0 ]]; then failed_msg "test \" ${item} \" failed. ret=$ret"; exit $ret; fi | 272 | ret=$?; if [[ $ret -ne 0 ]]; then failed_msg "test \" ${item} \" failed. ret=$ret"; exit $ret; fi |
| 273 | ok_msg "test \" ${item} \" success" | 273 | ok_msg "test \" ${item} \" success" |
| 274 | 274 | ||
| 275 | +####################################################################################################### | ||
| 276 | +####################################################################################################### | ||
| 277 | +####################################################################################################### | ||
| 278 | +item="./configure --without-utest" | ||
| 279 | +ok_msg "test \" ${item} \"" | ||
| 280 | +($item && make $params) >>$log 2>&1 | ||
| 281 | +ret=$?; if [[ $ret -ne 0 ]]; then failed_msg "test \" ${item} \" failed. ret=$ret"; exit $ret; fi | ||
| 282 | +ok_msg "test \" ${item} \" success" | ||
| 283 | + | ||
| 275 | echo "success" | 284 | echo "success" |
| @@ -154,9 +154,9 @@ int SrsStreamListener::listen(string i, int p) | @@ -154,9 +154,9 @@ int SrsStreamListener::listen(string i, int p) | ||
| 154 | return ret; | 154 | return ret; |
| 155 | } | 155 | } |
| 156 | 156 | ||
| 157 | - srs_info("listen thread cid=%d, current_cid=%d, " | 157 | + srs_info("listen thread current_cid=%d, " |
| 158 | "listen at port=%d, type=%d, fd=%d started success, ep=%s:%d", | 158 | "listen at port=%d, type=%d, fd=%d started success, ep=%s:%d", |
| 159 | - pthread->cid(), _srs_context->get_id(), _port, _type, fd, ip.c_str(), port); | 159 | + _srs_context->get_id(), p, type, listener->fd(), i.c_str(), p); |
| 160 | 160 | ||
| 161 | srs_trace("%s listen at tcp://%s:%d, fd=%d", srs_listener_type2string(type).c_str(), ip.c_str(), port, listener->fd()); | 161 | srs_trace("%s listen at tcp://%s:%d, fd=%d", srs_listener_type2string(type).c_str(), ip.c_str(), port, listener->fd()); |
| 162 | 162 | ||
| @@ -327,9 +327,9 @@ int SrsUdpStreamListener::listen(string i, int p) | @@ -327,9 +327,9 @@ int SrsUdpStreamListener::listen(string i, int p) | ||
| 327 | return ret; | 327 | return ret; |
| 328 | } | 328 | } |
| 329 | 329 | ||
| 330 | - srs_info("listen thread cid=%d, current_cid=%d, " | 330 | + srs_info("listen thread current_cid=%d, " |
| 331 | "listen at port=%d, type=%d, fd=%d started success, ep=%s:%d", | 331 | "listen at port=%d, type=%d, fd=%d started success, ep=%s:%d", |
| 332 | - pthread->cid(), _srs_context->get_id(), port, type, fd, ip.c_str(), port); | 332 | + _srs_context->get_id(), p, type, listener->fd(), i.c_str(), p); |
| 333 | 333 | ||
| 334 | // notify the handler the fd changed. | 334 | // notify the handler the fd changed. |
| 335 | if ((ret = caster->on_stfd_change(listener->stfd())) != ERROR_SUCCESS) { | 335 | if ((ret = caster->on_stfd_change(listener->stfd())) != ERROR_SUCCESS) { |
| @@ -961,8 +961,8 @@ int SrsProtocol::recv_interlaced_message(SrsCommonMessage** pmsg) | @@ -961,8 +961,8 @@ int SrsProtocol::recv_interlaced_message(SrsCommonMessage** pmsg) | ||
| 961 | return ret; | 961 | return ret; |
| 962 | } | 962 | } |
| 963 | srs_verbose("read message header success. " | 963 | srs_verbose("read message header success. " |
| 964 | - "fmt=%d, mh_size=%d, ext_time=%d, size=%d, message(type=%d, size=%d, time=%"PRId64", sid=%d)", | ||
| 965 | - fmt, mh_size, chunk->extended_timestamp, (chunk->msg? chunk->msg->size : 0), chunk->header.message_type, | 964 | + "fmt=%d, ext_time=%d, size=%d, message(type=%d, size=%d, time=%"PRId64", sid=%d)", |
| 965 | + fmt, chunk->extended_timestamp, (chunk->msg? chunk->msg->size : 0), chunk->header.message_type, | ||
| 966 | chunk->header.payload_length, chunk->header.timestamp, chunk->header.stream_id); | 966 | chunk->header.payload_length, chunk->header.timestamp, chunk->header.stream_id); |
| 967 | 967 | ||
| 968 | // read msg payload from chunk stream. | 968 | // read msg payload from chunk stream. |
-
请 注册 或 登录 后发表评论