Overview
Comment: | Add mutexes for AmigaOS |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
2f01be38084f2e62ec86a72364f99f82 |
User & Date: | js on 2019-08-01 21:17:21 |
Other Links: | manifest | tags |
Context
2019-08-01
| ||
21:20 | Add of_once() for AmigaOS check-in: c2bde5d283 user: js tags: trunk | |
21:17 | Add mutexes for AmigaOS check-in: 2f01be3808 user: js tags: trunk | |
21:05 | Add missing extern "C" check-in: c26426e80f user: js tags: trunk | |
Changes
Modified src/mutex.h from [1c81973578] to [1d847caaa3].
︙ | ︙ | |||
16 17 18 19 20 21 22 | */ #include "objfw-defs.h" #include "platform.h" #if !defined(OF_HAVE_THREADS) || \ | | > > > | > > | 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 | */ #include "objfw-defs.h" #include "platform.h" #if !defined(OF_HAVE_THREADS) || \ (!defined(OF_HAVE_PTHREADS) && !defined(OF_WINDOWS) && !defined(OF_AMIGAOS)) # error No mutexes available! #endif #import "macros.h" #if defined(OF_HAVE_PTHREADS) # include <pthread.h> typedef pthread_mutex_t of_mutex_t; #elif defined(OF_WINDOWS) # include <windows.h> typedef CRITICAL_SECTION of_mutex_t; #elif defined(OF_AMIGAOS) # include <exec/semaphores.h> typedef struct SignalSemaphore of_mutex_t; #endif #if defined(OF_HAVE_ATOMIC_OPS) # import "atomic.h" typedef volatile int of_spinlock_t; # define OF_SPINCOUNT 10 #elif defined(OF_HAVE_PTHREAD_SPINLOCKS) typedef pthread_spinlock_t of_spinlock_t; #else typedef of_mutex_t of_spinlock_t; #endif #ifdef OF_HAVE_SCHED_YIELD # include <sched.h> #endif #if defined(OF_HAVE_RECURSIVE_PTHREAD_MUTEXES) || defined(OF_WINDOWS) || \ defined(OF_AMIGAOS) # define of_rmutex_t of_mutex_t #else # import "tlskey.h" typedef struct { of_mutex_t mutex; of_tlskey_t count; } of_rmutex_t; #endif #ifdef __cplusplus |
︙ | ︙ |
Modified src/mutex.m from [619bce178b] to [5e75d9fbfc].
︙ | ︙ | |||
19 20 21 22 23 24 25 26 27 | #import "mutex.h" #if defined(OF_HAVE_PTHREADS) # include "mutex_pthread.m" #elif defined(OF_WINDOWS) # include "mutex_winapi.m" #endif | > > | > | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 | #import "mutex.h" #if defined(OF_HAVE_PTHREADS) # include "mutex_pthread.m" #elif defined(OF_WINDOWS) # include "mutex_winapi.m" #elif defined(OF_AMIGAOS) # include "mutex_amiga.m" #endif #if !defined(OF_HAVE_RECURSIVE_PTHREAD_MUTEXES) && !defined(OF_WINDOWS) && \ !defined(OF_AMIGAOS) bool of_rmutex_new(of_rmutex_t *rmutex) { if (!of_mutex_new(&rmutex->mutex)) return false; if (!of_tlskey_new(&rmutex->count)) |
︙ | ︙ |
Added src/mutex_amiga.m version [07f9094daa].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 | /* * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, * 2018, 2019 * Jonathan Schleifer <js@heap.zone> * * All rights reserved. * * This file is part of ObjFW. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE.QPL included in * the packaging of this file. * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include <proto/exec.h> bool of_mutex_new(of_mutex_t *mutex) { InitSemaphore(mutex); return true; } bool of_mutex_lock(of_mutex_t *mutex) { ObtainSemaphore(mutex); return true; } bool of_mutex_trylock(of_mutex_t *mutex) { return AttemptSemaphore(mutex); } bool of_mutex_unlock(of_mutex_t *mutex) { ReleaseSemaphore(mutex); return true; } bool of_mutex_free(of_mutex_t *mutex) { return true; } bool of_rmutex_new(of_rmutex_t *rmutex) { return of_mutex_new(rmutex); } bool of_rmutex_lock(of_rmutex_t *rmutex) { return of_mutex_lock(rmutex); } bool of_rmutex_trylock(of_rmutex_t *rmutex) { return of_mutex_trylock(rmutex); } bool of_rmutex_unlock(of_rmutex_t *rmutex) { return of_mutex_unlock(rmutex); } bool of_rmutex_free(of_rmutex_t *rmutex) { return of_mutex_free(rmutex); } |