ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/SheepShaver/src/Unix/sysdeps.h
(Generate patch)

Comparing SheepShaver/src/Unix/sysdeps.h (file contents):
Revision 1.43 by gbeauche, 2005-06-25T11:06:24Z vs.
Revision 1.46 by gbeauche, 2005-07-01T23:15:11Z

# Line 288 | Line 288 | static inline int testandset(volatile in
288   }
289   #endif
290  
291 < /* FIXME: SheepShaver occasionnally hangs with those locks */
292 < #if 0 && (defined(__i386__) || defined(__x86_64__))
291 > #if defined(__i386__) || defined(__x86_64__)
292   #define HAVE_TEST_AND_SET 1
293   static inline int testandset(volatile int *p)
294   {
# Line 372 | Line 371 | typedef volatile int spinlock_t;
371  
372   static const spinlock_t SPIN_LOCK_UNLOCKED = 0;
373  
374 < #if HAVE_TEST_AND_SET
374 > #if defined(HAVE_TEST_AND_SET) && defined(HAVE_PTHREADS)
375 > // There is nothing to lock if we are not in an multithreaded environment
376   #define HAVE_SPINLOCKS 1
377   static inline void spin_lock(spinlock_t *lock)
378   {
# Line 419 | Line 419 | typedef struct timeval tm_time_t;
419   #define C4X_FLOAT_FORMAT 4
420  
421   // High-precision timing
422 < #if defined(HAVE_PTHREADS) && defined(HAVE_CLOCK_NANOSLEEP) && 0
422 > #if defined(HAVE_PTHREADS) && defined(HAVE_CLOCK_NANOSLEEP)
423   #define PRECISE_TIMING 1
424   #define PRECISE_TIMING_POSIX 1
425   #endif
# Line 442 | Line 442 | typedef struct rgb_color {
442   } rgb_color;
443  
444   // X11 display fast locks
445 < #ifdef HAVE_SPINLOCKS
446 < #define X11_LOCK_TYPE spinlock_t
447 < #define X11_LOCK_INIT SPIN_LOCK_UNLOCKED
448 < #define XDisplayLock() spin_lock(&x_display_lock)
449 < #define XDisplayUnlock() spin_unlock(&x_display_lock)
450 < #elif defined(HAVE_PTHREADS)
445 > #if defined(HAVE_PTHREADS)
446   #define X11_LOCK_TYPE pthread_mutex_t
447   #define X11_LOCK_INIT PTHREAD_MUTEX_INITIALIZER
448   #define XDisplayLock() pthread_mutex_lock(&x_display_lock);
449   #define XDisplayUnlock() pthread_mutex_unlock(&x_display_lock);
450 + #elif defined(HAVE_SPINLOCKS)
451 + #define X11_LOCK_TYPE spinlock_t
452 + #define X11_LOCK_INIT SPIN_LOCK_UNLOCKED
453 + #define XDisplayLock() spin_lock(&x_display_lock)
454 + #define XDisplayUnlock() spin_unlock(&x_display_lock)
455   #else
456   #define XDisplayLock()
457   #define XDisplayUnlock()

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines