]> git.lizzy.rs Git - minetest.git/blobdiff - src/porting.cpp
Cleanup jthread and fix win32 build
[minetest.git] / src / porting.cpp
index 92615d77a2b9a21a77313f8b412bbd0b821e9623..a080a44e5bb5cbae1944003fad47779f1f1ff61e 100644 (file)
@@ -1,18 +1,18 @@
 /*
-Minetest-c55
-Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 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.
 */
@@ -23,11 +23,24 @@ with this program; if not, write to the Free Software Foundation, Inc.,
        See comments in porting.h
 */
 
+#if defined(linux)
+       #include <unistd.h>
+#elif defined(__APPLE__)
+       #include <unistd.h>
+       #include <mach-o/dyld.h>
+#elif defined(__FreeBSD__)
+       #include <unistd.h>
+       #include <sys/types.h>
+       #include <sys/sysctl.h>
+#endif
+
 #include "porting.h"
 #include "config.h"
 #include "debug.h"
 #include "filesys.h"
 #include "log.h"
+#include "util/string.h"
+#include <list>
 
 #ifdef __APPLE__
        #include "CoreFoundation/CoreFoundation.h"
@@ -56,7 +69,7 @@ void sigint_handler(int sig)
        {
                dstream<<DTIME<<"INFO: sigint_handler(): "
                                <<"Ctrl-C pressed, shutting down."<<std::endl;
-               
+
                // Comment out for less clutter when testing scripts
                /*dstream<<DTIME<<"INFO: sigint_handler(): "
                                <<"Printing debug stacks"<<std::endl;
@@ -77,8 +90,7 @@ void signal_handler_init(void)
 
 #else // _WIN32
        #include <signal.h>
-       #include <windows.h>
-       
+
        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,16 @@ 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) != "");
+}
+
 void initializePaths()
 {
-#ifdef RUN_IN_PLACE
+#if RUN_IN_PLACE
        /*
                Use relative paths if RUN_IN_PLACE
        */
@@ -156,46 +297,89 @@ void initializePaths()
                Windows
        */
        #if defined(_WIN32)
-               #include <windows.h>
 
        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"<<std::endl;
+               path_share = std::string(buf) + "\\..\\..";
+               path_user = std::string(buf) + "\\..\\..";
+       }
+       else{
+               path_share = std::string(buf) + "\\..";
+               path_user = std::string(buf) + "\\..";
+       }
 
        /*
                Linux
        */
        #elif defined(linux)
-               #include <unistd.h>
-       
+
        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"
                        <<std::endl;
-       path_share = std::string("../share");
-       path_user = std::string("../user");
+
+       /* scriptapi no longer allows paths that start with "..", so assuming that
+          the current working directory is bin/, strip off the last component. */
+       char *cwd = getcwd(NULL, 0);
+       pathRemoveFile(cwd, '/');
+       path_share = std::string(cwd);
+       path_user = std::string(cwd);
 
        #endif
 
@@ -211,20 +395,19 @@ void initializePaths()
                Windows
        */
        #if defined(_WIN32)
-               #include <windows.h>
 
        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\<PROJECT_NAME>"
        len = GetEnvironmentVariable("APPDATA", buf, buflen);
        assert(len < buflen);
@@ -234,30 +417,50 @@ void initializePaths()
                Linux
        */
        #elif defined(linux)
-               #include <unistd.h>
-       
-       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: system-wide share not found at \""<<path_share<<"\"";
-               path_share = std::string(buf) + "/../share";
-               dstream<<"WARNING: Using \""<<path_share<<"\" instead."<<std::endl;
+       // Find share directory from these.
+       // It is identified by containing the subdirectory "builtin".
+       std::list<std::string> 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<std::string>::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 \""
+                                       <<trypath<<"\""<<std::endl;
+                       continue;
+               }
+               // Warn if was not the first alternative
+               if(i != trylist.begin()){
+                       dstream<<"WARNING: system-wide share found at \""
+                                       <<trypath<<"\""<<std::endl;
+               }
+               path_share = trypath;
+               break;
        }
-       
+
        path_user = std::string(getenv("HOME")) + "/." + PROJECT_NAME;
 
        /*
                OS X
        */
        #elif defined(__APPLE__)
-               #include <unistd.h>
 
     // Code based on
     // http://stackoverflow.com/questions/516200/relative-paths-not-working-in-xcode-c
@@ -276,14 +479,14 @@ void initializePaths()
                dstream<<"WARNING: Could not determine bundle resource path"<<std::endl;
     }
     CFRelease(resources_url);
-       
+
        path_user = std::string(getenv("HOME")) + "/Library/Application Support/" + PROJECT_NAME;
 
-       #elif defined(__FreeBSD__)
+       #else // FreeBSD, and probably many other POSIX-like systems.
 
-       path_share = std::string(INSTALL_PREFIX) + "/share/" + PROJECT_NAME;
+       path_share = STATIC_SHAREDIR;
        path_user = std::string(getenv("HOME")) + "/." + PROJECT_NAME;
-    
+
        #endif
 
 #endif // RUN_IN_PLACE