Changeset 1022567

Timestamp:

11/09/2014 07:31:37 PM (10 years ago)

Author:

mlazarov

Message:

Adding max load average default value according to cpu's count

Location:

hyper-cache-extended/trunk

Files:

• cache.php (modified) (3 diffs)
• options.php (modified) (2 diffs)
• plugin.php (modified) (2 diffs)

hyper-cache-extended/trunk/cache.php

@@ -25 +25 @@
     return false;
 }
+
+if(!$hyper_cache['load']){$hyper_cache['load'] = 5;}
+
+
+$loadavg = explode(' ',@file_get_contents('/proc/loadavg'));
+$server_load = (float)$loadavg[0];
+
+
 
 $hyper_uri = $_SERVER['REQUEST_URI'];
@@ -85 +93 @@
 // Do not use or cache pages when a wordpress user is logged on
 foreach ($_COOKIE as $n => $v) {
-    // If it's required to bypass the cache when the visitor is a commenter, stop.
-    if ($hyper_cache['comment'] && substr($n, 0, 15) == 'comment_author_')
+    // If it's required to bypass the cache when the visitor is a commenter AND server load is bellow critical, stop.
+    if ($hyper_cache['comment'] && substr($n, 0, 15) == 'comment_author_' && $server_load < $hyper_cache['load'])
         return false;
 
@@ -116 +124 @@
     return;
 }
-
-if(!$hyper_cache['load']) $hyper_cache['load'] = 5;
-
-$loadavg = explode(' ',@file_get_contents('/proc/loadavg'));
-$server_load = (float)$loadavg[0];
 
 $hc_file_time = @ filemtime($hc_file);

hyper-cache-extended/trunk/options.php

@@ -190 +190 @@
     </td>
 </tr>
-
+<?php
+$numCpus = false;
+if (is_file('/proc/cpuinfo') && is_readable('/proc/cpuinfo')){
+    $cpuinfo = file_get_contents('/proc/cpuinfo');
+    preg_match_all('/^processor/m', $cpuinfo, $matches);
+    $numCpus = count($matches[0]);
+}
+
+?>
 
 <tr valign="top">
@@ -197 +205 @@
         <input type="text" size="5" name="options[load]" value="<?php echo htmlspecialchars($options['load']); ?>"/>
         <br />
-        <?php _e('Hyper Cache Extended will serve the cached pages until Server Load gets below this number', 'hyper-cache');?>
+        <?php _e('Hyper Cache Extended will serve the cached pages until Server Load gets below this number. '.($numCpus?'Optimal value: '.($numCpus+1):''), 'hyper-cache');?>
     </td>
 </tr>

hyper-cache-extended/trunk/plugin.php

@@ -43 +43 @@
 function hyper_activate(){
     $hce_options = get_option('hyper_cache_extended');
+
 
     $options = array();
@@ -57 +58 @@
     $options['expire_type'] = 'post';
     $options['path'] = WP_CONTENT_DIR.'/cache/';
+
+    if (is_file('/proc/cpuinfo') && is_readable('/proc/cpuinfo')){
+        $cpuinfo = file_get_contents('/proc/cpuinfo');
+        preg_match_all('/^processor/m', $cpuinfo, $matches);
+        $numCpus = count($matches[0]);
+        $options['load'] = $numCpus + 1;
+    }
+    
 
     $buffer = hyper_generate_config($options);