Do not allow the m_transforming_liquid queue to increase until all RAM is consumed

[minetest.git] / src / porting.cpp

diff --git a/src/porting.cpp b/src/porting.cpp
index 3c2a5c82488f88dfea5b5b1d9c79c7d0e1b9f417..025e5978c7557642ed61d8b092c8f679a22f995d 100644 (file)
--- a/src/porting.cpp
+++ b/src/porting.cpp
@@ -36,6 +36,16 @@ with this program; if not, write to the Free Software Foundation, Inc.,
        #include <sys/utsname.h>
 #endif
 
+#if !defined(_WIN32) && !defined(__APPLE__) && \
+       !defined(__ANDROID__) && !defined(SERVER)
+       #define XORG_USED
+#endif
+
+#ifdef XORG_USED
+       #include <X11/Xlib.h>
+       #include <X11/Xutil.h>
+#endif
+
 #include "config.h"
 #include "debug.h"
 #include "filesys.h"
@@ -167,6 +177,7 @@ int getNumberOfProcessors() {
 }
 
 
+#ifndef __ANDROID__
 bool threadBindToProcessor(threadid_t tid, int pnumber) {
 #if defined(_WIN32)
 
@@ -194,7 +205,7 @@ bool threadBindToProcessor(threadid_t tid, int pnumber) {
                                                pnumber, NULL) == 0;
 
 #elif defined(_AIX)
-       
+
        return bindprocessor(BINDTHREAD, (tid_t)tid, pnumber) == 0;
 
 #elif defined(__hpux) || defined(hpux)
@@ -203,11 +214,11 @@ bool threadBindToProcessor(threadid_t tid, int pnumber) {
 
        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,
@@ -219,7 +230,7 @@ bool threadBindToProcessor(threadid_t tid, int pnumber) {
 
 #endif
 }
-
+#endif
 
 bool threadSetPriority(threadid_t tid, int prio) {
 #if defined(_WIN32)
@@ -232,21 +243,21 @@ bool threadSetPriority(threadid_t tid, int prio) {
 
        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
 }
 
@@ -458,9 +469,15 @@ void initializePaths()
        {
                char buf[BUFSIZ];
                memset(buf, 0, BUFSIZ);
-               assert(readlink("/proc/self/exe", buf, BUFSIZ-1) != -1);
-               pathRemoveFile(buf, '/');
-               bindir = buf;
+               if (readlink("/proc/self/exe", buf, BUFSIZ-1) == -1) {
+                       errorstream << "Unable to read bindir "<< std::endl;
+#ifndef __ANDROID__
+                       assert("Unable to read bindir" == 0);
+#endif
+               } else {
+                       pathRemoveFile(buf, '/');
+                       bindir = buf;
+               }
        }
 
        // Find share directory from these.
@@ -472,6 +489,9 @@ void initializePaths()
        trylist.push_back(
                        bindir + DIR_DELIM + ".." + DIR_DELIM + "share" + DIR_DELIM + PROJECT_NAME);
        trylist.push_back(bindir + DIR_DELIM + "..");
+#ifdef __ANDROID__
+       trylist.push_back(path_user);
+#endif
 
        for(std::list<std::string>::const_iterator i = trylist.begin();
                        i != trylist.end(); i++)
@@ -490,8 +510,9 @@ void initializePaths()
                path_share = trypath;
                break;
        }
-
+#ifndef __ANDROID__
        path_user = std::string(getenv("HOME")) + DIR_DELIM + "." + PROJECT_NAME;
+#endif
 
        /*
                OS X
@@ -507,7 +528,7 @@ void initializePaths()
        {
                dstream<<"Bundle resource path: "<<path<<std::endl;
                //chdir(path);
-               path_share = std::string(path) + DIR_DELIM + "share";
+               path_share = std::string(path) + DIR_DELIM + STATIC_SHAREDIR;
        }
        else
        {
@@ -534,23 +555,29 @@ void initIrrlicht(irr::IrrlichtDevice * _device) {
        device = _device;
 }
 
+void setXorgClassHint(const video::SExposedVideoData &video_data,
+       const std::string &name)
+{
+#ifdef XORG_USED
+       XClassHint *classhint = XAllocClassHint();
+       classhint->res_name  = (char *)name.c_str();
+       classhint->res_class = (char *)name.c_str();
+
+       XSetClassHint((Display *)video_data.OpenGLLinux.X11Display,
+               video_data.OpenGLLinux.X11Window, classhint);
+       XFree(classhint);
+#endif
+}
+
 #ifndef SERVER
 v2u32 getWindowSize() {
        return device->getVideoDriver()->getScreenSize();
 }
 
+#ifndef __ANDROID__
 
 float getDisplayDensity() {
-       float gui_scaling = g_settings->getFloat("gui_scaling");
-       // using Y here feels like a bug, this needs to be discussed later!
-       if (getWindowSize().Y <= 800) {
-               return (2.0/3.0) * gui_scaling;
-       }
-       if (getWindowSize().Y <= 1280) {
-               return 1.0 * gui_scaling;
-       }
-
-       return (4.0/3.0) * gui_scaling;
+       return g_settings->getFloat("screen_dpi")/96.0;
 }
 
 v2u32 getDisplaySize() {
@@ -562,6 +589,7 @@ v2u32 getDisplaySize() {
        return deskres;
 }
 #endif
+#endif
 
 } //namespace porting