diff --git a/trunk/scripts/test_configure.sh b/trunk/scripts/test_configure.sh index e2626e098..a1dd7a6e2 100755 --- a/trunk/scripts/test_configure.sh +++ b/trunk/scripts/test_configure.sh @@ -272,4 +272,13 @@ ok_msg "test \" ${item} \"" ret=$?; if [[ $ret -ne 0 ]]; then failed_msg "test \" ${item} \" failed. ret=$ret"; exit $ret; fi ok_msg "test \" ${item} \" success" +####################################################################################################### +####################################################################################################### +####################################################################################################### +item="./configure --without-utest" +ok_msg "test \" ${item} \"" +($item && make $params) >>$log 2>&1 +ret=$?; if [[ $ret -ne 0 ]]; then failed_msg "test \" ${item} \" failed. ret=$ret"; exit $ret; fi +ok_msg "test \" ${item} \" success" + echo "success" diff --git a/trunk/src/app/srs_app_server.cpp b/trunk/src/app/srs_app_server.cpp index 208ee4036..d4b519831 100644 --- a/trunk/src/app/srs_app_server.cpp +++ b/trunk/src/app/srs_app_server.cpp @@ -154,9 +154,9 @@ int SrsStreamListener::listen(string i, int p) return ret; } - srs_info("listen thread cid=%d, current_cid=%d, " + srs_info("listen thread current_cid=%d, " "listen at port=%d, type=%d, fd=%d started success, ep=%s:%d", - pthread->cid(), _srs_context->get_id(), _port, _type, fd, ip.c_str(), port); + _srs_context->get_id(), p, type, listener->fd(), i.c_str(), p); srs_trace("%s listen at tcp://%s:%d, fd=%d", srs_listener_type2string(type).c_str(), ip.c_str(), port, listener->fd()); @@ -327,9 +327,9 @@ int SrsUdpStreamListener::listen(string i, int p) return ret; } - srs_info("listen thread cid=%d, current_cid=%d, " + srs_info("listen thread current_cid=%d, " "listen at port=%d, type=%d, fd=%d started success, ep=%s:%d", - pthread->cid(), _srs_context->get_id(), port, type, fd, ip.c_str(), port); + _srs_context->get_id(), p, type, listener->fd(), i.c_str(), p); // notify the handler the fd changed. if ((ret = caster->on_stfd_change(listener->stfd())) != ERROR_SUCCESS) { diff --git a/trunk/src/protocol/srs_rtmp_stack.cpp b/trunk/src/protocol/srs_rtmp_stack.cpp index c0ca5e9b5..738a7d81f 100644 --- a/trunk/src/protocol/srs_rtmp_stack.cpp +++ b/trunk/src/protocol/srs_rtmp_stack.cpp @@ -961,8 +961,8 @@ int SrsProtocol::recv_interlaced_message(SrsCommonMessage** pmsg) return ret; } srs_verbose("read message header success. " - "fmt=%d, mh_size=%d, ext_time=%d, size=%d, message(type=%d, size=%d, time=%"PRId64", sid=%d)", - fmt, mh_size, chunk->extended_timestamp, (chunk->msg? chunk->msg->size : 0), chunk->header.message_type, + "fmt=%d, ext_time=%d, size=%d, message(type=%d, size=%d, time=%"PRId64", sid=%d)", + fmt, chunk->extended_timestamp, (chunk->msg? chunk->msg->size : 0), chunk->header.message_type, chunk->header.payload_length, chunk->header.timestamp, chunk->header.stream_id); // read msg payload from chunk stream.