From 05c5326df32571b5f9aa7de597b6496dfd59539e Mon Sep 17 00:00:00 2001
From: Con Kolivas <kernel@kolivas.org>
Date: Wed, 16 Feb 2011 17:40:50 +1100
Subject: [PATCH] Revert "OSX doesn't support unnamed semaphores so to make it
 work, fake the threading by just creating the threads and waiting for them to
 finish."

This reverts commit b81542cea47a9195e1af052216497b902f3b2dd4.

Revert the change bypassing semaphores in OSX in preparation for changing the semaphores to mutexes.
---
 rzip.h   | 77 --------------------------------------------------------
 stream.c | 45 +++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 77 deletions(-)

diff --git a/rzip.h b/rzip.h
index de4046d..24cb77f 100644
--- a/rzip.h
+++ b/rzip.h
@@ -164,38 +164,6 @@ static inline i64 get_ram(void)
 
 	return ramsize;
 }
-
-/* OSX doesn't support unnamed semaphores so we fake the threading by
- * serialising threads and ignore all the semaphore calls.
- */
-static inline void init_sem(sem_t *sem __attribute__((unused)))
-{
-}
-
-static inline void post_sem(sem_t *s __attribute__((unused)))
-{
-}
-
-static inline void wait_sem(sem_t *s __attribute__((unused)))
-{
-}
-
-static inline void destroy_sem(sem_t *s __attribute__((unused)))
-{
-}
-
-static inline void create_pthread(pthread_t  * thread, pthread_attr_t * attr,
-	void * (*start_routine)(void *), void *arg)
-{
-	if (pthread_create(thread, attr, start_routine, arg))
-		fatal("pthread_create");
-	if (pthread_join(*thread, NULL))
-		fatal("pthread_join");
-}
-
-static inline void join_pthread(pthread_t th __attribute__((unused)), void **thread_return __attribute__((unused)))
-{
-}
 #else /* __APPLE__ */
  #define memstream_update_buffer(A, B, C) (0)
 static inline i64 get_ram(void)
@@ -221,51 +189,6 @@ static inline i64 get_ram(void)
 
 	return ramsize;
 }
-
-static inline void init_sem(sem_t *sem)
-{
-	if (unlikely(sem_init(sem, 0, 0)))
-		fatal("sem_init\n");
-}
-
-static inline void post_sem(sem_t *s)
-{
-retry:
-	if (unlikely((sem_post(s)) == -1)) {
-		if (errno == EINTR)
-			goto retry;
-		fatal("sem_post failed");
-	}
-}
-
-static inline void wait_sem(sem_t *s)
-{
-retry:
-	if (unlikely((sem_wait(s)) == -1)) {
-		if (errno == EINTR)
-			goto retry;
-		fatal("sem_wait failed");
-	}
-}
-
-static inline void destroy_sem(sem_t *s)
-{
-	if (unlikely(sem_destroy(s)))
-		fatal("sem_destroy failed\n");
-}
-
-static inline void create_pthread(pthread_t  *thread, pthread_attr_t * attr,
-	void * (*start_routine)(void *), void *arg)
-{
-	if (pthread_create(thread, attr, start_routine, arg))
-		fatal("pthread_create");
-}
-
-static inline void join_pthread(pthread_t th, void **thread_return)
-{
-	if (pthread_join(th, thread_return))
-		fatal("pthread_join");
-}
 #endif
 
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
diff --git a/stream.c b/stream.c
index b003b3c..2ea6502 100644
--- a/stream.c
+++ b/stream.c
@@ -45,6 +45,51 @@ struct uncomp_thread{
 	int stream;
 } *ucthread;
 
+void init_sem(sem_t *sem)
+{
+	if (unlikely(sem_init(sem, 0, 0)))
+		fatal("sem_init\n");
+}
+
+static inline void post_sem(sem_t *s)
+{
+retry:
+	if (unlikely((sem_post(s)) == -1)) {
+		if (errno == EINTR)
+			goto retry;
+		fatal("sem_post failed");
+	}
+}
+
+static inline void wait_sem(sem_t *s)
+{
+retry:
+	if (unlikely((sem_wait(s)) == -1)) {
+		if (errno == EINTR)
+			goto retry;
+		fatal("sem_wait failed");
+	}
+}
+
+static inline void destroy_sem(sem_t *s)
+{
+	if (unlikely(sem_destroy(s)))
+		fatal("sem_destroy failed\n");
+}
+
+void create_pthread(pthread_t  * thread, pthread_attr_t * attr,
+	void * (*start_routine)(void *), void *arg)
+{
+	if (pthread_create(thread, attr, start_routine, arg))
+		fatal("pthread_create");
+}
+
+void join_pthread(pthread_t th, void **thread_return)
+{
+	if (pthread_join(th, thread_return))
+		fatal("pthread_join");
+}
+
 /* just to keep things clean, declare function here
  * but move body to the end since it's a work function
 */