Changeset 1691

Timestamp:

Aug 31, 2008, 9:10:28 PM (16 years ago)

Author:

rgrieder

Message:

• Server GameState works. But the Client has problems that don't seem to be related to GameStates.
• added command line argument: limitToCPU for windows at the moment. 0 disables limitations, 1 limits to core 1, 2 to core 2, etc. if possible.

Location:

code/branches/gui/src/orxonox/gamestates

Files:

• GSClient.cc (modified) (1 diff)
• GSRoot.cc (modified) (5 diffs)
• GSRoot.h (modified) (1 diff)

code/branches/gui/src/orxonox/gamestates/GSClient.cc

@@ -36 +36 @@
 namespace orxonox
 {
-    SetCommandLineArgument(ip, "127.0.0.0").setInformation("#.#.#.#");
+    SetCommandLineArgument(ip, "127.0.0.1").setInformation("#.#.#.#");
 
     GSClient::GSClient()

code/branches/gui/src/orxonox/gamestates/GSRoot.cc

@@ -65 +65 @@
 {
     SetCommandLineArgument(dataPath, "").setInformation("PATH");
+    SetCommandLineArgument(limitToCPU, 1).setInformation("0: off | #cpu");
 
     GSRoot::GSRoot()
@@ -130 +131 @@
         // do this after ogre has initialised. Somehow Ogre changes the settings again (not through
         // the timer though).
-        setThreadAffinity();
+        int limitToCPU;
+        CommandLine::getValue("limitToCPU", &limitToCPU);
+        if (limitToCPU > 0)
+            setThreadAffinity((unsigned int)(limitToCPU - 1));
 
         // add console commands
@@ -170 +174 @@
     /**
     @note
-        The code of this function has been copied from OGRE, an open source graphics engine.
+        The code of this function has been copied and adjusted from OGRE, an open source graphics engine.
             (Object-oriented Graphics Rendering Engine)
         For the latest info, see http://www.ogre3d.org/
@@ -178 +182 @@
         OGRE is licensed under the LGPL. For more info, see ogre license info.
     */
-    void GSRoot::setThreadAffinity()
+    void GSRoot::setThreadAffinity(unsigned int limitToCPU)
     {
 #if ORXONOX_PLATFORM == ORXONOX_PLATFORM_WIN32
@@ -195 +199 @@
                     procMask = 1;
 
-            // Find the lowest core that this process uses
+        // if the core specified with limitToCPU is not available, take the lowest one
+        if (!(procMask & (1 << limitToCPU)))
+            limitToCPU = 0;
+
+            // Find the lowest core that this process uses and limitToCPU suggests
         DWORD threadMask = 1;
-            while ((threadMask & procMask) == 0)
+            while ((threadMask & procMask) == 0 || (threadMask < (1u << limitToCPU)))
                     threadMask <<= 1;
 

code/branches/gui/src/orxonox/gamestates/GSRoot.h

@@ -58 +58 @@
         void messageLogged(const std::string& message, Ogre::LogMessageLevel lml,
             bool maskDebug, const std::string& logName);
-        void setThreadAffinity();
+        void setThreadAffinity(unsigned int limitToCPU);
         void setupOgre();