process stream

server/streamreader/processStream.cpp

@@ -17,7 +17,11 @@
 ***/
 
 
+#include <sys/stat.h>
+#include <limits.h>
 #include "processStream.h"
+#include "common/snapException.h"
+#include "common/utils.h"
 #include "common/log.h"
 
 
@@ -26,13 +30,95 @@ using namespace std;
 
 
 
-ProcessStream::ProcessStream(PcmListener* pcmListener, const StreamUri& uri) : PcmStream(pcmListener, uri)
+bool ProcessStream::fileExists(const std::string& name) 
 {
+	struct stat buffer;   
+	return (stat (name.c_str(), &buffer) == 0); 
+}
+
+
+std::string ProcessStream::findExe(const std::string& name)
+{
+	if (fileExists(name))
+		return name;
+
+	std::string exe = name;
+	if (exe.find("/") != string::npos)
+		exe = exe.substr(exe.find_last_of("/") + 1);
+
+	string whereis = execGetOutput("whereis " + exe);
+	if (whereis.find(":") != std::string::npos)
+	{
+		whereis = trim_copy(whereis.substr(whereis.find(":") + 1));
+		if (!whereis.empty())
+			return whereis;
+	}
+
+	char buff[PATH_MAX];
+	char szTmp[32];
+	sprintf(szTmp, "/proc/%d/exe", getpid());
+	ssize_t len = readlink(szTmp, buff, sizeof(buff)-1);
+	if (len != -1)
+	{
+		buff[len] = '\0';
+		return string(buff) + "/" + exe;
+	}
+
+	return "";
+}
+
+
+ProcessStream::ProcessStream(PcmListener* pcmListener, const StreamUri& uri) : PcmStream(pcmListener, uri), path(""), process_(nullptr)
+{
+	logO << "ProcessStream: " << uri_.getQuery("params") << "\n";
+
+	exe = findExe(uri.path);
+	if (exe.find("/") != string::npos)
+		path = exe.substr(0, exe.find_last_of("/"));
+
+	if (!fileExists(exe))
+		throw SnapException("file not found: \"" + uri.path + "\"");
+//	const auto& queries = uri_.query;
 }
 
 
 ProcessStream::~ProcessStream()
 {
+	process_->kill();
+}
+
+
+void ProcessStream::start()
+{
+	PcmStream::start();
+}
+
+
+void ProcessStream::stop()
+{
+	if (process_)
+		process_->kill();
+	PcmStream::stop();
+	stderrReaderThread_.join();
+}
+
+
+void ProcessStream::stderrReader()
+{
+	size_t buffer_size = 8192;
+	auto buffer = std::unique_ptr<char[]>(new char[buffer_size]);
+	ssize_t n;
+	stringstream message;
+	while (active_ && (n=read(process_->getStderr(), buffer.get(), buffer_size)) > 0)
+	{
+		string logmsg(buffer.get(), n);
+		if ((logmsg.find("allocated stream") == string::npos) &&
+			(logmsg.find("Got channel") == string::npos) &&
+			(logmsg.size() > 4))
+		{
+			logO << logmsg;
+		}
+	}
 }
 
 
@@ -45,6 +131,10 @@ void ProcessStream::worker()
 
 	while (active_)
 	{
+		process_.reset(new Process(exe + " " + uri_.getQuery("params"), path));
+		stderrReaderThread_ = thread(&ProcessStream::stderrReader, this);
+		stderrReaderThread_.detach();
+
 		gettimeofday(&tvChunk, NULL);
 		tvEncodedChunk_ = tvChunk;
 		long nextTick = chronos::getTickCount();
@@ -54,10 +144,22 @@ void ProcessStream::worker()
 			{
 				chunk->timestamp.sec = tvChunk.tv_sec;
 				chunk->timestamp.usec = tvChunk.tv_usec;
-				size_t toRead = chunk->payloadSize;
-				size_t count = 0;
-
-//// read
+				int toRead = chunk->payloadSize;
+				int len = 0;
+				do
+				{
+					int count = read(process_->getStdout(), chunk->payload + len, toRead - len);
+					if (count < 0)
+					{
+						setState(kIdle);
+						chronos::sleep(100);
+					}
+					else if (count == 0)
+						throw SnapException("end of file");
+					else
+						len += count;
+				}
+				while ((len < toRead) && active_);
 
 				encoder_->encode(chunk.get());
 				nextTick += pcmReadMs_;
@@ -66,6 +168,7 @@ void ProcessStream::worker()
 
 				if (nextTick >= currentTick)
 				{
+					setState(kPlaying);
 					chronos::sleep(nextTick - currentTick);
 				}
 				else
@@ -80,6 +183,8 @@ void ProcessStream::worker()
 		catch(const std::exception& e)
 		{
 			logE << "Exception: " << e.what() << std::endl;
+			process_->kill();
+			chronos::sleep(100);
 		}
 	}
 }