openvrml-commit Mailing List for OpenVRML (Page 69)

Status: Alpha

Brought to you by: braden, cks, cmorley

openvrml-commit — Changes to OpenVRML's source revision repository

You can subscribe to this list here.

2005	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (128)	Dec (65)
2006	Jan (48)	Feb (132)	Mar (95)	Apr (47)	May (54)	Jun (2)	Jul (57)	Aug (109)	Sep (131)	Oct (186)	Nov (105)	Dec (78)
2007	Jan (125)	Feb (105)	Mar (52)	Apr (104)	May (63)	Jun (116)	Jul (76)	Aug	Sep (18)	Oct (93)	Nov (110)	Dec (169)
2008	Jan (90)	Feb (64)	Mar (41)	Apr (23)	May (6)	Jun (18)	Jul (10)	Aug (61)	Sep (139)	Oct (50)	Nov (55)	Dec (2)
2009	Jan	Feb (1)	Mar (62)	Apr (22)	May (17)	Jun (19)	Jul (40)	Aug (21)	Sep	Oct (40)	Nov (23)	Dec
2010	Jan (14)	Feb (40)	Mar (9)	Apr (11)	May (19)	Jun (4)	Jul (10)	Aug (22)	Sep (15)	Oct	Nov (2)	Dec
2011	Jan (13)	Feb (10)	Mar	Apr (13)	May	Jun	Jul (2)	Aug (4)	Sep	Oct	Nov	Dec
2012	Jan	Feb	Mar	Apr (33)	May (20)	Jun	Jul (8)	Aug (7)	Sep (2)	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 67 68 69 70 71 .. 134 > >> (Page 69 of 134)

[openvrml-commit] openvrml ChangeLog,1.1494,1.1495

From: Braden M. <br...@us...> - 2007-05-12 03:29:43

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26508

Modified Files:
	ChangeLog 
Log Message:
Protect the plugin_streambuf_map with a mutex.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1494
retrieving revision 1.1495
diff -C2 -d -r1.1494 -r1.1495
*** ChangeLog	5 May 2007 06:09:05 -0000	1.1494
--- ChangeLog	12 May 2007 03:29:41 -0000	1.1495
***************
*** 1,2 ****
--- 1,28 ----
+ 2007-05-11 Braden McDaniel  <br...@en...>
+ 
+ 	Protect the plugin_streambuf_map with a mutex.
+ 
+ 	* src/openvrml-xembed/main.cpp
+ 	(openvrml_xembed::command_istream_reader::operator()() const):
+ 	plugin_streambuf_map::find now returns a
+ 	shared_ptr<plugin_streambuf>. plugin_streambuf_map::erase now
+ 	takes a stream id.
+ 	* src/openvrml-xembed/plugin_streambuf.cpp
+ 	(openvrml_xembed::plugin_streambuf::init(size_t, const
+ 	std::string&, const std::string &)): Modified to use new
+ 	plugin_streambuf_map interface.
+ 	(openvrml_xembed::plugin_streambuf_map): Removed.
+ 	(openvrml_xembed::plugin_streambuf_map::find(size_t) const): Added
+ 	function.
+ 	(openvrml_xembed::plugin_streambuf_map::insert(size_t, const
+ 	boost::shared_ptr<plugin_streambuf> &)): Added function.
+ 	(openvrml_xembed::plugin_streambuf_map::erase(size_t)): Added
+ 	function.
+ 	* src/openvrml-xembed/plugin_streambuf.h
+ 	(openvrml_xembed::uninitialized_plugin_streambuf_map): Inherit
+ 	boost::noncopyable.
+ 	(openvrml_xembed::plugin_streambuf_map): Rather than just use a
+ 	std::map directly, protect it with a mutex.
+ 
  2007-05-05 Braden McDaniel  <br...@en...>

[openvrml-commit] openvrml/src/openvrml-xembed main.cpp, 1.1.2.5, 1.1.2.6 plugin_streambuf.cpp, 1.1.2.3, 1.1.2.4 plugin_streambuf.h, 1.1.2.2, 1.1.2.3

From: Braden M. <br...@us...> - 2007-05-12 03:29:19

Update of /cvsroot/openvrml/openvrml/src/openvrml-xembed
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26475/src/openvrml-xembed

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	main.cpp plugin_streambuf.cpp plugin_streambuf.h 
Log Message:
Protect the plugin_streambuf_map with a mutex.

Index: plugin_streambuf.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/openvrml-xembed/plugin_streambuf.cpp,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** plugin_streambuf.cpp	15 Mar 2007 22:41:42 -0000	1.1.2.3
--- plugin_streambuf.cpp	12 May 2007 03:29:18 -0000	1.1.2.4
***************
*** 72,77 ****
      this->initialized_ = true;
      const boost::shared_ptr<plugin_streambuf> this_ = shared_from_this();
!     succeeded = plugin_streambuf_map.insert(make_pair(stream_id, this_))
!         .second;
      g_assert(succeeded);
      this->streambuf_initialized_or_failed_.notify_all();
--- 72,76 ----
      this->initialized_ = true;
      const boost::shared_ptr<plugin_streambuf> this_ = shared_from_this();
!     succeeded = plugin_streambuf_map_.insert(stream_id, this_);
      g_assert(succeeded);
      this->streambuf_initialized_or_failed_.notify_all();
***************
*** 139,146 ****
  }
  
- 
- openvrml_xembed::uninitialized_plugin_streambuf_map
- openvrml_xembed::uninitialized_plugin_streambuf_map_;
- 
  const boost::shared_ptr<openvrml_xembed::plugin_streambuf>
  openvrml_xembed::uninitialized_plugin_streambuf_map::
--- 138,141 ----
***************
*** 203,206 ****
  }
  
  
! openvrml_xembed::plugin_streambuf_map_t openvrml_xembed::plugin_streambuf_map;
--- 198,235 ----
  }
  
+ openvrml_xembed::uninitialized_plugin_streambuf_map
+ openvrml_xembed::uninitialized_plugin_streambuf_map_;
  
! 
! const boost::shared_ptr<openvrml_xembed::plugin_streambuf>
! openvrml_xembed::plugin_streambuf_map::find(const size_t id) const
! {
!     boost::mutex::scoped_lock lock(this->mutex_);
!     map_t::const_iterator pos = this->map_.find(id);
!     return pos == this->map_.end()
!         ? boost::shared_ptr<plugin_streambuf>()
!         : pos->second;
! }
! 
! bool
! openvrml_xembed::plugin_streambuf_map::
! insert(const size_t id,
!        const boost::shared_ptr<plugin_streambuf> & streambuf)
! {
!     boost::mutex::scoped_lock lock(this->mutex_);
!     return this->map_.insert(make_pair(id, streambuf)).second;
! }
! 
! /**
!  * @brief Erase the entry corresponding to @p id.
!  *
!  * @return @c true if an entry was removed; @c false otherwise.
!  */
! bool openvrml_xembed::plugin_streambuf_map::erase(const size_t id)
! {
!     boost::mutex::scoped_lock lock(this->mutex_);
!     return this->map_.erase(id) > 0;
! }
! 
! openvrml_xembed::plugin_streambuf_map
! openvrml_xembed::plugin_streambuf_map_;

Index: main.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/openvrml-xembed/main.cpp,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -d -r1.1.2.5 -r1.1.2.6
*** main.cpp	15 Mar 2007 22:41:42 -0000	1.1.2.5
--- main.cpp	12 May 2007 03:29:18 -0000	1.1.2.6
***************
*** 71,74 ****
--- 71,75 ----
              string command_line;
              while (getline(*this->in_, command_line)) {
+                 using boost::shared_ptr;
                  using std::istringstream;
  
***************
*** 77,82 ****
                  command_line_stream >> command;
                  if (command == "get-url-result") {
-                     using boost::shared_ptr;
- 
                      std::string url;
                      int result;
--- 78,81 ----
***************
*** 88,93 ****
                      streambuf->set_get_url_result(result);
                  } else if (command == "new-stream") {
-                     using boost::shared_ptr;
- 
                      size_t stream_id;
                      std::string type, url;
--- 87,90 ----
***************
*** 115,137 ****
                      size_t stream_id;
                      command_line_stream >> stream_id;
!                     plugin_streambuf_map_t::iterator pos = 
!                         plugin_streambuf_map.find(stream_id);
!                     if (pos == plugin_streambuf_map.end()) {
!                         g_warning("Attempt to destroy a nonexistent stream.");
                          continue;
                      }
!                     pos->second->buf_.set_eof();
!                     plugin_streambuf_map.erase(pos);
                  } else if (command == "write") {
                      size_t stream_id, length;
                      command_line_stream >> stream_id >> length;
!                     plugin_streambuf_map_t::const_iterator pos =
!                         plugin_streambuf_map.find(stream_id);
!                     if (pos == plugin_streambuf_map.end()) {
                          g_warning("Attempt to write to a nonexistent stream.");
                          continue;
                      }
                      for (size_t i = 0; i < length; ++i) {
!                         pos->second->buf_.put(this->in_->get());
                      }
                  } else if (command == "load-url") {
--- 112,135 ----
                      size_t stream_id;
                      command_line_stream >> stream_id;
!                     const shared_ptr<plugin_streambuf> streambuf =
!                         plugin_streambuf_map_.find(stream_id);
!                     if (!streambuf) {
!                         g_warning("Attempt to destroy a nonexistent stream "
!                                   "(with stream ID %lu).", stream_id);
                          continue;
                      }
!                     streambuf->buf_.set_eof();
!                     plugin_streambuf_map_.erase(stream_id);
                  } else if (command == "write") {
                      size_t stream_id, length;
                      command_line_stream >> stream_id >> length;
!                     const shared_ptr<plugin_streambuf> streambuf =
!                         plugin_streambuf_map_.find(stream_id);
!                     if (!streambuf) {
                          g_warning("Attempt to write to a nonexistent stream.");
                          continue;
                      }
                      for (size_t i = 0; i < length; ++i) {
!                         streambuf->buf_.put(this->in_->get());
                      }
                  } else if (command == "load-url") {

Index: plugin_streambuf.h
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/openvrml-xembed/plugin_streambuf.h,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** plugin_streambuf.h	12 Feb 2007 02:19:13 -0000	1.1.2.2
--- plugin_streambuf.h	12 May 2007 03:29:18 -0000	1.1.2.3
***************
*** 25,28 ****
--- 25,29 ----
  #   include <set>
  #   include <streambuf>
+ #   include <boost/noncopyable.hpp>
  #   include <boost/shared_ptr.hpp>
  #   include <boost/enable_shared_from_this.hpp>
***************
*** 66,70 ****
      };
  
!     extern class uninitialized_plugin_streambuf_map {
          mutable boost::mutex mutex_;
          typedef std::multimap<std::string, boost::shared_ptr<plugin_streambuf> >
--- 67,71 ----
      };
  
!     extern class uninitialized_plugin_streambuf_map : boost::noncopyable {
          mutable boost::mutex mutex_;
          typedef std::multimap<std::string, boost::shared_ptr<plugin_streambuf> >
***************
*** 83,91 ****
      } uninitialized_plugin_streambuf_map_;
  
  
!     typedef std::map<size_t, boost::shared_ptr<plugin_streambuf> >
!         plugin_streambuf_map_t;
! 
!     extern plugin_streambuf_map_t plugin_streambuf_map;
  }
  
--- 84,98 ----
      } uninitialized_plugin_streambuf_map_;
  
+     extern class plugin_streambuf_map : boost::noncopyable {
+         mutable boost::mutex mutex_;
+         typedef std::map<size_t, boost::shared_ptr<plugin_streambuf> > map_t;
+         map_t map_;
  
!     public:
!         const boost::shared_ptr<plugin_streambuf> find(size_t id) const;
!         bool insert(size_t id,
!                     const boost::shared_ptr<plugin_streambuf> & streambuf);
!         bool erase(size_t id);
!     } plugin_streambuf_map_;
  }

[openvrml-commit] openvrml ChangeLog,1.1310.2.169,1.1310.2.170

From: Braden M. <br...@us...> - 2007-05-12 03:29:19

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26475

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	ChangeLog 
Log Message:
Protect the plugin_streambuf_map with a mutex.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1310.2.169
retrieving revision 1.1310.2.170
diff -C2 -d -r1.1310.2.169 -r1.1310.2.170
*** ChangeLog	5 May 2007 06:07:15 -0000	1.1310.2.169
--- ChangeLog	12 May 2007 03:29:18 -0000	1.1310.2.170
***************
*** 1,2 ****
--- 1,28 ----
+ 2007-05-11 Braden McDaniel  <br...@en...>
+ 
+ 	Protect the plugin_streambuf_map with a mutex.
+ 
+ 	* src/openvrml-xembed/main.cpp
+ 	(openvrml_xembed::command_istream_reader::operator()() const):
+ 	plugin_streambuf_map::find now returns a
+ 	shared_ptr<plugin_streambuf>. plugin_streambuf_map::erase now
+ 	takes a stream id.
+ 	* src/openvrml-xembed/plugin_streambuf.cpp
+ 	(openvrml_xembed::plugin_streambuf::init(size_t, const
+ 	std::string&, const std::string &)): Modified to use new
+ 	plugin_streambuf_map interface.
+ 	(openvrml_xembed::plugin_streambuf_map): Removed.
+ 	(openvrml_xembed::plugin_streambuf_map::find(size_t) const): Added
+ 	function.
+ 	(openvrml_xembed::plugin_streambuf_map::insert(size_t, const
+ 	boost::shared_ptr<plugin_streambuf> &)): Added function.
+ 	(openvrml_xembed::plugin_streambuf_map::erase(size_t)): Added
+ 	function.
+ 	* src/openvrml-xembed/plugin_streambuf.h
+ 	(openvrml_xembed::uninitialized_plugin_streambuf_map): Inherit
+ 	boost::noncopyable.
+ 	(openvrml_xembed::plugin_streambuf_map): Rather than just use a
+ 	std::map directly, protect it with a mutex.
+ 
  2007-05-05 Braden McDaniel  <br...@en...>

[openvrml-commit] openvrml ChangeLog,1.1310.2.168,1.1310.2.169

From: Braden M. <br...@us...> - 2007-05-05 06:09:21

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5251

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	ChangeLog 
Log Message:
Pass GNOME_PARAM_APP_DATADIR to gnome_program_init.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1310.2.168
retrieving revision 1.1310.2.169
diff -C2 -d -r1.1310.2.168 -r1.1310.2.169
*** ChangeLog	30 Apr 2007 07:37:07 -0000	1.1310.2.168
--- ChangeLog	5 May 2007 06:07:15 -0000	1.1310.2.169
***************
*** 1,2 ****
--- 1,8 ----
+ 2007-05-05 Braden McDaniel  <br...@en...>
+ 
+ 	* src/openvrml-player/player.cpp
+ 	(main(int, char *[])): Pass GNOME_PARAM_APP_DATADIR to
+ 	gnome_program_init.
+ 
  2007-04-30 Braden McDaniel  <br...@en...>

[openvrml-commit] openvrml/src/openvrml-player player.cpp, 1.1.2.21, 1.1.2.22

From: Braden M. <br...@us...> - 2007-05-05 06:09:21

Update of /cvsroot/openvrml/openvrml/src/openvrml-player
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5251/src/openvrml-player

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	player.cpp 
Log Message:
Pass GNOME_PARAM_APP_DATADIR to gnome_program_init.

Index: player.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/player.cpp,v
retrieving revision 1.1.2.21
retrieving revision 1.1.2.22
diff -C2 -d -r1.1.2.21 -r1.1.2.22
*** player.cpp	15 Apr 2007 16:36:32 -0000	1.1.2.21
--- player.cpp	5 May 2007 06:07:16 -0000	1.1.2.22
***************
*** 196,206 ****
  
      GnomeProgram * const program =
!         gnome_program_init(app_id,
!                            PACKAGE_VERSION,
!                            LIBGNOMEUI_MODULE,
!                            argc,
!                            argv,
!                            GNOME_PARAM_GOPTION_CONTEXT, option_context,
!                            GNOME_PARAM_NONE);
  
      glade_init();
--- 196,208 ----
  
      GnomeProgram * const program =
!         gnome_program_init(
!             app_id,
!             PACKAGE_VERSION,
!             LIBGNOMEUI_MODULE,
!             argc,
!             argv,
!             GNOME_PARAM_GOPTION_CONTEXT, option_context,
!             GNOME_PARAM_APP_DATADIR, OPENVRML_PLAYER_PKGDATADIR_,
!             GNOME_PARAM_NONE);
  
      glade_init();

[openvrml-commit] openvrml ChangeLog,1.1493,1.1494

From: Braden M. <br...@us...> - 2007-05-05 06:09:21

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5932

Modified Files:
	ChangeLog 
Log Message:
Pass GNOME_PARAM_APP_DATADIR to gnome_program_init.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1493
retrieving revision 1.1494
diff -C2 -d -r1.1493 -r1.1494
*** ChangeLog	30 Apr 2007 07:37:25 -0000	1.1493
--- ChangeLog	5 May 2007 06:09:05 -0000	1.1494
***************
*** 1,2 ****
--- 1,8 ----
+ 2007-05-05 Braden McDaniel  <br...@en...>
+ 
+ 	* src/openvrml-player/player.cpp
+ 	(main(int, char *[])): Pass GNOME_PARAM_APP_DATADIR to
+ 	gnome_program_init.
+ 
  2007-04-30 Braden McDaniel  <br...@en...>

[openvrml-commit] openvrml/src/openvrml-player player.cpp, 1.22, 1.23

From: Braden M. <br...@us...> - 2007-05-05 06:09:21

Update of /cvsroot/openvrml/openvrml/src/openvrml-player
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5932/src/openvrml-player

Modified Files:
	player.cpp 
Log Message:
Pass GNOME_PARAM_APP_DATADIR to gnome_program_init.

Index: player.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/player.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** player.cpp	15 Apr 2007 16:36:49 -0000	1.22
--- player.cpp	5 May 2007 06:09:06 -0000	1.23
***************
*** 196,206 ****
  
      GnomeProgram * const program =
!         gnome_program_init(app_id,
!                            PACKAGE_VERSION,
!                            LIBGNOMEUI_MODULE,
!                            argc,
!                            argv,
!                            GNOME_PARAM_GOPTION_CONTEXT, option_context,
!                            GNOME_PARAM_NONE);
  
      glade_init();
--- 196,208 ----
  
      GnomeProgram * const program =
!         gnome_program_init(
!             app_id,
!             PACKAGE_VERSION,
!             LIBGNOMEUI_MODULE,
!             argc,
!             argv,
!             GNOME_PARAM_GOPTION_CONTEXT, option_context,
!             GNOME_PARAM_APP_DATADIR, OPENVRML_PLAYER_PKGDATADIR_,
!             GNOME_PARAM_NONE);
  
      glade_init();

[openvrml-commit] openvrml/src/libopenvrml-gl Makefile.am,1.8,1.9

From: Braden M. <br...@us...> - 2007-04-30 07:37:30

Update of /cvsroot/openvrml/openvrml/src/libopenvrml-gl
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv30264/src/libopenvrml-gl

Modified Files:
	Makefile.am 
Log Message:
Updates for 0.16.4 release.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml-gl/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Makefile.am	30 Dec 2006 23:37:44 -0000	1.8
--- Makefile.am	30 Apr 2007 07:37:25 -0000	1.9
***************
*** 1,3 ****
! LIBRARY_VERSION = 6:4:0
  #                 | | |
  #          +------+ | +---+
--- 1,3 ----
! LIBRARY_VERSION = 6:5:0
  #                 | | |
  #          +------+ | +---+

[openvrml-commit] openvrml ChangeLog, 1.1492, 1.1493 NEWS, 1.42, 1.43 README, 1.79, 1.80 configure.ac, 1.112, 1.113