owen/lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Try to avoid avconv zombies

Browse Source
This commit is contained in:
emeric
2014-08-20 01:00:00 +02:00
parent 89147fd955
commit 9bbff324ec
4 changed files with 50 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
transcode/AvConvTranscoder.cpp
+41 -30
View File
@@ -11,6 +11,8 @@
namespace Transcode
{
boost::mutex AvConvTranscoder::_mutex;
boost::filesystem::path AvConvTranscoder::_avConvPath = "";
void
@@ -109,15 +111,21 @@ AvConvTranscoder::AvConvTranscoder(const Parameters& parameters)
std::cout << "executing... '" << oss.str() << "'" << std::endl;
std::vector<int> ranges = { 3, 1024 }; // fd range to be closed
_child = std::make_shared<boost::process::child>( boost::process::execute(
boost::process::initializers::run_exe(_avConvPath),
boost::process::initializers::set_cmd_line(oss.str()),
boost::process::initializers::bind_stdout(sink),
boost::process::initializers::close_fd(STDIN_FILENO),
boost::process::initializers::close_fds(ranges)
)
);
// make sure only one thread is executing this part of code
// See boost process FAQ
{
boost::lock_guard<boost::mutex> lock(_mutex);
std::vector<int> ranges = { 3, 1024 }; // fd range to be closed
_child = std::make_shared<boost::process::child>( boost::process::execute(
boost::process::initializers::run_exe(_avConvPath),
boost::process::initializers::set_cmd_line(oss.str()),
boost::process::initializers::bind_stdout(sink),
boost::process::initializers::close_fd(STDIN_FILENO),
boost::process::initializers::close_fds(ranges)
)
);
}
}
@@ -154,34 +162,37 @@ AvConvTranscoder::~AvConvTranscoder()
void
AvConvTranscoder::waitChild()
{
try {
if (_child) {
std::cout << "waiting for child!" << std::endl;
boost::process::wait_for_exit(*_child);
std::cout << "waiting for child! DONE" << std::endl;
_child.reset();
}
}
catch( std::exception& e)
if (_child)
{
std::cerr << "Exception caugh in waitChild: " << e.what() << std::endl;
boost::system::error_code ec;
std::cout << "waiting for child!" << std::endl;
boost::process::wait_for_exit(*_child, ec);
std::cout << "waiting for child! DONE." << std::endl;
if (ec)
std::cerr << "AvConvTranscoder::waitChild: error: " << ec.message() << std::endl;
_child.reset();
}
}
void
void
AvConvTranscoder::killChild()
{
try {
if (_child) {
std::cout << "Killing child!" << std::endl;
boost::process::terminate(*_child);
std::cout << "Killing child DONE" << std::endl;
_child.reset();
}
}
catch( std::exception& e)
if (_child)
{
std::cerr << "Exception caugh in killChild: " << e.what() << std::endl;
boost::system::error_code ec;
std::cout << "Killing child! pid = " << _child->pid << std::endl;
boost::process::terminate(*_child, ec);
std::cout << "Killing child DONE" << std::endl;
// If an error occured, force kill the child
if (ec)
std::cerr << "AvConvTranscoder::killChild: error: " << ec.message() << std::endl;
_child.reset();
}
}
transcode/AvConvTranscoder.hpp
+3
View File
@@ -8,6 +8,7 @@
#include <boost/iostreams/stream.hpp>
#include <boost/process.hpp>
#include <boost/filesystem.hpp>
#include <boost/thread.hpp>
#include "Parameters.hpp"
@@ -43,6 +44,8 @@ class AvConvTranscoder
const Parameters _parameters;
static boost::mutex _mutex;
boost::process::pipe _outputPipe;
boost::iostreams::file_descriptor_source _source;
boost::iostreams::stream_buffer<boost::iostreams::file_descriptor_source> _is;