forked from Kolyah35/minecraft-pe-0.6.1
Fix massive lag spike when starting on haiku
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -4,6 +4,7 @@ out/
|
||||
bin/
|
||||
lib/
|
||||
build-apk/
|
||||
build-haiku/
|
||||
cmake-build-*/
|
||||
CMakeFiles/
|
||||
CMakeCache.txt
|
||||
|
||||
@@ -17,8 +17,8 @@ using namespace RakNet;
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
|
||||
#elif defined(__HAIKU__)
|
||||
#include <kernel/OS.h>
|
||||
#else
|
||||
#include <pthread.h>
|
||||
#endif
|
||||
@@ -93,9 +93,10 @@ int RakThread::Create( void* start_address( void* ), void *arglist, int priority
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#elif defined(__HAIKU__)
|
||||
thread_id threadHandle = spawn_thread((thread_func)start_address, "RakThread", priority, arglist);
|
||||
int res = resume_thread(threadHandle);
|
||||
return res == B_OK ? 0 : 1;
|
||||
#else
|
||||
pthread_t threadHandle;
|
||||
// Create thread linux
|
||||
|
||||
@@ -1665,7 +1665,7 @@ void GetMyIP_Win32( SystemAddress addresses[MAXIMUM_NUMBER_OF_INTERNAL_IDS] )
|
||||
}
|
||||
}
|
||||
// #else
|
||||
/*
|
||||
|
||||
void GetMyIP_Linux( SystemAddress addresses[MAXIMUM_NUMBER_OF_INTERNAL_IDS] )
|
||||
{
|
||||
struct ifaddrs *ifaddr, *ifa;
|
||||
@@ -1716,7 +1716,7 @@ void GetMyIP_Linux( SystemAddress addresses[MAXIMUM_NUMBER_OF_INTERNAL_IDS] )
|
||||
|
||||
freeifaddrs(ifaddr);
|
||||
}
|
||||
*/
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -1724,10 +1724,10 @@ void SocketLayer::GetMyIP( SystemAddress addresses[MAXIMUM_NUMBER_OF_INTERNAL_ID
|
||||
{
|
||||
|
||||
|
||||
|
||||
|
||||
#if defined(_WIN32)
|
||||
GetMyIP_Win32(addresses);
|
||||
#elif defined(__HAIKU__)
|
||||
GetMyIP_Linux(addresses);
|
||||
#else
|
||||
// GetMyIP_Linux(addresses);
|
||||
GetMyIP_Win32(addresses);
|
||||
|
||||
@@ -351,7 +351,8 @@ StartupResult RakPeer::Startup( unsigned short maxConnections, SocketDescriptor
|
||||
#if defined(_WIN32)
|
||||
threadPriority=0;
|
||||
|
||||
|
||||
#elif defined(__HAIKU__)
|
||||
threadPriority=40;
|
||||
#else
|
||||
threadPriority=1000;
|
||||
#endif
|
||||
|
||||
@@ -19,6 +19,8 @@ using namespace RakNet;
|
||||
|
||||
|
||||
|
||||
#elif defined(__HAIKU__)
|
||||
#include <kernel/OS.h>
|
||||
#else
|
||||
#include <pthread.h>
|
||||
#endif
|
||||
@@ -92,10 +94,10 @@ int RakThread::Create( void* start_address( void* ), void *arglist, int priority
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#elif defined(__HAIKU__)
|
||||
thread_id threadHandle = spawn_thread((thread_func)start_address, "RakThread", priority, arglist);
|
||||
int res = resume_thread(threadHandle);
|
||||
return res == B_OK ? 0 : 1;
|
||||
#else
|
||||
pthread_t threadHandle;
|
||||
// Create thread linux
|
||||
|
||||
@@ -1665,7 +1665,7 @@ void GetMyIP_Win32( SystemAddress addresses[MAXIMUM_NUMBER_OF_INTERNAL_IDS] )
|
||||
}
|
||||
}
|
||||
// #else
|
||||
/*
|
||||
|
||||
void GetMyIP_Linux( SystemAddress addresses[MAXIMUM_NUMBER_OF_INTERNAL_IDS] )
|
||||
{
|
||||
struct ifaddrs *ifaddr, *ifa;
|
||||
@@ -1716,7 +1716,7 @@ void GetMyIP_Linux( SystemAddress addresses[MAXIMUM_NUMBER_OF_INTERNAL_IDS] )
|
||||
|
||||
freeifaddrs(ifaddr);
|
||||
}
|
||||
*/
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -1728,6 +1728,8 @@ void SocketLayer::GetMyIP( SystemAddress addresses[MAXIMUM_NUMBER_OF_INTERNAL_ID
|
||||
|
||||
#if defined(_WIN32)
|
||||
GetMyIP_Win32(addresses);
|
||||
#elif defined(__HAIKU__)
|
||||
GetMyIP_Linux(addresses);
|
||||
#else
|
||||
// GetMyIP_Linux(addresses);
|
||||
GetMyIP_Win32(addresses);
|
||||
|
||||
Reference in New Issue
Block a user