summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorAndrew Udvare <audvare@gmail.com>2020-09-30 02:39:18 +0200
committerAndrew Udvare <audvare@gmail.com>2020-09-30 21:40:28 +0200
commit01ea7801fdd51852a4312350cd6c8bf91efe8666 (patch)
treee30f6eca1dd4d0f512ceb4fa7d36e2b8dd2fd60d /src/core
parentFix more (diff)
downloadre3-01ea7801fdd51852a4312350cd6c8bf91efe8666.tar
re3-01ea7801fdd51852a4312350cd6c8bf91efe8666.tar.gz
re3-01ea7801fdd51852a4312350cd6c8bf91efe8666.tar.bz2
re3-01ea7801fdd51852a4312350cd6c8bf91efe8666.tar.lz
re3-01ea7801fdd51852a4312350cd6c8bf91efe8666.tar.xz
re3-01ea7801fdd51852a4312350cd6c8bf91efe8666.tar.zst
re3-01ea7801fdd51852a4312350cd6c8bf91efe8666.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/CdStreamPosix.cpp73
1 files changed, 49 insertions, 24 deletions
diff --git a/src/core/CdStreamPosix.cpp b/src/core/CdStreamPosix.cpp
index e114a29a..895143a4 100644
--- a/src/core/CdStreamPosix.cpp
+++ b/src/core/CdStreamPosix.cpp
@@ -4,6 +4,7 @@
#include <pthread.h>
#include <signal.h>
#include <semaphore.h>
+#include <stdlib.h>
#include <sys/types.h>
#include <unistd.h>
#include <sys/time.h>
@@ -21,6 +22,30 @@
#define CDDEBUG(f, ...) debug ("%s: " f "\n", "cdvd_stream", ## __VA_ARGS__)
#define CDTRACE(f, ...) printf("%s: " f "\n", "cdvd_stream", ## __VA_ARGS__)
+#ifdef __APPLE__
+#define COMPAT_SEM_T sem_t *
+int compat_sem_init(sem_t **ptr, __attribute__((unused)) int x, __attribute__((unused)) int y) {
+ *ptr = sem_open("/semaphore", O_CREAT, 0644, 1);
+ return *ptr == SEM_FAILED ? -1 : 0;
+}
+int compat_sem_post(sem_t **sem) {
+ return sem_post(*sem);
+}
+int compat_sem_wait(sem_t **sem) {
+ return sem_wait(*sem);
+}
+int compat_sem_destroy(sem_t **sem, const char * name) {
+ sem_close(*sem);
+ sem_unlink(name);
+}
+#else
+#define COMPAT_SEM_T sem_t
+#define compat_sem_post sem_post
+#define compat_sem_destroy(x, y) sem_destroy(x)
+#define compat_sem_init sem_init
+#define compat_sem_wait sem_wait
+#endif
+
// #define ONE_THREAD_PER_CHANNEL // Don't use if you're not on SSD/Flash. (Also you may want to benefit from this via using all channels in Streaming.cpp)
bool flushStream[MAX_CDCHANNELS];
@@ -35,11 +60,11 @@ struct CdReadInfo
int32 nStatus;
#ifdef ONE_THREAD_PER_CHANNEL
int8 nThreadStatus; // 0: created 1:initalized 2:abort now
- pthread_t pChannelThread;
- sem_t pStartSemaphore;
+ pthread_t pChannelThread;
+ COMPAT_SEM_T pStartSemaphore;
#endif
- sem_t pDoneSemaphore; // used for CdStreamSync
- int32 hFile;
+ COMPAT_SEM_T pDoneSemaphore; // used for CdStreamSync
+ int32 hFile;
};
char gCdImageNames[MAX_CDIMAGES+1][64];
@@ -51,7 +76,7 @@ char *gImgNames[MAX_CDIMAGES];
#ifndef ONE_THREAD_PER_CHANNEL
pthread_t _gCdStreamThread;
-sem_t gCdStreamSema; // released when we have new thing to read(so channel is set)
+COMPAT_SEM_T gCdStreamSema; // released when we have new thing to read(so channel is set)
int8 gCdStreamThreadStatus; // 0: created 1:initalized 2:abort now
Queue gChannelRequestQ;
bool _gbCdStreamOverlapped;
@@ -76,7 +101,7 @@ CdStreamInitThread(void)
gChannelRequestQ.tail = 0;
gChannelRequestQ.size = gNumChannels + 1;
ASSERT(gChannelRequestQ.items != nil );
- status = sem_init(&gCdStreamSema, 0, 0);
+ status = compat_sem_init(&gCdStreamSema, 0, 0);
#endif
@@ -91,7 +116,7 @@ CdStreamInitThread(void)
{
for ( int32 i = 0; i < gNumChannels; i++ )
{
- status = sem_init(&gpReadInfo[i].pDoneSemaphore, 0, 0);
+ status = compat_sem_init(&gpReadInfo[i].pDoneSemaphore, 0, 0);
if (status == -1)
{
@@ -100,7 +125,7 @@ CdStreamInitThread(void)
return;
}
#ifdef ONE_THREAD_PER_CHANNEL
- status = sem_init(&gpReadInfo[i].pStartSemaphore, 0, 0);
+ status = compat_sem_init(&gpReadInfo[i].pStartSemaphore, 0, 0);
if (status == -1)
{
@@ -214,13 +239,13 @@ CdStreamShutdown(void)
// Destroying semaphores and free(gpReadInfo) will be done at threads
#ifndef ONE_THREAD_PER_CHANNEL
gCdStreamThreadStatus = 2;
- sem_post(&gCdStreamSema);
+ compat_sem_post(&gCdStreamSema);
#endif
#ifdef ONE_THREAD_PER_CHANNEL
for ( int32 i = 0; i < gNumChannels; i++ ) {
gpReadInfo[i].nThreadStatus = 2;
- sem_post(&gpReadInfo[i].pStartSemaphore);
+ compat_sem_post(&gpReadInfo[i].pStartSemaphore);
}
#endif
}
@@ -254,10 +279,10 @@ CdStreamRead(int32 channel, void *buffer, uint32 offset, uint32 size)
#ifndef ONE_THREAD_PER_CHANNEL
AddToQueue(&gChannelRequestQ, channel);
- if ( sem_post(&gCdStreamSema) != 0 )
+ if ( compat_sem_post(&gCdStreamSema) != 0 )
printf("Signal Sema Error\n");
#else
- if ( sem_post(&gpReadInfo[channel].pStartSemaphore) != 0 )
+ if ( compat_sem_post(&gpReadInfo[channel].pStartSemaphore) != 0 )
printf("Signal Sema Error\n");
#endif
@@ -332,7 +357,7 @@ CdStreamSync(int32 channel)
{
pChannel->bLocked = true;
- sem_wait(&pChannel->pDoneSemaphore);
+ compat_sem_wait(&pChannel->pDoneSemaphore);
}
pChannel->bReading = false;
@@ -383,12 +408,12 @@ void *CdStreamThread(void *param)
#ifndef ONE_THREAD_PER_CHANNEL
while (gCdStreamThreadStatus != 2) {
- sem_wait(&gCdStreamSema);
+ compat_sem_wait(&gCdStreamSema);
int32 channel = GetFirstInQueue(&gChannelRequestQ);
#else
int channel = *((int*)param);
while (gpReadInfo[channel].nThreadStatus != 2){
- sem_wait(&gpReadInfo[channel].pStartSemaphore);
+ compat_sem_wait(&gpReadInfo[channel].pStartSemaphore);
#endif
ASSERT( channel < gNumChannels );
@@ -437,22 +462,22 @@ void *CdStreamThread(void *param)
if ( pChannel->bLocked )
{
- sem_post(&pChannel->pDoneSemaphore);
+ compat_sem_post(&pChannel->pDoneSemaphore);
}
pChannel->bReading = false;
}
#ifndef ONE_THREAD_PER_CHANNEL
- for ( int32 i = 0; i < gNumChannels; i++ )
- {
- sem_destroy(&gpReadInfo[i].pDoneSemaphore);
- }
- sem_destroy(&gCdStreamSema);
+ for ( int32 i = 0; i < gNumChannels; i++ )
+ {
+ compat_sem_destroy(&gpReadInfo[i].pDoneSemaphore, "/semaphoredone");
+ }
+ compat_sem_destroy(&gCdStreamSema, "/semaphore");
free(gChannelRequestQ.items);
#else
- sem_destroy(&gpReadInfo[channel].pStartSemaphore);
- sem_destroy(&gpReadInfo[channel].pDoneSemaphore);
+ compat_sem_destroy(&gpReadInfo[channel].pStartSemaphore, "/semaphorestart");
+ compat_sem_destroy(&gpReadInfo[channel].pDoneSemaphore, "/semaphoredone");
#endif
- free(gpReadInfo);
+ free(gpReadInfo);
pthread_exit(nil);
}