Changeset 20872

Timestamp:

09/26/07 14:54:35 (1 year ago)

Author:

patrick

Message:

Fixed nasty crash-on-exit problems caused by Sonix cleaning up the resources
in Audiere or OpenAL at the wrong time. As near as I can tell, Audiere and
OpenAL clean-up procedures need to occur in the same thread where they were
initialized. In order for this to happen, we have to be able to tell the
Sound Manager (and Sonix) to shut down at the appropriate time. Having it
happen as a side effect of the snx::sonix singleton being destroyed at the
time of application exit caused the crashes.

Bumped the version to 2.3.15.

Files:

• juggler/trunk/modules/vrjuggler/ChangeLog (modified) (1 diff)
• juggler/trunk/modules/vrjuggler/VERSION (modified) (1 diff)
• juggler/trunk/modules/vrjuggler/configure.ac (modified) (1 diff)
• juggler/trunk/modules/vrjuggler/vrj/Kernel/Kernel.cpp (modified) (4 diffs)
• juggler/trunk/modules/vrjuggler/vrj/Kernel/Kernel.h (modified) (1 diff)
• juggler/trunk/modules/vrjuggler/vrj/Sound/SoundManager.h (modified) (1 diff)
• juggler/trunk/modules/vrjuggler/vrj/Sound/SoundManagerSonix.cpp (modified) (1 diff)
• juggler/trunk/modules/vrjuggler/vrj/Sound/SoundManagerSonix.h (modified) (1 diff)

juggler/trunk/modules/vrjuggler/ChangeLog

@@ -1 +1 @@
-DATE        AUTHOR      CHANGE
------------ ----------- -------------------------------------------------------
+Sep-26-2007 patrick     Fixed crash-on-exit problems with Sonix.
+                        NEW VERSION: 2.3.15
-Sep-19-2007 patrick     Added draw thread CPU affinity capabilities through the
-                        new environment variable VJ_DRAW_THREAD_AFFINITY. This

juggler/trunk/modules/vrjuggler/VERSION

@@ +1 @@
+2.3.15-0 @09/26/2007 19:55:00 UTC@
-2.3.14-0 @09/19/2007 19:10:00 UTC@
-2.3.13-0 @09/05/2007 02:05:00 UTC@

juggler/trunk/modules/vrjuggler/configure.ac

@@ -178 +178 @@
-GADGETEER_PATH([1.3.7], ,
-               [AC_MSG_ERROR(*** Gadgeteer required for VR Juggler ***)])
-1.4
+3.6
-
-VJ_GET_BOOST_LIB_SUFFIX_LIST([$dpp_boost_major], [$dpp_boost_minor],

juggler/trunk/modules/vrjuggler/vrj/Kernel/Kernel.cpp

@@ -700 +700 @@
-   // XXX: TODO: Free resources (ie closeContext())
-
-
-
-
+
+
+
+
-   {
-      stopDrawManager();
-      cfg_mgr->removeConfigElementHandler(mDrawManager);
+   }
+
+   // If the new application is NULL OR we have an old Sound Manager that is
+   // different from the new one, then stop the current Sound Manager.
+   if ( NULL == newApp || NULL != mSoundManager &&
+        newApp->getSoundManager() != mSoundManager )
+   {
+      stopSoundManager();
-      cfg_mgr->removeConfigElementHandler(mSoundManager);
-   }
@@ -731 +740 @@
-
-         mDrawManager = mApp->getDrawManager();             // Get the new draw manager
-         mSoundManager = mApp->getSoundManager();           // Get the new sound manager
-         cfg_mgr->addConfigElementHandler(mDrawManager);    // Tell config manager about them
-         cfg_mgr->addConfigElementHandler(mSoundManager);   // Tell config manager about them
-         startDrawManager(true);                      // Start the new one
-      }
@@ -740 +747 @@
-         startDrawManager(false);                     // Start new app
-      }
+
+      if ( mApp->getSoundManager() != mSoundManager )
+      {
+         // Get the new sound manager and tell the Config Manager about it.
+         mSoundManager = mApp->getSoundManager();
+         cfg_mgr->addConfigElementHandler(mSoundManager);
+      }
+
-      // Now handle configuration
-      cfg_mgr->addConfigElementHandler(mApp);
@@ -977 +992 @@
-      mDrawManager = NULL;
-      mDisplayManager->setDrawManager(NULL);
+   }
+}
+
+void Kernel::stopSoundManager()
+{
+   if ( NULL != mSoundManager )
+   {
+      mSoundManager->closeAPI();
+      mSoundManager = NULL;
-   }
-}

juggler/trunk/modules/vrjuggler/vrj/Kernel/Kernel.h

@@ -397 +397 @@
-   //@}
-
+   /** @name Sound Manager Routines */
+   //@{
+   /**
+    * Stops the Sound Manager and closes its resources.
+    *
+    * @post \c mSoundManager is NULL.
+    *
+    * @since 2.3.15
+    */
+   void stopSoundManager();
+   //@}
+
-public:
-   /** @name Global "get" interface */

juggler/trunk/modules/vrjuggler/vrj/Sound/SoundManager.h

@@ -82 +82 @@
-       */
-      virtual void sync() {}
+
+      /**
+       * Shuts down the sound API currently in use.
+       *
+       * @since 2.3.15
+       */
+      virtual void closeAPI() {}
-   };
-} // end namespace

juggler/trunk/modules/vrjuggler/vrj/Sound/SoundManagerSonix.cpp

@@ -212 +212 @@
-   }
-
+   void SoundManagerSonix::closeAPI()
+   {
+      snx::sonix::instance()->shutdownAPI();
+   }
+
-} // end namespace

juggler/trunk/modules/vrjuggler/vrj/Sound/SoundManagerSonix.h

@@ -71 +71 @@
-      virtual void sync();
-
+      /**
+       * Tells Sonix to shut down the current sound API. Depending on what
+       * sound API is in use, this will cause sounds to stop playing and
+       * loaded resources to be released.
+       *
+       * @since 2.3.15
+       */
+      virtual void closeAPI();
+
-   private:
-      vpr::Interval mLastFrameTime;