mirror of https://github.com/ossrs/srs.git
merge from 2.0.152
winlin
10 years ago
commit
e75b7e89d6
@ -0,0 +1,98 @@
|
|||||||
|
/*
|
||||||
|
The MIT License (MIT)
|
||||||
|
|
||||||
|
Copyright (c) 2013-2015 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_app_async_call.hpp>
|
||||||
|
|
||||||
|
using namespace std;
|
||||||
|
|
||||||
|
#include <srs_kernel_error.hpp>
|
||||||
|
#include <srs_kernel_log.hpp>
|
||||||
|
|
||||||
|
// the sleep interval for http async callback.
|
||||||
|
#define SRS_AUTO_ASYNC_CALLBACL_SLEEP_US 300000
|
||||||
|
|
||||||
|
ISrsDvrAsyncCall::ISrsDvrAsyncCall()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
ISrsDvrAsyncCall::~ISrsDvrAsyncCall()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
SrsDvrAsyncCallThread::SrsDvrAsyncCallThread()
|
||||||
|
{
|
||||||
|
pthread = new SrsThread("async", this, SRS_AUTO_ASYNC_CALLBACL_SLEEP_US, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
SrsDvrAsyncCallThread::~SrsDvrAsyncCallThread()
|
||||||
|
{
|
||||||
|
stop();
|
||||||
|
srs_freep(pthread);
|
||||||
|
|
||||||
|
std::vector<ISrsDvrAsyncCall*>::iterator it;
|
||||||
|
for (it = callbacks.begin(); it != callbacks.end(); ++it) {
|
||||||
|
ISrsDvrAsyncCall* call = *it;
|
||||||
|
srs_freep(call);
|
||||||
|
}
|
||||||
|
callbacks.clear();
|
||||||
|
}
|
||||||
|
|
||||||
|
int SrsDvrAsyncCallThread::call(ISrsDvrAsyncCall* c)
|
||||||
|
{
|
||||||
|
int ret = ERROR_SUCCESS;
|
||||||
|
|
||||||
|
callbacks.push_back(c);
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
int SrsDvrAsyncCallThread::start()
|
||||||
|
{
|
||||||
|
return pthread->start();
|
||||||
|
}
|
||||||
|
|
||||||
|
void SrsDvrAsyncCallThread::stop()
|
||||||
|
{
|
||||||
|
pthread->stop();
|
||||||
|
}
|
||||||
|
|
||||||
|
int SrsDvrAsyncCallThread::cycle()
|
||||||
|
{
|
||||||
|
int ret = ERROR_SUCCESS;
|
||||||
|
|
||||||
|
std::vector<ISrsDvrAsyncCall*> copies = callbacks;
|
||||||
|
callbacks.clear();
|
||||||
|
|
||||||
|
std::vector<ISrsDvrAsyncCall*>::iterator it;
|
||||||
|
for (it = copies.begin(); it != copies.end(); ++it) {
|
||||||
|
ISrsDvrAsyncCall* call = *it;
|
||||||
|
if ((ret = call->call()) != ERROR_SUCCESS) {
|
||||||
|
srs_warn("dvr: ignore callback %s, ret=%d", call->to_string().c_str(), ret);
|
||||||
|
}
|
||||||
|
srs_freep(call);
|
||||||
|
}
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -0,0 +1,75 @@
|
|||||||
|
/*
|
||||||
|
The MIT License (MIT)
|
||||||
|
|
||||||
|
Copyright (c) 2013-2015 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_APP_ASYNC_CALL_HPP
|
||||||
|
#define SRS_APP_ASYNC_CALL_HPP
|
||||||
|
|
||||||
|
/*
|
||||||
|
#include <srs_app_async_call.hpp>
|
||||||
|
*/
|
||||||
|
#include <srs_core.hpp>
|
||||||
|
|
||||||
|
#include <string>
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
|
#include <srs_app_thread.hpp>
|
||||||
|
|
||||||
|
/**
|
||||||
|
* the async call for http hooks,
|
||||||
|
* for the http hooks will switch st-thread,
|
||||||
|
* so we must use isolate thread to avoid the thread corrupt,
|
||||||
|
* for example, when dvr call http hooks, the video receive thread got
|
||||||
|
* a video and pass it to the dvr again.
|
||||||
|
* futhurmore, the aync call never block the main worker thread.
|
||||||
|
*/
|
||||||
|
class ISrsDvrAsyncCall
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
ISrsDvrAsyncCall();
|
||||||
|
virtual ~ISrsDvrAsyncCall();
|
||||||
|
public:
|
||||||
|
virtual int call() = 0;
|
||||||
|
virtual std::string to_string() = 0;
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* the async callback for dvr.
|
||||||
|
*/
|
||||||
|
class SrsDvrAsyncCallThread : public ISrsThreadHandler
|
||||||
|
{
|
||||||
|
private:
|
||||||
|
SrsThread* pthread;
|
||||||
|
std::vector<ISrsDvrAsyncCall*> callbacks;
|
||||||
|
public:
|
||||||
|
SrsDvrAsyncCallThread();
|
||||||
|
virtual ~SrsDvrAsyncCallThread();
|
||||||
|
public:
|
||||||
|
virtual int call(ISrsDvrAsyncCall* c);
|
||||||
|
public:
|
||||||
|
virtual int start();
|
||||||
|
virtual void stop();
|
||||||
|
virtual int cycle();
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
Loading…
Reference in New Issue