#include "color/color_producer.h"\r
#include "separated/separated_producer.h"\r
\r
-#include <common/memory/safe_ptr.h>\r
+#include <common/assert.h>\r
+#include <common/except.h>\r
#include <common/concurrency/executor.h>\r
-#include <common/exception/exceptions.h>\r
-#include <common/utility/move_on_copy.h>\r
+#include <common/concurrency/async.h>\r
+#include <common/spl/memory.h>\r
\r
namespace caspar { namespace core {\r
-\r
-boost::unique_future<std::wstring> frame_producer::call(const std::wstring&) \r
-{\r
- BOOST_THROW_EXCEPTION(not_supported());\r
-}\r
\r
std::vector<const producer_factory_t> g_factories;\r
- \r
-class destroy_producer_proxy : public frame_producer\r
-{ \r
- std::unique_ptr<std::shared_ptr<frame_producer>> producer_;\r
-public:\r
- destroy_producer_proxy(safe_ptr<frame_producer>&& producer) \r
- : producer_(new std::shared_ptr<frame_producer>(std::move(producer)))\r
- {\r
- }\r
\r
- ~destroy_producer_proxy()\r
- { \r
- static auto destroyers = std::make_shared<tbb::concurrent_bounded_queue<std::shared_ptr<executor>>>();\r
- static tbb::atomic<int> destroyer_count;\r
-\r
- try\r
- {\r
- std::shared_ptr<executor> destroyer;\r
- if(!destroyers->try_pop(destroyer))\r
- {\r
- destroyer.reset(new executor(L"destroyer"));\r
- destroyer->set_priority_class(below_normal_priority_class);\r
- if(++destroyer_count > 16)\r
- CASPAR_LOG(warning) << L"Potential destroyer dead-lock detected.";\r
- CASPAR_LOG(trace) << "Created destroyer: " << destroyer_count;\r
- }\r
- \r
- auto producer = producer_.release();\r
- auto pool = destroyers;\r
- destroyer->begin_invoke([=]\r
- {\r
- std::unique_ptr<std::shared_ptr<frame_producer>> producer2(producer);\r
-\r
- auto str = (*producer2)->print();\r
- try\r
- {\r
- if(!producer->unique())\r
- CASPAR_LOG(trace) << str << L" Not destroyed on asynchronous destruction thread: " << producer->use_count();\r
- else\r
- CASPAR_LOG(trace) << str << L" Destroying on asynchronous destruction thread.";\r
- }\r
- catch(...){}\r
- \r
- producer2.reset();\r
- pool->push(destroyer);\r
- }); \r
- }\r
- catch(...)\r
- {\r
- CASPAR_LOG_CURRENT_EXCEPTION();\r
- try\r
- {\r
- producer_.reset();\r
- }\r
- catch(...){}\r
- }\r
- }\r
-\r
- virtual safe_ptr<draw_frame> receive(int hints) override {return (*producer_)->receive(hints);}\r
- virtual safe_ptr<draw_frame> last_frame() const override {return (*producer_)->last_frame();}\r
- virtual std::wstring print() const override {return (*producer_)->print();}\r
- virtual boost::property_tree::wptree info() const override {return (*producer_)->info();}\r
- virtual boost::unique_future<std::wstring> call(const std::wstring& str) override {return (*producer_)->call(str);}\r
- virtual safe_ptr<frame_producer> get_following_producer() const override {return (*producer_)->get_following_producer();}\r
- virtual void set_leading_producer(const safe_ptr<frame_producer>& producer) override {(*producer_)->set_leading_producer(producer);}\r
- virtual uint32_t nb_frames() const override {return (*producer_)->nb_frames();}\r
-};\r
-\r
-safe_ptr<core::frame_producer> create_producer_destroy_proxy(safe_ptr<core::frame_producer> producer)\r
+void register_producer_factory(const producer_factory_t& factory)\r
{\r
- return make_safe<destroy_producer_proxy>(std::move(producer));\r
+ g_factories.push_back(factory);\r
}\r
\r
-class print_producer_proxy : public frame_producer\r
-{ \r
- std::shared_ptr<frame_producer> producer_;\r
-public:\r
- print_producer_proxy(safe_ptr<frame_producer>&& producer) \r
- : producer_(std::move(producer))\r
- {\r
- CASPAR_LOG(info) << producer_->print() << L" Initialized.";\r
- }\r
-\r
- ~print_producer_proxy()\r
- { \r
- auto str = producer_->print();\r
- CASPAR_LOG(trace) << str << L" Uninitializing.";\r
- producer_.reset();\r
- CASPAR_LOG(info) << str << L" Uninitialized.";\r
- }\r
-\r
- virtual safe_ptr<draw_frame> receive(int hints) override {return (producer_)->receive(hints);}\r
- virtual safe_ptr<draw_frame> last_frame() const override {return (producer_)->last_frame();}\r
- virtual std::wstring print() const override {return (producer_)->print();}\r
- virtual boost::property_tree::wptree info() const override {return (producer_)->info();}\r
- virtual boost::unique_future<std::wstring> call(const std::wstring& str) override {return (producer_)->call(str);}\r
- virtual safe_ptr<frame_producer> get_following_producer() const override {return (producer_)->get_following_producer();}\r
- virtual void set_leading_producer(const safe_ptr<frame_producer>& producer) override {(producer_)->set_leading_producer(producer);}\r
- virtual uint32_t nb_frames() const override {return (producer_)->nb_frames();}\r
-};\r
-\r
-safe_ptr<core::frame_producer> create_producer_print_proxy(safe_ptr<core::frame_producer> producer)\r
+boost::unique_future<std::wstring> frame_producer::call(const std::wstring&) \r
{\r
- return make_safe<print_producer_proxy>(std::move(producer));\r
+ BOOST_THROW_EXCEPTION(not_supported());\r
}\r
\r
-class last_frame_producer : public frame_producer\r
+const spl::shared_ptr<frame_producer>& frame_producer::empty() // nothrow\r
{\r
- const std::wstring print_;\r
- const safe_ptr<draw_frame> frame_;\r
- const uint32_t nb_frames_;\r
-public:\r
- last_frame_producer(const safe_ptr<frame_producer>& producer) \r
- : print_(producer->print())\r
- , frame_(producer->last_frame() != draw_frame::eof() ? producer->last_frame() : draw_frame::empty())\r
- , nb_frames_(producer->nb_frames())\r
- {\r
- }\r
- \r
- virtual safe_ptr<draw_frame> receive(int){return frame_;}\r
- virtual safe_ptr<core::draw_frame> last_frame() const{return frame_;}\r
- virtual std::wstring print() const{return L"dummy[" + print_ + L"]";}\r
- virtual uint32_t nb_frames() const {return nb_frames_;} \r
- virtual boost::property_tree::wptree info() const override\r
- {\r
- boost::property_tree::wptree info;\r
- info.add(L"type", L"last-frame-producer");\r
- return info;\r
- }\r
-};\r
\r
struct empty_frame_producer : public frame_producer\r
{\r
- virtual safe_ptr<draw_frame> receive(int){return draw_frame::empty();}\r
- virtual safe_ptr<draw_frame> last_frame() const{return draw_frame::empty();}\r
- virtual void set_frame_factory(const safe_ptr<frame_factory>&){}\r
+ virtual spl::shared_ptr<draw_frame> receive(int){return draw_frame::empty();}\r
+ virtual spl::shared_ptr<draw_frame> last_frame() const{return draw_frame::empty();}\r
+ virtual void set_frame_factory(const spl::shared_ptr<frame_factory>&){}\r
virtual uint32_t nb_frames() const {return 0;}\r
virtual std::wstring print() const { return L"empty";}\r
+ virtual void subscribe(const monitor::observable::observer_ptr& o){}\r
+ virtual void unsubscribe(const monitor::observable::observer_ptr& o){} \r
+ virtual std::wstring name() const {return L"empty";}\r
\r
virtual boost::property_tree::wptree info() const override\r
{\r
}\r
};\r
\r
-const safe_ptr<frame_producer>& frame_producer::empty() // nothrow\r
-{\r
- static safe_ptr<frame_producer> producer = make_safe<empty_frame_producer>();\r
+ static spl::shared_ptr<frame_producer> producer = spl::make_shared<empty_frame_producer>();\r
return producer;\r
} \r
\r
-safe_ptr<draw_frame> receive_and_follow(safe_ptr<frame_producer>& producer, int hints)\r
+class producer_proxy : public frame_producer\r
{ \r
- auto frame = producer->receive(hints);\r
- if(frame == draw_frame::eof())\r
+ std::shared_ptr<frame_producer> producer_;\r
+public:\r
+ producer_proxy(spl::shared_ptr<frame_producer>&& producer) \r
+ : producer_(std::move(producer))\r
{\r
- CASPAR_LOG(info) << producer->print() << " End Of File.";\r
- auto following = producer->get_following_producer();\r
- if(following != frame_producer::empty())\r
+ CASPAR_LOG(info) << producer_->print() << L" Initialized.";\r
+ }\r
+\r
+ virtual ~producer_proxy()\r
+ { \r
+ static tbb::atomic<int> counter = tbb::atomic<int>();\r
+ \r
+ ++counter;\r
+ CASPAR_VERIFY(counter < 32);\r
+ \r
+ auto producer = new spl::shared_ptr<frame_producer>(std::move(producer_));\r
+ async([=]\r
{\r
- following->set_leading_producer(producer);\r
- producer = std::move(following);\r
- }\r
- else\r
- producer = make_safe<last_frame_producer>(producer);\r
+ std::unique_ptr<spl::shared_ptr<frame_producer>> pointer_guard(producer);\r
+ auto str = (*producer)->print();\r
+ try\r
+ {\r
+ if(!producer->unique())\r
+ CASPAR_LOG(trace) << str << L" Not destroyed on asynchronous destruction thread: " << producer->use_count();\r
+ else\r
+ CASPAR_LOG(trace) << str << L" Destroying on asynchronous destruction thread.";\r
+ }\r
+ catch(...){}\r
+ \r
+ CASPAR_LOG(trace) << str << L" Uninitializing.";\r
+ pointer_guard.reset();\r
+ CASPAR_LOG(info) << str << L" Uninitialized.";\r
\r
- return receive_and_follow(producer, hints);\r
+ --counter;\r
+ }); \r
}\r
- return frame;\r
-}\r
+ \r
+ virtual spl::shared_ptr<draw_frame> receive(int flags) override {return producer_->receive(flags);}\r
+ virtual spl::shared_ptr<draw_frame> last_frame() const override {return producer_->last_frame();}\r
+ virtual std::wstring print() const override {return producer_->print();}\r
+ virtual std::wstring name() const override {return producer_->name();}\r
+ virtual boost::property_tree::wptree info() const override {return producer_->info();}\r
+ virtual boost::unique_future<std::wstring> call(const std::wstring& str) override {return producer_->call(str);}\r
+ virtual void leading_producer(const spl::shared_ptr<frame_producer>& producer) override {return producer_->leading_producer(producer);}\r
+ virtual uint32_t nb_frames() const override {return producer_->nb_frames();}\r
+ virtual void subscribe(const monitor::observable::observer_ptr& o) {return producer_->subscribe(o);}\r
+ virtual void unsubscribe(const monitor::observable::observer_ptr& o) {return producer_->unsubscribe(o);}\r
+};\r
\r
-void register_producer_factory(const producer_factory_t& factory)\r
+spl::shared_ptr<core::frame_producer> wrap_producer(spl::shared_ptr<core::frame_producer> producer)\r
{\r
- g_factories.push_back(factory);\r
+ return spl::make_shared<producer_proxy>(std::move(producer));\r
}\r
\r
-safe_ptr<core::frame_producer> do_create_producer(const safe_ptr<frame_factory>& my_frame_factory, const std::vector<std::wstring>& params)\r
+spl::shared_ptr<core::frame_producer> do_create_producer(const spl::shared_ptr<frame_factory>& my_frame_factory, const std::vector<std::wstring>& params)\r
{\r
if(params.empty())\r
BOOST_THROW_EXCEPTION(invalid_argument() << arg_name_info("params") << arg_value_info(""));\r
\r
if(producer == frame_producer::empty())\r
producer = create_color_producer(my_frame_factory, params);\r
+\r
+ if(producer == frame_producer::empty())\r
+ return producer;\r
\r
return producer;\r
}\r
\r
-\r
-safe_ptr<core::frame_producer> create_producer(const safe_ptr<frame_factory>& my_frame_factory, const std::vector<std::wstring>& params)\r
+spl::shared_ptr<core::frame_producer> create_producer(const spl::shared_ptr<frame_factory>& my_frame_factory, const std::vector<std::wstring>& params)\r
{ \r
auto producer = do_create_producer(my_frame_factory, params);\r
auto key_producer = frame_producer::empty();\r
}\r
\r
\r
-safe_ptr<core::frame_producer> create_producer(const safe_ptr<frame_factory>& factory, const std::wstring& params)\r
+spl::shared_ptr<core::frame_producer> create_producer(const spl::shared_ptr<frame_factory>& factory, const std::wstring& params)\r
{\r
std::wstringstream iss(params);\r
std::vector<std::wstring> tokens;\r
projects / casparcg / blobdiff