Browse Source

Fix a SMP related bug introduced in rev 2957 : remove the __SMP__ flag and define LOCK for SMP in all cases.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2965 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/1.90
sletz 14 years ago
parent
commit
23fab4f1bb
6 changed files with 7 additions and 17 deletions
  1. +4
    -0
      ChangeLog
  2. +0
    -1
      common/JackAtomic.h
  3. +1
    -5
      linux/JackAtomic_os.h
  4. +1
    -5
      macosx/JackAtomic_os.h
  5. +1
    -5
      windows/JackAtomic_os.h
  6. +0
    -1
      wscript

+ 4
- 0
ChangeLog View File

@@ -23,6 +23,10 @@ Michael Voigt
Jackdmp changes log
---------------------------

2008-10-08 Stephane Letz <letz@grame.fr>
* Fix a SMP related bug introduced in rev 2957 : remove the __SMP__ flag and define LOCK for SMP in all cases.

2008-10-02 Stephane Letz <letz@grame.fr>
* Correct file permission for jack-shm-registry POSIX shared memory segment.


+ 0
- 1
common/JackAtomic.h View File

@@ -21,7 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define __JackAtomic__

#include "JackTypes.h"

#include "JackAtomic_os.h"

static inline long INC_ATOMIC(volatile SInt32* val)


+ 1
- 5
linux/JackAtomic_os.h View File

@@ -52,11 +52,7 @@ static inline int CAS(register UInt32 value, register UInt32 newvalue, register

#if defined(__i386__) || defined(__x86_64__)

#ifdef __SMP__
# define LOCK "lock ; "
#else
# define LOCK ""
#endif
#define LOCK "lock ; "

static inline char CAS(volatile UInt32 value, UInt32 newvalue, volatile void* addr)
{


+ 1
- 5
macosx/JackAtomic_os.h View File

@@ -52,11 +52,7 @@ static inline int CAS(register UInt32 value, register UInt32 newvalue, register

#if defined(__i386__) || defined(__x86_64__)

#ifdef __SMP__
# define LOCK "lock ; "
#else
# define LOCK ""
#endif
#define LOCK "lock ; "

static inline char CAS(volatile UInt32 value, UInt32 newvalue, volatile void* addr)
{


+ 1
- 5
windows/JackAtomic_os.h View File

@@ -55,11 +55,7 @@ inline char CAS(volatile UInt32 value, UInt32 newvalue, volatile void * addr)

#else

#ifdef __SMP__
# define LOCK "lock ; "
#else
# define LOCK ""
#endif
#define LOCK "lock ; "

static inline char CAS(volatile UInt32 value, UInt32 newvalue, volatile void* addr)
{


+ 0
- 1
wscript View File

@@ -105,7 +105,6 @@ def configure(conf):

conf.define('ADDON_DIR', os.path.normpath(conf.env['PREFIX'] + '/lib/jack'))
conf.define('JACK_LOCATION', os.path.normpath(conf.env['PREFIX'] + '/bin'))
conf.define('__SMP__', 1)
conf.define('USE_POSIX_SHM', 1)
conf.define('JACKMP', 1)
if conf.env['BUILD_JACKDBUS'] == True:


Loading…
Cancel
Save