Atomic ++, optustest fixed

- volatile -> Atomic (finished)
- ozCore
  * Atomic
    + memory order as a template arg, checked with static_assert
    + fetchAnd(), fetchOr(), fetchXor()
    + threadFence()
    + operators =, &=, ++ etc.
- opustest fixed

CMakeLists.txt

@@ -123,6 +123,8 @@ endif()
 
 find_package(OpenAL REQUIRED)
 find_package(PNG REQUIRED)
+pkg_check_modules(OGG REQUIRED ogg)
+pkg_check_modules(OPUS REQUIRED opus)
 pkg_check_modules(OPUSFILE REQUIRED opusfile)
 pkg_check_modules(VORBISFILE REQUIRED vorbisfile)
 

build.sh

@@ -20,7 +20,7 @@ platforms=(
 #  Emscripten
 #  Linux-i686
 #  Linux-i686-Clang
-  Linux-x86_64
+#  Linux-x86_64
   Linux-x86_64-Clang
 #  PNaCl
 #  Windows-i686

src/client/Context.hh

@@ -94,18 +94,18 @@ private:
   {
     static const int BUFFER_SIZE = 44100;
 
-    uint          id;
-    uint          bufferIds[2];
-    int           nQueuedBuffers;
-    int           nSamples;
-
-    volatile int  owner;
-    volatile bool isAlive;              // Set to false to terminate source before it finishes.
-    Mutex         mutex;
-    Thread        thread;
-
-    String        text;
-    short         samples[BUFFER_SIZE];
+    uint         id;
+    uint         bufferIds[2];
+    int          nQueuedBuffers;
+    int          nSamples;
+
+    Atomic<int>  owner;
+    Atomic<bool> isAlive;              // Set to false to terminate source before it finishes.
+    Mutex        mutex;
+    Thread       thread;
+
+    String       text;
+    short        samples[BUFFER_SIZE];
   };
 
 private:

src/client/EditStage.hh

@@ -39,7 +39,7 @@ private:
   Thread         auxThread;
   Semaphore      mainSemaphore;
   Semaphore      auxSemaphore;
-  volatile bool  isAuxAlive;
+  Atomic<bool>   isAuxAlive;
 
 public:
 

src/client/GameStage.hh

@@ -38,34 +38,34 @@ private:
   // 2.5 min.
   static const uint AUTOSAVE_INTERVAL;
 
-  ulong64       startTicks;
-  long64        sleepMicros;
-  long64        loadingMicros;
-  long64        uiMicros;
-  long64        loaderMicros;
-  long64        presentMicros;
-  long64        matrixMicros;
-  long64        nirvanaMicros;
-
-  uint          autosaveTicks;
-
-  Stream        saveStream;
-  File          saveFile;
-  Thread        saveThread;
-
-  Thread        auxThread;
-  Semaphore     mainSemaphore;
-  Semaphore     auxSemaphore;
-  volatile bool isAuxAlive;
+  ulong64      startTicks;
+  long64       sleepMicros;
+  long64       loadingMicros;
+  long64       uiMicros;
+  long64       loaderMicros;
+  long64       presentMicros;
+  long64       matrixMicros;
+  long64       nirvanaMicros;
+
+  uint         autosaveTicks;
+
+  Stream       saveStream;
+  File         saveFile;
+  Thread       saveThread;
+
+  Thread       auxThread;
+  Semaphore    mainSemaphore;
+  Semaphore    auxSemaphore;
+  Atomic<bool> isAuxAlive;
 
 public:
 
-  Proxy*        proxy;
+  Proxy*       proxy;
 
-  File          autosaveFile;
-  File          quicksaveFile;
-  File          stateFile;
-  String        mission;
+  File         autosaveFile;
+  File         quicksaveFile;
+  File         stateFile;
+  String       mission;
 
 private:
 

src/client/Loader.hh

@@ -63,14 +63,16 @@ private:
   static const uint SOUND_CLEAR_INTERVAL      = 120 * Timer::TICKS_PER_SEC;  // 2 min (+ 100 s)
   static const uint SOUND_CLEAR_LAG           = 100 * Timer::TICKS_PER_SEC;
 
-  Thread preloadThread;
+private:
+
+  Thread       preloadThread;
 
-  Semaphore preloadMainSemaphore;
-  Semaphore preloadAuxSemaphore;
+  Semaphore    preloadMainSemaphore;
+  Semaphore    preloadAuxSemaphore;
 
-  volatile bool isPreloadAlive;
+  Atomic<bool> isPreloadAlive;
 
-  uint tick;
+  uint         tick;
 
 private:
 

src/client/Render.hh

@@ -106,7 +106,7 @@ private:
   Semaphore                   effectsMainSemaphore;
   Semaphore                   effectsAuxSemaphore;
 
-  volatile bool               areEffectsAlive;
+  Atomic<bool>                areEffectsAlive;
 
 public:
 

src/client/Sound.cc

@@ -64,7 +64,7 @@ void Sound::musicRun()
     }
 
     if (streamedTrack >= 0) {
-      streamedBytes = musicDecoder.decode();
+      hasStreamedBytes = musicDecoder.decode();
     }
   }
 }
@@ -134,7 +134,7 @@ void Sound::updateMusic()
     alGetSourcei(musicSource, AL_BUFFERS_PROCESSED, &nProcessed);
 
     if (nProcessed != 0) {
-      if (streamedBytes) {
+      if (hasStreamedBytes) {
         hasLoaded = true;
 
         uint buffer;
@@ -151,7 +151,7 @@ void Sound::updateMusic()
       }
     }
     // If beginning of a track.
-    else if (musicBuffersQueued != 2 && streamedBytes) {
+    else if (musicBuffersQueued != 2 && hasStreamedBytes) {
       hasLoaded = true;
 
       int i = musicBuffersQueued;

src/client/Sound.hh

@@ -53,8 +53,8 @@ private:
 
   // Music track id to switch to, -1 to do nothing, -2 stop playing.
   int                         selectedTrack;
-  volatile int                streamedTrack;
-  volatile bool               streamedBytes;
+  Atomic<int>                 streamedTrack;
+  Atomic<bool>                hasStreamedBytes;
 
   Thread                      musicThread;
   Thread                      soundThread;
@@ -64,8 +64,8 @@ private:
   Semaphore                   soundMainSemaphore;
   Semaphore                   soundAuxSemaphore;
 
-  volatile bool               isMusicAlive;
-  volatile bool               isSoundAlive;
+  Atomic<bool>                isMusicAlive;
+  Atomic<bool>               isSoundAlive;
 
 public: