From: Braden M. <br...@us...> - 2006-12-02 07:20:22
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18013 Modified Files: ChangeLog Log Message: Mark any uninitialized plugin_streambufs as failed when quitting openvrml-gtkplug so that reader threads will not continue to block on them (creating a deadlock). Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1389 retrieving revision 1.1390 diff -C2 -d -r1.1389 -r1.1390 *** ChangeLog 30 Nov 2006 06:47:42 -0000 1.1389 --- ChangeLog 2 Dec 2006 07:20:20 -0000 1.1390 *************** *** 1,2 **** --- 1,36 ---- + 2006-12-02 Braden McDaniel <br...@en...> + + Mark any uninitialized plugin_streambufs as failed when quitting + openvrml-gtkplug so that reader threads will not continue to block + on them (creating a deadlock). + + * src/openvrml-gtkplug/gtkvrmlbrowser.cpp + (resource_fetcher::do_get_resource(const std::string &)): Fixed + comment to be more host-agnostic (i.e., removed reference to + NPN_GetURL). + * src/openvrml-gtkplug/main.cpp + (openvrml_player::command_istream_reader::operator()() const): + Mark any remaining uninitialized plugin_streambufs as failed. + * src/openvrml-gtkplug/plugin_streambuf.cpp + (openvrml_player::plugin_streambuf::init(size_t, const + std::string&, const std::string &)): Assert validity of arguments; + changed name of condition variable. + (openvrml_player::plugin_streambuf::fail()): Added function; used + to indicate that a stream will not be initialized. + (openvrml_player::plugin_streambuf::url() const): Changed name of + condition variable. + (openvrml_player::plugin_streambuf::type() const): Changed name of + condition variable. + (openvrml_player::plugin_streambuf::underflow()): Changed name of + condition variable. + (openvrml_player::uninitialized_plugin_streambuf_map::empty() + const): Added function. + * src/openvrml-gtkplug/plugin_streambuf.h + (openvrml_player::plugin_streambuf): Changed + streambuf_initialized_ condition variable to + streambuf_initialized_or_failed_; added fail member function. + (openvrml_player::uninitialized_plugin_streambuf_map): Added empty + member function. + 2006-11-30 Braden McDaniel <br...@en...> |