external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

fix ffmpeg log fd leak, always close log_fd. 0.9.94

Browse source
This commit is contained in:
winlin 2014-05-13 11:16:53 +08:00
parent 74e6e28993
commit 7004510cc7
3 changed files with 134 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

10
trunk/src/app/srs_app_ffmpeg.cpp
View file

@ -64,8 +64,6 @@ SrsFFMPEG::SrsFFMPEG(std::string ffmpeg_bin)
abitrate = 0; abitrate = 0;
asample_rate = 0; asample_rate = 0;
achannels = 0; achannels = 0;
log_fd = -1;
} }
SrsFFMPEG::~SrsFFMPEG() SrsFFMPEG::~SrsFFMPEG()
@ -375,6 +373,7 @@ int SrsFFMPEG::start()
// child process: ffmpeg encoder engine. // child process: ffmpeg encoder engine.
if (pid == 0) { if (pid == 0) {
// redirect logs to file. // redirect logs to file.
int log_fd = -1;
int flags = O_CREAT|O_WRONLY|O_APPEND; int flags = O_CREAT|O_WRONLY|O_APPEND;
mode_t mode = S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH; mode_t mode = S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH;
if ((log_fd = ::open(log_file.c_str(), flags, mode)) < 0) { if ((log_fd = ::open(log_file.c_str(), flags, mode)) < 0) {
@ -392,6 +391,8 @@ int SrsFFMPEG::start()
srs_error("dup2 encoder file failed. ret=%d", ret); srs_error("dup2 encoder file failed. ret=%d", ret);
return ret; return ret;
} }
// close log fd
::close(log_fd);
// close other fds // close other fds
// TODO: do in right way. // TODO: do in right way.
for (int i = 3; i < 1024; i++) { for (int i = 3; i < 1024; i++) {
@ -456,11 +457,6 @@ int SrsFFMPEG::cycle()
void SrsFFMPEG::stop() void SrsFFMPEG::stop()
{ {
if (log_fd > 0) {
::close(log_fd);
log_fd = -1;
}
if (!started) { if (!started) {
return; return;
} }

1
trunk/src/app/srs_app_ffmpeg.hpp
View file

@ -48,7 +48,6 @@ private:
pid_t pid; pid_t pid;
private: private:
std::string log_file; std::string log_file;
int log_fd;
private: private:
std::string ffmpeg; std::string ffmpeg;
std::string _iparams; std::string _iparams;

2
trunk/src/core/srs_core.hpp Normal file → Executable file
View file

@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version // current release version
#define VERSION_MAJOR "0" #define VERSION_MAJOR "0"
#define VERSION_MINOR "9" #define VERSION_MINOR "9"
#define VERSION_REVISION "93" #define VERSION_REVISION "94"
#define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
// server info. // server info.
#define RTMP_SIG_SRS_KEY "srs" #define RTMP_SIG_SRS_KEY "srs"