Changeset 7314 in orxonox.OLD for trunk/src/lib

Timestamp:

Apr 17, 2006, 1:19:20 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: ShellBuffer is now ThreadSafe for printing to it
I must say: SDL_Thread's are way easier than simple pThreads

Location:

trunk/src/lib

Files:

• shell/shell_buffer.cc (modified) (4 diffs)
• shell/shell_buffer.h (modified) (2 diffs)
• sound/ogg_player.cc (modified) (1 diff)

trunk/src/lib/shell/shell_buffer.cc

@@ -42 +42 @@
 
 ShellBuffer* ShellBuffer::singletonRef = NULL;
+SDL_mutex* ShellBuffer::bufferMutex = NULL;
 
 /**
@@ -52 +53 @@
 
   this->flush();
+
+  if (ShellBuffer::bufferMutex != NULL)
+    SDL_DestroyMutex(ShellBuffer::bufferMutex);
+  ShellBuffer::bufferMutex = NULL;
 
   ShellBuffer::singletonRef = NULL;
@@ -103 +108 @@
   va_start(arguments, line);
 
+  if (ShellBuffer::bufferMutex == NULL)
+    ShellBuffer::bufferMutex = SDL_CreateMutex();
+
+  SDL_mutexP(ShellBuffer::bufferMutex);
 #if DEBUG < 3
   if (ShellBuffer::singletonRef == NULL)
 #endif
-
     vprintf(line, arguments);
 #if DEBUG < 3
@@ -114 +122 @@
 #endif
     ShellBuffer::singletonRef->addBufferLine(line, arguments);
+  SDL_mutexV(ShellBuffer::bufferMutex);
   return true;
 }

trunk/src/lib/shell/shell_buffer.h

@@ -10 +10 @@
 #include <stdarg.h>
 #include <list>
+#include <SDL_thread.h>
 
 #define      SHELL_BUFFER_SIZE       16384         //!< The Size of the input-buffers (should be large enough to carry any kind of input)
@@ -60 +61 @@
 
     unsigned long            lineCount;                          //!< how many Lines have been written out so far.
+
+    static SDL_mutex*        bufferMutex;                        //!< Only one thread may write into the ShellBuffer at a time.
 };
 

trunk/src/lib/sound/ogg_player.cc

@@ -13 +13 @@
    co-programmer: ...
 
+    Beware:
+   The Ogg-Player is a __Threaded__ Stream, this means, that invoking play()
+   creates a Thread, that loops through the Music-File. The Thread seems
+   to be safe, but it is not guarantied.
 
    -------------------------------------------------------------------
-   The source of this file comes stright from http://www.devmaster.net
+   A Simple Version of this can be found at http://www.devmaster.net
    Thanks a lot for the nice work, and the easy portability to our Project.
 */
-
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_SOUND