refine the thread model for the retry threads

trunk/conf/srs.conf

@@ -81,11 +81,11 @@ vhost __defaultVhost__ {
 vhost dev {
     enabled         on;
     gop_cache       on;
-    hls             on;
+    hls             off;
     hls_path        ./objs/nginx/html;
     hls_fragment    5;
     hls_window      30;
-    #forward         127.0.0.1:19350;
+    forward         127.0.0.1:19350;
     http_hooks {
         enabled         off;
         on_connect      http://127.0.0.1:8085/api/v1/clients;
@@ -96,7 +96,7 @@ vhost dev {
         on_stop         http://127.0.0.1:8085/api/v1/sessions;
     }
     transcode {
-        enabled     off;
+        enabled     on;
         ffmpeg      ./objs/ffmpeg/bin/ffmpeg;
         engine dev {
             enabled         on;

trunk/configure

@@ -116,7 +116,7 @@ MODULE_FILES=("srs_core" "srs_core_log" "srs_core_server"
         "srs_core_handshake" "srs_core_pithy_print"
         "srs_core_config" "srs_core_refer" "srs_core_reload"
         "srs_core_hls" "srs_core_forward" "srs_core_encoder"
-        "srs_core_http")
+        "srs_core_http" "srs_core_thread")
 MODULE_DIR="src/core" . auto/modules.sh
 CORE_OBJS="${MODULE_OBJS[@]}"
 

trunk/src/core/srs_core.cpp

@@ -111,3 +111,17 @@ void srs_vhost_resolve(std::string& vhost, std::string& app)
 		}
 	}
 }
+
+void srs_close_stfd(st_netfd_t& stfd)
+{
+	if (stfd) {
+		int fd = st_netfd_fileno(stfd);
+		st_netfd_close(stfd);
+		stfd = NULL;
+		
+		// st does not close it sometimes, 
+		// close it manually.
+		close(fd);
+	}
+}
+

trunk/src/core/srs_core.hpp

@@ -46,6 +46,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <stddef.h>
 #include <sys/types.h>
 
+#include <st.h>
+
 // generated by configure.
 #include <srs_auto_headers.hpp>
 
@@ -102,4 +104,7 @@ extern std::string srs_dns_resolve(std::string host);
 //		app...vhost...request_vhost
 extern void srs_vhost_resolve(std::string& vhost, std::string& app);
 
+// close the netfd, and close the underlayer fd.
+extern void srs_close_stfd(st_netfd_t& stfd);
+
 #endif

trunk/src/core/srs_core_conn.cpp

@@ -36,15 +36,7 @@ SrsConnection::SrsConnection(SrsServer* srs_server, st_netfd_t client_stfd)
 
 SrsConnection::~SrsConnection()
 {
-	if (stfd) {
+	srs_close_stfd(stfd);
-		int fd = st_netfd_fileno(stfd);
-		st_netfd_close(stfd);
-		stfd = NULL;
-		
-		// st does not close it sometimes, 
-		// close it manually.
-		close(fd);
-	}
 }
 
 int SrsConnection::start()

trunk/src/core/srs_core_conn.hpp

@@ -30,8 +30,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <srs_core.hpp>
 
-#include <st.h>
-
 class SrsServer;
 class SrsConnection
 {

trunk/src/core/srs_core_encoder.cpp

@@ -483,13 +483,103 @@ void SrsFFMPEG::stop()
 
 SrsEncoder::SrsEncoder()
 {
-	tid = NULL;
+	pthread = new SrsThread(this, SRS_ENCODER_SLEEP_MS);
-	loop = false;
+	pithy_print = new SrsPithyPrint(SRS_STAGE_ENCODER);
 }
 
 SrsEncoder::~SrsEncoder()
 {
 	on_unpublish();
+	
+	srs_freep(pthread);
+}
+
+int SrsEncoder::on_publish(SrsRequest* req)
+{
+	int ret = ERROR_SUCCESS;
+
+	ret = parse_scope_engines(req);
+	
+	// ignore the loop encoder
+	if (ret == ERROR_ENCODER_LOOP) {
+		clear_engines();
+		ret = ERROR_SUCCESS;
+	}
+	
+	// return for error or no engine.
+	if (ret != ERROR_SUCCESS || ffmpegs.empty()) {
+		return ret;
+	}
+    
+    // start thread to run all encoding engines.
+    if ((ret = pthread->start()) != ERROR_SUCCESS) {
+        srs_error("st_thread_create failed. ret=%d", ret);
+        return ret;
+    }
+    
+	return ret;
+}
+
+void SrsEncoder::on_unpublish()
+{
+	pthread->stop();
+	clear_engines();
+}
+
+int SrsEncoder::cycle()
+{
+	int ret = ERROR_SUCCESS;
+	
+	std::vector<SrsFFMPEG*>::iterator it;
+	for (it = ffmpegs.begin(); it != ffmpegs.end(); ++it) {
+		SrsFFMPEG* ffmpeg = *it;
+		
+		// start all ffmpegs.
+		if ((ret = ffmpeg->start()) != ERROR_SUCCESS) {
+			srs_error("ffmpeg start failed. ret=%d", ret);
+			return ret;
+		}
+
+		// check ffmpeg status.
+		if ((ret = ffmpeg->cycle()) != ERROR_SUCCESS) {
+			srs_error("ffmpeg cycle failed. ret=%d", ret);
+			return ret;
+		}
+	}
+
+	// pithy print
+	encoder();
+	pithy_print->elapse(SRS_ENCODER_SLEEP_MS);
+	
+	return ret;
+}
+
+void SrsEncoder::on_leave_loop()
+{
+	// kill ffmpeg when finished and it alive
+	std::vector<SrsFFMPEG*>::iterator it;
+
+	for (it = ffmpegs.begin(); it != ffmpegs.end(); ++it) {
+		SrsFFMPEG* ffmpeg = *it;
+		ffmpeg->stop();
+	}
+}
+
+void SrsEncoder::clear_engines()
+{
+	std::vector<SrsFFMPEG*>::iterator it;
+	
+	for (it = ffmpegs.begin(); it != ffmpegs.end(); ++it) {
+		SrsFFMPEG* ffmpeg = *it;
+		srs_freep(ffmpeg);
+	}
+
+	ffmpegs.clear();
+}
+
+SrsFFMPEG* SrsEncoder::at(int index)
+{
+	return ffmpegs[index];
 }
 
 int SrsEncoder::parse_scope_engines(SrsRequest* req)
@@ -531,60 +621,6 @@ int SrsEncoder::parse_scope_engines(SrsRequest* req)
 	return ret;
 }
 
-int SrsEncoder::on_publish(SrsRequest* req)
-{
-	int ret = ERROR_SUCCESS;
-
-	ret = parse_scope_engines(req);
-	
-	// ignore the loop encoder
-	if (ret == ERROR_ENCODER_LOOP) {
-		ret = ERROR_SUCCESS;
-	}
-	
-	// return for error or no engine.
-	if (ret != ERROR_SUCCESS || ffmpegs.empty()) {
-		return ret;
-	}
-    
-    // start thread to run all encoding engines.
-    srs_assert(!tid);
-    if((tid = st_thread_create(encoder_thread, this, 1, 0)) == NULL) {
-		ret = ERROR_ST_CREATE_FORWARD_THREAD;
-        srs_error("st_thread_create failed. ret=%d", ret);
-        return ret;
-    }
-    
-	return ret;
-}
-
-void SrsEncoder::on_unpublish()
-{
-	if (tid) {
-		loop = false;
-		st_thread_interrupt(tid);
-		st_thread_join(tid, NULL);
-		tid = NULL;
-	}
-
-	clear_engines();
-}
-
-void SrsEncoder::clear_engines()
-{
-	std::vector<SrsFFMPEG*>::iterator it;
-	for (it = ffmpegs.begin(); it != ffmpegs.end(); ++it) {
-		SrsFFMPEG* ffmpeg = *it;
-		srs_freep(ffmpeg);
-	}
-	ffmpegs.clear();
-}
-
-SrsFFMPEG* SrsEncoder::at(int index)
-{
-	return ffmpegs[index];
-}
-
 int SrsEncoder::parse_transcode(SrsRequest* req, SrsConfDirective* conf)
 {
 	int ret = ERROR_SUCCESS;
@@ -631,7 +667,6 @@ int SrsEncoder::parse_transcode(SrsRequest* req, SrsConfDirective* conf)
 			
 			// if got a loop, donot transcode the whole stream.
 			if (ret == ERROR_ENCODER_LOOP) {
-				clear_engines();
 				break;
 			}
 			
@@ -646,85 +681,14 @@ int SrsEncoder::parse_transcode(SrsRequest* req, SrsConfDirective* conf)
 	return ret;
 }
 
-int SrsEncoder::cycle()
+void SrsEncoder::encoder()
-{
-	int ret = ERROR_SUCCESS;
-	
-	std::vector<SrsFFMPEG*>::iterator it;
-	for (it = ffmpegs.begin(); it != ffmpegs.end(); ++it) {
-		SrsFFMPEG* ffmpeg = *it;
-		
-		// start all ffmpegs.
-		if ((ret = ffmpeg->start()) != ERROR_SUCCESS) {
-			srs_error("ffmpeg start failed. ret=%d", ret);
-			return ret;
-		}
-
-		// check ffmpeg status.
-		if ((ret = ffmpeg->cycle()) != ERROR_SUCCESS) {
-			srs_error("ffmpeg cycle failed. ret=%d", ret);
-			return ret;
-		}
-	}
-	
-	return ret;
-}
-
-void SrsEncoder::encoder_cycle()
-{
-	int ret = ERROR_SUCCESS;
-	
-	log_context->generate_id();
-	srs_trace("encoder cycle start");
-	
-	SrsPithyPrint pithy_print(SRS_STAGE_ENCODER);
-	
-	while (loop) {
-		if ((ret = cycle()) != ERROR_SUCCESS) {
-			srs_warn("encoder cycle failed, ignored and retry, ret=%d", ret);
-		} else {
-			srs_info("encoder cycle success, retry");
-		}
-		
-		if (!loop) {
-			break;
-		}
-
-		encoder(&pithy_print);
-		pithy_print.elapse(SRS_ENCODER_SLEEP_MS);
-		
-		st_usleep(SRS_ENCODER_SLEEP_MS * 1000);
-	}
-	
-	// kill ffmpeg when finished and it alive
-	std::vector<SrsFFMPEG*>::iterator it;
-	for (it = ffmpegs.begin(); it != ffmpegs.end(); ++it) {
-		SrsFFMPEG* ffmpeg = *it;
-		ffmpeg->stop();
-	}
-	
-	srs_trace("encoder cycle finished");
-}
-
-void SrsEncoder::encoder(SrsPithyPrint* pithy_print)
 {
 	// reportable
 	if (pithy_print->can_print()) {
-		srs_trace("-> time=%"PRId64", encoders=%d",
+		// TODO: FIXME: show more info.
-			pithy_print->get_age(), (int)ffmpegs.size());
+		srs_trace("-> time=%"PRId64", encoders=%d", pithy_print->get_age(), (int)ffmpegs.size());
 	}
 }
 
-void* SrsEncoder::encoder_thread(void* arg)
-{
-	SrsEncoder* obj = (SrsEncoder*)arg;
-	srs_assert(obj != NULL);
-	
-	obj->loop = true;
-	obj->encoder_cycle();
-	
-	return NULL;
-}
-
 #endif
 

trunk/src/core/srs_core_encoder.hpp

@@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <string>
 #include <vector>
 
-#include <st.h>
+#include <srs_core_thread.hpp>
 
 class SrsConfDirective;
 class SrsRequest;
@@ -85,28 +85,29 @@ public:
 * the encoder for a stream,
 * may use multiple ffmpegs to transcode the specified stream.
 */
-class SrsEncoder
+class SrsEncoder : public ISrsThreadHandler
 {
 private:
 	std::vector<SrsFFMPEG*> ffmpegs;
 private:
-	st_thread_t tid;
+	SrsThread* pthread;
-	bool loop;
+	SrsPithyPrint* pithy_print;
 public:
 	SrsEncoder();
 	virtual ~SrsEncoder();
 public:
 	virtual int on_publish(SrsRequest* req);
 	virtual void on_unpublish();
+// interface ISrsThreadHandler.
+public:
+	virtual int cycle();
+	virtual void on_leave_loop();
 private:
-	virtual int parse_scope_engines(SrsRequest* req);
 	virtual void clear_engines();
 	virtual SrsFFMPEG* at(int index);
+	virtual int parse_scope_engines(SrsRequest* req);
 	virtual int parse_transcode(SrsRequest* req, SrsConfDirective* conf);
-	virtual int cycle();
+	virtual void encoder();
-	virtual void encoder_cycle();
-	virtual void encoder(SrsPithyPrint* pithy_print);
-	static void* encoder_thread(void* arg);
 };
 
 #endif

trunk/src/core/srs_core_error.hpp

@@ -37,8 +37,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define ERROR_ST_OPEN_SOCKET			102
 #define ERROR_ST_CREATE_LISTEN_THREAD	103
 #define ERROR_ST_CREATE_CYCLE_THREAD	104
-#define ERROR_ST_CREATE_FORWARD_THREAD	105
+#define ERROR_ST_CONNECT				105
-#define ERROR_ST_CONNECT				106
 
 #define ERROR_SOCKET_CREATE 			200
 #define ERROR_SOCKET_SETREUSE 			201

trunk/src/core/srs_core_forward.cpp

@@ -1,387 +1,329 @@
-/*
+/*
-The MIT License (MIT)
+The MIT License (MIT)
-
+
-Copyright (c) 2013 winlin
+Copyright (c) 2013 winlin
-
+
-Permission is hereby granted, free of charge, to any person obtaining a copy of
+Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
+this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
+the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
+the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
+subject to the following conditions:
-
+
-The above copyright notice and this permission notice shall be included in all
+The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+copies or substantial portions of the Software.
-
+
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
+*/
-
+
-#include <srs_core_forward.hpp>
+#include <srs_core_forward.hpp>
-
+
-#include <stdlib.h>
+#include <stdlib.h>
-#include <sys/socket.h>
+#include <sys/socket.h>
-#include <netinet/in.h>
+#include <netinet/in.h>
-#include <arpa/inet.h>
+#include <arpa/inet.h>
-
+
-#include <srs_core_error.hpp>
+#include <srs_core_error.hpp>
-#include <srs_core_rtmp.hpp>
+#include <srs_core_rtmp.hpp>
-#include <srs_core_log.hpp>
+#include <srs_core_log.hpp>
-#include <srs_core_protocol.hpp>
+#include <srs_core_protocol.hpp>
-#include <srs_core_pithy_print.hpp>
+#include <srs_core_pithy_print.hpp>
-#include <srs_core_rtmp.hpp>
+#include <srs_core_rtmp.hpp>
-#include <srs_core_config.hpp>
+#include <srs_core_config.hpp>
-
+
-#define SRS_PULSE_TIMEOUT_MS 100
+#define SRS_PULSE_TIMEOUT_MS 100
-#define SRS_FORWARDER_SLEEP_MS 2000
+#define SRS_FORWARDER_SLEEP_MS 2000
-#define SRS_SEND_TIMEOUT_US 3000000L
+#define SRS_SEND_TIMEOUT_US 3000000L
-#define SRS_RECV_TIMEOUT_US SRS_SEND_TIMEOUT_US
+#define SRS_RECV_TIMEOUT_US SRS_SEND_TIMEOUT_US
-
+
-SrsForwarder::SrsForwarder()
+SrsForwarder::SrsForwarder()
-{
+{
-	client = NULL;
+	client = NULL;
-	stfd = NULL;
+	stfd = NULL;
-	stream_id = 0;
+	stream_id = 0;
-	
+
-	tid = NULL;
+	pthread = new SrsThread(this, SRS_FORWARDER_SLEEP_MS);
-	loop = false;
+}
-}
+
-
+SrsForwarder::~SrsForwarder()
-SrsForwarder::~SrsForwarder()
+{
-{
+	on_unpublish();
-	on_unpublish();
+	
-	
+	std::vector<SrsSharedPtrMessage*>::iterator it;
-	std::vector<SrsSharedPtrMessage*>::iterator it;
+	for (it = msgs.begin(); it != msgs.end(); ++it) {
-	for (it = msgs.begin(); it != msgs.end(); ++it) {
+		SrsSharedPtrMessage* msg = *it;
-		SrsSharedPtrMessage* msg = *it;
+		srs_freep(msg);
-		srs_freep(msg);
+	}
-	}
+	msgs.clear();
-	msgs.clear();
+	
-}
+	srs_freep(pthread);
-
+}
-int SrsForwarder::on_publish(SrsRequest* req, std::string forward_server)
+
-{
+int SrsForwarder::on_publish(SrsRequest* req, std::string forward_server)
-	int ret = ERROR_SUCCESS;
+{
-	
+	int ret = ERROR_SUCCESS;
-	// forward app
+	
-	app = req->app;
+	// forward app
-	
+	app = req->app;
-	stream_name = req->stream;
+	
-	server = forward_server;
+	stream_name = req->stream;
-	std::string s_port = RTMP_DEFAULT_PORTS;
+	server = forward_server;
-	port = RTMP_DEFAULT_PORT;
+	std::string s_port = RTMP_DEFAULT_PORTS;
-	
+	port = RTMP_DEFAULT_PORT;
-	size_t pos = forward_server.find(":");
+	
-	if (pos != std::string::npos) {
+	size_t pos = forward_server.find(":");
-		s_port = forward_server.substr(pos + 1);
+	if (pos != std::string::npos) {
-		server = forward_server.substr(0, pos);
+		s_port = forward_server.substr(pos + 1);
-	}
+		server = forward_server.substr(0, pos);
-	// discovery vhost
+	}
-	std::string vhost = req->vhost;
+	// discovery vhost
-	srs_vhost_resolve(vhost, s_port);
+	std::string vhost = req->vhost;
-	port = ::atoi(s_port.c_str());
+	srs_vhost_resolve(vhost, s_port);
-	
+	port = ::atoi(s_port.c_str());
-	// generate tcUrl
+	
-	tc_url = "rtmp://";
+	// generate tcUrl
-	tc_url += vhost;
+	tc_url = "rtmp://";
-	tc_url += "/";
+	tc_url += vhost;
-	tc_url += req->app;
+	tc_url += "/";
-	
+	tc_url += req->app;
-	// dead loop check
+	
-	std::string source_ep = req->vhost;
+	// dead loop check
-	source_ep += ":";
+	std::string source_ep = req->vhost;
-	source_ep += req->port;
+	source_ep += ":";
-	
+	source_ep += req->port;
-	std::string dest_ep = vhost;
+	
-	dest_ep += ":";
+	std::string dest_ep = vhost;
-	dest_ep += s_port;
+	dest_ep += ":";
-	
+	dest_ep += s_port;
-	if (source_ep == dest_ep) {
+	
-		ret = ERROR_SYSTEM_FORWARD_LOOP;
+	if (source_ep == dest_ep) {
-		srs_warn("farder loop detected. src=%s, dest=%s, ret=%d", 
+		ret = ERROR_SYSTEM_FORWARD_LOOP;
-			source_ep.c_str(), dest_ep.c_str(), ret);
+		srs_warn("farder loop detected. src=%s, dest=%s, ret=%d", 
-		return ret;
+			source_ep.c_str(), dest_ep.c_str(), ret);
-	}
+		return ret;
-	srs_trace("start forward %s to %s, stream: %s/%s", 
+	}
-		source_ep.c_str(), dest_ep.c_str(), tc_url.c_str(), 
+	srs_trace("start forward %s to %s, stream: %s/%s", 
-		stream_name.c_str());
+		source_ep.c_str(), dest_ep.c_str(), tc_url.c_str(), 
-	
+		stream_name.c_str());
-	// TODO: seems bug when republish and reforward.
+	
-	
+	if ((ret = pthread->start()) != ERROR_SUCCESS) {
-	// start forward
+        srs_error("start srs thread failed. ret=%d", ret);
-	if ((ret = open_socket()) != ERROR_SUCCESS) {
+        return ret;
-		return ret;
+	}
-	}
+	
-    
+	return ret;
-    srs_assert(!tid);
+}
-    if((tid = st_thread_create(forward_thread, this, 1, 0)) == NULL){
+
-		ret = ERROR_ST_CREATE_FORWARD_THREAD;
+void SrsForwarder::on_unpublish()
-        srs_error("st_thread_create failed. ret=%d", ret);
+{
-        return ret;
+	pthread->stop();
-    }
+	
-	
+	close_underlayer_socket();
-	return ret;
+	
-}
+	srs_freep(client);
-
+}
-void SrsForwarder::on_unpublish()
+
-{
+int SrsForwarder::on_meta_data(SrsSharedPtrMessage* metadata)
-	if (tid) {
+{
-		loop = false;
+	int ret = ERROR_SUCCESS;
-		st_thread_interrupt(tid);
+	
-		st_thread_join(tid, NULL);
+	msgs.push_back(metadata);
-		tid = NULL;
+	
-	}
+	return ret;
-	
+}
-	if (stfd) {
+
-		int fd = st_netfd_fileno(stfd);
+int SrsForwarder::on_audio(SrsSharedPtrMessage* msg)
-		st_netfd_close(stfd);
+{
-		stfd = NULL;
+	int ret = ERROR_SUCCESS;
-		
+	
-		// st does not close it sometimes, 
+	// TODO: FIXME: must drop the msgs when server failed.
-		// close it manually.
+	msgs.push_back(msg);
-		close(fd);
+	
-	}
+	return ret;
-	
+}
-	srs_freep(client);
+
-}
+int SrsForwarder::on_video(SrsSharedPtrMessage* msg)
-
+{
-int SrsForwarder::on_meta_data(SrsSharedPtrMessage* metadata)
+	int ret = ERROR_SUCCESS;
-{
+	
-	int ret = ERROR_SUCCESS;
+	// TODO: FIXME: must drop the msgs when server failed.
-	
+	msgs.push_back(msg);
-	msgs.push_back(metadata);
+	
-	
+	return ret;
-	return ret;
+}
-}
+
-
+int SrsForwarder::cycle()
-int SrsForwarder::on_audio(SrsSharedPtrMessage* msg)
+{
-{
+	int ret = ERROR_SUCCESS;
-	int ret = ERROR_SUCCESS;
+	
-	
+	if ((ret = connect_server()) != ERROR_SUCCESS) {
-	// TODO: FIXME: must drop the msgs when server failed.
+		return ret;
-	msgs.push_back(msg);
+	}
-	
+	srs_assert(client);
-	return ret;
+
-}
+	client->set_recv_timeout(SRS_RECV_TIMEOUT_US);
-
+	client->set_send_timeout(SRS_SEND_TIMEOUT_US);
-int SrsForwarder::on_video(SrsSharedPtrMessage* msg)
+	
-{
+	if ((ret = client->handshake()) != ERROR_SUCCESS) {
-	int ret = ERROR_SUCCESS;
+		srs_error("handshake with server failed. ret=%d", ret);
-	
+		return ret;
-	// TODO: FIXME: must drop the msgs when server failed.
+	}
-	msgs.push_back(msg);
+	if ((ret = client->connect_app(app, tc_url)) != ERROR_SUCCESS) {
-	
+		srs_error("connect with server failed, tcUrl=%s. ret=%d", tc_url.c_str(), ret);
-	return ret;
+		return ret;
-}
+	}
-
+	if ((ret = client->create_stream(stream_id)) != ERROR_SUCCESS) {
-int SrsForwarder::open_socket()
+		srs_error("connect with server failed, stream_id=%d. ret=%d", stream_id, ret);
-{
+		return ret;
-	int ret = ERROR_SUCCESS;
+	}
-	
+	
-	srs_trace("forward stream=%s, tcUrl=%s to server=%s, port=%d",
+	// TODO: FIXME: need to cache the metadata and sequence header when reconnect.
-		stream_name.c_str(), tc_url.c_str(), server.c_str(), port);
+	
-
+	if ((ret = client->publish(stream_name, stream_id)) != ERROR_SUCCESS) {
-    int sock = socket(AF_INET, SOCK_STREAM, 0);
+		srs_error("connect with server failed, stream_name=%s, stream_id=%d. ret=%d", 
-    if(sock == -1){
+			stream_name.c_str(), stream_id, ret);
-        ret = ERROR_SOCKET_CREATE;
+		return ret;
-        srs_error("create socket error. ret=%d", ret);
+	}
-        return ret;
+	
-    }
+	if ((ret = forward()) != ERROR_SUCCESS) {
-    
+		return ret;
-    stfd = st_netfd_open_socket(sock);
+	}
-    if(stfd == NULL){
+	
-        ret = ERROR_ST_OPEN_SOCKET;
+	return ret;
-        srs_error("st_netfd_open_socket failed. ret=%d", ret);
+}
-        return ret;
+
-    }
+void SrsForwarder::close_underlayer_socket()
-
+{
-	srs_freep(client);
+	srs_close_stfd(stfd);
-	client = new SrsRtmpClient(stfd);
+}
-	
+
-	return ret;
+int SrsForwarder::connect_server()
-}
+{
-
+	int ret = ERROR_SUCCESS;
-int SrsForwarder::connect_server()
+	
-{
+	// reopen
-	int ret = ERROR_SUCCESS;
+	close_underlayer_socket();
-	
+	
-	std::string ip = srs_dns_resolve(server);
+	// open socket.
-	if (ip.empty()) {
+	srs_trace("forward stream=%s, tcUrl=%s to server=%s, port=%d",
-		ret = ERROR_SYSTEM_IP_INVALID;
+		stream_name.c_str(), tc_url.c_str(), server.c_str(), port);
-		srs_error("dns resolve server error, ip empty. ret=%d", ret);
+
-		return ret;
+    int sock = socket(AF_INET, SOCK_STREAM, 0);
-	}
+    if(sock == -1){
-	
+        ret = ERROR_SOCKET_CREATE;
-    sockaddr_in addr;
+        srs_error("create socket error. ret=%d", ret);
-    addr.sin_family = AF_INET;
+        return ret;
-    addr.sin_port = htons(port);
+    }
-    addr.sin_addr.s_addr = inet_addr(ip.c_str());
+    
-    
+    srs_assert(!stfd);
-    if (st_connect(stfd, (const struct sockaddr*)&addr, sizeof(sockaddr_in), ST_UTIME_NO_TIMEOUT) == -1){
+    stfd = st_netfd_open_socket(sock);
-        ret = ERROR_ST_CONNECT;
+    if(stfd == NULL){
-        srs_error("connect to server error. ip=%s, port=%d, ret=%d", ip.c_str(), port, ret);
+        ret = ERROR_ST_OPEN_SOCKET;
-        return ret;
+        srs_error("st_netfd_open_socket failed. ret=%d", ret);
-    }
+        return ret;
-    srs_trace("connect to server success. server=%s, ip=%s, port=%d", server.c_str(), ip.c_str(), port);
+    }
-    
+
-	return ret;
+	srs_freep(client);
-}
+	client = new SrsRtmpClient(stfd);
-
+	
-int SrsForwarder::cycle()
+	// connect to server.
-{
+	std::string ip = srs_dns_resolve(server);
-	int ret = ERROR_SUCCESS;
+	if (ip.empty()) {
-
+		ret = ERROR_SYSTEM_IP_INVALID;
-	client->set_recv_timeout(SRS_RECV_TIMEOUT_US);
+		srs_error("dns resolve server error, ip empty. ret=%d", ret);
-	client->set_send_timeout(SRS_SEND_TIMEOUT_US);
+		return ret;
-	
+	}
-	if ((ret = connect_server()) != ERROR_SUCCESS) {
+	
-		return ret;
+    sockaddr_in addr;
-	}
+    addr.sin_family = AF_INET;
-	srs_assert(client);
+    addr.sin_port = htons(port);
-	
+    addr.sin_addr.s_addr = inet_addr(ip.c_str());
-	if ((ret = client->handshake()) != ERROR_SUCCESS) {
+    
-		srs_error("handshake with server failed. ret=%d", ret);
+    if (st_connect(stfd, (const struct sockaddr*)&addr, sizeof(sockaddr_in), ST_UTIME_NO_TIMEOUT) == -1){
-		return ret;
+        ret = ERROR_ST_CONNECT;
-	}
+        srs_error("connect to server error. ip=%s, port=%d, ret=%d", ip.c_str(), port, ret);
-	if ((ret = client->connect_app(app, tc_url)) != ERROR_SUCCESS) {
+        return ret;
-		srs_error("connect with server failed, tcUrl=%s. ret=%d", tc_url.c_str(), ret);
+    }
-		return ret;
+    srs_trace("connect to server success. server=%s, ip=%s, port=%d", server.c_str(), ip.c_str(), port);
-	}
+    
-	if ((ret = client->create_stream(stream_id)) != ERROR_SUCCESS) {
+	return ret;
-		srs_error("connect with server failed, stream_id=%d. ret=%d", stream_id, ret);
+}
-		return ret;
+
-	}
+int SrsForwarder::forward()
-	
+{
-	// TODO: FIXME: need to cache the metadata and sequence header when reconnect.
+	int ret = ERROR_SUCCESS;
-	
+	
-	if ((ret = client->publish(stream_name, stream_id)) != ERROR_SUCCESS) {
+	client->set_recv_timeout(SRS_PULSE_TIMEOUT_MS * 1000);
-		srs_error("connect with server failed, stream_name=%s, stream_id=%d. ret=%d", 
+	
-			stream_name.c_str(), stream_id, ret);
+	SrsPithyPrint pithy_print(SRS_STAGE_FORWARDER);
-		return ret;
+
-	}
+	while (true) {
-	
+		// switch to other st-threads.
-	if ((ret = forward()) != ERROR_SUCCESS) {
+		st_usleep(0);
-		return ret;
+
-	}
+		// read from client.
-	
+		if (true) {
-	return ret;
+			SrsCommonMessage* msg = NULL;
-}
+			ret = client->recv_message(&msg);
-
+			
-int SrsForwarder::forward()
+			srs_verbose("play loop recv message. ret=%d", ret);
-{
+			if (ret != ERROR_SUCCESS && ret != ERROR_SOCKET_TIMEOUT) {
-	int ret = ERROR_SUCCESS;
+				srs_error("recv server control message failed. ret=%d", ret);
-	
+				return ret;
-	client->set_recv_timeout(SRS_PULSE_TIMEOUT_MS * 1000);
+			}
-	
+		}
-	SrsPithyPrint pithy_print(SRS_STAGE_FORWARDER);
+		
-
+		// ignore when no messages.
-	while (loop) {
+		int count = (int)msgs.size();
-		pithy_print.elapse(SRS_PULSE_TIMEOUT_MS);
+		if (msgs.empty()) {
-		
+			continue;
-		// switch to other st-threads.
+		}
-		st_usleep(0);
+
-
+		// pithy print
-		// read from client.
+		pithy_print.elapse(SRS_PULSE_TIMEOUT_MS);
-		if (true) {
+		if (pithy_print.can_print()) {
-			SrsCommonMessage* msg = NULL;
+			srs_trace("-> time=%"PRId64", msgs=%d, obytes=%"PRId64", ibytes=%"PRId64", okbps=%d, ikbps=%d", 
-			ret = client->recv_message(&msg);
+				pithy_print.get_age(), count, client->get_send_bytes(), client->get_recv_bytes(), client->get_send_kbps(), client->get_recv_kbps());
-			
+		}
-			srs_verbose("play loop recv message. ret=%d", ret);
+	
-			if (ret != ERROR_SUCCESS && ret != ERROR_SOCKET_TIMEOUT) {
+		// all msgs to forward.
-				srs_error("recv server control message failed. ret=%d", ret);
+		int i = 0;
-				return ret;
+		for (i = 0; i < count; i++) {
-			}
+			SrsSharedPtrMessage* msg = msgs[i];
-		}
+			msgs[i] = NULL;
-		
+
-		// ignore when no messages.
+			// we erased the sendout messages, the msg must not be NULL.
-		int count = (int)msgs.size();
+			srs_assert(msg);
-		if (msgs.empty()) {
+			
-			continue;
+			ret = client->send_message(msg);
-		}
+			if (ret != ERROR_SUCCESS) {
-
+				srs_error("forwarder send message to server failed. ret=%d", ret);
-		// reportable
+		
-		if (pithy_print.can_print()) {
+				// convert the index to count when error.
-			srs_trace("-> time=%"PRId64", msgs=%d, obytes=%"PRId64", ibytes=%"PRId64", okbps=%d, ikbps=%d", 
+				i++;
-				pithy_print.get_age(), count, client->get_send_bytes(), client->get_recv_bytes(), client->get_send_kbps(), client->get_recv_kbps());
+				
-		}
+				break;
-	
+			}
-		// all msgs to forward.
+		}
-		int i = 0;
+
-		for (i = 0; i < count; i++) {
+		// clear sendout mesages.
-			SrsSharedPtrMessage* msg = msgs[i];
+		if (i < count) {
-			msgs[i] = NULL;
+			srs_warn("clear forwarded msg, total=%d, forwarded=%d, ret=%d", count, i, ret);
-
+		} else {
-			// we erased the sendout messages, the msg must not be NULL.
+			srs_info("clear forwarded msg, total=%d, forwarded=%d, ret=%d", count, i, ret);
-			srs_assert(msg);
+		}
-			
+		msgs.erase(msgs.begin(), msgs.begin() + i);
-			ret = client->send_message(msg);
+		
-			if (ret != ERROR_SUCCESS) {
+		if (ret != ERROR_SUCCESS) {
-				srs_error("forwarder send message to server failed. ret=%d", ret);
+			break;
-		
+		}
-				// convert the index to count when error.
+	}
-				i++;
+	
-				
+	return ret;
-				break;
+}
-			}
+
-		}
-
-		// clear sendout mesages.
-		if (i < count) {
-			srs_warn("clear forwarded msg, total=%d, forwarded=%d, ret=%d", count, i, ret);
-		} else {
-			srs_info("clear forwarded msg, total=%d, forwarded=%d, ret=%d", count, i, ret);
-		}
-		msgs.erase(msgs.begin(), msgs.begin() + i);
-		
-		if (ret != ERROR_SUCCESS) {
-			break;
-		}
-	}
-	
-	return ret;
-}
-
-void SrsForwarder::forward_cycle()
-{
-	int ret = ERROR_SUCCESS;
-	
-	log_context->generate_id();
-	srs_trace("forward cycle start");
-	
-	while (loop) {
-		if ((ret = cycle()) != ERROR_SUCCESS) {
-			srs_warn("forward cycle failed, ignored and retry, ret=%d", ret);
-		} else {
-			srs_info("forward cycle success, retry");
-		}
-		
-		if (!loop) {
-			break;
-		}
-		
-		st_usleep(SRS_FORWARDER_SLEEP_MS * 1000);
-
-		if ((ret = open_socket()) != ERROR_SUCCESS) {
-			srs_warn("forward cycle reopen failed, ignored and retry, ret=%d", ret);
-		} else {
-			srs_info("forward cycle reopen success");
-		}
-	}
-	srs_trace("forward cycle finished");
-}
-
-void* SrsForwarder::forward_thread(void* arg)
-{
-	SrsForwarder* obj = (SrsForwarder*)arg;
-	srs_assert(obj != NULL);
-	
-	obj->loop = true;
-	obj->forward_cycle();
-	
-	return NULL;
-}
-

trunk/src/core/srs_core_forward.hpp

@@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <string>
 #include <vector>
 
-#include <st.h>
+#include <srs_core_thread.hpp>
 
 class SrsSharedPtrMessage;
 class SrsOnMetaDataPacket;
@@ -42,7 +42,7 @@ class SrsRequest;
 /**
 * forward the stream to other servers.
 */
-class SrsForwarder
+class SrsForwarder : public ISrsThreadHandler
 {
 private:
 	std::string app;
@@ -53,8 +53,7 @@ private:
 	int port;
 private:
 	st_netfd_t stfd;
-	st_thread_t tid;
+	SrsThread* pthread;
-	bool loop;
 private:
 	SrsRtmpClient* client;
 	std::vector<SrsSharedPtrMessage*> msgs;
@@ -67,14 +66,13 @@ public:
 	virtual int on_meta_data(SrsSharedPtrMessage* metadata);
 	virtual int on_audio(SrsSharedPtrMessage* msg);
 	virtual int on_video(SrsSharedPtrMessage* msg);
-private:
+// interface ISrsThreadHandler.
-	virtual int open_socket();
+public:
-	virtual int connect_server();
-private:
 	virtual int cycle();
+private:
+	virtual void close_underlayer_socket();
+	virtual int connect_server();
 	virtual int forward();
-	virtual void forward_cycle();
-	static void* forward_thread(void* arg);
 };
 
 #endif

trunk/src/core/srs_core_http.cpp

@@ -184,15 +184,7 @@ void SrsHttpClient::disconnect()
 {
 	connected = false;
 	
-	if (stfd) {
+	srs_close_stfd(stfd);
-		int fd = st_netfd_fileno(stfd);
-		st_netfd_close(stfd);
-		stfd = NULL;
-		
-		// st does not close it sometimes, 
-		// close it manually.
-		::close(fd);
-	}
 }
 
 int SrsHttpClient::connect(SrsHttpUri* uri)

trunk/src/core/srs_core_http.hpp

@@ -36,7 +36,6 @@ class SrsSocket;
 
 #include <string>
 
-#include <st.h>
 #include <http_parser.h>
 
 #define SRS_HTTP_HEADER_BUFFER		1024

trunk/src/core/srs_core_log.cpp

@@ -29,8 +29,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <string>
 #include <map>
 
-#include <st.h>
-
 ILogContext::ILogContext()
 {
 }

trunk/src/core/srs_core_protocol.hpp

@@ -33,8 +33,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <map>
 #include <string>
 
-#include <st.h>
-
 #include <srs_core_log.hpp>
 #include <srs_core_error.hpp>
 

trunk/src/core/srs_core_rtmp.hpp

@@ -32,8 +32,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <string>
 
-#include <st.h>
-
 class SrsProtocol;
 class ISrsMessage;
 class SrsCommonMessage;

trunk/src/core/srs_core_server.cpp

@@ -30,8 +30,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <algorithm>
 
-#include <st.h>
-
 #include <srs_core_log.hpp>
 #include <srs_core_error.hpp>
 #include <srs_core_client.hpp>
@@ -48,24 +46,16 @@ SrsListener::SrsListener(SrsServer* _server, SrsListenerType _type)
 	port = 0;
 	server = _server;
 	type = _type;
-	
+
-	tid = NULL;
+	pthread = new SrsThread(this, 0);
-	loop = false;
 }
 
 SrsListener::~SrsListener()
 {
-	if (stfd) {
+	srs_close_stfd(stfd);
-		st_netfd_close(stfd);
-		stfd = NULL;
-	}
 	
-	if (tid) {
+	pthread->stop();
-		loop = false;
+	srs_freep(pthread);
-		st_thread_interrupt(tid);
-		st_thread_join(tid, NULL);
-		tid = NULL;
-	}
 	
 	// st does not close it sometimes, 
 	// close it manually.
@@ -118,8 +108,7 @@ int SrsListener::listen(int _port)
     }
     srs_verbose("st open socket success. fd=%d", fd);
     
-    if ((tid = st_thread_create(listen_thread, this, 1, 0)) == NULL) {
+    if ((ret = pthread->start()) != ERROR_SUCCESS) {
-        ret = ERROR_ST_CREATE_LISTEN_THREAD;
         srs_error("st_thread_create listen thread error. ret=%d", ret);
         return ret;
     }
@@ -130,41 +119,32 @@ int SrsListener::listen(int _port)
 	return ret;
 }
 
-void SrsListener::listen_cycle()
+void SrsListener::on_enter_loop()
+{
+	srs_trace("listen cycle start, port=%d, type=%d, fd=%d", port, type, fd);
+}
+
+int SrsListener::cycle()
 {
 	int ret = ERROR_SUCCESS;
 	
-	log_context->generate_id();
+    st_netfd_t client_stfd = st_accept(stfd, NULL, NULL, ST_UTIME_NO_TIMEOUT);
-	srs_trace("listen cycle start, port=%d, type=%d, fd=%d", port, type, fd);
+    
+    if(client_stfd == NULL){
+        // ignore error.
+        srs_warn("ignore accept thread stoppped for accept client error");
+        return ret;
+    }
+    srs_verbose("get a client. fd=%d", st_netfd_fileno(client_stfd));
 	
-	while (loop) {
+	if ((ret = server->accept_client(type, client_stfd)) != ERROR_SUCCESS) {
-	    st_netfd_t client_stfd = st_accept(stfd, NULL, NULL, ST_UTIME_NO_TIMEOUT);
+		srs_warn("accept client error. ret=%d", ret);
-	    
+		return ret;
-	    if(client_stfd == NULL){
-	        // ignore error.
-	        srs_warn("ignore accept thread stoppped for accept client error");
-	        continue;
-	    }
-	    srs_verbose("get a client. fd=%d", st_netfd_fileno(client_stfd));
-    	
-    	if ((ret = server->accept_client(type, client_stfd)) != ERROR_SUCCESS) {
-    		srs_warn("accept client error. ret=%d", ret);
-			continue;
-    	}
-    	
-    	srs_verbose("accept client finished. conns=%d, ret=%d", (int)conns.size(), ret);
 	}
-}
-
-void* SrsListener::listen_thread(void* arg)
-{
-	SrsListener* obj = (SrsListener*)arg;
-	srs_assert(obj != NULL);
 	
-	obj->loop = true;
+	srs_verbose("accept client finished. conns=%d, ret=%d", (int)conns.size(), ret);
-	obj->listen_cycle();
 	
-	return NULL;
+	return ret;
 }
 
 SrsServer::SrsServer()
@@ -312,8 +292,7 @@ int SrsServer::accept_client(SrsListenerType type, st_netfd_t client_stfd)
 		srs_error("exceed the max connections, drop client: "
 			"clients=%d, max=%d, fd=%d", (int)conns.size(), max_connections, fd);
 			
-		st_netfd_close(client_stfd);
+		srs_close_stfd(client_stfd);
-		::close(fd);
 		
 		return ret;
 	}

trunk/src/core/srs_core_server.hpp

@@ -32,9 +32,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <vector>
 
-#include <st.h>
-
 #include <srs_core_reload.hpp>
+#include <srs_core_thread.hpp>
 
 class SrsServer;
 class SrsConnection;
@@ -45,7 +44,7 @@ enum SrsListenerType
 	SrsListenerApi
 };
 
-class SrsListener
+class SrsListener : public ISrsThreadHandler
 {
 public:
 	SrsListenerType type;
@@ -54,16 +53,16 @@ private:
 	st_netfd_t stfd;
 	int port;
 	SrsServer* server;
-	st_thread_t tid;
+	SrsThread* pthread;
-	bool loop;
 public:
 	SrsListener(SrsServer* _server, SrsListenerType _type);
 	virtual ~SrsListener();
 public:
 	virtual int listen(int port);
-private:
+// interface ISrsThreadHandler.
-	virtual void listen_cycle();
+public:
-	static void* listen_thread(void* arg);
+	virtual void on_enter_loop();
+	virtual int cycle();
 };
 
 class SrsServer : public SrsReloadHandler

trunk/src/core/srs_core_socket.hpp

@@ -30,8 +30,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <srs_core.hpp>
 
-#include <st.h>
-
 /**
 * the socket provides TCP socket over st,
 * that is, the sync socket mechanism.

trunk/src/core/srs_core_thread.cpp

@@ -0,0 +1,156 @@
+/*
+The MIT License (MIT)
+
+Copyright (c) 2013 winlin
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <srs_core_thread.hpp>
+
+#include <srs_core_error.hpp>
+#include <srs_core_log.hpp>
+
+ISrsThreadHandler::ISrsThreadHandler()
+{
+}
+
+ISrsThreadHandler::~ISrsThreadHandler()
+{
+}
+
+void ISrsThreadHandler::on_enter_loop()
+{
+}
+
+int ISrsThreadHandler::on_before_cycle()
+{
+	int ret = ERROR_SUCCESS;
+	return ret;
+}
+
+int ISrsThreadHandler::on_end_cycle()
+{
+	int ret = ERROR_SUCCESS;
+	return ret;
+}
+
+void ISrsThreadHandler::on_leave_loop()
+{
+}
+
+SrsThread::SrsThread(ISrsThreadHandler* thread_handler, int64_t interval_ms)
+{
+	handler = thread_handler;
+	cycle_interval_milliseconds = interval_ms;
+	
+	tid = NULL;
+	loop = false;
+}
+
+SrsThread::~SrsThread()
+{
+	stop();
+}
+
+int SrsThread::start()
+{
+	int ret = ERROR_SUCCESS;
+	
+    if(tid) {
+        srs_info("thread already running.");
+        return ret;
+    }
+    
+    if((tid = st_thread_create(thread_fun, this, 1, 0)) == NULL){
+		ret = ERROR_ST_CREATE_CYCLE_THREAD;
+        srs_error("st_thread_create failed. ret=%d", ret);
+        return ret;
+    }
+    
+    return ret;
+}
+
+void SrsThread::stop()
+{
+	if (tid) {
+		loop = false;
+		
+		// the interrupt will cause the socket to read/write error,
+		// which will terminate the cycle thread.
+		st_thread_interrupt(tid);
+		
+		// wait the thread to exit.
+		st_thread_join(tid, NULL);
+		
+		tid = NULL;
+	}
+}
+
+void SrsThread::thread_cycle()
+{
+	int ret = ERROR_SUCCESS;
+	
+	srs_assert(handler);
+	
+	log_context->generate_id();
+	srs_trace("thread cycle start");
+
+	handler->on_end_cycle();
+	
+	loop = true;
+	while (loop) {
+		if ((ret = handler->on_before_cycle()) != ERROR_SUCCESS) {
+			srs_warn("thread on before cycle failed, ignored and retry, ret=%d", ret);
+			goto failed;
+		}
+		srs_info("thread on before cycle success");
+		
+		if ((ret = handler->cycle()) != ERROR_SUCCESS) {
+			srs_warn("thread cycle failed, ignored and retry, ret=%d", ret);
+			goto failed;
+		}
+		srs_info("thread cycle success");
+		
+		if ((ret = handler->on_end_cycle()) != ERROR_SUCCESS) {
+			srs_warn("thread on end cycle failed, ignored and retry, ret=%d", ret);
+			goto failed;
+		}
+		srs_info("thread on end cycle success");
+
+failed:
+		if (!loop) {
+			break;
+		}
+		
+		st_usleep(cycle_interval_milliseconds * 1000);
+	}
+	
+	handler->on_leave_loop();
+	srs_trace("thread cycle finished");
+}
+
+void* SrsThread::thread_fun(void* arg)
+{
+	SrsThread* obj = (SrsThread*)arg;
+	srs_assert(obj);
+	
+	obj->thread_cycle();
+	
+	return NULL;
+}

trunk/src/core/srs_core_thread.hpp

@@ -0,0 +1,98 @@
+/*
+The MIT License (MIT)
+
+Copyright (c) 2013 winlin
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef SRS_CORE_THREAD_HPP
+#define SRS_CORE_THREAD_HPP
+
+/*
+#include <srs_core_thread.hpp>
+*/
+#include <srs_core.hpp>
+
+/**
+* the handler for the thread, callback interface.
+* the thread model defines as:
+* 	handler->on_enter_loop()
+* 	while loop:
+*		handler->on_before_cycle()
+*		handler->cycle()
+*		handler->on_end_cycle()
+*		if !loop then break for user stop thread.
+*		sleep(CycleIntervalMilliseconds)
+* 	handler->on_leave_loop()
+* when stop, the thread will interrupt the st_thread,
+* which will cause the socket to return error and 
+* terminate the cycle thread.
+*/
+class ISrsThreadHandler
+{
+public:
+	ISrsThreadHandler();
+	virtual ~ISrsThreadHandler();
+public:
+	virtual void on_enter_loop();
+	virtual int on_before_cycle();
+	virtual int cycle() = 0;
+	virtual int on_end_cycle();
+	virtual void on_leave_loop();
+};
+
+/**
+* provides servies from st_thread_t,
+* for common thread usage.
+*/
+class SrsThread
+{
+private:
+	st_thread_t tid;
+	bool loop;
+private:
+	ISrsThreadHandler* handler;
+	int64_t cycle_interval_milliseconds;
+public:
+	/**
+	* initialize the thread.
+	* @param thread_handler, the cycle handler for the thread.
+	* @param interval_ms, the sleep interval when cycle finished.
+	*/
+	SrsThread(ISrsThreadHandler* thread_handler, int64_t interval_ms);
+	virtual ~SrsThread();
+public:
+	/**
+	* start the thread, invoke the cycle of handler util
+	* user stop the thread.
+	* @remark ignore any error of cycle of handler.
+	* @remark user can start multiple times, ignore if already started.
+	*/
+	virtual int start();
+	/**
+	* stop the thread, wait for the thread to terminate.
+	* @remark user can stop multiple times, ignore if already stopped.
+	*/
+	virtual void stop();
+private:
+	virtual void thread_cycle();
+	static void* thread_fun(void* arg);
+};
+
+#endif

trunk/src/srs/srs.upp

@@ -1,60 +1,62 @@
 file
-	main readonly separator,
+    main readonly separator,
-	..\main\srs_main_server.cpp,
+    ..\main\srs_main_server.cpp,
-	auto readonly separator,
+    auto readonly separator,
-	..\..\objs\srs_auto_headers.hpp,
+    ..\..\objs\srs_auto_headers.hpp,
-	core readonly separator,
+    core readonly separator,
-	..\core\srs_core.hpp,
+    ..\core\srs_core.hpp,
-	..\core\srs_core.cpp,
+    ..\core\srs_core.cpp,
-	..\core\srs_core_error.hpp,
+    ..\core\srs_core_amf0.hpp,
-	..\core\srs_core_error.cpp,
+    ..\core\srs_core_amf0.cpp,
-	..\core\srs_core_autofree.hpp,
+    ..\core\srs_core_autofree.hpp,
-	..\core\srs_core_autofree.cpp,
+    ..\core\srs_core_autofree.cpp,
-	..\core\srs_core_server.hpp,
+    ..\core\srs_core_buffer.hpp,
-	..\core\srs_core_server.cpp,
+    ..\core\srs_core_buffer.cpp,
-	..\core\srs_core_reload.hpp,
+    ..\core\srs_core_client.hpp,
-	..\core\srs_core_reload.cpp,
+    ..\core\srs_core_client.cpp,
-	..\core\srs_core_config.hpp,
+    ..\core\srs_core_codec.hpp,
-	..\core\srs_core_config.cpp,
+    ..\core\srs_core_codec.cpp,
-	..\core\srs_core_refer.hpp,
+    ..\core\srs_core_config.hpp,
-	..\core\srs_core_refer.cpp,
+    ..\core\srs_core_config.cpp,
-	..\core\srs_core_conn.hpp,
+    ..\core\srs_core_conn.hpp,
-	..\core\srs_core_conn.cpp,
+    ..\core\srs_core_conn.cpp,
-	..\core\srs_core_client.hpp,
+    ..\core\srs_core_encoder.hpp,
-	..\core\srs_core_client.cpp,
+    ..\core\srs_core_encoder.cpp,
-        ..\core\srs_core_http.hpp,
+    ..\core\srs_core_error.hpp,
-        ..\core\srs_core_http.cpp,
+    ..\core\srs_core_error.cpp,
-	..\core\srs_core_source.hpp,
+    ..\core\srs_core_forward.hpp,
-	..\core\srs_core_source.cpp,
+    ..\core\srs_core_forward.cpp,
-	..\core\srs_core_forward.hpp,
+    ..\core\srs_core_handshake.hpp,
-	..\core\srs_core_forward.cpp,
+    ..\core\srs_core_handshake.cpp,
-	..\core\srs_core_encoder.hpp,
+    ..\core\srs_core_hls.hpp,
-	..\core\srs_core_encoder.cpp,
+    ..\core\srs_core_hls.cpp,
-	..\core\srs_core_hls.hpp,
+    ..\core\srs_core_http.hpp,
-	..\core\srs_core_hls.cpp,
+    ..\core\srs_core_http.cpp,
-	..\core\srs_core_codec.hpp,
+    ..\core\srs_core_log.hpp,
-	..\core\srs_core_codec.cpp,
+    ..\core\srs_core_log.cpp,
-	..\core\srs_core_rtmp.hpp,
+    ..\core\srs_core_pithy_print.hpp,
-	..\core\srs_core_rtmp.cpp,
+    ..\core\srs_core_pithy_print.cpp,
-	..\core\srs_core_handshake.hpp,
+    ..\core\srs_core_protocol.hpp,
-	..\core\srs_core_handshake.cpp,
+    ..\core\srs_core_protocol.cpp,
-	..\core\srs_core_protocol.hpp,
+    ..\core\srs_core_refer.hpp,
-	..\core\srs_core_protocol.cpp,
+    ..\core\srs_core_refer.cpp,
-	..\core\srs_core_amf0.hpp,
+    ..\core\srs_core_reload.hpp,
-	..\core\srs_core_amf0.cpp,
+    ..\core\srs_core_reload.cpp,
-	..\core\srs_core_stream.hpp,
+    ..\core\srs_core_rtmp.hpp,
-	..\core\srs_core_stream.cpp,
+    ..\core\srs_core_rtmp.cpp,
-	..\core\srs_core_socket.hpp,
+    ..\core\srs_core_thread.hpp,
-	..\core\srs_core_socket.cpp,
+    ..\core\srs_core_thread.cpp,
-	..\core\srs_core_buffer.hpp,
+    ..\core\srs_core_server.hpp,
-	..\core\srs_core_buffer.cpp,
+    ..\core\srs_core_server.cpp,
-	..\core\srs_core_pithy_print.hpp,
+    ..\core\srs_core_stream.hpp,
-	..\core\srs_core_pithy_print.cpp,
+    ..\core\srs_core_stream.cpp,
-	..\core\srs_core_log.hpp,
+    ..\core\srs_core_socket.hpp,
-	..\core\srs_core_log.cpp,
+    ..\core\srs_core_socket.cpp,
-	research readonly separator,
+    ..\core\srs_core_source.hpp,
-	..\..\research\ts_info.cc;
+    ..\core\srs_core_source.cpp,
+    research readonly separator,
+    ..\..\research\ts_info.cc;
 
 mainconfig
-	"" = "MAIN";
+    "" = "MAIN";