Changeset 12441

Timestamp:

02/14/08 10:48:08 (11 months ago)

Author:

pottedmeat

Message:

Refs #5602. Update cron to run a limited number of files at a time

Files:

• util/branches/dev/jsdoc/jsdoc.module (modified) (4 diffs)

util/branches/dev/jsdoc/jsdoc.module

@@ -412 +412 @@
   // Validate the stuff added in the newly included file
   if (_jsdoc_cron_validate_include()) {
-    $files = call_user_func(_jsdoc_base() . '_get_files');
+    $files = variable_get('jsdoc_cron_files', array());
+    if (!empty($files)) {
+      call_user_func(_jsdoc_base() . '_get_files');
+      print count($files) . ' files left<br>';
+    }else{
+      db_query("UPDATE {jsdoc_cache} SET used = 0");
+      foreach (jsdoc_projects() as $project) {
+        $version = jsdoc_version_node_load('HEAD', $project);
+        db_query("UPDATE {jsdoc_resources} SET used = 0 WHERE used = 1 AND version = %d", $version->nid);
+      }
+      $files = call_user_func(_jsdoc_base() . '_get_files');
+    }
     if (!is_array($files)) {
       watchdog('jsdoc', _jsdoc_base() . '_get_files' . t(' does not return an array in ') . _jsdoc_file_location(), WATCHDOG_ERROR);
@@ -429 +440 @@
       variable_set('jsdoc_cron_time', time());
 
-      db_query("UPDATE {jsdoc_cache} SET used = 0");
-      foreach (jsdoc_projects() as $project) {
-        $version = jsdoc_version_node_load('HEAD', $project);
-        db_query("UPDATE {jsdoc_objects} SET used = 0 WHERE used = 1 AND version = %d", $version->nid);
-        db_query("UPDATE {jsdoc_resources} SET used = 0 WHERE used = 1 AND version = %d", $version->nid);
-      }
-      unset($project);
-      unset($version);
-
+      $count = 0;
+      $limit = 25;
       foreach ($files as $list) {
+        if($count == $limit){
+          if(count($files) <= $limit){
+            variable_set('jsdoc_cron_files', array());
+          }else{
+            variable_set('jsdoc_cron_files', array_slice($files, $limit));
+          }
+          break;
+        }
+        ++$count;
         list($namespace, $file_name) = $list;
         unset($list);
@@ -458 +471 @@
           }
           else {
+            print 'cache hit ' . $cache->filepath . '<br>';
             db_query("UPDATE {jsdoc_cache} SET used = 1 WHERE namespace = '%s' AND filepath = '%s'", $namespace, $file_name);
             $contents = unserialize(file_get_contents($cache_dir . $cache->cid));
@@ -473 +487 @@
           $provides_node = _jsdoc_resource_get_or_create($contents['#provides'], $namespace);
           $resource_node = _jsdoc_resource_get_or_create($contents['#resource'], $namespace);
+
+          db_query("UPDATE {jsdoc_objects} SET used = 0 WHERE used = 1 AND version = %d AND resource_vid = %d", $version->nid, $resource_node->vid);
+
+          unset($project);
+          unset($version);
+
           db_query("UPDATE {jsdoc_resources} SET used = 1 WHERE vid = %d", $provides_node->vid);
           db_query("UPDATE {jsdoc_resources} SET used = 1 WHERE vid = %d", $resource_node->vid);