Replace only apr_thread_create with pthread_create.

diff --git a/Handler.mm b/Handler.mm
index e460483ee7ca780be68350f3df423813aa14aefb..c289c4eb9218156d4131fea376de92eb7eace4c6 100644 (file)
--- a/Handler.mm
+++ b/Handler.mm
@@ -28,7 +28,7 @@
 #include "Cycript.tab.hh"
 
 #include <Foundation/Foundation.h>
 #include "Cycript.tab.hh"
 
 #include <Foundation/Foundation.h>

-#include <apr_thread_proc.h>
+#include <pthread.h>

 #include <unistd.h>
 #include <sstream>
 
 #include <unistd.h>
 #include <sstream>
 


@@ -65,7 +65,7 @@ struct CYClient :
     CYData
 {
     int socket_;
     CYData
 {
     int socket_;

-    apr_thread_t *thread_;
+    pthread_t thread_;

 
     CYClient(int socket) :
         socket_(socket)
 
     CYClient(int socket) :
         socket_(socket)


@@ -141,7 +141,7 @@ struct CYClient :
     }
 };
 
     }
 };
 

-static void * APR_THREAD_FUNC OnClient(apr_thread_t *thread, void *data) {
+static void * APR_THREAD_FUNC OnClient(void *data) {

     CYClient *client(reinterpret_cast<CYClient *>(data));
     client->Handle();
     delete client;
     CYClient *client(reinterpret_cast<CYClient *>(data));
     client->Handle();
     delete client;


@@ -150,9 +150,7 @@ static void * APR_THREAD_FUNC OnClient(apr_thread_t *thread, void *data) {
 
 extern "C" void CYHandleClient(CYPool &pool, int socket) {
     CYClient *client(new(pool) CYClient(socket));
 
 extern "C" void CYHandleClient(CYPool &pool, int socket) {
     CYClient *client(new(pool) CYClient(socket));

-    apr_threadattr_t *attr;
-    _aprcall(apr_threadattr_create(&attr, *client->pool_));
-    _aprcall(apr_thread_create(&client->thread_, attr, &OnClient, client, *client->pool_));
+    _assert(pthread_create(&client->thread_, NULL, &OnClient, client) == 0);

 }
 
 extern "C" void CYHandleServer(pid_t pid) {
 }
 
 extern "C" void CYHandleServer(pid_t pid) {

diff --git a/Server.cpp b/Server.cpp
index 7a6bed77670b95710aab5427db728de60d398a58..7b88f97111a29c40696bbcc2473dd5e64355b1e8 100644 (file)
--- a/Server.cpp
+++ b/Server.cpp
@@ -21,8 +21,6 @@
 
 #include <Pooling.hpp>
 
 
 #include <Pooling.hpp>
 

-#include <apr_thread_proc.h>
-

 #include <CoreFoundation/CFLogUtilities.h>
 #include <CFNetwork/CFNetwork.h>
 
 #include <CoreFoundation/CFLogUtilities.h>
 #include <CFNetwork/CFNetwork.h>