X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;ds=sidebyside;f=src%2Fporting.cpp;h=e7bef1d33f30c5ec3f718180c0a8b073d244ac18;hb=a230e1e7360eb561429bf69ad8793745fbd5e7c3;hp=f2ca601eb3098ad0d0a4dec210249b91c112a697;hpb=f79082a46d5b2385ae5aebf9048d4ca8b87940c3;p=minetest.git diff --git a/src/porting.cpp b/src/porting.cpp index f2ca601eb..e7bef1d33 100644 --- a/src/porting.cpp +++ b/src/porting.cpp @@ -1,18 +1,18 @@ /* -Minetest-c55 -Copyright (C) 2010 celeron55, Perttu Ahola +Minetest +Copyright (C) 2013 celeron55, Perttu Ahola This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or +it under the terms of the GNU Lesser General Public License as published by +the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +GNU Lesser General Public License for more details. -You should have received a copy of the GNU General Public License along +You should have received a copy of the GNU Lesser General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -24,14 +24,27 @@ with this program; if not, write to the Free Software Foundation, Inc., */ #include "porting.h" + +#if defined(__APPLE__) + #include + #include "CoreFoundation/CoreFoundation.h" +#elif defined(__FreeBSD__) + #include + #include +#elif defined(_WIN32) + #include +#endif +#if !defined(_WIN32) + #include + #include +#endif + #include "config.h" #include "debug.h" #include "filesys.h" #include "log.h" - -#ifdef __APPLE__ - #include "CoreFoundation/CoreFoundation.h" -#endif +#include "util/string.h" +#include namespace porting { @@ -56,7 +69,7 @@ void sigint_handler(int sig) { dstream< - #include - + BOOL WINAPI event_handler(DWORD sig) { switch(sig) @@ -108,10 +120,10 @@ void signal_handler_init(void) case CTRL_BREAK_EVENT: break; } - + return TRUE; } - + void signal_handler_init(void) { SetConsoleCtrlHandler( (PHANDLER_ROUTINE)event_handler,TRUE); @@ -119,12 +131,134 @@ void signal_handler_init(void) #endif + +/* + Multithreading support +*/ +int getNumberOfProcessors() { +#if defined(_SC_NPROCESSORS_ONLN) + + return sysconf(_SC_NPROCESSORS_ONLN); + +#elif defined(__FreeBSD__) || defined(__APPLE__) + + unsigned int len, count; + len = sizeof(count); + return sysctlbyname("hw.ncpu", &count, &len, NULL, 0); + +#elif defined(_GNU_SOURCE) + + return get_nprocs(); + +#elif defined(_WIN32) + + SYSTEM_INFO sysinfo; + GetSystemInfo(&sysinfo); + return sysinfo.dwNumberOfProcessors; + +#elif defined(PTW32_VERSION) || defined(__hpux) + + return pthread_num_processors_np(); + +#else + + return 1; + +#endif +} + + +bool threadBindToProcessor(threadid_t tid, int pnumber) { +#if defined(_WIN32) + + HANDLE hThread = OpenThread(THREAD_ALL_ACCESS, 0, tid); + if (!hThread) + return false; + + bool success = SetThreadAffinityMask(hThread, 1 << pnumber) != 0; + + CloseHandle(hThread); + return success; + +#elif (defined(__FreeBSD__) && (__FreeBSD_version >= 702106)) \ + || defined(__linux) || defined(linux) + + cpu_set_t cpuset; + + CPU_ZERO(&cpuset); + CPU_SET(pnumber, &cpuset); + return pthread_setaffinity_np(tid, sizeof(cpuset), &cpuset) == 0; + +#elif defined(__sun) || defined(sun) + + return processor_bind(P_LWPID, MAKE_LWPID_PTHREAD(tid), + pnumber, NULL) == 0; + +#elif defined(_AIX) + + return bindprocessor(BINDTHREAD, (tid_t)tid, pnumber) == 0; + +#elif defined(__hpux) || defined(hpux) + + pthread_spu_t answer; + + return pthread_processor_bind_np(PTHREAD_BIND_ADVISORY_NP, + &answer, pnumber, tid) == 0; + +#elif defined(__APPLE__) + + struct thread_affinity_policy tapol; + + thread_port_t threadport = pthread_mach_thread_np(tid); + tapol.affinity_tag = pnumber + 1; + return thread_policy_set(threadport, THREAD_AFFINITY_POLICY, + (thread_policy_t)&tapol, THREAD_AFFINITY_POLICY_COUNT) == KERN_SUCCESS; + +#else + + return false; + +#endif +} + + +bool threadSetPriority(threadid_t tid, int prio) { +#if defined(_WIN32) + + HANDLE hThread = OpenThread(THREAD_ALL_ACCESS, 0, tid); + if (!hThread) + return false; + + bool success = SetThreadPriority(hThread, prio) != 0; + + CloseHandle(hThread); + return success; + +#else + + struct sched_param sparam; + int policy; + + if (pthread_getschedparam(tid, &policy, &sparam) != 0) + return false; + + int min = sched_get_priority_min(policy); + int max = sched_get_priority_max(policy); + + sparam.sched_priority = min + prio * (max - min) / THREAD_PRIORITY_HIGHEST; + return pthread_setschedparam(tid, policy, &sparam) == 0; + +#endif +} + + /* Path mangler */ -std::string path_share = ".." DIR_DELIM "share"; -std::string path_user = ".." DIR_DELIM "user"; +// Default to RUN_IN_PLACE style relative paths +std::string path_share = ".."; +std::string path_user = ".."; std::string getDataPath(const char *subpath) { @@ -143,9 +277,52 @@ void pathRemoveFile(char *path, char delim) path[i] = 0; } +bool detectMSVCBuildDir(char *c_path) +{ + std::string path(c_path); + const char *ends[] = {"bin\\Release", "bin\\Build", NULL}; + return (removeStringEnd(path, ends) != ""); +} + +std::string get_sysinfo() +{ +#ifdef _WIN32 + OSVERSIONINFO osvi; + std::ostringstream oss; + std::string tmp; + ZeroMemory(&osvi, sizeof(OSVERSIONINFO)); + osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + GetVersionEx(&osvi); + tmp = osvi.szCSDVersion; + std::replace(tmp.begin(), tmp.end(), ' ', '_'); + + oss << "Windows/" << osvi.dwMajorVersion << "." + << osvi.dwMinorVersion; + if(osvi.szCSDVersion[0]) + oss << "-" << tmp; + oss << " "; + #ifdef _WIN64 + oss << "x86_64"; + #else + BOOL is64 = FALSE; + if(IsWow64Process(GetCurrentProcess(), &is64) && is64) + oss << "x86_64"; // 32-bit app on 64-bit OS + else + oss << "x86"; + #endif + + return oss.str(); +#else + struct utsname osinfo; + uname(&osinfo); + return std::string(osinfo.sysname) + "/" + + osinfo.release + " " + osinfo.machine; +#endif +} + void initializePaths() { -#ifdef RUN_IN_PLACE +#if RUN_IN_PLACE /* Use relative paths if RUN_IN_PLACE */ @@ -156,46 +333,89 @@ void initializePaths() Windows */ #if defined(_WIN32) - #include const DWORD buflen = 1000; char buf[buflen]; DWORD len; - + // Find path of executable and set path_share relative to it len = GetModuleFileName(GetModuleHandle(NULL), buf, buflen); assert(len < buflen); pathRemoveFile(buf, '\\'); - path_share = std::string(buf) + "\\..\\share"; - path_user = std::string(buf) + "\\..\\user"; + if(detectMSVCBuildDir(buf)){ + infostream<<"MSVC build directory detected"< - + char buf[BUFSIZ]; memset(buf, 0, BUFSIZ); // Get path to executable assert(readlink("/proc/self/exe", buf, BUFSIZ-1) != -1); - + pathRemoveFile(buf, '/'); - path_share = std::string(buf) + "/../share"; - path_user = std::string(buf) + "/../user"; - + path_share = std::string(buf) + "/.."; + path_user = std::string(buf) + "/.."; + /* OS X */ - #elif defined(__APPLE__) || defined(__FreeBSD__) - + #elif defined(__APPLE__) + + //https://developer.apple.com/library/mac/#documentation/Darwin/Reference/ManPages/man3/dyld.3.html + //TODO: Test this code + char buf[BUFSIZ]; + uint32_t len = sizeof(buf); + assert(_NSGetExecutablePath(buf, &len) != -1); + + pathRemoveFile(buf, '/'); + + path_share = std::string(buf) + "/.."; + path_user = std::string(buf) + "/.."; + + /* + FreeBSD + */ + #elif defined(__FreeBSD__) + + int mib[4]; + char buf[BUFSIZ]; + size_t len = sizeof(buf); + + mib[0] = CTL_KERN; + mib[1] = KERN_PROC; + mib[2] = KERN_PROC_PATHNAME; + mib[3] = -1; + assert(sysctl(mib, 4, buf, &len, NULL, 0) != -1); + + pathRemoveFile(buf, '/'); + + path_share = std::string(buf) + "/.."; + path_user = std::string(buf) + "/.."; + + #else + //TODO: Get path of executable. This assumes working directory is bin/ - dstream<<"WARNING: Relative path not properly supported on OS X and FreeBSD" + dstream<<"WARNING: Relative path not properly supported on this platform" < const DWORD buflen = 1000; char buf[buflen]; DWORD len; - + // Find path of executable and set path_share relative to it len = GetModuleFileName(GetModuleHandle(NULL), buf, buflen); assert(len < buflen); pathRemoveFile(buf, '\\'); - - // Use ".\bin\..\share" - path_share = std::string(buf) + "\\..\\share"; - + + // Use ".\bin\.." + path_share = std::string(buf) + "\\.."; + // Use "C:\Documents and Settings\user\Application Data\" len = GetEnvironmentVariable("APPDATA", buf, buflen); assert(len < buflen); @@ -234,30 +453,50 @@ void initializePaths() Linux */ #elif defined(linux) - #include - - char buf[BUFSIZ]; - memset(buf, 0, BUFSIZ); + // Get path to executable - assert(readlink("/proc/self/exe", buf, BUFSIZ-1) != -1); - - pathRemoveFile(buf, '/'); + std::string bindir = ""; + { + char buf[BUFSIZ]; + memset(buf, 0, BUFSIZ); + assert(readlink("/proc/self/exe", buf, BUFSIZ-1) != -1); + pathRemoveFile(buf, '/'); + bindir = buf; + } - path_share = std::string(buf) + "/../share/" + PROJECT_NAME; - //path_share = std::string(INSTALL_PREFIX) + "/share/" + PROJECT_NAME; - if (!fs::PathExists(path_share)) { - dstream<<"WARNING: data path " << path_share << " not found!"; - path_share = std::string(buf) + "/../data"; - dstream<<" Trying " << path_share << std::endl; + // Find share directory from these. + // It is identified by containing the subdirectory "builtin". + std::list trylist; + std::string static_sharedir = STATIC_SHAREDIR; + if(static_sharedir != "" && static_sharedir != ".") + trylist.push_back(static_sharedir); + trylist.push_back(bindir + "/../share/" + PROJECT_NAME); + trylist.push_back(bindir + "/.."); + + for(std::list::const_iterator i = trylist.begin(); + i != trylist.end(); i++) + { + const std::string &trypath = *i; + if(!fs::PathExists(trypath) || !fs::PathExists(trypath + "/builtin")){ + dstream<<"WARNING: system-wide share not found at \"" + < // Code based on // http://stackoverflow.com/questions/516200/relative-paths-not-working-in-xcode-c @@ -276,14 +515,14 @@ void initializePaths() dstream<<"WARNING: Could not determine bundle resource path"<