Ticket #2782: mythtv_jobqueue_2.patch

libs/libmyth/util.h

@@ -61 +61 @@
 long long getDiskSpace(const QString&,long long&,long long&);
 bool getUptime(time_t &uptime);
 bool getMemStats(int &totalMB, int &freeMB, int &totalVM, int &freeVM);
+bool getCPUStats(int &totalTime, int &idleTime);
 
 #endif // UTIL_H_

libs/libmyth/util.cpp

@@ -472 +472 @@
 
     return true;
 }
+
+bool getCPUStats(int &totalTime, int &idleTime)
+{
+#ifdef __linux__
+        bool found = false;
+    char line[256];
+        FILE *stat = fopen("/proc/stat", "r");
+        if (stat)
+        {
+        while ( (found = fgets(line, sizeof line, stat)) && strncmp(line, "cpu ", 4) )
+                ;
+
+        fclose(stat);
+        }
+        
+    if (found)
+        {
+            char what[32];
+            unsigned long user_time, nice_time, system_time, idle_time, wait_time = 0;
+            sscanf(line, "%s %lu %lu %lu %lu %lu", what, &user_time, &nice_time,
+                &system_time, &idle_time, &wait_time);
+
+        unsigned long total_time = user_time + nice_time + system_time + idle_time + wait_time ;
+            static unsigned long last_total_time = 0, last_idle_time = 0;
+            totalTime = total_time - last_total_time;
+            last_total_time = total_time;
+            idleTime = idle_time - last_idle_time;
+            last_idle_time = idle_time;
+            return true;        
+        }
+        else
+        {
+                VERBOSE(VB_IMPORTANT, "cpuCPUAvail(): can't read /proc/stat");
+                return false;
+        }
+#else
+        VERBOSE(VB_IMPORTANT, "getCPUAvail(): Unknown platform. "
+                        "How do I get CPU stats?");
+        return false;
+#endif
+}

libs/libmythtv/jobqueue.cpp

@@ -231 +231 @@
                 jobsRunning++;
             }
 
+            int totalTime, idleTime;
             message = QString("Currently Running %1 jobs.")
                               .arg(jobsRunning);
             if (!inTimeWindow)
@@ -251 +252 @@
 
                 atMax = true;
             }
+            else if (getCPUStats(totalTime, idleTime) && (idleTime * 100 / totalTime) < 25)
+            {
+                message += QString(" CPU near full capacity (%1% idle), "
+                                   "will not start new jobs")
+                                   .arg(idleTime * 100 / totalTime);
+                VERBOSE(VB_JOBQUEUE, LOC + message);
+                atMax = true;
+            }
             else
             {
                 VERBOSE(VB_JOBQUEUE, LOC + message);
                 atMax = false;
             }
 
-
             for (unsigned int x = 0;
-                 (x < jobs.size()) && (jobsRunning < maxJobs); x++)
+                 x < jobs.size(); x++)
             {
                 id = jobs[x].id;
                 chanid = jobs[x].chanid;
@@ -431 +439 @@
                 }
 
                 // never start or claim more than one job in a single run
-                if (startedJobAlready)
+                if (startedJobAlready || atMax)
                     continue;
 
                 if ((inTimeWindow) &&
@@ -470 +478 @@
             }
         }
 
-        if (startedJobAlready)
-            sleep(5);
-        else
-            sleep(sleepTime);
+        sleep(sleepTime);
     }
 }