From 8bdf98afa56d63d6b2d01ab18c65c436e2de0010 Mon Sep 17 00:00:00 2001 From: winlin Date: Wed, 5 Mar 2014 10:34:17 +0800 Subject: [PATCH] refine the multiple processes architecture, remove the isolate bandwidth test process --- README.md | 15 ++++++--------- trunk/configure | 12 ++++++------ 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index c12ea307b..c33f11863 100755 --- a/README.md +++ b/README.md @@ -254,21 +254,18 @@ Schema#2: SRS RTMP Edge server pull stream from origin (or upstream SRS +---------+---------+ +-----+-----+ --------------+------------network-------+--------- | | - +-----------+ +----+-----------+ +----+------+ - | master +--fork->-+ back source(1) +-->-pull-+ stream(2) + - +-----+-----+ +----------------+ +-------+---+ + +-----------+ +----+-----------+ +----+-----------+ + | master +--fork->-+ back source(1) +-->-pull-+ stream 1-N(2) + + +-----+-----+ +----------------+ +-------+--------+ + | | +-------------------------------------fork--->-----+ - | +-------------------+ - +--fork->--+ bandwidth test(3) + - +-------------------+ Remark: (1) back source process: create by master process, get stream from - upnode server, serve the stream process. + upnode server if edge, create stream if origin, serve the stream + process. (2) stream process: create by master process, get stream from back source process, serve the client. -(3) bandwidth test process: create by master process, serve the - bandwidth test client. Remark: (a) This multiple processes architecture is design by wenjie, it's a very simple and powerful multiple process architecture, for the diff --git a/trunk/configure b/trunk/configure index 0f7824584..9287ffeaa 100755 --- a/trunk/configure +++ b/trunk/configure @@ -79,18 +79,18 @@ BLACK="\\${BLACK}" default: bandwidth librtmp-sample utest @echo -e "\$(GREEN)build summary:\$(BLACK)" - @echo -e " \$(GREEN)server: ./objs/srs, the srs server\$(BLACK)" + @echo -e " \$(GREEN)server: ./objs/srs, the srs server\$(BLACK)" @echo -e " ${SrsHlsSummaryColor}hls: delivery HLS stream, @see: https://github.com/winlinvip/simple-rtmp-server/wiki/DeliveryHLS\$(BLACK)" @echo -e " ${SrsSslSummaryColor}ssl: support RTMP complex handshake, @see: https://github.com/winlinvip/simple-rtmp-server/wiki/RTMPHandshake\$(BLACK)" @echo -e " ${SrsFfmpegSummaryColor}ffmpeg: support transcoding with FFMPEG, @see: https://github.com/winlinvip/simple-rtmp-server/wiki/FFMPEG\$(BLACK)" @echo -e " ${SrsHttpSummaryColor}http: support http callback, @see: https://github.com/winlinvip/simple-rtmp-server/wiki/HTTPCallback\$(BLACK)" - @echo -e " \$(GREEN)bandwidth: ./objs/bandwidth, the bandwidth test client\$(BLACK)" - @echo -e " \$(GREEN)librtmp: ./objs/include, ./objs/lib, the srs-librtmp library, @see: https://github.com/winlinvip/simple-rtmp-server/wiki/SrsLibrtmp\$(BLACK)" + @echo -e " \$(GREEN)bandwidth: ./objs/bandwidth, the bandwidth test client\$(BLACK)" + @echo -e " \$(GREEN)librtmp: ./objs/include, ./objs/lib, the srs-librtmp library, @see: https://github.com/winlinvip/simple-rtmp-server/wiki/SrsLibrtmp\$(BLACK)" @echo -e " \$(GREEN)simple handshake: publish/play stream with simple handshake to server\$(BLACK)" @echo -e " ${SrsSslSummaryColor}complex handshake: it's not required to publish/play stream for client, recommend disable it for srs-librtmp\$(BLACK)" - @echo -e " \$(GREEN)librtmp-sample: ./research/librtmp, the srs-librtmp client sample\$(BLACK)" - @echo -e " ${SrsResearchSummaryColor}research: ./objs/research, api server, players, ts info.\$(BLACK)" - @echo -e " ${SrsUtestSummaryColor}utest: ./objs/srs_utest, the utest for srs\$(BLACK)" + @echo -e " \$(GREEN)librtmp-sample: ./research/librtmp, the srs-librtmp client sample\$(BLACK)" + @echo -e " ${SrsResearchSummaryColor}research: ./objs/research, api server, players, ts info.\$(BLACK)" + @echo -e " ${SrsUtestSummaryColor}utest: ./objs/srs_utest, the utest for srs\$(BLACK)" @echo -e "\$(GREEN)binaries @see: https://github.com/winlinvip/simple-rtmp-server/wiki/Build\$(BLACK)" help: